summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'dev-java')
-rw-r--r--dev-java/angus-activation/angus-activation-1.0.0-r1.ebuild2
-rw-r--r--dev-java/angus-activation/angus-activation-1.0.0.ebuild43
-rw-r--r--dev-java/animal-sniffer-annotations/animal-sniffer-annotations-1.15-r1.ebuild1
-rw-r--r--dev-java/ant-eclipse-ecj/Manifest1
-rw-r--r--dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.22-r2.ebuild (renamed from dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.22-r1.ebuild)0
-rw-r--r--dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.25.ebuild53
-rw-r--r--dev-java/ant-eclipse-ecj/files/ecj-4.222
-rw-r--r--dev-java/ant-eclipse-ecj/files/ecj-4.257
-rw-r--r--dev-java/apiguardian-api/apiguardian-api-1.1.2-r1.ebuild2
-rw-r--r--dev-java/apiguardian-api/apiguardian-api-1.1.2.ebuild36
-rw-r--r--dev-java/aqute-bnd-annotation/Manifest1
-rw-r--r--dev-java/aqute-bnd-annotation/aqute-bnd-annotation-6.3.1.ebuild48
-rw-r--r--dev-java/aqute-bnd-annotation/metadata.xml (renamed from dev-java/log4j-api-java9/metadata.xml)0
-rw-r--r--dev-java/asm-analysis/Manifest1
-rw-r--r--dev-java/asm-analysis/asm-analysis-9.2.ebuild28
-rw-r--r--dev-java/asm-analysis/metadata.xml26
-rw-r--r--dev-java/asm-commons/Manifest1
-rw-r--r--dev-java/asm-commons/asm-commons-9.2.ebuild28
-rw-r--r--dev-java/asm-commons/metadata.xml26
-rw-r--r--dev-java/asm-tree/Manifest1
-rw-r--r--dev-java/asm-tree/asm-tree-9.2.ebuild28
-rw-r--r--dev-java/asm-tree/metadata.xml26
-rw-r--r--dev-java/asm-util/Manifest1
-rw-r--r--dev-java/asm-util/asm-util-9.2.ebuild28
-rw-r--r--dev-java/asm-util/metadata.xml26
-rw-r--r--dev-java/assertj-core/assertj-core-3.10.0.ebuild2
-rw-r--r--dev-java/bcel/Manifest3
-rw-r--r--dev-java/bcel/bcel-6.5.0-r3.ebuild75
-rw-r--r--dev-java/bcel/bcel-6.5.0.ebuild31
-rw-r--r--dev-java/bcel/bcel-6.6.0.ebuild59
-rw-r--r--dev-java/bcel/metadata.xml31
-rw-r--r--dev-java/bcmail/Manifest1
-rw-r--r--dev-java/bcmail/bcmail-1.72.ebuild57
-rw-r--r--dev-java/bcpg/Manifest1
-rw-r--r--dev-java/bcpg/bcpg-1.72.ebuild59
-rw-r--r--dev-java/bcpkix/Manifest1
-rw-r--r--dev-java/bcpkix/bcpkix-1.72.ebuild93
-rw-r--r--dev-java/bcprov/Manifest1
-rw-r--r--dev-java/bcprov/bcprov-1.72.ebuild99
-rw-r--r--dev-java/bcutil/Manifest1
-rw-r--r--dev-java/bcutil/bcutil-1.72.ebuild55
-rw-r--r--dev-java/browserlauncher2/browserlauncher2-1.3-r2.ebuild49
-rw-r--r--dev-java/browserlauncher2/browserlauncher2-1.3-r3.ebuild33
-rw-r--r--dev-java/byaccj/byaccj-1.15-r3.ebuild4
-rw-r--r--dev-java/byte-buddy-agent/Manifest2
-rw-r--r--dev-java/byte-buddy-agent/byte-buddy-agent-1.12.10.ebuild87
-rw-r--r--dev-java/byte-buddy/Manifest5
-rw-r--r--dev-java/byte-buddy/byte-buddy-1.12.10.ebuild48
-rw-r--r--dev-java/byte-buddy/byte-buddy-1.12.12.ebuild176
-rw-r--r--dev-java/byte-buddy/byte-buddy-1.12.14.ebuild (renamed from dev-java/byte-buddy/byte-buddy-1.12.13.ebuild)99
-rw-r--r--dev-java/byte-buddy/byte-buddy-1.12.18.ebuild175
-rw-r--r--dev-java/byte-buddy/files/byte-buddy-1.12.18-not-java20.patch52
-rw-r--r--dev-java/cdi-api/Manifest1
-rw-r--r--dev-java/cdi-api/cdi-api-4.0.1-r2.ebuild102
-rw-r--r--dev-java/cdi-api/files/cdi-api-4.0.1-skip-tests.patch72
-rw-r--r--dev-java/cdi-api/metadata.xml (renamed from dev-java/byte-buddy-agent/metadata.xml)2
-rw-r--r--dev-java/commons-codec/commons-codec-1.15-r1.ebuild2
-rw-r--r--dev-java/commons-codec/commons-codec-1.15.ebuild50
-rw-r--r--dev-java/commons-collections/commons-collections-4.4-r1.ebuild2
-rw-r--r--dev-java/commons-collections/commons-collections-4.4.ebuild67
-rw-r--r--dev-java/commons-compress/Manifest2
-rw-r--r--dev-java/commons-compress/commons-compress-1.21-r1.ebuild121
-rw-r--r--dev-java/commons-compress/commons-compress-1.21.ebuild73
-rw-r--r--dev-java/commons-digester/commons-digester-2.1-r2.ebuild2
-rw-r--r--dev-java/commons-io/commons-io-2.11.0-r1.ebuild2
-rw-r--r--dev-java/commons-io/commons-io-2.11.0.ebuild55
-rw-r--r--dev-java/commons-logging/commons-logging-1.2-r6.ebuild (renamed from dev-java/commons-logging/commons-logging-1.2-r5.ebuild)4
-rw-r--r--dev-java/commons-math/Manifest1
-rw-r--r--dev-java/commons-math/commons-math-3.6.1-r1.ebuild24
-rw-r--r--dev-java/commons-math/commons-math-3.6.1-r2.ebuild2
-rw-r--r--dev-java/commons-net/Manifest2
-rw-r--r--dev-java/commons-net/commons-net-3.9.0.ebuild39
-rw-r--r--dev-java/commons-text/Manifest2
-rw-r--r--dev-java/commons-text/commons-text-1.10.0.ebuild59
-rw-r--r--dev-java/commons-text/commons-text-1.9.ebuild43
-rw-r--r--dev-java/coursier-bin/Manifest1
-rw-r--r--dev-java/coursier-bin/coursier-bin-2.1.0_rc2.ebuild30
-rw-r--r--dev-java/coursier-bin/metadata.xml11
-rw-r--r--dev-java/easymock/Manifest1
-rw-r--r--dev-java/easymock/easymock-2.5.2.ebuild57
-rw-r--r--dev-java/easymock/easymock-3.3.1-r1.ebuild2
-rw-r--r--dev-java/easymock/files/easymock-2.5.5-nameClash.patch230
-rw-r--r--dev-java/easymock/files/easymock-2.5.5-tests2nameClash.patch420
-rw-r--r--dev-java/eclipse-ecj/Manifest1
-rw-r--r--dev-java/eclipse-ecj/eclipse-ecj-4.25.ebuild72
-rw-r--r--dev-java/eclipse-ecj/metadata.xml2
-rw-r--r--dev-java/fastinfoset/fastinfoset-2.1.0-r1.ebuild2
-rw-r--r--dev-java/felix-framework/Manifest1
-rw-r--r--dev-java/felix-framework/felix-framework-7.0.5.ebuild106
-rw-r--r--dev-java/felix-framework/metadata.xml12
-rw-r--r--dev-java/felix-main/Manifest1
-rw-r--r--dev-java/felix-main/felix-main-7.0.5-r1.ebuild74
-rw-r--r--dev-java/felix-main/metadata.xml15
-rw-r--r--dev-java/felix-resolver/Manifest1
-rw-r--r--dev-java/felix-resolver/felix-resolver-2.0.4.ebuild71
-rw-r--r--dev-java/felix-resolver/metadata.xml11
-rw-r--r--dev-java/felix-utils/Manifest1
-rw-r--r--dev-java/felix-utils/felix-utils-1.11.8.ebuild59
-rw-r--r--dev-java/felix-utils/files/felix-utils-1.11.8-Port-to-osgi-cmpn.patch123
-rw-r--r--dev-java/felix-utils/metadata.xml11
-rw-r--r--dev-java/fishbowl/Manifest1
-rw-r--r--dev-java/fishbowl/fishbowl-1.4.1.ebuild53
-rw-r--r--dev-java/fishbowl/metadata.xml7
-rw-r--r--dev-java/gradle-bin/Manifest3
-rw-r--r--dev-java/gradle-bin/gradle-bin-7.5.1.ebuild61
-rw-r--r--dev-java/gradle-bin/gradle-bin-7.6.ebuild (renamed from dev-java/gradle-bin/gradle-bin-7.5.ebuild)0
-rw-r--r--dev-java/greenmail/Manifest1
-rw-r--r--dev-java/greenmail/greenmail-2.0.0_alpha2.ebuild57
-rw-r--r--dev-java/greenmail/metadata.xml10
-rw-r--r--dev-java/gson/Manifest2
-rw-r--r--dev-java/gson/gson-2.9.0-r1.ebuild63
-rw-r--r--dev-java/gson/gson-2.9.1.ebuild (renamed from dev-java/gson/gson-2.9.0-r2.ebuild)10
-rw-r--r--dev-java/hamcrest-core/Manifest2
-rw-r--r--dev-java/hamcrest-core/files/hamcrest-core-1.3-r3-java-11.patch (renamed from dev-java/hamcrest-core/files/hamcrest-core-1.3-java-11.patch)36
-rw-r--r--dev-java/hamcrest-core/hamcrest-core-1.1-r4.ebuild2
-rw-r--r--dev-java/hamcrest-core/hamcrest-core-1.3-r3.ebuild (renamed from dev-java/hamcrest-core/hamcrest-core-1.3-r2.ebuild)27
-rw-r--r--dev-java/hamcrest-generator/Manifest2
-rw-r--r--dev-java/hamcrest-generator/files/hamcrest-generator-1.3-no_jarjar.patch16
-rw-r--r--dev-java/hamcrest-generator/hamcrest-generator-1.3-r3.ebuild52
-rw-r--r--dev-java/hamcrest-generator/hamcrest-generator-1.3-r4.ebuild28
-rw-r--r--dev-java/hamcrest-library/Manifest2
-rw-r--r--dev-java/hamcrest-library/files/hamcrest-library-1.3-r3-java-11.patch (renamed from dev-java/hamcrest-library/files/hamcrest-library-1.3-java-11.patch)64
-rw-r--r--dev-java/hamcrest-library/hamcrest-library-1.3-r3.ebuild (renamed from dev-java/hamcrest-library/hamcrest-library-1.3-r2.ebuild)32
-rw-r--r--dev-java/hamcrest/hamcrest-2.2.ebuild2
-rw-r--r--dev-java/hawtjni-runtime/Manifest1
-rw-r--r--dev-java/hawtjni-runtime/hawtjni-runtime-1.15-r1.ebuild29
-rw-r--r--dev-java/hawtjni-runtime/hawtjni-runtime-1.18.ebuild2
-rw-r--r--dev-java/htmlcleaner/Manifest1
-rw-r--r--dev-java/htmlcleaner/htmlcleaner-2.25.ebuild73
-rw-r--r--dev-java/htmlcleaner/htmlcleaner-2.26.ebuild2
-rw-r--r--dev-java/icu4j/Manifest2
-rw-r--r--dev-java/icu4j/icu4j-72.1.ebuild (renamed from dev-java/icu4j/icu4j-71.1.ebuild)33
-rw-r--r--dev-java/injection-api/Manifest1
-rw-r--r--dev-java/injection-api/injection-api-2.0.1.ebuild29
-rw-r--r--dev-java/injection-api/metadata.xml10
-rw-r--r--dev-java/j2objc-annotations/Manifest1
-rw-r--r--dev-java/j2objc-annotations/j2objc-annotations-1.2-r1.ebuild23
-rw-r--r--dev-java/j2objc-annotations/j2objc-annotations-2.8.ebuild2
-rw-r--r--dev-java/jackrabbit-webdav/jackrabbit-webdav-2.10.1-r3.ebuild (renamed from dev-java/jackrabbit-webdav/jackrabbit-webdav-2.10.1-r2.ebuild)2
-rw-r--r--dev-java/jackrabbit-webdav/jackrabbit-webdav-2.21.7-r1.ebuild2
-rw-r--r--dev-java/jackson-annotations/Manifest2
-rw-r--r--dev-java/jackson-annotations/jackson-annotations-2.13.4.ebuild (renamed from dev-java/jackson-annotations/jackson-annotations-2.13.3.ebuild)11
-rw-r--r--dev-java/jackson-core/Manifest2
-rw-r--r--dev-java/jackson-core/jackson-core-2.13.4.ebuild (renamed from dev-java/jackson-core/jackson-core-2.13.3.ebuild)11
-rw-r--r--dev-java/jackson-databind/Manifest2
-rw-r--r--dev-java/jackson-databind/jackson-databind-2.13.4.1.ebuild (renamed from dev-java/jackson-databind/jackson-databind-2.13.3.ebuild)25
-rw-r--r--dev-java/jackson-dataformat-xml/Manifest2
-rw-r--r--dev-java/jackson-dataformat-xml/jackson-dataformat-xml-2.13.4-r1.ebuild (renamed from dev-java/jackson-dataformat-xml/jackson-dataformat-xml-2.13.3-r1.ebuild)23
-rw-r--r--dev-java/jackson-dataformat-yaml/Manifest2
-rw-r--r--dev-java/jackson-dataformat-yaml/jackson-dataformat-yaml-2.13.3.ebuild79
-rw-r--r--dev-java/jackson-dataformat-yaml/jackson-dataformat-yaml-2.13.4-r1.ebuild (renamed from dev-java/jackson-dataformat-yaml/jackson-dataformat-yaml-2.13.3-r1.ebuild)10
-rw-r--r--dev-java/jackson-module-jakarta-xmlbind/Manifest2
-rw-r--r--dev-java/jackson-module-jakarta-xmlbind/jackson-module-jakarta-xmlbind-2.13.3.ebuild81
-rw-r--r--dev-java/jackson-module-jakarta-xmlbind/jackson-module-jakarta-xmlbind-2.13.4-r1.ebuild (renamed from dev-java/jackson-module-jakarta-xmlbind/jackson-module-jakarta-xmlbind-2.13.3-r1.ebuild)23
-rw-r--r--dev-java/jacl/metadata.xml52
-rw-r--r--dev-java/jakarta-annotations-api/jakarta-annotations-api-2.1.1.ebuild2
-rw-r--r--dev-java/jakarta-el-api/Manifest1
-rw-r--r--dev-java/jakarta-el-api/jakarta-el-api-5.0.1-r1.ebuild33
-rw-r--r--dev-java/jakarta-el-api/metadata.xml7
-rw-r--r--dev-java/jakarta-interceptors/Manifest1
-rw-r--r--dev-java/jakarta-interceptors/jakarta-interceptors-2.1.0.ebuild33
-rw-r--r--dev-java/jakarta-interceptors/metadata.xml13
-rw-r--r--dev-java/jakarta-json-api/jakarta-json-api-1.1.6-r1.ebuild (renamed from dev-java/jakarta-json-api/jakarta-json-api-1.1.6.ebuild)16
-rw-r--r--dev-java/jakarta-mail-api/jakarta-mail-api-2.1.0-r1.ebuild2
-rw-r--r--dev-java/jakarta-mail-api/jakarta-mail-api-2.1.0.ebuild81
-rw-r--r--dev-java/jakarta-mail/Manifest1
-rw-r--r--dev-java/jakarta-mail/jakarta-mail-2.0.1.ebuild75
-rw-r--r--dev-java/jakarta-mail/metadata.xml10
-rw-r--r--dev-java/jakarta-regexp/Manifest2
-rw-r--r--dev-java/jakarta-regexp/jakarta-regexp-1.3-r6.ebuild33
-rw-r--r--dev-java/jakarta-regexp/jakarta-regexp-1.5-r1.ebuild32
-rw-r--r--dev-java/jakarta-servlet-api/Manifest2
-rw-r--r--dev-java/jakarta-servlet-api/jakarta-servlet-api-4.0.4.ebuild35
-rw-r--r--dev-java/jakarta-servlet-api/jakarta-servlet-api-6.0.0.ebuild39
-rw-r--r--dev-java/jakarta-servlet-api/metadata.xml11
-rw-r--r--dev-java/jakartaee-migration/Manifest3
-rw-r--r--dev-java/jakartaee-migration/jakartaee-migration-1.0.4.ebuild (renamed from dev-java/jakartaee-migration/jakartaee-migration-1.0.1.ebuild)18
-rw-r--r--dev-java/jakartaee-migration/jakartaee-migration-1.0.6.ebuild92
-rw-r--r--dev-java/janino/janino-3.1.7.ebuild2
-rw-r--r--dev-java/jansi/jansi-2.4.0-r1.ebuild2
-rw-r--r--dev-java/javassist/Manifest4
-rw-r--r--dev-java/javassist/javassist-3.18.2-r1.ebuild44
-rw-r--r--dev-java/javassist/javassist-3.29.1.ebuild (renamed from dev-java/javassist/javassist-3.29.0-r2.ebuild)12
-rw-r--r--dev-java/javassist/javassist-3.29.2.ebuild79
-rw-r--r--dev-java/jaxb-runtime/jaxb-runtime-4.0.0-r1.ebuild2
-rw-r--r--dev-java/jaxb-stax-ex/jaxb-stax-ex-2.1.0-r1.ebuild2
-rw-r--r--dev-java/jaxrs-api/Manifest1
-rw-r--r--dev-java/jaxrs-api/jaxrs-api-2.1.6.ebuild59
-rw-r--r--dev-java/jaxrs-api/metadata.xml7
-rw-r--r--dev-java/jaxws-api/Manifest1
-rw-r--r--dev-java/jaxws-api/jaxws-api-2.3.3.ebuild35
-rw-r--r--dev-java/jaxws-api/metadata.xml13
-rw-r--r--dev-java/jdbc-postgresql/Manifest3
-rw-r--r--dev-java/jdbc-postgresql/jdbc-postgresql-42.4.0.ebuild59
-rw-r--r--dev-java/jdbc-postgresql/jdbc-postgresql-42.5.0.ebuild (renamed from dev-java/jdbc-postgresql/jdbc-postgresql-42.4.1.ebuild)26
-rw-r--r--dev-java/jffi/Manifest2
-rw-r--r--dev-java/jffi/files/jffi-1.2.8-junit-4.11.patch14
-rw-r--r--dev-java/jffi/files/jffi-1.2.8-makefile.patch52
-rw-r--r--dev-java/jffi/files/jffi-1.3.6-GNUmakefile.patch26
-rw-r--r--dev-java/jffi/files/jffi_maven-build.xml259
-rw-r--r--dev-java/jffi/jffi-1.2.9-r1.ebuild131
-rw-r--r--dev-java/jffi/jffi-1.3.6.ebuild98
-rw-r--r--dev-java/jffi/jffi-1.3.9-r1.ebuild25
-rw-r--r--dev-java/jffi/jffi-1.3.9.ebuild97
-rw-r--r--dev-java/jmock/Manifest2
-rw-r--r--dev-java/jmock/jmock-2.12.0.ebuild98
-rw-r--r--dev-java/jmock/jmock-2.6.1-r1.ebuild43
-rw-r--r--dev-java/jnr-a64asm/jnr-a64asm-1.0.0.ebuild4
-rw-r--r--dev-java/jnr-ffi/Manifest1
-rw-r--r--dev-java/jnr-ffi/files/jnr-ffi-2.0.2-junit48.patch11
-rw-r--r--dev-java/jnr-ffi/files/jnr-ffi_maven-build.xml250
-rw-r--r--dev-java/jnr-ffi/jnr-ffi-2.0.2-r1.ebuild64
-rw-r--r--dev-java/jnr-ffi/jnr-ffi-2.2.12.ebuild2
-rw-r--r--dev-java/jnr-netdb/Manifest1
-rw-r--r--dev-java/jnr-netdb/files/jnr-netdb_maven-build.xml231
-rw-r--r--dev-java/jnr-netdb/jnr-netdb-1.1.4-r1.ebuild55
-rw-r--r--dev-java/jnr-netdb/jnr-netdb-1.2.0.ebuild2
-rw-r--r--dev-java/jnr-posix/Manifest1
-rw-r--r--dev-java/jnr-posix/files/jnr-posix-3.1.15-FileTest.patch10
-rw-r--r--dev-java/jnr-posix/files/jnr-posix_maven-build.xml256
-rw-r--r--dev-java/jnr-posix/jnr-posix-3.0.10-r1.ebuild54
-rw-r--r--dev-java/jnr-posix/jnr-posix-3.1.15.ebuild39
-rw-r--r--dev-java/joda-convert/joda-convert-2.2.2-r1.ebuild71
-rw-r--r--dev-java/joda-convert/joda-convert-2.2.2-r2.ebuild2
-rw-r--r--dev-java/joda-time/Manifest3
-rw-r--r--dev-java/joda-time/files/joda-time-2.11.0-test.patch14
-rw-r--r--dev-java/joda-time/joda-time-2.10.10-r1.ebuild75
-rw-r--r--dev-java/joda-time/joda-time-2.11.2.ebuild (renamed from dev-java/joda-time/joda-time-2.10.14.ebuild)59
-rw-r--r--dev-java/jtds/metadata.xml16
-rw-r--r--dev-java/jul-to-slf4j/Manifest1
-rw-r--r--dev-java/jul-to-slf4j/jul-to-slf4j-2.0.3.ebuild55
-rw-r--r--dev-java/jul-to-slf4j/metadata.xml13
-rw-r--r--dev-java/junit-dataprovider/junit-dataprovider-2.9.ebuild2
-rw-r--r--dev-java/junitparams/junitparams-1.1.1-r1.ebuild (renamed from dev-java/junitparams/junitparams-1.1.1.ebuild)15
-rw-r--r--dev-java/jython/jython-2.7.0-r7.ebuild (renamed from dev-java/jython/jython-2.7.0-r6.ebuild)4
-rw-r--r--dev-java/log4j-api-java9/Manifest1
-rw-r--r--dev-java/log4j-api-java9/log4j-api-java9-2.17.1.ebuild52
-rw-r--r--dev-java/log4j-core/log4j-core-2.18.0-r1.ebuild2
-rw-r--r--dev-java/log4j-core/log4j-core-2.18.0.ebuild175
-rw-r--r--dev-java/log4j-over-slf4j/Manifest1
-rw-r--r--dev-java/log4j-over-slf4j/log4j-over-slf4j-2.0.3.ebuild60
-rw-r--r--dev-java/log4j-over-slf4j/metadata.xml13
-rw-r--r--dev-java/logback-classic/Manifest2
-rw-r--r--dev-java/logback-classic/logback-classic-1.2.11.ebuild96
-rw-r--r--dev-java/logback-classic/logback-classic-1.4.1.ebuild136
-rw-r--r--dev-java/logback-core/Manifest2
-rw-r--r--dev-java/logback-core/files/logback-core-1.2.11-Ignore-test-failing-under-Java-16.patch24
-rw-r--r--dev-java/logback-core/logback-core-1.4.1.ebuild (renamed from dev-java/logback-core/logback-core-1.2.11.ebuild)68
-rw-r--r--dev-java/lzma/Manifest1
-rw-r--r--dev-java/lzma/lzma-22.01.ebuild23
-rw-r--r--dev-java/maven-bin/Manifest1
-rw-r--r--dev-java/maven-bin/maven-bin-3.8.3.ebuild64
-rw-r--r--dev-java/maven-bin/maven-bin-3.8.6.ebuild2
-rw-r--r--dev-java/memoryfilesystem/memoryfilesystem-2.3.0.ebuild2
-rw-r--r--dev-java/metainf-services/Manifest1
-rw-r--r--dev-java/metainf-services/files/metainf-services-1.7-build.xml192
-rw-r--r--dev-java/metainf-services/metainf-services-1.7-r1.ebuild28
-rw-r--r--dev-java/metainf-services/metainf-services-1.9.ebuild2
-rw-r--r--dev-java/mill-bin/Manifest3
-rw-r--r--dev-java/mill-bin/mill-bin-0.10.5.ebuild26
-rw-r--r--dev-java/mill-bin/mill-bin-0.10.9.ebuild (renamed from dev-java/mill-bin/mill-bin-0.10.4.ebuild)0
-rw-r--r--dev-java/mockito/Manifest5
-rw-r--r--dev-java/mockito/mockito-1.9.5-r2.ebuild44
-rw-r--r--dev-java/mockito/mockito-1.9.5-r3.ebuild31
-rw-r--r--dev-java/mockito/mockito-4.6.0-r1.ebuild50
-rw-r--r--dev-java/mockito/mockito-4.8.1.ebuild (renamed from dev-java/mockito/mockito-4.6.1-r1.ebuild)7
-rw-r--r--dev-java/msv/Manifest2
-rw-r--r--dev-java/msv/metadata.xml19
-rw-r--r--dev-java/msv/msv-20130601.ebuild56
-rw-r--r--dev-java/msv/msv-2022.7.ebuild70
-rw-r--r--dev-java/objenesis-test/Manifest1
-rw-r--r--dev-java/objenesis-test/objenesis-test-3.2.ebuild32
-rw-r--r--dev-java/objenesis/Manifest2
-rw-r--r--dev-java/objenesis/objenesis-3.2.ebuild44
-rw-r--r--dev-java/objenesis/objenesis-3.3.ebuild45
-rw-r--r--dev-java/openjdk-bin/Manifest36
-rw-r--r--dev-java/openjdk-bin/openjdk-bin-11.0.16.1_p1.ebuild135
-rw-r--r--dev-java/openjdk-bin/openjdk-bin-11.0.17_p8.ebuild135
-rw-r--r--dev-java/openjdk-bin/openjdk-bin-17.0.4.1_p1.ebuild136
-rw-r--r--dev-java/openjdk-bin/openjdk-bin-17.0.5_p8.ebuild136
-rw-r--r--dev-java/openjdk-bin/openjdk-bin-8.345_p01.ebuild123
-rw-r--r--dev-java/openjdk-bin/openjdk-bin-8.352_p08.ebuild123
-rw-r--r--dev-java/openjdk-jre-bin/Manifest6
-rw-r--r--dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.16.1_p1.ebuild83
-rw-r--r--dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.17_p8.ebuild83
-rw-r--r--dev-java/openjdk-jre-bin/openjdk-jre-bin-17.0.4.1_p1.ebuild83
-rw-r--r--dev-java/openjdk-jre-bin/openjdk-jre-bin-17.0.5_p8.ebuild83
-rw-r--r--dev-java/openjdk-jre-bin/openjdk-jre-bin-8.345_p01.ebuild82
-rw-r--r--dev-java/openjdk-jre-bin/openjdk-jre-bin-8.352_p08.ebuild82
-rw-r--r--dev-java/openjdk/Manifest7
-rw-r--r--dev-java/openjdk/metadata.xml6
-rw-r--r--dev-java/openjdk/openjdk-11.0.15_p10-r1.ebuild8
-rw-r--r--dev-java/openjdk/openjdk-11.0.16.1_p1.ebuild300
-rw-r--r--dev-java/openjdk/openjdk-11.0.17_p8.ebuild300
-rw-r--r--dev-java/openjdk/openjdk-17.0.3_p7-r1.ebuild6
-rw-r--r--dev-java/openjdk/openjdk-17.0.4.1_p1.ebuild316
-rw-r--r--dev-java/openjdk/openjdk-17.0.5_p8.ebuild314
-rw-r--r--dev-java/openjdk/openjdk-8.332_p09.ebuild13
-rw-r--r--dev-java/openjdk/openjdk-8.345_p01.ebuild229
-rw-r--r--dev-java/openjdk/openjdk-8.352_p08.ebuild229
-rw-r--r--dev-java/opentest4j/opentest4j-1.2.0-r1.ebuild2
-rw-r--r--dev-java/opentest4j/opentest4j-1.2.0.ebuild34
-rw-r--r--dev-java/osgi-cmpn/Manifest1
-rw-r--r--dev-java/osgi-cmpn/metadata.xml8
-rw-r--r--dev-java/osgi-cmpn/osgi-cmpn-8.0.0.ebuild45
-rw-r--r--dev-java/plexus-classworlds/Manifest1
-rw-r--r--dev-java/plexus-classworlds/files/2.2.3-build.xml126
-rw-r--r--dev-java/plexus-classworlds/plexus-classworlds-2.2.3.ebuild41
-rw-r--r--dev-java/plexus-classworlds/plexus-classworlds-2.6.0.ebuild2
-rw-r--r--dev-java/poi/Manifest3
-rw-r--r--dev-java/poi/poi-5.0.0.ebuild64
-rw-r--r--dev-java/poi/poi-5.2.3.ebuild (renamed from dev-java/poi/poi-5.2.2.ebuild)12
-rw-r--r--dev-java/protobuf-java/Manifest4
-rw-r--r--dev-java/protobuf-java/metadata.xml3
-rw-r--r--dev-java/protobuf-java/protobuf-java-3.17.3.ebuild55
-rw-r--r--dev-java/protobuf-java/protobuf-java-3.19.3.ebuild55
-rw-r--r--dev-java/protobuf-java/protobuf-java-3.21.9-r1.ebuild98
-rw-r--r--dev-java/protobuf-java/protobuf-java-3.21.9.ebuild68
-rw-r--r--dev-java/protobuf-java/protobuf-java-9999.ebuild116
-rw-r--r--dev-java/qdox/Manifest1
-rw-r--r--dev-java/qdox/metadata.xml2
-rw-r--r--dev-java/qdox/qdox-2.0.1.ebuild102
-rw-r--r--dev-java/randomized-runner/Manifest1
-rw-r--r--dev-java/randomized-runner/randomized-runner-2.7.9.ebuild70
-rw-r--r--dev-java/randomized-runner/randomized-runner-2.8.0.ebuild2
-rw-r--r--dev-java/reflections/reflections-0.9.12-r2.ebuild99
-rw-r--r--dev-java/reflections/reflections-0.9.12-r4.ebuild2
-rw-r--r--dev-java/relaxng-datatype/Manifest1
-rw-r--r--dev-java/relaxng-datatype/relaxng-datatype-20020414.ebuild21
-rw-r--r--dev-java/reload4j/Manifest1
-rw-r--r--dev-java/reload4j/metadata.xml7
-rw-r--r--dev-java/reload4j/reload4j-1.2.22.ebuild113
-rw-r--r--dev-java/sbt-bin/Manifest1
-rw-r--r--dev-java/sbt-bin/metadata.xml3
-rw-r--r--dev-java/sbt-bin/sbt-bin-1.3.10.ebuild2
-rw-r--r--dev-java/sbt-bin/sbt-bin-1.8.0.ebuild49
-rw-r--r--dev-java/sbt/Manifest5
-rw-r--r--dev-java/sbt/sbt-0.13.13.ebuild162
-rw-r--r--dev-java/scram/scram-2.1.ebuild2
-rw-r--r--dev-java/slf4j-api/Manifest2
-rw-r--r--dev-java/slf4j-api/metadata.xml4
-rw-r--r--dev-java/slf4j-api/slf4j-api-2.0.3.ebuild (renamed from dev-java/slf4j-api/slf4j-api-1.7.36.ebuild)36
-rw-r--r--dev-java/slf4j-ext/Manifest2
-rw-r--r--dev-java/slf4j-ext/metadata.xml12
-rw-r--r--dev-java/slf4j-ext/slf4j-ext-1.7.36.ebuild74
-rw-r--r--dev-java/slf4j-ext/slf4j-ext-2.0.3.ebuild61
-rw-r--r--dev-java/slf4j-nop/Manifest2
-rw-r--r--dev-java/slf4j-nop/metadata.xml12
-rw-r--r--dev-java/slf4j-nop/slf4j-nop-2.0.3.ebuild (renamed from dev-java/slf4j-nop/slf4j-nop-1.7.36.ebuild)29
-rw-r--r--dev-java/slf4j-reload4j/Manifest1
-rw-r--r--dev-java/slf4j-reload4j/metadata.xml (renamed from dev-java/objenesis-test/metadata.xml)4
-rw-r--r--dev-java/slf4j-reload4j/slf4j-reload4j-2.0.3.ebuild82
-rw-r--r--dev-java/slf4j-simple/Manifest2
-rw-r--r--dev-java/slf4j-simple/metadata.xml4
-rw-r--r--dev-java/slf4j-simple/slf4j-simple-1.7.36.ebuild77
-rw-r--r--dev-java/slf4j-simple/slf4j-simple-2.0.3.ebuild72
-rw-r--r--dev-java/snakeyaml/Manifest2
-rw-r--r--dev-java/snakeyaml/files/snakeyaml-1.30-fix-test-check.patch18
-rw-r--r--dev-java/snakeyaml/snakeyaml-1.30-r1.ebuild91
-rw-r--r--dev-java/snakeyaml/snakeyaml-1.30.ebuild95
-rw-r--r--dev-java/snakeyaml/snakeyaml-1.33.ebuild74
-rw-r--r--dev-java/snappy/snappy-1.1.7.8-r1.ebuild2
-rw-r--r--dev-java/snappy/snappy-1.1.7.8.ebuild97
-rw-r--r--dev-java/system-rules/Manifest1
-rw-r--r--dev-java/system-rules/metadata.xml7
-rw-r--r--dev-java/system-rules/system-rules-1.19.0.ebuild58
-rw-r--r--dev-java/tomcat-el-api/Manifest12
-rw-r--r--dev-java/tomcat-el-api/metadata.xml7
-rw-r--r--dev-java/tomcat-el-api/tomcat-el-api-10.0.27-r1.ebuild36
-rw-r--r--dev-java/tomcat-el-api/tomcat-el-api-10.1.1.ebuild36
-rw-r--r--dev-java/tomcat-el-api/tomcat-el-api-10.1.2.ebuild40
-rw-r--r--dev-java/tomcat-el-api/tomcat-el-api-8.5.83-r1.ebuild36
-rw-r--r--dev-java/tomcat-el-api/tomcat-el-api-8.5.84.ebuild40
-rw-r--r--dev-java/tomcat-el-api/tomcat-el-api-9.0.68-r1.ebuild36
-rw-r--r--dev-java/tomcat-el-api/tomcat-el-api-9.0.69.ebuild40
-rw-r--r--dev-java/tomcat-el-api/tomcat-el-api-9.0.70.ebuild40
-rw-r--r--dev-java/tomcat-jsp-api/Manifest12
-rw-r--r--dev-java/tomcat-jsp-api/metadata.xml7
-rw-r--r--dev-java/tomcat-jsp-api/tomcat-jsp-api-10.0.27-r1.ebuild43
-rw-r--r--dev-java/tomcat-jsp-api/tomcat-jsp-api-10.1.1.ebuild43
-rw-r--r--dev-java/tomcat-jsp-api/tomcat-jsp-api-10.1.2.ebuild47
-rw-r--r--dev-java/tomcat-jsp-api/tomcat-jsp-api-8.5.83-r1.ebuild43
-rw-r--r--dev-java/tomcat-jsp-api/tomcat-jsp-api-8.5.84.ebuild47
-rw-r--r--dev-java/tomcat-jsp-api/tomcat-jsp-api-9.0.68-r1.ebuild43
-rw-r--r--dev-java/tomcat-jsp-api/tomcat-jsp-api-9.0.69.ebuild47
-rw-r--r--dev-java/tomcat-jsp-api/tomcat-jsp-api-9.0.70.ebuild47
-rw-r--r--dev-java/tomcat-native/Manifest1
-rw-r--r--dev-java/tomcat-native/tomcat-native-1.2.34.ebuild62
-rw-r--r--dev-java/tomcat-native/tomcat-native-1.2.35.ebuild2
-rw-r--r--dev-java/tomcat-servlet-api/Manifest18
-rw-r--r--dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.22.ebuild98
-rw-r--r--dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.23.ebuild98
-rw-r--r--dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.27-r1.ebuild43
-rw-r--r--dev-java/tomcat-servlet-api/tomcat-servlet-api-10.1.1.ebuild43
-rw-r--r--dev-java/tomcat-servlet-api/tomcat-servlet-api-10.1.2.ebuild47
-rw-r--r--dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.81.ebuild99
-rw-r--r--dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.82.ebuild99
-rw-r--r--dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.83-r1.ebuild45
-rw-r--r--dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.84.ebuild49
-rw-r--r--dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.64.ebuild99
-rw-r--r--dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.65.ebuild99
-rw-r--r--dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.68-r1.ebuild43
-rw-r--r--dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.69.ebuild47
-rw-r--r--dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.70.ebuild47
-rw-r--r--dev-java/typesafe-config/Manifest1
-rw-r--r--dev-java/typesafe-config/typesafe-config-1.3.0-r3.ebuild21
-rw-r--r--dev-java/typesafe-config/typesafe-config-1.4.2.ebuild2
-rw-r--r--dev-java/woodstox-core/Manifest2
-rw-r--r--dev-java/woodstox-core/metadata.xml1
-rw-r--r--dev-java/woodstox-core/woodstox-core-6.2.8-r1.ebuild102
-rw-r--r--dev-java/woodstox-core/woodstox-core-6.3.1.ebuild89
-rw-r--r--dev-java/xerces/xerces-2.12.2.ebuild2
-rw-r--r--dev-java/xerial-core/Manifest2
-rw-r--r--dev-java/xerial-core/xerial-core-2.1.ebuild (renamed from dev-java/xerial-core/xerial-core-2.0.1-r1.ebuild)29
-rw-r--r--dev-java/xsdlib/Manifest2
-rw-r--r--dev-java/xsdlib/metadata.xml3
-rw-r--r--dev-java/xsdlib/xsdlib-2013.6.1.ebuild35
-rw-r--r--dev-java/xsdlib/xsdlib-2022.7.ebuild73
-rw-r--r--dev-java/zstd-jni/Manifest3
-rw-r--r--dev-java/zstd-jni/files/zstd-jni-1.5.0.4-filter-flags.patch9
-rw-r--r--dev-java/zstd-jni/zstd-jni-1.5.0.4.ebuild60
-rw-r--r--dev-java/zstd-jni/zstd-jni-1.5.0.5.ebuild60
-rw-r--r--dev-java/zstd-jni/zstd-jni-1.5.2.4.ebuild67
423 files changed, 9785 insertions, 7146 deletions
diff --git a/dev-java/angus-activation/angus-activation-1.0.0-r1.ebuild b/dev-java/angus-activation/angus-activation-1.0.0-r1.ebuild
index 9349e1ca9b70..9f8f2247f80d 100644
--- a/dev-java/angus-activation/angus-activation-1.0.0-r1.ebuild
+++ b/dev-java/angus-activation/angus-activation-1.0.0-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/eclipse-ee4j/${PN}/archive/${PV}.tar.gz -> ${P}.tar.
LICENSE="EPL-1.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
DEPEND="
dev-java/jakarta-activation-api:2
diff --git a/dev-java/angus-activation/angus-activation-1.0.0.ebuild b/dev-java/angus-activation/angus-activation-1.0.0.ebuild
deleted file mode 100644
index effcb2f8468a..000000000000
--- a/dev-java/angus-activation/angus-activation-1.0.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/eclipse-ee4j/angus-activation/archive/refs/tags/1.0.0.tar.gz --slot 0 --keywords "~amd64 ~arm64 ~ppc64 ~x86" --ebuild angus-activation-1.0.0.ebuild
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source"
-MAVEN_ID="org.eclipse.angus:angus-activation:1.0.0"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Provides the implementation of the Jakarta Activation Specification"
-HOMEPAGE="https://github.com/eclipse-ee4j/angus-activation"
-SRC_URI="https://github.com/eclipse-ee4j/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="EPL-1.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-# Common dependencies
-# POM: pom.xml
-# jakarta.activation:jakarta.activation-api:2.1.0 -> !!!suitble-mavenVersion-not-found!!!
-
-CP_DEPEND=">=dev-java/jakarta-activation-api-2.1.0:2"
-DEPEND="${CP_DEPEND}
- >=virtual/jdk-1.8:*"
-
-RDEPEND="${CP_DEPEND}
- >=virtual/jre-1.8:*"
-
-DOCS=( ../{CONTRIBUTING,LICENSE,NOTICE,README}.md )
-
-S="${WORKDIR}/${P}/activation-registry"
-
-JAVA_SRC_DIR="src/main/java"
-JAVA_RESOURCE_DIRS="src/main/resources"
-
-src_install() {
- default # https://bugs.gentoo.org/789582
- java-pkg-simple_src_install
-}
diff --git a/dev-java/animal-sniffer-annotations/animal-sniffer-annotations-1.15-r1.ebuild b/dev-java/animal-sniffer-annotations/animal-sniffer-annotations-1.15-r1.ebuild
index 12973df6f557..265decdfdc6f 100644
--- a/dev-java/animal-sniffer-annotations/animal-sniffer-annotations-1.15-r1.ebuild
+++ b/dev-java/animal-sniffer-annotations/animal-sniffer-annotations-1.15-r1.ebuild
@@ -5,6 +5,7 @@ EAPI=8
MY_PN="${PN%-annotations}"
JAVA_PKG_IUSE="doc source"
+MAVEN_ID="org.codehaus.mojo:animal-sniffer-annotations:1.15"
inherit java-pkg-2 java-pkg-simple
diff --git a/dev-java/ant-eclipse-ecj/Manifest b/dev-java/ant-eclipse-ecj/Manifest
index 8445570a7ca7..00234773ac65 100644
--- a/dev-java/ant-eclipse-ecj/Manifest
+++ b/dev-java/ant-eclipse-ecj/Manifest
@@ -1,2 +1,3 @@
DIST ecjsrc-4.15.jar 2166228 BLAKE2B 794e0ba1a19b325e2dd8ad0b288ccbe04866627670b50d39dd327c13fe1fac56200eb3a6c1c3d1af043cad795508b9b714a5243049671414b5a62a97725d3297 SHA512 ada55b2522cf26570f0cd43f415eb5cf20e6840f83dadc72e1ae474ebf10eadca73f9fa3d1db51e13fd2762c38cd3e3567db3c7840d43ae3d8665ebe35e1889d
DIST ecjsrc-4.22.jar 2358194 BLAKE2B e091050297b4556c38adfb01fb1e43e13644af1b3c2b30a93cfe3fdbb55050a0f7709081c7406d384d7141de67a954253aa26cdbb45f56327b16ee5ddd5e82a7 SHA512 cd52a72aecded032625ee83581ac565e1e96f8d26ecfc76e982274fd3d6238f1e7f22576855589b021e9a5ef67686b9b75e010c4e2033a8b7f6e7c9b1ff7eb4c
+DIST ecjsrc-4.25.jar 2340770 BLAKE2B e1e82356984a72e7ebbd5ace2ccbaf885c7acfdaf410b2386fa0a143f85e4431cfa2f5d254197eb56203c48505bc7dbe264664815b572c725ac5814645254776 SHA512 b475d58ef6a03e4bbf7e0f440edcbdd61e0548f68e48c7762973f60850a14fc1c234bb9a41be404ed06db14a273646f1dc5ad7effd4c7146b46f40a52850f236
diff --git a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.22-r1.ebuild b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.22-r2.ebuild
index a2d55cda8ca1..a2d55cda8ca1 100644
--- a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.22-r1.ebuild
+++ b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.22-r2.ebuild
diff --git a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.25.ebuild b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.25.ebuild
new file mode 100644
index 000000000000..22c9edfdafa4
--- /dev/null
+++ b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.25.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple prefix
+
+DMF="R-${PV}-202208311800"
+
+DESCRIPTION="Ant Compiler Adapter for Eclipse Java Compiler"
+HOMEPAGE="https://www.eclipse.org/"
+SRC_URI="https://download.eclipse.org/eclipse/downloads/drops4/${DMF}/ecjsrc-${PV}.jar"
+
+LICENSE="EPL-1.0"
+KEYWORDS="amd64 ~ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris"
+SLOT="4.25"
+IUSE=""
+
+CDEPEND="~dev-java/eclipse-ecj-${PV}:${SLOT}
+ dev-java/ant-core:0"
+# though technically both could be set to 1.8 and it would
+# compile using jdk 11+, it would not compile using jdk 1.8
+# because eclipse ecj has min jdk 11
+RDEPEND="${CDEPEND}
+ >=virtual/jre-11:*"
+DEPEND="${CDEPEND}
+ >=virtual/jdk-17:*"
+BDEPEND="app-arch/unzip"
+
+JAVA_GENTOO_CLASSPATH="ant-core,eclipse-ecj-${SLOT}"
+
+src_prepare() {
+ default
+
+ # Remove everything but the Ant component.
+ find org -type f ! -path "org/eclipse/jdt/internal/antadapter/*" ! -name "JDTCompilerAdapter.java" -delete || die
+
+ rm build.xml || die
+}
+
+src_compile() {
+ java-pkg-simple_src_compile
+ find org -type f ! -name "*.java" | xargs jar uvf "${PN}.jar" || die "jar update failed"
+}
+
+src_install() {
+ java-pkg-simple_src_install
+ insinto /usr/share/java-config-2/compiler
+ doins "${FILESDIR}/ecj-${SLOT}"
+ eprefixify "${ED}"/usr/share/java-config-2/compiler/ecj-${SLOT}
+}
diff --git a/dev-java/ant-eclipse-ecj/files/ecj-4.22 b/dev-java/ant-eclipse-ecj/files/ecj-4.22
index 5bbcc318d9ba..57e76b76c539 100644
--- a/dev-java/ant-eclipse-ecj/files/ecj-4.22
+++ b/dev-java/ant-eclipse-ecj/files/ecj-4.22
@@ -1,5 +1,5 @@
JAVAC="@GENTOO_PORTAGE_EPREFIX@/usr/bin/ecj-4.22"
-PACKAGE="=dev-java/ant-eclipse-ecj-4.21*"
+PACKAGE="=dev-java/ant-eclipse-ecj-4.22*"
SUPPORTED_TARGET="1.1 1.2 1.3 1.4 1.5 1.6 1.7 1.8 9 10 11 12 13 14 15 16 17"
SUPPORTED_SOURCE="1.3 1.4 1.5 1.6 1.7 1.8 9 10 11 12 13 14 15 16 17"
ANT_BUILD_COMPILER="org.eclipse.jdt.core.JDTCompilerAdapter"
diff --git a/dev-java/ant-eclipse-ecj/files/ecj-4.25 b/dev-java/ant-eclipse-ecj/files/ecj-4.25
new file mode 100644
index 000000000000..b1f3ece05dd7
--- /dev/null
+++ b/dev-java/ant-eclipse-ecj/files/ecj-4.25
@@ -0,0 +1,7 @@
+JAVAC="@GENTOO_PORTAGE_EPREFIX@/usr/bin/ecj-4.25"
+PACKAGE="=dev-java/ant-eclipse-ecj-4.25*"
+SUPPORTED_TARGET="1.1 1.2 1.3 1.4 1.5 1.6 1.7 1.8 9 10 11 12 13 14 15 16 17 18"
+SUPPORTED_SOURCE="1.3 1.4 1.5 1.6 1.7 1.8 9 10 11 12 13 14 15 16 17 18"
+ANT_BUILD_COMPILER="org.eclipse.jdt.core.JDTCompilerAdapter"
+ANT_BUILD_COMPILER_DEPS="eclipse-ecj-4.25,ant-eclipse-ecj-4.25"
+GENERATION="2"
diff --git a/dev-java/apiguardian-api/apiguardian-api-1.1.2-r1.ebuild b/dev-java/apiguardian-api/apiguardian-api-1.1.2-r1.ebuild
index 53885481c686..942785e74192 100644
--- a/dev-java/apiguardian-api/apiguardian-api-1.1.2-r1.ebuild
+++ b/dev-java/apiguardian-api/apiguardian-api-1.1.2-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/apiguardian-team/apiguardian/archive/r${PV}.tar.gz -
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
DEPEND=">=virtual/jdk-11:*"
RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/apiguardian-api/apiguardian-api-1.1.2.ebuild b/dev-java/apiguardian-api/apiguardian-api-1.1.2.ebuild
deleted file mode 100644
index b9bd660df331..000000000000
--- a/dev-java/apiguardian-api/apiguardian-api-1.1.2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source"
-MAVEN_ID="org.apiguardian:apiguardian-api:1.1.2"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="@org.apiguardian.api.API Java annotation provider"
-HOMEPAGE="https://github.com/apiguardian-team/apiguardian"
-SRC_URI="https://github.com/apiguardian-team/apiguardian/archive/r${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-DEPEND="
- >=virtual/jdk-1.8:*
-"
-
-RDEPEND="
- >=virtual/jre-1.8:*
-"
-
-DOCS=( README.md )
-
-S="${WORKDIR}/${PN%-api}-r${PV}"
-
-JAVA_SRC_DIR=( src/{main,module}/java )
-
-src_install() {
- default # https://bugs.gentoo.org/789582
- java-pkg-simple_src_install
-}
diff --git a/dev-java/aqute-bnd-annotation/Manifest b/dev-java/aqute-bnd-annotation/Manifest
new file mode 100644
index 000000000000..5b277a425cec
--- /dev/null
+++ b/dev-java/aqute-bnd-annotation/Manifest
@@ -0,0 +1 @@
+DIST biz.aQute.bnd.annotation-6.3.1-sources.jar 50600 BLAKE2B 6ace86a803c378be17b4ecfb658eb17e9c95f4f8797cdf22cbb9a5acb2a382fe0ee6791ad0280a2de9d9e85fbe2732487e693b2c93f08145b3633810f480f8b9 SHA512 751855a173e6d5f9d09f6d63775b97d971cebbfc019053988ec7fe144d0f49b4d09b9a2339d63bb43cea51d09d7d766554255f727cad8d73d9c196097e58d0fd
diff --git a/dev-java/aqute-bnd-annotation/aqute-bnd-annotation-6.3.1.ebuild b/dev-java/aqute-bnd-annotation/aqute-bnd-annotation-6.3.1.ebuild
new file mode 100644
index 000000000000..0ec922b091fb
--- /dev/null
+++ b/dev-java/aqute-bnd-annotation/aqute-bnd-annotation-6.3.1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom biz.aQute.bnd.annotation-6.3.1.pom --download-uri https://repo1.maven.org/maven2/biz/aQute/bnd/biz.aQute.bnd.annotation/6.3.1/biz.aQute.bnd.annotation-6.3.1-sources.jar --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild aqute-bnd-annotation-6.3.1.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="biz.aQute.bnd:biz.aQute.bnd.annotation:6.3.1"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="bnd Annotations Library"
+HOMEPAGE="https://bnd.bndtools.org/"
+SRC_URI="https://repo1.maven.org/maven2/biz/aQute/bnd/biz.aQute.bnd.annotation/${PV}/biz.aQute.bnd.annotation-${PV}-sources.jar"
+
+LICENSE="Apache-2.0 EPL-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
+
+# Common dependencies
+# POM: biz.aQute.bnd.annotation-${PV}.pom
+# org.osgi:org.osgi.resource:1.0.0 -> !!!artifactId-not-found!!!
+# org.osgi:org.osgi.service.serviceloader:1.0.0 -> !!!artifactId-not-found!!!
+
+CP_DEPEND="dev-java/osgi-annotation:0"
+
+# Compile dependencies
+# POM: biz.aQute.bnd.annotation-${PV}.pom
+# org.osgi:org.osgi.namespace.extender:1.0.1 -> !!!artifactId-not-found!!!
+# org.osgi:org.osgi.namespace.service:1.0.0 -> !!!artifactId-not-found!!!
+# org.osgi:osgi.annotation:8.1.0 -> >=dev-java/osgi-annotation-8.1.0:0
+
+DEPEND=">=virtual/jdk-1.8:*
+ dev-java/osgi-cmpn:8
+ dev-java/osgi-core:0
+ ${CP_DEPEND}"
+
+RDEPEND=">=virtual/jre-1.8:*
+ ${CP_DEPEND}"
+
+BDEPEND="app-arch/unzip"
+
+S="${WORKDIR}"
+
+JAVA_CLASSPATH_EXTRA="osgi-cmpn-8,osgi-core"
+JAVA_SRC_DIR="."
diff --git a/dev-java/log4j-api-java9/metadata.xml b/dev-java/aqute-bnd-annotation/metadata.xml
index 75321cfb5598..75321cfb5598 100644
--- a/dev-java/log4j-api-java9/metadata.xml
+++ b/dev-java/aqute-bnd-annotation/metadata.xml
diff --git a/dev-java/asm-analysis/Manifest b/dev-java/asm-analysis/Manifest
deleted file mode 100644
index 20184b840f68..000000000000
--- a/dev-java/asm-analysis/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST asm-ASM_9_2.tar.gz 1614845 BLAKE2B 3fc0fb45d0583b06371452d2df166ce53f81a114a386eda96fe3b0c748beffdd42791d59ddfb4c9ad368f73728f3382855a7336324b013e937c20a4f31cea44b SHA512 a0077e3c1ebbd8a841d3556be4363383951244ba87670af45a8565e14ad3ac94ab89a23b934b3609190e1b16dd9663798c01d1c859eddb2e825c41908c2e2afd
diff --git a/dev-java/asm-analysis/asm-analysis-9.2.ebuild b/dev-java/asm-analysis/asm-analysis-9.2.ebuild
deleted file mode 100644
index 9e455cc5874c..000000000000
--- a/dev-java/asm-analysis/asm-analysis-9.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-JAVA_PKG_IUSE="doc source"
-MAVEN_ID="org.ow2.asm:asm-analysis:9.2"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Bytecode manipulation framework for Java (Static code analysis API)"
-HOMEPAGE="http://asm.ow2.org"
-MY_P="ASM_${PV//./_}"
-SRC_URI="https://gitlab.ow2.org/asm/asm/-/archive/${MY_P}/asm-${MY_P}.tar.gz"
-LICENSE="BSD"
-SLOT=`ver_cut 1`
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~x64-macos"
-RESTRICT="test"
-
-CDEPEND="dev-java/asm-tree:${SLOT}"
-DEPEND=">=virtual/jdk-1.8:*
-${CDEPEND}
-"
-RDEPEND=">=virtual/jre-1.8:*
-${CDEPEND}
-"
-
-JAVA_GENTOO_CLASSPATH="asm-${SLOT} asm-tree-${SLOT}"
-JAVA_SRC_DIR="asm-${MY_P}/${PN}/src/main/java"
diff --git a/dev-java/asm-analysis/metadata.xml b/dev-java/asm-analysis/metadata.xml
deleted file mode 100644
index b460724d5676..000000000000
--- a/dev-java/asm-analysis/metadata.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>java@gentoo.org</email>
- <name>Java</name>
- </maintainer>
- <maintainer type="person" proxied="yes">
- <email>kaiboma06@gmail.com</email>
- <name>Kaibo Ma</name>
- </maintainer>
- <longdescription>
- ASM is a Java bytecode manipulation framework. It can be used to
- dynamically generate stub classes or other proxy classes, directly in
- binary form, or to dynamically modify classes at load time, i.e., just
- before they are loaded into the Java Virtual Machine.
-
- ASM offers similar functionalities as BCEL or SERP, but is much more
- smaller (25KB instead of 350KB for BCEL and 150KB for SERP) and faster
- than these tools (the overhead of a load time class transformation is of
- the order of 60% with ASM, 700% or more with BCEL, and 1100% or more
- with SERP). Indeed ASM was designed to be used in a dynamic way* and was
- therefore designed and implemented to be as small and as fast as
- possible.
- </longdescription>
-</pkgmetadata>
diff --git a/dev-java/asm-commons/Manifest b/dev-java/asm-commons/Manifest
deleted file mode 100644
index 20184b840f68..000000000000
--- a/dev-java/asm-commons/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST asm-ASM_9_2.tar.gz 1614845 BLAKE2B 3fc0fb45d0583b06371452d2df166ce53f81a114a386eda96fe3b0c748beffdd42791d59ddfb4c9ad368f73728f3382855a7336324b013e937c20a4f31cea44b SHA512 a0077e3c1ebbd8a841d3556be4363383951244ba87670af45a8565e14ad3ac94ab89a23b934b3609190e1b16dd9663798c01d1c859eddb2e825c41908c2e2afd
diff --git a/dev-java/asm-commons/asm-commons-9.2.ebuild b/dev-java/asm-commons/asm-commons-9.2.ebuild
deleted file mode 100644
index bd43329c1f32..000000000000
--- a/dev-java/asm-commons/asm-commons-9.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-JAVA_PKG_IUSE="doc source"
-MAVEN_ID="org.ow2.asm:asm-commons:9.2"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Bytecode manipulation framework for Java (Common class adaptors)"
-HOMEPAGE="http://asm.ow2.org"
-MY_P="ASM_${PV//./_}"
-SRC_URI="https://gitlab.ow2.org/asm/asm/-/archive/${MY_P}/asm-${MY_P}.tar.gz"
-LICENSE="BSD"
-SLOT=`ver_cut 1`
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~x64-macos"
-RESTRICT="test"
-
-CDEPEND="dev-java/asm-analysis:${SLOT} dev-java/asm-tree:${SLOT} dev-java/asm:${SLOT}"
-DEPEND=">=virtual/jdk-1.8:*
-${CDEPEND}
-"
-RDEPEND=">=virtual/jre-1.8:*
-${CDEPEND}
-"
-
-JAVA_GENTOO_CLASSPATH="asm-${SLOT} asm-tree-${SLOT} asm-analysis-${SLOT}"
-JAVA_SRC_DIR="asm-${MY_P}/${PN}/src/main/java"
diff --git a/dev-java/asm-commons/metadata.xml b/dev-java/asm-commons/metadata.xml
deleted file mode 100644
index b460724d5676..000000000000
--- a/dev-java/asm-commons/metadata.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>java@gentoo.org</email>
- <name>Java</name>
- </maintainer>
- <maintainer type="person" proxied="yes">
- <email>kaiboma06@gmail.com</email>
- <name>Kaibo Ma</name>
- </maintainer>
- <longdescription>
- ASM is a Java bytecode manipulation framework. It can be used to
- dynamically generate stub classes or other proxy classes, directly in
- binary form, or to dynamically modify classes at load time, i.e., just
- before they are loaded into the Java Virtual Machine.
-
- ASM offers similar functionalities as BCEL or SERP, but is much more
- smaller (25KB instead of 350KB for BCEL and 150KB for SERP) and faster
- than these tools (the overhead of a load time class transformation is of
- the order of 60% with ASM, 700% or more with BCEL, and 1100% or more
- with SERP). Indeed ASM was designed to be used in a dynamic way* and was
- therefore designed and implemented to be as small and as fast as
- possible.
- </longdescription>
-</pkgmetadata>
diff --git a/dev-java/asm-tree/Manifest b/dev-java/asm-tree/Manifest
deleted file mode 100644
index 20184b840f68..000000000000
--- a/dev-java/asm-tree/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST asm-ASM_9_2.tar.gz 1614845 BLAKE2B 3fc0fb45d0583b06371452d2df166ce53f81a114a386eda96fe3b0c748beffdd42791d59ddfb4c9ad368f73728f3382855a7336324b013e937c20a4f31cea44b SHA512 a0077e3c1ebbd8a841d3556be4363383951244ba87670af45a8565e14ad3ac94ab89a23b934b3609190e1b16dd9663798c01d1c859eddb2e825c41908c2e2afd
diff --git a/dev-java/asm-tree/asm-tree-9.2.ebuild b/dev-java/asm-tree/asm-tree-9.2.ebuild
deleted file mode 100644
index 49cefdb5dccc..000000000000
--- a/dev-java/asm-tree/asm-tree-9.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-JAVA_PKG_IUSE="doc source"
-MAVEN_ID="org.ow2.asm:asm-tree:9.2"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Bytecode manipulation framework for Java (Tree API)"
-HOMEPAGE="http://asm.ow2.org"
-MY_P="ASM_${PV//./_}"
-SRC_URI="https://gitlab.ow2.org/asm/asm/-/archive/${MY_P}/asm-${MY_P}.tar.gz"
-LICENSE="BSD"
-SLOT=`ver_cut 1`
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~x64-macos"
-RESTRICT="test"
-
-CDEPEND="dev-java/asm:${SLOT}"
-DEPEND=">=virtual/jdk-1.8:*
-${CDEPEND}
-"
-RDEPEND=">=virtual/jre-1.8:*
-${CDEPEND}
-"
-
-JAVA_GENTOO_CLASSPATH="asm-${SLOT}"
-JAVA_SRC_DIR="asm-${MY_P}/${PN}/src/main/java"
diff --git a/dev-java/asm-tree/metadata.xml b/dev-java/asm-tree/metadata.xml
deleted file mode 100644
index b460724d5676..000000000000
--- a/dev-java/asm-tree/metadata.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>java@gentoo.org</email>
- <name>Java</name>
- </maintainer>
- <maintainer type="person" proxied="yes">
- <email>kaiboma06@gmail.com</email>
- <name>Kaibo Ma</name>
- </maintainer>
- <longdescription>
- ASM is a Java bytecode manipulation framework. It can be used to
- dynamically generate stub classes or other proxy classes, directly in
- binary form, or to dynamically modify classes at load time, i.e., just
- before they are loaded into the Java Virtual Machine.
-
- ASM offers similar functionalities as BCEL or SERP, but is much more
- smaller (25KB instead of 350KB for BCEL and 150KB for SERP) and faster
- than these tools (the overhead of a load time class transformation is of
- the order of 60% with ASM, 700% or more with BCEL, and 1100% or more
- with SERP). Indeed ASM was designed to be used in a dynamic way* and was
- therefore designed and implemented to be as small and as fast as
- possible.
- </longdescription>
-</pkgmetadata>
diff --git a/dev-java/asm-util/Manifest b/dev-java/asm-util/Manifest
deleted file mode 100644
index 20184b840f68..000000000000
--- a/dev-java/asm-util/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST asm-ASM_9_2.tar.gz 1614845 BLAKE2B 3fc0fb45d0583b06371452d2df166ce53f81a114a386eda96fe3b0c748beffdd42791d59ddfb4c9ad368f73728f3382855a7336324b013e937c20a4f31cea44b SHA512 a0077e3c1ebbd8a841d3556be4363383951244ba87670af45a8565e14ad3ac94ab89a23b934b3609190e1b16dd9663798c01d1c859eddb2e825c41908c2e2afd
diff --git a/dev-java/asm-util/asm-util-9.2.ebuild b/dev-java/asm-util/asm-util-9.2.ebuild
deleted file mode 100644
index 24ae0369880b..000000000000
--- a/dev-java/asm-util/asm-util-9.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-JAVA_PKG_IUSE="doc source"
-MAVEN_ID="org.ow2.asm:asm-util:9.2"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Bytecode manipulation framework for Java (Utilities)"
-HOMEPAGE="http://asm.ow2.org"
-MY_P="ASM_${PV//./_}"
-SRC_URI="https://gitlab.ow2.org/asm/asm/-/archive/${MY_P}/asm-${MY_P}.tar.gz"
-LICENSE="BSD"
-SLOT=`ver_cut 1`
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~x64-macos"
-RESTRICT="test"
-
-CDEPEND="dev-java/asm-analysis:${SLOT} dev-java/asm-tree:${SLOT} dev-java/asm:${SLOT}"
-DEPEND=">=virtual/jdk-1.8:*
-${CDEPEND}
-"
-RDEPEND=">=virtual/jre-1.8:*
-${CDEPEND}
-"
-
-JAVA_GENTOO_CLASSPATH="asm-${SLOT} asm-tree-${SLOT} asm-analysis-${SLOT}"
-JAVA_SRC_DIR="asm-${MY_P}/${PN}/src/main/java"
diff --git a/dev-java/asm-util/metadata.xml b/dev-java/asm-util/metadata.xml
deleted file mode 100644
index b460724d5676..000000000000
--- a/dev-java/asm-util/metadata.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>java@gentoo.org</email>
- <name>Java</name>
- </maintainer>
- <maintainer type="person" proxied="yes">
- <email>kaiboma06@gmail.com</email>
- <name>Kaibo Ma</name>
- </maintainer>
- <longdescription>
- ASM is a Java bytecode manipulation framework. It can be used to
- dynamically generate stub classes or other proxy classes, directly in
- binary form, or to dynamically modify classes at load time, i.e., just
- before they are loaded into the Java Virtual Machine.
-
- ASM offers similar functionalities as BCEL or SERP, but is much more
- smaller (25KB instead of 350KB for BCEL and 150KB for SERP) and faster
- than these tools (the overhead of a load time class transformation is of
- the order of 60% with ASM, 700% or more with BCEL, and 1100% or more
- with SERP). Indeed ASM was designed to be used in a dynamic way* and was
- therefore designed and implemented to be as small and as fast as
- possible.
- </longdescription>
-</pkgmetadata>
diff --git a/dev-java/assertj-core/assertj-core-3.10.0.ebuild b/dev-java/assertj-core/assertj-core-3.10.0.ebuild
index aac98e5265bc..38d9cb8187f0 100644
--- a/dev-java/assertj-core/assertj-core-3.10.0.ebuild
+++ b/dev-java/assertj-core/assertj-core-3.10.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/assertj/${PN}/archive/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="3"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
CP_DEPEND="
>=dev-java/byte-buddy-1.12.12:0
diff --git a/dev-java/bcel/Manifest b/dev-java/bcel/Manifest
index 293f425488f6..387e9e378b12 100644
--- a/dev-java/bcel/Manifest
+++ b/dev-java/bcel/Manifest
@@ -1 +1,2 @@
-DIST bcel-6.5.0-sources.tar.gz 1009051 BLAKE2B fd07d8a5144112efe38e30a8d10c3b6a189a4ec70defa96c402fa88027acf84b07c15138d235354baac18bdb798d407c11ccfada7bbe7339532f829e814e2d2c SHA512 c6da4b4d4cbad3ad2b3a4c0208063e3858170356fc4f6670c95ce819f0aea69f103914875a12bf2715a869c2b19a3e79fcb55a695eb269d9937520db25da1e3d
+DIST bcel-6.6.0-src.tar.gz 1009654 BLAKE2B 9043cc077773383aebf9b56e8c67de9ffb9e278db1737eefb5966b32cbe36131bd6ec14454361daaf424a8114de21e804dadaebfbee6d11493026b8a98135668 SHA512 13f361be498625c3276860ae14c225c49135687f4ba69de4afaac2d135df4e5c6b51277e3cd4c05bac27156e4fab5316c102a25a67d8abb6c640499917d01917
+DIST bcel-6.6.0-src.tar.gz.asc 488 BLAKE2B b3d07f9d6f8f2b92215173d390281cab03b98dea2e926f5fe7f3ced74610c56dfa2915c5bfeeca360cd3904773cb66f8d9042062e6b3821f707853ef5c82fc73 SHA512 65830fcd5f5adb1deb92edd0b9181b9aeaf3d5357858a348606416dcfb416f58420ceb6c8ea58a550d5d7b4d1909dcff125b31496c00a9107ae211936c1d6e1d
diff --git a/dev-java/bcel/bcel-6.5.0-r3.ebuild b/dev-java/bcel/bcel-6.5.0-r3.ebuild
deleted file mode 100644
index 54af8629d599..000000000000
--- a/dev-java/bcel/bcel-6.5.0-r3.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://ftp.wayne.edu/apache//commons/bcel/source/bcel-6.5.0-src.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" --ebuild bcel-6.5.0-r1.ebuild
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.apache.bcel:bcel:6.5.0"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Apache Commons Bytecode Engineering Library"
-HOMEPAGE="https://commons.apache.org/proper/commons-bcel/"
-SRC_URI="mirror://apache/commons/${PN}/source/${P}-src.tar.gz -> ${P}-sources.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-# Compile dependencies
-# POM: pom.xml
-# test? javax:javaee-api:6.0 -> !!!groupId-not-found!!!
-# test? junit:junit:4.13 -> >=dev-java/junit-4.13.1:4
-# test? net.java.dev.jna:jna:5.5.0 -> !!!groupId-not-found!!!
-# test? net.java.dev.jna:jna-platform:5.5.0 -> !!!groupId-not-found!!!
-# test? org.apache.commons:commons-lang3:3.10 -> >=dev-java/commons-lang-3.11:3.6
-
-DEPEND="
- >=virtual/jdk-1.8:*
- test? (
- dev-java/commons-collections:4
- dev-java/commons-io:1
- dev-java/commons-lang:3.6
- dev-java/jna:4
- dev-java/jmh-core:0
- dev-java/javax-mail:0
- )
-"
-
-RDEPEND="
- >=virtual/jre-1.8:*
-"
-
-RESTRICT="!test? ( test )"
-
-S="${WORKDIR}/${P}-src"
-
-JAVA_SRC_DIR="src/main/java"
-
-JAVA_TEST_GENTOO_CLASSPATH="commons-collections-4,commons-io-1,commons-lang-3.6,jmh-core,jna-4,junit-4,javax-mail"
-JAVA_TEST_SRC_DIR="src/test/java"
-JAVA_TEST_RESOURCE_DIRS=(
- "src/test/resources"
-)
-JAVA_TEST_EXCLUDES=(
- # Invalid test class
- "org.apache.bcel.data.AnonymousClassTest"
- "org.apache.bcel.verifier.tests.TestArray01"
- "org.apache.bcel.verifier.tests.TestArrayAccess01"
- "org.apache.bcel.verifier.tests.TestArrayAccess02Creator"
- "org.apache.bcel.verifier.tests.TestArrayAccess03Creator"
- "org.apache.bcel.verifier.tests.TestArrayAccess04Creator"
- "org.apache.bcel.verifier.tests.TestLegalInvokeInterface01"
- "org.apache.bcel.verifier.tests.TestLegalInvokeSpecial01"
- "org.apache.bcel.verifier.tests.TestLegalInvokeSpecial02"
- "org.apache.bcel.verifier.tests.TestLegalInvokeStatic01"
- "org.apache.bcel.verifier.tests.TestLegalInvokeVirtual01"
- "org.apache.bcel.verifier.tests.TestLegalInvokeVirtual02"
- "org.apache.bcel.verifier.tests.TestReturn01Creator"
- "org.apache.bcel.verifier.tests.TestReturn02"
- "org.apache.bcel.verifier.tests.TestCreator"
- "org.apache.bcel.verifier.tests.TestReturn03Creator"
-)
diff --git a/dev-java/bcel/bcel-6.5.0.ebuild b/dev-java/bcel/bcel-6.5.0.ebuild
deleted file mode 100644
index b4fcd293facd..000000000000
--- a/dev-java/bcel/bcel-6.5.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir bcel-6.5.0-src --pom pom.xml --download-uri https://ftp.wayne.edu/apache//commons/bcel/source/bcel-6.5.0-src.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" --ebuild bcel-6.5.0.ebuild
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source"
-MAVEN_ID="org.apache.bcel:bcel:6.5.0"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Apache Commons Bytecode Engineering Library"
-HOMEPAGE="https://commons.apache.org/proper/commons-bcel"
-SRC_URI="mirror://apache/commons/${PN}/source/${P}-src.tar.gz -> ${P}-sources.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-DEPEND="
- >=virtual/jdk-1.8:*
-"
-
-RDEPEND="
- >=virtual/jre-1.8:*
-"
-
-S="${WORKDIR}/${P}-src"
-
-JAVA_SRC_DIR="src/main/java"
diff --git a/dev-java/bcel/bcel-6.6.0.ebuild b/dev-java/bcel/bcel-6.6.0.ebuild
new file mode 100644
index 000000000000..8545fafd527e
--- /dev/null
+++ b/dev-java/bcel/bcel-6.6.0.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri mirror://apache/commons/bcel/source/bcel-6.6.0-src.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" --ebuild bcel-6.6.0.ebuild
+
+EAPI=8
+
+# No tests, junit-jupiter is not packaged
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="org.apache.bcel:bcel:6.6.0"
+
+inherit java-pkg-2 java-pkg-simple verify-sig
+
+DESCRIPTION="Apache Commons Bytecode Engineering Library"
+HOMEPAGE="https://commons.apache.org/proper/commons-bcel/"
+SRC_URI="https://archive.apache.org/dist/commons/bcel/source/bcel-${PV}-src.tar.gz
+ verify-sig? ( https://downloads.apache.org/commons/bcel/source/bcel-${PV}-src.tar.gz.asc )"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+# Common dependencies
+# POM: pom.xml
+# org.apache.commons:commons-lang3:3.12.0 -> >=dev-java/commons-lang-3.12.0:3.6
+
+CP_DEPEND="
+ dev-java/commons-lang:3.6
+"
+
+# Compile dependencies
+# POM: pom.xml
+# test? javax:javaee-api:6.0 -> !!!groupId-not-found!!!
+# test? net.java.dev.jna:jna:5.12.1 -> !!!suitable-mavenVersion-not-found!!!
+# test? net.java.dev.jna:jna-platform:5.12.1 -> !!!artifactId-not-found!!!
+# test? org.apache.commons:commons-exec:1.3 -> !!!artifactId-not-found!!!
+# test? org.junit.jupiter:junit-jupiter:5.9.1 -> !!!groupId-not-found!!!
+
+DEPEND="
+ >=virtual/jdk-1.8:*
+ ${CP_DEPEND}
+"
+
+RDEPEND="
+ >=virtual/jre-1.8:*
+ ${CP_DEPEND}"
+
+BDEPEND="
+ verify-sig? ( sec-keys/openpgp-keys-apache-commons )
+"
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/commons.apache.org.asc"
+
+DOCS=( NOTICE.txt RELEASE-NOTES.txt )
+
+S="${WORKDIR}/${P}-src"
+
+JAVA_AUTOMATIC_MODULE_NAME="org.apache.bcel"
+JAVA_SRC_DIR="src/main/java"
diff --git a/dev-java/bcel/metadata.xml b/dev-java/bcel/metadata.xml
index 5d226489e06c..5b5f89c96e8e 100644
--- a/dev-java/bcel/metadata.xml
+++ b/dev-java/bcel/metadata.xml
@@ -1,19 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="project">
- <email>java@gentoo.org</email>
- <name>Java</name>
- </maintainer>
- <longdescription lang="en">
- This is the main Reference implementation of the BCEL JavaClass API.
- The Byte Code Engineering Library (formerly known as JavaClass) is intended
- to give users a convenient possibility to analyze, create, and manipulate
- (binary) Java class files (those ending with .class). Classes are represented
- by objects which contain all the symbolic information of the given class:
- methods, fields and byte code instructions, in particular.
-</longdescription>
- <upstream>
- <remote-id type="github">apache/commons-bcel</remote-id>
- </upstream>
+ <maintainer type="project">
+ <email>java@gentoo.org</email>
+ <name>Java</name>
+ </maintainer>
+ <longdescription lang="en">
+ This is the main Reference implementation of the BCEL JavaClass API.
+ The Byte Code Engineering Library (formerly known as JavaClass) is intended
+ to give users a convenient possibility to analyze, create, and manipulate
+ (binary) Java class files (those ending with .class). Classes are represented
+ by objects which contain all the symbolic information of the given class:
+ methods, fields and byte code instructions, in particular.
+ </longdescription>
+ <upstream>
+ <changelog>https://downloads.apache.org/commons/bcel/RELEASE-NOTES.txt</changelog>
+ <remote-id type="github">apache/commons-bcel</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-java/bcmail/Manifest b/dev-java/bcmail/Manifest
index 7feaa1f69257..a6beedad13a8 100644
--- a/dev-java/bcmail/Manifest
+++ b/dev-java/bcmail/Manifest
@@ -1 +1,2 @@
DIST bc-java-r1rv71.tar.gz 117684695 BLAKE2B db0a1b2576a55592e0447aa8734e8ecb6fe8452d08dabf010070f3c6b5a3b4caa7a5929baaa52796fed0ef397e18fe58fdb91dfef6da75af8f28efb627d2b808 SHA512 c9a095a034863a46027e28754ae96d9750162120bc1af124fa700ad05d23716a606633b674e2e8490bda658d30d30e93f42ba00dcc1ac13596a24f8aa43a666d
+DIST bc-java-r1rv72.tar.gz 380374879 BLAKE2B 53c593c1d97e9ee56388479dce7386d254f74a8bab9612e802ebe963df84d1a397fe0c5a7a0d0db2ac2cd3252ae43e79c67b9d3ba1b5ffc20cc8727c7e1a6994 SHA512 dbfdd9e4f30ab713584830a0fd0d7e4f89904366bf4953a9e722656cc4cd92c9d29238649efa7b4cdab64e2c08f4b3b3c96667d1ade569ade5a5a2c9ad9d5b5c
diff --git a/dev-java/bcmail/bcmail-1.72.ebuild b/dev-java/bcmail/bcmail-1.72.ebuild
new file mode 100644
index 000000000000..09cfa8ab86b2
--- /dev/null
+++ b/dev-java/bcmail/bcmail-1.72.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.bouncycastle:bcmail-jdk18on:1.72"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="The Bouncy Castle Java S/MIME APIs for handling S/MIME protocols"
+HOMEPAGE="https://www.bouncycastle.org/java.html"
+SRC_URI="https://github.com/bcgit/bc-java/archive/r${PV/./rv}.tar.gz -> bc-java-r${PV/./rv}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+CP_DEPEND="
+ ~dev-java/bcpkix-${PV}:0
+ ~dev-java/bcprov-${PV}:0
+ ~dev-java/bcutil-${PV}:0
+ dev-java/jakarta-activation:1
+ dev-java/javax-mail:0
+ "
+DEPEND="${CP_DEPEND}
+ >=virtual/jdk-11:*"
+RDEPEND="${CP_DEPEND}
+ >=virtual/jre-1.8:*"
+
+DOCS=( ../{README,SECURITY}.md )
+HTML_DOCS=( ../{CONTRIBUTORS,index}.html )
+
+S="${WORKDIR}/bc-java-r${PV/./rv}/mail"
+
+JAVA_RESOURCE_DIRS="src/main/resources"
+JAVA_SRC_DIR=(
+ "src/main/java"
+ "src/main/jdk1.9"
+)
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+JAVA_TEST_RUN_ONLY="org.bouncycastle.mail.smime.test.AllTests"
+JAVA_TEST_SRC_DIR="src/test/java"
+
+src_prepare() {
+ default
+ java-pkg_clean ..
+}
+
+src_install() {
+ docinto html
+ dodoc -r ../docs
+ java-pkg-simple_src_install
+}
diff --git a/dev-java/bcpg/Manifest b/dev-java/bcpg/Manifest
index 7feaa1f69257..a6beedad13a8 100644
--- a/dev-java/bcpg/Manifest
+++ b/dev-java/bcpg/Manifest
@@ -1 +1,2 @@
DIST bc-java-r1rv71.tar.gz 117684695 BLAKE2B db0a1b2576a55592e0447aa8734e8ecb6fe8452d08dabf010070f3c6b5a3b4caa7a5929baaa52796fed0ef397e18fe58fdb91dfef6da75af8f28efb627d2b808 SHA512 c9a095a034863a46027e28754ae96d9750162120bc1af124fa700ad05d23716a606633b674e2e8490bda658d30d30e93f42ba00dcc1ac13596a24f8aa43a666d
+DIST bc-java-r1rv72.tar.gz 380374879 BLAKE2B 53c593c1d97e9ee56388479dce7386d254f74a8bab9612e802ebe963df84d1a397fe0c5a7a0d0db2ac2cd3252ae43e79c67b9d3ba1b5ffc20cc8727c7e1a6994 SHA512 dbfdd9e4f30ab713584830a0fd0d7e4f89904366bf4953a9e722656cc4cd92c9d29238649efa7b4cdab64e2c08f4b3b3c96667d1ade569ade5a5a2c9ad9d5b5c
diff --git a/dev-java/bcpg/bcpg-1.72.ebuild b/dev-java/bcpg/bcpg-1.72.ebuild
new file mode 100644
index 000000000000..8f9ae15c6094
--- /dev/null
+++ b/dev-java/bcpg/bcpg-1.72.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.bouncycastle:bcpg-jdk18on:1.72"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Java cryptography APIs"
+HOMEPAGE="https://www.bouncycastle.org/java.html"
+SRC_URI="https://github.com/bcgit/bc-java/archive/r${PV/./rv}.tar.gz -> bc-java-r${PV/./rv}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+CP_DEPEND="~dev-java/bcprov-${PV}:0"
+DEPEND="${CP_DEPEND}
+ >=virtual/jdk-11:*"
+RDEPEND="${CP_DEPEND}
+ >=virtual/jre-1.8:*"
+
+DOCS=( ../{README,SECURITY}.md )
+HTML_DOCS=( ../{CONTRIBUTORS,index}.html )
+
+S="${WORKDIR}/bc-java-r${PV/./rv}/pg"
+
+JAVA_SRC_DIR=(
+ "src/main/java"
+ "src/main/jdk1.9"
+)
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+JAVA_TEST_SRC_DIR="src/test/java"
+
+src_prepare() {
+ default
+ java-pkg_clean ..
+}
+
+src_test() {
+ pushd src/test/java || die
+ local JAVA_TEST_RUN_ONLY=$(find * \
+ -name "AllTests.java" )
+ popd || die
+ JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}"
+ JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}"
+ java-pkg-simple_src_test
+}
+
+src_install() {
+ docinto html
+ dodoc -r ../docs
+ java-pkg-simple_src_install
+}
diff --git a/dev-java/bcpkix/Manifest b/dev-java/bcpkix/Manifest
index 7feaa1f69257..a6beedad13a8 100644
--- a/dev-java/bcpkix/Manifest
+++ b/dev-java/bcpkix/Manifest
@@ -1 +1,2 @@
DIST bc-java-r1rv71.tar.gz 117684695 BLAKE2B db0a1b2576a55592e0447aa8734e8ecb6fe8452d08dabf010070f3c6b5a3b4caa7a5929baaa52796fed0ef397e18fe58fdb91dfef6da75af8f28efb627d2b808 SHA512 c9a095a034863a46027e28754ae96d9750162120bc1af124fa700ad05d23716a606633b674e2e8490bda658d30d30e93f42ba00dcc1ac13596a24f8aa43a666d
+DIST bc-java-r1rv72.tar.gz 380374879 BLAKE2B 53c593c1d97e9ee56388479dce7386d254f74a8bab9612e802ebe963df84d1a397fe0c5a7a0d0db2ac2cd3252ae43e79c67b9d3ba1b5ffc20cc8727c7e1a6994 SHA512 dbfdd9e4f30ab713584830a0fd0d7e4f89904366bf4953a9e722656cc4cd92c9d29238649efa7b4cdab64e2c08f4b3b3c96667d1ade569ade5a5a2c9ad9d5b5c
diff --git a/dev-java/bcpkix/bcpkix-1.72.ebuild b/dev-java/bcpkix/bcpkix-1.72.ebuild
new file mode 100644
index 000000000000..8293b0a9ddc0
--- /dev/null
+++ b/dev-java/bcpkix/bcpkix-1.72.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.bouncycastle:bcpkix-jdk18on:1.72"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple check-reqs
+
+DESCRIPTION="Java APIs for CMS, PKCS, EAC, TSP, CMP, CRMF, OCSP, and certificate generation"
+HOMEPAGE="https://www.bouncycastle.org/java.html"
+SRC_URI="https://github.com/bcgit/bc-java/archive/r${PV/./rv}.tar.gz -> bc-java-r${PV/./rv}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+# 1) testSANMismatchIP(org.bouncycastle.est.test.TestHostNameAuthorizer)
+# org.bouncycastle.est.ESTException: localhost.me: Temporary failure in name resolution HTTP Status Code: 0
+PROPERTIES="test_network"
+RESTRICT="test"
+
+CDEPEND="
+ ~dev-java/bcprov-${PV}:0
+ ~dev-java/bcutil-${PV}:0
+ "
+DEPEND="${CDEPEND}
+ >=virtual/jdk-11:*"
+RDEPEND="${CDEPEND}
+ >=virtual/jre-1.8:*"
+
+DOCS=( ../{README,SECURITY}.md )
+HTML_DOCS=( ../{CONTRIBUTORS,index}.html )
+
+S="${WORKDIR}/bc-java-r${PV/./rv}/pkix"
+
+JAVA_GENTOO_CLASSPATH="bcprov,bcutil"
+JAVA_SRC_DIR=(
+ "src/main/java"
+ "src/main/jdk1.9"
+)
+
+JAVA_TEST_EXTRA_ARGS="-Dbc.test.data.home=${S}/../core/src/test/data"
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+JAVA_TEST_SRC_DIR="src/test/java"
+
+# https://bugs.gentoo.org/823347
+check_env() {
+ if use test; then
+ # this is needed only for tests
+ CHECKREQS_MEMORY="2048M"
+ check-reqs_pkg_pretend
+ fi
+}
+
+# https://bugs.gentoo.org/823347
+pkg_pretend() {
+ check_env
+}
+
+# https://bugs.gentoo.org/823347
+pkg_setup() {
+ check_env
+ java-pkg-2_pkg_setup
+}
+
+src_prepare() {
+ default
+ java-pkg_clean ..
+}
+
+# https://bugs.gentoo.org/823347
+src_test() {
+ JAVA_TEST_EXTRA_ARGS+=" -Xmx${CHECKREQS_MEMORY}"
+ pushd src/test/java || die
+ local JAVA_TEST_RUN_ONLY=$(find * \
+ -name "AllTests.java" \
+ )
+ popd
+ einfo "${JAVA_TEST_RUN_ONLY}"
+ JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}"
+ JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}"
+ java-pkg-simple_src_test
+}
+
+src_install() {
+ docinto html
+ dodoc -r ../docs
+ java-pkg-simple_src_install
+}
diff --git a/dev-java/bcprov/Manifest b/dev-java/bcprov/Manifest
index 7feaa1f69257..a6beedad13a8 100644
--- a/dev-java/bcprov/Manifest
+++ b/dev-java/bcprov/Manifest
@@ -1 +1,2 @@
DIST bc-java-r1rv71.tar.gz 117684695 BLAKE2B db0a1b2576a55592e0447aa8734e8ecb6fe8452d08dabf010070f3c6b5a3b4caa7a5929baaa52796fed0ef397e18fe58fdb91dfef6da75af8f28efb627d2b808 SHA512 c9a095a034863a46027e28754ae96d9750162120bc1af124fa700ad05d23716a606633b674e2e8490bda658d30d30e93f42ba00dcc1ac13596a24f8aa43a666d
+DIST bc-java-r1rv72.tar.gz 380374879 BLAKE2B 53c593c1d97e9ee56388479dce7386d254f74a8bab9612e802ebe963df84d1a397fe0c5a7a0d0db2ac2cd3252ae43e79c67b9d3ba1b5ffc20cc8727c7e1a6994 SHA512 dbfdd9e4f30ab713584830a0fd0d7e4f89904366bf4953a9e722656cc4cd92c9d29238649efa7b4cdab64e2c08f4b3b3c96667d1ade569ade5a5a2c9ad9d5b5c
diff --git a/dev-java/bcprov/bcprov-1.72.ebuild b/dev-java/bcprov/bcprov-1.72.ebuild
new file mode 100644
index 000000000000..725862bd4945
--- /dev/null
+++ b/dev-java/bcprov/bcprov-1.72.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.bouncycastle:bcprov-jdk18on:1.72"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple check-reqs
+
+DESCRIPTION="Java cryptography APIs"
+HOMEPAGE="https://www.bouncycastle.org/java.html"
+SRC_URI="https://github.com/bcgit/bc-java/archive/r${PV/./rv}.tar.gz -> bc-java-r${PV/./rv}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+DEPEND=">=virtual/jdk-11:*"
+RDEPEND=">=virtual/jre-1.8:*"
+BDEPEND="app-arch/zip"
+
+DOCS=( {README,SECURITY}.md )
+HTML_DOCS=( {CONTRIBUTORS,index}.html )
+
+S="${WORKDIR}/bc-java-r${PV/./rv}"
+
+check_env() {
+ if use test; then
+ # this is needed only for tests
+ CHECKREQS_MEMORY="2048M"
+ check-reqs_pkg_pretend
+ fi
+}
+
+pkg_pretend() {
+ check_env
+}
+
+pkg_setup() {
+ check_env
+ java-pkg-2_pkg_setup
+}
+
+src_prepare() {
+ default
+ java-pkg_clean ..
+ # 3 unsolved test failures # 873442
+ rm -r core/src/test/java/org/bouncycastle/pqc/legacy/math/ntru || die
+}
+
+src_compile() {
+ JAVA_RESOURCE_DIRS=(
+ "core/src/main/resources"
+ "prov/src/main/resources"
+ )
+ JAVA_SRC_DIR=(
+ "core/src/main/java"
+ "prov/src/main/java"
+ "prov/src/main/jdk1.9"
+ )
+ java-pkg-simple_src_compile
+}
+
+src_test() {
+ JAVA_TEST_EXTRA_ARGS="-Dbc.test.data.home=${S}/core/src/test/data"
+ JAVA_TEST_EXTRA_ARGS+=" -Xmx${CHECKREQS_MEMORY}"
+ JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+
+ einfo "Testing \"core\""
+ JAVA_TEST_RESOURCE_DIRS="core/src/test/resources"
+ JAVA_TEST_SRC_DIR="core/src/test/java"
+ pushd core/src/test/java || die
+ local JAVA_TEST_RUN_ONLY=$(find * \
+ -name "AllTests.java" )
+ popd || die
+ JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}"
+ JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}"
+ java-pkg-simple_src_test
+
+ einfo "Testing bcprov"
+ JAVA_GENTOO_CLASSPATH_EXTRA=":core.jar" # other value needed than for compilation
+ JAVA_TEST_RESOURCE_DIRS="prov/src/test/resources"
+ JAVA_TEST_SRC_DIR="prov/src/test/java"
+ pushd prov/src/test/java || die
+ local JAVA_TEST_RUN_ONLY=$(find * \
+ -name "AllTests.java" )
+ popd || die
+ JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}"
+ JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}"
+ java-pkg-simple_src_test
+}
+
+src_install() {
+ docinto html
+ dodoc -r docs
+ java-pkg-simple_src_install
+}
diff --git a/dev-java/bcutil/Manifest b/dev-java/bcutil/Manifest
index 7feaa1f69257..a6beedad13a8 100644
--- a/dev-java/bcutil/Manifest
+++ b/dev-java/bcutil/Manifest
@@ -1 +1,2 @@
DIST bc-java-r1rv71.tar.gz 117684695 BLAKE2B db0a1b2576a55592e0447aa8734e8ecb6fe8452d08dabf010070f3c6b5a3b4caa7a5929baaa52796fed0ef397e18fe58fdb91dfef6da75af8f28efb627d2b808 SHA512 c9a095a034863a46027e28754ae96d9750162120bc1af124fa700ad05d23716a606633b674e2e8490bda658d30d30e93f42ba00dcc1ac13596a24f8aa43a666d
+DIST bc-java-r1rv72.tar.gz 380374879 BLAKE2B 53c593c1d97e9ee56388479dce7386d254f74a8bab9612e802ebe963df84d1a397fe0c5a7a0d0db2ac2cd3252ae43e79c67b9d3ba1b5ffc20cc8727c7e1a6994 SHA512 dbfdd9e4f30ab713584830a0fd0d7e4f89904366bf4953a9e722656cc4cd92c9d29238649efa7b4cdab64e2c08f4b3b3c96667d1ade569ade5a5a2c9ad9d5b5c
diff --git a/dev-java/bcutil/bcutil-1.72.ebuild b/dev-java/bcutil/bcutil-1.72.ebuild
new file mode 100644
index 000000000000..685ae8de494f
--- /dev/null
+++ b/dev-java/bcutil/bcutil-1.72.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.bouncycastle:bcutil-jdk18on:1.72"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Java APIs for ASN.1 extension and utility APIs used to support bcpkix and bctls"
+HOMEPAGE="https://www.bouncycastle.org/java.html"
+SRC_URI="https://github.com/bcgit/bc-java/archive/r${PV/./rv}.tar.gz -> bc-java-r${PV/./rv}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+CDEPEND="~dev-java/bcprov-${PV}:0"
+DEPEND="${CDEPEND}
+ >=virtual/jdk-11:*"
+RDEPEND="${CDEPEND}
+ >=virtual/jre-1.8:*"
+
+DOCS=( ../{README,SECURITY}.md )
+HTML_DOCS=( ../{CONTRIBUTORS,index}.html )
+
+S="${WORKDIR}/bc-java-r${PV/./rv}/util"
+
+JAVA_GENTOO_CLASSPATH="bcprov"
+JAVA_SRC_DIR=(
+ "src/main/java"
+ "src/main/jdk1.9"
+)
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_SRC_DIR="src/test/java"
+JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+
+JAVA_TEST_RUN_ONLY=(
+ "org.bouncycastle.asn1.util.test.AllTests"
+ "org.bouncycastle.oer.test.AllTests"
+)
+
+src_prepare() {
+ default
+ java-pkg_clean ..
+}
+
+src_install() {
+ docinto html
+ dodoc -r ../docs
+ java-pkg-simple_src_install
+}
diff --git a/dev-java/browserlauncher2/browserlauncher2-1.3-r2.ebuild b/dev-java/browserlauncher2/browserlauncher2-1.3-r2.ebuild
deleted file mode 100644
index 7f2370c1c9c6..000000000000
--- a/dev-java/browserlauncher2/browserlauncher2-1.3-r2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-MY_PV="$(ver_rs 1- _)"
-
-DESCRIPTION="A library that facilitates opening a browser from a Java application"
-HOMEPAGE="http://browserlaunch2.sourceforge.net/"
-SRC_URI="https://downloads.sourceforge.net/project/browserlaunch2/browserlauncher2/${PV}/BrowserLauncher2-all-${MY_PV}.jar"
-
-LICENSE="LGPL-2.1"
-SLOT="1.0"
-KEYWORDS="amd64 ppc64 x86"
-
-DEPEND=">=virtual/jdk-1.8:*"
-RDEPEND=">=virtual/jre-1.8:*"
-BDEPEND="app-arch/unzip"
-
-S="${WORKDIR}"
-
-src_prepare() {
- default
- unpack ${A}
- find . -name "*.class" -exec rm -v {} \; || die
- # fixing build.xml
- sed -i -e "s: includes=\"\*\*/\*\.class\"::g" "${S}/build.xml" || die
-
- iconv -f ISO-8859-1 -t UTF8 -o "${S}/source/at/jta/Regor.java~" \
- "${S}/source/at/jta/Regor.java" || die "recoding failed"
- mv -f "${S}"/source/at/jta/Regor.java{~,} || die "cannot rename"
-}
-
-EANT_BUILD_TARGET="build"
-EANT_DOC_TARGET="api"
-
-src_install() {
- java-pkg_newjar deployment/*.jar
- java-pkg_dolauncher BrowserLauncherTestApp-${SLOT} \
- --main "edu.stanford.ejalbert.testing.BrowserLauncherTestApp"
-
- dodoc README*
- use doc && java-pkg_dojavadoc api
- use source && java-pkg_dosrc source
-}
diff --git a/dev-java/browserlauncher2/browserlauncher2-1.3-r3.ebuild b/dev-java/browserlauncher2/browserlauncher2-1.3-r3.ebuild
new file mode 100644
index 000000000000..6e0be61baf7e
--- /dev/null
+++ b/dev-java/browserlauncher2/browserlauncher2-1.3-r3.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="A library that facilitates opening a browser from a Java application"
+HOMEPAGE="https://browserlaunch2.sourceforge.net/"
+SRC_URI="https://downloads.sourceforge.net/project/browserlaunch2/browserlauncher2/${PV}/BrowserLauncher2-all-${PV//./_}.jar"
+
+LICENSE="LGPL-2.1"
+SLOT="1.0"
+KEYWORDS="amd64 ppc64 x86"
+
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
+BDEPEND="app-arch/unzip"
+
+JAVA_SRC_DIR="source"
+JAVA_RESOURCE_DIRS="resources"
+JAVA_MAIN_CLASS="edu.stanford.ejalbert.testing.BrowserLauncherTestApp"
+JAVA_ENCODING="ISO-8859-1"
+
+src_prepare() {
+ default
+ java-pkg_clean
+
+ cp -r source resources || die "Cannot create resources dir"
+ find resources -type f ! -name '*.properties' -exec rm -rf {} + || die
+}
diff --git a/dev-java/byaccj/byaccj-1.15-r3.ebuild b/dev-java/byaccj/byaccj-1.15-r3.ebuild
index 9feb822145a5..70d92d0ce0ef 100644
--- a/dev-java/byaccj/byaccj-1.15-r3.ebuild
+++ b/dev-java/byaccj/byaccj-1.15-r3.ebuild
@@ -5,8 +5,8 @@ EAPI=8
inherit toolchain-funcs
-DESCRIPTION="A java extension of BSD YACC-compatible parser generator"
-HOMEPAGE="http://byaccj.sourceforge.net/"
+DESCRIPTION="A Java extension of BSD YACC-compatible parser generator"
+HOMEPAGE="https://byaccj.sourceforge.net/"
MY_P="${PN}${PV}_src"
SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
diff --git a/dev-java/byte-buddy-agent/Manifest b/dev-java/byte-buddy-agent/Manifest
deleted file mode 100644
index c34703014fee..000000000000
--- a/dev-java/byte-buddy-agent/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST byte-buddy-1.12.10.tar.gz 149932619 BLAKE2B dce562c72fce2b4c6f7d7b49192297929c6828b5157db81825199eb6636a6aadfa27240cf69e6ebfef7e809b35aec0037461ec4b30c7633cb700f55458238058 SHA512 5f8c9e94e3661978e51134a65842e376b96acfe25e940c565a2647bec54bb7c40b12501b590019270ce470efc4ca8f4dd0a7ffe7c6d5d2854b768c28c84920a6
-DIST byte-buddy-agent-1.12.10-sources.jar 204651 BLAKE2B f3e0db8e6c8f3380ee3bfd8969555c331689990b97e91206567c01ffbaabc58eeb25b0879e792ebce1044afa8d3b5596830349d9c233ab1af84d13213e046f4d SHA512 8569531e5f5343378037cd9740bdc42b91becb9adaf0f2cacbdcb0e5ccafb3e47fce9c7b71d8d8d8df1c7373ffd44d798b8b164136d87913faed1e19474f803d
diff --git a/dev-java/byte-buddy-agent/byte-buddy-agent-1.12.10.ebuild b/dev-java/byte-buddy-agent/byte-buddy-agent-1.12.10.ebuild
deleted file mode 100644
index dd14f79475bf..000000000000
--- a/dev-java/byte-buddy-agent/byte-buddy-agent-1.12.10.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom byte-buddy-agent-1.12.10.pom --download-uri https://repo1.maven.org/maven2/net/bytebuddy/byte-buddy-agent/1.12.10/byte-buddy-agent-1.12.10.jar --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild byte-buddy-agent-1.12.10.ebuild
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="net.bytebuddy:byte-buddy-agent:1.12.10"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Offers convenience for attaching an agent to the local or a remote VM"
-HOMEPAGE="https://bytebuddy.net/"
-SRC_URI="https://repo1.maven.org/maven2/net/bytebuddy/${PN}/${PV}/${P}-sources.jar
- test? ( https://github.com/raphw/byte-buddy/archive/byte-buddy-${PV}.tar.gz )"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-# Compile dependencies
-# POM: ${P}.pom
-# com.google.code.findbugs:findbugs-annotations:3.0.1 -> >=dev-java/findbugs-annotations-3.0.1:0
-# com.google.code.findbugs:jsr305:3.0.2 -> >=dev-java/jsr305-3.0.2:0
-# net.java.dev.jna:jna:5.8.0 -> >=dev-java/jna-5.10.0:4
-# net.java.dev.jna:jna-platform:5.8.0 -> !!!artifactId-not-found!!!
-
-DEPEND="
- >=virtual/jdk-1.8:*
- dev-java/findbugs-annotations:0
- dev-java/jna:4
- test? ( dev-java/mockito:4 )
-"
-
-RDEPEND="
- >=virtual/jre-1.8:*
-"
-
-BDEPEND="app-arch/unzip"
-
-S="${WORKDIR}"
-
-JAVA_CLASSPATH_EXTRA="findbugs-annotations,jna-4"
-JAVA_SRC_DIR="src/main/java"
-
-JAVA_TEST_GENTOO_CLASSPATH="junit-4,mockito-4"
-JAVA_TEST_SRC_DIR="src/test/java"
-
-# 1) testSystemProperties(net.bytebuddy.agent.VirtualMachineAttachmentTest)
-# java.lang.reflect.InvocationTargetException
-# --
-# Caused by: java.lang.UnsatisfiedLinkError: Native library (com/sun/jna/linux-x86-64/libjnidispatch.so) not found in resource path (target/test-classes:byte-buddy-agent.jar:/usr/share/findbugs-annotations/lib/findbugs-annotations.jar:/usr/share/jna-4/lib/jna.jar:/usr/share/jna-4/lib/jna-platform.jar:/usr/share/jsr305/lib/jsr305.jar:/usr/share/junit-4/lib/junit.jar:/usr/share/mockito-4/lib/mockito.jar:/usr/share/hamcrest-core-1.3/lib/hamcrest-core.jar:/usr/share/byte-buddy/lib/byte-buddy.jar:/usr/share/byte-buddy-agent/lib/byte-buddy-agent.jar:/usr/share/objenesis/lib/objenesis.jar:/usr/share/opentest4j/lib/opentest4j.jar:/usr/share/junit-4/lib/junit.jar:/usr/share/hamcrest-core-1.3/lib/hamcrest-core.jar)
-# at com.sun.jna.Native.loadNativeDispatchLibraryFromClasspath(Native.java:1059)
-# --
-# 2) testAgentProperties(net.bytebuddy.agent.VirtualMachineAttachmentTest)
-# java.lang.reflect.InvocationTargetException
-# --
-# Caused by: java.lang.NoClassDefFoundError: Could not initialize class com.sun.jna.Native
-# at net.bytebuddy.agent.VirtualMachine$ForHotSpot$Connection$ForJnaPosixSocket$Factory.<init>(VirtualMachine.java:879)
-# --
-# 3) testMultipleProperties(net.bytebuddy.agent.VirtualMachineAttachmentTest)
-# java.lang.reflect.InvocationTargetException
-# --
-# Caused by: java.lang.NoClassDefFoundError: Could not initialize class com.sun.jna.Native
-# at net.bytebuddy.agent.VirtualMachine$ForHotSpot$Connection$ForJnaPosixSocket$Factory.<init>(VirtualMachine.java:879)
-# --
-# 4) testAttachment(net.bytebuddy.agent.VirtualMachineAttachmentTest)
-# java.lang.reflect.InvocationTargetException
-# --
-# Caused by: java.lang.NoClassDefFoundError: Could not initialize class com.sun.jna.Native
-# at net.bytebuddy.agent.VirtualMachine$ForHotSpot$Connection$ForJnaPosixSocket$Factory.<init>(VirtualMachine.java:879)
-# --
-# FAILURES!!!
-# Tests run: 51, Failures: 4
-JAVA_TEST_EXCLUDES="net.bytebuddy.agent.VirtualMachineAttachmentTest"
-
-src_prepare() {
- default
- mkdir -p "src/main/java" || die
- mv "net" "src/main/java" || die
- if use test; then
- mv "byte-buddy-byte-buddy-${PV}/byte-buddy-agent/src/test" "src" || die
- fi
-}
diff --git a/dev-java/byte-buddy/Manifest b/dev-java/byte-buddy/Manifest
index fffac52846d5..42657532e069 100644
--- a/dev-java/byte-buddy/Manifest
+++ b/dev-java/byte-buddy/Manifest
@@ -1,3 +1,2 @@
-DIST byte-buddy-1.12.10-sources.jar 1331398 BLAKE2B 8732ac81514de40d3d2ffd67ddca05ab9b8a5d0a7f240ee4591fd02b41f410f9e834f389aa898829fbae6082e14a090f87052f537b2b6293c7f8f98d4a5d0583 SHA512 15cb4330598d9259afa29aac0317f8e0e003eb76fb26052bba0714ad30453db721938be7d46fcc6a0c7bbe124bffe68dfee6fcf11a3e4030e99ef01d0ae3d461
-DIST byte-buddy-1.12.12.tar.gz 149937318 BLAKE2B 1a1bd0de97b47ace4c64649da3ae80dcb421a4d46e9b4f66e121accad94a99a2b81fa9aeaca99ae14cf1ef56feff5248d5700d6b056d490563bbc7ae9f07ace9 SHA512 bd8dc5b86ce456d5a907dd23643233bb001c15df5419aeed177d3b4f8054ab172d13244d0b3fef734e8232dfdd9339745d8112fa69e0be566b62459c198bf67a
-DIST byte-buddy-1.12.13.tar.gz 1721038 BLAKE2B 60aadbbb3b56e5ac2ecc2bb162653b769f4d4b913bd675457ce2fbf12a5777addc4beb2bb2e347d5956dbf1fbe6a6dfce078a29c53b1f1e2a60585670897d4ee SHA512 88c221d0dccb248683069070e498c5d4320f4fce059c45f460e04fbd86c2c596c18a4c7f4e9b3a0480eaf96d93593d1f1af87d894a7c4b3d73511e88a95f4e92
+DIST byte-buddy-1.12.14.tar.gz 1857258 BLAKE2B 6957246f6689d1bdfdc6277ad752e03df0ae47c62b0afded77c94cdd41e00cc736517d0e4e5d5f8c59be519262a03864cde9bffa4ae53e5a7daeed84a519967f SHA512 5035be16fbdf2f7e8e2c93b87ee5f9adc927a19fd3b7d9fcd262906d8d21532cef8111084c3d6d0b75e101df0bfee19bf9177bc6a7d4b18cf0f26146fba4f147
+DIST byte-buddy-1.12.18.tar.gz 1924438 BLAKE2B 278ac97d60e62c7d44142a01da94113b29b483bff532f08fca7e345f383a4ddf83cb8c4d0544bce1879bb26909d048a76562cd816c4e9cb06695127ed849f08c SHA512 637e041f97981b85cd13ffecb0de47206b5c99d8b98561561414d8a599f5d53a6e047ba3ad9bc88ca030125221df3ebe49d6eff18a4093f4027d8cbf34a483b0
diff --git a/dev-java/byte-buddy/byte-buddy-1.12.10.ebuild b/dev-java/byte-buddy/byte-buddy-1.12.10.ebuild
deleted file mode 100644
index 482eea806388..000000000000
--- a/dev-java/byte-buddy/byte-buddy-1.12.10.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom byte-buddy-1.12.10.pom --download-uri https://repo1.maven.org/maven2/net/bytebuddy/byte-buddy/1.12.10/byte-buddy-1.12.10-sources.jar --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild byte-buddy-1.12.10.ebuild
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source"
-MAVEN_ID="net.bytebuddy:byte-buddy:1.12.10"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Byte Buddy is a Java library for creating Java classes at run time"
-HOMEPAGE="https://bytebuddy.net/"
-SRC_URI="https://repo1.maven.org/maven2/net/bytebuddy/${PN}/${PV}/${P}-sources.jar"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-# Compile dependencies
-# POM: ${P}.pom
-# com.google.code.findbugs:findbugs-annotations:3.0.1 -> >=dev-java/findbugs-annotations-3.0.1:0
-# com.google.code.findbugs:jsr305:3.0.2 -> >=dev-java/jsr305-3.0.2:0
-# net.java.dev.jna:jna:5.8.0 -> >=dev-java/jna-5.10.0:4
-# net.java.dev.jna:jna-platform:5.8.0 -> !!!artifactId-not-found!!!
-
-DEPEND="
- >=virtual/jdk-1.8:*
- dev-java/findbugs-annotations:0
- >=dev-java/jna-5.10.0:4
-"
-
-RDEPEND="
- >=virtual/jre-1.8:*
-"
-
-BDEPEND="app-arch/unzip"
-
-S="${WORKDIR}"
-
-JAVA_CLASSPATH_EXTRA="findbugs-annotations,jna-4"
-
-src_prepare() {
- default
- java-pkg_clean
-}
diff --git a/dev-java/byte-buddy/byte-buddy-1.12.12.ebuild b/dev-java/byte-buddy/byte-buddy-1.12.12.ebuild
deleted file mode 100644
index 6a3353c6c3d1..000000000000
--- a/dev-java/byte-buddy/byte-buddy-1.12.12.ebuild
+++ /dev/null
@@ -1,176 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/raphw/byte-buddy/archive/byte-buddy-1.12.12.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild byte-buddy-1.12.12.ebuild
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="net.bytebuddy:byte-buddy-agent:1.12.12"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Offers convenience for attaching an agent to the local or a remote VM"
-HOMEPAGE="https://bytebuddy.net"
-SRC_URI="https://github.com/raphw/${PN}/archive/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-
-DEPEND="
- >=virtual/jdk-11:*
- dev-java/asm:9
- dev-java/findbugs-annotations:0
- dev-java/jna:4
- dev-java/jsr305:0
- test? (
- dev-java/mockito:4
- )
-"
-
-RDEPEND="
- >=virtual/jre-1.8:*
-"
-
-S="${WORKDIR}/${PN}-${P}"
-
-JAVA_CLASSPATH_EXTRA="asm-9,findbugs-annotations,jsr305,jna-4"
-
-src_prepare() {
- default
- # https://github.com/raphw/byte-buddy/blob/byte-buddy-1.12.12/byte-buddy-agent/pom.xml#L132-L165
- cat > byte-buddy-agent/src/main/java/module-info.java <<-EOF
- module net.bytebuddy.agent {
- requires java.instrument;
- requires static jdk.attach;
- requires static com.sun.jna;
- requires static com.sun.jna.platform;
- requires java.base;
- exports net.bytebuddy.agent;
- exports net.bytebuddy.agent.utility.nullability;
- }
- EOF
-
- sed \
- -e 's:verifyZeroInteractions:verifyNoInteractions:g' \
- -i byte-buddy-dep/src/test/java/net/bytebuddy/*.java \
- -i byte-buddy-dep/src/test/java/net/bytebuddy/*/*Test.java \
- -i byte-buddy-dep/src/test/java/net/bytebuddy/*/*/*Test.java \
- -i byte-buddy-dep/src/test/java/net/bytebuddy/*/*/*/*Test.java \
- -i byte-buddy-dep/src/test/java/net/bytebuddy/*/*/*/*/*Test.java \
- || die
-}
-
-src_compile() {
- einfo "Compiling byte-buddy-agent.jar"
- JAVA_SRC_DIR="byte-buddy-agent/src/main/java"
- JAVA_RESOURCE_DIRS="byte-buddy-agent/src/main/resources"
- JAVA_JAR_FILENAME="byte-buddy-agent.jar"
- java-pkg-simple_src_compile
- JAVA_GENTOO_CLASSPATH_EXTRA+=":byte-buddy-agent.jar"
- rm -r target || die
-
-# For pkgdiff to compare the content of module-info.class
-# mkdir -p META-INF/versions/9 || die
-# cp target/classes/module-info.class META-INF/versions/9/ || die
-# jar -uf byte-buddy.jar -C . META-INF/versions/9/module-info.class || die
-
- einfo "Compiling byte-buddy-dep.jar"
- JAVA_SRC_DIR="byte-buddy-dep/src/main/java"
- JAVA_RESOURCE_DIRS="byte-buddy-dep/src/main/resources"
- JAVA_JAR_FILENAME="byte-buddy-dep.jar"
- java-pkg-simple_src_compile
- JAVA_GENTOO_CLASSPATH_EXTRA+=":byte-buddy-dep.jar"
- rm -r target || die
-
- if use doc; then
- einfo "Compiling javadocs"
- JAVA_SRC_DIR=(
- "byte-buddy-agent/src/main/java"
- "byte-buddy-dep/src/main/java"
- )
- JAVA_JAR_FILENAME="ignoreme.jar"
- java-pkg-simple_src_compile
- fi
-}
-
-src_test() {
- JAVA_TEST_GENTOO_CLASSPATH="junit-4,mockito-4"
-
- # einfo "Setting -Djava.library.path"
- # This would work only after manually adding libjnidispatch.so to /usr/share/jna-4/lib/jna.jar,
- # done with ( jar -uf /usr/share/jna-4/lib/jna.jar -C . com/sun/jna/linux-x86-64/libjnidispatch )
-# JAVA_TEST_EXTRA_ARGS=( -Djava.library.path+="$(java-config -i jna-4)" com.sun.jna.Native )
- # Otherwise fails with:
- # Exception in thread "main" java.lang.UnsatisfiedLinkError: Native library (com/sun/jna/linux-x86-64/libjnidispatch.so) not found in resource path
-
- einfo "Testing byte-buddy-agent"
- JAVA_TEST_SRC_DIR="byte-buddy-agent/src/test/java"
- # Native library (com/sun/jna/linux-x86-64/libjnidispatch.so) not found in resource path
- JAVA_TEST_EXCLUDES=( net.bytebuddy.agent.VirtualMachineAttachmentTest )
- java-pkg-simple_src_test
-
- einfo "Testing byte-buddy-dep"
- JAVA_TEST_SRC_DIR="byte-buddy-dep/src/test/java"
- JAVA_TEST_RESOURCE_DIRS="byte-buddy-dep/src/test/resources"
-
- # what "mvn test" does with java 17 is:
- # Tests run: 9836, Failures: 0, Errors: 0, Skipped: 0
-
- # 1) testTypeVariableTypeAnnotationRuntimeRetention[0](net.bytebuddy.implementation.attribute.MethodAttributeAppenderForInstrumentedMethodTest)
- # org.mockito.exceptions.verification.NoInteractionsWanted:
- # --
- # 2) testTypeVariableTypeAnnotationRuntimeRetention[1](net.bytebuddy.implementation.attribute.MethodAttributeAppenderForInstrumentedMethodTest)
- # org.mockito.exceptions.verification.NoInteractionsWanted:
- # --
- # 3) testAnnotationClassFileRetention(net.bytebuddy.implementation.attribute.TypeAttributeAppenderForInstrumentedTypeDifferentiatingTest)
- # org.mockito.exceptions.verification.NoInteractionsWanted:
- # --
- # 4) testAnnotationByteCodeRetention(net.bytebuddy.implementation.attribute.TypeAttributeAppenderForInstrumentedTypeDifferentiatingTest)
- # org.mockito.exceptions.verification.NoInteractionsWanted:
- # --
- # 5) testAnnotationClassFileRetention(net.bytebuddy.implementation.attribute.TypeAttributeAppenderForInstrumentedTypeTest)
- # org.mockito.exceptions.verification.NoInteractionsWanted:
- # --
- # 6) testAnnotationByteCodeRetention(net.bytebuddy.implementation.attribute.TypeAttributeAppenderForInstrumentedTypeTest)
- # org.mockito.exceptions.verification.NoInteractionsWanted:
- # --
- # 7) testChildSecond(net.bytebuddy.pool.TypePoolDefaultHierarchyTest)
- # org.mockito.exceptions.verification.NoInteractionsWanted:
- # --
- # 8) testNoParameterNameAndModifiers(net.bytebuddy.pool.TypePoolDefaultMethodDescriptionTest)
- # java.lang.AssertionError:
- # --
- # 9) testSimpleApplication(net.bytebuddy.description.type.TypeInitializerTest)
- # org.mockito.exceptions.verification.NoInteractionsWanted:
- # --
- # 10) testRedefinitionChunkedOneFailsResubmit(net.bytebuddy.agent.builder.AgentBuilderDefaultTest)
- # org.mockito.exceptions.verification.NoInteractionsWanted:
- JAVA_TEST_EXCLUDES+=(
- net.bytebuddy.implementation.attribute.MethodAttributeAppenderForInstrumentedMethodTest
- net.bytebuddy.implementation.attribute.TypeAttributeAppenderForInstrumentedTypeDifferentiatingTest
- net.bytebuddy.implementation.attribute.TypeAttributeAppenderForInstrumentedTypeTest
- net.bytebuddy.pool.TypePoolDefaultHierarchyTest
- net.bytebuddy.pool.TypePoolDefaultMethodDescriptionTest
- net.bytebuddy.description.type.TypeInitializerTest
- net.bytebuddy.agent.builder.AgentBuilderDefaultTest
- )
- java-pkg-simple_src_test
-}
-
-src_install() {
- java-pkg_dojar "byte-buddy-agent.jar"
- java-pkg_dojar "byte-buddy-dep.jar"
-
- if use doc; then
- java-pkg_dojavadoc target/api
- fi
-
- if use source; then
- java-pkg_dosrc "byte-buddy-agent/src/main/java/*"
- java-pkg_dosrc "byte-buddy-dep/src/main/java/*"
- fi
-}
diff --git a/dev-java/byte-buddy/byte-buddy-1.12.13.ebuild b/dev-java/byte-buddy/byte-buddy-1.12.14.ebuild
index c5c66b0dfca9..76862e0b7298 100644
--- a/dev-java/byte-buddy/byte-buddy-1.12.13.ebuild
+++ b/dev-java/byte-buddy/byte-buddy-1.12.14.ebuild
@@ -2,12 +2,12 @@
# Distributed under the terms of the GNU General Public License v2
# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/raphw/byte-buddy/archive/byte-buddy-1.12.13.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild byte-buddy-1.12.13.ebuild
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/raphw/byte-buddy/archive/byte-buddy-1.12.14.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild byte-buddy-1.12.14.ebuild
EAPI=8
JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="net.bytebuddy:byte-buddy-agent:1.12.13"
+MAVEN_ID="net.bytebuddy:byte-buddy-agent:1.12.14"
JAVA_TESTING_FRAMEWORKS="junit-4"
inherit java-pkg-2 java-pkg-simple
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/raphw/${PN}/archive/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
DEPEND="
>=virtual/jdk-11:*
@@ -31,9 +31,7 @@ DEPEND="
)
"
-RDEPEND="
- >=virtual/jre-1.8:*
-"
+RDEPEND=">=virtual/jre-1.8:*"
S="${WORKDIR}/${PN}-${P}"
@@ -46,7 +44,7 @@ JAVA_CLASSPATH_EXTRA="
src_prepare() {
default
- # https://github.com/raphw/byte-buddy/blob/byte-buddy-1.12.12/byte-buddy-agent/pom.xml#L132-L165
+ # https://github.com/raphw/byte-buddy/blob/byte-buddy-1.12.14/byte-buddy-agent/pom.xml#L132-L166
cat > byte-buddy-agent/src/main/java/module-info.java <<-EOF
module net.bytebuddy.agent {
requires java.instrument;
@@ -59,6 +57,7 @@ src_prepare() {
}
EOF
+ # adjustment for recent mockito versions
sed \
-e 's:verifyZeroInteractions:verifyNoInteractions:g' \
-i byte-buddy-dep/src/test/java/net/bytebuddy/*.java \
@@ -67,6 +66,61 @@ src_prepare() {
-i byte-buddy-dep/src/test/java/net/bytebuddy/*/*/*/*Test.java \
-i byte-buddy-dep/src/test/java/net/bytebuddy/*/*/*/*/*Test.java \
|| die
+
+ # instead of shading byte-buddy-dep we move it into byte-buddy.
+ mv byte-buddy{-dep,}/src/main/java || die "cannot move sources"
+ mv byte-buddy{-dep,}/src/test || die "cannot move tests"
+
+ # https://github.com/raphw/byte-buddy/blob/byte-buddy-1.12.14/byte-buddy/pom.xml#L159-L195
+ cat > byte-buddy/src/main/java/module-info.java <<-EOF
+ module net.bytebuddy {
+ requires static java.instrument;
+ requires static java.management;
+ requires static jdk.unsupported;
+ requires static net.bytebuddy.agent;
+ requires static com.sun.jna;
+ requires static com.sun.jna.platform;
+ requires java.base;
+ exports net.bytebuddy;
+ exports net.bytebuddy.agent.builder;
+ exports net.bytebuddy.asm;
+ exports net.bytebuddy.build;
+ exports net.bytebuddy.description;
+ exports net.bytebuddy.description.annotation;
+ exports net.bytebuddy.description.enumeration;
+ exports net.bytebuddy.description.field;
+ exports net.bytebuddy.description.method;
+ exports net.bytebuddy.description.modifier;
+ exports net.bytebuddy.description.type;
+ exports net.bytebuddy.dynamic;
+ exports net.bytebuddy.dynamic.loading;
+ exports net.bytebuddy.dynamic.scaffold;
+ exports net.bytebuddy.dynamic.scaffold.inline;
+ exports net.bytebuddy.dynamic.scaffold.subclass;
+ exports net.bytebuddy.implementation;
+ exports net.bytebuddy.implementation.attribute;
+ exports net.bytebuddy.implementation.auxiliary;
+ exports net.bytebuddy.implementation.bind;
+ exports net.bytebuddy.implementation.bind.annotation;
+ exports net.bytebuddy.implementation.bytecode;
+ exports net.bytebuddy.implementation.bytecode.assign;
+ exports net.bytebuddy.implementation.bytecode.assign.primitive;
+ exports net.bytebuddy.implementation.bytecode.assign.reference;
+ exports net.bytebuddy.implementation.bytecode.collection;
+ exports net.bytebuddy.implementation.bytecode.constant;
+ exports net.bytebuddy.implementation.bytecode.member;
+ exports net.bytebuddy.matcher;
+ exports net.bytebuddy.pool;
+ exports net.bytebuddy.utility;
+ exports net.bytebuddy.utility.nullability;
+ exports net.bytebuddy.utility.privilege;
+ exports net.bytebuddy.utility.visitor;
+ }
+ EOF
+ # We don't bundle, hence cannot export them
+ # exports net.bytebuddy.jar.asm;
+ # exports net.bytebuddy.jar.asm.signature;
+ # exports net.bytebuddy.jar.asm.commons;
}
src_compile() {
@@ -78,17 +132,13 @@ src_compile() {
JAVA_GENTOO_CLASSPATH_EXTRA+=":byte-buddy-agent.jar"
rm -r target || die
-# For pkgdiff to compare the content of module-info.class
-# mkdir -p META-INF/versions/9 || die
-# cp target/classes/module-info.class META-INF/versions/9/ || die
-# jar -uf byte-buddy.jar -C . META-INF/versions/9/module-info.class || die
-
- einfo "Compiling byte-buddy-dep.jar"
- JAVA_SRC_DIR="byte-buddy-dep/src/main/java"
+ einfo "Compiling byte-buddy.jar"
+ JAVA_SRC_DIR="byte-buddy/src/main/java"
JAVA_RESOURCE_DIRS=()
- JAVA_JAR_FILENAME="byte-buddy-dep.jar"
+ JAVA_JAR_FILENAME="byte-buddy.jar"
+ JAVA_MAIN_CLASS="net.bytebuddy.build.Plugin\$Engine\$Default"
java-pkg-simple_src_compile
- JAVA_GENTOO_CLASSPATH_EXTRA+=":byte-buddy-dep.jar"
+ JAVA_GENTOO_CLASSPATH_EXTRA+=":byte-buddy.jar"
rm -r target || die
if use doc; then
@@ -120,27 +170,26 @@ src_test() {
)
java-pkg-simple_src_test
- einfo "Testing byte-buddy-dep"
- JAVA_TEST_SRC_DIR="byte-buddy-dep/src/test/java"
+ einfo "Testing byte-buddy"
+ JAVA_TEST_SRC_DIR="byte-buddy/src/test/java"
JAVA_TEST_RESOURCE_DIRS=(
- byte-buddy-dep/src/test/resources
- byte-buddy-dep/src/test/precompiled*
+ byte-buddy/src/test/resources
+ byte-buddy/src/test/precompiled*
)
# what "mvn test" does with java 17 is:
- # Tests run: 9855, Failures: 0, Errors: 0, Skipped: 0
+ # Tests run: 10022, Failures: 0, Errors: 0, Skipped: 0
JAVA_TEST_EXCLUDES+=(
net.bytebuddy.pool.TypePoolDefaultMethodDescriptionTest # 39 tests
- # v1.12.13
net.bytebuddy.build.CachedReturnPluginTest # 44 tests
- net.bytebuddy.build.CachedReturnPluginOtherTest # 4 tests
+ net.bytebuddy.build.CachedReturnPluginOtherTest # 4 tests
)
java-pkg-simple_src_test
}
src_install() {
java-pkg_dojar "byte-buddy-agent.jar"
- java-pkg_dojar "byte-buddy-dep.jar"
+ java-pkg_dojar "byte-buddy.jar"
if use doc; then
java-pkg_dojavadoc target/api
@@ -148,6 +197,6 @@ src_install() {
if use source; then
java-pkg_dosrc "byte-buddy-agent/src/main/java/*"
- java-pkg_dosrc "byte-buddy-dep/src/main/java/*"
+ java-pkg_dosrc "byte-buddy/src/main/java/*"
fi
}
diff --git a/dev-java/byte-buddy/byte-buddy-1.12.18.ebuild b/dev-java/byte-buddy/byte-buddy-1.12.18.ebuild
new file mode 100644
index 000000000000..847b00aff70c
--- /dev/null
+++ b/dev-java/byte-buddy/byte-buddy-1.12.18.ebuild
@@ -0,0 +1,175 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/raphw/byte-buddy/archive/byte-buddy-1.12.18.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild byte-buddy-1.12.18.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="net.bytebuddy:byte-buddy-agent:1.12.18"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Offers convenience for attaching an agent to the local or a remote VM"
+HOMEPAGE="https://bytebuddy.net"
+SRC_URI="https://github.com/raphw/byte-buddy/archive/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+DEPEND="
+ >=virtual/jdk-11:*
+ dev-java/asm:9
+ dev-java/findbugs-annotations:0
+ dev-java/jna:4
+ dev-java/jsr305:0
+ test? (
+ dev-java/mockito:4
+ )
+"
+
+RDEPEND=">=virtual/jre-1.8:*"
+
+PATCHES=(
+ "${FILESDIR}/byte-buddy-1.12.18-not-java20.patch"
+)
+
+S="${WORKDIR}/byte-buddy-${P}"
+
+JAVA_CLASSPATH_EXTRA="
+ asm-9
+ findbugs-annotations
+ jsr305
+ jna-4
+"
+
+src_prepare() {
+ default
+ # https://github.com/raphw/byte-buddy/blob/byte-buddy-1.12.18/byte-buddy-agent/pom.xml#L142-L176
+ cat > byte-buddy-agent/src/main/java/module-info.java <<-EOF || die
+ module net.bytebuddy.agent {
+ requires java.instrument;
+ requires static jdk.attach;
+ requires static com.sun.jna;
+ requires static com.sun.jna.platform;
+ requires java.base;
+ exports net.bytebuddy.agent;
+ exports net.bytebuddy.agent.utility.nullability;
+ }
+ EOF
+
+ # adjustment for recent mockito versions
+ sed \
+ -e 's:verifyZeroInteractions:verifyNoInteractions:g' \
+ -i byte-buddy-dep/src/test/java/net/bytebuddy/*.java \
+ -i byte-buddy-dep/src/test/java/net/bytebuddy/*/*Test.java \
+ -i byte-buddy-dep/src/test/java/net/bytebuddy/*/*/*Test.java \
+ -i byte-buddy-dep/src/test/java/net/bytebuddy/*/*/*/*Test.java \
+ -i byte-buddy-dep/src/test/java/net/bytebuddy/*/*/*/*/*Test.java \
+ || die
+
+ # instead of shading byte-buddy-dep we move it into byte-buddy.
+ mv byte-buddy{-dep,}/src/main/java || die "cannot move sources"
+
+ # https://github.com/raphw/byte-buddy/blob/byte-buddy-1.12.18/byte-buddy/pom.xml#L159-L195
+ local exports="$( \
+ sed -n '/<packages.list.external>/,/<\/packages.list.external/p' \
+ byte-buddy/pom.xml \
+ | sed -e 's:^:exports :' -e 's:,:;:' \
+ | grep -v 'packages.list.external\|shade' | tr -s '[:space:]' \
+ )" || die
+ cat > byte-buddy/src/main/java/module-info.java <<-EOF || die
+ module net.bytebuddy {
+ requires static java.instrument;
+ requires static java.management;
+ requires static jdk.unsupported;
+ requires static net.bytebuddy.agent;
+ requires static com.sun.jna;
+ requires static com.sun.jna.platform;
+ requires java.base;
+ ${exports}
+ }
+ EOF
+}
+
+src_compile() {
+ einfo "Compiling byte-buddy-agent.jar"
+ JAVA_JAR_FILENAME="byte-buddy-agent.jar"
+ JAVA_RESOURCE_DIRS="byte-buddy-agent/src/main/resources"
+ JAVA_SRC_DIR="byte-buddy-agent/src/main/java"
+ java-pkg-simple_src_compile
+ JAVA_GENTOO_CLASSPATH_EXTRA+=":byte-buddy-agent.jar"
+ rm -r target || die
+
+ einfo "Compiling byte-buddy.jar"
+ JAVA_JAR_FILENAME="byte-buddy.jar"
+ JAVA_MAIN_CLASS="net.bytebuddy.build.Plugin\$Engine\$Default"
+ JAVA_RESOURCE_DIRS=()
+ JAVA_SRC_DIR="byte-buddy/src/main/java"
+ java-pkg-simple_src_compile
+ JAVA_GENTOO_CLASSPATH_EXTRA+=":byte-buddy.jar"
+ rm -r target || die
+
+ if use doc; then
+ einfo "Compiling javadocs"
+ rm byte-buddy-agent/src/main/java/module-info.java || die
+ JAVA_SRC_DIR=(
+ "byte-buddy-agent/src/main/java"
+ "byte-buddy/src/main/java"
+ )
+ JAVA_JAR_FILENAME="ignoreme.jar"
+ java-pkg-simple_src_compile
+ fi
+}
+
+src_test() {
+ # instead of shading byte-buddy-dep we move it into byte-buddy.
+ mv byte-buddy{-dep,}/src/test || die "cannot move tests"
+
+ # @Ignore one of 4 tests, https://bugs.gentoo.org/863386
+ sed \
+ -e '/import org.junit.Test/a import org.junit.Ignore;' \
+ -e '/testIgnoreExistingField()/i @Ignore' \
+ -i byte-buddy/src/test/java/net/bytebuddy/build/CachedReturnPluginOtherTest.java || die
+
+ # @Ignore one of 39 tests, https://bugs.gentoo.org/863386
+ sed \
+ -e '/import org.junit.Test/a import org.junit.Ignore;' \
+ -e '/testNoParameterNameAndModifiers()/i @Ignore' \
+ -i byte-buddy/src/test/java/net/bytebuddy/description/method/AbstractMethodDescriptionTest.java || die
+
+ JAVA_TEST_GENTOO_CLASSPATH="junit-4,mockito-4"
+
+ einfo "Testing byte-buddy-agent"
+ # https://github.com/raphw/byte-buddy/issues/1321#issuecomment-1252776459
+ JAVA_TEST_EXTRA_ARGS=( -Dnet.bytebuddy.test.jnapath="${EPREFIX}/usr/$(get_libdir)/jna-4/" )
+ JAVA_TEST_SRC_DIR="byte-buddy-agent/src/test/java"
+ java-pkg-simple_src_test
+
+ einfo "Testing byte-buddy"
+ JAVA_TEST_RESOURCE_DIRS=( byte-buddy/src/test/{resources,precompiled*} )
+ JAVA_TEST_SRC_DIR="byte-buddy/src/test/java"
+
+ JAVA_TEST_EXCLUDES=(
+ # all tests in this class fail, https://bugs.gentoo.org/863386
+ net.bytebuddy.build.CachedReturnPluginTest
+ )
+ java-pkg-simple_src_test
+}
+
+src_install() {
+ java-pkg_dojar "byte-buddy-agent.jar"
+ java-pkg_dojar "byte-buddy.jar"
+
+ if use doc; then
+ java-pkg_dojavadoc target/api
+ fi
+
+ if use source; then
+ java-pkg_dosrc "byte-buddy-agent/src/main/java/*"
+ java-pkg_dosrc "byte-buddy/src/main/java/*"
+ fi
+}
diff --git a/dev-java/byte-buddy/files/byte-buddy-1.12.18-not-java20.patch b/dev-java/byte-buddy/files/byte-buddy-1.12.18-not-java20.patch
new file mode 100644
index 000000000000..73b9bccdab3e
--- /dev/null
+++ b/dev-java/byte-buddy/files/byte-buddy-1.12.18-not-java20.patch
@@ -0,0 +1,52 @@
+# We don't have JAVA_V20
+--- a/byte-buddy-dep/src/main/java/net/bytebuddy/ClassFileVersion.java
++++ b/byte-buddy-dep/src/main/java/net/bytebuddy/ClassFileVersion.java
+@@ -140,11 +140,6 @@ public class ClassFileVersion implements Comparable<ClassFileVersion>, Serializa
+ */
+ public static final ClassFileVersion JAVA_V19 = new ClassFileVersion(Opcodes.V19);
+
+- /**
+- * The class file version of Java 20.
+- */
+- public static final ClassFileVersion JAVA_V20 = new ClassFileVersion(Opcodes.V20);
+-
+ /**
+ * A version locator for the executing JVM.
+ */
+@@ -235,8 +230,6 @@ public class ClassFileVersion implements Comparable<ClassFileVersion>, Serializa
+ return JAVA_V18;
+ } else if (javaVersionString.equals("1.19") || javaVersionString.equals("19")) {
+ return JAVA_V19;
+- } else if (javaVersionString.equals("1.20") || javaVersionString.equals("20")) {
+- return JAVA_V20;
+ } else {
+ if (OpenedClassReader.EXPERIMENTAL) {
+ try {
+@@ -300,8 +293,6 @@ public class ClassFileVersion implements Comparable<ClassFileVersion>, Serializa
+ return JAVA_V18;
+ case 19:
+ return JAVA_V19;
+- case 20:
+- return JAVA_V20;
+ default:
+ if (OpenedClassReader.EXPERIMENTAL && javaVersion > 0) {
+ return new ClassFileVersion(BASE_VERSION + javaVersion);
+@@ -317,7 +308,7 @@ public class ClassFileVersion implements Comparable<ClassFileVersion>, Serializa
+ * @return The latest officially supported Java version.
+ */
+ public static ClassFileVersion latest() {
+- return ClassFileVersion.JAVA_V20;
++ return ClassFileVersion.JAVA_V19;
+ }
+
+ /**
+--- a/byte-buddy-dep/src/test/java/net/bytebuddy/ClassFileVersionKnownVersionsTest.java
++++ b/byte-buddy-dep/src/test/java/net/bytebuddy/ClassFileVersionKnownVersionsTest.java
+@@ -77,7 +77,6 @@ public class ClassFileVersionKnownVersionsTest {
+ {17, 17, Arrays.asList("1.17", "17"), Opcodes.V17, (short) 61, (short) 0, true, true, true},
+ {18, 18, Arrays.asList("1.18", "18"), Opcodes.V18, (short) 62, (short) 0, true, true, true},
+ {19, 19, Arrays.asList("1.19", "19"), Opcodes.V19, (short) 63, (short) 0, true, true, true},
+- {20, 20, Arrays.asList("1.20", "20"), Opcodes.V20, (short) 64, (short) 0, true, true, true}
+ });
+ }
+
diff --git a/dev-java/cdi-api/Manifest b/dev-java/cdi-api/Manifest
new file mode 100644
index 000000000000..86f330ad3dd5
--- /dev/null
+++ b/dev-java/cdi-api/Manifest
@@ -0,0 +1 @@
+DIST cdi-api-4.0.1.tar.gz 280719 BLAKE2B 9c4cf34f1b0c096a3097bed658ba4c13ab6fa655cd8233b82b13a788dd047e1be89bcde69b3c69665c0987c4f62cd5e4596e51f6235c95db5239daf403dea4e9 SHA512 7f3e9ca45e0708b3c998ff6f743975a9995309d1fb93fde64ca8a0fca73e16ea653085ca743c921d52385f0fbcbdab10b45fd8b6e8b27c2e058871febbbeeb1e
diff --git a/dev-java/cdi-api/cdi-api-4.0.1-r2.ebuild b/dev-java/cdi-api/cdi-api-4.0.1-r2.ebuild
new file mode 100644
index 000000000000..ca054b493d33
--- /dev/null
+++ b/dev-java/cdi-api/cdi-api-4.0.1-r2.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom api/pom.xml --download-uri https://github.com/jakartaee/cdi/archive/4.0.1.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild cdi-api-4.0.1.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="jakarta.enterprise:jakarta.enterprise.cdi-api:4.0.1"
+JAVA_TESTING_FRAMEWORKS="testng"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="APIs for CDI (Contexts and Dependency Injection for Java)"
+HOMEPAGE="https://projects.eclipse.org/projects/ee4j.cdi"
+SRC_URI="https://github.com/jakartaee/cdi/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
+
+EL_API_SLOT="5.0"
+
+DEPEND="
+ dev-java/injection-api:0
+ dev-java/jakarta-annotations-api:0
+ dev-java/jakarta-el-api:${EL_API_SLOT}
+ dev-java/jakarta-interceptors:0
+ >=virtual/jdk-11:*
+"
+RDEPEND=">=virtual/jre-11:*"
+
+DOCS=( CONTRIBUTING.adoc {NOTICE,README}.md )
+
+PATCHES=(
+ # https://bugs.gentoo.org/856412
+ # org.jboss.cdi.api.test.se.SeContainerInitializerTest # Tests run: 4, Failures: 1
+ # org.jboss.cdi.api.test.CDITest # Tests run: 11, Failures: 5
+ "${FILESDIR}/cdi-api-4.0.1-skip-tests.patch"
+)
+
+S="${WORKDIR}/cdi-${PV}"
+
+JAVA_TEST_GENTOO_CLASSPATH="testng"
+JAVA_TEST_EXTRA_ARGS=( -DserviceDir="target/test-classes/META-INF/services" )
+JAVA_TEST_SRC_DIR="api/src/test/java"
+JAVA_TEST_RESOURCE_DIRS="api/src/test/resources"
+
+JAVA_TEST_EXCLUDES=(
+ # Tests run: 1, Failures: 1
+ org.jboss.cdi.api.test.privileged.CDIPrivilegedTest
+)
+
+src_prepare(){
+ default # https://bugs.gentoo.org/780585
+}
+
+src_compile() {
+ JAVA_CLASSPATH_EXTRA="
+ injection-api
+ jakarta-annotations-api
+ jakarta-el-api-${EL_API_SLOT}
+ jakarta-interceptors
+ "
+ JAVA_SRC_DIR="lang-model/src/main/java"
+ JAVA_JAR_FILENAME="lang-model.jar"
+ java-pkg-simple_src_compile
+ JAVA_GENTOO_CLASSPATH_EXTRA+=":lang-model.jar"
+ rm -r target || die
+
+ JAVA_SRC_DIR="api/src/main/java"
+ JAVA_RESOURCE_DIRS="api/src/main/resources"
+ JAVA_JAR_FILENAME="cdi-api.jar"
+ java-pkg-simple_src_compile
+ JAVA_GENTOO_CLASSPATH_EXTRA+=":cdi-api.jar"
+ rm -r target || die
+
+ if use doc; then
+ rm lang-model/src/main/java/module-info.java || die
+ JAVA_SRC_DIR=(
+ "lang-model/src/main/java"
+ "api/src/main/java"
+ )
+ JAVA_JAR_FILENAME="ignoreme.jar"
+ java-pkg-simple_src_compile
+ fi
+}
+
+src_install() {
+ java-pkg_dojar "lang-model.jar"
+ java-pkg_dojar "cdi-api.jar"
+
+ if use doc; then
+ java-pkg_dojavadoc target/api
+ fi
+
+ if use source; then
+ java-pkg_dosrc "lang-model/src/main/java/*"
+ java-pkg_dosrc "api/src/main/java/*"
+ fi
+}
diff --git a/dev-java/cdi-api/files/cdi-api-4.0.1-skip-tests.patch b/dev-java/cdi-api/files/cdi-api-4.0.1-skip-tests.patch
new file mode 100644
index 000000000000..f62b64b3d450
--- /dev/null
+++ b/dev-java/cdi-api/files/cdi-api-4.0.1-skip-tests.patch
@@ -0,0 +1,72 @@
+--- a/api/src/test/java/org/jboss/cdi/api/test/se/SeContainerInitializerTest.java
++++ b/api/src/test/java/org/jboss/cdi/api/test/se/SeContainerInitializerTest.java
+@@ -48,7 +48,7 @@ public class SeContainerInitializerTest {
+ SeContainerInitializer.newInstance();
+ }
+
+- @Test
++ @Test(enabled = false)
+ public void testWithOneGoodSeContainerInitializer() throws Exception {
+
+ FileWriter fw = new FileWriter(SERVICE_FILE_NAME);
+@@ -79,4 +79,4 @@ public class SeContainerInitializerTest {
+ Assert.assertTrue(SeContainerInitializer.newInstance().getClass().equals(DummySeContainerInitializer.class) ||
+ SeContainerInitializer.newInstance().getClass().equals(DummySeContainerInitializer2.class));
+ }
+-}
+\ No newline at end of file
++}
+--- a/api/src/test/java/org/jboss/cdi/api/test/CDITest.java
++++ b/api/src/test/java/org/jboss/cdi/api/test/CDITest.java
+@@ -59,7 +59,7 @@ public class CDITest {
+ }
+
+
+- @Test
++ @Test(enabled = false)
+ public void testWithOneGoodCDIProvider() throws Exception {
+
+ FileWriter fw = new FileWriter(SERVICE_FILE_NAME);
+@@ -90,7 +90,7 @@ public class CDITest {
+
+ }
+
+- @Test
++ @Test(enabled = false)
+ public void testWithTwoGoodCDIProvider() throws Exception {
+ FileWriter fw = new FileWriter(SERVICE_FILE_NAME);
+ fw.write(DummyCDIProvider2.class.getName());
+@@ -101,7 +101,7 @@ public class CDITest {
+ }
+
+
+- @Test
++ @Test(enabled = false)
+ public void testWithTwoGoodCDIProviderReverse() throws Exception {
+ FileWriter fw = new FileWriter(SERVICE_FILE_NAME);
+ fw.write(DummyCDIProvider.class.getName());
+@@ -111,7 +111,7 @@ public class CDITest {
+ Assert.assertTrue(CDI.current().getClass().equals(DummyCDIProvider.DummyCDI.class));
+ }
+
+- @Test
++ @Test(enabled = false)
+ public void testWithTwoCDIProviderOneWithNullCDIAndOneGood() throws Exception {
+ FileWriter fw = new FileWriter(SERVICE_FILE_NAME);
+ fw.write(DummyCDIProviderWithNullCDI.class.getName());
+@@ -122,7 +122,7 @@ public class CDITest {
+ }
+
+
+- @Test
++ @Test(enabled = false)
+ public void testWithThreeCDIProviderOneWithNullCDIAndOthersGood() throws Exception {
+ FileWriter fw = new FileWriter(SERVICE_FILE_NAME);
+ fw.write(DummyCDIProviderWithNullCDI.class.getName());
+@@ -163,4 +163,4 @@ public class CDITest {
+ ClosableCDIProvider.closeContainer();
+ CDI.current();
+ }
+-}
+\ No newline at end of file
++}
diff --git a/dev-java/byte-buddy-agent/metadata.xml b/dev-java/cdi-api/metadata.xml
index 02d6cbf56ced..5445151724ee 100644
--- a/dev-java/byte-buddy-agent/metadata.xml
+++ b/dev-java/cdi-api/metadata.xml
@@ -5,6 +5,6 @@
<email>java@gentoo.org</email>
</maintainer>
<upstream>
- <remote-id type="github">raphw/byte-buddy</remote-id>
+ <remote-id type="github">jakartaee/cdi</remote-id>
</upstream>
</pkgmetadata>
diff --git a/dev-java/commons-codec/commons-codec-1.15-r1.ebuild b/dev-java/commons-codec/commons-codec-1.15-r1.ebuild
index e611ee200c7c..95a9ec2ab516 100644
--- a/dev-java/commons-codec/commons-codec-1.15-r1.ebuild
+++ b/dev-java/commons-codec/commons-codec-1.15-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://apache/commons/codec/source/${P}-src.tar.gz -> ${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux"
# Compile dependencies
# POM: ${P}-src/pom.xml
diff --git a/dev-java/commons-codec/commons-codec-1.15.ebuild b/dev-java/commons-codec/commons-codec-1.15.ebuild
deleted file mode 100644
index 88e15404828e..000000000000
--- a/dev-java/commons-codec/commons-codec-1.15.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom commons-codec-1.15-src/pom.xml --download-uri https://apache.osuosl.org/commons/codec/source/commons-codec-1.15-src.tar.gz --slot 0 --keywords "~amd64 ~ppc64 ~x86" --ebuild commons-codec-1.15.ebuild
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="commons-codec:commons-codec:1.15"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Implementations of common encoders and decoders in Java"
-HOMEPAGE="https://commons.apache.org/proper/commons-codec/"
-SRC_URI="mirror://apache/commons/codec/source/${P}-src.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux"
-
-# Compile dependencies
-# POM: ${P}-src/pom.xml
-# test? junit:junit:4.13 -> >=dev-java/junit-4.13.1:4
-# test? org.apache.commons:commons-lang3:3.8 -> >=dev-java/commons-lang-3.11:3.6
-
-DEPEND="
- >=virtual/jdk-1.8:*
- test? (
- >=dev-java/commons-lang-3.11:3.6
- )
-"
-
-RDEPEND="
- >=virtual/jre-1.8:*
-"
-
-S="${WORKDIR}/${P}-src"
-
-JAVA_SRC_DIR="src/main/java"
-JAVA_RESOURCE_DIRS=(
- "src/main/resources"
-)
-
-JAVA_TEST_GENTOO_CLASSPATH="junit-4,commons-lang-3.6"
-JAVA_TEST_SRC_DIR="src/test/java"
-JAVA_TEST_RESOURCE_DIRS=(
- "src/test/resources"
-)
diff --git a/dev-java/commons-collections/commons-collections-4.4-r1.ebuild b/dev-java/commons-collections/commons-collections-4.4-r1.ebuild
index c55d0bb19796..5c4b6e0ebaee 100644
--- a/dev-java/commons-collections/commons-collections-4.4-r1.ebuild
+++ b/dev-java/commons-collections/commons-collections-4.4-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://apache/commons/collections/source/${PN}4-${PV}-src.tar.gz -> $
LICENSE="Apache-2.0"
SLOT="4"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
# Compile dependencies
# POM: pom.xml
diff --git a/dev-java/commons-collections/commons-collections-4.4.ebuild b/dev-java/commons-collections/commons-collections-4.4.ebuild
deleted file mode 100644
index b843e427b13b..000000000000
--- a/dev-java/commons-collections/commons-collections-4.4.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri mirror://apache/commons/collections/source/commons-collections4-4.4-src.tar.gz --slot 4 --keywords "~amd64 ~arm64 ~ppc64 ~x86" --ebuild commons-collections-4.4.ebuild
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.apache.commons:commons-collections4:4.4"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Extends the JCF classes with new interfaces, implementations and utilities"
-HOMEPAGE="https://commons.apache.org/proper/commons-collections/"
-SRC_URI="mirror://apache/commons/collections/source/${PN}4-${PV}-src.tar.gz -> ${P}-src.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="4"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-# Compile dependencies
-# POM: pom.xml
-# test? junit:junit:4.12 -> >=dev-java/junit-4.13.2:4
-# test? org.apache.commons:commons-lang3:3.9 -> >=dev-java/commons-lang-3.12.0:3.6
-# test? org.easymock:easymock:4.0.2 -> !!!suitable-mavenVersion-not-found!!!
-
-DEPEND="
- >=virtual/jdk-1.8:*
- test? (
- dev-java/easymock:3.2
- dev-java/commons-lang:3.6
- )
-"
-
-RDEPEND="
- >=virtual/jre-1.8:*
-"
-
-DOCS=( {CONTRIBUTING,README}.md {LICENSE,NOTICE,RELEASE-NOTES}.txt )
-HTML_DOCS=( {DEVELOPERS-GUIDE,PROPOSAL}.html )
-
-S="${WORKDIR}/commons-collections4-${PV}-src"
-
-JAVA_SRC_DIR="src/main/java"
-
-JAVA_TEST_GENTOO_CLASSPATH="junit-4,commons-lang-3.6,easymock-3.2"
-JAVA_TEST_SRC_DIR="src/test/java"
-JAVA_TEST_RESOURCE_DIRS="src/test/resources"
-
-src_test() {
- # https://github.com/apache/commons-collections/blob/cab58b3a8093a2f6b84f12783a3fb358747310f7/pom.xml#L542-L550
- pushd src/test/java || die
- local TESTS=$(find * -name "*Test.java" ! -name "TestUtils.java" ! -name "Abstract*.java" ! -name "BulkTest.java")
- TESTS="${TESTS//.java}"
- TESTS="${TESTS//\//.}"
- popd
-
- JAVA_TEST_RUN_ONLY=( "${TESTS}" )
- java-pkg-simple_src_test
-}
-
-src_install() {
- default # https://bugs.gentoo.org/789582
- java-pkg-simple_src_install
-}
diff --git a/dev-java/commons-compress/Manifest b/dev-java/commons-compress/Manifest
index 1c4ed59777d0..e433074b748e 100644
--- a/dev-java/commons-compress/Manifest
+++ b/dev-java/commons-compress/Manifest
@@ -1 +1 @@
-DIST commons-compress-1.21-sources.tar.gz 15165800 BLAKE2B 3fed32af039860c6b434c485f0c78939ed810a224a12680ddf1d9d6ed540f4e74530edd0e0077fd41af31404c296a607db912465cfd725c31446bc6fa7b8df8a SHA512 8041371b491057435ca62390e70b30031e4d21e80c37d9cb922fdffa794b56aee3b5d60d8241e4db0cecc28c82dfdaafbe52b2175e26062da169fec8efbb17e1
+DIST commons-compress-1.21-src.tar.gz 15165800 BLAKE2B 3fed32af039860c6b434c485f0c78939ed810a224a12680ddf1d9d6ed540f4e74530edd0e0077fd41af31404c296a607db912465cfd725c31446bc6fa7b8df8a SHA512 8041371b491057435ca62390e70b30031e4d21e80c37d9cb922fdffa794b56aee3b5d60d8241e4db0cecc28c82dfdaafbe52b2175e26062da169fec8efbb17e1
diff --git a/dev-java/commons-compress/commons-compress-1.21-r1.ebuild b/dev-java/commons-compress/commons-compress-1.21-r1.ebuild
new file mode 100644
index 000000000000..40cf830dd60a
--- /dev/null
+++ b/dev-java/commons-compress/commons-compress-1.21-r1.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://apache.miloslavbrada.cz//commons/compress/source/commons-compress-1.21-src.tar.gz --slot 0 --keywords "~amd64 ~arm64 ~x86" --ebuild commons-compress-1.21.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.apache.commons:commons-compress:1.21"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Java API for working with archive files"
+HOMEPAGE="https://commons.apache.org/proper/commons-compress/"
+SRC_URI="mirror://apache/commons/compress/source/${P}-src.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
+
+# Common dependencies
+# POM: pom.xml
+# asm:asm:3.2 -> !!!groupId-not-found!!!
+# com.github.luben:zstd-jni:1.5.0-2 -> >=dev-java/zstd-jni-1.5.0.5:0
+# org.brotli:dec:0.1.2 -> >=dev-java/brotli-dec-0.1.2:0
+# org.tukaani:xz:1.9 -> >=dev-java/xz-java-1.9:0
+
+CP_DEPEND="
+ dev-java/asm:9
+ dev-java/brotli-dec:0
+ dev-java/xz-java:0
+ dev-java/zstd-jni:0
+"
+
+# Compile dependencies
+# POM: pom.xml
+# org.osgi:osgi.core:6.0.0 -> >=dev-java/osgi-core-8.0.0:0
+# POM: pom.xml
+# test? com.github.marschall:memoryfilesystem:2.1.0 -> >=dev-java/memoryfilesystem-2.3.0:0
+# test? javax.inject:javax.inject:1 -> >=dev-java/javax-inject-1:0
+# test? junit:junit:4.13.2 -> >=dev-java/junit-4.13.2:4
+# test? org.apache.felix:org.apache.felix.framework:7.0.0 -> >=dev-java/felix-framework-7.0.5:0
+# test? org.hamcrest:hamcrest:2.2 -> >=dev-java/hamcrest-2.2:0
+# test? org.mockito:mockito-core:3.11.1 -> >=dev-java/mockito-4.6.1:4
+# test? org.ops4j.pax.exam:pax-exam-cm:4.13.1 -> !!!groupId-not-found!!!
+# test? org.ops4j.pax.exam:pax-exam-container-native:4.13.1 -> !!!groupId-not-found!!!
+# test? org.ops4j.pax.exam:pax-exam-junit4:4.13.1 -> !!!groupId-not-found!!!
+# test? org.ops4j.pax.exam:pax-exam-link-mvn:4.13.1 -> !!!groupId-not-found!!!
+# test? org.slf4j:slf4j-api:1.7.30 -> >=dev-java/slf4j-api-1.7.36:0
+
+DEPEND="
+ >=virtual/jdk-11:*
+ ${CP_DEPEND}
+ dev-java/osgi-core:0
+ test? (
+ dev-java/felix-framework:0
+ dev-java/hamcrest:0
+ dev-java/javax-inject:0
+ dev-java/memoryfilesystem:0
+ dev-java/mockito:4
+ dev-java/slf4j-api:0
+ )
+"
+
+RDEPEND="
+ >=virtual/jre-1.8:*
+ ${CP_DEPEND}"
+
+S="${WORKDIR}/${P}-src"
+
+PATCHES=(
+ "${FILESDIR}/${P}-asm7+.patch"
+)
+
+JAVA_AUTOMATIC_MODULE_NAME="org.apache.commons.compress"
+JAVA_CLASSPATH_EXTRA="osgi-core"
+JAVA_ENCODING="iso-8859-1"
+JAVA_MAIN_CLASS="org.apache.commons.compress.archivers.Lister"
+JAVA_SRC_DIR="src/main/java"
+
+JAVA_TEST_GENTOO_CLASSPATH="memoryfilesystem,javax-inject,junit-4,felix-framework,hamcrest,mockito-4,slf4j-api"
+JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+JAVA_TEST_SRC_DIR="src/test/java"
+
+src_prepare() {
+ default
+ # error: package org.ops4j.pax.exam does not exist
+ # removing it costs 2 tests
+ rm src/test/java/org/apache/commons/compress/OsgiITest.java || die
+
+ # java.io.FileNotFoundException: couldn't find zstandard.testdata.zst
+ # pom.xml lines 420-422
+ tar xf src/test/resources/zstd-tests.tar \
+ -C src/test/resources || die "cannot unpack zstd-tests.tar"
+
+ # pom.xml lines 518-520
+ tar xjf src/test/resources/zip64support.tar.bz2 \
+ -C src/test/resources || die "cannot unpack zip64support.tar.bz2"
+
+ JAVA_TEST_EXTRA_ARGS=( -Djava.library.path="${EPREFIX}/usr/$(get_libdir)/zstd-jni/" )
+}
+
+JAVA_TEST_EXCLUDES=(
+ # No runnable methods
+ org.apache.commons.compress.archivers.TestArchiveStreamProvider
+ org.apache.commons.compress.compressors.TestCompressorStreamProvider
+
+ # fails without useful message
+ org.apache.commons.compress.compressors.DetectCompressorTestCase # has 8 tests
+
+ # These tests pass but they prevent printing test messages::
+# org.apache.commons.compress.compressors.pack200.Pack200UtilsTest # has 2 tests
+# org.apache.commons.compress.compressors.FramedSnappyTestCase # has 5 tests
+# org.apache.commons.compress.compressors.XZTestCase # has 4 tests
+# org.apache.commons.compress.compressors.Pack200TestCase # has 15 tests
+# org.apache.commons.compress.harmony.pack200.tests.PackingOptionsTest # has 12 tests
+# org.apache.commons.compress.harmony.pack200.tests.ArchiveTest # has 9 tests
+# org.apache.commons.compress.harmony.unpack200.tests.ArchiveTest # has 13 tests
+)
diff --git a/dev-java/commons-compress/commons-compress-1.21.ebuild b/dev-java/commons-compress/commons-compress-1.21.ebuild
deleted file mode 100644
index c011b4bda384..000000000000
--- a/dev-java/commons-compress/commons-compress-1.21.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://apache.miloslavbrada.cz//commons/compress/source/commons-compress-1.21-src.tar.gz --slot 0 --keywords "~amd64 ~arm64 ~x86" --ebuild commons-compress-1.21.ebuild
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source"
-MAVEN_ID="org.apache.commons:commons-compress:1.21"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Java API for working with archive files"
-HOMEPAGE="https://commons.apache.org/proper/commons-compress/"
-SRC_URI="mirror://apache/commons/compress/source/${P}-src.tar.gz -> ${P}-sources.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-# Common dependencies
-# POM: pom.xml
-# asm:asm:3.2 -> !!!groupId-not-found!!!
-# com.github.luben:zstd-jni:1.5.0-2 -> >=dev-java/zstd-jni-1.5.0.4:0
-# org.brotli:dec:0.1.2 -> >=dev-java/brotli-dec-0.1.2:0
-# org.tukaani:xz:1.9 -> >=dev-java/xz-java-1.9:0
-
-CDEPEND="
- 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
-"
-
-# Compile dependencies
-# POM: pom.xml
-# org.osgi:org.osgi.core:6.0.0 -> !!!artifactId-not-found!!!
-# POM: pom.xml
-# test? com.github.marschall:memoryfilesystem:2.1.0 -> !!!groupId-not-found!!!
-# test? javax.inject:javax.inject:1 -> !!!groupId-not-found!!!
-# test? junit:junit:4.13.2 -> >=dev-java/junit-4.13.2:4
-# test? org.apache.felix:org.apache.felix.framework:7.0.0 -> !!!groupId-not-found!!!
-# test? org.hamcrest:hamcrest:2.2 -> !!!artifactId-not-found!!!
-# test? org.mockito:mockito-core:3.11.1 -> !!!suitable-mavenVersion-not-found!!!
-# test? org.ops4j.pax.exam:pax-exam-cm:4.13.1 -> !!!groupId-not-found!!!
-# test? org.ops4j.pax.exam:pax-exam-container-native:4.13.1 -> !!!groupId-not-found!!!
-# test? org.ops4j.pax.exam:pax-exam-junit4:4.13.1 -> !!!groupId-not-found!!!
-# test? org.ops4j.pax.exam:pax-exam-link-mvn:4.13.1 -> !!!groupId-not-found!!!
-# test? org.slf4j:slf4j-api:1.7.30 -> >=dev-java/slf4j-api-1.7.30:0
-
-DEPEND="
- >=virtual/jdk-1.8:*
- ${CDEPEND}
-"
-
-RDEPEND="
- >=virtual/jre-1.8:*
- ${CDEPEND}"
-
-S="${WORKDIR}/${P}-src"
-
-PATCHES=(
- "${FILESDIR}/${P}-asm7+.patch"
-)
-
-JAVA_ENCODING="iso-8859-1"
-
-JAVA_GENTOO_CLASSPATH="asm-9,zstd-jni,brotli-dec,xz-java"
-JAVA_SRC_DIR="src/main/java"
-
-src_prepare() {
- default
-}
diff --git a/dev-java/commons-digester/commons-digester-2.1-r2.ebuild b/dev-java/commons-digester/commons-digester-2.1-r2.ebuild
index 2999e8c31357..1d6571243ef9 100644
--- a/dev-java/commons-digester/commons-digester-2.1-r2.ebuild
+++ b/dev-java/commons-digester/commons-digester-2.1-r2.ebuild
@@ -14,7 +14,7 @@ inherit java-pkg-2 java-pkg-simple
DESCRIPTION="Reads XML configuration files to provide initialization of various Java objects"
HOMEPAGE="https://commons.apache.org/digester/"
-SRC_URI="mirror://apache/commons/digester/source/commons-digester-2.1-src.tar.gz"
+SRC_URI="mirror://apache/commons/digester/source/${P}-src.tar.gz"
LICENSE="Apache-2.0"
SLOT="2.1"
diff --git a/dev-java/commons-io/commons-io-2.11.0-r1.ebuild b/dev-java/commons-io/commons-io-2.11.0-r1.ebuild
index 73150451cd28..222c0ad697b9 100644
--- a/dev-java/commons-io/commons-io-2.11.0-r1.ebuild
+++ b/dev-java/commons-io/commons-io-2.11.0-r1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://commons.apache.org/proper/commons-io/"
SRC_URI="mirror://apache/commons/io/source/${P}-src.tar.gz -> ${P}-sources.tar.gz"
LICENSE="Apache-2.0"
SLOT="1"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
# Compile dependencies
# POM: pom.xml
diff --git a/dev-java/commons-io/commons-io-2.11.0.ebuild b/dev-java/commons-io/commons-io-2.11.0.ebuild
deleted file mode 100644
index f6f4b5f8feb0..000000000000
--- a/dev-java/commons-io/commons-io-2.11.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://mirror.dkm.cz/apache//commons/io/source/commons-io-2.11.0-src.tar.gz --slot 0 --keywords "~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris" --ebuild commons-io-2.11.0.ebuild
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="commons-io:commons-io:2.11.0"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Utility classes, stream implementations, file filters, and much more"
-HOMEPAGE="https://commons.apache.org/proper/commons-io/"
-SRC_URI="mirror://apache/commons/io/source/${P}-src.tar.gz -> ${P}-sources.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="1"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
-
-# Compile dependencies
-# POM: pom.xml
-# test? com.google.jimfs:jimfs:1.2 -> !!!groupId-not-found!!!
-# test? org.apache.commons:commons-lang3:3.12.0 -> >=dev-java/commons-lang-3.12.0:3.6
-# test? org.junit-pioneer:junit-pioneer:1.4.2 -> !!!groupId-not-found!!!
-# test? org.junit.jupiter:junit-jupiter:5.7.2 -> !!!groupId-not-found!!!
-# test? org.mockito:mockito-inline:3.11.2 -> !!!artifactId-not-found!!!
-# test? org.openjdk.jmh:jmh-core:1.32 -> !!!groupId-not-found!!!
-# test? org.openjdk.jmh:jmh-generator-annprocess:1.32 -> !!!groupId-not-found!!!
-
-DEPEND="
- >=virtual/jdk-1.8:*
- test? (
- >=dev-java/commons-lang-3.12.0:3.6
- )
-"
-
-RDEPEND="
- >=virtual/jre-1.8:*
-"
-
-# some test dependencies are missing
-RESTRICT="test"
-
-S="${WORKDIR}/${P}-src"
-
-JAVA_ENCODING="iso-8859-1"
-
-JAVA_SRC_DIR="src/main/java"
-
-JAVA_TEST_GENTOO_CLASSPATH="commons-lang-3.6"
-JAVA_TEST_SRC_DIR="src/test/java"
-JAVA_TEST_RESOURCE_DIRS=(
- "src/test/resources"
-)
diff --git a/dev-java/commons-logging/commons-logging-1.2-r5.ebuild b/dev-java/commons-logging/commons-logging-1.2-r6.ebuild
index b3a0f8533760..8c38a37bc9cb 100644
--- a/dev-java/commons-logging/commons-logging-1.2-r5.ebuild
+++ b/dev-java/commons-logging/commons-logging-1.2-r6.ebuild
@@ -27,7 +27,7 @@ CDEPEND="
dev-java/log4j-api:2
dev-java/log4j-core:2
)
- servletapi? ( dev-java/tomcat-servlet-api:4.0 )"
+ servletapi? ( dev-java/jakarta-servlet-api:4 )"
RDEPEND="
${CDEPEND}
@@ -92,7 +92,7 @@ src_prepare() {
fi
if use servletapi; then
- echo "servletapi.jar=$(java-pkg_getjar tomcat-servlet-api-4.0 servlet-api.jar)" >> build.properties || die
+ echo "servletapi.jar=$(java-pkg_getjars jakarta-servlet-api-4 )" >> build.properties || die
fi
}
diff --git a/dev-java/commons-math/Manifest b/dev-java/commons-math/Manifest
index 6e97211d4920..bf6297cec518 100644
--- a/dev-java/commons-math/Manifest
+++ b/dev-java/commons-math/Manifest
@@ -1,2 +1 @@
DIST commons-math3-3.6.1-sources.jar 2514690 BLAKE2B ce5dc1a5bdccf85aa780dd648b64c0ed78b4d5a36d15d9737f661135f4f1ec962c3c44a0c4d8fc7d12c667e62b19860cb2a47f507c8c3e6da6cce57e1b9caf54 SHA512 eab6003834c0f1b7e67eee242d33db43f85d388ac32e37caa6bd16d74340db5c189ff5c7fd112ef13b9009d2fbcf2bad6650b6e5d9124316b59493b2d07d065d
-DIST commons-math3-3.6.1.jar 2514690 BLAKE2B ce5dc1a5bdccf85aa780dd648b64c0ed78b4d5a36d15d9737f661135f4f1ec962c3c44a0c4d8fc7d12c667e62b19860cb2a47f507c8c3e6da6cce57e1b9caf54 SHA512 eab6003834c0f1b7e67eee242d33db43f85d388ac32e37caa6bd16d74340db5c189ff5c7fd112ef13b9009d2fbcf2bad6650b6e5d9124316b59493b2d07d065d
diff --git a/dev-java/commons-math/commons-math-3.6.1-r1.ebuild b/dev-java/commons-math/commons-math-3.6.1-r1.ebuild
deleted file mode 100644
index 45de2587390c..000000000000
--- a/dev-java/commons-math/commons-math-3.6.1-r1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc examples source"
-MAVEN_ID="org.apache.commons:commons-math3:3.6.1"
-
-inherit java-pkg-2 java-pkg-simple
-
-MY_PN="${PN}3"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Lightweight, self-contained mathematics and statistics components"
-HOMEPAGE="https://commons.apache.org/math/"
-SRC_URI="https://repo1.maven.org/maven2/org/apache/commons/${MY_PN}/${PV}/${MY_P}-sources.jar
--> ${MY_P}.jar"
-
-DEPEND=">=virtual/jdk-1.8:*"
-RDEPEND=">=virtual/jre-1.8:*"
-
-LICENSE="Apache-2.0"
-SLOT="3"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
diff --git a/dev-java/commons-math/commons-math-3.6.1-r2.ebuild b/dev-java/commons-math/commons-math-3.6.1-r2.ebuild
index 0c33559066fe..d77cb259350a 100644
--- a/dev-java/commons-math/commons-math-3.6.1-r2.ebuild
+++ b/dev-java/commons-math/commons-math-3.6.1-r2.ebuild
@@ -20,6 +20,6 @@ RDEPEND=">=virtual/jre-1.8:*"
LICENSE="Apache-2.0"
SLOT="3"
-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"
JAVA_AUTOMATIC_MODULE_NAME="commons.math3"
diff --git a/dev-java/commons-net/Manifest b/dev-java/commons-net/Manifest
index 9a5756803a63..72b28387d441 100644
--- a/dev-java/commons-net/Manifest
+++ b/dev-java/commons-net/Manifest
@@ -1 +1,3 @@
DIST commons-net-3.8.0.jar 437325 BLAKE2B 92bdbf2f95cc54f6a791a9de0a56878fe12b6d956d47a4116ae21df35f3dcc4d7b10f5c03c081fc7012a06416f5f9f6555060784bfe22ec9c8d70b17ee7ea215 SHA512 a16ed8c2966541cc052fe963338efcc6f9c42ccd6fefe246547e66d9f46c35cf42bc6d13cb983a1829a378ebd7a676bcb812acbc3aa0ed30e6fa206748dae620
+DIST commons-net-3.9.0-src.tar.gz 440911 BLAKE2B d7f24bff2e36d727bc12bf700b5a5ba9bf6b34a1d63cf892124b81ced113e4b66ebdb8b1eb54fbac33b76efcfc7333150c8d5ce87039cc7204ebf16bb64c8044 SHA512 a2d4ef4937701f28304fdb9a39a0d4a8fdd5fd7ae84c6d647a6b9e05eee68cb4fde8ae9eedd94f45fdc0194d160dd9f64b3c1cfbdd8bcea2214e9826ace32877
+DIST commons-net-3.9.0-src.tar.gz.asc 488 BLAKE2B 7999c63348fdb63de670cf1ace3c928796c663aa960494e0d4a398529b19c4834e9c3d2d8dbdb13e2ba392909e1761458c99332f35e39e0efb0f212b3c0f32de SHA512 72da1fe78bc6c0dea70d171c3c60c7eee8387bb28244f8b67bf38b66c3e7f2c183e4413c3f090a5b1a591ce64a6d43434093425f44c10a9dd03f0b354306e017
diff --git a/dev-java/commons-net/commons-net-3.9.0.ebuild b/dev-java/commons-net/commons-net-3.9.0.ebuild
new file mode 100644
index 000000000000..9c7298427146
--- /dev/null
+++ b/dev-java/commons-net/commons-net-3.9.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc examples source"
+MAVEN_ID="commons-net:commons-net:3.9.0"
+# No tests, junit-jupiter and junit-vintage are not packaged.
+# JAVA_TESTING_FRAMEWORKS="junit-vintage junit-jupiter"
+
+inherit java-pkg-2 java-pkg-simple verify-sig
+
+DESCRIPTION="Client-oriented Java library to implement many Internet protocols"
+HOMEPAGE="https://commons.apache.org/proper/commons-net/"
+SRC_URI="mirror://apache/commons/net/source/commons-net-${PV}-src.tar.gz
+ verify-sig? ( https://downloads.apache.org/commons/net/source/commons-net-${PV}-src.tar.gz.asc )"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
+BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-commons )"
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/commons.apache.org.asc"
+
+DOCS=(
+ CONTRIBUTING.md
+ NOTICE.txt
+ README.md
+ RELEASE-NOTES.txt
+)
+
+S="${WORKDIR}/${P}-src"
+
+JAVA_AUTOMATIC_MODULE_NAME="org.apache.commons.net"
+JAVA_ENCODING="iso-8859-1"
+JAVA_RESOURCE_DIRS="src/main/resources"
+JAVA_SRC_DIR="src/main/java"
diff --git a/dev-java/commons-text/Manifest b/dev-java/commons-text/Manifest
index e99bcc4b22d1..6a46c7a8be2a 100644
--- a/dev-java/commons-text/Manifest
+++ b/dev-java/commons-text/Manifest
@@ -1 +1 @@
-DIST commons-text-1.9-sources.tar.gz 312764 BLAKE2B 44b628c418a910ff38b5a1fb3b4c9f14a1f9818afd12540f8c8cf8b1a99fd7abd365e704142bcec901e5e067b303ff44f9c992f8714eae68b94819780a270dd2 SHA512 53f993e79aaa6789d3388aa96b6b2a14cf646b27ff3774524390e511241a85288947cc929519eff61a8734578f25bdf3d9969d84da20c1a749b19d90a55da8ae
+DIST commons-text-1.10.0-src.tar.gz 342224 BLAKE2B efed282c9fed7dae5766f7158136a4d7414ba0610e16a52fa2d12ee04e43960d47ec7c62f220c2ab881a13afa8a81cf85e453364e37c67550e15c314122ebf25 SHA512 6bf2dc7dda4429cb1b9ba3a4d383c1d9ffabd5ff35a0adc55216e7cf4c532e51b2b012c9b0f3ea859cd32aef75e05547d892301f34f304a0bfd27c39a28fe04f
diff --git a/dev-java/commons-text/commons-text-1.10.0.ebuild b/dev-java/commons-text/commons-text-1.10.0.ebuild
new file mode 100644
index 000000000000..6241e756e3c3
--- /dev/null
+++ b/dev-java/commons-text/commons-text-1.10.0.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri mirror://apache//commons/text/source/commons-text-1.10.0-src.tar.gz --slot 0 --keywords "~amd64 ~ppc64 ~x86" --ebuild commons-text-1.10.0.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="org.apache.commons:commons-text:1.10.0"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Apache Commons Text is a library focused on algorithms working on strings"
+HOMEPAGE="https://commons.apache.org/proper/commons-text/"
+SRC_URI="mirror://apache//commons/text/source/commons-text-${PV}-src.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ppc64 x86"
+
+# Common dependencies
+# POM: pom.xml
+# org.apache.commons:commons-lang3:3.12.0 -> >=dev-java/commons-lang-3.12.0:3.6
+
+CDEPEND="
+ dev-java/commons-lang:3.6
+"
+
+# Compile dependencies
+# POM: pom.xml
+# test? commons-io:commons-io:2.11.0 -> >=dev-java/commons-io-2.11.0:1
+# test? org.apache.commons:commons-rng-simple:1.4 -> !!!artifactId-not-found!!!
+# test? org.assertj:assertj-core:3.23.1 -> !!!suitable-mavenVersion-not-found!!!
+# test? org.graalvm.js:js:22.0.0.2 -> !!!groupId-not-found!!!
+# test? org.graalvm.js:js-scriptengine:22.0.0.2 -> !!!groupId-not-found!!!
+# test? org.junit.jupiter:junit-jupiter:5.9.1 -> !!!groupId-not-found!!!
+# test? org.mockito:mockito-inline:4.8.0 -> !!!artifactId-not-found!!!
+# test? org.openjdk.jmh:jmh-core:1.35 -> >=dev-java/jmh-core-1.35:0
+# test? org.openjdk.jmh:jmh-generator-annprocess:1.35 -> !!!artifactId-not-found!!!
+
+DEPEND="
+ >=virtual/jdk-1.8:*
+ ${CDEPEND}
+"
+
+RDEPEND="
+ >=virtual/jre-1.8:*
+ ${CDEPEND}"
+
+DOCS=( CONTRIBUTING.md NOTICE.txt README.md RELEASE-NOTES.txt )
+
+S="${WORKDIR}/${P}-src"
+
+JAVA_AUTOMATIC_MODULE_NAME="org.apache.commons.text"
+JAVA_ENCODING="ISO-8859-1"
+
+JAVA_GENTOO_CLASSPATH="commons-lang-3.6"
+JAVA_SRC_DIR="src/main/java"
diff --git a/dev-java/commons-text/commons-text-1.9.ebuild b/dev-java/commons-text/commons-text-1.9.ebuild
deleted file mode 100644
index 530b720f0f19..000000000000
--- a/dev-java/commons-text/commons-text-1.9.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://downloads.apache.org//commons/text/source/commons-text-1.9-src.tar.gz --slot 0 --keywords "~amd64 ~x86" --ebuild commons-text-1.9.ebuild
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source"
-MAVEN_ID="org.apache.commons:commons-text:1.9"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Apache Commons Text is a library focused on algorithms working on strings"
-HOMEPAGE="https://commons.apache.org/proper/commons-text"
-SRC_URI="https://downloads.apache.org//commons/text/source/${P}-src.tar.gz -> ${P}-sources.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
-
-# Common dependencies
-# POM: pom.xml
-# org.apache.commons:commons-lang3:3.11 -> >=dev-java/commons-lang-3.11:3.6
-
-CDEPEND="
- >=dev-java/commons-lang-3.11:3.6
-"
-
-DEPEND="
- >=virtual/jdk-1.8:*
- ${CDEPEND}
-"
-
-RDEPEND="
- >=virtual/jre-1.8:*
- ${CDEPEND}"
-
-S="${WORKDIR}/${P}-src"
-
-JAVA_ENCODING="ISO-8859-1"
-
-JAVA_GENTOO_CLASSPATH="commons-lang-3.6"
-JAVA_SRC_DIR="src/main/java"
diff --git a/dev-java/coursier-bin/Manifest b/dev-java/coursier-bin/Manifest
new file mode 100644
index 000000000000..d221834ae1ef
--- /dev/null
+++ b/dev-java/coursier-bin/Manifest
@@ -0,0 +1 @@
+DIST coursier-bin-2.1.0_rc2.gz 21077153 BLAKE2B 19ff645670b3f94162672b669063491f10e4ae8aee645fe0205f4f0dc80e9380ab045c665cdca792d93f1723348c8d267b01bfabc4db5014765757417d1cdc6e SHA512 9b822f8642a10afe7933c8f7bf246aea73b42e0d6ef5db0f9e4f9edee96a31a3d00111a8e1ba2e77898135131b6158dd3be5ca5ba3bac9ca95866aef881e5b80
diff --git a/dev-java/coursier-bin/coursier-bin-2.1.0_rc2.ebuild b/dev-java/coursier-bin/coursier-bin-2.1.0_rc2.ebuild
new file mode 100644
index 000000000000..32691c5ffc9b
--- /dev/null
+++ b/dev-java/coursier-bin/coursier-bin-2.1.0_rc2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+get_orig_coursier_pv() {
+ local orig_pv=$(ver_rs 3 -)
+ orig_pv=${orig_pv/rc/RC}
+ orig_pv=${orig_pv/pre/M}
+ echo "${orig_pv}"
+}
+
+DESCRIPTION="Java/Scala artifact fetching, bundling and deploying"
+HOMEPAGE="https://get-coursier.io/"
+SRC_URI="https://github.com/coursier/coursier/releases/download/v$(get_orig_coursier_pv)/cs-x86_64-pc-linux.gz -> ${P}.gz"
+
+KEYWORDS="~amd64"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+S="${WORKDIR}"
+
+RDEPEND=">=virtual/jre-8"
+
+QA_FLAGS_IGNORED="usr/bin/coursier"
+QA_TEXTRELS="usr/bin/coursier"
+
+src_install() {
+ newbin "${P}" coursier
+}
diff --git a/dev-java/coursier-bin/metadata.xml b/dev-java/coursier-bin/metadata.xml
new file mode 100644
index 000000000000..eb6b7081158b
--- /dev/null
+++ b/dev-java/coursier-bin/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type='person'>
+ <email>flow@gentoo.org</email>
+ <name>Florian Schmaus</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">coursier/coursier</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-java/easymock/Manifest b/dev-java/easymock/Manifest
index d534942235a7..36d55f52bdad 100644
--- a/dev-java/easymock/Manifest
+++ b/dev-java/easymock/Manifest
@@ -1 +1,2 @@
+DIST easymock-2.5.2.tar.gz 100112 BLAKE2B 2952aad1a88b169413152e8fa63eaba85767d93ccd8535e309cb647b90ad86695da59c394d1199abfb6f1c624913b2546f326ae5a68092261968d734d2018c5c SHA512 0343815f74258739ac60e1ef2fe72a0e9ce0e1b6ecd4f14d657d7da2a10523e24df5160533b0d75e87ffa0322a3477ec6823b257fe5968929d55dee9dfa68267
DIST easymock-3.3.1.tar.gz 624460 BLAKE2B bb5a472aef6c162d3afe5b66edef4891cc48fe6698c1f1eccc7f45f1883ff7f940b0479af5c0dd61b3354b41225ca50f191ba54b92479362a0074ddf3dbb5b43 SHA512 93fefd458a42b6c13d85ab1df768bf906620f052eea88116e93578374a5086eb8b27d8731e82b689dc3d73699e45d03b718c7d8bf2a430ac4a6a717365e52a9a
diff --git a/dev-java/easymock/easymock-2.5.2.ebuild b/dev-java/easymock/easymock-2.5.2.ebuild
new file mode 100644
index 000000000000..30cfb883f7a9
--- /dev/null
+++ b/dev-java/easymock/easymock-2.5.2.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/easymock/easymock/archive/easymock-2.5.2.tar.gz --slot 2.5 --keywords "~amd64" --ebuild easymock-2.5.2.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.easymock:easymock:2.5.2"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Mock Objects for interfaces in JUnit tests by generating them on the fly"
+HOMEPAGE="https://easymock.org"
+SRC_URI="https://github.com/easymock/easymock/archive/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="2.5"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
+
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
+
+PATCHES=(
+ "${FILESDIR}/easymock-2.5.5-nameClash.patch"
+ "${FILESDIR}/easymock-2.5.5-tests2nameClash.patch"
+)
+
+S="${WORKDIR}/easymock-easymock-${PV}"
+
+JAVA_SRC_DIR="src/main/java"
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_SRC_DIR="src/test/java"
+JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+
+src_prepare() {
+ default # https://bugs.gentoo.org/780585
+ # 1) testGetInstance(org.easymock.tests2.EasyMockPropertiesTest)
+ # java.lang.AssertionError: expected:<1> but was:<null>
+ sed \
+ -e '/import org.junit.Test/a import org.junit.Ignore;' \
+ -e '/testGetInstance()/i @Ignore' \
+ -i src/test/java/org/easymock/tests2/EasyMockPropertiesTest.java || die
+
+ # 2) testPrimitiveDeprecated(org.easymock.tests2.CaptureTest)
+ # java.lang.AssertionError:
+ # 3) testPrimitiveVsObject(org.easymock.tests2.CaptureTest)
+ # java.lang.AssertionError:
+ sed \
+ -e '/import org.junit.Test/a import org.junit.Ignore;' \
+ -e '/testPrimitiveDeprecated()/i @Ignore' \
+ -e '/testPrimitiveVsObject()/i @Ignore' \
+ -i src/test/java/org/easymock/tests2/CaptureTest.java || die
+}
diff --git a/dev-java/easymock/easymock-3.3.1-r1.ebuild b/dev-java/easymock/easymock-3.3.1-r1.ebuild
index 8a7db3b2235f..0193c3bb5f12 100644
--- a/dev-java/easymock/easymock-3.3.1-r1.ebuild
+++ b/dev-java/easymock/easymock-3.3.1-r1.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
JAVA_PKG_IUSE="doc source test"
MAVEN_ID="org.easymock:easymock:3.3.1"
diff --git a/dev-java/easymock/files/easymock-2.5.5-nameClash.patch b/dev-java/easymock/files/easymock-2.5.5-nameClash.patch
new file mode 100644
index 000000000000..7a4f0d92ab64
--- /dev/null
+++ b/dev-java/easymock/files/easymock-2.5.5-nameClash.patch
@@ -0,0 +1,230 @@
+--- a/src/main/java/org/easymock/EasyMock.java Thu Feb 23 10:32:43 2012 +0100
++++ b/src/main/java/org/easymock/EasyMock.java Thu Feb 23 11:25:46 2012 +0100
+@@ -1452,81 +1452,200 @@
+
+ /**
+ * Expect any object but captures it for later use.
+- *
+- * @param <T> Type of the captured object
+- * @param captured Where the parameter is captured
++ *
++ * @param <T>
++ * Type of the captured object
++ * @param captured
++ * Where the parameter is captured
+ * @return <code>null</code>
+ */
+- public static <T> T capture(Capture<T> captured) {
++ public static <T> T capture(final Capture<T> captured) {
+ reportMatcher(new Captures<T>(captured));
+ return null;
+ }
+-
++
++ /**
++ * Expect any boolean but captures it for later use.
++ *
++ * @param captured
++ * Where the parameter is captured
++ * @return <code>false</code>
++ */
++ public static boolean captureBoolean(final Capture<Boolean> captured) {
++ reportMatcher(new Captures<Boolean>(captured));
++ return false;
++ }
++
++// /**
++// * Expect any boolean but captures it for later use.
++// *
++// * @param captured
++// * Where the parameter is captured
++// * @return <code>0</code>
++// *
++// * @deprecated Because of harder erasure enforcement, doesn't compile in
++// * Java 7
++// */
++// @Deprecated
++// public static boolean capture(final Capture<Boolean> captured) {
++// return captureBoolean(captured);
++// }
++
+ /**
+ * Expect any int but captures it for later use.
+- *
+- * @param captured Where the parameter is captured
++ *
++ * @param captured
++ * Where the parameter is captured
+ * @return <code>0</code>
+ */
+- public static int capture(Capture<Integer> captured) {
++ public static int captureInt(final Capture<Integer> captured) {
+ reportMatcher(new Captures<Integer>(captured));
+ return 0;
+ }
+-
++// /**
++// * Expect any int but captures it for later use.
++// *
++// * @param captured
++// * Where the parameter is captured
++// * @return <code>0</code>
++// *
++// * @deprecated Because of harder erasure enforcement, doesn't compile in
++// * Java 7
++// */
++// @Deprecated
++// public static int capture(final Capture<Integer> captured) {
++// return captureInt(captured);
++// }
++
+ /**
+ * Expect any long but captures it for later use.
+- *
+- * @param captured Where the parameter is captured
++ *
++ * @param captured
++ * Where the parameter is captured
+ * @return <code>0</code>
+ */
+- public static long capture(Capture<Long> captured) {
++ public static long captureLong(final Capture<Long> captured) {
+ reportMatcher(new Captures<Long>(captured));
+ return 0;
+ }
+-
++// /**
++// * Expect any long but captures it for later use.
++// *
++// * @param captured
++// * Where the parameter is captured
++// * @return <code>0</code>
++// *
++// * @deprecated Because of harder erasure enforcement, doesn't compile in
++// * Java 7
++// */
++// @Deprecated
++// public static long capture(final Capture<Long> captured) {
++// return captureLong(captured);
++// }
++
+ /**
+ * Expect any float but captures it for later use.
+- *
+- * @param captured Where the parameter is captured
++ *
++ * @param captured
++ * Where the parameter is captured
+ * @return <code>0</code>
+ */
+- public static float capture(Capture<Float> captured) {
++ public static float captureFloat(final Capture<Float> captured) {
+ reportMatcher(new Captures<Float>(captured));
+ return 0;
+ }
+-
++// /**
++// * Expect any float but captures it for later use.
++// *
++// * @param captured
++// * Where the parameter is captured
++// * @return <code>0</code>
++// *
++// * @deprecated Because of harder erasure enforcement, doesn't compile in
++// * Java 7
++// */
++// @Deprecated
++// public static float capture(final Capture<Float> captured) {
++// return captureFloat(captured);
++// }
++
+ /**
+ * Expect any double but captures it for later use.
+- *
+- * @param captured Where the parameter is captured
++ *
++ * @param captured
++ * Where the parameter is captured
+ * @return <code>0</code>
+ */
+- public static double capture(Capture<Double> captured) {
++ public static double captureDouble(final Capture<Double> captured) {
+ reportMatcher(new Captures<Double>(captured));
+ return 0;
+ }
++// /**
++// * Expect any double but captures it for later use.
++// *
++// * @param captured
++// * Where the parameter is captured
++// * @return <code>0</code>
++// *
++// * @deprecated Because of harder erasure enforcement, doesn't compile in
++// * Java 7
++// */
++// @Deprecated
++// public static double capture(final Capture<Double> captured) {
++// return captureDouble(captured);
++// }
+
+ /**
+ * Expect any byte but captures it for later use.
+- *
+- * @param captured Where the parameter is captured
++ *
++ * @param captured
++ * Where the parameter is captured
+ * @return <code>0</code>
+ */
+- public static byte capture(Capture<Byte> captured) {
++ public static byte captureByte(final Capture<Byte> captured) {
+ reportMatcher(new Captures<Byte>(captured));
+ return 0;
+ }
+-
++// /**
++// * Expect any byte but captures it for later use.
++// *
++// * @param captured
++// * Where the parameter is captured
++// * @return <code>0</code>
++// *
++// * @deprecated Because of harder erasure enforcement, doesn't compile in
++// * Java 7
++// */
++// @Deprecated
++// public static byte capture(final Capture<Byte> captured) {
++// return captureByte(captured);
++// }
++
+ /**
+ * Expect any char but captures it for later use.
+- *
+- * @param captured Where the parameter is captured
++ *
++ * @param captured
++ * Where the parameter is captured
+ * @return <code>0</code>
+ */
+- public static char capture(Capture<Character> captured) {
++ public static char captureChar(final Capture<Character> captured) {
+ reportMatcher(new Captures<Character>(captured));
+ return 0;
+ }
++// /**
++// * Expect any char but captures it for later use.
++// *
++// * @param captured
++// * Where the parameter is captured
++// * @return <code>0</code>
++// *
++// * @deprecated Because of harder erasure enforcement, doesn't compile in
++// * Java 7
++// */
++// @Deprecated
++// public static char capture(final Capture<Character> captured) {
++// return captureChar(captured);
++// }
+
+ /**
+ * Switches the given mock objects (more exactly: the controls of the mock
diff --git a/dev-java/easymock/files/easymock-2.5.5-tests2nameClash.patch b/dev-java/easymock/files/easymock-2.5.5-tests2nameClash.patch
new file mode 100644
index 000000000000..23ed754e3854
--- /dev/null
+++ b/dev-java/easymock/files/easymock-2.5.5-tests2nameClash.patch
@@ -0,0 +1,420 @@
+--- a/src/test/java/org/easymock/tests2/CaptureTest.java Thu Feb 23 10:32:43 2012 +0100
++++ b/src/test/java/org/easymock/tests2/CaptureTest.java Thu Feb 23 11:25:46 2012 +0100
+@@ -1,12 +1,12 @@
+-/*
+- * Copyright 2003-2009 OFFIS, Henri Tremblay
+- *
++/**
++ * Copyright 2001-2011 the original author or authors.
++ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+- *
++ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+- *
++ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@@ -27,10 +27,13 @@
+ import org.junit.Before;
+ import org.junit.Test;
+
++/**
++ * @author Henri Tremblay
++ */
+ public class CaptureTest {
+
+ public static class A {
+- public String foo(IMethods methods) {
++ public String foo(final IMethods methods) {
+ return methods.oneArg(2);
+ }
+ }
+@@ -42,16 +45,16 @@
+ @After
+ public void tearDown() throws Exception {
+ }
+-
+- private Capture<Integer> testCaptureType(CaptureType type) {
+- IMethods mock = createMock(IMethods.class);
+- Capture<Integer> captured = new Capture<Integer>(type);
+-
+- expect(mock.oneArg(capture(captured))).andReturn("1");
++
++ private Capture<Integer> testCaptureType(final CaptureType type) {
++ final IMethods mock = createMock(IMethods.class);
++ final Capture<Integer> captured = new Capture<Integer>(type);
++
++ expect(mock.oneArg(captureInt(captured))).andReturn("1");
+ expect(mock.oneArg(anyInt())).andReturn("1");
+- expect(mock.oneArg(capture(captured))).andReturn("2").times(2);
+- mock.twoArgumentMethod(capture(captured), eq(5));
+- mock.twoArgumentMethod(capture(captured), capture(captured));
++ expect(mock.oneArg(captureInt(captured))).andReturn("2").times(2);
++ mock.twoArgumentMethod(captureInt(captured), eq(5));
++ mock.twoArgumentMethod(captureInt(captured), captureInt(captured));
+
+ replay(mock);
+
+@@ -66,28 +69,28 @@
+
+ return captured;
+ }
+-
++
+ @Test
+ public void testCaptureFirst() {
+- Capture<Integer> captured = testCaptureType(CaptureType.FIRST);
++ final Capture<Integer> captured = testCaptureType(CaptureType.FIRST);
+ assertEquals(0, (int) captured.getValue());
+ }
+
+ @Test
+ public void testCaptureLast() {
+- Capture<Integer> captured = testCaptureType(CaptureType.LAST);
++ final Capture<Integer> captured = testCaptureType(CaptureType.LAST);
+ assertEquals(7, (int) captured.getValue());
+ }
+
+ @Test
+ public void testCaptureAll() {
+- Capture<Integer> captured = testCaptureType(CaptureType.ALL);
++ final Capture<Integer> captured = testCaptureType(CaptureType.ALL);
+ assertEquals(Arrays.asList(0, 2, 3, 4, 6, 7), captured.getValues());
+ }
+
+ @Test
+ public void testCaptureNone() {
+- Capture<Integer> captured = testCaptureType(CaptureType.NONE);
++ final Capture<Integer> captured = testCaptureType(CaptureType.NONE);
+ assertFalse(captured.hasCaptured());
+ }
+
+@@ -96,11 +99,10 @@
+
+ @Test
+ public void testCaptureRightOne() {
+- Capture<String> captured = new Capture<String>();
+- IMethods mock = createMock(IMethods.class);
++ final Capture<String> captured = new Capture<String>();
++ final IMethods mock = createMock(IMethods.class);
+
+- expect(mock.oneArg(and(eq("test"), capture(captured)))).andReturn(
+- "answer1");
++ expect(mock.oneArg(and(eq("test"), capture(captured)))).andReturn("answer1");
+ expect(mock.oneArg("a")).andReturn("answer2");
+
+ replay(mock);
+@@ -114,10 +116,11 @@
+ verify(mock);
+ }
+
++ @SuppressWarnings("deprecation")
+ @Test
+ public void testPrimitiveVsObject() {
+- Capture<Integer> capture = new Capture<Integer>();
+- IMethods mock = createMock(IMethods.class);
++ final Capture<Integer> capture = new Capture<Integer>();
++ final IMethods mock = createMock(IMethods.class);
+
+ expect(mock.oneArg(capture(capture))).andReturn("answer");
+ expect(mock.oneArg((Integer) capture(capture))).andReturn("answer");
+@@ -135,11 +138,10 @@
+
+ @Test
+ public void testAnd() {
+- Capture<String> captured = new Capture<String>();
+- IMethods mock = createMock(IMethods.class);
++ final Capture<String> captured = new Capture<String>();
++ final IMethods mock = createMock(IMethods.class);
+
+- expect(mock.oneArg(and(capture(captured), eq("test")))).andReturn(
+- "answer");
++ expect(mock.oneArg(and(capture(captured), eq("test")))).andReturn("answer");
+
+ replay(mock);
+
+@@ -148,17 +150,19 @@
+
+ verify(mock);
+ }
+-
++
++ @SuppressWarnings("deprecation")
+ @Test
+- public void testPrimitive() {
+- Capture<Integer> captureI = new Capture<Integer>();
+- Capture<Long> captureL = new Capture<Long>();
+- Capture<Float> captureF = new Capture<Float>();
+- Capture<Double> captureD = new Capture<Double>();
+- Capture<Byte> captureB = new Capture<Byte>();
+- Capture<Character> captureC = new Capture<Character>();
++ public void testPrimitiveDeprecated() {
++ final Capture<Integer> captureI = new Capture<Integer>();
++ final Capture<Long> captureL = new Capture<Long>();
++ final Capture<Float> captureF = new Capture<Float>();
++ final Capture<Double> captureD = new Capture<Double>();
++ final Capture<Byte> captureB = new Capture<Byte>();
++ final Capture<Character> captureC = new Capture<Character>();
++ final Capture<Boolean> captureBool = new Capture<Boolean>();
+
+- IMethods mock = createMock(IMethods.class);
++ final IMethods mock = createMock(IMethods.class);
+
+ expect(mock.oneArg(capture(captureI))).andReturn("answerI");
+ expect(mock.oneArg(capture(captureL))).andReturn("answerL");
+@@ -166,6 +170,7 @@
+ expect(mock.oneArg(capture(captureD))).andReturn("answerD");
+ expect(mock.oneArg(capture(captureB))).andReturn("answerB");
+ expect(mock.oneArg(capture(captureC))).andReturn("answerC");
++ expect(mock.oneArg(capture(captureBool))).andReturn("answerZ");
+
+ replay(mock);
+
+@@ -175,6 +180,7 @@
+ assertEquals("answerD", mock.oneArg(4.0));
+ assertEquals("answerB", mock.oneArg((byte) 5));
+ assertEquals("answerC", mock.oneArg((char) 6));
++ assertEquals("answerZ", mock.oneArg(true));
+
+ assertEquals(1, captureI.getValue().intValue());
+ assertEquals(2l, captureL.getValue().longValue());
+@@ -182,19 +188,60 @@
+ assertEquals(4.0, captureD.getValue().doubleValue(), 0.0);
+ assertEquals((byte) 5, captureB.getValue().byteValue());
+ assertEquals((char) 6, captureC.getValue().charValue());
+-
++ assertEquals(true, captureBool.getValue().booleanValue());
++
+ verify(mock);
+ }
+-
++
++ @Test
++ public void testPrimitive() {
++ final Capture<Integer> captureI = new Capture<Integer>();
++ final Capture<Long> captureL = new Capture<Long>();
++ final Capture<Float> captureF = new Capture<Float>();
++ final Capture<Double> captureD = new Capture<Double>();
++ final Capture<Byte> captureB = new Capture<Byte>();
++ final Capture<Character> captureC = new Capture<Character>();
++ final Capture<Boolean> captureBool = new Capture<Boolean>();
++
++ final IMethods mock = createMock(IMethods.class);
++
++ expect(mock.oneArg(captureInt(captureI))).andReturn("answerI");
++ expect(mock.oneArg(captureLong(captureL))).andReturn("answerL");
++ expect(mock.oneArg(captureFloat(captureF))).andReturn("answerF");
++ expect(mock.oneArg(captureDouble(captureD))).andReturn("answerD");
++ expect(mock.oneArg(captureByte(captureB))).andReturn("answerB");
++ expect(mock.oneArg(captureChar(captureC))).andReturn("answerC");
++ expect(mock.oneArg(captureBoolean(captureBool))).andReturn("answerZ");
++
++ replay(mock);
++
++ assertEquals("answerI", mock.oneArg(1));
++ assertEquals("answerL", mock.oneArg(2l));
++ assertEquals("answerF", mock.oneArg(3.0f));
++ assertEquals("answerD", mock.oneArg(4.0));
++ assertEquals("answerB", mock.oneArg((byte) 5));
++ assertEquals("answerC", mock.oneArg((char) 6));
++ assertEquals("answerZ", mock.oneArg(true));
++
++ assertEquals(1, captureI.getValue().intValue());
++ assertEquals(2l, captureL.getValue().longValue());
++ assertEquals(3.0f, captureF.getValue().floatValue(), 0.0);
++ assertEquals(4.0, captureD.getValue().doubleValue(), 0.0);
++ assertEquals((byte) 5, captureB.getValue().byteValue());
++ assertEquals((char) 6, captureC.getValue().charValue());
++ assertEquals(true, captureBool.getValue().booleanValue());
++
++ verify(mock);
++ }
++
+ @Test
+ public void testCapture() {
+- Capture<String> capture = new Capture<String>();
++ final Capture<String> capture = new Capture<String>();
+ assertFalse(capture.hasCaptured());
+ try {
+ capture.getValue();
+ fail("Should not be allowed");
+- }
+- catch(AssertionError e) {
++ } catch (final AssertionError e) {
+ assertEquals("Nothing captured yet", e.getMessage());
+ }
+ assertEquals("Nothing captured yet", capture.toString());
+@@ -207,29 +254,26 @@
+ try {
+ capture.getValue();
+ fail();
+- }
+- catch(AssertionError e) {
++ } catch (final AssertionError e) {
+ assertEquals("Nothing captured yet", e.getMessage());
+ }
+-
++
+ capture.setValue(null);
+ assertTrue(capture.hasCaptured());
+ assertNull(capture.getValue());
+ assertEquals("null", capture.toString());
+ }
+-
++
+ @Test
+ public void testCaptureMultiple() {
+- Capture<String> capture = new Capture<String>(CaptureType.ALL);
++ final Capture<String> capture = new Capture<String>(CaptureType.ALL);
+ capture.setValue("a");
+ capture.setValue("b");
+ try {
+ capture.getValue();
+ fail();
+- } catch (AssertionError e) {
+- assertEquals(
+- "More than one value captured: " + capture.getValues(), e
+- .getMessage());
++ } catch (final AssertionError e) {
++ assertEquals("More than one value captured: " + capture.getValues(), e.getMessage());
+ }
+ assertEquals(Arrays.asList("a", "b"), capture.getValues());
+ }
+@@ -237,30 +281,26 @@
+ @Test
+ public void testCapture_2617107() {
+
+- IMethods mock = createMock(IMethods.class);
++ final IMethods mock = createMock(IMethods.class);
+
+- Capture<String> cap1 = new Capture<String>();
+- Capture<String> cap2 = new Capture<String>();
+- Capture<String> cap3 = new Capture<String>();
+- Capture<String> cap4 = new Capture<String>();
++ final Capture<String> cap1 = new Capture<String>();
++ final Capture<String> cap2 = new Capture<String>();
++ final Capture<String> cap3 = new Capture<String>();
++ final Capture<String> cap4 = new Capture<String>();
+
+- mock.simpleMethodWithArgument(and(isA(String.class),
+- capture(cap1)));
+- mock.simpleMethodWithArgument(and(isA(String.class),
+- capture(cap2)));
+- mock.simpleMethodWithArgument(and(isA(String.class),
+- capture(cap3)));
+- mock.simpleMethodWithArgument(and(isA(String.class),
+- capture(cap4)));
++ mock.simpleMethodWithArgument(and(isA(String.class), capture(cap1)));
++ mock.simpleMethodWithArgument(and(isA(String.class), capture(cap2)));
++ mock.simpleMethodWithArgument(and(isA(String.class), capture(cap3)));
++ mock.simpleMethodWithArgument(and(isA(String.class), capture(cap4)));
+
+ replay(mock);
+
+ final String[] s = { "one", "two", "three", "four" };
+
+- for (int i = 0; i < s.length; i++) {
+- mock.simpleMethodWithArgument(s[i]);
++ for (final String element : s) {
++ mock.simpleMethodWithArgument(element);
+ }
+-
++
+ assertEquals("one", cap1.getValue());
+ assertEquals("two", cap2.getValue());
+ assertEquals("three", cap3.getValue());
+@@ -268,7 +308,7 @@
+
+ verify(mock);
+ }
+-
++
+ @Test
+ public void testCaptureNonStrictControl_2133741() {
+ testCaptureHelper(createMock(IMethods.class));
+@@ -279,9 +319,9 @@
+ testCaptureHelper(createStrictMock(IMethods.class));
+ }
+
+- protected void testCaptureHelper(IMethods mock) {
+- Capture<String> capture1 = new Capture<String>();
+- Capture<String> capture2 = new Capture<String>();
++ protected void testCaptureHelper(final IMethods mock) {
++ final Capture<String> capture1 = new Capture<String>();
++ final Capture<String> capture2 = new Capture<String>();
+
+ mock.simpleMethodWithArgument(capture(capture1));
+ mock.simpleMethodWithArgument(capture(capture2));
+@@ -294,25 +334,25 @@
+ assertTrue(capture1.hasCaptured());
+ assertTrue(capture2.hasCaptured());
+ assertFalse(capture1.getValue() == capture2.getValue());
+- }
+-
++ }
++
+ @Test
+ public void testCapture1_2446744() {
+- Capture<String> capture1 = new Capture<String>();
+- Capture<String> capture2 = new Capture<String>();
+- Capture<String> capture3 = new Capture<String>();
+- IMethods mock = createMock(IMethods.class);
++ final Capture<String> capture1 = new Capture<String>();
++ final Capture<String> capture2 = new Capture<String>();
++ final Capture<String> capture3 = new Capture<String>();
++ final IMethods mock = createMock(IMethods.class);
+ expect(mock.oneArg(capture(capture1))).andReturn("1").once();
+ expect(mock.oneArg(capture(capture2))).andReturn("2").once();
+ expect(mock.oneArg(capture(capture3))).andReturn("3").once();
+-
++
+ replay(mock);
+-
++
+ for (int i = 0; i < 3; i++) {
+- String string = "Run" + (i + 1);
++ final String string = "Run" + (i + 1);
+ mock.oneArg(string);
+ }
+-
++
+ assertEquals("Run3", capture3.getValue());
+ assertEquals("Run2", capture2.getValue());
+ assertEquals("Run1", capture1.getValue());
+@@ -320,16 +360,16 @@
+
+ @Test
+ public void testCapture2_2446744() {
+- Capture<String> capture = new Capture<String>(CaptureType.ALL);
+- IMethods mock = createMock(IMethods.class);
++ final Capture<String> capture = new Capture<String>(CaptureType.ALL);
++ final IMethods mock = createMock(IMethods.class);
+ expect(mock.oneArg(capture(capture))).andReturn("1").once();
+ expect(mock.oneArg(capture(capture))).andReturn("2").once();
+ expect(mock.oneArg(capture(capture))).andReturn("3").once();
+-
++
+ replay(mock);
+-
++
+ for (int i = 0; i < 3; i++) {
+- String string = "Run" + (i + 1);
++ final String string = "Run" + (i + 1);
+ mock.oneArg(string);
+ }
+
+@@ -338,8 +378,8 @@
+
+ @Test
+ public void testCaptureFromStub() {
+- Capture<String> capture = new Capture<String>(CaptureType.ALL);
+- IMethods mock = createMock(IMethods.class);
++ final Capture<String> capture = new Capture<String>(CaptureType.ALL);
++ final IMethods mock = createMock(IMethods.class);
+ expect(mock.oneArg(capture(capture))).andStubReturn("1");
+
+ replay(mock);
diff --git a/dev-java/eclipse-ecj/Manifest b/dev-java/eclipse-ecj/Manifest
index 8445570a7ca7..00234773ac65 100644
--- a/dev-java/eclipse-ecj/Manifest
+++ b/dev-java/eclipse-ecj/Manifest
@@ -1,2 +1,3 @@
DIST ecjsrc-4.15.jar 2166228 BLAKE2B 794e0ba1a19b325e2dd8ad0b288ccbe04866627670b50d39dd327c13fe1fac56200eb3a6c1c3d1af043cad795508b9b714a5243049671414b5a62a97725d3297 SHA512 ada55b2522cf26570f0cd43f415eb5cf20e6840f83dadc72e1ae474ebf10eadca73f9fa3d1db51e13fd2762c38cd3e3567db3c7840d43ae3d8665ebe35e1889d
DIST ecjsrc-4.22.jar 2358194 BLAKE2B e091050297b4556c38adfb01fb1e43e13644af1b3c2b30a93cfe3fdbb55050a0f7709081c7406d384d7141de67a954253aa26cdbb45f56327b16ee5ddd5e82a7 SHA512 cd52a72aecded032625ee83581ac565e1e96f8d26ecfc76e982274fd3d6238f1e7f22576855589b021e9a5ef67686b9b75e010c4e2033a8b7f6e7c9b1ff7eb4c
+DIST ecjsrc-4.25.jar 2340770 BLAKE2B e1e82356984a72e7ebbd5ace2ccbaf885c7acfdaf410b2386fa0a143f85e4431cfa2f5d254197eb56203c48505bc7dbe264664815b572c725ac5814645254776 SHA512 b475d58ef6a03e4bbf7e0f440edcbdd61e0548f68e48c7762973f60850a14fc1c234bb9a41be404ed06db14a273646f1dc5ad7effd4c7146b46f40a52850f236
diff --git a/dev-java/eclipse-ecj/eclipse-ecj-4.25.ebuild b/dev-java/eclipse-ecj/eclipse-ecj-4.25.ebuild
new file mode 100644
index 000000000000..25f270741274
--- /dev/null
+++ b/dev-java/eclipse-ecj/eclipse-ecj-4.25.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_PN="ecj"
+DMF="R-${PV}-202208311800"
+
+DESCRIPTION="Eclipse Compiler for Java"
+HOMEPAGE="https://www.eclipse.org/"
+SRC_URI="https://download.eclipse.org/eclipse/downloads/drops4/${DMF}/${MY_PN}src-${PV}.jar"
+
+LICENSE="EPL-1.0"
+KEYWORDS="amd64 ~ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris"
+SLOT="4.25"
+IUSE="+ant"
+
+COMMON_DEP="
+ app-eselect/eselect-java
+ dev-java/ant-core:0"
+RDEPEND="${COMMON_DEP}
+ >=virtual/jre-11:*"
+DEPEND="${COMMON_DEP}
+ >=virtual/jdk-17:*
+ app-arch/unzip"
+PDEPEND="
+ ant? ( ~dev-java/ant-eclipse-ecj-${PV} )"
+
+JAVA_JAR_FILENAME="${MY_PN}.jar"
+JAVA_GENTOO_CLASSPATH="ant-core"
+
+S="${WORKDIR}"
+
+# See https://bugs.eclipse.org/bugs/show_bug.cgi?id=479134 for details
+src_prepare() {
+ default
+
+ # These have their own package.
+ rm org/eclipse/jdt/core/JDTCompilerAdapter.java || die
+ rm -r org/eclipse/jdt/internal/antadapter || die
+
+ # JavaCore is not distributed in the jar
+ sed -i -e '/import org.eclipse.jdt.core.JavaCore;/d' \
+ -e 's|JavaCore.getOptions()||g' \
+ org/eclipse/jdt/internal/compiler/batch/ClasspathDirectory.java
+}
+
+src_compile() {
+ java-pkg-simple_src_compile
+ find org META-INF -type f ! -name "*.java" | xargs jar uvf "${JAVA_JAR_FILENAME}" || die "jar update failed"
+}
+
+src_install() {
+ java-pkg-simple_src_install
+ java-pkg_dolauncher ${MY_PN}-${SLOT} --main \
+ org.eclipse.jdt.internal.compiler.batch.Main
+}
+
+pkg_postinst() {
+ einfo "To select between slots of ECJ..."
+ einfo " # eselect ecj"
+
+ eselect ecj update ecj-${SLOT}
+}
+
+pkg_postrm() {
+ eselect ecj update
+}
diff --git a/dev-java/eclipse-ecj/metadata.xml b/dev-java/eclipse-ecj/metadata.xml
index 6820dbb133ed..de58dba6e94e 100644
--- a/dev-java/eclipse-ecj/metadata.xml
+++ b/dev-java/eclipse-ecj/metadata.xml
@@ -13,6 +13,6 @@ used with Ant by using the -lib option to and and setting
-Dbuild.compiler=ecj
</longdescription>
<use>
- <flag name="ant">Support using ecj in Ant builds via dev-java/ant-eclipse-ecj</flag>
+ <flag name="ant">Support using ecj in Ant builds via <pkg>dev-java/ant-eclipse-ecj</pkg></flag>
</use>
</pkgmetadata>
diff --git a/dev-java/fastinfoset/fastinfoset-2.1.0-r1.ebuild b/dev-java/fastinfoset/fastinfoset-2.1.0-r1.ebuild
index 7f4e952e82bf..011a70f41489 100644
--- a/dev-java/fastinfoset/fastinfoset-2.1.0-r1.ebuild
+++ b/dev-java/fastinfoset/fastinfoset-2.1.0-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/eclipse-ee4j/jaxb-fi/archive/${PV}.tar.gz -> ${P}.ta
LICENSE="Apache-2.0 EPL-1.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
DEPEND="
>=virtual/jdk-11:*
diff --git a/dev-java/felix-framework/Manifest b/dev-java/felix-framework/Manifest
new file mode 100644
index 000000000000..7c129e4b6fc7
--- /dev/null
+++ b/dev-java/felix-framework/Manifest
@@ -0,0 +1 @@
+DIST felix-framework-7.0.5.tar.gz 505118 BLAKE2B 3652d46dfb4c9c5b43b159450b81ad896483fb2df40165d7e7b8bbd718c8e3297163065474bd10f3858ff7fc2646134ed470e34ede8eeb5efc05cec75f1a7aec SHA512 58fa96500fed827c348a47ac8672aeb4e5b94bfd681c4cde610b3a453fd2abfe2d631742281a192c76718ee83fc4c30980a5179926ff3bc7b8ea649ef07f34a3
diff --git a/dev-java/felix-framework/felix-framework-7.0.5.ebuild b/dev-java/felix-framework/felix-framework-7.0.5.ebuild
new file mode 100644
index 000000000000..df163b2381bb
--- /dev/null
+++ b/dev-java/felix-framework/felix-framework-7.0.5.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri mirror://apache/felix/org.apache.felix.framework-7.0.5-source-release.tar.gz --slot 0 --keywords "~amd64" --ebuild felix-framework-7.0.5.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.apache.felix:org.apache.felix.framework:7.0.5"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Implementation of the OSGi R8 core framework specification"
+HOMEPAGE="https://felix.apache.org/documentation/subprojects/apache-felix-framework.html"
+SRC_URI="mirror://apache/felix/org.apache.${PN//-/.}-${PV}-source-release.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
+
+# Common dependencies
+# POM: pom.xml
+# org.codehaus.mojo:animal-sniffer-annotations:1.9 -> >=dev-java/animal-sniffer-annotations-1.15:0
+
+CP_DEPEND="dev-java/animal-sniffer-annotations:0"
+
+# Compile dependencies
+# POM: pom.xml
+# org.apache.felix:org.apache.felix.resolver:2.0.4 -> >=dev-java/felix-resolver-2.0.4:0
+# org.osgi:org.osgi.annotation:6.0.0 -> !!!artifactId-not-found!!!
+# POM: pom.xml
+# test? junit:junit:4.12 -> >=dev-java/junit-4.13.2:4
+# test? org.easymock:easymock:2.5.2 -> >=dev-java/easymock-2.5.2:2.5
+# test? org.mockito:mockito-all:1.10.19 -> !!!artifactId-not-found!!!
+# test? org.ow2.asm:asm-all:5.2 -> !!!artifactId-not-found!!!
+
+DEPEND="
+ >=virtual/jdk-11:*
+ ${CP_DEPEND}
+ dev-java/osgi-annotation:0
+ dev-java/felix-resolver:0
+ test? (
+ dev-java/asm:4
+ dev-java/easymock:2.5
+ dev-java/mockito:0
+ )
+"
+
+RDEPEND="
+ >=virtual/jre-1.8:*
+ ${CP_DEPEND}"
+
+S="${WORKDIR}/org.apache.felix.framework-${PV}"
+
+JAVA_CLASSPATH_EXTRA="felix-resolver,osgi-annotation"
+JAVA_SRC_DIR="src/main/java"
+JAVA_RESOURCE_DIRS="src/main/resources"
+
+JAVA_TEST_GENTOO_CLASSPATH="asm-4,junit-4,easymock-2.5,mockito"
+JAVA_TEST_SRC_DIR="src/test/java"
+
+src_prepare() {
+ default
+ # 58,91 pom.xml
+ cat > src/main/java/module-info.java <<-EOF
+ $( sed -n '/<moduleInfoSource>/,/<\/moduleInfoSource/p' pom.xml \
+ | grep -v moduleInfoSource )
+ EOF
+
+ sed -e 's/{dollar}//g' -i src/main/resources/default.properties || die
+
+ sed -e "s:\${pom.version}:${PV}:" \
+ -i src/main/resources/org/apache/felix/framework/Felix.properties || die
+
+ # bundling some classes from felix-resolver according to 99,132 pom.xml
+ # if we don't bundle compilation would fail with:
+ # src/main/java/module-info.java:23: error: package is empty or does not exist: org.osgi.service.resolver
+ cd src/main/resources || die
+ jar xvf "$(java-pkg_getjar --build-only felix-resolver felix-resolver.jar)" \
+ org/{apache/felix,osgi/service}/resolver/ || die
+}
+
+src_compile() {
+ java-pkg-simple_src_compile
+
+ # according to pom.xml, line 129
+ # grep the line between <Add-opens> and </Add-opens> from pom.xml
+ local add_opens="$(sed -n '/<Add-opens>/,/<\/Add-opens/p' pom.xml \
+ | grep -v Add-opens | tr -s '[:space:]')" || die
+ echo "Add-opens:${add_opens}" > "${T}/Add-opens-to-MANIFEST.MF" \
+ || die "Add-opens-to-MANIFEST.MF failed"
+ jar ufmv ${JAVA_JAR_FILENAME} "${T}/Add-opens-to-MANIFEST.MF" \
+ || die "updating MANIFEST.MF failed"
+}
+
+src_test() {
+ # java.base does not "opens java.lang" to unnamed module
+ # adding it to MANIFEST.MF would not fix the test failures.
+ local vm_version="$(java-config -g PROVIDES_VERSION)"
+ if ver_test "${vm_version}" -ge 17; then
+ JAVA_TEST_EXTRA_ARGS+=( --add-opens=java.base/java.lang=ALL-UNNAMED )
+ fi
+ java-pkg-simple_src_test
+}
diff --git a/dev-java/felix-framework/metadata.xml b/dev-java/felix-framework/metadata.xml
new file mode 100644
index 000000000000..e6816da2d497
--- /dev/null
+++ b/dev-java/felix-framework/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>java@gentoo.org</email>
+ </maintainer>
+ <upstream>
+ <bugs-to>https://issues.apache.org/jira/browse/FELIX</bugs-to>
+ <doc>https://felix.apache.org/documentation/subprojects/apache-felix-framework.html</doc>
+ <remote-id type="github">apache/felix-dev</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-java/felix-main/Manifest b/dev-java/felix-main/Manifest
new file mode 100644
index 000000000000..91eadc1ce506
--- /dev/null
+++ b/dev-java/felix-main/Manifest
@@ -0,0 +1 @@
+DIST felix-main-7.0.5.tar.gz 255198 BLAKE2B 289e2305b15c28f985bee1d8687db6ecb5098a2086da6fd32a7db8572f83a1ac37e49deeb89d657d48b943a626d400caccd8185ced565e8c65aa558395aeef05 SHA512 e06f6c330a73100a739575e92a6f0af263a98643bbd6fd6661e799c2a11c8c9d9589f1f5b8802799ffcae7007e8362c629055fa8b25a50a4fa736ed2ba2955b0
diff --git a/dev-java/felix-main/felix-main-7.0.5-r1.ebuild b/dev-java/felix-main/felix-main-7.0.5-r1.ebuild
new file mode 100644
index 000000000000..60e9162ace4a
--- /dev/null
+++ b/dev-java/felix-main/felix-main-7.0.5-r1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri mirror://apache/felix/org.apache.felix.main-7.0.5-source-release.tar.gz --slot 0 --keywords "~amd64" --ebuild felix-main-7.0.5.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="org.apache.felix:org.apache.felix.main:7.0.5"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Open source OSGi framework by Apache Software Foundation"
+HOMEPAGE="https://felix.apache.org/documentation/index.html"
+SRC_URI="mirror://apache/felix/org.apache.${PN//-/.}-${PV}-source-release.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
+
+# Common dependencies
+# POM: pom.xml
+# org.apache.felix:org.apache.felix.framework:7.0.5 -> >=dev-java/felix-framework-7.0.5:0
+
+CP_DEPEND="~dev-java/felix-framework-${PV}:0"
+
+DEPEND="
+ >=virtual/jdk-11:*
+ ${CP_DEPEND}
+"
+
+RDEPEND="
+ >=virtual/jre-1.8:*
+ ${CP_DEPEND}
+"
+
+DOCS=( DEPENDENCIES NOTICE )
+
+S="${WORKDIR}/org.apache.felix.main-${PV}"
+
+JAVA_MAIN_CLASS="org.apache.felix.main.Main"
+JAVA_RESOURCE_DIRS="src/main/resources"
+JAVA_SRC_DIR="src/main/java"
+
+src_prepare() {
+ default
+ # 58,91 pom.xml
+ cat > src/main/java/module-info.java <<-EOF || die
+ $( sed -n '/<moduleInfoSource>/,/<\/moduleInfoSource/p' pom.xml \
+ | grep -v moduleInfoSource )
+ EOF
+
+ # according to pom.xml, line 91
+ local add_opens="$( sed -n '/<Add-opens>/,/<\/Add-opens/p' pom.xml \
+ | grep -v Add-opens | tr -s '[:space:]')" || die
+ mkdir src/main/resources/META-INF || die
+ echo "Add-opens:${add_opens}" >> src/main/resources/META-INF/MANIFEST.MF \
+ || die "creating MANIFEST.MF failed"
+
+ # no idea what to do with felix.log.level=${log.level} here, but ...
+ sed -e 's/{dollar}//' -i src/main/resources/config.properties || die
+
+ # bundling some classes from felix-framework according to 78,94 pom.xml
+ # if we don't bundle compilation of module-info would fail
+ cd src/main/resources || die
+ jar xvf "$(java-pkg_getjar --build-only felix-framework felix-framework.jar)" \
+ default.properties org/ || die "felix-framework.jar does not exist"
+}
+
+src_install() {
+ dodoc -r doc
+ java-pkg-simple_src_install
+}
diff --git a/dev-java/felix-main/metadata.xml b/dev-java/felix-main/metadata.xml
new file mode 100644
index 000000000000..2052253c1b6e
--- /dev/null
+++ b/dev-java/felix-main/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>java@gentoo.org</email>
+ </maintainer>
+ <upstream>
+ <bugs-to>https://issues.apache.org/jira/browse/FELIX</bugs-to>
+ <doc>https://felix.apache.org/documentation/</doc>
+ <remote-id type="github">apache/felix-dev</remote-id>
+ </upstream>
+ <longdescription>
+ Apache Felix is a community effort to implement the OSGi Framework and Service platform and other interesting OSGi-related technologies.
+ </longdescription>
+</pkgmetadata>
diff --git a/dev-java/felix-resolver/Manifest b/dev-java/felix-resolver/Manifest
new file mode 100644
index 000000000000..e66c365ab77e
--- /dev/null
+++ b/dev-java/felix-resolver/Manifest
@@ -0,0 +1 @@
+DIST felix-resolver-2.0.4.tar.gz 164538 BLAKE2B 38d979557e484692bc6e47ce069bac5ca3c19f4b01b2d6222760708da571ca79166f4821c0b79c181a40c4228095dbe28f051e7d84d696cfddeef63f5a006ddd SHA512 bf4da4550b208dbe9e74cb4f66e9456fb0a3da66f6e60c08ebea88b68cc6f71200dcf324d22d85e6f5558e7f67335f8899e932de3b813a7fc7e9325eb8a31b61
diff --git a/dev-java/felix-resolver/felix-resolver-2.0.4.ebuild b/dev-java/felix-resolver/felix-resolver-2.0.4.ebuild
new file mode 100644
index 000000000000..e70076614ec8
--- /dev/null
+++ b/dev-java/felix-resolver/felix-resolver-2.0.4.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri mirror://apache/felix/org.apache.felix.resolver-2.0.4-source-release.tar.gz --slot 0 --keywords "~amd64" --ebuild felix-resolver-2.0.4.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.apache.felix:org.apache.felix.resolver:2.0.4"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Provide OSGi resolver service."
+HOMEPAGE="https://felix.apache.org/documentation/index.html"
+SRC_URI="mirror://apache/felix/org.apache.${PN//-/.}-${PV}-source-release.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
+
+# Common dependencies
+# POM: pom.xml
+# org.osgi:org.osgi.core:5.0.0 -> >=dev-java/osgi-core-api-5.0.0:0
+# org.osgi:osgi.annotation:6.0.1 -> >=dev-java/osgi-annotation-8.1.0:0
+
+CP_DEPEND="
+ dev-java/osgi-annotation:0
+ dev-java/osgi-core:0
+"
+
+# Compile dependencies
+# POM: pom.xml
+# test? junit:junit:4.11 -> >=dev-java/junit-4.13.2:4
+# test? org.apache.felix:org.apache.felix.utils:1.8.0 -> >=dev-java/felix-utils-1.11.8:0
+# test? org.mockito:mockito-all:1.10.19 -> !!!artifactId-not-found!!!
+
+DEPEND="
+ >=virtual/jdk-1.8:*
+ ${CP_DEPEND}
+ test? (
+ dev-java/felix-utils:0
+ dev-java/mockito:0
+ )
+"
+
+RDEPEND="
+ >=virtual/jre-1.8:*
+ ${CP_DEPEND}"
+
+DOCS=( DEPENDENCIES NOTICE doc/changelog.txt )
+
+S="${WORKDIR}/org.apache.felix.resolver-${PV}"
+
+JAVA_RESOURCE_DIRS="src/main/resources"
+JAVA_SRC_DIR="src/main/java"
+
+JAVA_TEST_GENTOO_CLASSPATH="felix-utils,junit-4,mockito"
+JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+JAVA_TEST_SRC_DIR="src/test/java"
+
+src_test() {
+ # java.lang.ClassFormatError accessible: module java.base does not "opens java.lang" to unnamed module @73ec6027
+ local vm_version="$(java-config -g PROVIDES_VERSION)"
+ if ver_test "${vm_version}" -ge 17; then
+ JAVA_TEST_EXTRA_ARGS+=( --add-opens=java.base/java.lang=ALL-UNNAMED )
+ JAVA_TEST_EXTRA_ARGS+=( --add-opens=java.base/java.io=ALL-UNNAMED )
+ fi
+ java-pkg-simple_src_test
+}
diff --git a/dev-java/felix-resolver/metadata.xml b/dev-java/felix-resolver/metadata.xml
new file mode 100644
index 000000000000..4af2d5d52d45
--- /dev/null
+++ b/dev-java/felix-resolver/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>java@gentoo.org</email>
+ </maintainer>
+ <upstream>
+ <doc>https://felix.apache.org/documentation/documentation.html</doc>
+ <remote-id type="github">apache/felix-dev</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-java/felix-utils/Manifest b/dev-java/felix-utils/Manifest
new file mode 100644
index 000000000000..5cdf8cb77b6b
--- /dev/null
+++ b/dev-java/felix-utils/Manifest
@@ -0,0 +1 @@
+DIST felix-utils-1.11.8.tar.gz 90519 BLAKE2B 2fe6ce8101e8e4d9533a2decacc581d35babd3a26747598a196ade7cea787d6e379968208619dc9c4d89c8f670ccb98124223828c852347f859c4ae3a7f284c8 SHA512 cef0f05754857a5863869145b3c465a1fea0d41767637df904b0b041579af18e5b5e3c8e09dc89f0e2e3d252585e0765b6b6e34bf932df1ebdc62a7127ac8cfd
diff --git a/dev-java/felix-utils/felix-utils-1.11.8.ebuild b/dev-java/felix-utils/felix-utils-1.11.8.ebuild
new file mode 100644
index 000000000000..9c7ef0ca3fcd
--- /dev/null
+++ b/dev-java/felix-utils/felix-utils-1.11.8.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri mirror://apache/felix/org.apache.felix.utils-1.11.8-source-release.tar.gz --slot 0 --keywords "~amd64" --ebuild felix-utils-1.11.8.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.apache.felix:org.apache.felix.utils:1.11.8"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Utility classes for OSGi"
+HOMEPAGE="https://felix.apache.org/documentation/index.html"
+SRC_URI="mirror://apache/felix/org.apache.felix.utils-${PV}-source-release.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
+
+# Compile dependencies
+# POM: pom.xml
+# org.osgi:osgi.cmpn:5.0.0 -> >=dev-java/osgi-cmpn-8.0.0:8
+# org.osgi:osgi.core:5.0.0 -> >=dev-java/osgi-core-8.0.0:0
+# POM: pom.xml
+# test? junit:junit:4.12 -> >=dev-java/junit-4.13.2:4
+# test? org.mockito:mockito-core:2.18.3 -> >=dev-java/mockito-4.7.0:4
+
+DEPEND="
+ >=virtual/jdk-1.8:*
+ dev-java/osgi-cmpn:8
+ dev-java/osgi-core:0
+ test? (
+ dev-java/mockito:4
+ )
+"
+
+RDEPEND=">=virtual/jre-1.8:*"
+
+PATCHES=(
+ "${FILESDIR}/felix-utils-1.11.8-Port-to-osgi-cmpn.patch"
+)
+
+DOCS=( DEPENDENCIES NOTICE doc/changelog.txt )
+
+S="${WORKDIR}/org.apache.felix.utils-${PV}"
+
+JAVA_CLASSPATH_EXTRA="osgi-cmpn-8,osgi-core"
+JAVA_SRC_DIR="src/main/java"
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4,mockito-4"
+JAVA_TEST_SRC_DIR="src/test/java"
+JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+
+src_prepare() {
+ default # https://bugs.gentoo.org/780585
+}
diff --git a/dev-java/felix-utils/files/felix-utils-1.11.8-Port-to-osgi-cmpn.patch b/dev-java/felix-utils/files/felix-utils-1.11.8-Port-to-osgi-cmpn.patch
new file mode 100644
index 000000000000..22b0222af68b
--- /dev/null
+++ b/dev-java/felix-utils/files/felix-utils-1.11.8-Port-to-osgi-cmpn.patch
@@ -0,0 +1,123 @@
+From d7a2d969b55ab34a223ad1422b2e3ef7d95a347f Mon Sep 17 00:00:00 2001
+From: Marian Koncek <mkoncek@redhat.com>
+Date: Mon, 5 Nov 2018 09:59:04 +0100
+Subject: [PATCH] Port to osgi-cmpn
+
+---
+ .../utils/repository/AggregateRepository.java | 20 +++++++++++++++++++
+ .../utils/repository/BaseRepository.java | 19 ++++++++++++++++++
+ .../utils/properties/MockBundleContext.java | 10 ++++++++++
+ 3 files changed, 49 insertions(+)
+
+diff --git a/src/main/java/org/apache/felix/utils/repository/AggregateRepository.java b/src/main/java/org/apache/felix/utils/repository/AggregateRepository.java
+index 50dceaf..4da3141 100644
+--- a/src/main/java/org/apache/felix/utils/repository/AggregateRepository.java
++++ b/src/main/java/org/apache/felix/utils/repository/AggregateRepository.java
+@@ -25,7 +25,12 @@ import java.util.Map;
+
+ import org.osgi.resource.Capability;
+ import org.osgi.resource.Requirement;
++import org.osgi.resource.Resource;
++import org.osgi.service.repository.ExpressionCombiner;
+ import org.osgi.service.repository.Repository;
++import org.osgi.service.repository.RequirementBuilder;
++import org.osgi.service.repository.RequirementExpression;
++import org.osgi.util.promise.Promise;
+
+ public class AggregateRepository implements Repository {
+
+@@ -52,4 +57,19 @@ public class AggregateRepository implements Repository {
+ }
+ return result;
+ }
++
++ @Override
++ public Promise<Collection<Resource>> findProviders(RequirementExpression expression) {
++ throw new UnsupportedOperationException();
++ }
++
++ @Override
++ public ExpressionCombiner getExpressionCombiner() {
++ throw new UnsupportedOperationException();
++ }
++
++ @Override
++ public RequirementBuilder newRequirementBuilder(String namespace) {
++ throw new UnsupportedOperationException();
++ }
+ }
+diff --git a/src/main/java/org/apache/felix/utils/repository/BaseRepository.java b/src/main/java/org/apache/felix/utils/repository/BaseRepository.java
+index 95adadd..0998ab0 100644
+--- a/src/main/java/org/apache/felix/utils/repository/BaseRepository.java
++++ b/src/main/java/org/apache/felix/utils/repository/BaseRepository.java
+@@ -30,7 +30,11 @@ import org.osgi.framework.Constants;
+ import org.osgi.resource.Capability;
+ import org.osgi.resource.Requirement;
+ import org.osgi.resource.Resource;
++import org.osgi.service.repository.ExpressionCombiner;
+ import org.osgi.service.repository.Repository;
++import org.osgi.service.repository.RequirementBuilder;
++import org.osgi.service.repository.RequirementExpression;
++import org.osgi.util.promise.Promise;
+
+ /**
+ */
+@@ -90,4 +94,19 @@ public class BaseRepository implements Repository {
+ }
+ return result;
+ }
++
++ @Override
++ public Promise<Collection<Resource>> findProviders(RequirementExpression expression) {
++ throw new UnsupportedOperationException();
++ }
++
++ @Override
++ public ExpressionCombiner getExpressionCombiner() {
++ throw new UnsupportedOperationException();
++ }
++
++ @Override
++ public RequirementBuilder newRequirementBuilder(String namespace) {
++ throw new UnsupportedOperationException();
++ }
+ }
+diff --git a/src/test/java/org/apache/felix/utils/properties/MockBundleContext.java b/src/test/java/org/apache/felix/utils/properties/MockBundleContext.java
+index 3eab444..df94a6c 100644
+--- a/src/test/java/org/apache/felix/utils/properties/MockBundleContext.java
++++ b/src/test/java/org/apache/felix/utils/properties/MockBundleContext.java
+@@ -25,7 +25,9 @@ import org.osgi.framework.BundleListener;
+ import org.osgi.framework.Filter;
+ import org.osgi.framework.FrameworkListener;
+ import org.osgi.framework.InvalidSyntaxException;
++import org.osgi.framework.ServiceFactory;
+ import org.osgi.framework.ServiceListener;
++import org.osgi.framework.ServiceObjects;
+ import org.osgi.framework.ServiceReference;
+ import org.osgi.framework.ServiceRegistration;
+
+@@ -105,6 +107,10 @@ public class MockBundleContext implements BundleContext {
+ throw new UnsupportedOperationException();
+ }
+
++ public <S> ServiceRegistration<S> registerService(Class<S> clazz, ServiceFactory<S> factory, Dictionary<String, ?> properties) {
++ throw new UnsupportedOperationException();
++ }
++
+ public ServiceReference[] getServiceReferences(String s, String s1) throws InvalidSyntaxException {
+ throw new UnsupportedOperationException();
+ }
+@@ -125,6 +131,10 @@ public class MockBundleContext implements BundleContext {
+ throw new UnsupportedOperationException();
+ }
+
++ public <S> ServiceObjects<S> getServiceObjects(ServiceReference<S> reference) {
++ throw new UnsupportedOperationException();
++ }
++
+ public File getDataFile(String s) {
+ throw new UnsupportedOperationException();
+ }
+--
+2.17.2
+
diff --git a/dev-java/felix-utils/metadata.xml b/dev-java/felix-utils/metadata.xml
new file mode 100644
index 000000000000..4af2d5d52d45
--- /dev/null
+++ b/dev-java/felix-utils/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>java@gentoo.org</email>
+ </maintainer>
+ <upstream>
+ <doc>https://felix.apache.org/documentation/documentation.html</doc>
+ <remote-id type="github">apache/felix-dev</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-java/fishbowl/Manifest b/dev-java/fishbowl/Manifest
new file mode 100644
index 000000000000..4175f48650ea
--- /dev/null
+++ b/dev-java/fishbowl/Manifest
@@ -0,0 +1 @@
+DIST fishbowl-1.4.1.tar.gz 54572 BLAKE2B 75adfbbdf8c2d48ba6ca52d223f87d840e938514183f01bdb6b505a9cfd3485414d32d63f8f1cfc303c3a431c32e1accc9d319003f82b84016a621c8324f70b8 SHA512 9040bc8bad19457a828a88cdbe448ecbb6af6af279db58a4447670cd8a32cacf30d01ea0bc6614f75e3bfd6bf73e0bce06f33014d22e9963fd9e46fbcd2c94c9
diff --git a/dev-java/fishbowl/fishbowl-1.4.1.ebuild b/dev-java/fishbowl/fishbowl-1.4.1.ebuild
new file mode 100644
index 000000000000..a00f47a95146
--- /dev/null
+++ b/dev-java/fishbowl/fishbowl-1.4.1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/stefanbirkner/fishbowl/archive/fishbowl-1.4.1.tar.gz --slot 0 --keywords "~amd64" --ebuild fishbowl-1.4.1.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="com.github.stefanbirkner:fishbowl:1.4.1"
+# Tests not possible, several test dependencies are missing.
+# JAVA_TESTING_FRAMEWORKS="testng junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Use the AAA pattern for writing tests for code that throws an exception"
+HOMEPAGE="https://github.com/stefanbirkner/fishbowl/"
+SRC_URI="https://github.com/stefanbirkner/${PN}/archive/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
+
+# Compile dependencies
+# POM: pom.xml
+# test? com.google.truth:truth:0.25 -> !!!groupId-not-found!!!
+# test? de.bechte.junit:junit-hierarchicalcontextrunner:4.12.0 -> !!!groupId-not-found!!!
+# test? junit:junit:4.12 -> >=dev-java/junit-4.13.2:4
+# test? org.assertj:assertj-core:1.7.1 -> >=dev-java/assertj-core-2.3.0:2
+# test? org.easytesting:fest-assert:1.4 -> !!!groupId-not-found!!!
+# test? org.hamcrest:hamcrest-core:1.3 -> >=dev-java/hamcrest-core-1.3:1.3
+# test? org.hamcrest:hamcrest-library:1.3 -> >=dev-java/hamcrest-library-1.3:1.3
+# test? org.mockito:mockito-core:1.10.19 -> >=dev-java/mockito-4.4.0:4
+# test? org.testng:testng:6.8.17 -> !!!groupId-not-found!!!
+
+DEPEND=">=virtual/jdk-1.8:*"
+# test? (
+# !!!groupId-not-found!!!
+# >=dev-java/assertj-core-2.3.0:2
+# >=dev-java/hamcrest-core-1.3:1.3
+# >=dev-java/hamcrest-library-1.3:1.3
+# >=dev-java/mockito-4.4.0:4
+# )
+# "
+
+RDEPEND=">=virtual/jre-1.8:*"
+
+S="${WORKDIR}/${PN}-${P}"
+
+JAVA_SRC_DIR="src/main/java"
+
+# JAVA_TEST_GENTOO_CLASSPATH="!!!groupId-not-found!!!,!!!groupId-not-found!!!,junit-4,assertj-core-2,!!!groupId-not-found!!!,hamcrest-core-1.3,hamcrest-library-1.3,mockito-4,!!!groupId-not-found!!!"
+# JAVA_TEST_SRC_DIR="src/test/java"
diff --git a/dev-java/fishbowl/metadata.xml b/dev-java/fishbowl/metadata.xml
new file mode 100644
index 000000000000..75321cfb5598
--- /dev/null
+++ b/dev-java/fishbowl/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>java@gentoo.org</email>
+ </maintainer>
+</pkgmetadata>
diff --git a/dev-java/gradle-bin/Manifest b/dev-java/gradle-bin/Manifest
index 35f1fc4b3edd..ebe757ca74b8 100644
--- a/dev-java/gradle-bin/Manifest
+++ b/dev-java/gradle-bin/Manifest
@@ -3,4 +3,5 @@ DIST gradle-bin-7.1.1.zip 154838841 BLAKE2B 0a0ad08101f0c5fa7c0cb2a4c9ad6e53320c
DIST gradle-bin-7.2.zip 157058280 BLAKE2B 918213df58ac2afbd075c74588f60676cd7dc99030834828138c621348ac1abd368e0b54c2f6937cbfc9533e55e310b46cf841c92dcb1039b898c6f456032d38 SHA512 6ccc79f08afdc20b3d5abf876c3cabb69114d1ab4285cdb77158cd8c5e09207589edefb6c79f2bcffe4629a38c6b9e2f473de42dab29a24310965bc5816b907d
DIST gradle-bin-7.3.3.zip 158875257 BLAKE2B 94f86e06da3eae4a9522d35a28577d033d64ce1bc2f36d0f5c1992e9b92ec311d25bd98bbeaf4b8a9869f22d93e14c88952e12166e436a0a6c206541d1f967aa SHA512 03f2bdd77202788cd43bb3e3a6390340f4d083d69ade5a53e0163204fb85307f5bbbbf4e04077c6ae558bc36ab3c478674f941079bc14a8344f55631fbba1490
DIST gradle-bin-7.4.2.zip 159315974 BLAKE2B c7c8dbe82d22dec699d1997a781f3a66110c9910dfe67df2304c48cead96c130ca072550b8c5fa2362744cd2ea3c9723c45a6ecf6e0737fe3c9b7e286b44f4ae SHA512 2e1d05486baa9661d5c8ffead2df87874a66f6cfc958ee6840432b89d221d8b0af9e3cad3675766f5413d12aa61c5b5fb0dd82f4164e5da3022865eba9ceadbf
-DIST gradle-bin-7.5.zip 166044548 BLAKE2B 2814ebe54bbe7165e6337be087bf2c841ff308c5d3f6c01e7a4d1dd63c13e723e9c06c395632edb32b7c9f84d174e1c0dd8c6ffee1f35f0b33201e24615b6521 SHA512 48646d59cd89836c33805fe3899587d338b46665f8f9c9d1535aa862b2a331e3045aa77cf4f2523e85b88ca3d2c58e0b4990fc02b84fb79e327817e37d9c6319
+DIST gradle-bin-7.5.1.zip 166101707 BLAKE2B e018f8ae0e4cbe1fff2e3fb3029ef4c3f35e1bf541ce75f22561e16c43d8501c2f2501db72081656a836ab1c3358020dbf0be3499e7c16b385d9940c852c62ae SHA512 89189d529df1258a01ad2e6c38b1374dfb3a1440706c1c7f27ace89b6fd5b6849f9809f209e3e410f226aeeb9348d144de70397ac94b4e59fd311a2b0dee0dc9
+DIST gradle-bin-7.6.zip 165398808 BLAKE2B e9ffb8157184a4977f72a5267501ad3bf7201ad77216b64cc99e9c54e4c4787a0c26ca94302cc507ca747dd4c073bfdf8e9ae931b1b329d6d7df339e26d665a5 SHA512 5c5b9ade91898ec2fe142ff98dc7ae681a9f3b923ce40998a731cb84fdfcdbde6510cc9da026a9359526569e37472b06c1a6bc5a2794d2af5e9d6f1d13a21ac8
diff --git a/dev-java/gradle-bin/gradle-bin-7.5.1.ebuild b/dev-java/gradle-bin/gradle-bin-7.5.1.ebuild
new file mode 100644
index 000000000000..0e7b49ee8847
--- /dev/null
+++ b/dev-java/gradle-bin/gradle-bin-7.5.1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+IUSE="doc"
+JAVA_PKG_IUSE="source"
+
+inherit java-pkg-2
+
+MY_PN=${PN%%-bin}
+MY_P="${MY_PN}-${PV/_rc/-rc-}"
+
+DESCRIPTION="A project automation and build tool with a Groovy based DSL"
+SRC_URI="https://services.gradle.org/distributions/${MY_P}-all.zip -> ${P}.zip"
+HOMEPAGE="https://www.gradle.org/"
+
+LICENSE="Apache-2.0"
+SLOT="${PV}"
+KEYWORDS="amd64 x86"
+
+DEPEND="app-eselect/eselect-gradle"
+BDEPEND="app-arch/unzip"
+RDEPEND="
+ ${DEPEND}
+ >=virtual/jre-1.8:*
+"
+
+S="${WORKDIR}/${MY_P}"
+
+src_compile() {
+ :
+}
+
+src_install() {
+ local gradle_dir="/usr/share/${PN}-${SLOT}"
+
+ if use source; then
+ java-pkg_dosrc src
+ fi
+
+ docinto html
+ dodoc -r docs/release-notes.html
+ if use doc; then
+ dodoc -r docs/{dsl,userguide}
+ java-pkg_dojavadoc docs/javadoc
+ fi
+
+ insinto "${gradle_dir}"
+ doins -r bin/ lib/
+ fperms 755 "${gradle_dir}/bin/gradle"
+ dosym "${gradle_dir}/bin/gradle" "/usr/bin/${PN}-${SLOT}"
+}
+
+pkg_postinst() {
+ eselect gradle update ifunset
+}
+
+pkg_postrm() {
+ eselect gradle update ifunset
+}
diff --git a/dev-java/gradle-bin/gradle-bin-7.5.ebuild b/dev-java/gradle-bin/gradle-bin-7.6.ebuild
index 8dedd9ecd1ef..8dedd9ecd1ef 100644
--- a/dev-java/gradle-bin/gradle-bin-7.5.ebuild
+++ b/dev-java/gradle-bin/gradle-bin-7.6.ebuild
diff --git a/dev-java/greenmail/Manifest b/dev-java/greenmail/Manifest
new file mode 100644
index 000000000000..5def750177c9
--- /dev/null
+++ b/dev-java/greenmail/Manifest
@@ -0,0 +1 @@
+DIST greenmail-2.0.0_alpha2.tar.gz 969798 BLAKE2B 0e1b00ccc96fac26d453cff5f49937bebc7b62e58ad33c9c287e7edb15de2884620ea52c94e00f5ddb9dc6e8853ed36101c4f7f294d48044d78a2a747146952e SHA512 925762f834d797e5136412520d45e9ce56c7b946f9cf1b7e90b674b12405a426bdceb068c7b459b1d4321d04ed68ff5dfd2d32ea6d5f17e848189596cc9acb17
diff --git a/dev-java/greenmail/greenmail-2.0.0_alpha2.ebuild b/dev-java/greenmail/greenmail-2.0.0_alpha2.ebuild
new file mode 100644
index 000000000000..564a6c9ca56d
--- /dev/null
+++ b/dev-java/greenmail/greenmail-2.0.0_alpha2.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/greenmail-mail-test/greenmail/archive/release-2.0.0-alpha-2.tar.gz --slot 2 --keywords "~amd64" --ebuild greenmail-2.0.0_alpha2.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="com.icegreen:greenmail:2.0.0-alpha-2"
+# No tests, dependencies are not packaged
+# JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="GreenMail - Email Test Servers"
+HOMEPAGE="https://greenmail-mail-test.github.io/greenmail/"
+SRC_URI="https://github.com/greenmail-mail-test/greenmail/archive/release-${PV/_alpha/-alpha-}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="2"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
+
+# Common dependencies
+# POM: pom.xml
+# com.sun.mail:jakarta.mail:2.0.1 -> >=dev-java/jakarta-mail-2.0.1:0
+# jakarta.activation:jakarta.activation-api:2.0.1 -> >=dev-java/jakarta-activation-api-2.1.0:2
+# junit:junit:4.13.2 -> >=dev-java/junit-4.13.2:4
+# org.slf4j:slf4j-api:1.7.32 -> >=dev-java/slf4j-api-1.7.36:0
+
+CP_DEPEND="
+ dev-java/jakarta-activation-api:2
+ dev-java/jakarta-mail:0
+ dev-java/junit:4
+ dev-java/slf4j-api:0
+"
+
+# Compile dependencies
+# POM: pom.xml
+# test? org.assertj:assertj-core:3.19.0 -> !!!suitable-mavenVersion-not-found!!!
+# test? org.hamcrest:hamcrest-core:2.2 -> !!!suitable-mavenVersion-not-found!!!
+# test? org.hamcrest:hamcrest-library:2.2 -> !!!suitable-mavenVersion-not-found!!!
+# test? org.slf4j:slf4j-log4j12:1.7.32 -> !!!artifactId-not-found!!!
+
+DEPEND="
+ >=virtual/jdk-1.8:*
+ ${CP_DEPEND}"
+
+RDEPEND="
+ >=virtual/jre-1.8:*
+ ${CP_DEPEND}"
+
+DOCS=( ../README.md )
+
+S="${WORKDIR}/greenmail-release-${PV/_alpha/-alpha-}/greenmail-core"
+
+JAVA_SRC_DIR="src/main/java"
diff --git a/dev-java/greenmail/metadata.xml b/dev-java/greenmail/metadata.xml
new file mode 100644
index 000000000000..88b4c60ecd57
--- /dev/null
+++ b/dev-java/greenmail/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>java@gentoo.org</email>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">greenmail-mail-test/greenmail</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-java/gson/Manifest b/dev-java/gson/Manifest
index e539d331b471..d07656879069 100644
--- a/dev-java/gson/Manifest
+++ b/dev-java/gson/Manifest
@@ -1 +1 @@
-DIST gson-2.9.0.tar.gz 350309 BLAKE2B f17f7a7410744b14cb79c979b35c7f3c46a3d9e922722c41893b872013319a1bd06d81526e8380055aafa47524bfcc50e02629d1c5994e1f9f81df4391a9c651 SHA512 25e57f0e3cbff7e4d33070d250ba4ecf1c659380bce07863c52a3b30edd0ba88c923e55b0f38098b5ce3827a74a21c4d41f9de02f6a84da771ae39fd823667d3
+DIST gson-parent-2.9.1.tar.gz 359012 BLAKE2B e0a0d6e517e7323a508d7aa6cb26e39aad4a3c479b479ae7b075d3cb47c0312294eb074ed52f1fbbec5de301341dac7f5d742913498205f0544a53da0c0eb1a1 SHA512 928a17491efc9866271f08d4ec0fc22b96b4b6f4827d86679cd4a9085e91fbf6b1b4d6618d380ff63e7a9922d9cf0ec7ba9cd073862e7e212eb31c0140c6b6ad
diff --git a/dev-java/gson/gson-2.9.0-r1.ebuild b/dev-java/gson/gson-2.9.0-r1.ebuild
deleted file mode 100644
index b6821636dfbf..000000000000
--- a/dev-java/gson/gson-2.9.0-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/google/gson/archive/gson-parent-2.9.0.tar.gz --slot 2.6 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild gson-2.9.0.ebuild
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="com.google.code.gson:gson:2.9.0"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Gson JSON library"
-HOMEPAGE="https://github.com/google/gson"
-SRC_URI="https://github.com/google/${PN}/archive/${PN}-parent-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="2.9"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-DEPEND="
- virtual/jdk:11
-"
-
-# Set to jre-11:* since jre-1.8:* causes errors:
-# error: Invalid SafeVarargs annotation. Instance method <T>assertIterationOrder(Iterable<T>,T...) is not final.
-# in src/test/java/com/google/gson/internal/LinkedTreeMapTest.java:164:
-RDEPEND="
- >=virtual/jre-11:*
-"
-
-S="${WORKDIR}/${PN}-${PN}-parent-${PV}/${PN}"
-
-JAVA_SRC_DIR=(
- "src/main/java"
- "src/main/java-templates"
-)
-
-JAVA_TEST_GENTOO_CLASSPATH="junit-4"
-JAVA_TEST_SRC_DIR="src/test/java"
-JAVA_TEST_RESOURCE_DIRS=(
- "src/test/resources"
-)
-
-JAVA_TEST_EXCLUDES=(
- # requires the test class to be obfuscated using proguard which we do not have atm
- "com.google.gson.functional.EnumWithObfuscatedTest"
- # FAILURES!!!
- # Tests run: 1090, Failures: 3
- # testComGoogleGsonAnnotationsPackage(com.google.gson.regression.OSGiTest)
- # junit.framework.AssertionFailedError: Cannot find com.google.gson OSGi bundle manifest
- "com.google.gson.regression.OSGiTest"
- # testSerializeInternalImplementationObject(com.google.gson.functional.ReflectionAccessTest)
- # java.lang.IllegalStateException: Expected BEGIN_ARRAY but was BEGIN_OBJECT at line 1 column 2 path $
- "com.google.gson.functional.ReflectionAccessTest"
-)
-
-src_prepare() {
- default
- sed -i "s/\${project.version}/${PV}/g" src/main/java-templates/com/google/gson/internal/GsonBuildConfig.java || die "Failed to set version"
-}
diff --git a/dev-java/gson/gson-2.9.0-r2.ebuild b/dev-java/gson/gson-2.9.1.ebuild
index 19d4e18df7d0..d04adf324bd7 100644
--- a/dev-java/gson/gson-2.9.0-r2.ebuild
+++ b/dev-java/gson/gson-2.9.1.ebuild
@@ -2,19 +2,19 @@
# Distributed under the terms of the GNU General Public License v2
# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/google/gson/archive/gson-parent-2.9.0.tar.gz --slot 2.6 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild gson-2.9.0.ebuild
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/google/gson/archive/gson-parent-2.9.1.tar.gz --slot 2.6 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild gson-2.9.1.ebuild
EAPI=8
JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="com.google.code.gson:gson:2.9.0"
+MAVEN_ID="com.google.code.gson:gson:2.9.1"
JAVA_TESTING_FRAMEWORKS="junit-4"
inherit java-pkg-2 java-pkg-simple
DESCRIPTION="Gson JSON library"
HOMEPAGE="https://github.com/google/gson"
-SRC_URI="https://github.com/google/${PN}/archive/${PN}-parent-${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/google/gson/archive/gson-parent-${PV}.tar.gz"
LICENSE="Apache-2.0"
SLOT="2.6"
@@ -23,7 +23,7 @@ KEYWORDS="amd64 ~arm arm64 ppc64 x86"
DEPEND=">=virtual/jdk-11:*"
RDEPEND=">=virtual/jre-1.8:*"
-S="${WORKDIR}/${PN}-${PN}-parent-${PV}/${PN}"
+S="${WORKDIR}/gson-gson-parent-${PV}/gson"
JAVA_SRC_DIR=(
"src/main/java"
@@ -38,7 +38,7 @@ JAVA_TEST_EXCLUDES=(
# requires the test class to be obfuscated using proguard which we do not have atm
"com.google.gson.functional.EnumWithObfuscatedTest"
# FAILURES!!!
- # Tests run: 1090, Failures: 3
+ # Tests run: 1135, Failures: 3
# testComGoogleGsonAnnotationsPackage(com.google.gson.regression.OSGiTest)
# junit.framework.AssertionFailedError: Cannot find com.google.gson OSGi bundle manifest
"com.google.gson.regression.OSGiTest"
diff --git a/dev-java/hamcrest-core/Manifest b/dev-java/hamcrest-core/Manifest
index 6c4ab7fb2a33..53b1379edb09 100644
--- a/dev-java/hamcrest-core/Manifest
+++ b/dev-java/hamcrest-core/Manifest
@@ -1,2 +1,2 @@
-DIST hamcrest-1.3.tgz 3686096 BLAKE2B 38ff91a524064cb00b4d2e82c0a50a2df870bbb0a6e43055f33ce344a1dc8de3760530652691db26aa42890d8517940c038a570b5acaaf91b7e970aca7df3493 SHA512 5672bc627bc71d6fd64b6f776b89ac16ed68819fa4a0748c1250b57f1065c1e7e18ba184d9fe3392e54000ddeb353d0d8d67f4eecdf464974563f05c6b226fc2
DIST hamcrest-core-1.1.tar.gz 1247348 BLAKE2B 07b874ca2e61808cd1a30246cbfe7baa220a9c83df7be94dbb50c4df0279bcf906a32cc1b69aed0ebd81d51392af28050d070b7fabb50f8063964b0782b5e105 SHA512 d86080f1ef5982faee728e29675676a89b42a02c4b00783c67be948076e502e70a2b435568502d8ed3c5b1bcc5441b3cdd8817dab841cac537087edeee47632f
+DIST hamcrest-java-1.3.tar.gz 2007925 BLAKE2B 7d54f056814ba30d669e171f00c31e71a0aaea37d345fa93d0c88afb8c3f916180ba699c2cee9219504c3e931b4f4548d708c927cf2caf483847f217c22c7cdf SHA512 4356df7b5b78f821847fde027b416b49b8456e84ab2ec98c2982adf54e2bdc01a5ca2c2b5425620c5ee34bfe3f95ea43c77190504f76ddc9f8b93b137a4ca54b
diff --git a/dev-java/hamcrest-core/files/hamcrest-core-1.3-java-11.patch b/dev-java/hamcrest-core/files/hamcrest-core-1.3-r3-java-11.patch
index 9f68faecb6bf..21a957eb7212 100644
--- a/dev-java/hamcrest-core/files/hamcrest-core-1.3-java-11.patch
+++ b/dev-java/hamcrest-core/files/hamcrest-core-1.3-r3-java-11.patch
@@ -1,22 +1,26 @@
+diff --git a/hamcrest-core/src/main/java/org/hamcrest/core/AllOf.java b/hamcrest-core/src/main/java/org/hamcrest/core/AllOf.java
+index a5daf94..23090b2 100644
--- a/hamcrest-core/src/main/java/org/hamcrest/core/AllOf.java
+++ b/hamcrest-core/src/main/java/org/hamcrest/core/AllOf.java
@@ -57,7 +57,7 @@ public class AllOf<T> extends DiagnosingMatcher<T> {
- */
- @Factory
- public static <T> Matcher<T> allOf(Matcher<? super T>... matchers) {
-- return allOf(Arrays.asList(matchers));
-+ return allOf((List<Matcher<? super T>>) Arrays.asList(matchers));
- }
-
- /**
+ */
+ @Factory
+ public static <T> Matcher<T> allOf(Matcher<? super T>... matchers) {
+- return allOf(Arrays.asList(matchers));
++ return allOf((List<Matcher<? super T>>) Arrays.asList(matchers));
+ }
+
+ /**
+diff --git a/hamcrest-core/src/main/java/org/hamcrest/core/AnyOf.java b/hamcrest-core/src/main/java/org/hamcrest/core/AnyOf.java
+index de00677..fb551a2 100644
--- a/hamcrest-core/src/main/java/org/hamcrest/core/AnyOf.java
+++ b/hamcrest-core/src/main/java/org/hamcrest/core/AnyOf.java
@@ -47,7 +47,7 @@ public class AnyOf<T> extends ShortcutCombination<T> {
- */
- @Factory
- public static <T> AnyOf<T> anyOf(Matcher<? super T>... matchers) {
-- return anyOf(Arrays.asList(matchers));
-+ return anyOf((List<Matcher<? super T>>) Arrays.asList(matchers));
- }
-
- /**
+ */
+ @Factory
+ public static <T> AnyOf<T> anyOf(Matcher<? super T>... matchers) {
+- return anyOf(Arrays.asList(matchers));
++ return anyOf((List<Matcher<? super T>>) Arrays.asList(matchers));
+ }
+
+ /**
diff --git a/dev-java/hamcrest-core/hamcrest-core-1.1-r4.ebuild b/dev-java/hamcrest-core/hamcrest-core-1.1-r4.ebuild
index e8d9fbe997ec..d8b3c2e8df34 100644
--- a/dev-java/hamcrest-core/hamcrest-core-1.1-r4.ebuild
+++ b/dev-java/hamcrest-core/hamcrest-core-1.1-r4.ebuild
@@ -11,7 +11,7 @@ MY_PN="hamcrest"
MY_P="${MY_PN}-${PV}"
DESCRIPTION="Library of matchers for building test expressions"
-HOMEPAGE="http://hamcrest.org/JavaHamcrest/"
+HOMEPAGE="https://hamcrest.org/JavaHamcrest/"
SRC_URI="https://github.com/${MY_PN}/JavaHamcrest/archive/${MY_PN}-java-${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD-2"
diff --git a/dev-java/hamcrest-core/hamcrest-core-1.3-r2.ebuild b/dev-java/hamcrest-core/hamcrest-core-1.3-r3.ebuild
index 27f4ffa43866..8ef55c0cf9a8 100644
--- a/dev-java/hamcrest-core/hamcrest-core-1.3-r2.ebuild
+++ b/dev-java/hamcrest-core/hamcrest-core-1.3-r3.ebuild
@@ -1,38 +1,36 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
JAVA_PKG_IUSE="doc source"
MAVEN_ID="org.hamcrest:hamcrest-core:1.3"
inherit java-pkg-2 java-pkg-simple
-MY_PN="hamcrest"
-MY_P="${MY_PN}-${PV}"
-S="${WORKDIR}/${MY_P}"
-
DESCRIPTION="Core library of matchers for building test expressions"
-HOMEPAGE="http://hamcrest.org/JavaHamcrest/"
-SRC_URI="mirror://gentoo/${MY_P}.tgz"
+HOMEPAGE="https://hamcrest.org/JavaHamcrest/"
+SRC_URI="https://github.com/hamcrest/JavaHamcrest/archive/hamcrest-java-${PV}.tar.gz"
LICENSE="BSD-2"
SLOT="${PV}"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x64-solaris"
DEPEND=">=virtual/jdk-1.8:*"
RDEPEND=">=virtual/jre-1.8:*"
-BDEPEND=">=dev-java/hamcrest-generator-${PV}:1.3"
-
-JAVA_SRC_DIR="${PN}/src"
+BDEPEND="dev-java/hamcrest-generator:1.3"
DOCS=( {CHANGES,LICENSE,README}.txt )
PATCHES=(
# https://bugs.gentoo.org/751379
- "${FILESDIR}"/hamcrest-core-1.3-java-11.patch
+ "${FILESDIR}"/hamcrest-core-1.3-r3-java-11.patch
)
+S="${WORKDIR}/JavaHamcrest-hamcrest-java-${PV}"
+
+JAVA_SRC_DIR="${PN}/src"
+
src_prepare() {
default
java-pkg_clean
@@ -53,8 +51,3 @@ src_compile() {
# Compile again, this time including the freshly generated "CoreMatchers.java"
java-pkg-simple_src_compile
}
-
-src_install() {
- default
- java-pkg-simple_src_install
-}
diff --git a/dev-java/hamcrest-generator/Manifest b/dev-java/hamcrest-generator/Manifest
index 480364f4e8f4..1139a7ccc0a9 100644
--- a/dev-java/hamcrest-generator/Manifest
+++ b/dev-java/hamcrest-generator/Manifest
@@ -1 +1 @@
-DIST hamcrest-1.3.tgz 3686096 BLAKE2B 38ff91a524064cb00b4d2e82c0a50a2df870bbb0a6e43055f33ce344a1dc8de3760530652691db26aa42890d8517940c038a570b5acaaf91b7e970aca7df3493 SHA512 5672bc627bc71d6fd64b6f776b89ac16ed68819fa4a0748c1250b57f1065c1e7e18ba184d9fe3392e54000ddeb353d0d8d67f4eecdf464974563f05c6b226fc2
+DIST hamcrest-java-1.3.tar.gz 2007925 BLAKE2B 7d54f056814ba30d669e171f00c31e71a0aaea37d345fa93d0c88afb8c3f916180ba699c2cee9219504c3e931b4f4548d708c927cf2caf483847f217c22c7cdf SHA512 4356df7b5b78f821847fde027b416b49b8456e84ab2ec98c2982adf54e2bdc01a5ca2c2b5425620c5ee34bfe3f95ea43c77190504f76ddc9f8b93b137a4ca54b
diff --git a/dev-java/hamcrest-generator/files/hamcrest-generator-1.3-no_jarjar.patch b/dev-java/hamcrest-generator/files/hamcrest-generator-1.3-no_jarjar.patch
deleted file mode 100644
index 6cd74732c2c0..000000000000
--- a/dev-java/hamcrest-generator/files/hamcrest-generator-1.3-no_jarjar.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/build.xml 2012-07-02 21:14:09.000000000 +0200
-+++ b/build.xml 2013-06-15 21:39:55.005813436 +0200
-@@ -16,13 +16,6 @@
- modulename="hamcrest-generator-nodeps"
- classpath="lib/generator/qdox-1.12.jar"/>
-
-- <!-- Bundle QDox classes in hamcrest-generator.jar using JarJar to place classes under a different package -->
-- <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" classpath="lib/generator/jarjar-1.3.jar"/>
-- <jarjar jarfile="build/hamcrest-generator-${version}.jar">
-- <zipfileset src="build/hamcrest-generator-nodeps-${version}.jar"/>
-- <zipfileset src="lib/generator/qdox-1.12.jar"/>
-- <rule pattern="com.thoughtworks.qdox.**" result="org.hamcrest.generator.qdox.@1"/>
-- </jarjar>
- <copy file="build/hamcrest-generator-nodeps-${version}-sources.jar" tofile="build/hamcrest-generator-${version}-sources.jar"/>
- </target>
-
diff --git a/dev-java/hamcrest-generator/hamcrest-generator-1.3-r3.ebuild b/dev-java/hamcrest-generator/hamcrest-generator-1.3-r3.ebuild
deleted file mode 100644
index 6aa236cef3f7..000000000000
--- a/dev-java/hamcrest-generator/hamcrest-generator-1.3-r3.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="source test"
-
-inherit java-pkg-2 java-ant-2
-
-MY_PN="hamcrest"
-MY_P="${MY_PN}-${PV}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="Code generator for Hamcrest's library of matchers for building test expressions"
-HOMEPAGE="http://hamcrest.org/JavaHamcrest/"
-SRC_URI="mirror://gentoo/${MY_P}.tgz"
-
-LICENSE="BSD-2"
-SLOT="${PV}"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~ppc-macos ~x64-macos"
-
-CDEPEND="dev-java/qdox:1.12"
-
-DEPEND=">=virtual/jdk-1.8:*
- ${CDEPEND}"
-
-RDEPEND=">=virtual/jre-1.8:*
- ${CDEPEND}"
-
-EANT_BUILD_TARGET="generator"
-EANT_EXTRA_ARGS="-Dversion=${PV}"
-
-src_prepare() {
- default
- # Don't include source in JAR. If a Gentoo user wants the source the source
- # USE flag will be enabled.
- eapply "${FILESDIR}/${P}-no_jarjar.patch"
-
- find -iname "*.jar" -exec rm -v {} + || die "Unable to remove bundled JAR files"
-
- # These jars must be symlinked. Specifying them using gentoo.classpath
- # does not work.
- java-pkg_jar-from --into lib/generator qdox-1.12 qdox.jar qdox-1.12.jar
-}
-
-src_install() {
- java-pkg_newjar build/${PN}-nodeps-${PV}.jar ${PN}.jar
-
- dodoc README.txt CHANGES.txt
-
- use source && java-pkg_dosrc ${PN}/src/main/java/org
-}
diff --git a/dev-java/hamcrest-generator/hamcrest-generator-1.3-r4.ebuild b/dev-java/hamcrest-generator/hamcrest-generator-1.3-r4.ebuild
new file mode 100644
index 000000000000..2a11b0c6d4ed
--- /dev/null
+++ b/dev-java/hamcrest-generator/hamcrest-generator-1.3-r4.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Code generator for Hamcrest's library of matchers for building test expressions"
+HOMEPAGE="https://hamcrest.org/JavaHamcrest/"
+SRC_URI="https://github.com/hamcrest/JavaHamcrest/archive/hamcrest-java-${PV}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="${PV}"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~ppc-macos ~x64-macos"
+
+CP_DEPEND="dev-java/qdox:1.12"
+
+DEPEND=">=virtual/jdk-1.8:*
+ ${CP_DEPEND}"
+
+RDEPEND=">=virtual/jre-1.8:*
+ ${CP_DEPEND}"
+
+S="${WORKDIR}/JavaHamcrest-hamcrest-java-${PV}"
+
+JAVA_SRC_DIR="${PN}/src/main/java"
diff --git a/dev-java/hamcrest-library/Manifest b/dev-java/hamcrest-library/Manifest
index 480364f4e8f4..1139a7ccc0a9 100644
--- a/dev-java/hamcrest-library/Manifest
+++ b/dev-java/hamcrest-library/Manifest
@@ -1 +1 @@
-DIST hamcrest-1.3.tgz 3686096 BLAKE2B 38ff91a524064cb00b4d2e82c0a50a2df870bbb0a6e43055f33ce344a1dc8de3760530652691db26aa42890d8517940c038a570b5acaaf91b7e970aca7df3493 SHA512 5672bc627bc71d6fd64b6f776b89ac16ed68819fa4a0748c1250b57f1065c1e7e18ba184d9fe3392e54000ddeb353d0d8d67f4eecdf464974563f05c6b226fc2
+DIST hamcrest-java-1.3.tar.gz 2007925 BLAKE2B 7d54f056814ba30d669e171f00c31e71a0aaea37d345fa93d0c88afb8c3f916180ba699c2cee9219504c3e931b4f4548d708c927cf2caf483847f217c22c7cdf SHA512 4356df7b5b78f821847fde027b416b49b8456e84ab2ec98c2982adf54e2bdc01a5ca2c2b5425620c5ee34bfe3f95ea43c77190504f76ddc9f8b93b137a4ca54b
diff --git a/dev-java/hamcrest-library/files/hamcrest-library-1.3-java-11.patch b/dev-java/hamcrest-library/files/hamcrest-library-1.3-r3-java-11.patch
index fb749dfe7d24..5e1103d3fbfe 100644
--- a/dev-java/hamcrest-library/files/hamcrest-library-1.3-java-11.patch
+++ b/dev-java/hamcrest-library/files/hamcrest-library-1.3-r3-java-11.patch
@@ -1,44 +1,44 @@
--- a/hamcrest-library/src/main/java/org/hamcrest/collection/IsIterableContainingInAnyOrder.java
+++ b/hamcrest-library/src/main/java/org/hamcrest/collection/IsIterableContainingInAnyOrder.java
@@ -122,7 +122,7 @@ public class IsIterableContainingInAnyOrder<T> extends TypeSafeDiagnosingMatcher
- */
- @Factory
- public static <T> Matcher<Iterable<? extends T>> containsInAnyOrder(Matcher<? super T>... itemMatchers) {
-- return containsInAnyOrder(Arrays.asList(itemMatchers));
-+ return containsInAnyOrder((List<Matcher<? super T>>) Arrays.asList(itemMatchers));
- }
-
- /**
+ */
+ @Factory
+ public static <T> Matcher<Iterable<? extends T>> containsInAnyOrder(Matcher<? super T>... itemMatchers) {
+- return containsInAnyOrder(Arrays.asList(itemMatchers));
++ return containsInAnyOrder((List<Matcher<? super T>>) Arrays.asList(itemMatchers));
+ }
+
+ /**
--- a/hamcrest-library/src/main/java/org/hamcrest/collection/IsIterableContainingInOrder.java
+++ b/hamcrest-library/src/main/java/org/hamcrest/collection/IsIterableContainingInOrder.java
@@ -138,7 +138,7 @@ public class IsIterableContainingInOrder<E> extends TypeSafeDiagnosingMatcher<It
- */
- @Factory
- public static <E> Matcher<Iterable<? extends E>> contains(Matcher<? super E>... itemMatchers) {
-- return contains(asList(itemMatchers));
-+ return contains((List<Matcher<? super E>>) asList(itemMatchers));
- }
-
- /**
+ */
+ @Factory
+ public static <E> Matcher<Iterable<? extends E>> contains(Matcher<? super E>... itemMatchers) {
+- return contains(asList(itemMatchers));
++ return contains((List<Matcher<? super E>>) asList(itemMatchers));
+ }
+
+ /**
--- a/hamcrest-library/src/main/java/org/hamcrest/collection/IsArrayContainingInAnyOrder.java
+++ b/hamcrest-library/src/main/java/org/hamcrest/collection/IsArrayContainingInAnyOrder.java
@@ -55,7 +55,7 @@ public class IsArrayContainingInAnyOrder<E> extends TypeSafeMatcher<E[]> {
- */
- @Factory
- public static <E> Matcher<E[]> arrayContainingInAnyOrder(Matcher<? super E>... itemMatchers) {
-- return arrayContainingInAnyOrder(Arrays.asList(itemMatchers));
-+ return arrayContainingInAnyOrder((List<Matcher<? super E>>) Arrays.asList(itemMatchers));
- }
-
- /**
+ */
+ @Factory
+ public static <E> Matcher<E[]> arrayContainingInAnyOrder(Matcher<? super E>... itemMatchers) {
+- return arrayContainingInAnyOrder(Arrays.asList(itemMatchers));
++ return arrayContainingInAnyOrder((List<Matcher<? super E>>) Arrays.asList(itemMatchers));
+ }
+
+ /**
--- a/hamcrest-library/src/main/java/org/hamcrest/collection/IsArrayContainingInOrder.java
+++ b/hamcrest-library/src/main/java/org/hamcrest/collection/IsArrayContainingInOrder.java
@@ -69,7 +69,7 @@ public class IsArrayContainingInOrder<E> extends TypeSafeMatcher<E[]> {
- */
- @Factory
- public static <E> Matcher<E[]> arrayContaining(Matcher<? super E>... itemMatchers) {
-- return arrayContaining(asList(itemMatchers));
-+ return arrayContaining((List<Matcher<? super E>>) asList(itemMatchers));
- }
-
- /**
+ */
+ @Factory
+ public static <E> Matcher<E[]> arrayContaining(Matcher<? super E>... itemMatchers) {
+- return arrayContaining(asList(itemMatchers));
++ return arrayContaining((List<Matcher<? super E>>) asList(itemMatchers));
+ }
+
+ /**
diff --git a/dev-java/hamcrest-library/hamcrest-library-1.3-r2.ebuild b/dev-java/hamcrest-library/hamcrest-library-1.3-r3.ebuild
index 116e14e5b5b7..1fb31d824ea8 100644
--- a/dev-java/hamcrest-library/hamcrest-library-1.3-r2.ebuild
+++ b/dev-java/hamcrest-library/hamcrest-library-1.3-r3.ebuild
@@ -1,40 +1,41 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-JAVA_PKG_IUSE="source"
+JAVA_PKG_IUSE="doc source"
MAVEN_ID="org.hamcrest:hamcrest-library:1.3"
inherit java-pkg-2 java-pkg-simple
-MY_PN=${PN/-library}
-MY_P="${MY_PN}-${PV}"
-S="${WORKDIR}/${MY_P}"
-
DESCRIPTION="Core library of matchers for building test expressions"
-HOMEPAGE="http://hamcrest.org/JavaHamcrest/"
-SRC_URI="mirror://gentoo/${MY_P}.tgz"
+HOMEPAGE="https://hamcrest.org/JavaHamcrest/"
+SRC_URI="https://github.com/hamcrest/JavaHamcrest/archive/hamcrest-java-${PV}.tar.gz"
LICENSE="BSD-2"
SLOT="${PV}"
KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-DEPEND="dev-java/hamcrest-core:${SLOT}
+CP_DEPEND="dev-java/hamcrest-core:1.3"
+
+DEPEND="${CP_DEPEND}
>=virtual/jdk-1.8:*"
-RDEPEND="dev-java/hamcrest-core:${SLOT}
+
+RDEPEND="${CP_DEPEND}
>=virtual/jre-1.8:*"
-BDEPEND=">=dev-java/hamcrest-generator-${PV}:1.3"
+
+BDEPEND="dev-java/hamcrest-generator:1.3"
JAVA_SRC_DIR="${PN}/src"
-JAVA_GENTOO_CLASSPATH="hamcrest-core-1.3"
DOCS=( {CHANGES,LICENSE,README}.txt )
PATCHES=(
- "${FILESDIR}"/hamcrest-library-1.3-java-11.patch
+ "${FILESDIR}"/hamcrest-library-1.3-r3-java-11.patch
)
+S="${WORKDIR}/JavaHamcrest-hamcrest-java-${PV}"
+
src_prepare() {
default
java-pkg_clean
@@ -55,8 +56,3 @@ src_compile() {
# Compile again, this time including the freshly generated "Matchers.java"
java-pkg-simple_src_compile
}
-
-src_install() {
- default
- java-pkg-simple_src_install
-}
diff --git a/dev-java/hamcrest/hamcrest-2.2.ebuild b/dev-java/hamcrest/hamcrest-2.2.ebuild
index 08c754f7eea1..8660d4f26194 100644
--- a/dev-java/hamcrest/hamcrest-2.2.ebuild
+++ b/dev-java/hamcrest/hamcrest-2.2.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/${PN}/JavaHamcrest/archive/v${PV}.tar.gz -> ${P}.tar
LICENSE="BSD"
SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
DEPEND="
>=virtual/jdk-1.8:*
diff --git a/dev-java/hawtjni-runtime/Manifest b/dev-java/hawtjni-runtime/Manifest
index 473ef1cdabf5..1697e9eae264 100644
--- a/dev-java/hawtjni-runtime/Manifest
+++ b/dev-java/hawtjni-runtime/Manifest
@@ -1,2 +1 @@
-DIST hawtjni-project-1.15.tar.gz 1606236 BLAKE2B 52357dbefde43ec82cf218ada90642d118ebaa6a6be173cc1f4f48377fda95b902f0a90dfb60822c02c144b9bf13d0800c94d67cc2f9c76e607bbbb80a80898e SHA512 1a93658bf8621c770cf97b546c6a5c0cf1821b06cb16dbc872ad0c830c599d3947ffe56b4cca16217a510d4e929ebcfc5eabdf4ad4364f5225b53d22c7d48abb
DIST hawtjni-project-1.18.tar.gz 1615093 BLAKE2B a195bcfb7c213ec4451605f62a1ab3546b7fa160a03d8c6c1a77a58e103481a196845d924d9f1a08cc2a17dfd71f9428f69a64983df00333cc00435c7dde2e5d SHA512 beeacd92c9b4fef413cb2d339041042ffd79fe7cb62c4fa3bcc8c2d758402183a5806ebd0ee91754f9f0025f4115022c71705e8f6330f2fa8b8cead774a30bf0
diff --git a/dev-java/hawtjni-runtime/hawtjni-runtime-1.15-r1.ebuild b/dev-java/hawtjni-runtime/hawtjni-runtime-1.15-r1.ebuild
deleted file mode 100644
index 9c6ad50feb44..000000000000
--- a/dev-java/hawtjni-runtime/hawtjni-runtime-1.15-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-MY_P="hawtjni-project-${PV}"
-
-DESCRIPTION="A JNI code generator based on the generator used by the Eclipse SWT project"
-HOMEPAGE="https://github.com/fusesource/hawtjni"
-SRC_URI="https://github.com/fusesource/hawtjni/archive/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-DEPEND=">=virtual/jdk-1.8:*"
-RDEPEND=">=virtual/jre-1.8:*"
-
-S="${WORKDIR}/hawtjni-${MY_P}/${PN}/src"
-JAVA_SRC_DIR="main/java"
-
-src_install() {
- java-pkg-simple_src_install
- dodoc ../../{changelog,notice,readme}.md
-}
diff --git a/dev-java/hawtjni-runtime/hawtjni-runtime-1.18.ebuild b/dev-java/hawtjni-runtime/hawtjni-runtime-1.18.ebuild
index 13748884cb64..06b8d00654ba 100644
--- a/dev-java/hawtjni-runtime/hawtjni-runtime-1.18.ebuild
+++ b/dev-java/hawtjni-runtime/hawtjni-runtime-1.18.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/fusesource/hawtjni/archive/hawtjni-project-${PV}.tar
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
DEPEND=">=virtual/jdk-1.8:*"
RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/htmlcleaner/Manifest b/dev-java/htmlcleaner/Manifest
index 4352620f3de1..c055de4d6604 100644
--- a/dev-java/htmlcleaner/Manifest
+++ b/dev-java/htmlcleaner/Manifest
@@ -1,2 +1 @@
-DIST htmlcleaner-2.25-src.zip 414193 BLAKE2B e840b65665b23a6c55eda49a522994208b7178ddf924e60bdca9304c58df9bde343b31bbd4b7491db7bfd4fe0930283f9019d9213450618e0d50036563cced86 SHA512 fb49f0298b05008a727e7ba97a3444c6f8c31f65a9962e42bae63e1dab76fc7302f282daa45177daffcadbb73565685735f44b57107c62819bafa0db030c5ea3
DIST htmlcleaner-2.26-src.zip 414195 BLAKE2B c73533054bf7a8a66a767e53cbafecca1f174cb3be16e116ddd0e025e627603e225323e9095ea40b38a06c661ebe9f2a9e1f53736bf74fd8a2e41d909381c4fb SHA512 df1f9ccc696d538289a0addd19f8d955a3bcb0da88640208c513b2f4f0c4a3ee516b459aa3aae25d36d6ec09c4082b96484df287fb422add2eb160072668af5a
diff --git a/dev-java/htmlcleaner/htmlcleaner-2.25.ebuild b/dev-java/htmlcleaner/htmlcleaner-2.25.ebuild
deleted file mode 100644
index bb8c0221c59b..000000000000
--- a/dev-java/htmlcleaner/htmlcleaner-2.25.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="HTML parser written in Java that can be used as a tool, library or Ant task"
-HOMEPAGE="http://htmlcleaner.sourceforge.net/"
-SRC_URI="mirror://sourceforge/htmlcleaner/files/${P}-src.zip"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-CDEPEND="dev-java/jdom:2"
-
-RDEPEND="
- ${CDEPEND}
- >=virtual/jre-1.8:*"
-
-DEPEND="
- ${CDEPEND}
- dev-java/ant-core:0
- test? ( dev-java/junit:4 )
- >=virtual/jdk-1.8:*"
-
-BDEPEND="
- app-arch/unzip"
-
-JAVA_SRC_DIR="src/main/java"
-JAVA_GENTOO_CLASSPATH="jdom-2"
-
-PATCHES=(
- "${FILESDIR}/${PN}-2.24-fix-tests.patch"
-)
-
-src_prepare() {
- default
- # Don't require default.xml to be in the current directory.
- sed -i "s:\"default\.xml\":\"${JAVA_PKG_SHAREPATH}/default.xml\":g" \
- src/main/java/org/htmlcleaner/ConfigFileTagProvider.java || die
-}
-
-src_configure() {
- JAVA_GENTOO_CLASSPATH_EXTRA=$(java-pkg_getjars --build-only ant-core)
-}
-
-src_install() {
- java-pkg-simple_src_install
- java-pkg_register-ant-task
- java-pkg_dolauncher ${PN} --main org.${PN}.CommandLine
-
- insinto "${JAVA_PKG_SHAREPATH}"
- newins example.xml default.xml
-}
-
-src_test() {
- local DIR="src/test/java"
- local CP="${DIR}:${PN}.jar:$(java-pkg_getjars junit-4,${JAVA_GENTOO_CLASSPATH})"
-
- local TESTS=$(find "${DIR}" -name "*Test.java" ! -name "Abstract*")
- TESTS="${TESTS//src\/test\/java\/}"
- TESTS="${TESTS//.java}"
- TESTS="${TESTS//\//.}"
-
- ejavac -classpath "${CP}" -d "${DIR}" $(find "${DIR}" -name "*.java")
- ejunit4 -classpath "${CP}" ${TESTS}
-}
diff --git a/dev-java/htmlcleaner/htmlcleaner-2.26.ebuild b/dev-java/htmlcleaner/htmlcleaner-2.26.ebuild
index 2bb65af8d069..11ae5880fbc2 100644
--- a/dev-java/htmlcleaner/htmlcleaner-2.26.ebuild
+++ b/dev-java/htmlcleaner/htmlcleaner-2.26.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/project/htmlcleaner/htmlcleaner/htmlcleaner%20v${P
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
CP_DEPEND="dev-java/jdom:2"
diff --git a/dev-java/icu4j/Manifest b/dev-java/icu4j/Manifest
index 14622dceb93a..764b0abe0d37 100644
--- a/dev-java/icu4j/Manifest
+++ b/dev-java/icu4j/Manifest
@@ -1 +1 @@
-DIST icu4j-71.1.tar.gz 66177851 BLAKE2B 39c5f6e1a8adc6ee913a7a41dcbf733c1f50e6de3047c0c548bf39426102fccef1a03dd7cb4020bd56b32d0c565848f11cc5ce3f738519dd7d2820a670c40443 SHA512 cc9ccb3208d8079c4f8169713aa0ebb930e86cf6c72510a3b7de5824e6482f26166a2e530abaaecfb8338764b23ac215b2921a821167b41d6a3f23952e2718e6
+DIST icu-72.1.tar.gz 67092974 BLAKE2B 2261c7969ddbfdb4e75e405646cc9f29b1f8dd21f98641b9318457d3cd27694833a9181f4888d2cb243ba65191fe9216a508684c1dbd5a85f36e06ae8fac7d9e SHA512 fee1278f16528867da63d95feee6864a1f62befa9cc0b006439e1b47cf6f3f0e6581692432129e465208b5bd7fcc44e1175f124e83157547b3d9a78f3a4944ab
diff --git a/dev-java/icu4j/icu4j-71.1.ebuild b/dev-java/icu4j/icu4j-72.1.ebuild
index a14ec6534942..6c36773ab3b6 100644
--- a/dev-java/icu4j/icu4j-71.1.ebuild
+++ b/dev-java/icu4j/icu4j-72.1.ebuild
@@ -2,19 +2,19 @@
# Distributed under the terms of the GNU General Public License v2
# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/unicode-org/icu/archive/refs/tags/release-70-1.tar.gz --slot 70 --keywords "~amd64 ~arm64 ~ppc64 ~x86" --ebuild icu4j-70.1.ebuild
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/unicode-org/icu/archive/release-72-1.tar.gz --slot 70 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild icu4j-72.1.ebuild
EAPI=8
JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="com.ibm.icu:icu4j:71.1"
+MAVEN_ID="com.ibm.icu:icu4j:72.1"
JAVA_TESTING_FRAMEWORKS="junit-4"
inherit java-pkg-2 java-pkg-simple
DESCRIPTION="A set of Java libraries providing Unicode and Globalization support"
HOMEPAGE="https://icu.unicode.org"
-SRC_URI="https://github.com/unicode-org/icu/archive/refs/tags/release-${PV/./-}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/unicode-org/icu/archive/refs/tags/release-${PV/./-}.tar.gz -> icu-${PV}.tar.gz"
LICENSE="icu"
SLOT="70"
@@ -109,8 +109,8 @@ src_prepare() {
cp shared/data/testdata.jar . || die
# clone tests src
- for i in charset collate core framework localespi packaging translit; do \
- cp -r tests/$i/{src,resources} ; \
+ for i in charset collate core framework localespi packaging translit; do
+ cp -r tests/$i/{src,resources};
done || die "copying tests from src to resources failed"
cp -r ../tools/misc/{src,resources} || die
@@ -120,7 +120,7 @@ src_prepare() {
}
src_compile() {
- # "icu4j.jar"
+ einfo "Compiling icu4j.jar"
JAVA_SRC_DIR=(
classes/collate/src
classes/core/src
@@ -138,23 +138,26 @@ src_compile() {
resources/translit/src
shared/licenses
)
+ JAVA_AUTOMATIC_MODULE_NAME="com.ibm.icu"
JAVA_JAR_FILENAME="icu4j.jar"
JAVA_MAIN_CLASS="com.ibm.icu.util.VersionInfo"
java-pkg-simple_src_compile
rm -r target || die
- # "icu4j-charset.jar"
- JAVA_SRC_DIR=( classes/charset/src )
- JAVA_RESOURCE_DIRS=( resources/charset/src shared/licenses )
+ einfo "Compiling icu4j-charset.jar"
+ JAVA_AUTOMATIC_MODULE_NAME="com.ibm.icu.charset"
JAVA_JAR_FILENAME="icu4j-charset.jar"
JAVA_MAIN_CLASS=""
+ JAVA_RESOURCE_DIRS=( resources/charset/src shared/licenses )
+ JAVA_SRC_DIR=( classes/charset/src )
java-pkg-simple_src_compile
rm -r target || die
- # "icu4j-localespi.jar"
- JAVA_SRC_DIR=( classes/localespi/src )
- JAVA_RESOURCE_DIRS=( resources/localespi/src shared/licenses )
+ einfo "Compiling icu4j-localespi.jar"
+ JAVA_AUTOMATIC_MODULE_NAME="com.ibm.icu.localespi"
JAVA_JAR_FILENAME="icu4j-localespi.jar"
+ JAVA_RESOURCE_DIRS=( resources/localespi/src shared/licenses )
+ JAVA_SRC_DIR=( classes/localespi/src )
java-pkg-simple_src_compile
rm -r target || die
@@ -162,17 +165,17 @@ src_compile() {
# needed for compilicg the tests
# but "No runnable methods" ("Invalid test class")
if use test; then
- JAVA_SRC_DIR=( tests/framework/src ../tools/misc/src )
- JAVA_RESOURCE_DIRS=( tests/framework/resources ../tools/misc/resources )
JAVA_JAR_FILENAME="framework.jar"
+ JAVA_RESOURCE_DIRS=( tests/framework/resources ../tools/misc/resources )
+ JAVA_SRC_DIR=( tests/framework/src ../tools/misc/src )
java-pkg-simple_src_compile
rm -fr target || die
fi
# javadocs
if use doc; then
- JAVA_SRC_DIR=( classes )
JAVA_JAR_FILENAME="ignoreme.jar"
+ JAVA_SRC_DIR=( classes )
java-pkg-simple_src_compile
fi
}
diff --git a/dev-java/injection-api/Manifest b/dev-java/injection-api/Manifest
new file mode 100644
index 000000000000..f27cd5678a48
--- /dev/null
+++ b/dev-java/injection-api/Manifest
@@ -0,0 +1 @@
+DIST injection-api-2.0.1.tar.gz 15277 BLAKE2B e1a575ce9705636e0e176e63684c3c4ddd3e7932f2fcf36af86e00e4ebb9888151d64019dea8339c80951d40d3f588bcb6857943c2e3a501e68ad7702a73c643 SHA512 21037c1b9b9687210663ee32b40c7ab897a27812591e38af2f840421488029d1b90f0528570940499142a7ec21ebd1f0fc4506872d9667a066b4ce84d38428e5
diff --git a/dev-java/injection-api/injection-api-2.0.1.ebuild b/dev-java/injection-api/injection-api-2.0.1.ebuild
new file mode 100644
index 000000000000..149141f12301
--- /dev/null
+++ b/dev-java/injection-api/injection-api-2.0.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/eclipse-ee4j/injection-api/archive/2.0.1.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild injection-api-2.0.1.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="jakarta.inject:jakarta.inject-api:2.0.1"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Jakarta Dependency Injection"
+HOMEPAGE="https://jakarta.ee/specifications/dependency-injection/"
+SRC_URI="https://github.com/eclipse-ee4j/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
+
+DEPEND=">=virtual/jdk-11:*"
+RDEPEND=">=virtual/jre-1.8:*"
+
+DOCS=( {CONTRIBUTING,NOTICE}.md )
+
+S="${WORKDIR}/${P}"
+
+JAVA_SRC_DIR="src/main/java"
diff --git a/dev-java/injection-api/metadata.xml b/dev-java/injection-api/metadata.xml
new file mode 100644
index 000000000000..4c37da7799c7
--- /dev/null
+++ b/dev-java/injection-api/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>java@gentoo.org</email>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">eclipse-ee4j/injection-api</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-java/j2objc-annotations/Manifest b/dev-java/j2objc-annotations/Manifest
index ab5ae1e084ca..7ce33bc9a26c 100644
--- a/dev-java/j2objc-annotations/Manifest
+++ b/dev-java/j2objc-annotations/Manifest
@@ -1,2 +1 @@
-DIST j2objc-1.2.tar.gz 9719149 BLAKE2B 8d5b9fd5b1e9356edf0e9021537c45d74f6e666de7a5fc85eb6a619b0616475bea6ef65e030e0e4023049123fba07793243af8299b8e4e24b224f252dafd8eda SHA512 2332eedcca42c936044f39ca5cf457995786beea140eb2e621d5fc7804d63aae961ad89f0f31b56afe32f8d852ecb6e73e576aaa85290135b87b762848f28c25
DIST j2objc-2.8.tar.gz 29383083 BLAKE2B a2d288b95fac5d5fafbf5e3c8c7c862e41ba9562f6a3f367ee03574db0f07e030f7812de7d0cf63c97acdbbf8ddd8128fe14e89e97623d6d3cf7b85071e160b3 SHA512 f93a77db3a672691666de317010e455aceb20313a40217270cf4cfd082a0443f7f5cf6f53f06a1006d0a2788c199685a574b0acb435dccdc4e419a2340451860
diff --git a/dev-java/j2objc-annotations/j2objc-annotations-1.2-r1.ebuild b/dev-java/j2objc-annotations/j2objc-annotations-1.2-r1.ebuild
deleted file mode 100644
index 8e90d442f377..000000000000
--- a/dev-java/j2objc-annotations/j2objc-annotations-1.2-r1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_PN="${PN%-annotations}"
-MY_P="${MY_PN}-${PV}"
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Annotations for the J2ObjC Java to Objective-C translator"
-HOMEPAGE="http://j2objc.org"
-SRC_URI="https://github.com/google/${MY_PN}/archive/${PV}.tar.gz -> ${MY_P}.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-DEPEND=">=virtual/jdk-1.8:*"
-RDEPEND=">=virtual/jre-1.8:*"
-
-S="${WORKDIR}/${MY_P}/annotations"
-JAVA_SRC_DIR="src/main/java"
diff --git a/dev-java/j2objc-annotations/j2objc-annotations-2.8.ebuild b/dev-java/j2objc-annotations/j2objc-annotations-2.8.ebuild
index 6d1ab4cdf1d2..3d69f0171861 100644
--- a/dev-java/j2objc-annotations/j2objc-annotations-2.8.ebuild
+++ b/dev-java/j2objc-annotations/j2objc-annotations-2.8.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/google/j2objc/archive/${PV}.tar.gz -> j2objc-${PV}.t
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
DEPEND="virtual/jdk:1.8"
RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/jackrabbit-webdav/jackrabbit-webdav-2.10.1-r2.ebuild b/dev-java/jackrabbit-webdav/jackrabbit-webdav-2.10.1-r3.ebuild
index de5e7d799a3f..bce380ed025c 100644
--- a/dev-java/jackrabbit-webdav/jackrabbit-webdav-2.10.1-r2.ebuild
+++ b/dev-java/jackrabbit-webdav/jackrabbit-webdav-2.10.1-r3.ebuild
@@ -24,7 +24,7 @@ CP_DEPEND="dev-java/bndlib:0
dev-java/slf4j-api:0
dev-java/slf4j-nop:0
dev-java/commons-httpclient:3
- java-virtuals/servlet-api:2.3"
+ dev-java/tomcat-servlet-api:2.3"
DEPEND=">=virtual/jdk-1.8:*
${CP_DEPEND}"
diff --git a/dev-java/jackrabbit-webdav/jackrabbit-webdav-2.21.7-r1.ebuild b/dev-java/jackrabbit-webdav/jackrabbit-webdav-2.21.7-r1.ebuild
index ab072c3b1bd9..378c64394006 100644
--- a/dev-java/jackrabbit-webdav/jackrabbit-webdav-2.21.7-r1.ebuild
+++ b/dev-java/jackrabbit-webdav/jackrabbit-webdav-2.21.7-r1.ebuild
@@ -13,7 +13,7 @@ JAVA_TESTING_FRAMEWORKS="junit-4"
inherit java-pkg-2 java-pkg-simple
DESCRIPTION="Generic WebDAV Library"
-HOMEPAGE="http://jackrabbit.apache.org/jackrabbit-webdav/"
+HOMEPAGE="https://jackrabbit.apache.org"
SRC_URI="mirror://apache/jackrabbit/${PV}/jackrabbit-${PV}-src.zip"
LICENSE="Apache-2.0"
diff --git a/dev-java/jackson-annotations/Manifest b/dev-java/jackson-annotations/Manifest
index 63bfb41a2979..e56fa64c2593 100644
--- a/dev-java/jackson-annotations/Manifest
+++ b/dev-java/jackson-annotations/Manifest
@@ -1 +1 @@
-DIST jackson-annotations-2.13.3.tar.gz 1984205 BLAKE2B c577fcdcb40c44cf1cb08ebe467318ca4e4fff9fdeaf756360ef202275a48b5f5a93135439567261651b5731f523588f0c29a17c05ba6d03fec0f19ed19d9c5b SHA512 c00aec542c8ddea999fb60536cb2cab3edbf4f1d20b29e404d62add54a22546ca195ab7faeda4a2cd1d3a827f10420ccafe1dfb0065742f46aecfc2d00f2c1fc
+DIST jackson-annotations-2.13.4.tar.gz 1984001 BLAKE2B 8c4eed89fc0c5b3d68f25f2db28a38e55a2e629c7c38289a82f4ff4a122967326e0221cb020afb69577fe4d5baa2ba89f8db5a398302cd25404083a5d0830eaf SHA512 5ad1d07b254956f9d4123eb01e32d8a8f43eccefe60c6841675ccfecd8837feb4de9352d90f8b8a2703f0f12a0fd20083f8d274594e1ca5674894b2cd76ce322
diff --git a/dev-java/jackson-annotations/jackson-annotations-2.13.3.ebuild b/dev-java/jackson-annotations/jackson-annotations-2.13.4.ebuild
index 13397eeb87c4..4505a819c458 100644
--- a/dev-java/jackson-annotations/jackson-annotations-2.13.3.ebuild
+++ b/dev-java/jackson-annotations/jackson-annotations-2.13.4.ebuild
@@ -2,12 +2,12 @@
# Distributed under the terms of the GNU General Public License v2
# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/FasterXML/jackson-annotations/archive/jackson-annotations-2.13.3.tar.gz --slot 2 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild jackson-annotations-2.13.3.ebuild
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/FasterXML/jackson-annotations/archive/jackson-annotations-2.13.4.tar.gz --slot 2 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild jackson-annotations-2.13.4.ebuild
EAPI=8
JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="com.fasterxml.jackson.core:jackson-annotations:2.13.3"
+MAVEN_ID="com.fasterxml.jackson.core:jackson-annotations:2.13.4"
JAVA_TESTING_FRAMEWORKS="junit-4"
inherit java-pkg-2 java-pkg-simple
@@ -23,7 +23,7 @@ KEYWORDS="amd64 ~arm arm64 ppc64 x86"
DEPEND=">=virtual/jdk-11:*"
RDEPEND=">=virtual/jre-1.8:*"
-DOCS=( README.md release-notes/VERSION-2.x )
+DOCS=( {README,SECURITY}.md release-notes/VERSION-2.x )
S="${WORKDIR}/${PN}-${P}"
@@ -36,8 +36,3 @@ JAVA_TEST_EXCLUDES=(
# junit.framework.AssertionFailedError: No tests found in com.fasterxml.jackson.annotation.TestBase
com.fasterxml.jackson.annotation.TestBase
)
-
-src_install() {
- default # https://bugs.gentoo.org/789582
- java-pkg-simple_src_install
-}
diff --git a/dev-java/jackson-core/Manifest b/dev-java/jackson-core/Manifest
index 49e736e09bf2..ebe2f5072775 100644
--- a/dev-java/jackson-core/Manifest
+++ b/dev-java/jackson-core/Manifest
@@ -1 +1 @@
-DIST jackson-core-2.13.3.tar.gz 12268319 BLAKE2B 8053988b060cd625670c643d9ba12d9ceae72dffa583bfc78e87044ac723c78bc44dfbdbaca0331098116a43b273dac844721a9e44ba1a536cc457f841d89b56 SHA512 9e7a9ec54073fa6faac36914c496df38bb6c201a37ade2b32306561b71e1b78a0ec4f48b006d4fb10cbde21979a16d117706b59338ada7aedcb593ba5c31ea52
+DIST jackson-core-2.13.4.tar.gz 12270995 BLAKE2B d4556ad35eaf4f3182cb07eb39b14691a0d9c5d7801a4f6450536fcb33c19e9d6f24e80477c09dae167d4ff3b3e57798d63f4c24ca689a902350a6ff4ce0b19d SHA512 95fba755c9289728ce6168e57ef8f2417df03616b5839beacc338947d1447719e930b6f820144c0f398f162676e5d56a6a5bbcb86cbdb15f80de566ba45c478a
diff --git a/dev-java/jackson-core/jackson-core-2.13.3.ebuild b/dev-java/jackson-core/jackson-core-2.13.4.ebuild
index e25ceed85a1a..c5efc120c377 100644
--- a/dev-java/jackson-core/jackson-core-2.13.3.ebuild
+++ b/dev-java/jackson-core/jackson-core-2.13.4.ebuild
@@ -2,12 +2,12 @@
# Distributed under the terms of the GNU General Public License v2
# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/FasterXML/jackson-core/archive/jackson-core-2.13..tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild jackson-core-2.13.333.ebuild
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/FasterXML/jackson-core/archive/jackson-core-2.13.4.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild jackson-core-2.13.4.ebuild
EAPI=8
JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="com.fasterxml.jackson.core:jackson-core:2.13.3"
+MAVEN_ID="com.fasterxml.jackson.core:jackson-core:2.13.4"
JAVA_TESTING_FRAMEWORKS="junit-4"
inherit java-pkg-2 java-pkg-simple
@@ -23,7 +23,7 @@ KEYWORDS="amd64 ~arm arm64 ppc64 x86"
DEPEND=">=virtual/jdk-11:*"
RDEPEND=">=virtual/jre-1.8:*"
-DOCS=( README.md release-notes/{CREDITS-2.x,VERSION-2.x} )
+DOCS=( {README,SECURITY}.md release-notes/{CREDITS-2.x,VERSION-2.x} )
S="${WORKDIR}/${PN}-${P}"
@@ -62,8 +62,3 @@ src_test() {
JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}"
java-pkg-simple_src_test
}
-
-src_install() {
- default # https://bugs.gentoo.org/789582
- java-pkg-simple_src_install
-}
diff --git a/dev-java/jackson-databind/Manifest b/dev-java/jackson-databind/Manifest
index c7c82d3053aa..34113ea0eb6d 100644
--- a/dev-java/jackson-databind/Manifest
+++ b/dev-java/jackson-databind/Manifest
@@ -1 +1 @@
-DIST jackson-databind-2.13.3.tar.gz 48056095 BLAKE2B 04751cd99eae3bbf3c3a30993506f05b47a85782f52e2cf51f50de9bcb5e9c3718d6ba6105667226272d644dcac6aeeb3ce06dc7ae737adf0392a7a7eafef2aa SHA512 785db6cab20ee74ff90815b8a1afedcbf10f13f60c336a61c20513757cbcde80c073d5f4dc60d390a72600a2b5719cca22b4c71220707dd4edd67dd87f6a7ac9
+DIST jackson-databind-2.13.4.1.tar.gz 48063423 BLAKE2B 88370810068f3c1b3973f310e55e6fb53067ff9796de960d2c57cd50ee59dd552f58b4e73d4455076b18ec996ce7714ab84000a4887a1779fcf259859c891346 SHA512 22b7a4225903a0fad3d7d17a5fad79905da96a4a7ebf70b7d9f2c778e88f8c9c2a27d96f66beae96f189ebcd9ca19fd7b12405009ae38023ec8b0511e1ba1af2
diff --git a/dev-java/jackson-databind/jackson-databind-2.13.3.ebuild b/dev-java/jackson-databind/jackson-databind-2.13.4.1.ebuild
index f6673fd7ebe7..e7113f161f38 100644
--- a/dev-java/jackson-databind/jackson-databind-2.13.3.ebuild
+++ b/dev-java/jackson-databind/jackson-databind-2.13.4.1.ebuild
@@ -2,13 +2,14 @@
# Distributed under the terms of the GNU General Public License v2
# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/FasterXML/jackson-databind/archive/jackson-databind-2.13.3.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild jackson-databind-2.13.3.ebuild
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/FasterXML/jackson-databind/archive/jackson-databind-2.13.4.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild jackson-databind-2.13.4.ebuild
EAPI=8
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="com.fasterxml.jackson.core:jackson-databind:2.13.3"
-JAVA_TESTING_FRAMEWORKS="junit-4"
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="com.fasterxml.jackson.core:jackson-databind:2.13.4.1"
+# No tests because of not yet packaged powermock
+# JAVA_TESTING_FRAMEWORKS="junit-4"
inherit java-pkg-2 java-pkg-simple
@@ -20,17 +21,14 @@ LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-# Dependencies like powermock-{core,module-junit4,api-mockito2} are not available in ::gentoo
-RESTRICT="test"
-
# Common dependencies
# POM: pom.xml
-# com.fasterxml.jackson.core:jackson-annotations:2.13.3 -> >=dev-java/jackson-annotations-2.13.3:2
-# com.fasterxml.jackson.core:jackson-core:2.13.3 -> >=dev-java/jackson-core-2.13.3:0
+# com.fasterxml.jackson.core:jackson-annotations:2.13.4 -> >=dev-java/jackson-annotations-2.13.4:2
+# com.fasterxml.jackson.core:jackson-core:2.13.4 -> >=dev-java/jackson-core-2.13.4:0
CP_DEPEND="
- ~dev-java/jackson-annotations-${PV}:2
- ~dev-java/jackson-core-${PV}:0
+ ~dev-java/jackson-annotations-2.13.4:2
+ ~dev-java/jackson-core-2.13.4:0
"
# Compile dependencies
@@ -76,8 +74,3 @@ src_prepare() {
"${JAVA_SRC_DIR}/com/fasterxml/jackson/databind/cfg/PackageVersion.java.in" \
> "${JAVA_SRC_DIR}/com/fasterxml/jackson/databind/cfg/PackageVersion.java" || die
}
-
-src_install() {
- default # https://bugs.gentoo.org/789582
- java-pkg-simple_src_install
-}
diff --git a/dev-java/jackson-dataformat-xml/Manifest b/dev-java/jackson-dataformat-xml/Manifest
index c3e4606939c7..e8a729e86a91 100644
--- a/dev-java/jackson-dataformat-xml/Manifest
+++ b/dev-java/jackson-dataformat-xml/Manifest
@@ -1 +1 @@
-DIST jackson-dataformat-xml-2.13.3.tar.gz 3201473 BLAKE2B 90f6b98325e3ae43e7ba560b077ee8fc8e5ad5004fd23b7c10a2c2a3ec7a674b700b80766690d2442820f87698fa5e33c440c2aa12cd521b7566e78eca50bbaa SHA512 52e26e1a398d90f75ef61d074ed1d149b9f13555f1878703b3148ed008f29f8802586a6020f3c1427a748a73b9a4ca56d86ffd769cf6cb7317a69e039345eefa
+DIST jackson-dataformat-xml-2.13.4.tar.gz 3203115 BLAKE2B c959c878c6905de9fee73fab87381296d30146ab755765e715f49f141ea80d3843116752710e78f270c96abb0a2dd784fff01769ce68c126b3c7bd5acbe1a880 SHA512 8b6c76d8b324ceffece806f2de1352e2b2b557d64f51885bec8e60033c254e9c5a9adad29c07b6a5aaa77d535245ad581f67768a62af7a44160221aae62115e6
diff --git a/dev-java/jackson-dataformat-xml/jackson-dataformat-xml-2.13.3-r1.ebuild b/dev-java/jackson-dataformat-xml/jackson-dataformat-xml-2.13.4-r1.ebuild
index af94b82ff4ac..0abe765139fe 100644
--- a/dev-java/jackson-dataformat-xml/jackson-dataformat-xml-2.13.3-r1.ebuild
+++ b/dev-java/jackson-dataformat-xml/jackson-dataformat-xml-2.13.4-r1.ebuild
@@ -2,12 +2,12 @@
# Distributed under the terms of the GNU General Public License v2
# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/FasterXML/jackson-dataformat-xml/archive/jackson-dataformat-xml-2.13.3.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild jackson-dataformat-xml-2.13.3.ebuild
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/FasterXML/jackson-dataformat-xml/archive/jackson-dataformat-xml-2.13.4.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild jackson-dataformat-xml-2.13.4.ebuild
EAPI=8
JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.13.3"
+MAVEN_ID="com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.13.4"
JAVA_TESTING_FRAMEWORKS="junit-4"
inherit java-pkg-2 java-pkg-simple
@@ -22,23 +22,23 @@ KEYWORDS="amd64 ~arm arm64 ppc64 x86"
# Common dependencies
# POM: pom.xml
-# com.fasterxml.jackson.core:jackson-annotations:2.13.3 -> >=dev-java/jackson-annotations-2.13.3:2
-# com.fasterxml.jackson.core:jackson-core:2.13.3 -> >=dev-java/jackson-core-2.13.3:0
-# com.fasterxml.jackson.core:jackson-databind:2.13.3 -> >=dev-java/jackson-databind-2.13.3:0
-# com.fasterxml.woodstox:woodstox-core:6.2.7 -> >=dev-java/woodstox-core-6.2.8:0
+# com.fasterxml.jackson.core:jackson-annotations:2.13.4 -> >=dev-java/jackson-annotations-2.13.4:2
+# com.fasterxml.jackson.core:jackson-core:2.13.4 -> >=dev-java/jackson-core-2.13.4:0
+# com.fasterxml.jackson.core:jackson-databind:2.13.4 -> >=dev-java/jackson-databind-2.13.4:0
+# com.fasterxml.woodstox:woodstox-core:6.3.1 -> >=dev-java/woodstox-core-6.3.1:0
# org.codehaus.woodstox:stax2-api:4.2.1 -> >=dev-java/stax2-api-4.2.1:0
CP_DEPEND="
~dev-java/jackson-annotations-${PV}:2
~dev-java/jackson-core-${PV}:0
- ~dev-java/jackson-databind-${PV}:0
+ ~dev-java/jackson-databind-${PV}.1:0
>=dev-java/stax2-api-4.2.1-r1:0
dev-java/woodstox-core:0
"
# Compile dependencies
# POM: pom.xml
-# test? com.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations:2.13.3 -> >=dev-java/jackson-module-jakarta-xmlbind-2.13.3:0
+# test? com.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations:2.13.4 -> >=dev-java/jackson-module-jakarta-xmlbind-2.13.4:0
# test? com.sun.xml.stream:sjsxp:1.0.2 -> >=dev-java/sjsxp-1.0.2:0
# test? jakarta.xml.bind:jakarta.xml.bind-api:3.0.1 -> >=dev-java/jaxb-api-3.0.1:3
# test? junit:junit:4.13.1 -> >=dev-java/junit-4.13.2:4
@@ -57,7 +57,7 @@ RDEPEND="
>=virtual/jre-1.8:*
${CP_DEPEND}"
-DOCS=( README.md release-notes/{CREDITS,VERSION}-2.x )
+DOCS=( {README,SECURITY}.md release-notes/{CREDITS,VERSION}-2.x )
S="${WORKDIR}/${PN}-${P}"
@@ -103,8 +103,3 @@ src_test() {
java-pkg-simple_src_test
}
-
-src_install() {
- default # https://bugs.gentoo.org/789582
- java-pkg-simple_src_install
-}
diff --git a/dev-java/jackson-dataformat-yaml/Manifest b/dev-java/jackson-dataformat-yaml/Manifest
index 30c81f39372f..3788f2029f74 100644
--- a/dev-java/jackson-dataformat-yaml/Manifest
+++ b/dev-java/jackson-dataformat-yaml/Manifest
@@ -1 +1 @@
-DIST jackson-dataformats-text-2.13.3.tar.gz 3528981 BLAKE2B 98593f45e663905c15ab5cb37152c95d69a0121515990fac0c66f640d93af83cd51802e2856a4e8df6b82c0121ac4fcd20774fd6a3841e019e1da56c599ed9a9 SHA512 77fad3e6ab5ad55d3a46ffaee3482e9f0dbfa36ce67d5ad31e0b7cde667536387f1dce5bc8296733a28efb09f423785aca7291d9ba85a67ca2b94ef4c8766d7f
+DIST jackson-dataformats-text-2.13.4.tar.gz 3530892 BLAKE2B 3cbfcbbd33aeac67476caa453b77c19a1da88a9fb9482360bf427af3f41d689a04fc1ecb28d4424c5bfd7436979f1b03c215ca88a0064338f53dfd169f288562 SHA512 792f416c7cabd639b42bd93205e55328ace53c093e59d57eeaedc27a61358527515031c70dd503702471a13237f6389ca118e453da0ab002e20a531885d58a11
diff --git a/dev-java/jackson-dataformat-yaml/jackson-dataformat-yaml-2.13.3.ebuild b/dev-java/jackson-dataformat-yaml/jackson-dataformat-yaml-2.13.3.ebuild
deleted file mode 100644
index 8dd76fc9caca..000000000000
--- a/dev-java/jackson-dataformat-yaml/jackson-dataformat-yaml-2.13.3.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/FasterXML/jackson-dataformats-text/archive/jackson-dataformats-text-2.13.3.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild jackson-dataformat-yaml-2.13.3.ebuild
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.13.3"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Support for reading and writing YAML-encoded data via Jackson abstractions"
-HOMEPAGE="https://github.com/FasterXML/jackson-dataformats-text"
-SRC_URI="https://github.com/FasterXML/jackson-dataformats-text/archive/jackson-dataformats-text-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-# Common dependencies
-# POM: pom.xml
-# com.fasterxml.jackson.core:jackson-core:2.13.3 -> >=dev-java/jackson-core-2.13.3:0
-# com.fasterxml.jackson.core:jackson-databind:2.13.3 -> >=dev-java/jackson-databind-2.13.3:0
-# org.yaml:snakeyaml:1.30 -> >=dev-java/snakeyaml-1.30:0
-
-CP_DEPEND="
- ~dev-java/jackson-core-${PV}:0
- ~dev-java/jackson-databind-${PV}:0
- dev-java/snakeyaml:0
-"
-
-DEPEND="
- >=virtual/jdk-11:*
- ${CP_DEPEND}
-"
-
-RDEPEND="
- >=virtual/jre-1.8:*
- ${CP_DEPEND}"
-
-DOCS=( README.md release-notes/{CREDITS,VERSION} )
-
-S="${WORKDIR}/jackson-dataformats-text-jackson-dataformats-text-${PV}/yaml"
-
-JAVA_SRC_DIR=( "src/main/java" "src/moditect" )
-JAVA_RESOURCE_DIRS="src/main/resources"
-
-JAVA_TEST_GENTOO_CLASSPATH="junit-4"
-JAVA_TEST_SRC_DIR="src/test/java"
-JAVA_TEST_RESOURCE_DIRS="src/test/resources"
-JAVA_TEST_EXCLUDES=(
- # Upstream's usual exclude pattern: "**/failing**/*.java"
- com.fasterxml.jackson.dataformat.yaml.failing.ObjectIdWithTree2Test
- com.fasterxml.jackson.dataformat.yaml.failing.PolymorphicWithObjectId25Test
- com.fasterxml.jackson.dataformat.yaml.failing.SimpleGeneration215Test
-)
-
-src_prepare() {
- default
- java-pkg-2_src_prepare
-
- sed -e 's:@package@:com.fasterxml.jackson.dataformat.yaml:g' \
- -e "s:@projectversion@:${PV}:g" \
- -e 's:@projectgroupid@:com.fasterxml.jackson.dataformat:g' \
- -e "s:@projectartifactid@:${PN}:g" \
- "${JAVA_SRC_DIR}/com/fasterxml/jackson/dataformat/yaml/PackageVersion.java.in" \
- > "${JAVA_SRC_DIR}/com/fasterxml/jackson/dataformat/yaml/PackageVersion.java" || die
-
- # dev-java/snakeyaml-1.30 does not provide module-info
- sed -e '/snakeyaml;/d' -i src/moditect/module-info.java || die
-}
-
-src_install() {
- default # https://bugs.gentoo.org/789582
- java-pkg-simple_src_install
-}
diff --git a/dev-java/jackson-dataformat-yaml/jackson-dataformat-yaml-2.13.3-r1.ebuild b/dev-java/jackson-dataformat-yaml/jackson-dataformat-yaml-2.13.4-r1.ebuild
index 530150c4744a..a852610200cc 100644
--- a/dev-java/jackson-dataformat-yaml/jackson-dataformat-yaml-2.13.3-r1.ebuild
+++ b/dev-java/jackson-dataformat-yaml/jackson-dataformat-yaml-2.13.4-r1.ebuild
@@ -2,12 +2,12 @@
# Distributed under the terms of the GNU General Public License v2
# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/FasterXML/jackson-dataformats-text/archive/jackson-dataformats-text-2.13.3.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild jackson-dataformat-yaml-2.13.3.ebuild
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/FasterXML/jackson-dataformats-text/archive/jackson-dataformats-text-2.13.4.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild jackson-dataformat-yaml-2.13.4.ebuild
EAPI=8
JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.13.3"
+MAVEN_ID="com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.13.4"
JAVA_TESTING_FRAMEWORKS="junit-4"
inherit java-pkg-2 java-pkg-simple
@@ -18,12 +18,12 @@ SRC_URI="https://github.com/FasterXML/jackson-dataformats-text/archive/jackson-d
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
DEPEND="
~dev-java/jackson-core-${PV}:0
- ~dev-java/jackson-databind-${PV}:0
- >=dev-java/snakeyaml-1.30-r1:0
+ ~dev-java/jackson-databind-${PV}.1:0
+ dev-java/snakeyaml:0
>=virtual/jdk-11:*
"
diff --git a/dev-java/jackson-module-jakarta-xmlbind/Manifest b/dev-java/jackson-module-jakarta-xmlbind/Manifest
index 709b5d5c0d0d..9066121ef023 100644
--- a/dev-java/jackson-module-jakarta-xmlbind/Manifest
+++ b/dev-java/jackson-module-jakarta-xmlbind/Manifest
@@ -1 +1 @@
-DIST jackson-module-jakarta-xmlbind-2.13.3.tar.gz 2145569 BLAKE2B 13864e4272d40e8425232482a67a2bc720ff294e93ec623589bd0b7286e2c63c2b724bc1033eb19437cdea23db0b11142380715fc300c32e8af9dba22eeed407 SHA512 2807a9e1d3531f3553a2ab6bb64e0ece2809ca9d2facae320dbd38efe0797cdc7ab11e9b284122d75a98a50eda9bc0cfb0f098ca0921e3bf67a0e38b5252a14d
+DIST jackson-module-jakarta-xmlbind-2.13.4.tar.gz 2146134 BLAKE2B ae20a115464a052a8403172706025fc595d6e6aeafda60cf3cce784e1e0a29f38d672fb5205e9dbd74de1ef9615f3bfd0268711d9992c123cac0ef692e59be3a SHA512 0706566a9e5e68697d54319a425fde53948ad610a6eb9519d2e02d375ea280468c7e9e3d5ff4378535ed3a71480f207257a558f73819b1b81edc69f9d3c317a8
diff --git a/dev-java/jackson-module-jakarta-xmlbind/jackson-module-jakarta-xmlbind-2.13.3.ebuild b/dev-java/jackson-module-jakarta-xmlbind/jackson-module-jakarta-xmlbind-2.13.3.ebuild
deleted file mode 100644
index b8c68c4cebaa..000000000000
--- a/dev-java/jackson-module-jakarta-xmlbind/jackson-module-jakarta-xmlbind-2.13.3.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/FasterXML/jackson-modules-base/archive/jackson-modules-base-2.13.3.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild jackson-module-jakarta-xmlbind-2.13.3.ebuild
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="com.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations:2.13.3"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Support for using Jakarta XML Bind (aka JAXB 3.0) annotations"
-HOMEPAGE="https://github.com/FasterXML/jackson-modules-base"
-SRC_URI="https://github.com/FasterXML/jackson-modules-base/archive/jackson-modules-base-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-# We don't have jaxb-runtime:3.0.1
-RESTRICT="test"
-
-# Common dependencies
-# POM: pom.xml
-# com.fasterxml.jackson.core:jackson-annotations:2.13.3 -> >=dev-java/jackson-annotations-2.13.3:2
-# com.fasterxml.jackson.core:jackson-core:2.13.3 -> >=dev-java/jackson-core-2.13.3:0
-# com.fasterxml.jackson.core:jackson-databind:2.13.3 -> >=dev-java/jackson-databind-2.13.3:0
-# com.sun.activation:jakarta.activation:2.0.1 -> >=dev-java/jakarta-activation-2.0.1:2
-# jakarta.xml.bind:jakarta.xml.bind-api:3.0.1 -> >=dev-java/jaxb-api-3.0.1:3
-
-CP_DEPEND="
- ~dev-java/jackson-annotations-${PV}:2
- ~dev-java/jackson-core-${PV}:0
- ~dev-java/jackson-databind-${PV}:0
- dev-java/jakarta-activation:1
- dev-java/jaxb-api:3
-"
-
-# Compile dependencies
-# POM: pom.xml
-# test? junit:junit:4.13.1 -> >=dev-java/junit-4.13.2:4
-# test? org.glassfish.jaxb:jaxb-runtime:3.0.1 -> !!!groupId-not-found!!!
-
-DEPEND="
- >=virtual/jdk-11:*
- ${CP_DEPEND}"
-# test? (
-# !!!groupId-not-found!!!
-# )
-#"
-
-RDEPEND="
- >=virtual/jre-1.8:*
- ${CP_DEPEND}"
-
-S="${WORKDIR}/jackson-modules-base-jackson-modules-base-${PV}/jakarta-xmlbind/"
-
-JAVA_SRC_DIR=( "src/main/java" "src/moditect" )
-JAVA_RESOURCE_DIRS="src/main/resources"
-
-# JAVA_TEST_GENTOO_CLASSPATH="junit-4,!!!groupId-not-found!!!"
-# JAVA_TEST_SRC_DIR="src/test/java"
-
-src_prepare() {
- java-pkg-2_src_prepare
-
- sed -e 's:@package@:com.fasterxml.jackson.module.jakarta.xmlbind:g' \
- -e "s:@projectversion@:${PV}:g" \
- -e 's:@projectgroupid@:com.fasterxml.jackson.module:g' \
- -e "s:@projectartifactid@:jackson-module-jakarta-xmlbind-annotations:g" \
- "${JAVA_SRC_DIR}/com/fasterxml/jackson/module/jakarta/xmlbind/PackageVersion.java.in" \
- > "${JAVA_SRC_DIR}/com/fasterxml/jackson/module/jakarta/xmlbind/PackageVersion.java" || die
-}
-
-src_install() {
- default # https://bugs.gentoo.org/789582
- java-pkg-simple_src_install
-}
diff --git a/dev-java/jackson-module-jakarta-xmlbind/jackson-module-jakarta-xmlbind-2.13.3-r1.ebuild b/dev-java/jackson-module-jakarta-xmlbind/jackson-module-jakarta-xmlbind-2.13.4-r1.ebuild
index 394536c89255..afca2db73bd3 100644
--- a/dev-java/jackson-module-jakarta-xmlbind/jackson-module-jakarta-xmlbind-2.13.3-r1.ebuild
+++ b/dev-java/jackson-module-jakarta-xmlbind/jackson-module-jakarta-xmlbind-2.13.4-r1.ebuild
@@ -2,12 +2,12 @@
# Distributed under the terms of the GNU General Public License v2
# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/FasterXML/jackson-modules-base/archive/jackson-modules-base-2.13.3.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild jackson-module-jakarta-xmlbind-2.13.3.ebuild
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/FasterXML/jackson-modules-base/archive/jackson-modules-base-2.13.4.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild jackson-module-jakarta-xmlbind-2.13.4.ebuild
EAPI=8
JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="com.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations:2.13.3"
+MAVEN_ID="com.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations:2.13.4"
JAVA_TESTING_FRAMEWORKS="junit-4"
inherit java-pkg-2 java-pkg-simple
@@ -18,20 +18,20 @@ SRC_URI="https://github.com/FasterXML/jackson-modules-base/archive/jackson-modul
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
# Common dependencies
# POM: pom.xml
-# com.fasterxml.jackson.core:jackson-annotations:2.13.3 -> >=dev-java/jackson-annotations-2.13.3:2
-# com.fasterxml.jackson.core:jackson-core:2.13.3 -> >=dev-java/jackson-core-2.13.3:0
-# com.fasterxml.jackson.core:jackson-databind:2.13.3 -> >=dev-java/jackson-databind-2.13.3:0
-# com.sun.activation:jakarta.activation:2.0.1 -> >=dev-java/jakarta-activation-2.0.1:2
+# com.fasterxml.jackson.core:jackson-annotations:2.13.4 -> >=dev-java/jackson-annotations-2.13.4:2
+# com.fasterxml.jackson.core:jackson-core:2.13.4 -> >=dev-java/jackson-core-2.13.4:0
+# com.fasterxml.jackson.core:jackson-databind:2.13.4 -> >=dev-java/jackson-databind-2.13.4:0
+# jakarta.activation:jakarta.activation-api:2.1.0 -> >=dev-java/jakarta-activation-api-2.1.0:2
# jakarta.xml.bind:jakarta.xml.bind-api:3.0.1 -> >=dev-java/jaxb-api-3.0.1:3
CP_DEPEND="
~dev-java/jackson-annotations-${PV}:2
~dev-java/jackson-core-${PV}:0
- ~dev-java/jackson-databind-${PV}:0
+ ~dev-java/jackson-databind-${PV}.1:0
dev-java/jakarta-activation:1
dev-java/jaxb-api:4
"
@@ -39,7 +39,7 @@ CP_DEPEND="
# Compile dependencies
# POM: pom.xml
# test? junit:junit:4.13.1 -> >=dev-java/junit-4.13.2:4
-# test? org.glassfish.jaxb:jaxb-runtime:3.0.1 -> !!!groupId-not-found!!!
+# test? org.glassfish.jaxb:jaxb-runtime:3.0.1 -> >=dev-java/jaxb-runtime-4.0.0:4
DEPEND="
>=virtual/jdk-11:*
@@ -77,8 +77,3 @@ src_prepare() {
"${JAVA_SRC_DIR}/com/fasterxml/jackson/module/jakarta/xmlbind/PackageVersion.java.in" \
> "${JAVA_SRC_DIR}/com/fasterxml/jackson/module/jakarta/xmlbind/PackageVersion.java" || die
}
-
-src_install() {
- default # https://bugs.gentoo.org/789582
- java-pkg-simple_src_install
-}
diff --git a/dev-java/jacl/metadata.xml b/dev-java/jacl/metadata.xml
index 2cb9f05ebf1a..c574f221537a 100644
--- a/dev-java/jacl/metadata.xml
+++ b/dev-java/jacl/metadata.xml
@@ -6,35 +6,35 @@
<name>Java</name>
</maintainer>
<longdescription>
-The Tcl/Java project's goal is to make integrating the Java platform and the
-Tcl scripting language as easy as possible. The project actually consists of
-two distinct packages, called Tcl Blend and Jacl. It is important to
-understand what each package provides and in what situations one might choose
-to use Jacl or Tcl Blend.
+ The Tcl/Java project's goal is to make integrating the Java platform and the
+ Tcl scripting language as easy as possible. The project actually consists of
+ two distinct packages, called Tcl Blend and Jacl. It is important to
+ understand what each package provides and in what situations one might choose
+ to use Jacl or Tcl Blend.
-Tcl Blend is a Tcl extension that makes use of JNI to facilitate communication
-between a Java interpreter and a Tcl interpreter. Tcl Blend is typically used
-to load a Java interpreter into an existing Tcl process, so that functionality
-implemented in Java can be accessed via Tcl. One can also load Tcl Blend and
-Tcl into a Java process, which is a great way to add scripting functionality
-to an existing Java application. Because Tcl Blend is a normal Tcl extension,
-one can use it with other popular Tcl extensions like Tk, Expect, and Itcl.
+ Tcl Blend is a Tcl extension that makes use of JNI to facilitate communication
+ between a Java interpreter and a Tcl interpreter. Tcl Blend is typically used
+ to load a Java interpreter into an existing Tcl process, so that functionality
+ implemented in Java can be accessed via Tcl. One can also load Tcl Blend and
+ Tcl into a Java process, which is a great way to add scripting functionality
+ to an existing Java application. Because Tcl Blend is a normal Tcl extension,
+ one can use it with other popular Tcl extensions like Tk, Expect, and Itcl.
-Jacl is a self-contained implementation of a Tcl interpreter, written entirely
-in Java. Jacl also includes features that facilitate communication between a
-Java interpreter and a Tcl interpreter. Jacl is typically used to incorporate
-scripting functionality into an existing Java application. For users who want
-to avoid adding any native code to their Java applications, Jacl is the ideal
-solution.
+ Jacl is a self-contained implementation of a Tcl interpreter, written entirely
+ in Java. Jacl also includes features that facilitate communication between a
+ Java interpreter and a Tcl interpreter. Jacl is typically used to incorporate
+ scripting functionality into an existing Java application. For users who want
+ to avoid adding any native code to their Java applications, Jacl is the ideal
+ solution.
-Tcl Blend and Jacl define both a Tcl API and a Java API that make it easy to
-call Java code from Tcl or call Tcl code from Java. For example, one could
-allocate a Java object in a Tcl script and interactively invoke Java methods
-on the object. It is also easy to use the supplied API to evaluate a Tcl
-procedure from a Java method or implement Tcl procudures in Java. The flexible
-API and wealth of implementation options provided by the Tcl/Java project make
-integrating Tcl and Java easy.
-</longdescription>
+ Tcl Blend and Jacl define both a Tcl API and a Java API that make it easy to
+ call Java code from Tcl or call Tcl code from Java. For example, one could
+ allocate a Java object in a Tcl script and interactively invoke Java methods
+ on the object. It is also easy to use the supplied API to evaluate a Tcl
+ procedure from a Java method or implement Tcl procudures in Java. The flexible
+ API and wealth of implementation options provided by the Tcl/Java project make
+ integrating Tcl and Java easy.
+ </longdescription>
<upstream>
<remote-id type="sourceforge">tcljava</remote-id>
</upstream>
diff --git a/dev-java/jakarta-annotations-api/jakarta-annotations-api-2.1.1.ebuild b/dev-java/jakarta-annotations-api/jakarta-annotations-api-2.1.1.ebuild
index afe6dfd9962b..2d9118c013cd 100644
--- a/dev-java/jakarta-annotations-api/jakarta-annotations-api-2.1.1.ebuild
+++ b/dev-java/jakarta-annotations-api/jakarta-annotations-api-2.1.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/eclipse-ee4j/${PN/jakarta/common}/archive/${PV}.tar.
LICENSE="EPL-2.0 GPL-2-with-classpath-exception"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
DEPEND="
>=virtual/jdk-11:*
diff --git a/dev-java/jakarta-el-api/Manifest b/dev-java/jakarta-el-api/Manifest
new file mode 100644
index 000000000000..0463d0c2a8ea
--- /dev/null
+++ b/dev-java/jakarta-el-api/Manifest
@@ -0,0 +1 @@
+DIST jakarta-el-api-5.0.1.tar.gz 148830 BLAKE2B 408d71576bc2f4de8bae9f54ddd10373d5f6674280a06e89cbda005a34c1574d6602f51a22c221a4aecc8a65848b40aa7e25781b0043cf6426c7b48f364e1136 SHA512 ddbaa201c354f79d99df9b6470eac3bca31207137eae3e5a6ac1b16bcd2ec382239aa64765d485c488ebd925b72b4023c6724bafd726557b9828a3c085982d24
diff --git a/dev-java/jakarta-el-api/jakarta-el-api-5.0.1-r1.ebuild b/dev-java/jakarta-el-api/jakarta-el-api-5.0.1-r1.ebuild
new file mode 100644
index 000000000000..9147cace3d1f
--- /dev/null
+++ b/dev-java/jakarta-el-api/jakarta-el-api-5.0.1-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom api/pom.xml --download-uri https://github.com/jakartaee/expression-language/archive/5.0.1-RELEASE-api.tar.gz --slot 0 --keywords "~amd64" --ebuild jakarta-el-api-5.0.1.ebuild
+
+EAPI=8
+
+# No tests since we don't have junit-jupiter
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="jakarta.el:jakarta.el-api:5.0.1"
+# JAVA_TESTING_FRAMEWORKS="junit-jupiter"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Jakarta Expression Language defines an expression language for Java applications"
+HOMEPAGE="https://projects.eclipse.org/projects/ee4j.el"
+SRC_URI="https://github.com/jakartaee/expression-language/archive/${PV}-RELEASE-api.tar.gz -> ${P}.tar.gz"
+
+LICENSE="EPL-2.0 GPL-2-with-classpath-exception"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
+SLOT="5.0"
+
+DEPEND=">=virtual/jdk-11:*"
+# <release>11</release>
+# https://github.com/jakartaee/expression-language/blob/5.0.1-RELEASE-api/api/pom.xml#L143
+RDEPEND=">=virtual/jre-11:*"
+
+DOCS=( {CONTRIBUTING,NOTICE,README}.md )
+
+S="${WORKDIR}/expression-language-${PV}-RELEASE-api"
+
+JAVA_SRC_DIR="api/src/main/java"
diff --git a/dev-java/jakarta-el-api/metadata.xml b/dev-java/jakarta-el-api/metadata.xml
new file mode 100644
index 000000000000..75321cfb5598
--- /dev/null
+++ b/dev-java/jakarta-el-api/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>java@gentoo.org</email>
+ </maintainer>
+</pkgmetadata>
diff --git a/dev-java/jakarta-interceptors/Manifest b/dev-java/jakarta-interceptors/Manifest
new file mode 100644
index 000000000000..33eaeb20657b
--- /dev/null
+++ b/dev-java/jakarta-interceptors/Manifest
@@ -0,0 +1 @@
+DIST jakarta-interceptors-2.1.0.tar.gz 85830 BLAKE2B 044fa06fa189a7b5dc73c1a33a04939bd895f488acabecae5564cea32419f213e75a3064578ffd462fcbf6de9212178bc389912f15f5ab0f63de729c4b6acc4d SHA512 e3a72bc181101fa550088a1ea7b284d693a4222de97a4a91e0c56d8fe1a3c50da1b56d692da73c5cfc4c36ea3bcbe15d0fa8321c8e521ea7c241a48151125bc6
diff --git a/dev-java/jakarta-interceptors/jakarta-interceptors-2.1.0.ebuild b/dev-java/jakarta-interceptors/jakarta-interceptors-2.1.0.ebuild
new file mode 100644
index 000000000000..894a7f0f3b5f
--- /dev/null
+++ b/dev-java/jakarta-interceptors/jakarta-interceptors-2.1.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom api/pom.xml --download-uri https://github.com/jakartaee/interceptors/archive/2.1.0-RELEASE.tar.gz --slot 0 --keywords "~amd64" --ebuild jakarta-interceptors-2.1.0.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="jakarta.interceptor:jakarta.interceptor-api:2.1.0"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Jakarta Interceptors"
+HOMEPAGE="https://projects.eclipse.org/projects/ee4j.interceptors"
+SRC_URI="https://github.com/jakartaee/interceptors/archive/${PV}-RELEASE.tar.gz -> ${P}.tar.gz"
+
+LICENSE="EPL-2.0 GPL-2-with-classpath-exception"
+SLOT="0"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
+
+DEPEND="
+ dev-java/jakarta-annotations-api:0
+ >=virtual/jdk-11:*
+"
+RDEPEND=">=virtual/jre-1.8:*"
+
+DOCS=( {CONTRIBUTING,NOTICE,README}.md )
+
+S="${WORKDIR}/interceptors-${PV}-RELEASE"
+
+JAVA_CLASSPATH_EXTRA="jakarta-annotations-api"
+JAVA_SRC_DIR="api/src/main/java"
diff --git a/dev-java/jakarta-interceptors/metadata.xml b/dev-java/jakarta-interceptors/metadata.xml
new file mode 100644
index 000000000000..7be8f07ef964
--- /dev/null
+++ b/dev-java/jakarta-interceptors/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>java@gentoo.org</email>
+ </maintainer>
+ <longdescription>
+ Jakarta Interceptors defines a means of interposing on business method invocations and specific events—such as lifecycle events and timeout events—that occur on instances of Jakarta EE components and other managed classes.
+ </longdescription>
+ <upstream>
+ <remote-id type="github">jakartaee/interceptors</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-java/jakarta-json-api/jakarta-json-api-1.1.6.ebuild b/dev-java/jakarta-json-api/jakarta-json-api-1.1.6-r1.ebuild
index d8ca5b27516a..81ff7a0206e8 100644
--- a/dev-java/jakarta-json-api/jakarta-json-api-1.1.6.ebuild
+++ b/dev-java/jakarta-json-api/jakarta-json-api-1.1.6-r1.ebuild
@@ -14,28 +14,18 @@ MY_P="${MY_PN}-${MY_PV}"
DESCRIPTION="JSR 374 (JSON Processing) API"
HOMEPAGE="https://projects.eclipse.org/projects/ee4j.jsonp"
-SRC_URI="https://github.com/eclipse-ee4j/jsonp/archive/refs/tags/${MY_PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/eclipse-ee4j/jsonp/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
LICENSE="|| ( EPL-2.0 GPL-2-with-classpath-exception )"
# Since version 2.0.0, the namespace has changed to jakarta.json
SLOT="1"
KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-DEPEND="
- >=virtual/jdk-1.8:*
-"
-
-RDEPEND="
- >=virtual/jre-1.8:*
-"
+DEPEND=">=virtual/jdk-11:*"
+RDEPEND=">=virtual/jre-1.8:*"
S="${WORKDIR}/${MY_P}"
JAVA_SRC_DIR="api/src/main"
DOCS=( CONTRIBUTING.md NOTICE.md README.md )
-
-src_install() {
- java-pkg-simple_src_install
- einstalldocs # https://bugs.gentoo.org/789582
-}
diff --git a/dev-java/jakarta-mail-api/jakarta-mail-api-2.1.0-r1.ebuild b/dev-java/jakarta-mail-api/jakarta-mail-api-2.1.0-r1.ebuild
index 749424a2617f..987359f4550e 100644
--- a/dev-java/jakarta-mail-api/jakarta-mail-api-2.1.0-r1.ebuild
+++ b/dev-java/jakarta-mail-api/jakarta-mail-api-2.1.0-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/eclipse-ee4j/mail/archive/${PV}.tar.gz -> ${P}.tar.g
LICENSE="EPL-1.0 EPL-2.0 GPL-2-with-classpath-exception"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
# Probably caused by --module-path missing @${test_sources}
diff --git a/dev-java/jakarta-mail-api/jakarta-mail-api-2.1.0.ebuild b/dev-java/jakarta-mail-api/jakarta-mail-api-2.1.0.ebuild
deleted file mode 100644
index 42176c20e111..000000000000
--- a/dev-java/jakarta-mail-api/jakarta-mail-api-2.1.0.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/eclipse-ee4j/mail/archive/2.1.0.tar.gz --slot 0 --keywords "~amd64 ~arm64 ~ppc64 ~x86" --ebuild jakarta-mail-api-2.1.0.ebuild
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="jakarta.mail:jakarta.mail-api:2.1.0"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Jakarta Mail API 2.1 Specification API"
-HOMEPAGE="https://eclipse-ee4j.github.io/mail/"
-SRC_URI="https://github.com/eclipse-ee4j/mail/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="EPL-1.0 EPL-2.0 GPL-2-with-classpath-exception"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-# Probably caused by --module-path missing @${test_sources}
-
-# warning: [options] system modules path not set in conjunction with -source 9
-# src/test/java/module-info.java:24: error: package is empty or does not exist: jakarta.mail.event
-# exports jakarta.mail.event;
-# ^
-# src/test/java/module-info.java:29: error: cannot find symbol
-# uses jakarta.mail.Provider;
-# ^
-# symbol: class Provider
-# location: package jakarta.mail
-# src/test/java/module-info.java:30: error: cannot find symbol
-# uses jakarta.mail.util.StreamProvider;
-# ^
-# symbol: class StreamProvider
-# location: package jakarta.mail.util
-# src/test/java/module-info.java:32: error: cannot find symbol
-# provides jakarta.mail.util.StreamProvider with jakarta.mail.util.DummyStreamProvider;
-# ^
-# symbol: class StreamProvider
-# location: package jakarta.mail.util
-# 4 errors
-RESTRICT="test"
-
-# Common dependencies
-# POM: pom.xml
-# jakarta.activation:jakarta.activation-api:2.1.0 -> >=dev-java/jakarta-activation-api-2.1.0:2.1
-
-CP_DEPEND=">=dev-java/jakarta-activation-api-2.1.0:2"
-
-DEPEND="${CP_DEPEND}
- >=virtual/jdk-11:*
- test? (
- dev-java/angus-activation:0
- )"
-
-RDEPEND="${CP_DEPEND}
- >=virtual/jre-1.8:*"
-
-DOCS=( ../{CONTRIBUTING,NOTICE,README}.md )
-
-S="${WORKDIR}/mail-${PV}/api"
-
-JAVA_SRC_DIR="src/main/"
-
-JAVA_TEST_GENTOO_CLASSPATH="junit-4,angus-activation"
-JAVA_TEST_SRC_DIR="src/test/java"
-JAVA_TEST_RESOURCE_DIRS="src/test/resources"
-
-src_prepare() {
- default
- java-pkg_clean ..
- java-pkg-2_src_prepare
-}
-
-src_install() {
- default # https://bugs.gentoo.org/789582
- java-pkg-simple_src_install
-}
diff --git a/dev-java/jakarta-mail/Manifest b/dev-java/jakarta-mail/Manifest
new file mode 100644
index 000000000000..720158c77d99
--- /dev/null
+++ b/dev-java/jakarta-mail/Manifest
@@ -0,0 +1 @@
+DIST jakarta-mail-2.0.1.tar.gz 1799232 BLAKE2B 91c8109dee5b1dd5d245df44b905435e59c4f7a888711edf19431bd3e7627d5ba4dbc34e3bd8458507c77c5fb6ed50843f45b2e8b01b7369b660055d8c99739d SHA512 42e9f82cda788b4cf73c06c8c2798a3f886fe714e4f8f4cb0356643b05acd756d46ff382333d2a9e4aaa4ed0dd5d01bc354f7e442c78be9f59cca25d4c23a3ec
diff --git a/dev-java/jakarta-mail/jakarta-mail-2.0.1.ebuild b/dev-java/jakarta-mail/jakarta-mail-2.0.1.ebuild
new file mode 100644
index 000000000000..2fcf73b3a66e
--- /dev/null
+++ b/dev-java/jakarta-mail/jakarta-mail-2.0.1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/jakartaee/mail-api/archive/2.0.1.tar.gz --slot 0 --keywords "~amd64" --ebuild jakarta-mail-2.0.1.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="com.sun.mail:jakarta.mail:2.0.1"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Implementation of the Jakarta Mail API"
+HOMEPAGE="https://github.com/jakartaee/mail-api"
+SRC_URI="https://github.com/jakartaee/mail-api/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="EPL-1.0 EPL-2.0 GPL-2-with-classpath-exception"
+SLOT="0"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
+
+# Common dependencies
+# POM: pom.xml
+# com.sun.activation:jakarta.activation:2.0.1 -> >=dev-java/jakarta-activation-2.0.1:2
+
+CP_DEPEND="dev-java/jakarta-activation:2"
+
+DEPEND="
+ >=virtual/jdk-11:*
+ ${CP_DEPEND}
+"
+
+RDEPEND="
+ >=virtual/jre-1.8:*
+ ${CP_DEPEND}
+"
+
+DOCS=( ../{CONTRIBUTING,NOTICE,README}.md )
+
+S="${WORKDIR}/mail-api-${PV}/mail"
+
+JAVA_ENCODING="iso-8859-1"
+
+JAVA_SRC_DIR="src/main/java"
+JAVA_RESOURCE_DIRS="src/main/resources"
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_EXTRA_ARGS=( -ea )
+JAVA_TEST_SRC_DIR="src/test/java"
+JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+
+src_prepare() {
+ default
+ mv src/main/{resources,java}/jakarta/mail/Version.java || die
+}
+
+src_test() {
+ pushd src/test/java || die
+ # Selection according to 137,138 pom.xml
+ # This one does not run because of
+ # "java.io.IOException: Permission denied"
+ # excluding it costs 141 tests.
+ # 1) com.sun.mail.util.logging.MailHandlerTest
+ local JAVA_TEST_RUN_ONLY=$(find * \
+ \( -wholename "**/*TestSuite.java" \
+ -o -wholename "**/*Test.java" \) \
+ ! -name "MailHandlerTest.java" \
+ )
+ JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}"
+ JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}"
+ popd
+
+ java-pkg-simple_src_test
+}
diff --git a/dev-java/jakarta-mail/metadata.xml b/dev-java/jakarta-mail/metadata.xml
new file mode 100644
index 000000000000..53eb0003d9ca
--- /dev/null
+++ b/dev-java/jakarta-mail/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>java@gentoo.org</email>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">jakartaee/mail-api</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-java/jakarta-regexp/Manifest b/dev-java/jakarta-regexp/Manifest
index c997055568c5..5e6c64169679 100644
--- a/dev-java/jakarta-regexp/Manifest
+++ b/dev-java/jakarta-regexp/Manifest
@@ -1,3 +1 @@
-DIST jakarta-regexp-1.3.tar.gz 127069 BLAKE2B c6bb7383459a4cacc3af40ec65d83f7d16ae723585fee06b4c874995455924e000d8bdc0b07615028f81fc7d6ba2927755e11bc9e7a726ffb4adf34be034ce63 SHA512 20e932856a2e761ac2c8b62617a0e661eb9ef309230ea8379cf3582a1a9308b50334bea66405fa47fade9b92a3cf9609c0a3e42cb7db85af4af63acaec553112
DIST jakarta-regexp-1.4.tar.gz 137768 BLAKE2B f6732f6a856736d1394b429453fd8958deb9f3f651f24accf641fee8b5ccc39e9807510135b07452f80fff55423406afc1aed88cef7d80e16ac013a1436b2649 SHA512 209b3f960cd16f05d3fd609b3b6ddb119e056f428b831788caaed6ebcb64c00279b18484845456dd07b8b761a7181f6772dbe9fd578f0401a5d8b1dcf98afc35
-DIST jakarta-regexp-1.5.tar.gz 170142 BLAKE2B f245a3d53eb0be3ed2494269eee956aec7a7459872219f1bb8ecb3e5f544070b0792a690b4a52f70f0e2ba6963842868cfcbf40cdfea0155831f216636d943cf SHA512 428e5971140dd29246ec41e698813d244efc0e871c69d2d83685d8ae3691f0e20ac44aedad3c59f3c356d24384461de83921e40f0cc4d69c95813f02e8aaba82
diff --git a/dev-java/jakarta-regexp/jakarta-regexp-1.3-r6.ebuild b/dev-java/jakarta-regexp/jakarta-regexp-1.3-r6.ebuild
deleted file mode 100644
index 6a45372245ce..000000000000
--- a/dev-java/jakarta-regexp/jakarta-regexp-1.3-r6.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="100% Pure Java Regular Expression package"
-SRC_URI="mirror://apache/jakarta/regexp/source/${P}.tar.gz"
-HOMEPAGE="https://jakarta.apache.org/"
-
-SLOT="${PV}"
-IUSE=""
-LICENSE="Apache-1.1"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-
-RDEPEND="
- >=virtual/jre-1.8:*"
-
-DEPEND="
- >=virtual/jdk-1.8:*"
-
-S="${WORKDIR}/${P}"
-
-JAVA_SRC_DIR="src/java"
-
-src_prepare() {
- default
-
- java-pkg_clean
-}
diff --git a/dev-java/jakarta-regexp/jakarta-regexp-1.5-r1.ebuild b/dev-java/jakarta-regexp/jakarta-regexp-1.5-r1.ebuild
deleted file mode 100644
index 40c79264c7f8..000000000000
--- a/dev-java/jakarta-regexp/jakarta-regexp-1.5-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="100% Pure Java Regular Expression package"
-SRC_URI="mirror://apache/jakarta/regexp/source/${P}.tar.gz"
-HOMEPAGE="https://jakarta.apache.org/"
-
-SLOT="${PV}"
-IUSE=""
-LICENSE="Apache-1.1"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-
-RDEPEND="
- >=virtual/jre-1.8:*"
-
-DEPEND="
- >=virtual/jdk-1.8:*"
-
-S="${WORKDIR}/${P}"
-
-JAVA_SRC_DIR="src/java"
-
-src_prepare() {
- default
- java-pkg_clean
-}
diff --git a/dev-java/jakarta-servlet-api/Manifest b/dev-java/jakarta-servlet-api/Manifest
new file mode 100644
index 000000000000..93a125b9a802
--- /dev/null
+++ b/dev-java/jakarta-servlet-api/Manifest
@@ -0,0 +1,2 @@
+DIST jakarta-servlet-api-4.0.4-RELEASE.tar.gz 188270 BLAKE2B 6c5db208603333abb9aa31726e60d489c5f860e3b6ad61e691d65e8b99909a8139f7677cec52d2a74ed9e8445ea2f0f510875ca32a2e512a09183245a9822889 SHA512 9cd613f8c33f5d415b06f70543eee926c81e87a14d03b837998a6c4db11ce5fb9c2b97f796f2936a63f2a6dc7847d7a97aec7a804b80234cd52e4bfdca9920a9
+DIST jakarta-servlet-api-6.0.0-RELEASE.tar.gz 634690 BLAKE2B e48375f6a0b74950a2c50d73f2d50f7c79db96e22d5c845380bff670948cd1a1d1ea98eaf93e7fa02887e94010c8573382ba3f6fb52a8fca6fa98e5915c307f6 SHA512 65285bce3e8b5143eb33d548549ff5653c6c90f55e7a19e8fdb4a7799842d3430cfe0cebe54f7a7d253d9da4c2b6d4d7a08b35846636c11a2ca814b8311cecc7
diff --git a/dev-java/jakarta-servlet-api/jakarta-servlet-api-4.0.4.ebuild b/dev-java/jakarta-servlet-api/jakarta-servlet-api-4.0.4.ebuild
new file mode 100644
index 000000000000..063b338f3af5
--- /dev/null
+++ b/dev-java/jakarta-servlet-api/jakarta-servlet-api-4.0.4.ebuild
@@ -0,0 +1,35 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="jakarta.servlet:jakarta.servlet-api:4.0.4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Javax servlet API"
+HOMEPAGE="https://projects.eclipse.org/projects/ee4j.servlet"
+SRC_URI="https://github.com/jakartaee/servlet/archive/${PV}-RELEASE.tar.gz -> ${P}-RELEASE.tar.gz"
+
+LICENSE="|| ( GPL-2 GPL-2-with-classpath-exception )"
+SLOT="4"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
+
+RDEPEND=">=virtual/jre-1.8:*"
+DEPEND=">=virtual/jdk-1.8:*"
+
+DOCS=( {CONTRIBUTING,NOTICE,README}.md )
+
+S="${WORKDIR}/servlet-${PV}-RELEASE"
+
+JAVA_AUTOMATIC_MODULE_NAME="java.servlet"
+JAVA_SRC_DIR="api/src/main/java"
+JAVA_RESOURCE_DIRS="api/src/main/res"
+
+src_prepare() {
+ default
+ cp -r api/src/main/{java,res} || die
+ find api/src/main/res -type f -name '*.java' -exec rm -rf {} + || die
+ java-pkg-2_src_prepare
+}
diff --git a/dev-java/jakarta-servlet-api/jakarta-servlet-api-6.0.0.ebuild b/dev-java/jakarta-servlet-api/jakarta-servlet-api-6.0.0.ebuild
new file mode 100644
index 000000000000..7fbf152908ae
--- /dev/null
+++ b/dev-java/jakarta-servlet-api/jakarta-servlet-api-6.0.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/jakartaee/servlet/archive/6.0.0-RELEASE.tar.gz --slot 6 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild jakarta-servlet-api-6.0.0.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="jakarta.servlet:jakarta.servlet-api:6.0.0"
+# No tests because of still missing junit-jupiter
+# JAVA_TESTING_FRAMEWORKS="junit-jupiter"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Javax servlet API"
+HOMEPAGE="https://projects.eclipse.org/projects/ee4j.servlet"
+SRC_URI="https://github.com/jakartaee/servlet/archive/${PV}-RELEASE.tar.gz -> ${P}-RELEASE.tar.gz"
+
+LICENSE="EPL-2.0 GPL-2-with-classpath-exception"
+SLOT="6"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
+
+RDEPEND=">=virtual/jre-1.8:*"
+DEPEND=">=virtual/jdk-11:*"
+
+DOCS=( {CONTRIBUTING,NOTICE,README}.md )
+
+S="${WORKDIR}/servlet-${PV}-RELEASE"
+
+JAVA_SRC_DIR="api/src/main/java"
+JAVA_RESOURCE_DIRS=( api/src/main/{resources,properties} )
+
+src_prepare() {
+ default
+ cp -r api/src/main/{java,properties} || die
+ find api/src/main/properties -type f ! -name '*.properties' -exec rm -rf {} + || die
+ java-pkg-2_src_prepare
+}
diff --git a/dev-java/jakarta-servlet-api/metadata.xml b/dev-java/jakarta-servlet-api/metadata.xml
new file mode 100644
index 000000000000..77e11a268a0a
--- /dev/null
+++ b/dev-java/jakarta-servlet-api/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>java@gentoo.org</email>
+ </maintainer>
+ <slots>
+ <slot name="4">provides javax.servlet</slot>
+ <slot name="6">provides jakarta.servlet</slot>
+ </slots>
+</pkgmetadata>
diff --git a/dev-java/jakartaee-migration/Manifest b/dev-java/jakartaee-migration/Manifest
index 25ddd4ffdac2..7251be753cd4 100644
--- a/dev-java/jakartaee-migration/Manifest
+++ b/dev-java/jakartaee-migration/Manifest
@@ -1 +1,2 @@
-DIST jakartaee-migration-1.0.1-sources.tar.gz 35763 BLAKE2B 9e739668a7ebd65396960cd2447ecf2bc114cb85a2c554a17cb8478bef13f70f2fed26cc96553a22e7279dde698e1c094ca4dc7a8695ff9f82903ebe8badbd69 SHA512 6caaadfe5dcb21a859f2e401c039832b2774d8876ac724c3159b28c80a1153f7cd1c6706ba29a38d5f748cd2e55a85bd9bfecfb3a405f86aa85637ff3ca3c5f7
+DIST jakartaee-migration-1.0.4-sources.tar.gz 38400 BLAKE2B c0c0151adfde56632ad95919a88eedd6a44056e2d29320e63e0dc64c59cf7ba928135f817ddb3c79a96dd7a8418ab92c8fe4aa9f50a51442bb55384349de603f SHA512 a9d49463f44affa1c5f57d9342e7b4dc77a829c904ba2376f87f086c3662f01e05a2b1cfe2dc746e33605a66849f12415ebb2b63eb05c5e476a4eab9ffd39644
+DIST jakartaee-migration-1.0.6-sources.tar.gz 42167 BLAKE2B 9252078f3b31e07dab533ca9d1d32812f49571adf942a3f11bf074d2110b5fb0c2500dae244b10597f0d76c18bb153cd577528cb01ff01350abb46d32251293a SHA512 81ecfe561695e4e5cacaed0ef89e5759e357b332f2798ac6f3d89c43c9a5dfed1a684745b7fe3afe6d1e82ac9405fd2de68da599a53bfe5f67397b452753b572
diff --git a/dev-java/jakartaee-migration/jakartaee-migration-1.0.1.ebuild b/dev-java/jakartaee-migration/jakartaee-migration-1.0.4.ebuild
index 2f557abf9a8c..92c0218f4b3b 100644
--- a/dev-java/jakartaee-migration/jakartaee-migration-1.0.1.ebuild
+++ b/dev-java/jakartaee-migration/jakartaee-migration-1.0.4.ebuild
@@ -2,12 +2,12 @@
# Distributed under the terms of the GNU General Public License v2
# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://ftp.fau.de/apache/tomcat/jakartaee-migration/v1.0.1/source/jakartaee-migration-1.0.1-src.tar.gz --slot 0 --keywords "~amd64" --ebuild jakartaee-migration-1.0.1.ebuild
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://ftp.fau.de/apache/tomcat/jakartaee-migration/v1.0.4/source/jakartaee-migration-1.0.4-src.tar.gz --slot 0 --keywords "~amd64" --ebuild jakartaee-migration-1.0.4.ebuild
EAPI=8
JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.apache.tomcat:jakartaee-migration:1.0.1"
+MAVEN_ID="org.apache.tomcat:jakartaee-migration:1.0.4"
JAVA_TESTING_FRAMEWORKS="junit-4"
inherit java-pkg-2 java-pkg-simple
@@ -21,22 +21,22 @@ KEYWORDS="amd64"
# Common dependencies
# POM: pom.xml
-# commons-io:commons-io:2.8.0 -> >=dev-java/commons-io-2.8.0:1
+# commons-io:commons-io:2.11.0 -> >=dev-java/commons-io-2.11.0:1
# org.apache.bcel:bcel:6.5.0 -> >=dev-java/bcel-6.5.0:0
-# org.apache.commons:commons-compress:1.20 -> >=dev-java/commons-compress-1.20:0
+# org.apache.commons:commons-compress:1.21 -> >=dev-java/commons-compress-1.21:0
CDEPEND="
dev-java/ant-core:0
- dev-java/bcel:0
- >=dev-java/commons-compress-1.20:0
- dev-java/commons-io:1
+ >=dev-java/bcel-6.5.0:0
+ >=dev-java/commons-compress-1.21:0
+ >=dev-java/commons-io-2.11.0:1
"
# Compile dependencies
# POM: pom.xml
-# org.apache.ant:ant:1.10.9 -> !!!groupId-not-found!!!
+# org.apache.ant:ant:1.10.12 -> !!!suitable-mavenVersion-not-found!!!
# POM: pom.xml
-# test? junit:junit:4.13.1 -> >=dev-java/junit-4.13.1:4
+# test? junit:junit:4.13.2 -> >=dev-java/junit-4.13.2:4
DEPEND="
>=virtual/jdk-1.8:*
diff --git a/dev-java/jakartaee-migration/jakartaee-migration-1.0.6.ebuild b/dev-java/jakartaee-migration/jakartaee-migration-1.0.6.ebuild
new file mode 100644
index 000000000000..1c9731c85b44
--- /dev/null
+++ b/dev-java/jakartaee-migration/jakartaee-migration-1.0.6.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://ftp.fau.de/apache/tomcat/jakartaee-migration/v1.0.5/source/jakartaee-migration-1.0.5-src.tar.gz --slot 0 --keywords "~amd64" --ebuild jakartaee-migration-1.0.5.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.apache.tomcat:jakartaee-migration:1.0.6"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Apache Tomcat tool for migration from Java EE 8 to Jakarta EE 9"
+HOMEPAGE="https://tomcat.apache.org"
+SRC_URI="mirror://apache/tomcat/${PN}/v${PV}/source/${P}-src.tar.gz -> ${P}-sources.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+# Common dependencies
+# POM: pom.xml
+# commons-io:commons-io:2.11.0 -> >=dev-java/commons-io-2.11.0:1
+# org.apache.bcel:bcel:6.6.0 -> >=dev-java/bcel-6.6.0:0
+# org.apache.commons:commons-compress:1.22 -> !!!suitable-mavenVersion-not-found!!!
+
+CDEPEND="
+ dev-java/ant-core:0
+ >=dev-java/bcel-6.6.0:0
+ >=dev-java/commons-compress-1.21:0
+ >=dev-java/commons-io-2.11.0:1
+"
+
+# Compile dependencies
+# POM: pom.xml
+# org.apache.ant:ant:1.10.12 -> !!!suitable-mavenVersion-not-found!!!
+# POM: pom.xml
+# test? junit:junit:4.13.2 -> >=dev-java/junit-4.13.2:4
+
+DEPEND="
+ >=virtual/jdk-1.8:*
+ ${CDEPEND}
+"
+
+RDEPEND="
+ >=virtual/jre-1.8:*
+ ${CDEPEND}"
+
+S="${WORKDIR}/${P}"
+
+JAVA_LAUNCHER_FILENAME="${PN}"
+
+JAVA_GENTOO_CLASSPATH="ant-core,bcel,commons-compress,commons-io-1"
+JAVA_SRC_DIR="src/main/java"
+JAVA_MAIN_CLASS="org.apache.tomcat.jakartaee.MigrationCLI"
+JAVA_RESOURCE_DIRS=(
+ "src/main/resources"
+)
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_SRC_DIR="src/test/java"
+JAVA_TEST_RESOURCE_DIRS=(
+ "src/test/resources"
+)
+JAVA_TEST_EXCLUDES=(
+ "org.apache.tomcat.jakartaee.TesterConstants"
+)
+
+src_prepare() {
+ default
+ sed -i "s/\${project.version}/${PV}/g" src/main/resources/info.properties
+}
+
+src_test() {
+ # we need to create jar files for the tests the same way as it's done using pom.xml
+ local implementation_version=$(grep Implementation-Version pom.xml | grep -oE "[0-9]+\.[0-9]+\.[0-9]+")
+ mkdir -p target/test-classes/META-INF || die
+ pushd target/test-classes || die
+ echo "Implementation-Version: ${implementation_version}" > META-INF/MANIFEST.MF
+ ejavac -d . -encoding ${JAVA_ENCODING} $(find "${S}/${JAVA_TEST_SRC_DIR}" -name CommonGatewayInterface.java) || die
+ jar cfm cgi-api.jar META-INF/MANIFEST.MF $(find -name CommonGatewayInterface.class) || die
+ ejavac -d . -encoding ${JAVA_ENCODING} $(find "${S}/${JAVA_TEST_SRC_DIR}" -name HelloCGI.java) || die
+ jar cfm hellocgi.jar META-INF/MANIFEST.MF $(find -name HelloCGI.class) || die
+ for enc in rsa dsa ec; do
+ cp hellocgi.jar hellocgi-signed-${enc}.jar || die
+ jarsigner -keystore "${S}/src/test/resources/keystore.p12" -storepass apache hellocgi-signed-${enc}.jar ${enc} || die
+ done
+ popd
+
+ java-pkg-simple_src_test
+}
diff --git a/dev-java/janino/janino-3.1.7.ebuild b/dev-java/janino/janino-3.1.7.ebuild
index 46f3e8c96ec4..b0fbd7ad85b3 100644
--- a/dev-java/janino/janino-3.1.7.ebuild
+++ b/dev-java/janino/janino-3.1.7.ebuild
@@ -14,7 +14,7 @@ inherit java-pkg-2 java-pkg-simple
DESCRIPTION="An embedded compiler for run-time compilation purposes"
HOMEPAGE="https://janino-compiler.github.io/janino/"
-SRC_URI="https://github.com/janino-compiler/janino/archive/v3.1.7.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/janino-compiler/janino/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
diff --git a/dev-java/jansi/jansi-2.4.0-r1.ebuild b/dev-java/jansi/jansi-2.4.0-r1.ebuild
index 7974adb4db91..94f5bb697e72 100644
--- a/dev-java/jansi/jansi-2.4.0-r1.ebuild
+++ b/dev-java/jansi/jansi-2.4.0-r1.ebuild
@@ -71,7 +71,7 @@ src_compile() {
src_install() {
# default # https://bugs.gentoo.org/789582
- # deafult fails with
+ # default fails with
# make: *** No rule to make target 'install'. Stop.
java-pkg_doso target/native--/libjansi-$(ver_cut 1-2).so
java-pkg-simple_src_install
diff --git a/dev-java/javassist/Manifest b/dev-java/javassist/Manifest
index a3c89e947805..c9f70c72fe7c 100644
--- a/dev-java/javassist/Manifest
+++ b/dev-java/javassist/Manifest
@@ -1,2 +1,2 @@
-DIST javassist-3.18.2.tar.gz 1179428 BLAKE2B cc7dfebca2e47576f902e6249c1efb65c18823e75ba3698c2d94541bdc910b9b7547e8619c1f19a84c158771230ddd112ddb0445ed97cd64810beacf3468a1ba SHA512 67f22a70584eba31088d63b7862f0f7872a6a7ec57f4397b95044695af75be005e86aa5a5f20fe8e650c2178a9b63b4b922accf940b46ceb1c8e7ce9c51798ca
-DIST javassist-3.29.0.tar.gz 1290728 BLAKE2B 21543fe4d81cc46fa8d6530e8b5b821df64af31404831d15255fe7d362fe40de39451f4e6a264986ce7b8fdb16116c3266a522caf24a2df6a91cc7203354e070 SHA512 9487d4b6e1d7981360f768f2ebe7e8313c103752cc458eb454fffcf6714f62952cc772e920ee663e89cd51cd6a2669993f5595e682ec74313799eff32144541c
+DIST javassist-3.29.1.tar.gz 1291658 BLAKE2B 4064401ad01c1e1c9aa4a219a81f0fc2e67b1d4cb85cb98b4a996dd2bf789ee1feb790e5bb332205ef2fafe1c7ac0ea82e5e25afff4d9960c54dfe2cb895d0fd SHA512 5788a4a50b803b2a4520340ceae9fd47466d2004cce4138fd861b57fd760109c61c375a28bd907bb9dfeb56bd44734f003ddd1b550571f101a7d1bc04096b5f8
+DIST javassist-3.29.2.tar.gz 1293705 BLAKE2B 23101970a3fe9e4428b9e2e55ec2973663b537b2e205db55952bce116eb0cdd327e156f9bebf16a3c4322d8e5002d612067b14e8d234e87524361b5f08c9ecde SHA512 651f48d9138b54d4816611c077614bbb15f8189d755c2c2c7e5c2dfb35ad8f48cd9d2e0532edbd565456a923b3166eaecdde8702d65c70a32eb21c2d42f67bfc
diff --git a/dev-java/javassist/javassist-3.18.2-r1.ebuild b/dev-java/javassist/javassist-3.18.2-r1.ebuild
deleted file mode 100644
index 239e1b7b9ccc..000000000000
--- a/dev-java/javassist/javassist-3.18.2-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_ANT_REWRITE_CLASSPATH=y
-JAVA_PKG_IUSE="doc source examples"
-
-EANT_DOC_TARGET="javadocs"
-EANT_NEEDS_TOOLS="yes"
-
-MAVEN_ID="javassist:javassist:3.18.2"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Javassist makes Java bytecode manipulation simple"
-HOMEPAGE="http://www.csg.is.titech.ac.jp/~chiba/javassist/"
-SRC_URI="https://github.com/jboss-javassist/javassist/archive/rel_${PV//./_}_ga_build.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-rel_${PV//./_}_ga_build"
-
-LICENSE="MPL-1.1"
-SLOT="3"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux"
-
-RDEPEND=">=virtual/jre-1.8:*"
-DEPEND=">=virtual/jdk-1.8:*"
-BDEPEND="app-arch/unzip"
-
-src_prepare() {
- default
-
- find -name "*.jar" -delete || die
-}
-
-src_install() {
- java-pkg_dojar ${PN}.jar
-
- use doc && java-pkg_dojavadoc html
- use source && java-pkg_dosrc src/main/javassist
- use examples && java-pkg_doexamples sample/*
-
- docinto html
- dodoc Readme.html
-}
diff --git a/dev-java/javassist/javassist-3.29.0-r2.ebuild b/dev-java/javassist/javassist-3.29.1.ebuild
index dd078cbb9c34..30332016b6d5 100644
--- a/dev-java/javassist/javassist-3.29.0-r2.ebuild
+++ b/dev-java/javassist/javassist-3.29.1.ebuild
@@ -2,12 +2,12 @@
# Distributed under the terms of the GNU General Public License v2
# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/jboss-javassist/javassist/archive/rel_3_29_0_ga.tar.gz --slot 3 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild javassist-3.29.0.ebuild
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/jboss-javassist/javassist/archive/rel_3_29_1_ga.tar.gz --slot 3 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild javassist-3.29.1.ebuild
EAPI=8
JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.javassist:javassist:3.29.0-GA"
+MAVEN_ID="org.javassist:javassist:3.29.1-GA"
JAVA_TESTING_FRAMEWORKS="junit-4"
inherit java-pkg-2 java-pkg-simple
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/jboss-javassist/javassist/archive/rel_${PV//./_}_ga.
LICENSE="Apache-2.0 LGPL-2.1 MPL-1.1"
SLOT="3"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux"
# Tests run: 431, Failures: 6
# Cannot solve those test failures. Using "mvn test" they all pass.
@@ -35,11 +35,15 @@ DEPEND=">=virtual/jdk-11:*
RDEPEND=">=virtual/jre-1.8:*"
+DOCS=( Changes.md README.md )
+HTML_DOCS=( tutorial/{brown.css,tutorial.html,tutorial2.html,tutorial3.html} )
+
S="${WORKDIR}/${PN}-rel_${PV//./_}_ga"
+JAVA_AUTOMATIC_MODULE_NAME="org.javassist"
+JAVA_MAIN_CLASS="javassist.CtClass"
JAVA_NEEDS_TOOLS=1
JAVA_SRC_DIR="src/main"
-JAVA_MAIN_CLASS="javassist.CtClass"
JAVA_TEST_GENTOO_CLASSPATH="hamcrest-library-1.3,junit-4"
JAVA_TEST_SRC_DIR="src/test"
diff --git a/dev-java/javassist/javassist-3.29.2.ebuild b/dev-java/javassist/javassist-3.29.2.ebuild
new file mode 100644
index 000000000000..5c7d808762a4
--- /dev/null
+++ b/dev-java/javassist/javassist-3.29.2.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/jboss-javassist/javassist/archive/rel_3_29_2_ga.tar.gz --slot 3 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild javassist-3.29.2.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.javassist:javassist:3.29.2-GA"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="A class library for editing bytecodes in Java."
+HOMEPAGE="https://www.javassist.org"
+SRC_URI="https://github.com/jboss-javassist/javassist/archive/rel_${PV//./_}_ga.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0 LGPL-2.1 MPL-1.1"
+SLOT="3"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+
+# Compile dependencies
+# POM: pom.xml
+# test? junit:junit:[4.13.1,) -> >=dev-java/junit-4.13.2:4
+# test? org.hamcrest:hamcrest-all:1.3 -> !!!artifactId-not-found!!!
+
+DEPEND=">=virtual/jdk-11:*
+ test? ( dev-java/hamcrest-library:1.3 )"
+
+RDEPEND=">=virtual/jre-1.8:*"
+
+DOCS=( Changes.md README.md )
+HTML_DOCS=( tutorial/{brown.css,tutorial.html,tutorial2.html,tutorial3.html} )
+
+S="${WORKDIR}/${PN}-rel_${PV//./_}_ga"
+
+JAVA_AUTOMATIC_MODULE_NAME="org.javassist"
+JAVA_MAIN_CLASS="javassist.CtClass"
+JAVA_NEEDS_TOOLS=1
+JAVA_SRC_DIR="src/main"
+
+JAVA_TEST_GENTOO_CLASSPATH="hamcrest-library-1.3,junit-4"
+JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+JAVA_TEST_RUN_ONLY="javassist.JvstTest" # pom.xml, line 167
+JAVA_TEST_SRC_DIR="src/test"
+
+src_prepare() {
+ default
+ java-pkg_clean javassist.jar
+ sed -e 's:\.\./\.\./::' -i src/test/javassist/JvstTest{4,Root}.java || die
+
+ # Tests run: 432, Failures: 6
+ # https://bugs.gentoo.org/856364
+ # Cannot solve those test failures.
+ # replacing test... with notTest... for those tests
+ sed \
+ -e '/public void/s:testInsertAt:notTestInsertAt:' \
+ -e '/public void/s:testInsertLocal:notTestInsertLocal:' \
+ -e '/public void/s:testNewArray:notTestNewArray:' \
+ -e '/public void/s:testURL:notTestURL:' \
+ -i src/test/javassist/JvstTest2.java || die
+
+ sed \
+ -e '/public void/s:testMethodParameters:notTestMethodParameters:' \
+ -i src/test/javassist/JvstTest4.java || die
+
+ sed \
+ -e '/public void/s:testLocalVarAttribute:notTestLocalVarAttribute:' \
+ -i src/test/javassist/bytecode/BytecodeTest.java || die
+}
+
+src_test() {
+ default
+ einfo "Testing"
+ JAVA_PKG_WANT_SOURCE=11
+ JAVA_PKG_WANT_TARGET=11
+ java-pkg-simple_src_test
+}
diff --git a/dev-java/jaxb-runtime/jaxb-runtime-4.0.0-r1.ebuild b/dev-java/jaxb-runtime/jaxb-runtime-4.0.0-r1.ebuild
index 586a6dc6e5e1..f5011e99962c 100644
--- a/dev-java/jaxb-runtime/jaxb-runtime-4.0.0-r1.ebuild
+++ b/dev-java/jaxb-runtime/jaxb-runtime-4.0.0-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/eclipse-ee4j/jaxb-ri/archive/${PV}-RI.tar.gz -> jaxb
LICENSE="EPL-1.0"
SLOT="4"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
DEPEND="
>=dev-java/fastinfoset-2.1.0-r1:0
diff --git a/dev-java/jaxb-stax-ex/jaxb-stax-ex-2.1.0-r1.ebuild b/dev-java/jaxb-stax-ex/jaxb-stax-ex-2.1.0-r1.ebuild
index e7cfb9f464e5..d5300cd9e6ee 100644
--- a/dev-java/jaxb-stax-ex/jaxb-stax-ex-2.1.0-r1.ebuild
+++ b/dev-java/jaxb-stax-ex/jaxb-stax-ex-2.1.0-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/eclipse-ee4j/${PN}/archive/${PV}.tar.gz -> ${P}.tar.
LICENSE="EPL-1.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
DEPEND="
dev-java/jakarta-activation-api:2
diff --git a/dev-java/jaxrs-api/Manifest b/dev-java/jaxrs-api/Manifest
new file mode 100644
index 000000000000..5a9949619d25
--- /dev/null
+++ b/dev-java/jaxrs-api/Manifest
@@ -0,0 +1 @@
+DIST jaxrs-api-2.1.6.tar.gz 225315 BLAKE2B bf4f12eadbee605e1141c72ee2a51c64548f3bed2846d1605758bcd994633b1a8f23b2054e0b71503583096a7234f42d12a389b9da031fa8b8c6b313cad84d98 SHA512 b5032ea9905e31b4120761125999a50e6d30229e7174e4a5e087f263030b25c157384a6d31796a90c590fda413e0e66220ec77c809a22fac8827ffa971c4aae7
diff --git a/dev-java/jaxrs-api/jaxrs-api-2.1.6.ebuild b/dev-java/jaxrs-api/jaxrs-api-2.1.6.ebuild
new file mode 100644
index 000000000000..3390c60bee70
--- /dev/null
+++ b/dev-java/jaxrs-api/jaxrs-api-2.1.6.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom jaxrs-api/pom.xml --download-uri https://github.com/jakartaee/rest/archive/2.1.6.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild jaxrs-api-2.1.6.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="jakarta.ws.rs:jakarta.ws.rs-api:2.1.6"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Jakarta RESTful Web Services API"
+HOMEPAGE="https://github.com/jakartaee/rest"
+SRC_URI="https://github.com/jakartaee/rest/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="EPL-2.0 GPL-2-with-classpath-exception"
+SLOT="0"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
+
+# Compile dependencies
+# POM: ${PN}/pom.xml
+# jakarta.activation:jakarta.activation-api:1.2.1 -> >=dev-java/jakarta-activation-api-1.2.2:1
+# jakarta.xml.bind:jakarta.xml.bind-api:2.3.2 -> >=dev-java/jaxb-api-2.3.3:2
+# POM: ${PN}/pom.xml
+# test? junit:junit:4.11 -> >=dev-java/junit-4.13.2:4
+# test? org.glassfish.jaxb:jaxb-runtime:2.3.2 -> !!!groupId-not-found!!!
+# test? org.mockito:mockito-core:2.22.0 -> >=dev-java/mockito-4.4.0:4
+
+DEPEND="
+ >=virtual/jdk-11:*
+ dev-java/jakarta-activation-api:1
+ dev-java/jaxb-api:2
+ test? (
+ dev-java/jaxb-runtime:4
+ dev-java/mockito:4
+ )
+"
+
+RDEPEND=">=virtual/jre-1.8:*"
+
+DOCS=( ../{CONTRIBUTING,NOTICE,README}.md )
+
+S="${WORKDIR}/rest-${PV}/${PN}"
+
+JAVA_CLASSPATH_EXTRA="jakarta-activation-api-1,jaxb-api-2"
+JAVA_SRC_DIR="src/main/java"
+
+JAVA_TEST_GENTOO_CLASSPATH="jaxb-runtime-4,junit-4,mockito-4"
+JAVA_TEST_SRC_DIR="src/test/java"
+
+# "mvn test" -> Tests run: 34, Failures: 0, Errors: 0, Skipped: 3
+# 1) testSerializationOfJaxbLink(javax.ws.rs.core.JaxbLinkTest)
+# javax.xml.bind.JAXBException: Implementation of JAXB-API has not been found on module path or classpath.
+JAVA_TEST_EXCLUDES=(
+ javax.ws.rs.core.JaxbLinkTest
+)
diff --git a/dev-java/jaxrs-api/metadata.xml b/dev-java/jaxrs-api/metadata.xml
new file mode 100644
index 000000000000..75321cfb5598
--- /dev/null
+++ b/dev-java/jaxrs-api/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>java@gentoo.org</email>
+ </maintainer>
+</pkgmetadata>
diff --git a/dev-java/jaxws-api/Manifest b/dev-java/jaxws-api/Manifest
new file mode 100644
index 000000000000..74bc51487301
--- /dev/null
+++ b/dev-java/jaxws-api/Manifest
@@ -0,0 +1 @@
+DIST jaxws-api-2.3.3.tar.gz 173806 BLAKE2B 416294f78f4fdb00e8ac6a285b0820d5e7c5938b700d9efffdbac76dd37c4940bb6f4a88a1bce9f3da8ef156e56ea1f858bcba041763f0397c5f7a8b08297b2a SHA512 7663dd7a9169dbe9b7d869e318add1b3a41ea5246500afb4f1d1374f4b89a71de6a68af413b8037374c4e6fb4fa4acb8524d197eebdef6bceeee8339818905b7
diff --git a/dev-java/jaxws-api/jaxws-api-2.3.3.ebuild b/dev-java/jaxws-api/jaxws-api-2.3.3.ebuild
new file mode 100644
index 000000000000..f9b7430e6ad9
--- /dev/null
+++ b/dev-java/jaxws-api/jaxws-api-2.3.3.ebuild
@@ -0,0 +1,35 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="jakarta.xml.ws:jakarta.xml.ws-api:2.3.3"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="JAX-WS (JSR 224) API (Eclipse Project for JAX-WS)"
+HOMEPAGE="https://github.com/eclipse-ee4j/jax-ws-api"
+SRC_URI="https://github.com/eclipse-ee4j/jax-ws-api/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD" # "BSD-3 Clause"
+SLOT="0"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
+
+RDEPEND=">=virtual/jre-1.8:*"
+DEPEND="
+ dev-java/jakarta-xml-soap-api:1
+ dev-java/jaxb-api:2
+ >=virtual/jdk-11:*
+"
+
+DOCS=( ../{CONTRIBUTING,NOTICE,README}.md )
+
+S="${WORKDIR}/jax-ws-api-${PV}/api"
+
+JAVA_CLASSPATH_EXTRA="
+ jakarta-xml-soap-api-1
+ jaxb-api-2
+"
+JAVA_SRC_DIR="src/main/java"
+JAVA_RESOURCE_DIRS="src/main/resources"
diff --git a/dev-java/jaxws-api/metadata.xml b/dev-java/jaxws-api/metadata.xml
new file mode 100644
index 000000000000..d36027249291
--- /dev/null
+++ b/dev-java/jaxws-api/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>java@gentoo.org</email>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">eclipse-ee4j/jax-ws-api</remote-id>
+ </upstream>
+ <slots>
+ <slot name="0">provides javax.xml.ws</slot>
+ </slots>
+</pkgmetadata>
diff --git a/dev-java/jdbc-postgresql/Manifest b/dev-java/jdbc-postgresql/Manifest
index 7fe34114a6a3..3da68de820d0 100644
--- a/dev-java/jdbc-postgresql/Manifest
+++ b/dev-java/jdbc-postgresql/Manifest
@@ -1,2 +1 @@
-DIST postgresql-jdbc-42.4.0.src.tar.gz 966868 BLAKE2B 0a8bffcfbba4ddedcbd77717b6bca2f4e7cd9fe4597c6edb5a2ac8fbea788c692377ae713723aa7342895f857aff7eca0825eedd36cff69f3760b11cbb7b666c SHA512 816967923f54d5c2ad856e3ae2612987fa52234acc6b487f492d56614ac241d9542abd40a1f868ad6d895a45de28f7a0d586f8486dc719600238bcc3ef40819a
-DIST postgresql-jdbc-42.4.1.src.tar.gz 969554 BLAKE2B 76035b2362c304d6263b9549b2ecbedc6e1cfedeba9c2c35f07d29dada39e5bce93e939abb8cb2232a428b0341c5cd5e6ae22de6106292c4d28243e3e0e6fc00 SHA512 a49c5b68a26ba6fd1b150c45da2ec58ea4435b7c36b8aa9bf6c3d33b6a265dabe7da51705e9d7234a640c8f6ccb5c3abb639db2d7bc38e6f4e26550b05b4a844
+DIST postgresql-jdbc-42.5.0.src.tar.gz 971368 BLAKE2B 961ba5af17f27792f44b715e8a248950926f1e7a384c3bb7ef4d9f919c84833129d45bcaeaded17d8d8cb3733b3f70cde76c126c501c7c1c1ed8a356c2e2f78d SHA512 432347622d6a1034048cb2dc18e7c5fdb1e843a27db505c8ea0381fee700480682222f4b8a285d8d774a0732398cc6254692c8f130c1814a464966b9dba72f64
diff --git a/dev-java/jdbc-postgresql/jdbc-postgresql-42.4.0.ebuild b/dev-java/jdbc-postgresql/jdbc-postgresql-42.4.0.ebuild
deleted file mode 100644
index 37557d8f291b..000000000000
--- a/dev-java/jdbc-postgresql/jdbc-postgresql-42.4.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://jdbc.postgresql.org/download/postgresql-jdbc-42.4.0.src.tar.gz --slot 0 --keywords "~amd64 ~ppc64 ~x86" --ebuild jdbc-postgresql-42.4.0.ebuild
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source"
-MAVEN_ID="org.postgresql:postgresql:42.4.0"
-# We don't have junit-vintage and junit-jupiter.
-# JAVA_TESTING_FRAMEWORKS="junit-vintage junit-jupiter junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Java JDBC 4.2 (JRE 8+) driver for PostgreSQL database"
-HOMEPAGE="https://github.com/pgjdbc/pgjdbc"
-SRC_URI="https://jdbc.postgresql.org/download/postgresql-jdbc-${PV}.src.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
-
-# Common dependencies
-# POM: pom.xml
-# com.ongres.scram:client:2.1 -> !!!groupId-not-found!!!
-# uk.org.webcompere:system-stubs-jupiter:1.2.0 -> !!!groupId-not-found!!!
-
-CP_DEPEND="dev-java/scram:0"
-
-# Compile dependencies
-# POM: pom.xml
-# test? junit:junit:4.13 -> >=dev-java/junit-4.13.2:4
-# test? org.junit.jupiter:junit-jupiter-api:5.6.0 -> !!!groupId-not-found!!!
-# test? org.junit.jupiter:junit-jupiter-engine:5.6.0 -> !!!groupId-not-found!!!
-# test? org.junit.jupiter:junit-jupiter-params:5.6.0 -> !!!groupId-not-found!!!
-# test? org.junit.vintage:junit-vintage-engine:5.6.0 -> !!!groupId-not-found!!!
-# test? se.jiderhamn:classloader-leak-test-framework:1.1.1 -> !!!groupId-not-found!!!
-
-DEPEND="
- >=virtual/jdk-1.8:*
- ${CP_DEPEND}"
-# test? (
-# !!!groupId-not-found!!!
-# )
-# "
-
-RDEPEND="
- >=virtual/jre-1.8:*
- ${CP_DEPEND}"
-
-S="${WORKDIR}/postgresql-${PV}-jdbc-src"
-
-JAVA_SRC_DIR="src/main/java"
-JAVA_RESOURCE_DIRS="src/main/resources"
-
-# JAVA_TEST_GENTOO_CLASSPATH="junit-4,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!"
-# JAVA_TEST_SRC_DIR="src/test/java"
-# JAVA_TEST_RESOURCE_DIRS="src/test/resources"
diff --git a/dev-java/jdbc-postgresql/jdbc-postgresql-42.4.1.ebuild b/dev-java/jdbc-postgresql/jdbc-postgresql-42.5.0.ebuild
index 4a3943552b65..85640e4c4afe 100644
--- a/dev-java/jdbc-postgresql/jdbc-postgresql-42.4.1.ebuild
+++ b/dev-java/jdbc-postgresql/jdbc-postgresql-42.5.0.ebuild
@@ -2,12 +2,12 @@
# Distributed under the terms of the GNU General Public License v2
# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://jdbc.postgresql.org/download/postgresql-jdbc-42.4.1.src.tar.gz --slot 0 --keywords "~amd64 ~ppc64 ~x86" --ebuild jdbc-postgresql-42.4.1.ebuild
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://jdbc.postgresql.org/download/postgresql-jdbc-42.5.0.src.tar.gz --slot 0 --keywords "~amd64 ~ppc64 ~x86" --ebuild jdbc-postgresql-42.5.0.ebuild
EAPI=8
JAVA_PKG_IUSE="doc source"
-MAVEN_ID="org.postgresql:postgresql:42.4.1"
+MAVEN_ID="org.postgresql:postgresql:42.5.0"
# We don't have junit-vintage and junit-jupiter.
# JAVA_TESTING_FRAMEWORKS="junit-vintage junit-jupiter junit-4"
@@ -19,31 +19,27 @@ SRC_URI="https://jdbc.postgresql.org/download/postgresql-jdbc-${PV}.src.tar.gz"
LICENSE="BSD-2"
SLOT="0"
-KEYWORDS="amd64 ppc64 ~x86"
+KEYWORDS="amd64 ppc64 x86"
# Common dependencies
# POM: pom.xml
-# com.ongres.scram:client:2.1 -> !!!groupId-not-found!!!
-# uk.org.webcompere:system-stubs-jupiter:1.2.0 -> !!!groupId-not-found!!!
+# com.ongres.scram:client:2.1 -> >=dev-java/scram-2.1:0
+# uk.org.webcompere:system-stubs-jupiter:2.0.1 -> !!!groupId-not-found!!!
CP_DEPEND="dev-java/scram:0"
# Compile dependencies
# POM: pom.xml
# test? junit:junit:4.13 -> >=dev-java/junit-4.13.2:4
-# test? org.junit.jupiter:junit-jupiter-api:5.6.0 -> !!!groupId-not-found!!!
-# test? org.junit.jupiter:junit-jupiter-engine:5.6.0 -> !!!groupId-not-found!!!
-# test? org.junit.jupiter:junit-jupiter-params:5.6.0 -> !!!groupId-not-found!!!
-# test? org.junit.vintage:junit-vintage-engine:5.6.0 -> !!!groupId-not-found!!!
+# test? org.junit.jupiter:junit-jupiter-api:5.8.2 -> !!!groupId-not-found!!!
+# test? org.junit.jupiter:junit-jupiter-engine:5.8.2 -> !!!groupId-not-found!!!
+# test? org.junit.jupiter:junit-jupiter-params:5.8.2 -> !!!groupId-not-found!!!
+# test? org.junit.vintage:junit-vintage-engine:5.8.2 -> !!!groupId-not-found!!!
# test? se.jiderhamn:classloader-leak-test-framework:1.1.1 -> !!!groupId-not-found!!!
DEPEND="
>=virtual/jdk-1.8:*
${CP_DEPEND}"
-# test? (
-# !!!groupId-not-found!!!
-# )
-# "
RDEPEND="
>=virtual/jre-1.8:*
@@ -54,7 +50,3 @@ S="${WORKDIR}/postgresql-${PV}-jdbc-src"
JAVA_MAIN_CLASS="org.postgresql.util.PGJDBCMain"
JAVA_SRC_DIR="src/main/java"
JAVA_RESOURCE_DIRS="src/main/resources"
-
-# JAVA_TEST_GENTOO_CLASSPATH="junit-4,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!"
-# JAVA_TEST_SRC_DIR="src/test/java"
-# JAVA_TEST_RESOURCE_DIRS="src/test/resources"
diff --git a/dev-java/jffi/Manifest b/dev-java/jffi/Manifest
index 46f96ebc4d8b..1417241bf1c7 100644
--- a/dev-java/jffi/Manifest
+++ b/dev-java/jffi/Manifest
@@ -1,3 +1 @@
-DIST jffi-1.2.9.tar.gz 1952668 BLAKE2B 320329b02ee9e93153fc334b73a6216da74ac2d924a64c8a1569f1f1507e1196d0b922f7d158ea91f6bc7164979b2ac12de239adbe98664a3708dd29c8d40f96 SHA512 2fd9a95cce9a3406a09856761d1318d4c6b976b1f9b66c7c5b0b5e95d44b19ba654ab8288f396782c7bb53e6d9949e7cfa9c46763f2a0761c6e86f102cd202e4
-DIST jffi-1.3.6.tar.gz 3187269 BLAKE2B 87a98c752440e336948923e73e2756cb0f88cbb111775f7fcc176152c60a050dad2b8d312bf0e6cda9e499b06fa64f6eda0659a6635010cb2da6ade4471225b9 SHA512 0259e59daa438572e94737efc126ab631be5f92e9ac2bf2bfdcdf92bcf9709ef930d68250b7fcaee3126a97c705c112d02bdfb0a800e8eb3b3f2fde6381f7a9f
DIST jffi-1.3.9.tar.gz 3193992 BLAKE2B bcd2dba3f9528c293aebb13a8fbd0b2fd7afcbae0cc5fa231f7e8ab190b834adc9e3f40bfc1211d0019a34a9edbaf8810f44b88f3c44b1e3b8065b2b80ccc6dc SHA512 21bf6997c64c0764c1fe86c9ab9b854037241489789f443a3337253ecc95100c94723a57165c85eed7a6c3837b8c04751af4a1fb5873a9c9fcd9a4535b68fc10
diff --git a/dev-java/jffi/files/jffi-1.2.8-junit-4.11.patch b/dev-java/jffi/files/jffi-1.2.8-junit-4.11.patch
deleted file mode 100644
index ac3843a0053a..000000000000
--- a/dev-java/jffi/files/jffi-1.2.8-junit-4.11.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/src/test/java/com/kenai/jffi/NumberTest.java
-+++ b/src/test/java/com/kenai/jffi/NumberTest.java
-@@ -234,9 +234,8 @@
- private void returnF32(InvokerType type) {
- LibNumberTest lib = UnitHelper.loadTestLibrary(LibNumberTest.class, type);
- float[] values = { 0f, 1.0f, -2.0f };
-- for (int i = 0; i < values.length; ++i) {
-- assertEquals("Value not returned correctly", values[i], lib.ret_float(values[i]), 0.1f);
-- }
-+ float[] lib_values = { lib.ret_float(0f), lib.ret_float(1.0f), lib.ret_float(-2.0f) };
-+ assertArrayEquals("Value not returned correctly", values, lib_values, 0.1f);
- }
-
- @Test public void returnDefaultF64() {
diff --git a/dev-java/jffi/files/jffi-1.2.8-makefile.patch b/dev-java/jffi/files/jffi-1.2.8-makefile.patch
deleted file mode 100644
index cdc28a662b51..000000000000
--- a/dev-java/jffi/files/jffi-1.2.8-makefile.patch
+++ /dev/null
@@ -1,52 +0,0 @@
---- a/jni/GNUmakefile
-+++ b/jni/GNUmakefile
-@@ -41,6 +41,7 @@
- JFFI_BUILD_DIR = $(BUILD_DIR)/jffi
-
- ifeq ($(USE_SYSTEM_LIBFFI),1)
-+ LIBFFI =
- LIBFFI_LIBS ?= $(shell pkg-config --libs libffi)
- LIBFFI_CFLAGS ?= $(shell pkg-config --cflags libffi)
- else
-@@ -64,9 +65,8 @@
- OFLAGS = -O2 $(JFLAGS)
-
- # MacOS headers aren't completely warning free, so turn them off
--WERROR = -Werror
- ifneq ($(OS),darwin)
-- WFLAGS += -Wundef $(WERROR)
-+ WFLAGS += -Wundef
- endif
- WFLAGS += -W -Wall -Wno-unused -Wno-parentheses -Wno-unused-parameter
- PICFLAGS = -fPIC
-@@ -279,7 +279,7 @@
- @echo "JFFI_BUILD_DIR=$(JFFI_BUILD_DIR)"
- @echo "OBJS=$(OBJS)"
-
--$(LIBJFFI): $(OBJS) $(LIBFFI_LIBS)
-+$(LIBJFFI): $(OBJS) $(LIBFFI)
- $(CC) -o $@ $(LDFLAGS) $(SOFLAGS) $(OBJS) $(LIBFFI_LIBS) $(LIBS)
- $(STRIP) $@
-
-@@ -291,7 +291,7 @@
- @mkdir -p $(@D)
- @$(CC) $(CFLAGS) -o $@ -c $<
-
--$(OBJS) : $(LIBFFI_LIBS)
-+$(OBJS) : $(LIBFFI)
-
- ifeq ($(OS), darwin)
- build_ffi = \
---- a/libtest/GNUmakefile
-+++ b/libtest/GNUmakefile
-@@ -44,8 +44,8 @@
- # Compiler/linker flags from:
- # http://weblogs.java.net/blog/kellyohair/archive/2006/01/compilation_of_1.html
- JFLAGS = -fno-omit-frame-pointer -fno-strict-aliasing
--OFLAGS = -O2 $(JFLAGS)
--WFLAGS = -W -Werror -Wall -Wno-unused -Wno-unused-parameter -Wno-parentheses
-+OFLAGS = $(JFLAGS)
-+WFLAGS = -W -Wall -Wno-unused -Wno-unused-parameter -Wno-parentheses
- PICFLAGS = -fPIC
- SOFLAGS = -shared -Wl,-O1
- LDFLAGS += $(SOFLAGS)
diff --git a/dev-java/jffi/files/jffi-1.3.6-GNUmakefile.patch b/dev-java/jffi/files/jffi-1.3.6-GNUmakefile.patch
deleted file mode 100644
index 2dd5e9d8791a..000000000000
--- a/dev-java/jffi/files/jffi-1.3.6-GNUmakefile.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/jni/GNUmakefile b/jni/GNUmakefile
-index c0f298c..457626f 100755
---- a/jni/GNUmakefile
-+++ b/jni/GNUmakefile
-@@ -278,16 +278,16 @@ debug:
- @echo "OBJS=$(OBJS)"
-
- $(LIBJFFI): $(OBJS) $(LIBFFI_LIBS)
-- $(CC) -o $@ $(LDFLAGS) $(SOFLAGS) $(OBJS) $(LIBFFI) $(LIBS)
-+ $(CC) -o $@ $(LDFLAGS) $(SOFLAGS) $(OBJS) $(LIBFFI) $(LIBS) $(LIBFFI_LIBS)
- $(STRIP) $@
-
- $(BUILD_DIR)/%.o : $(SRC_DIR)/%.c $(wildcard $(JFFI_SRC_DIR)/*.h)
-- @mkdir -p $(@D)
-- @$(CCACHE) $(CC) $(CFLAGS) -c $< -o $@
-+ mkdir -p $(@D)
-+ $(CCACHE) $(CC) $(CFLAGS) -c $< -o $@
-
- $(BUILD_DIR)/%.o : $(SRC_DIR)/%.S $(wildcard $(JFFI_SRC_DIR)/*.h)
-- @mkdir -p $(@D)
-- @$(CC) $(CFLAGS) -o $@ -c $<
-+ mkdir -p $(@D)
-+ $(CC) $(CFLAGS) -o $@ -c $<
-
- $(OBJS) : $(LIBFFI)
-
diff --git a/dev-java/jffi/files/jffi_maven-build.xml b/dev-java/jffi/files/jffi_maven-build.xml
deleted file mode 100644
index d8114185ee41..000000000000
--- a/dev-java/jffi/files/jffi_maven-build.xml
+++ /dev/null
@@ -1,259 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- ====================================================================== -->
-<!-- Ant build file (http://ant.apache.org/) for Ant 1.6.2 or above. -->
-<!-- ====================================================================== -->
-
-<!-- ====================================================================== -->
-<!-- ===================== - DO NOT EDIT THIS FILE! - ===================== -->
-<!-- ====================================================================== -->
-<!-- -->
-<!-- Any modifications will be overwritten. -->
-<!-- -->
-<!-- Generated by Maven Ant Plugin on 1/9/12 9:52 AM -->
-<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/ -->
-<!-- -->
-<!-- ====================================================================== -->
-
-<project name="jffi-from-maven" default="package" basedir=".">
-
- <!-- ====================================================================== -->
- <!-- Build environment properties -->
- <!-- ====================================================================== -->
-
- <property file="${user.home}/.m2/maven.properties"/>
- <property file="maven-build.properties"/>
-
- <property name="maven.build.finalName" value="jffi-1.0.11"/>
- <property name="maven.build.dir" value="target"/>
- <property name="maven.build.outputDir" value="${maven.build.dir}/classes"/>
- <property name="maven.build.srcDir.0" value="src/main/java"/>
- <property name="maven.build.resourceDir.0" value="src/main/resources"/>
- <property name="maven.build.testOutputDir" value="${maven.build.dir}/test-classes"/>
- <property name="maven.build.testDir.0" value="src/test/java"/>
- <property name="maven.build.testResourceDir.0" value="src/test/resources"/>
- <property name="maven.test.reports" value="${maven.build.dir}/test-reports"/>
- <property name="maven.reporting.outputDirectory" value="${maven.build.dir}/site"/>
-
- <property name="maven.repo.local" value="${user.home}/.m2/repository"/>
- <property name="maven.settings.offline" value="false"/>
- <property name="maven.settings.interactiveMode" value="true"/>
-
- <!-- ====================================================================== -->
- <!-- Defining classpaths -->
- <!-- ====================================================================== -->
-
- <path id="build.classpath"/>
- <path id="build.test.classpath">
- <pathelement location="${maven.repo.local}/junit/junit/4.8.2/junit-4.8.2.jar"/>
- </path>
-
- <!-- ====================================================================== -->
- <!-- Cleaning up target -->
- <!-- ====================================================================== -->
-
- <target name="clean" description="Clean the output directory">
- <delete dir="${maven.build.dir}"/>
- </target>
-
- <!-- ====================================================================== -->
- <!-- Compilation target -->
- <!-- ====================================================================== -->
-
- <target name="compile" depends="get-deps" description="Compile the code">
- <mkdir dir="${maven.build.outputDir}"/>
- <javac destdir="${maven.build.outputDir}"
- nowarn="false"
- debug="true"
- optimize="false"
- deprecation="true"
- target="1.1"
- verbose="false"
- fork="false"
- source="1.3">
- <src>
- <pathelement location="${maven.build.srcDir.0}"/>
- </src>
- <classpath refid="build.classpath"/>
- </javac>
- </target>
-
- <!-- ====================================================================== -->
- <!-- Test-compilation target -->
- <!-- ====================================================================== -->
-
- <target name="compile-tests"
- depends="compile"
- description="Compile the test code"
- unless="maven.test.skip">
- <mkdir dir="${maven.build.testOutputDir}"/>
- <javac destdir="${maven.build.testOutputDir}"
- nowarn="false"
- debug="true"
- optimize="false"
- deprecation="true"
- target="1.1"
- verbose="false"
- fork="false"
- source="1.3">
- <src>
- <pathelement location="${maven.build.testDir.0}"/>
- </src>
- <classpath>
- <path refid="build.test.classpath"/>
- <pathelement location="${maven.build.outputDir}"/>
- </classpath>
- </javac>
- </target>
-
- <!-- ====================================================================== -->
- <!-- Run all tests -->
- <!-- ====================================================================== -->
-
- <target name="test"
- depends="compile-tests, junit-missing"
- unless="junit.skipped"
- description="Run the test cases">
- <mkdir dir="${maven.test.reports}"/>
- <junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir=".">
- <sysproperty key="basedir" value="."/>
- <formatter type="xml"/>
- <formatter type="plain" usefile="false"/>
- <classpath>
- <path refid="build.test.classpath"/>
- <pathelement location="${maven.build.outputDir}"/>
- <pathelement location="${maven.build.testOutputDir}"/>
- </classpath>
- <batchtest todir="${maven.test.reports}" unless="test">
- <fileset dir="${maven.build.testDir.0}">
- <include name="**/Test*.java"/>
- <include name="**/*Test.java"/>
- <include name="**/*TestCase.java"/>
- <exclude name="**/*Abstract*Test.java"/>
- </fileset>
- </batchtest>
- <batchtest todir="${maven.test.reports}" if="test">
- <fileset dir="${maven.build.testDir.0}">
- <include name="**/${test}.java"/>
- <exclude name="**/*Abstract*Test.java"/>
- </fileset>
- </batchtest>
- </junit>
- </target>
-
- <target name="test-junit-present">
- <available classname="junit.framework.Test" property="junit.present"/>
- </target>
-
- <target name="test-junit-status"
- depends="test-junit-present">
- <condition property="junit.missing">
- <and>
- <isfalse value="${junit.present}"/>
- <isfalse value="${maven.test.skip}"/>
- </and>
- </condition>
- <condition property="junit.skipped">
- <or>
- <isfalse value="${junit.present}"/>
- <istrue value="${maven.test.skip}"/>
- </or>
- </condition>
- </target>
-
- <target name="junit-missing"
- depends="test-junit-status"
- if="junit.missing">
- <echo>=================================== WARNING ===================================</echo>
- <echo> JUnit is not present in your $ANT_HOME/lib directory. Tests not executed.</echo>
- <echo>===============================================================================</echo>
- </target>
-
- <!-- ====================================================================== -->
- <!-- Javadoc target -->
- <!-- ====================================================================== -->
-
- <target name="javadoc" description="Generates the Javadoc of the application">
- <javadoc sourcepath="${maven.build.srcDir.0}"
- packagenames="*"
- destdir="${maven.reporting.outputDirectory}/apidocs"
- access="protected"
- old="false"
- verbose="false"
- version="true"
- use="true"
- author="true"
- splitindex="false"
- nodeprecated="false"
- nodeprecatedlist="false"
- notree="false"
- noindex="false"
- nohelp="false"
- nonavbar="false"
- serialwarn="false"
- charset="ISO-8859-1"
- linksource="false"
- breakiterator="false"/>
- </target>
-
- <!-- ====================================================================== -->
- <!-- Package target -->
- <!-- ====================================================================== -->
-
- <target name="package" depends="compile,test" description="Package the application">
- <jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar"
- compress="true"
- index="false"
- basedir="${maven.build.outputDir}"
- excludes="**/package.html"/>
- </target>
-
- <!-- ====================================================================== -->
- <!-- A dummy target for the package named after the type it creates -->
- <!-- ====================================================================== -->
-
- <target name="jar" depends="package" description="Builds the jar for the application"/>
-
- <!-- ====================================================================== -->
- <!-- Download dependencies target -->
- <!-- ====================================================================== -->
-
- <target name="test-offline">
- <condition property="maven.mode.offline">
- <equals arg1="${maven.settings.offline}" arg2="true"/>
- </condition>
- </target>
-
- <target name="get-deps"
- depends="test-offline"
- description="Download all dependencies"
- unless="maven.mode.offline">
- <mkdir dir="${maven.repo.local}"/>
- <mkdir dir="${maven.repo.local}/junit/junit/4.8.2"/>
- <get src="http://repository.jboss.com/maven2/junit/junit/4.8.2/junit-4.8.2.jar"
- dest="${maven.repo.local}/junit/junit/4.8.2/junit-4.8.2.jar"
- usetimestamp="false"
- ignoreerrors="true"/>
- <get src="http://snapshots.jboss.org/maven2/junit/junit/4.8.2/junit-4.8.2.jar"
- dest="${maven.repo.local}/junit/junit/4.8.2/junit-4.8.2.jar"
- usetimestamp="false"
- ignoreerrors="true"/>
- <get src="http://repository.jboss.org/maven2//junit/junit/4.8.2/junit-4.8.2.jar"
- dest="${maven.repo.local}/junit/junit/4.8.2/junit-4.8.2.jar"
- usetimestamp="false"
- ignoreerrors="true"/>
- <get src="https://repository.jboss.org/nexus/content/groups/public-jboss//junit/junit/4.8.2/junit-4.8.2.jar"
- dest="${maven.repo.local}/junit/junit/4.8.2/junit-4.8.2.jar"
- usetimestamp="false"
- ignoreerrors="true"/>
- <get src="https://oss.sonatype.org/content/repositories/snapshots/junit/junit/4.8.2/junit-4.8.2.jar"
- dest="${maven.repo.local}/junit/junit/4.8.2/junit-4.8.2.jar"
- usetimestamp="false"
- ignoreerrors="true"/>
- <get src="http://repo1.maven.org/maven2/junit/junit/4.8.2/junit-4.8.2.jar"
- dest="${maven.repo.local}/junit/junit/4.8.2/junit-4.8.2.jar"
- usetimestamp="false"
- ignoreerrors="true"/>
- </target>
-
-</project>
diff --git a/dev-java/jffi/jffi-1.2.9-r1.ebuild b/dev-java/jffi/jffi-1.2.9-r1.ebuild
deleted file mode 100644
index ef103551c7d9..000000000000
--- a/dev-java/jffi/jffi-1.2.9-r1.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="An optimized Java interface to libffi"
-HOMEPAGE="https://github.com/jnr/jffi"
-SRC_URI="https://github.com/jnr/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="|| ( Apache-2.0 LGPL-3 )"
-SLOT="1.2"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~ppc-macos ~x64-macos"
-
-CDEPEND="dev-libs/libffi:0="
-
-RDEPEND="${CDEPEND}
- >=virtual/jre-1.8:*"
-
-# java 1.8 is needed because javah is called which is not in newer jdks
-DEPEND="${CDEPEND}
- virtual/jdk:1.8
- test? (
- dev-java/ant-junit4:0
- dev-java/junit:4
- )"
-
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.2.8-makefile.patch
- "${FILESDIR}"/${PN}-1.2.8-junit-4.11.patch
-)
-
-RESTRICT="test"
-
-src_prepare() {
- default
-
- cp "${FILESDIR}"/${PN}_maven-build.xml build.xml || die
-
- # misc fixes for Darwin
- if [[ ${CHOST} == *-darwin* ]] ; then
- local uarch
- # don't do multiarch
- # avoid using Xcode stuff
- # use Prefix' headers
- # don't mess with deployment target
- # set install_name
- use x64-macos && uarch=x86_64
- use ppc-macos && uarch=ppc
- sed -i \
- -e "/ARCHES +=/s/=.*$/= ${uarch}/" \
- -e "/XCODE=/s:=.*$:=${EPREFIX}:" \
- -e "/MACSDK/s/^/#/" \
- -e "/MACOSX_DEPLOYMENT_TARGET=/s/MAC/NOMAC/" \
- -e "/SOFLAGS =/s:=.*:= -install_name ${EPREFIX}/usr/lib/jffi-${SLOT}/libjffi-${SLOT}.jnilib:" \
- jni/GNUmakefile || die
- fi
-
- java-pkg_clean
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-EANT_EXTRA_ARGS="-Dmaven.build.finalName=${PN}"
-
-src_compile() {
- # generate Version.java
- cat > src/main/java/com/kenai/jffi/Version.java <<-EOF
- package com.kenai.jffi;
- public final class Version {
- private Version() {}
- public static final int MAJOR = $(ver_cut 1);
- public static final int MINOR = $(ver_cut 2);
- public static final int MICRO = $(ver_cut 3);
- }
- EOF
-
- java-pkg-2_src_compile
-
- # generate headers
- mkdir -p build/jni
- javah -d build/jni -classpath target/classes \
- com.kenai.jffi.Foreign \
- com.kenai.jffi.ObjectBuffer \
- com.kenai.jffi.Version \
- || die
-
- #build native library.
- local args=(
- SRC_DIR=jni
- JNI_DIR=jni
- BUILD_DIR=build/jni
- VERSION=$(ver_cut 1-2)
- USE_SYSTEM_LIBFFI=1
- CCACHE=
- -f jni/GNUmakefile
- )
- emake "${args[@]}"
-}
-
-EANT_TEST_GENTOO_CLASSPATH="ant-junit4,junit-4"
-
-src_test() {
- # build native test library
- emake BUILD_DIR=build -f libtest/GNUmakefile
-
- _JAVA_OPTIONS="-Djffi.boot.library.path=${S}/build/jni" \
- java-pkg-2_src_test
-}
-
-src_install() {
- local libname=".so"
-
- [[ ${CHOST} == *-darwin* ]] && libname=.jnilib
- java-pkg_doso build/jni/lib${PN}-$(ver_cut 1-2)${libname}
-
- # must by after _doso to have JAVA_PKG_LIBDEST set
- cat > boot.properties <<-EOF
- jffi.boot.library.path = ${JAVA_PKG_LIBDEST}
- EOF
- jar -uf target/${PN}.jar boot.properties || die
-
- java-pkg_dojar target/${PN}.jar
-
- use doc && java-pkg_dojavadoc target/site/apidocs
- use source && java-pkg_dosrc src/main/java/*
-}
diff --git a/dev-java/jffi/jffi-1.3.6.ebuild b/dev-java/jffi/jffi-1.3.6.ebuild
deleted file mode 100644
index f34b51d92cc2..000000000000
--- a/dev-java/jffi/jffi-1.3.6.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/jnr/jffi/archive/refs/tags/jffi-1.3.6.tar.gz --slot 1.3 --keywords "~amd64 ~arm64 ~ppc64 ~x86" --ebuild jffi-1.3.6.ebuild
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="com.github.jnr:jffi:1.3.6"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Java Foreign Function Interface"
-HOMEPAGE="https://github.com/jnr/jffi"
-SRC_URI="https://github.com/jnr/${PN}/archive/refs/tags/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="1.2"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-
-DEPEND=">=virtual/jdk-1.8:*"
-RDEPEND=">=virtual/jre-1.8:*"
-
-PATCHES=( "${FILESDIR}"/jffi-1.3.6-GNUmakefile.patch )
-DOCS=( LICENSE README.md )
-
-S="${WORKDIR}/${PN}-${P}"
-
-JAVA_SRC_DIR="src/main/java"
-
-# https://github.com/jnr/jffi/blob/eabdf09c3ec4fc8a54b684ff326e36b36b74e0da/build.xml#L26
-JAVA_TEST_EXTRA_ARGS="-Djffi.library.path=${S}/build/jni -Djffi.boot.library.path=${S}/build/jni"
-JAVA_TEST_GENTOO_CLASSPATH="junit-4"
-JAVA_TEST_SRC_DIR="src/test/java"
-
-src_prepare() {
- default
- cat > src/main/java/com/kenai/jffi/Version.java <<-EOF
- package com.kenai.jffi;
- import java.lang.annotation.Native;
- public final class Version {
- private Version() {}
- @Native
- public static final int MAJOR = $(ver_cut 1);
- @Native
- public static final int MINOR = $(ver_cut 2);
- @Native
- public static final int MICRO = $(ver_cut 3);
- }
- EOF
-}
-
-src_compile() {
- java-pkg-simple_src_compile
-
- # generate headers
- mkdir -p build/jni
- javac -h build/jni -classpath target/classes \
- ${JAVA_SRC_DIR}/com/kenai/jffi/{Foreign,ObjectBuffer,Version}.java \
- || die
-
- #build native library.
- local args=(
- SRC_DIR=jni
- JNI_DIR=jni
- BUILD_DIR=build/jni
- VERSION=$(ver_cut 1-2)
- USE_SYSTEM_LIBFFI=1
- CCACHE=
- -f jni/GNUmakefile
- )
- emake "${args[@]}"
-}
-
-src_test() {
- # build native test library
- emake BUILD_DIR=build -f libtest/GNUmakefile
-
- # https://github.com/jnr/jffi/issues/60
- LC_ALL=C java-pkg-simple_src_test
-}
-
-src_install() {
- default
-
- local libname=".so"
- java-pkg_doso build/jni/lib${PN}-$(ver_cut 1-2)${libname}
-
- # must be after _doso to have JAVA_PKG_LIBDEST set
- cat > boot.properties <<-EOF
- jffi.boot.library.path = ${JAVA_PKG_LIBDEST}
- EOF
- jar -uf ${PN}.jar boot.properties || die
-
- java-pkg-simple_src_install
-}
diff --git a/dev-java/jffi/jffi-1.3.9-r1.ebuild b/dev-java/jffi/jffi-1.3.9-r1.ebuild
index 0655be95b313..ee8168740ba4 100644
--- a/dev-java/jffi/jffi-1.3.9-r1.ebuild
+++ b/dev-java/jffi/jffi-1.3.9-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/jnr/${PN}/archive/refs/tags/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="1.3"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
DEPEND=">=virtual/jdk-1.8:*
>=dev-libs/libffi-3.4.2-r2:="
@@ -51,6 +51,29 @@ src_prepare() {
public static final int MICRO = $(ver_cut 3);
}
EOF
+
+ # https://bugs.gentoo.org/829820
+ if use arm; then
+ sed \
+ -e '/import org.junit.Test/a import org.junit.Ignore;' \
+ -e '/invokeHeapDO()/i @Ignore' \
+ -e '/invokeHeapNO()/i @Ignore' \
+ -e '/invokeHeapOD()/i @Ignore' \
+ -e '/invokeHeapON()/i @Ignore' \
+ -e '/invokeHeapOO()/i @Ignore' \
+ -e '/invokeHeapO()/i @Ignore' \
+ -e '/invokeNativeDO()/i @Ignore' \
+ -e '/invokeNativeNO()/i @Ignore' \
+ -e '/invokeNativeOD()/i @Ignore' \
+ -e '/invokeNativeON()/i @Ignore' \
+ -e '/invokeNativeOO()/i @Ignore' \
+ -e '/invokeNativeO()/i @Ignore' \
+ -i src/test/java/com/kenai/jffi/InvokerTest.java || die
+ sed \
+ -e '/import org.junit.Test/a import org.junit.Ignore;' \
+ -e '/returnDefaultF128HighPrecision/i @Ignore' \
+ -i src/test/java/com/kenai/jffi/NumberTest.java || die
+ fi
}
src_compile() {
diff --git a/dev-java/jffi/jffi-1.3.9.ebuild b/dev-java/jffi/jffi-1.3.9.ebuild
deleted file mode 100644
index d74a2940741e..000000000000
--- a/dev-java/jffi/jffi-1.3.9.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/jnr/jffi/archive/jffi-1.3.9.tar.gz --slot 1.3 --keywords "~amd64 ~arm64 ~ppc64 ~x86" --ebuild jffi-1.3.9.ebuild
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="com.github.jnr:jffi:1.3.9"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Java Foreign Function Interface"
-HOMEPAGE="https://github.com/jnr/jffi"
-SRC_URI="https://github.com/jnr/${PN}/archive/refs/tags/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="1.3"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-
-DEPEND=">=virtual/jdk-1.8:*"
-RDEPEND=">=virtual/jre-1.8:*"
-
-PATCHES=( "${FILESDIR}"/jffi-1.3.8-GNUmakefile.patch )
-
-S="${WORKDIR}/${PN}-${P}"
-
-JAVA_SRC_DIR="src/main/java"
-
-# https://github.com/jnr/jffi/blob/b6ad5c066a6346072ea04f8ffa8177204aadcb13/build.xml#L26
-JAVA_TEST_EXTRA_ARGS="-Djffi.library.path=${S}/build/jni -Djffi.boot.library.path=${S}/build/jni"
-JAVA_TEST_GENTOO_CLASSPATH="junit-4"
-JAVA_TEST_SRC_DIR="src/test/java"
-
-src_prepare() {
- default
- cat > src/main/java/com/kenai/jffi/Version.java <<-EOF
- package com.kenai.jffi;
- import java.lang.annotation.Native;
- public final class Version {
- private Version() {}
- @Native
- public static final int MAJOR = $(ver_cut 1);
- @Native
- public static final int MINOR = $(ver_cut 2);
- @Native
- public static final int MICRO = $(ver_cut 3);
- }
- EOF
-}
-
-src_compile() {
- java-pkg-simple_src_compile
-
- # generate headers
- mkdir -p build/jni
- javac -h build/jni -classpath target/classes \
- ${JAVA_SRC_DIR}/com/kenai/jffi/{Foreign,ObjectBuffer,Version}.java \
- || die
-
- #build native library.
- local args=(
- SRC_DIR=jni
- JNI_DIR=jni
- BUILD_DIR=build/jni
- VERSION=$(ver_cut 1-2)
- USE_SYSTEM_LIBFFI=1
- CCACHE=
- -f jni/GNUmakefile
- )
- emake "${args[@]}"
-}
-
-src_test() {
- # build native test library
- emake BUILD_DIR=build -f libtest/GNUmakefile
-
- # https://github.com/jnr/jffi/issues/60
- LC_ALL=C java-pkg-simple_src_test
-}
-
-src_install() {
- default
-
- local libname=".so"
- java-pkg_doso build/jni/lib${PN}-$(ver_cut 1-2)${libname}
-
- # must be after _doso to have JAVA_PKG_LIBDEST set
- cat > boot.properties <<-EOF
- jffi.boot.library.path = ${JAVA_PKG_LIBDEST}
- EOF
- jar -uf ${PN}.jar boot.properties || die
-
- java-pkg-simple_src_install
-}
diff --git a/dev-java/jmock/Manifest b/dev-java/jmock/Manifest
index 461e7589a929..3180d94c6641 100644
--- a/dev-java/jmock/Manifest
+++ b/dev-java/jmock/Manifest
@@ -1,2 +1,2 @@
DIST jmock-1.2.0-jars.zip 153214 BLAKE2B 2c40696229018406f3b60559013b73b5331c223da6e2743830c4c9b8b728484b1ebed8fb347c240f50f6936c2fd1e4ee85b754315682047a87a14414effc3a48 SHA512 5290f1d14cbc3d0f223bdaf59716b037dbc021c8f39a3784d13af8d8be3edbddc5e2eb4754b80e78ae954daf12889210183e7e11c110012b4d9320344efe19da
-DIST jmock-2.6.1-jars.zip 1249841 BLAKE2B 87861dad7151000e1397a54d0ded7e49c3fd81fca64afd74d6176436f336be5b5e89f73be8c124cf086798f74aef4972303137529113e3c85ba93353f95e3a42 SHA512 7cd1d2e89dceb31c68ad3f702ad937b5de6ec77cc37e94be7aa53db2fc61d11aa40ec5aab225a3eeeba5064ad8384f10413ac05a9df97102c8e63f4209ea149e
+DIST jmock-2.12.0.tar.gz 111963 BLAKE2B d4b8c8c4ca68ed8dae3b4906e3163fa5e8e8ea8f4b993386d7fa605e0188dd43462550ae4833ab9dbfe68c24e15cf6d19a6f444ca57f666fdfe8b29734fd32f7 SHA512 b1ba12981e7379f5b07a29749c7640906c02f72f52158921d0ac02abf69c9c8c2dc753f4462ff0afa5807852a06f59a6da9ed9357ae7dc0303b0377a0e3da854
diff --git a/dev-java/jmock/jmock-2.12.0.ebuild b/dev-java/jmock/jmock-2.12.0.ebuild
new file mode 100644
index 000000000000..a258ba6eeffd
--- /dev/null
+++ b/dev-java/jmock/jmock-2.12.0.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom jmock/pom.xml --download-uri https://github.com/jmock-developers/jmock-library/archive/2.12.0.tar.gz --slot 2 --keywords "~amd64 ~arm64 ~ppc64 ~x86" --ebuild jmock-2.12.0.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.jmock:jmock:2.12.0"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="An expressive Mock Object library for Test Driven Development"
+HOMEPAGE="http://jmock.org/"
+SRC_URI="https://github.com/${PN}-developers/${PN}-library/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="2"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
+
+DEPEND="
+ dev-java/asm:9
+ dev-java/bsh:0
+ dev-java/hamcrest:0
+ >=virtual/jdk-1.8:*
+ test? (
+ dev-java/findbugs-annotations:0
+ dev-java/jaxws-api:0
+ )
+"
+
+RDEPEND=">=virtual/jre-1.8:*"
+
+S="${WORKDIR}/jmock-library-${PV}"
+
+JAVA_TEST_GENTOO_CLASSPATH="
+ findbugs-annotations
+ jaxws-api
+ junit-4
+"
+JAVA_TEST_SRC_DIR="jmock/src/test/java"
+
+src_prepare() {
+ default
+ # We have "signed.jar" directly in ${S}, not in "../testjar/target/".
+ sed \
+ -e 's:\.\.\/testjar\/target\/\(signed.jar\):\1:' \
+ -i jmock/src/test/java/org/jmock/test/unit/lib/JavaReflectionImposteriserTests.java || die
+}
+
+src_compile() {
+ if use test; then
+ einfo "Compiling testjar"
+ JAVA_SRC_DIR="testjar/src/main/java"
+ JAVA_CLASSPATH_EXTRA="findbugs-annotations"
+ JAVA_JAR_FILENAME="signed.jar"
+ java-pkg-simple_src_compile
+ cp {,un}signed.jar || die
+ JAVA_GENTOO_CLASSPATH_EXTRA+=":signed.jar:unsigned.jar"
+ rm -r target || die
+ fi
+
+ einfo "Compiling jmock.jar"
+ JAVA_SRC_DIR="jmock/src/main/java"
+ JAVA_CLASSPATH_EXTRA="
+ asm-9
+ bsh
+ hamcrest
+ "
+ JAVA_JAR_FILENAME="jmock.jar"
+ java-pkg-simple_src_compile
+
+ # Code generation according to jmock/pom.xml#L73-L90
+ "$(java-config -J)" \
+ -cp $(java-config --with-dependencies --classpath asm:9):${PN}.jar \
+ org.jmock.ExpectationsCreator
+
+ # Update jmock.jar with updated Expectations.class
+ jar ufv jmock.jar -C target/classes org/jmock/Expectations.class || die
+}
+
+src_test() {
+ # ${S}/pom.xml#L131-L143
+ pushd jmock/src/test/java || die
+ local JAVA_TEST_RUN_ONLY=$(find * \
+ \( -wholename "**/*Test.java" \
+ -o -wholename '**/*Tests.java' \)\
+ ! -wholename "**/Failing*TestCase.java" \
+ ! -wholename "**/VerifyingTestCaseTests$*" \
+ ! -wholename "**/Abstract*Test.java" \
+ )
+ popd
+ JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}"
+ JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}"
+ java-pkg-simple_src_test
+}
diff --git a/dev-java/jmock/jmock-2.6.1-r1.ebuild b/dev-java/jmock/jmock-2.6.1-r1.ebuild
deleted file mode 100644
index a61fb1719ea3..000000000000
--- a/dev-java/jmock/jmock-2.6.1-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Library for testing Java code using mock objects"
-HOMEPAGE="http://jmock.org"
-SRC_URI="http://jmock.org/downloads/${P}-jars.zip"
-
-LICENSE="BSD"
-SLOT="2"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
-
-CDEPEND="dev-java/hamcrest-core:1.3
- dev-java/hamcrest-library:1.3
- dev-java/junit:4"
-
-RDEPEND=">=virtual/jre-1.8:*
- ${CDEPEND}"
-
-DEPEND="app-arch/unzip
- >=virtual/jdk-1.8:*
- ${CDEPEND}"
-
-JAVA_GENTOO_CLASSPATH="hamcrest-core-1.3,hamcrest-library-1.3,junit-4"
-
-S="${WORKDIR}/${P}"
-
-src_unpack() {
- unpack ${A}
- cd "${S}" || die
- unzip ${P}.jar -d src || die
- rm *.jar || die
-}
-
-src_prepare() {
- default
- find -name "*.class" -delete || die
-}
diff --git a/dev-java/jnr-a64asm/jnr-a64asm-1.0.0.ebuild b/dev-java/jnr-a64asm/jnr-a64asm-1.0.0.ebuild
index b9856b27e0ee..998ea27aa3f3 100644
--- a/dev-java/jnr-a64asm/jnr-a64asm-1.0.0.ebuild
+++ b/dev-java/jnr-a64asm/jnr-a64asm-1.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# Skeleton command:
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/jnr/${PN}/archive/refs/tags/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="2"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
DEPEND="
>=virtual/jdk-1.8:*
diff --git a/dev-java/jnr-ffi/Manifest b/dev-java/jnr-ffi/Manifest
index ea0315a2f0c8..cfbd2c1ca16d 100644
--- a/dev-java/jnr-ffi/Manifest
+++ b/dev-java/jnr-ffi/Manifest
@@ -1,2 +1 @@
-DIST jnr-ffi-2.0.2.tar.gz 170707 BLAKE2B fc4f1dcea51939b6098b980b4962380e58ba590ea9d4cdba7823c1372bd645d985ae25d8ebf1f0b575a0e4b5c192e5595094076d3cd44e4bb3c077dd838c170f SHA512 80a932408f5ceaf19fd7a399b786aa0d7b9251ea144bc2755bcf3cdc3aea85615a1faa001bbcd3072bc0eead2aaa30d0bbead5f96c82c4b9e455c1ed1379b4c0
DIST jnr-ffi-2.2.12.tar.gz 285324 BLAKE2B 32e866654b901ded7cdc82999d79873d49bd9d3599d265e9d029e7cf8ce1895f9e830a1af75b8c149c3debc5f3d256f6241d706ecbd94277ce1fa49a2868885c SHA512 420adb647c5d0547f0b18e4f8a21096da9aaebbdf0e50761ec1fd6be64ad29649c7af4d6daf0a8c4c38e02a05e0df836de6fdb7776f10c02d8bfd447a11882b3
diff --git a/dev-java/jnr-ffi/files/jnr-ffi-2.0.2-junit48.patch b/dev-java/jnr-ffi/files/jnr-ffi-2.0.2-junit48.patch
deleted file mode 100644
index 92b4cb2bcfc3..000000000000
--- a/dev-java/jnr-ffi/files/jnr-ffi-2.0.2-junit48.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/test/java/jnr/ffi/ObjectReferenceManagerTest.java
-+++ b/src/test/java/jnr/ffi/ObjectReferenceManagerTest.java
-@@ -35,7 +35,7 @@
- Pointer ptr = referenceManager.add(bar);
- Pointer ptr2 = referenceManager.add(bar2);
- assertNotSame(ptr, ptr2);
-- assertNotEquals(ptr, ptr2);
-+ assertTrue(!ptr.equals(ptr2));
- assertSame(bar, referenceManager.get(ptr));
- assertSame(bar2, referenceManager.get(ptr2));
- }
diff --git a/dev-java/jnr-ffi/files/jnr-ffi_maven-build.xml b/dev-java/jnr-ffi/files/jnr-ffi_maven-build.xml
deleted file mode 100644
index 0337f347bec0..000000000000
--- a/dev-java/jnr-ffi/files/jnr-ffi_maven-build.xml
+++ /dev/null
@@ -1,250 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- ====================================================================== -->
-<!-- Ant build file (http://ant.apache.org/) for Ant 1.6.2 or above. -->
-<!-- ====================================================================== -->
-
-<!-- ====================================================================== -->
-<!-- ===================== - DO NOT EDIT THIS FILE! - ===================== -->
-<!-- ====================================================================== -->
-<!-- -->
-<!-- Any modifications will be overwritten. -->
-<!-- -->
-<!-- Generated by Maven Ant Plugin on 1/9/12 11:18 AM -->
-<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/ -->
-<!-- -->
-<!-- ====================================================================== -->
-
-<project name="jnr-ffi-from-maven" default="package" basedir=".">
-
- <!-- ====================================================================== -->
- <!-- Build environment properties -->
- <!-- ====================================================================== -->
-
- <property file="${user.home}/.m2/maven.properties"/>
- <property file="maven-build.properties"/>
-
- <property name="maven.build.finalName" value="jnr-ffi-0.6.0"/>
- <property name="maven.build.dir" value="target"/>
- <property name="maven.build.outputDir" value="${maven.build.dir}/classes"/>
- <property name="maven.build.srcDir.0" value="src/main/java"/>
- <property name="maven.build.resourceDir.0" value="src/main/resources"/>
- <property name="maven.build.testOutputDir" value="${maven.build.dir}/test-classes"/>
- <property name="maven.build.testDir.0" value="src/test/java"/>
- <property name="maven.build.testResourceDir.0" value="src/test/resources"/>
- <property name="maven.test.reports" value="${maven.build.dir}/test-reports"/>
- <property name="maven.reporting.outputDirectory" value="${maven.build.dir}/site"/>
-
- <property name="maven.repo.local" value="${user.home}/.m2/repository"/>
- <property name="maven.settings.offline" value="false"/>
- <property name="maven.settings.interactiveMode" value="true"/>
-
- <!-- ====================================================================== -->
- <!-- Defining classpaths -->
- <!-- ====================================================================== -->
-
- <path id="build.classpath">
- <pathelement location="${maven.repo.local}/com/github/jnr/jffi/1.0.11/jffi-1.0.11.jar"/>
- <pathelement location="${maven.repo.local}/asm/asm/3.2/asm-3.2.jar"/>
- <pathelement location="${maven.repo.local}/asm/asm-commons/3.2/asm-commons-3.2.jar"/>
- <pathelement location="${maven.repo.local}/asm/asm-analysis/3.2/asm-analysis-3.2.jar"/>
- <pathelement location="${maven.repo.local}/asm/asm-tree/3.2/asm-tree-3.2.jar"/>
- <pathelement location="${maven.repo.local}/asm/asm-util/3.2/asm-util-3.2.jar"/>
- <pathelement location="${maven.repo.local}/com/github/jnr/jnr-x86asm/1.0.1/jnr-x86asm-1.0.1.jar"/>
- </path>
- <path id="build.test.classpath">
- <pathelement location="${maven.repo.local}/junit/junit/4.8.2/junit-4.8.2.jar"/>
- <pathelement location="${maven.repo.local}/com/github/jnr/jffi/1.0.11/jffi-1.0.11.jar"/>
- <pathelement location="${maven.repo.local}/com/github/jnr/jffi/1.0.11/jffi-1.0.11-native.jar"/>
- <pathelement location="${maven.repo.local}/asm/asm/3.2/asm-3.2.jar"/>
- <pathelement location="${maven.repo.local}/asm/asm-commons/3.2/asm-commons-3.2.jar"/>
- <pathelement location="${maven.repo.local}/asm/asm-analysis/3.2/asm-analysis-3.2.jar"/>
- <pathelement location="${maven.repo.local}/asm/asm-tree/3.2/asm-tree-3.2.jar"/>
- <pathelement location="${maven.repo.local}/asm/asm-util/3.2/asm-util-3.2.jar"/>
- <pathelement location="${maven.repo.local}/com/github/jnr/jnr-x86asm/1.0.1/jnr-x86asm-1.0.1.jar"/>
- </path>
-
- <!-- ====================================================================== -->
- <!-- Cleaning up target -->
- <!-- ====================================================================== -->
-
- <target name="clean" description="Clean the output directory">
- <delete dir="${maven.build.dir}"/>
- </target>
-
- <!-- ====================================================================== -->
- <!-- Compilation target -->
- <!-- ====================================================================== -->
-
- <target name="compile" depends="get-deps" description="Compile the code">
- <mkdir dir="${maven.build.outputDir}"/>
- <javac destdir="${maven.build.outputDir}"
- nowarn="false"
- debug="true"
- optimize="false"
- deprecation="true"
- target="1.1"
- verbose="false"
- fork="false"
- source="1.3">
- <src>
- <pathelement location="${maven.build.srcDir.0}"/>
- </src>
- <classpath refid="build.classpath"/>
- </javac>
- </target>
-
- <!-- ====================================================================== -->
- <!-- Test-compilation target -->
- <!-- ====================================================================== -->
-
- <target name="compile-tests"
- depends="compile"
- description="Compile the test code"
- unless="maven.test.skip">
- <mkdir dir="${maven.build.testOutputDir}"/>
- <javac destdir="${maven.build.testOutputDir}"
- nowarn="false"
- debug="true"
- optimize="false"
- deprecation="true"
- target="1.1"
- verbose="false"
- fork="false"
- source="1.3">
- <src>
- <pathelement location="${maven.build.testDir.0}"/>
- </src>
- <classpath>
- <path refid="build.test.classpath"/>
- <pathelement location="${maven.build.outputDir}"/>
- </classpath>
- </javac>
- </target>
-
- <!-- ====================================================================== -->
- <!-- Run all tests -->
- <!-- ====================================================================== -->
-
- <target name="test"
- depends="compile-tests, junit-missing"
- unless="junit.skipped"
- description="Run the test cases">
- <mkdir dir="${maven.test.reports}"/>
- <junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir=".">
- <sysproperty key="basedir" value="."/>
- <formatter type="xml"/>
- <formatter type="plain" usefile="false"/>
- <classpath>
- <path refid="build.test.classpath"/>
- <pathelement location="${maven.build.outputDir}"/>
- <pathelement location="${maven.build.testOutputDir}"/>
- </classpath>
- <batchtest todir="${maven.test.reports}" unless="test">
- <fileset dir="${maven.build.testDir.0}">
- <include name="**/Test*.java"/>
- <include name="**/*Test.java"/>
- <include name="**/*TestCase.java"/>
- <exclude name="**/*Abstract*Test.java"/>
- </fileset>
- </batchtest>
- <batchtest todir="${maven.test.reports}" if="test">
- <fileset dir="${maven.build.testDir.0}">
- <include name="**/${test}.java"/>
- <exclude name="**/*Abstract*Test.java"/>
- </fileset>
- </batchtest>
- </junit>
- </target>
-
- <target name="test-junit-present">
- <available classname="junit.framework.Test" property="junit.present"/>
- </target>
-
- <target name="test-junit-status"
- depends="test-junit-present">
- <condition property="junit.missing">
- <and>
- <isfalse value="${junit.present}"/>
- <isfalse value="${maven.test.skip}"/>
- </and>
- </condition>
- <condition property="junit.skipped">
- <or>
- <isfalse value="${junit.present}"/>
- <istrue value="${maven.test.skip}"/>
- </or>
- </condition>
- </target>
-
- <target name="junit-missing"
- depends="test-junit-status"
- if="junit.missing">
- <echo>=================================== WARNING ===================================</echo>
- <echo> JUnit is not present in your $ANT_HOME/lib directory. Tests not executed.</echo>
- <echo>===============================================================================</echo>
- </target>
-
- <!-- ====================================================================== -->
- <!-- Javadoc target -->
- <!-- ====================================================================== -->
-
- <target name="javadoc" description="Generates the Javadoc of the application">
- <javadoc sourcepath="${maven.build.srcDir.0}"
- packagenames="*"
- destdir="${maven.reporting.outputDirectory}/apidocs"
- access="protected"
- old="false"
- verbose="false"
- version="true"
- use="true"
- author="true"
- splitindex="false"
- nodeprecated="false"
- nodeprecatedlist="false"
- notree="false"
- noindex="false"
- nohelp="false"
- nonavbar="false"
- serialwarn="false"
- charset="ISO-8859-1"
- linksource="false"
- breakiterator="false"/>
- </target>
-
- <!-- ====================================================================== -->
- <!-- Package target -->
- <!-- ====================================================================== -->
-
- <target name="package" depends="compile,test" description="Package the application">
- <jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar"
- compress="true"
- index="false"
- basedir="${maven.build.outputDir}"
- excludes="**/package.html"/>
- </target>
-
- <!-- ====================================================================== -->
- <!-- A dummy target for the package named after the type it creates -->
- <!-- ====================================================================== -->
-
- <target name="jar" depends="package" description="Builds the jar for the application"/>
-
- <!-- ====================================================================== -->
- <!-- Download dependencies target -->
- <!-- ====================================================================== -->
-
- <target name="test-offline">
- <condition property="maven.mode.offline">
- <equals arg1="${maven.settings.offline}" arg2="true"/>
- </condition>
- </target>
-
- <target name="get-deps"
- depends="test-offline"
- description="Download all dependencies"
- unless="maven.mode.offline">
- <!-- removed -->
- </target>
-
-</project>
diff --git a/dev-java/jnr-ffi/jnr-ffi-2.0.2-r1.ebuild b/dev-java/jnr-ffi/jnr-ffi-2.0.2-r1.ebuild
deleted file mode 100644
index 2c4a9a83197d..000000000000
--- a/dev-java/jnr-ffi/jnr-ffi-2.0.2-r1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="An abstracted interface to invoking native functions from java"
-HOMEPAGE="https://github.com/jnr/jnr-ffi"
-SRC_URI="https://github.com/jnr/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="|| ( Apache-2.0 LGPL-3 )"
-SLOT="2"
-KEYWORDS="~arm ppc64"
-
-# Fixing https://bugs.gentoo.org/736830 would cost too much time.
-RESTRICT="test"
-
-COMMON_DEP="
- ~dev-java/jffi-1.2.9:1.2
- dev-java/jnr-x86asm:1.0
- dev-java/asm:4"
-
-RDEPEND="${COMMON_DEP}
- >=virtual/jre-1.8:*"
-
-DEPEND="${COMMON_DEP}
- >=virtual/jdk-1.8:*
- test? (
- dev-java/ant-junit:0
- >=dev-java/junit-4.8:4
- )"
-
-src_prepare() {
- default
- cp "${FILESDIR}"/${PN}_maven-build.xml build.xml || die
- eapply "${FILESDIR}"/${P}-junit48.patch
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-JAVA_ANT_CLASSPATH_TAGS="${JAVA_ANT_CLASSPATH_TAGS} javadoc"
-JAVA_ANT_ENCODING="UTF-8"
-
-EANT_GENTOO_CLASSPATH="asm-4,jffi-1.2,jnr-x86asm-1.0"
-EANT_EXTRA_ARGS="-Dmaven.build.finalName=${PN}"
-
-EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit-4"
-
-src_test() {
- # build native test library
- emake BUILD_DIR=build -f libtest/GNUmakefile
-
- _JAVA_OPTIONS="-Djnr.ffi.library.path=build" \
- java-pkg-2_src_test
-}
-
-src_install() {
- java-pkg_dojar target/${PN}.jar
-
- use doc && java-pkg_dojavadoc target/site/apidocs
- use source && java-pkg_dosrc src/main/java/*
-}
diff --git a/dev-java/jnr-ffi/jnr-ffi-2.2.12.ebuild b/dev-java/jnr-ffi/jnr-ffi-2.2.12.ebuild
index aec229af6305..7020f2331029 100644
--- a/dev-java/jnr-ffi/jnr-ffi-2.2.12.ebuild
+++ b/dev-java/jnr-ffi/jnr-ffi-2.2.12.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/jnr/${PN}/archive/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="2"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
CP_DEPEND="
dev-java/asm:9
diff --git a/dev-java/jnr-netdb/Manifest b/dev-java/jnr-netdb/Manifest
index 9ac877e87be7..e22f9d59deea 100644
--- a/dev-java/jnr-netdb/Manifest
+++ b/dev-java/jnr-netdb/Manifest
@@ -1,2 +1 @@
-DIST jnr-netdb-1.1.4.tar.gz 648347 BLAKE2B 08953f93fe4a6146dfc77c463e07a8b9f6e784ffc26165d7409a623756733a7598b4d0a3fa55302b5f9b01c870cee3062f310c74e20f6a8a11ff1b41d38a0d7a SHA512 949a744b1d443cde564a2582baf7b4323c721417f32a45fd7413f791823cac5877bef62ed0d3079345631b908a581a1acf83dd00a926f87ebbd8e61d38a20195
DIST jnr-netdb-1.2.0.tar.gz 649059 BLAKE2B 660074d3a0d201784bddb259796ee4bb87a3579d6ffffcb5c3bf171d34e525c768c8c9282d8a99c250282d108011c0cf4bc9b8cf32dc7f3edc7e0a2b1cbaf9d4 SHA512 6eeb21d42b1eb7c0beed4f263c3440c7e5ae15f76365fb189fc8727c824e01d92662564ae641e1233ec0df68f6761c3c31a8a61891de59a524c213959bd32856
diff --git a/dev-java/jnr-netdb/files/jnr-netdb_maven-build.xml b/dev-java/jnr-netdb/files/jnr-netdb_maven-build.xml
deleted file mode 100644
index 9f4dfef15335..000000000000
--- a/dev-java/jnr-netdb/files/jnr-netdb_maven-build.xml
+++ /dev/null
@@ -1,231 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- ====================================================================== -->
-<!-- Ant build file (http://ant.apache.org/) for Ant 1.6.2 or above. -->
-<!-- ====================================================================== -->
-
-<!-- ====================================================================== -->
-<!-- ===================== - DO NOT EDIT THIS FILE! - ===================== -->
-<!-- ====================================================================== -->
-<!-- -->
-<!-- Any modifications will be overwritten. -->
-<!-- -->
-<!-- Generated by Maven Ant Plugin on 5/28/12 5:31 PM -->
-<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/ -->
-<!-- -->
-<!-- ====================================================================== -->
-
-<project name="jnr-netdb-from-maven" default="package" basedir=".">
-
- <!-- ====================================================================== -->
- <!-- Build environment properties -->
- <!-- ====================================================================== -->
-
- <property file="maven-build.properties"/>
-
- <property name="maven.build.finalName" value="jnr-netdb"/>
- <property name="maven.build.dir" value="target"/>
- <property name="maven.build.outputDir" value="${maven.build.dir}/classes"/>
- <property name="maven.build.srcDir.0" value="src/main/java"/>
- <property name="maven.build.resourceDir.0" value="src/main/resources"/>
- <property name="maven.build.testOutputDir" value="${maven.build.dir}/test-classes"/>
- <property name="maven.build.testDir.0" value="src/test/java"/>
- <property name="maven.build.testResourceDir.0" value="src/test/resources"/>
- <property name="maven.test.reports" value="${maven.build.dir}/test-reports"/>
- <property name="maven.reporting.outputDirectory" value="${maven.build.dir}/site"/>
-
- <property name="maven.settings.offline" value="false"/>
- <property name="maven.settings.interactiveMode" value="true"/>
-
- <!-- ====================================================================== -->
- <!-- Defining classpaths -->
- <!-- ====================================================================== -->
-
- <path id="build.classpath">
- </path>
- <path id="build.test.classpath">
- </path>
-
- <!-- ====================================================================== -->
- <!-- Cleaning up target -->
- <!-- ====================================================================== -->
-
- <target name="clean" description="Clean the output directory">
- <delete dir="${maven.build.dir}"/>
- </target>
-
- <!-- ====================================================================== -->
- <!-- Compilation target -->
- <!-- ====================================================================== -->
-
- <target name="compile" depends="get-deps" description="Compile the code">
- <mkdir dir="${maven.build.outputDir}"/>
- <javac destdir="${maven.build.outputDir}"
- nowarn="false"
- debug="true"
- optimize="false"
- deprecation="true"
- target="1.1"
- verbose="false"
- fork="false"
- source="1.3">
- <src>
- <pathelement location="${maven.build.srcDir.0}"/>
- </src>
- <classpath refid="build.classpath"/>
- </javac>
- </target>
-
- <!-- ====================================================================== -->
- <!-- Test-compilation target -->
- <!-- ====================================================================== -->
-
- <target name="compile-tests"
- depends="compile"
- description="Compile the test code"
- unless="maven.test.skip">
- <mkdir dir="${maven.build.testOutputDir}"/>
- <javac destdir="${maven.build.testOutputDir}"
- nowarn="false"
- debug="true"
- optimize="false"
- deprecation="true"
- target="1.1"
- verbose="false"
- fork="false"
- source="1.3">
- <src>
- <pathelement location="${maven.build.testDir.0}"/>
- </src>
- <classpath>
- <path refid="build.test.classpath"/>
- <pathelement location="${maven.build.outputDir}"/>
- </classpath>
- </javac>
- </target>
-
- <!-- ====================================================================== -->
- <!-- Run all tests -->
- <!-- ====================================================================== -->
-
- <target name="test"
- depends="compile-tests, junit-missing"
- unless="junit.skipped"
- description="Run the test cases">
- <mkdir dir="${maven.test.reports}"/>
- <junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir=".">
- <sysproperty key="basedir" value="."/>
- <formatter type="xml"/>
- <formatter type="plain" usefile="false"/>
- <classpath>
- <path refid="build.test.classpath"/>
- <pathelement location="${maven.build.outputDir}"/>
- <pathelement location="${maven.build.testOutputDir}"/>
- </classpath>
- <batchtest todir="${maven.test.reports}" unless="test">
- <fileset dir="${maven.build.testDir.0}">
- <include name="**/Test*.java"/>
- <include name="**/*Test.java"/>
- <include name="**/*TestCase.java"/>
- <exclude name="**/*Abstract*Test.java"/>
- </fileset>
- </batchtest>
- <batchtest todir="${maven.test.reports}" if="test">
- <fileset dir="${maven.build.testDir.0}">
- <include name="**/${test}.java"/>
- <exclude name="**/*Abstract*Test.java"/>
- </fileset>
- </batchtest>
- </junit>
- </target>
-
- <target name="test-junit-present">
- <available classname="junit.framework.Test" property="junit.present"/>
- </target>
-
- <target name="test-junit-status"
- depends="test-junit-present">
- <condition property="junit.missing">
- <and>
- <isfalse value="${junit.present}"/>
- <isfalse value="${maven.test.skip}"/>
- </and>
- </condition>
- <condition property="junit.skipped">
- <or>
- <isfalse value="${junit.present}"/>
- <istrue value="${maven.test.skip}"/>
- </or>
- </condition>
- </target>
-
- <target name="junit-missing"
- depends="test-junit-status"
- if="junit.missing">
- <echo>=================================== WARNING ===================================</echo>
- <echo> JUnit is not present in your $ANT_HOME/lib directory. Tests not executed.</echo>
- <echo>===============================================================================</echo>
- </target>
-
- <!-- ====================================================================== -->
- <!-- Javadoc target -->
- <!-- ====================================================================== -->
-
- <target name="javadoc" description="Generates the Javadoc of the application">
- <javadoc sourcepath="${maven.build.srcDir.0}"
- packagenames="*"
- destdir="${maven.reporting.outputDirectory}/apidocs"
- access="protected"
- old="false"
- verbose="false"
- version="true"
- use="true"
- author="true"
- splitindex="false"
- nodeprecated="false"
- nodeprecatedlist="false"
- notree="false"
- noindex="false"
- nohelp="false"
- nonavbar="false"
- serialwarn="false"
- charset="ISO-8859-1"
- linksource="false"
- breakiterator="false"/>
- </target>
-
- <!-- ====================================================================== -->
- <!-- Package target -->
- <!-- ====================================================================== -->
-
- <target name="package" depends="compile,test" description="Package the application">
- <jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar"
- compress="true"
- index="false"
- basedir="${maven.build.outputDir}"
- excludes="**/package.html"/>
- </target>
-
- <!-- ====================================================================== -->
- <!-- A dummy target for the package named after the type it creates -->
- <!-- ====================================================================== -->
-
- <target name="jar" depends="package" description="Builds the jar for the application"/>
-
- <!-- ====================================================================== -->
- <!-- Download dependencies target -->
- <!-- ====================================================================== -->
-
- <target name="test-offline">
- <condition property="maven.mode.offline">
- <equals arg1="${maven.settings.offline}" arg2="true"/>
- </condition>
- </target>
-
- <target name="get-deps"
- depends="test-offline"
- description="Download all dependencies"
- unless="maven.mode.offline">
- </target>
-
-</project>
diff --git a/dev-java/jnr-netdb/jnr-netdb-1.1.4-r1.ebuild b/dev-java/jnr-netdb/jnr-netdb-1.1.4-r1.ebuild
deleted file mode 100644
index 2a7af0818eb5..000000000000
--- a/dev-java/jnr-netdb/jnr-netdb-1.1.4-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Network services database access for java"
-HOMEPAGE="https://github.com/jnr/jnr-netdb"
-SRC_URI="https://github.com/jnr/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="1.0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-COMMON_DEP="
- dev-java/jnr-ffi:2"
-
-RDEPEND="${COMMON_DEP}
- >=virtual/jre-1.8:*"
-
-DEPEND="${COMMON_DEP}
- >=virtual/jdk-1.8:*
- test? (
- dev-java/ant-junit
- dev-java/junit:4
- )"
-
-src_prepare() {
- default
- find -name '*.jar' -exec rm -v {} + || die
-
- cp "${FILESDIR}"/${PN}_maven-build.xml build.xml || die
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-JAVA_ANT_CLASSPATH_TAGS="${JAVA_ANT_CLASSPATH_TAGS} javadoc"
-JAVA_ANT_ENCODING="UTF-8"
-
-EANT_GENTOO_CLASSPATH="jnr-ffi-2"
-EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit-4"
-
-src_test() {
- java-pkg-2_src_test
-}
-
-src_install() {
- java-pkg_dojar target/${PN}.jar
- dodoc README
-
- use doc && java-pkg_dojavadoc target/site/apidocs
- use source && java-pkg_dosrc src/main/java/*
-}
diff --git a/dev-java/jnr-netdb/jnr-netdb-1.2.0.ebuild b/dev-java/jnr-netdb/jnr-netdb-1.2.0.ebuild
index 03d46d9a7634..23bbacedb948 100644
--- a/dev-java/jnr-netdb/jnr-netdb-1.2.0.ebuild
+++ b/dev-java/jnr-netdb/jnr-netdb-1.2.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/jnr/jnr-netdb/archive/jnr-netdb-${PV}.tar.gz"
LICENSE="Apache-2.0"
SLOT="1.0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
CP_DEPEND="
dev-java/jnr-ffi:2"
diff --git a/dev-java/jnr-posix/Manifest b/dev-java/jnr-posix/Manifest
index 2e180c60d0a4..99cac23713ca 100644
--- a/dev-java/jnr-posix/Manifest
+++ b/dev-java/jnr-posix/Manifest
@@ -1,2 +1 @@
-DIST jnr-posix-3.0.10.tar.gz 85912 BLAKE2B b87ff78ccf10718bd1faf9e308421ba3ab5e90dee5e244fb1b7f53592da8ad98973cc50e6469bcea59e1202ee82b3f77522eb95e23584ff70cc66099ef1c4266 SHA512 a282c164b0b9ace8aba508a48d08d53beb0ddcd4baf5389412941a1e1430d75df9bdd35935a6982d4bb1910c0fdad55910ba028b1b5388c55e19a6c4ed2ba6a1
DIST jnr-posix-3.1.15.tar.gz 120573 BLAKE2B 8035308440e444876d8d955ec3dd0b9d41f770436b53f964795a183ed7bd676dda8787c37425c488af2aa0accc948b86d1773e7e97ee5bcdaf209383dfda24a6 SHA512 6c8cd6d43c509ef7c16901d02983b823464b3437019233021398b2a9dfc85923db87c585e2f8248f080447a990e308feff25bbbf2a7261019dcae66c22e14a91
diff --git a/dev-java/jnr-posix/files/jnr-posix-3.1.15-FileTest.patch b/dev-java/jnr-posix/files/jnr-posix-3.1.15-FileTest.patch
index eba2a6fc450a..a186087c626d 100644
--- a/dev-java/jnr-posix/files/jnr-posix-3.1.15-FileTest.patch
+++ b/dev-java/jnr-posix/files/jnr-posix-3.1.15-FileTest.patch
@@ -1,15 +1,5 @@
-diff --git a/src/test/java/jnr/posix/FileTest.java b/src/test/java/jnr/posix/FileTest.java
-index afadb07..7eb8af7 100644
--- a/src/test/java/jnr/posix/FileTest.java
+++ b/src/test/java/jnr/posix/FileTest.java
-@@ -8,6 +8,7 @@ import jnr.ffi.Pointer;
- import jnr.posix.util.Platform;
- import org.junit.BeforeClass;
- import org.junit.Test;
-+import org.junit.Ignore;
-
- import java.io.*;
- import java.nio.ByteBuffer;
@@ -215,7 +216,7 @@ public class FileTest {
dir.delete();
}
diff --git a/dev-java/jnr-posix/files/jnr-posix_maven-build.xml b/dev-java/jnr-posix/files/jnr-posix_maven-build.xml
deleted file mode 100644
index 82260e156394..000000000000
--- a/dev-java/jnr-posix/files/jnr-posix_maven-build.xml
+++ /dev/null
@@ -1,256 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- ====================================================================== -->
-<!-- Ant build file (http://ant.apache.org/) for Ant 1.6.2 or above. -->
-<!-- ====================================================================== -->
-
-<!-- ====================================================================== -->
-<!-- ===================== - DO NOT EDIT THIS FILE! - ===================== -->
-<!-- ====================================================================== -->
-<!-- -->
-<!-- Any modifications will be overwritten. -->
-<!-- -->
-<!-- Generated by Maven Ant Plugin on 1/9/12 10:58 AM -->
-<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/ -->
-<!-- -->
-<!-- ====================================================================== -->
-
-<project name="jnr-posix-from-maven" default="package" basedir=".">
-
- <!-- ====================================================================== -->
- <!-- Build environment properties -->
- <!-- ====================================================================== -->
-
- <property file="${user.home}/.m2/maven.properties"/>
- <property file="maven-build.properties"/>
-
- <property name="maven.build.finalName" value="jnr-posix-2.0"/>
- <property name="maven.build.dir" value="target"/>
- <property name="maven.build.outputDir" value="${maven.build.dir}/classes"/>
- <property name="maven.build.srcDir.0" value="src/main/java"/>
- <property name="maven.build.resourceDir.0" value="src/main/resources"/>
- <property name="maven.build.testOutputDir" value="${maven.build.dir}/test-classes"/>
- <property name="maven.build.testDir.0" value="src/test/java"/>
- <property name="maven.build.testResourceDir.0" value="src/test/resources"/>
- <property name="maven.test.reports" value="${maven.build.dir}/test-reports"/>
- <property name="maven.reporting.outputDirectory" value="${maven.build.dir}/site"/>
-
- <property name="maven.repo.local" value="${user.home}/.m2/repository"/>
- <property name="maven.settings.offline" value="false"/>
- <property name="maven.settings.interactiveMode" value="true"/>
-
- <!-- ====================================================================== -->
- <!-- Defining classpaths -->
- <!-- ====================================================================== -->
-
- <path id="build.classpath">
- <pathelement location="${maven.repo.local}/com/github/jnr/jnr-ffi/0.6.0/jnr-ffi-0.6.0.jar"/>
- <pathelement location="${maven.repo.local}/com/github/jnr/jffi/1.0.11/jffi-1.0.11.jar"/>
- <pathelement location="${maven.repo.local}/com/github/jnr/jffi/1.0.11/jffi-1.0.11-native.jar"/>
- <pathelement location="${maven.repo.local}/asm/asm/3.2/asm-3.2.jar"/>
- <pathelement location="${maven.repo.local}/asm/asm-commons/3.2/asm-commons-3.2.jar"/>
- <pathelement location="${maven.repo.local}/asm/asm-analysis/3.2/asm-analysis-3.2.jar"/>
- <pathelement location="${maven.repo.local}/asm/asm-tree/3.2/asm-tree-3.2.jar"/>
- <pathelement location="${maven.repo.local}/asm/asm-util/3.2/asm-util-3.2.jar"/>
- <pathelement location="${maven.repo.local}/com/github/jnr/jnr-x86asm/1.0.1/jnr-x86asm-1.0.1.jar"/>
- <pathelement location="${maven.repo.local}/com/github/jnr/jnr-constants/0.8.2/jnr-constants-0.8.2.jar"/>
- </path>
- <path id="build.test.classpath">
- <pathelement location="${maven.repo.local}/junit/junit/4.8.2/junit-4.8.2.jar"/>
- <pathelement location="${maven.repo.local}/com/github/jnr/jnr-ffi/0.6.0/jnr-ffi-0.6.0.jar"/>
- <pathelement location="${maven.repo.local}/com/github/jnr/jffi/1.0.11/jffi-1.0.11.jar"/>
- <pathelement location="${maven.repo.local}/com/github/jnr/jffi/1.0.11/jffi-1.0.11-native.jar"/>
- <pathelement location="${maven.repo.local}/asm/asm/3.2/asm-3.2.jar"/>
- <pathelement location="${maven.repo.local}/asm/asm-commons/3.2/asm-commons-3.2.jar"/>
- <pathelement location="${maven.repo.local}/asm/asm-analysis/3.2/asm-analysis-3.2.jar"/>
- <pathelement location="${maven.repo.local}/asm/asm-tree/3.2/asm-tree-3.2.jar"/>
- <pathelement location="${maven.repo.local}/asm/asm-util/3.2/asm-util-3.2.jar"/>
- <pathelement location="${maven.repo.local}/com/github/jnr/jnr-x86asm/1.0.1/jnr-x86asm-1.0.1.jar"/>
- <pathelement location="${maven.repo.local}/com/github/jnr/jnr-constants/0.8.2/jnr-constants-0.8.2.jar"/>
- </path>
-
- <!-- ====================================================================== -->
- <!-- Cleaning up target -->
- <!-- ====================================================================== -->
-
- <target name="clean" description="Clean the output directory">
- <delete dir="${maven.build.dir}"/>
- </target>
-
- <!-- ====================================================================== -->
- <!-- Compilation target -->
- <!-- ====================================================================== -->
-
- <target name="compile" depends="get-deps" description="Compile the code">
- <mkdir dir="${maven.build.outputDir}"/>
- <javac destdir="${maven.build.outputDir}"
- nowarn="false"
- debug="true"
- optimize="false"
- deprecation="true"
- target="1.1"
- verbose="false"
- fork="false"
- source="1.3">
- <src>
- <pathelement location="${maven.build.srcDir.0}"/>
- </src>
- <classpath refid="build.classpath"/>
- </javac>
- </target>
-
- <!-- ====================================================================== -->
- <!-- Test-compilation target -->
- <!-- ====================================================================== -->
-
- <target name="compile-tests"
- depends="compile"
- description="Compile the test code"
- unless="maven.test.skip">
- <mkdir dir="${maven.build.testOutputDir}"/>
- <javac destdir="${maven.build.testOutputDir}"
- nowarn="false"
- debug="true"
- optimize="false"
- deprecation="true"
- target="1.1"
- verbose="false"
- fork="false"
- source="1.3">
- <src>
- <pathelement location="${maven.build.testDir.0}"/>
- </src>
- <classpath>
- <path refid="build.test.classpath"/>
- <pathelement location="${maven.build.outputDir}"/>
- </classpath>
- </javac>
- </target>
-
- <!-- ====================================================================== -->
- <!-- Run all tests -->
- <!-- ====================================================================== -->
-
- <target name="test"
- depends="compile-tests, junit-missing"
- unless="junit.skipped"
- description="Run the test cases">
- <mkdir dir="${maven.test.reports}"/>
- <junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir=".">
- <sysproperty key="basedir" value="."/>
- <formatter type="xml"/>
- <formatter type="plain" usefile="false"/>
- <classpath>
- <path refid="build.test.classpath"/>
- <pathelement location="${maven.build.outputDir}"/>
- <pathelement location="${maven.build.testOutputDir}"/>
- </classpath>
- <batchtest todir="${maven.test.reports}" unless="test">
- <fileset dir="${maven.build.testDir.0}">
- <include name="**/Test*.java"/>
- <include name="**/*Test.java"/>
- <include name="**/*TestCase.java"/>
- <exclude name="**/*Abstract*Test.java"/>
- </fileset>
- </batchtest>
- <batchtest todir="${maven.test.reports}" if="test">
- <fileset dir="${maven.build.testDir.0}">
- <include name="**/${test}.java"/>
- <exclude name="**/*Abstract*Test.java"/>
- </fileset>
- </batchtest>
- </junit>
- </target>
-
- <target name="test-junit-present">
- <available classname="junit.framework.Test" property="junit.present"/>
- </target>
-
- <target name="test-junit-status"
- depends="test-junit-present">
- <condition property="junit.missing">
- <and>
- <isfalse value="${junit.present}"/>
- <isfalse value="${maven.test.skip}"/>
- </and>
- </condition>
- <condition property="junit.skipped">
- <or>
- <isfalse value="${junit.present}"/>
- <istrue value="${maven.test.skip}"/>
- </or>
- </condition>
- </target>
-
- <target name="junit-missing"
- depends="test-junit-status"
- if="junit.missing">
- <echo>=================================== WARNING ===================================</echo>
- <echo> JUnit is not present in your $ANT_HOME/lib directory. Tests not executed.</echo>
- <echo>===============================================================================</echo>
- </target>
-
- <!-- ====================================================================== -->
- <!-- Javadoc target -->
- <!-- ====================================================================== -->
-
- <target name="javadoc" description="Generates the Javadoc of the application">
- <javadoc sourcepath="${maven.build.srcDir.0}"
- packagenames="*"
- destdir="${maven.reporting.outputDirectory}/apidocs"
- access="protected"
- old="false"
- verbose="false"
- version="true"
- use="true"
- author="true"
- splitindex="false"
- nodeprecated="false"
- nodeprecatedlist="false"
- notree="false"
- noindex="false"
- nohelp="false"
- nonavbar="false"
- serialwarn="false"
- charset="ISO-8859-1"
- linksource="false"
- breakiterator="false"/>
- </target>
-
- <!-- ====================================================================== -->
- <!-- Package target -->
- <!-- ====================================================================== -->
-
- <target name="package" depends="compile,test" description="Package the application">
- <jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar"
- compress="true"
- index="false"
- manifest="MANIFEST.MF"
- basedir="${maven.build.outputDir}"
- excludes="**/package.html"/>
- </target>
-
- <!-- ====================================================================== -->
- <!-- A dummy target for the package named after the type it creates -->
- <!-- ====================================================================== -->
-
- <target name="jar" depends="package" description="Builds the jar for the application"/>
-
- <!-- ====================================================================== -->
- <!-- Download dependencies target -->
- <!-- ====================================================================== -->
-
- <target name="test-offline">
- <condition property="maven.mode.offline">
- <equals arg1="${maven.settings.offline}" arg2="true"/>
- </condition>
- </target>
-
- <target name="get-deps"
- depends="test-offline"
- description="Download all dependencies"
- unless="maven.mode.offline">
- <!-- removed -->
- </target>
-
-</project>
diff --git a/dev-java/jnr-posix/jnr-posix-3.0.10-r1.ebuild b/dev-java/jnr-posix/jnr-posix-3.0.10-r1.ebuild
deleted file mode 100644
index 8e1f57eabfc9..000000000000
--- a/dev-java/jnr-posix/jnr-posix-3.0.10-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source test"
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-JAVA_ANT_CLASSPATH_TAGS="${JAVA_ANT_CLASSPATH_TAGS} javadoc"
-JAVA_ANT_ENCODING="UTF-8"
-
-EANT_EXTRA_ARGS="-Dmaven.build.finalName=${PN}"
-EANT_GENTOO_CLASSPATH="jnr-constants,jnr-ffi-2"
-EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit-4"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Lightweight cross-platform POSIX emulation layer for Java"
-HOMEPAGE="https://github.com/jnr/jnr-posix"
-SRC_URI="https://github.com/jnr/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="|| ( CPL-1.0 GPL-2 LGPL-2.1 )"
-SLOT="3.0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris"
-
-CDEPEND="dev-java/jnr-constants:0
- dev-java/jnr-ffi:2"
-
-RDEPEND="${CDEPEND}
- >=virtual/jre-1.8:*"
-
-DEPEND="${CDEPEND}
- >=virtual/jdk-1.8:*
- test? (
- dev-java/ant-junit4:0
- dev-java/junit:4
- )"
-
-src_prepare() {
- default
-
- cp "${FILESDIR}"/${PN}_maven-build.xml build.xml || die
-}
-
-src_test() {
- ANT_TASKS="ant-junit4" eant test -DJunit.present=true
-}
-
-src_install() {
- java-pkg_dojar target/${PN}.jar
- dodoc README.txt
-
- use doc && java-pkg_dojavadoc target/site/apidocs
- use source && java-pkg_dosrc src/main/java/*
-}
diff --git a/dev-java/jnr-posix/jnr-posix-3.1.15.ebuild b/dev-java/jnr-posix/jnr-posix-3.1.15.ebuild
index 3f90b95f3507..0fd709bffe6a 100644
--- a/dev-java/jnr-posix/jnr-posix-3.1.15.ebuild
+++ b/dev-java/jnr-posix/jnr-posix-3.1.15.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/jnr/${PN}/archive/${P}.tar.gz"
LICENSE="EPL-2.0 GPL-2 LGPL-2.1"
SLOT="3.0"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
CP_DEPEND="
>=dev-java/jnr-ffi-2.2.12:2
@@ -39,6 +39,43 @@ JAVA_TEST_GENTOO_CLASSPATH="junit-4"
JAVA_TEST_SRC_DIR="src/test/java"
src_test() {
+ sed \
+ -e '/import org.junit.Test/a import org.junit.Ignore;' \
+ -i src/test/java/jnr/posix/FileTest.java || die
+
+ if use ppc64; then
+ # Ignore testMessageHdrMultipleControl
+ # https://bugs.gentoo.org/866199
+ # https://github.com/jnr/jnr-posix/issues/178
+ sed \
+ -e '/testMessageHdrMultipleControl/i @Ignore' \
+ -e '/import org.junit.Test/a import org.junit.Ignore;' \
+ -i src/test/java/jnr/posix/LinuxPOSIXTest.java || die
+ fi
+
+ if use arm; then
+ # https://bugs.gentoo.org/866692
+ sed \
+ -e '/utimensatRelativePath()/i @Ignore' \
+ -e '/utimesDefaultValuesTest()/i @Ignore' \
+ -e '/futimeTest()/i @Ignore' \
+ -e '/utimesTest()/i @Ignore' \
+ -e '/utimesPointerTest()/i @Ignore' \
+ -e '/utimensatAbsolutePath()/i @Ignore' \
+ -e '/futimens()/i @Ignore' \
+ -i src/test/java/jnr/posix/FileTest.java || die
+ sed \
+ -e '/import org.junit.Test/a import org.junit.Ignore;' \
+ -e '/ioprioThreadedTest()/i @Ignore' \
+ -e '/testPosixFadvise()/i @Ignore' \
+ -i src/test/java/jnr/posix/LinuxPOSIXTest.java || die
+ sed \
+ -e '/import org.junit.Test/a import org.junit.Ignore;' \
+ -e '/testSetRlimitPointerLinux()/i @Ignore' \
+ -e '/testGetRLimitPointer()/i @Ignore' \
+ -i src/test/java/jnr/posix/ProcessTest.java || die
+ fi
+
JAVA_TEST_EXCLUDES=(
# https://github.com/jnr/jnr-posix/blob/jnr-posix-3.1.15/pom.xml#L185
# <exclude>**/windows/*Test.java</exclude>
diff --git a/dev-java/joda-convert/joda-convert-2.2.2-r1.ebuild b/dev-java/joda-convert/joda-convert-2.2.2-r1.ebuild
deleted file mode 100644
index df8f686daa93..000000000000
--- a/dev-java/joda-convert/joda-convert-2.2.2-r1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/JodaOrg/joda-convert/archive/refs/tags/v2.2.2.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild joda-convert-2.2.2.ebuild
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.joda:joda-convert:2.2.2"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Library to convert Objects to and from String"
-HOMEPAGE="https://www.joda.org/joda-convert/"
-SRC_URI="https://github.com/JodaOrg/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-# Compile dependencies
-# POM: pom.xml
-# test? com.google.guava:guava:31.0.1-jre -> !!!suitable-mavenVersion-not-found!!!
-# test? junit:junit:4.13.2 -> >=dev-java/junit-4.13.2:4
-
-DEPEND="
- >=virtual/jdk-1.8:*
- test? (
- dev-java/guava:0
- )
-"
-
-RDEPEND="
- >=virtual/jre-1.8:*
-"
-
-DOCS=( {LICENSE,NOTICE,RELEASE-NOTES}.txt README.md )
-
-S="${WORKDIR}/${P}"
-
-JAVA_SRC_DIR="src/main/java"
-# JAVA_RESOURCE_DIRS=""
-
-JAVA_TEST_GENTOO_CLASSPATH="guava,junit-4"
-JAVA_TEST_SRC_DIR="src/test/java"
-JAVA_TEST_RESOURCE_DIRS="src/test/resources"
-
-JAVA_TEST_EXCLUDES=(
- # Upstream: Tests run: 186, Failures: 0, Errors: 0, Skipped: 0
- # All following: No runnable methods
- org.joda.convert.test1.Test1Class
- org.joda.convert.test1.Test1Interface
- org.joda.convert.test2.Test2Class
- org.joda.convert.test2.Test2Factory
- org.joda.convert.test2.Test2Interface
- org.joda.convert.test3.Test3Class
- org.joda.convert.test3.Test3Factory
- org.joda.convert.test3.Test3Interface
- org.joda.convert.test3.Test3SuperClass
- org.joda.convert.test4.Test4Class
- org.joda.convert.test4.Test4Factory
- org.joda.convert.test4.Test4Interface
- org.joda.convert.TestRenameHandlerBadInit
-)
-
-src_install() {
- default # https://bugs.gentoo.org/789582
- java-pkg-simple_src_install
-}
diff --git a/dev-java/joda-convert/joda-convert-2.2.2-r2.ebuild b/dev-java/joda-convert/joda-convert-2.2.2-r2.ebuild
index 6c9ea47fa60a..ead8e8b640ec 100644
--- a/dev-java/joda-convert/joda-convert-2.2.2-r2.ebuild
+++ b/dev-java/joda-convert/joda-convert-2.2.2-r2.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/JodaOrg/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
# Compile dependencies
# POM: pom.xml
diff --git a/dev-java/joda-time/Manifest b/dev-java/joda-time/Manifest
index ca62ba31e7a1..9acad90f89bc 100644
--- a/dev-java/joda-time/Manifest
+++ b/dev-java/joda-time/Manifest
@@ -1,2 +1 @@
-DIST joda-time-2.10.10.tar.gz 1052384 BLAKE2B 656efddf6b98f10ce6729c6fa4c76ddfeb86dd94971c2637af3ddcb8a3a47f83948dbd58b04a6249445ef2857c5c5edb994a6d56349ed4ff4130ce9aaebd57e9 SHA512 e7917fd28cd10d7fbee02016b1f13a15a80af099b952cc0e8978bfc7fa389109553804670492c206f2b49bcf910ea093fc1838cb45ce4b7a3a885aac2aaf5943
-DIST joda-time-2.10.14.tar.gz 1055876 BLAKE2B c70ad0724ad5e6d6f6a158ed05eb9711095cd353bf72a43a3edaa8ce36db1f92e0c18cd2e2b73c34e4126962d0ef97bf83844f9de924df8aadce7d38ffdb7975 SHA512 061c341c35f5187422fe402500384f5933c1eb0c77963f65b5295b8f9b479adf29f944269173d9a93e4a288c583777b21f085afe4c5da6c695f14801636f0fc1
+DIST joda-time-2.11.2.tar.gz 1055885 BLAKE2B 52281dcb530734dd33d0c01b07c9fbc5e7afd507a97e6926f7ef442dc91907d999d126289bc609e6fabf6af4267e47e5a79452d462a3f0561c405e6cd7f5976f SHA512 ea43deea4ef751fc631c35589adec0c5d9d0a5c836c1a24ada5d994cb9310a55b5af69260afd2647516c64fc84b892a2e25fca4bb38e852982c40f7caa5858b3
diff --git a/dev-java/joda-time/files/joda-time-2.11.0-test.patch b/dev-java/joda-time/files/joda-time-2.11.0-test.patch
new file mode 100644
index 000000000000..a74cd01edfbc
--- /dev/null
+++ b/dev-java/joda-time/files/joda-time-2.11.0-test.patch
@@ -0,0 +1,14 @@
+--- a/src/test/java/org/joda/time/TestDateTimeZone.java
++++ b/src/test/java/org/joda/time/TestDateTimeZone.java
+@@ -778,9 +778,10 @@ public class TestDateTimeZone extends TestCase {
+ static final boolean JDK9;
+ static {
+ boolean jdk9 = true;
++ System.out.println("java.version = " + System.getProperty("java.version") );
+ try {
+ String str = System.getProperty("java.version");
+- jdk9 = str.startsWith("9");
++ jdk9 = str.startsWith("11");
+ } catch (Exception ex) {
+ jdk9 = false;
+ }
diff --git a/dev-java/joda-time/joda-time-2.10.10-r1.ebuild b/dev-java/joda-time/joda-time-2.10.10-r1.ebuild
deleted file mode 100644
index 408ed0ec0688..000000000000
--- a/dev-java/joda-time/joda-time-2.10.10-r1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom joda-time-2.10.10/pom.xml --download-uri https://github.com/JodaOrg/joda-time/archive/refs/tags/v2.10.10.tar.gz --slot 0 --keywords "~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris" --ebuild joda-time-2.10.10.ebuild
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="joda-time:joda-time:2.10.10"
-JAVA_TESTING_FRAMEWORKS="junit"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Date and time library to replace JDK date handling"
-HOMEPAGE="https://www.joda.org/joda-time/"
-SRC_URI="https://github.com/JodaOrg/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
-
-# Common dependencies
-# POM: ${P}/pom.xml
-# org.joda:joda-convert:1.9.2 -> >=dev-java/joda-convert-2.2.1:0
-
-CDEPEND="
- dev-java/joda-convert:0
-"
-
-DEPEND="
- >=virtual/jdk-1.8:*
- ${CDEPEND}
-"
-
-RDEPEND="
- >=virtual/jre-1.8:*
- ${CDEPEND}"
-
-S="${WORKDIR}"
-
-JAVA_GENTOO_CLASSPATH="joda-convert"
-JAVA_SRC_DIR="${P}/src/main/java"
-JAVA_RESOURCE_DIRS=(
- "${P}/src/main/java"
-)
-
-JAVA_TEST_GENTOO_CLASSPATH="junit"
-JAVA_TEST_SRC_DIR="${P}/src/test/java"
-JAVA_TEST_RESOURCE_DIRS=(
- "${P}/src/test/resources"
-)
-
-src_compile() {
- java-pkg-simple_src_compile
-
- # Generate the missing "org/joda/time/tz/data/ZoneInfoMap"
- # Arguments from https://github.com/JodaOrg/joda-time/blob/v2.10.10/pom.xml#L413-L427
- "$(java-config -J)" \
- -cp ${PN}.jar \
- org.joda.time.tz.ZoneInfoCompiler \
- -src "${JAVA_SRC_DIR}/org/joda/time/tz/src" \
- -dst "${P}/src/main/resources/org/joda/time/tz/data" \
- africa \
- antarctica \
- asia \
- australasia \
- europe \
- northamerica \
- southamerica \
- etcetera \
- backward
-
- java-pkg_addres ${PN}.jar "${P}"/src/main/resources || die
-}
diff --git a/dev-java/joda-time/joda-time-2.10.14.ebuild b/dev-java/joda-time/joda-time-2.11.2.ebuild
index 23de2c024ab5..5141590c79a3 100644
--- a/dev-java/joda-time/joda-time-2.10.14.ebuild
+++ b/dev-java/joda-time/joda-time-2.11.2.ebuild
@@ -2,15 +2,15 @@
# Distributed under the terms of the GNU General Public License v2
# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/JodaOrg/joda-time/archive/v2.10.14.tar.gz --slot 0 --keywords "~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris" --ebuild joda-time-2.10.14.ebuild
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/JodaOrg/joda-time/archive/v2.11..tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris" --ebuild joda-time-2.11..ebuild
EAPI=8
JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="joda-time:joda-time:2.10.1r40"
+MAVEN_ID="joda-time:joda-time:2.11.2"
JAVA_TESTING_FRAMEWORKS="junit"
-inherit java-pkg-2 java-pkg-simple
+inherit edo java-pkg-2 java-pkg-simple
DESCRIPTION="Date and time library to replace JDK date handling"
HOMEPAGE="https://www.joda.org/joda-time/"
@@ -18,34 +18,38 @@ SRC_URI="https://github.com/JodaOrg/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
# Common dependencies
-# POM: ${P}/pom.xml
-# org.joda:joda-convert:1.9.2 -> >=dev-java/joda-convert-2.2.1:0
+# POM: pom.xml
+# org.joda:joda-convert:1.9.2 -> >=dev-java/joda-convert-2.2.2:0
-CP_DEPEND="
- >=dev-java/joda-convert-2.2.2-r2:0
-"
+CP_DEPEND="dev-java/joda-convert:0"
-DEPEND="
- >=virtual/jdk-1.8:*
- ${CP_DEPEND}
-"
+DEPEND=">=virtual/jdk-1.8:*
+ ${CP_DEPEND}"
-RDEPEND="
- >=virtual/jre-1.8:*
+RDEPEND=">=virtual/jre-1.8:*
${CP_DEPEND}"
+PATCHES=(
+ # Enable tests for jdk-11 in
+ # src/test/java/org/joda/time/TestDateTimeZone.java
+ "${FILESDIR}/joda-time-2.11.0-test.patch"
+)
+
+DOCS=( NOTICE.txt README.md RELEASE-NOTES.txt )
+
S="${WORKDIR}/${P}"
-JAVA_SRC_DIR="src/main/java"
-JAVA_RESOURCE_DIRS="src/main/res"
JAVA_AUTOMATIC_MODULE_NAME="org.joda.time"
+JAVA_RESOURCE_DIRS="src/main/res"
+JAVA_SRC_DIR="src/main/java"
JAVA_TEST_GENTOO_CLASSPATH="junit"
-JAVA_TEST_SRC_DIR="src/test/java"
JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+JAVA_TEST_RUN_ONLY="org.joda.time.TestAllPackages"
+JAVA_TEST_SRC_DIR="src/test/java"
src_prepare() {
default
@@ -60,11 +64,11 @@ src_compile() {
# Generate the missing "org/joda/time/tz/data/ZoneInfoMap"
# Arguments from https://github.com/JodaOrg/joda-time/blob/v2.10.10/pom.xml#L413-L427
- "$(java-config -J)" \
+ edo "$(java-config -J)" \
-cp ${PN}.jar \
org.joda.time.tz.ZoneInfoCompiler \
-src "${JAVA_SRC_DIR}/org/joda/time/tz/src" \
- -dst "src/main/res/org/joda/time/tz/data" \
+ -dst "${P}/src/main/resources/org/joda/time/tz/data" \
africa \
antarctica \
asia \
@@ -75,6 +79,17 @@ src_compile() {
etcetera \
backward
- # add org/joda/time/tz to the jar file
- jar -uf joda-time.jar -C src/main/res org/joda/time/tz/data || die
+ java-pkg_addres ${PN}.jar "${P}"/src/main/resources
+}
+
+src_test() {
+ # There are test failures in
+ # src/test/java/org/joda/time/TestDateTimeZone.java
+ # with jdk higher than 11
+ local vm_version="$(java-config -g PROVIDES_VERSION)"
+ if ver_test "${vm_version}" -le 11 ; then
+ java-pkg-simple_src_test
+ else
+ einfo "Tests restricted to <=jdk-11"
+ fi
}
diff --git a/dev-java/jtds/metadata.xml b/dev-java/jtds/metadata.xml
index 7b2a6acb973a..bb04112b5b30 100644
--- a/dev-java/jtds/metadata.xml
+++ b/dev-java/jtds/metadata.xml
@@ -6,14 +6,14 @@
<name>Java</name>
</maintainer>
<longdescription>
-jTDS is an open source 100% pure Java (type 4) JDBC 3.0 driver for Microsoft SQL
-Server (6.5, 7, 2000 and 2005) and Sybase (10, 11, 12). jTDS is based on the
-work of the FreeTDS project and is currently the fastest complete JDBC driver
-for SQL Server and Sybase. Starting with release 0.9 jTDS is 100% JDBC 3.0
-compatible, supporting forward-only and scrollable/updateable ResultSets,
-multiple concurrent (completely independent) Statements per Connection and
-implementing all the DatabaseMetaData and ResultSetMetaData methods.
-</longdescription>
+ jTDS is an open source 100% pure Java (type 4) JDBC 3.0 driver for Microsoft SQL
+ Server (6.5, 7, 2000 and 2005) and Sybase (10, 11, 12). jTDS is based on the
+ work of the FreeTDS project and is currently the fastest complete JDBC driver
+ for SQL Server and Sybase. Starting with release 0.9 jTDS is 100% JDBC 3.0
+ compatible, supporting forward-only and scrollable/updateable ResultSets,
+ multiple concurrent (completely independent) Statements per Connection and
+ implementing all the DatabaseMetaData and ResultSetMetaData methods.
+ </longdescription>
<upstream>
<remote-id type="sourceforge">jtds</remote-id>
</upstream>
diff --git a/dev-java/jul-to-slf4j/Manifest b/dev-java/jul-to-slf4j/Manifest
new file mode 100644
index 000000000000..502a0b5b52a6
--- /dev/null
+++ b/dev-java/jul-to-slf4j/Manifest
@@ -0,0 +1 @@
+DIST slf4j-2.0.3.tar.gz 1435478 BLAKE2B fec1a47882d3bbf508f4faed9cbf9448a23e9749c6c41f241c7e80654e0ce55211cec9228fcf0e666c997a4f24c5b96ad57dc076910e7f05704b02d0cf7db709 SHA512 0fb295f7942c2af8aebe2ecf544ef8326b8cc88de397ee6b37a10249b38150a506f62dcec614eee13519a299b30c6d2481dec3ea235d4b3e6a5241d12639bca6
diff --git a/dev-java/jul-to-slf4j/jul-to-slf4j-2.0.3.ebuild b/dev-java/jul-to-slf4j/jul-to-slf4j-2.0.3.ebuild
new file mode 100644
index 000000000000..cf9d0c136c29
--- /dev/null
+++ b/dev-java/jul-to-slf4j/jul-to-slf4j-2.0.3.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/qos-ch/slf4j/archive/v_2.0.3.tar.gz --slot 0 --keywords "~amd64" --ebuild jul-to-slf4j-2.0.3.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.slf4j:jul-to-slf4j:2.0.3"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="JUL to SLF4J bridge"
+HOMEPAGE="https://www.slf4j.org"
+SRC_URI="https://github.com/qos-ch/slf4j/archive/v_${PV}.tar.gz -> slf4j-${PV}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
+
+# Common dependencies
+# POM: pom.xml
+# org.slf4j:slf4j-api:2.0.3 -> >=dev-java/slf4j-api-2.0.3:0
+
+CP_DEPEND="~dev-java/slf4j-api-${PV}:0"
+
+# Compile dependencies
+# POM: pom.xml
+# test? junit:junit:4.13.1 -> >=dev-java/junit-4.13.2:4
+# test? org.slf4j:slf4j-reload4j:2.0.3 -> >=dev-java/slf4j-reload4j-2.0.3:0
+
+DEPEND="
+ >=virtual/jdk-1.8:*
+ ${CP_DEPEND}
+ test? (
+ ~dev-java/slf4j-reload4j-${PV}:0
+ )
+"
+
+RDEPEND="
+ >=virtual/jre-1.8:*
+ ${CP_DEPEND}"
+
+DOCS=( ../{README,SECURITY}.md )
+
+S="${WORKDIR}/slf4j-v_${PV}/${PN}"
+
+JAVA_RESOURCE_DIRS="src/main/resources"
+JAVA_SRC_DIR="src/main/java"
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4,slf4j-reload4j"
+JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+JAVA_TEST_SRC_DIR="src/test/java"
diff --git a/dev-java/jul-to-slf4j/metadata.xml b/dev-java/jul-to-slf4j/metadata.xml
new file mode 100644
index 000000000000..14f9229b142a
--- /dev/null
+++ b/dev-java/jul-to-slf4j/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>java@gentoo.org</email>
+ <name>Java</name>
+ </maintainer>
+ <upstream>
+ <doc>https://www.slf4j.org/docs.html</doc>
+ <bugs-to>https://www.slf4j.org/bug-reporting.html</bugs-to>
+ <remote-id type="github">qos-ch/slf4j</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-java/junit-dataprovider/junit-dataprovider-2.9.ebuild b/dev-java/junit-dataprovider/junit-dataprovider-2.9.ebuild
index a4ededc832a5..79576d4265fc 100644
--- a/dev-java/junit-dataprovider/junit-dataprovider-2.9.ebuild
+++ b/dev-java/junit-dataprovider/junit-dataprovider-2.9.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/TNG/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
CP_DEPEND="dev-java/findbugs-annotations:0"
diff --git a/dev-java/junitparams/junitparams-1.1.1.ebuild b/dev-java/junitparams/junitparams-1.1.1-r1.ebuild
index 0f82eeb6b29c..db8ec80d207d 100644
--- a/dev-java/junitparams/junitparams-1.1.1.ebuild
+++ b/dev-java/junitparams/junitparams-1.1.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# Skeleton command:
@@ -24,9 +24,7 @@ KEYWORDS="amd64 ~arm arm64 ppc64 x86"
# POM: pom.xml
# junit:junit:4.12 -> >=dev-java/junit-4.12:4
-CDEPEND="
- >=dev-java/junit-4.12:4
-"
+CP_DEPEND="dev-java/junit:4"
# Compile dependencies
# POM: pom.xml
@@ -34,15 +32,15 @@ CDEPEND="
DEPEND="
>=virtual/jdk-1.8:*
- ${CDEPEND}
+ ${CP_DEPEND}
test? (
- >=dev-java/assertj-core-2.3.0:2
+ dev-java/assertj-core:3
)
"
RDEPEND="
>=virtual/jre-1.8:*
- ${CDEPEND}"
+ ${CP_DEPEND}"
PATCHES=(
"${FILESDIR}"/junitparams-1.1.1-test.patch
@@ -50,10 +48,9 @@ PATCHES=(
S="${WORKDIR}/JUnitParams-JUnitParams-${PV}"
-JAVA_GENTOO_CLASSPATH="junit-4"
JAVA_SRC_DIR="src/main/java"
-JAVA_TEST_GENTOO_CLASSPATH="assertj-core-2"
+JAVA_TEST_GENTOO_CLASSPATH="assertj-core-3"
JAVA_TEST_SRC_DIR="src/test/java"
JAVA_TEST_RESOURCE_DIRS="src/test/resources"
diff --git a/dev-java/jython/jython-2.7.0-r6.ebuild b/dev-java/jython/jython-2.7.0-r7.ebuild
index d2b1a1703775..b05f5ed59d82 100644
--- a/dev-java/jython/jython-2.7.0-r6.ebuild
+++ b/dev-java/jython/jython-2.7.0-r7.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
JAVA_PKG_IUSE="doc source"
MAVEN_ID="org.python:jython:2.7.0"
@@ -25,7 +25,7 @@ CP_DEPEND="dev-java/antlr:3
dev-java/asm:9
dev-java/commons-compress:0
dev-java/guava:0
- dev-java/jffi:1.2
+ dev-java/jffi:1.3
dev-java/jline:2
dev-java/icu4j:70
dev-java/jnr-constants:0
diff --git a/dev-java/log4j-api-java9/Manifest b/dev-java/log4j-api-java9/Manifest
deleted file mode 100644
index c2ad720f37fa..000000000000
--- a/dev-java/log4j-api-java9/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST apache-log4j-2.17.1-src.tar.gz 11602282 BLAKE2B 6e6a69565ee28fc138ddb78258ac30b13a9be3f3baee64c3427b63b059c552d314be3c4a345ea297010d345c4dcb31d154aaea6cd2fc587512c6087c5dfe0745 SHA512 21cdfca54eb0d6af261a5ae89ff98197473d9c0203b0ab530f3aef6c90957bfb95a423983c8a19d7fbab05ec194b6fad8e46628e32270dd8b94ddd194a1cb177
diff --git a/dev-java/log4j-api-java9/log4j-api-java9-2.17.1.ebuild b/dev-java/log4j-api-java9/log4j-api-java9-2.17.1.ebuild
deleted file mode 100644
index 0135b568e04c..000000000000
--- a/dev-java/log4j-api-java9/log4j-api-java9-2.17.1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom log4j-api-java9/pom.xml --download-uri mirror://apache/logging/log4j/2.17.1/apache-log4j-2.17.1-src.tar.gz --slot 2 --keywords "~amd64 ~arm ~arm64" --ebuild log4j-api-java9-2.17.1.ebuild
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.apache.logging.log4j:log4j-api-java9:2.17.1"
-JAVA_TESTING_FRAMEWORKS="junit-jupiter"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="The Apache Log4j API (Java 9)"
-HOMEPAGE="https://logging.apache.org/log4j/2.x/"
-SRC_URI="mirror://apache/logging/log4j/${PV}/apache-log4j-${PV}-src.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="2"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~x86"
-
-# junit-jupiter is not available in ::gentoo
-RESTRICT="test"
-
-# Compile dependencies
-# POM: ${PN}/pom.xml
-# test? org.apache.maven:maven-core:3.6.3 -> !!!groupId-not-found!!!
-# test? org.junit.jupiter:junit-jupiter-engine:5.7.2 -> !!!groupId-not-found!!!
-
-DEPEND=">=virtual/jdk-11:*"
-# test? (
-# !!!groupId-not-found!!!
-# )
-#"
-
-RDEPEND=">=virtual/jre-11:*"
-
-DOCS=( {CONTRIBUTING,README,RELEASE-NOTES,SECURITY}.md LICENSE.txt )
-
-S="${WORKDIR}/apache-log4j-${PV}-src"
-
-JAVA_SRC_DIR="${PN}/src/main/java"
-JAVA_RESOURCE_DIRS="${PN}/src/assembly"
-
-# JAVA_TEST_GENTOO_CLASSPATH="!!!groupId-not-found!!!,!!!groupId-not-found!!!"
-# JAVA_TEST_SRC_DIR="${PN}/src/test/java"
-
-src_install() {
- default # https://bugs.gentoo.org/789582
- java-pkg-simple_src_install
-}
diff --git a/dev-java/log4j-core/log4j-core-2.18.0-r1.ebuild b/dev-java/log4j-core/log4j-core-2.18.0-r1.ebuild
index 139a53d77109..cafb2b256299 100644
--- a/dev-java/log4j-core/log4j-core-2.18.0-r1.ebuild
+++ b/dev-java/log4j-core/log4j-core-2.18.0-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://apache/logging/log4j/${PV}/apache-log4j-${PV}-src.tar.gz"
LICENSE="Apache-2.0"
SLOT="2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
# We don't have junit-vintage and junit-jupiter
RESTRICT="test"
diff --git a/dev-java/log4j-core/log4j-core-2.18.0.ebuild b/dev-java/log4j-core/log4j-core-2.18.0.ebuild
deleted file mode 100644
index 1141696993de..000000000000
--- a/dev-java/log4j-core/log4j-core-2.18.0.ebuild
+++ /dev/null
@@ -1,175 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom log4j-core/pom.xml --download-uri mirror://apache/logging/log4j/2.18.0/apache-log4j-2.18.0-src.tar.gz --slot 2 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild log4j-core-2.18.0.ebuild
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.apache.logging.log4j:log4j-core:2.18.0"
-# JAVA_TESTING_FRAMEWORKS="junit-vintage junit-jupiter"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="The Apache Log4j Implementation"
-HOMEPAGE="https://logging.apache.org/log4j/2.x/"
-SRC_URI="mirror://apache/logging/log4j/${PV}/apache-log4j-${PV}-src.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="2"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-# We don't have junit-vintage and junit-jupiter
-RESTRICT="test"
-
-# Common dependencies
-# POM: ${PN}/pom.xml
-# com.conversantmedia:disruptor:1.2.15 -> >=dev-java/conversant-disruptor-1.2.19:0
-# com.fasterxml.jackson.core:jackson-core:2.13.3 -> >=dev-java/jackson-core-2.13.3:0
-# com.fasterxml.jackson.core:jackson-databind:2.13.3 -> >=dev-java/jackson-databind-2.13.3:0
-# com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.13.3 -> >=dev-java/jackson-dataformat-xml-2.13.3:0
-# com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.13.3 -> >=dev-java/jackson-dataformat-yaml-2.13.3:0
-# com.fasterxml.woodstox:woodstox-core:6.2.8 -> >=dev-java/woodstox-core-6.2.8:0
-# com.lmax:disruptor:3.4.4 -> >=dev-java/lmax-disruptor-3.4.4:0
-# org.apache.commons:commons-compress:1.21 -> >=dev-java/commons-compress-1.21:0
-# org.apache.commons:commons-csv:1.9.0 -> >=dev-java/commons-csv-1.9.0:0
-# org.apache.kafka:kafka-clients:1.1.1 -> >=dev-java/kafka-clients-1.1.1:0
-# org.apache.logging.log4j:log4j-api:2.18.0 -> >=dev-java/log4j-api-2.18.0:2
-# org.fusesource.jansi:jansi:2.4.0 -> >=dev-java/jansi-2.4.0:2
-# org.jctools:jctools-core:3.3.0 -> !!!suitable-mavenVersion-not-found!!!
-# org.slf4j:slf4j-api:1.7.36 -> >=dev-java/slf4j-api-1.7.36:0
-# org.zeromq:jeromq:0.5.2 -> >=dev-java/jeromq-0.5.2:0
-
-CP_DEPEND="
- dev-java/commons-compress:0
- dev-java/commons-csv:0
- dev-java/conversant-disruptor:0
- dev-java/jackson-core:0
- dev-java/jackson-databind:0
- dev-java/jackson-dataformat-xml:0
- dev-java/jackson-dataformat-yaml:0
- dev-java/jansi:2
- dev-java/javax-mail:0
- dev-java/jctools-core:3
- dev-java/jeromq:0
- dev-java/kafka-clients:0
- dev-java/lmax-disruptor:0
- ~dev-java/log4j-api-${PV}:2
- dev-java/slf4j-api:0
- dev-java/woodstox-core:0
-"
-
-# Compile dependencies
-# POM: ${PN}/pom.xml
-# javax.activation:javax.activation-api:1.2.0 -> !!!groupId-not-found!!!
-# javax.jms:javax.jms-api:2.0.1 -> !!!groupId-not-found!!!
-# javax.mail:javax.mail-api:1.6.2 -> !!!groupId-not-found!!!
-# org.osgi:org.osgi.core:6.0.0 -> >=dev-java/osgi-core-8.0.0:0
-# POM: ${PN}/pom.xml
-# test? ch.qos.logback:logback-classic:1.2.11 -> >=dev-java/logback-classic-1.2.11:0
-# test? ch.qos.logback:logback-core:1.2.11 -> >=dev-java/logback-core-1.2.11:0
-# test? com.github.tomakehurst:wiremock:2.26.3 -> !!!groupId-not-found!!!
-# test? com.google.code.java-allocation-instrumenter:java-allocation-instrumenter:3.3.0 -> !!!groupId-not-found!!!
-# test? com.h2database:h2:2.1.214 -> !!!groupId-not-found!!!
-# test? commons-codec:commons-codec:1.15 -> >=dev-java/commons-codec-1.15:0
-# test? commons-io:commons-io:2.11.0 -> >=dev-java/commons-io-2.11.0:1
-# test? commons-logging:commons-logging:1.2 -> >=dev-java/commons-logging-1.2:0
-# test? net.javacrumbs.json-unit:json-unit:2.32.0 -> !!!groupId-not-found!!!
-# test? org.apache-extras.beanshell:bsh:2.0b6 -> >=dev-java/bsh-2.0_beta6:0
-# test? org.apache.activemq:activemq-broker:5.17.1 -> !!!groupId-not-found!!!
-# test? org.apache.commons:commons-lang3:3.12.0 -> >=dev-java/commons-lang-3.12.0:3.6
-# test? org.apache.felix:org.apache.felix.framework:7.0.5 -> !!!groupId-not-found!!!
-# test? org.apache.logging.log4j:log4j-api:2.18.0 -> >=dev-java/log4j-api-2.18.0:2
-# test? org.apache.maven:maven-core:3.8.5 -> !!!groupId-not-found!!!
-# test? org.awaitility:awaitility:4.2.0 -> !!!groupId-not-found!!!
-# test? org.codehaus.groovy:groovy-dateutil:3.0.10 -> !!!groupId-not-found!!!
-# test? org.codehaus.groovy:groovy-jsr223:3.0.10 -> !!!groupId-not-found!!!
-# test? org.codehaus.plexus:plexus-utils:3.4.2 -> !!!groupId-not-found!!!
-# test? org.eclipse.tycho:org.eclipse.osgi:3.13.0.v20180226-1711 -> !!!groupId-not-found!!!
-# test? org.hamcrest:hamcrest:2.2 -> >=dev-java/hamcrest-2.2:0
-# test? org.hsqldb:hsqldb:2.5.2 -> !!!groupId-not-found!!!
-# test? org.jmdns:jmdns:3.5.7 -> !!!groupId-not-found!!!
-# test? org.junit-pioneer:junit-pioneer:1.6.2 -> !!!groupId-not-found!!!
-# test? org.junit.jupiter:junit-jupiter-engine:5.8.2 -> !!!groupId-not-found!!!
-# test? org.junit.jupiter:junit-jupiter-params:5.8.2 -> !!!groupId-not-found!!!
-# test? org.junit.platform:junit-platform-commons:1.8.2 -> !!!groupId-not-found!!!
-# test? org.junit.vintage:junit-vintage-engine:5.8.2 -> !!!groupId-not-found!!!
-# test? org.mockito:mockito-core:4.4.0 -> >=dev-java/mockito-4.4.0:4
-# test? org.mockito:mockito-junit-jupiter:4.4.0 -> !!!artifactId-not-found!!!
-# test? org.slf4j:slf4j-ext:1.7.36 -> >=dev-java/slf4j-ext-1.7.36:0
-# test? org.springframework:spring-test:5.3.20 -> !!!groupId-not-found!!!
-# test? org.tukaani:xz:1.9 -> >=dev-java/xz-java-1.9:0
-# test? org.xmlunit:xmlunit-core:2.9.0 -> !!!groupId-not-found!!!
-# test? org.xmlunit:xmlunit-matchers:2.9.0 -> !!!groupId-not-found!!!
-# test? org.zapodot:embedded-ldap-junit:0.8.1 -> !!!groupId-not-found!!!
-
-DEPEND="${CP_DEPEND}
- dev-java/jakarta-activation-api:1
- dev-java/jakarta-mail-api:0
- dev-java/javax-jms-api:0
- dev-java/osgi-core-api:0
- >=virtual/jdk-1.8:*"
-# test? (
-# !!!artifactId-not-found!!!
-# !!!groupId-not-found!!!
-# >=dev-java/bsh-2.0_beta6:0
-# >=dev-java/commons-codec-1.15:0
-# >=dev-java/commons-io-2.11.0:1
-# >=dev-java/commons-lang-3.12.0:3.6
-# >=dev-java/commons-logging-1.2:0
-# >=dev-java/hamcrest-2.2:0
-# >=dev-java/log4j-api-2.18.0:2
-# >=dev-java/logback-classic-1.2.11:0
-# >=dev-java/logback-core-1.2.11:0
-# >=dev-java/mockito-4.4.0:4
-# >=dev-java/slf4j-ext-1.7.36:0
-# >=dev-java/xz-java-1.9:0
-# )
-#"
-
-# Runtime dependencies
-# POM: ${PN}/pom.xml
-# com.sun.mail:javax.mail:1.6.2 -> !!!artifactId-not-found!!!
-
-RDEPEND="
- >=virtual/jre-1.8:*
- ${CP_DEPEND}"
-
-DOCS=( {CONTRIBUTING,README,RELEASE-NOTES,SECURITY}.md )
-
-S="${WORKDIR}/apache-log4j-${PV}-src"
-
-JAVA_CLASSPATH_EXTRA="jakarta-activation-api-1,jakarta-mail-api,javax-jms-api,osgi-core-api"
-JAVA_SRC_DIR="${PN}/src/main/java"
-JAVA_RESOURCE_DIRS="${PN}/src/main/resources"
-
-#JAVA_TEST_GENTOO_CLASSPATH="logback-classic,logback-core,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,commons-codec,commons-io-1,commons-logging,!!!groupId-not-found!!!,bsh,!!!groupId-not-found!!!,commons-lang-3.6,!!!groupId-not-found!!!,log4j-api-2,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,hamcrest,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,mockito-4,!!!artifactId-not-found!!!,slf4j-ext,!!!groupId-not-found!!!,xz-java,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!"
-#JAVA_TEST_SRC_DIR="${PN}/src/test/java"
-#JAVA_TEST_RESOURCE_DIRS=(
-# "${PN}/src/test/resources"
-#)
-
-src_compile() {
- java-pkg-simple_src_compile
-
- # Process the @Plugin annotation used on Log4j 2 built-in plugins
- # to generate a serialized plugin listing file
- # https://logging.apache.org/log4j/2.x/manual/plugins.html
- local processor="org.apache.logging.log4j.core.config.plugins.processor.PluginProcessor"
- local classes="target/classes"
- local classpath="${JAVA_JAR_FILENAME}:$(\
- java-pkg_getjars --build-only --with-dependencies \
- "${JAVA_GENTOO_CLASSPATH},${JAVA_CLASSPATH_EXTRA}")"
- # Just in case java-pkg-simple.eclass changes the path in the future
- mkdir -p "${classes}" || die "Failed to create directory for classes"
- local sources_list_file="${T}/sources.lst"
- find "${JAVA_SRC_DIR}" -type f -name "*.java" > "${sources_list_file}" || die
- ejavac -d "${classes}" -cp "${classpath}" \
- -proc:only -processor "${processor}" \
- @"${sources_list_file}"
- # Update the JAR to include the serialized plugin listing file
- local jar="$(java-config -j)"
- "${jar}" -uf "${JAVA_JAR_FILENAME}" -C "${classes}" . ||
- die "Failed to update JAR"
-}
diff --git a/dev-java/log4j-over-slf4j/Manifest b/dev-java/log4j-over-slf4j/Manifest
new file mode 100644
index 000000000000..502a0b5b52a6
--- /dev/null
+++ b/dev-java/log4j-over-slf4j/Manifest
@@ -0,0 +1 @@
+DIST slf4j-2.0.3.tar.gz 1435478 BLAKE2B fec1a47882d3bbf508f4faed9cbf9448a23e9749c6c41f241c7e80654e0ce55211cec9228fcf0e666c997a4f24c5b96ad57dc076910e7f05704b02d0cf7db709 SHA512 0fb295f7942c2af8aebe2ecf544ef8326b8cc88de397ee6b37a10249b38150a506f62dcec614eee13519a299b30c6d2481dec3ea235d4b3e6a5241d12639bca6
diff --git a/dev-java/log4j-over-slf4j/log4j-over-slf4j-2.0.3.ebuild b/dev-java/log4j-over-slf4j/log4j-over-slf4j-2.0.3.ebuild
new file mode 100644
index 000000000000..d71e64f91321
--- /dev/null
+++ b/dev-java/log4j-over-slf4j/log4j-over-slf4j-2.0.3.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/qos-ch/slf4j/archive/v_2.0.3.tar.gz --slot 0 --keywords "~amd64" --ebuild log4j-over-slf4j-2.0.3.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.slf4j:log4j-over-slf4j:2.0.3"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Log4j implemented over SLF4J"
+HOMEPAGE="https://www.slf4j.org"
+SRC_URI="https://github.com/qos-ch/slf4j/archive/v_${PV}.tar.gz -> slf4j-${PV}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
+
+# Common dependencies
+# POM: pom.xml
+# org.slf4j:slf4j-api:2.0.3 -> >=dev-java/slf4j-api-2.0.3:0
+
+CP_DEPEND="~dev-java/slf4j-api-${PV}:0"
+
+# Compile dependencies
+# POM: pom.xml
+# test? junit:junit:4.13.1 -> >=dev-java/junit-4.13.2:4
+# test? org.slf4j:slf4j-jdk14:2.0.3 -> !!!artifactId-not-found!!!
+
+DEPEND="
+ >=virtual/jdk-11:*
+ ${CP_DEPEND}"
+
+RDEPEND="
+ >=virtual/jre-1.8:*
+ ${CP_DEPEND}"
+
+DOCS=( ../{README,SECURITY}.md )
+
+S="${WORKDIR}/slf4j-v_${PV}/${PN}"
+
+JAVA_RESOURCE_DIRS="src/main/resources"
+JAVA_SRC_DIR=( src/main/java{,9} )
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_SRC_DIR="src/test/java"
+
+src_prepare() {
+ default
+ # org.slf4j:slf4j-jdk14:2.0.3 is not packaged
+ sed \
+ -e '/import org.junit.Test/a import org.junit.Ignore;' \
+ -e '/testPop()/i @Ignore' \
+ -e '/testSmoke()/i @Ignore' \
+ -i src/test/java/org/apache/log4j/test/NDCTest.java || die
+}
diff --git a/dev-java/log4j-over-slf4j/metadata.xml b/dev-java/log4j-over-slf4j/metadata.xml
new file mode 100644
index 000000000000..14f9229b142a
--- /dev/null
+++ b/dev-java/log4j-over-slf4j/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>java@gentoo.org</email>
+ <name>Java</name>
+ </maintainer>
+ <upstream>
+ <doc>https://www.slf4j.org/docs.html</doc>
+ <bugs-to>https://www.slf4j.org/bug-reporting.html</bugs-to>
+ <remote-id type="github">qos-ch/slf4j</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-java/logback-classic/Manifest b/dev-java/logback-classic/Manifest
index fd3f6cd22f0b..6e682bb8af44 100644
--- a/dev-java/logback-classic/Manifest
+++ b/dev-java/logback-classic/Manifest
@@ -1 +1 @@
-DIST logback-1.2.11.tar.gz 4133000 BLAKE2B 09ef74fb92c5a3f10a9ed401b0cc687f9dbc05daf17646f96fa216aefef1a150434b7ba4ca25b6ed751c01dab906c56be5c65908ca9baf6e29cc1a9f55e14773 SHA512 2482f7af5696034e9b412fb3d37be7f0bc7c8a2549808f88b0ae693c0be4f95c41acd82649f76a4572ea5c0bb9f8d7a78b9a64d7af6dd76a0b1b926d7419c084
+DIST logback-1.4.1.tar.gz 760510 BLAKE2B a01aab8b499059669e22a2ab51522b01765bb2802008058bf3ca1a9ddafa06d2827d4129e76dc6f91e960dea2e419087dbcbc6fbced6b560295cda7089ce4a12 SHA512 4e8b0cb7cd7f950d7b6a859bc40cc8a3ddc41e2c7ab1567dc29780f4f05a14fdf34dd569928e1425886226e45979d85587ddf5e1e61665929718336451a0802c
diff --git a/dev-java/logback-classic/logback-classic-1.2.11.ebuild b/dev-java/logback-classic/logback-classic-1.2.11.ebuild
deleted file mode 100644
index 2759bdc02256..000000000000
--- a/dev-java/logback-classic/logback-classic-1.2.11.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/qos-ch/logback/archive/v_1.2.11.tar.gz --slot 0 --keywords "~amd64" --ebuild logback-classic-1.2.11.ebuild
-
-EAPI=8
-
-# No tests, too many dependencies missing
-JAVA_PKG_IUSE="doc source"
-MAVEN_ID="ch.qos.logback:logback-classic:1.2.11"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="logback-classic module"
-HOMEPAGE="http://logback.qos.ch"
-SRC_URI="https://github.com/qos-ch/logback/archive/v_${PV}.tar.gz -> logback-${PV}.tar.gz"
-
-LICENSE="EPL-1.0 LGPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-# Common dependencies
-# POM: pom.xml
-# ch.qos.logback:logback-core:1.2.11 -> >=dev-java/logback-core-1.2.11:0
-# javax.mail:mail:1.4 -> !!!groupId-not-found!!!
-# javax.servlet:javax.servlet-api:3.1.0 -> !!!groupId-not-found!!!
-# org.codehaus.janino:janino:3.0.6 -> >=dev-java/janino-3.1.6:0
-# org.slf4j:slf4j-api:1.7.32 -> >=dev-java/slf4j-api-1.7.32:0
-
-CP_DEPEND="
- 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
-"
-
-# Compile dependencies
-# POM: pom.xml
-# test? ch.qos.cal10n.plugins:maven-cal10n-plugin:0.8.1 -> !!!groupId-not-found!!!
-# test? ch.qos.logback:logback-core:1.2.11 -> >=dev-java/logback-core-1.2.11:0
-# test? com.icegreen:greenmail:1.3 -> !!!groupId-not-found!!!
-# test? dom4j:dom4j:1.6.1 -> !!!groupId-not-found!!!
-# test? junit:junit:4.10 -> >=dev-java/junit-4.13.2:4
-# test? log4j:log4j:1.2.17 -> >=dev-java/log4j-1.2.17:0
-# test? org.apache.felix:org.apache.felix.main:2.0.2 -> !!!groupId-not-found!!!
-# test? org.assertj:assertj-core:1.7.1 -> >=dev-java/assertj-core-2.3.0:2
-# test? org.mockito:mockito-core:2.7.9 -> >=dev-java/mockito-4.4.0:4
-# test? org.slf4j:integration:1.7.32 -> !!!artifactId-not-found!!!
-# test? org.slf4j:jul-to-slf4j:1.7.32 -> !!!artifactId-not-found!!!
-# test? org.slf4j:log4j-over-slf4j:1.7.32 -> !!!artifactId-not-found!!!
-# test? org.slf4j:slf4j-api:1.7.32 -> >=dev-java/slf4j-api-1.7.32:0
-# test? org.slf4j:slf4j-ext:1.7.32 -> >=dev-java/slf4j-ext-1.7.36:0
-# test? org.subethamail:subethasmtp:2.1.0 -> !!!groupId-not-found!!!
-
-# Restricting to jdk:1.8
-# src/main/java/ch/qos/logback/classic/spi/PackagingDataCalculator.java:20: error: cannot find symbol
-# import sun.reflect.Reflection;
-# ^
-# https://jira.qos.ch/browse/LOGBACK-1343
-DEPEND="
- virtual/jdk:1.8
- ${CP_DEPEND}"
-# test? (
-# dev-java/dom4j:1
-# dev-java/assertj-core:2
-# dev-java/log4j-12-api:2
-# dev-java/logback-core:0
-# dev-java/mockito:4
-# dev-java/slf4j-api:0
-# dev-java/slf4j-ext:0
-# )
-# "
-
-RDEPEND="
- virtual/jre:1.8
- ${CP_DEPEND}"
-
-DOCS=( ../README.md )
-
-S="${WORKDIR}/logback-v_${PV}/logback-classic"
-
-JAVA_SRC_DIR="src/main/java"
-JAVA_RESOURCE_DIRS="src/main/resources"
-
-JAVA_TEST_GENTOO_CLASSPATH="dom4j-1,logback-core,junit-4,log4j,assertj-core-2,mockito-4,slf4j-api,slf4j-ext"
-JAVA_TEST_SRC_DIR="src/test/java"
-JAVA_TEST_RESOURCE_DIRS="src/test/resources"
-
-src_install() {
- default # https://bugs.gentoo.org/789582
- java-pkg-simple_src_install
-}
diff --git a/dev-java/logback-classic/logback-classic-1.4.1.ebuild b/dev-java/logback-classic/logback-classic-1.4.1.ebuild
new file mode 100644
index 000000000000..3c1d932f9dc1
--- /dev/null
+++ b/dev-java/logback-classic/logback-classic-1.4.1.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom logback-classic/pom.xml --download-uri https://github.com/qos-ch/logback/archive/v_1.4.1.tar.gz --slot 0 --keywords "~amd64" --ebuild logback-classic-1.4.1.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="ch.qos.logback:logback-classic:1.4.1"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="logback-classic module"
+HOMEPAGE="https://logback.qos.ch"
+SRC_URI="https://github.com/qos-ch/logback/archive/v_${PV}.tar.gz -> logback-${PV}.tar.gz"
+
+LICENSE="EPL-1.0 LGPL-3"
+SLOT="0"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
+
+# Common dependencies
+# POM: ${PN}/pom.xml
+# ch.qos.logback:logback-core:1.4.1 -> >=dev-java/logback-core-1.4.1:0
+# jakarta.mail:jakarta.mail-api:2.0.1 -> >=dev-java/jakarta-mail-api-2.1.0:0
+# org.codehaus.janino:janino:3.1.7 -> >=dev-java/janino-3.1.7:0
+# org.slf4j:slf4j-api:2.0.1 -> >=dev-java/slf4j-api-2.0.3:0
+
+CP_DEPEND="
+ ~dev-java/janino-3.1.7:0
+ dev-java/jakarta-mail-api:0
+ ~dev-java/logback-core-${PV}:0
+ >=dev-java/slf4j-api-2.0.0:0
+"
+
+# Compile dependencies
+# POM: ${PN}/pom.xml
+# jakarta.servlet:jakarta.servlet-api:5.0.0 -> >=dev-java/jakarta-servlet-api-6.0.0:6
+# POM: ${PN}/pom.xml
+# test? ch.qos.logback:logback-core:1.4.1 -> >=dev-java/logback-core-1.4.1:0
+# test? ch.qos.reload4j:reload4j:1.2.18.4 -> >=dev-java/reload4j-1.2.22:0
+# test? com.icegreen:greenmail:2.0.0-alpha-1 -> >=dev-java/greenmail-2.0.0_alpha2:2
+# test? junit:junit:4.13.1 -> >=dev-java/junit-4.13.2:4
+# test? org.apache.felix:org.apache.felix.main:5.6.10 -> >=dev-java/felix-main-7.0.5:0
+# test? org.assertj:assertj-core:1.7.1 -> >=dev-java/assertj-core-2.3.0:2
+# test? org.dom4j:dom4j:2.0.3 -> >=dev-java/dom4j-2.1.3:1
+# test? org.mockito:mockito-core:4.3.0 -> >=dev-java/mockito-4.8.0:4
+# test? org.slf4j:jul-to-slf4j:2.0.1 -> >=dev-java/jul-to-slf4j-2.0.3:0
+# test? org.slf4j:log4j-over-slf4j:2.0.1 -> >=dev-java/log4j-over-slf4j-2.0.3:0
+# test? org.slf4j:slf4j-api:2.0.1 -> >=dev-java/slf4j-api-2.0.3:0
+
+DEPEND="
+ >=virtual/jdk-11:*
+ ${CP_DEPEND}
+ dev-java/jakarta-servlet-api:6
+ test? (
+ dev-java/assertj-core:3
+ dev-java/dom4j:1
+ dev-java/felix-main:0
+ dev-java/greenmail:2
+ dev-java/jul-to-slf4j:0
+ dev-java/log4j-over-slf4j:0
+ dev-java/logback-core:0
+ dev-java/mockito:4
+ dev-java/osgi-core:0
+ dev-java/reload4j:0
+ )
+"
+
+# Runtime dependencies
+# POM: ${PN}/pom.xml
+# com.sun.mail:jakarta.mail:2.0.1 -> >=dev-java/jakarta-mail-2.0.1:0
+
+RDEPEND="
+ >=virtual/jre-1.8:*
+ ${CP_DEPEND}
+ dev-java/jakarta-mail:0
+"
+
+S="${WORKDIR}/logback-v_${PV}/logback-classic"
+
+JAVA_CLASSPATH_EXTRA="jakarta-servlet-api-6"
+JAVA_GENTOO_CLASSPATH+="jakarta-mail"
+JAVA_RESOURCE_DIRS="src/main/resources"
+JAVA_SRC_DIR="src/main/java"
+
+JAVA_TEST_GENTOO_CLASSPATH="
+ assertj-core-3
+ felix-main
+ greenmail-2
+ jul-to-slf4j
+ junit-4
+ log4j-over-slf4j
+ mockito-4
+ reload4j
+"
+JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+JAVA_TEST_SRC_DIR="src/test/java"
+
+JAVA_TEST_EXCLUDES=(
+ # Invalid test classes, "No runnable methods"
+ ch.qos.logback.core.testUtil.EnvUtilForTests
+ ch.qos.logback.core.rolling.testUtil.ScaffoldingForRollingTests
+ ch.qos.logback.classic.util.TestHelper
+
+ # Test failures:
+ ch.qos.logback.classic.net.SMTPAppender_GreenTest # 14 tests
+
+ # 1) versionTest(ch.qos.logback.classic.util.EnvUtilTest)
+ # java.lang.AssertionError
+ # at org.junit.Assert.fail(Assert.java:87)
+ # at org.junit.Assert.assertTrue(Assert.java:42)
+ # at org.junit.Assert.assertNotNull(Assert.java:713)
+ # at org.junit.Assert.assertNotNull(Assert.java:723)
+ # at ch.qos.logback.classic.util.EnvUtilTest.versionTest(EnvUtilTest.java:17)
+ ch.qos.logback.classic.util.EnvUtilTest
+
+ # 2) testSmoke(org.slf4j.test_osgi.BundleTest)
+ # junit.framework.AssertionFailedError
+ # at junit.framework.Assert.fail(Assert.java:55)
+ # at junit.framework.Assert.assertTrue(Assert.java:22)
+ # at junit.framework.Assert.assertTrue(Assert.java:31)
+ # at junit.framework.TestCase.assertTrue(TestCase.java:200)
+ # at org.slf4j.test_osgi.BundleTest.testSmoke(BundleTest.java:41)
+ org.slf4j.test_osgi.BundleTest
+)
+
+src_test() {
+ # Tests need dom4j:1 on classpath but without dependencies:
+ JAVA_GENTOO_CLASSPATH_EXTRA="$(java-pkg_getjars --build-only dom4j-1)"
+
+ # package ch.qos.logback.core.contention does not exist
+ JAVA_GENTOO_CLASSPATH_EXTRA+=":../logback-core/src/test/java/"
+ java-pkg-simple_src_test
+}
diff --git a/dev-java/logback-core/Manifest b/dev-java/logback-core/Manifest
index fd3f6cd22f0b..6e682bb8af44 100644
--- a/dev-java/logback-core/Manifest
+++ b/dev-java/logback-core/Manifest
@@ -1 +1 @@
-DIST logback-1.2.11.tar.gz 4133000 BLAKE2B 09ef74fb92c5a3f10a9ed401b0cc687f9dbc05daf17646f96fa216aefef1a150434b7ba4ca25b6ed751c01dab906c56be5c65908ca9baf6e29cc1a9f55e14773 SHA512 2482f7af5696034e9b412fb3d37be7f0bc7c8a2549808f88b0ae693c0be4f95c41acd82649f76a4572ea5c0bb9f8d7a78b9a64d7af6dd76a0b1b926d7419c084
+DIST logback-1.4.1.tar.gz 760510 BLAKE2B a01aab8b499059669e22a2ab51522b01765bb2802008058bf3ca1a9ddafa06d2827d4129e76dc6f91e960dea2e419087dbcbc6fbced6b560295cda7089ce4a12 SHA512 4e8b0cb7cd7f950d7b6a859bc40cc8a3ddc41e2c7ab1567dc29780f4f05a14fdf34dd569928e1425886226e45979d85587ddf5e1e61665929718336451a0802c
diff --git a/dev-java/logback-core/files/logback-core-1.2.11-Ignore-test-failing-under-Java-16.patch b/dev-java/logback-core/files/logback-core-1.2.11-Ignore-test-failing-under-Java-16.patch
deleted file mode 100644
index 9423f26e9a1a..000000000000
--- a/dev-java/logback-core/files/logback-core-1.2.11-Ignore-test-failing-under-Java-16.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- a/src/test/java/ch/qos/logback/core/AsyncAppenderBaseTest.java
-+++ b/src/test/java/ch/qos/logback/core/AsyncAppenderBaseTest.java
-@@ -18,6 +18,7 @@
- import static org.junit.Assert.assertTrue;
-
- import org.junit.Before;
-+import org.junit.Ignore;
- import org.junit.Test;
-
- import ch.qos.logback.core.helpers.NOPAppender;
-@@ -281,10 +282,13 @@ public void verifyInterruptionFlagWhenStopping_NOT_INTERUPPTED() {
- }
-
-
-+ // In JDK non started threads can be interrupted
-+ @Ignore
- @Test
- public void verifyInterruptionOfWorkerIsSwallowed() {
- asyncAppenderBase.addAppender(delayingListAppender);
- asyncAppenderBase.start();
-+ Thread.yield();
- asyncAppenderBase.stop();
- assertFalse(asyncAppenderBase.worker.isInterrupted());
- }
diff --git a/dev-java/logback-core/logback-core-1.2.11.ebuild b/dev-java/logback-core/logback-core-1.4.1.ebuild
index 954b29679ba8..ab06f67e0f2f 100644
--- a/dev-java/logback-core/logback-core-1.2.11.ebuild
+++ b/dev-java/logback-core/logback-core-1.4.1.ebuild
@@ -2,12 +2,12 @@
# Distributed under the terms of the GNU General Public License v2
# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/qos-ch/logback/archive/v_1.2.11.tar.gz --slot 0 --keywords "~amd64" --ebuild logback-core-1.2.11.ebuild
+# java-ebuilder --generate-ebuild --workdir . --pom logback-core/pom.xml --download-uri https://github.com/qos-ch/logback/archive/v_1.4.1.tar.gz --slot 0 --keywords "~amd64" --ebuild logback-core-1.4.1.ebuild
EAPI=8
JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="ch.qos.logback:logback-core:1.2.11"
+MAVEN_ID="ch.qos.logback:logback-core:1.4.1"
JAVA_TESTING_FRAMEWORKS="junit-4"
inherit java-pkg-2 java-pkg-simple
@@ -21,32 +21,32 @@ SLOT="0"
KEYWORDS="amd64 ~arm arm64 ppc64 x86"
# Common dependencies
-# POM: pom.xml
-# javax.mail:mail:1.4 -> !!!groupId-not-found!!!
-# javax.servlet:javax.servlet-api:3.1.0 -> !!!groupId-not-found!!!
-# org.codehaus.janino:janino:3.0.6 -> >=dev-java/janino-3.1.6:0
-# org.fusesource.jansi:jansi:1.9 -> >=dev-java/jansi-1.13:0
+# POM: ${PN}/pom.xml
+# com.sun.mail:jakarta.mail:2.0.1 -> >=dev-java/jakarta-mail-2.0.1:0
+# jakarta.mail:jakarta.mail-api:2.0.1 -> >=dev-java/jakarta-mail-api-2.1.0:0
+# jakarta.servlet:jakarta.servlet-api:5.0.0 -> >=dev-java/jakarta-servlet-api-6.0.0:6
+# org.codehaus.janino:janino:3.1.7 -> >=dev-java/janino-3.1.7:0
+# org.fusesource.jansi:jansi:1.18 -> >=dev-java/jansi-2.4.0:2
CP_DEPEND="
- dev-java/javax-mail:0
- dev-java/janino:0
- dev-java/jansi:0
- java-virtuals/servlet-api:3.1
+ dev-java/jakarta-mail:0
+ dev-java/jakarta-mail-api:0
+ dev-java/jakarta-servlet-api:6
+ ~dev-java/janino-3.1.7:0
+ dev-java/jansi:2
"
# Compile dependencies
-# POM: pom.xml
-# test? joda-time:joda-time:2.9.2 -> >=dev-java/joda-time-2.10.10:0
-# test? junit:junit:4.10 -> >=dev-java/junit-4.13.2:4
+# POM: ${PN}/pom.xml
+# test? junit:junit:4.13.1 -> >=dev-java/junit-4.13.2:4
# test? org.assertj:assertj-core:1.7.1 -> >=dev-java/assertj-core-2.3.0:2
-# test? org.mockito:mockito-core:2.7.9 -> >=dev-java/mockito-4.4.0:4
+# test? org.mockito:mockito-core:4.3.0 -> >=dev-java/mockito-4.7.0:4
DEPEND="
- >=virtual/jdk-1.8:*
+ >=virtual/jdk-11:*
${CP_DEPEND}
test? (
- dev-java/assertj-core:2
- dev-java/joda-time:0
+ dev-java/assertj-core:3
dev-java/mockito:4
)
"
@@ -55,39 +55,25 @@ RDEPEND="
>=virtual/jre-1.8:*
${CP_DEPEND}"
-DOCS=( ../README.md )
+# DOCS=( ../README.md )
S="${WORKDIR}/logback-v_${PV}/logback-core"
JAVA_SRC_DIR="src/main/java"
-JAVA_TEST_GENTOO_CLASSPATH="joda-time,junit-4,assertj-core-2,mockito-4"
-JAVA_TEST_SRC_DIR="src/test/java"
+JAVA_TEST_GENTOO_CLASSPATH="junit-4,assertj-core-3,mockito-4"
JAVA_TEST_RESOURCE_DIRS="src/test/resources"
-
-src_prepare() {
- default
- sed \
- -e 's:org.mockito.Matchers:org.mockito.ArgumentMatchers:' \
- -i 'src/test/java/ch/qos/logback/core/net/AbstractSocketAppenderIntegrationTest.java' || die
-
- # Ignore test failing under Java 16
- # See https://github.com/qos-ch/logback/commit/d6a8200cea6d960bf6832b9b95aed64e87474afb
- local vm_version="$(java-config -g PROVIDES_VERSION)"
- if [[ "${vm_version}" -ge "17" ]] ; then
- eapply "${FILESDIR}/logback-core-1.2.11-Ignore-test-failing-under-Java-16.patch"
- fi
-}
+JAVA_TEST_SRC_DIR="src/test/java"
src_test() {
- # 67,73 logback-core/pom.xml
+ # 83,88 logback-core/pom.xml
# <excludes>
# <exclude>**/All*Test.java</exclude>
# <exclude>**/PackageTest.java</exclude>
# <!-- ConsoleAppenderTest redirects System.out which is not well tolerated by Maven -->
# <exclude>**/ConsoleAppenderTest.java</exclude>
- # <!--<exclude>**/TimeBasedRollingTest.java</exclude>-->
# </excludes>
+ rm src/test/java/ch/qos/logback/core/appender/ConsoleAppenderTest.java || die
pushd src/test/java || die
local JAVA_TEST_RUN_ONLY=$(find * \
-name "*Test.java" \
@@ -95,7 +81,6 @@ src_test() {
! -wholename "**/PackageTest.java" \
! -name "AbstractAppenderTest.java" \
! -name "AbstractPatternLayoutBaseTest.java" \
- ! -name "AbstractSocketAppenderIntegrationTest.java" \
)
JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}"
JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}"
@@ -103,14 +88,9 @@ src_test() {
# accessible: module java.base does not "opens java.lang" to unnamed module @42bb2aee
local vm_version="$(java-config -g PROVIDES_VERSION)"
- if [[ "${vm_version}" -ge "17" ]] ; then
+ if [[ "${vm_version}" -ge 17 ]]; then
JAVA_TEST_EXTRA_ARGS+=( --add-opens=java.base/java.lang=ALL-UNNAMED )
JAVA_TEST_EXTRA_ARGS+=( --add-opens=java.base/java.io=ALL-UNNAMED )
fi
java-pkg-simple_src_test
}
-
-src_install() {
- default # https://bugs.gentoo.org/789582
- java-pkg-simple_src_install
-}
diff --git a/dev-java/lzma/Manifest b/dev-java/lzma/Manifest
index 99d89fc6e027..3011ae25a902 100644
--- a/dev-java/lzma/Manifest
+++ b/dev-java/lzma/Manifest
@@ -1 +1,2 @@
+DIST lzma-22.01.7z 1261282 BLAKE2B 31bfa505626c6d22f84562d927cb8b7f0c6f9d7cfe9e38f49b33866957ad81f7bd1e6fb7b02a3e001edf9d64fc499b396e73738585e7d3a29fcd7d41dc65d1d7 SHA512 83e320242a51cb37caefd386a5768e64c6872101fd3c3cf4d3318bf834d27e84d8a92e3252987520a578b19ce3e2cddcbf9e10b909f5263c5cdc0710c2f26797
DIST lzma1900.7z 1082692 BLAKE2B 88aca3f3225d589c9b1b0fbf4c196db8e6e8df362f926736a45e1f80d302c132b25537203b0a903da9de5f3b0398b10901f126cf6905fcbdf0a57ee894e74b6d SHA512 60532483249d86960d5c481dc88ebeafabb7e435afb6188bc26f38177b8534ef3da83317d6920d99103d4f10a8dcdb624489ea5ddad8e0c8732bab1bb4ebd7eb
diff --git a/dev-java/lzma/lzma-22.01.ebuild b/dev-java/lzma/lzma-22.01.ebuild
new file mode 100644
index 000000000000..fcb02d0d2be1
--- /dev/null
+++ b/dev-java/lzma/lzma-22.01.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple unpacker
+
+DESCRIPTION="Java code for LZMA compression and decompression"
+HOMEPAGE="https://7-zip.org/"
+SRC_URI="https://7-zip.org/a/lzma${PV/./}.7z -> ${P}.7z"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND=">=virtual/jre-1.8:*"
+DEPEND=">=virtual/jdk-1.8:*"
+BDEPEND="$(unpacker_src_uri_depends)"
+
+S="${WORKDIR}/Java"
+
+JAVA_SRC_DIR="SevenZip"
diff --git a/dev-java/maven-bin/Manifest b/dev-java/maven-bin/Manifest
index ff948ed9ad93..c54fc46bb46b 100644
--- a/dev-java/maven-bin/Manifest
+++ b/dev-java/maven-bin/Manifest
@@ -1,2 +1 @@
-DIST apache-maven-3.8.3-bin.tar.gz 9042049 BLAKE2B 2709a47fddca340d9ddaa1f716990e5a4580667169552cedcda2f2017b190cacfc545e2d5b0d5aaae5f95172fb49201eefc4edaff1009f855fb93065e0de6919 SHA512 1c12a5df43421795054874fd54bb8b37d242949133b5bf6052a063a13a93f13a20e6e9dae2b3d85b9c7034ec977bbc2b6e7f66832182b9c863711d78bfe60faa
DIST apache-maven-3.8.6-bin.tar.gz 8676320 BLAKE2B 7ad7695aaed86b478044dd0ce59d359c8eb3644ddf0bc3ea501a9eb5c373e2bdacbe8cdf8c85edab930d84d446ff1cb25975281bb7c9cb517a005accba9e413d SHA512 f790857f3b1f90ae8d16281f902c689e4f136ebe584aba45e4b1fa66c80cba826d3e0e52fdd04ed44b4c66f6d3fe3584a057c26dfcac544a60b301e6d0f91c26
diff --git a/dev-java/maven-bin/maven-bin-3.8.3.ebuild b/dev-java/maven-bin/maven-bin-3.8.3.ebuild
deleted file mode 100644
index 15cbb360e0de..000000000000
--- a/dev-java/maven-bin/maven-bin-3.8.3.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit java-pkg-2
-
-MY_PN=apache-${PN%%-bin}
-MY_PV=${PV/_alpha/-alpha-}
-MY_P="${MY_PN}-${MY_PV}"
-MY_MV="${PV%%.*}"
-
-DESCRIPTION="Project Management and Comprehension Tool for Java"
-SRC_URI="mirror://apache/maven/maven-${MY_MV}/${PV}/binaries/${MY_P}-bin.tar.gz"
-HOMEPAGE="https://maven.apache.org/"
-
-LICENSE="Apache-2.0"
-SLOT="3.8"
-KEYWORDS="amd64 x86"
-
-DEPEND="
- >=virtual/jdk-1.8:*
- app-eselect/eselect-java"
-
-RDEPEND="
- >=virtual/jre-1.8:*"
-
-S="${WORKDIR}/${MY_P}"
-
-MAVEN="${PN}-${SLOT}"
-MAVEN_SHARE="/usr/share/${MAVEN}"
-
-QA_FLAGS_IGNORED=(
- "${MAVEN_SHARE}/lib/jansi-native/linux32/libjansi.so"
- "${MAVEN_SHARE}/lib/jansi-native/linux64/libjansi.so"
-)
-
-# TODO:
-# We should use jars from packages, instead of what is bundled.
-src_install() {
- dodir "${MAVEN_SHARE}"
-
- cp -Rp bin boot conf lib "${ED}/${MAVEN_SHARE}" || die "failed to copy"
-
- java-pkg_regjar "${ED}/${MAVEN_SHARE}"/boot/*.jar
- java-pkg_regjar "${ED}/${MAVEN_SHARE}"/lib/*.jar
-
- dodoc NOTICE README.txt
-
- dodir /usr/bin
- dosym "${MAVEN_SHARE}/bin/mvn" /usr/bin/mvn-${SLOT}
-
- # See bug #342901.
- echo "CONFIG_PROTECT=\"${MAVEN_SHARE}/conf\"" > "${T}/25${MAVEN}" || die
- doenvd "${T}/25${MAVEN}"
-}
-
-pkg_postinst() {
- eselect maven update mvn-${SLOT}
-}
-
-pkg_postrm() {
- eselect maven update
-}
diff --git a/dev-java/maven-bin/maven-bin-3.8.6.ebuild b/dev-java/maven-bin/maven-bin-3.8.6.ebuild
index 8f533bbc4a50..2866b9890bf2 100644
--- a/dev-java/maven-bin/maven-bin-3.8.6.ebuild
+++ b/dev-java/maven-bin/maven-bin-3.8.6.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://maven.apache.org/"
LICENSE="Apache-2.0"
SLOT="3.8"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
DEPEND="
>=virtual/jdk-1.8:*
diff --git a/dev-java/memoryfilesystem/memoryfilesystem-2.3.0.ebuild b/dev-java/memoryfilesystem/memoryfilesystem-2.3.0.ebuild
index bb7eb852ea77..4164784cd150 100644
--- a/dev-java/memoryfilesystem/memoryfilesystem-2.3.0.ebuild
+++ b/dev-java/memoryfilesystem/memoryfilesystem-2.3.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/marschall/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
CP_DEPEND="
dev-java/jakarta-annotations-api:0
diff --git a/dev-java/metainf-services/Manifest b/dev-java/metainf-services/Manifest
index 3c043e1a724f..9f645d5aee76 100644
--- a/dev-java/metainf-services/Manifest
+++ b/dev-java/metainf-services/Manifest
@@ -1,2 +1 @@
-DIST metainf-services-1.7.tar.gz 5301 BLAKE2B dabb2229e5123b535c81f5796d92365eba609e696c0c513666c105534eb1430420b71768436ed53078dc72a2261ed821010ffea0098a4a65f81c5f1c2c118a6e SHA512 d6162e94ff5efcf61e56e0c1e1d22c51854fa7f98662b6ac0cc7d230b7f11b0d3c7c7238b640693d8d6f5e6e6f508bf5116ea22e73487d00145cd5a87853b3df
DIST metainf-services-1.9.tar.gz 5353 BLAKE2B a2d72b886169f6697033c56fa581e4fed9f69236a335397b0480111959e87e1d25ee16b96c6449b37b467aa68f0b4997873346416d8a09e3b14b911ffe37ffd4 SHA512 6d666c2582944e824cc66dd58c09474775e475146af7f8edcb4abce45eff6573481f550d8c37b854addd81825201207be7855b9bbc21f539559395a63e9fa261
diff --git a/dev-java/metainf-services/files/metainf-services-1.7-build.xml b/dev-java/metainf-services/files/metainf-services-1.7-build.xml
deleted file mode 100644
index 4dd4174c45b4..000000000000
--- a/dev-java/metainf-services/files/metainf-services-1.7-build.xml
+++ /dev/null
@@ -1,192 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- ====================================================================== -->
-<!-- Ant build file (http://ant.apache.org/) for Ant 1.6.2 or above. -->
-<!-- ====================================================================== -->
-
-<!-- ====================================================================== -->
-<!-- ===================== - DO NOT EDIT THIS FILE! - ===================== -->
-<!-- ====================================================================== -->
-<!-- -->
-<!-- Any modifications will be overwritten. -->
-<!-- -->
-<!-- Generated by Maven Ant Plugin on 7/13/13 1:12 PM -->
-<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/ -->
-<!-- -->
-<!-- ====================================================================== -->
-
-<project name="metainf-services-from-maven" default="package" basedir=".">
-
- <!-- ====================================================================== -->
- <!-- Build environment properties -->
- <!-- ====================================================================== -->
-
- <property file="${user.home}/.m2/maven.properties"/>
- <property file="maven-build.properties"/>
-
- <property name="maven.build.finalName" value="metainf-services-1.7"/>
- <property name="maven.build.dir" value="target"/>
- <property name="maven.build.outputDir" value="${maven.build.dir}/classes"/>
- <property name="maven.build.srcDir.0" value="src/main/java"/>
- <property name="maven.build.resourceDir.0" value="src/main/resources"/>
- <property name="maven.build.testOutputDir" value="${maven.build.dir}/test-classes"/>
- <property name="maven.build.testDir.0" value="src/test/java"/>
- <property name="maven.build.testResourceDir.0" value="src/test/resources"/>
- <property name="maven.test.reports" value="${maven.build.dir}/test-reports"/>
- <property name="maven.reporting.outputDirectory" value="${maven.build.dir}/site"/>
-
- <property name="maven.repo.local" value="${user.home}/.m2/repository"/>
- <property name="maven.settings.offline" value="false"/>
- <property name="maven.settings.interactiveMode" value="true"/>
-
- <!-- ====================================================================== -->
- <!-- Defining classpaths -->
- <!-- ====================================================================== -->
-
- <path id="build.classpath"/>
- <path id="build.test.classpath"/>
-
- <!-- ====================================================================== -->
- <!-- Cleaning up target -->
- <!-- ====================================================================== -->
-
- <target name="clean" description="Clean the output directory">
- <delete dir="${maven.build.dir}"/>
- </target>
-
- <!-- ====================================================================== -->
- <!-- Compilation target -->
- <!-- ====================================================================== -->
-
- <target name="compile" depends="get-deps" description="Compile the code">
- <mkdir dir="${maven.build.outputDir}"/>
- <javac destdir="${maven.build.outputDir}"
- nowarn="false"
- debug="true"
- optimize="false"
- deprecation="true"
- target="1.6"
- verbose="false"
- fork="false"
- source="1.6">
- <src>
- <pathelement location="${maven.build.srcDir.0}"/>
- </src>
- <classpath refid="build.classpath"/>
- </javac>
- <copy todir="${maven.build.outputDir}">
- <fileset dir="${maven.build.resourceDir.0}"/>
- </copy>
- </target>
-
- <!-- ====================================================================== -->
- <!-- Test-compilation target -->
- <!-- ====================================================================== -->
-
- <target name="compile-tests"
- depends="compile"
- description="Compile the test code"
- unless="maven.test.skip">
- <mkdir dir="${maven.build.testOutputDir}"/>
- </target>
-
- <!-- ====================================================================== -->
- <!-- Run all tests -->
- <!-- ====================================================================== -->
-
- <target name="test"
- depends="compile-tests, junit-missing"
- unless="junit.skipped"
- description="Run the test cases"/>
-
- <target name="test-junit-present">
- <available classname="junit.framework.Test" property="junit.present"/>
- </target>
-
- <target name="test-junit-status"
- depends="test-junit-present">
- <condition property="junit.missing">
- <and>
- <isfalse value="${junit.present}"/>
- <isfalse value="${maven.test.skip}"/>
- </and>
- </condition>
- <condition property="junit.skipped">
- <or>
- <isfalse value="${junit.present}"/>
- <istrue value="${maven.test.skip}"/>
- </or>
- </condition>
- </target>
-
- <target name="junit-missing"
- depends="test-junit-status"
- if="junit.missing">
- <echo>=================================== WARNING ===================================</echo>
- <echo> JUnit is not present in your $ANT_HOME/lib directory. Tests not executed.</echo>
- <echo>===============================================================================</echo>
- </target>
-
- <!-- ====================================================================== -->
- <!-- Javadoc target -->
- <!-- ====================================================================== -->
-
- <target name="javadoc" description="Generates the Javadoc of the application">
- <javadoc sourcepath="${maven.build.srcDir.0}"
- packagenames="*"
- destdir="${maven.reporting.outputDirectory}/apidocs"
- access="protected"
- old="false"
- verbose="false"
- version="true"
- use="true"
- author="true"
- splitindex="false"
- nodeprecated="false"
- nodeprecatedlist="false"
- notree="false"
- noindex="false"
- nohelp="false"
- nonavbar="false"
- serialwarn="false"
- charset="ISO-8859-1"
- linksource="false"
- breakiterator="false"/>
- </target>
-
- <!-- ====================================================================== -->
- <!-- Package target -->
- <!-- ====================================================================== -->
-
- <target name="package" depends="compile,test" description="Package the application">
- <jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar"
- compress="true"
- index="false"
- basedir="${maven.build.outputDir}"
- excludes="**/package.html"/>
- </target>
-
- <!-- ====================================================================== -->
- <!-- A dummy target for the package named after the type it creates -->
- <!-- ====================================================================== -->
-
- <target name="jar" depends="package" description="Builds the jar for the application"/>
-
- <!-- ====================================================================== -->
- <!-- Download dependencies target -->
- <!-- ====================================================================== -->
-
- <target name="test-offline">
- <condition property="maven.mode.offline">
- <equals arg1="${maven.settings.offline}" arg2="true"/>
- </condition>
- </target>
-
- <target name="get-deps"
- depends="test-offline"
- description="Download all dependencies"
- unless="maven.mode.offline">
- <mkdir dir="${maven.repo.local}"/>
- </target>
-
-</project>
diff --git a/dev-java/metainf-services/metainf-services-1.7-r1.ebuild b/dev-java/metainf-services/metainf-services-1.7-r1.ebuild
deleted file mode 100644
index 046f310fec8a..000000000000
--- a/dev-java/metainf-services/metainf-services-1.7-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Generates META-INF/services files automatically"
-HOMEPAGE="http://metainf-services.kohsuke.org/"
-SRC_URI="https://github.com/kohsuke/${PN}/archive/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND=">=virtual/jre-1.8:*"
-DEPEND=">=virtual/jdk-1.8:*"
-
-S="${WORKDIR}/${PN}-${P}"
-
-src_prepare() {
- default
- cp "${FILESDIR}"/${P}-build.xml build.xml || die
-}
-
-src_install() {
- java-pkg_newjar target/${P}.jar
-}
diff --git a/dev-java/metainf-services/metainf-services-1.9.ebuild b/dev-java/metainf-services/metainf-services-1.9.ebuild
index d8d62e7083e4..bc65997190d7 100644
--- a/dev-java/metainf-services/metainf-services-1.9.ebuild
+++ b/dev-java/metainf-services/metainf-services-1.9.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/kohsuke/${PN}/archive/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
RDEPEND=">=virtual/jre-1.8:*"
DEPEND=">=virtual/jdk-1.8:*"
diff --git a/dev-java/mill-bin/Manifest b/dev-java/mill-bin/Manifest
index c1aacc489a54..7cca5898b2d1 100644
--- a/dev-java/mill-bin/Manifest
+++ b/dev-java/mill-bin/Manifest
@@ -1,2 +1 @@
-DIST mill-bin-0.10.4 68195230 BLAKE2B 922604123641ea130da1fbc30e6fdbf768479cdee61f8ca9443f4a96f2d9a3608c2377741716c2f942c29cf40c10f23f3cd24255221d7095060c89c5cde7b8f3 SHA512 2141159fd88866ba3c3abf05af0d7b2bbd89b901a16a29e51b6baefbb94fe68afc4b5c83cf18d289279dbb142b47eadd5ec225a72059be9fa6fc0594b0c130af
-DIST mill-bin-0.10.5 65096167 BLAKE2B 756970782a3abd67a03337824bb54c887758968c8f98cbeadbeb6e84277a5318c737e920b8e3f9025dcc01c81440f62f61e415b5a343f8c36b06bffe66bdb0ec SHA512 151be733fb5438fbad4e1e2b7c6918a38743f1f494652d2d3b11a5d1b67ff3dff40f62b1e71784f5ff22045f45f7e9390a9b4eb6377814cbcfa5cc1e337b0666
+DIST mill-bin-0.10.9 71023828 BLAKE2B 6cd71ad3a293b92957b504b850110103290f0017416c370f6de172247e96a42daffe94f7460325bff89b3136e3890eddb0ff7857418a0166327684e785a8e956 SHA512 494ad57e036180a285e44ff24ab8a7070b1b444e4267eb9ea76823f3717db4ca7bcab17013932764ed04fd7127272d87fef08cb59bc43ae257a76fdd715581e9
diff --git a/dev-java/mill-bin/mill-bin-0.10.5.ebuild b/dev-java/mill-bin/mill-bin-0.10.5.ebuild
deleted file mode 100644
index e8485c57dfd6..000000000000
--- a/dev-java/mill-bin/mill-bin-0.10.5.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_PN=${PN%-bin}
-
-DESCRIPTION="A Java/Scala build tool"
-HOMEPAGE="https://com-lihaoyi.github.io/mill/"
-SRC_URI="https://github.com/com-lihaoyi/${MY_PN}/releases/download/${PV}/${PV}-assembly -> ${P}"
-KEYWORDS="~amd64 ~x86"
-
-LICENSE="MIT"
-SLOT="0"
-
-RDEPEND=">=virtual/jre-1.8:*"
-
-S="${WORKDIR}"
-
-src_unpack() {
- :
-}
-
-src_install() {
- newbin "${DISTDIR}"/${P} ${MY_PN}
-}
diff --git a/dev-java/mill-bin/mill-bin-0.10.4.ebuild b/dev-java/mill-bin/mill-bin-0.10.9.ebuild
index 4b4375e44bc5..4b4375e44bc5 100644
--- a/dev-java/mill-bin/mill-bin-0.10.4.ebuild
+++ b/dev-java/mill-bin/mill-bin-0.10.9.ebuild
diff --git a/dev-java/mockito/Manifest b/dev-java/mockito/Manifest
index 42cb97a35ce9..02907aed67b4 100644
--- a/dev-java/mockito/Manifest
+++ b/dev-java/mockito/Manifest
@@ -1,3 +1,2 @@
-DIST mockito-1.9.5.zip 6453870 BLAKE2B b577c4a82f03b5c345462ecc10e9fe25c03836d08d57d633d95a1eaba17f52d4306603f50f332df360d0a4880c85c65bad4503503df0acad8f7b437694a2b887 SHA512 93768992c74fbc2e2653b46b3afb526ab816b9c707cb5f9608564299ffd206e256182be146c590b4777a624379f576d7117ed7d43b11f8d2974e87c402eede51
-DIST mockito-4.6.0.tar.gz 1030497 BLAKE2B 0afc0f5874acbd290312a7eee2ce8b9f7d1a83da12338ff8851e02cd6a9ed0c99bfc109fade5ddfec5f9a5277ffaa0d04c53a726c31082dc53b512a2e551473b SHA512 18f76788e610ca169cf6b4eefd0fdd78c333b920122115d816d1f2ab94f0a84d5a9fd0d00d41d1c34e592c5634f7ac55f7f491061b7992d18aa69f3fc62561b6
-DIST mockito-4.6.1.tar.gz 1031362 BLAKE2B 52768ead8770c701f5e5b698f9c35e8e189b57979d90b231b434aba57f6f1f167e5f1491eec53280ce29410add31ac41e81b3637257f58709162cc3c5307ed27 SHA512 f16454f3baba2e55a6da229d7719359357b2641cf4abaf3c0e5f5cac6999325ac4a9c08d815a02939c1ef62831745162935bb8d03177a27b0d972600a92fc1f7
+DIST mockito-4.8.1.tar.gz 1045454 BLAKE2B 82efc18afa8efae2495fdd5b0db58ddde8ea5cae9b7dfb554075924e343f5c0290a7f5d63b18c217b33a11c31a13ac40fcd28a752b0deae737c4bd75ea13c044 SHA512 dd2adc2211637daa86f5174e333744c5a1ff29dcccf9866a33933e2ba945d99781d5860c6059e6fa06a649d9a45417ab13066f8c8e896cb753b6e0869f0e2b03
+DIST mockito-core-1.9.5-sources.jar 723074 BLAKE2B e553a923542a1a2574ee0cda5979d168cc3e9644dbbc9fceed2301ae1bac150c4e35dbc4432d50e2479efea2a6cd35ec19c62c3598f61709f1f5dc8959cc0155 SHA512 271e626c3b5be9a7d7c82a2f0bf44077aabd51924b0956a88633ace7fe8c134d8cd1f89ce348ce0d15ccce55a50027e303836d2d2f430500317b6136d308d3d4
diff --git a/dev-java/mockito/mockito-1.9.5-r2.ebuild b/dev-java/mockito/mockito-1.9.5-r2.ebuild
deleted file mode 100644
index 8d5f634f6853..000000000000
--- a/dev-java/mockito/mockito-1.9.5-r2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source"
-MAVEN_ID="org.mockito:mockito-core:1.9.5"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="A mocking framework for Java"
-HOMEPAGE="https://github.com/mockito/mockito"
-SRC_URI="https://${PN}.googlecode.com/files/${P}.zip"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-CDEPEND="
- dev-java/ant-core:0
- dev-java/hamcrest-core:0
- dev-java/junit:4
- dev-java/objenesis:0
-"
-RDEPEND="${CDEPEND}
- virtual/jre:1.8"
-DEPEND="${CDEPEND}
- virtual/jdk:1.8"
-BDEPEND="app-arch/unzip"
-
-S="${WORKDIR}"
-
-JAVA_SRC_DIR="src"
-JAVA_GENTOO_CLASSPATH="junit-4,objenesis,hamcrest-core,ant-core"
-
-src_unpack() {
- unpack ${A}
- unzip "${S}"/sources/${PN}-core-${PV}-sources.jar -d src/ || die
-}
-
-src_prepare() {
- default
- find "${S}" -name "*.jar" -delete || die
-}
diff --git a/dev-java/mockito/mockito-1.9.5-r3.ebuild b/dev-java/mockito/mockito-1.9.5-r3.ebuild
new file mode 100644
index 000000000000..b3f923f412a9
--- /dev/null
+++ b/dev-java/mockito/mockito-1.9.5-r3.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="org.mockito:mockito-core:1.9.5"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="A mocking framework for Java"
+HOMEPAGE="https://github.com/mockito/mockito"
+SRC_URI="https://repo1.maven.org/maven2/org/mockito/mockito-core/${PV}/mockito-core-${PV}-sources.jar"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
+
+CP_DEPEND="
+ dev-java/ant-core:0
+ dev-java/hamcrest-core:0
+ dev-java/junit:4
+ dev-java/objenesis:0
+"
+DEPEND=">=virtual/jdk-1.8:*
+ ${CP_DEPEND}"
+RDEPEND=">=virtual/jre-1.8:*
+ ${CP_DEPEND}"
+BDEPEND="app-arch/unzip"
+
+JAVADOC_ARGS="-source 8"
diff --git a/dev-java/mockito/mockito-4.6.0-r1.ebuild b/dev-java/mockito/mockito-4.6.0-r1.ebuild
deleted file mode 100644
index bd3679411683..000000000000
--- a/dev-java/mockito/mockito-4.6.0-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Tests not enabled, wants junit-jupiter.
-# "${S}/settings.gradle.kts"
-JAVA_PKG_IUSE="doc source"
-MAVEN_ID="org.mockito:mockito-core:4.6.0"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Mockito mock objects library core API and implementation"
-HOMEPAGE="https://github.com/mockito/mockito"
-SRC_URI="https://github.com/mockito/mockito/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="4"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-# Common dependencies
-# POM: ${PN}-core-${PV}.pom
-# net.bytebuddy:byte-buddy:1.12.8 -> >=dev-java/byte-buddy-1.12.8:0
-# net.bytebuddy:byte-buddy-agent:1.12.8 -> >=dev-java/byte-buddy-agent-1.12.8:0
-
-CP_DEPEND="
- <=dev-java/byte-buddy-1.12.10:0
- <=dev-java/byte-buddy-agent-1.12.10:0
- dev-java/junit:4
- dev-java/objenesis:0
- dev-java/opentest4j:0
-"
-
-DEPEND="
- >=virtual/jdk-1.8:*
- ${CP_DEPEND}
-"
-
-# Runtime dependencies
-# POM: ${PN}-core-${PV}.pom
-# org.objenesis:objenesis:3.2 -> >=dev-java/objenesis-3.2:0
-
-RDEPEND="
- >=virtual/jre-1.8:*
- ${CP_DEPEND}
-"
-
-S="${WORKDIR}/${P}"
-
-JAVA_SRC_DIR="src/main/java"
diff --git a/dev-java/mockito/mockito-4.6.1-r1.ebuild b/dev-java/mockito/mockito-4.8.1.ebuild
index 493246812dac..91e98b36fd76 100644
--- a/dev-java/mockito/mockito-4.6.1-r1.ebuild
+++ b/dev-java/mockito/mockito-4.8.1.ebuild
@@ -6,7 +6,7 @@ EAPI=8
# Tests not enabled, wants junit-jupiter.
# "${S}/settings.gradle.kts"
JAVA_PKG_IUSE="doc source"
-MAVEN_ID="org.mockito:mockito-core:4.6.1"
+MAVEN_ID="org.mockito:mockito-core:4.8.1"
inherit java-pkg-2 java-pkg-simple
@@ -16,11 +16,11 @@ SRC_URI="https://github.com/mockito/mockito/archive/v${PV}.tar.gz -> ${P}.tar.gz
LICENSE="MIT"
SLOT="4"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
CP_DEPEND="
dev-java/asm:9
- >=dev-java/byte-buddy-1.12.12:0
+ >=dev-java/byte-buddy-1.12.13:0
dev-java/objenesis:0
"
@@ -48,6 +48,7 @@ JAVA_AUTOMATIC_MODULE_NAME="org.mockito"
src_prepare() {
default
+ # dev-java/byte-buddy is built from byte-buddy-dep without shaded stuff.
sed \
-e 's:net.bytebuddy.jar.asm:org.objectweb.asm:' \
-i src/main/java/org/mockito/internal/creation/bytebuddy/MockMethodAdvice.java \
diff --git a/dev-java/msv/Manifest b/dev-java/msv/Manifest
index 875c65d2afd6..9475f768708b 100644
--- a/dev-java/msv/Manifest
+++ b/dev-java/msv/Manifest
@@ -1 +1 @@
-DIST msv-core-2013.6.1-sources.jar 1011944 BLAKE2B 474d8a45bc5f16ec76dbe853a835b66cd1d733973ffad0dd5e0a653d349f075e22a72d29d91da312a9a133218f4187ece15fd66b19dc34bc00cdea72b95a5929 SHA512 3985451ff52e50957fdc22ef598edcd7b02495b834a53a048018064d1a6063d4554a7cb5d7752c2d265b852d17c7a55787d9b1ec2b580988ad005fcbc9c6eb8a
+DIST msv-2022.7.tar.gz 2594951 BLAKE2B fce006f4b845efcd930b7999ac00eaab06c404888eb73a6eeab6cfad616b4922271d2d682abc82f3be4c4f6a791aa14681f6e6bfebd2118ac3aa2bcba41fd1f8 SHA512 315342628f79c561883be0d966211dd81daae66a414dcc9bb5a87d86f97121d38b5835e9a6d1ac7c21ccff46040e53d3cabd32e9ea677c9ca4335a86c5259949
diff --git a/dev-java/msv/metadata.xml b/dev-java/msv/metadata.xml
index a12324e097b7..d52f73b93e44 100644
--- a/dev-java/msv/metadata.xml
+++ b/dev-java/msv/metadata.xml
@@ -1,12 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer type="project">
- <email>java@gentoo.org</email>
- <name>Java</name>
-</maintainer>
-<longdescription>
-The Sun Multi-Schema XML Validator (MSV) is a Java technology tool
-to validate XML documents against several kinds of XML schemata.
-</longdescription>
+ <maintainer type="project">
+ <email>java@gentoo.org</email>
+ <name>Java</name>
+ </maintainer>
+ <longdescription>
+ The Sun Multi-Schema XML Validator (MSV) is a Java technology tool
+ to validate XML documents against several kinds of XML schemata.
+ </longdescription>
+ <upstream>
+ <remote-id type="github">xmlark/msv</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-java/msv/msv-20130601.ebuild b/dev-java/msv/msv-20130601.ebuild
deleted file mode 100644
index a3e3eb88b963..000000000000
--- a/dev-java/msv/msv-20130601.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_PV="${PV:4:2}.${PV:6}"
-MY_PV="${PV:0:4}.${MY_PV//0}"
-JAVA_PKG_IUSE="doc source"
-MAVEN_ID="net.java.dev.msv:msv-core:2013.6.1"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Multi-Schema XML Validator, a Java tool for validating XML documents"
-HOMEPAGE="https://msv.java.net/"
-SRC_URI="https://search.maven.org/remotecontent?filepath=net/java/dev/${PN}/${PN}-core/${MY_PV}/${PN}-core-${MY_PV}-sources.jar"
-
-LICENSE="BSD Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-CP_DEPEND="
- dev-java/iso-relax:0
- dev-java/relaxng-datatype:0
- dev-java/xml-commons-resolver:0
- dev-java/xsdlib:0"
-
-DEPEND="${CP_DEPEND}
- >=virtual/jdk-1.8:*"
-
-RDEPEND="${CP_DEPEND}
- dev-java/xerces:2
- >=virtual/jre-1.8:*"
-
-BDEPEND="app-arch/unzip"
-
-JAVAC_ARGS="-XDignore.symbol.file"
-JAVA_SRC_DIR="."
-JAVA_RESOURCE_DIRS="res"
-
-src_prepare() {
- default
- mkdir "res" || die
- cp -r "com" "res" || die
-
- # The only resources to have are '*.properties'
- find res -type f ! -name '*.properties' -exec rm -rf {} + || die
-
- sed -e '/resolver.tools.CatalogResolver/s/com.sun.org.apache.xml.internal/org.apache.xml/' \
- -i com/sun/msv/driver/textui/Driver.java || die
-}
-
-src_install() {
- java-pkg-simple_src_install
- java-pkg_register-dependency xerces-2
- java-pkg_dolauncher "${PN}" --main com.sun.msv.driver.textui.Driver
-}
diff --git a/dev-java/msv/msv-2022.7.ebuild b/dev-java/msv/msv-2022.7.ebuild
new file mode 100644
index 000000000000..4e917361678f
--- /dev/null
+++ b/dev-java/msv/msv-2022.7.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/xmlark/msv/archive/msv-2022.7.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild msv-2022.7.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="net.java.dev.msv:msv-core:2022.7"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Multi-Schema Validator Core package"
+HOMEPAGE="https://github.com/xmlark/msv/msv-core"
+SRC_URI="https://github.com/xmlark/msv/archive/msv-${PV}.tar.gz"
+
+LICENSE="BSD-1"
+SLOT="0"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
+
+# Common dependencies
+# POM: pom.xml
+# isorelax:isorelax:20030108 -> !!!groupId-not-found!!!
+# net.java.dev.msv:xsdlib:2022.7 -> !!!suitable-mavenVersion-not-found!!!
+# relaxngDatatype:relaxngDatatype:20020414 -> >=dev-java/relaxng-datatype-20020414:0
+# xerces:xercesImpl:2.12.2 -> >=dev-java/xerces-2.12.2:2
+# xml-apis:xml-apis:1.4.01 -> >=dev-java/xml-commons-external-1.4.01:1.4
+# xml-resolver:xml-resolver:1.2 -> >=dev-java/xml-commons-resolver-1.2:0
+
+CP_DEPEND="
+ dev-java/iso-relax:0
+ dev-java/relaxng-datatype:0
+ dev-java/xerces:2
+ dev-java/xml-commons-external:1.4
+ dev-java/xml-commons-resolver:0
+ dev-java/xsdlib:0
+"
+
+DEPEND=">=virtual/jdk-1.8:*
+ ${CP_DEPEND}"
+
+RDEPEND=">=virtual/jre-1.8:*
+ ${CP_DEPEND}"
+
+S="${WORKDIR}/msv-${P}/msv"
+
+JAVA_MAIN_CLASS="com.sun.msv.driver.textui.Driver"
+JAVA_SRC_DIR="src/main/java"
+JAVA_RESOURCE_DIRS="src/main/resources"
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_SRC_DIR="src/test/java"
+JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+
+src_test() {
+ # Selection according to pom.xml#L182-L210
+ pushd src/test/java || die
+ local JAVA_TEST_RUN_ONLY=$(find * \
+ \( -wholename "**/*Test.java" \
+ -o -wholename "**/*TestCase.java" \
+ -o -wholename "**/*TestCases.java" \) \
+ ! -wholename "**/*\$*" \
+ )
+ popd
+ JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}"
+ JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}"
+ java-pkg-simple_src_test
+}
diff --git a/dev-java/objenesis-test/Manifest b/dev-java/objenesis-test/Manifest
deleted file mode 100644
index b705a57d89bb..000000000000
--- a/dev-java/objenesis-test/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST objenesis-3.2.tar.gz 123629 BLAKE2B d875224d7a9fcf6173787edaca35f58f72d6c85ee443831be8050170ba826e8a155c7983c62ef5d01a1bb8331943dd6da5cb50eefb87cc0c7d3db540b01fcac3 SHA512 8f0bf9449191bce1823be0cbae85438edf595bde0483bb2fb4415a880b6715ae60826473bd5ee15789a7d0638932878dbdaaf7b42a6d582aa7bbf09124e97e3b
diff --git a/dev-java/objenesis-test/objenesis-test-3.2.ebuild b/dev-java/objenesis-test/objenesis-test-3.2.ebuild
deleted file mode 100644
index c3a83dc1fbc7..000000000000
--- a/dev-java/objenesis-test/objenesis-test-3.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom objenesis-3.2/test/pom.xml --download-uri https://github.com/easymock/objenesis/archive/refs/tags/3.2.tar.gz --slot 0 --keywords "~amd64 ~arm64 ~ppc64 ~x86" --ebuild objenesis-test-3.2.ebuild
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source"
-MAVEN_ID="org.objenesis:objenesis-test:3.2"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Test library for Objenesis library"
-HOMEPAGE="http://objenesis.org"
-SRC_URI="https://github.com/easymock/objenesis/archive/refs/tags/${PV}.tar.gz -> objenesis-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-DEPEND="
- >=virtual/jdk-1.8:*
-"
-
-RDEPEND="
- >=virtual/jre-1.8:*
-"
-
-S="${WORKDIR}"
-
-JAVA_SRC_DIR="objenesis-${PV}/test/src/main/java"
diff --git a/dev-java/objenesis/Manifest b/dev-java/objenesis/Manifest
index b705a57d89bb..955ff2825c1c 100644
--- a/dev-java/objenesis/Manifest
+++ b/dev-java/objenesis/Manifest
@@ -1 +1 @@
-DIST objenesis-3.2.tar.gz 123629 BLAKE2B d875224d7a9fcf6173787edaca35f58f72d6c85ee443831be8050170ba826e8a155c7983c62ef5d01a1bb8331943dd6da5cb50eefb87cc0c7d3db540b01fcac3 SHA512 8f0bf9449191bce1823be0cbae85438edf595bde0483bb2fb4415a880b6715ae60826473bd5ee15789a7d0638932878dbdaaf7b42a6d582aa7bbf09124e97e3b
+DIST objenesis-3.3.tar.gz 125400 BLAKE2B 36cff7cb5a2dca9a81f3ca07d56995f68d9c61c9d2b7caeac5f87bb13da02b0494053927e2221c776edef0bafb862f5c97dfc0e79cf991c6c970b5b9206a5aa3 SHA512 786fe0d2d1dba0f006d5218101578d8fd23616765f5cdb4df190d138fd10dd675b9189887c27a40b63f09ed5e1dac1324b2936c7ac24a655e6f63d53b9cd7c01
diff --git a/dev-java/objenesis/objenesis-3.2.ebuild b/dev-java/objenesis/objenesis-3.2.ebuild
deleted file mode 100644
index b752785e109c..000000000000
--- a/dev-java/objenesis/objenesis-3.2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom objenesis-3.2/main/pom.xml --download-uri https://github.com/easymock/objenesis/archive/refs/tags/3.2.tar.gz --slot 0 --keywords "~amd64 ~arm64 ~ppc64 ~x86" --ebuild objenesis-3.2.ebuild
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.objenesis:objenesis:3.2"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="A library for instantiating Java objects"
-HOMEPAGE="http://objenesis.org/"
-SRC_URI="https://github.com/easymock/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-# Compile dependencies
-# POM: ${P}/main/pom.xml
-# test? junit:junit:4.13.2 -> >=dev-java/junit-4.13.2:4
-# test? org.objenesis:objenesis-test:3.2 -> >=dev-java/objenesis-test-3.2:0
-
-DEPEND="
- >=virtual/jdk-1.8:*
- test? (
- >=dev-java/objenesis-test-3.2:0
- )
-"
-
-RDEPEND="
- >=virtual/jre-1.8:*
-"
-
-S="${WORKDIR}"
-
-JAVA_SRC_DIR="${P}/main/src/main/java"
-
-JAVA_TEST_GENTOO_CLASSPATH="junit-4,objenesis-test"
-JAVA_TEST_SRC_DIR="${P}/main/src/test/java"
diff --git a/dev-java/objenesis/objenesis-3.3.ebuild b/dev-java/objenesis/objenesis-3.3.ebuild
new file mode 100644
index 000000000000..7ce789fc392d
--- /dev/null
+++ b/dev-java/objenesis/objenesis-3.3.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# No tests since we don't have junit-jupiter
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="org.objenesis:objenesis:3.3"
+# JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="A library for instantiating Java objects"
+HOMEPAGE="http://objenesis.org/"
+SRC_URI="https://github.com/easymock/objenesis/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
+
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
+
+S="${WORKDIR}/${P}"
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_SRC_DIR="main/src/test/java"
+
+src_compile() {
+# if use test; then
+# einfo "Compiling objenesis-test"
+# JAVA_AUTOMATIC_MODULE_NAME="org.objenesis.test"
+# JAVA_SRC_DIR="test/src/main/java"
+# JAVA_JAR_FILENAME="objenesis-test.jar"
+# java-pkg-simple_src_compile
+# JAVA_GENTOO_CLASSPATH_EXTRA+=":objenesis-test.jar"
+# rm -r target || die
+# fi
+
+ einfo "Compiling objenesis"
+ JAVA_SRC_DIR="main/src/main/java"
+ JAVA_JAR_FILENAME="objenesis.jar"
+ JAVA_AUTOMATIC_MODULE_NAME="org.objenesis"
+ java-pkg-simple_src_compile
+}
diff --git a/dev-java/openjdk-bin/Manifest b/dev-java/openjdk-bin/Manifest
index c02f9dbe7e25..0b3ef247f47e 100644
--- a/dev-java/openjdk-bin/Manifest
+++ b/dev-java/openjdk-bin/Manifest
@@ -1,18 +1,54 @@
DIST OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.15_10.tar.gz 189998414 BLAKE2B 6cf30a34a8a3e040895763fbf740e370469ecb9f71ab0d10d7b3c313f922981dfdf2eddaa64badac92d45db1a9945ed1389f1794a434b366034d43af263bf57c SHA512 51a2fc7ddff7d64eadfb7e2f496c33176dbfceea2cdcd479528195ce00454d3d9bb5ad82714e59bdae8cf2cf7f75ce9f1dcb9c5d62aeffda9d1ec9ff0262e04a
+DIST OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.16.1_1.tar.gz 190493431 BLAKE2B 22e11711048b1e3e45eabd298c4ad25b2162e794561a4aa704ca2cf9612282b40203a6f16337416d16e065ec4764051a199af5b20803aab1c29c3aea6c2e39c3 SHA512 e61529d6782adcb9ccb78b0f3996bd2927b41a199210e6abec969880763e1b2234ddf04fe254110cc332df499616d67156a3b8376012cd3e6640f37e52ef132d
+DIST OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.17_8.tar.gz 190830566 BLAKE2B fe5581f048cb76c9baa2ab3e4b4ad7b941decbd3d66d370a3c1f152e1337d59944dc3f1739e429725c3f9482839f305a367ab491592e0b694a59c2f8c3eaf9f4 SHA512 ba738a83057029282da0f5d02aa1bb89ffb7ee5040f72a25b0211222a7b6de64939efbf4d96128c92149260a56127e1c9179313627eb5c7a43b78a526f6e3a6f
DIST OpenJDK11U-jdk_arm_linux_hotspot_11.0.15_10.tar.gz 181012868 BLAKE2B b52d2330291ae8f8d74ba98b4679414e86c9018ad364bb27f09b5f192369c0b934654e5b4d8a07027e001da96fb89bd62a18ab5c1acea3c2cea2cc31e20a1481 SHA512 abe8469f5fa4f46f71e35785c6972b2901f003e311086352df6eff6911393c31c01ff965c74772656e2255e0bbb15eee6b761db472c886b60a8cda046fb46764
+DIST OpenJDK11U-jdk_arm_linux_hotspot_11.0.16.1_1.tar.gz 181437038 BLAKE2B d87e38a9600e2f4289637f9b54044bb25777cd7a434eae89800945515ecb3965eae8f4660d18e96f1fb95e2401133e6630d98b3b23d826425bff5bd88e5b99b8 SHA512 72e2846718fc2e2a85a23cb97f49acf9314b7da78a79d3fe9cd0a91d34867bb2a3b6ace359b366caf564bb5d026f19400564e31064691016e9827a450b5e1a6a
+DIST OpenJDK11U-jdk_arm_linux_hotspot_11.0.17_8.tar.gz 181771684 BLAKE2B 17999bd2e1599b1a129f50f4139bcb12fbd4ad0fdd30f2e8024a17a24912820aaa24fab747938f802c1f30d3dea9c696cf8ca858c1438b944ab1c45c1ee21fbf SHA512 8adab075049b52b7b80bb4bd48a8cac0633c7bd6e6b05932464753e03883f33665cd9609038519f048e2cc73e0d78b51ab2d7ca0716ca12ecf6883522c7448d1
DIST OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.15_10.tar.gz 175250283 BLAKE2B 4b4fe6a5018cfa40ac71cfcf41c261887890e339d9e5f57aac55f494abb7a4e99263db151d85698690513caf670acfef29a83616e49d6f845e02cef024624fd6 SHA512 98adf9689782aa78d61f485e671c434cfdfae7ba92a7ce0c2401164250b7def2f881e201835e1ca2ab56a3ae4967c0923f4856171c2a4918f7190adf4b5e0bca
+DIST OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.16.1_1.tar.gz 175833123 BLAKE2B c027ac3c128ee8cc6e62e375c66a642931a9344bd7d06cad6025094a8569d135a2982ead3057da7841ebcc5a02fc8c8db653f8aa09bcc8179122e1c1e6018be0 SHA512 f3af5dc335d0573ed89037a6227e96e75ec2031af6653f3a034b2d5e0737f1edc875aa883050783c6d556ce5a55ce4f9cd7859b574915b994b58fb26d906fbfd
+DIST OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.17_8.tar.gz 176227429 BLAKE2B 7b8dd16eabec342d606d4a342d25f669d879a7ab259f9b88a2fc95fd11bc0883ad2d21d69881c6e25d71ef500be9326eda4c17c79aa00c075c50bb69b0cf94e7 SHA512 bfedee850260e7d9dcd441832859de59f572626ca7c48eb52ab2122a31f6de3857cd766a582159508a2782dbd63abfa175f32a4963ef72d7070e2749164d7824
DIST OpenJDK11U-jdk_x64_alpine-linux_hotspot_11.0.15_10.tar.gz 193336087 BLAKE2B 0f61aba6b76b019ef7271dd92cd4b6db432318d629b5485e2f85a9ca586f1ce6b6d3e2c48486a4f3d90f8730e3fc7dd4f0975849f7c0f820812625556331db87 SHA512 360a349b34f2194498d0800145b54e5532b8a2137d7526a692a855a036d1cb6ef185bdeffaff63bb8cce71c7a0b10fee6acfb1024db8d2ec0cd485baa0683304
+DIST OpenJDK11U-jdk_x64_alpine-linux_hotspot_11.0.16.1_1.tar.gz 192644240 BLAKE2B c7e77e1b620f6df33d63656a09203bd3d700579a8730141ea4a20424f844c6afc09f4c6681fa66c3fabab0cc9505293cdeed04fa16b0accc49209e0ea4877ba6 SHA512 457df026841f11a424e8f8fe789ba4968d60b0a06deef01a69911ec2084fd4f14ae5dfae543bb646881ce8e4e34665c65670943a43cb2a83c6923122801de468
+DIST OpenJDK11U-jdk_x64_alpine-linux_hotspot_11.0.17_8.tar.gz 192983282 BLAKE2B 3b19eb7bd47f30bcdcd9e2c5745cc034913150aac28cbe4573854e1d4a7a1eeb6ec1a95c1d082fc44fc097ddd0f0ee6b8c41ffc9c70239fd4fe723e22aa11b2f SHA512 26ec3b483f24e70c4d75f43debe91ef78dc721cdbafe38513feaae66e54c538a240d93d354443114550392644fa5faddf06dc61c87abb1bee80bf324767b143b
DIST OpenJDK11U-jdk_x64_linux_hotspot_11.0.15_10.tar.gz 193245074 BLAKE2B 0a559bd0513984c2bc93e31ab7afcb8f5fc152c9984d957359bf1901e46b25b25ddee81c4c8fc0f560e65b343f74e39c55a1af61526fceec0eb530309eb65383 SHA512 85b21da3ff777b6239df5534ee3539b256a1de5d02abf4f537bca38d2cbf8006b4130d8bde2e24835a8da7a651fc8852df2c5060d26b9d594927f4d609912554
+DIST OpenJDK11U-jdk_x64_linux_hotspot_11.0.16.1_1.tar.gz 193754645 BLAKE2B 5ab76378de497da3e59b5c33025322aacfa67edfa9766fbee346399f8dca71309aa9e6c6ad43a59c2bc7033fc01806b045832ee6b57f08956a2d696e760c247d SHA512 38aa02b8ab14b678b226891ffb2d2ab1248202d595e8c37ded3479d3d0a210355df75cabb62b03ccfae5369965e80ab4872cf7f530d0ddbc4cbf4c9a0f922e37
+DIST OpenJDK11U-jdk_x64_linux_hotspot_11.0.17_8.tar.gz 194082362 BLAKE2B 14dc6f09cadc774b7f69914c468daafb00686fca376f22acb5b7777d8d767e22baa58201aa062c4ab229d77f4311116dbc1b02c49c56439612c4c5e0df5ccecf SHA512 f74b704581f3cfb66d4df79f9583ce0e3e94ff0b4930188485c57594af507359dcd579d22aeb9dede3c2d7bc2e8a51212c615f9a367ddcc180fe8a318efaf95b
DIST OpenJDK11U-jdk_x64_mac_hotspot_11.0.15_10.tar.gz 186328533 BLAKE2B 72f662e4aed529de853e47b848b46c15fade1a8c120f83b3409492801084114724f1d3875fedf1607133192ef5a612dbab828e578bff98adf1605fd990a24b21 SHA512 af69ea99e3d3b7ae84405190a12f788348162fd235aa5df8ce7ea3127d961e015b51cf70277aefa0e29a434ba10876812e997a063c5aaedafa460fc5451783c7
+DIST OpenJDK11U-jdk_x64_mac_hotspot_11.0.16.1_1.tar.gz 186335152 BLAKE2B ce97404fe164c89cc43d053e14a4abd596c104a6dfa355cc011de274aa5e1b9d2d5cb881299fad7877fd0b49bf1f738672eb565d4c543720d059663b34fd5da6 SHA512 6ccbbf271e23d6d2315ac62e5ea574991e728a4298cbf217aa7fffb3717c6a13cd82a467d15a0be9699e7b9e9a062ed0f10772165a40604f2f3c8e02729a6eaa
+DIST OpenJDK11U-jdk_x64_mac_hotspot_11.0.17_8.tar.gz 186594836 BLAKE2B 00d52b8e2f750335e87358df56bd94082370832b2ae01cc200c1fb96c8401e7dc941cd1eeb6a8f9c33319440a82d2f98d243a1c14a0c15620e0226280e159c96 SHA512 342a68be1779680161174cc24a8111e72bb9bd2ff5a92a67d4b901538a81dd694fb90eee1f890ea6d8e2a89727a31ea2dc8b97091cc8e43c9f842b114530f485
DIST OpenJDK17U-jdk_aarch64_linux_hotspot_17.0.3_7.tar.gz 190142132 BLAKE2B e6b0fb199ba788a31b6238d3bc458216baf37f1517a449be63668c412dfe7662d644ffdb312194533d4af089ac2753c164059978d65eddd951bb98bfc108da87 SHA512 f406ae289659e902dd3314d40485c1f3b04915451794c2bebfb1eeda7c83dbf051c26461aec7fe07c1a43f5319f80044aefc99c9177e2a9ca0a31a9c9f06c157
+DIST OpenJDK17U-jdk_aarch64_linux_hotspot_17.0.4.1_1.tar.gz 189797923 BLAKE2B 8732ba8ce23d8ebdcac7fbb2c6035c3cafd11eda4853b948327c6c9839a88294d5c89a03006d542c8ab797b3d4d570aefc6289ff97338d68089387d0ed742d3c SHA512 d2bcf2b766e3135320f28de1df47c3d3f9012281501390ffb6a4c01f59c72fccd348139f4eeb0a9bcce747ed8cfb04f2c8d78161dda2f2f6e0728993f8953061
+DIST OpenJDK17U-jdk_aarch64_linux_hotspot_17.0.5_8.tar.gz 190100891 BLAKE2B dcf1aca6db5af78d39a0e27422c3c9d17b7e459dad73fa74a475881a221a235f8ffbba1633a1d4858efa4e38d11a5f6e15a2eeb5a580edb0ce3ba7eebb559967 SHA512 7d16ee70f6f8a17cd22adfddd29d23e8cc74c24cae7a33cced6f73e16767da217c9959e82033cadf9c20d887f521a6807304ec80a23a033040b179b348312034
DIST OpenJDK17U-jdk_aarch64_mac_hotspot_17.0.3_7.tar.gz 177467402 BLAKE2B 38b8508e81bcbaf90a1db9bfe3f804da9838cc43b6043c328d19523c83dc5d953465a1018a9054979163140a28f5e213815634005cf096f6932407e8f7ccf9a6 SHA512 0433dc839a98b810cad9fe0d98c46cabccec5ceb44fd5bc67fff0c27962f183a3814b9aab521768b578d8f11bda97934629bf9fce5c010cdc93c685b842566e7
+DIST OpenJDK17U-jdk_aarch64_mac_hotspot_17.0.4.1_1.tar.gz 177121101 BLAKE2B bfbbdfdf77e5f52bdef3bc9ab387590f2d02ed7f039ab49b15127b9a09430b0a9cfadde04cdb70668812d68ed4279dce3fceee6183d469e0ff4b37f43bff60cb SHA512 36403f81c06c4d7bb76058bae6a4e5c94d3c134f9b6ff9ec4b9f8ab9437195f0e2e2c2770cea4d765a182a0b2fdfc4b7fc4343fa5170af5720343d3fe0302e02
+DIST OpenJDK17U-jdk_aarch64_mac_hotspot_17.0.5_8.tar.gz 177335828 BLAKE2B 9c4748b4099f2d6d3bcdd709c294f1d1f7fe8731a389362d30e2717acf79d79279f1c8d6d05bb6a11a8d3fad0cabcc166ce7db44a4a31dee9f3b45f4565c7c18 SHA512 858dd4ebb5844acd40a517dd849d284521375286d5e025558c50fc406306d1aa6160af07ecfa43f35f7e30c2bd3845c63814edbe2e6c85f611aacb8da2e2019d
DIST OpenJDK17U-jdk_arm_linux_hotspot_17.0.3_7.tar.gz 188309462 BLAKE2B e47b98ebcb661631732e3238ce3cd1630a0a2103d7e32beabb49d1a0ff216c34c0c39fac11a848474a36dd2c98f6724c58900e3026d04cb7e4f7f00adbe1fe18 SHA512 9158821b22633177866ac0a5c4ffd774d2d750adea2de2adce661060ab7d28cf67fc703eb9e0e200149fa03eb040a05dc45ac944dacd140e0d0fa06515584795
+DIST OpenJDK17U-jdk_arm_linux_hotspot_17.0.4.1_1.tar.gz 187944772 BLAKE2B 6e04360ff4abec1bb76d5e73bc21716a935224ccd799ab4ee09f989a996ba4684677cd28545f90ef9a5d53e1ecb46a0e1d641c6c41aa93f74992b53cc19ece5e SHA512 850a0241ee1c67b5f8c2350432de82d3d264015cad7455f98d392b5bf32bc0b44aeaf1fc9b42035a2a13f157f57e833667329970e61f4626b88bbb4fcfd39482
+DIST OpenJDK17U-jdk_arm_linux_hotspot_17.0.5_8.tar.gz 188272844 BLAKE2B 7a86c2c4f27322ffe9e2296ab8a0042b0f3e900c11605a06c64bb5817dc9d9e0235e55e27d08ebd53ecbc7b85cc0ce6f3421b8f87e3779e5585104533a371bfb SHA512 dfbddc376da65abf7cf73fc4a9bd5e85488f996035c7b9d1d8e5624e999b688c76ffb53030d09d8e482c91c79771bfb10e7536a081537eee3bac8ba54b624690
DIST OpenJDK17U-jdk_ppc64le_linux_hotspot_17.0.3_7.tar.gz 190898839 BLAKE2B b5188190ab30393ff789724ca99ce89232d8a4d81c22205111da4cc60cc258fe5bee47a5550cf032937542d7fb677af0de9aebbe39fe20b4af223a6d7d3211e5 SHA512 e1f1ade72f12c21eef9d34d05e2a4a8228320138d0c626c4eb31431ac9d5e5123ec8ef24c168005e3bb3508537c826399122461a0ce8de1310ccab40d8d21145
+DIST OpenJDK17U-jdk_ppc64le_linux_hotspot_17.0.4.1_1.tar.gz 190474121 BLAKE2B ac8b741cf29816960de615999d5030f03677fc3a370c0c430d408802535cbbb2b304aa18d036529d29c1939c2d43ff84bdddeb15dde5a22bbda7c807ddc900db SHA512 04c9182fc503369b7dcf53729e3c5e7f16828477e168d279806c7968482588ee5a04b1c31407c2baa1c1d24468592e1e416a9ea2115391113b83e792457e31b1
+DIST OpenJDK17U-jdk_ppc64le_linux_hotspot_17.0.5_8.tar.gz 190798083 BLAKE2B 5750a7a908f2b679edf337b7f6795ea598a57bc2298ab9ef2ccaf7e6b2d6f81802eae120c8f971ed79ea8f8b6ee9607f28a2113e37005bb6528b37a33f6dd670 SHA512 636ad7c5363c1173655ca734f4184ad2ffaeac49ec20520fa75d337c52bf3517ac86d9f7552e0158adb73def293372eaa14625cdec927f09062596586b861b1a
DIST OpenJDK17U-jdk_x64_alpine-linux_hotspot_17.0.3_7.tar.gz 191298712 BLAKE2B abcb97374d38cb7457139865617d7570627d390c0db47ed572048dbb9f35b7cf6cf1a7d973684607ce3f7477f9b03b85ba43b8b4447b04f9fe1bfe419a18d190 SHA512 4e69597c134f37db83b44fd86e13c25ded20d8a1b2d8e959b6ddee29e5cc8c2a7bfd449636399f2d7bf030d93b2a29236e614a1578f9bbd37ca7e12249dc80bc
+DIST OpenJDK17U-jdk_x64_alpine-linux_hotspot_17.0.4.1_1.tar.gz 190514211 BLAKE2B 07f802438dffcd54b07ea5342ee78fcfecaf51bac90666aadce34c871f25df6e21a30565e17952dd13fc5da9f032eaa931b66a725f416c98bcbcad0a1d584ad0 SHA512 927a83458e89ff8acd82a443cfe08d6cd93e73bec3311661d2bd4e09eba151088e0d1f40206f50c681586d6629a02c4549fc97df043edacb255e841ea17c83f4
+DIST OpenJDK17U-jdk_x64_alpine-linux_hotspot_17.0.5_8.tar.gz 190792800 BLAKE2B 6406f30e88b409a23f9fe96fcf833290c0fce00b0b7951bbf104d93149a9a5571655143502dde101d6ffd559eaf48f34840e08d38d87e129a1b0dfc0250d4602 SHA512 2312d538e697161c1378793fdd8f63dd46db76041be22d3243b7f9bea964b422a0fc7daf18f7dec228bedb49602dd104908915d6f4ea3c7b893fb52630d57980
DIST OpenJDK17U-jdk_x64_linux_hotspot_17.0.3_7.tar.gz 191514138 BLAKE2B 3e2d64cdf15c63f2f50148576bc8ed085ec808a28a07113910f7b04c5729a1a56840751da627d8012751a7b533f6730c3a9bb99914382caf82f63e5a65dad40a SHA512 144f1e1c0f9558bd0be0536b48b89081579d1232d75c00fcfb7be2460475a4eaf3a6ae89007e683fd6148b4ebf33c2d9492419db96090e07f4ae52afc71df861
+DIST OpenJDK17U-jdk_x64_linux_hotspot_17.0.4.1_1.tar.gz 191174859 BLAKE2B e6552e71279ca4a6d04a6e6d5a1707720fa7900c03fb31e312dfacf44d4dd699f657fe2f672881783a1918bac1598a99b4c56d90bb42b2c28a75762ea647f2c3 SHA512 db61842d4482da4fd5b86aee5b1c7f7c28218a58d73850513f272153a1ab09374462cd0d6f631b69f30204e5cfaca44357fa481dc4ebc67a50eda5b71a761082
+DIST OpenJDK17U-jdk_x64_linux_hotspot_17.0.5_8.tar.gz 191466567 BLAKE2B 688a939a48f39ae112c415ec4523a65f6bb311250142fdb66efc4a986744306b44704450aa0abc5ad5608293b6300c82956131d832d8e8577772a4e9b71e96d9 SHA512 c77a59ef59690108c90677125f6ad93959f1618096334d28cf9c9d22db96a728576bd25e6ac2df62cc0f8656cf4b9f6b9a72743f31fb40ba74c794a2a8226380
DIST OpenJDK17U-jdk_x64_mac_hotspot_17.0.3_7.tar.gz 187277835 BLAKE2B 2a6766ae47281222a570485bbb67b10b78b2d17399a2fd76e254be3d30808a09002fe6fcf5814be044c4a95c3f791af4b45df9320cea5ec212f9db38329b1630 SHA512 00cb5c5628ef2fcbc44ffcb2f81b8cae8c57107df8c456b4f3bf6897269daebdbd9ce0fe78af686cebedbd2426fa85095b198d47578828404a1b046eb0cbca60
+DIST OpenJDK17U-jdk_x64_mac_hotspot_17.0.4.1_1.tar.gz 186906753 BLAKE2B e86da7cb28aa43fde9ab947fbe886ed2ce4985d15a3aabf846f5bfc647203fe330f5333c9a7bf30936b2b566424c695c83b246baeda10b32de1b59a118414fb4 SHA512 b4911f006af320acf7ce18ae981a3a29d72d6fc1190bf4a0cd47f389d415de4980f65a0007a7cdcd8f15b7434b2e0e772acf4dcb3b76daa32841c7b4016e9458
+DIST OpenJDK17U-jdk_x64_mac_hotspot_17.0.5_8.tar.gz 187174050 BLAKE2B df8a7369f7beb49f57bdba9e291471f805d427bdd019528cfc7874b49335b8598e614cacf82b64c0f6a3dfca055c174eaa30a0a3723effc958c40f826d1c10cc SHA512 29f848434cee5345d23434fae28e20fb722ae181cfbd0ec966aa730e05937015586a31d694cba4556fcbccb96752373fc8c13c2748f9ee5a30a243f3ce239989
DIST OpenJDK8U-jdk_aarch64_linux_hotspot_8u332b09.tar.gz 102003248 BLAKE2B 75eb1dc4e09f868ca1a5f0ccc275e36992414e250c2815ab2a6e879942dfdd57a069d6d2cc79aee967c8d2077cecef6d65285cf870e70d22aebef607e906dbec SHA512 cf716f9a614932ccffeb8a7a2ee3a2f10543b31b8f6953933ba4785f386873fe00fee69061c70c26b55a6db13f26ba529f9953d7f3fce9b42172fe3b4e0eee52
+DIST OpenJDK8U-jdk_aarch64_linux_hotspot_8u345b01.tar.gz 102022940 BLAKE2B 40b14e0399de76c6dd2bdc9cd6b3aba7d62cddbb636a2b11a905dc432b0aa91ad62d415203f3f83c0ba82c3667f83a485ec57e71077c26c8eaf35c0f08edd713 SHA512 d932f0a0101fdce350e48a4a79754477478b6c345bdd66bd63be53a10fe6e613b89028d4ebb03d48e85284d5a1caca7f128690765e91968e01420f5fbc08ce48
+DIST OpenJDK8U-jdk_aarch64_linux_hotspot_8u352b08.tar.gz 102045265 BLAKE2B f75bafbde083abfd606f1a916d6bb0245dd8087260fde954611db79de55e95a5c7feb4d5ed50c9e23de4b698d2a9aa180f73d73c52d5f3956b17681edff98d01 SHA512 a37c05e14bbd9c419a62fdaa9a9cb3ec4f1a1135424beb093c91d55873bd79fa3ef63a8fdf05695d709c9c3fc406386a16b1bfc898dc2690361d97df8c3fe1b5
DIST OpenJDK8U-jdk_arm_linux_hotspot_8u332b09.tar.gz 98261468 BLAKE2B 7fe2b5c6178af88ebf390352f67acca7216af23d6015beb8e94215d1af82b41c2b8e8790c00b5fbf363837a98ddb051a6ebede5fe78f471f09331c1014bd85ec SHA512 17c9bdc892dc479bd7c5bef2ab3a6637cc499e1c257d6ddd541e7f372d6737d644920538e0c39e8aa7c905f0f1172429cc171d608bd337e872be7b399733b25e
+DIST OpenJDK8U-jdk_arm_linux_hotspot_8u345b01.tar.gz 98273349 BLAKE2B 71556f01bcd6f513af963fc9c9b2269460faa9f23ad85429fefddc169038aa1c98fb505184aa216f08b96a31d5d8e10d831ef65d7f9dba9499783eafca08b824 SHA512 8e9a5155cd8f769c25b79863ccfa8956cfd252278eca7f105d7179cca9ec2035580d959a5662aa263d852699000478344fab816301a809961cb2d1d5ccaed758
+DIST OpenJDK8U-jdk_arm_linux_hotspot_8u352b08.tar.gz 98283632 BLAKE2B 936091ac36cf393c14528e527e94aba8415706aa4d1b77ec03be3ea0566ef85913dfdb53f41eb44f555f7a6ca54e9bac96064069ee28809120f854ef406f46c5 SHA512 e11db4aaec318fb01cc6e840bf07207daa967e38e71302eed988f5409370ec14f853b58e8dbe07583997e2345eae101097e80aff02feb034f34536a84580c4de
DIST OpenJDK8U-jdk_ppc64le_linux_hotspot_8u332b09.tar.gz 100484069 BLAKE2B 7e3b0186947f19094d88140304e756b7b2728560299f330c84ed8f9ac77c40fb046c2731d22c5d30e5d2837b878caccb19e8f1174f272c2fb29905db15500640 SHA512 adcfa446254c7de8b80f040e7f9960625c0314dabc8b457dee9d95216050f9aedc0c59528c29f7f1bc950c3ed0b713f3234dd9f9fb2a5bab7e706dbdb2eef42d
+DIST OpenJDK8U-jdk_ppc64le_linux_hotspot_8u345b01.tar.gz 100474631 BLAKE2B 32c98c9b0c97b427b880589c26002fa67f90980b099090a8b43a0c4b3d71319617126b55da7102abe9d15b0b3569fdd7f4288936607258a278fe805e875d469e SHA512 37501b2c3ebe224404c34a847ed643a95ebf85aa6b8412bc3405ff3afdbecb9a69b2324b774d96d9cb5ba44170d84f6ac0026ea66c1074c13ef06c330952c9fb
+DIST OpenJDK8U-jdk_ppc64le_linux_hotspot_8u352b08.tar.gz 100508249 BLAKE2B 0fe530829d3205904b2ae239598c6c5d158e1be5c87ee3616b15f23088b40f5d800fc5f2fd5ad0aa9342508297eb8b3b33d0c2d4149e12b6a261be7d57764628 SHA512 9592e64484b62bef89071862eb5a6e4fde412a99a43c0eaf3f412964016ead60b73fde844b4f1909dd4e839cc7509f65184f9f9445a06642365104f642758a9b
DIST OpenJDK8U-jdk_x64_linux_hotspot_8u332b09.tar.gz 102918585 BLAKE2B 55d7ef116ee28f37ab1a96cb8ffe021d1784b208ad248e78d6f0a7f22429364364e00ef17fe6159fac2fde6a0765a20125db6ce17694992dbc9e3b3e054adddf SHA512 9f387fb8b872b65fc6a545151c185b9ad1aaac7ad7cffac4d2b936dedbca116a7d74e56754353ffa4caed394497ca659852f0e5e3803ead10f8fa95d562e28a8
+DIST OpenJDK8U-jdk_x64_linux_hotspot_8u345b01.tar.gz 102925260 BLAKE2B ce4e79c98f5f3b2119fafd0ad43ca64bc823ff9adf20cd76e4e8c0de34ddc11cce7311d0ffc1cdcaab70632b3c18dca5b57c916a01230b22fcc74c4e8e08e3c9 SHA512 92bafba262a269ec3be7d83d8ca36468ad69d850d44b373c04c92a14c74a9aa89314f2aa68a6565c41b302c60fb8d19f1cf0f3075924a497e8be05e8a08ce95d
+DIST OpenJDK8U-jdk_x64_linux_hotspot_8u352b08.tar.gz 102942531 BLAKE2B 3e59f7495e7c79e93b39e596f445738b6c809388367b1f41b5925b6f63bd81feff05dc6587d8bbca6c56187f22c048bf108032a45373096ef95389cc1fba7ebb SHA512 a6dfbc34a95f91749db11fed76e918288f2eb64234bc63f1e39db73cce918de419df6dd7a69fc4aaffac559d0b35c9ed2c782ef061e026096183028ffe24ae95
DIST OpenJDK8U-jdk_x64_mac_hotspot_8u332b09.tar.gz 107924497 BLAKE2B f1f283b33f2e81a15f6ba01b7c2c63093b8a12dd0c9853ff9a2cea8d5352b6994266e8653135574f59a24da7294e602c5dd2fb3524065aa53e21b8313d3b0d33 SHA512 c7474e6a81d9e44e7c48388917de87733bfcb13c99a6d253ba180ac8b826ec79f1871d57dcc3e2edb4929f2687541156770c7568162a95389cdf1606d8e65397
+DIST OpenJDK8U-jdk_x64_mac_hotspot_8u345b01.tar.gz 107934646 BLAKE2B 766fc30b428283a5c4bebad76043e0d6fbdc31c747a09ce4f9440ef1493b4127dd7c0a9d0bf04ca0a6fe9215556224d157355b7cf14e685ed3791b6ca5d226fc SHA512 3a70f6587c858b675adce10063197fa97683157b4e3506dcae2649edeffe32ff8914bddee63a6856c3390c91f97fb79a11ed799f95a73526f48fb96cb92be26b
+DIST OpenJDK8U-jdk_x64_mac_hotspot_8u352b08.tar.gz 107947323 BLAKE2B d1d725cb13ffac50a044a78daf02062aefd421b46c5205069b770b310b2c1403cd36e557ea37de9ad8591ce5f2c5b5eccfba32314987524a4de62b6d16a3b7f1 SHA512 2831a84e1da3f6f979a3b76670676f176b700dbae3cdd5e634056c5f0239b4fdebc6a0ec5cdf11bd930ea10708a6f7ef9c58b46888009c52217c2e0fb324a4af
diff --git a/dev-java/openjdk-bin/openjdk-bin-11.0.16.1_p1.ebuild b/dev-java/openjdk-bin/openjdk-bin-11.0.16.1_p1.ebuild
new file mode 100644
index 000000000000..1e11ae065419
--- /dev/null
+++ b/dev-java/openjdk-bin/openjdk-bin-11.0.16.1_p1.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit java-vm-2 toolchain-funcs
+
+abi_uri() {
+ local baseuri="https://github.com/adoptium/temurin${SLOT}-binaries/releases/download/jdk-${MY_PV}/"
+ local musl=
+ local os=linux
+
+ case ${2} in
+ *-macos) os=mac ;;
+ *-solaris) os=solaris ;;
+ esac
+
+ if [[ ${3} == musl ]]; then
+ os=alpine-linux
+ musl=true
+ fi
+
+ echo "${2-$1}? (
+ ${musl:+ elibc_musl? ( }
+ ${baseuri}/OpenJDK${SLOT}U-jdk_${1}_${os}_hotspot_${MY_PV//+/_}.tar.gz
+ ${musl:+ ) } )"
+}
+
+MY_PV=${PV/_p/+}
+SLOT=$(ver_cut 1)
+
+SRC_URI="
+ $(abi_uri arm)
+ $(abi_uri aarch64 arm64)
+ $(abi_uri x64 amd64)
+ $(abi_uri x64 amd64 musl)
+ $(abi_uri ppc64le ppc64)
+ $(abi_uri x64 x64-macos)
+"
+
+DESCRIPTION="Prebuilt Java JDK binaries provided by Eclipse Temurin"
+HOMEPAGE="https://adoptium.net"
+LICENSE="GPL-2-with-classpath-exception"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x64-macos"
+IUSE="alsa cups headless-awt selinux source"
+
+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
+ )
+ )"
+
+RESTRICT="preserve-libs splitdebug"
+QA_PREBUILT="*"
+
+S="${WORKDIR}/jdk-${MY_PV}"
+
+pkg_pretend() {
+ if [[ "$(tc-is-softfloat)" != "no" ]]; then
+ die "These binaries require a hardfloat system."
+ fi
+}
+
+src_unpack() {
+ default
+ if [[ ${A} == *_mac_* ]] ; then
+ mv -v "${S}/Contents/Home/"* "${S}" || die
+ rm -Rf "${S}/Contents" # drop macOS executable
+ fi
+}
+
+src_install() {
+ local dest="/opt/${P}"
+ local ddest="${ED}/${dest#/}"
+
+ # on macOS if they would exist they would be called .dylib, but most
+ # importantly, there are no different providers, so everything
+ # that's shipped works.
+ if [[ ${A} != *_mac_* ]] ; then
+ # Not sure why they bundle this as it's commonly available and they
+ # only do so on x86_64. It's needed by libfontmanager.so. IcedTea
+ # also has an explicit dependency while Oracle seemingly dlopens it.
+ rm -vf lib/libfreetype.so || die
+
+ # prefer system copy # https://bugs.gentoo.org/776676
+ rm -vf lib/libharfbuzz.so || die
+
+ # Oracle and IcedTea have libjsoundalsa.so depending on
+ # libasound.so.2 but AdoptOpenJDK only has libjsound.so. Weird.
+ if ! use alsa ; then
+ rm -v lib/libjsound.* || die
+ fi
+
+ if use headless-awt ; then
+ rm -v lib/lib*{[jx]awt,splashscreen}* || die
+ fi
+ fi
+
+ if ! use source ; then
+ rm -v lib/src.zip || die
+ fi
+
+ rm -v lib/security/cacerts || die
+ dosym -r /etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts
+
+ dodir "${dest}"
+ cp -pPR * "${ddest}" || die
+
+ # provide stable symlink
+ dosym "${P}" "/opt/${PN}-${SLOT}"
+
+ java-vm_install-env "${FILESDIR}"/${PN}.env.sh
+ java-vm_set-pax-markings "${ddest}"
+ java-vm_revdep-mask
+ java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
+}
+
+pkg_postinst() {
+ java-vm-2_pkg_postinst
+}
diff --git a/dev-java/openjdk-bin/openjdk-bin-11.0.17_p8.ebuild b/dev-java/openjdk-bin/openjdk-bin-11.0.17_p8.ebuild
new file mode 100644
index 000000000000..1e11ae065419
--- /dev/null
+++ b/dev-java/openjdk-bin/openjdk-bin-11.0.17_p8.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit java-vm-2 toolchain-funcs
+
+abi_uri() {
+ local baseuri="https://github.com/adoptium/temurin${SLOT}-binaries/releases/download/jdk-${MY_PV}/"
+ local musl=
+ local os=linux
+
+ case ${2} in
+ *-macos) os=mac ;;
+ *-solaris) os=solaris ;;
+ esac
+
+ if [[ ${3} == musl ]]; then
+ os=alpine-linux
+ musl=true
+ fi
+
+ echo "${2-$1}? (
+ ${musl:+ elibc_musl? ( }
+ ${baseuri}/OpenJDK${SLOT}U-jdk_${1}_${os}_hotspot_${MY_PV//+/_}.tar.gz
+ ${musl:+ ) } )"
+}
+
+MY_PV=${PV/_p/+}
+SLOT=$(ver_cut 1)
+
+SRC_URI="
+ $(abi_uri arm)
+ $(abi_uri aarch64 arm64)
+ $(abi_uri x64 amd64)
+ $(abi_uri x64 amd64 musl)
+ $(abi_uri ppc64le ppc64)
+ $(abi_uri x64 x64-macos)
+"
+
+DESCRIPTION="Prebuilt Java JDK binaries provided by Eclipse Temurin"
+HOMEPAGE="https://adoptium.net"
+LICENSE="GPL-2-with-classpath-exception"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x64-macos"
+IUSE="alsa cups headless-awt selinux source"
+
+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
+ )
+ )"
+
+RESTRICT="preserve-libs splitdebug"
+QA_PREBUILT="*"
+
+S="${WORKDIR}/jdk-${MY_PV}"
+
+pkg_pretend() {
+ if [[ "$(tc-is-softfloat)" != "no" ]]; then
+ die "These binaries require a hardfloat system."
+ fi
+}
+
+src_unpack() {
+ default
+ if [[ ${A} == *_mac_* ]] ; then
+ mv -v "${S}/Contents/Home/"* "${S}" || die
+ rm -Rf "${S}/Contents" # drop macOS executable
+ fi
+}
+
+src_install() {
+ local dest="/opt/${P}"
+ local ddest="${ED}/${dest#/}"
+
+ # on macOS if they would exist they would be called .dylib, but most
+ # importantly, there are no different providers, so everything
+ # that's shipped works.
+ if [[ ${A} != *_mac_* ]] ; then
+ # Not sure why they bundle this as it's commonly available and they
+ # only do so on x86_64. It's needed by libfontmanager.so. IcedTea
+ # also has an explicit dependency while Oracle seemingly dlopens it.
+ rm -vf lib/libfreetype.so || die
+
+ # prefer system copy # https://bugs.gentoo.org/776676
+ rm -vf lib/libharfbuzz.so || die
+
+ # Oracle and IcedTea have libjsoundalsa.so depending on
+ # libasound.so.2 but AdoptOpenJDK only has libjsound.so. Weird.
+ if ! use alsa ; then
+ rm -v lib/libjsound.* || die
+ fi
+
+ if use headless-awt ; then
+ rm -v lib/lib*{[jx]awt,splashscreen}* || die
+ fi
+ fi
+
+ if ! use source ; then
+ rm -v lib/src.zip || die
+ fi
+
+ rm -v lib/security/cacerts || die
+ dosym -r /etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts
+
+ dodir "${dest}"
+ cp -pPR * "${ddest}" || die
+
+ # provide stable symlink
+ dosym "${P}" "/opt/${PN}-${SLOT}"
+
+ java-vm_install-env "${FILESDIR}"/${PN}.env.sh
+ java-vm_set-pax-markings "${ddest}"
+ java-vm_revdep-mask
+ java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
+}
+
+pkg_postinst() {
+ java-vm-2_pkg_postinst
+}
diff --git a/dev-java/openjdk-bin/openjdk-bin-17.0.4.1_p1.ebuild b/dev-java/openjdk-bin/openjdk-bin-17.0.4.1_p1.ebuild
new file mode 100644
index 000000000000..10cf917bc189
--- /dev/null
+++ b/dev-java/openjdk-bin/openjdk-bin-17.0.4.1_p1.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit java-vm-2 toolchain-funcs
+
+abi_uri() {
+ local baseuri="https://github.com/adoptium/temurin${SLOT}-binaries/releases/download/jdk-${MY_PV}/"
+ local musl=
+ local os=linux
+
+ case ${2} in
+ *-macos) os=mac ;;
+ *-solaris) os=solaris ;;
+ esac
+
+ if [[ ${3} == musl ]]; then
+ os=alpine-linux
+ musl=true
+ fi
+
+ echo "${2-$1}? (
+ ${musl:+ elibc_musl? ( }
+ ${baseuri}/OpenJDK${SLOT}U-jdk_${1}_${os}_hotspot_${MY_PV//+/_}.tar.gz
+ ${musl:+ ) } )"
+}
+
+MY_PV=${PV/_p/+}
+SLOT=$(ver_cut 1)
+
+SRC_URI="
+ $(abi_uri aarch64 arm64)
+ $(abi_uri arm)
+ $(abi_uri x64 amd64)
+ $(abi_uri x64 amd64 musl)
+ $(abi_uri aarch64 arm64-macos)
+ $(abi_uri ppc64le ppc64)
+ $(abi_uri x64 x64-macos)
+"
+
+DESCRIPTION="Prebuilt Java JDK binaries provided by Eclipse Temurin"
+HOMEPAGE="https://adoptium.net"
+LICENSE="GPL-2-with-classpath-exception"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x64-macos"
+IUSE="alsa cups headless-awt selinux source"
+
+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
+ )
+ )"
+
+RESTRICT="preserve-libs splitdebug"
+QA_PREBUILT="*"
+
+S="${WORKDIR}/jdk-${MY_PV}"
+
+pkg_pretend() {
+ if [[ "$(tc-is-softfloat)" != "no" ]]; then
+ die "These binaries require a hardfloat system."
+ fi
+}
+
+src_unpack() {
+ default
+ if [[ ${A} == *_mac_* ]] ; then
+ mv -v "${S}/Contents/Home/"* "${S}" || die
+ rm -Rf "${S}/Contents" # drop macOS executable
+ fi
+}
+
+src_install() {
+ local dest="/opt/${P}"
+ local ddest="${ED}/${dest#/}"
+
+ # on macOS if they would exist they would be called .dylib, but most
+ # importantly, there are no different providers, so everything
+ # that's shipped works.
+ if [[ ${A} != *_mac_* ]] ; then
+ # Not sure why they bundle this as it's commonly available and they
+ # only do so on x86_64. It's needed by libfontmanager.so. IcedTea
+ # also has an explicit dependency while Oracle seemingly dlopens it.
+ rm -vf lib/libfreetype.so || die
+
+ # prefer system copy # https://bugs.gentoo.org/776676
+ rm -vf lib/libharfbuzz.so || die
+
+ # Oracle and IcedTea have libjsoundalsa.so depending on
+ # libasound.so.2 but AdoptOpenJDK only has libjsound.so. Weird.
+ if ! use alsa ; then
+ rm -v lib/libjsound.* || die
+ fi
+
+ if use headless-awt ; then
+ rm -v lib/lib*{[jx]awt,splashscreen}* || die
+ fi
+ fi
+
+ if ! use source ; then
+ rm -v lib/src.zip || die
+ fi
+
+ rm -v lib/security/cacerts || die
+ dosym -r /etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts
+
+ dodir "${dest}"
+ cp -pPR * "${ddest}" || die
+
+ # provide stable symlink
+ dosym "${P}" "/opt/${PN}-${SLOT}"
+
+ java-vm_install-env "${FILESDIR}"/${PN}.env.sh
+ java-vm_set-pax-markings "${ddest}"
+ java-vm_revdep-mask
+ java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
+}
+
+pkg_postinst() {
+ java-vm-2_pkg_postinst
+}
diff --git a/dev-java/openjdk-bin/openjdk-bin-17.0.5_p8.ebuild b/dev-java/openjdk-bin/openjdk-bin-17.0.5_p8.ebuild
new file mode 100644
index 000000000000..10cf917bc189
--- /dev/null
+++ b/dev-java/openjdk-bin/openjdk-bin-17.0.5_p8.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit java-vm-2 toolchain-funcs
+
+abi_uri() {
+ local baseuri="https://github.com/adoptium/temurin${SLOT}-binaries/releases/download/jdk-${MY_PV}/"
+ local musl=
+ local os=linux
+
+ case ${2} in
+ *-macos) os=mac ;;
+ *-solaris) os=solaris ;;
+ esac
+
+ if [[ ${3} == musl ]]; then
+ os=alpine-linux
+ musl=true
+ fi
+
+ echo "${2-$1}? (
+ ${musl:+ elibc_musl? ( }
+ ${baseuri}/OpenJDK${SLOT}U-jdk_${1}_${os}_hotspot_${MY_PV//+/_}.tar.gz
+ ${musl:+ ) } )"
+}
+
+MY_PV=${PV/_p/+}
+SLOT=$(ver_cut 1)
+
+SRC_URI="
+ $(abi_uri aarch64 arm64)
+ $(abi_uri arm)
+ $(abi_uri x64 amd64)
+ $(abi_uri x64 amd64 musl)
+ $(abi_uri aarch64 arm64-macos)
+ $(abi_uri ppc64le ppc64)
+ $(abi_uri x64 x64-macos)
+"
+
+DESCRIPTION="Prebuilt Java JDK binaries provided by Eclipse Temurin"
+HOMEPAGE="https://adoptium.net"
+LICENSE="GPL-2-with-classpath-exception"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x64-macos"
+IUSE="alsa cups headless-awt selinux source"
+
+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
+ )
+ )"
+
+RESTRICT="preserve-libs splitdebug"
+QA_PREBUILT="*"
+
+S="${WORKDIR}/jdk-${MY_PV}"
+
+pkg_pretend() {
+ if [[ "$(tc-is-softfloat)" != "no" ]]; then
+ die "These binaries require a hardfloat system."
+ fi
+}
+
+src_unpack() {
+ default
+ if [[ ${A} == *_mac_* ]] ; then
+ mv -v "${S}/Contents/Home/"* "${S}" || die
+ rm -Rf "${S}/Contents" # drop macOS executable
+ fi
+}
+
+src_install() {
+ local dest="/opt/${P}"
+ local ddest="${ED}/${dest#/}"
+
+ # on macOS if they would exist they would be called .dylib, but most
+ # importantly, there are no different providers, so everything
+ # that's shipped works.
+ if [[ ${A} != *_mac_* ]] ; then
+ # Not sure why they bundle this as it's commonly available and they
+ # only do so on x86_64. It's needed by libfontmanager.so. IcedTea
+ # also has an explicit dependency while Oracle seemingly dlopens it.
+ rm -vf lib/libfreetype.so || die
+
+ # prefer system copy # https://bugs.gentoo.org/776676
+ rm -vf lib/libharfbuzz.so || die
+
+ # Oracle and IcedTea have libjsoundalsa.so depending on
+ # libasound.so.2 but AdoptOpenJDK only has libjsound.so. Weird.
+ if ! use alsa ; then
+ rm -v lib/libjsound.* || die
+ fi
+
+ if use headless-awt ; then
+ rm -v lib/lib*{[jx]awt,splashscreen}* || die
+ fi
+ fi
+
+ if ! use source ; then
+ rm -v lib/src.zip || die
+ fi
+
+ rm -v lib/security/cacerts || die
+ dosym -r /etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts
+
+ dodir "${dest}"
+ cp -pPR * "${ddest}" || die
+
+ # provide stable symlink
+ dosym "${P}" "/opt/${PN}-${SLOT}"
+
+ java-vm_install-env "${FILESDIR}"/${PN}.env.sh
+ java-vm_set-pax-markings "${ddest}"
+ java-vm_revdep-mask
+ java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
+}
+
+pkg_postinst() {
+ java-vm-2_pkg_postinst
+}
diff --git a/dev-java/openjdk-bin/openjdk-bin-8.345_p01.ebuild b/dev-java/openjdk-bin/openjdk-bin-8.345_p01.ebuild
new file mode 100644
index 000000000000..7834a4a17075
--- /dev/null
+++ b/dev-java/openjdk-bin/openjdk-bin-8.345_p01.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit java-vm-2
+
+abi_uri() {
+ local os=linux
+ case ${2} in
+ *-macos) os=mac ;;
+ *-solaris) os=solaris ;;
+ esac
+ echo "${2-$1}? (
+ https://github.com/adoptium/temurin${SLOT}-binaries/releases/download/jdk${MY_PV}/OpenJDK8U-jdk_${1}_${os}_hotspot_${3-${MY_PV/-/}}.tar.gz
+ )"
+}
+
+# they have different tarball names for different arches...
+# https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jdk_x64_linux_hotspot_8u282b08.tar.gz
+# https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jdk_aarch64_linux_hotspot_jdk8u282-b08.tar.gz
+
+MY_PV=$(ver_rs 1 'u' 2 '-' ${PV//p/b})
+SLOT=$(ver_cut 1)
+
+DESCRIPTION="Prebuilt Java JDK binaries provided by Eclipse Temurin"
+HOMEPAGE="https://adoptium.net"
+SRC_URI="
+ $(abi_uri arm)
+ $(abi_uri aarch64 arm64)
+ $(abi_uri ppc64le ppc64)
+ $(abi_uri x64 amd64)
+ $(abi_uri x64 x64-macos)
+"
+
+LICENSE="GPL-2-with-classpath-exception"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x64-macos"
+
+IUSE="alsa cups examples headless-awt selinux source"
+
+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
+ )
+ )
+"
+
+RESTRICT="preserve-libs strip"
+QA_PREBUILT="*"
+
+S="${WORKDIR}/jdk${MY_PV}"
+
+src_unpack() {
+ default
+ # 753575
+ if use arm; then
+ mv -v "${S}"* "${S}" || die
+ elif [[ ${A} == *_mac_* ]] ; then
+ mv -v "${S}/Contents/Home/"* "${S}" || die
+ rm -Rf "${S}/Contents" # drop macOS executable
+ fi
+}
+
+src_install() {
+ local dest="/opt/${P}"
+ local ddest="${ED}/${dest#/}"
+
+ rm ASSEMBLY_EXCEPTION LICENSE THIRD_PARTY_README || die
+
+ # on macOS if they would exist they would be called .dylib, but most
+ # importantly, there are no different providers, so everything
+ # that's shipped works.
+ if [[ ${A} != *_mac_* ]] ; then
+ # this does not exist on arm64 hence -f
+ rm -fv jre/lib/*/libfreetype.so* || die
+
+ if ! use alsa ; then
+ rm -v jre/lib/*/libjsoundalsa.so* || die
+ fi
+
+ if ! use examples ; then
+ rm -vr sample || die
+ fi
+
+ if use headless-awt ; then
+ rm -fvr {,jre/}lib/*/lib*{[jx]awt,splashscreen}* \
+ {,jre/}bin/policytool bin/appletviewer || die
+ fi
+ fi
+
+ if ! use source ; then
+ rm -v src.zip || die
+ fi
+
+ rm -v jre/lib/security/cacerts || die
+ dosym ../../../../../etc/ssl/certs/java/cacerts \
+ "${dest}"/jre/lib/security/cacerts
+
+ dodir "${dest}"
+ cp -pPR * "${ddest}" || die
+
+ # provide stable symlink
+ dosym "${P}" "/opt/${PN}-${SLOT}"
+
+ java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
+ java-vm_set-pax-markings "${ddest}"
+ java-vm_revdep-mask
+ java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
+}
diff --git a/dev-java/openjdk-bin/openjdk-bin-8.352_p08.ebuild b/dev-java/openjdk-bin/openjdk-bin-8.352_p08.ebuild
new file mode 100644
index 000000000000..7834a4a17075
--- /dev/null
+++ b/dev-java/openjdk-bin/openjdk-bin-8.352_p08.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit java-vm-2
+
+abi_uri() {
+ local os=linux
+ case ${2} in
+ *-macos) os=mac ;;
+ *-solaris) os=solaris ;;
+ esac
+ echo "${2-$1}? (
+ https://github.com/adoptium/temurin${SLOT}-binaries/releases/download/jdk${MY_PV}/OpenJDK8U-jdk_${1}_${os}_hotspot_${3-${MY_PV/-/}}.tar.gz
+ )"
+}
+
+# they have different tarball names for different arches...
+# https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jdk_x64_linux_hotspot_8u282b08.tar.gz
+# https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jdk_aarch64_linux_hotspot_jdk8u282-b08.tar.gz
+
+MY_PV=$(ver_rs 1 'u' 2 '-' ${PV//p/b})
+SLOT=$(ver_cut 1)
+
+DESCRIPTION="Prebuilt Java JDK binaries provided by Eclipse Temurin"
+HOMEPAGE="https://adoptium.net"
+SRC_URI="
+ $(abi_uri arm)
+ $(abi_uri aarch64 arm64)
+ $(abi_uri ppc64le ppc64)
+ $(abi_uri x64 amd64)
+ $(abi_uri x64 x64-macos)
+"
+
+LICENSE="GPL-2-with-classpath-exception"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x64-macos"
+
+IUSE="alsa cups examples headless-awt selinux source"
+
+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
+ )
+ )
+"
+
+RESTRICT="preserve-libs strip"
+QA_PREBUILT="*"
+
+S="${WORKDIR}/jdk${MY_PV}"
+
+src_unpack() {
+ default
+ # 753575
+ if use arm; then
+ mv -v "${S}"* "${S}" || die
+ elif [[ ${A} == *_mac_* ]] ; then
+ mv -v "${S}/Contents/Home/"* "${S}" || die
+ rm -Rf "${S}/Contents" # drop macOS executable
+ fi
+}
+
+src_install() {
+ local dest="/opt/${P}"
+ local ddest="${ED}/${dest#/}"
+
+ rm ASSEMBLY_EXCEPTION LICENSE THIRD_PARTY_README || die
+
+ # on macOS if they would exist they would be called .dylib, but most
+ # importantly, there are no different providers, so everything
+ # that's shipped works.
+ if [[ ${A} != *_mac_* ]] ; then
+ # this does not exist on arm64 hence -f
+ rm -fv jre/lib/*/libfreetype.so* || die
+
+ if ! use alsa ; then
+ rm -v jre/lib/*/libjsoundalsa.so* || die
+ fi
+
+ if ! use examples ; then
+ rm -vr sample || die
+ fi
+
+ if use headless-awt ; then
+ rm -fvr {,jre/}lib/*/lib*{[jx]awt,splashscreen}* \
+ {,jre/}bin/policytool bin/appletviewer || die
+ fi
+ fi
+
+ if ! use source ; then
+ rm -v src.zip || die
+ fi
+
+ rm -v jre/lib/security/cacerts || die
+ dosym ../../../../../etc/ssl/certs/java/cacerts \
+ "${dest}"/jre/lib/security/cacerts
+
+ dodir "${dest}"
+ cp -pPR * "${ddest}" || die
+
+ # provide stable symlink
+ dosym "${P}" "/opt/${PN}-${SLOT}"
+
+ java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
+ java-vm_set-pax-markings "${ddest}"
+ java-vm_revdep-mask
+ java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
+}
diff --git a/dev-java/openjdk-jre-bin/Manifest b/dev-java/openjdk-jre-bin/Manifest
index 37434dfb74dc..271fc3d105b7 100644
--- a/dev-java/openjdk-jre-bin/Manifest
+++ b/dev-java/openjdk-jre-bin/Manifest
@@ -1,5 +1,11 @@
DIST OpenJDK11U-jre_x64_linux_hotspot_11.0.14_9.tar.gz 42435138 BLAKE2B 0f972a78221b74be4b8c87845f52d331eb6caf84eef06d291d0cd25ce4357b7072f938fd0390a9c54647d4ddcfe4c0184ddf84583e017e1bf78338b7939437bc SHA512 9ee64498d83d16cefc5a155393d9477bb78338d43a3b4b1699f4358644415a6be5601f7b2a87a82f2a95cafd6485b6db7b30bd0d21096110211b942e95deed64
DIST OpenJDK11U-jre_x64_linux_hotspot_11.0.15_10.tar.gz 42471028 BLAKE2B a88fa041ffdcedabbcdadbb1eb4a0052456666ba779eb0f82bc27ea7f2923a1b2e538d14d5f615869e456b1bce48859211134c6bd9d31c2c082068686b68fd59 SHA512 a8a8a9c9f243aaf9b051bd0c35009ec96a28dcf47b53139dd59891a5ff2ced590e56961edb093cf67b8239d92a4b407f631b389fdff986fdb746316f420abf34
+DIST OpenJDK11U-jre_x64_linux_hotspot_11.0.16.1_1.tar.gz 42705612 BLAKE2B 02b0239a613f0738c7980105cd8595c0bbf456ba13f669dd11071313260d1fdbe1bc0c91e9fc9252cb04078ec7da36fdb4cf8a3408d1afdb7298f88bb75a75d8 SHA512 21af841b9e14ea32e13dd45fb2e693c0dfcbf65e99ebaaee44f14188c8b30c2cd76de816dc184b7bc9f376b26ab6bb9741be84f37bb99bec4dc381aa7ce9ada9
+DIST OpenJDK11U-jre_x64_linux_hotspot_11.0.17_8.tar.gz 42827817 BLAKE2B b904eb70da1ef73def0475c379bc91790e348cad830783cbd492c386498a5d09bdf8f117614b53c6a708c0aaa5881dd300b144e2d71e99cfa14fe99a05059d11 SHA512 4866c5f06b92e7e82e4427ec012a6e1421ba5e5aaf8624cb683ff86f950eb15f5d32962b585047d571f8a54e6a5df31f222eec15d530bcc4713c63d612d20d7f
DIST OpenJDK17U-jre_x64_linux_hotspot_17.0.3_7.tar.gz 45971131 BLAKE2B dc8a358b10b0d3a6fac60f340ee5224c348aa4b2683e5f7b3396eaca180a12212260d45b8347b472f80671ef86a91f764727897146e4d36bc08b24c7920635fa SHA512 27da884a807c980386b7295f7ea5e253c03b497eff6e21e0cb35ea050552eaf9a3f71060cbd1a2f0cd6069a55ae00b43e46edcf09ab36c142587ea2ab781ad14
+DIST OpenJDK17U-jre_x64_linux_hotspot_17.0.4.1_1.tar.gz 45941557 BLAKE2B 877a194672bfb950203d466191c1c220fffcca86559c0179c573e85152b9e63d253891989ed825181f3e034dd9d6f5cfba10986cf1c019e7faf73ad9a89bee48 SHA512 0bea14d42df99771e8e02f705f9233fc666904667607ca66e47be57fb09131b0a9d70b7bd4cc5b322805cc09cb14ad711db60348e9d17f9714884006185a928c
+DIST OpenJDK17U-jre_x64_linux_hotspot_17.0.5_8.tar.gz 46080826 BLAKE2B b6c92f8bad0f8806f7138da0cbb79876b32d0abd0be8fc25c016e555a7c8a9297d63b85ee4c778a812e5fa3bce7b48e320285f4dec93a6176498ab52d111632a SHA512 6d228cadc7ecf46deb571124870a6d37604759024de1e4e1df9f45c86d988326a91799e3ede866a1fa564b5d73ccf859888f640bf6a9c8c0596f6ac75c4a8241
DIST OpenJDK8U-jre_x64_linux_hotspot_8u322b06.tar.gz 41317897 BLAKE2B b96b39d4b3f7fe54f9b04698d4f24879ce617e61ade298b7de1472cb85fbf7d5f297f009c0e881a17bcdaf9baaf3187acef531b0ace97a1f2ab099811995c815 SHA512 4a3acc1330056011f0097aaca77858779e2c89d214598ef66736956984204b8de804549e42c51f8392806753f3d534d34ad93ef6df9f2f45a369e04f6a0694ac
DIST OpenJDK8U-jre_x64_linux_hotspot_8u332b09.tar.gz 41336220 BLAKE2B 52eb9aa2623335bca7be71d1aca6b4292a029554ef9f9e0e1209a7fa0892931c37b670f9f90586d4ff3cd35540a3a7cb230f20789481836d20f04d4cfcc56596 SHA512 c62002aa1a28547b0b0cefea3f83af2cf6507002bf296b1b83bd04406f4c362f4c74940209ebbd3803513395bec7503882aac7f8d35dcbf6a6e02e9155a53cdd
+DIST OpenJDK8U-jre_x64_linux_hotspot_8u345b01.tar.gz 41336188 BLAKE2B 05c1ff3f0561410dafb88f1ce1486decbe56f528cebde4f5d05d589e5a7c706e84bf23f89cda68b19212dbd9b109546a7b78b407a8453c9f040b9e95f5f9c35f SHA512 15cb0be04c9a516476405107fc472470b4576b3893aca8f926b8f007fcb21b6eba1d87a52a806ec698cb3a8b17bae8f557445e9201be2f2d7246a67e28df0be4
+DIST OpenJDK8U-jre_x64_linux_hotspot_8u352b08.tar.gz 41349408 BLAKE2B 98b4b57f6839b09bff112894360587f5bc745506830795d9329e1db26cf676a77cf7d06813e850c44619b1b03d86926b98bdc4f3672d2bb73c1dbb081ad47bae SHA512 36f76d74d69afc488e3d992f5f97d522c22736999904a6045205da9d514bd02d5f00e21e8e5344632d80fd85d50a8496c9950bea368b9a6b332cd5062134d2b5
diff --git a/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.16.1_p1.ebuild b/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.16.1_p1.ebuild
new file mode 100644
index 000000000000..43ec32db6c4d
--- /dev/null
+++ b/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.16.1_p1.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit java-vm-2
+
+abi_uri() {
+ echo "${2-$1}? (
+ https://github.com/adoptium/temurin${SLOT}-binaries/releases/download/jdk-${MY_PV}/OpenJDK${SLOT}U-jre_${1}_linux_hotspot_${MY_PV//+/_}.tar.gz
+ )"
+}
+
+MY_PV=${PV/_p/+}
+SLOT=${MY_PV%%[.+]*}
+
+SRC_URI="
+ $(abi_uri x64 amd64)
+"
+
+DESCRIPTION="Prebuilt Java JRE binaries provided by Eclipse Temurin"
+HOMEPAGE="https://adoptopenjdk.net"
+LICENSE="GPL-2-with-classpath-exception"
+KEYWORDS="~amd64"
+IUSE="alsa cups headless-awt selinux"
+
+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
+ )"
+
+RESTRICT="preserve-libs splitdebug"
+QA_PREBUILT="*"
+
+S="${WORKDIR}/jdk-${MY_PV}-jre"
+
+src_install() {
+ local dest="/opt/${PN}-${SLOT}"
+ local ddest="${ED}/${dest#/}"
+
+ # Not sure why they bundle this as it's commonly available and they
+ # only do so on x86_64. It's needed by libfontmanager.so. IcedTea
+ # also has an explicit dependency while Oracle seemingly dlopens it.
+ rm -vf lib/libfreetype.so || die
+
+ # Oracle and IcedTea have libjsoundalsa.so depending on
+ # libasound.so.2 but AdoptOpenJDK only has libjsound.so. Weird.
+ if ! use alsa ; then
+ rm -v lib/libjsound.* || die
+ fi
+
+ if use headless-awt ; then
+ rm -v lib/lib*{[jx]awt,splashscreen}* || die
+ fi
+
+ rm -v lib/security/cacerts || die
+ dosym -r /etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts
+
+ dodir "${dest}"
+ cp -pPR * "${ddest}" || die
+
+ java-vm_install-env "${FILESDIR}"/${PN}.env.sh
+ java-vm_set-pax-markings "${ddest}"
+ java-vm_revdep-mask
+ java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
+}
+
+pkg_postinst() {
+ java-vm-2_pkg_postinst
+}
diff --git a/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.17_p8.ebuild b/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.17_p8.ebuild
new file mode 100644
index 000000000000..43ec32db6c4d
--- /dev/null
+++ b/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.17_p8.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit java-vm-2
+
+abi_uri() {
+ echo "${2-$1}? (
+ https://github.com/adoptium/temurin${SLOT}-binaries/releases/download/jdk-${MY_PV}/OpenJDK${SLOT}U-jre_${1}_linux_hotspot_${MY_PV//+/_}.tar.gz
+ )"
+}
+
+MY_PV=${PV/_p/+}
+SLOT=${MY_PV%%[.+]*}
+
+SRC_URI="
+ $(abi_uri x64 amd64)
+"
+
+DESCRIPTION="Prebuilt Java JRE binaries provided by Eclipse Temurin"
+HOMEPAGE="https://adoptopenjdk.net"
+LICENSE="GPL-2-with-classpath-exception"
+KEYWORDS="~amd64"
+IUSE="alsa cups headless-awt selinux"
+
+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
+ )"
+
+RESTRICT="preserve-libs splitdebug"
+QA_PREBUILT="*"
+
+S="${WORKDIR}/jdk-${MY_PV}-jre"
+
+src_install() {
+ local dest="/opt/${PN}-${SLOT}"
+ local ddest="${ED}/${dest#/}"
+
+ # Not sure why they bundle this as it's commonly available and they
+ # only do so on x86_64. It's needed by libfontmanager.so. IcedTea
+ # also has an explicit dependency while Oracle seemingly dlopens it.
+ rm -vf lib/libfreetype.so || die
+
+ # Oracle and IcedTea have libjsoundalsa.so depending on
+ # libasound.so.2 but AdoptOpenJDK only has libjsound.so. Weird.
+ if ! use alsa ; then
+ rm -v lib/libjsound.* || die
+ fi
+
+ if use headless-awt ; then
+ rm -v lib/lib*{[jx]awt,splashscreen}* || die
+ fi
+
+ rm -v lib/security/cacerts || die
+ dosym -r /etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts
+
+ dodir "${dest}"
+ cp -pPR * "${ddest}" || die
+
+ java-vm_install-env "${FILESDIR}"/${PN}.env.sh
+ java-vm_set-pax-markings "${ddest}"
+ java-vm_revdep-mask
+ java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
+}
+
+pkg_postinst() {
+ java-vm-2_pkg_postinst
+}
diff --git a/dev-java/openjdk-jre-bin/openjdk-jre-bin-17.0.4.1_p1.ebuild b/dev-java/openjdk-jre-bin/openjdk-jre-bin-17.0.4.1_p1.ebuild
new file mode 100644
index 000000000000..43ec32db6c4d
--- /dev/null
+++ b/dev-java/openjdk-jre-bin/openjdk-jre-bin-17.0.4.1_p1.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit java-vm-2
+
+abi_uri() {
+ echo "${2-$1}? (
+ https://github.com/adoptium/temurin${SLOT}-binaries/releases/download/jdk-${MY_PV}/OpenJDK${SLOT}U-jre_${1}_linux_hotspot_${MY_PV//+/_}.tar.gz
+ )"
+}
+
+MY_PV=${PV/_p/+}
+SLOT=${MY_PV%%[.+]*}
+
+SRC_URI="
+ $(abi_uri x64 amd64)
+"
+
+DESCRIPTION="Prebuilt Java JRE binaries provided by Eclipse Temurin"
+HOMEPAGE="https://adoptopenjdk.net"
+LICENSE="GPL-2-with-classpath-exception"
+KEYWORDS="~amd64"
+IUSE="alsa cups headless-awt selinux"
+
+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
+ )"
+
+RESTRICT="preserve-libs splitdebug"
+QA_PREBUILT="*"
+
+S="${WORKDIR}/jdk-${MY_PV}-jre"
+
+src_install() {
+ local dest="/opt/${PN}-${SLOT}"
+ local ddest="${ED}/${dest#/}"
+
+ # Not sure why they bundle this as it's commonly available and