summaryrefslogtreecommitdiff
path: root/metadata/md5-cache/dev-java
diff options
context:
space:
mode:
Diffstat (limited to 'metadata/md5-cache/dev-java')
-rw-r--r--metadata/md5-cache/dev-java/Manifest.gzbin119734 -> 116935 bytes
-rw-r--r--metadata/md5-cache/dev-java/ant-eclipse-ecj-4.15-r1 (renamed from metadata/md5-cache/dev-java/ant-eclipse-ecj-4.15)7
-rw-r--r--metadata/md5-cache/dev-java/ant-owanttask-1.3.213
-rw-r--r--metadata/md5-cache/dev-java/antlr-2.7.7-r813
-rw-r--r--metadata/md5-cache/dev-java/antlr-2.7.7-r913
-rw-r--r--metadata/md5-cache/dev-java/antlr-3.214
-rw-r--r--metadata/md5-cache/dev-java/antlr-3.2-r114
-rw-r--r--metadata/md5-cache/dev-java/apt-mirror-1.0-r113
-rw-r--r--metadata/md5-cache/dev-java/assertj-core-2.3.04
-rw-r--r--metadata/md5-cache/dev-java/avalon-framework-4.2.0-r24
-rw-r--r--metadata/md5-cache/dev-java/avalon-logkit-2.1-r94
-rw-r--r--metadata/md5-cache/dev-java/classmate-0.9.0-r114
-rw-r--r--metadata/md5-cache/dev-java/classmate-1.2.014
-rw-r--r--metadata/md5-cache/dev-java/commons-cli-1.44
-rw-r--r--metadata/md5-cache/dev-java/commons-codec-1.154
-rw-r--r--metadata/md5-cache/dev-java/commons-codec-1.714
-rw-r--r--metadata/md5-cache/dev-java/commons-collections-4.1-r14
-rw-r--r--metadata/md5-cache/dev-java/commons-configuration-1.6-r214
-rw-r--r--metadata/md5-cache/dev-java/commons-io-2.8.04
-rw-r--r--metadata/md5-cache/dev-java/commons-jelly-1.0-r814
-rw-r--r--metadata/md5-cache/dev-java/commons-lang-3.11-r114
-rw-r--r--metadata/md5-cache/dev-java/commons-lang-3.12.04
-rw-r--r--metadata/md5-cache/dev-java/commons-logging-1.2-r34
-rw-r--r--metadata/md5-cache/dev-java/commons-math-3.6.1-r14
-rw-r--r--metadata/md5-cache/dev-java/commons-text-1.94
-rw-r--r--metadata/md5-cache/dev-java/easymock-3.3.1-r14
-rw-r--r--metadata/md5-cache/dev-java/ezmorph-1.0.614
-rw-r--r--metadata/md5-cache/dev-java/ical4j-1.0.514
-rw-r--r--metadata/md5-cache/dev-java/ini4j-0.5.113
-rw-r--r--metadata/md5-cache/dev-java/ini4j-0.5.213
-rw-r--r--metadata/md5-cache/dev-java/jackcess-4.0.04
-rw-r--r--metadata/md5-cache/dev-java/jakartaee-migration-0.2.014
-rw-r--r--metadata/md5-cache/dev-java/jakartaee-migration-1.0.014
-rw-r--r--metadata/md5-cache/dev-java/java-config-2.3.12
-rw-r--r--metadata/md5-cache/dev-java/java-config-99992
-rw-r--r--metadata/md5-cache/dev-java/javatoolkit-0.6.52
-rw-r--r--metadata/md5-cache/dev-java/jaxen-1.1.4-r114
-rw-r--r--metadata/md5-cache/dev-java/jaxen-1.1.6-r24
-rw-r--r--metadata/md5-cache/dev-java/jaxen-1.2.0-r14
-rw-r--r--metadata/md5-cache/dev-java/jdom-2.0.6-r414
-rw-r--r--metadata/md5-cache/dev-java/jdom-2.0.6-r54
-rw-r--r--metadata/md5-cache/dev-java/jflex-1.6.1-r14
-rw-r--r--metadata/md5-cache/dev-java/joda-time-2.10.10-r14
-rw-r--r--metadata/md5-cache/dev-java/joda-time-2.7-r114
-rw-r--r--metadata/md5-cache/dev-java/junitparams-1.1.14
-rw-r--r--metadata/md5-cache/dev-java/jython-2.7.0-r22
-rw-r--r--metadata/md5-cache/dev-java/libreadline-java-0.8.0-r414
-rw-r--r--metadata/md5-cache/dev-java/libreadline-java-0.8.0-r514
-rw-r--r--metadata/md5-cache/dev-java/log4j-1.2.17-r34
-rw-r--r--metadata/md5-cache/dev-java/objenesis-3.24
-rw-r--r--metadata/md5-cache/dev-java/objenesis-test-3.24
-rw-r--r--metadata/md5-cache/dev-java/odfdom-0.8.6-r115
-rw-r--r--metadata/md5-cache/dev-java/openjdk-8.292_p104
-rw-r--r--metadata/md5-cache/dev-java/openjdk-bin-8.292_p104
-rw-r--r--metadata/md5-cache/dev-java/oracle-javamail-1.5.6-r14
-rw-r--r--metadata/md5-cache/dev-java/poi-5.0.04
-rw-r--r--metadata/md5-cache/dev-java/saaj-1.3.19-r214
-rw-r--r--metadata/md5-cache/dev-java/slf4j-api-1.7.30-r14
-rw-r--r--metadata/md5-cache/dev-java/snakeyaml-1.1614
-rw-r--r--metadata/md5-cache/dev-java/snakeyaml-1.28-r14
-rw-r--r--metadata/md5-cache/dev-java/sparsebitset-1.24
-rw-r--r--metadata/md5-cache/dev-java/sun-jai-bin-1.1.3-r214
-rw-r--r--metadata/md5-cache/dev-java/sun-jms-1.1-r214
-rw-r--r--metadata/md5-cache/dev-java/sun-jms-1.1-r315
-rw-r--r--metadata/md5-cache/dev-java/swt-4.1013
-rw-r--r--metadata/md5-cache/dev-java/swt-4.10-r114
-rw-r--r--metadata/md5-cache/dev-java/tapestry-3.0.4-r313
-rw-r--r--metadata/md5-cache/dev-java/tomcat-servlet-api-10.0.613
-rw-r--r--metadata/md5-cache/dev-java/tomcat-servlet-api-7.0.1084
-rw-r--r--metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.654
-rw-r--r--metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.6613
-rw-r--r--metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.454
-rw-r--r--metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.4613
-rw-r--r--metadata/md5-cache/dev-java/trident-1.3-r115
-rw-r--r--metadata/md5-cache/dev-java/velocity-1.7-r214
-rw-r--r--metadata/md5-cache/dev-java/velocity-2.34
-rw-r--r--metadata/md5-cache/dev-java/xom-1.2.1014
-rw-r--r--metadata/md5-cache/dev-java/xom-1.3.213
-rw-r--r--metadata/md5-cache/dev-java/xom-1.3.74
79 files changed, 228 insertions, 460 deletions
diff --git a/metadata/md5-cache/dev-java/Manifest.gz b/metadata/md5-cache/dev-java/Manifest.gz
index cbdbfa191f8c..185edc188fb1 100644
--- a/metadata/md5-cache/dev-java/Manifest.gz
+++ b/metadata/md5-cache/dev-java/Manifest.gz
Binary files differ
diff --git a/metadata/md5-cache/dev-java/ant-eclipse-ecj-4.15 b/metadata/md5-cache/dev-java/ant-eclipse-ecj-4.15-r1
index 9a3037f4020c..a78e13df4dc7 100644
--- a/metadata/md5-cache/dev-java/ant-eclipse-ecj-4.15
+++ b/metadata/md5-cache/dev-java/ant-eclipse-ecj-4.15-r1
@@ -1,13 +1,14 @@
+BDEPEND=app-arch/unzip
DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=~dev-java/eclipse-ecj-4.15:4.15 dev-java/ant-core:0 app-arch/unzip >=virtual/jdk-11 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DEPEND=~dev-java/eclipse-ecj-4.15:4.15 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
HOMEPAGE=http://www.eclipse.org/
IUSE=elibc_FreeBSD doc source elibc_FreeBSD
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 )
+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 45c44ec10db6affb3ebee1ac72039888 java-pkg-simple c85bf2d75a5f53e7b39fc9104701ebfb java-utils-2 2440f41421207d084e5e3f1fb001b34e prefix de7d8e2b10085ed5ff09ad70e4753e5c
-_md5_=dbc847767adb43f64442c64be9a9630c
+_md5_=4041cbaac69ff227ee76f74fc42884f8
diff --git a/metadata/md5-cache/dev-java/ant-owanttask-1.3.2 b/metadata/md5-cache/dev-java/ant-owanttask-1.3.2
deleted file mode 100644
index 37775dd1116d..000000000000
--- a/metadata/md5-cache/dev-java/ant-owanttask-1.3.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup
-DEPEND=>=virtual/jdk-1.4 dev-java/xalan >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=ObjectWeb's Ant tasks
-EAPI=5
-HOMEPAGE=http://monolog.objectweb.org
-IUSE=elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=LGPL-2.1
-RDEPEND=>=virtual/jre-1.4 >=dev-java/ant-core-1.7.0 dev-java/xalan >=dev-java/java-config-2.2.0-r3
-SLOT=0
-SRC_URI=http://download.forge.objectweb.org/monolog/ow_util_ant_tasks_1.3.2.zip
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 eapi7-ver f9ec87e93172b25ce65a85303dc06964 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 9f813bb3c47cf2e60619a663b87c5f4e estack 055c42df72f76a4f45ec92b35e83cd56 eutils 2d5b3f4b315094768576b6799e4f926e java-ant-2 51fb0a4707d58382310390ad47ab0ab0 java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-utils-2 2440f41421207d084e5e3f1fb001b34e l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib d410501a125f99ffb560b0c523cd3d1e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator d3fb3ba33acc3bbbdc4d7970227c100d wrapper 4251d4c84c25f59094fd557e0063a974
-_md5_=1d4a8c8b4ed0d651df47c2244753c0f4
diff --git a/metadata/md5-cache/dev-java/antlr-2.7.7-r8 b/metadata/md5-cache/dev-java/antlr-2.7.7-r8
deleted file mode 100644
index 07285c275c27..000000000000
--- a/metadata/md5-cache/dev-java/antlr-2.7.7-r8
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=A parser generator for many languages
-EAPI=6
-HOMEPAGE=https://www.antlr2.org/
-IUSE=examples elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=public-domain
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://www.antlr2.org/download/antlr-2.7.7.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 eapi7-ver f9ec87e93172b25ce65a85303dc06964 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 9f813bb3c47cf2e60619a663b87c5f4e estack 055c42df72f76a4f45ec92b35e83cd56 eutils 2d5b3f4b315094768576b6799e4f926e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-pkg-simple c85bf2d75a5f53e7b39fc9104701ebfb java-utils-2 2440f41421207d084e5e3f1fb001b34e l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib d410501a125f99ffb560b0c523cd3d1e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator d3fb3ba33acc3bbbdc4d7970227c100d wrapper 4251d4c84c25f59094fd557e0063a974
-_md5_=c1fb1c9536e1e3688ea5b0cf87b85081
diff --git a/metadata/md5-cache/dev-java/antlr-2.7.7-r9 b/metadata/md5-cache/dev-java/antlr-2.7.7-r9
new file mode 100644
index 000000000000..afa7845af7fa
--- /dev/null
+++ b/metadata/md5-cache/dev-java/antlr-2.7.7-r9
@@ -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=A parser generator for many languages
+EAPI=7
+HOMEPAGE=https://www.antlr2.org/
+IUSE=examples elibc_FreeBSD doc source elibc_FreeBSD
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=public-domain
+RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+SLOT=0
+SRC_URI=https://www.antlr2.org/download/antlr-2.7.7.tar.gz
+_eclasses_=java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-pkg-simple c85bf2d75a5f53e7b39fc9104701ebfb java-utils-2 2440f41421207d084e5e3f1fb001b34e
+_md5_=d8fade192eda8ecb0e0d73fb744ab0de
diff --git a/metadata/md5-cache/dev-java/antlr-3.2 b/metadata/md5-cache/dev-java/antlr-3.2
deleted file mode 100644
index 149f7499ded8..000000000000
--- a/metadata/md5-cache/dev-java/antlr-3.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test unpack
-DEPEND=>=dev-java/antlr-2.7.7-r7:0 dev-java/stringtemplate:0 >=virtual/jdk-1.6 test? ( dev-java/junit:4 ) >=dev-java/java-config-2.2.0-r3
-DESCRIPTION=A parser generator for many languages
-EAPI=5
-HOMEPAGE=https://www.antlr3.org/
-IUSE=doc test elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=BSD
-RDEPEND=>=dev-java/antlr-2.7.7-r7:0 dev-java/stringtemplate:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3
-RESTRICT=!test? ( test )
-SLOT=3
-SRC_URI=https://www.antlr3.org/download/antlr-3.2.tar.gz https://www.antlr3.org/download/antlr-3.2.jar
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 eapi7-ver f9ec87e93172b25ce65a85303dc06964 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 9f813bb3c47cf2e60619a663b87c5f4e estack 055c42df72f76a4f45ec92b35e83cd56 eutils 2d5b3f4b315094768576b6799e4f926e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-pkg-simple c85bf2d75a5f53e7b39fc9104701ebfb java-utils-2 2440f41421207d084e5e3f1fb001b34e l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib d410501a125f99ffb560b0c523cd3d1e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator d3fb3ba33acc3bbbdc4d7970227c100d wrapper 4251d4c84c25f59094fd557e0063a974
-_md5_=10f18d1ad5a2642f00c66be5ce606723
diff --git a/metadata/md5-cache/dev-java/antlr-3.2-r1 b/metadata/md5-cache/dev-java/antlr-3.2-r1
new file mode 100644
index 000000000000..b125b5966631
--- /dev/null
+++ b/metadata/md5-cache/dev-java/antlr-3.2-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install preinst prepare setup test unpack
+DEPEND=>=dev-java/antlr-2.7.7-r7:0 dev-java/stringtemplate:0 >=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=elibc_FreeBSD doc test elibc_FreeBSD
+KEYWORDS=amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=BSD
+RDEPEND=>=dev-java/antlr-2.7.7-r7:0 dev-java/stringtemplate:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3
+RESTRICT=!test? ( test )
+SLOT=3
+SRC_URI=https://www.antlr3.org/download/antlr-3.2.tar.gz https://www.antlr3.org/download/antlr-3.2.jar
+_eclasses_=java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-pkg-simple c85bf2d75a5f53e7b39fc9104701ebfb java-utils-2 2440f41421207d084e5e3f1fb001b34e
+_md5_=720d399a9afd6dadf37b6f45e4f3d2be
diff --git a/metadata/md5-cache/dev-java/apt-mirror-1.0-r1 b/metadata/md5-cache/dev-java/apt-mirror-1.0-r1
deleted file mode 100644
index bc4993d426fb..000000000000
--- a/metadata/md5-cache/dev-java/apt-mirror-1.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Annotation processing apt mirror API introduced in J2SE 5.0
-EAPI=5
-HOMEPAGE=http://aptmirrorapi.dev.java.net/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=BSD
-RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://gentoo/apt-mirror-1.0.tar.bz2
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 eapi7-ver f9ec87e93172b25ce65a85303dc06964 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 9f813bb3c47cf2e60619a663b87c5f4e estack 055c42df72f76a4f45ec92b35e83cd56 eutils 2d5b3f4b315094768576b6799e4f926e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-pkg-simple c85bf2d75a5f53e7b39fc9104701ebfb java-utils-2 2440f41421207d084e5e3f1fb001b34e l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib d410501a125f99ffb560b0c523cd3d1e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator d3fb3ba33acc3bbbdc4d7970227c100d wrapper 4251d4c84c25f59094fd557e0063a974
-_md5_=a7de7f688f5cd7929b870f72f332a77d
diff --git a/metadata/md5-cache/dev-java/assertj-core-2.3.0 b/metadata/md5-cache/dev-java/assertj-core-2.3.0
index fd2eab41bf65..adda0ef0dd7d 100644
--- a/metadata/md5-cache/dev-java/assertj-core-2.3.0
+++ b/metadata/md5-cache/dev-java/assertj-core-2.3.0
@@ -4,10 +4,10 @@ DESCRIPTION=Java library that provides a fluent interface for writing assertions
EAPI=5
HOMEPAGE=http://joel-costigliola.github.io/assertj/
IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
LICENSE=Apache-2.0
RDEPEND=dev-java/cglib:3 dev-java/junit:4 >=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=2
SRC_URI=https://github.com/joel-costigliola/assertj-core/archive/assertj-core-2.3.0.tar.gz
_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 eapi7-ver f9ec87e93172b25ce65a85303dc06964 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 9f813bb3c47cf2e60619a663b87c5f4e estack 055c42df72f76a4f45ec92b35e83cd56 eutils 2d5b3f4b315094768576b6799e4f926e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-pkg-simple c85bf2d75a5f53e7b39fc9104701ebfb java-utils-2 2440f41421207d084e5e3f1fb001b34e l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib d410501a125f99ffb560b0c523cd3d1e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator d3fb3ba33acc3bbbdc4d7970227c100d wrapper 4251d4c84c25f59094fd557e0063a974
-_md5_=37ee7dc2d845089ec735713fc845be8d
+_md5_=3a8818f75b868073829460ec15d735c8
diff --git a/metadata/md5-cache/dev-java/avalon-framework-4.2.0-r2 b/metadata/md5-cache/dev-java/avalon-framework-4.2.0-r2
index 36febfab7508..f15d71b664e0 100644
--- a/metadata/md5-cache/dev-java/avalon-framework-4.2.0-r2
+++ b/metadata/md5-cache/dev-java/avalon-framework-4.2.0-r2
@@ -4,10 +4,10 @@ DESCRIPTION=Avalon Framework
EAPI=5
HOMEPAGE=http://avalon.apache.org/
IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=amd64 arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
LICENSE=Apache-2.0
RDEPEND=>=virtual/jre-1.4 dev-java/avalon-logkit:2.0 dev-java/log4j:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=4.2
SRC_URI=mirror://apache/avalon/avalon-framework/source/avalon-framework-4.2.0-src.tar.gz
_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 eapi7-ver f9ec87e93172b25ce65a85303dc06964 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 9f813bb3c47cf2e60619a663b87c5f4e estack 055c42df72f76a4f45ec92b35e83cd56 eutils 2d5b3f4b315094768576b6799e4f926e java-ant-2 51fb0a4707d58382310390ad47ab0ab0 java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-utils-2 2440f41421207d084e5e3f1fb001b34e l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib d410501a125f99ffb560b0c523cd3d1e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator d3fb3ba33acc3bbbdc4d7970227c100d wrapper 4251d4c84c25f59094fd557e0063a974
-_md5_=676c5414049fbb4588c8e2b56dfa49e5
+_md5_=04d73772ce9bc5e8f8897c2310c048b1
diff --git a/metadata/md5-cache/dev-java/avalon-logkit-2.1-r9 b/metadata/md5-cache/dev-java/avalon-logkit-2.1-r9
index 971e040cb10a..9c8b648c125f 100644
--- a/metadata/md5-cache/dev-java/avalon-logkit-2.1-r9
+++ b/metadata/md5-cache/dev-java/avalon-logkit-2.1-r9
@@ -4,11 +4,11 @@ DESCRIPTION=Easy-to-use Java logging toolkit
EAPI=7
HOMEPAGE=https://avalon.apache.org/closed.html
IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=amd64 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/oracle-javamail:0 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 ) !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 51fb0a4707d58382310390ad47ab0ab0 java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-utils-2 2440f41421207d084e5e3f1fb001b34e multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
-_md5_=fa8bf19b7292196f91f39acfb35254bc
+_md5_=a28c663625fe268fd75de4a747902ad7
diff --git a/metadata/md5-cache/dev-java/classmate-0.9.0-r1 b/metadata/md5-cache/dev-java/classmate-0.9.0-r1
deleted file mode 100644
index 068d0f55fd44..000000000000
--- a/metadata/md5-cache/dev-java/classmate-0.9.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test unpack
-DEPEND=>=virtual/jdk-1.6 test? ( dev-java/junit:4 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Zero-dependency Java library for accurately introspecting type information
-EAPI=5
-HOMEPAGE=https://github.com/cowtowncoder/java-classmate/
-IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/cowtowncoder/java-classmate/archive/classmate-0.9.0.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 eapi7-ver f9ec87e93172b25ce65a85303dc06964 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 9f813bb3c47cf2e60619a663b87c5f4e estack 055c42df72f76a4f45ec92b35e83cd56 eutils 2d5b3f4b315094768576b6799e4f926e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-pkg-simple c85bf2d75a5f53e7b39fc9104701ebfb java-utils-2 2440f41421207d084e5e3f1fb001b34e l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib d410501a125f99ffb560b0c523cd3d1e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf vcs-snapshot b1abf460a493fc59ebb25de0df3f09dd versionator d3fb3ba33acc3bbbdc4d7970227c100d wrapper 4251d4c84c25f59094fd557e0063a974
-_md5_=9b59d844cb5737177cf19ef1c1d0268f
diff --git a/metadata/md5-cache/dev-java/classmate-1.2.0 b/metadata/md5-cache/dev-java/classmate-1.2.0
deleted file mode 100644
index 43f8261712cc..000000000000
--- a/metadata/md5-cache/dev-java/classmate-1.2.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.6 test? ( dev-java/junit:4 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Zero-dependency Java library for accurately introspecting type information
-EAPI=6
-HOMEPAGE=https://github.com/cowtowncoder/java-classmate/
-IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/cowtowncoder/java-classmate/archive/classmate-1.2.0.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 eapi7-ver f9ec87e93172b25ce65a85303dc06964 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 9f813bb3c47cf2e60619a663b87c5f4e estack 055c42df72f76a4f45ec92b35e83cd56 eutils 2d5b3f4b315094768576b6799e4f926e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-pkg-simple c85bf2d75a5f53e7b39fc9104701ebfb java-utils-2 2440f41421207d084e5e3f1fb001b34e l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib d410501a125f99ffb560b0c523cd3d1e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator d3fb3ba33acc3bbbdc4d7970227c100d wrapper 4251d4c84c25f59094fd557e0063a974
-_md5_=f4d98403e4df9389474129423cc458af
diff --git a/metadata/md5-cache/dev-java/commons-cli-1.4 b/metadata/md5-cache/dev-java/commons-cli-1.4
index 67dfe8723aa2..fb7f6e80a195 100644
--- a/metadata/md5-cache/dev-java/commons-cli-1.4
+++ b/metadata/md5-cache/dev-java/commons-cli-1.4
@@ -4,11 +4,11 @@ DESCRIPTION=A Java library for working with the command line arguments and optio
EAPI=6
HOMEPAGE=http://commons.apache.org/cli/
IUSE=test elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+KEYWORDS=amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
LICENSE=Apache-2.0
RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
RESTRICT=!test? ( test )
SLOT=1
SRC_URI=mirror://apache/commons/cli/source/commons-cli-1.4-src.tar.gz
_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 eapi7-ver f9ec87e93172b25ce65a85303dc06964 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 9f813bb3c47cf2e60619a663b87c5f4e estack 055c42df72f76a4f45ec92b35e83cd56 eutils 2d5b3f4b315094768576b6799e4f926e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-pkg-simple c85bf2d75a5f53e7b39fc9104701ebfb java-utils-2 2440f41421207d084e5e3f1fb001b34e l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib d410501a125f99ffb560b0c523cd3d1e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator d3fb3ba33acc3bbbdc4d7970227c100d wrapper 4251d4c84c25f59094fd557e0063a974
-_md5_=f03b466afae50645403f760e33fb9da9
+_md5_=747c6f20b31bfd0dce15029505d9f123
diff --git a/metadata/md5-cache/dev-java/commons-codec-1.15 b/metadata/md5-cache/dev-java/commons-codec-1.15
index cea366a7517a..a191a1e195b7 100644
--- a/metadata/md5-cache/dev-java/commons-codec-1.15
+++ b/metadata/md5-cache/dev-java/commons-codec-1.15
@@ -4,11 +4,11 @@ DESCRIPTION=Implementations of common encoders and decoders in Java
EAPI=7
HOMEPAGE=https://commons.apache.org/proper/commons-codec/
IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=~amd64 ~arm64 ppc64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 arm64 ppc64 x86 ~amd64-linux ~x86-linux
LICENSE=Apache-2.0
RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
RESTRICT=!test? ( test ) !test? ( test )
SLOT=0
SRC_URI=mirror://apache/commons/codec/source/commons-codec-1.15-src.tar.gz -> commons-codec-1.15.tar.gz
_eclasses_=java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-pkg-simple c85bf2d75a5f53e7b39fc9104701ebfb java-utils-2 2440f41421207d084e5e3f1fb001b34e
-_md5_=6265e1bc08a3f51402368d5d9888e71d
+_md5_=0c6a54bb2e203461e9d15cdeac1c9459
diff --git a/metadata/md5-cache/dev-java/commons-codec-1.7 b/metadata/md5-cache/dev-java/commons-codec-1.7
deleted file mode 100644
index 346b9918652d..000000000000
--- a/metadata/md5-cache/dev-java/commons-codec-1.7
+++ /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/junit:4 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Implementations of common encoders and decoders in Java
-EAPI=5
-HOMEPAGE=http://commons.apache.org/codec
-IUSE=test elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86 ~amd64-linux ~x86-linux
-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=mirror://apache/commons/codec/source/commons-codec-1.7-src.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 eapi7-ver f9ec87e93172b25ce65a85303dc06964 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 9f813bb3c47cf2e60619a663b87c5f4e estack 055c42df72f76a4f45ec92b35e83cd56 eutils 2d5b3f4b315094768576b6799e4f926e java-ant-2 51fb0a4707d58382310390ad47ab0ab0 java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-utils-2 2440f41421207d084e5e3f1fb001b34e l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib d410501a125f99ffb560b0c523cd3d1e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator d3fb3ba33acc3bbbdc4d7970227c100d wrapper 4251d4c84c25f59094fd557e0063a974
-_md5_=1e818c1c69c427169f3e1e455004480e
diff --git a/metadata/md5-cache/dev-java/commons-collections-4.1-r1 b/metadata/md5-cache/dev-java/commons-collections-4.1-r1
index 22505c7f3f77..92e85ac55cc5 100644
--- a/metadata/md5-cache/dev-java/commons-collections-4.1-r1
+++ b/metadata/md5-cache/dev-java/commons-collections-4.1-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Extends the JCF classes with new interfaces, implementations and uti
EAPI=7
HOMEPAGE=https://commons.apache.org/collections/
IUSE=test elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~arm64 ppc64 x86
+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 45c44ec10db6affb3ebee1ac72039888 java-pkg-simple c85bf2d75a5f53e7b39fc9104701ebfb java-utils-2 2440f41421207d084e5e3f1fb001b34e
-_md5_=a81f890bfaa695f412ecb4ad8db12c29
+_md5_=14fa4410d2b7e56b5383d8b5d69a06d5
diff --git a/metadata/md5-cache/dev-java/commons-configuration-1.6-r2 b/metadata/md5-cache/dev-java/commons-configuration-1.6-r2
deleted file mode 100644
index ac2a1d234443..000000000000
--- a/metadata/md5-cache/dev-java/commons-configuration-1.6-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 >=dev-java/commons-beanutils-1.7.0:1.7 >=dev-java/commons-codec-1.3:0 >=dev-java/commons-collections-3.1:0 >=dev-java/commons-digester-1.8:0 >=dev-java/commons-jxpath-1.2:0 >=dev-java/commons-lang-2.4:2.1 >=dev-java/commons-logging-1.1.1:0 java-virtuals/servlet-api:3.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-0.3.0-r2
-DESCRIPTION=Generic interface for reading configuration data from a variety of sources
-EAPI=5
-HOMEPAGE=http://commons.apache.org/configuration/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.6 >=dev-java/commons-beanutils-1.7.0:1.7 >=dev-java/commons-codec-1.3:0 >=dev-java/commons-collections-3.1:0 >=dev-java/commons-digester-1.8:0 >=dev-java/commons-jxpath-1.2:0 >=dev-java/commons-lang-2.4:2.1 >=dev-java/commons-logging-1.1.1:0 java-virtuals/servlet-api:3.0 dev-java/ant-core:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://apache/commons/configuration/source/commons-configuration-1.6-src.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 eapi7-ver f9ec87e93172b25ce65a85303dc06964 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 9f813bb3c47cf2e60619a663b87c5f4e estack 055c42df72f76a4f45ec92b35e83cd56 eutils 2d5b3f4b315094768576b6799e4f926e java-ant-2 51fb0a4707d58382310390ad47ab0ab0 java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-utils-2 2440f41421207d084e5e3f1fb001b34e l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib d410501a125f99ffb560b0c523cd3d1e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator d3fb3ba33acc3bbbdc4d7970227c100d wrapper 4251d4c84c25f59094fd557e0063a974
-_md5_=2ff836049931a66442730975676dee62
diff --git a/metadata/md5-cache/dev-java/commons-io-2.8.0 b/metadata/md5-cache/dev-java/commons-io-2.8.0
index f0568e4def1d..ac0bc51b8ad5 100644
--- a/metadata/md5-cache/dev-java/commons-io-2.8.0
+++ b/metadata/md5-cache/dev-java/commons-io-2.8.0
@@ -4,10 +4,10 @@ DESCRIPTION=Utility classes, stream implementations, file filters, and endian cl
EAPI=7
HOMEPAGE=https://commons.apache.org/proper/commons-io/
IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=amd64 arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-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=1
SRC_URI=mirror://apache/commons/io/source/commons-io-2.8.0-src.tar.gz -> commons-io-2.8.0-sources.tar.gz
_eclasses_=java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-pkg-simple c85bf2d75a5f53e7b39fc9104701ebfb java-utils-2 2440f41421207d084e5e3f1fb001b34e
-_md5_=610047e93e27a6c6b851e50f43027f50
+_md5_=479412693f18d8862e559b8c632c403e
diff --git a/metadata/md5-cache/dev-java/commons-jelly-1.0-r8 b/metadata/md5-cache/dev-java/commons-jelly-1.0-r8
deleted file mode 100644
index b89fc8e1c22a..000000000000
--- a/metadata/md5-cache/dev-java/commons-jelly-1.0-r8
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=dev-java/dom4j:1 dev-java/junit:0 dev-java/jaxen:1.1 dev-java/commons-cli:1 dev-java/commons-lang:0 dev-java/commons-jexl:1.0 dev-java/commons-logging:0 dev-java/commons-discovery:0 dev-java/commons-collections:0 dev-java/commons-beanutils:1.7 dev-java/tomcat-jstl-spec:0 java-virtuals/servlet-api:3.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-0.3.0-r2
-DESCRIPTION=A Java and XML based scripting and processing engine
-EAPI=5
-HOMEPAGE=http://commons.apache.org/jelly/
-IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-java/dom4j:1 dev-java/junit:0 dev-java/jaxen:1.1 dev-java/commons-cli:1 dev-java/commons-lang:0 dev-java/commons-jexl:1.0 dev-java/commons-logging:0 dev-java/commons-discovery:0 dev-java/commons-collections:0 dev-java/commons-beanutils:1.7 dev-java/tomcat-jstl-spec:0 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 ) !test? ( test )
-SLOT=1
-SRC_URI=mirror://apache/jakarta/commons/jelly/source/commons-jelly-1.0-src.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 eapi7-ver f9ec87e93172b25ce65a85303dc06964 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 9f813bb3c47cf2e60619a663b87c5f4e estack 055c42df72f76a4f45ec92b35e83cd56 eutils 2d5b3f4b315094768576b6799e4f926e java-ant-2 51fb0a4707d58382310390ad47ab0ab0 java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-utils-2 2440f41421207d084e5e3f1fb001b34e l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib d410501a125f99ffb560b0c523cd3d1e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator d3fb3ba33acc3bbbdc4d7970227c100d wrapper 4251d4c84c25f59094fd557e0063a974
-_md5_=76d1ff917b5bc59e069d797c9c9b4411
diff --git a/metadata/md5-cache/dev-java/commons-lang-3.11-r1 b/metadata/md5-cache/dev-java/commons-lang-3.11-r1
deleted file mode 100644
index 85119c9d34e0..000000000000
--- a/metadata/md5-cache/dev-java/commons-lang-3.11-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=dev-java/easymock:3.2 dev-java/commons-io:1 >=virtual/jdk-1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Commons components to manipulate core java classes
-EAPI=7
-HOMEPAGE=https://commons.apache.org/lang
-IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris
-LICENSE=Apache-2.0
-RDEPEND=dev-java/easymock:3.2 dev-java/commons-io:1 >=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=3.6
-SRC_URI=mirror://apache/commons/lang/source/commons-lang3-3.11-src.tar.gz -> commons-lang-3.11.tar.gz
-_eclasses_=java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-pkg-simple c85bf2d75a5f53e7b39fc9104701ebfb java-utils-2 2440f41421207d084e5e3f1fb001b34e
-_md5_=b131b08db6af9c13d8d04020cac38ee7
diff --git a/metadata/md5-cache/dev-java/commons-lang-3.12.0 b/metadata/md5-cache/dev-java/commons-lang-3.12.0
index ed136782ccef..838530451eb6 100644
--- a/metadata/md5-cache/dev-java/commons-lang-3.12.0
+++ b/metadata/md5-cache/dev-java/commons-lang-3.12.0
@@ -4,10 +4,10 @@ DESCRIPTION=Commons components to manipulate core java classes
EAPI=7
HOMEPAGE=https://commons.apache.org/proper/commons-lang/
IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris
+KEYWORDS=amd64 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 )
SLOT=3.6
SRC_URI=mirror://apache/commons/lang/source/commons-lang3-3.12.0-src.tar.gz -> commons-lang-3.12.0-sources.tar.gz
_eclasses_=java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-pkg-simple c85bf2d75a5f53e7b39fc9104701ebfb java-utils-2 2440f41421207d084e5e3f1fb001b34e
-_md5_=8f66e3740c0fc4ffd994a45285daddd9
+_md5_=5846b31677b487670c7b205cedcd1f62
diff --git a/metadata/md5-cache/dev-java/commons-logging-1.2-r3 b/metadata/md5-cache/dev-java/commons-logging-1.2-r3
index 6989ca711627..3473dd429ebd 100644
--- a/metadata/md5-cache/dev-java/commons-logging-1.2-r3
+++ b/metadata/md5-cache/dev-java/commons-logging-1.2-r3
@@ -4,11 +4,11 @@ DESCRIPTION=An ultra-thin bridge between different Java logging libraries
EAPI=7
HOMEPAGE=https://commons.apache.org/logging/
IUSE=avalon-framework avalon-logkit log4j servletapi test elibc_FreeBSD doc source elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
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:0 ) servletapi? ( dev-java/tomcat-servlet-api:4.0 ) >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
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 51fb0a4707d58382310390ad47ab0ab0 java-osgi 303099c377fa3ce30c97f39ebecb351f java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-utils-2 2440f41421207d084e5e3f1fb001b34e multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
-_md5_=7b5498eebc6200f3138b81ff76134178
+_md5_=af5d44f08d795a81bbf4b1b50c8803af
diff --git a/metadata/md5-cache/dev-java/commons-math-3.6.1-r1 b/metadata/md5-cache/dev-java/commons-math-3.6.1-r1
index f634dd357e1a..a9865657e58b 100644
--- a/metadata/md5-cache/dev-java/commons-math-3.6.1-r1
+++ b/metadata/md5-cache/dev-java/commons-math-3.6.1-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Lightweight, self-contained mathematics and statistics components
EAPI=7
HOMEPAGE=https://commons.apache.org/math/
IUSE=elibc_FreeBSD doc examples source elibc_FreeBSD
-KEYWORDS=amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 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=3
SRC_URI=https://repo1.maven.org/maven2/org/apache/commons/commons-math3/3.6.1/commons-math3-3.6.1-sources.jar -> commons-math3-3.6.1.jar
_eclasses_=java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-pkg-simple c85bf2d75a5f53e7b39fc9104701ebfb java-utils-2 2440f41421207d084e5e3f1fb001b34e
-_md5_=cc44018f39a03fd03394d5f462505d89
+_md5_=e18abc2956a4a915ffc9079f61dafb1a
diff --git a/metadata/md5-cache/dev-java/commons-text-1.9 b/metadata/md5-cache/dev-java/commons-text-1.9
index 8fc1d070a41d..48c73ee5ef6a 100644
--- a/metadata/md5-cache/dev-java/commons-text-1.9
+++ b/metadata/md5-cache/dev-java/commons-text-1.9
@@ -4,10 +4,10 @@ DESCRIPTION=Apache Commons Text is a library focused on algorithms working on st
EAPI=7
HOMEPAGE=https://commons.apache.org/proper/commons-text
IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~ppc64 ~x86
+KEYWORDS=amd64 ppc64 x86
LICENSE=Apache-2.0
RDEPEND=>=virtual/jre-1.8:* >=dev-java/commons-lang-3.11:3.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=0
SRC_URI=https://downloads.apache.org//commons/text/source/commons-text-1.9-src.tar.gz -> commons-text-1.9-sources.tar.gz
_eclasses_=java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-pkg-simple c85bf2d75a5f53e7b39fc9104701ebfb java-utils-2 2440f41421207d084e5e3f1fb001b34e
-_md5_=8b7deef2f3e57660625fbcb6e441a8a5
+_md5_=4979a90ffe1547a2454cede2c791891b
diff --git a/metadata/md5-cache/dev-java/easymock-3.3.1-r1 b/metadata/md5-cache/dev-java/easymock-3.3.1-r1
index c0f053b99d62..b6a6a49c4661 100644
--- a/metadata/md5-cache/dev-java/easymock-3.3.1-r1
+++ b/metadata/md5-cache/dev-java/easymock-3.3.1-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Mock Objects for interfaces in JUnit tests by generating them on the
EAPI=7
HOMEPAGE=https://easymock.org/
IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=amd64 ~arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64 x86
LICENSE=Apache-2.0
RDEPEND=>=virtual/jre-1.8:* dev-java/cglib:3 dev-java/junit:4 dev-java/objenesis:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
RESTRICT=!test? ( test ) !test? ( test )
SLOT=3.2
SRC_URI=https://github.com/easymock/easymock/archive/refs/tags/easymock-3.3.1.tar.gz
_eclasses_=java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-pkg-simple c85bf2d75a5f53e7b39fc9104701ebfb java-utils-2 2440f41421207d084e5e3f1fb001b34e
-_md5_=f0cb9df7c49da6e9b503d9a35281c971
+_md5_=30f053791c5ee79ae6b26dc0f9281266
diff --git a/metadata/md5-cache/dev-java/ezmorph-1.0.6 b/metadata/md5-cache/dev-java/ezmorph-1.0.6
deleted file mode 100644
index a4b9df25e0f2..000000000000
--- a/metadata/md5-cache/dev-java/ezmorph-1.0.6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.4 app-arch/unzip dev-java/commons-lang:2.1 dev-java/commons-beanutils:1.7 dev-java/commons-logging:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=A simple Java library for transforming an Object to another Object
-EAPI=5
-HOMEPAGE=http://ezmorph.sourceforge.net/
-IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.4 dev-java/commons-lang:2.1 dev-java/commons-beanutils:1.7 dev-java/commons-logging:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://sourceforge/ezmorph/ezmorph-1.0.6-sources.jar
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 eapi7-ver f9ec87e93172b25ce65a85303dc06964 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 9f813bb3c47cf2e60619a663b87c5f4e estack 055c42df72f76a4f45ec92b35e83cd56 eutils 2d5b3f4b315094768576b6799e4f926e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-pkg-simple c85bf2d75a5f53e7b39fc9104701ebfb java-utils-2 2440f41421207d084e5e3f1fb001b34e l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib d410501a125f99ffb560b0c523cd3d1e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator d3fb3ba33acc3bbbdc4d7970227c100d wrapper 4251d4c84c25f59094fd557e0063a974
-_md5_=1f4eaefc31a1ed344d1762e4be2f992d
diff --git a/metadata/md5-cache/dev-java/ical4j-1.0.5 b/metadata/md5-cache/dev-java/ical4j-1.0.5
deleted file mode 100644
index 0488e3e5cfec..000000000000
--- a/metadata/md5-cache/dev-java/ical4j-1.0.5
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.4 dev-java/emma:0 dev-java/commons-logging:0 dev-java/commons-codec:0 dev-java/commons-lang:2.1 dev-java/backport-util-concurrent:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=a Java library for handling iCalendar data streams
-EAPI=5
-HOMEPAGE=http://ical4j.sourceforge.net/
-IUSE=elibc_FreeBSD doc examples source elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=BSD
-RDEPEND=>=virtual/jre-1.4 dev-java/commons-logging:0 dev-java/commons-codec:0 dev-java/commons-lang:2.1 dev-java/backport-util-concurrent:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://sourceforge/ical4j/ical4j-1.0.5-src.tar.bz2
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 eapi7-ver f9ec87e93172b25ce65a85303dc06964 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 9f813bb3c47cf2e60619a663b87c5f4e estack 055c42df72f76a4f45ec92b35e83cd56 eutils 2d5b3f4b315094768576b6799e4f926e java-ant-2 51fb0a4707d58382310390ad47ab0ab0 java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-utils-2 2440f41421207d084e5e3f1fb001b34e l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib d410501a125f99ffb560b0c523cd3d1e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator d3fb3ba33acc3bbbdc4d7970227c100d wrapper 4251d4c84c25f59094fd557e0063a974
-_md5_=632a1b19bf7daa3089f6e603a8828a93
diff --git a/metadata/md5-cache/dev-java/ini4j-0.5.1 b/metadata/md5-cache/dev-java/ini4j-0.5.1
deleted file mode 100644
index 6af4aba8d5b2..000000000000
--- a/metadata/md5-cache/dev-java/ini4j-0.5.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=Simple Java API Windows style .ini file handling
-EAPI=5
-HOMEPAGE=http://ini4j.sourceforge.net/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-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/org/ini4j/ini4j/0.5.1/ini4j-0.5.1-sources.jar -> ini4j-0.5.1.jar
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 eapi7-ver f9ec87e93172b25ce65a85303dc06964 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 9f813bb3c47cf2e60619a663b87c5f4e estack 055c42df72f76a4f45ec92b35e83cd56 eutils 2d5b3f4b315094768576b6799e4f926e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-pkg-simple c85bf2d75a5f53e7b39fc9104701ebfb java-utils-2 2440f41421207d084e5e3f1fb001b34e l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib d410501a125f99ffb560b0c523cd3d1e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator d3fb3ba33acc3bbbdc4d7970227c100d wrapper 4251d4c84c25f59094fd557e0063a974
-_md5_=4e57727d6d1179fa2de3452dcedbb991
diff --git a/metadata/md5-cache/dev-java/ini4j-0.5.2 b/metadata/md5-cache/dev-java/ini4j-0.5.2
deleted file mode 100644
index 84b0d0972fc5..000000000000
--- a/metadata/md5-cache/dev-java/ini4j-0.5.2
+++ /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=Simple Java API Windows style .ini file handling
-EAPI=6
-HOMEPAGE=http://ini4j.sourceforge.net/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-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/org/ini4j/ini4j/0.5.2/ini4j-0.5.2-sources.jar -> ini4j-0.5.2.jar
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 eapi7-ver f9ec87e93172b25ce65a85303dc06964 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 9f813bb3c47cf2e60619a663b87c5f4e estack 055c42df72f76a4f45ec92b35e83cd56 eutils 2d5b3f4b315094768576b6799e4f926e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-pkg-simple c85bf2d75a5f53e7b39fc9104701ebfb java-utils-2 2440f41421207d084e5e3f1fb001b34e l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib d410501a125f99ffb560b0c523cd3d1e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator d3fb3ba33acc3bbbdc4d7970227c100d wrapper 4251d4c84c25f59094fd557e0063a974
-_md5_=86857945d7c3df6e87a01cb4838fd645
diff --git a/metadata/md5-cache/dev-java/jackcess-4.0.0 b/metadata/md5-cache/dev-java/jackcess-4.0.0
index 0dee198ef7de..8d4733b10ed1 100644
--- a/metadata/md5-cache/dev-java/jackcess-4.0.0
+++ b/metadata/md5-cache/dev-java/jackcess-4.0.0
@@ -4,11 +4,11 @@ DESCRIPTION=A pure Java library for reading from and writing to MS Access databa
EAPI=7
HOMEPAGE=https://jackcess.sourceforge.io
IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=~amd64 ~arm64 ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=amd64 arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos
LICENSE=Apache-2.0
RDEPEND=>=virtual/jre-1.8:* >=dev-java/commons-lang-3.11:3.6 >=dev-java/commons-logging-1.2:0 >=dev-java/poi-5.0.0:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
RESTRICT=!test? ( test ) !test? ( test )
SLOT=1
SRC_URI=https://github.com/jahlborn/jackcess/archive/refs/tags/jackcess-4.0.0.tar.gz -> jackcess-4.0.0-sources.tar.gz
_eclasses_=java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-pkg-simple c85bf2d75a5f53e7b39fc9104701ebfb java-utils-2 2440f41421207d084e5e3f1fb001b34e
-_md5_=fe5bb35f9307f113d26fa0b919d5b050
+_md5_=a956447862f653d12a9accfb0cf81c6b
diff --git a/metadata/md5-cache/dev-java/jakartaee-migration-0.2.0 b/metadata/md5-cache/dev-java/jakartaee-migration-0.2.0
deleted file mode 100644
index ea767feab5f0..000000000000
--- a/metadata/md5-cache/dev-java/jakartaee-migration-0.2.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.8:* dev-java/ant-core:0 >=dev-java/bcel-6.5.0: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 ) test? ( dev-java/junit:4 )
-DESCRIPTION=Apache Tomcat tool for migration from Java EE 8 to Jakarta EE 9.
-EAPI=7
-HOMEPAGE=https://tomcat.apache.org
-IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.8:* dev-java/ant-core:0 >=dev-java/bcel-6.5.0: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 ) !test? ( test )
-SLOT=0
-SRC_URI=mirror://apache/tomcat/jakartaee-migration/v0.2.0/source/jakartaee-migration-0.2.0-src.tar.gz -> jakartaee-migration-0.2.0-sources.tar.gz
-_eclasses_=java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-pkg-simple c85bf2d75a5f53e7b39fc9104701ebfb java-utils-2 2440f41421207d084e5e3f1fb001b34e
-_md5_=497ca1227dc5352361a2732dba9e5cfc
diff --git a/metadata/md5-cache/dev-java/jakartaee-migration-1.0.0 b/metadata/md5-cache/dev-java/jakartaee-migration-1.0.0
new file mode 100644
index 000000000000..0fb8d10afa00
--- /dev/null
+++ b/metadata/md5-cache/dev-java/jakartaee-migration-1.0.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=>=virtual/jdk-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 ) test? ( dev-java/junit:4 )
+DESCRIPTION=Apache Tomcat tool for migration from Java EE 8 to Jakarta EE 9.
+EAPI=7
+HOMEPAGE=https://tomcat.apache.org
+IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
+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 ) !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 45c44ec10db6affb3ebee1ac72039888 java-pkg-simple c85bf2d75a5f53e7b39fc9104701ebfb java-utils-2 2440f41421207d084e5e3f1fb001b34e
+_md5_=863dcc34eb7ccaa8877b78db26a5c4cf
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 015bcd415946..8207f3bcb618 100644
--- a/metadata/md5-cache/dev-java/java-config-2.3.1
+++ b/metadata/md5-cache/dev-java/java-config-2.3.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targe
RESTRICT=!test? ( test )
SLOT=2
SRC_URI=https://gitweb.gentoo.org/proj/java-config.git/snapshot/java-config-2.3.1.tar.gz
-_eclasses_=distutils-r1 f0ca511df3fddd316b783632b804e8fb multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 26e4ad0a4190b14f70973dc253e86535 python-utils-r1 20c4a380a6193a089c8c432f3e5f8402 toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=distutils-r1 f0ca511df3fddd316b783632b804e8fb multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 26e4ad0a4190b14f70973dc253e86535 python-utils-r1 d273d56dc725880edbeb1f6389faf5f1 toolchain-funcs 24921b57d6561d87cbef4916a296ada4
_md5_=210d5b2b442929480c4cf07ae3629c8a
diff --git a/metadata/md5-cache/dev-java/java-config-9999 b/metadata/md5-cache/dev-java/java-config-9999
index 5f69823df9e4..14e6e159bd86 100644
--- a/metadata/md5-cache/dev-java/java-config-9999
+++ b/metadata/md5-cache/dev-java/java-config-9999
@@ -11,5 +11,5 @@ RDEPEND=!dev-java/java-config-wrapper sys-apps/baselayout-java sys-apps/portage[
REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
RESTRICT=!test? ( test )
SLOT=2
-_eclasses_=distutils-r1 f0ca511df3fddd316b783632b804e8fb git-r3 b8e8c92aa5fe8df7187e466138eb4e52 multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 26e4ad0a4190b14f70973dc253e86535 python-utils-r1 20c4a380a6193a089c8c432f3e5f8402 toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=distutils-r1 f0ca511df3fddd316b783632b804e8fb git-r3 b8e8c92aa5fe8df7187e466138eb4e52 multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 26e4ad0a4190b14f70973dc253e86535 python-utils-r1 d273d56dc725880edbeb1f6389faf5f1 toolchain-funcs 24921b57d6561d87cbef4916a296ada4
_md5_=44d8ca396b93962c816cbd33dbab0ade
diff --git a/metadata/md5-cache/dev-java/javatoolkit-0.6.5 b/metadata/md5-cache/dev-java/javatoolkit-0.6.5
index 65285f6987b0..bf6b4e7350c6 100644
--- a/metadata/md5-cache/dev-java/javatoolkit-0.6.5
+++ b/metadata/md5-cache/dev-java/javatoolkit-0.6.5
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_7? ( dev-lang/python:3.7[xml(+)] ) python_targets
REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
SLOT=0
SRC_URI=https://gitweb.gentoo.org/proj/javatoolkit.git/snapshot/javatoolkit-0.6.5.tar.bz2
-_eclasses_=distutils-r1 f0ca511df3fddd316b783632b804e8fb multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 prefix de7d8e2b10085ed5ff09ad70e4753e5c python-r1 26e4ad0a4190b14f70973dc253e86535 python-utils-r1 20c4a380a6193a089c8c432f3e5f8402 toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=distutils-r1 f0ca511df3fddd316b783632b804e8fb multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 prefix de7d8e2b10085ed5ff09ad70e4753e5c python-r1 26e4ad0a4190b14f70973dc253e86535 python-utils-r1 d273d56dc725880edbeb1f6389faf5f1 toolchain-funcs 24921b57d6561d87cbef4916a296ada4
_md5_=8d93ce5ba68a58cb642197df026bb2b8
diff --git a/metadata/md5-cache/dev-java/jaxen-1.1.4-r1 b/metadata/md5-cache/dev-java/jaxen-1.1.4-r1
deleted file mode 100644
index 51b6eeb1e0d8..000000000000
--- a/metadata/md5-cache/dev-java/jaxen-1.1.4-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=dev-java/xom:0 dev-java/jdom:0 dev-java/dom4j:1 test? ( dev-java/ant-junit:0 ) >=virtual/jdk-1.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=A Java XPath Engine
-EAPI=5
-HOMEPAGE=http://jaxen.org
-IUSE=elibc_FreeBSD doc examples source test elibc_FreeBSD
-KEYWORDS=amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris
-LICENSE=JDOM
-RDEPEND=dev-java/xom:0 dev-java/jdom:0 dev-java/dom4j:1 >=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=1.1
-SRC_URI=http://dist.codehaus.org/jaxen/distributions/jaxen-1.1.4-src.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 eapi7-ver f9ec87e93172b25ce65a85303dc06964 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 9f813bb3c47cf2e60619a663b87c5f4e estack 055c42df72f76a4f45ec92b35e83cd56 eutils 2d5b3f4b315094768576b6799e4f926e java-ant-2 51fb0a4707d58382310390ad47ab0ab0 java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-utils-2 2440f41421207d084e5e3f1fb001b34e l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib d410501a125f99ffb560b0c523cd3d1e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator d3fb3ba33acc3bbbdc4d7970227c100d wrapper 4251d4c84c25f59094fd557e0063a974
-_md5_=c7f498e4e957fd04535cb85b5f54d13d
diff --git a/metadata/md5-cache/dev-java/jaxen-1.1.6-r2 b/metadata/md5-cache/dev-java/jaxen-1.1.6-r2
index b0d7090343c7..a62c73457c31 100644
--- a/metadata/md5-cache/dev-java/jaxen-1.1.6-r2
+++ b/metadata/md5-cache/dev-java/jaxen-1.1.6-r2
@@ -4,10 +4,10 @@ DESCRIPTION=A Java XPath Engine
EAPI=7
HOMEPAGE=https://github.com/codehaus
IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ~arm ~arm64 ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ppc64 x86
LICENSE=JDOM
RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=1.1
SRC_URI=https://repo1.maven.org/maven2/jaxen/jaxen/1.1.6/jaxen-1.1.6-sources.jar -> jaxen-1.1.6.jar
_eclasses_=java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-pkg-simple c85bf2d75a5f53e7b39fc9104701ebfb java-utils-2 2440f41421207d084e5e3f1fb001b34e
-_md5_=b4d4de1bdc2c48c94b1d45073de1a0a9
+_md5_=57d9894267cb7ae7b25eb008838fda23
diff --git a/metadata/md5-cache/dev-java/jaxen-1.2.0-r1 b/metadata/md5-cache/dev-java/jaxen-1.2.0-r1
index f6751d95dc81..df66b454c1af 100644
--- a/metadata/md5-cache/dev-java/jaxen-1.2.0-r1
+++ b/metadata/md5-cache/dev-java/jaxen-1.2.0-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Jaxen is a universal XPath engine for Java.
EAPI=7
HOMEPAGE=http://www.cafeconleche.org/jaxen/
IUSE=dom4j jdom xom elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=amd64 ~arm arm64 ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ppc64 x86
LICENSE=BSD-2
RDEPEND=dom4j? ( dev-java/dom4j:1 ) jdom? ( dev-java/jdom:0 ) xom? ( dev-java/xom:0 ) >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
REQUIRED_USE=test? ( dom4j jdom xom )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test ) !test? ( test )
SLOT=1.2
SRC_URI=https://github.com/jaxen-xpath/jaxen/archive/refs/tags/v1.2.0.tar.gz -> jaxen-1.2.0.tar.gz
_eclasses_=java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-pkg-simple c85bf2d75a5f53e7b39fc9104701ebfb java-utils-2 2440f41421207d084e5e3f1fb001b34e
-_md5_=b78fc31323715df8f4469809b8cf55b4
+_md5_=1a4f51f34bea001f84ddc2780bd6154a
diff --git a/metadata/md5-cache/dev-java/jdom-2.0.6-r4 b/metadata/md5-cache/dev-java/jdom-2.0.6-r4
deleted file mode 100644
index 002035b5922f..000000000000
--- a/metadata/md5-cache/dev-java/jdom-2.0.6-r4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=dev-java/xalan:0 dev-java/jaxen:1.1 dev-java/iso-relax: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-0.3.0-r2
-DESCRIPTION=Java API to manipulate XML data
-EAPI=5
-HOMEPAGE=http://www.jdom.org
-IUSE=test elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ~arm ~arm64 ppc64 x86
-LICENSE=Apache-1.1
-RDEPEND=dev-java/xalan:0 dev-java/jaxen:1.1 dev-java/iso-relax:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=!test? ( test )
-SLOT=2
-SRC_URI=https://github.com/hunterhacker/jdom/archive/JDOM-2.0.6.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 eapi7-ver f9ec87e93172b25ce65a85303dc06964 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 9f813bb3c47cf2e60619a663b87c5f4e estack 055c42df72f76a4f45ec92b35e83cd56 eutils 2d5b3f4b315094768576b6799e4f926e java-ant-2 51fb0a4707d58382310390ad47ab0ab0 java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-utils-2 2440f41421207d084e5e3f1fb001b34e l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib d410501a125f99ffb560b0c523cd3d1e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator d3fb3ba33acc3bbbdc4d7970227c100d wrapper 4251d4c84c25f59094fd557e0063a974
-_md5_=d97911fc1c41a9c1f4efc1d35779f121
diff --git a/metadata/md5-cache/dev-java/jdom-2.0.6-r5 b/metadata/md5-cache/dev-java/jdom-2.0.6-r5
index 857419dbcf53..0d09cc2df6a6 100644
--- a/metadata/md5-cache/dev-java/jdom-2.0.6-r5
+++ b/metadata/md5-cache/dev-java/jdom-2.0.6-r5
@@ -4,11 +4,11 @@ DESCRIPTION=Java API to manipulate XML data
EAPI=7
HOMEPAGE=http://www.jdom.org
IUSE=test elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ~arm arm64 ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ppc64 x86
LICENSE=Apache-1.1
RDEPEND=dev-java/iso-relax:0 dev-java/jaxen:1.2 dev-java/xalan:0 >=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/hunterhacker/jdom/archive/JDOM-2.0.6.tar.gz
_eclasses_=java-ant-2 51fb0a4707d58382310390ad47ab0ab0 java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-utils-2 2440f41421207d084e5e3f1fb001b34e multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
-_md5_=0e84f8fd82dd7cd13d83a7edcc51e6bd
+_md5_=cdba899512bbb81b2bad833fe49a41ae
diff --git a/metadata/md5-cache/dev-java/jflex-1.6.1-r1 b/metadata/md5-cache/dev-java/jflex-1.6.1-r1
index 333d328eaacf..fef0240c4610 100644
--- a/metadata/md5-cache/dev-java/jflex-1.6.1-r1
+++ b/metadata/md5-cache/dev-java/jflex-1.6.1-r1
@@ -4,7 +4,7 @@ DESCRIPTION=JFlex is a lexical analyzer generator for Java
EAPI=7
HOMEPAGE=https://www.jflex.de/
IUSE=examples test vim-syntax elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ~arm ~arm64 ppc64 ~x86 ~ppc-macos ~x64-macos
+KEYWORDS=amd64 ~arm arm64 ppc64 ~x86 ~ppc-macos ~x64-macos
LICENSE=BSD
PDEPEND=dev-java/javacup:0
RDEPEND=>=virtual/jre-1.8:* vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) dev-java/ant-core:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://jflex.de/jflex-1.6.1.tar.gz
_eclasses_=java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-pkg-simple c85bf2d75a5f53e7b39fc9104701ebfb java-utils-2 2440f41421207d084e5e3f1fb001b34e
-_md5_=df1295542ba9736106ed8ec0819c0fcd
+_md5_=2c1c2554aae9cf7899ec3d354f91313d
diff --git a/metadata/md5-cache/dev-java/joda-time-2.10.10-r1 b/metadata/md5-cache/dev-java/joda-time-2.10.10-r1
index 7eb38fe9f2a1..f70346537776 100644
--- a/metadata/md5-cache/dev-java/joda-time-2.10.10-r1
+++ b/metadata/md5-cache/dev-java/joda-time-2.10.10-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Date and time library to replace JDK date handling
EAPI=7
HOMEPAGE=https://www.joda.org/joda-time/
IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=~amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
LICENSE=Apache-2.0
RDEPEND=>=virtual/jre-1.8:* dev-java/joda-convert:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
RESTRICT=!test? ( test ) !test? ( test )
SLOT=0
SRC_URI=https://github.com/JodaOrg/joda-time/archive/refs/tags/v2.10.10.tar.gz -> joda-time-2.10.10.tar.gz
_eclasses_=java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-pkg-simple c85bf2d75a5f53e7b39fc9104701ebfb java-utils-2 2440f41421207d084e5e3f1fb001b34e
-_md5_=79257444964281fbd98e3d7013914ff7
+_md5_=a945221520a356858bb771baa7edc873
diff --git a/metadata/md5-cache/dev-java/joda-time-2.7-r1 b/metadata/md5-cache/dev-java/joda-time-2.7-r1
deleted file mode 100644
index a35f75cdd1fb..000000000000
--- a/metadata/md5-cache/dev-java/joda-time-2.7-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.8 dev-java/joda-convert: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-0.3.0-r2
-DESCRIPTION=A quality open-source replacement for the Java Date and Time classes
-EAPI=7
-HOMEPAGE=https://www.joda.org/joda-time/ https://github.com/JodaOrg/joda-time/
-IUSE=elibc_FreeBSD doc examples source test elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
-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/JodaOrg/joda-time/releases/download/v2.7/joda-time-2.7-dist.tar.gz
-_eclasses_=java-ant-2 51fb0a4707d58382310390ad47ab0ab0 java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-utils-2 2440f41421207d084e5e3f1fb001b34e multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
-_md5_=0fea5f98cbe9f25cbc0724de7d74efb1
diff --git a/metadata/md5-cache/dev-java/junitparams-1.1.1 b/metadata/md5-cache/dev-java/junitparams-1.1.1
index f1d306d0eb3f..3e0767f4a7c4 100644
--- a/metadata/md5-cache/dev-java/junitparams-1.1.1
+++ b/metadata/md5-cache/dev-java/junitparams-1.1.1
@@ -4,11 +4,11 @@ DESCRIPTION=Better parameterised tests for JUnit
EAPI=7
HOMEPAGE=https://github.com/Pragmatists/JUnitParams
IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~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 ) !test? ( test )
SLOT=0
SRC_URI=https://github.com/Pragmatists/JUnitParams/archive/refs/tags/JUnitParams-1.1.1.tar.gz -> junitparams-1.1.1.tar.gz
_eclasses_=java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-pkg-simple c85bf2d75a5f53e7b39fc9104701ebfb java-utils-2 2440f41421207d084e5e3f1fb001b34e
-_md5_=ed51e14ac95d806166c4e7785f58ef70
+_md5_=1b5db49c14f8eafc00f8ebf3e455a097
diff --git a/metadata/md5-cache/dev-java/jython-2.7.0-r2 b/metadata/md5-cache/dev-java/jython-2.7.0-r2
index 61d460ebf1c7..012c90af9180 100644
--- a/metadata/md5-cache/dev-java/jython-2.7.0-r2
+++ b/metadata/md5-cache/dev-java/jython-2.7.0-r2
@@ -10,5 +10,5 @@ RDEPEND=dev-java/antlr:3 dev-java/netty-transport:0 >=dev-java/asm-5:4 dev-java/
RESTRICT=test
SLOT=2.7
SRC_URI=https://search.maven.org/remotecontent?filepath=org/python/jython/2.7.0/jython-2.7.0-sources.jar
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 eapi7-ver f9ec87e93172b25ce65a85303dc06964 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 9f813bb3c47cf2e60619a663b87c5f4e estack 055c42df72f76a4f45ec92b35e83cd56 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic bc2e7662a4a9a8643be851982a837ddc java-ant-2 51fb0a4707d58382310390ad47ab0ab0 java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-utils-2 2440f41421207d084e5e3f1fb001b34e l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib d410501a125f99ffb560b0c523cd3d1e preserve-libs ef207dc62baddfddfd39a164d9797648 python-utils-r1 20c4a380a6193a089c8c432f3e5f8402 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator d3fb3ba33acc3bbbdc4d7970227c100d wrapper 4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 eapi7-ver f9ec87e93172b25ce65a85303dc06964 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 9f813bb3c47cf2e60619a663b87c5f4e estack 055c42df72f76a4f45ec92b35e83cd56 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic bc2e7662a4a9a8643be851982a837ddc java-ant-2 51fb0a4707d58382310390ad47ab0ab0 java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-utils-2 2440f41421207d084e5e3f1fb001b34e l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib d410501a125f99ffb560b0c523cd3d1e preserve-libs ef207dc62baddfddfd39a164d9797648 python-utils-r1 d273d56dc725880edbeb1f6389faf5f1 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator d3fb3ba33acc3bbbdc4d7970227c100d wrapper 4251d4c84c25f59094fd557e0063a974
_md5_=9146b361b1282323dfc5dc8500c35f72
diff --git a/metadata/md5-cache/dev-java/libreadline-java-0.8.0-r4 b/metadata/md5-cache/dev-java/libreadline-java-0.8.0-r4
deleted file mode 100644
index d2d49dee0ff6..000000000000
--- a/metadata/md5-cache/dev-java/libreadline-java-0.8.0-r4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 sys-libs/ncurses:0= >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=A JNI-wrapper to GNU Readline
-EAPI=6
-HOMEPAGE=http://java-readline.sourceforge.net/
-IUSE=elibc_FreeBSD elibc_FreeBSD doc source
-KEYWORDS=amd64 ppc64 x86
-LICENSE=LGPL-2.1
-RDEPEND=>=virtual/jre-1.6 sys-libs/ncurses:0= >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://sourceforge/java-readline/libreadline-java-0.8.0-src.tar.gz -> libreadline-java-0.8.0.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 eapi7-ver f9ec87e93172b25ce65a85303dc06964 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 9f813bb3c47cf2e60619a663b87c5f4e estack 055c42df72f76a4f45ec92b35e83cd56 eutils 2d5b3f4b315094768576b6799e4f926e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-utils-2 2440f41421207d084e5e3f1fb001b34e l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib d410501a125f99ffb560b0c523cd3d1e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator d3fb3ba33acc3bbbdc4d7970227c100d wrapper 4251d4c84c25f59094fd557e0063a974
-_md5_=9c3d4a9decdc960a71290e459826a2f4
diff --git a/metadata/md5-cache/dev-java/libreadline-java-0.8.0-r5 b/metadata/md5-cache/dev-java/libreadline-java-0.8.0-r5
new file mode 100644
index 000000000000..2a161c483eb4
--- /dev/null
+++ b/metadata/md5-cache/dev-java/libreadline-java-0.8.0-r5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install preinst prepare setup
+DEPEND=virtual/jdk:1.8 sys-libs/ncurses:0= >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=A JNI-wrapper to GNU Readline
+EAPI=7
+HOMEPAGE=http://java-readline.sourceforge.net/
+IUSE=elibc_FreeBSD elibc_FreeBSD doc source
+KEYWORDS=amd64 ppc64 x86
+LICENSE=LGPL-2.1
+RDEPEND=>=virtual/jre-1.8:* sys-libs/ncurses:0= >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://sourceforge/java-readline/libreadline-java-0.8.0-src.tar.gz -> libreadline-java-0.8.0.tar.gz
+_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 2d5b3f4b315094768576b6799e4f926e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-utils-2 2440f41421207d084e5e3f1fb001b34e l10n 8cdd85e169b835d518bc2fd59f780d8e wrapper 4251d4c84c25f59094fd557e0063a974
+_md5_=83ee1cb7bfbbf55e17720c641ac2aa8e
diff --git a/metadata/md5-cache/dev-java/log4j-1.2.17-r3 b/metadata/md5-cache/dev-java/log4j-1.2.17-r3
index b909c53fd54a..73604da1050e 100644
--- a/metadata/md5-cache/dev-java/log4j-1.2.17-r3
+++ b/metadata/md5-cache/dev-java/log4j-1.2.17-r3
@@ -4,10 +4,10 @@ DESCRIPTION=A low-overhead robust logging package for Java
EAPI=5
HOMEPAGE=http://logging.apache.org/log4j/
IUSE=javamail jms elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux
+KEYWORDS=amd64 ~arm arm64 ppc64 x86 ~amd64-linux
LICENSE=Apache-2.0
RDEPEND=javamail? ( dev-java/oracle-javamail:0 ) jms? ( java-virtuals/jms:0 ) >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=0
SRC_URI=mirror://apache/logging/log4j/1.2.17/log4j-1.2.17.tar.gz
_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 eapi7-ver f9ec87e93172b25ce65a85303dc06964 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 9f813bb3c47cf2e60619a663b87c5f4e estack 055c42df72f76a4f45ec92b35e83cd56 eutils 2d5b3f4b315094768576b6799e4f926e java-ant-2 51fb0a4707d58382310390ad47ab0ab0 java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-utils-2 2440f41421207d084e5e3f1fb001b34e l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib d410501a125f99ffb560b0c523cd3d1e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator d3fb3ba33acc3bbbdc4d7970227c100d wrapper 4251d4c84c25f59094fd557e0063a974
-_md5_=34522c003bfab26daa0dec900f33cc3d
+_md5_=0b615dcd9048430eab504bcbc357bf4f
diff --git a/metadata/md5-cache/dev-java/objenesis-3.2 b/metadata/md5-cache/dev-java/objenesis-3.2
index 9807c775432c..8002bfaebacb 100644
--- a/metadata/md5-cache/dev-java/objenesis-3.2
+++ b/metadata/md5-cache/dev-java/objenesis-3.2
@@ -4,11 +4,11 @@ DESCRIPTION=A library for instantiating Java objects
EAPI=7
HOMEPAGE=http://objenesis.org/objenesis
IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=amd64 ~arm64 ppc64 x86
+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 ) !test? ( test )
SLOT=0
SRC_URI=https://github.com/easymock/objenesis/archive/refs/tags/3.2.tar.gz -> objenesis-3.2.tar.gz
_eclasses_=java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-pkg-simple c85bf2d75a5f53e7b39fc9104701ebfb java-utils-2 2440f41421207d084e5e3f1fb001b34e
-_md5_=3cd1ea23f3408b5893f895345c09e168
+_md5_=07e388042fccc87d190394cb28100600
diff --git a/metadata/md5-cache/dev-java/objenesis-test-3.2 b/metadata/md5-cache/dev-java/objenesis-test-3.2
index 77ff300cad81..d0c77609dc15 100644
--- a/metadata/md5-cache/dev-java/objenesis-test-3.2
+++ b/metadata/md5-cache/dev-java/objenesis-test-3.2
@@ -4,10 +4,10 @@ DESCRIPTION=Test library for Objenesis library
EAPI=7
HOMEPAGE=http://objenesis.org
IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ~arm64 ppc64 x86
+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 )
SLOT=0
SRC_URI=https://github.com/easymock/objenesis/archive/refs/tags/3.2.tar.gz -> objenesis-3.2.tar.gz
_eclasses_=java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-pkg-simple c85bf2d75a5f53e7b39fc9104701ebfb java-utils-2 2440f41421207d084e5e3f1fb001b34e
-_md5_=903c1b8dccce3bb3e0dfaf23e40b45ca
+_md5_=a86ff0219d90db9f86163ac561a7673c
diff --git a/metadata/md5-cache/dev-java/odfdom-0.8.6-r1 b/metadata/md5-cache/dev-java/odfdom-0.8.6-r1
deleted file mode 100644
index 7cff82a6325c..000000000000
--- a/metadata/md5-cache/dev-java/odfdom-0.8.6-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.5 dev-java/xerces:2 dev-java/xml-commons-external:1.4 test? ( dev-java/ant-junit4:0 dev-java/hamcrest-core:0 dev-java/junit:4 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=The ODFDOM reference implementation, written in Java
-EAPI=7
-HOMEPAGE=http://odftoolkit.org/projects/odfdom
-IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=~amd64 ~x86-linux ~sparc-solaris ~x86-solaris
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.5 dev-java/xerces:2 dev-java/xml-commons-external:1.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=http://odftoolkit.org/projects/odfdom/downloads/download/current-version%252Fodfdom-0.8.6-sources.zip -> odfdom-0.8.6-sources.zip
-_eclasses_=java-ant-2 51fb0a4707d58382310390ad47ab0ab0 java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-utils-2 2440f41421207d084e5e3f1fb001b34e multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
-_md5_=dcba39eb0158ce4e7334898a388ca24f
diff --git a/metadata/md5-cache/dev-java/openjdk-8.292_p10 b/metadata/md5-cache/dev-java/openjdk-8.292_p10
index 60822be3cfc7..0ece4efb88a3 100644
--- a/metadata/md5-cache/dev-java/openjdk-8.292_p10
+++ b/metadata/md5-cache/dev-java/openjdk-8.292_p10
@@ -4,11 +4,11 @@ DESCRIPTION=Open source implementation of the Java programming language
EAPI=6
HOMEPAGE=https://openjdk.java.net
IUSE=alsa debug cups doc examples headless-awt javafx +jbootstrap +pch selinux source elibc_FreeBSD
-KEYWORDS=amd64 ~arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64 x86
LICENSE=GPL-2
PDEPEND=javafx? ( dev-java/openjfx:8 )
RDEPEND=media-libs/freetype:2= media-libs/giflib:0/7 sys-libs/zlib >=sys-apps/baselayout-java-0.1.0-r1 !headless-awt? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrender x11-libs/libXt x11-libs/libXtst ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) selinux? ( sec-policy/selinux-java ) >=dev-java/java-config-2.2.0-r3 >=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.4.0
SLOT=8
SRC_URI=!arm64? ( https://hg.openjdk.java.net/jdk8u/jdk8u/archive/jdk8u292-ga.tar.bz2 -> openjdk-8.292_p10.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/corba/archive/jdk8u292-ga.tar.bz2 -> openjdk-corba-8.292_p10.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/hotspot/archive/jdk8u292-ga.tar.bz2 -> openjdk-hotspot-8.292_p10.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/jaxp/archive/jdk8u292-ga.tar.bz2 -> openjdk-jaxp-8.292_p10.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/jaxws/archive/jdk8u292-ga.tar.bz2 -> openjdk-jaxws-8.292_p10.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/jdk/archive/jdk8u292-ga.tar.bz2 -> openjdk-jdk-8.292_p10.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/langtools/archive/jdk8u292-ga.tar.bz2 -> openjdk-langtools-8.292_p10.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/nashorn/archive/jdk8u292-ga.tar.bz2 -> openjdk-nashorn-8.292_p10.tar.bz2 ) arm64? ( https://hg.openjdk.java.net/aarch64-port/jdk8u-shenandoah/archive/aarch64-shenandoah-jdk8u292-b10.tar.bz2 -> openjdk-aarch64-shenandoah-8.292_p10.tar.bz2 https://hg.openjdk.java.net/aarch64-port/jdk8u-shenandoah/corba/archive/aarch64-shenandoah-jdk8u292-b10.tar.bz2 -> openjdk-aarch64-shenandoah-corba-8.292_p10.tar.bz2 https://hg.openjdk.java.net/aarch64-port/jdk8u-shenandoah/hotspot/archive/aarch64-shenandoah-jdk8u292-b10.tar.bz2 -> openjdk-aarch64-shenandoah-hotspot-8.292_p10.tar.bz2 https://hg.openjdk.java.net/aarch64-port/jdk8u-shenandoah/jaxp/archive/aarch64-shenandoah-jdk8u292-b10.tar.bz2 -> openjdk-aarch64-shenandoah-jaxp-8.292_p10.tar.bz2 https://hg.openjdk.java.net/aarch64-port/jdk8u-shenandoah/jaxws/archive/aarch64-shenandoah-jdk8u292-b10.tar.bz2 -> openjdk-aarch64-shenandoah-jaxws-8.292_p10.tar.bz2 https://hg.openjdk.java.net/aarch64-port/jdk8u-shenandoah/jdk/archive/aarch64-shenandoah-jdk8u292-b10.tar.bz2 -> openjdk-aarch64-shenandoah-jdk-8.292_p10.tar.bz2 https://hg.openjdk.java.net/aarch64-port/jdk8u-shenandoah/langtools/archive/aarch64-shenandoah-jdk8u292-b10.tar.bz2 -> openjdk-aarch64-shenandoah-langtools-8.292_p10.tar.bz2 https://hg.openjdk.java.net/aarch64-port/jdk8u-shenandoah/nashorn/archive/aarch64-shenandoah-jdk8u292-b10.tar.bz2 -> openjdk-aarch64-shenandoah-nashorn-jdk8.292_p10.tar.bz2 )
_eclasses_=check-reqs 97b90bd8fb799993925e6b3a683184e5 desktop c0d27bf73aa08ca05b663dbd31fbef28 eapi7-ver f9ec87e93172b25ce65a85303dc06964 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 9f813bb3c47cf2e60619a663b87c5f4e estack 055c42df72f76a4f45ec92b35e83cd56 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic bc2e7662a4a9a8643be851982a837ddc java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-utils-2 2440f41421207d084e5e3f1fb001b34e java-vm-2 1b9686c0df06500159478dfaf5c21338 l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 pax-utils d3fc79d3d50544347e324864f95206e2 prefix de7d8e2b10085ed5ff09ad70e4753e5c preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator d3fb3ba33acc3bbbdc4d7970227c100d wrapper 4251d4c84c25f59094fd557e0063a974 xdg-utils ff2ff954e6b17929574eee4efc5152ba
-_md5_=f7a49b72853459078140756031e89ff2
+_md5_=77f207c520a5ec1fa7a9f31f49917a78
diff --git a/metadata/md5-cache/dev-java/openjdk-bin-8.292_p10 b/metadata/md5-cache/dev-java/openjdk-bin-8.292_p10
index 056451452987..1f1774385208 100644
--- a/metadata/md5-cache/dev-java/openjdk-bin-8.292_p10
+++ b/metadata/md5-cache/dev-java/openjdk-bin-8.292_p10
@@ -4,11 +4,11 @@ DESCRIPTION=Prebuilt Java JDK binaries provided by AdoptOpenJDK
EAPI=6
HOMEPAGE=https://adoptopenjdk.net
IUSE=alsa cups examples headless-awt selinux source
-KEYWORDS=amd64 ~arm ~arm64 ppc64 ~x64-macos
+KEYWORDS=amd64 ~arm arm64 ppc64 ~x64-macos
LICENSE=GPL-2-with-classpath-exception
RDEPEND=>=sys-apps/baselayout-java-0.1.0-r1 kernel_linux? ( media-libs/fontconfig:1.0 media-libs/freetype:2 >=sys-libs/glibc-2.2.5:* sys-libs/zlib alsa? ( media-libs/alsa-lib ) arm? ( dev-libs/libffi-compat:6 ) cups? ( net-print/cups ) selinux? ( sec-policy/selinux-java ) !headless-awt? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrender x11-libs/libXtst ) ) >=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.4.0
RESTRICT=preserve-libs strip
SLOT=8
SRC_URI=arm64? ( https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10/OpenJDK8U-jdk_aarch64_linux_hotspot_8u292b10.tar.gz ) arm? ( https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10/OpenJDK8U-jdk_arm_linux_hotspot_8u292b10.tar.gz ) ppc64? ( https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10/OpenJDK8U-jdk_ppc64le_linux_hotspot_8u292b10.tar.gz ) amd64? ( https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10/OpenJDK8U-jdk_x64_linux_hotspot_8u292b10.tar.gz ) x64-macos? ( https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10/OpenJDK8U-jdk_x64_mac_hotspot_8u292b10.tar.gz )
_eclasses_=eapi7-ver f9ec87e93172b25ce65a85303dc06964 java-vm-2 1b9686c0df06500159478dfaf5c21338 multilib d410501a125f99ffb560b0c523cd3d1e pax-utils d3fc79d3d50544347e324864f95206e2 prefix de7d8e2b10085ed5ff09ad70e4753e5c toolchain-funcs 24921b57d6561d87cbef4916a296ada4 xdg-utils ff2ff954e6b17929574eee4efc5152ba
-_md5_=29af4780098b0aa10a3f9d880099d878
+_md5_=519cb175c385a54b77516b304a773252
diff --git a/metadata/md5-cache/dev-java/oracle-javamail-1.5.6-r1 b/metadata/md5-cache/dev-java/oracle-javamail-1.5.6-r1
index c2b3454b7968..51b341ab9db5 100644
--- a/metadata/md5-cache/dev-java/oracle-javamail-1.5.6-r1
+++ b/metadata/md5-cache/dev-java/oracle-javamail-1.5.6-r1
@@ -4,10 +4,10 @@ DESCRIPTION=A Java-based framework to build multiplatform mail and messaging app
EAPI=6
HOMEPAGE=https://java.net/projects/javamail/pages/Home
IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=CDDL GPL-2 BSD
RDEPEND=virtual/jre:1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=0
SRC_URI=https://java.net/projects/javamail/downloads/download/source/javamail-1.5.6-src.zip -> oracle-javamail-1.5.6.zip
_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 eapi7-ver f9ec87e93172b25ce65a85303dc06964 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 9f813bb3c47cf2e60619a663b87c5f4e estack 055c42df72f76a4f45ec92b35e83cd56 eutils 2d5b3f4b315094768576b6799e4f926e java-ant-2 51fb0a4707d58382310390ad47ab0ab0 java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-utils-2 2440f41421207d084e5e3f1fb001b34e l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib d410501a125f99ffb560b0c523cd3d1e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator d3fb3ba33acc3bbbdc4d7970227c100d wrapper 4251d4c84c25f59094fd557e0063a974
-_md5_=663df0bbc5bec647871639b1b229299e
+_md5_=06079a0bc4404a846516da80d66ed06d
diff --git a/metadata/md5-cache/dev-java/poi-5.0.0 b/metadata/md5-cache/dev-java/poi-5.0.0
index 1b4785146536..82b6fe3f5272 100644
--- a/metadata/md5-cache/dev-java/poi-5.0.0
+++ b/metadata/md5-cache/dev-java/poi-5.0.0
@@ -4,10 +4,10 @@ DESCRIPTION=Maven build of Apache POI for Sonar checks
EAPI=7
HOMEPAGE=https://poi.apache.org/
IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~arm64 ppc64 ~x86
+KEYWORDS=amd64 arm64 ppc64 x86
LICENSE=Apache-2.0
RDEPEND=>=virtual/jre-1.8:* >=dev-java/commons-codec-1.11:0 >=dev-java/commons-collections-4.1:4 >=dev-java/commons-math-3.6.1:3 >=dev-java/slf4j-api-1.7.30:0 >=dev-java/sparsebitset-1.2:0 dev-java/commons-logging:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=0
SRC_URI=https://archive.apache.org/dist/poi/release/src/poi-src-5.0.0-20210120.tar.gz -> poi-5.0.0.tar.gz
_eclasses_=java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-pkg-simple c85bf2d75a5f53e7b39fc9104701ebfb java-utils-2 2440f41421207d084e5e3f1fb001b34e
-_md5_=0828e3fd9ba435801ca302ee6ae8eec2
+_md5_=d5de5639d67fc3cfc5734f5cbbea16f8
diff --git a/metadata/md5-cache/dev-java/saaj-1.3.19-r2 b/metadata/md5-cache/dev-java/saaj-1.3.19-r2
deleted file mode 100644
index 902033c65dd5..000000000000
--- a/metadata/md5-cache/dev-java/saaj-1.3.19-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=dev-java/mimepull:0 dev-java/xerces:2 dev-java/xml-commons-external:1.4 java-virtuals/saaj-api:0 >=virtual/jdk-1.6 test? ( dev-java/ant-junit:0 dev-java/xalan:0 java-virtuals/servlet-api:2.5 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=SOAP with Attachments API for Java
-EAPI=6
-HOMEPAGE=https://saaj.dev.java.net/
-IUSE=elibc_FreeBSD examples source test elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=CDDL
-RDEPEND=dev-java/mimepull:0 dev-java/xerces:2 dev-java/xml-commons-external:1.4 java-virtuals/saaj-api:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~sera/distfiles/saaj-1.3.19.tar.bz2
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 eapi7-ver f9ec87e93172b25ce65a85303dc06964 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 9f813bb3c47cf2e60619a663b87c5f4e estack 055c42df72f76a4f45ec92b35e83cd56 eutils 2d5b3f4b315094768576b6799e4f926e java-ant-2 51fb0a4707d58382310390ad47ab0ab0 java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-utils-2 2440f41421207d084e5e3f1fb001b34e l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib d410501a125f99ffb560b0c523cd3d1e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator d3fb3ba33acc3bbbdc4d7970227c100d wrapper 4251d4c84c25f59094fd557e0063a974
-_md5_=758e158e14670019a9df7958a85f9941
diff --git a/metadata/md5-cache/dev-java/slf4j-api-1.7.30-r1 b/metadata/md5-cache/dev-java/slf4j-api-1.7.30-r1
index b00ecff2d762..ba5660d819c6 100644
--- a/metadata/md5-cache/dev-java/slf4j-api-1.7.30-r1
+++ b/metadata/md5-cache/dev-java/slf4j-api-1.7.30-r1
@@ -5,11 +5,11 @@ DESCRIPTION=The slf4j API
EAPI=7
HOMEPAGE=https://www.slf4j.org
IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=amd64 ~arm64 ppc64 x86
+KEYWORDS=amd64 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 ) !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 45c44ec10db6affb3ebee1ac72039888 java-pkg-simple c85bf2d75a5f53e7b39fc9104701ebfb java-utils-2 2440f41421207d084e5e3f1fb001b34e
-_md5_=564cf5aaa5f2d2ff4290417634ae4881
+_md5_=cff6b64ccc7b0e5e720e13d26034a778
diff --git a/metadata/md5-cache/dev-java/snakeyaml-1.16 b/metadata/md5-cache/dev-java/snakeyaml-1.16
deleted file mode 100644
index f35008643f8a..000000000000
--- a/metadata/md5-cache/dev-java/snakeyaml-1.16
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test unpack
-DEPEND=>=virtual/jdk-1.6 test? ( dev-java/joda-time:0 dev-java/junit:4 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=A YAML 1.1 parser and emitter for Java 5
-EAPI=5
-HOMEPAGE=https://bitbucket.org/asomov/snakeyaml
-IUSE=test elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://bitbucket.org/asomov/snakeyaml/get/v1.16.tar.bz2 -> snakeyaml-1.16.tar.bz2
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 eapi7-ver f9ec87e93172b25ce65a85303dc06964 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 9f813bb3c47cf2e60619a663b87c5f4e estack 055c42df72f76a4f45ec92b35e83cd56 eutils 2d5b3f4b315094768576b6799e4f926e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-pkg-simple c85bf2d75a5f53e7b39fc9104701ebfb java-utils-2 2440f41421207d084e5e3f1fb001b34e l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib d410501a125f99ffb560b0c523cd3d1e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf vcs-snapshot b1abf460a493fc59ebb25de0df3f09dd versionator d3fb3ba33acc3bbbdc4d7970227c100d wrapper 4251d4c84c25f59094fd557e0063a974
-_md5_=33b098d5af4743ac19f0be93d39ba9b5
diff --git a/metadata/md5-cache/dev-java/snakeyaml-1.28-r1 b/metadata/md5-cache/dev-java/snakeyaml-1.28-r1
index 0eb75a3a1d1f..bd455e0ce79f 100644
--- a/metadata/md5-cache/dev-java/snakeyaml-1.28-r1
+++ b/metadata/md5-cache/dev-java/snakeyaml-1.28-r1
@@ -4,11 +4,11 @@ DESCRIPTION=YAML 1.1 parser and emitter for Java
EAPI=7
HOMEPAGE=https://bitbucket.org/asomov/snakeyaml
IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 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 ) !test? ( test )
SLOT=0
SRC_URI=https://bitbucket.org/asomov/snakeyaml/get/snakeyaml-1.28.tar.gz -> asomov-snakeyaml-b28f0b4d87c6.tar.gz
_eclasses_=java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-pkg-simple c85bf2d75a5f53e7b39fc9104701ebfb java-utils-2 2440f41421207d084e5e3f1fb001b34e
-_md5_=3bdfe3a4687bcee2fb07aaeb82098325
+_md5_=3348435bcbdd84326968cb82ca5d95bd
diff --git a/metadata/md5-cache/dev-java/sparsebitset-1.2 b/metadata/md5-cache/dev-java/sparsebitset-1.2
index a8000030257a..d220ffdea942 100644
--- a/metadata/md5-cache/dev-java/sparsebitset-1.2
+++ b/metadata/md5-cache/dev-java/sparsebitset-1.2
@@ -4,11 +4,11 @@ DESCRIPTION=An efficient sparse bitset implementation for Java
EAPI=7
HOMEPAGE=https://github.com/brettwooldridge/SparseBitSet
IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=~amd64 ~arm64 ppc64 ~x86
+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 ) !test? ( test )
SLOT=0
SRC_URI=https://github.com/brettwooldridge/SparseBitSet/archive/refs/tags/SparseBitSet-1.2.tar.gz -> sparsebitset-1.2.tar.gz
_eclasses_=java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-pkg-simple c85bf2d75a5f53e7b39fc9104701ebfb java-utils-2 2440f41421207d084e5e3f1fb001b34e
-_md5_=182f2d73d73ae2c46df6fe5c78c3e1d2
+_md5_=12a6f2e60d75f585b97926231f87136b
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
new file mode 100644
index 000000000000..a265bc6a632e
--- /dev/null
+++ b/metadata/md5-cache/dev-java/sun-jai-bin-1.1.3-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst preinst prepare setup
+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/
+IUSE=elibc_FreeBSD
+KEYWORDS=~amd64
+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 45c44ec10db6affb3ebee1ac72039888 java-utils-2 2440f41421207d084e5e3f1fb001b34e
+_md5_=1bdb94ef11f470d74a7ada67ccaf9fd2
diff --git a/metadata/md5-cache/dev-java/sun-jms-1.1-r2 b/metadata/md5-cache/dev-java/sun-jms-1.1-r2
deleted file mode 100644
index 3c97f10f625c..000000000000
--- a/metadata/md5-cache/dev-java/sun-jms-1.1-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install nofetch preinst prepare setup
-DEPEND=app-arch/unzip >=virtual/jdk-1.3 >=dev-java/java-config-2.2.0-r3
-DESCRIPTION=The Java Message Service (JMS) API
-EAPI=7
-HOMEPAGE=http://java.sun.com/products/jms/
-IUSE=doc elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
-LICENSE=sun-bcla-jms
-RDEPEND=>=virtual/jre-1.3 >=dev-java/java-config-2.2.0-r3
-RESTRICT=bindist fetch
-SLOT=0
-SRC_URI=jms-1_1-fr-apidocs.zip
-_eclasses_=java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-utils-2 2440f41421207d084e5e3f1fb001b34e
-_md5_=2af07aff1ec976328d8b467a6734fd0a
diff --git a/metadata/md5-cache/dev-java/sun-jms-1.1-r3 b/metadata/md5-cache/dev-java/sun-jms-1.1-r3
new file mode 100644
index 000000000000..f1abdc7ad825
--- /dev/null
+++ b/metadata/md5-cache/dev-java/sun-jms-1.1-r3
@@ -0,0 +1,15 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=compile install nofetch preinst prepare setup
+DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3
+DESCRIPTION=The Java Message Service (JMS) API
+EAPI=7
+HOMEPAGE=https://www.oracle.com/java/technologies/java-message-service.html
+IUSE=doc elibc_FreeBSD
+KEYWORDS=amd64 arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
+LICENSE=sun-bcla-jms
+RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3
+RESTRICT=bindist fetch
+SLOT=0
+SRC_URI=jms-1_1-fr-apidocs.zip
+_eclasses_=java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-utils-2 2440f41421207d084e5e3f1fb001b34e
+_md5_=e0fa95ef53785fbff9348492ae0ff223
diff --git a/metadata/md5-cache/dev-java/swt-4.10 b/metadata/md5-cache/dev-java/swt-4.10
deleted file mode 100644
index 4b0f0d577086..000000000000
--- a/metadata/md5-cache/dev-java/swt-4.10
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup unpack
-DEPEND=>=dev-libs/atk-1.10.2 >=dev-libs/glib-2.32 >=x11-libs/gtk+-2.6.8:2 x11-libs/libXtst cairo? ( >=x11-libs/cairo-1.4.14 ) opengl? ( virtual/glu virtual/opengl ) webkit? ( net-libs/webkit-gtk:4 ) >=virtual/jdk-1.8 app-arch/unzip virtual/pkgconfig x11-base/xorg-proto x11-libs/libX11 x11-libs/libXrender x11-libs/libXt >=x11-libs/libXtst-1.1.0 >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=GTK based SWT Library
-EAPI=6
-HOMEPAGE=http://www.eclipse.org/
-IUSE=cairo opengl webkit elibc_FreeBSD elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=~amd64 ~ppc64
-LICENSE=CPL-1.0 LGPL-2.1 MPL-1.1
-RDEPEND=>=dev-libs/atk-1.10.2 >=dev-libs/glib-2.32 >=x11-libs/gtk+-2.6.8:2 x11-libs/libXtst cairo? ( >=x11-libs/cairo-1.4.14 ) opengl? ( virtual/glu virtual/opengl ) webkit? ( net-libs/webkit-gtk:4 ) >=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3
-SLOT=4.10
-SRC_URI=amd64? ( http://download.eclipse.org/eclipse/downloads/drops4/R-4.10-201812060815/swt-4.10-gtk-linux-x86_64.zip ) ppc64? ( http://download.eclipse.org/eclipse/downloads/drops4/R-4.10-201812060815/swt-4.10-gtk-linux-ppc64le.zip )
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 eapi7-ver f9ec87e93172b25ce65a85303dc06964 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 9f813bb3c47cf2e60619a663b87c5f4e estack 055c42df72f76a4f45ec92b35e83cd56 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic bc2e7662a4a9a8643be851982a837ddc java-ant-2 51fb0a4707d58382310390ad47ab0ab0 java-osgi 303099c377fa3ce30c97f39ebecb351f java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-utils-2 2440f41421207d084e5e3f1fb001b34e l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib d410501a125f99ffb560b0c523cd3d1e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator d3fb3ba33acc3bbbdc4d7970227c100d wrapper 4251d4c84c25f59094fd557e0063a974
-_md5_=d6aec3a190b9a91fc40c430087340e60
diff --git a/metadata/md5-cache/dev-java/swt-4.10-r1 b/metadata/md5-cache/dev-java/swt-4.10-r1
new file mode 100644
index 000000000000..a03e87a07786
--- /dev/null
+++ b/metadata/md5-cache/dev-java/swt-4.10-r1
@@ -0,0 +1,14 @@
+BDEPEND=app-arch/unzip virtual/pkgconfig
+DEFINED_PHASES=compile configure install preinst prepare setup unpack
+DEPEND=>=dev-libs/atk-1.10.2 >=dev-libs/glib-2.32 >=x11-libs/gtk+-2.6.8:2 x11-libs/libXtst cairo? ( >=x11-libs/cairo-1.4.14 ) opengl? ( virtual/glu virtual/opengl ) webkit? ( net-libs/webkit-gtk:4 ) >=virtual/jdk-1.8:* x11-base/xorg-proto x11-libs/libX11 x11-libs/libXrender x11-libs/libXt >=x11-libs/libXtst-1.1.0 >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
+DESCRIPTION=GTK based SWT Library
+EAPI=7
+HOMEPAGE=http://www.eclipse.org/
+IUSE=cairo opengl webkit elibc_FreeBSD elibc_FreeBSD elibc_FreeBSD
+KEYWORDS=~amd64 ~ppc64
+LICENSE=CPL-1.0 LGPL-2.1 MPL-1.1
+RDEPEND=>=dev-libs/atk-1.10.2 >=dev-libs/glib-2.32 >=x11-libs/gtk+-2.6.8:2 x11-libs/libXtst cairo? ( >=x11-libs/cairo-1.4.14 ) opengl? ( virtual/glu virtual/opengl ) webkit? ( net-libs/webkit-gtk:4 ) >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3
+SLOT=4.10
+SRC_URI=amd64? ( http://download.eclipse.org/eclipse/downloads/drops4/R-4.10-201812060815/swt-4.10-gtk-linux-x86_64.zip ) ppc64? ( http://download.eclipse.org/eclipse/downloads/drops4/R-4.10-201812060815/swt-4.10-gtk-linux-ppc64le.zip )
+_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic bc2e7662a4a9a8643be851982a837ddc java-ant-2 51fb0a4707d58382310390ad47ab0ab0 java-osgi 303099c377fa3ce30c97f39ebecb351f java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-utils-2 2440f41421207d084e5e3f1fb001b34e l10n 8cdd85e169b835d518bc2fd59f780d8e multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 wrapper 4251d4c84c25f59094fd557e0063a974
+_md5_=5923a860499c6cba9e2705ee61428089
diff --git a/metadata/md5-cache/dev-java/tapestry-3.0.4-r3 b/metadata/md5-cache/dev-java/tapestry-3.0.4-r3
deleted file mode 100644
index b001beaa4742..000000000000
--- a/metadata/md5-cache/dev-java/tapestry-3.0.4-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=dev-java/bsf:2.3 dev-java/commons-beanutils:1.7 dev-java/commons-codec:0 dev-java/commons-digester:0 dev-java/commons-fileupload:0 dev-java/commons-lang:2.1 dev-java/commons-logging:0 dev-java/jakarta-oro:2.0 dev-java/javassist:2 dev-java/ognl:3.0 dev-java/tomcat-servlet-api:2.4 app-arch/unzip >=virtual/jdk-1.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Dynamic, robust, highly scalable web framework in Java
-EAPI=6
-HOMEPAGE=https://tapestry.apache.org/
-IUSE=doc source elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=dev-java/bsf:2.3 dev-java/commons-beanutils:1.7 dev-java/commons-codec:0 dev-java/commons-digester:0 dev-java/commons-fileupload:0 dev-java/commons-lang:2.1 dev-java/commons-logging:0 dev-java/jakarta-oro:2.0 dev-java/javassist:2 dev-java/ognl:3.0 dev-java/tomcat-servlet-api:2.4 >=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=3.0
-SRC_URI=mirror://apache/tapestry/Tapestry-3.0.4-src.zip
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 eapi7-ver f9ec87e93172b25ce65a85303dc06964 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 9f813bb3c47cf2e60619a663b87c5f4e estack 055c42df72f76a4f45ec92b35e83cd56 eutils 2d5b3f4b315094768576b6799e4f926e java-ant-2 51fb0a4707d58382310390ad47ab0ab0 java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-utils-2 2440f41421207d084e5e3f1fb001b34e l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib d410501a125f99ffb560b0c523cd3d1e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator d3fb3ba33acc3bbbdc4d7970227c100d wrapper 4251d4c84c25f59094fd557e0063a974
-_md5_=311e7c300ef2fa07f733d1188fc3c38a
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-10.0.6 b/metadata/md5-cache/dev-java/tomcat-servlet-api-10.0.6
new file mode 100644
index 000000000000..4db6dd03fcb4
--- /dev/null
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-10.0.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=Tomcat's Servlet API 5.0/JSP API 3.0/EL API 4.0 implementation
+EAPI=7
+HOMEPAGE=https://tomcat.apache.org/
+IUSE=elibc_FreeBSD source elibc_FreeBSD
+KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+LICENSE=Apache-2.0
+RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+SLOT=5.0
+SRC_URI=mirror://apache/tomcat/tomcat-10/v10.0.6/src/apache-tomcat-10.0.6-src.tar.gz
+_eclasses_=java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-pkg-simple c85bf2d75a5f53e7b39fc9104701ebfb java-utils-2 2440f41421207d084e5e3f1fb001b34e
+_md5_=77fd539bb8ae0a999f3ea38f455ad5b1
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-7.0.108 b/metadata/md5-cache/dev-java/tomcat-servlet-api-7.0.108
index 8c50205b7d4d..753e5cf48de9 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-7.0.108
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-7.0.108
@@ -4,10 +4,10 @@ DESCRIPTION=Tomcat's Servlet API 3.0/JSP API 2.2 implementation
EAPI=7
HOMEPAGE=https://tomcat.apache.org/
IUSE=elibc_FreeBSD source elibc_FreeBSD
-KEYWORDS=amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
LICENSE=Apache-2.0
RDEPEND=>=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=3.0
SRC_URI=mirror://apache/tomcat/tomcat-7/v7.0.108/src/apache-tomcat-7.0.108-src.tar.gz
_eclasses_=java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-pkg-simple c85bf2d75a5f53e7b39fc9104701ebfb java-utils-2 2440f41421207d084e5e3f1fb001b34e
-_md5_=762814fb31c81990673f362c86590a58
+_md5_=8b2861f02a5c0fc5d82edcfef67e2583
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.65 b/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.65
index fdcb7c82e4e7..32b38b23a4c3 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.65
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.65
@@ -4,10 +4,10 @@ DESCRIPTION=Tomcat's Servlet API 3.1/JSP API 2.3/EL API 3.0 implementation
EAPI=7
HOMEPAGE=https://tomcat.apache.org/
IUSE=elibc_FreeBSD source elibc_FreeBSD
-KEYWORDS=amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
LICENSE=Apache-2.0
RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=3.1
SRC_URI=mirror://apache/tomcat/tomcat-8/v8.5.65/src/apache-tomcat-8.5.65-src.tar.gz
_eclasses_=java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-pkg-simple c85bf2d75a5f53e7b39fc9104701ebfb java-utils-2 2440f41421207d084e5e3f1fb001b34e
-_md5_=058f031a1fa50c11c0747ad72f5f4ba1
+_md5_=79a96c508aead4b84cfed9039f703158
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.66 b/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.66
new file mode 100644
index 000000000000..fd4fe3329462
--- /dev/null
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.66
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=Tomcat's Servlet API 3.1/JSP API 2.3/EL API 3.0 implementation
+EAPI=7
+HOMEPAGE=https://tomcat.apache.org/
+IUSE=elibc_FreeBSD source elibc_FreeBSD
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+LICENSE=Apache-2.0
+RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+SLOT=3.1
+SRC_URI=mirror://apache/tomcat/tomcat-8/v8.5.66/src/apache-tomcat-8.5.66-src.tar.gz
+_eclasses_=java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-pkg-simple c85bf2d75a5f53e7b39fc9104701ebfb java-utils-2 2440f41421207d084e5e3f1fb001b34e
+_md5_=6bfb744c21b3aef71221b585819bbcf5
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.45 b/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.45
index 1c1ade055138..5a3c74b9d0cc 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.45
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.45
@@ -4,10 +4,10 @@ DESCRIPTION=Tomcat's Servlet API 4.0/JSP API 2.3/EL API 3.0 implementation
EAPI=7
HOMEPAGE=https://tomcat.apache.org/
IUSE=elibc_FreeBSD source elibc_FreeBSD
-KEYWORDS=amd64 ~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.45/src/apache-tomcat-9.0.45-src.tar.gz
_eclasses_=java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-pkg-simple c85bf2d75a5f53e7b39fc9104701ebfb java-utils-2 2440f41421207d084e5e3f1fb001b34e
-_md5_=68cabe0b474f7a8e0f1c6763e9d0cf73
+_md5_=ef266bd8e37f4da01c568ada0201b95e
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.46 b/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.46
new file mode 100644
index 000000000000..aea52c53559a
--- /dev/null
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.46
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=Tomcat's Servlet API 4.0/JSP API 2.3/EL API 3.0 implementation
+EAPI=7
+HOMEPAGE=https://tomcat.apache.org/
+IUSE=elibc_FreeBSD source elibc_FreeBSD
+KEYWORDS=~amd64 ~arm ~arm64 ~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.46/src/apache-tomcat-9.0.46-src.tar.gz
+_eclasses_=java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-pkg-simple c85bf2d75a5f53e7b39fc9104701ebfb java-utils-2 2440f41421207d084e5e3f1fb001b34e
+_md5_=5c43d891ab52b7fab53f38a55644b1ce
diff --git a/metadata/md5-cache/dev-java/trident-1.3-r1 b/metadata/md5-cache/dev-java/trident-1.3-r1
new file mode 100644
index 000000000000..506a441d3636
--- /dev/null
+++ b/metadata/md5-cache/dev-java/trident-1.3-r1
@@ -0,0 +1,15 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=compile configure install preinst prepare setup
+DEPEND=>=virtual/jdk-1.8:* dev-java/swt:4.10 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
+DESCRIPTION=Java animation library
+EAPI=7
+HOMEPAGE=https://kenai.com/projects/trident/pages/Home
+IUSE=elibc_FreeBSD source elibc_FreeBSD
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=>=virtual/jre-1.8:* dev-java/swt:4.10 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://kenai.com/projects/trident/downloads/download/version%201.3%20-%20stable/trident-all.zip -> trident-1.3.zip
+_eclasses_=java-ant-2 51fb0a4707d58382310390ad47ab0ab0 java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-utils-2 2440f41421207d084e5e3f1fb001b34e multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_md5_=727700fb4251c2ee0d0eb49b796faea9
diff --git a/metadata/md5-cache/dev-java/velocity-1.7-r2 b/metadata/md5-cache/dev-java/velocity-1.7-r2
deleted file mode 100644
index 607ac310a559..000000000000
--- a/metadata/md5-cache/dev-java/velocity-1.7-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=dev-java/jdom:0 dev-java/log4j:0 dev-java/ant-core:0 dev-java/werken-xpath:0 dev-java/jakarta-oro:2.0 dev-java/avalon-logkit:2.0 dev-java/commons-lang:2.1 dev-java/commons-logging:0 dev-java/commons-collections:0 java-virtuals/servlet-api:2.3 >=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Java framework for easy creation/rendering of documents
-EAPI=5
-HOMEPAGE=http://velocity.apache.org
-IUSE=test elibc_FreeBSD examples doc source elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=dev-java/jdom:0 dev-java/log4j:0 dev-java/ant-core:0 dev-java/werken-xpath:0 dev-java/jakarta-oro:2.0 dev-java/avalon-logkit:2.0 dev-java/commons-lang:2.1 dev-java/commons-logging:0 dev-java/commons-collections:0 java-virtuals/servlet-api:2.3 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://apache/velocity/engine/1.7/velocity-1.7.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 eapi7-ver f9ec87e93172b25ce65a85303dc06964 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 9f813bb3c47cf2e60619a663b87c5f4e estack 055c42df72f76a4f45ec92b35e83cd56 eutils 2d5b3f4b315094768576b6799e4f926e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-pkg-simple c85bf2d75a5f53e7b39fc9104701ebfb java-utils-2 2440f41421207d084e5e3f1fb001b34e l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib d410501a125f99ffb560b0c523cd3d1e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator d3fb3ba33acc3bbbdc4d7970227c100d wrapper 4251d4c84c25f59094fd557e0063a974
-_md5_=10c16f9dfe9e6fbd09cff5b1239350d6
diff --git a/metadata/md5-cache/dev-java/velocity-2.3 b/metadata/md5-cache/dev-java/velocity-2.3
index a0aa00e5a72c..1622e08e8e3e 100644
--- a/metadata/md5-cache/dev-java/velocity-2.3
+++ b/metadata/md5-cache/dev-java/velocity-2.3
@@ -5,11 +5,11 @@ DESCRIPTION=Apache Velocity is a general purpose template engine.
EAPI=7
HOMEPAGE=https://velocity.apache.org
IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
LICENSE=Apache-2.0
RDEPEND=>=virtual/jre-1.8:* >=dev-java/commons-io-2.8.0:1 >=dev-java/commons-lang-3.11:3.6 >=dev-java/slf4j-api-1.7.30:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
RESTRICT=!test? ( test ) !test? ( test )
SLOT=0
SRC_URI=https://github.com/apache/velocity-engine/archive/refs/tags/2.3.tar.gz -> velocity-2.3.tar.gz
_eclasses_=java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-pkg-simple c85bf2d75a5f53e7b39fc9104701ebfb java-utils-2 2440f41421207d084e5e3f1fb001b34e
-_md5_=39ca93c41cb1c57511726598b5635265
+_md5_=d2d3036b00c3ef4b87cf6469386172fd
diff --git a/metadata/md5-cache/dev-java/xom-1.2.10 b/metadata/md5-cache/dev-java/xom-1.2.10
deleted file mode 100644
index c9633f7e213c..000000000000
--- a/metadata/md5-cache/dev-java/xom-1.2.10
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.4 dev-java/jarjar:1 dev-java/xerces:2 dev-java/xml-commons-external:1.3 examples? ( java-virtuals/servlet-api: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-0.3.0-r2
-DESCRIPTION=A new XML object model
-EAPI=5
-HOMEPAGE=http://cafeconleche.org/XOM/index.html
-IUSE=elibc_FreeBSD doc examples source elibc_FreeBSD
-KEYWORDS=amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris
-LICENSE=LGPL-2
-RDEPEND=>=virtual/jre-1.4 dev-java/xerces:2 dev-java/xml-commons-external:1.3 examples? ( java-virtuals/servlet-api:2.4 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=0
-SRC_URI=http://cafeconleche.org/XOM/xom-1.2.10.tar.gz http://dist.codehaus.org/jaxen/distributions/jaxen-1.1.6-src.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 eapi7-ver f9ec87e93172b25ce65a85303dc06964 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 9f813bb3c47cf2e60619a663b87c5f4e estack 055c42df72f76a4f45ec92b35e83cd56 eutils 2d5b3f4b315094768576b6799e4f926e java-ant-2 51fb0a4707d58382310390ad47ab0ab0 java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-utils-2 2440f41421207d084e5e3f1fb001b34e l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib d410501a125f99ffb560b0c523cd3d1e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator d3fb3ba33acc3bbbdc4d7970227c100d wrapper 4251d4c84c25f59094fd557e0063a974
-_md5_=664a1b9f1a76ce9b8610c5994d4019aa
diff --git a/metadata/md5-cache/dev-java/xom-1.3.2 b/metadata/md5-cache/dev-java/xom-1.3.2
deleted file mode 100644
index 64ea61419190..000000000000
--- a/metadata/md5-cache/dev-java/xom-1.3.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=dev-java/xerces:2 dev-java/jaxen:1.1 dev-java/xml-commons-external:1.3 >=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=XML Object Model
-EAPI=6
-HOMEPAGE=http://cafeconleche.org/XOM/index.html
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~arm arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris
-LICENSE=LGPL-2
-RDEPEND=dev-java/xerces:2 dev-java/jaxen:1.1 dev-java/xml-commons-external:1.3 >=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/xom/xom/1.3.2/xom-1.3.2-sources.jar -> xom-1.3.2.jar
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 eapi7-ver f9ec87e93172b25ce65a85303dc06964 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 9f813bb3c47cf2e60619a663b87c5f4e estack 055c42df72f76a4f45ec92b35e83cd56 eutils 2d5b3f4b315094768576b6799e4f926e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-pkg-simple c85bf2d75a5f53e7b39fc9104701ebfb java-utils-2 2440f41421207d084e5e3f1fb001b34e l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib d410501a125f99ffb560b0c523cd3d1e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator d3fb3ba33acc3bbbdc4d7970227c100d wrapper 4251d4c84c25f59094fd557e0063a974
-_md5_=ac4c366324d80e04cb17b09fe83ad724
diff --git a/metadata/md5-cache/dev-java/xom-1.3.7 b/metadata/md5-cache/dev-java/xom-1.3.7
index f0f82aee8456..9a1696f6fd8e 100644
--- a/metadata/md5-cache/dev-java/xom-1.3.7
+++ b/metadata/md5-cache/dev-java/xom-1.3.7
@@ -4,11 +4,11 @@ DESCRIPTION=XML Object Model
EAPI=7
HOMEPAGE=https://xom.nu
IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=amd64 ~arm arm64 ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris
LICENSE=LGPL-2
RDEPEND=dev-java/jaxen:1.2 dev-java/xerces:2 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
RESTRICT=!test? ( test ) !test? ( test )
SLOT=0
SRC_URI=https://github.com/elharo/xom/releases/download/v1.3.7/xom-1.3.7-src.tar.gz
_eclasses_=java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-pkg-simple c85bf2d75a5f53e7b39fc9104701ebfb java-utils-2 2440f41421207d084e5e3f1fb001b34e
-_md5_=b35548cc3d50e1ce5e6983e2c90ace70
+_md5_=9c30cff4e1a02cc0ffcbe68aa5a5c148