summaryrefslogtreecommitdiff
path: root/metadata/md5-cache/dev-java
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2022-06-29 12:04:12 +0100
committerV3n3RiX <venerix@koprulu.sector>2022-06-29 12:04:12 +0100
commit0f558761aa2dee1017b4751e4017205e015a9560 (patch)
tree037df795519468a25d9362b4e95cdaeb84eb1cf9 /metadata/md5-cache/dev-java
parent752d6256e5204b958b0ef7905675a940b5e9172f (diff)
gentoo resync : 29.12.2022
Diffstat (limited to 'metadata/md5-cache/dev-java')
-rw-r--r--metadata/md5-cache/dev-java/Manifest.gzbin74968 -> 70100 bytes
-rw-r--r--metadata/md5-cache/dev-java/angus-activation-1.0.02
-rw-r--r--metadata/md5-cache/dev-java/animal-sniffer-annotations-1.15-r12
-rw-r--r--metadata/md5-cache/dev-java/ant-antlr-1.10.92
-rw-r--r--metadata/md5-cache/dev-java/ant-apache-bcel-1.10.92
-rw-r--r--metadata/md5-cache/dev-java/ant-apache-bsf-1.10.92
-rw-r--r--metadata/md5-cache/dev-java/ant-apache-log4j-1.10.9-r12
-rw-r--r--metadata/md5-cache/dev-java/ant-apache-oro-1.10.92
-rw-r--r--metadata/md5-cache/dev-java/ant-apache-regexp-1.10.92
-rw-r--r--metadata/md5-cache/dev-java/ant-apache-resolver-1.10.92
-rw-r--r--metadata/md5-cache/dev-java/ant-apache-xalan2-1.10.92
-rw-r--r--metadata/md5-cache/dev-java/ant-commons-logging-1.10.92
-rw-r--r--metadata/md5-cache/dev-java/ant-commons-net-1.10.92
-rw-r--r--metadata/md5-cache/dev-java/ant-contrib-1.0_beta6_pre20201123-r12
-rw-r--r--metadata/md5-cache/dev-java/ant-core-1.10.9-r5 (renamed from metadata/md5-cache/dev-java/ant-core-1.10.9-r3)4
-rw-r--r--metadata/md5-cache/dev-java/ant-eclipse-ecj-4.15-r12
-rw-r--r--metadata/md5-cache/dev-java/ant-eclipse-ecj-4.22-r1 (renamed from metadata/md5-cache/dev-java/ant-eclipse-ecj-4.22)6
-rw-r--r--metadata/md5-cache/dev-java/ant-eclipse-ecj-4.5.114
-rw-r--r--metadata/md5-cache/dev-java/ant-ivy-2.5.0-r12
-rw-r--r--metadata/md5-cache/dev-java/ant-jai-1.10.92
-rw-r--r--metadata/md5-cache/dev-java/ant-javamail-1.10.9-r12
-rw-r--r--metadata/md5-cache/dev-java/ant-jdepend-1.10.92
-rw-r--r--metadata/md5-cache/dev-java/ant-jmf-1.10.92
-rw-r--r--metadata/md5-cache/dev-java/ant-jsch-1.10.92
-rw-r--r--metadata/md5-cache/dev-java/ant-junit-1.10.92
-rw-r--r--metadata/md5-cache/dev-java/ant-junit4-1.10.92
-rw-r--r--metadata/md5-cache/dev-java/ant-junitlauncher-1.10.92
-rw-r--r--metadata/md5-cache/dev-java/ant-swing-1.10.92
-rw-r--r--metadata/md5-cache/dev-java/ant-testutil-1.10.92
-rw-r--r--metadata/md5-cache/dev-java/ant-xz-1.10.92
-rw-r--r--metadata/md5-cache/dev-java/antlr-2.7.7-r92
-rw-r--r--metadata/md5-cache/dev-java/antlr-3.2-r12
-rw-r--r--metadata/md5-cache/dev-java/antlr-3.5.2-r213
-rw-r--r--metadata/md5-cache/dev-java/antlr-3.5.36
-rw-r--r--metadata/md5-cache/dev-java/antlr-4.9.32
-rw-r--r--metadata/md5-cache/dev-java/antlr-runtime-3.5.215
-rw-r--r--metadata/md5-cache/dev-java/antlr-runtime-3.5.36
-rw-r--r--metadata/md5-cache/dev-java/antlr-runtime-4.9.32
-rw-r--r--metadata/md5-cache/dev-java/antlr-tool-3.5.216
-rw-r--r--metadata/md5-cache/dev-java/antlr-tool-3.5.36
-rw-r--r--metadata/md5-cache/dev-java/antlr-tool-4.9.32
-rw-r--r--metadata/md5-cache/dev-java/aopalliance-1.0-r32
-rw-r--r--metadata/md5-cache/dev-java/apache-rat-core-0.132
-rw-r--r--metadata/md5-cache/dev-java/apache-rat-tasks-0.132
-rw-r--r--metadata/md5-cache/dev-java/apiguardian-api-1.1.22
-rw-r--r--metadata/md5-cache/dev-java/asm-5.1-r12
-rw-r--r--metadata/md5-cache/dev-java/asm-9.215
-rw-r--r--metadata/md5-cache/dev-java/asm-9.36
-rw-r--r--metadata/md5-cache/dev-java/asm-analysis-9.22
-rw-r--r--metadata/md5-cache/dev-java/asm-commons-9.22
-rw-r--r--metadata/md5-cache/dev-java/asm-tree-9.22
-rw-r--r--metadata/md5-cache/dev-java/asm-util-9.22
-rw-r--r--metadata/md5-cache/dev-java/aspectj-1.9.72
-rw-r--r--metadata/md5-cache/dev-java/assertj-core-2.3.0-r12
-rw-r--r--metadata/md5-cache/dev-java/avalon-framework-4.2.0-r42
-rw-r--r--metadata/md5-cache/dev-java/avalon-logkit-2.1-r122
-rw-r--r--metadata/md5-cache/dev-java/batik-1.1415
-rw-r--r--metadata/md5-cache/dev-java/batik-1.14-r16
-rw-r--r--metadata/md5-cache/dev-java/bcel-6.5.02
-rw-r--r--metadata/md5-cache/dev-java/bcel-6.5.0-r32
-rw-r--r--metadata/md5-cache/dev-java/bcmail-1.69-r12
-rw-r--r--metadata/md5-cache/dev-java/bcmail-1.7115
-rw-r--r--metadata/md5-cache/dev-java/bcpg-1.692
-rw-r--r--metadata/md5-cache/dev-java/bcpg-1.7115
-rw-r--r--metadata/md5-cache/dev-java/bcpkix-1.692
-rw-r--r--metadata/md5-cache/dev-java/bcpkix-1.71-r116
-rw-r--r--metadata/md5-cache/dev-java/bcprov-1.692
-rw-r--r--metadata/md5-cache/dev-java/bcprov-1.71-r116
-rw-r--r--metadata/md5-cache/dev-java/bcutil-1.692
-rw-r--r--metadata/md5-cache/dev-java/bcutil-1.7115
-rw-r--r--metadata/md5-cache/dev-java/bnd-junit-2.1.0-r22
-rw-r--r--metadata/md5-cache/dev-java/bndlib-2.1.0-r12
-rw-r--r--metadata/md5-cache/dev-java/boot-bin-2.8.314
-rw-r--r--metadata/md5-cache/dev-java/brotli-dec-0.1.22
-rw-r--r--metadata/md5-cache/dev-java/browserlauncher2-1.3-r22
-rw-r--r--metadata/md5-cache/dev-java/bsf-2.4.0-r32
-rw-r--r--metadata/md5-cache/dev-java/bsh-2.0_beta6-r12
-rw-r--r--metadata/md5-cache/dev-java/byaccj-1.15-r23
-rw-r--r--metadata/md5-cache/dev-java/byaccj-1.15-r311
-rw-r--r--metadata/md5-cache/dev-java/byte-buddy-1.12.1015
-rw-r--r--metadata/md5-cache/dev-java/byte-buddy-1.12.86
-rw-r--r--metadata/md5-cache/dev-java/byte-buddy-agent-1.12.1016
-rw-r--r--metadata/md5-cache/dev-java/byte-buddy-agent-1.12.86
-rw-r--r--metadata/md5-cache/dev-java/c3p0-0.9.5.5-r12
-rw-r--r--metadata/md5-cache/dev-java/cal10n-0.8.12
-rw-r--r--metadata/md5-cache/dev-java/cglib-3.3.0-r12
-rw-r--r--metadata/md5-cache/dev-java/checker-framework-qual-3.14.02
-rw-r--r--metadata/md5-cache/dev-java/commons-beanutils-1.9.4-r12
-rw-r--r--metadata/md5-cache/dev-java/commons-cli-1.415
-rw-r--r--metadata/md5-cache/dev-java/commons-cli-1.5.06
-rw-r--r--metadata/md5-cache/dev-java/commons-codec-1.152
-rw-r--r--metadata/md5-cache/dev-java/commons-collections-3.2.22
-rw-r--r--metadata/md5-cache/dev-java/commons-collections-4.42
-rw-r--r--metadata/md5-cache/dev-java/commons-compress-1.212
-rw-r--r--metadata/md5-cache/dev-java/commons-csv-1.9.02
-rw-r--r--metadata/md5-cache/dev-java/commons-daemon-1.2.42
-rw-r--r--metadata/md5-cache/dev-java/commons-daemon-1.3.114
-rw-r--r--metadata/md5-cache/dev-java/commons-digester-2.1-r22
-rw-r--r--metadata/md5-cache/dev-java/commons-digester-3.2-r32
-rw-r--r--metadata/md5-cache/dev-java/commons-httpclient-3.1-r22
-rw-r--r--metadata/md5-cache/dev-java/commons-imaging-1.0_alpha22
-rw-r--r--metadata/md5-cache/dev-java/commons-io-2.11.02
-rw-r--r--metadata/md5-cache/dev-java/commons-jxpath-1.3-r514
-rw-r--r--metadata/md5-cache/dev-java/commons-lang-2.6-r22
-rw-r--r--metadata/md5-cache/dev-java/commons-lang-3.12.02
-rw-r--r--metadata/md5-cache/dev-java/commons-logging-1.2-r52
-rw-r--r--metadata/md5-cache/dev-java/commons-math-3.6.1-r12
-rw-r--r--metadata/md5-cache/dev-java/commons-net-3.8.02
-rw-r--r--metadata/md5-cache/dev-java/commons-text-1.92
-rw-r--r--metadata/md5-cache/dev-java/commons-validator-1.72
-rw-r--r--metadata/md5-cache/dev-java/commons-vfs-2.0-r22
-rw-r--r--metadata/md5-cache/dev-java/conversant-disruptor-1.2.19-r12
-rw-r--r--metadata/md5-cache/dev-java/conversant-disruptor-1.2.2015
-rw-r--r--metadata/md5-cache/dev-java/core-specs-alpha-0.1.242
-rw-r--r--metadata/md5-cache/dev-java/core-specs-alpha-0.2.442
-rw-r--r--metadata/md5-cache/dev-java/core-specs-alpha-0.2.562
-rw-r--r--metadata/md5-cache/dev-java/cortado-0.6.0-r22
-rw-r--r--metadata/md5-cache/dev-java/cpptasks-1.0_beta5-r12
-rw-r--r--metadata/md5-cache/dev-java/dom4j-2.1.32
-rw-r--r--metadata/md5-cache/dev-java/easymock-3.3.1-r14
-rw-r--r--metadata/md5-cache/dev-java/eclipse-ecj-4.152
-rw-r--r--metadata/md5-cache/dev-java/eclipse-ecj-4.22-r1 (renamed from metadata/md5-cache/dev-java/eclipse-ecj-4.22)6
-rw-r--r--metadata/md5-cache/dev-java/eclipse-ecj-4.5.115
-rw-r--r--metadata/md5-cache/dev-java/eclipsito-2018051014
-rw-r--r--metadata/md5-cache/dev-java/emma-2.0.5312-r42
-rw-r--r--metadata/md5-cache/dev-java/error-prone-annotations-2.7.12
-rw-r--r--metadata/md5-cache/dev-java/failureaccess-30.1.12
-rw-r--r--metadata/md5-cache/dev-java/fastinfoset-2.1.015
-rw-r--r--metadata/md5-cache/dev-java/fec-1.0.4-r46
-rw-r--r--metadata/md5-cache/dev-java/findbugs-annotations-3.0.16
-rw-r--r--metadata/md5-cache/dev-java/fontbox-2.0.26 (renamed from metadata/md5-cache/dev-java/fontbox-2.0.24)10
-rw-r--r--metadata/md5-cache/dev-java/fop-2.72
-rw-r--r--metadata/md5-cache/dev-java/gcj-jdk-5.4.0-r112
-rw-r--r--metadata/md5-cache/dev-java/gin-2.1.2-r1 (renamed from metadata/md5-cache/dev-java/gin-2.1.2)9
-rw-r--r--metadata/md5-cache/dev-java/glassfish-jms-api-1.1.2.2.04-r215
-rw-r--r--metadata/md5-cache/dev-java/glassfish-persistence-1.0-r22
-rw-r--r--metadata/md5-cache/dev-java/glassfish-xmlrpc-api-1.1.1-r12
-rw-r--r--metadata/md5-cache/dev-java/glazedlists-1.8.0-r215
-rw-r--r--metadata/md5-cache/dev-java/gnu-jaf-1.1.214
-rw-r--r--metadata/md5-cache/dev-java/gnu-jaf-1.1.2-r16
-rw-r--r--metadata/md5-cache/dev-java/gnu-regexp-1.1.4-r42
-rw-r--r--metadata/md5-cache/dev-java/gradle-bin-6.8.32
-rw-r--r--metadata/md5-cache/dev-java/gradle-bin-7.1.12
-rw-r--r--metadata/md5-cache/dev-java/gradle-bin-7.22
-rw-r--r--metadata/md5-cache/dev-java/gradle-bin-7.3.32
-rw-r--r--metadata/md5-cache/dev-java/gradle-bin-7.415
-rw-r--r--metadata/md5-cache/dev-java/gradle-bin-7.4.115
-rw-r--r--metadata/md5-cache/dev-java/gradle-bin-7.4.22
-rw-r--r--metadata/md5-cache/dev-java/gson-2.8.8-r12
-rw-r--r--metadata/md5-cache/dev-java/gson-2.9.0-r16
-rw-r--r--metadata/md5-cache/dev-java/guava-20.014
-rw-r--r--metadata/md5-cache/dev-java/guava-20.0-r114
-rw-r--r--metadata/md5-cache/dev-java/guava-30.1.12
-rw-r--r--metadata/md5-cache/dev-java/guava-testlib-30.1.18
-rw-r--r--metadata/md5-cache/dev-java/guice-4.115
-rw-r--r--metadata/md5-cache/dev-java/guice-5.1.06
-rw-r--r--metadata/md5-cache/dev-java/gwt-2.9.0-r32
-rw-r--r--metadata/md5-cache/dev-java/hamcrest-core-1.1-r42
-rw-r--r--metadata/md5-cache/dev-java/hamcrest-core-1.3-r22
-rw-r--r--metadata/md5-cache/dev-java/hamcrest-generator-1.3-r32
-rw-r--r--metadata/md5-cache/dev-java/hamcrest-library-1.3-r22
-rw-r--r--metadata/md5-cache/dev-java/hawtjni-runtime-1.15-r12
-rw-r--r--metadata/md5-cache/dev-java/htmlcleaner-2.252
-rw-r--r--metadata/md5-cache/dev-java/httpcomponents-client-4.5.13-r12
-rw-r--r--metadata/md5-cache/dev-java/httpcore-4.4.142
-rw-r--r--metadata/md5-cache/dev-java/icedtea-3.21.04
-rw-r--r--metadata/md5-cache/dev-java/icedtea-bin-3.16.05
-rw-r--r--metadata/md5-cache/dev-java/icedtea-bin-3.16.0-r24
-rw-r--r--metadata/md5-cache/dev-java/icedtea-sound-1.0.1-r12
-rw-r--r--metadata/md5-cache/dev-java/icedtea-web-1.8.4-r115
-rw-r--r--metadata/md5-cache/dev-java/icedtea-web-1.8.815
-rw-r--r--metadata/md5-cache/dev-java/icedtea-web-1.8.8-r16
-rw-r--r--metadata/md5-cache/dev-java/icu4j-71.12
-rw-r--r--metadata/md5-cache/dev-java/iso-relax-20050331-r52
-rw-r--r--metadata/md5-cache/dev-java/istack-commons-runtime-4.1.115
-rw-r--r--metadata/md5-cache/dev-java/j2objc-annotations-1.2-r12
-rw-r--r--metadata/md5-cache/dev-java/jackcess-4.0.02
-rw-r--r--metadata/md5-cache/dev-java/jackrabbit-webdav-2.10.1-r22
-rw-r--r--metadata/md5-cache/dev-java/jackrabbit-webdav-2.21.7-r12
-rw-r--r--metadata/md5-cache/dev-java/jackson-annotations-2.13.2-r16
-rw-r--r--metadata/md5-cache/dev-java/jackson-annotations-2.13.3 (renamed from metadata/md5-cache/dev-java/jackson-annotations-2.13.2)10
-rw-r--r--metadata/md5-cache/dev-java/jackson-core-2.13.2-r16
-rw-r--r--metadata/md5-cache/dev-java/jackson-core-2.13.3 (renamed from metadata/md5-cache/dev-java/jackson-core-2.13.2)10
-rw-r--r--metadata/md5-cache/dev-java/jackson-databind-2.13.215
-rw-r--r--metadata/md5-cache/dev-java/jackson-databind-2.13.2.26
-rw-r--r--metadata/md5-cache/dev-java/jackson-databind-2.13.315
-rw-r--r--metadata/md5-cache/dev-java/jackson-dataformat-xml-2.13.215
-rw-r--r--metadata/md5-cache/dev-java/jackson-dataformat-xml-2.13.2-r16
-rw-r--r--metadata/md5-cache/dev-java/jackson-dataformat-xml-2.13.315
-rw-r--r--metadata/md5-cache/dev-java/jackson-dataformat-xml-2.13.3-r115
-rw-r--r--metadata/md5-cache/dev-java/jackson-dataformat-yaml-2.13.215
-rw-r--r--metadata/md5-cache/dev-java/jackson-dataformat-yaml-2.13.2-r16
-rw-r--r--metadata/md5-cache/dev-java/jackson-dataformat-yaml-2.13.315
-rw-r--r--metadata/md5-cache/dev-java/jackson-module-jakarta-xmlbind-2.13.215
-rw-r--r--metadata/md5-cache/dev-java/jackson-module-jakarta-xmlbind-2.13.2-r16
-rw-r--r--metadata/md5-cache/dev-java/jackson-module-jakarta-xmlbind-2.13.315
-rw-r--r--metadata/md5-cache/dev-java/jackson-module-jakarta-xmlbind-2.13.3-r115
-rw-r--r--metadata/md5-cache/dev-java/jacl-1.4.1-r22
-rw-r--r--metadata/md5-cache/dev-java/jai-imageio-core-1.4.02
-rw-r--r--metadata/md5-cache/dev-java/jai-imageio-jpeg2000-1.4.02
-rw-r--r--metadata/md5-cache/dev-java/jakarta-activation-1.2.2-r12
-rw-r--r--metadata/md5-cache/dev-java/jakarta-activation-2.0.1-r12
-rw-r--r--metadata/md5-cache/dev-java/jakarta-activation-api-1.2.2-r12
-rw-r--r--metadata/md5-cache/dev-java/jakarta-activation-api-2.1.0-r12
-rw-r--r--metadata/md5-cache/dev-java/jakarta-json-api-1.1.62
-rw-r--r--metadata/md5-cache/dev-java/jakarta-mail-api-2.1.015
-rw-r--r--metadata/md5-cache/dev-java/jakarta-oro-2.0.8-r52
-rw-r--r--metadata/md5-cache/dev-java/jakarta-regexp-1.3-r62
-rw-r--r--metadata/md5-cache/dev-java/jakarta-regexp-1.4-r32
-rw-r--r--metadata/md5-cache/dev-java/jakarta-regexp-1.5-r12
-rw-r--r--metadata/md5-cache/dev-java/jakarta-xml-soap-api-1.4.2-r12
-rw-r--r--metadata/md5-cache/dev-java/jakartaee-migration-1.0.02
-rw-r--r--metadata/md5-cache/dev-java/jal-20031117-r62
-rw-r--r--metadata/md5-cache/dev-java/janino-3.1.7 (renamed from metadata/md5-cache/dev-java/janino-3.1.6)8
-rw-r--r--metadata/md5-cache/dev-java/jansi-1.132
-rw-r--r--metadata/md5-cache/dev-java/jansi-2.4.0-r12
-rw-r--r--metadata/md5-cache/dev-java/jansi-native-1.82
-rw-r--r--metadata/md5-cache/dev-java/japitools-0.9.7-r415
-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/java-dep-check-0.52
-rw-r--r--metadata/md5-cache/dev-java/java-diff-utils-1.3.02
-rw-r--r--metadata/md5-cache/dev-java/java-getopt-1.0.14-r12
-rw-r--r--metadata/md5-cache/dev-java/java-service-wrapper-3.5.25-r22
-rw-r--r--metadata/md5-cache/dev-java/javacc-5.0-r46
-rw-r--r--metadata/md5-cache/dev-java/javacup-0.11b_p20151001-r12
-rw-r--r--metadata/md5-cache/dev-java/javahelp-2.0.05_p2017071914
-rw-r--r--metadata/md5-cache/dev-java/javahelp-2.0.05_p20170719-r16
-rw-r--r--metadata/md5-cache/dev-java/javassist-3.18.2-r12
-rw-r--r--metadata/md5-cache/dev-java/javatoolkit-0.6.72
-rw-r--r--metadata/md5-cache/dev-java/javax-inject-1-r42
-rw-r--r--metadata/md5-cache/dev-java/javax-mail-1.6.7-r12
-rw-r--r--metadata/md5-cache/dev-java/jaxb-api-2.3.315
-rw-r--r--metadata/md5-cache/dev-java/jaxb-api-2.3.3-r16
-rw-r--r--metadata/md5-cache/dev-java/jaxb-api-3.0.114
-rw-r--r--metadata/md5-cache/dev-java/jaxb-api-3.0.1-r18
-rw-r--r--metadata/md5-cache/dev-java/jaxb-api-4.0.015
-rw-r--r--metadata/md5-cache/dev-java/jaxb-runtime-4.0.015
-rw-r--r--metadata/md5-cache/dev-java/jaxb-stax-ex-2.1.015
-rw-r--r--metadata/md5-cache/dev-java/jaxen-1.2.0-r12
-rw-r--r--metadata/md5-cache/dev-java/jbig2-imageio-3.0.32
-rw-r--r--metadata/md5-cache/dev-java/jbitcollider-core-0.8-r16
-rw-r--r--metadata/md5-cache/dev-java/jboss-jms-api-1.0.12
-rw-r--r--metadata/md5-cache/dev-java/jboss-marshalling-1.3.0-r214
-rw-r--r--metadata/md5-cache/dev-java/jboss-modules-1.3.3-r12
-rw-r--r--metadata/md5-cache/dev-java/jcalendar-1.4-r12
-rw-r--r--metadata/md5-cache/dev-java/jchart2d-3.2.2-r12
-rw-r--r--metadata/md5-cache/dev-java/jcifs-1.3.19-r12
-rw-r--r--metadata/md5-cache/dev-java/jcip-annotations-1.0.1-r12
-rw-r--r--metadata/md5-cache/dev-java/jclasslib-3.1-r12
-rw-r--r--metadata/md5-cache/dev-java/jcommander-1.48-r115
-rw-r--r--metadata/md5-cache/dev-java/jcommander-1.826
-rw-r--r--metadata/md5-cache/dev-java/jctools-core-2.0.22
-rw-r--r--metadata/md5-cache/dev-java/jctools-core-3.1.015
-rw-r--r--metadata/md5-cache/dev-java/jdbc-mssqlserver-6.2.213
-rw-r--r--metadata/md5-cache/dev-java/jdbc-mysql-8.0.262
-rw-r--r--metadata/md5-cache/dev-java/jdbc-postgresql-42.4.014
-rw-r--r--metadata/md5-cache/dev-java/jdbc-postgresql-9.4_p1206-r12
-rw-r--r--metadata/md5-cache/dev-java/jdepend-2.102
-rw-r--r--metadata/md5-cache/dev-java/jdom-1.1.3-r12
-rw-r--r--metadata/md5-cache/dev-java/jdom-2.0.6-r515
-rw-r--r--metadata/md5-cache/dev-java/jdom-2.0.6.115
-rw-r--r--metadata/md5-cache/dev-java/jempbox-1.7.1-r115
-rw-r--r--metadata/md5-cache/dev-java/jeromq-0.5.22
-rw-r--r--metadata/md5-cache/dev-java/jffi-1.2.9-r12
-rw-r--r--metadata/md5-cache/dev-java/jffi-1.3.62
-rw-r--r--metadata/md5-cache/dev-java/jffi-1.3.915
-rw-r--r--metadata/md5-cache/dev-java/jflex-1.6.1-r12
-rw-r--r--metadata/md5-cache/dev-java/jformatstring-2.0.3-r12
-rw-r--r--metadata/md5-cache/dev-java/jgoodies-common-1.8.0-r12
-rw-r--r--metadata/md5-cache/dev-java/jgoodies-looks-2.6.0-r12
-rw-r--r--metadata/md5-cache/dev-java/jgraph-5.12.0.4-r114
-rw-r--r--metadata/md5-cache/dev-java/jide-oss-3.7.122
-rw-r--r--metadata/md5-cache/dev-java/jline-2.14.62
-rw-r--r--metadata/md5-cache/dev-java/jmh-core-1.2114
-rw-r--r--metadata/md5-cache/dev-java/jmh-core-1.356
-rw-r--r--metadata/md5-cache/dev-java/jmock-1.2.0-r22
-rw-r--r--metadata/md5-cache/dev-java/jmock-2.6.1-r12
-rw-r--r--metadata/md5-cache/dev-java/jna-4.2.2-r317
-rw-r--r--metadata/md5-cache/dev-java/jna-5.10.06
-rw-r--r--metadata/md5-cache/dev-java/jna-5.11.04
-rw-r--r--metadata/md5-cache/dev-java/jnacl-1.02
-rw-r--r--metadata/md5-cache/dev-java/jnr-a64asm-1.0.02
-rw-r--r--metadata/md5-cache/dev-java/jnr-constants-0.10.32
-rw-r--r--metadata/md5-cache/dev-java/jnr-ffi-2.0.2-r12
-rw-r--r--metadata/md5-cache/dev-java/jnr-ffi-2.2.1214
-rw-r--r--metadata/md5-cache/dev-java/jnr-ffi-2.2.82
-rw-r--r--metadata/md5-cache/dev-java/jnr-netdb-1.1.4-r12
-rw-r--r--metadata/md5-cache/dev-java/jnr-netdb-1.2.015
-rw-r--r--metadata/md5-cache/dev-java/jnr-posix-3.0.10-r12
-rw-r--r--metadata/md5-cache/dev-java/jnr-posix-3.1.1515
-rw-r--r--metadata/md5-cache/dev-java/jnr-x86asm-1.0.2-r22
-rw-r--r--metadata/md5-cache/dev-java/joda-convert-2.2.2-r12
-rw-r--r--metadata/md5-cache/dev-java/joda-time-2.10.10-r12
-rw-r--r--metadata/md5-cache/dev-java/jol-core-0.162
-rw-r--r--metadata/md5-cache/dev-java/jopt-simple-5.014
-rw-r--r--metadata/md5-cache/dev-java/jopt-simple-5.0-r16
-rw-r--r--metadata/md5-cache/dev-java/jopt-simple-5.0.4 (renamed from metadata/md5-cache/dev-java/jopt-simple-4.6-r1)10
-rw-r--r--metadata/md5-cache/dev-java/jrobin-1.6.0-r22
-rw-r--r--metadata/md5-cache/dev-java/jsch-0.1.552
-rw-r--r--metadata/md5-cache/dev-java/jsch-agent-proxy-0.0.92
-rw-r--r--metadata/md5-cache/dev-java/json-202203202
-rw-r--r--metadata/md5-cache/dev-java/json-simple-1.1-r22
-rw-r--r--metadata/md5-cache/dev-java/jspeex-0.9.7-r22
-rw-r--r--metadata/md5-cache/dev-java/jsr250-1.214
-rw-r--r--metadata/md5-cache/dev-java/jsr305-3.0.2-r12
-rw-r--r--metadata/md5-cache/dev-java/jta-1.1-r12
-rw-r--r--metadata/md5-cache/dev-java/jtds-1.3.1-r12
-rw-r--r--metadata/md5-cache/dev-java/jtidy-1.0-r12
-rw-r--r--metadata/md5-cache/dev-java/junit-3.8.2-r22
-rw-r--r--metadata/md5-cache/dev-java/junit-4.13.22
-rw-r--r--metadata/md5-cache/dev-java/junit-clptr-1.2.22
-rw-r--r--metadata/md5-cache/dev-java/junitparams-1.1.12
-rw-r--r--metadata/md5-cache/dev-java/jython-2.7.0-r416
-rw-r--r--metadata/md5-cache/dev-java/jython-2.7.0-r66
-rw-r--r--metadata/md5-cache/dev-java/jzlib-1.1.3-r22
-rw-r--r--metadata/md5-cache/dev-java/kafka-clients-1.1.12
-rw-r--r--metadata/md5-cache/dev-java/leiningen-bin-2.9.114
-rw-r--r--metadata/md5-cache/dev-java/leiningen-bin-2.9.86
-rw-r--r--metadata/md5-cache/dev-java/libg-2.1.0-r22
-rw-r--r--metadata/md5-cache/dev-java/lmax-disruptor-3.4.42
-rw-r--r--metadata/md5-cache/dev-java/log4j-12-api-2.17.115
-rw-r--r--metadata/md5-cache/dev-java/log4j-12-api-2.17.26
-rw-r--r--metadata/md5-cache/dev-java/log4j-api-2.17.115
-rw-r--r--metadata/md5-cache/dev-java/log4j-api-2.17.26
-rw-r--r--metadata/md5-cache/dev-java/log4j-api-java9-2.17.12
-rw-r--r--metadata/md5-cache/dev-java/log4j-core-2.17.26
-rw-r--r--metadata/md5-cache/dev-java/log4j-core-2.17.2-r1 (renamed from metadata/md5-cache/dev-java/log4j-core-2.17.1-r1)12
-rw-r--r--metadata/md5-cache/dev-java/logback-classic-1.2.116
-rw-r--r--metadata/md5-cache/dev-java/logback-core-1.2.116
-rw-r--r--metadata/md5-cache/dev-java/lucene-2.4.1-r32
-rw-r--r--metadata/md5-cache/dev-java/lz4-java-1.8.0-r12
-rw-r--r--metadata/md5-cache/dev-java/lzma-19.006
-rw-r--r--metadata/md5-cache/dev-java/lzmajio-0.95-r36
-rw-r--r--metadata/md5-cache/dev-java/maven-bin-3.8.22
-rw-r--r--metadata/md5-cache/dev-java/maven-bin-3.8.32
-rw-r--r--metadata/md5-cache/dev-java/maven-hawtjni-plugin-1.1513
-rw-r--r--metadata/md5-cache/dev-java/mchange-commons-0.2.202
-rw-r--r--metadata/md5-cache/dev-java/mersennetwister-0_pre23765-r26
-rw-r--r--metadata/md5-cache/dev-java/metainf-services-1.7-r12
-rw-r--r--metadata/md5-cache/dev-java/microba-0.4.4.3-r214
-rw-r--r--metadata/md5-cache/dev-java/miglayout-4.0-r12
-rw-r--r--metadata/md5-cache/dev-java/mill-bin-0.10.110
-rw-r--r--metadata/md5-cache/dev-java/mill-bin-0.10.210
-rw-r--r--metadata/md5-cache/dev-java/mill-bin-0.10.310
-rw-r--r--metadata/md5-cache/dev-java/mill-bin-0.10.4 (renamed from metadata/md5-cache/dev-java/mill-bin-0.10.0)2
-rw-r--r--metadata/md5-cache/dev-java/mimepull-1.9.6-r214
-rw-r--r--metadata/md5-cache/dev-java/mockito-1.9.5-r22
-rw-r--r--metadata/md5-cache/dev-java/mockito-4.4.06
-rw-r--r--metadata/md5-cache/dev-java/mockito-4.6.014
-rw-r--r--metadata/md5-cache/dev-java/mockito-4.6.114
-rw-r--r--metadata/md5-cache/dev-java/msv-201306012
-rw-r--r--metadata/md5-cache/dev-java/mvel-2.3.2-r12
-rw-r--r--metadata/md5-cache/dev-java/netty-4.1.356
-rw-r--r--metadata/md5-cache/dev-java/netty-4.1.35-r115
-rw-r--r--metadata/md5-cache/dev-java/netty-buffer-4.0.362
-rw-r--r--metadata/md5-cache/dev-java/netty-buffer-4.0.36-r12
-rw-r--r--metadata/md5-cache/dev-java/netty-common-4.0.36-r22
-rw-r--r--metadata/md5-cache/dev-java/netty-transport-4.0.362
-rw-r--r--metadata/md5-cache/dev-java/objenesis-3.22
-rw-r--r--metadata/md5-cache/dev-java/objenesis-test-3.22
-rw-r--r--metadata/md5-cache/dev-java/openjdk-11.0.14_p9-r115
-rw-r--r--metadata/md5-cache/dev-java/openjdk-11.0.15_p107
-rw-r--r--metadata/md5-cache/dev-java/openjdk-17.0.2_p815
-rw-r--r--metadata/md5-cache/dev-java/openjdk-17.0.3_p711
-rw-r--r--metadata/md5-cache/dev-java/openjdk-8.322_p0616
-rw-r--r--metadata/md5-cache/dev-java/openjdk-8.332_p098
-rw-r--r--metadata/md5-cache/dev-java/openjdk-bin-11.0.14_p9-r114
-rw-r--r--metadata/md5-cache/dev-java/openjdk-bin-11.0.15_p107
-rw-r--r--metadata/md5-cache/dev-java/openjdk-bin-17.0.2_p814
-rw-r--r--metadata/md5-cache/dev-java/openjdk-bin-17.0.3_p77
-rw-r--r--metadata/md5-cache/dev-java/openjdk-bin-8.322_p0614
-rw-r--r--metadata/md5-cache/dev-java/openjdk-bin-8.332_p097
-rw-r--r--metadata/md5-cache/dev-java/openjdk-jre-bin-11.0.14_p9-r14
-rw-r--r--metadata/md5-cache/dev-java/openjdk-jre-bin-11.0.15_p107
-rw-r--r--metadata/md5-cache/dev-java/openjdk-jre-bin-17.0.3_p77
-rw-r--r--metadata/md5-cache/dev-java/openjdk-jre-bin-8.322_p064
-rw-r--r--metadata/md5-cache/dev-java/openjdk-jre-bin-8.332_p097
-rw-r--r--metadata/md5-cache/dev-java/openjfx-11.0.11_p12
-rw-r--r--metadata/md5-cache/dev-java/openjfx-11.0.9_p02
-rw-r--r--metadata/md5-cache/dev-java/openjfx-8.10002
-rw-r--r--metadata/md5-cache/dev-java/opentest4j-1.2.02
-rw-r--r--metadata/md5-cache/dev-java/oracle-javamail-1.5.6-r114
-rw-r--r--metadata/md5-cache/dev-java/osgi-annotation-versioning-1.1.12
-rw-r--r--metadata/md5-cache/dev-java/osgi-compendium-4.3.1-r3 (renamed from metadata/md5-cache/dev-java/osgi-compendium-4.3.1-r2)12
-rw-r--r--metadata/md5-cache/dev-java/osgi-core-api-5.0.0-r22
-rw-r--r--metadata/md5-cache/dev-java/osgi-enterprise-api-5.0.0-r115
-rw-r--r--metadata/md5-cache/dev-java/osgi-enterprise-api-5.0.0-r26
-rw-r--r--metadata/md5-cache/dev-java/osgi-foundation-1.2.0-r22
-rw-r--r--metadata/md5-cache/dev-java/pdf-renderer-1.0.5-r12
-rw-r--r--metadata/md5-cache/dev-java/pdfbox-2.0.26 (renamed from metadata/md5-cache/dev-java/pdfbox-2.0.24)14
-rw-r--r--metadata/md5-cache/dev-java/picocli-4.6.3-r12
-rw-r--r--metadata/md5-cache/dev-java/plexus-classworlds-2.2.32
-rw-r--r--metadata/md5-cache/dev-java/poi-5.0.02
-rw-r--r--metadata/md5-cache/dev-java/protobuf-java-3.17.32
-rw-r--r--metadata/md5-cache/dev-java/protobuf-java-3.19.32
-rw-r--r--metadata/md5-cache/dev-java/protobuf-java-99992
-rw-r--r--metadata/md5-cache/dev-java/qdox-1.12.1-r32
-rw-r--r--metadata/md5-cache/dev-java/randomized-runner-2.7.92
-rw-r--r--metadata/md5-cache/dev-java/rat-0.132
-rw-r--r--metadata/md5-cache/dev-java/reflections-0.9.10-r114
-rw-r--r--metadata/md5-cache/dev-java/reflections-0.9.12-r26
-rw-r--r--metadata/md5-cache/dev-java/reflections-0.9.12-r315
-rw-r--r--metadata/md5-cache/dev-java/relaxng-datatype-1.0-r214
-rw-r--r--metadata/md5-cache/dev-java/relaxng-datatype-1.0-r36
-rw-r--r--metadata/md5-cache/dev-java/resin-servlet-api-3.0.25-r12
-rw-r--r--metadata/md5-cache/dev-java/resin-servlet-api-4.0.27-r22
-rw-r--r--metadata/md5-cache/dev-java/resin-servlet-api-4.0.46-r12
-rw-r--r--metadata/md5-cache/dev-java/rhino-1.7.142
-rw-r--r--metadata/md5-cache/dev-java/rome-0.9-r42
-rw-r--r--metadata/md5-cache/dev-java/rxtx-2.2_pre2-r22
-rw-r--r--metadata/md5-cache/dev-java/sac-1.3-r42
-rw-r--r--metadata/md5-cache/dev-java/saslprep-1.114
-rw-r--r--metadata/md5-cache/dev-java/sax-2.2.1-r52
-rw-r--r--metadata/md5-cache/dev-java/saxon-6.5.5-r32
-rw-r--r--metadata/md5-cache/dev-java/saxon-9.2.0.6-r32
-rw-r--r--metadata/md5-cache/dev-java/sbt-0.13.132
-rw-r--r--metadata/md5-cache/dev-java/sbt-0.13.18-r1 (renamed from metadata/md5-cache/dev-java/sbt-0.13.18)12
-rw-r--r--metadata/md5-cache/dev-java/sbt-bin-1.3.106
-rw-r--r--metadata/md5-cache/dev-java/sbt-bin-1.3.213
-rw-r--r--metadata/md5-cache/dev-java/scram-2.115
-rw-r--r--metadata/md5-cache/dev-java/sjsxp-1.0.22
-rw-r--r--metadata/md5-cache/dev-java/slf4j-api-1.7.362
-rw-r--r--metadata/md5-cache/dev-java/slf4j-ext-1.7.362
-rw-r--r--metadata/md5-cache/dev-java/slf4j-nop-1.7.362
-rw-r--r--metadata/md5-cache/dev-java/slf4j-simple-1.7.362
-rw-r--r--metadata/md5-cache/dev-java/snakeyaml-1.302
-rw-r--r--metadata/md5-cache/dev-java/snappy-1.1.7.82
-rw-r--r--metadata/md5-cache/dev-java/sparsebitset-1.22
-rw-r--r--metadata/md5-cache/dev-java/spec-alpha-0.1.1432
-rw-r--r--metadata/md5-cache/dev-java/spec-alpha-0.2.1762
-rw-r--r--metadata/md5-cache/dev-java/spec-alpha-0.2.1942
-rw-r--r--metadata/md5-cache/dev-java/spin-1.5-r216
-rw-r--r--metadata/md5-cache/dev-java/stax2-api-4.2.114
-rw-r--r--metadata/md5-cache/dev-java/stax2-api-4.2.1-r16
-rw-r--r--metadata/md5-cache/dev-java/stringprep-1.114
-rw-r--r--metadata/md5-cache/dev-java/stringtemplate-3.2.1-r22
-rw-r--r--metadata/md5-cache/dev-java/stringtemplate-4.3.22
-rw-r--r--metadata/md5-cache/dev-java/sun-jai-bin-1.1.3-r22
-rw-r--r--metadata/md5-cache/dev-java/sun-jms-1.1-r316
-rw-r--r--metadata/md5-cache/dev-java/swing-layout-1.0.4-r22
-rw-r--r--metadata/md5-cache/dev-java/swingx-1.6.4-r12
-rw-r--r--metadata/md5-cache/dev-java/swingx-beaninfo-1.6.4-r12
-rw-r--r--metadata/md5-cache/dev-java/swingx-ws-1.0_p20110515-r22
-rw-r--r--metadata/md5-cache/dev-java/swt-3.7.2-r32
-rw-r--r--metadata/md5-cache/dev-java/swt-3.8.2-r42
-rw-r--r--metadata/md5-cache/dev-java/swt-4.10-r22
-rw-r--r--metadata/md5-cache/dev-java/testng-6.9.1015
-rw-r--r--metadata/md5-cache/dev-java/testng-6.9.10-r16
-rw-r--r--metadata/md5-cache/dev-java/tomcat-native-1.2.336
-rw-r--r--metadata/md5-cache/dev-java/tomcat-native-1.2.34 (renamed from metadata/md5-cache/dev-java/tomcat-native-1.2.32)8
-rw-r--r--metadata/md5-cache/dev-java/tomcat-servlet-api-10.0.21 (renamed from metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.62)10
-rw-r--r--metadata/md5-cache/dev-java/tomcat-servlet-api-10.0.22 (renamed from metadata/md5-cache/dev-java/tomcat-servlet-api-10.0.18)8
-rw-r--r--metadata/md5-cache/dev-java/tomcat-servlet-api-4.1.402
-rw-r--r--metadata/md5-cache/dev-java/tomcat-servlet-api-5.5.362
-rw-r--r--metadata/md5-cache/dev-java/tomcat-servlet-api-6.0.53-r12
-rw-r--r--metadata/md5-cache/dev-java/tomcat-servlet-api-7.0.1092
-rw-r--r--metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.79 (renamed from metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.78)4
-rw-r--r--metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.81 (renamed from metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.77)8
-rw-r--r--metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.63 (renamed from metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.60)4
-rw-r--r--metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.64 (renamed from metadata/md5-cache/dev-java/tomcat-servlet-api-10.0.20)12
-rw-r--r--metadata/md5-cache/dev-java/treelayout-1.0.3-r12
-rw-r--r--metadata/md5-cache/dev-java/typesafe-config-1.3.0-r32
-rw-r--r--metadata/md5-cache/dev-java/univocity-parsers-2.9.12
-rw-r--r--metadata/md5-cache/dev-java/validation-api-1.0.0-r12
-rw-r--r--metadata/md5-cache/dev-java/validation-api-1.1.0-r12
-rw-r--r--metadata/md5-cache/dev-java/velocity-2.32
-rw-r--r--metadata/md5-cache/dev-java/woodstox-core-6.2.8-r12
-rw-r--r--metadata/md5-cache/dev-java/wsdl4j-1.6.2-r12
-rw-r--r--metadata/md5-cache/dev-java/wsdl4j-1.6.315
-rw-r--r--metadata/md5-cache/dev-java/xalan-2.7.2-r12
-rw-r--r--metadata/md5-cache/dev-java/xalan-serializer-2.7.2-r12
-rw-r--r--metadata/md5-cache/dev-java/xerces-2.12.22
-rw-r--r--metadata/md5-cache/dev-java/xerial-core-2.0.1-r12
-rw-r--r--metadata/md5-cache/dev-java/xjavac-2.4.014
-rw-r--r--metadata/md5-cache/dev-java/xml-commons-external-1.3.04-r114
-rw-r--r--metadata/md5-cache/dev-java/xml-commons-external-1.4.01-r22
-rw-r--r--metadata/md5-cache/dev-java/xml-commons-resolver-1.2-r22
-rw-r--r--metadata/md5-cache/dev-java/xml-commons-resolver-1.2-r314
-rw-r--r--metadata/md5-cache/dev-java/xmlgraphics-commons-2.715
-rw-r--r--metadata/md5-cache/dev-java/xmlgraphics-commons-2.7-r16
-rw-r--r--metadata/md5-cache/dev-java/xmlunit-1.6-r12
-rw-r--r--metadata/md5-cache/dev-java/xmpbox-2.0.26 (renamed from metadata/md5-cache/dev-java/xmpbox-2.0.24)6
-rw-r--r--metadata/md5-cache/dev-java/xom-1.3.72
-rw-r--r--metadata/md5-cache/dev-java/xpp2-2.1.10-r32
-rw-r--r--metadata/md5-cache/dev-java/xpp3-1.1.4c-r62
-rw-r--r--metadata/md5-cache/dev-java/xsdlib-20090415-r12
-rw-r--r--metadata/md5-cache/dev-java/xz-java-1.92
-rw-r--r--metadata/md5-cache/dev-java/zstd-jni-1.5.0.44
489 files changed, 1157 insertions, 1556 deletions
diff --git a/metadata/md5-cache/dev-java/Manifest.gz b/metadata/md5-cache/dev-java/Manifest.gz
index e00de3e31ac7..c159f41c24f4 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/angus-activation-1.0.0 b/metadata/md5-cache/dev-java/angus-activation-1.0.0
index b564f8bcb8ac..366acb650fa5 100644
--- a/metadata/md5-cache/dev-java/angus-activation-1.0.0
+++ b/metadata/md5-cache/dev-java/angus-activation-1.0.0
@@ -10,5 +10,5 @@ LICENSE=EPL-1.0
RDEPEND=>=dev-java/jakarta-activation-api-2.1.0:2 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=0
SRC_URI=https://github.com/eclipse-ee4j/angus-activation/archive/refs/tags/1.0.0.tar.gz -> angus-activation-1.0.0.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=5a90818da557a849d2bd8941803cedea
diff --git a/metadata/md5-cache/dev-java/animal-sniffer-annotations-1.15-r1 b/metadata/md5-cache/dev-java/animal-sniffer-annotations-1.15-r1
index f9cd9d6cd8ff..4a6402ee5846 100644
--- a/metadata/md5-cache/dev-java/animal-sniffer-annotations-1.15-r1
+++ b/metadata/md5-cache/dev-java/animal-sniffer-annotations-1.15-r1
@@ -10,5 +10,5 @@ LICENSE=MIT
RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=0
SRC_URI=https://github.com/mojohaus/animal-sniffer/archive/animal-sniffer-parent-1.15.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=5f4f2d91488556166bdc004714fdf6f6
diff --git a/metadata/md5-cache/dev-java/ant-antlr-1.10.9 b/metadata/md5-cache/dev-java/ant-antlr-1.10.9
index 392d1d5639a1..2812e047853a 100644
--- a/metadata/md5-cache/dev-java/ant-antlr-1.10.9
+++ b/metadata/md5-cache/dev-java/ant-antlr-1.10.9
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/antlr-2.7.7-r7:0 >=dev-java/java-config-2.2.0-r3 ~dev-java/an
RESTRICT=test
SLOT=0
SRC_URI=mirror://apache/ant/source/apache-ant-1.10.9-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.10.9-gentoo.tar.bz2
-_eclasses_=ant-tasks bf8953b38a65f5a7d92b8d2ba4efa7f4 java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=ant-tasks bf8953b38a65f5a7d92b8d2ba4efa7f4 java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 cfb5f6911bb70204c94ceafd0372c716 multilib 4fbbbc98f236f1b43acd99476bc3cd85 toolchain-funcs e9da88162e7a3c60376e80c2c2adcdfb
_md5_=e34ccc87a626ad32a574e7078c842e05
diff --git a/metadata/md5-cache/dev-java/ant-apache-bcel-1.10.9 b/metadata/md5-cache/dev-java/ant-apache-bcel-1.10.9
index 4917d9900d49..bcedd5e4cf91 100644
--- a/metadata/md5-cache/dev-java/ant-apache-bcel-1.10.9
+++ b/metadata/md5-cache/dev-java/ant-apache-bcel-1.10.9
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/bcel-5.1-r3:0 >=dev-java/java-config-2.2.0-r3 ~dev-java/ant-c
RESTRICT=test
SLOT=0
SRC_URI=mirror://apache/ant/source/apache-ant-1.10.9-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.10.9-gentoo.tar.bz2
-_eclasses_=ant-tasks bf8953b38a65f5a7d92b8d2ba4efa7f4 java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=ant-tasks bf8953b38a65f5a7d92b8d2ba4efa7f4 java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 cfb5f6911bb70204c94ceafd0372c716 multilib 4fbbbc98f236f1b43acd99476bc3cd85 toolchain-funcs e9da88162e7a3c60376e80c2c2adcdfb
_md5_=f0a7256c8537cd8896f15a893d4f7793
diff --git a/metadata/md5-cache/dev-java/ant-apache-bsf-1.10.9 b/metadata/md5-cache/dev-java/ant-apache-bsf-1.10.9
index 64070bb3e92f..4a7469c8b239 100644
--- a/metadata/md5-cache/dev-java/ant-apache-bsf-1.10.9
+++ b/metadata/md5-cache/dev-java/ant-apache-bsf-1.10.9
@@ -11,5 +11,5 @@ RDEPEND=>=dev-java/bsf-2.4.0-r1:2.3[python?,javascript?,tcl?] >=dev-java/java-co
RESTRICT=test
SLOT=0
SRC_URI=mirror://apache/ant/source/apache-ant-1.10.9-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.10.9-gentoo.tar.bz2
-_eclasses_=ant-tasks bf8953b38a65f5a7d92b8d2ba4efa7f4 java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=ant-tasks bf8953b38a65f5a7d92b8d2ba4efa7f4 java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 cfb5f6911bb70204c94ceafd0372c716 multilib 4fbbbc98f236f1b43acd99476bc3cd85 toolchain-funcs e9da88162e7a3c60376e80c2c2adcdfb
_md5_=64a9cc51fd51b815e8d71966014dc957
diff --git a/metadata/md5-cache/dev-java/ant-apache-log4j-1.10.9-r1 b/metadata/md5-cache/dev-java/ant-apache-log4j-1.10.9-r1
index 3d11e98db462..9e0fa093ba9c 100644
--- a/metadata/md5-cache/dev-java/ant-apache-log4j-1.10.9-r1
+++ b/metadata/md5-cache/dev-java/ant-apache-log4j-1.10.9-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-java/log4j-12-api:2 >=dev-java/java-config-2.2.0-r3 ~dev-java/ant-co
RESTRICT=test
SLOT=0
SRC_URI=mirror://apache/ant/source/apache-ant-1.10.9-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.10.9-gentoo.tar.bz2
-_eclasses_=ant-tasks bf8953b38a65f5a7d92b8d2ba4efa7f4 java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=ant-tasks bf8953b38a65f5a7d92b8d2ba4efa7f4 java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 cfb5f6911bb70204c94ceafd0372c716 multilib 4fbbbc98f236f1b43acd99476bc3cd85 toolchain-funcs e9da88162e7a3c60376e80c2c2adcdfb
_md5_=eab333cc6f69a614495b1a4a4eaea139
diff --git a/metadata/md5-cache/dev-java/ant-apache-oro-1.10.9 b/metadata/md5-cache/dev-java/ant-apache-oro-1.10.9
index 652f1396c8a9..0230698e1429 100644
--- a/metadata/md5-cache/dev-java/ant-apache-oro-1.10.9
+++ b/metadata/md5-cache/dev-java/ant-apache-oro-1.10.9
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/jakarta-oro-2.0.8-r2:2.0 >=dev-java/java-config-2.2.0-r3 ~dev
RESTRICT=test
SLOT=0
SRC_URI=mirror://apache/ant/source/apache-ant-1.10.9-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.10.9-gentoo.tar.bz2
-_eclasses_=ant-tasks bf8953b38a65f5a7d92b8d2ba4efa7f4 java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=ant-tasks bf8953b38a65f5a7d92b8d2ba4efa7f4 java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 cfb5f6911bb70204c94ceafd0372c716 multilib 4fbbbc98f236f1b43acd99476bc3cd85 toolchain-funcs e9da88162e7a3c60376e80c2c2adcdfb
_md5_=08992e578bac558a1819b6052b1421a0
diff --git a/metadata/md5-cache/dev-java/ant-apache-regexp-1.10.9 b/metadata/md5-cache/dev-java/ant-apache-regexp-1.10.9
index a94b13b834a4..43230a03f850 100644
--- a/metadata/md5-cache/dev-java/ant-apache-regexp-1.10.9
+++ b/metadata/md5-cache/dev-java/ant-apache-regexp-1.10.9
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/jakarta-regexp-1.4-r1:1.4 >=dev-java/java-config-2.2.0-r3 ~de
RESTRICT=test
SLOT=0
SRC_URI=mirror://apache/ant/source/apache-ant-1.10.9-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.10.9-gentoo.tar.bz2
-_eclasses_=ant-tasks bf8953b38a65f5a7d92b8d2ba4efa7f4 java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=ant-tasks bf8953b38a65f5a7d92b8d2ba4efa7f4 java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 cfb5f6911bb70204c94ceafd0372c716 multilib 4fbbbc98f236f1b43acd99476bc3cd85 toolchain-funcs e9da88162e7a3c60376e80c2c2adcdfb
_md5_=9571e66c145abbe89dfc22113a77d6a7
diff --git a/metadata/md5-cache/dev-java/ant-apache-resolver-1.10.9 b/metadata/md5-cache/dev-java/ant-apache-resolver-1.10.9
index 62a9a83e20e9..91de12ea7a4c 100644
--- a/metadata/md5-cache/dev-java/ant-apache-resolver-1.10.9
+++ b/metadata/md5-cache/dev-java/ant-apache-resolver-1.10.9
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/xml-commons-resolver-1.2:0 >=dev-java/java-config-2.2.0-r3 ~d
RESTRICT=test
SLOT=0
SRC_URI=mirror://apache/ant/source/apache-ant-1.10.9-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.10.9-gentoo.tar.bz2
-_eclasses_=ant-tasks bf8953b38a65f5a7d92b8d2ba4efa7f4 java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=ant-tasks bf8953b38a65f5a7d92b8d2ba4efa7f4 java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 cfb5f6911bb70204c94ceafd0372c716 multilib 4fbbbc98f236f1b43acd99476bc3cd85 toolchain-funcs e9da88162e7a3c60376e80c2c2adcdfb
_md5_=b2537452929b04a6bd67a5307b739052
diff --git a/metadata/md5-cache/dev-java/ant-apache-xalan2-1.10.9 b/metadata/md5-cache/dev-java/ant-apache-xalan2-1.10.9
index 9660d6c90c0b..4df9f59913ad 100644
--- a/metadata/md5-cache/dev-java/ant-apache-xalan2-1.10.9
+++ b/metadata/md5-cache/dev-java/ant-apache-xalan2-1.10.9
@@ -10,5 +10,5 @@ RDEPEND=dev-java/xalan:0 dev-java/xalan-serializer:0 >=dev-java/java-config-2.2.
RESTRICT=test
SLOT=0
SRC_URI=mirror://apache/ant/source/apache-ant-1.10.9-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.10.9-gentoo.tar.bz2
-_eclasses_=ant-tasks bf8953b38a65f5a7d92b8d2ba4efa7f4 java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=ant-tasks bf8953b38a65f5a7d92b8d2ba4efa7f4 java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 cfb5f6911bb70204c94ceafd0372c716 multilib 4fbbbc98f236f1b43acd99476bc3cd85 toolchain-funcs e9da88162e7a3c60376e80c2c2adcdfb
_md5_=afc98c5e4173e64de9682dd8e2046b1d
diff --git a/metadata/md5-cache/dev-java/ant-commons-logging-1.10.9 b/metadata/md5-cache/dev-java/ant-commons-logging-1.10.9
index 7b69badb1b53..92899348d056 100644
--- a/metadata/md5-cache/dev-java/ant-commons-logging-1.10.9
+++ b/metadata/md5-cache/dev-java/ant-commons-logging-1.10.9
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/commons-logging-1.0.4-r2:0 >=dev-java/java-config-2.2.0-r3 ~d
RESTRICT=test
SLOT=0
SRC_URI=mirror://apache/ant/source/apache-ant-1.10.9-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.10.9-gentoo.tar.bz2
-_eclasses_=ant-tasks bf8953b38a65f5a7d92b8d2ba4efa7f4 java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=ant-tasks bf8953b38a65f5a7d92b8d2ba4efa7f4 java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 cfb5f6911bb70204c94ceafd0372c716 multilib 4fbbbc98f236f1b43acd99476bc3cd85 toolchain-funcs e9da88162e7a3c60376e80c2c2adcdfb
_md5_=c2fe459a05eca5eb22c32caa6d5c9108
diff --git a/metadata/md5-cache/dev-java/ant-commons-net-1.10.9 b/metadata/md5-cache/dev-java/ant-commons-net-1.10.9
index 9d8175d80174..f42b4a994939 100644
--- a/metadata/md5-cache/dev-java/ant-commons-net-1.10.9
+++ b/metadata/md5-cache/dev-java/ant-commons-net-1.10.9
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/commons-net-1.4.1-r1:0 >=dev-java/java-config-2.2.0-r3 ~dev-j
RESTRICT=test
SLOT=0
SRC_URI=mirror://apache/ant/source/apache-ant-1.10.9-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.10.9-gentoo.tar.bz2
-_eclasses_=ant-tasks bf8953b38a65f5a7d92b8d2ba4efa7f4 java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=ant-tasks bf8953b38a65f5a7d92b8d2ba4efa7f4 java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 cfb5f6911bb70204c94ceafd0372c716 multilib 4fbbbc98f236f1b43acd99476bc3cd85 toolchain-funcs e9da88162e7a3c60376e80c2c2adcdfb
_md5_=025960691ea0088b2d386db373a44c46
diff --git a/metadata/md5-cache/dev-java/ant-contrib-1.0_beta6_pre20201123-r1 b/metadata/md5-cache/dev-java/ant-contrib-1.0_beta6_pre20201123-r1
index 2992fb47eb69..fed3d89aa0c9 100644
--- a/metadata/md5-cache/dev-java/ant-contrib-1.0_beta6_pre20201123-r1
+++ b/metadata/md5-cache/dev-java/ant-contrib-1.0_beta6_pre20201123-r1
@@ -11,5 +11,5 @@ RDEPEND=dev-java/ant-core:0 dev-java/ant-ivy:2 dev-java/bcel:0 dev-java/commons-
RESTRICT=test !test? ( test )
SLOT=0
SRC_URI=https://github.com/cniweb/ant-contrib/archive/0228412be2ef648cfabc1d74416d3188755aff9b.tar.gz -> ant-contrib-1.0_beta6_pre20201123.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=fa7c24e7af94c93a09a703c266c268bc
diff --git a/metadata/md5-cache/dev-java/ant-core-1.10.9-r3 b/metadata/md5-cache/dev-java/ant-core-1.10.9-r5
index 77732e4f45bd..6deb4de02ec4 100644
--- a/metadata/md5-cache/dev-java/ant-core-1.10.9-r3
+++ b/metadata/md5-cache/dev-java/ant-core-1.10.9-r5
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
RESTRICT=test
SLOT=0
SRC_URI=https://archive.apache.org/dist/ant/source/apache-ant-1.10.9-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.10.9-gentoo.tar.bz2
-_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b prefix eab3c99d77fe00506c109c8a736186f7 toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=1d13bd87f602ae7cb47269498f3e56ef
+_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 cfb5f6911bb70204c94ceafd0372c716 multilib 4fbbbc98f236f1b43acd99476bc3cd85 prefix eab3c99d77fe00506c109c8a736186f7 toolchain-funcs e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=20c39a9dfeb803c3bdce27f967c97e5e
diff --git a/metadata/md5-cache/dev-java/ant-eclipse-ecj-4.15-r1 b/metadata/md5-cache/dev-java/ant-eclipse-ecj-4.15-r1
index 5d1a69637596..fa43497f4427 100644
--- a/metadata/md5-cache/dev-java/ant-eclipse-ecj-4.15-r1
+++ b/metadata/md5-cache/dev-java/ant-eclipse-ecj-4.15-r1
@@ -11,5 +11,5 @@ LICENSE=EPL-1.0
RDEPEND=~dev-java/eclipse-ecj-4.15:4.15 dev-java/ant-core:0 >=virtual/jre-11:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=4.15
SRC_URI=https://archive.eclipse.org/eclipse/downloads/drops4/R-4.15-202003050155/ecjsrc-4.15.jar
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 prefix eab3c99d77fe00506c109c8a736186f7
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716 prefix eab3c99d77fe00506c109c8a736186f7
_md5_=1b628cead7c3a75ec3360a1af96cd2b8
diff --git a/metadata/md5-cache/dev-java/ant-eclipse-ecj-4.22 b/metadata/md5-cache/dev-java/ant-eclipse-ecj-4.22-r1
index 0ecbf6fd0469..912f253b07aa 100644
--- a/metadata/md5-cache/dev-java/ant-eclipse-ecj-4.22
+++ b/metadata/md5-cache/dev-java/ant-eclipse-ecj-4.22-r1
@@ -1,6 +1,6 @@
BDEPEND=app-arch/unzip
DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=~dev-java/eclipse-ecj-4.22:4.22 dev-java/ant-core:0 >=virtual/jdk-11:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DEPEND=~dev-java/eclipse-ecj-4.22:4.22 dev-java/ant-core:0 >=virtual/jdk-17:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
DESCRIPTION=Ant Compiler Adapter for Eclipse Java Compiler
EAPI=8
HOMEPAGE=https://www.eclipse.org/
@@ -11,5 +11,5 @@ LICENSE=EPL-1.0
RDEPEND=~dev-java/eclipse-ecj-4.22:4.22 dev-java/ant-core:0 >=virtual/jre-11:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=4.22
SRC_URI=https://download.eclipse.org/eclipse/downloads/drops4/R-4.22-202111241800/ecjsrc-4.22.jar
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 prefix eab3c99d77fe00506c109c8a736186f7
-_md5_=695b3eb30c21dc00041055907636f025
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716 prefix eab3c99d77fe00506c109c8a736186f7
+_md5_=16906fe0be1c0936565664ca79aca066
diff --git a/metadata/md5-cache/dev-java/ant-eclipse-ecj-4.5.1 b/metadata/md5-cache/dev-java/ant-eclipse-ecj-4.5.1
deleted file mode 100644
index e9e6392f98dc..000000000000
--- a/metadata/md5-cache/dev-java/ant-eclipse-ecj-4.5.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=~dev-java/eclipse-ecj-4.5.1:4.5 >=dev-java/ant-core-1.7 app-arch/unzip >=virtual/jdk-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Ant Compiler Adapter for Eclipse Java Compiler
-EAPI=5
-HOMEPAGE=http://www.eclipse.org/
-INHERIT=java-pkg-2 java-pkg-simple prefix
-IUSE=doc source
-KEYWORDS=amd64 ~ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris
-LICENSE=EPL-1.0
-RDEPEND=~dev-java/eclipse-ecj-4.5.1:4.5 >=dev-java/ant-core-1.7 >=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=4.5
-SRC_URI=http://download.eclipse.org/eclipse/downloads/drops4/R-4.5.1-201509040015/ecjsrc-4.5.1.jar
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 eapi7-ver 1a0a60ad07c8b32d2faba2d085dc0f24 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 9f813bb3c47cf2e60619a663b87c5f4e estack 055c42df72f76a4f45ec92b35e83cd56 eutils dab5d8ec471d025b79c9e6906bcf3bff java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 ltprune 97143780d341cc8d8f1d4c6187a36d29 multilib 4a33c9008e5ee30cb8840a3fdc24df2b prefix eab3c99d77fe00506c109c8a736186f7 preserve-libs a8e50acee31b5759b4df1f7707cae54b strip-linguas ac3ee41ee2d31d8c41a77c0838320cc7 toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8 vcs-clean d271b7bc7e6a009758d7d4ef749174e3 versionator d3fb3ba33acc3bbbdc4d7970227c100d wrapper 4a1902f969e5718126434fc35f3a0d9c
-_md5_=42a68e63a4276ba15c73cee21a0e4704
diff --git a/metadata/md5-cache/dev-java/ant-ivy-2.5.0-r1 b/metadata/md5-cache/dev-java/ant-ivy-2.5.0-r1
index 305744eb6bb3..ce8e8aca6822 100644
--- a/metadata/md5-cache/dev-java/ant-ivy-2.5.0-r1
+++ b/metadata/md5-cache/dev-java/ant-ivy-2.5.0-r1
@@ -12,5 +12,5 @@ RDEPEND=dev-java/ant-core:0 dev-java/bcpg:0 dev-java/bcprov:0 dev-java/httpcompo
RESTRICT=test !test? ( test )
SLOT=2
SRC_URI=mirror://apache/ant/ivy/2.5.0/apache-ivy-2.5.0-src.tar.gz
-_eclasses_=java-osgi c9b922d3fd7b5c6117f4c4d68e32e881 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-osgi c9b922d3fd7b5c6117f4c4d68e32e881 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=b8ffa063f56d10f6081980a097bcb278
diff --git a/metadata/md5-cache/dev-java/ant-jai-1.10.9 b/metadata/md5-cache/dev-java/ant-jai-1.10.9
index 7f063d4754bf..5d753f663b62 100644
--- a/metadata/md5-cache/dev-java/ant-jai-1.10.9
+++ b/metadata/md5-cache/dev-java/ant-jai-1.10.9
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/sun-jai-bin-1.1.2.01-r1 >=dev-java/java-config-2.2.0-r3 ~dev-
RESTRICT=test
SLOT=0
SRC_URI=mirror://apache/ant/source/apache-ant-1.10.9-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.10.9-gentoo.tar.bz2
-_eclasses_=ant-tasks bf8953b38a65f5a7d92b8d2ba4efa7f4 java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=ant-tasks bf8953b38a65f5a7d92b8d2ba4efa7f4 java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 cfb5f6911bb70204c94ceafd0372c716 multilib 4fbbbc98f236f1b43acd99476bc3cd85 toolchain-funcs e9da88162e7a3c60376e80c2c2adcdfb
_md5_=42e8a3bbc17b75be224e72baf75747a2
diff --git a/metadata/md5-cache/dev-java/ant-javamail-1.10.9-r1 b/metadata/md5-cache/dev-java/ant-javamail-1.10.9-r1
index e90da7532002..62e4eeda021d 100644
--- a/metadata/md5-cache/dev-java/ant-javamail-1.10.9-r1
+++ b/metadata/md5-cache/dev-java/ant-javamail-1.10.9-r1
@@ -10,5 +10,5 @@ RDEPEND=virtual/jdk:1.8 dev-java/gnu-jaf:1 dev-java/javax-mail:0 >=dev-java/java
RESTRICT=test
SLOT=0
SRC_URI=mirror://apache/ant/source/apache-ant-1.10.9-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.10.9-gentoo.tar.bz2
-_eclasses_=ant-tasks bf8953b38a65f5a7d92b8d2ba4efa7f4 java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=ant-tasks bf8953b38a65f5a7d92b8d2ba4efa7f4 java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 cfb5f6911bb70204c94ceafd0372c716 multilib 4fbbbc98f236f1b43acd99476bc3cd85 toolchain-funcs e9da88162e7a3c60376e80c2c2adcdfb
_md5_=95696bd61b85b23a07f7eac32f544426
diff --git a/metadata/md5-cache/dev-java/ant-jdepend-1.10.9 b/metadata/md5-cache/dev-java/ant-jdepend-1.10.9
index 822f520812d3..b486d8b825a8 100644
--- a/metadata/md5-cache/dev-java/ant-jdepend-1.10.9
+++ b/metadata/md5-cache/dev-java/ant-jdepend-1.10.9
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/jdepend-2.9-r2:0 >=dev-java/java-config-2.2.0-r3 ~dev-java/an
RESTRICT=test
SLOT=0
SRC_URI=mirror://apache/ant/source/apache-ant-1.10.9-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.10.9-gentoo.tar.bz2
-_eclasses_=ant-tasks bf8953b38a65f5a7d92b8d2ba4efa7f4 java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=ant-tasks bf8953b38a65f5a7d92b8d2ba4efa7f4 java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 cfb5f6911bb70204c94ceafd0372c716 multilib 4fbbbc98f236f1b43acd99476bc3cd85 toolchain-funcs e9da88162e7a3c60376e80c2c2adcdfb
_md5_=b76423fd0a062777430f41b4b23d842e
diff --git a/metadata/md5-cache/dev-java/ant-jmf-1.10.9 b/metadata/md5-cache/dev-java/ant-jmf-1.10.9
index 0795505ea5c5..a410c7d4e5e3 100644
--- a/metadata/md5-cache/dev-java/ant-jmf-1.10.9
+++ b/metadata/md5-cache/dev-java/ant-jmf-1.10.9
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/java-config-2.2.0-r3 ~dev-java/ant-core-1.10.9:0 >=virtual/jr
RESTRICT=test
SLOT=0
SRC_URI=mirror://apache/ant/source/apache-ant-1.10.9-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.10.9-gentoo.tar.bz2
-_eclasses_=ant-tasks bf8953b38a65f5a7d92b8d2ba4efa7f4 java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=ant-tasks bf8953b38a65f5a7d92b8d2ba4efa7f4 java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 cfb5f6911bb70204c94ceafd0372c716 multilib 4fbbbc98f236f1b43acd99476bc3cd85 toolchain-funcs e9da88162e7a3c60376e80c2c2adcdfb
_md5_=c4fe3db8e5d90549dce972a29b652884
diff --git a/metadata/md5-cache/dev-java/ant-jsch-1.10.9 b/metadata/md5-cache/dev-java/ant-jsch-1.10.9
index 09c37257ab51..cc63d583883c 100644
--- a/metadata/md5-cache/dev-java/ant-jsch-1.10.9
+++ b/metadata/md5-cache/dev-java/ant-jsch-1.10.9
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/jsch-0.1.37:0 >=dev-java/java-config-2.2.0-r3 ~dev-java/ant-c
RESTRICT=test
SLOT=0
SRC_URI=mirror://apache/ant/source/apache-ant-1.10.9-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.10.9-gentoo.tar.bz2
-_eclasses_=ant-tasks bf8953b38a65f5a7d92b8d2ba4efa7f4 java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=ant-tasks bf8953b38a65f5a7d92b8d2ba4efa7f4 java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 cfb5f6911bb70204c94ceafd0372c716 multilib 4fbbbc98f236f1b43acd99476bc3cd85 toolchain-funcs e9da88162e7a3c60376e80c2c2adcdfb
_md5_=9c4d200e9c9ef8a75748a54564700257
diff --git a/metadata/md5-cache/dev-java/ant-junit-1.10.9 b/metadata/md5-cache/dev-java/ant-junit-1.10.9
index 43965858ca84..bfa82d52370d 100644
--- a/metadata/md5-cache/dev-java/ant-junit-1.10.9
+++ b/metadata/md5-cache/dev-java/ant-junit-1.10.9
@@ -10,5 +10,5 @@ RDEPEND=dev-java/junit:0 dev-java/junit:4 >=dev-java/java-config-2.2.0-r3 ~dev-j
RESTRICT=test
SLOT=0
SRC_URI=mirror://apache/ant/source/apache-ant-1.10.9-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.10.9-gentoo.tar.bz2
-_eclasses_=ant-tasks bf8953b38a65f5a7d92b8d2ba4efa7f4 java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=ant-tasks bf8953b38a65f5a7d92b8d2ba4efa7f4 java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 cfb5f6911bb70204c94ceafd0372c716 multilib 4fbbbc98f236f1b43acd99476bc3cd85 toolchain-funcs e9da88162e7a3c60376e80c2c2adcdfb
_md5_=dca20742a3e7a8b82d9c2538f7d7fda3
diff --git a/metadata/md5-cache/dev-java/ant-junit4-1.10.9 b/metadata/md5-cache/dev-java/ant-junit4-1.10.9
index 8b51f2bb087e..f17a184da447 100644
--- a/metadata/md5-cache/dev-java/ant-junit4-1.10.9
+++ b/metadata/md5-cache/dev-java/ant-junit4-1.10.9
@@ -10,5 +10,5 @@ RDEPEND=dev-java/junit:4 ~dev-java/ant-junit-1.10.9 >=dev-java/java-config-2.2.0
RESTRICT=test
SLOT=0
SRC_URI=mirror://apache/ant/source/apache-ant-1.10.9-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.10.9-gentoo.tar.bz2
-_eclasses_=ant-tasks bf8953b38a65f5a7d92b8d2ba4efa7f4 java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=ant-tasks bf8953b38a65f5a7d92b8d2ba4efa7f4 java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 cfb5f6911bb70204c94ceafd0372c716 multilib 4fbbbc98f236f1b43acd99476bc3cd85 toolchain-funcs e9da88162e7a3c60376e80c2c2adcdfb
_md5_=6967158f03a23bbcfe494ed4c782ad81
diff --git a/metadata/md5-cache/dev-java/ant-junitlauncher-1.10.9 b/metadata/md5-cache/dev-java/ant-junitlauncher-1.10.9
index 67d8a09f870b..2c8a662b6750 100644
--- a/metadata/md5-cache/dev-java/ant-junitlauncher-1.10.9
+++ b/metadata/md5-cache/dev-java/ant-junitlauncher-1.10.9
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/java-config-2.2.0-r3 ~dev-java/ant-core-1.10.9:0 >=virtual/jr
RESTRICT=test
SLOT=0
SRC_URI=mirror://apache/ant/source/apache-ant-1.10.9-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.10.9-gentoo.tar.bz2
-_eclasses_=ant-tasks bf8953b38a65f5a7d92b8d2ba4efa7f4 java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=ant-tasks bf8953b38a65f5a7d92b8d2ba4efa7f4 java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 cfb5f6911bb70204c94ceafd0372c716 multilib 4fbbbc98f236f1b43acd99476bc3cd85 toolchain-funcs e9da88162e7a3c60376e80c2c2adcdfb
_md5_=2e8b698dd0a76f2d77ed62a329ee9334
diff --git a/metadata/md5-cache/dev-java/ant-swing-1.10.9 b/metadata/md5-cache/dev-java/ant-swing-1.10.9
index 59675a32c393..e06e21a3d187 100644
--- a/metadata/md5-cache/dev-java/ant-swing-1.10.9
+++ b/metadata/md5-cache/dev-java/ant-swing-1.10.9
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/java-config-2.2.0-r3 ~dev-java/ant-core-1.10.9:0 >=virtual/jr
RESTRICT=test
SLOT=0
SRC_URI=mirror://apache/ant/source/apache-ant-1.10.9-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.10.9-gentoo.tar.bz2
-_eclasses_=ant-tasks bf8953b38a65f5a7d92b8d2ba4efa7f4 java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=ant-tasks bf8953b38a65f5a7d92b8d2ba4efa7f4 java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 cfb5f6911bb70204c94ceafd0372c716 multilib 4fbbbc98f236f1b43acd99476bc3cd85 toolchain-funcs e9da88162e7a3c60376e80c2c2adcdfb
_md5_=dfc1f020d954b249a78fe55fb1a2d3df
diff --git a/metadata/md5-cache/dev-java/ant-testutil-1.10.9 b/metadata/md5-cache/dev-java/ant-testutil-1.10.9
index d61983bd7eb8..54da978c5029 100644
--- a/metadata/md5-cache/dev-java/ant-testutil-1.10.9
+++ b/metadata/md5-cache/dev-java/ant-testutil-1.10.9
@@ -10,5 +10,5 @@ RDEPEND=dev-java/ant-core:0 >=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3 ~d
RESTRICT=test
SLOT=0
SRC_URI=mirror://apache/ant/source/apache-ant-1.10.9-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.10.9-gentoo.tar.bz2
-_eclasses_=ant-tasks bf8953b38a65f5a7d92b8d2ba4efa7f4 java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=ant-tasks bf8953b38a65f5a7d92b8d2ba4efa7f4 java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 cfb5f6911bb70204c94ceafd0372c716 multilib 4fbbbc98f236f1b43acd99476bc3cd85 toolchain-funcs e9da88162e7a3c60376e80c2c2adcdfb
_md5_=69983d2e7060871087ab6002b6061112
diff --git a/metadata/md5-cache/dev-java/ant-xz-1.10.9 b/metadata/md5-cache/dev-java/ant-xz-1.10.9
index c34befe36d6a..ce2d01a7f2dd 100644
--- a/metadata/md5-cache/dev-java/ant-xz-1.10.9
+++ b/metadata/md5-cache/dev-java/ant-xz-1.10.9
@@ -10,5 +10,5 @@ RDEPEND=dev-java/xz-java >=dev-java/java-config-2.2.0-r3 ~dev-java/ant-core-1.10
RESTRICT=test
SLOT=0
SRC_URI=mirror://apache/ant/source/apache-ant-1.10.9-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.10.9-gentoo.tar.bz2
-_eclasses_=ant-tasks bf8953b38a65f5a7d92b8d2ba4efa7f4 java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=ant-tasks bf8953b38a65f5a7d92b8d2ba4efa7f4 java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 cfb5f6911bb70204c94ceafd0372c716 multilib 4fbbbc98f236f1b43acd99476bc3cd85 toolchain-funcs e9da88162e7a3c60376e80c2c2adcdfb
_md5_=0e3e412509d92ffa578ce37cf810c621
diff --git a/metadata/md5-cache/dev-java/antlr-2.7.7-r9 b/metadata/md5-cache/dev-java/antlr-2.7.7-r9
index 3711213d5c02..b5a493e59f87 100644
--- a/metadata/md5-cache/dev-java/antlr-2.7.7-r9
+++ b/metadata/md5-cache/dev-java/antlr-2.7.7-r9
@@ -10,5 +10,5 @@ LICENSE=public-domain
RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=0
SRC_URI=https://www.antlr2.org/download/antlr-2.7.7.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=7cea84226e935ddb81d4f1d650e012d1
diff --git a/metadata/md5-cache/dev-java/antlr-3.2-r1 b/metadata/md5-cache/dev-java/antlr-3.2-r1
index 88e388707094..92ca5b23b471 100644
--- a/metadata/md5-cache/dev-java/antlr-3.2-r1
+++ b/metadata/md5-cache/dev-java/antlr-3.2-r1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-java/antlr-2.7.7-r7:0 dev-java/stringtemplate:0 >=virtual/jre-1.8:
RESTRICT=!test? ( test )
SLOT=3
SRC_URI=https://www.antlr3.org/download/antlr-3.2.tar.gz https://www.antlr3.org/download/antlr-3.2.jar
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=030dfc1ef28d4465566f94832b3197fb
diff --git a/metadata/md5-cache/dev-java/antlr-3.5.2-r2 b/metadata/md5-cache/dev-java/antlr-3.5.2-r2
deleted file mode 100644
index 10bd40db36be..000000000000
--- a/metadata/md5-cache/dev-java/antlr-3.5.2-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst preinst prepare setup
-DEPEND=>=virtual/jdk-1.8:* ~dev-java/antlr-runtime-3.5.2:3.5 ~dev-java/antlr-tool-3.5.2:3.5 >=dev-java/java-config-2.2.0-r3
-DESCRIPTION=A parser generator for many languages
-EAPI=8
-HOMEPAGE=https://www.antlr3.org/
-INHERIT=java-pkg-2
-KEYWORDS=amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=BSD
-RDEPEND=>=virtual/jre-1.8:* ~dev-java/antlr-runtime-3.5.2:3.5 ~dev-java/antlr-tool-3.5.2:3.5 >=dev-java/java-config-2.2.0-r3
-SLOT=3.5
-SRC_URI=https://github.com/antlr/antlr3/archive/3.5.2.tar.gz -> antlr-3.5.2.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
-_md5_=848885875eb4a9f31d4c085859c93206
diff --git a/metadata/md5-cache/dev-java/antlr-3.5.3 b/metadata/md5-cache/dev-java/antlr-3.5.3
index f98b49a88b07..b482cbd0089f 100644
--- a/metadata/md5-cache/dev-java/antlr-3.5.3
+++ b/metadata/md5-cache/dev-java/antlr-3.5.3
@@ -4,10 +4,10 @@ DESCRIPTION=A parser generator for many languages
EAPI=8
HOMEPAGE=https://www.antlr3.org/
INHERIT=java-pkg-2
-KEYWORDS=amd64 ~arm arm64 ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=BSD
RDEPEND=>=virtual/jre-1.8:* ~dev-java/antlr-runtime-3.5.3:3.5 ~dev-java/antlr-tool-3.5.3:3.5 >=dev-java/java-config-2.2.0-r3
SLOT=3.5
SRC_URI=https://github.com/antlr/antlr3/archive/3.5.3.tar.gz -> antlr-3.5.3.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
-_md5_=ae8eb923356b02f657e57fbdfc023d62
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 cfb5f6911bb70204c94ceafd0372c716
+_md5_=f46dda2011443ce888f26b19a749173a
diff --git a/metadata/md5-cache/dev-java/antlr-4.9.3 b/metadata/md5-cache/dev-java/antlr-4.9.3
index 594e354fc5c9..ddaf636f9cbf 100644
--- a/metadata/md5-cache/dev-java/antlr-4.9.3
+++ b/metadata/md5-cache/dev-java/antlr-4.9.3
@@ -9,5 +9,5 @@ LICENSE=BSD
RDEPEND=>=virtual/jre-1.8:* ~dev-java/antlr-runtime-4.9.3:4 ~dev-java/antlr-tool-4.9.3:4 >=dev-java/java-config-2.2.0-r3
SLOT=4
SRC_URI=https://github.com/antlr/antlr4/archive/4.9.3.tar.gz -> antlr-4.9.3.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=5ee108df70063aee13d8c45f15de7ba9
diff --git a/metadata/md5-cache/dev-java/antlr-runtime-3.5.2 b/metadata/md5-cache/dev-java/antlr-runtime-3.5.2
deleted file mode 100644
index fe24a43234dd..000000000000
--- a/metadata/md5-cache/dev-java/antlr-runtime-3.5.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=dev-java/stringtemplate-3.2.1:0 >=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=ANTLR 3 Runtime
-EAPI=8
-HOMEPAGE=https://www.antlr3.org/
-INHERIT=java-pkg-2 java-pkg-simple
-IUSE=doc source
-KEYWORDS=amd64 ~arm arm64 ppc64 x86
-LICENSE=BSD
-RDEPEND=>=dev-java/stringtemplate-3.2.1:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=3.5
-SRC_URI=https://repo1.maven.org/maven2/org/antlr/antlr-runtime/3.5.2/antlr-runtime-3.5.2-sources.jar
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
-_md5_=cfafecf65e1496e71c71ae4b45cc9ac3
diff --git a/metadata/md5-cache/dev-java/antlr-runtime-3.5.3 b/metadata/md5-cache/dev-java/antlr-runtime-3.5.3
index 18d2a51e1f6e..3b8a563741c4 100644
--- a/metadata/md5-cache/dev-java/antlr-runtime-3.5.3
+++ b/metadata/md5-cache/dev-java/antlr-runtime-3.5.3
@@ -6,10 +6,10 @@ EAPI=8
HOMEPAGE=https://www.antlr3.org/
INHERIT=java-pkg-2 java-pkg-simple
IUSE=doc source
-KEYWORDS=amd64 ~arm arm64 ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ppc64 x86
LICENSE=BSD
RDEPEND=>=dev-java/stringtemplate-3.2.1:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=3.5
SRC_URI=https://repo1.maven.org/maven2/org/antlr/antlr-runtime/3.5.3/antlr-runtime-3.5.3-sources.jar
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
-_md5_=5cf4a9e9758d6682aaea1961b4e018b4
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
+_md5_=fb3a34e1933a20bfb2882d4c7a9470ec
diff --git a/metadata/md5-cache/dev-java/antlr-runtime-4.9.3 b/metadata/md5-cache/dev-java/antlr-runtime-4.9.3
index d674ab4d25a9..b32ae168a2d7 100644
--- a/metadata/md5-cache/dev-java/antlr-runtime-4.9.3
+++ b/metadata/md5-cache/dev-java/antlr-runtime-4.9.3
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
RESTRICT=!test? ( test )
SLOT=4
SRC_URI=https://github.com/antlr/antlr4/archive/4.9.3.tar.gz -> antlr-4.9.3.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=24940d00dbb98aa66e931290836ae633
diff --git a/metadata/md5-cache/dev-java/antlr-tool-3.5.2 b/metadata/md5-cache/dev-java/antlr-tool-3.5.2
deleted file mode 100644
index d8696691349f..000000000000
--- a/metadata/md5-cache/dev-java/antlr-tool-3.5.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.8:* ~dev-java/antlr-runtime-3.5.2:3.5 dev-java/stringtemplate:4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
-DESCRIPTION=The ANTLR 3 tool
-EAPI=8
-HOMEPAGE=https://www.antlr3.org/
-INHERIT=java-pkg-2 java-pkg-simple
-IUSE=doc source test
-KEYWORDS=amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=BSD
-RDEPEND=>=virtual/jre-1.8:* ~dev-java/antlr-runtime-3.5.2:3.5 dev-java/stringtemplate:4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=!test? ( test )
-SLOT=3.5
-SRC_URI=https://repo1.maven.org/maven2/org/antlr/antlr/3.5.2/antlr-3.5.2-sources.jar -> antlr-tool-3.5.2-sources.jar https://github.com/antlr/antlr3/archive/3.5.2.tar.gz -> antlr-3.5.2.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
-_md5_=4c54f231e9ddf173dae022714a684e0d
diff --git a/metadata/md5-cache/dev-java/antlr-tool-3.5.3 b/metadata/md5-cache/dev-java/antlr-tool-3.5.3
index 2ed8f3438f85..3a5594142023 100644
--- a/metadata/md5-cache/dev-java/antlr-tool-3.5.3
+++ b/metadata/md5-cache/dev-java/antlr-tool-3.5.3
@@ -6,11 +6,11 @@ EAPI=8
HOMEPAGE=https://www.antlr3.org/
INHERIT=java-pkg-2 java-pkg-simple
IUSE=doc source test
-KEYWORDS=amd64 ~arm arm64 ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=BSD
RDEPEND=>=virtual/jre-1.8:* ~dev-java/antlr-runtime-3.5.3:3.5 dev-java/stringtemplate:4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
RESTRICT=!test? ( test )
SLOT=3.5
SRC_URI=https://repo1.maven.org/maven2/org/antlr/antlr/3.5.3/antlr-3.5.3-sources.jar -> antlr-tool-3.5.3-sources.jar https://github.com/antlr/antlr3/archive/3.5.3.tar.gz -> antlr-3.5.3.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
-_md5_=30e6f27786ad80c310a00f694a8eb8f6
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
+_md5_=fdace0a03a36bbde4e83973477982685
diff --git a/metadata/md5-cache/dev-java/antlr-tool-4.9.3 b/metadata/md5-cache/dev-java/antlr-tool-4.9.3
index 9a44807408a8..1029844ca912 100644
--- a/metadata/md5-cache/dev-java/antlr-tool-4.9.3
+++ b/metadata/md5-cache/dev-java/antlr-tool-4.9.3
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* ~dev-java/antlr-runtime-4.9.3:4 dev-java/antlr-runti
RESTRICT=!test? ( test )
SLOT=4
SRC_URI=https://github.com/antlr/antlr4/archive/4.9.3.tar.gz -> antlr-4.9.3.tar.gz https://repo1.maven.org/maven2/org/antlr/antlr4/4.9.3/antlr4-4.9.3-sources.jar -> antlr-tool-4.9.3-sources.jar
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=ffc0a7a373c6934a5c70e4561bad36f7
diff --git a/metadata/md5-cache/dev-java/aopalliance-1.0-r3 b/metadata/md5-cache/dev-java/aopalliance-1.0-r3
index be8af074e2a9..53acf83cf7fd 100644
--- a/metadata/md5-cache/dev-java/aopalliance-1.0-r3
+++ b/metadata/md5-cache/dev-java/aopalliance-1.0-r3
@@ -10,5 +10,5 @@ LICENSE=public-domain
RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=1
SRC_URI=mirror://gentoo/aopalliance-1.0-gentoo.tar.bz2
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=0bcbc7cba4df84544947602428a6dd59
diff --git a/metadata/md5-cache/dev-java/apache-rat-core-0.13 b/metadata/md5-cache/dev-java/apache-rat-core-0.13
index eb9cf3684043..9b91ed8e3f1b 100644
--- a/metadata/md5-cache/dev-java/apache-rat-core-0.13
+++ b/metadata/md5-cache/dev-java/apache-rat-core-0.13
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/commons-cli-1.3.1:1 >=dev-java/commons-co
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=mirror://apache//creadur/apache-rat-0.13/apache-rat-0.13-src.tar.bz2
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=d22bad28e451f95f75c485378fececf2
diff --git a/metadata/md5-cache/dev-java/apache-rat-tasks-0.13 b/metadata/md5-cache/dev-java/apache-rat-tasks-0.13
index c53fec6ac446..105f4b9c9b05 100644
--- a/metadata/md5-cache/dev-java/apache-rat-tasks-0.13
+++ b/metadata/md5-cache/dev-java/apache-rat-tasks-0.13
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* dev-java/ant-core:0 ~dev-java/apache-rat-core-0.13:0
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=mirror://apache//creadur/apache-rat-0.13/apache-rat-0.13-src.tar.bz2
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=7c5b860615c9f5b27aa0563531da9afa
diff --git a/metadata/md5-cache/dev-java/apiguardian-api-1.1.2 b/metadata/md5-cache/dev-java/apiguardian-api-1.1.2
index ab67be327773..de3e046054c5 100644
--- a/metadata/md5-cache/dev-java/apiguardian-api-1.1.2
+++ b/metadata/md5-cache/dev-java/apiguardian-api-1.1.2
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=0
SRC_URI=https://github.com/apiguardian-team/apiguardian/archive/r1.1.2.tar.gz -> apiguardian-api-1.1.2.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=69fcc0569b5c03709824ac64d07333ae
diff --git a/metadata/md5-cache/dev-java/asm-5.1-r1 b/metadata/md5-cache/dev-java/asm-5.1-r1
index 9d7bb5b2f2d5..3f58de34d004 100644
--- a/metadata/md5-cache/dev-java/asm-5.1-r1
+++ b/metadata/md5-cache/dev-java/asm-5.1-r1
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
RESTRICT=test
SLOT=4
SRC_URI=https://gitlab.ow2.org/asm/asm/-/archive/ASM_5_1/asm-ASM_5_1.tar.gz https://gitlab.ow2.org/asm/asm/-/archive/ASM_4_0/asm-ASM_4_0.tar.gz
-_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 cfb5f6911bb70204c94ceafd0372c716 multilib 4fbbbc98f236f1b43acd99476bc3cd85 toolchain-funcs e9da88162e7a3c60376e80c2c2adcdfb
_md5_=745d811e25a5d9d9425d94e7d00a3d76
diff --git a/metadata/md5-cache/dev-java/asm-9.2 b/metadata/md5-cache/dev-java/asm-9.2
deleted file mode 100644
index 249aa5ff4729..000000000000
--- a/metadata/md5-cache/dev-java/asm-9.2
+++ /dev/null
@@ -1,15 +0,0 @@
-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=Bytecode manipulation framework for Java
-EAPI=7
-HOMEPAGE=https://asm.ow2.io
-INHERIT=java-pkg-2 java-pkg-simple
-IUSE=doc source
-KEYWORDS=amd64 ~arm arm64 ppc64 x86 ~x64-macos
-LICENSE=BSD
-RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=9
-SRC_URI=https://gitlab.ow2.org/asm/asm/-/archive/ASM_9_2/asm-ASM_9_2.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
-_md5_=4c463e999ec3e798366b448f80c3bc56
diff --git a/metadata/md5-cache/dev-java/asm-9.3 b/metadata/md5-cache/dev-java/asm-9.3
index 32d39a765ab2..f1c48a5b0fd8 100644
--- a/metadata/md5-cache/dev-java/asm-9.3
+++ b/metadata/md5-cache/dev-java/asm-9.3
@@ -5,10 +5,10 @@ EAPI=8
HOMEPAGE=https://asm.ow2.io
INHERIT=java-pkg-2 java-pkg-simple
IUSE=doc source
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos
+KEYWORDS=amd64 ~arm arm64 ppc64 x86 ~x64-macos
LICENSE=BSD
RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=9
SRC_URI=https://gitlab.ow2.org/asm/asm/-/archive/ASM_9_3/asm-ASM_9_3.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
-_md5_=ce16429d07b4c7cbcc59974efe4cf231
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
+_md5_=d35853d5037bf4cdee1e5b1b109f346b
diff --git a/metadata/md5-cache/dev-java/asm-analysis-9.2 b/metadata/md5-cache/dev-java/asm-analysis-9.2
index a292e871ce39..b420cb10c6c5 100644
--- a/metadata/md5-cache/dev-java/asm-analysis-9.2
+++ b/metadata/md5-cache/dev-java/asm-analysis-9.2
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* dev-java/asm-tree:9 >=dev-java/java-config-2.2.0-r3
RESTRICT=test
SLOT=9
SRC_URI=https://gitlab.ow2.org/asm/asm/-/archive/ASM_9_2/asm-ASM_9_2.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=fe7a8408f10d39dd9c2221802762805d
diff --git a/metadata/md5-cache/dev-java/asm-commons-9.2 b/metadata/md5-cache/dev-java/asm-commons-9.2
index 05074a4d77c0..36372955516c 100644
--- a/metadata/md5-cache/dev-java/asm-commons-9.2
+++ b/metadata/md5-cache/dev-java/asm-commons-9.2
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* dev-java/asm-analysis:9 dev-java/asm-tree:9 dev-java
RESTRICT=test
SLOT=9
SRC_URI=https://gitlab.ow2.org/asm/asm/-/archive/ASM_9_2/asm-ASM_9_2.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=84167a058bc3d43afc79c5294aae4994
diff --git a/metadata/md5-cache/dev-java/asm-tree-9.2 b/metadata/md5-cache/dev-java/asm-tree-9.2
index 2e131b95ef85..42f4364b5dd9 100644
--- a/metadata/md5-cache/dev-java/asm-tree-9.2
+++ b/metadata/md5-cache/dev-java/asm-tree-9.2
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* dev-java/asm:9 >=dev-java/java-config-2.2.0-r3 sourc
RESTRICT=test
SLOT=9
SRC_URI=https://gitlab.ow2.org/asm/asm/-/archive/ASM_9_2/asm-ASM_9_2.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=cbe37d5daaa6d2b184d30aa962ff6b32
diff --git a/metadata/md5-cache/dev-java/asm-util-9.2 b/metadata/md5-cache/dev-java/asm-util-9.2
index 9bd29fe32370..3b2a976a9578 100644
--- a/metadata/md5-cache/dev-java/asm-util-9.2
+++ b/metadata/md5-cache/dev-java/asm-util-9.2
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* dev-java/asm-analysis:9 dev-java/asm-tree:9 dev-java
RESTRICT=test
SLOT=9
SRC_URI=https://gitlab.ow2.org/asm/asm/-/archive/ASM_9_2/asm-ASM_9_2.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=277b4ea08d1523a6fadcdb08b6847c21
diff --git a/metadata/md5-cache/dev-java/aspectj-1.9.7 b/metadata/md5-cache/dev-java/aspectj-1.9.7
index 02640a4981f2..bca2c15c738c 100644
--- a/metadata/md5-cache/dev-java/aspectj-1.9.7
+++ b/metadata/md5-cache/dev-java/aspectj-1.9.7
@@ -11,5 +11,5 @@ LICENSE=EPL-1.0
RDEPEND=dev-java/asm:9 dev-java/commons-logging:0 dev-java/ant-apache-regexp:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=0
SRC_URI=https://github.com/eclipse/org.aspectj/archive/refs/tags/V1_9_7.tar.gz -> aspectj-1.9.7.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=72e4c000f4d64ad768a7fcfd8c05933c
diff --git a/metadata/md5-cache/dev-java/assertj-core-2.3.0-r1 b/metadata/md5-cache/dev-java/assertj-core-2.3.0-r1
index eaa8de34008e..b5ab0ca0d74c 100644
--- a/metadata/md5-cache/dev-java/assertj-core-2.3.0-r1
+++ b/metadata/md5-cache/dev-java/assertj-core-2.3.0-r1
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
RDEPEND=dev-java/cglib:3 dev-java/junit:4 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=2
SRC_URI=https://github.com/assertj/assertj-core/archive/assertj-core-2.3.0.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=74c0f187f05a2b4e485e2e4d881f1e45
diff --git a/metadata/md5-cache/dev-java/avalon-framework-4.2.0-r4 b/metadata/md5-cache/dev-java/avalon-framework-4.2.0-r4
index 67c54caa6ab6..ecc26107377b 100644
--- a/metadata/md5-cache/dev-java/avalon-framework-4.2.0-r4
+++ b/metadata/md5-cache/dev-java/avalon-framework-4.2.0-r4
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* dev-java/avalon-logkit:2.0 dev-java/log4j-12-api:2 >
RESTRICT=!test? ( test )
SLOT=4.2
SRC_URI=mirror://apache/avalon/avalon-framework/source/avalon-framework-4.2.0-src.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=a24a1c659a325216db06ccb8934a21df
diff --git a/metadata/md5-cache/dev-java/avalon-logkit-2.1-r12 b/metadata/md5-cache/dev-java/avalon-logkit-2.1-r12
index d573cb0277be..15e4cd39ed01 100644
--- a/metadata/md5-cache/dev-java/avalon-logkit-2.1-r12
+++ b/metadata/md5-cache/dev-java/avalon-logkit-2.1-r12
@@ -11,5 +11,5 @@ RDEPEND=dev-java/javax-mail:0 dev-java/jboss-jms-api:1.1 dev-java/log4j-12-api:2
RESTRICT=!test? ( test )
SLOT=2.0
SRC_URI=https://archive.apache.org/dist/excalibur/avalon-logkit/source/avalon-logkit-2.1-src.tar.gz
-_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 cfb5f6911bb70204c94ceafd0372c716 multilib 4fbbbc98f236f1b43acd99476bc3cd85 toolchain-funcs e9da88162e7a3c60376e80c2c2adcdfb
_md5_=5d7c65739477c8cb57c90d4bd7014ae8
diff --git a/metadata/md5-cache/dev-java/batik-1.14 b/metadata/md5-cache/dev-java/batik-1.14
deleted file mode 100644
index e2e50d0ce56d..000000000000
--- a/metadata/md5-cache/dev-java/batik-1.14
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test
-DEPEND=dev-java/jacl:0 dev-java/jython:2.7 dev-java/rhino:1.6 dev-java/xalan:0 dev-java/xml-commons-external:1.3 dev-java/xmlgraphics-commons:2 >=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
-DESCRIPTION=XML Graphics Batik
-EAPI=8
-HOMEPAGE=https://xmlgraphics.apache.org/batik/
-INHERIT=desktop java-pkg-2 java-pkg-simple xdg-utils
-IUSE=doc source test
-KEYWORDS=amd64 ~arm64 ppc64 x86
-LICENSE=Apache-2.0
-RDEPEND=dev-java/jacl:0 dev-java/jython:2.7 dev-java/rhino:1.6 dev-java/xalan:0 dev-java/xml-commons-external:1.3 dev-java/xmlgraphics-commons:2 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=!test? ( test )
-SLOT=1.14
-SRC_URI=mirror://apache/xmlgraphics/batik/source/batik-src-1.14.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 xdg-utils fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=414a7460560f08a908cb57556fb4036b
diff --git a/metadata/md5-cache/dev-java/batik-1.14-r1 b/metadata/md5-cache/dev-java/batik-1.14-r1
index a71a76b94cd2..0894dcc380a6 100644
--- a/metadata/md5-cache/dev-java/batik-1.14-r1
+++ b/metadata/md5-cache/dev-java/batik-1.14-r1
@@ -5,11 +5,11 @@ EAPI=8
HOMEPAGE=https://xmlgraphics.apache.org/batik/
INHERIT=desktop java-pkg-2 java-pkg-simple xdg-utils
IUSE=doc source test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm64 ppc64 x86
LICENSE=Apache-2.0
RDEPEND=dev-java/jacl:0 dev-java/jython:2.7 dev-java/rhino:1.6 dev-java/xalan:0 dev-java/xml-commons-external:1.4 dev-java/xmlgraphics-commons:2 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
RESTRICT=!test? ( test )
SLOT=1.14
SRC_URI=mirror://apache/xmlgraphics/batik/source/batik-src-1.14.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 xdg-utils fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=fb41fef0de9dfc0b6f0baf05536a294d
+_eclasses_=desktop 22952d8f27cac191d75529d4c38e6bfa java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716 xdg-utils fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=44313ea3fef478caa985c1bb56c99e8e
diff --git a/metadata/md5-cache/dev-java/bcel-6.5.0 b/metadata/md5-cache/dev-java/bcel-6.5.0
index ed2f5bc3064c..84135666db50 100644
--- a/metadata/md5-cache/dev-java/bcel-6.5.0
+++ b/metadata/md5-cache/dev-java/bcel-6.5.0
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=0
SRC_URI=mirror://apache/commons/bcel/source/bcel-6.5.0-src.tar.gz -> bcel-6.5.0-sources.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=1b41fb3dc0aebc4198e00ba8011f3914
diff --git a/metadata/md5-cache/dev-java/bcel-6.5.0-r3 b/metadata/md5-cache/dev-java/bcel-6.5.0-r3
index 2fef6703207b..d3a150350945 100644
--- a/metadata/md5-cache/dev-java/bcel-6.5.0-r3
+++ b/metadata/md5-cache/dev-java/bcel-6.5.0-r3
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
RESTRICT=!test? ( test ) !test? ( test )
SLOT=0
SRC_URI=mirror://apache/commons/bcel/source/bcel-6.5.0-src.tar.gz -> bcel-6.5.0-sources.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=e76cf0726e5f8a5cab751740ddbae2f3
diff --git a/metadata/md5-cache/dev-java/bcmail-1.69-r1 b/metadata/md5-cache/dev-java/bcmail-1.69-r1
index a88136eaac56..b501a37eaa3f 100644
--- a/metadata/md5-cache/dev-java/bcmail-1.69-r1
+++ b/metadata/md5-cache/dev-java/bcmail-1.69-r1
@@ -11,5 +11,5 @@ RDEPEND=~dev-java/bcpkix-1.69:0 ~dev-java/bcprov-1.69:0 ~dev-java/bcutil-1.69:0
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://github.com/bcgit/bc-java/archive/refs/tags/r1rv69.tar.gz -> bc-java-r1rv69.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=8da5d2d5d95e1f5c896a299d22e38e3f
diff --git a/metadata/md5-cache/dev-java/bcmail-1.71 b/metadata/md5-cache/dev-java/bcmail-1.71
new file mode 100644
index 000000000000..f62e62078632
--- /dev/null
+++ b/metadata/md5-cache/dev-java/bcmail-1.71
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=~dev-java/bcpkix-1.71:0 ~dev-java/bcprov-1.71:0 ~dev-java/bcutil-1.71:0 dev-java/jakarta-activation:1 dev-java/javax-mail:0 >=virtual/jdk-11:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
+DESCRIPTION=The Bouncy Castle Java S/MIME APIs for handling S/MIME protocols
+EAPI=8
+HOMEPAGE=https://www.bouncycastle.org/java.html
+INHERIT=java-pkg-2 java-pkg-simple
+IUSE=doc source test
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=BSD
+RDEPEND=~dev-java/bcpkix-1.71:0 ~dev-java/bcprov-1.71:0 ~dev-java/bcutil-1.71:0 dev-java/jakarta-activation:1 dev-java/javax-mail:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/bcgit/bc-java/archive/r1rv71.tar.gz -> bc-java-r1rv71.tar.gz
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
+_md5_=af7b09336abef3ee4736bd08c8dec67d
diff --git a/metadata/md5-cache/dev-java/bcpg-1.69 b/metadata/md5-cache/dev-java/bcpg-1.69
index afa075bc3e49..5212f590f0ec 100644
--- a/metadata/md5-cache/dev-java/bcpg-1.69
+++ b/metadata/md5-cache/dev-java/bcpg-1.69
@@ -11,5 +11,5 @@ RDEPEND=~dev-java/bcprov-1.69:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://github.com/bcgit/bc-java/archive/refs/tags/r1rv69.tar.gz -> bc-java-r1rv69.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=c586bb96bc1c8ffda729116f4cd8c46c
diff --git a/metadata/md5-cache/dev-java/bcpg-1.71 b/metadata/md5-cache/dev-java/bcpg-1.71
new file mode 100644
index 000000000000..1e528ff5c7e0
--- /dev/null
+++ b/metadata/md5-cache/dev-java/bcpg-1.71
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=~dev-java/bcprov-1.71:0 >=virtual/jdk-11:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
+DESCRIPTION=Java cryptography APIs
+EAPI=8
+HOMEPAGE=https://www.bouncycastle.org/java.html
+INHERIT=java-pkg-2 java-pkg-simple
+IUSE=doc source test
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=BSD
+RDEPEND=~dev-java/bcprov-1.71:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/bcgit/bc-java/archive/r1rv71.tar.gz -> bc-java-r1rv71.tar.gz
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
+_md5_=059e08ba91516de585b6df9285d9c408
diff --git a/metadata/md5-cache/dev-java/bcpkix-1.69 b/metadata/md5-cache/dev-java/bcpkix-1.69
index 6d87dc2fabbe..cc5cea352da2 100644
--- a/metadata/md5-cache/dev-java/bcpkix-1.69
+++ b/metadata/md5-cache/dev-java/bcpkix-1.69
@@ -11,5 +11,5 @@ RDEPEND=~dev-java/bcprov-1.69:0 ~dev-java/bcutil-1.69:0 >=virtual/jre-1.8:* >=de
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://github.com/bcgit/bc-java/archive/refs/tags/r1rv69.tar.gz -> bc-java-r1rv69.tar.gz
-_eclasses_=check-reqs 82234bf011d5453330773cd5fc3f0199 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=check-reqs 5e6dfbd7a8d3238a79f009fae7ac469c java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=816bf43cb03d381035ea210f0abc3dc9
diff --git a/metadata/md5-cache/dev-java/bcpkix-1.71-r1 b/metadata/md5-cache/dev-java/bcpkix-1.71-r1
new file mode 100644
index 000000000000..ecfd84e71510
--- /dev/null
+++ b/metadata/md5-cache/dev-java/bcpkix-1.71-r1
@@ -0,0 +1,16 @@
+DEFINED_PHASES=compile install preinst prepare pretend setup test
+DEPEND=~dev-java/bcprov-1.71:0 ~dev-java/bcutil-1.71:0 >=virtual/jdk-11:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
+DESCRIPTION=Java APIs for CMS, PKCS, EAC, TSP, CMP, CRMF, OCSP, and certificate generation
+EAPI=8
+HOMEPAGE=https://www.bouncycastle.org/java.html
+INHERIT=java-pkg-2 java-pkg-simple check-reqs
+IUSE=doc source test
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=BSD
+PROPERTIES=test_network
+RDEPEND=~dev-java/bcprov-1.71:0 ~dev-java/bcutil-1.71:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=test !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/bcgit/bc-java/archive/r1rv71.tar.gz -> bc-java-r1rv71.tar.gz
+_eclasses_=check-reqs 5e6dfbd7a8d3238a79f009fae7ac469c java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
+_md5_=4361e1b4101e25e68b34ae4d5b9e1bda
diff --git a/metadata/md5-cache/dev-java/bcprov-1.69 b/metadata/md5-cache/dev-java/bcprov-1.69
index 465611d2dc13..c4990c3df9ed 100644
--- a/metadata/md5-cache/dev-java/bcprov-1.69
+++ b/metadata/md5-cache/dev-java/bcprov-1.69
@@ -12,5 +12,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://github.com/bcgit/bc-java/archive/refs/tags/r1rv69.tar.gz -> bc-java-r1rv69.tar.gz
-_eclasses_=check-reqs 82234bf011d5453330773cd5fc3f0199 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=check-reqs 5e6dfbd7a8d3238a79f009fae7ac469c java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=814c5034775a00b7c6f98aa6733bebf7
diff --git a/metadata/md5-cache/dev-java/bcprov-1.71-r1 b/metadata/md5-cache/dev-java/bcprov-1.71-r1
new file mode 100644
index 000000000000..89dfc2ac692e
--- /dev/null
+++ b/metadata/md5-cache/dev-java/bcprov-1.71-r1
@@ -0,0 +1,16 @@
+BDEPEND=app-arch/zip
+DEFINED_PHASES=compile install preinst prepare pretend setup test
+DEPEND=>=virtual/jdk-11:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
+DESCRIPTION=Java cryptography APIs
+EAPI=8
+HOMEPAGE=https://www.bouncycastle.org/java.html
+INHERIT=java-pkg-2 java-pkg-simple check-reqs
+IUSE=doc source test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=BSD
+RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/bcgit/bc-java/archive/r1rv71.tar.gz -> bc-java-r1rv71.tar.gz
+_eclasses_=check-reqs 5e6dfbd7a8d3238a79f009fae7ac469c java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
+_md5_=e82ecad68f1674c4419ccfc4484efdbd
diff --git a/metadata/md5-cache/dev-java/bcutil-1.69 b/metadata/md5-cache/dev-java/bcutil-1.69
index 3d0c2143141e..0a9e98077d15 100644
--- a/metadata/md5-cache/dev-java/bcutil-1.69
+++ b/metadata/md5-cache/dev-java/bcutil-1.69
@@ -11,5 +11,5 @@ RDEPEND=~dev-java/bcprov-1.69:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://github.com/bcgit/bc-java/archive/refs/tags/r1rv69.tar.gz -> bc-java-r1rv69.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=1daceb77b59371772b191b981754b0e0
diff --git a/metadata/md5-cache/dev-java/bcutil-1.71 b/metadata/md5-cache/dev-java/bcutil-1.71
new file mode 100644
index 000000000000..7aaa7714ef4c
--- /dev/null
+++ b/metadata/md5-cache/dev-java/bcutil-1.71
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=~dev-java/bcprov-1.71:0 >=virtual/jdk-11:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
+DESCRIPTION=Java APIs for ASN.1 extension and utility APIs used to support bcpkix and bctls
+EAPI=8
+HOMEPAGE=https://www.bouncycastle.org/java.html
+INHERIT=java-pkg-2 java-pkg-simple
+IUSE=doc source test
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=BSD
+RDEPEND=~dev-java/bcprov-1.71:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/bcgit/bc-java/archive/r1rv71.tar.gz -> bc-java-r1rv71.tar.gz
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
+_md5_=3694deb1b58c1d7b33b5e989c80ac5d5
diff --git a/metadata/md5-cache/dev-java/bnd-junit-2.1.0-r2 b/metadata/md5-cache/dev-java/bnd-junit-2.1.0-r2
index bf0159cf079e..9dd5d37ca0bd 100644
--- a/metadata/md5-cache/dev-java/bnd-junit-2.1.0-r2
+++ b/metadata/md5-cache/dev-java/bnd-junit-2.1.0-r2
@@ -11,5 +11,5 @@ RDEPEND=dev-java/osgi-core-api:0 dev-java/bndlib:0 virtual/jre:1.8 >=dev-java/ja
RESTRICT=test
SLOT=0
SRC_URI=https://github.com/bndtools/bnd/archive/2.1.0.REL.tar.gz -> bndlib-2.1.0.tar.gz
-_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 cfb5f6911bb70204c94ceafd0372c716 multilib 4fbbbc98f236f1b43acd99476bc3cd85 toolchain-funcs e9da88162e7a3c60376e80c2c2adcdfb
_md5_=024d611dae6922351631e7f7f594bca7
diff --git a/metadata/md5-cache/dev-java/bndlib-2.1.0-r1 b/metadata/md5-cache/dev-java/bndlib-2.1.0-r1
index 819e942a3e0b..46df5b4db088 100644
--- a/metadata/md5-cache/dev-java/bndlib-2.1.0-r1
+++ b/metadata/md5-cache/dev-java/bndlib-2.1.0-r1
@@ -11,5 +11,5 @@ RDEPEND=virtual/jre:1.8 dev-java/libg:0 dev-java/osgi-compendium:0 dev-java/osgi
RESTRICT=test
SLOT=0
SRC_URI=https://github.com/bndtools/bnd/archive/2.1.0.REL.tar.gz -> bndlib-2.1.0.tar.gz
-_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 cfb5f6911bb70204c94ceafd0372c716 multilib 4fbbbc98f236f1b43acd99476bc3cd85 toolchain-funcs e9da88162e7a3c60376e80c2c2adcdfb
_md5_=7c66aa75cfeb1d877ddbc7a33913c75a
diff --git a/metadata/md5-cache/dev-java/boot-bin-2.8.3 b/metadata/md5-cache/dev-java/boot-bin-2.8.3
deleted file mode 100644
index 4ed05131b37e..000000000000
--- a/metadata/md5-cache/dev-java/boot-bin-2.8.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst preinst prepare setup unpack
-DEPEND=>=virtual/jdk-1.7 >=dev-java/java-config-2.2.0-r3
-DESCRIPTION=Build tooling for Clojure
-EAPI=6
-HOMEPAGE=https://boot-clj.com/
-INHERIT=java-pkg-2
-KEYWORDS=amd64 x86
-LICENSE=EPL-1.0
-RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/boot-clj/boot/releases/download/2.8.3/boot.jar -> boot-2.8.3.jar https://raw.githubusercontent.com/boot-clj/boot/2.8.3/README.md -> boot-2.8.3-README.md https://raw.githubusercontent.com/boot-clj/boot/2.8.3/CHANGES.md -> boot-2.8.3-CHANGES.md
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 eapi7-ver 1a0a60ad07c8b32d2faba2d085dc0f24 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 9f813bb3c47cf2e60619a663b87c5f4e estack 055c42df72f76a4f45ec92b35e83cd56 eutils dab5d8ec471d025b79c9e6906bcf3bff java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 ltprune 97143780d341cc8d8f1d4c6187a36d29 multilib 4a33c9008e5ee30cb8840a3fdc24df2b preserve-libs a8e50acee31b5759b4df1f7707cae54b strip-linguas ac3ee41ee2d31d8c41a77c0838320cc7 toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8 vcs-clean d271b7bc7e6a009758d7d4ef749174e3 versionator d3fb3ba33acc3bbbdc4d7970227c100d wrapper 4a1902f969e5718126434fc35f3a0d9c
-_md5_=22354732b248da37c5382ba6684b680f
diff --git a/metadata/md5-cache/dev-java/brotli-dec-0.1.2 b/metadata/md5-cache/dev-java/brotli-dec-0.1.2
index 4486a4df5416..45532428cb4b 100644
--- a/metadata/md5-cache/dev-java/brotli-dec-0.1.2
+++ b/metadata/md5-cache/dev-java/brotli-dec-0.1.2
@@ -11,5 +11,5 @@ LICENSE=MIT
RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=0
SRC_URI=https://repo1.maven.org/maven2/org/brotli/dec/0.1.2/dec-0.1.2-sources.jar -> brotli-dec-0.1.2-sources.jar
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=5798bdfffc623c3300d063ff927ff233
diff --git a/metadata/md5-cache/dev-java/browserlauncher2-1.3-r2 b/metadata/md5-cache/dev-java/browserlauncher2-1.3-r2
index 5977b338544a..e49b454f1253 100644
--- a/metadata/md5-cache/dev-java/browserlauncher2-1.3-r2
+++ b/metadata/md5-cache/dev-java/browserlauncher2-1.3-r2
@@ -11,5 +11,5 @@ LICENSE=LGPL-2.1
RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=1.0
SRC_URI=https://downloads.sourceforge.net/project/browserlaunch2/browserlauncher2/1.3/BrowserLauncher2-all-1_3.jar
-_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 cfb5f6911bb70204c94ceafd0372c716 multilib 4fbbbc98f236f1b43acd99476bc3cd85 toolchain-funcs e9da88162e7a3c60376e80c2c2adcdfb
_md5_=cc5b8ebcc5e25045a3f12f7aa5edd9ed
diff --git a/metadata/md5-cache/dev-java/bsf-2.4.0-r3 b/metadata/md5-cache/dev-java/bsf-2.4.0-r3
index e3f5a067e067..017925d6741c 100644
--- a/metadata/md5-cache/dev-java/bsf-2.4.0-r3
+++ b/metadata/md5-cache/dev-java/bsf-2.4.0-r3
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
RDEPEND=python? ( dev-java/jython:2.7 ) javascript? ( dev-java/rhino:1.6 ) tcl? ( dev-java/jacl:0 ) dev-java/xalan:0 dev-java/commons-logging:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=2.3
SRC_URI=mirror://apache/commons/bsf/source/bsf-src-2.4.0.tar.gz
-_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 cfb5f6911bb70204c94ceafd0372c716 multilib 4fbbbc98f236f1b43acd99476bc3cd85 toolchain-funcs e9da88162e7a3c60376e80c2c2adcdfb
_md5_=e4381ba8417b6210ddde9d9d2a4b92d4
diff --git a/metadata/md5-cache/dev-java/bsh-2.0_beta6-r1 b/metadata/md5-cache/dev-java/bsh-2.0_beta6-r1
index 450a37918f40..6dc1162319d3 100644
--- a/metadata/md5-cache/dev-java/bsh-2.0_beta6-r1
+++ b/metadata/md5-cache/dev-java/bsh-2.0_beta6-r1
@@ -11,5 +11,5 @@ RDEPEND=dev-java/bsf:2.3 java-virtuals/servlet-api:3.0 >=virtual/jre-1.8 >=dev-j
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://github.com/beanshell/beanshell/archive/2.0b6.tar.gz -> bsh-2.0b6.tar.gz
-_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 cfb5f6911bb70204c94ceafd0372c716 multilib 4fbbbc98f236f1b43acd99476bc3cd85 toolchain-funcs e9da88162e7a3c60376e80c2c2adcdfb
_md5_=c3a61360fb8c1450e51dc796bf358959
diff --git a/metadata/md5-cache/dev-java/byaccj-1.15-r2 b/metadata/md5-cache/dev-java/byaccj-1.15-r2
index 62f252a02797..29c9c89c2c25 100644
--- a/metadata/md5-cache/dev-java/byaccj-1.15-r2
+++ b/metadata/md5-cache/dev-java/byaccj-1.15-r2
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile install
DESCRIPTION=A java extension of BSD YACC-compatible parser generator
EAPI=7
HOMEPAGE=http://byaccj.sourceforge.net/
+INHERIT=toolchain-funcs
KEYWORDS=amd64 ~arm arm64 ppc64 x86 ~ppc-macos ~x64-macos
LICENSE=public-domain
SLOT=0
SRC_URI=mirror://sourceforge/byaccj/byaccj1.15_src.tar.gz
-_eclasses_=multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multilib 4fbbbc98f236f1b43acd99476bc3cd85 toolchain-funcs e9da88162e7a3c60376e80c2c2adcdfb
_md5_=184b19a4c5d7dfdbb6b5f8884deb8462
diff --git a/metadata/md5-cache/dev-java/byaccj-1.15-r3 b/metadata/md5-cache/dev-java/byaccj-1.15-r3
new file mode 100644
index 000000000000..453163494bec
--- /dev/null
+++ b/metadata/md5-cache/dev-java/byaccj-1.15-r3
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install
+DESCRIPTION=A java extension of BSD YACC-compatible parser generator
+EAPI=8
+HOMEPAGE=http://byaccj.sourceforge.net/
+INHERIT=toolchain-funcs
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~ppc-macos ~x64-macos
+LICENSE=public-domain
+SLOT=0
+SRC_URI=mirror://sourceforge/byaccj/byaccj1.15_src.tar.gz
+_eclasses_=multilib 4fbbbc98f236f1b43acd99476bc3cd85 toolchain-funcs e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=dc512c62aa08a733d875c10825891f9c
diff --git a/metadata/md5-cache/dev-java/byte-buddy-1.12.10 b/metadata/md5-cache/dev-java/byte-buddy-1.12.10
new file mode 100644
index 000000000000..9d2c5caa9f93
--- /dev/null
+++ b/metadata/md5-cache/dev-java/byte-buddy-1.12.10
@@ -0,0 +1,15 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=>=virtual/jdk-1.8:* dev-java/findbugs-annotations:0 >=dev-java/jna-5.10.0:4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=Byte Buddy is a Java library for creating Java classes at run time
+EAPI=8
+HOMEPAGE=https://bytebuddy.net/
+INHERIT=java-pkg-2 java-pkg-simple
+IUSE=doc source
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+SLOT=0
+SRC_URI=https://repo1.maven.org/maven2/net/bytebuddy/byte-buddy/1.12.10/byte-buddy-1.12.10-sources.jar
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
+_md5_=19752073146c4937bbbdcc005385ad58
diff --git a/metadata/md5-cache/dev-java/byte-buddy-1.12.8 b/metadata/md5-cache/dev-java/byte-buddy-1.12.8
index b0ba602623a2..82ed581147c6 100644
--- a/metadata/md5-cache/dev-java/byte-buddy-1.12.8
+++ b/metadata/md5-cache/dev-java/byte-buddy-1.12.8
@@ -6,10 +6,10 @@ EAPI=8
HOMEPAGE=https://bytebuddy.net/
INHERIT=java-pkg-2 java-pkg-simple
IUSE=doc source
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ppc64 x86
LICENSE=Apache-2.0
RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=0
SRC_URI=https://repo1.maven.org/maven2/net/bytebuddy/byte-buddy/1.12.8/byte-buddy-1.12.8-sources.jar
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
-_md5_=eed9f343de99ddd49e78f04a346a5875
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
+_md5_=660a729f3640adea990e08d3449714e9
diff --git a/metadata/md5-cache/dev-java/byte-buddy-agent-1.12.10 b/metadata/md5-cache/dev-java/byte-buddy-agent-1.12.10
new file mode 100644
index 000000000000..1013b009f591
--- /dev/null
+++ b/metadata/md5-cache/dev-java/byte-buddy-agent-1.12.10
@@ -0,0 +1,16 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=>=virtual/jdk-1.8:* dev-java/findbugs-annotations:0 dev-java/jna:4 test? ( dev-java/mockito:4 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
+DESCRIPTION=Offers convenience for attaching an agent to the local or a remote VM
+EAPI=8
+HOMEPAGE=https://bytebuddy.net/
+INHERIT=java-pkg-2 java-pkg-simple
+IUSE=doc source test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://repo1.maven.org/maven2/net/bytebuddy/byte-buddy-agent/1.12.10/byte-buddy-agent-1.12.10-sources.jar test? ( https://github.com/raphw/byte-buddy/archive/byte-buddy-1.12.10.tar.gz )
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
+_md5_=4991421f92be840cc07fcd9df1aa55ef
diff --git a/metadata/md5-cache/dev-java/byte-buddy-agent-1.12.8 b/metadata/md5-cache/dev-java/byte-buddy-agent-1.12.8
index cb2f2e12c185..d54701896753 100644
--- a/metadata/md5-cache/dev-java/byte-buddy-agent-1.12.8
+++ b/metadata/md5-cache/dev-java/byte-buddy-agent-1.12.8
@@ -6,11 +6,11 @@ EAPI=8
HOMEPAGE=https://bytebuddy.net/
INHERIT=java-pkg-2 java-pkg-simple
IUSE=doc source test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ppc64 x86
LICENSE=Apache-2.0
RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://repo1.maven.org/maven2/net/bytebuddy/byte-buddy-agent/1.12.8/byte-buddy-agent-1.12.8-sources.jar test? ( https://codeload.github.com/raphw/byte-buddy/tar.gz/byte-buddy-1.12.8 -> byte-buddy-1.12.8.tar.gz )
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
-_md5_=92bc1e8ac4e3b6c2b67e4862e9fa908a
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
+_md5_=198ae7d2ab45a53c550362cc319d5a2a
diff --git a/metadata/md5-cache/dev-java/c3p0-0.9.5.5-r1 b/metadata/md5-cache/dev-java/c3p0-0.9.5.5-r1
index 609a61a9f212..08f8687b4643 100644
--- a/metadata/md5-cache/dev-java/c3p0-0.9.5.5-r1
+++ b/metadata/md5-cache/dev-java/c3p0-0.9.5.5-r1
@@ -10,5 +10,5 @@ LICENSE=|| ( EPL-1.0 LGPL-2.1 )
RDEPEND=>=virtual/jre-1.8:* dev-java/log4j-12-api:2 dev-java/mchange-commons:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=0
SRC_URI=mirror://sourceforge/c3p0/c3p0-0.9.5.5.src.tgz
-_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 cfb5f6911bb70204c94ceafd0372c716 multilib 4fbbbc98f236f1b43acd99476bc3cd85 toolchain-funcs e9da88162e7a3c60376e80c2c2adcdfb
_md5_=f30bf992da1014f795384a7c04867797
diff --git a/metadata/md5-cache/dev-java/cal10n-0.8.1 b/metadata/md5-cache/dev-java/cal10n-0.8.1
index b69953edaa7a..09793634c940 100644
--- a/metadata/md5-cache/dev-java/cal10n-0.8.1
+++ b/metadata/md5-cache/dev-java/cal10n-0.8.1
@@ -10,5 +10,5 @@ LICENSE=MIT
RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=0
SRC_URI=https://github.com/qos-ch/cal10n/archive/v_0.8.1.tar.gz -> cal10n-0.8.1.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=0660b455429dbdf902b31d8f1befb67c
diff --git a/metadata/md5-cache/dev-java/cglib-3.3.0-r1 b/metadata/md5-cache/dev-java/cglib-3.3.0-r1
index b387a1534c7d..38d47a4d3971 100644
--- a/metadata/md5-cache/dev-java/cglib-3.3.0-r1
+++ b/metadata/md5-cache/dev-java/cglib-3.3.0-r1
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* dev-java/ant-core:0 dev-java/asm:9 >=dev-java/java-c
RESTRICT=!test? ( test )
SLOT=3
SRC_URI=https://github.com/cglib/cglib/archive//RELEASE_3_3_0.tar.gz -> cglib-RELEASE_3_3_0.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=ce17e92c57e18188a5d7ac54ab915579
diff --git a/metadata/md5-cache/dev-java/checker-framework-qual-3.14.0 b/metadata/md5-cache/dev-java/checker-framework-qual-3.14.0
index e6c3a0fdba70..aec952477575 100644
--- a/metadata/md5-cache/dev-java/checker-framework-qual-3.14.0
+++ b/metadata/md5-cache/dev-java/checker-framework-qual-3.14.0
@@ -10,5 +10,5 @@ LICENSE=MIT
RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=0
SRC_URI=https://codeload.github.com/typetools/checker-framework/tar.gz/refs/tags/checker-framework-3.14.0 -> checker-framework-3.14.0.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=7ee370ee2561a156f144a8211a56d9c5
diff --git a/metadata/md5-cache/dev-java/commons-beanutils-1.9.4-r1 b/metadata/md5-cache/dev-java/commons-beanutils-1.9.4-r1
index 340cc12287c3..e39fd231296d 100644
--- a/metadata/md5-cache/dev-java/commons-beanutils-1.9.4-r1
+++ b/metadata/md5-cache/dev-java/commons-beanutils-1.9.4-r1
@@ -11,5 +11,5 @@ RDEPEND=dev-java/commons-collections:0 dev-java/commons-logging:0 >=virtual/jre-
RESTRICT=!test? ( test )
SLOT=1.7
SRC_URI=mirror://apache/commons/beanutils/source/commons-beanutils-1.9.4-src.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=b818ee63d0978430ab19080ede8dc626
diff --git a/metadata/md5-cache/dev-java/commons-cli-1.4 b/metadata/md5-cache/dev-java/commons-cli-1.4
deleted file mode 100644
index 03720e291c57..000000000000
--- a/metadata/md5-cache/dev-java/commons-cli-1.4
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.7 test? ( dev-java/junit:4 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=A Java library for working with the command line arguments and options
-EAPI=6
-HOMEPAGE=http://commons.apache.org/cli/
-INHERIT=java-pkg-2 java-pkg-simple
-IUSE=test doc source
-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 1a0a60ad07c8b32d2faba2d085dc0f24 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 9f813bb3c47cf2e60619a663b87c5f4e estack 055c42df72f76a4f45ec92b35e83cd56 eutils dab5d8ec471d025b79c9e6906bcf3bff java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 ltprune 97143780d341cc8d8f1d4c6187a36d29 multilib 4a33c9008e5ee30cb8840a3fdc24df2b preserve-libs a8e50acee31b5759b4df1f7707cae54b strip-linguas ac3ee41ee2d31d8c41a77c0838320cc7 toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8 vcs-clean d271b7bc7e6a009758d7d4ef749174e3 versionator d3fb3ba33acc3bbbdc4d7970227c100d wrapper 4a1902f969e5718126434fc35f3a0d9c
-_md5_=747c6f20b31bfd0dce15029505d9f123
diff --git a/metadata/md5-cache/dev-java/commons-cli-1.5.0 b/metadata/md5-cache/dev-java/commons-cli-1.5.0
index 98e4fa0b0eb0..fafdb81cb958 100644
--- a/metadata/md5-cache/dev-java/commons-cli-1.5.0
+++ b/metadata/md5-cache/dev-java/commons-cli-1.5.0
@@ -5,11 +5,11 @@ EAPI=8
HOMEPAGE=https://commons.apache.org/proper/commons-cli/
INHERIT=java-pkg-2 java-pkg-simple
IUSE=doc source test
-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.8:* >=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.5.0-src.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
-_md5_=93c195d21f40437428e7cdc35a46f2d1
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
+_md5_=bbc0e4f273d7d83ad71d8f24d2de6bed
diff --git a/metadata/md5-cache/dev-java/commons-codec-1.15 b/metadata/md5-cache/dev-java/commons-codec-1.15
index b926d9bf52f4..8d06e682845e 100644
--- a/metadata/md5-cache/dev-java/commons-codec-1.15
+++ b/metadata/md5-cache/dev-java/commons-codec-1.15
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=mirror://apache/commons/codec/source/commons-codec-1.15-src.tar.gz -> commons-codec-1.15.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=a47a1adf4794c5c18b4a5c6a76cd6e2f
diff --git a/metadata/md5-cache/dev-java/commons-collections-3.2.2 b/metadata/md5-cache/dev-java/commons-collections-3.2.2
index 984271cc4d94..1eed06b6564c 100644
--- a/metadata/md5-cache/dev-java/commons-collections-3.2.2
+++ b/metadata/md5-cache/dev-java/commons-collections-3.2.2
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=mirror://apache/commons/collections/source/commons-collections-3.2.2-src.tar.gz
-_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 cfb5f6911bb70204c94ceafd0372c716 multilib 4fbbbc98f236f1b43acd99476bc3cd85 toolchain-funcs e9da88162e7a3c60376e80c2c2adcdfb
_md5_=f48a8926e7069cc3e5324144276913fe
diff --git a/metadata/md5-cache/dev-java/commons-collections-4.4 b/metadata/md5-cache/dev-java/commons-collections-4.4
index 1378fec50ae2..8727a433844b 100644
--- a/metadata/md5-cache/dev-java/commons-collections-4.4
+++ b/metadata/md5-cache/dev-java/commons-collections-4.4
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
RESTRICT=!test? ( test )
SLOT=4
SRC_URI=mirror://apache/commons/collections/source/commons-collections4-4.4-src.tar.gz -> commons-collections-4.4-src.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=6b544a7a39e6ff6b3bf2d08b896e9eda
diff --git a/metadata/md5-cache/dev-java/commons-compress-1.21 b/metadata/md5-cache/dev-java/commons-compress-1.21
index dd92185276cc..845d89166320 100644
--- a/metadata/md5-cache/dev-java/commons-compress-1.21
+++ b/metadata/md5-cache/dev-java/commons-compress-1.21
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
RDEPEND=>=virtual/jre-1.8:* dev-java/asm:9 >=dev-java/brotli-dec-0.1.2:0 >=dev-java/xz-java-1.9:0 >=dev-java/zstd-jni-1.5.0.4:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=0
SRC_URI=mirror://apache/commons/compress/source/commons-compress-1.21-src.tar.gz -> commons-compress-1.21-sources.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=cdfe827a2af525dbeea2496338680049
diff --git a/metadata/md5-cache/dev-java/commons-csv-1.9.0 b/metadata/md5-cache/dev-java/commons-csv-1.9.0
index d73680259316..7c589393e88e 100644
--- a/metadata/md5-cache/dev-java/commons-csv-1.9.0
+++ b/metadata/md5-cache/dev-java/commons-csv-1.9.0
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
RESTRICT=test
SLOT=0
SRC_URI=mirror://apache/commons/csv/source/commons-csv-1.9.0-src.tar.gz -> commons-csv-1.9.0-sources.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=ee03a72c337c9e519e3ed23d324e9281
diff --git a/metadata/md5-cache/dev-java/commons-daemon-1.2.4 b/metadata/md5-cache/dev-java/commons-daemon-1.2.4
index 47a922249b65..0a30fe8e1faa 100644
--- a/metadata/md5-cache/dev-java/commons-daemon-1.2.4
+++ b/metadata/md5-cache/dev-java/commons-daemon-1.2.4
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=0
SRC_URI=mirror://apache/commons/daemon/source/commons-daemon-1.2.4-src.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716 multilib 4fbbbc98f236f1b43acd99476bc3cd85 toolchain-funcs e9da88162e7a3c60376e80c2c2adcdfb
_md5_=4f2372c98f63944ca12050021f50323c
diff --git a/metadata/md5-cache/dev-java/commons-daemon-1.3.1 b/metadata/md5-cache/dev-java/commons-daemon-1.3.1
new file mode 100644
index 000000000000..0004a85ba0bf
--- /dev/null
+++ b/metadata/md5-cache/dev-java/commons-daemon-1.3.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=Tools to allow Java programs to run as UNIX daemons
+EAPI=8
+HOMEPAGE=https://commons.apache.org/proper/commons-daemon/
+INHERIT=java-pkg-2 java-pkg-simple toolchain-funcs
+IUSE=doc source
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+SLOT=0
+SRC_URI=mirror://apache/commons/daemon/source/commons-daemon-1.3.1-src.tar.gz
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716 multilib 4fbbbc98f236f1b43acd99476bc3cd85 toolchain-funcs e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=b41bb4b5f6e8c0f605483a0938f999ee
diff --git a/metadata/md5-cache/dev-java/commons-digester-2.1-r2 b/metadata/md5-cache/dev-java/commons-digester-2.1-r2
index 0f9a306f4243..8347f41681f3 100644
--- a/metadata/md5-cache/dev-java/commons-digester-2.1-r2
+++ b/metadata/md5-cache/dev-java/commons-digester-2.1-r2
@@ -11,5 +11,5 @@ RDEPEND=>=dev-java/commons-beanutils-1.9.4:1.7 >=dev-java/commons-logging-1.2:0
RESTRICT=!test? ( test )
SLOT=2.1
SRC_URI=mirror://apache/commons/digester/source/commons-digester-2.1-src.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=b7bb8f3b2a878f1cb6fe638237ebedbf
diff --git a/metadata/md5-cache/dev-java/commons-digester-3.2-r3 b/metadata/md5-cache/dev-java/commons-digester-3.2-r3
index 7a8bed067757..6fd51ccb7eef 100644
--- a/metadata/md5-cache/dev-java/commons-digester-3.2-r3
+++ b/metadata/md5-cache/dev-java/commons-digester-3.2-r3
@@ -12,5 +12,5 @@ RDEPEND=>=dev-java/cglib-3.3.0:3 >=dev-java/commons-beanutils-1.9.4:1.7 >=dev-ja
RESTRICT=test !test? ( test )
SLOT=3.2
SRC_URI=mirror://apache/commons/digester/source/commons-digester3-3.2-src.tar.gz -> commons-digester-3.2.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=32cba32ff0bd4c3adba31f8ed800b86a
diff --git a/metadata/md5-cache/dev-java/commons-httpclient-3.1-r2 b/metadata/md5-cache/dev-java/commons-httpclient-3.1-r2
index f2f37137bf1b..1effde1137e6 100644
--- a/metadata/md5-cache/dev-java/commons-httpclient-3.1-r2
+++ b/metadata/md5-cache/dev-java/commons-httpclient-3.1-r2
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* dev-java/commons-logging:0 dev-java/commons-codec:0
RESTRICT=test
SLOT=3
SRC_URI=mirror://apache/httpcomponents/commons-httpclient/source/commons-httpclient-3.1-src.tar.gz
-_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 cfb5f6911bb70204c94ceafd0372c716 multilib 4fbbbc98f236f1b43acd99476bc3cd85 toolchain-funcs e9da88162e7a3c60376e80c2c2adcdfb
_md5_=4bfadc2ca13c5ff2db0bdd47f2f9d72c
diff --git a/metadata/md5-cache/dev-java/commons-imaging-1.0_alpha2 b/metadata/md5-cache/dev-java/commons-imaging-1.0_alpha2
index ce3c76b5ab55..728db1c24396 100644
--- a/metadata/md5-cache/dev-java/commons-imaging-1.0_alpha2
+++ b/metadata/md5-cache/dev-java/commons-imaging-1.0_alpha2
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=0
SRC_URI=mirror://apache/commons/imaging/source/commons-imaging-1.0-alpha2-src.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=56c127c95cb5d5d1dabb2a4f10e036b1
diff --git a/metadata/md5-cache/dev-java/commons-io-2.11.0 b/metadata/md5-cache/dev-java/commons-io-2.11.0
index dc4b4982d4ab..223d8cd47226 100644
--- a/metadata/md5-cache/dev-java/commons-io-2.11.0
+++ b/metadata/md5-cache/dev-java/commons-io-2.11.0
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
RESTRICT=test
SLOT=1
SRC_URI=mirror://apache/commons/io/source/commons-io-2.11.0-src.tar.gz -> commons-io-2.11.0-sources.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=9579ab0e9bdfaffa3a66570fc1fb1fbb
diff --git a/metadata/md5-cache/dev-java/commons-jxpath-1.3-r5 b/metadata/md5-cache/dev-java/commons-jxpath-1.3-r5
deleted file mode 100644
index eb1a2dd6943d..000000000000
--- a/metadata/md5-cache/dev-java/commons-jxpath-1.3-r5
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=dev-java/commons-beanutils:1.7 dev-java/jdom:0 java-virtuals/servlet-api:3.0 >=virtual/jdk-1.8:* dev-java/xerces:2 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Applies XPath expressions to graphs of objects of all kinds
-EAPI=8
-HOMEPAGE=https://commons.apache.org/jxpath/
-INHERIT=java-pkg-2 java-pkg-simple
-IUSE=doc source
-KEYWORDS=amd64 ppc64 x86
-LICENSE=Apache-2.0
-RDEPEND=dev-java/commons-beanutils:1.7 dev-java/jdom:0 java-virtuals/servlet-api:3.0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://apache/commons/jxpath/source/commons-jxpath-1.3-src.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
-_md5_=f716d2054196f344d86d0761b2f0f844
diff --git a/metadata/md5-cache/dev-java/commons-lang-2.6-r2 b/metadata/md5-cache/dev-java/commons-lang-2.6-r2
index 381073885faf..0a9973d9c840 100644
--- a/metadata/md5-cache/dev-java/commons-lang-2.6-r2
+++ b/metadata/md5-cache/dev-java/commons-lang-2.6-r2
@@ -11,5 +11,5 @@ RDEPEND=virtual/jre:1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
RESTRICT=!test? ( test )
SLOT=2.1
SRC_URI=mirror://apache/commons/lang/source/commons-lang-2.6-src.tar.gz
-_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 cfb5f6911bb70204c94ceafd0372c716 multilib 4fbbbc98f236f1b43acd99476bc3cd85 toolchain-funcs e9da88162e7a3c60376e80c2c2adcdfb
_md5_=af75f2cd4bd2717eb350f17cf86f845a
diff --git a/metadata/md5-cache/dev-java/commons-lang-3.12.0 b/metadata/md5-cache/dev-java/commons-lang-3.12.0
index cec687d67a50..6c2e824d2c1a 100644
--- a/metadata/md5-cache/dev-java/commons-lang-3.12.0
+++ b/metadata/md5-cache/dev-java/commons-lang-3.12.0
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=3.6
SRC_URI=mirror://apache/commons/lang/source/commons-lang3-3.12.0-src.tar.gz -> commons-lang-3.12.0-sources.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=8c91cc1d0458203f6d62f3d899d2c212
diff --git a/metadata/md5-cache/dev-java/commons-logging-1.2-r5 b/metadata/md5-cache/dev-java/commons-logging-1.2-r5
index a0afa3c842f0..f5ec041cd8ae 100644
--- a/metadata/md5-cache/dev-java/commons-logging-1.2-r5
+++ b/metadata/md5-cache/dev-java/commons-logging-1.2-r5
@@ -12,5 +12,5 @@ REQUIRED_USE=doc? ( avalon-framework avalon-logkit log4j servletapi )
RESTRICT=!test? ( test ) !servletapi? ( test )
SLOT=0
SRC_URI=mirror://apache/commons/logging/source/commons-logging-1.2-src.tar.gz
-_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-osgi c9b922d3fd7b5c6117f4c4d68e32e881 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-osgi c9b922d3fd7b5c6117f4c4d68e32e881 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 cfb5f6911bb70204c94ceafd0372c716 multilib 4fbbbc98f236f1b43acd99476bc3cd85 toolchain-funcs e9da88162e7a3c60376e80c2c2adcdfb
_md5_=43416132fd6c4efd7cf735c6b5aacef9
diff --git a/metadata/md5-cache/dev-java/commons-math-3.6.1-r1 b/metadata/md5-cache/dev-java/commons-math-3.6.1-r1
index 477c6becc245..45accf84f397 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
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=3
SRC_URI=https://repo1.maven.org/maven2/org/apache/commons/commons-math3/3.6.1/commons-math3-3.6.1-sources.jar -> commons-math3-3.6.1.jar
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=f60b2dc1c2fb0ffa9d56ed8f45448ee1
diff --git a/metadata/md5-cache/dev-java/commons-net-3.8.0 b/metadata/md5-cache/dev-java/commons-net-3.8.0
index ca99eafa22b0..151268c1751d 100644
--- a/metadata/md5-cache/dev-java/commons-net-3.8.0
+++ b/metadata/md5-cache/dev-java/commons-net-3.8.0
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=0
SRC_URI=https://repo1.maven.org/maven2/commons-net/commons-net/3.8.0/commons-net-3.8.0-sources.jar -> commons-net-3.8.0.jar
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=a03e165ef4bd12b97d0e7520eb7bf586
diff --git a/metadata/md5-cache/dev-java/commons-text-1.9 b/metadata/md5-cache/dev-java/commons-text-1.9
index bcd300aa0346..8f9966538487 100644
--- a/metadata/md5-cache/dev-java/commons-text-1.9
+++ b/metadata/md5-cache/dev-java/commons-text-1.9
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
RDEPEND=>=virtual/jre-1.8:* >=dev-java/commons-lang-3.11:3.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=0
SRC_URI=https://downloads.apache.org//commons/text/source/commons-text-1.9-src.tar.gz -> commons-text-1.9-sources.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=7bf149e50a545940e82cce31351cbf86
diff --git a/metadata/md5-cache/dev-java/commons-validator-1.7 b/metadata/md5-cache/dev-java/commons-validator-1.7
index 3846b0802b09..be6cd7482d92 100644
--- a/metadata/md5-cache/dev-java/commons-validator-1.7
+++ b/metadata/md5-cache/dev-java/commons-validator-1.7
@@ -11,5 +11,5 @@ RDEPEND=dev-java/commons-beanutils:1.7 dev-java/commons-digester:2.1 dev-java/co
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=mirror://apache/commons/validator/source/commons-validator-1.7-src.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=77e3c85c5463e21f4a84ecf440783bc6
diff --git a/metadata/md5-cache/dev-java/commons-vfs-2.0-r2 b/metadata/md5-cache/dev-java/commons-vfs-2.0-r2
index 9c707415394c..140fe129dc87 100644
--- a/metadata/md5-cache/dev-java/commons-vfs-2.0-r2
+++ b/metadata/md5-cache/dev-java/commons-vfs-2.0-r2
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
RDEPEND=dev-java/ant-core:0 dev-java/commons-collections:0 dev-java/commons-logging:0 dev-java/commons-net:0 dev-java/commons-httpclient:3 dev-java/jackrabbit-webdav:0 dev-java/jsch:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=2
SRC_URI=mirror://apache/commons/vfs/source/commons-vfs-2.0-src.tar.gz
-_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 cfb5f6911bb70204c94ceafd0372c716 multilib 4fbbbc98f236f1b43acd99476bc3cd85 toolchain-funcs e9da88162e7a3c60376e80c2c2adcdfb
_md5_=7fe2e1d80a50330b345a7433034ced4f
diff --git a/metadata/md5-cache/dev-java/conversant-disruptor-1.2.19-r1 b/metadata/md5-cache/dev-java/conversant-disruptor-1.2.19-r1
index d39e19c4da4b..85a2eedcd6e3 100644
--- a/metadata/md5-cache/dev-java/conversant-disruptor-1.2.19-r1
+++ b/metadata/md5-cache/dev-java/conversant-disruptor-1.2.19-r1
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://github.com/conversant/disruptor/archive/1.2.19.tar.gz -> conversant-disruptor-1.2.19.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=e384b01a0554f8de125716f9cd6e41a5
diff --git a/metadata/md5-cache/dev-java/conversant-disruptor-1.2.20 b/metadata/md5-cache/dev-java/conversant-disruptor-1.2.20
new file mode 100644
index 000000000000..827e1ab346a6
--- /dev/null
+++ b/metadata/md5-cache/dev-java/conversant-disruptor-1.2.20
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=>=virtual/jdk-11:* test? ( dev-java/slf4j-api:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
+DESCRIPTION=Conversant Disruptor - very high throughput Java BlockingQueue
+EAPI=8
+HOMEPAGE=https://github.com/conversant/disruptor
+INHERIT=java-pkg-2 java-pkg-simple
+IUSE=doc source test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/conversant/disruptor/archive/1.2.20.tar.gz -> conversant-disruptor-1.2.20.tar.gz
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
+_md5_=c9e8eac570a85ba3c78d6041b89865fb
diff --git a/metadata/md5-cache/dev-java/core-specs-alpha-0.1.24 b/metadata/md5-cache/dev-java/core-specs-alpha-0.1.24
index 737acd2e2954..c0685e021e85 100644
--- a/metadata/md5-cache/dev-java/core-specs-alpha-0.1.24
+++ b/metadata/md5-cache/dev-java/core-specs-alpha-0.1.24
@@ -9,5 +9,5 @@ LICENSE=EPL-1.0
RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3
SLOT=0.1
SRC_URI=https://github.com/clojure/core.specs.alpha/archive/core.specs.alpha-0.1.24.tar.gz -> core-specs-alpha-0.1.24.tar.gz
-_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 cfb5f6911bb70204c94ceafd0372c716 multilib 4fbbbc98f236f1b43acd99476bc3cd85 toolchain-funcs e9da88162e7a3c60376e80c2c2adcdfb
_md5_=caaacacbbf986bb968c3b93a81de48f0
diff --git a/metadata/md5-cache/dev-java/core-specs-alpha-0.2.44 b/metadata/md5-cache/dev-java/core-specs-alpha-0.2.44
index 5ac49eea67b4..664181a3d173 100644
--- a/metadata/md5-cache/dev-java/core-specs-alpha-0.2.44
+++ b/metadata/md5-cache/dev-java/core-specs-alpha-0.2.44
@@ -9,5 +9,5 @@ LICENSE=EPL-1.0
RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3
SLOT=0.2
SRC_URI=https://github.com/clojure/core.specs.alpha/archive/core.specs.alpha-0.2.44.tar.gz -> core-specs-alpha-0.2.44.tar.gz
-_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 cfb5f6911bb70204c94ceafd0372c716 multilib 4fbbbc98f236f1b43acd99476bc3cd85 toolchain-funcs e9da88162e7a3c60376e80c2c2adcdfb
_md5_=02d6dbc3aef805e1178e36211fd03409
diff --git a/metadata/md5-cache/dev-java/core-specs-alpha-0.2.56 b/metadata/md5-cache/dev-java/core-specs-alpha-0.2.56
index aaf2bed397a5..e5ab2f7e0d28 100644
--- a/metadata/md5-cache/dev-java/core-specs-alpha-0.2.56
+++ b/metadata/md5-cache/dev-java/core-specs-alpha-0.2.56
@@ -9,5 +9,5 @@ LICENSE=EPL-1.0
RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3
SLOT=0.2
SRC_URI=https://github.com/clojure/core.specs.alpha/archive/core.specs.alpha-0.2.56.tar.gz -> core-specs-alpha-0.2.56.tar.gz
-_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 cfb5f6911bb70204c94ceafd0372c716 multilib 4fbbbc98f236f1b43acd99476bc3cd85 toolchain-funcs e9da88162e7a3c60376e80c2c2adcdfb
_md5_=faa81bdb522e13991a71394907889ff5
diff --git a/metadata/md5-cache/dev-java/cortado-0.6.0-r2 b/metadata/md5-cache/dev-java/cortado-0.6.0-r2
index 88712c00e18b..989d070e92b8 100644
--- a/metadata/md5-cache/dev-java/cortado-0.6.0-r2
+++ b/metadata/md5-cache/dev-java/cortado-0.6.0-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2
RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3
SLOT=0
SRC_URI=https://downloads.xiph.org/releases/cortado/cortado-0.6.0.tar.gz
-_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 cfb5f6911bb70204c94ceafd0372c716 multilib 4fbbbc98f236f1b43acd99476bc3cd85 toolchain-funcs e9da88162e7a3c60376e80c2c2adcdfb
_md5_=9b2debbc537a0092e0ea6d6a4fbe4292
diff --git a/metadata/md5-cache/dev-java/cpptasks-1.0_beta5-r1 b/metadata/md5-cache/dev-java/cpptasks-1.0_beta5-r1
index d26e13a78b8c..1fbcd2476b4c 100644
--- a/metadata/md5-cache/dev-java/cpptasks-1.0_beta5-r1
+++ b/metadata/md5-cache/dev-java/cpptasks-1.0_beta5-r1
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* dev-java/ant-core:0 dev-java/xerces:2 >=dev-java/jav
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=mirror://sourceforge/ant-contrib/ant-contrib/cpptasks-1.0-beta5/cpptasks-1.0b5.tar.gz
-_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 cfb5f6911bb70204c94ceafd0372c716 multilib 4fbbbc98f236f1b43acd99476bc3cd85 toolchain-funcs e9da88162e7a3c60376e80c2c2adcdfb
_md5_=e34ce749cce1ab0dc73cf770b0590392
diff --git a/metadata/md5-cache/dev-java/dom4j-2.1.3 b/metadata/md5-cache/dev-java/dom4j-2.1.3
index 8a0024330afc..61a7561786c5 100644
--- a/metadata/md5-cache/dev-java/dom4j-2.1.3
+++ b/metadata/md5-cache/dev-java/dom4j-2.1.3
@@ -11,5 +11,5 @@ RDEPEND=dev-java/jaxb-api:2 dev-java/xpp2:0 dev-java/xpp3:0 dev-java/xsdlib:0 ja
RESTRICT=!test? ( test )
SLOT=1
SRC_URI=https://github.com/dom4j/dom4j/archive/refs/tags/version-2.1.3.tar.gz -> dom4j-2.1.3.tar.gz https://repo1.maven.org/maven2/jaxen/jaxen/1.2.0/jaxen-1.2.0.jar
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=6b7b54ce52fe6dc61ec15e131c7cb961
diff --git a/metadata/md5-cache/dev-java/easymock-3.3.1-r1 b/metadata/md5-cache/dev-java/easymock-3.3.1-r1
index 1b19d25db942..217d868ea4e7 100644
--- a/metadata/md5-cache/dev-java/easymock-3.3.1-r1
+++ b/metadata/md5-cache/dev-java/easymock-3.3.1-r1
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* dev-java/cglib:3 dev-java/junit:4 dev-java/objenesis
RESTRICT=!test? ( test )
SLOT=3.2
SRC_URI=https://github.com/easymock/easymock/archive/refs/tags/easymock-3.3.1.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
-_md5_=bf8d9bf8607b14707e1b9927446c145c
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
+_md5_=600961bfa15ecd7f7b7f9310c15c0a1a
diff --git a/metadata/md5-cache/dev-java/eclipse-ecj-4.15 b/metadata/md5-cache/dev-java/eclipse-ecj-4.15
index ec501e622072..195d8cc22cc7 100644
--- a/metadata/md5-cache/dev-java/eclipse-ecj-4.15
+++ b/metadata/md5-cache/dev-java/eclipse-ecj-4.15
@@ -11,5 +11,5 @@ PDEPEND=ant? ( ~dev-java/ant-eclipse-ecj-4.15 )
RDEPEND=app-eselect/eselect-java dev-java/ant-core:0 virtual/jre >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=4.15
SRC_URI=https://archive.eclipse.org/eclipse/downloads/drops4/R-4.15-202003050155/ecjsrc-4.15.jar
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=05f6212f9979277996675e568acca2f3
diff --git a/metadata/md5-cache/dev-java/eclipse-ecj-4.22 b/metadata/md5-cache/dev-java/eclipse-ecj-4.22-r1
index 1d11864bb82c..6a0d86e5fe3e 100644
--- a/metadata/md5-cache/dev-java/eclipse-ecj-4.22
+++ b/metadata/md5-cache/dev-java/eclipse-ecj-4.22-r1
@@ -1,5 +1,5 @@
DEFINED_PHASES=compile install postinst postrm preinst prepare setup test
-DEPEND=app-eselect/eselect-java dev-java/ant-core:0 >=virtual/jdk-11:* app-arch/unzip >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DEPEND=app-eselect/eselect-java dev-java/ant-core:0 >=virtual/jdk-17:* app-arch/unzip >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
DESCRIPTION=Eclipse Compiler for Java
EAPI=8
HOMEPAGE=https://www.eclipse.org/
@@ -11,5 +11,5 @@ PDEPEND=ant? ( ~dev-java/ant-eclipse-ecj-4.22 )
RDEPEND=app-eselect/eselect-java dev-java/ant-core:0 >=virtual/jre-11:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=4.22
SRC_URI=https://download.eclipse.org/eclipse/downloads/drops4/R-4.22-202111241800/ecjsrc-4.22.jar
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
-_md5_=c7f957817a8db2fc62eca28d1a53fef2
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
+_md5_=4d367efb81de0e6b3334cb40ce75314e
diff --git a/metadata/md5-cache/dev-java/eclipse-ecj-4.5.1 b/metadata/md5-cache/dev-java/eclipse-ecj-4.5.1
deleted file mode 100644
index b27de8afadf3..000000000000
--- a/metadata/md5-cache/dev-java/eclipse-ecj-4.5.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test
-DEPEND=app-eselect/eselect-java >=virtual/jdk-1.7 app-arch/unzip >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Eclipse Compiler for Java
-EAPI=5
-HOMEPAGE=https://www.eclipse.org/
-INHERIT=java-pkg-2 java-pkg-simple
-IUSE=+ant doc source
-KEYWORDS=amd64 ~ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris
-LICENSE=EPL-1.0
-PDEPEND=ant? ( ~dev-java/ant-eclipse-ecj-4.5.1 )
-RDEPEND=app-eselect/eselect-java >=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=4.5
-SRC_URI=https://archive.eclipse.org/eclipse/downloads/drops4/R-4.5.1-201509040015/ecjsrc-4.5.1.jar
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 eapi7-ver 1a0a60ad07c8b32d2faba2d085dc0f24 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 9f813bb3c47cf2e60619a663b87c5f4e estack 055c42df72f76a4f45ec92b35e83cd56 eutils dab5d8ec471d025b79c9e6906bcf3bff java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 ltprune 97143780d341cc8d8f1d4c6187a36d29 multilib 4a33c9008e5ee30cb8840a3fdc24df2b preserve-libs a8e50acee31b5759b4df1f7707cae54b strip-linguas ac3ee41ee2d31d8c41a77c0838320cc7 toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8 vcs-clean d271b7bc7e6a009758d7d4ef749174e3 versionator d3fb3ba33acc3bbbdc4d7970227c100d wrapper 4a1902f969e5718126434fc35f3a0d9c
-_md5_=a62029dfe0695f292a98c1019980e640
diff --git a/metadata/md5-cache/dev-java/eclipsito-20180510 b/metadata/md5-cache/dev-java/eclipsito-20180510
deleted file mode 100644
index dc244203cb2b..000000000000
--- a/metadata/md5-cache/dev-java/eclipsito-20180510
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test unpack
-DEPEND=>=virtual/jdk-1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=A small subset of Eclipse core libraries for modular applications
-EAPI=6
-HOMEPAGE=https://github.com/bardsoftware/eclipsito
-INHERIT=java-pkg-2 java-pkg-simple vcs-snapshot
-IUSE=doc source
-KEYWORDS=~amd64 ~x86
-LICENSE=EPL-1.0
-RDEPEND=>=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://github.com/bardsoftware/eclipsito/archive/0eb2fbb739898f55265027c2796f77fbee9f4ab2.tar.gz -> eclipsito-20180510.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 eapi7-ver 1a0a60ad07c8b32d2faba2d085dc0f24 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 9f813bb3c47cf2e60619a663b87c5f4e estack 055c42df72f76a4f45ec92b35e83cd56 eutils dab5d8ec471d025b79c9e6906bcf3bff java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 ltprune 97143780d341cc8d8f1d4c6187a36d29 multilib 4a33c9008e5ee30cb8840a3fdc24df2b preserve-libs a8e50acee31b5759b4df1f7707cae54b strip-linguas ac3ee41ee2d31d8c41a77c0838320cc7 toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8 vcs-clean d271b7bc7e6a009758d7d4ef749174e3 vcs-snapshot 19dc666868420457132a7514d4621476 versionator d3fb3ba33acc3bbbdc4d7970227c100d wrapper 4a1902f969e5718126434fc35f3a0d9c
-_md5_=17b85274f8a61d31c90032cfa735431b
diff --git a/metadata/md5-cache/dev-java/emma-2.0.5312-r4 b/metadata/md5-cache/dev-java/emma-2.0.5312-r4
index 30178f6c2659..8e374dd8256d 100644
--- a/metadata/md5-cache/dev-java/emma-2.0.5312-r4
+++ b/metadata/md5-cache/dev-java/emma-2.0.5312-r4
@@ -11,5 +11,5 @@ LICENSE=CPL-1.0
RDEPEND=dev-java/ant-core launcher? ( !sci-biology/emboss ) >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=0
SRC_URI=mirror://sourceforge/emma/emma-2.0.5312-src.zip
-_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 cfb5f6911bb70204c94ceafd0372c716 multilib 4fbbbc98f236f1b43acd99476bc3cd85 toolchain-funcs e9da88162e7a3c60376e80c2c2adcdfb
_md5_=c4267c86a013dd64bbab4bb5874832e5
diff --git a/metadata/md5-cache/dev-java/error-prone-annotations-2.7.1 b/metadata/md5-cache/dev-java/error-prone-annotations-2.7.1
index 4c94cfcfd660..d60eddbfc46e 100644
--- a/metadata/md5-cache/dev-java/error-prone-annotations-2.7.1
+++ b/metadata/md5-cache/dev-java/error-prone-annotations-2.7.1
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=0
SRC_URI=https://codeload.github.com/google/error-prone/tar.gz/v2.7.1 -> error-prone-2.7.1.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=0cca748e4ff975067e06bc5596d4962a
diff --git a/metadata/md5-cache/dev-java/failureaccess-30.1.1 b/metadata/md5-cache/dev-java/failureaccess-30.1.1
index fee86402632d..5a4bfde6a4f8 100644
--- a/metadata/md5-cache/dev-java/failureaccess-30.1.1
+++ b/metadata/md5-cache/dev-java/failureaccess-30.1.1
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=0
SRC_URI=https://codeload.github.com/google/guava/tar.gz/refs/tags/v30.1.1 -> guava-30.1.1.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=d6db1f05beb39924e4e2962ca8ff6226
diff --git a/metadata/md5-cache/dev-java/fastinfoset-2.1.0 b/metadata/md5-cache/dev-java/fastinfoset-2.1.0
new file mode 100644
index 000000000000..1cb946b9aec2
--- /dev/null
+++ b/metadata/md5-cache/dev-java/fastinfoset-2.1.0
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
+DESCRIPTION=Open Source implementation of the Fast Infoset Standard for Binary XML
+EAPI=8
+HOMEPAGE=https://projects.eclipse.org/projects/ee4j.jaxb-impl/FastInfoset
+INHERIT=java-pkg-2 java-pkg-simple
+IUSE=doc source test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=Apache-2.0 EPL-1.0
+RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/eclipse-ee4j/jaxb-fi/archive/2.1.0.tar.gz -> fastinfoset-2.1.0.tar.gz
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
+_md5_=c8e556358a39e2252bf23182f1fd762b
diff --git a/metadata/md5-cache/dev-java/fec-1.0.4-r4 b/metadata/md5-cache/dev-java/fec-1.0.4-r4
index 29cae192cd85..e2969bcea819 100644
--- a/metadata/md5-cache/dev-java/fec-1.0.4-r4
+++ b/metadata/md5-cache/dev-java/fec-1.0.4-r4
@@ -5,11 +5,11 @@ EAPI=8
HOMEPAGE=https://bitbucket.org/onionnetworks/
INHERIT=flag-o-matic toolchain-funcs java-pkg-2 java-ant-2
IUSE=doc source
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~arm x86
LICENSE=BSD-2
RDEPEND=dev-java/log4j-12-api:2 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
RESTRICT=test
SLOT=0
SRC_URI=https://dev.gentoo.org/~monsieurp/packages/fec-1.0.4.tar.gz
-_eclasses_=flag-o-matic a500d7cc40da3de38c361e889153bdf7 java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=f9885d800843cc7528dd1d9ea6b274c4
+_eclasses_=flag-o-matic a3abd6002fafb3022597be6b8d01f88b java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 cfb5f6911bb70204c94ceafd0372c716 multilib 4fbbbc98f236f1b43acd99476bc3cd85 toolchain-funcs e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=7d70d372b9eed42b170f499f094f751b
diff --git a/metadata/md5-cache/dev-java/findbugs-annotations-3.0.1 b/metadata/md5-cache/dev-java/findbugs-annotations-3.0.1
index c27ebf2b0d38..02dbb182ef26 100644
--- a/metadata/md5-cache/dev-java/findbugs-annotations-3.0.1
+++ b/metadata/md5-cache/dev-java/findbugs-annotations-3.0.1
@@ -6,10 +6,10 @@ EAPI=8
HOMEPAGE=http://findbugs.sourceforge.net/
INHERIT=java-pkg-2 java-pkg-simple
IUSE=doc source
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ppc64 x86
LICENSE=LGPL-3
RDEPEND=>=virtual/jre-1.8:* >=dev-java/jsr305-3.0.2:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=0
SRC_URI=https://repo1.maven.org/maven2/com/google/code/findbugs/findbugs-annotations/3.0.1/findbugs-annotations-3.0.1-sources.jar
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
-_md5_=b244a3d5622c61a6b6479b912153d5a9
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
+_md5_=6c535dd2eb7bf22f692a9291758ff87b
diff --git a/metadata/md5-cache/dev-java/fontbox-2.0.24 b/metadata/md5-cache/dev-java/fontbox-2.0.26
index 3ece9e5757d5..954dc2ec2845 100644
--- a/metadata/md5-cache/dev-java/fontbox-2.0.24
+++ b/metadata/md5-cache/dev-java/fontbox-2.0.26
@@ -2,15 +2,15 @@ BDEPEND=app-arch/unzip
DEFINED_PHASES=compile install preinst prepare setup test
DEPEND=dev-java/commons-logging:0 >=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
DESCRIPTION=An open source Java library for parsing font files
-EAPI=7
+EAPI=8
HOMEPAGE=https://pdfbox.apache.org/
INHERIT=java-pkg-2 java-pkg-simple
IUSE=doc source test
-KEYWORDS=amd64 ~arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64 x86
LICENSE=Apache-2.0
RDEPEND=dev-java/commons-logging:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
RESTRICT=!test? ( test )
SLOT=0
-SRC_URI=mirror://apache/pdfbox/2.0.24/pdfbox-2.0.24-src.zip test? ( https://issues.apache.org/jira/secure/attachment/12684264/SourceSansProBold.otf https://issues.apache.org/jira/secure/attachment/12896461/NotoEmoji-Regular.ttf https://issues.apache.org/jira/secure/attachment/12809395/DejaVuSansMono.ttf )
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
-_md5_=e26898c9a485d82259b3f6936a3d1302
+SRC_URI=mirror://apache/pdfbox/2.0.26/pdfbox-2.0.26-src.zip test? ( https://issues.apache.org/jira/secure/attachment/12684264/SourceSansProBold.otf https://issues.apache.org/jira/secure/attachment/12896461/NotoEmoji-Regular.ttf https://issues.apache.org/jira/secure/attachment/12809395/DejaVuSansMono.ttf https://issues.apache.org/jira/secure/attachment/13036376/NotoSansSC-Regular.otf http://mirrors.ctan.org/fonts/opensans/type1/OpenSans-Regular.pfb )
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
+_md5_=b58b190b0f9b9bbe1a1796dfb832ea3f
diff --git a/metadata/md5-cache/dev-java/fop-2.7 b/metadata/md5-cache/dev-java/fop-2.7
index 77bcf79674f5..7f8dfc330479 100644
--- a/metadata/md5-cache/dev-java/fop-2.7
+++ b/metadata/md5-cache/dev-java/fop-2.7
@@ -11,5 +11,5 @@ RDEPEND=dev-java/batik:1.14 dev-java/commons-io:1 dev-java/fontbox:0 dev-java/qd
RESTRICT=!test? ( test )
SLOT=2.7
SRC_URI=mirror://apache/xmlgraphics/fop/source/fop-2.7-src.tar.gz https://dev.gentoo.org/~flow/distfiles/fop/fop-2.7-jars.tar.xz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=36f2a45a101f85662f10d4281493ee8e
diff --git a/metadata/md5-cache/dev-java/gcj-jdk-5.4.0-r1 b/metadata/md5-cache/dev-java/gcj-jdk-5.4.0-r1
deleted file mode 100644
index 7e0d8ebf7203..000000000000
--- a/metadata/md5-cache/dev-java/gcj-jdk-5.4.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm prerm setup
-DEPEND=dev-java/ecj-gcj:* dev-lang/perl ~sys-devel/gcc-5.4.0[awt?,gcj] dev-java/java-config app-eselect/eselect-java
-DESCRIPTION=Java wrappers around GCJ
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
-IUSE=awt
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x86-linux
-LICENSE=GPL-2
-RDEPEND=dev-java/ecj-gcj:* dev-lang/perl ~sys-devel/gcc-5.4.0[awt?,gcj] dev-java/java-config app-eselect/eselect-java
-SLOT=0
-_eclasses_=java-vm-2 69658c0814b27f9cbe466a24e6621d23 multilib 4a33c9008e5ee30cb8840a3fdc24df2b pax-utils 91d47e5d20627c717aa878b9167c62a8 prefix eab3c99d77fe00506c109c8a736186f7 toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8 xdg-utils fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=9523fa2844511511e13c0b1eceedd033
diff --git a/metadata/md5-cache/dev-java/gin-2.1.2 b/metadata/md5-cache/dev-java/gin-2.1.2-r1
index ba8303657903..c7e22f5de9d4 100644
--- a/metadata/md5-cache/dev-java/gin-2.1.2
+++ b/metadata/md5-cache/dev-java/gin-2.1.2-r1
@@ -1,6 +1,5 @@
-BDEPEND=app-arch/unzip
DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=dev-java/aopalliance:1 dev-java/javax-inject:0 dev-java/gwt:2.8 dev-java/validation-api:1.0 >=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
+DEPEND=dev-java/aopalliance:1 dev-java/javax-inject:0 dev-java/gwt:2.8 dev-java/validation-api:1.0 virtual/jdk:1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
DESCRIPTION=Google Gin (GWT INjection)
EAPI=7
HOMEPAGE=https://gwtplus.github.io/google-gin/
@@ -11,6 +10,6 @@ LICENSE=Apache-2.0
RDEPEND=dev-java/aopalliance:1 dev-java/javax-inject:0 dev-java/gwt:2.8 dev-java/validation-api:1.0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
RESTRICT=mirror
SLOT=2.1
-SRC_URI=https://github.com/gwtplus/google-gin/archive/d62089f5b6ea33d842ab4646b51583c65a8be36b.zip -> google-gin-2.1.2.zip
-_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=cb4c774e700033e5f5a86367ecb88e4d
+SRC_URI=https://github.com/gwtplus/google-gin/archive/2.1.2.tar.gz -> gin-2.1.2.tar.gz
+_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 cfb5f6911bb70204c94ceafd0372c716 multilib 4fbbbc98f236f1b43acd99476bc3cd85 toolchain-funcs e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=2411d184bca3209b2a42c682775c8ad2
diff --git a/metadata/md5-cache/dev-java/glassfish-jms-api-1.1.2.2.04-r2 b/metadata/md5-cache/dev-java/glassfish-jms-api-1.1.2.2.04-r2
deleted file mode 100644
index 8668e9eeb936..000000000000
--- a/metadata/md5-cache/dev-java/glassfish-jms-api-1.1.2.2.04-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=compile configure install preinst prepare setup unpack
-DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
-DESCRIPTION=Java Transaction API
-EAPI=7
-HOMEPAGE=https://glassfish.dev.java.net/
-INHERIT=java-pkg-2 java-ant-2
-IUSE=doc source
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=|| ( CDDL GPL-2 )
-RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://download.java.net/javaee5/v2ur2/promoted/source/glassfish-v2ur2-b04-src.zip
-_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=ae4289dbfdafd987ff83f65dd1e42013
diff --git a/metadata/md5-cache/dev-java/glassfish-persistence-1.0-r2 b/metadata/md5-cache/dev-java/glassfish-persistence-1.0-r2
index d5b8d0ec68ab..d5ca654c5380 100644
--- a/metadata/md5-cache/dev-java/glassfish-persistence-1.0-r2
+++ b/metadata/md5-cache/dev-java/glassfish-persistence-1.0-r2
@@ -10,5 +10,5 @@ LICENSE=CDDL
RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3
SLOT=0
SRC_URI=https://download.java.net/javaee5/fcs_branch/promoted/source/glassfish-9_0-b48-src.zip
-_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 cfb5f6911bb70204c94ceafd0372c716 multilib 4fbbbc98f236f1b43acd99476bc3cd85 toolchain-funcs e9da88162e7a3c60376e80c2c2adcdfb
_md5_=2eda64ba01f7d0e0fdbb0489beb321e9
diff --git a/metadata/md5-cache/dev-java/glassfish-xmlrpc-api-1.1.1-r1 b/metadata/md5-cache/dev-java/glassfish-xmlrpc-api-1.1.1-r1
index ecaf80752534..a79a676449c4 100644
--- a/metadata/md5-cache/dev-java/glassfish-xmlrpc-api-1.1.1-r1
+++ b/metadata/md5-cache/dev-java/glassfish-xmlrpc-api-1.1.1-r1
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
RDEPEND=>=virtual/jre-1.8:* dev-java/jakarta-xml-soap-api:1 java-virtuals/servlet-api:3.0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=0
SRC_URI=https://dev.gentoo.org/~tomwij/files/dist/glassfish-xmlrpc-api-1.1.1.tar.xz
-_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 cfb5f6911bb70204c94ceafd0372c716 multilib 4fbbbc98f236f1b43acd99476bc3cd85 toolchain-funcs e9da88162e7a3c60376e80c2c2adcdfb
_md5_=95ebc9c82e02ba2749c8d790909f4bf2
diff --git a/metadata/md5-cache/dev-java/glazedlists-1.8.0-r2 b/metadata/md5-cache/dev-java/glazedlists-1.8.0-r2
deleted file mode 100644
index fb4b88ee1531..000000000000
--- a/metadata/md5-cache/dev-java/glazedlists-1.8.0-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=A toolkit for list transformations
-EAPI=8
-HOMEPAGE=http://www.glazedlists.com/
-INHERIT=java-pkg-2 java-pkg-simple
-IUSE=doc source
-KEYWORDS=amd64 x86
-LICENSE=|| ( LGPL-2.1 MPL-1.1 )
-RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=http://java.net/downloads/glazedlists/glazedlists-1.8.0/glazedlists-1.8.0-source_java15.zip -> glazedlists-1.8.0.zip
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
-_md5_=343c91daad959937d1630fb1d26312fb
diff --git a/metadata/md5-cache/dev-java/gnu-jaf-1.1.2 b/metadata/md5-cache/dev-java/gnu-jaf-1.1.2
deleted file mode 100644
index 542fb7f2928f..000000000000
--- a/metadata/md5-cache/dev-java/gnu-jaf-1.1.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
-DESCRIPTION=GNU implementation of the JavaBeans Activation Framework
-EAPI=6
-HOMEPAGE=https://www.gnu.org/software/classpathx/jaf/jaf.html
-INHERIT=java-pkg-2 java-ant-2
-IUSE=doc source
-KEYWORDS=amd64 ppc64 x86
-LICENSE=GPL-2-with-linking-exception
-RDEPEND=>=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=1
-SRC_URI=mirror://gnu/classpathx/activation-1.1.2.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 eapi7-ver 1a0a60ad07c8b32d2faba2d085dc0f24 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 9f813bb3c47cf2e60619a663b87c5f4e estack 055c42df72f76a4f45ec92b35e83cd56 eutils dab5d8ec471d025b79c9e6906bcf3bff java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 ltprune 97143780d341cc8d8f1d4c6187a36d29 multilib 4a33c9008e5ee30cb8840a3fdc24df2b preserve-libs a8e50acee31b5759b4df1f7707cae54b strip-linguas ac3ee41ee2d31d8c41a77c0838320cc7 toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8 vcs-clean d271b7bc7e6a009758d7d4ef749174e3 versionator d3fb3ba33acc3bbbdc4d7970227c100d wrapper 4a1902f969e5718126434fc35f3a0d9c
-_md5_=eee91dede46a31f086a61cc990784b8a
diff --git a/metadata/md5-cache/dev-java/gnu-jaf-1.1.2-r1 b/metadata/md5-cache/dev-java/gnu-jaf-1.1.2-r1
index 333bab5a9df5..cac708454979 100644
--- a/metadata/md5-cache/dev-java/gnu-jaf-1.1.2-r1
+++ b/metadata/md5-cache/dev-java/gnu-jaf-1.1.2-r1
@@ -5,10 +5,10 @@ EAPI=8
HOMEPAGE=https://www.gnu.org/software/classpathx/jaf/jaf.html
INHERIT=java-pkg-2 java-ant-2
IUSE=doc source
-KEYWORDS=~amd64 ~ppc64 ~x86
+KEYWORDS=amd64 ppc64 x86
LICENSE=GPL-2-with-linking-exception
RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=1
SRC_URI=mirror://gnu/classpathx/activation-1.1.2.tar.gz
-_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=01d86091ef756a34b7d61a16cbdf8fc6
+_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 cfb5f6911bb70204c94ceafd0372c716 multilib 4fbbbc98f236f1b43acd99476bc3cd85 toolchain-funcs e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=8262c20d8c547d826d3620a0c5929896
diff --git a/metadata/md5-cache/dev-java/gnu-regexp-1.1.4-r4 b/metadata/md5-cache/dev-java/gnu-regexp-1.1.4-r4
index 2590a013831e..137c2b07107e 100644
--- a/metadata/md5-cache/dev-java/gnu-regexp-1.1.4-r4
+++ b/metadata/md5-cache/dev-java/gnu-regexp-1.1.4-r4
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1
RDEPEND=dev-java/java-getopt:1 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=1
SRC_URI=mirror://gentoo/gnu-regexp-1.1.4.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=3e2b517468bb0aaf8aa31524c2242598
diff --git a/metadata/md5-cache/dev-java/gradle-bin-6.8.3 b/metadata/md5-cache/dev-java/gradle-bin-6.8.3
index fd8d365023cc..6a6f474167a8 100644
--- a/metadata/md5-cache/dev-java/gradle-bin-6.8.3
+++ b/metadata/md5-cache/dev-java/gradle-bin-6.8.3
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0
RDEPEND=app-eselect/eselect-gradle >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=6.8.3
SRC_URI=https://services.gradle.org/distributions/gradle-6.8.3-all.zip -> gradle-bin-6.8.3.zip
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=5aa706dbb29d22a8cf9b12ce444721d9
diff --git a/metadata/md5-cache/dev-java/gradle-bin-7.1.1 b/metadata/md5-cache/dev-java/gradle-bin-7.1.1
index 5e1a7c4b3296..b23cac49ec30 100644
--- a/metadata/md5-cache/dev-java/gradle-bin-7.1.1
+++ b/metadata/md5-cache/dev-java/gradle-bin-7.1.1
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0
RDEPEND=app-eselect/eselect-gradle >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=7.1.1
SRC_URI=https://services.gradle.org/distributions/gradle-7.1.1-all.zip -> gradle-bin-7.1.1.zip
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=5aa706dbb29d22a8cf9b12ce444721d9
diff --git a/metadata/md5-cache/dev-java/gradle-bin-7.2 b/metadata/md5-cache/dev-java/gradle-bin-7.2
index 347df1b85982..d95aaa92ee5e 100644
--- a/metadata/md5-cache/dev-java/gradle-bin-7.2
+++ b/metadata/md5-cache/dev-java/gradle-bin-7.2
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0
RDEPEND=app-eselect/eselect-gradle >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=7.2
SRC_URI=https://services.gradle.org/distributions/gradle-7.2-all.zip -> gradle-bin-7.2.zip
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=386ee51f52c5a6bc43ccbf484647ce29
diff --git a/metadata/md5-cache/dev-java/gradle-bin-7.3.3 b/metadata/md5-cache/dev-java/gradle-bin-7.3.3
index b0550345e2eb..fa5dfc8fb13e 100644
--- a/metadata/md5-cache/dev-java/gradle-bin-7.3.3
+++ b/metadata/md5-cache/dev-java/gradle-bin-7.3.3
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0
RDEPEND=app-eselect/eselect-gradle >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=7.3.3
SRC_URI=https://services.gradle.org/distributions/gradle-7.3.3-all.zip -> gradle-bin-7.3.3.zip
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=386ee51f52c5a6bc43ccbf484647ce29
diff --git a/metadata/md5-cache/dev-java/gradle-bin-7.4 b/metadata/md5-cache/dev-java/gradle-bin-7.4
deleted file mode 100644
index 9144fbe8b26d..000000000000
--- a/metadata/md5-cache/dev-java/gradle-bin-7.4
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup
-DEPEND=app-eselect/eselect-gradle >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=A project automation and build tool with a Groovy based DSL
-EAPI=7
-HOMEPAGE=https://www.gradle.org/
-INHERIT=java-pkg-2
-IUSE=doc source
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=app-eselect/eselect-gradle >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=7.4
-SRC_URI=https://services.gradle.org/distributions/gradle-7.4-all.zip -> gradle-bin-7.4.zip
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
-_md5_=386ee51f52c5a6bc43ccbf484647ce29
diff --git a/metadata/md5-cache/dev-java/gradle-bin-7.4.1 b/metadata/md5-cache/dev-java/gradle-bin-7.4.1
deleted file mode 100644
index a5160b4388c3..000000000000
--- a/metadata/md5-cache/dev-java/gradle-bin-7.4.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup
-DEPEND=app-eselect/eselect-gradle >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=A project automation and build tool with a Groovy based DSL
-EAPI=7
-HOMEPAGE=https://www.gradle.org/
-INHERIT=java-pkg-2
-IUSE=doc source
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=app-eselect/eselect-gradle >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=7.4.1
-SRC_URI=https://services.gradle.org/distributions/gradle-7.4.1-all.zip -> gradle-bin-7.4.1.zip
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
-_md5_=386ee51f52c5a6bc43ccbf484647ce29
diff --git a/metadata/md5-cache/dev-java/gradle-bin-7.4.2 b/metadata/md5-cache/dev-java/gradle-bin-7.4.2
index b9197cd349e1..4db4481ea20d 100644
--- a/metadata/md5-cache/dev-java/gradle-bin-7.4.2
+++ b/metadata/md5-cache/dev-java/gradle-bin-7.4.2
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0
RDEPEND=app-eselect/eselect-gradle >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=7.4.2
SRC_URI=https://services.gradle.org/distributions/gradle-7.4.2-all.zip -> gradle-bin-7.4.2.zip
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=386ee51f52c5a6bc43ccbf484647ce29
diff --git a/metadata/md5-cache/dev-java/gson-2.8.8-r1 b/metadata/md5-cache/dev-java/gson-2.8.8-r1
index 65b9949bf101..73c89bbc97fb 100644
--- a/metadata/md5-cache/dev-java/gson-2.8.8-r1
+++ b/metadata/md5-cache/dev-java/gson-2.8.8-r1
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
RESTRICT=!test? ( test )
SLOT=2.6
SRC_URI=https://github.com/google/gson/archive/gson-parent-2.8.8.tar.gz -> gson-2.8.8-sources.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=413cee418fff8b99e966934c8910f9a5
diff --git a/metadata/md5-cache/dev-java/gson-2.9.0-r1 b/metadata/md5-cache/dev-java/gson-2.9.0-r1
index 4a4ddaa4d076..f40b1aef3c9d 100644
--- a/metadata/md5-cache/dev-java/gson-2.9.0-r1
+++ b/metadata/md5-cache/dev-java/gson-2.9.0-r1
@@ -5,11 +5,11 @@ EAPI=8
HOMEPAGE=https://github.com/google/gson
INHERIT=java-pkg-2 java-pkg-simple
IUSE=doc source test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ppc64 x86
LICENSE=Apache-2.0
RDEPEND=>=virtual/jre-11:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
RESTRICT=!test? ( test )
SLOT=2.9
SRC_URI=https://github.com/google/gson/archive/gson-parent-2.9.0.tar.gz -> gson-2.9.0.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
-_md5_=592c7049eac2190a1afc737546045821
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
+_md5_=15797fef3ee0bdbc79633cfe6ea00d61
diff --git a/metadata/md5-cache/dev-java/guava-20.0 b/metadata/md5-cache/dev-java/guava-20.0
deleted file mode 100644
index 8097358e93c4..000000000000
--- a/metadata/md5-cache/dev-java/guava-20.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=dev-java/animal-sniffer-annotations:0 dev-java/error-prone-annotations:0 dev-java/jsr305:0 >=virtual/jdk-1.7 dev-java/j2objc-annotations:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=A collection of Google's core Java libraries
-EAPI=6
-HOMEPAGE=https://github.com/google/guava
-INHERIT=java-pkg-2 java-pkg-simple
-IUSE=doc source
-KEYWORDS=amd64 ~arm arm64 ppc64 x86
-LICENSE=Apache-2.0
-RDEPEND=dev-java/animal-sniffer-annotations:0 dev-java/error-prone-annotations:0 dev-java/jsr305:0 >=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=20
-SRC_URI=https://github.com/google/guava/archive/v20.0.tar.gz -> guava-20.0.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 eapi7-ver 1a0a60ad07c8b32d2faba2d085dc0f24 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 9f813bb3c47cf2e60619a663b87c5f4e estack 055c42df72f76a4f45ec92b35e83cd56 eutils dab5d8ec471d025b79c9e6906bcf3bff java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 ltprune 97143780d341cc8d8f1d4c6187a36d29 multilib 4a33c9008e5ee30cb8840a3fdc24df2b preserve-libs a8e50acee31b5759b4df1f7707cae54b strip-linguas ac3ee41ee2d31d8c41a77c0838320cc7 toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8 vcs-clean d271b7bc7e6a009758d7d4ef749174e3 versionator d3fb3ba33acc3bbbdc4d7970227c100d wrapper 4a1902f969e5718126434fc35f3a0d9c
-_md5_=391d2b39d3a12d33093dc537d06d650d
diff --git a/metadata/md5-cache/dev-java/guava-20.0-r1 b/metadata/md5-cache/dev-java/guava-20.0-r1
deleted file mode 100644
index 897da27fdc0c..000000000000
--- a/metadata/md5-cache/dev-java/guava-20.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=dev-java/animal-sniffer-annotations:0 dev-java/error-prone-annotations:0 dev-java/jsr305:0 >=virtual/jdk-1.8:* dev-java/j2objc-annotations:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=A collection of Google's core Java libraries
-EAPI=8
-HOMEPAGE=https://github.com/google/guava
-INHERIT=java-pkg-2 java-pkg-simple
-IUSE=doc source
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-java/animal-sniffer-annotations:0 dev-java/error-prone-annotations:0 dev-java/jsr305:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=20
-SRC_URI=https://github.com/google/guava/archive/v20.0.tar.gz -> guava-20.0.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
-_md5_=3b58e40e9fa94e6fa9515a3610de1e37
diff --git a/metadata/md5-cache/dev-java/guava-30.1.1 b/metadata/md5-cache/dev-java/guava-30.1.1
index aa18c0512168..aab1f70f7b4a 100644
--- a/metadata/md5-cache/dev-java/guava-30.1.1
+++ b/metadata/md5-cache/dev-java/guava-30.1.1
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
RDEPEND=>=virtual/jre-1.8:* >=dev-java/error-prone-annotations-2.7.1:0 >=dev-java/failureaccess-30.1.1:0 dev-java/jsr305:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=0
SRC_URI=https://codeload.github.com/google/guava/tar.gz/v30.1.1 -> guava-30.1.1.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=b7a8182279a430660d9c84a74b18d222
diff --git a/metadata/md5-cache/dev-java/guava-testlib-30.1.1 b/metadata/md5-cache/dev-java/guava-testlib-30.1.1
index 8ccba82dcba3..e830ae328fd6 100644
--- a/metadata/md5-cache/dev-java/guava-testlib-30.1.1
+++ b/metadata/md5-cache/dev-java/guava-testlib-30.1.1
@@ -5,11 +5,11 @@ EAPI=8
HOMEPAGE=https://github.com/google/guava
INHERIT=java-pkg-2 java-pkg-simple
IUSE=doc source test
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ppc64 x86
LICENSE=Apache-2.0
RDEPEND=>=virtual/jre-1.8:* dev-java/checker-framework-qual:0 dev-java/error-prone-annotations:0 ~dev-java/guava-30.1.1:0 dev-java/jsr305:0 dev-java/junit:4 dev-java/j2objc-annotations:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=!test? ( test )
+RESTRICT=test !test? ( test )
SLOT=0
SRC_URI=https://github.com/google/guava/archive/v30.1.1.tar.gz -> guava-30.1.1.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
-_md5_=3b394be7083fbd28868ecd7a90a2abc3
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
+_md5_=3fbd991319b8644dea02060fac23b0ee
diff --git a/metadata/md5-cache/dev-java/guice-4.1 b/metadata/md5-cache/dev-java/guice-4.1
deleted file mode 100644
index 50866fc07f42..000000000000
--- a/metadata/md5-cache/dev-java/guice-4.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.7 dev-java/aopalliance:1 >=dev-java/asm-5:4 >=dev-java/cglib-3.1:3 dev-java/guava:20 dev-java/javax-inject:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
-DESCRIPTION=A lightweight dependency injection framework for Java 5 and above
-EAPI=6
-HOMEPAGE=https://github.com/google/guice/
-INHERIT=java-pkg-2 java-ant-2
-IUSE=source
-KEYWORDS=amd64 ~arm arm64 ppc64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.7 dev-java/aopalliance:1 >=dev-java/asm-5:4 >=dev-java/cglib-3.1:3 dev-java/guava:20 dev-java/javax-inject:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=4
-SRC_URI=https://github.com/google/guice/archive/4.1.tar.gz -> guice-4.1.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 eapi7-ver 1a0a60ad07c8b32d2faba2d085dc0f24 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 9f813bb3c47cf2e60619a663b87c5f4e estack 055c42df72f76a4f45ec92b35e83cd56 eutils dab5d8ec471d025b79c9e6906bcf3bff java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 ltprune 97143780d341cc8d8f1d4c6187a36d29 multilib 4a33c9008e5ee30cb8840a3fdc24df2b preserve-libs a8e50acee31b5759b4df1f7707cae54b strip-linguas ac3ee41ee2d31d8c41a77c0838320cc7 toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8 vcs-clean d271b7bc7e6a009758d7d4ef749174e3 versionator d3fb3ba33acc3bbbdc4d7970227c100d wrapper 4a1902f969e5718126434fc35f3a0d9c
-_md5_=83230809b4ca25805d1a3df808bbaa39
diff --git a/metadata/md5-cache/dev-java/guice-5.1.0 b/metadata/md5-cache/dev-java/guice-5.1.0
index 92d63ff21c38..32bc9b343161 100644
--- a/metadata/md5-cache/dev-java/guice-5.1.0
+++ b/metadata/md5-cache/dev-java/guice-5.1.0
@@ -5,11 +5,11 @@ EAPI=8
HOMEPAGE=https://github.com/google/guice
INHERIT=java-pkg-2 java-pkg-simple
IUSE=doc source test
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ppc64 x86
LICENSE=Apache-2.0
RDEPEND=>=virtual/jre-1.8:* dev-java/aopalliance:1 dev-java/asm:9 dev-java/guava:0 dev-java/javax-inject:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
RESTRICT=test !test? ( test )
SLOT=4
SRC_URI=https://github.com/google/guice/archive/5.1.0.tar.gz -> guice-5.1.0.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
-_md5_=203def2f2991fdbb20c1ae0e39d4e145
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
+_md5_=685cafffd922ef9f81fe437e0f590464
diff --git a/metadata/md5-cache/dev-java/gwt-2.9.0-r3 b/metadata/md5-cache/dev-java/gwt-2.9.0-r3
index 53c66481b026..b3ac3d0ca94d 100644
--- a/metadata/md5-cache/dev-java/gwt-2.9.0-r3
+++ b/metadata/md5-cache/dev-java/gwt-2.9.0-r3
@@ -11,5 +11,5 @@ RDEPEND=dev-java/guava:0 dev-java/rhino:1.6 dev-java/asm:9 dev-java/eclipse-ecj:
RESTRICT=mirror test
SLOT=2.8
SRC_URI=https://github.com/gwtproject/gwt/archive/2.9.0.tar.gz -> gwt-2.9.0.tar.gz https://github.com/gwtproject/tools/archive/194772ed94078802d8030136796de344eb1fdbe1.tar.gz -> gwt-tools-194772ed94078802d8030136796de344eb1fdbe1.tar.gz
-_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 cfb5f6911bb70204c94ceafd0372c716 multilib 4fbbbc98f236f1b43acd99476bc3cd85 toolchain-funcs e9da88162e7a3c60376e80c2c2adcdfb
_md5_=ff32efc4c783593995d5cb71417aa35b
diff --git a/metadata/md5-cache/dev-java/hamcrest-core-1.1-r4 b/metadata/md5-cache/dev-java/hamcrest-core-1.1-r4
index 5bcf35669abb..16345ea6e4b7 100644
--- a/metadata/md5-cache/dev-java/hamcrest-core-1.1-r4
+++ b/metadata/md5-cache/dev-java/hamcrest-core-1.1-r4
@@ -10,5 +10,5 @@ LICENSE=BSD-2
RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=0
SRC_URI=https://github.com/hamcrest/JavaHamcrest/archive/hamcrest-java-1.1.tar.gz -> hamcrest-core-1.1.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=862771c872b5a68e1ef18e3583aa2b41
diff --git a/metadata/md5-cache/dev-java/hamcrest-core-1.3-r2 b/metadata/md5-cache/dev-java/hamcrest-core-1.3-r2
index ed6f6745a24e..841cf1d3df3d 100644
--- a/metadata/md5-cache/dev-java/hamcrest-core-1.3-r2
+++ b/metadata/md5-cache/dev-java/hamcrest-core-1.3-r2
@@ -11,5 +11,5 @@ LICENSE=BSD-2
RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=1.3
SRC_URI=mirror://gentoo/hamcrest-1.3.tgz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=d817cac38530baf00f8637892dd278c8
diff --git a/metadata/md5-cache/dev-java/hamcrest-generator-1.3-r3 b/metadata/md5-cache/dev-java/hamcrest-generator-1.3-r3
index b270dc01f9d9..bff24ed64dff 100644
--- a/metadata/md5-cache/dev-java/hamcrest-generator-1.3-r3
+++ b/metadata/md5-cache/dev-java/hamcrest-generator-1.3-r3
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* dev-java/qdox:1.12 >=dev-java/java-config-2.2.0-r3 s
RESTRICT=!test? ( test )
SLOT=1.3
SRC_URI=mirror://gentoo/hamcrest-1.3.tgz
-_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 cfb5f6911bb70204c94ceafd0372c716 multilib 4fbbbc98f236f1b43acd99476bc3cd85 toolchain-funcs e9da88162e7a3c60376e80c2c2adcdfb
_md5_=c06ce07f847072c858dc889f4805ac57
diff --git a/metadata/md5-cache/dev-java/hamcrest-library-1.3-r2 b/metadata/md5-cache/dev-java/hamcrest-library-1.3-r2
index 89fd45a3b629..b572f1890ef9 100644
--- a/metadata/md5-cache/dev-java/hamcrest-library-1.3-r2
+++ b/metadata/md5-cache/dev-java/hamcrest-library-1.3-r2
@@ -11,5 +11,5 @@ LICENSE=BSD-2
RDEPEND=dev-java/hamcrest-core:1.3 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=1.3
SRC_URI=mirror://gentoo/hamcrest-1.3.tgz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=93f17b49b2a6ee35d661928b655146a1
diff --git a/metadata/md5-cache/dev-java/hawtjni-runtime-1.15-r1 b/metadata/md5-cache/dev-java/hawtjni-runtime-1.15-r1
index db9889eb7b85..305d755f13ee 100644
--- a/metadata/md5-cache/dev-java/hawtjni-runtime-1.15-r1
+++ b/metadata/md5-cache/dev-java/hawtjni-runtime-1.15-r1
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=0
SRC_URI=https://github.com/fusesource/hawtjni/archive/hawtjni-project-1.15.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=57b6855aa7eb537491fab8bf1a485409
diff --git a/metadata/md5-cache/dev-java/htmlcleaner-2.25 b/metadata/md5-cache/dev-java/htmlcleaner-2.25
index 7ee1c71acee0..58121c19f30a 100644
--- a/metadata/md5-cache/dev-java/htmlcleaner-2.25
+++ b/metadata/md5-cache/dev-java/htmlcleaner-2.25
@@ -12,5 +12,5 @@ RDEPEND=dev-java/jdom:2 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 sour
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=mirror://sourceforge/htmlcleaner/files/htmlcleaner-2.25-src.zip
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=3985eacac36e2ec1a395a39c03b79127
diff --git a/metadata/md5-cache/dev-java/httpcomponents-client-4.5.13-r1 b/metadata/md5-cache/dev-java/httpcomponents-client-4.5.13-r1
index 8df176597997..924f750dffc1 100644
--- a/metadata/md5-cache/dev-java/httpcomponents-client-4.5.13-r1
+++ b/metadata/md5-cache/dev-java/httpcomponents-client-4.5.13-r1
@@ -11,5 +11,5 @@ RDEPEND=dev-java/commons-codec:0 dev-java/commons-logging:0 dev-java/httpcore:0
RESTRICT=!test? ( test )
SLOT=4
SRC_URI=mirror://apache/httpcomponents/httpclient/source/httpcomponents-client-4.5.13-src.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=bb83a3c6a052302645f9eefbde882a6d
diff --git a/metadata/md5-cache/dev-java/httpcore-4.4.14 b/metadata/md5-cache/dev-java/httpcore-4.4.14
index 1aaad03fd7e2..d332794914ef 100644
--- a/metadata/md5-cache/dev-java/httpcore-4.4.14
+++ b/metadata/md5-cache/dev-java/httpcore-4.4.14
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=mirror://apache/httpcomponents/httpcore/source/httpcomponents-core-4.4.14-src.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=98ecdd55b66865a821b1bdfbd1cd4777
diff --git a/metadata/md5-cache/dev-java/icedtea-3.21.0 b/metadata/md5-cache/dev-java/icedtea-3.21.0
index 24b694f889fc..b50091d09068 100644
--- a/metadata/md5-cache/dev-java/icedtea-3.21.0
+++ b/metadata/md5-cache/dev-java/icedtea-3.21.0
@@ -1,5 +1,5 @@
DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm pretend setup test unpack
-DEPEND=>=dev-libs/glib-2.26:2= >=dev-util/systemtap-1 media-libs/fontconfig:1.0= >=media-libs/freetype-2.5.3:2= >=sys-libs/zlib-1.2.3 virtual/jpeg:0= gtk? ( >=dev-libs/atk-1.30.0 >=x11-libs/cairo-1.8.8 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-2.8:2 >=x11-libs/pango-1.24.5 ) kerberos? ( virtual/krb5 ) sctp? ( net-misc/lksctp-tools ) smartcard? ( sys-apps/pcsc-lite ) system-lcms? ( >=media-libs/lcms-2.9:2= ) >=media-libs/alsa-lib-1.0 >=net-print/cups-1.2.12 >=media-libs/giflib-4.1.6:0= >=media-libs/libpng-1.2:0= >=x11-libs/libX11-1.1.3 >=x11-libs/libXext-1.1.1 >=x11-libs/libXi-1.1.3 >=x11-libs/libXrender-0.9.4 >=x11-libs/libXtst-1.0.3 x11-libs/libXcomposite x11-base/xorg-proto >=x11-libs/libXau-1.0.3 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXinerama-1.0.2 || ( dev-java/openjdk-bin:8 dev-java/openjdk:8 dev-java/icedtea-bin:8 dev-java/icedtea:8 ) app-arch/cpio app-arch/unzip app-arch/zip app-misc/ca-certificates dev-lang/perl dev-libs/openssl:0 sys-apps/attr sys-apps/lsb-release x11-libs/libXt virtual/pkgconfig pax-kernel? ( sys-apps/elfix ) >=dev-java/java-config-2.2.0-r3 dev-java/java-config app-eselect/eselect-java
+DEPEND=>=dev-libs/glib-2.26:2= >=dev-util/systemtap-1 media-libs/fontconfig:1.0= >=media-libs/freetype-2.5.3:2= >=sys-libs/zlib-1.2.3 virtual/jpeg:0= gtk? ( >=dev-libs/atk-1.30.0 >=x11-libs/cairo-1.8.8 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-2.8:2 >=x11-libs/pango-1.24.5 ) kerberos? ( virtual/krb5 ) sctp? ( net-misc/lksctp-tools ) smartcard? ( sys-apps/pcsc-lite ) system-lcms? ( >=media-libs/lcms-2.9:2= ) >=media-libs/alsa-lib-1.0 >=net-print/cups-1.2.12 >=media-libs/giflib-4.1.6:0= >=media-libs/libpng-1.2:0= >=x11-libs/libX11-1.1.3 >=x11-libs/libXext-1.1.1 >=x11-libs/libXi-1.1.3 >=x11-libs/libXrender-0.9.4 >=x11-libs/libXtst-1.0.3 x11-libs/libXcomposite x11-base/xorg-proto >=x11-libs/libXau-1.0.3 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXinerama-1.0.2 || ( dev-java/openjdk-bin:8 dev-java/openjdk:8 dev-java/icedtea-bin:8 dev-java/icedtea:8 ) app-arch/cpio app-arch/unzip app-arch/zip app-misc/ca-certificates dev-lang/perl dev-libs/openssl:0 sys-apps/attr sys-apps/lsb-release x11-libs/libXt virtual/pkgconfig pax-kernel? ( sys-apps/elfix ) >=dev-java/java-config-2.2.0-r3 dev-java/java-config app-eselect/eselect-java app-arch/unzip
DESCRIPTION=A harness to build OpenJDK using Free Software build tools and dependencies
EAPI=6
HOMEPAGE=https://icedtea.classpath.org
@@ -13,5 +13,5 @@ REQUIRED_USE=gtk? ( !headless-awt )
RESTRICT=!test? ( test )
SLOT=8
SRC_URI=https://icedtea.classpath.org/download/source/icedtea-3.21.0.tar.xz https://icedtea.classpath.org/download/drops/icedtea8/3.21.0/openjdk.tar.xz -> icedtea-3.21-openjdk-3.21.0.tar.xz https://icedtea.classpath.org/download/drops/icedtea8/3.21.0/corba.tar.xz -> icedtea-3.21-corba-3.21.0.tar.xz https://icedtea.classpath.org/download/drops/icedtea8/3.21.0/jaxp.tar.xz -> icedtea-3.21-jaxp-3.21.0.tar.xz https://icedtea.classpath.org/download/drops/icedtea8/3.21.0/jaxws.tar.xz -> icedtea-3.21-jaxws-3.21.0.tar.xz https://icedtea.classpath.org/download/drops/icedtea8/3.21.0/jdk.tar.xz -> icedtea-3.21-jdk-3.21.0.tar.xz https://icedtea.classpath.org/download/drops/icedtea8/3.21.0/hotspot.tar.xz -> icedtea-3.21-hotspot-3.21.0.tar.xz https://icedtea.classpath.org/download/drops/icedtea8/3.21.0/nashorn.tar.xz -> icedtea-3.21-nashorn-3.21.0.tar.xz https://icedtea.classpath.org/download/drops/icedtea8/3.21.0/langtools.tar.xz -> icedtea-3.21-langtools-3.21.0.tar.xz shenandoah? ( https://icedtea.classpath.org/download/drops/icedtea8/3.21.0/shenandoah.tar.xz -> icedtea-3.21-shenandoah-3.21.0.tar.xz ) arm? ( https://icedtea.classpath.org/download/drops/icedtea8/3.21.0/aarch32.tar.xz -> icedtea-3.21-aarch32-3.21.0.tar.xz ) https://icedtea.classpath.org/download/drops/cacao/cacao-c182f119eaad.tar.xz -> icedtea-cacao-c182f119eaad.tar.xz https://icedtea.classpath.org/download/drops/jamvm/jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz -> icedtea-jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz
-_eclasses_=check-reqs 82234bf011d5453330773cd5fc3f0199 desktop c0d27bf73aa08ca05b663dbd31fbef28 eapi7-ver 1a0a60ad07c8b32d2faba2d085dc0f24 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 9f813bb3c47cf2e60619a663b87c5f4e estack 055c42df72f76a4f45ec92b35e83cd56 eutils dab5d8ec471d025b79c9e6906bcf3bff flag-o-matic a500d7cc40da3de38c361e889153bdf7 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 java-vm-2 69658c0814b27f9cbe466a24e6621d23 ltprune 97143780d341cc8d8f1d4c6187a36d29 multilib 4a33c9008e5ee30cb8840a3fdc24df2b multiprocessing b4e253ab22cef7b1085e9b67c7a3b730 pax-utils 91d47e5d20627c717aa878b9167c62a8 prefix eab3c99d77fe00506c109c8a736186f7 preserve-libs a8e50acee31b5759b4df1f7707cae54b strip-linguas ac3ee41ee2d31d8c41a77c0838320cc7 toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8 vcs-clean d271b7bc7e6a009758d7d4ef749174e3 versionator d3fb3ba33acc3bbbdc4d7970227c100d wrapper 4a1902f969e5718126434fc35f3a0d9c xdg-utils fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=check-reqs 5e6dfbd7a8d3238a79f009fae7ac469c desktop 22952d8f27cac191d75529d4c38e6bfa eapi7-ver 1a0a60ad07c8b32d2faba2d085dc0f24 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 28f0f3c0226306ec5f49e13bf851f171 estack 055c42df72f76a4f45ec92b35e83cd56 eutils dab5d8ec471d025b79c9e6906bcf3bff flag-o-matic a3abd6002fafb3022597be6b8d01f88b java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 cfb5f6911bb70204c94ceafd0372c716 java-vm-2 5dd4303f0b659986f096e65e566b9701 ltprune 97143780d341cc8d8f1d4c6187a36d29 multilib 4fbbbc98f236f1b43acd99476bc3cd85 multiprocessing b4e253ab22cef7b1085e9b67c7a3b730 pax-utils 91d47e5d20627c717aa878b9167c62a8 prefix eab3c99d77fe00506c109c8a736186f7 preserve-libs a8e50acee31b5759b4df1f7707cae54b strip-linguas ac3ee41ee2d31d8c41a77c0838320cc7 toolchain-funcs e9da88162e7a3c60376e80c2c2adcdfb vcs-clean d271b7bc7e6a009758d7d4ef749174e3 versionator d3fb3ba33acc3bbbdc4d7970227c100d wrapper 4a1902f969e5718126434fc35f3a0d9c xdg-utils fffb53a53cf17c9c0c998a3c0a590c7e
_md5_=b80119a1990d211bd58f3cba3241bd88
diff --git a/metadata/md5-cache/dev-java/icedtea-bin-3.16.0 b/metadata/md5-cache/dev-java/icedtea-bin-3.16.0
index 7524cc09b5f3..91e9d8c2e7a4 100644
--- a/metadata/md5-cache/dev-java/icedtea-bin-3.16.0
+++ b/metadata/md5-cache/dev-java/icedtea-bin-3.16.0
@@ -1,8 +1,9 @@
DEFINED_PHASES=install postinst postrm prepare prerm pretend setup
-DEPEND=app-arch/xz-utils dev-java/java-config app-eselect/eselect-java
+DEPEND=app-arch/xz-utils dev-java/java-config app-eselect/eselect-java app-arch/unzip
DESCRIPTION=A Gentoo-made binary build of the IcedTea JDK
EAPI=6
HOMEPAGE=http://icedtea.classpath.org
+INHERIT=java-vm-2 multilib-build toolchain-funcs
IUSE=+alsa big-endian cups doc examples +gtk headless-awt pulseaudio selinux source abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
KEYWORDS=-* amd64 ~arm arm64 ppc64 x86
LICENSE=GPL-2-with-classpath-exception
@@ -12,5 +13,5 @@ REQUIRED_USE=gtk? ( !headless-awt )
RESTRICT=preserve-libs strip
SLOT=8
SRC_URI=doc? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-doc-3.16.0.tar.xz ) source? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-src-3.16.0.tar.xz ) big-endian? ( ppc64? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-core-3.16.0-ppc64.tar.xz examples? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-examples-3.16.0-ppc64.tar.xz ) ) ) !big-endian? ( ppc64? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-core-3.16.0-ppc64le.tar.xz examples? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-examples-3.16.0-ppc64le.tar.xz ) ) ) amd64? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-core-3.16.0-amd64.tar.xz examples? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-examples-3.16.0-amd64.tar.xz ) ) arm? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-core-3.16.0-arm.tar.xz examples? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-examples-3.16.0-arm.tar.xz ) ) arm64? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-core-3.16.0-arm64.tar.xz examples? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-examples-3.16.0-arm64.tar.xz ) ) x86? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-core-3.16.0-x86.tar.xz examples? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-examples-3.16.0-x86.tar.xz ) )
-_eclasses_=java-vm-2 69658c0814b27f9cbe466a24e6621d23 multibuild d26d81f242cb193d899a72bca423d0bd multilib 4a33c9008e5ee30cb8840a3fdc24df2b multilib-build 05f207909a804c9174bc39a00547d598 pax-utils 91d47e5d20627c717aa878b9167c62a8 prefix eab3c99d77fe00506c109c8a736186f7 toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8 xdg-utils fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=java-vm-2 5dd4303f0b659986f096e65e566b9701 multibuild d26d81f242cb193d899a72bca423d0bd multilib 4fbbbc98f236f1b43acd99476bc3cd85 multilib-build 05f207909a804c9174bc39a00547d598 pax-utils 91d47e5d20627c717aa878b9167c62a8 prefix eab3c99d77fe00506c109c8a736186f7 toolchain-funcs e9da88162e7a3c60376e80c2c2adcdfb xdg-utils fffb53a53cf17c9c0c998a3c0a590c7e
_md5_=4bc6a6c3d396914bb57c6503c2835e94
diff --git a/metadata/md5-cache/dev-java/icedtea-bin-3.16.0-r2 b/metadata/md5-cache/dev-java/icedtea-bin-3.16.0-r2
index 083e210194ea..0e895c854735 100644
--- a/metadata/md5-cache/dev-java/icedtea-bin-3.16.0-r2
+++ b/metadata/md5-cache/dev-java/icedtea-bin-3.16.0-r2
@@ -1,8 +1,10 @@
+BDEPEND=app-arch/unzip
DEFINED_PHASES=install postinst postrm prepare prerm pretend setup
DEPEND=app-arch/xz-utils dev-java/java-config app-eselect/eselect-java
DESCRIPTION=A Gentoo-made binary build of the IcedTea JDK
EAPI=8
HOMEPAGE=http://icedtea.classpath.org
+INHERIT=java-vm-2 multilib-build toolchain-funcs
IUSE=+alsa big-endian cups doc examples +gtk headless-awt pulseaudio selinux source abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
KEYWORDS=-* ~amd64 ~arm ~arm64 ~ppc64 ~x86
LICENSE=GPL-2-with-classpath-exception
@@ -12,5 +14,5 @@ REQUIRED_USE=gtk? ( !headless-awt )
RESTRICT=preserve-libs strip
SLOT=8
SRC_URI=doc? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-doc-3.16.0.tar.xz ) source? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-src-3.16.0.tar.xz ) big-endian? ( ppc64? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-core-3.16.0-ppc64.tar.xz examples? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-examples-3.16.0-ppc64.tar.xz ) ) ) !big-endian? ( ppc64? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-core-3.16.0-ppc64le.tar.xz examples? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-examples-3.16.0-ppc64le.tar.xz ) ) ) amd64? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-core-3.16.0-amd64.tar.xz examples? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-examples-3.16.0-amd64.tar.xz ) ) arm? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-core-3.16.0-arm.tar.xz examples? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-examples-3.16.0-arm.tar.xz ) ) arm64? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-core-3.16.0-arm64.tar.xz examples? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-examples-3.16.0-arm64.tar.xz ) ) x86? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-core-3.16.0-x86.tar.xz examples? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-examples-3.16.0-x86.tar.xz ) )
-_eclasses_=java-vm-2 69658c0814b27f9cbe466a24e6621d23 multibuild d26d81f242cb193d899a72bca423d0bd multilib 4a33c9008e5ee30cb8840a3fdc24df2b multilib-build 05f207909a804c9174bc39a00547d598 pax-utils 91d47e5d20627c717aa878b9167c62a8 prefix eab3c99d77fe00506c109c8a736186f7 toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8 xdg-utils fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=java-vm-2 5dd4303f0b659986f096e65e566b9701 multibuild d26d81f242cb193d899a72bca423d0bd multilib 4fbbbc98f236f1b43acd99476bc3cd85 multilib-build 05f207909a804c9174bc39a00547d598 pax-utils 91d47e5d20627c717aa878b9167c62a8 prefix eab3c99d77fe00506c109c8a736186f7 toolchain-funcs e9da88162e7a3c60376e80c2c2adcdfb xdg-utils fffb53a53cf17c9c0c998a3c0a590c7e
_md5_=d7c1bf31512893365fabb51f42f5baa5
diff --git a/metadata/md5-cache/dev-java/icedtea-sound-1.0.1-r1 b/metadata/md5-cache/dev-java/icedtea-sound-1.0.1-r1
index f073dc554a29..459648d3d5cc 100644
--- a/metadata/md5-cache/dev-java/icedtea-sound-1.0.1-r1
+++ b/metadata/md5-cache/dev-java/icedtea-sound-1.0.1-r1
@@ -11,5 +11,5 @@ LICENSE=GPL-2-with-linking-exception
RDEPEND=virtual/jdk:1.8 >=media-sound/pulseaudio-0.9.11 >=dev-java/java-config-2.2.0-r3
SLOT=0
SRC_URI=https://icedtea.classpath.org/download/source/icedtea-sound-1.0.1.tar.xz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=cd60742967283b0b3d0b1f94e4991c04
diff --git a/metadata/md5-cache/dev-java/icedtea-web-1.8.4-r1 b/metadata/md5-cache/dev-java/icedtea-web-1.8.4-r1
deleted file mode 100644
index ddad70b84cbb..000000000000
--- a/metadata/md5-cache/dev-java/icedtea-web-1.8.4-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=app-arch/zip sys-devel/bc virtual/jdk:1.8 virtual/pkgconfig virtual/rust doc? ( sys-devel/bc ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 >=virtual/rust-1.37.0
-DEFINED_PHASES=compile configure install postinst prepare test unpack
-DESCRIPTION=FOSS Java browser plugin and Web Start implementation
-EAPI=7
-HOMEPAGE=https://github.com/AdoptOpenJDK/IcedTea-Web
-INHERIT=autotools bash-completion-r1 cargo readme.gentoo-r1 xdg-utils
-IUSE=doc debug
-KEYWORDS=amd64 arm64 ppc64 x86
-LICENSE=GPL-2 GPL-2-with-linking-exception LGPL-2
-RDEPEND=>=app-eselect/eselect-java-0.2.0 >=virtual/jre-1.8
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/AdoptOpenJDK/icedtea-web/archive/icedtea-web-1.8.4.tar.gz https://crates.io/api/v1/crates/dunce/0.1.1/download -> dunce-0.1.1.crate
-_eclasses_=autotools b46e8992a8126c894fbdc8084fc040c4 bash-completion-r1 f5e7a020fd9c741740756aac61bf75ff cargo 52a92ed3815080c5f2caac1905687b1c gnuconfig b6b3e92f8b8c996400074b5f61a59256 libtool 241a8f577b9781a42a7421e53448a44e multilib 4a33c9008e5ee30cb8840a3fdc24df2b multiprocessing b4e253ab22cef7b1085e9b67c7a3b730 readme.gentoo-r1 b776ad4b42f564c406a95c41ccb42c55 toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8 xdg-utils fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=6d20088db7fbdf10b73369a50581fccd
diff --git a/metadata/md5-cache/dev-java/icedtea-web-1.8.8 b/metadata/md5-cache/dev-java/icedtea-web-1.8.8
deleted file mode 100644
index b64369defe5f..000000000000
--- a/metadata/md5-cache/dev-java/icedtea-web-1.8.8
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=app-arch/zip sys-devel/bc virtual/jdk:1.8 virtual/pkgconfig virtual/rust doc? ( sys-devel/bc ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 >=virtual/rust-1.37.0
-DEFINED_PHASES=compile configure install postinst prepare test unpack
-DESCRIPTION=FOSS Java browser plugin and Web Start implementation
-EAPI=7
-HOMEPAGE=https://github.com/AdoptOpenJDK/IcedTea-Web
-INHERIT=autotools bash-completion-r1 cargo readme.gentoo-r1 xdg-utils
-IUSE=doc debug
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2 GPL-2-with-linking-exception LGPL-2
-RDEPEND=>=app-eselect/eselect-java-0.2.0 >=virtual/jre-1.8
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/AdoptOpenJDK/icedtea-web/archive/icedtea-web-1.8.8.tar.gz https://crates.io/api/v1/crates/dunce/0.1.1/download -> dunce-0.1.1.crate
-_eclasses_=autotools b46e8992a8126c894fbdc8084fc040c4 bash-completion-r1 f5e7a020fd9c741740756aac61bf75ff cargo 52a92ed3815080c5f2caac1905687b1c gnuconfig b6b3e92f8b8c996400074b5f61a59256 libtool 241a8f577b9781a42a7421e53448a44e multilib 4a33c9008e5ee30cb8840a3fdc24df2b multiprocessing b4e253ab22cef7b1085e9b67c7a3b730 readme.gentoo-r1 b776ad4b42f564c406a95c41ccb42c55 toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8 xdg-utils fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=81abe6989c9fd372690fa45f86649407
diff --git a/metadata/md5-cache/dev-java/icedtea-web-1.8.8-r1 b/metadata/md5-cache/dev-java/icedtea-web-1.8.8-r1
index a27049d8e253..663ac7cd6339 100644
--- a/metadata/md5-cache/dev-java/icedtea-web-1.8.8-r1
+++ b/metadata/md5-cache/dev-java/icedtea-web-1.8.8-r1
@@ -6,11 +6,11 @@ EAPI=8
HOMEPAGE=https://github.com/AdoptOpenJDK/IcedTea-Web
INHERIT=autotools bash-completion-r1 cargo java-pkg-2 readme.gentoo-r1 xdg-utils
IUSE=doc debug
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 arm64 ppc64 x86
LICENSE=GPL-2 GPL-2-with-linking-exception LGPL-2
RDEPEND=>=app-eselect/eselect-java-0.2.0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3
RESTRICT=test
SLOT=0
SRC_URI=https://github.com/AdoptOpenJDK/icedtea-web/archive/icedtea-web-1.8.8.tar.gz https://crates.io/api/v1/crates/dunce/0.1.1/download -> dunce-0.1.1.crate
-_eclasses_=autotools b46e8992a8126c894fbdc8084fc040c4 bash-completion-r1 f5e7a020fd9c741740756aac61bf75ff cargo 52a92ed3815080c5f2caac1905687b1c gnuconfig b6b3e92f8b8c996400074b5f61a59256 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 libtool 241a8f577b9781a42a7421e53448a44e multilib 4a33c9008e5ee30cb8840a3fdc24df2b multiprocessing b4e253ab22cef7b1085e9b67c7a3b730 readme.gentoo-r1 b776ad4b42f564c406a95c41ccb42c55 toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8 xdg-utils fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=06c63f45f233bf69b9706a234128e076
+_eclasses_=autotools 136117fb43a9bf5598530e9cc642f710 bash-completion-r1 f5e7a020fd9c741740756aac61bf75ff cargo 52a92ed3815080c5f2caac1905687b1c gnuconfig b6b3e92f8b8c996400074b5f61a59256 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 cfb5f6911bb70204c94ceafd0372c716 libtool 241a8f577b9781a42a7421e53448a44e multilib 4fbbbc98f236f1b43acd99476bc3cd85 multiprocessing b4e253ab22cef7b1085e9b67c7a3b730 readme.gentoo-r1 b776ad4b42f564c406a95c41ccb42c55 toolchain-funcs e9da88162e7a3c60376e80c2c2adcdfb xdg-utils fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=152e6755ea5728eb8ac17fbf5596f575
diff --git a/metadata/md5-cache/dev-java/icu4j-71.1 b/metadata/md5-cache/dev-java/icu4j-71.1
index cf3102599e2b..67babe8e7b58 100644
--- a/metadata/md5-cache/dev-java/icu4j-71.1
+++ b/metadata/md5-cache/dev-java/icu4j-71.1
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
RESTRICT=!test? ( test )
SLOT=70
SRC_URI=https://github.com/unicode-org/icu/archive/refs/tags/release-71-1.tar.gz -> icu4j-71.1.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=608873bde6d4fcb66db9268cdae131d5
diff --git a/metadata/md5-cache/dev-java/iso-relax-20050331-r5 b/metadata/md5-cache/dev-java/iso-relax-20050331-r5
index 79ad57c8aa02..5c43f914683b 100644
--- a/metadata/md5-cache/dev-java/iso-relax-20050331-r5
+++ b/metadata/md5-cache/dev-java/iso-relax-20050331-r5
@@ -11,5 +11,5 @@ RDEPEND=dev-java/ant-core:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3
RESTRICT=test
SLOT=0
SRC_URI=mirror://gentoo/iso-relax-20050331.tar.bz2
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=a84f38d6a933e9fd22f734b3820885cc
diff --git a/metadata/md5-cache/dev-java/istack-commons-runtime-4.1.1 b/metadata/md5-cache/dev-java/istack-commons-runtime-4.1.1
new file mode 100644
index 000000000000..a43ccc9a07a4
--- /dev/null
+++ b/metadata/md5-cache/dev-java/istack-commons-runtime-4.1.1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=>=virtual/jdk-1.8:* dev-java/jakarta-activation-api:2 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
+DESCRIPTION=istack common utility code
+EAPI=8
+HOMEPAGE=https://projects.eclipse.org/projects/ee4j/istack-commons/
+INHERIT=java-pkg-2 java-pkg-simple
+IUSE=doc source test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=EPL-1.0
+RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/eclipse-ee4j/jaxb-istack-commons/archive/4.1.1.tar.gz -> jaxb-istack-commons-istack-commons-runtime-4.1.1.tar.gz
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
+_md5_=017580c1a2bbab04687dfda83d03bc7b
diff --git a/metadata/md5-cache/dev-java/j2objc-annotations-1.2-r1 b/metadata/md5-cache/dev-java/j2objc-annotations-1.2-r1
index 18de830dfbb4..df0997acac7e 100644
--- a/metadata/md5-cache/dev-java/j2objc-annotations-1.2-r1
+++ b/metadata/md5-cache/dev-java/j2objc-annotations-1.2-r1
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=0
SRC_URI=https://github.com/google/j2objc/archive/1.2.tar.gz -> j2objc-1.2.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=01350264add1cdca6196b90b3470300b
diff --git a/metadata/md5-cache/dev-java/jackcess-4.0.0 b/metadata/md5-cache/dev-java/jackcess-4.0.0
index be2fad773612..600148b30208 100644
--- a/metadata/md5-cache/dev-java/jackcess-4.0.0
+++ b/metadata/md5-cache/dev-java/jackcess-4.0.0
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/commons-lang-3.11:3.6 >=dev-java/commons-
RESTRICT=!test? ( test )
SLOT=1
SRC_URI=https://github.com/jahlborn/jackcess/archive/refs/tags/jackcess-4.0.0.tar.gz -> jackcess-4.0.0-sources.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=4a06ce48615df7a1aed5c5bf2ee1577c
diff --git a/metadata/md5-cache/dev-java/jackrabbit-webdav-2.10.1-r2 b/metadata/md5-cache/dev-java/jackrabbit-webdav-2.10.1-r2
index 030a1dff029c..d475b94415e8 100644
--- a/metadata/md5-cache/dev-java/jackrabbit-webdav-2.10.1-r2
+++ b/metadata/md5-cache/dev-java/jackrabbit-webdav-2.10.1-r2
@@ -12,5 +12,5 @@ RDEPEND=>=virtual/jre-1.8:* dev-java/bndlib:0 dev-java/slf4j-api:0 dev-java/slf4
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=mirror://apache/jackrabbit/2.10.1/jackrabbit-2.10.1-src.zip
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=5808f285a2b6a5c3da1c51fdd999c92b
diff --git a/metadata/md5-cache/dev-java/jackrabbit-webdav-2.21.7-r1 b/metadata/md5-cache/dev-java/jackrabbit-webdav-2.21.7-r1
index beadaaa42ec0..6780ca5a3345 100644
--- a/metadata/md5-cache/dev-java/jackrabbit-webdav-2.21.7-r1
+++ b/metadata/md5-cache/dev-java/jackrabbit-webdav-2.21.7-r1
@@ -12,5 +12,5 @@ RDEPEND=dev-java/httpcomponents-client:4 dev-java/httpcore:0 dev-java/osgi-annot
RESTRICT=!test? ( test )
SLOT=2
SRC_URI=mirror://apache/jackrabbit/2.21.7/jackrabbit-2.21.7-src.zip
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=65c70f65cb8c9421c6090410aea25e7a
diff --git a/metadata/md5-cache/dev-java/jackson-annotations-2.13.2-r1 b/metadata/md5-cache/dev-java/jackson-annotations-2.13.2-r1
index f898cfb6f641..adfbfe47cad1 100644
--- a/metadata/md5-cache/dev-java/jackson-annotations-2.13.2-r1
+++ b/metadata/md5-cache/dev-java/jackson-annotations-2.13.2-r1
@@ -5,11 +5,11 @@ EAPI=8
HOMEPAGE=https://github.com/FasterXML/jackson-annotations
INHERIT=java-pkg-2 java-pkg-simple
IUSE=doc source test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ppc64 x86
LICENSE=Apache-2.0
RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
RESTRICT=!test? ( test )
SLOT=2
SRC_URI=https://github.com/FasterXML/jackson-annotations/archive/jackson-annotations-2.13.2.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
-_md5_=47fddaf0d6d86535481e9702033662d5
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
+_md5_=52e5505231ce2b73e9d1c6fa4006fb9d
diff --git a/metadata/md5-cache/dev-java/jackson-annotations-2.13.2 b/metadata/md5-cache/dev-java/jackson-annotations-2.13.3
index 681ba225da38..6a50c11c7339 100644
--- a/metadata/md5-cache/dev-java/jackson-annotations-2.13.2
+++ b/metadata/md5-cache/dev-java/jackson-annotations-2.13.3
@@ -1,15 +1,15 @@
DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
+DEPEND=>=virtual/jdk-11:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
DESCRIPTION=Core annotations used for value types, used by Jackson data binding package.
EAPI=8
HOMEPAGE=https://github.com/FasterXML/jackson-annotations
INHERIT=java-pkg-2 java-pkg-simple
IUSE=doc source test
-KEYWORDS=amd64 ~arm arm64 ppc64 x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
LICENSE=Apache-2.0
RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
RESTRICT=!test? ( test )
SLOT=2
-SRC_URI=https://github.com/FasterXML/jackson-annotations/archive/jackson-annotations-2.13.2.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
-_md5_=f380dce9bef51615b5823d527849c535
+SRC_URI=https://github.com/FasterXML/jackson-annotations/archive/jackson-annotations-2.13.3.tar.gz
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
+_md5_=777525351e16e0aa9d7199de58b8d61f
diff --git a/metadata/md5-cache/dev-java/jackson-core-2.13.2-r1 b/metadata/md5-cache/dev-java/jackson-core-2.13.2-r1
index d1b843333366..04f738b21211 100644
--- a/metadata/md5-cache/dev-java/jackson-core-2.13.2-r1
+++ b/metadata/md5-cache/dev-java/jackson-core-2.13.2-r1
@@ -5,11 +5,11 @@ EAPI=8
HOMEPAGE=https://github.com/FasterXML/jackson-core
INHERIT=java-pkg-2 java-pkg-simple
IUSE=doc source test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ppc64 x86
LICENSE=Apache-2.0
RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://github.com/FasterXML/jackson-core/archive/jackson-core-2.13.2.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
-_md5_=cf1c481710f655c066587e110958d4d8
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
+_md5_=6f6870494a8e707a0c16dc8ec375561d
diff --git a/metadata/md5-cache/dev-java/jackson-core-2.13.2 b/metadata/md5-cache/dev-java/jackson-core-2.13.3
index d0f90b54246b..6864dbce9e2d 100644
--- a/metadata/md5-cache/dev-java/jackson-core-2.13.2
+++ b/metadata/md5-cache/dev-java/jackson-core-2.13.3
@@ -1,15 +1,15 @@
DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
+DEPEND=>=virtual/jdk-11:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
DESCRIPTION=Core Jackson processing abstractions (Streaming API), implementation for JSON
EAPI=8
HOMEPAGE=https://github.com/FasterXML/jackson-core
INHERIT=java-pkg-2 java-pkg-simple
IUSE=doc source test
-KEYWORDS=amd64 ~arm arm64 ppc64 x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
LICENSE=Apache-2.0
RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
RESTRICT=!test? ( test )
SLOT=0
-SRC_URI=https://github.com/FasterXML/jackson-core/archive/jackson-core-2.13.2.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
-_md5_=09399f8e3be7acb6bb4f45ceefd28f43
+SRC_URI=https://github.com/FasterXML/jackson-core/archive/jackson-core-2.13.3.tar.gz
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
+_md5_=151a771ba6a88f23f28939543905adb7
diff --git a/metadata/md5-cache/dev-java/jackson-databind-2.13.2 b/metadata/md5-cache/dev-java/jackson-databind-2.13.2
deleted file mode 100644
index 88ea0e25b5e6..000000000000
--- a/metadata/md5-cache/dev-java/jackson-databind-2.13.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.8:* ~dev-java/jackson-annotations-2.13.2:2 ~dev-java/jackson-core-2.13.2:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
-DESCRIPTION=General data-binding functionality for Jackson: works on core streaming API
-EAPI=8
-HOMEPAGE=https://github.com/FasterXML/jackson-databind
-INHERIT=java-pkg-2 java-pkg-simple
-IUSE=doc source test
-KEYWORDS=amd64 ~arm arm64 ppc64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.8:* ~dev-java/jackson-annotations-2.13.2:2 ~dev-java/jackson-core-2.13.2:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/FasterXML/jackson-databind/archive/jackson-databind-2.13.2.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
-_md5_=4dabe97dc4c3090074061d23c52b7679
diff --git a/metadata/md5-cache/dev-java/jackson-databind-2.13.2.2 b/metadata/md5-cache/dev-java/jackson-databind-2.13.2.2
index c2d12eb8dced..2ee24b23222a 100644
--- a/metadata/md5-cache/dev-java/jackson-databind-2.13.2.2
+++ b/metadata/md5-cache/dev-java/jackson-databind-2.13.2.2
@@ -5,11 +5,11 @@ EAPI=8
HOMEPAGE=https://github.com/FasterXML/jackson-databind
INHERIT=java-pkg-2 java-pkg-simple
IUSE=doc source test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ppc64 x86
LICENSE=Apache-2.0
RDEPEND=>=virtual/jre-1.8:* ~dev-java/jackson-annotations-2.13.2:2 ~dev-java/jackson-core-2.13.2:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
RESTRICT=test !test? ( test )
SLOT=0
SRC_URI=https://github.com/FasterXML/jackson-databind/archive/jackson-databind-2.13.2.2.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
-_md5_=041307ad650971b72e602e0b9a879f8a
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
+_md5_=1ab8656a9d7a6ab1abd9247f7f47ad10
diff --git a/metadata/md5-cache/dev-java/jackson-databind-2.13.3 b/metadata/md5-cache/dev-java/jackson-databind-2.13.3
new file mode 100644
index 000000000000..221abf33d12f
--- /dev/null
+++ b/metadata/md5-cache/dev-java/jackson-databind-2.13.3
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=>=virtual/jdk-11:* ~dev-java/jackson-annotations-2.13.3:2 ~dev-java/jackson-core-2.13.3:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
+DESCRIPTION=General data-binding functionality for Jackson: works on core streaming API
+EAPI=8
+HOMEPAGE=https://github.com/FasterXML/jackson-databind
+INHERIT=java-pkg-2 java-pkg-simple
+IUSE=doc source test
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
+LICENSE=Apache-2.0
+RDEPEND=>=virtual/jre-1.8:* ~dev-java/jackson-annotations-2.13.3:2 ~dev-java/jackson-core-2.13.3:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=test !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/FasterXML/jackson-databind/archive/jackson-databind-2.13.3.tar.gz
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
+_md5_=359d07897d0278e84e294a346f5075d9
diff --git a/metadata/md5-cache/dev-java/jackson-dataformat-xml-2.13.2 b/metadata/md5-cache/dev-java/jackson-dataformat-xml-2.13.2
deleted file mode 100644
index 074e0b8ed3fa..000000000000
--- a/metadata/md5-cache/dev-java/jackson-dataformat-xml-2.13.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.8:* ~dev-java/jackson-annotations-2.13.2:2 ~dev-java/jackson-core-2.13.2:0 ~dev-java/jackson-databind-2.13.2:0 dev-java/stax2-api:0 dev-java/woodstox-core:0 test? ( ~dev-java/jackson-module-jakarta-xmlbind-2.13.2:0 dev-java/jaxb-api:3 dev-java/sjsxp:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
-DESCRIPTION=Data format extension for Jackson
-EAPI=8
-HOMEPAGE=https://github.com/FasterXML/jackson-dataformat-xml
-INHERIT=java-pkg-2 java-pkg-simple
-IUSE=doc source test
-KEYWORDS=amd64 ~arm arm64 ppc64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.8:* ~dev-java/jackson-annotations-2.13.2:2 ~dev-java/jackson-core-2.13.2:0 ~dev-java/jackson-databind-2.13.2:0 dev-java/stax2-api:0 dev-java/woodstox-core:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/FasterXML/jackson-dataformat-xml/archive/jackson-dataformat-xml-2.13.2.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
-_md5_=085c746d94a4b30ca20cece6ed92dbc7
diff --git a/metadata/md5-cache/dev-java/jackson-dataformat-xml-2.13.2-r1 b/metadata/md5-cache/dev-java/jackson-dataformat-xml-2.13.2-r1
index ae8841c8f404..d193f910a6d2 100644
--- a/metadata/md5-cache/dev-java/jackson-dataformat-xml-2.13.2-r1
+++ b/metadata/md5-cache/dev-java/jackson-dataformat-xml-2.13.2-r1
@@ -5,11 +5,11 @@ EAPI=8
HOMEPAGE=https://github.com/FasterXML/jackson-dataformat-xml
INHERIT=java-pkg-2 java-pkg-simple
IUSE=doc source test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ppc64 x86
LICENSE=Apache-2.0
RDEPEND=>=virtual/jre-1.8:* ~dev-java/jackson-annotations-2.13.2:2 ~dev-java/jackson-core-2.13.2:0 ~dev-java/jackson-databind-2.13.2.2:0 >=dev-java/stax2-api-4.2.1-r1:0 dev-java/woodstox-core:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://github.com/FasterXML/jackson-dataformat-xml/archive/jackson-dataformat-xml-2.13.2.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
-_md5_=3e49953b03fc68fd11e25b7827b130f5
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
+_md5_=076a966c073f3b38f1cd56607811e73f
diff --git a/metadata/md5-cache/dev-java/jackson-dataformat-xml-2.13.3 b/metadata/md5-cache/dev-java/jackson-dataformat-xml-2.13.3
new file mode 100644
index 000000000000..944f2347111e
--- /dev/null
+++ b/metadata/md5-cache/dev-java/jackson-dataformat-xml-2.13.3
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=>=virtual/jdk-11:* ~dev-java/jackson-annotations-2.13.3:2 ~dev-java/jackson-core-2.13.3:0 ~dev-java/jackson-databind-2.13.3:0 >=dev-java/stax2-api-4.2.1-r1:0 dev-java/woodstox-core:0 test? ( ~dev-java/jackson-module-jakarta-xmlbind-2.13.3:0 dev-java/jaxb-api:3 dev-java/sjsxp:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
+DESCRIPTION=Data format extension for Jackson
+EAPI=8
+HOMEPAGE=https://github.com/FasterXML/jackson-dataformat-xml
+INHERIT=java-pkg-2 java-pkg-simple
+IUSE=doc source test
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
+LICENSE=Apache-2.0
+RDEPEND=>=virtual/jre-1.8:* ~dev-java/jackson-annotations-2.13.3:2 ~dev-java/jackson-core-2.13.3:0 ~dev-java/jackson-databind-2.13.3:0 >=dev-java/stax2-api-4.2.1-r1:0 dev-java/woodstox-core:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/FasterXML/jackson-dataformat-xml/archive/jackson-dataformat-xml-2.13.3.tar.gz
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
+_md5_=b26ee0c2d382ff78a9dbabec7ed2e0f3
diff --git a/metadata/md5-cache/dev-java/jackson-dataformat-xml-2.13.3-r1 b/metadata/md5-cache/dev-java/jackson-dataformat-xml-2.13.3-r1
new file mode 100644
index 000000000000..60c49411110a
--- /dev/null
+++ b/metadata/md5-cache/dev-java/jackson-dataformat-xml-2.13.3-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=>=virtual/jdk-11:* ~dev-java/jackson-annotations-2.13.3:2 ~dev-java/jackson-core-2.13.3:0 ~dev-java/jackson-databind-2.13.3:0 >=dev-java/stax2-api-4.2.1-r1:0 dev-java/woodstox-core:0 test? ( ~dev-java/jackson-module-jakarta-xmlbind-2.13.3:0 dev-java/jaxb-api:4 dev-java/sjsxp:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
+DESCRIPTION=Data format extension for Jackson
+EAPI=8
+HOMEPAGE=https://github.com/FasterXML/jackson-dataformat-xml
+INHERIT=java-pkg-2 java-pkg-simple
+IUSE=doc source test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=virtual/jre-1.8:* ~dev-java/jackson-annotations-2.13.3:2 ~dev-java/jackson-core-2.13.3:0 ~dev-java/jackson-databind-2.13.3:0 >=dev-java/stax2-api-4.2.1-r1:0 dev-java/woodstox-core:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/FasterXML/jackson-dataformat-xml/archive/jackson-dataformat-xml-2.13.3.tar.gz
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
+_md5_=6f5e8b56fa0374e12b095bd17f9836d4
diff --git a/metadata/md5-cache/dev-java/jackson-dataformat-yaml-2.13.2 b/metadata/md5-cache/dev-java/jackson-dataformat-yaml-2.13.2
deleted file mode 100644
index 16902d716a68..000000000000
--- a/metadata/md5-cache/dev-java/jackson-dataformat-yaml-2.13.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.8:* ~dev-java/jackson-core-2.13.2:0 ~dev-java/jackson-databind-2.13.2:0 dev-java/snakeyaml:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
-DESCRIPTION=Support for reading and writing YAML-encoded data via Jackson abstractions
-EAPI=8
-HOMEPAGE=https://github.com/FasterXML/jackson-dataformats-text
-INHERIT=java-pkg-2 java-pkg-simple
-IUSE=doc source test
-KEYWORDS=amd64 ~arm arm64 ppc64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.8:* ~dev-java/jackson-core-2.13.2:0 ~dev-java/jackson-databind-2.13.2:0 dev-java/snakeyaml:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/FasterXML/jackson-dataformats-text/archive/jackson-dataformats-text-2.13.2.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
-_md5_=05370752da4e45558e8f913459336e8c
diff --git a/metadata/md5-cache/dev-java/jackson-dataformat-yaml-2.13.2-r1 b/metadata/md5-cache/dev-java/jackson-dataformat-yaml-2.13.2-r1
index fc27ed987eb9..f1a6fc1225b0 100644
--- a/metadata/md5-cache/dev-java/jackson-dataformat-yaml-2.13.2-r1
+++ b/metadata/md5-cache/dev-java/jackson-dataformat-yaml-2.13.2-r1
@@ -5,11 +5,11 @@ EAPI=8
HOMEPAGE=https://github.com/FasterXML/jackson-dataformats-text
INHERIT=java-pkg-2 java-pkg-simple
IUSE=doc source test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ppc64 x86
LICENSE=Apache-2.0
RDEPEND=>=virtual/jre-1.8:* ~dev-java/jackson-core-2.13.2:0 ~dev-java/jackson-databind-2.13.2.2:0 dev-java/snakeyaml:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://github.com/FasterXML/jackson-dataformats-text/archive/jackson-dataformats-text-2.13.2.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
-_md5_=a7ccdff5d8c38920e1e7947dd8473798
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
+_md5_=e230206906cb6250a5d3d2562a1103f7
diff --git a/metadata/md5-cache/dev-java/jackson-dataformat-yaml-2.13.3 b/metadata/md5-cache/dev-java/jackson-dataformat-yaml-2.13.3
new file mode 100644
index 000000000000..652a6479f8a8
--- /dev/null
+++ b/metadata/md5-cache/dev-java/jackson-dataformat-yaml-2.13.3
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=>=virtual/jdk-11:* ~dev-java/jackson-core-2.13.3:0 ~dev-java/jackson-databind-2.13.3:0 dev-java/snakeyaml:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
+DESCRIPTION=Support for reading and writing YAML-encoded data via Jackson abstractions
+EAPI=8
+HOMEPAGE=https://github.com/FasterXML/jackson-dataformats-text
+INHERIT=java-pkg-2 java-pkg-simple
+IUSE=doc source test
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
+LICENSE=Apache-2.0
+RDEPEND=>=virtual/jre-1.8:* ~dev-java/jackson-core-2.13.3:0 ~dev-java/jackson-databind-2.13.3:0 dev-java/snakeyaml:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/FasterXML/jackson-dataformats-text/archive/jackson-dataformats-text-2.13.3.tar.gz
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
+_md5_=1ccff617f6612b7d5a9de69638327938
diff --git a/metadata/md5-cache/dev-java/jackson-module-jakarta-xmlbind-2.13.2 b/metadata/md5-cache/dev-java/jackson-module-jakarta-xmlbind-2.13.2
deleted file mode 100644
index 8ce0126d478e..000000000000
--- a/metadata/md5-cache/dev-java/jackson-module-jakarta-xmlbind-2.13.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.8:* ~dev-java/jackson-annotations-2.13.2:2 ~dev-java/jackson-core-2.13.2:0 ~dev-java/jackson-databind-2.13.2:0 dev-java/jakarta-activation-api:1 dev-java/jaxb-api:3 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
-DESCRIPTION=Support for using Jakarta XML Bind (aka JAXB 3.0) annotations
-EAPI=8
-HOMEPAGE=https://github.com/FasterXML/jackson-modules-base
-INHERIT=java-pkg-2 java-pkg-simple
-IUSE=doc source test
-KEYWORDS=amd64 ~arm arm64 ppc64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.8:* ~dev-java/jackson-annotations-2.13.2:2 ~dev-java/jackson-core-2.13.2:0 ~dev-java/jackson-databind-2.13.2:0 dev-java/jakarta-activation-api:1 dev-java/jaxb-api:3 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/FasterXML/jackson-modules-base/archive/jackson-modules-base-2.13.2.tar.gz -> jackson-module-jakarta-xmlbind-2.13.2.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
-_md5_=c9482a7e29fa263456ee166fb9c65f90
diff --git a/metadata/md5-cache/dev-java/jackson-module-jakarta-xmlbind-2.13.2-r1 b/metadata/md5-cache/dev-java/jackson-module-jakarta-xmlbind-2.13.2-r1
index 14caedde15c5..defa72a0451a 100644
--- a/metadata/md5-cache/dev-java/jackson-module-jakarta-xmlbind-2.13.2-r1
+++ b/metadata/md5-cache/dev-java/jackson-module-jakarta-xmlbind-2.13.2-r1
@@ -5,11 +5,11 @@ EAPI=8
HOMEPAGE=https://github.com/FasterXML/jackson-modules-base
INHERIT=java-pkg-2 java-pkg-simple
IUSE=doc source test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ppc64 x86
LICENSE=Apache-2.0
RDEPEND=>=virtual/jre-1.8:* ~dev-java/jackson-annotations-2.13.2:2 ~dev-java/jackson-core-2.13.2:0 ~dev-java/jackson-databind-2.13.2.2:0 dev-java/jakarta-activation-api:1 dev-java/jaxb-api:3 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
RESTRICT=test !test? ( test )
SLOT=0
SRC_URI=https://github.com/FasterXML/jackson-modules-base/archive/jackson-modules-base-2.13.2.tar.gz -> jackson-module-jakarta-xmlbind-2.13.2.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
-_md5_=04b00192bbf4c9dcd25277dec27a3655
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
+_md5_=e8adbe3ee532d5fd05cc483a837254b6
diff --git a/metadata/md5-cache/dev-java/jackson-module-jakarta-xmlbind-2.13.3 b/metadata/md5-cache/dev-java/jackson-module-jakarta-xmlbind-2.13.3
new file mode 100644
index 000000000000..0ab19bd1242d
--- /dev/null
+++ b/metadata/md5-cache/dev-java/jackson-module-jakarta-xmlbind-2.13.3
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=>=virtual/jdk-11:* ~dev-java/jackson-annotations-2.13.3:2 ~dev-java/jackson-core-2.13.3:0 ~dev-java/jackson-databind-2.13.3:0 dev-java/jakarta-activation:1 dev-java/jaxb-api:3 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
+DESCRIPTION=Support for using Jakarta XML Bind (aka JAXB 3.0) annotations
+EAPI=8
+HOMEPAGE=https://github.com/FasterXML/jackson-modules-base
+INHERIT=java-pkg-2 java-pkg-simple
+IUSE=doc source test
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
+LICENSE=Apache-2.0
+RDEPEND=>=virtual/jre-1.8:* ~dev-java/jackson-annotations-2.13.3:2 ~dev-java/jackson-core-2.13.3:0 ~dev-java/jackson-databind-2.13.3:0 dev-java/jakarta-activation:1 dev-java/jaxb-api:3 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=test !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/FasterXML/jackson-modules-base/archive/jackson-modules-base-2.13.3.tar.gz -> jackson-module-jakarta-xmlbind-2.13.3.tar.gz
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
+_md5_=323c22bc93f690f63dabba52831bcc15
diff --git a/metadata/md5-cache/dev-java/jackson-module-jakarta-xmlbind-2.13.3-r1 b/metadata/md5-cache/dev-java/jackson-module-jakarta-xmlbind-2.13.3-r1
new file mode 100644
index 000000000000..01797e54d903
--- /dev/null
+++ b/metadata/md5-cache/dev-java/jackson-module-jakarta-xmlbind-2.13.3-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=>=virtual/jdk-11:* ~dev-java/jackson-annotations-2.13.3:2 ~dev-java/jackson-core-2.13.3:0 ~dev-java/jackson-databind-2.13.3:0 dev-java/jakarta-activation:1 dev-java/jaxb-api:4 test? ( dev-java/jaxb-runtime:4 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
+DESCRIPTION=Support for using Jakarta XML Bind (aka JAXB 3.0) annotations
+EAPI=8
+HOMEPAGE=https://github.com/FasterXML/jackson-modules-base
+INHERIT=java-pkg-2 java-pkg-simple
+IUSE=doc source test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=virtual/jre-1.8:* ~dev-java/jackson-annotations-2.13.3:2 ~dev-java/jackson-core-2.13.3:0 ~dev-java/jackson-databind-2.13.3:0 dev-java/jakarta-activation:1 dev-java/jaxb-api:4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/FasterXML/jackson-modules-base/archive/jackson-modules-base-2.13.3.tar.gz -> jackson-module-jakarta-xmlbind-2.13.3.tar.gz
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
+_md5_=11072eed14981e1828ea5f767a3695e2
diff --git a/metadata/md5-cache/dev-java/jacl-1.4.1-r2 b/metadata/md5-cache/dev-java/jacl-1.4.1-r2
index fc294a48ffad..77bf6e66425c 100644
--- a/metadata/md5-cache/dev-java/jacl-1.4.1-r2
+++ b/metadata/md5-cache/dev-java/jacl-1.4.1-r2
@@ -10,5 +10,5 @@ LICENSE=BSD
RDEPEND=>=dev-lang/tcl-8.4.5:* >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=0
SRC_URI=mirror://sourceforge/project/tcljava/jacl/1.4.1/jacl1.4.1.tar.gz -> jacl-1.4.1.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=2b2f769227fc69a612651c02ccdd38b5
diff --git a/metadata/md5-cache/dev-java/jai-imageio-core-1.4.0 b/metadata/md5-cache/dev-java/jai-imageio-core-1.4.0
index 079bc1074d6a..b6dc70b57d60 100644
--- a/metadata/md5-cache/dev-java/jai-imageio-core-1.4.0
+++ b/metadata/md5-cache/dev-java/jai-imageio-core-1.4.0
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://github.com/jai-imageio/jai-imageio-core/archive/refs/tags/jai-imageio-core-1.4.0.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=74ad4bab14571030a910e71cd2e89864
diff --git a/metadata/md5-cache/dev-java/jai-imageio-jpeg2000-1.4.0 b/metadata/md5-cache/dev-java/jai-imageio-jpeg2000-1.4.0
index 38d5b2fac4c4..f243052a9744 100644
--- a/metadata/md5-cache/dev-java/jai-imageio-jpeg2000-1.4.0
+++ b/metadata/md5-cache/dev-java/jai-imageio-jpeg2000-1.4.0
@@ -11,5 +11,5 @@ RDEPEND=dev-java/jai-imageio-core:0 >=virtual/jre-1.8:* >=dev-java/java-config-2
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://github.com/jai-imageio/jai-imageio-jpeg2000/archive/refs/tags/jai-imageio-jpeg2000-1.4.0.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=b3ab374e62458f2b7465a8bc15c11a2c
diff --git a/metadata/md5-cache/dev-java/jakarta-activation-1.2.2-r1 b/metadata/md5-cache/dev-java/jakarta-activation-1.2.2-r1
index 9919a14e5be9..afb26bb1fbef 100644
--- a/metadata/md5-cache/dev-java/jakarta-activation-1.2.2-r1
+++ b/metadata/md5-cache/dev-java/jakarta-activation-1.2.2-r1
@@ -11,5 +11,5 @@ LICENSE=EPL-1.0
RDEPEND=dev-java/jakarta-activation-api:1 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=1
SRC_URI=https://github.com/eclipse-ee4j/jaf/archive/1.2.2.tar.gz -> jakarta-activation-1.2.2.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=b99f05dd12cac00e435ee47ecf965e4d
diff --git a/metadata/md5-cache/dev-java/jakarta-activation-2.0.1-r1 b/metadata/md5-cache/dev-java/jakarta-activation-2.0.1-r1
index 450ff1f8c725..dabaaed41c24 100644
--- a/metadata/md5-cache/dev-java/jakarta-activation-2.0.1-r1
+++ b/metadata/md5-cache/dev-java/jakarta-activation-2.0.1-r1
@@ -10,5 +10,5 @@ LICENSE=EPL-1.0
RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=2
SRC_URI=https://github.com/eclipse-ee4j/jaf/archive/2.0.1.tar.gz -> jakarta-activation-2.0.1.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=93e0c276aeccbc963839590ab4f681d9
diff --git a/metadata/md5-cache/dev-java/jakarta-activation-api-1.2.2-r1 b/metadata/md5-cache/dev-java/jakarta-activation-api-1.2.2-r1
index 356b8b5a87f2..68a423004a01 100644
--- a/metadata/md5-cache/dev-java/jakarta-activation-api-1.2.2-r1
+++ b/metadata/md5-cache/dev-java/jakarta-activation-api-1.2.2-r1
@@ -11,5 +11,5 @@ LICENSE=EPL-1.0
RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=1
SRC_URI=https://github.com/eclipse-ee4j/jaf/archive/1.2.2.tar.gz -> jakarta-activation-api-1.2.2.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=c34af806732c7e489f11860f6501ea3a
diff --git a/metadata/md5-cache/dev-java/jakarta-activation-api-2.1.0-r1 b/metadata/md5-cache/dev-java/jakarta-activation-api-2.1.0-r1
index 6a73dd87acb6..d3b46a550ac9 100644
--- a/metadata/md5-cache/dev-java/jakarta-activation-api-2.1.0-r1
+++ b/metadata/md5-cache/dev-java/jakarta-activation-api-2.1.0-r1
@@ -10,5 +10,5 @@ LICENSE=EPL-1.0
RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=2
SRC_URI=https://github.com/eclipse-ee4j/jaf/archive/2.1.0.tar.gz -> jakarta-activation-2.1.0.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=1ab8555b3a957d389e447120417be772
diff --git a/metadata/md5-cache/dev-java/jakarta-json-api-1.1.6 b/metadata/md5-cache/dev-java/jakarta-json-api-1.1.6
index 914d49443e66..3f33905604d4 100644
--- a/metadata/md5-cache/dev-java/jakarta-json-api-1.1.6
+++ b/metadata/md5-cache/dev-java/jakarta-json-api-1.1.6
@@ -10,5 +10,5 @@ LICENSE=|| ( EPL-2.0 GPL-2-with-classpath-exception )
RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=1
SRC_URI=https://github.com/eclipse-ee4j/jsonp/archive/refs/tags/1.1-1.1.6-RELEASE.tar.gz -> jakarta-json-api-1.1.6.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=6c329892ea7e59d87209e53bb82d0310
diff --git a/metadata/md5-cache/dev-java/jakarta-mail-api-2.1.0 b/metadata/md5-cache/dev-java/jakarta-mail-api-2.1.0
new file mode 100644
index 000000000000..b356c457a03d
--- /dev/null
+++ b/metadata/md5-cache/dev-java/jakarta-mail-api-2.1.0
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=>=dev-java/jakarta-activation-api-2.1.0:2 >=virtual/jdk-11:* test? ( dev-java/angus-activation:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
+DESCRIPTION=Jakarta Mail API 2.1 Specification API
+EAPI=8
+HOMEPAGE=https://eclipse-ee4j.github.io/mail/
+INHERIT=java-pkg-2 java-pkg-simple
+IUSE=doc source test
+KEYWORDS=amd64 arm64 ppc64 x86
+LICENSE=EPL-1.0 EPL-2.0 GPL-2-with-classpath-exception
+RDEPEND=>=dev-java/jakarta-activation-api-2.1.0:2 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=test !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/eclipse-ee4j/mail/archive/2.1.0.tar.gz -> jakarta-mail-api-2.1.0.tar.gz
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
+_md5_=307d73a110c1f9d0de4d5a31d28a12e3
diff --git a/metadata/md5-cache/dev-java/jakarta-oro-2.0.8-r5 b/metadata/md5-cache/dev-java/jakarta-oro-2.0.8-r5
index 9bc97bd5a785..6f685d47512f 100644
--- a/metadata/md5-cache/dev-java/jakarta-oro-2.0.8-r5
+++ b/metadata/md5-cache/dev-java/jakarta-oro-2.0.8-r5
@@ -10,5 +10,5 @@ LICENSE=Apache-1.1
RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=2.0
SRC_URI=https://archive.apache.org/dist/jakarta/oro/jakarta-oro-2.0.8.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=3ae2e6df0f95075b5e750e7dae925af4
diff --git a/metadata/md5-cache/dev-java/jakarta-regexp-1.3-r6 b/metadata/md5-cache/dev-java/jakarta-regexp-1.3-r6
index d6f00ebddc5f..260a43ad2864 100644
--- a/metadata/md5-cache/dev-java/jakarta-regexp-1.3-r6
+++ b/metadata/md5-cache/dev-java/jakarta-regexp-1.3-r6
@@ -10,5 +10,5 @@ LICENSE=Apache-1.1
RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=1.3
SRC_URI=mirror://apache/jakarta/regexp/source/jakarta-regexp-1.3.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=f9265de0a00a4138a0cc591a28cbf1af
diff --git a/metadata/md5-cache/dev-java/jakarta-regexp-1.4-r3 b/metadata/md5-cache/dev-java/jakarta-regexp-1.4-r3
index b22778e85f6f..7ab656399372 100644
--- a/metadata/md5-cache/dev-java/jakarta-regexp-1.4-r3
+++ b/metadata/md5-cache/dev-java/jakarta-regexp-1.4-r3
@@ -10,5 +10,5 @@ LICENSE=Apache-1.1
RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=1.4
SRC_URI=mirror://apache/jakarta/regexp/source/jakarta-regexp-1.4.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=4715ec34bfa34c1bcc3f2b1d512e12e1
diff --git a/metadata/md5-cache/dev-java/jakarta-regexp-1.5-r1 b/metadata/md5-cache/dev-java/jakarta-regexp-1.5-r1
index 48f6cef4ac3f..574b3950cf1e 100644
--- a/metadata/md5-cache/dev-java/jakarta-regexp-1.5-r1
+++ b/metadata/md5-cache/dev-java/jakarta-regexp-1.5-r1
@@ -10,5 +10,5 @@ LICENSE=Apache-1.1
RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=1.5
SRC_URI=mirror://apache/jakarta/regexp/source/jakarta-regexp-1.5.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=609d1f6ec6890acda208be367de1eb86
diff --git a/metadata/md5-cache/dev-java/jakarta-xml-soap-api-1.4.2-r1 b/metadata/md5-cache/dev-java/jakarta-xml-soap-api-1.4.2-r1
index 18aa79c0a4ce..357e7aea7a96 100644
--- a/metadata/md5-cache/dev-java/jakarta-xml-soap-api-1.4.2-r1
+++ b/metadata/md5-cache/dev-java/jakarta-xml-soap-api-1.4.2-r1
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/jakarta-activation-api-1.2.2-r1:1 >=dev-j
RESTRICT=!test? ( test )
SLOT=1
SRC_URI=https://github.com/eclipse-ee4j/saaj-api/archive/1.4.2.tar.gz -> jakarta-xml-soap-api-1.4.2.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=59335730ce52755d0fd0bcfb5957b2a4
diff --git a/metadata/md5-cache/dev-java/jakartaee-migration-1.0.0 b/metadata/md5-cache/dev-java/jakartaee-migration-1.0.0
index 821c541ce3bf..49ad65345387 100644
--- a/metadata/md5-cache/dev-java/jakartaee-migration-1.0.0
+++ b/metadata/md5-cache/dev-java/jakartaee-migration-1.0.0
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* dev-java/ant-core:0 dev-java/bcel:0 >=dev-java/commo
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=mirror://apache/tomcat/jakartaee-migration/v1.0.0/source/jakartaee-migration-1.0.0-src.tar.gz -> jakartaee-migration-1.0.0-sources.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=4f6cec3ec86c9e19c57456e02da5f39b
diff --git a/metadata/md5-cache/dev-java/jal-20031117-r6 b/metadata/md5-cache/dev-java/jal-20031117-r6
index 726a49c29c56..0a3cd0a14784 100644
--- a/metadata/md5-cache/dev-java/jal-20031117-r6
+++ b/metadata/md5-cache/dev-java/jal-20031117-r6
@@ -10,5 +10,5 @@ LICENSE=HPND
RDEPEND=dev-java/ant-core:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=0
SRC_URI=https://dev.gentoo.org/~monsieurp/packages/jal-20031117.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=c8457e8bbe91555b895391aab6235604
diff --git a/metadata/md5-cache/dev-java/janino-3.1.6 b/metadata/md5-cache/dev-java/janino-3.1.7
index d697fad50aa3..4bcf0a44357a 100644
--- a/metadata/md5-cache/dev-java/janino-3.1.6
+++ b/metadata/md5-cache/dev-java/janino-3.1.7
@@ -5,11 +5,11 @@ EAPI=8
HOMEPAGE=https://janino-compiler.github.io/janino/
INHERIT=java-pkg-2 java-pkg-simple
IUSE=doc source test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ppc64 x86
LICENSE=BSD
RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
RESTRICT=!test? ( test )
SLOT=0
-SRC_URI=https://codeload.github.com/janino-compiler/janino/tar.gz/v3.1.6 -> janino-3.1.6.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
-_md5_=c72ae0899fabe78f5fe26a7a8e0d28c8
+SRC_URI=https://github.com/janino-compiler/janino/archive/v3.1.7.tar.gz -> janino-3.1.7.tar.gz
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
+_md5_=9a316cac77b7c200d0729ce0cfa2fa7b
diff --git a/metadata/md5-cache/dev-java/jansi-1.13 b/metadata/md5-cache/dev-java/jansi-1.13
index 190eb3bcebae..bc763d084b63 100644
--- a/metadata/md5-cache/dev-java/jansi-1.13
+++ b/metadata/md5-cache/dev-java/jansi-1.13
@@ -11,5 +11,5 @@ RDEPEND=dev-java/jansi-native:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://github.com/fusesource/jansi/archive/jansi-project-1.13.tar.gz -> jansi-1.13.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=ee1233c04a41ea2639d3127438b6cc82
diff --git a/metadata/md5-cache/dev-java/jansi-2.4.0-r1 b/metadata/md5-cache/dev-java/jansi-2.4.0-r1
index 5c184fd53eaf..2911cc22cd35 100644
--- a/metadata/md5-cache/dev-java/jansi-2.4.0-r1
+++ b/metadata/md5-cache/dev-java/jansi-2.4.0-r1
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=2
SRC_URI=https://github.com/fusesource/jansi/archive/refs/tags/jansi-2.4.0.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716 multilib 4fbbbc98f236f1b43acd99476bc3cd85 toolchain-funcs e9da88162e7a3c60376e80c2c2adcdfb
_md5_=2105da837123b0bf282c3320f9f7c173
diff --git a/metadata/md5-cache/dev-java/jansi-native-1.8 b/metadata/md5-cache/dev-java/jansi-native-1.8
index 11178b9e4a98..bdadbed48b07 100644
--- a/metadata/md5-cache/dev-java/jansi-native-1.8
+++ b/metadata/md5-cache/dev-java/jansi-native-1.8
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
RDEPEND=dev-java/hawtjni-runtime:0 >=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=0
SRC_URI=https://github.com/fusesource/jansi-native/archive/jansi-native-1.8.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 vcs-snapshot 19dc666868420457132a7514d4621476
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716 vcs-snapshot 19dc666868420457132a7514d4621476
_md5_=758fbbc82194cc75be177b62685c36a1
diff --git a/metadata/md5-cache/dev-java/japitools-0.9.7-r4 b/metadata/md5-cache/dev-java/japitools-0.9.7-r4
deleted file mode 100644
index 8ce15d47d370..000000000000
--- a/metadata/md5-cache/dev-java/japitools-0.9.7-r4
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=dev-java/ant-core:0 >=virtual/jdk-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Java API compatibility testing tools
-EAPI=6
-HOMEPAGE=http://sab39.netreach.com/japi/
-INHERIT=java-pkg-2 java-pkg-simple
-IUSE=doc source
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/perl dev-java/ant-core:0 >=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=0
-SRC_URI=http://www.kaffe.org/~stuart/japi/japitools-0.9.7.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 eapi7-ver 1a0a60ad07c8b32d2faba2d085dc0f24 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 9f813bb3c47cf2e60619a663b87c5f4e estack 055c42df72f76a4f45ec92b35e83cd56 eutils dab5d8ec471d025b79c9e6906bcf3bff java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 ltprune 97143780d341cc8d8f1d4c6187a36d29 multilib 4a33c9008e5ee30cb8840a3fdc24df2b preserve-libs a8e50acee31b5759b4df1f7707cae54b strip-linguas ac3ee41ee2d31d8c41a77c0838320cc7 toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8 vcs-clean d271b7bc7e6a009758d7d4ef749174e3 versionator d3fb3ba33acc3bbbdc4d7970227c100d wrapper 4a1902f969e5718126434fc35f3a0d9c
-_md5_=afe0177420d765fbe9b51a633b0905fe
diff --git a/metadata/md5-cache/dev-java/java-config-2.3.1 b/metadata/md5-cache/dev-java/java-config-2.3.1
index 215799403808..cb79734a97f3 100644
--- a/metadata/md5-cache/dev-java/java-config-2.3.1
+++ b/metadata/md5-cache/dev-java/java-config-2.3.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
RESTRICT=!test? ( test )
SLOT=2
SRC_URI=https://gitweb.gentoo.org/proj/java-config.git/snapshot/java-config-2.3.1.tar.gz
-_eclasses_=distutils-r1 3b871cf4724e3abc9b4ff059289f0d45 eapi8-dosym cd7d420bb5be5ee079f27239ce76b8f5 multibuild d26d81f242cb193d899a72bca423d0bd multilib 4a33c9008e5ee30cb8840a3fdc24df2b multiprocessing b4e253ab22cef7b1085e9b67c7a3b730 python-r1 8638751691200e941f26fe0ac3aef1d1 python-utils-r1 5dc84801daa87406aafaf535cb947a64 toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=distutils-r1 10a93585889c3ca7651cbcd2ee831e47 eapi8-dosym cd7d420bb5be5ee079f27239ce76b8f5 multibuild d26d81f242cb193d899a72bca423d0bd multilib 4fbbbc98f236f1b43acd99476bc3cd85 multiprocessing b4e253ab22cef7b1085e9b67c7a3b730 python-r1 e2883e4f04f0503cdf7f2954e2bf5e15 python-utils-r1 648fe6a039e87233d7f48da72cadb76f toolchain-funcs e9da88162e7a3c60376e80c2c2adcdfb
_md5_=78442f5721d6e54a0616613fca8d9fe4
diff --git a/metadata/md5-cache/dev-java/java-config-9999 b/metadata/md5-cache/dev-java/java-config-9999
index 4bc66c30a801..0d8abf6492a5 100644
--- a/metadata/md5-cache/dev-java/java-config-9999
+++ b/metadata/md5-cache/dev-java/java-config-9999
@@ -12,5 +12,5 @@ RDEPEND=sys-apps/baselayout-java sys-apps/portage[python_targets_python3_8(-)?,p
REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
RESTRICT=!test? ( test )
SLOT=2
-_eclasses_=distutils-r1 3b871cf4724e3abc9b4ff059289f0d45 eapi8-dosym cd7d420bb5be5ee079f27239ce76b8f5 git-r3 b9ac6f96d2a88edb5b351df634dc5e53 multibuild d26d81f242cb193d899a72bca423d0bd multilib 4a33c9008e5ee30cb8840a3fdc24df2b multiprocessing b4e253ab22cef7b1085e9b67c7a3b730 python-r1 8638751691200e941f26fe0ac3aef1d1 python-utils-r1 5dc84801daa87406aafaf535cb947a64 toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=distutils-r1 10a93585889c3ca7651cbcd2ee831e47 eapi8-dosym cd7d420bb5be5ee079f27239ce76b8f5 git-r3 b9ac6f96d2a88edb5b351df634dc5e53 multibuild d26d81f242cb193d899a72bca423d0bd multilib 4fbbbc98f236f1b43acd99476bc3cd85 multiprocessing b4e253ab22cef7b1085e9b67c7a3b730 python-r1 e2883e4f04f0503cdf7f2954e2bf5e15 python-utils-r1 648fe6a039e87233d7f48da72cadb76f toolchain-funcs e9da88162e7a3c60376e80c2c2adcdfb
_md5_=b64bf89941b0e95d76694f9f5daf68b0
diff --git a/metadata/md5-cache/dev-java/java-dep-check-0.5 b/metadata/md5-cache/dev-java/java-dep-check-0.5
index cbe9a2f55c08..2d1688b0078b 100644
--- a/metadata/md5-cache/dev-java/java-dep-check-0.5
+++ b/metadata/md5-cache/dev-java/java-dep-check-0.5
@@ -8,5 +8,5 @@ KEYWORDS=amd64 x86
LICENSE=GPL-2
RDEPEND=>=virtual/jre-1.8:* dev-java/commons-cli:1 dev-java/asm:4 >=dev-java/java-config-2.2.0-r3
SLOT=0
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=f1e7c2d211ebef2a07d44c9226e5a9e8
diff --git a/metadata/md5-cache/dev-java/java-diff-utils-1.3.0 b/metadata/md5-cache/dev-java/java-diff-utils-1.3.0
index 72e04319fc48..5560da316570 100644
--- a/metadata/md5-cache/dev-java/java-diff-utils-1.3.0
+++ b/metadata/md5-cache/dev-java/java-diff-utils-1.3.0
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0
RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=0
SRC_URI=https://repo1.maven.org/maven2/com/googlecode/java-diff-utils/diffutils/1.3.0/diffutils-1.3.0-sources.jar -> java-diff-utils-1.3.0-sources.jar
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=0aa373505a7ef0316bae90d4cb8b4da0
diff --git a/metadata/md5-cache/dev-java/java-getopt-1.0.14-r1 b/metadata/md5-cache/dev-java/java-getopt-1.0.14-r1
index 70434b3a2a86..c64a0aafd4b8 100644
--- a/metadata/md5-cache/dev-java/java-getopt-1.0.14-r1
+++ b/metadata/md5-cache/dev-java/java-getopt-1.0.14-r1
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1
RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=1
SRC_URI=https://www.urbanophile.com/arenn/hacking/getopt/java-getopt-1.0.14.tar.gz
-_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 cfb5f6911bb70204c94ceafd0372c716 multilib 4fbbbc98f236f1b43acd99476bc3cd85 toolchain-funcs e9da88162e7a3c60376e80c2c2adcdfb
_md5_=243688f4d6836bad80c47beebe1f6f2f
diff --git a/metadata/md5-cache/dev-java/java-service-wrapper-3.5.25-r2 b/metadata/md5-cache/dev-java/java-service-wrapper-3.5.25-r2
index d1d28463fe6c..ea38ee4f7a2b 100644
--- a/metadata/md5-cache/dev-java/java-service-wrapper-3.5.25-r2
+++ b/metadata/md5-cache/dev-java/java-service-wrapper-3.5.25-r2
@@ -11,5 +11,5 @@ RDEPEND=virtual/jre:1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=http://wrapper.tanukisoftware.org/download/3.5.25/wrapper_3.5.25_src.tar.gz
-_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 cfb5f6911bb70204c94ceafd0372c716 multilib 4fbbbc98f236f1b43acd99476bc3cd85 toolchain-funcs e9da88162e7a3c60376e80c2c2adcdfb
_md5_=d0aeb80cc4cce8db41bbe12cbbc97a9b
diff --git a/metadata/md5-cache/dev-java/javacc-5.0-r4 b/metadata/md5-cache/dev-java/javacc-5.0-r4
index cc7a51d90a1b..44ac8fcaf02e 100644
--- a/metadata/md5-cache/dev-java/javacc-5.0-r4
+++ b/metadata/md5-cache/dev-java/javacc-5.0-r4
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install preinst prepare setup test
DEPEND=dev-java/junit:0 >=virtual/jdk-1.8:* test? ( dev-java/ant-junit:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
DESCRIPTION=Java Compiler Compiler - The Java Parser Generator
EAPI=8
-HOMEPAGE=https://javacc.java.net/
+HOMEPAGE=https://javacc.github.io/javacc/
INHERIT=java-pkg-2 java-ant-2
IUSE=doc examples source test
KEYWORDS=amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
@@ -11,5 +11,5 @@ RDEPEND=dev-java/junit:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 sou
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=http://java.net/projects/javacc/downloads/download/javacc-5.0src.tar.gz
-_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=264abd75d63f97cc128ab86ab0d73c6c
+_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 cfb5f6911bb70204c94ceafd0372c716 multilib 4fbbbc98f236f1b43acd99476bc3cd85 toolchain-funcs e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=d89460767e9b517238fbed3a2464460d
diff --git a/metadata/md5-cache/dev-java/javacup-0.11b_p20151001-r1 b/metadata/md5-cache/dev-java/javacup-0.11b_p20151001-r1
index 4bb4c3389e3e..6c014921f5d2 100644
--- a/metadata/md5-cache/dev-java/javacup-0.11b_p20151001-r1
+++ b/metadata/md5-cache/dev-java/javacup-0.11b_p20151001-r1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=0
SRC_URI=http://www2.cs.tum.edu/projects/cup/releases/java-cup-src-11b-20151001.tar.gz
-_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 cfb5f6911bb70204c94ceafd0372c716 multilib 4fbbbc98f236f1b43acd99476bc3cd85 toolchain-funcs e9da88162e7a3c60376e80c2c2adcdfb
_md5_=d84a4f7636f2081fa5935784e0ab9f54
diff --git a/metadata/md5-cache/dev-java/javahelp-2.0.05_p20170719 b/metadata/md5-cache/dev-java/javahelp-2.0.05_p20170719
deleted file mode 100644
index ff060694a2b6..000000000000
--- a/metadata/md5-cache/dev-java/javahelp-2.0.05_p20170719
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=virtual/jdk:1.8 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
-DESCRIPTION=The JavaHelp system online help system
-EAPI=6
-HOMEPAGE=https://javaee.github.io/javahelp/
-INHERIT=java-pkg-2 java-ant-2
-IUSE=examples source
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
-LICENSE=GPL-2-with-linking-exception
-RDEPEND=>=virtual/jre-1.4 java-virtuals/servlet-api:2.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://github.com/javaee/javahelp/archive/3ca862d8626096770598a3a256886d205246f4a4.tar.gz -> javahelp-2.0.05_p20170719.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 eapi7-ver 1a0a60ad07c8b32d2faba2d085dc0f24 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 9f813bb3c47cf2e60619a663b87c5f4e estack 055c42df72f76a4f45ec92b35e83cd56 eutils dab5d8ec471d025b79c9e6906bcf3bff java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 ltprune 97143780d341cc8d8f1d4c6187a36d29 multilib 4a33c9008e5ee30cb8840a3fdc24df2b preserve-libs a8e50acee31b5759b4df1f7707cae54b strip-linguas ac3ee41ee2d31d8c41a77c0838320cc7 toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8 vcs-clean d271b7bc7e6a009758d7d4ef749174e3 versionator d3fb3ba33acc3bbbdc4d7970227c100d wrapper 4a1902f969e5718126434fc35f3a0d9c
-_md5_=7db8c9ec7af032d38c794c75fb195ff4
diff --git a/metadata/md5-cache/dev-java/javahelp-2.0.05_p20170719-r1 b/metadata/md5-cache/dev-java/javahelp-2.0.05_p20170719-r1
index c3e64a097e61..5e7553148d12 100644
--- a/metadata/md5-cache/dev-java/javahelp-2.0.05_p20170719-r1
+++ b/metadata/md5-cache/dev-java/javahelp-2.0.05_p20170719-r1
@@ -5,10 +5,10 @@ EAPI=8
HOMEPAGE=https://javaee.github.io/javahelp/
INHERIT=java-pkg-2 java-ant-2
IUSE=examples source
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
LICENSE=GPL-2-with-linking-exception
RDEPEND=>=virtual/jre-1.4 java-virtuals/servlet-api:2.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=0
SRC_URI=https://github.com/javaee/javahelp/archive/3ca862d8626096770598a3a256886d205246f4a4.tar.gz -> javahelp-2.0.05_p20170719.tar.gz
-_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=c37ca7f47b77e653d05a6e10900e193e
+_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 cfb5f6911bb70204c94ceafd0372c716 multilib 4fbbbc98f236f1b43acd99476bc3cd85 toolchain-funcs e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=7f4094b8588d34c5b84a29b688f91d16
diff --git a/metadata/md5-cache/dev-java/javassist-3.18.2-r1 b/metadata/md5-cache/dev-java/javassist-3.18.2-r1
index 48bac317f91f..8a9fe78dd9b4 100644
--- a/metadata/md5-cache/dev-java/javassist-3.18.2-r1
+++ b/metadata/md5-cache/dev-java/javassist-3.18.2-r1
@@ -11,5 +11,5 @@ LICENSE=MPL-1.1
RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=3
SRC_URI=https://github.com/jboss-javassist/javassist/archive/rel_3_18_2_ga_build.tar.gz -> javassist-3.18.2.tar.gz
-_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 cfb5f6911bb70204c94ceafd0372c716 multilib 4fbbbc98f236f1b43acd99476bc3cd85 toolchain-funcs e9da88162e7a3c60376e80c2c2adcdfb
_md5_=d7ce84a722c49ab46f6496ba55de58ff
diff --git a/metadata/md5-cache/dev-java/javatoolkit-0.6.7 b/metadata/md5-cache/dev-java/javatoolkit-0.6.7
index ceb8a8cbaab7..9bc6db63f98b 100644
--- a/metadata/md5-cache/dev-java/javatoolkit-0.6.7
+++ b/metadata/md5-cache/dev-java/javatoolkit-0.6.7
@@ -11,5 +11,5 @@ RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[xml(+)] )
REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
SLOT=0
SRC_URI=https://gitweb.gentoo.org/proj/javatoolkit.git/snapshot/javatoolkit-0.6.7.tar.bz2
-_eclasses_=distutils-r1 3b871cf4724e3abc9b4ff059289f0d45 eapi8-dosym cd7d420bb5be5ee079f27239ce76b8f5 multibuild d26d81f242cb193d899a72bca423d0bd multilib 4a33c9008e5ee30cb8840a3fdc24df2b multiprocessing b4e253ab22cef7b1085e9b67c7a3b730 prefix eab3c99d77fe00506c109c8a736186f7 python-r1 8638751691200e941f26fe0ac3aef1d1 python-utils-r1 5dc84801daa87406aafaf535cb947a64 toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=distutils-r1 10a93585889c3ca7651cbcd2ee831e47 eapi8-dosym cd7d420bb5be5ee079f27239ce76b8f5 multibuild d26d81f242cb193d899a72bca423d0bd multilib 4fbbbc98f236f1b43acd99476bc3cd85 multiprocessing b4e253ab22cef7b1085e9b67c7a3b730 prefix eab3c99d77fe00506c109c8a736186f7 python-r1 e2883e4f04f0503cdf7f2954e2bf5e15 python-utils-r1 648fe6a039e87233d7f48da72cadb76f toolchain-funcs e9da88162e7a3c60376e80c2c2adcdfb
_md5_=977e58e26a42f43779fa46207e038d56
diff --git a/metadata/md5-cache/dev-java/javax-inject-1-r4 b/metadata/md5-cache/dev-java/javax-inject-1-r4
index d03abcaf016d..e69425e78f2e 100644
--- a/metadata/md5-cache/dev-java/javax-inject-1-r4
+++ b/metadata/md5-cache/dev-java/javax-inject-1-r4
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=0
SRC_URI=http://central.maven.org/maven2/javax/inject/javax.inject/1/javax.inject-1-sources.jar -> javax-inject-1.jar
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=d3143b886eb166ae748f79f144ce16dd
diff --git a/metadata/md5-cache/dev-java/javax-mail-1.6.7-r1 b/metadata/md5-cache/dev-java/javax-mail-1.6.7-r1
index d4af67d46a8d..d5d8871af27b 100644
--- a/metadata/md5-cache/dev-java/javax-mail-1.6.7-r1
+++ b/metadata/md5-cache/dev-java/javax-mail-1.6.7-r1
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/jakarta-activation-1.2.2:1 >=dev-java/jav
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://github.com/eclipse-ee4j/mail/archive/refs/tags/1.6.7.tar.gz -> javax-mail-1.6.7.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=4f2134451cece532730774e7a4819886
diff --git a/metadata/md5-cache/dev-java/jaxb-api-2.3.3 b/metadata/md5-cache/dev-java/jaxb-api-2.3.3
deleted file mode 100644
index c8f80f724cb2..000000000000
--- a/metadata/md5-cache/dev-java/jaxb-api-2.3.3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=dev-java/jakarta-activation-api:1 >=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
-DESCRIPTION=Jakarta XML Binding API
-EAPI=7
-HOMEPAGE=https://github.com/eclipse-ee4j/jaxb-api
-INHERIT=java-pkg-2 java-pkg-simple
-IUSE=doc source test
-KEYWORDS=amd64 ~arm arm64 ppc64 x86
-LICENSE=EPL-1.0
-RDEPEND=dev-java/jakarta-activation-api:1 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=!test? ( test )
-SLOT=2
-SRC_URI=https://github.com/eclipse-ee4j/jaxb-api/archive/refs/tags/2.3.3.tar.gz -> jaxb-api-2.3.3.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
-_md5_=c1b0ecf02838fc055b60677a23db06e8
diff --git a/metadata/md5-cache/dev-java/jaxb-api-2.3.3-r1 b/metadata/md5-cache/dev-java/jaxb-api-2.3.3-r1
index bac9c74052ab..fb7e3080f4ee 100644
--- a/metadata/md5-cache/dev-java/jaxb-api-2.3.3-r1
+++ b/metadata/md5-cache/dev-java/jaxb-api-2.3.3-r1
@@ -5,11 +5,11 @@ EAPI=8
HOMEPAGE=https://github.com/eclipse-ee4j/jaxb-api
INHERIT=java-pkg-2 java-pkg-simple
IUSE=doc source test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ppc64 x86
LICENSE=EPL-1.0
RDEPEND=dev-java/jakarta-activation-api:1 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
RESTRICT=!test? ( test )
SLOT=2
SRC_URI=https://github.com/eclipse-ee4j/jaxb-api/archive/2.3.3.tar.gz -> jaxb-api-2.3.3.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
-_md5_=89040877c49967a6c4b6a2b8e97a480c
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
+_md5_=eaad392d1fe1f2dd6238ab66a6d755c8
diff --git a/metadata/md5-cache/dev-java/jaxb-api-3.0.1 b/metadata/md5-cache/dev-java/jaxb-api-3.0.1
deleted file mode 100644
index 58970286abe7..000000000000
--- a/metadata/md5-cache/dev-java/jaxb-api-3.0.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=dev-java/jakarta-activation:2 >=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Jakarta XML Binding API
-EAPI=8
-HOMEPAGE=https://github.com/eclipse-ee4j/jaxb-api/jakarta.xml.bind-api
-INHERIT=java-pkg-2 java-pkg-simple
-IUSE=doc source
-KEYWORDS=amd64 ~arm arm64 ppc64 x86
-LICENSE=EPL-1.0
-RDEPEND=dev-java/jakarta-activation:2 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=3
-SRC_URI=https://github.com/eclipse-ee4j/jaxb-api/archive/refs/tags/3.0.1.tar.gz -> jaxb-api-3.0.1.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
-_md5_=aebe6e2b7893c07ad3386163ff6bbb1d
diff --git a/metadata/md5-cache/dev-java/jaxb-api-3.0.1-r1 b/metadata/md5-cache/dev-java/jaxb-api-3.0.1-r1
index f61119a5669e..5a0d3cca9475 100644
--- a/metadata/md5-cache/dev-java/jaxb-api-3.0.1-r1
+++ b/metadata/md5-cache/dev-java/jaxb-api-3.0.1-r1
@@ -2,13 +2,13 @@ DEFINED_PHASES=compile install preinst prepare setup test
DEPEND=dev-java/jakarta-activation:2 >=virtual/jdk-11:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
DESCRIPTION=Jakarta XML Binding API
EAPI=8
-HOMEPAGE=https://github.com/eclipse-ee4j/jaxb-api/jakarta.xml.bind-api
+HOMEPAGE=https://github.com/eclipse-ee4j/jaxb-api
INHERIT=java-pkg-2 java-pkg-simple
IUSE=doc source
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ppc64 x86
LICENSE=EPL-1.0
RDEPEND=dev-java/jakarta-activation:2 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=3
SRC_URI=https://github.com/eclipse-ee4j/jaxb-api/archive/3.0.1.tar.gz -> jaxb-api-3.0.1.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
-_md5_=a747372c86248de4a58fd9fe013b9cb9
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
+_md5_=189e24d7f81c9503e4d29c01dd6706b9
diff --git a/metadata/md5-cache/dev-java/jaxb-api-4.0.0 b/metadata/md5-cache/dev-java/jaxb-api-4.0.0
new file mode 100644
index 000000000000..60c16e83ed20
--- /dev/null
+++ b/metadata/md5-cache/dev-java/jaxb-api-4.0.0
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=dev-java/jakarta-activation:2 >=virtual/jdk-11:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
+DESCRIPTION=Jakarta XML Binding API
+EAPI=8
+HOMEPAGE=https://github.com/eclipse-ee4j/jaxb-api
+INHERIT=java-pkg-2 java-pkg-simple
+IUSE=doc source test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=EPL-1.0
+RDEPEND=dev-java/jakarta-activation:2 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=!test? ( test )
+SLOT=4
+SRC_URI=https://github.com/eclipse-ee4j/jaxb-api/archive/4.0.0.tar.gz -> jaxb-api-4.0.0.tar.gz
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
+_md5_=0c163797032d442aa335e0fd46640207
diff --git a/metadata/md5-cache/dev-java/jaxb-runtime-4.0.0 b/metadata/md5-cache/dev-java/jaxb-runtime-4.0.0
new file mode 100644
index 000000000000..28df9f1cdea2
--- /dev/null
+++ b/metadata/md5-cache/dev-java/jaxb-runtime-4.0.0
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=dev-java/istack-commons-runtime:0 dev-java/jaxb-api:4 >=virtual/jdk-11:* dev-java/fastinfoset:0 dev-java/jaxb-stax-ex:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
+DESCRIPTION=JAXB (JSR 222) Reference Implementation
+EAPI=8
+HOMEPAGE=https://eclipse-ee4j.github.io/jaxb-ri/
+INHERIT=java-pkg-2 java-pkg-simple
+IUSE=doc source test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=EPL-1.0
+RDEPEND=>=virtual/jre-11:* dev-java/fastinfoset:0 dev-java/jaxb-stax-ex:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=!test? ( test )
+SLOT=4
+SRC_URI=https://github.com/eclipse-ee4j/jaxb-ri/archive/4.0.0-RI.tar.gz -> jaxb-ri-4.0.0.tar.gz
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
+_md5_=18271d157fbb6330145e8b0283bbc638
diff --git a/metadata/md5-cache/dev-java/jaxb-stax-ex-2.1.0 b/metadata/md5-cache/dev-java/jaxb-stax-ex-2.1.0
new file mode 100644
index 000000000000..75d0384eddb7
--- /dev/null
+++ b/metadata/md5-cache/dev-java/jaxb-stax-ex-2.1.0
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=>=virtual/jdk-1.8:* dev-java/jakarta-activation-api:2 dev-java/jaxb-api:4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
+DESCRIPTION=Extensions to JSR-173 StAX API.
+EAPI=8
+HOMEPAGE=https://projects.eclipse.org/projects/ee4j/stax-ex
+INHERIT=java-pkg-2 java-pkg-simple
+IUSE=doc source test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=EPL-1.0
+RDEPEND=>=virtual/jre-1.8:* dev-java/jakarta-activation-api:2 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/eclipse-ee4j/jaxb-stax-ex/archive/2.1.0.tar.gz -> jaxb-stax-ex-2.1.0.tar.gz
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
+_md5_=d4602215299dde047f84e3dce80f5698
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 33c4164f7e7b..122e31e7c3a2 100644
--- a/metadata/md5-cache/dev-java/jaxen-1.2.0-r1
+++ b/metadata/md5-cache/dev-java/jaxen-1.2.0-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=test? ( dom4j jdom xom )
RESTRICT=!test? ( test )
SLOT=1.2
SRC_URI=https://github.com/jaxen-xpath/jaxen/archive/refs/tags/v1.2.0.tar.gz -> jaxen-1.2.0.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=40233440ad9fc6c27b7884eb9f32577c
diff --git a/metadata/md5-cache/dev-java/jbig2-imageio-3.0.3 b/metadata/md5-cache/dev-java/jbig2-imageio-3.0.3
index 4adbf28b7bdc..5dc0d92e8dfd 100644
--- a/metadata/md5-cache/dev-java/jbig2-imageio-3.0.3
+++ b/metadata/md5-cache/dev-java/jbig2-imageio-3.0.3
@@ -12,5 +12,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://downloads.apache.org/pdfbox/jbig2-imageio/3.0.3/jbig2-imageio-3.0.3-src.zip
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=810b9388968a1104bd8f66775a3663de
diff --git a/metadata/md5-cache/dev-java/jbitcollider-core-0.8-r1 b/metadata/md5-cache/dev-java/jbitcollider-core-0.8-r1
index d77dd94c6b32..83b91de2d224 100644
--- a/metadata/md5-cache/dev-java/jbitcollider-core-0.8-r1
+++ b/metadata/md5-cache/dev-java/jbitcollider-core-0.8-r1
@@ -6,10 +6,10 @@ EAPI=7
HOMEPAGE=http://bitcollider.sourceforge.net/
INHERIT=java-pkg-2 java-pkg-simple
IUSE=doc source
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~arm x86
LICENSE=public-domain
RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=0
SRC_URI=mirror://sourceforge/project/bitcollider/jBitcollider%20%28Java%29/0.8/jBitcollider-0.8.zip
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
-_md5_=9528d6aa625292071820e4d473eceb20
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
+_md5_=7423d0ebe8ddbcadde1f824f53b88dd0
diff --git a/metadata/md5-cache/dev-java/jboss-jms-api-1.0.1 b/metadata/md5-cache/dev-java/jboss-jms-api-1.0.1
index 81591051f519..3bf8f3eb7294 100644
--- a/metadata/md5-cache/dev-java/jboss-jms-api-1.0.1
+++ b/metadata/md5-cache/dev-java/jboss-jms-api-1.0.1
@@ -10,5 +10,5 @@ LICENSE=CDDL GPL-2-with-classpath-exception
RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=1.1
SRC_URI=https://github.com/jboss/jboss-jms-api_spec/archive/jboss-jms-api_1.1_spec-1.0.1.Final.tar.gz -> jboss-jms-api-1.0.1.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=5d60f8328a4acde2dd87178749caf147
diff --git a/metadata/md5-cache/dev-java/jboss-marshalling-1.3.0-r2 b/metadata/md5-cache/dev-java/jboss-marshalling-1.3.0-r2
deleted file mode 100644
index 89df3f9da7a3..000000000000
--- a/metadata/md5-cache/dev-java/jboss-marshalling-1.3.0-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=dev-java/jboss-modules:0 >=virtual/jdk-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Compatible alternative to the JDK serialization API
-EAPI=6
-HOMEPAGE=https://jbossmarshalling.jboss.org/
-INHERIT=java-pkg-2 java-pkg-simple
-IUSE=doc source
-KEYWORDS=amd64
-LICENSE=Apache-2.0
-RDEPEND=dev-java/jboss-modules:0 >=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://download.jboss.org/jbossmarshalling/jboss-marshalling-1.3.0.CR9-sources.jar
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 eapi7-ver 1a0a60ad07c8b32d2faba2d085dc0f24 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 9f813bb3c47cf2e60619a663b87c5f4e estack 055c42df72f76a4f45ec92b35e83cd56 eutils dab5d8ec471d025b79c9e6906bcf3bff java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 ltprune 97143780d341cc8d8f1d4c6187a36d29 multilib 4a33c9008e5ee30cb8840a3fdc24df2b preserve-libs a8e50acee31b5759b4df1f7707cae54b strip-linguas ac3ee41ee2d31d8c41a77c0838320cc7 toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8 vcs-clean d271b7bc7e6a009758d7d4ef749174e3 versionator d3fb3ba33acc3bbbdc4d7970227c100d wrapper 4a1902f969e5718126434fc35f3a0d9c
-_md5_=db18a89273bc822857535704c730097f
diff --git a/metadata/md5-cache/dev-java/jboss-modules-1.3.3-r1 b/metadata/md5-cache/dev-java/jboss-modules-1.3.3-r1
index 0edec144a0c0..9cef9e345178 100644
--- a/metadata/md5-cache/dev-java/jboss-modules-1.3.3-r1
+++ b/metadata/md5-cache/dev-java/jboss-modules-1.3.3-r1
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1
RDEPEND=>=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=0
SRC_URI=https://github.com/jboss-modules/jboss-modules/archive/1.3.3.Final.tar.gz -> jboss-modules-1.3.3.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=464b16ed641d1a1dc99e77febba64fd3
diff --git a/metadata/md5-cache/dev-java/jcalendar-1.4-r1 b/metadata/md5-cache/dev-java/jcalendar-1.4-r1
index cff47ea88937..bb4a7c31c143 100644
--- a/metadata/md5-cache/dev-java/jcalendar-1.4-r1
+++ b/metadata/md5-cache/dev-java/jcalendar-1.4-r1
@@ -12,5 +12,5 @@ RDEPEND=dev-java/jgoodies-looks:2.6 >=virtual/jre-1.8:* >=dev-java/java-config-2
RESTRICT=test
SLOT=1.2
SRC_URI=https://www.toedter.com/download/jcalendar-1.4.zip
-_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 cfb5f6911bb70204c94ceafd0372c716 multilib 4fbbbc98f236f1b43acd99476bc3cd85 toolchain-funcs e9da88162e7a3c60376e80c2c2adcdfb
_md5_=cea34c9f66e014bc4174572339efe672
diff --git a/metadata/md5-cache/dev-java/jchart2d-3.2.2-r1 b/metadata/md5-cache/dev-java/jchart2d-3.2.2-r1
index c042ec84d387..3fcf87d5cd1e 100644
--- a/metadata/md5-cache/dev-java/jchart2d-3.2.2-r1
+++ b/metadata/md5-cache/dev-java/jchart2d-3.2.2-r1
@@ -11,5 +11,5 @@ LICENSE=LGPL-2.1+
RDEPEND=>=virtual/jre-1.8:* dev-java/jide-oss:0 dev-java/xmlgraphics-commons:2 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=0
SRC_URI=mirror://sourceforge/project/jchart2d/jchart2d/sources/jchart2d-eclipse-project-3.2.2.zip
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=8ee1afeba3f37c7129584659dbe505fb
diff --git a/metadata/md5-cache/dev-java/jcifs-1.3.19-r1 b/metadata/md5-cache/dev-java/jcifs-1.3.19-r1
index 0a46f7d5d1ee..92b6e95fdda5 100644
--- a/metadata/md5-cache/dev-java/jcifs-1.3.19-r1
+++ b/metadata/md5-cache/dev-java/jcifs-1.3.19-r1
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1
RDEPEND=java-virtuals/servlet-api:3.0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=1.1
SRC_URI=https://jcifs.samba.org/src/jcifs-1.3.19.tgz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=f0e312c2ab9d25d016eacd88a6b13b99
diff --git a/metadata/md5-cache/dev-java/jcip-annotations-1.0.1-r1 b/metadata/md5-cache/dev-java/jcip-annotations-1.0.1-r1
index 2cb03d0f4dde..51a7b64e54c4 100644
--- a/metadata/md5-cache/dev-java/jcip-annotations-1.0.1-r1
+++ b/metadata/md5-cache/dev-java/jcip-annotations-1.0.1-r1
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=0
SRC_URI=https://github.com/stephenc/jcip-annotations/archive/jcip-annotations-1.0-1.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=2102558eeb9f6633f492229e3b75c6f1
diff --git a/metadata/md5-cache/dev-java/jclasslib-3.1-r1 b/metadata/md5-cache/dev-java/jclasslib-3.1-r1
index 6a42f02618e7..63ba17e89208 100644
--- a/metadata/md5-cache/dev-java/jclasslib-3.1-r1
+++ b/metadata/md5-cache/dev-java/jclasslib-3.1-r1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=0
SRC_URI=https://github.com/ingokegel/jclasslib/archive/3.1.tar.gz -> jclasslib-3.1.tar.gz
-_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 cfb5f6911bb70204c94ceafd0372c716 multilib 4fbbbc98f236f1b43acd99476bc3cd85 toolchain-funcs e9da88162e7a3c60376e80c2c2adcdfb
_md5_=e8fc11b9dda2ea2bc79f400b074596a3
diff --git a/metadata/md5-cache/dev-java/jcommander-1.48-r1 b/metadata/md5-cache/dev-java/jcommander-1.48-r1
deleted file mode 100644
index 8f25f77f9629..000000000000
--- a/metadata/md5-cache/dev-java/jcommander-1.48-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-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=Command line parsing framework for Java
-EAPI=8
-HOMEPAGE=https://github.com/cbeust/jcommander
-INHERIT=java-pkg-2 java-pkg-simple
-IUSE=doc source
-KEYWORDS=amd64 ~arm arm64 ppc64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/cbeust/jcommander/archive/jcommander-1.48.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
-_md5_=2721681d21b37179599dbee1935c0d82
diff --git a/metadata/md5-cache/dev-java/jcommander-1.82 b/metadata/md5-cache/dev-java/jcommander-1.82
index 3efb8a1cb474..76e5e0b8d421 100644
--- a/metadata/md5-cache/dev-java/jcommander-1.82
+++ b/metadata/md5-cache/dev-java/jcommander-1.82
@@ -5,11 +5,11 @@ EAPI=8
HOMEPAGE=https://github.com/cbeust/jcommander
INHERIT=java-pkg-2 java-pkg-simple
IUSE=doc source test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ppc64 x86
LICENSE=Apache-2.0
RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://github.com/cbeust/jcommander/archive/1.82.tar.gz -> jcommander-1.82.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
-_md5_=27215733855287078b0cf614e38b054e
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
+_md5_=78b36510eb443bcc396ec20166e65ae3
diff --git a/metadata/md5-cache/dev-java/jctools-core-2.0.2 b/metadata/md5-cache/dev-java/jctools-core-2.0.2
index 762b5aa48c37..038f5c6b7b9d 100644
--- a/metadata/md5-cache/dev-java/jctools-core-2.0.2
+++ b/metadata/md5-cache/dev-java/jctools-core-2.0.2
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://github.com/JCTools/JCTools/archive/v2.0.2.tar.gz -> jctools-core-2.0.2.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=c7a5338e2727cef828458d6f2a6f0f9a
diff --git a/metadata/md5-cache/dev-java/jctools-core-3.1.0 b/metadata/md5-cache/dev-java/jctools-core-3.1.0
new file mode 100644
index 000000000000..0224b18c21ea
--- /dev/null
+++ b/metadata/md5-cache/dev-java/jctools-core-3.1.0
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=>=virtual/jdk-1.8:* test? ( dev-java/guava-testlib:0 dev-java/hamcrest-library:1.3 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
+DESCRIPTION=Java Concurrency Tools Core Library
+EAPI=8
+HOMEPAGE=https://jctools.github.io/JCTools/
+INHERIT=java-pkg-2 java-pkg-simple
+IUSE=doc source test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=!test? ( test )
+SLOT=3
+SRC_URI=https://github.com/JCTools/JCTools/archive/v3.1.0.tar.gz -> jctools-3.1.0.tar.gz
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
+_md5_=953a1dd2971f6f32f35a21b7265a830b
diff --git a/metadata/md5-cache/dev-java/jdbc-mssqlserver-6.2.2 b/metadata/md5-cache/dev-java/jdbc-mssqlserver-6.2.2
deleted file mode 100644
index 55c72239a33b..000000000000
--- a/metadata/md5-cache/dev-java/jdbc-mssqlserver-6.2.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup unpack
-DEPEND=>=dev-java/java-config-2.2.0-r3
-DESCRIPTION=JDBC driver for Microsoft SQL Server
-EAPI=6
-HOMEPAGE=https://github.com/Microsoft/mssql-jdbc
-INHERIT=java-pkg-2 versionator
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3
-SLOT=4.2
-SRC_URI=https://github.com/Microsoft/mssql-jdbc/releases/download/v6.2.2/mssql-jdbc-6.2.2.jre8.jar
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 eapi7-ver 1a0a60ad07c8b32d2faba2d085dc0f24 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 9f813bb3c47cf2e60619a663b87c5f4e estack 055c42df72f76a4f45ec92b35e83cd56 eutils dab5d8ec471d025b79c9e6906bcf3bff java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 ltprune 97143780d341cc8d8f1d4c6187a36d29 multilib 4a33c9008e5ee30cb8840a3fdc24df2b preserve-libs a8e50acee31b5759b4df1f7707cae54b strip-linguas ac3ee41ee2d31d8c41a77c0838320cc7 toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8 vcs-clean d271b7bc7e6a009758d7d4ef749174e3 versionator d3fb3ba33acc3bbbdc4d7970227c100d wrapper 4a1902f969e5718126434fc35f3a0d9c
-_md5_=60d23fe0793e1b886f4272e2b4fae806
diff --git a/metadata/md5-cache/dev-java/jdbc-mysql-8.0.26 b/metadata/md5-cache/dev-java/jdbc-mysql-8.0.26
index 648699b51f94..9e5257357bd0 100644
--- a/metadata/md5-cache/dev-java/jdbc-mysql-8.0.26
+++ b/metadata/md5-cache/dev-java/jdbc-mysql-8.0.26
@@ -11,5 +11,5 @@ LICENSE=GPL-2-with-MySQL-FLOSS-exception
RDEPEND=dev-java/c3p0:0 dev-java/protobuf-java:0 dev-java/slf4j-api:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=0
SRC_URI=https://repo1.maven.org/maven2/mysql/mysql-connector-java/8.0.26/mysql-connector-java-8.0.26-sources.jar -> jdbc-mysql-8.0.26-sources.jar
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=e77b7ef9974dc977efe71afc9322d6fb
diff --git a/metadata/md5-cache/dev-java/jdbc-postgresql-42.4.0 b/metadata/md5-cache/dev-java/jdbc-postgresql-42.4.0
new file mode 100644
index 000000000000..45c33391b362
--- /dev/null
+++ b/metadata/md5-cache/dev-java/jdbc-postgresql-42.4.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=>=virtual/jdk-1.8:* dev-java/scram:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=Java JDBC 4.2 (JRE 8+) driver for PostgreSQL database
+EAPI=8
+HOMEPAGE=https://github.com/pgjdbc/pgjdbc
+INHERIT=java-pkg-2 java-pkg-simple
+IUSE=doc source
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=BSD-2
+RDEPEND=>=virtual/jre-1.8:* dev-java/scram:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+SLOT=0
+SRC_URI=https://jdbc.postgresql.org/download/postgresql-jdbc-42.4.0.src.tar.gz
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
+_md5_=16181e9193901cf0fa532b6ccc65f3df
diff --git a/metadata/md5-cache/dev-java/jdbc-postgresql-9.4_p1206-r1 b/metadata/md5-cache/dev-java/jdbc-postgresql-9.4_p1206-r1
index c12d9f4f7422..2274f1bed077 100644
--- a/metadata/md5-cache/dev-java/jdbc-postgresql-9.4_p1206-r1
+++ b/metadata/md5-cache/dev-java/jdbc-postgresql-9.4_p1206-r1
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
RESTRICT=test
SLOT=0
SRC_URI=https://jdbc.postgresql.org/download/postgresql-jdbc-9.4-1206.src.tar.gz
-_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 cfb5f6911bb70204c94ceafd0372c716 multilib 4fbbbc98f236f1b43acd99476bc3cd85 toolchain-funcs e9da88162e7a3c60376e80c2c2adcdfb
_md5_=6f4b6dc80f28d8073c0562723c667463
diff --git a/metadata/md5-cache/dev-java/jdepend-2.10 b/metadata/md5-cache/dev-java/jdepend-2.10
index 16eccb8c762d..b54a7c5866cc 100644
--- a/metadata/md5-cache/dev-java/jdepend-2.10
+++ b/metadata/md5-cache/dev-java/jdepend-2.10
@@ -10,5 +10,5 @@ LICENSE=BSD
RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=0
SRC_URI=https://github.com/clarkware/jdepend/archive/refs/tags/2.10.tar.gz -> jdepend-2.10.tar.gz
-_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 cfb5f6911bb70204c94ceafd0372c716 multilib 4fbbbc98f236f1b43acd99476bc3cd85 toolchain-funcs e9da88162e7a3c60376e80c2c2adcdfb
_md5_=c37d437ac9e15bc146c5c4121ee25b7f
diff --git a/metadata/md5-cache/dev-java/jdom-1.1.3-r1 b/metadata/md5-cache/dev-java/jdom-1.1.3-r1
index 1c57a2922f74..1f043e6948c3 100644
--- a/metadata/md5-cache/dev-java/jdom-1.1.3-r1
+++ b/metadata/md5-cache/dev-java/jdom-1.1.3-r1
@@ -10,5 +10,5 @@ LICENSE=JDOM
RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=0
SRC_URI=http://www.jdom.org/dist/binary/archive/jdom-1.1.3.tar.gz
-_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 cfb5f6911bb70204c94ceafd0372c716 multilib 4fbbbc98f236f1b43acd99476bc3cd85 toolchain-funcs e9da88162e7a3c60376e80c2c2adcdfb
_md5_=15279c6eb7b16492a9dae6bc7ef27c76
diff --git a/metadata/md5-cache/dev-java/jdom-2.0.6-r5 b/metadata/md5-cache/dev-java/jdom-2.0.6-r5
deleted file mode 100644
index 249733d3f573..000000000000
--- a/metadata/md5-cache/dev-java/jdom-2.0.6-r5
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=dev-java/iso-relax:0 dev-java/jaxen:1.2 dev-java/xalan:0 >=virtual/jdk-1.8:* test? ( dev-java/ant-junit:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
-DESCRIPTION=Java API to manipulate XML data
-EAPI=7
-HOMEPAGE=http://www.jdom.org
-INHERIT=java-pkg-2 java-ant-2
-IUSE=test doc source
-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 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=cdba899512bbb81b2bad833fe49a41ae
diff --git a/metadata/md5-cache/dev-java/jdom-2.0.6.1 b/metadata/md5-cache/dev-java/jdom-2.0.6.1
new file mode 100644
index 000000000000..2b647491367e
--- /dev/null
+++ b/metadata/md5-cache/dev-java/jdom-2.0.6.1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=>=virtual/jdk-1.8:* dev-java/iso-relax:0 dev-java/jaxen:1.2 dev-java/xalan:0 test? ( dev-java/xerces:2 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
+DESCRIPTION=Java-based solution for accessing, manipulating, and outputting XML data
+EAPI=8
+HOMEPAGE=http://www.jdom.org
+INHERIT=java-pkg-2 java-pkg-simple
+IUSE=doc source test
+KEYWORDS=amd64 ~arm arm64 ppc64 x86
+LICENSE=Apache-1.1
+RDEPEND=>=virtual/jre-1.8:* dev-java/iso-relax:0 dev-java/jaxen:1.2 dev-java/xalan:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=test !test? ( test )
+SLOT=2
+SRC_URI=https://github.com/hunterhacker/jdom/archive/JDOM-2.0.6.1.tar.gz
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
+_md5_=1151c4b0c84ce6383754007044d0e5f7
diff --git a/metadata/md5-cache/dev-java/jempbox-1.7.1-r1 b/metadata/md5-cache/dev-java/jempbox-1.7.1-r1
deleted file mode 100644
index de6ec401eb25..000000000000
--- a/metadata/md5-cache/dev-java/jempbox-1.7.1-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.8 app-arch/unzip test? ( dev-java/ant-junit:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
-DESCRIPTION=An open source Java library for parsing font files
-EAPI=7
-HOMEPAGE=https://pdfbox.apache.org/
-INHERIT=java-pkg-2 java-ant-2
-IUSE=doc source test
-KEYWORDS=amd64 x86
-LICENSE=BSD
-RDEPEND=>=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=!test? ( test )
-SLOT=1.7
-SRC_URI=mirror://apache/pdfbox/1.7.1/pdfbox-1.7.1-src.zip
-_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=21159a2c08ba683736340c4837d890b4
diff --git a/metadata/md5-cache/dev-java/jeromq-0.5.2 b/metadata/md5-cache/dev-java/jeromq-0.5.2
index a1598856d16a..242c9130f145 100644
--- a/metadata/md5-cache/dev-java/jeromq-0.5.2
+++ b/metadata/md5-cache/dev-java/jeromq-0.5.2
@@ -12,5 +12,5 @@ RDEPEND=dev-java/jnacl:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 sou
RESTRICT=test !test? ( test )
SLOT=0
SRC_URI=https://github.com/zeromq/jeromq/archive/v0.5.2.tar.gz -> jeromq-0.5.2.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=cbdf1b7c47907d1fd626e6f811fc62be
diff --git a/metadata/md5-cache/dev-java/jffi-1.2.9-r1 b/metadata/md5-cache/dev-java/jffi-1.2.9-r1
index b5e5aedc6253..51dcbff18266 100644
--- a/metadata/md5-cache/dev-java/jffi-1.2.9-r1
+++ b/metadata/md5-cache/dev-java/jffi-1.2.9-r1
@@ -12,5 +12,5 @@ RDEPEND=dev-libs/libffi:0= >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 s
RESTRICT=test
SLOT=1.2
SRC_URI=https://github.com/jnr/jffi/archive/1.2.9.tar.gz -> jffi-1.2.9.tar.gz
-_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 cfb5f6911bb70204c94ceafd0372c716 multilib 4fbbbc98f236f1b43acd99476bc3cd85 toolchain-funcs e9da88162e7a3c60376e80c2c2adcdfb
_md5_=1b346ef078509f32a134a9e810fa5bba
diff --git a/metadata/md5-cache/dev-java/jffi-1.3.6 b/metadata/md5-cache/dev-java/jffi-1.3.6
index f150f55343ef..24b9d52e59c5 100644
--- a/metadata/md5-cache/dev-java/jffi-1.3.6
+++ b/metadata/md5-cache/dev-java/jffi-1.3.6
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
RESTRICT=!test? ( test )
SLOT=1.2
SRC_URI=https://github.com/jnr/jffi/archive/refs/tags/jffi-1.3.6.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=0451cde6ee3ccf7dabf97d64848a5a35
diff --git a/metadata/md5-cache/dev-java/jffi-1.3.9 b/metadata/md5-cache/dev-java/jffi-1.3.9
new file mode 100644
index 000000000000..37af985fbfd2
--- /dev/null
+++ b/metadata/md5-cache/dev-java/jffi-1.3.9
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
+DESCRIPTION=Java Foreign Function Interface
+EAPI=8
+HOMEPAGE=https://github.com/jnr/jffi
+INHERIT=java-pkg-2 java-pkg-simple
+IUSE=doc source test
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=!test? ( test )
+SLOT=1.3
+SRC_URI=https://github.com/jnr/jffi/archive/refs/tags/jffi-1.3.9.tar.gz
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
+_md5_=4e9c554edc34cb126c5abc9e0928a0e4
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 7233887e7a14..cdea72bf5559 100644
--- a/metadata/md5-cache/dev-java/jflex-1.6.1-r1
+++ b/metadata/md5-cache/dev-java/jflex-1.6.1-r1
@@ -12,5 +12,5 @@ RDEPEND=>=virtual/jre-1.8:* vim-syntax? ( || ( app-editors/vim app-editors/gvim
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://jflex.de/jflex-1.6.1.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=479edb30c65ebe69783faaf5f7ffa02e
diff --git a/metadata/md5-cache/dev-java/jformatstring-2.0.3-r1 b/metadata/md5-cache/dev-java/jformatstring-2.0.3-r1
index ea07b6b7a3a5..9e214dbbf1ba 100644
--- a/metadata/md5-cache/dev-java/jformatstring-2.0.3-r1
+++ b/metadata/md5-cache/dev-java/jformatstring-2.0.3-r1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=0
SRC_URI=mirror://sourceforge/findbugs/findbugs-3.0.1-source.zip
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=b8ac9859bde44b536280eca8b7171498
diff --git a/metadata/md5-cache/dev-java/jgoodies-common-1.8.0-r1 b/metadata/md5-cache/dev-java/jgoodies-common-1.8.0-r1
index bae9794e2ce7..dbabdb4956bc 100644
--- a/metadata/md5-cache/dev-java/jgoodies-common-1.8.0-r1
+++ b/metadata/md5-cache/dev-java/jgoodies-common-1.8.0-r1
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
RESTRICT=test
SLOT=1.8
SRC_URI=http://www.jgoodies.com/download/libraries/common/jgoodies-common-1_8_0.zip
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=d52a14c07ec78008e65c2d3c455d6c4a
diff --git a/metadata/md5-cache/dev-java/jgoodies-looks-2.6.0-r1 b/metadata/md5-cache/dev-java/jgoodies-looks-2.6.0-r1
index 566603cd5463..1a78966365d1 100644
--- a/metadata/md5-cache/dev-java/jgoodies-looks-2.6.0-r1
+++ b/metadata/md5-cache/dev-java/jgoodies-looks-2.6.0-r1
@@ -11,5 +11,5 @@ LICENSE=BSD
RDEPEND=dev-java/jgoodies-common:1.8 virtual/jre:1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=2.6
SRC_URI=http://www.jgoodies.com/download/libraries/looks/jgoodies-looks-2_6_0.zip
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=10aea06f77390c986abddf2e4041a2ee
diff --git a/metadata/md5-cache/dev-java/jgraph-5.12.0.4-r1 b/metadata/md5-cache/dev-java/jgraph-5.12.0.4-r1
deleted file mode 100644
index 1d42a7fc3b92..000000000000
--- a/metadata/md5-cache/dev-java/jgraph-5.12.0.4-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-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=Open-source graph component for Java
-EAPI=6
-HOMEPAGE=https://www.jgraph.com
-INHERIT=java-pkg-2 java-pkg-simple
-IUSE=doc examples source doc source
-KEYWORDS=amd64 x86
-LICENSE=LGPL-2.1
-RDEPEND=>=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://gentoo/jgraph-5.12.0.4.jar
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 eapi7-ver 1a0a60ad07c8b32d2faba2d085dc0f24 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 9f813bb3c47cf2e60619a663b87c5f4e estack 055c42df72f76a4f45ec92b35e83cd56 eutils dab5d8ec471d025b79c9e6906bcf3bff java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 ltprune 97143780d341cc8d8f1d4c6187a36d29 multilib 4a33c9008e5ee30cb8840a3fdc24df2b preserve-libs a8e50acee31b5759b4df1f7707cae54b strip-linguas ac3ee41ee2d31d8c41a77c0838320cc7 toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8 vcs-clean d271b7bc7e6a009758d7d4ef749174e3 versionator d3fb3ba33acc3bbbdc4d7970227c100d wrapper 4a1902f969e5718126434fc35f3a0d9c
-_md5_=73d1f454e456a915170fbb915caf2a52
diff --git a/metadata/md5-cache/dev-java/jide-oss-3.7.12 b/metadata/md5-cache/dev-java/jide-oss-3.7.12
index ab4e8963b595..97936bbebbb3 100644
--- a/metadata/md5-cache/dev-java/jide-oss-3.7.12
+++ b/metadata/md5-cache/dev-java/jide-oss-3.7.12
@@ -11,5 +11,5 @@ RDEPEND=virtual/jre:1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://github.com/jidesoft/jide-oss/archive/19083238ce00ecbd7370f856cb64ea69dae669a5.tar.gz -> jide-oss-3.7.12.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=c56dd1b825e9b9b216e38d167a33cb19
diff --git a/metadata/md5-cache/dev-java/jline-2.14.6 b/metadata/md5-cache/dev-java/jline-2.14.6
index a9aaa0a10b20..252969e3a0a2 100644
--- a/metadata/md5-cache/dev-java/jline-2.14.6
+++ b/metadata/md5-cache/dev-java/jline-2.14.6
@@ -11,5 +11,5 @@ RDEPEND=dev-java/jansi:0 dev-java/jansi-native:0 >=virtual/jre-1.8:* >=dev-java/
RESTRICT=!test? ( test ) test
SLOT=2
SRC_URI=https://github.com/jline/jline2/archive/jline-2.14.6.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=5e27aa77287fd305780286a6ca2c1ae1
diff --git a/metadata/md5-cache/dev-java/jmh-core-1.21 b/metadata/md5-cache/dev-java/jmh-core-1.21
deleted file mode 100644
index 935d82ed8b0f..000000000000
--- a/metadata/md5-cache/dev-java/jmh-core-1.21
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.7 dev-java/asm:4 dev-java/junit:4 dev-java/commons-math:3 dev-java/jopt-simple:4.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Harness for building, running, and analysing nano/micro/milli/macro benchmarks
-EAPI=6
-HOMEPAGE=https://openjdk.java.net/projects/code-tools/jmh
-INHERIT=java-pkg-2 java-pkg-simple
-IUSE=doc source
-KEYWORDS=amd64 ~arm arm64 ppc64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.7 dev-java/asm:4 dev-java/junit:4 dev-java/commons-math:3 dev-java/jopt-simple:4.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://hg.openjdk.java.net/code-tools/jmh/archive/f25ae8584db1.tar.gz -> jmh-core-1.21.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 eapi7-ver 1a0a60ad07c8b32d2faba2d085dc0f24 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 9f813bb3c47cf2e60619a663b87c5f4e estack 055c42df72f76a4f45ec92b35e83cd56 eutils dab5d8ec471d025b79c9e6906bcf3bff java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 ltprune 97143780d341cc8d8f1d4c6187a36d29 multilib 4a33c9008e5ee30cb8840a3fdc24df2b preserve-libs a8e50acee31b5759b4df1f7707cae54b strip-linguas ac3ee41ee2d31d8c41a77c0838320cc7 toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8 vcs-clean d271b7bc7e6a009758d7d4ef749174e3 versionator d3fb3ba33acc3bbbdc4d7970227c100d wrapper 4a1902f969e5718126434fc35f3a0d9c
-_md5_=dbcfe39b741e515cd3e32193254548ad
diff --git a/metadata/md5-cache/dev-java/jmh-core-1.35 b/metadata/md5-cache/dev-java/jmh-core-1.35
index cc13f0e2903d..8f98b6e2a3e7 100644
--- a/metadata/md5-cache/dev-java/jmh-core-1.35
+++ b/metadata/md5-cache/dev-java/jmh-core-1.35
@@ -5,11 +5,11 @@ EAPI=8
HOMEPAGE=https://openjdk.java.net/projects/code-tools/jmh/
INHERIT=java-pkg-2 java-pkg-simple
IUSE=doc source test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ppc64 x86
LICENSE=Apache-2.0
RDEPEND=>=virtual/jre-1.8:* dev-java/commons-math:3 dev-java/jopt-simple:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://github.com/openjdk/jmh/archive/1.35.tar.gz -> jmh-core-1.35.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
-_md5_=21815147f77039152f45227204fced6d
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
+_md5_=e9ebc246564e61aa07ef11575c206054
diff --git a/metadata/md5-cache/dev-java/jmock-1.2.0-r2 b/metadata/md5-cache/dev-java/jmock-1.2.0-r2
index ba4c64248c1d..f85e14e43a2b 100644
--- a/metadata/md5-cache/dev-java/jmock-1.2.0-r2
+++ b/metadata/md5-cache/dev-java/jmock-1.2.0-r2
@@ -10,5 +10,5 @@ LICENSE=BSD
RDEPEND=>=virtual/jre-1.8:* dev-java/junit:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=1.0
SRC_URI=http://jmock.org/downloads/jmock-1.2.0-jars.zip
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=aff79e108dae2fe4b9e30b2acf617385
diff --git a/metadata/md5-cache/dev-java/jmock-2.6.1-r1 b/metadata/md5-cache/dev-java/jmock-2.6.1-r1
index 3d44787333ff..e6c2679735f2 100644
--- a/metadata/md5-cache/dev-java/jmock-2.6.1-r1
+++ b/metadata/md5-cache/dev-java/jmock-2.6.1-r1
@@ -10,5 +10,5 @@ LICENSE=BSD
RDEPEND=>=virtual/jre-1.8:* dev-java/hamcrest-core:1.3 dev-java/hamcrest-library:1.3 dev-java/junit:4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=2
SRC_URI=http://jmock.org/downloads/jmock-2.6.1-jars.zip
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=2829f7a8add333ca99df12006b171866
diff --git a/metadata/md5-cache/dev-java/jna-4.2.2-r3 b/metadata/md5-cache/dev-java/jna-4.2.2-r3
deleted file mode 100644
index d03ebd7cc104..000000000000
--- a/metadata/md5-cache/dev-java/jna-4.2.2-r3
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=dev-libs/libffi:= virtual/jdk:1.8 x11-libs/libXt test? ( dev-java/ant-junit:0 dev-java/guava:20 dev-java/javassist:3 dev-java/reflections:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
-DESCRIPTION=Java Native Access (JNA)
-EAPI=7
-HOMEPAGE=https://github.com/java-native-access/jna
-INHERIT=java-pkg-2 java-ant-2 toolchain-funcs
-IUSE=+awt +nio-buffers test doc source
-KEYWORDS=amd64 ppc64 x86
-LICENSE=LGPL-2.1
-RDEPEND=dev-libs/libffi:= virtual/jre:1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-REQUIRED_USE=test? ( awt nio-buffers )
-RESTRICT=test
-SLOT=4
-SRC_URI=https://github.com/java-native-access/jna/archive/4.2.2.tar.gz -> jna-4.2.2.tar.gz
-_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=0c8e4c84e9168c9e775b74022adacdeb
diff --git a/metadata/md5-cache/dev-java/jna-5.10.0 b/metadata/md5-cache/dev-java/jna-5.10.0
index f75f70606757..0569bbbb4e4d 100644
--- a/metadata/md5-cache/dev-java/jna-5.10.0
+++ b/metadata/md5-cache/dev-java/jna-5.10.0
@@ -6,11 +6,11 @@ EAPI=8
HOMEPAGE=https://github.com/java-native-access/jna
INHERIT=java-pkg-2 java-ant-2 toolchain-funcs
IUSE=doc source test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ppc64 x86
LICENSE=|| ( Apache-2.0 LGPL-2.1+ )
RDEPEND=>=virtual/jre-1.8:* >=dev-libs/libffi-3.4:= >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
RESTRICT=!test? ( test )
SLOT=4
SRC_URI=https://github.com/java-native-access/jna/archive/refs/tags/5.10.0.tar.gz -> jna-5.10.0.tar.gz
-_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=bb55a5092e48e4602491157e063c6848
+_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 cfb5f6911bb70204c94ceafd0372c716 multilib 4fbbbc98f236f1b43acd99476bc3cd85 toolchain-funcs e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=54023cd635be486c83cb8a96d2544825
diff --git a/metadata/md5-cache/dev-java/jna-5.11.0 b/metadata/md5-cache/dev-java/jna-5.11.0
index 5aaa5def5a29..c1df02d710b4 100644
--- a/metadata/md5-cache/dev-java/jna-5.11.0
+++ b/metadata/md5-cache/dev-java/jna-5.11.0
@@ -12,5 +12,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-libs/libffi-3.4:= >=dev-java/java-config-2.2.0
RESTRICT=!test? ( test )
SLOT=4
SRC_URI=https://github.com/java-native-access/jna/archive/refs/tags/5.11.0.tar.gz -> jna-5.11.0.tar.gz
-_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=2b127aa4709be22052c512d53648ede5
+_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 cfb5f6911bb70204c94ceafd0372c716 multilib 4fbbbc98f236f1b43acd99476bc3cd85 toolchain-funcs e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=5b8479f78a72e305ec3a61bd2a6d825c
diff --git a/metadata/md5-cache/dev-java/jnacl-1.0 b/metadata/md5-cache/dev-java/jnacl-1.0
index 7354ae55cb71..27bf8ad26e7d 100644
--- a/metadata/md5-cache/dev-java/jnacl-1.0
+++ b/metadata/md5-cache/dev-java/jnacl-1.0
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
RESTRICT=test !test? ( test )
SLOT=0
SRC_URI=https://github.com/neilalexander/jnacl/archive/v1.0.tar.gz -> jnacl-1.0.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=5e705f6ce84403d0bef9d073976f8796
diff --git a/metadata/md5-cache/dev-java/jnr-a64asm-1.0.0 b/metadata/md5-cache/dev-java/jnr-a64asm-1.0.0
index 927127451a27..50fa84ca9b73 100644
--- a/metadata/md5-cache/dev-java/jnr-a64asm-1.0.0
+++ b/metadata/md5-cache/dev-java/jnr-a64asm-1.0.0
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=2
SRC_URI=https://github.com/jnr/jnr-a64asm/archive/refs/tags/jnr-a64asm-1.0.0.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=21d1d2285c1a7dad57430c8bbadb4c0a
diff --git a/metadata/md5-cache/dev-java/jnr-constants-0.10.3 b/metadata/md5-cache/dev-java/jnr-constants-0.10.3
index 62afa4108430..2c6b3dda29f3 100644
--- a/metadata/md5-cache/dev-java/jnr-constants-0.10.3
+++ b/metadata/md5-cache/dev-java/jnr-constants-0.10.3
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://github.com/jnr/jnr-constants/archive/refs/tags/jnr-constants-0.10.3.tar.gz -> jnr-constants-0.10.3-sources.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=6bc0cca0013ff6c3cddddfb28b1557ea
diff --git a/metadata/md5-cache/dev-java/jnr-ffi-2.0.2-r1 b/metadata/md5-cache/dev-java/jnr-ffi-2.0.2-r1
index 53d1602032f1..29fcb3a77deb 100644
--- a/metadata/md5-cache/dev-java/jnr-ffi-2.0.2-r1
+++ b/metadata/md5-cache/dev-java/jnr-ffi-2.0.2-r1
@@ -11,5 +11,5 @@ RDEPEND=~dev-java/jffi-1.2.9:1.2 dev-java/jnr-x86asm:1.0 dev-java/asm:4 >=virtua
RESTRICT=test
SLOT=2
SRC_URI=https://github.com/jnr/jnr-ffi/archive/2.0.2.tar.gz -> jnr-ffi-2.0.2.tar.gz
-_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 cfb5f6911bb70204c94ceafd0372c716 multilib 4fbbbc98f236f1b43acd99476bc3cd85 toolchain-funcs e9da88162e7a3c60376e80c2c2adcdfb
_md5_=4c37f28ee86cbec4b10031e9e326c951
diff --git a/metadata/md5-cache/dev-java/jnr-ffi-2.2.12 b/metadata/md5-cache/dev-java/jnr-ffi-2.2.12
new file mode 100644
index 000000000000..ec4554501c6d
--- /dev/null
+++ b/metadata/md5-cache/dev-java/jnr-ffi-2.2.12
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=dev-java/asm:9 >=dev-java/jffi-1.3.8:1.3 dev-java/jnr-a64asm:2 dev-java/jnr-x86asm:1.0 >=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=A library for invoking native functions from java
+EAPI=8
+HOMEPAGE=https://github.com/jnr/jnr-ffi
+INHERIT=java-pkg-2 java-pkg-simple
+IUSE=doc source
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-java/asm:9 >=dev-java/jffi-1.3.8:1.3 dev-java/jnr-a64asm:2 dev-java/jnr-x86asm:1.0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+SLOT=2
+SRC_URI=https://github.com/jnr/jnr-ffi/archive/jnr-ffi-2.2.12.tar.gz
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
+_md5_=3f8f557b7e56b1446ccd7059f2ed563e
diff --git a/metadata/md5-cache/dev-java/jnr-ffi-2.2.8 b/metadata/md5-cache/dev-java/jnr-ffi-2.2.8
index f60743d1c073..bd5164ecac82 100644
--- a/metadata/md5-cache/dev-java/jnr-ffi-2.2.8
+++ b/metadata/md5-cache/dev-java/jnr-ffi-2.2.8
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
RDEPEND=dev-java/asm:9 dev-java/asm-analysis:9 dev-java/asm-commons:9 dev-java/asm-tree:9 dev-java/asm-util:9 >=dev-java/jffi-1.3.6:1.2 dev-java/jnr-a64asm:2 dev-java/jnr-x86asm:1.0 >=virtual/jre-1.8:* >=dev-java/jffi-1.3.6:1.2 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=2
SRC_URI=https://github.com/jnr/jnr-ffi/archive/refs/tags/jnr-ffi-2.2.8.tar.gz -> jnr-ffi-2.2.8-sources.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=ffc9c7e67b1fc3d4bf0e7654a4e5c84d
diff --git a/metadata/md5-cache/dev-java/jnr-netdb-1.1.4-r1 b/metadata/md5-cache/dev-java/jnr-netdb-1.1.4-r1
index c80428b4efeb..67c873d25285 100644
--- a/metadata/md5-cache/dev-java/jnr-netdb-1.1.4-r1
+++ b/metadata/md5-cache/dev-java/jnr-netdb-1.1.4-r1
@@ -11,5 +11,5 @@ RDEPEND=dev-java/jnr-ffi:2 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 s
RESTRICT=!test? ( test )
SLOT=1.0
SRC_URI=https://github.com/jnr/jnr-netdb/archive/1.1.4.tar.gz -> jnr-netdb-1.1.4.tar.gz
-_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 cfb5f6911bb70204c94ceafd0372c716 multilib 4fbbbc98f236f1b43acd99476bc3cd85 toolchain-funcs e9da88162e7a3c60376e80c2c2adcdfb
_md5_=31f22860ea4a9c15d396360eda1d00b6
diff --git a/metadata/md5-cache/dev-java/jnr-netdb-1.2.0 b/metadata/md5-cache/dev-java/jnr-netdb-1.2.0
new file mode 100644
index 000000000000..f74dc092f254
--- /dev/null
+++ b/metadata/md5-cache/dev-java/jnr-netdb-1.2.0
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=dev-java/jnr-ffi:2 >=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
+DESCRIPTION=Network services database access for java
+EAPI=8
+HOMEPAGE=https://github.com/jnr/jnr-netdb
+INHERIT=java-pkg-2 java-pkg-simple
+IUSE=doc source test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-java/jnr-ffi:2 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=!test? ( test )
+SLOT=1.0
+SRC_URI=https://github.com/jnr/jnr-netdb/archive/jnr-netdb-1.2.0.tar.gz
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
+_md5_=311e4311ea1fb4f222b9cd9bcc4ed77e
diff --git a/metadata/md5-cache/dev-java/jnr-posix-3.0.10-r1 b/metadata/md5-cache/dev-java/jnr-posix-3.0.10-r1
index b389364831c6..f78fe2114676 100644
--- a/metadata/md5-cache/dev-java/jnr-posix-3.0.10-r1
+++ b/metadata/md5-cache/dev-java/jnr-posix-3.0.10-r1
@@ -11,5 +11,5 @@ RDEPEND=dev-java/jnr-constants:0 dev-java/jnr-ffi:2 >=virtual/jre-1.8:* >=dev-ja
RESTRICT=!test? ( test )
SLOT=3.0
SRC_URI=https://github.com/jnr/jnr-posix/archive/3.0.10.tar.gz -> jnr-posix-3.0.10.tar.gz
-_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 cfb5f6911bb70204c94ceafd0372c716 multilib 4fbbbc98f236f1b43acd99476bc3cd85 toolchain-funcs e9da88162e7a3c60376e80c2c2adcdfb
_md5_=eb871d92ac3fb94b076964bba70590ab
diff --git a/metadata/md5-cache/dev-java/jnr-posix-3.1.15 b/metadata/md5-cache/dev-java/jnr-posix-3.1.15
new file mode 100644
index 000000000000..59cd6e619898
--- /dev/null
+++ b/metadata/md5-cache/dev-java/jnr-posix-3.1.15
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=>=dev-java/jnr-ffi-2.2.12:2 dev-java/jnr-constants:0 >=virtual/jdk-11:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
+DESCRIPTION=Common cross-project/cross-platform POSIX APIs
+EAPI=8
+HOMEPAGE=https://github.com/jnr/jnr-posix
+INHERIT=java-pkg-2 java-pkg-simple
+IUSE=doc source test
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=EPL-2.0 GPL-2 LGPL-2.1
+RDEPEND=>=dev-java/jnr-ffi-2.2.12:2 dev-java/jnr-constants:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=!test? ( test )
+SLOT=3.0
+SRC_URI=https://github.com/jnr/jnr-posix/archive/jnr-posix-3.1.15.tar.gz
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
+_md5_=559c13d4b19d58619fd52b98528b0b09
diff --git a/metadata/md5-cache/dev-java/jnr-x86asm-1.0.2-r2 b/metadata/md5-cache/dev-java/jnr-x86asm-1.0.2-r2
index ed68534fa9b5..b579dd55057c 100644
--- a/metadata/md5-cache/dev-java/jnr-x86asm-1.0.2-r2
+++ b/metadata/md5-cache/dev-java/jnr-x86asm-1.0.2-r2
@@ -10,5 +10,5 @@ LICENSE=MIT
RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=1.0
SRC_URI=https://github.com/jnr/jnr-x86asm/archive/refs/tags/1.0.2.tar.gz -> jnr-x86asm-1.0.2.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=39e0820ac165bd3223bf2966ddddad04
diff --git a/metadata/md5-cache/dev-java/joda-convert-2.2.2-r1 b/metadata/md5-cache/dev-java/joda-convert-2.2.2-r1
index d2715b9bf2ea..2e9df4e0bd6a 100644
--- a/metadata/md5-cache/dev-java/joda-convert-2.2.2-r1
+++ b/metadata/md5-cache/dev-java/joda-convert-2.2.2-r1
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://github.com/JodaOrg/joda-convert/archive/v2.2.2.tar.gz -> joda-convert-2.2.2.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=90f25a6747bfcdf02a0ebd8f6afea1f6
diff --git a/metadata/md5-cache/dev-java/joda-time-2.10.10-r1 b/metadata/md5-cache/dev-java/joda-time-2.10.10-r1
index e1eb166a35ca..3f9c19a91643 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
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* dev-java/joda-convert:0 >=dev-java/java-config-2.2.0
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://github.com/JodaOrg/joda-time/archive/refs/tags/v2.10.10.tar.gz -> joda-time-2.10.10.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=8878189767bee19642f925560bd8f439
diff --git a/metadata/md5-cache/dev-java/jol-core-0.16 b/metadata/md5-cache/dev-java/jol-core-0.16
index 8daa20f52774..e6161166dd57 100644
--- a/metadata/md5-cache/dev-java/jol-core-0.16
+++ b/metadata/md5-cache/dev-java/jol-core-0.16
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://github.com/openjdk/jol/archive/refs/tags/0.16.tar.gz -> jol-0.16.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=f1293deef1eb2b45257a37d77a13a82b
diff --git a/metadata/md5-cache/dev-java/jopt-simple-5.0 b/metadata/md5-cache/dev-java/jopt-simple-5.0
deleted file mode 100644
index 4d72e6869d1d..000000000000
--- a/metadata/md5-cache/dev-java/jopt-simple-5.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=A Java library for parsing command line options
-EAPI=6
-HOMEPAGE=https://pholser.github.com/jopt-simple
-INHERIT=java-pkg-2 java-pkg-simple
-IUSE=doc source
-KEYWORDS=amd64 ppc64 x86
-LICENSE=MIT
-RDEPEND=>=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://github.com/pholser/jopt-simple/tarball/jopt-simple-5.0 -> jopt-simple-5.0.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 eapi7-ver 1a0a60ad07c8b32d2faba2d085dc0f24 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 9f813bb3c47cf2e60619a663b87c5f4e estack 055c42df72f76a4f45ec92b35e83cd56 eutils dab5d8ec471d025b79c9e6906bcf3bff java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 ltprune 97143780d341cc8d8f1d4c6187a36d29 multilib 4a33c9008e5ee30cb8840a3fdc24df2b preserve-libs a8e50acee31b5759b4df1f7707cae54b strip-linguas ac3ee41ee2d31d8c41a77c0838320cc7 toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8 vcs-clean d271b7bc7e6a009758d7d4ef749174e3 versionator d3fb3ba33acc3bbbdc4d7970227c100d wrapper 4a1902f969e5718126434fc35f3a0d9c
-_md5_=59b242f2fe6dd28649c847d5ac0a7f99
diff --git a/metadata/md5-cache/dev-java/jopt-simple-5.0-r1 b/metadata/md5-cache/dev-java/jopt-simple-5.0-r1
index 91b9dfad50b9..1cab6b1f3469 100644
--- a/metadata/md5-cache/dev-java/jopt-simple-5.0-r1
+++ b/metadata/md5-cache/dev-java/jopt-simple-5.0-r1
@@ -5,10 +5,10 @@ EAPI=8
HOMEPAGE=https://jopt-simple.github.io/jopt-simple/
INHERIT=java-pkg-2 java-pkg-simple
IUSE=doc source
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ppc64 x86
LICENSE=MIT
RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=0
SRC_URI=https://github.com/jopt-simple/jopt-simple/archive/jopt-simple-5.0.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
-_md5_=de9c8ac8f277f1564fc28b4c13728584
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
+_md5_=954d76ae0dcbcae2baab89ddfefc203a
diff --git a/metadata/md5-cache/dev-java/jopt-simple-4.6-r1 b/metadata/md5-cache/dev-java/jopt-simple-5.0.4
index 854d53ea484e..175c3f2fb455 100644
--- a/metadata/md5-cache/dev-java/jopt-simple-4.6-r1
+++ b/metadata/md5-cache/dev-java/jopt-simple-5.0.4
@@ -5,10 +5,10 @@ EAPI=8
HOMEPAGE=https://jopt-simple.github.io/jopt-simple/
INHERIT=java-pkg-2 java-pkg-simple
IUSE=doc source
-KEYWORDS=amd64 ~arm arm64 ppc64 x86
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
LICENSE=MIT
RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=4.6
-SRC_URI=https://github.com/jopt-simple/jopt-simple/archive/refs/tags/jopt-simple-4.6.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
-_md5_=cb1cf225df2f3ad0086821dc8845f118
+SLOT=0
+SRC_URI=https://github.com/jopt-simple/jopt-simple/archive/jopt-simple-5.0.4.tar.gz
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
+_md5_=869f0071e55b362b14d280eec1a83c7c
diff --git a/metadata/md5-cache/dev-java/jrobin-1.6.0-r2 b/metadata/md5-cache/dev-java/jrobin-1.6.0-r2
index 63d1daddf22b..fdf77741d036 100644
--- a/metadata/md5-cache/dev-java/jrobin-1.6.0-r2
+++ b/metadata/md5-cache/dev-java/jrobin-1.6.0-r2
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://github.com/OpenNMS/jrobin/archive/jrobin-1.6.0-1.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=c518f3b0782e0d8a81457374013abe21
diff --git a/metadata/md5-cache/dev-java/jsch-0.1.55 b/metadata/md5-cache/dev-java/jsch-0.1.55
index 2b34411f64e7..520372f90ede 100644
--- a/metadata/md5-cache/dev-java/jsch-0.1.55
+++ b/metadata/md5-cache/dev-java/jsch-0.1.55
@@ -11,5 +11,5 @@ LICENSE=BSD
RDEPEND=>=dev-java/jzlib-1.1.3:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=0
SRC_URI=mirror://sourceforge/jsch/jsch-0.1.55.zip
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=3c67018e37f64ad1b88f0747698b03d1
diff --git a/metadata/md5-cache/dev-java/jsch-agent-proxy-0.0.9 b/metadata/md5-cache/dev-java/jsch-agent-proxy-0.0.9
index 38f14715f101..3957d86a66f6 100644
--- a/metadata/md5-cache/dev-java/jsch-agent-proxy-0.0.9
+++ b/metadata/md5-cache/dev-java/jsch-agent-proxy-0.0.9
@@ -10,5 +10,5 @@ LICENSE=BSD
RDEPEND=dev-java/jna:4 dev-java/jsch:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=0
SRC_URI=https://github.com/ymnk/jsch-agent-proxy/archive/12c3d64fc2b0a4fd37659369edfdee26e48954e2.tar.gz -> jsch-agent-proxy-0.0.9.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=f0145b7f42bda4b62567a4fe7ed159e0
diff --git a/metadata/md5-cache/dev-java/json-20220320 b/metadata/md5-cache/dev-java/json-20220320
index 7b17d6ac328c..4211d471b3d0 100644
--- a/metadata/md5-cache/dev-java/json-20220320
+++ b/metadata/md5-cache/dev-java/json-20220320
@@ -10,5 +10,5 @@ LICENSE=JSON
RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=0
SRC_URI=https://codeload.github.com/stleary/JSON-java/tar.gz/20220320 -> json-20220320.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=0c4b904e5a8e6d956a21cdf4f4e42532
diff --git a/metadata/md5-cache/dev-java/json-simple-1.1-r2 b/metadata/md5-cache/dev-java/json-simple-1.1-r2
index 9a1a53f72ab3..bad6c6c33e69 100644
--- a/metadata/md5-cache/dev-java/json-simple-1.1-r2
+++ b/metadata/md5-cache/dev-java/json-simple-1.1-r2
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=0
SRC_URI=https://github.com/fangyidong/json-simple/archive/tag_release_1_1_1.tar.gz -> json-simple-1.1.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=582d7ea68716f01a3bafa1082f0145c6
diff --git a/metadata/md5-cache/dev-java/jspeex-0.9.7-r2 b/metadata/md5-cache/dev-java/jspeex-0.9.7-r2
index eb0ebbbb22f5..032562ce81d8 100644
--- a/metadata/md5-cache/dev-java/jspeex-0.9.7-r2
+++ b/metadata/md5-cache/dev-java/jspeex-0.9.7-r2
@@ -12,5 +12,5 @@ RDEPEND=dev-java/ant-core:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=mirror://sourceforge/jspeex/jspeex-0.9.7.zip
-_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 cfb5f6911bb70204c94ceafd0372c716 multilib 4fbbbc98f236f1b43acd99476bc3cd85 toolchain-funcs e9da88162e7a3c60376e80c2c2adcdfb
_md5_=aa48b8f15f3f68c7ed90b29836daf6af
diff --git a/metadata/md5-cache/dev-java/jsr250-1.2 b/metadata/md5-cache/dev-java/jsr250-1.2
deleted file mode 100644
index fa9d4fc0d04c..000000000000
--- a/metadata/md5-cache/dev-java/jsr250-1.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=JSR 250 Common Annotations
-EAPI=6
-HOMEPAGE=https://jcp.org/en/jsr/detail?id=250
-INHERIT=java-pkg-2 java-pkg-simple
-IUSE=doc source
-KEYWORDS=amd64 ppc64 x86 ~amd64-linux
-LICENSE=|| ( CDDL GPL-2 )
-RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://repo1.maven.org/maven2/javax/annotation/javax.annotation-api/1.2/javax.annotation-api-1.2-sources.jar -> jsr250-1.2.jar
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 eapi7-ver 1a0a60ad07c8b32d2faba2d085dc0f24 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 9f813bb3c47cf2e60619a663b87c5f4e estack 055c42df72f76a4f45ec92b35e83cd56 eutils dab5d8ec471d025b79c9e6906bcf3bff java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 ltprune 97143780d341cc8d8f1d4c6187a36d29 multilib 4a33c9008e5ee30cb8840a3fdc24df2b preserve-libs a8e50acee31b5759b4df1f7707cae54b strip-linguas ac3ee41ee2d31d8c41a77c0838320cc7 toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8 vcs-clean d271b7bc7e6a009758d7d4ef749174e3 versionator d3fb3ba33acc3bbbdc4d7970227c100d wrapper 4a1902f969e5718126434fc35f3a0d9c
-_md5_=2c23355b97cb5dd807972b2900046397
diff --git a/metadata/md5-cache/dev-java/jsr305-3.0.2-r1 b/metadata/md5-cache/dev-java/jsr305-3.0.2-r1
index fbe65f095638..a1a12730d5c8 100644
--- a/metadata/md5-cache/dev-java/jsr305-3.0.2-r1
+++ b/metadata/md5-cache/dev-java/jsr305-3.0.2-r1
@@ -10,5 +10,5 @@ LICENSE=BSD
RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=0
SRC_URI=https://repo1.maven.org/maven2/com/google/code/findbugs/jsr305/3.0.2/jsr305-3.0.2-sources.jar
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=f010bcb7603d30304cccc69595761b8d
diff --git a/metadata/md5-cache/dev-java/jta-1.1-r1 b/metadata/md5-cache/dev-java/jta-1.1-r1
index b5367584795b..7461d4e30892 100644
--- a/metadata/md5-cache/dev-java/jta-1.1-r1
+++ b/metadata/md5-cache/dev-java/jta-1.1-r1
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3
RESTRICT=fetch
SLOT=0
SRC_URI=jta-1_1-classes.zip
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=bc8f4489d0fe3fa1dcfe2d5228c8393c
diff --git a/metadata/md5-cache/dev-java/jtds-1.3.1-r1 b/metadata/md5-cache/dev-java/jtds-1.3.1-r1
index e6b2c7c04760..94f1972f40c0 100644
--- a/metadata/md5-cache/dev-java/jtds-1.3.1-r1
+++ b/metadata/md5-cache/dev-java/jtds-1.3.1-r1
@@ -12,5 +12,5 @@ RDEPEND=dev-java/jcifs:1.1 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 s
RESTRICT=test
SLOT=1.3
SRC_URI=mirror://sourceforge/project/jtds/jtds/1.3.1/jtds-1.3.1-src.zip
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=730dfb2314979eb49a33d1e6e2b55e02
diff --git a/metadata/md5-cache/dev-java/jtidy-1.0-r1 b/metadata/md5-cache/dev-java/jtidy-1.0-r1
index 00853ca0655b..eeb3f2cb3c32 100644
--- a/metadata/md5-cache/dev-java/jtidy-1.0-r1
+++ b/metadata/md5-cache/dev-java/jtidy-1.0-r1
@@ -11,5 +11,5 @@ LICENSE=HTML-Tidy W3C
RDEPEND=dev-java/ant-core:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=0
SRC_URI=mirror://sourceforge/project/jtidy/JTidy/r938/jtidy-r938-sources.zip -> jtidy-1.0.zip
-_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 cfb5f6911bb70204c94ceafd0372c716 multilib 4fbbbc98f236f1b43acd99476bc3cd85 toolchain-funcs e9da88162e7a3c60376e80c2c2adcdfb
_md5_=b140cbe80d1d147d604ba3d6832d278c
diff --git a/metadata/md5-cache/dev-java/junit-3.8.2-r2 b/metadata/md5-cache/dev-java/junit-3.8.2-r2
index 60bf1139712a..4b775dcf5adf 100644
--- a/metadata/md5-cache/dev-java/junit-3.8.2-r2
+++ b/metadata/md5-cache/dev-java/junit-3.8.2-r2
@@ -10,5 +10,5 @@ LICENSE=CPL-1.0
RDEPEND=>=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=0
SRC_URI=mirror://sourceforge/junit/junit3.8.2.zip
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=2cb66bdc1fddf90655369bf84c447628
diff --git a/metadata/md5-cache/dev-java/junit-4.13.2 b/metadata/md5-cache/dev-java/junit-4.13.2
index 5e96ea9ef72f..61a8e7763fa7 100644
--- a/metadata/md5-cache/dev-java/junit-4.13.2
+++ b/metadata/md5-cache/dev-java/junit-4.13.2
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* dev-java/hamcrest-core:1.3 >=dev-java/java-config-2.
RESTRICT=!test? ( test )
SLOT=4
SRC_URI=https://github.com/junit-team/junit4/archive/refs/tags/r4.13.2.tar.gz -> junit-4.13.2.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=d5125b3191cacd1f95f49f2c28a3a361
diff --git a/metadata/md5-cache/dev-java/junit-clptr-1.2.2 b/metadata/md5-cache/dev-java/junit-clptr-1.2.2
index 27bcb3bff403..a912493c7af2 100644
--- a/metadata/md5-cache/dev-java/junit-clptr-1.2.2
+++ b/metadata/md5-cache/dev-java/junit-clptr-1.2.2
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
RDEPEND=>=virtual/jre-1.8:* dev-java/junit:4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=0
SRC_URI=https://github.com/bitstrings/junit-clptr/archive/refs/tags/1.2.2.tar.gz -> junit-clptr-1.2.2-sources.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=cf422be6a5523815b02e67c5e3ea8ca8
diff --git a/metadata/md5-cache/dev-java/junitparams-1.1.1 b/metadata/md5-cache/dev-java/junitparams-1.1.1
index 559fced6d307..282eb3c6f198 100644
--- a/metadata/md5-cache/dev-java/junitparams-1.1.1
+++ b/metadata/md5-cache/dev-java/junitparams-1.1.1
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/junit-4.12:4 >=dev-java/java-config-2.2.0
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://github.com/Pragmatists/JUnitParams/archive/refs/tags/JUnitParams-1.1.1.tar.gz -> junitparams-1.1.1.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=5cc085539258633a17adf50959bf58a6
diff --git a/metadata/md5-cache/dev-java/jython-2.7.0-r4 b/metadata/md5-cache/dev-java/jython-2.7.0-r4
deleted file mode 100644
index ab263016e544..000000000000
--- a/metadata/md5-cache/dev-java/jython-2.7.0-r4
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=dev-java/antlr:3 dev-java/netty-transport:0 dev-java/asm:9 dev-java/commons-compress:0 dev-java/guava:20 dev-java/jffi:1.2 dev-java/jline:2 dev-java/icu4j:70 dev-java/jnr-constants:0 dev-java/jnr-posix:3.0 dev-java/jnr-netdb:1.0 dev-java/stringtemplate:0 dev-java/xerces:2 java-virtuals/servlet-api:3.0 >=virtual/jdk-1.8:* dev-java/ant-core:0 test? ( dev-java/junit:4 dev-java/ant-junit:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
-DESCRIPTION=An implementation of Python written in Java
-EAPI=7
-HOMEPAGE=https://www.jython.org
-INHERIT=java-pkg-2 java-ant-2 python-utils-r1 flag-o-matic
-IUSE=examples test doc source
-KEYWORDS=amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux
-LICENSE=PSF-2
-RDEPEND=dev-java/antlr:3 dev-java/netty-transport:0 dev-java/asm:9 dev-java/commons-compress:0 dev-java/guava:20 dev-java/jffi:1.2 dev-java/jline:2 dev-java/icu4j:70 dev-java/jnr-constants:0 dev-java/jnr-posix:3.0 dev-java/jnr-netdb:1.0 dev-java/stringtemplate:0 dev-java/xerces:2 java-virtuals/servlet-api:3.0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=2.7
-SRC_URI=https://search.maven.org/remotecontent?filepath=org/python/jython/2.7.0/jython-2.7.0-sources.jar
-_eclasses_=eapi8-dosym cd7d420bb5be5ee079f27239ce76b8f5 edos2unix 33e347e171066657f91f8b0c72ec8773 eutils dab5d8ec471d025b79c9e6906bcf3bff flag-o-matic a500d7cc40da3de38c361e889153bdf7 java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b multiprocessing b4e253ab22cef7b1085e9b67c7a3b730 python-utils-r1 5dc84801daa87406aafaf535cb947a64 strip-linguas ac3ee41ee2d31d8c41a77c0838320cc7 toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8 wrapper 4a1902f969e5718126434fc35f3a0d9c
-_md5_=c1d7e3aa43528f0731ae1ec08a059928
diff --git a/metadata/md5-cache/dev-java/jython-2.7.0-r6 b/metadata/md5-cache/dev-java/jython-2.7.0-r6
index fded3df24481..5df23e412c21 100644
--- a/metadata/md5-cache/dev-java/jython-2.7.0-r6
+++ b/metadata/md5-cache/dev-java/jython-2.7.0-r6
@@ -6,11 +6,11 @@ EAPI=7
HOMEPAGE=https://www.jython.org
INHERIT=java-pkg-2 java-ant-2 python-utils-r1 flag-o-matic
IUSE=examples test doc source
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux
LICENSE=PSF-2
RDEPEND=dev-java/antlr:3 dev-java/netty:0 dev-java/asm:9 dev-java/commons-compress:0 dev-java/guava:0 dev-java/jffi:1.2 dev-java/jline:2 dev-java/icu4j:70 dev-java/jnr-constants:0 dev-java/jnr-posix:3.0 dev-java/jnr-netdb:1.0 dev-java/stringtemplate:0 dev-java/xerces:2 java-virtuals/servlet-api:3.0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
RESTRICT=test
SLOT=2.7
SRC_URI=https://search.maven.org/remotecontent?filepath=org/python/jython/2.7.0/jython-2.7.0-sources.jar
-_eclasses_=eapi8-dosym cd7d420bb5be5ee079f27239ce76b8f5 edos2unix 33e347e171066657f91f8b0c72ec8773 eutils dab5d8ec471d025b79c9e6906bcf3bff flag-o-matic a500d7cc40da3de38c361e889153bdf7 java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b multiprocessing b4e253ab22cef7b1085e9b67c7a3b730 python-utils-r1 5dc84801daa87406aafaf535cb947a64 strip-linguas ac3ee41ee2d31d8c41a77c0838320cc7 toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8 wrapper 4a1902f969e5718126434fc35f3a0d9c
-_md5_=f5e80abcb880708c44ef94f413cfb17c
+_eclasses_=eapi8-dosym cd7d420bb5be5ee079f27239ce76b8f5 edos2unix 33e347e171066657f91f8b0c72ec8773 eutils dab5d8ec471d025b79c9e6906bcf3bff flag-o-matic a3abd6002fafb3022597be6b8d01f88b java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 cfb5f6911bb70204c94ceafd0372c716 multilib 4fbbbc98f236f1b43acd99476bc3cd85 multiprocessing b4e253ab22cef7b1085e9b67c7a3b730 python-utils-r1 648fe6a039e87233d7f48da72cadb76f strip-linguas ac3ee41ee2d31d8c41a77c0838320cc7 toolchain-funcs e9da88162e7a3c60376e80c2c2adcdfb wrapper 4a1902f969e5718126434fc35f3a0d9c
+_md5_=ca04b6ab8ceac0bacd40d7e86ab66a81
diff --git a/metadata/md5-cache/dev-java/jzlib-1.1.3-r2 b/metadata/md5-cache/dev-java/jzlib-1.1.3-r2
index 305fedc64ce2..efd7a79aea54 100644
--- a/metadata/md5-cache/dev-java/jzlib-1.1.3-r2
+++ b/metadata/md5-cache/dev-java/jzlib-1.1.3-r2
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
RESTRICT=test
SLOT=0
SRC_URI=https://github.com/ymnk/jzlib/archive/1.1.3.tar.gz -> jzlib-1.1.3.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=c7f98be39fac6bb494bcd0bf1b9d1786
diff --git a/metadata/md5-cache/dev-java/kafka-clients-1.1.1 b/metadata/md5-cache/dev-java/kafka-clients-1.1.1
index 908d54842a33..a83831f6dcd1 100644
--- a/metadata/md5-cache/dev-java/kafka-clients-1.1.1
+++ b/metadata/md5-cache/dev-java/kafka-clients-1.1.1
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
RDEPEND=>=virtual/jre-1.8:* >=dev-java/lz4-java-1.4.1:0 >=dev-java/slf4j-api-1.7.25:0 >=dev-java/snappy-1.1.7.1:1.1 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=0
SRC_URI=https://archive.apache.org/dist/kafka/1.1.1/kafka-1.1.1-src.tgz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=e349412855f51dda74f62c8f9d543bb9
diff --git a/metadata/md5-cache/dev-java/leiningen-bin-2.9.1 b/metadata/md5-cache/dev-java/leiningen-bin-2.9.1
deleted file mode 100644
index a1047c0996eb..000000000000
--- a/metadata/md5-cache/dev-java/leiningen-bin-2.9.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup unpack
-DEPEND=>=virtual/jdk-1.8 >=dev-java/java-config-2.2.0-r3
-DESCRIPTION=Automate Clojure projects without setting your hair on fire
-EAPI=6
-HOMEPAGE=https://leiningen.org/
-INHERIT=java-pkg-2
-KEYWORDS=amd64 arm64 ~x86 ~x64-macos
-LICENSE=EPL-1.0
-RDEPEND=>=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/technomancy/leiningen/releases/download/2.9.1/leiningen-2.9.1-standalone.zip -> leiningen-2.9.1-standalone.jar https://raw.githubusercontent.com/technomancy/leiningen/2.9.1/bin/lein-pkg -> leiningen-2.9.1.sh
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 eapi7-ver 1a0a60ad07c8b32d2faba2d085dc0f24 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 9f813bb3c47cf2e60619a663b87c5f4e estack 055c42df72f76a4f45ec92b35e83cd56 eutils dab5d8ec471d025b79c9e6906bcf3bff java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 ltprune 97143780d341cc8d8f1d4c6187a36d29 multilib 4a33c9008e5ee30cb8840a3fdc24df2b preserve-libs a8e50acee31b5759b4df1f7707cae54b strip-linguas ac3ee41ee2d31d8c41a77c0838320cc7 toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8 vcs-clean d271b7bc7e6a009758d7d4ef749174e3 versionator d3fb3ba33acc3bbbdc4d7970227c100d wrapper 4a1902f969e5718126434fc35f3a0d9c
-_md5_=f2d1eade654b12d47d89d89c133c805f
diff --git a/metadata/md5-cache/dev-java/leiningen-bin-2.9.8 b/metadata/md5-cache/dev-java/leiningen-bin-2.9.8
index 79b0b40fbd92..ad3feba35114 100644
--- a/metadata/md5-cache/dev-java/leiningen-bin-2.9.8
+++ b/metadata/md5-cache/dev-java/leiningen-bin-2.9.8
@@ -4,11 +4,11 @@ DESCRIPTION=Automate Clojure projects without setting your hair on fire
EAPI=8
HOMEPAGE=https://leiningen.org/
INHERIT=java-pkg-2
-KEYWORDS=~amd64 ~arm64 ~x86 ~x64-macos
+KEYWORDS=amd64 arm64 ~x86 ~x64-macos
LICENSE=EPL-1.0
RDEPEND=>=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3
RESTRICT=test
SLOT=0
SRC_URI=https://github.com/technomancy/leiningen/releases/download/2.9.8/leiningen-2.9.8-standalone.jar https://raw.githubusercontent.com/technomancy/leiningen/2.9.8/bin/lein-pkg -> leiningen-2.9.8.sh
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
-_md5_=aa772d3d2fd9f8d6253b3d38340599e6
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 cfb5f6911bb70204c94ceafd0372c716
+_md5_=fcd58995e06652d1f6d36bbac97e3c03
diff --git a/metadata/md5-cache/dev-java/libg-2.1.0-r2 b/metadata/md5-cache/dev-java/libg-2.1.0-r2
index d17de1855e5c..2d8d5b0266e8 100644
--- a/metadata/md5-cache/dev-java/libg-2.1.0-r2
+++ b/metadata/md5-cache/dev-java/libg-2.1.0-r2
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3
RESTRICT=test
SLOT=0
SRC_URI=https://github.com/bndtools/bnd/archive/2.1.0.REL.tar.gz -> bndlib-2.1.0.tar.gz
-_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 cfb5f6911bb70204c94ceafd0372c716 multilib 4fbbbc98f236f1b43acd99476bc3cd85 toolchain-funcs e9da88162e7a3c60376e80c2c2adcdfb
_md5_=f0a9c234e14606974c5cd4c4f7050818
diff --git a/metadata/md5-cache/dev-java/lmax-disruptor-3.4.4 b/metadata/md5-cache/dev-java/lmax-disruptor-3.4.4
index fcd1329410f4..57737ed65b07 100644
--- a/metadata/md5-cache/dev-java/lmax-disruptor-3.4.4
+++ b/metadata/md5-cache/dev-java/lmax-disruptor-3.4.4
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://github.com/LMAX-Exchange/disruptor/archive/3.4.4.tar.gz -> lmax-disruptor-3.4.4.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=d0063608d73b32d09af4e0e9aa228d3c
diff --git a/metadata/md5-cache/dev-java/log4j-12-api-2.17.1 b/metadata/md5-cache/dev-java/log4j-12-api-2.17.1
deleted file mode 100644
index dfe8b66898fb..000000000000
--- a/metadata/md5-cache/dev-java/log4j-12-api-2.17.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=~dev-java/log4j-api-2.17.1:2 ~dev-java/log4j-core-2.17.1:2 >=virtual/jdk-1.8:* dev-java/jboss-jms-api:1.1 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=The Apache Log4j 1.x Compatibility API
-EAPI=8
-HOMEPAGE=https://logging.apache.org/log4j/2.x/
-INHERIT=java-pkg-2 java-pkg-simple
-IUSE=doc source test
-KEYWORDS=amd64 ~arm arm64 ppc64 x86
-LICENSE=Apache-2.0
-RDEPEND=~dev-java/log4j-api-2.17.1:2 ~dev-java/log4j-core-2.17.1:2 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test !test? ( test )
-SLOT=2
-SRC_URI=mirror://apache/logging/log4j/2.17.1/apache-log4j-2.17.1-src.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
-_md5_=85b1dbc023dbb3ec04b9facfdfafe938
diff --git a/metadata/md5-cache/dev-java/log4j-12-api-2.17.2 b/metadata/md5-cache/dev-java/log4j-12-api-2.17.2
index 7f39363ec413..2383e8d7e669 100644
--- a/metadata/md5-cache/dev-java/log4j-12-api-2.17.2
+++ b/metadata/md5-cache/dev-java/log4j-12-api-2.17.2
@@ -5,11 +5,11 @@ EAPI=8
HOMEPAGE=https://logging.apache.org/log4j/2.x/
INHERIT=java-pkg-2 java-pkg-simple
IUSE=doc source test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ppc64 x86
LICENSE=Apache-2.0
RDEPEND=~dev-java/log4j-api-2.17.2:2 ~dev-java/log4j-core-2.17.2:2 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
RESTRICT=test !test? ( test )
SLOT=2
SRC_URI=mirror://apache/logging/log4j/2.17.2/apache-log4j-2.17.2-src.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
-_md5_=b0a08d8a41e226ec79536e54e3fcee95
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
+_md5_=571098f937e395b5d31e9c89fd54ab81
diff --git a/metadata/md5-cache/dev-java/log4j-api-2.17.1 b/metadata/md5-cache/dev-java/log4j-api-2.17.1
deleted file mode 100644
index 1da539a90eb6..000000000000
--- a/metadata/md5-cache/dev-java/log4j-api-2.17.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.8:* dev-java/osgi-core-api:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=The Apache Log4j API
-EAPI=8
-HOMEPAGE=https://logging.apache.org/log4j/2.x/
-INHERIT=java-pkg-2 java-pkg-simple
-IUSE=doc source test
-KEYWORDS=amd64 ~arm arm64 ppc64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test !test? ( test )
-SLOT=2
-SRC_URI=mirror://apache/logging/log4j/2.17.1/apache-log4j-2.17.1-src.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
-_md5_=3769b1a7bd3476092fffbe442ca691c6
diff --git a/metadata/md5-cache/dev-java/log4j-api-2.17.2 b/metadata/md5-cache/dev-java/log4j-api-2.17.2
index 929cfea8ef0e..951af7524872 100644
--- a/metadata/md5-cache/dev-java/log4j-api-2.17.2
+++ b/metadata/md5-cache/dev-java/log4j-api-2.17.2
@@ -5,11 +5,11 @@ EAPI=8
HOMEPAGE=https://logging.apache.org/log4j/2.x/
INHERIT=java-pkg-2 java-pkg-simple
IUSE=doc source test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ppc64 x86
LICENSE=Apache-2.0
RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
RESTRICT=test !test? ( test )
SLOT=2
SRC_URI=mirror://apache/logging/log4j/2.17.2/apache-log4j-2.17.2-src.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
-_md5_=a9d8acd8d47102cd87f23eb8dc3c2650
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
+_md5_=aab9b71adce49ddbcf80053e6539a3ed
diff --git a/metadata/md5-cache/dev-java/log4j-api-java9-2.17.1 b/metadata/md5-cache/dev-java/log4j-api-java9-2.17.1
index 1b556964b946..84d6b2cfc218 100644
--- a/metadata/md5-cache/dev-java/log4j-api-java9-2.17.1
+++ b/metadata/md5-cache/dev-java/log4j-api-java9-2.17.1
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-11:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zi
RESTRICT=test !test? ( test )
SLOT=2
SRC_URI=mirror://apache/logging/log4j/2.17.1/apache-log4j-2.17.1-src.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=13767e6ae691bb21322e030b7e85dd12
diff --git a/metadata/md5-cache/dev-java/log4j-core-2.17.2 b/metadata/md5-cache/dev-java/log4j-core-2.17.2
index f59a8f9b5dc6..89fa445b3c8d 100644
--- a/metadata/md5-cache/dev-java/log4j-core-2.17.2
+++ b/metadata/md5-cache/dev-java/log4j-core-2.17.2
@@ -5,11 +5,11 @@ EAPI=8
HOMEPAGE=https://logging.apache.org/log4j/2.x/
INHERIT=java-pkg-2 java-pkg-simple
IUSE=doc source test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ppc64 x86
LICENSE=Apache-2.0
RDEPEND=>=virtual/jre-1.8:* dev-java/commons-compress:0 dev-java/commons-csv:0 dev-java/conversant-disruptor:0 dev-java/jackson-core:0 dev-java/jackson-databind:0 dev-java/jackson-dataformat-xml:0 dev-java/jackson-dataformat-yaml:0 dev-java/jakarta-activation-api:1 dev-java/jansi:2 dev-java/javax-mail:0 dev-java/jctools-core:0 dev-java/jeromq:0 dev-java/kafka-clients:0 dev-java/lmax-disruptor:0 ~dev-java/log4j-api-2.17.2:2 dev-java/slf4j-api:0 dev-java/woodstox-core:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
RESTRICT=test !test? ( test )
SLOT=2
SRC_URI=mirror://apache/logging/log4j/2.17.2/apache-log4j-2.17.2-src.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
-_md5_=2432e2db5d112606a5ebcb124d414b84
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
+_md5_=632062b903e7276608f988fe5260cece
diff --git a/metadata/md5-cache/dev-java/log4j-core-2.17.1-r1 b/metadata/md5-cache/dev-java/log4j-core-2.17.2-r1
index fdd91826cf92..6e83a1d14687 100644
--- a/metadata/md5-cache/dev-java/log4j-core-2.17.1-r1
+++ b/metadata/md5-cache/dev-java/log4j-core-2.17.2-r1
@@ -1,15 +1,15 @@
DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=dev-java/commons-compress:0 dev-java/commons-csv:0 dev-java/conversant-disruptor:0 dev-java/jackson-core:0 dev-java/jackson-databind:0 dev-java/jackson-dataformat-xml:0 dev-java/jackson-dataformat-yaml:0 dev-java/jakarta-activation-api:1 dev-java/jansi:2 dev-java/javax-mail:0 dev-java/jctools-core:0 dev-java/jeromq:0 dev-java/kafka-clients:0 dev-java/lmax-disruptor:0 ~dev-java/log4j-api-2.17.1:2 dev-java/slf4j-api:0 dev-java/woodstox-core:0 dev-java/jboss-jms-api:1.1 dev-java/osgi-core-api:0 >=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DEPEND=dev-java/commons-compress:0 dev-java/commons-csv:0 dev-java/conversant-disruptor:0 dev-java/jackson-core:0 dev-java/jackson-databind:0 dev-java/jackson-dataformat-xml:0 dev-java/jackson-dataformat-yaml:0 dev-java/jakarta-activation-api:1 dev-java/jansi:2 dev-java/javax-mail:0 dev-java/jctools-core:3 dev-java/jeromq:0 dev-java/kafka-clients:0 dev-java/lmax-disruptor:0 ~dev-java/log4j-api-2.17.2:2 dev-java/slf4j-api:0 dev-java/woodstox-core:0 dev-java/jboss-jms-api:1.1 dev-java/osgi-core-api:0 >=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
DESCRIPTION=The Apache Log4j Implementation
EAPI=8
HOMEPAGE=https://logging.apache.org/log4j/2.x/
INHERIT=java-pkg-2 java-pkg-simple
IUSE=doc source test
-KEYWORDS=amd64 ~arm arm64 ppc64 x86
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.8:* dev-java/commons-compress:0 dev-java/commons-csv:0 dev-java/conversant-disruptor:0 dev-java/jackson-core:0 dev-java/jackson-databind:0 dev-java/jackson-dataformat-xml:0 dev-java/jackson-dataformat-yaml:0 dev-java/jakarta-activation-api:1 dev-java/jansi:2 dev-java/javax-mail:0 dev-java/jctools-core:0 dev-java/jeromq:0 dev-java/kafka-clients:0 dev-java/lmax-disruptor:0 ~dev-java/log4j-api-2.17.1:2 dev-java/slf4j-api:0 dev-java/woodstox-core:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RDEPEND=>=virtual/jre-1.8:* dev-java/commons-compress:0 dev-java/commons-csv:0 dev-java/conversant-disruptor:0 dev-java/jackson-core:0 dev-java/jackson-databind:0 dev-java/jackson-dataformat-xml:0 dev-java/jackson-dataformat-yaml:0 dev-java/jakarta-activation-api:1 dev-java/jansi:2 dev-java/javax-mail:0 dev-java/jctools-core:3 dev-java/jeromq:0 dev-java/kafka-clients:0 dev-java/lmax-disruptor:0 ~dev-java/log4j-api-2.17.2:2 dev-java/slf4j-api:0 dev-java/woodstox-core:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
RESTRICT=test !test? ( test )
SLOT=2
-SRC_URI=mirror://apache/logging/log4j/2.17.1/apache-log4j-2.17.1-src.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
-_md5_=70c00c60c3f5d42ae827a8bdc0e83d88
+SRC_URI=mirror://apache/logging/log4j/2.17.2/apache-log4j-2.17.2-src.tar.gz
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
+_md5_=f36e277de4225a91564cbfde454b2f96
diff --git a/metadata/md5-cache/dev-java/logback-classic-1.2.11 b/metadata/md5-cache/dev-java/logback-classic-1.2.11
index 526cb56a9e40..62697c6a51f1 100644
--- a/metadata/md5-cache/dev-java/logback-classic-1.2.11
+++ b/metadata/md5-cache/dev-java/logback-classic-1.2.11
@@ -5,10 +5,10 @@ EAPI=8
HOMEPAGE=http://logback.qos.ch
INHERIT=java-pkg-2 java-pkg-simple
IUSE=doc source
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ppc64 x86
LICENSE=EPL-1.0 LGPL-3
RDEPEND=virtual/jre:1.8 dev-java/janino:0 dev-java/javax-mail:0 dev-java/logback-core:0 dev-java/reflections:0 dev-java/slf4j-api:0 java-virtuals/servlet-api:3.1 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=0
SRC_URI=https://github.com/qos-ch/logback/archive/v_1.2.11.tar.gz -> logback-1.2.11.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
-_md5_=b25afd6c5834774863a7be6eedabbd6d
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
+_md5_=1f053a5bed40f6795d1f0e8403023b8c
diff --git a/metadata/md5-cache/dev-java/logback-core-1.2.11 b/metadata/md5-cache/dev-java/logback-core-1.2.11
index f59a9f0350b2..1d2313c9b2e7 100644
--- a/metadata/md5-cache/dev-java/logback-core-1.2.11
+++ b/metadata/md5-cache/dev-java/logback-core-1.2.11
@@ -5,11 +5,11 @@ EAPI=8
HOMEPAGE=https://logback.qos.ch
INHERIT=java-pkg-2 java-pkg-simple
IUSE=doc source test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ppc64 x86
LICENSE=EPL-1.0 LGPL-3
RDEPEND=>=virtual/jre-1.8:* dev-java/javax-mail:0 dev-java/janino:0 dev-java/jansi:0 java-virtuals/servlet-api:3.1 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://github.com/qos-ch/logback/archive/v_1.2.11.tar.gz -> logback-1.2.11.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
-_md5_=d2e1f809837a7787e31597c53b5785f0
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
+_md5_=7c02ed502eff289bb6e096001ab174f0
diff --git a/metadata/md5-cache/dev-java/lucene-2.4.1-r3 b/metadata/md5-cache/dev-java/lucene-2.4.1-r3
index 064e7d5bf48e..b79aaa428397 100644
--- a/metadata/md5-cache/dev-java/lucene-2.4.1-r3
+++ b/metadata/md5-cache/dev-java/lucene-2.4.1-r3
@@ -11,5 +11,5 @@ RDEPEND=dev-java/javacc:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 so
RESTRICT=!test? ( test )
SLOT=2.4
SRC_URI=https://archive.apache.org/dist/lucene/java/lucene-2.4.1-src.tar.gz -> lucene-2.4.1.tar.gz
-_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 cfb5f6911bb70204c94ceafd0372c716 multilib 4fbbbc98f236f1b43acd99476bc3cd85 toolchain-funcs e9da88162e7a3c60376e80c2c2adcdfb
_md5_=590e0bfc50c22320d0caef8faa97ffbd
diff --git a/metadata/md5-cache/dev-java/lz4-java-1.8.0-r1 b/metadata/md5-cache/dev-java/lz4-java-1.8.0-r1
index 912a35d54d4a..952e01ab3f11 100644
--- a/metadata/md5-cache/dev-java/lz4-java-1.8.0-r1
+++ b/metadata/md5-cache/dev-java/lz4-java-1.8.0-r1
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* app-arch/lz4:= >=dev-java/java-config-2.2.0-r3 sourc
RESTRICT=test !test? ( test )
SLOT=0
SRC_URI=https://github.com/lz4/lz4-java/archive/refs/tags/1.8.0.tar.gz -> lz4-java-1.8.0.tar.gz
-_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 cfb5f6911bb70204c94ceafd0372c716 multilib 4fbbbc98f236f1b43acd99476bc3cd85 toolchain-funcs e9da88162e7a3c60376e80c2c2adcdfb
_md5_=ea5f1bb76e73263100fbc2e08c2e1244
diff --git a/metadata/md5-cache/dev-java/lzma-19.00 b/metadata/md5-cache/dev-java/lzma-19.00
index 31034aefc343..cfbc3ee65132 100644
--- a/metadata/md5-cache/dev-java/lzma-19.00
+++ b/metadata/md5-cache/dev-java/lzma-19.00
@@ -6,10 +6,10 @@ EAPI=7
HOMEPAGE=https://www.7-zip.org/
INHERIT=java-pkg-2 java-pkg-simple
IUSE=doc source
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~arm x86
LICENSE=public-domain
RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=0
SRC_URI=https://www.7-zip.org/a/lzma1900.7z
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
-_md5_=9c54f1a52c6373711d85944874ee8e68
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
+_md5_=cdeef0e576c5b973c6822069ce21dd4b
diff --git a/metadata/md5-cache/dev-java/lzmajio-0.95-r3 b/metadata/md5-cache/dev-java/lzmajio-0.95-r3
index a6d343eb87a0..e92003584db7 100644
--- a/metadata/md5-cache/dev-java/lzmajio-0.95-r3
+++ b/metadata/md5-cache/dev-java/lzmajio-0.95-r3
@@ -5,10 +5,10 @@ EAPI=7
HOMEPAGE=https://contrapunctus.net/league/haques/lzmajio/ https://github.com/league/lzmajio
INHERIT=java-pkg-2 java-pkg-simple
IUSE=doc source
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~arm x86
LICENSE=LGPL-2.1
RDEPEND=dev-java/lzma:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=0
SRC_URI=https://github.com/league/lzmajio-0.95/archive/0.95.tar.gz -> lzmajio-0.95.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
-_md5_=ac596e1478d250cd543873f491fb9ad8
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
+_md5_=832d12b84d7f4124fb7091c8f2fe0f00
diff --git a/metadata/md5-cache/dev-java/maven-bin-3.8.2 b/metadata/md5-cache/dev-java/maven-bin-3.8.2
index e3f340267945..e870ccb4d53b 100644
--- a/metadata/md5-cache/dev-java/maven-bin-3.8.2
+++ b/metadata/md5-cache/dev-java/maven-bin-3.8.2
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3
SLOT=3.8
SRC_URI=mirror://apache/maven/maven-3/3.8.2/binaries/apache-maven-3.8.2-bin.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=70fd40cf2c49d35a9edcc067af05bb2c
diff --git a/metadata/md5-cache/dev-java/maven-bin-3.8.3 b/metadata/md5-cache/dev-java/maven-bin-3.8.3
index e4ffc1f2682f..97aaf439284a 100644
--- a/metadata/md5-cache/dev-java/maven-bin-3.8.3
+++ b/metadata/md5-cache/dev-java/maven-bin-3.8.3
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3
SLOT=3.8
SRC_URI=mirror://apache/maven/maven-3/3.8.3/binaries/apache-maven-3.8.3-bin.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=70fd40cf2c49d35a9edcc067af05bb2c
diff --git a/metadata/md5-cache/dev-java/maven-hawtjni-plugin-1.15 b/metadata/md5-cache/dev-java/maven-hawtjni-plugin-1.15
deleted file mode 100644
index 3bc1ac217598..000000000000
--- a/metadata/md5-cache/dev-java/maven-hawtjni-plugin-1.15
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.8 >=dev-java/java-config-2.2.0-r3
-DESCRIPTION=Maven plugin for the HawtJNI code generator (resources only)
-EAPI=6
-HOMEPAGE=https://github.com/fusesource/hawtjni
-INHERIT=java-pkg-2
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3
-SLOT=0
-SRC_URI=https://github.com/fusesource/hawtjni/archive/hawtjni-project-1.15.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 eapi7-ver 1a0a60ad07c8b32d2faba2d085dc0f24 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 9f813bb3c47cf2e60619a663b87c5f4e estack 055c42df72f76a4f45ec92b35e83cd56 eutils dab5d8ec471d025b79c9e6906bcf3bff java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 ltprune 97143780d341cc8d8f1d4c6187a36d29 multilib 4a33c9008e5ee30cb8840a3fdc24df2b preserve-libs a8e50acee31b5759b4df1f7707cae54b strip-linguas ac3ee41ee2d31d8c41a77c0838320cc7 toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8 vcs-clean d271b7bc7e6a009758d7d4ef749174e3 versionator d3fb3ba33acc3bbbdc4d7970227c100d wrapper 4a1902f969e5718126434fc35f3a0d9c
-_md5_=f03e6f50e1ab381789ee9c8f58589137
diff --git a/metadata/md5-cache/dev-java/mchange-commons-0.2.20 b/metadata/md5-cache/dev-java/mchange-commons-0.2.20
index eae8732f19fe..cdb73475e9fb 100644
--- a/metadata/md5-cache/dev-java/mchange-commons-0.2.20
+++ b/metadata/md5-cache/dev-java/mchange-commons-0.2.20
@@ -10,5 +10,5 @@ LICENSE=EPL-1.0 LGPL-2.1
RDEPEND=dev-java/log4j-api:2 dev-java/log4j-12-api:2 dev-java/log4j-core:2 dev-java/slf4j-api:0 dev-java/typesafe-config:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=0
SRC_URI=https://github.com/swaldman/mchange-commons-java/archive/refs/tags/v0.2.20.tar.gz -> mchange-commons-0.2.20.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=8ebed4da60f3daa69ceb2c883b13c2b6
diff --git a/metadata/md5-cache/dev-java/mersennetwister-0_pre23765-r2 b/metadata/md5-cache/dev-java/mersennetwister-0_pre23765-r2
index 04d9adba7914..9dbe677a42ed 100644
--- a/metadata/md5-cache/dev-java/mersennetwister-0_pre23765-r2
+++ b/metadata/md5-cache/dev-java/mersennetwister-0_pre23765-r2
@@ -5,10 +5,10 @@ EAPI=7
HOMEPAGE=http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/emt.html
INHERIT=java-pkg-2 java-pkg-simple
IUSE=doc source
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~arm x86
LICENSE=BSD
RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=0
SRC_URI=mirror://gentoo/mersennetwister-0_pre23765.tar.bz2
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
-_md5_=a68650c82c6a24bca015230d120a63f7
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
+_md5_=73a2f12f18234064dcc5eb41cc673b32
diff --git a/metadata/md5-cache/dev-java/metainf-services-1.7-r1 b/metadata/md5-cache/dev-java/metainf-services-1.7-r1
index 6394f12c8b5b..54f6db31904d 100644
--- a/metadata/md5-cache/dev-java/metainf-services-1.7-r1
+++ b/metadata/md5-cache/dev-java/metainf-services-1.7-r1
@@ -9,5 +9,5 @@ LICENSE=MIT
RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3
SLOT=0
SRC_URI=https://github.com/kohsuke/metainf-services/archive/metainf-services-1.7.tar.gz
-_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 cfb5f6911bb70204c94ceafd0372c716 multilib 4fbbbc98f236f1b43acd99476bc3cd85 toolchain-funcs e9da88162e7a3c60376e80c2c2adcdfb
_md5_=d7b5cd9746772f19122b9cd09a35982e
diff --git a/metadata/md5-cache/dev-java/microba-0.4.4.3-r2 b/metadata/md5-cache/dev-java/microba-0.4.4.3-r2
deleted file mode 100644
index 1799a3202fd0..000000000000
--- a/metadata/md5-cache/dev-java/microba-0.4.4.3-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=dev-java/jgraph:0 >=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Swing components for date operations and palettes
-EAPI=8
-HOMEPAGE=https://github.com/tdbear/microba
-INHERIT=java-pkg-2 java-pkg-simple
-IUSE=doc source
-KEYWORDS=amd64 x86
-LICENSE=BSD
-RDEPEND=dev-java/jgraph:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://github.com/tdbear/microba/archive/refs/tags/0.4.4.3.tar.gz -> microba-0.4.4.3.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
-_md5_=c811b7362e71e4127d891198e7b0a894
diff --git a/metadata/md5-cache/dev-java/miglayout-4.0-r1 b/metadata/md5-cache/dev-java/miglayout-4.0-r1
index 15da094e91f1..2d85c9030eba 100644
--- a/metadata/md5-cache/dev-java/miglayout-4.0-r1
+++ b/metadata/md5-cache/dev-java/miglayout-4.0-r1
@@ -11,5 +11,5 @@ LICENSE=BSD
RDEPEND=swt? ( dev-java/swt:3.7 ) >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=0
SRC_URI=http://www.migcalendar.com/miglayout/versions/4.0/miglayout-4.0-sources.jar
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=f81c067fd7f0cb198281b55425f123c1
diff --git a/metadata/md5-cache/dev-java/mill-bin-0.10.1 b/metadata/md5-cache/dev-java/mill-bin-0.10.1
deleted file mode 100644
index 3485b6906caf..000000000000
--- a/metadata/md5-cache/dev-java/mill-bin-0.10.1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=A Java/Scala build tool
-EAPI=8
-HOMEPAGE=https://com-lihaoyi.github.io/mill/
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=virtual/jre-1.8:*
-SLOT=0
-SRC_URI=https://github.com/com-lihaoyi/mill/releases/download/0.10.1/0.10.1-assembly -> mill-bin-0.10.1
-_md5_=2b4d4ada0013d7b03d498570ab932074
diff --git a/metadata/md5-cache/dev-java/mill-bin-0.10.2 b/metadata/md5-cache/dev-java/mill-bin-0.10.2
deleted file mode 100644
index 4e3620f54bff..000000000000
--- a/metadata/md5-cache/dev-java/mill-bin-0.10.2
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=A Java/Scala build tool
-EAPI=8
-HOMEPAGE=https://com-lihaoyi.github.io/mill/
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=virtual/jre-1.8:*
-SLOT=0
-SRC_URI=https://github.com/com-lihaoyi/mill/releases/download/0.10.2/0.10.2-assembly -> mill-bin-0.10.2
-_md5_=2b4d4ada0013d7b03d498570ab932074
diff --git a/metadata/md5-cache/dev-java/mill-bin-0.10.3 b/metadata/md5-cache/dev-java/mill-bin-0.10.3
deleted file mode 100644
index 55415f033704..000000000000
--- a/metadata/md5-cache/dev-java/mill-bin-0.10.3
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=A Java/Scala build tool
-EAPI=8
-HOMEPAGE=https://com-lihaoyi.github.io/mill/
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=virtual/jre-1.8:*
-SLOT=0
-SRC_URI=https://github.com/com-lihaoyi/mill/releases/download/0.10.3/0.10.3-assembly -> mill-bin-0.10.3
-_md5_=2b4d4ada0013d7b03d498570ab932074
diff --git a/metadata/md5-cache/dev-java/mill-bin-0.10.0 b/metadata/md5-cache/dev-java/mill-bin-0.10.4
index 2df69076a537..6f4941d8c1d1 100644
--- a/metadata/md5-cache/dev-java/mill-bin-0.10.0
+++ b/metadata/md5-cache/dev-java/mill-bin-0.10.4
@@ -6,5 +6,5 @@ KEYWORDS=amd64 x86
LICENSE=MIT
RDEPEND=>=virtual/jre-1.8:*
SLOT=0
-SRC_URI=https://github.com/com-lihaoyi/mill/releases/download/0.10.0/0.10.0-assembly -> mill-bin-0.10.0
+SRC_URI=https://github.com/com-lihaoyi/mill/releases/download/0.10.4/0.10.4-assembly -> mill-bin-0.10.4
_md5_=3a6ba799e376fdf7242adbdd130f301a
diff --git a/metadata/md5-cache/dev-java/mimepull-1.9.6-r2 b/metadata/md5-cache/dev-java/mimepull-1.9.6-r2
deleted file mode 100644
index f2624ed3c85a..000000000000
--- a/metadata/md5-cache/dev-java/mimepull-1.9.6-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Pull API for parsing MIME messages
-EAPI=6
-HOMEPAGE=http://java.net/projects/mimepull
-INHERIT=java-pkg-2 java-pkg-simple
-IUSE=source doc
-KEYWORDS=amd64 ~ppc64 x86
-LICENSE=CDDL
-RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://repo1.maven.org/maven2/org/jvnet/mimepull/mimepull/1.9.6/mimepull-1.9.6-sources.jar -> mimepull-1.9.6.jar
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 eapi7-ver 1a0a60ad07c8b32d2faba2d085dc0f24 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 9f813bb3c47cf2e60619a663b87c5f4e estack 055c42df72f76a4f45ec92b35e83cd56 eutils dab5d8ec471d025b79c9e6906bcf3bff java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 ltprune 97143780d341cc8d8f1d4c6187a36d29 multilib 4a33c9008e5ee30cb8840a3fdc24df2b preserve-libs a8e50acee31b5759b4df1f7707cae54b strip-linguas ac3ee41ee2d31d8c41a77c0838320cc7 toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8 vcs-clean d271b7bc7e6a009758d7d4ef749174e3 versionator d3fb3ba33acc3bbbdc4d7970227c100d wrapper 4a1902f969e5718126434fc35f3a0d9c
-_md5_=755bac65f7fda6a03cd3f0bfd7625693
diff --git a/metadata/md5-cache/dev-java/mockito-1.9.5-r2 b/metadata/md5-cache/dev-java/mockito-1.9.5-r2
index 912fe7f28a70..5df5c5f9af0f 100644
--- a/metadata/md5-cache/dev-java/mockito-1.9.5-r2
+++ b/metadata/md5-cache/dev-java/mockito-1.9.5-r2
@@ -11,5 +11,5 @@ LICENSE=MIT
RDEPEND=dev-java/ant-core:0 dev-java/hamcrest-core:0 dev-java/junit:4 dev-java/objenesis:0 virtual/jre:1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=0
SRC_URI=https://mockito.googlecode.com/files/mockito-1.9.5.zip
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=4976555477c891d9c12d81fd9f8b842c
diff --git a/metadata/md5-cache/dev-java/mockito-4.4.0 b/metadata/md5-cache/dev-java/mockito-4.4.0
index bf59ef3b31d7..e03c03ae7bbb 100644
--- a/metadata/md5-cache/dev-java/mockito-4.4.0
+++ b/metadata/md5-cache/dev-java/mockito-4.4.0
@@ -5,10 +5,10 @@ EAPI=8
HOMEPAGE=https://github.com/mockito/mockito
INHERIT=java-pkg-2 java-pkg-simple
IUSE=doc source
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ppc64 x86
LICENSE=MIT
RDEPEND=>=virtual/jre-1.8:* dev-java/byte-buddy:0 dev-java/byte-buddy-agent:0 dev-java/junit:4 dev-java/objenesis:0 dev-java/opentest4j:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=4
SRC_URI=https://codeload.github.com/mockito/mockito/tar.gz/v4.4.0 -> mockito-4.4.0.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
-_md5_=dbdc51a283c629b3a94da7e5d9b2cdec
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
+_md5_=87a674431a81a29a7384f699b388b782
diff --git a/metadata/md5-cache/dev-java/mockito-4.6.0 b/metadata/md5-cache/dev-java/mockito-4.6.0
new file mode 100644
index 000000000000..d5db48f9930b
--- /dev/null
+++ b/metadata/md5-cache/dev-java/mockito-4.6.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=>=virtual/jdk-1.8:* dev-java/byte-buddy:0 dev-java/byte-buddy-agent:0 dev-java/junit:4 dev-java/objenesis:0 dev-java/opentest4j:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=Mockito mock objects library core API and implementation
+EAPI=8
+HOMEPAGE=https://github.com/mockito/mockito
+INHERIT=java-pkg-2 java-pkg-simple
+IUSE=doc source
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=MIT
+RDEPEND=>=virtual/jre-1.8:* dev-java/byte-buddy:0 dev-java/byte-buddy-agent:0 dev-java/junit:4 dev-java/objenesis:0 dev-java/opentest4j:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+SLOT=4
+SRC_URI=https://github.com/mockito/mockito/archive/v4.6.0.tar.gz -> mockito-4.6.0.tar.gz
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
+_md5_=2ab3ae994fb118ffef05cff0512d87fa
diff --git a/metadata/md5-cache/dev-java/mockito-4.6.1 b/metadata/md5-cache/dev-java/mockito-4.6.1
new file mode 100644
index 000000000000..f30c7b7a03e4
--- /dev/null
+++ b/metadata/md5-cache/dev-java/mockito-4.6.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=dev-java/junit:4 >=virtual/jdk-1.8:* dev-java/byte-buddy:0 dev-java/byte-buddy-agent:0 dev-java/objenesis:0 dev-java/opentest4j:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=Mockito mock objects library core API and implementation
+EAPI=8
+HOMEPAGE=https://github.com/mockito/mockito
+INHERIT=java-pkg-2 java-pkg-simple
+IUSE=doc source
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=MIT
+RDEPEND=>=virtual/jre-1.8:* dev-java/byte-buddy:0 dev-java/byte-buddy-agent:0 dev-java/objenesis:0 dev-java/opentest4j:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+SLOT=4
+SRC_URI=https://github.com/mockito/mockito/archive/v4.6.1.tar.gz -> mockito-4.6.1.tar.gz
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
+_md5_=3990062b398f87d77999ffec5a2815df
diff --git a/metadata/md5-cache/dev-java/msv-20130601 b/metadata/md5-cache/dev-java/msv-20130601
index eaab3cd545e9..fb6019b5dd80 100644
--- a/metadata/md5-cache/dev-java/msv-20130601
+++ b/metadata/md5-cache/dev-java/msv-20130601
@@ -11,5 +11,5 @@ LICENSE=BSD Apache-2.0
RDEPEND=dev-java/iso-relax:0 dev-java/relaxng-datatype:0 dev-java/xml-commons-resolver:0 dev-java/xsdlib:0 dev-java/xerces:2 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=0
SRC_URI=https://search.maven.org/remotecontent?filepath=net/java/dev/msv/msv-core/2013.6.1/msv-core-2013.6.1-sources.jar
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=b88c98513deb1fa0d5a4475745e534a5
diff --git a/metadata/md5-cache/dev-java/mvel-2.3.2-r1 b/metadata/md5-cache/dev-java/mvel-2.3.2-r1
index 6d40e5a48058..f4430f97b4b2 100644
--- a/metadata/md5-cache/dev-java/mvel-2.3.2-r1
+++ b/metadata/md5-cache/dev-java/mvel-2.3.2-r1
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
RESTRICT=!test? ( test )
SLOT=2.3
SRC_URI=https://github.com/mvel/mvel/archive/refs/tags/mvel2-2.3.2.Final.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=36977dbfaeea9af5404e6b16fb157e42
diff --git a/metadata/md5-cache/dev-java/netty-4.1.35 b/metadata/md5-cache/dev-java/netty-4.1.35
index af7779eb2bee..1ccb907c8a6a 100644
--- a/metadata/md5-cache/dev-java/netty-4.1.35
+++ b/metadata/md5-cache/dev-java/netty-4.1.35
@@ -5,11 +5,11 @@ EAPI=8
HOMEPAGE=https://netty.io/
INHERIT=java-pkg-2 java-pkg-simple
IUSE=doc source test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ppc64 x86
LICENSE=Apache-2.0
RDEPEND=>=virtual/jre-1.8:* dev-java/commons-logging:0 dev-java/jctools-core:0 dev-java/log4j-12-api:2 dev-java/slf4j-simple:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://github.com/netty/netty/archive/refs/tags/netty-4.1.35.Final.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
-_md5_=449c1fcdc263291464441dadf8c476ec
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
+_md5_=21e7dd2e78a62244587f0b60bc40a3f1
diff --git a/metadata/md5-cache/dev-java/netty-4.1.35-r1 b/metadata/md5-cache/dev-java/netty-4.1.35-r1
new file mode 100644
index 000000000000..7b06a5844ef4
--- /dev/null
+++ b/metadata/md5-cache/dev-java/netty-4.1.35-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=>=virtual/jdk-1.8:* dev-java/commons-logging:0 dev-java/jctools-core:3 dev-java/log4j-12-api:2 dev-java/slf4j-simple:0 test? ( dev-java/javassist:3 dev-java/hamcrest-library:1.3 dev-java/logback-classic:0 dev-java/log4j-core:2 dev-java/mockito:4 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
+DESCRIPTION=Async event-driven framework for high performance network applications
+EAPI=8
+HOMEPAGE=https://netty.io/
+INHERIT=java-pkg-2 java-pkg-simple
+IUSE=doc source test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=virtual/jre-1.8:* dev-java/commons-logging:0 dev-java/jctools-core:3 dev-java/log4j-12-api:2 dev-java/slf4j-simple:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/netty/netty/archive/refs/tags/netty-4.1.35.Final.tar.gz
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
+_md5_=b35c975e34a4e3ad7185b9ca116bccbb
diff --git a/metadata/md5-cache/dev-java/netty-buffer-4.0.36 b/metadata/md5-cache/dev-java/netty-buffer-4.0.36
index 2f44c29bc21e..9c5532692381 100644
--- a/metadata/md5-cache/dev-java/netty-buffer-4.0.36
+++ b/metadata/md5-cache/dev-java/netty-buffer-4.0.36
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.7 ~dev-java/netty-common-4.0.36:0 >=dev-java/java-config
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://github.com/netty/netty/archive/netty-4.0.36.Final.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 eapi7-ver 1a0a60ad07c8b32d2faba2d085dc0f24 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 9f813bb3c47cf2e60619a663b87c5f4e estack 055c42df72f76a4f45ec92b35e83cd56 eutils dab5d8ec471d025b79c9e6906bcf3bff java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 ltprune 97143780d341cc8d8f1d4c6187a36d29 multilib 4a33c9008e5ee30cb8840a3fdc24df2b preserve-libs a8e50acee31b5759b4df1f7707cae54b strip-linguas ac3ee41ee2d31d8c41a77c0838320cc7 toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8 vcs-clean d271b7bc7e6a009758d7d4ef749174e3 versionator d3fb3ba33acc3bbbdc4d7970227c100d wrapper 4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=desktop 22952d8f27cac191d75529d4c38e6bfa eapi7-ver 1a0a60ad07c8b32d2faba2d085dc0f24 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 28f0f3c0226306ec5f49e13bf851f171 estack 055c42df72f76a4f45ec92b35e83cd56 eutils dab5d8ec471d025b79c9e6906bcf3bff java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716 ltprune 97143780d341cc8d8f1d4c6187a36d29 multilib 4fbbbc98f236f1b43acd99476bc3cd85 preserve-libs a8e50acee31b5759b4df1f7707cae54b strip-linguas ac3ee41ee2d31d8c41a77c0838320cc7 toolchain-funcs e9da88162e7a3c60376e80c2c2adcdfb vcs-clean d271b7bc7e6a009758d7d4ef749174e3 versionator d3fb3ba33acc3bbbdc4d7970227c100d wrapper 4a1902f969e5718126434fc35f3a0d9c
_md5_=d42543efe23963c10a983a500f06053d
diff --git a/metadata/md5-cache/dev-java/netty-buffer-4.0.36-r1 b/metadata/md5-cache/dev-java/netty-buffer-4.0.36-r1
index 9f56cd6b0ce7..ce3492ad75e7 100644
--- a/metadata/md5-cache/dev-java/netty-buffer-4.0.36-r1
+++ b/metadata/md5-cache/dev-java/netty-buffer-4.0.36-r1
@@ -11,5 +11,5 @@ RDEPEND=dev-java/netty-common:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://github.com/netty/netty/archive/refs/tags/netty-4.0.36.Final.tar.gz
-_eclasses_=check-reqs 82234bf011d5453330773cd5fc3f0199 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=check-reqs 5e6dfbd7a8d3238a79f009fae7ac469c java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=6f6b407145ed84e4f8764847194e9752
diff --git a/metadata/md5-cache/dev-java/netty-common-4.0.36-r2 b/metadata/md5-cache/dev-java/netty-common-4.0.36-r2
index dfb3be4f5b93..751a4f991162 100644
--- a/metadata/md5-cache/dev-java/netty-common-4.0.36-r2
+++ b/metadata/md5-cache/dev-java/netty-common-4.0.36-r2
@@ -11,5 +11,5 @@ RDEPEND=dev-java/commons-logging:0 dev-java/javassist:3 dev-java/log4j-12-api:2
RESTRICT=test
SLOT=0
SRC_URI=https://github.com/netty/netty/archive/netty-4.0.36.Final.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=9d99c6c4cb4f0abdda088fc4fa5e9a63
diff --git a/metadata/md5-cache/dev-java/netty-transport-4.0.36 b/metadata/md5-cache/dev-java/netty-transport-4.0.36
index a3773c8943ca..037279fd6339 100644
--- a/metadata/md5-cache/dev-java/netty-transport-4.0.36
+++ b/metadata/md5-cache/dev-java/netty-transport-4.0.36
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.7 ~dev-java/netty-buffer-4.0.36:0 ~dev-java/netty-common
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://github.com/netty/netty/archive/netty-4.0.36.Final.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 eapi7-ver 1a0a60ad07c8b32d2faba2d085dc0f24 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 9f813bb3c47cf2e60619a663b87c5f4e estack 055c42df72f76a4f45ec92b35e83cd56 eutils dab5d8ec471d025b79c9e6906bcf3bff java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 ltprune 97143780d341cc8d8f1d4c6187a36d29 multilib 4a33c9008e5ee30cb8840a3fdc24df2b preserve-libs a8e50acee31b5759b4df1f7707cae54b strip-linguas ac3ee41ee2d31d8c41a77c0838320cc7 toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8 vcs-clean d271b7bc7e6a009758d7d4ef749174e3 versionator d3fb3ba33acc3bbbdc4d7970227c100d wrapper 4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=desktop 22952d8f27cac191d75529d4c38e6bfa eapi7-ver 1a0a60ad07c8b32d2faba2d085dc0f24 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 28f0f3c0226306ec5f49e13bf851f171 estack 055c42df72f76a4f45ec92b35e83cd56 eutils dab5d8ec471d025b79c9e6906bcf3bff java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716 ltprune 97143780d341cc8d8f1d4c6187a36d29 multilib 4fbbbc98f236f1b43acd99476bc3cd85 preserve-libs a8e50acee31b5759b4df1f7707cae54b strip-linguas ac3ee41ee2d31d8c41a77c0838320cc7 toolchain-funcs e9da88162e7a3c60376e80c2c2adcdfb vcs-clean d271b7bc7e6a009758d7d4ef749174e3 versionator d3fb3ba33acc3bbbdc4d7970227c100d wrapper 4a1902f969e5718126434fc35f3a0d9c
_md5_=daa26d6c482ae201228a945f47e696f3
diff --git a/metadata/md5-cache/dev-java/objenesis-3.2 b/metadata/md5-cache/dev-java/objenesis-3.2
index 020aefb73802..f6371b63e031 100644
--- a/metadata/md5-cache/dev-java/objenesis-3.2
+++ b/metadata/md5-cache/dev-java/objenesis-3.2
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://github.com/easymock/objenesis/archive/refs/tags/3.2.tar.gz -> objenesis-3.2.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=06fba41631ebab0c728e0e0661211a34
diff --git a/metadata/md5-cache/dev-java/objenesis-test-3.2 b/metadata/md5-cache/dev-java/objenesis-test-3.2
index bd742d3fc8c9..a02ce94262b1 100644
--- a/metadata/md5-cache/dev-java/objenesis-test-3.2
+++ b/metadata/md5-cache/dev-java/objenesis-test-3.2
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=0
SRC_URI=https://github.com/easymock/objenesis/archive/refs/tags/3.2.tar.gz -> objenesis-3.2.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=f281541877d897bfd7500ea353a84ca9
diff --git a/metadata/md5-cache/dev-java/openjdk-11.0.14_p9-r1 b/metadata/md5-cache/dev-java/openjdk-11.0.14_p9-r1
deleted file mode 100644
index 21c206164d2c..000000000000
--- a/metadata/md5-cache/dev-java/openjdk-11.0.14_p9-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm pretend setup
-DEPEND=media-libs/freetype:2= media-libs/giflib:0/7 media-libs/harfbuzz:= media-libs/libpng:0= media-libs/lcms:2= sys-libs/zlib virtual/jpeg:0= systemtap? ( dev-util/systemtap ) app-arch/zip media-libs/alsa-lib net-print/cups x11-base/xorg-proto x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXt x11-libs/libXtst javafx? ( dev-java/openjfx:11= ) system-bootstrap? ( || ( dev-java/openjdk-bin:11[gentoo-vm(+)] dev-java/openjdk:11[gentoo-vm(+)] ) ) >=dev-java/java-config-2.2.0-r3 dev-java/java-config app-eselect/eselect-java
-DESCRIPTION=Open source implementation of the Java programming language
-EAPI=7
-HOMEPAGE=https://openjdk.java.net
-INHERIT=eapi8-dosym check-reqs flag-o-matic java-pkg-2 java-vm-2 multiprocessing toolchain-funcs
-IUSE=alsa big-endian cups debug doc examples headless-awt javafx +jbootstrap selinux source system-bootstrap systemtap
-KEYWORDS=amd64 ~arm arm64 ppc64 ~riscv x86
-LICENSE=GPL-2
-RDEPEND=media-libs/freetype:2= media-libs/giflib:0/7 media-libs/harfbuzz:= media-libs/libpng:0= media-libs/lcms:2= sys-libs/zlib virtual/jpeg:0= systemtap? ( dev-util/systemtap ) >=sys-apps/baselayout-java-0.1.0-r1 !headless-awt? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXt x11-libs/libXtst ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) selinux? ( sec-policy/selinux-java ) >=dev-java/java-config-2.2.0-r3 dev-java/java-config app-eselect/eselect-java
-REQUIRED_USE=javafx? ( alsa !headless-awt ) !system-bootstrap? ( jbootstrap )
-SLOT=11
-SRC_URI=https://github.com/openjdk/jdk11u/archive/refs/tags/jdk-11.0.14-ga.tar.gz -> openjdk-11.0.14_p9.tar.gz !system-bootstrap? ( ppc64? ( big-endian? ( https://dev.gentoo.org/~arthurzam/distfiles/dev-java/openjdk/openjdk-bootstrap-11.0.13_p8-ppc64.tar.xz ) ) riscv? ( https://dev.gentoo.org/~arthurzam/distfiles/dev-java/openjdk/openjdk-bootstrap-11.0.14_p9-riscv.tar.xz ) x86? ( https://dev.gentoo.org/~arthurzam/distfiles/dev-java/openjdk/openjdk-bootstrap-11.0.13_p8-x86.tar.xz ) ) riscv? ( https://dev.gentoo.org/~arthurzam/distfiles/dev-java/openjdk/openjdk-11.0.14-riscv.patch.xz )
-_eclasses_=check-reqs 82234bf011d5453330773cd5fc3f0199 eapi8-dosym cd7d420bb5be5ee079f27239ce76b8f5 edos2unix 33e347e171066657f91f8b0c72ec8773 eutils dab5d8ec471d025b79c9e6906bcf3bff flag-o-matic a500d7cc40da3de38c361e889153bdf7 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 java-vm-2 69658c0814b27f9cbe466a24e6621d23 multilib 4a33c9008e5ee30cb8840a3fdc24df2b multiprocessing b4e253ab22cef7b1085e9b67c7a3b730 pax-utils 91d47e5d20627c717aa878b9167c62a8 prefix eab3c99d77fe00506c109c8a736186f7 strip-linguas ac3ee41ee2d31d8c41a77c0838320cc7 toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8 wrapper 4a1902f969e5718126434fc35f3a0d9c xdg-utils fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=876000fc7e1fa1cd4a379e6fc6576c01
diff --git a/metadata/md5-cache/dev-java/openjdk-11.0.15_p10 b/metadata/md5-cache/dev-java/openjdk-11.0.15_p10
index b1fd8cb12683..62d209d5c67d 100644
--- a/metadata/md5-cache/dev-java/openjdk-11.0.15_p10
+++ b/metadata/md5-cache/dev-java/openjdk-11.0.15_p10
@@ -1,3 +1,4 @@
+BDEPEND=app-arch/unzip
DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm pretend setup
DEPEND=media-libs/freetype:2= media-libs/giflib:0/7 media-libs/harfbuzz:= media-libs/libpng:0= media-libs/lcms:2= sys-libs/zlib virtual/jpeg:0= systemtap? ( dev-util/systemtap ) app-arch/zip media-libs/alsa-lib net-print/cups x11-base/xorg-proto x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXt x11-libs/libXtst javafx? ( dev-java/openjfx:11= ) system-bootstrap? ( || ( dev-java/openjdk-bin:11[gentoo-vm(+)] dev-java/openjdk:11[gentoo-vm(+)] ) ) >=dev-java/java-config-2.2.0-r3 dev-java/java-config app-eselect/eselect-java
DESCRIPTION=Open source implementation of the Java programming language
@@ -5,11 +6,11 @@ EAPI=7
HOMEPAGE=https://openjdk.java.net
INHERIT=eapi8-dosym check-reqs flag-o-matic java-pkg-2 java-vm-2 multiprocessing toolchain-funcs
IUSE=alsa big-endian cups debug doc examples headless-awt javafx +jbootstrap selinux source system-bootstrap systemtap
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ppc64 ~riscv x86
LICENSE=GPL-2
RDEPEND=media-libs/freetype:2= media-libs/giflib:0/7 media-libs/harfbuzz:= media-libs/libpng:0= media-libs/lcms:2= sys-libs/zlib virtual/jpeg:0= systemtap? ( dev-util/systemtap ) >=sys-apps/baselayout-java-0.1.0-r1 !headless-awt? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXt x11-libs/libXtst ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) selinux? ( sec-policy/selinux-java ) >=dev-java/java-config-2.2.0-r3 dev-java/java-config app-eselect/eselect-java
REQUIRED_USE=javafx? ( alsa !headless-awt ) !system-bootstrap? ( jbootstrap )
SLOT=11
SRC_URI=https://github.com/openjdk/jdk11u/archive/refs/tags/jdk-11.0.15-ga.tar.gz -> openjdk-11.0.15_p10.tar.gz !system-bootstrap? ( ppc64? ( big-endian? ( https://dev.gentoo.org/~arthurzam/distfiles/dev-java/openjdk/openjdk-bootstrap-11.0.13_p8-ppc64.tar.xz ) ) riscv? ( https://dev.gentoo.org/~arthurzam/distfiles/dev-java/openjdk/openjdk-bootstrap-11.0.14_p9-riscv.tar.xz ) x86? ( https://dev.gentoo.org/~arthurzam/distfiles/dev-java/openjdk/openjdk-bootstrap-11.0.13_p8-x86.tar.xz ) ) riscv? ( https://dev.gentoo.org/~arthurzam/distfiles/dev-java/openjdk/openjdk-11.0.14-riscv.patch.xz )
-_eclasses_=check-reqs 82234bf011d5453330773cd5fc3f0199 eapi8-dosym cd7d420bb5be5ee079f27239ce76b8f5 edos2unix 33e347e171066657f91f8b0c72ec8773 eutils dab5d8ec471d025b79c9e6906bcf3bff flag-o-matic a500d7cc40da3de38c361e889153bdf7 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 java-vm-2 69658c0814b27f9cbe466a24e6621d23 multilib 4a33c9008e5ee30cb8840a3fdc24df2b multiprocessing b4e253ab22cef7b1085e9b67c7a3b730 pax-utils 91d47e5d20627c717aa878b9167c62a8 prefix eab3c99d77fe00506c109c8a736186f7 strip-linguas ac3ee41ee2d31d8c41a77c0838320cc7 toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8 wrapper 4a1902f969e5718126434fc35f3a0d9c xdg-utils fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=9c10e8f57fc8148bcdb150923c0d37ab
+_eclasses_=check-reqs 5e6dfbd7a8d3238a79f009fae7ac469c eapi8-dosym cd7d420bb5be5ee079f27239ce76b8f5 edos2unix 33e347e171066657f91f8b0c72ec8773 eutils dab5d8ec471d025b79c9e6906bcf3bff flag-o-matic a3abd6002fafb3022597be6b8d01f88b java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 cfb5f6911bb70204c94ceafd0372c716 java-vm-2 5dd4303f0b659986f096e65e566b9701 multilib 4fbbbc98f236f1b43acd99476bc3cd85 multiprocessing b4e253ab22cef7b1085e9b67c7a3b730 pax-utils 91d47e5d20627c717aa878b9167c62a8 prefix eab3c99d77fe00506c109c8a736186f7 strip-linguas ac3ee41ee2d31d8c41a77c0838320cc7 toolchain-funcs e9da88162e7a3c60376e80c2c2adcdfb wrapper 4a1902f969e5718126434fc35f3a0d9c xdg-utils fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=1c0ebbf4ac1b8d02a9abd88eac574d05
diff --git a/metadata/md5-cache/dev-java/openjdk-17.0.2_p8 b/metadata/md5-cache/dev-java/openjdk-17.0.2_p8
deleted file mode 100644
index dcee77f3f23b..000000000000
--- a/metadata/md5-cache/dev-java/openjdk-17.0.2_p8
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm pretend setup
-DEPEND=media-libs/freetype:2= media-libs/giflib:0/7 media-libs/harfbuzz:= media-libs/libpng:0= media-libs/lcms:2= sys-libs/zlib virtual/jpeg:0= systemtap? ( dev-util/systemtap ) app-arch/zip media-libs/alsa-lib net-print/cups x11-base/xorg-proto x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXt x11-libs/libXtst javafx? ( dev-java/openjfx:17= ) system-bootstrap? ( || ( dev-java/openjdk-bin:17 dev-java/openjdk:17 ) ) >=dev-java/java-config-2.2.0-r3 dev-java/java-config app-eselect/eselect-java
-DESCRIPTION=Open source implementation of the Java programming language
-EAPI=7
-HOMEPAGE=https://openjdk.java.net
-INHERIT=check-reqs eapi8-dosym flag-o-matic java-pkg-2 java-vm-2 multiprocessing toolchain-funcs
-IUSE=alsa big-endian cups debug doc examples gentoo-vm headless-awt javafx +jbootstrap selinux source system-bootstrap systemtap
-KEYWORDS=amd64 ~arm arm64 ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=media-libs/freetype:2= media-libs/giflib:0/7 media-libs/harfbuzz:= media-libs/libpng:0= media-libs/lcms:2= sys-libs/zlib virtual/jpeg:0= systemtap? ( dev-util/systemtap ) >=sys-apps/baselayout-java-0.1.0-r1 !headless-awt? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXt x11-libs/libXtst ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) selinux? ( sec-policy/selinux-java ) >=dev-java/java-config-2.2.0-r3 dev-java/java-config app-eselect/eselect-java
-REQUIRED_USE=javafx? ( alsa !headless-awt ) !system-bootstrap? ( jbootstrap )
-SLOT=17
-SRC_URI=https://github.com/openjdk/jdk17u/archive/refs/tags/jdk-17.0.2+8.tar.gz -> openjdk-17.0.2_p8.tar.gz !system-bootstrap? ( arm64? ( elibc_musl? ( https://dev.gentoo.org/~arthurzam/distfiles/dev-java/openjdk/openjdk-bootstrap-17.0.2_p8-arm64-musl.tar.xz ) ) ppc64? ( big-endian? ( https://dev.gentoo.org/~arthurzam/distfiles/dev-java/openjdk/openjdk-bootstrap-17.0.1_p12-ppc64.tar.xz ) ) x86? ( https://dev.gentoo.org/~arthurzam/distfiles/dev-java/openjdk/openjdk-bootstrap-17.0.1_p12-x86.tar.xz ) )
-_eclasses_=check-reqs 82234bf011d5453330773cd5fc3f0199 eapi8-dosym cd7d420bb5be5ee079f27239ce76b8f5 edos2unix 33e347e171066657f91f8b0c72ec8773 eutils dab5d8ec471d025b79c9e6906bcf3bff flag-o-matic a500d7cc40da3de38c361e889153bdf7 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 java-vm-2 69658c0814b27f9cbe466a24e6621d23 multilib 4a33c9008e5ee30cb8840a3fdc24df2b multiprocessing b4e253ab22cef7b1085e9b67c7a3b730 pax-utils 91d47e5d20627c717aa878b9167c62a8 prefix eab3c99d77fe00506c109c8a736186f7 strip-linguas ac3ee41ee2d31d8c41a77c0838320cc7 toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8 wrapper 4a1902f969e5718126434fc35f3a0d9c xdg-utils fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=c8765ca9892cc67510f9c07f15004765
diff --git a/metadata/md5-cache/dev-java/openjdk-17.0.3_p7 b/metadata/md5-cache/dev-java/openjdk-17.0.3_p7
index 839ec718fcaf..b56c45dab9cf 100644
--- a/metadata/md5-cache/dev-java/openjdk-17.0.3_p7
+++ b/metadata/md5-cache/dev-java/openjdk-17.0.3_p7
@@ -1,15 +1,16 @@
+BDEPEND=app-arch/unzip
DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm pretend setup
DEPEND=media-libs/freetype:2= media-libs/giflib:0/7 media-libs/harfbuzz:= media-libs/libpng:0= media-libs/lcms:2= sys-libs/zlib virtual/jpeg:0= systemtap? ( dev-util/systemtap ) app-arch/zip media-libs/alsa-lib net-print/cups x11-base/xorg-proto x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXt x11-libs/libXtst javafx? ( dev-java/openjfx:17= ) system-bootstrap? ( || ( dev-java/openjdk-bin:17 dev-java/openjdk:17 ) ) >=dev-java/java-config-2.2.0-r3 dev-java/java-config app-eselect/eselect-java
DESCRIPTION=Open source implementation of the Java programming language
EAPI=7
HOMEPAGE=https://openjdk.java.net
INHERIT=check-reqs eapi8-dosym flag-o-matic java-pkg-2 java-vm-2 multiprocessing toolchain-funcs
-IUSE=alsa big-endian cups debug doc examples gentoo-vm headless-awt javafx +jbootstrap selinux source system-bootstrap systemtap
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+IUSE=alsa big-endian cups debug doc examples +gentoo-vm headless-awt javafx +jbootstrap selinux source system-bootstrap systemtap
+KEYWORDS=amd64 ~arm arm64 ppc64 ~riscv x86
LICENSE=GPL-2
RDEPEND=media-libs/freetype:2= media-libs/giflib:0/7 media-libs/harfbuzz:= media-libs/libpng:0= media-libs/lcms:2= sys-libs/zlib virtual/jpeg:0= systemtap? ( dev-util/systemtap ) >=sys-apps/baselayout-java-0.1.0-r1 !headless-awt? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXt x11-libs/libXtst ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) selinux? ( sec-policy/selinux-java ) >=dev-java/java-config-2.2.0-r3 dev-java/java-config app-eselect/eselect-java
REQUIRED_USE=javafx? ( alsa !headless-awt ) !system-bootstrap? ( jbootstrap )
SLOT=17
-SRC_URI=https://github.com/openjdk/jdk17u/archive/refs/tags/jdk-17.0.3+7.tar.gz -> openjdk-17.0.3_p7.tar.gz !system-bootstrap? ( arm64? ( elibc_musl? ( https://dev.gentoo.org/~arthurzam/distfiles/dev-java/openjdk/openjdk-bootstrap-17.0.2_p8-arm64-musl.tar.xz ) ) ppc64? ( big-endian? ( https://dev.gentoo.org/~arthurzam/distfiles/dev-java/openjdk/openjdk-bootstrap-17.0.1_p12-ppc64.tar.xz ) ) x86? ( https://dev.gentoo.org/~arthurzam/distfiles/dev-java/openjdk/openjdk-bootstrap-17.0.1_p12-x86.tar.xz ) )
-_eclasses_=check-reqs 82234bf011d5453330773cd5fc3f0199 eapi8-dosym cd7d420bb5be5ee079f27239ce76b8f5 edos2unix 33e347e171066657f91f8b0c72ec8773 eutils dab5d8ec471d025b79c9e6906bcf3bff flag-o-matic a500d7cc40da3de38c361e889153bdf7 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 java-vm-2 69658c0814b27f9cbe466a24e6621d23 multilib 4a33c9008e5ee30cb8840a3fdc24df2b multiprocessing b4e253ab22cef7b1085e9b67c7a3b730 pax-utils 91d47e5d20627c717aa878b9167c62a8 prefix eab3c99d77fe00506c109c8a736186f7 strip-linguas ac3ee41ee2d31d8c41a77c0838320cc7 toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8 wrapper 4a1902f969e5718126434fc35f3a0d9c xdg-utils fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=13517dc2f281e48786c97286c064a899
+SRC_URI=https://github.com/openjdk/jdk17u/archive/refs/tags/jdk-17.0.3+7.tar.gz -> openjdk-17.0.3_p7.tar.gz !system-bootstrap? ( arm64? ( elibc_musl? ( https://dev.gentoo.org/~arthurzam/distfiles/dev-java/openjdk/openjdk-bootstrap-17.0.2_p8-arm64-musl.tar.xz ) ) ppc64? ( big-endian? ( https://dev.gentoo.org/~arthurzam/distfiles/dev-java/openjdk/openjdk-bootstrap-17.0.1_p12-ppc64.tar.xz ) ) x86? ( https://dev.gentoo.org/~arthurzam/distfiles/dev-java/openjdk/openjdk-bootstrap-17.0.1_p12-x86.tar.xz ) riscv? ( https://dev.gentoo.org/~arthurzam/distfiles/dev-java/openjdk/openjdk-bootstrap-17.0.3_p7-riscv.tar.xz ) ) riscv? ( https://dev.gentoo.org/~arthurzam/distfiles/dev-java/openjdk/openjdk-17.0.3-riscv.patch.xz )
+_eclasses_=check-reqs 5e6dfbd7a8d3238a79f009fae7ac469c eapi8-dosym cd7d420bb5be5ee079f27239ce76b8f5 edos2unix 33e347e171066657f91f8b0c72ec8773 eutils dab5d8ec471d025b79c9e6906bcf3bff flag-o-matic a3abd6002fafb3022597be6b8d01f88b java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 cfb5f6911bb70204c94ceafd0372c716 java-vm-2 5dd4303f0b659986f096e65e566b9701 multilib 4fbbbc98f236f1b43acd99476bc3cd85 multiprocessing b4e253ab22cef7b1085e9b67c7a3b730 pax-utils 91d47e5d20627c717aa878b9167c62a8 prefix eab3c99d77fe00506c109c8a736186f7 strip-linguas ac3ee41ee2d31d8c41a77c0838320cc7 toolchain-funcs e9da88162e7a3c60376e80c2c2adcdfb wrapper 4a1902f969e5718126434fc35f3a0d9c xdg-utils fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=0a6163ff7601c985dab5778ae3bd8978
diff --git a/metadata/md5-cache/dev-java/openjdk-8.322_p06 b/metadata/md5-cache/dev-java/openjdk-8.322_p06
deleted file mode 100644
index 12f66555274e..000000000000
--- a/metadata/md5-cache/dev-java/openjdk-8.322_p06
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm pretend setup
-DEPEND=media-libs/freetype:2= media-libs/giflib:0/7 sys-libs/zlib app-arch/zip media-libs/alsa-lib net-print/cups virtual/pkgconfig x11-base/xorg-proto x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrender x11-libs/libXt x11-libs/libXtst || ( dev-java/openjdk-bin:8 dev-java/icedtea-bin:8 dev-java/openjdk:8 dev-java/icedtea:8 ) >=dev-java/java-config-2.2.0-r3 dev-java/java-config app-eselect/eselect-java
-DESCRIPTION=Open source implementation of the Java programming language
-EAPI=7
-HOMEPAGE=https://openjdk.java.net
-INHERIT=check-reqs eapi8-dosym flag-o-matic java-pkg-2 java-vm-2 multiprocessing toolchain-funcs
-IUSE=alsa debug cups doc examples headless-awt javafx +jbootstrap selinux source
-KEYWORDS=amd64 arm64 ppc64 x86
-LICENSE=GPL-2
-PDEPEND=javafx? ( dev-java/openjfx:8 )
-RDEPEND=media-libs/freetype:2= media-libs/giflib:0/7 sys-libs/zlib >=sys-apps/baselayout-java-0.1.0-r1 !headless-awt? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrender x11-libs/libXt x11-libs/libXtst ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) selinux? ( sec-policy/selinux-java ) >=dev-java/java-config-2.2.0-r3 dev-java/java-config app-eselect/eselect-java
-SLOT=8
-SRC_URI=https://github.com/openjdk/jdk8u/archive/refs/tags/jdk8u322-ga.tar.gz -> openjdk-8.322_p06.tar.gz
-_eclasses_=check-reqs 82234bf011d5453330773cd5fc3f0199 eapi8-dosym cd7d420bb5be5ee079f27239ce76b8f5 edos2unix 33e347e171066657f91f8b0c72ec8773 eutils dab5d8ec471d025b79c9e6906bcf3bff flag-o-matic a500d7cc40da3de38c361e889153bdf7 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 java-vm-2 69658c0814b27f9cbe466a24e6621d23 multilib 4a33c9008e5ee30cb8840a3fdc24df2b multiprocessing b4e253ab22cef7b1085e9b67c7a3b730 pax-utils 91d47e5d20627c717aa878b9167c62a8 prefix eab3c99d77fe00506c109c8a736186f7 strip-linguas ac3ee41ee2d31d8c41a77c0838320cc7 toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8 wrapper 4a1902f969e5718126434fc35f3a0d9c xdg-utils fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=a01243da1cf44347c004b959cae6fcae
diff --git a/metadata/md5-cache/dev-java/openjdk-8.332_p09 b/metadata/md5-cache/dev-java/openjdk-8.332_p09
index 439207042917..03e79127aa68 100644
--- a/metadata/md5-cache/dev-java/openjdk-8.332_p09
+++ b/metadata/md5-cache/dev-java/openjdk-8.332_p09
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig
+BDEPEND=virtual/pkgconfig app-arch/unzip
DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm pretend setup
DEPEND=media-libs/freetype:2= media-libs/giflib:0/7 sys-libs/zlib app-arch/zip media-libs/alsa-lib net-print/cups virtual/pkgconfig x11-base/xorg-proto x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrender x11-libs/libXt x11-libs/libXtst || ( dev-java/openjdk-bin:8 dev-java/icedtea-bin:8 dev-java/openjdk:8 dev-java/icedtea:8 ) >=dev-java/java-config-2.2.0-r3 dev-java/java-config app-eselect/eselect-java
DESCRIPTION=Open source implementation of the Java programming language
@@ -6,11 +6,11 @@ EAPI=7
HOMEPAGE=https://openjdk.java.net
INHERIT=check-reqs eapi8-dosym flag-o-matic java-pkg-2 java-vm-2 multiprocessing toolchain-funcs
IUSE=alsa debug cups doc examples headless-awt javafx +jbootstrap selinux source
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 arm64 ppc64 x86
LICENSE=GPL-2
PDEPEND=javafx? ( dev-java/openjfx:8 )
RDEPEND=media-libs/freetype:2= media-libs/giflib:0/7 sys-libs/zlib >=sys-apps/baselayout-java-0.1.0-r1 !headless-awt? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrender x11-libs/libXt x11-libs/libXtst ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) selinux? ( sec-policy/selinux-java ) >=dev-java/java-config-2.2.0-r3 dev-java/java-config app-eselect/eselect-java
SLOT=8
SRC_URI=https://github.com/openjdk/jdk8u/archive/refs/tags/jdk8u332-ga.tar.gz -> openjdk-8.332_p09.tar.gz
-_eclasses_=check-reqs 82234bf011d5453330773cd5fc3f0199 eapi8-dosym cd7d420bb5be5ee079f27239ce76b8f5 edos2unix 33e347e171066657f91f8b0c72ec8773 eutils dab5d8ec471d025b79c9e6906bcf3bff flag-o-matic a500d7cc40da3de38c361e889153bdf7 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 java-vm-2 69658c0814b27f9cbe466a24e6621d23 multilib 4a33c9008e5ee30cb8840a3fdc24df2b multiprocessing b4e253ab22cef7b1085e9b67c7a3b730 pax-utils 91d47e5d20627c717aa878b9167c62a8 prefix eab3c99d77fe00506c109c8a736186f7 strip-linguas ac3ee41ee2d31d8c41a77c0838320cc7 toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8 wrapper 4a1902f969e5718126434fc35f3a0d9c xdg-utils fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=5f51397d74b7c168c6572a6c5d7bc2b8
+_eclasses_=check-reqs 5e6dfbd7a8d3238a79f009fae7ac469c eapi8-dosym cd7d420bb5be5ee079f27239ce76b8f5 edos2unix 33e347e171066657f91f8b0c72ec8773 eutils dab5d8ec471d025b79c9e6906bcf3bff flag-o-matic a3abd6002fafb3022597be6b8d01f88b java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 cfb5f6911bb70204c94ceafd0372c716 java-vm-2 5dd4303f0b659986f096e65e566b9701 multilib 4fbbbc98f236f1b43acd99476bc3cd85 multiprocessing b4e253ab22cef7b1085e9b67c7a3b730 pax-utils 91d47e5d20627c717aa878b9167c62a8 prefix eab3c99d77fe00506c109c8a736186f7 strip-linguas ac3ee41ee2d31d8c41a77c0838320cc7 toolchain-funcs e9da88162e7a3c60376e80c2c2adcdfb wrapper 4a1902f969e5718126434fc35f3a0d9c xdg-utils fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=a01243da1cf44347c004b959cae6fcae
diff --git a/metadata/md5-cache/dev-java/openjdk-bin-11.0.14_p9-r1 b/metadata/md5-cache/dev-java/openjdk-bin-11.0.14_p9-r1
deleted file mode 100644
index c73273b6b172..000000000000
--- a/metadata/md5-cache/dev-java/openjdk-bin-11.0.14_p9-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst postrm prerm pretend setup unpack
-DEPEND=dev-java/java-config app-eselect/eselect-java
-DESCRIPTION=Prebuilt Java JDK binaries provided by Eclipse Temurin
-EAPI=8
-HOMEPAGE=https://adoptium.net
-IUSE=alsa cups headless-awt selinux source
-KEYWORDS=amd64 ~arm arm64 ppc64 ~x64-macos
-LICENSE=GPL-2-with-classpath-exception
-RDEPEND=>=sys-apps/baselayout-java-0.1.0-r1 kernel_linux? ( media-libs/fontconfig:1.0 media-libs/freetype:2 media-libs/harfbuzz elibc_glibc? ( >=sys-libs/glibc-2.2.5:* ) elibc_musl? ( sys-libs/musl ) sys-libs/zlib alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) selinux? ( sec-policy/selinux-java ) !headless-awt? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrender x11-libs/libXtst ) ) dev-java/java-config app-eselect/eselect-java
-RESTRICT=preserve-libs splitdebug
-SLOT=11
-SRC_URI=arm? ( https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.14+9//OpenJDK11U-jdk_arm_linux_hotspot_11.0.14_9.tar.gz ) arm64? ( https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.14+9//OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.14_9.tar.gz ) amd64? ( https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.14+9//OpenJDK11U-jdk_x64_linux_hotspot_11.0.14_9.tar.gz ) amd64? ( elibc_musl? ( https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.14+9//OpenJDK11U-jdk_x64_alpine-linux_hotspot_11.0.14_9.tar.gz ) ) ppc64? ( https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.14+9//OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.14_9.tar.gz ) x64-macos? ( https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.14+9//OpenJDK11U-jdk_x64_mac_hotspot_11.0.14_9.tar.gz )
-_eclasses_=java-vm-2 69658c0814b27f9cbe466a24e6621d23 multilib 4a33c9008e5ee30cb8840a3fdc24df2b pax-utils 91d47e5d20627c717aa878b9167c62a8 prefix eab3c99d77fe00506c109c8a736186f7 toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8 xdg-utils fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=b007934ca6d5ffa648f5c2093dae67f4
diff --git a/metadata/md5-cache/dev-java/openjdk-bin-11.0.15_p10 b/metadata/md5-cache/dev-java/openjdk-bin-11.0.15_p10
index 26eb2f38d10b..22f6698c34bd 100644
--- a/metadata/md5-cache/dev-java/openjdk-bin-11.0.15_p10
+++ b/metadata/md5-cache/dev-java/openjdk-bin-11.0.15_p10
@@ -1,3 +1,4 @@
+BDEPEND=app-arch/unzip
DEFINED_PHASES=install postinst postrm prerm pretend setup unpack
DEPEND=dev-java/java-config app-eselect/eselect-java
DESCRIPTION=Prebuilt Java JDK binaries provided by Eclipse Temurin
@@ -5,11 +6,11 @@ EAPI=8
HOMEPAGE=https://adoptium.net
INHERIT=java-vm-2 toolchain-funcs
IUSE=alsa cups headless-awt selinux source
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x64-macos
+KEYWORDS=amd64 ~arm arm64 ppc64 ~x64-macos
LICENSE=GPL-2-with-classpath-exception
RDEPEND=>=sys-apps/baselayout-java-0.1.0-r1 kernel_linux? ( media-libs/fontconfig:1.0 media-libs/freetype:2 media-libs/harfbuzz elibc_glibc? ( >=sys-libs/glibc-2.2.5:* ) elibc_musl? ( sys-libs/musl ) sys-libs/zlib alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) selinux? ( sec-policy/selinux-java ) !headless-awt? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrender x11-libs/libXtst ) ) dev-java/java-config app-eselect/eselect-java
RESTRICT=preserve-libs splitdebug
SLOT=11
SRC_URI=arm? ( https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.15+10//OpenJDK11U-jdk_arm_linux_hotspot_11.0.15_10.tar.gz ) arm64? ( https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.15+10//OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.15_10.tar.gz ) amd64? ( https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.15+10//OpenJDK11U-jdk_x64_linux_hotspot_11.0.15_10.tar.gz ) amd64? ( elibc_musl? ( https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.15+10//OpenJDK11U-jdk_x64_alpine-linux_hotspot_11.0.15_10.tar.gz ) ) ppc64? ( https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.15+10//OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.15_10.tar.gz ) x64-macos? ( https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.15+10//OpenJDK11U-jdk_x64_mac_hotspot_11.0.15_10.tar.gz )
-_eclasses_=java-vm-2 69658c0814b27f9cbe466a24e6621d23 multilib 4a33c9008e5ee30cb8840a3fdc24df2b pax-utils 91d47e5d20627c717aa878b9167c62a8 prefix eab3c99d77fe00506c109c8a736186f7 toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8 xdg-utils fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=4222c1fb68f0d58531f747c4f748121a
+_eclasses_=java-vm-2 5dd4303f0b659986f096e65e566b9701 multilib 4fbbbc98f236f1b43acd99476bc3cd85 pax-utils 91d47e5d20627c717aa878b9167c62a8 prefix eab3c99d77fe00506c109c8a736186f7 toolchain-funcs e9da88162e7a3c60376e80c2c2adcdfb xdg-utils fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=dea4981e5e1337e9b1942afcf485a104
diff --git a/metadata/md5-cache/dev-java/openjdk-bin-17.0.2_p8 b/metadata/md5-cache/dev-java/openjdk-bin-17.0.2_p8
deleted file mode 100644
index 06f9ed34a1d9..000000000000
--- a/metadata/md5-cache/dev-java/openjdk-bin-17.0.2_p8
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst postrm prerm pretend setup unpack
-DEPEND=dev-java/java-config app-eselect/eselect-java
-DESCRIPTION=Prebuilt Java JDK binaries provided by Eclipse Temurin
-EAPI=8
-HOMEPAGE=https://adoptium.net
-IUSE=alsa cups +gentoo-vm headless-awt selinux source
-KEYWORDS=amd64 ~arm arm64 ppc64 ~x64-macos
-LICENSE=GPL-2-with-classpath-exception
-RDEPEND=>=sys-apps/baselayout-java-0.1.0-r1 kernel_linux? ( media-libs/fontconfig:1.0 media-libs/freetype:2 media-libs/harfbuzz elibc_glibc? ( >=sys-libs/glibc-2.2.5:* ) elibc_musl? ( sys-libs/musl ) sys-libs/zlib alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) selinux? ( sec-policy/selinux-java ) !headless-awt? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrender x11-libs/libXtst ) ) dev-java/java-config app-eselect/eselect-java
-RESTRICT=preserve-libs splitdebug
-SLOT=17
-SRC_URI=arm64? ( https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.2+8//OpenJDK17U-jdk_aarch64_linux_hotspot_17.0.2_8.tar.gz ) arm? ( https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.2+8//OpenJDK17U-jdk_arm_linux_hotspot_17.0.2_8.tar.gz ) amd64? ( https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.2+8//OpenJDK17U-jdk_x64_linux_hotspot_17.0.2_8.tar.gz ) amd64? ( elibc_musl? ( https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.2+8//OpenJDK17U-jdk_x64_alpine-linux_hotspot_17.0.2_8.tar.gz ) ) arm64-macos? ( https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.2+8//OpenJDK17U-jdk_aarch64_mac_hotspot_17.0.2_8.tar.gz ) ppc64? ( https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.2+8//OpenJDK17U-jdk_ppc64le_linux_hotspot_17.0.2_8.tar.gz ) x64-macos? ( https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.2+8//OpenJDK17U-jdk_x64_mac_hotspot_17.0.2_8.tar.gz )
-_eclasses_=java-vm-2 69658c0814b27f9cbe466a24e6621d23 multilib 4a33c9008e5ee30cb8840a3fdc24df2b pax-utils 91d47e5d20627c717aa878b9167c62a8 prefix eab3c99d77fe00506c109c8a736186f7 toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8 xdg-utils fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=80838340070863fc981500a5ecd0be01
diff --git a/metadata/md5-cache/dev-java/openjdk-bin-17.0.3_p7 b/metadata/md5-cache/dev-java/openjdk-bin-17.0.3_p7
index 6fab4a0c10c6..9b886c0fc979 100644
--- a/metadata/md5-cache/dev-java/openjdk-bin-17.0.3_p7
+++ b/metadata/md5-cache/dev-java/openjdk-bin-17.0.3_p7
@@ -1,3 +1,4 @@
+BDEPEND=app-arch/unzip
DEFINED_PHASES=install postinst postrm prerm pretend setup unpack
DEPEND=dev-java/java-config app-eselect/eselect-java
DESCRIPTION=Prebuilt Java JDK binaries provided by Eclipse Temurin
@@ -5,11 +6,11 @@ EAPI=8
HOMEPAGE=https://adoptium.net
INHERIT=java-vm-2 toolchain-funcs
IUSE=alsa cups +gentoo-vm headless-awt selinux source
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x64-macos
+KEYWORDS=amd64 ~arm arm64 ppc64 ~x64-macos
LICENSE=GPL-2-with-classpath-exception
RDEPEND=>=sys-apps/baselayout-java-0.1.0-r1 kernel_linux? ( media-libs/fontconfig:1.0 media-libs/freetype:2 media-libs/harfbuzz elibc_glibc? ( >=sys-libs/glibc-2.2.5:* ) elibc_musl? ( sys-libs/musl ) sys-libs/zlib alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) selinux? ( sec-policy/selinux-java ) !headless-awt? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrender x11-libs/libXtst ) ) dev-java/java-config app-eselect/eselect-java
RESTRICT=preserve-libs splitdebug
SLOT=17
SRC_URI=arm64? ( https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.3+7//OpenJDK17U-jdk_aarch64_linux_hotspot_17.0.3_7.tar.gz ) arm? ( https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.3+7//OpenJDK17U-jdk_arm_linux_hotspot_17.0.3_7.tar.gz ) amd64? ( https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.3+7//OpenJDK17U-jdk_x64_linux_hotspot_17.0.3_7.tar.gz ) amd64? ( elibc_musl? ( https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.3+7//OpenJDK17U-jdk_x64_alpine-linux_hotspot_17.0.3_7.tar.gz ) ) arm64-macos? ( https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.3+7//OpenJDK17U-jdk_aarch64_mac_hotspot_17.0.3_7.tar.gz ) ppc64? ( https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.3+7//OpenJDK17U-jdk_ppc64le_linux_hotspot_17.0.3_7.tar.gz ) x64-macos? ( https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.3+7//OpenJDK17U-jdk_x64_mac_hotspot_17.0.3_7.tar.gz )
-_eclasses_=java-vm-2 69658c0814b27f9cbe466a24e6621d23 multilib 4a33c9008e5ee30cb8840a3fdc24df2b pax-utils 91d47e5d20627c717aa878b9167c62a8 prefix eab3c99d77fe00506c109c8a736186f7 toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8 xdg-utils fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=8e866602eeffa90b1650e990e4b6abee
+_eclasses_=java-vm-2 5dd4303f0b659986f096e65e566b9701 multilib 4fbbbc98f236f1b43acd99476bc3cd85 pax-utils 91d47e5d20627c717aa878b9167c62a8 prefix eab3c99d77fe00506c109c8a736186f7 toolchain-funcs e9da88162e7a3c60376e80c2c2adcdfb xdg-utils fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=6ace0ba098fedbf68ef7cffbd28e3a2f
diff --git a/metadata/md5-cache/dev-java/openjdk-bin-8.322_p06 b/metadata/md5-cache/dev-java/openjdk-bin-8.322_p06
deleted file mode 100644
index cd9ec6974ae7..000000000000
--- a/metadata/md5-cache/dev-java/openjdk-bin-8.322_p06
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst postrm prerm setup unpack
-DEPEND=dev-java/java-config app-eselect/eselect-java
-DESCRIPTION=Prebuilt Java JDK binaries provided by Eclipse Temurin
-EAPI=8
-HOMEPAGE=https://adoptium.net
-IUSE=alsa cups examples headless-awt selinux source
-KEYWORDS=amd64 ~arm arm64 ppc64 ~x64-macos
-LICENSE=GPL-2-with-classpath-exception
-RDEPEND=>=sys-apps/baselayout-java-0.1.0-r1 kernel_linux? ( media-libs/fontconfig:1.0 media-libs/freetype:2 >=sys-libs/glibc-2.2.5:* sys-libs/zlib alsa? ( media-libs/alsa-lib ) arm? ( dev-libs/libffi-compat:6 ) cups? ( net-print/cups ) selinux? ( sec-policy/selinux-java ) !headless-awt? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrender x11-libs/libXtst ) ) dev-java/java-config app-eselect/eselect-java
-RESTRICT=preserve-libs strip
-SLOT=8
-SRC_URI=arm? ( https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u322-b06/OpenJDK8U-jdk_arm_linux_hotspot_8u322b06.tar.gz ) arm64? ( https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u322-b06/OpenJDK8U-jdk_aarch64_linux_hotspot_8u322b06.tar.gz ) ppc64? ( https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u322-b06/OpenJDK8U-jdk_ppc64le_linux_hotspot_8u322b06.tar.gz ) amd64? ( https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u322-b06/OpenJDK8U-jdk_x64_linux_hotspot_8u322b06.tar.gz ) x64-macos? ( https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u322-b06/OpenJDK8U-jdk_x64_mac_hotspot_8u322b06.tar.gz )
-_eclasses_=java-vm-2 69658c0814b27f9cbe466a24e6621d23 multilib 4a33c9008e5ee30cb8840a3fdc24df2b pax-utils 91d47e5d20627c717aa878b9167c62a8 prefix eab3c99d77fe00506c109c8a736186f7 toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8 xdg-utils fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=a89f1085c4c5c42a30e6d904b449dda6
diff --git a/metadata/md5-cache/dev-java/openjdk-bin-8.332_p09 b/metadata/md5-cache/dev-java/openjdk-bin-8.332_p09
index 4be798e839dc..ac3afda91354 100644
--- a/metadata/md5-cache/dev-java/openjdk-bin-8.332_p09
+++ b/metadata/md5-cache/dev-java/openjdk-bin-8.332_p09
@@ -1,3 +1,4 @@
+BDEPEND=app-arch/unzip
DEFINED_PHASES=install postinst postrm prerm setup unpack
DEPEND=dev-java/java-config app-eselect/eselect-java
DESCRIPTION=Prebuilt Java JDK binaries provided by Eclipse Temurin
@@ -5,11 +6,11 @@ EAPI=8
HOMEPAGE=https://adoptium.net
INHERIT=java-vm-2
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 app-eselect/eselect-java
RESTRICT=preserve-libs strip
SLOT=8
SRC_URI=arm? ( https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u332-b09/OpenJDK8U-jdk_arm_linux_hotspot_8u332b09.tar.gz ) arm64? ( https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u332-b09/OpenJDK8U-jdk_aarch64_linux_hotspot_8u332b09.tar.gz ) ppc64? ( https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u332-b09/OpenJDK8U-jdk_ppc64le_linux_hotspot_8u332b09.tar.gz ) amd64? ( https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u332-b09/OpenJDK8U-jdk_x64_linux_hotspot_8u332b09.tar.gz ) x64-macos? ( https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u332-b09/OpenJDK8U-jdk_x64_mac_hotspot_8u332b09.tar.gz )
-_eclasses_=java-vm-2 69658c0814b27f9cbe466a24e6621d23 multilib 4a33c9008e5ee30cb8840a3fdc24df2b pax-utils 91d47e5d20627c717aa878b9167c62a8 prefix eab3c99d77fe00506c109c8a736186f7 toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8 xdg-utils fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=816e99fe5d6aa319265d8e1bce44d0d5
+_eclasses_=java-vm-2 5dd4303f0b659986f096e65e566b9701 multilib 4fbbbc98f236f1b43acd99476bc3cd85 pax-utils 91d47e5d20627c717aa878b9167c62a8 prefix eab3c99d77fe00506c109c8a736186f7 toolchain-funcs e9da88162e7a3c60376e80c2c2adcdfb xdg-utils fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=268264fdf04a3fbc5eb2d069ac393e54
diff --git a/metadata/md5-cache/dev-java/openjdk-jre-bin-11.0.14_p9-r1 b/metadata/md5-cache/dev-java/openjdk-jre-bin-11.0.14_p9-r1
index 23fc95a11d17..f92178a0f717 100644
--- a/metadata/md5-cache/dev-java/openjdk-jre-bin-11.0.14_p9-r1
+++ b/metadata/md5-cache/dev-java/openjdk-jre-bin-11.0.14_p9-r1
@@ -1,8 +1,10 @@
+BDEPEND=app-arch/unzip
DEFINED_PHASES=install postinst postrm prerm setup
DEPEND=dev-java/java-config app-eselect/eselect-java
DESCRIPTION=Prebuilt Java JRE binaries provided by Eclipse Temurin
EAPI=8
HOMEPAGE=https://adoptopenjdk.net
+INHERIT=java-vm-2
IUSE=alsa cups +gentoo-vm headless-awt selinux
KEYWORDS=amd64
LICENSE=GPL-2-with-classpath-exception
@@ -10,5 +12,5 @@ RDEPEND=media-libs/fontconfig:1.0 media-libs/freetype:2 >net-libs/libnet-1.1 >=s
RESTRICT=preserve-libs splitdebug
SLOT=11
SRC_URI=amd64? ( https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.14+9/OpenJDK11U-jre_x64_linux_hotspot_11.0.14_9.tar.gz )
-_eclasses_=java-vm-2 69658c0814b27f9cbe466a24e6621d23 multilib 4a33c9008e5ee30cb8840a3fdc24df2b pax-utils 91d47e5d20627c717aa878b9167c62a8 prefix eab3c99d77fe00506c109c8a736186f7 toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8 xdg-utils fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=java-vm-2 5dd4303f0b659986f096e65e566b9701 multilib 4fbbbc98f236f1b43acd99476bc3cd85 pax-utils 91d47e5d20627c717aa878b9167c62a8 prefix eab3c99d77fe00506c109c8a736186f7 toolchain-funcs e9da88162e7a3c60376e80c2c2adcdfb xdg-utils fffb53a53cf17c9c0c998a3c0a590c7e
_md5_=fa0214c158eeb8848087e463f57de08c
diff --git a/metadata/md5-cache/dev-java/openjdk-jre-bin-11.0.15_p10 b/metadata/md5-cache/dev-java/openjdk-jre-bin-11.0.15_p10
index 5012f58c564a..b6cc26c90eb1 100644
--- a/metadata/md5-cache/dev-java/openjdk-jre-bin-11.0.15_p10
+++ b/metadata/md5-cache/dev-java/openjdk-jre-bin-11.0.15_p10
@@ -1,3 +1,4 @@
+BDEPEND=app-arch/unzip
DEFINED_PHASES=install postinst postrm prerm setup
DEPEND=dev-java/java-config app-eselect/eselect-java
DESCRIPTION=Prebuilt Java JRE binaries provided by Eclipse Temurin
@@ -5,11 +6,11 @@ EAPI=8
HOMEPAGE=https://adoptopenjdk.net
INHERIT=java-vm-2
IUSE=alsa cups +gentoo-vm headless-awt selinux
-KEYWORDS=~amd64
+KEYWORDS=amd64
LICENSE=GPL-2-with-classpath-exception
RDEPEND=media-libs/fontconfig:1.0 media-libs/freetype:2 >net-libs/libnet-1.1 >=sys-apps/baselayout-java-0.1.0-r1 >=sys-libs/glibc-2.2.5:* sys-libs/zlib alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) selinux? ( sec-policy/selinux-java ) !headless-awt? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrender x11-libs/libXtst ) dev-java/java-config app-eselect/eselect-java
RESTRICT=preserve-libs splitdebug
SLOT=11
SRC_URI=amd64? ( https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.15+10/OpenJDK11U-jre_x64_linux_hotspot_11.0.15_10.tar.gz )
-_eclasses_=java-vm-2 69658c0814b27f9cbe466a24e6621d23 multilib 4a33c9008e5ee30cb8840a3fdc24df2b pax-utils 91d47e5d20627c717aa878b9167c62a8 prefix eab3c99d77fe00506c109c8a736186f7 toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8 xdg-utils fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=01bf5daeddfc5c79a7e688ce1ec90cf9
+_eclasses_=java-vm-2 5dd4303f0b659986f096e65e566b9701 multilib 4fbbbc98f236f1b43acd99476bc3cd85 pax-utils 91d47e5d20627c717aa878b9167c62a8 prefix eab3c99d77fe00506c109c8a736186f7 toolchain-funcs e9da88162e7a3c60376e80c2c2adcdfb xdg-utils fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=fa0214c158eeb8848087e463f57de08c
diff --git a/metadata/md5-cache/dev-java/openjdk-jre-bin-17.0.3_p7 b/metadata/md5-cache/dev-java/openjdk-jre-bin-17.0.3_p7
index d5b6a1976755..701e08a6543f 100644
--- a/metadata/md5-cache/dev-java/openjdk-jre-bin-17.0.3_p7
+++ b/metadata/md5-cache/dev-java/openjdk-jre-bin-17.0.3_p7
@@ -1,3 +1,4 @@
+BDEPEND=app-arch/unzip
DEFINED_PHASES=install postinst postrm prerm setup
DEPEND=dev-java/java-config app-eselect/eselect-java
DESCRIPTION=Prebuilt Java JRE binaries provided by Eclipse Temurin
@@ -5,11 +6,11 @@ EAPI=8
HOMEPAGE=https://adoptopenjdk.net
INHERIT=java-vm-2
IUSE=alsa cups +gentoo-vm headless-awt selinux
-KEYWORDS=~amd64
+KEYWORDS=amd64
LICENSE=GPL-2-with-classpath-exception
RDEPEND=media-libs/fontconfig:1.0 media-libs/freetype:2 >net-libs/libnet-1.1 >=sys-apps/baselayout-java-0.1.0-r1 >=sys-libs/glibc-2.2.5:* sys-libs/zlib alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) selinux? ( sec-policy/selinux-java ) !headless-awt? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrender x11-libs/libXtst ) dev-java/java-config app-eselect/eselect-java
RESTRICT=preserve-libs splitdebug
SLOT=17
SRC_URI=amd64? ( https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.3+7/OpenJDK17U-jre_x64_linux_hotspot_17.0.3_7.tar.gz )
-_eclasses_=java-vm-2 69658c0814b27f9cbe466a24e6621d23 multilib 4a33c9008e5ee30cb8840a3fdc24df2b pax-utils 91d47e5d20627c717aa878b9167c62a8 prefix eab3c99d77fe00506c109c8a736186f7 toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8 xdg-utils fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=01bf5daeddfc5c79a7e688ce1ec90cf9
+_eclasses_=java-vm-2 5dd4303f0b659986f096e65e566b9701 multilib 4fbbbc98f236f1b43acd99476bc3cd85 pax-utils 91d47e5d20627c717aa878b9167c62a8 prefix eab3c99d77fe00506c109c8a736186f7 toolchain-funcs e9da88162e7a3c60376e80c2c2adcdfb xdg-utils fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=fa0214c158eeb8848087e463f57de08c
diff --git a/metadata/md5-cache/dev-java/openjdk-jre-bin-8.322_p06 b/metadata/md5-cache/dev-java/openjdk-jre-bin-8.322_p06
index 38e86e7bf870..ce2eda2758ab 100644
--- a/metadata/md5-cache/dev-java/openjdk-jre-bin-8.322_p06
+++ b/metadata/md5-cache/dev-java/openjdk-jre-bin-8.322_p06
@@ -1,8 +1,10 @@
+BDEPEND=app-arch/unzip
DEFINED_PHASES=install postinst postrm prerm setup
DEPEND=dev-java/java-config app-eselect/eselect-java
DESCRIPTION=Prebuilt Java JRE binaries provided by Eclipse Temurin
EAPI=8
HOMEPAGE=https://adoptium.net
+INHERIT=java-vm-2
IUSE=alsa cups headless-awt selinux
KEYWORDS=amd64
LICENSE=GPL-2-with-classpath-exception
@@ -10,5 +12,5 @@ RDEPEND=media-libs/fontconfig:1.0 media-libs/freetype:2 >net-libs/libnet-1.1 >=s
RESTRICT=preserve-libs splitdebug
SLOT=8
SRC_URI=amd64? ( https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u322-b06/OpenJDK8U-jre_x64_linux_hotspot_8u322b06.tar.gz )
-_eclasses_=java-vm-2 69658c0814b27f9cbe466a24e6621d23 multilib 4a33c9008e5ee30cb8840a3fdc24df2b pax-utils 91d47e5d20627c717aa878b9167c62a8 prefix eab3c99d77fe00506c109c8a736186f7 toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8 xdg-utils fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=java-vm-2 5dd4303f0b659986f096e65e566b9701 multilib 4fbbbc98f236f1b43acd99476bc3cd85 pax-utils 91d47e5d20627c717aa878b9167c62a8 prefix eab3c99d77fe00506c109c8a736186f7 toolchain-funcs e9da88162e7a3c60376e80c2c2adcdfb xdg-utils fffb53a53cf17c9c0c998a3c0a590c7e
_md5_=08f8743e7eba2c2c9d5ca5bd87b1d761
diff --git a/metadata/md5-cache/dev-java/openjdk-jre-bin-8.332_p09 b/metadata/md5-cache/dev-java/openjdk-jre-bin-8.332_p09
index 0277f0faefd0..1ec3733d36bd 100644
--- a/metadata/md5-cache/dev-java/openjdk-jre-bin-8.332_p09
+++ b/metadata/md5-cache/dev-java/openjdk-jre-bin-8.332_p09
@@ -1,3 +1,4 @@
+BDEPEND=app-arch/unzip
DEFINED_PHASES=install postinst postrm prerm setup
DEPEND=dev-java/java-config app-eselect/eselect-java
DESCRIPTION=Prebuilt Java JRE binaries provided by Eclipse Temurin
@@ -5,11 +6,11 @@ EAPI=8
HOMEPAGE=https://adoptium.net
INHERIT=java-vm-2
IUSE=alsa cups headless-awt selinux
-KEYWORDS=~amd64
+KEYWORDS=amd64
LICENSE=GPL-2-with-classpath-exception
RDEPEND=media-libs/fontconfig:1.0 media-libs/freetype:2 >net-libs/libnet-1.1 >=sys-apps/baselayout-java-0.1.0-r1 >=sys-libs/glibc-2.2.5:* sys-libs/zlib alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) selinux? ( sec-policy/selinux-java ) !headless-awt? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrender x11-libs/libXtst ) dev-java/java-config app-eselect/eselect-java
RESTRICT=preserve-libs splitdebug
SLOT=8
SRC_URI=amd64? ( https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u332-b09/OpenJDK8U-jre_x64_linux_hotspot_8u332b09.tar.gz )
-_eclasses_=java-vm-2 69658c0814b27f9cbe466a24e6621d23 multilib 4a33c9008e5ee30cb8840a3fdc24df2b pax-utils 91d47e5d20627c717aa878b9167c62a8 prefix eab3c99d77fe00506c109c8a736186f7 toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8 xdg-utils fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=ba60498a19a073949d6bbf7974652ad4
+_eclasses_=java-vm-2 5dd4303f0b659986f096e65e566b9701 multilib 4fbbbc98f236f1b43acd99476bc3cd85 pax-utils 91d47e5d20627c717aa878b9167c62a8 prefix eab3c99d77fe00506c109c8a736186f7 toolchain-funcs e9da88162e7a3c60376e80c2c2adcdfb xdg-utils fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=08f8743e7eba2c2c9d5ca5bd87b1d761
diff --git a/metadata/md5-cache/dev-java/openjfx-11.0.11_p1 b/metadata/md5-cache/dev-java/openjfx-11.0.11_p1
index 379cc11ffe51..64de9dda9407 100644
--- a/metadata/md5-cache/dev-java/openjfx-11.0.11_p1
+++ b/metadata/md5-cache/dev-java/openjfx-11.0.11_p1
@@ -11,5 +11,5 @@ RDEPEND=dev-java/swt:4.10[cairo,opengl] dev-libs/atk dev-libs/glib:2 dev-libs/li
REQUIRED_USE=amd64? ( cpu_flags_x86_sse2 )
SLOT=11
SRC_URI=https://hg.openjdk.java.net/openjfx/11-dev/rt/archive/11.0.11+1.tar.bz2 -> openjfx-11.0.11_p1.tar.bz2 https://downloads.gradle.org/distributions/gradle-4.10.3-bin.zip https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-sandbox/7.1.0/lucene-sandbox-7.1.0.jar https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-grouping/7.1.0/lucene-grouping-7.1.0.jar https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-queryparser/7.1.0/lucene-queryparser-7.1.0.jar https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-queries/7.1.0/lucene-queries-7.1.0.jar https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-core/7.1.0/lucene-core-7.1.0.jar https://repo.maven.apache.org/maven2/org/antlr/gunit/3.5.2/gunit-3.5.2.jar https://repo1.maven.org/maven2/org/antlr/antlr4/4.7.2/antlr4-4.7.2-complete.jar https://repo.maven.apache.org/maven2/org/antlr/ST4/4.0.8/ST4-4.0.8.jar
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 eapi7-ver 1a0a60ad07c8b32d2faba2d085dc0f24 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 9f813bb3c47cf2e60619a663b87c5f4e estack 055c42df72f76a4f45ec92b35e83cd56 eutils dab5d8ec471d025b79c9e6906bcf3bff flag-o-matic a500d7cc40da3de38c361e889153bdf7 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 ltprune 97143780d341cc8d8f1d4c6187a36d29 multilib 4a33c9008e5ee30cb8840a3fdc24df2b multiprocessing b4e253ab22cef7b1085e9b67c7a3b730 preserve-libs a8e50acee31b5759b4df1f7707cae54b strip-linguas ac3ee41ee2d31d8c41a77c0838320cc7 toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8 vcs-clean d271b7bc7e6a009758d7d4ef749174e3 versionator d3fb3ba33acc3bbbdc4d7970227c100d wrapper 4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=desktop 22952d8f27cac191d75529d4c38e6bfa eapi7-ver 1a0a60ad07c8b32d2faba2d085dc0f24 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 28f0f3c0226306ec5f49e13bf851f171 estack 055c42df72f76a4f45ec92b35e83cd56 eutils dab5d8ec471d025b79c9e6906bcf3bff flag-o-matic a3abd6002fafb3022597be6b8d01f88b java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 cfb5f6911bb70204c94ceafd0372c716 ltprune 97143780d341cc8d8f1d4c6187a36d29 multilib 4fbbbc98f236f1b43acd99476bc3cd85 multiprocessing b4e253ab22cef7b1085e9b67c7a3b730 preserve-libs a8e50acee31b5759b4df1f7707cae54b strip-linguas ac3ee41ee2d31d8c41a77c0838320cc7 toolchain-funcs e9da88162e7a3c60376e80c2c2adcdfb vcs-clean d271b7bc7e6a009758d7d4ef749174e3 versionator d3fb3ba33acc3bbbdc4d7970227c100d wrapper 4a1902f969e5718126434fc35f3a0d9c
_md5_=020283e8f5cc2a36d2f2566d3ab50613
diff --git a/metadata/md5-cache/dev-java/openjfx-11.0.9_p0 b/metadata/md5-cache/dev-java/openjfx-11.0.9_p0
index 81c326ba7aed..3f6fb908a2c0 100644
--- a/metadata/md5-cache/dev-java/openjfx-11.0.9_p0
+++ b/metadata/md5-cache/dev-java/openjfx-11.0.9_p0
@@ -11,5 +11,5 @@ RDEPEND=dev-java/swt:4.10[cairo,opengl] dev-libs/atk dev-libs/glib:2 dev-libs/li
REQUIRED_USE=amd64? ( cpu_flags_x86_sse2 )
SLOT=11
SRC_URI=https://hg.openjdk.java.net/openjfx/11-dev/rt/archive/11.0.9+0.tar.bz2 -> openjfx-11.0.9_p0.tar.bz2 https://downloads.gradle.org/distributions/gradle-4.10.3-bin.zip https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-sandbox/7.1.0/lucene-sandbox-7.1.0.jar https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-grouping/7.1.0/lucene-grouping-7.1.0.jar https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-queryparser/7.1.0/lucene-queryparser-7.1.0.jar https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-queries/7.1.0/lucene-queries-7.1.0.jar https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-core/7.1.0/lucene-core-7.1.0.jar https://repo.maven.apache.org/maven2/org/antlr/gunit/3.5.2/gunit-3.5.2.jar https://repo1.maven.org/maven2/org/antlr/antlr4/4.7.2/antlr4-4.7.2-complete.jar https://repo.maven.apache.org/maven2/org/antlr/ST4/4.0.8/ST4-4.0.8.jar
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 eapi7-ver 1a0a60ad07c8b32d2faba2d085dc0f24 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 9f813bb3c47cf2e60619a663b87c5f4e estack 055c42df72f76a4f45ec92b35e83cd56 eutils dab5d8ec471d025b79c9e6906bcf3bff flag-o-matic a500d7cc40da3de38c361e889153bdf7 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 ltprune 97143780d341cc8d8f1d4c6187a36d29 multilib 4a33c9008e5ee30cb8840a3fdc24df2b multiprocessing b4e253ab22cef7b1085e9b67c7a3b730 preserve-libs a8e50acee31b5759b4df1f7707cae54b strip-linguas ac3ee41ee2d31d8c41a77c0838320cc7 toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8 vcs-clean d271b7bc7e6a009758d7d4ef749174e3 versionator d3fb3ba33acc3bbbdc4d7970227c100d wrapper 4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=desktop 22952d8f27cac191d75529d4c38e6bfa eapi7-ver 1a0a60ad07c8b32d2faba2d085dc0f24 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 28f0f3c0226306ec5f49e13bf851f171 estack 055c42df72f76a4f45ec92b35e83cd56 eutils dab5d8ec471d025b79c9e6906bcf3bff flag-o-matic a3abd6002fafb3022597be6b8d01f88b java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 cfb5f6911bb70204c94ceafd0372c716 ltprune 97143780d341cc8d8f1d4c6187a36d29 multilib 4fbbbc98f236f1b43acd99476bc3cd85 multiprocessing b4e253ab22cef7b1085e9b67c7a3b730 preserve-libs a8e50acee31b5759b4df1f7707cae54b strip-linguas ac3ee41ee2d31d8c41a77c0838320cc7 toolchain-funcs e9da88162e7a3c60376e80c2c2adcdfb vcs-clean d271b7bc7e6a009758d7d4ef749174e3 versionator d3fb3ba33acc3bbbdc4d7970227c100d wrapper 4a1902f969e5718126434fc35f3a0d9c
_md5_=19fd42b84358719bcb75fc6361dfc545
diff --git a/metadata/md5-cache/dev-java/openjfx-8.1000 b/metadata/md5-cache/dev-java/openjfx-8.1000
index c845e58d06b3..166fc71128c0 100644
--- a/metadata/md5-cache/dev-java/openjfx-8.1000
+++ b/metadata/md5-cache/dev-java/openjfx-8.1000
@@ -12,5 +12,5 @@ REQUIRED_USE=amd64? ( cpu_flags_x86_sse2 )
RESTRICT=test
SLOT=8
SRC_URI=https://hg.openjdk.java.net/openjfx/8u-dev/rt/archive/9f49e3b6147f.tar.bz2 -> openjfx-8.1000.tar.bz2 https://dev.gentoo.org/~gyakovlev/distfiles/openjfx-8.1000-backports.tar.bz2 https://services.gradle.org/distributions/gradle-4.10.3-bin.zip
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 eapi7-ver 1a0a60ad07c8b32d2faba2d085dc0f24 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 9f813bb3c47cf2e60619a663b87c5f4e estack 055c42df72f76a4f45ec92b35e83cd56 eutils dab5d8ec471d025b79c9e6906bcf3bff flag-o-matic a500d7cc40da3de38c361e889153bdf7 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 ltprune 97143780d341cc8d8f1d4c6187a36d29 multilib 4a33c9008e5ee30cb8840a3fdc24df2b multiprocessing b4e253ab22cef7b1085e9b67c7a3b730 preserve-libs a8e50acee31b5759b4df1f7707cae54b strip-linguas ac3ee41ee2d31d8c41a77c0838320cc7 toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8 vcs-clean d271b7bc7e6a009758d7d4ef749174e3 versionator d3fb3ba33acc3bbbdc4d7970227c100d wrapper 4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=desktop 22952d8f27cac191d75529d4c38e6bfa eapi7-ver 1a0a60ad07c8b32d2faba2d085dc0f24 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 28f0f3c0226306ec5f49e13bf851f171 estack 055c42df72f76a4f45ec92b35e83cd56 eutils dab5d8ec471d025b79c9e6906bcf3bff flag-o-matic a3abd6002fafb3022597be6b8d01f88b java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716 ltprune 97143780d341cc8d8f1d4c6187a36d29 multilib 4fbbbc98f236f1b43acd99476bc3cd85 multiprocessing b4e253ab22cef7b1085e9b67c7a3b730 preserve-libs a8e50acee31b5759b4df1f7707cae54b strip-linguas ac3ee41ee2d31d8c41a77c0838320cc7 toolchain-funcs e9da88162e7a3c60376e80c2c2adcdfb vcs-clean d271b7bc7e6a009758d7d4ef749174e3 versionator d3fb3ba33acc3bbbdc4d7970227c100d wrapper 4a1902f969e5718126434fc35f3a0d9c
_md5_=498092692a9d4a8c0dbccc4a78cef95a
diff --git a/metadata/md5-cache/dev-java/opentest4j-1.2.0 b/metadata/md5-cache/dev-java/opentest4j-1.2.0
index a2f789b976fb..0d9214be1f7d 100644
--- a/metadata/md5-cache/dev-java/opentest4j-1.2.0
+++ b/metadata/md5-cache/dev-java/opentest4j-1.2.0
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://github.com/ota4j-team/opentest4j/archive/r1.2.0.tar.gz -> opentest4j-1.2.0.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=99859f93c1cecc167f711d0a36e52e6e
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
deleted file mode 100644
index 7db5578f328e..000000000000
--- a/metadata/md5-cache/dev-java/oracle-javamail-1.5.6-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup unpack
-DEPEND=app-arch/unzip virtual/jdk:1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
-DESCRIPTION=A Java-based framework to build multiplatform mail and messaging applications
-EAPI=6
-HOMEPAGE=https://java.net/projects/javamail/pages/Home
-INHERIT=java-pkg-2 java-ant-2
-IUSE=doc source
-KEYWORDS=amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=CDDL GPL-2 BSD
-RDEPEND=virtual/jre:1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://java.net/projects/javamail/downloads/download/source/javamail-1.5.6-src.zip -> oracle-javamail-1.5.6.zip
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 eapi7-ver 1a0a60ad07c8b32d2faba2d085dc0f24 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 9f813bb3c47cf2e60619a663b87c5f4e estack 055c42df72f76a4f45ec92b35e83cd56 eutils dab5d8ec471d025b79c9e6906bcf3bff java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 ltprune 97143780d341cc8d8f1d4c6187a36d29 multilib 4a33c9008e5ee30cb8840a3fdc24df2b preserve-libs a8e50acee31b5759b4df1f7707cae54b strip-linguas ac3ee41ee2d31d8c41a77c0838320cc7 toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8 vcs-clean d271b7bc7e6a009758d7d4ef749174e3 versionator d3fb3ba33acc3bbbdc4d7970227c100d wrapper 4a1902f969e5718126434fc35f3a0d9c
-_md5_=c886c413c843830b7dd1e0c99df6d010
diff --git a/metadata/md5-cache/dev-java/osgi-annotation-versioning-1.1.1 b/metadata/md5-cache/dev-java/osgi-annotation-versioning-1.1.1
index a4e6ae8469de..fdd5b2c8b09b 100644
--- a/metadata/md5-cache/dev-java/osgi-annotation-versioning-1.1.1
+++ b/metadata/md5-cache/dev-java/osgi-annotation-versioning-1.1.1
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0
RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=0
SRC_URI=https://repo1.maven.org/maven2/org/osgi/org.osgi.annotation.versioning/1.1.1/org.osgi.annotation.versioning-1.1.1-sources.jar -> osgi-annotation-versioning-1.1.1-sources.jar
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=a9d6c762ca136920c7f039fc17bcc66c
diff --git a/metadata/md5-cache/dev-java/osgi-compendium-4.3.1-r2 b/metadata/md5-cache/dev-java/osgi-compendium-4.3.1-r3
index 7e05e4072a97..6e7a23e361fd 100644
--- a/metadata/md5-cache/dev-java/osgi-compendium-4.3.1-r2
+++ b/metadata/md5-cache/dev-java/osgi-compendium-4.3.1-r3
@@ -2,14 +2,14 @@ BDEPEND=app-arch/unzip
DEFINED_PHASES=compile install preinst prepare setup test
DEPEND=dev-java/glassfish-persistence:0 dev-java/osgi-core-api:0 dev-java/osgi-foundation:0 dev-java/tomcat-servlet-api:4.0 >=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
DESCRIPTION=OSGi Service Platform Compendium API (Companion Code)
-EAPI=7
-HOMEPAGE=http://wiki.osgi.org/wiki/Release_4.3
+EAPI=8
+HOMEPAGE=https://docs.osgi.org
INHERIT=java-pkg-2 java-pkg-simple
IUSE=doc source
KEYWORDS=amd64 ~arm arm64 ppc64 x86
-LICENSE=Apache-2.0 OSGi-Specification-2.0
+LICENSE=Apache-2.0
RDEPEND=dev-java/glassfish-persistence:0 dev-java/osgi-core-api:0 dev-java/osgi-foundation:0 dev-java/tomcat-servlet-api:4.0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=0
-SRC_URI=https://osgi.org/download/r4v43/osgi.cmpn-4.3.1.jar
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
-_md5_=e528ca5556bddf0986b3a918563b8b1d
+SRC_URI=https://docs.osgi.org/download/r4v43/osgi.cmpn-4.3.1.jar
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
+_md5_=70ac5302e564293810674fa42e8e160b
diff --git a/metadata/md5-cache/dev-java/osgi-core-api-5.0.0-r2 b/metadata/md5-cache/dev-java/osgi-core-api-5.0.0-r2
index b34876e0210c..cee6b8cad3f6 100644
--- a/metadata/md5-cache/dev-java/osgi-core-api-5.0.0-r2
+++ b/metadata/md5-cache/dev-java/osgi-core-api-5.0.0-r2
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=0
SRC_URI=http://www.osgi.org/download/r5/osgi.core-5.0.0.jar
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=5af090f872a5bf2c3cff9ab2c3e5a826
diff --git a/metadata/md5-cache/dev-java/osgi-enterprise-api-5.0.0-r1 b/metadata/md5-cache/dev-java/osgi-enterprise-api-5.0.0-r1
deleted file mode 100644
index 1e336c9edf53..000000000000
--- a/metadata/md5-cache/dev-java/osgi-enterprise-api-5.0.0-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=dev-java/glassfish-persistence:0 dev-java/osgi-core-api:0 java-virtuals/servlet-api:2.5 >=virtual/jdk-1.8:* app-arch/unzip >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=OSGi Enterprise Release 5 Companion Code
-EAPI=7
-HOMEPAGE=http://www.osgi.org/Main/HomePage
-INHERIT=java-pkg-2 java-pkg-simple
-IUSE=doc source
-KEYWORDS=amd64 ~arm arm64 ppc64 x86
-LICENSE=Apache-2.0 OSGi-Specification-2.0
-RDEPEND=dev-java/glassfish-persistence:0 dev-java/osgi-core-api:0 java-virtuals/servlet-api:2.5 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=bindist
-SLOT=0
-SRC_URI=https://docs.osgi.org/download/r5/osgi.enterprise-5.0.0.jar
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
-_md5_=2ec59d2daeed99509f462f1dbf235779
diff --git a/metadata/md5-cache/dev-java/osgi-enterprise-api-5.0.0-r2 b/metadata/md5-cache/dev-java/osgi-enterprise-api-5.0.0-r2
index 812790ae0c8c..63220516c2f5 100644
--- a/metadata/md5-cache/dev-java/osgi-enterprise-api-5.0.0-r2
+++ b/metadata/md5-cache/dev-java/osgi-enterprise-api-5.0.0-r2
@@ -6,11 +6,11 @@ EAPI=8
HOMEPAGE=http://www.osgi.org/Main/HomePage
INHERIT=java-pkg-2 java-pkg-simple
IUSE=doc source
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ppc64 x86
LICENSE=Apache-2.0 OSGi-Specification-2.0
RDEPEND=dev-java/glassfish-persistence:0 dev-java/osgi-core-api:0 dev-java/tomcat-servlet-api:2.5 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
RESTRICT=bindist
SLOT=0
SRC_URI=https://docs.osgi.org/download/r5/osgi.enterprise-5.0.0.jar
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
-_md5_=cb20ed26ae93e9b27dbc56791c776840
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
+_md5_=40b840e093102f3f25ae1fcd87e2ce0c
diff --git a/metadata/md5-cache/dev-java/osgi-foundation-1.2.0-r2 b/metadata/md5-cache/dev-java/osgi-foundation-1.2.0-r2
index 22a47c761192..9c69ac778df6 100644
--- a/metadata/md5-cache/dev-java/osgi-foundation-1.2.0-r2
+++ b/metadata/md5-cache/dev-java/osgi-foundation-1.2.0-r2
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0 OSGi-Specification-2.0
RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=0
SRC_URI=https://dev.gentoo.org/~tomwij/files/dist/osgi-foundation-1.2.0.tar.xz
-_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 cfb5f6911bb70204c94ceafd0372c716 multilib 4fbbbc98f236f1b43acd99476bc3cd85 toolchain-funcs e9da88162e7a3c60376e80c2c2adcdfb
_md5_=b5ad8db98fdd4ae0e864800547a520f6
diff --git a/metadata/md5-cache/dev-java/pdf-renderer-1.0.5-r1 b/metadata/md5-cache/dev-java/pdf-renderer-1.0.5-r1
index f2d505c4d990..a1012d0bc21c 100644
--- a/metadata/md5-cache/dev-java/pdf-renderer-1.0.5-r1
+++ b/metadata/md5-cache/dev-java/pdf-renderer-1.0.5-r1
@@ -11,5 +11,5 @@ LICENSE=LGPL-3
RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=0
SRC_URI=https://repo1.maven.org/maven2/org/swinglabs/pdf-renderer/1.0.5/pdf-renderer-1.0.5-sources.jar
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=2c78499f210b111fd94d81bd4618a5cc
diff --git a/metadata/md5-cache/dev-java/pdfbox-2.0.24 b/metadata/md5-cache/dev-java/pdfbox-2.0.26
index b725e9e1307d..1bdd2dfffebc 100644
--- a/metadata/md5-cache/dev-java/pdfbox-2.0.24
+++ b/metadata/md5-cache/dev-java/pdfbox-2.0.26
@@ -1,17 +1,17 @@
BDEPEND=app-arch/unzip
DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=dev-java/bcmail:0 dev-java/bcprov:0 dev-java/commons-logging:0 ~dev-java/fontbox-2.0.24:0 tools? ( dev-java/java-diff-utils:0 dev-java/junit:4 dev-java/mockito:0 ) >=virtual/jdk-1.8:* test? ( dev-java/jai-imageio-core:0 dev-java/jai-imageio-jpeg2000:0 dev-java/java-diff-utils:0 dev-java/jbig2-imageio:0 dev-java/mockito:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
+DEPEND=dev-java/bcmail:0 dev-java/bcprov:0 dev-java/commons-logging:0 ~dev-java/fontbox-2.0.26:0 >=virtual/jdk-1.8:* test? ( dev-java/jai-imageio-core:0 dev-java/jai-imageio-jpeg2000:0 dev-java/java-diff-utils:0 dev-java/jbig2-imageio:0 dev-java/mockito:4 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
DESCRIPTION=Java library and utilities for working with PDF documents
-EAPI=7
+EAPI=8
HOMEPAGE=https://pdfbox.apache.org/
INHERIT=java-pkg-2 java-pkg-simple
IUSE=+tools doc source test
KEYWORDS=amd64 ~arm64 ppc64 x86
LICENSE=Apache-2.0
PROPERTIES=test_network
-RDEPEND=dev-java/bcmail:0 dev-java/bcprov:0 dev-java/commons-logging:0 ~dev-java/fontbox-2.0.24:0 tools? ( dev-java/java-diff-utils:0 dev-java/junit:4 dev-java/mockito:0 ) >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
+RDEPEND=dev-java/bcmail:0 dev-java/bcprov:0 dev-java/commons-logging:0 ~dev-java/fontbox-2.0.26:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=test !test? ( test )
SLOT=0
-SRC_URI=mirror://apache/pdfbox/2.0.24/pdfbox-2.0.24-src.zip test? ( https://issues.apache.org/jira/secure/attachment/12481683/1.pdf -> PDFBOX-1031-1.pdf https://issues.apache.org/jira/secure/attachment/12481684/2.pdf -> PDFBOX-1031-2.pdf https://issues.apache.org/jira/secure/attachment/12486525/1_testfile1.pdf -> PDFBOX-1065-1.pdf https://issues.apache.org/jira/secure/attachment/12486526/2_testfile1.pdf -> PDFBOX-1065-2.pdf https://issues.apache.org/jira/secure/attachment/12490774/a.pdf -> PDFBOX-1100-1.pdf https://issues.apache.org/jira/secure/attachment/12490775/b.pdf -> PDFBOX-1100-2.pdf https://issues.apache.org/jira/secure/attachment/12848122/SF1199AEG%20%28Complete%29.pdf -> PDFBOX-3656.pdf https://issues.apache.org/jira/secure/attachment/12852207/test.pdf -> PDFBOX-3682.pdf https://issues.apache.org/jira/secure/attachment/12888957/079977.pdf -> PDFBOX-3940-079977.pdf https://issues.apache.org/jira/secure/attachment/12867113/202097.pdf -> PDFBOX-3785-202097.pdf https://issues.apache.org/jira/secure/attachment/12890031/670064.pdf -> PDFBOX-3947-670064.pdf https://issues.apache.org/jira/secure/attachment/12890034/EUWO6SQS5TM4VGOMRD3FLXZHU35V2CP2.pdf -> PDFBOX-3948-EUWO6SQS5TM4VGOMRD3FLXZHU35V2CP2.pdf https://issues.apache.org/jira/secure/attachment/12890037/MKFYUGZWS3OPXLLVU2Z4LWCTVA5WNOGF.pdf -> PDFBOX-3949-MKFYUGZWS3OPXLLVU2Z4LWCTVA5WNOGF.pdf https://issues.apache.org/jira/secure/attachment/12890042/23EGDHXSBBYQLKYOKGZUOVYVNE675PRD.pdf -> PDFBOX-3950-23EGDHXSBBYQLKYOKGZUOVYVNE675PRD.pdf https://issues.apache.org/jira/secure/attachment/12890047/FIHUZWDDL2VGPOE34N6YHWSIGSH5LVGZ.pdf -> PDFBOX-3951-FIHUZWDDL2VGPOE34N6YHWSIGSH5LVGZ.pdf https://issues.apache.org/jira/secure/attachment/12892097/c687766d68ac766be3f02aaec5e0d713_2.pdf -> PDFBOX-3964-c687766d68ac766be3f02aaec5e0d713_2.pdf https://issues.apache.org/jira/secure/attachment/12893582/63NGFQRI44HQNPIPEJH5W2TBM6DJZWMI.pdf -> PDFBOX-3977-63NGFQRI44HQNPIPEJH5W2TBM6DJZWMI.pdf https://issues.apache.org/jira/secure/attachment/12896905/GeneralForbearance.pdf -> PDFBOX-3999-GeneralForbearance.pdf https://issues.apache.org/jira/secure/attachment/12919726/sample.pdf -> PDFBOX-4197.pdf https://issues.apache.org/jira/secure/attachment/12938094/Quelldatei.pdf -> PDFBOX-4308.pdf https://issues.apache.org/jira/secure/attachment/12952086/form.pdf -> PDFBOX-4408.pdf https://issues.apache.org/jira/secure/attachment/12953423/000314.pdf -> PDFBOX-4418-000314.pdf https://issues.apache.org/jira/secure/attachment/12953421/000671.pdf -> PDFBOX-4418-000671.pdf https://issues.apache.org/jira/secure/attachment/12953866/000746.pdf -> PDFBOX-4423-000746.pdf https://issues.apache.org/jira/secure/attachment/12966453/cryptfilter.pdf -> PDFBOX-4517-cryptfilter.pdf https://issues.apache.org/jira/secure/attachment/12991833/PDFBOX-4750-test.pdf -> PDFBOX-4750.pdf https://issues.apache.org/jira/secure/attachment/12914331/WXMDXCYRWFDCMOSFQJ5OAJIAFXYRZ5OA.pdf -> PDFBOX-4153-WXMDXCYRWFDCMOSFQJ5OAJIAFXYRZ5OA.pdf https://issues.apache.org/jira/secure/attachment/12962991/NeS1078.pdf -> PDFBOX-4490.pdf https://issues.apache.org/jira/secure/attachment/12784025/PDFBOX-3208-L33MUTT2SVCWGCS6UIYL5TH3PNPXHIS6.pdf https://issues.apache.org/jira/secure/attachment/12867102/PDFBOX-3783-72GLBIGUC6LB46ELZFBARRJTLN4RBSQM.pdf https://issues.apache.org/jira/secure/attachment/12929821/16bit.png -> PDFBOX-4184-16bit.png https://issues.apache.org/jira/secure/attachment/12943502/ArrayIndexOutOfBoundsException%20COSParser -> PDFBOX-4338.pdf https://issues.apache.org/jira/secure/attachment/12943503/NullPointerException%20COSParser -> PDFBOX-4339.pdf https://issues.apache.org/jira/secure/attachment/12867433/genko_oc_shiryo1.pdf https://moji.or.jp/wp-content/ipafont/IPAfont/ipag00303.zip https://moji.or.jp/wp-content/ipafont/IPAfont/ipagp00303.zip https://issues.apache.org/jira/secure/attachment/12911053/n019003l.pfb https://issues.apache.org/jira/secure/attachment/12949710/032163.jpg -> PDFBOX-4184-032163.jpg https://issues.apache.org/jira/secure/attachment/13025718/lotus.jpg -> PDFBOX-5196-lotus.jpg )
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
-_md5_=d2d18c0ea03fff8600282c6b75cc426c
+SRC_URI=mirror://apache/pdfbox/2.0.26/pdfbox-2.0.26-src.zip test? ( https://issues.apache.org/jira/secure/attachment/12481683/1.pdf -> PDFBOX-1031-1.pdf https://issues.apache.org/jira/secure/attachment/12481684/2.pdf -> PDFBOX-1031-2.pdf https://issues.apache.org/jira/secure/attachment/12486525/1_testfile1.pdf -> PDFBOX-1065-1.pdf https://issues.apache.org/jira/secure/attachment/12486526/2_testfile1.pdf -> PDFBOX-1065-2.pdf https://issues.apache.org/jira/secure/attachment/12490774/a.pdf -> PDFBOX-1100-1.pdf https://issues.apache.org/jira/secure/attachment/12490775/b.pdf -> PDFBOX-1100-2.pdf https://issues.apache.org/jira/secure/attachment/12848122/SF1199AEG%20%28Complete%29.pdf -> PDFBOX-3656.pdf https://issues.apache.org/jira/secure/attachment/12852207/test.pdf -> PDFBOX-3682.pdf https://issues.apache.org/jira/secure/attachment/12888957/079977.pdf -> PDFBOX-3940-079977.pdf https://issues.apache.org/jira/secure/attachment/12867113/202097.pdf -> PDFBOX-3785-202097.pdf https://issues.apache.org/jira/secure/attachment/12890031/670064.pdf -> PDFBOX-3947-670064.pdf https://issues.apache.org/jira/secure/attachment/12890034/EUWO6SQS5TM4VGOMRD3FLXZHU35V2CP2.pdf -> PDFBOX-3948-EUWO6SQS5TM4VGOMRD3FLXZHU35V2CP2.pdf https://issues.apache.org/jira/secure/attachment/12890037/MKFYUGZWS3OPXLLVU2Z4LWCTVA5WNOGF.pdf -> PDFBOX-3949-MKFYUGZWS3OPXLLVU2Z4LWCTVA5WNOGF.pdf https://issues.apache.org/jira/secure/attachment/12890042/23EGDHXSBBYQLKYOKGZUOVYVNE675PRD.pdf -> PDFBOX-3950-23EGDHXSBBYQLKYOKGZUOVYVNE675PRD.pdf https://issues.apache.org/jira/secure/attachment/12890047/FIHUZWDDL2VGPOE34N6YHWSIGSH5LVGZ.pdf -> PDFBOX-3951-FIHUZWDDL2VGPOE34N6YHWSIGSH5LVGZ.pdf https://issues.apache.org/jira/secure/attachment/12892097/c687766d68ac766be3f02aaec5e0d713_2.pdf -> PDFBOX-3964-c687766d68ac766be3f02aaec5e0d713_2.pdf https://issues.apache.org/jira/secure/attachment/12893582/63NGFQRI44HQNPIPEJH5W2TBM6DJZWMI.pdf -> PDFBOX-3977-63NGFQRI44HQNPIPEJH5W2TBM6DJZWMI.pdf https://issues.apache.org/jira/secure/attachment/12896905/GeneralForbearance.pdf -> PDFBOX-3999-GeneralForbearance.pdf https://issues.apache.org/jira/secure/attachment/12919726/sample.pdf -> PDFBOX-4197.pdf https://issues.apache.org/jira/secure/attachment/12938094/Quelldatei.pdf -> PDFBOX-4308.pdf https://issues.apache.org/jira/secure/attachment/12952086/form.pdf -> PDFBOX-4408.pdf https://issues.apache.org/jira/secure/attachment/12953423/000314.pdf -> PDFBOX-4418-000314.pdf https://issues.apache.org/jira/secure/attachment/12953421/000671.pdf -> PDFBOX-4418-000671.pdf https://issues.apache.org/jira/secure/attachment/12953866/000746.pdf -> PDFBOX-4423-000746.pdf https://issues.apache.org/jira/secure/attachment/12966453/cryptfilter.pdf -> PDFBOX-4517-cryptfilter.pdf https://issues.apache.org/jira/secure/attachment/12991833/PDFBOX-4750-test.pdf -> PDFBOX-4750.pdf https://issues.apache.org/jira/secure/attachment/12914331/WXMDXCYRWFDCMOSFQJ5OAJIAFXYRZ5OA.pdf -> PDFBOX-4153-WXMDXCYRWFDCMOSFQJ5OAJIAFXYRZ5OA.pdf https://issues.apache.org/jira/secure/attachment/12962991/NeS1078.pdf -> PDFBOX-4490.pdf https://issues.apache.org/jira/secure/attachment/12784025/PDFBOX-3208-L33MUTT2SVCWGCS6UIYL5TH3PNPXHIS6.pdf https://issues.apache.org/jira/secure/attachment/12867102/PDFBOX-3783-72GLBIGUC6LB46ELZFBARRJTLN4RBSQM.pdf https://issues.apache.org/jira/secure/attachment/12929821/16bit.png -> PDFBOX-4184-16bit.png https://issues.apache.org/jira/secure/attachment/12943502/ArrayIndexOutOfBoundsException%20COSParser -> PDFBOX-4338.pdf https://issues.apache.org/jira/secure/attachment/12943503/NullPointerException%20COSParser -> PDFBOX-4339.pdf https://issues.apache.org/jira/secure/attachment/12867433/genko_oc_shiryo1.pdf https://moji.or.jp/wp-content/ipafont/IPAfont/ipag00303.zip https://moji.or.jp/wp-content/ipafont/IPAfont/ipagp00303.zip https://issues.apache.org/jira/secure/attachment/12911053/n019003l.pfb https://issues.apache.org/jira/secure/attachment/12949710/032163.jpg -> PDFBOX-4184-032163.jpg https://issues.apache.org/jira/secure/attachment/13025718/lotus.jpg -> PDFBOX-5196-lotus.jpg https://issues.apache.org/jira/secure/attachment/13002695/13._Korona_szallo_vegzes_13.09.26.eredeti.pdf -> PDFBOX-4831.pdf )
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
+_md5_=1e5d6fbd169d4efe306549bbc5f267c2
diff --git a/metadata/md5-cache/dev-java/picocli-4.6.3-r1 b/metadata/md5-cache/dev-java/picocli-4.6.3-r1
index 1b4138083ea1..08cdcc94407d 100644
--- a/metadata/md5-cache/dev-java/picocli-4.6.3-r1
+++ b/metadata/md5-cache/dev-java/picocli-4.6.3-r1
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
RESTRICT=test !test? ( test )
SLOT=0
SRC_URI=https://github.com/remkop/picocli/archive/v4.6.3.tar.gz -> picocli-4.6.3-sources.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=db5e2ea1ef3c5fff4dd8d4e5c43dbe0a
diff --git a/metadata/md5-cache/dev-java/plexus-classworlds-2.2.3 b/metadata/md5-cache/dev-java/plexus-classworlds-2.2.3
index b02c7c5134e0..fb39c5534fb1 100644
--- a/metadata/md5-cache/dev-java/plexus-classworlds-2.2.3
+++ b/metadata/md5-cache/dev-java/plexus-classworlds-2.2.3
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://dev.gentoo.org/~ercpe/distfiles/dev-java/plexus-classworlds/plexus-classworlds-2.2.3.tar.bz2
-_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 cfb5f6911bb70204c94ceafd0372c716 multilib 4fbbbc98f236f1b43acd99476bc3cd85 toolchain-funcs e9da88162e7a3c60376e80c2c2adcdfb
_md5_=f5be57cb43c766cedbf3913f56dcc9f5
diff --git a/metadata/md5-cache/dev-java/poi-5.0.0 b/metadata/md5-cache/dev-java/poi-5.0.0
index 943264ba98ba..7dcdb3cc03bf 100644
--- a/metadata/md5-cache/dev-java/poi-5.0.0
+++ b/metadata/md5-cache/dev-java/poi-5.0.0
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
RDEPEND=>=virtual/jre-1.8:* >=dev-java/commons-codec-1.11:0 >=dev-java/commons-collections-4.1:4 >=dev-java/commons-math-3.6.1:3 >=dev-java/slf4j-api-1.7.30:0 >=dev-java/sparsebitset-1.2:0 dev-java/commons-logging:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=0
SRC_URI=https://archive.apache.org/dist/poi/release/src/poi-src-5.0.0-20210120.tar.gz -> poi-5.0.0.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=d5de5639d67fc3cfc5734f5cbbea16f8
diff --git a/metadata/md5-cache/dev-java/protobuf-java-3.17.3 b/metadata/md5-cache/dev-java/protobuf-java-3.17.3
index fde95bd8cfe1..76f40b8cbc23 100644
--- a/metadata/md5-cache/dev-java/protobuf-java-3.17.3
+++ b/metadata/md5-cache/dev-java/protobuf-java-3.17.3
@@ -11,5 +11,5 @@ LICENSE=BSD
RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=0/28
SRC_URI=https://github.com/protocolbuffers/protobuf/archive/v3.17.3.tar.gz -> protobuf-3.17.3.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=96a63f10c1b4d9a9eaa37a3a5bee43bb
diff --git a/metadata/md5-cache/dev-java/protobuf-java-3.19.3 b/metadata/md5-cache/dev-java/protobuf-java-3.19.3
index 36aa7722914d..b8289f220386 100644
--- a/metadata/md5-cache/dev-java/protobuf-java-3.19.3
+++ b/metadata/md5-cache/dev-java/protobuf-java-3.19.3
@@ -11,5 +11,5 @@ LICENSE=BSD
RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=0/30
SRC_URI=https://github.com/protocolbuffers/protobuf/archive/v3.19.3.tar.gz -> protobuf-3.19.3.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=c715873210be022cf2d9f30d2bfcaa8b
diff --git a/metadata/md5-cache/dev-java/protobuf-java-9999 b/metadata/md5-cache/dev-java/protobuf-java-9999
index 8028cb10fbfb..5a0070eaa9dc 100644
--- a/metadata/md5-cache/dev-java/protobuf-java-9999
+++ b/metadata/md5-cache/dev-java/protobuf-java-9999
@@ -10,5 +10,5 @@ LICENSE=BSD
PROPERTIES=live
RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=0/30
-_eclasses_=git-r3 b9ac6f96d2a88edb5b351df634dc5e53 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=git-r3 b9ac6f96d2a88edb5b351df634dc5e53 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=feafd3e9e534a0afae32f75e585cd380
diff --git a/metadata/md5-cache/dev-java/qdox-1.12.1-r3 b/metadata/md5-cache/dev-java/qdox-1.12.1-r3
index 060e7a399377..e4891d516e6f 100644
--- a/metadata/md5-cache/dev-java/qdox-1.12.1-r3
+++ b/metadata/md5-cache/dev-java/qdox-1.12.1-r3
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* dev-java/ant-core:0 >=dev-java/java-config-2.2.0-r3
RESTRICT=!test? ( test )
SLOT=1.12
SRC_URI=https://github.com/codehaus/qdox/archive/qdox-1.12.1.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=e64f90ccc4aa2c6b1d9796d8e86b2a08
diff --git a/metadata/md5-cache/dev-java/randomized-runner-2.7.9 b/metadata/md5-cache/dev-java/randomized-runner-2.7.9
index bc69e4bac36c..1e37df801798 100644
--- a/metadata/md5-cache/dev-java/randomized-runner-2.7.9
+++ b/metadata/md5-cache/dev-java/randomized-runner-2.7.9
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/junit-4.12:4 >=dev-java/java-config-2.2.0
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://github.com/randomizedtesting/randomizedtesting/archive/release/2.7.9.tar.gz -> randomized-runner-2.7.9.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=cf62f79fbdb1a6a21f5406895ae275b6
diff --git a/metadata/md5-cache/dev-java/rat-0.13 b/metadata/md5-cache/dev-java/rat-0.13
index 4036212864bc..21a4ab286843 100644
--- a/metadata/md5-cache/dev-java/rat-0.13
+++ b/metadata/md5-cache/dev-java/rat-0.13
@@ -8,5 +8,5 @@ KEYWORDS=amd64 x86
LICENSE=Apache-2.0
RDEPEND=~dev-java/apache-rat-core-0.13:0 ~dev-java/apache-rat-tasks-0.13:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3
SLOT=0
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=d3abfd8c59cbe78b7c86854cba028d0c
diff --git a/metadata/md5-cache/dev-java/reflections-0.9.10-r1 b/metadata/md5-cache/dev-java/reflections-0.9.10-r1
deleted file mode 100644
index 6b69b46c36be..000000000000
--- a/metadata/md5-cache/dev-java/reflections-0.9.10-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.7 dev-java/commons-vfs:2 dev-java/dom4j:1 dev-java/gson:2.6 dev-java/guava:20 dev-java/javassist:3 dev-java/jsr305:0 dev-java/slf4j-api:0 dev-java/tomcat-servlet-api:3.1 app-arch/unzip >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Java runtime metadata analysis
-EAPI=6
-HOMEPAGE=https://github.com/ronmamo/reflections
-INHERIT=java-pkg-2 java-pkg-simple
-IUSE=doc source
-KEYWORDS=amd64 ~arm arm64 ppc64 x86
-LICENSE=WTFPL-2
-RDEPEND=>=virtual/jre-1.7 dev-java/commons-vfs:2 dev-java/dom4j:1 dev-java/gson:2.6 dev-java/guava:20 dev-java/javassist:3 dev-java/jsr305:0 dev-java/slf4j-api:0 dev-java/tomcat-servlet-api:3.1 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=http://search.maven.org/remotecontent?filepath=org/reflections/reflections/0.9.10/reflections-0.9.10-sources.jar
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 eapi7-ver 1a0a60ad07c8b32d2faba2d085dc0f24 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 9f813bb3c47cf2e60619a663b87c5f4e estack 055c42df72f76a4f45ec92b35e83cd56 eutils dab5d8ec471d025b79c9e6906bcf3bff java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 ltprune 97143780d341cc8d8f1d4c6187a36d29 multilib 4a33c9008e5ee30cb8840a3fdc24df2b preserve-libs a8e50acee31b5759b4df1f7707cae54b strip-linguas ac3ee41ee2d31d8c41a77c0838320cc7 toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8 vcs-clean d271b7bc7e6a009758d7d4ef749174e3 versionator d3fb3ba33acc3bbbdc4d7970227c100d wrapper 4a1902f969e5718126434fc35f3a0d9c
-_md5_=3050442ece8cfcbbf6173ca3b3351ef6
diff --git a/metadata/md5-cache/dev-java/reflections-0.9.12-r2 b/metadata/md5-cache/dev-java/reflections-0.9.12-r2
index 808d9c9409c6..66b6772429c3 100644
--- a/metadata/md5-cache/dev-java/reflections-0.9.12-r2
+++ b/metadata/md5-cache/dev-java/reflections-0.9.12-r2
@@ -5,11 +5,11 @@ EAPI=8
HOMEPAGE=https://github.com/ronmamo/reflections
INHERIT=java-pkg-2 java-pkg-simple
IUSE=doc source test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ppc64 x86
LICENSE=WTFPL-2 BSD-2
RDEPEND=>=virtual/jre-1.8:* dev-java/dom4j:1 dev-java/gson:2.9 dev-java/javassist:3 dev-java/slf4j-api:0 dev-java/slf4j-simple:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://github.com/ronmamo/reflections/archive/0.9.12.tar.gz -> reflections-0.9.12.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
-_md5_=d1399bc4d9841e2cece22e580e1b4c97
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
+_md5_=0647b7846a8a11506b5df9851b13828d
diff --git a/metadata/md5-cache/dev-java/reflections-0.9.12-r3 b/metadata/md5-cache/dev-java/reflections-0.9.12-r3
new file mode 100644
index 000000000000..8e8ef425bfca
--- /dev/null
+++ b/metadata/md5-cache/dev-java/reflections-0.9.12-r3
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=dev-java/tomcat-servlet-api:2.5 >=virtual/jdk-11:* dev-java/dom4j:1 dev-java/gson:2.9 dev-java/javassist:3 dev-java/slf4j-api:0 dev-java/slf4j-simple:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
+DESCRIPTION=Reflections - a Java runtime metadata analysis
+EAPI=8
+HOMEPAGE=https://github.com/ronmamo/reflections
+INHERIT=java-pkg-2 java-pkg-simple
+IUSE=doc source test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=WTFPL-2 BSD-2
+RDEPEND=>=virtual/jre-1.8:* dev-java/dom4j:1 dev-java/gson:2.9 dev-java/javassist:3 dev-java/slf4j-api:0 dev-java/slf4j-simple:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ronmamo/reflections/archive/0.9.12.tar.gz -> reflections-0.9.12.tar.gz
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
+_md5_=3934a0fde540feee9e1d61371cbf0ab2
diff --git a/metadata/md5-cache/dev-java/relaxng-datatype-1.0-r2 b/metadata/md5-cache/dev-java/relaxng-datatype-1.0-r2
deleted file mode 100644
index 484f2cc55667..000000000000
--- a/metadata/md5-cache/dev-java/relaxng-datatype-1.0-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=app-arch/unzip >=virtual/jdk-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Interface between RELAX NG validators and datatype libraries
-EAPI=6
-HOMEPAGE=https://relaxng.org/
-INHERIT=java-pkg-2 java-pkg-simple
-IUSE=doc source
-KEYWORDS=amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=BSD
-RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://sourceforge/relaxng/relaxngDatatype-1.0.zip -> relaxng-datatype-1.0.zip
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 eapi7-ver 1a0a60ad07c8b32d2faba2d085dc0f24 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 9f813bb3c47cf2e60619a663b87c5f4e estack 055c42df72f76a4f45ec92b35e83cd56 eutils dab5d8ec471d025b79c9e6906bcf3bff java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 ltprune 97143780d341cc8d8f1d4c6187a36d29 multilib 4a33c9008e5ee30cb8840a3fdc24df2b preserve-libs a8e50acee31b5759b4df1f7707cae54b strip-linguas ac3ee41ee2d31d8c41a77c0838320cc7 toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8 vcs-clean d271b7bc7e6a009758d7d4ef749174e3 versionator d3fb3ba33acc3bbbdc4d7970227c100d wrapper 4a1902f969e5718126434fc35f3a0d9c
-_md5_=5ee49b07c286804f7f0c01276a9fe1e8
diff --git a/metadata/md5-cache/dev-java/relaxng-datatype-1.0-r3 b/metadata/md5-cache/dev-java/relaxng-datatype-1.0-r3
index 77b43115501b..5217294a2e66 100644
--- a/metadata/md5-cache/dev-java/relaxng-datatype-1.0-r3
+++ b/metadata/md5-cache/dev-java/relaxng-datatype-1.0-r3
@@ -6,10 +6,10 @@ EAPI=8
HOMEPAGE=https://relaxng.org/
INHERIT=java-pkg-2 java-pkg-simple
IUSE=doc source
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
LICENSE=BSD
RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=0
SRC_URI=mirror://sourceforge/relaxng/relaxngDatatype-1.0.zip -> relaxng-datatype-1.0.zip
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
-_md5_=7080dc385de660288ae62908e7da438e
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
+_md5_=6b41635752749efe6c795a098b293ad6
diff --git a/metadata/md5-cache/dev-java/resin-servlet-api-3.0.25-r1 b/metadata/md5-cache/dev-java/resin-servlet-api-3.0.25-r1
index 6c2d946f17df..53e9edcd19f9 100644
--- a/metadata/md5-cache/dev-java/resin-servlet-api-3.0.25-r1
+++ b/metadata/md5-cache/dev-java/resin-servlet-api-3.0.25-r1
@@ -11,5 +11,5 @@ LICENSE=GPL-2+
RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=2.4
SRC_URI=http://www.caucho.com/download/resin-3.0.25-src.zip mirror://gentoo/resin-gentoo-patches-3.0.25.tar.bz2
-_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 cfb5f6911bb70204c94ceafd0372c716 multilib 4fbbbc98f236f1b43acd99476bc3cd85 toolchain-funcs e9da88162e7a3c60376e80c2c2adcdfb
_md5_=65d5b79e953b706a291d61e12571b93f
diff --git a/metadata/md5-cache/dev-java/resin-servlet-api-4.0.27-r2 b/metadata/md5-cache/dev-java/resin-servlet-api-4.0.27-r2
index 1d92d5527d23..018d635957dd 100644
--- a/metadata/md5-cache/dev-java/resin-servlet-api-4.0.27-r2
+++ b/metadata/md5-cache/dev-java/resin-servlet-api-4.0.27-r2
@@ -10,5 +10,5 @@ LICENSE=GPL-2
RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=3.0
SRC_URI=https://caucho.com/download/resin-4.0.27-src.tar.gz
-_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 cfb5f6911bb70204c94ceafd0372c716 multilib 4fbbbc98f236f1b43acd99476bc3cd85 toolchain-funcs e9da88162e7a3c60376e80c2c2adcdfb
_md5_=429fbf89c07d222703761b31c67eacfc
diff --git a/metadata/md5-cache/dev-java/resin-servlet-api-4.0.46-r1 b/metadata/md5-cache/dev-java/resin-servlet-api-4.0.46-r1
index ff0eeb845512..ecea9a96b7b7 100644
--- a/metadata/md5-cache/dev-java/resin-servlet-api-4.0.46-r1
+++ b/metadata/md5-cache/dev-java/resin-servlet-api-4.0.46-r1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=3.1
SRC_URI=https://caucho.com/download/resin-4.0.46-src.tar.gz
-_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 cfb5f6911bb70204c94ceafd0372c716 multilib 4fbbbc98f236f1b43acd99476bc3cd85 toolchain-funcs e9da88162e7a3c60376e80c2c2adcdfb
_md5_=13dffd9c17ccbe2c79962cdaac838432
diff --git a/metadata/md5-cache/dev-java/rhino-1.7.14 b/metadata/md5-cache/dev-java/rhino-1.7.14
index ae8c1d166221..bf96f67bdaad 100644
--- a/metadata/md5-cache/dev-java/rhino-1.7.14
+++ b/metadata/md5-cache/dev-java/rhino-1.7.14
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
RESTRICT=test !test? ( test )
SLOT=1.6
SRC_URI=https://github.com/mozilla/rhino/archive/Rhino1_7_14_Release.tar.gz -> rhino-1.7.14.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=e22c22e09284defb9a49b15e471af42c
diff --git a/metadata/md5-cache/dev-java/rome-0.9-r4 b/metadata/md5-cache/dev-java/rome-0.9-r4
index bc3d54d177b2..e7fca30c4715 100644
--- a/metadata/md5-cache/dev-java/rome-0.9-r4
+++ b/metadata/md5-cache/dev-java/rome-0.9-r4
@@ -12,5 +12,5 @@ RDEPEND=dev-java/jdom:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 sour
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=mirror://gentoo/rome-0.9.zip
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=213f0e66eb276ced3a6c501f727e5592
diff --git a/metadata/md5-cache/dev-java/rxtx-2.2_pre2-r2 b/metadata/md5-cache/dev-java/rxtx-2.2_pre2-r2
index 28d4d6cebd08..127e7d8df117 100644
--- a/metadata/md5-cache/dev-java/rxtx-2.2_pre2-r2
+++ b/metadata/md5-cache/dev-java/rxtx-2.2_pre2-r2
@@ -11,5 +11,5 @@ LICENSE=LGPL-2.1+
RDEPEND=>=virtual/jre-1.8:* lfd? ( sys-apps/xinetd ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=2
SRC_URI=ftp://ftp.qbang.org/pub/rxtx/rxtx-2.2pre2.zip
-_eclasses_=autotools b46e8992a8126c894fbdc8084fc040c4 gnuconfig b6b3e92f8b8c996400074b5f61a59256 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 libtool 241a8f577b9781a42a7421e53448a44e multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools 136117fb43a9bf5598530e9cc642f710 gnuconfig b6b3e92f8b8c996400074b5f61a59256 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 cfb5f6911bb70204c94ceafd0372c716 libtool 241a8f577b9781a42a7421e53448a44e multilib 4fbbbc98f236f1b43acd99476bc3cd85 toolchain-funcs e9da88162e7a3c60376e80c2c2adcdfb
_md5_=625c67cac350aab0cd4d989cb074031f
diff --git a/metadata/md5-cache/dev-java/sac-1.3-r4 b/metadata/md5-cache/dev-java/sac-1.3-r4
index f85b527c5092..2cca7cf68f44 100644
--- a/metadata/md5-cache/dev-java/sac-1.3-r4
+++ b/metadata/md5-cache/dev-java/sac-1.3-r4
@@ -11,5 +11,5 @@ LICENSE=W3C
RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=0
SRC_URI=https://www.w3.org/2002/06/sacjava-1.3.zip -> sac-1.3.zip
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=1b00e55158cbaeeb6aeb966bb8d0e47e
diff --git a/metadata/md5-cache/dev-java/saslprep-1.1 b/metadata/md5-cache/dev-java/saslprep-1.1
new file mode 100644
index 000000000000..916b9e70da8f
--- /dev/null
+++ b/metadata/md5-cache/dev-java/saslprep-1.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=>=virtual/jdk-1.8:* dev-java/stringprep:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=SASLprep: Stringprep Profile for User Names and Passwords
+EAPI=8
+HOMEPAGE=https://gitlab.com/ongresinc/stringprep
+INHERIT=java-pkg-2 java-pkg-simple
+IUSE=doc source
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=BSD-2
+RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+SLOT=0
+SRC_URI=https://repo1.maven.org/maven2/com/ongres/stringprep/saslprep/1.1/saslprep-1.1-sources.jar
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
+_md5_=4b3d9bb0a3cfa48a4a096cdb1e403c18
diff --git a/metadata/md5-cache/dev-java/sax-2.2.1-r5 b/metadata/md5-cache/dev-java/sax-2.2.1-r5
index 2c7b1ebcb234..ac0da8bc93bc 100644
--- a/metadata/md5-cache/dev-java/sax-2.2.1-r5
+++ b/metadata/md5-cache/dev-java/sax-2.2.1-r5
@@ -11,5 +11,5 @@ LICENSE=public-domain
RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=0
SRC_URI=mirror://sourceforge/sax/sax2r3.zip -> sax-2.2.1.zip
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=7a2c78e8c769fc141720a601e6ffdfdf
diff --git a/metadata/md5-cache/dev-java/saxon-6.5.5-r3 b/metadata/md5-cache/dev-java/saxon-6.5.5-r3
index be0f28d4479f..12d79a96e8d1 100644
--- a/metadata/md5-cache/dev-java/saxon-6.5.5-r3
+++ b/metadata/md5-cache/dev-java/saxon-6.5.5-r3
@@ -11,5 +11,5 @@ LICENSE=MPL-1.1
RDEPEND=dev-java/jdom:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=6.5
SRC_URI=mirror://sourceforge/project/saxon/saxon6/6.5.5/saxon6-5-5.zip
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=58ccce8abcdbad8e38d4e11952e2031c
diff --git a/metadata/md5-cache/dev-java/saxon-9.2.0.6-r3 b/metadata/md5-cache/dev-java/saxon-9.2.0.6-r3
index c52dfc7c59af..26f34fa11ef7 100644
--- a/metadata/md5-cache/dev-java/saxon-9.2.0.6-r3
+++ b/metadata/md5-cache/dev-java/saxon-9.2.0.6-r3
@@ -11,5 +11,5 @@ LICENSE=MPL-1.0
RDEPEND=dev-java/xom:0 dev-java/jdom:0 dev-java/dom4j:1 dev-java/ant-core >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=9
SRC_URI=mirror://sourceforge/project/saxon/Saxon-HE/9.2/saxonhe9-2-0-6source.zip
-_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 cfb5f6911bb70204c94ceafd0372c716 multilib 4fbbbc98f236f1b43acd99476bc3cd85 toolchain-funcs e9da88162e7a3c60376e80c2c2adcdfb
_md5_=714ce958990a1f8eef01a9a22a724c8d
diff --git a/metadata/md5-cache/dev-java/sbt-0.13.13 b/metadata/md5-cache/dev-java/sbt-0.13.13
index db98d6e84efd..2d21a5a529c4 100644
--- a/metadata/md5-cache/dev-java/sbt-0.13.13
+++ b/metadata/md5-cache/dev-java/sbt-0.13.13
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8 dev-lang/scala >=dev-java/java-config-2.2.0-r3
RESTRICT=test
SLOT=0
SRC_URI=!binary? ( https://dev.gentoo.org/~gienah/snapshots/sbt-0.13.13-src.tar.xz https://dev.gentoo.org/~gienah/snapshots/sbt-0.13.13-ivy2-deps.tar.xz https://dev.gentoo.org/~gienah/snapshots/sbt-0.13.13-sbt-deps.tar.xz http://repo.typesafe.com/typesafe/ivy-releases/org.scala-sbt/sbt-launch/0.13.13/sbt-launch.jar -> sbt-launch-0.13.13.jar ) binary? ( https://dev.gentoo.org/~gienah/files/dist/sbt-0.13.13-gentoo-binary.tar.xz )
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 eapi7-ver 1a0a60ad07c8b32d2faba2d085dc0f24 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 9f813bb3c47cf2e60619a663b87c5f4e estack 055c42df72f76a4f45ec92b35e83cd56 eutils dab5d8ec471d025b79c9e6906bcf3bff java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 ltprune 97143780d341cc8d8f1d4c6187a36d29 multilib 4a33c9008e5ee30cb8840a3fdc24df2b preserve-libs a8e50acee31b5759b4df1f7707cae54b strip-linguas ac3ee41ee2d31d8c41a77c0838320cc7 toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8 vcs-clean d271b7bc7e6a009758d7d4ef749174e3 versionator d3fb3ba33acc3bbbdc4d7970227c100d wrapper 4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=desktop 22952d8f27cac191d75529d4c38e6bfa eapi7-ver 1a0a60ad07c8b32d2faba2d085dc0f24 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 28f0f3c0226306ec5f49e13bf851f171 estack 055c42df72f76a4f45ec92b35e83cd56 eutils dab5d8ec471d025b79c9e6906bcf3bff java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 cfb5f6911bb70204c94ceafd0372c716 ltprune 97143780d341cc8d8f1d4c6187a36d29 multilib 4fbbbc98f236f1b43acd99476bc3cd85 preserve-libs a8e50acee31b5759b4df1f7707cae54b strip-linguas ac3ee41ee2d31d8c41a77c0838320cc7 toolchain-funcs e9da88162e7a3c60376e80c2c2adcdfb vcs-clean d271b7bc7e6a009758d7d4ef749174e3 versionator d3fb3ba33acc3bbbdc4d7970227c100d wrapper 4a1902f969e5718126434fc35f3a0d9c
_md5_=4f028ee99085e12312946b85e649cd8f
diff --git a/metadata/md5-cache/dev-java/sbt-0.13.18 b/metadata/md5-cache/dev-java/sbt-0.13.18-r1
index b5a792b31725..bbee6ee957ea 100644
--- a/metadata/md5-cache/dev-java/sbt-0.13.18
+++ b/metadata/md5-cache/dev-java/sbt-0.13.18-r1
@@ -1,15 +1,15 @@
DEFINED_PHASES=compile install preinst prepare setup test unpack
-DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3
+DEPEND=virtual/jdk:1.8 >=dev-java/java-config-2.2.0-r3
DESCRIPTION=sbt is a build tool for Scala and Java projects that aims to do the basics well
-EAPI=7
+EAPI=8
HOMEPAGE=https://www.scala-sbt.org/
INHERIT=java-pkg-2
IUSE=binary
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
LICENSE=BSD
RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3
RESTRICT=test
SLOT=0
-SRC_URI=!binary? ( https://github.com/sbt/sbt/archive/v0.13.18.tar.gz -> sbt-0.13.18.tar.gz https://dev.gentoo.org/~gienah/snapshots/sbt-0.13.18-ivy2-deps.tar.xz https://dev.gentoo.org/~gienah/snapshots/sbt-0.13.18-sbt-deps.tar.xz http://repo.typesafe.com/typesafe/ivy-releases/org.scala-sbt/sbt-launch/0.13.18/sbt-launch.jar -> sbt-launch-0.13.18.jar ) binary? ( https://dev.gentoo.org/~gienah/files/dist/sbt-0.13.18-gentoo-binary.tar.xz )
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
-_md5_=697eb5ced0f4c9b0055c7213576bfcc3
+SRC_URI=!binary? ( https://github.com/sbt/sbt/archive/v0.13.18.tar.gz -> sbt-0.13.18.tar.gz https://dev.gentoo.org/~gienah/snapshots/sbt-0.13.18-ivy2-deps.tar.xz https://dev.gentoo.org/~gienah/snapshots/sbt-0.13.18-sbt-deps.tar.xz https://repo.typesafe.com/typesafe/ivy-releases/org.scala-sbt/sbt-launch/0.13.18/sbt-launch.jar -> sbt-launch-0.13.18.jar ) binary? ( https://dev.gentoo.org/~gienah/distfiles/sbt-0.13.18-gentoo-binary.tar.xz )
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 cfb5f6911bb70204c94ceafd0372c716
+_md5_=f8da03f44a49e9fb0a2002e6e2cbdaf5
diff --git a/metadata/md5-cache/dev-java/sbt-bin-1.3.10 b/metadata/md5-cache/dev-java/sbt-bin-1.3.10
index 1a12020a2be3..365144a044ec 100644
--- a/metadata/md5-cache/dev-java/sbt-bin-1.3.10
+++ b/metadata/md5-cache/dev-java/sbt-bin-1.3.10
@@ -4,10 +4,10 @@ DESCRIPTION=sbt, a build tool for Scala
EAPI=7
HOMEPAGE=https://scala-sbt.org
INHERIT=java-pkg-2
-KEYWORDS=~amd64
+KEYWORDS=amd64
LICENSE=BSD
RDEPEND=>=virtual/jre-1.7 !dev-java/sbt >=dev-java/java-config-2.2.0-r3
SLOT=0
SRC_URI=https://github.com/sbt/sbt/releases/download/v1.3.10/sbt-1.3.10.tgz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
-_md5_=ed5c0d9ba3515bbf495ea011a782277a
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 cfb5f6911bb70204c94ceafd0372c716
+_md5_=28efc05686efb589220457113eb9de74
diff --git a/metadata/md5-cache/dev-java/sbt-bin-1.3.2 b/metadata/md5-cache/dev-java/sbt-bin-1.3.2
deleted file mode 100644
index 248a3796469a..000000000000
--- a/metadata/md5-cache/dev-java/sbt-bin-1.3.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup unpack
-DEPEND=>=dev-java/java-config-2.2.0-r3
-DESCRIPTION=sbt, a build tool for Scala
-EAPI=7
-HOMEPAGE=https://scala-sbt.org
-INHERIT=java-pkg-2
-KEYWORDS=amd64
-LICENSE=BSD
-RDEPEND=>=virtual/jre-1.7 !dev-java/sbt >=dev-java/java-config-2.2.0-r3
-SLOT=0
-SRC_URI=https://github.com/sbt/sbt/releases/download/v1.3.2/sbt-1.3.2.tgz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
-_md5_=9e74c2dc0e226b9dacf531839775e184
diff --git a/metadata/md5-cache/dev-java/scram-2.1 b/metadata/md5-cache/dev-java/scram-2.1
new file mode 100644
index 000000000000..a9abfc8b6a88
--- /dev/null
+++ b/metadata/md5-cache/dev-java/scram-2.1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=>=virtual/jdk-1.8:* dev-java/saslprep:0 dev-java/findbugs-annotations:0 dev-java/jsr305:0 test? ( dev-java/stringprep:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
+DESCRIPTION=Java Implementation of the Salted Challenge Response Authentication Mechanism
+EAPI=8
+HOMEPAGE=https://gitlab.com/ongresinc/scram
+INHERIT=java-pkg-2 java-pkg-simple
+IUSE=doc source test
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=BSD
+RDEPEND=>=virtual/jre-1.8:* dev-java/saslprep:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://gitlab.com/ongresinc/scram/-/archive/2.1/scram-2.1.tar.gz
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
+_md5_=40910d029580e2ea61a544344056bd59
diff --git a/metadata/md5-cache/dev-java/sjsxp-1.0.2 b/metadata/md5-cache/dev-java/sjsxp-1.0.2
index f2f88ec4c219..8ad3ada2f24b 100644
--- a/metadata/md5-cache/dev-java/sjsxp-1.0.2
+++ b/metadata/md5-cache/dev-java/sjsxp-1.0.2
@@ -11,5 +11,5 @@ LICENSE=GPL-2
RDEPEND=dev-java/xpp3:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=0
SRC_URI=https://repo1.maven.org/maven2/com/sun/xml/stream/sjsxp/1.0.2/sjsxp-1.0.2-sources.jar
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=308d0100ae4ba811f4261b0944400eaf
diff --git a/metadata/md5-cache/dev-java/slf4j-api-1.7.36 b/metadata/md5-cache/dev-java/slf4j-api-1.7.36
index 47c319011b5d..4843fb0be297 100644
--- a/metadata/md5-cache/dev-java/slf4j-api-1.7.36
+++ b/metadata/md5-cache/dev-java/slf4j-api-1.7.36
@@ -12,5 +12,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://github.com/qos-ch/slf4j/archive/v_1.7.36.tar.gz -> slf4j-1.7.36.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=338f4e479d80a739f05e04a17f5dfd25
diff --git a/metadata/md5-cache/dev-java/slf4j-ext-1.7.36 b/metadata/md5-cache/dev-java/slf4j-ext-1.7.36
index 584e103c70a1..4b34171a463b 100644
--- a/metadata/md5-cache/dev-java/slf4j-ext-1.7.36
+++ b/metadata/md5-cache/dev-java/slf4j-ext-1.7.36
@@ -10,5 +10,5 @@ LICENSE=MIT
RDEPEND=>=virtual/jre-1.8:* dev-java/cal10n:0 dev-java/commons-lang:2.1 dev-java/javassist:3 ~dev-java/slf4j-api-1.7.36:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=0
SRC_URI=https://github.com/qos-ch/slf4j/archive/v_1.7.36.tar.gz -> slf4j-1.7.36.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=10ce5b7c3440e8afa5c532cf009b1588
diff --git a/metadata/md5-cache/dev-java/slf4j-nop-1.7.36 b/metadata/md5-cache/dev-java/slf4j-nop-1.7.36
index 75d0e83a9aa4..72a060c40870 100644
--- a/metadata/md5-cache/dev-java/slf4j-nop-1.7.36
+++ b/metadata/md5-cache/dev-java/slf4j-nop-1.7.36
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* ~dev-java/slf4j-api-1.7.36:0 >=dev-java/java-config-
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://github.com/qos-ch/slf4j/archive/v_1.7.36.tar.gz -> slf4j-1.7.36.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=3e3bf4e30cff976cd3b3aa2ec11881d2
diff --git a/metadata/md5-cache/dev-java/slf4j-simple-1.7.36 b/metadata/md5-cache/dev-java/slf4j-simple-1.7.36
index 5f7906169ed9..9c99c07170a5 100644
--- a/metadata/md5-cache/dev-java/slf4j-simple-1.7.36
+++ b/metadata/md5-cache/dev-java/slf4j-simple-1.7.36
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* ~dev-java/slf4j-api-1.7.36:0 >=dev-java/java-config-
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://github.com/qos-ch/slf4j/archive/v_1.7.36.tar.gz -> slf4j-1.7.36.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=b11f579dd89a57a61786c3acc4558cd6
diff --git a/metadata/md5-cache/dev-java/snakeyaml-1.30 b/metadata/md5-cache/dev-java/snakeyaml-1.30
index fbade2100e98..dc571635d755 100644
--- a/metadata/md5-cache/dev-java/snakeyaml-1.30
+++ b/metadata/md5-cache/dev-java/snakeyaml-1.30
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://bitbucket.org/snakeyaml/snakeyaml/get/snakeyaml-1.30.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=5014e3fa46e22db553e98f253185d3f4
diff --git a/metadata/md5-cache/dev-java/snappy-1.1.7.8 b/metadata/md5-cache/dev-java/snappy-1.1.7.8
index bdaeff06f93d..9bfcb5c96c1b 100644
--- a/metadata/md5-cache/dev-java/snappy-1.1.7.8
+++ b/metadata/md5-cache/dev-java/snappy-1.1.7.8
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* dev-java/osgi-core-api:0 app-arch/snappy dev-libs/bi
RESTRICT=test !test? ( test )
SLOT=1.1
SRC_URI=https://github.com/xerial/snappy-java/archive/1.1.7.8.tar.gz -> snappy-java-1.1.7.8.tar.gz
-_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 cfb5f6911bb70204c94ceafd0372c716 multilib 4fbbbc98f236f1b43acd99476bc3cd85 toolchain-funcs e9da88162e7a3c60376e80c2c2adcdfb
_md5_=30bfd61a20e562d852946b5ef1c2c7c4
diff --git a/metadata/md5-cache/dev-java/sparsebitset-1.2 b/metadata/md5-cache/dev-java/sparsebitset-1.2
index 8d90d67d1303..7d7117a57116 100644
--- a/metadata/md5-cache/dev-java/sparsebitset-1.2
+++ b/metadata/md5-cache/dev-java/sparsebitset-1.2
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://github.com/brettwooldridge/SparseBitSet/archive/refs/tags/SparseBitSet-1.2.tar.gz -> sparsebitset-1.2.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=12a6f2e60d75f585b97926231f87136b
diff --git a/metadata/md5-cache/dev-java/spec-alpha-0.1.143 b/metadata/md5-cache/dev-java/spec-alpha-0.1.143
index 28aad0120ead..dd3d6834da07 100644
--- a/metadata/md5-cache/dev-java/spec-alpha-0.1.143
+++ b/metadata/md5-cache/dev-java/spec-alpha-0.1.143
@@ -9,5 +9,5 @@ LICENSE=EPL-1.0
RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3
SLOT=0.1
SRC_URI=https://github.com/clojure/spec.alpha/archive/spec.alpha-0.1.143.tar.gz -> spec-alpha-0.1.143.tar.gz
-_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 cfb5f6911bb70204c94ceafd0372c716 multilib 4fbbbc98f236f1b43acd99476bc3cd85 toolchain-funcs e9da88162e7a3c60376e80c2c2adcdfb
_md5_=bba66ecd87479c84051f091f7a333b9d
diff --git a/metadata/md5-cache/dev-java/spec-alpha-0.2.176 b/metadata/md5-cache/dev-java/spec-alpha-0.2.176
index 66cc05f32b22..102fe6c229d0 100644
--- a/metadata/md5-cache/dev-java/spec-alpha-0.2.176
+++ b/metadata/md5-cache/dev-java/spec-alpha-0.2.176
@@ -9,5 +9,5 @@ LICENSE=EPL-1.0
RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3
SLOT=0.2
SRC_URI=https://github.com/clojure/spec.alpha/archive/spec.alpha-0.2.176.tar.gz -> spec-alpha-0.2.176.tar.gz
-_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 cfb5f6911bb70204c94ceafd0372c716 multilib 4fbbbc98f236f1b43acd99476bc3cd85 toolchain-funcs e9da88162e7a3c60376e80c2c2adcdfb
_md5_=1b7aef6dad85d62a04e7c6e251d3c238
diff --git a/metadata/md5-cache/dev-java/spec-alpha-0.2.194 b/metadata/md5-cache/dev-java/spec-alpha-0.2.194
index f5f4b0cf6426..0b0826d9523c 100644
--- a/metadata/md5-cache/dev-java/spec-alpha-0.2.194
+++ b/metadata/md5-cache/dev-java/spec-alpha-0.2.194
@@ -9,5 +9,5 @@ LICENSE=EPL-1.0
RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3
SLOT=0.2
SRC_URI=https://github.com/clojure/spec.alpha/archive/spec.alpha-0.2.194.tar.gz -> spec-alpha-0.2.194.tar.gz
-_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 cfb5f6911bb70204c94ceafd0372c716 multilib 4fbbbc98f236f1b43acd99476bc3cd85 toolchain-funcs e9da88162e7a3c60376e80c2c2adcdfb
_md5_=e5d86d5dd44cbc84e39df89aeaf70d07
diff --git a/metadata/md5-cache/dev-java/spin-1.5-r2 b/metadata/md5-cache/dev-java/spin-1.5-r2
deleted file mode 100644
index de48c32a4169..000000000000
--- a/metadata/md5-cache/dev-java/spin-1.5-r2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.8:* dev-java/cglib:3 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:0 )
-DESCRIPTION=Transparent threading solution for non-freezing Swing applications.
-EAPI=8
-HOMEPAGE=http://spin.sourceforge.net
-INHERIT=java-pkg-2 java-pkg-simple
-IUSE=doc source test
-KEYWORDS=amd64 x86
-LICENSE=LGPL-3
-RDEPEND=>=virtual/jre-1.8:* dev-java/cglib:3 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://sourceforge/project/spin/spin/v1.5/spin-1.5-all.zip
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
-_md5_=85477047cb583e6a212b1783d52db5f0
diff --git a/metadata/md5-cache/dev-java/stax2-api-4.2.1 b/metadata/md5-cache/dev-java/stax2-api-4.2.1
deleted file mode 100644
index 03c05612f5ca..000000000000
--- a/metadata/md5-cache/dev-java/stax2-api-4.2.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=stax2 API is an extension to basic Stax 1.0 API
-EAPI=8
-HOMEPAGE=https://github.com/FasterXML/stax2-api
-INHERIT=java-pkg-2 java-pkg-simple
-IUSE=doc source
-KEYWORDS=amd64 ~arm arm64 ppc64 x86
-LICENSE=BSD
-RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://github.com/FasterXML/stax2-api/archive/refs/tags/stax2-api-4.2.1.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
-_md5_=cf52313552016e8722605f56d367aa4f
diff --git a/metadata/md5-cache/dev-java/stax2-api-4.2.1-r1 b/metadata/md5-cache/dev-java/stax2-api-4.2.1-r1
index 125d89bbbc2b..fedd6f25f101 100644
--- a/metadata/md5-cache/dev-java/stax2-api-4.2.1-r1
+++ b/metadata/md5-cache/dev-java/stax2-api-4.2.1-r1
@@ -5,10 +5,10 @@ EAPI=8
HOMEPAGE=https://github.com/FasterXML/stax2-api
INHERIT=java-pkg-2 java-pkg-simple
IUSE=doc source
-KEYWORDS=~amd64 ~arm arm64 ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ppc64 x86
LICENSE=BSD
RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=0
SRC_URI=https://github.com/FasterXML/stax2-api/archive/refs/tags/stax2-api-4.2.1.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
-_md5_=21405c010c53a89714e903e6ed964e25
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
+_md5_=950511a8e1083c5f4ad34a160222c06e
diff --git a/metadata/md5-cache/dev-java/stringprep-1.1 b/metadata/md5-cache/dev-java/stringprep-1.1
new file mode 100644
index 000000000000..3e9bbcec5cdc
--- /dev/null
+++ b/metadata/md5-cache/dev-java/stringprep-1.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=SASLprep: Stringprep Profile for User Names and Passwords
+EAPI=8
+HOMEPAGE=https://gitlab.com/ongresinc/stringprep
+INHERIT=java-pkg-2 java-pkg-simple
+IUSE=doc source
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=BSD-2
+RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+SLOT=0
+SRC_URI=https://repo1.maven.org/maven2/com/ongres/stringprep/stringprep/1.1/stringprep-1.1-sources.jar
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
+_md5_=22894f6ef74740b14b48f94ae5d9549c
diff --git a/metadata/md5-cache/dev-java/stringtemplate-3.2.1-r2 b/metadata/md5-cache/dev-java/stringtemplate-3.2.1-r2
index 8f1a194430a2..330debacedda 100644
--- a/metadata/md5-cache/dev-java/stringtemplate-3.2.1-r2
+++ b/metadata/md5-cache/dev-java/stringtemplate-3.2.1-r2
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* dev-java/antlr:0 >=dev-java/java-config-2.2.0-r3 sou
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://github.com/antlr/stringtemplate3/archive/68f2a42e8038f8e716e9666909ea485ee8aff45a.tar.gz -> stringtemplate-3.2.1.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=ce2be796703b4a85cc2dc9fa30c706f7
diff --git a/metadata/md5-cache/dev-java/stringtemplate-4.3.2 b/metadata/md5-cache/dev-java/stringtemplate-4.3.2
index 3112319e6304..63c1c791e02c 100644
--- a/metadata/md5-cache/dev-java/stringtemplate-4.3.2
+++ b/metadata/md5-cache/dev-java/stringtemplate-4.3.2
@@ -12,5 +12,5 @@ RDEPEND=>=virtual/jre-1.8:* dev-java/antlr-runtime:3.5 >=dev-java/java-config-2.
RESTRICT=!test? ( test )
SLOT=4
SRC_URI=https://repo1.maven.org/maven2/org/antlr/ST4/4.3.2/ST4-4.3.2-sources.jar https://github.com/antlr/stringtemplate4/archive/4.3.2.tar.gz -> stringtemplate-4.3.2.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=7a97a65cb993f6578b85ff5c07499110
diff --git a/metadata/md5-cache/dev-java/sun-jai-bin-1.1.3-r2 b/metadata/md5-cache/dev-java/sun-jai-bin-1.1.3-r2
index 7920af272225..0a60031921b4 100644
--- a/metadata/md5-cache/dev-java/sun-jai-bin-1.1.3-r2
+++ b/metadata/md5-cache/dev-java/sun-jai-bin-1.1.3-r2
@@ -10,5 +10,5 @@ RDEPEND=virtual/jre:1.8 >=dev-java/java-config-2.2.0-r3
RESTRICT=bindist mirror
SLOT=0
SRC_URI=!amd64? ( https://download.java.net/media/jai/builds/release/1_1_3/jai-1_1_3-lib-linux-i586.tar.gz ) amd64? ( https://download.java.net/media/jai/builds/release/1_1_3/jai-1_1_3-lib-linux-amd64.tar.gz )
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=09fcb42b33c1665c3ad8594de22b165a
diff --git a/metadata/md5-cache/dev-java/sun-jms-1.1-r3 b/metadata/md5-cache/dev-java/sun-jms-1.1-r3
deleted file mode 100644
index 2971d80c3529..000000000000
--- a/metadata/md5-cache/dev-java/sun-jms-1.1-r3
+++ /dev/null
@@ -1,16 +0,0 @@
-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
-INHERIT=java-pkg-2
-IUSE=doc
-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 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
-_md5_=e0fa95ef53785fbff9348492ae0ff223
diff --git a/metadata/md5-cache/dev-java/swing-layout-1.0.4-r2 b/metadata/md5-cache/dev-java/swing-layout-1.0.4-r2
index d854c0f66201..605d62c00353 100644
--- a/metadata/md5-cache/dev-java/swing-layout-1.0.4-r2
+++ b/metadata/md5-cache/dev-java/swing-layout-1.0.4-r2
@@ -11,5 +11,5 @@ LICENSE=LGPL-2.1
RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=1
SRC_URI=mirror://gentoo/swing-layout-1.0.4-src.zip
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=2676b345338fb20e84e5cddcba153511
diff --git a/metadata/md5-cache/dev-java/swingx-1.6.4-r1 b/metadata/md5-cache/dev-java/swingx-1.6.4-r1
index 4e61c9272a5e..a28ad187d66e 100644
--- a/metadata/md5-cache/dev-java/swingx-1.6.4-r1
+++ b/metadata/md5-cache/dev-java/swingx-1.6.4-r1
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1
RDEPEND=virtual/jre:1.8 dev-java/metainf-services:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=1.6
SRC_URI=https://maven.java.net/service/local/repositories/releases/content/org/swinglabs/swingx/swingx-all/1.6.4/swingx-all-1.6.4-sources.jar https://java.net/projects/swingx/downloads/download/releases/swingx-mavensupport-1.6.4-sources.jar
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=8b75665f7ccbc2320259e96eef6cebf2
diff --git a/metadata/md5-cache/dev-java/swingx-beaninfo-1.6.4-r1 b/metadata/md5-cache/dev-java/swingx-beaninfo-1.6.4-r1
index 062232631c70..98456f59a245 100644
--- a/metadata/md5-cache/dev-java/swingx-beaninfo-1.6.4-r1
+++ b/metadata/md5-cache/dev-java/swingx-beaninfo-1.6.4-r1
@@ -11,5 +11,5 @@ LICENSE=LGPL-2.1
RDEPEND=>=virtual/jre-1.8:* dev-java/swingx:1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=0
SRC_URI=https://java.net/downloads/swingx/releases/swingx-beaninfo-1.6.4-sources.jar
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=f12e43df4ba1e563f1b2e5f55c8df20c
diff --git a/metadata/md5-cache/dev-java/swingx-ws-1.0_p20110515-r2 b/metadata/md5-cache/dev-java/swingx-ws-1.0_p20110515-r2
index ce222c50a40b..fbd0fd7ae160 100644
--- a/metadata/md5-cache/dev-java/swingx-ws-1.0_p20110515-r2
+++ b/metadata/md5-cache/dev-java/swingx-ws-1.0_p20110515-r2
@@ -11,5 +11,5 @@ LICENSE=LGPL-2.1
RDEPEND=dev-java/jakarta-xml-soap-api:1 dev-java/jdom:0 dev-java/json:0 dev-java/rome:0 dev-java/jtidy:0 dev-java/xerces:2 dev-java/swingx:1.6 dev-java/swing-layout:1 dev-java/swingx-beaninfo:0 dev-java/commons-httpclient:3 dev-java/xml-commons-external:1.4 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=bt747
SRC_URI=mirror://sourceforge/bt747/Development/swingx-ws-2011_05_15-src.zip
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=48ea44ce683e8616b1bf5804c5571b74
diff --git a/metadata/md5-cache/dev-java/swt-3.7.2-r3 b/metadata/md5-cache/dev-java/swt-3.7.2-r3
index e02545a5aef9..25311255a5c2 100644
--- a/metadata/md5-cache/dev-java/swt-3.7.2-r3
+++ b/metadata/md5-cache/dev-java/swt-3.7.2-r3
@@ -11,5 +11,5 @@ LICENSE=CPL-1.0 LGPL-2.1 MPL-1.1
RDEPEND=>=dev-libs/atk-1.10.2 >=dev-libs/glib-2.6 >=x11-libs/gtk+-2.6.8:2 x11-libs/libXtst cairo? ( >=x11-libs/cairo-1.4.14 ) opengl? ( virtual/glu virtual/opengl ) >=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3
SLOT=3.7
SRC_URI=amd64? ( http://archive.eclipse.org/eclipse/downloads/drops/R-3.7.2-201202080800/swt-3.7.2-gtk-linux-x86_64.zip ) ppc? ( http://archive.eclipse.org/eclipse/downloads/drops/R-3.7.2-201202080800/swt-3.7.2-gtk-linux-x86.zip ) ppc64? ( http://archive.eclipse.org/eclipse/downloads/drops/R-3.7.2-201202080800/swt-3.7.2-gtk-linux-ppc64.zip ) x86? ( http://archive.eclipse.org/eclipse/downloads/drops/R-3.7.2-201202080800/swt-3.7.2-gtk-linux-x86.zip )
-_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-osgi c9b922d3fd7b5c6117f4c4d68e32e881 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-osgi c9b922d3fd7b5c6117f4c4d68e32e881 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 cfb5f6911bb70204c94ceafd0372c716 multilib 4fbbbc98f236f1b43acd99476bc3cd85 toolchain-funcs e9da88162e7a3c60376e80c2c2adcdfb
_md5_=0d6f88d42687ca65b21dc5d8571dd6f6
diff --git a/metadata/md5-cache/dev-java/swt-3.8.2-r4 b/metadata/md5-cache/dev-java/swt-3.8.2-r4
index c186cf1ccab9..bfadfd6a74ae 100644
--- a/metadata/md5-cache/dev-java/swt-3.8.2-r4
+++ b/metadata/md5-cache/dev-java/swt-3.8.2-r4
@@ -10,5 +10,5 @@ LICENSE=CPL-1.0 LGPL-2.1 MPL-1.1
RDEPEND=>=dev-libs/atk-1.10.2 >=dev-libs/glib-2.6 >=x11-libs/gtk+-2.6.8:2 x11-libs/libXtst cairo? ( >=x11-libs/cairo-1.4.14 ) opengl? ( virtual/glu virtual/opengl ) >=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3
SLOT=3.8
SRC_URI=amd64? ( http://archive.eclipse.org/eclipse/downloads/drops/R-3.8.2-201301310800/swt-3.8.2-gtk-linux-x86_64.zip ) ppc? ( http://archive.eclipse.org/eclipse/downloads/drops/R-3.8.2-201301310800/swt-3.8.2-gtk-linux-x86.zip ) ppc64? ( http://archive.eclipse.org/eclipse/downloads/drops/R-3.8.2-201301310800/swt-3.8.2-gtk-linux-ppc64.zip ) x86? ( http://archive.eclipse.org/eclipse/downloads/drops/R-3.8.2-201301310800/swt-3.8.2-gtk-linux-x86.zip )
-_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-osgi c9b922d3fd7b5c6117f4c4d68e32e881 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-osgi c9b922d3fd7b5c6117f4c4d68e32e881 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 cfb5f6911bb70204c94ceafd0372c716 multilib 4fbbbc98f236f1b43acd99476bc3cd85 toolchain-funcs e9da88162e7a3c60376e80c2c2adcdfb
_md5_=1a0bdb433c0d83e53323cf38fc2458ae
diff --git a/metadata/md5-cache/dev-java/swt-4.10-r2 b/metadata/md5-cache/dev-java/swt-4.10-r2
index 11951b32f548..8b49b1eee5ed 100644
--- a/metadata/md5-cache/dev-java/swt-4.10-r2
+++ b/metadata/md5-cache/dev-java/swt-4.10-r2
@@ -11,5 +11,5 @@ LICENSE=CPL-1.0 LGPL-2.1 MPL-1.1
RDEPEND=>=dev-libs/atk-1.10.2 >=dev-libs/glib-2.32 >=x11-libs/gtk+-2.6.8:2 x11-libs/libXtst cairo? ( >=x11-libs/cairo-1.4.14 ) opengl? ( virtual/glu virtual/opengl ) webkit? ( net-libs/webkit-gtk:4 ) >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3
SLOT=4.10
SRC_URI=amd64? ( http://download.eclipse.org/eclipse/downloads/drops4/R-4.10-201812060815/swt-4.10-gtk-linux-x86_64.zip ) ppc64? ( http://download.eclipse.org/eclipse/downloads/drops4/R-4.10-201812060815/swt-4.10-gtk-linux-ppc64le.zip )
-_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 eutils dab5d8ec471d025b79c9e6906bcf3bff flag-o-matic a500d7cc40da3de38c361e889153bdf7 java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-osgi c9b922d3fd7b5c6117f4c4d68e32e881 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b strip-linguas ac3ee41ee2d31d8c41a77c0838320cc7 toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8 wrapper 4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 eutils dab5d8ec471d025b79c9e6906bcf3bff flag-o-matic a3abd6002fafb3022597be6b8d01f88b java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-osgi c9b922d3fd7b5c6117f4c4d68e32e881 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 cfb5f6911bb70204c94ceafd0372c716 multilib 4fbbbc98f236f1b43acd99476bc3cd85 strip-linguas ac3ee41ee2d31d8c41a77c0838320cc7 toolchain-funcs e9da88162e7a3c60376e80c2c2adcdfb wrapper 4a1902f969e5718126434fc35f3a0d9c
_md5_=7ee352c08907a4dcf2f198e51ab248b4
diff --git a/metadata/md5-cache/dev-java/testng-6.9.10 b/metadata/md5-cache/dev-java/testng-6.9.10
deleted file mode 100644
index 384f58b8bbe9..000000000000
--- a/metadata/md5-cache/dev-java/testng-6.9.10
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=dev-java/bsh:0 dev-java/guice:4 dev-java/junit:4 dev-java/ant-core:0 dev-java/snakeyaml:0 dev-java/jcommander:0 >=virtual/jdk-1.7 test? ( dev-java/assertj-core:2 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Testing framework inspired by JUnit and NUnit with new features
-EAPI=5
-HOMEPAGE=https://testng.org/
-INHERIT=java-pkg-2 java-pkg-simple
-IUSE=test doc source
-KEYWORDS=amd64 ~arm arm64 ppc64 x86
-LICENSE=Apache-2.0
-RDEPEND=dev-java/bsh:0 dev-java/guice:4 dev-java/junit:4 dev-java/ant-core:0 dev-java/snakeyaml:0 dev-java/jcommander:0 >=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/cbeust/testng/archive/6.9.10.tar.gz -> testng-6.9.10.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 eapi7-ver 1a0a60ad07c8b32d2faba2d085dc0f24 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 9f813bb3c47cf2e60619a663b87c5f4e estack 055c42df72f76a4f45ec92b35e83cd56 eutils dab5d8ec471d025b79c9e6906bcf3bff java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 ltprune 97143780d341cc8d8f1d4c6187a36d29 multilib 4a33c9008e5ee30cb8840a3fdc24df2b preserve-libs a8e50acee31b5759b4df1f7707cae54b strip-linguas ac3ee41ee2d31d8c41a77c0838320cc7 toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8 vcs-clean d271b7bc7e6a009758d7d4ef749174e3 versionator d3fb3ba33acc3bbbdc4d7970227c100d wrapper 4a1902f969e5718126434fc35f3a0d9c
-_md5_=7340528ad190212b4fb759bee7b3a554
diff --git a/metadata/md5-cache/dev-java/testng-6.9.10-r1 b/metadata/md5-cache/dev-java/testng-6.9.10-r1
index eefdf3482fbc..4ac27b42ff4e 100644
--- a/metadata/md5-cache/dev-java/testng-6.9.10-r1
+++ b/metadata/md5-cache/dev-java/testng-6.9.10-r1
@@ -5,11 +5,11 @@ EAPI=8
HOMEPAGE=https://testng.org/
INHERIT=java-pkg-2 java-pkg-simple
IUSE=test doc source
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ppc64 x86
LICENSE=Apache-2.0
RDEPEND=dev-java/bsh:0 dev-java/guice:4 dev-java/junit:4 dev-java/ant-core:0 dev-java/snakeyaml:0 dev-java/jcommander:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
RESTRICT=test
SLOT=0
SRC_URI=https://github.com/cbeust/testng/archive/6.9.10.tar.gz -> testng-6.9.10.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
-_md5_=dcbb00caec778b23592df5f1c33f8f6c
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
+_md5_=5de2015633ade6be261ed58d4f3809b1
diff --git a/metadata/md5-cache/dev-java/tomcat-native-1.2.33 b/metadata/md5-cache/dev-java/tomcat-native-1.2.33
index b36f8951fc7a..e98ac7fa8616 100644
--- a/metadata/md5-cache/dev-java/tomcat-native-1.2.33
+++ b/metadata/md5-cache/dev-java/tomcat-native-1.2.33
@@ -5,11 +5,11 @@ EAPI=8
HOMEPAGE=https://tomcat.apache.org/
INHERIT=java-pkg-2 java-ant-2
IUSE=static-libs test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
LICENSE=Apache-2.0
RDEPEND=dev-libs/apr:1= dev-libs/openssl:0= >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=mirror://apache/tomcat/tomcat-connectors/native/1.2.33/source/tomcat-native-1.2.33-src.tar.gz
-_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=33cb3c7df9ef11012684ca5aa22cc64b
+_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 cfb5f6911bb70204c94ceafd0372c716 multilib 4fbbbc98f236f1b43acd99476bc3cd85 toolchain-funcs e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=4d0641fff4ff93b51958f2e8ddc698b3
diff --git a/metadata/md5-cache/dev-java/tomcat-native-1.2.32 b/metadata/md5-cache/dev-java/tomcat-native-1.2.34
index 5880d6914ee6..6f535b6e5929 100644
--- a/metadata/md5-cache/dev-java/tomcat-native-1.2.32
+++ b/metadata/md5-cache/dev-java/tomcat-native-1.2.34
@@ -5,11 +5,11 @@ EAPI=8
HOMEPAGE=https://tomcat.apache.org/
INHERIT=java-pkg-2 java-ant-2
IUSE=static-libs test
-KEYWORDS=amd64 ~x86
+KEYWORDS=~amd64 ~x86
LICENSE=Apache-2.0
RDEPEND=dev-libs/apr:1= dev-libs/openssl:0= >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3
RESTRICT=!test? ( test )
SLOT=0
-SRC_URI=mirror://apache/tomcat/tomcat-connectors/native/1.2.32/source/tomcat-native-1.2.32-src.tar.gz
-_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=4d0641fff4ff93b51958f2e8ddc698b3
+SRC_URI=mirror://apache/tomcat/tomcat-connectors/native/1.2.34/source/tomcat-native-1.2.34-src.tar.gz
+_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 cfb5f6911bb70204c94ceafd0372c716 multilib 4fbbbc98f236f1b43acd99476bc3cd85 toolchain-funcs e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=33cb3c7df9ef11012684ca5aa22cc64b
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.62 b/metadata/md5-cache/dev-java/tomcat-servlet-api-10.0.21
index 8b8e87721c57..6c8a7b065d28 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.62
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-10.0.21
@@ -1,6 +1,6 @@
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
+DESCRIPTION=Tomcat's Servlet API 5.0/JSP API 3.0/EL API 4.0 implementation
EAPI=8
HOMEPAGE=https://tomcat.apache.org/
INHERIT=java-pkg-2 java-pkg-simple
@@ -8,7 +8,7 @@ IUSE=source
KEYWORDS=amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
LICENSE=Apache-2.0
RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=4.0
-SRC_URI=mirror://apache/tomcat/tomcat-9/v9.0.62/src/apache-tomcat-9.0.62-src.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
-_md5_=89115bc19add62d8ea59308a19759575
+SLOT=5.0
+SRC_URI=mirror://apache/tomcat/tomcat-10/v10.0.21/src/apache-tomcat-10.0.21-src.tar.gz
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
+_md5_=b0f3ca1e6f94a1f8bcb7e96efb26b264
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-10.0.18 b/metadata/md5-cache/dev-java/tomcat-servlet-api-10.0.22
index e37fa2ee3a7c..59c48f3b92d4 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-10.0.18
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-10.0.22
@@ -5,10 +5,10 @@ EAPI=8
HOMEPAGE=https://tomcat.apache.org/
INHERIT=java-pkg-2 java-pkg-simple
IUSE=source
-KEYWORDS=amd64 ~arm arm64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
LICENSE=Apache-2.0
RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=5.0
-SRC_URI=mirror://apache/tomcat/tomcat-10/v10.0.18/src/apache-tomcat-10.0.18-src.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
-_md5_=020916eb2be685584c4c31be6ed12817
+SRC_URI=mirror://apache/tomcat/tomcat-10/v10.0.22/src/apache-tomcat-10.0.22-src.tar.gz
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
+_md5_=484ed8723ef13a21c7a8ed2078e7409b
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-4.1.40 b/metadata/md5-cache/dev-java/tomcat-servlet-api-4.1.40
index 4da5a3260024..18d2b50e1cbf 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-4.1.40
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-4.1.40
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
RDEPEND=>=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=2.3
SRC_URI=https://archive.apache.org/dist/tomcat/tomcat-4/v4.1.40/src/apache-tomcat-4.1.40-src.tar.gz
-_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 cfb5f6911bb70204c94ceafd0372c716 multilib 4fbbbc98f236f1b43acd99476bc3cd85 toolchain-funcs e9da88162e7a3c60376e80c2c2adcdfb
_md5_=e55474e5386f7203cb04a172ab7de0c2
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-5.5.36 b/metadata/md5-cache/dev-java/tomcat-servlet-api-5.5.36
index 890030498359..185d77581978 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-5.5.36
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-5.5.36
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
RDEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3
SLOT=2.4
SRC_URI=https://archive.apache.org/dist/tomcat/tomcat-5/v5.5.36/src/apache-tomcat-5.5.36-src.tar.gz
-_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-osgi c9b922d3fd7b5c6117f4c4d68e32e881 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-osgi c9b922d3fd7b5c6117f4c4d68e32e881 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 cfb5f6911bb70204c94ceafd0372c716 multilib 4fbbbc98f236f1b43acd99476bc3cd85 toolchain-funcs e9da88162e7a3c60376e80c2c2adcdfb
_md5_=3037ebb67bccfb6c7b14f5f21f34e929
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-6.0.53-r1 b/metadata/md5-cache/dev-java/tomcat-servlet-api-6.0.53-r1
index ef6ae5d6a447..d7191bbc5571 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-6.0.53-r1
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-6.0.53-r1
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
RDEPEND=>=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=2.5
SRC_URI=https://archive.apache.org/dist/tomcat/tomcat-6/v6.0.53/src/apache-tomcat-6.0.53-src.tar.gz
-_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 cfb5f6911bb70204c94ceafd0372c716 multilib 4fbbbc98f236f1b43acd99476bc3cd85 toolchain-funcs e9da88162e7a3c60376e80c2c2adcdfb
_md5_=b9ba179dd9ddedb59455338e1f2919b3
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-7.0.109 b/metadata/md5-cache/dev-java/tomcat-servlet-api-7.0.109
index 107052cc302f..779f5bd858d4 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-7.0.109
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-7.0.109
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
RDEPEND=>=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=3.0
SRC_URI=mirror://apache/tomcat/tomcat-7/v7.0.109/src/apache-tomcat-7.0.109-src.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=8b2861f02a5c0fc5d82edcfef67e2583
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.78 b/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.79
index 0636d6f7d20c..1209bb37b752 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.78
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.79
@@ -9,6 +9,6 @@ KEYWORDS=amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-so
LICENSE=Apache-2.0
RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=3.1
-SRC_URI=mirror://apache/tomcat/tomcat-8/v8.5.78/src/apache-tomcat-8.5.78-src.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+SRC_URI=mirror://apache/tomcat/tomcat-8/v8.5.79/src/apache-tomcat-8.5.79-src.tar.gz
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=1299696970c89c828be32d9a9d67e292
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.77 b/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.81
index dca009457d94..8dcdd6f92978 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.77
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.81
@@ -5,10 +5,10 @@ EAPI=7
HOMEPAGE=https://tomcat.apache.org/
INHERIT=java-pkg-2 java-pkg-simple
IUSE=source
-KEYWORDS=amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
LICENSE=Apache-2.0
RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=3.1
-SRC_URI=mirror://apache/tomcat/tomcat-8/v8.5.77/src/apache-tomcat-8.5.77-src.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
-_md5_=1299696970c89c828be32d9a9d67e292
+SRC_URI=mirror://apache/tomcat/tomcat-8/v8.5.81/src/apache-tomcat-8.5.81-src.tar.gz
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
+_md5_=ab5d48ecbb7dcf4732f97868224457ca
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.60 b/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.63
index 5372aa5b04c2..f5ca624afeb5 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.60
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.63
@@ -9,6 +9,6 @@ KEYWORDS=amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-so
LICENSE=Apache-2.0
RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=4.0
-SRC_URI=mirror://apache/tomcat/tomcat-9/v9.0.60/src/apache-tomcat-9.0.60-src.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+SRC_URI=mirror://apache/tomcat/tomcat-9/v9.0.63/src/apache-tomcat-9.0.63-src.tar.gz
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=89115bc19add62d8ea59308a19759575
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-10.0.20 b/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.64
index ef5db03cb0b0..297163a08a45 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-10.0.20
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.64
@@ -1,14 +1,14 @@
DEFINED_PHASES=compile install preinst prepare setup test
DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Tomcat's Servlet API 5.0/JSP API 3.0/EL API 4.0 implementation
+DESCRIPTION=Tomcat's Servlet API 4.0/JSP API 2.3/EL API 3.0 implementation
EAPI=8
HOMEPAGE=https://tomcat.apache.org/
INHERIT=java-pkg-2 java-pkg-simple
IUSE=source
-KEYWORDS=amd64 ~arm arm64 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=5.0
-SRC_URI=mirror://apache/tomcat/tomcat-10/v10.0.20/src/apache-tomcat-10.0.20-src.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
-_md5_=020916eb2be685584c4c31be6ed12817
+SLOT=4.0
+SRC_URI=mirror://apache/tomcat/tomcat-9/v9.0.64/src/apache-tomcat-9.0.64-src.tar.gz
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
+_md5_=08ded5a97f72bfd8d150c726103afe2f
diff --git a/metadata/md5-cache/dev-java/treelayout-1.0.3-r1 b/metadata/md5-cache/dev-java/treelayout-1.0.3-r1
index c5b228b910ae..cdc29eb7702c 100644
--- a/metadata/md5-cache/dev-java/treelayout-1.0.3-r1
+++ b/metadata/md5-cache/dev-java/treelayout-1.0.3-r1
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://github.com/abego/treelayout/archive/v1.0.3.tar.gz -> treelayout-1.0.3.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=8887a0352989a252aa1bba63953ac9bb
diff --git a/metadata/md5-cache/dev-java/typesafe-config-1.3.0-r3 b/metadata/md5-cache/dev-java/typesafe-config-1.3.0-r3
index bf6a2e586ef4..34bc420628b1 100644
--- a/metadata/md5-cache/dev-java/typesafe-config-1.3.0-r3
+++ b/metadata/md5-cache/dev-java/typesafe-config-1.3.0-r3
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=0
SRC_URI=https://github.com/lightbend/config/archive/refs/tags/v1.3.0.tar.gz -> typesafe-config-1.3.0.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=3f340436e99a53914207a339c4cc3a75
diff --git a/metadata/md5-cache/dev-java/univocity-parsers-2.9.1 b/metadata/md5-cache/dev-java/univocity-parsers-2.9.1
index 837d7ff374ce..d9df85157b30 100644
--- a/metadata/md5-cache/dev-java/univocity-parsers-2.9.1
+++ b/metadata/md5-cache/dev-java/univocity-parsers-2.9.1
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=0
SRC_URI=https://github.com/uniVocity/univocity-parsers/archive/refs/tags/v2.9.1.tar.gz -> univocity-parsers-2.9.1.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=19253877fdd33c094d6d50c427f7f224
diff --git a/metadata/md5-cache/dev-java/validation-api-1.0.0-r1 b/metadata/md5-cache/dev-java/validation-api-1.0.0-r1
index e4d68c32bfc2..90f85db03507 100644
--- a/metadata/md5-cache/dev-java/validation-api-1.0.0-r1
+++ b/metadata/md5-cache/dev-java/validation-api-1.0.0-r1
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0
RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=1.0
SRC_URI=https://repository.jboss.org/nexus/service/local/repo_groups/public/content/javax/validation/validation-api/1.0.0.GA/validation-api-1.0.0.GA-sources.jar
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=a0a24c2ae72b3e51abe0c0d08b649679
diff --git a/metadata/md5-cache/dev-java/validation-api-1.1.0-r1 b/metadata/md5-cache/dev-java/validation-api-1.1.0-r1
index 42922546596f..e83a0259a513 100644
--- a/metadata/md5-cache/dev-java/validation-api-1.1.0-r1
+++ b/metadata/md5-cache/dev-java/validation-api-1.1.0-r1
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0
RDEPEND=>=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=1.0
SRC_URI=https://repo1.maven.org/maven2/javax/validation/validation-api/1.1.0.Final/validation-api-1.1.0.Final-sources.jar -> validation-api-1.1.0.jar
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=5e3cfb69d85910d60d651cc0a669454d
diff --git a/metadata/md5-cache/dev-java/velocity-2.3 b/metadata/md5-cache/dev-java/velocity-2.3
index 9416507f2ea9..ae3c82b767c7 100644
--- a/metadata/md5-cache/dev-java/velocity-2.3
+++ b/metadata/md5-cache/dev-java/velocity-2.3
@@ -12,5 +12,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/commons-io-2.8.0:1 >=dev-java/commons-lan
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://github.com/apache/velocity-engine/archive/refs/tags/2.3.tar.gz -> velocity-2.3.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=196e2c49434cac18d569e94ce794c2cf
diff --git a/metadata/md5-cache/dev-java/woodstox-core-6.2.8-r1 b/metadata/md5-cache/dev-java/woodstox-core-6.2.8-r1
index 88949fec0b62..1c9d2afd73cd 100644
--- a/metadata/md5-cache/dev-java/woodstox-core-6.2.8-r1
+++ b/metadata/md5-cache/dev-java/woodstox-core-6.2.8-r1
@@ -11,5 +11,5 @@ RDEPEND=dev-java/msv:0 dev-java/relaxng-datatype:0 dev-java/stax2-api:0 dev-java
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://github.com/FasterXML/woodstox/archive/woodstox-core-6.2.8.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=12ee3023fe4681f69fd40ae5d449212e
diff --git a/metadata/md5-cache/dev-java/wsdl4j-1.6.2-r1 b/metadata/md5-cache/dev-java/wsdl4j-1.6.2-r1
index 03dd2276374d..2cc29acc2427 100644
--- a/metadata/md5-cache/dev-java/wsdl4j-1.6.2-r1
+++ b/metadata/md5-cache/dev-java/wsdl4j-1.6.2-r1
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
RESTRICT=test
SLOT=0
SRC_URI=mirror://sourceforge/wsdl4j/wsdl4j-src-1.6.2.zip test? ( mirror://sourceforge/jwsdltck/jwsdltck-bin-1.2.zip )
-_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 cfb5f6911bb70204c94ceafd0372c716 multilib 4fbbbc98f236f1b43acd99476bc3cd85 toolchain-funcs e9da88162e7a3c60376e80c2c2adcdfb
_md5_=9aa326432167919e4687c68b1949b92b
diff --git a/metadata/md5-cache/dev-java/wsdl4j-1.6.3 b/metadata/md5-cache/dev-java/wsdl4j-1.6.3
new file mode 100644
index 000000000000..1581a7394ba3
--- /dev/null
+++ b/metadata/md5-cache/dev-java/wsdl4j-1.6.3
@@ -0,0 +1,15 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=Web Services Description Language for Java Toolkit (WSDL4J)
+EAPI=8
+HOMEPAGE=https://wsdl4j.sourceforge.net
+INHERIT=java-pkg-2 java-pkg-simple
+IUSE=doc source
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=CPL-1.0
+RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+SLOT=0
+SRC_URI=mirror://sourceforge/project/wsdl4j/WSDL4J/1.6.3/wsdl4j-src-1.6.3.zip
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
+_md5_=21c268ecb0cfb00a9832d67b1238866c
diff --git a/metadata/md5-cache/dev-java/xalan-2.7.2-r1 b/metadata/md5-cache/dev-java/xalan-2.7.2-r1
index e53ef69276c5..620e483e082c 100644
--- a/metadata/md5-cache/dev-java/xalan-2.7.2-r1
+++ b/metadata/md5-cache/dev-java/xalan-2.7.2-r1
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0
RDEPEND=dev-java/javacup:0 dev-java/bcel:0 >=virtual/jre-1.8:* ~dev-java/xalan-serializer-2.7.2:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=0
SRC_URI=mirror://apache/xalan/xalan-j/source/xalan-j_2_7_2-src.tar.gz doc? ( mirror://apache/xalan/xalan-j/binaries/xalan-j_2_7_2-bin.zip )
-_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 cfb5f6911bb70204c94ceafd0372c716 multilib 4fbbbc98f236f1b43acd99476bc3cd85 toolchain-funcs e9da88162e7a3c60376e80c2c2adcdfb
_md5_=f76b5f3e572c89e4034b9e7611b7fcdf
diff --git a/metadata/md5-cache/dev-java/xalan-serializer-2.7.2-r1 b/metadata/md5-cache/dev-java/xalan-serializer-2.7.2-r1
index de9a4dac38d6..0af5495512b8 100644
--- a/metadata/md5-cache/dev-java/xalan-serializer-2.7.2-r1
+++ b/metadata/md5-cache/dev-java/xalan-serializer-2.7.2-r1
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=0
SRC_URI=mirror://apache/xalan/xalan-j/source/xalan-j_2_7_2-src.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=cd902d6eff7e78d19623f8568ba74796
diff --git a/metadata/md5-cache/dev-java/xerces-2.12.2 b/metadata/md5-cache/dev-java/xerces-2.12.2
index 4eae10d88856..9c02515100f4 100644
--- a/metadata/md5-cache/dev-java/xerces-2.12.2
+++ b/metadata/md5-cache/dev-java/xerces-2.12.2
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
RDEPEND=dev-java/xml-commons-external:1.4 dev-java/xml-commons-resolver:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=2
SRC_URI=mirror://apache/xerces/j/source/Xerces-J-src.2.12.2.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=cb5ec7aa1a3c9ce7cbd1b7f7cf3f0037
diff --git a/metadata/md5-cache/dev-java/xerial-core-2.0.1-r1 b/metadata/md5-cache/dev-java/xerial-core-2.0.1-r1
index a359d1aa7ab9..99d5f8afb5a5 100644
--- a/metadata/md5-cache/dev-java/xerial-core-2.0.1-r1
+++ b/metadata/md5-cache/dev-java/xerial-core-2.0.1-r1
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://dev.gentoo.org/~ercpe/distfiles/dev-java/xerial-core/xerial-core-2.0.1.tar.bz2
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=bdb6618a2d342e7f3891623a6b005e8a
diff --git a/metadata/md5-cache/dev-java/xjavac-2.4.0 b/metadata/md5-cache/dev-java/xjavac-2.4.0
deleted file mode 100644
index eb8fa94b3715..000000000000
--- a/metadata/md5-cache/dev-java/xjavac-2.4.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=dev-java/ant-core:0 >=virtual/jdk-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Xerses Java Parser
-EAPI=6
-HOMEPAGE=https://xerces.apache.org/xerces-j
-INHERIT=java-pkg-2 java-pkg-simple
-IUSE=doc source
-KEYWORDS=amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=Apache-2.0
-RDEPEND=dev-java/ant-core:0 >=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=1
-SRC_URI=https://dev.gentoo.org/~monsieurp/packages/xjavac-2.4.0.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 eapi7-ver 1a0a60ad07c8b32d2faba2d085dc0f24 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 9f813bb3c47cf2e60619a663b87c5f4e estack 055c42df72f76a4f45ec92b35e83cd56 eutils dab5d8ec471d025b79c9e6906bcf3bff java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 ltprune 97143780d341cc8d8f1d4c6187a36d29 multilib 4a33c9008e5ee30cb8840a3fdc24df2b preserve-libs a8e50acee31b5759b4df1f7707cae54b strip-linguas ac3ee41ee2d31d8c41a77c0838320cc7 toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8 vcs-clean d271b7bc7e6a009758d7d4ef749174e3 versionator d3fb3ba33acc3bbbdc4d7970227c100d wrapper 4a1902f969e5718126434fc35f3a0d9c
-_md5_=6cc5c92ba0c5f76bc1dd76438dc973d3
diff --git a/metadata/md5-cache/dev-java/xml-commons-external-1.3.04-r1 b/metadata/md5-cache/dev-java/xml-commons-external-1.3.04-r1
deleted file mode 100644
index 7b387e390abe..000000000000
--- a/metadata/md5-cache/dev-java/xml-commons-external-1.3.04-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
-DESCRIPTION=Externally-defined set of standard interfaces, namely DOM, SAX, and JAXP
-EAPI=6
-HOMEPAGE=https://xml.apache.org/commons/
-INHERIT=java-pkg-2 java-ant-2
-IUSE=doc source doc source
-KEYWORDS=amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=1.3
-SRC_URI=mirror://gentoo/xml-commons-external-1.3.04.tar.bz2
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 eapi7-ver 1a0a60ad07c8b32d2faba2d085dc0f24 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 9f813bb3c47cf2e60619a663b87c5f4e estack 055c42df72f76a4f45ec92b35e83cd56 eutils dab5d8ec471d025b79c9e6906bcf3bff java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 ltprune 97143780d341cc8d8f1d4c6187a36d29 multilib 4a33c9008e5ee30cb8840a3fdc24df2b preserve-libs a8e50acee31b5759b4df1f7707cae54b strip-linguas ac3ee41ee2d31d8c41a77c0838320cc7 toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8 vcs-clean d271b7bc7e6a009758d7d4ef749174e3 versionator d3fb3ba33acc3bbbdc4d7970227c100d wrapper 4a1902f969e5718126434fc35f3a0d9c
-_md5_=fbbedaa4209ccea1c5981809735b352c
diff --git a/metadata/md5-cache/dev-java/xml-commons-external-1.4.01-r2 b/metadata/md5-cache/dev-java/xml-commons-external-1.4.01-r2
index 64285861e135..7aa1bb633ecf 100644
--- a/metadata/md5-cache/dev-java/xml-commons-external-1.4.01-r2
+++ b/metadata/md5-cache/dev-java/xml-commons-external-1.4.01-r2
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0
RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=1.4
SRC_URI=https://repo1.maven.org/maven2/xml-apis/xml-apis/1.4.01/xml-apis-1.4.01-sources.jar -> xml-commons-external-1.4.01.jar
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=11df5eb34ec712c6d6bd68a8a8901ed0
diff --git a/metadata/md5-cache/dev-java/xml-commons-resolver-1.2-r2 b/metadata/md5-cache/dev-java/xml-commons-resolver-1.2-r2
index a815c5eb148c..a1918a84bfc4 100644
--- a/metadata/md5-cache/dev-java/xml-commons-resolver-1.2-r2
+++ b/metadata/md5-cache/dev-java/xml-commons-resolver-1.2-r2
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=0
SRC_URI=mirror://apache/xml/commons/xml-commons-resolver-1.2.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=d4a018806605ca5d4b9a4ad82307e754
diff --git a/metadata/md5-cache/dev-java/xml-commons-resolver-1.2-r3 b/metadata/md5-cache/dev-java/xml-commons-resolver-1.2-r3
new file mode 100644
index 000000000000..38b2183d6cd6
--- /dev/null
+++ b/metadata/md5-cache/dev-java/xml-commons-resolver-1.2-r3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=An XML Entity and URI Resolver
+EAPI=8
+HOMEPAGE=https://xerces.apache.org/xml-commons/components/resolver/
+INHERIT=java-pkg-2 java-pkg-simple
+IUSE=doc source
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=Apache-2.0
+RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+SLOT=0
+SRC_URI=mirror://apache/xerces/xml-commons/xml-commons-resolver-1.2.tar.gz
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
+_md5_=d158a01e877e1e75992f37fbf2a3ccdd
diff --git a/metadata/md5-cache/dev-java/xmlgraphics-commons-2.7 b/metadata/md5-cache/dev-java/xmlgraphics-commons-2.7
deleted file mode 100644
index 285225745a5a..000000000000
--- a/metadata/md5-cache/dev-java/xmlgraphics-commons-2.7
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=dev-java/commons-io:1 dev-java/commons-logging:0 >=virtual/jdk-1.8:* test? ( dev-java/mockito:0 dev-java/xml-commons-resolver:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
-DESCRIPTION=XML Graphics Commons
-EAPI=8
-HOMEPAGE=https://xmlgraphics.apache.org/commons/
-INHERIT=java-pkg-2 java-pkg-simple
-IUSE=doc source test
-KEYWORDS=amd64 arm64 ppc64 x86
-LICENSE=Apache-2.0
-RDEPEND=dev-java/commons-io:1 dev-java/commons-logging:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test !test? ( test )
-SLOT=2
-SRC_URI=mirror://apache/xmlgraphics/commons/source/xmlgraphics-commons-2.7-src.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
-_md5_=56d251bdbe9fd5f9bb45ff826c0bae24
diff --git a/metadata/md5-cache/dev-java/xmlgraphics-commons-2.7-r1 b/metadata/md5-cache/dev-java/xmlgraphics-commons-2.7-r1
index 774c6348f841..ed3d1c2aabda 100644
--- a/metadata/md5-cache/dev-java/xmlgraphics-commons-2.7-r1
+++ b/metadata/md5-cache/dev-java/xmlgraphics-commons-2.7-r1
@@ -5,11 +5,11 @@ EAPI=8
HOMEPAGE=https://xmlgraphics.apache.org/commons/
INHERIT=java-pkg-2 java-pkg-simple
IUSE=doc source test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 arm64 ppc64 x86
LICENSE=Apache-2.0
RDEPEND=dev-java/commons-io:1 dev-java/commons-logging:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
RESTRICT=!test? ( test )
SLOT=2
SRC_URI=mirror://apache/xmlgraphics/commons/source/xmlgraphics-commons-2.7-src.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
-_md5_=d75d0062b9b3ad5059edf6e21f052bac
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
+_md5_=ec3c7a3bfcc7f8291d550d34ad8799a7
diff --git a/metadata/md5-cache/dev-java/xmlunit-1.6-r1 b/metadata/md5-cache/dev-java/xmlunit-1.6-r1
index bb4f83f82e1d..1b64f36d0861 100644
--- a/metadata/md5-cache/dev-java/xmlunit-1.6-r1
+++ b/metadata/md5-cache/dev-java/xmlunit-1.6-r1
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* dev-java/junit:0 >=dev-java/java-config-2.2.0-r3 sou
RESTRICT=!test? ( test )
SLOT=1
SRC_URI=mirror://sourceforge/xmlunit/xmlunit-1.6-src.zip
-_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 cfb5f6911bb70204c94ceafd0372c716 multilib 4fbbbc98f236f1b43acd99476bc3cd85 toolchain-funcs e9da88162e7a3c60376e80c2c2adcdfb
_md5_=9394d087cfd29588535e4561e6d5d06a
diff --git a/metadata/md5-cache/dev-java/xmpbox-2.0.24 b/metadata/md5-cache/dev-java/xmpbox-2.0.26
index 6f39c84d9543..23e901e09c37 100644
--- a/metadata/md5-cache/dev-java/xmpbox-2.0.24
+++ b/metadata/md5-cache/dev-java/xmpbox-2.0.26
@@ -11,6 +11,6 @@ LICENSE=Apache-2.0
RDEPEND=dev-java/jaxb-api:2 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
RESTRICT=!test? ( test )
SLOT=0
-SRC_URI=mirror://apache/pdfbox/2.0.24/pdfbox-2.0.24-src.zip
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
-_md5_=2f11d8a49426a25cbffad11cd56e97de
+SRC_URI=mirror://apache/pdfbox/2.0.26/pdfbox-2.0.26-src.zip
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
+_md5_=aa62712e703d5c934864b83d0df26de7
diff --git a/metadata/md5-cache/dev-java/xom-1.3.7 b/metadata/md5-cache/dev-java/xom-1.3.7
index 466f6ec2f47e..374393bdcf34 100644
--- a/metadata/md5-cache/dev-java/xom-1.3.7
+++ b/metadata/md5-cache/dev-java/xom-1.3.7
@@ -11,5 +11,5 @@ RDEPEND=dev-java/jaxen:1.2 dev-java/xerces:2 >=virtual/jre-1.8:* >=dev-java/java
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://github.com/elharo/xom/releases/download/v1.3.7/xom-1.3.7-src.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=9c30cff4e1a02cc0ffcbe68aa5a5c148
diff --git a/metadata/md5-cache/dev-java/xpp2-2.1.10-r3 b/metadata/md5-cache/dev-java/xpp2-2.1.10-r3
index 93d135ccdd34..c8f5994a62ca 100644
--- a/metadata/md5-cache/dev-java/xpp2-2.1.10-r3
+++ b/metadata/md5-cache/dev-java/xpp2-2.1.10-r3
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* dev-java/xerces:2 >=dev-java/java-config-2.2.0-r3 so
RESTRICT=test
SLOT=0
SRC_URI=https://web.archive.org/web/20130904173708/http://www.extreme.indiana.edu/xgws/xsoap/xpp/download/PullParser2/PullParser2.1.10.tgz
-_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 cfb5f6911bb70204c94ceafd0372c716 multilib 4fbbbc98f236f1b43acd99476bc3cd85 toolchain-funcs e9da88162e7a3c60376e80c2c2adcdfb
_md5_=b94c06e34b96ea621107d7db29d49ac1
diff --git a/metadata/md5-cache/dev-java/xpp3-1.1.4c-r6 b/metadata/md5-cache/dev-java/xpp3-1.1.4c-r6
index 6c85ef92a5cf..3f65270331ee 100644
--- a/metadata/md5-cache/dev-java/xpp3-1.1.4c-r6
+++ b/metadata/md5-cache/dev-java/xpp3-1.1.4c-r6
@@ -10,5 +10,5 @@ LICENSE=Apache-1.1 IBM JDOM LGPL-2.1+
RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=0
SRC_URI=https://repo1.maven.org/maven2/xpp3/xpp3/1.1.4c/xpp3-1.1.4c-sources.jar -> xpp3-1.1.4c.jar
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=805b3964c2455242a09dcf8a33a87ccd
diff --git a/metadata/md5-cache/dev-java/xsdlib-20090415-r1 b/metadata/md5-cache/dev-java/xsdlib-20090415-r1
index a3339de2f8dc..3b2f16465cab 100644
--- a/metadata/md5-cache/dev-java/xsdlib-20090415-r1
+++ b/metadata/md5-cache/dev-java/xsdlib-20090415-r1
@@ -11,5 +11,5 @@ LICENSE=BSD Apache-1.1
RDEPEND=dev-java/xerces:2 dev-java/relaxng-datatype:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=0
SRC_URI=http://java.net/downloads/msv/releases/xsdlib.20090415.zip
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=450d84935fd1f21e92dbd894ff81d532
diff --git a/metadata/md5-cache/dev-java/xz-java-1.9 b/metadata/md5-cache/dev-java/xz-java-1.9
index 904e77f5e6fa..54662794f5e7 100644
--- a/metadata/md5-cache/dev-java/xz-java-1.9
+++ b/metadata/md5-cache/dev-java/xz-java-1.9
@@ -10,5 +10,5 @@ LICENSE=public-domain
RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=0
SRC_URI=https://tukaani.org/xz/xz-java-1.9.zip
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716
_md5_=4c9fa9f91e413a04f4e7bf627a55dad3
diff --git a/metadata/md5-cache/dev-java/zstd-jni-1.5.0.4 b/metadata/md5-cache/dev-java/zstd-jni-1.5.0.4
index 4af681d76f83..a3d0f04a6337 100644
--- a/metadata/md5-cache/dev-java/zstd-jni-1.5.0.4
+++ b/metadata/md5-cache/dev-java/zstd-jni-1.5.0.4
@@ -1,4 +1,4 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
DEFINED_PHASES=compile configure install preinst prepare setup test
DEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3
DESCRIPTION=JNI bindings for Zstd native library
@@ -10,5 +10,5 @@ LICENSE=BSD
RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3
SLOT=0
SRC_URI=https://github.com/luben/zstd-jni/archive/v1.5.0-4.tar.gz -> zstd-jni-1.5.0.4.tar.gz
-_eclasses_=cmake 90e2b29417d53718328f3a95227137a0 edos2unix 33e347e171066657f91f8b0c72ec8773 eutils dab5d8ec471d025b79c9e6906bcf3bff flag-o-matic a500d7cc40da3de38c361e889153bdf7 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b multiprocessing b4e253ab22cef7b1085e9b67c7a3b730 ninja-utils 58ec4e54962bf45d065fb95030701514 strip-linguas ac3ee41ee2d31d8c41a77c0838320cc7 toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8 wrapper 4a1902f969e5718126434fc35f3a0d9c xdg-utils fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake 44afbf15c35884f7c840470f1cf05d0d edos2unix 33e347e171066657f91f8b0c72ec8773 eutils dab5d8ec471d025b79c9e6906bcf3bff flag-o-matic a3abd6002fafb3022597be6b8d01f88b java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 cfb5f6911bb70204c94ceafd0372c716 multilib 4fbbbc98f236f1b43acd99476bc3cd85 multiprocessing b4e253ab22cef7b1085e9b67c7a3b730 ninja-utils 58ec4e54962bf45d065fb95030701514 strip-linguas ac3ee41ee2d31d8c41a77c0838320cc7 toolchain-funcs e9da88162e7a3c60376e80c2c2adcdfb wrapper 4a1902f969e5718126434fc35f3a0d9c xdg-utils fffb53a53cf17c9c0c998a3c0a590c7e
_md5_=143e064a4c48b4a9a8140d602240a94f