summaryrefslogtreecommitdiff
path: root/metadata/md5-cache/dev-java
diff options
context:
space:
mode:
Diffstat (limited to 'metadata/md5-cache/dev-java')
-rw-r--r--metadata/md5-cache/dev-java/Manifest.gzbin77732 -> 74968 bytes
-rw-r--r--metadata/md5-cache/dev-java/angus-activation-1.0.03
-rw-r--r--metadata/md5-cache/dev-java/animal-sniffer-annotations-1.15-r13
-rw-r--r--metadata/md5-cache/dev-java/ant-antlr-1.10.93
-rw-r--r--metadata/md5-cache/dev-java/ant-apache-bcel-1.10.93
-rw-r--r--metadata/md5-cache/dev-java/ant-apache-bsf-1.10.93
-rw-r--r--metadata/md5-cache/dev-java/ant-apache-log4j-1.10.9-r13
-rw-r--r--metadata/md5-cache/dev-java/ant-apache-oro-1.10.93
-rw-r--r--metadata/md5-cache/dev-java/ant-apache-regexp-1.10.93
-rw-r--r--metadata/md5-cache/dev-java/ant-apache-resolver-1.10.93
-rw-r--r--metadata/md5-cache/dev-java/ant-apache-xalan2-1.10.93
-rw-r--r--metadata/md5-cache/dev-java/ant-commons-logging-1.10.93
-rw-r--r--metadata/md5-cache/dev-java/ant-commons-net-1.10.93
-rw-r--r--metadata/md5-cache/dev-java/ant-contrib-1.0_beta6_pre20201123-r13
-rw-r--r--metadata/md5-cache/dev-java/ant-core-1.10.9-r33
-rw-r--r--metadata/md5-cache/dev-java/ant-eclipse-ecj-4.10-r113
-rw-r--r--metadata/md5-cache/dev-java/ant-eclipse-ecj-4.1313
-rw-r--r--metadata/md5-cache/dev-java/ant-eclipse-ecj-4.15-r19
-rw-r--r--metadata/md5-cache/dev-java/ant-eclipse-ecj-4.229
-rw-r--r--metadata/md5-cache/dev-java/ant-eclipse-ecj-4.5.13
-rw-r--r--metadata/md5-cache/dev-java/ant-ivy-2.5.015
-rw-r--r--metadata/md5-cache/dev-java/ant-ivy-2.5.0-r17
-rw-r--r--metadata/md5-cache/dev-java/ant-jai-1.10.93
-rw-r--r--metadata/md5-cache/dev-java/ant-javamail-1.10.9-r13
-rw-r--r--metadata/md5-cache/dev-java/ant-jdepend-1.10.93
-rw-r--r--metadata/md5-cache/dev-java/ant-jmf-1.10.93
-rw-r--r--metadata/md5-cache/dev-java/ant-jsch-1.10.93
-rw-r--r--metadata/md5-cache/dev-java/ant-junit-1.10.93
-rw-r--r--metadata/md5-cache/dev-java/ant-junit4-1.10.93
-rw-r--r--metadata/md5-cache/dev-java/ant-junitlauncher-1.10.93
-rw-r--r--metadata/md5-cache/dev-java/ant-swing-1.10.93
-rw-r--r--metadata/md5-cache/dev-java/ant-testutil-1.10.93
-rw-r--r--metadata/md5-cache/dev-java/ant-xz-1.10.93
-rw-r--r--metadata/md5-cache/dev-java/antlr-2.7.7-r93
-rw-r--r--metadata/md5-cache/dev-java/antlr-3.2-r13
-rw-r--r--metadata/md5-cache/dev-java/antlr-3.5.2-r23
-rw-r--r--metadata/md5-cache/dev-java/antlr-3.5.37
-rw-r--r--metadata/md5-cache/dev-java/antlr-4.9.33
-rw-r--r--metadata/md5-cache/dev-java/antlr-runtime-3.5.23
-rw-r--r--metadata/md5-cache/dev-java/antlr-runtime-3.5.37
-rw-r--r--metadata/md5-cache/dev-java/antlr-runtime-4.9.33
-rw-r--r--metadata/md5-cache/dev-java/antlr-tool-3.5.23
-rw-r--r--metadata/md5-cache/dev-java/antlr-tool-3.5.37
-rw-r--r--metadata/md5-cache/dev-java/antlr-tool-4.9.35
-rw-r--r--metadata/md5-cache/dev-java/aopalliance-1.0-r35
-rw-r--r--metadata/md5-cache/dev-java/apache-rat-core-0.133
-rw-r--r--metadata/md5-cache/dev-java/apache-rat-tasks-0.133
-rw-r--r--metadata/md5-cache/dev-java/apiguardian-api-1.1.27
-rw-r--r--metadata/md5-cache/dev-java/asm-5.1-r13
-rw-r--r--metadata/md5-cache/dev-java/asm-9.23
-rw-r--r--metadata/md5-cache/dev-java/asm-9.314
-rw-r--r--metadata/md5-cache/dev-java/asm-analysis-9.23
-rw-r--r--metadata/md5-cache/dev-java/asm-commons-9.23
-rw-r--r--metadata/md5-cache/dev-java/asm-tree-9.23
-rw-r--r--metadata/md5-cache/dev-java/asm-util-9.23
-rw-r--r--metadata/md5-cache/dev-java/aspectj-1.9.73
-rw-r--r--metadata/md5-cache/dev-java/assertj-core-2.3.013
-rw-r--r--metadata/md5-cache/dev-java/assertj-core-2.3.0-r17
-rw-r--r--metadata/md5-cache/dev-java/avalon-framework-4.2.0-r43
-rw-r--r--metadata/md5-cache/dev-java/avalon-logkit-2.1-r123
-rw-r--r--metadata/md5-cache/dev-java/batik-1.147
-rw-r--r--metadata/md5-cache/dev-java/batik-1.14-r115
-rw-r--r--metadata/md5-cache/dev-java/batik-1.913
-rw-r--r--metadata/md5-cache/dev-java/bcel-6.5.03
-rw-r--r--metadata/md5-cache/dev-java/bcel-6.5.0-r33
-rw-r--r--metadata/md5-cache/dev-java/bcmail-1.69-r13
-rw-r--r--metadata/md5-cache/dev-java/bcpg-1.693
-rw-r--r--metadata/md5-cache/dev-java/bcpkix-1.693
-rw-r--r--metadata/md5-cache/dev-java/bcprov-1.693
-rw-r--r--metadata/md5-cache/dev-java/bcutil-1.693
-rw-r--r--metadata/md5-cache/dev-java/bnd-junit-2.1.0-r23
-rw-r--r--metadata/md5-cache/dev-java/bndlib-2.1.0-r13
-rw-r--r--metadata/md5-cache/dev-java/boot-bin-2.8.33
-rw-r--r--metadata/md5-cache/dev-java/brotli-dec-0.1.23
-rw-r--r--metadata/md5-cache/dev-java/browserlauncher2-1.3-r23
-rw-r--r--metadata/md5-cache/dev-java/bsf-2.4.0-r213
-rw-r--r--metadata/md5-cache/dev-java/bsf-2.4.0-r37
-rw-r--r--metadata/md5-cache/dev-java/bsh-2.0_beta6-r13
-rw-r--r--metadata/md5-cache/dev-java/byte-buddy-1.12.83
-rw-r--r--metadata/md5-cache/dev-java/byte-buddy-agent-1.12.83
-rw-r--r--metadata/md5-cache/dev-java/c3p0-0.9.5.5-r13
-rw-r--r--metadata/md5-cache/dev-java/cal10n-0.8.13
-rw-r--r--metadata/md5-cache/dev-java/cglib-3.3.0-r13
-rw-r--r--metadata/md5-cache/dev-java/checker-framework-qual-3.14.03
-rw-r--r--metadata/md5-cache/dev-java/commons-beanutils-1.9.4-r13
-rw-r--r--metadata/md5-cache/dev-java/commons-cli-1.43
-rw-r--r--metadata/md5-cache/dev-java/commons-cli-1.5.015
-rw-r--r--metadata/md5-cache/dev-java/commons-codec-1.153
-rw-r--r--metadata/md5-cache/dev-java/commons-collections-3.2.23
-rw-r--r--metadata/md5-cache/dev-java/commons-collections-4.43
-rw-r--r--metadata/md5-cache/dev-java/commons-compress-1.213
-rw-r--r--metadata/md5-cache/dev-java/commons-csv-1.9.03
-rw-r--r--metadata/md5-cache/dev-java/commons-daemon-1.2.43
-rw-r--r--metadata/md5-cache/dev-java/commons-digester-2.1-r23
-rw-r--r--metadata/md5-cache/dev-java/commons-digester-3.2-r33
-rw-r--r--metadata/md5-cache/dev-java/commons-httpclient-3.1-r23
-rw-r--r--metadata/md5-cache/dev-java/commons-httpclient-4.5.13-r114
-rw-r--r--metadata/md5-cache/dev-java/commons-imaging-1.0_alpha23
-rw-r--r--metadata/md5-cache/dev-java/commons-io-2.11.03
-rw-r--r--metadata/md5-cache/dev-java/commons-jxpath-1.3-r53
-rw-r--r--metadata/md5-cache/dev-java/commons-lang-2.6-r23
-rw-r--r--metadata/md5-cache/dev-java/commons-lang-3.12.03
-rw-r--r--metadata/md5-cache/dev-java/commons-logging-1.2-r53
-rw-r--r--metadata/md5-cache/dev-java/commons-math-3.6.1-r13
-rw-r--r--metadata/md5-cache/dev-java/commons-net-3.8.03
-rw-r--r--metadata/md5-cache/dev-java/commons-text-1.93
-rw-r--r--metadata/md5-cache/dev-java/commons-validator-1.73
-rw-r--r--metadata/md5-cache/dev-java/commons-vfs-2.0-r23
-rw-r--r--metadata/md5-cache/dev-java/conversant-disruptor-1.2.19-r1 (renamed from metadata/md5-cache/dev-java/conversant-disruptor-1.2.19)7
-rw-r--r--metadata/md5-cache/dev-java/core-specs-alpha-0.1.243
-rw-r--r--metadata/md5-cache/dev-java/core-specs-alpha-0.2.443
-rw-r--r--metadata/md5-cache/dev-java/core-specs-alpha-0.2.563
-rw-r--r--metadata/md5-cache/dev-java/cortado-0.6.0-r23
-rw-r--r--metadata/md5-cache/dev-java/cpptasks-1.0_beta5-r13
-rw-r--r--metadata/md5-cache/dev-java/dom4j-2.1.33
-rw-r--r--metadata/md5-cache/dev-java/easymock-3.3.1-r13
-rw-r--r--metadata/md5-cache/dev-java/eclipse-ecj-4.1014
-rw-r--r--metadata/md5-cache/dev-java/eclipse-ecj-4.13-r214
-rw-r--r--metadata/md5-cache/dev-java/eclipse-ecj-4.159
-rw-r--r--metadata/md5-cache/dev-java/eclipse-ecj-4.229
-rw-r--r--metadata/md5-cache/dev-java/eclipse-ecj-4.5.19
-rw-r--r--metadata/md5-cache/dev-java/eclipsito-201805103
-rw-r--r--metadata/md5-cache/dev-java/emma-2.0.5312-r43
-rw-r--r--metadata/md5-cache/dev-java/error-prone-annotations-2.7.13
-rw-r--r--metadata/md5-cache/dev-java/failureaccess-30.1.13
-rw-r--r--metadata/md5-cache/dev-java/fec-1.0.4-r43
-rw-r--r--metadata/md5-cache/dev-java/findbugs-annotations-3.0.13
-rw-r--r--metadata/md5-cache/dev-java/fontbox-1.7.1-r114
-rw-r--r--metadata/md5-cache/dev-java/fontbox-1.7.1-r215
-rw-r--r--metadata/md5-cache/dev-java/fontbox-2.0.243
-rw-r--r--metadata/md5-cache/dev-java/fop-2.0-r314
-rw-r--r--metadata/md5-cache/dev-java/fop-2.79
-rw-r--r--metadata/md5-cache/dev-java/freehep-graphicsbase-2.414
-rw-r--r--metadata/md5-cache/dev-java/freehep-io-2.2.214
-rw-r--r--metadata/md5-cache/dev-java/gin-2.1.23
-rw-r--r--metadata/md5-cache/dev-java/glassfish-interceptor-api-3.113
-rw-r--r--metadata/md5-cache/dev-java/glassfish-jms-api-1.1.2.2.04-r23
-rw-r--r--metadata/md5-cache/dev-java/glassfish-persistence-1.0-r23
-rw-r--r--metadata/md5-cache/dev-java/glassfish-xmlrpc-api-1.1.1-r13
-rw-r--r--metadata/md5-cache/dev-java/glazedlists-1.8.0-r23
-rw-r--r--metadata/md5-cache/dev-java/gnu-classpath-0.98-r614
-rw-r--r--metadata/md5-cache/dev-java/gnu-jaf-1.1.23
-rw-r--r--metadata/md5-cache/dev-java/gnu-jaf-1.1.2-r114
-rw-r--r--metadata/md5-cache/dev-java/gnu-regexp-1.1.4-r43
-rw-r--r--metadata/md5-cache/dev-java/gradle-bin-6.8.33
-rw-r--r--metadata/md5-cache/dev-java/gradle-bin-7.1.13
-rw-r--r--metadata/md5-cache/dev-java/gradle-bin-7.23
-rw-r--r--metadata/md5-cache/dev-java/gradle-bin-7.3.33
-rw-r--r--metadata/md5-cache/dev-java/gradle-bin-7.43
-rw-r--r--metadata/md5-cache/dev-java/gradle-bin-7.4.13
-rw-r--r--metadata/md5-cache/dev-java/gradle-bin-7.4.27
-rw-r--r--metadata/md5-cache/dev-java/gson-2.8.8-r1 (renamed from metadata/md5-cache/dev-java/gson-2.8.8)7
-rw-r--r--metadata/md5-cache/dev-java/gson-2.9.0-r115
-rw-r--r--metadata/md5-cache/dev-java/guava-20.03
-rw-r--r--metadata/md5-cache/dev-java/guava-20.0-r13
-rw-r--r--metadata/md5-cache/dev-java/guava-30.1.13
-rw-r--r--metadata/md5-cache/dev-java/guava-testlib-30.1.115
-rw-r--r--metadata/md5-cache/dev-java/guice-4.13
-rw-r--r--metadata/md5-cache/dev-java/guice-5.1.015
-rw-r--r--metadata/md5-cache/dev-java/gwt-2.9.0-r214
-rw-r--r--metadata/md5-cache/dev-java/gwt-2.9.0-r315
-rw-r--r--metadata/md5-cache/dev-java/hamcrest-core-1.1-r47
-rw-r--r--metadata/md5-cache/dev-java/hamcrest-core-1.3-r27
-rw-r--r--metadata/md5-cache/dev-java/hamcrest-generator-1.3-r37
-rw-r--r--metadata/md5-cache/dev-java/hamcrest-library-1.3-r27
-rw-r--r--metadata/md5-cache/dev-java/hawtjni-runtime-1.15-r13
-rw-r--r--metadata/md5-cache/dev-java/htmlcleaner-2.253
-rw-r--r--metadata/md5-cache/dev-java/httpcomponents-client-4.5.13-r13
-rw-r--r--metadata/md5-cache/dev-java/httpcore-4.4.143
-rw-r--r--metadata/md5-cache/dev-java/icedtea-3.21.03
-rw-r--r--metadata/md5-cache/dev-java/icedtea-sound-1.0.114
-rw-r--r--metadata/md5-cache/dev-java/icedtea-sound-1.0.1-r17
-rw-r--r--metadata/md5-cache/dev-java/icedtea-web-1.8.4-r13
-rw-r--r--metadata/md5-cache/dev-java/icedtea-web-1.8.83
-rw-r--r--metadata/md5-cache/dev-java/icedtea-web-1.8.8-r116
-rw-r--r--metadata/md5-cache/dev-java/icu4j-70.114
-rw-r--r--metadata/md5-cache/dev-java/icu4j-71.17
-rw-r--r--metadata/md5-cache/dev-java/invokebinder-1.614
-rw-r--r--metadata/md5-cache/dev-java/iso-relax-20050331-r53
-rw-r--r--metadata/md5-cache/dev-java/j2objc-annotations-1.2-r13
-rw-r--r--metadata/md5-cache/dev-java/jackcess-4.0.03
-rw-r--r--metadata/md5-cache/dev-java/jackrabbit-webdav-2.10.1-r23
-rw-r--r--metadata/md5-cache/dev-java/jackrabbit-webdav-2.21.7-r13
-rw-r--r--metadata/md5-cache/dev-java/jackson-annotations-2.13.27
-rw-r--r--metadata/md5-cache/dev-java/jackson-annotations-2.13.2-r1 (renamed from metadata/md5-cache/dev-java/jackson-annotations-2.13.0)11
-rw-r--r--metadata/md5-cache/dev-java/jackson-core-2.13.014
-rw-r--r--metadata/md5-cache/dev-java/jackson-core-2.13.27
-rw-r--r--metadata/md5-cache/dev-java/jackson-core-2.13.2-r115
-rw-r--r--metadata/md5-cache/dev-java/jackson-databind-2.13.014
-rw-r--r--metadata/md5-cache/dev-java/jackson-databind-2.13.27
-rw-r--r--metadata/md5-cache/dev-java/jackson-databind-2.13.2.215
-rw-r--r--metadata/md5-cache/dev-java/jackson-dataformat-xml-2.13.014
-rw-r--r--metadata/md5-cache/dev-java/jackson-dataformat-xml-2.13.27
-rw-r--r--metadata/md5-cache/dev-java/jackson-dataformat-xml-2.13.2-r115
-rw-r--r--metadata/md5-cache/dev-java/jackson-dataformat-yaml-2.13.014
-rw-r--r--metadata/md5-cache/dev-java/jackson-dataformat-yaml-2.13.27
-rw-r--r--metadata/md5-cache/dev-java/jackson-dataformat-yaml-2.13.2-r115
-rw-r--r--metadata/md5-cache/dev-java/jackson-module-jakarta-xmlbind-2.13.014
-rw-r--r--metadata/md5-cache/dev-java/jackson-module-jakarta-xmlbind-2.13.27
-rw-r--r--metadata/md5-cache/dev-java/jackson-module-jakarta-xmlbind-2.13.2-r115
-rw-r--r--metadata/md5-cache/dev-java/jacl-1.4.1-r23
-rw-r--r--metadata/md5-cache/dev-java/jai-imageio-core-1.4.03
-rw-r--r--metadata/md5-cache/dev-java/jai-imageio-jpeg2000-1.4.03
-rw-r--r--metadata/md5-cache/dev-java/jakarta-activation-1.2.2-r1 (renamed from metadata/md5-cache/dev-java/jakarta-activation-1.2.2)11
-rw-r--r--metadata/md5-cache/dev-java/jakarta-activation-2.0.113
-rw-r--r--metadata/md5-cache/dev-java/jakarta-activation-2.0.1-r114
-rw-r--r--metadata/md5-cache/dev-java/jakarta-activation-api-1.2.2-r1 (renamed from metadata/md5-cache/dev-java/jakarta-activation-api-1.2.2)11
-rw-r--r--metadata/md5-cache/dev-java/jakarta-activation-api-2.1.0-r1 (renamed from metadata/md5-cache/dev-java/jakarta-activation-api-2.1.0)9
-rw-r--r--metadata/md5-cache/dev-java/jakarta-json-api-1.1.63
-rw-r--r--metadata/md5-cache/dev-java/jakarta-oro-2.0.8-r53
-rw-r--r--metadata/md5-cache/dev-java/jakarta-regexp-1.3-r63
-rw-r--r--metadata/md5-cache/dev-java/jakarta-regexp-1.4-r33
-rw-r--r--metadata/md5-cache/dev-java/jakarta-regexp-1.5-r13
-rw-r--r--metadata/md5-cache/dev-java/jakarta-xml-soap-api-1.4.214
-rw-r--r--metadata/md5-cache/dev-java/jakarta-xml-soap-api-1.4.2-r115
-rw-r--r--metadata/md5-cache/dev-java/jakartaee-migration-1.0.03
-rw-r--r--metadata/md5-cache/dev-java/jal-20031117-r63
-rw-r--r--metadata/md5-cache/dev-java/janino-3.1.67
-rw-r--r--metadata/md5-cache/dev-java/jansi-1.133
-rw-r--r--metadata/md5-cache/dev-java/jansi-2.4.0-r13
-rw-r--r--metadata/md5-cache/dev-java/jansi-native-1.83
-rw-r--r--metadata/md5-cache/dev-java/japitools-0.9.7-r43
-rw-r--r--metadata/md5-cache/dev-java/java-apicheck-0_p2015090710
-rw-r--r--metadata/md5-cache/dev-java/java-config-2.3.17
-rw-r--r--metadata/md5-cache/dev-java/java-config-99995
-rw-r--r--metadata/md5-cache/dev-java/java-dep-check-0.53
-rw-r--r--metadata/md5-cache/dev-java/java-diff-utils-1.3.03
-rw-r--r--metadata/md5-cache/dev-java/java-getopt-1.0.14-r13
-rw-r--r--metadata/md5-cache/dev-java/java-service-wrapper-3.5.25-r23
-rw-r--r--metadata/md5-cache/dev-java/javacc-5.0-r43
-rw-r--r--metadata/md5-cache/dev-java/javacup-0.11b_p20151001-r13
-rw-r--r--metadata/md5-cache/dev-java/javahelp-2.0.05_p201707193
-rw-r--r--metadata/md5-cache/dev-java/javahelp-2.0.05_p20170719-r114
-rw-r--r--metadata/md5-cache/dev-java/javassist-3.18.2-r13
-rw-r--r--metadata/md5-cache/dev-java/javatoolkit-0.6.73
-rw-r--r--metadata/md5-cache/dev-java/javax-inject-1-r45
-rw-r--r--metadata/md5-cache/dev-java/javax-mail-1.6.7-r1 (renamed from metadata/md5-cache/dev-java/javax-mail-1.6.7)7
-rw-r--r--metadata/md5-cache/dev-java/jaxb-api-2.3.33
-rw-r--r--metadata/md5-cache/dev-java/jaxb-api-2.3.3-r115
-rw-r--r--metadata/md5-cache/dev-java/jaxb-api-3.0.13
-rw-r--r--metadata/md5-cache/dev-java/jaxb-api-3.0.1-r114
-rw-r--r--metadata/md5-cache/dev-java/jaxen-1.1.6-r213
-rw-r--r--metadata/md5-cache/dev-java/jaxen-1.2.0-r13
-rw-r--r--metadata/md5-cache/dev-java/jbig2-imageio-3.0.33
-rw-r--r--metadata/md5-cache/dev-java/jbitcollider-core-0.8-r13
-rw-r--r--metadata/md5-cache/dev-java/jboss-jms-api-1.0.13
-rw-r--r--metadata/md5-cache/dev-java/jboss-marshalling-1.3.0-r23
-rw-r--r--metadata/md5-cache/dev-java/jboss-marshalling-river-1.3.013
-rw-r--r--metadata/md5-cache/dev-java/jboss-marshalling-serial-1.3.013
-rw-r--r--metadata/md5-cache/dev-java/jboss-modules-1.3.3-r13
-rw-r--r--metadata/md5-cache/dev-java/jcalendar-1.4-r13
-rw-r--r--metadata/md5-cache/dev-java/jchart2d-3.2.2-r13
-rw-r--r--metadata/md5-cache/dev-java/jcifs-1.3.19-r13
-rw-r--r--metadata/md5-cache/dev-java/jcip-annotations-1.0.1-r13
-rw-r--r--metadata/md5-cache/dev-java/jclasslib-3.113
-rw-r--r--metadata/md5-cache/dev-java/jclasslib-3.1-r17
-rw-r--r--metadata/md5-cache/dev-java/jcommander-1.48-r13
-rw-r--r--metadata/md5-cache/dev-java/jcommander-1.8215
-rw-r--r--metadata/md5-cache/dev-java/jctools-core-2.0.23
-rw-r--r--metadata/md5-cache/dev-java/jdbc-mssqlserver-6.2.23
-rw-r--r--metadata/md5-cache/dev-java/jdbc-mysql-8.0.263
-rw-r--r--metadata/md5-cache/dev-java/jdbc-postgresql-9.4_p1206-r13
-rw-r--r--metadata/md5-cache/dev-java/jdepend-2.103
-rw-r--r--metadata/md5-cache/dev-java/jdom-1.1.3-r13
-rw-r--r--metadata/md5-cache/dev-java/jdom-2.0.6-r53
-rw-r--r--metadata/md5-cache/dev-java/jempbox-1.7.1-r13
-rw-r--r--metadata/md5-cache/dev-java/jeromq-0.5.23
-rw-r--r--metadata/md5-cache/dev-java/jffi-1.2.9-r13
-rw-r--r--metadata/md5-cache/dev-java/jffi-1.3.63
-rw-r--r--metadata/md5-cache/dev-java/jflex-1.6.1-r13
-rw-r--r--metadata/md5-cache/dev-java/jformatstring-2.0.3-r13
-rw-r--r--metadata/md5-cache/dev-java/jgoodies-common-1.8.0-r13
-rw-r--r--metadata/md5-cache/dev-java/jgoodies-looks-2.6.0-r13
-rw-r--r--metadata/md5-cache/dev-java/jgraph-5.12.0.4-r13
-rw-r--r--metadata/md5-cache/dev-java/jide-oss-3.7.123
-rw-r--r--metadata/md5-cache/dev-java/jline-2.14.63
-rw-r--r--metadata/md5-cache/dev-java/jmh-core-1.213
-rw-r--r--metadata/md5-cache/dev-java/jmh-core-1.3515
-rw-r--r--metadata/md5-cache/dev-java/jmock-1.2.0-r23
-rw-r--r--metadata/md5-cache/dev-java/jmock-2.6.1-r13
-rw-r--r--metadata/md5-cache/dev-java/jna-4.2.2-r33
-rw-r--r--metadata/md5-cache/dev-java/jna-5.10.07
-rw-r--r--metadata/md5-cache/dev-java/jna-5.11.016
-rw-r--r--metadata/md5-cache/dev-java/jnacl-1.03
-rw-r--r--metadata/md5-cache/dev-java/jnr-a64asm-1.0.03
-rw-r--r--metadata/md5-cache/dev-java/jnr-constants-0.10.33
-rw-r--r--metadata/md5-cache/dev-java/jnr-ffi-2.0.2-r13
-rw-r--r--metadata/md5-cache/dev-java/jnr-ffi-2.2.83
-rw-r--r--metadata/md5-cache/dev-java/jnr-netdb-1.1.4-r13
-rw-r--r--metadata/md5-cache/dev-java/jnr-posix-3.0.10-r13
-rw-r--r--metadata/md5-cache/dev-java/jnr-x86asm-1.0.2-r23
-rw-r--r--metadata/md5-cache/dev-java/joda-convert-2.2.2-r13
-rw-r--r--metadata/md5-cache/dev-java/joda-time-2.10.10-r13
-rw-r--r--metadata/md5-cache/dev-java/jol-core-0.163
-rw-r--r--metadata/md5-cache/dev-java/jopt-simple-4.6-r13
-rw-r--r--metadata/md5-cache/dev-java/jopt-simple-5.03
-rw-r--r--metadata/md5-cache/dev-java/jopt-simple-5.0-r114
-rw-r--r--metadata/md5-cache/dev-java/jrobin-1.6.0-r114
-rw-r--r--metadata/md5-cache/dev-java/jrobin-1.6.0-r27
-rw-r--r--metadata/md5-cache/dev-java/jsch-0.1.553
-rw-r--r--metadata/md5-cache/dev-java/jsch-agent-proxy-0.0.93
-rw-r--r--metadata/md5-cache/dev-java/json-2015072913
-rw-r--r--metadata/md5-cache/dev-java/json-202203207
-rw-r--r--metadata/md5-cache/dev-java/json-simple-1.1-r23
-rw-r--r--metadata/md5-cache/dev-java/jspeex-0.9.7-r23
-rw-r--r--metadata/md5-cache/dev-java/jsr250-1.23
-rw-r--r--metadata/md5-cache/dev-java/jsr305-3.0.2-r13
-rw-r--r--metadata/md5-cache/dev-java/jta-1.1-r13
-rw-r--r--metadata/md5-cache/dev-java/jtds-1.3.1-r13
-rw-r--r--metadata/md5-cache/dev-java/jtidy-1.0-r13
-rw-r--r--metadata/md5-cache/dev-java/junit-3.8.2-r23
-rw-r--r--metadata/md5-cache/dev-java/junit-4.13.23
-rw-r--r--metadata/md5-cache/dev-java/junit-clptr-1.2.23
-rw-r--r--metadata/md5-cache/dev-java/junitparams-1.1.13
-rw-r--r--metadata/md5-cache/dev-java/jython-2.7.0-r47
-rw-r--r--metadata/md5-cache/dev-java/jython-2.7.0-r616
-rw-r--r--metadata/md5-cache/dev-java/jzlib-1.1.3-r23
-rw-r--r--metadata/md5-cache/dev-java/kafka-clients-1.1.13
-rw-r--r--metadata/md5-cache/dev-java/leiningen-bin-2.9.13
-rw-r--r--metadata/md5-cache/dev-java/leiningen-bin-2.9.814
-rw-r--r--metadata/md5-cache/dev-java/libg-2.1.0-r23
-rw-r--r--metadata/md5-cache/dev-java/lmax-disruptor-3.4.43
-rw-r--r--metadata/md5-cache/dev-java/log4j-1.2.17-r313
-rw-r--r--metadata/md5-cache/dev-java/log4j-12-api-2.17.13
-rw-r--r--metadata/md5-cache/dev-java/log4j-12-api-2.17.23
-rw-r--r--metadata/md5-cache/dev-java/log4j-api-2.17.13
-rw-r--r--metadata/md5-cache/dev-java/log4j-api-2.17.23
-rw-r--r--metadata/md5-cache/dev-java/log4j-api-java9-2.17.17
-rw-r--r--metadata/md5-cache/dev-java/log4j-core-2.17.1-r13
-rw-r--r--metadata/md5-cache/dev-java/log4j-core-2.17.23
-rw-r--r--metadata/md5-cache/dev-java/logback-classic-1.2.117
-rw-r--r--metadata/md5-cache/dev-java/logback-core-1.2.117
-rw-r--r--metadata/md5-cache/dev-java/lucene-2.4.1-r214
-rw-r--r--metadata/md5-cache/dev-java/lucene-2.4.1-r37
-rw-r--r--metadata/md5-cache/dev-java/lz4-java-1.8.0-r13
-rw-r--r--metadata/md5-cache/dev-java/lzma-19.003
-rw-r--r--metadata/md5-cache/dev-java/lzmajio-0.95-r33
-rw-r--r--metadata/md5-cache/dev-java/maven-bin-3.8.23
-rw-r--r--metadata/md5-cache/dev-java/maven-bin-3.8.33
-rw-r--r--metadata/md5-cache/dev-java/maven-hawtjni-plugin-1.153
-rw-r--r--metadata/md5-cache/dev-java/mchange-commons-0.2.203
-rw-r--r--metadata/md5-cache/dev-java/mersennetwister-0_pre23765-r23
-rw-r--r--metadata/md5-cache/dev-java/metainf-services-1.7-r13
-rw-r--r--metadata/md5-cache/dev-java/microba-0.4.4.3-r113
-rw-r--r--metadata/md5-cache/dev-java/microba-0.4.4.3-r27
-rw-r--r--metadata/md5-cache/dev-java/miglayout-4.0-r13
-rw-r--r--metadata/md5-cache/dev-java/mimepull-1.9.6-r23
-rw-r--r--metadata/md5-cache/dev-java/mockito-1.9.5-r23
-rw-r--r--metadata/md5-cache/dev-java/mockito-4.4.03
-rw-r--r--metadata/md5-cache/dev-java/msv-201306013
-rw-r--r--metadata/md5-cache/dev-java/mvel-2.3.2-r13
-rw-r--r--metadata/md5-cache/dev-java/netty-4.1.357
-rw-r--r--metadata/md5-cache/dev-java/netty-buffer-4.0.363
-rw-r--r--metadata/md5-cache/dev-java/netty-buffer-4.0.36-r13
-rw-r--r--metadata/md5-cache/dev-java/netty-common-4.0.36-r23
-rw-r--r--metadata/md5-cache/dev-java/netty-transport-4.0.363
-rw-r--r--metadata/md5-cache/dev-java/objenesis-3.23
-rw-r--r--metadata/md5-cache/dev-java/objenesis-test-3.23
-rw-r--r--metadata/md5-cache/dev-java/openjdk-11.0.13_p814
-rw-r--r--metadata/md5-cache/dev-java/openjdk-11.0.14_p9-r19
-rw-r--r--metadata/md5-cache/dev-java/openjdk-11.0.15_p1015
-rw-r--r--metadata/md5-cache/dev-java/openjdk-17.0.1_p1214
-rw-r--r--metadata/md5-cache/dev-java/openjdk-17.0.2_p83
-rw-r--r--metadata/md5-cache/dev-java/openjdk-17.0.3_p715
-rw-r--r--metadata/md5-cache/dev-java/openjdk-8.312_p0714
-rw-r--r--metadata/md5-cache/dev-java/openjdk-8.322_p063
-rw-r--r--metadata/md5-cache/dev-java/openjdk-8.332_p0916
-rw-r--r--metadata/md5-cache/dev-java/openjdk-bin-11.0.13_p814
-rw-r--r--metadata/md5-cache/dev-java/openjdk-bin-11.0.13_p8-r114
-rw-r--r--metadata/md5-cache/dev-java/openjdk-bin-11.0.15_p1015
-rw-r--r--metadata/md5-cache/dev-java/openjdk-bin-17.0.1_p12-r114
-rw-r--r--metadata/md5-cache/dev-java/openjdk-bin-17.0.3_p715
-rw-r--r--metadata/md5-cache/dev-java/openjdk-bin-8.312_p0714
-rw-r--r--metadata/md5-cache/dev-java/openjdk-bin-8.332_p09 (renamed from metadata/md5-cache/dev-java/openjdk-bin-8.312_p07-r1)5
-rw-r--r--metadata/md5-cache/dev-java/openjdk-jre-bin-11.0.14_p9-r1 (renamed from metadata/md5-cache/dev-java/openjdk-jre-bin-11.0.14_p9)0
-rw-r--r--metadata/md5-cache/dev-java/openjdk-jre-bin-11.0.15_p1015
-rw-r--r--metadata/md5-cache/dev-java/openjdk-jre-bin-17.0.3_p715
-rw-r--r--metadata/md5-cache/dev-java/openjdk-jre-bin-8.332_p09 (renamed from metadata/md5-cache/dev-java/openjdk-jre-bin-8.312_p07-r1)7
-rw-r--r--metadata/md5-cache/dev-java/openjfx-11.0.11_p13
-rw-r--r--metadata/md5-cache/dev-java/openjfx-11.0.9_p03
-rw-r--r--metadata/md5-cache/dev-java/openjfx-8.10003
-rw-r--r--metadata/md5-cache/dev-java/opentest4j-1.2.07
-rw-r--r--metadata/md5-cache/dev-java/oracle-javamail-1.5.6-r13
-rw-r--r--metadata/md5-cache/dev-java/osgi-annotation-versioning-1.1.13
-rw-r--r--metadata/md5-cache/dev-java/osgi-compendium-4.3.1-r23
-rw-r--r--metadata/md5-cache/dev-java/osgi-core-api-5.0.0-r23
-rw-r--r--metadata/md5-cache/dev-java/osgi-enterprise-api-5.0.0-r13
-rw-r--r--metadata/md5-cache/dev-java/osgi-enterprise-api-5.0.0-r216
-rw-r--r--metadata/md5-cache/dev-java/osgi-foundation-1.2.0-r23
-rw-r--r--metadata/md5-cache/dev-java/pdf-renderer-1.0.5-r13
-rw-r--r--metadata/md5-cache/dev-java/pdfbox-2.0.243
-rw-r--r--metadata/md5-cache/dev-java/picocli-4.6.3-r13
-rw-r--r--metadata/md5-cache/dev-java/plexus-classworlds-2.2.33
-rw-r--r--metadata/md5-cache/dev-java/poi-5.0.03
-rw-r--r--metadata/md5-cache/dev-java/protobuf-java-3.17.33
-rw-r--r--metadata/md5-cache/dev-java/protobuf-java-3.19.37
-rw-r--r--metadata/md5-cache/dev-java/protobuf-java-99993
-rw-r--r--metadata/md5-cache/dev-java/qdox-1.12.1-r214
-rw-r--r--metadata/md5-cache/dev-java/qdox-1.12.1-r37
-rw-r--r--metadata/md5-cache/dev-java/randomized-runner-2.7.814
-rw-r--r--metadata/md5-cache/dev-java/randomized-runner-2.7.97
-rw-r--r--metadata/md5-cache/dev-java/rat-0.133
-rw-r--r--metadata/md5-cache/dev-java/reflections-0.9.10-r13
-rw-r--r--metadata/md5-cache/dev-java/reflections-0.9.12-r215
-rw-r--r--metadata/md5-cache/dev-java/relaxng-datatype-1.0-r23
-rw-r--r--metadata/md5-cache/dev-java/relaxng-datatype-1.0-r315
-rw-r--r--metadata/md5-cache/dev-java/resin-servlet-api-3.0.25-r13
-rw-r--r--metadata/md5-cache/dev-java/resin-servlet-api-4.0.27-r23
-rw-r--r--metadata/md5-cache/dev-java/resin-servlet-api-4.0.46-r13
-rw-r--r--metadata/md5-cache/dev-java/rhino-1.7.143
-rw-r--r--metadata/md5-cache/dev-java/rome-0.9-r43
-rw-r--r--metadata/md5-cache/dev-java/rxtx-2.2_pre2-r23
-rw-r--r--metadata/md5-cache/dev-java/sac-1.3-r43
-rw-r--r--metadata/md5-cache/dev-java/sax-2.2.1-r53
-rw-r--r--metadata/md5-cache/dev-java/saxon-6.5.5-r213
-rw-r--r--metadata/md5-cache/dev-java/saxon-6.5.5-r37
-rw-r--r--metadata/md5-cache/dev-java/saxon-9.2.0.6-r213
-rw-r--r--metadata/md5-cache/dev-java/saxon-9.2.0.6-r37
-rw-r--r--metadata/md5-cache/dev-java/sbt-0.13.133
-rw-r--r--metadata/md5-cache/dev-java/sbt-0.13.183
-rw-r--r--metadata/md5-cache/dev-java/sbt-bin-1.3.103
-rw-r--r--metadata/md5-cache/dev-java/sbt-bin-1.3.23
-rw-r--r--metadata/md5-cache/dev-java/sjsxp-1.0.23
-rw-r--r--metadata/md5-cache/dev-java/slf4j-api-1.7.363
-rw-r--r--metadata/md5-cache/dev-java/slf4j-ext-1.7.363
-rw-r--r--metadata/md5-cache/dev-java/slf4j-nop-1.7.363
-rw-r--r--metadata/md5-cache/dev-java/slf4j-simple-1.7.363
-rw-r--r--metadata/md5-cache/dev-java/snakeyaml-1.28-r114
-rw-r--r--metadata/md5-cache/dev-java/snakeyaml-1.307
-rw-r--r--metadata/md5-cache/dev-java/snappy-1.1.7.83
-rw-r--r--metadata/md5-cache/dev-java/sparsebitset-1.23
-rw-r--r--metadata/md5-cache/dev-java/spec-alpha-0.1.1433
-rw-r--r--metadata/md5-cache/dev-java/spec-alpha-0.2.1763
-rw-r--r--metadata/md5-cache/dev-java/spec-alpha-0.2.1943
-rw-r--r--metadata/md5-cache/dev-java/spin-1.5-r23
-rw-r--r--metadata/md5-cache/dev-java/stax2-api-4.2.13
-rw-r--r--metadata/md5-cache/dev-java/stax2-api-4.2.1-r114
-rw-r--r--metadata/md5-cache/dev-java/stringtemplate-3.2.1-r23
-rw-r--r--metadata/md5-cache/dev-java/stringtemplate-4.3.115
-rw-r--r--metadata/md5-cache/dev-java/stringtemplate-4.3.27
-rw-r--r--metadata/md5-cache/dev-java/sun-jai-bin-1.1.3-r23
-rw-r--r--metadata/md5-cache/dev-java/sun-jms-1.1-r33
-rw-r--r--metadata/md5-cache/dev-java/swing-layout-1.0.4-r23
-rw-r--r--metadata/md5-cache/dev-java/swingx-1.6.4-r13
-rw-r--r--metadata/md5-cache/dev-java/swingx-beaninfo-1.6.4-r13
-rw-r--r--metadata/md5-cache/dev-java/swingx-ws-1.0_p20110515-r23
-rw-r--r--metadata/md5-cache/dev-java/swt-3.7.2-r33
-rw-r--r--metadata/md5-cache/dev-java/swt-3.8.2-r43
-rw-r--r--metadata/md5-cache/dev-java/swt-4.10-r23
-rw-r--r--metadata/md5-cache/dev-java/testng-6.9.103
-rw-r--r--metadata/md5-cache/dev-java/testng-6.9.10-r13
-rw-r--r--metadata/md5-cache/dev-java/tomcat-native-1.2.327
-rw-r--r--metadata/md5-cache/dev-java/tomcat-native-1.2.33 (renamed from metadata/md5-cache/dev-java/tomcat-native-1.2.31)11
-rw-r--r--metadata/md5-cache/dev-java/tomcat-servlet-api-10.0.1713
-rw-r--r--metadata/md5-cache/dev-java/tomcat-servlet-api-10.0.187
-rw-r--r--metadata/md5-cache/dev-java/tomcat-servlet-api-10.0.207
-rw-r--r--metadata/md5-cache/dev-java/tomcat-servlet-api-4.1.403
-rw-r--r--metadata/md5-cache/dev-java/tomcat-servlet-api-5.5.363
-rw-r--r--metadata/md5-cache/dev-java/tomcat-servlet-api-6.0.53-r13
-rw-r--r--metadata/md5-cache/dev-java/tomcat-servlet-api-7.0.1093
-rw-r--r--metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.7613
-rw-r--r--metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.777
-rw-r--r--metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.787
-rw-r--r--metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.5913
-rw-r--r--metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.607
-rw-r--r--metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.627
-rw-r--r--metadata/md5-cache/dev-java/treelayout-1.0.3-r13
-rw-r--r--metadata/md5-cache/dev-java/typesafe-config-1.3.0-r33
-rw-r--r--metadata/md5-cache/dev-java/univocity-parsers-2.9.17
-rw-r--r--metadata/md5-cache/dev-java/validation-api-1.0.0-r17
-rw-r--r--metadata/md5-cache/dev-java/validation-api-1.1.0-r17
-rw-r--r--metadata/md5-cache/dev-java/velocity-2.33
-rw-r--r--metadata/md5-cache/dev-java/woodstox-core-6.2.714
-rw-r--r--metadata/md5-cache/dev-java/woodstox-core-6.2.8-r1 (renamed from metadata/md5-cache/dev-java/woodstox-core-6.2.8)9
-rw-r--r--metadata/md5-cache/dev-java/wsdl4j-1.6.2-r13
-rw-r--r--metadata/md5-cache/dev-java/xalan-2.7.2-r13
-rw-r--r--metadata/md5-cache/dev-java/xalan-serializer-2.7.2-r13
-rw-r--r--metadata/md5-cache/dev-java/xerces-2.12.23
-rw-r--r--metadata/md5-cache/dev-java/xerial-core-2.0.1-r13
-rw-r--r--metadata/md5-cache/dev-java/xjavac-2.4.03
-rw-r--r--metadata/md5-cache/dev-java/xml-commons-external-1.3.04-r13
-rw-r--r--metadata/md5-cache/dev-java/xml-commons-external-1.4.01-r23
-rw-r--r--metadata/md5-cache/dev-java/xml-commons-resolver-1.2-r23
-rw-r--r--metadata/md5-cache/dev-java/xmlgraphics-commons-2.73
-rw-r--r--metadata/md5-cache/dev-java/xmlgraphics-commons-2.7-r115
-rw-r--r--metadata/md5-cache/dev-java/xmlunit-1.6-r13
-rw-r--r--metadata/md5-cache/dev-java/xmpbox-2.0.243
-rw-r--r--metadata/md5-cache/dev-java/xom-1.3.73
-rw-r--r--metadata/md5-cache/dev-java/xpp2-2.1.10-r33
-rw-r--r--metadata/md5-cache/dev-java/xpp3-1.1.4c-r63
-rw-r--r--metadata/md5-cache/dev-java/xsdlib-20090415-r13
-rw-r--r--metadata/md5-cache/dev-java/xz-java-1.93
-rw-r--r--metadata/md5-cache/dev-java/zstd-jni-1.5.0.43
493 files changed, 1512 insertions, 1296 deletions
diff --git a/metadata/md5-cache/dev-java/Manifest.gz b/metadata/md5-cache/dev-java/Manifest.gz
index acfeb86b3e04..e00de3e31ac7 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 15d0fc862105..b564f8bcb8ac 100644
--- a/metadata/md5-cache/dev-java/angus-activation-1.0.0
+++ b/metadata/md5-cache/dev-java/angus-activation-1.0.0
@@ -3,11 +3,12 @@ DEPEND=>=dev-java/jakarta-activation-api-2.1.0:2 >=virtual/jdk-1.8:* >=dev-java/
DESCRIPTION=Provides the implementation of the Jakarta Activation Specification
EAPI=8
HOMEPAGE=https://github.com/eclipse-ee4j/angus-activation
+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-api-2.1.0:2 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=0
SRC_URI=https://github.com/eclipse-ee4j/angus-activation/archive/refs/tags/1.0.0.tar.gz -> angus-activation-1.0.0.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
_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 9154dfc4d382..f9cd9d6cd8ff 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
@@ -3,11 +3,12 @@ DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zi
DESCRIPTION=Java annotations for marking methods that Animal Sniffer should ignore
EAPI=8
HOMEPAGE=http://www.mojohaus.org/animal-sniffer/animal-sniffer-annotations/
+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/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=0
SRC_URI=https://github.com/mojohaus/animal-sniffer/archive/animal-sniffer-parent-1.15.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
_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 63ef79b1a4fd..392d1d5639a1 100644
--- a/metadata/md5-cache/dev-java/ant-antlr-1.10.9
+++ b/metadata/md5-cache/dev-java/ant-antlr-1.10.9
@@ -3,11 +3,12 @@ DEPEND=>=dev-java/java-config-2.2.0-r3 dev-java/javatoolkit ~dev-java/ant-core-1
DESCRIPTION=Apache Ant's optional tasks for Antlr
EAPI=7
HOMEPAGE=https://ant.apache.org/
+INHERIT=ant-tasks
KEYWORDS=amd64 ~arm 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/antlr-2.7.7-r7:0 >=dev-java/java-config-2.2.0-r3 ~dev-java/ant-core-1.10.9:0 >=virtual/jre-1.8
RESTRICT=test
SLOT=0
SRC_URI=mirror://apache/ant/source/apache-ant-1.10.9-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.10.9-gentoo.tar.bz2
-_eclasses_=ant-tasks bf8953b38a65f5a7d92b8d2ba4efa7f4 java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=ant-tasks bf8953b38a65f5a7d92b8d2ba4efa7f4 java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
_md5_=e34ccc87a626ad32a574e7078c842e05
diff --git a/metadata/md5-cache/dev-java/ant-apache-bcel-1.10.9 b/metadata/md5-cache/dev-java/ant-apache-bcel-1.10.9
index d151df263dc5..4917d9900d49 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
@@ -3,11 +3,12 @@ DEPEND=>=dev-java/bcel-5.1-r3:0 >=dev-java/java-config-2.2.0-r3 dev-java/javatoo
DESCRIPTION=Apache Ant's optional tasks depending on bcel
EAPI=7
HOMEPAGE=https://ant.apache.org/
+INHERIT=ant-tasks
KEYWORDS=amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=Apache-2.0
RDEPEND=>=dev-java/bcel-5.1-r3:0 >=dev-java/java-config-2.2.0-r3 ~dev-java/ant-core-1.10.9:0 >=virtual/jre-1.8
RESTRICT=test
SLOT=0
SRC_URI=mirror://apache/ant/source/apache-ant-1.10.9-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.10.9-gentoo.tar.bz2
-_eclasses_=ant-tasks bf8953b38a65f5a7d92b8d2ba4efa7f4 java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=ant-tasks bf8953b38a65f5a7d92b8d2ba4efa7f4 java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
_md5_=f0a7256c8537cd8896f15a893d4f7793
diff --git a/metadata/md5-cache/dev-java/ant-apache-bsf-1.10.9 b/metadata/md5-cache/dev-java/ant-apache-bsf-1.10.9
index 3382fc2fe24c..64070bb3e92f 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
@@ -3,6 +3,7 @@ DEPEND=>=dev-java/bsf-2.4.0-r1:2.3[python?,javascript?,tcl?] >=dev-java/java-con
DESCRIPTION=Apache Ant's optional tasks depending on bsf-2.3
EAPI=7
HOMEPAGE=https://ant.apache.org/
+INHERIT=ant-tasks
IUSE=python javascript tcl
KEYWORDS=amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=Apache-2.0
@@ -10,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 92b5a4d196abffe2dbe3bdc1cf4ef2ae multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=ant-tasks bf8953b38a65f5a7d92b8d2ba4efa7f4 java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
_md5_=64a9cc51fd51b815e8d71966014dc957
diff --git a/metadata/md5-cache/dev-java/ant-apache-log4j-1.10.9-r1 b/metadata/md5-cache/dev-java/ant-apache-log4j-1.10.9-r1
index 6bb0a9d704c7..3d11e98db462 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
@@ -3,11 +3,12 @@ DEPEND=dev-java/log4j-12-api:2 >=dev-java/java-config-2.2.0-r3 dev-java/javatool
DESCRIPTION=Apache Ant's optional tasks depending on log4j-12-api-2
EAPI=7
HOMEPAGE=https://ant.apache.org/
+INHERIT=ant-tasks
KEYWORDS=amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=Apache-2.0
RDEPEND=dev-java/log4j-12-api:2 >=dev-java/java-config-2.2.0-r3 ~dev-java/ant-core-1.10.9:0 >=virtual/jre-1.8
RESTRICT=test
SLOT=0
SRC_URI=mirror://apache/ant/source/apache-ant-1.10.9-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.10.9-gentoo.tar.bz2
-_eclasses_=ant-tasks bf8953b38a65f5a7d92b8d2ba4efa7f4 java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=ant-tasks bf8953b38a65f5a7d92b8d2ba4efa7f4 java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
_md5_=eab333cc6f69a614495b1a4a4eaea139
diff --git a/metadata/md5-cache/dev-java/ant-apache-oro-1.10.9 b/metadata/md5-cache/dev-java/ant-apache-oro-1.10.9
index a80d626a9b38..652f1396c8a9 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
@@ -3,11 +3,12 @@ DEPEND=>=dev-java/jakarta-oro-2.0.8-r2:2.0 >=dev-java/java-config-2.2.0-r3 dev-j
DESCRIPTION=Apache Ant's optional tasks depending on jakarta-oro-2.0
EAPI=7
HOMEPAGE=https://ant.apache.org/
+INHERIT=ant-tasks
KEYWORDS=amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=Apache-2.0
RDEPEND=>=dev-java/jakarta-oro-2.0.8-r2:2.0 >=dev-java/java-config-2.2.0-r3 ~dev-java/ant-core-1.10.9:0 >=virtual/jre-1.8
RESTRICT=test
SLOT=0
SRC_URI=mirror://apache/ant/source/apache-ant-1.10.9-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.10.9-gentoo.tar.bz2
-_eclasses_=ant-tasks bf8953b38a65f5a7d92b8d2ba4efa7f4 java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=ant-tasks bf8953b38a65f5a7d92b8d2ba4efa7f4 java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
_md5_=08992e578bac558a1819b6052b1421a0
diff --git a/metadata/md5-cache/dev-java/ant-apache-regexp-1.10.9 b/metadata/md5-cache/dev-java/ant-apache-regexp-1.10.9
index 3c9a159bc4c6..a94b13b834a4 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
@@ -3,11 +3,12 @@ DEPEND=>=dev-java/jakarta-regexp-1.4-r1:1.4 >=dev-java/java-config-2.2.0-r3 dev-
DESCRIPTION=Apache Ant's optional tasks depending on jakarta-regexp-1.4
EAPI=7
HOMEPAGE=https://ant.apache.org/
+INHERIT=ant-tasks
KEYWORDS=amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=Apache-2.0
RDEPEND=>=dev-java/jakarta-regexp-1.4-r1:1.4 >=dev-java/java-config-2.2.0-r3 ~dev-java/ant-core-1.10.9:0 >=virtual/jre-1.8
RESTRICT=test
SLOT=0
SRC_URI=mirror://apache/ant/source/apache-ant-1.10.9-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.10.9-gentoo.tar.bz2
-_eclasses_=ant-tasks bf8953b38a65f5a7d92b8d2ba4efa7f4 java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=ant-tasks bf8953b38a65f5a7d92b8d2ba4efa7f4 java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
_md5_=9571e66c145abbe89dfc22113a77d6a7
diff --git a/metadata/md5-cache/dev-java/ant-apache-resolver-1.10.9 b/metadata/md5-cache/dev-java/ant-apache-resolver-1.10.9
index 95a35f89ac16..62a9a83e20e9 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
@@ -3,11 +3,12 @@ DEPEND=>=dev-java/xml-commons-resolver-1.2:0 >=dev-java/java-config-2.2.0-r3 dev
DESCRIPTION=Apache Ant's optional tasks depending on xml-commons-resolver
EAPI=7
HOMEPAGE=https://ant.apache.org/
+INHERIT=ant-tasks
KEYWORDS=amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=Apache-2.0
RDEPEND=>=dev-java/xml-commons-resolver-1.2:0 >=dev-java/java-config-2.2.0-r3 ~dev-java/ant-core-1.10.9:0 >=virtual/jre-1.8
RESTRICT=test
SLOT=0
SRC_URI=mirror://apache/ant/source/apache-ant-1.10.9-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.10.9-gentoo.tar.bz2
-_eclasses_=ant-tasks bf8953b38a65f5a7d92b8d2ba4efa7f4 java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=ant-tasks bf8953b38a65f5a7d92b8d2ba4efa7f4 java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
_md5_=b2537452929b04a6bd67a5307b739052
diff --git a/metadata/md5-cache/dev-java/ant-apache-xalan2-1.10.9 b/metadata/md5-cache/dev-java/ant-apache-xalan2-1.10.9
index f4b613804aa1..9660d6c90c0b 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
@@ -3,11 +3,12 @@ DEPEND=dev-java/xalan:0 dev-java/xalan-serializer:0 >=dev-java/java-config-2.2.0
DESCRIPTION=Apache Ant's optional tasks depending on xalan
EAPI=7
HOMEPAGE=https://ant.apache.org/
+INHERIT=ant-tasks
KEYWORDS=amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=Apache-2.0
RDEPEND=dev-java/xalan:0 dev-java/xalan-serializer:0 >=dev-java/java-config-2.2.0-r3 ~dev-java/ant-core-1.10.9:0 >=virtual/jre-1.8
RESTRICT=test
SLOT=0
SRC_URI=mirror://apache/ant/source/apache-ant-1.10.9-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.10.9-gentoo.tar.bz2
-_eclasses_=ant-tasks bf8953b38a65f5a7d92b8d2ba4efa7f4 java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=ant-tasks bf8953b38a65f5a7d92b8d2ba4efa7f4 java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
_md5_=afc98c5e4173e64de9682dd8e2046b1d
diff --git a/metadata/md5-cache/dev-java/ant-commons-logging-1.10.9 b/metadata/md5-cache/dev-java/ant-commons-logging-1.10.9
index 1266e24a69c9..7b69badb1b53 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
@@ -3,11 +3,12 @@ DEPEND=>=dev-java/commons-logging-1.0.4-r2:0 >=dev-java/java-config-2.2.0-r3 dev
DESCRIPTION=Apache Ant's optional tasks depending on commons-logging
EAPI=7
HOMEPAGE=https://ant.apache.org/
+INHERIT=ant-tasks
KEYWORDS=amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=Apache-2.0
RDEPEND=>=dev-java/commons-logging-1.0.4-r2:0 >=dev-java/java-config-2.2.0-r3 ~dev-java/ant-core-1.10.9:0 >=virtual/jre-1.8
RESTRICT=test
SLOT=0
SRC_URI=mirror://apache/ant/source/apache-ant-1.10.9-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.10.9-gentoo.tar.bz2
-_eclasses_=ant-tasks bf8953b38a65f5a7d92b8d2ba4efa7f4 java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=ant-tasks bf8953b38a65f5a7d92b8d2ba4efa7f4 java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
_md5_=c2fe459a05eca5eb22c32caa6d5c9108
diff --git a/metadata/md5-cache/dev-java/ant-commons-net-1.10.9 b/metadata/md5-cache/dev-java/ant-commons-net-1.10.9
index 162c8a5b3c39..9d8175d80174 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
@@ -3,11 +3,12 @@ DEPEND=>=dev-java/commons-net-1.4.1-r1:0 >=dev-java/java-config-2.2.0-r3 dev-jav
DESCRIPTION=Apache Ant's optional tasks depending on commons-net
EAPI=7
HOMEPAGE=https://ant.apache.org/
+INHERIT=ant-tasks
KEYWORDS=amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=Apache-2.0
RDEPEND=>=dev-java/commons-net-1.4.1-r1:0 >=dev-java/java-config-2.2.0-r3 ~dev-java/ant-core-1.10.9:0 >=virtual/jre-1.8
RESTRICT=test
SLOT=0
SRC_URI=mirror://apache/ant/source/apache-ant-1.10.9-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.10.9-gentoo.tar.bz2
-_eclasses_=ant-tasks bf8953b38a65f5a7d92b8d2ba4efa7f4 java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=ant-tasks bf8953b38a65f5a7d92b8d2ba4efa7f4 java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
_md5_=025960691ea0088b2d386db373a44c46
diff --git a/metadata/md5-cache/dev-java/ant-contrib-1.0_beta6_pre20201123-r1 b/metadata/md5-cache/dev-java/ant-contrib-1.0_beta6_pre20201123-r1
index ffa2419f6dc9..2992fb47eb69 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
@@ -3,6 +3,7 @@ DEPEND=dev-java/ant-core:0 dev-java/ant-ivy:2 dev-java/bcel:0 dev-java/commons-h
DESCRIPTION=Ant-contrib tasks for Apache Ant
EAPI=8
HOMEPAGE=http://ant-contrib.sourceforge.net
+INHERIT=java-pkg-2 java-pkg-simple
IUSE=doc source test
KEYWORDS=amd64 ppc64 x86
LICENSE=Apache-2.0
@@ -10,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 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
_md5_=fa7c24e7af94c93a09a703c266c268bc
diff --git a/metadata/md5-cache/dev-java/ant-core-1.10.9-r3 b/metadata/md5-cache/dev-java/ant-core-1.10.9-r3
index 06a56ccf6823..77732e4f45bd 100644
--- a/metadata/md5-cache/dev-java/ant-core-1.10.9-r3
+++ b/metadata/md5-cache/dev-java/ant-core-1.10.9-r3
@@ -3,6 +3,7 @@ DEPEND=>=virtual/jdk-1.8:* doc? ( dev-java/bcel:0 dev-java/bsf:2.3 dev-java/comm
DESCRIPTION=Java-based build tool similar to 'make' that uses XML configuration files
EAPI=8
HOMEPAGE=https://ant.apache.org/
+INHERIT=java-pkg-2 java-ant-2 prefix
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
@@ -10,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 92b5a4d196abffe2dbe3bdc1cf4ef2ae multilib 4a33c9008e5ee30cb8840a3fdc24df2b prefix eab3c99d77fe00506c109c8a736186f7 toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b prefix eab3c99d77fe00506c109c8a736186f7 toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
_md5_=1d13bd87f602ae7cb47269498f3e56ef
diff --git a/metadata/md5-cache/dev-java/ant-eclipse-ecj-4.10-r1 b/metadata/md5-cache/dev-java/ant-eclipse-ecj-4.10-r1
deleted file mode 100644
index 6f5b795bed8b..000000000000
--- a/metadata/md5-cache/dev-java/ant-eclipse-ecj-4.10-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=~dev-java/eclipse-ecj-4.10:4.10 >=dev-java/ant-core-1.7 app-arch/unzip >=virtual/jdk-11 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Ant Compiler Adapter for Eclipse Java Compiler
-EAPI=6
-HOMEPAGE=http://www.eclipse.org/
-IUSE=doc source
-KEYWORDS=~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris
-LICENSE=EPL-1.0
-RDEPEND=~dev-java/eclipse-ecj-4.10:4.10 >=dev-java/ant-core-1.7 >=virtual/jre-11 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=4.10
-SRC_URI=http://download.eclipse.org/eclipse/downloads/drops4/R-4.10-201812060815/ecjsrc-4.10.jar
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 eapi7-ver 1a0a60ad07c8b32d2faba2d085dc0f24 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 9f813bb3c47cf2e60619a663b87c5f4e estack 055c42df72f76a4f45ec92b35e83cd56 eutils dab5d8ec471d025b79c9e6906bcf3bff java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib 4a33c9008e5ee30cb8840a3fdc24df2b prefix eab3c99d77fe00506c109c8a736186f7 preserve-libs a8e50acee31b5759b4df1f7707cae54b strip-linguas ac3ee41ee2d31d8c41a77c0838320cc7 toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8 vcs-clean d271b7bc7e6a009758d7d4ef749174e3 versionator d3fb3ba33acc3bbbdc4d7970227c100d wrapper 4a1902f969e5718126434fc35f3a0d9c
-_md5_=dcaf97e0850a1440b330a1efd27a1abb
diff --git a/metadata/md5-cache/dev-java/ant-eclipse-ecj-4.13 b/metadata/md5-cache/dev-java/ant-eclipse-ecj-4.13
deleted file mode 100644
index d677f64761dd..000000000000
--- a/metadata/md5-cache/dev-java/ant-eclipse-ecj-4.13
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=~dev-java/eclipse-ecj-4.13:4.13 dev-java/ant-core:0 app-arch/unzip >=virtual/jdk-11 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Ant Compiler Adapter for Eclipse Java Compiler
-EAPI=7
-HOMEPAGE=http://www.eclipse.org/
-IUSE=doc source
-KEYWORDS=~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris
-LICENSE=EPL-1.0
-RDEPEND=~dev-java/eclipse-ecj-4.13:4.13 dev-java/ant-core:0 >=virtual/jre-11 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=4.13
-SRC_URI=http://download.eclipse.org/eclipse/downloads/drops4/R-4.13-201909161045/ecjsrc-4.13.jar
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae prefix eab3c99d77fe00506c109c8a736186f7
-_md5_=e3d1538495b9fd462d9a0de748c15dd2
diff --git a/metadata/md5-cache/dev-java/ant-eclipse-ecj-4.15-r1 b/metadata/md5-cache/dev-java/ant-eclipse-ecj-4.15-r1
index 77cd96e0706a..5d1a69637596 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
@@ -3,12 +3,13 @@ DEFINED_PHASES=compile install preinst prepare setup test
DEPEND=~dev-java/eclipse-ecj-4.15:4.15 dev-java/ant-core:0 >=virtual/jdk-11:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
DESCRIPTION=Ant Compiler Adapter for Eclipse Java Compiler
EAPI=7
-HOMEPAGE=http://www.eclipse.org/
+HOMEPAGE=https://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.15:4.15 dev-java/ant-core:0 >=virtual/jre-11:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=4.15
-SRC_URI=http://download.eclipse.org/eclipse/downloads/drops4/R-4.15-202003050155/ecjsrc-4.15.jar
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae prefix eab3c99d77fe00506c109c8a736186f7
-_md5_=61eadcb3163e3944fda9a5f1508226f8
+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
+_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
index 8e0aad32060a..0ecbf6fd0469 100644
--- a/metadata/md5-cache/dev-java/ant-eclipse-ecj-4.22
+++ b/metadata/md5-cache/dev-java/ant-eclipse-ecj-4.22
@@ -3,12 +3,13 @@ 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 )
DESCRIPTION=Ant Compiler Adapter for Eclipse Java Compiler
EAPI=8
-HOMEPAGE=http://www.eclipse.org/
+HOMEPAGE=https://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.22:4.22 dev-java/ant-core:0 >=virtual/jre-11:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=4.22
-SRC_URI=http://download.eclipse.org/eclipse/downloads/drops4/R-4.22-202111241800/ecjsrc-4.22.jar
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae prefix eab3c99d77fe00506c109c8a736186f7
-_md5_=b88c015ca714491a7ce8e180a62a36cc
+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
diff --git a/metadata/md5-cache/dev-java/ant-eclipse-ecj-4.5.1 b/metadata/md5-cache/dev-java/ant-eclipse-ecj-4.5.1
index 4f196133809e..e9e6392f98dc 100644
--- a/metadata/md5-cache/dev-java/ant-eclipse-ecj-4.5.1
+++ b/metadata/md5-cache/dev-java/ant-eclipse-ecj-4.5.1
@@ -3,11 +3,12 @@ DEPEND=~dev-java/eclipse-ecj-4.5.1:4.5 >=dev-java/ant-core-1.7 app-arch/unzip >=
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 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib 4a33c9008e5ee30cb8840a3fdc24df2b prefix eab3c99d77fe00506c109c8a736186f7 preserve-libs a8e50acee31b5759b4df1f7707cae54b strip-linguas ac3ee41ee2d31d8c41a77c0838320cc7 toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8 vcs-clean d271b7bc7e6a009758d7d4ef749174e3 versionator d3fb3ba33acc3bbbdc4d7970227c100d wrapper 4a1902f969e5718126434fc35f3a0d9c
+_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 b/metadata/md5-cache/dev-java/ant-ivy-2.5.0
deleted file mode 100644
index 352747930e65..000000000000
--- a/metadata/md5-cache/dev-java/ant-ivy-2.5.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=dev-java/ant-core:0 dev-java/bcpg:0 dev-java/bcprov:0 dev-java/commons-httpclient:4 dev-java/commons-vfs:2 dev-java/httpcore:0 dev-java/jakarta-oro:2.0 dev-java/jsch:0 dev-java/jsch-agent-proxy:0 test? ( dev-java/ant-junit:0 dev-java/ant-junit4:0 dev-java/ant-junitlauncher:0 dev-java/ant-testutil:0 dev-java/hamcrest-core:1.3 dev-java/hamcrest-library:1.3 dev-java/xmlunit:1 ) >=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
-DESCRIPTION=Ivy is a free java based dependency manager
-EAPI=7
-HOMEPAGE=https://ant.apache.org/ivy/
-IUSE=doc source test
-KEYWORDS=amd64 ppc64 x86
-LICENSE=Apache-2.0
-PROPERTIES=test_network
-RDEPEND=dev-java/ant-core:0 dev-java/bcpg:0 dev-java/bcprov:0 dev-java/commons-httpclient:4 dev-java/commons-vfs:2 dev-java/httpcore:0 dev-java/jakarta-oro:2.0 dev-java/jsch:0 dev-java/jsch-agent-proxy:0 test? ( dev-java/ant-junit:0 dev-java/ant-junit4:0 dev-java/ant-junitlauncher:0 dev-java/ant-testutil:0 dev-java/hamcrest-core:1.3 dev-java/hamcrest-library:1.3 dev-java/xmlunit:1 ) >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=2
-SRC_URI=mirror://apache/ant/ivy/2.5.0/apache-ivy-2.5.0-src.tar.gz
-_eclasses_=java-osgi c9b922d3fd7b5c6117f4c4d68e32e881 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
-_md5_=7624e0d4156c71de0dce952881cd5e8d
diff --git a/metadata/md5-cache/dev-java/ant-ivy-2.5.0-r1 b/metadata/md5-cache/dev-java/ant-ivy-2.5.0-r1
index 39ed21425ca3..305744eb6bb3 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
@@ -3,13 +3,14 @@ DEPEND=dev-java/ant-core:0 dev-java/bcpg:0 dev-java/bcprov:0 dev-java/httpcompon
DESCRIPTION=Ivy is a free java based dependency manager
EAPI=8
HOMEPAGE=https://ant.apache.org/ivy/
+INHERIT=java-pkg-2 java-pkg-simple java-osgi
IUSE=doc source test
-KEYWORDS=~amd64 ~ppc64 ~x86
+KEYWORDS=amd64 ppc64 x86
LICENSE=Apache-2.0
PROPERTIES=test_network
RDEPEND=dev-java/ant-core:0 dev-java/bcpg:0 dev-java/bcprov:0 dev-java/httpcomponents-client dev-java/commons-vfs:2 dev-java/httpcore:0 dev-java/jakarta-oro:2.0 dev-java/jsch:0 dev-java/jsch-agent-proxy:0 test? ( dev-java/ant-junit:0 dev-java/ant-junit4:0 dev-java/ant-junitlauncher:0 dev-java/ant-testutil:0 dev-java/hamcrest-core:1.3 dev-java/hamcrest-library:1.3 dev-java/xmlunit:1 ) 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/ant/ivy/2.5.0/apache-ivy-2.5.0-src.tar.gz
-_eclasses_=java-osgi c9b922d3fd7b5c6117f4c4d68e32e881 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
-_md5_=a419215d9c92b47df08ee5d73b76aa83
+_eclasses_=java-osgi c9b922d3fd7b5c6117f4c4d68e32e881 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_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 842e60e09f53..7f063d4754bf 100644
--- a/metadata/md5-cache/dev-java/ant-jai-1.10.9
+++ b/metadata/md5-cache/dev-java/ant-jai-1.10.9
@@ -3,11 +3,12 @@ DEPEND=>=dev-java/sun-jai-bin-1.1.2.01-r1 >=dev-java/java-config-2.2.0-r3 dev-ja
DESCRIPTION=Apache Ant's optional tasks depending on sun-jai-bin
EAPI=7
HOMEPAGE=https://ant.apache.org/
+INHERIT=ant-tasks
KEYWORDS=amd64 ppc64 x86
LICENSE=Apache-2.0
RDEPEND=>=dev-java/sun-jai-bin-1.1.2.01-r1 >=dev-java/java-config-2.2.0-r3 ~dev-java/ant-core-1.10.9:0 >=virtual/jre-1.8
RESTRICT=test
SLOT=0
SRC_URI=mirror://apache/ant/source/apache-ant-1.10.9-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.10.9-gentoo.tar.bz2
-_eclasses_=ant-tasks bf8953b38a65f5a7d92b8d2ba4efa7f4 java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=ant-tasks bf8953b38a65f5a7d92b8d2ba4efa7f4 java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
_md5_=42e8a3bbc17b75be224e72baf75747a2
diff --git a/metadata/md5-cache/dev-java/ant-javamail-1.10.9-r1 b/metadata/md5-cache/dev-java/ant-javamail-1.10.9-r1
index 85721c9fbd28..e90da7532002 100644
--- a/metadata/md5-cache/dev-java/ant-javamail-1.10.9-r1
+++ b/metadata/md5-cache/dev-java/ant-javamail-1.10.9-r1
@@ -3,11 +3,12 @@ DEPEND=virtual/jdk:1.8 dev-java/gnu-jaf:1 dev-java/javax-mail:0 >=dev-java/java-
DESCRIPTION=Apache Ant's optional tasks depending on gnu-jaf-1
EAPI=7
HOMEPAGE=https://ant.apache.org/
+INHERIT=ant-tasks
KEYWORDS=amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=Apache-2.0
RDEPEND=virtual/jdk:1.8 dev-java/gnu-jaf:1 dev-java/javax-mail:0 >=dev-java/java-config-2.2.0-r3 ~dev-java/ant-core-1.10.9:0 >=virtual/jre-1.8
RESTRICT=test
SLOT=0
SRC_URI=mirror://apache/ant/source/apache-ant-1.10.9-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.10.9-gentoo.tar.bz2
-_eclasses_=ant-tasks bf8953b38a65f5a7d92b8d2ba4efa7f4 java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=ant-tasks bf8953b38a65f5a7d92b8d2ba4efa7f4 java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
_md5_=95696bd61b85b23a07f7eac32f544426
diff --git a/metadata/md5-cache/dev-java/ant-jdepend-1.10.9 b/metadata/md5-cache/dev-java/ant-jdepend-1.10.9
index 0f2c2ca38653..822f520812d3 100644
--- a/metadata/md5-cache/dev-java/ant-jdepend-1.10.9
+++ b/metadata/md5-cache/dev-java/ant-jdepend-1.10.9
@@ -3,11 +3,12 @@ DEPEND=>=dev-java/jdepend-2.9-r2:0 >=dev-java/java-config-2.2.0-r3 dev-java/java
DESCRIPTION=Apache Ant's optional tasks depending on jdepend
EAPI=7
HOMEPAGE=https://ant.apache.org/
+INHERIT=ant-tasks
KEYWORDS=amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=Apache-2.0
RDEPEND=>=dev-java/jdepend-2.9-r2:0 >=dev-java/java-config-2.2.0-r3 ~dev-java/ant-core-1.10.9:0 >=virtual/jre-1.8
RESTRICT=test
SLOT=0
SRC_URI=mirror://apache/ant/source/apache-ant-1.10.9-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.10.9-gentoo.tar.bz2
-_eclasses_=ant-tasks bf8953b38a65f5a7d92b8d2ba4efa7f4 java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=ant-tasks bf8953b38a65f5a7d92b8d2ba4efa7f4 java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
_md5_=b76423fd0a062777430f41b4b23d842e
diff --git a/metadata/md5-cache/dev-java/ant-jmf-1.10.9 b/metadata/md5-cache/dev-java/ant-jmf-1.10.9
index 30a3e98187c9..0795505ea5c5 100644
--- a/metadata/md5-cache/dev-java/ant-jmf-1.10.9
+++ b/metadata/md5-cache/dev-java/ant-jmf-1.10.9
@@ -3,11 +3,12 @@ DEPEND=>=dev-java/java-config-2.2.0-r3 dev-java/javatoolkit ~dev-java/ant-core-1
DESCRIPTION=Apache Ant's optional tasks for the Java Media Framework (JMF)
EAPI=7
HOMEPAGE=https://ant.apache.org/
+INHERIT=ant-tasks
KEYWORDS=amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
LICENSE=Apache-2.0
RDEPEND=>=dev-java/java-config-2.2.0-r3 ~dev-java/ant-core-1.10.9:0 >=virtual/jre-1.8
RESTRICT=test
SLOT=0
SRC_URI=mirror://apache/ant/source/apache-ant-1.10.9-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.10.9-gentoo.tar.bz2
-_eclasses_=ant-tasks bf8953b38a65f5a7d92b8d2ba4efa7f4 java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=ant-tasks bf8953b38a65f5a7d92b8d2ba4efa7f4 java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
_md5_=c4fe3db8e5d90549dce972a29b652884
diff --git a/metadata/md5-cache/dev-java/ant-jsch-1.10.9 b/metadata/md5-cache/dev-java/ant-jsch-1.10.9
index a6537e69c514..09c37257ab51 100644
--- a/metadata/md5-cache/dev-java/ant-jsch-1.10.9
+++ b/metadata/md5-cache/dev-java/ant-jsch-1.10.9
@@ -3,11 +3,12 @@ DEPEND=>=dev-java/jsch-0.1.37:0 >=dev-java/java-config-2.2.0-r3 dev-java/javatoo
DESCRIPTION=Apache Ant's optional tasks depending on jsch
EAPI=7
HOMEPAGE=https://ant.apache.org/
+INHERIT=ant-tasks
KEYWORDS=amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=Apache-2.0
RDEPEND=>=dev-java/jsch-0.1.37:0 >=dev-java/java-config-2.2.0-r3 ~dev-java/ant-core-1.10.9:0 >=virtual/jre-1.8
RESTRICT=test
SLOT=0
SRC_URI=mirror://apache/ant/source/apache-ant-1.10.9-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.10.9-gentoo.tar.bz2
-_eclasses_=ant-tasks bf8953b38a65f5a7d92b8d2ba4efa7f4 java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=ant-tasks bf8953b38a65f5a7d92b8d2ba4efa7f4 java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
_md5_=9c4d200e9c9ef8a75748a54564700257
diff --git a/metadata/md5-cache/dev-java/ant-junit-1.10.9 b/metadata/md5-cache/dev-java/ant-junit-1.10.9
index a70a9741ce8d..43965858ca84 100644
--- a/metadata/md5-cache/dev-java/ant-junit-1.10.9
+++ b/metadata/md5-cache/dev-java/ant-junit-1.10.9
@@ -3,11 +3,12 @@ DEPEND=dev-java/junit:0 dev-java/junit:4 >=dev-java/java-config-2.2.0-r3 dev-jav
DESCRIPTION=Apache Ant's optional tasks depending on junit
EAPI=7
HOMEPAGE=https://ant.apache.org/
+INHERIT=ant-tasks
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/junit:0 dev-java/junit:4 >=dev-java/java-config-2.2.0-r3 ~dev-java/ant-core-1.10.9:0 >=virtual/jre-1.8
RESTRICT=test
SLOT=0
SRC_URI=mirror://apache/ant/source/apache-ant-1.10.9-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.10.9-gentoo.tar.bz2
-_eclasses_=ant-tasks bf8953b38a65f5a7d92b8d2ba4efa7f4 java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=ant-tasks bf8953b38a65f5a7d92b8d2ba4efa7f4 java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
_md5_=dca20742a3e7a8b82d9c2538f7d7fda3
diff --git a/metadata/md5-cache/dev-java/ant-junit4-1.10.9 b/metadata/md5-cache/dev-java/ant-junit4-1.10.9
index 1504eb31dc56..8b51f2bb087e 100644
--- a/metadata/md5-cache/dev-java/ant-junit4-1.10.9
+++ b/metadata/md5-cache/dev-java/ant-junit4-1.10.9
@@ -3,11 +3,12 @@ DEPEND=dev-java/junit:4 ~dev-java/ant-junit-1.10.9 >=dev-java/java-config-2.2.0-
DESCRIPTION=Apache Ant's optional tasks depending on junit-4
EAPI=7
HOMEPAGE=https://ant.apache.org/
+INHERIT=ant-tasks
KEYWORDS=amd64 ~arm arm64 ppc64 x86
LICENSE=Apache-2.0
RDEPEND=dev-java/junit:4 ~dev-java/ant-junit-1.10.9 >=dev-java/java-config-2.2.0-r3 ~dev-java/ant-core-1.10.9:0 >=virtual/jre-1.8
RESTRICT=test
SLOT=0
SRC_URI=mirror://apache/ant/source/apache-ant-1.10.9-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.10.9-gentoo.tar.bz2
-_eclasses_=ant-tasks bf8953b38a65f5a7d92b8d2ba4efa7f4 java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=ant-tasks bf8953b38a65f5a7d92b8d2ba4efa7f4 java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
_md5_=6967158f03a23bbcfe494ed4c782ad81
diff --git a/metadata/md5-cache/dev-java/ant-junitlauncher-1.10.9 b/metadata/md5-cache/dev-java/ant-junitlauncher-1.10.9
index a3a4cf95d854..67d8a09f870b 100644
--- a/metadata/md5-cache/dev-java/ant-junitlauncher-1.10.9
+++ b/metadata/md5-cache/dev-java/ant-junitlauncher-1.10.9
@@ -3,11 +3,12 @@ DEPEND=>=dev-java/java-config-2.2.0-r3 dev-java/javatoolkit ~dev-java/ant-core-1
DESCRIPTION=Apache Ant's optional tasks depending on
EAPI=7
HOMEPAGE=https://ant.apache.org/
+INHERIT=ant-tasks
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/java-config-2.2.0-r3 ~dev-java/ant-core-1.10.9:0 >=virtual/jre-1.8
RESTRICT=test
SLOT=0
SRC_URI=mirror://apache/ant/source/apache-ant-1.10.9-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.10.9-gentoo.tar.bz2
-_eclasses_=ant-tasks bf8953b38a65f5a7d92b8d2ba4efa7f4 java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=ant-tasks bf8953b38a65f5a7d92b8d2ba4efa7f4 java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
_md5_=2e8b698dd0a76f2d77ed62a329ee9334
diff --git a/metadata/md5-cache/dev-java/ant-swing-1.10.9 b/metadata/md5-cache/dev-java/ant-swing-1.10.9
index d3567d0efcec..59675a32c393 100644
--- a/metadata/md5-cache/dev-java/ant-swing-1.10.9
+++ b/metadata/md5-cache/dev-java/ant-swing-1.10.9
@@ -3,11 +3,12 @@ DEPEND=>=dev-java/java-config-2.2.0-r3 dev-java/javatoolkit ~dev-java/ant-core-1
DESCRIPTION=Apache Ant's optional tasks for Swing
EAPI=7
HOMEPAGE=https://ant.apache.org/
+INHERIT=ant-tasks
KEYWORDS=amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=Apache-2.0
RDEPEND=>=dev-java/java-config-2.2.0-r3 ~dev-java/ant-core-1.10.9:0 >=virtual/jre-1.8
RESTRICT=test
SLOT=0
SRC_URI=mirror://apache/ant/source/apache-ant-1.10.9-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.10.9-gentoo.tar.bz2
-_eclasses_=ant-tasks bf8953b38a65f5a7d92b8d2ba4efa7f4 java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=ant-tasks bf8953b38a65f5a7d92b8d2ba4efa7f4 java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
_md5_=dfc1f020d954b249a78fe55fb1a2d3df
diff --git a/metadata/md5-cache/dev-java/ant-testutil-1.10.9 b/metadata/md5-cache/dev-java/ant-testutil-1.10.9
index d779ce39061d..d61983bd7eb8 100644
--- a/metadata/md5-cache/dev-java/ant-testutil-1.10.9
+++ b/metadata/md5-cache/dev-java/ant-testutil-1.10.9
@@ -3,11 +3,12 @@ DEPEND=dev-java/ant-core:0 >=virtual/jdk-1.8 >=dev-java/junit-4.11:4 ~dev-java/a
DESCRIPTION=Apache Ant's optional test utility classes
EAPI=7
HOMEPAGE=https://ant.apache.org/
+INHERIT=ant-tasks
KEYWORDS=amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=Apache-2.0
RDEPEND=dev-java/ant-core:0 >=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3 ~dev-java/ant-core-1.10.9:0 >=virtual/jre-1.8
RESTRICT=test
SLOT=0
SRC_URI=mirror://apache/ant/source/apache-ant-1.10.9-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.10.9-gentoo.tar.bz2
-_eclasses_=ant-tasks bf8953b38a65f5a7d92b8d2ba4efa7f4 java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=ant-tasks bf8953b38a65f5a7d92b8d2ba4efa7f4 java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
_md5_=69983d2e7060871087ab6002b6061112
diff --git a/metadata/md5-cache/dev-java/ant-xz-1.10.9 b/metadata/md5-cache/dev-java/ant-xz-1.10.9
index 3ed660aae25c..c34befe36d6a 100644
--- a/metadata/md5-cache/dev-java/ant-xz-1.10.9
+++ b/metadata/md5-cache/dev-java/ant-xz-1.10.9
@@ -3,11 +3,12 @@ DEPEND=dev-java/xz-java >=dev-java/java-config-2.2.0-r3 dev-java/javatoolkit ~de
DESCRIPTION=Apache Ant's optional tasks for XZ compression
EAPI=7
HOMEPAGE=https://ant.apache.org/
+INHERIT=ant-tasks
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/xz-java >=dev-java/java-config-2.2.0-r3 ~dev-java/ant-core-1.10.9:0 >=virtual/jre-1.8
RESTRICT=test
SLOT=0
SRC_URI=mirror://apache/ant/source/apache-ant-1.10.9-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.10.9-gentoo.tar.bz2
-_eclasses_=ant-tasks bf8953b38a65f5a7d92b8d2ba4efa7f4 java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=ant-tasks bf8953b38a65f5a7d92b8d2ba4efa7f4 java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
_md5_=0e3e412509d92ffa578ce37cf810c621
diff --git a/metadata/md5-cache/dev-java/antlr-2.7.7-r9 b/metadata/md5-cache/dev-java/antlr-2.7.7-r9
index 22f563b9f14f..3711213d5c02 100644
--- a/metadata/md5-cache/dev-java/antlr-2.7.7-r9
+++ b/metadata/md5-cache/dev-java/antlr-2.7.7-r9
@@ -3,11 +3,12 @@ DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zi
DESCRIPTION=A parser generator for many languages
EAPI=7
HOMEPAGE=https://www.antlr2.org/
+INHERIT=java-pkg-2 java-pkg-simple
IUSE=examples 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=public-domain
RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=0
SRC_URI=https://www.antlr2.org/download/antlr-2.7.7.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
_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 3828bde1432b..88e388707094 100644
--- a/metadata/md5-cache/dev-java/antlr-3.2-r1
+++ b/metadata/md5-cache/dev-java/antlr-3.2-r1
@@ -3,6 +3,7 @@ DEPEND=>=dev-java/antlr-2.7.7-r7:0 dev-java/stringtemplate:0 >=virtual/jdk-1.8:*
DESCRIPTION=A parser generator for many languages
EAPI=7
HOMEPAGE=https://www.antlr3.org/
+INHERIT=java-pkg-2 java-pkg-simple
IUSE=doc test
KEYWORDS=amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=BSD
@@ -10,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 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
_md5_=030dfc1ef28d4465566f94832b3197fb
diff --git a/metadata/md5-cache/dev-java/antlr-3.5.2-r2 b/metadata/md5-cache/dev-java/antlr-3.5.2-r2
index 8fda79f127ad..10bd40db36be 100644
--- a/metadata/md5-cache/dev-java/antlr-3.5.2-r2
+++ b/metadata/md5-cache/dev-java/antlr-3.5.2-r2
@@ -3,10 +3,11 @@ DEPEND=>=virtual/jdk-1.8:* ~dev-java/antlr-runtime-3.5.2:3.5 ~dev-java/antlr-too
DESCRIPTION=A parser generator for many languages
EAPI=8
HOMEPAGE=https://www.antlr3.org/
+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 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_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 4a793ee9655c..f98b49a88b07 100644
--- a/metadata/md5-cache/dev-java/antlr-3.5.3
+++ b/metadata/md5-cache/dev-java/antlr-3.5.3
@@ -3,10 +3,11 @@ DEPEND=>=virtual/jdk-1.8:* ~dev-java/antlr-runtime-3.5.3:3.5 ~dev-java/antlr-too
DESCRIPTION=A parser generator for many languages
EAPI=8
HOMEPAGE=https://www.antlr3.org/
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+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.3:3.5 ~dev-java/antlr-tool-3.5.3:3.5 >=dev-java/java-config-2.2.0-r3
SLOT=3.5
SRC_URI=https://github.com/antlr/antlr3/archive/3.5.3.tar.gz -> antlr-3.5.3.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
-_md5_=c4e3209754dcadb728f1686d564f3b8b
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_md5_=ae8eb923356b02f657e57fbdfc023d62
diff --git a/metadata/md5-cache/dev-java/antlr-4.9.3 b/metadata/md5-cache/dev-java/antlr-4.9.3
index 80e0c51d2a60..594e354fc5c9 100644
--- a/metadata/md5-cache/dev-java/antlr-4.9.3
+++ b/metadata/md5-cache/dev-java/antlr-4.9.3
@@ -3,10 +3,11 @@ DEPEND=>=virtual/jdk-1.8:* ~dev-java/antlr-runtime-4.9.3:4 ~dev-java/antlr-tool-
DESCRIPTION=A parser generator for many languages
EAPI=8
HOMEPAGE=https://www.antlr.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-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 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
_md5_=5ee108df70063aee13d8c45f15de7ba9
diff --git a/metadata/md5-cache/dev-java/antlr-runtime-3.5.2 b/metadata/md5-cache/dev-java/antlr-runtime-3.5.2
index 9971e83fb6e7..fe24a43234dd 100644
--- a/metadata/md5-cache/dev-java/antlr-runtime-3.5.2
+++ b/metadata/md5-cache/dev-java/antlr-runtime-3.5.2
@@ -4,11 +4,12 @@ DEPEND=>=dev-java/stringtemplate-3.2.1:0 >=virtual/jdk-1.8:* >=dev-java/java-con
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 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_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 227529701654..18d2a51e1f6e 100644
--- a/metadata/md5-cache/dev-java/antlr-runtime-3.5.3
+++ b/metadata/md5-cache/dev-java/antlr-runtime-3.5.3
@@ -4,11 +4,12 @@ DEPEND=>=dev-java/stringtemplate-3.2.1:0 >=virtual/jdk-1.8:* >=dev-java/java-con
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
+KEYWORDS=amd64 ~arm arm64 ppc64 ~x86
LICENSE=BSD
RDEPEND=>=dev-java/stringtemplate-3.2.1:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=3.5
SRC_URI=https://repo1.maven.org/maven2/org/antlr/antlr-runtime/3.5.3/antlr-runtime-3.5.3-sources.jar
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
-_md5_=7a420da2ec9ecfc30440c6972fafefb7
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_md5_=5cf4a9e9758d6682aaea1961b4e018b4
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 2ca2a3d4d581..d674ab4d25a9 100644
--- a/metadata/md5-cache/dev-java/antlr-runtime-4.9.3
+++ b/metadata/md5-cache/dev-java/antlr-runtime-4.9.3
@@ -3,6 +3,7 @@ DEPEND=>=virtual/jdk-1.8:* test? ( ~dev-java/antlr-tool-4.9.3:4 dev-java/jol-cor
DESCRIPTION=ANTLR 4 Runtime
EAPI=8
HOMEPAGE=https://www.antlr.org/
+INHERIT=java-pkg-2 java-pkg-simple
IUSE=doc source test
KEYWORDS=amd64 ~arm arm64 ppc64 x86
LICENSE=BSD
@@ -10,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 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
_md5_=24940d00dbb98aa66e931290836ae633
diff --git a/metadata/md5-cache/dev-java/antlr-tool-3.5.2 b/metadata/md5-cache/dev-java/antlr-tool-3.5.2
index c67283df26ca..d8696691349f 100644
--- a/metadata/md5-cache/dev-java/antlr-tool-3.5.2
+++ b/metadata/md5-cache/dev-java/antlr-tool-3.5.2
@@ -4,6 +4,7 @@ DEPEND=>=virtual/jdk-1.8:* ~dev-java/antlr-runtime-3.5.2:3.5 dev-java/stringtemp
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
@@ -11,5 +12,5 @@ RDEPEND=>=virtual/jre-1.8:* ~dev-java/antlr-runtime-3.5.2:3.5 dev-java/stringtem
RESTRICT=!test? ( test )
SLOT=3.5
SRC_URI=https://repo1.maven.org/maven2/org/antlr/antlr/3.5.2/antlr-3.5.2-sources.jar -> antlr-tool-3.5.2-sources.jar https://github.com/antlr/antlr3/archive/3.5.2.tar.gz -> antlr-3.5.2.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_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 f839b07cfaee..2ed8f3438f85 100644
--- a/metadata/md5-cache/dev-java/antlr-tool-3.5.3
+++ b/metadata/md5-cache/dev-java/antlr-tool-3.5.3
@@ -4,12 +4,13 @@ DEPEND=>=virtual/jdk-1.8:* ~dev-java/antlr-runtime-3.5.3:3.5 dev-java/stringtemp
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
+KEYWORDS=amd64 ~arm arm64 ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=BSD
RDEPEND=>=virtual/jre-1.8:* ~dev-java/antlr-runtime-3.5.3:3.5 dev-java/stringtemplate:4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
RESTRICT=!test? ( test )
SLOT=3.5
SRC_URI=https://repo1.maven.org/maven2/org/antlr/antlr/3.5.3/antlr-3.5.3-sources.jar -> antlr-tool-3.5.3-sources.jar https://github.com/antlr/antlr3/archive/3.5.3.tar.gz -> antlr-3.5.3.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
-_md5_=a83806577ee801b2575b8404d03f7e17
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_md5_=30e6f27786ad80c310a00f694a8eb8f6
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 c983bbec4a24..9a44807408a8 100644
--- a/metadata/md5-cache/dev-java/antlr-tool-4.9.3
+++ b/metadata/md5-cache/dev-java/antlr-tool-4.9.3
@@ -3,6 +3,7 @@ DEPEND=>=virtual/jdk-1.8:* ~dev-java/antlr-runtime-4.9.3:4 dev-java/antlr-runtim
DESCRIPTION=The ANTLR 4 grammar compiler
EAPI=8
HOMEPAGE=https://www.antlr.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
@@ -10,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 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
-_md5_=ee8dfd42f251eedddfefa85db193a19b
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_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 baf8c6395bb2..be8af074e2a9 100644
--- a/metadata/md5-cache/dev-java/aopalliance-1.0-r3
+++ b/metadata/md5-cache/dev-java/aopalliance-1.0-r3
@@ -3,11 +3,12 @@ DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zi
DESCRIPTION=Aspect-Oriented Programming (AOP) Alliance classes
EAPI=8
HOMEPAGE=http://aopalliance.sourceforge.net/
+INHERIT=java-pkg-2 java-pkg-simple
IUSE=doc source
KEYWORDS=amd64 ~arm arm64 ppc64 x86 ~amd64-linux
LICENSE=public-domain
RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=1
SRC_URI=mirror://gentoo/aopalliance-1.0-gentoo.tar.bz2
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
-_md5_=743c9d116cc847653ea415023904e1e2
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_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 3b345234116f..eb9cf3684043 100644
--- a/metadata/md5-cache/dev-java/apache-rat-core-0.13
+++ b/metadata/md5-cache/dev-java/apache-rat-core-0.13
@@ -3,6 +3,7 @@ DEPEND=>=virtual/jdk-1.8:* >=dev-java/commons-cli-1.3.1:1 >=dev-java/commons-com
DESCRIPTION=The core functionality, shared by the Ant tasks and the Maven plugin
EAPI=7
HOMEPAGE=https://creadur.apache.org/rat/apache-rat-core/
+INHERIT=java-pkg-2 java-pkg-simple
IUSE=doc source test
KEYWORDS=amd64 x86
LICENSE=Apache-2.0
@@ -10,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 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
_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 a4a9023f391b..c53fec6ac446 100644
--- a/metadata/md5-cache/dev-java/apache-rat-tasks-0.13
+++ b/metadata/md5-cache/dev-java/apache-rat-tasks-0.13
@@ -3,6 +3,7 @@ DEPEND=>=virtual/jdk-1.8:* dev-java/ant-core:0 ~dev-java/apache-rat-core-0.13:0
DESCRIPTION=A plugin for Apache Ant that runs Apache Rat to audit the source
EAPI=7
HOMEPAGE=https://creadur.apache.org/rat/apache-rat-tasks/
+INHERIT=java-pkg-2 java-pkg-simple
IUSE=doc source test
KEYWORDS=amd64 x86
LICENSE=Apache-2.0
@@ -10,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 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
_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 3d608172fc9c..ab67be327773 100644
--- a/metadata/md5-cache/dev-java/apiguardian-api-1.1.2
+++ b/metadata/md5-cache/dev-java/apiguardian-api-1.1.2
@@ -3,11 +3,12 @@ DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zi
DESCRIPTION=@org.apiguardian.api.API Java annotation provider
EAPI=8
HOMEPAGE=https://github.com/apiguardian-team/apiguardian
+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://github.com/apiguardian-team/apiguardian/archive/r1.1.2.tar.gz -> apiguardian-api-1.1.2.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
-_md5_=d76247c95650f65c07f039dba0f75255
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_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 834d75daf112..9d7bb5b2f2d5 100644
--- a/metadata/md5-cache/dev-java/asm-5.1-r1
+++ b/metadata/md5-cache/dev-java/asm-5.1-r1
@@ -3,6 +3,7 @@ DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zi
DESCRIPTION=Bytecode manipulation framework for Java
EAPI=7
HOMEPAGE=https://asm.ow2.io
+INHERIT=java-pkg-2 java-ant-2
IUSE=doc source
KEYWORDS=amd64 ~arm arm64 ppc64 x86 ~x64-macos
LICENSE=BSD
@@ -10,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 92b5a4d196abffe2dbe3bdc1cf4ef2ae multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
_md5_=745d811e25a5d9d9425d94e7d00a3d76
diff --git a/metadata/md5-cache/dev-java/asm-9.2 b/metadata/md5-cache/dev-java/asm-9.2
index d7b77d434261..249aa5ff4729 100644
--- a/metadata/md5-cache/dev-java/asm-9.2
+++ b/metadata/md5-cache/dev-java/asm-9.2
@@ -3,6 +3,7 @@ DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zi
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
@@ -10,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
RESTRICT=test
SLOT=9
SRC_URI=https://gitlab.ow2.org/asm/asm/-/archive/ASM_9_2/asm-ASM_9_2.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_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
new file mode 100644
index 000000000000..32d39a765ab2
--- /dev/null
+++ b/metadata/md5-cache/dev-java/asm-9.3
@@ -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=Bytecode manipulation framework for Java
+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
+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
diff --git a/metadata/md5-cache/dev-java/asm-analysis-9.2 b/metadata/md5-cache/dev-java/asm-analysis-9.2
index beca02ffbbcf..a292e871ce39 100644
--- a/metadata/md5-cache/dev-java/asm-analysis-9.2
+++ b/metadata/md5-cache/dev-java/asm-analysis-9.2
@@ -3,6 +3,7 @@ DEPEND=>=virtual/jdk-1.8:* dev-java/asm-tree:9 >=dev-java/java-config-2.2.0-r3 s
DESCRIPTION=Bytecode manipulation framework for Java (Static code analysis API)
EAPI=7
HOMEPAGE=http://asm.ow2.org
+INHERIT=java-pkg-2 java-pkg-simple
IUSE=doc source
KEYWORDS=amd64 ~arm arm64 ppc64 x86 ~x64-macos
LICENSE=BSD
@@ -10,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 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
_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 e81e7df80bfc..05074a4d77c0 100644
--- a/metadata/md5-cache/dev-java/asm-commons-9.2
+++ b/metadata/md5-cache/dev-java/asm-commons-9.2
@@ -3,6 +3,7 @@ DEPEND=>=virtual/jdk-1.8:* dev-java/asm-analysis:9 dev-java/asm-tree:9 dev-java/
DESCRIPTION=Bytecode manipulation framework for Java (Common class adaptors)
EAPI=7
HOMEPAGE=http://asm.ow2.org
+INHERIT=java-pkg-2 java-pkg-simple
IUSE=doc source
KEYWORDS=amd64 ~arm arm64 ppc64 x86 ~x64-macos
LICENSE=BSD
@@ -10,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 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
_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 c156cf750c6e..2e131b95ef85 100644
--- a/metadata/md5-cache/dev-java/asm-tree-9.2
+++ b/metadata/md5-cache/dev-java/asm-tree-9.2
@@ -3,6 +3,7 @@ DEPEND=>=virtual/jdk-1.8:* dev-java/asm:9 >=dev-java/java-config-2.2.0-r3 source
DESCRIPTION=Bytecode manipulation framework for Java (Tree API)
EAPI=7
HOMEPAGE=http://asm.ow2.org
+INHERIT=java-pkg-2 java-pkg-simple
IUSE=doc source
KEYWORDS=amd64 ~arm arm64 ppc64 x86 ~x64-macos
LICENSE=BSD
@@ -10,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 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
_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 adca1a2f5c5a..9bd29fe32370 100644
--- a/metadata/md5-cache/dev-java/asm-util-9.2
+++ b/metadata/md5-cache/dev-java/asm-util-9.2
@@ -3,6 +3,7 @@ DEPEND=>=virtual/jdk-1.8:* dev-java/asm-analysis:9 dev-java/asm-tree:9 dev-java/
DESCRIPTION=Bytecode manipulation framework for Java (Utilities)
EAPI=7
HOMEPAGE=http://asm.ow2.org
+INHERIT=java-pkg-2 java-pkg-simple
IUSE=doc source
KEYWORDS=amd64 ~arm arm64 ppc64 x86 ~x64-macos
LICENSE=BSD
@@ -10,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 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
_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 664140378102..02640a4981f2 100644
--- a/metadata/md5-cache/dev-java/aspectj-1.9.7
+++ b/metadata/md5-cache/dev-java/aspectj-1.9.7
@@ -4,11 +4,12 @@ DEPEND=dev-java/asm:9 dev-java/commons-logging:0 dev-java/ant-apache-regexp:0 >=
DESCRIPTION=A seamless aspect-oriented extension to the Java programming language
EAPI=7
HOMEPAGE=https://eclipse.org/aspectj/
+INHERIT=java-pkg-2 java-pkg-simple
IUSE=doc source
KEYWORDS=amd64 x86
LICENSE=EPL-1.0
RDEPEND=dev-java/asm:9 dev-java/commons-logging:0 dev-java/ant-apache-regexp:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=0
SRC_URI=https://github.com/eclipse/org.aspectj/archive/refs/tags/V1_9_7.tar.gz -> aspectj-1.9.7.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
_md5_=72e4c000f4d64ad768a7fcfd8c05933c
diff --git a/metadata/md5-cache/dev-java/assertj-core-2.3.0 b/metadata/md5-cache/dev-java/assertj-core-2.3.0
deleted file mode 100644
index 38aefafc8405..000000000000
--- a/metadata/md5-cache/dev-java/assertj-core-2.3.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=dev-java/cglib:3 dev-java/junit:4 >=virtual/jdk-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Java library that provides a fluent interface for writing assertions
-EAPI=5
-HOMEPAGE=http://joel-costigliola.github.io/assertj/
-IUSE=doc source
-KEYWORDS=amd64 ~arm arm64 ppc64 x86
-LICENSE=Apache-2.0
-RDEPEND=dev-java/cglib:3 dev-java/junit:4 >=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=2
-SRC_URI=https://github.com/joel-costigliola/assertj-core/archive/assertj-core-2.3.0.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 eapi7-ver 1a0a60ad07c8b32d2faba2d085dc0f24 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 9f813bb3c47cf2e60619a663b87c5f4e estack 055c42df72f76a4f45ec92b35e83cd56 eutils dab5d8ec471d025b79c9e6906bcf3bff java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib 4a33c9008e5ee30cb8840a3fdc24df2b preserve-libs a8e50acee31b5759b4df1f7707cae54b strip-linguas ac3ee41ee2d31d8c41a77c0838320cc7 toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8 vcs-clean d271b7bc7e6a009758d7d4ef749174e3 versionator d3fb3ba33acc3bbbdc4d7970227c100d wrapper 4a1902f969e5718126434fc35f3a0d9c
-_md5_=dceefdc36e4a1e70030e7697e7490c60
diff --git a/metadata/md5-cache/dev-java/assertj-core-2.3.0-r1 b/metadata/md5-cache/dev-java/assertj-core-2.3.0-r1
index c6b638e62bd0..eaa8de34008e 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
@@ -3,11 +3,12 @@ DEPEND=dev-java/cglib:3 dev-java/junit:4 >=virtual/jdk-1.8:* >=dev-java/java-con
DESCRIPTION=Java library that provides a fluent interface for writing assertions
EAPI=8
HOMEPAGE=https://joel-costigliola.github.io/assertj/
+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=dev-java/cglib:3 dev-java/junit:4 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=2
SRC_URI=https://github.com/assertj/assertj-core/archive/assertj-core-2.3.0.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
-_md5_=11cd951842e84c0a7c83bc1ae6e14a1d
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_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 efa73f8a6f7b..67c54caa6ab6 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
@@ -3,6 +3,7 @@ DEPEND=>=virtual/jdk-1.8:* dev-java/avalon-logkit:2.0 dev-java/log4j-12-api:2 te
DESCRIPTION=Avalon Framework
EAPI=8
HOMEPAGE=https://avalon.apache.org/
+INHERIT=java-pkg-2 java-pkg-simple
IUSE=doc source test
KEYWORDS=amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
LICENSE=Apache-2.0
@@ -10,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 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
_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 59d78a5a8290..d573cb0277be 100644
--- a/metadata/md5-cache/dev-java/avalon-logkit-2.1-r12
+++ b/metadata/md5-cache/dev-java/avalon-logkit-2.1-r12
@@ -3,6 +3,7 @@ DEPEND=dev-java/javax-mail:0 dev-java/jboss-jms-api:1.1 dev-java/log4j-12-api:2
DESCRIPTION=Easy-to-use Java logging toolkit
EAPI=8
HOMEPAGE=https://avalon.apache.org/closed.html
+INHERIT=java-pkg-2 java-ant-2
IUSE=doc source test
KEYWORDS=amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
LICENSE=Apache-2.0
@@ -10,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 92b5a4d196abffe2dbe3bdc1cf4ef2ae multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
_md5_=5d7c65739477c8cb57c90d4bd7014ae8
diff --git a/metadata/md5-cache/dev-java/batik-1.14 b/metadata/md5-cache/dev-java/batik-1.14
index a4453aa38742..e2e50d0ce56d 100644
--- a/metadata/md5-cache/dev-java/batik-1.14
+++ b/metadata/md5-cache/dev-java/batik-1.14
@@ -3,12 +3,13 @@ DEPEND=dev-java/jacl:0 dev-java/jython:2.7 dev-java/rhino:1.6 dev-java/xalan:0 d
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
+KEYWORDS=amd64 ~arm64 ppc64 x86
LICENSE=Apache-2.0
RDEPEND=dev-java/jacl:0 dev-java/jython:2.7 dev-java/rhino:1.6 dev-java/xalan:0 dev-java/xml-commons-external:1.3 dev-java/xmlgraphics-commons:2 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
RESTRICT=!test? ( test )
SLOT=1.14
SRC_URI=mirror://apache/xmlgraphics/batik/source/batik-src-1.14.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae xdg-utils fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=4ca3a17b8d6d42d0aa8b9ac84af5a82f
+_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
new file mode 100644
index 000000000000..a71a76b94cd2
--- /dev/null
+++ b/metadata/md5-cache/dev-java/batik-1.14-r1
@@ -0,0 +1,15 @@
+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.4 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.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
diff --git a/metadata/md5-cache/dev-java/batik-1.9 b/metadata/md5-cache/dev-java/batik-1.9
deleted file mode 100644
index c70bc6a04c4f..000000000000
--- a/metadata/md5-cache/dev-java/batik-1.9
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=tcl? ( dev-java/jacl:0 ) python? ( dev-java/jython:2.7 ) dev-java/xalan:0 dev-java/rhino:1.6 dev-java/ant-core:0 dev-java/xmlgraphics-commons:2 dev-java/xml-commons-external:1.3 >=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
-DESCRIPTION=Java based SVG toolkit
-EAPI=5
-HOMEPAGE=https://xmlgraphics.apache.org/batik/
-IUSE=doc python tcl doc
-KEYWORDS=amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
-LICENSE=Apache-2.0
-RDEPEND=tcl? ( dev-java/jacl:0 ) python? ( dev-java/jython:2.7 ) dev-java/xalan:0 dev-java/rhino:1.6 dev-java/ant-core:0 dev-java/xmlgraphics-commons:2 dev-java/xml-commons-external:1.3 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3
-SLOT=1.9
-SRC_URI=http://apache.mirrors.ovh.net/ftp.apache.org/dist/xmlgraphics/batik/source/batik-src-1.9.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 eapi7-ver 1a0a60ad07c8b32d2faba2d085dc0f24 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 9f813bb3c47cf2e60619a663b87c5f4e estack 055c42df72f76a4f45ec92b35e83cd56 eutils dab5d8ec471d025b79c9e6906bcf3bff java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib 4a33c9008e5ee30cb8840a3fdc24df2b preserve-libs a8e50acee31b5759b4df1f7707cae54b strip-linguas ac3ee41ee2d31d8c41a77c0838320cc7 toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8 vcs-clean d271b7bc7e6a009758d7d4ef749174e3 versionator d3fb3ba33acc3bbbdc4d7970227c100d wrapper 4a1902f969e5718126434fc35f3a0d9c
-_md5_=338e256f593ff733b6548dbe496b7a81
diff --git a/metadata/md5-cache/dev-java/bcel-6.5.0 b/metadata/md5-cache/dev-java/bcel-6.5.0
index 1237735daa99..ed2f5bc3064c 100644
--- a/metadata/md5-cache/dev-java/bcel-6.5.0
+++ b/metadata/md5-cache/dev-java/bcel-6.5.0
@@ -3,11 +3,12 @@ DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zi
DESCRIPTION=Apache Commons Bytecode Engineering Library
EAPI=7
HOMEPAGE=https://commons.apache.org/proper/commons-bcel
+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/commons/bcel/source/bcel-6.5.0-src.tar.gz -> bcel-6.5.0-sources.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
_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 289310a3e02e..2fef6703207b 100644
--- a/metadata/md5-cache/dev-java/bcel-6.5.0-r3
+++ b/metadata/md5-cache/dev-java/bcel-6.5.0-r3
@@ -3,6 +3,7 @@ DEPEND=>=virtual/jdk-1.8:* test? ( dev-java/commons-collections:4 dev-java/commo
DESCRIPTION=Apache Commons Bytecode Engineering Library
EAPI=8
HOMEPAGE=https://commons.apache.org/proper/commons-bcel/
+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=Apache-2.0
@@ -10,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 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
_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 087675030697..a88136eaac56 100644
--- a/metadata/md5-cache/dev-java/bcmail-1.69-r1
+++ b/metadata/md5-cache/dev-java/bcmail-1.69-r1
@@ -3,6 +3,7 @@ DEPEND=~dev-java/bcpkix-1.69:0 ~dev-java/bcprov-1.69:0 ~dev-java/bcutil-1.69:0 d
DESCRIPTION=The Bouncy Castle Java S/MIME APIs for handling S/MIME protocols
EAPI=7
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
@@ -10,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 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
_md5_=8da5d2d5d95e1f5c896a299d22e38e3f
diff --git a/metadata/md5-cache/dev-java/bcpg-1.69 b/metadata/md5-cache/dev-java/bcpg-1.69
index 26310e12851a..afa075bc3e49 100644
--- a/metadata/md5-cache/dev-java/bcpg-1.69
+++ b/metadata/md5-cache/dev-java/bcpg-1.69
@@ -3,6 +3,7 @@ DEPEND=~dev-java/bcprov-1.69:0 >=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-
DESCRIPTION=Java cryptography APIs
EAPI=7
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
@@ -10,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 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
_md5_=c586bb96bc1c8ffda729116f4cd8c46c
diff --git a/metadata/md5-cache/dev-java/bcpkix-1.69 b/metadata/md5-cache/dev-java/bcpkix-1.69
index ee3f7e7501c7..6d87dc2fabbe 100644
--- a/metadata/md5-cache/dev-java/bcpkix-1.69
+++ b/metadata/md5-cache/dev-java/bcpkix-1.69
@@ -3,6 +3,7 @@ DEPEND=~dev-java/bcprov-1.69:0 ~dev-java/bcutil-1.69:0 >=virtual/jdk-1.8:* >=dev
DESCRIPTION=Java APIs for CMS, PKCS, EAC, TSP, CMP, CRMF, OCSP, and certificate generation
EAPI=7
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
@@ -10,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 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_eclasses_=check-reqs 82234bf011d5453330773cd5fc3f0199 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
_md5_=816bf43cb03d381035ea210f0abc3dc9
diff --git a/metadata/md5-cache/dev-java/bcprov-1.69 b/metadata/md5-cache/dev-java/bcprov-1.69
index 91e92992251d..465611d2dc13 100644
--- a/metadata/md5-cache/dev-java/bcprov-1.69
+++ b/metadata/md5-cache/dev-java/bcprov-1.69
@@ -4,6 +4,7 @@ DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zi
DESCRIPTION=Java cryptography APIs
EAPI=7
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
@@ -11,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 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_eclasses_=check-reqs 82234bf011d5453330773cd5fc3f0199 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
_md5_=814c5034775a00b7c6f98aa6733bebf7
diff --git a/metadata/md5-cache/dev-java/bcutil-1.69 b/metadata/md5-cache/dev-java/bcutil-1.69
index 5c8adafdfe0f..3d0c2143141e 100644
--- a/metadata/md5-cache/dev-java/bcutil-1.69
+++ b/metadata/md5-cache/dev-java/bcutil-1.69
@@ -3,6 +3,7 @@ DEPEND=~dev-java/bcprov-1.69:0 >=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-
DESCRIPTION=Java APIs for ASN.1 extension and utility APIs used to support bcpkix and bctls
EAPI=7
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
@@ -10,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 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
_md5_=1daceb77b59371772b191b981754b0e0
diff --git a/metadata/md5-cache/dev-java/bnd-junit-2.1.0-r2 b/metadata/md5-cache/dev-java/bnd-junit-2.1.0-r2
index adb32e239199..bf0159cf079e 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
@@ -3,6 +3,7 @@ DEPEND=dev-java/osgi-core-api:0 dev-java/bndlib:0 virtual/jdk:1.8 test? ( dev-ja
DESCRIPTION=Junit plugin for bndlib, a swiss army knife for OSGi
EAPI=7
HOMEPAGE=http://www.aqute.biz/Bnd/Bnd
+INHERIT=java-pkg-2 java-ant-2
IUSE=test
KEYWORDS=~amd64 ~x86
LICENSE=Apache-2.0
@@ -10,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 92b5a4d196abffe2dbe3bdc1cf4ef2ae multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
_md5_=024d611dae6922351631e7f7f594bca7
diff --git a/metadata/md5-cache/dev-java/bndlib-2.1.0-r1 b/metadata/md5-cache/dev-java/bndlib-2.1.0-r1
index a435ba9b4b72..819e942a3e0b 100644
--- a/metadata/md5-cache/dev-java/bndlib-2.1.0-r1
+++ b/metadata/md5-cache/dev-java/bndlib-2.1.0-r1
@@ -3,6 +3,7 @@ DEPEND=virtual/jdk:1.8 dev-java/libg:0 dev-java/osgi-compendium:0 dev-java/osgi-
DESCRIPTION=A swiss army knife for OSGi
EAPI=7
HOMEPAGE=https://bnd.bndtools.org/
+INHERIT=java-pkg-2 java-ant-2
IUSE=test
KEYWORDS=amd64 ~arm arm64 ppc64 x86
LICENSE=Apache-2.0
@@ -10,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 92b5a4d196abffe2dbe3bdc1cf4ef2ae multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
_md5_=7c66aa75cfeb1d877ddbc7a33913c75a
diff --git a/metadata/md5-cache/dev-java/boot-bin-2.8.3 b/metadata/md5-cache/dev-java/boot-bin-2.8.3
index 1256a1229da2..4ed05131b37e 100644
--- a/metadata/md5-cache/dev-java/boot-bin-2.8.3
+++ b/metadata/md5-cache/dev-java/boot-bin-2.8.3
@@ -3,11 +3,12 @@ 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 92b5a4d196abffe2dbe3bdc1cf4ef2ae ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib 4a33c9008e5ee30cb8840a3fdc24df2b preserve-libs a8e50acee31b5759b4df1f7707cae54b strip-linguas ac3ee41ee2d31d8c41a77c0838320cc7 toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8 vcs-clean d271b7bc7e6a009758d7d4ef749174e3 versionator d3fb3ba33acc3bbbdc4d7970227c100d wrapper 4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 eapi7-ver 1a0a60ad07c8b32d2faba2d085dc0f24 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 9f813bb3c47cf2e60619a663b87c5f4e estack 055c42df72f76a4f45ec92b35e83cd56 eutils dab5d8ec471d025b79c9e6906bcf3bff java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 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 0273601ef33d..4486a4df5416 100644
--- a/metadata/md5-cache/dev-java/brotli-dec-0.1.2
+++ b/metadata/md5-cache/dev-java/brotli-dec-0.1.2
@@ -4,11 +4,12 @@ DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zi
DESCRIPTION=Brotli decompressor
EAPI=7
HOMEPAGE=https://github.com/google/brotli
+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/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=0
SRC_URI=https://repo1.maven.org/maven2/org/brotli/dec/0.1.2/dec-0.1.2-sources.jar -> brotli-dec-0.1.2-sources.jar
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
_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 1f1a752d2b76..5977b338544a 100644
--- a/metadata/md5-cache/dev-java/browserlauncher2-1.3-r2
+++ b/metadata/md5-cache/dev-java/browserlauncher2-1.3-r2
@@ -4,11 +4,12 @@ DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zi
DESCRIPTION=A library that facilitates opening a browser from a Java application
EAPI=7
HOMEPAGE=http://browserlaunch2.sourceforge.net/
+INHERIT=java-pkg-2 java-ant-2
IUSE=doc source
KEYWORDS=amd64 ppc64 x86
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 92b5a4d196abffe2dbe3bdc1cf4ef2ae multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
_md5_=cc5b8ebcc5e25045a3f12f7aa5edd9ed
diff --git a/metadata/md5-cache/dev-java/bsf-2.4.0-r2 b/metadata/md5-cache/dev-java/bsf-2.4.0-r2
deleted file mode 100644
index b354aaec9269..000000000000
--- a/metadata/md5-cache/dev-java/bsf-2.4.0-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup
-DEPEND=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/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
-DESCRIPTION=Bean Script Framework
-EAPI=5
-HOMEPAGE=http://commons.apache.org/bsf/
-IUSE=javascript python tcl doc examples source
-KEYWORDS=amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=Apache-2.0
-RDEPEND=python? ( dev-java/jython:2.7 ) javascript? ( dev-java/rhino:1.6 ) tcl? ( dev-java/jacl:0 ) dev-java/xalan:0 dev-java/commons-logging:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=2.3
-SRC_URI=mirror://apache/jakarta/bsf/source/bsf-src-2.4.0.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 eapi7-ver 1a0a60ad07c8b32d2faba2d085dc0f24 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 9f813bb3c47cf2e60619a663b87c5f4e estack 055c42df72f76a4f45ec92b35e83cd56 eutils dab5d8ec471d025b79c9e6906bcf3bff java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib 4a33c9008e5ee30cb8840a3fdc24df2b preserve-libs a8e50acee31b5759b4df1f7707cae54b strip-linguas ac3ee41ee2d31d8c41a77c0838320cc7 toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8 vcs-clean d271b7bc7e6a009758d7d4ef749174e3 versionator d3fb3ba33acc3bbbdc4d7970227c100d wrapper 4a1902f969e5718126434fc35f3a0d9c
-_md5_=c1e4a62e434ee70ae540e510b0a03b64
diff --git a/metadata/md5-cache/dev-java/bsf-2.4.0-r3 b/metadata/md5-cache/dev-java/bsf-2.4.0-r3
index 77e3e939d7d9..e3f5a067e067 100644
--- a/metadata/md5-cache/dev-java/bsf-2.4.0-r3
+++ b/metadata/md5-cache/dev-java/bsf-2.4.0-r3
@@ -3,11 +3,12 @@ DEPEND=python? ( dev-java/jython:2.7 ) javascript? ( dev-java/rhino:1.6 ) tcl? (
DESCRIPTION=Bean Script Framework
EAPI=8
HOMEPAGE=https://commons.apache.org/proper/commons-bsf/
+INHERIT=java-pkg-2 java-ant-2
IUSE=javascript python tcl doc examples source
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=Apache-2.0
RDEPEND=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 92b5a4d196abffe2dbe3bdc1cf4ef2ae multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=83c74484161798ef487620a329100b44
+_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_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 d690b37086bc..450a37918f40 100644
--- a/metadata/md5-cache/dev-java/bsh-2.0_beta6-r1
+++ b/metadata/md5-cache/dev-java/bsh-2.0_beta6-r1
@@ -3,6 +3,7 @@ DEPEND=dev-java/bsf:2.3 java-virtuals/servlet-api:3.0 test? ( dev-java/ant-junit
DESCRIPTION=A small embeddable Java source interpreter
EAPI=7
HOMEPAGE=https://github.com/beanshell/beanshell
+INHERIT=java-pkg-2 java-ant-2
IUSE=doc source test
KEYWORDS=amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux
LICENSE=LGPL-2.1
@@ -10,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 92b5a4d196abffe2dbe3bdc1cf4ef2ae multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
_md5_=c3a61360fb8c1450e51dc796bf358959
diff --git a/metadata/md5-cache/dev-java/byte-buddy-1.12.8 b/metadata/md5-cache/dev-java/byte-buddy-1.12.8
index 347c378e316b..b0ba602623a2 100644
--- a/metadata/md5-cache/dev-java/byte-buddy-1.12.8
+++ b/metadata/md5-cache/dev-java/byte-buddy-1.12.8
@@ -4,11 +4,12 @@ DEPEND=>=virtual/jdk-1.8:* dev-java/findbugs-annotations:0 >=dev-java/jna-5.10.0
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.8/byte-buddy-1.12.8-sources.jar
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
_md5_=eed9f343de99ddd49e78f04a346a5875
diff --git a/metadata/md5-cache/dev-java/byte-buddy-agent-1.12.8 b/metadata/md5-cache/dev-java/byte-buddy-agent-1.12.8
index a0342707b466..cb2f2e12c185 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
@@ -4,6 +4,7 @@ DEPEND=>=virtual/jdk-1.8:* dev-java/findbugs-annotations:0 dev-java/jna:4 test?
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
@@ -11,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://repo1.maven.org/maven2/net/bytebuddy/byte-buddy-agent/1.12.8/byte-buddy-agent-1.12.8-sources.jar test? ( https://codeload.github.com/raphw/byte-buddy/tar.gz/byte-buddy-1.12.8 -> byte-buddy-1.12.8.tar.gz )
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
_md5_=92bc1e8ac4e3b6c2b67e4862e9fa908a
diff --git a/metadata/md5-cache/dev-java/c3p0-0.9.5.5-r1 b/metadata/md5-cache/dev-java/c3p0-0.9.5.5-r1
index 7269809b6a2e..609a61a9f212 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
@@ -3,11 +3,12 @@ DEPEND=>=virtual/jdk-1.8:* dev-java/log4j-12-api:2 dev-java/mchange-commons:0 >=
DESCRIPTION=JDBC drivers with JNDI-bindable DataSources
EAPI=8
HOMEPAGE=https://www.mchange.com/projects/c3p0/
+INHERIT=java-pkg-2 java-ant-2
IUSE=doc examples source
KEYWORDS=amd64 ppc64 x86 ~amd64-linux ~x86-linux
LICENSE=|| ( EPL-1.0 LGPL-2.1 )
RDEPEND=>=virtual/jre-1.8:* dev-java/log4j-12-api:2 dev-java/mchange-commons:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=0
SRC_URI=mirror://sourceforge/c3p0/c3p0-0.9.5.5.src.tgz
-_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
_md5_=f30bf992da1014f795384a7c04867797
diff --git a/metadata/md5-cache/dev-java/cal10n-0.8.1 b/metadata/md5-cache/dev-java/cal10n-0.8.1
index 3d1438e0466f..b69953edaa7a 100644
--- a/metadata/md5-cache/dev-java/cal10n-0.8.1
+++ b/metadata/md5-cache/dev-java/cal10n-0.8.1
@@ -3,11 +3,12 @@ DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zi
DESCRIPTION=java library for writing localized messages using resource bundle
EAPI=8
HOMEPAGE=http://cal10n.qos.ch/
+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/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=0
SRC_URI=https://github.com/qos-ch/cal10n/archive/v_0.8.1.tar.gz -> cal10n-0.8.1.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
_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 55b6beda1fcb..b387a1534c7d 100644
--- a/metadata/md5-cache/dev-java/cglib-3.3.0-r1
+++ b/metadata/md5-cache/dev-java/cglib-3.3.0-r1
@@ -3,6 +3,7 @@ DEPEND=>=virtual/jdk-1.8:* dev-java/ant-core:0 dev-java/asm:9 >=dev-java/java-co
DESCRIPTION=cglib is a powerful, high performance and quality Code Generation Library
EAPI=8
HOMEPAGE=https://github.com/cglib/cglib
+INHERIT=java-pkg-2 java-pkg-simple
IUSE=examples source test
KEYWORDS=amd64 ~arm arm64 ppc64 x86
LICENSE=Apache-2.0
@@ -10,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 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
_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 f3989a8d0f6e..e6c3a0fdba70 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
@@ -3,11 +3,12 @@ DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zi
DESCRIPTION=Annotations for type-checking by the Checker Framework
EAPI=7
HOMEPAGE=https://checkerframework.org/
+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/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=0
SRC_URI=https://codeload.github.com/typetools/checker-framework/tar.gz/refs/tags/checker-framework-3.14.0 -> checker-framework-3.14.0.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
_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 3b960d9a9d92..340cc12287c3 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
@@ -3,6 +3,7 @@ DEPEND=dev-java/commons-collections:0 dev-java/commons-logging:0 >=virtual/jdk-1
DESCRIPTION=Provides easy-to-use wrappers around Reflection and Introspection APIs
EAPI=8
HOMEPAGE=https://commons.apache.org/proper/commons-beanutils/
+INHERIT=java-pkg-2 java-pkg-simple
IUSE=doc source test
KEYWORDS=amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos
LICENSE=Apache-2.0
@@ -10,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 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
_md5_=b818ee63d0978430ab19080ede8dc626
diff --git a/metadata/md5-cache/dev-java/commons-cli-1.4 b/metadata/md5-cache/dev-java/commons-cli-1.4
index 7372b5631c55..03720e291c57 100644
--- a/metadata/md5-cache/dev-java/commons-cli-1.4
+++ b/metadata/md5-cache/dev-java/commons-cli-1.4
@@ -3,6 +3,7 @@ DEPEND=>=virtual/jdk-1.7 test? ( dev-java/junit:4 ) >=dev-java/java-config-2.2.0
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
@@ -10,5 +11,5 @@ RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
RESTRICT=!test? ( test )
SLOT=1
SRC_URI=mirror://apache/commons/cli/source/commons-cli-1.4-src.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 eapi7-ver 1a0a60ad07c8b32d2faba2d085dc0f24 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 9f813bb3c47cf2e60619a663b87c5f4e estack 055c42df72f76a4f45ec92b35e83cd56 eutils dab5d8ec471d025b79c9e6906bcf3bff java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib 4a33c9008e5ee30cb8840a3fdc24df2b preserve-libs a8e50acee31b5759b4df1f7707cae54b strip-linguas ac3ee41ee2d31d8c41a77c0838320cc7 toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8 vcs-clean d271b7bc7e6a009758d7d4ef749174e3 versionator d3fb3ba33acc3bbbdc4d7970227c100d wrapper 4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 eapi7-ver 1a0a60ad07c8b32d2faba2d085dc0f24 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 9f813bb3c47cf2e60619a663b87c5f4e estack 055c42df72f76a4f45ec92b35e83cd56 eutils dab5d8ec471d025b79c9e6906bcf3bff java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 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
new file mode 100644
index 000000000000..98e4fa0b0eb0
--- /dev/null
+++ b/metadata/md5-cache/dev-java/commons-cli-1.5.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=A Java library for working with the command line arguments and options
+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
+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
diff --git a/metadata/md5-cache/dev-java/commons-codec-1.15 b/metadata/md5-cache/dev-java/commons-codec-1.15
index 175fafd20bcb..b926d9bf52f4 100644
--- a/metadata/md5-cache/dev-java/commons-codec-1.15
+++ b/metadata/md5-cache/dev-java/commons-codec-1.15
@@ -3,6 +3,7 @@ DEPEND=>=virtual/jdk-1.8:* test? ( >=dev-java/commons-lang-3.11:3.6 ) >=dev-java
DESCRIPTION=Implementations of common encoders and decoders in Java
EAPI=7
HOMEPAGE=https://commons.apache.org/proper/commons-codec/
+INHERIT=java-pkg-2 java-pkg-simple
IUSE=doc source test
KEYWORDS=amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux
LICENSE=Apache-2.0
@@ -10,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 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
_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 3eadcb7e09e9..984271cc4d94 100644
--- a/metadata/md5-cache/dev-java/commons-collections-3.2.2
+++ b/metadata/md5-cache/dev-java/commons-collections-3.2.2
@@ -3,6 +3,7 @@ DEPEND=>=virtual/jdk-1.8:* test? ( dev-java/junit:0 dev-java/ant-junit:0 ) >=dev
DESCRIPTION=Jakarta-Commons Collections Component
EAPI=7
HOMEPAGE=https://commons.apache.org/collections/
+INHERIT=java-pkg-2 java-ant-2 java-utils-2
IUSE=test doc source test
KEYWORDS=amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos
LICENSE=Apache-2.0
@@ -10,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 92b5a4d196abffe2dbe3bdc1cf4ef2ae multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
_md5_=f48a8926e7069cc3e5324144276913fe
diff --git a/metadata/md5-cache/dev-java/commons-collections-4.4 b/metadata/md5-cache/dev-java/commons-collections-4.4
index d5cd2c01d152..1378fec50ae2 100644
--- a/metadata/md5-cache/dev-java/commons-collections-4.4
+++ b/metadata/md5-cache/dev-java/commons-collections-4.4
@@ -3,6 +3,7 @@ DEPEND=>=virtual/jdk-1.8:* test? ( dev-java/easymock:3.2 dev-java/commons-lang:3
DESCRIPTION=Extends the JCF classes with new interfaces, implementations and utilities
EAPI=8
HOMEPAGE=https://commons.apache.org/proper/commons-collections/
+INHERIT=java-pkg-2 java-pkg-simple
IUSE=doc source test
KEYWORDS=amd64 ~arm arm64 ppc64 x86
LICENSE=Apache-2.0
@@ -10,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 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
_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 a8dca13db243..dd92185276cc 100644
--- a/metadata/md5-cache/dev-java/commons-compress-1.21
+++ b/metadata/md5-cache/dev-java/commons-compress-1.21
@@ -3,11 +3,12 @@ DEPEND=>=virtual/jdk-1.8:* dev-java/asm:9 >=dev-java/brotli-dec-0.1.2:0 >=dev-ja
DESCRIPTION=Java API for working with archive files
EAPI=7
HOMEPAGE=https://commons.apache.org/proper/commons-compress/
+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/asm:9 >=dev-java/brotli-dec-0.1.2:0 >=dev-java/xz-java-1.9:0 >=dev-java/zstd-jni-1.5.0.4:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=0
SRC_URI=mirror://apache/commons/compress/source/commons-compress-1.21-src.tar.gz -> commons-compress-1.21-sources.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
_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 df7d33067a1b..d73680259316 100644
--- a/metadata/md5-cache/dev-java/commons-csv-1.9.0
+++ b/metadata/md5-cache/dev-java/commons-csv-1.9.0
@@ -3,6 +3,7 @@ DEPEND=>=virtual/jdk-1.8:* test? ( >=dev-java/commons-io-2.11.0:1 >=dev-java/com
DESCRIPTION=Simple interface for reading and writing CSV files of various types
EAPI=7
HOMEPAGE=https://commons.apache.org/proper/commons-csv/
+INHERIT=java-pkg-2 java-pkg-simple
IUSE=doc source test
KEYWORDS=amd64 ~arm arm64 ppc64 x86
LICENSE=Apache-2.0
@@ -10,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 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
_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 27c849884aa3..47a922249b65 100644
--- a/metadata/md5-cache/dev-java/commons-daemon-1.2.4
+++ b/metadata/md5-cache/dev-java/commons-daemon-1.2.4
@@ -3,11 +3,12 @@ DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zi
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.2.4-src.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
_md5_=4f2372c98f63944ca12050021f50323c
diff --git a/metadata/md5-cache/dev-java/commons-digester-2.1-r2 b/metadata/md5-cache/dev-java/commons-digester-2.1-r2
index ec86b2444e79..0f9a306f4243 100644
--- a/metadata/md5-cache/dev-java/commons-digester-2.1-r2
+++ b/metadata/md5-cache/dev-java/commons-digester-2.1-r2
@@ -3,6 +3,7 @@ DEPEND=>=dev-java/commons-beanutils-1.9.4:1.7 >=dev-java/commons-logging-1.2:0 >
DESCRIPTION=Reads XML configuration files to provide initialization of various Java objects
EAPI=8
HOMEPAGE=https://commons.apache.org/digester/
+INHERIT=java-pkg-2 java-pkg-simple
IUSE=doc source test
KEYWORDS=amd64 ppc64 x86
LICENSE=Apache-2.0
@@ -10,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 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
_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 959ad28ec2ea..7a8bed067757 100644
--- a/metadata/md5-cache/dev-java/commons-digester-3.2-r3
+++ b/metadata/md5-cache/dev-java/commons-digester-3.2-r3
@@ -3,6 +3,7 @@ DEPEND=>=dev-java/cglib-3.3.0:3 >=dev-java/commons-beanutils-1.9.4:1.7 >=dev-jav
DESCRIPTION=Reads XML configuration files to provide initialization of various Java objects
EAPI=8
HOMEPAGE=https://commons.apache.org/digester/
+INHERIT=java-pkg-2 java-pkg-simple
IUSE=doc source test
KEYWORDS=amd64 ppc64 x86
LICENSE=Apache-2.0
@@ -11,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 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
_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 f32f00a19409..f2f37137bf1b 100644
--- a/metadata/md5-cache/dev-java/commons-httpclient-3.1-r2
+++ b/metadata/md5-cache/dev-java/commons-httpclient-3.1-r2
@@ -3,6 +3,7 @@ DEPEND=>=virtual/jdk-1.8:* test? ( dev-java/ant-junit:0 ) dev-java/commons-loggi
DESCRIPTION=The Jakarta Commons HttpClient library
EAPI=7
HOMEPAGE=https://hc.apache.org/httpclient-legacy/
+INHERIT=java-pkg-2 java-ant-2
IUSE=doc examples source test
KEYWORDS=amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux
LICENSE=Apache-2.0
@@ -10,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 92b5a4d196abffe2dbe3bdc1cf4ef2ae multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
_md5_=4bfadc2ca13c5ff2db0bdd47f2f9d72c
diff --git a/metadata/md5-cache/dev-java/commons-httpclient-4.5.13-r1 b/metadata/md5-cache/dev-java/commons-httpclient-4.5.13-r1
deleted file mode 100644
index f0e33f359ce8..000000000000
--- a/metadata/md5-cache/dev-java/commons-httpclient-4.5.13-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=dev-java/commons-codec:0 dev-java/commons-logging:0 dev-java/httpcore:0 >=virtual/jdk-1.8:* test? ( dev-java/hamcrest-core:1.3 dev-java/mockito:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
-DESCRIPTION=Apache HttpComponents Client
-EAPI=7
-HOMEPAGE=https://hc.apache.org/httpcomponents-client
-IUSE=doc source test
-KEYWORDS=amd64 ~arm ~arm64 ppc64 x86
-LICENSE=Apache-2.0
-RDEPEND=dev-java/commons-codec:0 dev-java/commons-logging:0 dev-java/httpcore:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=!test? ( test )
-SLOT=4
-SRC_URI=mirror://apache/httpcomponents/httpclient/source/httpcomponents-client-4.5.13-src.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
-_md5_=0b16d0c37c6db7936e06532fcecc8729
diff --git a/metadata/md5-cache/dev-java/commons-imaging-1.0_alpha2 b/metadata/md5-cache/dev-java/commons-imaging-1.0_alpha2
index e2c04f957618..ce3c76b5ab55 100644
--- a/metadata/md5-cache/dev-java/commons-imaging-1.0_alpha2
+++ b/metadata/md5-cache/dev-java/commons-imaging-1.0_alpha2
@@ -3,11 +3,12 @@ DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zi
DESCRIPTION=Apache Commons Imaging (previously Sanselan) is a pure-Java image library.
EAPI=8
HOMEPAGE=https://commons.apache.org/proper/commons-imaging/
+INHERIT=java-pkg-2 java-pkg-simple
IUSE=doc source
KEYWORDS=~amd64 ~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/imaging/source/commons-imaging-1.0-alpha2-src.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
_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 56f379c0a15b..dc4b4982d4ab 100644
--- a/metadata/md5-cache/dev-java/commons-io-2.11.0
+++ b/metadata/md5-cache/dev-java/commons-io-2.11.0
@@ -3,6 +3,7 @@ DEPEND=>=virtual/jdk-1.8:* test? ( >=dev-java/commons-lang-3.12.0:3.6 ) >=dev-ja
DESCRIPTION=Utility classes, stream implementations, file filters, and much more
EAPI=7
HOMEPAGE=https://commons.apache.org/proper/commons-io/
+INHERIT=java-pkg-2 java-pkg-simple
IUSE=doc source test
KEYWORDS=amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
LICENSE=Apache-2.0
@@ -10,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 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
_md5_=9579ab0e9bdfaffa3a66570fc1fb1fbb
diff --git a/metadata/md5-cache/dev-java/commons-jxpath-1.3-r5 b/metadata/md5-cache/dev-java/commons-jxpath-1.3-r5
index 82799c24555e..eb1a2dd6943d 100644
--- a/metadata/md5-cache/dev-java/commons-jxpath-1.3-r5
+++ b/metadata/md5-cache/dev-java/commons-jxpath-1.3-r5
@@ -3,11 +3,12 @@ DEPEND=dev-java/commons-beanutils:1.7 dev-java/jdom:0 java-virtuals/servlet-api:
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 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_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 5bb56fd4744b..381073885faf 100644
--- a/metadata/md5-cache/dev-java/commons-lang-2.6-r2
+++ b/metadata/md5-cache/dev-java/commons-lang-2.6-r2
@@ -3,6 +3,7 @@ DEPEND=virtual/jdk:1.8 test? ( dev-java/ant-junit:0 ) >=dev-java/java-config-2.2
DESCRIPTION=Commons components to manipulate core java classes
EAPI=7
HOMEPAGE=https://commons.apache.org/proper/commons-lang/
+INHERIT=java-pkg-2 java-ant-2
IUSE=doc source test
KEYWORDS=amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris
LICENSE=Apache-2.0
@@ -10,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 92b5a4d196abffe2dbe3bdc1cf4ef2ae multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
_md5_=af75f2cd4bd2717eb350f17cf86f845a
diff --git a/metadata/md5-cache/dev-java/commons-lang-3.12.0 b/metadata/md5-cache/dev-java/commons-lang-3.12.0
index a5302145c316..cec687d67a50 100644
--- a/metadata/md5-cache/dev-java/commons-lang-3.12.0
+++ b/metadata/md5-cache/dev-java/commons-lang-3.12.0
@@ -3,11 +3,12 @@ DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zi
DESCRIPTION=Commons components to manipulate core java classes
EAPI=7
HOMEPAGE=https://commons.apache.org/proper/commons-lang/
+INHERIT=java-pkg-2 java-pkg-simple
IUSE=doc source
KEYWORDS=amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris
LICENSE=Apache-2.0
RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=3.6
SRC_URI=mirror://apache/commons/lang/source/commons-lang3-3.12.0-src.tar.gz -> commons-lang-3.12.0-sources.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
_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 1e5ae7cb8c27..a0afa3c842f0 100644
--- a/metadata/md5-cache/dev-java/commons-logging-1.2-r5
+++ b/metadata/md5-cache/dev-java/commons-logging-1.2-r5
@@ -3,6 +3,7 @@ DEPEND=avalon-logkit? ( dev-java/avalon-logkit:2.0 ) avalon-framework? ( dev-jav
DESCRIPTION=An ultra-thin bridge between different Java logging libraries
EAPI=8
HOMEPAGE=https://commons.apache.org/logging/
+INHERIT=java-pkg-2 java-ant-2 java-osgi
IUSE=avalon-framework avalon-logkit log4j servletapi test doc source
KEYWORDS=amd64 ~arm arm64 ppc64 x86
LICENSE=Apache-2.0
@@ -11,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 92b5a4d196abffe2dbe3bdc1cf4ef2ae multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-osgi c9b922d3fd7b5c6117f4c4d68e32e881 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
_md5_=43416132fd6c4efd7cf735c6b5aacef9
diff --git a/metadata/md5-cache/dev-java/commons-math-3.6.1-r1 b/metadata/md5-cache/dev-java/commons-math-3.6.1-r1
index 2c37a120e997..477c6becc245 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
@@ -3,11 +3,12 @@ DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zi
DESCRIPTION=Lightweight, self-contained mathematics and statistics components
EAPI=7
HOMEPAGE=https://commons.apache.org/math/
+INHERIT=java-pkg-2 java-pkg-simple
IUSE=doc examples source
KEYWORDS=amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=Apache-2.0
RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=3
SRC_URI=https://repo1.maven.org/maven2/org/apache/commons/commons-math3/3.6.1/commons-math3-3.6.1-sources.jar -> commons-math3-3.6.1.jar
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
_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 ae9460ae3a54..ca99eafa22b0 100644
--- a/metadata/md5-cache/dev-java/commons-net-3.8.0
+++ b/metadata/md5-cache/dev-java/commons-net-3.8.0
@@ -3,11 +3,12 @@ DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zi
DESCRIPTION=Client-oriented Java library to implement many Internet protocols
EAPI=7
HOMEPAGE=https://commons.apache.org/net/
+INHERIT=java-pkg-2 java-pkg-simple
IUSE=doc examples source
KEYWORDS=amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=Apache-2.0
RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=0
SRC_URI=https://repo1.maven.org/maven2/commons-net/commons-net/3.8.0/commons-net-3.8.0-sources.jar -> commons-net-3.8.0.jar
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
_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 57a83c3ff36e..bcd300aa0346 100644
--- a/metadata/md5-cache/dev-java/commons-text-1.9
+++ b/metadata/md5-cache/dev-java/commons-text-1.9
@@ -3,11 +3,12 @@ DEPEND=>=virtual/jdk-1.8:* >=dev-java/commons-lang-3.11:3.6 >=dev-java/java-conf
DESCRIPTION=Apache Commons Text is a library focused on algorithms working on strings
EAPI=7
HOMEPAGE=https://commons.apache.org/proper/commons-text
+INHERIT=java-pkg-2 java-pkg-simple
IUSE=doc source
KEYWORDS=amd64 ppc64 x86
LICENSE=Apache-2.0
RDEPEND=>=virtual/jre-1.8:* >=dev-java/commons-lang-3.11:3.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=0
SRC_URI=https://downloads.apache.org//commons/text/source/commons-text-1.9-src.tar.gz -> commons-text-1.9-sources.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
_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 fcebad43ba04..3846b0802b09 100644
--- a/metadata/md5-cache/dev-java/commons-validator-1.7
+++ b/metadata/md5-cache/dev-java/commons-validator-1.7
@@ -3,6 +3,7 @@ DEPEND=dev-java/commons-beanutils:1.7 dev-java/commons-digester:2.1 dev-java/com
DESCRIPTION=Commons component to validate user input, or data input
EAPI=7
HOMEPAGE=https://commons.apache.org/proper/commons-validator/
+INHERIT=java-pkg-2 java-pkg-simple
IUSE=doc source test
KEYWORDS=amd64 ppc64 x86
LICENSE=Apache-2.0
@@ -10,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 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
_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 ce0c46ccae3a..9c707415394c 100644
--- a/metadata/md5-cache/dev-java/commons-vfs-2.0-r2
+++ b/metadata/md5-cache/dev-java/commons-vfs-2.0-r2
@@ -3,11 +3,12 @@ DEPEND=dev-java/ant-core:0 dev-java/commons-collections:0 dev-java/commons-loggi
DESCRIPTION=A single API for accessing various different file systems
EAPI=7
HOMEPAGE=https://commons.apache.org/vfs/
+INHERIT=java-pkg-2 java-ant-2
IUSE=source
KEYWORDS=amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux
LICENSE=Apache-2.0
RDEPEND=dev-java/ant-core:0 dev-java/commons-collections:0 dev-java/commons-logging:0 dev-java/commons-net:0 dev-java/commons-httpclient:3 dev-java/jackrabbit-webdav:0 dev-java/jsch:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=2
SRC_URI=mirror://apache/commons/vfs/source/commons-vfs-2.0-src.tar.gz
-_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
_md5_=7fe2e1d80a50330b345a7433034ced4f
diff --git a/metadata/md5-cache/dev-java/conversant-disruptor-1.2.19 b/metadata/md5-cache/dev-java/conversant-disruptor-1.2.19-r1
index 01a7f9e080da..d39e19c4da4b 100644
--- a/metadata/md5-cache/dev-java/conversant-disruptor-1.2.19
+++ b/metadata/md5-cache/dev-java/conversant-disruptor-1.2.19-r1
@@ -1,8 +1,9 @@
DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.8:* test? ( dev-java/slf4j-api:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
+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
@@ -10,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 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
-_md5_=8c86652a19f7e1d3a012baa6933d6ea7
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_md5_=e384b01a0554f8de125716f9cd6e41a5
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 891b1c00c7e1..737acd2e2954 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
@@ -3,10 +3,11 @@ DEPEND=dev-java/ant-core:0 >=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 >
DESCRIPTION=A Clojure library with specs to describe Clojure core macros and functions
EAPI=7
HOMEPAGE=https://clojure.org/ https://github.com/clojure/core.specs.alpha
+INHERIT=java-pkg-2 java-ant-2
KEYWORDS=~amd64 ~x86 ~x86-linux
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 92b5a4d196abffe2dbe3bdc1cf4ef2ae multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
_md5_=caaacacbbf986bb968c3b93a81de48f0
diff --git a/metadata/md5-cache/dev-java/core-specs-alpha-0.2.44 b/metadata/md5-cache/dev-java/core-specs-alpha-0.2.44
index 658f6613e38f..5ac49eea67b4 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
@@ -3,10 +3,11 @@ DEPEND=dev-java/ant-core:0 >=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 >
DESCRIPTION=A Clojure library with specs to describe Clojure core macros and functions
EAPI=7
HOMEPAGE=https://clojure.org/ https://github.com/clojure/core.specs.alpha
+INHERIT=java-pkg-2 java-ant-2
KEYWORDS=~amd64 ~x86 ~x86-linux
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 92b5a4d196abffe2dbe3bdc1cf4ef2ae multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
_md5_=02d6dbc3aef805e1178e36211fd03409
diff --git a/metadata/md5-cache/dev-java/core-specs-alpha-0.2.56 b/metadata/md5-cache/dev-java/core-specs-alpha-0.2.56
index 01aa56a937a5..aaf2bed397a5 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
@@ -3,10 +3,11 @@ DEPEND=dev-java/ant-core:0 >=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 >
DESCRIPTION=A Clojure library with specs to describe Clojure core macros and functions
EAPI=7
HOMEPAGE=https://clojure.org/ https://github.com/clojure/core.specs.alpha
+INHERIT=java-pkg-2 java-ant-2
KEYWORDS=~amd64 ~x86 ~x86-linux
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 92b5a4d196abffe2dbe3bdc1cf4ef2ae multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
_md5_=faa81bdb522e13991a71394907889ff5
diff --git a/metadata/md5-cache/dev-java/cortado-0.6.0-r2 b/metadata/md5-cache/dev-java/cortado-0.6.0-r2
index 563ab7eac264..88712c00e18b 100644
--- a/metadata/md5-cache/dev-java/cortado-0.6.0-r2
+++ b/metadata/md5-cache/dev-java/cortado-0.6.0-r2
@@ -3,10 +3,11 @@ DEPEND=virtual/jdk:1.8 >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2
DESCRIPTION=Multimedia framework for Java written by Fluendo
EAPI=8
HOMEPAGE=https://www.theora.org/cortado/
+INHERIT=java-pkg-2 java-ant-2
KEYWORDS=amd64 ppc64 x86
LICENSE=GPL-2 LGPL-2
RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3
SLOT=0
SRC_URI=https://downloads.xiph.org/releases/cortado/cortado-0.6.0.tar.gz
-_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
_md5_=9b2debbc537a0092e0ea6d6a4fbe4292
diff --git a/metadata/md5-cache/dev-java/cpptasks-1.0_beta5-r1 b/metadata/md5-cache/dev-java/cpptasks-1.0_beta5-r1
index f0f485535a63..d26e13a78b8c 100644
--- a/metadata/md5-cache/dev-java/cpptasks-1.0_beta5-r1
+++ b/metadata/md5-cache/dev-java/cpptasks-1.0_beta5-r1
@@ -3,6 +3,7 @@ DEPEND=>=virtual/jdk-1.8:* dev-java/ant-core:0 dev-java/xerces:2 test? ( dev-jav
DESCRIPTION=Ant-tasks to compile various source languages and produce executables
EAPI=8
HOMEPAGE=http://ant-contrib.sourceforge.net/
+INHERIT=java-pkg-2 java-ant-2
IUSE=doc examples source test
KEYWORDS=amd64 ~arm arm64 ppc64 x86
LICENSE=Apache-2.0
@@ -10,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 92b5a4d196abffe2dbe3bdc1cf4ef2ae multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
_md5_=e34ce749cce1ab0dc73cf770b0590392
diff --git a/metadata/md5-cache/dev-java/dom4j-2.1.3 b/metadata/md5-cache/dev-java/dom4j-2.1.3
index cea18b638f77..8a0024330afc 100644
--- a/metadata/md5-cache/dev-java/dom4j-2.1.3
+++ b/metadata/md5-cache/dev-java/dom4j-2.1.3
@@ -3,6 +3,7 @@ DEPEND=dev-java/jaxb-api:2 dev-java/xpp2:0 dev-java/xpp3:0 dev-java/xsdlib:0 jax
DESCRIPTION=flexible XML framework for Java
EAPI=7
HOMEPAGE=https://dom4j.github.io/
+INHERIT=java-pkg-2 java-pkg-simple
IUSE=jaxen doc source test
KEYWORDS=amd64 ~arm arm64 ppc64 x86
LICENSE=dom4j
@@ -10,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 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
_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 6d3d5fb911c9..1b19d25db942 100644
--- a/metadata/md5-cache/dev-java/easymock-3.3.1-r1
+++ b/metadata/md5-cache/dev-java/easymock-3.3.1-r1
@@ -3,6 +3,7 @@ DEPEND=>=virtual/jdk-1.8:* dev-java/cglib:3 dev-java/junit:4 dev-java/objenesis:
DESCRIPTION=Mock Objects for interfaces in JUnit tests by generating them on the fly
EAPI=7
HOMEPAGE=https://easymock.org/
+INHERIT=java-pkg-2 java-pkg-simple
IUSE=doc source test
KEYWORDS=amd64 ~arm arm64 ppc64 x86
LICENSE=Apache-2.0
@@ -10,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 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
_md5_=bf8d9bf8607b14707e1b9927446c145c
diff --git a/metadata/md5-cache/dev-java/eclipse-ecj-4.10 b/metadata/md5-cache/dev-java/eclipse-ecj-4.10
deleted file mode 100644
index 6b70610c5aeb..000000000000
--- a/metadata/md5-cache/dev-java/eclipse-ecj-4.10
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test
-DEPEND=app-eselect/eselect-java dev-java/ant-core >=virtual/jdk-11 app-arch/unzip >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Eclipse Compiler for Java
-EAPI=6
-HOMEPAGE=http://www.eclipse.org/
-IUSE=+ant doc source
-KEYWORDS=~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris
-LICENSE=EPL-1.0
-PDEPEND=ant? ( ~dev-java/ant-eclipse-ecj-4.10 )
-RDEPEND=app-eselect/eselect-java dev-java/ant-core >=virtual/jre-11 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=4.10
-SRC_URI=http://download.eclipse.org/eclipse/downloads/drops4/R-4.10-201812060815/ecjsrc-4.10.jar
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 eapi7-ver 1a0a60ad07c8b32d2faba2d085dc0f24 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 9f813bb3c47cf2e60619a663b87c5f4e estack 055c42df72f76a4f45ec92b35e83cd56 eutils dab5d8ec471d025b79c9e6906bcf3bff java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib 4a33c9008e5ee30cb8840a3fdc24df2b preserve-libs a8e50acee31b5759b4df1f7707cae54b strip-linguas ac3ee41ee2d31d8c41a77c0838320cc7 toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8 vcs-clean d271b7bc7e6a009758d7d4ef749174e3 versionator d3fb3ba33acc3bbbdc4d7970227c100d wrapper 4a1902f969e5718126434fc35f3a0d9c
-_md5_=e4b04355fcf5790c547e86b927908ad5
diff --git a/metadata/md5-cache/dev-java/eclipse-ecj-4.13-r2 b/metadata/md5-cache/dev-java/eclipse-ecj-4.13-r2
deleted file mode 100644
index 7cdcc88b563e..000000000000
--- a/metadata/md5-cache/dev-java/eclipse-ecj-4.13-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-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 )
-DESCRIPTION=Eclipse Compiler for Java
-EAPI=7
-HOMEPAGE=http://www.eclipse.org/
-IUSE=+ant doc source
-KEYWORDS=~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris
-LICENSE=EPL-1.0
-PDEPEND=ant? ( ~dev-java/ant-eclipse-ecj-4.13 )
-RDEPEND=app-eselect/eselect-java dev-java/ant-core:0 virtual/jre >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=4.13
-SRC_URI=http://download.eclipse.org/eclipse/downloads/drops4/R-4.13-201909161045/ecjsrc-4.13.jar
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
-_md5_=8c9f5d7e56c84da1409f02cc68906e2b
diff --git a/metadata/md5-cache/dev-java/eclipse-ecj-4.15 b/metadata/md5-cache/dev-java/eclipse-ecj-4.15
index 7b4aafef7dec..ec501e622072 100644
--- a/metadata/md5-cache/dev-java/eclipse-ecj-4.15
+++ b/metadata/md5-cache/dev-java/eclipse-ecj-4.15
@@ -2,13 +2,14 @@ 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 )
DESCRIPTION=Eclipse Compiler for Java
EAPI=7
-HOMEPAGE=http://www.eclipse.org/
+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.15 )
RDEPEND=app-eselect/eselect-java dev-java/ant-core:0 virtual/jre >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=4.15
-SRC_URI=http://download.eclipse.org/eclipse/downloads/drops4/R-4.15-202003050155/ecjsrc-4.15.jar
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
-_md5_=36d324a818e8e954208dd40f46dd9053
+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
+_md5_=05f6212f9979277996675e568acca2f3
diff --git a/metadata/md5-cache/dev-java/eclipse-ecj-4.22 b/metadata/md5-cache/dev-java/eclipse-ecj-4.22
index 887e2ba629d8..1d11864bb82c 100644
--- a/metadata/md5-cache/dev-java/eclipse-ecj-4.22
+++ b/metadata/md5-cache/dev-java/eclipse-ecj-4.22
@@ -2,13 +2,14 @@ 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 )
DESCRIPTION=Eclipse Compiler for Java
EAPI=8
-HOMEPAGE=http://www.eclipse.org/
+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.22 )
RDEPEND=app-eselect/eselect-java dev-java/ant-core:0 >=virtual/jre-11:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=4.22
-SRC_URI=http://download.eclipse.org/eclipse/downloads/drops4/R-4.22-202111241800/ecjsrc-4.22.jar
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
-_md5_=c2b4d868f6518ff728355ffa6c0a1540
+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
diff --git a/metadata/md5-cache/dev-java/eclipse-ecj-4.5.1 b/metadata/md5-cache/dev-java/eclipse-ecj-4.5.1
index d467cd759c23..b27de8afadf3 100644
--- a/metadata/md5-cache/dev-java/eclipse-ecj-4.5.1
+++ b/metadata/md5-cache/dev-java/eclipse-ecj-4.5.1
@@ -2,13 +2,14 @@ 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=http://www.eclipse.org/
+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=http://download.eclipse.org/eclipse/downloads/drops4/R-4.5.1-201509040015/ecjsrc-4.5.1.jar
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 eapi7-ver 1a0a60ad07c8b32d2faba2d085dc0f24 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 9f813bb3c47cf2e60619a663b87c5f4e estack 055c42df72f76a4f45ec92b35e83cd56 eutils dab5d8ec471d025b79c9e6906bcf3bff java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib 4a33c9008e5ee30cb8840a3fdc24df2b preserve-libs a8e50acee31b5759b4df1f7707cae54b strip-linguas ac3ee41ee2d31d8c41a77c0838320cc7 toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8 vcs-clean d271b7bc7e6a009758d7d4ef749174e3 versionator d3fb3ba33acc3bbbdc4d7970227c100d wrapper 4a1902f969e5718126434fc35f3a0d9c
-_md5_=51b052d6d74153f2dccb029a59c90883
+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
index daeacdd46dc4..dc244203cb2b 100644
--- a/metadata/md5-cache/dev-java/eclipsito-20180510
+++ b/metadata/md5-cache/dev-java/eclipsito-20180510
@@ -3,11 +3,12 @@ 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 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib 4a33c9008e5ee30cb8840a3fdc24df2b preserve-libs a8e50acee31b5759b4df1f7707cae54b strip-linguas ac3ee41ee2d31d8c41a77c0838320cc7 toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8 vcs-clean d271b7bc7e6a009758d7d4ef749174e3 vcs-snapshot 19dc666868420457132a7514d4621476 versionator d3fb3ba33acc3bbbdc4d7970227c100d wrapper 4a1902f969e5718126434fc35f3a0d9c
+_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 0e1df75a610b..30178f6c2659 100644
--- a/metadata/md5-cache/dev-java/emma-2.0.5312-r4
+++ b/metadata/md5-cache/dev-java/emma-2.0.5312-r4
@@ -4,11 +4,12 @@ DEPEND=dev-java/ant-core launcher? ( !sci-biology/emboss ) >=virtual/jdk-1.8:* >
DESCRIPTION=Free Java code coverage tool
EAPI=8
HOMEPAGE=http://emma.sourceforge.net/
+INHERIT=java-pkg-2 java-ant-2
IUSE=+launcher source
KEYWORDS=amd64 ~arm arm64 ppc64 x86
LICENSE=CPL-1.0
RDEPEND=dev-java/ant-core launcher? ( !sci-biology/emboss ) >=virtual/jre-1.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 92b5a4d196abffe2dbe3bdc1cf4ef2ae multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
_md5_=c4267c86a013dd64bbab4bb5874832e5
diff --git a/metadata/md5-cache/dev-java/error-prone-annotations-2.7.1 b/metadata/md5-cache/dev-java/error-prone-annotations-2.7.1
index 9e33e7d917a2..4c94cfcfd660 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
@@ -3,11 +3,12 @@ DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zi
DESCRIPTION=Java annotations for the Error Prone static analysis tool
EAPI=7
HOMEPAGE=http://errorprone.info
+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://codeload.github.com/google/error-prone/tar.gz/v2.7.1 -> error-prone-2.7.1.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
_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 e89b56335273..fee86402632d 100644
--- a/metadata/md5-cache/dev-java/failureaccess-30.1.1
+++ b/metadata/md5-cache/dev-java/failureaccess-30.1.1
@@ -3,11 +3,12 @@ DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zi
DESCRIPTION=Guava's InternalFutureFailureAccess and InternalFutures classes.
EAPI=7
HOMEPAGE=https://github.com/google/guava/failureaccess
+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://codeload.github.com/google/guava/tar.gz/refs/tags/v30.1.1 -> guava-30.1.1.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
_md5_=d6db1f05beb39924e4e2962ca8ff6226
diff --git a/metadata/md5-cache/dev-java/fec-1.0.4-r4 b/metadata/md5-cache/dev-java/fec-1.0.4-r4
index 3e19b5c38a21..29cae192cd85 100644
--- a/metadata/md5-cache/dev-java/fec-1.0.4-r4
+++ b/metadata/md5-cache/dev-java/fec-1.0.4-r4
@@ -3,6 +3,7 @@ DEPEND=dev-java/log4j-12-api:2 >=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-
DESCRIPTION=Forward Error Correction library in Java
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
LICENSE=BSD-2
@@ -10,5 +11,5 @@ RDEPEND=dev-java/log4j-12-api:2 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0
RESTRICT=test
SLOT=0
SRC_URI=https://dev.gentoo.org/~monsieurp/packages/fec-1.0.4.tar.gz
-_eclasses_=flag-o-matic a500d7cc40da3de38c361e889153bdf7 java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=flag-o-matic a500d7cc40da3de38c361e889153bdf7 java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
_md5_=f9885d800843cc7528dd1d9ea6b274c4
diff --git a/metadata/md5-cache/dev-java/findbugs-annotations-3.0.1 b/metadata/md5-cache/dev-java/findbugs-annotations-3.0.1
index dac9dd434886..c27ebf2b0d38 100644
--- a/metadata/md5-cache/dev-java/findbugs-annotations-3.0.1
+++ b/metadata/md5-cache/dev-java/findbugs-annotations-3.0.1
@@ -4,11 +4,12 @@ DEPEND=>=virtual/jdk-1.8:* >=dev-java/jsr305-3.0.2:0 >=dev-java/java-config-2.2.
DESCRIPTION=Annotation defined by the FindBugs tool
EAPI=8
HOMEPAGE=http://findbugs.sourceforge.net/
+INHERIT=java-pkg-2 java-pkg-simple
IUSE=doc source
KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
LICENSE=LGPL-3
RDEPEND=>=virtual/jre-1.8:* >=dev-java/jsr305-3.0.2:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=0
SRC_URI=https://repo1.maven.org/maven2/com/google/code/findbugs/findbugs-annotations/3.0.1/findbugs-annotations-3.0.1-sources.jar
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
_md5_=b244a3d5622c61a6b6479b912153d5a9
diff --git a/metadata/md5-cache/dev-java/fontbox-1.7.1-r1 b/metadata/md5-cache/dev-java/fontbox-1.7.1-r1
deleted file mode 100644
index 28de19887640..000000000000
--- a/metadata/md5-cache/dev-java/fontbox-1.7.1-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.6 test? ( dev-java/ant-junit:0 dev-java/junit:4 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
-DESCRIPTION=An open source Java library for parsing font files
-EAPI=6
-HOMEPAGE=https://pdfbox.apache.org/
-IUSE=doc source test
-KEYWORDS=amd64 ~arm64 ppc64 x86 ~x64-macos
-LICENSE=BSD
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=!test? ( test )
-SLOT=1.7
-SRC_URI=https://archive.apache.org/dist/pdfbox/1.7.1/pdfbox-1.7.1-src.zip -> fontbox-1.7.1.zip
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 eapi7-ver 1a0a60ad07c8b32d2faba2d085dc0f24 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 9f813bb3c47cf2e60619a663b87c5f4e estack 055c42df72f76a4f45ec92b35e83cd56 eutils dab5d8ec471d025b79c9e6906bcf3bff java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib 4a33c9008e5ee30cb8840a3fdc24df2b preserve-libs a8e50acee31b5759b4df1f7707cae54b strip-linguas ac3ee41ee2d31d8c41a77c0838320cc7 toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8 vcs-clean d271b7bc7e6a009758d7d4ef749174e3 versionator d3fb3ba33acc3bbbdc4d7970227c100d wrapper 4a1902f969e5718126434fc35f3a0d9c
-_md5_=a8b7ac03bdb4d6da39957d4676484953
diff --git a/metadata/md5-cache/dev-java/fontbox-1.7.1-r2 b/metadata/md5-cache/dev-java/fontbox-1.7.1-r2
deleted file mode 100644
index ad610a396c3e..000000000000
--- a/metadata/md5-cache/dev-java/fontbox-1.7.1-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.8:* test? ( dev-java/ant-junit:0 dev-java/junit:4 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
-DESCRIPTION=An open source Java library for parsing font files
-EAPI=8
-HOMEPAGE=https://pdfbox.apache.org/
-IUSE=doc source test
-KEYWORDS=~amd64 ~arm64 ppc64 ~x86 ~x64-macos
-LICENSE=BSD
-RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=!test? ( test )
-SLOT=1.7
-SRC_URI=https://archive.apache.org/dist/pdfbox/1.7.1/pdfbox-1.7.1-src.zip -> fontbox-1.7.1.zip
-_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=86a6fb781b6380f5cc34cf17f1321b4c
diff --git a/metadata/md5-cache/dev-java/fontbox-2.0.24 b/metadata/md5-cache/dev-java/fontbox-2.0.24
index 28c107f16823..3ece9e5757d5 100644
--- a/metadata/md5-cache/dev-java/fontbox-2.0.24
+++ b/metadata/md5-cache/dev-java/fontbox-2.0.24
@@ -4,6 +4,7 @@ DEPEND=dev-java/commons-logging:0 >=virtual/jdk-1.8:* >=dev-java/java-config-2.2
DESCRIPTION=An open source Java library for parsing font files
EAPI=7
HOMEPAGE=https://pdfbox.apache.org/
+INHERIT=java-pkg-2 java-pkg-simple
IUSE=doc source test
KEYWORDS=amd64 ~arm64 ppc64 x86
LICENSE=Apache-2.0
@@ -11,5 +12,5 @@ RDEPEND=dev-java/commons-logging:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=mirror://apache/pdfbox/2.0.24/pdfbox-2.0.24-src.zip test? ( https://issues.apache.org/jira/secure/attachment/12684264/SourceSansProBold.otf https://issues.apache.org/jira/secure/attachment/12896461/NotoEmoji-Regular.ttf https://issues.apache.org/jira/secure/attachment/12809395/DejaVuSansMono.ttf )
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
_md5_=e26898c9a485d82259b3f6936a3d1302
diff --git a/metadata/md5-cache/dev-java/fop-2.0-r3 b/metadata/md5-cache/dev-java/fop-2.0-r3
deleted file mode 100644
index c39e8bfc3df5..000000000000
--- a/metadata/md5-cache/dev-java/fop-2.0-r3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 app-arch/unzip dev-java/batik:1.9 dev-java/ant-core:0 dev-java/fontbox:1.7 dev-java/commons-io:1 dev-java/commons-logging:0 java-virtuals/servlet-api:3.0 dev-java/avalon-framework:4.2 dev-java/xmlgraphics-commons:2 dev-java/xml-commons-external:1.3 dev-java/qdox:1.12 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
-DESCRIPTION=Formatting Objects Processor is a print formatter driven by XSL
-EAPI=5
-HOMEPAGE=https://xmlgraphics.apache.org/fop/
-IUSE=doc examples source test
-KEYWORDS=amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.6 dev-java/batik:1.9 dev-java/ant-core:0 dev-java/fontbox:1.7 dev-java/commons-io:1 dev-java/commons-logging:0 java-virtuals/servlet-api:3.0 dev-java/avalon-framework:4.2 dev-java/xmlgraphics-commons:2 dev-java/xml-commons-external:1.3 dev-java/qdox:1.12 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://apache/xmlgraphics/fop/source/fop-2.0-src.zip
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 eapi7-ver 1a0a60ad07c8b32d2faba2d085dc0f24 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 9f813bb3c47cf2e60619a663b87c5f4e estack 055c42df72f76a4f45ec92b35e83cd56 eutils dab5d8ec471d025b79c9e6906bcf3bff java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib 4a33c9008e5ee30cb8840a3fdc24df2b preserve-libs a8e50acee31b5759b4df1f7707cae54b strip-linguas ac3ee41ee2d31d8c41a77c0838320cc7 toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8 vcs-clean d271b7bc7e6a009758d7d4ef749174e3 versionator d3fb3ba33acc3bbbdc4d7970227c100d wrapper 4a1902f969e5718126434fc35f3a0d9c
-_md5_=4d301c13a39302d4307da4bd25cd2837
diff --git a/metadata/md5-cache/dev-java/fop-2.7 b/metadata/md5-cache/dev-java/fop-2.7
index 600371d876ca..77bcf79674f5 100644
--- a/metadata/md5-cache/dev-java/fop-2.7
+++ b/metadata/md5-cache/dev-java/fop-2.7
@@ -3,12 +3,13 @@ DEPEND=dev-java/batik:1.14 dev-java/commons-io:1 dev-java/fontbox:0 dev-java/qdo
DESCRIPTION=XML Graphics Format Object Processor All-In-One
EAPI=8
HOMEPAGE=https://xmlgraphics.apache.org/fop/
+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/batik:1.14 dev-java/commons-io:1 dev-java/fontbox:0 dev-java/qdox:1.12 dev-java/sun-jai-bin:0 dev-java/xmlgraphics-commons:2 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
RESTRICT=!test? ( test )
SLOT=2.7
-SRC_URI=mirror://apache/xmlgraphics/fop/source/fop-2.7-src.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
-_md5_=b85a8bc75bbcca54ddb6daefd37eaf4b
+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
+_md5_=36f2a45a101f85662f10d4281493ee8e
diff --git a/metadata/md5-cache/dev-java/freehep-graphicsbase-2.4 b/metadata/md5-cache/dev-java/freehep-graphicsbase-2.4
deleted file mode 100644
index 2e2675e7931f..000000000000
--- a/metadata/md5-cache/dev-java/freehep-graphicsbase-2.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=dev-java/freehep-io:0 dev-java/junit:4 >=virtual/jdk-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=High Energy Physics Java library - FreeHEP Graphics Base Library
-EAPI=5
-HOMEPAGE=http://java.freehep.org/
-IUSE=test doc source
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0 LGPL-2.1
-RDEPEND=dev-java/freehep-io:0 dev-java/junit:4 >=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/freehep/freehep-vectorgraphics/archive/freehep-vectorgraphics-2.4.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 eapi7-ver 1a0a60ad07c8b32d2faba2d085dc0f24 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 9f813bb3c47cf2e60619a663b87c5f4e estack 055c42df72f76a4f45ec92b35e83cd56 eutils dab5d8ec471d025b79c9e6906bcf3bff java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib 4a33c9008e5ee30cb8840a3fdc24df2b preserve-libs a8e50acee31b5759b4df1f7707cae54b strip-linguas ac3ee41ee2d31d8c41a77c0838320cc7 toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8 vcs-clean d271b7bc7e6a009758d7d4ef749174e3 versionator d3fb3ba33acc3bbbdc4d7970227c100d wrapper 4a1902f969e5718126434fc35f3a0d9c
-_md5_=1cf26d6ffbea1cb6752b5ae75e522ec5
diff --git a/metadata/md5-cache/dev-java/freehep-io-2.2.2 b/metadata/md5-cache/dev-java/freehep-io-2.2.2
deleted file mode 100644
index 97c03c3157fa..000000000000
--- a/metadata/md5-cache/dev-java/freehep-io-2.2.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.7 test? ( dev-java/junit:4 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=High Energy Physics Java library - FreeHEP I/O Library
-EAPI=5
-HOMEPAGE=http://java.freehep.org/
-IUSE=test doc source
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0 LGPL-2.1
-RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/freehep/freehep-io/archive/freehep-io-2.2.2.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 eapi7-ver 1a0a60ad07c8b32d2faba2d085dc0f24 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 9f813bb3c47cf2e60619a663b87c5f4e estack 055c42df72f76a4f45ec92b35e83cd56 eutils dab5d8ec471d025b79c9e6906bcf3bff java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib 4a33c9008e5ee30cb8840a3fdc24df2b preserve-libs a8e50acee31b5759b4df1f7707cae54b strip-linguas ac3ee41ee2d31d8c41a77c0838320cc7 toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8 vcs-clean d271b7bc7e6a009758d7d4ef749174e3 versionator d3fb3ba33acc3bbbdc4d7970227c100d wrapper 4a1902f969e5718126434fc35f3a0d9c
-_md5_=23af37d098ba8f89cc67ee2fed568c04
diff --git a/metadata/md5-cache/dev-java/gin-2.1.2 b/metadata/md5-cache/dev-java/gin-2.1.2
index 1a3e52b92a93..ba8303657903 100644
--- a/metadata/md5-cache/dev-java/gin-2.1.2
+++ b/metadata/md5-cache/dev-java/gin-2.1.2
@@ -4,6 +4,7 @@ DEPEND=dev-java/aopalliance:1 dev-java/javax-inject:0 dev-java/gwt:2.8 dev-java/
DESCRIPTION=Google Gin (GWT INjection)
EAPI=7
HOMEPAGE=https://gwtplus.github.io/google-gin/
+INHERIT=java-pkg-2 java-ant-2
IUSE=source
KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
LICENSE=Apache-2.0
@@ -11,5 +12,5 @@ RDEPEND=dev-java/aopalliance:1 dev-java/javax-inject:0 dev-java/gwt:2.8 dev-java
RESTRICT=mirror
SLOT=2.1
SRC_URI=https://github.com/gwtplus/google-gin/archive/d62089f5b6ea33d842ab4646b51583c65a8be36b.zip -> google-gin-2.1.2.zip
-_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
_md5_=cb4c774e700033e5f5a86367ecb88e4d
diff --git a/metadata/md5-cache/dev-java/glassfish-interceptor-api-3.1 b/metadata/md5-cache/dev-java/glassfish-interceptor-api-3.1
deleted file mode 100644
index 86b55c9dbb28..000000000000
--- a/metadata/md5-cache/dev-java/glassfish-interceptor-api-3.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
-DESCRIPTION=Project GlassFish Interceptor API
-EAPI=5
-HOMEPAGE=https://glassfish.java.net/
-IUSE=doc source
-KEYWORDS=amd64 x86 ~amd64-linux
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~tomwij/files/dist/glassfish-interceptor-api-3.1.tar.xz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 eapi7-ver 1a0a60ad07c8b32d2faba2d085dc0f24 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 9f813bb3c47cf2e60619a663b87c5f4e estack 055c42df72f76a4f45ec92b35e83cd56 eutils dab5d8ec471d025b79c9e6906bcf3bff java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib 4a33c9008e5ee30cb8840a3fdc24df2b preserve-libs a8e50acee31b5759b4df1f7707cae54b strip-linguas ac3ee41ee2d31d8c41a77c0838320cc7 toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8 vcs-clean d271b7bc7e6a009758d7d4ef749174e3 versionator d3fb3ba33acc3bbbdc4d7970227c100d wrapper 4a1902f969e5718126434fc35f3a0d9c
-_md5_=a2a5d2853eec8cc4ae3eefd2915f6c16
diff --git a/metadata/md5-cache/dev-java/glassfish-jms-api-1.1.2.2.04-r2 b/metadata/md5-cache/dev-java/glassfish-jms-api-1.1.2.2.04-r2
index 945029c062e5..8668e9eeb936 100644
--- a/metadata/md5-cache/dev-java/glassfish-jms-api-1.1.2.2.04-r2
+++ b/metadata/md5-cache/dev-java/glassfish-jms-api-1.1.2.2.04-r2
@@ -4,11 +4,12 @@ DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zi
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 92b5a4d196abffe2dbe3bdc1cf4ef2ae multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_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 0396a3e61517..d5b8d0ec68ab 100644
--- a/metadata/md5-cache/dev-java/glassfish-persistence-1.0-r2
+++ b/metadata/md5-cache/dev-java/glassfish-persistence-1.0-r2
@@ -4,10 +4,11 @@ DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1
DESCRIPTION=Glassfish implementation of persistence API
EAPI=7
HOMEPAGE=https://javaee.github.io/glassfish/
+INHERIT=java-pkg-2 java-ant-2
KEYWORDS=amd64 ~arm arm64 ppc64 x86
LICENSE=CDDL
RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3
SLOT=0
SRC_URI=https://download.java.net/javaee5/fcs_branch/promoted/source/glassfish-9_0-b48-src.zip
-_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
_md5_=2eda64ba01f7d0e0fdbb0489beb321e9
diff --git a/metadata/md5-cache/dev-java/glassfish-xmlrpc-api-1.1.1-r1 b/metadata/md5-cache/dev-java/glassfish-xmlrpc-api-1.1.1-r1
index d6cac8f5e738..ecaf80752534 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
@@ -3,11 +3,12 @@ DEPEND=>=virtual/jdk-1.8:* dev-java/jakarta-xml-soap-api:1 java-virtuals/servlet
DESCRIPTION=Project GlassFish XML RPC API
EAPI=8
HOMEPAGE=https://glassfish.java.net/
+INHERIT=java-pkg-2 java-ant-2
IUSE=doc source
KEYWORDS=amd64 x86
LICENSE=Apache-2.0
RDEPEND=>=virtual/jre-1.8:* dev-java/jakarta-xml-soap-api:1 java-virtuals/servlet-api:3.0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=0
SRC_URI=https://dev.gentoo.org/~tomwij/files/dist/glassfish-xmlrpc-api-1.1.1.tar.xz
-_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
_md5_=95ebc9c82e02ba2749c8d790909f4bf2
diff --git a/metadata/md5-cache/dev-java/glazedlists-1.8.0-r2 b/metadata/md5-cache/dev-java/glazedlists-1.8.0-r2
index aff3de1da510..fb4b88ee1531 100644
--- a/metadata/md5-cache/dev-java/glazedlists-1.8.0-r2
+++ b/metadata/md5-cache/dev-java/glazedlists-1.8.0-r2
@@ -4,11 +4,12 @@ DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zi
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 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
_md5_=343c91daad959937d1630fb1d26312fb
diff --git a/metadata/md5-cache/dev-java/gnu-classpath-0.98-r6 b/metadata/md5-cache/dev-java/gnu-classpath-0.98-r6
deleted file mode 100644
index 8265f7f3873c..000000000000
--- a/metadata/md5-cache/dev-java/gnu-classpath-0.98-r6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=app-arch/zip gtk? ( x11-base/xorg-proto x11-libs/libXrender >=x11-libs/libXtst-1.1.0 ) >=virtual/jdk-1.5 alsa? ( media-libs/alsa-lib ) dssi? ( >=media-libs/dssi-0.9 ) gconf? ( gnome-base/gconf:2= ) gjdoc? ( >=dev-java/antlr-2.7.7-r7:0 ) gmp? ( >=dev-libs/gmp-4.2.4:0= ) gtk? ( >=x11-libs/gtk+-2.8:2= dev-libs/glib:2= media-libs/freetype:2= >=x11-libs/cairo-1.1.9:= x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/pango ) xml? ( >=dev-libs/libxml2-2.6.8:2= >=dev-libs/libxslt-1.1.11 ) >=dev-java/java-config-2.2.0-r3
-DESCRIPTION=Free core class libraries for use with Java VMs and compilers
-EAPI=5
-HOMEPAGE=https://www.gnu.org/software/classpath
-IUSE=alsa debug doc dssi examples gconf +gjdoc gmp gtk xml
-KEYWORDS=amd64 ppc64 x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2-with-linking-exception
-RDEPEND=>=virtual/jre-1.5 alsa? ( media-libs/alsa-lib ) dssi? ( >=media-libs/dssi-0.9 ) gconf? ( gnome-base/gconf:2= ) gjdoc? ( >=dev-java/antlr-2.7.7-r7:0 ) gmp? ( >=dev-libs/gmp-4.2.4:0= ) gtk? ( >=x11-libs/gtk+-2.8:2= dev-libs/glib:2= media-libs/freetype:2= >=x11-libs/cairo-1.1.9:= x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/pango ) xml? ( >=dev-libs/libxml2-2.6.8:2= >=dev-libs/libxslt-1.1.11 ) >=dev-java/java-config-2.2.0-r3
-REQUIRED_USE=doc? ( gjdoc )
-SLOT=0.98
-SRC_URI=mirror://gnu/classpath/classpath-0.98.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 eapi7-ver 1a0a60ad07c8b32d2faba2d085dc0f24 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 9f813bb3c47cf2e60619a663b87c5f4e estack 055c42df72f76a4f45ec92b35e83cd56 eutils dab5d8ec471d025b79c9e6906bcf3bff java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib 4a33c9008e5ee30cb8840a3fdc24df2b preserve-libs a8e50acee31b5759b4df1f7707cae54b strip-linguas ac3ee41ee2d31d8c41a77c0838320cc7 toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8 vcs-clean d271b7bc7e6a009758d7d4ef749174e3 versionator d3fb3ba33acc3bbbdc4d7970227c100d wrapper 4a1902f969e5718126434fc35f3a0d9c
-_md5_=fa64c51164cfb4ccf6304f23bfe05222
diff --git a/metadata/md5-cache/dev-java/gnu-jaf-1.1.2 b/metadata/md5-cache/dev-java/gnu-jaf-1.1.2
index 872f265cd05d..542fb7f2928f 100644
--- a/metadata/md5-cache/dev-java/gnu-jaf-1.1.2
+++ b/metadata/md5-cache/dev-java/gnu-jaf-1.1.2
@@ -3,11 +3,12 @@ DEPEND=>=virtual/jdk-1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
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 92b5a4d196abffe2dbe3bdc1cf4ef2ae ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib 4a33c9008e5ee30cb8840a3fdc24df2b preserve-libs a8e50acee31b5759b4df1f7707cae54b strip-linguas ac3ee41ee2d31d8c41a77c0838320cc7 toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8 vcs-clean d271b7bc7e6a009758d7d4ef749174e3 versionator d3fb3ba33acc3bbbdc4d7970227c100d wrapper 4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 eapi7-ver 1a0a60ad07c8b32d2faba2d085dc0f24 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 9f813bb3c47cf2e60619a663b87c5f4e estack 055c42df72f76a4f45ec92b35e83cd56 eutils dab5d8ec471d025b79c9e6906bcf3bff java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 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
new file mode 100644
index 000000000000..333bab5a9df5
--- /dev/null
+++ b/metadata/md5-cache/dev-java/gnu-jaf-1.1.2-r1
@@ -0,0 +1,14 @@
+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=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
+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
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 56bb9264a6d1..2590a013831e 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
@@ -3,11 +3,12 @@ DEPEND=dev-java/java-getopt:1 >=virtual/jdk-1.8:* source? ( app-arch/zip ) >=dev
DESCRIPTION=GNU regular expression package for Java
EAPI=8
HOMEPAGE=https://savannah.gnu.org/projects/gnu-regexp
+INHERIT=java-pkg-2 java-pkg-simple
IUSE=doc source
KEYWORDS=amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
LICENSE=LGPL-2.1
RDEPEND=dev-java/java-getopt:1 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=1
SRC_URI=mirror://gentoo/gnu-regexp-1.1.4.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
_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 82b0fa75e2fd..fd8d365023cc 100644
--- a/metadata/md5-cache/dev-java/gradle-bin-6.8.3
+++ b/metadata/md5-cache/dev-java/gradle-bin-6.8.3
@@ -4,11 +4,12 @@ DEPEND=app-eselect/eselect-gradle >=dev-java/java-config-2.2.0-r3 source? ( app-
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=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 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
_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 255268ae2517..5e1a7c4b3296 100644
--- a/metadata/md5-cache/dev-java/gradle-bin-7.1.1
+++ b/metadata/md5-cache/dev-java/gradle-bin-7.1.1
@@ -4,11 +4,12 @@ DEPEND=app-eselect/eselect-gradle >=dev-java/java-config-2.2.0-r3 source? ( app-
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.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 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
_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 4738e2083e38..347df1b85982 100644
--- a/metadata/md5-cache/dev-java/gradle-bin-7.2
+++ b/metadata/md5-cache/dev-java/gradle-bin-7.2
@@ -4,11 +4,12 @@ DEPEND=app-eselect/eselect-gradle >=dev-java/java-config-2.2.0-r3 source? ( app-
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.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 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
_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 e08df97a9b28..b0550345e2eb 100644
--- a/metadata/md5-cache/dev-java/gradle-bin-7.3.3
+++ b/metadata/md5-cache/dev-java/gradle-bin-7.3.3
@@ -4,11 +4,12 @@ DEPEND=app-eselect/eselect-gradle >=dev-java/java-config-2.2.0-r3 source? ( app-
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.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 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
_md5_=386ee51f52c5a6bc43ccbf484647ce29
diff --git a/metadata/md5-cache/dev-java/gradle-bin-7.4 b/metadata/md5-cache/dev-java/gradle-bin-7.4
index cae76689b9ed..9144fbe8b26d 100644
--- a/metadata/md5-cache/dev-java/gradle-bin-7.4
+++ b/metadata/md5-cache/dev-java/gradle-bin-7.4
@@ -4,11 +4,12 @@ DEPEND=app-eselect/eselect-gradle >=dev-java/java-config-2.2.0-r3 source? ( app-
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 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_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
index db7f4ec0aa9a..a5160b4388c3 100644
--- a/metadata/md5-cache/dev-java/gradle-bin-7.4.1
+++ b/metadata/md5-cache/dev-java/gradle-bin-7.4.1
@@ -4,11 +4,12 @@ DEPEND=app-eselect/eselect-gradle >=dev-java/java-config-2.2.0-r3 source? ( app-
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 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_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 aa98e0c74a0a..b9197cd349e1 100644
--- a/metadata/md5-cache/dev-java/gradle-bin-7.4.2
+++ b/metadata/md5-cache/dev-java/gradle-bin-7.4.2
@@ -4,11 +4,12 @@ DEPEND=app-eselect/eselect-gradle >=dev-java/java-config-2.2.0-r3 source? ( app-
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
+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.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 92b5a4d196abffe2dbe3bdc1cf4ef2ae
-_md5_=0f343b25f25d6b6757e38b8441640127
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_md5_=386ee51f52c5a6bc43ccbf484647ce29
diff --git a/metadata/md5-cache/dev-java/gson-2.8.8 b/metadata/md5-cache/dev-java/gson-2.8.8-r1
index 10ffdf92ecef..65b9949bf101 100644
--- a/metadata/md5-cache/dev-java/gson-2.8.8
+++ b/metadata/md5-cache/dev-java/gson-2.8.8-r1
@@ -1,8 +1,9 @@
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=Gson JSON library
EAPI=7
HOMEPAGE=https://github.com/google/gson
+INHERIT=java-pkg-2 java-pkg-simple
IUSE=doc source test
KEYWORDS=amd64 ~arm arm64 ppc64 x86
LICENSE=Apache-2.0
@@ -10,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 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
-_md5_=f4c59c41da9ccfd2f644e9ea8c3fbc35
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_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
new file mode 100644
index 000000000000..4a4ddaa4d076
--- /dev/null
+++ b/metadata/md5-cache/dev-java/gson-2.9.0-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=virtual/jdk:11 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
+DESCRIPTION=Gson JSON library
+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
+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
diff --git a/metadata/md5-cache/dev-java/guava-20.0 b/metadata/md5-cache/dev-java/guava-20.0
index dfbd99ccd398..8097358e93c4 100644
--- a/metadata/md5-cache/dev-java/guava-20.0
+++ b/metadata/md5-cache/dev-java/guava-20.0
@@ -3,11 +3,12 @@ DEPEND=dev-java/animal-sniffer-annotations:0 dev-java/error-prone-annotations:0
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 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib 4a33c9008e5ee30cb8840a3fdc24df2b preserve-libs a8e50acee31b5759b4df1f7707cae54b strip-linguas ac3ee41ee2d31d8c41a77c0838320cc7 toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8 vcs-clean d271b7bc7e6a009758d7d4ef749174e3 versionator d3fb3ba33acc3bbbdc4d7970227c100d wrapper 4a1902f969e5718126434fc35f3a0d9c
+_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
index 1b965a968928..897da27fdc0c 100644
--- a/metadata/md5-cache/dev-java/guava-20.0-r1
+++ b/metadata/md5-cache/dev-java/guava-20.0-r1
@@ -3,11 +3,12 @@ DEPEND=dev-java/animal-sniffer-annotations:0 dev-java/error-prone-annotations:0
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 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_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 4f8004175360..aa18c0512168 100644
--- a/metadata/md5-cache/dev-java/guava-30.1.1
+++ b/metadata/md5-cache/dev-java/guava-30.1.1
@@ -3,11 +3,12 @@ DEPEND=>=dev-java/checker-framework-qual-3.14.0:0 dev-java/j2objc-annotations:0
DESCRIPTION=A collection of Google's core Java libraries
EAPI=7
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=>=virtual/jre-1.8:* >=dev-java/error-prone-annotations-2.7.1:0 >=dev-java/failureaccess-30.1.1:0 dev-java/jsr305:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=0
SRC_URI=https://codeload.github.com/google/guava/tar.gz/v30.1.1 -> guava-30.1.1.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
_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
new file mode 100644
index 000000000000..8ccba82dcba3
--- /dev/null
+++ b/metadata/md5-cache/dev-java/guava-testlib-30.1.1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=>=virtual/jdk-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 ) test? ( dev-java/junit:4 )
+DESCRIPTION=A set of java classes to assist the tests for Guava itself
+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
+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 )
+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
diff --git a/metadata/md5-cache/dev-java/guice-4.1 b/metadata/md5-cache/dev-java/guice-4.1
index ae30180e9b4e..50866fc07f42 100644
--- a/metadata/md5-cache/dev-java/guice-4.1
+++ b/metadata/md5-cache/dev-java/guice-4.1
@@ -3,6 +3,7 @@ DEPEND=>=virtual/jdk-1.7 dev-java/aopalliance:1 >=dev-java/asm-5:4 >=dev-java/cg
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
@@ -10,5 +11,5 @@ RDEPEND=>=virtual/jre-1.7 dev-java/aopalliance:1 >=dev-java/asm-5:4 >=dev-java/c
RESTRICT=test
SLOT=4
SRC_URI=https://github.com/google/guice/archive/4.1.tar.gz -> guice-4.1.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 eapi7-ver 1a0a60ad07c8b32d2faba2d085dc0f24 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 9f813bb3c47cf2e60619a663b87c5f4e estack 055c42df72f76a4f45ec92b35e83cd56 eutils dab5d8ec471d025b79c9e6906bcf3bff java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib 4a33c9008e5ee30cb8840a3fdc24df2b preserve-libs a8e50acee31b5759b4df1f7707cae54b strip-linguas ac3ee41ee2d31d8c41a77c0838320cc7 toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8 vcs-clean d271b7bc7e6a009758d7d4ef749174e3 versionator d3fb3ba33acc3bbbdc4d7970227c100d wrapper 4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 eapi7-ver 1a0a60ad07c8b32d2faba2d085dc0f24 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 9f813bb3c47cf2e60619a663b87c5f4e estack 055c42df72f76a4f45ec92b35e83cd56 eutils dab5d8ec471d025b79c9e6906bcf3bff java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 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
new file mode 100644
index 000000000000..92d63ff21c38
--- /dev/null
+++ b/metadata/md5-cache/dev-java/guice-5.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/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
+DESCRIPTION=Guice is a lightweight dependency injection framework for Java 6 and above
+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
+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
diff --git a/metadata/md5-cache/dev-java/gwt-2.9.0-r2 b/metadata/md5-cache/dev-java/gwt-2.9.0-r2
deleted file mode 100644
index 52fff865add0..000000000000
--- a/metadata/md5-cache/dev-java/gwt-2.9.0-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=dev-java/guava:20 dev-java/rhino:1.6 dev-java/asm:9 dev-java/eclipse-ecj:4.15 dev-java/validation-api:1.0 virtual/jdk:1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
-DESCRIPTION=Google Web Toolkit library
-EAPI=7
-HOMEPAGE=http://www.gwtproject.org/
-IUSE=source
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=dev-java/guava:20 dev-java/rhino:1.6 dev-java/asm:9 dev-java/eclipse-ecj:4.15 dev-java/validation-api:1.0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=mirror test
-SLOT=2.8
-SRC_URI=https://github.com/gwtproject/gwt/archive/2.9.0.tar.gz -> gwt-2.9.0.tar.gz https://github.com/gwtproject/tools/archive/194772ed94078802d8030136796de344eb1fdbe1.tar.gz -> gwt-tools-194772ed94078802d8030136796de344eb1fdbe1.tar.gz
-_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=7ea26f99294ce414392ab83cdced6a3f
diff --git a/metadata/md5-cache/dev-java/gwt-2.9.0-r3 b/metadata/md5-cache/dev-java/gwt-2.9.0-r3
new file mode 100644
index 000000000000..53c66481b026
--- /dev/null
+++ b/metadata/md5-cache/dev-java/gwt-2.9.0-r3
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install preinst prepare setup test
+DEPEND=dev-java/guava:0 dev-java/rhino:1.6 dev-java/asm:9 dev-java/eclipse-ecj:4.15 dev-java/validation-api:1.0 virtual/jdk:1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
+DESCRIPTION=Google Web Toolkit library
+EAPI=8
+HOMEPAGE=https://www.gwtproject.org/
+INHERIT=java-pkg-2 java-ant-2
+IUSE=source
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=dev-java/guava:0 dev-java/rhino:1.6 dev-java/asm:9 dev-java/eclipse-ecj:4.15 dev-java/validation-api:1.0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=mirror test
+SLOT=2.8
+SRC_URI=https://github.com/gwtproject/gwt/archive/2.9.0.tar.gz -> gwt-2.9.0.tar.gz https://github.com/gwtproject/tools/archive/194772ed94078802d8030136796de344eb1fdbe1.tar.gz -> gwt-tools-194772ed94078802d8030136796de344eb1fdbe1.tar.gz
+_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_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 b047c64d6b87..5bcf35669abb 100644
--- a/metadata/md5-cache/dev-java/hamcrest-core-1.1-r4
+++ b/metadata/md5-cache/dev-java/hamcrest-core-1.1-r4
@@ -2,12 +2,13 @@ DEFINED_PHASES=compile install preinst prepare setup test
DEPEND=>=virtual/jdk-1.8:* source? ( app-arch/zip ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
DESCRIPTION=Library of matchers for building test expressions
EAPI=7
-HOMEPAGE=https://github.com/hamcrest
+HOMEPAGE=http://hamcrest.org/JavaHamcrest/
+INHERIT=java-pkg-2 java-pkg-simple
IUSE=doc source
KEYWORDS=amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x64-solaris
LICENSE=BSD-2
RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=0
SRC_URI=https://github.com/hamcrest/JavaHamcrest/archive/hamcrest-java-1.1.tar.gz -> hamcrest-core-1.1.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
-_md5_=c96e71e59280258000276957223b2507
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_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 404751da6733..ed6f6745a24e 100644
--- a/metadata/md5-cache/dev-java/hamcrest-core-1.3-r2
+++ b/metadata/md5-cache/dev-java/hamcrest-core-1.3-r2
@@ -3,12 +3,13 @@ DEFINED_PHASES=compile install preinst prepare setup test
DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
DESCRIPTION=Core library of matchers for building test expressions
EAPI=7
-HOMEPAGE=https://github.com/hamcrest
+HOMEPAGE=http://hamcrest.org/JavaHamcrest/
+INHERIT=java-pkg-2 java-pkg-simple
IUSE=doc source
KEYWORDS=amd64 ~arm arm64 ppc64 x86 ~ppc-macos ~x64-macos
LICENSE=BSD-2
RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=1.3
SRC_URI=mirror://gentoo/hamcrest-1.3.tgz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
-_md5_=ad5192a4602f7d68f7ed522e0a1e789a
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_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 2a12575cbfb4..b270dc01f9d9 100644
--- a/metadata/md5-cache/dev-java/hamcrest-generator-1.3-r3
+++ b/metadata/md5-cache/dev-java/hamcrest-generator-1.3-r3
@@ -2,7 +2,8 @@ DEFINED_PHASES=compile configure install preinst prepare setup
DEPEND=>=virtual/jdk-1.8:* dev-java/qdox:1.12 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
DESCRIPTION=Code generator for Hamcrest's library of matchers for building test expressions
EAPI=7
-HOMEPAGE=https://github.com/hamcrest
+HOMEPAGE=http://hamcrest.org/JavaHamcrest/
+INHERIT=java-pkg-2 java-ant-2
IUSE=source test
KEYWORDS=amd64 ~arm arm64 ppc64 x86 ~ppc-macos ~x64-macos
LICENSE=BSD-2
@@ -10,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 92b5a4d196abffe2dbe3bdc1cf4ef2ae multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=11cb0796cc8389e450d3ab15612a7391
+_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_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 88824df9b963..89fd45a3b629 100644
--- a/metadata/md5-cache/dev-java/hamcrest-library-1.3-r2
+++ b/metadata/md5-cache/dev-java/hamcrest-library-1.3-r2
@@ -3,12 +3,13 @@ DEFINED_PHASES=compile install preinst prepare setup test
DEPEND=dev-java/hamcrest-core:1.3 >=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
DESCRIPTION=Core library of matchers for building test expressions
EAPI=7
-HOMEPAGE=https://github.com/hamcrest
+HOMEPAGE=http://hamcrest.org/JavaHamcrest/
+INHERIT=java-pkg-2 java-pkg-simple
IUSE=source
KEYWORDS=amd64 ~arm arm64 ppc64 x86
LICENSE=BSD-2
RDEPEND=dev-java/hamcrest-core:1.3 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=1.3
SRC_URI=mirror://gentoo/hamcrest-1.3.tgz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
-_md5_=54d513ed5a773b1b34c91813b56e998f
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_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 53d1f054f6c9..db9889eb7b85 100644
--- a/metadata/md5-cache/dev-java/hawtjni-runtime-1.15-r1
+++ b/metadata/md5-cache/dev-java/hawtjni-runtime-1.15-r1
@@ -3,11 +3,12 @@ DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zi
DESCRIPTION=A JNI code generator based on the generator used by the Eclipse SWT project
EAPI=7
HOMEPAGE=https://github.com/fusesource/hawtjni
+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://github.com/fusesource/hawtjni/archive/hawtjni-project-1.15.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
_md5_=57b6855aa7eb537491fab8bf1a485409
diff --git a/metadata/md5-cache/dev-java/htmlcleaner-2.25 b/metadata/md5-cache/dev-java/htmlcleaner-2.25
index 23e7c8a3433c..7ee1c71acee0 100644
--- a/metadata/md5-cache/dev-java/htmlcleaner-2.25
+++ b/metadata/md5-cache/dev-java/htmlcleaner-2.25
@@ -4,6 +4,7 @@ DEPEND=dev-java/jdom:2 dev-java/ant-core:0 test? ( dev-java/junit:4 ) >=virtual/
DESCRIPTION=HTML parser written in Java that can be used as a tool, library or Ant task
EAPI=7
HOMEPAGE=http://htmlcleaner.sourceforge.net/
+INHERIT=java-pkg-2 java-pkg-simple
IUSE=test doc source
KEYWORDS=amd64 x86
LICENSE=BSD
@@ -11,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 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
_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 5b5efeb76a8c..8df176597997 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
@@ -3,6 +3,7 @@ DEPEND=dev-java/commons-codec:0 dev-java/commons-logging:0 dev-java/httpcore:0 >
DESCRIPTION=Apache HttpComponents Client
EAPI=7
HOMEPAGE=https://hc.apache.org/httpcomponents-client
+INHERIT=java-pkg-2 java-pkg-simple
IUSE=doc source test
KEYWORDS=amd64 ~arm arm64 ppc64 x86
LICENSE=Apache-2.0
@@ -10,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 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
_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 91cca0d5db28..1aaad03fd7e2 100644
--- a/metadata/md5-cache/dev-java/httpcore-4.4.14
+++ b/metadata/md5-cache/dev-java/httpcore-4.4.14
@@ -3,6 +3,7 @@ DEPEND=>=virtual/jdk-1.8:* test? ( dev-java/commons-logging:0 dev-java/mockito:0
DESCRIPTION=Apache HttpComponents Core (blocking I/O)
EAPI=7
HOMEPAGE=https://hc.apache.org/httpcomponents-core-ga
+INHERIT=java-pkg-2 java-pkg-simple
IUSE=doc source test
KEYWORDS=amd64 ~arm arm64 ppc64 x86
LICENSE=Apache-2.0
@@ -10,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 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
_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 2424ecab9398..24b694f889fc 100644
--- a/metadata/md5-cache/dev-java/icedtea-3.21.0
+++ b/metadata/md5-cache/dev-java/icedtea-3.21.0
@@ -3,6 +3,7 @@ DEPEND=>=dev-libs/glib-2.26:2= >=dev-util/systemtap-1 media-libs/fontconfig:1.0=
DESCRIPTION=A harness to build OpenJDK using Free Software build tools and dependencies
EAPI=6
HOMEPAGE=https://icedtea.classpath.org
+INHERIT=check-reqs eapi7-ver flag-o-matic java-pkg-2 java-vm-2 multiprocessing pax-utils toolchain-funcs xdg-utils
IUSE=+alsa cacao +cups doc examples +gtk headless-awt jamvm +jbootstrap kerberos pax-kernel pch pulseaudio sctp selinux shenandoah smartcard +source +system-lcms test zero
KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
LICENSE=Apache-1.1 Apache-2.0 GPL-1 GPL-2 GPL-2-with-linking-exception LGPL-2 MPL-1.0 MPL-1.1 public-domain W3C
@@ -12,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 92b5a4d196abffe2dbe3bdc1cf4ef2ae java-vm-2 69658c0814b27f9cbe466a24e6621d23 ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib 4a33c9008e5ee30cb8840a3fdc24df2b multiprocessing 61c959fc55c15c00bbb1079d6a71370b pax-utils 91d47e5d20627c717aa878b9167c62a8 prefix eab3c99d77fe00506c109c8a736186f7 preserve-libs a8e50acee31b5759b4df1f7707cae54b strip-linguas ac3ee41ee2d31d8c41a77c0838320cc7 toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8 vcs-clean d271b7bc7e6a009758d7d4ef749174e3 versionator d3fb3ba33acc3bbbdc4d7970227c100d wrapper 4a1902f969e5718126434fc35f3a0d9c xdg-utils fffb53a53cf17c9c0c998a3c0a590c7e
+_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
_md5_=b80119a1990d211bd58f3cba3241bd88
diff --git a/metadata/md5-cache/dev-java/icedtea-sound-1.0.1 b/metadata/md5-cache/dev-java/icedtea-sound-1.0.1
deleted file mode 100644
index 49655322880b..000000000000
--- a/metadata/md5-cache/dev-java/icedtea-sound-1.0.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure preinst prepare setup
-DEPEND=>=virtual/jdk-1.6.0 >=media-sound/pulseaudio-0.9.11:= app-arch/zip >=dev-java/java-config-2.2.0-r3
-DESCRIPTION=Plugins for javax.sound
-EAPI=5
-HOMEPAGE=http://icedtea.classpath.org
-IUSE=+doc test
-KEYWORDS=amd64 ~arm arm64 ppc64 x86
-LICENSE=GPL-2-with-linking-exception
-RDEPEND=>=virtual/jdk-1.6.0 >=media-sound/pulseaudio-0.9.11:= >=dev-java/java-config-2.2.0-r3
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=http://icedtea.classpath.org/download/source/icedtea-sound-1.0.1.tar.xz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 eapi7-ver 1a0a60ad07c8b32d2faba2d085dc0f24 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 9f813bb3c47cf2e60619a663b87c5f4e estack 055c42df72f76a4f45ec92b35e83cd56 eutils dab5d8ec471d025b79c9e6906bcf3bff java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib 4a33c9008e5ee30cb8840a3fdc24df2b prefix eab3c99d77fe00506c109c8a736186f7 preserve-libs a8e50acee31b5759b4df1f7707cae54b strip-linguas ac3ee41ee2d31d8c41a77c0838320cc7 toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8 vcs-clean d271b7bc7e6a009758d7d4ef749174e3 versionator d3fb3ba33acc3bbbdc4d7970227c100d wrapper 4a1902f969e5718126434fc35f3a0d9c
-_md5_=342d98dfbcfc03254c37b49d58392daa
diff --git a/metadata/md5-cache/dev-java/icedtea-sound-1.0.1-r1 b/metadata/md5-cache/dev-java/icedtea-sound-1.0.1-r1
index 5dc708a8327d..f073dc554a29 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
@@ -4,11 +4,12 @@ DEPEND=virtual/jdk:1.8 >=media-sound/pulseaudio-0.9.11 >=dev-java/java-config-2.
DESCRIPTION=Plugins for javax.sound
EAPI=8
HOMEPAGE=https://icedtea.classpath.org
+INHERIT=java-pkg-2
IUSE=+doc
-KEYWORDS=~amd64 ~arm arm64 ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ppc64 x86
LICENSE=GPL-2-with-linking-exception
RDEPEND=virtual/jdk:1.8 >=media-sound/pulseaudio-0.9.11 >=dev-java/java-config-2.2.0-r3
SLOT=0
SRC_URI=https://icedtea.classpath.org/download/source/icedtea-sound-1.0.1.tar.xz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
-_md5_=1085dee96f9a36deb600bb00b1b1f026
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_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
index 4c1d919b8281..ddad70b84cbb 100644
--- a/metadata/md5-cache/dev-java/icedtea-web-1.8.4-r1
+++ b/metadata/md5-cache/dev-java/icedtea-web-1.8.4-r1
@@ -3,6 +3,7 @@ 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
@@ -10,5 +11,5 @@ RDEPEND=>=app-eselect/eselect-java-0.2.0 >=virtual/jre-1.8
RESTRICT=test
SLOT=0
SRC_URI=https://github.com/AdoptOpenJDK/icedtea-web/archive/icedtea-web-1.8.4.tar.gz https://crates.io/api/v1/crates/dunce/0.1.1/download -> dunce-0.1.1.crate
-_eclasses_=autotools 9724194ab651ce63fd9bc06e4e1410b4 bash-completion-r1 f5e7a020fd9c741740756aac61bf75ff cargo 52a92ed3815080c5f2caac1905687b1c gnuconfig 262062cef0ba4f22b397193da514a350 libtool 241a8f577b9781a42a7421e53448a44e multilib 4a33c9008e5ee30cb8840a3fdc24df2b multiprocessing 61c959fc55c15c00bbb1079d6a71370b readme.gentoo-r1 b776ad4b42f564c406a95c41ccb42c55 toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8 xdg-utils fffb53a53cf17c9c0c998a3c0a590c7e
+_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
index a1fbb2c1786f..b64369defe5f 100644
--- a/metadata/md5-cache/dev-java/icedtea-web-1.8.8
+++ b/metadata/md5-cache/dev-java/icedtea-web-1.8.8
@@ -3,6 +3,7 @@ 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
@@ -10,5 +11,5 @@ RDEPEND=>=app-eselect/eselect-java-0.2.0 >=virtual/jre-1.8
RESTRICT=test
SLOT=0
SRC_URI=https://github.com/AdoptOpenJDK/icedtea-web/archive/icedtea-web-1.8.8.tar.gz https://crates.io/api/v1/crates/dunce/0.1.1/download -> dunce-0.1.1.crate
-_eclasses_=autotools 9724194ab651ce63fd9bc06e4e1410b4 bash-completion-r1 f5e7a020fd9c741740756aac61bf75ff cargo 52a92ed3815080c5f2caac1905687b1c gnuconfig 262062cef0ba4f22b397193da514a350 libtool 241a8f577b9781a42a7421e53448a44e multilib 4a33c9008e5ee30cb8840a3fdc24df2b multiprocessing 61c959fc55c15c00bbb1079d6a71370b readme.gentoo-r1 b776ad4b42f564c406a95c41ccb42c55 toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8 xdg-utils fffb53a53cf17c9c0c998a3c0a590c7e
+_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
new file mode 100644
index 000000000000..a27049d8e253
--- /dev/null
+++ b/metadata/md5-cache/dev-java/icedtea-web-1.8.8-r1
@@ -0,0 +1,16 @@
+BDEPEND=app-arch/zip sys-devel/bc 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.53
+DEFINED_PHASES=compile configure install postinst preinst prepare setup test unpack
+DEPEND=virtual/jdk:1.8 >=dev-java/java-config-2.2.0-r3
+DESCRIPTION=FOSS Java browser plugin and Web Start implementation
+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
+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
diff --git a/metadata/md5-cache/dev-java/icu4j-70.1 b/metadata/md5-cache/dev-java/icu4j-70.1
deleted file mode 100644
index c9b2771b3765..000000000000
--- a/metadata/md5-cache/dev-java/icu4j-70.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.8:* test? ( dev-java/junitparams:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
-DESCRIPTION=A set of Java libraries providing Unicode and Globalization support
-EAPI=7
-HOMEPAGE=https://icu.unicode.org
-IUSE=doc source test
-KEYWORDS=amd64 ~arm arm64 ppc64 x86
-LICENSE=icu
-RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=!test? ( test )
-SLOT=70
-SRC_URI=https://github.com/unicode-org/icu/archive/refs/tags/release-70-1.tar.gz -> icu4j-70.1.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
-_md5_=30ffbee0546649e832d767b5b0e6cd76
diff --git a/metadata/md5-cache/dev-java/icu4j-71.1 b/metadata/md5-cache/dev-java/icu4j-71.1
index 93978f622abf..cf3102599e2b 100644
--- a/metadata/md5-cache/dev-java/icu4j-71.1
+++ b/metadata/md5-cache/dev-java/icu4j-71.1
@@ -3,12 +3,13 @@ DEPEND=>=virtual/jdk-1.8:* test? ( dev-java/junitparams:0 ) >=dev-java/java-conf
DESCRIPTION=A set of Java libraries providing Unicode and Globalization support
EAPI=8
HOMEPAGE=https://icu.unicode.org
+INHERIT=java-pkg-2 java-pkg-simple
IUSE=doc source test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ppc64 x86
LICENSE=icu
RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
RESTRICT=!test? ( test )
SLOT=70
SRC_URI=https://github.com/unicode-org/icu/archive/refs/tags/release-71-1.tar.gz -> icu4j-71.1.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
-_md5_=6c0ed3995d0039c6a049b9db0acb1aca
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_md5_=608873bde6d4fcb66db9268cdae131d5
diff --git a/metadata/md5-cache/dev-java/invokebinder-1.6 b/metadata/md5-cache/dev-java/invokebinder-1.6
deleted file mode 100644
index 4293750dc035..000000000000
--- a/metadata/md5-cache/dev-java/invokebinder-1.6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.7 test? ( dev-java/ant-junit:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
-DESCRIPTION=Provide a friendly DSL for binding method handles
-EAPI=5
-HOMEPAGE=https://github.com/headius/invokebinder
-IUSE=doc source test
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/headius/invokebinder/archive/invokebinder-1.6.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 eapi7-ver 1a0a60ad07c8b32d2faba2d085dc0f24 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 9f813bb3c47cf2e60619a663b87c5f4e estack 055c42df72f76a4f45ec92b35e83cd56 eutils dab5d8ec471d025b79c9e6906bcf3bff java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib 4a33c9008e5ee30cb8840a3fdc24df2b preserve-libs a8e50acee31b5759b4df1f7707cae54b strip-linguas ac3ee41ee2d31d8c41a77c0838320cc7 toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8 vcs-clean d271b7bc7e6a009758d7d4ef749174e3 versionator d3fb3ba33acc3bbbdc4d7970227c100d wrapper 4a1902f969e5718126434fc35f3a0d9c
-_md5_=7adf737eb0720dc8b5f7fc6517a3d30c
diff --git a/metadata/md5-cache/dev-java/iso-relax-20050331-r5 b/metadata/md5-cache/dev-java/iso-relax-20050331-r5
index 1d521f5cb40e..79ad57c8aa02 100644
--- a/metadata/md5-cache/dev-java/iso-relax-20050331-r5
+++ b/metadata/md5-cache/dev-java/iso-relax-20050331-r5
@@ -3,6 +3,7 @@ DEPEND=dev-java/ant-core:0 >=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 s
DESCRIPTION=Interfaces useful for applications which support RELAX Core
EAPI=7
HOMEPAGE=http://www.xml.gr.jp/relax/
+INHERIT=java-pkg-2 java-pkg-simple
IUSE=doc source
KEYWORDS=amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris
LICENSE=MIT
@@ -10,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 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
_md5_=a84f38d6a933e9fd22f734b3820885cc
diff --git a/metadata/md5-cache/dev-java/j2objc-annotations-1.2-r1 b/metadata/md5-cache/dev-java/j2objc-annotations-1.2-r1
index 534403914b02..18de830dfbb4 100644
--- a/metadata/md5-cache/dev-java/j2objc-annotations-1.2-r1
+++ b/metadata/md5-cache/dev-java/j2objc-annotations-1.2-r1
@@ -3,11 +3,12 @@ DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zi
DESCRIPTION=Annotations for the J2ObjC Java to Objective-C translator
EAPI=8
HOMEPAGE=http://j2objc.org
+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://github.com/google/j2objc/archive/1.2.tar.gz -> j2objc-1.2.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
_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 29e9bead9b99..be2fad773612 100644
--- a/metadata/md5-cache/dev-java/jackcess-4.0.0
+++ b/metadata/md5-cache/dev-java/jackcess-4.0.0
@@ -3,6 +3,7 @@ DEPEND=>=virtual/jdk-1.8:* >=dev-java/commons-lang-3.11:3.6 >=dev-java/commons-l
DESCRIPTION=A pure Java library for reading from and writing to MS Access databases
EAPI=7
HOMEPAGE=https://jackcess.sourceforge.io
+INHERIT=java-pkg-2 java-pkg-simple
IUSE=doc source test
KEYWORDS=amd64 arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos
LICENSE=Apache-2.0
@@ -10,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 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
_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 6e7b02a7fdf6..030a1dff029c 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
@@ -4,6 +4,7 @@ DEPEND=>=virtual/jdk-1.8:* dev-java/bndlib:0 dev-java/slf4j-api:0 dev-java/slf4j
DESCRIPTION=Fully conforming implementation of the JRC API (specified in JSR 170 and 283)
EAPI=8
HOMEPAGE=https://jackrabbit.apache.org/
+INHERIT=java-pkg-2 java-pkg-simple
IUSE=doc source test
KEYWORDS=amd64 ~arm arm64 ppc64 x86
LICENSE=Apache-2.0
@@ -11,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 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
_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 e0879350ddd0..beadaaa42ec0 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
@@ -4,6 +4,7 @@ DEPEND=dev-java/httpcomponents-client:4 dev-java/httpcore:0 dev-java/osgi-annota
DESCRIPTION=Generic WebDAV Library
EAPI=7
HOMEPAGE=http://jackrabbit.apache.org/jackrabbit-webdav/
+INHERIT=java-pkg-2 java-pkg-simple
IUSE=doc source test
KEYWORDS=amd64 ~arm arm64 ppc64 x86
LICENSE=Apache-2.0
@@ -11,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 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
_md5_=65c70f65cb8c9421c6090410aea25e7a
diff --git a/metadata/md5-cache/dev-java/jackson-annotations-2.13.2 b/metadata/md5-cache/dev-java/jackson-annotations-2.13.2
index e0fb4292a3f6..681ba225da38 100644
--- a/metadata/md5-cache/dev-java/jackson-annotations-2.13.2
+++ b/metadata/md5-cache/dev-java/jackson-annotations-2.13.2
@@ -3,12 +3,13 @@ DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zi
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 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
-_md5_=6ee42260d895bf3e20e3d70a8224fac8
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_md5_=f380dce9bef51615b5823d527849c535
diff --git a/metadata/md5-cache/dev-java/jackson-annotations-2.13.0 b/metadata/md5-cache/dev-java/jackson-annotations-2.13.2-r1
index 3d6ae77347bb..f898cfb6f641 100644
--- a/metadata/md5-cache/dev-java/jackson-annotations-2.13.0
+++ b/metadata/md5-cache/dev-java/jackson-annotations-2.13.2-r1
@@ -1,14 +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/refs/tags/jackson-annotations-2.13.0.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
-_md5_=2551ec34e46939d833894ebbf9ec405a
+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
diff --git a/metadata/md5-cache/dev-java/jackson-core-2.13.0 b/metadata/md5-cache/dev-java/jackson-core-2.13.0
deleted file mode 100644
index 9dfd7898d7b4..000000000000
--- a/metadata/md5-cache/dev-java/jackson-core-2.13.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 ) test? ( dev-java/junit:4 )
-DESCRIPTION=Core Jackson processing abstractionis (Streaming API), implementation for JSON
-EAPI=8
-HOMEPAGE=https://github.com/FasterXML/jackson-core
-IUSE=doc source test
-KEYWORDS=amd64 ~arm arm64 ppc64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/FasterXML/jackson-core/archive/refs/tags/jackson-core-2.13.0.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
-_md5_=dd54c67639beb0ffe9c08ddb24d00c88
diff --git a/metadata/md5-cache/dev-java/jackson-core-2.13.2 b/metadata/md5-cache/dev-java/jackson-core-2.13.2
index 42d6c43a8a63..d0f90b54246b 100644
--- a/metadata/md5-cache/dev-java/jackson-core-2.13.2
+++ b/metadata/md5-cache/dev-java/jackson-core-2.13.2
@@ -3,12 +3,13 @@ DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zi
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 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
-_md5_=d7d3dc2a74052414aeb810228b59cb4d
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_md5_=09399f8e3be7acb6bb4f45ceefd28f43
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
new file mode 100644
index 000000000000..d1b843333366
--- /dev/null
+++ b/metadata/md5-cache/dev-java/jackson-core-2.13.2-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+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
+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
diff --git a/metadata/md5-cache/dev-java/jackson-databind-2.13.0 b/metadata/md5-cache/dev-java/jackson-databind-2.13.0
deleted file mode 100644
index 995984b41cf5..000000000000
--- a/metadata/md5-cache/dev-java/jackson-databind-2.13.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=dev-java/jackson-annotations-2.13.0:2 dev-java/jackson-core:0 >=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
-DESCRIPTION=General data-binding functionality for Jackson: works on core streaming API
-EAPI=8
-HOMEPAGE=https://github.com/FasterXML/jackson-databind
-IUSE=doc source test
-KEYWORDS=amd64 ~arm arm64 ppc64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-java/jackson-annotations-2.13.0:2 dev-java/jackson-core:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/FasterXML/jackson-databind/archive/refs/tags/jackson-databind-2.13.0.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
-_md5_=980e2bd2778e782a9b511c654e34a21e
diff --git a/metadata/md5-cache/dev-java/jackson-databind-2.13.2 b/metadata/md5-cache/dev-java/jackson-databind-2.13.2
index 80fe599dcced..88ea0e25b5e6 100644
--- a/metadata/md5-cache/dev-java/jackson-databind-2.13.2
+++ b/metadata/md5-cache/dev-java/jackson-databind-2.13.2
@@ -3,12 +3,13 @@ DEPEND=>=virtual/jdk-1.8:* ~dev-java/jackson-annotations-2.13.2:2 ~dev-java/jack
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
+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 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
-_md5_=dc6f68a8a8cde874a0ec168ac9d2af2a
+_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
new file mode 100644
index 000000000000..c2d12eb8dced
--- /dev/null
+++ b/metadata/md5-cache/dev-java/jackson-databind-2.13.2.2
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=>=virtual/jdk-11:* ~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.2.tar.gz
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_md5_=041307ad650971b72e602e0b9a879f8a
diff --git a/metadata/md5-cache/dev-java/jackson-dataformat-xml-2.13.0 b/metadata/md5-cache/dev-java/jackson-dataformat-xml-2.13.0
deleted file mode 100644
index 51904177cb79..000000000000
--- a/metadata/md5-cache/dev-java/jackson-dataformat-xml-2.13.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=dev-java/jackson-annotations-2.13.0:2 >=dev-java/jackson-core-2.13.0:0 >=dev-java/jackson-databind-2.13.0:0 >=dev-java/stax2-api-4.2.1:0 >=dev-java/woodstox-core-6.2.7:0 >=virtual/jdk-1.8:* test? ( dev-java/jackson-module-jakarta-xmlbind:0 dev-java/jaxb-api:3 dev-java/sjsxp:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
-DESCRIPTION=Data format extension for Jackson
-EAPI=8
-HOMEPAGE=https://github.com/FasterXML/jackson-dataformat-xml
-IUSE=doc source test
-KEYWORDS=amd64 ~arm arm64 ppc64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-java/jackson-annotations-2.13.0:2 >=dev-java/jackson-core-2.13.0:0 >=dev-java/jackson-databind-2.13.0:0 >=dev-java/stax2-api-4.2.1:0 >=dev-java/woodstox-core-6.2.7:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/FasterXML/jackson-dataformat-xml/archive/jackson-dataformat-xml-2.13.0.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
-_md5_=7cc1f729ea314d91abd7184b3358494d
diff --git a/metadata/md5-cache/dev-java/jackson-dataformat-xml-2.13.2 b/metadata/md5-cache/dev-java/jackson-dataformat-xml-2.13.2
index cf28f0496bbe..074e0b8ed3fa 100644
--- a/metadata/md5-cache/dev-java/jackson-dataformat-xml-2.13.2
+++ b/metadata/md5-cache/dev-java/jackson-dataformat-xml-2.13.2
@@ -3,12 +3,13 @@ DEPEND=>=virtual/jdk-1.8:* ~dev-java/jackson-annotations-2.13.2:2 ~dev-java/jack
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
+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 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
-_md5_=26a2d436fb5c36377057dd99cb125851
+_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
new file mode 100644
index 000000000000..ae8841c8f404
--- /dev/null
+++ b/metadata/md5-cache/dev-java/jackson-dataformat-xml-2.13.2-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=>=virtual/jdk-11:* ~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 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.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
diff --git a/metadata/md5-cache/dev-java/jackson-dataformat-yaml-2.13.0 b/metadata/md5-cache/dev-java/jackson-dataformat-yaml-2.13.0
deleted file mode 100644
index ce34191c0644..000000000000
--- a/metadata/md5-cache/dev-java/jackson-dataformat-yaml-2.13.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=dev-java/jackson-core:0 dev-java/jackson-databind:0 dev-java/snakeyaml:0 >=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
-DESCRIPTION=Support for reading and writing YAML-encoded data via Jackson abstractions
-EAPI=8
-HOMEPAGE=https://github.com/FasterXML/jackson-dataformats-text
-IUSE=doc source test
-KEYWORDS=amd64 ~arm arm64 ppc64 x86
-LICENSE=Apache-2.0
-RDEPEND=dev-java/jackson-core:0 dev-java/jackson-databind:0 dev-java/snakeyaml:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/FasterXML/jackson-dataformats-text/archive/refs/tags/jackson-dataformats-text-2.13.0.tar.gz -> jackson-dataformat-yaml-2.13.0.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
-_md5_=50fae41682e4cd7316581c0ee845c0e5
diff --git a/metadata/md5-cache/dev-java/jackson-dataformat-yaml-2.13.2 b/metadata/md5-cache/dev-java/jackson-dataformat-yaml-2.13.2
index a7a68d0ce74a..16902d716a68 100644
--- a/metadata/md5-cache/dev-java/jackson-dataformat-yaml-2.13.2
+++ b/metadata/md5-cache/dev-java/jackson-dataformat-yaml-2.13.2
@@ -3,12 +3,13 @@ DEPEND=>=virtual/jdk-1.8:* ~dev-java/jackson-core-2.13.2:0 ~dev-java/jackson-dat
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
+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 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
-_md5_=df4719c5df9f533e1712fd11037a8a76
+_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
new file mode 100644
index 000000000000..fc27ed987eb9
--- /dev/null
+++ b/metadata/md5-cache/dev-java/jackson-dataformat-yaml-2.13.2-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=>=virtual/jdk-11:* ~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 ) 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.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
diff --git a/metadata/md5-cache/dev-java/jackson-module-jakarta-xmlbind-2.13.0 b/metadata/md5-cache/dev-java/jackson-module-jakarta-xmlbind-2.13.0
deleted file mode 100644
index e0560ae843a9..000000000000
--- a/metadata/md5-cache/dev-java/jackson-module-jakarta-xmlbind-2.13.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=dev-java/jackson-annotations:2 dev-java/jackson-core:0 dev-java/jackson-databind:0 dev-java/jakarta-activation-api:1 dev-java/jaxb-api:3 >=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
-DESCRIPTION=Support for using Jakarta XML Bind (aka JAXB 3.0) annotations
-EAPI=8
-HOMEPAGE=https://github.com/FasterXML/jackson-modules-base
-IUSE=doc source test
-KEYWORDS=amd64 ~arm arm64 ppc64 x86
-LICENSE=Apache-2.0
-RDEPEND=dev-java/jackson-annotations:2 dev-java/jackson-core:0 dev-java/jackson-databind:0 dev-java/jakarta-activation-api:1 dev-java/jaxb-api:3 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/FasterXML/jackson-modules-base/archive/refs/tags/jackson-modules-base-2.13.0.tar.gz -> jackson-module-jakarta-xmlbind-2.13.0.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
-_md5_=757d3bb6596965e60ab025aede70d98b
diff --git a/metadata/md5-cache/dev-java/jackson-module-jakarta-xmlbind-2.13.2 b/metadata/md5-cache/dev-java/jackson-module-jakarta-xmlbind-2.13.2
index 547f0ccb304f..8ce0126d478e 100644
--- a/metadata/md5-cache/dev-java/jackson-module-jakarta-xmlbind-2.13.2
+++ b/metadata/md5-cache/dev-java/jackson-module-jakarta-xmlbind-2.13.2
@@ -3,12 +3,13 @@ DEPEND=>=virtual/jdk-1.8:* ~dev-java/jackson-annotations-2.13.2:2 ~dev-java/jack
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
+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 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
-_md5_=1abcde9a606f78f3a8d6c2af44f0888c
+_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
new file mode 100644
index 000000000000..14caedde15c5
--- /dev/null
+++ b/metadata/md5-cache/dev-java/jackson-module-jakarta-xmlbind-2.13.2-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=>=virtual/jdk-11:* ~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 ) 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.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
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 3714bd9dbc2c..fc294a48ffad 100644
--- a/metadata/md5-cache/dev-java/jacl-1.4.1-r2
+++ b/metadata/md5-cache/dev-java/jacl-1.4.1-r2
@@ -3,11 +3,12 @@ DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zi
DESCRIPTION=Jacl is an implementation of Tcl written in Java
EAPI=8
HOMEPAGE=http://tcljava.sourceforge.net
+INHERIT=java-pkg-2 java-pkg-simple
IUSE=doc doc source
KEYWORDS=amd64 ~arm arm64 ppc64 x86
LICENSE=BSD
RDEPEND=>=dev-lang/tcl-8.4.5:* >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=0
SRC_URI=mirror://sourceforge/project/tcljava/jacl/1.4.1/jacl1.4.1.tar.gz -> jacl-1.4.1.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
_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 95780e7c8dc8..079bc1074d6a 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
@@ -3,6 +3,7 @@ DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zi
DESCRIPTION=Java Advanced Imaging Image I/O Tools API core (standalone)
EAPI=7
HOMEPAGE=https://github.com/jai-imageio/jai-imageio-core
+INHERIT=java-pkg-2 java-pkg-simple
IUSE=doc source test
KEYWORDS=amd64 ~arm64 ppc64 x86
LICENSE=Sun-BSD-no-nuclear-2005
@@ -10,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 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
_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 9081ea106cd3..38d5b2fac4c4 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
@@ -3,6 +3,7 @@ DEPEND=dev-java/jai-imageio-core:0 >=virtual/jdk-1.8:* >=dev-java/java-config-2.
DESCRIPTION=JPEG2000 support for Java Advanced Imaging Image I/O Tools API
EAPI=7
HOMEPAGE=https://github.com/jai-imageio/jai-imageio-jpeg2000
+INHERIT=java-pkg-2 java-pkg-simple
IUSE=doc source test
KEYWORDS=amd64 ~arm64 ppc64 x86
LICENSE=Sun-BSD-no-nuclear-2005
@@ -10,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 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
_md5_=b3ab374e62458f2b7465a8bc15c11a2c
diff --git a/metadata/md5-cache/dev-java/jakarta-activation-1.2.2 b/metadata/md5-cache/dev-java/jakarta-activation-1.2.2-r1
index 21418cab3646..9919a14e5be9 100644
--- a/metadata/md5-cache/dev-java/jakarta-activation-1.2.2
+++ b/metadata/md5-cache/dev-java/jakarta-activation-1.2.2-r1
@@ -1,14 +1,15 @@
BDEPEND=app-arch/zip
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 )
+DEPEND=dev-java/jakarta-activation-api:1 >=virtual/jdk-11:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
DESCRIPTION=Jakarta Activation
-EAPI=7
+EAPI=8
HOMEPAGE=https://eclipse-ee4j.github.io/jaf/
+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-api:1 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=1
-SRC_URI=https://github.com/eclipse-ee4j/jaf/archive/refs/tags/1.2.2.tar.gz -> jakarta-activation-1.2.2.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
-_md5_=acfe408cd3a1ae1c1cc23d04bdb4ddc7
+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
+_md5_=b99f05dd12cac00e435ee47ecf965e4d
diff --git a/metadata/md5-cache/dev-java/jakarta-activation-2.0.1 b/metadata/md5-cache/dev-java/jakarta-activation-2.0.1
deleted file mode 100644
index 82eb3c1f8bd1..000000000000
--- a/metadata/md5-cache/dev-java/jakarta-activation-2.0.1
+++ /dev/null
@@ -1,13 +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=Jakarta Activation
-EAPI=8
-HOMEPAGE=https://github.com/eclipse-ee4j/jaf/jakarta.activation
-IUSE=doc source
-KEYWORDS=amd64 ~arm arm64 ppc64 x86
-LICENSE=EPL-1.0
-RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=2
-SRC_URI=https://github.com/eclipse-ee4j/jaf/archive/refs/tags/2.0.1.tar.gz -> jakarta-activation-2.0.1.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
-_md5_=7f0e440412a7e71b24a67d2a1355bcd1
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
new file mode 100644
index 000000000000..450ff1f8c725
--- /dev/null
+++ b/metadata/md5-cache/dev-java/jakarta-activation-2.0.1-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=>=virtual/jdk-11:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=Jakarta Activation
+EAPI=8
+HOMEPAGE=https://github.com/eclipse-ee4j/jaf
+INHERIT=java-pkg-2 java-pkg-simple
+IUSE=doc source
+KEYWORDS=amd64 ~arm arm64 ppc64 x86
+LICENSE=EPL-1.0
+RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+SLOT=2
+SRC_URI=https://github.com/eclipse-ee4j/jaf/archive/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
+_md5_=93e0c276aeccbc963839590ab4f681d9
diff --git a/metadata/md5-cache/dev-java/jakarta-activation-api-1.2.2 b/metadata/md5-cache/dev-java/jakarta-activation-api-1.2.2-r1
index 763fc521c6f7..356b8b5a87f2 100644
--- a/metadata/md5-cache/dev-java/jakarta-activation-api-1.2.2
+++ b/metadata/md5-cache/dev-java/jakarta-activation-api-1.2.2-r1
@@ -1,14 +1,15 @@
BDEPEND=app-arch/zip
DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DEPEND=>=virtual/jdk-11:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
DESCRIPTION=Jakarta Activation API jar
-EAPI=7
+EAPI=8
HOMEPAGE=https://eclipse-ee4j.github.io/jaf/
+INHERIT=java-pkg-2 java-pkg-simple
IUSE=doc source
KEYWORDS=amd64 ~arm arm64 ppc64 x86
LICENSE=EPL-1.0
RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=1
-SRC_URI=https://github.com/eclipse-ee4j/jaf/archive/refs/tags/1.2.2.tar.gz -> jakarta-activation-api-1.2.2.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
-_md5_=1ca3fc94c23d584f8a654743ebb60c80
+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
+_md5_=c34af806732c7e489f11860f6501ea3a
diff --git a/metadata/md5-cache/dev-java/jakarta-activation-api-2.1.0 b/metadata/md5-cache/dev-java/jakarta-activation-api-2.1.0-r1
index 019406e28036..6a73dd87acb6 100644
--- a/metadata/md5-cache/dev-java/jakarta-activation-api-2.1.0
+++ b/metadata/md5-cache/dev-java/jakarta-activation-api-2.1.0-r1
@@ -1,13 +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 )
+DEPEND=>=virtual/jdk-11:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
DESCRIPTION=Jakarta Activation API jar
EAPI=8
HOMEPAGE=https://eclipse-ee4j.github.io/jaf/
+INHERIT=java-pkg-2 java-pkg-simple
IUSE=doc source
KEYWORDS=amd64 ~arm arm64 ppc64 x86
LICENSE=EPL-1.0
RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=2
-SRC_URI=https://github.com/eclipse-ee4j/jaf/archive/refs/tags/2.1.0.tar.gz -> jakarta-activation-2.1.0.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
-_md5_=1999852c19527c7c6b18bf571ff77042
+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
+_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 c58c3d9cfcfc..914d49443e66 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
@@ -3,11 +3,12 @@ DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zi
DESCRIPTION=JSR 374 (JSON Processing) API
EAPI=8
HOMEPAGE=https://projects.eclipse.org/projects/ee4j.jsonp
+INHERIT=java-pkg-2 java-pkg-simple
IUSE=doc source
KEYWORDS=amd64 ~arm arm64 ppc64 x86
LICENSE=|| ( EPL-2.0 GPL-2-with-classpath-exception )
RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=1
SRC_URI=https://github.com/eclipse-ee4j/jsonp/archive/refs/tags/1.1-1.1.6-RELEASE.tar.gz -> jakarta-json-api-1.1.6.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
_md5_=6c329892ea7e59d87209e53bb82d0310
diff --git a/metadata/md5-cache/dev-java/jakarta-oro-2.0.8-r5 b/metadata/md5-cache/dev-java/jakarta-oro-2.0.8-r5
index 21de50773a33..9bc97bd5a785 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
@@ -3,11 +3,12 @@ DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zi
DESCRIPTION=A set of text-processing Java classes
EAPI=7
HOMEPAGE=https://jakarta.apache.org/oro/
+INHERIT=java-pkg-2 java-pkg-simple
IUSE=doc source examples
KEYWORDS=amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=Apache-1.1
RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=2.0
SRC_URI=https://archive.apache.org/dist/jakarta/oro/jakarta-oro-2.0.8.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
_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 ce06f371601a..d6f00ebddc5f 100644
--- a/metadata/md5-cache/dev-java/jakarta-regexp-1.3-r6
+++ b/metadata/md5-cache/dev-java/jakarta-regexp-1.3-r6
@@ -3,11 +3,12 @@ DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zi
DESCRIPTION=100% Pure Java Regular Expression package
EAPI=8
HOMEPAGE=https://jakarta.apache.org/
+INHERIT=java-pkg-2 java-pkg-simple
IUSE=doc source
KEYWORDS=amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
LICENSE=Apache-1.1
RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=1.3
SRC_URI=mirror://apache/jakarta/regexp/source/jakarta-regexp-1.3.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
_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 16ee69cb91d4..b22778e85f6f 100644
--- a/metadata/md5-cache/dev-java/jakarta-regexp-1.4-r3
+++ b/metadata/md5-cache/dev-java/jakarta-regexp-1.4-r3
@@ -3,11 +3,12 @@ DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zi
DESCRIPTION=100% Pure Java Regular Expression package
EAPI=8
HOMEPAGE=https://jakarta.apache.org/
+INHERIT=java-pkg-2 java-pkg-simple
IUSE=doc source
KEYWORDS=amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
LICENSE=Apache-1.1
RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=1.4
SRC_URI=mirror://apache/jakarta/regexp/source/jakarta-regexp-1.4.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
_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 a23a4969f471..48f6cef4ac3f 100644
--- a/metadata/md5-cache/dev-java/jakarta-regexp-1.5-r1
+++ b/metadata/md5-cache/dev-java/jakarta-regexp-1.5-r1
@@ -3,11 +3,12 @@ DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zi
DESCRIPTION=100% Pure Java Regular Expression package
EAPI=8
HOMEPAGE=https://jakarta.apache.org/
+INHERIT=java-pkg-2 java-pkg-simple
IUSE=doc source
KEYWORDS=amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
LICENSE=Apache-1.1
RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=1.5
SRC_URI=mirror://apache/jakarta/regexp/source/jakarta-regexp-1.5.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
_md5_=609d1f6ec6890acda208be367de1eb86
diff --git a/metadata/md5-cache/dev-java/jakarta-xml-soap-api-1.4.2 b/metadata/md5-cache/dev-java/jakarta-xml-soap-api-1.4.2
deleted file mode 100644
index 5fbb41f1c818..000000000000
--- a/metadata/md5-cache/dev-java/jakarta-xml-soap-api-1.4.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.8:* dev-java/jakarta-activation-api:1 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
-DESCRIPTION=SOAP with Attachments API for Java (SAAJ) API (Eclipse Project for JAX-WS)
-EAPI=8
-HOMEPAGE=https://projects.eclipse.org/projects/ee4j.jaxws
-IUSE=doc source test
-KEYWORDS=amd64 ~arm arm64 ppc64 x86
-LICENSE=BSD
-RDEPEND=>=virtual/jre-1.8:* dev-java/jakarta-activation-api:1 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=!test? ( test )
-SLOT=1
-SRC_URI=https://github.com/eclipse-ee4j/saaj-api/archive/refs/tags/1.4.2.tar.gz -> jakarta-xml-soap-api-1.4.2.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
-_md5_=8643b5ce946c9dec19663881bb60c2de
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
new file mode 100644
index 000000000000..18aa79c0a4ce
--- /dev/null
+++ b/metadata/md5-cache/dev-java/jakarta-xml-soap-api-1.4.2-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=>=virtual/jdk-11:* >=dev-java/jakarta-activation-api-1.2.2-r1:1 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
+DESCRIPTION=SOAP with Attachments API for Java (SAAJ) API (Eclipse Project for JAX-WS)
+EAPI=8
+HOMEPAGE=https://projects.eclipse.org/projects/ee4j.jaxws
+INHERIT=java-pkg-2 java-pkg-simple
+IUSE=doc source test
+KEYWORDS=amd64 ~arm arm64 ppc64 x86
+LICENSE=BSD
+RDEPEND=>=virtual/jre-1.8:* >=dev-java/jakarta-activation-api-1.2.2-r1:1 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=!test? ( test )
+SLOT=1
+SRC_URI=https://github.com/eclipse-ee4j/saaj-api/archive/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
+_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 47bf8831d559..821c541ce3bf 100644
--- a/metadata/md5-cache/dev-java/jakartaee-migration-1.0.0
+++ b/metadata/md5-cache/dev-java/jakartaee-migration-1.0.0
@@ -3,6 +3,7 @@ DEPEND=>=virtual/jdk-1.8:* dev-java/ant-core:0 dev-java/bcel:0 >=dev-java/common
DESCRIPTION=Apache Tomcat tool for migration from Java EE 8 to Jakarta EE 9
EAPI=7
HOMEPAGE=https://tomcat.apache.org
+INHERIT=java-pkg-2 java-pkg-simple
IUSE=doc source test
KEYWORDS=amd64
LICENSE=Apache-2.0
@@ -10,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 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
_md5_=4f6cec3ec86c9e19c57456e02da5f39b
diff --git a/metadata/md5-cache/dev-java/jal-20031117-r6 b/metadata/md5-cache/dev-java/jal-20031117-r6
index d070df92802b..726a49c29c56 100644
--- a/metadata/md5-cache/dev-java/jal-20031117-r6
+++ b/metadata/md5-cache/dev-java/jal-20031117-r6
@@ -3,11 +3,12 @@ DEPEND=dev-java/ant-core:0 >=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 s
DESCRIPTION=Partial port of the C++ Standard Template Library
EAPI=8
HOMEPAGE=http://vigna.dsi.unimi.it/jal
+INHERIT=java-pkg-2 java-pkg-simple
IUSE=doc source
KEYWORDS=amd64 x86
LICENSE=HPND
RDEPEND=dev-java/ant-core:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=0
SRC_URI=https://dev.gentoo.org/~monsieurp/packages/jal-20031117.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
_md5_=c8457e8bbe91555b895391aab6235604
diff --git a/metadata/md5-cache/dev-java/janino-3.1.6 b/metadata/md5-cache/dev-java/janino-3.1.6
index 417c66c28855..d697fad50aa3 100644
--- a/metadata/md5-cache/dev-java/janino-3.1.6
+++ b/metadata/md5-cache/dev-java/janino-3.1.6
@@ -3,12 +3,13 @@ DEPEND=>=virtual/jdk-1.8:* dev-java/ant-core:0 >=dev-java/java-config-2.2.0-r3 s
DESCRIPTION=An embedded compiler for run-time compilation purposes
EAPI=8
HOMEPAGE=https://janino-compiler.github.io/janino/
+INHERIT=java-pkg-2 java-pkg-simple
IUSE=doc source test
-KEYWORDS=~amd64 ~arm64 ~ppc64
+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 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
-_md5_=fd82d000c17fe8add801416380429684
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_md5_=c72ae0899fabe78f5fe26a7a8e0d28c8
diff --git a/metadata/md5-cache/dev-java/jansi-1.13 b/metadata/md5-cache/dev-java/jansi-1.13
index de890a95c122..190eb3bcebae 100644
--- a/metadata/md5-cache/dev-java/jansi-1.13
+++ b/metadata/md5-cache/dev-java/jansi-1.13
@@ -3,6 +3,7 @@ DEPEND=dev-java/jansi-native:0 test? ( dev-java/junit:4 ) >=virtual/jdk-1.8:* >=
DESCRIPTION=A library that allows you to use ANSI escape sequences in your console output
EAPI=7
HOMEPAGE=https://fusesource.github.io/jansi/
+INHERIT=java-pkg-2 java-pkg-simple
IUSE=doc source test
KEYWORDS=amd64 ~arm arm64 ppc64 x86
LICENSE=Apache-2.0
@@ -10,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 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
_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 0023f056fb6e..5c184fd53eaf 100644
--- a/metadata/md5-cache/dev-java/jansi-2.4.0-r1
+++ b/metadata/md5-cache/dev-java/jansi-2.4.0-r1
@@ -3,11 +3,12 @@ DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zi
DESCRIPTION=Jansi is a java library for generating and interpreting ANSI escape sequences.
EAPI=8
HOMEPAGE=http://fusesource.github.io/jansi
+INHERIT=java-pkg-2 java-pkg-simple toolchain-funcs
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=2
SRC_URI=https://github.com/fusesource/jansi/archive/refs/tags/jansi-2.4.0.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
_md5_=2105da837123b0bf282c3320f9f7c173
diff --git a/metadata/md5-cache/dev-java/jansi-native-1.8 b/metadata/md5-cache/dev-java/jansi-native-1.8
index 54889950026e..11178b9e4a98 100644
--- a/metadata/md5-cache/dev-java/jansi-native-1.8
+++ b/metadata/md5-cache/dev-java/jansi-native-1.8
@@ -3,11 +3,12 @@ DEPEND=dev-java/hawtjni-runtime:0 >=virtual/jdk-1.8 >=dev-java/java-config-2.2.0
DESCRIPTION=Native JNI component for dev-java/jansi
EAPI=7
HOMEPAGE=http://fusesource.github.io/jansi/
+INHERIT=vcs-snapshot java-pkg-2 java-pkg-simple
IUSE=doc source
KEYWORDS=amd64 ~arm arm64 ppc64 x86
LICENSE=Apache-2.0
RDEPEND=dev-java/hawtjni-runtime:0 >=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=0
SRC_URI=https://github.com/fusesource/jansi-native/archive/jansi-native-1.8.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae vcs-snapshot 19dc666868420457132a7514d4621476
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 vcs-snapshot 19dc666868420457132a7514d4621476
_md5_=758fbbc82194cc75be177b62685c36a1
diff --git a/metadata/md5-cache/dev-java/japitools-0.9.7-r4 b/metadata/md5-cache/dev-java/japitools-0.9.7-r4
index dbb30c0dcaae..8ce15d47d370 100644
--- a/metadata/md5-cache/dev-java/japitools-0.9.7-r4
+++ b/metadata/md5-cache/dev-java/japitools-0.9.7-r4
@@ -3,6 +3,7 @@ DEPEND=dev-java/ant-core:0 >=virtual/jdk-1.7 >=dev-java/java-config-2.2.0-r3 sou
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
@@ -10,5 +11,5 @@ RDEPEND=dev-lang/perl dev-java/ant-core:0 >=virtual/jre-1.7 >=dev-java/java-conf
RESTRICT=test
SLOT=0
SRC_URI=http://www.kaffe.org/~stuart/japi/japitools-0.9.7.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 eapi7-ver 1a0a60ad07c8b32d2faba2d085dc0f24 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 9f813bb3c47cf2e60619a663b87c5f4e estack 055c42df72f76a4f45ec92b35e83cd56 eutils dab5d8ec471d025b79c9e6906bcf3bff java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib 4a33c9008e5ee30cb8840a3fdc24df2b preserve-libs a8e50acee31b5759b4df1f7707cae54b strip-linguas ac3ee41ee2d31d8c41a77c0838320cc7 toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8 vcs-clean d271b7bc7e6a009758d7d4ef749174e3 versionator d3fb3ba33acc3bbbdc4d7970227c100d wrapper 4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 eapi7-ver 1a0a60ad07c8b32d2faba2d085dc0f24 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 9f813bb3c47cf2e60619a663b87c5f4e estack 055c42df72f76a4f45ec92b35e83cd56 eutils dab5d8ec471d025b79c9e6906bcf3bff java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 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-apicheck-0_p20150907 b/metadata/md5-cache/dev-java/java-apicheck-0_p20150907
deleted file mode 100644
index 9a98e2b4f198..000000000000
--- a/metadata/md5-cache/dev-java/java-apicheck-0_p20150907
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Command line tool to check Java packages for API compatibility
-EAPI=5
-HOMEPAGE=https://github.com/gentoo/java-apicheck/
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+
-RDEPEND=dev-java/japitools dev-java/java-config
-SLOT=0
-SRC_URI=https://github.com/gentoo/java-apicheck/archive/0_p20150907.tar.gz -> java-apicheck-0_p20150907.tar.gz
-_md5_=ec2abe84c6585f61f67841324d147a3c
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 f843617bc0aa..215799403808 100644
--- a/metadata/md5-cache/dev-java/java-config-2.3.1
+++ b/metadata/md5-cache/dev-java/java-config-2.3.1
@@ -4,13 +4,14 @@ DEPEND=test? ( sys-apps/portage[python_targets_python3_8(-)?,python_targets_pyth
DESCRIPTION=Java environment configuration query tool
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Java
+INHERIT=distutils-r1
IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-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 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=GPL-2
RDEPEND=sys-apps/baselayout-java sys-apps/portage[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
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 779bc733c68a72273cfce64602bada1d eapi8-dosym cd7d420bb5be5ee079f27239ce76b8f5 multibuild d26d81f242cb193d899a72bca423d0bd multilib 4a33c9008e5ee30cb8840a3fdc24df2b multiprocessing 61c959fc55c15c00bbb1079d6a71370b python-r1 8638751691200e941f26fe0ac3aef1d1 python-utils-r1 59dddabd6a41ab69723654916142f63b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=de36897f44274d07eb58415aed512517
+_eclasses_=distutils-r1 3b871cf4724e3abc9b4ff059289f0d45 eapi8-dosym cd7d420bb5be5ee079f27239ce76b8f5 multibuild d26d81f242cb193d899a72bca423d0bd multilib 4a33c9008e5ee30cb8840a3fdc24df2b multiprocessing b4e253ab22cef7b1085e9b67c7a3b730 python-r1 8638751691200e941f26fe0ac3aef1d1 python-utils-r1 5dc84801daa87406aafaf535cb947a64 toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_md5_=78442f5721d6e54a0616613fca8d9fe4
diff --git a/metadata/md5-cache/dev-java/java-config-9999 b/metadata/md5-cache/dev-java/java-config-9999
index 4f50213988da..4bc66c30a801 100644
--- a/metadata/md5-cache/dev-java/java-config-9999
+++ b/metadata/md5-cache/dev-java/java-config-9999
@@ -4,6 +4,7 @@ DEPEND=test? ( sys-apps/portage[python_targets_python3_8(-)?,python_targets_pyth
DESCRIPTION=Java environment configuration query tool
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Java
+INHERIT=distutils-r1 git-r3
IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
LICENSE=GPL-2
PROPERTIES=live
@@ -11,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 779bc733c68a72273cfce64602bada1d eapi8-dosym cd7d420bb5be5ee079f27239ce76b8f5 git-r3 b9ac6f96d2a88edb5b351df634dc5e53 multibuild d26d81f242cb193d899a72bca423d0bd multilib 4a33c9008e5ee30cb8840a3fdc24df2b multiprocessing 61c959fc55c15c00bbb1079d6a71370b python-r1 8638751691200e941f26fe0ac3aef1d1 python-utils-r1 59dddabd6a41ab69723654916142f63b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=693418d0d3741cb4a5cd4e3af0c754db
+_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
+_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 a451f65ecaf8..cbe9a2f55c08 100644
--- a/metadata/md5-cache/dev-java/java-dep-check-0.5
+++ b/metadata/md5-cache/dev-java/java-dep-check-0.5
@@ -3,9 +3,10 @@ DEPEND=>=virtual/jdk-1.8:* dev-java/commons-cli:1 dev-java/asm:4 >=dev-java/java
DESCRIPTION=Java Dependency checker
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Java
+INHERIT=java-pkg-2 java-pkg-simple
KEYWORDS=amd64 x86
LICENSE=GPL-2
RDEPEND=>=virtual/jre-1.8:* dev-java/commons-cli:1 dev-java/asm:4 >=dev-java/java-config-2.2.0-r3
SLOT=0
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
_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 12a08f3e02d7..72e04319fc48 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
@@ -4,11 +4,12 @@ DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zi
DESCRIPTION=Library for computing diffs, applying patches, generationg side-by-side view
EAPI=7
HOMEPAGE=http://code.google.com/p/java-diff-utils/
+INHERIT=java-pkg-2 java-pkg-simple
IUSE=doc source
KEYWORDS=amd64 ~arm64 ppc64 x86
LICENSE=Apache-2.0
RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=0
SRC_URI=https://repo1.maven.org/maven2/com/googlecode/java-diff-utils/diffutils/1.3.0/diffutils-1.3.0-sources.jar -> java-diff-utils-1.3.0-sources.jar
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
_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 0a4063483928..70434b3a2a86 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
@@ -3,11 +3,12 @@ DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zi
DESCRIPTION=Java command line option parser
EAPI=7
HOMEPAGE=https://www.urbanophile.com/arenn/hacking/download.html
+INHERIT=java-pkg-2 java-ant-2
IUSE=doc source
KEYWORDS=amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris
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 92b5a4d196abffe2dbe3bdc1cf4ef2ae multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
_md5_=243688f4d6836bad80c47beebe1f6f2f
diff --git a/metadata/md5-cache/dev-java/java-service-wrapper-3.5.25-r2 b/metadata/md5-cache/dev-java/java-service-wrapper-3.5.25-r2
index d42c7505975c..d1d28463fe6c 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
@@ -3,6 +3,7 @@ DEPEND=virtual/jdk:1.8 test? ( dev-java/ant-junit:0 ) >=dev-java/java-config-2.2
DESCRIPTION=A wrapper that makes it possible to install a Java Application as daemon
EAPI=7
HOMEPAGE=http://wrapper.tanukisoftware.org/
+INHERIT=java-pkg-2 java-ant-2 toolchain-funcs
IUSE=doc source test
KEYWORDS=amd64 ~arm x86
LICENSE=tanuki-community
@@ -10,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 92b5a4d196abffe2dbe3bdc1cf4ef2ae multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
_md5_=d0aeb80cc4cce8db41bbe12cbbc97a9b
diff --git a/metadata/md5-cache/dev-java/javacc-5.0-r4 b/metadata/md5-cache/dev-java/javacc-5.0-r4
index f075a9bea4d4..cc7a51d90a1b 100644
--- a/metadata/md5-cache/dev-java/javacc-5.0-r4
+++ b/metadata/md5-cache/dev-java/javacc-5.0-r4
@@ -3,6 +3,7 @@ DEPEND=dev-java/junit:0 >=virtual/jdk-1.8:* test? ( dev-java/ant-junit:0 ) >=dev
DESCRIPTION=Java Compiler Compiler - The Java Parser Generator
EAPI=8
HOMEPAGE=https://javacc.java.net/
+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
LICENSE=BSD
@@ -10,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 92b5a4d196abffe2dbe3bdc1cf4ef2ae multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
_md5_=264abd75d63f97cc128ab86ab0d73c6c
diff --git a/metadata/md5-cache/dev-java/javacup-0.11b_p20151001-r1 b/metadata/md5-cache/dev-java/javacup-0.11b_p20151001-r1
index 4b8012546015..4bb4c3389e3e 100644
--- a/metadata/md5-cache/dev-java/javacup-0.11b_p20151001-r1
+++ b/metadata/md5-cache/dev-java/javacup-0.11b_p20151001-r1
@@ -3,11 +3,12 @@ DEPEND=dev-java/ant-core:0 dev-java/jflex:0 >=virtual/jdk-1.8:* >=dev-java/java-
DESCRIPTION=CUP Parser Generator for Java
EAPI=7
HOMEPAGE=http://www2.cs.tum.edu/projects/cup/
+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=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 92b5a4d196abffe2dbe3bdc1cf4ef2ae multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
_md5_=d84a4f7636f2081fa5935784e0ab9f54
diff --git a/metadata/md5-cache/dev-java/javahelp-2.0.05_p20170719 b/metadata/md5-cache/dev-java/javahelp-2.0.05_p20170719
index b8202bbdf1ef..ff060694a2b6 100644
--- a/metadata/md5-cache/dev-java/javahelp-2.0.05_p20170719
+++ b/metadata/md5-cache/dev-java/javahelp-2.0.05_p20170719
@@ -3,11 +3,12 @@ DEPEND=virtual/jdk:1.8 java-virtuals/servlet-api:2.4 >=dev-java/java-config-2.2.
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 92b5a4d196abffe2dbe3bdc1cf4ef2ae ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib 4a33c9008e5ee30cb8840a3fdc24df2b preserve-libs a8e50acee31b5759b4df1f7707cae54b strip-linguas ac3ee41ee2d31d8c41a77c0838320cc7 toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8 vcs-clean d271b7bc7e6a009758d7d4ef749174e3 versionator d3fb3ba33acc3bbbdc4d7970227c100d wrapper 4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 eapi7-ver 1a0a60ad07c8b32d2faba2d085dc0f24 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 9f813bb3c47cf2e60619a663b87c5f4e estack 055c42df72f76a4f45ec92b35e83cd56 eutils dab5d8ec471d025b79c9e6906bcf3bff java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 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
new file mode 100644
index 000000000000..c3e64a097e61
--- /dev/null
+++ b/metadata/md5-cache/dev-java/javahelp-2.0.05_p20170719-r1
@@ -0,0 +1,14 @@
+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=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
+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
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 34521cfae88b..48bac317f91f 100644
--- a/metadata/md5-cache/dev-java/javassist-3.18.2-r1
+++ b/metadata/md5-cache/dev-java/javassist-3.18.2-r1
@@ -4,11 +4,12 @@ DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zi
DESCRIPTION=Javassist makes Java bytecode manipulation simple
EAPI=7
HOMEPAGE=http://www.csg.is.titech.ac.jp/~chiba/javassist/
+INHERIT=java-pkg-2 java-ant-2
IUSE=doc source examples
KEYWORDS=amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux
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 92b5a4d196abffe2dbe3bdc1cf4ef2ae multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
_md5_=d7ce84a722c49ab46f6496ba55de58ff
diff --git a/metadata/md5-cache/dev-java/javatoolkit-0.6.7 b/metadata/md5-cache/dev-java/javatoolkit-0.6.7
index 4ba49d27bfe1..ceb8a8cbaab7 100644
--- a/metadata/md5-cache/dev-java/javatoolkit-0.6.7
+++ b/metadata/md5-cache/dev-java/javatoolkit-0.6.7
@@ -3,6 +3,7 @@ DEFINED_PHASES=compile configure install prepare test
DESCRIPTION=Collection of Gentoo-specific tools for Java
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Java
+INHERIT=distutils-r1 prefix
IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
KEYWORDS=amd64 ~arm arm64 ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=GPL-2
@@ -10,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 779bc733c68a72273cfce64602bada1d eapi8-dosym cd7d420bb5be5ee079f27239ce76b8f5 multibuild d26d81f242cb193d899a72bca423d0bd multilib 4a33c9008e5ee30cb8840a3fdc24df2b multiprocessing 61c959fc55c15c00bbb1079d6a71370b prefix eab3c99d77fe00506c109c8a736186f7 python-r1 8638751691200e941f26fe0ac3aef1d1 python-utils-r1 59dddabd6a41ab69723654916142f63b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_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
_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 3b7ac3990d55..d03abcaf016d 100644
--- a/metadata/md5-cache/dev-java/javax-inject-1-r4
+++ b/metadata/md5-cache/dev-java/javax-inject-1-r4
@@ -3,11 +3,12 @@ DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zi
DESCRIPTION=Dependency injection for Java (JSR-330)
EAPI=8
HOMEPAGE=https://github.com/javax-inject/javax-inject
+INHERIT=java-pkg-2 java-pkg-simple
IUSE=doc source
KEYWORDS=amd64 ~arm arm64 ppc64 x86 ~amd64-linux
LICENSE=Apache-2.0
RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=0
SRC_URI=http://central.maven.org/maven2/javax/inject/javax.inject/1/javax.inject-1-sources.jar -> javax-inject-1.jar
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
-_md5_=65390d955ab9d7d019e9ca0305497eb4
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_md5_=d3143b886eb166ae748f79f144ce16dd
diff --git a/metadata/md5-cache/dev-java/javax-mail-1.6.7 b/metadata/md5-cache/dev-java/javax-mail-1.6.7-r1
index 0205326bd6cd..d4af67d46a8d 100644
--- a/metadata/md5-cache/dev-java/javax-mail-1.6.7
+++ b/metadata/md5-cache/dev-java/javax-mail-1.6.7-r1
@@ -1,8 +1,9 @@
DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.8:* >=dev-java/jakarta-activation-1.2.2:1 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
+DEPEND=>=virtual/jdk-11:* >=dev-java/jakarta-activation-1.2.2:1 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
DESCRIPTION=Jakarta Mail API
EAPI=8
HOMEPAGE=https://eclipse-ee4j.github.io/mail/
+INHERIT=java-pkg-2 java-pkg-simple
IUSE=doc source test
KEYWORDS=amd64 ~arm arm64 ppc64 x86
LICENSE=EPL-1.0 EPL-2.0 GPL-2-with-classpath-exception
@@ -10,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 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
-_md5_=20ad40d9565ec43093111b31e7af7429
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_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
index 1370c93aef43..c8f80f724cb2 100644
--- a/metadata/md5-cache/dev-java/jaxb-api-2.3.3
+++ b/metadata/md5-cache/dev-java/jaxb-api-2.3.3
@@ -3,6 +3,7 @@ DEPEND=dev-java/jakarta-activation-api:1 >=virtual/jdk-1.8:* >=dev-java/java-con
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
@@ -10,5 +11,5 @@ RDEPEND=dev-java/jakarta-activation-api:1 >=virtual/jre-1.8:* >=dev-java/java-co
RESTRICT=!test? ( test )
SLOT=2
SRC_URI=https://github.com/eclipse-ee4j/jaxb-api/archive/refs/tags/2.3.3.tar.gz -> jaxb-api-2.3.3.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_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
new file mode 100644
index 000000000000..bac9c74052ab
--- /dev/null
+++ b/metadata/md5-cache/dev-java/jaxb-api-2.3.3-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=dev-java/jakarta-activation-api:1 >=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-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
diff --git a/metadata/md5-cache/dev-java/jaxb-api-3.0.1 b/metadata/md5-cache/dev-java/jaxb-api-3.0.1
index 9b4599e4d062..58970286abe7 100644
--- a/metadata/md5-cache/dev-java/jaxb-api-3.0.1
+++ b/metadata/md5-cache/dev-java/jaxb-api-3.0.1
@@ -3,11 +3,12 @@ DEPEND=dev-java/jakarta-activation:2 >=virtual/jdk-1.8:* >=dev-java/java-config-
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 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_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
new file mode 100644
index 000000000000..f61119a5669e
--- /dev/null
+++ b/metadata/md5-cache/dev-java/jaxb-api-3.0.1-r1
@@ -0,0 +1,14 @@
+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
+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/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
diff --git a/metadata/md5-cache/dev-java/jaxen-1.1.6-r2 b/metadata/md5-cache/dev-java/jaxen-1.1.6-r2
deleted file mode 100644
index 23707defc864..000000000000
--- a/metadata/md5-cache/dev-java/jaxen-1.1.6-r2
+++ /dev/null
@@ -1,13 +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 XPath Engine
-EAPI=7
-HOMEPAGE=https://github.com/codehaus
-IUSE=doc source
-KEYWORDS=amd64 ~arm arm64 ppc64 x86
-LICENSE=JDOM
-RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=1.1
-SRC_URI=https://repo1.maven.org/maven2/jaxen/jaxen/1.1.6/jaxen-1.1.6-sources.jar -> jaxen-1.1.6.jar
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
-_md5_=57d9894267cb7ae7b25eb008838fda23
diff --git a/metadata/md5-cache/dev-java/jaxen-1.2.0-r1 b/metadata/md5-cache/dev-java/jaxen-1.2.0-r1
index 87bd46daf7a5..33c4164f7e7b 100644
--- a/metadata/md5-cache/dev-java/jaxen-1.2.0-r1
+++ b/metadata/md5-cache/dev-java/jaxen-1.2.0-r1
@@ -3,6 +3,7 @@ DEPEND=dom4j? ( dev-java/dom4j:1 ) jdom? ( dev-java/jdom:0 ) xom? ( dev-java/xom
DESCRIPTION=Jaxen is a universal XPath engine for Java
EAPI=7
HOMEPAGE=http://www.cafeconleche.org/jaxen/
+INHERIT=java-pkg-2 java-pkg-simple
IUSE=dom4j jdom xom doc source test
KEYWORDS=amd64 ~arm arm64 ppc64 x86
LICENSE=BSD-2
@@ -11,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 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
_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 6d71d17bc064..4adbf28b7bdc 100644
--- a/metadata/md5-cache/dev-java/jbig2-imageio-3.0.3
+++ b/metadata/md5-cache/dev-java/jbig2-imageio-3.0.3
@@ -4,6 +4,7 @@ DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zi
DESCRIPTION=PDFBox JBIG2 ImageIO plugin
EAPI=7
HOMEPAGE=https://pdfbox.apache.org
+INHERIT=java-pkg-2 java-pkg-simple
IUSE=doc source test
KEYWORDS=amd64 ~arm64 ppc64 x86
LICENSE=Apache-2.0
@@ -11,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 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
_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 f28682c95766..d77dd94c6b32 100644
--- a/metadata/md5-cache/dev-java/jbitcollider-core-0.8-r1
+++ b/metadata/md5-cache/dev-java/jbitcollider-core-0.8-r1
@@ -4,11 +4,12 @@ DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zi
DESCRIPTION=Core classes of jBitcollider: org.bitpedia.collider.core
EAPI=7
HOMEPAGE=http://bitcollider.sourceforge.net/
+INHERIT=java-pkg-2 java-pkg-simple
IUSE=doc source
KEYWORDS=amd64 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 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
_md5_=9528d6aa625292071820e4d473eceb20
diff --git a/metadata/md5-cache/dev-java/jboss-jms-api-1.0.1 b/metadata/md5-cache/dev-java/jboss-jms-api-1.0.1
index ad1faf131ad0..81591051f519 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
@@ -3,11 +3,12 @@ DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zi
DESCRIPTION=JSR-000914: Java(TM) Message Service (JMS) 1.1 API
EAPI=8
HOMEPAGE=https://github.com/jboss/jboss-jms-api_spec
+INHERIT=java-pkg-2 java-pkg-simple
IUSE=doc source
KEYWORDS=amd64 ~arm arm64 ppc64 x86
LICENSE=CDDL GPL-2-with-classpath-exception
RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=1.1
SRC_URI=https://github.com/jboss/jboss-jms-api_spec/archive/jboss-jms-api_1.1_spec-1.0.1.Final.tar.gz -> jboss-jms-api-1.0.1.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
_md5_=5d60f8328a4acde2dd87178749caf147
diff --git a/metadata/md5-cache/dev-java/jboss-marshalling-1.3.0-r2 b/metadata/md5-cache/dev-java/jboss-marshalling-1.3.0-r2
index 575f272f9045..89df3f9da7a3 100644
--- a/metadata/md5-cache/dev-java/jboss-marshalling-1.3.0-r2
+++ b/metadata/md5-cache/dev-java/jboss-marshalling-1.3.0-r2
@@ -3,11 +3,12 @@ DEPEND=dev-java/jboss-modules:0 >=virtual/jdk-1.7 >=dev-java/java-config-2.2.0-r
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 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib 4a33c9008e5ee30cb8840a3fdc24df2b preserve-libs a8e50acee31b5759b4df1f7707cae54b strip-linguas ac3ee41ee2d31d8c41a77c0838320cc7 toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8 vcs-clean d271b7bc7e6a009758d7d4ef749174e3 versionator d3fb3ba33acc3bbbdc4d7970227c100d wrapper 4a1902f969e5718126434fc35f3a0d9c
+_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-marshalling-river-1.3.0 b/metadata/md5-cache/dev-java/jboss-marshalling-river-1.3.0
deleted file mode 100644
index 4a490bbb9104..000000000000
--- a/metadata/md5-cache/dev-java/jboss-marshalling-river-1.3.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=~dev-java/jboss-marshalling-1.3.0:0 >=virtual/jdk-1.7 app-arch/unzip >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=River protocol implementation for JBoss Marshalling
-EAPI=5
-HOMEPAGE=https://jbossmarshalling.jboss.org/
-IUSE=doc source
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=~dev-java/jboss-marshalling-1.3.0:0 >=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://download.jboss.org/jbossmarshalling/jboss-marshalling-river-1.3.0.CR9-sources.jar
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 eapi7-ver 1a0a60ad07c8b32d2faba2d085dc0f24 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 9f813bb3c47cf2e60619a663b87c5f4e estack 055c42df72f76a4f45ec92b35e83cd56 eutils dab5d8ec471d025b79c9e6906bcf3bff java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib 4a33c9008e5ee30cb8840a3fdc24df2b preserve-libs a8e50acee31b5759b4df1f7707cae54b strip-linguas ac3ee41ee2d31d8c41a77c0838320cc7 toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8 vcs-clean d271b7bc7e6a009758d7d4ef749174e3 versionator d3fb3ba33acc3bbbdc4d7970227c100d wrapper 4a1902f969e5718126434fc35f3a0d9c
-_md5_=07ace6e1c91f5d4860d5fc9f52bc43c8
diff --git a/metadata/md5-cache/dev-java/jboss-marshalling-serial-1.3.0 b/metadata/md5-cache/dev-java/jboss-marshalling-serial-1.3.0
deleted file mode 100644
index 367c84218464..000000000000
--- a/metadata/md5-cache/dev-java/jboss-marshalling-serial-1.3.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=~dev-java/jboss-marshalling-1.3.0:0 >=virtual/jdk-1.7 app-arch/unzip >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Serial protocol implementation for JBoss Marshalling
-EAPI=5
-HOMEPAGE=https://jbossmarshalling.jboss.org/
-IUSE=doc source
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=~dev-java/jboss-marshalling-1.3.0:0 >=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://download.jboss.org/jbossmarshalling/jboss-marshalling-serial-1.3.0.CR9-sources.jar
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 eapi7-ver 1a0a60ad07c8b32d2faba2d085dc0f24 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 9f813bb3c47cf2e60619a663b87c5f4e estack 055c42df72f76a4f45ec92b35e83cd56 eutils dab5d8ec471d025b79c9e6906bcf3bff java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib 4a33c9008e5ee30cb8840a3fdc24df2b preserve-libs a8e50acee31b5759b4df1f7707cae54b strip-linguas ac3ee41ee2d31d8c41a77c0838320cc7 toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8 vcs-clean d271b7bc7e6a009758d7d4ef749174e3 versionator d3fb3ba33acc3bbbdc4d7970227c100d wrapper 4a1902f969e5718126434fc35f3a0d9c
-_md5_=0574fb7d6eb3073d5939fd8c43d40db8
diff --git a/metadata/md5-cache/dev-java/jboss-modules-1.3.3-r1 b/metadata/md5-cache/dev-java/jboss-modules-1.3.3-r1
index dc16346796f1..0edec144a0c0 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
@@ -3,11 +3,12 @@ DEPEND=virtual/jdk:1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
DESCRIPTION=JBoss modular classloading system
EAPI=7
HOMEPAGE=https://www.jboss.org/
+INHERIT=java-pkg-2 java-pkg-simple
IUSE=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=https://github.com/jboss-modules/jboss-modules/archive/1.3.3.Final.tar.gz -> jboss-modules-1.3.3.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
_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 87be89bd837b..cff47ea88937 100644
--- a/metadata/md5-cache/dev-java/jcalendar-1.4-r1
+++ b/metadata/md5-cache/dev-java/jcalendar-1.4-r1
@@ -4,6 +4,7 @@ DEPEND=dev-java/jgoodies-looks:2.6 >=virtual/jdk-1.8:* >=dev-java/java-config-2.
DESCRIPTION=Java date chooser bean for graphically picking a date
EAPI=8
HOMEPAGE=https://www.toedter.com/en/jcalendar/
+INHERIT=java-pkg-2 java-ant-2
IUSE=doc source
KEYWORDS=amd64 x86
LICENSE=LGPL-2.1
@@ -11,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 92b5a4d196abffe2dbe3bdc1cf4ef2ae multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
_md5_=cea34c9f66e014bc4174572339efe672
diff --git a/metadata/md5-cache/dev-java/jchart2d-3.2.2-r1 b/metadata/md5-cache/dev-java/jchart2d-3.2.2-r1
index a5e448624084..c042ec84d387 100644
--- a/metadata/md5-cache/dev-java/jchart2d-3.2.2-r1
+++ b/metadata/md5-cache/dev-java/jchart2d-3.2.2-r1
@@ -4,11 +4,12 @@ DEPEND=>=virtual/jdk-1.8:* dev-java/jide-oss:0 dev-java/xmlgraphics-commons:2 >=
DESCRIPTION=A minimalistic realtime charting library for Java
EAPI=8
HOMEPAGE=http://jchart2d.sourceforge.net
+INHERIT=java-pkg-2 java-pkg-simple
IUSE=doc source
KEYWORDS=~amd64 ~x86
LICENSE=LGPL-2.1+
RDEPEND=>=virtual/jre-1.8:* dev-java/jide-oss:0 dev-java/xmlgraphics-commons:2 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=0
SRC_URI=mirror://sourceforge/project/jchart2d/jchart2d/sources/jchart2d-eclipse-project-3.2.2.zip
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
_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 20b55427d01a..0a46f7d5d1ee 100644
--- a/metadata/md5-cache/dev-java/jcifs-1.3.19-r1
+++ b/metadata/md5-cache/dev-java/jcifs-1.3.19-r1
@@ -3,11 +3,12 @@ DEPEND=java-virtuals/servlet-api:3.0 >=virtual/jdk-1.8:* >=dev-java/java-config-
DESCRIPTION=Library that implements the CIFS/SMB networking protocol in Java
EAPI=8
HOMEPAGE=https://jcifs.samba.org/
+INHERIT=java-pkg-2 java-pkg-simple
IUSE=doc examples source
KEYWORDS=amd64 ppc64 x86
LICENSE=LGPL-2.1
RDEPEND=java-virtuals/servlet-api:3.0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=1.1
SRC_URI=https://jcifs.samba.org/src/jcifs-1.3.19.tgz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
_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 911817ca2185..2cb03d0f4dde 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
@@ -3,11 +3,12 @@ DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zi
DESCRIPTION=Clean room implementation of the JCIP Annotations
EAPI=7
HOMEPAGE=https://github.com/stephenc/jcip-annotations
+INHERIT=java-pkg-2 java-pkg-simple
IUSE=doc source
KEYWORDS=~amd64 ~x86
LICENSE=Apache-2.0
RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=0
SRC_URI=https://github.com/stephenc/jcip-annotations/archive/jcip-annotations-1.0-1.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
_md5_=2102558eeb9f6633f492229e3b75c6f1
diff --git a/metadata/md5-cache/dev-java/jclasslib-3.1 b/metadata/md5-cache/dev-java/jclasslib-3.1
deleted file mode 100644
index 9f8ae0301d7c..000000000000
--- a/metadata/md5-cache/dev-java/jclasslib-3.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
-DESCRIPTION=Java bytecode viewer
-EAPI=6
-HOMEPAGE=https://github.com/ingokegel/jclasslib
-IUSE=doc source
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=GPL-2
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://github.com/ingokegel/jclasslib/archive/3.1.tar.gz -> jclasslib-3.1.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 eapi7-ver 1a0a60ad07c8b32d2faba2d085dc0f24 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 9f813bb3c47cf2e60619a663b87c5f4e estack 055c42df72f76a4f45ec92b35e83cd56 eutils dab5d8ec471d025b79c9e6906bcf3bff java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib 4a33c9008e5ee30cb8840a3fdc24df2b preserve-libs a8e50acee31b5759b4df1f7707cae54b strip-linguas ac3ee41ee2d31d8c41a77c0838320cc7 toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8 vcs-clean d271b7bc7e6a009758d7d4ef749174e3 versionator d3fb3ba33acc3bbbdc4d7970227c100d wrapper 4a1902f969e5718126434fc35f3a0d9c
-_md5_=9c0671bb61bc02e0f2416bb1564c37e2
diff --git a/metadata/md5-cache/dev-java/jclasslib-3.1-r1 b/metadata/md5-cache/dev-java/jclasslib-3.1-r1
index ba81c899208a..6a42f02618e7 100644
--- a/metadata/md5-cache/dev-java/jclasslib-3.1-r1
+++ b/metadata/md5-cache/dev-java/jclasslib-3.1-r1
@@ -3,11 +3,12 @@ DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zi
DESCRIPTION=Java bytecode viewer
EAPI=8
HOMEPAGE=https://github.com/ingokegel/jclasslib
+INHERIT=java-pkg-2 java-ant-2
IUSE=doc source
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
LICENSE=GPL-2
RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=0
SRC_URI=https://github.com/ingokegel/jclasslib/archive/3.1.tar.gz -> jclasslib-3.1.tar.gz
-_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=fa24853d432a3dec99eec1f8d4063df2
+_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_md5_=e8fc11b9dda2ea2bc79f400b074596a3
diff --git a/metadata/md5-cache/dev-java/jcommander-1.48-r1 b/metadata/md5-cache/dev-java/jcommander-1.48-r1
index 7a91cb7c9644..8f25f77f9629 100644
--- a/metadata/md5-cache/dev-java/jcommander-1.48-r1
+++ b/metadata/md5-cache/dev-java/jcommander-1.48-r1
@@ -3,6 +3,7 @@ DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zi
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
@@ -10,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/cbeust/jcommander/archive/jcommander-1.48.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_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
new file mode 100644
index 000000000000..3efb8a1cb474
--- /dev/null
+++ b/metadata/md5-cache/dev-java/jcommander-1.82
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=>=virtual/jdk-1.8:* test? ( dev-java/jackson-annotations:2 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/testng:0 )
+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 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/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
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 7773309f9897..762b5aa48c37 100644
--- a/metadata/md5-cache/dev-java/jctools-core-2.0.2
+++ b/metadata/md5-cache/dev-java/jctools-core-2.0.2
@@ -3,6 +3,7 @@ DEPEND=>=virtual/jdk-1.8:* test? ( dev-java/hamcrest-library:1.3 ) >=dev-java/ja
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
@@ -10,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 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
_md5_=c7a5338e2727cef828458d6f2a6f0f9a
diff --git a/metadata/md5-cache/dev-java/jdbc-mssqlserver-6.2.2 b/metadata/md5-cache/dev-java/jdbc-mssqlserver-6.2.2
index 0b433226571a..55c72239a33b 100644
--- a/metadata/md5-cache/dev-java/jdbc-mssqlserver-6.2.2
+++ b/metadata/md5-cache/dev-java/jdbc-mssqlserver-6.2.2
@@ -3,10 +3,11 @@ 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 92b5a4d196abffe2dbe3bdc1cf4ef2ae ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib 4a33c9008e5ee30cb8840a3fdc24df2b preserve-libs a8e50acee31b5759b4df1f7707cae54b strip-linguas ac3ee41ee2d31d8c41a77c0838320cc7 toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8 vcs-clean d271b7bc7e6a009758d7d4ef749174e3 versionator d3fb3ba33acc3bbbdc4d7970227c100d wrapper 4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 eapi7-ver 1a0a60ad07c8b32d2faba2d085dc0f24 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 9f813bb3c47cf2e60619a663b87c5f4e estack 055c42df72f76a4f45ec92b35e83cd56 eutils dab5d8ec471d025b79c9e6906bcf3bff java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 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 977dfae458fc..648699b51f94 100644
--- a/metadata/md5-cache/dev-java/jdbc-mysql-8.0.26
+++ b/metadata/md5-cache/dev-java/jdbc-mysql-8.0.26
@@ -4,11 +4,12 @@ DEPEND=dev-java/c3p0:0 dev-java/protobuf-java:0 dev-java/slf4j-api:0 >=virtual/j
DESCRIPTION=JDBC Type 4 driver for MySQL
EAPI=7
HOMEPAGE=https://dev.mysql.com/doc/connector-j/en/
+INHERIT=java-pkg-2 java-pkg-simple
IUSE=doc source
KEYWORDS=amd64 ppc64 x86
LICENSE=GPL-2-with-MySQL-FLOSS-exception
RDEPEND=dev-java/c3p0:0 dev-java/protobuf-java:0 dev-java/slf4j-api:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=0
SRC_URI=https://repo1.maven.org/maven2/mysql/mysql-connector-java/8.0.26/mysql-connector-java-8.0.26-sources.jar -> jdbc-mysql-8.0.26-sources.jar
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
_md5_=e77b7ef9974dc977efe71afc9322d6fb
diff --git a/metadata/md5-cache/dev-java/jdbc-postgresql-9.4_p1206-r1 b/metadata/md5-cache/dev-java/jdbc-postgresql-9.4_p1206-r1
index 2809235db7f8..c12d9f4f7422 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
@@ -3,6 +3,7 @@ DEPEND=virtual/jdk:1.8 doc? ( dev-libs/libxslt app-text/docbook-xsl-stylesheets
DESCRIPTION=JDBC Driver for PostgreSQL
EAPI=7
HOMEPAGE=https://jdbc.postgresql.org/
+INHERIT=java-pkg-2 java-ant-2
IUSE=test doc source
KEYWORDS=amd64 ppc64 x86
LICENSE=POSTGRESQL
@@ -10,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 92b5a4d196abffe2dbe3bdc1cf4ef2ae multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
_md5_=6f4b6dc80f28d8073c0562723c667463
diff --git a/metadata/md5-cache/dev-java/jdepend-2.10 b/metadata/md5-cache/dev-java/jdepend-2.10
index 92b0e14e082a..16eccb8c762d 100644
--- a/metadata/md5-cache/dev-java/jdepend-2.10
+++ b/metadata/md5-cache/dev-java/jdepend-2.10
@@ -3,11 +3,12 @@ DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zi
DESCRIPTION=Traverses Java class file directories and generates design quality metrics
EAPI=8
HOMEPAGE=https://github.com/clarkware/jdepend
+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=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 92b5a4d196abffe2dbe3bdc1cf4ef2ae multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
_md5_=c37d437ac9e15bc146c5c4121ee25b7f
diff --git a/metadata/md5-cache/dev-java/jdom-1.1.3-r1 b/metadata/md5-cache/dev-java/jdom-1.1.3-r1
index bf3e9d1feb9e..1c57a2922f74 100644
--- a/metadata/md5-cache/dev-java/jdom-1.1.3-r1
+++ b/metadata/md5-cache/dev-java/jdom-1.1.3-r1
@@ -3,11 +3,12 @@ DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zi
DESCRIPTION=Java API to manipulate XML data
EAPI=7
HOMEPAGE=http://www.jdom.org
+INHERIT=java-pkg-2 java-ant-2
IUSE=doc examples source
KEYWORDS=amd64 ~arm arm64 ppc64 x86
LICENSE=JDOM
RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=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 92b5a4d196abffe2dbe3bdc1cf4ef2ae multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
_md5_=15279c6eb7b16492a9dae6bc7ef27c76
diff --git a/metadata/md5-cache/dev-java/jdom-2.0.6-r5 b/metadata/md5-cache/dev-java/jdom-2.0.6-r5
index d90f5640a25c..249733d3f573 100644
--- a/metadata/md5-cache/dev-java/jdom-2.0.6-r5
+++ b/metadata/md5-cache/dev-java/jdom-2.0.6-r5
@@ -3,6 +3,7 @@ DEPEND=dev-java/iso-relax:0 dev-java/jaxen:1.2 dev-java/xalan:0 >=virtual/jdk-1.
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
@@ -10,5 +11,5 @@ RDEPEND=dev-java/iso-relax:0 dev-java/jaxen:1.2 dev-java/xalan:0 >=virtual/jre-1
RESTRICT=!test? ( test )
SLOT=2
SRC_URI=https://github.com/hunterhacker/jdom/archive/JDOM-2.0.6.tar.gz
-_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_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/jempbox-1.7.1-r1 b/metadata/md5-cache/dev-java/jempbox-1.7.1-r1
index d173b7a24c54..de6ec401eb25 100644
--- a/metadata/md5-cache/dev-java/jempbox-1.7.1-r1
+++ b/metadata/md5-cache/dev-java/jempbox-1.7.1-r1
@@ -3,6 +3,7 @@ DEPEND=>=virtual/jdk-1.8 app-arch/unzip test? ( dev-java/ant-junit:0 ) >=dev-jav
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
@@ -10,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
RESTRICT=!test? ( test )
SLOT=1.7
SRC_URI=mirror://apache/pdfbox/1.7.1/pdfbox-1.7.1-src.zip
-_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_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 f530b11c807d..a1598856d16a 100644
--- a/metadata/md5-cache/dev-java/jeromq-0.5.2
+++ b/metadata/md5-cache/dev-java/jeromq-0.5.2
@@ -3,6 +3,7 @@ DEPEND=dev-java/jnacl:0 >=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 sour
DESCRIPTION=Pure Java implementation of libzmq
EAPI=8
HOMEPAGE=https://github.com/zeromq/jeromq
+INHERIT=java-pkg-2 java-pkg-simple
IUSE=doc source test
KEYWORDS=amd64 ~arm arm64 ppc64 x86
LICENSE=MPL-2.0
@@ -11,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 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
_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 b9f820e6d755..b5e5aedc6253 100644
--- a/metadata/md5-cache/dev-java/jffi-1.2.9-r1
+++ b/metadata/md5-cache/dev-java/jffi-1.2.9-r1
@@ -4,6 +4,7 @@ DEPEND=dev-libs/libffi:0= virtual/jdk:1.8 test? ( dev-java/ant-junit4:0 dev-java
DESCRIPTION=An optimized Java interface to libffi
EAPI=7
HOMEPAGE=https://github.com/jnr/jffi
+INHERIT=java-pkg-2 java-ant-2
IUSE=doc source test
KEYWORDS=amd64 ~arm ~arm64 ppc64 x86 ~ppc-macos ~x64-macos
LICENSE=|| ( Apache-2.0 LGPL-3 )
@@ -11,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 92b5a4d196abffe2dbe3bdc1cf4ef2ae multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
_md5_=1b346ef078509f32a134a9e810fa5bba
diff --git a/metadata/md5-cache/dev-java/jffi-1.3.6 b/metadata/md5-cache/dev-java/jffi-1.3.6
index a67133cd183f..f150f55343ef 100644
--- a/metadata/md5-cache/dev-java/jffi-1.3.6
+++ b/metadata/md5-cache/dev-java/jffi-1.3.6
@@ -3,6 +3,7 @@ DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zi
DESCRIPTION=Java Foreign Function Interface
EAPI=7
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
@@ -10,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 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
_md5_=0451cde6ee3ccf7dabf97d64848a5a35
diff --git a/metadata/md5-cache/dev-java/jflex-1.6.1-r1 b/metadata/md5-cache/dev-java/jflex-1.6.1-r1
index d2ebf9c5055c..7233887e7a14 100644
--- a/metadata/md5-cache/dev-java/jflex-1.6.1-r1
+++ b/metadata/md5-cache/dev-java/jflex-1.6.1-r1
@@ -3,6 +3,7 @@ DEPEND=>=virtual/jdk-1.8:* test? ( dev-java/junit:4 ) dev-java/ant-core:0 >=dev-
DESCRIPTION=JFlex is a lexical analyzer generator for Java
EAPI=7
HOMEPAGE=https://www.jflex.de/
+INHERIT=java-pkg-2 java-pkg-simple
IUSE=examples test vim-syntax doc source
KEYWORDS=amd64 ~arm arm64 ppc64 x86 ~ppc-macos ~x64-macos
LICENSE=BSD
@@ -11,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 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
_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 4dfd48e9f08a..ea07b6b7a3a5 100644
--- a/metadata/md5-cache/dev-java/jformatstring-2.0.3-r1
+++ b/metadata/md5-cache/dev-java/jformatstring-2.0.3-r1
@@ -3,11 +3,12 @@ DEPEND=>=virtual/jdk-1.8:* app-arch/unzip >=dev-java/java-config-2.2.0-r3 source
DESCRIPTION=Compile time checking for Java format strings
EAPI=7
HOMEPAGE=https://code.google.com/p/j-format-string
+INHERIT=java-pkg-2 java-pkg-simple
IUSE=doc source
KEYWORDS=~amd64 ~ppc64 ~x86
LICENSE=GPL-2
RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=0
SRC_URI=mirror://sourceforge/findbugs/findbugs-3.0.1-source.zip
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
_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 dae205ef8b22..bae9794e2ce7 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
@@ -3,6 +3,7 @@ DEPEND=app-arch/unzip >=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source
DESCRIPTION=JGoodies Common Library
EAPI=8
HOMEPAGE=http://www.jgoodies.com/
+INHERIT=java-pkg-2 java-pkg-simple
IUSE=doc source
KEYWORDS=amd64 ~ppc64 x86
LICENSE=BSD
@@ -10,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 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
_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 80e61e3e5c96..566603cd5463 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
@@ -4,11 +4,12 @@ DEPEND=dev-java/jgoodies-common:1.8 virtual/jdk:1.8 >=dev-java/java-config-2.2.0
DESCRIPTION=JGoodies Looks Library
EAPI=7
HOMEPAGE=http://www.jgoodies.com/
+INHERIT=java-pkg-2 java-pkg-simple
IUSE=doc source
KEYWORDS=amd64 x86
LICENSE=BSD
RDEPEND=dev-java/jgoodies-common:1.8 virtual/jre:1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=2.6
SRC_URI=http://www.jgoodies.com/download/libraries/looks/jgoodies-looks-2_6_0.zip
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
_md5_=10aea06f77390c986abddf2e4041a2ee
diff --git a/metadata/md5-cache/dev-java/jgraph-5.12.0.4-r1 b/metadata/md5-cache/dev-java/jgraph-5.12.0.4-r1
index 33d0c4777947..1d42a7fc3b92 100644
--- a/metadata/md5-cache/dev-java/jgraph-5.12.0.4-r1
+++ b/metadata/md5-cache/dev-java/jgraph-5.12.0.4-r1
@@ -3,11 +3,12 @@ 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 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib 4a33c9008e5ee30cb8840a3fdc24df2b preserve-libs a8e50acee31b5759b4df1f7707cae54b strip-linguas ac3ee41ee2d31d8c41a77c0838320cc7 toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8 vcs-clean d271b7bc7e6a009758d7d4ef749174e3 versionator d3fb3ba33acc3bbbdc4d7970227c100d wrapper 4a1902f969e5718126434fc35f3a0d9c
+_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 abdcae5a491a..ab4e8963b595 100644
--- a/metadata/md5-cache/dev-java/jide-oss-3.7.12
+++ b/metadata/md5-cache/dev-java/jide-oss-3.7.12
@@ -3,6 +3,7 @@ DEPEND=virtual/jdk:1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
DESCRIPTION=JIDE Common Layer (Professional Swing Components)
EAPI=7
HOMEPAGE=https://github.com/jidesoft/jide-oss
+INHERIT=java-pkg-2 java-pkg-simple
IUSE=doc source test
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2-with-exceptions
@@ -10,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 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
_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 95373c2751c0..a9aaa0a10b20 100644
--- a/metadata/md5-cache/dev-java/jline-2.14.6
+++ b/metadata/md5-cache/dev-java/jline-2.14.6
@@ -3,6 +3,7 @@ DEPEND=test? ( dev-java/easymock:3.2 dev-java/junit:4 ) dev-java/jansi:0 dev-jav
DESCRIPTION=A Java library for handling console input
EAPI=7
HOMEPAGE=https://github.com/jline/jline2
+INHERIT=java-pkg-2 java-pkg-simple
IUSE=test doc source
KEYWORDS=amd64 ~arm arm64 ppc64 x86
LICENSE=BSD
@@ -10,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 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
_md5_=5e27aa77287fd305780286a6ca2c1ae1
diff --git a/metadata/md5-cache/dev-java/jmh-core-1.21 b/metadata/md5-cache/dev-java/jmh-core-1.21
index 29bd57a85012..935d82ed8b0f 100644
--- a/metadata/md5-cache/dev-java/jmh-core-1.21
+++ b/metadata/md5-cache/dev-java/jmh-core-1.21
@@ -3,11 +3,12 @@ DEPEND=>=virtual/jdk-1.7 dev-java/asm:4 dev-java/junit:4 dev-java/commons-math:3
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 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib 4a33c9008e5ee30cb8840a3fdc24df2b preserve-libs a8e50acee31b5759b4df1f7707cae54b strip-linguas ac3ee41ee2d31d8c41a77c0838320cc7 toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8 vcs-clean d271b7bc7e6a009758d7d4ef749174e3 versionator d3fb3ba33acc3bbbdc4d7970227c100d wrapper 4a1902f969e5718126434fc35f3a0d9c
+_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
new file mode 100644
index 000000000000..cc13f0e2903d
--- /dev/null
+++ b/metadata/md5-cache/dev-java/jmh-core-1.35
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=>=virtual/jdk-1.8:* dev-java/commons-math:3 dev-java/jopt-simple:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
+DESCRIPTION=Harness for building, running, and analysing nano/micro/milli/macro benchmarks
+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
+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
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 c16711f12756..ba4c64248c1d 100644
--- a/metadata/md5-cache/dev-java/jmock-1.2.0-r2
+++ b/metadata/md5-cache/dev-java/jmock-1.2.0-r2
@@ -3,11 +3,12 @@ DEPEND=app-arch/unzip >=virtual/jdk-1.8:* dev-java/junit:0 >=dev-java/java-confi
DESCRIPTION=Library for testing Java code using mock objects
EAPI=7
HOMEPAGE=http://jmock.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
LICENSE=BSD
RDEPEND=>=virtual/jre-1.8:* dev-java/junit:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=1.0
SRC_URI=http://jmock.org/downloads/jmock-1.2.0-jars.zip
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
_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 b64b1cf037e7..3d44787333ff 100644
--- a/metadata/md5-cache/dev-java/jmock-2.6.1-r1
+++ b/metadata/md5-cache/dev-java/jmock-2.6.1-r1
@@ -3,11 +3,12 @@ DEPEND=app-arch/unzip >=virtual/jdk-1.8:* dev-java/hamcrest-core:1.3 dev-java/ha
DESCRIPTION=Library for testing Java code using mock objects
EAPI=7
HOMEPAGE=http://jmock.org
+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/hamcrest-core:1.3 dev-java/hamcrest-library:1.3 dev-java/junit:4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=2
SRC_URI=http://jmock.org/downloads/jmock-2.6.1-jars.zip
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
_md5_=2829f7a8add333ca99df12006b171866
diff --git a/metadata/md5-cache/dev-java/jna-4.2.2-r3 b/metadata/md5-cache/dev-java/jna-4.2.2-r3
index d097bcbd37b5..d03ebd7cc104 100644
--- a/metadata/md5-cache/dev-java/jna-4.2.2-r3
+++ b/metadata/md5-cache/dev-java/jna-4.2.2-r3
@@ -4,6 +4,7 @@ DEPEND=dev-libs/libffi:= virtual/jdk:1.8 x11-libs/libXt test? ( dev-java/ant-jun
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
@@ -12,5 +13,5 @@ REQUIRED_USE=test? ( awt nio-buffers )
RESTRICT=test
SLOT=4
SRC_URI=https://github.com/java-native-access/jna/archive/4.2.2.tar.gz -> jna-4.2.2.tar.gz
-_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_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 d3f31a705534..f75f70606757 100644
--- a/metadata/md5-cache/dev-java/jna-5.10.0
+++ b/metadata/md5-cache/dev-java/jna-5.10.0
@@ -1,9 +1,10 @@
BDEPEND=virtual/pkgconfig
DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.8:* dev-java/animal-sniffer-annotations:0 dev-java/ant-core:0 dev-java/asm:9 test? ( dev-java/ant-junit:0 dev-java/junit:4 dev-java/reflections:0 ) >=dev-libs/libffi-3.4:= x11-libs/libXt >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
+DEPEND=>=virtual/jdk-1.8:* dev-java/animal-sniffer-annotations:0 dev-java/ant-core:0 dev-java/asm:9 test? ( dev-java/ant-junit4:0 dev-java/junit:4 dev-java/reflections:0 ) >=dev-libs/libffi-3.4:= x11-libs/libXt >=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
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
LICENSE=|| ( Apache-2.0 LGPL-2.1+ )
@@ -11,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.10.0.tar.gz -> jna-5.10.0.tar.gz
-_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=150594df3137d60f17034b40994d1f82
+_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_md5_=bb55a5092e48e4602491157e063c6848
diff --git a/metadata/md5-cache/dev-java/jna-5.11.0 b/metadata/md5-cache/dev-java/jna-5.11.0
new file mode 100644
index 000000000000..5aaa5def5a29
--- /dev/null
+++ b/metadata/md5-cache/dev-java/jna-5.11.0
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile configure install preinst prepare setup test
+DEPEND=>=virtual/jdk-1.8:* dev-java/animal-sniffer-annotations:0 dev-java/ant-core:0 dev-java/asm:9 test? ( dev-java/ant-junit4:0 dev-java/junit:4 dev-java/reflections:0 ) >=dev-libs/libffi-3.4:= x11-libs/libXt >=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
+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
+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.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
diff --git a/metadata/md5-cache/dev-java/jnacl-1.0 b/metadata/md5-cache/dev-java/jnacl-1.0
index 5fb4fee7fbb8..7354ae55cb71 100644
--- a/metadata/md5-cache/dev-java/jnacl-1.0
+++ b/metadata/md5-cache/dev-java/jnacl-1.0
@@ -3,6 +3,7 @@ DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zi
DESCRIPTION=Pure Java implementation of NaCl: Networking and Cryptography library
EAPI=8
HOMEPAGE=https://github.com/neilalexander/jnacl
+INHERIT=java-pkg-2 java-pkg-simple
IUSE=doc source test
KEYWORDS=amd64 ~arm arm64 ppc64 x86
LICENSE=BSD-2
@@ -10,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 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
_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 587a868e54f0..927127451a27 100644
--- a/metadata/md5-cache/dev-java/jnr-a64asm-1.0.0
+++ b/metadata/md5-cache/dev-java/jnr-a64asm-1.0.0
@@ -3,11 +3,12 @@ DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zi
DESCRIPTION=A pure-java A64 assembler
EAPI=7
HOMEPAGE=http://nexus.sonatype.org/oss-repository-hosting.html/jnr-a64asm
+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=2
SRC_URI=https://github.com/jnr/jnr-a64asm/archive/refs/tags/jnr-a64asm-1.0.0.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
_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 0d12ca07da5a..62afa4108430 100644
--- a/metadata/md5-cache/dev-java/jnr-constants-0.10.3
+++ b/metadata/md5-cache/dev-java/jnr-constants-0.10.3
@@ -3,6 +3,7 @@ DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zi
DESCRIPTION=A set of platform constants (e.g. errno values)
EAPI=7
HOMEPAGE=https://github.com/jnr/jnr-constants
+INHERIT=java-pkg-2 java-pkg-simple
IUSE=doc source test
KEYWORDS=amd64 ~arm arm64 ppc64 x86
LICENSE=Apache-2.0
@@ -10,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 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
_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 548ac90c320b..53d1602032f1 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
@@ -3,6 +3,7 @@ DEPEND=~dev-java/jffi-1.2.9:1.2 dev-java/jnr-x86asm:1.0 dev-java/asm:4 >=virtual
DESCRIPTION=An abstracted interface to invoking native functions from java
EAPI=7
HOMEPAGE=https://github.com/jnr/jnr-ffi
+INHERIT=java-pkg-2 java-ant-2
IUSE=doc source test
KEYWORDS=~arm ppc64
LICENSE=|| ( Apache-2.0 LGPL-3 )
@@ -10,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 92b5a4d196abffe2dbe3bdc1cf4ef2ae multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
_md5_=4c37f28ee86cbec4b10031e9e326c951
diff --git a/metadata/md5-cache/dev-java/jnr-ffi-2.2.8 b/metadata/md5-cache/dev-java/jnr-ffi-2.2.8
index 0f3635a33f72..f60743d1c073 100644
--- a/metadata/md5-cache/dev-java/jnr-ffi-2.2.8
+++ b/metadata/md5-cache/dev-java/jnr-ffi-2.2.8
@@ -3,11 +3,12 @@ DEPEND=dev-java/asm:9 dev-java/asm-analysis:9 dev-java/asm-commons:9 dev-java/as
DESCRIPTION=A library for invoking native functions from java
EAPI=7
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/asm-analysis:9 dev-java/asm-commons:9 dev-java/asm-tree:9 dev-java/asm-util:9 >=dev-java/jffi-1.3.6:1.2 dev-java/jnr-a64asm:2 dev-java/jnr-x86asm:1.0 >=virtual/jre-1.8:* >=dev-java/jffi-1.3.6:1.2 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=2
SRC_URI=https://github.com/jnr/jnr-ffi/archive/refs/tags/jnr-ffi-2.2.8.tar.gz -> jnr-ffi-2.2.8-sources.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
_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 560b0585ee53..c80428b4efeb 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
@@ -3,6 +3,7 @@ DEPEND=dev-java/jnr-ffi:2 >=virtual/jdk-1.8:* test? ( dev-java/ant-junit dev-jav
DESCRIPTION=Network services database access for java
EAPI=7
HOMEPAGE=https://github.com/jnr/jnr-netdb
+INHERIT=java-pkg-2 java-ant-2
IUSE=doc source test
KEYWORDS=amd64 ~arm arm64 ppc64 x86
LICENSE=Apache-2.0
@@ -10,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 92b5a4d196abffe2dbe3bdc1cf4ef2ae multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
_md5_=31f22860ea4a9c15d396360eda1d00b6
diff --git a/metadata/md5-cache/dev-java/jnr-posix-3.0.10-r1 b/metadata/md5-cache/dev-java/jnr-posix-3.0.10-r1
index 790f925a1f0d..b389364831c6 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
@@ -3,6 +3,7 @@ DEPEND=dev-java/jnr-constants:0 dev-java/jnr-ffi:2 >=virtual/jdk-1.8:* test? ( d
DESCRIPTION=Lightweight cross-platform POSIX emulation layer for Java
EAPI=7
HOMEPAGE=https://github.com/jnr/jnr-posix
+INHERIT=java-pkg-2 java-ant-2
IUSE=doc source test
KEYWORDS=amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris
LICENSE=|| ( CPL-1.0 GPL-2 LGPL-2.1 )
@@ -10,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 92b5a4d196abffe2dbe3bdc1cf4ef2ae multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
_md5_=eb871d92ac3fb94b076964bba70590ab
diff --git a/metadata/md5-cache/dev-java/jnr-x86asm-1.0.2-r2 b/metadata/md5-cache/dev-java/jnr-x86asm-1.0.2-r2
index 65ed010189b7..ed68534fa9b5 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
@@ -3,11 +3,12 @@ DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zi
DESCRIPTION=A pure-java port of asmjit
EAPI=7
HOMEPAGE=https://github.com/jnr/jnr-x86asm
+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/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=1.0
SRC_URI=https://github.com/jnr/jnr-x86asm/archive/refs/tags/1.0.2.tar.gz -> jnr-x86asm-1.0.2.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
_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 f05e0e99133e..d2715b9bf2ea 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
@@ -3,6 +3,7 @@ DEPEND=>=virtual/jdk-1.8:* test? ( dev-java/guava:0 ) >=dev-java/java-config-2.2
DESCRIPTION=Library to convert Objects to and from String
EAPI=8
HOMEPAGE=https://www.joda.org/joda-convert/
+INHERIT=java-pkg-2 java-pkg-simple
IUSE=doc source test
KEYWORDS=amd64 ~arm arm64 ppc64 x86
LICENSE=Apache-2.0
@@ -10,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 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
_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 4a006e3a6fcb..e1eb166a35ca 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
@@ -3,6 +3,7 @@ DEPEND=>=virtual/jdk-1.8:* dev-java/joda-convert:0 >=dev-java/java-config-2.2.0-
DESCRIPTION=Date and time library to replace JDK date handling
EAPI=7
HOMEPAGE=https://www.joda.org/joda-time/
+INHERIT=java-pkg-2 java-pkg-simple
IUSE=doc source test
KEYWORDS=amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
LICENSE=Apache-2.0
@@ -10,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 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
_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 6582ee99cdbe..8daa20f52774 100644
--- a/metadata/md5-cache/dev-java/jol-core-0.16
+++ b/metadata/md5-cache/dev-java/jol-core-0.16
@@ -3,6 +3,7 @@ DEPEND=>=virtual/jdk-1.8:* test? ( dev-java/asm:4 ) >=dev-java/java-config-2.2.0
DESCRIPTION=Java Object Layout: Core
EAPI=8
HOMEPAGE=https://openjdk.java.net/projects/code-tools/jol/
+INHERIT=java-pkg-2 java-pkg-simple
IUSE=doc source test
KEYWORDS=amd64 ~arm arm64 ppc64 x86
LICENSE=GPL-2-with-classpath-exception
@@ -10,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 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
_md5_=f1293deef1eb2b45257a37d77a13a82b
diff --git a/metadata/md5-cache/dev-java/jopt-simple-4.6-r1 b/metadata/md5-cache/dev-java/jopt-simple-4.6-r1
index f6380794e975..854d53ea484e 100644
--- a/metadata/md5-cache/dev-java/jopt-simple-4.6-r1
+++ b/metadata/md5-cache/dev-java/jopt-simple-4.6-r1
@@ -3,11 +3,12 @@ DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zi
DESCRIPTION=A Java library for parsing command line options
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
LICENSE=MIT
RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=4.6
SRC_URI=https://github.com/jopt-simple/jopt-simple/archive/refs/tags/jopt-simple-4.6.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
_md5_=cb1cf225df2f3ad0086821dc8845f118
diff --git a/metadata/md5-cache/dev-java/jopt-simple-5.0 b/metadata/md5-cache/dev-java/jopt-simple-5.0
index 1e08ec5101a6..4d72e6869d1d 100644
--- a/metadata/md5-cache/dev-java/jopt-simple-5.0
+++ b/metadata/md5-cache/dev-java/jopt-simple-5.0
@@ -3,11 +3,12 @@ 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 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib 4a33c9008e5ee30cb8840a3fdc24df2b preserve-libs a8e50acee31b5759b4df1f7707cae54b strip-linguas ac3ee41ee2d31d8c41a77c0838320cc7 toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8 vcs-clean d271b7bc7e6a009758d7d4ef749174e3 versionator d3fb3ba33acc3bbbdc4d7970227c100d wrapper 4a1902f969e5718126434fc35f3a0d9c
+_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
new file mode 100644
index 000000000000..91b9dfad50b9
--- /dev/null
+++ b/metadata/md5-cache/dev-java/jopt-simple-5.0-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=A Java library for parsing command line options
+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
+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
diff --git a/metadata/md5-cache/dev-java/jrobin-1.6.0-r1 b/metadata/md5-cache/dev-java/jrobin-1.6.0-r1
deleted file mode 100644
index 2608361896a1..000000000000
--- a/metadata/md5-cache/dev-java/jrobin-1.6.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst preinst prepare setup test
-DEPEND=>=virtual/jdk-1.6 test? ( dev-java/asm:4 >=dev-java/cglib-3.1:3 dev-java/easymock:3.2 dev-java/junit:4 dev-java/objenesis:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=JRobin is a 100% pure Java alternative to RRDTool
-EAPI=5
-HOMEPAGE=http://www.jrobin.org/
-IUSE=test doc source
-KEYWORDS=amd64 x86
-LICENSE=LGPL-2.1
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/OpenNMS/jrobin/archive/jrobin-1.6.0-1.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 eapi7-ver 1a0a60ad07c8b32d2faba2d085dc0f24 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 9f813bb3c47cf2e60619a663b87c5f4e estack 055c42df72f76a4f45ec92b35e83cd56 eutils dab5d8ec471d025b79c9e6906bcf3bff java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib 4a33c9008e5ee30cb8840a3fdc24df2b preserve-libs a8e50acee31b5759b4df1f7707cae54b strip-linguas ac3ee41ee2d31d8c41a77c0838320cc7 toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8 vcs-clean d271b7bc7e6a009758d7d4ef749174e3 versionator d3fb3ba33acc3bbbdc4d7970227c100d wrapper 4a1902f969e5718126434fc35f3a0d9c
-_md5_=57600635174ab6ee787537966877caac
diff --git a/metadata/md5-cache/dev-java/jrobin-1.6.0-r2 b/metadata/md5-cache/dev-java/jrobin-1.6.0-r2
index 5b4e3dbb9f05..63d1daddf22b 100644
--- a/metadata/md5-cache/dev-java/jrobin-1.6.0-r2
+++ b/metadata/md5-cache/dev-java/jrobin-1.6.0-r2
@@ -3,12 +3,13 @@ DEPEND=>=virtual/jdk-1.8:* test? ( dev-java/easymock:3.2 ) >=dev-java/java-confi
DESCRIPTION=JRobin is a 100% pure Java alternative to RRDTool
EAPI=8
HOMEPAGE=https://github.com/OpenNMS/jrobin
+INHERIT=java-pkg-2 java-pkg-simple
IUSE=doc source test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
LICENSE=LGPL-3
RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://github.com/OpenNMS/jrobin/archive/jrobin-1.6.0-1.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
-_md5_=ef886b35ec6ae27db2d90257dd6287d9
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_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 5b86a6043af1..2b34411f64e7 100644
--- a/metadata/md5-cache/dev-java/jsch-0.1.55
+++ b/metadata/md5-cache/dev-java/jsch-0.1.55
@@ -4,11 +4,12 @@ DEPEND=>=dev-java/jzlib-1.1.3:0 >=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0
DESCRIPTION=JSch is a pure Java implementation of SSH2
EAPI=8
HOMEPAGE=http://www.jcraft.com/jsch/
+INHERIT=java-pkg-2 java-pkg-simple
IUSE=doc source
KEYWORDS=amd64 ~arm arm64 ppc64 x86
LICENSE=BSD
RDEPEND=>=dev-java/jzlib-1.1.3:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=0
SRC_URI=mirror://sourceforge/jsch/jsch-0.1.55.zip
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
_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 26c931acff4e..38f14715f101 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
@@ -3,11 +3,12 @@ DEPEND=dev-java/jna:4 dev-java/jsch:0 >=virtual/jdk-1.8:* >=dev-java/java-config
DESCRIPTION=a proxy to ssh-agent and Pageant in Java
EAPI=7
HOMEPAGE=http://www.jcraft.com/jsch-agent-proxy/
+INHERIT=java-pkg-2 java-pkg-simple
IUSE=doc source
KEYWORDS=amd64 ppc64 x86
LICENSE=BSD
RDEPEND=dev-java/jna:4 dev-java/jsch:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=0
SRC_URI=https://github.com/ymnk/jsch-agent-proxy/archive/12c3d64fc2b0a4fd37659369edfdee26e48954e2.tar.gz -> jsch-agent-proxy-0.0.9.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
_md5_=f0145b7f42bda4b62567a4fe7ed159e0
diff --git a/metadata/md5-cache/dev-java/json-20150729 b/metadata/md5-cache/dev-java/json-20150729
deleted file mode 100644
index 556ac32af1f8..000000000000
--- a/metadata/md5-cache/dev-java/json-20150729
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Java implementation of the JavaScript Object Notation
-EAPI=5
-HOMEPAGE=https://github.com/douglascrockford/JSON-java
-IUSE=doc source
-KEYWORDS=amd64 x86
-LICENSE=JSON
-RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://github.com/douglascrockford/JSON-java/archive/20150729.zip -> json-20150729.zip
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 eapi7-ver 1a0a60ad07c8b32d2faba2d085dc0f24 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 9f813bb3c47cf2e60619a663b87c5f4e estack 055c42df72f76a4f45ec92b35e83cd56 eutils dab5d8ec471d025b79c9e6906bcf3bff java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib 4a33c9008e5ee30cb8840a3fdc24df2b preserve-libs a8e50acee31b5759b4df1f7707cae54b strip-linguas ac3ee41ee2d31d8c41a77c0838320cc7 toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8 vcs-clean d271b7bc7e6a009758d7d4ef749174e3 versionator d3fb3ba33acc3bbbdc4d7970227c100d wrapper 4a1902f969e5718126434fc35f3a0d9c
-_md5_=5850af41f8607d08a3d6e93e20b776ad
diff --git a/metadata/md5-cache/dev-java/json-20220320 b/metadata/md5-cache/dev-java/json-20220320
index 4c6ffa2d73f0..7b17d6ac328c 100644
--- a/metadata/md5-cache/dev-java/json-20220320
+++ b/metadata/md5-cache/dev-java/json-20220320
@@ -3,11 +3,12 @@ DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zi
DESCRIPTION=A reference implementation of a JSON package in Java
EAPI=8
HOMEPAGE=https://github.com/stleary/JSON-java
+INHERIT=java-pkg-2 java-pkg-simple
IUSE=doc source
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
LICENSE=JSON
RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=0
SRC_URI=https://codeload.github.com/stleary/JSON-java/tar.gz/20220320 -> json-20220320.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
-_md5_=adc7be8873ce45780dc769f01597f481
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_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 012ff0fcb52e..9a1a53f72ab3 100644
--- a/metadata/md5-cache/dev-java/json-simple-1.1-r2
+++ b/metadata/md5-cache/dev-java/json-simple-1.1-r2
@@ -3,11 +3,12 @@ DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zi
DESCRIPTION=Simple Java toolkit for JSON
EAPI=7
HOMEPAGE=http://www.json.org
+INHERIT=java-pkg-2 java-pkg-simple
IUSE=source doc
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=https://github.com/fangyidong/json-simple/archive/tag_release_1_1_1.tar.gz -> json-simple-1.1.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
_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 d03f9c131739..eb0ebbbb22f5 100644
--- a/metadata/md5-cache/dev-java/jspeex-0.9.7-r2
+++ b/metadata/md5-cache/dev-java/jspeex-0.9.7-r2
@@ -4,6 +4,7 @@ DEPEND=dev-java/ant-core:0 dev-java/junit:0 >=virtual/jdk-1.8:* test? ( dev-java
DESCRIPTION=Speex speech codec library for Java
EAPI=7
HOMEPAGE=http://jspeex.sourceforge.net/
+INHERIT=java-pkg-2 java-ant-2
IUSE=doc source test
KEYWORDS=~amd64 ~x86
LICENSE=BSD
@@ -11,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 92b5a4d196abffe2dbe3bdc1cf4ef2ae multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
_md5_=aa48b8f15f3f68c7ed90b29836daf6af
diff --git a/metadata/md5-cache/dev-java/jsr250-1.2 b/metadata/md5-cache/dev-java/jsr250-1.2
index c566685bbebb..fa9d4fc0d04c 100644
--- a/metadata/md5-cache/dev-java/jsr250-1.2
+++ b/metadata/md5-cache/dev-java/jsr250-1.2
@@ -3,11 +3,12 @@ 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 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib 4a33c9008e5ee30cb8840a3fdc24df2b preserve-libs a8e50acee31b5759b4df1f7707cae54b strip-linguas ac3ee41ee2d31d8c41a77c0838320cc7 toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8 vcs-clean d271b7bc7e6a009758d7d4ef749174e3 versionator d3fb3ba33acc3bbbdc4d7970227c100d wrapper 4a1902f969e5718126434fc35f3a0d9c
+_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 6043739ea59a..fbe65f095638 100644
--- a/metadata/md5-cache/dev-java/jsr305-3.0.2-r1
+++ b/metadata/md5-cache/dev-java/jsr305-3.0.2-r1
@@ -3,11 +3,12 @@ DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zi
DESCRIPTION=Annotations for Software Defect Detection in Java
EAPI=8
HOMEPAGE=https://jcp.org/en/jsr/detail?id=305
+INHERIT=java-pkg-2 java-pkg-simple
IUSE=source doc
KEYWORDS=amd64 ~arm arm64 ppc64 x86
LICENSE=BSD
RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=0
SRC_URI=https://repo1.maven.org/maven2/com/google/code/findbugs/jsr305/3.0.2/jsr305-3.0.2-sources.jar
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
_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 513f9f845c72..b5367584795b 100644
--- a/metadata/md5-cache/dev-java/jta-1.1-r1
+++ b/metadata/md5-cache/dev-java/jta-1.1-r1
@@ -4,11 +4,12 @@ DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3
DESCRIPTION=The Java Transaction API
EAPI=7
HOMEPAGE=https://www.oracle.com/java/technologies/jta.html
+INHERIT=java-pkg-2
KEYWORDS=amd64 ppc64 x86 ~amd64-linux ~x86-linux
LICENSE=sun-bcla-jta
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 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
_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 886a39ab8dd8..e6b2c7c04760 100644
--- a/metadata/md5-cache/dev-java/jtds-1.3.1-r1
+++ b/metadata/md5-cache/dev-java/jtds-1.3.1-r1
@@ -4,6 +4,7 @@ DEPEND=dev-java/jcifs:1.1 >=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 so
DESCRIPTION=jTDS - SQL Server and Sybase JDBC driver
EAPI=8
HOMEPAGE=http://jtds.sourceforge.net
+INHERIT=java-pkg-2 java-pkg-simple
IUSE=doc source
KEYWORDS=amd64 x86
LICENSE=LGPL-2.1
@@ -11,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 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
_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 2daec00a9f04..00853ca0655b 100644
--- a/metadata/md5-cache/dev-java/jtidy-1.0-r1
+++ b/metadata/md5-cache/dev-java/jtidy-1.0-r1
@@ -4,11 +4,12 @@ DEPEND=dev-java/ant-core:0 >=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 s
DESCRIPTION=Java port of HTML Tidy, an HTML syntax checker and pretty printer
EAPI=8
HOMEPAGE=http://jtidy.sourceforge.net/
+INHERIT=java-pkg-2 java-ant-2
IUSE=doc source
KEYWORDS=amd64 ppc64 x86
LICENSE=HTML-Tidy W3C
RDEPEND=dev-java/ant-core:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=0
SRC_URI=mirror://sourceforge/project/jtidy/JTidy/r938/jtidy-r938-sources.zip -> jtidy-1.0.zip
-_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
_md5_=b140cbe80d1d147d604ba3d6832d278c
diff --git a/metadata/md5-cache/dev-java/junit-3.8.2-r2 b/metadata/md5-cache/dev-java/junit-3.8.2-r2
index ca3988216826..60bf1139712a 100644
--- a/metadata/md5-cache/dev-java/junit-3.8.2-r2
+++ b/metadata/md5-cache/dev-java/junit-3.8.2-r2
@@ -3,11 +3,12 @@ DEPEND=>=virtual/jdk-1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
DESCRIPTION=Simple framework to write repeatable tests
EAPI=7
HOMEPAGE=http://www.junit.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 ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=CPL-1.0
RDEPEND=>=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=0
SRC_URI=mirror://sourceforge/junit/junit3.8.2.zip
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
_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 a40b55a3567c..5e96ea9ef72f 100644
--- a/metadata/md5-cache/dev-java/junit-4.13.2
+++ b/metadata/md5-cache/dev-java/junit-4.13.2
@@ -3,6 +3,7 @@ DEPEND=>=virtual/jdk-1.8:* test? ( dev-java/hamcrest-library:1.3 ) dev-java/hamc
DESCRIPTION=Simple framework to write repeatable tests
EAPI=7
HOMEPAGE=https://junit.org/junit5/
+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 ~x64-solaris ~x86-solaris
LICENSE=EPL-1.0
@@ -10,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 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
_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 bef434f5fcdd..27bcb3bff403 100644
--- a/metadata/md5-cache/dev-java/junit-clptr-1.2.2
+++ b/metadata/md5-cache/dev-java/junit-clptr-1.2.2
@@ -3,11 +3,12 @@ DEPEND=>=virtual/jdk-1.8:* dev-java/junit:4 >=dev-java/java-config-2.2.0-r3 sour
DESCRIPTION=ClassLoader per Test runner for JUnit 4.12+
EAPI=7
HOMEPAGE=http://nexus.sonatype.org/oss-repository-hosting.html/junit-clptr
+INHERIT=java-pkg-2 java-pkg-simple
IUSE=doc source
KEYWORDS=amd64 ppc64 x86
LICENSE=Apache-2.0
RDEPEND=>=virtual/jre-1.8:* dev-java/junit:4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=0
SRC_URI=https://github.com/bitstrings/junit-clptr/archive/refs/tags/1.2.2.tar.gz -> junit-clptr-1.2.2-sources.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
_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 edab7fb32290..559fced6d307 100644
--- a/metadata/md5-cache/dev-java/junitparams-1.1.1
+++ b/metadata/md5-cache/dev-java/junitparams-1.1.1
@@ -3,6 +3,7 @@ DEPEND=>=virtual/jdk-1.8:* >=dev-java/junit-4.12:4 test? ( >=dev-java/assertj-co
DESCRIPTION=Better parameterised tests for JUnit
EAPI=7
HOMEPAGE=https://github.com/Pragmatists/JUnitParams
+INHERIT=java-pkg-2 java-pkg-simple
IUSE=doc source test
KEYWORDS=amd64 ~arm arm64 ppc64 x86
LICENSE=Apache-2.0
@@ -10,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 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
_md5_=5cc085539258633a17adf50959bf58a6
diff --git a/metadata/md5-cache/dev-java/jython-2.7.0-r4 b/metadata/md5-cache/dev-java/jython-2.7.0-r4
index 01430227f130..ab263016e544 100644
--- a/metadata/md5-cache/dev-java/jython-2.7.0-r4
+++ b/metadata/md5-cache/dev-java/jython-2.7.0-r4
@@ -4,12 +4,13 @@ DEPEND=dev-java/antlr:3 dev-java/netty-transport:0 dev-java/asm:9 dev-java/commo
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
+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 92b5a4d196abffe2dbe3bdc1cf4ef2ae multilib 4a33c9008e5ee30cb8840a3fdc24df2b multiprocessing 61c959fc55c15c00bbb1079d6a71370b python-utils-r1 59dddabd6a41ab69723654916142f63b strip-linguas ac3ee41ee2d31d8c41a77c0838320cc7 toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8 wrapper 4a1902f969e5718126434fc35f3a0d9c
-_md5_=1cb7ccd20488c922d0e3675300ce8826
+_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
new file mode 100644
index 000000000000..fded3df24481
--- /dev/null
+++ b/metadata/md5-cache/dev-java/jython-2.7.0-r6
@@ -0,0 +1,16 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=compile configure install preinst prepare setup test
+DEPEND=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/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: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
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 655f450b90a8..305fedc64ce2 100644
--- a/metadata/md5-cache/dev-java/jzlib-1.1.3-r2
+++ b/metadata/md5-cache/dev-java/jzlib-1.1.3-r2
@@ -3,6 +3,7 @@ DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zi
DESCRIPTION=JZlib is a re-implementation of zlib in pure Java
EAPI=7
HOMEPAGE=http://www.jcraft.com/jzlib/
+INHERIT=java-pkg-2 java-pkg-simple
IUSE=examples source test
KEYWORDS=amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=BSD
@@ -10,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 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
_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 c0989c3c52f5..908d54842a33 100644
--- a/metadata/md5-cache/dev-java/kafka-clients-1.1.1
+++ b/metadata/md5-cache/dev-java/kafka-clients-1.1.1
@@ -3,11 +3,12 @@ DEPEND=>=virtual/jdk-1.8:* >=dev-java/lz4-java-1.4.1:0 >=dev-java/slf4j-api-1.7.
DESCRIPTION=Apache Kafka distributed event streaming platform
EAPI=8
HOMEPAGE=https://kafka.apache.org/
+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/lz4-java-1.4.1:0 >=dev-java/slf4j-api-1.7.25:0 >=dev-java/snappy-1.1.7.1:1.1 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=0
SRC_URI=https://archive.apache.org/dist/kafka/1.1.1/kafka-1.1.1-src.tgz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
_md5_=e349412855f51dda74f62c8f9d543bb9
diff --git a/metadata/md5-cache/dev-java/leiningen-bin-2.9.1 b/metadata/md5-cache/dev-java/leiningen-bin-2.9.1
index f71ab66baf1c..a1047c0996eb 100644
--- a/metadata/md5-cache/dev-java/leiningen-bin-2.9.1
+++ b/metadata/md5-cache/dev-java/leiningen-bin-2.9.1
@@ -3,11 +3,12 @@ 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 92b5a4d196abffe2dbe3bdc1cf4ef2ae ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib 4a33c9008e5ee30cb8840a3fdc24df2b preserve-libs a8e50acee31b5759b4df1f7707cae54b strip-linguas ac3ee41ee2d31d8c41a77c0838320cc7 toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8 vcs-clean d271b7bc7e6a009758d7d4ef749174e3 versionator d3fb3ba33acc3bbbdc4d7970227c100d wrapper 4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 eapi7-ver 1a0a60ad07c8b32d2faba2d085dc0f24 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 9f813bb3c47cf2e60619a663b87c5f4e estack 055c42df72f76a4f45ec92b35e83cd56 eutils dab5d8ec471d025b79c9e6906bcf3bff java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 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
new file mode 100644
index 000000000000..79b0b40fbd92
--- /dev/null
+++ b/metadata/md5-cache/dev-java/leiningen-bin-2.9.8
@@ -0,0 +1,14 @@
+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=8
+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.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
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 a2ab42d16046..d17de1855e5c 100644
--- a/metadata/md5-cache/dev-java/libg-2.1.0-r2
+++ b/metadata/md5-cache/dev-java/libg-2.1.0-r2
@@ -3,6 +3,7 @@ DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1
DESCRIPTION=Lots of small utilities for bndlib, a swiss army knife for OSGi
EAPI=7
HOMEPAGE=https://bnd.bndtools.org/
+INHERIT=java-pkg-2 java-ant-2
IUSE=test
KEYWORDS=amd64 ~arm arm64 ppc64 x86
LICENSE=Apache-2.0
@@ -10,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 92b5a4d196abffe2dbe3bdc1cf4ef2ae multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
_md5_=f0a9c234e14606974c5cd4c4f7050818
diff --git a/metadata/md5-cache/dev-java/lmax-disruptor-3.4.4 b/metadata/md5-cache/dev-java/lmax-disruptor-3.4.4
index 0bfeae980a30..fcd1329410f4 100644
--- a/metadata/md5-cache/dev-java/lmax-disruptor-3.4.4
+++ b/metadata/md5-cache/dev-java/lmax-disruptor-3.4.4
@@ -3,6 +3,7 @@ DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zi
DESCRIPTION=A High Performance Inter-Thread Messaging Library
EAPI=8
HOMEPAGE=https://lmax-exchange.github.io/disruptor/
+INHERIT=java-pkg-2 java-pkg-simple
IUSE=doc source test
KEYWORDS=amd64 ~arm arm64 ppc64 x86
LICENSE=Apache-2.0
@@ -10,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 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
_md5_=d0063608d73b32d09af4e0e9aa228d3c
diff --git a/metadata/md5-cache/dev-java/log4j-1.2.17-r3 b/metadata/md5-cache/dev-java/log4j-1.2.17-r3
deleted file mode 100644
index 54506c611635..000000000000
--- a/metadata/md5-cache/dev-java/log4j-1.2.17-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=javamail? ( dev-java/oracle-javamail:0 ) jms? ( java-virtuals/jms:0 ) >=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
-DESCRIPTION=A low-overhead robust logging package for Java
-EAPI=5
-HOMEPAGE=http://logging.apache.org/log4j/
-IUSE=javamail jms doc source
-KEYWORDS=amd64 ~arm arm64 ppc64 x86 ~amd64-linux
-LICENSE=Apache-2.0
-RDEPEND=javamail? ( dev-java/oracle-javamail:0 ) jms? ( java-virtuals/jms:0 ) >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://apache/logging/log4j/1.2.17/log4j-1.2.17.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 eapi7-ver 1a0a60ad07c8b32d2faba2d085dc0f24 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 9f813bb3c47cf2e60619a663b87c5f4e estack 055c42df72f76a4f45ec92b35e83cd56 eutils dab5d8ec471d025b79c9e6906bcf3bff java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib 4a33c9008e5ee30cb8840a3fdc24df2b preserve-libs a8e50acee31b5759b4df1f7707cae54b strip-linguas ac3ee41ee2d31d8c41a77c0838320cc7 toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8 vcs-clean d271b7bc7e6a009758d7d4ef749174e3 versionator d3fb3ba33acc3bbbdc4d7970227c100d wrapper 4a1902f969e5718126434fc35f3a0d9c
-_md5_=0b615dcd9048430eab504bcbc357bf4f
diff --git a/metadata/md5-cache/dev-java/log4j-12-api-2.17.1 b/metadata/md5-cache/dev-java/log4j-12-api-2.17.1
index 3e182332a0e1..dfe8b66898fb 100644
--- a/metadata/md5-cache/dev-java/log4j-12-api-2.17.1
+++ b/metadata/md5-cache/dev-java/log4j-12-api-2.17.1
@@ -3,6 +3,7 @@ DEPEND=~dev-java/log4j-api-2.17.1:2 ~dev-java/log4j-core-2.17.1:2 >=virtual/jdk-
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
@@ -10,5 +11,5 @@ RDEPEND=~dev-java/log4j-api-2.17.1:2 ~dev-java/log4j-core-2.17.1:2 >=virtual/jre
RESTRICT=test !test? ( test )
SLOT=2
SRC_URI=mirror://apache/logging/log4j/2.17.1/apache-log4j-2.17.1-src.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_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 719819befe12..7f39363ec413 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
@@ -3,6 +3,7 @@ DEPEND=~dev-java/log4j-api-2.17.2:2 ~dev-java/log4j-core-2.17.2:2 >=virtual/jdk-
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
@@ -10,5 +11,5 @@ RDEPEND=~dev-java/log4j-api-2.17.2:2 ~dev-java/log4j-core-2.17.2:2 >=virtual/jre
RESTRICT=test !test? ( test )
SLOT=2
SRC_URI=mirror://apache/logging/log4j/2.17.2/apache-log4j-2.17.2-src.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
_md5_=b0a08d8a41e226ec79536e54e3fcee95
diff --git a/metadata/md5-cache/dev-java/log4j-api-2.17.1 b/metadata/md5-cache/dev-java/log4j-api-2.17.1
index 603865e60eec..1da539a90eb6 100644
--- a/metadata/md5-cache/dev-java/log4j-api-2.17.1
+++ b/metadata/md5-cache/dev-java/log4j-api-2.17.1
@@ -3,6 +3,7 @@ DEPEND=>=virtual/jdk-1.8:* dev-java/osgi-core-api:0 >=dev-java/java-config-2.2.0
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
@@ -10,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=2
SRC_URI=mirror://apache/logging/log4j/2.17.1/apache-log4j-2.17.1-src.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_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 7438aa1e1777..929cfea8ef0e 100644
--- a/metadata/md5-cache/dev-java/log4j-api-2.17.2
+++ b/metadata/md5-cache/dev-java/log4j-api-2.17.2
@@ -3,6 +3,7 @@ DEPEND=>=virtual/jdk-1.8:* dev-java/osgi-core-api:0 >=dev-java/java-config-2.2.0
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
@@ -10,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=2
SRC_URI=mirror://apache/logging/log4j/2.17.2/apache-log4j-2.17.2-src.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
_md5_=a9d8acd8d47102cd87f23eb8dc3c2650
diff --git a/metadata/md5-cache/dev-java/log4j-api-java9-2.17.1 b/metadata/md5-cache/dev-java/log4j-api-java9-2.17.1
index b3f19cad4a37..1b556964b946 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
@@ -3,12 +3,13 @@ DEPEND=>=virtual/jdk-11:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
DESCRIPTION=The Apache Log4j API (Java 9)
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 ~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? ( test )
SLOT=2
SRC_URI=mirror://apache/logging/log4j/2.17.1/apache-log4j-2.17.1-src.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
-_md5_=d26378af3a37518e48aa6929eaeebbe3
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_md5_=13767e6ae691bb21322e030b7e85dd12
diff --git a/metadata/md5-cache/dev-java/log4j-core-2.17.1-r1 b/metadata/md5-cache/dev-java/log4j-core-2.17.1-r1
index 0b0577705a95..fdd91826cf92 100644
--- a/metadata/md5-cache/dev-java/log4j-core-2.17.1-r1
+++ b/metadata/md5-cache/dev-java/log4j-core-2.17.1-r1
@@ -3,6 +3,7 @@ DEPEND=dev-java/commons-compress:0 dev-java/commons-csv:0 dev-java/conversant-di
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
LICENSE=Apache-2.0
@@ -10,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* dev-java/commons-compress:0 dev-java/commons-csv:0 d
RESTRICT=test !test? ( test )
SLOT=2
SRC_URI=mirror://apache/logging/log4j/2.17.1/apache-log4j-2.17.1-src.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
_md5_=70c00c60c3f5d42ae827a8bdc0e83d88
diff --git a/metadata/md5-cache/dev-java/log4j-core-2.17.2 b/metadata/md5-cache/dev-java/log4j-core-2.17.2
index 9a2c4384085b..f59a8f9b5dc6 100644
--- a/metadata/md5-cache/dev-java/log4j-core-2.17.2
+++ b/metadata/md5-cache/dev-java/log4j-core-2.17.2
@@ -3,6 +3,7 @@ DEPEND=dev-java/commons-compress:0 dev-java/commons-csv:0 dev-java/conversant-di
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
LICENSE=Apache-2.0
@@ -10,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* dev-java/commons-compress:0 dev-java/commons-csv:0 d
RESTRICT=test !test? ( test )
SLOT=2
SRC_URI=mirror://apache/logging/log4j/2.17.2/apache-log4j-2.17.2-src.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
_md5_=2432e2db5d112606a5ebcb124d414b84
diff --git a/metadata/md5-cache/dev-java/logback-classic-1.2.11 b/metadata/md5-cache/dev-java/logback-classic-1.2.11
index 9aeb631ec099..526cb56a9e40 100644
--- a/metadata/md5-cache/dev-java/logback-classic-1.2.11
+++ b/metadata/md5-cache/dev-java/logback-classic-1.2.11
@@ -3,11 +3,12 @@ DEPEND=virtual/jdk:1.8 dev-java/janino:0 dev-java/javax-mail:0 dev-java/logback-
DESCRIPTION=logback-classic module
EAPI=8
HOMEPAGE=http://logback.qos.ch
+INHERIT=java-pkg-2 java-pkg-simple
IUSE=doc source
-KEYWORDS=~amd64 ~arm64 ~ppc64
+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 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
-_md5_=e1c95d93b42eccb72d0f563082dae67f
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_md5_=b25afd6c5834774863a7be6eedabbd6d
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 af68ce65f9a3..f59a9f0350b2 100644
--- a/metadata/md5-cache/dev-java/logback-core-1.2.11
+++ b/metadata/md5-cache/dev-java/logback-core-1.2.11
@@ -3,12 +3,13 @@ DEPEND=>=virtual/jdk-1.8:* dev-java/javax-mail:0 dev-java/janino:0 dev-java/jans
DESCRIPTION=logback-core module
EAPI=8
HOMEPAGE=https://logback.qos.ch
+INHERIT=java-pkg-2 java-pkg-simple
IUSE=doc source test
-KEYWORDS=~amd64 ~arm64 ~ppc64
+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 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
-_md5_=1b5096efe927e2b4e39ccd7d62f72a44
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_md5_=d2e1f809837a7787e31597c53b5785f0
diff --git a/metadata/md5-cache/dev-java/lucene-2.4.1-r2 b/metadata/md5-cache/dev-java/lucene-2.4.1-r2
deleted file mode 100644
index 911b9fc85d59..000000000000
--- a/metadata/md5-cache/dev-java/lucene-2.4.1-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=dev-java/javacc:0 >=virtual/jdk-1.6 test? ( dev-java/junit:0 dev-java/ant-core:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
-DESCRIPTION=High-performance, full-featured text search engine written entirely in Java
-EAPI=6
-HOMEPAGE=https://lucene.apache.org
-IUSE=doc source test
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=dev-java/javacc:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=!test? ( test )
-SLOT=2.4
-SRC_URI=https://archive.apache.org/dist/lucene/java/lucene-2.4.1-src.tar.gz -> lucene-2.4.1.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 eapi7-ver 1a0a60ad07c8b32d2faba2d085dc0f24 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 9f813bb3c47cf2e60619a663b87c5f4e estack 055c42df72f76a4f45ec92b35e83cd56 eutils dab5d8ec471d025b79c9e6906bcf3bff java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib 4a33c9008e5ee30cb8840a3fdc24df2b preserve-libs a8e50acee31b5759b4df1f7707cae54b strip-linguas ac3ee41ee2d31d8c41a77c0838320cc7 toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8 vcs-clean d271b7bc7e6a009758d7d4ef749174e3 versionator d3fb3ba33acc3bbbdc4d7970227c100d wrapper 4a1902f969e5718126434fc35f3a0d9c
-_md5_=f600176223481fd074181365488abbb2
diff --git a/metadata/md5-cache/dev-java/lucene-2.4.1-r3 b/metadata/md5-cache/dev-java/lucene-2.4.1-r3
index 8da89077452f..064e7d5bf48e 100644
--- a/metadata/md5-cache/dev-java/lucene-2.4.1-r3
+++ b/metadata/md5-cache/dev-java/lucene-2.4.1-r3
@@ -3,12 +3,13 @@ DEPEND=dev-java/javacc:0 virtual/jdk:1.8 test? ( dev-java/junit:0 dev-java/ant-c
DESCRIPTION=High-performance, full-featured text search engine written entirely in Java
EAPI=8
HOMEPAGE=https://lucene.apache.org
+INHERIT=java-pkg-2 java-ant-2
IUSE=doc source test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
LICENSE=Apache-2.0
RDEPEND=dev-java/javacc:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
RESTRICT=!test? ( test )
SLOT=2.4
SRC_URI=https://archive.apache.org/dist/lucene/java/lucene-2.4.1-src.tar.gz -> lucene-2.4.1.tar.gz
-_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=0d5ebd095f71058ca68a13d8fb06d737
+_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_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 5330996d152d..912a35d54d4a 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
@@ -3,6 +3,7 @@ DEPEND=>=virtual/jdk-1.8:* dev-java/mvel:2.3 dev-libs/xxhash test? ( dev-java/ju
DESCRIPTION=LZ4 compression for Java
EAPI=8
HOMEPAGE=https://github.com/lz4/lz4-java
+INHERIT=java-pkg-2 java-ant-2 toolchain-funcs
IUSE=doc source test
KEYWORDS=amd64 ~arm arm64 ppc64 x86
LICENSE=Apache-2.0
@@ -10,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 92b5a4d196abffe2dbe3bdc1cf4ef2ae multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
_md5_=ea5f1bb76e73263100fbc2e08c2e1244
diff --git a/metadata/md5-cache/dev-java/lzma-19.00 b/metadata/md5-cache/dev-java/lzma-19.00
index f205ae080cba..31034aefc343 100644
--- a/metadata/md5-cache/dev-java/lzma-19.00
+++ b/metadata/md5-cache/dev-java/lzma-19.00
@@ -4,11 +4,12 @@ DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zi
DESCRIPTION=Java code for LZMA compression and decompression
EAPI=7
HOMEPAGE=https://www.7-zip.org/
+INHERIT=java-pkg-2 java-pkg-simple
IUSE=doc source
KEYWORDS=amd64 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 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
_md5_=9c54f1a52c6373711d85944874ee8e68
diff --git a/metadata/md5-cache/dev-java/lzmajio-0.95-r3 b/metadata/md5-cache/dev-java/lzmajio-0.95-r3
index 057f59f24c8b..a6d343eb87a0 100644
--- a/metadata/md5-cache/dev-java/lzmajio-0.95-r3
+++ b/metadata/md5-cache/dev-java/lzmajio-0.95-r3
@@ -3,11 +3,12 @@ DEPEND=dev-java/lzma:0 >=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 sourc
DESCRIPTION=LzmaInputStream/LzmaOutputStream interacting with underlying LZMA en-/decoders
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
LICENSE=LGPL-2.1
RDEPEND=dev-java/lzma:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=0
SRC_URI=https://github.com/league/lzmajio-0.95/archive/0.95.tar.gz -> lzmajio-0.95.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
_md5_=ac596e1478d250cd543873f491fb9ad8
diff --git a/metadata/md5-cache/dev-java/maven-bin-3.8.2 b/metadata/md5-cache/dev-java/maven-bin-3.8.2
index 6609d6e17c0a..e3f340267945 100644
--- a/metadata/md5-cache/dev-java/maven-bin-3.8.2
+++ b/metadata/md5-cache/dev-java/maven-bin-3.8.2
@@ -3,10 +3,11 @@ DEPEND=>=virtual/jdk-1.8:* app-eselect/eselect-java >=dev-java/java-config-2.2.0
DESCRIPTION=Project Management and Comprehension Tool for Java
EAPI=7
HOMEPAGE=https://maven.apache.org/
+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=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 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
_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 d717d97a618d..e4ffc1f2682f 100644
--- a/metadata/md5-cache/dev-java/maven-bin-3.8.3
+++ b/metadata/md5-cache/dev-java/maven-bin-3.8.3
@@ -3,10 +3,11 @@ DEPEND=>=virtual/jdk-1.8:* app-eselect/eselect-java >=dev-java/java-config-2.2.0
DESCRIPTION=Project Management and Comprehension Tool for Java
EAPI=7
HOMEPAGE=https://maven.apache.org/
+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=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 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
_md5_=70fd40cf2c49d35a9edcc067af05bb2c
diff --git a/metadata/md5-cache/dev-java/maven-hawtjni-plugin-1.15 b/metadata/md5-cache/dev-java/maven-hawtjni-plugin-1.15
index 5e27f2d5df13..3bc1ac217598 100644
--- a/metadata/md5-cache/dev-java/maven-hawtjni-plugin-1.15
+++ b/metadata/md5-cache/dev-java/maven-hawtjni-plugin-1.15
@@ -3,10 +3,11 @@ 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 92b5a4d196abffe2dbe3bdc1cf4ef2ae ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib 4a33c9008e5ee30cb8840a3fdc24df2b preserve-libs a8e50acee31b5759b4df1f7707cae54b strip-linguas ac3ee41ee2d31d8c41a77c0838320cc7 toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8 vcs-clean d271b7bc7e6a009758d7d4ef749174e3 versionator d3fb3ba33acc3bbbdc4d7970227c100d wrapper 4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 eapi7-ver 1a0a60ad07c8b32d2faba2d085dc0f24 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 9f813bb3c47cf2e60619a663b87c5f4e estack 055c42df72f76a4f45ec92b35e83cd56 eutils dab5d8ec471d025b79c9e6906bcf3bff java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 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 daa0827abf74..eae8732f19fe 100644
--- a/metadata/md5-cache/dev-java/mchange-commons-0.2.20
+++ b/metadata/md5-cache/dev-java/mchange-commons-0.2.20
@@ -3,11 +3,12 @@ DEPEND=dev-java/log4j-api:2 dev-java/log4j-12-api:2 dev-java/log4j-core:2 dev-ja
DESCRIPTION=a library of arguably useful Java utilities.
EAPI=8
HOMEPAGE=https://github.com/swaldman/mchange-commons-java
+INHERIT=java-pkg-2 java-pkg-simple
IUSE=doc source
KEYWORDS=amd64 ppc64 x86
LICENSE=EPL-1.0 LGPL-2.1
RDEPEND=dev-java/log4j-api:2 dev-java/log4j-12-api:2 dev-java/log4j-core:2 dev-java/slf4j-api:0 dev-java/typesafe-config:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=0
SRC_URI=https://github.com/swaldman/mchange-commons-java/archive/refs/tags/v0.2.20.tar.gz -> mchange-commons-0.2.20.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
_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 cee1ea72cae3..04d9adba7914 100644
--- a/metadata/md5-cache/dev-java/mersennetwister-0_pre23765-r2
+++ b/metadata/md5-cache/dev-java/mersennetwister-0_pre23765-r2
@@ -3,11 +3,12 @@ DEPEND=source? ( app-arch/zip ) >=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0
DESCRIPTION=Modified MersenneTwister java port for Freenet
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
LICENSE=BSD
RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=0
SRC_URI=mirror://gentoo/mersennetwister-0_pre23765.tar.bz2
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
_md5_=a68650c82c6a24bca015230d120a63f7
diff --git a/metadata/md5-cache/dev-java/metainf-services-1.7-r1 b/metadata/md5-cache/dev-java/metainf-services-1.7-r1
index 9079196fddc2..6394f12c8b5b 100644
--- a/metadata/md5-cache/dev-java/metainf-services-1.7-r1
+++ b/metadata/md5-cache/dev-java/metainf-services-1.7-r1
@@ -3,10 +3,11 @@ DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1
DESCRIPTION=Generates META-INF/services files automatically
EAPI=8
HOMEPAGE=http://metainf-services.kohsuke.org/
+INHERIT=java-pkg-2 java-ant-2
KEYWORDS=amd64 x86
LICENSE=MIT
RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3
SLOT=0
SRC_URI=https://github.com/kohsuke/metainf-services/archive/metainf-services-1.7.tar.gz
-_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
_md5_=d7b5cd9746772f19122b9cd09a35982e
diff --git a/metadata/md5-cache/dev-java/microba-0.4.4.3-r1 b/metadata/md5-cache/dev-java/microba-0.4.4.3-r1
deleted file mode 100644
index 864f032b997f..000000000000
--- a/metadata/md5-cache/dev-java/microba-0.4.4.3-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=dev-java/jgraph:0 >=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Swing components for date operations and palettes
-EAPI=6
-HOMEPAGE=https://github.com/tdbear/microba
-IUSE=doc source
-KEYWORDS=amd64 x86
-LICENSE=BSD
-RDEPEND=dev-java/jgraph:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://github.com/tdbear/microba/archive/0.4.4.3.zip -> microba-0.4.4.3.zip
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 eapi7-ver 1a0a60ad07c8b32d2faba2d085dc0f24 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 9f813bb3c47cf2e60619a663b87c5f4e estack 055c42df72f76a4f45ec92b35e83cd56 eutils dab5d8ec471d025b79c9e6906bcf3bff java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib 4a33c9008e5ee30cb8840a3fdc24df2b preserve-libs a8e50acee31b5759b4df1f7707cae54b strip-linguas ac3ee41ee2d31d8c41a77c0838320cc7 toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8 vcs-clean d271b7bc7e6a009758d7d4ef749174e3 versionator d3fb3ba33acc3bbbdc4d7970227c100d wrapper 4a1902f969e5718126434fc35f3a0d9c
-_md5_=c15914077d044c9b72f8a027fc0f258b
diff --git a/metadata/md5-cache/dev-java/microba-0.4.4.3-r2 b/metadata/md5-cache/dev-java/microba-0.4.4.3-r2
index 2b5cbb86d5ac..1799a3202fd0 100644
--- a/metadata/md5-cache/dev-java/microba-0.4.4.3-r2
+++ b/metadata/md5-cache/dev-java/microba-0.4.4.3-r2
@@ -3,11 +3,12 @@ DEPEND=dev-java/jgraph:0 >=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 sou
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
+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 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
-_md5_=84850ba57d8c9243e1748dd0e83ad36e
+_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 1008cd87c24a..15da094e91f1 100644
--- a/metadata/md5-cache/dev-java/miglayout-4.0-r1
+++ b/metadata/md5-cache/dev-java/miglayout-4.0-r1
@@ -4,11 +4,12 @@ DEPEND=swt? ( dev-java/swt:3.7 ) >=virtual/jdk-1.8:* >=dev-java/java-config-2.2.
DESCRIPTION=Easy to use yet very powerful Java Swing layout manager
EAPI=7
HOMEPAGE=http://www.miglayout.com/
+INHERIT=java-pkg-2
IUSE=swt doc examples source
KEYWORDS=amd64 x86
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 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
_md5_=f81c067fd7f0cb198281b55425f123c1
diff --git a/metadata/md5-cache/dev-java/mimepull-1.9.6-r2 b/metadata/md5-cache/dev-java/mimepull-1.9.6-r2
index 1282c9563bc5..f2624ed3c85a 100644
--- a/metadata/md5-cache/dev-java/mimepull-1.9.6-r2
+++ b/metadata/md5-cache/dev-java/mimepull-1.9.6-r2
@@ -3,11 +3,12 @@ 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 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib 4a33c9008e5ee30cb8840a3fdc24df2b preserve-libs a8e50acee31b5759b4df1f7707cae54b strip-linguas ac3ee41ee2d31d8c41a77c0838320cc7 toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8 vcs-clean d271b7bc7e6a009758d7d4ef749174e3 versionator d3fb3ba33acc3bbbdc4d7970227c100d wrapper 4a1902f969e5718126434fc35f3a0d9c
+_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 ce208ffc702d..912fe7f28a70 100644
--- a/metadata/md5-cache/dev-java/mockito-1.9.5-r2
+++ b/metadata/md5-cache/dev-java/mockito-1.9.5-r2
@@ -4,11 +4,12 @@ DEPEND=dev-java/ant-core:0 dev-java/hamcrest-core:0 dev-java/junit:4 dev-java/ob
DESCRIPTION=A mocking framework for Java
EAPI=7
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=dev-java/ant-core:0 dev-java/hamcrest-core:0 dev-java/junit:4 dev-java/objenesis:0 virtual/jre:1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=0
SRC_URI=https://mockito.googlecode.com/files/mockito-1.9.5.zip
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
_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 b769edfe8693..bf59ef3b31d7 100644
--- a/metadata/md5-cache/dev-java/mockito-4.4.0
+++ b/metadata/md5-cache/dev-java/mockito-4.4.0
@@ -3,11 +3,12 @@ DEPEND=>=virtual/jdk-1.8:* dev-java/byte-buddy:0 dev-java/byte-buddy-agent:0 dev
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://codeload.github.com/mockito/mockito/tar.gz/v4.4.0 -> mockito-4.4.0.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
_md5_=dbdc51a283c629b3a94da7e5d9b2cdec
diff --git a/metadata/md5-cache/dev-java/msv-20130601 b/metadata/md5-cache/dev-java/msv-20130601
index d66cf1d71ce4..eaab3cd545e9 100644
--- a/metadata/md5-cache/dev-java/msv-20130601
+++ b/metadata/md5-cache/dev-java/msv-20130601
@@ -4,11 +4,12 @@ DEPEND=dev-java/iso-relax:0 dev-java/relaxng-datatype:0 dev-java/xml-commons-res
DESCRIPTION=Multi-Schema XML Validator, a Java tool for validating XML documents
EAPI=8
HOMEPAGE=https://msv.java.net/
+INHERIT=java-pkg-2 java-pkg-simple
IUSE=doc source
KEYWORDS=amd64 ~arm arm64 ppc64 x86
LICENSE=BSD Apache-2.0
RDEPEND=dev-java/iso-relax:0 dev-java/relaxng-datatype:0 dev-java/xml-commons-resolver:0 dev-java/xsdlib:0 dev-java/xerces:2 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=0
SRC_URI=https://search.maven.org/remotecontent?filepath=net/java/dev/msv/msv-core/2013.6.1/msv-core-2013.6.1-sources.jar
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
_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 13e4a8fb1cdd..6d40e5a48058 100644
--- a/metadata/md5-cache/dev-java/mvel-2.3.2-r1
+++ b/metadata/md5-cache/dev-java/mvel-2.3.2-r1
@@ -3,6 +3,7 @@ DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zi
DESCRIPTION=MVFLEX Expression Language
EAPI=8
HOMEPAGE=https://github.com/mvel/mvel
+INHERIT=java-pkg-2 java-pkg-simple
IUSE=doc source test
KEYWORDS=amd64 ~arm arm64 ppc64 x86
LICENSE=Apache-2.0
@@ -10,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 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
_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 28f957dea3d6..af7779eb2bee 100644
--- a/metadata/md5-cache/dev-java/netty-4.1.35
+++ b/metadata/md5-cache/dev-java/netty-4.1.35
@@ -3,12 +3,13 @@ DEPEND=>=virtual/jdk-1.8:* dev-java/commons-logging:0 dev-java/jctools-core:0 de
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 ~arm64 ~ppc64
+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 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
-_md5_=46287e1bba52cfaff9f7b136521d6b4c
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_md5_=449c1fcdc263291464441dadf8c476ec
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 2141fd12775e..2f44c29bc21e 100644
--- a/metadata/md5-cache/dev-java/netty-buffer-4.0.36
+++ b/metadata/md5-cache/dev-java/netty-buffer-4.0.36
@@ -3,6 +3,7 @@ DEPEND=>=virtual/jdk-1.7 ~dev-java/netty-common-4.0.36:0 test? ( dev-java/easymo
DESCRIPTION=Async event-driven framework for high performance network applications
EAPI=5
HOMEPAGE=https://netty.io/
+INHERIT=java-pkg-2 java-pkg-simple
IUSE=test doc source
KEYWORDS=amd64 arm64 ppc64 x86
LICENSE=Apache-2.0
@@ -10,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 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib 4a33c9008e5ee30cb8840a3fdc24df2b preserve-libs a8e50acee31b5759b4df1f7707cae54b strip-linguas ac3ee41ee2d31d8c41a77c0838320cc7 toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8 vcs-clean d271b7bc7e6a009758d7d4ef749174e3 versionator d3fb3ba33acc3bbbdc4d7970227c100d wrapper 4a1902f969e5718126434fc35f3a0d9c
+_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_=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 a7d5bfef7c01..9f56cd6b0ce7 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
@@ -3,6 +3,7 @@ DEPEND=dev-java/netty-common:0 >=virtual/jdk-1.8:* test? ( dev-java/easymock:3.2
DESCRIPTION=Async event-driven framework for high performance network applications
EAPI=8
HOMEPAGE=https://netty.io/
+INHERIT=check-reqs java-pkg-2 java-pkg-simple
IUSE=doc source test
KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
LICENSE=Apache-2.0
@@ -10,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 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_eclasses_=check-reqs 82234bf011d5453330773cd5fc3f0199 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
_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 77b28e0dcd80..dfb3be4f5b93 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
@@ -3,6 +3,7 @@ DEPEND=dev-java/commons-logging:0 dev-java/javassist:3 dev-java/log4j-12-api:2 d
DESCRIPTION=Async event-driven framework for high performance network applications
EAPI=8
HOMEPAGE=https://netty.io/
+INHERIT=java-pkg-2 java-pkg-simple
IUSE=test doc source
KEYWORDS=amd64 ~arm arm64 ppc64 x86
LICENSE=Apache-2.0
@@ -10,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 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
_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 cae03f73d27d..a3773c8943ca 100644
--- a/metadata/md5-cache/dev-java/netty-transport-4.0.36
+++ b/metadata/md5-cache/dev-java/netty-transport-4.0.36
@@ -3,6 +3,7 @@ DEPEND=>=virtual/jdk-1.7 ~dev-java/netty-buffer-4.0.36:0 ~dev-java/netty-common-
DESCRIPTION=Async event-driven framework for high performance network applications
EAPI=5
HOMEPAGE=https://netty.io/
+INHERIT=java-pkg-2 java-pkg-simple
IUSE=test doc source
KEYWORDS=amd64 ~arm arm64 ppc64 x86
LICENSE=Apache-2.0
@@ -10,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 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib 4a33c9008e5ee30cb8840a3fdc24df2b preserve-libs a8e50acee31b5759b4df1f7707cae54b strip-linguas ac3ee41ee2d31d8c41a77c0838320cc7 toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8 vcs-clean d271b7bc7e6a009758d7d4ef749174e3 versionator d3fb3ba33acc3bbbdc4d7970227c100d wrapper 4a1902f969e5718126434fc35f3a0d9c
+_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_=daa26d6c482ae201228a945f47e696f3
diff --git a/metadata/md5-cache/dev-java/objenesis-3.2 b/metadata/md5-cache/dev-java/objenesis-3.2
index 8203a8771cee..020aefb73802 100644
--- a/metadata/md5-cache/dev-java/objenesis-3.2
+++ b/metadata/md5-cache/dev-java/objenesis-3.2
@@ -3,6 +3,7 @@ DEPEND=>=virtual/jdk-1.8:* test? ( >=dev-java/objenesis-test-3.2:0 ) >=dev-java/
DESCRIPTION=A library for instantiating Java objects
EAPI=7
HOMEPAGE=http://objenesis.org/
+INHERIT=java-pkg-2 java-pkg-simple
IUSE=doc source test
KEYWORDS=amd64 ~arm arm64 ppc64 x86
LICENSE=Apache-2.0
@@ -10,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 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
_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 6896ead93c41..bd742d3fc8c9 100644
--- a/metadata/md5-cache/dev-java/objenesis-test-3.2
+++ b/metadata/md5-cache/dev-java/objenesis-test-3.2
@@ -3,11 +3,12 @@ DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zi
DESCRIPTION=Test library for Objenesis library
EAPI=7
HOMEPAGE=http://objenesis.org
+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://github.com/easymock/objenesis/archive/refs/tags/3.2.tar.gz -> objenesis-3.2.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
_md5_=f281541877d897bfd7500ea353a84ca9
diff --git a/metadata/md5-cache/dev-java/openjdk-11.0.13_p8 b/metadata/md5-cache/dev-java/openjdk-11.0.13_p8
deleted file mode 100644
index fa4500d35db4..000000000000
--- a/metadata/md5-cache/dev-java/openjdk-11.0.13_p8
+++ /dev/null
@@ -1,14 +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= ) || ( dev-java/openjdk-bin:11 dev-java/openjdk:11 ) >=dev-java/java-config-2.2.0-r3 dev-java/java-config app-eselect/eselect-java
-DESCRIPTION=Open source implementation of the Java programming language
-EAPI=6
-HOMEPAGE=https://openjdk.java.net
-IUSE=alsa cups debug doc examples gentoo-vm headless-awt javafx +jbootstrap pch selinux source systemtap
-KEYWORDS=amd64 ~arm arm64 ppc64
-LICENSE=GPL-2
-RDEPEND=media-libs/freetype:2= media-libs/giflib:0/7 media-libs/harfbuzz:= media-libs/libpng:0= media-libs/lcms:2= sys-libs/zlib virtual/jpeg:0= systemtap? ( dev-util/systemtap ) >=sys-apps/baselayout-java-0.1.0-r1 !headless-awt? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXt x11-libs/libXtst ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) selinux? ( sec-policy/selinux-java ) >=dev-java/java-config-2.2.0-r3 dev-java/java-config app-eselect/eselect-java
-REQUIRED_USE=javafx? ( alsa !headless-awt )
-SLOT=11
-SRC_URI=https://github.com/openjdk/jdk11u-dev/archive/refs/tags/jdk-11.0.13-ga.tar.gz -> openjdk-11.0.13_p8.tar.gz
-_eclasses_=check-reqs 82234bf011d5453330773cd5fc3f0199 desktop c0d27bf73aa08ca05b663dbd31fbef28 eapi7-ver 1a0a60ad07c8b32d2faba2d085dc0f24 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 9f813bb3c47cf2e60619a663b87c5f4e estack 055c42df72f76a4f45ec92b35e83cd56 eutils dab5d8ec471d025b79c9e6906bcf3bff flag-o-matic a500d7cc40da3de38c361e889153bdf7 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae java-vm-2 69658c0814b27f9cbe466a24e6621d23 ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib 4a33c9008e5ee30cb8840a3fdc24df2b multiprocessing 61c959fc55c15c00bbb1079d6a71370b pax-utils 91d47e5d20627c717aa878b9167c62a8 prefix eab3c99d77fe00506c109c8a736186f7 preserve-libs a8e50acee31b5759b4df1f7707cae54b strip-linguas ac3ee41ee2d31d8c41a77c0838320cc7 toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8 vcs-clean d271b7bc7e6a009758d7d4ef749174e3 versionator d3fb3ba33acc3bbbdc4d7970227c100d wrapper 4a1902f969e5718126434fc35f3a0d9c xdg-utils fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=43b5a1ced82b1f58dac07fb260bb6fef
diff --git a/metadata/md5-cache/dev-java/openjdk-11.0.14_p9-r1 b/metadata/md5-cache/dev-java/openjdk-11.0.14_p9-r1
index 4d3d174a1a0d..21c206164d2c 100644
--- a/metadata/md5-cache/dev-java/openjdk-11.0.14_p9-r1
+++ b/metadata/md5-cache/dev-java/openjdk-11.0.14_p9-r1
@@ -3,12 +3,13 @@ DEPEND=media-libs/freetype:2= media-libs/giflib:0/7 media-libs/harfbuzz:= media-
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 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.14-ga.tar.gz -> openjdk-11.0.14_p9.tar.gz !system-bootstrap? ( ppc64? ( big-endian? ( https://dev.gentoo.org/~arthurzam/distfiles/dev-java/openjdk/openjdk-bootstrap-11.0.13_p8-ppc64.tar.xz ) ) x86? ( https://dev.gentoo.org/~arthurzam/distfiles/dev-java/openjdk/openjdk-bootstrap-11.0.13_p8-x86.tar.xz ) )
-_eclasses_=check-reqs 82234bf011d5453330773cd5fc3f0199 eapi8-dosym cd7d420bb5be5ee079f27239ce76b8f5 edos2unix 33e347e171066657f91f8b0c72ec8773 eutils dab5d8ec471d025b79c9e6906bcf3bff flag-o-matic a500d7cc40da3de38c361e889153bdf7 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae java-vm-2 69658c0814b27f9cbe466a24e6621d23 multilib 4a33c9008e5ee30cb8840a3fdc24df2b multiprocessing 61c959fc55c15c00bbb1079d6a71370b pax-utils 91d47e5d20627c717aa878b9167c62a8 prefix eab3c99d77fe00506c109c8a736186f7 strip-linguas ac3ee41ee2d31d8c41a77c0838320cc7 toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8 wrapper 4a1902f969e5718126434fc35f3a0d9c xdg-utils fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=6f6de145eca4f6efb6851bb3a317c555
+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
new file mode 100644
index 000000000000..b1fd8cb12683
--- /dev/null
+++ b/metadata/md5-cache/dev-java/openjdk-11.0.15_p10
@@ -0,0 +1,15 @@
+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.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
diff --git a/metadata/md5-cache/dev-java/openjdk-17.0.1_p12 b/metadata/md5-cache/dev-java/openjdk-17.0.1_p12
deleted file mode 100644
index a4d9925d158f..000000000000
--- a/metadata/md5-cache/dev-java/openjdk-17.0.1_p12
+++ /dev/null
@@ -1,14 +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= ) || ( dev-java/openjdk-bin:17 dev-java/openjdk:17 ) >=dev-java/java-config-2.2.0-r3 dev-java/java-config app-eselect/eselect-java
-DESCRIPTION=Open source implementation of the Java programming language
-EAPI=6
-HOMEPAGE=https://openjdk.java.net
-IUSE=alsa cups debug doc examples gentoo-vm headless-awt javafx +jbootstrap pch selinux source systemtap
-KEYWORDS=amd64 ~arm arm64 ppc64
-LICENSE=GPL-2
-RDEPEND=media-libs/freetype:2= media-libs/giflib:0/7 media-libs/harfbuzz:= media-libs/libpng:0= media-libs/lcms:2= sys-libs/zlib virtual/jpeg:0= systemtap? ( dev-util/systemtap ) >=sys-apps/baselayout-java-0.1.0-r1 !headless-awt? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXt x11-libs/libXtst ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) selinux? ( sec-policy/selinux-java ) >=dev-java/java-config-2.2.0-r3 dev-java/java-config app-eselect/eselect-java
-REQUIRED_USE=javafx? ( alsa !headless-awt )
-SLOT=17
-SRC_URI=https://github.com/openjdk/jdk17u/archive/refs/tags/jdk-17.0.1+12.tar.gz -> openjdk-17.0.1_p12.tar.gz
-_eclasses_=check-reqs 82234bf011d5453330773cd5fc3f0199 desktop c0d27bf73aa08ca05b663dbd31fbef28 eapi7-ver 1a0a60ad07c8b32d2faba2d085dc0f24 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 9f813bb3c47cf2e60619a663b87c5f4e estack 055c42df72f76a4f45ec92b35e83cd56 eutils dab5d8ec471d025b79c9e6906bcf3bff flag-o-matic a500d7cc40da3de38c361e889153bdf7 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae java-vm-2 69658c0814b27f9cbe466a24e6621d23 ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib 4a33c9008e5ee30cb8840a3fdc24df2b multiprocessing 61c959fc55c15c00bbb1079d6a71370b pax-utils 91d47e5d20627c717aa878b9167c62a8 prefix eab3c99d77fe00506c109c8a736186f7 preserve-libs a8e50acee31b5759b4df1f7707cae54b strip-linguas ac3ee41ee2d31d8c41a77c0838320cc7 toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8 vcs-clean d271b7bc7e6a009758d7d4ef749174e3 versionator d3fb3ba33acc3bbbdc4d7970227c100d wrapper 4a1902f969e5718126434fc35f3a0d9c xdg-utils fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=1ec349a27d3349cb45a8a1fcd56d56a1
diff --git a/metadata/md5-cache/dev-java/openjdk-17.0.2_p8 b/metadata/md5-cache/dev-java/openjdk-17.0.2_p8
index f93f26c3ba68..dcee77f3f23b 100644
--- a/metadata/md5-cache/dev-java/openjdk-17.0.2_p8
+++ b/metadata/md5-cache/dev-java/openjdk-17.0.2_p8
@@ -3,6 +3,7 @@ DEPEND=media-libs/freetype:2= media-libs/giflib:0/7 media-libs/harfbuzz:= media-
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
@@ -10,5 +11,5 @@ RDEPEND=media-libs/freetype:2= media-libs/giflib:0/7 media-libs/harfbuzz:= media
REQUIRED_USE=javafx? ( alsa !headless-awt ) !system-bootstrap? ( jbootstrap )
SLOT=17
SRC_URI=https://github.com/openjdk/jdk17u/archive/refs/tags/jdk-17.0.2+8.tar.gz -> openjdk-17.0.2_p8.tar.gz !system-bootstrap? ( arm64? ( elibc_musl? ( https://dev.gentoo.org/~arthurzam/distfiles/dev-java/openjdk/openjdk-bootstrap-17.0.2_p8-arm64-musl.tar.xz ) ) ppc64? ( big-endian? ( https://dev.gentoo.org/~arthurzam/distfiles/dev-java/openjdk/openjdk-bootstrap-17.0.1_p12-ppc64.tar.xz ) ) x86? ( https://dev.gentoo.org/~arthurzam/distfiles/dev-java/openjdk/openjdk-bootstrap-17.0.1_p12-x86.tar.xz ) )
-_eclasses_=check-reqs 82234bf011d5453330773cd5fc3f0199 eapi8-dosym cd7d420bb5be5ee079f27239ce76b8f5 edos2unix 33e347e171066657f91f8b0c72ec8773 eutils dab5d8ec471d025b79c9e6906bcf3bff flag-o-matic a500d7cc40da3de38c361e889153bdf7 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae java-vm-2 69658c0814b27f9cbe466a24e6621d23 multilib 4a33c9008e5ee30cb8840a3fdc24df2b multiprocessing 61c959fc55c15c00bbb1079d6a71370b pax-utils 91d47e5d20627c717aa878b9167c62a8 prefix eab3c99d77fe00506c109c8a736186f7 strip-linguas ac3ee41ee2d31d8c41a77c0838320cc7 toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8 wrapper 4a1902f969e5718126434fc35f3a0d9c xdg-utils fffb53a53cf17c9c0c998a3c0a590c7e
+_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
new file mode 100644
index 000000000000..839ec718fcaf
--- /dev/null
+++ b/metadata/md5-cache/dev-java/openjdk-17.0.3_p7
@@ -0,0 +1,15 @@
+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.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
diff --git a/metadata/md5-cache/dev-java/openjdk-8.312_p07 b/metadata/md5-cache/dev-java/openjdk-8.312_p07
deleted file mode 100644
index 4cb4cce3fb2f..000000000000
--- a/metadata/md5-cache/dev-java/openjdk-8.312_p07
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm pretend setup unpack
-DEPEND=media-libs/freetype:2= media-libs/giflib:0/7 sys-libs/zlib app-arch/zip media-libs/alsa-lib net-print/cups virtual/pkgconfig x11-base/xorg-proto x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrender x11-libs/libXt x11-libs/libXtst || ( dev-java/openjdk-bin:8 dev-java/icedtea-bin:8 dev-java/openjdk:8 dev-java/icedtea:8 ) >=dev-java/java-config-2.2.0-r3 dev-java/java-config app-eselect/eselect-java
-DESCRIPTION=Open source implementation of the Java programming language
-EAPI=6
-HOMEPAGE=https://openjdk.java.net
-IUSE=alsa debug cups doc examples headless-awt javafx +jbootstrap pch selinux source
-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=!arm64? ( https://hg.openjdk.java.net/jdk8u/jdk8u/archive/jdk8u312-ga.tar.bz2 -> openjdk-8.312_p07.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/corba/archive/jdk8u312-ga.tar.bz2 -> openjdk-corba-8.312_p07.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/hotspot/archive/jdk8u312-ga.tar.bz2 -> openjdk-hotspot-8.312_p07.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/jaxp/archive/jdk8u312-ga.tar.bz2 -> openjdk-jaxp-8.312_p07.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/jaxws/archive/jdk8u312-ga.tar.bz2 -> openjdk-jaxws-8.312_p07.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/jdk/archive/jdk8u312-ga.tar.bz2 -> openjdk-jdk-8.312_p07.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/langtools/archive/jdk8u312-ga.tar.bz2 -> openjdk-langtools-8.312_p07.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/nashorn/archive/jdk8u312-ga.tar.bz2 -> openjdk-nashorn-8.312_p07.tar.bz2 ) arm64? ( https://hg.openjdk.java.net/aarch64-port/jdk8u-shenandoah/archive/aarch64-shenandoah-jdk8u312-b07.tar.bz2 -> openjdk-aarch64-shenandoah-8.312_p07.tar.bz2 https://hg.openjdk.java.net/aarch64-port/jdk8u-shenandoah/corba/archive/aarch64-shenandoah-jdk8u312-b07.tar.bz2 -> openjdk-aarch64-shenandoah-corba-8.312_p07.tar.bz2 https://hg.openjdk.java.net/aarch64-port/jdk8u-shenandoah/hotspot/archive/aarch64-shenandoah-jdk8u312-b07.tar.bz2 -> openjdk-aarch64-shenandoah-hotspot-8.312_p07.tar.bz2 https://hg.openjdk.java.net/aarch64-port/jdk8u-shenandoah/jaxp/archive/aarch64-shenandoah-jdk8u312-b07.tar.bz2 -> openjdk-aarch64-shenandoah-jaxp-8.312_p07.tar.bz2 https://hg.openjdk.java.net/aarch64-port/jdk8u-shenandoah/jaxws/archive/aarch64-shenandoah-jdk8u312-b07.tar.bz2 -> openjdk-aarch64-shenandoah-jaxws-8.312_p07.tar.bz2 https://hg.openjdk.java.net/aarch64-port/jdk8u-shenandoah/jdk/archive/aarch64-shenandoah-jdk8u312-b07.tar.bz2 -> openjdk-aarch64-shenandoah-jdk-8.312_p07.tar.bz2 https://hg.openjdk.java.net/aarch64-port/jdk8u-shenandoah/langtools/archive/aarch64-shenandoah-jdk8u312-b07.tar.bz2 -> openjdk-aarch64-shenandoah-langtools-8.312_p07.tar.bz2 https://hg.openjdk.java.net/aarch64-port/jdk8u-shenandoah/nashorn/archive/aarch64-shenandoah-jdk8u312-b07.tar.bz2 -> openjdk-aarch64-shenandoah-nashorn-jdk8.312_p07.tar.bz2 )
-_eclasses_=check-reqs 82234bf011d5453330773cd5fc3f0199 desktop c0d27bf73aa08ca05b663dbd31fbef28 eapi7-ver 1a0a60ad07c8b32d2faba2d085dc0f24 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 9f813bb3c47cf2e60619a663b87c5f4e estack 055c42df72f76a4f45ec92b35e83cd56 eutils dab5d8ec471d025b79c9e6906bcf3bff flag-o-matic a500d7cc40da3de38c361e889153bdf7 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae java-vm-2 69658c0814b27f9cbe466a24e6621d23 ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib 4a33c9008e5ee30cb8840a3fdc24df2b multiprocessing 61c959fc55c15c00bbb1079d6a71370b pax-utils 91d47e5d20627c717aa878b9167c62a8 prefix eab3c99d77fe00506c109c8a736186f7 preserve-libs a8e50acee31b5759b4df1f7707cae54b strip-linguas ac3ee41ee2d31d8c41a77c0838320cc7 toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8 vcs-clean d271b7bc7e6a009758d7d4ef749174e3 versionator d3fb3ba33acc3bbbdc4d7970227c100d wrapper 4a1902f969e5718126434fc35f3a0d9c xdg-utils fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=53014ab8b45ec984c85b2735b0fa6faa
diff --git a/metadata/md5-cache/dev-java/openjdk-8.322_p06 b/metadata/md5-cache/dev-java/openjdk-8.322_p06
index 22c480b6fc1e..12f66555274e 100644
--- a/metadata/md5-cache/dev-java/openjdk-8.322_p06
+++ b/metadata/md5-cache/dev-java/openjdk-8.322_p06
@@ -4,6 +4,7 @@ DEPEND=media-libs/freetype:2= media-libs/giflib:0/7 sys-libs/zlib app-arch/zip m
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
@@ -11,5 +12,5 @@ PDEPEND=javafx? ( dev-java/openjfx:8 )
RDEPEND=media-libs/freetype:2= media-libs/giflib:0/7 sys-libs/zlib >=sys-apps/baselayout-java-0.1.0-r1 !headless-awt? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrender x11-libs/libXt x11-libs/libXtst ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) selinux? ( sec-policy/selinux-java ) >=dev-java/java-config-2.2.0-r3 dev-java/java-config app-eselect/eselect-java
SLOT=8
SRC_URI=https://github.com/openjdk/jdk8u/archive/refs/tags/jdk8u322-ga.tar.gz -> openjdk-8.322_p06.tar.gz
-_eclasses_=check-reqs 82234bf011d5453330773cd5fc3f0199 eapi8-dosym cd7d420bb5be5ee079f27239ce76b8f5 edos2unix 33e347e171066657f91f8b0c72ec8773 eutils dab5d8ec471d025b79c9e6906bcf3bff flag-o-matic a500d7cc40da3de38c361e889153bdf7 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae java-vm-2 69658c0814b27f9cbe466a24e6621d23 multilib 4a33c9008e5ee30cb8840a3fdc24df2b multiprocessing 61c959fc55c15c00bbb1079d6a71370b pax-utils 91d47e5d20627c717aa878b9167c62a8 prefix eab3c99d77fe00506c109c8a736186f7 strip-linguas ac3ee41ee2d31d8c41a77c0838320cc7 toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8 wrapper 4a1902f969e5718126434fc35f3a0d9c xdg-utils fffb53a53cf17c9c0c998a3c0a590c7e
+_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
new file mode 100644
index 000000000000..439207042917
--- /dev/null
+++ b/metadata/md5-cache/dev-java/openjdk-8.332_p09
@@ -0,0 +1,16 @@
+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/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
diff --git a/metadata/md5-cache/dev-java/openjdk-bin-11.0.13_p8 b/metadata/md5-cache/dev-java/openjdk-bin-11.0.13_p8
deleted file mode 100644
index ad56f218d240..000000000000
--- a/metadata/md5-cache/dev-java/openjdk-bin-11.0.13_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=6
-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 >=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=arm? ( https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.13+8/OpenJDK11U-jdk_arm_linux_hotspot_11.0.13_8.tar.gz ) arm64? ( https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.13+8/OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.13_8.tar.gz ) ppc64? ( https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.13+8/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.13_8.tar.gz ) amd64? ( https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.13+8/OpenJDK11U-jdk_x64_linux_hotspot_11.0.13_8.tar.gz ) x64-macos? ( https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.13+8/OpenJDK11U-jdk_x64_mac_hotspot_11.0.13_8.tar.gz )
-_eclasses_=java-vm-2 69658c0814b27f9cbe466a24e6621d23 multilib 4a33c9008e5ee30cb8840a3fdc24df2b pax-utils 91d47e5d20627c717aa878b9167c62a8 prefix eab3c99d77fe00506c109c8a736186f7 toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8 xdg-utils fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=3f272d3be56e61133a0d26f26112db46
diff --git a/metadata/md5-cache/dev-java/openjdk-bin-11.0.13_p8-r1 b/metadata/md5-cache/dev-java/openjdk-bin-11.0.13_p8-r1
deleted file mode 100644
index 4ecf8fca0442..000000000000
--- a/metadata/md5-cache/dev-java/openjdk-bin-11.0.13_p8-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 +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 >=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=arm? ( https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.13+8/OpenJDK11U-jdk_arm_linux_hotspot_11.0.13_8.tar.gz ) arm64? ( https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.13+8/OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.13_8.tar.gz ) ppc64? ( https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.13+8/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.13_8.tar.gz ) amd64? ( https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.13+8/OpenJDK11U-jdk_x64_linux_hotspot_11.0.13_8.tar.gz ) x64-macos? ( https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.13+8/OpenJDK11U-jdk_x64_mac_hotspot_11.0.13_8.tar.gz )
-_eclasses_=java-vm-2 69658c0814b27f9cbe466a24e6621d23 multilib 4a33c9008e5ee30cb8840a3fdc24df2b pax-utils 91d47e5d20627c717aa878b9167c62a8 prefix eab3c99d77fe00506c109c8a736186f7 toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8 xdg-utils fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=ca6b022d6f439abf1f0013b6da33d7b5
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
new file mode 100644
index 000000000000..26eb2f38d10b
--- /dev/null
+++ b/metadata/md5-cache/dev-java/openjdk-bin-11.0.15_p10
@@ -0,0 +1,15 @@
+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
+INHERIT=java-vm-2 toolchain-funcs
+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.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
diff --git a/metadata/md5-cache/dev-java/openjdk-bin-17.0.1_p12-r1 b/metadata/md5-cache/dev-java/openjdk-bin-17.0.1_p12-r1
deleted file mode 100644
index 58d324a7fb95..000000000000
--- a/metadata/md5-cache/dev-java/openjdk-bin-17.0.1_p12-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 +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:* ) 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=arm? ( https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.1+12//OpenJDK17U-jdk_arm_linux_hotspot_17.0.1_12.tar.gz ) arm64? ( https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.1+12//OpenJDK17U-jdk_aarch64_linux_hotspot_17.0.1_12.tar.gz ) ppc64? ( https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.1+12//OpenJDK17U-jdk_ppc64le_linux_hotspot_17.0.1_12.tar.gz ) amd64? ( https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.1+12//OpenJDK17U-jdk_x64_linux_hotspot_17.0.1_12.tar.gz ) amd64? ( elibc_musl? ( https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.1+12//OpenJDK17U-jdk_x64_alpine-linux_hotspot_17.0.1_12.tar.gz ) ) x64-macos? ( https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.1+12//OpenJDK17U-jdk_x64_mac_hotspot_17.0.1_12.tar.gz )
-_eclasses_=java-vm-2 69658c0814b27f9cbe466a24e6621d23 multilib 4a33c9008e5ee30cb8840a3fdc24df2b pax-utils 91d47e5d20627c717aa878b9167c62a8 prefix eab3c99d77fe00506c109c8a736186f7 toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8 xdg-utils fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=b8267bc320c6e32ec025cb4885d27fa3
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
new file mode 100644
index 000000000000..6fab4a0c10c6
--- /dev/null
+++ b/metadata/md5-cache/dev-java/openjdk-bin-17.0.3_p7
@@ -0,0 +1,15 @@
+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
+INHERIT=java-vm-2 toolchain-funcs
+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.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
diff --git a/metadata/md5-cache/dev-java/openjdk-bin-8.312_p07 b/metadata/md5-cache/dev-java/openjdk-bin-8.312_p07
deleted file mode 100644
index 9751e091ce55..000000000000
--- a/metadata/md5-cache/dev-java/openjdk-bin-8.312_p07
+++ /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=6
-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=arm64? ( https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u312-b07/OpenJDK8U-jdk_aarch64_linux_hotspot_8u312b07.tar.gz ) arm? ( https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u312-b07/OpenJDK8U-jdk_arm_linux_hotspot_8u312b07.tar.gz ) ppc64? ( https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u312-b07/OpenJDK8U-jdk_ppc64le_linux_hotspot_8u312b07.tar.gz ) amd64? ( https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u312-b07/OpenJDK8U-jdk_x64_linux_hotspot_8u312b07.tar.gz ) x64-macos? ( https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u312-b07/OpenJDK8U-jdk_x64_mac_hotspot_8u312b07.tar.gz )
-_eclasses_=eapi7-ver 1a0a60ad07c8b32d2faba2d085dc0f24 java-vm-2 69658c0814b27f9cbe466a24e6621d23 multilib 4a33c9008e5ee30cb8840a3fdc24df2b pax-utils 91d47e5d20627c717aa878b9167c62a8 prefix eab3c99d77fe00506c109c8a736186f7 toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8 xdg-utils fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=d85cabd51295998f9d216c814565176e
diff --git a/metadata/md5-cache/dev-java/openjdk-bin-8.312_p07-r1 b/metadata/md5-cache/dev-java/openjdk-bin-8.332_p09
index fd8636d1391c..4be798e839dc 100644
--- a/metadata/md5-cache/dev-java/openjdk-bin-8.312_p07-r1
+++ b/metadata/md5-cache/dev-java/openjdk-bin-8.332_p09
@@ -3,12 +3,13 @@ DEPEND=dev-java/java-config app-eselect/eselect-java
DESCRIPTION=Prebuilt Java JDK binaries provided by Eclipse Temurin
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
LICENSE=GPL-2-with-classpath-exception
RDEPEND=>=sys-apps/baselayout-java-0.1.0-r1 kernel_linux? ( media-libs/fontconfig:1.0 media-libs/freetype:2 >=sys-libs/glibc-2.2.5:* sys-libs/zlib alsa? ( media-libs/alsa-lib ) arm? ( dev-libs/libffi-compat:6 ) cups? ( net-print/cups ) selinux? ( sec-policy/selinux-java ) !headless-awt? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrender x11-libs/libXtst ) ) dev-java/java-config app-eselect/eselect-java
RESTRICT=preserve-libs strip
SLOT=8
-SRC_URI=arm64? ( https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u312-b07/OpenJDK8U-jdk_aarch64_linux_hotspot_8u312b07.tar.gz ) arm? ( https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u312-b07/OpenJDK8U-jdk_arm_linux_hotspot_8u312b07.tar.gz ) ppc64? ( https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u312-b07/OpenJDK8U-jdk_ppc64le_linux_hotspot_8u312b07.tar.gz ) amd64? ( https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u312-b07/OpenJDK8U-jdk_x64_linux_hotspot_8u312b07.tar.gz ) x64-macos? ( https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u312-b07/OpenJDK8U-jdk_x64_mac_hotspot_8u312b07.tar.gz )
+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_=717c3a63b3a210f0c33eb497d5e9e06d
+_md5_=816e99fe5d6aa319265d8e1bce44d0d5
diff --git a/metadata/md5-cache/dev-java/openjdk-jre-bin-11.0.14_p9 b/metadata/md5-cache/dev-java/openjdk-jre-bin-11.0.14_p9-r1
index 23fc95a11d17..23fc95a11d17 100644
--- a/metadata/md5-cache/dev-java/openjdk-jre-bin-11.0.14_p9
+++ b/metadata/md5-cache/dev-java/openjdk-jre-bin-11.0.14_p9-r1
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
new file mode 100644
index 000000000000..5012f58c564a
--- /dev/null
+++ b/metadata/md5-cache/dev-java/openjdk-jre-bin-11.0.15_p10
@@ -0,0 +1,15 @@
+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
+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
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
new file mode 100644
index 000000000000..d5b6a1976755
--- /dev/null
+++ b/metadata/md5-cache/dev-java/openjdk-jre-bin-17.0.3_p7
@@ -0,0 +1,15 @@
+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
+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
diff --git a/metadata/md5-cache/dev-java/openjdk-jre-bin-8.312_p07-r1 b/metadata/md5-cache/dev-java/openjdk-jre-bin-8.332_p09
index 634f75c46b8d..0277f0faefd0 100644
--- a/metadata/md5-cache/dev-java/openjdk-jre-bin-8.312_p07-r1
+++ b/metadata/md5-cache/dev-java/openjdk-jre-bin-8.332_p09
@@ -3,12 +3,13 @@ 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
+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/jdk8u312-b07/OpenJDK8U-jre_x64_linux_hotspot_8u312b07.tar.gz )
+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_=3b32f9556c26e979ae3fd2efc29f20b7
+_md5_=ba60498a19a073949d6bbf7974652ad4
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 ecf921fcf928..379cc11ffe51 100644
--- a/metadata/md5-cache/dev-java/openjfx-11.0.11_p1
+++ b/metadata/md5-cache/dev-java/openjfx-11.0.11_p1
@@ -3,6 +3,7 @@ DEPEND=dev-java/swt:4.10[cairo,opengl] dev-libs/atk dev-libs/glib:2 dev-libs/lib
DESCRIPTION=Java OpenJFX client application platform
EAPI=6
HOMEPAGE=https://openjfx.io
+INHERIT=flag-o-matic java-pkg-2 multiprocessing
IUSE=cpu_flags_x86_sse2 debug doc source +media
KEYWORDS=-* ~amd64 ~ppc64
LICENSE=GPL-2-with-classpath-exception
@@ -10,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 92b5a4d196abffe2dbe3bdc1cf4ef2ae ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib 4a33c9008e5ee30cb8840a3fdc24df2b multiprocessing 61c959fc55c15c00bbb1079d6a71370b preserve-libs a8e50acee31b5759b4df1f7707cae54b strip-linguas ac3ee41ee2d31d8c41a77c0838320cc7 toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8 vcs-clean d271b7bc7e6a009758d7d4ef749174e3 versionator d3fb3ba33acc3bbbdc4d7970227c100d wrapper 4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 eapi7-ver 1a0a60ad07c8b32d2faba2d085dc0f24 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 9f813bb3c47cf2e60619a663b87c5f4e estack 055c42df72f76a4f45ec92b35e83cd56 eutils dab5d8ec471d025b79c9e6906bcf3bff flag-o-matic a500d7cc40da3de38c361e889153bdf7 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 ltprune 97143780d341cc8d8f1d4c6187a36d29 multilib 4a33c9008e5ee30cb8840a3fdc24df2b multiprocessing b4e253ab22cef7b1085e9b67c7a3b730 preserve-libs a8e50acee31b5759b4df1f7707cae54b strip-linguas ac3ee41ee2d31d8c41a77c0838320cc7 toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8 vcs-clean d271b7bc7e6a009758d7d4ef749174e3 versionator d3fb3ba33acc3bbbdc4d7970227c100d wrapper 4a1902f969e5718126434fc35f3a0d9c
_md5_=020283e8f5cc2a36d2f2566d3ab50613
diff --git a/metadata/md5-cache/dev-java/openjfx-11.0.9_p0 b/metadata/md5-cache/dev-java/openjfx-11.0.9_p0
index 28f9e7f49504..81c326ba7aed 100644
--- a/metadata/md5-cache/dev-java/openjfx-11.0.9_p0
+++ b/metadata/md5-cache/dev-java/openjfx-11.0.9_p0
@@ -3,6 +3,7 @@ DEPEND=dev-java/swt:4.10[cairo,opengl] dev-libs/atk dev-libs/glib:2 dev-libs/lib
DESCRIPTION=Java OpenJFX client application platform
EAPI=6
HOMEPAGE=https://openjfx.io
+INHERIT=flag-o-matic java-pkg-2 multiprocessing
IUSE=cpu_flags_x86_sse2 debug doc source +media
KEYWORDS=-* ~amd64 ~ppc64
LICENSE=GPL-2-with-classpath-exception
@@ -10,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 92b5a4d196abffe2dbe3bdc1cf4ef2ae ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib 4a33c9008e5ee30cb8840a3fdc24df2b multiprocessing 61c959fc55c15c00bbb1079d6a71370b preserve-libs a8e50acee31b5759b4df1f7707cae54b strip-linguas ac3ee41ee2d31d8c41a77c0838320cc7 toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8 vcs-clean d271b7bc7e6a009758d7d4ef749174e3 versionator d3fb3ba33acc3bbbdc4d7970227c100d wrapper 4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 eapi7-ver 1a0a60ad07c8b32d2faba2d085dc0f24 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 9f813bb3c47cf2e60619a663b87c5f4e estack 055c42df72f76a4f45ec92b35e83cd56 eutils dab5d8ec471d025b79c9e6906bcf3bff flag-o-matic a500d7cc40da3de38c361e889153bdf7 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 ltprune 97143780d341cc8d8f1d4c6187a36d29 multilib 4a33c9008e5ee30cb8840a3fdc24df2b multiprocessing b4e253ab22cef7b1085e9b67c7a3b730 preserve-libs a8e50acee31b5759b4df1f7707cae54b strip-linguas ac3ee41ee2d31d8c41a77c0838320cc7 toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8 vcs-clean d271b7bc7e6a009758d7d4ef749174e3 versionator d3fb3ba33acc3bbbdc4d7970227c100d wrapper 4a1902f969e5718126434fc35f3a0d9c
_md5_=19fd42b84358719bcb75fc6361dfc545
diff --git a/metadata/md5-cache/dev-java/openjfx-8.1000 b/metadata/md5-cache/dev-java/openjfx-8.1000
index f22c45ee9296..c845e58d06b3 100644
--- a/metadata/md5-cache/dev-java/openjfx-8.1000
+++ b/metadata/md5-cache/dev-java/openjfx-8.1000
@@ -3,6 +3,7 @@ DEPEND=app-arch/unzip >=dev-java/ant-core-1.8.2:0 >=dev-java/antlr-2.7.7-r7:0 de
DESCRIPTION=Java OpenJFX 8 client application platform
EAPI=6
HOMEPAGE=https://openjfx.io
+INHERIT=eapi7-ver flag-o-matic java-pkg-2 java-pkg-simple multiprocessing toolchain-funcs
IUSE=debug doc media cpu_flags_x86_sse2 doc source
KEYWORDS=~amd64 ~ppc64
LICENSE=GPL-2-with-classpath-exception
@@ -11,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 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib 4a33c9008e5ee30cb8840a3fdc24df2b multiprocessing 61c959fc55c15c00bbb1079d6a71370b preserve-libs a8e50acee31b5759b4df1f7707cae54b strip-linguas ac3ee41ee2d31d8c41a77c0838320cc7 toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8 vcs-clean d271b7bc7e6a009758d7d4ef749174e3 versionator d3fb3ba33acc3bbbdc4d7970227c100d wrapper 4a1902f969e5718126434fc35f3a0d9c
+_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
_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 d5b6a0a8a660..a2f789b976fb 100644
--- a/metadata/md5-cache/dev-java/opentest4j-1.2.0
+++ b/metadata/md5-cache/dev-java/opentest4j-1.2.0
@@ -3,12 +3,13 @@ DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zi
DESCRIPTION=Open Test Alliance for the JVM
EAPI=8
HOMEPAGE=https://github.com/ota4j-team/opentest4j
+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/ota4j-team/opentest4j/archive/r1.2.0.tar.gz -> opentest4j-1.2.0.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
-_md5_=82035c59a8adb225d3b46be7955823c8
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_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
index 978b2f430f6a..7db5578f328e 100644
--- a/metadata/md5-cache/dev-java/oracle-javamail-1.5.6-r1
+++ b/metadata/md5-cache/dev-java/oracle-javamail-1.5.6-r1
@@ -3,11 +3,12 @@ DEPEND=app-arch/unzip virtual/jdk:1.8 >=dev-java/java-config-2.2.0-r3 source? (
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 92b5a4d196abffe2dbe3bdc1cf4ef2ae ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib 4a33c9008e5ee30cb8840a3fdc24df2b preserve-libs a8e50acee31b5759b4df1f7707cae54b strip-linguas ac3ee41ee2d31d8c41a77c0838320cc7 toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8 vcs-clean d271b7bc7e6a009758d7d4ef749174e3 versionator d3fb3ba33acc3bbbdc4d7970227c100d wrapper 4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 eapi7-ver 1a0a60ad07c8b32d2faba2d085dc0f24 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 9f813bb3c47cf2e60619a663b87c5f4e estack 055c42df72f76a4f45ec92b35e83cd56 eutils dab5d8ec471d025b79c9e6906bcf3bff java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 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 28ed396196f3..a4e6ae8469de 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
@@ -4,11 +4,12 @@ DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zi
DESCRIPTION=OSGi Companion Code for org.osgi.annotation.versioning Version 1.1.1
EAPI=7
HOMEPAGE=https://www.osgi.org/
+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/org/osgi/org.osgi.annotation.versioning/1.1.1/org.osgi.annotation.versioning-1.1.1-sources.jar -> osgi-annotation-versioning-1.1.1-sources.jar
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
_md5_=a9d6c762ca136920c7f039fc17bcc66c
diff --git a/metadata/md5-cache/dev-java/osgi-compendium-4.3.1-r2 b/metadata/md5-cache/dev-java/osgi-compendium-4.3.1-r2
index 858acfb47816..7e05e4072a97 100644
--- a/metadata/md5-cache/dev-java/osgi-compendium-4.3.1-r2
+++ b/metadata/md5-cache/dev-java/osgi-compendium-4.3.1-r2
@@ -4,11 +4,12 @@ DEPEND=dev-java/glassfish-persistence:0 dev-java/osgi-core-api:0 dev-java/osgi-f
DESCRIPTION=OSGi Service Platform Compendium API (Companion Code)
EAPI=7
HOMEPAGE=http://wiki.osgi.org/wiki/Release_4.3
+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 dev-java/osgi-foundation:0 dev-java/tomcat-servlet-api:4.0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=0
SRC_URI=https://osgi.org/download/r4v43/osgi.cmpn-4.3.1.jar
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
_md5_=e528ca5556bddf0986b3a918563b8b1d
diff --git a/metadata/md5-cache/dev-java/osgi-core-api-5.0.0-r2 b/metadata/md5-cache/dev-java/osgi-core-api-5.0.0-r2
index 3db5e174b69a..b34876e0210c 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
@@ -3,11 +3,12 @@ DEPEND=>=virtual/jdk-1.8:* app-arch/unzip >=dev-java/java-config-2.2.0-r3 source
DESCRIPTION=OSGi Service Platform Core API (Companion Code)
EAPI=8
HOMEPAGE=http://www.osgi.org/Specifications/HomePage
+INHERIT=java-pkg-2 java-pkg-simple
IUSE=doc source
KEYWORDS=amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x64-macos
LICENSE=Apache-2.0
RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=0
SRC_URI=http://www.osgi.org/download/r5/osgi.core-5.0.0.jar
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
_md5_=5af090f872a5bf2c3cff9ab2c3e5a826
diff --git a/metadata/md5-cache/dev-java/osgi-enterprise-api-5.0.0-r1 b/metadata/md5-cache/dev-java/osgi-enterprise-api-5.0.0-r1
index 91329f316c01..1e336c9edf53 100644
--- a/metadata/md5-cache/dev-java/osgi-enterprise-api-5.0.0-r1
+++ b/metadata/md5-cache/dev-java/osgi-enterprise-api-5.0.0-r1
@@ -3,6 +3,7 @@ DEPEND=dev-java/glassfish-persistence:0 dev-java/osgi-core-api:0 java-virtuals/s
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
@@ -10,5 +11,5 @@ RDEPEND=dev-java/glassfish-persistence:0 dev-java/osgi-core-api:0 java-virtuals/
RESTRICT=bindist
SLOT=0
SRC_URI=https://docs.osgi.org/download/r5/osgi.enterprise-5.0.0.jar
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_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
new file mode 100644
index 000000000000..812790ae0c8c
--- /dev/null
+++ b/metadata/md5-cache/dev-java/osgi-enterprise-api-5.0.0-r2
@@ -0,0 +1,16 @@
+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/tomcat-servlet-api:2.5 >=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=OSGi Enterprise Release 5 Companion Code
+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
+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
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 17ea5f85cccb..22a47c761192 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
@@ -3,11 +3,12 @@ DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zi
DESCRIPTION=OSGi R4 Foundation EE by Apache Felix
EAPI=7
HOMEPAGE=http://felix.apache.org/
+INHERIT=java-pkg-2 java-ant-2
IUSE=doc source
KEYWORDS=amd64 ~arm arm64 ppc64 x86
LICENSE=Apache-2.0 OSGi-Specification-2.0
RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=0
SRC_URI=https://dev.gentoo.org/~tomwij/files/dist/osgi-foundation-1.2.0.tar.xz
-_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
_md5_=b5ad8db98fdd4ae0e864800547a520f6
diff --git a/metadata/md5-cache/dev-java/pdf-renderer-1.0.5-r1 b/metadata/md5-cache/dev-java/pdf-renderer-1.0.5-r1
index ea2630891fdb..f2d505c4d990 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
@@ -4,11 +4,12 @@ DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zi
DESCRIPTION=a 100% Java PDF renderer and viewer
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
+INHERIT=java-pkg-2 java-pkg-simple
IUSE=doc source
KEYWORDS=amd64 ppc64 x86
LICENSE=LGPL-3
RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=0
SRC_URI=https://repo1.maven.org/maven2/org/swinglabs/pdf-renderer/1.0.5/pdf-renderer-1.0.5-sources.jar
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
_md5_=2c78499f210b111fd94d81bd4618a5cc
diff --git a/metadata/md5-cache/dev-java/pdfbox-2.0.24 b/metadata/md5-cache/dev-java/pdfbox-2.0.24
index 20d9a7b2bcd5..b725e9e1307d 100644
--- a/metadata/md5-cache/dev-java/pdfbox-2.0.24
+++ b/metadata/md5-cache/dev-java/pdfbox-2.0.24
@@ -4,6 +4,7 @@ DEPEND=dev-java/bcmail:0 dev-java/bcprov:0 dev-java/commons-logging:0 ~dev-java/
DESCRIPTION=Java library and utilities for working with PDF documents
EAPI=7
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
@@ -12,5 +13,5 @@ RDEPEND=dev-java/bcmail:0 dev-java/bcprov:0 dev-java/commons-logging:0 ~dev-java
RESTRICT=test
SLOT=0
SRC_URI=mirror://apache/pdfbox/2.0.24/pdfbox-2.0.24-src.zip test? ( https://issues.apache.org/jira/secure/attachment/12481683/1.pdf -> PDFBOX-1031-1.pdf https://issues.apache.org/jira/secure/attachment/12481684/2.pdf -> PDFBOX-1031-2.pdf https://issues.apache.org/jira/secure/attachment/12486525/1_testfile1.pdf -> PDFBOX-1065-1.pdf https://issues.apache.org/jira/secure/attachment/12486526/2_testfile1.pdf -> PDFBOX-1065-2.pdf https://issues.apache.org/jira/secure/attachment/12490774/a.pdf -> PDFBOX-1100-1.pdf https://issues.apache.org/jira/secure/attachment/12490775/b.pdf -> PDFBOX-1100-2.pdf https://issues.apache.org/jira/secure/attachment/12848122/SF1199AEG%20%28Complete%29.pdf -> PDFBOX-3656.pdf https://issues.apache.org/jira/secure/attachment/12852207/test.pdf -> PDFBOX-3682.pdf https://issues.apache.org/jira/secure/attachment/12888957/079977.pdf -> PDFBOX-3940-079977.pdf https://issues.apache.org/jira/secure/attachment/12867113/202097.pdf -> PDFBOX-3785-202097.pdf https://issues.apache.org/jira/secure/attachment/12890031/670064.pdf -> PDFBOX-3947-670064.pdf https://issues.apache.org/jira/secure/attachment/12890034/EUWO6SQS5TM4VGOMRD3FLXZHU35V2CP2.pdf -> PDFBOX-3948-EUWO6SQS5TM4VGOMRD3FLXZHU35V2CP2.pdf https://issues.apache.org/jira/secure/attachment/12890037/MKFYUGZWS3OPXLLVU2Z4LWCTVA5WNOGF.pdf -> PDFBOX-3949-MKFYUGZWS3OPXLLVU2Z4LWCTVA5WNOGF.pdf https://issues.apache.org/jira/secure/attachment/12890042/23EGDHXSBBYQLKYOKGZUOVYVNE675PRD.pdf -> PDFBOX-3950-23EGDHXSBBYQLKYOKGZUOVYVNE675PRD.pdf https://issues.apache.org/jira/secure/attachment/12890047/FIHUZWDDL2VGPOE34N6YHWSIGSH5LVGZ.pdf -> PDFBOX-3951-FIHUZWDDL2VGPOE34N6YHWSIGSH5LVGZ.pdf https://issues.apache.org/jira/secure/attachment/12892097/c687766d68ac766be3f02aaec5e0d713_2.pdf -> PDFBOX-3964-c687766d68ac766be3f02aaec5e0d713_2.pdf https://issues.apache.org/jira/secure/attachment/12893582/63NGFQRI44HQNPIPEJH5W2TBM6DJZWMI.pdf -> PDFBOX-3977-63NGFQRI44HQNPIPEJH5W2TBM6DJZWMI.pdf https://issues.apache.org/jira/secure/attachment/12896905/GeneralForbearance.pdf -> PDFBOX-3999-GeneralForbearance.pdf https://issues.apache.org/jira/secure/attachment/12919726/sample.pdf -> PDFBOX-4197.pdf https://issues.apache.org/jira/secure/attachment/12938094/Quelldatei.pdf -> PDFBOX-4308.pdf https://issues.apache.org/jira/secure/attachment/12952086/form.pdf -> PDFBOX-4408.pdf https://issues.apache.org/jira/secure/attachment/12953423/000314.pdf -> PDFBOX-4418-000314.pdf https://issues.apache.org/jira/secure/attachment/12953421/000671.pdf -> PDFBOX-4418-000671.pdf https://issues.apache.org/jira/secure/attachment/12953866/000746.pdf -> PDFBOX-4423-000746.pdf https://issues.apache.org/jira/secure/attachment/12966453/cryptfilter.pdf -> PDFBOX-4517-cryptfilter.pdf https://issues.apache.org/jira/secure/attachment/12991833/PDFBOX-4750-test.pdf -> PDFBOX-4750.pdf https://issues.apache.org/jira/secure/attachment/12914331/WXMDXCYRWFDCMOSFQJ5OAJIAFXYRZ5OA.pdf -> PDFBOX-4153-WXMDXCYRWFDCMOSFQJ5OAJIAFXYRZ5OA.pdf https://issues.apache.org/jira/secure/attachment/12962991/NeS1078.pdf -> PDFBOX-4490.pdf https://issues.apache.org/jira/secure/attachment/12784025/PDFBOX-3208-L33MUTT2SVCWGCS6UIYL5TH3PNPXHIS6.pdf https://issues.apache.org/jira/secure/attachment/12867102/PDFBOX-3783-72GLBIGUC6LB46ELZFBARRJTLN4RBSQM.pdf https://issues.apache.org/jira/secure/attachment/12929821/16bit.png -> PDFBOX-4184-16bit.png https://issues.apache.org/jira/secure/attachment/12943502/ArrayIndexOutOfBoundsException%20COSParser -> PDFBOX-4338.pdf https://issues.apache.org/jira/secure/attachment/12943503/NullPointerException%20COSParser -> PDFBOX-4339.pdf https://issues.apache.org/jira/secure/attachment/12867433/genko_oc_shiryo1.pdf https://moji.or.jp/wp-content/ipafont/IPAfont/ipag00303.zip https://moji.or.jp/wp-content/ipafont/IPAfont/ipagp00303.zip https://issues.apache.org/jira/secure/attachment/12911053/n019003l.pfb https://issues.apache.org/jira/secure/attachment/12949710/032163.jpg -> PDFBOX-4184-032163.jpg https://issues.apache.org/jira/secure/attachment/13025718/lotus.jpg -> PDFBOX-5196-lotus.jpg )
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
_md5_=d2d18c0ea03fff8600282c6b75cc426c
diff --git a/metadata/md5-cache/dev-java/picocli-4.6.3-r1 b/metadata/md5-cache/dev-java/picocli-4.6.3-r1
index 1dbaebe305b8..1b4138083ea1 100644
--- a/metadata/md5-cache/dev-java/picocli-4.6.3-r1
+++ b/metadata/md5-cache/dev-java/picocli-4.6.3-r1
@@ -3,6 +3,7 @@ DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zi
DESCRIPTION=Java command line parser with both an annotations API and a programmatic API
EAPI=8
HOMEPAGE=https://picocli.info
+INHERIT=java-pkg-2 java-pkg-simple
IUSE=doc source test
KEYWORDS=amd64 ~arm64 ppc64 x86
LICENSE=Apache-2.0
@@ -10,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 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
_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 e1d52c72c0b8..b02c7c5134e0 100644
--- a/metadata/md5-cache/dev-java/plexus-classworlds-2.2.3
+++ b/metadata/md5-cache/dev-java/plexus-classworlds-2.2.3
@@ -3,6 +3,7 @@ DEPEND=>=virtual/jdk-1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
DESCRIPTION=The class loader framework of the Plexus project
EAPI=7
HOMEPAGE=https://github.com/codehaus
+INHERIT=java-pkg-2 java-ant-2
IUSE=doc source test
KEYWORDS=amd64 ~arm arm64 ppc64 x86
LICENSE=codehaus-classworlds
@@ -10,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 92b5a4d196abffe2dbe3bdc1cf4ef2ae multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
_md5_=f5be57cb43c766cedbf3913f56dcc9f5
diff --git a/metadata/md5-cache/dev-java/poi-5.0.0 b/metadata/md5-cache/dev-java/poi-5.0.0
index 8a3e30f9a377..943264ba98ba 100644
--- a/metadata/md5-cache/dev-java/poi-5.0.0
+++ b/metadata/md5-cache/dev-java/poi-5.0.0
@@ -3,11 +3,12 @@ DEPEND=>=virtual/jdk-1.8:* >=dev-java/commons-codec-1.11:0 >=dev-java/commons-co
DESCRIPTION=Maven build of Apache POI for Sonar checks
EAPI=7
HOMEPAGE=https://poi.apache.org/
+INHERIT=java-pkg-2 java-pkg-simple
IUSE=doc source
KEYWORDS=amd64 arm64 ppc64 x86
LICENSE=Apache-2.0
RDEPEND=>=virtual/jre-1.8:* >=dev-java/commons-codec-1.11:0 >=dev-java/commons-collections-4.1:4 >=dev-java/commons-math-3.6.1:3 >=dev-java/slf4j-api-1.7.30:0 >=dev-java/sparsebitset-1.2:0 dev-java/commons-logging:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=0
SRC_URI=https://archive.apache.org/dist/poi/release/src/poi-src-5.0.0-20210120.tar.gz -> poi-5.0.0.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
_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 beb96ad2b213..fde95bd8cfe1 100644
--- a/metadata/md5-cache/dev-java/protobuf-java-3.17.3
+++ b/metadata/md5-cache/dev-java/protobuf-java-3.17.3
@@ -4,11 +4,12 @@ DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zi
DESCRIPTION=Google's Protocol Buffers - Java bindings
EAPI=7
HOMEPAGE=https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf
+INHERIT=java-pkg-2 java-pkg-simple
IUSE=doc source
KEYWORDS=amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos
LICENSE=BSD
RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=0/28
SRC_URI=https://github.com/protocolbuffers/protobuf/archive/v3.17.3.tar.gz -> protobuf-3.17.3.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
_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 2264ac62cba3..36aa7722914d 100644
--- a/metadata/md5-cache/dev-java/protobuf-java-3.19.3
+++ b/metadata/md5-cache/dev-java/protobuf-java-3.19.3
@@ -4,11 +4,12 @@ DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zi
DESCRIPTION=Google's Protocol Buffers - Java bindings
EAPI=7
HOMEPAGE=https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf
+INHERIT=java-pkg-2 java-pkg-simple
IUSE=doc source
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos
LICENSE=BSD
RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=0/30
SRC_URI=https://github.com/protocolbuffers/protobuf/archive/v3.19.3.tar.gz -> protobuf-3.19.3.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
-_md5_=304da8b7b24214b8c20b711a7f5615a1
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_md5_=c715873210be022cf2d9f30d2bfcaa8b
diff --git a/metadata/md5-cache/dev-java/protobuf-java-9999 b/metadata/md5-cache/dev-java/protobuf-java-9999
index f39103dbca15..8028cb10fbfb 100644
--- a/metadata/md5-cache/dev-java/protobuf-java-9999
+++ b/metadata/md5-cache/dev-java/protobuf-java-9999
@@ -4,10 +4,11 @@ DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zi
DESCRIPTION=Google's Protocol Buffers - Java bindings
EAPI=7
HOMEPAGE=https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf
+INHERIT=java-pkg-2 java-pkg-simple git-r3
IUSE=doc source
LICENSE=BSD
PROPERTIES=live
RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=0/30
-_eclasses_=git-r3 b9ac6f96d2a88edb5b351df634dc5e53 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_eclasses_=git-r3 b9ac6f96d2a88edb5b351df634dc5e53 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
_md5_=feafd3e9e534a0afae32f75e585cd380
diff --git a/metadata/md5-cache/dev-java/qdox-1.12.1-r2 b/metadata/md5-cache/dev-java/qdox-1.12.1-r2
deleted file mode 100644
index 1b52297e119d..000000000000
--- a/metadata/md5-cache/dev-java/qdox-1.12.1-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.8 app-arch/unzip:0 dev-java/byaccj:0 >=dev-java/jflex-1.6.1:0 dev-java/jmock:1.0 test? ( dev-java/junit:0 ) dev-java/ant-core:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
-DESCRIPTION=Parser for extracting class/interface/method definitions
-EAPI=7
-HOMEPAGE=https://github.com/codehaus/qdox
-IUSE=doc source test
-KEYWORDS=amd64 ~arm arm64 ppc64 x86 ~ppc-macos ~x64-macos
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.8 dev-java/ant-core:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=!test? ( test )
-SLOT=1.12
-SRC_URI=https://github.com/codehaus/qdox/archive/qdox-1.12.1.tar.gz
-_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=6ba1fb1febbbbb7c992b5a5d0ab19f24
diff --git a/metadata/md5-cache/dev-java/qdox-1.12.1-r3 b/metadata/md5-cache/dev-java/qdox-1.12.1-r3
index debe465b1372..060e7a399377 100644
--- a/metadata/md5-cache/dev-java/qdox-1.12.1-r3
+++ b/metadata/md5-cache/dev-java/qdox-1.12.1-r3
@@ -3,12 +3,13 @@ DEPEND=>=virtual/jdk-1.8:* dev-java/byaccj:0 >=dev-java/jflex-1.6.1:0 dev-java/j
DESCRIPTION=Parser for extracting class/interface/method definitions
EAPI=8
HOMEPAGE=https://github.com/codehaus/qdox
+INHERIT=java-pkg-2
IUSE=doc source test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~ppc-macos ~x64-macos
+KEYWORDS=amd64 ~arm arm64 ppc64 x86 ~ppc-macos ~x64-macos
LICENSE=Apache-2.0
RDEPEND=>=virtual/jre-1.8:* dev-java/ant-core:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
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 92b5a4d196abffe2dbe3bdc1cf4ef2ae
-_md5_=bfbb947c79fadf681549faaa8badf360
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_md5_=e64f90ccc4aa2c6b1d9796d8e86b2a08
diff --git a/metadata/md5-cache/dev-java/randomized-runner-2.7.8 b/metadata/md5-cache/dev-java/randomized-runner-2.7.8
deleted file mode 100644
index 099c65738cc9..000000000000
--- a/metadata/md5-cache/dev-java/randomized-runner-2.7.8
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.8:* >=dev-java/junit-4.12:4 test? ( >=dev-java/assertj-core-2.3.0:2 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
-DESCRIPTION=JUnit test runner and plugins for running JUnit tests with pseudo-randomness
-EAPI=7
-HOMEPAGE=https://github.com/randomizedtesting/randomizedtesting/randomizedtesting-runner
-IUSE=doc source test
-KEYWORDS=amd64 ~arm arm64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.8:* >=dev-java/junit-4.12:4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/randomizedtesting/randomizedtesting/archive/refs/tags/release/2.7.8.tar.gz -> randomized-runner-2.7.8.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
-_md5_=7a1299c01a6bc42fbdaccbfd314fe9a8
diff --git a/metadata/md5-cache/dev-java/randomized-runner-2.7.9 b/metadata/md5-cache/dev-java/randomized-runner-2.7.9
index 6036cac56bb7..bc69e4bac36c 100644
--- a/metadata/md5-cache/dev-java/randomized-runner-2.7.9
+++ b/metadata/md5-cache/dev-java/randomized-runner-2.7.9
@@ -3,12 +3,13 @@ DEPEND=>=virtual/jdk-1.8:* >=dev-java/junit-4.12:4 test? ( >=dev-java/assertj-co
DESCRIPTION=JUnit test runner and plugins for running JUnit tests with pseudo-randomness
EAPI=8
HOMEPAGE=https://labs.carrotsearch.com/randomizedtesting.html
+INHERIT=java-pkg-2 java-pkg-simple
IUSE=doc source test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm arm64 ppc64 x86
LICENSE=Apache-2.0
RDEPEND=>=virtual/jre-1.8:* >=dev-java/junit-4.12:4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://github.com/randomizedtesting/randomizedtesting/archive/release/2.7.9.tar.gz -> randomized-runner-2.7.9.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
-_md5_=fda0325c336fc72343bedb9885b4ddd0
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_md5_=cf62f79fbdb1a6a21f5406895ae275b6
diff --git a/metadata/md5-cache/dev-java/rat-0.13 b/metadata/md5-cache/dev-java/rat-0.13
index ca0824bde7a8..4036212864bc 100644
--- a/metadata/md5-cache/dev-java/rat-0.13
+++ b/metadata/md5-cache/dev-java/rat-0.13
@@ -3,9 +3,10 @@ DEPEND=>=dev-java/java-config-2.2.0-r3
DESCRIPTION=Apache Rat is a release audit tool, focused on licenses
EAPI=7
HOMEPAGE=https://creadur.apache.org/rat/
+INHERIT=java-pkg-2
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 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
_md5_=d3abfd8c59cbe78b7c86854cba028d0c
diff --git a/metadata/md5-cache/dev-java/reflections-0.9.10-r1 b/metadata/md5-cache/dev-java/reflections-0.9.10-r1
index 80fcaf9d4832..6b69b46c36be 100644
--- a/metadata/md5-cache/dev-java/reflections-0.9.10-r1
+++ b/metadata/md5-cache/dev-java/reflections-0.9.10-r1
@@ -3,11 +3,12 @@ DEPEND=>=virtual/jdk-1.7 dev-java/commons-vfs:2 dev-java/dom4j:1 dev-java/gson:2
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 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib 4a33c9008e5ee30cb8840a3fdc24df2b preserve-libs a8e50acee31b5759b4df1f7707cae54b strip-linguas ac3ee41ee2d31d8c41a77c0838320cc7 toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8 vcs-clean d271b7bc7e6a009758d7d4ef749174e3 versionator d3fb3ba33acc3bbbdc4d7970227c100d wrapper 4a1902f969e5718126434fc35f3a0d9c
+_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
new file mode 100644
index 000000000000..808d9c9409c6
--- /dev/null
+++ b/metadata/md5-cache/dev-java/reflections-0.9.12-r2
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=dev-java/tomcat-servlet-api:2.5 >=virtual/jdk-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 ) 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 e38ea02d8ed864a74078ecf46aa06f30
+_md5_=d1399bc4d9841e2cece22e580e1b4c97
diff --git a/metadata/md5-cache/dev-java/relaxng-datatype-1.0-r2 b/metadata/md5-cache/dev-java/relaxng-datatype-1.0-r2
index 313a572261d9..484f2cc55667 100644
--- a/metadata/md5-cache/dev-java/relaxng-datatype-1.0-r2
+++ b/metadata/md5-cache/dev-java/relaxng-datatype-1.0-r2
@@ -3,11 +3,12 @@ DEPEND=app-arch/unzip >=virtual/jdk-1.7 >=dev-java/java-config-2.2.0-r3 source?
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 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib 4a33c9008e5ee30cb8840a3fdc24df2b preserve-libs a8e50acee31b5759b4df1f7707cae54b strip-linguas ac3ee41ee2d31d8c41a77c0838320cc7 toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8 vcs-clean d271b7bc7e6a009758d7d4ef749174e3 versionator d3fb3ba33acc3bbbdc4d7970227c100d wrapper 4a1902f969e5718126434fc35f3a0d9c
+_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
new file mode 100644
index 000000000000..77b43115501b
--- /dev/null
+++ b/metadata/md5-cache/dev-java/relaxng-datatype-1.0-r3
@@ -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=Interface between RELAX NG validators and datatype libraries
+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
+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
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 aacb67cdc116..6c2d946f17df 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
@@ -4,11 +4,12 @@ DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zi
DESCRIPTION=Resin Servlet API 2.4/JSP API 2.0 implementation
EAPI=7
HOMEPAGE=http://www.caucho.com/
+INHERIT=java-pkg-2 java-ant-2
IUSE=source
KEYWORDS=amd64 ppc64 x86
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 92b5a4d196abffe2dbe3bdc1cf4ef2ae multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
_md5_=65d5b79e953b706a291d61e12571b93f
diff --git a/metadata/md5-cache/dev-java/resin-servlet-api-4.0.27-r2 b/metadata/md5-cache/dev-java/resin-servlet-api-4.0.27-r2
index a24985973daa..1d92d5527d23 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
@@ -3,11 +3,12 @@ DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zi
DESCRIPTION=Resin Servlet API 3.0/JSP API 2.1 implementation
EAPI=8
HOMEPAGE=https://caucho.com
+INHERIT=java-pkg-2 java-ant-2
IUSE=source
KEYWORDS=amd64 ppc64 x86
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 92b5a4d196abffe2dbe3bdc1cf4ef2ae multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
_md5_=429fbf89c07d222703761b31c67eacfc
diff --git a/metadata/md5-cache/dev-java/resin-servlet-api-4.0.46-r1 b/metadata/md5-cache/dev-java/resin-servlet-api-4.0.46-r1
index 83b8cda41f21..ff0eeb845512 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
@@ -3,11 +3,12 @@ DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zi
DESCRIPTION=Resin Servlet API 3.0/JSP API 2.1 implementation
EAPI=8
HOMEPAGE=https://caucho.com
+INHERIT=java-pkg-2 java-ant-2
IUSE=source
KEYWORDS=amd64 ppc64 x86
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 92b5a4d196abffe2dbe3bdc1cf4ef2ae multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
_md5_=13dffd9c17ccbe2c79962cdaac838432
diff --git a/metadata/md5-cache/dev-java/rhino-1.7.14 b/metadata/md5-cache/dev-java/rhino-1.7.14
index 1e655fcf4ca4..ae8c1d166221 100644
--- a/metadata/md5-cache/dev-java/rhino-1.7.14
+++ b/metadata/md5-cache/dev-java/rhino-1.7.14
@@ -3,6 +3,7 @@ DEPEND=>=virtual/jdk-1.8:* test? ( dev-java/ant-junit:0 dev-java/emma:0 dev-java
DESCRIPTION=An open-source implementation of JavaScript written in Java
EAPI=8
HOMEPAGE=https://github.com/mozilla/rhino
+INHERIT=java-pkg-2 java-pkg-simple
IUSE=doc source test
KEYWORDS=amd64 ~arm arm64 ppc64 x86
LICENSE=MPL-1.1 GPL-2
@@ -10,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 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
_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 fb535b8980c8..bc3d54d177b2 100644
--- a/metadata/md5-cache/dev-java/rome-0.9-r4
+++ b/metadata/md5-cache/dev-java/rome-0.9-r4
@@ -4,6 +4,7 @@ DEPEND=dev-java/jdom:0 >=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 sourc
DESCRIPTION=Java framework for RSS and Atom feeds
EAPI=8
HOMEPAGE=https://rometools.github.io/rome/
+INHERIT=java-pkg-2 java-pkg-simple
IUSE=doc source test
KEYWORDS=amd64 x86
LICENSE=Apache-2.0
@@ -11,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 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
_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 4c942ea20e64..28d4d6cebd08 100644
--- a/metadata/md5-cache/dev-java/rxtx-2.2_pre2-r2
+++ b/metadata/md5-cache/dev-java/rxtx-2.2_pre2-r2
@@ -4,11 +4,12 @@ DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zi
DESCRIPTION=Native library providing serial and parallel communication for Java
EAPI=8
HOMEPAGE=http://rxtx.qbang.org/
+INHERIT=toolchain-funcs autotools java-pkg-2
IUSE=lfd doc source
KEYWORDS=amd64 x86
LICENSE=LGPL-2.1+
RDEPEND=>=virtual/jre-1.8:* lfd? ( sys-apps/xinetd ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=2
SRC_URI=ftp://ftp.qbang.org/pub/rxtx/rxtx-2.2pre2.zip
-_eclasses_=autotools 9724194ab651ce63fd9bc06e4e1410b4 gnuconfig 262062cef0ba4f22b397193da514a350 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae libtool 241a8f577b9781a42a7421e53448a44e multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools b46e8992a8126c894fbdc8084fc040c4 gnuconfig b6b3e92f8b8c996400074b5f61a59256 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 libtool 241a8f577b9781a42a7421e53448a44e multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
_md5_=625c67cac350aab0cd4d989cb074031f
diff --git a/metadata/md5-cache/dev-java/sac-1.3-r4 b/metadata/md5-cache/dev-java/sac-1.3-r4
index e049d515c419..f85b527c5092 100644
--- a/metadata/md5-cache/dev-java/sac-1.3-r4
+++ b/metadata/md5-cache/dev-java/sac-1.3-r4
@@ -4,11 +4,12 @@ DEPEND=app-arch/zip >=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source?
DESCRIPTION=SAC is a standard interface for CSS parser
EAPI=8
HOMEPAGE=https://www.w3.org/Style/CSS/SAC/
+INHERIT=java-pkg-2 java-pkg-simple
IUSE=doc source
KEYWORDS=amd64 ~arm arm64 ppc64 x86
LICENSE=W3C
RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=0
SRC_URI=https://www.w3.org/2002/06/sacjava-1.3.zip -> sac-1.3.zip
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
_md5_=1b00e55158cbaeeb6aeb966bb8d0e47e
diff --git a/metadata/md5-cache/dev-java/sax-2.2.1-r5 b/metadata/md5-cache/dev-java/sax-2.2.1-r5
index be336fe460ca..2c7b1ebcb234 100644
--- a/metadata/md5-cache/dev-java/sax-2.2.1-r5
+++ b/metadata/md5-cache/dev-java/sax-2.2.1-r5
@@ -4,11 +4,12 @@ DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zi
DESCRIPTION=SAX: Simple API for XML in Java
EAPI=8
HOMEPAGE=http://sax.sourceforge.net/
+INHERIT=java-pkg-2 java-pkg-simple
IUSE=doc source
KEYWORDS=amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos
LICENSE=public-domain
RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=0
SRC_URI=mirror://sourceforge/sax/sax2r3.zip -> sax-2.2.1.zip
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
_md5_=7a2c78e8c769fc141720a601e6ffdfdf
diff --git a/metadata/md5-cache/dev-java/saxon-6.5.5-r2 b/metadata/md5-cache/dev-java/saxon-6.5.5-r2
deleted file mode 100644
index 0a26c2b143d5..000000000000
--- a/metadata/md5-cache/dev-java/saxon-6.5.5-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test unpack
-DEPEND=dev-java/jdom:0 app-arch/unzip >=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Set of tools for processing XML documents
-EAPI=6
-HOMEPAGE=http://saxon.sourceforge.net/
-IUSE=doc examples source
-KEYWORDS=amd64 x86
-LICENSE=MPL-1.1
-RDEPEND=dev-java/jdom:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=6.5
-SRC_URI=mirror://sourceforge/saxon/saxon6-5-5.zip
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 eapi7-ver 1a0a60ad07c8b32d2faba2d085dc0f24 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 9f813bb3c47cf2e60619a663b87c5f4e estack 055c42df72f76a4f45ec92b35e83cd56 eutils dab5d8ec471d025b79c9e6906bcf3bff java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib 4a33c9008e5ee30cb8840a3fdc24df2b preserve-libs a8e50acee31b5759b4df1f7707cae54b strip-linguas ac3ee41ee2d31d8c41a77c0838320cc7 toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8 vcs-clean d271b7bc7e6a009758d7d4ef749174e3 versionator d3fb3ba33acc3bbbdc4d7970227c100d wrapper 4a1902f969e5718126434fc35f3a0d9c
-_md5_=d3206516c54ca322951cecff93f13c83
diff --git a/metadata/md5-cache/dev-java/saxon-6.5.5-r3 b/metadata/md5-cache/dev-java/saxon-6.5.5-r3
index d57e222c27cc..be0f28d4479f 100644
--- a/metadata/md5-cache/dev-java/saxon-6.5.5-r3
+++ b/metadata/md5-cache/dev-java/saxon-6.5.5-r3
@@ -4,11 +4,12 @@ DEPEND=dev-java/jdom:0 virtual/jdk:1.8 >=dev-java/java-config-2.2.0-r3 source? (
DESCRIPTION=Set of tools for processing XML documents
EAPI=8
HOMEPAGE=http://saxon.sourceforge.net/
+INHERIT=java-pkg-2 java-pkg-simple
IUSE=doc examples source
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
LICENSE=MPL-1.1
RDEPEND=dev-java/jdom:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=6.5
SRC_URI=mirror://sourceforge/project/saxon/saxon6/6.5.5/saxon6-5-5.zip
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
-_md5_=b7aa80ccf30684be71a8025432e32cad
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_md5_=58ccce8abcdbad8e38d4e11952e2031c
diff --git a/metadata/md5-cache/dev-java/saxon-9.2.0.6-r2 b/metadata/md5-cache/dev-java/saxon-9.2.0.6-r2
deleted file mode 100644
index 67bd11a4b97b..000000000000
--- a/metadata/md5-cache/dev-java/saxon-9.2.0.6-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=dev-java/xom:0 dev-java/jdom:0 dev-java/dom4j:1 dev-java/ant-core app-arch/unzip >=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
-DESCRIPTION=A XSLT and XQuery Processor
-EAPI=6
-HOMEPAGE=http://saxon.sourceforge.net/
-IUSE=doc source
-KEYWORDS=amd64 ~arm arm64 ppc64 x86
-LICENSE=MPL-1.0
-RDEPEND=dev-java/xom:0 dev-java/jdom:0 dev-java/dom4j:1 dev-java/ant-core >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=9
-SRC_URI=mirror://sourceforge/saxon/saxonhe9-2-0-6source.zip
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 eapi7-ver 1a0a60ad07c8b32d2faba2d085dc0f24 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 9f813bb3c47cf2e60619a663b87c5f4e estack 055c42df72f76a4f45ec92b35e83cd56 eutils dab5d8ec471d025b79c9e6906bcf3bff java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib 4a33c9008e5ee30cb8840a3fdc24df2b preserve-libs a8e50acee31b5759b4df1f7707cae54b strip-linguas ac3ee41ee2d31d8c41a77c0838320cc7 toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8 vcs-clean d271b7bc7e6a009758d7d4ef749174e3 versionator d3fb3ba33acc3bbbdc4d7970227c100d wrapper 4a1902f969e5718126434fc35f3a0d9c
-_md5_=0c7279830e1c335ece40179bf7e44fac
diff --git a/metadata/md5-cache/dev-java/saxon-9.2.0.6-r3 b/metadata/md5-cache/dev-java/saxon-9.2.0.6-r3
index d2bee99c211a..c52dfc7c59af 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
@@ -4,11 +4,12 @@ DEPEND=dev-java/xom:0 dev-java/jdom:0 dev-java/dom4j:1 dev-java/ant-core >=virtu
DESCRIPTION=A XSLT and XQuery Processor
EAPI=8
HOMEPAGE=http://saxon.sourceforge.net/
+INHERIT=java-pkg-2 java-ant-2
IUSE=doc source
-KEYWORDS=~amd64 ~arm arm64 ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ppc64 x86
LICENSE=MPL-1.0
RDEPEND=dev-java/xom:0 dev-java/jdom:0 dev-java/dom4j:1 dev-java/ant-core >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=9
SRC_URI=mirror://sourceforge/project/saxon/Saxon-HE/9.2/saxonhe9-2-0-6source.zip
-_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=272f2fee3fc1af7463a48c9f9f1227d0
+_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_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 c0699398cc4a..db98d6e84efd 100644
--- a/metadata/md5-cache/dev-java/sbt-0.13.13
+++ b/metadata/md5-cache/dev-java/sbt-0.13.13
@@ -3,6 +3,7 @@ DEPEND=>=virtual/jdk-1.8 dev-lang/scala >=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=6
HOMEPAGE=https://www.scala-sbt.org/
+INHERIT=java-pkg-2
IUSE=binary
KEYWORDS=amd64 x86
LICENSE=BSD
@@ -10,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 92b5a4d196abffe2dbe3bdc1cf4ef2ae ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib 4a33c9008e5ee30cb8840a3fdc24df2b preserve-libs a8e50acee31b5759b4df1f7707cae54b strip-linguas ac3ee41ee2d31d8c41a77c0838320cc7 toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8 vcs-clean d271b7bc7e6a009758d7d4ef749174e3 versionator d3fb3ba33acc3bbbdc4d7970227c100d wrapper 4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 eapi7-ver 1a0a60ad07c8b32d2faba2d085dc0f24 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 9f813bb3c47cf2e60619a663b87c5f4e estack 055c42df72f76a4f45ec92b35e83cd56 eutils dab5d8ec471d025b79c9e6906bcf3bff java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 ltprune 97143780d341cc8d8f1d4c6187a36d29 multilib 4a33c9008e5ee30cb8840a3fdc24df2b preserve-libs a8e50acee31b5759b4df1f7707cae54b strip-linguas ac3ee41ee2d31d8c41a77c0838320cc7 toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8 vcs-clean d271b7bc7e6a009758d7d4ef749174e3 versionator d3fb3ba33acc3bbbdc4d7970227c100d wrapper 4a1902f969e5718126434fc35f3a0d9c
_md5_=4f028ee99085e12312946b85e649cd8f
diff --git a/metadata/md5-cache/dev-java/sbt-0.13.18 b/metadata/md5-cache/dev-java/sbt-0.13.18
index 2e37c67ed317..b5a792b31725 100644
--- a/metadata/md5-cache/dev-java/sbt-0.13.18
+++ b/metadata/md5-cache/dev-java/sbt-0.13.18
@@ -3,6 +3,7 @@ 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
HOMEPAGE=https://www.scala-sbt.org/
+INHERIT=java-pkg-2
IUSE=binary
KEYWORDS=~amd64 ~x86
LICENSE=BSD
@@ -10,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3
RESTRICT=test
SLOT=0
SRC_URI=!binary? ( https://github.com/sbt/sbt/archive/v0.13.18.tar.gz -> sbt-0.13.18.tar.gz https://dev.gentoo.org/~gienah/snapshots/sbt-0.13.18-ivy2-deps.tar.xz https://dev.gentoo.org/~gienah/snapshots/sbt-0.13.18-sbt-deps.tar.xz http://repo.typesafe.com/typesafe/ivy-releases/org.scala-sbt/sbt-launch/0.13.18/sbt-launch.jar -> sbt-launch-0.13.18.jar ) binary? ( https://dev.gentoo.org/~gienah/files/dist/sbt-0.13.18-gentoo-binary.tar.xz )
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
_md5_=697eb5ced0f4c9b0055c7213576bfcc3
diff --git a/metadata/md5-cache/dev-java/sbt-bin-1.3.10 b/metadata/md5-cache/dev-java/sbt-bin-1.3.10
index 84849c5ffa9f..1a12020a2be3 100644
--- a/metadata/md5-cache/dev-java/sbt-bin-1.3.10
+++ b/metadata/md5-cache/dev-java/sbt-bin-1.3.10
@@ -3,10 +3,11 @@ 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.10/sbt-1.3.10.tgz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
_md5_=ed5c0d9ba3515bbf495ea011a782277a
diff --git a/metadata/md5-cache/dev-java/sbt-bin-1.3.2 b/metadata/md5-cache/dev-java/sbt-bin-1.3.2
index d0a9f6a3b93e..248a3796469a 100644
--- a/metadata/md5-cache/dev-java/sbt-bin-1.3.2
+++ b/metadata/md5-cache/dev-java/sbt-bin-1.3.2
@@ -3,10 +3,11 @@ 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 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
_md5_=9e74c2dc0e226b9dacf531839775e184
diff --git a/metadata/md5-cache/dev-java/sjsxp-1.0.2 b/metadata/md5-cache/dev-java/sjsxp-1.0.2
index 6de9dcfe6d37..f2f88ec4c219 100644
--- a/metadata/md5-cache/dev-java/sjsxp-1.0.2
+++ b/metadata/md5-cache/dev-java/sjsxp-1.0.2
@@ -4,11 +4,12 @@ DEPEND=dev-java/xpp3:0 >=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 sourc
DESCRIPTION=Sun Java Streaming XML Parser (SJSXP) is the implementation of JSR 173
EAPI=8
HOMEPAGE=https://sjsxp.java.net/
+INHERIT=java-pkg-2 java-pkg-simple
IUSE=doc source
KEYWORDS=amd64 ~arm arm64 ppc64 x86
LICENSE=GPL-2
RDEPEND=dev-java/xpp3:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=0
SRC_URI=https://repo1.maven.org/maven2/com/sun/xml/stream/sjsxp/1.0.2/sjsxp-1.0.2-sources.jar
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
_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 a0af8ab8393d..47c319011b5d 100644
--- a/metadata/md5-cache/dev-java/slf4j-api-1.7.36
+++ b/metadata/md5-cache/dev-java/slf4j-api-1.7.36
@@ -4,6 +4,7 @@ DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zi
DESCRIPTION=The slf4j API
EAPI=8
HOMEPAGE=https://www.slf4j.org
+INHERIT=java-pkg-2 java-pkg-simple
IUSE=doc source test
KEYWORDS=amd64 ~arm arm64 ppc64 x86
LICENSE=MIT
@@ -11,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 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
_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 b6dcc717ad5f..584e103c70a1 100644
--- a/metadata/md5-cache/dev-java/slf4j-ext-1.7.36
+++ b/metadata/md5-cache/dev-java/slf4j-ext-1.7.36
@@ -3,11 +3,12 @@ DEPEND=>=virtual/jdk-1.8:* dev-java/cal10n:0 dev-java/commons-lang:2.1 dev-java/
DESCRIPTION=Extensions to the SLF4J API
EAPI=8
HOMEPAGE=https://www.slf4j.org
+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/cal10n:0 dev-java/commons-lang:2.1 dev-java/javassist:3 ~dev-java/slf4j-api-1.7.36:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=0
SRC_URI=https://github.com/qos-ch/slf4j/archive/v_1.7.36.tar.gz -> slf4j-1.7.36.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
_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 7f006aa4b455..75d0e83a9aa4 100644
--- a/metadata/md5-cache/dev-java/slf4j-nop-1.7.36
+++ b/metadata/md5-cache/dev-java/slf4j-nop-1.7.36
@@ -3,6 +3,7 @@ DEPEND=>=virtual/jdk-1.8:* ~dev-java/slf4j-api-1.7.36:0 >=dev-java/java-config-2
DESCRIPTION=SLF4J NOP Binding
EAPI=8
HOMEPAGE=https://www.slf4j.org
+INHERIT=java-pkg-2 java-pkg-simple
IUSE=doc source test
KEYWORDS=amd64 ~arm arm64 ppc64 x86
LICENSE=MIT
@@ -10,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 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
_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 db0a5e0dee0f..5f7906169ed9 100644
--- a/metadata/md5-cache/dev-java/slf4j-simple-1.7.36
+++ b/metadata/md5-cache/dev-java/slf4j-simple-1.7.36
@@ -3,6 +3,7 @@ DEPEND=>=virtual/jdk-1.8:* ~dev-java/slf4j-api-1.7.36:0 test? ( ~dev-java/slf4j-
DESCRIPTION=SLF4J Simple binding
EAPI=8
HOMEPAGE=https://www.slf4j.org
+INHERIT=java-pkg-2 java-pkg-simple
IUSE=doc source test
KEYWORDS=amd64 ~arm arm64 ppc64 x86
LICENSE=MIT
@@ -10,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 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
_md5_=b11f579dd89a57a61786c3acc4558cd6
diff --git a/metadata/md5-cache/dev-java/snakeyaml-1.28-r1 b/metadata/md5-cache/dev-java/snakeyaml-1.28-r1
deleted file mode 100644
index 75995108d7ae..000000000000
--- a/metadata/md5-cache/dev-java/snakeyaml-1.28-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.8:* test? ( >=dev-java/commons-io-2.4:1 dev-java/commons-lang:3.6 >=dev-java/joda-time-2.10.10:0 >=dev-java/velocity-1.7:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
-DESCRIPTION=YAML 1.1 parser and emitter for Java
-EAPI=7
-HOMEPAGE=https://bitbucket.org/asomov/snakeyaml
-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://bitbucket.org/asomov/snakeyaml/get/snakeyaml-1.28.tar.gz -> asomov-snakeyaml-b28f0b4d87c6.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
-_md5_=58a4e67bff599ee5f42fc9b539c32e69
diff --git a/metadata/md5-cache/dev-java/snakeyaml-1.30 b/metadata/md5-cache/dev-java/snakeyaml-1.30
index 4ed01fddd391..fbade2100e98 100644
--- a/metadata/md5-cache/dev-java/snakeyaml-1.30
+++ b/metadata/md5-cache/dev-java/snakeyaml-1.30
@@ -3,12 +3,13 @@ DEPEND=>=virtual/jdk-1.8:* test? ( dev-java/velocity:0 dev-java/joda-time:0 ) >=
DESCRIPTION=YAML 1.1 parser and emitter for Java
EAPI=8
HOMEPAGE=https://bitbucket.org/snakeyaml/snakeyaml
+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://bitbucket.org/snakeyaml/snakeyaml/get/snakeyaml-1.30.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
-_md5_=38e48a98120a974dbe18a7f4715cc13c
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_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 ed6ee8c44dc1..bdaeff06f93d 100644
--- a/metadata/md5-cache/dev-java/snappy-1.1.7.8
+++ b/metadata/md5-cache/dev-java/snappy-1.1.7.8
@@ -3,6 +3,7 @@ DEPEND=>=virtual/jdk-1.8:* dev-java/osgi-core-api:0 app-arch/snappy dev-libs/bit
DESCRIPTION=Snappy compressor/decompressor for Java
EAPI=8
HOMEPAGE=https://github.com/xerial/snappy-java/
+INHERIT=java-pkg-2 java-ant-2 toolchain-funcs
IUSE=doc source test
KEYWORDS=amd64 ~arm arm64 ppc64 x86
LICENSE=Apache-2.0
@@ -10,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 92b5a4d196abffe2dbe3bdc1cf4ef2ae multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
_md5_=30bfd61a20e562d852946b5ef1c2c7c4
diff --git a/metadata/md5-cache/dev-java/sparsebitset-1.2 b/metadata/md5-cache/dev-java/sparsebitset-1.2
index fb8bc8f6f6f3..8d90d67d1303 100644
--- a/metadata/md5-cache/dev-java/sparsebitset-1.2
+++ b/metadata/md5-cache/dev-java/sparsebitset-1.2
@@ -3,6 +3,7 @@ DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zi
DESCRIPTION=An efficient sparse bitset implementation for Java
EAPI=7
HOMEPAGE=https://github.com/brettwooldridge/SparseBitSet
+INHERIT=java-pkg-2 java-pkg-simple
IUSE=doc source test
KEYWORDS=amd64 arm64 ppc64 x86
LICENSE=Apache-2.0
@@ -10,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 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
_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 1121c2a0cb87..28aad0120ead 100644
--- a/metadata/md5-cache/dev-java/spec-alpha-0.1.143
+++ b/metadata/md5-cache/dev-java/spec-alpha-0.1.143
@@ -3,10 +3,11 @@ DEPEND=dev-java/ant-core:0 >=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 >
DESCRIPTION=A Clojure library to describe the structure of data and functions
EAPI=7
HOMEPAGE=https://clojure.org/ https://github.com/clojure/spec.alpha
+INHERIT=java-pkg-2 java-ant-2
KEYWORDS=~amd64 ~x86 ~x86-linux
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 92b5a4d196abffe2dbe3bdc1cf4ef2ae multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
_md5_=bba66ecd87479c84051f091f7a333b9d
diff --git a/metadata/md5-cache/dev-java/spec-alpha-0.2.176 b/metadata/md5-cache/dev-java/spec-alpha-0.2.176
index cdf612b1c303..66cc05f32b22 100644
--- a/metadata/md5-cache/dev-java/spec-alpha-0.2.176
+++ b/metadata/md5-cache/dev-java/spec-alpha-0.2.176
@@ -3,10 +3,11 @@ DEPEND=dev-java/ant-core:0 >=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 >
DESCRIPTION=A Clojure library to describe the structure of data and functions
EAPI=7
HOMEPAGE=https://clojure.org/ https://github.com/clojure/spec.alpha
+INHERIT=java-pkg-2 java-ant-2
KEYWORDS=~amd64 ~x86 ~x86-linux
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 92b5a4d196abffe2dbe3bdc1cf4ef2ae multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
_md5_=1b7aef6dad85d62a04e7c6e251d3c238
diff --git a/metadata/md5-cache/dev-java/spec-alpha-0.2.194 b/metadata/md5-cache/dev-java/spec-alpha-0.2.194
index 3f52ac9916fa..f5f4b0cf6426 100644
--- a/metadata/md5-cache/dev-java/spec-alpha-0.2.194
+++ b/metadata/md5-cache/dev-java/spec-alpha-0.2.194
@@ -3,10 +3,11 @@ DEPEND=dev-java/ant-core:0 >=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 >
DESCRIPTION=A Clojure library to describe the structure of data and functions
EAPI=7
HOMEPAGE=https://clojure.org/ https://github.com/clojure/spec.alpha
+INHERIT=java-pkg-2 java-ant-2
KEYWORDS=~amd64 ~x86 ~x86-linux
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 92b5a4d196abffe2dbe3bdc1cf4ef2ae multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
_md5_=e5d86d5dd44cbc84e39df89aeaf70d07
diff --git a/metadata/md5-cache/dev-java/spin-1.5-r2 b/metadata/md5-cache/dev-java/spin-1.5-r2
index 5da3969f8498..de48c32a4169 100644
--- a/metadata/md5-cache/dev-java/spin-1.5-r2
+++ b/metadata/md5-cache/dev-java/spin-1.5-r2
@@ -4,6 +4,7 @@ DEPEND=>=virtual/jdk-1.8:* dev-java/cglib:3 >=dev-java/java-config-2.2.0-r3 sour
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
@@ -11,5 +12,5 @@ RDEPEND=>=virtual/jre-1.8:* dev-java/cglib:3 >=dev-java/java-config-2.2.0-r3 sou
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=mirror://sourceforge/project/spin/spin/v1.5/spin-1.5-all.zip
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_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
index c3a52b78d8f8..03c05612f5ca 100644
--- a/metadata/md5-cache/dev-java/stax2-api-4.2.1
+++ b/metadata/md5-cache/dev-java/stax2-api-4.2.1
@@ -3,11 +3,12 @@ DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zi
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 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_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
new file mode 100644
index 000000000000..125d89bbbc2b
--- /dev/null
+++ b/metadata/md5-cache/dev-java/stax2-api-4.2.1-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=>=virtual/jdk-1.9:* >=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_=21405c010c53a89714e903e6ed964e25
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 9131be9e9981..8f1a194430a2 100644
--- a/metadata/md5-cache/dev-java/stringtemplate-3.2.1-r2
+++ b/metadata/md5-cache/dev-java/stringtemplate-3.2.1-r2
@@ -3,6 +3,7 @@ DEPEND=>=virtual/jdk-1.8:* dev-java/antlr:0 >=dev-java/java-config-2.2.0-r3 sour
DESCRIPTION=A Java template engine
EAPI=7
HOMEPAGE=https://www.stringtemplate.org/
+INHERIT=java-pkg-2 java-pkg-simple
IUSE=doc source test
KEYWORDS=amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=BSD-1
@@ -10,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 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
_md5_=ce2be796703b4a85cc2dc9fa30c706f7
diff --git a/metadata/md5-cache/dev-java/stringtemplate-4.3.1 b/metadata/md5-cache/dev-java/stringtemplate-4.3.1
deleted file mode 100644
index 340021b4383b..000000000000
--- a/metadata/md5-cache/dev-java/stringtemplate-4.3.1
+++ /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/antlr-runtime:3.5 test? ( dev-java/antlr-tool:3.5 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
-DESCRIPTION=A Java template engine
-EAPI=8
-HOMEPAGE=https://www.stringtemplate.org/
-IUSE=doc source test
-KEYWORDS=amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=BSD
-RDEPEND=>=virtual/jre-1.8:* dev-java/antlr-runtime:3.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=!test? ( test )
-SLOT=4
-SRC_URI=https://repo1.maven.org/maven2/org/antlr/ST4/4.3.1/ST4-4.3.1-sources.jar https://github.com/antlr/stringtemplate4/archive/4.3.1.tar.gz -> stringtemplate-4.3.1.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
-_md5_=8176126ca619cea3e0f8e17a03c5931b
diff --git a/metadata/md5-cache/dev-java/stringtemplate-4.3.2 b/metadata/md5-cache/dev-java/stringtemplate-4.3.2
index b534004b8717..3112319e6304 100644
--- a/metadata/md5-cache/dev-java/stringtemplate-4.3.2
+++ b/metadata/md5-cache/dev-java/stringtemplate-4.3.2
@@ -4,12 +4,13 @@ DEPEND=>=virtual/jdk-1.8:* dev-java/antlr-runtime:3.5 test? ( dev-java/antlr-too
DESCRIPTION=A Java template engine
EAPI=8
HOMEPAGE=https://www.stringtemplate.org/
+INHERIT=java-pkg-2 java-pkg-simple
IUSE=doc source test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=BSD
RDEPEND=>=virtual/jre-1.8:* dev-java/antlr-runtime:3.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
RESTRICT=!test? ( test )
SLOT=4
SRC_URI=https://repo1.maven.org/maven2/org/antlr/ST4/4.3.2/ST4-4.3.2-sources.jar https://github.com/antlr/stringtemplate4/archive/4.3.2.tar.gz -> stringtemplate-4.3.2.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
-_md5_=ff797ca3504410f4352e3b094efe3769
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_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 eb99d22ef4a6..7920af272225 100644
--- a/metadata/md5-cache/dev-java/sun-jai-bin-1.1.3-r2
+++ b/metadata/md5-cache/dev-java/sun-jai-bin-1.1.3-r2
@@ -3,11 +3,12 @@ DEPEND=>=dev-java/java-config-2.2.0-r3
DESCRIPTION=JAI is a class library for managing images
EAPI=7
HOMEPAGE=https://jai.dev.java.net/
+INHERIT=java-pkg-2
KEYWORDS=amd64 ~arm arm64 ppc64 x86
LICENSE=sun-bcla-jai
RDEPEND=virtual/jre:1.8 >=dev-java/java-config-2.2.0-r3
RESTRICT=bindist mirror
SLOT=0
SRC_URI=!amd64? ( https://download.java.net/media/jai/builds/release/1_1_3/jai-1_1_3-lib-linux-i586.tar.gz ) amd64? ( https://download.java.net/media/jai/builds/release/1_1_3/jai-1_1_3-lib-linux-amd64.tar.gz )
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
_md5_=09fcb42b33c1665c3ad8594de22b165a
diff --git a/metadata/md5-cache/dev-java/sun-jms-1.1-r3 b/metadata/md5-cache/dev-java/sun-jms-1.1-r3
index 5ec7b8de50c4..2971d80c3529 100644
--- a/metadata/md5-cache/dev-java/sun-jms-1.1-r3
+++ b/metadata/md5-cache/dev-java/sun-jms-1.1-r3
@@ -4,6 +4,7 @@ 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
@@ -11,5 +12,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3
RESTRICT=bindist fetch
SLOT=0
SRC_URI=jms-1_1-fr-apidocs.zip
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_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 ab0aef51c57a..d854c0f66201 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
@@ -4,11 +4,12 @@ DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zi
DESCRIPTION=Professional cross platform layouts with Swing
EAPI=8
HOMEPAGE=https://swing-layout.dev.java.net/
+INHERIT=java-pkg-2 java-pkg-simple
IUSE=doc source
KEYWORDS=amd64 x86
LICENSE=LGPL-2.1
RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=1
SRC_URI=mirror://gentoo/swing-layout-1.0.4-src.zip
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
_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 bc468b892478..4e61c9272a5e 100644
--- a/metadata/md5-cache/dev-java/swingx-1.6.4-r1
+++ b/metadata/md5-cache/dev-java/swingx-1.6.4-r1
@@ -3,11 +3,12 @@ DEPEND=virtual/jdk:1.8 dev-java/metainf-services:0 >=dev-java/java-config-2.2.0-
DESCRIPTION=A collection of powerful, useful, and just plain fun Swing components
EAPI=7
HOMEPAGE=https://java.net/projects/swingx/
+INHERIT=java-pkg-2 java-pkg-simple
IUSE=doc source
KEYWORDS=~amd64 ~x86
LICENSE=LGPL-2.1
RDEPEND=virtual/jre:1.8 dev-java/metainf-services:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=1.6
SRC_URI=https://maven.java.net/service/local/repositories/releases/content/org/swinglabs/swingx/swingx-all/1.6.4/swingx-all-1.6.4-sources.jar https://java.net/projects/swingx/downloads/download/releases/swingx-mavensupport-1.6.4-sources.jar
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
_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 69594e5707a9..062232631c70 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
@@ -4,11 +4,12 @@ DEPEND=>=virtual/jdk-1.8:* dev-java/swingx:1.6 >=dev-java/java-config-2.2.0-r3 s
DESCRIPTION=SwingX Beaninfo
EAPI=8
HOMEPAGE=https://java.net/projects/swingx/
+INHERIT=java-pkg-2 java-pkg-simple
IUSE=doc source
KEYWORDS=~amd64 ~x86
LICENSE=LGPL-2.1
RDEPEND=>=virtual/jre-1.8:* dev-java/swingx:1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=0
SRC_URI=https://java.net/downloads/swingx/releases/swingx-beaninfo-1.6.4-sources.jar
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
_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 fc1c9d6f3d5a..ce222c50a40b 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
@@ -4,11 +4,12 @@ DEPEND=dev-java/jakarta-xml-soap-api:1 dev-java/jdom:0 dev-java/json:0 dev-java/
DESCRIPTION=Utilities and widgets to integrate Swing GUIs with web applications
EAPI=8
HOMEPAGE=https://java.net/projects/swingx-ws/
+INHERIT=java-pkg-2 java-pkg-simple
IUSE=doc source
KEYWORDS=~amd64 ~x86
LICENSE=LGPL-2.1
RDEPEND=dev-java/jakarta-xml-soap-api:1 dev-java/jdom:0 dev-java/json:0 dev-java/rome:0 dev-java/jtidy:0 dev-java/xerces:2 dev-java/swingx:1.6 dev-java/swing-layout:1 dev-java/swingx-beaninfo:0 dev-java/commons-httpclient:3 dev-java/xml-commons-external:1.4 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=bt747
SRC_URI=mirror://sourceforge/bt747/Development/swingx-ws-2011_05_15-src.zip
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
_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 74142dcdbc94..e02545a5aef9 100644
--- a/metadata/md5-cache/dev-java/swt-3.7.2-r3
+++ b/metadata/md5-cache/dev-java/swt-3.7.2-r3
@@ -4,11 +4,12 @@ DEPEND=>=dev-libs/atk-1.10.2 >=dev-libs/glib-2.6 >=x11-libs/gtk+-2.6.8:2 x11-lib
DESCRIPTION=GTK based SWT Library
EAPI=7
HOMEPAGE=http://www.eclipse.org/
+INHERIT=java-pkg-2 java-ant-2 java-osgi toolchain-funcs
IUSE=cairo opengl
KEYWORDS=amd64 ppc64 x86
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 92b5a4d196abffe2dbe3bdc1cf4ef2ae multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-osgi c9b922d3fd7b5c6117f4c4d68e32e881 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
_md5_=0d6f88d42687ca65b21dc5d8571dd6f6
diff --git a/metadata/md5-cache/dev-java/swt-3.8.2-r4 b/metadata/md5-cache/dev-java/swt-3.8.2-r4
index ebff5d3995f9..c186cf1ccab9 100644
--- a/metadata/md5-cache/dev-java/swt-3.8.2-r4
+++ b/metadata/md5-cache/dev-java/swt-3.8.2-r4
@@ -3,11 +3,12 @@ DEPEND=>=dev-libs/atk-1.10.2 >=dev-libs/glib-2.6 >=x11-libs/gtk+-2.6.8:2 x11-lib
DESCRIPTION=GTK based SWT Library
EAPI=8
HOMEPAGE=http://www.eclipse.org/
+INHERIT=java-pkg-2 java-ant-2 toolchain-funcs java-osgi
IUSE=cairo opengl
KEYWORDS=amd64 ppc64 x86
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 92b5a4d196abffe2dbe3bdc1cf4ef2ae multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-osgi c9b922d3fd7b5c6117f4c4d68e32e881 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
_md5_=1a0bdb433c0d83e53323cf38fc2458ae
diff --git a/metadata/md5-cache/dev-java/swt-4.10-r2 b/metadata/md5-cache/dev-java/swt-4.10-r2
index 1ec5522f183a..11951b32f548 100644
--- a/metadata/md5-cache/dev-java/swt-4.10-r2
+++ b/metadata/md5-cache/dev-java/swt-4.10-r2
@@ -4,11 +4,12 @@ DEPEND=>=dev-libs/atk-1.10.2 >=dev-libs/glib-2.32 >=x11-libs/gtk+-2.6.8:2 x11-li
DESCRIPTION=GTK based SWT Library
EAPI=7
HOMEPAGE=http://www.eclipse.org/
+INHERIT=flag-o-matic java-pkg-2 java-ant-2 toolchain-funcs java-osgi
IUSE=cairo opengl webkit
KEYWORDS=amd64 ppc64
LICENSE=CPL-1.0 LGPL-2.1 MPL-1.1
RDEPEND=>=dev-libs/atk-1.10.2 >=dev-libs/glib-2.32 >=x11-libs/gtk+-2.6.8:2 x11-libs/libXtst cairo? ( >=x11-libs/cairo-1.4.14 ) opengl? ( virtual/glu virtual/opengl ) webkit? ( net-libs/webkit-gtk:4 ) >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3
SLOT=4.10
SRC_URI=amd64? ( http://download.eclipse.org/eclipse/downloads/drops4/R-4.10-201812060815/swt-4.10-gtk-linux-x86_64.zip ) ppc64? ( http://download.eclipse.org/eclipse/downloads/drops4/R-4.10-201812060815/swt-4.10-gtk-linux-ppc64le.zip )
-_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 eutils dab5d8ec471d025b79c9e6906bcf3bff flag-o-matic a500d7cc40da3de38c361e889153bdf7 java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-osgi c9b922d3fd7b5c6117f4c4d68e32e881 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae multilib 4a33c9008e5ee30cb8840a3fdc24df2b strip-linguas ac3ee41ee2d31d8c41a77c0838320cc7 toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8 wrapper 4a1902f969e5718126434fc35f3a0d9c
+_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
_md5_=7ee352c08907a4dcf2f198e51ab248b4
diff --git a/metadata/md5-cache/dev-java/testng-6.9.10 b/metadata/md5-cache/dev-java/testng-6.9.10
index 1aa581647323..384f58b8bbe9 100644
--- a/metadata/md5-cache/dev-java/testng-6.9.10
+++ b/metadata/md5-cache/dev-java/testng-6.9.10
@@ -3,6 +3,7 @@ DEPEND=dev-java/bsh:0 dev-java/guice:4 dev-java/junit:4 dev-java/ant-core:0 dev-
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
@@ -10,5 +11,5 @@ RDEPEND=dev-java/bsh:0 dev-java/guice:4 dev-java/junit:4 dev-java/ant-core:0 dev
RESTRICT=test
SLOT=0
SRC_URI=https://github.com/cbeust/testng/archive/6.9.10.tar.gz -> testng-6.9.10.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 eapi7-ver 1a0a60ad07c8b32d2faba2d085dc0f24 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 9f813bb3c47cf2e60619a663b87c5f4e estack 055c42df72f76a4f45ec92b35e83cd56 eutils dab5d8ec471d025b79c9e6906bcf3bff java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib 4a33c9008e5ee30cb8840a3fdc24df2b preserve-libs a8e50acee31b5759b4df1f7707cae54b strip-linguas ac3ee41ee2d31d8c41a77c0838320cc7 toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8 vcs-clean d271b7bc7e6a009758d7d4ef749174e3 versionator d3fb3ba33acc3bbbdc4d7970227c100d wrapper 4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 eapi7-ver 1a0a60ad07c8b32d2faba2d085dc0f24 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 9f813bb3c47cf2e60619a663b87c5f4e estack 055c42df72f76a4f45ec92b35e83cd56 eutils dab5d8ec471d025b79c9e6906bcf3bff java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 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 e6d288c3842d..eefdf3482fbc 100644
--- a/metadata/md5-cache/dev-java/testng-6.9.10-r1
+++ b/metadata/md5-cache/dev-java/testng-6.9.10-r1
@@ -3,6 +3,7 @@ DEPEND=dev-java/bsh:0 dev-java/guice:4 dev-java/junit:4 dev-java/ant-core:0 dev-
DESCRIPTION=Testing framework inspired by JUnit and NUnit with new features
EAPI=8
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
@@ -10,5 +11,5 @@ RDEPEND=dev-java/bsh:0 dev-java/guice:4 dev-java/junit:4 dev-java/ant-core:0 dev
RESTRICT=test
SLOT=0
SRC_URI=https://github.com/cbeust/testng/archive/6.9.10.tar.gz -> testng-6.9.10.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
_md5_=dcbb00caec778b23592df5f1c33f8f6c
diff --git a/metadata/md5-cache/dev-java/tomcat-native-1.2.32 b/metadata/md5-cache/dev-java/tomcat-native-1.2.32
index 81f70047a03b..5880d6914ee6 100644
--- a/metadata/md5-cache/dev-java/tomcat-native-1.2.32
+++ b/metadata/md5-cache/dev-java/tomcat-native-1.2.32
@@ -3,12 +3,13 @@ DEPEND=>=virtual/jdk-1.8:* test? ( dev-java/ant-junit:0 ) >=dev-java/java-config
DESCRIPTION=Allows Tomcat to use certain native resources for better performance
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 92b5a4d196abffe2dbe3bdc1cf4ef2ae multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=33cb3c7df9ef11012684ca5aa22cc64b
+_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_md5_=4d0641fff4ff93b51958f2e8ddc698b3
diff --git a/metadata/md5-cache/dev-java/tomcat-native-1.2.31 b/metadata/md5-cache/dev-java/tomcat-native-1.2.33
index 49b3c6e71b67..b36f8951fc7a 100644
--- a/metadata/md5-cache/dev-java/tomcat-native-1.2.31
+++ b/metadata/md5-cache/dev-java/tomcat-native-1.2.33
@@ -1,14 +1,15 @@
DEFINED_PHASES=compile configure install postinst preinst prepare setup test
DEPEND=>=virtual/jdk-1.8:* test? ( dev-java/ant-junit:0 ) >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
DESCRIPTION=Allows Tomcat to use certain native resources for better performance
-EAPI=7
+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.31/source/tomcat-native-1.2.31-src.tar.gz
-_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=e83e396997fe8d7bc561354ca091870c
+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
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-10.0.17 b/metadata/md5-cache/dev-java/tomcat-servlet-api-10.0.17
deleted file mode 100644
index d42c7b86097b..000000000000
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-10.0.17
+++ /dev/null
@@ -1,13 +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=Tomcat's Servlet API 5.0/JSP API 3.0/EL API 4.0 implementation
-EAPI=8
-HOMEPAGE=https://tomcat.apache.org/
-IUSE=source
-KEYWORDS=amd64 ~arm arm64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=5.0
-SRC_URI=mirror://apache/tomcat/tomcat-10/v10.0.17/src/apache-tomcat-10.0.17-src.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
-_md5_=020916eb2be685584c4c31be6ed12817
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-10.0.18 b/metadata/md5-cache/dev-java/tomcat-servlet-api-10.0.18
index b08297a2540b..e37fa2ee3a7c 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-10.0.18
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-10.0.18
@@ -3,11 +3,12 @@ DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zi
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
IUSE=source
-KEYWORDS=~amd64 ~arm arm64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm arm64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
LICENSE=Apache-2.0
RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=5.0
SRC_URI=mirror://apache/tomcat/tomcat-10/v10.0.18/src/apache-tomcat-10.0.18-src.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
-_md5_=77855d10a095352ef8432dff69191097
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_md5_=020916eb2be685584c4c31be6ed12817
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-10.0.20 b/metadata/md5-cache/dev-java/tomcat-servlet-api-10.0.20
index 8b6b56cebc82..ef5db03cb0b0 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-10.0.20
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-10.0.20
@@ -3,11 +3,12 @@ DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zi
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
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.20/src/apache-tomcat-10.0.20-src.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
-_md5_=484ed8723ef13a21c7a8ed2078e7409b
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_md5_=020916eb2be685584c4c31be6ed12817
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 09f4eeb5beb8..4da5a3260024 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
@@ -3,11 +3,12 @@ DEPEND=>=virtual/jdk-1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
DESCRIPTION=Tomcat's Servlet API 2.3/JSP API 1.2 implementation
EAPI=7
HOMEPAGE=https://tomcat.apache.org/
+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 ~x64-solaris ~x86-solaris
LICENSE=Apache-2.0
RDEPEND=>=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=2.3
SRC_URI=https://archive.apache.org/dist/tomcat/tomcat-4/v4.1.40/src/apache-tomcat-4.1.40-src.tar.gz
-_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
_md5_=e55474e5386f7203cb04a172ab7de0c2
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-5.5.36 b/metadata/md5-cache/dev-java/tomcat-servlet-api-5.5.36
index ec5f5de56f95..890030498359 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
@@ -3,11 +3,12 @@ DEPEND=>=virtual/jdk-1.8 source? ( app-arch/zip ) >=dev-java/java-config-2.2.0-r
DESCRIPTION=Tomcat's Servlet API 2.4/JSP API 2.0 implementation
EAPI=7
HOMEPAGE=https://tomcat.apache.org/
+INHERIT=java-pkg-2 java-ant-2 java-osgi
IUSE=doc source
KEYWORDS=amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
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 92b5a4d196abffe2dbe3bdc1cf4ef2ae multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-osgi c9b922d3fd7b5c6117f4c4d68e32e881 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
_md5_=3037ebb67bccfb6c7b14f5f21f34e929
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-6.0.53-r1 b/metadata/md5-cache/dev-java/tomcat-servlet-api-6.0.53-r1
index 66b32edc1816..ef6ae5d6a447 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
@@ -3,11 +3,12 @@ DEPEND=>=virtual/jdk-1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
DESCRIPTION=Tomcat's Servlet API 2.5/JSP API 2.1 implementation
EAPI=7
HOMEPAGE=https://tomcat.apache.org/
+INHERIT=java-pkg-2 java-ant-2
IUSE=source
KEYWORDS=amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris
LICENSE=Apache-2.0
RDEPEND=>=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=2.5
SRC_URI=https://archive.apache.org/dist/tomcat/tomcat-6/v6.0.53/src/apache-tomcat-6.0.53-src.tar.gz
-_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
_md5_=b9ba179dd9ddedb59455338e1f2919b3
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-7.0.109 b/metadata/md5-cache/dev-java/tomcat-servlet-api-7.0.109
index 1125e681f391..107052cc302f 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
@@ -3,11 +3,12 @@ DEPEND=>=virtual/jdk-1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
DESCRIPTION=Tomcat's Servlet API 3.0/JSP API 2.2 implementation
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
LICENSE=Apache-2.0
RDEPEND=>=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=3.0
SRC_URI=mirror://apache/tomcat/tomcat-7/v7.0.109/src/apache-tomcat-7.0.109-src.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
_md5_=8b2861f02a5c0fc5d82edcfef67e2583
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.76 b/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.76
deleted file mode 100644
index 6f08e7f58170..000000000000
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.76
+++ /dev/null
@@ -1,13 +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=Tomcat's Servlet API 3.1/JSP API 2.3/EL API 3.0 implementation
-EAPI=7
-HOMEPAGE=https://tomcat.apache.org/
-IUSE=source
-KEYWORDS=amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=3.1
-SRC_URI=mirror://apache/tomcat/tomcat-8/v8.5.76/src/apache-tomcat-8.5.76-src.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
-_md5_=1299696970c89c828be32d9a9d67e292
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.77 b/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.77
index 91a2e2870e42..dca009457d94 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.77
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.77
@@ -3,11 +3,12 @@ DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zi
DESCRIPTION=Tomcat's Servlet API 3.1/JSP API 2.3/EL API 3.0 implementation
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 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
-_md5_=02ff9c0607d1e35b099496ea057bf1b4
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_md5_=1299696970c89c828be32d9a9d67e292
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.78 b/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.78
index 52a412f263bb..0636d6f7d20c 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.78
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.78
@@ -3,11 +3,12 @@ DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zi
DESCRIPTION=Tomcat's Servlet API 3.1/JSP API 2.3/EL API 3.0 implementation
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.78/src/apache-tomcat-8.5.78-src.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
-_md5_=ab5d48ecbb7dcf4732f97868224457ca
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_md5_=1299696970c89c828be32d9a9d67e292
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.59 b/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.59
deleted file mode 100644
index a097dfcbfee7..000000000000
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.59
+++ /dev/null
@@ -1,13 +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=Tomcat's Servlet API 4.0/JSP API 2.3/EL API 3.0 implementation
-EAPI=8
-HOMEPAGE=https://tomcat.apache.org/
-IUSE=source
-KEYWORDS=amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=4.0
-SRC_URI=mirror://apache/tomcat/tomcat-9/v9.0.59/src/apache-tomcat-9.0.59-src.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
-_md5_=89115bc19add62d8ea59308a19759575
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.60 b/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.60
index bc962ae08ebd..5372aa5b04c2 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.60
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.60
@@ -3,11 +3,12 @@ DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zi
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 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
LICENSE=Apache-2.0
RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=4.0
SRC_URI=mirror://apache/tomcat/tomcat-9/v9.0.60/src/apache-tomcat-9.0.60-src.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
-_md5_=c7720588ea9f9215c9fa5aa5c2d63302
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_md5_=89115bc19add62d8ea59308a19759575
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.62 b/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.62
index 67f8fc4ef9d7..8b8e87721c57 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.62
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.62
@@ -3,11 +3,12 @@ DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zi
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 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
LICENSE=Apache-2.0
RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=4.0
SRC_URI=mirror://apache/tomcat/tomcat-9/v9.0.62/src/apache-tomcat-9.0.62-src.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
-_md5_=08ded5a97f72bfd8d150c726103afe2f
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_md5_=89115bc19add62d8ea59308a19759575
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 9e0d5304e056..c5b228b910ae 100644
--- a/metadata/md5-cache/dev-java/treelayout-1.0.3-r1
+++ b/metadata/md5-cache/dev-java/treelayout-1.0.3-r1
@@ -3,6 +3,7 @@ DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zi
DESCRIPTION=Efficient and customizable TreeLayout Algorithm in Java.
EAPI=8
HOMEPAGE=https://github.com/abego/treelayout
+INHERIT=java-pkg-2 java-pkg-simple
IUSE=doc source test
KEYWORDS=amd64 ~arm arm64 ppc64 x86
LICENSE=BSD
@@ -10,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 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
_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 2b05c77134b6..bf6a2e586ef4 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
@@ -3,11 +3,12 @@ DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zi
DESCRIPTION=A library of arguably useful Java utilities
EAPI=8
HOMEPAGE=https://lightbend.github.io/config/
+INHERIT=java-pkg-2 java-pkg-simple
IUSE=doc source 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=https://github.com/lightbend/config/archive/refs/tags/v1.3.0.tar.gz -> typesafe-config-1.3.0.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
_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 653ed9b1c3a5..837d7ff374ce 100644
--- a/metadata/md5-cache/dev-java/univocity-parsers-2.9.1
+++ b/metadata/md5-cache/dev-java/univocity-parsers-2.9.1
@@ -3,11 +3,12 @@ DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zi
DESCRIPTION=A collection of extremely fast and reliable parsers for Java
EAPI=8
HOMEPAGE=https://www.univocity.com/
+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://github.com/uniVocity/univocity-parsers/archive/refs/tags/v2.9.1.tar.gz -> univocity-parsers-2.9.1.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
-_md5_=3c9fba39b3fe7b9aefa2f4ec1e2416a3
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_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 10ee52d1728a..e4d68c32bfc2 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
@@ -3,12 +3,13 @@ DEFINED_PHASES=compile install preinst prepare setup test
DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
DESCRIPTION=Bean Validation (JSR-303) API
EAPI=7
-HOMEPAGE=http://fisheye.jboss.org/browse/Hibernate/beanvalidation/api/tags/v1_0_0_GA
+HOMEPAGE=https://beanvalidation.org/
+INHERIT=java-pkg-2 java-pkg-simple
IUSE=doc source
KEYWORDS=~amd64 ~x86
LICENSE=Apache-2.0
RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=1.0
SRC_URI=https://repository.jboss.org/nexus/service/local/repo_groups/public/content/javax/validation/validation-api/1.0.0.GA/validation-api-1.0.0.GA-sources.jar
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
-_md5_=3ccd6587428aa84d746f0d82f769889a
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_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 9a47113fe859..42922546596f 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
@@ -3,12 +3,13 @@ DEFINED_PHASES=compile install preinst prepare setup test
DEPEND=>=virtual/jdk-1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
DESCRIPTION=Bean Validation (JSR-303) API
EAPI=7
-HOMEPAGE=http://fisheye.jboss.org/browse/Hibernate/beanvalidation/api/tags/v1_0_0_GA
+HOMEPAGE=https://beanvalidation.org/
+INHERIT=java-pkg-2 java-pkg-simple
IUSE=doc source
KEYWORDS=amd64 x86
LICENSE=Apache-2.0
RDEPEND=>=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=1.0
SRC_URI=https://repo1.maven.org/maven2/javax/validation/validation-api/1.1.0.Final/validation-api-1.1.0.Final-sources.jar -> validation-api-1.1.0.jar
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
-_md5_=a2e640185994c36cf7a5d4d0335bc6bc
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_md5_=5e3cfb69d85910d60d651cc0a669454d
diff --git a/metadata/md5-cache/dev-java/velocity-2.3 b/metadata/md5-cache/dev-java/velocity-2.3
index 5d0616d3fd74..9416507f2ea9 100644
--- a/metadata/md5-cache/dev-java/velocity-2.3
+++ b/metadata/md5-cache/dev-java/velocity-2.3
@@ -4,6 +4,7 @@ DEPEND=>=virtual/jdk-1.8:* >=dev-java/commons-io-2.8.0:1 >=dev-java/commons-lang
DESCRIPTION=Apache Velocity is a general purpose template engine
EAPI=7
HOMEPAGE=https://velocity.apache.org
+INHERIT=java-pkg-2 java-pkg-simple
IUSE=doc source test
KEYWORDS=amd64 ~arm arm64 ppc64 x86
LICENSE=Apache-2.0
@@ -11,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 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
_md5_=196e2c49434cac18d569e94ce794c2cf
diff --git a/metadata/md5-cache/dev-java/woodstox-core-6.2.7 b/metadata/md5-cache/dev-java/woodstox-core-6.2.7
deleted file mode 100644
index f55dc948581f..000000000000
--- a/metadata/md5-cache/dev-java/woodstox-core-6.2.7
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=dev-java/msv:0 dev-java/relaxng-datatype:0 dev-java/stax2-api:0 dev-java/xsdlib:0 >=virtual/jdk-1.8:* dev-java/osgi-core-api:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
-DESCRIPTION=An XML processor that implements Stax (JSR-173), SAX2 and Stax2 APIs
-EAPI=8
-HOMEPAGE=https://github.com/FasterXML/woodstox
-IUSE=doc source test
-KEYWORDS=amd64 ~arm arm64 ppc64 x86
-LICENSE=Apache-2.0
-RDEPEND=dev-java/msv:0 dev-java/relaxng-datatype:0 dev-java/stax2-api:0 dev-java/xsdlib:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/FasterXML/woodstox/archive/refs/tags/woodstox-core-6.2.7.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
-_md5_=87570cb619132cdee4a3eb4e84201986
diff --git a/metadata/md5-cache/dev-java/woodstox-core-6.2.8 b/metadata/md5-cache/dev-java/woodstox-core-6.2.8-r1
index 715e129bb344..88949fec0b62 100644
--- a/metadata/md5-cache/dev-java/woodstox-core-6.2.8
+++ b/metadata/md5-cache/dev-java/woodstox-core-6.2.8-r1
@@ -1,14 +1,15 @@
DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=dev-java/msv:0 dev-java/relaxng-datatype:0 dev-java/stax2-api:0 dev-java/xsdlib:0 >=virtual/jdk-1.8:* dev-java/osgi-core-api:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
+DEPEND=dev-java/msv:0 dev-java/relaxng-datatype:0 dev-java/stax2-api:0 dev-java/xsdlib:0 >=virtual/jdk-11:* dev-java/osgi-core-api:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
DESCRIPTION=An XML processor that implements Stax (JSR-173), SAX2 and Stax2 APIs
EAPI=8
HOMEPAGE=https://github.com/FasterXML/woodstox
+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/msv:0 dev-java/relaxng-datatype:0 dev-java/stax2-api:0 dev-java/xsdlib:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://github.com/FasterXML/woodstox/archive/woodstox-core-6.2.8.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
-_md5_=f18e632565e89e8de10ef603cc74872b
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
+_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 ccd443a55bd6..03dd2276374d 100644
--- a/metadata/md5-cache/dev-java/wsdl4j-1.6.2-r1
+++ b/metadata/md5-cache/dev-java/wsdl4j-1.6.2-r1
@@ -3,6 +3,7 @@ DEPEND=>=virtual/jdk-1.8:* test? ( dev-java/junit:0 ) app-arch/unzip >=dev-java/
DESCRIPTION=Web Services Description Language for Java Toolkit (WSDL4J)
EAPI=7
HOMEPAGE=http://wsdl4j.sourceforge.net
+INHERIT=java-pkg-2 java-ant-2
IUSE=doc source test
KEYWORDS=amd64 ~ppc64 x86
LICENSE=CPL-1.0
@@ -10,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 92b5a4d196abffe2dbe3bdc1cf4ef2ae multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
_md5_=9aa326432167919e4687c68b1949b92b
diff --git a/metadata/md5-cache/dev-java/xalan-2.7.2-r1 b/metadata/md5-cache/dev-java/xalan-2.7.2-r1
index 88a760d9a7c2..e53ef69276c5 100644
--- a/metadata/md5-cache/dev-java/xalan-2.7.2-r1
+++ b/metadata/md5-cache/dev-java/xalan-2.7.2-r1
@@ -4,11 +4,12 @@ DEPEND=dev-java/javacup:0 dev-java/bcel:0 virtual/jdk:1.8 >=dev-java/java-config
DESCRIPTION=Transforming XML documents into HTML, text, or other XML document types
EAPI=7
HOMEPAGE=https://xalan.apache.org/
+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=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 92b5a4d196abffe2dbe3bdc1cf4ef2ae multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
_md5_=f76b5f3e572c89e4034b9e7611b7fcdf
diff --git a/metadata/md5-cache/dev-java/xalan-serializer-2.7.2-r1 b/metadata/md5-cache/dev-java/xalan-serializer-2.7.2-r1
index 78865fb4e51d..de9a4dac38d6 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
@@ -3,11 +3,12 @@ DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zi
DESCRIPTION=DOM Level 3 serializer from Apache Xalan, shared by Xalan and Xerces
EAPI=7
HOMEPAGE=https://xalan.apache.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 ~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/xalan/xalan-j/source/xalan-j_2_7_2-src.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
_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 0b340ff843cf..4eae10d88856 100644
--- a/metadata/md5-cache/dev-java/xerces-2.12.2
+++ b/metadata/md5-cache/dev-java/xerces-2.12.2
@@ -3,11 +3,12 @@ DEPEND=dev-java/xml-commons-external:1.4 dev-java/xml-commons-resolver:0 virtual
DESCRIPTION=Xerces Java XML parser
EAPI=8
HOMEPAGE=https://xerces.apache.org/xerces2-j/index.html
+INHERIT=java-pkg-2 java-pkg-simple
IUSE=doc source
KEYWORDS=amd64 ~arm arm64 ppc64 x86
LICENSE=Apache-2.0
RDEPEND=dev-java/xml-commons-external:1.4 dev-java/xml-commons-resolver:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=2
SRC_URI=mirror://apache/xerces/j/source/Xerces-J-src.2.12.2.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
_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 6a341158a699..a359d1aa7ab9 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
@@ -3,6 +3,7 @@ DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zi
DESCRIPTION=Core library of the Xerial project.
EAPI=8
HOMEPAGE=https://xerial.org
+INHERIT=java-pkg-2 java-pkg-simple
IUSE=doc source test
KEYWORDS=amd64 ~arm arm64 ppc64 x86
LICENSE=Apache-2.0
@@ -10,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 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
_md5_=bdb6618a2d342e7f3891623a6b005e8a
diff --git a/metadata/md5-cache/dev-java/xjavac-2.4.0 b/metadata/md5-cache/dev-java/xjavac-2.4.0
index d3038f2b785e..eb8fa94b3715 100644
--- a/metadata/md5-cache/dev-java/xjavac-2.4.0
+++ b/metadata/md5-cache/dev-java/xjavac-2.4.0
@@ -3,11 +3,12 @@ DEPEND=dev-java/ant-core:0 >=virtual/jdk-1.7 >=dev-java/java-config-2.2.0-r3 sou
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 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib 4a33c9008e5ee30cb8840a3fdc24df2b preserve-libs a8e50acee31b5759b4df1f7707cae54b strip-linguas ac3ee41ee2d31d8c41a77c0838320cc7 toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8 vcs-clean d271b7bc7e6a009758d7d4ef749174e3 versionator d3fb3ba33acc3bbbdc4d7970227c100d wrapper 4a1902f969e5718126434fc35f3a0d9c
+_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
index 2b1c0d355e5d..7b387e390abe 100644
--- a/metadata/md5-cache/dev-java/xml-commons-external-1.3.04-r1
+++ b/metadata/md5-cache/dev-java/xml-commons-external-1.3.04-r1
@@ -3,11 +3,12 @@ DEPEND=>=virtual/jdk-1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
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 92b5a4d196abffe2dbe3bdc1cf4ef2ae ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib 4a33c9008e5ee30cb8840a3fdc24df2b preserve-libs a8e50acee31b5759b4df1f7707cae54b strip-linguas ac3ee41ee2d31d8c41a77c0838320cc7 toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8 vcs-clean d271b7bc7e6a009758d7d4ef749174e3 versionator d3fb3ba33acc3bbbdc4d7970227c100d wrapper 4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 eapi7-ver 1a0a60ad07c8b32d2faba2d085dc0f24 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 9f813bb3c47cf2e60619a663b87c5f4e estack 055c42df72f76a4f45ec92b35e83cd56 eutils dab5d8ec471d025b79c9e6906bcf3bff java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 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 34ad2f12cece..64285861e135 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
@@ -4,11 +4,12 @@ DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zi
DESCRIPTION=Externally-defined set of standard interfaces, namely DOM, SAX, and JAXP
EAPI=7
HOMEPAGE=https://xerces.apache.org/xml-commons/components/external/
+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=1.4
SRC_URI=https://repo1.maven.org/maven2/xml-apis/xml-apis/1.4.01/xml-apis-1.4.01-sources.jar -> xml-commons-external-1.4.01.jar
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
_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 9c91384c6d19..a815c5eb148c 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
@@ -3,11 +3,12 @@ DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zi
DESCRIPTION=An XML Entity and URI Resolver
EAPI=7
HOMEPAGE=http://xml.apache.org/commons/
+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/xml/commons/xml-commons-resolver-1.2.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
_md5_=d4a018806605ca5d4b9a4ad82307e754
diff --git a/metadata/md5-cache/dev-java/xmlgraphics-commons-2.7 b/metadata/md5-cache/dev-java/xmlgraphics-commons-2.7
index 5cf1c3f019dd..285225745a5a 100644
--- a/metadata/md5-cache/dev-java/xmlgraphics-commons-2.7
+++ b/metadata/md5-cache/dev-java/xmlgraphics-commons-2.7
@@ -3,6 +3,7 @@ DEPEND=dev-java/commons-io:1 dev-java/commons-logging:0 >=virtual/jdk-1.8:* test
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
@@ -10,5 +11,5 @@ RDEPEND=dev-java/commons-io:1 dev-java/commons-logging:0 >=virtual/jre-1.8:* >=d
RESTRICT=test !test? ( test )
SLOT=2
SRC_URI=mirror://apache/xmlgraphics/commons/source/xmlgraphics-commons-2.7-src.tar.gz
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_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
new file mode 100644
index 000000000000..774c6348f841
--- /dev/null
+++ b/metadata/md5-cache/dev-java/xmlgraphics-commons-2.7-r1
@@ -0,0 +1,15 @@
+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:4 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 )
+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
diff --git a/metadata/md5-cache/dev-java/xmlunit-1.6-r1 b/metadata/md5-cache/dev-java/xmlunit-1.6-r1
index ddf183d16d91..bb4f83f82e1d 100644
--- a/metadata/md5-cache/dev-java/xmlunit-1.6-r1
+++ b/metadata/md5-cache/dev-java/xmlunit-1.6-r1
@@ -3,6 +3,7 @@ DEPEND=>=virtual/jdk-1.8:* app-arch/unzip:0 doc? ( app-text/docbook-xsl-styleshe
DESCRIPTION=XMLUnit extends JUnit and NUnit to enable unit testing of XML
EAPI=8
HOMEPAGE=http://xmlunit.sourceforge.net/
+INHERIT=java-pkg-2 java-ant-2
IUSE=doc source test
KEYWORDS=amd64 ~arm64 ppc64 x86
LICENSE=BSD
@@ -10,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 92b5a4d196abffe2dbe3bdc1cf4ef2ae multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
_md5_=9394d087cfd29588535e4561e6d5d06a
diff --git a/metadata/md5-cache/dev-java/xmpbox-2.0.24 b/metadata/md5-cache/dev-java/xmpbox-2.0.24
index bee1bbf5b0b6..6f39c84d9543 100644
--- a/metadata/md5-cache/dev-java/xmpbox-2.0.24
+++ b/metadata/md5-cache/dev-java/xmpbox-2.0.24
@@ -4,6 +4,7 @@ DEPEND=dev-java/jaxb-api:2 >=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 s
DESCRIPTION=An open source Java tool that implements Adobe's XMP(TM) specification
EAPI=8
HOMEPAGE=https://pdfbox.apache.org
+INHERIT=java-pkg-2 java-pkg-simple
IUSE=doc source test
KEYWORDS=amd64 arm64 ppc64 x86
LICENSE=Apache-2.0
@@ -11,5 +12,5 @@ RDEPEND=dev-java/jaxb-api:2 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=mirror://apache/pdfbox/2.0.24/pdfbox-2.0.24-src.zip
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
_md5_=2f11d8a49426a25cbffad11cd56e97de
diff --git a/metadata/md5-cache/dev-java/xom-1.3.7 b/metadata/md5-cache/dev-java/xom-1.3.7
index fd30b47f65b8..466f6ec2f47e 100644
--- a/metadata/md5-cache/dev-java/xom-1.3.7
+++ b/metadata/md5-cache/dev-java/xom-1.3.7
@@ -3,6 +3,7 @@ DEPEND=dev-java/jaxen:1.2 dev-java/xerces:2 dev-java/junit:0 >=virtual/jdk-1.8:*
DESCRIPTION=XML Object Model
EAPI=7
HOMEPAGE=https://xom.nu
+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 ~x86-solaris
LICENSE=LGPL-2
@@ -10,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 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
_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 b81006e8a594..93d135ccdd34 100644
--- a/metadata/md5-cache/dev-java/xpp2-2.1.10-r3
+++ b/metadata/md5-cache/dev-java/xpp2-2.1.10-r3
@@ -3,6 +3,7 @@ DEPEND=>=virtual/jdk-1.8:* test? ( dev-java/junit:4 ) dev-java/xerces:2 >=dev-ja
DESCRIPTION=A streaming pull XML parser used to quickly process input elements
EAPI=7
HOMEPAGE=https://web.archive.org/web/20130904163229/http://www.extreme.indiana.edu/xgws/xsoap/xpp/xpp2/
+INHERIT=java-pkg-2 java-ant-2
IUSE=test doc source
KEYWORDS=amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
LICENSE=Apache-1.1 IBM
@@ -10,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 92b5a4d196abffe2dbe3bdc1cf4ef2ae multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 e38ea02d8ed864a74078ecf46aa06f30 multilib 4a33c9008e5ee30cb8840a3fdc24df2b toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8
_md5_=b94c06e34b96ea621107d7db29d49ac1
diff --git a/metadata/md5-cache/dev-java/xpp3-1.1.4c-r6 b/metadata/md5-cache/dev-java/xpp3-1.1.4c-r6
index 7589c330ecb1..6c85ef92a5cf 100644
--- a/metadata/md5-cache/dev-java/xpp3-1.1.4c-r6
+++ b/metadata/md5-cache/dev-java/xpp3-1.1.4c-r6
@@ -3,11 +3,12 @@ DEPEND=virtual/jdk:1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
DESCRIPTION=An implementation of XMLPULL V1 API
EAPI=8
HOMEPAGE=https://www.extreme.indiana.edu/xgws/xsoap/xpp/mxp1/index.html
+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=Apache-1.1 IBM JDOM LGPL-2.1+
RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=0
SRC_URI=https://repo1.maven.org/maven2/xpp3/xpp3/1.1.4c/xpp3-1.1.4c-sources.jar -> xpp3-1.1.4c.jar
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
_md5_=805b3964c2455242a09dcf8a33a87ccd
diff --git a/metadata/md5-cache/dev-java/xsdlib-20090415-r1 b/metadata/md5-cache/dev-java/xsdlib-20090415-r1
index 58c92b21b560..a3339de2f8dc 100644
--- a/metadata/md5-cache/dev-java/xsdlib-20090415-r1
+++ b/metadata/md5-cache/dev-java/xsdlib-20090415-r1
@@ -4,11 +4,12 @@ DEPEND=dev-java/xerces:2 dev-java/relaxng-datatype:0 >=virtual/jdk-1.8:* >=dev-j
DESCRIPTION=Sun XML Datatypes Library
EAPI=7
HOMEPAGE=http://msv.java.net/
+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 Apache-1.1
RDEPEND=dev-java/xerces:2 dev-java/relaxng-datatype:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=0
SRC_URI=http://java.net/downloads/msv/releases/xsdlib.20090415.zip
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
_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 b32a02c564e0..904e77f5e6fa 100644
--- a/metadata/md5-cache/dev-java/xz-java-1.9
+++ b/metadata/md5-cache/dev-java/xz-java-1.9
@@ -3,11 +3,12 @@ DEPEND=app-arch/unzip >=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source
DESCRIPTION=Implementation of xz data compression in pure java
EAPI=7
HOMEPAGE=https://tukaani.org/xz/java.html
+INHERIT=java-pkg-2 java-pkg-simple
IUSE=doc examples source
KEYWORDS=amd64 ~arm arm64 ppc64 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://tukaani.org/xz/xz-java-1.9.zip
-_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 95922adb58696025c86c401d825178a7 java-utils-2 e38ea02d8ed864a74078ecf46aa06f30
_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 19e0ff5aef7c..4af681d76f83 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
@@ -4,10 +4,11 @@ DEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3
DESCRIPTION=JNI bindings for Zstd native library
EAPI=7
HOMEPAGE=https://github.com/luben/zstd-jni
+INHERIT=java-pkg-2 java-pkg-simple cmake
KEYWORDS=amd64 ~arm arm64 ppc64 x86
LICENSE=BSD
RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3
SLOT=0
SRC_URI=https://github.com/luben/zstd-jni/archive/v1.5.0-4.tar.gz -> zstd-jni-1.5.0.4.tar.gz
-_eclasses_=cmake 3c38df051095289667b6f09ebd0cc149 edos2unix 33e347e171066657f91f8b0c72ec8773 eutils dab5d8ec471d025b79c9e6906bcf3bff flag-o-matic a500d7cc40da3de38c361e889153bdf7 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 8a2b8811bad7877b5ec349bddeceabb6 java-utils-2 92b5a4d196abffe2dbe3bdc1cf4ef2ae multilib 4a33c9008e5ee30cb8840a3fdc24df2b multiprocessing 61c959fc55c15c00bbb1079d6a71370b ninja-utils fef481272d4a8e136a7d8a0fb1329384 strip-linguas ac3ee41ee2d31d8c41a77c0838320cc7 toolchain-funcs badd6e329e1f3e6bee99b35bf8763ce8 wrapper 4a1902f969e5718126434fc35f3a0d9c xdg-utils fffb53a53cf17c9c0c998a3c0a590c7e
+_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
_md5_=143e064a4c48b4a9a8140d602240a94f