summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'dev-java')
-rw-r--r--dev-java/angus-activation/angus-activation-1.0.0-r1.ebuild34
-rw-r--r--dev-java/ant-eclipse-ecj/Manifest1
-rw-r--r--dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.22-r1.ebuild (renamed from dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.22.ebuild)4
-rw-r--r--dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.5.1.ebuild48
-rw-r--r--dev-java/ant-eclipse-ecj/files/ecj-4.57
-rw-r--r--dev-java/apiguardian-api/apiguardian-api-1.1.2-r1.ebuild24
-rw-r--r--dev-java/asm/Manifest1
-rw-r--r--dev-java/asm/asm-9.2.ebuild23
-rw-r--r--dev-java/asm/asm-9.3.ebuild2
-rw-r--r--dev-java/assertj-core/Manifest1
-rw-r--r--dev-java/assertj-core/assertj-core-3.10.0.ebuild109
-rw-r--r--dev-java/assertj-core/files/assertj-core-3.10.0-java11-compatibility.patch456
-rw-r--r--dev-java/assertj-core/metadata.xml2
-rw-r--r--dev-java/batik/batik-1.14-r1.ebuild2
-rw-r--r--dev-java/batik/batik-1.14.ebuild191
-rw-r--r--dev-java/bcmail/Manifest2
-rw-r--r--dev-java/bcmail/bcmail-1.71.ebuild (renamed from dev-java/bcmail/bcmail-1.69-r1.ebuild)15
-rw-r--r--dev-java/bcmail/metadata.xml3
-rw-r--r--dev-java/bcpg/Manifest2
-rw-r--r--dev-java/bcpg/bcpg-1.71.ebuild (renamed from dev-java/bcpg/bcpg-1.69.ebuild)22
-rw-r--r--dev-java/bcpg/metadata.xml3
-rw-r--r--dev-java/bcpkix/Manifest2
-rw-r--r--dev-java/bcpkix/bcpkix-1.71-r1.ebuild (renamed from dev-java/bcpkix/bcpkix-1.69.ebuild)36
-rw-r--r--dev-java/bcpkix/metadata.xml3
-rw-r--r--dev-java/bcprov/Manifest2
-rw-r--r--dev-java/bcprov/bcprov-1.69.ebuild99
-rw-r--r--dev-java/bcprov/bcprov-1.71-r1.ebuild111
-rw-r--r--dev-java/bcprov/metadata.xml2
-rw-r--r--dev-java/bcutil/Manifest2
-rw-r--r--dev-java/bcutil/bcutil-1.71.ebuild (renamed from dev-java/bcutil/bcutil-1.69.ebuild)17
-rw-r--r--dev-java/bcutil/metadata.xml3
-rw-r--r--dev-java/byaccj/byaccj-1.15-r3.ebuild (renamed from dev-java/byaccj/byaccj-1.15-r2.ebuild)9
-rw-r--r--dev-java/byaccj/files/byaccj-1.15-implicit-function-declaration.patch15
-rw-r--r--dev-java/byte-buddy-agent/Manifest4
-rw-r--r--dev-java/byte-buddy-agent/byte-buddy-agent-1.12.10.ebuild (renamed from dev-java/byte-buddy-agent/byte-buddy-agent-1.12.8.ebuild)8
-rw-r--r--dev-java/byte-buddy/Manifest3
-rw-r--r--dev-java/byte-buddy/byte-buddy-1.12.10.ebuild (renamed from dev-java/byte-buddy/byte-buddy-1.12.8.ebuild)6
-rw-r--r--dev-java/byte-buddy/byte-buddy-1.12.12.ebuild176
-rw-r--r--dev-java/commons-cli/Manifest1
-rw-r--r--dev-java/commons-cli/commons-cli-1.4.ebuild43
-rw-r--r--dev-java/commons-cli/commons-cli-1.5.0.ebuild2
-rw-r--r--dev-java/commons-codec/commons-codec-1.15-r1.ebuild45
-rw-r--r--dev-java/commons-collections/commons-collections-4.4-r1.ebuild68
-rw-r--r--dev-java/commons-daemon/Manifest2
-rw-r--r--dev-java/commons-daemon/commons-daemon-1.3.1.ebuild (renamed from dev-java/commons-daemon/commons-daemon-1.2.4.ebuild)10
-rw-r--r--dev-java/commons-daemon/files/commons-daemon-1.3.1-Make.patch21
-rw-r--r--dev-java/commons-imaging/Manifest2
-rw-r--r--dev-java/commons-imaging/commons-imaging-1.0_alpha3.ebuild (renamed from dev-java/commons-imaging/commons-imaging-1.0_alpha2.ebuild)8
-rw-r--r--dev-java/commons-io/commons-io-2.11.0-r1.ebuild54
-rw-r--r--dev-java/commons-jxpath/Manifest1
-rw-r--r--dev-java/commons-jxpath/commons-jxpath-1.3-r5.ebuild62
-rw-r--r--dev-java/commons-math/Manifest1
-rw-r--r--dev-java/commons-math/commons-math-3.6.1-r2.ebuild25
-rw-r--r--dev-java/conversant-disruptor/Manifest2
-rw-r--r--dev-java/conversant-disruptor/conversant-disruptor-1.2.20.ebuild (renamed from dev-java/conversant-disruptor/conversant-disruptor-1.2.19-r1.ebuild)27
-rw-r--r--dev-java/easymock/easymock-3.3.1-r1.ebuild13
-rw-r--r--dev-java/eclipse-ecj/Manifest1
-rw-r--r--dev-java/eclipse-ecj/eclipse-ecj-4.22-r1.ebuild (renamed from dev-java/eclipse-ecj/eclipse-ecj-4.22.ebuild)4
-rw-r--r--dev-java/eclipse-ecj/eclipse-ecj-4.5.1.ebuild68
-rw-r--r--dev-java/fastinfoset/Manifest1
-rw-r--r--dev-java/fastinfoset/fastinfoset-2.1.0-r1.ebuild41
-rw-r--r--dev-java/fastinfoset/metadata.xml (renamed from dev-java/glassfish-jms-api/metadata.xml)1
-rw-r--r--dev-java/fec/fec-1.0.4-r4.ebuild2
-rw-r--r--dev-java/fec/metadata.xml3
-rw-r--r--dev-java/findbugs-annotations/findbugs-annotations-3.0.1.ebuild2
-rw-r--r--dev-java/fontbox/Manifest4
-rw-r--r--dev-java/fontbox/fontbox-2.0.26.ebuild (renamed from dev-java/fontbox/fontbox-2.0.24.ebuild)29
-rw-r--r--dev-java/gin/Manifest2
-rw-r--r--dev-java/gin/gin-2.1.2-r1.ebuild (renamed from dev-java/gin/gin-2.1.2.ebuild)15
-rw-r--r--dev-java/glassfish-jms-api/Manifest1
-rw-r--r--dev-java/glassfish-jms-api/glassfish-jms-api-1.1.2.2.04-r2.ebuild48
-rw-r--r--dev-java/glazedlists/Manifest1
-rw-r--r--dev-java/glazedlists/glazedlists-1.8.0-r2.ebuild29
-rw-r--r--dev-java/glazedlists/metadata.xml8
-rw-r--r--dev-java/gnu-jaf/gnu-jaf-1.1.2-r1.ebuild2
-rw-r--r--dev-java/gnu-jaf/gnu-jaf-1.1.2.ebuild29
-rw-r--r--dev-java/gradle-bin/Manifest1
-rw-r--r--dev-java/gradle-bin/gradle-bin-7.5.ebuild61
-rw-r--r--dev-java/gson/Manifest1
-rw-r--r--dev-java/gson/gson-2.8.8-r1.ebuild65
-rw-r--r--dev-java/gson/gson-2.9.0-r1.ebuild2
-rw-r--r--dev-java/gson/gson-2.9.0-r2.ebuild60
-rw-r--r--dev-java/guava-testlib/guava-testlib-30.1.1.ebuild4
-rw-r--r--dev-java/guava/Manifest1
-rw-r--r--dev-java/guava/guava-20.0-r1.ebuild36
-rw-r--r--dev-java/guava/guava-20.0.ebuild36
-rw-r--r--dev-java/guice/Manifest1
-rw-r--r--dev-java/guice/guice-4.1.ebuild51
-rw-r--r--dev-java/guice/guice-5.1.0.ebuild2
-rw-r--r--dev-java/hamcrest/Manifest1
-rw-r--r--dev-java/hamcrest/files/hamcrest-2.2-java-11.patch127
-rw-r--r--dev-java/hamcrest/hamcrest-2.2.ebuild49
-rw-r--r--dev-java/hamcrest/metadata.xml (renamed from dev-java/spin/metadata.xml)3
-rw-r--r--dev-java/hawtjni-runtime/Manifest1
-rw-r--r--dev-java/hawtjni-runtime/hawtjni-runtime-1.18.ebuild27
-rw-r--r--dev-java/htmlcleaner/Manifest1
-rw-r--r--dev-java/htmlcleaner/htmlcleaner-2.26.ebuild55
-rw-r--r--dev-java/icedtea-web/Manifest1
-rw-r--r--dev-java/icedtea-web/icedtea-web-1.8.4-r1.ebuild94
-rw-r--r--dev-java/icedtea-web/icedtea-web-1.8.8-r1.ebuild2
-rw-r--r--dev-java/icedtea-web/icedtea-web-1.8.8.ebuild94
-rw-r--r--dev-java/istack-commons-runtime/Manifest1
-rw-r--r--dev-java/istack-commons-runtime/istack-commons-runtime-4.1.1-r1.ebuild52
-rw-r--r--dev-java/istack-commons-runtime/metadata.xml (renamed from dev-java/jempbox/metadata.xml)4
-rw-r--r--dev-java/j2objc-annotations/Manifest3
-rw-r--r--dev-java/j2objc-annotations/j2objc-annotations-2.8.ebuild33
-rw-r--r--dev-java/jackcess/jackcess-4.0.0.ebuild4
-rw-r--r--dev-java/jackson-annotations/Manifest2
-rw-r--r--dev-java/jackson-annotations/jackson-annotations-2.13.2-r1.ebuild43
-rw-r--r--dev-java/jackson-annotations/jackson-annotations-2.13.3.ebuild (renamed from dev-java/jackson-annotations/jackson-annotations-2.13.2.ebuild)6
-rw-r--r--dev-java/jackson-core/Manifest2
-rw-r--r--dev-java/jackson-core/jackson-core-2.13.2-r1.ebuild69
-rw-r--r--dev-java/jackson-core/jackson-core-2.13.3.ebuild (renamed from dev-java/jackson-core/jackson-core-2.13.2.ebuild)6
-rw-r--r--dev-java/jackson-databind/Manifest3
-rw-r--r--dev-java/jackson-databind/jackson-databind-2.13.2.2.ebuild83
-rw-r--r--dev-java/jackson-databind/jackson-databind-2.13.3.ebuild (renamed from dev-java/jackson-databind/jackson-databind-2.13.2.ebuild)14
-rw-r--r--dev-java/jackson-dataformat-xml/Manifest2
-rw-r--r--dev-java/jackson-dataformat-xml/jackson-dataformat-xml-2.13.2-r1.ebuild110
-rw-r--r--dev-java/jackson-dataformat-xml/jackson-dataformat-xml-2.13.3-r1.ebuild (renamed from dev-java/jackson-dataformat-xml/jackson-dataformat-xml-2.13.2.ebuild)22
-rw-r--r--dev-java/jackson-dataformat-yaml/Manifest2
-rw-r--r--dev-java/jackson-dataformat-yaml/jackson-dataformat-yaml-2.13.3-r1.ebuild (renamed from dev-java/jackson-dataformat-yaml/jackson-dataformat-yaml-2.13.2-r1.ebuild)33
-rw-r--r--dev-java/jackson-dataformat-yaml/jackson-dataformat-yaml-2.13.3.ebuild (renamed from dev-java/jackson-dataformat-yaml/jackson-dataformat-yaml-2.13.2.ebuild)10
-rw-r--r--dev-java/jackson-dataformat-yaml/metadata.xml3
-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-r1.ebuild (renamed from dev-java/jackson-module-jakarta-xmlbind/jackson-module-jakarta-xmlbind-2.13.2-r1.ebuild)41
-rw-r--r--dev-java/jackson-module-jakarta-xmlbind/jackson-module-jakarta-xmlbind-2.13.3.ebuild (renamed from dev-java/jackson-module-jakarta-xmlbind/jackson-module-jakarta-xmlbind-2.13.2.ebuild)16
-rw-r--r--dev-java/jai-imageio-core/jai-imageio-core-1.4.0.ebuild4
-rw-r--r--dev-java/jai-imageio-jpeg2000/jai-imageio-jpeg2000-1.4.0.ebuild4
-rw-r--r--dev-java/jakarta-annotations-api/Manifest1
-rw-r--r--dev-java/jakarta-annotations-api/jakarta-annotations-api-2.1.1.ebuild31
-rw-r--r--dev-java/jakarta-annotations-api/metadata.xml (renamed from dev-java/jgraph/metadata.xml)3
-rw-r--r--dev-java/jakarta-mail-api/Manifest1
-rw-r--r--dev-java/jakarta-mail-api/jakarta-mail-api-2.1.0-r1.ebuild71
-rw-r--r--dev-java/jakarta-mail-api/jakarta-mail-api-2.1.0.ebuild81
-rw-r--r--dev-java/jakarta-mail-api/metadata.xml (renamed from dev-java/commons-jxpath/metadata.xml)6
-rw-r--r--dev-java/jakartaee-migration/Manifest1
-rw-r--r--dev-java/jakartaee-migration/jakartaee-migration-1.0.1.ebuild92
-rw-r--r--dev-java/janino/Manifest2
-rw-r--r--dev-java/janino/janino-3.1.7.ebuild (renamed from dev-java/janino/janino-3.1.6.ebuild)20
-rw-r--r--dev-java/java-diff-utils/java-diff-utils-1.3.0.ebuild4
-rw-r--r--dev-java/java-service-wrapper/Manifest1
-rw-r--r--dev-java/java-service-wrapper/java-service-wrapper-3.5.50.ebuild86
-rw-r--r--dev-java/javahelp/javahelp-2.0.05_p20170719-r1.ebuild2
-rw-r--r--dev-java/javahelp/javahelp-2.0.05_p20170719.ebuild70
-rw-r--r--dev-java/javassist/Manifest1
-rw-r--r--dev-java/javassist/javassist-3.29.0-r2.ebuild64
-rw-r--r--dev-java/javassist/metadata.xml3
-rw-r--r--dev-java/javax-jms-api/Manifest1
-rw-r--r--dev-java/javax-jms-api/javax-jms-api-2.0.3.ebuild29
-rw-r--r--dev-java/javax-jms-api/metadata.xml (renamed from dev-java/sun-jms/metadata.xml)5
-rw-r--r--dev-java/jaxb-api/Manifest1
-rw-r--r--dev-java/jaxb-api/jaxb-api-2.3.3-r1.ebuild2
-rw-r--r--dev-java/jaxb-api/jaxb-api-2.3.3.ebuild59
-rw-r--r--dev-java/jaxb-api/jaxb-api-3.0.1-r1.ebuild4
-rw-r--r--dev-java/jaxb-api/jaxb-api-3.0.1.ebuild40
-rw-r--r--dev-java/jaxb-api/jaxb-api-4.0.0.ebuild42
-rw-r--r--dev-java/jaxb-runtime/Manifest1
-rw-r--r--dev-java/jaxb-runtime/jaxb-runtime-4.0.0-r1.ebuild108
-rw-r--r--dev-java/jaxb-runtime/metadata.xml7
-rw-r--r--dev-java/jaxb-stax-ex/Manifest1
-rw-r--r--dev-java/jaxb-stax-ex/jaxb-stax-ex-2.1.0-r1.ebuild37
-rw-r--r--dev-java/jaxb-stax-ex/metadata.xml7
-rw-r--r--dev-java/jbig2-imageio/jbig2-imageio-3.0.3.ebuild4
-rw-r--r--dev-java/jbitcollider-core/jbitcollider-core-0.8-r1.ebuild4
-rw-r--r--dev-java/jctools-core/Manifest3
-rw-r--r--dev-java/jctools-core/jctools-core-2.0.2.ebuild57
-rw-r--r--dev-java/jctools-core/jctools-core-3.1.0.ebuild72
-rw-r--r--dev-java/jctools-core/jctools-core-3.3.0.ebuild64
-rw-r--r--dev-java/jdbc-postgresql/Manifest2
-rw-r--r--dev-java/jdbc-postgresql/files/jdbc-postgresql-9.4_p1201-remove-osgi.patch37
-rw-r--r--dev-java/jdbc-postgresql/files/jdbc-postgresql-9.4_p1204-remove-sspi.patch138
-rw-r--r--dev-java/jdbc-postgresql/jdbc-postgresql-42.4.0.ebuild59
-rw-r--r--dev-java/jdbc-postgresql/jdbc-postgresql-9.4_p1206-r1.ebuild110
-rw-r--r--dev-java/jdom/Manifest2
-rw-r--r--dev-java/jdom/files/build-xml-2.patch36
-rw-r--r--dev-java/jdom/jdom-2.0.6-r5.ebuild64
-rw-r--r--dev-java/jdom/jdom-2.0.6.1.ebuild97
-rw-r--r--dev-java/jdom/metadata.xml3
-rw-r--r--dev-java/jempbox/Manifest1
-rw-r--r--dev-java/jempbox/files/jempbox-1.7.1_maven-build.xml247
-rw-r--r--dev-java/jempbox/jempbox-1.7.1-r1.ebuild47
-rw-r--r--dev-java/jffi/Manifest1
-rw-r--r--dev-java/jffi/files/jffi-1.3.8-GNUmakefile.patch28
-rw-r--r--dev-java/jffi/jffi-1.3.9-r1.ebuild99
-rw-r--r--dev-java/jffi/jffi-1.3.9.ebuild97
-rw-r--r--dev-java/jgraph/Manifest1
-rw-r--r--dev-java/jgraph/jgraph-5.12.0.4-r1.ebuild35
-rw-r--r--dev-java/jmh-core/Manifest1
-rw-r--r--dev-java/jmh-core/jmh-core-1.21.ebuild34
-rw-r--r--dev-java/jmh-core/jmh-core-1.35.ebuild2
-rw-r--r--dev-java/jna/Manifest2
-rw-r--r--dev-java/jna/files/4.2.2-build.xml.patch23
-rw-r--r--dev-java/jna/files/5.11.0-makefile-flags.patch (renamed from dev-java/jna/files/4.2.2-makefile-flags.patch)17
-rw-r--r--dev-java/jna/jna-4.2.2-r3.ebuild87
-rw-r--r--dev-java/jna/jna-5.10.0.ebuild99
-rw-r--r--dev-java/jna/jna-5.11.0-r1.ebuild (renamed from dev-java/jna/jna-5.11.0.ebuild)14
-rw-r--r--dev-java/jna/metadata.xml4
-rw-r--r--dev-java/jnr-ffi/Manifest2
-rw-r--r--dev-java/jnr-ffi/jnr-ffi-2.2.12.ebuild47
-rw-r--r--dev-java/jnr-ffi/jnr-ffi-2.2.8.ebuild63
-rw-r--r--dev-java/jnr-netdb/Manifest1
-rw-r--r--dev-java/jnr-netdb/jnr-netdb-1.2.0.ebuild43
-rw-r--r--dev-java/jnr-posix/Manifest1
-rw-r--r--dev-java/jnr-posix/files/jnr-posix-3.1.15-FileTest.patch48
-rw-r--r--dev-java/jnr-posix/jnr-posix-3.1.15.ebuild65
-rw-r--r--dev-java/joda-convert/joda-convert-2.2.2-r2.ebuild65
-rw-r--r--dev-java/joda-time/Manifest1
-rw-r--r--dev-java/joda-time/joda-time-2.10.14.ebuild80
-rw-r--r--dev-java/jopt-simple/Manifest3
-rw-r--r--dev-java/jopt-simple/jopt-simple-4.6-r1.ebuild23
-rw-r--r--dev-java/jopt-simple/jopt-simple-5.0.4.ebuild (renamed from dev-java/jopt-simple/jopt-simple-5.0-r1.ebuild)6
-rw-r--r--dev-java/jopt-simple/jopt-simple-5.0.ebuild33
-rw-r--r--dev-java/jopt-simple/metadata.xml2
-rw-r--r--dev-java/junit-dataprovider/Manifest1
-rw-r--r--dev-java/junit-dataprovider/junit-dataprovider-2.9.ebuild94
-rw-r--r--dev-java/junit-dataprovider/metadata.xml7
-rw-r--r--dev-java/junitparams/metadata.xml2
-rw-r--r--dev-java/jython/jython-2.7.0-r4.ebuild152
-rw-r--r--dev-java/jython/jython-2.7.0-r6.ebuild2
-rw-r--r--dev-java/leiningen-bin/Manifest2
-rw-r--r--dev-java/leiningen-bin/leiningen-bin-2.9.1.ebuild62
-rw-r--r--dev-java/leiningen-bin/leiningen-bin-2.9.8.ebuild2
-rw-r--r--dev-java/log4j-12-api/Manifest1
-rw-r--r--dev-java/log4j-12-api/log4j-12-api-2.18.0.ebuild84
-rw-r--r--dev-java/log4j-api/Manifest1
-rw-r--r--dev-java/log4j-api/log4j-api-2.18.0.ebuild71
-rw-r--r--dev-java/log4j-core/Manifest1
-rw-r--r--dev-java/log4j-core/log4j-core-2.17.2-r1.ebuild (renamed from dev-java/log4j-core/log4j-core-2.17.2.ebuild)2
-rw-r--r--dev-java/log4j-core/log4j-core-2.18.0.ebuild175
-rw-r--r--dev-java/logback-classic/logback-classic-1.2.11.ebuild2
-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.2.11.ebuild15
-rw-r--r--dev-java/lzma/lzma-19.00.ebuild4
-rw-r--r--dev-java/lzmajio/lzmajio-0.95-r3.ebuild4
-rw-r--r--dev-java/maven-bin/Manifest2
-rw-r--r--dev-java/maven-bin/maven-bin-3.8.6.ebuild (renamed from dev-java/maven-bin/maven-bin-3.8.2.ebuild)6
-rw-r--r--dev-java/memoryfilesystem/Manifest1
-rw-r--r--dev-java/memoryfilesystem/memoryfilesystem-2.3.0.ebuild53
-rw-r--r--dev-java/memoryfilesystem/metadata.xml7
-rw-r--r--dev-java/mersennetwister/mersennetwister-0_pre23765-r2.ebuild4
-rw-r--r--dev-java/metainf-services/Manifest1
-rw-r--r--dev-java/metainf-services/metainf-services-1.9.ebuild22
-rw-r--r--dev-java/microba/Manifest1
-rw-r--r--dev-java/microba/metadata.xml12
-rw-r--r--dev-java/microba/microba-0.4.4.3-r2.ebuild42
-rw-r--r--dev-java/mill-bin/Manifest3
-rw-r--r--dev-java/mill-bin/mill-bin-0.10.2.ebuild26
-rw-r--r--dev-java/mill-bin/mill-bin-0.10.4.ebuild2
-rw-r--r--dev-java/mill-bin/mill-bin-0.10.5.ebuild (renamed from dev-java/mill-bin/mill-bin-0.10.3.ebuild)2
-rw-r--r--dev-java/mockito/Manifest3
-rw-r--r--dev-java/mockito/metadata.xml1
-rw-r--r--dev-java/mockito/mockito-4.6.0-r1.ebuild (renamed from dev-java/mockito/mockito-4.4.0.ebuild)15
-rw-r--r--dev-java/mockito/mockito-4.6.1-r1.ebuild55
-rw-r--r--dev-java/netty-buffer/Manifest1
-rw-r--r--dev-java/netty-buffer/metadata.xml11
-rw-r--r--dev-java/netty-buffer/netty-buffer-4.0.36-r1.ebuild85
-rw-r--r--dev-java/netty-buffer/netty-buffer-4.0.36.ebuild49
-rw-r--r--dev-java/netty-common/Manifest1
-rw-r--r--dev-java/netty-common/metadata.xml11
-rw-r--r--dev-java/netty-common/netty-common-4.0.36-r2.ebuild72
-rw-r--r--dev-java/netty-transport/Manifest1
-rw-r--r--dev-java/netty-transport/metadata.xml11
-rw-r--r--dev-java/netty-transport/netty-transport-4.0.36.ebuild61
-rw-r--r--dev-java/netty/netty-4.1.35-r1.ebuild (renamed from dev-java/netty/netty-4.1.35.ebuild)4
-rw-r--r--dev-java/openjdk-bin/Manifest18
-rw-r--r--dev-java/openjdk-bin/files/openjdk-bin-17.env.sh16
-rw-r--r--dev-java/openjdk-bin/files/openjdk-bin-8.env.sh3
-rw-r--r--dev-java/openjdk-bin/files/openjdk-bin.env.sh (renamed from dev-java/openjdk-bin/files/openjdk-bin-11.env.sh)3
-rw-r--r--dev-java/openjdk-bin/openjdk-bin-11.0.14_p9-r1.ebuild135
-rw-r--r--dev-java/openjdk-bin/openjdk-bin-11.0.15_p10.ebuild4
-rw-r--r--dev-java/openjdk-bin/openjdk-bin-17.0.2_p8.ebuild148
-rw-r--r--dev-java/openjdk-bin/openjdk-bin-17.0.3_p7.ebuild16
-rw-r--r--dev-java/openjdk-bin/openjdk-bin-8.322_p06.ebuild123
-rw-r--r--dev-java/openjdk-bin/openjdk-bin-8.332_p09.ebuild2
-rw-r--r--dev-java/openjdk-jre-bin/files/openjdk-jre-bin-11.env.sh14
-rw-r--r--dev-java/openjdk-jre-bin/files/openjdk-jre-bin-8.env.sh3
-rw-r--r--dev-java/openjdk-jre-bin/files/openjdk-jre-bin.env.sh (renamed from dev-java/openjdk-jre-bin/files/openjdk-jre-bin-17.env.sh)3
-rw-r--r--dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.14_p9-r1.ebuild2
-rw-r--r--dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.15_p10.ebuild4
-rw-r--r--dev-java/openjdk-jre-bin/openjdk-jre-bin-17.0.3_p7.ebuild4
-rw-r--r--dev-java/openjdk-jre-bin/openjdk-jre-bin-8.332_p09.ebuild2
-rw-r--r--dev-java/openjdk/Manifest5
-rw-r--r--dev-java/openjdk/files/openjdk-17.0.3-fix-nullptr-cast.patch111
-rw-r--r--dev-java/openjdk/files/openjdk-17.env.sh16
-rw-r--r--dev-java/openjdk/files/openjdk-8.env.sh3
-rw-r--r--dev-java/openjdk/files/openjdk.env.sh (renamed from dev-java/openjdk/files/openjdk-11.env.sh)3
-rw-r--r--dev-java/openjdk/openjdk-11.0.15_p10-r1.ebuild (renamed from dev-java/openjdk/openjdk-11.0.14_p9-r1.ebuild)14
-rw-r--r--dev-java/openjdk/openjdk-11.0.15_p10.ebuild292
-rw-r--r--dev-java/openjdk/openjdk-17.0.2_p8.ebuild313
-rw-r--r--dev-java/openjdk/openjdk-17.0.3_p7-r1.ebuild (renamed from dev-java/openjdk/openjdk-17.0.3_p7.ebuild)48
-rw-r--r--dev-java/openjdk/openjdk-8.322_p06.ebuild224
-rw-r--r--dev-java/openjdk/openjdk-8.332_p09.ebuild6
-rw-r--r--dev-java/opentest4j/opentest4j-1.2.0-r1.ebuild34
-rw-r--r--dev-java/osgi-annotation/Manifest1
-rw-r--r--dev-java/osgi-annotation/metadata.xml7
-rw-r--r--dev-java/osgi-annotation/osgi-annotation-8.1.0.ebuild28
-rw-r--r--dev-java/osgi-compendium/osgi-compendium-4.3.1-r3.ebuild (renamed from dev-java/osgi-compendium/osgi-compendium-4.3.1-r2.ebuild)22
-rw-r--r--dev-java/osgi-core/Manifest1
-rw-r--r--dev-java/osgi-core/metadata.xml7
-rw-r--r--dev-java/osgi-core/osgi-core-8.0.0.ebuild33
-rw-r--r--dev-java/osgi-enterprise-api/osgi-enterprise-api-5.0.0-r1.ebuild38
-rw-r--r--dev-java/osgi-enterprise-api/osgi-enterprise-api-5.0.0-r2.ebuild4
-rw-r--r--dev-java/pdfbox/Manifest3
-rw-r--r--dev-java/pdfbox/pdfbox-2.0.26.ebuild (renamed from dev-java/pdfbox/pdfbox-2.0.24.ebuild)116
-rw-r--r--dev-java/plexus-classworlds/Manifest1
-rw-r--r--dev-java/plexus-classworlds/metadata.xml3
-rw-r--r--dev-java/plexus-classworlds/plexus-classworlds-2.6.0.ebuild59
-rw-r--r--dev-java/poi/Manifest1
-rw-r--r--dev-java/poi/poi-5.0.0.ebuild4
-rw-r--r--dev-java/poi/poi-5.2.2.ebuild63
-rw-r--r--dev-java/randomized-runner/Manifest1
-rw-r--r--dev-java/randomized-runner/randomized-runner-2.8.0.ebuild57
-rw-r--r--dev-java/reflections/Manifest1
-rw-r--r--dev-java/reflections/reflections-0.9.10-r1.ebuild31
-rw-r--r--dev-java/reflections/reflections-0.9.12-r2.ebuild2
-rw-r--r--dev-java/reflections/reflections-0.9.12-r4.ebuild94
-rw-r--r--dev-java/relaxng-datatype/relaxng-datatype-1.0-r2.ebuild39
-rw-r--r--dev-java/relaxng-datatype/relaxng-datatype-1.0-r3.ebuild2
-rw-r--r--dev-java/rxtx/files/rxtx-2.1-7r2-ppcioh.diff16
-rw-r--r--dev-java/rxtx/files/rxtx-2.1-7r2-ttyPZ.diff20
-rw-r--r--dev-java/rxtx/rxtx-2.2_pre2-r2.ebuild4
-rw-r--r--dev-java/saslprep/Manifest1
-rw-r--r--dev-java/saslprep/metadata.xml7
-rw-r--r--dev-java/saslprep/saslprep-1.1.ebuild23
-rw-r--r--dev-java/sbt-bin/Manifest1
-rw-r--r--dev-java/sbt-bin/sbt-bin-1.3.10.ebuild4
-rw-r--r--dev-java/sbt-bin/sbt-bin-1.3.2.ebuild49
-rw-r--r--dev-java/sbt/sbt-0.13.18-r1.ebuild (renamed from dev-java/sbt/sbt-0.13.18.ebuild)21
-rw-r--r--dev-java/scram/Manifest1
-rw-r--r--dev-java/scram/metadata.xml7
-rw-r--r--dev-java/scram/scram-2.1.ebuild104
-rw-r--r--dev-java/snakeyaml/snakeyaml-1.30-r1.ebuild91
-rw-r--r--dev-java/sparsebitset/sparsebitset-1.2.ebuild4
-rw-r--r--dev-java/spin/Manifest1
-rw-r--r--dev-java/spin/spin-1.5-r2.ebuild93
-rw-r--r--dev-java/stringprep/Manifest1
-rw-r--r--dev-java/stringprep/metadata.xml7
-rw-r--r--dev-java/stringprep/stringprep-1.1.ebuild20
-rw-r--r--dev-java/sun-jms/Manifest1
-rw-r--r--dev-java/sun-jms/sun-jms-1.1-r3.ebuild61
-rw-r--r--dev-java/tomcat-native/Manifest4
-rw-r--r--dev-java/tomcat-native/metadata.xml6
-rw-r--r--dev-java/tomcat-native/tomcat-native-1.2.34.ebuild (renamed from dev-java/tomcat-native/tomcat-native-1.2.32.ebuild)0
-rw-r--r--dev-java/tomcat-native/tomcat-native-1.2.35.ebuild (renamed from dev-java/tomcat-native/tomcat-native-1.2.33.ebuild)2
-rw-r--r--dev-java/tomcat-servlet-api/Manifest13
-rw-r--r--dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.21.ebuild98
-rw-r--r--dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.22.ebuild (renamed from dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.20.ebuild)2
-rw-r--r--dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.23.ebuild (renamed from dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.18.ebuild)2
-rw-r--r--dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.78.ebuild99
-rw-r--r--dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.81.ebuild (renamed from dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.77.ebuild)0
-rw-r--r--dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.62.ebuild99
-rw-r--r--dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.64.ebuild (renamed from dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.60.ebuild)0
-rw-r--r--dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.65.ebuild (renamed from dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.63.ebuild)0
-rw-r--r--dev-java/typesafe-config/Manifest1
-rw-r--r--dev-java/typesafe-config/typesafe-config-1.4.2.ebuild33
-rw-r--r--dev-java/wsdl4j/Manifest3
-rw-r--r--dev-java/wsdl4j/files/1.6.2-tests-sandbox.patch11
-rw-r--r--dev-java/wsdl4j/metadata.xml2
-rw-r--r--dev-java/wsdl4j/wsdl4j-1.6.2-r1.ebuild61
-rw-r--r--dev-java/wsdl4j/wsdl4j-1.6.3.ebuild26
-rw-r--r--dev-java/xml-commons-external/Manifest1
-rw-r--r--dev-java/xml-commons-external/xml-commons-external-1.3.04-r1.ebuild39
-rw-r--r--dev-java/xml-commons-resolver/xml-commons-resolver-1.2-r3.ebuild (renamed from dev-java/xml-commons-resolver/xml-commons-resolver-1.2-r2.ebuild)21
-rw-r--r--dev-java/xmlgraphics-commons/xmlgraphics-commons-2.7-r1.ebuild2
-rw-r--r--dev-java/xmlgraphics-commons/xmlgraphics-commons-2.7.ebuild66
-rw-r--r--dev-java/xmpbox/Manifest2
-rw-r--r--dev-java/xmpbox/metadata.xml3
-rw-r--r--dev-java/xmpbox/xmpbox-2.0.26.ebuild (renamed from dev-java/xmpbox/xmpbox-2.0.24.ebuild)7
-rw-r--r--dev-java/xsdlib/Manifest1
-rw-r--r--dev-java/xsdlib/xsdlib-2013.6.1.ebuild35
-rw-r--r--dev-java/zstd-jni/Manifest1
-rw-r--r--dev-java/zstd-jni/zstd-jni-1.5.0.5.ebuild60
372 files changed, 5254 insertions, 5879 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
new file mode 100644
index 00000000000..9349e1ca9b7
--- /dev/null
+++ b/dev-java/angus-activation/angus-activation-1.0.0-r1.ebuild
@@ -0,0 +1,34 @@
+# 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-r1.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/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="EPL-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+DEPEND="
+ dev-java/jakarta-activation-api:2
+ >=virtual/jdk-11:*"
+
+RDEPEND=">=virtual/jre-1.8:*"
+
+DOCS=( ../{CONTRIBUTING,NOTICE,README}.md )
+
+S="${WORKDIR}/${P}/activation-registry"
+
+JAVA_CLASSPATH_EXTRA="jakarta-activation-api-2"
+JAVA_SRC_DIR="src/main/java"
+JAVA_RESOURCE_DIRS="src/main/resources"
diff --git a/dev-java/ant-eclipse-ecj/Manifest b/dev-java/ant-eclipse-ecj/Manifest
index e75203b2369..8445570a7ca 100644
--- a/dev-java/ant-eclipse-ecj/Manifest
+++ b/dev-java/ant-eclipse-ecj/Manifest
@@ -1,3 +1,2 @@
DIST ecjsrc-4.15.jar 2166228 BLAKE2B 794e0ba1a19b325e2dd8ad0b288ccbe04866627670b50d39dd327c13fe1fac56200eb3a6c1c3d1af043cad795508b9b714a5243049671414b5a62a97725d3297 SHA512 ada55b2522cf26570f0cd43f415eb5cf20e6840f83dadc72e1ae474ebf10eadca73f9fa3d1db51e13fd2762c38cd3e3567db3c7840d43ae3d8665ebe35e1889d
DIST ecjsrc-4.22.jar 2358194 BLAKE2B e091050297b4556c38adfb01fb1e43e13644af1b3c2b30a93cfe3fdbb55050a0f7709081c7406d384d7141de67a954253aa26cdbb45f56327b16ee5ddd5e82a7 SHA512 cd52a72aecded032625ee83581ac565e1e96f8d26ecfc76e982274fd3d6238f1e7f22576855589b021e9a5ef67686b9b75e010c4e2033a8b7f6e7c9b1ff7eb4c
-DIST ecjsrc-4.5.1.jar 1809543 BLAKE2B 6d9dfed1756ac3e7edf8dd5b30f945afac8bb09bfb5b10f9abed46fff917f600afaebd28451665005b38831f20846090bd3cd19b979130043adbc6a7970d6b36 SHA512 ee615e6fb7fb4a16ef4aeefdff93bafdbf36c9d0ce15713b81f1d4dce0ae87379fa4a6de34c32a134f78db6ed1a68d6c7b4e2a431b7de57bf8262a718fdd6553
diff --git a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.22.ebuild b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.22-r1.ebuild
index 1fc9f8bb234..a2d55cda8ca 100644
--- a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.22.ebuild
+++ b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.22-r1.ebuild
@@ -14,7 +14,7 @@ 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"
+KEYWORDS="amd64 ~ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris"
SLOT="4.22"
IUSE=""
@@ -26,7 +26,7 @@ CDEPEND="~dev-java/eclipse-ecj-${PV}:${SLOT}
RDEPEND="${CDEPEND}
>=virtual/jre-11:*"
DEPEND="${CDEPEND}
- >=virtual/jdk-11:*"
+ >=virtual/jdk-17:*"
BDEPEND="app-arch/unzip"
JAVA_GENTOO_CLASSPATH="ant-core,eclipse-ecj-${SLOT}"
diff --git a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.5.1.ebuild b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.5.1.ebuild
deleted file mode 100644
index 8260b02e4de..00000000000
--- a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.5.1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple prefix
-
-DMF="R-${PV}-201509040015"
-
-DESCRIPTION="Ant Compiler Adapter for Eclipse Java Compiler"
-HOMEPAGE="http://www.eclipse.org/"
-SRC_URI="http://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.5"
-IUSE=""
-
-CDEPEND="~dev-java/eclipse-ecj-${PV}:${SLOT}
- >=dev-java/ant-core-1.7"
-RDEPEND="${CDEPEND}
- >=virtual/jre-1.7"
-DEPEND="${CDEPEND}
- app-arch/unzip
- >=virtual/jdk-1.7"
-
-JAVA_GENTOO_CLASSPATH="ant-core,eclipse-ecj-${SLOT}"
-
-java_prepare() {
- # 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.5 b/dev-java/ant-eclipse-ecj/files/ecj-4.5
deleted file mode 100644
index e0a0eb367f5..00000000000
--- a/dev-java/ant-eclipse-ecj/files/ecj-4.5
+++ /dev/null
@@ -1,7 +0,0 @@
-JAVAC="@GENTOO_PORTAGE_EPREFIX@/usr/bin/ecj-4.5"
-PACKAGE="=dev-java/ant-eclipse-ecj-4.5*"
-SUPPORTED_TARGET="1.1 1.2 1.3 1.4 1.5 1.6 1.7 1.8"
-SUPPORTED_SOURCE="1.3 1.4 1.5 1.6 1.7 1.8"
-ANT_BUILD_COMPILER="org.eclipse.jdt.core.JDTCompilerAdapter"
-ANT_BUILD_COMPILER_DEPS="eclipse-ecj-4.5,ant-eclipse-ecj-4.5"
-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
new file mode 100644
index 00000000000..53885481c68
--- /dev/null
+++ b/dev-java/apiguardian-api/apiguardian-api-1.1.2-r1.ebuild
@@ -0,0 +1,24 @@
+# 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-11:*"
+RDEPEND=">=virtual/jre-1.8:*"
+
+S="${WORKDIR}/${PN%-api}-r${PV}"
+
+JAVA_SRC_DIR=( src/{main,module}/java )
diff --git a/dev-java/asm/Manifest b/dev-java/asm/Manifest
index 23ef00249b2..d1f433cd189 100644
--- a/dev-java/asm/Manifest
+++ b/dev-java/asm/Manifest
@@ -1,4 +1,3 @@
DIST asm-ASM_4_0.tar.gz 14789505 BLAKE2B 62b49d904f1ef2d32379f4f5d644cdc274b30f292ee4f64ad02be7d2226a90965f7b12421700e79dcd1e67a46e6a8543d5e353486a1577313616688ddc57f3b3 SHA512 e654623a882d9fe414e71861183f64840f7b6629231864872497d4bf9274e8ac05e05496593fa54a90d8c6a2e6d701b9a6f3876df611637f7d2079c5519def1e
DIST asm-ASM_5_1.tar.gz 16258842 BLAKE2B bd7d717cdfa6ff652c96b88d7b7d33fae614acba390c256ea72ecfbb3edc48382621a076dedf9b8728fdb1d0961cda943f165f99de840824b766c9af45a49339 SHA512 4bb32ce6eba267928261238f8f13cd2365ab374780039ad1df31698cd791645a370aca58c44270ec05f8377d6aa0a0d00f9f3890961cbd32a10cbd2e79e2d518
-DIST asm-ASM_9_2.tar.gz 1614845 BLAKE2B 3fc0fb45d0583b06371452d2df166ce53f81a114a386eda96fe3b0c748beffdd42791d59ddfb4c9ad368f73728f3382855a7336324b013e937c20a4f31cea44b SHA512 a0077e3c1ebbd8a841d3556be4363383951244ba87670af45a8565e14ad3ac94ab89a23b934b3609190e1b16dd9663798c01d1c859eddb2e825c41908c2e2afd
DIST asm-ASM_9_3.tar.gz 1666740 BLAKE2B 6905233f666159f861dda68a855e8f5632817b0627c2006d3a8e61340cd4afca9310860dd1eff46173ca7356583e6c44027e674f7e17eacaaf0dbcc24b92198e SHA512 401a4dd7c2638bbad940ca92c42b7ec6f44e1d19c407bba3cd6a081e0b51969cf62a0fbcc407ef4889d3c7d6c7b9893e77642c058f812e9d10b9d67c5215be42
diff --git a/dev-java/asm/asm-9.2.ebuild b/dev-java/asm/asm-9.2.ebuild
deleted file mode 100644
index 62a729090a5..00000000000
--- a/dev-java/asm/asm-9.2.ebuild
+++ /dev/null
@@ -1,23 +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.ow2.asm:asm:9.2"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Bytecode manipulation framework for Java"
-HOMEPAGE="https://asm.ow2.io"
-MY_P="ASM_${PV//./_}"
-SRC_URI="https://gitlab.ow2.org/asm/asm/-/archive/${MY_P}/asm-${MY_P}.tar.gz"
-LICENSE="BSD"
-SLOT="9"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~x64-macos"
-RESTRICT="test"
-
-CDEPEND=""
-DEPEND=">=virtual/jdk-1.8:*"
-RDEPEND=">=virtual/jre-1.8:*"
-
-JAVA_SRC_DIR="asm-${MY_P}/${PN}/src/main/java"
diff --git a/dev-java/asm/asm-9.3.ebuild b/dev-java/asm/asm-9.3.ebuild
index 1f60fa7df08..08fac0e70b4 100644
--- a/dev-java/asm/asm-9.3.ebuild
+++ b/dev-java/asm/asm-9.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://gitlab.ow2.org/asm/asm/-/archive/${MY_P}/asm-${MY_P}.tar.gz"
LICENSE="BSD"
SLOT="9"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~x64-macos"
DEPEND=">=virtual/jdk-1.8:*"
RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/assertj-core/Manifest b/dev-java/assertj-core/Manifest
index ab50860a208..6d5c5f3a7ea 100644
--- a/dev-java/assertj-core/Manifest
+++ b/dev-java/assertj-core/Manifest
@@ -1 +1,2 @@
DIST assertj-core-2.3.0.tar.gz 611609 BLAKE2B b99a01f67da75bad18e08df739c10943012f75eda9855ed906d407e474eeafe9a30be2e761de0bc791d72a6ff8c7ec8181cd37c6b6c9126f073df82a974163c3 SHA512 da67930d45afde12d317579edb62b5cff546283ea6a252c9b297f21b74404d7cfb63372d339f51733322205b89d35734e97888085387fb1a83c80d5963b05fd3
+DIST assertj-core-3.10.0.tar.gz 1100495 BLAKE2B 4050060e027588d9c62abd5f4c6b77affd96d94a6474c4acc750a946cd3906787f9b2194627abff6d2e0849d590f5a74bbc702b41de6cbfaa09fae951a1012cf SHA512 3763768c5572e133de69735b01fd64432c4330723aa7e6cc0de42e5948cb2d455ae52d9ada66391fb41e47c261816fe12a00d07962e253f0da13ef49255fc5c6
diff --git a/dev-java/assertj-core/assertj-core-3.10.0.ebuild b/dev-java/assertj-core/assertj-core-3.10.0.ebuild
new file mode 100644
index 00000000000..aac98e5265b
--- /dev/null
+++ b/dev-java/assertj-core/assertj-core-3.10.0.ebuild
@@ -0,0 +1,109 @@
+# 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/assertj/assertj-core/archive/assertj-core-3.10.0.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild assertj-core-3.10.0.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.assertj:assertj-core:3.10.0"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Rich and fluent assertions for testing for Java"
+HOMEPAGE="https://assertj.github.io/doc/"
+SRC_URI="https://github.com/assertj/${PN}/archive/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="3"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+CP_DEPEND="
+ >=dev-java/byte-buddy-1.12.12:0
+"
+
+DEPEND="
+ >=virtual/jdk-1.8:*
+ ${CP_DEPEND}
+ dev-java/hamcrest-core:1.3
+ dev-java/junit:4
+ dev-java/opentest4j:0
+ test? (
+ dev-java/guava:0
+ dev-java/junit-dataprovider:0
+ dev-java/memoryfilesystem:0
+ dev-java/mockito:4
+ )
+"
+
+RDEPEND="
+ >=virtual/jre-1.8:*
+ ${CP_DEPEND}"
+
+DOCS=( {CODE_OF_CONDUCT,CONTRIBUTING,README}.md )
+
+PATCHES=( "${FILESDIR}"/assertj-core-3.10.0-java11-compatibility.patch )
+
+S="${WORKDIR}/${PN}-${P}"
+
+JAVA_CLASSPATH_EXTRA="junit-4,hamcrest-core-1.3,opentest4j"
+JAVA_SRC_DIR="src/main/java"
+
+JAVA_TEST_GENTOO_CLASSPATH="guava,junit-dataprovider,memoryfilesystem,mockito-4"
+JAVA_TEST_SRC_DIR="src/test/java"
+JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+
+# These test classes are not run by "mvn test"
+# FAILURES!!!
+# Tests run: 11514, Failures: 32
+# Exclusion should leave "OK (11486 tests)" with jdk-11
+# and 14 test failures with jdk-17
+JAVA_TEST_EXCLUDES=(
+ org.assertj.core.internal.BaseArraysTest
+ org.assertj.core.internal.TestDescription
+ org.assertj.core.navigation.BaseNavigableIterableAssert_Test
+ org.assertj.core.navigation.BaseNavigableListAssert_Test
+ org.assertj.core.navigation.GenericNavigableAssert_Test
+ org.assertj.core.api.assumptions.BaseAssumptionsRunnerTest
+ org.assertj.core.api.atomic.referencearray.AtomicReferenceArrayAssert_filtered_baseTest
+ org.assertj.core.api.iterable.IterableAssert_filtered_baseTest
+ org.assertj.core.api.objectarray.ObjectArrayAssert_filtered_baseTest
+ org.assertj.core.api.TestCondition
+ org.assertj.core.api.BaseAssertionsTest
+ org.assertj.core.util.Files_TestCase
+ org.assertj.core.test.EqualsHashCodeContractTestCase
+ org.assertj.core.test.TestClassWithRandomId
+ org.assertj.core.test.TestData
+ org.assertj.core.test.TestFailures
+)
+
+src_prepare() {
+ default
+ sed \
+ -e 's:verifyZeroInteractions:verifyNoInteractions:' \
+ -i src/test/java/org/assertj/core/api/Assertions_assertThat_with_DoubleStream_Test.java \
+ -i src/test/java/org/assertj/core/api/Assertions_assertThat_with_IntStream_Test.java \
+ -i src/test/java/org/assertj/core/api/Assertions_assertThat_with_Iterator_Test.java \
+ -i src/test/java/org/assertj/core/api/Assertions_assertThat_with_LongStream_Test.java \
+ -i src/test/java/org/assertj/core/api/Assertions_assertThat_with_Stream_Test.java \
+ -i src/test/java/org/assertj/core/matcher/AssertionMatcher_matches_Test.java || die
+}
+
+src_test() {
+ 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.io=ALL-UNNAMED )
+ JAVA_TEST_EXTRA_ARGS+=( --add-opens=java.base/java.lang=ALL-UNNAMED )
+ JAVA_TEST_EXTRA_ARGS+=( --add-opens=java.base/java.math=ALL-UNNAMED )
+ JAVA_TEST_EXTRA_ARGS+=( --add-opens=java.base/java.util=ALL-UNNAMED )
+ # Before further test_excluds it should now read "Tests run: 11486, Failures: 3"
+ # Additional exclusions will leave "OK (11476 tests)"
+ JAVA_TEST_EXCLUDES+=(
+ org.assertj.core.internal.classes.Classes_assertHasMethods_Test
+ org.assertj.core.util.xml.XmlStringPrettyFormatter_prettyFormat_Test
+ )
+ fi
+ java-pkg-simple_src_test
+}
diff --git a/dev-java/assertj-core/files/assertj-core-3.10.0-java11-compatibility.patch b/dev-java/assertj-core/files/assertj-core-3.10.0-java11-compatibility.patch
new file mode 100644
index 00000000000..3f5210ae845
--- /dev/null
+++ b/dev-java/assertj-core/files/assertj-core-3.10.0-java11-compatibility.patch
@@ -0,0 +1,456 @@
+From 2e107db2a40c5ef60d4f5370e1e71fa780b67599 Mon Sep 17 00:00:00 2001
+From: Erhard Pointl <epeee@users.noreply.github.com>
+Date: Wed, 23 May 2018 11:45:35 +0200
+Subject: [PATCH] java11 compatibility (#1243)
+
+Fix java11 ea compile errors by adding assertThat method for StringBuilder and StringBuffer to disambiguate method resolution as StringBuilder and StringBuffer implements Comparable in java 11
+---
+ .../java/org/assertj/core/api/Assertions.java | 23 ++++++++++++
+ .../core/api/AssertionsForClassTypes.java | 24 +++++++++++++
+ .../org/assertj/core/api/Assumptions.java | 25 +++++++++++++
+ .../org/assertj/core/api/BDDAssertions.java | 24 +++++++++++++
+ .../api/Java6AbstractBDDSoftAssertions.java | 24 +++++++++++++
+ .../Java6AbstractStandardSoftAssertions.java | 24 +++++++++++++
+ .../org/assertj/core/api/Java6Assertions.java | 24 +++++++++++++
+ .../assertj/core/api/Java6BDDAssertions.java | 24 +++++++++++++
+ .../org/assertj/core/api/WithAssertions.java | 24 +++++++++++++
+ .../org/assertj/core/api/WithAssumptions.java | 23 ++++++++++++
+ ...ons_assertThat_with_StringBuffer_Test.java | 36 +++++++++++++++++++
+ ...ns_assertThat_with_StringBuilder_Test.java | 36 +++++++++++++++++++
+ 12 files changed, 311 insertions(+)
+ create mode 100644 src/test/java/org/assertj/core/api/Assertions_assertThat_with_StringBuffer_Test.java
+ create mode 100644 src/test/java/org/assertj/core/api/Assertions_assertThat_with_StringBuilder_Test.java
+
+diff --git a/src/main/java/org/assertj/core/api/Assertions.java b/src/main/java/org/assertj/core/api/Assertions.java
+index 28c457f4c7..664748dad3 100644
+--- a/src/main/java/org/assertj/core/api/Assertions.java
++++ b/src/main/java/org/assertj/core/api/Assertions.java
+@@ -2565,6 +2565,29 @@ public static <T> T assertThat(final AssertProvider<T> component) {
+ return AssertionsForInterfaceTypes.assertThat(actual);
+ }
+
++ /**
++ * Creates a new instance of <code>{@link CharSequenceAssert}</code> from a {@link StringBuilder}.
++ *
++ * @param actual the actual value.
++ * @return the created assertion object.
++ * @since 3.11.0
++ */
++ @CheckReturnValue
++ public static AbstractCharSequenceAssert<?, ? extends CharSequence> assertThat(StringBuilder actual) {
++ return AssertionsForClassTypes.assertThat(actual);
++ }
++ /**
++ * Creates a new instance of <code>{@link CharSequenceAssert}</code> from a {@link StringBuffer}.
++ *
++ * @param actual the actual value.
++ * @return the created assertion object.
++ * @since 3.11.0
++ */
++ @CheckReturnValue
++ public static AbstractCharSequenceAssert<?, ? extends CharSequence> assertThat(StringBuffer actual) {
++ return AssertionsForClassTypes.assertThat(actual);
++ }
++
+ /**
+ * Creates a new instance of <code>{@link CharSequenceAssert}from a {@link String}</code>.
+ *
+diff --git a/src/main/java/org/assertj/core/api/AssertionsForClassTypes.java b/src/main/java/org/assertj/core/api/AssertionsForClassTypes.java
+index fd05593159..fb2e2acfbd 100644
+--- a/src/main/java/org/assertj/core/api/AssertionsForClassTypes.java
++++ b/src/main/java/org/assertj/core/api/AssertionsForClassTypes.java
+@@ -487,6 +487,30 @@ public static AbstractShortArrayAssert<?> assertThat(short[] actual) {
+ return new ShortArrayAssert(actual);
+ }
+
++ /**
++ * Creates a new instance of <code>{@link CharSequenceAssert}</code> from a {@link StringBuilder}.
++ *
++ * @param actual the actual value.
++ * @return the created assertion object.
++ * @since 3.11.0
++ */
++ @CheckReturnValue
++ public static AbstractCharSequenceAssert<?, ? extends CharSequence> assertThat(StringBuilder actual) {
++ return new CharSequenceAssert(actual);
++ }
++
++ /**
++ * Creates a new instance of <code>{@link CharSequenceAssert}</code> from a {@link StringBuffer}.
++ *
++ * @param actual the actual value.
++ * @return the created assertion object.
++ * @since 3.11.0
++ */
++ @CheckReturnValue
++ public static AbstractCharSequenceAssert<?, ? extends CharSequence> assertThat(StringBuffer actual) {
++ return new CharSequenceAssert(actual);
++ }
++
+ /**
+ * Creates a new instance of <code>{@link StringAssert}</code>.
+ *
+diff --git a/src/main/java/org/assertj/core/api/Assumptions.java b/src/main/java/org/assertj/core/api/Assumptions.java
+index 9ce773bd44..d26b2453ce 100644
+--- a/src/main/java/org/assertj/core/api/Assumptions.java
++++ b/src/main/java/org/assertj/core/api/Assumptions.java
+@@ -308,6 +308,31 @@ public static AbstractCharArrayAssert<?> assumeThat(char[] actual) {
+ return asAssumption(CharSequenceAssert.class, CharSequence.class, actual);
+ }
+
++ /**
++ * Creates a new instance of <code>{@link CharSequenceAssert}</code> assumption from a {@link StringBuilder}.
++ *
++ * @param actual the actual value.
++ * @return the created assumption for assertion object.
++ * @since 3.11.0
++ */
++ @CheckReturnValue
++ public static AbstractCharSequenceAssert<?, ? extends CharSequence> assumeThat(StringBuilder actual) {
++ return asAssumption(CharSequenceAssert.class, CharSequence.class, actual);
++ }
++
++ /**
++ * Creates a new instance of <code>{@link CharSequenceAssert}</code> assumption from a {@link StringBuffer}.
++ *
++ * @param actual the actual value.
++ * @return the created assumption for assertion object.
++ * @since 3.11.0
++ */
++ @CheckReturnValue
++ public static AbstractCharSequenceAssert<?, ? extends CharSequence> assumeThat(StringBuffer actual) {
++ return asAssumption(CharSequenceAssert.class, CharSequence.class, actual);
++ }
++
++
+ /**
+ * Creates a new instance of <code>{@link ShortAssert}</code> assumption.
+ *
+diff --git a/src/main/java/org/assertj/core/api/BDDAssertions.java b/src/main/java/org/assertj/core/api/BDDAssertions.java
+index c558153faf..03e574a8d2 100644
+--- a/src/main/java/org/assertj/core/api/BDDAssertions.java
++++ b/src/main/java/org/assertj/core/api/BDDAssertions.java
+@@ -800,6 +800,30 @@ public static AbstractShortArrayAssert<?> then(short[] actual) {
+ return assertThat(actual);
+ }
+
++ /**
++ * Creates a new instance of <code>{@link org.assertj.core.api.CharSequenceAssert}</code> from a {@link StringBuilder}.
++ *
++ * @param actual the actual value.
++ * @return the created assertion object.
++ * @since 3.11.0
++ */
++ @CheckReturnValue
++ public static AbstractCharSequenceAssert<?, ? extends CharSequence> then(StringBuilder actual) {
++ return assertThat(actual);
++ }
++
++ /**
++ * Creates a new instance of <code>{@link org.assertj.core.api.CharSequenceAssert}</code> from a {@link StringBuffer}.
++ *
++ * @param actual the actual value.
++ * @return the created assertion object.
++ * @since 3.11.0
++ */
++ @CheckReturnValue
++ public static AbstractCharSequenceAssert<?, ? extends CharSequence> then(StringBuffer actual) {
++ return assertThat(actual);
++ }
++
+ /**
+ * Creates a new instance of <code>{@link org.assertj.core.api.StringAssert}</code>.
+ *
+diff --git a/src/main/java/org/assertj/core/api/Java6AbstractBDDSoftAssertions.java b/src/main/java/org/assertj/core/api/Java6AbstractBDDSoftAssertions.java
+index bd54285ae1..edb0451067 100644
+--- a/src/main/java/org/assertj/core/api/Java6AbstractBDDSoftAssertions.java
++++ b/src/main/java/org/assertj/core/api/Java6AbstractBDDSoftAssertions.java
+@@ -487,6 +487,30 @@ public CharSequenceAssert then(CharSequence actual) {
+ return proxy(CharSequenceAssert.class, CharSequence.class, actual);
+ }
+
++ /**
++ * Creates a new instance of <code>{@link CharSequenceAssert}</code> from a {@link StringBuilder}.
++ *
++ * @param actual the actual value.
++ * @return the created assertion object.
++ * @since 3.11.0
++ */
++ @CheckReturnValue
++ public CharSequenceAssert then(StringBuilder actual) {
++ return proxy(CharSequenceAssert.class, CharSequence.class, actual);
++ }
++
++ /**
++ * Creates a new instance of <code>{@link CharSequenceAssert}</code> from a {@link StringBuffer}.
++ *
++ * @param actual the actual value.
++ * @return the created assertion object.
++ * @since 3.11.0
++ */
++ @CheckReturnValue
++ public CharSequenceAssert then(StringBuffer actual) {
++ return proxy(CharSequenceAssert.class, CharSequence.class, actual);
++ }
++
+ /**
+ * Creates a new instance of <code>{@link StringAssert}</code>.
+ *
+diff --git a/src/main/java/org/assertj/core/api/Java6AbstractStandardSoftAssertions.java b/src/main/java/org/assertj/core/api/Java6AbstractStandardSoftAssertions.java
+index ee9d3fb72d..4ff4315635 100644
+--- a/src/main/java/org/assertj/core/api/Java6AbstractStandardSoftAssertions.java
++++ b/src/main/java/org/assertj/core/api/Java6AbstractStandardSoftAssertions.java
+@@ -489,6 +489,30 @@ public CharSequenceAssert assertThat(CharSequence actual) {
+ return proxy(CharSequenceAssert.class, CharSequence.class, actual);
+ }
+
++ /**
++ * Creates a new instance of <code>{@link CharSequenceAssert}</code> from a {@link StringBuilder}.
++ *
++ * @param actual the actual value.
++ * @return the created assertion object.
++ * @since 3.11.0
++ */
++ @CheckReturnValue
++ public CharSequenceAssert assertThat(StringBuilder actual) {
++ return proxy(CharSequenceAssert.class, CharSequence.class, actual);
++ }
++
++ /**
++ * Creates a new instance of <code>{@link CharSequenceAssert}</code> from a {@link StringBuffer}.
++ *
++ * @param actual the actual value.
++ * @return the created assertion object.
++ * @since 3.11.0
++ */
++ @CheckReturnValue
++ public CharSequenceAssert assertThat(StringBuffer actual) {
++ return proxy(CharSequenceAssert.class, CharSequence.class, actual);
++ }
++
+ /**
+ * Creates a new instance of <code>{@link StringAssert}</code>.
+ *
+diff --git a/src/main/java/org/assertj/core/api/Java6Assertions.java b/src/main/java/org/assertj/core/api/Java6Assertions.java
+index e88ccde3c8..10912f41bc 100644
+--- a/src/main/java/org/assertj/core/api/Java6Assertions.java
++++ b/src/main/java/org/assertj/core/api/Java6Assertions.java
+@@ -924,6 +924,30 @@ public static AbstractShortArrayAssert<?> assertThat(short[] actual) {
+ return new CharSequenceAssert(actual);
+ }
+
++ /**
++ * Creates a new instance of <code>{@link CharSequenceAssert}</code> from a {@link StringBuilder}.
++ *
++ * @param actual the actual value.
++ * @return the created assertion object.
++ * @since 3.11.0
++ */
++ @CheckReturnValue
++ public static AbstractCharSequenceAssert<?, ? extends CharSequence> assertThat(StringBuilder actual) {
++ return new CharSequenceAssert(actual);
++ }
++
++ /**
++ * Creates a new instance of <code>{@link CharSequenceAssert}</code> from a {@link StringBuffer}.
++ *
++ * @param actual the actual value.
++ * @return the created assertion object.
++ * @since 3.11.0
++ */
++ @CheckReturnValue
++ public static AbstractCharSequenceAssert<?, ? extends CharSequence> assertThat(StringBuffer actual) {
++ return new CharSequenceAssert(actual);
++ }
++
+ /**
+ * Creates a new instance of <code>{@link StringAssert}</code>.
+ *
+diff --git a/src/main/java/org/assertj/core/api/Java6BDDAssertions.java b/src/main/java/org/assertj/core/api/Java6BDDAssertions.java
+index 4ffc23475b..009929ebc9 100644
+--- a/src/main/java/org/assertj/core/api/Java6BDDAssertions.java
++++ b/src/main/java/org/assertj/core/api/Java6BDDAssertions.java
+@@ -795,6 +795,30 @@ public static AbstractShortArrayAssert<?> then(short[] actual) {
+ return assertThat(actual);
+ }
+
++ /**
++ * Creates a new instance of <code>{@link org.assertj.core.api.CharSequenceAssert}</code> from a {@link StringBuilder}.
++ *
++ * @param actual the actual value.
++ * @return the created assertion object.
++ * @since 3.11.0
++ */
++ @CheckReturnValue
++ public static AbstractCharSequenceAssert<?, ? extends CharSequence> then(StringBuilder actual) {
++ return assertThat(actual);
++ }
++
++ /**
++ * Creates a new instance of <code>{@link org.assertj.core.api.CharSequenceAssert}</code> from a {@link StringBuffer}.
++ *
++ * @param actual the actual value.
++ * @return the created assertion object.
++ * @since 3.11.0
++ */
++ @CheckReturnValue
++ public static AbstractCharSequenceAssert<?, ? extends CharSequence> then(StringBuffer actual) {
++ return assertThat(actual);
++ }
++
+ /**
+ * Creates a new instance of <code>{@link org.assertj.core.api.StringAssert}</code>.
+ *
+diff --git a/src/main/java/org/assertj/core/api/WithAssertions.java b/src/main/java/org/assertj/core/api/WithAssertions.java
+index c87854dd89..b71250c1bd 100644
+--- a/src/main/java/org/assertj/core/api/WithAssertions.java
++++ b/src/main/java/org/assertj/core/api/WithAssertions.java
+@@ -564,6 +564,30 @@ default <VALUE> AtomicStampedReferenceAssert<VALUE> assertThat(AtomicStampedRefe
+ return Assertions.assertThat(actual);
+ }
+
++ /**
++ * Creates a new instance of <code>{@link CharSequenceAssert}</code> from a {@link StringBuilder}.
++ *
++ * @param actual the actual value.
++ * @return the created assertion object.
++ * @since 3.11.0
++ */
++ @CheckReturnValue
++ default AbstractCharSequenceAssert<?, ? extends CharSequence> assertThat(final StringBuilder actual) {
++ return Assertions.assertThat(actual);
++ }
++
++ /**
++ * Creates a new instance of <code>{@link CharSequenceAssert}</code> from a {@link StringBuffer}.
++ *
++ * @param actual the actual value.
++ * @return the created assertion object.
++ * @since 3.11.0
++ */
++ @CheckReturnValue
++ default AbstractCharSequenceAssert<?, ? extends CharSequence> assertThat(final StringBuffer actual) {
++ return Assertions.assertThat(actual);
++ }
++
+ /**
+ * Creates a new instance of <code>{@link ShortArrayAssert}</code>.
+ *
+diff --git a/src/main/java/org/assertj/core/api/WithAssumptions.java b/src/main/java/org/assertj/core/api/WithAssumptions.java
+index 0703fa33dd..56539e36dd 100644
+--- a/src/main/java/org/assertj/core/api/WithAssumptions.java
++++ b/src/main/java/org/assertj/core/api/WithAssumptions.java
+@@ -371,6 +371,29 @@ default <VALUE> AtomicStampedReferenceAssert<VALUE> assumeThat(AtomicStampedRefe
+ return Assumptions.assumeThat(actual);
+ }
+
++ /**
++ * Creates a new instance of <code>{@link CharSequenceAssert}</code> assumption from a {@link StringBuilder}.
++ *
++ * @param actual the actual value.
++ * @return the created assumption for assertion object.
++ * @since 3.11.0
++ */
++ @CheckReturnValue
++ default AbstractCharSequenceAssert<?, ? extends CharSequence> assumeThat(final StringBuilder actual) {
++ return Assumptions.assumeThat(actual);
++ }
++
++ /**
++ * Creates a new instance of <code>{@link CharSequenceAssert}</code> assumption from a {@link StringBuffer}.
++ *
++ * @param actual the actual value.
++ * @return the created assumption for assertion object.
++ * @since 3.11.0
++ */
++ @CheckReturnValue
++ default AbstractCharSequenceAssert<?, ? extends CharSequence> assumeThat(final StringBuffer actual) {
++ return Assumptions.assumeThat(actual);
++ }
+ /**
+ * Creates a new instance of <code>{@link ShortArrayAssert}</code> assumption.
+ *
+diff --git a/src/test/java/org/assertj/core/api/Assertions_assertThat_with_StringBuffer_Test.java b/src/test/java/org/assertj/core/api/Assertions_assertThat_with_StringBuffer_Test.java
+new file mode 100644
+index 0000000000..b3f020f101
+--- /dev/null
++++ b/src/test/java/org/assertj/core/api/Assertions_assertThat_with_StringBuffer_Test.java
+@@ -0,0 +1,36 @@
++/*
++ * 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. See the License for the
++ * specific language governing permissions and limitations under the License.
++ *
++ * Copyright 2012-2018 the original author or authors.
++ */
++package org.assertj.core.api;
++
++import org.junit.Test;
++
++import static org.assertj.core.api.Assertions.assertThat;
++
++/**
++ * Tests for <code>{@link Assertions#assertThat(StringBuffer)}</code>.
++ */
++public class Assertions_assertThat_with_StringBuffer_Test {
++
++ @Test
++ public void should_create_Assert() {
++ AbstractCharSequenceAssert<?, ?> assertions = Assertions.assertThat(new StringBuffer("Yoda"));
++ assertThat(assertions).isNotNull();
++ }
++
++ @Test
++ public void should_pass_actual() {
++ StringBuffer actual = new StringBuffer("Yoda");
++ AbstractCharSequenceAssert<?, ?> assertions = Assertions.assertThat(actual);
++ assertThat(assertions.actual).isSameAs(actual);
++ }
++}
+diff --git a/src/test/java/org/assertj/core/api/Assertions_assertThat_with_StringBuilder_Test.java b/src/test/java/org/assertj/core/api/Assertions_assertThat_with_StringBuilder_Test.java
+new file mode 100644
+index 0000000000..315d6d4b9f
+--- /dev/null
++++ b/src/test/java/org/assertj/core/api/Assertions_assertThat_with_StringBuilder_Test.java
+@@ -0,0 +1,36 @@
++/*
++ * 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. See the License for the
++ * specific language governing permissions and limitations under the License.
++ *
++ * Copyright 2012-2018 the original author or authors.
++ */
++package org.assertj.core.api;
++
++import org.junit.Test;
++
++import static org.assertj.core.api.Assertions.assertThat;
++
++/**
++ * Tests for <code>{@link Assertions#assertThat(StringBuilder)}</code>.
++ */
++public class Assertions_assertThat_with_StringBuilder_Test {
++
++ @Test
++ public void should_create_Assert() {
++ AbstractCharSequenceAssert<?, ?> assertions = Assertions.assertThat(new StringBuilder("Yoda"));
++ assertThat(assertions).isNotNull();
++ }
++
++ @Test
++ public void should_pass_actual() {
++ StringBuilder actual = new StringBuilder("Yoda");
++ AbstractCharSequenceAssert<?, ?> assertions = Assertions.assertThat(actual);
++ assertThat(assertions.actual).isSameAs(actual);
++ }
++}
diff --git a/dev-java/assertj-core/metadata.xml b/dev-java/assertj-core/metadata.xml
index 9c7e00995b1..a009a741c11 100644
--- a/dev-java/assertj-core/metadata.xml
+++ b/dev-java/assertj-core/metadata.xml
@@ -7,6 +7,6 @@
</maintainer>
<longdescription>AssertJ core is a Java library that provides a fluent interface for writing assertions. Its main goal is to improve test code readability and make maintenance of tests easier. AssertJ core provides assertions for JDK standard types can be used with either JUnit or TestNG.</longdescription>
<upstream>
- <remote-id type="github">joel-costigliola/assertj-core</remote-id>
+ <remote-id type="github">assertj/assertj-core</remote-id>
</upstream>
</pkgmetadata>
diff --git a/dev-java/batik/batik-1.14-r1.ebuild b/dev-java/batik/batik-1.14-r1.ebuild
index 97c0d818348..1a978d257f2 100644
--- a/dev-java/batik/batik-1.14-r1.ebuild
+++ b/dev-java/batik/batik-1.14-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://apache/xmlgraphics/batik/source/batik-src-${PV}.tar.gz"
LICENSE="Apache-2.0"
SLOT="1.14"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ppc64 x86"
CP_DEPEND="
dev-java/jacl:0
diff --git a/dev-java/batik/batik-1.14.ebuild b/dev-java/batik/batik-1.14.ebuild
deleted file mode 100644
index 74222ffb9dd..00000000000
--- a/dev-java/batik/batik-1.14.ebuild
+++ /dev/null
@@ -1,191 +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/xmlgraphics/batik/source/batik-src-1.14.tar.gz --slot 1.14 --keywords "~amd64 ~ppc64 ~x86" --ebuild batik-1.14.ebuild
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.apache.xmlgraphics:batik:1.14"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit desktop java-pkg-2 java-pkg-simple xdg-utils
-
-DESCRIPTION="XML Graphics Batik"
-HOMEPAGE="https://xmlgraphics.apache.org/batik/"
-SRC_URI="mirror://apache/xmlgraphics/batik/source/batik-src-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="1.14"
-KEYWORDS="amd64 ~arm64 ppc64 x86"
-
-CP_DEPEND="
- dev-java/jacl:0
- dev-java/jython:2.7
- dev-java/rhino:1.6
- dev-java/xalan:0
- dev-java/xml-commons-external:1.3
- dev-java/xmlgraphics-commons:2
-"
-
-DEPEND="${CP_DEPEND}
- >=virtual/jdk-1.8:*"
-
-RDEPEND="${CP_DEPEND}
- >=virtual/jre-1.8:*"
-
-DOCS=( {CHANGES,NOTICE,README} )
-
-S="${WORKDIR}/batik-${PV}"
-
-src_prepare() {
- default
- java-pkg_clean
-}
-
-src_compile() {
-
- # We loop over the modules list and compile the jar files.
- while read module ; do \
-
- echo "compiling $module"
-
- JAVA_SRC_DIR=""
- JAVA_RESOURCE_DIRS=""
- JAVA_JAR_FILENAME="$module.jar"
- JAVA_MAIN_CLASS=""
-
- # Not all of the modules have resources.
- if [[ -d $module/src/main/resources ]]; then \
- JAVA_RESOURCE_DIRS="$module/src/main/resources"
- fi
-
- # Don't let sed die on modules without MainClass.
- JAVA_MAIN_CLASS=$( sed -n 's:.*<mainClass>\(.*\)</mainClass>:\1:p' $module/pom.xml )
-
- # Some modules don't have source code.
- if [[ -d $module/src/main/java/org ]]; then \
- JAVA_SRC_DIR="$module/src/main/java"
- java-pkg-simple_src_compile
- else
- # This case applies to batik-rasterizer.
- if [[ -d $module/src/main/resources/org ]]; then \
- jar -cfe $module.jar "${JAVA_MAIN_CLASS}" -C "$module/src/main/resources" . || die
- # Else for batik-rasterizer-ext, batik-squiggle and batik-squiggle-ext
- else
- jar -cfe $module.jar "${JAVA_MAIN_CLASS}" -C . README || die
- zip -d $module.jar "README"
- fi
- fi
-
- JAVA_GENTOO_CLASSPATH_EXTRA+=":$module.jar"
-
- rm -fr target || die
-
- # Modules batik-rasterizer-ext and batik-squiggle-ext, upstream puts their jar files in the extensions
- # directory, see batik-extension/src/main/resources/org/apache/batik/extensions/README.txt
- # We keep them in the mudules list for later but omit them by 'grep -v'.
- # The same for batik-test-old which depends on fop-transcoder-allinone which itself depends on batik.
- # batik-1.14-modules is the "Reactor Build Order" extracted from the output of "mvn dependency:tree".
- done < <(grep -v '\(batik-rasterizer-ext\|batik-squiggle-ext\|batik-test-old\)' "${FILESDIR}"/batik-1.14-modules)
-
- if use doc; then
-
- JAVA_SRC_DIR=""
- JAVA_JAR_FILENAME="ignoreme.jar"
-
- while read module ; do \
-
- # Some modules don't have source code
- if [[ -d $module/src/main/java/org ]]; then \
- JAVA_SRC_DIR+=( "$module/src/main/java" )
- fi
-
- done < "${FILESDIR}"/batik-1.14-modules
-
- java-pkg-simple_src_compile
- fi
-}
-
-src_test() {
-
- JAVA_TEST_GENTOO_CLASSPATH="junit-4"
-
- while read module ; do \
-
- echo "testing $module"
-
- JAVA_TEST_SRC_DIR=""
- JAVA_TEST_RESOURCE_DIRS=""
- JAVA_TEST_RUN_ONLY=""
-
- if [[ -d $module/src/test/resources ]]; then \
- JAVA_TEST_RESOURCE_DIRS="$module/src/test/resources"
- fi
-
- # https://github.com/apache/xmlgraphics-batik/blob/refs/tags/batik-1_14/batik-util/pom.xml#L74-L75
- if [[ $module == batik-util ]]; then \
- JAVA_TEST_RUN_ONLY="org.apache.batik.util.Base64TestCases"
- fi
-
- if [[ -d $module/src/test/java/org ]]; then \
- JAVA_TEST_SRC_DIR="$module/src/test/java"
- java-pkg-simple_src_test
- fi
-
- done < <(grep -v '\(batik-rasterizer-ext\|batik-squiggle-ext\|batik-test-old\)' "${FILESDIR}"/batik-1.14-modules)
-}
-
-src_install() {
- einstalldocs
- domenu "${FILESDIR}"/batik-squiggle.desktop
- doicon batik-svgbrowser/src/main/resources/org/apache/batik/apps/svgbrowser/resources/init.svg
-
- while read module ; do \
-
- JAVA_MAIN_CLASS=$( sed -n 's:.*<mainClass>\(.*\)</mainClass>:\1:p' $module/pom.xml )
-
- java-pkg_dojar $module.jar
-
- # Add a launcher if the module has a MainClass.
- if [[ -n "${JAVA_MAIN_CLASS}" ]]; then \
- java-pkg_dolauncher "$module-${SLOT}" --main "${JAVA_MAIN_CLASS}"
- fi
-
- # Some modules don't have source code
- if [[ -d $module/src/main/java/org ]]; then \
-
- if use source; then
- java-pkg_dosrc "$module/src/main/java/*"
- fi
-
- fi
-
- done < <(grep -v '\(batik-rasterizer-ext\|batik-squiggle-ext\|batik-test-old\)' "${FILESDIR}"/batik-1.14-modules)
-
- local java_policy_file="${JAVA_PKG_SHAREPATH}/etc/${PN}.policy"
- insinto "$(dirname "${java_policy_file}")"
- newins - "$(basename "${java_policy_file}")" <<- _EOF_
- grant codeBase "file:${EPREFIX}${JAVA_PKG_JARDEST}/-" {
- permission java.security.AllPermission;
- };
- _EOF_
- java-pkg_register-environment-variable \
- gjl_java_args \
- "-Djava.security.policy=file:${EPREFIX}${java_policy_file}"
-
- if use doc; then
- java-pkg_dojavadoc target/api
- fi
-}
-
-pkg_postinst() {
- xdg_desktop_database_update
- xdg_icon_cache_update
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
- xdg_icon_cache_update
-}
diff --git a/dev-java/bcmail/Manifest b/dev-java/bcmail/Manifest
index b7586bb4667..7feaa1f6925 100644
--- a/dev-java/bcmail/Manifest
+++ b/dev-java/bcmail/Manifest
@@ -1 +1 @@
-DIST bc-java-r1rv69.tar.gz 56587177 BLAKE2B be5321f48911840de70d3201c0436cf4147a25999abb605dc4c176ea9292796ca25633635d66dccab685a4bb162258c4495ccc764782119a0750ec1b7456a7db SHA512 5224f424faf549e8e3f2db1134e74647b09bebb654ed23bb0bcd493f065fdb3f2b4f2815be0137ebcc9d62b25a6725b7a26b76d55eb3ad014ad0ce92961126de
+DIST bc-java-r1rv71.tar.gz 117684695 BLAKE2B db0a1b2576a55592e0447aa8734e8ecb6fe8452d08dabf010070f3c6b5a3b4caa7a5929baaa52796fed0ef397e18fe58fdb91dfef6da75af8f28efb627d2b808 SHA512 c9a095a034863a46027e28754ae96d9750162120bc1af124fa700ad05d23716a606633b674e2e8490bda658d30d30e93f42ba00dcc1ac13596a24f8aa43a666d
diff --git a/dev-java/bcmail/bcmail-1.69-r1.ebuild b/dev-java/bcmail/bcmail-1.71.ebuild
index 3c07eddb70b..6d64d374d63 100644
--- a/dev-java/bcmail/bcmail-1.69-r1.ebuild
+++ b/dev-java/bcmail/bcmail-1.71.ebuild
@@ -1,17 +1,17 @@
# 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.bouncycastle:bcmail-jdk15on:1.69"
+MAVEN_ID="org.bouncycastle:bcmail-jdk18on:1.71"
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/refs/tags/r${PV/./rv}.tar.gz -> bc-java-r${PV/./rv}.tar.gz"
+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"
@@ -25,12 +25,12 @@ CDEPEND="
dev-java/javax-mail:0
"
DEPEND="${CDEPEND}
- >=virtual/jdk-1.8:*"
+ >=virtual/jdk-11:*"
RDEPEND="${CDEPEND}
>=virtual/jre-1.8:*"
DOCS=( ../{README,SECURITY}.md )
-HTML_DOCS=( ../{CONTRIBUTORS,index,LICENSE}.html )
+HTML_DOCS=( ../{CONTRIBUTORS,index}.html )
S="${WORKDIR}/bc-java-r${PV/./rv}/mail"
@@ -44,12 +44,11 @@ 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_RUN_ONLY="org.bouncycastle.mail.smime.test.AllTests" # OK (106 tests)
+JAVA_TEST_RUN_ONLY="org.bouncycastle.mail.smime.test.AllTests"
src_prepare() {
default
- cd ../ || die
- java-pkg_clean
+ java-pkg_clean ..
}
src_install() {
diff --git a/dev-java/bcmail/metadata.xml b/dev-java/bcmail/metadata.xml
index 4221e170cbc..97fff009c2d 100644
--- a/dev-java/bcmail/metadata.xml
+++ b/dev-java/bcmail/metadata.xml
@@ -5,4 +5,7 @@
<email>java@gentoo.org</email>
<name>Java</name>
</maintainer>
+ <longdescription>
+ The Bouncy Castle Java S/MIME APIs for handling S/MIME protocols. This jar contains S/MIME APIs for JDK 1.8 and up. The APIs can be used in conjunction with a JCE/JCA provider such as the one provided with the Bouncy Castle Cryptography APIs. The JavaMail API and the Java activation framework will also be needed.
+ </longdescription>
</pkgmetadata>
diff --git a/dev-java/bcpg/Manifest b/dev-java/bcpg/Manifest
index b7586bb4667..7feaa1f6925 100644
--- a/dev-java/bcpg/Manifest
+++ b/dev-java/bcpg/Manifest
@@ -1 +1 @@
-DIST bc-java-r1rv69.tar.gz 56587177 BLAKE2B be5321f48911840de70d3201c0436cf4147a25999abb605dc4c176ea9292796ca25633635d66dccab685a4bb162258c4495ccc764782119a0750ec1b7456a7db SHA512 5224f424faf549e8e3f2db1134e74647b09bebb654ed23bb0bcd493f065fdb3f2b4f2815be0137ebcc9d62b25a6725b7a26b76d55eb3ad014ad0ce92961126de
+DIST bc-java-r1rv71.tar.gz 117684695 BLAKE2B db0a1b2576a55592e0447aa8734e8ecb6fe8452d08dabf010070f3c6b5a3b4caa7a5929baaa52796fed0ef397e18fe58fdb91dfef6da75af8f28efb627d2b808 SHA512 c9a095a034863a46027e28754ae96d9750162120bc1af124fa700ad05d23716a606633b674e2e8490bda658d30d30e93f42ba00dcc1ac13596a24f8aa43a666d
diff --git a/dev-java/bcpg/bcpg-1.69.ebuild b/dev-java/bcpg/bcpg-1.71.ebuild
index 7e9f5e64e5f..8028aba31a2 100644
--- a/dev-java/bcpg/bcpg-1.69.ebuild
+++ b/dev-java/bcpg/bcpg-1.71.ebuild
@@ -1,17 +1,17 @@
-# Copyright 1999-2021 Gentoo Authors
+# 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.bouncycastle:bcpg-jdk15on:1.69"
+MAVEN_ID="org.bouncycastle:bcpg-jdk18on:1.71"
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/refs/tags/r${PV/./rv}.tar.gz -> bc-java-r${PV/./rv}.tar.gz"
+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"
@@ -19,12 +19,12 @@ KEYWORDS="amd64 arm64 ppc64 x86"
CDEPEND="~dev-java/bcprov-${PV}:0"
DEPEND="${CDEPEND}
- >=virtual/jdk-1.8:*"
+ >=virtual/jdk-11:*"
RDEPEND="${CDEPEND}
>=virtual/jre-1.8:*"
DOCS=( ../{README,SECURITY}.md )
-HTML_DOCS=( ../{CONTRIBUTORS,index,LICENSE}.html )
+HTML_DOCS=( ../{CONTRIBUTORS,index}.html )
S="${WORKDIR}/bc-java-r${PV/./rv}/pg"
@@ -33,22 +33,20 @@ JAVA_SRC_DIR=(
"src/main/java"
"src/main/jdk1.9" # https://bugs.gentoo.org/797634
)
-# JAVA_RESOURCE_DIRS="src/main/resources" # Does not exist
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.openpgp.test.AllTests" # OK (19 tests)
- "org.bouncycastle.openpgp.examples.test.AllTests" # OK (6 tests)
- "org.bouncycastle.gpg.test.AllTests" # OK (1 test)
+ "org.bouncycastle.openpgp.test.AllTests"
+ "org.bouncycastle.openpgp.examples.test.AllTests"
+ "org.bouncycastle.gpg.test.AllTests"
)
src_prepare() {
default
- cd ../ || die
- java-pkg_clean
+ java-pkg_clean ..
}
src_install() {
diff --git a/dev-java/bcpg/metadata.xml b/dev-java/bcpg/metadata.xml
index 4221e170cbc..3cbf364f100 100644
--- a/dev-java/bcpg/metadata.xml
+++ b/dev-java/bcpg/metadata.xml
@@ -5,4 +5,7 @@
<email>java@gentoo.org</email>
<name>Java</name>
</maintainer>
+ <longdescription>
+ The Bouncy Castle Java API for handling the OpenPGP protocol. This jar contains the OpenPGP API for JDK 1.8 and up. The APIs can be used in conjunction with a JCE/JCA provider such as the one provided with the Bouncy Castle Cryptography APIs.
+ </longdescription>
</pkgmetadata>
diff --git a/dev-java/bcpkix/Manifest b/dev-java/bcpkix/Manifest
index b7586bb4667..7feaa1f6925 100644
--- a/dev-java/bcpkix/Manifest
+++ b/dev-java/bcpkix/Manifest
@@ -1 +1 @@
-DIST bc-java-r1rv69.tar.gz 56587177 BLAKE2B be5321f48911840de70d3201c0436cf4147a25999abb605dc4c176ea9292796ca25633635d66dccab685a4bb162258c4495ccc764782119a0750ec1b7456a7db SHA512 5224f424faf549e8e3f2db1134e74647b09bebb654ed23bb0bcd493f065fdb3f2b4f2815be0137ebcc9d62b25a6725b7a26b76d55eb3ad014ad0ce92961126de
+DIST bc-java-r1rv71.tar.gz 117684695 BLAKE2B db0a1b2576a55592e0447aa8734e8ecb6fe8452d08dabf010070f3c6b5a3b4caa7a5929baaa52796fed0ef397e18fe58fdb91dfef6da75af8f28efb627d2b808 SHA512 c9a095a034863a46027e28754ae96d9750162120bc1af124fa700ad05d23716a606633b674e2e8490bda658d30d30e93f42ba00dcc1ac13596a24f8aa43a666d
diff --git a/dev-java/bcpkix/bcpkix-1.69.ebuild b/dev-java/bcpkix/bcpkix-1.71-r1.ebuild
index f719172983a..bcf70c8d215 100644
--- a/dev-java/bcpkix/bcpkix-1.69.ebuild
+++ b/dev-java/bcpkix/bcpkix-1.71-r1.ebuild
@@ -1,33 +1,38 @@
-# Copyright 1999-2021 Gentoo Authors
+# 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.bouncycastle:bcpkix-jdk15on:1.69"
+MAVEN_ID="org.bouncycastle:bcpkix-jdk18on:1.71"
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/refs/tags/r${PV/./rv}.tar.gz -> bc-java-r${PV/./rv}.tar.gz"
+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-1.8:*"
+ >=virtual/jdk-11:*"
RDEPEND="${CDEPEND}
>=virtual/jre-1.8:*"
DOCS=( ../{README,SECURITY}.md )
-HTML_DOCS=( ../{CONTRIBUTORS,index,LICENSE}.html )
+HTML_DOCS=( ../{CONTRIBUTORS,index}.html )
S="${WORKDIR}/bc-java-r${PV/./rv}/pkix"
@@ -36,7 +41,6 @@ JAVA_SRC_DIR=(
"src/main/java"
"src/main/jdk1.9" # https://bugs.gentoo.org/797634
)
-# JAVA_RESOURCE_DIRS="src/main/resources" # Does not exist
JAVA_TEST_GENTOO_CLASSPATH="junit-4"
JAVA_TEST_SRC_DIR="src/test/java"
@@ -44,16 +48,26 @@ JAVA_TEST_RESOURCE_DIRS="src/test/resources"
JAVA_TEST_EXTRA_ARGS="-Dbc.test.data.home=${S}/../core/src/test/data"
+# There was 1 failure:
+# 1) testSimpleTests(org.bouncycastle.cert.test.AllTests)
+# junit.framework.AssertionFailedError: CertTest:
+# CertTest: 9 failed - exception java.security.InvalidKeyException: cannot identify EdDSA public key
+# at junit.framework.Assert.fail(Assert.java:57)
+# at junit.framework.TestCase.fail(TestCase.java:223)
+# at org.bouncycastle.cert.test.AllTests.testSimpleTests(AllTests.java:30)
+#
+# FAILURES!!!
+# Tests run: 474, Failures: 1
JAVA_TEST_RUN_ONLY=(
"org.bouncycastle.cert.cmp.test.AllTests"
"org.bouncycastle.cert.crmf.test.AllTests"
"org.bouncycastle.cert.ocsp.test.AllTests"
"org.bouncycastle.cert.path.test.AllTests"
- "org.bouncycastle.cert.test.AllTests"
+# "org.bouncycastle.cert.test.AllTests"
"org.bouncycastle.cms.test.AllTests"
"org.bouncycastle.dvcs.test.AllTests"
"org.bouncycastle.eac.test.AllTests"
-# "org.bouncycastle.est.test.AllTests" # (16 tests) org.bouncycastle.est.ESTException: localhost.me: Temporary failure in name resolution HTTP Status Code: 0
+ "org.bouncycastle.est.test.AllTests"
"org.bouncycastle.mime.test.AllTests"
"org.bouncycastle.mozilla.test.AllTests"
"org.bouncycastle.openssl.test.AllTests"
@@ -79,12 +93,12 @@ pkg_pretend() {
# https://bugs.gentoo.org/823347
pkg_setup() {
check_env
+ java-pkg-2_pkg_setup
}
src_prepare() {
default
- cd ../ || die
- java-pkg_clean
+ java-pkg_clean ..
}
# https://bugs.gentoo.org/823347
diff --git a/dev-java/bcpkix/metadata.xml b/dev-java/bcpkix/metadata.xml
index 4221e170cbc..40c8ee28be1 100644
--- a/dev-java/bcpkix/metadata.xml
+++ b/dev-java/bcpkix/metadata.xml
@@ -5,4 +5,7 @@
<email>java@gentoo.org</email>
<name>Java</name>
</maintainer>
+ <longdescription>
+ The Bouncy Castle Java APIs for CMS, PKCS, EAC, TSP, CMP, CRMF, OCSP, and certificate generation. This jar contains APIs for JDK 1.8 and up. The APIs can be used in conjunction with a JCE/JCA provider such as the one provided with the Bouncy Castle Cryptography APIs.
+ </longdescription>
</pkgmetadata>
diff --git a/dev-java/bcprov/Manifest b/dev-java/bcprov/Manifest
index b7586bb4667..7feaa1f6925 100644
--- a/dev-java/bcprov/Manifest
+++ b/dev-java/bcprov/Manifest
@@ -1 +1 @@
-DIST bc-java-r1rv69.tar.gz 56587177 BLAKE2B be5321f48911840de70d3201c0436cf4147a25999abb605dc4c176ea9292796ca25633635d66dccab685a4bb162258c4495ccc764782119a0750ec1b7456a7db SHA512 5224f424faf549e8e3f2db1134e74647b09bebb654ed23bb0bcd493f065fdb3f2b4f2815be0137ebcc9d62b25a6725b7a26b76d55eb3ad014ad0ce92961126de
+DIST bc-java-r1rv71.tar.gz 117684695 BLAKE2B db0a1b2576a55592e0447aa8734e8ecb6fe8452d08dabf010070f3c6b5a3b4caa7a5929baaa52796fed0ef397e18fe58fdb91dfef6da75af8f28efb627d2b808 SHA512 c9a095a034863a46027e28754ae96d9750162120bc1af124fa700ad05d23716a606633b674e2e8490bda658d30d30e93f42ba00dcc1ac13596a24f8aa43a666d
diff --git a/dev-java/bcprov/bcprov-1.69.ebuild b/dev-java/bcprov/bcprov-1.69.ebuild
deleted file mode 100644
index e3a5ab067c7..00000000000
--- a/dev-java/bcprov/bcprov-1.69.ebuild
+++ /dev/null
@@ -1,99 +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"
-MAVEN_ID="org.bouncycastle:bcprov-jdk15on:1.69"
-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/refs/tags/r${PV/./rv}.tar.gz -> bc-java-r${PV/./rv}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
-
-DEPEND=">=virtual/jdk-1.8:*"
-RDEPEND=">=virtual/jre-1.8:*"
-BDEPEND="app-arch/zip"
-
-DOCS=( ../{README,SECURITY}.md )
-HTML_DOCS=( ../{CONTRIBUTORS,index,LICENSE}.html )
-
-S="${WORKDIR}/bc-java-r${PV/./rv}/prov"
-
-JAVA_SRC_DIR=(
- "src/main/java"
- "../core/src/main/java" # package org.bouncycastle.asn1 does not exist
- "src/main/jdk1.9" # https://bugs.gentoo.org/797634
-)
-JAVA_RESOURCE_DIRS="src/main/resources"
-
-JAVA_TEST_GENTOO_CLASSPATH="junit-4"
-JAVA_TEST_SRC_DIR=( "src/test/java" "../core/src/test/java" )
-JAVA_TEST_RESOURCE_DIRS=( "src/test/resources" "../core/src/test/resources" )
-
-JAVA_TEST_EXTRA_ARGS="-Dbc.test.data.home=${S}/../core/src/test/data"
-
-JAVA_TEST_RUN_ONLY=(
- "org.bouncycastle.asn1.test.AllTests" # OK (18 tests)
- "org.bouncycastle.crypto.agreement.test.AllTests" # OK (14 tests)
- "org.bouncycastle.crypto.ec.test.AllTests" # OK (1 test)
- "org.bouncycastle.crypto.prng.test.AllTests" # OK (1 test)
- "org.bouncycastle.crypto.test.AllTests" # Time: 126.95 OK (6 tests)
- "org.bouncycastle.jcajce.provider.test.AllTests" # OK (29 tests)
- "org.bouncycastle.jce.provider.test.AllTests" # OK (1 test)
- "org.bouncycastle.jce.provider.test.nist.AllTests" # OK (283 tests)
- "org.bouncycastle.jce.provider.test.rsa3.AllTests" # OK (11 tests)
- "org.bouncycastle.pqc.crypto.lms.AllTests" # OK (17 tests)
- "org.bouncycastle.pqc.crypto.test.AllTests" # OK (81 tests)
- "org.bouncycastle.pqc.jcajce.provider.test.AllTests" # OK (89 tests)
- "org.bouncycastle.util.encoders.test.AllTests" # OK (15 tests)
-)
-
-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
-}
-
-src_prepare() {
- default
- cd ../ || die
- java-pkg_clean
-}
-
-src_test() {
- JAVA_TEST_EXTRA_ARGS+=" -Xmx${CHECKREQS_MEMORY}"
- java-pkg-simple_src_test
-}
-
-src_install() {
- default
- einstalldocs
- docinto html
- dodoc -r ../docs
-
- # These files are not present in the upstream jar but are used for tests
- # Removing them from the jar file after testing
- zip --delete "${S}"/bcprov.jar \
- "org/bouncycastle/pqc/crypto/ntru/*" \
- "org/bouncycastle/pqc/math/ntru/*" \
- || die "cleaning after tests failed"
-
- java-pkg-simple_src_install
-}
diff --git a/dev-java/bcprov/bcprov-1.71-r1.ebuild b/dev-java/bcprov/bcprov-1.71-r1.ebuild
new file mode 100644
index 00000000000..fbe5c65f3f1
--- /dev/null
+++ b/dev-java/bcprov/bcprov-1.71-r1.ebuild
@@ -0,0 +1,111 @@
+# 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.71"
+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}/prov"
+
+JAVA_SRC_DIR=(
+ "src/main/java"
+ "../core/src/main/java" # package org.bouncycastle.asn1 does not exist
+ "src/main/jdk1.9" # https://bugs.gentoo.org/797634
+)
+JAVA_RESOURCE_DIRS="src/main/resources"
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_SRC_DIR=( "src/test/java" "../core/src/test/java" )
+JAVA_TEST_RESOURCE_DIRS=( "src/test/resources" "../core/src/test/resources" )
+
+JAVA_TEST_EXTRA_ARGS="-Dbc.test.data.home=${S}/../core/src/test/data"
+
+# Depending on vm_version 11 or 17 there are 2 different errrors
+# 1) testJCE(org.bouncycastle.jce.provider.test.SimpleTestTest)
+# junit.framework.AssertionFailedError: index 29 KeyStore: Exception: java.security.KeyStoreException: BKS-V1 not found
+# at junit.framework.Assert.fail(Assert.java:57)
+# at junit.framework.TestCase.fail(TestCase.java:223)
+# at org.bouncycastle.jce.provider.test.SimpleTestTest.testJCE(SimpleTestTest.java:26)
+#
+# 1) testJCE(org.bouncycastle.jce.provider.test.SimpleTestTest)
+# junit.framework.AssertionFailedError: index 9 BlockCipher: IDEA/PGPCFB/NoPadding failed encryption - java.io.IOException: javax.crypto.ShortBufferException: output buffer too short for input.
+# at junit.framework.Assert.fail(Assert.java:57)
+# at junit.framework.TestCase.fail(TestCase.java:223)
+# at org.bouncycastle.jce.provider.test.SimpleTestTest.testJCE(SimpleTestTest.java:26)
+JAVA_TEST_RUN_ONLY=(
+ "org.bouncycastle.asn1.test.AllTests"
+ "org.bouncycastle.crypto.agreement.test.AllTests"
+ "org.bouncycastle.crypto.ec.test.AllTests"
+ "org.bouncycastle.crypto.prng.test.AllTests"
+ "org.bouncycastle.crypto.test.AllTests"
+ "org.bouncycastle.jcajce.provider.test.AllTests"
+# "org.bouncycastle.jce.provider.test.AllTests" # bug #827146
+ "org.bouncycastle.jce.provider.test.nist.AllTests"
+ "org.bouncycastle.jce.provider.test.rsa3.AllTests"
+ "org.bouncycastle.pqc.crypto.lms.AllTests"
+ "org.bouncycastle.pqc.crypto.test.AllTests"
+ "org.bouncycastle.pqc.jcajce.provider.test.AllTests"
+ "org.bouncycastle.util.encoders.test.AllTests"
+)
+
+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 ..
+}
+
+src_test() {
+ JAVA_TEST_EXTRA_ARGS+=" -Xmx${CHECKREQS_MEMORY}"
+ java-pkg-simple_src_test
+}
+
+src_install() {
+ default
+ einstalldocs
+ docinto html
+ dodoc -r ../docs
+
+ # These files are not present in the upstream jar but are used for tests
+ # Removing them from the jar file after testing
+ zip --delete "${S}"/bcprov.jar \
+ "org/bouncycastle/pqc/crypto/ntru/*" \
+ "org/bouncycastle/pqc/math/ntru/*" \
+ || die "cleaning after tests failed"
+
+ java-pkg-simple_src_install
+}
diff --git a/dev-java/bcprov/metadata.xml b/dev-java/bcprov/metadata.xml
index b5ad9ebd01e..1a34130e2c6 100644
--- a/dev-java/bcprov/metadata.xml
+++ b/dev-java/bcprov/metadata.xml
@@ -6,6 +6,6 @@
<name>Java</name>
</maintainer>
<longdescription>
- "The Bouncy Castle Crypto package is a Java implementation of cryptographic algorithms. This jar contains JCE provider and lightweight API for the Bouncy Castle Cryptography APIs for JDK 1.5 to JDK 1.8."
+ The Bouncy Castle Crypto package is a Java implementation of cryptographic algorithms. This jar contains JCE provider and lightweight API for the Bouncy Castle Cryptography APIs for JDK 1.8 and up.
</longdescription>
</pkgmetadata>
diff --git a/dev-java/bcutil/Manifest b/dev-java/bcutil/Manifest
index b7586bb4667..7feaa1f6925 100644
--- a/dev-java/bcutil/Manifest
+++ b/dev-java/bcutil/Manifest
@@ -1 +1 @@
-DIST bc-java-r1rv69.tar.gz 56587177 BLAKE2B be5321f48911840de70d3201c0436cf4147a25999abb605dc4c176ea9292796ca25633635d66dccab685a4bb162258c4495ccc764782119a0750ec1b7456a7db SHA512 5224f424faf549e8e3f2db1134e74647b09bebb654ed23bb0bcd493f065fdb3f2b4f2815be0137ebcc9d62b25a6725b7a26b76d55eb3ad014ad0ce92961126de
+DIST bc-java-r1rv71.tar.gz 117684695 BLAKE2B db0a1b2576a55592e0447aa8734e8ecb6fe8452d08dabf010070f3c6b5a3b4caa7a5929baaa52796fed0ef397e18fe58fdb91dfef6da75af8f28efb627d2b808 SHA512 c9a095a034863a46027e28754ae96d9750162120bc1af124fa700ad05d23716a606633b674e2e8490bda658d30d30e93f42ba00dcc1ac13596a24f8aa43a666d
diff --git a/dev-java/bcutil/bcutil-1.69.ebuild b/dev-java/bcutil/bcutil-1.71.ebuild
index 69a1a271192..df97d23f0e6 100644
--- a/dev-java/bcutil/bcutil-1.69.ebuild
+++ b/dev-java/bcutil/bcutil-1.71.ebuild
@@ -1,17 +1,17 @@
-# Copyright 1999-2021 Gentoo Authors
+# 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.bouncycastle:bcutil-jdk15on:1.69"
+MAVEN_ID="org.bouncycastle:bcutil-jdk18on:1.71"
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/refs/tags/r${PV/./rv}.tar.gz -> bc-java-r${PV/./rv}.tar.gz"
+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"
@@ -19,12 +19,12 @@ KEYWORDS="amd64 arm64 ppc64 x86"
CDEPEND="~dev-java/bcprov-${PV}:0"
DEPEND="${CDEPEND}
- >=virtual/jdk-1.8:*"
+ >=virtual/jdk-11:*"
RDEPEND="${CDEPEND}
>=virtual/jre-1.8:*"
DOCS=( ../{README,SECURITY}.md )
-HTML_DOCS=( ../{CONTRIBUTORS,index,LICENSE}.html )
+HTML_DOCS=( ../{CONTRIBUTORS,index}.html )
S="${WORKDIR}/bc-java-r${PV/./rv}/util"
@@ -33,7 +33,6 @@ JAVA_SRC_DIR=(
"src/main/java"
"src/main/jdk1.9" # https://bugs.gentoo.org/797634
)
-# JAVA_RESOURCE_DIRS="src/main/resources" # Does not exist
JAVA_TEST_GENTOO_CLASSPATH="junit-4"
JAVA_TEST_SRC_DIR="src/test/java"
@@ -41,12 +40,12 @@ 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
- cd ../ || die
- java-pkg_clean
+ java-pkg_clean ..
}
src_install() {
diff --git a/dev-java/bcutil/metadata.xml b/dev-java/bcutil/metadata.xml
index 75321cfb559..8f66cc0abd4 100644
--- a/dev-java/bcutil/metadata.xml
+++ b/dev-java/bcutil/metadata.xml
@@ -4,4 +4,7 @@
<maintainer type="project">
<email>java@gentoo.org</email>
</maintainer>
+ <longdescription>
+ The Bouncy Castle Java APIs for ASN.1 extension and utility APIs used to support bcpkix and bctls. This jar contains APIs for JDK 1.8 and up.
+ </longdescription>
</pkgmetadata>
diff --git a/dev-java/byaccj/byaccj-1.15-r2.ebuild b/dev-java/byaccj/byaccj-1.15-r3.ebuild
index ed88c9ebb22..9feb822145a 100644
--- a/dev-java/byaccj/byaccj-1.15-r2.ebuild
+++ b/dev-java/byaccj/byaccj-1.15-r3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
inherit toolchain-funcs
@@ -13,10 +13,13 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
LICENSE="public-domain"
SLOT="0"
KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~ppc-macos ~x64-macos"
-IUSE=""
S="${WORKDIR}/${PN}${PV}"
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.15-implicit-function-declaration.patch
+)
+
src_compile() {
cp "${FILESDIR}/Makefile" src/Makefile || die
emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}" CFLAGS="${CFLAGS}" -C src linux
diff --git a/dev-java/byaccj/files/byaccj-1.15-implicit-function-declaration.patch b/dev-java/byaccj/files/byaccj-1.15-implicit-function-declaration.patch
new file mode 100644
index 00000000000..5f5bb58db13
--- /dev/null
+++ b/dev-java/byaccj/files/byaccj-1.15-implicit-function-declaration.patch
@@ -0,0 +1,15 @@
+main.c: In function ‘done’:
+main.c:88:43: error: implicit declaration of function -Werror=implicit-function-declaration
+ 88 | if (action_file) { fclose(action_file); unlink(action_file_name); }
+ | ^~~~~~
+--- a/src/main.c
++++ b/src/main.c
+@@ -2,6 +2,8 @@
+ #include <stdlib.h>
+ #include <string.h>
+
++#include <unistd.h>
++
+ #ifndef __WIN32__ /*rwj -- make portable*/
+ #include <signal.h>
+ #else
diff --git a/dev-java/byte-buddy-agent/Manifest b/dev-java/byte-buddy-agent/Manifest
index 56b0c9374b3..c34703014fe 100644
--- a/dev-java/byte-buddy-agent/Manifest
+++ b/dev-java/byte-buddy-agent/Manifest
@@ -1,2 +1,2 @@
-DIST byte-buddy-1.12.8.tar.gz 149928045 BLAKE2B f1fceaea236a7d625739547556cd3775629250ab0cf6ead0643002895d432f06b84bdf193de3d4aa88de8cfdd3ff38a4aa1340076be918c0e5e0c217072cb8e0 SHA512 dffe3f557d29b9c0ac16e8314e2a1fc2b089bda000d5c1307ad2d8808f149f3bef90daa0f8dcc9815d255fc11824b28708b6fddfe942ea8f24ca61f9ea73a1d9
-DIST byte-buddy-agent-1.12.8-sources.jar 204430 BLAKE2B fe62b36fccc1000b63cf4fdc9a0eda0b767baedbb795ed55d28068ca9bd01f10b47e28edb2ee2d0fccd28e82f531f882091386b9c58f2ca929e17e89f996876a SHA512 576cad5aec60bb1623faf6f2460e9550aab392124579a0ed467128c3cdbc20fb0c4e51dfaa8d56c8f2f314bcc494068aae5c199a0551cbfce053633a2ffb5bd2
+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.8.ebuild b/dev-java/byte-buddy-agent/byte-buddy-agent-1.12.10.ebuild
index 050af69691a..dd14f79475b 100644
--- a/dev-java/byte-buddy-agent/byte-buddy-agent-1.12.8.ebuild
+++ b/dev-java/byte-buddy-agent/byte-buddy-agent-1.12.10.ebuild
@@ -2,12 +2,12 @@
# Distributed under the terms of the GNU General Public License v2
# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom byte-buddy-agent-1.12.8.pom --download-uri https://repo1.maven.org/maven2/net/bytebuddy/byte-buddy-agent/1.12.8/byte-buddy-agent-1.12.8-sources.jar --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild byte-buddy-agent-1.12.8.ebuild
+# 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.8"
+MAVEN_ID="net.bytebuddy:byte-buddy-agent:1.12.10"
JAVA_TESTING_FRAMEWORKS="junit-4"
inherit java-pkg-2 java-pkg-simple
@@ -15,11 +15,11 @@ 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://codeload.github.com/raphw/byte-buddy/tar.gz/byte-buddy-1.12.8 -> byte-buddy-${PV}.tar.gz )"
+ 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"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
# Compile dependencies
# POM: ${P}.pom
diff --git a/dev-java/byte-buddy/Manifest b/dev-java/byte-buddy/Manifest
index 3765677c58d..57136f2a797 100644
--- a/dev-java/byte-buddy/Manifest
+++ b/dev-java/byte-buddy/Manifest
@@ -1 +1,2 @@
-DIST byte-buddy-1.12.8-sources.jar 1327088 BLAKE2B b20101a8e2f68c795ef102b8f2d581c1ebf223dee2170b675f0959bfe547c2793bf79c7e9508b405e43f3561f48423b980ed2e87c6297999a7d1257df4d6524e SHA512 a99d69be07049f4ed162566111c6524a9dd90af459d994a5e917596b5787b74aa88d67a8db7651008558ad687dccbefd0ee87207c6b28ab0660e02abdb43f9c6
+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
diff --git a/dev-java/byte-buddy/byte-buddy-1.12.8.ebuild b/dev-java/byte-buddy/byte-buddy-1.12.10.ebuild
index 3b658b7e113..482eea80638 100644
--- a/dev-java/byte-buddy/byte-buddy-1.12.8.ebuild
+++ b/dev-java/byte-buddy/byte-buddy-1.12.10.ebuild
@@ -2,12 +2,12 @@
# Distributed under the terms of the GNU General Public License v2
# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom byte-buddy-1.12.8.pom --download-uri https://repo1.maven.org/maven2/net/bytebuddy/byte-buddy/1.12.8/byte-buddy-1.12.8-sources.jar --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild byte-buddy-1.12.8.ebuild
+# 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.8"
+MAVEN_ID="net.bytebuddy:byte-buddy:1.12.10"
inherit java-pkg-2 java-pkg-simple
@@ -17,7 +17,7 @@ SRC_URI="https://repo1.maven.org/maven2/net/bytebuddy/${PN}/${PV}/${P}-sources.j
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
# Compile dependencies
# POM: ${P}.pom
diff --git a/dev-java/byte-buddy/byte-buddy-1.12.12.ebuild b/dev-java/byte-buddy/byte-buddy-1.12.12.ebuild
new file mode 100644
index 00000000000..6a3353c6c3d
--- /dev/null
+++ b/dev-java/byte-buddy/byte-buddy-1.12.12.ebuild
@@ -0,0 +1,176 @@
+# 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/commons-cli/Manifest b/dev-java/commons-cli/Manifest
index cb16aa4fe2d..5defc51942d 100644
--- a/dev-java/commons-cli/Manifest
+++ b/dev-java/commons-cli/Manifest
@@ -1,2 +1 @@
-DIST commons-cli-1.4-src.tar.gz 148530 BLAKE2B 72460ee073b4e8c5179da03c3d599cf04b37b5b3aff89e4927b07765bd879acc9ac56f52e7dee03214e21f7ba9e5af3adf54d2f943aebb266bfa9b4983ba0380 SHA512 a5db856f6154e4340aab1865e3b34c752c0dceb8063faa64740ed470d8e6b3e7782242ae51d6bb57a535a6d6dad2943cc3130d7202223b8f89b8cbecdc3d9d4f
DIST commons-cli-1.5.0-src.tar.gz 156731 BLAKE2B b3bc3c7426f4564187f6b2fecf2977a8d307277cb244bb51064f32e6d2fc0ddb08c539b3bae68bba5ccc2319d0e483f01f6765ae3e86ebfe99eb775564fd7c8f SHA512 aa2165695177c3e4561f68585cafb5434758138d8a863f3db1860477f660cf78664d2afb07cc3bc767bc8fa87befc7eaa5bdead423ee8b883c62ff00aec7cdda
diff --git a/dev-java/commons-cli/commons-cli-1.4.ebuild b/dev-java/commons-cli/commons-cli-1.4.ebuild
deleted file mode 100644
index cfe05d27ae2..00000000000
--- a/dev-java/commons-cli/commons-cli-1.4.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-JAVA_PKG_IUSE="doc source"
-MAVEN_ID="commons-cli:commons-cli:1.4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="A Java library for working with the command line arguments and options"
-HOMEPAGE="http://commons.apache.org/cli/"
-SRC_URI="mirror://apache/commons/cli/source/${P}-src.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="1"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=virtual/jre-1.7"
-
-DEPEND=">=virtual/jdk-1.7
- test? ( dev-java/junit:4 )"
-
-S="${WORKDIR}/${P}-src"
-JAVA_SRC_DIR="src/main/java"
-
-src_install() {
- java-pkg-simple_src_install
- dodoc CONTRIBUTING.md NOTICE.txt README.md RELEASE-NOTES.txt
-}
-
-src_test() {
- cd src/test/java || die
-
- local CP=".:${S}/${PN}.jar:$(java-pkg_getjars junit-4)"
- local TESTS=$(find * -name "*Test.java")
- TESTS="${TESTS//.java}"
- TESTS="${TESTS//\//.}"
-
- ejavac -cp "${CP}" -d . $(find * -name "*.java")
- ejunit4 -classpath "${CP}" ${TESTS}
-}
diff --git a/dev-java/commons-cli/commons-cli-1.5.0.ebuild b/dev-java/commons-cli/commons-cli-1.5.0.ebuild
index 8fb0198774d..5edf37d89a7 100644
--- a/dev-java/commons-cli/commons-cli-1.5.0.ebuild
+++ b/dev-java/commons-cli/commons-cli-1.5.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/commons/cli/source/${P}-src.tar.gz"
LICENSE="Apache-2.0"
SLOT="1"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/commons-codec/commons-codec-1.15-r1.ebuild b/dev-java/commons-codec/commons-codec-1.15-r1.ebuild
new file mode 100644
index 00000000000..e611ee200c7
--- /dev/null
+++ b/dev-java/commons-codec/commons-codec-1.15-r1.ebuild
@@ -0,0 +1,45 @@
+# 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_AUTOMATIC_MODULE_NAME="org.apache.commons.codec"
+
+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
new file mode 100644
index 00000000000..c55d0bb1979
--- /dev/null
+++ b/dev-java/commons-collections/commons-collections-4.4-r1.ebuild
@@ -0,0 +1,68 @@
+# 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"
+JAVA_AUTOMATIC_MODULE_NAME="org.apache.commons.collections4"
+
+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-daemon/Manifest b/dev-java/commons-daemon/Manifest
index 49470d61307..97c35db071c 100644
--- a/dev-java/commons-daemon/Manifest
+++ b/dev-java/commons-daemon/Manifest
@@ -1 +1 @@
-DIST commons-daemon-1.2.4-src.tar.gz 281929 BLAKE2B 877f1c31024a2f3e4796abdd11059bd636444f5c856b998a39761fb0b221467e986586fef43463a4d01b4d4f7a562f9f8c658b94a124cd356b0a70cc185c0030 SHA512 36e9cb3153ca763bfaaa71575a1584610254f1ce4c0f666ff7bbc628311405430536413525c9c777e4364eea62a247fb084750d837e84a62d9fce92a61909d56
+DIST commons-daemon-1.3.1-src.tar.gz 287642 BLAKE2B 02e85a5534af7f804a0374789506ee25ee8313987c68153974aa938b983745ae44d579f17deb362764d1a03b04bc552115bd69ef28b4f7d3bbb06f3bb4199814 SHA512 b810ac152f8296d980a4fb3786eff9d147b234dc2377df5fe1bded0824c694c9e82a7ef50b0a63c3e6432dfc4684a3aa2ce8d583aacb740bd4664c3dfb8b8f16
diff --git a/dev-java/commons-daemon/commons-daemon-1.2.4.ebuild b/dev-java/commons-daemon/commons-daemon-1.3.1.ebuild
index 8eb3ed4a133..baa152a4895 100644
--- a/dev-java/commons-daemon/commons-daemon-1.2.4.ebuild
+++ b/dev-java/commons-daemon/commons-daemon-1.3.1.ebuild
@@ -7,7 +7,7 @@
EAPI=8
JAVA_PKG_IUSE="doc source"
-MAVEN_ID="commons-daemon:commons-daemon:1.2.4"
+MAVEN_ID="commons-daemon:commons-daemon:1.3.1"
# JAVA_TESTING_FRAMEWORKS="junit-4"
inherit java-pkg-2 java-pkg-simple toolchain-funcs
@@ -28,7 +28,8 @@ RDEPEND="
>=virtual/jre-1.8:*
"
-DOCS=( {CONTRIBUTING,README}.md {HOWTO-RELEASE,LICENSE,NOTICE,RELEASE-NOTES}.txt )
+PATCHES=( "${FILESDIR}/commons-daemon-1.3.1-Make.patch" )
+DOCS=( {CONTRIBUTING,README}.md {HOWTO-RELEASE,NOTICE,RELEASE-NOTES}.txt )
HTML_DOCS=( PROPOSAL.html )
S="${WORKDIR}/${P}-src"
@@ -42,6 +43,11 @@ JAVA_SRC_DIR="src/main/java"
# JAVA_TEST_GENTOO_CLASSPATH="junit-4"
# JAVA_TEST_SRC_DIR="src/test/java"
+src_prepare() {
+ default
+ java-pkg-2_src_prepare
+}
+
src_compile() {
java-pkg-simple_src_compile
diff --git a/dev-java/commons-daemon/files/commons-daemon-1.3.1-Make.patch b/dev-java/commons-daemon/files/commons-daemon-1.3.1-Make.patch
new file mode 100644
index 00000000000..001be15a281
--- /dev/null
+++ b/dev-java/commons-daemon/files/commons-daemon-1.3.1-Make.patch
@@ -0,0 +1,21 @@
+--- a/src/native/unix/Makedefs.in
++++ b/src/native/unix/Makedefs.in
+@@ -17,6 +17,7 @@
+
+ # @author Pier Fumagalli <mailto:pier.fumagalli@eng.sun.com>
+
++AR = @AR@
+ CC = @CC@
+ CFLAGS = @CFLAGS@
+ CPPFLAGS = @CPPFLAGS@
+--- a/src/native/unix/native/Makefile.in
++++ b/src/native/unix/native/Makefile.in
+@@ -31,7 +31,7 @@ OBJS = arguments.o \
+ all: jsvc libservice.a
+
+ libservice.a: $(OBJS)
+- ar cr libservice.a $(OBJS)
++ ${AR} cr libservice.a $(OBJS)
+ $(RANLIB) libservice.a
+
+ jsvc: jsvc-unix.o libservice.a
diff --git a/dev-java/commons-imaging/Manifest b/dev-java/commons-imaging/Manifest
index 636f8ef3213..5472b1ce60c 100644
--- a/dev-java/commons-imaging/Manifest
+++ b/dev-java/commons-imaging/Manifest
@@ -1 +1 @@
-DIST commons-imaging-1.0-alpha2-src.tar.gz 39798631 BLAKE2B 01d0754689896a1f2ff1401cac7d9f59a6bbb245c0880f24f857efc53975c1203c6857d7a5d107763741a2dec7fb48c4faa258786f574cf2f3c5acca251e368b SHA512 f2479e0dc726a8d1193f4eef6289efe493cfbbe257054b5a13e929f5785f7a2c9c937e3f379e0f0066c591d18be27d12f1e5157e789eebab78fba489cc81e688
+DIST commons-imaging-1.0-alpha3-src.tar.gz 39966281 BLAKE2B f0fbb6d7ae0c12be19fe13d3ff4e1cced5acfe7ea72326528c67b57fade73c0acee3eb8eaa62b3d40c473c0c2faf7f60ec190bc0954c5159405358bfac4efd42 SHA512 16300adb5873fef464bedfdce7e1368f52add8d33087f059667840880b8666024feeecdb278a53d5c3d8e76d01ab921ea146d41ca688757f0cf0c2f2b32b0d53
diff --git a/dev-java/commons-imaging/commons-imaging-1.0_alpha2.ebuild b/dev-java/commons-imaging/commons-imaging-1.0_alpha3.ebuild
index 9ec64af99b7..338fc76ea1a 100644
--- a/dev-java/commons-imaging/commons-imaging-1.0_alpha2.ebuild
+++ b/dev-java/commons-imaging/commons-imaging-1.0_alpha3.ebuild
@@ -2,7 +2,7 @@
# 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/imaging/source/commons-imaging-1.0-alpha2-src.tar.gz --slot 0 --keywords "~amd64 ~x86" --ebuild commons-imaging-1.0_alpha2.ebuild
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri mirror://apache/commons/imaging/source/commons-imaging-1.0-alpha3-src.tar.gz --slot 0 --keywords "~amd64 ~x86" --ebuild commons-imaging-1.0_alpha3.ebuild
EAPI=8
@@ -34,8 +34,4 @@ S="${WORKDIR}/${P/_/-}-src"
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
-}
+JAVA_AUTOMATIC_MODULE_NAME="org.apache.commons.imaging"
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
new file mode 100644
index 00000000000..73150451cd2
--- /dev/null
+++ b/dev-java/commons-io/commons-io-2.11.0-r1.ebuild
@@ -0,0 +1,54 @@
+# 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://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"
+JAVA_AUTOMATIC_MODULE_NAME="org.apache.commons.io"
diff --git a/dev-java/commons-jxpath/Manifest b/dev-java/commons-jxpath/Manifest
deleted file mode 100644
index 29059110853..00000000000
--- a/dev-java/commons-jxpath/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST commons-jxpath-1.3-src.tar.gz 285339 BLAKE2B c0127ff90c51b7ba69c12072689cc7ca5b969fa29e4793839bef3200b0dc3fbb529c89e21877daa4def4386f94298e43054828d4b4b05be3671e38d9f728d3d0 SHA512 a0ad0b90c9aa4c732c47c8f38f036990438f526295b782fbdc00fd67e4c0e92643c7850429eb5263f9d322aff7cb7000b8ff2bffcdcfa88fa3ba5354dce7e152
diff --git a/dev-java/commons-jxpath/commons-jxpath-1.3-r5.ebuild b/dev-java/commons-jxpath/commons-jxpath-1.3-r5.ebuild
deleted file mode 100644
index af6d503a228..00000000000
--- a/dev-java/commons-jxpath/commons-jxpath-1.3-r5.ebuild
+++ /dev/null
@@ -1,62 +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/jxpath/source/commons-jxpath-1.3-src.tar.gz --slot 0 --keywords "~amd64 ~ppc64 ~x86" --ebuild commons-jxpath-1.3-r5.ebuild
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source"
-MAVEN_ID="commons-jxpath:commons-jxpath:1.3"
-# Tests depend on mockrunner-jdk1.3-j2ee1 which we don't have
-# JAVA_TESTING_FRAMEWORKS="junit"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Applies XPath expressions to graphs of objects of all kinds"
-HOMEPAGE="https://commons.apache.org/jxpath/"
-SRC_URI="mirror://apache/commons/jxpath/source/${P}-src.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
-
-# Common dependencies
-# POM: pom.xml
-# commons-beanutils:commons-beanutils:1.7.0 -> >=dev-java/commons-beanutils-1.9.4:1.7
-# jdom:jdom:1.0 -> !!!groupId-not-found!!!
-
-CP_DEPEND="
- dev-java/commons-beanutils:1.7
- dev-java/jdom:0
- java-virtuals/servlet-api:3.0
-"
-
-# Compile dependencies
-# POM: pom.xml
-# javax.servlet:jsp-api:2.0 -> !!!groupId-not-found!!!
-# javax.servlet:servlet-api:2.4 -> !!!groupId-not-found!!!
-# xerces:xercesImpl:2.4.0 -> >=dev-java/xerces-2.12.0:2
-# xml-apis:xml-apis:1.3.04 -> !!!groupId-not-found!!!
-# POM: pom.xml
-# test? com.mockrunner:mockrunner-jdk1.3-j2ee1.3:0.4 -> !!!groupId-not-found!!!
-# test? junit:junit:3.8.1 -> >=dev-java/junit-3.8.2:0
-
-DEPEND="${CP_DEPEND}
- >=virtual/jdk-1.8:*
- dev-java/xerces:2"
-
-RDEPEND="${CP_DEPEND}
- >=virtual/jre-1.8:*"
-
-DOCS=( {LICENSE,NOTICE}.txt )
-
-S="${WORKDIR}/${P}-src"
-
-JAVA_CLASSPATH_EXTRA="xerces-2"
-JAVA_SRC_DIR="src/java"
-
-src_install() {
- default # https://bugs.gentoo.org/789582
- java-pkg-simple_src_install
-}
diff --git a/dev-java/commons-math/Manifest b/dev-java/commons-math/Manifest
index 2a4d73ad3ca..6e97211d492 100644
--- a/dev-java/commons-math/Manifest
+++ b/dev-java/commons-math/Manifest
@@ -1 +1,2 @@
+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-r2.ebuild b/dev-java/commons-math/commons-math-3.6.1-r2.ebuild
new file mode 100644
index 00000000000..0c33559066f
--- /dev/null
+++ b/dev-java/commons-math/commons-math-3.6.1-r2.ebuild
@@ -0,0 +1,25 @@
+# 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="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"
+
+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"
+
+JAVA_AUTOMATIC_MODULE_NAME="commons.math3"
diff --git a/dev-java/conversant-disruptor/Manifest b/dev-java/conversant-disruptor/Manifest
index 58ca5b95c2d..3d67f85c9b5 100644
--- a/dev-java/conversant-disruptor/Manifest
+++ b/dev-java/conversant-disruptor/Manifest
@@ -1 +1 @@
-DIST conversant-disruptor-1.2.19.tar.gz 171364 BLAKE2B 2ac7a42835f22ae7361f156b9cb9853cea39b757c9869847b9b4c526e3e04e46ae8b7ca90c1c38bd3fa57f6925bfc95767235fb4640e7ecf1e62044973b53932 SHA512 f475507e2ab2e4260ec04b699c42115fa917f3df9dc67bbf944c96441e58fff1ab8ba63beb97dbc77d3b76f65b6b116d84b17a1eb4b40d58dedbc029e81e39ee
+DIST conversant-disruptor-1.2.20.tar.gz 171469 BLAKE2B 5c43a5ffad0dacf07605cab6bba2ab1d44f7204d1e24405a4f8f8b09a3edbee79bc5ae4ba28a0a8cb1440db15b6ec0143e3348c0ff42b4256c1267e87d36fefc SHA512 1e483642213a3780d24cd7b801d6d5d274df9bac075f88bdfc8026173d87e4b332e7cb6c174dc804d27670b89dc9abab3a6f93b663dfbbb3ecc4631266351f0f
diff --git a/dev-java/conversant-disruptor/conversant-disruptor-1.2.19-r1.ebuild b/dev-java/conversant-disruptor/conversant-disruptor-1.2.20.ebuild
index f16f11a1f11..d29f64fd9a9 100644
--- a/dev-java/conversant-disruptor/conversant-disruptor-1.2.19-r1.ebuild
+++ b/dev-java/conversant-disruptor/conversant-disruptor-1.2.20.ebuild
@@ -2,12 +2,12 @@
# Distributed under the terms of the GNU General Public License v2
# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom disruptor-1.2.19/pom.xml --download-uri https://github.com/conversant/disruptor/archive/refs/tags/1.2.19.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild conversant-disruptor-1.2.19.ebuild
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/conversant/disruptor/archive/1.2.20.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild conversant-disruptor-1.2.20.ebuild
EAPI=8
JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="com.conversantmedia:disruptor:1.2.19"
+MAVEN_ID="com.conversantmedia:disruptor:1.2.20"
JAVA_TESTING_FRAMEWORKS="junit-4"
inherit java-pkg-2 java-pkg-simple
@@ -21,9 +21,9 @@ SLOT="0"
KEYWORDS="amd64 ~arm arm64 ppc64 x86"
# Compile dependencies
-# POM: disruptor-${PV}/pom.xml
-# test? junit:junit:4.13 -> >=dev-java/junit-4.13.2:4
-# test? org.slf4j:slf4j-api:1.7.30 -> >=dev-java/slf4j-api-1.7.30:0
+# POM: pom.xml
+# test? junit:junit:4.13.1 -> >=dev-java/junit-4.13.2:4
+# test? org.slf4j:slf4j-api:1.7.30 -> >=dev-java/slf4j-api-1.7.36:0
DEPEND="
>=virtual/jdk-11:*
@@ -43,3 +43,20 @@ JAVA_RESOURCE_DIRS="src/main/resources"
JAVA_TEST_GENTOO_CLASSPATH="junit-4,slf4j-api"
JAVA_TEST_SRC_DIR="src/test/java"
+
+src_test() {
+ # Using the defaults of java-pkg-simple would exclude
+ # AbstractWaitingConditionTest and AbstractConditionTest
+ # which both are run by "mvn test".
+ pushd src/test/java || die
+ local JAVA_TEST_RUN_ONLY=$(find * -name "*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
+}
+
+src_install() {
+ default # https://bugs.gentoo.org/789582
+ java-pkg-simple_src_install
+}
diff --git a/dev-java/easymock/easymock-3.3.1-r1.ebuild b/dev-java/easymock/easymock-3.3.1-r1.ebuild
index 26eb0db0b3c..8a7db3b2235 100644
--- a/dev-java/easymock/easymock-3.3.1-r1.ebuild
+++ b/dev-java/easymock/easymock-3.3.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
EAPI=7
@@ -58,3 +58,14 @@ src_prepare() {
# cannot find symbol o = ProxyBuilder.forClass(ArrayList.class)
rm easymock/src/test/java/org/easymock/tests2/ClassExtensionHelperTest.java || die
}
+
+src_test() {
+ # ClassLoader.defineClass(java.lang.String,byte[],int,int,java.security.ProtectionDomain) throws
+ # java.lang.ClassFormatError accessible: module java.base does not "opens java.lang" to unnamed module @66da75e4
+ 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/eclipse-ecj/Manifest b/dev-java/eclipse-ecj/Manifest
index e75203b2369..8445570a7ca 100644
--- a/dev-java/eclipse-ecj/Manifest
+++ b/dev-java/eclipse-ecj/Manifest
@@ -1,3 +1,2 @@
DIST ecjsrc-4.15.jar 2166228 BLAKE2B 794e0ba1a19b325e2dd8ad0b288ccbe04866627670b50d39dd327c13fe1fac56200eb3a6c1c3d1af043cad795508b9b714a5243049671414b5a62a97725d3297 SHA512 ada55b2522cf26570f0cd43f415eb5cf20e6840f83dadc72e1ae474ebf10eadca73f9fa3d1db51e13fd2762c38cd3e3567db3c7840d43ae3d8665ebe35e1889d
DIST ecjsrc-4.22.jar 2358194 BLAKE2B e091050297b4556c38adfb01fb1e43e13644af1b3c2b30a93cfe3fdbb55050a0f7709081c7406d384d7141de67a954253aa26cdbb45f56327b16ee5ddd5e82a7 SHA512 cd52a72aecded032625ee83581ac565e1e96f8d26ecfc76e982274fd3d6238f1e7f22576855589b021e9a5ef67686b9b75e010c4e2033a8b7f6e7c9b1ff7eb4c
-DIST ecjsrc-4.5.1.jar 1809543 BLAKE2B 6d9dfed1756ac3e7edf8dd5b30f945afac8bb09bfb5b10f9abed46fff917f600afaebd28451665005b38831f20846090bd3cd19b979130043adbc6a7970d6b36 SHA512 ee615e6fb7fb4a16ef4aeefdff93bafdbf36c9d0ce15713b81f1d4dce0ae87379fa4a6de34c32a134f78db6ed1a68d6c7b4e2a431b7de57bf8262a718fdd6553
diff --git a/dev-java/eclipse-ecj/eclipse-ecj-4.22.ebuild b/dev-java/eclipse-ecj/eclipse-ecj-4.22-r1.ebuild
index 12eec977d83..c98b01d949d 100644
--- a/dev-java/eclipse-ecj/eclipse-ecj-4.22.ebuild
+++ b/dev-java/eclipse-ecj/eclipse-ecj-4.22-r1.ebuild
@@ -15,7 +15,7 @@ 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"
+KEYWORDS="amd64 ~ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris"
SLOT="4.22"
IUSE="+ant"
@@ -25,7 +25,7 @@ COMMON_DEP="
RDEPEND="${COMMON_DEP}
>=virtual/jre-11:*"
DEPEND="${COMMON_DEP}
- >=virtual/jdk-11:*
+ >=virtual/jdk-17:*
app-arch/unzip"
PDEPEND="
ant? ( ~dev-java/ant-eclipse-ecj-${PV} )"
diff --git a/dev-java/eclipse-ecj/eclipse-ecj-4.5.1.ebuild b/dev-java/eclipse-ecj/eclipse-ecj-4.5.1.ebuild
deleted file mode 100644
index 2aed82b6859..00000000000
--- a/dev-java/eclipse-ecj/eclipse-ecj-4.5.1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-MY_PN="ecj"
-DMF="R-${PV}-201509040015"
-
-DESCRIPTION="Eclipse Compiler for Java"
-HOMEPAGE="https://www.eclipse.org/"
-SRC_URI="https://archive.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.5"
-IUSE="+ant"
-
-COMMON_DEP="
- app-eselect/eselect-java"
-RDEPEND="${COMMON_DEP}
- >=virtual/jre-1.7"
-DEPEND="${COMMON_DEP}
- >=virtual/jdk-1.7
- app-arch/unzip"
-PDEPEND="
- ant? ( ~dev-java/ant-eclipse-ecj-${PV} )"
-
-JAVA_JAR_FILENAME="${MY_PN}.jar"
-
-S="${WORKDIR}"
-
-# See https://bugs.eclipse.org/bugs/show_bug.cgi?id=479134 for details
-java_prepare() {
- # 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/fastinfoset/Manifest b/dev-java/fastinfoset/Manifest
new file mode 100644
index 00000000000..91a6b0edef7
--- /dev/null
+++ b/dev-java/fastinfoset/Manifest
@@ -0,0 +1 @@
+DIST fastinfoset-2.1.0.tar.gz 304643 BLAKE2B 07d571d46dd31bbd1fb9a4aac457b7a2b3e9278a41a9b072790a2da56adccbba92cdfd7dde95d976d92c7fa38476448c3dd6e77366338fdce3e63f334e5823d4 SHA512 807926fe90f97a72e5d6f8abcbad8639b424d7938ab2afc7dc8107070db216167aada859acd041ba17566a33e277330d9ee51bdc10d16aa19a6ea07d4ae858aa
diff --git a/dev-java/fastinfoset/fastinfoset-2.1.0-r1.ebuild b/dev-java/fastinfoset/fastinfoset-2.1.0-r1.ebuild
new file mode 100644
index 00000000000..7f4e952e82b
--- /dev/null
+++ b/dev-java/fastinfoset/fastinfoset-2.1.0-r1.ebuild
@@ -0,0 +1,41 @@
+# 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/jaxb-fi/archive/2.1.0.tar.gz --slot 0 --keywords "~amd64 ~ppc64 ~x86" --ebuild fastinfoset-2.1.0.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="com.sun.xml.fastinfoset:FastInfoset:2.1.0"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Open Source implementation of the Fast Infoset Standard for Binary XML"
+HOMEPAGE="https://projects.eclipse.org/projects/ee4j.jaxb-impl/FastInfoset"
+SRC_URI="https://github.com/eclipse-ee4j/jaxb-fi/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0 EPL-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+DEPEND="
+ >=virtual/jdk-11:*
+"
+
+RDEPEND="
+ >=virtual/jre-1.8:*
+"
+
+DOCS=( ../{CONTRIBUTING,NOTICE,README}.md )
+HTML_DOCS=( docs/{index,ReleaseNotes}.html )
+
+S="${WORKDIR}/jaxb-fi-${PV}/${PN}"
+
+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"
diff --git a/dev-java/glassfish-jms-api/metadata.xml b/dev-java/fastinfoset/metadata.xml
index 4221e170cbc..75321cfb559 100644
--- a/dev-java/glassfish-jms-api/metadata.xml
+++ b/dev-java/fastinfoset/metadata.xml
@@ -3,6 +3,5 @@
<pkgmetadata>
<maintainer type="project">
<email>java@gentoo.org</email>
- <name>Java</name>
</maintainer>
</pkgmetadata>
diff --git a/dev-java/fec/fec-1.0.4-r4.ebuild b/dev-java/fec/fec-1.0.4-r4.ebuild
index 98864fd2a92..214363c410f 100644
--- a/dev-java/fec/fec-1.0.4-r4.ebuild
+++ b/dev-java/fec/fec-1.0.4-r4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://dev.gentoo.org/~monsieurp/packages/${P}.tar.gz"
LICENSE="BSD-2"
SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
CDEPEND="dev-java/log4j-12-api:2"
diff --git a/dev-java/fec/metadata.xml b/dev-java/fec/metadata.xml
index 12515a707d6..9ec6a4a58c7 100644
--- a/dev-java/fec/metadata.xml
+++ b/dev-java/fec/metadata.xml
@@ -9,7 +9,4 @@
<email>java@gentoo.org</email>
<name>Java</name>
</maintainer>
- <upstream>
- <remote-id type="bitbucket">onionnetworks</remote-id>
- </upstream>
</pkgmetadata>
diff --git a/dev-java/findbugs-annotations/findbugs-annotations-3.0.1.ebuild b/dev-java/findbugs-annotations/findbugs-annotations-3.0.1.ebuild
index 22b9af5b27f..5270eda7456 100644
--- a/dev-java/findbugs-annotations/findbugs-annotations-3.0.1.ebuild
+++ b/dev-java/findbugs-annotations/findbugs-annotations-3.0.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://repo1.maven.org/maven2/com/google/code/findbugs/${PN}/${PV}/${P
LICENSE="LGPL-3"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
# Common dependencies
# POM: ${P}.pom
diff --git a/dev-java/fontbox/Manifest b/dev-java/fontbox/Manifest
index dcc7f67ef61..3336cdec5c6 100644
--- a/dev-java/fontbox/Manifest
+++ b/dev-java/fontbox/Manifest
@@ -1,4 +1,6 @@
DIST DejaVuSansMono.ttf 317336 BLAKE2B c80f50cea451963a75c66160596b67655afb19c9ea0d61b8a5cd38b81c66bdd89a24872d293fa8752b1ce0bb828d63caf91e682c283312d5828218943c63c095 SHA512 1af1ce3e6d34a0b89c93072d8646e92cceb45b276389d2dd0d84457ec1193394d2bcc49bf3ce99c9c6b2658cd1337fc40ee5c61957f74cd45dbc3d51b6aef417
DIST NotoEmoji-Regular.ttf 418804 BLAKE2B e94f7b1d5bced052ff3f15a32ecce8f0f1dc2ef19565d3bcaa75b82676fbf0efeaa6efa1d25edf352b577acce17a45c6f0e7be1550c46a8c2ab6cef208cd6f11 SHA512 51b01ab0794be9f92c59679f6d56d4ce09ed959daeb9ec945bb837eb15a82ab302e83b29aab1972ac9cb648f7196a5f5ff4488a4622b36bedbc9cd0cab6dc3de
+DIST NotoSansSC-Regular.otf 8481960 BLAKE2B 3eee2c1e6be5e013d2ed679ccb361221e3e410150c7dc32d570382355e80e540c71be9009ece9951eea2379fb08fc05d8bcd65e941677660c55b450d660e8b03 SHA512 cbdd317d16099d24736457eef631353c7830a1a3c132b01f2cdc1e6a0c21a78e3b1fe8479b3f40179e7630a15cc23a093775bb22d521dba39376bb367d497b21
+DIST OpenSans-Regular.pfb 100962 BLAKE2B ff906c67a79df9d8deb9736f7439ba5429b72940b6a6fa49751fdea88adef70a3b57f28b2c31014da3206efe601095a8caeb98382fb36f8544afd0bec5cce355 SHA512 2787fcecc0feb1c9e6ff0d8de6193658413863e44eaab572751ca7e6c3b369c0a9731f4952cb0821f307760f0422f77c5f0d3fe7df6b054643fb39423e8d70ee
DIST SourceSansProBold.otf 104072 BLAKE2B 2c6538ed97cca04a6a38a1bcca7def6c9e923f0e7a773c2715d50ca1a526b1ff683bc6544155b1e170fb828c3923d6b22cdf7017f9da9de164523f328c1cc187 SHA512 28a044a2685fbc8da7810d9ac7b6b93a95542d504d7d8e671f009b8ebb2f5b70c974be7ea78974b188d8e6ab17d65b08f276c054927857315d5aad26f6fe36fc
-DIST pdfbox-2.0.24-src.zip 15651754 BLAKE2B 5d0220c28c2be18a66aa66c2540d3e1d85ecc6826f632e6c9a0193f2f02dca645909b0a54c707d856bb2886d52b0b5fb706503b4f89f0eb7aede8e612bebfa8e SHA512 5d55b3cadbbae266d90c47f5b10c9b09b6dc16f53b77a0cf15c78e62fc69afc7b6eab5a4329608ecdf25de9194b38db1f7d23e7d71af473cc1bf7b09b0028642
+DIST pdfbox-2.0.26-src.zip 15766524 BLAKE2B eafedf1db5a54d36cb42111b736ad79adfcc106630fa4b2bc57873dcfbdbbb7bd0e9408611b0d8771909e719813e388430944ae0fbaf800bdc859595de2b101b SHA512 e14c57e28d10324dbcb6ad239bad5751a2dab0035bbd80427afd03f65467ec1376ddd7d08e7cefd4d950b149f85d8f505f6f50cc3093fd65bb8a2cbb2b8c7c1e
diff --git a/dev-java/fontbox/fontbox-2.0.24.ebuild b/dev-java/fontbox/fontbox-2.0.26.ebuild
index ee8d0a7099d..693dc662a08 100644
--- a/dev-java/fontbox/fontbox-2.0.24.ebuild
+++ b/dev-java/fontbox/fontbox-2.0.26.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom pdfbox-2.0.24/fontbox/pom.xml --download-uri https://downloads.apache.org/pdfbox/2.0.24/pdfbox-2.0.24-src.zip --slot 0 --keywords "~amd64 ~arm64 ~ppc64 ~x86" --ebuild fontbox-2.0.24.ebuild
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri mirror://apache/pdfbox/2.0.26/pdfbox-2.0.26-src.zip --slot 0 --keywords "~amd64 ~arm64 ~ppc64 ~x86" --ebuild fontbox-2.0.26.ebuild
-EAPI=7
+EAPI=8
JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.apache.pdfbox:fontbox:2.0.24"
+MAVEN_ID="org.apache.pdfbox:fontbox:2.0.26"
JAVA_TESTING_FRAMEWORKS="junit-4"
inherit java-pkg-2 java-pkg-simple
@@ -19,26 +19,27 @@ SRC_URI="mirror://apache/pdfbox/${PV}/pdfbox-${PV}-src.zip
https://issues.apache.org/jira/secure/attachment/12684264/SourceSansProBold.otf
https://issues.apache.org/jira/secure/attachment/12896461/NotoEmoji-Regular.ttf
https://issues.apache.org/jira/secure/attachment/12809395/DejaVuSansMono.ttf
+ https://issues.apache.org/jira/secure/attachment/13036376/NotoSansSC-Regular.otf
+ http://mirrors.ctan.org/fonts/opensans/type1/OpenSans-Regular.pfb
)"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64 x86"
# Common dependencies
# POM: pdfbox-${PV}/${PN}/pom.xml
# commons-logging:commons-logging:1.2 -> >=dev-java/commons-logging-1.2:0
-CDEPEND="dev-java/commons-logging:0"
-DEPEND="${CDEPEND}
+CP_DEPEND="dev-java/commons-logging:0"
+DEPEND="${CP_DEPEND}
>=virtual/jdk-1.8:*"
-RDEPEND="${CDEPEND}
+RDEPEND="${CP_DEPEND}
>=virtual/jre-1.8:*"
BDEPEND="app-arch/unzip"
S="${WORKDIR}/pdfbox-${PV}/${PN}"
-JAVA_GENTOO_CLASSPATH="commons-logging"
JAVA_SRC_DIR="src/main/java"
JAVA_RESOURCE_DIRS="src/main/resources"
@@ -47,11 +48,15 @@ JAVA_TEST_SRC_DIR="src/test/java"
JAVA_TEST_RESOURCE_DIRS="src/test/resources"
src_test() {
- mkdir --parents target/pdfs || die
- cp "${DISTDIR}"/DejaVuSansMono.ttf \
- "${DISTDIR}"/NotoEmoji-Regular.ttf \
+ mkdir --parents target/{pdfs,fonts} || die
+ cp \
"${DISTDIR}"/SourceSansProBold.otf \
+ "${DISTDIR}"/NotoEmoji-Regular.ttf \
+ "${DISTDIR}"/DejaVuSansMono.ttf \
+ "${DISTDIR}"/NotoSansSC-Regular.otf \
"target/pdfs" || die
+ cp "${DISTDIR}"/OpenSans-Regular.pfb \
+ "target/fonts" || die
java-pkg-simple_src_test
}
diff --git a/dev-java/gin/Manifest b/dev-java/gin/Manifest
index 49f7e004687..5908cb81423 100644
--- a/dev-java/gin/Manifest
+++ b/dev-java/gin/Manifest
@@ -1 +1 @@
-DIST google-gin-2.1.2.zip 5495552 BLAKE2B 3e07fc2e8f2e93872cb022dc57d5b06cfb81cfd855e8027fbcc312e2b95e0c8c35a783c6deb842fd1f40ae8c94e5c120f463c36e20d873a415ef62b0e717f490 SHA512 eb661760078d2053dd1f6cf0d96e9c2895c7d7fd805c14f4da63c28801b8aabb6a9cf6baff020bee3830a3ba1451bdf44d53d41cae1d720bded06f7d013d59c0
+DIST gin-2.1.2.tar.gz 4100895 BLAKE2B ba9dcd333d51460f8e108253b7a5aeb92fa521b7d2b5133285917dc398264f581b1384b7e002b4d2ac677edc0e62a43b8718e02514ea942d90e2836dd5c66c40 SHA512 cfd11497d358217e3e6e0a024f461bd8fbd23cb39262c447c2729799b9aa3252967f866da9253c03de72a5dc43ee5cf1e7f6353f388b296af33e1e7be2bb8ddd
diff --git a/dev-java/gin/gin-2.1.2.ebuild b/dev-java/gin/gin-2.1.2-r1.ebuild
index a13c8f0e9aa..43bf6656dd6 100644
--- a/dev-java/gin/gin-2.1.2.ebuild
+++ b/dev-java/gin/gin-2.1.2-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
EAPI=7
@@ -7,14 +7,10 @@ JAVA_PKG_IUSE="source"
inherit java-pkg-2 java-ant-2
-MY_PN="google-gin"
-MY_P="${MY_PN}-${PV}"
-
-GIN_COMMIT="d62089f5b6ea33d842ab4646b51583c65a8be36b"
-
DESCRIPTION="Google Gin (GWT INjection)"
HOMEPAGE="https://gwtplus.github.io/google-gin/"
-SRC_URI="https://github.com/gwtplus/google-gin/archive/${GIN_COMMIT}.zip -> ${MY_P}.zip"
+SRC_URI="https://github.com/gwtplus/google-gin/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
RESTRICT="mirror"
SLOT="2.1"
LICENSE="Apache-2.0"
@@ -32,8 +28,7 @@ RDEPEND="
>=virtual/jre-1.8:*"
DEPEND="
${CDEPEND}
- >=virtual/jdk-1.8:*"
-BDEPEND="app-arch/unzip"
+ virtual/jdk:1.8"
JAVA_ANT_REWRITE_CLASSPATH="yes"
EANT_BUILD_XML="build.xml"
@@ -44,7 +39,7 @@ EANT_GENTOO_CLASSPATH="
validation-api-1.0
"
-S="${WORKDIR}/${MY_PN}-${GIN_COMMIT}"
+S="${WORKDIR}/google-gin-${PV}"
JAVA_RM_FILES=(
trunk/lib/aopalliance.jar
diff --git a/dev-java/glassfish-jms-api/Manifest b/dev-java/glassfish-jms-api/Manifest
deleted file mode 100644
index b9c3281c144..00000000000
--- a/dev-java/glassfish-jms-api/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST glassfish-v2ur2-b04-src.zip 39817113 BLAKE2B 4aeb0df44f838c91fa8dd52e2a4985e86457f75cec3cd5d527de54f672afcd2824cefaad9d9e67c5ce096515e389bb2fc0874d76ce2ec86a956233f2c3508439 SHA512 4ddf75ad1b81cfb8fc0b772fc75f9a81d74b6239282770d5da0ed70a7cd8b5fca2fd8c95782a2946ed054b43ee8e17edaf47d79c749e89280131bf1d15b1dcf8
diff --git a/dev-java/glassfish-jms-api/glassfish-jms-api-1.1.2.2.04-r2.ebuild b/dev-java/glassfish-jms-api/glassfish-jms-api-1.1.2.2.04-r2.ebuild
deleted file mode 100644
index 3b528fd9f0b..00000000000
--- a/dev-java/glassfish-jms-api/glassfish-jms-api-1.1.2.2.04-r2.ebuild
+++ /dev/null
@@ -1,48 +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
-
-DESCRIPTION="Java Transaction API"
-HOMEPAGE="https://glassfish.dev.java.net/"
-MAJOR=v$(ver_cut 3-4)
-MAJOR=${MAJOR/./ur}
-MY_PV=${MAJOR}-b$(ver_cut 5)
-MY_PN=${PN/-//}
-ZIP="glassfish-${MY_PV}-src.zip"
-SRC_URI="https://download.java.net/javaee5/${MAJOR}/promoted/source/${ZIP}"
-
-LICENSE="|| ( CDDL GPL-2 )"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE=""
-
-RDEPEND=">=virtual/jre-1.8:*"
-DEPEND=">=virtual/jdk-1.8:*"
-BDEPEND="app-arch/unzip"
-
-S=${WORKDIR}/${MY_PN}
-
-src_unpack() {
- unzip -q "${DISTDIR}/${ZIP}" "${MY_PN}/*" "glassfish/bootstrap/*" \
- || die "unpacking failed"
-}
-
-EANT_BUILD_TARGET="all"
-EANT_EXTRA_ARGS="-Djavaee.jar=${S}/${PN}.jar"
-EANT_DOC_TARGET=""
-
-src_compile() {
- java-pkg-2_src_compile
- if use doc; then
- javadoc -d javadoc -sourcepath src/java -subpackages javax || die "javadoc failed"
- fi
-}
-src_install() {
- java-pkg_dojar *.jar
- use doc && java-pkg_dojavadoc javadoc
- use source && java-pkg_dosrc src/java/javax
-}
diff --git a/dev-java/glazedlists/Manifest b/dev-java/glazedlists/Manifest
deleted file mode 100644
index a10a922759b..00000000000
--- a/dev-java/glazedlists/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST glazedlists-1.8.0.zip 1169436 BLAKE2B 3784881079165832a321616e51a344a1c9a7378b8f903e883367739b559b5e3b9e7871d3bee4c6979eb7ce5ded9606fb45bf25310b7314f8dbbb500a8bf9ff93 SHA512 3fc3f339a248a8aad897409d752464d60b504474ae1e4d99fa7fbb41d767928137711d5d9979154b53d677e42746e2df2dfefdc71fa4a8017ec70ab23dc4b6a5
diff --git a/dev-java/glazedlists/glazedlists-1.8.0-r2.ebuild b/dev-java/glazedlists/glazedlists-1.8.0-r2.ebuild
deleted file mode 100644
index 57554793d89..00000000000
--- a/dev-java/glazedlists/glazedlists-1.8.0-r2.ebuild
+++ /dev/null
@@ -1,29 +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="A toolkit for list transformations"
-HOMEPAGE="http://www.glazedlists.com/"
-SRC_URI="http://java.net/downloads/${PN}/${P}/${P}-source_java15.zip -> ${P}.zip"
-LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
- >=virtual/jre-1.8:*"
-
-DEPEND="
- >=virtual/jdk-1.8:*"
-
-BDEPEND="
- app-arch/unzip"
-
-JAVA_SRC_DIR="source"
-
-JAVA_ENCODING="ISO-8859-1"
diff --git a/dev-java/glazedlists/metadata.xml b/dev-java/glazedlists/metadata.xml
deleted file mode 100644
index 6021501589e..00000000000
--- a/dev-java/glazedlists/metadata.xml
+++ /dev/null
@@ -1,8 +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>
-</pkgmetadata>
diff --git a/dev-java/gnu-jaf/gnu-jaf-1.1.2-r1.ebuild b/dev-java/gnu-jaf/gnu-jaf-1.1.2-r1.ebuild
index 6c4ef7d1e74..6835f9c1d70 100644
--- a/dev-java/gnu-jaf/gnu-jaf-1.1.2-r1.ebuild
+++ b/dev-java/gnu-jaf/gnu-jaf-1.1.2-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/classpathx/activation-${PV}.tar.gz"
LICENSE="GPL-2-with-linking-exception"
SLOT="1"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ppc64 x86"
DEPEND=">=virtual/jdk-1.8:*"
RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/gnu-jaf/gnu-jaf-1.1.2.ebuild b/dev-java/gnu-jaf/gnu-jaf-1.1.2.ebuild
deleted file mode 100644
index 4af0a6d691b..00000000000
--- a/dev-java/gnu-jaf/gnu-jaf-1.1.2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-JAVA_PKG_IUSE="doc source"
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="GNU implementation of the JavaBeans Activation Framework"
-HOMEPAGE="https://www.gnu.org/software/classpathx/jaf/jaf.html"
-SRC_URI="mirror://gnu/classpathx/activation-${PV}.tar.gz"
-
-LICENSE="GPL-2-with-linking-exception"
-SLOT="1"
-KEYWORDS="amd64 ppc64 x86"
-
-DEPEND=">=virtual/jdk-1.8"
-RDEPEND=">=virtual/jre-1.8"
-
-S="${WORKDIR}/activation-${PV}"
-
-EANT_BUILD_TARGET="activation.jar"
-
-src_install() {
- java-pkg_dojar activation.jar
- einstalldocs
- use doc && java-pkg_dojavadoc docs
- use source && java-pkg_dosrc source/*
-}
diff --git a/dev-java/gradle-bin/Manifest b/dev-java/gradle-bin/Manifest
index 15a85272b56..35f1fc4b3ed 100644
--- a/dev-java/gradle-bin/Manifest
+++ b/dev-java/gradle-bin/Manifest
@@ -3,3 +3,4 @@ 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
diff --git a/dev-java/gradle-bin/gradle-bin-7.5.ebuild b/dev-java/gradle-bin/gradle-bin-7.5.ebuild
new file mode 100644
index 00000000000..8dedd9ecd1e
--- /dev/null
+++ b/dev-java/gradle-bin/gradle-bin-7.5.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/gson/Manifest b/dev-java/gson/Manifest
index 439250dc98e..e539d331b47 100644
--- a/dev-java/gson/Manifest
+++ b/dev-java/gson/Manifest
@@ -1,2 +1 @@
-DIST gson-2.8.8-sources.tar.gz 393941 BLAKE2B ebdd1088a069eea58e5ea4e2eddea0d42064c53f7284778b1b7217c8bc7abeb7e14350e19d838af1d94f78c5c38aca6de0f37674b022f0e528ed65eef803c3f1 SHA512 f90ad679c99c5e9a6ee9e397e59ab1d7d94a9c82366902b808addc40ebbab101fdba7fc83e4666c4f35e52d8b127e6f901e65072a7de210496466074dcd043c5
DIST gson-2.9.0.tar.gz 350309 BLAKE2B f17f7a7410744b14cb79c979b35c7f3c46a3d9e922722c41893b872013319a1bd06d81526e8380055aafa47524bfcc50e02629d1c5994e1f9f81df4391a9c651 SHA512 25e57f0e3cbff7e4d33070d250ba4ecf1c659380bce07863c52a3b30edd0ba88c923e55b0f38098b5ce3827a74a21c4d41f9de02f6a84da771ae39fd823667d3
diff --git a/dev-java/gson/gson-2.8.8-r1.ebuild b/dev-java/gson/gson-2.8.8-r1.ebuild
deleted file mode 100644
index a69ff0ad0aa..00000000000
--- a/dev-java/gson/gson-2.8.8-r1.ebuild
+++ /dev/null
@@ -1,65 +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 gson/pom.xml --download-uri https://github.com/google/gson/archive/gson-parent-2.8.8.tar.gz --slot 2.6 --keywords "~amd64 ~ppc64 ~x86" --ebuild gson-2.8.8.ebuild
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="com.google.code.gson:gson:2.8.8"
-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}-sources.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="2.6"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-# Compile dependencies
-# POM: ${PN}/pom.xml
-# test? com.github.wvengen:proguard-maven-plugin:2.4.0 -> !!!groupId-not-found!!!
-# test? junit:junit:4.13.2 -> >=dev-java/junit-4.13.2:4
-
-DEPEND="
- virtual/jdk:11
-"
-
-RDEPEND="
- >=virtual/jre-1.8:*
-"
-
-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"
-)
-
-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"
-}
-
-src_test() {
- local vm_version="$(java-config -g PROVIDES_VERSION)"
- if [[ "${vm_version}" == "1.8" ]] ; then
- JAVA_TEST_EXCLUDES+=( "com.google.gson.JsonArrayTest" )
- fi
- java-pkg-simple_src_test
-}
diff --git a/dev-java/gson/gson-2.9.0-r1.ebuild b/dev-java/gson/gson-2.9.0-r1.ebuild
index 655185099b3..b6821636dfb 100644
--- a/dev-java/gson/gson-2.9.0-r1.ebuild
+++ b/dev-java/gson/gson-2.9.0-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/google/${PN}/archive/${PN}-parent-${PV}.tar.gz -> ${
LICENSE="Apache-2.0"
SLOT="2.9"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
DEPEND="
virtual/jdk:11
diff --git a/dev-java/gson/gson-2.9.0-r2.ebuild b/dev-java/gson/gson-2.9.0-r2.ebuild
new file mode 100644
index 00000000000..19d4e18df7d
--- /dev/null
+++ b/dev-java/gson/gson-2.9.0-r2.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/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.6"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
+
+DEPEND=">=virtual/jdk-11:*"
+RDEPEND=">=virtual/jre-1.8:*"
+
+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 -e "s/\${project.version}/${PV}/g" \
+ -i src/main/java-templates/com/google/gson/internal/GsonBuildConfig.java \
+ || die "Failed to set version"
+
+ local vm_version="$(java-config -g PROVIDES_VERSION)"
+ if ver_test "${vm_version}" -ge "17" ; then
+ JAVA_TEST_EXCLUDES+=( "com.google.gson.internal.bind.DefaultDateTypeAdapterTest" )
+ fi
+}
diff --git a/dev-java/guava-testlib/guava-testlib-30.1.1.ebuild b/dev-java/guava-testlib/guava-testlib-30.1.1.ebuild
index d0dbe937f7c..24c89a665ec 100644
--- a/dev-java/guava-testlib/guava-testlib-30.1.1.ebuild
+++ b/dev-java/guava-testlib/guava-testlib-30.1.1.ebuild
@@ -18,10 +18,10 @@ SRC_URI="https://github.com/google/guava/archive/v${PV}.tar.gz -> guava-${PV}.ta
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
# error: package com.google.common.truth does not exist
-RESRTICT="test"
+RESTRICT="test"
# Common dependencies
# POM: ${PN}
diff --git a/dev-java/guava/Manifest b/dev-java/guava/Manifest
index 23aa6042585..6cdfcc4ae4a 100644
--- a/dev-java/guava/Manifest
+++ b/dev-java/guava/Manifest
@@ -1,2 +1 @@
-DIST guava-20.0.tar.gz 2522092 BLAKE2B 2ca76a71d0c169b80bfaa3e9847b2e465c57aabc0a67622a69519808fa8455146228747dc20e999ebc20ef7cd5fec1cfa82f6c025e9378011619cfedbc2c7d6c SHA512 e89eee8e66502f208878af286c660393712b12fb37647ec70719ca7c5184686c8dc5fc59d45c1813d792ecad9421e2c077dab075f76b1907c04f9f6e80567ac9
DIST guava-30.1.1.tar.gz 5404546 BLAKE2B 818ef4b17c4f0c8e92c327f046434a3bb428ac35d6e95edd6d6be558c755d138a8ac7f8ad2032073cad131890d8f838e896fff84ba217f8305be8bd65c619a48 SHA512 23b30d886a3200b8f998897ca7bc424b2d223a4fecb03ab644e08a989a85f008e30ef093055e6305c4148a1eb8919c407e35d19f492c5b189830bd115e9484f2
diff --git a/dev-java/guava/guava-20.0-r1.ebuild b/dev-java/guava/guava-20.0-r1.ebuild
deleted file mode 100644
index 91ac8943a4b..00000000000
--- a/dev-java/guava/guava-20.0-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source"
-MAVEN_ID="com.google.guava:guava:20.0"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="A collection of Google's core Java libraries"
-HOMEPAGE="https://github.com/google/guava"
-SRC_URI="https://github.com/google/guava/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="${PV%.*}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-
-CP_DEPEND="
- dev-java/animal-sniffer-annotations:0
- dev-java/error-prone-annotations:0
- dev-java/jsr305:0
-"
-
-RDEPEND="${CP_DEPEND}
- >=virtual/jre-1.8:*"
-
-DEPEND="${CP_DEPEND}
- >=virtual/jdk-1.8:*
- dev-java/j2objc-annotations:0"
-
-S="${WORKDIR}/${P}/${PN}"
-JAVA_SRC_DIR="src"
-
-src_configure() {
- JAVA_GENTOO_CLASSPATH_EXTRA=$(java-pkg_getjars --build-only j2objc-annotations)
-}
diff --git a/dev-java/guava/guava-20.0.ebuild b/dev-java/guava/guava-20.0.ebuild
deleted file mode 100644
index b81b0b0497d..00000000000
--- a/dev-java/guava/guava-20.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-JAVA_PKG_IUSE="doc source"
-MAVEN_ID="com.google.guava:guava:20.0"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="A collection of Google's core Java libraries"
-HOMEPAGE="https://github.com/google/guava"
-SRC_URI="https://github.com/google/guava/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="${PV%.*}"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-CP_DEPEND="
- dev-java/animal-sniffer-annotations:0
- dev-java/error-prone-annotations:0
- dev-java/jsr305:0
-"
-
-RDEPEND="${CP_DEPEND}
- >=virtual/jre-1.7"
-
-DEPEND="${CP_DEPEND}
- >=virtual/jdk-1.7
- dev-java/j2objc-annotations:0"
-
-S="${WORKDIR}/${P}/${PN}"
-JAVA_SRC_DIR="src"
-
-src_configure() {
- JAVA_GENTOO_CLASSPATH_EXTRA=$(java-pkg_getjars --build-only j2objc-annotations)
-}
diff --git a/dev-java/guice/Manifest b/dev-java/guice/Manifest
index 843d1f08107..0f624b6899a 100644
--- a/dev-java/guice/Manifest
+++ b/dev-java/guice/Manifest
@@ -1,2 +1 @@
-DIST guice-4.1.tar.gz 23212767 BLAKE2B bab34da971c1a154eca468bbae4f32db97c0f7ce88bd66cea9c79ef08871db06877ab1ea6495c920977ae139af0bddef2fa4bef8ff5783d2bd53c736bfa07153 SHA512 b42c6475a1d17c111a2ca278ac007bee541806685c0938c66f638808bd81d58aa99ba5aef2e4d8320dd5014df4307c5d2dd192111f4610c73a1eeef328771c00
DIST guice-5.1.0.tar.gz 650452 BLAKE2B 66c56b8605d189a3a6834a1de9ba6b7c6600583dfefa7808ae0b0b71d7f07746811a76326fc3ff56f2fd0d377f7bc3eb04d1c996ab2289eb48dff91d2f12b5f0 SHA512 b9719f07725c3188b8b903c8eee74ef59397f85f7452e38ef8ba2b3b66a56cef427d4dcee4e5d9c4033404a2f5cdadc2d40b6f7076b4c08fe1ec109910206e6a
diff --git a/dev-java/guice/guice-4.1.ebuild b/dev-java/guice/guice-4.1.ebuild
deleted file mode 100644
index a73ec4a039f..00000000000
--- a/dev-java/guice/guice-4.1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-JAVA_PKG_IUSE="source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="A lightweight dependency injection framework for Java 5 and above"
-HOMEPAGE="https://github.com/google/guice/"
-SRC_URI="https://github.com/google/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="4"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-RESTRICT="test"
-
-CP_DEPEND="dev-java/aopalliance:1
- >=dev-java/asm-5:4
- >=dev-java/cglib-3.1:3
- dev-java/guava:20
- dev-java/javax-inject:0"
-
-RDEPEND=">=virtual/jre-1.7
- ${CP_DEPEND}"
-
-DEPEND=">=virtual/jdk-1.7
- ${CP_DEPEND}"
-
-JAVA_PKG_BSFIX_ALL="no"
-JAVA_PKG_BSFIX_NAME="build.xml common.xml"
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-
-src_prepare() {
- default
-
- # Where could we get this FREAKIN jar?
- java-pkg_clean ! -name "bnd-*.jar"
-}
-
-src_compile() {
- EANT_BUILD_TARGET="compile manifest" java-pkg-2_src_compile
- jar cfm ${PN}.jar build/META-INF/MANIFEST.MF -C build/classes . || die
-}
-
-src_install() {
- java-pkg_dojar ${PN}.jar
- dodoc {CONTRIBUTING,README}.md
- use source && java-pkg_dosrc core/src/*
-}
diff --git a/dev-java/guice/guice-5.1.0.ebuild b/dev-java/guice/guice-5.1.0.ebuild
index 59b803decae..e1ee0899825 100644
--- a/dev-java/guice/guice-5.1.0.ebuild
+++ b/dev-java/guice/guice-5.1.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/google/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="4"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
# Most of the test dependencies are missing in Gentoo.
RESTRICT="test"
diff --git a/dev-java/hamcrest/Manifest b/dev-java/hamcrest/Manifest
new file mode 100644
index 00000000000..db8fb161eae
--- /dev/null
+++ b/dev-java/hamcrest/Manifest
@@ -0,0 +1 @@
+DIST hamcrest-2.2.tar.gz 603615 BLAKE2B b367fcb13be3314655e29e9196f3ae202200335801ea5bd8f97b5cd845bf7ecb39c4910b10e49938a373aa7897b62bc0935780490386bde1993add5b943b1eaf SHA512 8120e4f4ad83ff41b8b8ede1fe0817eb8fce6f13072e932aff7fc8c9f64689698753ae47b9f024922d5ab0a5bf7bb88b9e1998064d69a58b8c418ab89200e66a
diff --git a/dev-java/hamcrest/files/hamcrest-2.2-java-11.patch b/dev-java/hamcrest/files/hamcrest-2.2-java-11.patch
new file mode 100644
index 00000000000..83d8ddea910
--- /dev/null
+++ b/dev-java/hamcrest/files/hamcrest-2.2-java-11.patch
@@ -0,0 +1,127 @@
+diff --git a/hamcrest/src/main/java/org/hamcrest/collection/ArrayMatching.java b/hamcrest/src/main/java/org/hamcrest/collection/ArrayMatching.java
+index fc968e0..3bbc36e 100644
+--- a/hamcrest/src/main/java/org/hamcrest/collection/ArrayMatching.java
++++ b/hamcrest/src/main/java/org/hamcrest/collection/ArrayMatching.java
+@@ -67,7 +67,7 @@ public class ArrayMatching {
+ */
+ @SafeVarargs
+ public static <E> Matcher<E[]> arrayContainingInAnyOrder(Matcher<? super E>... itemMatchers) {
+- return arrayContainingInAnyOrder(asList(itemMatchers));
++ return arrayContainingInAnyOrder((List<Matcher<? super E>>) asList(itemMatchers));
+ }
+
+ /**
+diff --git a/hamcrest/src/main/java/org/hamcrest/collection/IsArrayContainingInAnyOrder.java b/hamcrest/src/main/java/org/hamcrest/collection/IsArrayContainingInAnyOrder.java
+index 7e72a62..35ff806 100644
+--- a/hamcrest/src/main/java/org/hamcrest/collection/IsArrayContainingInAnyOrder.java
++++ b/hamcrest/src/main/java/org/hamcrest/collection/IsArrayContainingInAnyOrder.java
+@@ -59,7 +59,7 @@ public class IsArrayContainingInAnyOrder<E> extends TypeSafeMatcher<E[]> {
+ * a list of matchers, each of which must be satisfied by an entry in an examined array
+ */
+ public static <E> Matcher<E[]> arrayContainingInAnyOrder(Matcher<? super E>... itemMatchers) {
+- return arrayContainingInAnyOrder(Arrays.asList(itemMatchers));
++ return arrayContainingInAnyOrder((List<Matcher<? super E>>) Arrays.asList(itemMatchers));
+ }
+
+ /**
+diff --git a/hamcrest/src/main/java/org/hamcrest/collection/IsArrayContainingInOrder.java b/hamcrest/src/main/java/org/hamcrest/collection/IsArrayContainingInOrder.java
+index c046914..312543f 100644
+--- a/hamcrest/src/main/java/org/hamcrest/collection/IsArrayContainingInOrder.java
++++ b/hamcrest/src/main/java/org/hamcrest/collection/IsArrayContainingInOrder.java
+@@ -73,7 +73,7 @@ public class IsArrayContainingInOrder<E> extends TypeSafeMatcher<E[]> {
+ * the matchers that must be satisfied by the items in the examined array
+ */
+ 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/hamcrest/src/main/java/org/hamcrest/collection/IsIterableContainingInAnyOrder.java b/hamcrest/src/main/java/org/hamcrest/collection/IsIterableContainingInAnyOrder.java
+index d6a9a33..6b4e39e 100644
+--- a/hamcrest/src/main/java/org/hamcrest/collection/IsIterableContainingInAnyOrder.java
++++ b/hamcrest/src/main/java/org/hamcrest/collection/IsIterableContainingInAnyOrder.java
+@@ -98,7 +98,7 @@ public class IsIterableContainingInAnyOrder<T> extends TypeSafeDiagnosingMatcher
+ */
+ @SafeVarargs
+ 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));
+ }
+
+ /**
+diff --git a/hamcrest/src/main/java/org/hamcrest/collection/IsIterableContainingInRelativeOrder.java b/hamcrest/src/main/java/org/hamcrest/collection/IsIterableContainingInRelativeOrder.java
+index 0657768..383c552 100644
+--- a/hamcrest/src/main/java/org/hamcrest/collection/IsIterableContainingInRelativeOrder.java
++++ b/hamcrest/src/main/java/org/hamcrest/collection/IsIterableContainingInRelativeOrder.java
+@@ -99,7 +99,7 @@ public class IsIterableContainingInRelativeOrder<E> extends TypeSafeDiagnosingMa
+ */
+ @SafeVarargs
+ public static <E> Matcher<Iterable<? extends E>> containsInRelativeOrder(Matcher<? super E>... itemMatchers) {
+- return containsInRelativeOrder(asList(itemMatchers));
++ return containsInRelativeOrder((List<Matcher<? super E>>) asList(itemMatchers));
+ }
+
+ /**
+diff --git a/hamcrest/src/main/java/org/hamcrest/core/AllOf.java b/hamcrest/src/main/java/org/hamcrest/core/AllOf.java
+index b8c3faa..e7e2550 100644
+--- a/hamcrest/src/main/java/org/hamcrest/core/AllOf.java
++++ b/hamcrest/src/main/java/org/hamcrest/core/AllOf.java
+@@ -4,6 +4,7 @@ import org.hamcrest.Description;
+ import org.hamcrest.DiagnosingMatcher;
+ import org.hamcrest.Matcher;
+
++import java.util.List;
+ import java.util.Arrays;
+
+ /**
+@@ -56,6 +57,6 @@ public class AllOf<T> extends DiagnosingMatcher<T> {
+ */
+ @SafeVarargs
+ 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/src/main/java/org/hamcrest/core/AnyOf.java b/hamcrest/src/main/java/org/hamcrest/core/AnyOf.java
+index 7a22c22..ba52275 100644
+--- a/hamcrest/src/main/java/org/hamcrest/core/AnyOf.java
++++ b/hamcrest/src/main/java/org/hamcrest/core/AnyOf.java
+@@ -3,6 +3,7 @@ package org.hamcrest.core;
+ import org.hamcrest.Description;
+ import org.hamcrest.Matcher;
+
++import java.util.List;
+ import java.util.Arrays;
+
+ /**
+@@ -46,6 +47,6 @@ public class AnyOf<T> extends ShortcutCombination<T> {
+ */
+ @SafeVarargs
+ 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/hamcrest/src/main/java/org/hamcrest/core/CombinableMatcher.java b/hamcrest/src/main/java/org/hamcrest/core/CombinableMatcher.java
+index e37efce..3ca6f96 100644
+--- a/hamcrest/src/main/java/org/hamcrest/core/CombinableMatcher.java
++++ b/hamcrest/src/main/java/org/hamcrest/core/CombinableMatcher.java
+@@ -57,7 +57,7 @@ public class CombinableMatcher<T> extends TypeSafeDiagnosingMatcher<T> {
+ this.first = matcher;
+ }
+ public CombinableMatcher<X> and(Matcher<? super X> other) {
+- return new CombinableMatcher<>(first).and(other);
++ return new CombinableMatcher<X>(first).and(other);
+ }
+ }
+
+@@ -76,7 +76,7 @@ public class CombinableMatcher<T> extends TypeSafeDiagnosingMatcher<T> {
+ this.first = matcher;
+ }
+ public CombinableMatcher<X> or(Matcher<? super X> other) {
+- return new CombinableMatcher<>(first).or(other);
++ return new CombinableMatcher<X>(first).or(other);
+ }
+ }
+ }
diff --git a/dev-java/hamcrest/hamcrest-2.2.ebuild b/dev-java/hamcrest/hamcrest-2.2.ebuild
new file mode 100644
index 00000000000..08c754f7eea
--- /dev/null
+++ b/dev-java/hamcrest/hamcrest-2.2.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom hamcrest-2.2.pom --download-uri https://github.com/hamcrest/JavaHamcrest/archive/v2.2.tar.gz --slot 0 --keywords "~amd64" --ebuild hamcrest-2.2.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.hamcrest:hamcrest:2.2"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Core API and libraries of hamcrest matcher framework."
+HOMEPAGE="http://hamcrest.org/JavaHamcrest/"
+SRC_URI="https://github.com/${PN}/JavaHamcrest/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~arm arm64 ppc64"
+
+DEPEND="
+ >=virtual/jdk-1.8:*
+"
+
+RDEPEND="
+ >=virtual/jre-1.8:*
+"
+
+PATCHES=( "${FILESDIR}"/hamcrest-2.2-java-11.patch )
+
+DOCS=( {CHANGES,README}.md )
+
+S="${WORKDIR}/JavaHamcrest-${PV}"
+
+JAVA_SRC_DIR="hamcrest/src/main/java"
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_SRC_DIR="hamcrest/src/test/java"
+
+src_prepare() {
+ default
+ java-pkg-2_src_prepare
+}
+
+src_install() {
+ default # https://bugs.gentoo.org/789582
+ java-pkg-simple_src_install
+}
diff --git a/dev-java/spin/metadata.xml b/dev-java/hamcrest/metadata.xml
index 9f47c959bca..27becd4fbc1 100644
--- a/dev-java/spin/metadata.xml
+++ b/dev-java/hamcrest/metadata.xml
@@ -3,9 +3,8 @@
<pkgmetadata>
<maintainer type="project">
<email>java@gentoo.org</email>
- <name>Java</name>
</maintainer>
<upstream>
- <remote-id type="sourceforge">spin</remote-id>
+ <remote-id type="github">hamcrest/JavaHamcrest</remote-id>
</upstream>
</pkgmetadata>
diff --git a/dev-java/hawtjni-runtime/Manifest b/dev-java/hawtjni-runtime/Manifest
index fb744589928..473ef1cdabf 100644
--- a/dev-java/hawtjni-runtime/Manifest
+++ b/dev-java/hawtjni-runtime/Manifest
@@ -1 +1,2 @@
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.18.ebuild b/dev-java/hawtjni-runtime/hawtjni-runtime-1.18.ebuild
new file mode 100644
index 00000000000..13748884cb6
--- /dev/null
+++ b/dev-java/hawtjni-runtime/hawtjni-runtime-1.18.ebuild
@@ -0,0 +1,27 @@
+# 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=""
+
+inherit java-pkg-2 java-pkg-simple
+
+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/hawtjni-project-${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:*"
+
+DOCS=( {changelog,notice,readme}.md )
+
+S="${WORKDIR}/hawtjni-hawtjni-project-${PV}"
+
+JAVA_AUTOMATIC_MODULE_NAME="org.fusesource.hawtjni.runtime"
+JAVA_SRC_DIR="${PN}/src/main/java"
diff --git a/dev-java/htmlcleaner/Manifest b/dev-java/htmlcleaner/Manifest
index bf12edd4b46..4352620f3de 100644
--- a/dev-java/htmlcleaner/Manifest
+++ b/dev-java/htmlcleaner/Manifest
@@ -1 +1,2 @@
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.26.ebuild b/dev-java/htmlcleaner/htmlcleaner-2.26.ebuild
new file mode 100644
index 00000000000..2bb65af8d06
--- /dev/null
+++ b/dev-java/htmlcleaner/htmlcleaner-2.26.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="net.sourceforge.htmlcleaner:htmlcleaner:2.26"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+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/project/htmlcleaner/htmlcleaner/htmlcleaner%20v${PV}/htmlcleaner-${PV}-src.zip"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+CP_DEPEND="dev-java/jdom:2"
+
+RDEPEND="
+ ${CP_DEPEND}
+ >=virtual/jre-1.8:*
+"
+
+DEPEND="
+ ${CP_DEPEND}
+ dev-java/ant-core:0
+ >=virtual/jdk-1.8:*
+ test? ( dev-java/junit:4 )
+"
+
+BDEPEND="app-arch/unzip"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-2.24-fix-tests.patch"
+)
+
+JAVA_CLASSPATH_EXTRA="ant-core"
+JAVA_SRC_DIR="src/main/java"
+JAVA_MAIN_CLASS="org.htmlcleaner.CommandLine"
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+
+src_prepare() {
+ default # https://bugs.gentoo.org/780585
+}
+
+src_install() {
+ java-pkg-simple_src_install
+ java-pkg_register-ant-task
+
+ insinto "${JAVA_PKG_SHAREPATH}"
+ newins example.xml default.xml
+}
diff --git a/dev-java/icedtea-web/Manifest b/dev-java/icedtea-web/Manifest
index 164fce0b02d..54b18ca69ba 100644
--- a/dev-java/icedtea-web/Manifest
+++ b/dev-java/icedtea-web/Manifest
@@ -1,3 +1,2 @@
DIST dunce-0.1.1.crate 4311 BLAKE2B 07b775c2e79d6414af5854282fdfbba26ac4675207f840cf627a33c7bdbca163283466011c641d62646fa77f8623f1f7143b5e3d87c34e0b9840e4807eea2df8 SHA512 3fa16c1d6d78374e6360b9e2349516859b617ac5532ade34359d952002a1fb6d5e70f27ce2c9b3d6e230c753218fcf6e9b3973161bf1f8dd9c08152fbda2f5ad
-DIST icedtea-web-1.8.4.tar.gz 2358591 BLAKE2B a62a88cfce49f473a0ab768ca386c4733d69fd3b603b29a8d5e7478b33030e2d016a0577bfc0fa4657bb0b3f99a2524d1b46cad7a8e4f97c1404eff5ca218613 SHA512 d155ec6ed9a007b2c59fd09fed9f4005a79640016ae62287eab7076c05b5ddd56d07b0ff86babf732f1bb82653fc0f7cf434550eabdaac8d666e64feabe4f890
DIST icedtea-web-1.8.8.tar.gz 2365638 BLAKE2B 39a19bd46a235d016f9192da7f15ffa17546dfbe8502df4991f6d45c6211723504c0d2dc0bc7aaa508e4b47295f244c65b6e7113666028824562b8d2b0ccf5b2 SHA512 99f246ce603e3edd4357a2c4d280f1ef92e1f760ca5d843eaccf7ca60950a47defec64eed87dac26c5c2e9776bed2f3e53f2c8793dabd47e1b5fc82823190dcc
diff --git a/dev-java/icedtea-web/icedtea-web-1.8.4-r1.ebuild b/dev-java/icedtea-web/icedtea-web-1.8.4-r1.ebuild
deleted file mode 100644
index caabab18f66..00000000000
--- a/dev-java/icedtea-web/icedtea-web-1.8.4-r1.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-README_GENTOO_SUFFIX="-r2"
-CRATES="dunce-0.1.1"
-
-inherit autotools bash-completion-r1 cargo readme.gentoo-r1 xdg-utils
-
-DESCRIPTION="FOSS Java browser plugin and Web Start implementation"
-HOMEPAGE="https://github.com/AdoptOpenJDK/IcedTea-Web"
-SRC_URI="https://github.com/AdoptOpenJDK/${PN}/archive/${P}.tar.gz
- $(cargo_crate_uris ${CRATES})"
-LICENSE="GPL-2 GPL-2-with-linking-exception LGPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
-IUSE="doc"
-
-# tests require ton of java deps we don't have packaged/working
-# but rust tests pass.
-RESTRICT="test"
-
-BDEPEND="
- app-arch/zip
- sys-devel/bc
- virtual/jdk:1.8
- virtual/pkgconfig
- virtual/rust
- doc? ( sys-devel/bc )
-"
-
-RDEPEND="
- >=app-eselect/eselect-java-0.2.0
- >=virtual/jre-1.8
-"
-
-S="${WORKDIR}/IcedTea-Web-${P}"
-
-QA_FLAGS_IGNORED="usr/bin/.*"
-
-src_prepare() {
- eapply_user
- sed -i 's/JAVADOC_OPTS=/\0-Xdoclint:none /g' Makefile.am || die
- eautoreconf
- cargo_gen_config
-}
-
-src_configure() {
- xdg_environment_reset
- # some functionality (tagsoup rhino) is disabled, because dev-java is
- # unmaintained and a lot of things simply does not build anymore.
- # native plugins also disabled, modern browsers no longer support it.
- local myconf=(
- --disable-native-plugin
- --program-transform-name='s/^javaws$/itweb-javaws/'
- --with-java="${EPREFIX}/usr/bin/java"
- --with-jdk-home="${EPREFIX}/etc/java-config-2/current-system-vm"
- --with-itw-libs=DISTRIBUTION
- --without-rhino
- --without-tagsoup
- $(use_enable doc docs)
- )
- unset _JAVA_OPTIONS
- export bashcompdir="$(get_bashcompdir)" # defaults to /etc if not found in pkg-config
- export CARGO_HOME="${ECARGO_HOME}"
- CONFIG_SHELL="${EPREFIX}/bin/bash" econf "${myconf[@]}"
-}
-
-src_compile() {
- # races in makefile
- emake -j1 #nowarn
-}
-
-src_install() {
- default
- rm -v "${ED}/usr/bin/itw-modularjdk.args" || die
- rename -v '.bash' '' "${ED}/usr/share/bash-completion/completions/"*.bash || die
- rename -v 'javaws' 'itweb-javaws' "${ED}/usr/share/man/man1/"javaws.1* || die
- mv -v "${ED}/usr/share/bash-completion/completions/"{javaws,itweb-javaws} || die
- sed -i 's/javaws/itweb-javaws/g' \
- "${ED}/usr/share/bash-completion/completions/itweb-javaws" || die
-
- readme.gentoo_create_doc
-}
-
-src_test() {
- # we want to override cargo.eclass' src_test
- :
-}
-
-pkg_postinst() {
- readme.gentoo_print_elog
-}
diff --git a/dev-java/icedtea-web/icedtea-web-1.8.8-r1.ebuild b/dev-java/icedtea-web/icedtea-web-1.8.8-r1.ebuild
index 238bb908026..186bb18591b 100644
--- a/dev-java/icedtea-web/icedtea-web-1.8.8-r1.ebuild
+++ b/dev-java/icedtea-web/icedtea-web-1.8.8-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/AdoptOpenJDK/${PN}/archive/${P}.tar.gz
$(cargo_crate_uris ${CRATES})"
LICENSE="GPL-2 GPL-2-with-linking-exception LGPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ppc64 x86"
IUSE="doc"
# tests require ton of java deps we don't have packaged/working
diff --git a/dev-java/icedtea-web/icedtea-web-1.8.8.ebuild b/dev-java/icedtea-web/icedtea-web-1.8.8.ebuild
deleted file mode 100644
index 563512e65b9..00000000000
--- a/dev-java/icedtea-web/icedtea-web-1.8.8.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-README_GENTOO_SUFFIX="-r2"
-CRATES="dunce-0.1.1"
-
-inherit autotools bash-completion-r1 cargo readme.gentoo-r1 xdg-utils
-
-DESCRIPTION="FOSS Java browser plugin and Web Start implementation"
-HOMEPAGE="https://github.com/AdoptOpenJDK/IcedTea-Web"
-SRC_URI="https://github.com/AdoptOpenJDK/${PN}/archive/${P}.tar.gz
- $(cargo_crate_uris ${CRATES})"
-LICENSE="GPL-2 GPL-2-with-linking-exception LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="doc"
-
-# tests require ton of java deps we don't have packaged/working
-# but rust tests pass.
-RESTRICT="test"
-
-BDEPEND="
- app-arch/zip
- sys-devel/bc
- virtual/jdk:1.8
- virtual/pkgconfig
- virtual/rust
- doc? ( sys-devel/bc )
-"
-
-RDEPEND="
- >=app-eselect/eselect-java-0.2.0
- >=virtual/jre-1.8
-"
-
-S="${WORKDIR}/IcedTea-Web-${P}"
-
-QA_FLAGS_IGNORED="usr/bin/.*"
-
-src_prepare() {
- eapply_user
- sed -i 's/JAVADOC_OPTS=/\0-Xdoclint:none /g' Makefile.am || die
- eautoreconf
- cargo_gen_config
-}
-
-src_configure() {
- xdg_environment_reset
- # some functionality (tagsoup rhino) is disabled, because dev-java is
- # unmaintained and a lot of things simply does not build anymore.
- # native plugins also disabled, modern browsers no longer support it.
- local myconf=(
- --disable-native-plugin
- --program-transform-name='s/^javaws$/itweb-javaws/'
- --with-java="${EPREFIX}/usr/bin/java"
- --with-jdk-home="${EPREFIX}/etc/java-config-2/current-system-vm"
- --with-itw-libs=DISTRIBUTION
- --without-rhino
- --without-tagsoup
- $(use_enable doc docs)
- )
- unset _JAVA_OPTIONS
- export bashcompdir="$(get_bashcompdir)" # defaults to /etc if not found in pkg-config
- export CARGO_HOME="${ECARGO_HOME}"
- CONFIG_SHELL="${EPREFIX}/bin/bash" econf "${myconf[@]}"
-}
-
-src_compile() {
- # races in makefile
- emake -j1 #nowarn
-}
-
-src_install() {
- default
- rm -v "${ED}/usr/bin/itw-modularjdk.args" || die
- rename -v '.bash' '' "${ED}/usr/share/bash-completion/completions/"*.bash || die
- rename -v 'javaws' 'itweb-javaws' "${ED}/usr/share/man/man1/"javaws.1* || die
- mv -v "${ED}/usr/share/bash-completion/completions/"{javaws,itweb-javaws} || die
- sed -i 's/javaws/itweb-javaws/g' \
- "${ED}/usr/share/bash-completion/completions/itweb-javaws" || die
-
- readme.gentoo_create_doc
-}
-
-src_test() {
- # we want to override cargo.eclass' src_test
- :
-}
-
-pkg_postinst() {
- readme.gentoo_print_elog
-}
diff --git a/dev-java/istack-commons-runtime/Manifest b/dev-java/istack-commons-runtime/Manifest
new file mode 100644
index 00000000000..17d337e462c
--- /dev/null
+++ b/dev-java/istack-commons-runtime/Manifest
@@ -0,0 +1 @@
+DIST jaxb-istack-commons-istack-commons-runtime-4.1.1.tar.gz 66161 BLAKE2B 07103ec616d23e14a5f61c4bb7ef9dce042f0df678db44f035b48c74eb7930f251d8b7fd8ce36c9bae7a7ef8ce213c62587dad2547518ba4638faf102ef651cd SHA512 b119b2c3582f5cbbd5793e0eb0a00c199c93119f3c18e34c57f8753b3a7008b9b93de58fd62df94d6cbedd698488616a80c334fda3d5038078e3858229f995cf
diff --git a/dev-java/istack-commons-runtime/istack-commons-runtime-4.1.1-r1.ebuild b/dev-java/istack-commons-runtime/istack-commons-runtime-4.1.1-r1.ebuild
new file mode 100644
index 00000000000..0d9371ac7ce
--- /dev/null
+++ b/dev-java/istack-commons-runtime/istack-commons-runtime-4.1.1-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom runtime/pom.xml --download-uri https://github.com/eclipse-ee4j/jaxb-istack-commons/archive/4.1.1.tar.gz --slot 0 --keywords "~amd64 ~ppc64 ~x86" --ebuild jaxb-istack-commons-runtime-4.1.1.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="com.sun.istack:istack-commons-runtime:4.1.1"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="istack common utility code"
+HOMEPAGE="https://projects.eclipse.org/projects/ee4j/istack-commons/"
+SRC_URI="https://github.com/eclipse-ee4j/jaxb-istack-commons/archive/${PV}.tar.gz -> jaxb-istack-commons-${P}.tar.gz"
+
+LICENSE="EPL-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+# Compile dependencies
+# POM: runtime/pom.xml
+# jakarta.activation:jakarta.activation-api:2.1.0 -> >=dev-java/jakarta-activation-api-2.1.0:2
+# POM: runtime/pom.xml
+# test? junit:junit:4.13.2 -> >=dev-java/junit-4.13.2:4
+
+# fails if jdk-1.8:* # https://bugs.gentoo.org/857024
+DEPEND="
+ >=virtual/jdk-11:*
+ dev-java/jakarta-activation-api:2
+"
+
+RDEPEND="
+ >=virtual/jre-1.8:*
+"
+
+DOCS=( ../{CONTRIBUTING,NOTICE,README}.md )
+
+S="${WORKDIR}/jaxb-istack-commons-${PV}/istack-commons"
+
+JAVA_CLASSPATH_EXTRA="jakarta-activation-api-2"
+JAVA_SRC_DIR="runtime/src/main/java"
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_SRC_DIR="runtime/src/test/java"
+
+src_install() {
+ default # https://bugs.gentoo.org/789582
+ java-pkg-simple_src_install
+}
diff --git a/dev-java/jempbox/metadata.xml b/dev-java/istack-commons-runtime/metadata.xml
index 006ce0bbb20..75321cfb559 100644
--- a/dev-java/jempbox/metadata.xml
+++ b/dev-java/istack-commons-runtime/metadata.xml
@@ -3,9 +3,5 @@
<pkgmetadata>
<maintainer type="project">
<email>java@gentoo.org</email>
- <name>Java</name>
</maintainer>
- <upstream>
- <remote-id type="github">apache/pdfbox</remote-id>
- </upstream>
</pkgmetadata>
diff --git a/dev-java/j2objc-annotations/Manifest b/dev-java/j2objc-annotations/Manifest
index 38b4ed181bb..ab5ae1e084c 100644
--- a/dev-java/j2objc-annotations/Manifest
+++ b/dev-java/j2objc-annotations/Manifest
@@ -1 +1,2 @@
-DIST j2objc-1.2.tar.gz 9718769 BLAKE2B 370a52fe9821814c12dd7a13072930f178e041d14baa2e912de3379030828ae62114b213f38f849934e68060fa51d8017a28772a794658aa23272ac5d254d933 SHA512 d2b4d12ba8107728ca33cfe18124eae092a2c2b9ce0b588374180d35816d83d6d6c9d029c3524537ac48f052dfa4c88b273405cddf56c54966216b1ed1a160eb
+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-2.8.ebuild b/dev-java/j2objc-annotations/j2objc-annotations-2.8.ebuild
new file mode 100644
index 00000000000..6d1ab4cdf1d
--- /dev/null
+++ b/dev-java/j2objc-annotations/j2objc-annotations-2.8.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"
+# Yes. version is "2.2" regardless ${PV} being "2.8".
+# See https://github.com/google/j2objc/blob/2.8/annotations/pom.xml#L32-L35
+MAVEN_ID="com.google.j2objc:j2objc-annotations:2.2"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Annotations for the J2ObjC Java to Objective-C translator"
+HOMEPAGE="https://developers.google.com/j2objc/"
+SRC_URI="https://github.com/google/j2objc/archive/${PV}.tar.gz -> j2objc-${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:*"
+
+DOCS=( ../{CONTRIBUTING,README}.md )
+
+S="${WORKDIR}/j2objc-${PV}/annotations"
+
+JAVA_SRC_DIR="src/main/java"
+
+src_prepare() {
+ default
+ rm Makefile || die
+}
diff --git a/dev-java/jackcess/jackcess-4.0.0.ebuild b/dev-java/jackcess/jackcess-4.0.0.ebuild
index 2d583cbc5fe..73b567ddfba 100644
--- a/dev-java/jackcess/jackcess-4.0.0.ebuild
+++ b/dev-java/jackcess/jackcess-4.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:
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/jahlborn/${PN}/archive/refs/tags/${P}.tar.gz -> ${P}
LICENSE="Apache-2.0"
SLOT="1"
-KEYWORDS="amd64 arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
# Common dependencies
# POM: pom.xml
diff --git a/dev-java/jackson-annotations/Manifest b/dev-java/jackson-annotations/Manifest
index aa2571e548e..63bfb41a297 100644
--- a/dev-java/jackson-annotations/Manifest
+++ b/dev-java/jackson-annotations/Manifest
@@ -1 +1 @@
-DIST jackson-annotations-2.13.2.tar.gz 1983139 BLAKE2B 511f62548ad3daa4aad265502e5c5e63cf3d60186b96f96ab2ebb3a904a8cca9e5eadfa31ac2fee1a8ce62c7ba51b4a722e9e46c9bbc390291048b0a852b8f30 SHA512 b024b5bff985a6104a122c58735249f3c3fa8e9ddb678283d876ff3750b72872bac13258456cca18828cda65e03eee85a9ef816f924fdbbec211fd03c7652439
+DIST jackson-annotations-2.13.3.tar.gz 1984205 BLAKE2B c577fcdcb40c44cf1cb08ebe467318ca4e4fff9fdeaf756360ef202275a48b5f5a93135439567261651b5731f523588f0c29a17c05ba6d03fec0f19ed19d9c5b SHA512 c00aec542c8ddea999fb60536cb2cab3edbf4f1d20b29e404d62add54a22546ca195ab7faeda4a2cd1d3a827f10420ccafe1dfb0065742f46aecfc2d00f2c1fc
diff --git a/dev-java/jackson-annotations/jackson-annotations-2.13.2-r1.ebuild b/dev-java/jackson-annotations/jackson-annotations-2.13.2-r1.ebuild
deleted file mode 100644
index ebc4e66b08e..00000000000
--- a/dev-java/jackson-annotations/jackson-annotations-2.13.2-r1.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/FasterXML/jackson-annotations/archive/jackson-annotations-2.13.2.tar.gz --slot 2 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild jackson-annotations-2.13.2.ebuild
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="com.fasterxml.jackson.core:jackson-annotations:2.13.2"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Core annotations used for value types, used by Jackson data binding package."
-HOMEPAGE="https://github.com/FasterXML/jackson-annotations"
-SRC_URI="https://github.com/FasterXML/${PN}/archive/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-
-DEPEND=">=virtual/jdk-11:*"
-RDEPEND=">=virtual/jre-1.8:*"
-
-DOCS=( README.md release-notes/VERSION-2.x )
-
-S="${WORKDIR}/${PN}-${P}"
-
-JAVA_SRC_DIR=( "src/main/java" "src/moditect" )
-
-JAVA_TEST_GENTOO_CLASSPATH="junit-4"
-JAVA_TEST_SRC_DIR="src/test/java"
-JAVA_TEST_EXCLUDES=(
- # 1) warning(junit.framework.TestSuite$1)
- # 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-annotations/jackson-annotations-2.13.2.ebuild b/dev-java/jackson-annotations/jackson-annotations-2.13.3.ebuild
index c2835290b46..13397eeb87c 100644
--- a/dev-java/jackson-annotations/jackson-annotations-2.13.2.ebuild
+++ b/dev-java/jackson-annotations/jackson-annotations-2.13.3.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.2.tar.gz --slot 2 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild jackson-annotations-2.13.2.ebuild
+# 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
EAPI=8
JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="com.fasterxml.jackson.core:jackson-annotations:2.13.2"
+MAVEN_ID="com.fasterxml.jackson.core:jackson-annotations:2.13.3"
JAVA_TESTING_FRAMEWORKS="junit-4"
inherit java-pkg-2 java-pkg-simple
@@ -20,7 +20,7 @@ LICENSE="Apache-2.0"
SLOT="2"
KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-DEPEND=">=virtual/jdk-1.8:*"
+DEPEND=">=virtual/jdk-11:*"
RDEPEND=">=virtual/jre-1.8:*"
DOCS=( README.md release-notes/VERSION-2.x )
diff --git a/dev-java/jackson-core/Manifest b/dev-java/jackson-core/Manifest
index ae2de93da1c..49e736e09bf 100644
--- a/dev-java/jackson-core/Manifest
+++ b/dev-java/jackson-core/Manifest
@@ -1 +1 @@
-DIST jackson-core-2.13.2.tar.gz 12267420 BLAKE2B 4acaef320fbd08bd3d3ae835eb4a96771b1f25aade7433e4c87beac0f6e365e641eea8c70ed7d3884159bd6990286b80891b57ac967ee292ee639cb2b56b66e1 SHA512 8e424ea255a6cd78c550300b0ff18d5e63945a3608dab2803211da2df5eb99fbd249779b2d051569b421c393e073d88a21b01c02a25b9647bcc8545f2d8cc1ee
+DIST jackson-core-2.13.3.tar.gz 12268319 BLAKE2B 8053988b060cd625670c643d9ba12d9ceae72dffa583bfc78e87044ac723c78bc44dfbdbaca0331098116a43b273dac844721a9e44ba1a536cc457f841d89b56 SHA512 9e7a9ec54073fa6faac36914c496df38bb6c201a37ade2b32306561b71e1b78a0ec4f48b006d4fb10cbde21979a16d117706b59338ada7aedcb593ba5c31ea52
diff --git a/dev-java/jackson-core/jackson-core-2.13.2-r1.ebuild b/dev-java/jackson-core/jackson-core-2.13.2-r1.ebuild
deleted file mode 100644
index 9892ac01a0e..00000000000
--- a/dev-java/jackson-core/jackson-core-2.13.2-r1.ebuild
+++ /dev/null
@@ -1,69 +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-core/archive/jackson-core-2.13.2.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild jackson-core-2.13.2.ebuild
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="com.fasterxml.jackson.core:jackson-core:2.13.2"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Core Jackson processing abstractions (Streaming API), implementation for JSON"
-HOMEPAGE="https://github.com/FasterXML/jackson-core"
-SRC_URI="https://github.com/FasterXML/${PN}/archive/${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=( README.md release-notes/{CREDITS-2.x,VERSION-2.x} )
-
-S="${WORKDIR}/${PN}-${P}"
-
-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"
-
-src_prepare() {
- default
-
- sed -e 's:@package@:com.fasterxml.jackson.core.json:g' \
- -e "s:@projectversion@:${PV}:g" \
- -e 's:@projectgroupid@:com.fasterxml.jackson.core:g' \
- -e 's:@projectartifactid@:jackson-core:g' \
- "${JAVA_SRC_DIR}/com/fasterxml/jackson/core/json/PackageVersion.java.in" \
- > "${JAVA_SRC_DIR}/com/fasterxml/jackson/core/json/PackageVersion.java" || die
-
- java-pkg-2_src_prepare
-}
-
-src_test() {
- pushd src/test/java || die
- local JAVA_TEST_RUN_ONLY=$(find * -name "*Test*.java" \
- ! -wholename "**/failing**/*.java" \
- ! -wholename "**/testsupport**/*.java" \
- ! -wholename "perf**/*.java" \
- ! -name "*TestBase.java" \
- ! -name "*BaseTest.java" \
- )
- popd
-
- JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}"
- 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-core/jackson-core-2.13.2.ebuild b/dev-java/jackson-core/jackson-core-2.13.3.ebuild
index e156fbe67bd..e25ceed85a1 100644
--- a/dev-java/jackson-core/jackson-core-2.13.2.ebuild
+++ b/dev-java/jackson-core/jackson-core-2.13.3.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.2.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild jackson-core-2.13.2.ebuild
+# 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
EAPI=8
JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="com.fasterxml.jackson.core:jackson-core:2.13.2"
+MAVEN_ID="com.fasterxml.jackson.core:jackson-core:2.13.3"
JAVA_TESTING_FRAMEWORKS="junit-4"
inherit java-pkg-2 java-pkg-simple
@@ -20,7 +20,7 @@ LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-DEPEND=">=virtual/jdk-1.8:*"
+DEPEND=">=virtual/jdk-11:*"
RDEPEND=">=virtual/jre-1.8:*"
DOCS=( README.md release-notes/{CREDITS-2.x,VERSION-2.x} )
diff --git a/dev-java/jackson-databind/Manifest b/dev-java/jackson-databind/Manifest
index cc40466a166..c7c82d3053a 100644
--- a/dev-java/jackson-databind/Manifest
+++ b/dev-java/jackson-databind/Manifest
@@ -1,2 +1 @@
-DIST jackson-databind-2.13.2.2.tar.gz 48061394 BLAKE2B c67b0a23c5fcff881d91ddec14877a5ec16c13eebfc76b34c1666bc9ebc73f573d279d1951ff2be96c612fa87281e08332047bb6c75df73184249b7ebb552d16 SHA512 0c3550aa3ada1c5fcd2f19076670c7ddffde59542b10fa270d1c7bd54d7866f0f10c256738ed76815af55c8531f7553f8b977c461fe710f759811b0ffa660245
-DIST jackson-databind-2.13.2.tar.gz 48047657 BLAKE2B 9efb9004d983613b4b0f9a3242d7c0a8610eaac868beff1b5343c268b9381a86c22176d2bbe847fba121f9f928f87838fc7e05bd34955ea3f811ed02a8547e5f SHA512 d15167e1a5a19a9aea369123faca3e7dd5b27a9a3cfa2f76c871967ec7b4331f1d5a266cf6084e94dafe00971abcbf17d01c6e3b91cae0b4a298769dac05f486
+DIST jackson-databind-2.13.3.tar.gz 48056095 BLAKE2B 04751cd99eae3bbf3c3a30993506f05b47a85782f52e2cf51f50de9bcb5e9c3718d6ba6105667226272d644dcac6aeeb3ce06dc7ae737adf0392a7a7eafef2aa SHA512 785db6cab20ee74ff90815b8a1afedcbf10f13f60c336a61c20513757cbcde80c073d5f4dc60d390a72600a2b5719cca22b4c71220707dd4edd67dd87f6a7ac9
diff --git a/dev-java/jackson-databind/jackson-databind-2.13.2.2.ebuild b/dev-java/jackson-databind/jackson-databind-2.13.2.2.ebuild
deleted file mode 100644
index 6cf6a5d4464..00000000000
--- a/dev-java/jackson-databind/jackson-databind-2.13.2.2.ebuild
+++ /dev/null
@@ -1,83 +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-databind/archive/jackson-databind-2.13.2.2.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild jackson-databind-2.13.2.2.ebuild
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="com.fasterxml.jackson.core:jackson-databind:2.13.2.2"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="General data-binding functionality for Jackson: works on core streaming API"
-HOMEPAGE="https://github.com/FasterXML/jackson-databind"
-SRC_URI="https://github.com/FasterXML/${PN}/archive/${P}.tar.gz"
-
-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.2 -> >=dev-java/jackson-annotations-2.13.2:2
-# com.fasterxml.jackson.core:jackson-core:2.13.2 -> >=dev-java/jackson-core-2.13.2:0
-
-CP_DEPEND="
- ~dev-java/jackson-annotations-2.13.2:2
- ~dev-java/jackson-core-2.13.2:0
-"
-
-# Compile dependencies
-# POM: pom.xml
-# test? javax.measure:jsr-275:0.9.1 -> !!!groupId-not-found!!!
-# test? junit:junit:4.13.1 -> >=dev-java/junit-4.13.2:4
-# test? org.powermock:powermock-api-mockito2:2.0.0 -> !!!groupId-not-found!!!
-# test? org.powermock:powermock-core:2.0.0 -> !!!groupId-not-found!!!
-# test? org.powermock:powermock-module-junit4:2.0.0 -> !!!groupId-not-found!!!
-
-DEPEND="
- >=virtual/jdk-11:*
- ${CP_DEPEND}"
-# test? (
-# !!!groupId-not-found!!!
-# )
-#"
-
-RDEPEND="
- >=virtual/jre-1.8:*
- ${CP_DEPEND}"
-
-DOCS=( {README,SECURITY}.md release-notes/{CREDITS,VERSION}-2.x )
-
-S="${WORKDIR}/${PN}-${P}"
-
-JAVA_SRC_DIR=( "src/main/java" "src/moditect" )
-JAVA_RESOURCE_DIRS="src/main/resources"
-
-# JAVA_TEST_GENTOO_CLASSPATH="!!!groupId-not-found!!!,junit-4,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!"
-# JAVA_TEST_SRC_DIR="src/test/java"
-# JAVA_TEST_RESOURCE_DIRS=(
-# "src/test/resources"
-# )
-
-src_prepare() {
- java-pkg-2_src_prepare
-
- sed -e 's:@package@:com.fasterxml.jackson.databind.cfg:g' \
- -e "s:@projectversion@:${PV}:g" \
- -e 's:@projectgroupid@:com.fasterxml.jackson.core:g' \
- -e "s:@projectartifactid@:${PN}:g" \
- "${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-databind/jackson-databind-2.13.2.ebuild b/dev-java/jackson-databind/jackson-databind-2.13.3.ebuild
index 9500e341664..f6673fd7ebe 100644
--- a/dev-java/jackson-databind/jackson-databind-2.13.2.ebuild
+++ b/dev-java/jackson-databind/jackson-databind-2.13.3.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-databind/archive/jackson-databind-2.13.2.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild jackson-databind-2.13.2.ebuild
+# 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
EAPI=8
JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="com.fasterxml.jackson.core:jackson-databind:2.13.2"
+MAVEN_ID="com.fasterxml.jackson.core:jackson-databind:2.13.3"
JAVA_TESTING_FRAMEWORKS="junit-4"
inherit java-pkg-2 java-pkg-simple
@@ -25,12 +25,12 @@ RESTRICT="test"
# Common dependencies
# POM: pom.xml
-# com.fasterxml.jackson.core:jackson-annotations:2.13.2 -> >=dev-java/jackson-annotations-2.13.2:2
-# com.fasterxml.jackson.core:jackson-core:2.13.2 -> >=dev-java/jackson-core-2.13.2:0
+# 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
CP_DEPEND="
- ~dev-java/jackson-annotations-2.13.2:2
- ~dev-java/jackson-core-2.13.2:0
+ ~dev-java/jackson-annotations-${PV}:2
+ ~dev-java/jackson-core-${PV}:0
"
# Compile dependencies
@@ -42,7 +42,7 @@ CP_DEPEND="
# test? org.powermock:powermock-module-junit4:2.0.0 -> !!!groupId-not-found!!!
DEPEND="
- >=virtual/jdk-1.8:*
+ >=virtual/jdk-11:*
${CP_DEPEND}"
# test? (
# !!!groupId-not-found!!!
diff --git a/dev-java/jackson-dataformat-xml/Manifest b/dev-java/jackson-dataformat-xml/Manifest
index aa0a164cc1c..c3e4606939c 100644
--- a/dev-java/jackson-dataformat-xml/Manifest
+++ b/dev-java/jackson-dataformat-xml/Manifest
@@ -1 +1 @@
-DIST jackson-dataformat-xml-2.13.2.tar.gz 3201222 BLAKE2B c4db7ae5f3f3fc41bb3890337cc2cf6f1fe4dd65e96bff336d0c21e19758ca797497affbd189b731518a164fa8ad7f40c07e1c64ab3250ac438f1d4bf122a6ce SHA512 048550c465a83e0e5b72313d601eace9d817572a7d331d37ac48af51d5e0ef8d52cccadb1412c27d4ebd28b222b7707a0bfba114e10168d233e4c4e9f8d2fd1f
+DIST jackson-dataformat-xml-2.13.3.tar.gz 3201473 BLAKE2B 90f6b98325e3ae43e7ba560b077ee8fc8e5ad5004fd23b7c10a2c2a3ec7a674b700b80766690d2442820f87698fa5e33c440c2aa12cd521b7566e78eca50bbaa SHA512 52e26e1a398d90f75ef61d074ed1d149b9f13555f1878703b3148ed008f29f8802586a6020f3c1427a748a73b9a4ca56d86ffd769cf6cb7317a69e039345eefa
diff --git a/dev-java/jackson-dataformat-xml/jackson-dataformat-xml-2.13.2-r1.ebuild b/dev-java/jackson-dataformat-xml/jackson-dataformat-xml-2.13.2-r1.ebuild
deleted file mode 100644
index da444ab5520..00000000000
--- a/dev-java/jackson-dataformat-xml/jackson-dataformat-xml-2.13.2-r1.ebuild
+++ /dev/null
@@ -1,110 +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-dataformat-xml/archive/jackson-dataformat-xml-2.13.2.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild jackson-dataformat-xml-2.13.2.ebuild
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.13.2"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Data format extension for Jackson"
-HOMEPAGE="https://github.com/FasterXML/jackson-dataformat-xml"
-SRC_URI="https://github.com/FasterXML/${PN}/archive/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-
-# Common dependencies
-# POM: pom.xml
-# com.fasterxml.jackson.core:jackson-annotations:2.13.2 -> >=dev-java/jackson-annotations-2.13.2:2
-# com.fasterxml.jackson.core:jackson-core:2.13.2 -> >=dev-java/jackson-core-2.13.2:0
-# com.fasterxml.jackson.core:jackson-databind:2.13.2 -> >=dev-java/jackson-databind-2.13.2:0
-# com.fasterxml.woodstox:woodstox-core:6.2.7 -> >=dev-java/woodstox-core-6.2.7: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}.2: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.2 -> >=dev-java/jackson-module-jakarta-xmlbind-2.13.2: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
-
-DEPEND="
- >=virtual/jdk-11:*
- ${CP_DEPEND}
- test? (
- ~dev-java/jackson-module-jakarta-xmlbind-${PV}:0
- dev-java/jaxb-api:3
- dev-java/sjsxp:0
- )
-"
-
-RDEPEND="
- >=virtual/jre-1.8:*
- ${CP_DEPEND}"
-
-DOCS=( README.md release-notes/{CREDITS,VERSION}-2.x )
-
-S="${WORKDIR}/${PN}-${P}"
-
-JAVA_SRC_DIR=( "src/main/java" "src/moditect" )
-JAVA_RESOURCE_DIRS="src/main/resources"
-
-JAVA_TEST_GENTOO_CLASSPATH="jackson-module-jakarta-xmlbind,sjsxp,jaxb-api-3,junit-4"
-JAVA_TEST_SRC_DIR="src/test/java"
-JAVA_TEST_RESOURCE_DIRS="src/test/resources"
-
-src_prepare() {
- java-pkg-2_src_prepare
-
- sed -e 's:@package@:com.fasterxml.jackson.dataformat.xml: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/xml/PackageVersion.java.in" \
- > "${JAVA_SRC_DIR}/com/fasterxml/jackson/dataformat/xml/PackageVersion.java" || die
-}
-
-src_test() {
- pushd src/test/java || die
- local JAVA_TEST_RUN_ONLY=$(find * -name "*Test*.java" \
- ! -wholename "**/failing**/*.java" \
- ! -name "*TestBase.java" )
- popd
-
- JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}"
- JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}"
-
- # The same failure under openjdk-17 occurs upstream (running 'mvn test')
-
- # 1) testCollection(com.fasterxml.jackson.dataformat.xml.lists.ListAsObjectTest)
- # com.fasterxml.jackson.databind.exc.InvalidDefinitionException: Failed to call `setAccess()` on Field 'first' due to
- # `java.lang.reflect.InaccessibleObjectException`, problem: Unable to make field transient java.util.LinkedList$Node
- # java.util.LinkedList.first accessible: module java.base does not "opens java.util" to unnamed module @42bb2aee
-
- 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.util=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/jackson-dataformat-xml/jackson-dataformat-xml-2.13.2.ebuild b/dev-java/jackson-dataformat-xml/jackson-dataformat-xml-2.13.3-r1.ebuild
index c5854f85e43..af94b82ff4a 100644
--- a/dev-java/jackson-dataformat-xml/jackson-dataformat-xml-2.13.2.ebuild
+++ b/dev-java/jackson-dataformat-xml/jackson-dataformat-xml-2.13.3-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.2.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild jackson-dataformat-xml-2.13.2.ebuild
+# 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
EAPI=8
JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.13.2"
+MAVEN_ID="com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.13.3"
JAVA_TESTING_FRAMEWORKS="junit-4"
inherit java-pkg-2 java-pkg-simple
@@ -22,33 +22,33 @@ KEYWORDS="amd64 ~arm arm64 ppc64 x86"
# Common dependencies
# POM: pom.xml
-# com.fasterxml.jackson.core:jackson-annotations:2.13.2 -> >=dev-java/jackson-annotations-2.13.2:2
-# com.fasterxml.jackson.core:jackson-core:2.13.2 -> >=dev-java/jackson-core-2.13.2:0
-# com.fasterxml.jackson.core:jackson-databind:2.13.2 -> >=dev-java/jackson-databind-2.13.2:0
-# com.fasterxml.woodstox:woodstox-core:6.2.7 -> >=dev-java/woodstox-core-6.2.7:0
+# 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
# 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/stax2-api: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.2 -> >=dev-java/jackson-module-jakarta-xmlbind-2.13.2:0
+# 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.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
DEPEND="
- >=virtual/jdk-1.8:*
+ >=virtual/jdk-11:*
${CP_DEPEND}
test? (
~dev-java/jackson-module-jakarta-xmlbind-${PV}:0
- dev-java/jaxb-api:3
+ dev-java/jaxb-api:4
dev-java/sjsxp:0
)
"
@@ -64,7 +64,7 @@ S="${WORKDIR}/${PN}-${P}"
JAVA_SRC_DIR=( "src/main/java" "src/moditect" )
JAVA_RESOURCE_DIRS="src/main/resources"
-JAVA_TEST_GENTOO_CLASSPATH="jackson-module-jakarta-xmlbind,sjsxp,jaxb-api-3,junit-4"
+JAVA_TEST_GENTOO_CLASSPATH="jackson-module-jakarta-xmlbind,sjsxp,jaxb-api-4,junit-4"
JAVA_TEST_SRC_DIR="src/test/java"
JAVA_TEST_RESOURCE_DIRS="src/test/resources"
diff --git a/dev-java/jackson-dataformat-yaml/Manifest b/dev-java/jackson-dataformat-yaml/Manifest
index d9b6c1b68b2..30c81f39372 100644
--- a/dev-java/jackson-dataformat-yaml/Manifest
+++ b/dev-java/jackson-dataformat-yaml/Manifest
@@ -1 +1 @@
-DIST jackson-dataformats-text-2.13.2.tar.gz 3528945 BLAKE2B 5dc38706b714121478e82b2f4bc0b3831fa84708b708c08c20d4744c4fc7130149d8dace5c20437514ce9431b1c39183f4d283717f4ad5876fac3651c53ea096 SHA512 1101aabc4b3b652ff90c23186fada6391db9cb4cb5ec6ba9ff78cd91b73ef3b632f38027e192d739d8e47f7ed2726ac03d8c3a1d20d416dfaac3b50ca11abb67
+DIST jackson-dataformats-text-2.13.3.tar.gz 3528981 BLAKE2B 98593f45e663905c15ab5cb37152c95d69a0121515990fac0c66f640d93af83cd51802e2856a4e8df6b82c0121ac4fcd20774fd6a3841e019e1da56c599ed9a9 SHA512 77fad3e6ab5ad55d3a46ffaee3482e9f0dbfa36ce67d5ad31e0b7cde667536387f1dce5bc8296733a28efb09f423785aca7291d9ba85a67ca2b94ef4c8766d7f
diff --git a/dev-java/jackson-dataformat-yaml/jackson-dataformat-yaml-2.13.2-r1.ebuild b/dev-java/jackson-dataformat-yaml/jackson-dataformat-yaml-2.13.3-r1.ebuild
index 139c808cdee..530150c4744 100644
--- a/dev-java/jackson-dataformat-yaml/jackson-dataformat-yaml-2.13.2-r1.ebuild
+++ b/dev-java/jackson-dataformat-yaml/jackson-dataformat-yaml-2.13.3-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.2.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild jackson-dataformat-yaml-2.13.2.ebuild
+# 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.2"
+MAVEN_ID="com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.13.3"
JAVA_TESTING_FRAMEWORKS="junit-4"
inherit java-pkg-2 java-pkg-simple
@@ -20,31 +20,20 @@ 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.2 -> >=dev-java/jackson-core-2.13.2:0
-# com.fasterxml.jackson.core:jackson-databind:2.13.2 -> >=dev-java/jackson-databind-2.13.2: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}.2:0
- dev-java/snakeyaml:0
-"
-
DEPEND="
+ ~dev-java/jackson-core-${PV}:0
+ ~dev-java/jackson-databind-${PV}:0
+ >=dev-java/snakeyaml-1.30-r1:0
>=virtual/jdk-11:*
- ${CP_DEPEND}
"
-RDEPEND="
- >=virtual/jre-1.8:*
- ${CP_DEPEND}"
+RDEPEND=">=virtual/jre-1.8:*"
DOCS=( README.md release-notes/{CREDITS,VERSION} )
S="${WORKDIR}/jackson-dataformats-text-jackson-dataformats-text-${PV}/yaml"
+JAVA_CLASSPATH_EXTRA="jackson-core,jackson-databind,snakeyaml"
JAVA_SRC_DIR=( "src/main/java" "src/moditect" )
JAVA_RESOURCE_DIRS="src/main/resources"
@@ -68,12 +57,4 @@ src_prepare() {
-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.2.ebuild b/dev-java/jackson-dataformat-yaml/jackson-dataformat-yaml-2.13.3.ebuild
index a324875e0e9..8dd76fc9cac 100644
--- a/dev-java/jackson-dataformat-yaml/jackson-dataformat-yaml-2.13.2.ebuild
+++ b/dev-java/jackson-dataformat-yaml/jackson-dataformat-yaml-2.13.3.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.2.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild jackson-dataformat-yaml-2.13.2.ebuild
+# 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.2"
+MAVEN_ID="com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.13.3"
JAVA_TESTING_FRAMEWORKS="junit-4"
inherit java-pkg-2 java-pkg-simple
@@ -22,8 +22,8 @@ KEYWORDS="amd64 ~arm arm64 ppc64 x86"
# Common dependencies
# POM: pom.xml
-# com.fasterxml.jackson.core:jackson-core:2.13.2 -> >=dev-java/jackson-core-2.13.2:0
-# com.fasterxml.jackson.core:jackson-databind:2.13.2 -> >=dev-java/jackson-databind-2.13.2: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
# org.yaml:snakeyaml:1.30 -> >=dev-java/snakeyaml-1.30:0
CP_DEPEND="
@@ -33,7 +33,7 @@ CP_DEPEND="
"
DEPEND="
- >=virtual/jdk-1.8:*
+ >=virtual/jdk-11:*
${CP_DEPEND}
"
diff --git a/dev-java/jackson-dataformat-yaml/metadata.xml b/dev-java/jackson-dataformat-yaml/metadata.xml
index ff11baa0e7b..bc9ae704cd0 100644
--- a/dev-java/jackson-dataformat-yaml/metadata.xml
+++ b/dev-java/jackson-dataformat-yaml/metadata.xml
@@ -5,6 +5,7 @@
<email>java@gentoo.org</email>
</maintainer>
<upstream>
- <remote-id type="github">https://github.com/FasterXML/jackson-dataformats-text/issues</remote-id>
+ <remote-id type="github">FasterXML/jackson-dataformats-text</remote-id>
+ <bugs-to>https://github.com/FasterXML/jackson-dataformats-text/issues</bugs-to>
</upstream>
</pkgmetadata>
diff --git a/dev-java/jackson-module-jakarta-xmlbind/Manifest b/dev-java/jackson-module-jakarta-xmlbind/Manifest
index 0af50bd9fe4..709b5d5c0d0 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.2.tar.gz 2146359 BLAKE2B 242d148b1945745f2578a751cf7aec7764000e3400fbc63d9c4b5b9ee029c77868b97590c922c3900e8b3800271176099d4928f3d63936c6b9e5e2326321616b SHA512 ea8d6a230f736cc0429e8d9a8883609074dc7e723bb01bdecbb49a665fc8f879b3f2da906c1d9816d6675a38479943a8b5e6fa1b67d495bbf882262808bce10b
+DIST jackson-module-jakarta-xmlbind-2.13.3.tar.gz 2145569 BLAKE2B 13864e4272d40e8425232482a67a2bc720ff294e93ec623589bd0b7286e2c63c2b724bc1033eb19437cdea23db0b11142380715fc300c32e8af9dba22eeed407 SHA512 2807a9e1d3531f3553a2ab6bb64e0ece2809ca9d2facae320dbd38efe0797cdc7ab11e9b284122d75a98a50eda9bc0cfb0f098ca0921e3bf67a0e38b5252a14d
diff --git a/dev-java/jackson-module-jakarta-xmlbind/jackson-module-jakarta-xmlbind-2.13.2-r1.ebuild b/dev-java/jackson-module-jakarta-xmlbind/jackson-module-jakarta-xmlbind-2.13.3-r1.ebuild
index bc1ab00b11a..394536c8925 100644
--- a/dev-java/jackson-module-jakarta-xmlbind/jackson-module-jakarta-xmlbind-2.13.2-r1.ebuild
+++ b/dev-java/jackson-module-jakarta-xmlbind/jackson-module-jakarta-xmlbind-2.13.3-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.2.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild jackson-module-jakarta-xmlbind-2.13.2.ebuild
+# 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.2"
+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
@@ -20,23 +20,20 @@ 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.2 -> >=dev-java/jackson-annotations-2.13.2:2
-# com.fasterxml.jackson.core:jackson-core:2.13.2 -> >=dev-java/jackson-core-2.13.2:0
-# com.fasterxml.jackson.core:jackson-databind:2.13.2 -> >=dev-java/jackson-databind-2.13.2:0
+# 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}.2:0
- dev-java/jakarta-activation-api:1
- dev-java/jaxb-api:3
+ ~dev-java/jackson-databind-${PV}:0
+ dev-java/jakarta-activation:1
+ dev-java/jaxb-api:4
"
# Compile dependencies
@@ -46,25 +43,29 @@ CP_DEPEND="
DEPEND="
>=virtual/jdk-11:*
- ${CP_DEPEND}"
-# test? (
-# !!!groupId-not-found!!!
-# )
-#"
+ ${CP_DEPEND}
+ test? (
+ dev-java/jaxb-runtime:4
+ )
+"
RDEPEND="
>=virtual/jre-1.8:*
${CP_DEPEND}"
-DOCS=( ../README.md )
-
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"
+JAVA_TEST_GENTOO_CLASSPATH="jaxb-runtime-4,junit-4"
+JAVA_TEST_SRC_DIR="src/test/java"
+
+JAVA_TEST_EXCLUDES=(
+ # Upstream does not run these
+ com.fasterxml.jackson.module.jakarta.xmlbind.failing.TestUnwrapping
+ com.fasterxml.jackson.module.jakarta.xmlbind.failing.TestXmlID3
+)
src_prepare() {
java-pkg-2_src_prepare
diff --git a/dev-java/jackson-module-jakarta-xmlbind/jackson-module-jakarta-xmlbind-2.13.2.ebuild b/dev-java/jackson-module-jakarta-xmlbind/jackson-module-jakarta-xmlbind-2.13.3.ebuild
index 18d572895a8..b8c68c4ceba 100644
--- a/dev-java/jackson-module-jakarta-xmlbind/jackson-module-jakarta-xmlbind-2.13.2.ebuild
+++ b/dev-java/jackson-module-jakarta-xmlbind/jackson-module-jakarta-xmlbind-2.13.3.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.2.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild jackson-module-jakarta-xmlbind-2.13.2.ebuild
+# 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.2"
+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
@@ -25,9 +25,9 @@ RESTRICT="test"
# Common dependencies
# POM: pom.xml
-# com.fasterxml.jackson.core:jackson-annotations:2.13.2 -> >=dev-java/jackson-annotations-2.13.2:2
-# com.fasterxml.jackson.core:jackson-core:2.13.2 -> >=dev-java/jackson-core-2.13.2:0
-# com.fasterxml.jackson.core:jackson-databind:2.13.2 -> >=dev-java/jackson-databind-2.13.2:0
+# 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
@@ -35,7 +35,7 @@ CP_DEPEND="
~dev-java/jackson-annotations-${PV}:2
~dev-java/jackson-core-${PV}:0
~dev-java/jackson-databind-${PV}:0
- dev-java/jakarta-activation-api:1
+ dev-java/jakarta-activation:1
dev-java/jaxb-api:3
"
@@ -45,7 +45,7 @@ CP_DEPEND="
# test? org.glassfish.jaxb:jaxb-runtime:3.0.1 -> !!!groupId-not-found!!!
DEPEND="
- >=virtual/jdk-1.8:*
+ >=virtual/jdk-11:*
${CP_DEPEND}"
# test? (
# !!!groupId-not-found!!!
@@ -56,8 +56,6 @@ RDEPEND="
>=virtual/jre-1.8:*
${CP_DEPEND}"
-DOCS=( ../README.md )
-
S="${WORKDIR}/jackson-modules-base-jackson-modules-base-${PV}/jakarta-xmlbind/"
JAVA_SRC_DIR=( "src/main/java" "src/moditect" )
diff --git a/dev-java/jai-imageio-core/jai-imageio-core-1.4.0.ebuild b/dev-java/jai-imageio-core/jai-imageio-core-1.4.0.ebuild
index 0799775bdcb..cf43149a135 100644
--- a/dev-java/jai-imageio-core/jai-imageio-core-1.4.0.ebuild
+++ b/dev-java/jai-imageio-core/jai-imageio-core-1.4.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:
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/jai-imageio/${PN}/archive/refs/tags/${P}.tar.gz"
LICENSE="Sun-BSD-no-nuclear-2005"
SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64 x86"
DEPEND=">=virtual/jdk-1.8:*"
RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/jai-imageio-jpeg2000/jai-imageio-jpeg2000-1.4.0.ebuild b/dev-java/jai-imageio-jpeg2000/jai-imageio-jpeg2000-1.4.0.ebuild
index b5ed9e69920..d6111d3e33c 100644
--- a/dev-java/jai-imageio-jpeg2000/jai-imageio-jpeg2000-1.4.0.ebuild
+++ b/dev-java/jai-imageio-jpeg2000/jai-imageio-jpeg2000-1.4.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:
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/jai-imageio/${PN}/archive/refs/tags/${P}.tar.gz"
LICENSE="Sun-BSD-no-nuclear-2005"
SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64 x86"
# Common dependencies
# POM: ${PN}-${P}/pom.xml
diff --git a/dev-java/jakarta-annotations-api/Manifest b/dev-java/jakarta-annotations-api/Manifest
new file mode 100644
index 00000000000..b27c2a5598e
--- /dev/null
+++ b/dev-java/jakarta-annotations-api/Manifest
@@ -0,0 +1 @@
+DIST jakarta-annotations-api-2.1.1.tar.gz 83788 BLAKE2B be9904337199bd8cf9e5748d53b4536b3562446d499992b97c7e413e2e2d9ae0c8ba50d601950a0feec8bce4c4c35093b7b8f87ad60ea407452f502996045e54 SHA512 8a61cb8a9da55efd7c5172aa9a134eae7d94489a66ef749c619a7fc596122fd50f3dda7a954d78f664132c72ce999d2d3ad01b70e1d2cb2072c881327de11d82
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
new file mode 100644
index 00000000000..afe6dfd9962
--- /dev/null
+++ b/dev-java/jakarta-annotations-api/jakarta-annotations-api-2.1.1.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="jakarta.annotation:jakarta.annotation-api:2.1.1"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Jakarta Annotations API"
+HOMEPAGE="https://projects.eclipse.org/projects/ee4j.ca"
+SRC_URI="https://github.com/eclipse-ee4j/${PN/jakarta/common}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="EPL-2.0 GPL-2-with-classpath-exception"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+DEPEND="
+ >=virtual/jdk-11:*
+"
+
+RDEPEND="
+ >=virtual/jre-1.8:*
+"
+
+DOCS=( {CONTRIBUTING,NOTICE,README}.md )
+
+S="${WORKDIR}/${P/jakarta/common}"
+
+JAVA_SRC_DIR="api/src/main/java"
diff --git a/dev-java/jgraph/metadata.xml b/dev-java/jakarta-annotations-api/metadata.xml
index 061fc28567e..9c98d5e873b 100644
--- a/dev-java/jgraph/metadata.xml
+++ b/dev-java/jakarta-annotations-api/metadata.xml
@@ -3,9 +3,8 @@
<pkgmetadata>
<maintainer type="project">
<email>java@gentoo.org</email>
- <name>Java</name>
</maintainer>
<upstream>
- <remote-id type="sourceforge">jgraph</remote-id>
+ <remote-id type="github">eclipse-ee4j/common-annotations-api</remote-id>
</upstream>
</pkgmetadata>
diff --git a/dev-java/jakarta-mail-api/Manifest b/dev-java/jakarta-mail-api/Manifest
new file mode 100644
index 00000000000..799d229338c
--- /dev/null
+++ b/dev-java/jakarta-mail-api/Manifest
@@ -0,0 +1 @@
+DIST jakarta-mail-api-2.1.0.tar.gz 1072862 BLAKE2B dcfe0cbbd777dfe2bb703ddc67803402a6a617f6956822e574b7f9b01f2541d0e06eacb3cd192b08205a6ff8151c7a93ad0db758a7df0eec0085e3964a3f88b8 SHA512 38d3e0476073b4faa732e6840d251f9ec90c42a7558b1ac628e83dfdad65f74c8cb3f87b6e1964f15354b5bcfee7fce2d0bdee20fa49073985db0e4401bc7627
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
new file mode 100644
index 00000000000..749424a2617
--- /dev/null
+++ b/dev-java/jakarta-mail-api/jakarta-mail-api-2.1.0-r1.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 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-r1.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"
+
+DEPEND="
+ dev-java/jakarta-activation-api:2
+ >=virtual/jdk-11:*
+ test? (
+ >=dev-java/angus-activation-1.0.0-r1:0
+ )"
+
+RDEPEND=">=virtual/jre-1.8:*"
+
+DOCS=( ../{CONTRIBUTING,NOTICE,README}.md )
+
+S="${WORKDIR}/mail-${PV}/api"
+
+JAVA_CLASSPATH_EXTRA="jakarta-activation-api-2"
+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
+}
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
new file mode 100644
index 00000000000..42176c20e11
--- /dev/null
+++ b/dev-java/jakarta-mail-api/jakarta-mail-api-2.1.0.ebuild
@@ -0,0 +1,81 @@
+# 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/commons-jxpath/metadata.xml b/dev-java/jakarta-mail-api/metadata.xml
index f918f701946..bb9bcf723eb 100644
--- a/dev-java/commons-jxpath/metadata.xml
+++ b/dev-java/jakarta-mail-api/metadata.xml
@@ -3,9 +3,11 @@
<pkgmetadata>
<maintainer type="project">
<email>java@gentoo.org</email>
- <name>Java</name>
</maintainer>
<longdescription>
- A Java-based implementation of XPath 1.0 that, in addition to XML processing, can inspect/modify Java object graphs (the library's explicit purpose) and even mixed Java/XML structures.
+ Jakarta Mail defines a platform-independent and protocol-independent framework to build mail and messaging applications.
</longdescription>
+ <upstream>
+ <remote-id type="github">eclipse-ee4j/mail</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-java/jakartaee-migration/Manifest b/dev-java/jakartaee-migration/Manifest
index 9645e64bbca..f02fd4759bc 100644
--- a/dev-java/jakartaee-migration/Manifest
+++ b/dev-java/jakartaee-migration/Manifest
@@ -1 +1,2 @@
DIST jakartaee-migration-1.0.0-sources.tar.gz 35116 BLAKE2B 98b587e5a51e8f3540d6f4570c60ffa5516801709e41260ac09f7fcabc9e96a3b9067e8eba6c5975c62e3c56585a1f334a21acc15627666e1616ced6f625c56f SHA512 f0c0dc5da4d3c5d4bae8fd4c3db349cb45b7c8d82ca0bb12f3c995e92d4b0893db111ab33ce812299d66904827adc91b22c49381625760fc05c1b10de76faa0c
+DIST jakartaee-migration-1.0.1-sources.tar.gz 35763 BLAKE2B 9e739668a7ebd65396960cd2447ecf2bc114cb85a2c554a17cb8478bef13f70f2fed26cc96553a22e7279dde698e1c094ca4dc7a8695ff9f82903ebe8badbd69 SHA512 6caaadfe5dcb21a859f2e401c039832b2774d8876ac724c3159b28c80a1153f7cd1c6706ba29a38d5f748cd2e55a85bd9bfecfb3a405f86aa85637ff3ca3c5f7
diff --git a/dev-java/jakartaee-migration/jakartaee-migration-1.0.1.ebuild b/dev-java/jakartaee-migration/jakartaee-migration-1.0.1.ebuild
new file mode 100644
index 00000000000..112b3607702
--- /dev/null
+++ b/dev-java/jakartaee-migration/jakartaee-migration-1.0.1.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.1/source/jakartaee-migration-1.0.1-src.tar.gz --slot 0 --keywords "~amd64" --ebuild jakartaee-migration-1.0.1.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.apache.tomcat:jakartaee-migration:1.0.0"
+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.8.0 -> >=dev-java/commons-io-2.8.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
+
+CDEPEND="
+ dev-java/ant-core:0
+ dev-java/bcel:0
+ >=dev-java/commons-compress-1.20:0
+ dev-java/commons-io:1
+"
+
+# Compile dependencies
+# POM: pom.xml
+# org.apache.ant:ant:1.10.9 -> !!!groupId-not-found!!!
+# POM: pom.xml
+# test? junit:junit:4.13.1 -> >=dev-java/junit-4.13.1: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/Manifest b/dev-java/janino/Manifest
index b25cc96111e..fb07b1534b7 100644
--- a/dev-java/janino/Manifest
+++ b/dev-java/janino/Manifest
@@ -1 +1 @@
-DIST janino-3.1.6.tar.gz 1730264 BLAKE2B a4e15b7b9a9d17b8762f5964171a01da3ce6f1045b8830c9a6e9a0d35c5096376fd667103360791f6848c762177f48f858e4e6233205fb6ff8258e6582211b89 SHA512 6e729733f74e0cc24db56c4030de8751c131c94b3abf0519288cc7539b5dda45de8c33e8dd37d8e70565ad0c3a3122cac7c73d77bc5f92a16db0b0f7ea7436d3
+DIST janino-3.1.7.tar.gz 1747439 BLAKE2B 6e42a9d5cc079c2cf17b76c1d76420ff3fa0027b54736f23e0aa2c5062f4dad19c1ac7efa678fa06cee369a01125a64a4ee32e4120e60ecd8a56d47aa4f69503 SHA512 541925fc10f5fbefde45e60cec1925e3d6f5b7244a6b9de251b5483224bee05c16182e2bf137a00349cbdb6c209ce18b2203ca066e5a7a1f146efa255f5f7799
diff --git a/dev-java/janino/janino-3.1.6.ebuild b/dev-java/janino/janino-3.1.7.ebuild
index 11ef65f524c..46f3e8c96ec 100644
--- a/dev-java/janino/janino-3.1.6.ebuild
+++ b/dev-java/janino/janino-3.1.7.ebuild
@@ -2,32 +2,36 @@
# Distributed under the terms of the GNU General Public License v2
# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom janino/pom.xml --download-uri https://codeload.github.com/janino-compiler/janino/tar.gz/v3.1.6 --slot 0 --keywords "~amd64" --ebuild JANjanino-3.1.6.ebuild
+# java-ebuilder --generate-ebuild --workdir . --pom janino/pom.xml --download-uri https://github.com/janino-compiler/janino/archive/refs/tags/v3.1.7.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild janino-3.1.7.ebuild
EAPI=8
JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.codehaus.janino:janino:3.1.6"
+MAVEN_ID="org.codehaus.janino:janino:3.1.7"
JAVA_TESTING_FRAMEWORKS="junit-4"
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://codeload.github.com/janino-compiler/janino/tar.gz/v${PV} -> ${P}.tar.gz"
+SRC_URI="https://github.com/janino-compiler/janino/archive/v3.1.7.tar.gz -> ${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
KEYWORDS="amd64 ~arm arm64 ppc64 x86"
# Common dependencies
-# POM: janino/pom.xml
-# org.codehaus.janino:commons-compiler:3.1.6 -> !!!groupId-not-found!!!
+# POM: ${PN}/pom.xml
+# org.codehaus.janino:commons-compiler:3.1.7 -> !!!artifactId-not-found!!!
+
+CDEPEND="
+ !!!artifactId-not-found!!!
+"
# Compile dependencies
-# POM: janino/pom.xml
-# org.apache.ant:ant:1.10.9 -> !!!groupId-not-found!!!
-# POM: janino/pom.xml
+# POM: ${PN}/pom.xml
+# org.apache.ant:ant:1.10.11 -> !!!suitable-mavenVersion-not-found!!!
+# POM: ${PN}/pom.xml
# test? junit:junit:4.13.1 -> >=dev-java/junit-4.13.2:4
DEPEND="
diff --git a/dev-java/java-diff-utils/java-diff-utils-1.3.0.ebuild b/dev-java/java-diff-utils/java-diff-utils-1.3.0.ebuild
index 944684c4b19..aa0b2dd5d3d 100644
--- a/dev-java/java-diff-utils/java-diff-utils-1.3.0.ebuild
+++ b/dev-java/java-diff-utils/java-diff-utils-1.3.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://repo1.maven.org/maven2/com/googlecode/${PN}/diffutils/${PV}/dif
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64 x86"
DEPEND=">=virtual/jdk-1.8:*"
RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/java-service-wrapper/Manifest b/dev-java/java-service-wrapper/Manifest
index 4d19c3dcace..684084d87d0 100644
--- a/dev-java/java-service-wrapper/Manifest
+++ b/dev-java/java-service-wrapper/Manifest
@@ -1 +1,2 @@
DIST wrapper_3.5.25_src.tar.gz 556678 BLAKE2B bead95eb2feebe0c22f8c66ca948185c320a979e498fb5156de576d443ba6e3375efb6244a66db6af101fa7dc459d983b51631fc237ad4578505be47059cf2c7 SHA512 4ce8ab5dc7acc4d78e7b902a61bb1e3785b5455f81438aa61a877107647e88ade595075ff0b8d5db0ff2b33bb94d70c2b1331561d6d282e497998eea9494c6f4
+DIST wrapper_3.5.50_src.tar.gz 779253 BLAKE2B 64863e408c2147014946f869bbd98775d1d23d4cd63ef562167f40191febf87cc72697a55fe2ec6a5d085f3df4897cc4485f4ed88a3ee3a7f7930215448972f7 SHA512 403deec1bcc70a93ce0b0749bf2d5bc27a4a540d07785bc3ac83b38257cc5e8247a784f646770c96ac318f22d30c463dafb2f002720041b93443b292d6669c09
diff --git a/dev-java/java-service-wrapper/java-service-wrapper-3.5.50.ebuild b/dev-java/java-service-wrapper/java-service-wrapper-3.5.50.ebuild
new file mode 100644
index 00000000000..149e25fdc51
--- /dev/null
+++ b/dev-java/java-service-wrapper/java-service-wrapper-3.5.50.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+inherit java-pkg-2 java-pkg-simple toolchain-funcs java-ant-2
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+DESCRIPTION="A wrapper that makes it possible to install a Java Application as daemon"
+HOMEPAGE="https://wrapper.tanukisoftware.com"
+SRC_URI="https://download.tanukisoftware.com/wrapper/${PV}/wrapper_${PV}_src.tar.gz"
+
+LICENSE="tanuki-community"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 ~x86"
+RESTRICT="!test? ( test )"
+
+RDEPEND=">=virtual/jre-1.8:*"
+DEPEND="
+ >=virtual/jdk-1.8:*
+ test? (
+ dev-java/junit:4
+ dev-util/cunit
+ )
+"
+BDEPEND="virtual/jdk"
+
+S="${WORKDIR}/wrapper_${PV}_src"
+
+JAVA_SRC_DIR="src/java/"
+JAVA_JAR_FILENAME="wrapper.jar"
+JAVA_TEST_SRC_DIR="src/test"
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+
+src_prepare() {
+ default
+
+ # replaces as-needed.patch
+ sed -i \
+ -e 's/gcc -O3/$(CC)/g' \
+ -e 's/ -pthread/ $(CFLAGS) $(LDFLAGS) -pthread/g' \
+ -e 's/ -shared/ $(LDFLAGS) -shared/g' \
+ -e 's/$(TEST)\/testsuite/testsuite/g' \
+ src/c/Makefile-*.make || die
+
+ cp "${S}/src/c/Makefile-linux-armel-32.make" "${S}/src/c/Makefile-linux-arm-32.make"
+ java-pkg-2_src_prepare
+
+ # enable tests on all platforms
+ if use test; then
+ grep "testsuite_SOURCE" "src/c/Makefile-linux-x86-64.make" | tee -a src/c/Makefile-*.make
+ assert
+ echo 'all: testsuite' | tee -a src/c/Makefile-*.make
+ assert
+ fi
+}
+
+src_compile() {
+ tc-export CC
+
+ pushd "${T}" || die
+ echo 'public class GetArchDataModel{public static void main(String[] args){System.out.println(System.getProperty("sun.arch.data.model"));}}' \
+ > GetArchDataModel.java || die
+ ejavac GetArchDataModel.java
+ local BITS
+ BITS="$(java GetArchDataModel)" || die "Failed to identify sun.arch.data.model property"
+ popd || die
+ eant -Dbits="${BITS}" compile-c
+
+ java-pkg-simple_src_compile
+}
+
+src_test() {
+ src/c/testsuite --basic || die
+ java-pkg-simple_src_test
+}
+
+src_install() {
+ java-pkg-simple_src_install
+ java-pkg_doso lib/libwrapper.so
+
+ dobin bin/wrapper
+ dodoc README*.txt
+ dodoc doc/revisions.txt
+}
diff --git a/dev-java/javahelp/javahelp-2.0.05_p20170719-r1.ebuild b/dev-java/javahelp/javahelp-2.0.05_p20170719-r1.ebuild
index bfedce9fba1..d617465487e 100644
--- a/dev-java/javahelp/javahelp-2.0.05_p20170719-r1.ebuild
+++ b/dev-java/javahelp/javahelp-2.0.05_p20170719-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/javaee/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz
LICENSE="GPL-2-with-linking-exception"
SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
CDEPEND="java-virtuals/servlet-api:2.4"
diff --git a/dev-java/javahelp/javahelp-2.0.05_p20170719.ebuild b/dev-java/javahelp/javahelp-2.0.05_p20170719.ebuild
deleted file mode 100644
index 4761d095147..00000000000
--- a/dev-java/javahelp/javahelp-2.0.05_p20170719.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-COMMIT="3ca862d8626096770598a3a256886d205246f4a4"
-JAVA_PKG_IUSE="examples source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="The JavaHelp system online help system"
-HOMEPAGE="https://javaee.github.io/javahelp/"
-SRC_URI="https://github.com/javaee/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2-with-linking-exception"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-
-CDEPEND="java-virtuals/servlet-api:2.4"
-
-RDEPEND=">=virtual/jre-1.4
- ${CDEPEND}"
-
-DEPEND="virtual/jdk:1.8
- ${CDEPEND}"
-
-JAVA_PKG_NV_DEPEND="virtual/jdk:1.8"
-
-S="${WORKDIR}/${PN}-${COMMIT}"
-
-_eant() {
- local \
- servlet_jar=$(java-pkg_getjar --virtual servlet-api-2.4 servlet-api.jar) \
- jsp_jar=$(java-pkg_getjar --virtual servlet-api-2.4 jsp-api.jar)
-
- eant \
- -f javahelp_nbproject/build.xml \
- -Dfile.reference.servlet-api.jar="${servlet_jar}" \
- -Dfile.reference.jsp-api.jar="${jsp_jar}" \
- -Dservlet-jar="${servlet_jar}" \
- -Djsp-jar="${jsp_jar}" \
- -Dservlet-jar-present=true \
- -Djsp-jar-present=true \
- -Dtomcat-zip-present=true \
- ${@}
-}
-
-src_compile() {
- _eant release
-}
-
-#Does not actually run anything
-#src_test() {
-# _eant test
-#}
-
-src_install() {
- java-pkg_dojar javahelp_nbproject/dist/lib/*.jar
-
- java-pkg_dolauncher jhsearch \
- --main com.sun.java.help.search.QueryEngine
- java-pkg_dolauncher jhindexer \
- --main com.sun.java.help.search.Indexer
-
- use source && java-pkg_dosrc \
- jhMaster/JSearch/*/com \
- jhMaster/JavaHelp/src/*/{javax,com}
-
- use examples && java-pkg_doexamples jhMaster/JavaHelp/demos
-}
diff --git a/dev-java/javassist/Manifest b/dev-java/javassist/Manifest
index 3b210b4537e..a3c89e94780 100644
--- a/dev-java/javassist/Manifest
+++ b/dev-java/javassist/Manifest
@@ -1 +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
diff --git a/dev-java/javassist/javassist-3.29.0-r2.ebuild b/dev-java/javassist/javassist-3.29.0-r2.ebuild
new file mode 100644
index 00000000000..dd078cbb9c3
--- /dev/null
+++ b/dev-java/javassist/javassist-3.29.0-r2.ebuild
@@ -0,0 +1,64 @@
+# 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_0_ga.tar.gz --slot 3 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild javassist-3.29.0.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.javassist:javassist:3.29.0-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"
+
+# Tests run: 431, Failures: 6
+# Cannot solve those test failures. Using "mvn test" they all pass.
+# https://bugs.gentoo.org/856364
+RESTRICT="test"
+
+# 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:*"
+
+S="${WORKDIR}/${PN}-rel_${PV//./_}_ga"
+
+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"
+JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+
+# https://github.com/jboss-javassist/javassist/blob/rel_3_29_0_ga/pom.xml#L166-L168
+# <include>javassist/JvstTest.java</include>
+JAVA_TEST_RUN_ONLY="javassist.JvstTest"
+
+src_prepare() {
+ default
+ java-pkg_clean javassist.jar
+ sed -e 's:\.\./\.\./::' -i src/test/javassist/JvstTest{4,Root}.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/javassist/metadata.xml b/dev-java/javassist/metadata.xml
index 56e992840bf..ff67a27c5ef 100644
--- a/dev-java/javassist/metadata.xml
+++ b/dev-java/javassist/metadata.xml
@@ -9,4 +9,7 @@
<remote-id type="sourceforge">jboss</remote-id>
<remote-id type="github">jboss-javassist/javassist</remote-id>
</upstream>
+ <longdescription>
+ Javassist (JAVA programming ASSISTant) makes Java bytecode manipulation simple. It is a class library for editing bytecodes in Java.
+ </longdescription>
</pkgmetadata>
diff --git a/dev-java/javax-jms-api/Manifest b/dev-java/javax-jms-api/Manifest
new file mode 100644
index 00000000000..b3fa25d684a
--- /dev/null
+++ b/dev-java/javax-jms-api/Manifest
@@ -0,0 +1 @@
+DIST javax-jms-api-2.0.3-RELEASE.tar.gz 162689 BLAKE2B cd59e263f649d30dcd4a117c95943c2fca4141822dc23f425286d142849c2be99a0e866f4f3439917a2a09c722a74b067025e34053f1afa7ee8654cca253d54c SHA512 64f492c17eb84a61e23da53755ce074c5c957204651a391f7e879992f8b781d6b8afbfc7f13898f1e5f5dcb384b3ae31807b4acde111f587703d5d8bc08b5063
diff --git a/dev-java/javax-jms-api/javax-jms-api-2.0.3.ebuild b/dev-java/javax-jms-api/javax-jms-api-2.0.3.ebuild
new file mode 100644
index 00000000000..5d29369afe4
--- /dev/null
+++ b/dev-java/javax-jms-api/javax-jms-api-2.0.3.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 api/pom.xml --download-uri https://github.com/jakartaee/messaging/archive/2.0.3-RELEASE.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild javax-jms-api-2.0.3.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="jakarta.jms:jakarta.jms-api:2.0.3"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Jakarta Messaging"
+HOMEPAGE="https://projects.eclipse.org/projects/ee4j.jms"
+SRC_URI="https://github.com/jakartaee/messaging/archive/${PV}-RELEASE.tar.gz -> ${P}-RELEASE.tar.gz"
+
+LICENSE="EPL-2.0 GPL-2-with-classpath-exception"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ppc64 ~x86"
+
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
+
+DOCS=( NOTICE.md README.md )
+
+S="${WORKDIR}/messaging-${PV}-RELEASE"
+
+JAVA_SRC_DIR="api/src/main/java"
diff --git a/dev-java/sun-jms/metadata.xml b/dev-java/javax-jms-api/metadata.xml
index cfecd6d03c9..ca6cf7f390b 100644
--- a/dev-java/sun-jms/metadata.xml
+++ b/dev-java/javax-jms-api/metadata.xml
@@ -3,11 +3,8 @@
<pkgmetadata>
<maintainer type="project">
<email>java@gentoo.org</email>
- <name>Java</name>
</maintainer>
<longdescription>
- The Java Message Service (JMS) API is a messaging standard that
- allows application components to create, send, receive, and read
- messages.
+ Jakarta Messaging describes a means for Java applications to create, send, and receive messages via loosely coupled, reliable asynchronous communication services.
</longdescription>
</pkgmetadata>
diff --git a/dev-java/jaxb-api/Manifest b/dev-java/jaxb-api/Manifest
index ce873eee07a..d20a942ff29 100644
--- a/dev-java/jaxb-api/Manifest
+++ b/dev-java/jaxb-api/Manifest
@@ -1,2 +1,3 @@
DIST jaxb-api-2.3.3.tar.gz 193025 BLAKE2B 1cf4461fdc67cc05ee43e880c254290b9dbe8a40b1dc39444d8fb6656698876a4bb16c679ee551ec7baa95c07eaf83e2fe5638a71eafbb158805c14c38888cb8 SHA512 37d6705fc1563f0d35a215e2f176473ee5e817a4a3017afe22042a4235c86b8556ea1fb23210d07ca7ea3cd1e0a3271daa4be8c9652cfe92ce2898f1381de3bf
DIST jaxb-api-3.0.1.tar.gz 420695 BLAKE2B 70da435e75f6fcb155d57ee20659897d7d1a72dc38e77f0348eaa767b56e2c5fbb7df88c3b0c794cfc7eaad3d839550a197288dab59520a63562f083388764c0 SHA512 16d62a1fd6045a57f1d215227ce75860340c286eb0986b1086a0312dbc8ca8119b25533c42fe54f367231ec1c34795fec6a9355417f71ce826ee28d5fb6cf9fe
+DIST jaxb-api-4.0.0.tar.gz 543827 BLAKE2B 12a113126290fdf46270d2713d88836e8f5d01059127747a343816a10deb45ecc8c8dc8cf2cf7e2b71754977900645d4fef6e08fa8c47f583945fea34bc62357 SHA512 eb4eab396b894ab801433e0e31f93a4980f3913176a1960591a69e4fd55f10f316a7edb712df323c59f7dc9ca6cebacb7257be06aec72446059dd8b93c6de175
diff --git a/dev-java/jaxb-api/jaxb-api-2.3.3-r1.ebuild b/dev-java/jaxb-api/jaxb-api-2.3.3-r1.ebuild
index 8e24eccaf3c..179eb6a32e3 100644
--- a/dev-java/jaxb-api/jaxb-api-2.3.3-r1.ebuild
+++ b/dev-java/jaxb-api/jaxb-api-2.3.3-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="2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
# Common dependencies
# POM: pom.xml
diff --git a/dev-java/jaxb-api/jaxb-api-2.3.3.ebuild b/dev-java/jaxb-api/jaxb-api-2.3.3.ebuild
deleted file mode 100644
index 9fa240685de..00000000000
--- a/dev-java/jaxb-api/jaxb-api-2.3.3.ebuild
+++ /dev/null
@@ -1,59 +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/eclipse-ee4j/jaxb-api/archive/refs/tags/2.3.3.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild jaxb-api-2.3.3.ebuild
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="jakarta.xml.bind:jakarta.xml.bind-api:2.3.3"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Jakarta XML Binding API"
-HOMEPAGE="https://github.com/eclipse-ee4j/jaxb-api"
-SRC_URI="https://github.com/eclipse-ee4j/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="EPL-1.0"
-SLOT="2"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-# Common dependencies
-# POM: pom.xml
-# jakarta.activation:jakarta.activation-api:1.2.2 -> >=dev-java/jakarta-activation-api-2.0.1:0
-# jakarta.xml.bind:jakarta.xml.bind-api:2.3.3 -> >=dev-java/jaxb-api-2.3.3:0
-
-CDEPEND="dev-java/jakarta-activation-api:1"
-DEPEND="${CDEPEND}
- >=virtual/jdk-1.8:*"
-RDEPEND="${CDEPEND}
- >=virtual/jre-1.8:*"
-
-DOCS=( ../{LICENSE,NOTICE,README}.md )
-
-S="${WORKDIR}/${P}/${PN}"
-
-JAVA_GENTOO_CLASSPATH="jakarta-activation-api-1"
-JAVA_GENTOO_CLASSPATH_EXTRA="jaxb-api.jar"
-JAVA_SRC_DIR="src/main/java"
-JAVA_RESOURCE_DIRS="src/main/resources"
-
-JAVA_TEST_GENTOO_CLASSPATH="junit-4"
-JAVA_TEST_SRC_DIR="../${PN}-test/src/test/java"
-JAVA_TEST_RESOURCE_DIRS="../${PN}-test/src/test/resources"
-
-src_test() {
- # Suppress tests for vm_version 1.8 (too many test failures)
- # see https://bugs.gentoo.org/796995
- local vm_version="$(java-config -g PROVIDES_VERSION)"
- if [[ "${vm_version}" != "1.8" ]] ; then
- java-pkg-simple_src_test
- fi
-}
-
-src_install() {
- default
- java-pkg-simple_src_install
-}
diff --git a/dev-java/jaxb-api/jaxb-api-3.0.1-r1.ebuild b/dev-java/jaxb-api/jaxb-api-3.0.1-r1.ebuild
index 6b3427db539..9167a5edd80 100644
--- a/dev-java/jaxb-api/jaxb-api-3.0.1-r1.ebuild
+++ b/dev-java/jaxb-api/jaxb-api-3.0.1-r1.ebuild
@@ -12,12 +12,12 @@ MAVEN_ID="jakarta.xml.bind:jakarta.xml.bind-api:3.0.1"
inherit java-pkg-2 java-pkg-simple
DESCRIPTION="Jakarta XML Binding API"
-HOMEPAGE="https://github.com/eclipse-ee4j/jaxb-api/jakarta.xml.bind-api"
+HOMEPAGE="https://github.com/eclipse-ee4j/jaxb-api"
SRC_URI="https://github.com/eclipse-ee4j/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="EPL-1.0"
SLOT="3"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
# Common dependencies
# POM: pom.xml
diff --git a/dev-java/jaxb-api/jaxb-api-3.0.1.ebuild b/dev-java/jaxb-api/jaxb-api-3.0.1.ebuild
deleted file mode 100644
index 857f9ebaa6e..00000000000
--- a/dev-java/jaxb-api/jaxb-api-3.0.1.ebuild
+++ /dev/null
@@ -1,40 +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/jaxb-api/archive/refs/tags/3.0.1.tar.gz --slot 2 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild jaxb-api-3.0.1.ebuild
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source"
-MAVEN_ID="jakarta.xml.bind:jakarta.xml.bind-api:3.0.1"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Jakarta XML Binding API"
-HOMEPAGE="https://github.com/eclipse-ee4j/jaxb-api/jakarta.xml.bind-api"
-SRC_URI="https://github.com/eclipse-ee4j/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="EPL-1.0"
-SLOT="3"
-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
-
-CDEPEND="dev-java/jakarta-activation:2"
-
-DEPEND="${CDEPEND}
- >=virtual/jdk-1.8:*"
-
-RDEPEND="${CDEPEND}
- >=virtual/jre-1.8:*"
-
-S="${WORKDIR}/${P}/${PN}"
-
-JAVA_GENTOO_CLASSPATH="jakarta-activation-2"
-JAVA_SRC_DIR="src/main/java"
-JAVA_RESOURCE_DIRS=(
- "src/main/resources"
-)
diff --git a/dev-java/jaxb-api/jaxb-api-4.0.0.ebuild b/dev-java/jaxb-api/jaxb-api-4.0.0.ebuild
new file mode 100644
index 00000000000..09661390a57
--- /dev/null
+++ b/dev-java/jaxb-api/jaxb-api-4.0.0.ebuild
@@ -0,0 +1,42 @@
+# 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="jakarta.xml.bind:jakarta.xml.bind-api:4.0.0"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Jakarta XML Binding API"
+HOMEPAGE="https://github.com/eclipse-ee4j/jaxb-api"
+SRC_URI="https://github.com/eclipse-ee4j/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="EPL-1.0"
+SLOT="4"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
+
+CP_DEPEND="dev-java/jakarta-activation:2"
+
+DEPEND="${CP_DEPEND}
+ >=virtual/jdk-11:*"
+
+RDEPEND="${CP_DEPEND}
+ >=virtual/jre-1.8:*"
+
+DOCS=( {CONTRIBUTING,NOTICE,README}.md )
+
+S="${WORKDIR}/${P}"
+
+JAVA_SRC_DIR="api/src/main/java"
+JAVA_RESOURCE_DIRS="api/src/main/resources"
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_SRC_DIR="jaxb-api-test/src/test/java"
+JAVA_TEST_RESOURCE_DIRS="jaxb-api-test/src/test/resources"
+
+src_install() {
+ default # https://bugs.gentoo.org/789582
+ java-pkg-simple_src_install
+}
diff --git a/dev-java/jaxb-runtime/Manifest b/dev-java/jaxb-runtime/Manifest
new file mode 100644
index 00000000000..3f6b074dab8
--- /dev/null
+++ b/dev-java/jaxb-runtime/Manifest
@@ -0,0 +1 @@
+DIST jaxb-ri-4.0.0.tar.gz 1739184 BLAKE2B a85a12fdca0b6eff8664894d65e2f82d30491e20050fde2ca828fa3c2c79ce2e158fca5ce6d0ae2cb2a00859abc0c9e9d49321c0943b862fd603a9e732f29dc4 SHA512 766a58d5107a88c19a99014b737b7b14a510b928dd26991adfe902073614923690c1e5a231834ec4a200a10adf9505b27179b8d84cf09dbb09292341c328e743
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
new file mode 100644
index 00000000000..586a6dc6e5e
--- /dev/null
+++ b/dev-java/jaxb-runtime/jaxb-runtime-4.0.0-r1.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom runtime/impl/pom.xml --download-uri https://github.com/eclipse-ee4j/jaxb-ri/archive/4.0.0-RI.tar.gz --slot 4 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild jaxb-runtime-4.0.0.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.glassfish.jaxb:jaxb-runtime:4.0.0"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="JAXB (JSR 222) Reference Implementation"
+HOMEPAGE="https://eclipse-ee4j.github.io/jaxb-ri/"
+SRC_URI="https://github.com/eclipse-ee4j/jaxb-ri/archive/${PV}-RI.tar.gz -> jaxb-ri-${PV}.tar.gz"
+
+LICENSE="EPL-1.0"
+SLOT="4"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+DEPEND="
+ >=dev-java/fastinfoset-2.1.0-r1:0
+ dev-java/jaxb-api:4
+ >=dev-java/jaxb-stax-ex-2.1.0-r1:0
+ dev-java/istack-commons-runtime:0
+ >=virtual/jdk-11:*
+"
+
+# reason: '<>' with anonymous inner classes is not supported in -source 8
+# (use -source 9 or higher to enable '<>' with anonymous inner classes)
+RDEPEND=">=virtual/jre-11:*"
+
+DOCS=( ../{CONTRIBUTING,NOTICE,README}.md )
+
+S="${WORKDIR}/jaxb-ri-${PV}-RI/jaxb-ri"
+
+JAVA_CLASSPATH_EXTRA="fastinfoset,jaxb-stax-ex"
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+
+src_compile() {
+ einfo "Compiling txw-runtime"
+ JAVA_SRC_DIR="txw/runtime/src/main/java"
+ JAVA_JAR_FILENAME="txw-runtime.jar"
+ java-pkg-simple_src_compile
+ JAVA_GENTOO_CLASSPATH_EXTRA+=":txw-runtime.jar"
+ rm -r target || die
+
+ einfo "Compiling core"
+ JAVA_SRC_DIR="core/src/main/java"
+ JAVA_RESOURCE_DIRS="core/src/main/resources"
+ JAVA_JAR_FILENAME="core.jar"
+ JAVA_CLASSPATH_EXTRA+=" istack-commons-runtime,jaxb-api-4"
+ java-pkg-simple_src_compile
+ JAVA_GENTOO_CLASSPATH_EXTRA+=":core.jar"
+ rm -r target || die
+
+ einfo "Compiling runtime"
+ JAVA_SRC_DIR="runtime/impl/src/main/java"
+ JAVA_RESOURCE_DIRS="runtime/impl/src/main/resources"
+ JAVA_JAR_FILENAME="runtime.jar"
+ java-pkg-simple_src_compile
+ JAVA_GENTOO_CLASSPATH_EXTRA+=":runtime.jar"
+ rm -r target || die
+
+ if use doc; then
+ einfo "Compiling javadocs"
+ rm {core,runtime/impl}/src/main/java/module-info.java || die
+ JAVA_SRC_DIR=(
+ "txw/runtime/src/main/java"
+ "core/src/main/java"
+ "runtime/impl/src/main/java"
+ )
+ JAVA_JAR_FILENAME="ignoreme.jar"
+ java-pkg-simple_src_compile
+ fi
+}
+
+src_test() {
+ einfo "Testing core"
+ JAVA_TEST_SRC_DIR="core/src/test/java"
+ JAVA_TEST_RESOURCE_DIRS="core/src/test/resources"
+ java-pkg-simple_src_test
+
+ einfo "Testing runtime"
+ JAVA_TEST_SRC_DIR="runtime/impl/src/test/java"
+ JAVA_TEST_RESOURCE_DIRS=()
+ java-pkg-simple_src_test
+}
+
+src_install() {
+ einstalldocs
+
+ java-pkg_dojar "txw-runtime.jar"
+ java-pkg_dojar "core.jar"
+ java-pkg_dojar "runtime.jar"
+
+ if use doc; then
+ java-pkg_dojavadoc target/api
+ fi
+
+ if use source; then
+ java-pkg_dosrc "txw/runtime/src/main/java/*"
+ java-pkg_dosrc "core/src/main/java/*"
+ java-pkg_dosrc "runtime/impl/src/main/java/*"
+ fi
+}
diff --git a/dev-java/jaxb-runtime/metadata.xml b/dev-java/jaxb-runtime/metadata.xml
new file mode 100644
index 00000000000..75321cfb559
--- /dev/null
+++ b/dev-java/jaxb-runtime/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/jaxb-stax-ex/Manifest b/dev-java/jaxb-stax-ex/Manifest
new file mode 100644
index 00000000000..403024b4deb
--- /dev/null
+++ b/dev-java/jaxb-stax-ex/Manifest
@@ -0,0 +1 @@
+DIST jaxb-stax-ex-2.1.0.tar.gz 28683 BLAKE2B 774f7420f996eb52abc9db56753f0fc492164ed12f4ddffacad8f801ac759666e6dcae85cf24ce1231df4d49d5b5084278d2cac0c5c129302ec973c215408782 SHA512 f81dcb4870800c4799e716254b84e57a15ef36a9e6a8502da7ee2711aad67765595674fccc1c4d9d4e8865c642dfadd694f8849d4e98c4e9f2368cb940deb38d
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
new file mode 100644
index 00000000000..e7cfb9f464e
--- /dev/null
+++ b/dev-java/jaxb-stax-ex/jaxb-stax-ex-2.1.0-r1.ebuild
@@ -0,0 +1,37 @@
+# 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/jaxb-stax-ex/archive/2.1.0.tar.gz --slot 0 --keywords "~amd64 ~ppc64 ~x86" --ebuild jaxb-stax-ex-2.1.0.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.jvnet.staxex:stax-ex:2.1.0"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Extensions to JSR-173 StAX API."
+HOMEPAGE="https://projects.eclipse.org/projects/ee4j/stax-ex"
+SRC_URI="https://github.com/eclipse-ee4j/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="EPL-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+DEPEND="
+ dev-java/jakarta-activation-api:2
+ dev-java/jaxb-api:4
+ >=virtual/jdk-11:*
+"
+
+RDEPEND=">=virtual/jre-1.8:*"
+
+S="${WORKDIR}/${P}"
+
+JAVA_CLASSPATH_EXTRA="jakarta-activation-api-2,jaxb-api-4"
+JAVA_SRC_DIR="src/main/java"
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_SRC_DIR="src/test/java"
diff --git a/dev-java/jaxb-stax-ex/metadata.xml b/dev-java/jaxb-stax-ex/metadata.xml
new file mode 100644
index 00000000000..75321cfb559
--- /dev/null
+++ b/dev-java/jaxb-stax-ex/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/jbig2-imageio/jbig2-imageio-3.0.3.ebuild b/dev-java/jbig2-imageio/jbig2-imageio-3.0.3.ebuild
index 759a268c26f..24e6a4482fb 100644
--- a/dev-java/jbig2-imageio/jbig2-imageio-3.0.3.ebuild
+++ b/dev-java/jbig2-imageio/jbig2-imageio-3.0.3.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:
@@ -18,7 +18,7 @@ SRC_URI="https://downloads.apache.org/pdfbox/${PN}/${PV}/${P}-src.zip"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64 x86"
DEPEND=">=virtual/jdk-1.8:*"
RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/jbitcollider-core/jbitcollider-core-0.8-r1.ebuild b/dev-java/jbitcollider-core/jbitcollider-core-0.8-r1.ebuild
index 07c846c70b0..00b7f87a10d 100644
--- a/dev-java/jbitcollider-core/jbitcollider-core-0.8-r1.ebuild
+++ b/dev-java/jbitcollider-core/jbitcollider-core-0.8-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
EAPI=7
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/project/bitcollider/jBitcollider%20%28Java%29/${PV
LICENSE="public-domain"
SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
DEPEND=">=virtual/jdk-1.8:*"
RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/jctools-core/Manifest b/dev-java/jctools-core/Manifest
index ee8ea275b3b..168c5537b98 100644
--- a/dev-java/jctools-core/Manifest
+++ b/dev-java/jctools-core/Manifest
@@ -1 +1,2 @@
-DIST jctools-core-2.0.2.tar.gz 4136573 BLAKE2B 6ca4c276422b24b18256b35606b6e59e8be53b77fe0b757e4f46dc4e0bdab0ea8fbb8c58e84794c689aa1df29a80aa847b6baf7cda430f2657720ecb5d60e99f SHA512 734905d6847664a08557fa9807766bfe2cd57e9562f1dc0d908c9fffc627c1cb7576ac079715004da9a1f2ee958c8373caf60c110ef3de8f7da5bb04775f6f7f
+DIST jctools-3.1.0.tar.gz 4204148 BLAKE2B 88f8f5395470072571de64ee3d696e90c1fbf22a6e9c1424463bfb8b497dd3d47f8d0fcc9a039acec8380ac52a3d445789257d5a1071e49e6963c59d156065e2 SHA512 bf69387732dea043e6e5fa44fe60a5f80ef5ae9d32ebb39ac16353e5bd82502b3b6e5564a8bd9f3b8ad073a95ff984ae55133884ebeea9d0b9a777c488af2a74
+DIST jctools-3.3.0.tar.gz 4214717 BLAKE2B c9c5f5897ebf8bb7ac439b969f372c45b7652517cbc5369c07fe80d11f779eebe7fe5ffb5d93a18fe3df5d9ca9adf3cee7268c8c6ed962fccb4d84f5b0451c4b SHA512 ce212abacca6137a133f7a4e94370442d00bf73794fa7b9ce440631701a9a2fca31c4dda05e2a768fcf28f75e84f2a7f318a936e429c7f4ed20daa7b79d11a4a
diff --git a/dev-java/jctools-core/jctools-core-2.0.2.ebuild b/dev-java/jctools-core/jctools-core-2.0.2.ebuild
deleted file mode 100644
index 825bc561d7d..00000000000
--- a/dev-java/jctools-core/jctools-core-2.0.2.ebuild
+++ /dev/null
@@ -1,57 +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/JCTools/JCTools/archive/refs/tags/v2.0.2.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild jctools-core-2.0.2.ebuild
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.jctools:jctools-core:2.0.2"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Java Concurrency Tools Core Library"
-HOMEPAGE="https://jctools.github.io/JCTools/"
-SRC_URI="https://github.com/JCTools/JCTools/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? junit:junit:4.12 -> >=dev-java/junit-4.13.2:4
-# test? org.hamcrest:hamcrest-all:1.3 -> !!!artifactId-not-found!!!
-
-DEPEND=">=virtual/jdk-1.8:*
- test? ( dev-java/hamcrest-library:1.3 )"
-
-RDEPEND=">=virtual/jre-1.8:*"
-
-DOCS=(
- ../{LICENSE,{README,RELEASE-NOTES}.md}
- ../resources/'1977 - Lamport - Concurrent Reading and Writing.pdf'
- ../resources/'2010 - Pisa - SPSC Queues on Shared Cache Multi-Core Systems.pdf'
- ../resources/'2011 - Dice - MultiLane - A Concurrent Blocking Multiset.pdf'
- ../resources/'2011 - Technion - CAFE - Scalable Task Pools with Adjustable Fairness and Contention.pdf'
- ../resources/'2012 - Junchang- BQueue- Efficient and Practical Queuing.pdf'
- ../resources/'2012 - Salzburg - Fast and Scalable k-FIFO Queues.pdf'
- ../resources/'2012 - Technion - SALSA - NUMA-aware Algorithm for Producer-Consumer Pools.pdf'
- ../resources/'2013 - Afek - Fast Concurrent Queues for x86 Processors.pdf'
- ../resources/'2013 - Salzburg - Distributed Queues in Shared Memory.pdf'
- ../resources/'2014 - Afek - Fence-Free Work Stealing on Bounded TSO Processors.pdf'
-)
-
-S="${WORKDIR}/JCTools-${PV}/jctools-core"
-
-JAVA_SRC_DIR="src/main/java"
-
-JAVA_TEST_GENTOO_CLASSPATH="junit-4,hamcrest-library-1.3"
-JAVA_TEST_SRC_DIR="src/test/java"
-
-src_install() {
- default # https://bugs.gentoo.org/789582
- java-pkg-simple_src_install
-}
diff --git a/dev-java/jctools-core/jctools-core-3.1.0.ebuild b/dev-java/jctools-core/jctools-core-3.1.0.ebuild
new file mode 100644
index 00000000000..aa0d71ccb18
--- /dev/null
+++ b/dev-java/jctools-core/jctools-core-3.1.0.ebuild
@@ -0,0 +1,72 @@
+# 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/JCTools/JCTools/archive/v3.1.0.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild jctools-core-3.1.0.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.jctools:jctools-core:3.0.1"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Java Concurrency Tools Core Library"
+HOMEPAGE="https://jctools.github.io/JCTools/"
+SRC_URI="https://github.com/JCTools/JCTools/archive/v${PV}.tar.gz -> jctools-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="3"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
+
+# Compile dependencies
+# POM: pom.xml
+# test? com.google.guava:guava-testlib:21.0 -> >=dev-java/guava-testlib-30.1.1:0
+# test? junit:junit:4.12 -> >=dev-java/junit-4.13.2:4
+# test? org.hamcrest:hamcrest-all:1.3 -> !!!artifactId-not-found!!!
+
+DEPEND=">=virtual/jdk-1.8:*
+ test? (
+ dev-java/guava-testlib:0
+ dev-java/hamcrest-library:1.3
+ )"
+
+RDEPEND=">=virtual/jre-1.8:*"
+
+DOCS=( ../{README,RELEASE-NOTES}.md )
+
+S="${WORKDIR}/JCTools-${PV}/jctools-core"
+
+JAVA_SRC_DIR="src/main/java"
+
+JAVA_TEST_GENTOO_CLASSPATH="guava-testlib,hamcrest-library-1.3,junit-4"
+JAVA_TEST_SRC_DIR="src/test/java"
+
+# Using the defaults of java-pkg-simple would skip more than half the number of tests.
+src_test() {
+ # These tests would fail and are not run by "mvn test".
+ # "org.jctools.queues.MpqSanityTest"
+ # "org.jctools.queues.QueueSanityTest"
+ # "org.jctools.queues.ScQueueRemoveTest"
+ # "org.jctools.util.TestUtil"
+ pushd src/test/java || die
+ local JAVA_TEST_RUN_ONLY=$(find * \
+ \( -name "*Test*.java" \
+ -o -name "nbsi_tester.java" \
+ -o -name "nbhs_tester.java" \)\
+ ! -name "MpqSanityTest.java" \
+ ! -name "QueueSanityTest.java" \
+ ! -name "ScQueueRemoveTest.java" \
+ ! -name "TestUtil.java" \
+ )
+ popd
+ JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}"
+ 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/jctools-core/jctools-core-3.3.0.ebuild b/dev-java/jctools-core/jctools-core-3.3.0.ebuild
new file mode 100644
index 00000000000..2e1511ad7f9
--- /dev/null
+++ b/dev-java/jctools-core/jctools-core-3.3.0.ebuild
@@ -0,0 +1,64 @@
+# 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/JCTools/JCTools/archive/v3.3.0.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild jctools-core-3.3.0.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.jctools:jctools-core:3.3.0"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Java Concurrency Tools Core Library"
+HOMEPAGE="https://jctools.github.io/JCTools/"
+SRC_URI="https://github.com/JCTools/JCTools/archive/v${PV}.tar.gz -> jctools-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="3"
+KEYWORDS="~amd64 ~arm ~arm64 ppc64 ~x86"
+
+DEPEND=">=virtual/jdk-1.8:*
+ test? (
+ dev-java/guava-testlib:0
+ dev-java/hamcrest-library:1.3
+ )"
+
+RDEPEND=">=virtual/jre-1.8:*"
+
+DOCS=( ../{README,RELEASE-NOTES}.md )
+
+S="${WORKDIR}/JCTools-${PV}/jctools-core"
+
+JAVA_SRC_DIR="src/main/java"
+
+JAVA_TEST_GENTOO_CLASSPATH="guava-testlib,hamcrest-library-1.3,junit-4"
+JAVA_TEST_SRC_DIR="src/test/java"
+
+# Using the defaults of java-pkg-simple would skip more than half the number of tests.
+src_test() {
+ # org.jetbrains.kotlinx.lincheck is not yet packaged
+ rm -r src/test/java/org/jctools/maps/linearizability_test || die
+ # These tests would fail and are not run by "mvn test".
+ # "org.jctools.queues.MpqSanityTest"
+ # "org.jctools.queues.QueueSanityTest"
+ # "org.jctools.queues.ScQueueRemoveTest"
+ # "org.jctools.util.TestUtil"
+ pushd src/test/java || die
+ local JAVA_TEST_RUN_ONLY=$(find * \
+ \( -name "*Test*.java" \
+ -o -name "nbsi_tester.java" \
+ -o -name "nbhs_tester.java" \)\
+ ! -name "MpqSanityTest.java" \
+ ! -name "QueueSanityTest.java" \
+ ! -name "ScQueueRemoveTest.java" \
+ ! -name "TestUtil.java" \
+ )
+ popd
+ JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}"
+ JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}"
+ java-pkg-simple_src_test
+ # OK (7226 tests)
+}
diff --git a/dev-java/jdbc-postgresql/Manifest b/dev-java/jdbc-postgresql/Manifest
index 04c1f8e9ea2..581a031b564 100644
--- a/dev-java/jdbc-postgresql/Manifest
+++ b/dev-java/jdbc-postgresql/Manifest
@@ -1 +1 @@
-DIST postgresql-jdbc-9.4-1206.src.tar.gz 2029837 BLAKE2B b222a0b2f8f99becaf0ae350407fafeb23d9d4bdb130c17996373b4211e0d56d1a76bc5737401dc6fc6618d2a891943d096b0f60f0770ff6ce859ade3e7a178d SHA512 b16816f1afd3ee5986fca197bd7608c2e2f334054e41a8c541c47985827f4f59d7691d23983bdac01c85fc364cd001c991ac6b4e8567429b9d1f4161388dd6bd
+DIST postgresql-jdbc-42.4.0.src.tar.gz 966868 BLAKE2B 0a8bffcfbba4ddedcbd77717b6bca2f4e7cd9fe4597c6edb5a2ac8fbea788c692377ae713723aa7342895f857aff7eca0825eedd36cff69f3760b11cbb7b666c SHA512 816967923f54d5c2ad856e3ae2612987fa52234acc6b487f492d56614ac241d9542abd40a1f868ad6d895a45de28f7a0d586f8486dc719600238bcc3ef40819a
diff --git a/dev-java/jdbc-postgresql/files/jdbc-postgresql-9.4_p1201-remove-osgi.patch b/dev-java/jdbc-postgresql/files/jdbc-postgresql-9.4_p1201-remove-osgi.patch
deleted file mode 100644
index 15b1860d2aa..00000000000
--- a/dev-java/jdbc-postgresql/files/jdbc-postgresql-9.4_p1201-remove-osgi.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- a/build.xml 2015-02-18 17:44:58.000000000 +0100
-+++ b/build.xml 2015-03-23 02:19:03.951945663 +0100
-@@ -403,34 +403,6 @@
- <attribute name="Implementation-Vendor" value="PostgreSQL Global Development Group" />
- </manifest>
- </jar>
--
-- <!-- add OSGi meta information -->
-- <property name="osgidir" value="${builddir}/osgi"/>
-- <mkdir dir="${osgidir}"/>
--
-- <!-- create a bnd file named after the JAR file so that bnd wrap tool find it -->
-- <echo file="${osgidir}/${artifact.version.string}.bnd">
--Bundle-ManifestVersion: 2
--
--Bundle-Name: PostgreSQL JDBC Driver ${jdbc.version.upper}
--Bundle-SymbolicName: org.postgresql.${jdbc.version}
--Bundle-Version: ${osgi.version}
--
--Bundle-Vendor: PostgreSQL Global Development Group
--Bundle-Copyright: Copyright (c) 2003-2015, PostgreSQL Global Development Group
--Bundle-License: http://www.postgresql.org/about/licence/
--Bundle-DocURL: http://jdbc.postgresql.org/
--
--Bundle-Classpath: .
--Bundle-Activator: org.postgresql.osgi.PGBundleActivator
--Require-Capability: osgi.ee;filter:="(&amp;(|(osgi.ee=J2SE)(osgi.ee=JavaSE))(version>=${java.specification.version}))"
--Export-Package: org.postgresql*; version=${fullversion}
--Import-Package: javax.sql, javax.transaction.xa, javax.naming, *;resolution:=optional
-- </echo>
--
-- <!-- run wrap task from bnd -->
-- <taskdef resource="aQute/bnd/ant/taskdef.properties" classpathref="dependency.build.classpath"/>
-- <bndwrap jars="${artifact.jar.build}" output="${artifact.jar}" definitions="${osgidir}"/>
- </target>
-
- <!-- create a distribution with docs, dependencies, and driver jar -->
diff --git a/dev-java/jdbc-postgresql/files/jdbc-postgresql-9.4_p1204-remove-sspi.patch b/dev-java/jdbc-postgresql/files/jdbc-postgresql-9.4_p1204-remove-sspi.patch
deleted file mode 100644
index 16996892b19..00000000000
--- a/dev-java/jdbc-postgresql/files/jdbc-postgresql-9.4_p1204-remove-sspi.patch
+++ /dev/null
@@ -1,138 +0,0 @@
---- a/org/postgresql/core/v3/ConnectionFactoryImpl.java 2015-10-09 20:55:53.000000000 +0200
-+++ b/org/postgresql/core/v3/ConnectionFactoryImpl.java 2015-10-14 20:42:48.816753341 +0200
-@@ -32,7 +32,6 @@
- import org.postgresql.hostchooser.HostChooserFactory;
- import org.postgresql.hostchooser.HostRequirement;
- import org.postgresql.hostchooser.HostStatus;
--import org.postgresql.sspi.SSPIClient;
- import org.postgresql.util.GT;
- import org.postgresql.util.HostSpec;
- import org.postgresql.util.MD5Digest;
-@@ -394,11 +393,7 @@
- // or an authentication request
-
- String password = PGProperty.PASSWORD.get(info);
--
-- /* SSPI negotiation state, if used */
-- SSPIClient sspiClient = null;
-
-- try {
- authloop:
- while (true)
- {
-@@ -514,88 +509,16 @@
- case AUTH_REQ_SSPI:
- /*
- * Use GSSAPI if requested on all platforms, via JSSE.
-- *
-- * For SSPI auth requests, if we're on Windows attempt native SSPI
-- * authentication if available, and if not disabled by setting a
-- * kerberosServerName. On other platforms, attempt JSSE GSSAPI
-- * negotiation with the SSPI server.
-- *
-- * Note that this is slightly different to libpq, which uses SSPI
-- * for GSSAPI where supported. We prefer to use the existing Java
-- * JSSE Kerberos support rather than going to native (via JNA) calls
-- * where possible, so that JSSE system properties etc continue
-- * to work normally.
-- *
-- * Note that while SSPI is often Kerberos-based there's no guarantee
-- * it will be; it may be NTLM or anything else. If the client responds
-- * to an SSPI request via GSSAPI and the other end isn't using Kerberos
-- * for SSPI then authentication will fail.
- */
-- final String gsslib = PGProperty.GSS_LIB.get(info);
-- final boolean usespnego = PGProperty.USE_SPNEGO.getBoolean(info);
--
-- boolean useSSPI = false;
-+ org.postgresql.gss.MakeGSS.authenticate(pgStream, host,
-+ user, password,
-+ PGProperty.JAAS_APPLICATION_NAME.get(info),
-+ PGProperty.KERBEROS_SERVER_NAME.get(info),
-+ logger,
-+ PGProperty.USE_SPNEGO.getBoolean(info));
-+
-+ break;
-
-- /*
-- * Use SSPI if we're in auto mode on windows and have a
-- * request for SSPI auth, or if it's forced. Otherwise
-- * use gssapi. If the user has specified a Kerberos server
-- * name we'll always use JSSE GSSAPI.
-- */
-- if (gsslib.equals("gssapi"))
-- logger.debug("Using JSSE GSSAPI, param gsslib=gssapi");
-- else if (areq == AUTH_REQ_GSS && !gsslib.equals("sspi"))
-- logger.debug("Using JSSE GSSAPI, gssapi requested by server and gsslib=sspi not forced");
-- else
-- {
-- /* Determine if SSPI is supported by the client */
-- sspiClient = new SSPIClient(pgStream,
-- PGProperty.SSPI_SERVICE_CLASS.get(info),
-- /* Use negotiation for SSPI, or if explicitly requested for GSS */
-- areq == AUTH_REQ_SSPI || (areq == AUTH_REQ_GSS && usespnego),
-- logger);
--
-- useSSPI = sspiClient.isSSPISupported();
-- logger.debug("SSPI support detected: " + useSSPI);
--
-- if (!useSSPI) {
-- /* No need to dispose() if no SSPI used */
-- sspiClient = null;
--
-- if (gsslib.equals("sspi"))
-- throw new PSQLException("SSPI forced with gsslib=sspi, but SSPI not available; set loglevel=2 for details",
-- PSQLState.CONNECTION_UNABLE_TO_CONNECT);
-- }
--
-- logger.debug("Using SSPI: " + useSSPI + ", gsslib="+gsslib+" and SSPI support detected");
-- }
--
-- if (useSSPI)
-- {
-- /* SSPI requested and detected as available */
-- sspiClient.startSSPI();
-- }
-- else
-- {
-- /* Use JGSS's GSSAPI for this request */
-- org.postgresql.gss.MakeGSS.authenticate(pgStream, host,
-- user, password,
-- PGProperty.JAAS_APPLICATION_NAME.get(info),
-- PGProperty.KERBEROS_SERVER_NAME.get(info),
-- logger,
-- usespnego);
-- }
--
-- break;
--
-- case AUTH_REQ_GSS_CONTINUE:
-- /*
-- * Only called for SSPI, as GSS is handled by an inner loop
-- * in MakeGSS.
-- */
-- sspiClient.continueSSPI(l_msgLen - 8);
-- break;
--
- case AUTH_REQ_OK:
- /* Cleanup after successful authentication */
- if (logger.logDebug())
-@@ -616,18 +539,6 @@
- throw new PSQLException(GT.tr("Protocol error. Session setup failed."), PSQLState.PROTOCOL_VIOLATION);
- }
- }
-- } finally {
-- /* Cleanup after successful or failed authentication attempts */
-- if (sspiClient != null)
-- {
-- try {
-- sspiClient.dispose();
-- } catch (RuntimeException ex) {
-- logger.log("Unexpected error during SSPI context disposal", ex);
-- }
--
-- }
-- }
-
- }
-
diff --git a/dev-java/jdbc-postgresql/jdbc-postgresql-42.4.0.ebuild b/dev-java/jdbc-postgresql/jdbc-postgresql-42.4.0.ebuild
new file mode 100644
index 00000000000..37557d8f291
--- /dev/null
+++ b/dev-java/jdbc-postgresql/jdbc-postgresql-42.4.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 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-9.4_p1206-r1.ebuild b/dev-java/jdbc-postgresql/jdbc-postgresql-9.4_p1206-r1.ebuild
deleted file mode 100644
index b5bfb41864b..00000000000
--- a/dev-java/jdbc-postgresql/jdbc-postgresql-9.4_p1206-r1.ebuild
+++ /dev/null
@@ -1,110 +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_PN="postgresql-jdbc"
-MY_PV="${PV/_p/-}"
-MY_P="${MY_PN}-${MY_PV}.src"
-
-DESCRIPTION="JDBC Driver for PostgreSQL"
-SRC_URI="https://jdbc.postgresql.org/download/${MY_P}.tar.gz"
-HOMEPAGE="https://jdbc.postgresql.org/"
-
-LICENSE="POSTGRESQL"
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
-IUSE="test"
-
-# it does not compile with jdk 11, newer versions should be fine
-# BUILD FAILED
-# /var/tmp/portage/dev-java/jdbc-postgresql-9.4_p1206-r1/work/postgresql-jdbc-9.4-1206.src/build.xml:197: Unknown JDK version.
-DEPEND="
- virtual/jdk:1.8
- doc? (
- dev-libs/libxslt
- app-text/docbook-xsl-stylesheets
- )
- test? (
- dev-db/postgresql[server]
- dev-java/ant-junit:0
- dev-java/hamcrest-core:1.3
- dev-java/junit:4
- dev-java/xml-commons-resolver:0
- )"
-RDEPEND=">=virtual/jre-1.8:*"
-
-RESTRICT="test" # Requires external postgresql server setup
-
-S="${WORKDIR}/postgresql-jdbc-${MY_PV}.src"
-
-HTML_DOCS=( build/doc/pgjdbc.html )
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-EANT_DOC_TARGET="publicapi"
-
-src_prepare() {
- default
-
- # Strip build.xml of maven deps
- sed -i -e '/<classpath.*dependency\.compile\.classpath/c\' build.xml || die
- sed -i -e '/<classpath.*dependency\.runtime\.classpath/c\' build.xml || die
- sed -i -e '/<classpath.*dependency\.test\.classpath/c\' build.xml || die
- sed -i -e '/<target name="artifact-version"/,/<[/]target>/{s/depends="maven-dependencies"//}' build.xml || die
- sed -i -e '/<target name="compile"/ s/,maven-dependencies//' build.xml || die
-
- # Remove SSPI, it pulls in Waffle-JNA and is only used on Windows
- sed -i -e '/<include.*sspi/c\' build.xml || die
- rm -vrf org/postgresql/sspi || die "Error removing sspi"
- eapply "${FILESDIR}"/${PN}-9.4_p1204-remove-sspi.patch
-
- # FIXME @someone who cares: enable through osgi flag?
- sed -i -e '/<include.*osgi/c\' build.xml || die
- sed -i -e '/<test.*osgi/c\' build.xml || die
- rm -vrf org/postgresql/osgi || die "Error removing osgi"
- rm -vrf org/postgresql/test/osgi || die "Error removing osgi tests"
- eapply "${FILESDIR}"/${PN}-9.4_p1201-remove-osgi.patch
-
- java-pkg_clean
-}
-
-src_compile() {
- EANT_BUILD_TARGET="release-version jar"
- java-pkg-2_src_compile
-
- # There is a task that creates this doc but I didn't find a way how to use system catalog
- # to lookup the stylesheet so the 'doc' target is rewritten here to use system call instead.
- if use doc; then
- mkdir -p "${S}/build/doc" || die
- xsltproc -o "${S}/build/doc/pgjdbc.html" http://docbook.sourceforge.net/release/xsl/current/xhtml/docbook.xsl \
- "${S}/doc/pgjdbc.xml" || die
- fi
-}
-
-src_test() {
- einfo "In order to run the tests successfully, you have to have:"
- einfo "1) PostgreSQL server running"
- einfo "2) database 'test' defined with user 'test' with password 'test'"
- einfo " as owner of the database"
- einfo "3) plpgsql support in the 'test' database"
- einfo
- einfo "You can find a general info on how to perform these steps at"
- einfo "https://wiki.gentoo.org/wiki/PostgreSQL"
-
- ANT_TASKS="ant-junit" eant test -Dgentoo.classpath=$(java-pkg_getjars --build-only "hamcrest-core-1.3,junit-4,xml-commons-resolver")
-}
-
-src_install() {
- java-pkg_newjar build/jars/postgresql*.jar jdbc-postgresql.jar
-
- if use doc ; then
- java-pkg_dojavadoc build/publicapi
- einstalldocs
- fi
-
- use source && java-pkg_dosrc org
-}
diff --git a/dev-java/jdom/Manifest b/dev-java/jdom/Manifest
index 251072f6c98..ac1c82fc0e3 100644
--- a/dev-java/jdom/Manifest
+++ b/dev-java/jdom/Manifest
@@ -1,2 +1,2 @@
-DIST JDOM-2.0.6.tar.gz 8344114 BLAKE2B 0b9a568fe4de1fb9afc5a547d75aa1d3556bf497c76e3d32d1ebd7658634ea02e4fafa3c6261b64d9b803fc6e78ae013fb8a366bcbd5024e8ab0aced83f58e33 SHA512 d585b39159f0887485b2e681609b51113de6bc7c43627c42d7e81eb06ac65c507b43cf3d81c5df4399b1e3abf454c8852264a84567940bc5ba0c358eb9c0c4a1
+DIST JDOM-2.0.6.1.tar.gz 8368301 BLAKE2B b9d5d8e611b9a0505c9576f2c4a2243eddd8a171bbe44d83440edf44154cae80138ddca8a0bceb3124a6825111d30641a28d645507a1bacad6a8cb9ad1dbccdd SHA512 c09b422b0635a478cb70e57e4c35bc7f505f6a2730be813d6e63c053814581e4dc3fdf431b945394c30ab37a8fb83fd103767f8de84d28bef79e95e2c37518e1
DIST jdom-1.1.3.tar.gz 4233403 BLAKE2B 9e4afacc6f10d2be1d793bd3b9f438f79e8e27f50bcae83eac5054df806c01c211ac493465bcda58ac204e796663ffb8aedf43a177f23c23a69af399243461a0 SHA512 a693fcc0d5c8ab3cf086a7904c7fb711e7deedca542089b84c6d011584e0d889495a58843033bff25272fdf130b1347419e31b9a4650c85ce9dfa19022dc0278
diff --git a/dev-java/jdom/files/build-xml-2.patch b/dev-java/jdom/files/build-xml-2.patch
deleted file mode 100644
index 420f9eff199..00000000000
--- a/dev-java/jdom/files/build-xml-2.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- a/build.xml 2015-02-15 02:58:04.000000000 +0000
-+++ b/build.xml 2015-08-27 23:11:09.807800249 +0100
-@@ -267,7 +267,7 @@
- </javac>
- </target>
-
-- <target name="compile" depends="compile.core, compile.junit, compile.contrib, compile.samples"
-+ <target name="compile" depends="compile.core, compile.contrib, compile.samples"
- description="Compiles all JDOM code (core, samples, junit, contrib)" />
-
- <!-- =================================================================== -->
-@@ -296,7 +296,7 @@
- <!-- =================================================================== -->
- <!-- Creates the jars -->
- <!-- =================================================================== -->
-- <target name="jars" depends="compile, javadoc"
-+ <target name="jars" depends="compile"
- description="Builds the Jars">
- <fixcrlf srcdir="." includes="**/*.bat" excludes="build*.*" eol="crlf"/>
- <fixcrlf srcdir="." includes="**/*.sh" excludes="build*.*" eol="lf"/>
-@@ -320,6 +320,7 @@
- <fileset dir="${contrib.build}" includes="**/*" />
- <fileset dir="${metainf.build}" excludes="**/MANIFEST.MF" />
- </jar>
-+<!--
- <jar jarfile="${package}/${jarbase}-junit.jar" >
- <fileset dir="${junit.build}" includes="**/*" />
- <fileset dir="${metainf.build}" excludes="**/MANIFEST.MF" />
-@@ -332,6 +333,7 @@
- <fileset dir="${contrib.src}" includes="**/*" />
- </jar>
-
-+-->
- </target>
-
- <target name="androidtests" depends="jars">
diff --git a/dev-java/jdom/jdom-2.0.6-r5.ebuild b/dev-java/jdom/jdom-2.0.6-r5.ebuild
deleted file mode 100644
index 772c36da6de..00000000000
--- a/dev-java/jdom/jdom-2.0.6-r5.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
-
-MY_P="JDOM-${PV}"
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Java API to manipulate XML data"
-SRC_URI="https://github.com/hunterhacker/${PN}/archive/${MY_P}.tar.gz"
-HOMEPAGE="http://www.jdom.org"
-
-LICENSE="Apache-1.1"
-SLOT="2"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-CDEPEND="
- dev-java/iso-relax:0
- dev-java/jaxen:1.2
- dev-java/xalan:0"
-
-RDEPEND="
- ${CDEPEND}
- >=virtual/jre-1.8:*"
-
-DEPEND="
- ${CDEPEND}
- >=virtual/jdk-1.8:*
- test? ( dev-java/ant-junit:0 )"
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_BUILD_TARGET="jars"
-EANT_TEST_TARGET="junit"
-EANT_GENTOO_CLASSPATH="iso-relax,jaxen-1.2,xalan"
-S="${WORKDIR}/${PN}-${MY_P}"
-
-PATCHES=(
- "${FILESDIR}/build-xml-2.patch"
-)
-
-src_prepare() {
- default
- java-pkg_clean
-
- # Remove Android stuff to avoid junit RDEPEND.
- rm -vr contrib/src/java/org/jdom2/contrib/android || die
-}
-
-src_install() {
- java-pkg_newjar build/package/${PN}-${SLOT}.x-????.??.??.??.??.jar ${PN}.jar
- java-pkg_newjar build/package/${PN}-${SLOT}.x-????.??.??.??.??-contrib.jar ${PN}-contrib.jar
-
- dodoc {CHANGES,COMMITTERS,README,TODO}.txt
- use doc && java-pkg_dojavadoc build/apidocs
- use source && java-pkg_dosrc {contrib,core}/src/java/*
-}
-
-src_test() {
- java-pkg-2_src_test
-}
diff --git a/dev-java/jdom/jdom-2.0.6.1.ebuild b/dev-java/jdom/jdom-2.0.6.1.ebuild
new file mode 100644
index 00000000000..5cbdaa66520
--- /dev/null
+++ b/dev-java/jdom/jdom-2.0.6.1.ebuild
@@ -0,0 +1,97 @@
+# 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.jdom:jdom2:2.0.6.1"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Java-based solution for accessing, manipulating, and outputting XML data"
+HOMEPAGE="http://www.jdom.org"
+SRC_URI="https://github.com/hunterhacker/jdom/archive/${PN^^}-${PV}.tar.gz"
+
+LICENSE="Apache-1.1"
+SLOT="2"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
+
+# FAILURES!!!
+# Tests run: 1887, Failures: 23
+RESTRICT="test"
+
+CP_DEPEND="
+ dev-java/iso-relax:0
+ dev-java/jaxen:1.2
+ dev-java/xalan:0
+"
+
+DEPEND="
+ >=virtual/jdk-1.8:*
+ ${CP_DEPEND}
+ test? (
+ dev-java/xerces:2
+ )
+"
+
+RDEPEND="
+ >=virtual/jre-1.8:*
+ ${CP_DEPEND}
+"
+
+S="${WORKDIR}/jdom-JDOM-${PV}"
+
+JAVA_TEST_SRC_DIR="test/src/java"
+JAVA_TEST_RESOURCE_DIRS="test/src/resources"
+JAVA_TEST_GENTOO_CLASSPATH="junit-4,xerces-2"
+
+src_prepare() {
+ default
+ java-pkg_clean
+
+ # Remove Android stuff to avoid junit RDEPEND.
+ rm -vr contrib/src/java/org/jdom2/contrib/android || die
+
+ # There are resources in JAVA_TEST_SRC_DIR
+ cp -r test/src/{java,resources}/org || die
+ # Remove .java files from JAVA_TEST_RESOURCE_DIRS
+ find test/src/resources -type f -name '*.java' -exec rm -rf {} + || die "deleting classes failed"
+}
+
+src_compile() {
+ JAVA_SRC_DIR="core/src/java"
+ JAVA_JAR_FILENAME="jdom.jar"
+ java-pkg-simple_src_compile
+ JAVA_GENTOO_CLASSPATH_EXTRA+=":jdom.jar"
+ rm -rf target || die
+
+ JAVA_SRC_DIR="contrib/src/java"
+ JAVA_RESOURCE_DIRS="contrib/src/resources"
+ JAVA_JAR_FILENAME="jdom-contrib.jar"
+ java-pkg-simple_src_compile
+ JAVA_GENTOO_CLASSPATH_EXTRA+=":jdom-contrib.jar"
+ rm -rf target || die
+
+ if use doc; then
+ JAVA_SRC_DIR=()
+ JAVA_SRC_DIR=(
+ "core/src/java"
+ "contrib/src/java"
+ )
+ JAVA_JAR_FILENAME="ignoreme.jar"
+ java-pkg-simple_src_compile
+ fi
+}
+
+src_install() {
+ default # https://bugs.gentoo.org/789582
+ java-pkg_dojar "jdom.jar"
+ java-pkg_dojar "jdom-contrib.jar"
+ if use doc; then
+ java-pkg_dojavadoc target/api
+ fi
+ if use source; then
+ java-pkg_dosrc "core/src/java/*" "contrib/src/java/*"
+ fi
+}
diff --git a/dev-java/jdom/metadata.xml b/dev-java/jdom/metadata.xml
index 129b89aa2cb..8495676e21f 100644
--- a/dev-java/jdom/metadata.xml
+++ b/dev-java/jdom/metadata.xml
@@ -8,4 +8,7 @@
<upstream>
<remote-id type="github">hunterhacker/jdom</remote-id>
</upstream>
+ <longdescription>
+ JDOM is a Java-oriented object model which models XML documents. It provides a Java-centric means of generating and manipulating XML documents. While JDOM interoperates well with existing standards such as the Simple API for XML (SAX) and the Document Object Model (DOM), it is not an abstraction layer or enhancement to those APIs. Rather, it seeks to provide a robust, light-weight means of reading and writing XML data without the complex and memory-consumptive options that current API offerings provide.
+ </longdescription>
</pkgmetadata>
diff --git a/dev-java/jempbox/Manifest b/dev-java/jempbox/Manifest
deleted file mode 100644
index 5fbc9f447dd..00000000000
--- a/dev-java/jempbox/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST pdfbox-1.7.1-src.zip 9167805 BLAKE2B f9e02d1540eaf7e4bb748906e56887494d81eecc88685fa9d758cb50712a530528573f4a7e5f816b4ff57d664a416b35444517d840c9b37239ec1e2b5a62b5a1 SHA512 8b2af3d8f431626c106e4f6e9e1d59d14abcd58cfdc9553f20c5057eef9f9cfbd0287e14e58e4d34472ad81198eb3f4d0a2fd6e88bd1fa5cbcf01e4befbf77d0
diff --git a/dev-java/jempbox/files/jempbox-1.7.1_maven-build.xml b/dev-java/jempbox/files/jempbox-1.7.1_maven-build.xml
deleted file mode 100644
index 453f9f69f66..00000000000
--- a/dev-java/jempbox/files/jempbox-1.7.1_maven-build.xml
+++ /dev/null
@@ -1,247 +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 8/2/12 4:32 PM -->
-<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/ -->
-<!-- -->
-<!-- ====================================================================== -->
-
-<project name="jempbox-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="jempbox-1.7.1"/>
- <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.1/junit-4.8.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.5"
- verbose="false"
- fork="false"
- source="1.5">
- <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.5"
- verbose="false"
- fork="false"
- source="1.5">
- <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"
- source="1.5"
- linksource="false"
- breakiterator="false">
- <link href="http://download.oracle.com/javase/1.5.0/docs/api/"/>
- </javadoc>
- </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">
- </jar>
- </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.1"/>
- <get src="http://repository.apache.org/snapshots/junit/junit/4.8.1/junit-4.8.1.jar"
- dest="${maven.repo.local}/junit/junit/4.8.1/junit-4.8.1.jar"
- usetimestamp="false"
- ignoreerrors="true"/>
- <get src="http://repo.maven.apache.org/maven2/junit/junit/4.8.1/junit-4.8.1.jar"
- dest="${maven.repo.local}/junit/junit/4.8.1/junit-4.8.1.jar"
- usetimestamp="false"
- ignoreerrors="true"/>
- </target>
-
-</project>
diff --git a/dev-java/jempbox/jempbox-1.7.1-r1.ebuild b/dev-java/jempbox/jempbox-1.7.1-r1.ebuild
deleted file mode 100644
index 12e0360d573..00000000000
--- a/dev-java/jempbox/jempbox-1.7.1-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2019 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
-
-MY_PN=pdfbox
-
-DESCRIPTION="An open source Java library for parsing font files"
-HOMEPAGE="https://pdfbox.apache.org/"
-SRC_URI="mirror://apache/${MY_PN}/${PV}/${MY_PN}-${PV}-src.zip"
-
-LICENSE="BSD"
-SLOT="1.7"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
- >=virtual/jre-1.8"
-DEPEND="
- >=virtual/jdk-1.8
- app-arch/unzip
- test? ( dev-java/ant-junit:0 )"
-
-S="${WORKDIR}/${MY_PN}-${PV}/${PN}"
-
-src_prepare() {
- default
-
- cp -v "${FILESDIR}"/${P}_maven-build.xml build.xml || die
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-
-src_test() {
- java-pkg-2_src_test
-}
-
-src_install() {
- java-pkg_newjar target/${P}.jar ${PN}.jar
-
- use doc && java-pkg_dojavadoc target/site/apidocs
- use source && java-pkg_dosrc src/main/java/org
-}
diff --git a/dev-java/jffi/Manifest b/dev-java/jffi/Manifest
index bf473974afc..46f96ebc4d8 100644
--- a/dev-java/jffi/Manifest
+++ b/dev-java/jffi/Manifest
@@ -1,2 +1,3 @@
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.3.8-GNUmakefile.patch b/dev-java/jffi/files/jffi-1.3.8-GNUmakefile.patch
new file mode 100644
index 00000000000..0e42b385e7b
--- /dev/null
+++ b/dev-java/jffi/files/jffi-1.3.8-GNUmakefile.patch
@@ -0,0 +1,28 @@
+diff --git a/jni/GNUmakefile b/jni/GNUmakefile
+index cfe570a..c8bbb51 100755
+--- a/jni/GNUmakefile
++++ b/jni/GNUmakefile
+@@ -278,7 +278,7 @@ 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) $@
+ ifeq ($(OS), darwin)
+ codesign -s - $@
+@@ -287,10 +287,14 @@ endif
+ $(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/jffi-1.3.9-r1.ebuild b/dev-java/jffi/jffi-1.3.9-r1.ebuild
new file mode 100644
index 00000000000..0655be95b31
--- /dev/null
+++ b/dev-java/jffi/jffi-1.3.9-r1.ebuild
@@ -0,0 +1,99 @@
+# 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:*
+ >=dev-libs/libffi-3.4.2-r2:="
+RDEPEND=">=virtual/jre-1.8:*
+ >=dev-libs/libffi-3.4.2-r2:="
+
+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/jffi/jffi-1.3.9.ebuild b/dev-java/jffi/jffi-1.3.9.ebuild
new file mode 100644
index 00000000000..d74a2940741
--- /dev/null
+++ b/dev-java/jffi/jffi-1.3.9.ebuild
@@ -0,0 +1,97 @@
+# 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/jgraph/Manifest b/dev-java/jgraph/Manifest
deleted file mode 100644
index 82c33950366..00000000000
--- a/dev-java/jgraph/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST jgraph-5.12.0.4.jar 3460750 BLAKE2B 0d2c50673eb652e4335a2d4fe9edcd93745595302c9ce674e8bb05ceab5edcb6b4a190e4d4da14bdb552ca7d35421473d0931addb02c2d1326d81eb442c372d1 SHA512 0832afeb28c4d5abb9288de4e1b74eefc432bb98f622e71f0d192bf9f01741feb406ba0473b923e0cb93401120c1456a00eec4653355c37bff7e9e1863e81b5d
diff --git a/dev-java/jgraph/jgraph-5.12.0.4-r1.ebuild b/dev-java/jgraph/jgraph-5.12.0.4-r1.ebuild
deleted file mode 100644
index 1681ab0b8ef..00000000000
--- a/dev-java/jgraph/jgraph-5.12.0.4-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Open-source graph component for Java"
-SRC_URI="mirror://gentoo/${P}.jar"
-HOMEPAGE="https://www.jgraph.com"
-IUSE="doc examples source"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-DEPEND="
- >=virtual/jdk-1.8"
-
-RDEPEND="
- >=virtual/jre-1.8"
-
-DOCS=( README WHATSNEW LICENSE ChangeLog )
-
-S="${WORKDIR}"
-
-JAVA_SRC_DIR="src"
-
-src_prepare() {
- default
-
- java-pkg_clean
-}
diff --git a/dev-java/jmh-core/Manifest b/dev-java/jmh-core/Manifest
index 9784eb312ca..918f4672b6d 100644
--- a/dev-java/jmh-core/Manifest
+++ b/dev-java/jmh-core/Manifest
@@ -1,2 +1 @@
-DIST jmh-core-1.21.tar.gz 615305 BLAKE2B 1a5cfe9784efe0cd7706382eaa89c8bcce0efcce3c2b802ce0772992dd16f0c6900a47d70b72d1c556584adb8afda442f49267ad4e0b53d04c20026979787210 SHA512 ac51d58d9b746157842a3bc9c4828bbff52c5882582e123e04b5ab6c4bfc1ff3cad1f6023ab1fe1eccfa68c73ffbd21b34388547bba544626af87092852ec166
DIST jmh-core-1.35.tar.gz 645087 BLAKE2B ce33167a58c2eaf64c38148f27493c86ac9c0084cb58a438b49148b41d3e2db66d8a78e0be8a78db39aebf06fc0b5767be61100b22ce77e018ac8ca29c05c17f SHA512 53ce7300f5e10f1efcb639f0d4d01adad48cadc8daea2e00db34113e42b192e49a6a04cc2b5fd4d291ac81a73a5b30613d22390722d35f54139f14ebbb01013c
diff --git a/dev-java/jmh-core/jmh-core-1.21.ebuild b/dev-java/jmh-core/jmh-core-1.21.ebuild
deleted file mode 100644
index 8d9d4c30c7d..00000000000
--- a/dev-java/jmh-core/jmh-core-1.21.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# Hash of tag, download not available via ${PV}
-MY_PN="jmh"
-MY_PV="f25ae8584db1"
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Harness for building, running, and analysing nano/micro/milli/macro benchmarks"
-HOMEPAGE="https://openjdk.java.net/projects/code-tools/jmh"
-SRC_URI="https://hg.openjdk.java.net/code-tools/${MY_PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-# jopt *must* be 4.6, see https://mail.openjdk.java.net/pipermail/jmh-dev/2016-October/002395.html
-CP_DEPEND="
- dev-java/asm:4
- dev-java/junit:4
- dev-java/commons-math:3
- dev-java/jopt-simple:4.6"
-
-DEPEND=">=virtual/jdk-1.7
- ${CP_DEPEND}"
-
-RDEPEND=">=virtual/jre-1.7
- ${CP_DEPEND}"
-
-S="${WORKDIR}/${MY_PN}-${MY_PV}/${PN}"
diff --git a/dev-java/jmh-core/jmh-core-1.35.ebuild b/dev-java/jmh-core/jmh-core-1.35.ebuild
index 0b99465b006..6d518ed16c0 100644
--- a/dev-java/jmh-core/jmh-core-1.35.ebuild
+++ b/dev-java/jmh-core/jmh-core-1.35.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/openjdk/jmh/archive/${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/commons-math:3
diff --git a/dev-java/jna/Manifest b/dev-java/jna/Manifest
index 516edfa4d5b..8790b86f56d 100644
--- a/dev-java/jna/Manifest
+++ b/dev-java/jna/Manifest
@@ -1,3 +1 @@
-DIST jna-4.2.2.tar.gz 58638853 BLAKE2B 3941202ad7839f748c65f1abf53a335f6de7959def06de27a30520457147af3f70f6de54d640718b8314f6e61ab61ee9b26c39812d5cb1f918b8ff714d6b902e SHA512 11ab524f87f6dc7fe3ac8eb0620f9ba392445147770304be7b7fa5cd49de8efed983ad30c16077bfa6419eaf1ff50311a3ded811a78fdcd09bc686ef93ad7f9f
-DIST jna-5.10.0.tar.gz 106258319 BLAKE2B f5605fd91bacc1e900e835494c27b0fdb4ba91b0c04bad1757133bed5938603264ce9fba89c5ce7e4644456b752b934f6e205d0131659e77bf0c58c2b44c61cd SHA512 93e1ab659a60d711557eb93620bcbd05f3dbe9c739b256cfb647d8ac2a4038d0bc638c614b58339b2875017ac18b219a4ddeb0d92e5ca25fef2e326bc14ae256
DIST jna-5.11.0.tar.gz 107424072 BLAKE2B 9f79a0b0e643c8213c159785814dffaeee2dc3b332647c5c887aa5a6e707be5241d392e75730b803b21362fcbdcee82d7049bcdfb7956039f1534e3cd8e170cf SHA512 0122b56c24125e5dea541bee71b43f127df50c8f90b2c240271c677a8d598d9640bb920bd3390856124e8b1bc89a9bd41d2b6c569ae7275f68a13c08fd07027d
diff --git a/dev-java/jna/files/4.2.2-build.xml.patch b/dev-java/jna/files/4.2.2-build.xml.patch
deleted file mode 100644
index de49c24b191..00000000000
--- a/dev-java/jna/files/4.2.2-build.xml.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/build.xml 2016-03-16 14:37:28.000000000 +0000
-+++ b/build.xml 2016-04-16 22:22:27.692967205 +0100
-@@ -320,7 +320,9 @@
- <pathelement path="${build}/${jar}"/>
- <pathelement path="${test.classes}"/>
- <pathelement path="${build}/${testjar}"/>
-+ <!--
- <pathelement path="lib/clover.jar"/>
-+ -->
- <path refid="test.libs"/>
- </path>
- </target>
-@@ -909,8 +911,10 @@
- <mkdir dir="${build}/jws"/>
- <copy todir="${build}/jws" file="${build}/${jar}"/>
- <copy todir="${build}/jws" file="${build}/${testjar}"/>
-+ <!--
- <copy todir="${build}/jws" file="lib/junit.jar"/>
- <copy todir="${build}/jws" file="lib/clover.jar"/>
-+ -->
- <jar jarfile="${build}/jws/jnidispatch.jar">
- <fileset dir="${build.native}" includes="*jnidispatch.*"/>
- </jar>
diff --git a/dev-java/jna/files/4.2.2-makefile-flags.patch b/dev-java/jna/files/5.11.0-makefile-flags.patch
index 3e290ece4e7..4a84abebf45 100644
--- a/dev-java/jna/files/4.2.2-makefile-flags.patch
+++ b/dev-java/jna/files/5.11.0-makefile-flags.patch
@@ -1,6 +1,6 @@
---- a/native/Makefile 2016-03-16 14:37:28.000000000 +0000
-+++ b/native/Makefile 2016-04-16 22:27:06.426345376 +0100
-@@ -81,7 +81,7 @@
+--- a/native/Makefile
++++ b/native/Makefile
+@@ -81,7 +81,7 @@ LIBPFX=lib
LIBSFX=.so
ARSFX=.a
JNISFX=$(LIBSFX)
@@ -9,7 +9,7 @@
LD=$(CC)
LIBS=
# Default to Sun recommendations for JNI compilation
-@@ -94,10 +94,10 @@
+@@ -94,10 +94,10 @@ CFLAGS_EXTRA=
COUT=-o $@
CINCLUDES=$(JAVA_INCLUDES) -I"$(JAVAH)" -I$(FFI_BUILD)/include
CDEFINES=-D_REENTRANT
@@ -23,3 +23,12 @@
ifeq ($(DYNAMIC_LIBFFI),true)
CFLAGS += $(shell pkg-config --cflags libffi 2>/dev/null || echo)
LIBS += $(shell pkg-config --libs libffi 2>/dev/null || echo -lffi)
+@@ -108,7 +108,7 @@ endif
+ # Avoid bug in X11-based 1.5/1.6 VMs; dynamically load instead of linking
+ # See http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6539705
+ #LIBS=-L"$(LIBDIR)" -ljawt
+-STRIP=strip -x
++STRIP?=strip -x
+ # end defaults
+
+ # Android build (cross-compile) requires the android NDK.
diff --git a/dev-java/jna/jna-4.2.2-r3.ebuild b/dev-java/jna/jna-4.2.2-r3.ebuild
deleted file mode 100644
index 2950dfd0edb..00000000000
--- a/dev-java/jna/jna-4.2.2-r3.ebuild
+++ /dev/null
@@ -1,87 +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="net.java.dev.jna:jna:4.2.2"
-
-inherit java-pkg-2 java-ant-2 toolchain-funcs
-
-DESCRIPTION="Java Native Access (JNA)"
-HOMEPAGE="https://github.com/java-native-access/jna"
-SRC_URI="https://github.com/java-native-access/jna/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="4"
-KEYWORDS="amd64 ppc64 x86"
-IUSE="+awt +nio-buffers test"
-
-REQUIRED_USE="test? ( awt nio-buffers )"
-
-# The tests stall immediately on some systems (not current stable?) when
-# the sandbox is active but pass successfully otherwise. Chewi has not
-# been able to determine why. This began in 4.2.0 as 4.1.0 worked
-# fine. Someone bisect it please. :)
-RESTRICT="test"
-
-CDEPEND="dev-libs/libffi:="
-DEPEND="${CDEPEND}
- virtual/jdk:1.8
- x11-libs/libXt
- test? (
- dev-java/ant-junit:0
- dev-java/guava:20
- dev-java/javassist:3
- dev-java/reflections:0
- )"
-RDEPEND="${CDEPEND}
- virtual/jre:1.8"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
- "${FILESDIR}"/${PV}-build.xml.patch
- "${FILESDIR}"/${PV}-makefile-flags.patch
-)
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_BUILD_TARGET="native jar contrib-jars"
-EANT_EXTRA_ARGS="-Ddynlink.native=true"
-EANT_TEST_EXTRA_ARGS="-Dheadless=true -Djava.io.tmpdir=${T}"
-EANT_TEST_GENTOO_CLASSPATH="guava-20,javassist-3,reflections"
-
-src_prepare() {
- default
-
- # delete bundled jars and copy of libffi
- # except native jars because build.xml needs them all
- find ! -path "./lib/native/*" -name "*.jar" -delete || die
- rm -r native/libffi || die
-
- if ! use awt ; then
- sed -i -E "s/^(CDEFINES=.*)/\1 -DNO_JAWT/g" native/Makefile || die
- fi
-
- if ! use nio-buffers ; then
- sed -i -E "s/^(CDEFINES=.*)/\1 -DNO_NIO_BUFFERS/g" native/Makefile || die
- fi
-
- java-pkg-2_src_prepare
-}
-
-src_configure() {
- tc-export CC
-}
-
-src_install() {
- java-pkg_newjar build/${PN}-min.jar
- java-pkg_dojar contrib/platform/dist/${PN}-platform.jar
- java-pkg_doso build/native-*/libjnidispatch.so
-
- use source && java-pkg_dosrc src/*
- use doc && java-pkg_dojavadoc doc/javadoc
-}
-
-src_test() {
- java-pkg-2_src_test
-}
diff --git a/dev-java/jna/jna-5.10.0.ebuild b/dev-java/jna/jna-5.10.0.ebuild
deleted file mode 100644
index 1d15c940f05..00000000000
--- a/dev-java/jna/jna-5.10.0.ebuild
+++ /dev/null
@@ -1,99 +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 test"
-MAVEN_ID="net.java.dev.jna:jna:5.10.0"
-
-inherit java-pkg-2 java-ant-2 toolchain-funcs
-
-DESCRIPTION="Java Native Access"
-HOMEPAGE="https://github.com/java-native-access/jna"
-SRC_URI="https://github.com/java-native-access/jna/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="|| ( Apache-2.0 LGPL-2.1+ )"
-SLOT="4"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-
-BDEPEND="
- virtual/pkgconfig
-"
-
-CDEPEND="
- >=dev-libs/libffi-3.4:=
-"
-
-DEPEND="
- >=virtual/jdk-1.8:*
- dev-java/animal-sniffer-annotations:0
- dev-java/ant-core:0
- dev-java/asm:9
- test? (
- dev-java/ant-junit4:0
- dev-java/junit:4
- dev-java/reflections:0
- )
- ${CDEPEND}
- x11-libs/libXt
-"
-
-RDEPEND="
- >=virtual/jre-1.8:*
- ${CDEPEND}
-"
-
-DOCS=( README.md CHANGES.md OTHERS TODO )
-PATCHES=(
- "${FILESDIR}/${PV}-build.xml.patch"
- "${FILESDIR}/4.2.2-makefile-flags.patch"
-)
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-JAVA_PKG_BSFIX_NAME="build.xml build-ant-tools.xml"
-EANT_BUILD_TARGET="jar contrib-jars"
-EANT_EXTRA_ARGS="-Dbuild-native=true -Dcompatibility=1.8 -Ddynlink.native=true"
-EANT_TEST_EXTRA_ARGS="-Djava.io.tmpdir=\"${T}\""
-EANT_TEST_GENTOO_CLASSPATH="animal-sniffer-annotations,reflections"
-
-pkg_setup() {
- java-pkg-2_pkg_setup
-
- EANT_GENTOO_CLASSPATH_EXTRA="$(java-pkg_getjars --build-only \
- animal-sniffer-annotations,ant-core,asm-9)"
-
- # Any spaces in paths returned by toolchain-funcs and options like MAKEOPTS
- # could cause trouble in EANT_EXTRA_ARGS when Java eclasses process the
- # variable's value, so define them in ANT_OPTS instead
- ANT_OPTS="-DCC='$(tc-getCC)'"
- # Parallel build does not respect dependency relationships between objects
- ANT_OPTS+=" -DEXTRA_MAKE_OPTS='${MAKEOPTS} -j1'"
-}
-
-src_prepare() {
- default
-
- # Eliminate build.xml's dependency on bundled native JARs
- sed -i -e '/zipfileset src="${lib.native}/,+2d' build.xml ||
- die "Failed to delete lines referencing bundled JARs in build.xml"
-
- # Clean up bundled JARs and libffi
- java-pkg_clean
- rm -r native/libffi || die "Failed to remove bundled libffi"
-
- java-pkg-2_src_prepare
-}
-
-src_test() {
- java-pkg-2_src_test
-}
-
-src_install() {
- java-pkg_newjar "build/${PN}-min.jar"
- java-pkg_dojar "contrib/platform/dist/${PN}-platform.jar"
- java-pkg_doso build/native-*/libjnidispatch.so
- einstalldocs
-
- use source && java-pkg_dosrc src/*
- use doc && java-pkg_dojavadoc doc/javadoc
-}
diff --git a/dev-java/jna/jna-5.11.0.ebuild b/dev-java/jna/jna-5.11.0-r1.ebuild
index be8f367f117..d1b4898f918 100644
--- a/dev-java/jna/jna-5.11.0.ebuild
+++ b/dev-java/jna/jna-5.11.0-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/java-native-access/jna/archive/refs/tags/${PV}.tar.g
LICENSE="|| ( Apache-2.0 LGPL-2.1+ )"
SLOT="4"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
BDEPEND="
virtual/pkgconfig
@@ -46,7 +46,7 @@ RDEPEND="
DOCS=( README.md CHANGES.md OTHERS TODO )
PATCHES=(
"${FILESDIR}/5.10.0-build.xml.patch"
- "${FILESDIR}/4.2.2-makefile-flags.patch"
+ "${FILESDIR}/5.11.0-makefile-flags.patch"
)
JAVA_ANT_REWRITE_CLASSPATH="true"
@@ -56,8 +56,8 @@ EANT_EXTRA_ARGS="-Dbuild-native=true -Dcompatibility=1.8 -Ddynlink.native=true"
EANT_TEST_EXTRA_ARGS="-Djava.io.tmpdir=\"${T}\""
EANT_TEST_GENTOO_CLASSPATH="animal-sniffer-annotations,reflections"
-pkg_setup() {
- java-pkg-2_pkg_setup
+src_prepare() {
+ default
EANT_GENTOO_CLASSPATH_EXTRA="$(java-pkg_getjars --build-only \
animal-sniffer-annotations,ant-core,asm-9)"
@@ -65,13 +65,9 @@ pkg_setup() {
# Any spaces in paths returned by toolchain-funcs and options like MAKEOPTS
# could cause trouble in EANT_EXTRA_ARGS when Java eclasses process the
# variable's value, so define them in ANT_OPTS instead
- ANT_OPTS="-DCC='$(tc-getCC)'"
+ ANT_OPTS="-DCC='$(tc-getCC)' -DSTRIP='$(tc-getSTRIP)'"
# Parallel build does not respect dependency relationships between objects
ANT_OPTS+=" -DEXTRA_MAKE_OPTS='${MAKEOPTS} -j1'"
-}
-
-src_prepare() {
- default
# Eliminate build.xml's dependency on bundled native JARs
sed -i -e '/zipfileset src="${lib.native}/,+2d' build.xml ||
diff --git a/dev-java/jna/metadata.xml b/dev-java/jna/metadata.xml
index 6a68a977dd2..3966f68718c 100644
--- a/dev-java/jna/metadata.xml
+++ b/dev-java/jna/metadata.xml
@@ -5,10 +5,6 @@
<email>java@gentoo.org</email>
<name>Java</name>
</maintainer>
- <use>
- <flag name="awt">Enables support for Java AWT</flag>
- <flag name="nio-buffers">Enables support for NIO buffers</flag>
- </use>
<upstream>
<remote-id type="github">twall/jna</remote-id>
</upstream>
diff --git a/dev-java/jnr-ffi/Manifest b/dev-java/jnr-ffi/Manifest
index a62c50306aa..ea0315a2f0c 100644
--- a/dev-java/jnr-ffi/Manifest
+++ b/dev-java/jnr-ffi/Manifest
@@ -1,2 +1,2 @@
DIST jnr-ffi-2.0.2.tar.gz 170707 BLAKE2B fc4f1dcea51939b6098b980b4962380e58ba590ea9d4cdba7823c1372bd645d985ae25d8ebf1f0b575a0e4b5c192e5595094076d3cd44e4bb3c077dd838c170f SHA512 80a932408f5ceaf19fd7a399b786aa0d7b9251ea144bc2755bcf3cdc3aea85615a1faa001bbcd3072bc0eead2aaa30d0bbead5f96c82c4b9e455c1ed1379b4c0
-DIST jnr-ffi-2.2.8-sources.tar.gz 261959 BLAKE2B 16f7b89c88a61fa07da65d4e5287258f96550b93898bb7313ddd62d1f002276da86aca2c79874eccb466eaebcad5181ff33539996a6558b6d79ce9280cf9c0a9 SHA512 15187d90f15ad82cb6cac0617806ab7d0322bfcb4f44523f2272f93f19ec115625806c9d450bffaa57db32c70906328c8edc905046465b0ec3eb6ff52e500b42
+DIST jnr-ffi-2.2.12.tar.gz 285324 BLAKE2B 32e866654b901ded7cdc82999d79873d49bd9d3599d265e9d029e7cf8ce1895f9e830a1af75b8c149c3debc5f3d256f6241d706ecbd94277ce1fa49a2868885c SHA512 420adb647c5d0547f0b18e4f8a21096da9aaebbdf0e50761ec1fd6be64ad29649c7af4d6daf0a8c4c38e02a05e0df836de6fdb7776f10c02d8bfd447a11882b3
diff --git a/dev-java/jnr-ffi/jnr-ffi-2.2.12.ebuild b/dev-java/jnr-ffi/jnr-ffi-2.2.12.ebuild
new file mode 100644
index 00000000000..aec229af630
--- /dev/null
+++ b/dev-java/jnr-ffi/jnr-ffi-2.2.12.ebuild
@@ -0,0 +1,47 @@
+# 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/jnr-ffi/archive/jnr-ffi-2.2.12.tar.gz --slot 2 --keywords "~amd64 ~arm64 ~ppc64 ~x86" --ebuild jnr-ffi-2.2.12.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="com.github.jnr:jnr-ffi:2.2.12"
+# We don't have junit-jupiter yet
+# JAVA_TESTING_FRAMEWORKS="junit-jupiter"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="A library for invoking native functions from java"
+HOMEPAGE="https://github.com/jnr/jnr-ffi"
+SRC_URI="https://github.com/jnr/${PN}/archive/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="2"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
+
+CP_DEPEND="
+ dev-java/asm:9
+ >=dev-java/jffi-1.3.8:1.3
+ dev-java/jnr-a64asm:2
+ dev-java/jnr-x86asm:1.0
+"
+
+DEPEND="${CP_DEPEND}
+ >=virtual/jdk-1.8:*"
+
+RDEPEND="${CP_DEPEND}
+ >=virtual/jre-1.8:*"
+
+S="${WORKDIR}/${PN}-${P}"
+
+JAVA_SRC_DIR="src/main/java"
+
+# JAVA_TEST_GENTOO_CLASSPATH="!!!groupId-not-found!!!"
+# JAVA_TEST_SRC_DIR="src/test/java"
+
+src_install() {
+ default # https://bugs.gentoo.org/789582
+ java-pkg-simple_src_install
+}
diff --git a/dev-java/jnr-ffi/jnr-ffi-2.2.8.ebuild b/dev-java/jnr-ffi/jnr-ffi-2.2.8.ebuild
deleted file mode 100644
index e577aeebbf6..00000000000
--- a/dev-java/jnr-ffi/jnr-ffi-2.2.8.ebuild
+++ /dev/null
@@ -1,63 +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/jnr-ffi/archive/refs/tags/jnr-ffi-2.2.8.tar.gz --slot 2 --keywords "~amd64 ~arm64 ~ppc64 ~x86" --ebuild jnr-ffi-2.2.8.ebuild
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source"
-MAVEN_ID="com.github.jnr:jnr-ffi:2.2.8"
-# no junit-jupiter in ::gentoo
-# JAVA_TESTING_FRAMEWORKS="junit-jupiter"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="A library for invoking native functions from java"
-HOMEPAGE="https://github.com/jnr/jnr-ffi"
-SRC_URI="https://github.com/jnr/${PN}/archive/refs/tags/${P}.tar.gz -> ${P}-sources.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="2"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-
-# Common dependencies
-# POM: pom.xml
-# com.github.jnr:jffi:1.3.6 -> >=dev-java/jffi-1.3.6:1.2
-# com.github.jnr:jnr-a64asm:1.0.0 -> >=dev-java/jnr-a64asm-1.0.0:2
-# com.github.jnr:jnr-x86asm:1.0.2 -> >=dev-java/jnr-x86asm-1.0.2:1.0
-# org.ow2.asm:asm:9.2 -> >=dev-java/asm-9.2:9
-# org.ow2.asm:asm-analysis:9.2 -> >=dev-java/asm-analysis-9.2:`ver_cut 1`
-# org.ow2.asm:asm-commons:9.2 -> >=dev-java/asm-commons-9.2:`ver_cut 1`
-# org.ow2.asm:asm-tree:9.2 -> >=dev-java/asm-tree-9.2:`ver_cut 1`
-# org.ow2.asm:asm-util:9.2 -> >=dev-java/asm-util-9.2:`ver_cut 1`
-
-CDEPEND="
- dev-java/asm:9
- dev-java/asm-analysis:9
- dev-java/asm-commons:9
- dev-java/asm-tree:9
- dev-java/asm-util:9
- >=dev-java/jffi-1.3.6:1.2
- dev-java/jnr-a64asm:2
- dev-java/jnr-x86asm:1.0
-"
-
-DEPEND="${CDEPEND}
- >=virtual/jdk-1.8:*"
-
-# Runtime dependencies
-# POM: pom.xml
-# com.github.jnr:jffi:1.3.6 -> >=dev-java/jffi-1.3.6:1.2
-
-RDEPEND="
- ${CDEPEND}>=virtual/jre-1.8:*
- >=dev-java/jffi-1.3.6:1.2"
-
-S="${WORKDIR}/${PN}-${P}"
-
-JAVA_GENTOO_CLASSPATH="jffi-1.2,jnr-a64asm-2,jnr-x86asm-1.0,asm-9,asm-analysis-9,asm-commons-9,asm-tree-9,asm-util-9,jffi-1.2"
-# no junit-jupiter in ::gentoo
-JAVA_SRC_DIR="src/main/java"
-
-# JAVA_TEST_GENTOO_CLASSPATH="!!!groupId-not-found!!!"
-# JAVA_TEST_SRC_DIR="src/test/java"
diff --git a/dev-java/jnr-netdb/Manifest b/dev-java/jnr-netdb/Manifest
index 1ca6fa73f8e..9ac877e87be 100644
--- a/dev-java/jnr-netdb/Manifest
+++ b/dev-java/jnr-netdb/Manifest
@@ -1 +1,2 @@
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/jnr-netdb-1.2.0.ebuild b/dev-java/jnr-netdb/jnr-netdb-1.2.0.ebuild
new file mode 100644
index 00000000000..03d46d9a763
--- /dev/null
+++ b/dev-java/jnr-netdb/jnr-netdb-1.2.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Network services database access for java"
+HOMEPAGE="https://github.com/jnr/jnr-netdb"
+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"
+
+CP_DEPEND="
+ dev-java/jnr-ffi:2"
+
+RDEPEND="${CP_DEPEND}
+ >=virtual/jre-1.8:*"
+
+DEPEND="${CP_DEPEND}
+ >=virtual/jdk-1.8:*"
+
+S="${WORKDIR}/${PN}-${P}"
+
+JAVA_SRC_DIR="src/main/java"
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_SRC_DIR="src/test/java"
+
+src_prepare() {
+ default
+ java-pkg_clean
+}
+
+src_install() {
+ default # https://bugs.gentoo.org/789582
+ java-pkg-simple_src_install
+}
diff --git a/dev-java/jnr-posix/Manifest b/dev-java/jnr-posix/Manifest
index 8d1346b1a5b..2e180c60d0a 100644
--- a/dev-java/jnr-posix/Manifest
+++ b/dev-java/jnr-posix/Manifest
@@ -1 +1,2 @@
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
new file mode 100644
index 00000000000..eba2a6fc450
--- /dev/null
+++ b/dev-java/jnr-posix/files/jnr-posix-3.1.15-FileTest.patch
@@ -0,0 +1,48 @@
+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();
+ }
+
+- @Test
++ @Ignore @Test
+ public void flockTest() throws Throwable {
+ if (!Platform.IS_WINDOWS) {
+ File tmp = File.createTempFile("flockTest", "tmp");
+@@ -236,7 +237,7 @@ public class FileTest {
+ }
+ }
+
+- @Test
++ @Ignore @Test
+ public void dupTest() throws Throwable {
+ File tmp = File.createTempFile("dupTest", "tmp");
+ RandomAccessFile raf = new RandomAccessFile(tmp, "rw");
+@@ -303,7 +304,7 @@ public class FileTest {
+ }
+ }
+
+- @Test
++ @Ignore @Test
+ public void fcntlDupfdWithArgTest() throws Throwable {
+ if (!Platform.IS_WINDOWS) {
+ File tmp = File.createTempFile("dupTest", "tmp");
+@@ -327,7 +328,7 @@ public class FileTest {
+ }
+ }
+
+- @Test
++ @Ignore @Test
+ public void closeTest() throws Throwable {
+ File tmp = File.createTempFile("closeTest", "tmp");
+ int fd = getFdFromDescriptor(JavaLibCHelper.getDescriptorFromChannel(new RandomAccessFile(tmp, "rw").getChannel()));
diff --git a/dev-java/jnr-posix/jnr-posix-3.1.15.ebuild b/dev-java/jnr-posix/jnr-posix-3.1.15.ebuild
new file mode 100644
index 00000000000..3f90b95f350
--- /dev/null
+++ b/dev-java/jnr-posix/jnr-posix-3.1.15.ebuild
@@ -0,0 +1,65 @@
+# 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/jnr-posix/archive/jnr-posix-3.1.15.tar.gz --slot 3.0 --keywords "~amd64 ~arm64 ~ppc64 ~x86" --ebuild jnr-posix-3.1.15.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="com.github.jnr:jnr-posix:3.1.15"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Common cross-project/cross-platform POSIX APIs"
+HOMEPAGE="https://github.com/jnr/jnr-posix"
+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"
+
+CP_DEPEND="
+ >=dev-java/jnr-ffi-2.2.12:2
+ dev-java/jnr-constants:0
+"
+
+DEPEND="${CP_DEPEND}
+ >=virtual/jdk-11:*"
+
+RDEPEND="${CP_DEPEND}
+ >=virtual/jre-1.8:*"
+
+S="${WORKDIR}/${PN}-${P}"
+
+JAVA_SRC_DIR="src/main/java"
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_SRC_DIR="src/test/java"
+
+src_test() {
+ JAVA_TEST_EXCLUDES=(
+ # https://github.com/jnr/jnr-posix/blob/jnr-posix-3.1.15/pom.xml#L185
+ # <exclude>**/windows/*Test.java</exclude>
+ "jnr.posix.windows.WindowsFileTest"
+ "jnr.posix.windows.WindowsHelpersTest"
+ # Next 3 tests need to run separately, otherwise would fail.
+ "jnr.posix.GroupTest"
+ "jnr.posix.NlLanginfoTest"
+ "jnr.posix.SpawnTest"
+ )
+ local vm_version="$(java-config -g PROVIDES_VERSION)"
+ if [[ "${vm_version}" -ge "17" ]] ; then
+ JAVA_TEST_EXTRA_ARGS+=( --add-opens=java.base/java.io=ALL-UNNAMED )
+ # Some tests in jnr.posix.FileTest fail with jdk-17
+ eapply "${FILESDIR}/jnr-posix-3.1.15-FileTest.patch"
+ fi
+ java-pkg-simple_src_test
+ JAVA_TEST_RUN_ONLY="jnr.posix.SpawnTest"
+ java-pkg-simple_src_test
+ JAVA_TEST_RUN_ONLY="jnr.posix.NlLanginfoTest"
+ java-pkg-simple_src_test
+ JAVA_TEST_RUN_ONLY="jnr.posix.GroupTest"
+ java-pkg-simple_src_test
+}
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
new file mode 100644
index 00000000000..6c9ea47fa60
--- /dev/null
+++ b/dev-java/joda-convert/joda-convert-2.2.2-r2.ebuild
@@ -0,0 +1,65 @@
+# 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-11:*
+ test? (
+ dev-java/guava:0
+ )
+"
+
+RDEPEND="
+ >=virtual/jre-1.8:*
+"
+
+DOCS=( {NOTICE,RELEASE-NOTES}.txt README.md )
+
+S="${WORKDIR}/${P}"
+
+JAVA_SRC_DIR="src/main/java"
+
+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
+)
diff --git a/dev-java/joda-time/Manifest b/dev-java/joda-time/Manifest
index a0252fc3468..ca62ba31e7a 100644
--- a/dev-java/joda-time/Manifest
+++ b/dev-java/joda-time/Manifest
@@ -1 +1,2 @@
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
diff --git a/dev-java/joda-time/joda-time-2.10.14.ebuild b/dev-java/joda-time/joda-time-2.10.14.ebuild
new file mode 100644
index 00000000000..23de2c024ab
--- /dev/null
+++ b/dev-java/joda-time/joda-time-2.10.14.ebuild
@@ -0,0 +1,80 @@
+# 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-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
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="joda-time:joda-time:2.10.1r40"
+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/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
+
+CP_DEPEND="
+ >=dev-java/joda-convert-2.2.2-r2:0
+"
+
+DEPEND="
+ >=virtual/jdk-1.8:*
+ ${CP_DEPEND}
+"
+
+RDEPEND="
+ >=virtual/jre-1.8:*
+ ${CP_DEPEND}"
+
+S="${WORKDIR}/${P}"
+
+JAVA_SRC_DIR="src/main/java"
+JAVA_RESOURCE_DIRS="src/main/res"
+JAVA_AUTOMATIC_MODULE_NAME="org.joda.time"
+
+JAVA_TEST_GENTOO_CLASSPATH="junit"
+JAVA_TEST_SRC_DIR="src/test/java"
+JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+
+src_prepare() {
+ default
+ # move .properties files to JAVA_RESOURCE_DIRS
+ mkdir -p src/main/res
+ cp -r src/main/{java/*,res} || die
+ find src/main/res -type f ! -name '*.properties' -exec rm -rf {} + || die
+}
+
+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 "src/main/res/org/joda/time/tz/data" \
+ africa \
+ antarctica \
+ asia \
+ australasia \
+ europe \
+ northamerica \
+ southamerica \
+ 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
+}
diff --git a/dev-java/jopt-simple/Manifest b/dev-java/jopt-simple/Manifest
index 5e45f7495c7..cfeed4629d9 100644
--- a/dev-java/jopt-simple/Manifest
+++ b/dev-java/jopt-simple/Manifest
@@ -1,2 +1 @@
-DIST jopt-simple-4.6.tar.gz 107082 BLAKE2B 622144647b24049861398cc99ca3cc268baae045f8ca23cdd5bddb2e656bc97d17397ae752ca9a6edc91b8486e1e55ce19ba335d2afadf6c6df4f858faf43a1e SHA512 c2f467521f6419f91206f6036d420671b02106beadff3fc51d1893e6f3f6302b8fcbb31957327b9e40cbfd7a7d55030e0c999d9570d7e29fe7a4375bab10ed76
-DIST jopt-simple-5.0.tar.gz 119502 BLAKE2B 975a0d338fa3154963954fd3b218c944dded023b3a2da59ee2671c73450a578dbf1aee8e52b9f715839e15c1937e0a493c4b37518b73038aa017e1d0ec1ca06a SHA512 f440c62cb307aad7cab64f091c82f78e11a117e60aaadf71883c149a622576531272de3d67859f6df093df658bb0bfb435d9bb33bc729bcda24dcc99d27369ff
+DIST jopt-simple-5.0.4.tar.gz 120388 BLAKE2B b9eec360f9399a40fa8fe33f14708c14a45689eb78efcdf99f27d666168d67f2670b4aa5bd6e7f26ddff72565107f1359214c808281918947d66874bde237b86 SHA512 ae4274bb4b3e2584dc6fb4370c4d63f9b95e63ff2cd124f92f8ad6e3a4a3dd91cd9e9b70ac423a560d52039508549a5319bb23035215b4a191c4fdc0f0e082d5
diff --git a/dev-java/jopt-simple/jopt-simple-4.6-r1.ebuild b/dev-java/jopt-simple/jopt-simple-4.6-r1.ebuild
deleted file mode 100644
index 131323ebb6b..00000000000
--- a/dev-java/jopt-simple/jopt-simple-4.6-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
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="A Java library for parsing command line options"
-HOMEPAGE="https://jopt-simple.github.io/jopt-simple/"
-SRC_URI="https://github.com/jopt-simple/jopt-simple/archive/refs/tags/jopt-simple-${PV}.tar.gz"
-
-LICENSE="MIT"
-SLOT="4.6"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-RDEPEND=">=virtual/jre-1.8:*"
-DEPEND=">=virtual/jdk-1.8:*"
-
-JAVA_SRC_DIR="src/main/java"
-
-S="${WORKDIR}/${PN}-${PN}-8808a39"
diff --git a/dev-java/jopt-simple/jopt-simple-5.0-r1.ebuild b/dev-java/jopt-simple/jopt-simple-5.0.4.ebuild
index 62a6e8d2b8b..1ac84e768ee 100644
--- a/dev-java/jopt-simple/jopt-simple-5.0-r1.ebuild
+++ b/dev-java/jopt-simple/jopt-simple-5.0.4.ebuild
@@ -14,12 +14,12 @@ SRC_URI="https://github.com/jopt-simple/jopt-simple/archive/jopt-simple-${PV}.ta
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-DEPEND=">=virtual/jdk-1.8:*"
RDEPEND=">=virtual/jre-1.8:*"
+DEPEND=">=virtual/jdk-1.8:*"
-S="${WORKDIR}/${PN}-${PN}-01719a6"
+S="${WORKDIR}/${PN}-${P}"
JAVA_SRC_DIR="src/main/java"
JAVA_RESOURCE_DIRS="src/main/resources"
diff --git a/dev-java/jopt-simple/jopt-simple-5.0.ebuild b/dev-java/jopt-simple/jopt-simple-5.0.ebuild
deleted file mode 100644
index 763a855732f..00000000000
--- a/dev-java/jopt-simple/jopt-simple-5.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="A Java library for parsing command line options"
-HOMEPAGE="https://pholser.github.com/jopt-simple"
-SRC_URI="https://github.com/pholser/${PN}/tarball/${P} -> ${P}.tar.gz"
-LICENSE="MIT"
-SLOT="0"
-
-KEYWORDS="amd64 ppc64 x86"
-
-RDEPEND=">=virtual/jre-1.8"
-DEPEND=">=virtual/jdk-1.8"
-
-S="${WORKDIR}/${PN}-${PN}-01719a6"
-
-JAVA_SRC_DIR="src/main/java"
-
-src_prepare() {
- default
- rm -v pom.xml || die
-}
-
-src_install() {
- einstalldocs
- java-pkg-simple_src_install
-}
diff --git a/dev-java/jopt-simple/metadata.xml b/dev-java/jopt-simple/metadata.xml
index 40ac5a24007..eede771ba47 100644
--- a/dev-java/jopt-simple/metadata.xml
+++ b/dev-java/jopt-simple/metadata.xml
@@ -6,6 +6,6 @@
<name>Java</name>
</maintainer>
<upstream>
- <remote-id type="github">pholser/jopt-simple</remote-id>
+ <remote-id type="github">jopt-simple/jopt-simple</remote-id>
</upstream>
</pkgmetadata>
diff --git a/dev-java/junit-dataprovider/Manifest b/dev-java/junit-dataprovider/Manifest
new file mode 100644
index 00000000000..1ed76780525
--- /dev/null
+++ b/dev-java/junit-dataprovider/Manifest
@@ -0,0 +1 @@
+DIST junit-dataprovider-2.9.tar.gz 192088 BLAKE2B 4b6650bb2488bb2102e433c48f9c19620e4f60cf222fbab0dd5c8486fb0e64a86cdbf445739e2ad26f6d1e68239805cda7dd48802b556f56c53130b8fd348569 SHA512 78b9c02213e43c05e1896ce740cd177ce728ba00607dd90a029d87abcdb9bf899a285e39d6c69ef8e0b7463fe04159d4e80c405f983059a7a5a349f95767cc99
diff --git a/dev-java/junit-dataprovider/junit-dataprovider-2.9.ebuild b/dev-java/junit-dataprovider/junit-dataprovider-2.9.ebuild
new file mode 100644
index 00000000000..a4ededc832a
--- /dev/null
+++ b/dev-java/junit-dataprovider/junit-dataprovider-2.9.ebuild
@@ -0,0 +1,94 @@
+# 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="com.tngtech.junit.dataprovider:junit-dataprovider:2.9"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="The common core for a TestNG like dataprovider runner for JUnit"
+HOMEPAGE="https://github.com/TNG/junit-dataprovider"
+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"
+
+CP_DEPEND="dev-java/findbugs-annotations:0"
+
+DEPEND="
+ >=virtual/jdk-1.8:*
+ ${CP_DEPEND}
+ dev-java/junit:4
+ test? (
+ dev-java/assertj-core:3
+ dev-java/mockito:4
+ )
+"
+
+RDEPEND="
+ >=virtual/jre-1.8:*
+ ${CP_DEPEND}
+"
+
+DOCS=( {CODE-OF-CONDUCT,CONTRIBUTING,README,SECURITY}.md NOTICE )
+
+S="${WORKDIR}/${PN}-${PV}/"
+
+src_compile() {
+ einfo "Compiling junit-dataprovider-core"
+ JAVA_SRC_DIR="core/src/main/java"
+ JAVA_JAR_FILENAME="junit-dataprovider-core.jar"
+ java-pkg-simple_src_compile
+ JAVA_GENTOO_CLASSPATH_EXTRA+=":junit-dataprovider-core.jar"
+ rm -r target || die
+
+ einfo "Compiling junit4-dataprovider"
+ JAVA_SRC_DIR="junit4/src/main/java"
+ JAVA_JAR_FILENAME="juni4-dataprovider.jar"
+ JAVA_CLASSPATH_EXTRA="junit-4"
+ java-pkg-simple_src_compile
+ rm -r target || die
+
+ if use doc; then
+ einfo "Compiling javadocs"
+ JAVA_SRC_DIR=(
+ "core/src/main/java"
+ "junit4/src/main/java"
+ )
+ JAVA_JAR_FILENAME="ignoreme.jar"
+ java-pkg-simple_src_compile
+ fi
+}
+
+src_test() {
+ einfo "Testing junit-dataprovider-core"
+ JAVA_TEST_GENTOO_CLASSPATH="assertj-core-3,junit-4,mockito:4"
+ JAVA_TEST_SRC_DIR="core/src/test/java"
+ java-pkg-simple_src_test
+
+ einfo "Testing junit4-dataprovider"
+ JAVA_TEST_SRC_DIR="junit4/src/main/java"
+ JAVA_TEST_EXCLUDES=(
+ com.tngtech.java.junit.dataprovider.internal.TestGenerator
+ com.tngtech.java.junit.dataprovider.internal.TestValidator
+ )
+ java-pkg-simple_src_test
+}
+
+src_install() {
+ java-pkg_dojar "junit-dataprovider-core.jar"
+ java-pkg_dojar "juni4-dataprovider.jar"
+
+ if use doc; then
+ java-pkg_dojavadoc target/api
+ fi
+
+ if use source; then
+ java-pkg_dosrc "core/src/main/java/*"
+ java-pkg_dosrc "junit4/src/main/java/*"
+ fi
+}
diff --git a/dev-java/junit-dataprovider/metadata.xml b/dev-java/junit-dataprovider/metadata.xml
new file mode 100644
index 00000000000..75321cfb559
--- /dev/null
+++ b/dev-java/junit-dataprovider/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/junitparams/metadata.xml b/dev-java/junitparams/metadata.xml
index e2f1912e2a3..8d7346cf8e0 100644
--- a/dev-java/junitparams/metadata.xml
+++ b/dev-java/junitparams/metadata.xml
@@ -5,7 +5,7 @@
<email>java@gentoo.org</email>
</maintainer>
<upstream>
- <remote-id type="github">Pragmatists/JUnitParams/tags</remote-id>
+ <remote-id type="github">Pragmatists/JUnitParams</remote-id>
<doc>https://github.com/Pragmatists/JUnitParams/wiki</doc>
<bugs-to>https://github.com/Pragmatists/JUnitParams/issues</bugs-to>
</upstream>
diff --git a/dev-java/jython/jython-2.7.0-r4.ebuild b/dev-java/jython/jython-2.7.0-r4.ebuild
deleted file mode 100644
index 3da94ca9ebb..00000000000
--- a/dev-java/jython/jython-2.7.0-r4.ebuild
+++ /dev/null
@@ -1,152 +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"
-MAVEN_ID="org.python:jython:2.7.0"
-
-inherit java-pkg-2 java-ant-2 python-utils-r1 flag-o-matic
-
-MY_PV=${PV/_beta/-b}
-MY_P=${PN}-${MY_PV}
-
-DESCRIPTION="An implementation of Python written in Java"
-HOMEPAGE="https://www.jython.org"
-SRC_URI="https://search.maven.org/remotecontent?filepath=org/python/${PN}/${MY_PV}/${MY_P}-sources.jar"
-
-LICENSE="PSF-2"
-SLOT="2.7"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="examples test"
-
-CP_DEPEND="dev-java/antlr:3
- dev-java/netty-transport:0
- dev-java/asm:9
- dev-java/commons-compress:0
- dev-java/guava:20
- dev-java/jffi:1.2
- dev-java/jline:2
- dev-java/icu4j:70
- dev-java/jnr-constants:0
- dev-java/jnr-posix:3.0
- dev-java/jnr-netdb:1.0
- dev-java/stringtemplate:0
- dev-java/xerces:2
- java-virtuals/servlet-api:3.0"
-RDEPEND="${CP_DEPEND}
- >=virtual/jre-1.8:*"
-DEPEND="${CP_DEPEND}
- >=virtual/jdk-1.8:*
- dev-java/ant-core:0
- test? (
- dev-java/junit:4
- dev-java/ant-junit:0
- )"
-BDEPEND="app-arch/unzip"
-
-S=${WORKDIR}
-
-RESTRICT="test"
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-JAVA_ANT_CLASSPATH_TAGS+=" java"
-
-EANT_BUILD_TARGET="developer-build"
-EANT_TEST_EXTRA_ARGS="-Dpython.home=dist"
-
-# jdbc-informix and jdbc-oracle-bin (requires registration) aren't exposed.
-# Uncomment and add to CDEPEND if you want either of them
-#EANT_GENTOO_CLASSPATH+=",jdbc-informix" EANT_EXTRA_ARGS+=" -Dinformix.present"
-#EANT_GENTOO_CLASSPATH+=",jdbc-oracle-bin" EANT_EXTRA_ARGS+=" -Doracle.present"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-2.5.2-distutils_scripts_location.patch
- "${FILESDIR}"/${PN}-2.5.2-respect_PYTHONPATH.patch
- "${FILESDIR}"/${PN}-2.7_beta1-ant.patch
- "${FILESDIR}"/${PN}-2.7_beta1-dont-always-recompile-classes.patch
- "${FILESDIR}"/${PN}-2.7_beta2-maxrepeat-import.patch
- "${FILESDIR}"/${PN}-2.7.0-build.xml.patch
- "${FILESDIR}"/CVE-2016-4000.patch
-)
-
-src_prepare() {
- default
-
- find \( -name '*.jar' -o -name '*.class' \
- -o -name '*.pyc' -o -name '*.exe' \) -delete
-
- # needed for launchertest
- chmod +x tests/shell/test-jython.sh || die
-
- java-pkg-2_src_prepare
-}
-
-src_configure() {
- # apparently this can cause problems
- append-flags -fno-stack-protector
-
- EANT_GENTOO_CLASSPATH_EXTRA="$(java-pkg_getjars --with-dependencies antlr-3,jnr-posix-3.0)"
- EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjars --build-only ant-core)"
-}
-
-src_test() {
- java-pkg-2_src_test
-}
-
-src_install() {
- local instdir=/usr/share/${PN}-${SLOT}
-
- java-pkg_newjar dist/${PN}-dev.jar
-
- java-pkg_register-optional-dependency jdbc-mysql
- java-pkg_register-optional-dependency jdbc-postgresql
-
- insinto ${instdir}
- doins -r dist/{Lib,registry}
-
- dodoc ACKNOWLEDGMENTS NEWS README.txt
-
- use doc && java-pkg_dohtml -r dist/Doc/javadoc
- use source && java-pkg_dosrc src/*
- use examples && java-pkg_doexamples Demo/*
-
- local java_args=(
- -Dpython.home="${EPREFIX}"/usr/share/${PN}-${SLOT}
- -Dpython.executable="${EPREFIX}"/usr/bin/jython${SLOT}
- -Dpython.cachedir="\${HOME}/.jythoncachedir"
- )
-
- java-pkg_dolauncher jython${SLOT} \
- --main org.python.util.jython \
- --java_args "${java_args[*]}"
-
- # we need a wrapper to help python_optimize
- cat <<-EOF > "${T}"/jython
- exec java -cp "$(java-pkg_getjars "${EANT_GENTOO_CLASSPATH}"):${EANT_GENTOO_CLASSPATH_EXTRA}:dist/${PN}-dev.jar" \
- -Dpython.home="${ED}${instdir}" \
- -Dpython.cachedir="${T}/.jythoncachedir" \
- -Duser.home="${T}" \
- org.python.util.jython "\${@}"
- EOF
- chmod +x "${T}"/jython || die
-
- local -x PYTHON="${T}"/jython
- # we can't get the path from the interpreter since it does some
- # magic that fails on non-installed copy...
- _python_export jython${SLOT} EPYTHON
-
- # compile tests (everything else is compiled already)
- # we're keeping it quiet since jython reports errors verbosely
- # and some of the tests are supposed to trigger compile errors
- python_optimize "${ED}${instdir}"/Lib/test &>/dev/null
-
- # for python-exec
- echo "EPYTHON='${EPYTHON}'" > epython.py || die
- python_moduleinto "/usr/share/jython-${SLOT}/Lib/site-packages"
- python_domodule epython.py
-
- # some of the class files end up with newer timestamps than the files they
- # were generated from, make sure this doesn't happen
- find "${ED}${instdir}"/Lib/ -name '*.class' | xargs touch
-}
diff --git a/dev-java/jython/jython-2.7.0-r6.ebuild b/dev-java/jython/jython-2.7.0-r6.ebuild
index 7000a802e09..d2b1a170377 100644
--- a/dev-java/jython/jython-2.7.0-r6.ebuild
+++ b/dev-java/jython/jython-2.7.0-r6.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://search.maven.org/remotecontent?filepath=org/python/${PN}/${MY_P
LICENSE="PSF-2"
SLOT="2.7"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux"
IUSE="examples test"
CP_DEPEND="dev-java/antlr:3
diff --git a/dev-java/leiningen-bin/Manifest b/dev-java/leiningen-bin/Manifest
index 772ac28d46c..573922fb97a 100644
--- a/dev-java/leiningen-bin/Manifest
+++ b/dev-java/leiningen-bin/Manifest
@@ -1,4 +1,2 @@
-DIST leiningen-2.9.1-standalone.jar 14621704 BLAKE2B 51d3aca27c56dcdf1560271509e6c4868e387255af5f4e75f42755243b14949ef994cbee81f796a5a533089433fff59e9aff65d7e4e93df02e86fccfd47cf7f9 SHA512 4364aa2a071117049f97f95e020f75bfd0875c88475591d4e04100ac1b228137360a8b24c09877cd3400b7854bf9392b4e5d07ed7f7972e10e4ef5396d0db574
-DIST leiningen-2.9.1.sh 4511 BLAKE2B 66fd656c20ed9b109982840315951b062b1a3fbf0b2b76fc1b6ca612d4daa5d07480838f3f58ec1f1193ff29318323123b6f58bde390d4fb628566687ed39eab SHA512 044621254d31bee3bcdd3f6bd52e9c233a736e2e780edaa3af1d5a7a90424294efd25590c9d3a0606560b223b9e73c87c258fbbb626d2af1b39a400ba1aea86d
DIST leiningen-2.9.8-standalone.jar 12834369 BLAKE2B 6c9bc9a2f990bb4959aa06f8f8b31c1084f0d2bad2e19c8343fb7e8a02acb6f6173737cbf36b028e113577ef26e380d7ace035316dee840c6da92512afa7ac0b SHA512 de4989bf31fe86bfb943d90b683dd17a7417c267e67ac8036967ed352e47a4361b8b6ec8378a1e6cf24fd8df51bcabb9578bc8f487d812c9fb5c2f5f476016cd
DIST leiningen-2.9.8.sh 4555 BLAKE2B c876d19a4ba9a53d84c31874af442e57e6184ce1f7145512355a88b833d2d236bd73eef93f260d22b51e6200c5579c3721a8b6bcb16d516e503a98a2eaf26126 SHA512 58cba7d457c98546e530ad821273cb3f51445ed3191022d0963dd51683cb6b24d0f7d557da34313083b0df11a2c9885bf6d5bb073dea736731de95e8fbbca492
diff --git a/dev-java/leiningen-bin/leiningen-bin-2.9.1.ebuild b/dev-java/leiningen-bin/leiningen-bin-2.9.1.ebuild
deleted file mode 100644
index 9ce40e8c97b..00000000000
--- a/dev-java/leiningen-bin/leiningen-bin-2.9.1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit java-pkg-2
-
-MY_PN="${PN%-bin}"
-MY_PNV="${MY_PN}-${PV}"
-
-DESCRIPTION="Automate Clojure projects without setting your hair on fire"
-HOMEPAGE="https://leiningen.org/"
-SRC_URI="
- https://github.com/technomancy/${MY_PN}/releases/download/${PV}/${MY_PNV}-standalone.zip -> ${MY_PNV}-standalone.jar
- https://raw.githubusercontent.com/technomancy/${MY_PN}/${PV}/bin/lein-pkg -> ${MY_PNV}.sh
-"
-
-LICENSE="EPL-1.0"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~x86 ~x64-macos"
-
-RDEPEND=">=virtual/jre-1.8"
-DEPEND=">=virtual/jdk-1.8"
-
-RESTRICT="test"
-
-src_unpack() {
- mkdir -p "${S}" || die "Can't mkdir ${S}"
- cd "${S}" || die "Can't enter ${S}"
- for file in ${A}; do
- einfo "Copying ${file}"
- cp "${DISTDIR}/${file}" "${S}/" || die "Can't copy ${file}"
- done
-}
-
-src_prepare() {
- einfo "Copying leinrc"
- cp "${FILESDIR}/leinrc" "${S}/" || die "Can't copy leinrc"
- einfo "Patching leinrc"
- sed -i "s^@@PN@@^${PN}^" "${S}/leinrc" || die "Can't patch leinrc"
-
- einfo "Renaming lein-pkg"
- # Rename generically to help user patching
- mv "${S}/${MY_PNV}.sh" "${S}/lein" || die "Can't rename to lein"
-
- einfo "Patching lein"
- java-pkg_init_paths_
- sed -i "s|^LEIN_JAR=.*$|LEIN_JAR=${EPREFIX}/${JAVA_PKG_JARDEST#/}/${PN}.jar|" "${S}/lein" \
- || die "Can't patch LEIN_JAR in lein"
-
- default
-}
-
-src_compile() { :; }
-
-src_install() {
- dobin "${S}/lein"
- java-pkg_newjar "${MY_PNV}-standalone.jar"
- insinto /etc
- doins "${S}/leinrc"
- fperms 0644 "/etc/leinrc"
-}
diff --git a/dev-java/leiningen-bin/leiningen-bin-2.9.8.ebuild b/dev-java/leiningen-bin/leiningen-bin-2.9.8.ebuild
index f0bd5ee2ac4..182f3392805 100644
--- a/dev-java/leiningen-bin/leiningen-bin-2.9.8.ebuild
+++ b/dev-java/leiningen-bin/leiningen-bin-2.9.8.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
LICENSE="EPL-1.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~x64-macos"
+KEYWORDS="amd64 arm64 ~x86 ~x64-macos"
RDEPEND=">=virtual/jre-1.8"
DEPEND=">=virtual/jdk-1.8"
diff --git a/dev-java/log4j-12-api/Manifest b/dev-java/log4j-12-api/Manifest
index 0116f1a3571..71eb0f57dfa 100644
--- a/dev-java/log4j-12-api/Manifest
+++ b/dev-java/log4j-12-api/Manifest
@@ -1 +1,2 @@
DIST apache-log4j-2.17.2-src.tar.gz 11680029 BLAKE2B 19baf31f4e00f0572fad810177d52bf3376f73a47a70ea251ce60a198f4bb322e6e97691f23b1ebb78e29f4eb6f0a36093bd2c6cb558486841d569b601d11015 SHA512 ae09c3af8662fcf5fdc4e7c7dd298e91ec85e90272b8247ce4ee60c7d4ecd48a4cd294fc9e51c0b307fbb58c677e61e31527eab4085debcc9b40919af0920176
+DIST apache-log4j-2.18.0-src.tar.gz 11748446 BLAKE2B c11a5c7cb5be77fd27504b93962c5493f92475e759a575c5536b674a7e8116d4f9840bd2eb3e95156c257ff046f0e3ec437960b0f5ca01f2ddceb509c49aac1f SHA512 104eb8dbd35d3166a0d49190b2e3fdf981b864d21ed47d84f16acd417b943a41fbafa445b2c38ae8cdc494da6af8746ecc3a0db4795f45ce427344659cffae7b
diff --git a/dev-java/log4j-12-api/log4j-12-api-2.18.0.ebuild b/dev-java/log4j-12-api/log4j-12-api-2.18.0.ebuild
new file mode 100644
index 00000000000..60312f6638e
--- /dev/null
+++ b/dev-java/log4j-12-api/log4j-12-api-2.18.0.ebuild
@@ -0,0 +1,84 @@
+# 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-1.2-api/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-12-api-2.18.0.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.apache.logging.log4j:log4j-1.2-api:2.18.0"
+JAVA_TESTING_FRAMEWORKS="junit-vintage junit-jupiter"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="The Apache Log4j 1.x Compatibility API"
+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: log4j-1.2-api/pom.xml
+# org.apache.logging.log4j:log4j-api:2.18.0 -> >=dev-java/log4j-api-2.18.0:2
+# org.apache.logging.log4j:log4j-core:2.18.0 -> >=dev-java/log4j-core-2.18.0:2
+
+CP_DEPEND="
+ ~dev-java/log4j-api-${PV}:2
+ ~dev-java/log4j-core-${PV}:2
+"
+
+# Compile dependencies
+# POM: log4j-1.2-api/pom.xml
+# javax.jms:javax.jms-api:2.0.1 -> !!!groupId-not-found!!!
+# POM: log4j-1.2-api/pom.xml
+# test? com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.13.3 -> >=dev-java/jackson-dataformat-xml-2.13.3:0
+# test? commons-io:commons-io:2.11.0 -> >=dev-java/commons-io-2.11.0:1
+# 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.logging.log4j:log4j-core:2.18.0 -> >=dev-java/log4j-core-2.18.0:2
+# test? org.apache.velocity:velocity:1.7 -> !!!artifactId-not-found!!!
+# test? org.eclipse.tycho:org.eclipse.osgi:3.13.0.v20180226-1711 -> !!!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? org.mockito:mockito-core:4.4.0 -> >=dev-java/mockito-4.4.0:4
+# test? oro:oro:2.0.8 -> >=dev-java/jakarta-oro-2.0.8:2.0
+
+DEPEND="${CP_DEPEND}
+ >=virtual/jdk-1.8:*
+ dev-java/javax-jms-api:0
+"
+# test? (
+# !!!artifactId-not-found!!!
+# !!!groupId-not-found!!!
+# >=dev-java/commons-io-2.11.0:1
+# >=dev-java/jackson-dataformat-xml-2.13.0:0
+# ~dev-java/log4j-api-${PV}:2
+# ~dev-java/log4j-core-${PV}:2
+# )
+#"
+
+RDEPEND="${CP_DEPEND}
+ >=virtual/jre-1.8:*
+"
+
+DOCS=( {CONTRIBUTING,README,RELEASE-NOTES,SECURITY}.md )
+
+S="${WORKDIR}/apache-log4j-${PV}-src"
+
+JAVA_CLASSPATH_EXTRA="javax-jms-api"
+JAVA_SRC_DIR="log4j-1.2-api/src/main/java"
+JAVA_RESOURCE_DIRS="log4j-1.2-api/src/main/resources"
+
+#JAVA_TEST_GENTOO_CLASSPATH="jackson-dataformat-xml,commons-io-1,commons-lang-3.6,!!!groupId-not-found!!!,log4j-api-2,log4j-core-2,!!!artifactId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,mockito-4,jakarta-oro-2.0"
+#JAVA_TEST_SRC_DIR="log4j-1.2-api/src/test/java"
+#JAVA_TEST_RESOURCE_DIRS=(
+# "log4j-1.2-api/src/test/resources"
+#)
diff --git a/dev-java/log4j-api/Manifest b/dev-java/log4j-api/Manifest
index 0116f1a3571..71eb0f57dfa 100644
--- a/dev-java/log4j-api/Manifest
+++ b/dev-java/log4j-api/Manifest
@@ -1 +1,2 @@
DIST apache-log4j-2.17.2-src.tar.gz 11680029 BLAKE2B 19baf31f4e00f0572fad810177d52bf3376f73a47a70ea251ce60a198f4bb322e6e97691f23b1ebb78e29f4eb6f0a36093bd2c6cb558486841d569b601d11015 SHA512 ae09c3af8662fcf5fdc4e7c7dd298e91ec85e90272b8247ce4ee60c7d4ecd48a4cd294fc9e51c0b307fbb58c677e61e31527eab4085debcc9b40919af0920176
+DIST apache-log4j-2.18.0-src.tar.gz 11748446 BLAKE2B c11a5c7cb5be77fd27504b93962c5493f92475e759a575c5536b674a7e8116d4f9840bd2eb3e95156c257ff046f0e3ec437960b0f5ca01f2ddceb509c49aac1f SHA512 104eb8dbd35d3166a0d49190b2e3fdf981b864d21ed47d84f16acd417b943a41fbafa445b2c38ae8cdc494da6af8746ecc3a0db4795f45ce427344659cffae7b
diff --git a/dev-java/log4j-api/log4j-api-2.18.0.ebuild b/dev-java/log4j-api/log4j-api-2.18.0.ebuild
new file mode 100644
index 00000000000..6b537e023c0
--- /dev/null
+++ b/dev-java/log4j-api/log4j-api-2.18.0.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 log4j-api/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-api-2.18.0.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.apache.logging.log4j:log4j-api:2.18.0"
+JAVA_TESTING_FRAMEWORKS="junit-vintage junit-jupiter"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="The Apache Log4j API"
+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,vintage} is not available in ::gentoo
+RESTRICT="test"
+
+# Compile dependencies
+# POM: ${PN}/pom.xml
+# org.osgi:org.osgi.core:6.0.0 -> >=dev-java/osgi-core-8.0.0:0
+# POM: ${PN}/pom.xml
+# test? com.fasterxml.jackson.core:jackson-core:2.13.3 -> >=dev-java/jackson-core-2.13.3:0
+# test? com.fasterxml.jackson.core:jackson-databind:2.13.3 -> >=dev-java/jackson-databind-2.13.3:0
+# 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.maven:maven-core:3.8.5 -> !!!groupId-not-found!!!
+# test? org.assertj:assertj-core:3.23.1 -> !!!suitable-mavenVersion-not-found!!!
+# test? org.eclipse.tycho:org.eclipse.osgi:3.13.0.v20180226-1711 -> !!!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-migrationsupport: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? uk.org.webcompere:system-stubs-jupiter:2.0.1 -> !!!groupId-not-found!!!
+
+DEPEND="
+ >=virtual/jdk-1.8:*
+ dev-java/osgi-core:0
+"
+# test? (
+# !!!groupId-not-found!!!
+# !!!suitable-mavenVersion-not-found!!!
+# >=dev-java/commons-lang-3.12.0:3.6
+# >=dev-java/jackson-core-2.13.3:0
+# >=dev-java/jackson-databind-2.13.3:0
+# )
+# "
+
+RDEPEND=">=virtual/jre-1.8:*"
+
+DOCS=( {CONTRIBUTING,README,RELEASE-NOTES,SECURITY}.md )
+
+S="${WORKDIR}/apache-log4j-${PV}-src"
+
+JAVA_CLASSPATH_EXTRA="osgi-core"
+JAVA_SRC_DIR="${PN}/src/main/java"
+JAVA_RESOURCE_DIRS="${PN}/src/main/resources"
+
+# JAVA_TEST_GENTOO_CLASSPATH="jackson-core,jackson-databind,commons-lang-3.6,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!suitable-mavenVersion-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!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"
+# )
diff --git a/dev-java/log4j-core/Manifest b/dev-java/log4j-core/Manifest
index 0116f1a3571..71eb0f57dfa 100644
--- a/dev-java/log4j-core/Manifest
+++ b/dev-java/log4j-core/Manifest
@@ -1 +1,2 @@
DIST apache-log4j-2.17.2-src.tar.gz 11680029 BLAKE2B 19baf31f4e00f0572fad810177d52bf3376f73a47a70ea251ce60a198f4bb322e6e97691f23b1ebb78e29f4eb6f0a36093bd2c6cb558486841d569b601d11015 SHA512 ae09c3af8662fcf5fdc4e7c7dd298e91ec85e90272b8247ce4ee60c7d4ecd48a4cd294fc9e51c0b307fbb58c677e61e31527eab4085debcc9b40919af0920176
+DIST apache-log4j-2.18.0-src.tar.gz 11748446 BLAKE2B c11a5c7cb5be77fd27504b93962c5493f92475e759a575c5536b674a7e8116d4f9840bd2eb3e95156c257ff046f0e3ec437960b0f5ca01f2ddceb509c49aac1f SHA512 104eb8dbd35d3166a0d49190b2e3fdf981b864d21ed47d84f16acd417b943a41fbafa445b2c38ae8cdc494da6af8746ecc3a0db4795f45ce427344659cffae7b
diff --git a/dev-java/log4j-core/log4j-core-2.17.2.ebuild b/dev-java/log4j-core/log4j-core-2.17.2-r1.ebuild
index 019860e2e92..ccbc2b1c3af 100644
--- a/dev-java/log4j-core/log4j-core-2.17.2.ebuild
+++ b/dev-java/log4j-core/log4j-core-2.17.2-r1.ebuild
@@ -53,7 +53,7 @@ CP_DEPEND="
dev-java/jakarta-activation-api:1
dev-java/jansi:2
dev-java/javax-mail:0
- dev-java/jctools-core:0
+ dev-java/jctools-core:3
dev-java/jeromq:0
dev-java/kafka-clients:0
dev-java/lmax-disruptor:0
diff --git a/dev-java/log4j-core/log4j-core-2.18.0.ebuild b/dev-java/log4j-core/log4j-core-2.18.0.ebuild
new file mode 100644
index 00000000000..5bdc076cad8
--- /dev/null
+++ b/dev-java/log4j-core/log4j-core-2.18.0.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 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/logback-classic/logback-classic-1.2.11.ebuild b/dev-java/logback-classic/logback-classic-1.2.11.ebuild
index 7654edfce25..2759bdc0225 100644
--- a/dev-java/logback-classic/logback-classic-1.2.11.ebuild
+++ b/dev-java/logback-classic/logback-classic-1.2.11.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/qos-ch/logback/archive/v_${PV}.tar.gz -> logback-${P
LICENSE="EPL-1.0 LGPL-3"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
# Common dependencies
# POM: pom.xml
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
new file mode 100644
index 00000000000..9423f26e9a1
--- /dev/null
+++ b/dev-java/logback-core/files/logback-core-1.2.11-Ignore-test-failing-under-Java-16.patch
@@ -0,0 +1,24 @@
+--- 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.2.11.ebuild
index 0cdfe7da574..954b29679ba 100644
--- a/dev-java/logback-core/logback-core-1.2.11.ebuild
+++ b/dev-java/logback-core/logback-core-1.2.11.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/qos-ch/logback/archive/v_${PV}.tar.gz -> logback-${P
LICENSE="EPL-1.0 LGPL-3"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
# Common dependencies
# POM: pom.xml
@@ -70,6 +70,13 @@ src_prepare() {
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
}
src_test() {
@@ -84,10 +91,11 @@ src_test() {
pushd src/test/java || die
local JAVA_TEST_RUN_ONLY=$(find * \
-name "*Test.java" \
- ! -name "**/All*Test.java" \
- ! -name "**/PackageTest.java" \
+ ! -wholename "**/All*Test.java" \
+ ! -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//\//.}"
@@ -97,6 +105,7 @@ src_test() {
local vm_version="$(java-config -g PROVIDES_VERSION)"
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
}
diff --git a/dev-java/lzma/lzma-19.00.ebuild b/dev-java/lzma/lzma-19.00.ebuild
index f986151ee26..90c6674d85f 100644
--- a/dev-java/lzma/lzma-19.00.ebuild
+++ b/dev-java/lzma/lzma-19.00.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
EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="https://www.7-zip.org/a/${PN}${PV/./}.7z"
LICENSE="public-domain"
SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
IUSE=""
RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/lzmajio/lzmajio-0.95-r3.ebuild b/dev-java/lzmajio/lzmajio-0.95-r3.ebuild
index 31377db3134..3eee961802a 100644
--- a/dev-java/lzmajio/lzmajio-0.95-r3.ebuild
+++ b/dev-java/lzmajio/lzmajio-0.95-r3.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
EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/league/${P}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
CDEPEND="dev-java/lzma:0"
diff --git a/dev-java/maven-bin/Manifest b/dev-java/maven-bin/Manifest
index 774551a8384..ff948ed9ad9 100644
--- a/dev-java/maven-bin/Manifest
+++ b/dev-java/maven-bin/Manifest
@@ -1,2 +1,2 @@
-DIST apache-maven-3.8.2-bin.tar.gz 9338426 BLAKE2B b39c9c87b6d05d633172152598496b6cb9b82c64c0572426c6a612ecfcc6d087085d58fdcaef0b61f5554c2b58e90b47bb0e6844dacc88c95bfb72ffc618e355 SHA512 b0bf39460348b2d8eae1c861ced6c3e8a077b6e761fb3d4669be5de09490521a74db294cf031b0775b2dfcd57bd82246e42ce10904063ef8e3806222e686f222
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.2.ebuild b/dev-java/maven-bin/maven-bin-3.8.6.ebuild
index 15cbb360e0d..8f533bbc4a5 100644
--- a/dev-java/maven-bin/maven-bin-3.8.2.ebuild
+++ b/dev-java/maven-bin/maven-bin-3.8.6.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
inherit java-pkg-2
@@ -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/Manifest b/dev-java/memoryfilesystem/Manifest
new file mode 100644
index 00000000000..eaac963a85a
--- /dev/null
+++ b/dev-java/memoryfilesystem/Manifest
@@ -0,0 +1 @@
+DIST memoryfilesystem-2.3.0.tar.gz 127429 BLAKE2B 74ce26328db840d3fce6aebc089cbe6921c2ab7b7448c63aedcffc7358890785ec10f7823d7bd686e3a82bdfb84b9c7c796f49f377f577473a98b298cd04848d SHA512 1aac6b19fe0f6f6c950f13fff3507c61e3307d8d400cba664ae7907c0b4fab03166482ab6515bf355fe27498775ac8ee2850eca8c510e3e72a481b00fec63078
diff --git a/dev-java/memoryfilesystem/memoryfilesystem-2.3.0.ebuild b/dev-java/memoryfilesystem/memoryfilesystem-2.3.0.ebuild
new file mode 100644
index 00000000000..bb7eb852ea7
--- /dev/null
+++ b/dev-java/memoryfilesystem/memoryfilesystem-2.3.0.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"
+MAVEN_ID="com.github.marschall:memoryfilesystem:2.3.0"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="An in memory implementation of a JSR-203 file system."
+HOMEPAGE="https://github.com/marschall/memoryfilesystem"
+SRC_URI="https://github.com/marschall/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+CP_DEPEND="
+ dev-java/jakarta-annotations-api:0
+"
+
+DEPEND="
+ >=virtual/jdk-11:*
+ ${CP_DEPEND}
+"
+
+RDEPEND="
+ >=virtual/jre-1.8:*
+ ${CP_DEPEND}
+"
+
+S="${WORKDIR}/${P}"
+
+JAVA_SRC_DIR="src/main/java"
+JAVA_RESOURCE_DIRS="src/main/resources"
+
+src_prepare() {
+ default
+ # https://github.com/marschall/memoryfilesystem/blob/2.3.0/pom.xml#L236-L259
+ cat > src/main/java/module-info.java <<-EOF
+ module com.github.marschall.memoryfilesystem {
+ requires java.base;
+ requires static jakarta.annotation;
+ exports com.github.marschall.memoryfilesystem;
+ provides java.nio.file.spi.FileSystemProvider with
+ com.github.marschall.memoryfilesystem.MemoryFileSystemProvider;
+ }
+ EOF
+ sed \
+ -e 's:javax\(.annotation.PreDestroy\):jakarta\1:' \
+ -i src/main/java/com/github/marschall/memoryfilesystem/MemoryFileSystem.java || die
+}
diff --git a/dev-java/memoryfilesystem/metadata.xml b/dev-java/memoryfilesystem/metadata.xml
new file mode 100644
index 00000000000..75321cfb559
--- /dev/null
+++ b/dev-java/memoryfilesystem/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/mersennetwister/mersennetwister-0_pre23765-r2.ebuild b/dev-java/mersennetwister/mersennetwister-0_pre23765-r2.ebuild
index c1723884aec..c633ea89d5c 100644
--- a/dev-java/mersennetwister/mersennetwister-0_pre23765-r2.ebuild
+++ b/dev-java/mersennetwister/mersennetwister-0_pre23765-r2.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
EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
IUSE=""
RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/metainf-services/Manifest b/dev-java/metainf-services/Manifest
index 6788adb48ee..3c043e1a724 100644
--- a/dev-java/metainf-services/Manifest
+++ b/dev-java/metainf-services/Manifest
@@ -1 +1,2 @@
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/metainf-services-1.9.ebuild b/dev-java/metainf-services/metainf-services-1.9.ebuild
new file mode 100644
index 00000000000..d8d62e7083e
--- /dev/null
+++ b/dev-java/metainf-services/metainf-services-1.9.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Generates META-INF/services files automatically"
+HOMEPAGE="https://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}"
+
+JAVA_SRC_DIR="src/main/java"
+JAVA_RESOURCE_DIRS="src/main/resources"
diff --git a/dev-java/microba/Manifest b/dev-java/microba/Manifest
deleted file mode 100644
index f78c3b42020..00000000000
--- a/dev-java/microba/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST microba-0.4.4.3.tar.gz 50106 BLAKE2B 15b7fe422f7d6aa92929a697ee2c12b2325c9cfcef6d43cc2f135b57a14d8a2a7c1a7b5b3de6bf8a7e1ed07ac275c26017430f776c435295e36109914aca090d SHA512 0191213d00fd0a6bd59a623fb0762eb589a5ac42c5c988a612c01781b30bcb6d86ce431f76687f5647889d54ad13b7f3fa2eec02ca81038f692d2cf25fa1aad1
diff --git a/dev-java/microba/metadata.xml b/dev-java/microba/metadata.xml
deleted file mode 100644
index 64b71aea296..00000000000
--- a/dev-java/microba/metadata.xml
+++ /dev/null
@@ -1,12 +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>
- <upstream>
- <remote-id type="sourceforge">microba</remote-id>
- <remote-id type="github">tdbear/microba</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/dev-java/microba/microba-0.4.4.3-r2.ebuild b/dev-java/microba/microba-0.4.4.3-r2.ebuild
deleted file mode 100644
index 8692c84f479..00000000000
--- a/dev-java/microba/microba-0.4.4.3-r2.ebuild
+++ /dev/null
@@ -1,42 +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="Swing components for date operations and palettes"
-HOMEPAGE="https://github.com/tdbear/microba"
-SRC_URI="https://github.com/tdbear/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-CP_DEPEND="dev-java/jgraph:0"
-
-RDEPEND="${CP_DEPEND}
- >=virtual/jre-1.8:*"
-
-DEPEND="${CP_DEPEND}
- >=virtual/jdk-1.8:*"
-
-S="${WORKDIR}/${P}"
-JAVA_SRC_DIR="src/main/java"
-
-DOCS=(
- change.log.txt
- readme.txt
- README.md
-)
-
-src_compile() {
- java-pkg-simple_src_compile
- java-pkg_addres ${PN}.jar ${JAVA_SRC_DIR}
-}
-
-src_install() {
- default
- java-pkg-simple_src_install
-}
diff --git a/dev-java/mill-bin/Manifest b/dev-java/mill-bin/Manifest
index d29735ce1f6..c1aacc489a5 100644
--- a/dev-java/mill-bin/Manifest
+++ b/dev-java/mill-bin/Manifest
@@ -1,3 +1,2 @@
-DIST mill-bin-0.10.2 67225385 BLAKE2B d3ec7f45344312fb3097142aebcbf7ccbafa1f2e2aeccd4b83c83b6dc4f90b5e7feeeb994dad930accee546106b2580bf37acc38dd83c9efb599e8b79b2ce8e3 SHA512 79b71bbbe4a05e314495cd97ae2fc926d35d5ba7134c8ff48c09a8fd0fe826b824dd8ccd7e27089acd84b0673acfcbebcf3ef77ac4d3b3d8a6b117244b1a80f5
-DIST mill-bin-0.10.3 67435545 BLAKE2B 1a57f2eaa7af6dd66a2cf46bd653a678d1b81f7cf1c12a99ecbe35f3279241873ea200445cfcd95e43ae4c1d80cdfc202c7c03db562ddf48c39840c804a42877 SHA512 c758d06df4be61986d8bd24d9939eac09bf5080f50b9a2baeb34ff6ff37d699226ed7d65b8facb51edd6f4a8d246333a96a1181e1e641a1127f48ed3d88ff3c1
DIST mill-bin-0.10.4 68195230 BLAKE2B 922604123641ea130da1fbc30e6fdbf768479cdee61f8ca9443f4a96f2d9a3608c2377741716c2f942c29cf40c10f23f3cd24255221d7095060c89c5cde7b8f3 SHA512 2141159fd88866ba3c3abf05af0d7b2bbd89b901a16a29e51b6baefbb94fe68afc4b5c83cf18d289279dbb142b47eadd5ec225a72059be9fa6fc0594b0c130af
+DIST mill-bin-0.10.5 65096167 BLAKE2B 756970782a3abd67a03337824bb54c887758968c8f98cbeadbeb6e84277a5318c737e920b8e3f9025dcc01c81440f62f61e415b5a343f8c36b06bffe66bdb0ec SHA512 151be733fb5438fbad4e1e2b7c6918a38743f1f494652d2d3b11a5d1b67ff3dff40f62b1e71784f5ff22045f45f7e9390a9b4eb6377814cbcfa5cc1e337b0666
diff --git a/dev-java/mill-bin/mill-bin-0.10.2.ebuild b/dev-java/mill-bin/mill-bin-0.10.2.ebuild
deleted file mode 100644
index 4b4375e44bc..00000000000
--- a/dev-java/mill-bin/mill-bin-0.10.2.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.4.ebuild
index e8485c57dfd..4b4375e44bc 100644
--- a/dev-java/mill-bin/mill-bin-0.10.4.ebuild
+++ b/dev-java/mill-bin/mill-bin-0.10.4.ebuild
@@ -8,7 +8,7 @@ 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"
+KEYWORDS="amd64 x86"
LICENSE="MIT"
SLOT="0"
diff --git a/dev-java/mill-bin/mill-bin-0.10.3.ebuild b/dev-java/mill-bin/mill-bin-0.10.5.ebuild
index 4b4375e44bc..e8485c57dfd 100644
--- a/dev-java/mill-bin/mill-bin-0.10.3.ebuild
+++ b/dev-java/mill-bin/mill-bin-0.10.5.ebuild
@@ -8,7 +8,7 @@ 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"
+KEYWORDS="~amd64 ~x86"
LICENSE="MIT"
SLOT="0"
diff --git a/dev-java/mockito/Manifest b/dev-java/mockito/Manifest
index 15273b873a5..42cb97a35ce 100644
--- a/dev-java/mockito/Manifest
+++ b/dev-java/mockito/Manifest
@@ -1,2 +1,3 @@
DIST mockito-1.9.5.zip 6453870 BLAKE2B b577c4a82f03b5c345462ecc10e9fe25c03836d08d57d633d95a1eaba17f52d4306603f50f332df360d0a4880c85c65bad4503503df0acad8f7b437694a2b887 SHA512 93768992c74fbc2e2653b46b3afb526ab816b9c707cb5f9608564299ffd206e256182be146c590b4777a624379f576d7117ed7d43b11f8d2974e87c402eede51
-DIST mockito-4.4.0.tar.gz 1030274 BLAKE2B 41b64456b8bf083f69889fdf7fb891a0bb790af8eb897fd0ba5ceca47050944fec102c33badcf6a68621a9fadc33439405b9ca307794f865637c3143c474ba3d SHA512 f0f4c3f585aad63a357d8b8f924124961e7fffdf95607945ae073ab32a05be6ff08794d3edfc60dea21b65ef7c827a4872315c2372d6a9aa822cf8700a08025f
+DIST mockito-4.6.0.tar.gz 1030497 BLAKE2B 0afc0f5874acbd290312a7eee2ce8b9f7d1a83da12338ff8851e02cd6a9ed0c99bfc109fade5ddfec5f9a5277ffaa0d04c53a726c31082dc53b512a2e551473b SHA512 18f76788e610ca169cf6b4eefd0fdd78c333b920122115d816d1f2ab94f0a84d5a9fd0d00d41d1c34e592c5634f7ac55f7f491061b7992d18aa69f3fc62561b6
+DIST mockito-4.6.1.tar.gz 1031362 BLAKE2B 52768ead8770c701f5e5b698f9c35e8e189b57979d90b231b434aba57f6f1f167e5f1491eec53280ce29410add31ac41e81b3637257f58709162cc3c5307ed27 SHA512 f16454f3baba2e55a6da229d7719359357b2641cf4abaf3c0e5f5cac6999325ac4a9c08d815a02939c1ef62831745162935bb8d03177a27b0d972600a92fc1f7
diff --git a/dev-java/mockito/metadata.xml b/dev-java/mockito/metadata.xml
index cb23ba0fb05..a48a1160ecf 100644
--- a/dev-java/mockito/metadata.xml
+++ b/dev-java/mockito/metadata.xml
@@ -6,7 +6,6 @@
<name>Java</name>
</maintainer>
<upstream>
- <remote-id type="google-code">mockito</remote-id>
<remote-id type="github">mockito/mockito</remote-id>
</upstream>
</pkgmetadata>
diff --git a/dev-java/mockito/mockito-4.4.0.ebuild b/dev-java/mockito/mockito-4.6.0-r1.ebuild
index f8a554b3ba6..bd367941168 100644
--- a/dev-java/mockito/mockito-4.4.0.ebuild
+++ b/dev-java/mockito/mockito-4.6.0-r1.ebuild
@@ -6,17 +6,17 @@ EAPI=8
# Tests not enabled, wants junit-jupiter.
# "${S}/settings.gradle.kts"
JAVA_PKG_IUSE="doc source"
-MAVEN_ID="org.mockito:mockito-core:4.4.0"
+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://codeload.github.com/mockito/mockito/tar.gz/v${PV} -> ${P}.tar.gz"
+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"
# Common dependencies
# POM: ${PN}-core-${PV}.pom
@@ -24,8 +24,8 @@ KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
# net.bytebuddy:byte-buddy-agent:1.12.8 -> >=dev-java/byte-buddy-agent-1.12.8:0
CP_DEPEND="
- dev-java/byte-buddy:0
- dev-java/byte-buddy-agent:0
+ <=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
@@ -48,8 +48,3 @@ RDEPEND="
S="${WORKDIR}/${P}"
JAVA_SRC_DIR="src/main/java"
-
-src_install() {
- java-pkg-simple_src_install
- einstalldocs # https://bugs.gentoo.org/789582
-}
diff --git a/dev-java/mockito/mockito-4.6.1-r1.ebuild b/dev-java/mockito/mockito-4.6.1-r1.ebuild
new file mode 100644
index 00000000000..493246812da
--- /dev/null
+++ b/dev-java/mockito/mockito-4.6.1-r1.ebuild
@@ -0,0 +1,55 @@
+# 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.1"
+
+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"
+
+CP_DEPEND="
+ dev-java/asm:9
+ >=dev-java/byte-buddy-1.12.12:0
+ dev-java/objenesis:0
+"
+
+DEPEND="
+ dev-java/junit:4
+ >=dev-java/opentest4j-1.2.0-r1:0
+ >=virtual/jdk-1.8:*
+ ${CP_DEPEND}
+"
+
+RDEPEND="
+ >=virtual/jre-1.8:*
+ ${CP_DEPEND}
+"
+
+S="${WORKDIR}/${P}"
+
+JAVA_CLASSPATH_EXTRA="
+ junit-4
+ opentest4j
+"
+
+JAVA_SRC_DIR="src/main/java"
+JAVA_AUTOMATIC_MODULE_NAME="org.mockito"
+
+src_prepare() {
+ default
+ sed \
+ -e 's:net.bytebuddy.jar.asm:org.objectweb.asm:' \
+ -i src/main/java/org/mockito/internal/creation/bytebuddy/MockMethodAdvice.java \
+ -i src/main/java/org/mockito/internal/creation/bytebuddy/InlineBytecodeGenerator.java || die
+}
diff --git a/dev-java/netty-buffer/Manifest b/dev-java/netty-buffer/Manifest
deleted file mode 100644
index be03553487f..00000000000
--- a/dev-java/netty-buffer/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST netty-4.0.36.Final.tar.gz 1267617 BLAKE2B 351b1f73b1a3c60fd843767254ae57e74d74cdfe570828b1a2e7aea55a203866ae4e232bad285c3937d8f2dc7689534ffb180fcd345c8cf10bced7048ec58ec3 SHA512 b222205963366d5a0f5539c7029dc47edea8d532fca05d169dfe12dbedf956959ba422a22254b09622db428b517da0fd0e58198d11e66193abdb6050481ccbe6
diff --git a/dev-java/netty-buffer/metadata.xml b/dev-java/netty-buffer/metadata.xml
deleted file mode 100644
index d07e708c64f..00000000000
--- a/dev-java/netty-buffer/metadata.xml
+++ /dev/null
@@ -1,11 +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>
- <upstream>
- <remote-id type="github">netty/netty</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/dev-java/netty-buffer/netty-buffer-4.0.36-r1.ebuild b/dev-java/netty-buffer/netty-buffer-4.0.36-r1.ebuild
deleted file mode 100644
index f69a3ee3a00..00000000000
--- a/dev-java/netty-buffer/netty-buffer-4.0.36-r1.ebuild
+++ /dev/null
@@ -1,85 +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/netty/netty/archive/refs/tags/netty-4.0.36.Final.tar.gz --slot 0 --keywords "~amd64 ~arm64 ~ppc64 ~x86" --ebuild netty-buffer-4.0.36.ebuild
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="io.netty:netty-buffer:4.0.36.Final"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit check-reqs java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Async event-driven framework for high performance network applications"
-HOMEPAGE="https://netty.io/"
-SRC_URI="https://github.com/netty/netty/archive/refs/tags/netty-${PV}.Final.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-
-# Common dependencies
-# POM: pom.xml
-# io.netty:netty-common:4.0.36.Final -> !!!groupId-not-found!!!
-
-CP_DEPEND="dev-java/netty-common:0"
-
-# Compile dependencies
-# POM: pom.xml
-# test? ch.qos.logback:logback-classic:1.0.13 -> !!!groupId-not-found!!!
-# test? io.netty:netty-build:22 -> !!!groupId-not-found!!!
-# test? junit:junit:4.12 -> >=dev-java/junit-4.13.2:4
-# test? org.easymock:easymock:3.2 -> >=dev-java/easymock-3.3.1:3.2
-# test? org.easymock:easymockclassextension:3.2 -> !!!artifactId-not-found!!!
-# test? org.hamcrest:hamcrest-library:1.3 -> >=dev-java/hamcrest-library-1.3:1.3
-# test? org.javassist:javassist:3.19.0-GA -> !!!groupId-not-found!!!
-# test? org.jmock:jmock-junit4:2.6.0 -> !!!groupId-not-found!!!
-# test? org.mockito:mockito-core:1.10.8 -> !!!suitable-mavenVersion-not-found!!!
-
-DEPEND="${CP_DEPEND}
- >=virtual/jdk-1.8:*
- test? (
- dev-java/easymock:3.2
- dev-java/hamcrest-library:1.3
- )"
-
-RDEPEND="${CP_DEPEND}
- >=virtual/jre-1.8:*"
-
-DOCS=( ../{CONTRIBUTING,README}.md ../{LICENSE,NOTICE}.txt )
-
-S="${WORKDIR}/netty-netty-${PV}.Final/buffer/"
-
-JAVA_SRC_DIR="src/main/java"
-
-JAVA_TEST_GENTOO_CLASSPATH="junit-4,easymock-3.2,hamcrest-library-1.3"
-JAVA_TEST_SRC_DIR="src/test/java"
-
-check_env() {
- if use test; then
- # this is needed only for tests
- # https://bugs.gentoo.org/829822
- CHECKREQS_MEMORY="2048M"
- check-reqs_pkg_pretend
- fi
-}
-
-pkg_pretend() {
- check_env
-}
-
-pkg_setup() {
- check_env
-}
-
-src_test() {
- JAVA_TEST_EXTRA_ARGS+=" -Xmx${CHECKREQS_MEMORY}"
- java-pkg-simple_src_test
-}
-
-src_install() {
- default # https://bugs.gentoo.org/789582
- java-pkg-simple_src_install
-}
diff --git a/dev-java/netty-buffer/netty-buffer-4.0.36.ebuild b/dev-java/netty-buffer/netty-buffer-4.0.36.ebuild
deleted file mode 100644
index dd39ef8af0b..00000000000
--- a/dev-java/netty-buffer/netty-buffer-4.0.36.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-MY_PN="netty"
-MY_P="${MY_PN}-${PV}"
-DESCRIPTION="Async event-driven framework for high performance network applications"
-HOMEPAGE="https://netty.io/"
-SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/${MY_P}.Final.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-CDEPEND="~dev-java/${MY_PN}-common-${PV}:0"
-
-RDEPEND=">=virtual/jre-1.7
- ${CDEPEND}"
-
-DEPEND=">=virtual/jdk-1.7
- ${CDEPEND}
- test? (
- dev-java/easymock:3.2
- dev-java/hamcrest-core:1.3
- dev-java/hamcrest-library:1.3
- dev-java/junit:4
- )"
-
-S="${WORKDIR}/${MY_PN}-${MY_P}.Final/${PN/${MY_PN}-}"
-JAVA_SRC_DIR="src/main/java"
-JAVA_GENTOO_CLASSPATH="${MY_PN}-common"
-
-src_test() {
- cd src/test/java || die
-
- local CP=".:${S}/${PN}.jar:$(java-pkg_getjars --with-dependencies ${JAVA_GENTOO_CLASSPATH},easymock-3.2,hamcrest-core-1.3,hamcrest-library-1.3,junit-4)"
- local TESTS=$(find * -name "*Test.java" ! -name "Abstract*")
- TESTS="${TESTS//.java}"
- TESTS="${TESTS//\//.}"
-
- ejavac -cp "${CP}" -d . $(find * -name "*.java")
- ejunit4 -classpath "${CP}" ${TESTS}
-}
diff --git a/dev-java/netty-common/Manifest b/dev-java/netty-common/Manifest
deleted file mode 100644
index be03553487f..00000000000
--- a/dev-java/netty-common/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST netty-4.0.36.Final.tar.gz 1267617 BLAKE2B 351b1f73b1a3c60fd843767254ae57e74d74cdfe570828b1a2e7aea55a203866ae4e232bad285c3937d8f2dc7689534ffb180fcd345c8cf10bced7048ec58ec3 SHA512 b222205963366d5a0f5539c7029dc47edea8d532fca05d169dfe12dbedf956959ba422a22254b09622db428b517da0fd0e58198d11e66193abdb6050481ccbe6
diff --git a/dev-java/netty-common/metadata.xml b/dev-java/netty-common/metadata.xml
deleted file mode 100644
index d07e708c64f..00000000000
--- a/dev-java/netty-common/metadata.xml
+++ /dev/null
@@ -1,11 +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>
- <upstream>
- <remote-id type="github">netty/netty</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/dev-java/netty-common/netty-common-4.0.36-r2.ebuild b/dev-java/netty-common/netty-common-4.0.36-r2.ebuild
deleted file mode 100644
index 3b2e51daa69..00000000000
--- a/dev-java/netty-common/netty-common-4.0.36-r2.ebuild
+++ /dev/null
@@ -1,72 +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
-
-MY_PN="netty"
-MY_P="${MY_PN}-${PV}"
-DESCRIPTION="Async event-driven framework for high performance network applications"
-HOMEPAGE="https://netty.io/"
-SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/${MY_P}.Final.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-IUSE="test"
-
-# Same test failures as before the revbumps still occur. See https://bugs.gentoo.org/827221
-RESTRICT="test"
-
-CP_DEPEND="dev-java/commons-logging:0
- dev-java/javassist:3
- dev-java/log4j-12-api:2
- dev-java/log4j-core:2
- dev-java/slf4j-api:0"
-
-RDEPEND="${CP_DEPEND}
- virtual/jre:1.8"
-
-# It does not build with java 11, https://bugs.gentoo.org/788364
-# src/main/java/io/netty/util/internal/Cleaner0.java:44: error: cannot find symbol
-# Cleaner cleaner = (Cleaner) cleanerField.get(direct);
-# ^
-# symbol: class Cleaner
-# location: class Cleaner0
-DEPEND="${CP_DEPEND}
- virtual/jdk:1.8
- test? (
- dev-java/asm:4
- dev-java/cglib:3
- dev-java/easymock:3.2
- dev-java/hamcrest-core:1.3
- dev-java/hamcrest-library:1.3
- dev-java/junit:4
- dev-java/mockito:0
- dev-java/objenesis:0
- dev-java/slf4j-simple:0
- )"
-
-S="${WORKDIR}/${MY_PN}-${MY_P}.Final/${PN/${MY_PN}-}"
-JAVA_SRC_DIR="src/main/java"
-
-src_prepare() {
- default
- # Needs Mockito 1.10.
- rm -v src/test/java/io/netty/util/concurrent/PromiseCombinerTest.java || die
-}
-
-src_test() {
- cd src/test/java || die
-
- local CP=".:${S}/${PN}.jar:$(java-pkg_getjars --with-dependencies ${JAVA_GENTOO_CLASSPATH},asm-4,cglib-3,easymock-3.2,hamcrest-core-1.3,hamcrest-library-1.3,junit-4,mockito,objenesis,slf4j-simple)"
- local TESTS=$(find * -name "*Test.java")
- TESTS="${TESTS//.java}"
- TESTS="${TESTS//\//.}"
-
- ejavac -cp "${CP}" -d . $(find * -name "*.java")
- ejunit4 -classpath "${CP}" ${TESTS}
-}
diff --git a/dev-java/netty-transport/Manifest b/dev-java/netty-transport/Manifest
deleted file mode 100644
index be03553487f..00000000000
--- a/dev-java/netty-transport/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST netty-4.0.36.Final.tar.gz 1267617 BLAKE2B 351b1f73b1a3c60fd843767254ae57e74d74cdfe570828b1a2e7aea55a203866ae4e232bad285c3937d8f2dc7689534ffb180fcd345c8cf10bced7048ec58ec3 SHA512 b222205963366d5a0f5539c7029dc47edea8d532fca05d169dfe12dbedf956959ba422a22254b09622db428b517da0fd0e58198d11e66193abdb6050481ccbe6
diff --git a/dev-java/netty-transport/metadata.xml b/dev-java/netty-transport/metadata.xml
deleted file mode 100644
index d07e708c64f..00000000000
--- a/dev-java/netty-transport/metadata.xml
+++ /dev/null
@@ -1,11 +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>
- <upstream>
- <remote-id type="github">netty/netty</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/dev-java/netty-transport/netty-transport-4.0.36.ebuild b/dev-java/netty-transport/netty-transport-4.0.36.ebuild
deleted file mode 100644
index a88cbd296c0..00000000000
--- a/dev-java/netty-transport/netty-transport-4.0.36.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-MY_PN="netty"
-MY_P="${MY_PN}-${PV}"
-DESCRIPTION="Async event-driven framework for high performance network applications"
-HOMEPAGE="https://netty.io/"
-SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/${MY_P}.Final.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-CDEPEND="~dev-java/${MY_PN}-buffer-${PV}:0
- ~dev-java/${MY_PN}-common-${PV}:0"
-
-RDEPEND=">=virtual/jre-1.7
- ${CDEPEND}"
-
-DEPEND=">=virtual/jdk-1.7
- ${CDEPEND}
- test? (
- dev-java/easymock:3.2
- dev-java/hamcrest-core:1.3
- dev-java/hamcrest-library:1.3
- dev-java/junit:4
- dev-java/mockito:0
- dev-java/objenesis:0
- )"
-
-S="${WORKDIR}/${MY_PN}-${MY_P}.Final/${PN/${MY_PN}-}"
-JAVA_SRC_DIR="src/main/java"
-JAVA_GENTOO_CLASSPATH="${MY_PN}-buffer,${MY_PN}-common"
-
-java_prepare() {
- # Need to package "classic" component of logback.
- rm -v src/test/java/io/netty/channel/SingleThreadEventLoopTest.java || die
-}
-
-src_test() {
- ewarn "If the hostname does not resolve to this system then these tests will"
- ewarn "fail. It is currently set to: $(uname -n)"
-
- cd src/test/java || die
-
- # --with-dependencies breaks while mockito needs hamcrest-core:0.
- local CP=".:${S}/${PN}.jar:$(java-pkg_getjars ${JAVA_GENTOO_CLASSPATH},easymock-3.2,hamcrest-core-1.3,hamcrest-library-1.3,junit-4,mockito,objenesis)"
- local TESTS=$(find * -name "*Test.java" ! -name "Abstract*" ! -name "Base*")
- TESTS="${TESTS//.java}"
- TESTS="${TESTS//\//.}"
-
- ejavac -cp "${CP}" -d . $(find * -name "*.java")
- ejunit4 -classpath "${CP}" ${TESTS}
-}
diff --git a/dev-java/netty/netty-4.1.35.ebuild b/dev-java/netty/netty-4.1.35-r1.ebuild
index 16ffa4df654..693bf87c6b5 100644
--- a/dev-java/netty/netty-4.1.35.ebuild
+++ b/dev-java/netty/netty-4.1.35-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/netty/netty/archive/refs/tags/netty-${PV}.Final.tar.
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
# We do not build the full range of modules provided by netty but only what
# was available before in netty-common, netty-buffer and netty-transport.
@@ -43,7 +43,7 @@ NETTY_MODULES=(
# https://www.slf4j.org/codes.html
CP_DEPEND="
dev-java/commons-logging:0
- dev-java/jctools-core:0
+ dev-java/jctools-core:3
dev-java/log4j-12-api:2
dev-java/slf4j-simple:0
"
diff --git a/dev-java/openjdk-bin/Manifest b/dev-java/openjdk-bin/Manifest
index dcf312e7c55..c02f9dbe7e2 100644
--- a/dev-java/openjdk-bin/Manifest
+++ b/dev-java/openjdk-bin/Manifest
@@ -1,36 +1,18 @@
-DIST OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.14_9.tar.gz 189849188 BLAKE2B e4d5d5d20b54642cec8941bbfb2a8523ed4f12185bed235d2dded02eca4ef6628ed5b8e36f614278ecad966b2c7cb4ab3b74d696b10718f56faf83834de424db SHA512 299478112d15b335d2cc802e8bcac3a00eb55cfedacbc0c62e462277dce10bfd45de789d760650171a064a574834b2c24e31e70914d63e82362da190e417105d
DIST OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.15_10.tar.gz 189998414 BLAKE2B 6cf30a34a8a3e040895763fbf740e370469ecb9f71ab0d10d7b3c313f922981dfdf2eddaa64badac92d45db1a9945ed1389f1794a434b366034d43af263bf57c SHA512 51a2fc7ddff7d64eadfb7e2f496c33176dbfceea2cdcd479528195ce00454d3d9bb5ad82714e59bdae8cf2cf7f75ce9f1dcb9c5d62aeffda9d1ec9ff0262e04a
-DIST OpenJDK11U-jdk_arm_linux_hotspot_11.0.14_9.tar.gz 180888469 BLAKE2B f5fb5a52c4f0b8c997d0a44122262e2754ab0a0adf369d095793ddf07b8189df7f9b2fa6503d5e765b7d0f792d98b88ea1ce7a23abde1c53dc42ffe90e077671 SHA512 a0e9d5aa5d1ccce23f1197e75e412c6a5369e30adcbe07e3c4c4f5b8448d88e0ea68455b42ac766ec825e0076a6d55d82ac745e0081c7ce4a79304f3d623940a
DIST OpenJDK11U-jdk_arm_linux_hotspot_11.0.15_10.tar.gz 181012868 BLAKE2B b52d2330291ae8f8d74ba98b4679414e86c9018ad364bb27f09b5f192369c0b934654e5b4d8a07027e001da96fb89bd62a18ab5c1acea3c2cea2cc31e20a1481 SHA512 abe8469f5fa4f46f71e35785c6972b2901f003e311086352df6eff6911393c31c01ff965c74772656e2255e0bbb15eee6b761db472c886b60a8cda046fb46764
-DIST OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.14_9.tar.gz 175127578 BLAKE2B ed7f55434b0273765c78c3efd8a5ae622e2fa7557334af74784f0e99936d489c3d191197fec251a4d8532c66727bdd9188344d3591cce623aa2553e79ee5da67 SHA512 bf4b3f18499420a44ed40fb2d751f294b5354d5b1d278725de97de9be7d2f37fbe5c281c50e33aceebd880d59d35de799454ca0a7bd382b5b3d8729286986d5b
DIST OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.15_10.tar.gz 175250283 BLAKE2B 4b4fe6a5018cfa40ac71cfcf41c261887890e339d9e5f57aac55f494abb7a4e99263db151d85698690513caf670acfef29a83616e49d6f845e02cef024624fd6 SHA512 98adf9689782aa78d61f485e671c434cfdfae7ba92a7ce0c2401164250b7def2f881e201835e1ca2ab56a3ae4967c0923f4856171c2a4918f7190adf4b5e0bca
-DIST OpenJDK11U-jdk_x64_alpine-linux_hotspot_11.0.14_9.tar.gz 192425435 BLAKE2B 3e98f8819bf36aaee0ae009e97c7efa9a26dfc55b856e3d2d098d266621c97b5a8448331888e18eb5a8ea164875020db59cb9be61f3756fa87f9376c2b6e5f6b SHA512 667bc8e6d745c693e5e60e332f491fd485e3f4d99e1543d6e72f1b64956e56b4e6892f3a47e642809378f0a8a8dfaaa034ac96a0aa70b0b7fec51ec53bafbaa7
DIST OpenJDK11U-jdk_x64_alpine-linux_hotspot_11.0.15_10.tar.gz 193336087 BLAKE2B 0f61aba6b76b019ef7271dd92cd4b6db432318d629b5485e2f85a9ca586f1ce6b6d3e2c48486a4f3d90f8730e3fc7dd4f0975849f7c0f820812625556331db87 SHA512 360a349b34f2194498d0800145b54e5532b8a2137d7526a692a855a036d1cb6ef185bdeffaff63bb8cce71c7a0b10fee6acfb1024db8d2ec0cd485baa0683304
-DIST OpenJDK11U-jdk_x64_linux_hotspot_11.0.14_9.tar.gz 193109331 BLAKE2B d1f3031c479bc32e3d4d56fb914c33c9e19444ef3b4fd836c52623619872d11cea843904d1425cdbfde2181f41bc63d97c14a479a134ae7280b4b5e49f7789ff SHA512 27d1a8627e6e97d4830f2b8839a7f8455d1e0680853049eb1417f78c5b8e05dc2e8f48520770b422797021a169c80ddbb0c907a5e40e02a4d951a429c5a2c86f
DIST OpenJDK11U-jdk_x64_linux_hotspot_11.0.15_10.tar.gz 193245074 BLAKE2B 0a559bd0513984c2bc93e31ab7afcb8f5fc152c9984d957359bf1901e46b25b25ddee81c4c8fc0f560e65b343f74e39c55a1af61526fceec0eb530309eb65383 SHA512 85b21da3ff777b6239df5534ee3539b256a1de5d02abf4f537bca38d2cbf8006b4130d8bde2e24835a8da7a651fc8852df2c5060d26b9d594927f4d609912554
-DIST OpenJDK11U-jdk_x64_mac_hotspot_11.0.14_9.tar.gz 191414234 BLAKE2B abc031558434dc4f800ab2f3251f66cddd49f2296933ae34c58406a1780982693106fe6f37747e48365bd4b6c9f9dd20e0492ddcca62d7e2555df776297d6f96 SHA512 a306fbd6775f4186483e0403f593f599af95e295acc46cba44dd0758dfae8b6a7b1b6ef4581c2ecac1f18b5e98a84e3e3900fae6ca948b74aba2c62a63c00dee
DIST OpenJDK11U-jdk_x64_mac_hotspot_11.0.15_10.tar.gz 186328533 BLAKE2B 72f662e4aed529de853e47b848b46c15fade1a8c120f83b3409492801084114724f1d3875fedf1607133192ef5a612dbab828e578bff98adf1605fd990a24b21 SHA512 af69ea99e3d3b7ae84405190a12f788348162fd235aa5df8ce7ea3127d961e015b51cf70277aefa0e29a434ba10876812e997a063c5aaedafa460fc5451783c7
-DIST OpenJDK17U-jdk_aarch64_linux_hotspot_17.0.2_8.tar.gz 188965124 BLAKE2B 659bf8518b3104e1fedd116cb9af8b0455d323ce883485f5e42cc9d1fb4d9bae5556757b309a7473559bd67c17a9aa0e0c51934e549141b25dcaeb9032a55b80 SHA512 5eadc730b39f6300be7b64a0a4e9d87873cdfa7b0a031923ddfab473affd5b22788a33e2f01412c99c2e42ffb2774cc655c732e7721a6fc02c2b34a42dc9088d
DIST OpenJDK17U-jdk_aarch64_linux_hotspot_17.0.3_7.tar.gz 190142132 BLAKE2B e6b0fb199ba788a31b6238d3bc458216baf37f1517a449be63668c412dfe7662d644ffdb312194533d4af089ac2753c164059978d65eddd951bb98bfc108da87 SHA512 f406ae289659e902dd3314d40485c1f3b04915451794c2bebfb1eeda7c83dbf051c26461aec7fe07c1a43f5319f80044aefc99c9177e2a9ca0a31a9c9f06c157
-DIST OpenJDK17U-jdk_aarch64_mac_hotspot_17.0.2_8.tar.gz 182550014 BLAKE2B 24a7aae5c6d282a416c996f6b35ff5c92522ac7853d4cc3248a34f642029fb95b798de3159dcd7ee60a9952dd5ef2926a97c82df0708655044fb4faa6d82019f SHA512 50e27087804582a1b124a17762cf24272cbd24ae1d1bc443950bd91c88da220415ca429894bd1d1172cb39fdbff262470276a3b3e9043b5eabf550c05ee2438b
DIST OpenJDK17U-jdk_aarch64_mac_hotspot_17.0.3_7.tar.gz 177467402 BLAKE2B 38b8508e81bcbaf90a1db9bfe3f804da9838cc43b6043c328d19523c83dc5d953465a1018a9054979163140a28f5e213815634005cf096f6932407e8f7ccf9a6 SHA512 0433dc839a98b810cad9fe0d98c46cabccec5ceb44fd5bc67fff0c27962f183a3814b9aab521768b578d8f11bda97934629bf9fce5c010cdc93c685b842566e7
-DIST OpenJDK17U-jdk_arm_linux_hotspot_17.0.2_8.tar.gz 188894874 BLAKE2B 9881d30cc0b4edc1c3a2d5978b08e820833e82c202f39ddf20600e56c596dc5b53d667eafdeb3048ed59a1d4e13f2ecfa136e123d8ae3f14ce43ece6ede9ab55 SHA512 708aa4a6912970ef6ea88ac3a4fcc04d4adaafcb207837dbe6c1f1e731e87faeb985fc8338a9d59f5637778be40690189c5c936ffb819265b558fc06bee99ddb
DIST OpenJDK17U-jdk_arm_linux_hotspot_17.0.3_7.tar.gz 188309462 BLAKE2B e47b98ebcb661631732e3238ce3cd1630a0a2103d7e32beabb49d1a0ff216c34c0c39fac11a848474a36dd2c98f6724c58900e3026d04cb7e4f7f00adbe1fe18 SHA512 9158821b22633177866ac0a5c4ffd774d2d750adea2de2adce661060ab7d28cf67fc703eb9e0e200149fa03eb040a05dc45ac944dacd140e0d0fa06515584795
-DIST OpenJDK17U-jdk_ppc64le_linux_hotspot_17.0.2_8.tar.gz 189073596 BLAKE2B 1303795dd08dedee8ea4723adaeaae4ab7ef28b81da0f5fd8b19ac5f027ec8f7edb67efe37ca47381a44b4a94223a36d37652a290c2f2cf9702520e01b700786 SHA512 beab26ef69c0ed07a14976c01dad4b2a4d708d04b22c86dabff7b87eaefd8e03f627c5c3388a0dbc55b10edaa14004bc0c44ea1fe3edb18e68cb23105d2ca44d
DIST OpenJDK17U-jdk_ppc64le_linux_hotspot_17.0.3_7.tar.gz 190898839 BLAKE2B b5188190ab30393ff789724ca99ce89232d8a4d81c22205111da4cc60cc258fe5bee47a5550cf032937542d7fb677af0de9aebbe39fe20b4af223a6d7d3211e5 SHA512 e1f1ade72f12c21eef9d34d05e2a4a8228320138d0c626c4eb31431ac9d5e5123ec8ef24c168005e3bb3508537c826399122461a0ce8de1310ccab40d8d21145
-DIST OpenJDK17U-jdk_x64_alpine-linux_hotspot_17.0.2_8.tar.gz 191420670 BLAKE2B 901cd6f9e816e1eaa949c97a86d9cfa6d3265b33da483ac5a4ba87621b5a196c7c51305be19745f8aa504ee4471a583180bc36de5a6013ca59e4f0890ea8fa34 SHA512 e80c8f02a35587c9305a92ed20926e79b0bab6b2d0fa3fd62ef7825383f68567c38cb52d2cc82b5def219df1fe2dbb531d0973b3713d1ec18c06c6967a228f73
DIST OpenJDK17U-jdk_x64_alpine-linux_hotspot_17.0.3_7.tar.gz 191298712 BLAKE2B abcb97374d38cb7457139865617d7570627d390c0db47ed572048dbb9f35b7cf6cf1a7d973684607ce3f7477f9b03b85ba43b8b4447b04f9fe1bfe419a18d190 SHA512 4e69597c134f37db83b44fd86e13c25ded20d8a1b2d8e959b6ddee29e5cc8c2a7bfd449636399f2d7bf030d93b2a29236e614a1578f9bbd37ca7e12249dc80bc
-DIST OpenJDK17U-jdk_x64_linux_hotspot_17.0.2_8.tar.gz 192041953 BLAKE2B 76b66b6571d50fd00c80bfdfd63023d070b7fb0f4ecacce86fcc10b651fa193a88ac8357e097d83ee4cfb982cd34b15cf4a9b59441066677d19a29073bee3666 SHA512 25ffa17e6d7c402e976823ac90d6fd6c4f07093c3766c6d48a7d1ecfe5908d6d73efe6f732af8fcb3f4f91b6daa0dd8f4a141ce7aae5fc12f0ed23a1c1e2ebb5
DIST OpenJDK17U-jdk_x64_linux_hotspot_17.0.3_7.tar.gz 191514138 BLAKE2B 3e2d64cdf15c63f2f50148576bc8ed085ec808a28a07113910f7b04c5729a1a56840751da627d8012751a7b533f6730c3a9bb99914382caf82f63e5a65dad40a SHA512 144f1e1c0f9558bd0be0536b48b89081579d1232d75c00fcfb7be2460475a4eaf3a6ae89007e683fd6148b4ebf33c2d9492419db96090e07f4ae52afc71df861
-DIST OpenJDK17U-jdk_x64_mac_hotspot_17.0.2_8.tar.gz 192611208 BLAKE2B ef5e801d3d8b5ace125d62a96ec2b76faf5acf12acd94d3cf6c3f80c84abe9ae91b9e53a85d5f57ff69bd2596cfb5715808d73070c971a5ed8dddec2694a9d64 SHA512 c43075b14450de6763a66c0f73d7836ec880045cc84c1b8f1e72f9e3f1e3ba6057afff27cb3bdcadd89a52c75671ed7cf844299943ba8d3bf86e6c45386fa039
DIST OpenJDK17U-jdk_x64_mac_hotspot_17.0.3_7.tar.gz 187277835 BLAKE2B 2a6766ae47281222a570485bbb67b10b78b2d17399a2fd76e254be3d30808a09002fe6fcf5814be044c4a95c3f791af4b45df9320cea5ec212f9db38329b1630 SHA512 00cb5c5628ef2fcbc44ffcb2f81b8cae8c57107df8c456b4f3bf6897269daebdbd9ce0fe78af686cebedbd2426fa85095b198d47578828404a1b046eb0cbca60
-DIST OpenJDK8U-jdk_aarch64_linux_hotspot_8u322b06.tar.gz 102170434 BLAKE2B 84755d791d6aea0b58de68f7ced3e023d7d5f705c99ece9cb91f77663643681ea22672bb1dae143475959374193b1bea1068c0a0f73df4e748430495993d1c5c SHA512 cda25392c8d51b720fac9022de0d7cfc1f496b9e5295b90ee6082e6787d483eaf32198092072b6fe9cadfec157a93f66290691b3d1476572ba2097ab5e70b33c
DIST OpenJDK8U-jdk_aarch64_linux_hotspot_8u332b09.tar.gz 102003248 BLAKE2B 75eb1dc4e09f868ca1a5f0ccc275e36992414e250c2815ab2a6e879942dfdd57a069d6d2cc79aee967c8d2077cecef6d65285cf870e70d22aebef607e906dbec SHA512 cf716f9a614932ccffeb8a7a2ee3a2f10543b31b8f6953933ba4785f386873fe00fee69061c70c26b55a6db13f26ba529f9953d7f3fce9b42172fe3b4e0eee52
-DIST OpenJDK8U-jdk_arm_linux_hotspot_8u322b06.tar.gz 98420081 BLAKE2B 77d735d6f07320d226cf575c84f3879d7dafb4fa4ce06c737e7bdaf4f731af323c3ed0bdbd66067200ef350c7b5202c75bdf7cdc2a538c54ef1058be54a9d57f SHA512 b355c813b2b382bb37c2ca34c01a631b6651e0559a864286c04518332c513d1f833f8441bed52ecc1e24074951a2e5149ce60c88fa2490165d43d0058efe073c
DIST OpenJDK8U-jdk_arm_linux_hotspot_8u332b09.tar.gz 98261468 BLAKE2B 7fe2b5c6178af88ebf390352f67acca7216af23d6015beb8e94215d1af82b41c2b8e8790c00b5fbf363837a98ddb051a6ebede5fe78f471f09331c1014bd85ec SHA512 17c9bdc892dc479bd7c5bef2ab3a6637cc499e1c257d6ddd541e7f372d6737d644920538e0c39e8aa7c905f0f1172429cc171d608bd337e872be7b399733b25e
-DIST OpenJDK8U-jdk_ppc64le_linux_hotspot_8u322b06.tar.gz 100615206 BLAKE2B 8956f1ed38732aa8e9880396dce7c477370d128c1a957ba6d135676140f3e8bf233c6563dbcd2f63c2136454a398c49455a96f77224691ded7843f6cac027d1f SHA512 11975e73e6615bcb686703241b0f1589699edfc76a4de97e7066d4d93826dfb8c07a54b6ea3f8a70d231f98d4033c2fbb7741fbf0df374aa810f6cff8b5cda33
DIST OpenJDK8U-jdk_ppc64le_linux_hotspot_8u332b09.tar.gz 100484069 BLAKE2B 7e3b0186947f19094d88140304e756b7b2728560299f330c84ed8f9ac77c40fb046c2731d22c5d30e5d2837b878caccb19e8f1174f272c2fb29905db15500640 SHA512 adcfa446254c7de8b80f040e7f9960625c0314dabc8b457dee9d95216050f9aedc0c59528c29f7f1bc950c3ed0b713f3234dd9f9fb2a5bab7e706dbdb2eef42d
-DIST OpenJDK8U-jdk_x64_linux_hotspot_8u322b06.tar.gz 103063877 BLAKE2B 9ca165707b4f02eeb5156a5379d246942eb06ffe4338490600e7a834c49c1199d46cd098bbcd8041e7c58107ccb657818e6ea37cdd39018a17a87e370c32665b SHA512 6ec164df1f95d2c8921b5d90c2dbd208107fa20e66d97e2920dbefd2b616214609392e36b885700bba14571d10848f412194db2f18206c1a21d16e6df7e29e53
DIST OpenJDK8U-jdk_x64_linux_hotspot_8u332b09.tar.gz 102918585 BLAKE2B 55d7ef116ee28f37ab1a96cb8ffe021d1784b208ad248e78d6f0a7f22429364364e00ef17fe6159fac2fde6a0765a20125db6ce17694992dbc9e3b3e054adddf SHA512 9f387fb8b872b65fc6a545151c185b9ad1aaac7ad7cffac4d2b936dedbca116a7d74e56754353ffa4caed394497ca659852f0e5e3803ead10f8fa95d562e28a8
-DIST OpenJDK8U-jdk_x64_mac_hotspot_8u322b06.tar.gz 108075347 BLAKE2B 89c81377516b737e1ce096b66c8460c86f77229c8a7021471e6c67ae738c99183dbe4e5d868de0de5251cca9eb5bcf888f88526a8390a56eb33bb6270038ebfb SHA512 5f9e6036ca72b015609c503b8446b79013dd4aac09349e3c65c9df0e91e2541f3672d867006cd1f236cdd8a60e16671c6e4423d5d6e85a5a31f6f97f1d168434
DIST OpenJDK8U-jdk_x64_mac_hotspot_8u332b09.tar.gz 107924497 BLAKE2B f1f283b33f2e81a15f6ba01b7c2c63093b8a12dd0c9853ff9a2cea8d5352b6994266e8653135574f59a24da7294e602c5dd2fb3524065aa53e21b8313d3b0d33 SHA512 c7474e6a81d9e44e7c48388917de87733bfcb13c99a6d253ba180ac8b826ec79f1871d57dcc3e2edb4929f2687541156770c7568162a95389cdf1606d8e65397
diff --git a/dev-java/openjdk-bin/files/openjdk-bin-17.env.sh b/dev-java/openjdk-bin/files/openjdk-bin-17.env.sh
deleted file mode 100644
index f6d25d57c4a..00000000000
--- a/dev-java/openjdk-bin/files/openjdk-bin-17.env.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-VERSION="Eclipse Temurin JDK ${PV}"
-JAVA_HOME="${EPREFIX}/opt/${P}"
-JDK_HOME="${EPREFIX}/opt/${P}"
-JAVAC="\${JAVA_HOME}/bin/javac"
-PATH="\${JAVA_HOME}/bin"
-ROOTPATH="\${JAVA_HOME}/bin"
-LDPATH="\${JAVA_HOME}/lib/:\${JAVA_HOME}/lib/server/"
-MANPATH=""
-PROVIDES_TYPE="JDK JRE"
-PROVIDES_VERSION="${SLOT}"
-BOOTCLASSPATH=""
-GENERATION="2"
-ENV_VARS="JAVA_HOME JDK_HOME JAVAC PATH ROOTPATH LDPATH MANPATH"
diff --git a/dev-java/openjdk-bin/files/openjdk-bin-8.env.sh b/dev-java/openjdk-bin/files/openjdk-bin-8.env.sh
index fe1b484edfa..9bb340ba4db 100644
--- a/dev-java/openjdk-bin/files/openjdk-bin-8.env.sh
+++ b/dev-java/openjdk-bin/files/openjdk-bin-8.env.sh
@@ -1,6 +1,3 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
VERSION="Eclipse Temurin JDK ${PV}"
JAVA_HOME="${EPREFIX}/opt/${P}"
JDK_HOME="${EPREFIX}/opt/${P}"
diff --git a/dev-java/openjdk-bin/files/openjdk-bin-11.env.sh b/dev-java/openjdk-bin/files/openjdk-bin.env.sh
index 073e66f7ee9..64619f60c7c 100644
--- a/dev-java/openjdk-bin/files/openjdk-bin-11.env.sh
+++ b/dev-java/openjdk-bin/files/openjdk-bin.env.sh
@@ -1,6 +1,3 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
VERSION="Eclipse Temurin JDK ${PV}"
JAVA_HOME="${EPREFIX}/opt/${P}"
JDK_HOME="${EPREFIX}/opt/${P}"
diff --git a/dev-java/openjdk-bin/openjdk-bin-11.0.14_p9-r1.ebuild b/dev-java/openjdk-bin/openjdk-bin-11.0.14_p9-r1.ebuild
deleted file mode 100644
index 1bb314be9d5..00000000000
--- a/dev-java/openjdk-bin/openjdk-bin-11.0.14_p9-r1.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# 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}-${SLOT}.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.15_p10.ebuild b/dev-java/openjdk-bin/openjdk-bin-11.0.15_p10.ebuild
index 27efa4384f2..eb2458b279a 100644
--- a/dev-java/openjdk-bin/openjdk-bin-11.0.15_p10.ebuild
+++ b/dev-java/openjdk-bin/openjdk-bin-11.0.15_p10.ebuild
@@ -41,7 +41,7 @@ SRC_URI="
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"
+KEYWORDS="amd64 ~arm arm64 ppc64 ~x64-macos"
IUSE="alsa cups headless-awt selinux source"
RDEPEND="
@@ -124,7 +124,7 @@ src_install() {
# provide stable symlink
dosym "${P}" "/opt/${PN}-${SLOT}"
- java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
+ 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
diff --git a/dev-java/openjdk-bin/openjdk-bin-17.0.2_p8.ebuild b/dev-java/openjdk-bin/openjdk-bin-17.0.2_p8.ebuild
deleted file mode 100644
index f5637ac0f05..00000000000
--- a/dev-java/openjdk-bin/openjdk-bin-17.0.2_p8.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# 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 +gentoo-vm 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}"
-
- use gentoo-vm && 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
-}
-
-pkg_postinst() {
- java-vm-2_pkg_postinst
-
- if use gentoo-vm ; then
- ewarn "WARNING! You have enabled the gentoo-vm USE flag, making this JDK"
- ewarn "recognised by the system. This will almost certainly break"
- ewarn "many java ebuilds as they are not ready for openjdk-${SLOT}"
- else
- ewarn "The experimental gentoo-vm USE flag has not been enabled so this JDK"
- ewarn "will not be recognised by the system. For example, simply calling"
- ewarn "\"java\" will launch a different JVM. This is necessary until Gentoo"
- ewarn "fully supports Java ${SLOT}. This JDK must therefore be invoked using its"
- ewarn "absolute location under ${EPREFIX}/opt/${P}."
- fi
-}
diff --git a/dev-java/openjdk-bin/openjdk-bin-17.0.3_p7.ebuild b/dev-java/openjdk-bin/openjdk-bin-17.0.3_p7.ebuild
index fba323d4c66..bba49ad388a 100644
--- a/dev-java/openjdk-bin/openjdk-bin-17.0.3_p7.ebuild
+++ b/dev-java/openjdk-bin/openjdk-bin-17.0.3_p7.ebuild
@@ -42,7 +42,7 @@ SRC_URI="
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"
+KEYWORDS="amd64 ~arm arm64 ppc64 ~x64-macos"
IUSE="alsa cups +gentoo-vm headless-awt selinux source"
RDEPEND="
@@ -125,7 +125,7 @@ src_install() {
# provide stable symlink
dosym "${P}" "/opt/${PN}-${SLOT}"
- use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
+ use gentoo-vm && 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
@@ -133,16 +133,4 @@ src_install() {
pkg_postinst() {
java-vm-2_pkg_postinst
-
- if use gentoo-vm ; then
- ewarn "WARNING! You have enabled the gentoo-vm USE flag, making this JDK"
- ewarn "recognised by the system. This will almost certainly break"
- ewarn "many java ebuilds as they are not ready for openjdk-${SLOT}"
- else
- ewarn "The experimental gentoo-vm USE flag has not been enabled so this JDK"
- ewarn "will not be recognised by the system. For example, simply calling"
- ewarn "\"java\" will launch a different JVM. This is necessary until Gentoo"
- ewarn "fully supports Java ${SLOT}. This JDK must therefore be invoked using its"
- ewarn "absolute location under ${EPREFIX}/opt/${P}."
- fi
}
diff --git a/dev-java/openjdk-bin/openjdk-bin-8.322_p06.ebuild b/dev-java/openjdk-bin/openjdk-bin-8.322_p06.ebuild
deleted file mode 100644
index aad1888ca56..00000000000
--- a/dev-java/openjdk-bin/openjdk-bin-8.322_p06.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# 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.332_p09.ebuild b/dev-java/openjdk-bin/openjdk-bin-8.332_p09.ebuild
index 7834a4a1707..aad1888ca56 100644
--- a/dev-java/openjdk-bin/openjdk-bin-8.332_p09.ebuild
+++ b/dev-java/openjdk-bin/openjdk-bin-8.332_p09.ebuild
@@ -34,7 +34,7 @@ SRC_URI="
"
LICENSE="GPL-2-with-classpath-exception"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x64-macos"
+KEYWORDS="amd64 ~arm arm64 ppc64 ~x64-macos"
IUSE="alsa cups examples headless-awt selinux source"
diff --git a/dev-java/openjdk-jre-bin/files/openjdk-jre-bin-11.env.sh b/dev-java/openjdk-jre-bin/files/openjdk-jre-bin-11.env.sh
deleted file mode 100644
index 5ccace8029b..00000000000
--- a/dev-java/openjdk-jre-bin/files/openjdk-jre-bin-11.env.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-VERSION="Eclipse Temurin JRE ${PV}"
-JAVA_HOME="${EPREFIX}/opt/${PN}-${SLOT}"
-PATH="\${JAVA_HOME}/bin"
-ROOTPATH="\${JAVA_HOME}/bin"
-LDPATH="\${JAVA_HOME}/lib/:\${JAVA_HOME}/lib/server/"
-MANPATH="\${JAVA_HOME}/man"
-PROVIDES_TYPE="JRE"
-PROVIDES_VERSION="${SLOT}"
-BOOTCLASSPATH=""
-GENERATION="2"
-ENV_VARS="JAVA_HOME PATH ROOTPATH LDPATH MANPATH"
diff --git a/dev-java/openjdk-jre-bin/files/openjdk-jre-bin-8.env.sh b/dev-java/openjdk-jre-bin/files/openjdk-jre-bin-8.env.sh
index e3f380e33c6..091a43a4efc 100644
--- a/dev-java/openjdk-jre-bin/files/openjdk-jre-bin-8.env.sh
+++ b/dev-java/openjdk-jre-bin/files/openjdk-jre-bin-8.env.sh
@@ -1,6 +1,3 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
VERSION="Eclipse Temurin JRE ${PV}"
JAVA_HOME="${EPREFIX}/opt/${P}"
JDK_HOME="${EPREFIX}/opt/${P}"
diff --git a/dev-java/openjdk-jre-bin/files/openjdk-jre-bin-17.env.sh b/dev-java/openjdk-jre-bin/files/openjdk-jre-bin.env.sh
index 5ccace8029b..3d5130c67fd 100644
--- a/dev-java/openjdk-jre-bin/files/openjdk-jre-bin-17.env.sh
+++ b/dev-java/openjdk-jre-bin/files/openjdk-jre-bin.env.sh
@@ -1,6 +1,3 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
VERSION="Eclipse Temurin JRE ${PV}"
JAVA_HOME="${EPREFIX}/opt/${PN}-${SLOT}"
PATH="\${JAVA_HOME}/bin"
diff --git a/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.14_p9-r1.ebuild b/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.14_p9-r1.ebuild
index d7a2d14be02..ae3ecf2e8fe 100644
--- a/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.14_p9-r1.ebuild
+++ b/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.14_p9-r1.ebuild
@@ -72,7 +72,7 @@ src_install() {
dodir "${dest}"
cp -pPR * "${ddest}" || die
- java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
+ 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
diff --git a/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.15_p10.ebuild b/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.15_p10.ebuild
index a6f7f3ee248..ae3ecf2e8fe 100644
--- a/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.15_p10.ebuild
+++ b/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.15_p10.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
DESCRIPTION="Prebuilt Java JRE binaries provided by Eclipse Temurin"
HOMEPAGE="https://adoptopenjdk.net"
LICENSE="GPL-2-with-classpath-exception"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
IUSE="alsa cups +gentoo-vm headless-awt selinux"
RDEPEND="
@@ -72,7 +72,7 @@ src_install() {
dodir "${dest}"
cp -pPR * "${ddest}" || die
- java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
+ 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
diff --git a/dev-java/openjdk-jre-bin/openjdk-jre-bin-17.0.3_p7.ebuild b/dev-java/openjdk-jre-bin/openjdk-jre-bin-17.0.3_p7.ebuild
index a6f7f3ee248..ae3ecf2e8fe 100644
--- a/dev-java/openjdk-jre-bin/openjdk-jre-bin-17.0.3_p7.ebuild
+++ b/dev-java/openjdk-jre-bin/openjdk-jre-bin-17.0.3_p7.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
DESCRIPTION="Prebuilt Java JRE binaries provided by Eclipse Temurin"
HOMEPAGE="https://adoptopenjdk.net"
LICENSE="GPL-2-with-classpath-exception"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
IUSE="alsa cups +gentoo-vm headless-awt selinux"
RDEPEND="
@@ -72,7 +72,7 @@ src_install() {
dodir "${dest}"
cp -pPR * "${ddest}" || die
- java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
+ 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
diff --git a/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.332_p09.ebuild b/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.332_p09.ebuild
index d4b6279fcfa..f337effa4a4 100644
--- a/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.332_p09.ebuild
+++ b/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.332_p09.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
"
LICENSE="GPL-2-with-classpath-exception"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
IUSE="alsa cups headless-awt selinux"
diff --git a/dev-java/openjdk/Manifest b/dev-java/openjdk/Manifest
index f78ee85760b..ab42df4cb81 100644
--- a/dev-java/openjdk/Manifest
+++ b/dev-java/openjdk/Manifest
@@ -1,10 +1,7 @@
DIST openjdk-11.0.14-riscv.patch.xz 279088 BLAKE2B f67cf5707246b22285de8217b68fb806e3c18b7289cb81428c0fe83c5a4dcd60233be10aaca0853ffb00ac24fa60cae1b1d60ed300ad6bff8b07e881bddf8650 SHA512 32bac5f0c0f5df883de344718586bf798db6c8a5738058ea5d4902f5a0a3fc841c1893dec3379a74b9468c1c37af5c31a3e296476549972d3f1305401354060d
-DIST openjdk-11.0.14_p9.tar.gz 122803178 BLAKE2B 521d7829b34fa4f9a143c51d61c339c8c7455f12c4f04eda4fdd687dafa842f2a1b1adfe2e897fecdfa4e1c3ee484ec0e3aaf38ab9246f20cd24e7185db6ba25 SHA512 3285d13ba0fbbfd4f1a676b0f099b0742527ff556edfc3387913b59b64126bdfecd2697d7ac83634ed7160adf46edca3b5b2c33d94e9dca068752da5b9d70837
DIST openjdk-11.0.15_p10.tar.gz 122902351 BLAKE2B a2dabad415a92765d548b19261e22e2cd483a17b478c8ef98342b44e88b39b23d89d31aecc80f93b27fce8df50ba41f4e6e5f10b66035bbfc1e0c03fc4707a40 SHA512 9d9e631046769d3ad95229172f392649ef4162161eb2d6fa7371665619600a04db440e1b3d30c580e283ad2b6bd7580d1199fc854fad3cb962d79f18b2347c67
-DIST openjdk-17.0.2_p8.tar.gz 104741920 BLAKE2B 749b1699f1b4b2bb6ee1139ceb704ba3b3f3789770176e5f0dc4b1d5ce5c2887514fc3c256a64f2ad9bb017339c20ef10110f35b523ee1edcd62924e41f44f03 SHA512 8eeb8b56410178179cc95aa02b0bf827fac3fbf6242a905502a6594763be809a727e55e87866ac65be56c22d6f78ec0c483bdaab9411f07d4b160c49b06921fa
-DIST openjdk-17.0.3-riscv.patch.xz 296268 BLAKE2B 5c3b43f160009144636becd6aae19559e8f03e4d6461f89c1b6c472e63c6f4c2c6064bb3dc24c825814e7d6cc927f66fe96793bd2c71a80e2b535eec0f685278 SHA512 1c2de73051a665ada6a12bb6f92f18b1d9366990cea403063d20937ac97c288f923746a0d094273ad7f7238cef1ebe1790c0f0ffe7e7acc07ad08ebc6a7ea085
+DIST openjdk-17.0.3-riscv.patch.xz 296268 BLAKE2B 9b2036493a485a1e245230488a5985af4f5d5c6a85912d73d8a712742fdfc26d5eb08ca8e69dac04f0d516fb361e6ed057c95a3839b04639d129581cf00f0620 SHA512 692b5e39e5c6eb1222f25c3012e9a73366d9c98f5c29c2f2d35f41991cdcb026a644398b6f3fdd8c9d8368b4b1f5dc4d89b3dbd594a2e7751de96a140551d445
DIST openjdk-17.0.3_p7.tar.gz 104797560 BLAKE2B 025ff6be360c74288990622bce31769e5780f3f326b0eed2b78a776cc4df8bdf8cb99dfb0d7dd3f03f8558ca9a66acc5c5bd04b227ba4dffe18f8586a287b74b SHA512 3bebaaf0469cd6558a3f033b768005e880ec95d5bb2a24b8929d2f6a05f18ca9977b291ad49b220a904f661cf6b47780a1cfd776109ed11d4e34d5345be8f66c
-DIST openjdk-8.322_p06.tar.gz 88114268 BLAKE2B 206b8373bacd829682e9203d9fbb14240994b63b7ddb3675cd3380ee7a4ab9c9016cdcc278b63d3110652ad02587d3c7965bc9865fed6c9ddd720e79bb917c71 SHA512 877b56bb11daf7295bd08d2a310cb4dc0478ac7465d4e7f88ba9b9ab2715761b2e83d2e47fb03dc82ec1f1651c9c0772f048360e1f71c0f91a19bda4b46cbcfc
DIST openjdk-8.332_p09.tar.gz 88130953 BLAKE2B 9c7419851588dfbca92610f8fbb8b74fa7516282f82e8c7c37af88c776ba0c83a22fb3d4a1c2c2b98d44e394025217d095cff9c79fba53f9c5a32a43eb91ad70 SHA512 f6a717f77cc0e85bc2eb3c3c599d09e06a4004e4987a2caf0773b1197336722469e2abcca9d39c1f4c534d15cd77408d6405c9ee6edb3815bccd8e4872571aaa
DIST openjdk-bootstrap-11.0.13_p8-ppc64.tar.xz 108215404 BLAKE2B 5e6c0b905b34b437137922b73a9724da96b8832186fea945f8c73d941db822ca1cc5718f3ecb4607ed98d1f8241c9f365b54caaf978863e8b84680a94f067b5d SHA512 732e2220219d42be10589fcaf2420da87ebc8564b4afc6bd02f61f31cdca9c31b339366e34d374fb814499b92f8aa796435a18f28e10c8cb00d9a0f5953bb60e
DIST openjdk-bootstrap-11.0.13_p8-x86.tar.xz 105420236 BLAKE2B d3137ad497937a9a04dedf38776f3ac45bf3b115d275991fd8582b72ade48390b6aa8ad89e0b4d34fa6a787a3c413dab20b32ef347dc8733544e810150c55d29 SHA512 f71a7ef8fbf19b0595dd7d4ebe52bbe1c95b8c17f34d092472c5f5ce8caf52a053f22db8587f1649f9a96ad01c0c632be343342812f5a8cc4ff843b33b8d9b0f
diff --git a/dev-java/openjdk/files/openjdk-17.0.3-fix-nullptr-cast.patch b/dev-java/openjdk/files/openjdk-17.0.3-fix-nullptr-cast.patch
new file mode 100644
index 00000000000..11f159680d8
--- /dev/null
+++ b/dev-java/openjdk/files/openjdk-17.0.3-fix-nullptr-cast.patch
@@ -0,0 +1,111 @@
+https://git.alpinelinux.org/aports/tree/community/openjdk17/FixNullPtrCast.patch
+https://github.com/openjdk/jdk17u/pull/347
+
+See also:
+https://www.openwall.com/lists/musl/2013/01/09/1
+https://git.musl-libc.org/cgit/musl/tree/include/unistd.h#n20
+
+Subject: Fix cast errors with latest GCC (11.2)
+Upstream: No
+Author: Simon Frankenberger <simon-alpine@fraho.eu>
+
+This patch fixes multiple casting errors reported by GCC 11.2
+
+--- old/src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.inline.hpp
++++ new/src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.inline.hpp
+@@ -205,7 +205,7 @@
+
+ // Note: We don't need a keep-alive-barrier here. We already enqueue any loaded reference for SATB anyway,
+ // because it must be the previous value.
+- res = load_reference_barrier(decorators, res, reinterpret_cast<T*>(NULL));
++ res = load_reference_barrier(decorators, res, static_cast<T*>(NULL));
+ satb_enqueue(res);
+ return res;
+ }
+@@ -216,7 +216,7 @@
+ oop previous = RawAccess<>::oop_atomic_xchg(addr, new_value);
+ // Note: We don't need a keep-alive-barrier here. We already enqueue any loaded reference for SATB anyway,
+ // because it must be the previous value.
+- previous = load_reference_barrier<T>(decorators, previous, reinterpret_cast<T*>(NULL));
++ previous = load_reference_barrier<T>(decorators, previous, static_cast<T*>(NULL));
+ satb_enqueue(previous);
+ return previous;
+ }
+--- old/src/hotspot/share/oops/access.hpp
++++ new/src/hotspot/share/oops/access.hpp
+@@ -294,8 +294,8 @@
+ static inline void arraycopy(arrayOop src_obj, size_t src_offset_in_bytes,
+ arrayOop dst_obj, size_t dst_offset_in_bytes,
+ size_t length) {
+- AccessT::arraycopy(src_obj, src_offset_in_bytes, reinterpret_cast<const T*>(NULL),
+- dst_obj, dst_offset_in_bytes, reinterpret_cast<T*>(NULL),
++ AccessT::arraycopy(src_obj, src_offset_in_bytes, static_cast<const T*>(NULL),
++ dst_obj, dst_offset_in_bytes, static_cast<T*>(NULL),
+ length);
+ }
+
+@@ -303,7 +303,7 @@
+ static inline void arraycopy_to_native(arrayOop src_obj, size_t src_offset_in_bytes,
+ T* dst,
+ size_t length) {
+- AccessT::arraycopy(src_obj, src_offset_in_bytes, reinterpret_cast<const T*>(NULL),
++ AccessT::arraycopy(src_obj, src_offset_in_bytes, static_cast<const T*>(NULL),
+ NULL, 0, dst,
+ length);
+ }
+@@ -313,15 +313,15 @@
+ arrayOop dst_obj, size_t dst_offset_in_bytes,
+ size_t length) {
+ AccessT::arraycopy(NULL, 0, src,
+- dst_obj, dst_offset_in_bytes, reinterpret_cast<T*>(NULL),
++ dst_obj, dst_offset_in_bytes, static_cast<T*>(NULL),
+ length);
+ }
+
+ static inline bool oop_arraycopy(arrayOop src_obj, size_t src_offset_in_bytes,
+ arrayOop dst_obj, size_t dst_offset_in_bytes,
+ size_t length) {
+- return AccessT::oop_arraycopy(src_obj, src_offset_in_bytes, reinterpret_cast<const HeapWord*>(NULL),
+- dst_obj, dst_offset_in_bytes, reinterpret_cast<HeapWord*>(NULL),
++ return AccessT::oop_arraycopy(src_obj, src_offset_in_bytes, static_cast<const HeapWord*>(NULL),
++ dst_obj, dst_offset_in_bytes, static_cast<HeapWord*>(NULL),
+ length);
+ }
+
+--- old/src/hotspot/cpu/x86/interp_masm_x86.cpp
++++ new/src/hotspot/cpu/x86/interp_masm_x86.cpp
+@@ -1122,7 +1122,7 @@
+
+ bind(loop);
+ // check if current entry is used
+- cmpptr(Address(rmon, BasicObjectLock::obj_offset_in_bytes()), (int32_t) NULL);
++ cmpptr(Address(rmon, BasicObjectLock::obj_offset_in_bytes()), 0);
+ jcc(Assembler::notEqual, exception);
+
+ addptr(rmon, entry_size); // otherwise advance to next entry
+--- old/src/hotspot/cpu/x86/interpreterRT_x86_64.cpp
++++ new/src/hotspot/cpu/x86/interpreterRT_x86_64.cpp
+@@ -443,10 +443,10 @@
+ _from -= Interpreter::stackElementSize;
+
+ if (_num_int_args < Argument::n_int_register_parameters_c-1) {
+- *_int_args++ = (*from_addr == 0) ? NULL : (intptr_t)from_addr;
++ *_int_args++ = (*from_addr == 0) ? (intptr_t) 0 : (intptr_t) from_addr;
+ _num_int_args++;
+ } else {
+- *_to++ = (*from_addr == 0) ? NULL : (intptr_t) from_addr;
++ *_to++ = (*from_addr == 0) ? (intptr_t) 0 : (intptr_t) from_addr;
+ }
+ }
+
+--- old/src/hotspot/cpu/aarch64/interpreterRT_aarch64.cpp
++++ new/src/hotspot/cpu/aarch64/interpreterRT_aarch64.cpp
+@@ -267,7 +267,7 @@
+
+ virtual void pass_object() {
+ intptr_t* addr = single_slot_addr();
+- intptr_t value = *addr == 0 ? NULL : (intptr_t)addr;
++ intptr_t value = *addr == 0 ? (intptr_t) 0 : (intptr_t)addr;
+ if (pass_gpr(value) < 0) {
+ pass_stack<>(value);
+ }
diff --git a/dev-java/openjdk/files/openjdk-17.env.sh b/dev-java/openjdk/files/openjdk-17.env.sh
deleted file mode 100644
index 7db6461bf48..00000000000
--- a/dev-java/openjdk/files/openjdk-17.env.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-VERSION="OpenJDK ${PV}"
-JAVA_HOME="${EPREFIX}/usr/$(get_libdir)/${PN}-${SLOT}"
-JDK_HOME="${EPREFIX}/usr/$(get_libdir)/${PN}-${SLOT}"
-JAVAC="\${JAVA_HOME}/bin/javac"
-PATH="\${JAVA_HOME}/bin"
-ROOTPATH="\${JAVA_HOME}/bin"
-LDPATH="\${JAVA_HOME}/lib/:\${JAVA_HOME}/lib/server/"
-MANPATH=""
-PROVIDES_TYPE="JDK JRE"
-PROVIDES_VERSION="${SLOT}"
-BOOTCLASSPATH=""
-GENERATION="2"
-ENV_VARS="JAVA_HOME JDK_HOME JAVAC PATH ROOTPATH LDPATH MANPATH"
diff --git a/dev-java/openjdk/files/openjdk-8.env.sh b/dev-java/openjdk/files/openjdk-8.env.sh
index 8f863e4c869..cc0bc80b474 100644
--- a/dev-java/openjdk/files/openjdk-8.env.sh
+++ b/dev-java/openjdk/files/openjdk-8.env.sh
@@ -1,6 +1,3 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
VERSION="OpenJDK ${PV}"
JAVA_HOME="${EPREFIX}/usr/$(get_libdir)/${PN}-${SLOT}"
JDK_HOME="${EPREFIX}/usr/$(get_libdir)/${PN}-${SLOT}"
diff --git a/dev-java/openjdk/files/openjdk-11.env.sh b/dev-java/openjdk/files/openjdk.env.sh
index 96c4be79c33..287c0578b7c 100644
--- a/dev-java/openjdk/files/openjdk-11.env.sh
+++ b/dev-java/openjdk/files/openjdk.env.sh
@@ -1,6 +1,3 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
VERSION="OpenJDK ${PV}"
JAVA_HOME="${EPREFIX}/usr/$(get_libdir)/${PN}-${SLOT}"
JDK_HOME="${EPREFIX}/usr/$(get_libdir)/${PN}-${SLOT}"
diff --git a/dev-java/openjdk/openjdk-11.0.14_p9-r1.ebuild b/dev-java/openjdk/openjdk-11.0.15_p10-r1.ebuild
index c9dc36e2d7b..4b7612e1259 100644
--- a/dev-java/openjdk/openjdk-11.0.14_p9-r1.ebuild
+++ b/dev-java/openjdk/openjdk-11.0.15_p10-r1.ebuild
@@ -59,7 +59,7 @@ COMMON_DEPEND="
media-libs/libpng:0=
media-libs/lcms:2=
sys-libs/zlib
- virtual/jpeg:0=
+ media-libs/libjpeg-turbo:0=
systemtap? ( dev-util/systemtap )
"
@@ -138,14 +138,11 @@ pkg_setup() {
if use system-bootstrap; then
for vm in ${JAVA_PKG_WANT_BUILD_VM}; do
- if [[ -d ${EPREFIX}/usr/lib/jvm/${vm} ]]; then
+ if [[ -d ${BROOT}/usr/lib/jvm/${vm} ]]; then
java-pkg-2_pkg_setup
return
fi
done
- else
- local xpakvar="${ARCH^^}_XPAK"
- export JDK_HOME="${WORKDIR}/openjdk-bootstrap-${!xpakvar}"
fi
}
@@ -156,6 +153,11 @@ src_prepare() {
}
src_configure() {
+ if ! use system-bootstrap; then
+ local xpakvar="${ARCH^^}_XPAK"
+ export JDK_HOME="${WORKDIR}/openjdk-bootstrap-${!xpakvar}"
+ fi
+
# Work around stack alignment issue, bug #647954.
use x86 && append-flags -mincoming-stack-boundary=2
@@ -276,7 +278,7 @@ src_install() {
einfo "Creating the Class Data Sharing archives and disabling usage tracking"
"${ddest}/bin/java" -server -Xshare:dump -Djdk.disableLastUsageTracking || die
- java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
+ java-vm_install-env "${FILESDIR}"/${PN}.env.sh
java-vm_revdep-mask
java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
diff --git a/dev-java/openjdk/openjdk-11.0.15_p10.ebuild b/dev-java/openjdk/openjdk-11.0.15_p10.ebuild
deleted file mode 100644
index 76cfa3954b7..00000000000
--- a/dev-java/openjdk/openjdk-11.0.15_p10.ebuild
+++ /dev/null
@@ -1,292 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit eapi8-dosym check-reqs flag-o-matic java-pkg-2 java-vm-2 multiprocessing toolchain-funcs
-
-# we need -ga tag to fetch tarball and unpack it, but exact number everywhere else to
-# set build version properly
-MY_PV="${PV%_p*}-ga"
-SLOT="${MY_PV%%[.+]*}"
-
-# variable name format: <UPPERCASE_KEYWORD>_XPAK
-PPC64_XPAK="11.0.13_p8" # big-endian bootstrap tarball
-RISCV_XPAK="11.0.14_p9" # lp64d bootstrap tarball
-X86_XPAK="11.0.13_p8"
-
-# Usage: bootstrap_uri <keyword> <version> [extracond]
-# Example: $(bootstrap_uri ppc64 17.0.1_p12 big-endian)
-# Output: ppc64? ( big-endian? ( https://...17.0.1_p12-ppc64.tar.xz ) )
-bootstrap_uri() {
- local baseuri="https://dev.gentoo.org/~arthurzam/distfiles/dev-java/${PN}/${PN}-bootstrap"
- local suff="tar.xz"
- local kw="${1:?${FUNCNAME[0]}: keyword not specified}"
- local ver="${2:?${FUNCNAME[0]}: version not specified}"
- local cond="${3-}"
-
- # here be dragons
- echo "${kw}? ( ${cond:+${cond}? (} ${baseuri}-${ver}-${kw}.${suff} ${cond:+) })"
-}
-
-DESCRIPTION="Open source implementation of the Java programming language"
-HOMEPAGE="https://openjdk.java.net"
-SRC_URI="
- https://github.com/${PN}/jdk${SLOT}u/archive/refs/tags/jdk-${MY_PV}.tar.gz
- -> ${P}.tar.gz
- !system-bootstrap? (
- $(bootstrap_uri ppc64 ${PPC64_XPAK} big-endian)
- $(bootstrap_uri riscv ${RISCV_XPAK})
- $(bootstrap_uri x86 ${X86_XPAK})
- )
- riscv? ( https://dev.gentoo.org/~arthurzam/distfiles/dev-java/openjdk/openjdk-11.0.14-riscv.patch.xz )
-"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-
-IUSE="alsa big-endian cups debug doc examples headless-awt javafx +jbootstrap selinux source system-bootstrap systemtap"
-
-REQUIRED_USE="
- javafx? ( alsa !headless-awt )
- !system-bootstrap? ( jbootstrap )
-"
-
-COMMON_DEPEND="
- media-libs/freetype:2=
- media-libs/giflib:0/7
- media-libs/harfbuzz:=
- media-libs/libpng:0=
- media-libs/lcms:2=
- sys-libs/zlib
- virtual/jpeg:0=
- systemtap? ( dev-util/systemtap )
-"
-
-# Many libs are required to build, but not to run, make is possible to remove
-# by listing conditionally in RDEPEND unconditionally in DEPEND
-RDEPEND="
- ${COMMON_DEPEND}
- >=sys-apps/baselayout-java-0.1.0-r1
- !headless-awt? (
- x11-libs/libX11
- x11-libs/libXext
- x11-libs/libXi
- x11-libs/libXrandr
- x11-libs/libXrender
- x11-libs/libXt
- x11-libs/libXtst
- )
- alsa? ( media-libs/alsa-lib )
- cups? ( net-print/cups )
- selinux? ( sec-policy/selinux-java )
-"
-
-DEPEND="
- ${COMMON_DEPEND}
- app-arch/zip
- media-libs/alsa-lib
- net-print/cups
- x11-base/xorg-proto
- x11-libs/libX11
- x11-libs/libXext
- x11-libs/libXi
- x11-libs/libXrandr
- x11-libs/libXrender
- x11-libs/libXt
- x11-libs/libXtst
- javafx? ( dev-java/openjfx:${SLOT}= )
- system-bootstrap? (
- || (
- dev-java/openjdk-bin:${SLOT}[gentoo-vm(+)]
- dev-java/openjdk:${SLOT}[gentoo-vm(+)]
- )
- )
-"
-
-S="${WORKDIR}/jdk${SLOT}u-jdk-${MY_PV}"
-
-# The space required to build varies wildly depending on USE flags,
-# ranging from 2GB to 16GB. This function is certainly not exact but
-# should be close enough to be useful.
-openjdk_check_requirements() {
- local M
- M=2048
- M=$(( $(usex jbootstrap 2 1) * $M ))
- M=$(( $(usex debug 3 1) * $M ))
- M=$(( $(usex doc 320 0) + $(usex source 128 0) + 192 + $M ))
-
- CHECKREQS_DISK_BUILD=${M}M check-reqs_pkg_${EBUILD_PHASE}
-}
-
-pkg_pretend() {
- openjdk_check_requirements
- if [[ ${MERGE_TYPE} != binary ]]; then
- has ccache ${FEATURES} && die "FEATURES=ccache doesn't work with ${PN}, bug #677876"
- fi
-}
-
-pkg_setup() {
- openjdk_check_requirements
- java-vm-2_pkg_setup
-
- [[ ${MERGE_TYPE} == "binary" ]] && return
-
- JAVA_PKG_WANT_BUILD_VM="openjdk-${SLOT} openjdk-bin-${SLOT}"
- JAVA_PKG_WANT_SOURCE="${SLOT}"
- JAVA_PKG_WANT_TARGET="${SLOT}"
-
- if use system-bootstrap; then
- for vm in ${JAVA_PKG_WANT_BUILD_VM}; do
- if [[ -d ${EPREFIX}/usr/lib/jvm/${vm} ]]; then
- java-pkg-2_pkg_setup
- return
- fi
- done
- else
- local xpakvar="${ARCH^^}_XPAK"
- export JDK_HOME="${WORKDIR}/openjdk-bootstrap-${!xpakvar}"
- fi
-}
-
-src_prepare() {
- use riscv && eapply "${WORKDIR}"/openjdk-11.0.14-riscv.patch
- default
- chmod +x configure || die
-}
-
-src_configure() {
- # Work around stack alignment issue, bug #647954.
- use x86 && append-flags -mincoming-stack-boundary=2
-
- # Work around -fno-common ( GCC10 default ), bug #713180
- append-flags -fcommon
-
- # Strip some flags users may set, but should not. #818502
- filter-flags -fexceptions
-
- # Enabling full docs appears to break doc building. If not
- # explicitly disabled, the flag will get auto-enabled if pandoc and
- # graphviz are detected. pandoc has loads of dependencies anyway.
-
- local myconf=(
- --disable-ccache
- --disable-precompiled-headers
- --enable-full-docs=no
- --with-boot-jdk="${JDK_HOME}"
- --with-extra-cflags="${CFLAGS}"
- --with-extra-cxxflags="${CXXFLAGS}"
- --with-extra-ldflags="${LDFLAGS}"
- --with-freetype="${XPAK_BOOTSTRAP:-system}"
- --with-giflib="${XPAK_BOOTSTRAP:-system}"
- --with-harfbuzz="${XPAK_BOOTSTRAP:-system}"
- --with-lcms="${XPAK_BOOTSTRAP:-system}"
- --with-libjpeg="${XPAK_BOOTSTRAP:-system}"
- --with-libpng="${XPAK_BOOTSTRAP:-system}"
- --with-native-debug-symbols=$(usex debug internal none)
- --with-vendor-name="Gentoo"
- --with-vendor-url="https://gentoo.org"
- --with-vendor-bug-url="https://bugs.gentoo.org"
- --with-vendor-vm-bug-url="https://bugs.openjdk.java.net"
- --with-vendor-version-string="${PVR}"
- --with-version-pre=""
- --with-version-string="${PV%_p*}"
- --with-version-build="${PV#*_p}"
- --with-zlib="${XPAK_BOOTSTRAP:-system}"
- --enable-dtrace=$(usex systemtap yes no)
- --enable-headless-only=$(usex headless-awt yes no)
- $(tc-is-clang && echo "--with-toolchain-type=clang")
- )
- ! use riscv && myconf+=( --with-jvm-features=shenandoahgc )
-
- if use javafx; then
- # this is not useful for users, just for upstream developers
- # build system compares mesa version in md file
- # https://bugs.gentoo.org/822612
- export LEGAL_EXCLUDES=mesa3d.md
-
- local zip="${EPREFIX}/usr/$(get_libdir)/openjfx-${SLOT}/javafx-exports.zip"
- if [[ -r ${zip} ]]; then
- myconf+=( --with-import-modules="${zip}" )
- else
- die "${zip} not found or not readable"
- fi
- fi
-
- if use !system-bootstrap ; then
- addpredict /dev/random
- addpredict /proc/self/coredump_filter
- fi
-
- (
- unset _JAVA_OPTIONS JAVA JAVA_TOOL_OPTIONS JAVAC XARGS
- CFLAGS= CXXFLAGS= LDFLAGS= \
- CONFIG_SITE=/dev/null \
- econf "${myconf[@]}"
- )
-}
-
-src_compile() {
- local myemakeargs=(
- JOBS=$(makeopts_jobs)
- LOG=debug
- CFLAGS_WARNINGS_ARE_ERRORS= # No -Werror
- NICE= # Use PORTAGE_NICENESS, don't adjust further down
- $(usex doc docs '')
- $(usex jbootstrap bootcycle-images product-images)
- )
- emake "${myemakeargs[@]}" -j1 #nowarn
-}
-
-src_install() {
- local dest="/usr/$(get_libdir)/${PN}-${SLOT}"
- local ddest="${ED}/${dest#/}"
-
- cd "${S}"/build/*-release/images/jdk || die
-
- # Create files used as storage for system preferences.
- mkdir .systemPrefs || die
- touch .systemPrefs/.system.lock || die
- touch .systemPrefs/.systemRootModFile || die
-
- # Oracle and IcedTea have libjsoundalsa.so depending on
- # libasound.so.2 but OpenJDK only has libjsound.so. Weird.
- if ! use alsa ; then
- rm -v lib/libjsound.* || die
- fi
-
- if ! use examples ; then
- rm -vr demo/ || die
- fi
-
- if ! use source ; then
- rm -v lib/src.zip || die
- fi
-
- rm -v lib/security/cacerts || die
-
- dodir "${dest}"
- cp -pPR * "${ddest}" || die
-
- dosym8 -r /etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts
-
- # must be done before running itself
- java-vm_set-pax-markings "${ddest}"
-
- einfo "Creating the Class Data Sharing archives and disabling usage tracking"
- "${ddest}/bin/java" -server -Xshare:dump -Djdk.disableLastUsageTracking || die
-
- java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
- java-vm_revdep-mask
- java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
-
- if use doc ; then
- docinto html
- dodoc -r "${S}"/build/*-release/images/docs/*
- dosym8 -r /usr/share/doc/"${PF}" /usr/share/doc/"${PN}-${SLOT}"
- fi
-}
-
-pkg_postinst() {
- java-vm-2_pkg_postinst
-}
diff --git a/dev-java/openjdk/openjdk-17.0.2_p8.ebuild b/dev-java/openjdk/openjdk-17.0.2_p8.ebuild
deleted file mode 100644
index 1a4d2981a7f..00000000000
--- a/dev-java/openjdk/openjdk-17.0.2_p8.ebuild
+++ /dev/null
@@ -1,313 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit check-reqs eapi8-dosym flag-o-matic java-pkg-2 java-vm-2 multiprocessing toolchain-funcs
-
-# variable name format: <UPPERCASE_KEYWORD>_XPAK
-ARM64_XPAK="17.0.2_p8" # musl bootstrap install
-PPC64_XPAK="17.0.1_p12" # big-endian bootstrap tarball
-X86_XPAK="17.0.1_p12"
-
-# Usage: bootstrap_uri <keyword> <version> [extracond]
-# Example: $(bootstrap_uri ppc64 17.0.1_p12 big-endian)
-# Output: ppc64? ( big-endian? ( https://...17.0.1_p12-ppc64.tar.xz ) )
-bootstrap_uri() {
- local baseuri="https://dev.gentoo.org/~arthurzam/distfiles/dev-java/${PN}/${PN}-bootstrap"
- local suff="tar.xz"
- local kw="${1:?${FUNCNAME[0]}: keyword not specified}"
- local ver="${2:?${FUNCNAME[0]}: version not specified}"
- local cond="${3-}"
- [[ ${cond} == elibc_musl* ]] && local musl=yes
-
- # here be dragons
- echo "${kw}? ( ${cond:+${cond}? (} ${baseuri}-${ver}-${kw}${musl:+-musl}.${suff} ${cond:+) })"
-}
-
-MY_PV="${PV//_p/+}"
-SLOT="$(ver_cut 1)"
-
-DESCRIPTION="Open source implementation of the Java programming language"
-HOMEPAGE="https://openjdk.java.net"
-SRC_URI="
- https://github.com/${PN}/jdk${SLOT}u/archive/refs/tags/jdk-${MY_PV}.tar.gz
- -> ${P}.tar.gz
- !system-bootstrap? (
- $(bootstrap_uri arm64 ${ARM64_XPAK} elibc_musl)
- $(bootstrap_uri ppc64 ${PPC64_XPAK} big-endian)
- $(bootstrap_uri x86 ${X86_XPAK})
- )
-"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 ~arm arm64 ppc64 ~x86"
-
-IUSE="alsa big-endian cups debug doc examples gentoo-vm headless-awt javafx +jbootstrap selinux source system-bootstrap systemtap"
-
-REQUIRED_USE="
- javafx? ( alsa !headless-awt )
- !system-bootstrap? ( jbootstrap )
-"
-
-COMMON_DEPEND="
- media-libs/freetype:2=
- media-libs/giflib:0/7
- media-libs/harfbuzz:=
- media-libs/libpng:0=
- media-libs/lcms:2=
- sys-libs/zlib
- virtual/jpeg:0=
- systemtap? ( dev-util/systemtap )
-"
-
-# Many libs are required to build, but not to run, make is possible to remove
-# by listing conditionally in RDEPEND unconditionally in DEPEND
-RDEPEND="
- ${COMMON_DEPEND}
- >=sys-apps/baselayout-java-0.1.0-r1
- !headless-awt? (
- x11-libs/libX11
- x11-libs/libXext
- x11-libs/libXi
- x11-libs/libXrandr
- x11-libs/libXrender
- x11-libs/libXt
- x11-libs/libXtst
- )
- alsa? ( media-libs/alsa-lib )
- cups? ( net-print/cups )
- selinux? ( sec-policy/selinux-java )
-"
-
-DEPEND="
- ${COMMON_DEPEND}
- app-arch/zip
- media-libs/alsa-lib
- net-print/cups
- x11-base/xorg-proto
- x11-libs/libX11
- x11-libs/libXext
- x11-libs/libXi
- x11-libs/libXrandr
- x11-libs/libXrender
- x11-libs/libXt
- x11-libs/libXtst
- javafx? ( dev-java/openjfx:${SLOT}= )
- system-bootstrap? (
- || (
- dev-java/openjdk-bin:${SLOT}
- dev-java/openjdk:${SLOT}
- )
- )
-"
-
-S="${WORKDIR}/jdk${SLOT}u-jdk-${MY_PV//+/-}"
-
-# The space required to build varies wildly depending on USE flags,
-# ranging from 2GB to 16GB. This function is certainly not exact but
-# should be close enough to be useful.
-openjdk_check_requirements() {
- local M
- M=2048
- M=$(( $(usex jbootstrap 2 1) * $M ))
- M=$(( $(usex debug 3 1) * $M ))
- M=$(( $(usex doc 320 0) + $(usex source 128 0) + 192 + $M ))
-
- CHECKREQS_DISK_BUILD=${M}M check-reqs_pkg_${EBUILD_PHASE}
-}
-
-pkg_pretend() {
- openjdk_check_requirements
- if [[ ${MERGE_TYPE} != binary ]]; then
- has ccache ${FEATURES} && die "FEATURES=ccache doesn't work with ${PN}, bug #677876"
- fi
-}
-
-pkg_setup() {
- openjdk_check_requirements
- java-vm-2_pkg_setup
-
- [[ ${MERGE_TYPE} == "binary" ]] && return
-
- JAVA_PKG_WANT_BUILD_VM="openjdk-${SLOT} openjdk-bin-${SLOT}"
- JAVA_PKG_WANT_SOURCE="${SLOT}"
- JAVA_PKG_WANT_TARGET="${SLOT}"
-
- # The nastiness below is necessary while the gentoo-vm USE flag is
- # masked. First we call java-pkg-2_pkg_setup if it looks like the
- # flag was unmasked against one of the possible build VMs. If not,
- # we try finding one of them in their expected locations. This would
- # have been slightly less messy if openjdk-bin had been installed to
- # /opt/${PN}-${SLOT} or if there was a mechanism to install a VM env
- # file but disable it so that it would not normally be selectable.
-
- local vm
- for vm in ${JAVA_PKG_WANT_BUILD_VM}; do
- if [[ -d ${EPREFIX}/usr/lib/jvm/${vm} ]]; then
- java-pkg-2_pkg_setup
- return
- fi
- done
-
- if has_version dev-java/openjdk:${SLOT}; then
- export JDK_HOME=${EPREFIX}/usr/$(get_libdir)/openjdk-${SLOT}
- elif use !system-bootstrap ; then
- local xpakvar="${ARCH^^}_XPAK"
- export JDK_HOME="${WORKDIR}/openjdk-bootstrap-${!xpakvar}"
- else
- JDK_HOME=$(best_version dev-java/openjdk-bin:${SLOT})
- [[ -n ${JDK_HOME} ]] || die "Build VM not found!"
- JDK_HOME=${JDK_HOME#*/}
- JDK_HOME=${EPREFIX}/opt/${JDK_HOME%-r*}
- export JDK_HOME
- fi
-}
-
-src_prepare() {
- default
- chmod +x configure || die
-}
-
-src_configure() {
- # Work around stack alignment issue, bug #647954. in case we ever have x86
- use x86 && append-flags -mincoming-stack-boundary=2
-
- # Work around -fno-common ( GCC10 default ), bug #713180
- append-flags -fcommon
-
- # Strip some flags users may set, but should not. #818502
- filter-flags -fexceptions
-
- # Enabling full docs appears to break doc building. If not
- # explicitly disabled, the flag will get auto-enabled if pandoc and
- # graphviz are detected. pandoc has loads of dependencies anyway.
-
- local myconf=(
- --disable-ccache
- --disable-precompiled-headers
- --disable-warnings-as-errors
- --enable-full-docs=no
- --with-boot-jdk="${JDK_HOME}"
- --with-extra-cflags="${CFLAGS}"
- --with-extra-cxxflags="${CXXFLAGS}"
- --with-extra-ldflags="${LDFLAGS}"
- --with-freetype="${XPAK_BOOTSTRAP:-system}"
- --with-giflib="${XPAK_BOOTSTRAP:-system}"
- --with-harfbuzz="${XPAK_BOOTSTRAP:-system}"
- --with-lcms="${XPAK_BOOTSTRAP:-system}"
- --with-libjpeg="${XPAK_BOOTSTRAP:-system}"
- --with-libpng="${XPAK_BOOTSTRAP:-system}"
- --with-native-debug-symbols=$(usex debug internal none)
- --with-vendor-name="Gentoo"
- --with-vendor-url="https://gentoo.org"
- --with-vendor-bug-url="https://bugs.gentoo.org"
- --with-vendor-vm-bug-url="https://bugs.openjdk.java.net"
- --with-vendor-version-string="${PVR}"
- --with-version-pre=""
- --with-version-string="${PV%_p*}"
- --with-version-build="${PV#*_p}"
- --with-zlib="${XPAK_BOOTSTRAP:-system}"
- --enable-dtrace=$(usex systemtap yes no)
- --enable-headless-only=$(usex headless-awt yes no)
- $(tc-is-clang && echo "--with-toolchain-type=clang")
- )
-
- if use javafx; then
- local zip="${EPREFIX}/usr/$(get_libdir)/openjfx-${SLOT}/javafx-exports.zip"
- if [[ -r ${zip} ]]; then
- myconf+=( --with-import-modules="${zip}" )
- else
- die "${zip} not found or not readable"
- fi
- fi
-
- if use !system-bootstrap ; then
- addpredict /dev/random
- addpredict /proc/self/coredump_filter
- fi
-
- (
- unset _JAVA_OPTIONS JAVA JAVA_TOOL_OPTIONS JAVAC XARGS
- CFLAGS= CXXFLAGS= LDFLAGS= \
- CONFIG_SITE=/dev/null \
- econf "${myconf[@]}"
- )
-}
-
-src_compile() {
- local myemakeargs=(
- JOBS=$(makeopts_jobs)
- LOG=debug
- CFLAGS_WARNINGS_ARE_ERRORS= # No -Werror
- NICE= # Use PORTAGE_NICENESS, don't adjust further down
- $(usex doc docs '')
- $(usex jbootstrap bootcycle-images product-images)
- )
- emake "${myemakeargs[@]}" -j1 #nowarn
-}
-
-src_install() {
- local dest="/usr/$(get_libdir)/${PN}-${SLOT}"
- local ddest="${ED}/${dest#/}"
-
- cd "${S}"/build/*-release/images/jdk || die
-
- # Create files used as storage for system preferences.
- mkdir .systemPrefs || die
- touch .systemPrefs/.system.lock || die
- touch .systemPrefs/.systemRootModFile || die
-
- # Oracle and IcedTea have libjsoundalsa.so depending on
- # libasound.so.2 but OpenJDK only has libjsound.so. Weird.
- if ! use alsa ; then
- rm -v lib/libjsound.* || die
- fi
-
- if ! use examples ; then
- rm -vr demo/ || die
- fi
-
- if ! use source ; then
- rm -v lib/src.zip || die
- fi
-
- rm -v lib/security/cacerts || die
-
- dodir "${dest}"
- cp -pPR * "${ddest}" || die
-
- dosym -r /etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts
-
- # must be done before running itself
- java-vm_set-pax-markings "${ddest}"
-
- einfo "Creating the Class Data Sharing archives and disabling usage tracking"
- "${ddest}/bin/java" -server -Xshare:dump -Djdk.disableLastUsageTracking || die
-
- use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
- java-vm_revdep-mask
- java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
-
- if use doc ; then
- docinto html
- dodoc -r "${S}"/build/*-release/images/docs/*
- dosym ../../../usr/share/doc/"${PF}" /usr/share/doc/"${PN}-${SLOT}"
- fi
-}
-
-pkg_postinst() {
- java-vm-2_pkg_postinst
-
- if use gentoo-vm ; then
- ewarn "WARNING! You have enabled the gentoo-vm USE flag, making this JDK"
- ewarn "recognised by the system. This will almost certainly break"
- ewarn "many java ebuilds as they are not ready for openjdk-${SLOT}"
- else
- ewarn "The experimental gentoo-vm USE flag has not been enabled so this JDK"
- ewarn "will not be recognised by the system. For example, simply calling"
- ewarn "\"java\" will launch a different JVM. This is necessary until Gentoo"
- ewarn "fully supports Java ${SLOT}. This JDK must therefore be invoked using its"
- ewarn "absolute location under ${EPREFIX}/usr/$(get_libdir)/${PN}-${SLOT}."
- fi
-}
diff --git a/dev-java/openjdk/openjdk-17.0.3_p7.ebuild b/dev-java/openjdk/openjdk-17.0.3_p7-r1.ebuild
index 7ee5a1d3d7e..c79922b3571 100644
--- a/dev-java/openjdk/openjdk-17.0.3_p7.ebuild
+++ b/dev-java/openjdk/openjdk-17.0.3_p7-r1.ebuild
@@ -44,9 +44,9 @@ SRC_URI="
"
LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 ~riscv x86"
-IUSE="alsa big-endian cups debug doc examples gentoo-vm headless-awt javafx +jbootstrap selinux source system-bootstrap systemtap"
+IUSE="alsa big-endian cups debug doc examples +gentoo-vm headless-awt javafx +jbootstrap selinux source system-bootstrap systemtap"
REQUIRED_USE="
javafx? ( alsa !headless-awt )
@@ -60,7 +60,7 @@ COMMON_DEPEND="
media-libs/libpng:0=
media-libs/lcms:2=
sys-libs/zlib
- virtual/jpeg:0=
+ media-libs/libjpeg-turbo:0=
systemtap? ( dev-util/systemtap )
"
@@ -107,6 +107,8 @@ DEPEND="
S="${WORKDIR}/jdk${SLOT}u-jdk-${MY_PV//+/-}"
+PATCHES=( "${FILESDIR}"/${PN}-17.0.3-fix-nullptr-cast.patch )
+
# The space required to build varies wildly depending on USE flags,
# ranging from 2GB to 16GB. This function is certainly not exact but
# should be close enough to be useful.
@@ -147,33 +149,33 @@ pkg_setup() {
local vm
for vm in ${JAVA_PKG_WANT_BUILD_VM}; do
- if [[ -d ${EPREFIX}/usr/lib/jvm/${vm} ]]; then
+ if [[ -d ${BROOT}/usr/lib/jvm/${vm} ]]; then
java-pkg-2_pkg_setup
return
fi
done
+}
+
+src_prepare() {
+ use riscv && eapply "${WORKDIR}"/openjdk-17.0.3-riscv.patch
+ default
+ chmod +x configure || die
+}
+src_configure() {
if has_version dev-java/openjdk:${SLOT}; then
- export JDK_HOME=${EPREFIX}/usr/$(get_libdir)/openjdk-${SLOT}
+ export JDK_HOME=${BROOT}/usr/$(get_libdir)/openjdk-${SLOT}
elif use !system-bootstrap ; then
local xpakvar="${ARCH^^}_XPAK"
export JDK_HOME="${WORKDIR}/openjdk-bootstrap-${!xpakvar}"
else
- JDK_HOME=$(best_version dev-java/openjdk-bin:${SLOT})
+ JDK_HOME=$(best_version -b dev-java/openjdk-bin:${SLOT})
[[ -n ${JDK_HOME} ]] || die "Build VM not found!"
JDK_HOME=${JDK_HOME#*/}
- JDK_HOME=${EPREFIX}/opt/${JDK_HOME%-r*}
+ JDK_HOME=${BROOT}/opt/${JDK_HOME%-r*}
export JDK_HOME
fi
-}
-src_prepare() {
- use riscv && eapply "${WORKDIR}"/openjdk-17.0.3-riscv.patch
- default
- chmod +x configure || die
-}
-
-src_configure() {
# Work around stack alignment issue, bug #647954. in case we ever have x86
use x86 && append-flags -mincoming-stack-boundary=2
@@ -283,7 +285,7 @@ src_install() {
dodir "${dest}"
cp -pPR * "${ddest}" || die
- dosym -r /etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts
+ dosym8 -r /etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts
# must be done before running itself
java-vm_set-pax-markings "${ddest}"
@@ -291,7 +293,7 @@ src_install() {
einfo "Creating the Class Data Sharing archives and disabling usage tracking"
"${ddest}/bin/java" -server -Xshare:dump -Djdk.disableLastUsageTracking || die
- use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
+ use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}.env.sh
java-vm_revdep-mask
java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
@@ -304,16 +306,4 @@ src_install() {
pkg_postinst() {
java-vm-2_pkg_postinst
-
- if use gentoo-vm ; then
- ewarn "WARNING! You have enabled the gentoo-vm USE flag, making this JDK"
- ewarn "recognised by the system. This will almost certainly break"
- ewarn "many java ebuilds as they are not ready for openjdk-${SLOT}"
- else
- ewarn "The experimental gentoo-vm USE flag has not been enabled so this JDK"
- ewarn "will not be recognised by the system. For example, simply calling"
- ewarn "\"java\" will launch a different JVM. This is necessary until Gentoo"
- ewarn "fully supports Java ${SLOT}. This JDK must therefore be invoked using its"
- ewarn "absolute location under ${EPREFIX}/usr/$(get_libdir)/${PN}-${SLOT}."
- fi
}
diff --git a/dev-java/openjdk/openjdk-8.322_p06.ebuild b/dev-java/openjdk/openjdk-8.322_p06.ebuild
deleted file mode 100644
index 5af7952e09b..00000000000
--- a/dev-java/openjdk/openjdk-8.322_p06.ebuild
+++ /dev/null
@@ -1,224 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit check-reqs eapi8-dosym flag-o-matic java-pkg-2 java-vm-2 multiprocessing toolchain-funcs
-
-# we need latest -ga tag from git, but want to keep build number as well
-# as _p component of the gentoo version string.
-
-MY_PV="$(ver_rs 1 'u' 2 '-' ${PV%_p*}-ga)"
-SLOT="${PV%%[.+]*}"
-
-DESCRIPTION="Open source implementation of the Java programming language"
-HOMEPAGE="https://openjdk.java.net"
-SRC_URI="https://github.com/openjdk/jdk${SLOT}u/archive/refs/tags/jdk${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 arm64 ppc64 x86"
-IUSE="alsa debug cups doc examples headless-awt javafx +jbootstrap selinux source"
-
-COMMON_DEPEND="
- media-libs/freetype:2=
- media-libs/giflib:0/7
- sys-libs/zlib
-"
-# Many libs are required to build, but not to run, make is possible to remove
-# by listing conditionally in RDEPEND unconditionally in DEPEND
-RDEPEND="
- ${COMMON_DEPEND}
- >=sys-apps/baselayout-java-0.1.0-r1
- !headless-awt? (
- x11-libs/libX11
- x11-libs/libXext
- x11-libs/libXi
- x11-libs/libXrender
- x11-libs/libXt
- x11-libs/libXtst
- )
- alsa? ( media-libs/alsa-lib )
- cups? ( net-print/cups )
- selinux? ( sec-policy/selinux-java )
-"
-
-DEPEND="
- ${COMMON_DEPEND}
- app-arch/zip
- media-libs/alsa-lib
- net-print/cups
- virtual/pkgconfig
- x11-base/xorg-proto
- x11-libs/libX11
- x11-libs/libXext
- x11-libs/libXi
- x11-libs/libXrender
- x11-libs/libXt
- x11-libs/libXtst
- || (
- dev-java/openjdk-bin:${SLOT}
- dev-java/icedtea-bin:${SLOT}
- dev-java/openjdk:${SLOT}
- dev-java/icedtea:${SLOT}
- )
-"
-
-BDEPEND="
- virtual/pkgconfig
-"
-
-PDEPEND="javafx? ( dev-java/openjfx:${SLOT} )"
-
-S="${WORKDIR}/jdk${SLOT}u-jdk${MY_PV}"
-
-PATCHES=( "${FILESDIR}/openjdk-8-insantiate-arrayallocator.patch" )
-
-# The space required to build varies wildly depending on USE flags,
-# ranging from 2GB to 16GB. This function is certainly not exact but
-# should be close enough to be useful.
-openjdk_check_requirements() {
- local M
- M=2048
- M=$(( $(usex debug 3 1) * $M ))
- M=$(( $(usex jbootstrap 2 1) * $M ))
- M=$(( $(usex doc 320 0) + $(usex source 128 0) + 192 + $M ))
-
- CHECKREQS_DISK_BUILD=${M}M check-reqs_pkg_${EBUILD_PHASE}
-}
-
-pkg_pretend() {
- openjdk_check_requirements
- if [[ ${MERGE_TYPE} != binary ]]; then
- has ccache ${FEATURES} && die "FEATURES=ccache doesn't work with ${PN}, bug #677876"
- fi
-}
-
-pkg_setup() {
- openjdk_check_requirements
-
- JAVA_PKG_WANT_BUILD_VM="openjdk-${SLOT} openjdk-bin-${SLOT} icedtea-${SLOT} icedtea-bin-${SLOT}"
- JAVA_PKG_WANT_SOURCE="${SLOT}"
- JAVA_PKG_WANT_TARGET="${SLOT}"
-
- java-vm-2_pkg_setup
- java-pkg-2_pkg_setup
-}
-
-src_prepare() {
- default
-
- # new warnings in new gcc https://bugs.gentoo.org/685426
- sed -i '/^WARNINGS_ARE_ERRORS/ s/-Werror/-Wno-error/' \
- hotspot/make/linux/makefiles/gcc.make || die
-
- chmod +x configure || die
-}
-
-src_configure() {
- # general build info found here:
- #https://hg.openjdk.java.net/jdk8/jdk8/raw-file/tip/README-builds.html
-
- # Work around stack alignment issue, bug #647954.
- use x86 && append-flags -mincoming-stack-boundary=2
-
- # Work around -fno-common ( GCC10 default ), bug #706638
- append-flags -fcommon
-
- # Strip some flags users may set, but should not. #818502
- filter-flags -fexceptions
-
- tc-export_build_env CC CXX PKG_CONFIG STRIP
-
- local myconf=(
- --disable-ccache
- --disable-freetype-bundling
- --disable-precompiled-headers
- --enable-unlimited-crypto
- --with-boot-jdk="${JDK_HOME}"
- --with-extra-cflags="${CFLAGS}"
- --with-extra-cxxflags="${CXXFLAGS}"
- --with-extra-ldflags="${LDFLAGS}"
- --with-freetype-lib="$( $(tc-getPKG_CONFIG) --variable=libdir freetype2 )"
- --with-freetype-include="$( $(tc-getPKG_CONFIG) --variable=includedir freetype2)/freetype2"
- --with-giflib=system
- --with-jtreg=no
- --with-jobs=1
- --with-num-cores=1
- --with-update-version="$(ver_cut 2)"
- --with-build-number="b$(ver_cut 4)"
- --with-milestone="fcs" # magic variable that means "release version"
- --with-vendor-name="Gentoo"
- --with-vendor-url="https://gentoo.org"
- --with-vendor-bug-url="https://bugs.gentoo.org"
- --with-vendor-vm-bug-url="https://bugs.openjdk.java.net"
- --with-zlib=system
- --with-native-debug-symbols=$(usex debug internal none)
- $(usex headless-awt --disable-headful '')
- $(tc-is-clang && echo "--with-toolchain-type=clang")
- )
-
- (
- unset _JAVA_OPTIONS JAVA JAVA_TOOL_OPTIONS JAVAC MAKE XARGS
- CFLAGS= CXXFLAGS= LDFLAGS= \
- CONFIG_SITE=/dev/null \
- CONFIG_SHELL="${EPREFIX}/bin/bash"
- econf "${myconf[@]}"
- )
-}
-
-src_compile() {
- local myemakeargs=(
- JOBS=$(makeopts_jobs)
- LOG=debug
- CFLAGS_WARNINGS_ARE_ERRORS= # No -Werror
- NICE= # Use PORTAGE_NICENESS, don't adjust further down
- $(usex doc docs '')
- $(usex jbootstrap bootcycle-images images)
- )
- emake "${myemakeargs[@]}" -j1 #nowarn
-}
-
-src_install() {
- local dest="/usr/$(get_libdir)/${PN}-${SLOT}"
- local ddest="${ED}/${dest#/}"
-
- cd "${S}"/build/*-release/images/j2sdk-image || die
-
- if ! use alsa; then
- rm -v jre/lib/$(get_system_arch)/libjsoundalsa.* || die
- fi
-
- # build system does not remove that
- if use headless-awt ; then
- rm -fvr jre/lib/$(get_system_arch)/lib*{[jx]awt,splashscreen}* \
- {,jre/}bin/policytool bin/appletviewer || die
- fi
-
- if ! use examples ; then
- rm -vr demo/ || die
- fi
-
- if ! use source ; then
- rm -v src.zip || die
- fi
-
- dodir "${dest}"
- cp -pPR * "${ddest}" || die
-
- dosym -r /etc/ssl/certs/java/cacerts "${dest}"/jre/lib/security/cacerts
-
- 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
-
- if use doc ; then
- docinto html
- dodoc -r "${S}"/build/*-release/docs/*
- fi
-}
-
-pkg_postinst() {
- java-vm-2_pkg_postinst
- einfo "JavaWebStart functionality provided by icedtea-web package"
-}
diff --git a/dev-java/openjdk/openjdk-8.332_p09.ebuild b/dev-java/openjdk/openjdk-8.332_p09.ebuild
index 3d08d57546e..a375e49ff16 100644
--- a/dev-java/openjdk/openjdk-8.332_p09.ebuild
+++ b/dev-java/openjdk/openjdk-8.332_p09.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://openjdk.java.net"
SRC_URI="https://github.com/openjdk/jdk${SLOT}u/archive/refs/tags/jdk${MY_PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ppc64 x86"
IUSE="alsa debug cups doc examples headless-awt javafx +jbootstrap selinux source"
COMMON_DEPEND="
@@ -161,7 +161,7 @@ src_configure() {
unset _JAVA_OPTIONS JAVA JAVA_TOOL_OPTIONS JAVAC MAKE XARGS
CFLAGS= CXXFLAGS= LDFLAGS= \
CONFIG_SITE=/dev/null \
- CONFIG_SHELL="${EPREFIX}/bin/bash"
+ CONFIG_SHELL="${BROOT}/bin/bash"
econf "${myconf[@]}"
)
}
@@ -205,7 +205,7 @@ src_install() {
dodir "${dest}"
cp -pPR * "${ddest}" || die
- dosym -r /etc/ssl/certs/java/cacerts "${dest}"/jre/lib/security/cacerts
+ dosym8 -r /etc/ssl/certs/java/cacerts "${dest}"/jre/lib/security/cacerts
java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
java-vm_set-pax-markings "${ddest}"
diff --git a/dev-java/opentest4j/opentest4j-1.2.0-r1.ebuild b/dev-java/opentest4j/opentest4j-1.2.0-r1.ebuild
new file mode 100644
index 00000000000..1e76405a61a
--- /dev/null
+++ b/dev-java/opentest4j/opentest4j-1.2.0-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 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.opentest4j:opentest4j:1.2.0"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Open Test Alliance for the JVM"
+HOMEPAGE="https://github.com/ota4j-team/opentest4j"
+SRC_URI="https://github.com/ota4j-team/opentest4j/archive/r${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:*
+"
+
+S="${WORKDIR}/${PN}-r${PV}"
+
+JAVA_SRC_DIR=( src/{main,module}/java )
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_SRC_DIR=( src/test/java )
+JAVA_TEST_RESOURCE_DIRS=( src/test/resources )
diff --git a/dev-java/osgi-annotation/Manifest b/dev-java/osgi-annotation/Manifest
new file mode 100644
index 00000000000..19b5e3b7afc
--- /dev/null
+++ b/dev-java/osgi-annotation/Manifest
@@ -0,0 +1 @@
+DIST osgi-annotation-8.1.0.jar 35775 BLAKE2B 404b78ead0693c2c5ade4dc9415f6b3f80d8a58933a466845bfbb6b2fb0dd4a479ad1cf392a12a18dc951755089e60dbc5f3a20a60ecbbeb23a7224b1c1ae9d2 SHA512 cfddedf01b873f51b8b0b129dfbfae547645eed3d8c2b59b6d940f9163c0809876fc0043f7b66e764215aab8136737e3c969d0d495e33330e8ae82b4c35c3132
diff --git a/dev-java/osgi-annotation/metadata.xml b/dev-java/osgi-annotation/metadata.xml
new file mode 100644
index 00000000000..75321cfb559
--- /dev/null
+++ b/dev-java/osgi-annotation/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/osgi-annotation/osgi-annotation-8.1.0.ebuild b/dev-java/osgi-annotation/osgi-annotation-8.1.0.ebuild
new file mode 100644
index 00000000000..f78c31f0340
--- /dev/null
+++ b/dev-java/osgi-annotation/osgi-annotation-8.1.0.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"
+MAVEN_ID="org.osgi:osgi.annotation:8.1.0"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="OSGi Annotation Release 8, Annotations for use in compiling bundles"
+HOMEPAGE="https://www.osgi.org"
+SRC_URI="https://docs.osgi.org/download/r$(ver_cut 1)/${PN/-/.}-${PV}.jar -> ${P}.jar"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ppc64 ~x86"
+
+RDEPEND=">=virtual/jre-1.8:*"
+DEPEND=">=virtual/jdk-1.8:*"
+BDEPEND="app-arch/unzip"
+
+JAVA_SRC_DIR="OSGI-OPT/src"
+
+src_prepare() {
+ default
+ java-pkg_clean org
+}
diff --git a/dev-java/osgi-compendium/osgi-compendium-4.3.1-r2.ebuild b/dev-java/osgi-compendium/osgi-compendium-4.3.1-r3.ebuild
index 609e01017aa..42efea848da 100644
--- a/dev-java/osgi-compendium/osgi-compendium-4.3.1-r2.ebuild
+++ b/dev-java/osgi-compendium/osgi-compendium-4.3.1-r3.ebuild
@@ -1,42 +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"
inherit java-pkg-2 java-pkg-simple
DESCRIPTION="OSGi Service Platform Compendium API (Companion Code)"
-HOMEPAGE="http://wiki.osgi.org/wiki/Release_4.3"
-SRC_URI="https://osgi.org/download/r4v43/osgi.cmpn-${PV}.jar"
+HOMEPAGE="https://docs.osgi.org"
+SRC_URI="https://docs.osgi.org/download/r4v43/osgi.cmpn-${PV}.jar"
-LICENSE="Apache-2.0 OSGi-Specification-2.0"
+LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-CDEPEND="dev-java/glassfish-persistence:0
+CP_DEPEND="
+ dev-java/glassfish-persistence:0
dev-java/osgi-core-api:0
dev-java/osgi-foundation:0
dev-java/tomcat-servlet-api:4.0"
-DEPEND="${CDEPEND}
+DEPEND="${CP_DEPEND}
>=virtual/jdk-1.8:*"
-RDEPEND="${CDEPEND}
+RDEPEND="${CP_DEPEND}
>=virtual/jre-1.8:*"
BDEPEND="app-arch/unzip"
JAVA_SRC_DIR="OSGI-OPT/src"
-JAVA_GENTOO_CLASSPATH="
- osgi-core-api
- osgi-foundation
- glassfish-persistence
- tomcat-servlet-api-4.0
-"
-
src_prepare() {
default
rm -r org || die
diff --git a/dev-java/osgi-core/Manifest b/dev-java/osgi-core/Manifest
new file mode 100644
index 00000000000..fefbfdfc258
--- /dev/null
+++ b/dev-java/osgi-core/Manifest
@@ -0,0 +1 @@
+DIST osgi-core-8.0.0.jar 556893 BLAKE2B 36c923ed2a0c590690d1fae112b56984ac16aab7ab0ce46b715aad8fc7b75f0846d640121ced62c626adb1b442c0cb524df37cb82339e9405db6abc7b67c64d9 SHA512 0161f91ecb8ad102731c71ce73f96b99174b5bce2f216770226860cff8a3fcd12abec828399077a835b6765ed9bf9ec29be618de8d2a85b40d6250c00bab4404
diff --git a/dev-java/osgi-core/metadata.xml b/dev-java/osgi-core/metadata.xml
new file mode 100644
index 00000000000..75321cfb559
--- /dev/null
+++ b/dev-java/osgi-core/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/osgi-core/osgi-core-8.0.0.ebuild b/dev-java/osgi-core/osgi-core-8.0.0.ebuild
new file mode 100644
index 00000000000..20c4f7bc688
--- /dev/null
+++ b/dev-java/osgi-core/osgi-core-8.0.0.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"
+MAVEN_ID="org.osgi:osgi.core:8.0.0"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="OSGi Service Platform Core API (Companion Code)"
+HOMEPAGE="https://www.osgi.org"
+SRC_URI="https://docs.osgi.org/download/r$(ver_cut 1)/${PN/-/.}-${PV}.jar -> ${P}.jar"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ppc64 ~x86"
+
+RDEPEND=">=virtual/jre-1.8:*"
+
+DEPEND="
+ dev-java/osgi-annotation:0
+ >=virtual/jdk-1.8:*"
+
+BDEPEND="app-arch/unzip"
+
+JAVA_CLASSPATH_EXTRA="osgi-annotation"
+JAVA_SRC_DIR="OSGI-OPT/src"
+
+src_prepare() {
+ default
+ java-pkg_clean org
+}
diff --git a/dev-java/osgi-enterprise-api/osgi-enterprise-api-5.0.0-r1.ebuild b/dev-java/osgi-enterprise-api/osgi-enterprise-api-5.0.0-r1.ebuild
deleted file mode 100644
index 7de7a854038..00000000000
--- a/dev-java/osgi-enterprise-api/osgi-enterprise-api-5.0.0-r1.ebuild
+++ /dev/null
@@ -1,38 +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"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="OSGi Enterprise Release 5 Companion Code"
-HOMEPAGE="http://www.osgi.org/Main/HomePage"
-SRC_URI="https://docs.osgi.org/download/r5/osgi.enterprise-${PV}.jar"
-
-LICENSE="Apache-2.0 OSGi-Specification-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-RESTRICT="bindist"
-
-CDEPEND="dev-java/glassfish-persistence:0
- dev-java/osgi-core-api:0
- java-virtuals/servlet-api:2.5"
-
-RDEPEND="${CDEPEND}
- >=virtual/jre-1.8:*"
-
-DEPEND="${CDEPEND}
- >=virtual/jdk-1.8:*
- app-arch/unzip"
-
-JAVA_SRC_DIR="OSGI-OPT/src"
-
-JAVA_GENTOO_CLASSPATH="glassfish-persistence,osgi-core-api,servlet-api-2.5"
-
-src_prepare() {
- default
- rm -r org || die
-}
diff --git a/dev-java/osgi-enterprise-api/osgi-enterprise-api-5.0.0-r2.ebuild b/dev-java/osgi-enterprise-api/osgi-enterprise-api-5.0.0-r2.ebuild
index 17de5b1b064..e80121b1a1e 100644
--- a/dev-java/osgi-enterprise-api/osgi-enterprise-api-5.0.0-r2.ebuild
+++ b/dev-java/osgi-enterprise-api/osgi-enterprise-api-5.0.0-r2.ebuild
@@ -11,9 +11,9 @@ DESCRIPTION="OSGi Enterprise Release 5 Companion Code"
HOMEPAGE="http://www.osgi.org/Main/HomePage"
SRC_URI="https://docs.osgi.org/download/r5/osgi.enterprise-${PV}.jar"
-LICENSE="Apache-2.0 OSGi-Specification-2.0"
+LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
RESTRICT="bindist"
diff --git a/dev-java/pdfbox/Manifest b/dev-java/pdfbox/Manifest
index 8b098def5e6..c303072cc51 100644
--- a/dev-java/pdfbox/Manifest
+++ b/dev-java/pdfbox/Manifest
@@ -32,9 +32,10 @@ DIST PDFBOX-4423-000746.pdf 574613 BLAKE2B 01f139d1c9b9e60d5e3be184b6289a4c50f03
DIST PDFBOX-4490.pdf 283351 BLAKE2B 4abac1974e9fc7ca0ede73d5c388125794760a32b24fbb245799f92bebf3cc37a6f0fb8e38fa282d39d0aa00093b829e924d90560b90562033958c270d07dec2 SHA512 5ae7f232c47c13ed31997eb2c368e7deb1013c1321d70bf79369f8d709b33406191d94c21a5d27b4c4bb48241bafd9328a0a6d2d093d4e540d5044e9503bd099
DIST PDFBOX-4517-cryptfilter.pdf 2157 BLAKE2B 69fea4396c05d977dcb7bc5c29143ad3a64fc45331dd8ddd660e3d557d222d56a548b3b24bb0141e8c8e8b6a5dfee2a3f83fa48a2b39fd448b9209204b3e4d9f SHA512 ed55a65bad6f91104846d28e9e7dcb18b11efbf980a74781350551428bbaecba375d9e22af02edf0f91263c7f668e93ec7c52d397898b7640c2d60e7dd3ae940
DIST PDFBOX-4750.pdf 333223 BLAKE2B 86e9191142b725a338c750d2f1cd25e3b65957160638e64ecdedc1a26f343709765b99fc15381e6a5045a60aa3d59cf6ff427599b89c03a6aface38e356a36da SHA512 add66ca86b5eb3bfd44fd8c273a81695586d76f6e630b714d4b8db6db5aee5b80e7a6d47b9863a42506773c2c0ee2181469d5cd717dba185b70ef5db7ffb80b9
+DIST PDFBOX-4831.pdf 708821 BLAKE2B b4b31a0c5685222b7dc4e9c3e1fbe5c72c6ee3b7ea4ac74727c10e04cc10a8c96ae82c7163d82a3003d69105d5990cefbb481d3c42be3bc69ca0a9c15db4d8b2 SHA512 cb13ce2ca64fa446b9d840444f6d363f0d826a55e4dae1c2de094aaee4dd92df192ec375ff6ca0ee50c5cdd52b634b9b838431d7aa6b852de02504c3fd95531a
DIST PDFBOX-5196-lotus.jpg 48292 BLAKE2B 9f9a02acb481349acc65266ab6529d40e9493fa0c6f5181aa46757ca2a3d29d519e7de2ea95c8288cd3f25f362a3fe7695e81fe0b653984ee267d2b5cc112e51 SHA512 37c73b41d1e00d66717c3715e6c45724c3f163d3d5b045c67e90c3713746d39eef96b4f0e6f368d0679d4c73d02ca01cfe5141d8a526e46ea15a4579ea1e75a2
DIST genko_oc_shiryo1.pdf 124896 BLAKE2B c3a9921afb052ee4fe5080a1f1e66d991e3041ff90bd26d42bf3a9116f05e81fb5bb51449411527c3c3193072854482cf4616bf57cad1ac7d774044fce26f13d SHA512 71888e06a0323ac6196c5942c5961f76f8a4d8c6913114aaa9e215f43112cfa5f1b741b7c801e794dc44e62c2d34bfaafe89267a4c7de753e4da1481b35820f3
DIST ipag00303.zip 4295310 BLAKE2B b68dd7dd7a7320894d782350c4598572c31d6ef492f9572adc2aac20ca98b5c5027995c0169bf815bc1e3a64d635b0e2d4e378b749e034f2fe718bcb7901d40a SHA512 59535137c649a2f8bdbb463cd716426811a6003a65883ca6e45bb0af1d526b3889af0fba3a353e90bc8d373cd32b90a27ff9ff6916ecbccb42e922c09e9b046a
DIST ipagp00303.zip 4295877 BLAKE2B e096303106029daaedae9befb003f70c2c7d00b858f89f5f8fffb9fc73679e63ec0dde8e0304cad2c611aa74d3cf1bfea56b9ac35e6838953d38b028654f5434 SHA512 26d0a9bfba7f5457a98b0bf45a4a6b081bca4140047a0886625691231459f8c81a6cdbe523e9abcbd45fd7caed21d78f1baf3a2cf9167320f6b79be3d697cb5b
DIST n019003l.pfb 79155 BLAKE2B 2995cd6e35de2d49cc6d4a5f6c7461396b23e14c6403cd7aecedbd5cec904fd0c42a114c4c5f5079fd1fad306dd8ddba649a13424ec5183395fb0fc1cbe2abb9 SHA512 8eafe21ffa6f3d7d0a50e9f4e5bcdeb727e804b552d74e65b709e778c9ed4605e5aa63743be285f0bc17ad162768583fec4196e1d1146d98f8703359247f22d0
-DIST pdfbox-2.0.24-src.zip 15651754 BLAKE2B 5d0220c28c2be18a66aa66c2540d3e1d85ecc6826f632e6c9a0193f2f02dca645909b0a54c707d856bb2886d52b0b5fb706503b4f89f0eb7aede8e612bebfa8e SHA512 5d55b3cadbbae266d90c47f5b10c9b09b6dc16f53b77a0cf15c78e62fc69afc7b6eab5a4329608ecdf25de9194b38db1f7d23e7d71af473cc1bf7b09b0028642
+DIST pdfbox-2.0.26-src.zip 15766524 BLAKE2B eafedf1db5a54d36cb42111b736ad79adfcc106630fa4b2bc57873dcfbdbbb7bd0e9408611b0d8771909e719813e388430944ae0fbaf800bdc859595de2b101b SHA512 e14c57e28d10324dbcb6ad239bad5751a2dab0035bbd80427afd03f65467ec1376ddd7d08e7cefd4d950b149f85d8f505f6f50cc3093fd65bb8a2cbb2b8c7c1e
diff --git a/dev-java/pdfbox/pdfbox-2.0.24.ebuild b/dev-java/pdfbox/pdfbox-2.0.26.ebuild
index c2ae65ec701..13e5a7c7f68 100644
--- a/dev-java/pdfbox/pdfbox-2.0.24.ebuild
+++ b/dev-java/pdfbox/pdfbox-2.0.26.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom pdfbox-2.0.24/pdfbox/pom.xml --download-uri https://downloads.apache.org/pdfbox/2.0.24/pdfbox-2.0.24-src.zip --slot 0 --keywords "~amd64 ~arm64 ~ppc64 ~x86" --ebuild pdfbox-2.0.24.ebuild
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri mirror://apache/pdfbox/2.0.26/pdfbox-2.0.26-src.zip --slot 0 --keywords "~amd64 ~arm64 ~ppc64 ~x86" --ebuild pdfbox-2.0.26.ebuild
-EAPI=7
+EAPI=8
JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.apache.pdfbox:pdfbox:2.0.24"
+MAVEN_ID="org.apache.pdfbox:pdfbox:2.0.26"
JAVA_TESTING_FRAMEWORKS="junit-4"
inherit java-pkg-2 java-pkg-simple
@@ -55,11 +55,12 @@ SRC_URI="mirror://apache/${PN}/${PV}/${P}-src.zip
https://issues.apache.org/jira/secure/attachment/12911053/n019003l.pfb
https://issues.apache.org/jira/secure/attachment/12949710/032163.jpg -> PDFBOX-4184-032163.jpg
https://issues.apache.org/jira/secure/attachment/13025718/lotus.jpg -> PDFBOX-5196-lotus.jpg
+ https://issues.apache.org/jira/secure/attachment/13002695/13._Korona_szallo_vegzes_13.09.26.eredeti.pdf -> PDFBOX-4831.pdf
)"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64 x86"
IUSE="+tools"
PROPERTIES="test_network"
@@ -72,16 +73,12 @@ RESTRICT="test"
# org.bouncycastle:bcmail-jdk15on:1.64 -> >=dev-java/bcmail-1.68:0
# org.bouncycastle:bcprov-jdk15on:1.64 -> >=dev-java/bcprov-1.68:0
-CDEPEND="
+CP_DEPEND="
dev-java/bcmail:0
dev-java/bcprov:0
dev-java/commons-logging:0
~dev-java/fontbox-${PV}:0
- tools? (
- dev-java/java-diff-utils:0
- dev-java/junit:4
- dev-java/mockito:0
- )"
+"
# Compile dependencies
# POM: ${P}/${PN}/pom.xml
@@ -92,22 +89,22 @@ CDEPEND="
# test? org.apache.pdfbox:jbig2-imageio:3.0.3 -> >=dev-java/jbig2-imageio-3.0.3:0
# test? org.mockito:mockito-core:3.10.0 -> !!!suitble-mavenVersion-not-found!!!
-DEPEND="${CDEPEND}
+DEPEND="${CP_DEPEND}
>=virtual/jdk-1.8:*
test? (
dev-java/jai-imageio-core:0
dev-java/jai-imageio-jpeg2000:0
dev-java/java-diff-utils:0
dev-java/jbig2-imageio:0
- dev-java/mockito:0
+ dev-java/mockito:4
)"
-RDEPEND="${CDEPEND}
+RDEPEND="${CP_DEPEND}
>=virtual/jre-1.8:*"
BDEPEND="app-arch/unzip"
-DOCS=( {README.md,{LICENSE,NOTICE,RELEASE-NOTES}.txt} )
+DOCS=( README.md {NOTICE,RELEASE-NOTES}.txt )
PATCHES=(
# adds @Ignore annotation to
@@ -119,43 +116,16 @@ PATCHES=(
S="${WORKDIR}/${P}"
JAVA_GENTOO_CLASSPATH_EXTRA="pdfbox.jar:pdfbox-debugger.jar"
-JAVA_GENTOO_CLASSPATH="commons-logging,fontbox,bcmail,bcprov"
-JAVA_TEST_GENTOO_CLASSPATH="jai-imageio-core,jai-imageio-jpeg2000,java-diff-utils,jbig2-imageio,junit-4,mockito"
+JAVA_TEST_GENTOO_CLASSPATH="jai-imageio-core,jai-imageio-jpeg2000,java-diff-utils,jbig2-imageio,junit-4,mockito-4"
JAVA_TEST_EXCLUDES=(
# excluded upstream according to
- # https://github.com/apache/pdfbox/blob/8876e8e1a0adbf619cef4638cc3cea073e3ca484/pdfbox/pom.xml#L123
+ # https://github.com/apache/pdfbox/blob/2.0.26/pdfbox/pom.xml#L123
"org.apache.pdfbox.rendering.TestPDFToImage"
- # 1) warning(junit.framework.TestSuite$1)
- # junit.framework.AssertionFailedError: Cannot instantiate test case: testIsSetDirect (java.lang.InstantiationException
- # 2) warning(junit.framework.TestSuite$1
- # junit.framework.AssertionFailedError: Cannot instantiate test case: testAccept (java.lang.InstantiationException
- # 3) warning(junit.framework.TestSuite$1)
- # junit.framework.AssertionFailedError: Cannot instantiate test case: testGetCOSObject (java.lang.InstantiationException
+ # Causing test failures. Upstream does not run these tests.
"org.apache.pdfbox.cos.TestCOSBase"
-
- # 4) warning(junit.framework.TestSuite$1)
- # junit.framework.AssertionFailedError: Cannot instantiate test case: testFloatValue (java.lang.InstantiationException
- # 5) warning(junit.framework.TestSuite$1)
- # junit.framework.AssertionFailedError: Cannot instantiate test case: testGet (java.lang.InstantiationException
- # 6) warning(junit.framework.TestSuite$1)
- # junit.framework.AssertionFailedError: Cannot instantiate test case: testInvalidNumber (java.lang.InstantiationException
- # 7) warning(junit.framework.TestSuite$1)
- # junit.framework.AssertionFailedError: Cannot instantiate test case: testLongValue (java.lang.InstantiationException
- # 8) warning(junit.framework.TestSuite$1)
- # junit.framework.AssertionFailedError: Cannot instantiate test case: testIntValue (java.lang.InstantiationException
- # 9) warning(junit.framework.TestSuite$1)
- # junit.framework.AssertionFailedError: Cannot instantiate test case: testLargeNumber (java.lang.InstantiationException
- # 10) warning(junit.framework.TestSuite$1)
- # junit.framework.AssertionFailedError: Cannot instantiate test case: testDoubleValue (java.lang.InstantiationException
- # 11) warning(junit.framework.TestSuite$1)
- # junit.framework.AssertionFailedError: Cannot instantiate test case: testIsSetDirect (java.lang.InstantiationException
- # 12) warning(junit.framework.TestSuite$1)
- # junit.framework.AssertionFailedError: Cannot instantiate test case: testAccept (java.lang.InstantiationException
- # 13) warning(junit.framework.TestSuite$1)
- # junit.framework.AssertionFailedError: Cannot instantiate test case: testGetCOSObject (java.lang.InstantiationException
- "org.apache.pdfbox.cos.TestCOSNumber" # Tests run: 10, Failures: 10
+ "org.apache.pdfbox.cos.TestCOSNumber"
)
src_prepare() {
@@ -163,50 +133,45 @@ src_prepare() {
}
src_compile() {
+ einfo "Compiling pdfbox"
JAVA_SRC_DIR="pdfbox/src/main/java"
JAVA_RESOURCE_DIRS="pdfbox/src/main/resources"
JAVA_JAR_FILENAME="pdfbox.jar"
java-pkg-simple_src_compile
- JAVA_SRC_DIR="debugger/src/main/java"
- JAVA_RESOURCE_DIRS="debugger/src/main/resources"
- JAVA_JAR_FILENAME="pdfbox-debugger.jar"
- java-pkg-simple_src_compile
-
if use tools; then
- JAVA_GENTOO_CLASSPATH+=" java-diff-utils,junit-4,mockito"
+ einfo "Compiling debugger"
+ JAVA_SRC_DIR="debugger/src/main/java"
+ JAVA_RESOURCE_DIRS="debugger/src/main/resources"
+ JAVA_JAR_FILENAME="pdfbox-debugger.jar"
+ java-pkg-simple_src_compile
+
+ einfo "Compiling pdfbox-tools"
JAVA_SRC_DIR="tools/src/main/java"
JAVA_RESOURCE_DIRS=""
JAVA_JAR_FILENAME="pdfbox-tools.jar"
java-pkg-simple_src_compile
fi
- JAVA_SRC_DIR=(
- "${S}/pdfbox/src/main/java"
- "${S}/debugger/src/main/java"
- )
- if use tools; then
- JAVA_SRC_DIR+=( "${S}/tools" )
+ if use doc; then
+ einfo "Compiling javadocs"
+ JAVA_SRC_DIR=(
+ "${S}/pdfbox/src/main/java"
+ "${S}/debugger/src/main/java"
+ )
+ if use tools; then
+ JAVA_SRC_DIR+=( "${S}/tools/src/main/java" )
+ fi
+ JAVA_JAR_FILENAME="ignoreme.jar"
+ java-pkg-simple_src_compile
fi
- JAVA_JAR_FILENAME="ignoreme.jar"
- java-pkg-simple_src_compile
}
src_test() {
+ einfo "Testing pdfbox"
JAVA_TEST_SRC_DIR="pdfbox/src/test/java"
JAVA_TEST_RESOURCE_DIRS="pdfbox/src/test/resources"
- # There was 1 failure
- # 1) testIsEmbeddingPermittedMultipleVersions(org.apache.pdfbox.pdmodel.font.TestFontEmbedding)
- # java.lang.ExceptionInInitializerError
- # Caused by: java.lang.reflect.InaccessibleObjectException: Unable to make protected final java.lang.Class java.lang.ClassLoader.defineClass(java.lang.String,byte[],int,int,java.security.ProtectionDomain) throws java.lang.ClassFormatError accessible: module java.base does not "opens java.lang" to unnamed module @4dc690f9
- # FAILURES!!!
- # Tests run: 586, Failures: 1
- local vm_version="$(java-config -g PROVIDES_VERSION)"
- if [[ "${vm_version}" == "17" ]] ; then
- JAVA_TEST_EXCLUDES+=( "org.apache.pdfbox.pdmodel.font.TestFontEmbedding" )
- fi
-
# tests failed with S="${WORKDIR}/${P}"
find pdfbox/src/test/ -type f -exec sed -i 's:src/test/resources:pdfbox/src/test/resources:' {} + || die
@@ -245,6 +210,7 @@ src_test() {
"${DISTDIR}"/PDFBOX-4338.pdf \
"${DISTDIR}"/PDFBOX-4339.pdf \
"${DISTDIR}"/genko_oc_shiryo1.pdf \
+ "${DISTDIR}"/PDFBOX-4831.pdf \
"target/pdfs" || die
mkdir target/fonts || die
@@ -263,6 +229,7 @@ src_test() {
rm -r target/test-classes || die # avoid to run previous tests again
if use tools; then
+ einfo "Testing pdfbox-tools"
find tools/src/test/ -type f -exec sed -i 's:src/test/resources:tools/src/test/resources:' {} + || die
JAVA_TEST_SRC_DIR="tools/src/test/java"
JAVA_TEST_RESOURCE_DIRS="tools/src/test/resources"
@@ -275,8 +242,8 @@ src_install() {
default
java-pkg_dojar "pdfbox.jar"
- java-pkg_dojar "pdfbox-debugger.jar"
if use tools; then
+ java-pkg_dojar "pdfbox-debugger.jar"
java-pkg_dojar "pdfbox-tools.jar"
java-pkg_dolauncher ${PN} --main org.apache.pdfbox.tools.PDFBox
fi
@@ -286,6 +253,9 @@ src_install() {
fi
if use source; then
- java-pkg_dosrc "${S}/pdfbox" "${S}/debugger" "${S}/tools"
+ java-pkg_dosrc \
+ "${S}/pdfbox/src/main/java/*" \
+ "${S}/debugger/src/main/java/*" \
+ "${S}/tools/src/main/java/*"
fi
}
diff --git a/dev-java/plexus-classworlds/Manifest b/dev-java/plexus-classworlds/Manifest
index ce840cb6f52..78a8b35b095 100644
--- a/dev-java/plexus-classworlds/Manifest
+++ b/dev-java/plexus-classworlds/Manifest
@@ -1 +1,2 @@
DIST plexus-classworlds-2.2.3.tar.bz2 41744 BLAKE2B 41ddc64c066bdfb5f2398773790b9fec213070d3dad5e57f7b0643f4347386d5304c435cd60e5b1fad32f2d7fae7b48a2afd0189d115018ed5ee38901c80867a SHA512 d5f3d3dac4df569b91ddea9265b14a2459b0ecd4ac3e4547cbac341f50d18238071a7a560d9771a9f8724c59225ea7fa8645ed72c5a00a684519a46a024c3c61
+DIST plexus-classworlds-2.6.0.tar.gz 57221 BLAKE2B 7cef274981101eab85247c1a19420ebbb626b671312579ea665fc3d82e9eb8caba55955ccbc38ccd54e19c55ec1683b6a99a2cd96b08bf7ace57355a8e958d1f SHA512 d6ef17a4651da99975bcfc04f89ba128d891efc9047dc9b8afa52bd092d07268d44a7424a3a3700209bb56452f035ac1071c58ae6dc961b7e991efee1c0e117e
diff --git a/dev-java/plexus-classworlds/metadata.xml b/dev-java/plexus-classworlds/metadata.xml
index 4221e170cbc..183a9252fc9 100644
--- a/dev-java/plexus-classworlds/metadata.xml
+++ b/dev-java/plexus-classworlds/metadata.xml
@@ -5,4 +5,7 @@
<email>java@gentoo.org</email>
<name>Java</name>
</maintainer>
+ <upstream>
+ <remote-id type="github">codehaus-plexus/plexus-classworlds</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-java/plexus-classworlds/plexus-classworlds-2.6.0.ebuild b/dev-java/plexus-classworlds/plexus-classworlds-2.6.0.ebuild
new file mode 100644
index 00000000000..3a2f9d422f5
--- /dev/null
+++ b/dev-java/plexus-classworlds/plexus-classworlds-2.6.0.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.codehaus.plexus:plexus-classworlds:2.6.0"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="The class loader framework of the Plexus project"
+HOMEPAGE="https://codehaus-plexus.github.io/plexus-classworlds/"
+SRC_URI="https://github.com/codehaus-plexus/plexus-classworlds/archive/plexus-classworlds-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+DEPEND="
+ >=virtual/jdk-1.8:*
+ test? (
+ dev-java/commons-logging
+ dev-java/xml-commons-external:1.4
+ )
+"
+RDEPEND=">=virtual/jre-1.8:*"
+
+S="${WORKDIR}/${PN}-${P}"
+
+JAVA_MAIN_CLASS="org.codehaus.plexus.classworlds.launcher.Launcher"
+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/test-data"
+JAVA_TEST_EXCLUDES="org.codehaus.plexus.classworlds.TestUtil"
+
+src_prepare() {
+ default
+ # Ignore one test case testing the presence of ant-core
+ sed \
+ -e '/testConfigure_Valid/i @Ignore' \
+ -e '/import org.junit.Test/a import org.junit.Ignore;' \
+ -i src/test/java/org/codehaus/plexus/classworlds/launcher/ConfiguratorTest.java || die
+}
+
+src_test(){
+ mkdir -p target/test-lib || die
+ # https://github.com/codehaus-plexus/plexus-classworlds/blob/plexus-classworlds-2.6.0/pom.xml#L159-L161
+ ln -s "$(java-pkg_getjars --build-only xml-commons-external-1.4)" \
+ target/test-lib/xml-apis-1.3.02.jar || die
+ # symlinking works only if java-pkg_getjars finds only one file
+ # but commons-logging has multiple jar files.
+ ln -s "${SYSROOT}"/usr/share/commons-logging/lib/commons-logging.jar \
+ target/test-lib/commons-logging-1.0.3.jar || die
+ java-pkg-simple_src_test
+}
diff --git a/dev-java/poi/Manifest b/dev-java/poi/Manifest
index 712b8ee1f6e..be75761a39e 100644
--- a/dev-java/poi/Manifest
+++ b/dev-java/poi/Manifest
@@ -1 +1,2 @@
DIST poi-5.0.0.tar.gz 111429369 BLAKE2B b29e754fb709d01ff4d68e9227f4c4739384bd02934b6860e8a0e96552d9e9ff1c5c665bc0b701f79226505fd98373fe6ad160c72735903eae388f0cd6618337 SHA512 e79d15b42d8ec389fd15b7714faf7b49b9fb4d57014cb341fff0f061393f4ea7dfcbd3810a6ec19539eabddbb1d0690aa56de4a1a412d05a527e11797047023a
+DIST poi-src-5.2.2-20220312.tgz 117042913 BLAKE2B ef2ab433158ac51fc163e9bfa65268d246a686c7892234cdd2332bef526c69b59dd0959bdabc6a486a99e20dfcc144ff6aff775a6412136112bb6a36f10968d3 SHA512 858d6c1af8a29a22aa24bef0422b3c8329141ff026131b8354a97c87acc31ef06c91f1b9cabeb71738b3687ddc8283f19b2ac42865b7e98e91cb0d5aa6b89b40
diff --git a/dev-java/poi/poi-5.0.0.ebuild b/dev-java/poi/poi-5.0.0.ebuild
index 17710fa6007..2996e53accb 100644
--- a/dev-java/poi/poi-5.0.0.ebuild
+++ b/dev-java/poi/poi-5.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:
@@ -16,7 +16,7 @@ HOMEPAGE="https://poi.apache.org/"
SRC_URI="https://archive.apache.org/dist/${PN}/release/src/${PN}-src-${PV}-20210120.tar.gz -> ${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
# Common dependencies
# POM: ${P}/sonar/main/pom.xml
diff --git a/dev-java/poi/poi-5.2.2.ebuild b/dev-java/poi/poi-5.2.2.ebuild
new file mode 100644
index 00000000000..64e978e351b
--- /dev/null
+++ b/dev-java/poi/poi-5.2.2.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom poi-5.2.2/sonar/main/pom.xml --download-uri https://archive.apache.org/dist/poi/release/src/poi-src-5.2.2-20210120.tar.gz --slot 0 --keywords "~amd64 ~arm64 ~ppc64 ~x86" --ebuild poi-5.0.0.ebuild
+
+EAPI=8
+
+# tests depend on junit-jupiter which is not packaged
+# https://github.com/apache/poi/blob/REL_5_2_2/poi/build.gradle#L51-L56
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="org.apache.poi:poi-main:5.2.2"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Maven build of Apache POI for Sonar checks"
+HOMEPAGE="https://poi.apache.org/"
+RELEASE_DATE="20220312"
+SRC_URI="mirror://apache/poi/release/src/poi-src-${PV}-${RELEASE_DATE}.tgz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+DEPEND="
+ >=dev-java/commons-codec-1.15-r1:0
+ >=dev-java/commons-collections-4.4-r1:4
+ >=dev-java/commons-io-2.11.0-r1:1
+ >=dev-java/commons-math-3.6.1-r2:3
+ dev-java/log4j-api:2
+ dev-java/sparsebitset:0
+ >=virtual/jdk-11:*
+"
+
+RDEPEND="
+ >=virtual/jre-1.8:*"
+
+S="${WORKDIR}/poi-src-${PV}-${RELEASE_DATE}"
+
+JAVA_CLASSPATH_EXTRA="
+ commons-codec
+ commons-collections-4
+ commons-io-1
+ commons-math-3
+ log4j-api-2
+ sparsebitset
+ "
+JAVA_SRC_DIR=( poi/src/main/java{,9} )
+JAVA_RESOURCE_DIRS="poi/src/main/resources"
+
+src_prepare() {
+ default
+ sed \
+ -e "s:@VERSION@:${PV}:g" \
+ -e "s:@DSTAMP@:${RELEASE_DATE}:g" \
+ poi/src/main/version/Version.java.template \
+ > poi/src/main/java/org/apache/poi/Version.java || die
+ # Neither log4j-api nor SparseBitSet provide Automatic-Module
+ sed \
+ -e '/SparseBitSet/d' \
+ -e '/org.apache.logging.log4j/d' \
+ -i poi/src/main/java9/module-info.java || die
+}
diff --git a/dev-java/randomized-runner/Manifest b/dev-java/randomized-runner/Manifest
index 4bf9443b619..518ae668bfa 100644
--- a/dev-java/randomized-runner/Manifest
+++ b/dev-java/randomized-runner/Manifest
@@ -1 +1,2 @@
DIST randomized-runner-2.7.9.tar.gz 1501927 BLAKE2B 41ac32c724a87021c9fd58d3c421cab1fefd00a1e9e25a29d6188b831120c5e1407894f19fa92254df5cd1f2a66a44bf6e4469fa2128d841c1f17d17a623eec9 SHA512 23db6f21a805146d759fa9d3c9a37199b7181d6c53d0f62a4d82c42cbc15816cc25a87a174ef3d533870d648039b3f8dcac9370ffaff4ef76fefb6fc2c38ee88
+DIST randomized-runner-2.8.0.tar.gz 1506178 BLAKE2B 0f142b5f90ea0aaf0934415ad772bf1363c75d371fb964398259e46af1879f2cd3520c9d3eff60b1614bef7fd64003d3ff868302cdc5421197085133dd856ba4 SHA512 e7fba917bf30a7ae4ea68301ec26bfa1b5659ea6124417ef494cc915b26bb07343ce8784dfd718032410ae750601f73ad56cd0a1bab3b2013559fc020694fb7f
diff --git a/dev-java/randomized-runner/randomized-runner-2.8.0.ebuild b/dev-java/randomized-runner/randomized-runner-2.8.0.ebuild
new file mode 100644
index 00000000000..8be9dae04f3
--- /dev/null
+++ b/dev-java/randomized-runner/randomized-runner-2.8.0.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/randomizedtesting/randomizedtesting/archive/release/2.8.0.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild randomized-runner-2.8.0.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="com.carrotsearch.randomizedtesting:randomizedtesting-runner:2.8.0"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="JUnit test runner and plugins for running JUnit tests with pseudo-randomness"
+HOMEPAGE="https://labs.carrotsearch.com/randomizedtesting.html"
+SRC_URI="https://github.com/randomizedtesting/randomizedtesting/archive/release/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+CP_DEPEND="
+ dev-java/junit:4
+"
+
+DEPEND="
+ >=virtual/jdk-1.8:*
+ ${CP_DEPEND}
+ test? (
+ dev-java/assertj-core:3
+ )
+"
+
+RDEPEND="
+ >=virtual/jre-1.8:*
+ ${CP_DEPEND}"
+
+DOCS=( ../{CHANGES,CONTRIBUTING,README}.txt )
+
+S="${WORKDIR}/randomizedtesting-release-${PV}/${PN}"
+
+JAVA_SRC_DIR="src/main/java"
+
+JAVA_TEST_GENTOO_CLASSPATH="assertj-core-3,junit-4"
+JAVA_TEST_SRC_DIR="src/test/java"
+
+src_test() {
+ local vm_version="$(java-config -g PROVIDES_VERSION)"
+ 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.util=ALL-UNNAMED )
+ JAVA_TEST_EXTRA_ARGS+=( --add-opens=java.base/sun.nio.fs=ALL-UNNAMED )
+ fi
+
+ java-pkg-simple_src_test
+}
diff --git a/dev-java/reflections/Manifest b/dev-java/reflections/Manifest
index accc0725d1d..1fdd7954179 100644
--- a/dev-java/reflections/Manifest
+++ b/dev-java/reflections/Manifest
@@ -1,2 +1 @@
-DIST reflections-0.9.10-sources.jar 53049 BLAKE2B 23491098dc648206161d983148bf11a1c4523df0593c903f9dbf03672b481d85aabaed7733a5d829b7f334e51d53dadde3fd439e62f9873ceb11f49f40a2cfef SHA512 940b80ed43aa900177e6c3551980eafe10f7ea16a1e5c0d24fc8c1e29f1e0155aae83e24f60af10f9743449ed38d2d3b211f3668fafbd95a6a2cb9c5581f56bf
DIST reflections-0.9.12.tar.gz 48235 BLAKE2B c82bd69f4433d8db738fcd32dd7fbf643984917622853b1886e15b906a91579de0193daf0fc1a9642c12d13de8236acf3e1f1409a18713b37c6e705a3cae34bd SHA512 8f8c7603ab73b599c6e2160f42b61c4e0eedef9981c06124bba0437d6636e7bf8a916784e266754562dc17f4d3ccf8df6c9ba707d1a7c38d97dc5eea9138064f
diff --git a/dev-java/reflections/reflections-0.9.10-r1.ebuild b/dev-java/reflections/reflections-0.9.10-r1.ebuild
deleted file mode 100644
index e5100333393..00000000000
--- a/dev-java/reflections/reflections-0.9.10-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Java runtime metadata analysis"
-HOMEPAGE="https://github.com/ronmamo/reflections"
-SRC_URI="http://search.maven.org/remotecontent?filepath=org/${PN}/${PN}/${PV}/${P}-sources.jar"
-LICENSE="WTFPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-CP_DEPEND="dev-java/commons-vfs:2
- dev-java/dom4j:1
- dev-java/gson:2.6
- dev-java/guava:20
- dev-java/javassist:3
- dev-java/jsr305:0
- dev-java/slf4j-api:0
- dev-java/tomcat-servlet-api:3.1"
-
-RDEPEND=">=virtual/jre-1.7
- ${CP_DEPEND}"
-
-DEPEND=">=virtual/jdk-1.7
- ${CP_DEPEND}
- app-arch/unzip"
diff --git a/dev-java/reflections/reflections-0.9.12-r2.ebuild b/dev-java/reflections/reflections-0.9.12-r2.ebuild
index 64c3642c4ef..f55973dea4e 100644
--- a/dev-java/reflections/reflections-0.9.12-r2.ebuild
+++ b/dev-java/reflections/reflections-0.9.12-r2.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/ronmamo/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="WTFPL-2 BSD-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
# Common dependencies
# POM: pom.xml
diff --git a/dev-java/reflections/reflections-0.9.12-r4.ebuild b/dev-java/reflections/reflections-0.9.12-r4.ebuild
new file mode 100644
index 00000000000..437dfdf3b0d
--- /dev/null
+++ b/dev-java/reflections/reflections-0.9.12-r4.ebuild
@@ -0,0 +1,94 @@
+# 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/ronmamo/reflections/archive/0.9.12.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild reflections-0.9.12.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.reflections:reflections:0.9.12"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Reflections - a Java runtime metadata analysis"
+HOMEPAGE="https://github.com/ronmamo/reflections"
+SRC_URI="https://github.com/ronmamo/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="WTFPL-2 BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+# Common dependencies
+# POM: pom.xml
+# com.google.code.gson:gson:2.8.6 -> >=dev-java/gson-2.8.8:2.6
+# org.dom4j:dom4j:2.1.1 -> >=dev-java/dom4j-2.1.3:1
+# org.javassist:javassist:3.26.0-GA -> !!!suitable-mavenVersion-not-found!!!
+# org.slf4j:slf4j-api:1.7.30 -> >=dev-java/slf4j-api-1.7.30:0
+# org.slf4j:slf4j-simple:1.7.24 -> >=dev-java/slf4j-simple-1.7.30:0
+
+CP_DEPEND="
+ dev-java/dom4j:1
+ dev-java/gson:2.6
+ dev-java/javassist:3
+ dev-java/slf4j-api:0
+ dev-java/slf4j-simple:0
+"
+
+# Compile dependencies
+# POM: pom.xml
+# javax.servlet:servlet-api:2.5 -> java-virtuals/servlet-api:2.5
+# POM: pom.xml
+# test? junit:junit:4.13 -> >=dev-java/junit-4.13.2:4
+
+DEPEND="
+ dev-java/tomcat-servlet-api:2.5
+ >=virtual/jdk-1.8:*
+ ${CP_DEPEND}
+"
+
+RDEPEND="
+ >=virtual/jre-1.8:*
+ ${CP_DEPEND}"
+
+S="${WORKDIR}/${P}"
+
+JAVA_CLASSPATH_EXTRA="tomcat-servlet-api-2.5"
+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" )
+JAVA_TEST_EXCLUDES=(
+ # Upstream does not run this test
+ "org.reflections.TestModel"
+ # 1) testMethodParameterNames(org.reflections.ReflectionsCollectTest)
+ # org.reflections.ReflectionsException: Scanner MethodParameterNamesScanner was not configured
+ # at org.reflections.Store.get(Store.java:39)
+ # at org.reflections.Store.get(Store.java:61)
+ # at org.reflections.Store.get(Store.java:46)
+ # at org.reflections.Reflections.getMethodParamNames(Reflections.java:579)
+ # at org.reflections.ReflectionsTest.testMethodParameterNames(ReflectionsTest.java:239)
+ org.reflections.ReflectionsCollectTest
+ # 2) testMethodParameterNames(org.reflections.ReflectionsParallelTest)
+ # org.reflections.ReflectionsException: Scanner MethodParameterNamesScanner was not configured
+ # at org.reflections.Store.get(Store.java:39)
+ # at org.reflections.Store.get(Store.java:61)
+ # at org.reflections.Store.get(Store.java:46)
+ # at org.reflections.Reflections.getMethodParamNames(Reflections.java:579)
+ # at org.reflections.ReflectionsTest.testMethodParameterNames(ReflectionsTest.java:239)
+ org.reflections.ReflectionsParallelTest
+ # 3) testMethodParameterNames(org.reflections.ReflectionsTest)
+ # org.reflections.ReflectionsException: Scanner MethodParameterNamesScanner was not configured
+ # at org.reflections.Store.get(Store.java:39)
+ # at org.reflections.Store.get(Store.java:61)
+ # at org.reflections.Store.get(Store.java:46)
+ # at org.reflections.Reflections.getMethodParamNames(Reflections.java:579)
+ # at org.reflections.ReflectionsTest.testMethodParameterNames(ReflectionsTest.java:239)
+ org.reflections.ReflectionsTest
+ #
+ # https://github.com/ronmamo/reflections/issues/277#issuecomment-927152981
+ # scanner was not configured exception - this is a known issue in 0.9.12, a simple workaround is to
+ # check if the getStore() contains index for the scanner before querying. next version 0.10 fixes this.
+)
diff --git a/dev-java/relaxng-datatype/relaxng-datatype-1.0-r2.ebuild b/dev-java/relaxng-datatype/relaxng-datatype-1.0-r2.ebuild
deleted file mode 100644
index c7357a9ad07..00000000000
--- a/dev-java/relaxng-datatype/relaxng-datatype-1.0-r2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-JAVA_PKG_IUSE="doc source"
-
-MY_PN="relaxngDatatype"
-MY_P="${MY_PN}-${PV}"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Interface between RELAX NG validators and datatype libraries"
-HOMEPAGE="https://relaxng.org/"
-SRC_URI="mirror://sourceforge/relaxng/${MY_P}.zip -> ${P}.zip"
-
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-LICENSE="BSD"
-SLOT="0"
-
-DEPEND="
- app-arch/unzip
- >=virtual/jdk-1.7
-"
-RDEPEND=">=virtual/jre-1.7"
-
-DOCS=( README.txt )
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
- default
- java-pkg_clean
-}
-
-src_install() {
- java-pkg-simple_src_install
- einstalldocs
-}
diff --git a/dev-java/relaxng-datatype/relaxng-datatype-1.0-r3.ebuild b/dev-java/relaxng-datatype/relaxng-datatype-1.0-r3.ebuild
index 5886aafc3e3..082bf9631a7 100644
--- a/dev-java/relaxng-datatype/relaxng-datatype-1.0-r3.ebuild
+++ b/dev-java/relaxng-datatype/relaxng-datatype-1.0-r3.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Interface between RELAX NG validators and datatype libraries"
HOMEPAGE="https://relaxng.org/"
SRC_URI="mirror://sourceforge/relaxng/${MY_P}.zip -> ${P}.zip"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
LICENSE="BSD"
SLOT="0"
diff --git a/dev-java/rxtx/files/rxtx-2.1-7r2-ppcioh.diff b/dev-java/rxtx/files/rxtx-2.1-7r2-ppcioh.diff
new file mode 100644
index 00000000000..2f3f5d623ca
--- /dev/null
+++ b/dev-java/rxtx/files/rxtx-2.1-7r2-ppcioh.diff
@@ -0,0 +1,16 @@
+diff --git a/src/RawImp.c b/src/RawImp.c
+index 077f30e..813fcf9 100644
+--- a/src/RawImp.c
++++ b/src/RawImp.c
+@@ -99,10 +99,8 @@
+ # include <linux/serial.h>
+ # include <linux/version.h>
+ #endif
+-#ifndef __APPLE__ /* dima */
+-#ifndef PPC
++#if !defined(__APPLE__) && !defined(PPC) && !defined(__powerpc__) && !defined(__powerpc64__) /* dima */
+ #include <sys/io.h>
+-#endif /* PPC */
+ #endif /* dima */
+
+ extern int errno;
diff --git a/dev-java/rxtx/files/rxtx-2.1-7r2-ttyPZ.diff b/dev-java/rxtx/files/rxtx-2.1-7r2-ttyPZ.diff
new file mode 100644
index 00000000000..b8fa3edf501
--- /dev/null
+++ b/dev-java/rxtx/files/rxtx-2.1-7r2-ttyPZ.diff
@@ -0,0 +1,20 @@
+diff --git a/src/gnu/io/RXTXCommDriver.java b/src/gnu/io/RXTXCommDriver.java
+index 3dce198..954b102 100644
+--- a/src/gnu/io/RXTXCommDriver.java
++++ b/src/gnu/io/RXTXCommDriver.java
+@@ -576,6 +576,7 @@ public class RXTXCommDriver implements CommDriver
+ String[] Temp = {
+ "ttyS", // linux Serial Ports
+ "ttySA", // for the IPAQs
++ "ttyPZ", // for G4/G5 RackMac
+ "ttyUSB", // for USB frobs
+ "rfcomm", // bluetooth serial device
+ "ttyircomm", // linux IrCommdevices (IrDA serial emu)
+@@ -608,6 +609,7 @@ public class RXTXCommDriver implements CommDriver
+ // linux ISI serial card
+ "ttyMX",// linux Moxa Smart IO cards
+ "ttyP", // linux Hayes ESP serial card
++ "ttyPZ", // linux PPC/PPC64 Zilog serial ports
+ "ttyR", // linux comtrol cards
+ // linux Specialix RIO serial card
+ "ttyS", // linux Serial Ports
diff --git a/dev-java/rxtx/rxtx-2.2_pre2-r2.ebuild b/dev-java/rxtx/rxtx-2.2_pre2-r2.ebuild
index 16874cfaeef..2d39447cb63 100644
--- a/dev-java/rxtx/rxtx-2.2_pre2-r2.ebuild
+++ b/dev-java/rxtx/rxtx-2.2_pre2-r2.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="http://rxtx.qbang.org/"
SRC_URI="ftp://ftp.qbang.org/pub/rxtx/${MY_P}.zip"
LICENSE="LGPL-2.1+"
SLOT="2"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~ppc64 x86"
IUSE="lfd"
RDEPEND=">=virtual/jre-1.8:*
@@ -39,6 +39,8 @@ src_prepare() {
eapply -p0 "${FILESDIR}/${PN}-2.1-7r2-lfd.diff"
eapply -p0 "${FILESDIR}/${PN}-2.1-7r2-nouts.diff"
+ eapply "${FILESDIR}/${PN}-2.1-7r2-ppcioh.diff"
+ eapply "${FILESDIR}/${PN}-2.1-7r2-ttyPZ.diff"
eapply -p0 "${FILESDIR}/${P}-limits.patch"
eapply "${FILESDIR}/${P}-add-ttyACM.patch"
eapply "${FILESDIR}/${P}-format-security.patch"
diff --git a/dev-java/saslprep/Manifest b/dev-java/saslprep/Manifest
new file mode 100644
index 00000000000..10350c43db2
--- /dev/null
+++ b/dev-java/saslprep/Manifest
@@ -0,0 +1 @@
+DIST saslprep-1.1-sources.jar 3735 BLAKE2B 4a2058856f0fa01a6f8ef05ca930d875825653f34c3d2b0bb81d658cb363fc5d4268a212d14e23ce60c666a1482de78e13483605c39783c81a971b148055464c SHA512 63badd75f5444af0077629dcf3f95a7c39d3e12f159a50748f54c36d2aa2cef90887c099d0c89007796174d48da0d25cc93db8ccf07660a8803e3edbbb92da05
diff --git a/dev-java/saslprep/metadata.xml b/dev-java/saslprep/metadata.xml
new file mode 100644
index 00000000000..75321cfb559
--- /dev/null
+++ b/dev-java/saslprep/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/saslprep/saslprep-1.1.ebuild b/dev-java/saslprep/saslprep-1.1.ebuild
new file mode 100644
index 00000000000..999c14713ac
--- /dev/null
+++ b/dev-java/saslprep/saslprep-1.1.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"
+MAVEN_ID="com.ongres.stringprep:saslprep:1.1"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="SASLprep: Stringprep Profile for User Names and Passwords"
+HOMEPAGE="https://gitlab.com/ongresinc/stringprep"
+SRC_URI="https://repo1.maven.org/maven2/com/ongres/stringprep/saslprep/${PV}/saslprep-${PV}-sources.jar"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="amd64 ppc64 x86"
+
+DEPEND=">=virtual/jdk-1.8:*
+ dev-java/stringprep:0"
+RDEPEND=">=virtual/jre-1.8:*"
+
+JAVA_CLASSPATH_EXTRA="stringprep"
diff --git a/dev-java/sbt-bin/Manifest b/dev-java/sbt-bin/Manifest
index 6866d35d319..11837950982 100644
--- a/dev-java/sbt-bin/Manifest
+++ b/dev-java/sbt-bin/Manifest
@@ -1,2 +1 @@
DIST sbt-1.3.10.tgz 57609786 BLAKE2B 35285d141d8ad38a8e15cc3dd18947fa34dbe307ce1fbdd267a0902ff7f5757a0ab80d56eb241c8bea79c4a13c270efb65a552a039416a6f571b6cd214739819 SHA512 93832c0eec51422d6db63078c722578cbad21e4611ca868e835471fb988ad225e8abdea47c6dcf6e19117db9598bc75296100d9dc7ba0d605b70adc592efb925
-DIST sbt-1.3.2.tgz 51817549 BLAKE2B ccb362b8cec867c64a04eba48982a9d339250d3ab51afb72fbbb7fe29406c6565d386ab0e02887007922f4134481b4ee764b63eb69300d7aa06dffd43a91a225 SHA512 2402f781962b80a46c63ac3aba0b2bb2b55ae509bb6b591d840385765dbf73cb6e5b40c12e6b95db2d8f4e77caeda32aad5a701a6439bde41ca3166d50f4b9b2
diff --git a/dev-java/sbt-bin/sbt-bin-1.3.10.ebuild b/dev-java/sbt-bin/sbt-bin-1.3.10.ebuild
index 493d2abf7d7..68c3ba963b1 100644
--- a/dev-java/sbt-bin/sbt-bin-1.3.10.ebuild
+++ b/dev-java/sbt-bin/sbt-bin-1.3.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/sbt/sbt/releases/download/v${PV}/${PN/-bin}-${PV}.tg
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
RDEPEND="
>=virtual/jre-1.7
diff --git a/dev-java/sbt-bin/sbt-bin-1.3.2.ebuild b/dev-java/sbt-bin/sbt-bin-1.3.2.ebuild
deleted file mode 100644
index 21e538c44ab..00000000000
--- a/dev-java/sbt-bin/sbt-bin-1.3.2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit java-pkg-2
-
-DESCRIPTION="sbt, a build tool for Scala"
-HOMEPAGE="https://scala-sbt.org"
-SRC_URI="https://github.com/sbt/sbt/releases/download/v${PV}/${PN/-bin}-${PV}.tgz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64"
-
-RDEPEND="
- >=virtual/jre-1.7
- !dev-java/sbt"
-
-src_unpack() {
- default
- mv "${WORKDIR}/sbt" "${S}" || die
-}
-
-src_prepare() {
- default
- java-pkg_init_paths_
-}
-
-src_compile() {
- :;
-}
-
-src_install() {
- local dest="${JAVA_PKG_SHAREPATH}"
-
- rm -v bin/sbt.bat || die
- sed -i -e 's#bin/sbt-launch.jar#lib/sbt-launch.jar#g;' \
- bin/sbt || die
-
- insinto "${dest}/lib"
- doins bin/*
-
- insinto "${dest}"
- doins -r conf
-
- fperms 0755 "${dest}/lib/sbt"
- dosym "${dest}/lib/sbt" /usr/bin/sbt
-}
diff --git a/dev-java/sbt/sbt-0.13.18.ebuild b/dev-java/sbt/sbt-0.13.18-r1.ebuild
index 4262d767d5b..eb340eb5492 100644
--- a/dev-java/sbt/sbt-0.13.18.ebuild
+++ b/dev-java/sbt/sbt-0.13.18-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="7"
+EAPI=8
inherit java-pkg-2
@@ -17,18 +17,20 @@ SRC_URI="
https://github.com/sbt/sbt/archive/v${PV}.tar.gz -> ${P}.tar.gz
https://dev.gentoo.org/~gienah/snapshots/${P}-ivy2-deps.tar.xz
https://dev.gentoo.org/~gienah/snapshots/${P}-sbt-deps.tar.xz
- http://repo.typesafe.com/typesafe/ivy-releases/org.scala-sbt/${L_PN}/${PV}/${L_PN}.jar -> ${L_P}.jar
+ https://repo.typesafe.com/typesafe/ivy-releases/org.scala-sbt/${L_PN}/${PV}/${L_PN}.jar -> ${L_P}.jar
)
binary? (
- https://dev.gentoo.org/~gienah/files/dist/${P}-gentoo-binary.tar.xz
+ https://dev.gentoo.org/~gienah/distfiles/${P}-gentoo-binary.tar.xz
)"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
IUSE="binary"
+# Restrict to jdk:1.8
+# Missing dependency 'object java.lang.Object in compiler mirror', bug #831297
DEPEND="
- >=virtual/jdk-1.8:*
+ virtual/jdk:1.8
"
RDEPEND="
@@ -41,7 +43,7 @@ RESTRICT="test"
# Note: to bump sbt, some things to try are:
# 1. remove the https://dev.gentoo.org/~gienah/snapshots/${P}-ivy2-deps.tar.xz
# https://dev.gentoo.org/~gienah/snapshots/${P}-sbt-deps.tar.xz and
-# binary? ( https://dev.gentoo.org/~gienah/files/dist/${P}-gentoo-binary.tar.xz )
+# binary? ( https://dev.gentoo.org/~gienah/distfiles/${P}-gentoo-binary.tar.xz )
# from SRC_URI
# 2. Comment the sbt publishLocal line in src_compile.
# 3. try:
@@ -122,10 +124,11 @@ src_prepare() {
src_compile() {
if ! use binary; then
einfo "=== sbt compile ..."
+ local vm_version="$(java-config -g PROVIDES_VERSION)"
"${WORKDIR}/${L_P}/sbt" -Dsbt.log.noformat=true compile || die
- einfo "=== sbt publishLocal with jdk $(java-pkg_get-vm-version) ..."
+ einfo "=== sbt publishLocal with jdk ${vm_version} ..."
cat <<- EOF | "${WORKDIR}/${L_P}/sbt" -Dsbt.log.noformat=true || die
- set every javaVersionPrefix in javaVersionCheck := Some("$(java-pkg_get-vm-version)")
+ set every javaVersionPrefix in javaVersionCheck := Some("${vm_version}")
publishLocal
EOF
fi
diff --git a/dev-java/scram/Manifest b/dev-java/scram/Manifest
new file mode 100644
index 00000000000..42494f4d9f7
--- /dev/null
+++ b/dev-java/scram/Manifest
@@ -0,0 +1 @@
+DIST scram-2.1.tar.gz 64263 BLAKE2B 59b71ee0faa32d2478e38e4275b7c83efb3f7a3ede0c068a8c0a6fe970248d22b539c50b97127b1b757839758d119b395fedd85d85425bd019e0972c2df20ef4 SHA512 e0757b306db03c56f03fa0907e46693337854c152a321cae1b109a1c16b0cb5be2482a92d64a420432a3ea31371990cbac444f965abde89c04083005b30012ef
diff --git a/dev-java/scram/metadata.xml b/dev-java/scram/metadata.xml
new file mode 100644
index 00000000000..75321cfb559
--- /dev/null
+++ b/dev-java/scram/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dt