summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'dev-java')
-rw-r--r--dev-java/angus-activation/Manifest1
-rw-r--r--dev-java/angus-activation/angus-activation-1.0.0.ebuild43
-rw-r--r--dev-java/angus-activation/metadata.xml (renamed from dev-java/janino/metadata.xml)1
-rw-r--r--dev-java/animal-sniffer-annotations/animal-sniffer-annotations-1.15-r1.ebuild (renamed from dev-java/animal-sniffer-annotations/animal-sniffer-annotations-1.15.ebuild)10
-rw-r--r--dev-java/ant-contrib/Manifest1
-rw-r--r--dev-java/ant-contrib/ant-contrib-1.0_beta3-r2.ebuild80
-rw-r--r--dev-java/ant-contrib/ant-contrib-1.0_beta6_pre20201123-r1.ebuild (renamed from dev-java/ant-contrib/ant-contrib-1.0_beta6_pre20201123.ebuild)33
-rw-r--r--dev-java/ant-contrib/files/tests-visibility.patch12
-rw-r--r--dev-java/ant-core/ant-core-1.10.9-r1.ebuild161
-rw-r--r--dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.10-r1.ebuild4
-rw-r--r--dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.13.ebuild4
-rw-r--r--dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.15-r1.ebuild2
-rw-r--r--dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.21.ebuild2
-rw-r--r--dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.4.2.ebuild4
-rw-r--r--dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.5.1.ebuild4
-rw-r--r--dev-java/ant-ivy/Manifest3
-rw-r--r--dev-java/ant-ivy/ant-ivy-1.4.1-r2.ebuild82
-rw-r--r--dev-java/ant-ivy/ant-ivy-2.3.0-r3.ebuild106
-rw-r--r--dev-java/ant-ivy/ant-ivy-2.5.0.ebuild182
-rw-r--r--dev-java/ant-ivy/files/1.4.1-javadoc.patch14
-rw-r--r--dev-java/ant-ivy/metadata.xml5
-rw-r--r--dev-java/ant-junit4/ant-junit4-1.10.9.ebuild4
-rw-r--r--dev-java/aopalliance/aopalliance-1.0-r2.ebuild2
-rw-r--r--dev-java/aopalliance/aopalliance-1.0-r3.ebuild36
-rw-r--r--dev-java/apache-rat-core/apache-rat-core-0.13.ebuild2
-rw-r--r--dev-java/aspectj/Manifest1
-rw-r--r--dev-java/aspectj/aspectj-1.9.6.ebuild44
-rw-r--r--dev-java/aspectj/aspectj-1.9.7.ebuild2
-rw-r--r--dev-java/assertj-core/assertj-core-2.3.0.ebuild2
-rw-r--r--dev-java/avalon-framework/avalon-framework-4.2.0-r3.ebuild2
-rw-r--r--dev-java/avalon-logkit/avalon-logkit-2.1-r9.ebuild2
-rw-r--r--dev-java/bcel/bcel-6.5.0-r2.ebuild (renamed from dev-java/bcel/bcel-6.5.0-r1.ebuild)29
-rw-r--r--dev-java/bcpg/Manifest1
-rw-r--r--dev-java/bcpg/bcpg-1.50-r1.ebuild70
-rw-r--r--dev-java/bcpg/bcpg-1.50-r2.ebuild73
-rw-r--r--dev-java/bcpkix/Manifest1
-rw-r--r--dev-java/bcpkix/bcpkix-1.50-r2.ebuild33
-rw-r--r--dev-java/bcprov/Manifest1
-rw-r--r--dev-java/bcprov/bcprov-1.50-r2.ebuild65
-rw-r--r--dev-java/bcprov/bcprov-1.50-r4.ebuild61
-rw-r--r--dev-java/bndlib/bndlib-2.1.0-r1.ebuild4
-rw-r--r--dev-java/boot-bin/Manifest3
-rw-r--r--dev-java/boot-bin/boot-bin-2.7.1-r1.ebuild71
-rw-r--r--dev-java/boot-bin/boot-bin-2.8.3.ebuild4
-rw-r--r--dev-java/brotli-dec/brotli-dec-0.1.2.ebuild2
-rw-r--r--dev-java/bsf/bsf-2.4.0-r2.ebuild4
-rw-r--r--dev-java/bsh/bsh-2.0_beta6-r1.ebuild5
-rw-r--r--dev-java/c3p0/Manifest2
-rw-r--r--dev-java/c3p0/c3p0-0.9.5.1.ebuild59
-rw-r--r--dev-java/c3p0/c3p0-0.9.5.5.ebuild57
-rw-r--r--dev-java/cglib/cglib-3.3.0.ebuild2
-rw-r--r--dev-java/checker-framework-qual/Manifest1
-rw-r--r--dev-java/checker-framework-qual/checker-framework-qual-3.14.0.ebuild26
-rw-r--r--dev-java/checker-framework-qual/metadata.xml16
-rw-r--r--dev-java/commons-beanutils/commons-beanutils-1.9.4-r1.ebuild101
-rw-r--r--dev-java/commons-beanutils/commons-beanutils-1.9.4.ebuild69
-rw-r--r--dev-java/commons-codec/commons-codec-1.15.ebuild4
-rw-r--r--dev-java/commons-collections/Manifest1
-rw-r--r--dev-java/commons-collections/commons-collections-3.2.2.ebuild4
-rw-r--r--dev-java/commons-collections/commons-collections-4.4.ebuild67
-rw-r--r--dev-java/commons-collections/metadata.xml11
-rw-r--r--dev-java/commons-compress/commons-compress-1.21.ebuild2
-rw-r--r--dev-java/commons-csv/commons-csv-1.9.0.ebuild2
-rw-r--r--dev-java/commons-daemon/commons-daemon-1.0.15.ebuild3
-rw-r--r--dev-java/commons-daemon/commons-daemon-1.1.0.ebuild3
-rw-r--r--dev-java/commons-digester/Manifest1
-rw-r--r--dev-java/commons-digester/commons-digester-2.1-r2.ebuild68
-rw-r--r--dev-java/commons-digester/commons-digester-3.2-r3.ebuild77
-rw-r--r--dev-java/commons-digester/metadata.xml11
-rw-r--r--dev-java/commons-httpclient/commons-httpclient-3.1-r2.ebuild4
-rw-r--r--dev-java/commons-httpclient/commons-httpclient-4.5.13-r1.ebuild4
-rw-r--r--dev-java/commons-imaging/Manifest2
-rw-r--r--dev-java/commons-imaging/commons-imaging-0.97.ebuild49
-rw-r--r--dev-java/commons-imaging/commons-imaging-1.0_alpha2.ebuild41
-rw-r--r--dev-java/commons-io/commons-io-2.11.0.ebuild4
-rw-r--r--dev-java/commons-jxpath/Manifest1
-rw-r--r--dev-java/commons-jxpath/commons-jxpath-1.3-r4.ebuild63
-rw-r--r--dev-java/commons-jxpath/commons-jxpath-1.3-r5.ebuild62
-rw-r--r--dev-java/commons-jxpath/metadata.xml11
-rw-r--r--dev-java/commons-lang/commons-lang-3.12.0.ebuild2
-rw-r--r--dev-java/commons-logging/commons-logging-1.2-r3.ebuild2
-rw-r--r--dev-java/commons-math/commons-math-3.6.1-r1.ebuild4
-rw-r--r--dev-java/commons-net/commons-net-3.8.0.ebuild4
-rw-r--r--dev-java/commons-pool/Manifest1
-rw-r--r--dev-java/commons-pool/commons-pool-2.2.ebuild49
-rw-r--r--dev-java/commons-pool/metadata.xml8
-rw-r--r--dev-java/commons-text/commons-text-1.9.ebuild2
-rw-r--r--dev-java/commons-vfs/Manifest1
-rw-r--r--dev-java/commons-vfs/commons-vfs-1.0-r1.ebuild40
-rw-r--r--dev-java/commons-vfs/commons-vfs-2.0-r2.ebuild6
-rw-r--r--dev-java/core-specs-alpha/core-specs-alpha-0.1.24.ebuild4
-rw-r--r--dev-java/core-specs-alpha/core-specs-alpha-0.2.44.ebuild4
-rw-r--r--dev-java/cpptasks/cpptasks-1.0_beta5-r1.ebuild64
-rw-r--r--dev-java/cpptasks/cpptasks-1.0_beta5.ebuild4
-rw-r--r--dev-java/cpptasks/files/cpptasks-1.0_beta5-test-classpath.patch33
-rw-r--r--dev-java/dict4j/Manifest1
-rw-r--r--dev-java/dict4j/dict4j-1.1.ebuild24
-rw-r--r--dev-java/dict4j/metadata.xml14
-rw-r--r--dev-java/dom4j/Manifest2
-rw-r--r--dev-java/dom4j/dom4j-1.6.1-r8.ebuild84
-rw-r--r--dev-java/dom4j/dom4j-1.6.1-r9.ebuild84
-rw-r--r--dev-java/dom4j/dom4j-2.1.3.ebuild4
-rw-r--r--dev-java/easymock/easymock-3.3.1-r1.ebuild2
-rw-r--r--dev-java/error-prone-annotations/Manifest1
-rw-r--r--dev-java/error-prone-annotations/error-prone-annotations-2.0.14.ebuild2
-rw-r--r--dev-java/error-prone-annotations/error-prone-annotations-2.7.1.ebuild27
-rw-r--r--dev-java/failureaccess/Manifest1
-rw-r--r--dev-java/failureaccess/failureaccess-30.1.1.ebuild28
-rw-r--r--dev-java/failureaccess/metadata.xml18
-rw-r--r--dev-java/felix-gogo-command/Manifest1
-rw-r--r--dev-java/felix-gogo-command/felix-gogo-command-0.12.0.ebuild44
-rw-r--r--dev-java/felix-gogo-command/files/felix-gogo-command-0.12.0-build.xml276
-rw-r--r--dev-java/felix-gogo-command/metadata.xml8
-rw-r--r--dev-java/fontbox/Manifest1
-rw-r--r--dev-java/fontbox/fontbox-1.8.11.ebuild51
-rw-r--r--dev-java/glassfish-ejb-api/Manifest1
-rw-r--r--dev-java/glassfish-ejb-api/metadata.xml8
-rw-r--r--dev-java/glassfish-persistence/glassfish-persistence-1.0-r2.ebuild4
-rw-r--r--dev-java/glassfish-xmlrpc-api/glassfish-xmlrpc-api-1.1.1-r1.ebuild (renamed from dev-java/glassfish-ejb-api/glassfish-ejb-api-3.2.ebuild)32
-rw-r--r--dev-java/gnu-jaf/Manifest1
-rw-r--r--dev-java/gnu-jaf/gnu-jaf-1.1.1-r1.ebuild35
-rw-r--r--dev-java/gnu-jaf/gnu-jaf-1.1.2.ebuild4
-rw-r--r--dev-java/gradle-bin/Manifest2
-rw-r--r--dev-java/gradle-bin/gradle-bin-6.8.3.ebuild2
-rw-r--r--dev-java/gradle-bin/gradle-bin-7.1.1.ebuild2
-rw-r--r--dev-java/gradle-bin/gradle-bin-7.3.3.ebuild (renamed from dev-java/gradle-bin/gradle-bin-7.3.ebuild)0
-rw-r--r--dev-java/gson/gson-2.8.8.ebuild15
-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.ebuild2
-rw-r--r--dev-java/guava/guava-30.1.1.ebuild58
-rw-r--r--dev-java/guice/guice-4.1.ebuild2
-rw-r--r--dev-java/hamcrest-core/hamcrest-core-1.3-r2.ebuild6
-rw-r--r--dev-java/hamcrest-generator/hamcrest-generator-1.3-r3.ebuild3
-rw-r--r--dev-java/hamcrest-library/hamcrest-library-1.3-r2.ebuild5
-rw-r--r--dev-java/hawtjni-runtime/hawtjni-runtime-1.15-r1.ebuild2
-rw-r--r--dev-java/httpcore/httpcore-4.4.14.ebuild4
-rw-r--r--dev-java/icedtea/Manifest22
-rw-r--r--dev-java/icedtea/icedtea-3.18.0.ebuild385
-rw-r--r--dev-java/icedtea/icedtea-3.19.0.ebuild385
-rw-r--r--dev-java/icedtea/icedtea-3.21.0.ebuild4
-rw-r--r--dev-java/icu4j/Manifest1
-rw-r--r--dev-java/icu4j/icu4j-54.1.1-r1.ebuild50
-rw-r--r--dev-java/icu4j/icu4j-70.1.ebuild10
-rw-r--r--dev-java/j2objc-annotations/j2objc-annotations-1.2-r1.ebuild (renamed from dev-java/j2objc-annotations/j2objc-annotations-1.2.ebuild)10
-rw-r--r--dev-java/jackcess/jackcess-4.0.0.ebuild2
-rw-r--r--dev-java/jackrabbit-webdav/files/jackrabbit-webdav-2.10.1-CSRFUtilTest.java.patch4
-rw-r--r--dev-java/jackrabbit-webdav/files/jackrabbit-webdav-2.10.1-OutputContextImplTest.java.patch4
-rw-r--r--dev-java/jackrabbit-webdav/jackrabbit-webdav-2.10.1-r2.ebuild51
-rw-r--r--dev-java/jackrabbit-webdav/jackrabbit-webdav-2.10.1.ebuild5
-rw-r--r--dev-java/jackrabbit-webdav/jackrabbit-webdav-2.21.7.ebuild4
-rw-r--r--dev-java/jackson-annotations/Manifest1
-rw-r--r--dev-java/jackson-annotations/jackson-annotations-2.13.0.ebuild43
-rw-r--r--dev-java/jackson/Manifest1
-rw-r--r--dev-java/jackson/jackson-2.9.10.ebuild59
-rw-r--r--dev-java/jackson/metadata.xml11
-rw-r--r--dev-java/jacl/jacl-1.4.1-r1.ebuild2
-rw-r--r--dev-java/jakarta-activation-api/Manifest2
-rw-r--r--dev-java/jakarta-activation-api/jakarta-activation-api-2.1.0.ebuild (renamed from dev-java/jakarta-activation-api/jakarta-activation-api-2.0.1-r1.ebuild)27
-rw-r--r--dev-java/jakarta-activation/Manifest1
-rw-r--r--dev-java/jakarta-activation/jakarta-activation-1.2.2.ebuild2
-rw-r--r--dev-java/jakarta-activation/jakarta-activation-2.0.1.ebuild35
-rw-r--r--dev-java/jakarta-regexp/jakarta-regexp-1.3-r5.ebuild4
-rw-r--r--dev-java/jakarta-regexp/jakarta-regexp-1.3-r6.ebuild33
-rw-r--r--dev-java/jakarta-regexp/jakarta-regexp-1.4-r2.ebuild4
-rw-r--r--dev-java/jakarta-regexp/jakarta-regexp-1.4-r3.ebuild32
-rw-r--r--dev-java/jakarta-regexp/jakarta-regexp-1.5-r1.ebuild32
-rw-r--r--dev-java/jakarta-regexp/jakarta-regexp-1.5.ebuild4
-rw-r--r--dev-java/jakarta-xml-soap-api/Manifest1
-rw-r--r--dev-java/jakarta-xml-soap-api/jakarta-xml-soap-api-1.4.2.ebuild65
-rw-r--r--dev-java/jakarta-xml-soap-api/metadata.xml (renamed from dev-java/jcommon/metadata.xml)4
-rw-r--r--dev-java/jakartaee-migration/jakartaee-migration-1.0.0.ebuild2
-rw-r--r--dev-java/jama/Manifest1
-rw-r--r--dev-java/jama/jama-1.0.3-r1.ebuild28
-rw-r--r--dev-java/jama/metadata.xml8
-rw-r--r--dev-java/jamon/Manifest1
-rw-r--r--dev-java/jamon/jamon-2.81.ebuild82
-rw-r--r--dev-java/jamon/metadata.xml16
-rw-r--r--dev-java/janino/Manifest1
-rw-r--r--dev-java/janino/janino-2.7.0.ebuild47
-rw-r--r--dev-java/jansi-native/jansi-native-1.8.ebuild2
-rw-r--r--dev-java/jansi/Manifest1
-rw-r--r--dev-java/jansi/jansi-1.13.ebuild2
-rw-r--r--dev-java/jansi/jansi-2.4.0-r1.ebuild78
-rw-r--r--dev-java/java-config/java-config-2.3.1.ebuild2
-rw-r--r--dev-java/java-config/java-config-9999.ebuild2
-rw-r--r--dev-java/javacc/javacc-5.0-r3.ebuild2
-rw-r--r--dev-java/javacc/javacc-5.0-r4.ebuild73
-rw-r--r--dev-java/javassist/Manifest1
-rw-r--r--dev-java/javassist/javassist-2.6-r2.ebuild32
-rw-r--r--dev-java/javassist/javassist-3.18.2-r1.ebuild2
-rw-r--r--dev-java/javassist/javassist-3.18.2.ebuild40
-rw-r--r--dev-java/javatoolkit/javatoolkit-0.6.7.ebuild2
-rw-r--r--dev-java/javax-inject/javax-inject-1-r2.ebuild4
-rw-r--r--dev-java/javax-inject/javax-inject-1-r3.ebuild6
-rw-r--r--dev-java/javax-inject/javax-inject-1-r4.ebuild22
-rw-r--r--dev-java/jaxb-api/Manifest1
-rw-r--r--dev-java/jaxb-api/jaxb-api-3.0.1.ebuild40
-rw-r--r--dev-java/jaxen/jaxen-1.2.0-r1.ebuild2
-rw-r--r--dev-java/jchardet/Manifest1
-rw-r--r--dev-java/jchardet/jchardet-1.1-r1.ebuild28
-rw-r--r--dev-java/jchardet/metadata.xml11
-rw-r--r--dev-java/jcifs/jcifs-1.3.19-r1.ebuild (renamed from dev-java/jcifs/jcifs-1.3.19.ebuild)9
-rw-r--r--dev-java/jcommander/jcommander-1.48-r1.ebuild29
-rw-r--r--dev-java/jcommander/jcommander-1.48.ebuild2
-rw-r--r--dev-java/jcommon/Manifest1
-rw-r--r--dev-java/jcommon/jcommon-1.0.23.ebuild56
-rw-r--r--dev-java/jdynamite/Manifest1
-rw-r--r--dev-java/jdynamite/jdynamite-1.2-r1.ebuild35
-rw-r--r--dev-java/jdynamite/metadata.xml11
-rw-r--r--dev-java/jffi/jffi-1.2.9-r1.ebuild2
-rw-r--r--dev-java/jfreesvg/Manifest2
-rw-r--r--dev-java/jfreesvg/jfreesvg-2.1-r1.ebuild42
-rw-r--r--dev-java/jfreesvg/jfreesvg-3.0.ebuild39
-rw-r--r--dev-java/jfreesvg/metadata.xml19
-rw-r--r--dev-java/jgoodies-looks/files/jgoodies-looks-2.3.1-build.xml.patch61
-rw-r--r--dev-java/jgrapht/Manifest1
-rw-r--r--dev-java/jgrapht/jgrapht-0.8.3.ebuild48
-rw-r--r--dev-java/jgrapht/metadata.xml11
-rw-r--r--dev-java/jibx/Manifest4
-rw-r--r--dev-java/jibx/jibx-1.1.5-r3.ebuild52
-rw-r--r--dev-java/jibx/jibx-1.2.6-r1.ebuild47
-rw-r--r--dev-java/jline/Manifest2
-rw-r--r--dev-java/jline/files/maven-build.properties13
-rw-r--r--dev-java/jline/files/maven-build.xml199
-rw-r--r--dev-java/jline/jline-1.0-r1.ebuild70
-rw-r--r--dev-java/jline/jline-2.12.1-r1.ebuild66
-rw-r--r--dev-java/jline/jline-2.14.6.ebuild2
-rw-r--r--dev-java/jmdns/Manifest1
-rw-r--r--dev-java/jmdns/jmdns-3.4.1-r1.ebuild27
-rw-r--r--dev-java/jmdns/metadata.xml16
-rw-r--r--dev-java/jmh-core/jmh-core-1.21.ebuild4
-rw-r--r--dev-java/jna/Manifest1
-rw-r--r--dev-java/jna/files/5.10.0-build.xml.patch55
-rw-r--r--dev-java/jna/files/5.10.0-tests-exclude.patch27
-rw-r--r--dev-java/jna/jna-5.10.0.ebuild100
-rw-r--r--dev-java/jnr-a64asm/jnr-a64asm-1.0.0.ebuild2
-rw-r--r--dev-java/jnr-constants/Manifest1
-rw-r--r--dev-java/jnr-constants/files/jnr-constants_maven-build.xml259
-rw-r--r--dev-java/jnr-constants/jnr-constants-0.10.3.ebuild2
-rw-r--r--dev-java/jnr-constants/jnr-constants-0.8.6.ebuild49
-rw-r--r--dev-java/jnr-enxio/Manifest1
-rw-r--r--dev-java/jnr-enxio/files/jnr-enxio-0.7-build.xml320
-rw-r--r--dev-java/jnr-enxio/jnr-enxio-0.7-r1.ebuild40
-rw-r--r--dev-java/jnr-enxio/metadata.xml11
-rw-r--r--dev-java/jnr-ffi/jnr-ffi-2.0.2-r1.ebuild5
-rw-r--r--dev-java/jnr-netdb/jnr-netdb-1.1.4-r1.ebuild4
-rw-r--r--dev-java/jnr-posix/jnr-posix-3.0.10-r1.ebuild4
-rw-r--r--dev-java/jnr-posix/jnr-posix-3.0.10.ebuild53
-rw-r--r--dev-java/jnr-unixsocket/Manifest1
-rw-r--r--dev-java/jnr-unixsocket/files/jnr-unixsocket-0.6-build.xml321
-rw-r--r--dev-java/jnr-unixsocket/jnr-unixsocket-0.6-r1.ebuild42
-rw-r--r--dev-java/jnr-unixsocket/metadata.xml11
-rw-r--r--dev-java/jnr-x86asm/jnr-x86asm-1.0.2-r2.ebuild2
-rw-r--r--dev-java/joda-convert/Manifest2
-rw-r--r--dev-java/joda-convert/files/joda-convert-1.3.1-build.xml248
-rw-r--r--dev-java/joda-convert/joda-convert-1.3.1-r1.ebuild43
-rw-r--r--dev-java/joda-convert/joda-convert-2.2.2.ebuild71
-rw-r--r--dev-java/joda-convert/metadata.xml3
-rw-r--r--dev-java/joda-time/joda-time-2.10.10-r1.ebuild2
-rw-r--r--dev-java/jopt-simple/jopt-simple-4.6-r1.ebuild23
-rw-r--r--dev-java/jopt-simple/jopt-simple-4.6.ebuild4
-rw-r--r--dev-java/jrrd/Manifest1
-rw-r--r--dev-java/jrrd/files/jrrd-1.0.1-javacflags.patch11
-rw-r--r--dev-java/jrrd/jrrd-1.0.1-r2.ebuild45
-rw-r--r--dev-java/jrrd/metadata.xml11
-rw-r--r--dev-java/jsch/Manifest1
-rw-r--r--dev-java/jsch/jsch-0.1.54-r1.ebuild56
-rw-r--r--dev-java/jsch/jsch-0.1.55.ebuild38
-rw-r--r--dev-java/jsoup/Manifest1
-rw-r--r--dev-java/jsoup/jsoup-1.8.3.ebuild48
-rw-r--r--dev-java/jsoup/metadata.xml20
-rw-r--r--dev-java/jsr225/Manifest1
-rw-r--r--dev-java/jsr225/jsr225-1.0.ebuild24
-rw-r--r--dev-java/jsr225/metadata.xml10
-rw-r--r--dev-java/jsr305/Manifest1
-rw-r--r--dev-java/jsr305/jsr305-3.0.2-r1.ebuild (renamed from dev-java/jsr305/jsr305-3.0.1.ebuild)13
-rw-r--r--dev-java/jsr305/jsr305-3.0.2.ebuild2
-rw-r--r--dev-java/jsr311-api/Manifest1
-rw-r--r--dev-java/jsr311-api/jsr311-api-1.1.1.ebuild19
-rw-r--r--dev-java/jsr311-api/metadata.xml11
-rw-r--r--dev-java/jsr322/Manifest1
-rw-r--r--dev-java/jsr322/jsr322-1.5.ebuild22
-rw-r--r--dev-java/jsr322/metadata.xml8
-rw-r--r--dev-java/jsr67/Manifest1
-rw-r--r--dev-java/jsr67/jsr67-1.3-r1.ebuild24
-rw-r--r--dev-java/jsr67/metadata.xml8
-rw-r--r--dev-java/jss/Manifest1
-rw-r--r--dev-java/jss/files/jss-3.4-target_source.patch11
-rw-r--r--dev-java/jss/files/jss-4.2.5-use_pkg-config.patch24
-rw-r--r--dev-java/jss/files/jss-4.3-cflags.patch11
-rw-r--r--dev-java/jss/files/jss-4.3-javadoc.patch11
-rw-r--r--dev-java/jss/files/jss-4.3-secitem.patch154
-rw-r--r--dev-java/jss/files/jss-4.3.2-ldflags.patch11
-rw-r--r--dev-java/jss/jss-4.3.2.ebuild95
-rw-r--r--dev-java/jss/metadata.xml16
-rw-r--r--dev-java/jung/Manifest1
-rw-r--r--dev-java/jung/jung-1.7.6-r1.ebuild40
-rw-r--r--dev-java/jung/metadata.xml16
-rw-r--r--dev-java/junit-clptr/junit-clptr-1.2.2.ebuild2
-rw-r--r--dev-java/junitparams/junitparams-1.1.1.ebuild2
-rw-r--r--dev-java/jython/jython-2.7.0-r2.ebuild151
-rw-r--r--dev-java/jython/jython-2.7.0-r4.ebuild5
-rw-r--r--dev-java/jzlib/jzlib-1.1.3-r2.ebuild5
-rw-r--r--dev-java/libg/libg-2.1.0-r2.ebuild4
-rw-r--r--dev-java/libreadline-java/Manifest1
-rw-r--r--dev-java/libreadline-java/files/libreadline-java-0.8.0-gmake.patch19
-rw-r--r--dev-java/libreadline-java/files/libreadline-java-0.8.0-respect-flags.patch27
-rw-r--r--dev-java/libreadline-java/files/termcap-to-ncurses.patch13
-rw-r--r--dev-java/libreadline-java/libreadline-java-0.8.0-r5.ebuild66
-rw-r--r--dev-java/libreadline-java/metadata.xml11
-rw-r--r--dev-java/log4j-api-java9/Manifest1
-rw-r--r--dev-java/log4j-api-java9/log4j-api-java9-2.15.0.ebuild52
-rw-r--r--dev-java/log4j-api-java9/metadata.xml (renamed from dev-java/milton-api/metadata.xml)1
-rw-r--r--dev-java/log4j-api/Manifest1
-rw-r--r--dev-java/log4j-api/log4j-api-2.15.0.ebuild82
-rw-r--r--dev-java/log4j-api/metadata.xml (renamed from dev-java/milton-mail-api/metadata.xml)1
-rw-r--r--dev-java/mchange-commons/Manifest1
-rw-r--r--dev-java/mchange-commons/mchange-commons-0.2.10-r1.ebuild43
-rw-r--r--dev-java/mill-bin/Manifest3
-rw-r--r--dev-java/mill-bin/mill-bin-0.10.0.ebuild26
-rw-r--r--dev-java/mill-bin/mill-bin-0.9.10.ebuild4
-rw-r--r--dev-java/mill-bin/mill-bin-0.9.11.ebuild (renamed from dev-java/mill-bin/mill-bin-0.9.9.ebuild)0
-rw-r--r--dev-java/milton-api/Manifest1
-rw-r--r--dev-java/milton-api/milton-api-2.7.1.3.ebuild34
-rw-r--r--dev-java/milton-mail-api/Manifest1
-rw-r--r--dev-java/milton-mail-api/milton-mail-api-2.7.1.3.ebuild38
-rw-r--r--dev-java/mina-core/Manifest2
-rw-r--r--dev-java/mina-core/metadata.xml8
-rw-r--r--dev-java/mina-core/mina-core-1.1.7-r1.ebuild29
-rw-r--r--dev-java/mina-core/mina-core-2.0.7-r1.ebuild39
-rw-r--r--dev-java/mockito/mockito-1.9.5-r2.ebuild2
-rw-r--r--dev-java/mojarra/Manifest1
-rw-r--r--dev-java/mojarra/files/mojarra-2.2.12-Util.java.patch25
-rw-r--r--dev-java/mojarra/metadata.xml8
-rw-r--r--dev-java/mojarra/mojarra-2.2.12-r1.ebuild54
-rw-r--r--dev-java/moshi/Manifest1
-rw-r--r--dev-java/moshi/metadata.xml11
-rw-r--r--dev-java/moshi/moshi-1.1.0.ebuild36
-rw-r--r--dev-java/mvel/Manifest1
-rw-r--r--dev-java/mvel/files/mvel-2.3.2-ignore-failing-tests.patch43
-rw-r--r--dev-java/mvel/files/mvel-2.3.2-update-supported-java-versions.patch51
-rw-r--r--dev-java/mvel/files/mvel-2.3.2-update-version-in-output.patch26
-rw-r--r--dev-java/mvel/metadata.xml (renamed from dev-java/jibx/metadata.xml)4
-rw-r--r--dev-java/mvel/mvel-2.3.2-r1.ebuild81
-rw-r--r--dev-java/netty-buffer/Manifest1
-rw-r--r--dev-java/netty-buffer/files/netty-buffer-4.0.21-build.xml229
-rw-r--r--dev-java/netty-buffer/netty-buffer-4.0.21.ebuild56
-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.ebuild4
-rw-r--r--dev-java/netty-common/Manifest1
-rw-r--r--dev-java/netty-common/netty-common-4.0.21.ebuild45
-rw-r--r--dev-java/netty-common/netty-common-4.0.36-r1.ebuild71
-rw-r--r--dev-java/netty-common/netty-common-4.0.36.ebuild4
-rw-r--r--dev-java/netty-transport/Manifest1
-rw-r--r--dev-java/netty-transport/files/netty-transport-4.0.21-build.xml229
-rw-r--r--dev-java/netty-transport/netty-transport-4.0.21-r1.ebuild48
-rw-r--r--dev-java/netty-transport/netty-transport-4.0.36.ebuild4
-rw-r--r--dev-java/neuroph/Manifest1
-rw-r--r--dev-java/neuroph/metadata.xml11
-rw-r--r--dev-java/neuroph/neuroph-2.4.ebuild39
-rw-r--r--dev-java/objenesis-test/objenesis-test-3.2.ebuild2
-rw-r--r--dev-java/objenesis/objenesis-3.2.ebuild6
-rw-r--r--dev-java/ognl/Manifest2
-rw-r--r--dev-java/ognl/metadata.xml11
-rw-r--r--dev-java/ognl/ognl-3.0.8.ebuild52
-rw-r--r--dev-java/okio/Manifest1
-rw-r--r--dev-java/okio/files/okio-remove-maven-animal-jre.patch44
-rw-r--r--dev-java/okio/metadata.xml11
-rw-r--r--dev-java/okio/okio-1.11.0.ebuild36
-rw-r--r--dev-java/openjdk-bin/Manifest13
-rw-r--r--dev-java/openjdk-bin/files/openjdk-bin-11.env.sh2
-rw-r--r--dev-java/openjdk-bin/files/openjdk-bin-17.env.sh2
-rw-r--r--dev-java/openjdk-bin/files/openjdk-bin-8.env.sh2
-rw-r--r--dev-java/openjdk-bin/openjdk-bin-11.0.13_p8-r1.ebuild16
-rw-r--r--dev-java/openjdk-bin/openjdk-bin-11.0.13_p8.ebuild16
-rw-r--r--dev-java/openjdk-bin/openjdk-bin-11.0.14_p9-r1.ebuild (renamed from dev-java/openjdk-bin/openjdk-bin-11.0.12_p7.ebuild)29
-rw-r--r--dev-java/openjdk-bin/openjdk-bin-17.0.1_p12-r1.ebuild6
-rw-r--r--dev-java/openjdk-bin/openjdk-bin-17.0.1_p12.ebuild147
-rw-r--r--dev-java/openjdk-bin/openjdk-bin-8.302_p08.ebuild123
-rw-r--r--dev-java/openjdk-bin/openjdk-bin-8.312_p07-r1.ebuild4
-rw-r--r--dev-java/openjdk-bin/openjdk-bin-8.312_p07.ebuild2
-rw-r--r--dev-java/openjdk-jre-bin/Manifest6
-rw-r--r--dev-java/openjdk-jre-bin/files/openjdk-jre-bin-11.env.sh2
-rw-r--r--dev-java/openjdk-jre-bin/files/openjdk-jre-bin-8.env.sh2
-rw-r--r--dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.11_p9.ebuild97
-rw-r--r--dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.13_p8-r1.ebuild97
-rw-r--r--dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.13_p8.ebuild97
-rw-r--r--dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.14_p9.ebuild (renamed from dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.12_p7.ebuild)28
-rw-r--r--dev-java/openjdk-jre-bin/openjdk-jre-bin-8.292_p10.ebuild83
-rw-r--r--dev-java/openjdk-jre-bin/openjdk-jre-bin-8.302_p08.ebuild83
-rw-r--r--dev-java/openjdk-jre-bin/openjdk-jre-bin-8.312_p07-r1.ebuild6
-rw-r--r--dev-java/openjdk-jre-bin/openjdk-jre-bin-8.312_p07.ebuild83
-rw-r--r--dev-java/openjdk/Manifest24
-rw-r--r--dev-java/openjdk/metadata.xml1
-rw-r--r--dev-java/openjdk/openjdk-11.0.13_p8.ebuild19
-rw-r--r--dev-java/openjdk/openjdk-11.0.14_p9.ebuild286
-rw-r--r--dev-java/openjdk/openjdk-17.0.1_p12.ebuild7
-rw-r--r--dev-java/openjdk/openjdk-17.0.2_p8.ebuild (renamed from dev-java/openjdk/openjdk-11.0.12_p7.ebuild)91
-rw-r--r--dev-java/openjdk/openjdk-8.302_p08.ebuild256
-rw-r--r--dev-java/openjdk/openjdk-8.312_p07.ebuild6
-rw-r--r--dev-java/oracle-javamail/oracle-javamail-1.5.6-r1.ebuild1
-rw-r--r--dev-java/osgi-annotation-versioning/osgi-annotation-versioning-1.1.1.ebuild4
-rw-r--r--dev-java/osgi-compendium/osgi-compendium-4.3.1-r2.ebuild4
-rw-r--r--dev-java/osgi-core-api/osgi-core-api-5.0.0-r2.ebuild (renamed from dev-java/osgi-core-api/osgi-core-api-5.0.0-r1.ebuild)15
-rw-r--r--dev-java/osgi-enterprise-api/osgi-enterprise-api-5.0.0-r1.ebuild4
-rw-r--r--dev-java/osgi-foundation/osgi-foundation-1.2.0-r2.ebuild4
-rw-r--r--dev-java/piccolo/Manifest1
-rw-r--r--dev-java/piccolo/metadata.xml11
-rw-r--r--dev-java/piccolo/piccolo-1.04.ebuild31
-rw-r--r--dev-java/piccolo2d/Manifest2
-rw-r--r--dev-java/piccolo2d/metadata.xml12
-rw-r--r--dev-java/piccolo2d/piccolo2d-3.0-r1.ebuild49
-rw-r--r--dev-java/piccolo2d/piccolo2d-3.0-r2.ebuild49
-rw-r--r--dev-java/picocli/Manifest1
-rw-r--r--dev-java/picocli/picocli-4.6.1.ebuild46
-rw-r--r--dev-java/picocli/picocli-4.6.2.ebuild2
-rw-r--r--dev-java/plexus-classworlds/plexus-classworlds-2.2.3.ebuild4
-rw-r--r--dev-java/portletapi/Manifest2
-rw-r--r--dev-java/portletapi/metadata.xml8
-rw-r--r--dev-java/portletapi/portletapi-1.0-r1.ebuild23
-rw-r--r--dev-java/portletapi/portletapi-2.0-r1.ebuild36
-rw-r--r--dev-java/qdox/qdox-1.12.1-r2.ebuild3
-rw-r--r--dev-java/randomized-runner/randomized-runner-2.7.8.ebuild2
-rw-r--r--dev-java/rat/rat-0.13.ebuild2
-rw-r--r--dev-java/reflections/reflections-0.9.10-r1.ebuild4
-rw-r--r--dev-java/resin-servlet-api/Manifest3
-rw-r--r--dev-java/resin-servlet-api/resin-servlet-api-4.0.27-r2.ebuild41
-rw-r--r--dev-java/resin-servlet-api/resin-servlet-api-4.0.46-r1.ebuild (renamed from dev-java/resin-servlet-api/resin-servlet-api-4.0.46.ebuild)22
-rw-r--r--dev-java/rhino/rhino-1.7.7-r1.ebuild4
-rw-r--r--dev-java/sac/sac-1.3-r4.ebuild (renamed from dev-java/sac/sac-1.3-r3.ebuild)21
-rw-r--r--dev-java/sax/sax-2.2.1-r5.ebuild (renamed from dev-java/sax/sax-2.2.1-r4.ebuild)15
-rw-r--r--dev-java/sbt/sbt-0.13.18.ebuild4
-rw-r--r--dev-java/slf4j-api/Manifest1
-rw-r--r--dev-java/slf4j-api/slf4j-api-1.7.30-r1.ebuild2
-rw-r--r--dev-java/slf4j-api/slf4j-api-1.7.32.ebuild62
-rw-r--r--dev-java/slf4j-log4j12/Manifest1
-rw-r--r--dev-java/slf4j-log4j12/metadata.xml8
-rw-r--r--dev-java/slf4j-log4j12/slf4j-log4j12-1.7.30.ebuild73
-rw-r--r--dev-java/slf4j-nop/Manifest1
-rw-r--r--dev-java/slf4j-nop/slf4j-nop-1.7.30.ebuild4
-rw-r--r--dev-java/slf4j-nop/slf4j-nop-1.7.32.ebuild55
-rw-r--r--dev-java/slf4j-simple/Manifest1
-rw-r--r--dev-java/slf4j-simple/slf4j-simple-1.7.30-r1.ebuild2
-rw-r--r--dev-java/slf4j-simple/slf4j-simple-1.7.32.ebuild76
-rw-r--r--dev-java/snakeyaml/snakeyaml-1.28-r1.ebuild2
-rw-r--r--dev-java/snappy/Manifest1
-rw-r--r--dev-java/snappy/files/1.0.3_rc3-gentoo.patch14
-rw-r--r--dev-java/snappy/files/1.0.3_rc3-unbundle-snappy.patch52
-rw-r--r--dev-java/snappy/snappy-1.0.3_rc3.ebuild65
-rw-r--r--dev-java/spec-alpha/spec-alpha-0.1.143.ebuild4
-rw-r--r--dev-java/spec-alpha/spec-alpha-0.2.176.ebuild4
-rw-r--r--dev-java/sun-jai-bin/sun-jai-bin-1.1.3-r2.ebuild4
-rw-r--r--dev-java/swingx-ws/Manifest1
-rw-r--r--dev-java/swingx-ws/swingx-ws-1.0-r1.ebuild54
-rw-r--r--dev-java/swt/swt-3.7.2-r3.ebuild12
-rw-r--r--dev-java/swt/swt-3.8.2-r3.ebuild12
-rw-r--r--dev-java/swt/swt-3.8.2-r4.ebuild152
-rw-r--r--dev-java/testng/testng-6.9.10.ebuild4
-rw-r--r--dev-java/tomcat-servlet-api/Manifest10
-rw-r--r--dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.14.ebuild (renamed from dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.12.ebuild)4
-rw-r--r--dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.16.ebuild (renamed from dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.13.ebuild)4
-rw-r--r--dev-java/tomcat-servlet-api/tomcat-servlet-api-4.1.40.ebuild4
-rw-r--r--dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.53-r1.ebuild4
-rw-r--r--dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.73.ebuild2
-rw-r--r--dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.75.ebuild (renamed from dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.72.ebuild)4
-rw-r--r--dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.56.ebuild (renamed from dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.54.ebuild)4
-rw-r--r--dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.58.ebuild (renamed from dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.55.ebuild)4
-rw-r--r--dev-java/trident/Manifest1
-rw-r--r--dev-java/trident/files/1.3-build.xml.patch29
-rw-r--r--dev-java/trident/metadata.xml8
-rw-r--r--dev-java/trident/trident-1.3-r1.ebuild54
-rw-r--r--dev-java/trident/trident-1.3.ebuild46
-rw-r--r--dev-java/typesafe-config/Manifest1
-rw-r--r--dev-java/typesafe-config/typesafe-config-1.3.0-r3.ebuild21
-rw-r--r--dev-java/velocity/velocity-2.3.ebuild4
-rw-r--r--dev-java/vldocking/Manifest1
-rw-r--r--dev-java/vldocking/metadata.xml15
-rw-r--r--dev-java/vldocking/vldocking-3.0.5.ebuild38
-rw-r--r--dev-java/ws-commons-util/Manifest1
-rw-r--r--dev-java/ws-commons-util/metadata.xml8
-rw-r--r--dev-java/ws-commons-util/ws-commons-util-1.0.1-r1.ebuild25
-rw-r--r--dev-java/xalan/xalan-2.7.2-r1.ebuild3
-rw-r--r--dev-java/xerial-core/metadata.xml2
-rw-r--r--dev-java/xerial-core/xerial-core-2.0.1-r1.ebuild48
-rw-r--r--dev-java/xml-commons-external/xml-commons-external-1.3.04-r1.ebuild3
-rw-r--r--dev-java/xml-commons-external/xml-commons-external-1.4.01-r1.ebuild27
-rw-r--r--dev-java/xml-commons-external/xml-commons-external-1.4.01-r2.ebuild7
-rw-r--r--dev-java/xml-commons-resolver/xml-commons-resolver-1.2-r1.ebuild37
-rw-r--r--dev-java/xml-commons-resolver/xml-commons-resolver-1.2-r2.ebuild2
-rw-r--r--dev-java/xml-security/Manifest1
-rw-r--r--dev-java/xml-security/files/1.5.7-build.xml.patch38
-rw-r--r--dev-java/xml-security/metadata.xml8
-rw-r--r--dev-java/xml-security/xml-security-1.5.7-r1.ebuild66
-rw-r--r--dev-java/xmlunit/xmlunit-1.6-r1.ebuild56
-rw-r--r--dev-java/xmpbox/Manifest1
-rw-r--r--dev-java/xmpbox/metadata.xml10
-rw-r--r--dev-java/xmpbox/xmpbox-2.0.24.ebuild64
-rw-r--r--dev-java/xmpcore/Manifest1
-rw-r--r--dev-java/xmpcore/metadata.xml8
-rw-r--r--dev-java/xmpcore/xmpcore-5.1.2.ebuild18
-rw-r--r--dev-java/zstd-jni/zstd-jni-1.5.0.4.ebuild2
502 files changed, 4082 insertions, 9776 deletions
diff --git a/dev-java/angus-activation/Manifest b/dev-java/angus-activation/Manifest
new file mode 100644
index 00000000000..666de992625
--- /dev/null
+++ b/dev-java/angus-activation/Manifest
@@ -0,0 +1 @@
+DIST angus-activation-1.0.0.tar.gz 26068 BLAKE2B 45151d8d0bc3c2b1835d2ceab62e9d4ab5294dcfbbf606d3298013f0dd5f27a7bbe950effbd053a6e54ec1179884870c167e8967b3536dd79902dbda506bb8c8 SHA512 e6e7b32f1aab8d293d5855a3e6b155922c18aeddf13b3daab6928c1b95b4af6dd292c5670351a70870723bc80a58ef4366e8b4fe40c5f5b995266751bccfdef6
diff --git a/dev-java/angus-activation/angus-activation-1.0.0.ebuild b/dev-java/angus-activation/angus-activation-1.0.0.ebuild
new file mode 100644
index 00000000000..effcb2f8468
--- /dev/null
+++ b/dev-java/angus-activation/angus-activation-1.0.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/eclipse-ee4j/angus-activation/archive/refs/tags/1.0.0.tar.gz --slot 0 --keywords "~amd64 ~arm64 ~ppc64 ~x86" --ebuild angus-activation-1.0.0.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="org.eclipse.angus:angus-activation:1.0.0"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Provides the implementation of the Jakarta Activation Specification"
+HOMEPAGE="https://github.com/eclipse-ee4j/angus-activation"
+SRC_URI="https://github.com/eclipse-ee4j/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="EPL-1.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
+
+# Common dependencies
+# POM: pom.xml
+# jakarta.activation:jakarta.activation-api:2.1.0 -> !!!suitble-mavenVersion-not-found!!!
+
+CP_DEPEND=">=dev-java/jakarta-activation-api-2.1.0:2"
+DEPEND="${CP_DEPEND}
+ >=virtual/jdk-1.8:*"
+
+RDEPEND="${CP_DEPEND}
+ >=virtual/jre-1.8:*"
+
+DOCS=( ../{CONTRIBUTING,LICENSE,NOTICE,README}.md )
+
+S="${WORKDIR}/${P}/activation-registry"
+
+JAVA_SRC_DIR="src/main/java"
+JAVA_RESOURCE_DIRS="src/main/resources"
+
+src_install() {
+ default # https://bugs.gentoo.org/789582
+ java-pkg-simple_src_install
+}
diff --git a/dev-java/janino/metadata.xml b/dev-java/angus-activation/metadata.xml
index 4221e170cbc..75321cfb559 100644
--- a/dev-java/janino/metadata.xml
+++ b/dev-java/angus-activation/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/animal-sniffer-annotations/animal-sniffer-annotations-1.15.ebuild b/dev-java/animal-sniffer-annotations/animal-sniffer-annotations-1.15-r1.ebuild
index 36f83951a32..12973df6f55 100644
--- a/dev-java/animal-sniffer-annotations/animal-sniffer-annotations-1.15.ebuild
+++ b/dev-java/animal-sniffer-annotations/animal-sniffer-annotations-1.15-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=6
+EAPI=8
MY_PN="${PN%-annotations}"
JAVA_PKG_IUSE="doc source"
@@ -13,10 +13,10 @@ HOMEPAGE="http://www.mojohaus.org/animal-sniffer/animal-sniffer-annotations/"
SRC_URI="https://github.com/mojohaus/${MY_PN}/archive/${MY_PN}-parent-${PV}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-DEPEND=">=virtual/jdk-1.7"
-RDEPEND=">=virtual/jre-1.7"
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
S="${WORKDIR}/${MY_PN}-${MY_PN}-parent-${PV}/${PN}"
JAVA_SRC_DIR="src/main/java"
diff --git a/dev-java/ant-contrib/Manifest b/dev-java/ant-contrib/Manifest
index 8b26c2ae497..f56a40d13f5 100644
--- a/dev-java/ant-contrib/Manifest
+++ b/dev-java/ant-contrib/Manifest
@@ -1,2 +1 @@
DIST ant-contrib-1.0_beta6_pre20201123.tar.gz 473435 BLAKE2B f73f0a3cfbf92719143a806e1b4b753f7809aeef4976fd6f75aef85490daa0a44a90c03779aba0784e9e59dfe9b9abf7b19c405287fa20838b29e621fa5f7dac SHA512 0b4d05c90c16c5d076364aa140d3ce503b7b7abf187d7d4cccbf0170dd3afab879bb71b002b3c467f73d2632a57dfd70f74715e8b48f26376cb88e872ec1014e
-DIST ant-contrib-1.0b3-src.tar.bz2 3298187 BLAKE2B 0572d583a770c239880fb7e8e4a1e91331dfe80a52d7cf83a90d108f1e717caa26699dce43b72fb1944a74c8c738ad659f60864e2e8e945c8e91569d80c1214b SHA512 8147ed51612eed9d41515c00ef2bb7210ebd50dba8b471abfadf8a56c67b53c030602ce9e49e9070d72d383de61f290e941a76c282e223330fee606f3633b0a8
diff --git a/dev-java/ant-contrib/ant-contrib-1.0_beta3-r2.ebuild b/dev-java/ant-contrib/ant-contrib-1.0_beta3-r2.ebuild
deleted file mode 100644
index 68d5f869ed7..00000000000
--- a/dev-java/ant-contrib/ant-contrib-1.0_beta3-r2.ebuild
+++ /dev/null
@@ -1,80 +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"
-WANT_ANT_TASKS="ant-ivy"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="A collection of tasks for Apache Ant"
-HOMEPAGE="http://ant-contrib.sourceforge.net/"
-SRC_URI="mirror://sourceforge/ant-contrib/${PN}-${PV/_beta/b}-src.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux"
-
-# test? ( dev-java/ant-junit dev-java/ant-testutil )
-CP_DEPEND="
- >=dev-java/ant-core-1.7.0:0
- dev-java/ant-ivy:0
- >=dev-java/bcel-5.1:0
- dev-java/commons-httpclient:3
- dev-java/xerces:2
-"
-
-RDEPEND="${CP_DEPEND}
- >=virtual/jre-1.4"
-
-# javatoolkit for cElementTree
-DEPEND="${CP_DEPEND}
- >=virtual/jdk-1.4
- >=dev-java/javatoolkit-0.3.0-r2"
-
-S="${WORKDIR}/${PN}"
-PATCHES=( "${FILESDIR}"/tests-visibility.patch )
-
-rewrite_build_xml() {
- python <<EOF
-import xml.etree.cElementTree as et
-tree = et.ElementTree(file='build.xml')
-root = tree.getroot()
-root.append(et.Element('path',id='test.classpath'))
-root.append(et.Element('path',id='compile.classpath'))
-skip=['resolve','classpath']
-for target in tree.getiterator("target"):
- if target.attrib['name'] in skip:
- target.attrib['if'] = 'false'
-
-tree.write('build.xml')
-EOF
- [[ $? != 0 ]] && die "Removing taskdefs failed"
-}
-
-src_prepare() {
- default
- rewrite_build_xml
- java-pkg_clean
- java-pkg-2_src_prepare
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_EXTRA_ARGS="-Dversion=${PV} -Ddep.available=true"
-
-# Can't load bcel for some reason
-RESTRICT="test"
-# for tests
-EANT_GENTOO_CLASSPATH_EXTRA="target/${PN}.jar"
-
-src_install() {
- java-pkg_dojar target/${PN}.jar
-
- java-pkg_register-ant-task
-
- use doc && java-pkg_dojavadoc target/docs/api
- use source && java-pkg_dosrc src/java/net
-
- java-pkg_dohtml -r docs/manual
-}
diff --git a/dev-java/ant-contrib/ant-contrib-1.0_beta6_pre20201123.ebuild b/dev-java/ant-contrib/ant-contrib-1.0_beta6_pre20201123-r1.ebuild
index f652e7eadd7..38db7e73b27 100644
--- a/dev-java/ant-contrib/ant-contrib-1.0_beta6_pre20201123.ebuild
+++ b/dev-java/ant-contrib/ant-contrib-1.0_beta6_pre20201123-r1.ebuild
@@ -4,7 +4,7 @@
# Skeleton command:
# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/cniweb/ant-contrib/archive/0228412be2ef648cfabc1d74416d3188755aff9b.tar.gz --slot 0 --keywords "~amd64 ~ppc64 ~x86" --ebuild ant-contrib-1.0_beta6_pre20201123.ebuild
-EAPI=7
+EAPI=8
JAVA_PKG_IUSE="doc source test"
MAVEN_ID="ant-contrib:ant-contrib:1.0b6"
@@ -14,12 +14,15 @@ inherit java-pkg-2 java-pkg-simple
MY_COMMIT="0228412be2ef648cfabc1d74416d3188755aff9b"
DESCRIPTION="Ant-contrib tasks for Apache Ant"
-HOMEPAGE="http://ant-contrib.sourceforge.net:80"
+HOMEPAGE="http://ant-contrib.sourceforge.net"
SRC_URI="https://github.com/cniweb/${PN}/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ppc64 x86"
+
+# Too many tests fail
+RESTRICT="test"
# Common dependencies
# POM: pom.xml
@@ -31,11 +34,11 @@ KEYWORDS="~amd64 ~ppc64 ~x86"
# xerces:xercesImpl:2.12.0 -> >=dev-java/xerces-2.12.0:2
CDEPEND="
- >=dev-java/ant-core-1.10.9:0
- >=dev-java/ant-ivy-2.3.0:2
- >=dev-java/bcel-6.5.0:0
- >=dev-java/commons-httpclient-3.1:3
- >=dev-java/xerces-2.12.0:2
+ dev-java/ant-core:0
+ dev-java/ant-ivy:2
+ dev-java/bcel:0
+ dev-java/commons-httpclient:3
+ dev-java/xerces:2
"
# Compile dependencies
@@ -43,18 +46,14 @@ CDEPEND="
# test? junit:junit:4.12 -> >=dev-java/junit-4.12:4
# test? org.apache.ant:ant-launcher:1.9.5 -> >=dev-java/ant-core-1.10.9:0
-DEPEND="
+DEPEND="${CDEPEND}
>=virtual/jdk-1.8:*
- ${CDEPEND}
test? (
- >=dev-java/ant-core-1.10.9:0
- )
-"
+ dev-java/ant-core:0
+ )"
-RDEPEND="
- >=virtual/jre-1.8:*
- ${CDEPEND}
-"
+RDEPEND="${CDEPEND}
+ >=virtual/jre-1.8:*"
S="${WORKDIR}/${PN}-${MY_COMMIT}/${PN}"
diff --git a/dev-java/ant-contrib/files/tests-visibility.patch b/dev-java/ant-contrib/files/tests-visibility.patch
deleted file mode 100644
index 182a17f054e..00000000000
--- a/dev-java/ant-contrib/files/tests-visibility.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur ant-contrib.old/test/src/net/sf/antcontrib/BuildFileTestBase.java ant-contrib/test/src/net/sf/antcontrib/BuildFileTestBase.java
---- ant-contrib.old/test/src/net/sf/antcontrib/BuildFileTestBase.java 2008-03-05 23:56:16.000000000 +0200
-+++ ant-contrib/test/src/net/sf/antcontrib/BuildFileTestBase.java 2008-03-05 23:56:55.000000000 +0200
-@@ -76,7 +76,7 @@
- * @param filename name of project file to run
- * @exception BuildException Description of the Exception
- */
-- protected void configureProject( String filename ) throws BuildException {
-+ public void configureProject( String filename ) throws BuildException {
- // find the build file
- File f = new File( filename );
- if ( !f.exists() ) {
diff --git a/dev-java/ant-core/ant-core-1.10.9-r1.ebuild b/dev-java/ant-core/ant-core-1.10.9-r1.ebuild
new file mode 100644
index 00000000000..9c38f6a612b
--- /dev/null
+++ b/dev-java/ant-core/ant-core-1.10.9-r1.ebuild
@@ -0,0 +1,161 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Don't depend on itself.
+JAVA_ANT_DISABLE_ANT_CORE_DEP="true"
+
+# Rewriting build.xml files for the testcases has no use at the moment.
+JAVA_PKG_BSFIX_ALL="no"
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2 prefix
+
+MY_P="apache-ant-${PV}"
+
+DESCRIPTION="Java-based build tool similar to 'make' that uses XML configuration files"
+HOMEPAGE="https://ant.apache.org/"
+SRC_URI="https://archive.apache.org/dist/ant/source/${MY_P}-src.tar.bz2
+ https://dev.gentoo.org/~fordfrog/distfiles/ant-${PV}-gentoo.tar.bz2"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+# Some dependencies for building Javadoc are unavailable on these architectures
+REQUIRED_USE="doc? ( !arm !arm64 )"
+
+CDEPEND=">=virtual/jdk-1.8:*"
+DEPEND="${CDEPEND}
+ doc? ( !arm? ( !arm64? (
+ dev-java/bcel:0
+ dev-java/bsf:2.3
+ dev-java/commons-logging:0
+ dev-java/commons-net:0
+ dev-java/jakarta-activation-api:1
+ dev-java/jakarta-regexp:1.4
+ dev-java/jakarta-oro:2.0
+ dev-java/jdepend:0
+ dev-java/jsch:0
+ dev-java/log4j:0
+ dev-java/oracle-javamail:0
+ dev-java/sun-jai-bin:0
+ dev-java/xalan:0
+ dev-java/xml-commons-resolver:0
+ dev-java/xz-java:0
+ ) ) )"
+RDEPEND="${CDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+RESTRICT="test"
+
+PATCHES=(
+ "${WORKDIR}/${PV}-build.patch"
+ "${WORKDIR}/${PV}-launch.patch"
+)
+
+src_prepare() {
+ default
+
+ eprefixify "${S}/src/script/ant"
+
+ # Fixes bug 556008.
+ java-ant_xml-rewrite -f build.xml \
+ -c -e javadoc \
+ -a failonerror \
+ -v "false"
+
+ # See bug #196080 for more details.
+ java-ant_bsfix_one build.xml
+ java-pkg-2_src_prepare
+
+ # Remove JDK9+ stuff
+ einfo "Removing JDK9+ classes (Jmod and Link)"
+ rm "${S}"/src/main/org/apache/tools/ant/taskdefs/modules/{Jmod,Link}.java
+}
+
+src_compile() {
+ export ANT_HOME=""
+ # Avoid error message that package ant-core was not found
+ export ANT_TASKS="none"
+
+ local bsyscp
+
+ # This ensures that when building ant with bootstrapped ant,
+ # only the source is used for resolving references, and not
+ # the classes in bootstrapped ant but jikes in kaffe has issues with this...
+ if ! java-pkg_current-vm-matches kaffe; then
+ bsyscp="-Dbuild.sysclasspath=ignore"
+ fi
+
+ CLASSPATH="$(java-config -t)" ./build.sh ${bsyscp} jars dist-internal ||
+ die "build failed"
+
+ if use doc; then
+ # All Java packages imported by the source files need to present in
+ # the classpath, otherwise it would be https://bugs.gentoo.org/780531
+ local doc_deps=(
+ bcel
+ bsf-2.3
+ commons-logging
+ commons-net
+ jakarta-activation-api-1
+ jakarta-oro-2.0
+ jakarta-regexp-1.4
+ jdepend
+ jsch
+ log4j
+ oracle-javamail
+ sun-jai-bin
+ xalan
+ xml-commons-resolver
+ xz-java
+ )
+ for dep in "${doc_deps[@]}"; do
+ java-pkg_jar-from --build-only --into lib/optional/ "${dep}"
+ done
+ # This file imports netrexx.lang.Rexx, which is not available
+ # from ::gentoo. Fortunately, there is not a dev-java/ant-*
+ # package for it, so even if we could generate documentation
+ # for it, it would be irrelevant
+ rm src/main/org/apache/tools/ant/taskdefs/optional/NetRexxC.java ||
+ die "Failed to remove Java source file blocking Javadoc generation"
+ ./build.sh ${bsyscp} javadocs || die "Javadoc build failed"
+ fi
+}
+
+src_install() {
+ dodir /usr/share/ant/lib
+
+ for jar in ant.jar ant-bootstrap.jar ant-launcher.jar ; do
+ java-pkg_dojar build/lib/${jar}
+ dosym ../../${PN}/lib/${jar} /usr/share/ant/lib/${jar}
+ done
+
+ dobin src/script/ant
+
+ dodir /usr/share/${PN}/bin
+ for each in antRun antRun.pl runant.pl runant.py ; do
+ dobin "${S}/src/script/${each}"
+ dosym ../../../bin/${each} /usr/share/${PN}/bin/${each}
+ done
+ dosym ../${PN}/bin /usr/share/ant/bin
+
+ insinto /usr/share/${PN}
+ doins -r dist/etc
+ dosym ../${PN}/etc /usr/share/ant/etc
+
+ echo "ANT_HOME=\"${EPREFIX}/usr/share/ant\"" > "${T}/20ant"
+ doenvd "${T}/20ant"
+
+ dodoc NOTICE README WHATSNEW KEYS
+
+ if use doc; then
+ dodoc -r manual/*
+ java-pkg_dojavadoc --symlink manual/api build/javadocs
+ fi
+
+ use source && java-pkg_dosrc src/main/*
+}
diff --git a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.10-r1.ebuild b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.10-r1.ebuild
index 2749b9e7017..720f27959e1 100644
--- a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.10-r1.ebuild
+++ b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.10-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -44,5 +44,5 @@ src_install() {
java-pkg-simple_src_install
insinto /usr/share/java-config-2/compiler
doins "${FILESDIR}/ecj-${SLOT}"
- eprefixify "${D}"/usr/share/java-config-2/compiler/ecj-${SLOT}
+ eprefixify "${ED}"/usr/share/java-config-2/compiler/ecj-${SLOT}
}
diff --git a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.13.ebuild b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.13.ebuild
index de1022b748c..a7881b3908e 100644
--- a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.13.ebuild
+++ b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.13.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -46,5 +46,5 @@ src_install() {
java-pkg-simple_src_install
insinto /usr/share/java-config-2/compiler
doins "${FILESDIR}/ecj-${SLOT}"
- eprefixify "${D}"/usr/share/java-config-2/compiler/ecj-${SLOT}
+ eprefixify "${ED}"/usr/share/java-config-2/compiler/ecj-${SLOT}
}
diff --git a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.15-r1.ebuild b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.15-r1.ebuild
index 478fe1efa82..8dfdbb8d826 100644
--- a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.15-r1.ebuild
+++ b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.15-r1.ebuild
@@ -46,5 +46,5 @@ src_install() {
java-pkg-simple_src_install
insinto /usr/share/java-config-2/compiler
doins "${FILESDIR}/ecj-${SLOT}"
- eprefixify "${D}"/usr/share/java-config-2/compiler/ecj-${SLOT}
+ eprefixify "${ED}"/usr/share/java-config-2/compiler/ecj-${SLOT}
}
diff --git a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.21.ebuild b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.21.ebuild
index 197be6d643e..0b394b88d26 100644
--- a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.21.ebuild
+++ b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.21.ebuild
@@ -50,5 +50,5 @@ src_install() {
java-pkg-simple_src_install
insinto /usr/share/java-config-2/compiler
doins "${FILESDIR}/ecj-${SLOT}"
- eprefixify "${D}"/usr/share/java-config-2/compiler/ecj-${SLOT}
+ eprefixify "${ED}"/usr/share/java-config-2/compiler/ecj-${SLOT}
}
diff --git a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.4.2.ebuild b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.4.2.ebuild
index 3656f27ea48..72245b3883f 100644
--- a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.4.2.ebuild
+++ b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.4.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -44,5 +44,5 @@ src_install() {
java-pkg-simple_src_install
insinto /usr/share/java-config-2/compiler
doins "${FILESDIR}/ecj-${SLOT}"
- eprefixify "${D}"/usr/share/java-config-2/compiler/ecj-${SLOT}
+ eprefixify "${ED}"/usr/share/java-config-2/compiler/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
index 3e841d32827..8260b02e4de 100644
--- 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
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -44,5 +44,5 @@ src_install() {
java-pkg-simple_src_install
insinto /usr/share/java-config-2/compiler
doins "${FILESDIR}/ecj-${SLOT}"
- eprefixify "${D}"/usr/share/java-config-2/compiler/ecj-${SLOT}
+ eprefixify "${ED}"/usr/share/java-config-2/compiler/ecj-${SLOT}
}
diff --git a/dev-java/ant-ivy/Manifest b/dev-java/ant-ivy/Manifest
index ef80fa17ff6..0d8fb7a2c91 100644
--- a/dev-java/ant-ivy/Manifest
+++ b/dev-java/ant-ivy/Manifest
@@ -1,2 +1 @@
-DIST apache-ivy-2.3.0-src.tar.gz 2790722 BLAKE2B 87a79bad15b9b74517ce240fcfd0ae9e58b67816f0ec1fbd14081a17bd837c497da419d0b45ad63b3782b151e86c85b79cafa11f8c1170ab0287597be78cabe7 SHA512 fde43ff288cd8c77f2bdecdcbf52f180247ed99a8526be9d875d60e209b66155d5526e968400382d2cef22cabb8899c3b0912e049ae7d23e2cb79be8a81fe00f
-DIST ivy-1.4.1-src.zip 751792 BLAKE2B 3a6ca8aaa49be9c664c3de4789debfe5770bb32084c548aa49a8d6146b55391729d5d68758e26f29253ab727e8a2a731961ba45419f3c1a212b26d74f33b0a0e SHA512 8ccb4680e8c32178bf12b74f4c6df668bbdd06c6dce6a2d0bf1b9daeec8fb5166d4d510cadb247dc4e2a91b71f5dc7fc429d0d7faed95a2898fd4f9d0888ee8d
+DIST apache-ivy-2.5.0-src.tar.gz 2719181 BLAKE2B 71c47e3493beac8de1bc4e8c86ae18383938265dd2803a1c4b9ad466306227dab9eeca256516ff94064d902d0694b4f0b35ce152c5f64b95b876e47289b25833 SHA512 59d9458345e3a51e8f527258ba26ebe2cf5cf257401c52fb5f75aced0da5f7bf36f8aa0f202bbc0cf029d1d49bd6634f7cb8b65ccc828eb55ff7084430879268
diff --git a/dev-java/ant-ivy/ant-ivy-1.4.1-r2.ebuild b/dev-java/ant-ivy/ant-ivy-1.4.1-r2.ebuild
deleted file mode 100644
index 62198fb29dc..00000000000
--- a/dev-java/ant-ivy/ant-ivy-1.4.1-r2.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc examples source test"
-
-# Registers as split-ant task.
-WANT_SPLIT_ANT="true"
-
-# Rewrites examples otherwise... bad.
-JAVA_PKG_BSFIX_ALL="no"
-
-inherit java-pkg-2 java-ant-2
-
-MY_PN="${PN##*-}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Ivy is a free java based dependency manager"
-HOMEPAGE="https://ant.apache.org/ivy/"
-SRC_URI="http://www.jaya.free.fr/downloads/ivy/${PV}/${MY_P}-src.zip"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux"
-
-COMMON_DEP="
- dev-java/ant-core:0
- dev-java/commons-cli:1
- dev-java/commons-httpclient:3
- dev-java/commons-vfs:0
- dev-java/jakarta-oro:2.0
- dev-java/jsch:0"
-
-BDEPEND="app-arch/unzip"
-DEPEND="
- >=virtual/jdk-1.8:*
- test? ( dev-java/ant-junit:0 )
- ${COMMON_DEP}"
-
-RDEPEND=">=virtual/jre-1.8:*
- ${COMMON_DEP}"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
- "${FILESDIR}/1.4.1-javadoc.patch"
-)
-
-src_prepare() {
- default
-
- # init-ivy expects existing ivy.jar, but we don't need actually it
- sed -i -e 's/depends="init-ivy, prepare"/depends="prepare"/' build.xml \
- || die
-
- rm -v src/java/fr/jayasoft/ivy/repository/vfs/IvyWebdav* || die
- java-ant_rewrite-classpath
- mkdir lib
-}
-
-EANT_GENTOO_CLASSPATH="
- ant-core,commons-cli-1,commons-httpclient-3
- commons-vfs,jakarta-oro-2.0,jsch"
-
-EANT_BUILD_TARGET="offline jar"
-
-src_test() {
- # TODO: find out why a couple of these fail
- java-pkg_jar-from --into lib junit
- ANT_TASKS="ant-junit" eant offline test
-}
-
-src_install() {
- java-pkg_dojar build/artifact/${MY_PN}.jar
-
- use doc && java-pkg_dojavadoc doc/ivy/api
- use examples && java-pkg_doexamples src/example
- use source && java-pkg_dosrc src/java/*
-
- java-pkg_register-ant-task
-}
diff --git a/dev-java/ant-ivy/ant-ivy-2.3.0-r3.ebuild b/dev-java/ant-ivy/ant-ivy-2.3.0-r3.ebuild
deleted file mode 100644
index 17350b9fc44..00000000000
--- a/dev-java/ant-ivy/ant-ivy-2.3.0-r3.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc examples source test"
-
-# Register this as a split-ant task.
-WANT_SPLIT_ANT="true"
-
-# Don't rewrite examples, that's bad.
-JAVA_PKG_BSFIX_ALL="no"
-
-inherit java-pkg-2 java-ant-2
-
-MY_PN="apache-ivy"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Ivy is a free java based dependency manager"
-HOMEPAGE="https://ant.apache.org/ivy/"
-SRC_URI="mirror://apache/ant/ivy/${PV}/${MY_P}-src.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="2"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux"
-
-# We cannot build tests yet as there is no org.apache.tools.ant.BuildFileTest packaged anywhere yet.
-RESTRICT="test"
-
-# SLOT to use for all bc dependencies.
-BC_SLOT="1.50"
-
-# There may be additional optional dependencies (commons-logging, commons-lang...)
-CDEPEND="dev-java/jsch:0
- dev-java/bcpg:${BC_SLOT}
- dev-java/ant-core:0
- dev-java/bcpkix:${BC_SLOT}
- dev-java/bcprov:${BC_SLOT}
- dev-java/commons-vfs:0
- dev-java/jakarta-oro:2.0
- dev-java/commons-httpclient:3"
-
-DEPEND=">=virtual/jdk-1.8:*
- test? (
- dev-java/ant-junit:0
- )
- ${CDEPEND}"
-
-RDEPEND=">=virtual/jre-1.8:*
- ${CDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
- default
-
- # This stuff needs removing.
- local CLEANUP=(
- doc/reports
- test/triggers
- doc/configuration
- test/repositories
- test/java/org/apache/ivy/core/settings/custom-resolver.jar
- src/example/chained-resolvers/settings/repository/test-1.0.jar
- )
-
- rm -rf "${CLEANUP[@]}" || die
-
- java-ant_rewrite-classpath
- mkdir lib || die
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-EANT_GENTOO_CLASSPATH="
- jsch
- bcpkix-${BC_SLOT}
- ant-core
- bcpg-${BC_SLOT}
- commons-vfs
- bcprov-${BC_SLOT}
- jakarta-oro-2.0
- commons-httpclient-3
-"
-
-EANT_BUILD_TARGET="/offline jar"
-
-EANT_EXTRA_ARGS="-Dbuild.version=${PV} -Dbundle.version=${PV}"
-
-src_test() {
- java-pkg_jar-from --into lib junit
- ANT_TASKS="ant-junit" eant "/offline test"
-}
-
-src_install() {
- java-pkg_dojar build/artifact/jars/ivy.jar
- java-pkg_register-ant-task
-
- if use doc; then
- java-pkg_dojavadoc build/doc/reports/api
- java-pkg_dohtml -r doc
- fi
-
- use examples && java-pkg_doexamples src/example
- use source && java-pkg_dosrc src/java/*
-}
diff --git a/dev-java/ant-ivy/ant-ivy-2.5.0.ebuild b/dev-java/ant-ivy/ant-ivy-2.5.0.ebuild
new file mode 100644
index 00000000000..4e3633fe329
--- /dev/null
+++ b/dev-java/ant-ivy/ant-ivy-2.5.0.ebuild
@@ -0,0 +1,182 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.apache.ivy:ivy:2.5.0"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple java-osgi
+
+DESCRIPTION="Ivy is a free java based dependency manager"
+HOMEPAGE="https://ant.apache.org/ivy/"
+SRC_URI="mirror://apache/ant/ivy/${PV}/apache-ivy-${PV}-src.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="2"
+KEYWORDS="amd64 ppc64 x86"
+
+PROPERTIES="test_network"
+RESTRICT="test"
+
+CDEPEND="
+ dev-java/ant-core:0
+ dev-java/bcpg:0
+ dev-java/bcprov:0
+ dev-java/commons-httpclient:4
+ dev-java/commons-vfs:2
+ dev-java/httpcore:0
+ dev-java/jakarta-oro:2.0
+ dev-java/jsch:0
+ dev-java/jsch-agent-proxy:0
+ test? (
+ dev-java/ant-junit:0
+ dev-java/ant-junit4:0
+ dev-java/ant-junitlauncher:0
+ dev-java/ant-testutil:0
+ dev-java/hamcrest-core:1.3
+ dev-java/hamcrest-library:1.3
+ dev-java/xmlunit:1
+ )"
+DEPEND="${CDEPEND}
+ >=virtual/jdk-1.8:*"
+RDEPEND="${CDEPEND}
+ >=virtual/jre-1.8:*"
+
+DOCS=( LICENSE NOTICE README.adoc )
+
+S="${WORKDIR}/apache-ivy-${PV}"
+
+JAVA_GENTOO_CLASSPATH="ant-core,bcpg,bcprov,commons-httpclient-4,commons-vfs-2,httpcore,jakarta-oro-2.0,jsch,jsch-agent-proxy"
+JAVA_MAIN_CLASS="org.apache.ivy.Main"
+JAVA_SRC_DIR="src/java"
+JAVA_RESOURCE_DIRS="resources/java"
+
+JAVA_TEST_GENTOO_CLASSPATH="ant-junit,ant-junit4,ant-junitlauncher,ant-testutil,hamcrest-core-1.3,hamcrest-library-1.3,junit-4,xmlunit-1"
+JAVA_TEST_SRC_DIR="test-src/java"
+JAVA_TEST_RESOURCE_DIRS="test"
+JAVA_GENTOO_CLASSPATH_EXTRA="ant-ivy.jar:test.jar:custom-resolver.jar"
+
+# according to 57,60 build-release.xml
+# https://github.com/apache/ant-ivy/commit/c0c8df492d2312c983f50cfdc5841e18177f6f7b
+JAVA_TEST_EXTRA_ARGS="-Divy.cache.ttl.default=1s -Dskip.download=true -Divy.home=/tmp -D/offline=true"
+
+# Several tests require a certain treatment to "generate-bundles":
+# https://github.com/apache/ant-ivy/blob/48234fc5ede85a865eb874a96c08472ce1751fd1/build.xml#L426-L428
+# <ant dir="${basedir}/test/test-repo" target="generate-bundles"/>
+#
+# The procedure is coded in https://github.com/apache/ant-ivy/blob/48234fc5ede85a865eb874a96c08472ce1751fd1/test/test-repo/build.xml#L19-L71
+# but appears too difficult to be reprodused with 'java-pkg-simple.eclass'.
+# So the failing tests will be excluded, saved for a later attempt.
+#
+# Not excluding any test classes results in "Tests run: 1109, Failures: 98"
+# Excluding those test classes listed below leads to "OK (812 tests)"
+JAVA_TEST_EXCLUDES=(
+ # https://github.com/apache/ant-ivy/blob/083e3f685c1fe29092e59c63b87e81d31fc9babe/build.properties#L56
+ # test.class.pattern = *Test
+ "org.apache.ivy.ant.testutil.AntTaskTestCase" # not in scope
+ "org.apache.ivy.core.TestPerformance" # not in scope
+ "org.apache.ivy.util.TestXmlHelper" # not in scope
+ "org.apache.ivy.TestFixture" # not in scope
+ "org.apache.ivy.TestHelper" # not in scope
+ # https://github.com/apache/ant-ivy/blob/48234fc5ede85a865eb874a96c08472ce1751fd1/build.xml#L412-L420
+ # <exclude name="**/Abstract*Test.java"/>
+ "org.apache.ivy.util.url.AbstractURLHandlerTest"
+ "org.apache.ivy.plugins.resolver.AbstractDependencyResolverTest"
+ "org.apache.ivy.plugins.matcher.AbstractPatternMatcherTest"
+ # following excluded tests cause test failures
+ "org.apache.ivy.ant.BuildOBRTaskTest" # Tests run: 3, Failures: 2
+ "org.apache.ivy.core.deliver.DeliverTest" # Tests run: 1, Failures: 1
+ "org.apache.ivy.core.module.descriptor.IvyMakePomTest" # Tests run: 1, Failures: 1
+ "org.apache.ivy.core.settings.XmlSettingsParserTest" # Tests run: 29, Failures: 1
+ "org.apache.ivy.osgi.core.AggregatedOSGiResolverTest" # Tests run: 3, Failures: 1
+ "org.apache.ivy.osgi.obr.OBRResolverTest" # Tests run: 16, Failures: 16
+ "org.apache.ivy.osgi.repo.BundleRepoTest" # Tests run: 4, Failures: 3
+ "org.apache.ivy.plugins.parser.m2.PomModuleDescriptorParserTest" # Tests run: 46, Failures: 1
+ "org.apache.ivy.plugins.parser.xml.XmlModuleDescriptorParserTest" # Tests run: 44, Failures: 7
+ "org.apache.ivy.plugins.parser.xml.XmlModuleDescriptorWriterTest" # Tests run: 10, Failures: 1
+ "org.apache.ivy.plugins.parser.xml.XmlModuleUpdaterTest" # Tests run: 14, Failures: 3
+ "org.apache.ivy.plugins.resolver.JarResolverTest" # Tests run: 3, Failures: 3
+ # following excluded tests can pass if run individually
+ "org.apache.ivy.ant.IvyConfigureTest" # OK (14 tests)
+ "org.apache.ivy.IvyTest" # OK (1 test)
+ "org.apache.ivy.MainTest" # OK (12 tests)
+ "org.apache.ivy.plugins.report.XmlReportWriterTest" # OK (3 tests)
+ "org.apache.ivy.plugins.resolver.BintrayResolverTest" # OK (12 tests)
+ "org.apache.ivy.plugins.resolver.ChainResolverTest" # OK (15 tests)
+ "org.apache.ivy.plugins.resolver.FileSystemResolverTest" # OK (27 tests)
+ "org.apache.ivy.plugins.resolver.IBiblioMavenSnapshotsResolutionTest" # OK (1 test)
+ "org.apache.ivy.plugins.resolver.IvyRepResolverTest" # OK (3 tests)
+ "org.apache.ivy.plugins.resolver.Maven2LocalTest" # OK (2 tests)
+ "org.apache.ivy.plugins.resolver.PackagerResolverTest" # OK (3 tests)
+ "org.apache.ivy.plugins.resolver.URLResolverTest" # OK (5 tests)
+ "org.apache.ivy.plugins.trigger.LogTriggerTest" # OK (3 tests)
+ # Without PROPERTIES="test_network", the following test cause additional failures.
+ "org.apache.ivy.core.settings.OnlineXmlSettingsParserTest"
+# "org.apache.ivy.osgi.updatesite.UpdateSiteAndIbiblioResolverTest"
+ "org.apache.ivy.osgi.updatesite.UpdateSiteLoaderTest"
+# "org.apache.ivy.plugins.resolver.IBiblioResolverTest"
+# "org.apache.ivy.plugins.resolver.MirroredURLResolverTest"
+ "org.apache.ivy.util.url.ArtifactoryListingTest"
+# "org.apache.ivy.util.url.BasicURLHandlerTest"
+# "org.apache.ivy.util.url.HttpclientURLHandlerTest"
+)
+
+src_prepare() {
+ default
+
+ mkdir --parents "${JAVA_RESOURCE_DIRS}/META-INF" || die
+ pushd "${JAVA_RESOURCE_DIRS}"
+ cp "${S}"/{NOTICE,LICENSE} META-INF/ || die
+ cp -r "${S}"/src/java/* . || die
+
+ # DEPRECATED: 'ivyconf' element is deprecated, use 'ivysettings' instead
+ # according to 210,221 build.xml and still in the upstream .jar file
+ cp org/apache/ivy/core/settings/ivy{settings,conf}-local.xml || die
+ cp org/apache/ivy/core/settings/ivy{settings,conf}-default-chain.xml || die
+ cp org/apache/ivy/core/settings/ivy{settings,conf}-main-chain.xml || die
+ cp org/apache/ivy/core/settings/ivy{settings,conf}-public.xml || die
+ cp org/apache/ivy/core/settings/ivy{settings,conf}-shared.xml || die
+ cp org/apache/ivy/core/settings/ivy{settings,conf}.xml || die
+
+ find . -type f -name '*.java' -exec rm -rf {} + || die
+ popd || die
+}
+
+src_test() {
+ # https://github.com/apache/ant-ivy/blob/48234fc5ede85a865eb874a96c08472ce1751fd1/build.xml#L396-L407
+ # name="build-custom-resolver-jar"
+ JAVA_SRC_DIR="test/custom-classpath"
+ JAVA_JAR_FILENAME="test/java/org/apache/ivy/core/settings/custom-resolver.jar"
+ java-pkg-simple_src_compile
+
+ # Without "license.xml" the tests won't even start. "Tests run: 1109, Failures: 318"
+ jar -cf test.jar \
+ -C test/java org/apache/ivy/plugins/parser/xml/license.xml \
+ -C test/java org/apache/ivy/plugins/parser/m2/license.xml || die
+
+ # Reduce number of failures to "Tests run: 1109, Failures: 98"
+ jar -uf "test.jar" -C test/java . || die
+
+ # Separate *.java files from test resources
+ # https://github.com/apache/ant-ivy/blob/48234fc5ede85a865eb874a96c08472ce1751fd1/build.xml#L389-L393
+ mkdir test-src || die
+ cp -r test/java test-src/ || die
+ find test -type f -name '*.java' -exec rm -rf {} + || die
+
+ # https://github.com/apache/ant-ivy/blob/48234fc5ede85a865eb874a96c08472ce1751fd1/build.xml#L430-L438
+ # name="prepare-test-jar-repositories"
+ mkdir test/jar-repos || die
+ jar -cfM "test/jar-repos/jarrepo1.jar" -C test/repositories/1 . || die
+# jar -cfM "test/jar-repos/jarrepo1_subdir.jar" -C test/repositories 1/**/*/ || die
+
+ java-pkg-simple_src_test
+}
+
+src_install() {
+ default
+ java-osgi_dojar-fromfile "ant-ivy.jar" "META-INF/MANIFEST.MF" "ant-ivy"
+ use doc && java-pkg_dojavadoc target/api
+ use source && java-pkg_dosrc src/*
+}
diff --git a/dev-java/ant-ivy/files/1.4.1-javadoc.patch b/dev-java/ant-ivy/files/1.4.1-javadoc.patch
deleted file mode 100644
index 4a0b47d8a71..00000000000
--- a/dev-java/ant-ivy/files/1.4.1-javadoc.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -ur ivy-1.4.1.old/build.xml ivy-1.4.1/build.xml
---- ivy-1.4.1.old/build.xml 2007-09-04 02:44:23.000000000 +0300
-+++ ivy-1.4.1/build.xml 2007-09-04 02:44:53.000000000 +0300
-@@ -245,9 +245,7 @@
- </target>
-
- <target name="javadoc">
-- <javadoc destdir="${javadoc.build.dir}">
-- <fileset dir="${src.dir}"/>
-- </javadoc>
-+ <javadoc destdir="${javadoc.build.dir}" sourcepath="${src.dir}" />
- </target>
-
- <target name="get-dxml" description="download dxml doc file from web site">
diff --git a/dev-java/ant-ivy/metadata.xml b/dev-java/ant-ivy/metadata.xml
index 3051d122c6e..91e2ba1cf10 100644
--- a/dev-java/ant-ivy/metadata.xml
+++ b/dev-java/ant-ivy/metadata.xml
@@ -14,4 +14,9 @@
to a local lib dir, and it does it for you by locating the artifacts of
your dependencies in repositories, such as ibiblio.
</longdescription>
+ <upstream>
+ <remote-id type="github">apache/ant-ivy</remote-id>
+ <doc>https://ant.apache.org/ivy/history/2.5.0</doc>
+ <bugs-to>https://issues.apache.org/jira/browse/IVY </bugs-to>
+ </upstream>
</pkgmetadata>
diff --git a/dev-java/ant-junit4/ant-junit4-1.10.9.ebuild b/dev-java/ant-junit4/ant-junit4-1.10.9.ebuild
index 71513c67cad..9eef99a6714 100644
--- a/dev-java/ant-junit4/ant-junit4-1.10.9.ebuild
+++ b/dev-java/ant-junit4/ant-junit4-1.10.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -9,7 +9,7 @@ ANT_TASK_DEPNAME="junit-4"
inherit ant-tasks
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
DEPEND="dev-java/junit:4
~dev-java/ant-junit-${PV}"
diff --git a/dev-java/aopalliance/aopalliance-1.0-r2.ebuild b/dev-java/aopalliance/aopalliance-1.0-r2.ebuild
index a9adc6ec5c8..b34aaa747a1 100644
--- a/dev-java/aopalliance/aopalliance-1.0-r2.ebuild
+++ b/dev-java/aopalliance/aopalliance-1.0-r2.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="http://aopalliance.sourceforge.net/"
LICENSE="public-domain"
SLOT="1"
-KEYWORDS="amd64 arm64 ppc64 x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux"
IUSE=""
diff --git a/dev-java/aopalliance/aopalliance-1.0-r3.ebuild b/dev-java/aopalliance/aopalliance-1.0-r3.ebuild
new file mode 100644
index 00000000000..bff2fa46d71
--- /dev/null
+++ b/dev-java/aopalliance/aopalliance-1.0-r3.ebuild
@@ -0,0 +1,36 @@
+# 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="Aspect-Oriented Programming (AOP) Alliance classes"
+SRC_URI="mirror://gentoo/${P}-gentoo.tar.bz2"
+#SRC_URI="mirror://gentoo/${P}.tar.bz2"
+# Tarball creation:
+# cvs -d:pserver:anonymous@aopalliance.cvs.sourceforge.net:/cvsroot/aopalliance login
+# cvs -z3 -d:pserver:anonymous@aopalliance.cvs.sourceforge.net:/cvsroot/aopalliance export -r interception_1_0 aopalliance
+# tar cjvf aopalliance-1.0-gentoo.tar.bz2 aopalliance
+HOMEPAGE="http://aopalliance.sourceforge.net/"
+LICENSE="public-domain"
+SLOT="1"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux"
+
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
+
+S="${WORKDIR}/${P}"
+
+JAVA_SRC_DIR="src/main"
+
+src_prepare() {
+ default
+
+ rm build.xml || die
+}
diff --git a/dev-java/apache-rat-core/apache-rat-core-0.13.ebuild b/dev-java/apache-rat-core/apache-rat-core-0.13.ebuild
index 5e67269064c..5e26db26f1a 100644
--- a/dev-java/apache-rat-core/apache-rat-core-0.13.ebuild
+++ b/dev-java/apache-rat-core/apache-rat-core-0.13.ebuild
@@ -12,7 +12,7 @@ JAVA_TESTING_FRAMEWORKS="junit-4"
inherit java-pkg-2 java-pkg-simple
-DESCRIPTION="The core functionality, shared by the Ant tasks and the Maven plugin."
+DESCRIPTION="The core functionality, shared by the Ant tasks and the Maven plugin"
HOMEPAGE="https://creadur.apache.org/rat/apache-rat-core/"
SRC_URI="mirror://apache//creadur/apache-rat-${PV}/apache-rat-${PV}-src.tar.bz2"
LICENSE="Apache-2.0"
diff --git a/dev-java/aspectj/Manifest b/dev-java/aspectj/Manifest
index ee90a3a8539..e373999baea 100644
--- a/dev-java/aspectj/Manifest
+++ b/dev-java/aspectj/Manifest
@@ -1,2 +1 @@
-DIST aspectj-1.9.6-src.jar 8616829 BLAKE2B adc12e181b2584287dd149657f0505b2d3ba877aa3e8cea1f2fd827b4d05c24728f120798019f1679ebafe850a8e68fa3db1467ac080c27692d5f81d31aebd48 SHA512 f15416a3921ef614ab8068c8ff8277f0fd3c177e9b277ac471786953615f1fe81638b8d13d77ebfe0643fdf089ee3cd5e718d522d2e588989a42df775f2a0516
DIST aspectj-1.9.7.tar.gz 26472044 BLAKE2B a66605845e188903d50566df658fe636b8feb980bbafdc3b4c3e73e46558b24e4bbaf931790012266ac62bff70c3139f0034dafc7de4622827c0f09d4d626efa SHA512 5db2122d95e78056752bbca9adee72c0fa634963b4ea6979c0b75a9cc58b5ef4cf88b79ad640920363ebe7855311bedfa7e30eaba378274a0eebc31557dd57e7
diff --git a/dev-java/aspectj/aspectj-1.9.6.ebuild b/dev-java/aspectj/aspectj-1.9.6.ebuild
deleted file mode 100644
index b1bc3636c59..00000000000
--- a/dev-java/aspectj/aspectj-1.9.6.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="A seamless aspect-oriented extension to the Java programming language"
-HOMEPAGE="https://eclipse.org/aspectj/"
-SRC_URI="https://www.eclipse.org/downloads/download.php?file=/tools/${PN}/${P}-src.jar&r=1 -> ${P}-src.jar"
-
-LICENSE="EPL-1.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-CDEPEND="dev-java/asm:9
- dev-java/commons-logging:0"
-DEPEND="${CDEPEND}
- >=virtual/jdk-1.8:*"
-RDEPEND="${CDEPEND}
- >=virtual/jre-1.8:*"
-BDEPEND="app-arch/zip"
-
-S=${WORKDIR}
-
-JAVA_SRC_DIR="${S}/src"
-JAVA_GENTOO_CLASSPATH="commons-logging,asm-9"
-JAVA_ENCODING="iso8859-1"
-
-src_unpack() {
- default
- unzip "${S}"/aspectjweaver-${PV}-sources.jar -d "${S}"/src/ || die
-}
-
-src_prepare() {
- default
-
- # needs part of BEA JRockit to compile
- rm "${S}"/src/org/aspectj/weaver/loadtime/JRockitAgent.java || die
- # aspectj uses a renamed version of asm:4
- find -name "*.java" -exec sed -i -e 's/import aj.org.objectweb.asm./import org.objectweb.asm./g' {} \; || die
- mkdir -p "${S}"/target/classes/org/aspectj/weaver/ || die
-}
diff --git a/dev-java/aspectj/aspectj-1.9.7.ebuild b/dev-java/aspectj/aspectj-1.9.7.ebuild
index 92f77bf5bec..4f7ef2231ed 100644
--- a/dev-java/aspectj/aspectj-1.9.7.ebuild
+++ b/dev-java/aspectj/aspectj-1.9.7.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/eclipse/org.aspectj/archive/refs/tags/V${PV//./_}.ta
LICENSE="EPL-1.0"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
CDEPEND="dev-java/asm:9
dev-java/commons-logging:0
diff --git a/dev-java/assertj-core/assertj-core-2.3.0.ebuild b/dev-java/assertj-core/assertj-core-2.3.0.ebuild
index 37f6529204e..4d52cde7788 100644
--- a/dev-java/assertj-core/assertj-core-2.3.0.ebuild
+++ b/dev-java/assertj-core/assertj-core-2.3.0.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Java library that provides a fluent interface for writing assertion
HOMEPAGE="http://joel-costigliola.github.io/assertj/"
SRC_URI="https://github.com/joel-costigliola/${PN}/archive/${P}.tar.gz"
LICENSE="Apache-2.0"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
SLOT="2"
CDEPEND="dev-java/cglib:3
diff --git a/dev-java/avalon-framework/avalon-framework-4.2.0-r3.ebuild b/dev-java/avalon-framework/avalon-framework-4.2.0-r3.ebuild
index 23b8c1a9113..fb178f374e6 100644
--- a/dev-java/avalon-framework/avalon-framework-4.2.0-r3.ebuild
+++ b/dev-java/avalon-framework/avalon-framework-4.2.0-r3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://apache/avalon/avalon-framework/source/${P}-src.tar.gz"
LICENSE="Apache-2.0"
SLOT="4.2"
-KEYWORDS="amd64 arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
CDEPEND="dev-java/avalon-logkit:2.0
dev-java/log4j:0"
diff --git a/dev-java/avalon-logkit/avalon-logkit-2.1-r9.ebuild b/dev-java/avalon-logkit/avalon-logkit-2.1-r9.ebuild
index efbc19a52df..3a719687e70 100644
--- a/dev-java/avalon-logkit/avalon-logkit-2.1-r9.ebuild
+++ b/dev-java/avalon-logkit/avalon-logkit-2.1-r9.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Easy-to-use Java logging toolkit"
HOMEPAGE="https://avalon.apache.org/closed.html"
SRC_URI="https://archive.apache.org/dist/excalibur/avalon-logkit/source/avalon-logkit-${PV}-src.tar.gz"
-KEYWORDS="amd64 arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
LICENSE="Apache-2.0"
SLOT="2.0"
IUSE=""
diff --git a/dev-java/bcel/bcel-6.5.0-r1.ebuild b/dev-java/bcel/bcel-6.5.0-r2.ebuild
index 183c85a56fa..7b3bf82feb0 100644
--- a/dev-java/bcel/bcel-6.5.0-r1.ebuild
+++ b/dev-java/bcel/bcel-6.5.0-r2.ebuild
@@ -1,10 +1,10 @@
-# 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 pom.xml --download-uri https://ftp.wayne.edu/apache//commons/bcel/source/bcel-6.5.0-src.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" --ebuild bcel-6.5.0-r1.ebuild
-EAPI=7
+EAPI=8
JAVA_PKG_IUSE="doc source test"
MAVEN_ID="org.apache.bcel:bcel:6.5.0"
@@ -13,7 +13,7 @@ JAVA_TESTING_FRAMEWORKS="junit-4"
inherit java-pkg-2 java-pkg-simple
DESCRIPTION="Apache Commons Bytecode Engineering Library"
-HOMEPAGE="https://commons.apache.org/proper/commons-bcel"
+HOMEPAGE="https://commons.apache.org/proper/commons-bcel/"
SRC_URI="mirror://apache/commons/${PN}/source/${P}-src.tar.gz -> ${P}-sources.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
@@ -29,18 +29,13 @@ KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64
DEPEND="
>=virtual/jdk-1.8:*
- !arm? (
- !arm64? (
- !ppc64? (
- test? (
- dev-java/commons-collections:4
- dev-java/commons-lang:3.6
- dev-java/jna:4
- dev-java/jmh-core:0
- dev-java/oracle-javamail:0
- )
- )
- )
+ test? (
+ dev-java/commons-collections:4
+ dev-java/commons-io:1
+ dev-java/commons-lang:3.6
+ dev-java/jna:4
+ dev-java/jmh-core:0
+ dev-java/oracle-javamail:0
)
"
@@ -48,13 +43,13 @@ RDEPEND="
>=virtual/jre-1.8:*
"
-RESTRICT="!test? ( test ) arm? ( test ) arm64? ( test ) ppc64? ( test )"
+RESTRICT="!test? ( test )"
S="${WORKDIR}/${P}-src"
JAVA_SRC_DIR="src/main/java"
-JAVA_TEST_GENTOO_CLASSPATH="commons-collections-4,commons-lang-3.6,jmh-core,jna-4,junit-4,oracle-javamail"
+JAVA_TEST_GENTOO_CLASSPATH="commons-collections-4,commons-io-1,commons-lang-3.6,jmh-core,jna-4,junit-4,oracle-javamail"
JAVA_TEST_SRC_DIR="src/test/java"
JAVA_TEST_RESOURCE_DIRS=(
"src/test/resources"
diff --git a/dev-java/bcpg/Manifest b/dev-java/bcpg/Manifest
index 94094e36d49..b7586bb4667 100644
--- a/dev-java/bcpg/Manifest
+++ b/dev-java/bcpg/Manifest
@@ -1,2 +1 @@
DIST bc-java-r1rv69.tar.gz 56587177 BLAKE2B be5321f48911840de70d3201c0436cf4147a25999abb605dc4c176ea9292796ca25633635d66dccab685a4bb162258c4495ccc764782119a0750ec1b7456a7db SHA512 5224f424faf549e8e3f2db1134e74647b09bebb654ed23bb0bcd493f065fdb3f2b4f2815be0137ebcc9d62b25a6725b7a26b76d55eb3ad014ad0ce92961126de
-DIST bcpg-jdk15on-150.tar.gz 691012 BLAKE2B ee566fb6deb44177e31bfe80b6bd1f13d39d6820cffe3693bd85314ccfd65c4805275b3925d52a6bda6b1ad7e3ea267f1f0bed3926420b5920e5f300020ecd9a SHA512 763d253b9bb45b7e7fab75d557daa784c3d4a503ced979adc986e5688c3939db248853c864a2f4bec6d5b1dd9ed668d5f278c91b5607774fc703971d0b330fe6
diff --git a/dev-java/bcpg/bcpg-1.50-r1.ebuild b/dev-java/bcpg/bcpg-1.50-r1.ebuild
deleted file mode 100644
index b895d167488..00000000000
--- a/dev-java/bcpg/bcpg-1.50-r1.ebuild
+++ /dev/null
@@ -1,70 +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 test"
-
-inherit java-pkg-2 java-pkg-simple
-
-MY_P="${PN}-jdk15on-${PV/./}"
-
-DESCRIPTION="Java cryptography APIs"
-HOMEPAGE="http://www.bouncycastle.org/java.html"
-SRC_URI="http://www.bouncycastle.org/download/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="1.50"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-# Tests are currently broken. Appears to need older version of bcprov; but since bcprov is not slotted, this can cause conflicts.
-# Needs further investigation; though, only a small part has tests and there are no tests for bcpg itself.
-RESTRICT="test"
-
-CDEPEND="dev-java/bcprov:${SLOT}"
-
-DEPEND=">=virtual/jdk-1.6
- app-arch/unzip
- test? (
- dev-java/ant-junit:0
- )
- ${CDEPEND}"
-
-RDEPEND=">=virtual/jre-1.6
- ${CDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-JAVA_GENTOO_CLASSPATH="bcprov-${SLOT}"
-
-src_unpack() {
- default
- cd "${S}"
- unpack ./src.zip
-}
-
-java_prepare() {
- if ! use test; then
- local RM_TEST_FILES=(
- org/bouncycastle/openpgp/test
- org/bouncycastle/openpgp/examples/test
- )
- rm -rf "${RM_TEST_FILES[@]}" || die
- fi
-}
-
-src_compile() {
- java-pkg-simple_src_compile
-}
-
-src_test() {
- local cp="${PN}.jar:bcprov.jar:junit.jar"
- local pkg="org.bouncycastle"
- java -cp ${cp} ${pkg}.openpgp.test.AllTests | tee openpgp.tests
- grep -q FAILURES *.tests && die "Tests failed."
-}
-
-src_install() {
- java-pkg-simple_src_install
- use source && java-pkg_dosrc org
-}
diff --git a/dev-java/bcpg/bcpg-1.50-r2.ebuild b/dev-java/bcpg/bcpg-1.50-r2.ebuild
deleted file mode 100644
index 6a89f6e9349..00000000000
--- a/dev-java/bcpg/bcpg-1.50-r2.ebuild
+++ /dev/null
@@ -1,73 +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 test"
-
-inherit java-pkg-2 java-pkg-simple
-
-MY_P="${PN}-jdk15on-${PV/./}"
-
-DESCRIPTION="Java cryptography APIs"
-HOMEPAGE="http://www.bouncycastle.org/java.html"
-SRC_URI="http://polydistortion.net/bc/download/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="1.50"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-# Tests are currently broken. Appears to need older version of bcprov; but
-# since bcprov is not slotted, this can cause conflicts. Needs further
-# investigation; though, only a small part has tests and there are no tests for
-# bcpg itself.
-RESTRICT="test"
-
-CDEPEND="dev-java/bcprov:${SLOT}"
-
-DEPEND="
- ${CDEPEND}
- >=virtual/jdk-1.6
- test? ( dev-java/ant-junit:0 )"
-
-RDEPEND="
- ${CDEPEND}
- >=virtual/jre-1.6"
-
-S="${WORKDIR}/${MY_P}"
-
-JAVA_GENTOO_CLASSPATH="bcprov-${SLOT}"
-
-src_unpack() {
- default
- cd "${S}" || die
- unpack ./src.zip
-}
-
-src_prepare() {
- default
- if ! use test; then
- local RM_TEST_FILES=(
- org/bouncycastle/openpgp/test
- org/bouncycastle/openpgp/examples/test
- )
- rm -rv "${RM_TEST_FILES[@]}" || die
- fi
-}
-
-src_compile() {
- java-pkg-simple_src_compile
-}
-
-src_test() {
- local cp="${PN}.jar:bcprov.jar:junit.jar"
- local pkg="org.bouncycastle"
- java -cp ${cp} ${pkg}.openpgp.test.AllTests | tee openpgp.tests
- grep -q FAILURES *.tests && die "Tests failed."
-}
-
-src_install() {
- einstalldocs
- java-pkg-simple_src_install
- use source && java-pkg_dosrc org
-}
diff --git a/dev-java/bcpkix/Manifest b/dev-java/bcpkix/Manifest
index 1ef5925468e..b7586bb4667 100644
--- a/dev-java/bcpkix/Manifest
+++ b/dev-java/bcpkix/Manifest
@@ -1,2 +1 @@
DIST bc-java-r1rv69.tar.gz 56587177 BLAKE2B be5321f48911840de70d3201c0436cf4147a25999abb605dc4c176ea9292796ca25633635d66dccab685a4bb162258c4495ccc764782119a0750ec1b7456a7db SHA512 5224f424faf549e8e3f2db1134e74647b09bebb654ed23bb0bcd493f065fdb3f2b4f2815be0137ebcc9d62b25a6725b7a26b76d55eb3ad014ad0ce92961126de
-DIST bcpkix-jdk15on-1.50-sources.jar 401716 BLAKE2B 7a656218b96da46027c82a023404c32b92a640aa0ed5a1256213139e8dc54f9ef07453478dcc66372a0a49562b92165148f18a5063c24f7569a3e40f649494ba SHA512 6dc6d63db649a94f54c7739144b4120db4255e0a0a713389d54fcd427b95a3ff5ec326ae066cb5aa8a6cf19ccb959cbb22f9f898d39bfe5bf8e20c4d9de6931c
diff --git a/dev-java/bcpkix/bcpkix-1.50-r2.ebuild b/dev-java/bcpkix/bcpkix-1.50-r2.ebuild
deleted file mode 100644
index a1a5de24b45..00000000000
--- a/dev-java/bcpkix/bcpkix-1.50-r2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 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="${PN}-jdk15on"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Java cryptography APIs"
-HOMEPAGE="http://www.bouncycastle.org/java.html"
-SRC_URI="http://central.maven.org/maven2/org/bouncycastle/${MY_PN}/${PV}/${MY_P}-sources.jar"
-
-KEYWORDS="amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-LICENSE="BSD"
-SLOT="1.50"
-
-CDEPEND="dev-java/bcprov:${SLOT}"
-
-DEPEND=">=virtual/jdk-1.6
- app-arch/unzip
- ${CDEPEND}"
-
-RDEPEND=">=virtual/jre-1.6
- ${CDEPEND}"
-
-JAVA_GENTOO_CLASSPATH="bcprov-${SLOT}"
-JAVA_ENCODING="ISO-8859-1"
-JAVA_SRC_DIR="org"
diff --git a/dev-java/bcprov/Manifest b/dev-java/bcprov/Manifest
index f766f2b06d0..b7586bb4667 100644
--- a/dev-java/bcprov/Manifest
+++ b/dev-java/bcprov/Manifest
@@ -1,2 +1 @@
DIST bc-java-r1rv69.tar.gz 56587177 BLAKE2B be5321f48911840de70d3201c0436cf4147a25999abb605dc4c176ea9292796ca25633635d66dccab685a4bb162258c4495ccc764782119a0750ec1b7456a7db SHA512 5224f424faf549e8e3f2db1134e74647b09bebb654ed23bb0bcd493f065fdb3f2b4f2815be0137ebcc9d62b25a6725b7a26b76d55eb3ad014ad0ce92961126de
-DIST bcprov-jdk15on-150.tar.gz 4629743 BLAKE2B 7ab18e83f90db38b9af9530246806b4d413718531ce4b34b7aefa7189e28ade8a2afd5d3b3dc25c8cb2d5ef23a8c7f8157ac947ae7d0a46356b00ea7dd6d5f76 SHA512 95400c338a65cbb7d1e80c776de41d3d372b4237aee91526a06774c3d4beb735dcfb4c1ed182a12f2ccac8204b9c546863d79eb99723394d48c415fa32b6ee0e
diff --git a/dev-java/bcprov/bcprov-1.50-r2.ebuild b/dev-java/bcprov/bcprov-1.50-r2.ebuild
deleted file mode 100644
index a2a400806d6..00000000000
--- a/dev-java/bcprov/bcprov-1.50-r2.ebuild
+++ /dev/null
@@ -1,65 +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 test"
-
-inherit java-pkg-2 java-pkg-simple
-
-MY_P="${PN}-jdk15on-${PV/./}"
-
-DESCRIPTION="Java cryptography APIs"
-HOMEPAGE="https://www.bouncycastle.org/java.html"
-SRC_URI="http://www.bouncycastle.org/download/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="1.50"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-CDEPEND=""
-
-DEPEND=">=virtual/jdk-1.6
- app-arch/unzip
- ${CDEPEND}"
-
-RDEPEND=">=virtual/jre-1.6
- ${CDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-JAVA_ENCODING="ISO-8859-1"
-
-# Package can't be built with test as bcprov and bcpkix can't be built with test.
-RESTRICT="test"
-
-src_unpack() {
- default
- cd "${S}"
- unpack ./src.zip
-}
-
-java_prepare() {
- if ! use test; then
- # There are too many files to delete so we won't be using JAVA_RM_FILES
- # (it produces a lot of output).
- local RM_TEST_FILES=()
- while read -d $'\0' -r file; do
- RM_TEST_FILES+=("${file}")
- done < <(find . -name "*Test*.java" -type f -print0)
- while read -d $'\0' -r file; do
- RM_TEST_FILES+=("${file}")
- done < <(find . -name "*Mock*.java" -type f -print0)
-
- rm -v "${RM_TEST_FILES[@]}"
- fi
-}
-
-src_compile() {
- java-pkg-simple_src_compile
-}
-
-src_install() {
- java-pkg-simple_src_install
- use source && java-pkg_dosrc org
-}
diff --git a/dev-java/bcprov/bcprov-1.50-r4.ebuild b/dev-java/bcprov/bcprov-1.50-r4.ebuild
deleted file mode 100644
index dce87d213ba..00000000000
--- a/dev-java/bcprov/bcprov-1.50-r4.ebuild
+++ /dev/null
@@ -1,61 +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 test"
-
-inherit java-pkg-2 java-pkg-simple
-
-MY_P="${PN}-jdk15on-${PV/./}"
-
-DESCRIPTION="Java cryptography APIs"
-HOMEPAGE="https://www.bouncycastle.org/java.html"
-SRC_URI="http://www.bouncycastle.org/download/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="1.50"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-DEPEND=">=virtual/jdk-1.6
- app-arch/unzip"
-
-RDEPEND=">=virtual/jre-1.6"
-
-S="${WORKDIR}/${MY_P}"
-
-JAVA_ENCODING="ISO-8859-1"
-
-# Package can't be built with test as bcprov and bcpkix can't be built with test.
-RESTRICT="test"
-
-src_unpack() {
- default
- cd "${S}"
- unpack ./src.zip
-}
-
-java_prepare() {
- if ! use test; then
- # There are too many files to delete so we won't be using JAVA_RM_FILES
- # (it produces a lot of output).
- local RM_TEST_FILES=()
- while read -d $'\0' -r file; do
- RM_TEST_FILES+=("${file}")
- done < <(find . -name "*Test*.java" -type f -print0)
- while read -d $'\0' -r file; do
- RM_TEST_FILES+=("${file}")
- done < <(find . -name "*Mock*.java" -type f -print0)
-
- rm -v "${RM_TEST_FILES[@]}" || die
- fi
-}
-
-src_compile() {
- java-pkg-simple_src_compile
-}
-
-src_install() {
- java-pkg-simple_src_install
- use source && java-pkg_dosrc org
-}
diff --git a/dev-java/bndlib/bndlib-2.1.0-r1.ebuild b/dev-java/bndlib/bndlib-2.1.0-r1.ebuild
index d8ef87b2b91..553e5e626d5 100644
--- a/dev-java/bndlib/bndlib-2.1.0-r1.ebuild
+++ b/dev-java/bndlib/bndlib-2.1.0-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
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/bndtools/bnd/archive/${PV}.REL.tar.gz -> ${P}.tar.gz
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
CDEPEND="dev-java/libg:0
dev-java/osgi-compendium:0
diff --git a/dev-java/boot-bin/Manifest b/dev-java/boot-bin/Manifest
index ef394a4f8ce..4f03eb0f1cc 100644
--- a/dev-java/boot-bin/Manifest
+++ b/dev-java/boot-bin/Manifest
@@ -1,6 +1,3 @@
-DIST boot-2.7.1-CHANGES.md 20380 BLAKE2B 84a57834b78b752b6be051aa9513ad3360cc81b1311248892b3f61760c181a2c53083da8c61eeae2930b2501b95b71dd74bfededa2325806a83abbb0ef0f35e3 SHA512 5f8b9866dcb5e784caee89c7a0569d6a2392cda19aa498d15eaa8d4ea054900bdc0dff950ca60f6c62f0cd262373a3cd0760c755b805d952bc96838de135aeb8
-DIST boot-2.7.1-README.md 16071 BLAKE2B de0f5168f1b4151ffc76bf02343a1d965ba418e90255d04ef8c6c0c30e32d1927042ed24d1e5e1e6dad3b9dc0e893bf7656a3cfc279f6e690a5c7587a3930897 SHA512 395b6fec79bd1299f4d84fda4ba3d0db0b54c9c591c7ffd2c3c0f239f5f1bade31bf6eb1b924d6e58775fb6d412417d251d77356698d54c93c3ee31b64c9652a
-DIST boot-2.7.1.jar 8388320 BLAKE2B a5af7ee5468cd6db1c955fd7a1726da6bc370ff8fb2b38312c42b9b6577c9605cfd472f86878c8706e50a1523f9e8789e7b92aa7244f2ce0450b7447cd8d5aa8 SHA512 d8101ba2c3a2bdec655f0fcea95a3cb33aee90c9471f6cd31f465c3716cb3f6d9027b7ec0c1c7cd277f8b43cbc0fd69d2e164fa33b112bba94d4d3245caafb3c
DIST boot-2.8.3-CHANGES.md 28286 BLAKE2B 56ce0ba83292d1b0a9b22b34e3ac89a4f203ff7b20b3a9a0ca092e4594cb8430574d04ff15ec50dc431f4a32ebbcbe2651010abc48c46a241fff5147d1449297 SHA512 cab01416dcbd642953fa32ae5d8255722f61860752a32e7a4a55f0d5730363e305c5549e63777e3e032f2d098864cfa16b62889c66fe9aa481778ad7a0249e80
DIST boot-2.8.3-README.md 19164 BLAKE2B cb2d63e332d427cd235868f9b25aa5b7baaa41ebbf1447c029019e2d4aa872eed26e79c027f06b201e21e0a1522d42fed57bf5eae5de683baf4a62e2c10b739a SHA512 2557f8ae6893ae6f3c576e8325f11edac5e4e91c45e3864957784092e8154aaa30f1a5de8acb52bb90e7c3ad034f2e9703e4b5aac2d621cbd885e8bbb102cc04
DIST boot-2.8.3.jar 20940394 BLAKE2B 398264e467dc14c7df49dd75e4197ebd755e1afdc6ae8877de30cd72d35c0bf56a83b64573ec3aa976ae63fcffe9c371b0789bc0f95e43bbb509ff19cc305ee9 SHA512 039c8ed3320871a1227240ad8d0aac07cbb41e65096d71b9547733c49f02febff6ac5ed15cda744c7fbc0ee4830908597f0c3c8288d4d059c603057db24bd1db
diff --git a/dev-java/boot-bin/boot-bin-2.7.1-r1.ebuild b/dev-java/boot-bin/boot-bin-2.7.1-r1.ebuild
deleted file mode 100644
index 53777ba1edb..00000000000
--- a/dev-java/boot-bin/boot-bin-2.7.1-r1.ebuild
+++ /dev/null
@@ -1,71 +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}"
-GITHUB_USER="boot-clj"
-
-DESCRIPTION="Build tooling for Clojure"
-HOMEPAGE="https://boot-clj.com/"
-SRC_URI="
- https://github.com/${GITHUB_USER}/${MY_PN}/releases/download/${PV}/${MY_PN}.jar -> ${MY_PNV}.jar
- https://raw.githubusercontent.com/${GITHUB_USER}/${MY_PN}/${PV}/README.md -> ${MY_PNV}-README.md
- https://raw.githubusercontent.com/${GITHUB_USER}/${MY_PN}/${PV}/CHANGES.md -> ${MY_PNV}-CHANGES.md
-"
-LICENSE="EPL-1.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND=">=virtual/jre-1.7"
-DEPEND=">=virtual/jdk-1.7"
-
-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 boot shell-script"
- cp "${FILESDIR}/boot" "${S}/" || die "Can't copy boot"
-
- for file in "README.md" "CHANGES.md"; do
- einfo "Renaming ${MY_PNV}-${file} to ${file}"
- mv "${S}/${MY_PNV}-${file}" "${S}/${file}" || die "Can't rename ${MY_PNV}-${file} to ${file}"
- done
-
- java-pkg_init_paths_
-
- sed -i "s|@@JAVA_PKG_SHAREPATH@@|${JAVA_PKG_SHAREPATH}|g" "${S}/boot" || die "Can't patch JAVA_PKG_SHAREPATH path in boot"
- sed -i "s|@@JAVA_PKG_JARDEST@@|${JAVA_PKG_JARDEST}|g" "${S}/boot" || die "Can't patch JAVA_PKG_JARDEST path in boot"
- sed -i "s|@@PN@@|${PN}|g" "${S}/boot" || die "Can't patch PN in boot"
-
- default
-}
-
-src_compile() { :; }
-
-src_install() {
- dobin "${S}/boot"
- dodoc "${S}/README.md"
- dodoc "${S}/CHANGES.md"
-
- java-pkg_newjar "${S}/${MY_PNV}.jar"
-}
-
-pkg_postinst() {
- einfo "This package will still download a whole lot of its own runtime"
- einfo "dependencies the first time you run it."
- einfo ""
- einfo "This currently can't be helped and is expected behaviour for a"
- einfo "java based development toolkit"
-}
diff --git a/dev-java/boot-bin/boot-bin-2.8.3.ebuild b/dev-java/boot-bin/boot-bin-2.8.3.ebuild
index 03e79137c50..58fcb200f38 100644
--- a/dev-java/boot-bin/boot-bin-2.8.3.ebuild
+++ b/dev-java/boot-bin/boot-bin-2.8.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -18,7 +18,7 @@ SRC_URI="
"
LICENSE="EPL-1.0"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
RDEPEND=">=virtual/jre-1.7"
DEPEND=">=virtual/jdk-1.7"
diff --git a/dev-java/brotli-dec/brotli-dec-0.1.2.ebuild b/dev-java/brotli-dec/brotli-dec-0.1.2.ebuild
index d2eb0a1e10a..545e6b9fff4 100644
--- a/dev-java/brotli-dec/brotli-dec-0.1.2.ebuild
+++ b/dev-java/brotli-dec/brotli-dec-0.1.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://repo1.maven.org/maven2/org/brotli/dec/${PV}/dec-${PV}-sources.j
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
BDEPEND="app-arch/unzip"
DEPEND=">=virtual/jdk-1.8:*"
diff --git a/dev-java/bsf/bsf-2.4.0-r2.ebuild b/dev-java/bsf/bsf-2.4.0-r2.ebuild
index 44f085f3032..a6d049b54c1 100644
--- a/dev-java/bsf/bsf-2.4.0-r2.ebuild
+++ b/dev-java/bsf/bsf-2.4.0-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="5"
@@ -11,7 +11,7 @@ HOMEPAGE="http://commons.apache.org/bsf/"
SRC_URI="mirror://apache/jakarta/bsf/source/${PN}-src-${PV}.tar.gz"
LICENSE="Apache-2.0"
SLOT="2.3"
-KEYWORDS="amd64 arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
# If you add new ones, add them to ant-apache-bsf too for use dependencies
IUSE="javascript python tcl"
diff --git a/dev-java/bsh/bsh-2.0_beta6-r1.ebuild b/dev-java/bsh/bsh-2.0_beta6-r1.ebuild
index e0000a5f8a8..ead3b203a19 100644
--- a/dev-java/bsh/bsh-2.0_beta6-r1.ebuild
+++ b/dev-java/bsh/bsh-2.0_beta6-r1.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.apache-extras.beanshell:bsh:2.0b6"
inherit java-pkg-2 java-ant-2
@@ -18,7 +19,7 @@ SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/${MY_PV}${MY_BETA}.tar.gz
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux"
IUSE=""
CDEPEND="
diff --git a/dev-java/c3p0/Manifest b/dev-java/c3p0/Manifest
index 9d8536667d6..bb4c017ae94 100644
--- a/dev-java/c3p0/Manifest
+++ b/dev-java/c3p0/Manifest
@@ -1 +1 @@
-DIST c3p0-0.9.5.1.src.tgz 839657 BLAKE2B b8cf89ecb5b3766852355cdeb234698b0d1d8327233152e2e51ddcfe4a6e3be5f0fe4cc12a70d0df90d8ead90b3506b405f267f83bbb4a2a0ea1ac9d86051c64 SHA512 1843696d48e68f6120a68c42f0eb60c342ed8d1ddcc1d78c500d85c3d7e5e48358d100ecb1e0efa192aba34c5d9221437d53c2a968a42b797ff84bc12db4a724
+DIST c3p0-0.9.5.5.src.tgz 869069 BLAKE2B 6e1349d1cd02647a7c2424b8e89a8c21cfd8faefd26b7e05ee9e2da1a1a501b2b3102b142eef52f56dea672408d683a6f47b4c89b25d529a578c4b1fe4aa819c SHA512 fa96b5d0042442c773309090b9cf8f0db8e16f334e321ac952afb198ca06cd66f6f7162369f22a439a0e6b45b1ffcddf540af53804f223844d7a5465213bece1
diff --git a/dev-java/c3p0/c3p0-0.9.5.1.ebuild b/dev-java/c3p0/c3p0-0.9.5.1.ebuild
deleted file mode 100644
index 15e63cf24a7..00000000000
--- a/dev-java/c3p0/c3p0-0.9.5.1.ebuild
+++ /dev/null
@@ -1,59 +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 examples test"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="JDBC drivers with JNDI-bindable DataSources"
-HOMEPAGE="http://c3p0.sourceforge.net/"
-
-MY_P="${P}.src"
-
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tgz"
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-CDEPEND="
- dev-java/log4j:0
- dev-java/mchange-commons:0"
-
-DEPEND="
- ${CDEPEND}
- test? (
- dev-java/junit:4
- )
- >=virtual/jdk-1.6"
-
-RDEPEND="
- ${CDEPEND}
- >=virtual/jre-1.6"
-
-S="${WORKDIR}/${MY_P}"
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-
-java_prepare() {
- java-pkg_clean
- java-pkg_jar-from --into lib/ mchange-commons
- java-pkg_jar-from --into lib/ log4j
-
-}
-
-EANT_TEST_TARGET="junit-tests"
-EANT_TEST_GENTOO_CLASSPATH="junit-4"
-
-src_test() {
- java-pkg-2_src_test
-}
-
-src_install() {
- java-pkg_newjar "build/${P}.jar"
- dodoc README-SRC
- use doc && java-pkg_dojavadoc build/apidocs
- use source && java-pkg_dosrc src/java/com/mchange/v2
- use examples && java-pkg_doexamples src/java/com/mchange/v2/c3p0/example
-}
diff --git a/dev-java/c3p0/c3p0-0.9.5.5.ebuild b/dev-java/c3p0/c3p0-0.9.5.5.ebuild
new file mode 100644
index 00000000000..a65d10630f9
--- /dev/null
+++ b/dev-java/c3p0/c3p0-0.9.5.5.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Tests require an existing running SQL server and 'junit.jar.file' property
+JAVA_PKG_IUSE="doc examples source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="JDBC drivers with JNDI-bindable DataSources"
+HOMEPAGE="https://www.mchange.com/projects/c3p0/"
+
+SRC_URI="mirror://sourceforge/${PN}/${P}.src.tgz"
+LICENSE="|| ( EPL-1.0 LGPL-2.1 )"
+SLOT="0"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux"
+
+CP_DEPEND="
+ dev-java/log4j:0
+ dev-java/mchange-commons:0
+"
+
+DEPEND="
+ >=virtual/jdk-1.8:*
+ ${CP_DEPEND}
+"
+
+RDEPEND="
+ >=virtual/jre-1.8:*
+ ${CP_DEPEND}
+"
+
+S="${WORKDIR}/${P}.src"
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+
+src_prepare() {
+ java-pkg_clean
+ java-pkg-2_src_prepare
+ java-pkg_jar-from --into lib/ log4j
+ java-pkg_jar-from --into lib/ mchange-commons
+
+ # Test sources interfere with Javadoc generation on JDK 11
+ # Remove since the tests will never be run
+ rm -r src/java/com/mchange/v2/c3p0/test ||
+ die "Failed to remove unused test sources"
+}
+
+src_install() {
+ java-pkg_newjar "build/${P}.jar"
+ einstalldocs
+
+ use doc && java-pkg_dojavadoc build/apidocs
+ use examples && java-pkg_doexamples src/java/com/mchange/v2/c3p0/example
+ use source && java-pkg_dosrc src/java/com/mchange/v2
+}
diff --git a/dev-java/cglib/cglib-3.3.0.ebuild b/dev-java/cglib/cglib-3.3.0.ebuild
index df66cf8c3d6..a1d5a874f9a 100644
--- a/dev-java/cglib/cglib-3.3.0.ebuild
+++ b/dev-java/cglib/cglib-3.3.0.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/cglib/cglib/archive/refs/tags/${MY_PV}.tar.gz -> ${M
LICENSE="Apache-2.0"
SLOT="3"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
CDEPEND="dev-java/ant-core:0
dev-java/asm:9
diff --git a/dev-java/checker-framework-qual/Manifest b/dev-java/checker-framework-qual/Manifest
new file mode 100644
index 00000000000..420abc50100
--- /dev/null
+++ b/dev-java/checker-framework-qual/Manifest
@@ -0,0 +1 @@
+DIST checker-framework-3.14.0.tar.gz 7788010 BLAKE2B e05647b7a551cb1e53c32ea65c1d5a28ed7a968310223664704722c58b6df188e80581df383937fef6ebed5042e7234281b55069fde1f4cb34853495c4e2fbff SHA512 14be47e823ba67b6fcb7a8033632a2dd56341bd0d2a56c7501b50eab5e471622372eb4b62f4e78e33be019c15f44d075d146ece98fa3316e7cb24346db98c238
diff --git a/dev-java/checker-framework-qual/checker-framework-qual-3.14.0.ebuild b/dev-java/checker-framework-qual/checker-framework-qual-3.14.0.ebuild
new file mode 100644
index 00000000000..a83640e7e91
--- /dev/null
+++ b/dev-java/checker-framework-qual/checker-framework-qual-3.14.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN="${PN%-qual}"
+MY_P="${MY_PN}-${PV}"
+JAVA_PKG_IUSE="doc source"
+JAVA_TESTING_FRAMEWORKS="junit"
+MAVEN_ID="org.checkerframework:checker-qual:${PV}"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Annotations for type-checking by the Checker Framework"
+HOMEPAGE="https://checkerframework.org/"
+SRC_URI="https://codeload.github.com/typetools/${MY_PN}/tar.gz/refs/tags/${MY_P} -> ${MY_P}.tar.gz"
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
+
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
+
+S="${WORKDIR}/${MY_PN}-${MY_P}/checker-qual"
+
+JAVA_SRC_DIR="src/main/java/org/checkerframework/"
diff --git a/dev-java/checker-framework-qual/metadata.xml b/dev-java/checker-framework-qual/metadata.xml
new file mode 100644
index 00000000000..2ab848a3d88
--- /dev/null
+++ b/dev-java/checker-framework-qual/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>java@gentoo.org</email>
+ <name>Java</name>
+ </maintainer>
+ <longdescription>
+The Checker Framework enhances Java's type system to make it
+more powerful and useful. This lets software developers detect
+and prevent errors in their Java programs.
+
+A "checker" is a tool that warns you about certain errors or
+gives you a guarantee that those errors do not occur.
+ </longdescription>
+</pkgmetadata>
diff --git a/dev-java/commons-beanutils/commons-beanutils-1.9.4-r1.ebuild b/dev-java/commons-beanutils/commons-beanutils-1.9.4-r1.ebuild
new file mode 100644
index 00000000000..b7f3e06ece9
--- /dev/null
+++ b/dev-java/commons-beanutils/commons-beanutils-1.9.4-r1.ebuild
@@ -0,0 +1,101 @@
+# 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 mirror://apache/commons/beanutils/source/1.9.4-src.tar.gz --slot 1.7 --keywords "~amd64 ~x86 ~ppc64 ~amd64-linux ~x86-linux ~x64-macos" --ebuild commons-beanutils-1.9.4.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="commons-beanutils:commons-beanutils:1.9.4"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Provides easy-to-use wrappers around Reflection and Introspection APIs"
+HOMEPAGE="https://commons.apache.org/proper/commons-beanutils/"
+SRC_URI="mirror://apache/commons/beanutils/source/${P}-src.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="1.7"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+
+# Common dependencies
+# POM: pom.xml
+# commons-collections:commons-collections:3.2.2 -> >=dev-java/commons-collections-3.2.2:0
+# commons-logging:commons-logging:1.2 -> >=dev-java/commons-logging-1.2:0
+
+CP_DEPEND="
+ dev-java/commons-collections:0
+ dev-java/commons-logging:0
+"
+
+# Compile dependencies
+# POM: pom.xml
+# test? commons-collections:commons-collections-testframework:3.2.1 -> !!!artifactId-not-found!!!
+# test? junit:junit:4.12 -> >=dev-java/junit-4.12:4
+
+DEPEND="${CP_DEPEND}
+ >=virtual/jdk-1.8:*
+ test? (
+ dev-java/commons-collections:0[test]
+ )"
+
+RDEPEND="${CP_DEPEND}
+ >=virtual/jre-1.8:*"
+
+DOCS=( {CONTRIBUTING,README}.md {LICENSE,NOTICE,RELEASE-NOTES}.txt )
+
+S="${WORKDIR}/${P}-src"
+
+JAVA_ENCODING="iso-8859-1"
+
+JAVA_SRC_DIR="src/main/java"
+
+JAVA_TEST_GENTOO_CLASSPATH="commons-collections,junit-4"
+JAVA_TEST_SRC_DIR="src/test/java"
+
+JAVA_TEST_EXCLUDES=(
+ # Upstream: Tests run: 1293, Failures: 0, Errors: 0, Skipped: 3
+ "org.apache.commons.beanutils.TestBeanPublicSubclass" # Invalid test class
+ "org.apache.commons.beanutils.TestBeanPackageSubclass" # Invalid test class
+ "org.apache.commons.beanutils.TestResultSetMetaData" # Invalid test class
+ "org.apache.commons.beanutils.TestResultSet" # Test class can only have one constructor
+ "org.apache.commons.beanutils.TestBean" # Test class can only have one constructor
+ # https://github.com/apache/commons-beanutils/blob/32ceb2c92512d44f97638805e2f3fd9d70dfcfc6/pom.xml#L378-L383
+ # <!-- This test case is known to fail, and there isn't any proposed fix
+ # - so we will just exclude it until someone comes up with a solution.
+ # -->
+ "org.apache.commons.beanutils.converters.MemoryTestCase"
+)
+
+src_test() {
+ # There were 8 failures:
+ # 1) testPropertyUtilsBean_descriptorsCache_memoryLeak(org.apache.commons.beanutils.memoryleaktests.MemoryLeakTestCase)
+ # java.lang.OutOfMemoryError: Java heap space: failed reallocation of scalar replaced objects
+ # 2) testPropertyUtilsBean_mappedDescriptorsCache_memoryLeak(org.apache.commons.beanutils.memoryleaktests.MemoryLeakTestCase)
+ # java.lang.OutOfMemoryError: Java heap space: failed reallocation of scalar replaced objects
+ # 3) testMappedPropertyDescriptor_MappedMethodReference1(org.apache.commons.beanutils.memoryleaktests.MemoryLeakTestCase)
+ # java.lang.OutOfMemoryError: Java heap space: failed reallocation of scalar replaced objects
+ # 4) testMappedPropertyDescriptor_MappedMethodReference2(org.apache.commons.beanutils.memoryleaktests.MemoryLeakTestCase)
+ # java.lang.OutOfMemoryError: Java heap space: failed reallocation of scalar replaced objects
+ # 5) testLocaleConvertUtilsBean_converters_memoryLeak(org.apache.commons.beanutils.memoryleaktests.MemoryLeakTestCase)
+ # java.lang.OutOfMemoryError: Java heap space: failed reallocation of scalar replaced objects
+ # 6) testWrapDynaClass_dynaClasses_memoryLeak(org.apache.commons.beanutils.memoryleaktests.MemoryLeakTestCase)
+ # java.lang.OutOfMemoryError: Java heap space: failed reallocation of scalar replaced objects
+ # 7) testMethodUtils_cache_memoryLeak(org.apache.commons.beanutils.memoryleaktests.MemoryLeakTestCase)
+ # java.lang.OutOfMemoryError: Java heap space: failed reallocation of scalar replaced objects
+ # 8) testConvertUtilsBean_converters_memoryLeak(org.apache.commons.beanutils.memoryleaktests.MemoryLeakTestCase)
+ # java.lang.OutOfMemoryError: Java heap space: failed reallocation of scalar replaced objects
+ local vm_version="$(java-config -g PROVIDES_VERSION)"
+ if [[ "${vm_version}" == "11" ]] ; then
+ JAVA_TEST_EXCLUDES+=( "org.apache.commons.beanutils.memoryleaktests.MemoryLeakTestCase" )
+ fi
+
+ java-pkg-simple_src_test
+}
+
+src_install() {
+ default # https://bugs.gentoo.org/789582
+ java-pkg-simple_src_install
+}
diff --git a/dev-java/commons-beanutils/commons-beanutils-1.9.4.ebuild b/dev-java/commons-beanutils/commons-beanutils-1.9.4.ebuild
deleted file mode 100644
index a36a6aea1ce..00000000000
--- a/dev-java/commons-beanutils/commons-beanutils-1.9.4.ebuild
+++ /dev/null
@@ -1,69 +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 mirror://apache/commons/beanutils/source/1.9.4-src.tar.gz --slot 1.7 --keywords "~amd64 ~x86 ~ppc64 ~amd64-linux ~x86-linux ~x64-macos" --ebuild commons-beanutils-1.9.4.ebuild
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="commons-beanutils:commons-beanutils:1.9.4"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Provides easy-to-use wrappers around Reflection and Introspection APIs"
-HOMEPAGE="https://commons.apache.org/proper/commons-beanutils/"
-SRC_URI="mirror://apache/commons/beanutils/source/${P}-src.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="1.7"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-# Common dependencies
-# POM: pom.xml
-# commons-collections:commons-collections:3.2.2 -> >=dev-java/commons-collections-3.2.2:0
-# commons-logging:commons-logging:1.2 -> >=dev-java/commons-logging-1.2:0
-
-CDEPEND="
- dev-java/commons-collections:0
- dev-java/commons-logging:0
-"
-
-# Compile dependencies
-# POM: pom.xml
-# test? commons-collections:commons-collections-testframework:3.2.1 -> !!!artifactId-not-found!!!
-# test? junit:junit:4.12 -> >=dev-java/junit-4.12:4
-
-DEPEND="
- >=virtual/jdk-1.8:*
- ${CDEPEND}
- test? (
- dev-java/commons-collections:0[test]
- )
-"
-
-RDEPEND="
- >=virtual/jre-1.8:*
- ${CDEPEND}
-"
-
-S="${WORKDIR}/${P}-src"
-
-JAVA_ENCODING="iso-8859-1"
-
-JAVA_GENTOO_CLASSPATH="commons-collections,commons-logging"
-JAVA_SRC_DIR="src/main/java"
-# JAVA_RESOURCE_DIRS="src/main/resources"
-
-JAVA_TEST_GENTOO_CLASSPATH="commons-collections,junit-4"
-JAVA_TEST_SRC_DIR="src/test/java"
-# JAVA_TEST_RESOURCE_DIRS="src/test/resources"
-
-JAVA_TEST_EXCLUDES=(
- "org.apache.commons.beanutils.TestBeanPublicSubclass" # Invalid test class
- "org.apache.commons.beanutils.TestBeanPackageSubclass" # Invalid test class
- "org.apache.commons.beanutils.TestResultSetMetaData" # Invalid test class
- "org.apache.commons.beanutils.TestResultSet" # Test class can only have one constructor
- "org.apache.commons.beanutils.TestBean" # Test class can only have one constructor
-)
diff --git a/dev-java/commons-codec/commons-codec-1.15.ebuild b/dev-java/commons-codec/commons-codec-1.15.ebuild
index 92af3cd6ce2..88e15404828 100644
--- a/dev-java/commons-codec/commons-codec-1.15.ebuild
+++ b/dev-java/commons-codec/commons-codec-1.15.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="mirror://apache/commons/codec/source/${P}-src.tar.gz -> ${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux"
# Compile dependencies
# POM: ${P}-src/pom.xml
diff --git a/dev-java/commons-collections/Manifest b/dev-java/commons-collections/Manifest
index 02508b4a856..466c5b01284 100644
--- a/dev-java/commons-collections/Manifest
+++ b/dev-java/commons-collections/Manifest
@@ -1,2 +1,3 @@
DIST commons-collections-3.2.2-src.tar.gz 630693 BLAKE2B a70cebe9526291d5207db7edd7c9b50060413880d41dcb28c01cf05f7e00a9f5e1560012c3c3c763162412282db9512bc2b64a5788f210c5c8866943d912dafb SHA512 2e8ef638f07515b028a3e7e97851fcf1d9023a2c188e211bd1e936f35d3d91c2885adf3b1103ad17dfb7aeea6e7a67ce7826ee346a8a29c1aa7c6b0cf14e9230
+DIST commons-collections-4.4-src.tar.gz 703008 BLAKE2B f4a0e858eb7412bdd431894f923a4731685ceb2463bee002401d8048cc40534f002ec0291aa67297e061a50b624d3de8f64e227f513ab1f3620e38d1d6858255 SHA512 2110e73eda97ca52a886cb708f21d8609a83655861594f3b6eb7a15b777d42eeeefc5d3b28ffc6ecc5e4f0b3fd5407f80019c2ce006f970f55455ef33eee47ee
DIST commons-collections4-4.1-src.tar.gz 704671 BLAKE2B dea1b630168373013ca937c9b02414b92845fdd9ddf7a22a05c4d7f8d30ff26d73f3a2d399d7a4c026f8ec43a282120fdf3d3cb1042a311c3b490ffed1774e30 SHA512 c5666f41b68c9fdba3731730595616b16f98579c077cf047f421a46729b5a65476a8707125a2c0b0c6c024ca94df8c2633123bd99e705149fcb1afadcd3bf68b
diff --git a/dev-java/commons-collections/commons-collections-3.2.2.ebuild b/dev-java/commons-collections/commons-collections-3.2.2.ebuild
index 6d32a5a18a4..e205323f6cd 100644
--- a/dev-java/commons-collections/commons-collections-3.2.2.ebuild
+++ b/dev-java/commons-collections/commons-collections-3.2.2.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="mirror://apache/${PN/-//}/source/${P}-src.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-java/commons-collections/commons-collections-4.4.ebuild b/dev-java/commons-collections/commons-collections-4.4.ebuild
new file mode 100644
index 00000000000..994cf13e94d
--- /dev/null
+++ b/dev-java/commons-collections/commons-collections-4.4.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri mirror://apache/commons/collections/source/commons-collections4-4.4-src.tar.gz --slot 4 --keywords "~amd64 ~arm64 ~ppc64 ~x86" --ebuild commons-collections-4.4.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.apache.commons:commons-collections4:4.4"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Extends the JCF classes with new interfaces, implementations and utilities"
+HOMEPAGE="https://commons.apache.org/proper/commons-collections/"
+SRC_URI="mirror://apache/commons/collections/source/${PN}4-${PV}-src.tar.gz -> ${P}-src.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="4"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+# Compile dependencies
+# POM: pom.xml
+# test? junit:junit:4.12 -> >=dev-java/junit-4.13.2:4
+# test? org.apache.commons:commons-lang3:3.9 -> >=dev-java/commons-lang-3.12.0:3.6
+# test? org.easymock:easymock:4.0.2 -> !!!suitable-mavenVersion-not-found!!!
+
+DEPEND="
+ >=virtual/jdk-1.8:*
+ test? (
+ dev-java/easymock:3.2
+ dev-java/commons-lang:3.6
+ )
+"
+
+RDEPEND="
+ >=virtual/jre-1.8:*
+"
+
+DOCS=( {CONTRIBUTING,README}.md {LICENSE,NOTICE,RELEASE-NOTES}.txt )
+HTML_DOCS=( {DEVELOPERS-GUIDE,PROPOSAL}.html )
+
+S="${WORKDIR}/commons-collections4-${PV}-src"
+
+JAVA_SRC_DIR="src/main/java"
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4,commons-lang-3.6,easymock-3.2"
+JAVA_TEST_SRC_DIR="src/test/java"
+JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+
+src_test() {
+ # https://github.com/apache/commons-collections/blob/cab58b3a8093a2f6b84f12783a3fb358747310f7/pom.xml#L542-L550
+ pushd src/test/java || die
+ local TESTS=$(find * -name "*Test.java" ! -name "TestUtils.java" ! -name "Abstract*.java" ! -name "BulkTest.java")
+ TESTS="${TESTS//.java}"
+ TESTS="${TESTS//\//.}"
+ popd
+
+ JAVA_TEST_RUN_ONLY=( "${TESTS}" )
+ java-pkg-simple_src_test
+}
+
+src_install() {
+ default # https://bugs.gentoo.org/789582
+ java-pkg-simple_src_install
+}
diff --git a/dev-java/commons-collections/metadata.xml b/dev-java/commons-collections/metadata.xml
index 6ef2d50cf07..62a57c23950 100644
--- a/dev-java/commons-collections/metadata.xml
+++ b/dev-java/commons-collections/metadata.xml
@@ -1,8 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="project">
- <email>java@gentoo.org</email>
- <name>Java</name>
- </maintainer>
+ <maintainer type="project">
+ <email>java@gentoo.org</email>
+ <name>Java</name>
+ </maintainer>
+ <longdescription>
+ The Apache Commons Collections package contains types that extend and augment the Java Collections Framework.
+ </longdescription>
</pkgmetadata>
diff --git a/dev-java/commons-compress/commons-compress-1.21.ebuild b/dev-java/commons-compress/commons-compress-1.21.ebuild
index 0e5af3fa548..c011b4bda38 100644
--- a/dev-java/commons-compress/commons-compress-1.21.ebuild
+++ b/dev-java/commons-compress/commons-compress-1.21.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://commons.apache.org/proper/commons-compress/"
SRC_URI="mirror://apache/commons/compress/source/${P}-src.tar.gz -> ${P}-sources.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
# Common dependencies
# POM: pom.xml
diff --git a/dev-java/commons-csv/commons-csv-1.9.0.ebuild b/dev-java/commons-csv/commons-csv-1.9.0.ebuild
index f7048a2fa23..8860918b997 100644
--- a/dev-java/commons-csv/commons-csv-1.9.0.ebuild
+++ b/dev-java/commons-csv/commons-csv-1.9.0.ebuild
@@ -11,7 +11,7 @@ MAVEN_ID="org.apache.commons:commons-csv:1.9.0"
inherit java-pkg-2 java-pkg-simple
-DESCRIPTION="Simple interface for reading and writing CSV files of various types."
+DESCRIPTION="Simple interface for reading and writing CSV files of various types"
HOMEPAGE="https://commons.apache.org/proper/commons-csv/"
SRC_URI="mirror://apache/commons/csv/source/${P}-src.tar.gz -> ${P}-sources.tar.gz"
LICENSE="Apache-2.0"
diff --git a/dev-java/commons-daemon/commons-daemon-1.0.15.ebuild b/dev-java/commons-daemon/commons-daemon-1.0.15.ebuild
index 1b467fb6bde..e97f26dfb42 100644
--- a/dev-java/commons-daemon/commons-daemon-1.0.15.ebuild
+++ b/dev-java/commons-daemon/commons-daemon-1.0.15.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -14,7 +14,6 @@ HOMEPAGE="http://commons.apache.org/daemon/"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="kernel_linux"
CDEPEND="kernel_linux? ( sys-libs/libcap )"
diff --git a/dev-java/commons-daemon/commons-daemon-1.1.0.ebuild b/dev-java/commons-daemon/commons-daemon-1.1.0.ebuild
index 6949a3798a3..e7677061981 100644
--- a/dev-java/commons-daemon/commons-daemon-1.1.0.ebuild
+++ b/dev-java/commons-daemon/commons-daemon-1.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -14,7 +14,6 @@ HOMEPAGE="https://commons.apache.org/daemon/"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="kernel_linux"
CDEPEND="kernel_linux? ( sys-libs/libcap )"
diff --git a/dev-java/commons-digester/Manifest b/dev-java/commons-digester/Manifest
index 4e92a56379d..494d592f3db 100644
--- a/dev-java/commons-digester/Manifest
+++ b/dev-java/commons-digester/Manifest
@@ -1,3 +1,4 @@
DIST commons-digester-1.8.1-src.tar.gz 303266 BLAKE2B 618885c812a9bf40c080bc5736b8b4be4e18fe4d2f732d2a44d39369ae6cf3beb3af0cf500da3d103d7aa8c18b41b84d06907b6fc90f7f10d30840d6cfc83012 SHA512 0a39069662b4792d4856b79b5cedc2b44cb70303a19045d21c233d45ae4dde9e80662bd242a381e759d7cdb5adaf0b9fa6206bb8397b53348fa9eac12e9a4e96
DIST commons-digester-2.1-src.tar.gz 304060 BLAKE2B 2360f6f8ab77b20ad6b4058e0437aa792bf3886ddec2e09b6db259bc142c070965ce066ef224e92fb91614075631a2af1358ae4b4fc065fe9118e1d2559bb9bb SHA512 6bdb63431ed1e17f5e8ba24951762750a0e59b70c76eabecbf13f5fe6974864825456beed615c8f2c16f9a2f1404f2e56bdbc3ba335656c3661d5f368c708b88
+DIST commons-digester-3.2.tar.gz 324555 BLAKE2B 7b8bdaa70eeafb069e9ecbfe697ab86f5167ae3b9933e8aa306f0080de0ec99d12bd023067678b7b904329178f553fd6d4d98141ab329154a1c27385b33e449f SHA512 6d5ed9a1cc7612244747dcbd5c713349f27d63d1cef39fa368b4e91eaa3b1fe7043ab2fb498a73e8afde8081b8ff26a966e5b87b8b6dc68a3d907e9b25aa7cad
DIST commons-digester3-3.2-src.tar.gz 324555 BLAKE2B 7b8bdaa70eeafb069e9ecbfe697ab86f5167ae3b9933e8aa306f0080de0ec99d12bd023067678b7b904329178f553fd6d4d98141ab329154a1c27385b33e449f SHA512 6d5ed9a1cc7612244747dcbd5c713349f27d63d1cef39fa368b4e91eaa3b1fe7043ab2fb498a73e8afde8081b8ff26a966e5b87b8b6dc68a3d907e9b25aa7cad
diff --git a/dev-java/commons-digester/commons-digester-2.1-r2.ebuild b/dev-java/commons-digester/commons-digester-2.1-r2.ebuild
new file mode 100644
index 00000000000..7db4511aecd
--- /dev/null
+++ b/dev-java/commons-digester/commons-digester-2.1-r2.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/digester/source/commons-digester-2.1-src.tar.gz --slot 2.1 --keywords "~amd64 ~ppc64 ~x86" --ebuild commons-digester-2.1-r2.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="commons-digester:commons-digester:2.1"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Reads XML configuration files to provide initialization of various Java objects"
+HOMEPAGE="https://commons.apache.org/digester/"
+SRC_URI="mirror://apache/commons/digester/source/commons-digester-2.1-src.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="2.1"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+# Common dependencies
+# POM: pom.xml
+# commons-beanutils:commons-beanutils:1.8.3 -> >=dev-java/commons-beanutils-1.9.4:1.7
+# commons-logging:commons-logging:1.1.1 -> >=dev-java/commons-logging-1.2:0
+
+CP_DEPEND="
+ >=dev-java/commons-beanutils-1.9.4:1.7
+ >=dev-java/commons-logging-1.2:0
+"
+
+DEPEND="${CP_DEPEND}
+ >=virtual/jdk-1.8:*"
+
+RDEPEND="${CP_DEPEND}
+ >=virtual/jre-1.8:*"
+
+DOCS=( {LICENSE,NOTICE,RELEASE-NOTES}.txt )
+
+S="${WORKDIR}/commons-digester-${PV}-src"
+
+JAVA_ENCODING="iso-8859-1"
+
+JAVA_SRC_DIR="src/main/java"
+JAVA_RESOURCE_DIRS="src/main/resources"
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_SRC_DIR="src/test/java"
+JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+
+src_test() {
+ pushd src/test/java || die
+ # Exclusions according to 212,215 pom.xml
+ local JAVA_TEST_RUN_ONLY=$(find * \
+ ! -name "Abstract*.java" ! -name "TestBean.java" \
+ ! -name "TestRule.java" ! -name "TestRuleSet.java" \
+ -name "*TestCase.java" -o -name "*Test.java")
+ JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}"
+ JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}"
+ popd
+ java-pkg-simple_src_test
+}
+
+src_install() {
+ default # https://bugs.gentoo.org/789582
+ java-pkg-simple_src_install
+}
diff --git a/dev-java/commons-digester/commons-digester-3.2-r3.ebuild b/dev-java/commons-digester/commons-digester-3.2-r3.ebuild
new file mode 100644
index 00000000000..45e85fb373f
--- /dev/null
+++ b/dev-java/commons-digester/commons-digester-3.2-r3.ebuild
@@ -0,0 +1,77 @@
+# 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/digester/source/commons-digester3-3.2-src.tar.gz --slot 3.2 --keywords "~amd64 ~ppc64 ~x86" --ebuild commons-digester3.2-r3.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.apache.commons:commons-digester3:3.2"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Reads XML configuration files to provide initialization of various Java objects"
+HOMEPAGE="https://commons.apache.org/digester/"
+SRC_URI="mirror://apache/commons/digester/source/${PN}3-${PV}-src.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="3.2"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+# 1) atomWithNamespaceParse(org.apache.commons.digester3.xmlrules.SetNamespaceURITestCase)
+# java.net.UnknownHostException: commons.apache.org
+PROPERTIES="test_network"
+RESTRICT="test"
+
+# Common dependencies
+# POM: pom.xml
+# cglib:cglib:2.2.2 -> >=dev-java/cglib-3.3.0:3
+# commons-beanutils:commons-beanutils:1.8.3 -> >=dev-java/commons-beanutils-1.9.4:1.7
+# commons-logging:commons-logging:1.1.1 -> >=dev-java/commons-logging-1.2:0
+
+CP_DEPEND="
+ >=dev-java/cglib-3.3.0:3
+ >=dev-java/commons-beanutils-1.9.4:1.7
+ >=dev-java/commons-logging-1.2:0
+"
+
+DEPEND="${CP_DEPEND}
+ >=virtual/jdk-1.8:*"
+
+RDEPEND="${CP_DEPEND}
+ >=virtual/jre-1.8:*"
+
+DOCS=( {LICENSE,NOTICE,RELEASE-NOTES}.txt )
+
+S="${WORKDIR}/commons-digester3-${PV}-src"
+
+JAVA_ENCODING="iso-8859-1"
+
+JAVA_SRC_DIR="src/main/java"
+JAVA_RESOURCE_DIRS="src/main/resources"
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_SRC_DIR="src/test/java"
+JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+
+src_test() {
+ pushd src/test/java || die
+ # Exclusions according to 226,229 pom.xml
+ local JAVA_TEST_RUN_ONLY=$(find * -name "*TestCase.java" ! -name "Abstract*.java" ! -name "TestBean.java" ! -name "TestRule.java" ! -name "TestRuleSet.java")
+ JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}"
+ JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}"
+ popd
+
+ # Testing with java-17 throws too many test failures
+ local vm_version="$(java-config -g PROVIDES_VERSION)"
+ if [[ "${vm_version}" != "17" ]] ; then
+ java-pkg-simple_src_test
+ fi
+}
+
+src_install() {
+ default # https://bugs.gentoo.org/789582
+ java-pkg-simple_src_install
+}
diff --git a/dev-java/commons-digester/metadata.xml b/dev-java/commons-digester/metadata.xml
index 6021501589e..080f8a0f031 100644
--- a/dev-java/commons-digester/metadata.xml
+++ b/dev-java/commons-digester/metadata.xml
@@ -1,8 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer type="project">
- <email>java@gentoo.org</email>
- <name>Java</name>
-</maintainer>
+ <maintainer type="project">
+ <email>java@gentoo.org</email>
+ <name>Java</name>
+ </maintainer>
+ <longdescription>
+ The Apache Commons Digester package lets you configure an XML to Java object mapping module which triggers certain actions called rules whenever a particular pattern of nested XML elements is recognized.
+ </longdescription>
</pkgmetadata>
diff --git a/dev-java/commons-httpclient/commons-httpclient-3.1-r2.ebuild b/dev-java/commons-httpclient/commons-httpclient-3.1-r2.ebuild
index 5921250be5e..f74e7fa80a5 100644
--- a/dev-java/commons-httpclient/commons-httpclient-3.1-r2.ebuild
+++ b/dev-java/commons-httpclient/commons-httpclient-3.1-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 @@ HOMEPAGE="https://hc.apache.org/"
SRC_URI="mirror://apache/httpcomponents/${PN}/source/${P}-src.tar.gz"
LICENSE="Apache-2.0"
SLOT="3"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux"
IUSE=""
# doesn't work with IBM JDK, bug #176133
diff --git a/dev-java/commons-httpclient/commons-httpclient-4.5.13-r1.ebuild b/dev-java/commons-httpclient/commons-httpclient-4.5.13-r1.ebuild
index 004ca865dbd..38274be97d0 100644
--- a/dev-java/commons-httpclient/commons-httpclient-4.5.13-r1.ebuild
+++ b/dev-java/commons-httpclient/commons-httpclient-4.5.13-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# Skeleton command:
@@ -18,7 +18,7 @@ SRC_URI="mirror://apache/httpcomponents/httpclient/source/httpcomponents-client-
LICENSE="Apache-2.0"
SLOT="4"
-KEYWORDS="amd64 ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
# Common dependencies
# POM: httpcomponents-client-${PV}/httpclient/pom.xml
diff --git a/dev-java/commons-imaging/Manifest b/dev-java/commons-imaging/Manifest
index 13bebfeb5b8..636f8ef3213 100644
--- a/dev-java/commons-imaging/Manifest
+++ b/dev-java/commons-imaging/Manifest
@@ -1 +1 @@
-DIST apache-sanselan-incubating-0.97-src.tar.gz 33317875 BLAKE2B c9db6c30accc308d2c5d5977b84da118ab50b010b3728665a75dab13f9fecb70075e2d2208a62fabc57af7396f7c39b1ec498e0840e5a2c9c8de9b95d2dd597a SHA512 b7e8af01f4b4ca812313bbf573758d9c0e1355266bfb83898336b14c4b492a8979f2a593f00d53c076e83cf807a049df624491a26623cfbceb00560b748f05f2
+DIST commons-imaging-1.0-alpha2-src.tar.gz 39798631 BLAKE2B 01d0754689896a1f2ff1401cac7d9f59a6bbb245c0880f24f857efc53975c1203c6857d7a5d107763741a2dec7fb48c4faa258786f574cf2f3c5acca251e368b SHA512 f2479e0dc726a8d1193f4eef6289efe493cfbbe257054b5a13e929f5785f7a2c9c937e3f379e0f0066c591d18be27d12f1e5157e789eebab78fba489cc81e688
diff --git a/dev-java/commons-imaging/commons-imaging-0.97.ebuild b/dev-java/commons-imaging/commons-imaging-0.97.ebuild
deleted file mode 100644
index f8c2ba3f2ef..00000000000
--- a/dev-java/commons-imaging/commons-imaging-0.97.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2016 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
-
-DESCRIPTION="A minimalistic realtime charting library for Java"
-HOMEPAGE="https://commons.apache.org/proper/commons-imaging"
-SRC_URI="mirror://apache/commons/sanselan/source/apache-sanselan-incubating-${PV}-src.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="test" # 5/48 failures, dunno why :(
-
-RDEPEND=">=virtual/jre-1.6"
-
-DEPEND=">=virtual/jdk-1.6
- test? ( dev-java/junit:4 )"
-
-S="${WORKDIR}/sanselan-${PV}-incubator"
-JAVA_ENCODING="ISO-8859-1"
-JAVA_SRC_DIR="src/main/java"
-
-java_prepare() {
- # Tsk, Windows developers…
- find src/test/java -name "*.java" -exec sed -i 's:\\:/:g' {} + || die
-}
-
-src_install() {
- java-pkg-simple_src_install
- dodoc README.txt RELEASE_NOTES
-}
-
-src_test() {
- local DIR="src/test/java"
- local CP="${DIR}:${PN}.jar:$(java-pkg_getjars junit-4)"
-
- local TESTS=$(find "${DIR}" -name "*Test.java" ! -name "*BaseTest.java" ! -name SanselanTest.java ! -name ByteSourceTest.java)
- TESTS="${TESTS//src\/test\/java\/}"
- TESTS="${TESTS//.java}"
- TESTS="${TESTS//\//.}"
-
- ejavac -cp "${CP}" -d "${DIR}" $(find "${DIR}" -name "*.java")
- ejunit4 -classpath "${CP}" ${TESTS}
-}
diff --git a/dev-java/commons-imaging/commons-imaging-1.0_alpha2.ebuild b/dev-java/commons-imaging/commons-imaging-1.0_alpha2.ebuild
new file mode 100644
index 00000000000..9ec64af99b7
--- /dev/null
+++ b/dev-java/commons-imaging/commons-imaging-1.0_alpha2.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 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
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="org.apache.commons:commons-imaging:1.0-alpha2"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Apache Commons Imaging (previously Sanselan) is a pure-Java image library."
+HOMEPAGE="https://commons.apache.org/proper/commons-imaging/"
+SRC_URI="mirror://apache/commons/imaging/source/commons-imaging-${PV/_/-}-src.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+# Compile dependencies
+# POM: pom.xml
+# test? commons-io:commons-io:2.7 -> >=dev-java/commons-io-2.11.0:1
+# test? org.hamcrest:hamcrest:2.2 -> !!!artifactId-not-found!!!
+# test? org.junit.jupiter:junit-jupiter:5.6.2 -> !!!groupId-not-found!!!
+
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
+
+DOCS=( {LICENSE,NOTICE,RELEASE-NOTES}.txt README.md )
+
+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
+}
diff --git a/dev-java/commons-io/commons-io-2.11.0.ebuild b/dev-java/commons-io/commons-io-2.11.0.ebuild
index a8b4bf854d9..f6f4b5f8feb 100644
--- a/dev-java/commons-io/commons-io-2.11.0.ebuild
+++ b/dev-java/commons-io/commons-io-2.11.0.ebuild
@@ -11,12 +11,12 @@ 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."
+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 arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
# Compile dependencies
# POM: pom.xml
diff --git a/dev-java/commons-jxpath/Manifest b/dev-java/commons-jxpath/Manifest
index ec388a631cd..308bae33ff3 100644
--- a/dev-java/commons-jxpath/Manifest
+++ b/dev-java/commons-jxpath/Manifest
@@ -1 +1,2 @@
+DIST commons-jxpath-1.3-src.tar.gz 285339 BLAKE2B c0127ff90c51b7ba69c12072689cc7ca5b969fa29e4793839bef3200b0dc3fbb529c89e21877daa4def4386f94298e43054828d4b4b05be3671e38d9f728d3d0 SHA512 a0ad0b90c9aa4c732c47c8f38f036990438f526295b782fbdc00fd67e4c0e92643c7850429eb5263f9d322aff7cb7000b8ff2bffcdcfa88fa3ba5354dce7e152
DIST commons-jxpath-1.3.tar.gz 285339 BLAKE2B c0127ff90c51b7ba69c12072689cc7ca5b969fa29e4793839bef3200b0dc3fbb529c89e21877daa4def4386f94298e43054828d4b4b05be3671e38d9f728d3d0 SHA512 a0ad0b90c9aa4c732c47c8f38f036990438f526295b782fbdc00fd67e4c0e92643c7850429eb5263f9d322aff7cb7000b8ff2bffcdcfa88fa3ba5354dce7e152
diff --git a/dev-java/commons-jxpath/commons-jxpath-1.3-r4.ebuild b/dev-java/commons-jxpath/commons-jxpath-1.3-r4.ebuild
deleted file mode 100644
index bc77ab2d8ed..00000000000
--- a/dev-java/commons-jxpath/commons-jxpath-1.3-r4.ebuild
+++ /dev/null
@@ -1,63 +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 test"
-
-inherit java-pkg-2 java-ant-2
-
-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 -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-
-S="${WORKDIR}/${P}-src"
-
-CDEPEND="
- dev-java/jdom:0
- java-virtuals/servlet-api:3.0
- dev-java/commons-beanutils:1.7"
-
-RDEPEND="
- ${CDEPEND}
- >=virtual/jre-1.6"
-
-DEPEND="
- ${CDEPEND}
- test? (
- dev-java/ant-junit:0
- dev-java/commons-logging:0
- dev-java/commons-collections:0
- )
- >=virtual/jdk-1.6"
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-EANT_GENTOO_CLASSPATH="jdom,servlet-api-3.0,commons-beanutils-1.7"
-
-EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},commons-logging,commons-collections,ant-junit"
-ANT_TASKS="ant-junit"
-EANT_TEST_TARGET="test"
-
-src_prepare() {
- default
-
- # Don't automatically run tests.
- sed 's/depends="compile,test"/depends="compile"/' -i build.xml || die
-
- # This one needs mockrunner. See #259027.
- rm -v src/test/org/apache/commons/jxpath/servlet/JXPathServletContextTest.java || die
-}
-
-src_test() {
- java-pkg-2_src_test
-}
-
-src_install() {
- java-pkg_dojar target/${PN}.jar
- use doc && java-pkg_dojavadoc dist/docs/api
- use source && java-pkg_dosrc src/java/*
-}
diff --git a/dev-java/commons-jxpath/commons-jxpath-1.3-r5.ebuild b/dev-java/commons-jxpath/commons-jxpath-1.3-r5.ebuild
new file mode 100644
index 00000000000..82e008be583
--- /dev/null
+++ b/dev-java/commons-jxpath/commons-jxpath-1.3-r5.ebuild
@@ -0,0 +1,62 @@
+# 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 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-jxpath/metadata.xml b/dev-java/commons-jxpath/metadata.xml
index 6021501589e..f918f701946 100644
--- a/dev-java/commons-jxpath/metadata.xml
+++ b/dev-java/commons-jxpath/metadata.xml
@@ -1,8 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer type="project">
- <email>java@gentoo.org</email>
- <name>Java</name>
-</maintainer>
+ <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.
+ </longdescription>
</pkgmetadata>
diff --git a/dev-java/commons-lang/commons-lang-3.12.0.ebuild b/dev-java/commons-lang/commons-lang-3.12.0.ebuild
index 26e34f109aa..4979efe4b1e 100644
--- a/dev-java/commons-lang/commons-lang-3.12.0.ebuild
+++ b/dev-java/commons-lang/commons-lang-3.12.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://commons.apache.org/proper/commons-lang/"
SRC_URI="mirror://apache/commons/lang/source/${PN}3-${PV}-src.tar.gz -> ${P}-sources.tar.gz"
LICENSE="Apache-2.0"
SLOT="3.6"
-KEYWORDS="amd64 arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
DEPEND="
>=virtual/jdk-1.8:*
diff --git a/dev-java/commons-logging/commons-logging-1.2-r3.ebuild b/dev-java/commons-logging/commons-logging-1.2-r3.ebuild
index 1be76e85241..86716083acb 100644
--- a/dev-java/commons-logging/commons-logging-1.2-r3.ebuild
+++ b/dev-java/commons-logging/commons-logging-1.2-r3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://apache/commons/logging/source/${P}-src.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="avalon-framework avalon-logkit log4j servletapi test"
RESTRICT="!test? ( test ) !servletapi? ( test )"
diff --git a/dev-java/commons-math/commons-math-3.6.1-r1.ebuild b/dev-java/commons-math/commons-math-3.6.1-r1.ebuild
index 3ef7e38716d..45de2587390 100644
--- a/dev-java/commons-math/commons-math-3.6.1-r1.ebuild
+++ b/dev-java/commons-math/commons-math-3.6.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
@@ -21,4 +21,4 @@ RDEPEND=">=virtual/jre-1.8:*"
LICENSE="Apache-2.0"
SLOT="3"
-KEYWORDS="amd64 arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
diff --git a/dev-java/commons-net/commons-net-3.8.0.ebuild b/dev-java/commons-net/commons-net-3.8.0.ebuild
index 73e3ed4a5df..6fdab25bad0 100644
--- a/dev-java/commons-net/commons-net-3.8.0.ebuild
+++ b/dev-java/commons-net/commons-net-3.8.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
EAPI=7
@@ -18,4 +18,4 @@ RDEPEND=">=virtual/jre-1.8:*"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
diff --git a/dev-java/commons-pool/Manifest b/dev-java/commons-pool/Manifest
deleted file mode 100644
index 8099fc3c4e7..00000000000
--- a/dev-java/commons-pool/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST commons-pool2-2.2-src.tar.gz 163682 BLAKE2B b9a84b1387cd00eb46cc94726ae3295a73f2f47b824401aca525296eddbf04b6c978a4808014bf7e93c113014e0e2fb0db39d6b9ddb9c651bb385cecd05584a5 SHA512 a9c1a30f497f4a6c28b8b4b82d3b2f801b464fc329d1da4f5087dcd6b923c45bde9ac6f3dc9939025453462f9dfea9fff637db9b4334ed513770a546b4807256
diff --git a/dev-java/commons-pool/commons-pool-2.2.ebuild b/dev-java/commons-pool/commons-pool-2.2.ebuild
deleted file mode 100644
index 162292b43aa..00000000000
--- a/dev-java/commons-pool/commons-pool-2.2.ebuild
+++ /dev/null
@@ -1,49 +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 test"
-
-inherit java-pkg-2 java-ant-2
-
-MY_PN="${PN}2"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Provides general purpose object pooling API"
-HOMEPAGE="http://commons.apache.org/pool/"
-SRC_URI="mirror://apache/commons/pool/source/${MY_P}-src.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="2"
-KEYWORDS="amd64 ppc64 x86"
-
-COMMON_DEP="dev-java/cglib:3
- dev-java/asm:4"
-RDEPEND="${COMMON_DEP}
- >=virtual/jre-1.6"
-DEPEND="${COMMON_DEP}
- >=virtual/jdk-1.6
- test? (
- dev-java/ant-junit:0
- dev-java/junit:4
- )"
-
-S="${WORKDIR}/${MY_P}-src"
-
-EANT_BUILD_TARGET="build-jar"
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_GENTOO_CLASSPATH="cglib-3,asm-4"
-EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit-4"
-
-src_test() {
- ANT_TASKS="ant-junit" java-pkg-2_src_test
-}
-
-src_install() {
- java-pkg_newjar dist/${MY_P}-SNAPSHOT.jar ${PN}.jar
- dodoc README.txt RELEASE-NOTES.txt
-
- use doc && java-pkg_dojavadoc dist/docs/api
- use source && java-pkg_dosrc src/main/java/org
-}
diff --git a/dev-java/commons-pool/metadata.xml b/dev-java/commons-pool/metadata.xml
deleted file mode 100644
index 6021501589e..00000000000
--- a/dev-java/commons-pool/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/commons-text/commons-text-1.9.ebuild b/dev-java/commons-text/commons-text-1.9.ebuild
index 67823fa867a..530b720f0f1 100644
--- a/dev-java/commons-text/commons-text-1.9.ebuild
+++ b/dev-java/commons-text/commons-text-1.9.ebuild
@@ -11,7 +11,7 @@ MAVEN_ID="org.apache.commons:commons-text:1.9"
inherit java-pkg-2 java-pkg-simple
-DESCRIPTION="Apache Commons Text is a library focused on algorithms working on strings."
+DESCRIPTION="Apache Commons Text is a library focused on algorithms working on strings"
HOMEPAGE="https://commons.apache.org/proper/commons-text"
SRC_URI="https://downloads.apache.org//commons/text/source/${P}-src.tar.gz -> ${P}-sources.tar.gz"
LICENSE="Apache-2.0"
diff --git a/dev-java/commons-vfs/Manifest b/dev-java/commons-vfs/Manifest
index 4e682a4175e..5a785427a26 100644
--- a/dev-java/commons-vfs/Manifest
+++ b/dev-java/commons-vfs/Manifest
@@ -1,2 +1 @@
-DIST commons-vfs-1.0-src.tar.gz 278588 BLAKE2B a92be28e02758bd271d7bf76f8b90c741dad0f1c15c71ab3624e16c6c30a47bbe189ef93c99b1f413034c47dbfdefbc155a526abf9897b85cb7352d1a92b4bef SHA512 5826ccd3faf574d7573b22fbab5f7f3ddc83b22504eb0822efbcc4570059db410d1a32811bf411414d275bdeb16ce39fd7cca2150d8537841cd888b1aef2b5a1
DIST commons-vfs-2.0-src.tar.gz 335255 BLAKE2B 01c8bba3340487672682af5c6b341ab1e8335070a9b711b5c85cca659854d05881a0ff10c4b168497e3a75867a7225740edc6e56019e55c499256401fb0a53c5 SHA512 433828b9eba73df14dbedaa4037e3da1c69bf1892553c1ae4d213ba864e4ee579e0c7799f39e3cb4ec087d7c9223f54442be46de9c4916d7b7ff8a51214d6346
diff --git a/dev-java/commons-vfs/commons-vfs-1.0-r1.ebuild b/dev-java/commons-vfs/commons-vfs-1.0-r1.ebuild
deleted file mode 100644
index acc513af4c2..00000000000
--- a/dev-java/commons-vfs/commons-vfs-1.0-r1.ebuild
+++ /dev/null
@@ -1,40 +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-vfs:commons-vfs:1.0"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="A single Java API for accessing various different file systems"
-HOMEPAGE="https://commons.apache.org/vfs/"
-SRC_URI="https://archive.apache.org/dist/${PN/-//}/source/${P}-src.tar.gz" # Not on Apache mirrors.
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux"
-RESTRICT="test" # Some failures, can't figure them out.
-
-CP_DEPEND="
- dev-java/ant-core:0
- dev-java/commons-collections:0
- dev-java/commons-httpclient:3
- dev-java/commons-logging:0
- dev-java/commons-net:0
- dev-java/jsch:0
-"
-
-RDEPEND=">=virtual/jre-1.7
- ${CP_DEPEND}"
-
-DEPEND=">=virtual/jdk-1.7
- ${CP_DEPEND}"
-
-S="${WORKDIR}/${P}-src"
-JAVA_SRC_DIR="core/src/main"
-
-src_install() {
- java-pkg-simple_src_install
- dodoc {NOTICE,RELEASE_NOTES}.txt
-}
diff --git a/dev-java/commons-vfs/commons-vfs-2.0-r2.ebuild b/dev-java/commons-vfs/commons-vfs-2.0-r2.ebuild
index 983692cd82f..fe0f75906de 100644
--- a/dev-java/commons-vfs/commons-vfs-2.0-r2.ebuild
+++ b/dev-java/commons-vfs/commons-vfs-2.0-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
@@ -8,12 +8,12 @@ JAVA_PKG_IUSE="source"
inherit java-pkg-2 java-ant-2
DESCRIPTION="A single API for accessing various different file systems"
-HOMEPAGE="http://commons.apache.org/vfs/"
+HOMEPAGE="https://commons.apache.org/vfs/"
SRC_URI="mirror://apache/commons/vfs/source/${P}-src.tar.gz"
LICENSE="Apache-2.0"
SLOT="2"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux"
CDEPEND="
dev-java/ant-core:0
diff --git a/dev-java/core-specs-alpha/core-specs-alpha-0.1.24.ebuild b/dev-java/core-specs-alpha/core-specs-alpha-0.1.24.ebuild
index 1dbd7e47739..a04c6e5dd6a 100644
--- a/dev-java/core-specs-alpha/core-specs-alpha-0.1.24.ebuild
+++ b/dev-java/core-specs-alpha/core-specs-alpha-0.1.24.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,7 +10,7 @@ EGIT_REF="43815fc"
MY_PN=${PN//-/.}
MY_P=${MY_PN}-${PV}
-DESCRIPTION="A Clojure library with specs to describe Clojure core macros and functions."
+DESCRIPTION="A Clojure library with specs to describe Clojure core macros and functions"
HOMEPAGE="https://clojure.org/ https://github.com/clojure/core.specs.alpha"
SRC_URI="https://github.com/clojure/${MY_PN}/archive/${MY_P}.tar.gz -> ${P}.tar.gz"
diff --git a/dev-java/core-specs-alpha/core-specs-alpha-0.2.44.ebuild b/dev-java/core-specs-alpha/core-specs-alpha-0.2.44.ebuild
index ebab256dc34..f54ad286701 100644
--- a/dev-java/core-specs-alpha/core-specs-alpha-0.2.44.ebuild
+++ b/dev-java/core-specs-alpha/core-specs-alpha-0.2.44.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,7 +10,7 @@ EGIT_REF="d69f559"
MY_PN=${PN//-/.}
MY_P=${MY_PN}-${PV}
-DESCRIPTION="A Clojure library with specs to describe Clojure core macros and functions."
+DESCRIPTION="A Clojure library with specs to describe Clojure core macros and functions"
HOMEPAGE="https://clojure.org/ https://github.com/clojure/core.specs.alpha"
SRC_URI="https://github.com/clojure/${MY_PN}/archive/${MY_P}.tar.gz -> ${P}.tar.gz"
diff --git a/dev-java/cpptasks/cpptasks-1.0_beta5-r1.ebuild b/dev-java/cpptasks/cpptasks-1.0_beta5-r1.ebuild
new file mode 100644
index 00000000000..d2302a4b865
--- /dev/null
+++ b/dev-java/cpptasks/cpptasks-1.0_beta5-r1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc examples source test"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Ant-tasks to compile various source languages and produce executables"
+HOMEPAGE="http://ant-contrib.sourceforge.net/"
+SRC_URI="mirror://sourceforge/ant-contrib/ant-contrib/${P/_/-}/${P/_beta/b}.tar.gz"
+S="${WORKDIR}/${P/_beta/b}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+CP_DEPEND="
+ dev-java/ant-core:0
+ dev-java/xerces:2
+"
+
+DEPEND="
+ >=virtual/jdk-1.8:*
+ ${CP_DEPEND}
+ test? (
+ dev-java/ant-junit:0
+ dev-java/junit:0
+ )
+"
+
+RDEPEND="
+ >=virtual/jre-1.8:*
+ ${CP_DEPEND}
+"
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+JAVA_ANT_CLASSPATH_TAGS="javac javadoc"
+
+EANT_BUILD_TARGET="jars"
+EANT_TEST_TARGET="run-tests -Djunit-available=true"
+EANT_DOC_TARGET="javadocs -Dbuild.javadocs=build/api"
+
+src_prepare() {
+ java-pkg_clean
+ use test && eapply "${FILESDIR}/${P}-test-classpath.patch"
+ java-pkg-2_src_prepare
+}
+
+src_test() {
+ java-pkg-2_src_test
+}
+
+src_install() {
+ java-pkg_dojar target/lib/${PN}.jar
+
+ java-pkg_register-ant-task
+
+ dodoc NOTICE
+ use doc && java-pkg_dojavadoc build/api
+ use examples && java-pkg_doexamples src/samples/*
+ use source && java-pkg_dosrc src/main/java/*
+}
diff --git a/dev-java/cpptasks/cpptasks-1.0_beta5.ebuild b/dev-java/cpptasks/cpptasks-1.0_beta5.ebuild
index c0dade63028..e72710bc345 100644
--- a/dev-java/cpptasks/cpptasks-1.0_beta5.ebuild
+++ b/dev-java/cpptasks/cpptasks-1.0_beta5.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
@@ -14,7 +14,7 @@ S="${WORKDIR}/${P/_beta/b}"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
CDEPEND="
dev-java/ant-core:0
diff --git a/dev-java/cpptasks/files/cpptasks-1.0_beta5-test-classpath.patch b/dev-java/cpptasks/files/cpptasks-1.0_beta5-test-classpath.patch
new file mode 100644
index 00000000000..02754ce7f1e
--- /dev/null
+++ b/dev-java/cpptasks/files/cpptasks-1.0_beta5-test-classpath.patch
@@ -0,0 +1,33 @@
+From 732e296e780633e3dce1bace28a4abae04f506c7 Mon Sep 17 00:00:00 2001
+From: Yuan Liao <liaoyuan@gmail.com>
+Date: Sat, 15 Jan 2022 10:58:28 -0800
+Subject: [PATCH] Prevent test classpath from being overwritten by
+ java-ant-2.eclass
+
+Signed-off-by: Yuan Liao <liaoyuan@gmail.com>
+---
+ build.xml | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/build.xml b/build.xml
+index ed3a0f7..24a3114 100644
+--- a/build.xml
++++ b/build.xml
+@@ -176,8 +176,12 @@
+ deprecation="false"
+ target="${javac.target}"
+ source="${javac.source}"
+- optimize="false"
+- classpath="${build.lib}/${name}.jar;${java.class.path}"/>
++ optimize="false">
++ <classpath>
++ <pathelement location="${build.lib}/${name}.jar" />
++ <pathelement location="${java.class.path}" />
++ </classpath>
++ </javac>
+ <jar jarfile="${tests.build.lib}/${name}_test.jar">
+ <fileset dir="." includes="NOTICE LICENSE"/>
+ <fileset dir="${tests.build.classes}"/>
+--
+2.34.1
+
diff --git a/dev-java/dict4j/Manifest b/dev-java/dict4j/Manifest
deleted file mode 100644
index cf8272e7112..00000000000
--- a/dev-java/dict4j/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST dict4j-1.1.jar 50269 BLAKE2B 70f7a46549384a063e1240bdb375a8c12e81c6a07a4c15bc1abcdb603ac89a2157a2cc2561960e4ab955d079dab3419708ae89e7f59bed51cc1da53649e52714 SHA512 35a6d77d13effa8d5e59ed2c03ff5700ccf2d91673b2bcf420a4f216176ca521dff741ff6660547823d16d06df1dcd2d44be1e90ce293a83ad9fa649b5caf7c6
diff --git a/dev-java/dict4j/dict4j-1.1.ebuild b/dev-java/dict4j/dict4j-1.1.ebuild
deleted file mode 100644
index 70e12c0b2ae..00000000000
--- a/dev-java/dict4j/dict4j-1.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2015 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
-
-DESCRIPTION="Dict protocol implementation in Java"
-HOMEPAGE="http://dict4j.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}-src.jar -> ${P}.jar"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=virtual/jre-1.6"
-DEPEND=">=virtual/jdk-1.6
- app-arch/unzip"
-
-JAVA_SRC_DIR="net"
-JAVA_ENCODING="ISO-8859-1"
diff --git a/dev-java/dict4j/metadata.xml b/dev-java/dict4j/metadata.xml
deleted file mode 100644
index bbb3474e75b..00000000000
--- a/dev-java/dict4j/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>monsieurp@gentoo.org</email>
- </maintainer>
- <maintainer type="project">
- <email>java@gentoo.org</email>
- <name>Java</name>
- </maintainer>
- <upstream>
- <remote-id type="sourceforge">dict4j</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/dev-java/dom4j/Manifest b/dev-java/dom4j/Manifest
index 8913db1a98e..a884ea898fb 100644
--- a/dev-java/dom4j/Manifest
+++ b/dev-java/dom4j/Manifest
@@ -1,4 +1,2 @@
-DIST dom4j-1.6.1-java5.patch.bz2 2900 BLAKE2B cdd7dc901f5292af3ef7f0ea200c3d22bbc8c0adc27606da3c8fbadc44625b114c995321723dca331f0b23d5248e1f9177f0def2f4138eebcbd4aaac0495d4dd SHA512 38da606d77b62976366cd089e5194a922e348ec396e7b9af4dceb0a536c47f66e0900cfa59c91df04aade6076630077a8f88c713b9c20224d69316109b293a96
-DIST dom4j-1.6.1.tar.gz 9687211 BLAKE2B 3daa3729ea071aa87c7c1e1e2b91f1635109774dd2bd564a85265a0286f1369373084b945409d9d5213d66a7e14224033d42c58d80125b7982eef8961eb29248 SHA512 95c5a7105a81734f77b4bf27f8bb0af116bf43d8ad5297a0902a6687a54109a87dffe2953cf430d14947cdaa590aa0fdf083b46a91d1d98d48431cfae4459d94
DIST dom4j-2.1.3.tar.gz 565918 BLAKE2B d6f8c9ae22f84086491ca7e60e5498edda727b219b4fe019da8f62a441dc3cea86ecf0554e32f8e717e21234b8ef8e2905946ab3722462f1fa748ad7e68e9e20 SHA512 8c4d7b4f2dd1b3f806e0d5103101998a094c31e9a4912539dcee32f24b35452c7f0d72c5f4cf55f8a8c9a416fee7284f9bca43ae56b0e66104b2b54fdb49ad96
DIST jaxen-1.2.0.jar 232455 BLAKE2B 6bd16e8ac34f3af1b9d61218dc6a29862178516cfbb98c6834bf6db846b537e44b48db6ff578b3d67d32c3e2b142e44440a2fdcc6dc06a6ea427b04e6bf1f370 SHA512 cad582fc12d0741e9e6fd7e0cf80a50feb04f5ef42043df96f8a5b78476c77695d8b43836d2241f76b35676ea759921edd25eaeb2c04ec916eb138aa2901ce5f
diff --git a/dev-java/dom4j/dom4j-1.6.1-r8.ebuild b/dev-java/dom4j/dom4j-1.6.1-r8.ebuild
deleted file mode 100644
index cc77ae8243d..00000000000
--- a/dev-java/dom4j/dom4j-1.6.1-r8.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="XML Java library"
-HOMEPAGE="https://dom4j.github.io/"
-SRC_URI="
- mirror://sourceforge/dom4j/${P}.tar.gz
- mirror://gentoo/${P}-java5.patch.bz2"
-
-LICENSE="dom4j"
-SLOT="1"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-CDEPEND="
- dev-java/xpp2:0
- dev-java/xpp3:0
- dev-java/xsdlib:0
- dev-java/relaxng-datatype:0"
-
-RDEPEND="
- ${CDEPEND}
- >=virtual/jre-1.8:*"
-
-# restricted to jdk 1.8 because it needs javax.xml.bind
-DEPEND="
- ${CDEPEND}
- test? (
- dev-java/xalan:0
- dev-java/ant-junit:0
- dev-java/junitperf:0
- )
- virtual/jdk:1.8"
-
-PDEPEND="dev-java/jaxen:1.1"
-
-# Add missing methods to compile on Java 5 #137970
-PATCHES=( "${WORKDIR}/${P}-java5.patch" )
-
-JAVA_RM_FILES=(
- src/test/org/dom4j/bean/BeansTest.java
- src/test/org/dom4j/io/StaxTest.java
- src/test/org/dom4j/rule/RuleTest.java
- src/test/org/dom4j/ThreadingTest.java
- src/test/org/dom4j/io/XPP3ReaderTest.java
-)
-
-src_prepare() {
- default
-
- # Circular deps with jaxen #212993
- find -name '*.jar' -! -name jaxen-1.1-beta-6.jar -exec rm -v {} + || die
-
- rm -v "${JAVA_RM_FILES[@]}" || die
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-JAVA_ANT_CLASSPATH_TAGS+=" javadoc"
-
-JAVA_ANT_ENCODING="ISO-8859-1"
-
-EANT_BUILD_TARGET="clean package"
-EANT_GENTOO_CLASSPATH="relaxng-datatype,xpp2,xpp3,xsdlib"
-EANT_GENTOO_CLASSPATH_EXTRA="lib/jaxen-1.1-beta-6.jar"
-EANT_EXTRA_ARGS="-Dbuild.javadocs=build/doc/api"
-
-EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junitperf,xalan"
-
-src_test() {
- java-pkg-2_src_test
-}
-
-src_install() {
- java-pkg_dojar "build/${PN}.jar"
- java-pkg_register-dependency jaxen-1.1
- use doc && java-pkg_dojavadoc build/doc/api
- use source && java-pkg_dosrc src/java/*
-}
diff --git a/dev-java/dom4j/dom4j-1.6.1-r9.ebuild b/dev-java/dom4j/dom4j-1.6.1-r9.ebuild
deleted file mode 100644
index 717d7ddf29b..00000000000
--- a/dev-java/dom4j/dom4j-1.6.1-r9.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="XML Java library"
-HOMEPAGE="https://dom4j.github.io/"
-SRC_URI="
- mirror://sourceforge/dom4j/${P}.tar.gz
- mirror://gentoo/${P}-java5.patch.bz2"
-
-LICENSE="dom4j"
-SLOT="1"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-CDEPEND="
- dev-java/xpp2:0
- dev-java/xpp3:0
- dev-java/xsdlib:0
- dev-java/relaxng-datatype:0"
-
-RDEPEND="
- ${CDEPEND}
- >=virtual/jre-1.8:*"
-
-# restricted to jdk 1.8 because it needs javax.xml.bind
-DEPEND="
- ${CDEPEND}
- test? (
- dev-java/xalan:0
- dev-java/ant-junit:0
- dev-java/junitperf:0
- )
- virtual/jdk:1.8"
-
-PDEPEND="dev-java/jaxen:1.2"
-
-# Add missing methods to compile on Java 5 #137970
-PATCHES=( "${WORKDIR}/${P}-java5.patch" )
-
-JAVA_RM_FILES=(
- src/test/org/dom4j/bean/BeansTest.java
- src/test/org/dom4j/io/StaxTest.java
- src/test/org/dom4j/rule/RuleTest.java
- src/test/org/dom4j/ThreadingTest.java
- src/test/org/dom4j/io/XPP3ReaderTest.java
-)
-
-src_prepare() {
- default
-
- # Circular deps with jaxen #212993
- find -name '*.jar' -! -name jaxen-1.1-beta-6.jar -exec rm -v {} + || die
-
- rm -v "${JAVA_RM_FILES[@]}" || die
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-JAVA_ANT_CLASSPATH_TAGS+=" javadoc"
-
-JAVA_ANT_ENCODING="ISO-8859-1"
-
-EANT_BUILD_TARGET="clean package"
-EANT_GENTOO_CLASSPATH="relaxng-datatype,xpp2,xpp3,xsdlib"
-EANT_GENTOO_CLASSPATH_EXTRA="lib/jaxen.jar"
-EANT_EXTRA_ARGS="-Dbuild.javadocs=build/doc/api"
-
-EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junitperf,xalan"
-
-src_test() {
- java-pkg-2_src_test
-}
-
-src_install() {
- java-pkg_dojar "build/${PN}.jar"
- java-pkg_register-dependency jaxen-1.2
- use doc && java-pkg_dojavadoc build/doc/api
- use source && java-pkg_dosrc src/java/*
-}
diff --git a/dev-java/dom4j/dom4j-2.1.3.ebuild b/dev-java/dom4j/dom4j-2.1.3.ebuild
index 48d0ffcb2cf..69be8c48e9f 100644
--- a/dev-java/dom4j/dom4j-2.1.3.ebuild
+++ b/dev-java/dom4j/dom4j-2.1.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:
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/refs/tags/version-${PV}.tar.gz -
LICENSE="dom4j"
SLOT="1"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
IUSE="jaxen"
CDEPEND="
diff --git a/dev-java/easymock/easymock-3.3.1-r1.ebuild b/dev-java/easymock/easymock-3.3.1-r1.ebuild
index bef9d66247a..26eb0db0b3c 100644
--- a/dev-java/easymock/easymock-3.3.1-r1.ebuild
+++ b/dev-java/easymock/easymock-3.3.1-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/refs/tags/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="3.2"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
CDEPEND="
dev-java/cglib:3
diff --git a/dev-java/error-prone-annotations/Manifest b/dev-java/error-prone-annotations/Manifest
index 0d166cbeade..fff42a2fa29 100644
--- a/dev-java/error-prone-annotations/Manifest
+++ b/dev-java/error-prone-annotations/Manifest
@@ -1 +1,2 @@
DIST error-prone-2.0.14.tar.gz 677991 BLAKE2B e247249b385b4d5ff46cd9faaeb88b7c2053204c17a2a81846c554e2eb95389a17ca340f02dbab187f7b9e297fb13c030912e49bfbe5b29c7158391b1a7c50da SHA512 0bf2c869638e03fea5395e2b84a690c42df320903e48a171537e68a60ae7a47a8a83de07fa0a8dfb03340c035878b4380fd6677ba3bf1d13eeffcfaee4e63658
+DIST error-prone-2.7.1.tar.gz 1576363 BLAKE2B a204a6a0dfcc88e06ff4f9288764c33c72e1d0c692ba20ce34a1440025abbb96d510129e335a475ffecc037806c72a0e1a85f0ad55a5ee4402d7b731eabd057b SHA512 2e8ff78b2fc65a0a53244711a3b5dd3d42cd09c0c9cca8dde5c814ee3e9dbc6e2c44f8bdb778111c93cd867f9b85b8afae4fd0551eda9326c0a9b1aa1dcaaf92
diff --git a/dev-java/error-prone-annotations/error-prone-annotations-2.0.14.ebuild b/dev-java/error-prone-annotations/error-prone-annotations-2.0.14.ebuild
index c24f32ac3cb..f5eb3a09a96 100644
--- a/dev-java/error-prone-annotations/error-prone-annotations-2.0.14.ebuild
+++ b/dev-java/error-prone-annotations/error-prone-annotations-2.0.14.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="http://errorprone.info"
SRC_URI="https://github.com/google/${MY_PN}/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
DEPEND=">=virtual/jdk-1.7"
RDEPEND=">=virtual/jre-1.7"
diff --git a/dev-java/error-prone-annotations/error-prone-annotations-2.7.1.ebuild b/dev-java/error-prone-annotations/error-prone-annotations-2.7.1.ebuild
new file mode 100644
index 00000000000..4c854a1d49a
--- /dev/null
+++ b/dev-java/error-prone-annotations/error-prone-annotations-2.7.1.ebuild
@@ -0,0 +1,27 @@
+# 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://codeload.github.com/google/error-prone/tar.gz/v2.7.1 --slot 0 --keywords "~amd64 ~arm64 ~ppc64 ~x86" --ebuild error-prone-annotations-2.7.1-r1.ebuild
+
+EAPI=7
+
+MY_PN="${PN%-annotations}"
+MY_P="${MY_PN}-${PV}"
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="com.google.errorprone:error_prone_annotations:${PV}"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Java annotations for the Error Prone static analysis tool"
+HOMEPAGE="http://errorprone.info"
+SRC_URI="https://codeload.github.com/google/${MY_PN}/tar.gz/v${PV} -> ${MY_P}.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
+
+S="${WORKDIR}/${MY_P}/annotations"
+JAVA_SRC_DIR="src/main/java"
diff --git a/dev-java/failureaccess/Manifest b/dev-java/failureaccess/Manifest
new file mode 100644
index 00000000000..6cdfcc4ae4a
--- /dev/null
+++ b/dev-java/failureaccess/Manifest
@@ -0,0 +1 @@
+DIST guava-30.1.1.tar.gz 5404546 BLAKE2B 818ef4b17c4f0c8e92c327f046434a3bb428ac35d6e95edd6d6be558c755d138a8ac7f8ad2032073cad131890d8f838e896fff84ba217f8305be8bd65c619a48 SHA512 23b30d886a3200b8f998897ca7bc424b2d223a4fecb03ab644e08a989a85f008e30ef093055e6305c4148a1eb8919c407e35d19f492c5b189830bd115e9484f2
diff --git a/dev-java/failureaccess/failureaccess-30.1.1.ebuild b/dev-java/failureaccess/failureaccess-30.1.1.ebuild
new file mode 100644
index 00000000000..fb3c8c35a82
--- /dev/null
+++ b/dev-java/failureaccess/failureaccess-30.1.1.ebuild
@@ -0,0 +1,28 @@
+# 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://codeload.github.com/google/guava/tar.gz/refs/tags/v30.1.1 --slot 0 --keywords "" --ebuild failureacess-30.1.1.ebuild
+
+EAPI=7
+
+MY_P=guava-${PV}
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="com.google.guava:failureaccess:1.0.1"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Guava's InternalFutureFailureAccess and InternalFutures classes."
+HOMEPAGE="https://github.com/google/guava/failureaccess"
+SRC_URI="https://codeload.github.com/google/guava/tar.gz/refs/tags/v${PV} -> ${MY_P}.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
+
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
+
+S="${WORKDIR}/${MY_P}"
+
+JAVA_SRC_DIR="futures/${PN}/src/com/google/common/util/concurrent/internal/"
diff --git a/dev-java/failureaccess/metadata.xml b/dev-java/failureaccess/metadata.xml
new file mode 100644
index 00000000000..f7694e837d1
--- /dev/null
+++ b/dev-java/failureaccess/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>java@gentoo.org</email>
+ <name>Java</name>
+ </maintainer>
+ <longdescription lang="en">
+Contains com.google.common.util.concurrent.internal.InternalFutureFailureAccess
+and InternalFutures. Most users will never need to use this artifact. Its
+classes are conceptually a part of Guava, but they're in this separate artifact
+so that Android libraries can use them without pulling in all of Guava (just as
+they can use ListenableFuture by depending on the listenablefuture artifact).
+ </longdescription>
+ <upstream>
+ <remote-id type="github">google/guava</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-java/felix-gogo-command/Manifest b/dev-java/felix-gogo-command/Manifest
deleted file mode 100644
index 5f1a5ca5a6c..00000000000
--- a/dev-java/felix-gogo-command/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST org.apache.felix.gogo.command-0.12.0-project.tar.gz 26454 BLAKE2B 0a0ed6b1ce7e66e90a32c71aa3786d290c907c68124a4056078907d1fe7d85546327d9540c68ee0bf3b90e28ef06fcd286e290d86799b6675fd642fbba30ad9e SHA512 8d7afa4b34be6460df9e1e91ecc42b34ecfc1888f5574add206a3c6fbc54647672e34d4f3a4e59eb39f8b2b9fd94b468647c0e95d5fc04649ab7a283e172a061
diff --git a/dev-java/felix-gogo-command/felix-gogo-command-0.12.0.ebuild b/dev-java/felix-gogo-command/felix-gogo-command-0.12.0.ebuild
deleted file mode 100644
index b2f275c09e1..00000000000
--- a/dev-java/felix-gogo-command/felix-gogo-command-0.12.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit java-pkg-2 java-ant-2 java-osgi
-
-DESCRIPTION="Felix Gogo Command"
-HOMEPAGE="http://felix.apache.org/site/apache-felix-gogo.html"
-LICENSE="Apache-2.0"
-
-MY_PN="org.apache.felix.gogo.command"
-MY_P="${MY_PN}-${PV}"
-SRC_URI="mirror://apache/felix/${MY_P}-project.tar.gz"
-SLOT="0"
-KEYWORDS="amd64"
-
-CDEPEND="
- dev-java/felix-bundlerepository:0
- dev-java/felix-gogo-runtime:0
- dev-java/osgi-compendium:0
- dev-java/osgi-core-api:0
-"
-
-DEPEND=">=virtual/jdk-1.6
- ${CDEPEND}"
-
-RDEPEND=">=virtual/jre-1.6
- ${CDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-java_prepare() {
- cp "${FILESDIR}"/${P}-build.xml build.xml || die
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_GENTOO_CLASSPATH="osgi-core-api,osgi-compendium,felix-gogo-runtime,felix-bundlerepository"
-
-src_install() {
- mv target/{${MY_P},${PN}}.jar || die
-
- java-osgi_dojar target/${PN}.jar ${MY_PN} ${MY_PN} "Export-Package: ${MY_PN}"
-}
diff --git a/dev-java/felix-gogo-command/files/felix-gogo-command-0.12.0-build.xml b/dev-java/felix-gogo-command/files/felix-gogo-command-0.12.0-build.xml
deleted file mode 100644
index b31bcdccdc0..00000000000
--- a/dev-java/felix-gogo-command/files/felix-gogo-command-0.12.0-build.xml
+++ /dev/null
@@ -1,276 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- ====================================================================== -->
-<!-- Ant build file (http://ant.apache.org/) for Ant 1.6.2 or above. -->
-<!-- ====================================================================== -->
-
-<!-- ====================================================================== -->
-<!-- ===================== - DO NOT EDIT THIS FILE! - ===================== -->
-<!-- ====================================================================== -->
-<!-- -->
-<!-- Any modifications will be overwritten. -->
-<!-- -->
-<!-- Generated by Maven Ant Plugin on 5/10/13 7:05 PM -->
-<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/ -->
-<!-- -->
-<!-- ====================================================================== -->
-
-<project name="org.apache.felix.gogo.command-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="org.apache.felix.gogo.command-0.12.0"/>
- <property name="maven.build.dir" value="target"/>
- <property name="maven.build.outputDir" value="${maven.build.dir}/classes"/>
- <property name="maven.build.srcDir.0" value="src/main/java"/>
- <property name="maven.build.resourceDir.0" value="src/main/resources"/>
- <property name="maven.build.resourceDir.1" value="."/>
- <property name="maven.build.testOutputDir" value="${maven.build.dir}/test-classes"/>
- <property name="maven.build.testDir.0" value="src/test/java"/>
- <property name="maven.build.testResourceDir.0" value="src/test/resources"/>
- <property name="maven.test.reports" value="${maven.build.dir}/test-reports"/>
- <property name="maven.reporting.outputDirectory" value="${maven.build.dir}/site"/>
-
- <property name="maven.repo.local" value="${user.home}/.m2/repository"/>
- <property name="maven.settings.offline" value="false"/>
- <property name="maven.settings.interactiveMode" value="true"/>
-
- <!-- ====================================================================== -->
- <!-- Defining classpaths -->
- <!-- ====================================================================== -->
-
- <path id="build.classpath">
- <pathelement location="${maven.repo.local}/org/osgi/org.osgi.core/4.3.0/org.osgi.core-4.3.0.jar"/>
- <pathelement location="${maven.repo.local}/org/osgi/org.osgi.compendium/4.0.0/org.osgi.compendium-4.0.0.jar"/>
- <pathelement location="${maven.repo.local}/org/apache/felix/org.apache.felix.gogo.runtime/0.10.0/org.apache.felix.gogo.runtime-0.10.0.jar"/>
- <pathelement location="${maven.repo.local}/org/apache/felix/org.apache.felix.bundlerepository/1.6.0/org.apache.felix.bundlerepository-1.6.0.jar"/>
- </path>
- <path id="build.test.classpath">
- <pathelement location="${maven.repo.local}/org/osgi/org.osgi.core/4.3.0/org.osgi.core-4.3.0.jar"/>
- <pathelement location="${maven.repo.local}/org/osgi/org.osgi.compendium/4.0.0/org.osgi.compendium-4.0.0.jar"/>
- <pathelement location="${maven.repo.local}/org/apache/felix/org.apache.felix.gogo.runtime/0.10.0/org.apache.felix.gogo.runtime-0.10.0.jar"/>
- <pathelement location="${maven.repo.local}/org/apache/felix/org.apache.felix.bundlerepository/1.6.0/org.apache.felix.bundlerepository-1.6.0.jar"/>
- <pathelement location="${maven.repo.local}/junit/junit/4.0/junit-4.0.jar"/>
- <pathelement location="${maven.repo.local}/org/easymock/easymock/2.4/easymock-2.4.jar"/>
- <pathelement location="${maven.repo.local}/org/mockito/mockito-all/1.7/mockito-all-1.7.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>
- <copy todir="${maven.build.outputDir}">
- <fileset dir="${maven.build.resourceDir.0}"/>
- </copy>
- <mkdir dir="${maven.build.outputDir}/META-INF"/>
- <copy todir="${maven.build.outputDir}/META-INF">
- <fileset dir="${maven.build.resourceDir.1}">
- <include name="LICENSE*"/>
- <include name="NOTICE*"/>
- </fileset>
- </copy>
- </target>
-
- <!-- ====================================================================== -->
- <!-- Test-compilation target -->
- <!-- ====================================================================== -->
-
- <target name="compile-tests"
- depends="compile"
- description="Compile the test code"
- unless="maven.test.skip">
- <mkdir dir="${maven.build.testOutputDir}"/>
- </target>
-
- <!-- ====================================================================== -->
- <!-- Run all tests -->
- <!-- ====================================================================== -->
-
- <target name="test"
- depends="compile-tests, junit-missing"
- unless="junit.skipped"
- description="Run the test cases"/>
-
- <target name="test-junit-present">
- <available classname="junit.framework.Test" property="junit.present"/>
- </target>
-
- <target name="test-junit-status"
- depends="test-junit-present">
- <condition property="junit.missing">
- <and>
- <isfalse value="${junit.present}"/>
- <isfalse value="${maven.test.skip}"/>
- </and>
- </condition>
- <condition property="junit.skipped">
- <or>
- <isfalse value="${junit.present}"/>
- <istrue value="${maven.test.skip}"/>
- </or>
- </condition>
- </target>
-
- <target name="junit-missing"
- depends="test-junit-status"
- if="junit.missing">
- <echo>=================================== WARNING ===================================</echo>
- <echo> JUnit is not present in your $ANT_HOME/lib directory. Tests not executed.</echo>
- <echo>===============================================================================</echo>
- </target>
-
- <!-- ====================================================================== -->
- <!-- Javadoc target -->
- <!-- ====================================================================== -->
-
- <target name="javadoc" description="Generates the Javadoc of the application">
- <javadoc sourcepath="${maven.build.srcDir.0}"
- packagenames="*"
- destdir="${maven.reporting.outputDirectory}/apidocs"
- access="protected"
- old="false"
- verbose="false"
- version="true"
- use="true"
- author="true"
- splitindex="false"
- nodeprecated="false"
- nodeprecatedlist="false"
- notree="false"
- noindex="false"
- nohelp="false"
- nonavbar="false"
- serialwarn="false"
- charset="ISO-8859-1"
- linksource="false"
- breakiterator="false"/>
- </target>
-
- <!-- ====================================================================== -->
- <!-- Package target -->
- <!-- ====================================================================== -->
-
- <target name="package" depends="compile,test" description="Package the application">
- <jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar"
- compress="true"
- index="false"
- basedir="${maven.build.outputDir}"
- excludes="**/package.html"/>
- </target>
-
- <!-- ====================================================================== -->
- <!-- A dummy target for the package named after the type it creates -->
- <!-- ====================================================================== -->
-
- <target name="jar" depends="package" description="Builds the jar for the application"/>
-
- <!-- ====================================================================== -->
- <!-- Download dependencies target -->
- <!-- ====================================================================== -->
-
- <target name="test-offline">
- <condition property="maven.mode.offline">
- <equals arg1="${maven.settings.offline}" arg2="true"/>
- </condition>
- </target>
-
- <target name="get-deps"
- depends="test-offline"
- description="Download all dependencies"
- unless="maven.mode.offline">
- <mkdir dir="${maven.repo.local}"/>
- <mkdir dir="${maven.repo.local}/org/osgi/org.osgi.core/4.3.0"/>
- <get src="http://repository.apache.org/snapshots/org/osgi/org.osgi.core/4.3.0/org.osgi.core-4.3.0.jar"
- dest="${maven.repo.local}/org/osgi/org.osgi.core/4.3.0/org.osgi.core-4.3.0.jar"
- usetimestamp="false"
- ignoreerrors="true"/>
- <get src="http://repo.maven.apache.org/maven2/org/osgi/org.osgi.core/4.3.0/org.osgi.core-4.3.0.jar"
- dest="${maven.repo.local}/org/osgi/org.osgi.core/4.3.0/org.osgi.core-4.3.0.jar"
- usetimestamp="false"
- ignoreerrors="true"/>
- <mkdir dir="${maven.repo.local}/org/osgi/org.osgi.compendium/4.0.0"/>
- <get src="http://repository.apache.org/snapshots/org/osgi/org.osgi.compendium/4.0.0/org.osgi.compendium-4.0.0.jar"
- dest="${maven.repo.local}/org/osgi/org.osgi.compendium/4.0.0/org.osgi.compendium-4.0.0.jar"
- usetimestamp="false"
- ignoreerrors="true"/>
- <get src="http://repo.maven.apache.org/maven2/org/osgi/org.osgi.compendium/4.0.0/org.osgi.compendium-4.0.0.jar"
- dest="${maven.repo.local}/org/osgi/org.osgi.compendium/4.0.0/org.osgi.compendium-4.0.0.jar"
- usetimestamp="false"
- ignoreerrors="true"/>
- <mkdir dir="${maven.repo.local}/org/apache/felix/org.apache.felix.gogo.runtime/0.10.0"/>
- <get src="http://repository.apache.org/snapshots/org/apache/felix/org.apache.felix.gogo.runtime/0.10.0/org.apache.felix.gogo.runtime-0.10.0.jar"
- dest="${maven.repo.local}/org/apache/felix/org.apache.felix.gogo.runtime/0.10.0/org.apache.felix.gogo.runtime-0.10.0.jar"
- usetimestamp="false"
- ignoreerrors="true"/>
- <get src="http://repo.maven.apache.org/maven2/org/apache/felix/org.apache.felix.gogo.runtime/0.10.0/org.apache.felix.gogo.runtime-0.10.0.jar"
- dest="${maven.repo.local}/org/apache/felix/org.apache.felix.gogo.runtime/0.10.0/org.apache.felix.gogo.runtime-0.10.0.jar"
- usetimestamp="false"
- ignoreerrors="true"/>
- <mkdir dir="${maven.repo.local}/org/apache/felix/org.apache.felix.bundlerepository/1.6.0"/>
- <get src="http://repository.apache.org/snapshots/org/apache/felix/org.apache.felix.bundlerepository/1.6.0/org.apache.felix.bundlerepository-1.6.0.jar"
- dest="${maven.repo.local}/org/apache/felix/org.apache.felix.bundlerepository/1.6.0/org.apache.felix.bundlerepository-1.6.0.jar"
- usetimestamp="false"
- ignoreerrors="true"/>
- <get src="http://repo.maven.apache.org/maven2/org/apache/felix/org.apache.felix.bundlerepository/1.6.0/org.apache.felix.bundlerepository-1.6.0.jar"
- dest="${maven.repo.local}/org/apache/felix/org.apache.felix.bundlerepository/1.6.0/org.apache.felix.bundlerepository-1.6.0.jar"
- usetimestamp="false"
- ignoreerrors="true"/>
- <mkdir dir="${maven.repo.local}/junit/junit/4.0"/>
- <get src="http://repository.apache.org/snapshots/junit/junit/4.0/junit-4.0.jar"
- dest="${maven.repo.local}/junit/junit/4.0/junit-4.0.jar"
- usetimestamp="false"
- ignoreerrors="true"/>
- <get src="http://repo.maven.apache.org/maven2/junit/junit/4.0/junit-4.0.jar"
- dest="${maven.repo.local}/junit/junit/4.0/junit-4.0.jar"
- usetimestamp="false"
- ignoreerrors="true"/>
- <mkdir dir="${maven.repo.local}/org/easymock/easymock/2.4"/>
- <get src="http://repository.apache.org/snapshots/org/easymock/easymock/2.4/easymock-2.4.jar"
- dest="${maven.repo.local}/org/easymock/easymock/2.4/easymock-2.4.jar"
- usetimestamp="false"
- ignoreerrors="true"/>
- <get src="http://repo.maven.apache.org/maven2/org/easymock/easymock/2.4/easymock-2.4.jar"
- dest="${maven.repo.local}/org/easymock/easymock/2.4/easymock-2.4.jar"
- usetimestamp="false"
- ignoreerrors="true"/>
- <mkdir dir="${maven.repo.local}/org/mockito/mockito-all/1.7"/>
- <get src="http://repository.apache.org/snapshots/org/mockito/mockito-all/1.7/mockito-all-1.7.jar"
- dest="${maven.repo.local}/org/mockito/mockito-all/1.7/mockito-all-1.7.jar"
- usetimestamp="false"
- ignoreerrors="true"/>
- <get src="http://repo.maven.apache.org/maven2/org/mockito/mockito-all/1.7/mockito-all-1.7.jar"
- dest="${maven.repo.local}/org/mockito/mockito-all/1.7/mockito-all-1.7.jar"
- usetimestamp="false"
- ignoreerrors="true"/>
- </target>
-
-</project>
diff --git a/dev-java/felix-gogo-command/metadata.xml b/dev-java/felix-gogo-command/metadata.xml
deleted file mode 100644
index 6021501589e..00000000000
--- a/dev-java/felix-gogo-command/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/fontbox/Manifest b/dev-java/fontbox/Manifest
index f68a095f58d..8da187270c9 100644
--- a/dev-java/fontbox/Manifest
+++ b/dev-java/fontbox/Manifest
@@ -2,5 +2,4 @@ DIST DejaVuSansMono.ttf 317336 BLAKE2B c80f50cea451963a75c66160596b67655afb19c9e
DIST NotoEmoji-Regular.ttf 418804 BLAKE2B e94f7b1d5bced052ff3f15a32ecce8f0f1dc2ef19565d3bcaa75b82676fbf0efeaa6efa1d25edf352b577acce17a45c6f0e7be1550c46a8c2ab6cef208cd6f11 SHA512 51b01ab0794be9f92c59679f6d56d4ce09ed959daeb9ec945bb837eb15a82ab302e83b29aab1972ac9cb648f7196a5f5ff4488a4622b36bedbc9cd0cab6dc3de
DIST SourceSansProBold.otf 104072 BLAKE2B 2c6538ed97cca04a6a38a1bcca7def6c9e923f0e7a773c2715d50ca1a526b1ff683bc6544155b1e170fb828c3923d6b22cdf7017f9da9de164523f328c1cc187 SHA512 28a044a2685fbc8da7810d9ac7b6b93a95542d504d7d8e671f009b8ebb2f5b70c974be7ea78974b188d8e6ab17d65b08f276c054927857315d5aad26f6fe36fc
DIST fontbox-1.7.1.zip 9167805 BLAKE2B f9e02d1540eaf7e4bb748906e56887494d81eecc88685fa9d758cb50712a530528573f4a7e5f816b4ff57d664a416b35444517d840c9b37239ec1e2b5a62b5a1 SHA512 8b2af3d8f431626c106e4f6e9e1d59d14abcd58cfdc9553f20c5057eef9f9cfbd0287e14e58e4d34472ad81198eb3f4d0a2fd6e88bd1fa5cbcf01e4befbf77d0
-DIST pdfbox-1.8.11-src.zip 11026359 BLAKE2B b3eb1add38e9bd0e5a1fcb116263fdbc372d6adb77132aeb0647a6c5d2c2b735345220f0a5c22caa97d04f78ad6517df388327aaa625677bd8c99d2051329a9c SHA512 05c8e5075379ed5ebb09555b39434dd936fce9dd24445871d24ea7f0f6afa49e74242bf0c9eba2d1a847b505143789b687dd039ca51ce76851132f2f18d434d1
DIST pdfbox-2.0.24-src.zip 15651754 BLAKE2B 5d0220c28c2be18a66aa66c2540d3e1d85ecc6826f632e6c9a0193f2f02dca645909b0a54c707d856bb2886d52b0b5fb706503b4f89f0eb7aede8e612bebfa8e SHA512 5d55b3cadbbae266d90c47f5b10c9b09b6dc16f53b77a0cf15c78e62fc69afc7b6eab5a4329608ecdf25de9194b38db1f7d23e7d71af473cc1bf7b09b0028642
diff --git a/dev-java/fontbox/fontbox-1.8.11.ebuild b/dev-java/fontbox/fontbox-1.8.11.ebuild
deleted file mode 100644
index 8177f7c9f41..00000000000
--- a/dev-java/fontbox/fontbox-1.8.11.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MY_PN="pdfbox"
-MY_P="${MY_PN}-${PV}"
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="An open source Java library for parsing font files"
-HOMEPAGE="https://pdfbox.apache.org/"
-SRC_URI="mirror://apache/${MY_PN}/${PV}/${MY_P}-src.zip"
-LICENSE="Apache-2.0"
-SLOT="1.8"
-KEYWORDS="amd64 ~arm64 ppc64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-CDEPEND=">=dev-java/commons-logging-1.1.1:0"
-
-RDEPEND="${CDEPEND}
- >=virtual/jre-1.6"
-
-DEPEND="${CDEPEND}
- >=virtual/jdk-1.6
- app-arch/unzip
- test? ( dev-java/junit:4 )"
-
-S="${WORKDIR}/${MY_P}/${PN}"
-JAVA_SRC_DIR="src/main/java"
-JAVA_GENTOO_CLASSPATH="commons-logging"
-
-src_install() {
- java-pkg-simple_src_install
- dodoc README.txt
-}
-
-src_test() {
- local DIR=src/test/java
- local CP="${DIR}:${PN}.jar:$(java-pkg_getjars junit-4,${JAVA_GENTOO_CLASSPATH})"
- local TESTS=$(find ${DIR} -name "*Test.java")
- TESTS="${TESTS//src\/test\/java\/}"
- TESTS="${TESTS//.java}"
- TESTS="${TESTS//\//.}"
-
- ejavac -cp "${CP}" -d ${DIR} $(find ${DIR} -name "*.java")
- ejunit4 -classpath "${CP}" ${TESTS}
-}
diff --git a/dev-java/glassfish-ejb-api/Manifest b/dev-java/glassfish-ejb-api/Manifest
deleted file mode 100644
index 41cb13d08d5..00000000000
--- a/dev-java/glassfish-ejb-api/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST glassfish-ejb-api-3.2.tar.xz 37052 BLAKE2B c281a98a98181c5f19d3d11830a4c67b818f1ea43b41f335ffb0181e43e1351d4279462d68151a7cd98ad0a040fa15e3102e7e01b66713ee46198bc2967d9b34 SHA512 1692bbff05242b0af5141b35151ff65f029e19f45c5dac07ed9b706635e3f42d8d512819f38a49b564c9dee51be33c36fb871ea5267000536a0fb1e1b5d6a00a
diff --git a/dev-java/glassfish-ejb-api/metadata.xml b/dev-java/glassfish-ejb-api/metadata.xml
deleted file mode 100644
index 6021501589e..00000000000
--- a/dev-java/glassfish-ejb-api/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/glassfish-persistence/glassfish-persistence-1.0-r2.ebuild b/dev-java/glassfish-persistence/glassfish-persistence-1.0-r2.ebuild
index 3b0fcc4a64b..ec68669476a 100644
--- a/dev-java/glassfish-persistence/glassfish-persistence-1.0-r2.ebuild
+++ b/dev-java/glassfish-persistence/glassfish-persistence-1.0-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
@@ -11,7 +11,7 @@ SRC_URI="https://download.java.net/javaee5/fcs_branch/promoted/source/glassfish-
LICENSE="CDDL"
SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
BDEPEND="app-arch/unzip"
DEPEND=">=virtual/jdk-1.8:*"
diff --git a/dev-java/glassfish-ejb-api/glassfish-ejb-api-3.2.ebuild b/dev-java/glassfish-xmlrpc-api/glassfish-xmlrpc-api-1.1.1-r1.ebuild
index b02a9bfeab6..71dc46ecd5a 100644
--- a/dev-java/glassfish-ejb-api/glassfish-ejb-api-3.2.ebuild
+++ b/dev-java/glassfish-xmlrpc-api/glassfish-xmlrpc-api-1.1.1-r1.ebuild
@@ -1,37 +1,41 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="5"
+EAPI=8
JAVA_PKG_IUSE="doc source"
inherit java-pkg-2 java-ant-2
-TOMEE_PV="1.5.2"
-
-DESCRIPTION="Project GlassFish Enterprise JavaBean API"
+DESCRIPTION="Project GlassFish XML RPC API"
HOMEPAGE="https://glassfish.java.net/"
SRC_URI="https://dev.gentoo.org/~tomwij/files/dist/${P}.tar.xz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
-CDEPEND="java-virtuals/xmlrpc-api:0
- java-virtuals/transaction-api:0"
+CP_DEPEND="
+ dev-java/jakarta-xml-soap-api:1
+ java-virtuals/servlet-api:3.0
+"
-DEPEND=">=virtual/jdk-1.7
- ${CDEPEND}"
+DEPEND="
+ >=virtual/jdk-1.8:*
+ ${CP_DEPEND}
+"
-RDEPEND=">=virtual/jre-1.7
- ${CDEPEND}"
+RDEPEND="
+ >=virtual/jre-1.8:*
+ ${CP_DEPEND}
+"
JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_GENTOO_CLASSPATH="xmlrpc-api,transaction-api"
+JAVA_ANT_CLASSPATH_TAGS="javac javadoc"
JAVA_PKG_BSFIX_NAME="maven-build.xml"
src_install() {
- java-pkg_newjar target/javax.ejb-api-${PV}.jar
+ java-pkg_newjar "target/javax.xml.rpc-api-${PV}.jar"
use doc && java-pkg_dojavadoc target/site/apidocs
use source && java-pkg_dosrc src/main/java/javax
diff --git a/dev-java/gnu-jaf/Manifest b/dev-java/gnu-jaf/Manifest
index 06deb19ee89..bc1c053be9b 100644
--- a/dev-java/gnu-jaf/Manifest
+++ b/dev-java/gnu-jaf/Manifest
@@ -1,2 +1 @@
-DIST activation-1.1.1.tar.gz 157018 BLAKE2B e9135b4c0996601c7963a46363e8ede3ba81e83e532637a92d83c89586eb52bd11be84ee37f5e8f31e372564f7c14aac4123726ba20712f5cef89a1e4bcd01f3 SHA512 d323644df13a4572bf1c10e7175c1c4cfa3078483886bba7b308989c215a23e12939b054124dbaf0437a4c5fdcb551b4e2189c09afc078218963389e4b3c3b7d
DIST activation-1.1.2.tar.gz 290644 BLAKE2B 15ec89a5c757bb134b9ec71e384a80dea5394b9b6463ca1fe44e2e622993fa8809231379b262b0a54595c32451a49ef508bea45ce82120138efe07d81939a817 SHA512 26534f7bb47daddf97b850ab74fc8ef2c5bd62d12cfb96e28e235071af7dcfc7761fa15f2d8f3a2d194f035665cef127812b7476af6cc81f6d6374f1fa725584
diff --git a/dev-java/gnu-jaf/gnu-jaf-1.1.1-r1.ebuild b/dev-java/gnu-jaf/gnu-jaf-1.1.1-r1.ebuild
deleted file mode 100644
index efb519edd97..00000000000
--- a/dev-java/gnu-jaf/gnu-jaf-1.1.1-r1.ebuild
+++ /dev/null
@@ -1,35 +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"
-
-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"
-
-DOCS=( AUTHORS ChangeLog )
-
-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/gnu-jaf/gnu-jaf-1.1.2.ebuild b/dev-java/gnu-jaf/gnu-jaf-1.1.2.ebuild
index a51b85e9f95..4af0a6d691b 100644
--- a/dev-java/gnu-jaf/gnu-jaf-1.1.2.ebuild
+++ b/dev-java/gnu-jaf/gnu-jaf-1.1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -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/gradle-bin/Manifest b/dev-java/gradle-bin/Manifest
index 1f7155e9a2e..0f799fbeac3 100644
--- a/dev-java/gradle-bin/Manifest
+++ b/dev-java/gradle-bin/Manifest
@@ -1,4 +1,4 @@
DIST gradle-bin-6.8.3.zip 150631445 BLAKE2B 935a6631167481e289ac5a468b822ffeec204519edf42c8a0f05a911ef716715b706e3c22637763b4a7a0c7cbfa89f163673ef5631c115c025c5634b353fcee6 SHA512 fdd5c347142c2a8e2a1455d8886ddb103531de6e69d41f20d199a488d10165600924876761b452da213759a1dc6d47ed00a069f1a9f8af99fdbf1af3bb2e0564
DIST gradle-bin-7.1.1.zip 154838841 BLAKE2B 0a0ad08101f0c5fa7c0cb2a4c9ad6e53320cc6214fe1a139f390b73d9aa656ebfaf90c21816d57964f37e9cad51faed21f82f55b7e24fcf0f5a3ffd861c990ad SHA512 95cc2de9b7c3d6019d7780b17238ff8f0db14c9a1e494b391c84d75619eb3064322bb2c56fa9127b0a5681c94b32283090a15b06fefeccdb95a1f8fb9e58c75c
DIST gradle-bin-7.2.zip 157058280 BLAKE2B 918213df58ac2afbd075c74588f60676cd7dc99030834828138c621348ac1abd368e0b54c2f6937cbfc9533e55e310b46cf841c92dcb1039b898c6f456032d38 SHA512 6ccc79f08afdc20b3d5abf876c3cabb69114d1ab4285cdb77158cd8c5e09207589edefb6c79f2bcffe4629a38c6b9e2f473de42dab29a24310965bc5816b907d
-DIST gradle-bin-7.3.zip 158812238 BLAKE2B 463c2ad907a914eddf6dd29b1909e97a872fbc014b8cff7c996284fdaf106ac5d9fd24394df59403722be9c44de5729928424ef76539915d2aecc0568bb6ad8c SHA512 56f2dbc88469ed0d8ac94b8b5e37e66e954f80e4daa10e32a6dde9a1167bff8ee75749cc0ac48369d9fb227950253b3cb757d568aff9206528b11b411f38774a
+DIST gradle-bin-7.3.3.zip 158875257 BLAKE2B 94f86e06da3eae4a9522d35a28577d033d64ce1bc2f36d0f5c1992e9b92ec311d25bd98bbeaf4b8a9869f22d93e14c88952e12166e436a0a6c206541d1f967aa SHA512 03f2bdd77202788cd43bb3e3a6390340f4d083d69ade5a53e0163204fb85307f5bbbbf4e04077c6ae558bc36ab3c478674f941079bc14a8344f55631fbba1490
diff --git a/dev-java/gradle-bin/gradle-bin-6.8.3.ebuild b/dev-java/gradle-bin/gradle-bin-6.8.3.ebuild
index dfbd1549205..1e7b593a822 100644
--- a/dev-java/gradle-bin/gradle-bin-6.8.3.ebuild
+++ b/dev-java/gradle-bin/gradle-bin-6.8.3.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://www.gradle.org/"
LICENSE="Apache-2.0"
SLOT="${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
DEPEND="app-eselect/eselect-gradle"
BDEPEND="app-arch/unzip"
diff --git a/dev-java/gradle-bin/gradle-bin-7.1.1.ebuild b/dev-java/gradle-bin/gradle-bin-7.1.1.ebuild
index dfbd1549205..1e7b593a822 100644
--- a/dev-java/gradle-bin/gradle-bin-7.1.1.ebuild
+++ b/dev-java/gradle-bin/gradle-bin-7.1.1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://www.gradle.org/"
LICENSE="Apache-2.0"
SLOT="${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
DEPEND="app-eselect/eselect-gradle"
BDEPEND="app-arch/unzip"
diff --git a/dev-java/gradle-bin/gradle-bin-7.3.ebuild b/dev-java/gradle-bin/gradle-bin-7.3.3.ebuild
index dfbd1549205..dfbd1549205 100644
--- a/dev-java/gradle-bin/gradle-bin-7.3.ebuild
+++ b/dev-java/gradle-bin/gradle-bin-7.3.3.ebuild
diff --git a/dev-java/gson/gson-2.8.8.ebuild b/dev-java/gson/gson-2.8.8.ebuild
index d8e2d41c924..ae03a8f412f 100644
--- a/dev-java/gson/gson-2.8.8.ebuild
+++ b/dev-java/gson/gson-2.8.8.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:
@@ -13,11 +13,12 @@ JAVA_TESTING_FRAMEWORKS="junit-4"
inherit java-pkg-2 java-pkg-simple
DESCRIPTION="Gson JSON library"
-HOMEPAGE="https://github.com/google/gson/gson"
+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 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
# Compile dependencies
# POM: ${PN}/pom.xml
@@ -54,3 +55,11 @@ 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/guava/Manifest b/dev-java/guava/Manifest
index 0b9dae4eb85..23aa6042585 100644
--- a/dev-java/guava/Manifest
+++ b/dev-java/guava/Manifest
@@ -1 +1,2 @@
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
new file mode 100644
index 00000000000..91ac8943a4b
--- /dev/null
+++ b/dev-java/guava/guava-20.0-r1.ebuild
@@ -0,0 +1,36 @@
+# 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
index ef48f5e71bc..b81b0b0497d 100644
--- a/dev-java/guava/guava-20.0.ebuild
+++ b/dev-java/guava/guava-20.0.ebuild
@@ -13,7 +13,7 @@ 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"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
CP_DEPEND="
dev-java/animal-sniffer-annotations:0
diff --git a/dev-java/guava/guava-30.1.1.ebuild b/dev-java/guava/guava-30.1.1.ebuild
new file mode 100644
index 00000000000..339f4b0e446
--- /dev/null
+++ b/dev-java/guava/guava-30.1.1.ebuild
@@ -0,0 +1,58 @@
+# 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://codeload.github.com/google/guava/tar.gz/refs/tags/v30.1.1 --slot 0 --keywords "" --ebuild guava-30.1.1.ebuild
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source"
+#JAVA_TESTING_FRAMEWORKS="junit-5"
+MAVEN_ID="com.google.guava:guava:${PV}-jre"
+
+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://codeload.github.com/google/guava/tar.gz/v${PV} -> ${P}.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
+
+# Common dependencies
+# POM: pom.xml
+# com.google.code.findbugs:jsr305:3.0.2 -> !!!groupId-not-found!!!
+# com.google.errorprone:error_prone_annotations:2.5.1 -> >=dev-java/error-prone-annotations-2.7.1:0
+# com.google.guava:failureaccess:1.0.1 -> >=dev-java/failureaccess-30.1.1:0
+# com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava -> !!!artifactId-not-found!!!
+# com.google.j2objc:j2objc-annotations:1.3 -> !!!groupId-not-found!!!
+# org.checkerframework:checker-qual:3.8.0 -> >=dev-java/checker-framework-qual-3.14.0:0
+
+CDEPEND="
+ >=dev-java/error-prone-annotations-2.7.1:0
+ >=dev-java/failureaccess-30.1.1:0
+ dev-java/jsr305:0
+"
+
+DEPEND="
+ >=dev-java/checker-framework-qual-3.14.0:0
+ dev-java/j2objc-annotations:0
+ >=virtual/jdk-1.8:*
+ ${CDEPEND}
+"
+
+RDEPEND=">=virtual/jre-1.8:*
+ ${CDEPEND}
+"
+
+S="${WORKDIR}/${P}"
+
+JAVA_GENTOO_CLASSPATH="error-prone-annotations,failureaccess,jsr305"
+
+src_configure() {
+ JAVA_GENTOO_CLASSPATH_EXTRA="$(java-pkg_getjars --build-only checker-framework-qual,j2objc-annotations)"
+}
+
+JAVA_SRC_DIR="${PN}/src"
+
+JAVA_TEST_SRC_DIR="${PN}-tests/"
diff --git a/dev-java/guice/guice-4.1.ebuild b/dev-java/guice/guice-4.1.ebuild
index 571a460abed..a73ec4a039f 100644
--- a/dev-java/guice/guice-4.1.ebuild
+++ b/dev-java/guice/guice-4.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/google/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="4"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
RESTRICT="test"
CP_DEPEND="dev-java/aopalliance:1
diff --git a/dev-java/hamcrest-core/hamcrest-core-1.3-r2.ebuild b/dev-java/hamcrest-core/hamcrest-core-1.3-r2.ebuild
index 627607d45aa..a8ef97c4a00 100644
--- a/dev-java/hamcrest-core/hamcrest-core-1.3-r2.ebuild
+++ b/dev-java/hamcrest-core/hamcrest-core-1.3-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
@@ -20,9 +20,7 @@ LICENSE="BSD-2"
SLOT="${PV}"
KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~ppc-macos ~x64-macos"
-DEPEND=">=virtual/jdk-1.8:*
- userland_GNU? ( sys-apps/findutils )"
-
+DEPEND=">=virtual/jdk-1.8:*"
RDEPEND=">=virtual/jre-1.8:*"
BDEPEND=">=dev-java/hamcrest-generator-${PV}:1.3"
diff --git a/dev-java/hamcrest-generator/hamcrest-generator-1.3-r3.ebuild b/dev-java/hamcrest-generator/hamcrest-generator-1.3-r3.ebuild
index 7afc1760f6b..bed740f60fb 100644
--- a/dev-java/hamcrest-generator/hamcrest-generator-1.3-r3.ebuild
+++ b/dev-java/hamcrest-generator/hamcrest-generator-1.3-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
@@ -22,7 +22,6 @@ KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~ppc-macos ~x64-macos"
CDEPEND="dev-java/qdox:1.12"
DEPEND=">=virtual/jdk-1.8:*
- userland_GNU? ( sys-apps/findutils )
${CDEPEND}"
RDEPEND=">=virtual/jre-1.8:*
diff --git a/dev-java/hamcrest-library/hamcrest-library-1.3-r2.ebuild b/dev-java/hamcrest-library/hamcrest-library-1.3-r2.ebuild
index afa5bc55ca5..3ab303aebbc 100644
--- a/dev-java/hamcrest-library/hamcrest-library-1.3-r2.ebuild
+++ b/dev-java/hamcrest-library/hamcrest-library-1.3-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
@@ -21,8 +21,7 @@ SLOT="${PV}"
KEYWORDS="amd64 ~arm arm64 ppc64 x86"
DEPEND="dev-java/hamcrest-core:${SLOT}
- >=virtual/jdk-1.8:*
- userland_GNU? ( sys-apps/findutils )"
+ >=virtual/jdk-1.8:*"
RDEPEND="dev-java/hamcrest-core:${SLOT}
>=virtual/jre-1.8:*"
BDEPEND=">=dev-java/hamcrest-generator-${PV}:1.3"
diff --git a/dev-java/hawtjni-runtime/hawtjni-runtime-1.15-r1.ebuild b/dev-java/hawtjni-runtime/hawtjni-runtime-1.15-r1.ebuild
index 7fe0b898a93..9c6ad50feb4 100644
--- a/dev-java/hawtjni-runtime/hawtjni-runtime-1.15-r1.ebuild
+++ b/dev-java/hawtjni-runtime/hawtjni-runtime-1.15-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/fusesource/hawtjni/archive/${MY_P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
DEPEND=">=virtual/jdk-1.8:*"
RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/httpcore/httpcore-4.4.14.ebuild b/dev-java/httpcore/httpcore-4.4.14.ebuild
index c208cb1c370..016fad82327 100644
--- a/dev-java/httpcore/httpcore-4.4.14.ebuild
+++ b/dev-java/httpcore/httpcore-4.4.14.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="mirror://apache/httpcomponents/httpcore/source/httpcomponents-core-${PV
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
# Compile dependencies
# POM: httpcore/pom.xml
diff --git a/dev-java/icedtea/Manifest b/dev-java/icedtea/Manifest
index 68c7092fb79..6adf8d98b5f 100644
--- a/dev-java/icedtea/Manifest
+++ b/dev-java/icedtea/Manifest
@@ -1,25 +1,3 @@
-DIST icedtea-3.18-aarch32-3.18.0.tar.xz 7057736 BLAKE2B bd681871da038ee1eaabe5c38e830a9d80fff30f8793b81afb69803107d0ee2ae8f3dad3985ec05c86120f1e3c86101984397476a76bce30a7b1852784175521 SHA512 3bc033bb4256d6a8ee8387998fbb4b1a14d2c6882337366085ca4648eb9b2a34176003e23e420703a075fb5322a1be3547d5ed82188d97e1f12429b4a8b3671d
-DIST icedtea-3.18-corba-3.18.0.tar.xz 948504 BLAKE2B 00deb77d5aebf19ad404bf44ac7367017f8aee6699e11b93d2cb44f7d23f17f13caba8aee9862b25e528bee3d8fbfa728260850d1aa2f66839b079b1111d3af4 SHA512 db71a9fd6288a8217a8338dda70a87eb4b97f1659c7e990eccd2774785bf1da9e35b71e231e108c610784922d1fa01cdaf115941189910ef9c68cf70746296ea
-DIST icedtea-3.18-hotspot-3.18.0.tar.xz 7110964 BLAKE2B ac45a7271f50a93b0ee27e6096820f3f93a02db42c6fde549515c3297590c94fff349a6cec5c9caf7bda31bbe36d6609097b4f73e99cdc1fe46bcfff0330a82e SHA512 abc46441c6ea7f652ee42376425e2fdd34a18de0803a13f38aa002a57a2835f8e2995f9a762fb53f114ad7b1030fc9ab82bd00839fccf57315018519df1c5c5f
-DIST icedtea-3.18-jaxp-3.18.0.tar.xz 2268136 BLAKE2B 6f398420e55684792020da116f8da25e1b4a59b2423d6b37ed55a567ba68aedca7a59c99ee0e3a87785a12910b518d07a9d0d248bb3ae151f81c7622ec904299 SHA512 fe8d25e38d05e0f65f91712ee7e4b6469605c9a6bd9b0cbdd29f483889b267483008fb913191ffa277047a66ad43eb397582935d984fad00e469b118532a1adf
-DIST icedtea-3.18-jaxws-3.18.0.tar.xz 2277356 BLAKE2B f0c3123722df57346461940f41e6b394a34c9e508ab3d2fa9f75581d4d626468394e2854129671e9bd68ecd217ed3aa0933cd14e2e74acd82d1cccd897e2b209 SHA512 b6879bdab06d1706945960b64f8dcff5ee8e81b95a733807768a0c2a5f329967e671d760a64239a42d6d5f9bf55b2904bf67082a4cd01ca5656bc323b041ff19
-DIST icedtea-3.18-jdk-3.18.0.tar.xz 40637140 BLAKE2B de565a2ba7cdb3732a551aa513cac3f52bf330590e011c6b05d47da1cee8389315ba3eb8112ce3c3d0510a049c49c147ea3a474eaadf70535fe30f63576fa293 SHA512 022115dbfc9ab7217a74b10e347a6a3a5eaa1112fef53cb37ff9dc003ec5bd3018b5b0bf675465d1c496e57b9b177102c6fef135acc881f3db49bea51c4f7375
-DIST icedtea-3.18-langtools-3.18.0.tar.xz 2080068 BLAKE2B e2781cc6728594a6c5e8dd213c810ae7fbed8d365da6db600e75b5786573b3d201cb0c3ed10221de1c139fe7ed55b59e57c47927272374e32ae94e586d6f0f9d SHA512 d96ded5041e488860baf1c17346e9342fb086e999fbf5d5a4dd5be97e0db17771f594c60f584d549d7ce1b4e1aa58b165a32f0633101bb70ea5c2d77758bb42b
-DIST icedtea-3.18-nashorn-3.18.0.tar.xz 2323912 BLAKE2B ab0c7dc3635a6eb7feb350d56c0fd5e03b36b60b107b26dbb04262291c4c0d57077bff5f7d949d95ec1de04210e06f40600d360600db09421f1dc0f801968817 SHA512 2bd488893ac33a16480cceb16fab62c11f8032e68d84818ad20aaa4c3928af6c77c60f8bd94878aa02b703e0302847272688d8641145972071c4e9a048cd5a13
-DIST icedtea-3.18-openjdk-3.18.0.tar.xz 364932 BLAKE2B 098ae1025f0457e14a4afc7b67ad6063f99be5fa486a2f6e187e490fe7b87efbf1cdc6fad2b33f7ae4f92817d5a0410254c723853a2519dacb5c21961c4d7558 SHA512 b4b40d19bb12ae85d68b110eb51051c089a9b7e857eceb10429b609a9f11671cbee34cfcef5c89ef23ad6aea80e4bcad1ed085fb310e09942816c5dccc8f171d
-DIST icedtea-3.18-shenandoah-3.18.0.tar.xz 7279864 BLAKE2B 1d8cfccda9cf24a5522862634d3699a7bd9cd445da7a08ab2061da45ddb885e023d56c096813710ef4f7ddb458300737bae21a56900bfb00e3ed5ac696af2059 SHA512 f8c5d4f108a3575f154a462e8cf907c14fbcdfc95708ebabbf530a79cc66979cc7e141cd239d6603e4a47d114130b07e6f32edb9145930e573a239fa0c91e75b
-DIST icedtea-3.18.0.tar.xz 1565468 BLAKE2B e6bffb9860ae8824a96e55970056025bc426453c26f91a7eb52f01f5ada7c0cb0bdcc4efa503186f514759f914d9053d08ba540bde7d15be81736037ce5d8db5 SHA512 e94c365513e5fa8a17d61fe7957db85018510567df9ba115c9bca98c658257ff1f4dff7967e88b73088630f07670beeaa8cbe49706d6bd02fb2804abad5d95b1
-DIST icedtea-3.19-aarch32-3.19.0.tar.xz 7199408 BLAKE2B c079eb55ca198f2d34b73e6ef80f1507e50e9ad2140d1af86c64da54e6b85d1345fed347d207205806a86728afde37ab3ae13830625da4d488d6db4bc841ff28 SHA512 9f364c0d51eb57168009ca08d74b598e553885d42f11df0fc1ac563e6a5234207a85fddf3fe315b3ac4cbdf8b50bcfdfd1bbb4fdea5e6f8b6988624cbe6c0b33
-DIST icedtea-3.19-corba-3.19.0.tar.xz 948912 BLAKE2B 888443236851c96934f9513ae28e1908cb49d4fc211426f78ddf9a31a9815c382d38a196ddc69c7e9573b840fc5533c95a55ded3a3bc3d6f55a8d25ac2587fea SHA512 9127268d519dd95fc5eeb6904b54dab3bb5472610e26c2b691a7306d25169dc82ce6de26ec3fe396a7f19726f73c5597fbf79d33027d905a3a1533316c4a3f1a
-DIST icedtea-3.19-hotspot-3.19.0.tar.xz 7113752 BLAKE2B 4a5603e64e4df6e7e0beebc762bc73868d736367540dac332196e736e1de371b63c9f3b7f1c167450536b6e195befee10136515027774fde789e90ade198020e SHA512 5995a905f9e886d9b2138f112ad9e03ce580f646f58601e354ebc5e0f2fc3f37b61847e64f258e9c31ab479e0e617604fb21d990c33b906d4cd1853fe9f1a0fa
-DIST icedtea-3.19-jaxp-3.19.0.tar.xz 2267888 BLAKE2B b64d615813e42e55eafda4374a8959b24b47614a158dc88d4ff188c09d6cc6f6d23ec6ae613ebdc52bd7fc02bcd8b96e517f163bf397b94eb36e68af9f7a7285 SHA512 78cfb56662e6b76632b746ff3b53496a7fa82daf2fe24d0988eda0552758f6c71d434ececd50fc7baf2e4e8a03b4febe8d489b2b6e1ac791c07170d72f7a881e
-DIST icedtea-3.19-jaxws-3.19.0.tar.xz 2277616 BLAKE2B 5fbca1daed96ef603e9605b9d2565c0a6be92771c862bda45c8cb532cd493d9f1e46f008a070ff6276ba68378427e5e82d0f5efd6a1098db7ff14a29a5854d1a SHA512 fca97468d4e73f7b5d345edf35422ea5a417cba2d1441656d2ab2ffdeb814a2641c2bc732b8e76a9a62566f95e1ef2a2d6281a3a6f8bffa900549f6ed6e86444
-DIST icedtea-3.19-jdk-3.19.0.tar.xz 40689020 BLAKE2B f85005bef6d2c22b57fffe5b403278dfd18b8a244da0b8e4f6d7ce574dd2d14da453d14ec02c131697b639f8155962755ef924690ae9fb5aa302ba84bf140a56 SHA512 aa8fdb3d2f43a54bc39f9f243392fcf161d3ad0f568681f0baccc8c99ab667d621b905fd4f32b0787107ab70f402978e0cf06b364a625c05a8358e86c0080a14
-DIST icedtea-3.19-langtools-3.19.0.tar.xz 2080888 BLAKE2B 06d9a2efb9bbad4e47b8f3f19d6b51eae5bc88b652175fe7a8fa98e72fc01a547c1db4efef7e0c2f9b8d0e27ba8f6f4b9ff6fe59197da39bdb8b77c60cec4057 SHA512 b96e24fe6e03e3522f3ccab956539fc518f9d4fd24d0c476c42c76fac1adee7cc367f9ca451f6dc97877f5bc28bc5d8810fedddf69548781c6429cae348ab736
-DIST icedtea-3.19-nashorn-3.19.0.tar.xz 2326776 BLAKE2B 5dfb09fffbec8f36eccaa81cea8e539004f523c35eef566330c9067f1136f54e4aa313bddc3093e3ec17a7d2d37298f92750286a6f601ce9bf4dbe6ed9f77ff5 SHA512 d831c844c5cf5fb778cf34f25dca855ba7c7dea9d72c6b59b402a7e19e3d3a2b7aa5b57d218f549aa82c1a1a733f450c3ed78820b2930e1c7d17eb08dd9dec7a
-DIST icedtea-3.19-openjdk-3.19.0.tar.xz 365128 BLAKE2B 8abc4d77d961810df0ac8a1c5fcc4eea0e0cc888b4471b987d708569116cba4871d37fdb9e7d115f5b2bb387e73e71593e04bad2d3ed2e33ab2938192251506a SHA512 90dea98d26279a5d0a5869a8d53234bc27a4fdcb0682ebc3baba1670ccca2035e41d24d0d67a7ee5d9304058516136c11177eb8190edb35f03ce8b8f63e56357
-DIST icedtea-3.19-shenandoah-3.19.0.tar.xz 7286788 BLAKE2B d1df26c9c25930a19ad1acad3c3a7b249456c1732981b5aa9f77f847c7e0c53010a7eea646ea0b63293985af238309c72320b0ac71678c0ca88c211d2adb601d SHA512 7db3b3f9c3e42fef50f1a84e9db1d1c2b5322f15ea26e7f0bcbbae8011365faf7f0ad4bf0bcf861c2d5eb1fe2845d57f9355b1b2e0203558f47a3564ae4709a0
-DIST icedtea-3.19.0.tar.xz 1568996 BLAKE2B 0ded447c674aa5dbfba690652de474b13f2107c221e0a7a9d98912ac374efbd44093c482abc5e4d4dcde0f9712020d8bdd9de98b347145217e719edf801e9afc SHA512 27d7c4c8e025a2c9320c0a47f3c521f51b49bf55d021c7a08aea9b7cb3d522cfc3e10d438b837669eeb5d427e950e7643c5ce4f817567d5e9fe39b56cdce8835
DIST icedtea-3.21-aarch32-3.21.0.tar.xz 7207712 BLAKE2B bb9001aa31011fd0b29141caa1ba48344f2ca08e5dbe69cb3501a4830886d02b7a8782336a84273aad2ea721f26db2d3f51cdc72a9eccde1ad45a2790fb2caf1 SHA512 fc44c3c59164f6904ad92e04cb8023f39e82d6a2704fb5a91bf84d41066183ca6140273fa4c13d08a0dda47f263bd2d7d5138a5c45f205c58f649e6b87f15a9e
DIST icedtea-3.21-corba-3.21.0.tar.xz 949700 BLAKE2B b845a46b5dcb22545073f894fbc5464e014f8f0e02e0cc66bccda0db6bd5566908a886823189ecf476847adb7f3fa5c009814e54c69d65a3a4a6c3cfc692564d SHA512 55110b92c6eddeb29eab97cbe644d8cc171a489b9fa806c81e4af88a1e5e3e6776fb97371715782935222944464f68e7d6783c46bd0d0de5659123f46c577a7a
DIST icedtea-3.21-hotspot-3.21.0.tar.xz 7121192 BLAKE2B 64813c6a71405c5c093792dadf8613361a056b590fa4fa7453887ac5eb1eda1da63777a2f1e529e50eefe033d6f7f757d3235d53ba8f0f45d40dad6f0c215334 SHA512 678f6c53db5858ba828e063eeeddb727dbeb0586ff26a4287f9735dc01ad00ddcd9f41fa65343b81d5f5c512a944f47a447d4bdc929ca26ba78a68a7e3dfc1cd
diff --git a/dev-java/icedtea/icedtea-3.18.0.ebuild b/dev-java/icedtea/icedtea-3.18.0.ebuild
deleted file mode 100644
index 8adf0db21c7..00000000000
--- a/dev-java/icedtea/icedtea-3.18.0.ebuild
+++ /dev/null
@@ -1,385 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)
-
-# *********************************************************
-# * IF YOU CHANGE THIS EBUILD, CHANGE ICEDTEA-6.* AS WELL *
-# *********************************************************
-
-EAPI=6
-SLOT="8"
-
-inherit check-reqs eapi7-ver flag-o-matic java-pkg-2 java-vm-2 multiprocessing pax-utils prefix toolchain-funcs xdg-utils
-
-ICEDTEA_VER=$(ver_cut 1-3)
-ICEDTEA_BRANCH=$(ver_cut 1-2)
-ICEDTEA_PKG=icedtea-${ICEDTEA_VER}
-
-CORBA_TARBALL="${PV}.tar.xz"
-JAXP_TARBALL="${PV}.tar.xz"
-JAXWS_TARBALL="${PV}.tar.xz"
-JDK_TARBALL="${PV}.tar.xz"
-LANGTOOLS_TARBALL="${PV}.tar.xz"
-OPENJDK_TARBALL="${PV}.tar.xz"
-NASHORN_TARBALL="${PV}.tar.xz"
-HOTSPOT_TARBALL="${PV}.tar.xz"
-SHENANDOAH_TARBALL="${PV}.tar.xz"
-AARCH32_TARBALL="${PV}.tar.xz"
-
-CACAO_TARBALL="cacao-c182f119eaad.tar.xz"
-JAMVM_TARBALL="jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz"
-
-CORBA_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-corba-${CORBA_TARBALL}"
-JAXP_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-jaxp-${JAXP_TARBALL}"
-JAXWS_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-jaxws-${JAXWS_TARBALL}"
-JDK_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-jdk-${JDK_TARBALL}"
-LANGTOOLS_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-langtools-${LANGTOOLS_TARBALL}"
-OPENJDK_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-openjdk-${OPENJDK_TARBALL}"
-NASHORN_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-nashorn-${NASHORN_TARBALL}"
-HOTSPOT_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-hotspot-${HOTSPOT_TARBALL}"
-SHENANDOAH_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-shenandoah-${SHENANDOAH_TARBALL}"
-AARCH32_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-aarch32-${AARCH32_TARBALL}"
-
-CACAO_GENTOO_TARBALL="icedtea-${CACAO_TARBALL}"
-JAMVM_GENTOO_TARBALL="icedtea-${JAMVM_TARBALL}"
-
-DROP_URL="https://icedtea.classpath.org/download/drops"
-ICEDTEA_URL="${DROP_URL}/icedtea${SLOT}/${ICEDTEA_VER}"
-
-DESCRIPTION="A harness to build OpenJDK using Free Software build tools and dependencies"
-HOMEPAGE="https://icedtea.classpath.org"
-SRC_PKG="${ICEDTEA_PKG}.tar.xz"
-SRC_URI="
- https://icedtea.classpath.org/download/source/${SRC_PKG}
- ${ICEDTEA_URL}/openjdk.tar.xz -> ${OPENJDK_GENTOO_TARBALL}
- ${ICEDTEA_URL}/corba.tar.xz -> ${CORBA_GENTOO_TARBALL}
- ${ICEDTEA_URL}/jaxp.tar.xz -> ${JAXP_GENTOO_TARBALL}
- ${ICEDTEA_URL}/jaxws.tar.xz -> ${JAXWS_GENTOO_TARBALL}
- ${ICEDTEA_URL}/jdk.tar.xz -> ${JDK_GENTOO_TARBALL}
- ${ICEDTEA_URL}/hotspot.tar.xz -> ${HOTSPOT_GENTOO_TARBALL}
- ${ICEDTEA_URL}/nashorn.tar.xz -> ${NASHORN_GENTOO_TARBALL}
- ${ICEDTEA_URL}/langtools.tar.xz -> ${LANGTOOLS_GENTOO_TARBALL}
- shenandoah? ( ${ICEDTEA_URL}/shenandoah.tar.xz -> ${SHENANDOAH_GENTOO_TARBALL} )
- arm? ( ${ICEDTEA_URL}/aarch32.tar.xz -> ${AARCH32_GENTOO_TARBALL} )
- ${DROP_URL}/cacao/${CACAO_TARBALL} -> ${CACAO_GENTOO_TARBALL}
- ${DROP_URL}/jamvm/${JAMVM_TARBALL} -> ${JAMVM_GENTOO_TARBALL}"
-
-LICENSE="Apache-1.1 Apache-2.0 GPL-1 GPL-2 GPL-2-with-linking-exception LGPL-2 MPL-1.0 MPL-1.1 public-domain W3C"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-
-IUSE="+alsa cacao +cups doc examples +gtk headless-awt
- jamvm +jbootstrap kerberos pax-kernel +pch
- pulseaudio sctp selinux shenandoah smartcard +source +system-lcms test zero"
-
-RESTRICT="!test? ( test )"
-REQUIRED_USE="gtk? ( !headless-awt )"
-
-# Ideally the following were optional at build time.
-ALSA_COMMON_DEP=">=media-libs/alsa-lib-1.0"
-CUPS_COMMON_DEP=">=net-print/cups-1.2.12"
-
-X_COMMON_DEP="
- >=media-libs/giflib-4.1.6:0=
- >=media-libs/libpng-1.2:0=
- >=x11-libs/libX11-1.1.3
- >=x11-libs/libXext-1.1.1
- >=x11-libs/libXi-1.1.3
- >=x11-libs/libXrender-0.9.4
- >=x11-libs/libXtst-1.0.3
- x11-libs/libXcomposite
-"
-
-X_DEPEND="
- x11-base/xorg-proto
- >=x11-libs/libXau-1.0.3
- >=x11-libs/libXdmcp-1.0.2
- >=x11-libs/libXinerama-1.0.2
-"
-
-# The Javascript requirement is obsolete; OpenJDK 8+ has Nashorn
-COMMON_DEP="
- >=dev-libs/glib-2.26:2=
- >=dev-util/systemtap-1
- media-libs/fontconfig:1.0=
- >=media-libs/freetype-2.5.3:2=
- >=sys-libs/zlib-1.2.3
- virtual/jpeg:0=
- gtk? (
- >=dev-libs/atk-1.30.0
- >=x11-libs/cairo-1.8.8
- x11-libs/gdk-pixbuf:2
- >=x11-libs/gtk+-2.8:2
- >=x11-libs/pango-1.24.5
- )
- kerberos? ( virtual/krb5 )
- sctp? ( net-misc/lksctp-tools )
- smartcard? ( sys-apps/pcsc-lite )
- system-lcms? ( >=media-libs/lcms-2.9:2= )
-"
-
-RDEPEND="${COMMON_DEP}
- !dev-java/icedtea:0
- !dev-java/icedtea-web:7
- >=gnome-base/gsettings-desktop-schemas-3.12.2
- >=sys-apps/baselayout-java-0.1.0-r1
- virtual/ttf-fonts
- alsa? ( ${ALSA_COMMON_DEP} )
- cups? ( ${CUPS_COMMON_DEP} )
- !headless-awt? ( ${X_COMMON_DEP} )
- selinux? ( sec-policy/selinux-java )
-"
-
-# perl is needed for running the SystemTap tests and the bootstrap javac
-# lsb-release is used to obtain distro information for the version & crash dump output
-# attr is needed for xattr.h which defines the extended attribute syscalls used by NIO2
-# x11-libs/libXt is needed for headers only (Intrinsic.h, IntrinsicP.h, Shell.h, StringDefs.h)
-# Ant is no longer needed under the new build system
-DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP} ${CUPS_COMMON_DEP} ${X_COMMON_DEP} ${X_DEPEND}
- || (
- dev-java/openjdk-bin:8
- dev-java/openjdk:8
- dev-java/icedtea-bin:8
- dev-java/icedtea:8
- )
- app-arch/cpio
- app-arch/unzip
- app-arch/zip
- app-misc/ca-certificates
- dev-lang/perl
- dev-libs/openssl:0
- sys-apps/attr
- sys-apps/lsb-release
- x11-libs/libXt
- virtual/pkgconfig
- pax-kernel? ( sys-apps/elfix )"
-
-PDEPEND="pulseaudio? ( dev-java/icedtea-sound )"
-
-S="${WORKDIR}"/${ICEDTEA_PKG}
-
-icedtea_check_requirements() {
- local CHECKREQS_DISK_BUILD
-
- if use doc; then
- CHECKREQS_DISK_BUILD="9000M"
- else
- CHECKREQS_DISK_BUILD="8500M"
- fi
-
- check-reqs_pkg_${EBUILD_PHASE}
-}
-
-pkg_pretend() {
- icedtea_check_requirements
-}
-
-pkg_setup() {
- icedtea_check_requirements
-
- JAVA_PKG_WANT_BUILD_VM="
- openjdk-8 openjdk-bin-8
- icedtea-8 icedtea-bin-8"
- JAVA_PKG_WANT_SOURCE="1.5"
- JAVA_PKG_WANT_TARGET="1.5"
-
- java-vm-2_pkg_setup
- java-pkg-2_pkg_setup
-}
-
-src_unpack() {
- unpack ${SRC_PKG}
-}
-
-src_configure() {
- # GCC10/-fno-common handling, #723102
- if [[ $(gcc-major-version) -ge 10 ]]; then
- append-flags -fcommon
- append-flags -fno-delete-null-pointer-checks -fno-lifetime-dse
- fi
- # this patch helps with gcc10 as well
- # since build system unpacks tarballs itself, this is a way to force makefile
- # to apply our patch. it expects relative path inside source, so we can't specify
- # ${FILESDIR} directly.
- mkdir -v gentoo_patches || die
- cp -v "${FILESDIR}/openjdk-8-hotspot-arrayallocator.patch" gentoo_patches || die
- export DISTRIBUTION_PATCHES="gentoo_patches//openjdk-8-hotspot-arrayallocator.patch"
-
- # For bootstrap builds as the sandbox control file might not yet exist.
- addpredict /proc/self/coredump_filter #nowarn
-
- # icedtea doesn't like some locales. #330433 #389717
- export LANG="C" LC_ALL="C"
-
- local cacao_config config hotspot_port hs_config jamvm_config use_cacao use_jamvm use_zero zero_config
- local vm=$(java-pkg_get-current-vm)
-
- # gcj-jdk ensures ecj is present.
- if use jbootstrap || has "${vm}" gcj-jdk; then
- use jbootstrap || einfo "bootstrap is necessary when building with ${vm}, ignoring USE=\"-jbootstrap\""
- config+=" --enable-bootstrap"
- else
- config+=" --disable-bootstrap"
- fi
-
- # Use Zero if requested
- if use zero; then
- use_zero="yes"
- fi
-
- # Use JamVM if requested
- if use jamvm; then
- use_jamvm="yes"
- fi
-
- # Use CACAO if requested
- if use cacao; then
- use_cacao="yes"
- fi
-
- # Are we on a architecture with a HotSpot port?
- # In-tree JIT ports are available for amd64, arm, arm64, ppc64 (be&le), SPARC and x86.
- if { use amd64 || use arm || use arm64 || use ppc64 || use sparc || use x86; }; then
- hotspot_port="yes"
- # Work around stack alignment issue, bug #647954.
- use x86 && append-flags -mincoming-stack-boundary=2
- fi
-
- # Always use HotSpot as the primary VM if available. #389521 #368669 #357633 ...
- # Otherwise use Zero for now until alternate VMs are working
- if test "x${hotspot_port}" != "xyes"; then
- use_zero="yes"
- fi
-
- if use shenandoah; then
- if { use amd64 || use arm64; }; then
- hs_config="--with-hotspot-build=shenandoah"
- hs_config+=" --with-hotspot-src-zip="${DISTDIR}/${SHENANDOAH_GENTOO_TARBALL}""
- else
- eerror "Shenandoah is only supported on arm64 and x86_64. Please re-build with USE="-shenandoah""
- fi
- else
- if use arm ; then
- hs_config="--with-hotspot-src-zip="${DISTDIR}/${AARCH32_GENTOO_TARBALL}""
- else
- hs_config="--with-hotspot-src-zip="${DISTDIR}/${HOTSPOT_GENTOO_TARBALL}""
- fi
- fi
-
- # Turn on JamVM if needed (non-HS archs) or requested
- if test "x${use_jamvm}" = "xyes"; then
- if test "x${hotspot_port}" = "xyes"; then
- ewarn 'Enabling JamVM on an architecture with HotSpot support; issues may result.'
- ewarn 'If so, please rebuild with USE="-jamvm"'
- fi
- ewarn 'JamVM is known to still have issues with IcedTea 3.x; please rebuild with USE="-jamvm"'
- jamvm_config="--enable-jamvm"
- fi
-
- # Turn on CACAO if needed (non-HS archs) or requested
- if test "x${use_cacao}" = "xyes"; then
- if test "x${hotspot_port}" = "xyes"; then
- ewarn 'Enabling CACAO on an architecture with HotSpot support; issues may result.'
- ewarn 'If so, please rebuild with USE="-cacao"'
- fi
- ewarn 'CACAO is known to still have issues with IcedTea 3.x; please rebuild with USE="-cacao"'
- cacao_config="--enable-cacao"
- fi
-
- # Turn on Zero if needed (non-HS/CACAO archs) or requested
- if test "x${use_zero}" = "xyes"; then
- if test "x${hotspot_port}" = "xyes"; then
- ewarn 'Enabling Zero on an architecture with HotSpot support; performance will be significantly reduced.'
- fi
- zero_config="--enable-zero"
- fi
-
- # PaX breaks pch, bug #601016
- if use pch && ! host-is-pax; then
- config+=" --enable-precompiled-headers"
- else
- config+=" --disable-precompiled-headers"
- fi
-
- config+=" --with-parallel-jobs=$(makeopts_jobs)"
-
- unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS
-
- # force bash for now https://bugs.gentoo.org/722292
- CONFIG_SHELL="${EPREFIX}/bin/bash" econf ${config} \
- --with-openjdk-src-zip="${DISTDIR}/${OPENJDK_GENTOO_TARBALL}" \
- --with-corba-src-zip="${DISTDIR}/${CORBA_GENTOO_TARBALL}" \
- --with-jaxp-src-zip="${DISTDIR}/${JAXP_GENTOO_TARBALL}" \
- --with-jaxws-src-zip="${DISTDIR}/${JAXWS_GENTOO_TARBALL}" \
- --with-jdk-src-zip="${DISTDIR}/${JDK_GENTOO_TARBALL}" \
- --with-langtools-src-zip="${DISTDIR}/${LANGTOOLS_GENTOO_TARBALL}" \
- --with-nashorn-src-zip="${DISTDIR}/${NASHORN_GENTOO_TARBALL}" \
- --with-cacao-src-zip="${DISTDIR}/${CACAO_GENTOO_TARBALL}" \
- --with-jamvm-src-zip="${DISTDIR}/${JAMVM_GENTOO_TARBALL}" \
- --with-jdk-home="$(java-config -O)" \
- --prefix="${EPREFIX}/usr/$(get_libdir)/icedtea${SLOT}" \
- --mandir="${EPREFIX}/usr/$(get_libdir)/icedtea${SLOT}/man" \
- --with-pkgversion="Gentoo ${PF}" \
- --disable-ccache \
- --disable-downloading --disable-Werror --disable-tests \
- --disable-systemtap-tests --enable-improved-font-rendering \
- --enable-system-jpeg --enable-system-zlib \
- $(use_enable headless-awt headless) \
- $(use_enable !headless-awt system-gif) \
- $(use_enable !headless-awt system-png) \
- $(use_enable doc docs) \
- $(use_enable kerberos system-kerberos) \
- $(use_enable system-lcms) \
- $(use_with pax-kernel pax "${EPREFIX}/usr/sbin/paxmark.sh") \
- $(use_enable sctp system-sctp) \
- $(use_enable smartcard system-pcsc) \
- ${zero_config} ${cacao_config} ${jamvm_config} ${hs_config}
-}
-
-src_compile() {
- default
-}
-
-src_test() {
- default
-}
-
-src_install() {
- default
-
- local dest="/usr/$(get_libdir)/icedtea${SLOT}"
- local ddest="${ED}${dest#/}"
-
- if ! use alsa; then
- rm -v "${ddest}"/jre/lib/$(get_system_arch)/libjsoundalsa.* || die
- fi
-
- if ! use examples; then
- rm -r "${ddest}"/demo "${ddest}"/sample || die
- fi
-
- if ! use source; then
- rm -v "${ddest}"/src.zip || die
- fi
-
- dosym ../../../usr/share/doc/"${PF}" usr/share/doc/"${PN}${SLOT}"
-
- # Fix the permissions.
- find "${ddest}" \! -type l \( -perm /111 -exec chmod 755 {} \; -o -exec chmod 644 {} \; \) || die
-
- dosym ../../../../../../etc/ssl/certs/java/cacerts "${dest}"/jre/lib/security/cacerts
-
- java-vm_install-env "${FILESDIR}/icedtea.env.sh"
- java-vm_sandbox-predict /proc/self/coredump_filter
-}
-
-pkg_postinst() {
- xdg_icon_cache_update
- java-vm-2_pkg_postinst
- einfo "JavaWebStart functionality provided by icedtea-web package"
-}
-
-pkg_postrm() {
- xdg_icon_cache_update
- java-vm-2_pkg_postrm
-}
diff --git a/dev-java/icedtea/icedtea-3.19.0.ebuild b/dev-java/icedtea/icedtea-3.19.0.ebuild
deleted file mode 100644
index 8adf0db21c7..00000000000
--- a/dev-java/icedtea/icedtea-3.19.0.ebuild
+++ /dev/null
@@ -1,385 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)
-
-# *********************************************************
-# * IF YOU CHANGE THIS EBUILD, CHANGE ICEDTEA-6.* AS WELL *
-# *********************************************************
-
-EAPI=6
-SLOT="8"
-
-inherit check-reqs eapi7-ver flag-o-matic java-pkg-2 java-vm-2 multiprocessing pax-utils prefix toolchain-funcs xdg-utils
-
-ICEDTEA_VER=$(ver_cut 1-3)
-ICEDTEA_BRANCH=$(ver_cut 1-2)
-ICEDTEA_PKG=icedtea-${ICEDTEA_VER}
-
-CORBA_TARBALL="${PV}.tar.xz"
-JAXP_TARBALL="${PV}.tar.xz"
-JAXWS_TARBALL="${PV}.tar.xz"
-JDK_TARBALL="${PV}.tar.xz"
-LANGTOOLS_TARBALL="${PV}.tar.xz"
-OPENJDK_TARBALL="${PV}.tar.xz"
-NASHORN_TARBALL="${PV}.tar.xz"
-HOTSPOT_TARBALL="${PV}.tar.xz"
-SHENANDOAH_TARBALL="${PV}.tar.xz"
-AARCH32_TARBALL="${PV}.tar.xz"
-
-CACAO_TARBALL="cacao-c182f119eaad.tar.xz"
-JAMVM_TARBALL="jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz"
-
-CORBA_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-corba-${CORBA_TARBALL}"
-JAXP_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-jaxp-${JAXP_TARBALL}"
-JAXWS_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-jaxws-${JAXWS_TARBALL}"
-JDK_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-jdk-${JDK_TARBALL}"
-LANGTOOLS_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-langtools-${LANGTOOLS_TARBALL}"
-OPENJDK_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-openjdk-${OPENJDK_TARBALL}"
-NASHORN_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-nashorn-${NASHORN_TARBALL}"
-HOTSPOT_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-hotspot-${HOTSPOT_TARBALL}"
-SHENANDOAH_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-shenandoah-${SHENANDOAH_TARBALL}"
-AARCH32_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-aarch32-${AARCH32_TARBALL}"
-
-CACAO_GENTOO_TARBALL="icedtea-${CACAO_TARBALL}"
-JAMVM_GENTOO_TARBALL="icedtea-${JAMVM_TARBALL}"
-
-DROP_URL="https://icedtea.classpath.org/download/drops"
-ICEDTEA_URL="${DROP_URL}/icedtea${SLOT}/${ICEDTEA_VER}"
-
-DESCRIPTION="A harness to build OpenJDK using Free Software build tools and dependencies"
-HOMEPAGE="https://icedtea.classpath.org"
-SRC_PKG="${ICEDTEA_PKG}.tar.xz"
-SRC_URI="
- https://icedtea.classpath.org/download/source/${SRC_PKG}
- ${ICEDTEA_URL}/openjdk.tar.xz -> ${OPENJDK_GENTOO_TARBALL}
- ${ICEDTEA_URL}/corba.tar.xz -> ${CORBA_GENTOO_TARBALL}
- ${ICEDTEA_URL}/jaxp.tar.xz -> ${JAXP_GENTOO_TARBALL}
- ${ICEDTEA_URL}/jaxws.tar.xz -> ${JAXWS_GENTOO_TARBALL}
- ${ICEDTEA_URL}/jdk.tar.xz -> ${JDK_GENTOO_TARBALL}
- ${ICEDTEA_URL}/hotspot.tar.xz -> ${HOTSPOT_GENTOO_TARBALL}
- ${ICEDTEA_URL}/nashorn.tar.xz -> ${NASHORN_GENTOO_TARBALL}
- ${ICEDTEA_URL}/langtools.tar.xz -> ${LANGTOOLS_GENTOO_TARBALL}
- shenandoah? ( ${ICEDTEA_URL}/shenandoah.tar.xz -> ${SHENANDOAH_GENTOO_TARBALL} )
- arm? ( ${ICEDTEA_URL}/aarch32.tar.xz -> ${AARCH32_GENTOO_TARBALL} )
- ${DROP_URL}/cacao/${CACAO_TARBALL} -> ${CACAO_GENTOO_TARBALL}
- ${DROP_URL}/jamvm/${JAMVM_TARBALL} -> ${JAMVM_GENTOO_TARBALL}"
-
-LICENSE="Apache-1.1 Apache-2.0 GPL-1 GPL-2 GPL-2-with-linking-exception LGPL-2 MPL-1.0 MPL-1.1 public-domain W3C"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-
-IUSE="+alsa cacao +cups doc examples +gtk headless-awt
- jamvm +jbootstrap kerberos pax-kernel +pch
- pulseaudio sctp selinux shenandoah smartcard +source +system-lcms test zero"
-
-RESTRICT="!test? ( test )"
-REQUIRED_USE="gtk? ( !headless-awt )"
-
-# Ideally the following were optional at build time.
-ALSA_COMMON_DEP=">=media-libs/alsa-lib-1.0"
-CUPS_COMMON_DEP=">=net-print/cups-1.2.12"
-
-X_COMMON_DEP="
- >=media-libs/giflib-4.1.6:0=
- >=media-libs/libpng-1.2:0=
- >=x11-libs/libX11-1.1.3
- >=x11-libs/libXext-1.1.1
- >=x11-libs/libXi-1.1.3
- >=x11-libs/libXrender-0.9.4
- >=x11-libs/libXtst-1.0.3
- x11-libs/libXcomposite
-"
-
-X_DEPEND="
- x11-base/xorg-proto
- >=x11-libs/libXau-1.0.3
- >=x11-libs/libXdmcp-1.0.2
- >=x11-libs/libXinerama-1.0.2
-"
-
-# The Javascript requirement is obsolete; OpenJDK 8+ has Nashorn
-COMMON_DEP="
- >=dev-libs/glib-2.26:2=
- >=dev-util/systemtap-1
- media-libs/fontconfig:1.0=
- >=media-libs/freetype-2.5.3:2=
- >=sys-libs/zlib-1.2.3
- virtual/jpeg:0=
- gtk? (
- >=dev-libs/atk-1.30.0
- >=x11-libs/cairo-1.8.8
- x11-libs/gdk-pixbuf:2
- >=x11-libs/gtk+-2.8:2
- >=x11-libs/pango-1.24.5
- )
- kerberos? ( virtual/krb5 )
- sctp? ( net-misc/lksctp-tools )
- smartcard? ( sys-apps/pcsc-lite )
- system-lcms? ( >=media-libs/lcms-2.9:2= )
-"
-
-RDEPEND="${COMMON_DEP}
- !dev-java/icedtea:0
- !dev-java/icedtea-web:7
- >=gnome-base/gsettings-desktop-schemas-3.12.2
- >=sys-apps/baselayout-java-0.1.0-r1
- virtual/ttf-fonts
- alsa? ( ${ALSA_COMMON_DEP} )
- cups? ( ${CUPS_COMMON_DEP} )
- !headless-awt? ( ${X_COMMON_DEP} )
- selinux? ( sec-policy/selinux-java )
-"
-
-# perl is needed for running the SystemTap tests and the bootstrap javac
-# lsb-release is used to obtain distro information for the version & crash dump output
-# attr is needed for xattr.h which defines the extended attribute syscalls used by NIO2
-# x11-libs/libXt is needed for headers only (Intrinsic.h, IntrinsicP.h, Shell.h, StringDefs.h)
-# Ant is no longer needed under the new build system
-DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP} ${CUPS_COMMON_DEP} ${X_COMMON_DEP} ${X_DEPEND}
- || (
- dev-java/openjdk-bin:8
- dev-java/openjdk:8
- dev-java/icedtea-bin:8
- dev-java/icedtea:8
- )
- app-arch/cpio
- app-arch/unzip
- app-arch/zip
- app-misc/ca-certificates
- dev-lang/perl
- dev-libs/openssl:0
- sys-apps/attr
- sys-apps/lsb-release
- x11-libs/libXt
- virtual/pkgconfig
- pax-kernel? ( sys-apps/elfix )"
-
-PDEPEND="pulseaudio? ( dev-java/icedtea-sound )"
-
-S="${WORKDIR}"/${ICEDTEA_PKG}
-
-icedtea_check_requirements() {
- local CHECKREQS_DISK_BUILD
-
- if use doc; then
- CHECKREQS_DISK_BUILD="9000M"
- else
- CHECKREQS_DISK_BUILD="8500M"
- fi
-
- check-reqs_pkg_${EBUILD_PHASE}
-}
-
-pkg_pretend() {
- icedtea_check_requirements
-}
-
-pkg_setup() {
- icedtea_check_requirements
-
- JAVA_PKG_WANT_BUILD_VM="
- openjdk-8 openjdk-bin-8
- icedtea-8 icedtea-bin-8"
- JAVA_PKG_WANT_SOURCE="1.5"
- JAVA_PKG_WANT_TARGET="1.5"
-
- java-vm-2_pkg_setup
- java-pkg-2_pkg_setup
-}
-
-src_unpack() {
- unpack ${SRC_PKG}
-}
-
-src_configure() {
- # GCC10/-fno-common handling, #723102
- if [[ $(gcc-major-version) -ge 10 ]]; then
- append-flags -fcommon
- append-flags -fno-delete-null-pointer-checks -fno-lifetime-dse
- fi
- # this patch helps with gcc10 as well
- # since build system unpacks tarballs itself, this is a way to force makefile
- # to apply our patch. it expects relative path inside source, so we can't specify
- # ${FILESDIR} directly.
- mkdir -v gentoo_patches || die
- cp -v "${FILESDIR}/openjdk-8-hotspot-arrayallocator.patch" gentoo_patches || die
- export DISTRIBUTION_PATCHES="gentoo_patches//openjdk-8-hotspot-arrayallocator.patch"
-
- # For bootstrap builds as the sandbox control file might not yet exist.
- addpredict /proc/self/coredump_filter #nowarn
-
- # icedtea doesn't like some locales. #330433 #389717
- export LANG="C" LC_ALL="C"
-
- local cacao_config config hotspot_port hs_config jamvm_config use_cacao use_jamvm use_zero zero_config
- local vm=$(java-pkg_get-current-vm)
-
- # gcj-jdk ensures ecj is present.
- if use jbootstrap || has "${vm}" gcj-jdk; then
- use jbootstrap || einfo "bootstrap is necessary when building with ${vm}, ignoring USE=\"-jbootstrap\""
- config+=" --enable-bootstrap"
- else
- config+=" --disable-bootstrap"
- fi
-
- # Use Zero if requested
- if use zero; then
- use_zero="yes"
- fi
-
- # Use JamVM if requested
- if use jamvm; then
- use_jamvm="yes"
- fi
-
- # Use CACAO if requested
- if use cacao; then
- use_cacao="yes"
- fi
-
- # Are we on a architecture with a HotSpot port?
- # In-tree JIT ports are available for amd64, arm, arm64, ppc64 (be&le), SPARC and x86.
- if { use amd64 || use arm || use arm64 || use ppc64 || use sparc || use x86; }; then
- hotspot_port="yes"
- # Work around stack alignment issue, bug #647954.
- use x86 && append-flags -mincoming-stack-boundary=2
- fi
-
- # Always use HotSpot as the primary VM if available. #389521 #368669 #357633 ...
- # Otherwise use Zero for now until alternate VMs are working
- if test "x${hotspot_port}" != "xyes"; then
- use_zero="yes"
- fi
-
- if use shenandoah; then
- if { use amd64 || use arm64; }; then
- hs_config="--with-hotspot-build=shenandoah"
- hs_config+=" --with-hotspot-src-zip="${DISTDIR}/${SHENANDOAH_GENTOO_TARBALL}""
- else
- eerror "Shenandoah is only supported on arm64 and x86_64. Please re-build with USE="-shenandoah""
- fi
- else
- if use arm ; then
- hs_config="--with-hotspot-src-zip="${DISTDIR}/${AARCH32_GENTOO_TARBALL}""
- else
- hs_config="--with-hotspot-src-zip="${DISTDIR}/${HOTSPOT_GENTOO_TARBALL}""
- fi
- fi
-
- # Turn on JamVM if needed (non-HS archs) or requested
- if test "x${use_jamvm}" = "xyes"; then
- if test "x${hotspot_port}" = "xyes"; then
- ewarn 'Enabling JamVM on an architecture with HotSpot support; issues may result.'
- ewarn 'If so, please rebuild with USE="-jamvm"'
- fi
- ewarn 'JamVM is known to still have issues with IcedTea 3.x; please rebuild with USE="-jamvm"'
- jamvm_config="--enable-jamvm"
- fi
-
- # Turn on CACAO if needed (non-HS archs) or requested
- if test "x${use_cacao}" = "xyes"; then
- if test "x${hotspot_port}" = "xyes"; then
- ewarn 'Enabling CACAO on an architecture with HotSpot support; issues may result.'
- ewarn 'If so, please rebuild with USE="-cacao"'
- fi
- ewarn 'CACAO is known to still have issues with IcedTea 3.x; please rebuild with USE="-cacao"'
- cacao_config="--enable-cacao"
- fi
-
- # Turn on Zero if needed (non-HS/CACAO archs) or requested
- if test "x${use_zero}" = "xyes"; then
- if test "x${hotspot_port}" = "xyes"; then
- ewarn 'Enabling Zero on an architecture with HotSpot support; performance will be significantly reduced.'
- fi
- zero_config="--enable-zero"
- fi
-
- # PaX breaks pch, bug #601016
- if use pch && ! host-is-pax; then
- config+=" --enable-precompiled-headers"
- else
- config+=" --disable-precompiled-headers"
- fi
-
- config+=" --with-parallel-jobs=$(makeopts_jobs)"
-
- unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS
-
- # force bash for now https://bugs.gentoo.org/722292
- CONFIG_SHELL="${EPREFIX}/bin/bash" econf ${config} \
- --with-openjdk-src-zip="${DISTDIR}/${OPENJDK_GENTOO_TARBALL}" \
- --with-corba-src-zip="${DISTDIR}/${CORBA_GENTOO_TARBALL}" \
- --with-jaxp-src-zip="${DISTDIR}/${JAXP_GENTOO_TARBALL}" \
- --with-jaxws-src-zip="${DISTDIR}/${JAXWS_GENTOO_TARBALL}" \
- --with-jdk-src-zip="${DISTDIR}/${JDK_GENTOO_TARBALL}" \
- --with-langtools-src-zip="${DISTDIR}/${LANGTOOLS_GENTOO_TARBALL}" \
- --with-nashorn-src-zip="${DISTDIR}/${NASHORN_GENTOO_TARBALL}" \
- --with-cacao-src-zip="${DISTDIR}/${CACAO_GENTOO_TARBALL}" \
- --with-jamvm-src-zip="${DISTDIR}/${JAMVM_GENTOO_TARBALL}" \
- --with-jdk-home="$(java-config -O)" \
- --prefix="${EPREFIX}/usr/$(get_libdir)/icedtea${SLOT}" \
- --mandir="${EPREFIX}/usr/$(get_libdir)/icedtea${SLOT}/man" \
- --with-pkgversion="Gentoo ${PF}" \
- --disable-ccache \
- --disable-downloading --disable-Werror --disable-tests \
- --disable-systemtap-tests --enable-improved-font-rendering \
- --enable-system-jpeg --enable-system-zlib \
- $(use_enable headless-awt headless) \
- $(use_enable !headless-awt system-gif) \
- $(use_enable !headless-awt system-png) \
- $(use_enable doc docs) \
- $(use_enable kerberos system-kerberos) \
- $(use_enable system-lcms) \
- $(use_with pax-kernel pax "${EPREFIX}/usr/sbin/paxmark.sh") \
- $(use_enable sctp system-sctp) \
- $(use_enable smartcard system-pcsc) \
- ${zero_config} ${cacao_config} ${jamvm_config} ${hs_config}
-}
-
-src_compile() {
- default
-}
-
-src_test() {
- default
-}
-
-src_install() {
- default
-
- local dest="/usr/$(get_libdir)/icedtea${SLOT}"
- local ddest="${ED}${dest#/}"
-
- if ! use alsa; then
- rm -v "${ddest}"/jre/lib/$(get_system_arch)/libjsoundalsa.* || die
- fi
-
- if ! use examples; then
- rm -r "${ddest}"/demo "${ddest}"/sample || die
- fi
-
- if ! use source; then
- rm -v "${ddest}"/src.zip || die
- fi
-
- dosym ../../../usr/share/doc/"${PF}" usr/share/doc/"${PN}${SLOT}"
-
- # Fix the permissions.
- find "${ddest}" \! -type l \( -perm /111 -exec chmod 755 {} \; -o -exec chmod 644 {} \; \) || die
-
- dosym ../../../../../../etc/ssl/certs/java/cacerts "${dest}"/jre/lib/security/cacerts
-
- java-vm_install-env "${FILESDIR}/icedtea.env.sh"
- java-vm_sandbox-predict /proc/self/coredump_filter
-}
-
-pkg_postinst() {
- xdg_icon_cache_update
- java-vm-2_pkg_postinst
- einfo "JavaWebStart functionality provided by icedtea-web package"
-}
-
-pkg_postrm() {
- xdg_icon_cache_update
- java-vm-2_pkg_postrm
-}
diff --git a/dev-java/icedtea/icedtea-3.21.0.ebuild b/dev-java/icedtea/icedtea-3.21.0.ebuild
index b4f4020fce2..9e673777081 100644
--- a/dev-java/icedtea/icedtea-3.21.0.ebuild
+++ b/dev-java/icedtea/icedtea-3.21.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
# Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)
@@ -69,7 +69,7 @@ LICENSE="Apache-1.1 Apache-2.0 GPL-1 GPL-2 GPL-2-with-linking-exception LGPL-2 M
KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
IUSE="+alsa cacao +cups doc examples +gtk headless-awt
- jamvm +jbootstrap kerberos pax-kernel +pch
+ jamvm +jbootstrap kerberos pax-kernel pch
pulseaudio sctp selinux shenandoah smartcard +source +system-lcms test zero"
RESTRICT="!test? ( test )"
diff --git a/dev-java/icu4j/Manifest b/dev-java/icu4j/Manifest
index 4a96af84eb3..406331bdf46 100644
--- a/dev-java/icu4j/Manifest
+++ b/dev-java/icu4j/Manifest
@@ -1,2 +1 @@
-DIST icu4j-54_1_1.tgz 23457651 BLAKE2B f200d170c32065d2f678247d595085283446e401da2c2433b426466fc5c6f93f5ce629bce23d1114cad7d360aa4d127060750d380da8cc3e7fa1e529b454bae9 SHA512 c41f7f9fb0819767da48ac21c4883a628da8397e0ad5b0d75e51d9185b5511608c9a635933c4ae2e0c8911b2cdecf47bc661050935bbae2ba58abfb5ad04dadf
DIST icu4j-70.1.tar.gz 65661187 BLAKE2B 9d2d38fa91092d8f2fa39c773b722019f1d0c9b06ba6e8abaf05c3d3b50977232d6f1a37fd5ab6be6461d133dd361dae9b8633e22c9f165ef4e6e4b8029f6b8a SHA512 f1a653452f42605f799de7ec1d5bf27aa4b715f2ec18534cd3b52bd9be7ddbe7a6d18b47e3a5b36c7a63442bc38304ddc80f519ac65b9a91978ab15b462d9456
diff --git a/dev-java/icu4j/icu4j-54.1.1-r1.ebuild b/dev-java/icu4j/icu4j-54.1.1-r1.ebuild
deleted file mode 100644
index 640cdc0756f..00000000000
--- a/dev-java/icu4j/icu4j-54.1.1-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# testdata.jar, icudata.jar and icutzdata.jar do not contain *.class files
-# but *.res files. These *.res data files are needed to build the final jar.
-
-JAVA_PKG_IUSE="doc examples source test"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="A set of Java libraries providing Unicode and Globalization support"
-HOMEPAGE="http://www.icu-project.org/"
-SRC_URI="http://download.icu-project.org/files/${PN}/${PV}/${PN}-${PV//./_}.tgz"
-
-LICENSE="icu"
-SLOT="52"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-# the build system does not support java > 1.8
-# also the package does not compile with newer jdks because of missing classes
-DEPEND="virtual/jdk:1.8"
-RDEPEND=">=virtual/jre-1.8:*"
-
-S="${WORKDIR}"
-
-HTML_DOCS="readme.html"
-
-JAVA_PKG_BSFIX_NAME+=" common-targets.xml"
-
-EANT_DOC_TARGET="docs"
-EANT_TEST_TARGET="check"
-
-src_test() {
- java-pkg-2_src_test
-}
-
-src_install() {
- java-pkg_dojar ${PN}.jar
- java-pkg_dojar ${PN}-charset.jar
- java-pkg_dojar ${PN}-localespi.jar
-
- einstalldocs
-
- use doc && java-pkg_dojavadoc doc
- use examples && java-pkg_doexamples demos samples
- use source && java-pkg_dosrc main/classes/*/src/com
-}
diff --git a/dev-java/icu4j/icu4j-70.1.ebuild b/dev-java/icu4j/icu4j-70.1.ebuild
index 271ad96ce37..784b9ff223b 100644
--- a/dev-java/icu4j/icu4j-70.1.ebuild
+++ b/dev-java/icu4j/icu4j-70.1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/unicode-org/icu/archive/refs/tags/release-${PV/./-}.
LICENSE="icu"
SLOT="70"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
DEPEND=">=virtual/jdk-1.8:*
test? ( dev-java/junitparams:0 )"
@@ -176,6 +176,14 @@ src_compile() {
fi
}
+src_test () {
+ # https://bugs.gentoo.org/827212
+ 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_dojar "icu4j.jar"
diff --git a/dev-java/j2objc-annotations/j2objc-annotations-1.2.ebuild b/dev-java/j2objc-annotations/j2objc-annotations-1.2-r1.ebuild
index 4d97b4ab4bb..8e90d442f37 100644
--- a/dev-java/j2objc-annotations/j2objc-annotations-1.2.ebuild
+++ b/dev-java/j2objc-annotations/j2objc-annotations-1.2-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=6
+EAPI=8
MY_PN="${PN%-annotations}"
MY_P="${MY_PN}-${PV}"
@@ -14,10 +14,10 @@ HOMEPAGE="http://j2objc.org"
SRC_URI="https://github.com/google/${MY_PN}/archive/${PV}.tar.gz -> ${MY_P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-DEPEND=">=virtual/jdk-1.7"
-RDEPEND=">=virtual/jre-1.7"
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
S="${WORKDIR}/${MY_P}/annotations"
JAVA_SRC_DIR="src/main/java"
diff --git a/dev-java/jackcess/jackcess-4.0.0.ebuild b/dev-java/jackcess/jackcess-4.0.0.ebuild
index 7d2a8161da6..2d583cbc5fe 100644
--- a/dev-java/jackcess/jackcess-4.0.0.ebuild
+++ b/dev-java/jackcess/jackcess-4.0.0.ebuild
@@ -12,7 +12,7 @@ JAVA_TESTING_FRAMEWORKS="junit-4"
inherit java-pkg-2 java-pkg-simple
-DESCRIPTION="A pure Java library for reading from and writing to MS Access databases."
+DESCRIPTION="A pure Java library for reading from and writing to MS Access databases"
HOMEPAGE="https://jackcess.sourceforge.io"
SRC_URI="https://github.com/jahlborn/${PN}/archive/refs/tags/${P}.tar.gz -> ${P}-sources.tar.gz"
diff --git a/dev-java/jackrabbit-webdav/files/jackrabbit-webdav-2.10.1-CSRFUtilTest.java.patch b/dev-java/jackrabbit-webdav/files/jackrabbit-webdav-2.10.1-CSRFUtilTest.java.patch
index 4c1f286339b..8417f31cfce 100644
--- a/dev-java/jackrabbit-webdav/files/jackrabbit-webdav-2.10.1-CSRFUtilTest.java.patch
+++ b/dev-java/jackrabbit-webdav/files/jackrabbit-webdav-2.10.1-CSRFUtilTest.java.patch
@@ -1,5 +1,5 @@
---- src/test/java/org/apache/jackrabbit/webdav/util/CSRFUtilTest.java.orig 2015-07-03 09:36:45.804000000 +0000
-+++ src/test/java/org/apache/jackrabbit/webdav/util/CSRFUtilTest.java 2015-07-03 09:36:59.498000000 +0000
+--- a/src/test/java/org/apache/jackrabbit/webdav/util/CSRFUtilTest.java.orig 2015-07-03 09:36:45.804000000 +0000
++++ b/src/test/java/org/apache/jackrabbit/webdav/util/CSRFUtilTest.java 2015-07-03 09:36:59.498000000 +0000
@@ -281,6 +281,18 @@
public void removeAttribute(String name) {
diff --git a/dev-java/jackrabbit-webdav/files/jackrabbit-webdav-2.10.1-OutputContextImplTest.java.patch b/dev-java/jackrabbit-webdav/files/jackrabbit-webdav-2.10.1-OutputContextImplTest.java.patch
index d9a2315f19a..9f132b817a1 100644
--- a/dev-java/jackrabbit-webdav/files/jackrabbit-webdav-2.10.1-OutputContextImplTest.java.patch
+++ b/dev-java/jackrabbit-webdav/files/jackrabbit-webdav-2.10.1-OutputContextImplTest.java.patch
@@ -1,5 +1,5 @@
---- src/test/java/org/apache/jackrabbit/webdav/io/OutputContextImplTest.java.orig 2015-07-03 09:26:48.578000000 +0000
-+++ src/test/java/org/apache/jackrabbit/webdav/io/OutputContextImplTest.java 2015-07-03 09:27:34.109000000 +0000
+--- a/src/test/java/org/apache/jackrabbit/webdav/io/OutputContextImplTest.java.orig 2015-07-03 09:26:48.578000000 +0000
++++ b/src/test/java/org/apache/jackrabbit/webdav/io/OutputContextImplTest.java 2015-07-03 09:27:34.109000000 +0000
@@ -40,6 +40,13 @@
public void setHeader(String name, String value) {
assertTrue(Long.parseLong(value) > Integer.MAX_VALUE);
diff --git a/dev-java/jackrabbit-webdav/jackrabbit-webdav-2.10.1-r2.ebuild b/dev-java/jackrabbit-webdav/jackrabbit-webdav-2.10.1-r2.ebuild
new file mode 100644
index 00000000000..108db165b5f
--- /dev/null
+++ b/dev-java/jackrabbit-webdav/jackrabbit-webdav-2.10.1-r2.ebuild
@@ -0,0 +1,51 @@
+# 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
+
+MY_PN="${PN/-*/}"
+
+DESCRIPTION="Fully conforming implementation of the JRC API (specified in JSR 170 and 283)"
+HOMEPAGE="https://jackrabbit.apache.org/"
+SRC_URI="mirror://apache/${MY_PN}/${PV}/${MY_PN}-${PV}-src.zip"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+S="${WORKDIR}/${MY_PN}-${PV}/${PN}"
+
+CP_DEPEND="dev-java/bndlib:0
+ dev-java/slf4j-api:0
+ dev-java/slf4j-nop:0
+ dev-java/commons-httpclient:3
+ java-virtuals/servlet-api:2.3"
+
+DEPEND=">=virtual/jdk-1.8:*
+ ${CP_DEPEND}"
+
+RDEPEND=">=virtual/jre-1.8:*
+ ${CP_DEPEND}"
+
+BDEPEND="app-arch/unzip"
+
+JAVA_SRC_DIR="src/main/java"
+JAVA_RESOURCE_DIRS=( "src/main/resources" )
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_SRC_DIR="src/test/java"
+JAVA_TEST_RESOURCE_DIRS=( "src/test/resources" )
+
+src_test() {
+ # Run only tests that would be executed by Maven as in ${S}/pom.xml:79
+ JAVA_TEST_RUN_ONLY=$(find "${JAVA_TEST_SRC_DIR}" -name "*TestAll.java" \
+ -exec realpath --relative-to="${JAVA_TEST_SRC_DIR}" {} \;)
+ JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}"
+ JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}"
+ java-pkg-simple_src_test
+}
diff --git a/dev-java/jackrabbit-webdav/jackrabbit-webdav-2.10.1.ebuild b/dev-java/jackrabbit-webdav/jackrabbit-webdav-2.10.1.ebuild
index 1c182599a97..2f95946aa57 100644
--- a/dev-java/jackrabbit-webdav/jackrabbit-webdav-2.10.1.ebuild
+++ b/dev-java/jackrabbit-webdav/jackrabbit-webdav-2.10.1.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="5"
@@ -25,7 +25,8 @@ CDEPEND="dev-java/bndlib:0
dev-java/commons-httpclient:3
java-virtuals/servlet-api:2.3"
-DEPEND=">=virtual/jdk-1.6
+DEPEND="app-arch/unzip
+ >=virtual/jdk-1.6
${CDEPEND}
test? ( dev-java/ant-junit:0 )"
diff --git a/dev-java/jackrabbit-webdav/jackrabbit-webdav-2.21.7.ebuild b/dev-java/jackrabbit-webdav/jackrabbit-webdav-2.21.7.ebuild
index a16fdc02265..76bd9541226 100644
--- a/dev-java/jackrabbit-webdav/jackrabbit-webdav-2.21.7.ebuild
+++ b/dev-java/jackrabbit-webdav/jackrabbit-webdav-2.21.7.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="mirror://apache/jackrabbit/${PV}/jackrabbit-${PV}-src.zip"
LICENSE="Apache-2.0"
SLOT="2"
-KEYWORDS="amd64 ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
# Common dependencies
# POM: pom.xml
diff --git a/dev-java/jackson-annotations/Manifest b/dev-java/jackson-annotations/Manifest
index e0dcf4474c3..26507ab1c13 100644
--- a/dev-java/jackson-annotations/Manifest
+++ b/dev-java/jackson-annotations/Manifest
@@ -1 +1,2 @@
+DIST jackson-annotations-2.13.0.tar.gz 1819614 BLAKE2B edb0a0e7586033a61722fda22bbb13f1ed119bd6af63931572396a4ee3f19f66fb20d750742b53d68a4159d11863b612d8e802b42b0359d90700dc6c03c8793e SHA512 e24fd9dfd6b7e3a7ee37cd41c30a073ec9b2d64dacfa47f7418643615b0ed145f8b1ac3e889b0f411412b74661b36ed352d89a62edebc8f2e07aeeed5d283c2f
DIST jackson-annotations-2.9.10.tar.gz 57322 BLAKE2B 85e3ac040e3adc986fa7b2a1892bb536ff2b46415af9390a6ec4e59bc9770b2bced4fd80edffc7b2083853b0b1bb5022dde137fda7e9920ec27e3fa54858e5fc SHA512 27c28e9453570aab4758031d406bfc8b8ba0eb443dcd0a884d6098840e5b577b2628288daf10e9de6ce5d1e4da2f4b8e4ec36a6559233e012725a906c4da21b9
diff --git a/dev-java/jackson-annotations/jackson-annotations-2.13.0.ebuild b/dev-java/jackson-annotations/jackson-annotations-2.13.0.ebuild
new file mode 100644
index 00000000000..91338cc24cc
--- /dev/null
+++ b/dev-java/jackson-annotations/jackson-annotations-2.13.0.ebuild
@@ -0,0 +1,43 @@
+# 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/FasterXML/jackson-annotations/archive/refs/tags/jackson-annotations-2.13.0.tar.gz --slot 2 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild jackson-annotations-2.13.0.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="com.fasterxml.jackson.core:jackson-annotations:2.13.0"
+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/refs/tags/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
+
+DOCS=( LICENSE 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/Manifest b/dev-java/jackson/Manifest
deleted file mode 100644
index 2152b09306d..00000000000
--- a/dev-java/jackson/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST jackson-core-2.9.10.tar.gz 416803 BLAKE2B 9d8efc39b09b9619da301dc7fec3bd6339133c3fea3af46bbd77530883662b3b1d4ba2536cb8bd7ff7609a79ae6cfce135a3a5d75076bb7884e5e2878ac0107b SHA512 26b22e3fa60190877f5227c936ee32fdb4014347307904b140a6c787bb732df598b0ed48e7014cb6e51172abe52783e4d866f135706c8ebc77e24bdf087e9e71
diff --git a/dev-java/jackson/jackson-2.9.10.ebuild b/dev-java/jackson/jackson-2.9.10.ebuild
deleted file mode 100644
index b495fe7cf27..00000000000
--- a/dev-java/jackson/jackson-2.9.10.ebuild
+++ /dev/null
@@ -1,59 +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"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="High-performance JSON processor"
-HOMEPAGE="https://github.com/FasterXML/jackson-core"
-SRC_URI="https://github.com/FasterXML/${PN}-core/archive/${PN}-core-${PV}.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="2"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=virtual/jre-1.7"
-DEPEND=">=virtual/jdk-1.7
- test? ( dev-java/junit:4 )"
-
-S="${WORKDIR}/${PN}-core-${PN}-core-${PV}"
-JAVA_SRC_DIR="src/main/java"
-
-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_compile() {
- java-pkg-simple_src_compile
- java-pkg_addres ${PN}.jar src/main/resources
-}
-
-src_install() {
- java-pkg-simple_src_install
- dodoc README.md release-notes/{CREDITS,VERSION}-2.x
-}
-
-src_test() {
- cd src/test/java || die
-
- local CP=".:../resources:${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/jackson/metadata.xml b/dev-java/jackson/metadata.xml
deleted file mode 100644
index bfc88552f0f..00000000000
--- a/dev-java/jackson/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">FasterXML/jackson-core</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/dev-java/jacl/jacl-1.4.1-r1.ebuild b/dev-java/jacl/jacl-1.4.1-r1.ebuild
index a4be253731c..a333844f35d 100644
--- a/dev-java/jacl/jacl-1.4.1-r1.ebuild
+++ b/dev-java/jacl/jacl-1.4.1-r1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="http://tcljava.sourceforge.net"
SRC_URI="mirror://sourceforge/tcljava/${MY_P}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
IUSE="doc"
CDEPEND=">=dev-lang/tcl-8.4.5:*"
diff --git a/dev-java/jakarta-activation-api/Manifest b/dev-java/jakarta-activation-api/Manifest
index bf22b45c54e..5f44c8a1386 100644
--- a/dev-java/jakarta-activation-api/Manifest
+++ b/dev-java/jakarta-activation-api/Manifest
@@ -1,2 +1,2 @@
-DIST jakarta-activation-2.0.1.tar.gz 133807 BLAKE2B 3b793fc767601cc1406482facb0456efd1f784371dff602e71f579a2c74f8e66affed384c8ce3b6aa7c2abfcb5cb0ff5f781ea109829c03f645099fb52016e21 SHA512 51e60d851b9f2027944ab24b248b3c7c19028a504ccf5f92a61495ffa65176df78c63c25e91de4a22d6aa9a1989db274f419f91693a21f052875635b8b21bad1
+DIST jakarta-activation-2.1.0.tar.gz 118833 BLAKE2B ad4b23405b412eb31ffe6fa9ebb62e5f3d21f721908bec6607d1e236b1aa36a5fbc5d721db879210b99a236a3ead4e6b89854f311b4593f32bc537f0d37638a0 SHA512 6552789b3bc590b241250387e07fd9973f2ba210544baf5e5c272ce9824ddc568dd186d2db2b28d89698b68c6505d8263d8aa5ceedf1a12a2d8fc94d648cc8fa
DIST jakarta-activation-api-1.2.2.tar.gz 123283 BLAKE2B 2d205b0a042790f931d20b30f422690eb4f7b51ffa3e8eb2af0eb1fabbcd3fa9e469e9b68384bd95278c319f97911795473cbc81282b516f30148488da729f4d SHA512 a9062eadf260621e0a10695e63082d010567665bc749f76be43381c0f313d61fdb8ab04b9b2765e7da740277cd0335e9f555dd7a1cd89b7eedf88f6e557427c4
diff --git a/dev-java/jakarta-activation-api/jakarta-activation-api-2.0.1-r1.ebuild b/dev-java/jakarta-activation-api/jakarta-activation-api-2.1.0.ebuild
index 66b3c87f408..b7c470c56a1 100644
--- a/dev-java/jakarta-activation-api/jakarta-activation-api-2.0.1-r1.ebuild
+++ b/dev-java/jakarta-activation-api/jakarta-activation-api-2.1.0.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 pom.xml --download-uri https://github.com/eclipse-ee4j/jaf/archive/refs/tags/2.0.1.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild jakarta-activation-2.0.1.ebuild
-EAPI=7
+EAPI=8
JAVA_PKG_IUSE="doc source"
-MAVEN_ID="jakarta.activation:jakarta.activation-api:2.0.1"
+MAVEN_ID="jakarta.activation:jakarta.activation-api:2.1.0"
inherit java-pkg-2 java-pkg-simple
@@ -17,34 +17,19 @@ SRC_URI="https://github.com/eclipse-ee4j/jaf/archive/refs/tags/${PV}.tar.gz -> j
LICENSE="EPL-1.0"
SLOT="2"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
DEPEND=">=virtual/jdk-1.8:*"
RDEPEND=">=virtual/jre-1.8:*"
-BDEPEND="app-arch/zip"
DOCS=( ../{CONTRIBUTING,LICENSE,NOTICE,README}.md )
-S="${WORKDIR}/jaf-${PV}/activation"
+S="${WORKDIR}/jaf-${PV}/api"
JAVA_SRC_DIR="src/main/java"
JAVA_RESOURCE_DIRS="src/main/resources"
-src_prepare() {
- default
- # these files are not present in the upstream jar
- find ${JAVA_RESOURCE_DIRS} -name "*.default" -delete || die "Failed to delete *.default files"
-}
-
-src_compile() {
- java-pkg-simple_src_compile
- # we remove implementation classes from the api
- zip -d ${PN}.jar "com/*" || die "Failed to remove implementation classes"
-}
-
src_install() {
- default
- # we remove the implementation sources so that they don't land in sources
- rm -fr ${JAVA_SRC_DIR}/com || "Failed to delete implementation sources"
+ default # https://bugs.gentoo.org/789582
java-pkg-simple_src_install
}
diff --git a/dev-java/jakarta-activation/Manifest b/dev-java/jakarta-activation/Manifest
index 94648449997..1dd5a7e9b40 100644
--- a/dev-java/jakarta-activation/Manifest
+++ b/dev-java/jakarta-activation/Manifest
@@ -1 +1,2 @@
DIST jakarta-activation-1.2.2.tar.gz 123283 BLAKE2B 2d205b0a042790f931d20b30f422690eb4f7b51ffa3e8eb2af0eb1fabbcd3fa9e469e9b68384bd95278c319f97911795473cbc81282b516f30148488da729f4d SHA512 a9062eadf260621e0a10695e63082d010567665bc749f76be43381c0f313d61fdb8ab04b9b2765e7da740277cd0335e9f555dd7a1cd89b7eedf88f6e557427c4
+DIST jakarta-activation-2.0.1.tar.gz 133807 BLAKE2B 3b793fc767601cc1406482facb0456efd1f784371dff602e71f579a2c74f8e66affed384c8ce3b6aa7c2abfcb5cb0ff5f781ea109829c03f645099fb52016e21 SHA512 51e60d851b9f2027944ab24b248b3c7c19028a504ccf5f92a61495ffa65176df78c63c25e91de4a22d6aa9a1989db274f419f91693a21f052875635b8b21bad1
diff --git a/dev-java/jakarta-activation/jakarta-activation-1.2.2.ebuild b/dev-java/jakarta-activation/jakarta-activation-1.2.2.ebuild
index 1fa05d077c0..4c78c930809 100644
--- a/dev-java/jakarta-activation/jakarta-activation-1.2.2.ebuild
+++ b/dev-java/jakarta-activation/jakarta-activation-1.2.2.ebuild
@@ -12,7 +12,7 @@ MAVEN_ID="com.sun.activation:jakarta.activation:1.2.2"
inherit java-pkg-2 java-pkg-simple
DESCRIPTION="Jakarta Activation"
-HOMEPAGE="https://github.com/eclipse-ee4j/jaf/jakarta.activation"
+HOMEPAGE="https://eclipse-ee4j.github.io/jaf/"
SRC_URI="https://github.com/eclipse-ee4j/jaf/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="EPL-1.0"
diff --git a/dev-java/jakarta-activation/jakarta-activation-2.0.1.ebuild b/dev-java/jakarta-activation/jakarta-activation-2.0.1.ebuild
new file mode 100644
index 00000000000..42ca4181217
--- /dev/null
+++ b/dev-java/jakarta-activation/jakarta-activation-2.0.1.ebuild
@@ -0,0 +1,35 @@
+# 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/jaf/archive/refs/tags/2.0.1.tar.gz --slot 2 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild jakarta-activation-2.0.1.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="com.sun.activation:jakarta.activation:2.0.1"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Jakarta Activation"
+HOMEPAGE="https://github.com/eclipse-ee4j/jaf/jakarta.activation"
+SRC_URI="https://github.com/eclipse-ee4j/jaf/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="EPL-1.0"
+SLOT="2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+DEPEND="
+ >=virtual/jdk-1.8:*
+"
+
+RDEPEND="
+ >=virtual/jre-1.8:*
+"
+
+S="${WORKDIR}/jaf-${PV}/activation"
+
+JAVA_SRC_DIR="src/main/java"
+JAVA_RESOURCE_DIRS=(
+ "src/main/resources"
+)
diff --git a/dev-java/jakarta-regexp/jakarta-regexp-1.3-r5.ebuild b/dev-java/jakarta-regexp/jakarta-regexp-1.3-r5.ebuild
index ddfe39278ff..f5a39f4ca7d 100644
--- a/dev-java/jakarta-regexp/jakarta-regexp-1.3-r5.ebuild
+++ b/dev-java/jakarta-regexp/jakarta-regexp-1.3-r5.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=5
@@ -9,7 +9,7 @@ inherit java-pkg-2 java-pkg-simple
DESCRIPTION="100% Pure Java Regular Expression package"
SRC_URI="mirror://apache/jakarta/regexp/source/${P}.tar.gz"
-HOMEPAGE="http://jakarta.apache.org/"
+HOMEPAGE="https://jakarta.apache.org/"
SLOT="${PV}"
IUSE=""
diff --git a/dev-java/jakarta-regexp/jakarta-regexp-1.3-r6.ebuild b/dev-java/jakarta-regexp/jakarta-regexp-1.3-r6.ebuild
new file mode 100644
index 00000000000..ab1d50e2440
--- /dev/null
+++ b/dev-java/jakarta-regexp/jakarta-regexp-1.3-r6.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="100% Pure Java Regular Expression package"
+SRC_URI="mirror://apache/jakarta/regexp/source/${P}.tar.gz"
+HOMEPAGE="https://jakarta.apache.org/"
+
+SLOT="${PV}"
+IUSE=""
+LICENSE="Apache-1.1"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+
+RDEPEND="
+ >=virtual/jre-1.8:*"
+
+DEPEND="
+ >=virtual/jdk-1.8:*"
+
+S="${WORKDIR}/${P}"
+
+JAVA_SRC_DIR="src/java"
+
+src_prepare() {
+ default
+
+ java-pkg_clean
+}
diff --git a/dev-java/jakarta-regexp/jakarta-regexp-1.4-r2.ebuild b/dev-java/jakarta-regexp/jakarta-regexp-1.4-r2.ebuild
index ddfe39278ff..f5a39f4ca7d 100644
--- a/dev-java/jakarta-regexp/jakarta-regexp-1.4-r2.ebuild
+++ b/dev-java/jakarta-regexp/jakarta-regexp-1.4-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=5
@@ -9,7 +9,7 @@ inherit java-pkg-2 java-pkg-simple
DESCRIPTION="100% Pure Java Regular Expression package"
SRC_URI="mirror://apache/jakarta/regexp/source/${P}.tar.gz"
-HOMEPAGE="http://jakarta.apache.org/"
+HOMEPAGE="https://jakarta.apache.org/"
SLOT="${PV}"
IUSE=""
diff --git a/dev-java/jakarta-regexp/jakarta-regexp-1.4-r3.ebuild b/dev-java/jakarta-regexp/jakarta-regexp-1.4-r3.ebuild
new file mode 100644
index 00000000000..db72332f033
--- /dev/null
+++ b/dev-java/jakarta-regexp/jakarta-regexp-1.4-r3.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="100% Pure Java Regular Expression package"
+SRC_URI="mirror://apache/jakarta/regexp/source/${P}.tar.gz"
+HOMEPAGE="https://jakarta.apache.org/"
+
+SLOT="${PV}"
+IUSE=""
+LICENSE="Apache-1.1"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+
+RDEPEND="
+ >=virtual/jre-1.8:*"
+
+DEPEND="
+ >=virtual/jdk-1.8:*"
+
+S="${WORKDIR}/${P}"
+
+JAVA_SRC_DIR="src/java"
+
+src_prepare() {
+ default
+ java-pkg_clean
+}
diff --git a/dev-java/jakarta-regexp/jakarta-regexp-1.5-r1.ebuild b/dev-java/jakarta-regexp/jakarta-regexp-1.5-r1.ebuild
new file mode 100644
index 00000000000..db72332f033
--- /dev/null
+++ b/dev-java/jakarta-regexp/jakarta-regexp-1.5-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="100% Pure Java Regular Expression package"
+SRC_URI="mirror://apache/jakarta/regexp/source/${P}.tar.gz"
+HOMEPAGE="https://jakarta.apache.org/"
+
+SLOT="${PV}"
+IUSE=""
+LICENSE="Apache-1.1"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+
+RDEPEND="
+ >=virtual/jre-1.8:*"
+
+DEPEND="
+ >=virtual/jdk-1.8:*"
+
+S="${WORKDIR}/${P}"
+
+JAVA_SRC_DIR="src/java"
+
+src_prepare() {
+ default
+ java-pkg_clean
+}
diff --git a/dev-java/jakarta-regexp/jakarta-regexp-1.5.ebuild b/dev-java/jakarta-regexp/jakarta-regexp-1.5.ebuild
index ddfe39278ff..f5a39f4ca7d 100644
--- a/dev-java/jakarta-regexp/jakarta-regexp-1.5.ebuild
+++ b/dev-java/jakarta-regexp/jakarta-regexp-1.5.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=5
@@ -9,7 +9,7 @@ inherit java-pkg-2 java-pkg-simple
DESCRIPTION="100% Pure Java Regular Expression package"
SRC_URI="mirror://apache/jakarta/regexp/source/${P}.tar.gz"
-HOMEPAGE="http://jakarta.apache.org/"
+HOMEPAGE="https://jakarta.apache.org/"
SLOT="${PV}"
IUSE=""
diff --git a/dev-java/jakarta-xml-soap-api/Manifest b/dev-java/jakarta-xml-soap-api/Manifest
new file mode 100644
index 00000000000..2ab2cfcfb03
--- /dev/null
+++ b/dev-java/jakarta-xml-soap-api/Manifest
@@ -0,0 +1 @@
+DIST jakarta-xml-soap-api-1.4.2.tar.gz 107226 BLAKE2B 4de5b994505d1964b6804010191b7b623322005d7bac6e9295062e821b5e0994a02d04f72d7f1bba9a8bf835ce42f455678af35c8cdf3e9e7208a2fde4151927 SHA512 9df8bb191fee0f6afa46f2d0c4bd5d1760324220be6862ff17df77d0dd4c9341360f18dd935233fdf6d9656d511c5378bd557e3dadd6570dfd3c9d7981179516
diff --git a/dev-java/jakarta-xml-soap-api/jakarta-xml-soap-api-1.4.2.ebuild b/dev-java/jakarta-xml-soap-api/jakarta-xml-soap-api-1.4.2.ebuild
new file mode 100644
index 00000000000..b22fd582fcc
--- /dev/null
+++ b/dev-java/jakarta-xml-soap-api/jakarta-xml-soap-api-1.4.2.ebuild
@@ -0,0 +1,65 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# This version provides module java.xml.soap and package javax.xml.soap
+MAVEN_ID="jakarta.xml.soap:jakarta.xml.soap-api:1.4.2"
+
+JAVA_PKG_IUSE="doc source test"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="SOAP with Attachments API for Java (SAAJ) API (Eclipse Project for JAX-WS)"
+HOMEPAGE="https://projects.eclipse.org/projects/ee4j.jaxws"
+SRC_URI="https://github.com/eclipse-ee4j/saaj-api/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+# EDL-1.0 equivalent to BSD
+# - 'SPDX-License-Identifier: BSD-3-Clause' in source files' headers
+# - https://www.eclipse.org/org/documents/edl-v10.php
+LICENSE="BSD"
+# Since version 2.0.0, the namespace has changed to jakarta.xml.soap
+SLOT="1"
+KEYWORDS="~amd64 ~x86"
+
+CP_DEPEND="
+ dev-java/jakarta-activation-api:1
+"
+
+DEPEND="
+ >=virtual/jdk-1.8:*
+ ${CP_DEPEND}
+"
+
+RDEPEND="
+ >=virtual/jre-1.8:*
+ ${CP_DEPEND}
+"
+
+S="${WORKDIR}/saaj-api-${PV}"
+
+JAVA_SRC_DIR="api/src/main/java"
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_SRC_DIR="api/src/test/java"
+JAVA_TEST_RESOURCE_DIRS=( "api/src/test/resources" )
+
+DOCS=( CONTRIBUTING.md NOTICE.md README.md )
+
+src_test() {
+ if ver_test "$(java-config -g PROVIDES_VERSION)" -lt 9; then
+ # https://github.com/javaee/javax.xml.soap/blob/1.4.0/pom.xml#L134-L143
+ JAVA_TEST_EXTRA_ARGS=( -Xbootclasspath/p:target/classes )
+ else
+ # '-Xbootclasspath/p' removed since JDK 9; '-Xbootclasspath/a' remains
+ # https://openjdk.java.net/jeps/261
+ JAVA_TEST_EXTRA_ARGS=( -Xbootclasspath/a:target/classes )
+ fi
+ java-pkg-simple_src_test
+}
+
+src_install() {
+ java-pkg-simple_src_install
+ einstalldocs # https://bugs.gentoo.org/789582
+}
diff --git a/dev-java/jcommon/metadata.xml b/dev-java/jakarta-xml-soap-api/metadata.xml
index 1cf7db5ba34..a5b17ebd397 100644
--- a/dev-java/jcommon/metadata.xml
+++ b/dev-java/jakarta-xml-soap-api/metadata.xml
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>java@gentoo.org</email>
<name>Java</name>
</maintainer>
<upstream>
- <remote-id type="sourceforge">jfreechart</remote-id>
+ <remote-id type="github">eclipse-ee4j/saaj-api</remote-id>
</upstream>
</pkgmetadata>
diff --git a/dev-java/jakartaee-migration/jakartaee-migration-1.0.0.ebuild b/dev-java/jakartaee-migration/jakartaee-migration-1.0.0.ebuild
index a5a06c63d54..405fd366f61 100644
--- a/dev-java/jakartaee-migration/jakartaee-migration-1.0.0.ebuild
+++ b/dev-java/jakartaee-migration/jakartaee-migration-1.0.0.ebuild
@@ -12,7 +12,7 @@ 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."
+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"
diff --git a/dev-java/jama/Manifest b/dev-java/jama/Manifest
deleted file mode 100644
index aee9142a85c..00000000000
--- a/dev-java/jama/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST jama-1.0.3.tar.gz 82188 BLAKE2B 35de815f770b192cd1b86a56ddf1919e12675d898ec4473489d3ce2c3899185f9d96eda39b6f7520fc67edfd17fe58b585f788f6a6967220150fc9a334b219ea SHA512 9bedf8f35ea1d400194b5a3b49914ebd04b5a31247959886f1967d062ceffae30993d34cd2f15d3942285a45c6930e2d4518f4ed0cc013ce853cc26aca021b0d
diff --git a/dev-java/jama/jama-1.0.3-r1.ebuild b/dev-java/jama/jama-1.0.3-r1.ebuild
deleted file mode 100644
index c3d99e6cda6..00000000000
--- a/dev-java/jama/jama-1.0.3-r1.ebuild
+++ /dev/null
@@ -1,28 +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="Jama"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A Java Matrix Package"
-HOMEPAGE="https://math.nist.gov/javanumerics/jama/"
-SRC_URI="https://math.nist.gov/javanumerics/${PN}/${MY_P}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86"
-
-DEPEND=">=virtual/jdk-1.6"
-RDEPEND=">=virtual/jre-1.6"
-
-S="${WORKDIR}"
-
-java_prepare() {
- java-pkg_clean
-}
diff --git a/dev-java/jama/metadata.xml b/dev-java/jama/metadata.xml
deleted file mode 100644
index 6021501589e..00000000000
--- a/dev-java/jama/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/jamon/Manifest b/dev-java/jamon/Manifest
deleted file mode 100644
index dc04a2c395f..00000000000
--- a/dev-java/jamon/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST jamonapi-2_81.tar.gz 23149879 BLAKE2B 1e21c6ae849a1fec74b87614594007653ccb573b450c495396951532dfe713ab47944425f421b212e052153c84163f79f376413946d16917e0900ec5fe64be8b SHA512 09fba65aec2754f8a1b85dd7f5691b8bae5c4f1c852dd69cddb3642a594bb44baa5b6a3c611657041d6ce2cc37c824a111adeaa929761e3983d43d7080ce05b1
diff --git a/dev-java/jamon/jamon-2.81.ebuild b/dev-java/jamon/jamon-2.81.ebuild
deleted file mode 100644
index 32622058bb3..00000000000
--- a/dev-java/jamon/jamon-2.81.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-MY_PN="${PN}api"
-MY_PV="${PV//./_}"
-MY_P="${MY_PN}-${MY_PV}"
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Java API to monitor production applications"
-HOMEPAGE="http://www.jamonapi.com/"
-SRC_URI="https://github.com/stevensouza/${MY_PN}/archive/v${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
-LICENSE="BSD"
-SLOT="2"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-CDEPEND="dev-java/log4j:0
- java-virtuals/interceptor-api:0
- java-virtuals/servlet-api:3.0
- www-servers/tomcat:7"
-
-RDEPEND="${CDEPEND}
- >=virtual/jre-1.7
- dev-db/hsqldb:0
- dev-java/jakarta-oro:2.0"
-
-DEPEND="${CDEPEND}
- >=virtual/jdk-1.7
- test? (
- dev-db/hsqldb:0
- dev-java/assertj-core:2
- dev-java/junit:4
- dev-java/mockito:0
- dev-java/objenesis:0
- )"
-
-S="${WORKDIR}/${MY_P}"
-JAVA_GENTOO_CLASSPATH="interceptor-api,log4j,servlet-api-3.0,tomcat-7"
-JAVA_SRC_DIR="${PN}/src/main/java"
-WAR_DIR="jamon_war/src/main/webapp"
-
-java_prepare() {
- # No Jetty or Hazelcast packaged right now and Spring is ancient.
- find \( -name "*Jetty*.java" -o -name "*Hazelcast*.java" \) -exec rm -v {} + || die
- rm -rv ./jamon/src/test/java/com/jamonapi/distributed/JamonDataPersisterFactoryTest.java \
- ./jamon/src/{main,test}/java/com/jamonapi/aop/spring || die
-
- # Keep fdsapi and xss-html-filter bundled as we lack packages.
- rm -v ${WAR_DIR}/WEB-INF/lib/{hsqldb,jakarta-oro}*.jar || die
-}
-
-src_compile() {
- java-pkg-simple_src_compile
- jar cf ${PN}.war -C ${WAR_DIR} . || die
-}
-
-src_install() {
- java-pkg-simple_src_install
- java-pkg_dowar ${PN}.war
- dodoc designnotes.txt README.md
-
- # hsqldb used by JSP files, oro used by fdsapi.
- java-pkg_register-dependency hsqldb,jakarta-oro-2.0
-}
-
-src_test() {
- cd jamon/src/test/java || die
-
- local CP=".:../resources:${S}/${PN}.jar:$(java-pkg_getjars assertj-core-2,hsqldb,junit-4,mockito,objenesis,${JAVA_GENTOO_CLASSPATH})"
- 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/jamon/metadata.xml b/dev-java/jamon/metadata.xml
deleted file mode 100644
index 021770d485b..00000000000
--- a/dev-java/jamon/metadata.xml
+++ /dev/null
@@ -1,16 +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>
- <longdescription>
- A free, simple, high performance, thread safe, Java API that allows
- developers to easily monitor production applications
- </longdescription>
- <upstream>
- <remote-id type="github">stevensouza/jamonapi</remote-id>
- <remote-id type="sourceforge">jamonapi</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/dev-java/janino/Manifest b/dev-java/janino/Manifest
deleted file mode 100644
index 60add465e00..00000000000
--- a/dev-java/janino/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST janino-2.7.0.zip 992669 BLAKE2B cc9ba79d0fc9af5bbe73f167dee6d15619b40b75852fcc227eaf5399e427cde2aeca4b6ef3ff21f303b71dbc21f432cc3e844583cafce3cb073eec1a1498c45a SHA512 0fe0faf16c9d7c63ed14b156bbf75b1ce6deebda24fc0eb0176e96693de9877187694dfb39e748523329430332a36017b2d7d04b2b26ef0847fde7396106185f
diff --git a/dev-java/janino/janino-2.7.0.ebuild b/dev-java/janino/janino-2.7.0.ebuild
deleted file mode 100644
index 92ea09bfe8c..00000000000
--- a/dev-java/janino/janino-2.7.0.ebuild
+++ /dev/null
@@ -1,47 +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 examples"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="An embedded compiler for run-time compilation purposes"
-HOMEPAGE="http://janino.net/"
-SRC_URI="http://janino.net/download/${P}.zip"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-
-IUSE=""
-
-CDEPEND="dev-java/ant-core:0
- dev-java/unkrig-nullanalysis:0"
-RDEPEND=">=virtual/jre-1.6
- ${CDEPEND}"
-DEPEND=">=virtual/jdk-1.6
- app-arch/unzip
- ${CDEPEND}"
-
-S="${WORKDIR}/${P}"
-JAVA_SRC_DIR="src"
-JAVA_GENTOO_CLASSPATH="ant-core,unkrig-nullanalysis"
-
-java_prepare() {
- unzip "${S}"/janino-src.zip -d ${JAVA_SRC_DIR} && \
- unzip "${S}"/commons-compiler-src.zip -d ${JAVA_SRC_DIR} || die
- find -iname '*.jar' -delete || die
-
- mkdir -p target/classes && \
- mv src/org.codehaus.commons.compiler.properties target/classes || die
-
- mkdir examples || die
- mv src/org/codehaus/commons/compiler/samples/* examples/ || die
-}
-
-src_install() {
- java-pkg-simple_src_install
- use examples && java-pkg_doexamples examples/
-}
diff --git a/dev-java/jansi-native/jansi-native-1.8.ebuild b/dev-java/jansi-native/jansi-native-1.8.ebuild
index ee86cabc4d4..88351addaf4 100644
--- a/dev-java/jansi-native/jansi-native-1.8.ebuild
+++ b/dev-java/jansi-native/jansi-native-1.8.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/fusesource/${PN}/archive/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
CDEPEND="dev-java/hawtjni-runtime:0"
diff --git a/dev-java/jansi/Manifest b/dev-java/jansi/Manifest
index 31fabc8cd4c..1325190f77b 100644
--- a/dev-java/jansi/Manifest
+++ b/dev-java/jansi/Manifest
@@ -1 +1,2 @@
DIST jansi-1.13.tar.gz 253219 BLAKE2B 89fc81710bc0860c717241c97fe2e7a148ccbaa5fb1e7db30b978aa69cddccbc9ea45a0e30ef384c42a741d707f5eab73ce8b2a76e1095c66a2c95f9088f28f0 SHA512 9c4bb0b7435c102068718e039900828994f1ba60ed44307eb726eb91a2884bc406688c2747635b9353f3bd68a6bf0e7c082a4069343b59efffc900f59c563fde
+DIST jansi-2.4.0.tar.gz 225579 BLAKE2B f07dfde9b789d62ec31999632e35609143289c5ab0972ce7cb931dea72ba41e6f2b9b74f7b3d82050e9ed4abd89386040d5268c408d787d3edd49fcdf0cce965 SHA512 4172b264463b847d6008dfad5c80246b029c7add2fd659f4b1c636891a86860f8f5ddd0ce0a5150065faeae72b19682339dda2d019c82f45d8f1be7a547e4558
diff --git a/dev-java/jansi/jansi-1.13.ebuild b/dev-java/jansi/jansi-1.13.ebuild
index 347109e6b44..900dd405b1d 100644
--- a/dev-java/jansi/jansi-1.13.ebuild
+++ b/dev-java/jansi/jansi-1.13.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/fusesource/${PN}/archive/${PN}-project-${PV}.tar.gz
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
CDEPEND="dev-java/jansi-native:0"
diff --git a/dev-java/jansi/jansi-2.4.0-r1.ebuild b/dev-java/jansi/jansi-2.4.0-r1.ebuild
new file mode 100644
index 00000000000..75e764ffdbf
--- /dev/null
+++ b/dev-java/jansi/jansi-2.4.0-r1.ebuild
@@ -0,0 +1,78 @@
+# 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/fusesource/jansi/archive/refs/tags/jansi-2.4.0.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild jansi-2.4.0.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="org.fusesource.jansi:jansi:2.4.0"
+
+inherit java-pkg-2 java-pkg-simple toolchain-funcs
+
+DESCRIPTION="Jansi is a java library for generating and interpreting ANSI escape sequences."
+HOMEPAGE="http://fusesource.github.io/jansi"
+SRC_URI="https://github.com/fusesource/${PN}/archive/refs/tags/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+# Compile dependencies
+# POM: pom.xml
+# test? info.picocli:picocli-codegen:4.5.2 -> !!!artifactId-not-found!!!
+# test? org.junit.jupiter:junit-jupiter:5.7.0 -> !!!groupId-not-found!!!
+# test? org.junit.jupiter:junit-jupiter-params:5.7.0 -> !!!groupId-not-found!!!
+
+DEPEND=">=virtual/jdk-1.8:*"
+
+# junit-jupiter is not available in ::gentoo
+# test? (
+# !!!artifactId-not-found!!!
+# !!!groupId-not-found!!!
+# )
+#"
+
+RDEPEND=">=virtual/jre-1.8:*"
+
+DOCS=( {changelog,readme}.md license.txt )
+
+S="${WORKDIR}/${PN}-${P}"
+
+JAVA_SRC_DIR="src/main/java"
+JAVA_RESOURCE_DIRS="src/main/resources"
+JAVA_MAIN_CLASS="org.fusesource.jansi.AnsiMain"
+
+# junit-jupiter is not available in ::gentoo
+#JAVA_TEST_GENTOO_CLASSPATH="!!!artifactId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!"
+#JAVA_TEST_SRC_DIR="src/test/java"
+#JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+
+src_prepare() {
+ default
+ # Remove this directory containing libjansi.so, libjansi.jnilib and jansi.dll
+ rm -r "${JAVA_RESOURCE_DIRS}/org/fusesource/jansi/internal/native" || die
+}
+
+src_compile() {
+ java-pkg-simple_src_compile
+
+ # build native library.
+ local args=(
+ CCFLAGS="${CFLAGS} ${CXXFLAGS} -Os -fPIC -fvisibility=hidden"
+ LINKFLAGS="-shared ${LDFLAGS}"
+ CC="$(tc-getCC)"
+ STRIP="$(tc-getSTRIP)"
+ LIBNAME="libjansi-$(ver_cut 1-2).so"
+ )
+ emake "${args[@]}" native
+}
+
+src_install() {
+ # default # https://bugs.gentoo.org/789582
+ # deafult fails with
+ # make: *** No rule to make target 'install'. Stop.
+ java-pkg_doso target/native--/libjansi-$(ver_cut 1-2).so
+ java-pkg-simple_src_install
+}
diff --git a/dev-java/java-config/java-config-2.3.1.ebuild b/dev-java/java-config/java-config-2.3.1.ebuild
index 69ba112dacf..45feed60cc3 100644
--- a/dev-java/java-config/java-config-2.3.1.ebuild
+++ b/dev-java/java-config/java-config-2.3.1.ebuild
@@ -4,7 +4,7 @@
EAPI=7
# jython depends on java-config, so don't add it or things will break
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
DISTUTILS_USE_SETUPTOOLS=no
inherit distutils-r1
diff --git a/dev-java/java-config/java-config-9999.ebuild b/dev-java/java-config/java-config-9999.ebuild
index b0bfd8b9071..00d8aaa41b6 100644
--- a/dev-java/java-config/java-config-9999.ebuild
+++ b/dev-java/java-config/java-config-9999.ebuild
@@ -4,7 +4,7 @@
EAPI=7
# jython depends on java-config, so don't add it or things will break
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
DISTUTILS_USE_SETUPTOOLS=no
inherit distutils-r1
diff --git a/dev-java/javacc/javacc-5.0-r3.ebuild b/dev-java/javacc/javacc-5.0-r3.ebuild
index a400ba3f05b..2ee54cf55c8 100644
--- a/dev-java/javacc/javacc-5.0-r3.ebuild
+++ b/dev-java/javacc/javacc-5.0-r3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://java.net/projects/${PN}/downloads/download/${P}src.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
CDEPEND="dev-java/junit:0"
diff --git a/dev-java/javacc/javacc-5.0-r4.ebuild b/dev-java/javacc/javacc-5.0-r4.ebuild
new file mode 100644
index 00000000000..dac3ebd544e
--- /dev/null
+++ b/dev-java/javacc/javacc-5.0-r4.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc examples source test"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Java Compiler Compiler - The Java Parser Generator"
+HOMEPAGE="https://javacc.java.net/"
+SRC_URI="http://java.net/projects/${PN}/downloads/download/${P}src.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+
+CDEPEND="dev-java/junit:0"
+
+RDEPEND="
+ ${CDEPEND}
+ >=virtual/jre-1.8:*"
+
+DEPEND="
+ ${CDEPEND}
+ >=virtual/jdk-1.8:*
+ test? ( dev-java/ant-junit:0 )"
+
+S="${WORKDIR}/${PN}"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-4.0-javadoc.patch
+)
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+JAVA_ANT_CLASSPATH_TAGS+=" javadoc"
+
+EANT_GENTOO_CLASSPATH="junit"
+
+src_prepare() {
+ default
+
+ rm -v lib/junit*/*.jar || die
+}
+
+src_test() {
+ java-pkg-2_src_test
+}
+
+src_install() {
+ java-pkg_dojar "bin/lib/${PN}.jar"
+
+ if use doc; then
+ java-pkg_dohtml -r www/*
+ java-pkg_dojavadoc doc/api
+ fi
+
+ use examples && java-pkg_doexamples examples
+ use source && java-pkg_dosrc src/*
+
+ echo "JAVACC_HOME=${EPREFIX}/usr/share/javacc/" > "${T}"/22javacc || die
+ doenvd "${T}"/22javacc
+
+ echo "export VERSION=${PV}" > "${T}"/pre || die
+
+ local launcher
+ for launcher in javacc jjdoc jjtree; do
+ java-pkg_dolauncher ${launcher} -pre "${T}"/pre --main ${launcher}
+ done
+
+ einstalldocs
+}
diff --git a/dev-java/javassist/Manifest b/dev-java/javassist/Manifest
index c1980d23980..3b210b4537e 100644
--- a/dev-java/javassist/Manifest
+++ b/dev-java/javassist/Manifest
@@ -1,2 +1 @@
-DIST javassist-2.6.zip 1143271 BLAKE2B 05f4e5ebc47420054d4c3d2f77cde33b92e616f3c6740fc030e69b90a697bfbb67be300375d9efc1929a2acfe3493f427222f8a7b1e3137d8bc42f749e51f840 SHA512 8a6da5e2a44cc3bc5b87538a4eda56808d13998d8c9932153f9bb42a1c7844d1a1c7311eb22b0b4ad04649bb7c22156acf851bee638cffbd3328bcef1d2a9f37
DIST javassist-3.18.2.tar.gz 1179428 BLAKE2B cc7dfebca2e47576f902e6249c1efb65c18823e75ba3698c2d94541bdc910b9b7547e8619c1f19a84c158771230ddd112ddb0445ed97cd64810beacf3468a1ba SHA512 67f22a70584eba31088d63b7862f0f7872a6a7ec57f4397b95044695af75be005e86aa5a5f20fe8e650c2178a9b63b4b922accf940b46ceb1c8e7ce9c51798ca
diff --git a/dev-java/javassist/javassist-2.6-r2.ebuild b/dev-java/javassist/javassist-2.6-r2.ebuild
deleted file mode 100644
index 01083b6a150..00000000000
--- a/dev-java/javassist/javassist-2.6-r2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc source examples"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Javassist makes Java bytecode manipulation simple"
-SRC_URI="mirror://sourceforge/jboss/${P}.zip"
-HOMEPAGE="http://www.csg.is.titech.ac.jp/~chiba/javassist/"
-
-LICENSE="MPL-1.1"
-SLOT="2"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=">=virtual/jre-1.6"
-DEPEND=">=virtual/jdk-1.6
- app-arch/unzip"
-S="${WORKDIR}"
-
-EANT_DOC_TARGET="javadocs"
-
-src_install() {
- java-pkg_dojar ${PN}.jar
- java-pkg_dohtml *.html
- use doc && java-pkg_dojavadoc html
- use source && java-pkg_dosrc src/main/javassist
- use examples && java-pkg_doexamples sample/*
-}
diff --git a/dev-java/javassist/javassist-3.18.2-r1.ebuild b/dev-java/javassist/javassist-3.18.2-r1.ebuild
index 7db6def075e..239e1b7b9cc 100644
--- a/dev-java/javassist/javassist-3.18.2-r1.ebuild
+++ b/dev-java/javassist/javassist-3.18.2-r1.ebuild
@@ -20,7 +20,7 @@ S="${WORKDIR}/${PN}-rel_${PV//./_}_ga_build"
LICENSE="MPL-1.1"
SLOT="3"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux"
RDEPEND=">=virtual/jre-1.8:*"
DEPEND=">=virtual/jdk-1.8:*"
diff --git a/dev-java/javassist/javassist-3.18.2.ebuild b/dev-java/javassist/javassist-3.18.2.ebuild
deleted file mode 100644
index 6aa16a6c6f6..00000000000
--- a/dev-java/javassist/javassist-3.18.2.ebuild
+++ /dev/null
@@ -1,40 +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 examples"
-MAVEN_ID="javassist:javassist:3.18.2"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Javassist makes Java bytecode manipulation simple"
-HOMEPAGE="http://www.csg.is.titech.ac.jp/~chiba/javassist/"
-SRC_URI="https://github.com/jboss-javassist/javassist/archive/rel_${PV//./_}_ga_build.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MPL-1.1"
-SLOT="3"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=">=virtual/jre-1.6"
-DEPEND=">=virtual/jdk-1.6
- app-arch/unzip"
-
-S="${WORKDIR}/${PN}-rel_${PV//./_}_ga_build"
-
-EANT_DOC_TARGET="javadocs"
-JAVA_ANT_REWRITE_CLASSPATH=y
-EANT_NEEDS_TOOLS="yes"
-
-java_prepare() {
- find -name "*.jar" -delete || die
-}
-
-src_install() {
- java-pkg_dojar ${PN}.jar
- dohtml Readme.html
- use doc && java-pkg_dojavadoc html
- use source && java-pkg_dosrc src/main/javassist
- use examples && java-pkg_doexamples sample/*
-}
diff --git a/dev-java/javatoolkit/javatoolkit-0.6.7.ebuild b/dev-java/javatoolkit/javatoolkit-0.6.7.ebuild
index 2b245791169..d2ba9cf64fa 100644
--- a/dev-java/javatoolkit/javatoolkit-0.6.7.ebuild
+++ b/dev-java/javatoolkit/javatoolkit-0.6.7.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{7,8,9,10} )
PYTHON_REQ_USE="xml(+)"
DISTUTILS_USE_SETUPTOOLS=no
diff --git a/dev-java/javax-inject/javax-inject-1-r2.ebuild b/dev-java/javax-inject/javax-inject-1-r2.ebuild
index 146f331c833..1e5e418d3cd 100644
--- a/dev-java/javax-inject/javax-inject-1-r2.ebuild
+++ b/dev-java/javax-inject/javax-inject-1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -10,7 +10,7 @@ MY_PN="${PN/-/.}"
MY_P="${MY_PN}-${PV}"
DESCRIPTION="Dependency injection for Java (JSR-330)"
-HOMEPAGE="https://code.google.com/p/atinject/"
+HOMEPAGE="https://github.com/javax-inject/javax-inject"
SRC_URI="http://central.maven.org/maven2/javax/inject/${MY_PN}/${PV}/${MY_P}-sources.jar"
LICENSE="Apache-2.0"
diff --git a/dev-java/javax-inject/javax-inject-1-r3.ebuild b/dev-java/javax-inject/javax-inject-1-r3.ebuild
index 74af36fc081..4778a718f69 100644
--- a/dev-java/javax-inject/javax-inject-1-r3.ebuild
+++ b/dev-java/javax-inject/javax-inject-1-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=6
@@ -11,12 +11,12 @@ MY_PN="${PN/-/.}"
MY_P="${MY_PN}-${PV}"
DESCRIPTION="Dependency injection for Java (JSR-330)"
-HOMEPAGE="https://code.google.com/p/atinject/"
+HOMEPAGE="https://github.com/javax-inject/javax-inject"
SRC_URI="http://central.maven.org/maven2/javax/inject/${MY_PN}/${PV}/${MY_P}-sources.jar -> ${P}.jar"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 arm64 ppc64 ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~arm arm64 ppc64 ~x86 ~amd64-linux"
RDEPEND=">=virtual/jre-1.6"
DEPEND=">=virtual/jdk-1.6"
diff --git a/dev-java/javax-inject/javax-inject-1-r4.ebuild b/dev-java/javax-inject/javax-inject-1-r4.ebuild
new file mode 100644
index 00000000000..24a0d7ec287
--- /dev/null
+++ b/dev-java/javax-inject/javax-inject-1-r4.ebuild
@@ -0,0 +1,22 @@
+# 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="${PN/-/.}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Dependency injection for Java (JSR-330)"
+HOMEPAGE="https://github.com/javax-inject/javax-inject"
+SRC_URI="http://central.maven.org/maven2/javax/inject/${MY_PN}/${PV}/${MY_P}-sources.jar -> ${P}.jar"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux"
+
+RDEPEND=">=virtual/jre-1.8:*"
+DEPEND=">=virtual/jdk-1.8:*"
diff --git a/dev-java/jaxb-api/Manifest b/dev-java/jaxb-api/Manifest
index 1298a573f19..ce873eee07a 100644
--- a/dev-java/jaxb-api/Manifest
+++ b/dev-java/jaxb-api/Manifest
@@ -1 +1,2 @@
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
diff --git a/dev-java/jaxb-api/jaxb-api-3.0.1.ebuild b/dev-java/jaxb-api/jaxb-api-3.0.1.ebuild
new file mode 100644
index 00000000000..1588cd3601b
--- /dev/null
+++ b/dev-java/jaxb-api/jaxb-api-3.0.1.ebuild
@@ -0,0 +1,40 @@
+# 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/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/jaxen/jaxen-1.2.0-r1.ebuild b/dev-java/jaxen/jaxen-1.2.0-r1.ebuild
index 211abc53f20..263da0bf4a8 100644
--- a/dev-java/jaxen/jaxen-1.2.0-r1.ebuild
+++ b/dev-java/jaxen/jaxen-1.2.0-r1.ebuild
@@ -12,7 +12,7 @@ JAVA_TESTING_FRAMEWORKS="junit"
inherit java-pkg-2 java-pkg-simple
-DESCRIPTION="Jaxen is a universal XPath engine for Java."
+DESCRIPTION="Jaxen is a universal XPath engine for Java"
HOMEPAGE="http://www.cafeconleche.org/jaxen/"
SRC_URI="https://github.com/${PN}-xpath/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
diff --git a/dev-java/jchardet/Manifest b/dev-java/jchardet/Manifest
deleted file mode 100644
index 8542869adfc..00000000000
--- a/dev-java/jchardet/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST jchardet-1.1.zip 82782 BLAKE2B 08ceb3119615ab25a43030392ce0114a03b00ae7dd5488cbafac66f36e8963cc200f3c80afff6a99cf0a1f6bdfac8c22a27a5f0d2e4a217443916eda75752cac SHA512 3a6141b1783286adfc072075f46da8f6e719361425cb2cbcd1c4c4dd82a6ef834a9f6f1aad8126d663dcfa12ad20cc362566dc2095ea95e01bd95adfae20bc28
diff --git a/dev-java/jchardet/jchardet-1.1-r1.ebuild b/dev-java/jchardet/jchardet-1.1-r1.ebuild
deleted file mode 100644
index d566bb21eb0..00000000000
--- a/dev-java/jchardet/jchardet-1.1-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2015 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
-
-DESCRIPTION="Java port of Mozilla's Automatic Charset Detection algorithm"
-HOMEPAGE="http://jchardet.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}/${P}.zip"
-
-LICENSE="MPL-1.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE=""
-
-RDEPEND=">=virtual/jre-1.6"
-DEPEND=">=virtual/jdk-1.6
- app-arch/unzip"
-
-S="${WORKDIR}/${P}"
-JAVA_SRC_DIR="src"
-
-java_prepare() {
- java-pkg_clean
-}
diff --git a/dev-java/jchardet/metadata.xml b/dev-java/jchardet/metadata.xml
deleted file mode 100644
index e9bb6ac8113..00000000000
--- a/dev-java/jchardet/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="sourceforge">jchardet</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/dev-java/jcifs/jcifs-1.3.19.ebuild b/dev-java/jcifs/jcifs-1.3.19-r1.ebuild
index de48d1147b2..b8169cb7986 100644
--- a/dev-java/jcifs/jcifs-1.3.19.ebuild
+++ b/dev-java/jcifs/jcifs-1.3.19-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=8
JAVA_PKG_IUSE="doc examples source"
@@ -10,6 +10,7 @@ inherit java-pkg-2 java-pkg-simple
DESCRIPTION="Library that implements the CIFS/SMB networking protocol in Java"
SRC_URI="https://jcifs.samba.org/src/${P}.tgz"
HOMEPAGE="https://jcifs.samba.org/"
+
LICENSE="LGPL-2.1"
SLOT="1.1"
@@ -19,11 +20,11 @@ CDEPEND="java-virtuals/servlet-api:3.0"
RDEPEND="
${CDEPEND}
- >=virtual/jre-1.6"
+ >=virtual/jre-1.8:*"
DEPEND="
${CDEPEND}
- >=virtual/jdk-1.6"
+ >=virtual/jdk-1.8:*"
JAVA_GENTOO_CLASSPATH="servlet-api-3.0"
diff --git a/dev-java/jcommander/jcommander-1.48-r1.ebuild b/dev-java/jcommander/jcommander-1.48-r1.ebuild
new file mode 100644
index 00000000000..a6f99b1114f
--- /dev/null
+++ b/dev-java/jcommander/jcommander-1.48-r1.ebuild
@@ -0,0 +1,29 @@
+# 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="Command line parsing framework for Java"
+HOMEPAGE="https://github.com/cbeust/jcommander"
+SRC_URI="https://github.com/cbeust/${PN}/archive/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
+
+S="${WORKDIR}/${PN}-${P}"
+
+RESTRICT="test"
+
+src_prepare() {
+ default
+
+ rm -rf src/test || die
+}
diff --git a/dev-java/jcommander/jcommander-1.48.ebuild b/dev-java/jcommander/jcommander-1.48.ebuild
index 50fccec7c40..4e01584edd8 100644
--- a/dev-java/jcommander/jcommander-1.48.ebuild
+++ b/dev-java/jcommander/jcommander-1.48.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/cbeust/${PN}/archive/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
DEPEND=">=virtual/jdk-1.6"
RDEPEND=">=virtual/jre-1.6"
diff --git a/dev-java/jcommon/Manifest b/dev-java/jcommon/Manifest
deleted file mode 100644
index c7cdd4429d5..00000000000
--- a/dev-java/jcommon/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST jcommon-1.0.23.zip 1373666 BLAKE2B 23c87cd18339ea8f5991933c1430464ca5a408d4d4afb42847ee8c3b941d8fd7ed9695af74ec9ff7fc5867758b826d49b5def73923e893910efc0a0d77f26f75 SHA512 c358239da8b1ddf53ce94bebb00b6518456aa921dd3aa84fc6a23144d499f14a85ba421cd71f3880e8d10153a6ab816f54c1fa872a4ab694ce3c7b8d69bc2a4b
diff --git a/dev-java/jcommon/jcommon-1.0.23.ebuild b/dev-java/jcommon/jcommon-1.0.23.ebuild
deleted file mode 100644
index 208f734743d..00000000000
--- a/dev-java/jcommon/jcommon-1.0.23.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2 versionator
-
-MY_P=${PN}-$(replace_version_separator 3 -)
-DESCRIPTION="A collection of useful classes used by JFreeChart, JFreeReport and others"
-HOMEPAGE="http://www.jfree.org/jcommon"
-SRC_URI="mirror://sourceforge/jfreechart/${MY_P}.zip"
-
-LICENSE="LGPL-2"
-SLOT="1.0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
- >=virtual/jdk-1.6
- app-arch/unzip
- test? ( dev-java/junit:4 )"
-RDEPEND=">=virtual/jre-1.6"
-
-S="${WORKDIR}"/"${MY_P}"
-
-java_prepare() {
- find "${WORKDIR}" -name '*.jar' -print -delete || die
-
- if ! use debug; then
- antflags="-Dbuild.debug=false -Dbuild.optimize=true"
- fi
-}
-
-src_compile() {
- if ! use debug; then
- antflags="-Dbuild.debug=false -Dbuild.optimize=true"
- fi
- eant -f ant/build.xml compile $(use_doc) $antflags
-}
-
-# No tests defined in build.xml. Let's turn them off.
-# src_test() {
-# java-pkg_jar-from --into lib junit-4
-# eant -f ant/build.xml compile-junit-tests
-# ejunit4 -cp "./lib/${P}-junit.jar:$(java-pkg_getjars junit-4)" \
-# org.jfree.junit.JCommonTestSuite
-# }
-
-src_install() {
- java-pkg_newjar ${P}.jar ${PN}.jar
- dodoc README.md
- use doc && java-pkg_dojavadoc javadoc
- use source && java-pkg_dosrc src/main/java/com src/main/java/org
-}
diff --git a/dev-java/jdynamite/Manifest b/dev-java/jdynamite/Manifest
deleted file mode 100644
index 9628e9f1490..00000000000
--- a/dev-java/jdynamite/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST jdynamite1_2.tar.gz 216501 BLAKE2B d945ad40e7b174722dc81b23f50f02c67e92f5ca274a0e6de48e80921d6f3081a4fc41b977ee457e0184d1c628e67702ef93da0440744fe392399e3f65265f14 SHA512 922dc3755fc673d228edcbb7d20084a7d2123b936b5c38514781bd0c5eeef4a6420a4ca7256fb3ca8796fb057b854c49c6bacd9ca76ac9fdb24b3d3404ea4aea
diff --git a/dev-java/jdynamite/jdynamite-1.2-r1.ebuild b/dev-java/jdynamite/jdynamite-1.2-r1.ebuild
deleted file mode 100644
index 484edc88acf..00000000000
--- a/dev-java/jdynamite/jdynamite-1.2-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2016 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_PV="${PV/./_}"
-DESCRIPTION="Dynamic Template in Java"
-HOMEPAGE="http://jdynamite.sourceforge.net/doc/jdynamite.html"
-SRC_URI="mirror://sourceforge/${PN}/${PN}${MY_PV}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-
-CDEPEND="dev-java/gnu-regexp:1"
-
-DEPEND="
- ${CDEPEND}
- >=virtual/jdk-1.6"
-
-RDEPEND="
- ${CDEPEND}
- >=virtual/jre-1.6"
-
-S="${WORKDIR}/${PN}${PV}"
-
-JAVA_GENTOO_CLASSPATH="gnu-regexp-1"
-JAVA_SRC_DIR="src/cb/jdynamite"
-
-java_prepare() {
- rm -fvr "${S}"/{lib/*,cb,src/gnu,build.xml} || die
-}
diff --git a/dev-java/jdynamite/metadata.xml b/dev-java/jdynamite/metadata.xml
deleted file mode 100644
index be045c43622..00000000000
--- a/dev-java/jdynamite/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="sourceforge">jdynamite</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/dev-java/jffi/jffi-1.2.9-r1.ebuild b/dev-java/jffi/jffi-1.2.9-r1.ebuild
index 6c6b7d259e4..ef103551c7d 100644
--- a/dev-java/jffi/jffi-1.2.9-r1.ebuild
+++ b/dev-java/jffi/jffi-1.2.9-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/jnr/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="|| ( Apache-2.0 LGPL-3 )"
SLOT="1.2"
-KEYWORDS="amd64 ~arm64 ppc64 x86 ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~ppc-macos ~x64-macos"
CDEPEND="dev-libs/libffi:0="
diff --git a/dev-java/jfreesvg/Manifest b/dev-java/jfreesvg/Manifest
deleted file mode 100644
index e35008887db..00000000000
--- a/dev-java/jfreesvg/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST jfreesvg-2.1.zip 2042545 BLAKE2B 702ea55c6e51bca156a41c5e624452fdad8c1a5472c204cbf58f796134ed6027259abd0a48719bbb5f83f6891ab3aec5db58c8726b0275b894065148a07ec179 SHA512 6c1556c640e749778aeb969540db7724895fe2113a7ceea732793730301dd04a1beafef35249b27b75696271bcd67a59236a15c106f7717482561011a1a08bc4
-DIST jfreesvg-3.0.zip 1946062 BLAKE2B 58aa3c95db3a0472de1e2c184f1e8bc9aa72b86f508dd7d41f169f03c8f07380269a36d0a22a71378ab7c2d45427fb479994b907c4e25317794814da69f79d7c SHA512 7d0bdcbf56f0a7110058137d53e291c41e53040cbc19442989a0c6d28f5d6d3ed26ecedbfc947ce845b8a971729e2d784e8ce5a041f6f095ff626a3494a55715
diff --git a/dev-java/jfreesvg/jfreesvg-2.1-r1.ebuild b/dev-java/jfreesvg/jfreesvg-2.1-r1.ebuild
deleted file mode 100644
index 948b007cad2..00000000000
--- a/dev-java/jfreesvg/jfreesvg-2.1-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2016 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-ant-2
-
-DESCRIPTION="JFreeSVG is a fast, light-weight, vector graphics library for the Java platform"
-HOMEPAGE="http://www.jfree.org/jfreesvg/"
-SRC_URI="mirror://sourceforge/jfreegraphics2d/${P}.zip"
-
-LICENSE="GPL-3"
-SLOT="2.1"
-KEYWORDS="amd64 x86"
-IUSE="debug"
-
-DEPEND="
- app-arch/unzip
- >=virtual/jdk-1.6"
-
-RDEPEND="
- >=virtual/jre-1.6"
-
-java_prepare() {
- java-pkg_clean
-}
-
-src_compile() {
- if ! use debug; then
- antflags="-Dbuild.debug=false -Dbuild.optimize=true"
- fi
- eant -f ant/build.xml compile $(use_doc) $antflags
-}
-
-src_install() {
- java-pkg_newjar "./lib/${P}.jar" ${PN}.jar
- dodoc README.md
- use doc && java-pkg_dojavadoc javadoc
- use source && java-pkg_dosrc src/main/java
-}
diff --git a/dev-java/jfreesvg/jfreesvg-3.0.ebuild b/dev-java/jfreesvg/jfreesvg-3.0.ebuild
deleted file mode 100644
index 2b3e2fef840..00000000000
--- a/dev-java/jfreesvg/jfreesvg-3.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2016 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-ant-2
-
-DESCRIPTION="JFreeSVG is a fast, light-weight, vector graphics library for the Java platform"
-HOMEPAGE="http://www.jfree.org/jfreesvg/"
-SRC_URI="mirror://sourceforge/jfreegraphics2d/${P}.zip"
-
-LICENSE="GPL-3"
-SLOT="3.0"
-KEYWORDS="amd64 x86"
-IUSE="debug"
-
-DEPEND=">=virtual/jdk-1.6
- app-arch/unzip"
-RDEPEND=">=virtual/jre-1.6"
-
-java_prepare() {
- find "${WORKDIR}" -name '*.jar' -print -delete || die
-}
-
-src_compile() {
- if ! use debug; then
- antflags="-Dbuild.debug=false -Dbuild.optimize=true"
- fi
- eant -f ant/build.xml compile $(use_doc) $antflags
-}
-
-src_install() {
- java-pkg_newjar "./lib/${P}.jar" ${PN}.jar
- dodoc README.md
- use doc && java-pkg_dojavadoc javadoc
- use source && java-pkg_dosrc src/main/java
-}
diff --git a/dev-java/jfreesvg/metadata.xml b/dev-java/jfreesvg/metadata.xml
deleted file mode 100644
index 143da010670..00000000000
--- a/dev-java/jfreesvg/metadata.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>monsieurp@gentoo.org</email>
- </maintainer>
- <maintainer type="project">
- <email>java@gentoo.org</email>
- <name>Java</name>
- </maintainer>
- <use>
- <flag name="debug">
- Enable debugging during compilation.
- </flag>
- </use>
- <upstream>
- <remote-id type="sourceforge">jfreegraphics2d</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/dev-java/jgoodies-looks/files/jgoodies-looks-2.3.1-build.xml.patch b/dev-java/jgoodies-looks/files/jgoodies-looks-2.3.1-build.xml.patch
deleted file mode 100644
index e6c0a4be233..00000000000
--- a/dev-java/jgoodies-looks/files/jgoodies-looks-2.3.1-build.xml.patch
+++ /dev/null
@@ -1,61 +0,0 @@
---- build.xml.orig 2006-10-12 23:54:26.000000000 +0200
-+++ build.xml 2006-10-12 23:57:36.000000000 +0200
-@@ -100,7 +100,6 @@
- srcdir ="${src.core.dir}"
- destdir ="${build.core.dir}"
- encoding ="${build.encoding}"
-- executable ="${build.compile.executable}"
- fork ="${build.compile.fork}"
- debug ="${build.compile.debug}"
- depend ="${build.compile.depend}"
-@@ -109,8 +108,7 @@
- optimize ="${build.compile.optimize}"
- source ="${build.compile.source}"
- target ="${build.compile.target}"
-- verbose ="${build.compile.verbose}"
-- bootclasspath="${build.boot.classpath}" />
-+ verbose ="${build.compile.verbose}"/>
-
- <copy toDir="${build.core.dir}" >
- <fileset dir="${src.core.dir}"
-@@ -127,7 +125,6 @@
- srcdir ="${src.demo.dir}"
- destdir ="${build.demo.dir}"
- encoding ="${build.encoding}"
-- executable ="${build.compile.executable}"
- fork ="${build.compile.fork}"
- debug ="${build.compile.debug}"
- depend ="${build.compile.depend}"
-@@ -137,7 +134,6 @@
- source ="${build.compile.source}"
- target ="${build.compile.target}"
- verbose ="${build.compile.verbose}"
-- bootclasspath="${build.boot.classpath}"
- classpathref ="classpath.demo" />
- </target>
-
-@@ -149,7 +145,6 @@
- srcdir ="${src.test.dir}"
- destdir ="${build.test.dir}"
- encoding ="${build.encoding}"
-- executable ="${build.compile.executable}"
- fork ="${build.compile.fork}"
- debug ="${build.compile.debug}"
- depend ="${build.compile.depend}"
-@@ -159,7 +154,6 @@
- source ="${build.compile.source}"
- target ="${build.compile.target}"
- verbose ="${build.compile.verbose}"
-- bootclasspath="${build.boot.classpath}"
- classpathref ="classpath.tests" />
- </target>
-
-@@ -235,7 +229,7 @@
- </target>
-
- <!-- ***************************************************************** -->
-- <target name="jar-all" depends="compile, manifest"
-+ <target name="jar-all" depends="compile-core, manifest"
- description="Creates the library jar with all JGoodies l&amp;fs." >
-
- <jar
diff --git a/dev-java/jgrapht/Manifest b/dev-java/jgrapht/Manifest
deleted file mode 100644
index b342056c1d0..00000000000
--- a/dev-java/jgrapht/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST jgrapht-0.8.3.tar.gz 1268147 BLAKE2B 78b9c6a4787adead9c27a4cf74f9ce821bab1ff35a62828383d058d50e4b568118f54bb0270449d75268aaae4d4d47231349342d064d185b4906ceb6b19022d1 SHA512 964790dc74fea1d84f4a4cda4a253ede810725ee7173a2b376acb3f0e10baa2eefcbc38c76441600e0c282e0486243a464116cb803308eac134561181a2c28e6
diff --git a/dev-java/jgrapht/jgrapht-0.8.3.ebuild b/dev-java/jgrapht/jgrapht-0.8.3.ebuild
deleted file mode 100644
index 1ea27d57362..00000000000
--- a/dev-java/jgrapht/jgrapht-0.8.3.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2 eutils
-
-DESCRIPTION="Graph library that is a simpler and faster alternative to JGraph"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-HOMEPAGE="http://jgrapht.sourceforge.net"
-
-KEYWORDS="amd64 x86"
-SLOT="0"
-LICENSE="LGPL-2.1"
-
-CDEPEND="dev-java/touchgraph-graphlayout:0
- dev-java/jgraph:0"
-
-DEPEND="${CDEPEND}
- >=virtual/jdk-1.6
- test? ( dev-java/ant-junit:0
- dev-java/xmlunit:1 )"
-
-RDEPEND="${CDEPEND}
- >=virtual/jre-1.6"
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_GENTOO_CLASSPATH="touchgraph-graphlayout jgraph"
-EANT_DOC_TARGET="javadoc"
-
-java_prepare() {
- rm -rf "${S}/lib" || die
- rm -v "${S}"/*.jar || die
-}
-
-src_test() {
- EANT_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH} xmlunit:1" ANT_TASKS="ant-junit" eant test
-}
-
-src_install() {
- java-pkg_newjar ${PN}*.jar || die
-
- dohtml README.html
- use doc && java-pkg_dojavadoc javadoc
- use source && java-pkg_dosrc src/org
-}
diff --git a/dev-java/jgrapht/metadata.xml b/dev-java/jgrapht/metadata.xml
deleted file mode 100644
index e5ace711985..00000000000
--- a/dev-java/jgrapht/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="sourceforge">jgrapht</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/dev-java/jibx/Manifest b/dev-java/jibx/Manifest
deleted file mode 100644
index 87ac75936ba..00000000000
--- a/dev-java/jibx/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST jibx-1.1.5.zip 6788994 BLAKE2B 0b579e6eb9f6037c92dce3acbec4e9fd5a6aec179cb0f4ecf935ff0bbfb525c4c317d79d21683c3ea6136256b69f5aa9250851802c8eaccf14f3dff9f5ad8aa6 SHA512 13c3a43a53746e9146d1240d73d1948b3c03ead55aa0e79158c2700a385b0dfba0e31122efd11446c1a46c2b3f85235035dc198c6b3acf2fcefa88b2a0683cc7
-DIST jibx-bind-1.2.6-sources.jar 450003 BLAKE2B 01dac23fe19f59f634bbf4c78c5f8bbdd5f61cb20e3fdc0d7a08d18614220b84b0512624019e29d3c2c2500c2d7278613260ce70601f8aaa0a863cbca38dff6a SHA512 8a93aed76d00c465f4fa1d4929bbecc37497b05d7e094b68745bd740bf06cfe87919f3c02b83311766852845e763a2ed51f9ed1d543d03921dea1b67526e7668
-DIST jibx-extras-1.2.6-sources.jar 61737 BLAKE2B 4a9a5f3d2f0490b7322a911bf245e9081c1aeea112908014a64dd32792a5ae2519b5a2d1f29119774ad4d9947ff6ed30304f401a984d677619837139fa4ad4bf SHA512 355e387f92766e2cdd8686e9ed26e80584c668ca6c670532f8f24ae758bc4713cfd505890f0ea634b3380f41429725e2ca719652700b0dc3562d5966b108b3ed
-DIST jibx-run-1.2.6-sources.jar 194660 BLAKE2B 4a5cafab6ed7a75e88151c141bd1b41cad12523c353fe7803de3a0d334c186a86884bb3969b6a0ae17a50f48a360368043b6bf8a2f2a00181650da9f15ecca2b SHA512 623ef57cc411464fe1b936d9795ba982fb221334ad8ea8448afa73d9c229a2b3dacde1ee424864d1c12830d59ca2e9431d54b5cb0d1e8273b4fd6fbc47a3cf5a
diff --git a/dev-java/jibx/jibx-1.1.5-r3.ebuild b/dev-java/jibx/jibx-1.1.5-r3.ebuild
deleted file mode 100644
index 26e71325f61..00000000000
--- a/dev-java/jibx/jibx-1.1.5-r3.ebuild
+++ /dev/null
@@ -1,52 +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"
-
-inherit java-pkg-2 java-ant-2 versionator
-
-MY_PV=$(replace_all_version_separators '_')
-
-DESCRIPTION="JiBX: Binding XML to Java Code"
-HOMEPAGE="http://jibx.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}_${MY_PV}.zip -> ${P}.zip"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-
-CDEPEND="
- dev-java/bcel:0
- dev-java/xpp3:0
- dev-java/dom4j:1
- dev-java/ant-core:0"
-
-DEPEND="
- ${CDEPEND}
- >=virtual/jdk-1.6"
-
-RDEPEND="
- ${CDEPEND}
- >=virtual/jre-1.6"
-
-S="${WORKDIR}/${PN}"
-
-DOCS=( changes.txt docs/binding.dtd docs/binding.xsd )
-HTML_DOCS=( readme.html docs starter tutorial )
-
-EANT_BUILD_TARGET="small-jars"
-EANT_BUILD_XML="build/build.xml"
-
-src_prepare() {
- default
- java-pkg_clean
- java-pkg_jar-from --into lib ant-core,bcel,dom4j-1,xpp3
-}
-
-src_install() {
- java-pkg_dojar "${S}"/lib/${PN}*.jar
- use source && java-pkg_dosrc build/src/* build/extras/*
- einstalldocs
-}
diff --git a/dev-java/jibx/jibx-1.2.6-r1.ebuild b/dev-java/jibx/jibx-1.2.6-r1.ebuild
deleted file mode 100644
index bc637548228..00000000000
--- a/dev-java/jibx/jibx-1.2.6-r1.ebuild
+++ /dev/null
@@ -1,47 +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"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Bind XML to Java code"
-HOMEPAGE="http://jibx.sourceforge.net/"
-SRC_URI="
- https://repo1.maven.org/maven2/org/${PN}/${PN}-extras/${PV}/${PN}-extras-${PV}-sources.jar
- https://repo1.maven.org/maven2/org/${PN}/${PN}-bind/${PV}/${PN}-bind-${PV}-sources.jar
- https://repo1.maven.org/maven2/org/${PN}/${PN}-run/${PV}/${PN}-run-${PV}-sources.jar
-"
-
-LICENSE="BSD"
-SLOT="1.2"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-
-CDEPEND="
- dev-java/bcel:0
- dev-java/xpp3:0
- dev-java/jdom:0
- dev-java/dom4j:1
- dev-java/log4j:0
- dev-java/joda-time:0
- dev-java/ant-core:0"
-
-RDEPEND="
- ${CDEPEND}
- >=virtual/jre-1.6"
-
-DEPEND="
- ${CDEPEND}
- >=virtual/jdk-1.6"
-
-JAVA_GENTOO_CLASSPATH="
- joda-time
- ant-core
- dom4j-1
- log4j
- jdom
- bcel
- xpp3
-"
diff --git a/dev-java/jline/Manifest b/dev-java/jline/Manifest
index d2ec5d9401e..b48e375690f 100644
--- a/dev-java/jline/Manifest
+++ b/dev-java/jline/Manifest
@@ -1,3 +1 @@
-DIST jline-1.0.zip 463082 BLAKE2B 4f4eec5a2674bf97ed9fe83c60d339fce54dcd556aca6e95db74438e87253fd4e36e4eef26b3ac14ed84fff3d2fe1b58ba3a6fe13f33d96fe50a34f7bb34f541 SHA512 2957e19a3536d89aeaf8f27afb1f8eb4eb8bcc99560244c7f1ba14693a84a2f5e677a6c21d5f85ec519674cc4cd6cb3c9e4725cb4797144168d2f6df3954aba9
-DIST jline-2.12.1.tar.gz 97289 BLAKE2B 375711ad78cba26c0b4702dd739a18dd4db2fd1e8b16ce817dd1f567c405b7b0f96c72a6c6b7fabff1520617cf9149a29040e132d0b61e2d57149bb83b404c8d SHA512 368492fa0b28e6aa3827db05d266b332935d9a03c2f6645d039941c61a698e85fd57accfac444503de4cb2f2dae5787496924b8d258faad1c18b6cafe787f99d
DIST jline-2.14.6.tar.gz 116599 BLAKE2B a3576314d8bb4886e0297822e0f37b4cc4c49cad1c5ea71a61a2813b0afae7ba8a5d5ad914fe900c4dca6c2f3891551157ca4a3d24231e8731cda4b5dbe80b32 SHA512 9e141c9a112dcb4850db95a7c2cec9b84f11be1f6740a3a33c99ec2ed5f900f4dae7474058e14319ef79476121997afbdb248ca22559a82a905c31690afa1d51
diff --git a/dev-java/jline/files/maven-build.properties b/dev-java/jline/files/maven-build.properties
deleted file mode 100644
index 66ef7cf2840..00000000000
--- a/dev-java/jline/files/maven-build.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-#Generated by Maven Ant Plugin - DO NOT EDIT THIS FILE!
-#Sun Jan 21 15:31:06 EET 2007
-maven.build.finalName=jline-0.9.9
-maven.build.outputDir=${maven.build.dir}/classes
-maven.build.resourceDir.0=src/main/resources
-maven.build.testResourceDir.0=src/test/resources
-maven.build.testOutputDir=${maven.build.dir}/test-classes
-maven.repo.local=lib
-maven.settings.offline=false
-maven.build.dir=target
-maven.settings.interactiveMode=true
-maven.build.srcDir.0=src/main/java
-maven.build.testDir.0=src/test/java
diff --git a/dev-java/jline/files/maven-build.xml b/dev-java/jline/files/maven-build.xml
deleted file mode 100644
index 7be70998ddc..00000000000
--- a/dev-java/jline/files/maven-build.xml
+++ /dev/null
@@ -1,199 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- ====================================================================== -->
-<!-- Ant build file (http://ant.apache.org/) for Ant 1.6.2 or above. -->
-<!-- ====================================================================== -->
-
-<!-- ====================================================================== -->
-<!-- ===================== - DO NOT EDIT THIS FILE! - ===================== -->
-<!-- ====================================================================== -->
-<!-- -->
-<!-- Any modifications will be overwritten. -->
-<!-- -->
-<!-- Generated by Maven Ant Plugin on 1/21/07 3:31 PM -->
-<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/ -->
-<!-- -->
-<!-- ====================================================================== -->
-
-<project name="jline-from-maven" default="dist" basedir=".">
-
- <!-- ====================================================================== -->
- <!-- Build environnement properties -->
- <!-- ====================================================================== -->
-
- <property file="maven-build.properties"/>
-
- <property name="maven.build.finalName" value="jline-0.9.9"/>
- <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/main/resources"/>
- <property name="maven.test.reports" value="${maven.build.dir}/test-reports"/>
-
- <property name="maven.settings.offline" value="true"/>
- <property name="maven.settings.interactiveMode" value="true"/>
-
- <!-- ====================================================================== -->
- <!-- Defining classpaths -->
- <!-- ====================================================================== -->
-
- <path id="build.classpath">
- <fileset dir="${maven.repo.local}">
- <include name="*.jar"/>
- </fileset>
- </path>
- <path id="build.test.classpath">
- <fileset dir="${maven.repo.local}">
- <include name="*.jar"/>
- </fileset>
- </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.3"
- verbose="false"
- fork="false"
- source="1.3">
- <src>
- <pathelement location="${maven.build.srcDir.0}"/>
- </src>
- <classpath refid="build.classpath"/>
- </javac>
- <copy todir="${maven.build.outputDir}">
- <fileset dir="${maven.build.resourceDir.0}"/>
- </copy>
- </target>
-
- <!-- ====================================================================== -->
- <!-- Test-compilation target -->
- <!-- ====================================================================== -->
-
- <target name="compile-tests"
- depends="junit-present, compile"
- description="Compile the test code"
- if="junit.present">
- <mkdir dir="${maven.build.testOutputDir}"/>
- <javac destdir="${maven.build.testOutputDir}"
- nowarn="false"
- debug="true"
- optimize="false"
- deprecation="true"
- target="1.3"
- verbose="false"
- fork="false"
- source="1.3">
- <src>
- <pathelement location="${maven.build.testDir.0}"/>
- </src>
- <classpath>
- <path refid="build.test.classpath"/>
- <pathelement location="${maven.build.outputDir}"/>
- </classpath>
- </javac>
- <copy todir="${maven.build.testOutputDir}">
- <fileset dir="${maven.build.testResourceDir.0}"/>
- </copy>
- </target>
-
- <!-- ====================================================================== -->
- <!-- Run all tests -->
- <!-- ====================================================================== -->
-
- <target name="test"
- depends="junit-present, compile-tests"
- if="junit.present"
- 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}">
- <fileset dir="${maven.build.testDir.0}">
- <include name="**/Test*.java"/>
- </fileset>
- </batchtest>
- </junit>
- </target>
-
- <target name="test-junit-present">
- <available classname="junit.framework.Test" property="junit.present"/>
- </target>
-
- <target name="junit-present"
- depends="test-junit-present"
- unless="junit.present">
- <echo>=================================== WARNING ===================================</echo>
- <echo> Junit isn&apos;t present in your $ANT_HOME/lib directory. Tests not executed. </echo>
- <echo>===============================================================================</echo>
- </target>
-
- <!-- ====================================================================== -->
- <!-- Package target -->
- <!-- ====================================================================== -->
-
- <target name="package" depends="compile" description="Package the application">
- <jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar"
- compress="true"
- index="false"
- basedir="${maven.build.outputDir}"
- excludes="**/package.html"/>
- </target>
-
- <!-- ====================================================================== -->
- <!-- Dist target -->
- <!-- ====================================================================== -->
-
- <target name="dist" depends="package,test" description="Package the application and run tests"/>
-
- <!-- ====================================================================== -->
- <!-- 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/3.8.1"/>
- <get src="http://jline.sourceforge.net/m2repo/junit/junit/3.8.1/junit-3.8.1.jar"
- dest="${maven.repo.local}/junit/junit/3.8.1/junit-3.8.1.jar"
- usetimestamp="true"
- ignoreerrors="true"/>
- <get src="http://repo1.maven.org/maven2/junit/junit/3.8.1/junit-3.8.1.jar"
- dest="${maven.repo.local}/junit/junit/3.8.1/junit-3.8.1.jar"
- usetimestamp="true"
- ignoreerrors="true"/>
- </target>
-</project>
diff --git a/dev-java/jline/jline-1.0-r1.ebuild b/dev-java/jline/jline-1.0-r1.ebuild
deleted file mode 100644
index eb4e3f9754d..00000000000
--- a/dev-java/jline/jline-1.0-r1.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
-
-JAVA_PKG_IUSE="source test"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Handle console input in Java"
-HOMEPAGE="http://jline.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.zip"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
-
-DEPEND="
- >=virtual/jdk-1.6
- app-arch/unzip
- test? (
- dev-java/ant-junit:0
- dev-java/junit:0
- )"
-
-RDEPEND="
- >=virtual/jre-1.6"
-
-S="${WORKDIR}/${P}/src"
-
-src_prepare() {
- default
- java-pkg_clean
-
- # we don't support maven for building yet.
- # this build.xml was generated by:
- # - mvn ant:ant
- # - tweak build.xml to not load properties from home dir
- # - tweak the test target to match the test cases
- # - change maven.repo.local from ~/.maven to "lib" in .properties
- # - change classpath definitions to "*.jar"
-
- cp "${FILESDIR}/maven-build.xml" build.xml || die
- cp "${FILESDIR}/maven-build.properties" . || die
- java-ant_ignore-system-classes
-
- mkdir lib || die
- cd lib || die
- if use test; then
- java-pkg_jar-from --build-only junit
- fi
-}
-
-src_compile() {
- # precompiled javadocs (needs maven to generate)
- # -Dmaven.build.finalName is needed to override the one defined in the
- # build.xml, which because it was generated with 0.9.9, defaults to
- # jline-0.9.9 -nichoj
- eant package -Dmaven.build.finalName=${P}
-}
-
-src_test() {
- ANT_TASKS="ant-junit" eant test -Djunit.present=true
-}
-
-src_install() {
- java-pkg_newjar target/${P}.jar
- # no api docs in this release
- # use doc && java-pkg_dojavadoc ../apidocs
- use source && java-pkg_dosrc src/main/java
-}
diff --git a/dev-java/jline/jline-2.12.1-r1.ebuild b/dev-java/jline/jline-2.12.1-r1.ebuild
deleted file mode 100644
index b0d0dafc0f2..00000000000
--- a/dev-java/jline/jline-2.12.1-r1.ebuild
+++ /dev/null
@@ -1,66 +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
-
-DESCRIPTION="A Java library for handling console input"
-HOMEPAGE="https://github.com/jline/jline2"
-SRC_URI="https://github.com/jline/${PN}2/archive/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="2"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-CDEPEND="
- dev-java/jansi:0
- dev-java/jansi-native:0"
-
-DEPEND="
- test? (
- dev-java/junit:4
- )
- ${CDEPEND}
- >=virtual/jdk-1.6"
-
-RDEPEND="
- ${CDEPEND}
- >=virtual/jre-1.6"
-
-S="${WORKDIR}/${PN}2-${P}"
-
-JAVA_SRC_DIR="src/main/java"
-
-JAVA_GENTOO_CLASSPATH="jansi,jansi-native"
-
-java_prepare() {
- # Easier to use java-pkg-simple.
- rm -v pom.xml || die
-
- # Don't forget the resources!
- mkdir -p target/classes || die
- cp -r src/main/resources/* target/classes || die
-}
-
-src_install() {
- java-pkg-simple_src_install
-
- dodoc {CHANGELOG,README}.md
-}
-
-src_test() {
- cd src/test/java || die
-
- local CP=".:../resources:${S}/${PN}.jar:$(java-pkg_getjars junit-4,${JAVA_GENTOO_CLASSPATH})"
- 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/jline/jline-2.14.6.ebuild b/dev-java/jline/jline-2.14.6.ebuild
index 7105a33024f..181001afabb 100644
--- a/dev-java/jline/jline-2.14.6.ebuild
+++ b/dev-java/jline/jline-2.14.6.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${PN}2-${P}"
LICENSE="BSD"
SLOT="2"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
IUSE="test"
# Needs yet-unpackaged powermock for tests
RESTRICT="!test? ( test ) test"
diff --git a/dev-java/jmdns/Manifest b/dev-java/jmdns/Manifest
deleted file mode 100644
index d92a70ffe4b..00000000000
--- a/dev-java/jmdns/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST jmdns-3.4.1.tgz 665503 BLAKE2B b2ddf4216a39abf8b1fa9629005f83a5b6d3bbc6a2b85fcb716f4591d9435892977086276c1838ff4966d54bb501a589c4eff15948bae4ee7b8d0f035371fcb8 SHA512 06e01dc7ef9eabd1ba75be016d688294043a6eec53de40d20026587f2c3d82bd0b025efd9b662bbe28450940d277da0fbc30ef69293ca3e81426212d8e85d7fb
diff --git a/dev-java/jmdns/jmdns-3.4.1-r1.ebuild b/dev-java/jmdns/jmdns-3.4.1-r1.ebuild
deleted file mode 100644
index d33a9ab1c9b..00000000000
--- a/dev-java/jmdns/jmdns-3.4.1-r1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-JAVA_PKG_IUSE="doc examples source test"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="JmDNS is an implementation of multi-cast DNS in Java"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
-HOMEPAGE="http://jmdns.sourceforge.net"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86"
-IUSE=""
-
-DEPEND=">=virtual/jdk-1.6"
-RDEPEND=">=virtual/jre-1.6"
-
-JAVA_SRC_DIR="src"
-
-src_prepare() {
- rm "${S}"/build.xml || die
- find -name "*.jar" -delete || die
- find "${JAVA_SRC_DIR}" -name "*Test.java" -delete || die
-}
diff --git a/dev-java/jmdns/metadata.xml b/dev-java/jmdns/metadata.xml
deleted file mode 100644
index 9431d32002b..00000000000
--- a/dev-java/jmdns/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <longdescription>
- JmDNS is an implementation of multi-cast DNS in Java.
- It supports service discovery and service registration.
- It is fully interoperable with Apple's Rendezvous.
- </longdescription>
- <maintainer type="project">
- <email>java@gentoo.org</email>
- <name>Java</name>
- </maintainer>
- <upstream>
- <remote-id type="sourceforge">jmdns</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/dev-java/jmh-core/jmh-core-1.21.ebuild b/dev-java/jmh-core/jmh-core-1.21.ebuild
index ad044bba454..8d9d4c30c7d 100644
--- a/dev-java/jmh-core/jmh-core-1.21.ebuild
+++ b/dev-java/jmh-core/jmh-core-1.21.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -16,7 +16,7 @@ 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 ~x86"
+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="
diff --git a/dev-java/jna/Manifest b/dev-java/jna/Manifest
index 20ee000d50b..ac70c75ad8e 100644
--- a/dev-java/jna/Manifest
+++ b/dev-java/jna/Manifest
@@ -1 +1,2 @@
DIST jna-4.2.2.tar.gz 58638853 BLAKE2B 3941202ad7839f748c65f1abf53a335f6de7959def06de27a30520457147af3f70f6de54d640718b8314f6e61ab61ee9b26c39812d5cb1f918b8ff714d6b902e SHA512 11ab524f87f6dc7fe3ac8eb0620f9ba392445147770304be7b7fa5cd49de8efed983ad30c16077bfa6419eaf1ff50311a3ded811a78fdcd09bc686ef93ad7f9f
+DIST jna-5.10.0.tar.gz 106258319 BLAKE2B f5605fd91bacc1e900e835494c27b0fdb4ba91b0c04bad1757133bed5938603264ce9fba89c5ce7e4644456b752b934f6e205d0131659e77bf0c58c2b44c61cd SHA512 93e1ab659a60d711557eb93620bcbd05f3dbe9c739b256cfb647d8ac2a4038d0bc638c614b58339b2875017ac18b219a4ddeb0d92e5ca25fef2e326bc14ae256
diff --git a/dev-java/jna/files/5.10.0-build.xml.patch b/dev-java/jna/files/5.10.0-build.xml.patch
new file mode 100644
index 00000000000..242845bfd35
--- /dev/null
+++ b/dev-java/jna/files/5.10.0-build.xml.patch
@@ -0,0 +1,55 @@
+diff --git a/build.xml b/build.xml
+index ed104c2..cd8895c 100644
+--- a/build.xml
++++ b/build.xml
+@@ -182,9 +182,9 @@
+
+ <target name="-prepare-anttools">
+ <subant antfile="build-ant-tools.xml" buildpath="${basedir}"></subant>
+- <taskdef name="BuildArmSoftFloatDetector" classname="com.sun.jna.BuildArmSoftFloatDetector" classpath="${build}/ant-tools:$lib/asm-8.0.1.jar" />
+- <taskdef name="CalcAndroidVersion" classname="com.sun.jna.ant.CalcAndroidVersion" classpath="${build}/ant-tools:lib/asm-8.0.1.jar" />
+- <taskdef name="ModuleGenerator" classname="com.sun.jna.ant.ModuleGenerator" classpath="${build}/ant-tools:lib/asm-8.0.1.jar" />
++ <taskdef name="BuildArmSoftFloatDetector" classname="com.sun.jna.BuildArmSoftFloatDetector" classpath="${build}/ant-tools:${gentoo.classpath}" />
++ <taskdef name="CalcAndroidVersion" classname="com.sun.jna.ant.CalcAndroidVersion" classpath="${build}/ant-tools:${gentoo.classpath}" />
++ <taskdef name="ModuleGenerator" classname="com.sun.jna.ant.ModuleGenerator" classpath="${build}/ant-tools:${gentoo.classpath}" />
+ </target>
+
+ <target name="-dynamic-properties" depends="-prepare-anttools">
+@@ -385,7 +385,9 @@
+ <pathelement path="${build}/${jar}"/>
+ <pathelement path="${test.classes}"/>
+ <pathelement path="${build}/${testjar}"/>
++ <!--
+ <pathelement path="lib/clover.jar"/>
++ -->
+ <path refid="test.libs"/>
+ </path>
+ </target>
+@@ -1265,8 +1267,10 @@ cd ..
+ <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" createUnicodeExtraFields="never" encoding="UTF-8">
+ <fileset dir="${build.native}" includes="*jnidispatch.*"/>
+ </jar>
+diff --git a/contrib/platform/build.xml b/contrib/platform/build.xml
+index 47fa8ed..a623ce6 100644
+--- a/contrib/platform/build.xml
++++ b/contrib/platform/build.xml
+@@ -115,9 +115,9 @@
+
+ <target name="-prepare-anttools">
+ <subant antfile="build-ant-tools.xml" buildpath="${basedir}/../../"></subant>
+- <taskdef name="BuildArmSoftFloatDetector" classname="com.sun.jna.BuildArmSoftFloatDetector" classpath="${basedir}/../../build/ant-tools:${basedir}/../../lib/asm-8.0.1.jar" />
+- <taskdef name="CalcAndroidVersion" classname="com.sun.jna.ant.CalcAndroidVersion" classpath="${basedir}/../../build/ant-tools:${basedir}/../../lib/asm-8.0.1.jar" />
+- <taskdef name="ModuleGenerator" classname="com.sun.jna.ant.ModuleGenerator" classpath="${basedir}/../../build/ant-tools:${basedir}/../../lib/asm-8.0.1.jar" />
++ <taskdef name="BuildArmSoftFloatDetector" classname="com.sun.jna.BuildArmSoftFloatDetector" classpath="${basedir}/../../build/ant-tools:${gentoo.classpath}" />
++ <taskdef name="CalcAndroidVersion" classname="com.sun.jna.ant.CalcAndroidVersion" classpath="${basedir}/../../build/ant-tools:${gentoo.classpath}" />
++ <taskdef name="ModuleGenerator" classname="com.sun.jna.ant.ModuleGenerator" classpath="${basedir}/../../build/ant-tools:${gentoo.classpath}" />
+ </target>
+
+ <macrodef name="build-manifest">
diff --git a/dev-java/jna/files/5.10.0-tests-exclude.patch b/dev-java/jna/files/5.10.0-tests-exclude.patch
new file mode 100644
index 00000000000..e608e2087f4
--- /dev/null
+++ b/dev-java/jna/files/5.10.0-tests-exclude.patch
@@ -0,0 +1,27 @@
+From 2b50e2296c9c9961fd168abe285f773aecd6437a Mon Sep 17 00:00:00 2001
+From: Yuan Liao <liaoyuan@gmail.com>
+Date: Thu, 6 Jan 2022 12:21:22 -0800
+Subject: [PATCH] Skip execution of test classes without any tests
+
+Signed-off-by: Yuan Liao <liaoyuan@gmail.com>
+---
+ build.xml | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/build.xml b/build.xml
+index ed104c2..9fb15ae 100644
+--- a/build.xml
++++ b/build.xml
+@@ -1388,6 +1388,9 @@ cd ..
+ <fileset dir="${test.src}" excludes="${tests.exclude-patterns}">
+ <patternset includes="${tests.include}"/>
+ <include name="${tests.platform}"/>
++ <exclude name="com/sun/jna/DefaultMethodInvocationTest.java"/>
++ <exclude name="com/sun/jna/ELFAnalyserTest.java"/>
++ <exclude name="com/sun/jna/PrematureGCTest.java"/>
+ <exclude name="${tests.exclude}"/>
+ </fileset>
+ </batchtest>
+--
+2.34.1
+
diff --git a/dev-java/jna/jna-5.10.0.ebuild b/dev-java/jna/jna-5.10.0.ebuild
new file mode 100644
index 00000000000..3f90c302433
--- /dev/null
+++ b/dev-java/jna/jna-5.10.0.ebuild
@@ -0,0 +1,100 @@
+# 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-junit: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}/${PV}-tests-exclude.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/jnr-a64asm/jnr-a64asm-1.0.0.ebuild b/dev-java/jnr-a64asm/jnr-a64asm-1.0.0.ebuild
index 36c5bd3bfc6..b9856b27e0e 100644
--- a/dev-java/jnr-a64asm/jnr-a64asm-1.0.0.ebuild
+++ b/dev-java/jnr-a64asm/jnr-a64asm-1.0.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/jnr/${PN}/archive/refs/tags/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="2"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
DEPEND="
>=virtual/jdk-1.8:*
diff --git a/dev-java/jnr-constants/Manifest b/dev-java/jnr-constants/Manifest
index b94cc78461b..f9acdf1a691 100644
--- a/dev-java/jnr-constants/Manifest
+++ b/dev-java/jnr-constants/Manifest
@@ -1,2 +1 @@
DIST jnr-constants-0.10.3-sources.tar.gz 261921 BLAKE2B f8137455c067e774dd30d64fe457dd859692315f43415bdfbffa4870b981db26de23d73fa7682bbd924523ac17dec56caa7078580cf817d8df3eae4d87c61343 SHA512 f7cd6a3778670c9835f8dce87c8470c8b8cfeda6f30d68051c09dae40c4f7dd7db88bed016450c33ab5c8da9a802b4bd050adf358680d5ec6735467e398404dc
-DIST jnr-constants-0.8.6.tar.gz 71080 BLAKE2B db86f3c0347b85dd56de72465c4198e74faa877b8a1373ab378728945edaf0c45748ed707e6b591224858f498ae7d43269d8127cb61b7ac2893ef9817e36ca1c SHA512 2098f8e1869b9c018ba3afa70ef386fce2609d9c650ee851dcd7cf7dc9d4d87dbe26886eb2e744d96cc11425f6b66144a018826360b7bab48a4b99e323f3717a
diff --git a/dev-java/jnr-constants/files/jnr-constants_maven-build.xml b/dev-java/jnr-constants/files/jnr-constants_maven-build.xml
deleted file mode 100644
index 75f8458ee2c..00000000000
--- a/dev-java/jnr-constants/files/jnr-constants_maven-build.xml
+++ /dev/null
@@ -1,259 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- ====================================================================== -->
-<!-- Ant build file (http://ant.apache.org/) for Ant 1.6.2 or above. -->
-<!-- ====================================================================== -->
-
-<!-- ====================================================================== -->
-<!-- ===================== - DO NOT EDIT THIS FILE! - ===================== -->
-<!-- ====================================================================== -->
-<!-- -->
-<!-- Any modifications will be overwritten. -->
-<!-- -->
-<!-- Generated by Maven Ant Plugin on 1/11/12 12:52 PM -->
-<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/ -->
-<!-- -->
-<!-- ====================================================================== -->
-
-<project name="jnr-constants-from-maven" default="package" basedir=".">
-
- <!-- ====================================================================== -->
- <!-- Build environment properties -->
- <!-- ====================================================================== -->
-
- <property file="${user.home}/.m2/maven.properties"/>
- <property file="maven-build.properties"/>
-
- <property name="maven.build.finalName" value="jnr-constants-0.8.2"/>
- <property name="maven.build.dir" value="target"/>
- <property name="maven.build.outputDir" value="${maven.build.dir}/classes"/>
- <property name="maven.build.srcDir.0" value="src/main/java"/>
- <property name="maven.build.resourceDir.0" value="src/main/resources"/>
- <property name="maven.build.testOutputDir" value="${maven.build.dir}/test-classes"/>
- <property name="maven.build.testDir.0" value="src/test/java"/>
- <property name="maven.build.testResourceDir.0" value="src/test/resources"/>
- <property name="maven.test.reports" value="${maven.build.dir}/test-reports"/>
- <property name="maven.reporting.outputDirectory" value="${maven.build.dir}/site"/>
-
- <property name="maven.repo.local" value="${user.home}/.m2/repository"/>
- <property name="maven.settings.offline" value="false"/>
- <property name="maven.settings.interactiveMode" value="true"/>
-
- <!-- ====================================================================== -->
- <!-- Defining classpaths -->
- <!-- ====================================================================== -->
-
- <path id="build.classpath"/>
- <path id="build.test.classpath">
- <pathelement location="${maven.repo.local}/junit/junit/4.8.2/junit-4.8.2.jar"/>
- </path>
-
- <!-- ====================================================================== -->
- <!-- Cleaning up target -->
- <!-- ====================================================================== -->
-
- <target name="clean" description="Clean the output directory">
- <delete dir="${maven.build.dir}"/>
- </target>
-
- <!-- ====================================================================== -->
- <!-- Compilation target -->
- <!-- ====================================================================== -->
-
- <target name="compile" depends="get-deps" description="Compile the code">
- <mkdir dir="${maven.build.outputDir}"/>
- <javac destdir="${maven.build.outputDir}"
- nowarn="false"
- debug="true"
- optimize="false"
- deprecation="true"
- target="1.1"
- verbose="false"
- fork="false"
- source="1.3">
- <src>
- <pathelement location="${maven.build.srcDir.0}"/>
- </src>
- <classpath refid="build.classpath"/>
- </javac>
- </target>
-
- <!-- ====================================================================== -->
- <!-- Test-compilation target -->
- <!-- ====================================================================== -->
-
- <target name="compile-tests"
- depends="compile"
- description="Compile the test code"
- unless="maven.test.skip">
- <mkdir dir="${maven.build.testOutputDir}"/>
- <javac destdir="${maven.build.testOutputDir}"
- nowarn="false"
- debug="true"
- optimize="false"
- deprecation="true"
- target="1.1"
- verbose="false"
- fork="false"
- source="1.3">
- <src>
- <pathelement location="${maven.build.testDir.0}"/>
- </src>
- <classpath>
- <path refid="build.test.classpath"/>
- <pathelement location="${maven.build.outputDir}"/>
- </classpath>
- </javac>
- </target>
-
- <!-- ====================================================================== -->
- <!-- Run all tests -->
- <!-- ====================================================================== -->
-
- <target name="test"
- depends="compile-tests, junit-missing"
- unless="junit.skipped"
- description="Run the test cases">
- <mkdir dir="${maven.test.reports}"/>
- <junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir=".">
- <sysproperty key="basedir" value="."/>
- <formatter type="xml"/>
- <formatter type="plain" usefile="false"/>
- <classpath>
- <path refid="build.test.classpath"/>
- <pathelement location="${maven.build.outputDir}"/>
- <pathelement location="${maven.build.testOutputDir}"/>
- </classpath>
- <batchtest todir="${maven.test.reports}" unless="test">
- <fileset dir="${maven.build.testDir.0}">
- <include name="**/Test*.java"/>
- <include name="**/*Test.java"/>
- <include name="**/*TestCase.java"/>
- <exclude name="**/*Abstract*Test.java"/>
- </fileset>
- </batchtest>
- <batchtest todir="${maven.test.reports}" if="test">
- <fileset dir="${maven.build.testDir.0}">
- <include name="**/${test}.java"/>
- <exclude name="**/*Abstract*Test.java"/>
- </fileset>
- </batchtest>
- </junit>
- </target>
-
- <target name="test-junit-present">
- <available classname="junit.framework.Test" property="junit.present"/>
- </target>
-
- <target name="test-junit-status"
- depends="test-junit-present">
- <condition property="junit.missing">
- <and>
- <isfalse value="${junit.present}"/>
- <isfalse value="${maven.test.skip}"/>
- </and>
- </condition>
- <condition property="junit.skipped">
- <or>
- <isfalse value="${junit.present}"/>
- <istrue value="${maven.test.skip}"/>
- </or>
- </condition>
- </target>
-
- <target name="junit-missing"
- depends="test-junit-status"
- if="junit.missing">
- <echo>=================================== WARNING ===================================</echo>
- <echo> JUnit is not present in your $ANT_HOME/lib directory. Tests not executed.</echo>
- <echo>===============================================================================</echo>
- </target>
-
- <!-- ====================================================================== -->
- <!-- Javadoc target -->
- <!-- ====================================================================== -->
-
- <target name="javadoc" description="Generates the Javadoc of the application">
- <javadoc sourcepath="${maven.build.srcDir.0}"
- packagenames="*"
- destdir="${maven.reporting.outputDirectory}/apidocs"
- access="protected"
- old="false"
- verbose="false"
- version="true"
- use="true"
- author="true"
- splitindex="false"
- nodeprecated="false"
- nodeprecatedlist="false"
- notree="false"
- noindex="false"
- nohelp="false"
- nonavbar="false"
- serialwarn="false"
- charset="ISO-8859-1"
- linksource="false"
- breakiterator="false"/>
- </target>
-
- <!-- ====================================================================== -->
- <!-- Package target -->
- <!-- ====================================================================== -->
-
- <target name="package" depends="compile,test" description="Package the application">
- <jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar"
- compress="true"
- index="false"
- basedir="${maven.build.outputDir}"
- excludes="**/package.html"/>
- </target>
-
- <!-- ====================================================================== -->
- <!-- A dummy target for the package named after the type it creates -->
- <!-- ====================================================================== -->
-
- <target name="jar" depends="package" description="Builds the jar for the application"/>
-
- <!-- ====================================================================== -->
- <!-- Download dependencies target -->
- <!-- ====================================================================== -->
-
- <target name="test-offline">
- <condition property="maven.mode.offline">
- <equals arg1="${maven.settings.offline}" arg2="true"/>
- </condition>
- </target>
-
- <target name="get-deps"
- depends="test-offline"
- description="Download all dependencies"
- unless="maven.mode.offline">
- <mkdir dir="${maven.repo.local}"/>
- <mkdir dir="${maven.repo.local}/junit/junit/4.8.2"/>
- <get src="http://repository.jboss.com/maven2/junit/junit/4.8.2/junit-4.8.2.jar"
- dest="${maven.repo.local}/junit/junit/4.8.2/junit-4.8.2.jar"
- usetimestamp="false"
- ignoreerrors="true"/>
- <get src="http://snapshots.jboss.org/maven2/junit/junit/4.8.2/junit-4.8.2.jar"
- dest="${maven.repo.local}/junit/junit/4.8.2/junit-4.8.2.jar"
- usetimestamp="false"
- ignoreerrors="true"/>
- <get src="http://repository.jboss.org/maven2//junit/junit/4.8.2/junit-4.8.2.jar"
- dest="${maven.repo.local}/junit/junit/4.8.2/junit-4.8.2.jar"
- usetimestamp="false"
- ignoreerrors="true"/>
- <get src="https://repository.jboss.org/nexus/content/groups/public-jboss//junit/junit/4.8.2/junit-4.8.2.jar"
- dest="${maven.repo.local}/junit/junit/4.8.2/junit-4.8.2.jar"
- usetimestamp="false"
- ignoreerrors="true"/>
- <get src="https://oss.sonatype.org/content/repositories/snapshots/junit/junit/4.8.2/junit-4.8.2.jar"
- dest="${maven.repo.local}/junit/junit/4.8.2/junit-4.8.2.jar"
- usetimestamp="false"
- ignoreerrors="true"/>
- <get src="http://repo1.maven.org/maven2/junit/junit/4.8.2/junit-4.8.2.jar"
- dest="${maven.repo.local}/junit/junit/4.8.2/junit-4.8.2.jar"
- usetimestamp="false"
- ignoreerrors="true"/>
- </target>
-
-</project>
diff --git a/dev-java/jnr-constants/jnr-constants-0.10.3.ebuild b/dev-java/jnr-constants/jnr-constants-0.10.3.ebuild
index 6308e379f3c..03889724207 100644
--- a/dev-java/jnr-constants/jnr-constants-0.10.3.ebuild
+++ b/dev-java/jnr-constants/jnr-constants-0.10.3.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://github.com/jnr/jnr-constants"
SRC_URI="https://github.com/jnr/${PN}/archive/refs/tags/${P}.tar.gz -> ${P}-sources.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
DEPEND="
>=virtual/jdk-1.8:*
diff --git a/dev-java/jnr-constants/jnr-constants-0.8.6.ebuild b/dev-java/jnr-constants/jnr-constants-0.8.6.ebuild
deleted file mode 100644
index 3f8c33be960..00000000000
--- a/dev-java/jnr-constants/jnr-constants-0.8.6.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="A set of platform constants (e.g. errno values)"
-HOMEPAGE="https://github.com/jnr/jnr-constants"
-# SRC_URI="https://github.com/jnr/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-SRC_URI="https://github.com/jnr/${PN}/archive/${P}.tar.gz"
-
-LICENSE="|| ( Apache-2.0 LGPL-3 )"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-
-RDEPEND="
- >=virtual/jre-1.6"
-
-DEPEND="
- >=virtual/jdk-1.6
- test? (
- dev-java/ant-junit:0
- >=dev-java/junit-4.8:4
- )"
-
-S="${WORKDIR}/${PN}-${P}"
-
-java_prepare() {
- cp "${FILESDIR}"/${PN}_maven-build.xml build.xml || die
-}
-
-JAVA_ANT_ENCODING="UTF-8"
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-EANT_EXTRA_ARGS="-Dmaven.build.finalName=${PN}"
-EANT_TEST_GENTOO_CLASSPATH="junit-4"
-
-src_test() {
- java-pkg-2_src_test
-}
-
-src_install() {
- java-pkg_dojar target/${PN}.jar
-
- use doc && java-pkg_dojavadoc target/site/apidocs
- use source && java-pkg_dosrc src/main/java/*
-}
diff --git a/dev-java/jnr-enxio/Manifest b/dev-java/jnr-enxio/Manifest
deleted file mode 100644
index 8d474e4d53b..00000000000
--- a/dev-java/jnr-enxio/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST jnr-enxio-0.7.tar.gz 10520 BLAKE2B 762c36ad59473d6be4f2c2b8c62ce489fe46ce30afe9b32101aa41ab703c50247cfa0908499f8c2fa79c2ac8c33972abe203984c5cbbe5111416e4684e4c79ed SHA512 ed8c13ae4de2334aa9ddd9a13534e0c49fb1bde48e3bd5085a62c96f2b9fe6970b4ba08fe6b27901c5e6db1b360511265ac276ca56f89fddf5e18db9726bd834
diff --git a/dev-java/jnr-enxio/files/jnr-enxio-0.7-build.xml b/dev-java/jnr-enxio/files/jnr-enxio-0.7-build.xml
deleted file mode 100644
index efdb518451e..00000000000
--- a/dev-java/jnr-enxio/files/jnr-enxio-0.7-build.xml
+++ /dev/null
@@ -1,320 +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 6/6/13 12:27 PM -->
-<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/ -->
-<!-- -->
-<!-- ====================================================================== -->
-
-<project name="jnr-enxio-from-maven" default="package" basedir=".">
-
- <!-- ====================================================================== -->
- <!-- Build environment properties -->
- <!-- ====================================================================== -->
-
- <property file="${user.home}/.m2/maven.properties"/>
- <property file="maven-build.properties"/>
-
- <property name="maven.build.finalName" value="jnr-enxio-0.7"/>
- <property name="maven.build.dir" value="target"/>
- <property name="maven.build.outputDir" value="${maven.build.dir}/classes"/>
- <property name="maven.build.srcDir.0" value="src/main/java"/>
- <property name="maven.build.resourceDir.0" value="src/main/resources"/>
- <property name="maven.build.testOutputDir" value="${maven.build.dir}/test-classes"/>
- <property name="maven.build.testDir.0" value="src/test/java"/>
- <property name="maven.build.testResourceDir.0" value="src/test/resources"/>
- <property name="maven.test.reports" value="${maven.build.dir}/test-reports"/>
- <property name="maven.reporting.outputDirectory" value="${maven.build.dir}/site"/>
-
- <property name="maven.repo.local" value="${user.home}/.m2/repository"/>
- <property name="maven.settings.offline" value="false"/>
- <property name="maven.settings.interactiveMode" value="true"/>
-
- <!-- ====================================================================== -->
- <!-- Defining classpaths -->
- <!-- ====================================================================== -->
-
- <path id="build.classpath">
- <pathelement location="${maven.repo.local}/com/github/jnr/jnr-constants/0.8.4/jnr-constants-0.8.4.jar"/>
- <pathelement location="${maven.repo.local}/com/github/jnr/jnr-ffi/1.0.3/jnr-ffi-1.0.3.jar"/>
- <pathelement location="${maven.repo.local}/com/github/jnr/jffi/1.2.7/jffi-1.2.7.jar"/>
- <pathelement location="${maven.repo.local}/org/ow2/asm/asm/4.0/asm-4.0.jar"/>
- <pathelement location="${maven.repo.local}/org/ow2/asm/asm-commons/4.0/asm-commons-4.0.jar"/>
- <pathelement location="${maven.repo.local}/org/ow2/asm/asm-analysis/4.0/asm-analysis-4.0.jar"/>
- <pathelement location="${maven.repo.local}/org/ow2/asm/asm-tree/4.0/asm-tree-4.0.jar"/>
- <pathelement location="${maven.repo.local}/org/ow2/asm/asm-util/4.0/asm-util-4.0.jar"/>
- <pathelement location="${maven.repo.local}/com/github/jnr/jnr-x86asm/1.0.2/jnr-x86asm-1.0.2.jar"/>
- </path>
- <path id="build.test.classpath">
- <pathelement location="${maven.repo.local}/junit/junit/4.11/junit-4.11.jar"/>
- <pathelement location="${maven.repo.local}/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar"/>
- <pathelement location="${maven.repo.local}/com/github/jnr/jnr-constants/0.8.4/jnr-constants-0.8.4.jar"/>
- <pathelement location="${maven.repo.local}/com/github/jnr/jnr-ffi/1.0.3/jnr-ffi-1.0.3.jar"/>
- <pathelement location="${maven.repo.local}/com/github/jnr/jffi/1.2.7/jffi-1.2.7.jar"/>
- <pathelement location="${maven.repo.local}/com/github/jnr/jffi/1.2.7/jffi-1.2.7-native.jar"/>
- <pathelement location="${maven.repo.local}/org/ow2/asm/asm/4.0/asm-4.0.jar"/>
- <pathelement location="${maven.repo.local}/org/ow2/asm/asm-commons/4.0/asm-commons-4.0.jar"/>
- <pathelement location="${maven.repo.local}/org/ow2/asm/asm-analysis/4.0/asm-analysis-4.0.jar"/>
- <pathelement location="${maven.repo.local}/org/ow2/asm/asm-tree/4.0/asm-tree-4.0.jar"/>
- <pathelement location="${maven.repo.local}/org/ow2/asm/asm-util/4.0/asm-util-4.0.jar"/>
- <pathelement location="${maven.repo.local}/com/github/jnr/jnr-x86asm/1.0.2/jnr-x86asm-1.0.2.jar"/>
- </path>
-
- <!-- ====================================================================== -->
- <!-- Cleaning up target -->
- <!-- ====================================================================== -->
-
- <target name="clean" description="Clean the output directory">
- <delete dir="${maven.build.dir}"/>
- </target>
-
- <!-- ====================================================================== -->
- <!-- Compilation target -->
- <!-- ====================================================================== -->
-
- <target name="compile" depends="get-deps" description="Compile the code">
- <mkdir dir="${maven.build.outputDir}"/>
- <javac destdir="${maven.build.outputDir}"
- nowarn="false"
- debug="true"
- optimize="false"
- deprecation="true"
- target="1.1"
- verbose="false"
- fork="false"
- source="1.3">
- <src>
- <pathelement location="${maven.build.srcDir.0}"/>
- </src>
- <classpath refid="build.classpath"/>
- </javac>
- </target>
-
- <!-- ====================================================================== -->
- <!-- Test-compilation target -->
- <!-- ====================================================================== -->
-
- <target name="compile-tests"
- depends="compile"
- description="Compile the test code"
- unless="maven.test.skip">
- <mkdir dir="${maven.build.testOutputDir}"/>
- </target>
-
- <!-- ====================================================================== -->
- <!-- Run all tests -->
- <!-- ====================================================================== -->
-
- <target name="test"
- depends="compile-tests, junit-missing"
- unless="junit.skipped"
- description="Run the test cases"/>
-
- <target name="test-junit-present">
- <available classname="junit.framework.Test" property="junit.present"/>
- </target>
-
- <target name="test-junit-status"
- depends="test-junit-present">
- <condition property="junit.missing">
- <and>
- <isfalse value="${junit.present}"/>
- <isfalse value="${maven.test.skip}"/>
- </and>
- </condition>
- <condition property="junit.skipped">
- <or>
- <isfalse value="${junit.present}"/>
- <istrue value="${maven.test.skip}"/>
- </or>
- </condition>
- </target>
-
- <target name="junit-missing"
- depends="test-junit-status"
- if="junit.missing">
- <echo>=================================== WARNING ===================================</echo>
- <echo> JUnit is not present in your $ANT_HOME/lib directory. Tests not executed.</echo>
- <echo>===============================================================================</echo>
- </target>
-
- <!-- ====================================================================== -->
- <!-- Javadoc target -->
- <!-- ====================================================================== -->
-
- <target name="javadoc" description="Generates the Javadoc of the application">
- <javadoc sourcepath="${maven.build.srcDir.0}"
- packagenames="*"
- destdir="${maven.reporting.outputDirectory}/apidocs"
- access="protected"
- old="false"
- verbose="false"
- version="true"
- use="true"
- author="true"
- splitindex="false"
- nodeprecated="false"
- nodeprecatedlist="false"
- notree="false"
- noindex="false"
- nohelp="false"
- nonavbar="false"
- serialwarn="false"
- charset="ISO-8859-1"
- linksource="false"
- breakiterator="false"/>
- </target>
-
- <!-- ====================================================================== -->
- <!-- Package target -->
- <!-- ====================================================================== -->
-
- <target name="package" depends="compile,test" description="Package the application">
- <jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar"
- compress="true"
- index="false"
- basedir="${maven.build.outputDir}"
- excludes="**/package.html"/>
- </target>
-
- <!-- ====================================================================== -->
- <!-- A dummy target for the package named after the type it creates -->
- <!-- ====================================================================== -->
-
- <target name="jar" depends="package" description="Builds the jar for the application"/>
-
- <!-- ====================================================================== -->
- <!-- Download dependencies target -->
- <!-- ====================================================================== -->
-
- <target name="test-offline">
- <condition property="maven.mode.offline">
- <equals arg1="${maven.settings.offline}" arg2="true"/>
- </condition>
- </target>
-
- <target name="get-deps"
- depends="test-offline"
- description="Download all dependencies"
- unless="maven.mode.offline">
- <mkdir dir="${maven.repo.local}"/>
- <mkdir dir="${maven.repo.local}/junit/junit/4.11"/>
- <get src="https://oss.sonatype.org/content/repositories/snapshots/junit/junit/4.11/junit-4.11.jar"
- dest="${maven.repo.local}/junit/junit/4.11/junit-4.11.jar"
- usetimestamp="false"
- ignoreerrors="true"/>
- <get src="http://repo.maven.apache.org/maven2/junit/junit/4.11/junit-4.11.jar"
- dest="${maven.repo.local}/junit/junit/4.11/junit-4.11.jar"
- usetimestamp="false"
- ignoreerrors="true"/>
- <mkdir dir="${maven.repo.local}/org/hamcrest/hamcrest-core/1.3"/>
- <get src="https://oss.sonatype.org/content/repositories/snapshots/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar"
- dest="${maven.repo.local}/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar"
- usetimestamp="false"
- ignoreerrors="true"/>
- <get src="http://repo.maven.apache.org/maven2/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar"
- dest="${maven.repo.local}/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar"
- usetimestamp="false"
- ignoreerrors="true"/>
- <mkdir dir="${maven.repo.local}/com/github/jnr/jnr-constants/0.8.4"/>
- <get src="https://oss.sonatype.org/content/repositories/snapshots/com/github/jnr/jnr-constants/0.8.4/jnr-constants-0.8.4.jar"
- dest="${maven.repo.local}/com/github/jnr/jnr-constants/0.8.4/jnr-constants-0.8.4.jar"
- usetimestamp="false"
- ignoreerrors="true"/>
- <get src="http://repo.maven.apache.org/maven2/com/github/jnr/jnr-constants/0.8.4/jnr-constants-0.8.4.jar"
- dest="${maven.repo.local}/com/github/jnr/jnr-constants/0.8.4/jnr-constants-0.8.4.jar"
- usetimestamp="false"
- ignoreerrors="true"/>
- <mkdir dir="${maven.repo.local}/com/github/jnr/jnr-ffi/1.0.3"/>
- <get src="https://oss.sonatype.org/content/repositories/snapshots/com/github/jnr/jnr-ffi/1.0.3/jnr-ffi-1.0.3.jar"
- dest="${maven.repo.local}/com/github/jnr/jnr-ffi/1.0.3/jnr-ffi-1.0.3.jar"
- usetimestamp="false"
- ignoreerrors="true"/>
- <get src="http://repo.maven.apache.org/maven2/com/github/jnr/jnr-ffi/1.0.3/jnr-ffi-1.0.3.jar"
- dest="${maven.repo.local}/com/github/jnr/jnr-ffi/1.0.3/jnr-ffi-1.0.3.jar"
- usetimestamp="false"
- ignoreerrors="true"/>
- <mkdir dir="${maven.repo.local}/com/github/jnr/jffi/1.2.7"/>
- <get src="https://oss.sonatype.org/content/repositories/snapshots/com/github/jnr/jffi/1.2.7/jffi-1.2.7.jar"
- dest="${maven.repo.local}/com/github/jnr/jffi/1.2.7/jffi-1.2.7.jar"
- usetimestamp="false"
- ignoreerrors="true"/>
- <get src="http://repo.maven.apache.org/maven2/com/github/jnr/jffi/1.2.7/jffi-1.2.7.jar"
- dest="${maven.repo.local}/com/github/jnr/jffi/1.2.7/jffi-1.2.7.jar"
- usetimestamp="false"
- ignoreerrors="true"/>
- <mkdir dir="${maven.repo.local}/com/github/jnr/jffi/1.2.7"/>
- <get src="https://oss.sonatype.org/content/repositories/snapshots/com/github/jnr/jffi/1.2.7/jffi-1.2.7-native.jar"
- dest="${maven.repo.local}/com/github/jnr/jffi/1.2.7/jffi-1.2.7-native.jar"
- usetimestamp="false"
- ignoreerrors="true"/>
- <get src="http://repo.maven.apache.org/maven2/com/github/jnr/jffi/1.2.7/jffi-1.2.7-native.jar"
- dest="${maven.repo.local}/com/github/jnr/jffi/1.2.7/jffi-1.2.7-native.jar"
- usetimestamp="false"
- ignoreerrors="true"/>
- <mkdir dir="${maven.repo.local}/org/ow2/asm/asm/4.0"/>
- <get src="https://oss.sonatype.org/content/repositories/snapshots/org/ow2/asm/asm/4.0/asm-4.0.jar"
- dest="${maven.repo.local}/org/ow2/asm/asm/4.0/asm-4.0.jar"
- usetimestamp="false"
- ignoreerrors="true"/>
- <get src="http://repo.maven.apache.org/maven2/org/ow2/asm/asm/4.0/asm-4.0.jar"
- dest="${maven.repo.local}/org/ow2/asm/asm/4.0/asm-4.0.jar"
- usetimestamp="false"
- ignoreerrors="true"/>
- <mkdir dir="${maven.repo.local}/org/ow2/asm/asm-commons/4.0"/>
- <get src="https://oss.sonatype.org/content/repositories/snapshots/org/ow2/asm/asm-commons/4.0/asm-commons-4.0.jar"
- dest="${maven.repo.local}/org/ow2/asm/asm-commons/4.0/asm-commons-4.0.jar"
- usetimestamp="false"
- ignoreerrors="true"/>
- <get src="http://repo.maven.apache.org/maven2/org/ow2/asm/asm-commons/4.0/asm-commons-4.0.jar"
- dest="${maven.repo.local}/org/ow2/asm/asm-commons/4.0/asm-commons-4.0.jar"
- usetimestamp="false"
- ignoreerrors="true"/>
- <mkdir dir="${maven.repo.local}/org/ow2/asm/asm-analysis/4.0"/>
- <get src="https://oss.sonatype.org/content/repositories/snapshots/org/ow2/asm/asm-analysis/4.0/asm-analysis-4.0.jar"
- dest="${maven.repo.local}/org/ow2/asm/asm-analysis/4.0/asm-analysis-4.0.jar"
- usetimestamp="false"
- ignoreerrors="true"/>
- <get src="http://repo.maven.apache.org/maven2/org/ow2/asm/asm-analysis/4.0/asm-analysis-4.0.jar"
- dest="${maven.repo.local}/org/ow2/asm/asm-analysis/4.0/asm-analysis-4.0.jar"
- usetimestamp="false"
- ignoreerrors="true"/>
- <mkdir dir="${maven.repo.local}/org/ow2/asm/asm-tree/4.0"/>
- <get src="https://oss.sonatype.org/content/repositories/snapshots/org/ow2/asm/asm-tree/4.0/asm-tree-4.0.jar"
- dest="${maven.repo.local}/org/ow2/asm/asm-tree/4.0/asm-tree-4.0.jar"
- usetimestamp="false"
- ignoreerrors="true"/>
- <get src="http://repo.maven.apache.org/maven2/org/ow2/asm/asm-tree/4.0/asm-tree-4.0.jar"
- dest="${maven.repo.local}/org/ow2/asm/asm-tree/4.0/asm-tree-4.0.jar"
- usetimestamp="false"
- ignoreerrors="true"/>
- <mkdir dir="${maven.repo.local}/org/ow2/asm/asm-util/4.0"/>
- <get src="https://oss.sonatype.org/content/repositories/snapshots/org/ow2/asm/asm-util/4.0/asm-util-4.0.jar"
- dest="${maven.repo.local}/org/ow2/asm/asm-util/4.0/asm-util-4.0.jar"
- usetimestamp="false"
- ignoreerrors="true"/>
- <get src="http://repo.maven.apache.org/maven2/org/ow2/asm/asm-util/4.0/asm-util-4.0.jar"
- dest="${maven.repo.local}/org/ow2/asm/asm-util/4.0/asm-util-4.0.jar"
- usetimestamp="false"
- ignoreerrors="true"/>
- <mkdir dir="${maven.repo.local}/com/github/jnr/jnr-x86asm/1.0.2"/>
- <get src="https://oss.sonatype.org/content/repositories/snapshots/com/github/jnr/jnr-x86asm/1.0.2/jnr-x86asm-1.0.2.jar"
- dest="${maven.repo.local}/com/github/jnr/jnr-x86asm/1.0.2/jnr-x86asm-1.0.2.jar"
- usetimestamp="false"
- ignoreerrors="true"/>
- <get src="http://repo.maven.apache.org/maven2/com/github/jnr/jnr-x86asm/1.0.2/jnr-x86asm-1.0.2.jar"
- dest="${maven.repo.local}/com/github/jnr/jnr-x86asm/1.0.2/jnr-x86asm-1.0.2.jar"
- usetimestamp="false"
- ignoreerrors="true"/>
- </target>
-
-</project>
diff --git a/dev-java/jnr-enxio/jnr-enxio-0.7-r1.ebuild b/dev-java/jnr-enxio/jnr-enxio-0.7-r1.ebuild
deleted file mode 100644
index a5257b885a5..00000000000
--- a/dev-java/jnr-enxio/jnr-enxio-0.7-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc examples source test"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Java Native Runtime Enhanced X-platform I/O"
-SRC_URI="https://github.com/jnr/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-HOMEPAGE="https://github.com/jnr/jnr-enxio"
-
-SLOT="0"
-KEYWORDS="amd64 x86"
-LICENSE="Apache-2.0"
-
-CDEPEND="dev-java/jnr-constants:0
- dev-java/jnr-ffi:2"
-
-DEPEND="${CDEPEND}
- >=virtual/jdk-1.7"
-
-RDEPEND="${CDEPEND}
- >=virtual/jre-1.7"
-
-java_prepare() {
- cp "${FILESDIR}"/${P}-build.xml build.xml || die
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_GENTOO_CLASSPATH="jnr-constants,jnr-ffi-2"
-
-src_install() {
- java-pkg_newjar target/${P}.jar ${PN}.jar
-
- use source && java-pkg_dosrc src/main/java/jnr
- use examples && java-pkg_doexamples src/main/java/jnr/enxio/example
- use doc && java-pkg_dojavadoc target/site/apidocs
-}
diff --git a/dev-java/jnr-enxio/metadata.xml b/dev-java/jnr-enxio/metadata.xml
deleted file mode 100644
index d8701322c28..00000000000
--- a/dev-java/jnr-enxio/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">jnr/jnr-enxio</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/dev-java/jnr-ffi/jnr-ffi-2.0.2-r1.ebuild b/dev-java/jnr-ffi/jnr-ffi-2.0.2-r1.ebuild
index e3a137ca89b..2c4a9a83197 100644
--- a/dev-java/jnr-ffi/jnr-ffi-2.0.2-r1.ebuild
+++ b/dev-java/jnr-ffi/jnr-ffi-2.0.2-r1.ebuild
@@ -13,7 +13,10 @@ SRC_URI="https://github.com/jnr/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="|| ( Apache-2.0 LGPL-3 )"
SLOT="2"
-KEYWORDS="~ppc64"
+KEYWORDS="~arm ppc64"
+
+# Fixing https://bugs.gentoo.org/736830 would cost too much time.
+RESTRICT="test"
COMMON_DEP="
~dev-java/jffi-1.2.9:1.2
diff --git a/dev-java/jnr-netdb/jnr-netdb-1.1.4-r1.ebuild b/dev-java/jnr-netdb/jnr-netdb-1.1.4-r1.ebuild
index 0445d17f4ea..2a7af0818eb 100644
--- a/dev-java/jnr-netdb/jnr-netdb-1.1.4-r1.ebuild
+++ b/dev-java/jnr-netdb/jnr-netdb-1.1.4-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
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/jnr/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="1.0"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
COMMON_DEP="
dev-java/jnr-ffi:2"
diff --git a/dev-java/jnr-posix/jnr-posix-3.0.10-r1.ebuild b/dev-java/jnr-posix/jnr-posix-3.0.10-r1.ebuild
index 3c685ec9c53..8e1f57eabfc 100644
--- a/dev-java/jnr-posix/jnr-posix-3.0.10-r1.ebuild
+++ b/dev-java/jnr-posix/jnr-posix-3.0.10-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
@@ -20,7 +20,7 @@ SRC_URI="https://github.com/jnr/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="|| ( CPL-1.0 GPL-2 LGPL-2.1 )"
SLOT="3.0"
-KEYWORDS="amd64 arm64 ~ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris"
CDEPEND="dev-java/jnr-constants:0
dev-java/jnr-ffi:2"
diff --git a/dev-java/jnr-posix/jnr-posix-3.0.10.ebuild b/dev-java/jnr-posix/jnr-posix-3.0.10.ebuild
deleted file mode 100644
index 908bb554f1a..00000000000
--- a/dev-java/jnr-posix/jnr-posix-3.0.10.ebuild
+++ /dev/null
@@ -1,53 +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 test"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Lightweight cross-platform POSIX emulation layer for Java"
-HOMEPAGE="https://github.com/jnr/jnr-posix"
-SRC_URI="https://github.com/jnr/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="|| ( CPL-1.0 GPL-2 LGPL-2.1 )"
-SLOT="3.0"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris"
-
-CDEPEND="dev-java/jnr-constants:0
- dev-java/jnr-ffi:2"
-
-RDEPEND="${CDEPEND}
- >=virtual/jre-1.6"
-
-DEPEND="${CDEPEND}
- >=virtual/jdk-1.6
- test? (
- dev-java/ant-junit
- dev-java/junit:4
- )"
-
-java_prepare() {
- cp "${FILESDIR}"/${PN}_maven-build.xml build.xml || die
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-JAVA_ANT_CLASSPATH_TAGS="${JAVA_ANT_CLASSPATH_TAGS} javadoc"
-JAVA_ANT_ENCODING="UTF-8"
-
-EANT_EXTRA_ARGS="-Dmaven.build.finalName=${PN}"
-EANT_GENTOO_CLASSPATH="jnr-constants,jnr-ffi-2"
-EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit-4"
-
-src_test() {
- java-pkg-2_src_test
-}
-
-src_install() {
- java-pkg_dojar target/${PN}.jar
- dodoc README.txt
-
- use doc && java-pkg_dojavadoc target/site/apidocs
- use source && java-pkg_dosrc src/main/java/*
-}
diff --git a/dev-java/jnr-unixsocket/Manifest b/dev-java/jnr-unixsocket/Manifest
deleted file mode 100644
index 1ef26ed9100..00000000000
--- a/dev-java/jnr-unixsocket/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST jnr-unixsocket-0.6.tar.gz 6756 BLAKE2B a011f3f660526b0a7e4973a5e2168f9b0ee8a408ad2c9c1b622d9aae7659d915e258a0588f010fb56e0ac5740590b89988d77579884930f70675aff4ffe056bf SHA512 93ceb4f90b259c94eb0a68f13da1bbdae547b77637102fc36b9aa4427ed079bca1e9d503579c52cb4ea591bf67df30efcb99c6c4d71e7545cc6ff35f5ca65249
diff --git a/dev-java/jnr-unixsocket/files/jnr-unixsocket-0.6-build.xml b/dev-java/jnr-unixsocket/files/jnr-unixsocket-0.6-build.xml
deleted file mode 100644
index 4ef23a7785e..00000000000
--- a/dev-java/jnr-unixsocket/files/jnr-unixsocket-0.6-build.xml
+++ /dev/null
@@ -1,321 +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 6/6/13 12:11 PM -->
-<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/ -->
-<!-- -->
-<!-- ====================================================================== -->
-
-<project name="jnr-unixsocket-from-maven" default="package" basedir=".">
-
- <!-- ====================================================================== -->
- <!-- Build environment properties -->
- <!-- ====================================================================== -->
-
- <property file="${user.home}/.m2/maven.properties"/>
- <property file="maven-build.properties"/>
-
- <property name="maven.build.finalName" value="jnr-unixsocket-0.6"/>
- <property name="maven.build.dir" value="target"/>
- <property name="maven.build.outputDir" value="${maven.build.dir}/classes"/>
- <property name="maven.build.srcDir.0" value="src/main/java"/>
- <property name="maven.build.resourceDir.0" value="src/main/resources"/>
- <property name="maven.build.testOutputDir" value="${maven.build.dir}/test-classes"/>
- <property name="maven.build.testDir.0" value="src/test/java"/>
- <property name="maven.build.testResourceDir.0" value="src/test/resources"/>
- <property name="maven.test.reports" value="${maven.build.dir}/test-reports"/>
- <property name="maven.reporting.outputDirectory" value="${maven.build.dir}/site"/>
-
- <property name="maven.repo.local" value="${user.home}/.m2/repository"/>
- <property name="maven.settings.offline" value="false"/>
- <property name="maven.settings.interactiveMode" value="true"/>
-
- <!-- ====================================================================== -->
- <!-- Defining classpaths -->
- <!-- ====================================================================== -->
-
- <path id="build.classpath">
- <pathelement location="${maven.repo.local}/com/github/jnr/jnr-ffi/1.0.3/jnr-ffi-1.0.3.jar"/>
- <pathelement location="${maven.repo.local}/com/github/jnr/jffi/1.2.7/jffi-1.2.7.jar"/>
- <pathelement location="${maven.repo.local}/org/ow2/asm/asm/4.0/asm-4.0.jar"/>
- <pathelement location="${maven.repo.local}/org/ow2/asm/asm-commons/4.0/asm-commons-4.0.jar"/>
- <pathelement location="${maven.repo.local}/org/ow2/asm/asm-analysis/4.0/asm-analysis-4.0.jar"/>
- <pathelement location="${maven.repo.local}/org/ow2/asm/asm-tree/4.0/asm-tree-4.0.jar"/>
- <pathelement location="${maven.repo.local}/org/ow2/asm/asm-util/4.0/asm-util-4.0.jar"/>
- <pathelement location="${maven.repo.local}/com/github/jnr/jnr-x86asm/1.0.2/jnr-x86asm-1.0.2.jar"/>
- <pathelement location="${maven.repo.local}/com/github/jnr/jnr-constants/0.8.4/jnr-constants-0.8.4.jar"/>
- <pathelement location="${maven.repo.local}/com/github/jnr/jnr-enxio/0.4/jnr-enxio-0.4.jar"/>
- </path>
- <path id="build.test.classpath">
- <pathelement location="${maven.repo.local}/junit/junit/4.8.2/junit-4.8.2.jar"/>
- <pathelement location="${maven.repo.local}/com/github/jnr/jnr-ffi/1.0.3/jnr-ffi-1.0.3.jar"/>
- <pathelement location="${maven.repo.local}/com/github/jnr/jffi/1.2.7/jffi-1.2.7.jar"/>
- <pathelement location="${maven.repo.local}/com/github/jnr/jffi/1.2.7/jffi-1.2.7-native.jar"/>
- <pathelement location="${maven.repo.local}/org/ow2/asm/asm/4.0/asm-4.0.jar"/>
- <pathelement location="${maven.repo.local}/org/ow2/asm/asm-commons/4.0/asm-commons-4.0.jar"/>
- <pathelement location="${maven.repo.local}/org/ow2/asm/asm-analysis/4.0/asm-analysis-4.0.jar"/>
- <pathelement location="${maven.repo.local}/org/ow2/asm/asm-tree/4.0/asm-tree-4.0.jar"/>
- <pathelement location="${maven.repo.local}/org/ow2/asm/asm-util/4.0/asm-util-4.0.jar"/>
- <pathelement location="${maven.repo.local}/com/github/jnr/jnr-x86asm/1.0.2/jnr-x86asm-1.0.2.jar"/>
- <pathelement location="${maven.repo.local}/com/github/jnr/jnr-constants/0.8.4/jnr-constants-0.8.4.jar"/>
- <pathelement location="${maven.repo.local}/com/github/jnr/jnr-enxio/0.4/jnr-enxio-0.4.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}"/>
- </target>
-
- <!-- ====================================================================== -->
- <!-- Run all tests -->
- <!-- ====================================================================== -->
-
- <target name="test"
- depends="compile-tests, junit-missing"
- unless="junit.skipped"
- description="Run the test cases"/>
-
- <target name="test-junit-present">
- <available classname="junit.framework.Test" property="junit.present"/>
- </target>
-
- <target name="test-junit-status"
- depends="test-junit-present">
- <condition property="junit.missing">
- <and>
- <isfalse value="${junit.present}"/>
- <isfalse value="${maven.test.skip}"/>
- </and>
- </condition>
- <condition property="junit.skipped">
- <or>
- <isfalse value="${junit.present}"/>
- <istrue value="${maven.test.skip}"/>
- </or>
- </condition>
- </target>
-
- <target name="junit-missing"
- depends="test-junit-status"
- if="junit.missing">
- <echo>=================================== WARNING ===================================</echo>
- <echo> JUnit is not present in your $ANT_HOME/lib directory. Tests not executed.</echo>
- <echo>===============================================================================</echo>
- </target>
-
- <!-- ====================================================================== -->
- <!-- Javadoc target -->
- <!-- ====================================================================== -->
-
- <target name="javadoc" description="Generates the Javadoc of the application">
- <javadoc sourcepath="${maven.build.srcDir.0}"
- packagenames="*"
- destdir="${maven.reporting.outputDirectory}/apidocs"
- access="protected"
- old="false"
- verbose="false"
- version="true"
- use="true"
- author="true"
- splitindex="false"
- nodeprecated="false"
- nodeprecatedlist="false"
- notree="false"
- noindex="false"
- nohelp="false"
- nonavbar="false"
- serialwarn="false"
- charset="ISO-8859-1"
- linksource="false"
- breakiterator="false"/>
- </target>
-
- <!-- ====================================================================== -->
- <!-- Package target -->
- <!-- ====================================================================== -->
-
- <target name="package" depends="compile,test" description="Package the application">
- <jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar"
- compress="true"
- index="false"
- basedir="${maven.build.outputDir}"
- excludes="**/package.html"/>
- </target>
-
- <!-- ====================================================================== -->
- <!-- A dummy target for the package named after the type it creates -->
- <!-- ====================================================================== -->
-
- <target name="jar" depends="package" description="Builds the jar for the application"/>
-
- <!-- ====================================================================== -->
- <!-- Download dependencies target -->
- <!-- ====================================================================== -->
-
- <target name="test-offline">
- <condition property="maven.mode.offline">
- <equals arg1="${maven.settings.offline}" arg2="true"/>
- </condition>
- </target>
-
- <target name="get-deps"
- depends="test-offline"
- description="Download all dependencies"
- unless="maven.mode.offline">
- <mkdir dir="${maven.repo.local}"/>
- <mkdir dir="${maven.repo.local}/junit/junit/4.8.2"/>
- <get src="https://oss.sonatype.org/content/repositories/snapshots/junit/junit/4.8.2/junit-4.8.2.jar"
- dest="${maven.repo.local}/junit/junit/4.8.2/junit-4.8.2.jar"
- usetimestamp="false"
- ignoreerrors="true"/>
- <get src="http://repo.maven.apache.org/maven2/junit/junit/4.8.2/junit-4.8.2.jar"
- dest="${maven.repo.local}/junit/junit/4.8.2/junit-4.8.2.jar"
- usetimestamp="false"
- ignoreerrors="true"/>
- <mkdir dir="${maven.repo.local}/com/github/jnr/jnr-ffi/1.0.3"/>
- <get src="https://oss.sonatype.org/content/repositories/snapshots/com/github/jnr/jnr-ffi/1.0.3/jnr-ffi-1.0.3.jar"
- dest="${maven.repo.local}/com/github/jnr/jnr-ffi/1.0.3/jnr-ffi-1.0.3.jar"
- usetimestamp="false"
- ignoreerrors="true"/>
- <get src="http://repo.maven.apache.org/maven2/com/github/jnr/jnr-ffi/1.0.3/jnr-ffi-1.0.3.jar"
- dest="${maven.repo.local}/com/github/jnr/jnr-ffi/1.0.3/jnr-ffi-1.0.3.jar"
- usetimestamp="false"
- ignoreerrors="true"/>
- <mkdir dir="${maven.repo.local}/com/github/jnr/jffi/1.2.7"/>
- <get src="https://oss.sonatype.org/content/repositories/snapshots/com/github/jnr/jffi/1.2.7/jffi-1.2.7.jar"
- dest="${maven.repo.local}/com/github/jnr/jffi/1.2.7/jffi-1.2.7.jar"
- usetimestamp="false"
- ignoreerrors="true"/>
- <get src="http://repo.maven.apache.org/maven2/com/github/jnr/jffi/1.2.7/jffi-1.2.7.jar"
- dest="${maven.repo.local}/com/github/jnr/jffi/1.2.7/jffi-1.2.7.jar"
- usetimestamp="false"
- ignoreerrors="true"/>
- <mkdir dir="${maven.repo.local}/com/github/jnr/jffi/1.2.7"/>
- <get src="https://oss.sonatype.org/content/repositories/snapshots/com/github/jnr/jffi/1.2.7/jffi-1.2.7-native.jar"
- dest="${maven.repo.local}/com/github/jnr/jffi/1.2.7/jffi-1.2.7-native.jar"
- usetimestamp="false"
- ignoreerrors="true"/>
- <get src="http://repo.maven.apache.org/maven2/com/github/jnr/jffi/1.2.7/jffi-1.2.7-native.jar"
- dest="${maven.repo.local}/com/github/jnr/jffi/1.2.7/jffi-1.2.7-native.jar"
- usetimestamp="false"
- ignoreerrors="true"/>
- <mkdir dir="${maven.repo.local}/org/ow2/asm/asm/4.0"/>
- <get src="https://oss.sonatype.org/content/repositories/snapshots/org/ow2/asm/asm/4.0/asm-4.0.jar"
- dest="${maven.repo.local}/org/ow2/asm/asm/4.0/asm-4.0.jar"
- usetimestamp="false"
- ignoreerrors="true"/>
- <get src="http://repo.maven.apache.org/maven2/org/ow2/asm/asm/4.0/asm-4.0.jar"
- dest="${maven.repo.local}/org/ow2/asm/asm/4.0/asm-4.0.jar"
- usetimestamp="false"
- ignoreerrors="true"/>
- <mkdir dir="${maven.repo.local}/org/ow2/asm/asm-commons/4.0"/>
- <get src="https://oss.sonatype.org/content/repositories/snapshots/org/ow2/asm/asm-commons/4.0/asm-commons-4.0.jar"
- dest="${maven.repo.local}/org/ow2/asm/asm-commons/4.0/asm-commons-4.0.jar"
- usetimestamp="false"
- ignoreerrors="true"/>
- <get src="http://repo.maven.apache.org/maven2/org/ow2/asm/asm-commons/4.0/asm-commons-4.0.jar"
- dest="${maven.repo.local}/org/ow2/asm/asm-commons/4.0/asm-commons-4.0.jar"
- usetimestamp="false"
- ignoreerrors="true"/>
- <mkdir dir="${maven.repo.local}/org/ow2/asm/asm-analysis/4.0"/>
- <get src="https://oss.sonatype.org/content/repositories/snapshots/org/ow2/asm/asm-analysis/4.0/asm-analysis-4.0.jar"
- dest="${maven.repo.local}/org/ow2/asm/asm-analysis/4.0/asm-analysis-4.0.jar"
- usetimestamp="false"
- ignoreerrors="true"/>
- <get src="http://repo.maven.apache.org/maven2/org/ow2/asm/asm-analysis/4.0/asm-analysis-4.0.jar"
- dest="${maven.repo.local}/org/ow2/asm/asm-analysis/4.0/asm-analysis-4.0.jar"
- usetimestamp="false"
- ignoreerrors="true"/>
- <mkdir dir="${maven.repo.local}/org/ow2/asm/asm-tree/4.0"/>
- <get src="https://oss.sonatype.org/content/repositories/snapshots/org/ow2/asm/asm-tree/4.0/asm-tree-4.0.jar"
- dest="${maven.repo.local}/org/ow2/asm/asm-tree/4.0/asm-tree-4.0.jar"
- usetimestamp="false"
- ignoreerrors="true"/>
- <get src="http://repo.maven.apache.org/maven2/org/ow2/asm/asm-tree/4.0/asm-tree-4.0.jar"
- dest="${maven.repo.local}/org/ow2/asm/asm-tree/4.0/asm-tree-4.0.jar"
- usetimestamp="false"
- ignoreerrors="true"/>
- <mkdir dir="${maven.repo.local}/org/ow2/asm/asm-util/4.0"/>
- <get src="https://oss.sonatype.org/content/repositories/snapshots/org/ow2/asm/asm-util/4.0/asm-util-4.0.jar"
- dest="${maven.repo.local}/org/ow2/asm/asm-util/4.0/asm-util-4.0.jar"
- usetimestamp="false"
- ignoreerrors="true"/>
- <get src="http://repo.maven.apache.org/maven2/org/ow2/asm/asm-util/4.0/asm-util-4.0.jar"
- dest="${maven.repo.local}/org/ow2/asm/asm-util/4.0/asm-util-4.0.jar"
- usetimestamp="false"
- ignoreerrors="true"/>
- <mkdir dir="${maven.repo.local}/com/github/jnr/jnr-x86asm/1.0.2"/>
- <get src="https://oss.sonatype.org/content/repositories/snapshots/com/github/jnr/jnr-x86asm/1.0.2/jnr-x86asm-1.0.2.jar"
- dest="${maven.repo.local}/com/github/jnr/jnr-x86asm/1.0.2/jnr-x86asm-1.0.2.jar"
- usetimestamp="false"
- ignoreerrors="true"/>
- <get src="http://repo.maven.apache.org/maven2/com/github/jnr/jnr-x86asm/1.0.2/jnr-x86asm-1.0.2.jar"
- dest="${maven.repo.local}/com/github/jnr/jnr-x86asm/1.0.2/jnr-x86asm-1.0.2.jar"
- usetimestamp="false"
- ignoreerrors="true"/>
- <mkdir dir="${maven.repo.local}/com/github/jnr/jnr-constants/0.8.4"/>
- <get src="https://oss.sonatype.org/content/repositories/snapshots/com/github/jnr/jnr-constants/0.8.4/jnr-constants-0.8.4.jar"
- dest="${maven.repo.local}/com/github/jnr/jnr-constants/0.8.4/jnr-constants-0.8.4.jar"
- usetimestamp="false"
- ignoreerrors="true"/>
- <get src="http://repo.maven.apache.org/maven2/com/github/jnr/jnr-constants/0.8.4/jnr-constants-0.8.4.jar"
- dest="${maven.repo.local}/com/github/jnr/jnr-constants/0.8.4/jnr-constants-0.8.4.jar"
- usetimestamp="false"
- ignoreerrors="true"/>
- <mkdir dir="${maven.repo.local}/com/github/jnr/jnr-enxio/0.4"/>
- <get src="https://oss.sonatype.org/content/repositories/snapshots/com/github/jnr/jnr-enxio/0.4/jnr-enxio-0.4.jar"
- dest="${maven.repo.local}/com/github/jnr/jnr-enxio/0.4/jnr-enxio-0.4.jar"
- usetimestamp="false"
- ignoreerrors="true"/>
- <get src="http://repo.maven.apache.org/maven2/com/github/jnr/jnr-enxio/0.4/jnr-enxio-0.4.jar"
- dest="${maven.repo.local}/com/github/jnr/jnr-enxio/0.4/jnr-enxio-0.4.jar"
- usetimestamp="false"
- ignoreerrors="true"/>
- </target>
-
-</project>
diff --git a/dev-java/jnr-unixsocket/jnr-unixsocket-0.6-r1.ebuild b/dev-java/jnr-unixsocket/jnr-unixsocket-0.6-r1.ebuild
deleted file mode 100644
index 4b92a5c3baa..00000000000
--- a/dev-java/jnr-unixsocket/jnr-unixsocket-0.6-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc examples source test"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Unix sockets for Java"
-SRC_URI="https://github.com/jnr/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-HOMEPAGE="https://github.com/jnr/jnr-unixsocket"
-
-SLOT="0"
-KEYWORDS="amd64 x86"
-LICENSE="Apache-2.0"
-
-CDEPEND="dev-java/jnr-constants:0
- dev-java/jnr-enxio:0
- dev-java/jnr-posix:3.0
- dev-java/jnr-ffi:2"
-
-DEPEND="${CDEPEND}
- >=virtual/jdk-1.7"
-
-RDEPEND="${CDEPEND}
- >=virtual/jre-1.7"
-
-java_prepare() {
- cp "${FILESDIR}"/${P}-build.xml build.xml || die
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_GENTOO_CLASSPATH="jnr-constants,jnr-enxio,jnr-ffi-2,jnr-posix-3.0"
-
-src_install() {
- java-pkg_newjar target/${P}.jar ${PN}.jar
-
- use source && java-pkg_dosrc src/main/java/jnr
- use examples && java-pkg_doexamples src/main/java/jnr/unixsocket/example
- use doc && java-pkg_dojavadoc target/site/apidocs
-}
diff --git a/dev-java/jnr-unixsocket/metadata.xml b/dev-java/jnr-unixsocket/metadata.xml
deleted file mode 100644
index e746f31f954..00000000000
--- a/dev-java/jnr-unixsocket/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">jnr/jnr-unixsocket</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/dev-java/jnr-x86asm/jnr-x86asm-1.0.2-r2.ebuild b/dev-java/jnr-x86asm/jnr-x86asm-1.0.2-r2.ebuild
index c67d69eba20..d6d1682c2b7 100644
--- a/dev-java/jnr-x86asm/jnr-x86asm-1.0.2-r2.ebuild
+++ b/dev-java/jnr-x86asm/jnr-x86asm-1.0.2-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/jnr/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar
LICENSE="MIT"
SLOT="1.0"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
IUSE=""
DEPEND=">=virtual/jdk-1.8:*"
diff --git a/dev-java/joda-convert/Manifest b/dev-java/joda-convert/Manifest
index c79515207e1..aa51e39d0cf 100644
--- a/dev-java/joda-convert/Manifest
+++ b/dev-java/joda-convert/Manifest
@@ -1 +1 @@
-DIST joda-convert-1.3.1-dist.tar.gz 131288 BLAKE2B 0b7b6cebb7e13e89d838ec10c4edd54b52bf3449b3003cd41ea2628719b8ea52bc00a8681a96fad0de79b4acd56fc4a8d4a31d558841fa268d9ffbeb97ca1ed0 SHA512 ee3f7264e9ee445dd8cf088c862809faceb012d317c4974d2312e1ce9b580193096259978a79cdefc2217818600ff38569348625986e19bdb753edb03ba58451
+DIST joda-convert-2.2.2.tar.gz 65476 BLAKE2B 9ef8e3b172d31f4e3b748ba5aae807b1d344c3b6bedeb0bf0b84b93009171495f271d03cd9f7b29147a256ddd1081b3fc9640c1df6b45425080ce1d44e2c0f37 SHA512 9660491373d5f7d415ab47cec7164922fc8901803e759bbf8cf7d0cc58040c2c8b245271f33d641a563ffb25b8e42f8197e297da7d1fe68a5c50ebb61536f3ae
diff --git a/dev-java/joda-convert/files/joda-convert-1.3.1-build.xml b/dev-java/joda-convert/files/joda-convert-1.3.1-build.xml
deleted file mode 100644
index c66dfec9c1d..00000000000
--- a/dev-java/joda-convert/files/joda-convert-1.3.1-build.xml
+++ /dev/null
@@ -1,248 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- ====================================================================== -->
-<!-- Ant build file (http://ant.apache.org/) for Ant 1.6.2 or above. -->
-<!-- ====================================================================== -->
-
-<!-- ====================================================================== -->
-<!-- ===================== - DO NOT EDIT THIS FILE! - ===================== -->
-<!-- ====================================================================== -->
-<!-- -->
-<!-- Any modifications will be overwritten. -->
-<!-- -->
-<!-- Generated by Maven Ant Plugin on 5/9/13 4:18 PM -->
-<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/ -->
-<!-- -->
-<!-- ====================================================================== -->
-
-<project name="joda-convert-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="joda-convert-1.3.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="."/>
- <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.5/junit-4.5.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="true"
- deprecation="false"
- target="1.6"
- verbose="true"
- fork="true"
- source="1.6">
- <src>
- <pathelement location="${maven.build.srcDir.0}"/>
- </src>
- <classpath refid="build.classpath"/>
- </javac>
- <mkdir dir="${maven.build.outputDir}/META-INF"/>
- <copy todir="${maven.build.outputDir}/META-INF">
- <fileset dir="${maven.build.resourceDir.0}">
- <include name="LICENSE.txt"/>
- <include name="NOTICE.txt"/>
- </fileset>
- </copy>
- </target>
-
- <!-- ====================================================================== -->
- <!-- Test-compilation target -->
- <!-- ====================================================================== -->
-
- <target name="compile-tests"
- depends="compile"
- description="Compile the test code"
- unless="maven.test.skip">
- <mkdir dir="${maven.build.testOutputDir}"/>
- <javac destdir="${maven.build.testOutputDir}"
- nowarn="false"
- debug="true"
- optimize="true"
- deprecation="false"
- target="1.6"
- verbose="true"
- fork="true"
- source="1.6">
- <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"/>
- <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"
- encoding="UTF-8"
- version="true"
- use="true"
- author="true"
- splitindex="false"
- nodeprecated="false"
- nodeprecatedlist="false"
- notree="false"
- noindex="false"
- nohelp="false"
- nonavbar="false"
- serialwarn="false"
- charset="ISO-8859-1"
- linksource="true"
- breakiterator="false">
- <link href="http://download.oracle.com/javase/6/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"
- manifest="src/conf/MANIFEST.MF"
- basedir="${maven.build.outputDir}"
- excludes="**/package.html"/>
- </target>
-
- <!-- ====================================================================== -->
- <!-- A dummy target for the package named after the type it creates -->
- <!-- ====================================================================== -->
-
- <target name="jar" depends="package" description="Builds the jar for the application"/>
-
- <!-- ====================================================================== -->
- <!-- Download dependencies target -->
- <!-- ====================================================================== -->
-
- <target name="test-offline">
- <condition property="maven.mode.offline">
- <equals arg1="${maven.settings.offline}" arg2="true"/>
- </condition>
- </target>
-
- <target name="get-deps"
- depends="test-offline"
- description="Download all dependencies"
- unless="maven.mode.offline">
- <mkdir dir="${maven.repo.local}"/>
- <mkdir dir="${maven.repo.local}/junit/junit/4.5"/>
- <get src="http://repo.maven.apache.org/maven2/junit/junit/4.5/junit-4.5.jar"
- dest="${maven.repo.local}/junit/junit/4.5/junit-4.5.jar"
- usetimestamp="false"
- ignoreerrors="true"/>
- </target>
-
-</project>
diff --git a/dev-java/joda-convert/joda-convert-1.3.1-r1.ebuild b/dev-java/joda-convert/joda-convert-1.3.1-r1.ebuild
deleted file mode 100644
index 03fe03d7034..00000000000
--- a/dev-java/joda-convert/joda-convert-1.3.1-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Java library for conversion between Object and String"
-HOMEPAGE="https://www.joda.org/joda-convert/"
-SRC_URI="mirror://sourceforge/${PN}/${P}-dist.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
-
-DEPEND="virtual/jdk:1.8
- test? (
- dev-java/junit:4
- dev-java/ant-junit:0
- )"
-RDEPEND=">=virtual/jre-1.8"
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_TEST_GENTOO_CLASSPATH="junit-4"
-EANT_EXTRA_ARGS="-Dmaven.build.finalName=${PN}"
-
-src_prepare() {
- default
- cp "${FILESDIR}"/${P}-build.xml build.xml || die
-}
-
-src_test() {
- java-pkg-2_src_test
-}
-
-src_install() {
- java-pkg_dojar target/${PN}.jar
- dodoc NOTICE.txt RELEASE-NOTES.txt
-
- use doc && java-pkg_dojavadoc target/site/apidocs
- use source && java-pkg_dosrc src/main/java/*
-}
diff --git a/dev-java/joda-convert/joda-convert-2.2.2.ebuild b/dev-java/joda-convert/joda-convert-2.2.2.ebuild
new file mode 100644
index 00000000000..cd9779ad6bd
--- /dev/null
+++ b/dev-java/joda-convert/joda-convert-2.2.2.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/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/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
+
+# Compile dependencies
+# POM: pom.xml
+# test? com.google.guava:guava:31.0.1-jre -> !!!suitable-mavenVersion-not-found!!!
+# test? junit:junit:4.13.2 -> >=dev-java/junit-4.13.2:4
+
+DEPEND="
+ >=virtual/jdk-1.8:*
+ test? (
+ dev-java/guava:20
+ )
+"
+
+RDEPEND="
+ >=virtual/jre-1.8:*
+"
+
+DOCS=( {LICENSE,NOTICE,RELEASE-NOTES}.txt README.md )
+
+S="${WORKDIR}/${P}"
+
+JAVA_SRC_DIR="src/main/java"
+# JAVA_RESOURCE_DIRS=""
+
+JAVA_TEST_GENTOO_CLASSPATH="guava-20,junit-4"
+JAVA_TEST_SRC_DIR="src/test/java"
+JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+
+JAVA_TEST_EXCLUDES=(
+ # Upstream: Tests run: 186, Failures: 0, Errors: 0, Skipped: 0
+ # All following: No runnable methods
+ org.joda.convert.test1.Test1Class
+ org.joda.convert.test1.Test1Interface
+ org.joda.convert.test2.Test2Class
+ org.joda.convert.test2.Test2Factory
+ org.joda.convert.test2.Test2Interface
+ org.joda.convert.test3.Test3Class
+ org.joda.convert.test3.Test3Factory
+ org.joda.convert.test3.Test3Interface
+ org.joda.convert.test3.Test3SuperClass
+ org.joda.convert.test4.Test4Class
+ org.joda.convert.test4.Test4Factory
+ org.joda.convert.test4.Test4Interface
+ org.joda.convert.TestRenameHandlerBadInit
+)
+
+src_install() {
+ default # https://bugs.gentoo.org/789582
+ java-pkg-simple_src_install
+}
diff --git a/dev-java/joda-convert/metadata.xml b/dev-java/joda-convert/metadata.xml
index e96bce731a6..9286c1123b7 100644
--- a/dev-java/joda-convert/metadata.xml
+++ b/dev-java/joda-convert/metadata.xml
@@ -6,6 +6,7 @@
<name>Java</name>
</maintainer>
<upstream>
- <remote-id type="sourceforge">joda-convert</remote-id>
+ <remote-id type="github">JodaOrg/joda-convert</remote-id>
+ <bugs-to>https://github.com/JodaOrg/joda-convert/issues</bugs-to>
</upstream>
</pkgmetadata>
diff --git a/dev-java/joda-time/joda-time-2.10.10-r1.ebuild b/dev-java/joda-time/joda-time-2.10.10-r1.ebuild
index 83349323f9f..408ed0ec068 100644
--- a/dev-java/joda-time/joda-time-2.10.10-r1.ebuild
+++ b/dev-java/joda-time/joda-time-2.10.10-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/JodaOrg/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
# Common dependencies
# POM: ${P}/pom.xml
diff --git a/dev-java/jopt-simple/jopt-simple-4.6-r1.ebuild b/dev-java/jopt-simple/jopt-simple-4.6-r1.ebuild
new file mode 100644
index 00000000000..ba73eb0fea1
--- /dev/null
+++ b/dev-java/jopt-simple/jopt-simple-4.6-r1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+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-4.6.ebuild b/dev-java/jopt-simple/jopt-simple-4.6.ebuild
index 197957670e4..91899dcea87 100644
--- a/dev-java/jopt-simple/jopt-simple-4.6.ebuild
+++ b/dev-java/jopt-simple/jopt-simple-4.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -12,7 +12,7 @@ HOMEPAGE="https://pholser.github.com/jopt-simple/"
SRC_URI="https://github.com/pholser/${PN}/tarball/${P} -> ${P}.tar.gz"
LICENSE="MIT"
SLOT="4.6"
-KEYWORDS="amd64 ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
RDEPEND=">=virtual/jre-1.6"
DEPEND=">=virtual/jdk-1.6"
diff --git a/dev-java/jrrd/Manifest b/dev-java/jrrd/Manifest
deleted file mode 100644
index 6704e0aaaa3..00000000000
--- a/dev-java/jrrd/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST jrrd-1.0.1.tar.gz 320476 BLAKE2B c8f2a16bd9e3d1dc53e6523e7b936ea65e23852feb69af917df9fcb40fe63a69335faf0bb476779f1e618ad44dabfec52f890232a8d85d8d5aa5c901c739bb6f SHA512 f794f052af32544e17d5aef58c7acb068f442c85e991d7f11c25119d94edb4aebb75f744df53caa64f4fd1e9f900f9018a82790a77dcac48e071b13833a8cced
diff --git a/dev-java/jrrd/files/jrrd-1.0.1-javacflags.patch b/dev-java/jrrd/files/jrrd-1.0.1-javacflags.patch
deleted file mode 100644
index b211ec1f3cb..00000000000
--- a/dev-java/jrrd/files/jrrd-1.0.1-javacflags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Makefile.am (revision 7413)
-+++ b/Makefile.am (working copy)
-@@ -15,7 +15,7 @@
-
- .java.class:
- -mkdir -p $(classdir)
-- $(JAVAC) -d $(classdir) $<
-+ $(JAVAC) $(JAVACFLAGS) -d $(classdir) $<
-
- rrd_jinterface.c: org_opennms_netmgt_rrd_rrdtool_Interface.h
-
diff --git a/dev-java/jrrd/jrrd-1.0.1-r2.ebuild b/dev-java/jrrd/jrrd-1.0.1-r2.ebuild
deleted file mode 100644
index 286cb6ffdc3..00000000000
--- a/dev-java/jrrd/jrrd-1.0.1-r2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-JAVA_PKG_IUSE="doc source"
-
-inherit autotools java-pkg-2
-
-DESCRIPTION="Java Interface to Tobias Oetiker's RRDtool"
-
-SRC_URI="mirror://sourceforge/opennms/${P}.tar.gz"
-HOMEPAGE="http://www.opennms.org/"
-KEYWORDS="amd64 x86"
-LICENSE="GPL-2"
-
-SLOT="0"
-
-CDEPEND="net-analyzer/rrdtool"
-
-RDEPEND="
- ${CDEPEND}
- >=virtual/jre-1.6"
-
-DEPEND="
- ${CDEPEND}
- >=virtual/jdk-1.6"
-
-PATCHES=( "${FILESDIR}/${P}-javacflags.patch" )
-
-src_configure() {
- econf
-}
-
-src_compile() {
- emake -j1
- use doc && ejavadoc -d javadoc $(find org -name "*.java")
-}
-
-src_install() {
- java-pkg_newjar "${S}/${PN}.jar"
- java-pkg_doso .libs/*.so
- use source && java-pkg_dosrc org
- use doc && java-pkg_dojavadoc javadoc
-}
diff --git a/dev-java/jrrd/metadata.xml b/dev-java/jrrd/metadata.xml
deleted file mode 100644
index 3c7cf2b9bec..00000000000
--- a/dev-java/jrrd/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="sourceforge">opennms</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/dev-java/jsch/Manifest b/dev-java/jsch/Manifest
index 018afebf8cf..38e84063f34 100644
--- a/dev-java/jsch/Manifest
+++ b/dev-java/jsch/Manifest
@@ -1 +1,2 @@
DIST jsch-0.1.54.zip 365455 BLAKE2B 5cd6fa012e5a511bad8f23a233559e6ad6d600f39ea7b519e66e118b1fdb997491b7ac8cff5bc1491c28f7ee99f0f4a3b4727f5d8ec02030576f34949d74e203 SHA512 2ed29f07495fbc28d6eb7b4fe414e8a9a96b911b2feea5b1513cc48a9439adba12341bceb23a3ea9ab307e32d48bfd4356c7bc877c56e77f6f55d69214db3a9e
+DIST jsch-0.1.55.zip 369664 BLAKE2B 4a35845e7b9e57c64a890547b2cabdec5bd03fa462ac3c78d8bcb757dbd5b50b366d41c042e904e44b967c85da01396c7dd085b8fe5f69ad243237fab38fa1f1 SHA512 334b550594272fe179f13fb6bbfc0a353334586786db2b3279608b85cdab3dd604e6dd04aa2376b5532816d906133e636b5359dda36c449d90173be501c61418
diff --git a/dev-java/jsch/jsch-0.1.54-r1.ebuild b/dev-java/jsch/jsch-0.1.54-r1.ebuild
new file mode 100644
index 00000000000..99d5d3657c7
--- /dev/null
+++ b/dev-java/jsch/jsch-0.1.54-r1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source examples"
+MAVEN_ID="com.jcraft:jsch:0.1.55"
+
+inherit java-pkg-2 java-ant-2 java-osgi
+
+DESCRIPTION="JSch is a pure Java implementation of SSH2"
+HOMEPAGE="http://www.jcraft.com/jsch/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.zip"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="zlib"
+
+CDEPEND="
+ zlib? ( dev-java/jzlib:0 )"
+
+RDEPEND="
+ ${CDEPEND}
+ >=virtual/jre-1.8:*"
+
+DEPEND="
+ ${CDEPEND}
+ >=virtual/jdk-1.8:*"
+
+BDEPEND="
+ app-arch/unzip
+"
+
+EANT_BUILD_TARGET="dist"
+JAVA_ANT_REWRITE_CLASSPATH="true"
+
+src_compile() {
+ if use zlib; then
+ EANT_EXTRA_ARGS="-Djzlib.available=true"
+ EANT_GENTOO_CLASSPATH="jzlib"
+ fi
+
+ java-pkg-2_src_compile
+}
+
+src_install() {
+ java-osgi_newjar dist/lib/jsch*.jar \
+ "com.jcraft.jsch" "JSch" \
+ "com.jcraft.jsch, com.jcraft.jsch.jce;x-internal:=true, \
+ com.jcraft.jsch.jcraft;x-internal:=true"
+
+ einstalldocs
+ use doc && java-pkg_dojavadoc javadoc
+ use source && java-pkg_dosrc src/*
+ use examples && java-pkg_doexamples examples
+}
diff --git a/dev-java/jsch/jsch-0.1.55.ebuild b/dev-java/jsch/jsch-0.1.55.ebuild
new file mode 100644
index 00000000000..4e12aeb3d7a
--- /dev/null
+++ b/dev-java/jsch/jsch-0.1.55.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom jsch-0.1.55.pom --download-uri https://repo1.maven.org/maven2/com/jcraft/jsch/0.1.55/jsch-0.1.55-sources.jar --slot 55 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild jsch-0.1.55.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="com.jcraft:jsch:0.1.55"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="JSch is a pure Java implementation of SSH2"
+HOMEPAGE="http://www.jcraft.com/jsch/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.zip"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+# Common dependencies
+# POM: ${P}.pom
+# com.jcraft:jzlib:1.0.7 -> >=dev-java/jzlib-1.1.3:0
+
+CP_DEPEND="
+ >=dev-java/jzlib-1.1.3:0
+"
+
+DEPEND="${CP_DEPEND}
+ >=virtual/jdk-1.8:*"
+
+RDEPEND="${CP_DEPEND}
+ >=virtual/jre-1.8:*"
+
+BDEPEND="app-arch/unzip"
+
+S="${WORKDIR}"
diff --git a/dev-java/jsoup/Manifest b/dev-java/jsoup/Manifest
deleted file mode 100644
index 2d3bf41db17..00000000000
--- a/dev-java/jsoup/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST jsoup-1.8.3a.zip 370626 BLAKE2B 9ba471a8e161ef4ad5f0abd54feb29075400a53622dcd1a9934307a123bfad087bea9fc17f3cf020929aadbf51a47b0df1aa1ad5201487394faaaf4c44a793a9 SHA512 d044231fc70ff6d5428707d56853db77feedbb29a4ea1a501e6fcbaaecb2743bdeeaa8dcf4c76f7d278905b31e83707ad2644e7876a44c9d2325537d647aab85
diff --git a/dev-java/jsoup/jsoup-1.8.3.ebuild b/dev-java/jsoup/jsoup-1.8.3.ebuild
deleted file mode 100644
index 103a8ed904c..00000000000
--- a/dev-java/jsoup/jsoup-1.8.3.ebuild
+++ /dev/null
@@ -1,48 +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 test"
-
-inherit java-pkg-2 java-pkg-simple
-
-MY_PV="${PV}a"
-MY_P="${PN}-${PN}-${MY_PV}"
-
-DESCRIPTION="Java HTML parser that makes sense of real-world HTML soup"
-HOMEPAGE="https://jsoup.org/"
-SRC_URI="https://github.com/jhy/${PN}/archive/${PN}-${MY_PV}.zip"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux"
-
-IUSE=""
-
-RDEPEND=">=virtual/jre-1.6"
-DEPEND=">=virtual/jdk-1.6
- test? ( dev-java/junit:4 )"
-
-S="${WORKDIR}/${MY_P}"
-
-JAVA_SRC_DIR="src/main/java"
-
-java_prepare() {
- rm pom.xml || die
- mkdir -p target/classes/org/jsoup/nodes/ || die
- cp src/main/java/org/jsoup/nodes/*.properties target/classes/org/jsoup/nodes/ || die
-}
-
-src_test() {
- testcp="${S}/${PN}.jar:$(java-pkg_getjars junit-4):target/tests"
-
- mkdir target/tests || die
- ejavac -cp "${testcp}" -d target/tests $(find src/test/java -name "*.java")
- cp -r src/test/resources/* target/tests || die
-
- tests=$(find target/tests -name "*Test.class" \
- | sed -e 's/target\/tests\///g' -e "s/\.class//" -e "s/\//./g" \
- | grep -vP '\$');
- ejunit4 -cp "${testcp}" ${tests}
-}
diff --git a/dev-java/jsoup/metadata.xml b/dev-java/jsoup/metadata.xml
deleted file mode 100644
index de1e1a4fcf8..00000000000
--- a/dev-java/jsoup/metadata.xml
+++ /dev/null
@@ -1,20 +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">jhy/jsoup</remote-id>
- </upstream>
- <longdescription>
- jsoup is a Java library for working with real-world HTML. It provides a
- very convenient API for extracting and manipulating data, using the best
- of DOM, CSS, and jquery-like methods.
- It implements the WHATWG HTML5 specification (http://whatwg.org/html),
- and parses HTML to the same DOM as modern browsers do. It's designed to
- deal with all varieties of HTML found in the wild; from pristine and
- validating, to invalid tag-soup; jsoup will create a sensible parse tree.
- </longdescription>
-</pkgmetadata>
diff --git a/dev-java/jsr225/Manifest b/dev-java/jsr225/Manifest
deleted file mode 100644
index c8500459e37..00000000000
--- a/dev-java/jsr225/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST jsr225-1.0.jar 58968 BLAKE2B 063cf9c372165a5382345e02cc4a6be9cc856533d18eca86c83c484034f97967e718f408ba701c1afccf8869f35980dba098d837b8cfb6cbe2d6b7adc9c70ef3 SHA512 c7f89904269bb09037599914cc4199b467f9d882b982eeeb7663776b61dbf6868c3aac8d576ca2d8999d0fe3378e3a3896776316c24039487d2501d6e2872712
diff --git a/dev-java/jsr225/jsr225-1.0.ebuild b/dev-java/jsr225/jsr225-1.0.ebuild
deleted file mode 100644
index bef070caa85..00000000000
--- a/dev-java/jsr225/jsr225-1.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-JAVA_PKG_IUSE="source doc"
-
-inherit java-pkg-2 java-pkg-simple
-
-MY_PN="xqj-api"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="XQuery API for Java"
-HOMEPAGE="http://jcp.org/en/jsr/detail?id=225"
-SRC_URI="https://github.com/cfoster/${MY_P}.0/raw/master/javax/xml/xquery/${MY_PN}/${PV}/${MY_P}-sources.jar -> ${P}.jar"
-
-LICENSE="GPL-2-with-linking-exception"
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
-IUSE=""
-
-RDEPEND=">=virtual/jre-1.6"
-DEPEND=">=virtual/jdk-1.6"
-
-JAVA_ENCODING="ISO-8859-1"
diff --git a/dev-java/jsr225/metadata.xml b/dev-java/jsr225/metadata.xml
deleted file mode 100644
index 44f32b80903..00000000000
--- a/dev-java/jsr225/metadata.xml
+++ /dev/null
@@ -1,10 +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>
- </maintainer>
- <upstream>
- <remote-id type="github">cfoster/xqj-api-1.0.0</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/dev-java/jsr305/Manifest b/dev-java/jsr305/Manifest
index 34d4b3252bb..066315e28ad 100644
--- a/dev-java/jsr305/Manifest
+++ b/dev-java/jsr305/Manifest
@@ -1,2 +1 @@
-DIST jsr305-3.0.1-sources.jar 16622 BLAKE2B c9cc042845c8cd0d4680568d1c1f7c3ae43ba03c0bc21eeac662572ec17a048b86d38848f116653f466904f5a90c345ab7e5ac827fdfe00c899521cea54e3474 SHA512 ca9902929de94fbc03b848599bb1f5f542898ade724eb0d6022f799733c9093bb27c0a565f0a90f47dba7bff72d5a6d24de687746721a1bec2050c2061ecd148
DIST jsr305-3.0.2.jar 18102 BLAKE2B fa6c40a63eb3e4683ae70612058420a905428b9ac9b920b2f7f4024579a5ff6fcffa576d50a616ed585b4896cbba87f4496273b860930f047184cf5df77004d0 SHA512 02327071dde09470c8cd0fe39405263146d7e86b15312bc3f909c6a6fa9b11c730bdb833b6cdbdf1aee0c6553e519cecd0257a296947f94636650e88cd8c5b79
diff --git a/dev-java/jsr305/jsr305-3.0.1.ebuild b/dev-java/jsr305/jsr305-3.0.2-r1.ebuild
index 02401bb3005..26583455807 100644
--- a/dev-java/jsr305/jsr305-3.0.1.ebuild
+++ b/dev-java/jsr305/jsr305-3.0.2-r1.ebuild
@@ -1,19 +1,18 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="5"
+EAPI=8
JAVA_PKG_IUSE="source doc"
inherit java-pkg-2 java-pkg-simple
DESCRIPTION="Annotations for Software Defect Detection in Java"
HOMEPAGE="http://jcp.org/en/jsr/detail?id=305"
-SRC_URI="http://central.maven.org/maven2/com/google/code/findbugs/${PN}/${PV}/${P}-sources.jar"
+SRC_URI="http://central.maven.org/maven2/com/google/code/findbugs/${PN}/${PV}/${P}-sources.jar -> ${P}.jar"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
-IUSE=""
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
-RDEPEND=">=virtual/jre-1.6"
-DEPEND=">=virtual/jdk-1.6"
+RDEPEND=">=virtual/jre-1.8:*"
+DEPEND=">=virtual/jdk-1.8:*"
diff --git a/dev-java/jsr305/jsr305-3.0.2.ebuild b/dev-java/jsr305/jsr305-3.0.2.ebuild
index d5ebba4056a..ed03d8e64d3 100644
--- a/dev-java/jsr305/jsr305-3.0.2.ebuild
+++ b/dev-java/jsr305/jsr305-3.0.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://central.maven.org/maven2/com/google/code/findbugs/${PN}/${PV}/${
LICENSE="BSD"
SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
RDEPEND=">=virtual/jre-1.6"
DEPEND=">=virtual/jdk-1.6"
diff --git a/dev-java/jsr311-api/Manifest b/dev-java/jsr311-api/Manifest
deleted file mode 100644
index 0c6118dea72..00000000000
--- a/dev-java/jsr311-api/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST jsr311-api-1.1.1-sources.jar 70022 BLAKE2B ca1c08bbdc256475adb89642d97ee278f0a26bd1191a29460a928a5148449207e41906eddc7a76bcfa8451cb241230ed8010e261ba8ac37ca0d260d6c4d1a3b9 SHA512 4f32eb290aa312794ae91b3b4e2baa72efbcf2036962c7223320f7f7e7cd9b5de10c4acb1c92277df946b12710e0699bc1d3ddd7459903c43107437c21cb5542
diff --git a/dev-java/jsr311-api/jsr311-api-1.1.1.ebuild b/dev-java/jsr311-api/jsr311-api-1.1.1.ebuild
deleted file mode 100644
index 0a55c763d1c..00000000000
--- a/dev-java/jsr311-api/jsr311-api-1.1.1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-JAVA_PKG_IUSE="source doc"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="JAX-RS: Java API for RESTful Web Services"
-HOMEPAGE="http://jcp.org/en/jsr/detail?id=311"
-SRC_URI="http://repo1.maven.org/maven2/javax/ws/rs/${PN}/${PV}/${P}-sources.jar"
-
-LICENSE="CDDL"
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
-IUSE=""
-
-RDEPEND=">=virtual/jre-1.6"
-DEPEND=">=virtual/jdk-1.6"
diff --git a/dev-java/jsr311-api/metadata.xml b/dev-java/jsr311-api/metadata.xml
deleted file mode 100644
index df203e1ca17..00000000000
--- a/dev-java/jsr311-api/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="person">
- <email>robbat2@gentoo.org</email>
-</maintainer>
-<maintainer type="project">
- <email>java@gentoo.org</email>
- <name>Java</name>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-java/jsr322/Manifest b/dev-java/jsr322/Manifest
deleted file mode 100644
index be702f79517..00000000000
--- a/dev-java/jsr322/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST jsr322-1.5.jar 86462 BLAKE2B e39aa3573ec711c721ed1cdf6ba3a3d58eb267ff6e05222852ba0d424100dfd9048f39e3f22910e70da60c8cbfff7ecd552488122789ade09a21972d8373e589 SHA512 e96d54f8ac8279e53754a3950590382f7857abf26a0a97f7ad70dc72e0da66c11c537627a329bee943756ffbb4d96e47b0501663b51c3775fb1dd5e8bfe3a9ae
diff --git a/dev-java/jsr322/jsr322-1.5.ebuild b/dev-java/jsr322/jsr322-1.5.ebuild
deleted file mode 100644
index a6017011f86..00000000000
--- a/dev-java/jsr322/jsr322-1.5.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-JAVA_PKG_IUSE="source doc"
-
-MY_PN="connector-api"
-MY_P="${MY_PN}-${PV}"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Java EE Connector Architecture"
-HOMEPAGE="http://jcp.org/en/jsr/detail?id=322"
-SRC_URI="https://repo1.maven.org/maven2/javax/resource/${MY_PN}/${PV}/${MY_P}-sources.jar -> ${P}.jar"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
-IUSE=""
-
-RDEPEND=">=virtual/jre-1.6"
-DEPEND=">=virtual/jdk-1.6"
diff --git a/dev-java/jsr322/metadata.xml b/dev-java/jsr322/metadata.xml
deleted file mode 100644
index 6ef2d50cf07..00000000000
--- a/dev-java/jsr322/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/jsr67/Manifest b/dev-java/jsr67/Manifest
deleted file mode 100644
index 48433b78a14..00000000000
--- a/dev-java/jsr67/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST jsr67-1.3.jar 327033 BLAKE2B cdfcb6d600a3b6cf6d355906eced551053f2cf608596dacfa477337d54eb47ef5dd6d87f508c59587453972d0eb547e6d6863ff57ec1d3c9e366f812c05a87c4 SHA512 c4145e5870af677542a09a17b7b57d9e5501f6354b26743b9eb9946dbd263114eb705c023af996ddcb256961df28a7ac2420a54fcdd69f73c8595901ee21760a
diff --git a/dev-java/jsr67/jsr67-1.3-r1.ebuild b/dev-java/jsr67/jsr67-1.3-r1.ebuild
deleted file mode 100644
index e9e87397f71..00000000000
--- a/dev-java/jsr67/jsr67-1.3-r1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc source"
-
-MY_PN="saaj-impl"
-MY_P="${MY_PN}-${PV}"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="SAAJ 1.3 (AKA JSR-67 MR3) API"
-HOMEPAGE="https://jcp.org/en/jsr/detail?id=67"
-SRC_URI="https://repo1.maven.org/maven2/com/sun/xml/messaging/${MY_PN%%-*}/${MY_PN}/${PV}/${MY_P}-sources.jar -> ${P}.jar"
-
-LICENSE="sun-jsr67"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=virtual/jre-1.6"
-
-DEPEND=">=virtual/jdk-1.6"
diff --git a/dev-java/jsr67/metadata.xml b/dev-java/jsr67/metadata.xml
deleted file mode 100644
index 6ef2d50cf07..00000000000
--- a/dev-java/jsr67/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/jss/Manifest b/dev-java/jss/Manifest
deleted file mode 100644
index 08f71177782..00000000000
--- a/dev-java/jss/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST jss-4.3.2.tar.bz2 435542 BLAKE2B 9623018e6e67654219fa439fdc907777cd286aa28b6bdbafee39a7082f949bc393d60dba32ca0b49178ecd423dcff0aa3ad411abb9db9332c6429d7751d89127 SHA512 3296da72f204fc4a0ea58dd889cf2721a4afa0ec7b5406312e64354cc67edcfc370140ad22a24f0dfcf11e438e69ebe9da45a70b5cbaa4026b40fd5fcf96c232
diff --git a/dev-java/jss/files/jss-3.4-target_source.patch b/dev-java/jss/files/jss-3.4-target_source.patch
deleted file mode 100644
index 5d5ce640965..00000000000
--- a/dev-java/jss/files/jss-3.4-target_source.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/mozilla/security/jss/build_java.pl
-+++ b/mozilla/security/jss/build_java.pl
-@@ -190,7 +190,7 @@
- #
- if( scalar(@source_list) > 0 ) {
- ensure_dir_exists($class_dir);
-- print_do("$javac $javac_opt_flag -sourcepath . -d $class_dir " .
-+ print_do("$javac $ENV{JAVA_GENTOO_OPTS} $javac_opt_flag -sourcepath . -d $class_dir " .
- "$classpath " . join(" ",@source_list));
- }
-
diff --git a/dev-java/jss/files/jss-4.2.5-use_pkg-config.patch b/dev-java/jss/files/jss-4.2.5-use_pkg-config.patch
deleted file mode 100644
index adf2862c90e..00000000000
--- a/dev-java/jss/files/jss-4.2.5-use_pkg-config.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Submitted By: Mario Fetka (mario-fetka at gmx dot at)
-Date: 2007-10-06
-Initial Package Version: 4.2.5
-Origin: me
-Upstream Status: #392775 UNCONFIRMED
-Description: this patch adds pkgconfig support to jss coreconf
-!!!! no check for NSS_PKGCONFIG NSPR_PKGCONFIG at the moment !!!!
-
---- a/mozilla/security/coreconf/location.mk
-+++ b/mozilla/security/coreconf/location.mk
-@@ -67,6 +67,13 @@
-
- GARBAGE += $(DEPENDENCIES) core $(wildcard core.[0-9]*)
-
-+ifdef USE_PKGCONFIG
-+ NSPR_INCLUDE_DIR = `${PKG_CONFIG} --variable=includedir $(NSPR_PKGCONFIG)`
-+ NSPR_LIB_DIR = `${PKG_CONFIG} --variable=libdir $(NSPR_PKGCONFIG)`
-+ NSS_INCLUDE_DIR = `${PKG_CONFIG} --variable=includedir $(NSS_PKGCONFIG)`
-+ NSS_LIB_DIR = `${PKG_CONFIG} --variable=libdir $(NSS_PKGCONFIG)`
-+endif
-+
- ifdef NSPR_INCLUDE_DIR
- INCLUDES += -I$(NSPR_INCLUDE_DIR)
- endif
diff --git a/dev-java/jss/files/jss-4.3-cflags.patch b/dev-java/jss/files/jss-4.3-cflags.patch
deleted file mode 100644
index 8b9705ca1e3..00000000000
--- a/dev-java/jss/files/jss-4.3-cflags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/security/coreconf/command.mk
-+++ b/security/coreconf/command.mk
-@@ -45,7 +45,7 @@
- CCF = $(CC) $(CFLAGS)
- LINK_DLL = $(LINK) $(OS_DLLFLAGS) $(DLLFLAGS)
- LINK_EXE = $(LINK) $(OS_LFLAGS) $(LFLAGS)
--CFLAGS = $(OPTIMIZER) $(OS_CFLAGS) $(XP_DEFINE) $(DEFINES) $(INCLUDES) \
-+CFLAGS += $(OPTIMIZER) $(OS_CFLAGS) $(XP_DEFINE) $(DEFINES) $(INCLUDES) \
- $(XCFLAGS)
- PERL = perl
- RANLIB = echo
diff --git a/dev-java/jss/files/jss-4.3-javadoc.patch b/dev-java/jss/files/jss-4.3-javadoc.patch
deleted file mode 100644
index 87941029bce..00000000000
--- a/dev-java/jss/files/jss-4.3-javadoc.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/security/jss/build_java.pl
-+++ b/security/jss/build_java.pl
-@@ -323,7 +323,7 @@
- ensure_dir_exists("$dist_dir/jssdoc");
- my $targets = join(" ", @packages);
- print "$targets\n";
-- print_do("$javadoc -breakiterator -sourcepath . -d $dist_dir/jssdoc $html_header_opt $targets");
-+ print_do("$javadoc -Xdoclint:none -breakiterator -sourcepath . -d $dist_dir/jssdoc $html_header_opt $targets");
- print_do("cp $dist_dir/jssdoc/index.html $dist_dir/jssdoc/index.html.bak");
- print_do("cp $dist_dir/jssdoc/overview-summary.html $dist_dir/jssdoc/index.html");
- }
diff --git a/dev-java/jss/files/jss-4.3-secitem.patch b/dev-java/jss/files/jss-4.3-secitem.patch
deleted file mode 100644
index a215bc628ea..00000000000
--- a/dev-java/jss/files/jss-4.3-secitem.patch
+++ /dev/null
@@ -1,154 +0,0 @@
---- a/security/jss/org/mozilla/jss/CryptoManager.c
-+++ b/security/jss/org/mozilla/jss/CryptoManager.c
-@@ -35,7 +35,7 @@
- * ***** END LICENSE BLOCK ***** */
- #include "_jni/org_mozilla_jss_CryptoManager.h"
-
--#include <secitem.h>
-+#include <nss/secitem.h>
- #include <secmod.h>
- #include <cert.h>
- #include <certt.h>
---- a/security/jss/org/mozilla/jss/SecretDecoderRing/KeyManager.c
-+++ b/security/jss/org/mozilla/jss/SecretDecoderRing/KeyManager.c
-@@ -36,7 +36,7 @@
-
- #include "_jni/org_mozilla_jss_SecretDecoderRing_KeyManager.h"
- #include <nspr.h>
--#include <secitem.h>
-+#include <nss/secitem.h>
- #include <jss_exceptions.h>
- #include <jssutil.h>
- #include <pk11func.h>
---- a/security/jss/org/mozilla/jss/crypto/PQGParams.c
-+++ b/security/jss/org/mozilla/jss/crypto/PQGParams.c
-@@ -39,7 +39,7 @@
- #include <nspr.h>
-
- #include <plarena.h>
--#include <secitem.h>
-+#include <nss/secitem.h>
- #include <secoidt.h>
- #include <keyt.h> /* for PQGParams */
- #include <pk11pqg.h>
---- a/security/jss/org/mozilla/jss/crypto/SecretDecoderRing.c
-+++ b/security/jss/org/mozilla/jss/crypto/SecretDecoderRing.c
-@@ -36,7 +36,7 @@
-
- #include "_jni/org_mozilla_jss_crypto_SecretDecoderRing.h"
- #include <nspr.h>
--#include <secitem.h>
-+#include <nss/secitem.h>
- #include <pk11sdr.h>
- #include <jss_exceptions.h>
- #include <jssutil.h>
---- a/security/jss/org/mozilla/jss/pkcs11/PK11Cipher.c
-+++ b/security/jss/org/mozilla/jss/pkcs11/PK11Cipher.c
-@@ -40,7 +40,7 @@
- #include <plarena.h>
- #include <seccomon.h>
- #include <pk11func.h>
--#include <secitem.h>
-+#include <nss/secitem.h>
-
- /* JSS includes */
- #include <java_ids.h>
---- a/security/jss/org/mozilla/jss/pkcs11/PK11KeyPairGenerator.c
-+++ b/security/jss/org/mozilla/jss/pkcs11/PK11KeyPairGenerator.c
-@@ -40,7 +40,7 @@
- #include <pk11pqg.h>
- #include <nspr.h>
- #include <key.h>
--#include <secitem.h>
-+#include <nss/secitem.h>
-
- #include <jssutil.h>
- #include <pk11util.h>
---- a/security/jss/org/mozilla/jss/pkcs11/PK11KeyWrapper.c
-+++ b/security/jss/org/mozilla/jss/pkcs11/PK11KeyWrapper.c
-@@ -40,7 +40,7 @@
- #include <plarena.h>
- #include <seccomon.h>
- #include <pk11func.h>
--#include <secitem.h>
-+#include <nss/secitem.h>
- #include <keyt.h>
-
- /* JSS includes */
---- a/security/jss/org/mozilla/jss/pkcs11/PK11MessageDigest.c
-+++ b/security/jss/org/mozilla/jss/pkcs11/PK11MessageDigest.c
-@@ -40,7 +40,7 @@
- #include <plarena.h>
- #include <seccomon.h>
- #include <pk11func.h>
--#include <secitem.h>
-+#include <nss/secitem.h>
-
- /* JSS includes */
- #include <java_ids.h>
---- a/security/jss/org/mozilla/jss/pkcs11/PK11PrivKey.c
-+++ b/security/jss/org/mozilla/jss/pkcs11/PK11PrivKey.c
-@@ -43,7 +43,7 @@
- #include <secerr.h>
- #include <nspr.h>
- #include <key.h>
--#include <secitem.h>
-+#include <nss/secitem.h>
-
- #include <jss_bigint.h>
- #include <jssutil.h>
---- a/security/jss/org/mozilla/jss/pkcs11/PK11Signature.c
-+++ b/security/jss/org/mozilla/jss/pkcs11/PK11Signature.c
-@@ -35,7 +35,7 @@
- * ***** END LICENSE BLOCK ***** */
-
- #include <nspr.h>
--#include <secitem.h>
-+#include <nss/secitem.h>
- #include <secoidt.h>
- #include <secmodt.h>
- #include <pk11func.h>
---- a/security/jss/org/mozilla/jss/pkcs11/PK11Token.c
-+++ b/security/jss/org/mozilla/jss/pkcs11/PK11Token.c
-@@ -53,7 +53,7 @@
- #include <jss_bigint.h>
- #include <Algorithm.h>
-
--#include <secitem.h>
-+#include <nss/secitem.h>
- #include "java_ids.h"
-
- #include "pk11util.h"
---- a/security/jss/org/mozilla/jss/ssl/callbacks.c
-+++ b/security/jss/org/mozilla/jss/ssl/callbacks.c
-@@ -39,7 +39,7 @@
- #include <nspr.h>
- #include <java_ids.h>
- #include <jss_exceptions.h>
--#include <secitem.h>
-+#include <nss/secitem.h>
- #include <jssutil.h>
- #include <certt.h>
- #include <keythi.h>
---- a/security/jss/org/mozilla/jss/util/jssutil.c
-+++ b/security/jss/org/mozilla/jss/util/jssutil.c
-@@ -38,7 +38,7 @@
- #include <nspr.h>
- #include <plstr.h>
- #include <seccomon.h>
--#include <secitem.h>
-+#include <nss/secitem.h>
- #include "jssutil.h"
- #include "jss_bigint.h"
- #include "jss_exceptions.h"
---- a/security/jss/org/mozilla/jss/util/jssutil.h
-+++ b/security/jss/org/mozilla/jss/util/jssutil.h
-@@ -39,7 +39,7 @@
- /* Need to include these first.
- * #include <nspr.h>
- * #include <jni.h>
-- * #include <secitem.h>
-+ * #include <nss/secitem.h>
- */
-
- PR_BEGIN_EXTERN_C
diff --git a/dev-java/jss/files/jss-4.3.2-ldflags.patch b/dev-java/jss/files/jss-4.3.2-ldflags.patch
deleted file mode 100644
index 11687fac4a0..00000000000
--- a/dev-java/jss/files/jss-4.3.2-ldflags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/security/coreconf/Linux.mk
-+++ b/security/coreconf/Linux.mk
-@@ -142,7 +142,7 @@
- ARCH = linux
-
- DSO_CFLAGS = -fPIC
--DSO_LDOPTS = -shared $(ARCHFLAG)
-+DSO_LDOPTS = $(LDFLAGS) -shared $(ARCHFLAG)
- # The linker on Red Hat Linux 7.2 and RHEL 2.1 (GNU ld version 2.11.90.0.8)
- # incorrectly reports undefined references in the libraries we link with, so
- # we don't use -z defs there.
diff --git a/dev-java/jss/jss-4.3.2.ebuild b/dev-java/jss/jss-4.3.2.ebuild
deleted file mode 100644
index 5c5137e8199..00000000000
--- a/dev-java/jss/jss-4.3.2.ebuild
+++ /dev/null
@@ -1,95 +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 multilib toolchain-funcs java-pkg-2
-
-DESCRIPTION="Network Security Services for Java (JSS)"
-HOMEPAGE="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/JSS"
-# 4.3.2 was released but was seemingly never announced. The binary jar
-# exists on Mozilla's servers but Chewi could only find a source tarball
-# at https://obs.kolabsys.com/package/show/Kolab:3.4/jss. However, you
-# need to register in order to download it, hence he has mirrored it.
-SRC_URI="https://dev.gentoo.org/~chewi/distfiles/${P}.tar.bz2"
-LICENSE="MPL-1.1"
-SLOT="3.4"
-KEYWORDS="amd64 x86"
-IUSE="examples test"
-
-CDEPEND=">=dev-libs/nspr-4.7.1
- >=dev-libs/nss-3.12.5"
-
-DEPEND="${CDEPEND}
- dev-lang/perl
- >=virtual/jdk-1.6
- virtual/pkgconfig
- test? ( dev-libs/nss[utils] )"
-
-RDEPEND="${CDEPEND}
- >=virtual/jre-1.6"
-
-S="${WORKDIR}/${P}/mozilla"
-
-java_prepare() {
- epatch "${FILESDIR}"/${PN}-3.4-target_source.patch
- epatch "${FILESDIR}"/${PN}-4.2.5-use_pkg-config.patch
- epatch "${FILESDIR}"/${PN}-4.3-cflags.patch
- epatch "${FILESDIR}"/${PN}-4.3.2-ldflags.patch
- epatch "${FILESDIR}"/${PN}-4.3-secitem.patch
-
- if java-pkg_is-vm-version-ge 1.8; then
- epatch "${FILESDIR}"/${PN}-4.3-javadoc.patch
- fi
-}
-
-src_compile() {
- local ARGS=(
- "CC=$(tc-getCC)"
- "AR=$(tc-getAR) cr \$@"
- "OS_RELEASE=2.6"
- "BUILD_OPT=1"
- )
-
- tc-export PKG_CONFIG
-
- export JAVA_GENTOO_OPTS="$(java-pkg_javac-args)"
- use amd64 && export USE_64=1
-
- cd "${S}/security/coreconf" || die
- emake -j1 "${ARGS[@]}"
-
- cd "${S}/security/jss" || die
- emake -j1 "${ARGS[@]}" USE_PKGCONFIG=1 NSS_PKGCONFIG=nss NSPR_PKGCONFIG=nspr
- use doc && emake -j1 "${ARGS[@]}" javadoc
-}
-
-# Chewi has managed to reach a test pass rate of 31/40 (78%) but the
-# remainder fail due to JSS not having kept pace with the ciphersuites
-# in NSS. There's not much we can do about that. The suite also leaves
-# java processes running and exits successfully on failure.
-RESTRICT="test"
-
-src_test() {
- # Parts of NSS are required for the tests.
- ln -snf "${EROOT}usr/$(get_libdir)/libnssckbi.so" dist/Linux*.OBJ/lib/ || die
- ln -snf "${EROOT}usr/bin" dist/Linux*.OBJ/ || die
-
- # The tests must be run from this directory.
- cd security/jss/org/mozilla/jss/tests || die
- BUILD_OPT=1 perl all.pl dist "${S}"/dist/Linux*.OBJ/ || die "tests failed"
-}
-
-src_install() {
- java-pkg_dojar dist/*.jar
-
- # Use this instead of the one in dist because it is a symlink
- # and doso handles symlinks by just symlinking to the original
- java-pkg_doso ./security/${PN}/lib/*/*.so
-
- use doc && java-pkg_dojavadoc dist/jssdoc
- use source && java-pkg_dosrc ./security/jss/org
- use examples && java-pkg_doexamples ./security/jss/samples
-}
diff --git a/dev-java/jss/metadata.xml b/dev-java/jss/metadata.xml
deleted file mode 100644
index e72f25cb054..00000000000
--- a/dev-java/jss/metadata.xml
+++ /dev/null
@@ -1,16 +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>
-
-<longdescription>
-
-Network Security Services for Java (JSS) is a Java interface to NSS. It supports
-most of the security standards and encryption technologies supported by NSS. JSS
-also provides a pure Java interface for ASN.1 types and BER/DER encoding.
-
-</longdescription>
-</pkgmetadata>
diff --git a/dev-java/jung/Manifest b/dev-java/jung/Manifest
deleted file mode 100644
index 03c05931aa6..00000000000
--- a/dev-java/jung/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST jung-1.7.6.zip 8164548 BLAKE2B f7ae35557e531686ca56235a6087587dd520ab1336e1121871e1f6727d64818b078dedaf55b1cbd83c32a8c5e03af7926a75302033a7e21e07200ac8f5d729b5 SHA512 126f06e34a6db6cc55df2b1c1b52612ddece7db7a1fb45cbc91892122678b0b629eac00276fc501aeab558cf1f01a4e5e7f5d0392bfae977ca1950df2c3d063a
diff --git a/dev-java/jung/jung-1.7.6-r1.ebuild b/dev-java/jung/jung-1.7.6-r1.ebuild
deleted file mode 100644
index 529a37e622f..00000000000
--- a/dev-java/jung/jung-1.7.6-r1.ebuild
+++ /dev/null
@@ -1,40 +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
-
-DESCRIPTION="The Java Universal Network/Graph Framework"
-HOMEPAGE="http://jung.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.zip"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86"
-IUSE=""
-
-CDEPEND="
- dev-java/colt:0
- dev-java/commons-collections:0"
-
-RDEPEND="
- ${CDEPEND}
- >=virtual/jre-1.6"
-
-DEPEND="
- ${CDEPEND}
- app-arch/unzip
- >=virtual/jdk-1.6"
-
-JAVA_SRC_DIR="src/edu"
-
-JAVA_GENTOO_CLASSPATH="
- colt
- commons-collections
-"
-
-java_prepare() {
- java-pkg_clean
-}
diff --git a/dev-java/jung/metadata.xml b/dev-java/jung/metadata.xml
deleted file mode 100644
index e0688a63f6b..00000000000
--- a/dev-java/jung/metadata.xml
+++ /dev/null
@@ -1,16 +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>
- <longdescription lang="en">
- A software library that provides a common and extendible language for
- the modeling, analysis, and visualization of data that can be
- represented as a graph or network.
- </longdescription>
- <upstream>
- <remote-id type="sourceforge">jung</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/dev-java/junit-clptr/junit-clptr-1.2.2.ebuild b/dev-java/junit-clptr/junit-clptr-1.2.2.ebuild
index 9a946560a51..e3c61f82a35 100644
--- a/dev-java/junit-clptr/junit-clptr-1.2.2.ebuild
+++ b/dev-java/junit-clptr/junit-clptr-1.2.2.ebuild
@@ -11,7 +11,7 @@ MAVEN_ID="org.bitstrings.test:junit-clptr:1.2.2"
inherit java-pkg-2 java-pkg-simple
-DESCRIPTION="ClassLoader per Test runner for JUnit 4.12+ based on myfaces-test \"TestPerClassLoaderRunner\"."
+DESCRIPTION="ClassLoader per Test runner for JUnit 4.12+ based on myfaces-test \"TestPerClassLoaderRunner\""
HOMEPAGE="http://nexus.sonatype.org/oss-repository-hosting.html/junit-clptr"
SRC_URI="https://github.com/bitstrings/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}-sources.tar.gz"
LICENSE="Apache-2.0"
diff --git a/dev-java/junitparams/junitparams-1.1.1.ebuild b/dev-java/junitparams/junitparams-1.1.1.ebuild
index 0ee9b7f9b46..0f82eeb6b29 100644
--- a/dev-java/junitparams/junitparams-1.1.1.ebuild
+++ b/dev-java/junitparams/junitparams-1.1.1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/Pragmatists/JUnitParams/archive/refs/tags/JUnitParam
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
# Common dependencies
# POM: pom.xml
diff --git a/dev-java/jython/jython-2.7.0-r2.ebuild b/dev-java/jython/jython-2.7.0-r2.ebuild
deleted file mode 100644
index f4ecf159358..00000000000
--- a/dev-java/jython/jython-2.7.0-r2.ebuild
+++ /dev/null
@@ -1,151 +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"
-
-inherit eutils 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 ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="examples test"
-
-CP_DEPEND="dev-java/antlr:3
- dev-java/netty-transport:0
- >=dev-java/asm-5:4
- dev-java/commons-compress:0
- dev-java/guava:20
- dev-java/jffi:1.2
- dev-java/jline:2
- dev-java/icu4j:52
- 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/script-api:0
- java-virtuals/servlet-api:3.0"
-RDEPEND="${CP_DEPEND}
- >=virtual/jre-1.7"
-DEPEND="${CP_DEPEND}
- >=virtual/jdk-1.7
- app-arch/unzip
- dev-java/ant-core:0
- test? (
- dev-java/junit:4
- dev-java/ant-junit:0
- )"
-
-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...
- local PYTHON_SITEDIR=${EPREFIX}/usr/share/jython-${SLOT}/Lib/site-packages
- 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_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-r4.ebuild b/dev-java/jython/jython-2.7.0-r4.ebuild
index 424604dcc20..c24d236dc54 100644
--- a/dev-java/jython/jython-2.7.0-r4.ebuild
+++ b/dev-java/jython/jython-2.7.0-r4.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# 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
@@ -16,7 +17,7 @@ SRC_URI="https://search.maven.org/remotecontent?filepath=org/python/${PN}/${MY_P
LICENSE="PSF-2"
SLOT="2.7"
-KEYWORDS="~amd64 arm64 ~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/jzlib/jzlib-1.1.3-r2.ebuild b/dev-java/jzlib/jzlib-1.1.3-r2.ebuild
index 615a5512fc0..89a304b848f 100644
--- a/dev-java/jzlib/jzlib-1.1.3-r2.ebuild
+++ b/dev-java/jzlib/jzlib-1.1.3-r2.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
JAVA_PKG_IUSE="examples source test"
+MAVEN_ID="com.jcraft:jzlib:1.1.3"
inherit java-pkg-2 java-pkg-simple
@@ -13,7 +14,7 @@ SRC_URI="https://github.com/ymnk/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
>=virtual/jre-1.8:*"
diff --git a/dev-java/libg/libg-2.1.0-r2.ebuild b/dev-java/libg/libg-2.1.0-r2.ebuild
index 2093ba30d73..b5305fd26da 100644
--- a/dev-java/libg/libg-2.1.0-r2.ebuild
+++ b/dev-java/libg/libg-2.1.0-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="https://github.com/bndtools/bnd/archive/${PV}.REL.tar.gz -> bndlib-${PV
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
# Tests depend on biz.aQute.junit, which depends on biz.aQute.bndlib, which on
# its own turn again depends on aQute.libg again; we can temporarily assume that
diff --git a/dev-java/libreadline-java/Manifest b/dev-java/libreadline-java/Manifest
deleted file mode 100644
index 681ab055aa4..00000000000
--- a/dev-java/libreadline-java/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST libreadline-java-0.8.0.tar.gz 77122 BLAKE2B cd25c3aea6189d0d48a10c26ad2f359e7f22533fd4a22d22b8491fd19c2d12c0fda6c8f1b8908bd66be8094efb374a51c6877eb89835360c4a2be8d9107d1336 SHA512 16bbb01a4852244387d63d8d5a7203e2862f235d8a68b436f33b586c7a6ea5297d1fabfa910c54bc33cfdc43b5dfe80e9eb4828b80196a974410c90387c3d1f2
diff --git a/dev-java/libreadline-java/files/libreadline-java-0.8.0-gmake.patch b/dev-java/libreadline-java/files/libreadline-java-0.8.0-gmake.patch
deleted file mode 100644
index 34a01e48ae5..00000000000
--- a/dev-java/libreadline-java/files/libreadline-java-0.8.0-gmake.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/src/native/Makefile
-+++ b/src/native/Makefile
-@@ -69,13 +69,13 @@ all: $(T_LIBS)
- lib: $(ROOTDIR)/$(LIB_PRE)$(TG).$(LIB_EXT)
-
- JavaReadline:
-- make TG=$@ lib
-+ $(MAKE) TG=$@ lib
-
- JavaEditline:
-- make TG=$@ lib
-+ $(MAKE) TG=$@ lib
-
- JavaGetline:
-- make TG=$@ lib
-+ $(MAKE) TG=$@ lib
-
- $(ROOTDIR)/$(LIB_PRE)$(TG).$(LIB_EXT): $(OBJECTS)
- ifeq (MSC,$(WIN32))
diff --git a/dev-java/libreadline-java/files/libreadline-java-0.8.0-respect-flags.patch b/dev-java/libreadline-java/files/libreadline-java-0.8.0-respect-flags.patch
deleted file mode 100644
index 9af21ba83d4..00000000000
--- a/dev-java/libreadline-java/files/libreadline-java-0.8.0-respect-flags.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff --git a/src/native/Makefile b/src/native/Makefile
-index 679adb7..a1f2a6a 100644
---- a/src/native/Makefile
-+++ b/src/native/Makefile
-@@ -51,11 +51,11 @@ JavaEditline_LIBS = -ledit -ltermcap
- ifeq (cygwin,$(WIN32))
- JavaGetline_LIBS = -lcygwin
- endif
--CC = gcc
-+CC ?= gcc
- OBJ_EXT := o
- LIB_PRE := lib
- LIB_EXT := so
--CFLAGS=-fPIC -DPOSIX
-+CFLAGS += -fPIC -DPOSIX
- endif
-
-
-@@ -97,7 +97,7 @@ ifeq (CYGWIN,$(WIN32))
- $(CC) -W1,$(ROOTDIR)/lib$(TG).exp -o $@ \
- $(OBJECTS) -W1,-e,_readline_init@12
- else
-- $(CC) -shared $(OBJECTS) $(LIBPATH) $($(TG)_LIBS) -o $@
-+ $(CC) -shared $(LDFLAGS) $(OBJECTS) $(LIBPATH) $($(TG)_LIBS) -o $@
- endif
- endif
-
diff --git a/dev-java/libreadline-java/files/termcap-to-ncurses.patch b/dev-java/libreadline-java/files/termcap-to-ncurses.patch
deleted file mode 100644
index 256cf6573da..00000000000
--- a/dev-java/libreadline-java/files/termcap-to-ncurses.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/src/native/Makefile.org 2004-09-07 16:43:16.703100016 +0200
-+++ b/src/native/Makefile 2004-09-07 16:43:28.804919625 +0200
-@@ -45,8 +45,8 @@
- CFLAGS=-DWIN32=$(WIN32) -D__IBMC__
- else
- INCLUDES = -I $(JAVAINCLUDE) -I $(JAVANATINC)
--LIBPATH = -L/usr/lib/termcap
--JavaReadline_LIBS = -lreadline -ltermcap -lhistory
-+LIBPATH =
-+JavaReadline_LIBS = -lreadline -lncurses -lhistory
- JavaEditline_LIBS = -ledit -ltermcap
- ifeq (cygwin,$(WIN32))
- JavaGetline_LIBS = -lcygwin
diff --git a/dev-java/libreadline-java/libreadline-java-0.8.0-r5.ebuild b/dev-java/libreadline-java/libreadline-java-0.8.0-r5.ebuild
deleted file mode 100644
index 32411ad2c86..00000000000
--- a/dev-java/libreadline-java/libreadline-java-0.8.0-r5.ebuild
+++ /dev/null
@@ -1,66 +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 eutils
-
-DESCRIPTION="A JNI-wrapper to GNU Readline"
-HOMEPAGE="http://java-readline.sourceforge.net/"
-SRC_URI="mirror://sourceforge/java-readline/${P}-src.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
-IUSE="elibc_FreeBSD"
-
-CDEPEND="sys-libs/ncurses:0="
-
-RDEPEND="
- >=virtual/jre-1.8:*
- ${CDEPEND}"
-
-DEPEND="
- virtual/jdk:1.8
- ${CDEPEND}"
-
-RESTRICT="test"
-
-# 1: See bug #157387 reported upstream.
-# 2: Respect CC CFLAGS LDFLAGS, see bugs #336302 #296741.
-PATCHES=(
- "${FILESDIR}/termcap-to-ncurses.patch"
- "${FILESDIR}/${P}-gmake.patch"
- "${FILESDIR}/${P}-respect-flags.patch"
-)
-
-DOCS=( ChangeLog NEWS README README.1st TODO )
-
-src_prepare() {
- default
-
- # See bug #157390.
- sed -i "s/^\(JC_FLAGS =\)/\1 $(java-pkg_javac-args)/" Makefile || die
- if use elibc_FreeBSD; then
- sed -i -e '/JAVANATINC/s:linux:freebsd:' Makefile || die "sed JAVANATINC failed"
- fi
-
-}
-
-src_compile() {
- emake -j1
- if use doc; then
- # src/org/gnu/readline/Readline.java is completely bogus and generate a
- # truckload of errors. Let's call make without catching anything. :(
- make -j1 apidoc
- fi
-}
-
-src_install() {
- java-pkg_doso *.so
- java-pkg_dojar *.jar
- use source && java-pkg_dosrc src/*
- use doc && java-pkg_dojavadoc api
-}
diff --git a/dev-java/libreadline-java/metadata.xml b/dev-java/libreadline-java/metadata.xml
deleted file mode 100644
index 7b73f81973f..00000000000
--- a/dev-java/libreadline-java/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="sourceforge">java-readline</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/dev-java/log4j-api-java9/Manifest b/dev-java/log4j-api-java9/Manifest
new file mode 100644
index 00000000000..50c36844ec0
--- /dev/null
+++ b/dev-java/log4j-api-java9/Manifest
@@ -0,0 +1 @@
+DIST apache-log4j-2.15.0-src.tar.gz 11550453 BLAKE2B 3b7a356714fbff0ad81f633750a45f6b3869df933c89c22b28346e49c6dfb83002ecf6374d04b1ae6a45b5486314654c8a660f3aee7a6b30273439e44db2c610 SHA512 61574722ab0a24bd0301fea57504a645f98f0e5913d1e02e49d25b3dcbf2dcbb3153cfca58fdde632087f94edc8e83820951288ba494234954ab4eeeb6b8be6a
diff --git a/dev-java/log4j-api-java9/log4j-api-java9-2.15.0.ebuild b/dev-java/log4j-api-java9/log4j-api-java9-2.15.0.ebuild
new file mode 100644
index 00000000000..fc6b19c9ff5
--- /dev/null
+++ b/dev-java/log4j-api-java9/log4j-api-java9-2.15.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom log4j-api-java9/pom.xml --download-uri mirror://apache/logging/log4j/2.15.0/apache-log4j-2.15.0-src.tar.gz --slot 2 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild log4j-api-java9-2.15.0.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.apache.logging.log4j:log4j-api-java9:2.15.0"
+JAVA_TESTING_FRAMEWORKS="junit-jupiter"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="The Apache Log4j API (Java 9)"
+HOMEPAGE="https://logging.apache.org/log4j/2.x/"
+SRC_URI="mirror://apache/logging/log4j/${PV}/apache-log4j-${PV}-src.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+# junit-jupiter is not available in ::gentoo
+RESTRICT="test"
+
+# Compile dependencies
+# POM: ${PN}/pom.xml
+# test? org.apache.maven:maven-core:3.6.3 -> !!!groupId-not-found!!!
+# test? org.junit.jupiter:junit-jupiter-engine:5.7.2 -> !!!groupId-not-found!!!
+
+DEPEND=">=virtual/jdk-11:*"
+# test? (
+# !!!groupId-not-found!!!
+# )
+#"
+
+RDEPEND=">=virtual/jre-11:*"
+
+DOCS=( {CONTRIBUTING,README,RELEASE-NOTES,SECURITY}.md LICENSE.txt )
+
+S="${WORKDIR}/apache-log4j-${PV}-src"
+
+JAVA_SRC_DIR="${PN}/src/main/java"
+JAVA_RESOURCE_DIRS="${PN}/src/assembly"
+
+# JAVA_TEST_GENTOO_CLASSPATH="!!!groupId-not-found!!!,!!!groupId-not-found!!!"
+# JAVA_TEST_SRC_DIR="${PN}/src/test/java"
+
+src_install() {
+ default # https://bugs.gentoo.org/789582
+ java-pkg-simple_src_install
+}
diff --git a/dev-java/milton-api/metadata.xml b/dev-java/log4j-api-java9/metadata.xml
index 4221e170cbc..75321cfb559 100644
--- a/dev-java/milton-api/metadata.xml
+++ b/dev-java/log4j-api-java9/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/log4j-api/Manifest b/dev-java/log4j-api/Manifest
new file mode 100644
index 00000000000..50c36844ec0
--- /dev/null
+++ b/dev-java/log4j-api/Manifest
@@ -0,0 +1 @@
+DIST apache-log4j-2.15.0-src.tar.gz 11550453 BLAKE2B 3b7a356714fbff0ad81f633750a45f6b3869df933c89c22b28346e49c6dfb83002ecf6374d04b1ae6a45b5486314654c8a660f3aee7a6b30273439e44db2c610 SHA512 61574722ab0a24bd0301fea57504a645f98f0e5913d1e02e49d25b3dcbf2dcbb3153cfca58fdde632087f94edc8e83820951288ba494234954ab4eeeb6b8be6a
diff --git a/dev-java/log4j-api/log4j-api-2.15.0.ebuild b/dev-java/log4j-api/log4j-api-2.15.0.ebuild
new file mode 100644
index 00000000000..10e57a693ca
--- /dev/null
+++ b/dev-java/log4j-api/log4j-api-2.15.0.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2021 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.15.0/apache-log4j-2.15.0-src.tar.gz --slot 2 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild log4j-api-2.15.0.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.apache.logging.log4j:log4j-api:2.15.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.apache.logging.log4j:log4j-api-java9:2.15.0 -> >=dev-java/log4j-api-java9-2.15.0:2
+# org.osgi:org.osgi.core:4.3.1 -> !!!artifactId-not-found!!!
+# POM: ${PN}/pom.xml
+# test? com.fasterxml.jackson.core:jackson-core:2.12.4 -> !!!groupId-not-found!!!
+# test? com.fasterxml.jackson.core:jackson-databind:2.12.4 -> !!!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:5.6.12 -> !!!groupId-not-found!!!
+# test? org.apache.maven:maven-core:3.6.3 -> !!!groupId-not-found!!!
+# test? org.assertj:assertj-core:3.20.2 -> !!!suitable-mavenVersion-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.7.2 -> !!!groupId-not-found!!!
+# test? org.junit.jupiter:junit-jupiter-migrationsupport:5.7.2 -> !!!groupId-not-found!!!
+# test? org.junit.jupiter:junit-jupiter-params:5.7.2 -> !!!groupId-not-found!!!
+# test? org.junit.vintage:junit-vintage-engine:5.7.2 -> !!!groupId-not-found!!!
+
+DEPEND=">=virtual/jdk-11:*
+ dev-java/osgi-core-api:0
+ dev-java/log4j-api-java9:2"
+# test? (
+# !!!groupId-not-found!!!
+# !!!suitable-mavenVersion-not-found!!!
+# >=dev-java/commons-lang-3.12.0:3.6
+# )
+#"
+
+RDEPEND=">=virtual/jre-11:*"
+
+DOCS=( {CONTRIBUTING,README,RELEASE-NOTES,SECURITY}.md LICENSE.txt )
+
+S="${WORKDIR}/apache-log4j-${PV}-src"
+
+JAVA_CLASSPATH_EXTRA="log4j-api-java9-2,osgi-core-api"
+JAVA_SRC_DIR="${PN}/src/main/java"
+JAVA_RESOURCE_DIRS="${PN}/src/main/resources"
+
+# JAVA_TEST_GENTOO_CLASSPATH="!!!groupId-not-found!!!,!!!groupId-not-found!!!,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!!!"
+# JAVA_TEST_SRC_DIR="${PN}/src/test/java"
+# JAVA_TEST_RESOURCE_DIRS=(
+# "${PN}/src/test/resources"
+# )
+
+src_prepare() {
+ default
+ mkdir -p log4j-api/src/main/resources/META-INF/versions/9 || die
+ pushd log4j-api/src/main/resources/META-INF/versions/9 || die
+ jar -xf "$(java-pkg_getjar --build-only log4j-api-java9-2 log4j-api-java9.jar)" \
+ org/apache/logging/log4j/util module-info.class || die
+ rm org/apache/logging/log4j/util/{PrivateSecurityManagerStackTraceUtil,PropertySource}.class || die
+ popd || die
+}
+
+src_install() {
+ default # https://bugs.gentoo.org/789582
+ java-pkg-simple_src_install
+}
diff --git a/dev-java/milton-mail-api/metadata.xml b/dev-java/log4j-api/metadata.xml
index 4221e170cbc..75321cfb559 100644
--- a/dev-java/milton-mail-api/metadata.xml
+++ b/dev-java/log4j-api/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/mchange-commons/Manifest b/dev-java/mchange-commons/Manifest
index 1821120392c..919f9bf6793 100644
--- a/dev-java/mchange-commons/Manifest
+++ b/dev-java/mchange-commons/Manifest
@@ -1 +1,2 @@
+DIST mchange-commons-0.2.10.tar.gz 218657 BLAKE2B f073aac7a560c31ea71c4114c5128de55d4b384c9579f649e0ca28c1257be64d22bce406b241f3b7665c5ec0e4cdc64c079c0f27f328e54803612abae43aef42 SHA512 098712b3b61d74a832699b6c92c75fdb243260400c1180511b5299a25553660750261ff8c2cf322350afd3d4b84fdf9900c26123b56add0f772e26e4f3ed8d7b
DIST mchange-commons-java-0.2.10.zip 773768 BLAKE2B abfcc70e109431afcc514e80a2dc3585a90de07f8cb800d0a9807b72ad10f0488ad0a8b7a641c3de7a91029e3d6b25590985df85e592d90d0af42728389d7e28 SHA512 8196cd4476c3dea55355ba11cc2f801602235de3a977d75eff3835dacaf612647adc0e595e0bf77a6313adcd718d143d08ecf6fd5aa0e6638a419cf1f107c3a9
diff --git a/dev-java/mchange-commons/mchange-commons-0.2.10-r1.ebuild b/dev-java/mchange-commons/mchange-commons-0.2.10-r1.ebuild
new file mode 100644
index 00000000000..bbae432a366
--- /dev/null
+++ b/dev-java/mchange-commons/mchange-commons-0.2.10-r1.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"
+inherit java-pkg-2 java-pkg-simple
+
+MY_PN="${PN}-java"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="a library of arguably useful Java utilities"
+HOMEPAGE="https://github.com/swaldman/mchange-commons-java"
+SRC_URI="https://github.com/swaldman/${MY_PN}/archive/refs/tags/${MY_P}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="CDDL"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+IUSE="doc source"
+
+CDEPEND="
+ dev-java/log4j:0
+ dev-java/slf4j-api:0
+ dev-java/typesafe-config:0"
+
+RDEPEND="
+ ${CDEPEND}
+ >=virtual/jre-1.8:*"
+
+DEPEND="
+ ${CDEPEND}
+ app-arch/zip
+ >=virtual/jdk-1.8:*"
+
+S="${WORKDIR}/${MY_PN}-${MY_P}"
+
+JAVA_SRC_DIR="src/main"
+
+JAVA_GENTOO_CLASSPATH="
+ log4j
+ slf4j-api
+ typesafe-config"
diff --git a/dev-java/mill-bin/Manifest b/dev-java/mill-bin/Manifest
index 5caafecca8b..14f2223992a 100644
--- a/dev-java/mill-bin/Manifest
+++ b/dev-java/mill-bin/Manifest
@@ -1,2 +1,3 @@
DIST 0.9.10-assembly 63268137 BLAKE2B a87553608f9269e529227b4bb13bfca32cf82f3feb7b947dd849d66e86721f390d1862df897184306d84251b635ecd089e1e817244ee6e241a7ebab6c60fe1fc SHA512 dd551aac47b99d7a33f7900f80ac16eba60d1a93f68c87329f3faee8d219102424e19de899b78619568e55f09f2b081948bd21356179d608847c722157a55208
-DIST 0.9.9-assembly 63255731 BLAKE2B ae4112a087b5aa6205a87fbef690820b4fde0d72962bb65d479bcdb666cf839df180935674947d53e81711377f0a8bd81bda5cdd8341027c9a2bd3bbc1869a3f SHA512 b7589c36a0607602150378c94c5cb6aba56a70ebe73517c081fbd603ad948bbff5302c17d0cecaac32741452598643089350348474988c0ff973e4bf620a7b3c
+DIST 0.9.11-assembly 63268510 BLAKE2B 2594800c42d23d3a91ec5b676e968200bb0a5f8e26a4163f05e6badd1377b593fa3b091f63bfca2b7cf3263fefa9d9bace5882b9a1061631f71ba647b65edeeb SHA512 3d6e67e1a301761209a83f3a12fbd692f5589af919ef4e30fe9017ef49a3ba5ff66a00ee372c184ab1d35932f014513c7fd4c7221463ecbc878efea0323c2920
+DIST mill-bin-0.10.0 65538437 BLAKE2B 1c3583e34a0bea381b6368acf00936adaace5cf3a959e710cde3ab08509b7de237d46ee0fb9266a34e0f746d6c9c052337a6d8dddb4d3ba990710c131f0ea11d SHA512 fd8a8c79672275de9bc4ab74791484dd1c91b5382990d993794b1bde59b24a2e331422a1210010a9acb6c4a29bf168ba0564f7767413acb4d6867e9ea14d2c33
diff --git a/dev-java/mill-bin/mill-bin-0.10.0.ebuild b/dev-java/mill-bin/mill-bin-0.10.0.ebuild
new file mode 100644
index 00000000000..e8485c57dfd
--- /dev/null
+++ b/dev-java/mill-bin/mill-bin-0.10.0.ebuild
@@ -0,0 +1,26 @@
+# 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.9.10.ebuild b/dev-java/mill-bin/mill-bin-0.9.10.ebuild
index abd33534fe9..bface58632d 100644
--- a/dev-java/mill-bin/mill-bin-0.9.10.ebuild
+++ b/dev-java/mill-bin/mill-bin-0.9.10.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
@@ -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"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
LICENSE="MIT"
SLOT="0"
diff --git a/dev-java/mill-bin/mill-bin-0.9.9.ebuild b/dev-java/mill-bin/mill-bin-0.9.11.ebuild
index abd33534fe9..abd33534fe9 100644
--- a/dev-java/mill-bin/mill-bin-0.9.9.ebuild
+++ b/dev-java/mill-bin/mill-bin-0.9.11.ebuild
diff --git a/dev-java/milton-api/Manifest b/dev-java/milton-api/Manifest
deleted file mode 100644
index 5c8cee48d25..00000000000
--- a/dev-java/milton-api/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST milton-api-2.7.1.3-sources.jar 240367 BLAKE2B 9c6ff4484336b5dc2d8f4506398d4e522cbad102473f6a2fb59fad8b98c6154a4b09c18378adceaa698a9db0bc495dd1b83fcc93c5afcd153876e52a4df99e5f SHA512 9d73e830a4c62b872fe756679158a961d6160016cc6db6915dd17f65f9ca6008cf7f451aae71beb735b24c7b0872b8b672f53f4a0ecb1279d9572e1908fd5f08
diff --git a/dev-java/milton-api/milton-api-2.7.1.3.ebuild b/dev-java/milton-api/milton-api-2.7.1.3.ebuild
deleted file mode 100644
index 72136a1b758..00000000000
--- a/dev-java/milton-api/milton-api-2.7.1.3.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-JAVA_PKG_IUSE="source doc"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Milton WebDav library"
-HOMEPAGE="http://milton.io"
-SRC_URI="http://milton.io/maven/io/milton/${PN}/${PV}/${P}-sources.jar"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE=""
-
-CDEPEND="
- dev-java/commons-codec:0
- dev-java/commons-io:1
- dev-java/slf4j-api:0
-"
-
-RDEPEND="
- ${CDEPEND}
- >=virtual/jre-1.6"
-
-DEPEND="
- ${CDEPEND}
- >=virtual/jdk-1.6"
-
-JAVA_GENTOO_CLASSPATH="commons-codec,commons-io-1,slf4j-api"
diff --git a/dev-java/milton-mail-api/Manifest b/dev-java/milton-mail-api/Manifest
deleted file mode 100644
index 9624656a4c9..00000000000
--- a/dev-java/milton-mail-api/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST milton-mail-api-2.7.1.3-sources.jar 34106 BLAKE2B 3307f0bbc700c529d1988648d1aab306dbefe6b5c6ca78d9706b0342b6f122836d05de99971d67c2c99bfdd07014f85307b8a87d97ef85337dbc8096fc4a289a SHA512 c0b7f7d62b54f996f42c44e8b28eeaee8a76e8990be5a9894a0f3b2daead699e78442c5cf96a272f71a54536c87247f366f10f3aa2c3adb9d4870253ec8c3b67
diff --git a/dev-java/milton-mail-api/milton-mail-api-2.7.1.3.ebuild b/dev-java/milton-mail-api/milton-mail-api-2.7.1.3.ebuild
deleted file mode 100644
index 13bf1e501a5..00000000000
--- a/dev-java/milton-mail-api/milton-mail-api-2.7.1.3.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-JAVA_PKG_IUSE="source doc"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Milton WebDav library"
-HOMEPAGE="http://milton.io"
-SRC_URI="http://milton.io/maven/io/milton/${PN}/${PV}/${P}-sources.jar"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE=""
-
-CDEPEND="
- dev-java/slf4j-api:0
- dev-java/milton-api:0
- dev-java/oracle-javamail:0
-"
-
-RDEPEND="
- ${CDEPEND}
- >=virtual/jre-1.6"
-
-DEPEND="
- ${CDEPEND}
- >=virtual/jdk-1.6"
-
-JAVA_GENTOO_CLASSPATH="
- slf4j-api
- milton-api
- oracle-javamail
-"
diff --git a/dev-java/mina-core/Manifest b/dev-java/mina-core/Manifest
deleted file mode 100644
index 54a0506ee35..00000000000
--- a/dev-java/mina-core/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST mina-core-1.1.7.jar 272148 BLAKE2B 08017722d3e85f233725c0f3495372d4c189a18bea346ff56ab2911dd35fa65df3697101a577424c8702b4fe52dee2701a13bdb2a90f187ff9df0f038fdfa02e SHA512 44f2f94aa356ce1b4ac0379ecec7b76b15210e54314c911bd8ba6d48910415363c9a34dc50e29b8e04ad08a371398ad9e2a00065a44b71c25caa3ef14a72b832
-DIST mina-core-2.0.7.tar.bz2 1953751 BLAKE2B 973e7d67f2328a8bc9fec31f693280b7f640fc3856912e7186b9c7f1d4b506303c4857304f26138a07b0cc10b6e6ff7516be504388980e4042f0ac450ddb5fbd SHA512 406f5fe9c389dc0a2ebe602207e1c914fee308368d5a1e15815ae4c160a986a30a453a1bfb4e010452de87aa28a6817c02f0b5a669ad272fdf603084e994e57e
diff --git a/dev-java/mina-core/metadata.xml b/dev-java/mina-core/metadata.xml
deleted file mode 100644
index 6ef2d50cf07..00000000000
--- a/dev-java/mina-core/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/mina-core/mina-core-1.1.7-r1.ebuild b/dev-java/mina-core/mina-core-1.1.7-r1.ebuild
deleted file mode 100644
index bb2d5a60560..00000000000
--- a/dev-java/mina-core/mina-core-1.1.7-r1.ebuild
+++ /dev/null
@@ -1,29 +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="Apache MINA Project"
-HOMEPAGE="https://mina.apache.org/"
-SRC_URI="mirror://gentoo/${P}.jar"
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
-
-CDEPEND="dev-java/slf4j-api:0"
-
-RDEPEND="
- ${CDEPEND}
- >=virtual/jre-1.6"
-
-DEPEND="
- ${CDEPEND}
- >=virtual/jdk-1.6"
-
-S="${WORKDIR}"
-
-JAVA_GENTOO_CLASSPATH="slf4j-api"
diff --git a/dev-java/mina-core/mina-core-2.0.7-r1.ebuild b/dev-java/mina-core/mina-core-2.0.7-r1.ebuild
deleted file mode 100644
index 443f413218f..00000000000
--- a/dev-java/mina-core/mina-core-2.0.7-r1.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"
-
-inherit java-pkg-2 java-pkg-simple
-
-MY_P="apache-mina-${PV}"
-
-DESCRIPTION="Apache MINA Project"
-HOMEPAGE="https://mina.apache.org/"
-SRC_URI="mirror://apache/mina/mina/${PV}/${MY_P}-src.tar.bz2 -> ${P}.tar.bz2"
-KEYWORDS="amd64 ppc64 x86"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-CDEPEND="dev-java/slf4j-api:0"
-
-RDEPEND="
- ${CDEPEND}
- >=virtual/jre-1.6"
-
-DEPEND="
- ${CDEPEND}
- >=virtual/jdk-1.6"
-
-S="${WORKDIR}/${MY_P}"
-
-JAVA_GENTOO_CLASSPATH="slf4j-api"
-
-JAVA_SRC_DIR="my_src"
-
-src_prepare() {
- default
- mkdir my_src || die
- mv src/mina-core/src/main/java/org my_src || die
-}
diff --git a/dev-java/mockito/mockito-1.9.5-r2.ebuild b/dev-java/mockito/mockito-1.9.5-r2.ebuild
index f4eeafd60d1..8d5f634f685 100644
--- a/dev-java/mockito/mockito-1.9.5-r2.ebuild
+++ b/dev-java/mockito/mockito-1.9.5-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://${PN}.googlecode.com/files/${P}.zip"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
CDEPEND="
dev-java/ant-core:0
diff --git a/dev-java/mojarra/Manifest b/dev-java/mojarra/Manifest
deleted file mode 100644
index 01c094e85fe..00000000000
--- a/dev-java/mojarra/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST javax.faces-2.2.12-sources.jar 3105808 BLAKE2B 347daf8b44171a94e7ebf09c8ad22b1b20255355f589def6c537c49e37275605caf80f219be21dd8561597c94c15e6fe2cc0c0c713297ceaf8d6be669b6a6e78 SHA512 b2bc2ce38d72af38a4b2fdb5aec790600ca41a5d7f6340bf6be671a901c9fe664d50d9d13f021694e85e0e145a2031e2d8b61dd6d6ccebb544f2512a91ff670a
diff --git a/dev-java/mojarra/files/mojarra-2.2.12-Util.java.patch b/dev-java/mojarra/files/mojarra-2.2.12-Util.java.patch
deleted file mode 100644
index 23033f65296..00000000000
--- a/dev-java/mojarra/files/mojarra-2.2.12-Util.java.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- src/com/sun/faces/util/Util.java.orig 2015-09-03 14:43:30.953486000 +0000
-+++ src/com/sun/faces/util/Util.java 2015-09-03 14:43:57.692486000 +0000
-@@ -354,13 +354,15 @@
- // as the same adapter in a standalone program works as one might expect.
- // So, for now, if the classname starts with '[', then use Class.forName()
- // to avoid CR 643419 and for all other cases, use ClassLoader.loadClass().
-- if (loader.getClass() == com.sun.faces.scripting.groovy.GroovyHelperImpl.MojarraGroovyClassLoader.class) {
-- if (name.charAt(0) == '[') {
-- return Class.forName(name, true, loader);
-- } else {
-- return loader.loadClass(name);
-- }
-- }
-+ //
-+ // Disable Groovy support.
-+ // if (loader.getClass() == com.sun.faces.scripting.groovy.GroovyHelperImpl.MojarraGroovyClassLoader.class) {
-+ // if (name.charAt(0) == '[') {
-+ // return Class.forName(name, true, loader);
-+ // } else {
-+ // return loader.loadClass(name);
-+ // }
-+ // }
- return Class.forName(name, true, loader);
- }
-
diff --git a/dev-java/mojarra/metadata.xml b/dev-java/mojarra/metadata.xml
deleted file mode 100644
index 6ef2d50cf07..00000000000
--- a/dev-java/mojarra/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/mojarra/mojarra-2.2.12-r1.ebuild b/dev-java/mojarra/mojarra-2.2.12-r1.ebuild
deleted file mode 100644
index 735e0e7b91b..00000000000
--- a/dev-java/mojarra/mojarra-2.2.12-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Project Mojarra - GlassFish's Implementation for JavaServer Faces API"
-HOMEPAGE="https://javaserverfaces.dev.java.net/"
-SRC_URI="https://maven.java.net/content/repositories/releases/org/glassfish/javax.faces/${PV}/javax.faces-${PV}-sources.jar"
-
-LICENSE="CDDL"
-SLOT="2.2"
-KEYWORDS="amd64 x86"
-
-IUSE=""
-
-CDEPEND="dev-java/glassfish-persistence:0
- dev-java/glassfish-ejb-api:0
- java-virtuals/servlet-api:3.0
- dev-java/tomcat-jstl-spec:0
- dev-java/tomcat-jstl-impl:0
- dev-java/validation-api:1.0
- dev-java/javax-inject:0
- dev-java/cdi-api:1.2"
-
-RDEPEND=">=virtual/jre-1.6
- ${CDEPEND}"
-DEPEND=">=virtual/jdk-1.6
- app-arch/unzip
- ${CDEPEND}"
-
-JAVA_SRC_DIR="src"
-
-JAVA_GENTOO_CLASSPATH="
- glassfish-persistence
- glassfish-ejb-api
- tomcat-jstl-spec
- tomcat-jstl-impl
- validation-api-1.0
- cdi-api-1.2
- servlet-api-3.0
- javax-inject
-"
-
-java_prepare() {
- mkdir src || die
- mv * src
-
- # We *MUST* bump Groovy to 2.4 at some point
- # to make this stuff work correctly.
- rm -v src/com/sun/faces/scripting/groovy/GroovyHelperImpl.java || die
- epatch "${FILESDIR}"/${P}-Util.java.patch
-}
diff --git a/dev-java/moshi/Manifest b/dev-java/moshi/Manifest
deleted file mode 100644
index 0b4777a4f8e..00000000000
--- a/dev-java/moshi/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST moshi-parent-1.1.0.tar.gz 85572 BLAKE2B 22a2192c47142591f1a3bc56525bd715247b94c61c0e97f2db942ddca1cdba914ef5eab61d19632f4eccd02425f29ad27f288e030e0f6af238095c75a6e20a9f SHA512 58557f20a84f4b59f0b603b6e6dbe803285f5c066451dac72e9926ca57131b62fddd222b995dc233e1c7120fc7787fa5b2c6ddab33d0b8e69b8ea1147ca06549
diff --git a/dev-java/moshi/metadata.xml b/dev-java/moshi/metadata.xml
deleted file mode 100644
index d69bf7b2e09..00000000000
--- a/dev-java/moshi/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">square/moshi</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/dev-java/moshi/moshi-1.1.0.ebuild b/dev-java/moshi/moshi-1.1.0.ebuild
deleted file mode 100644
index 5348dfbdb2f..00000000000
--- a/dev-java/moshi/moshi-1.1.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit java-pkg-2 java-pkg-simple
-
-MY_P="${PN}-parent-${PV}"
-
-DESCRIPTION="A modern JSON library for Android and Java"
-HOMEPAGE="https://github.com/square/moshi"
-SRC_URI="https://github.com/square/${PN}/archive/${MY_P}.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-CDEPEND="
- dev-java/assertj-core:2
- dev-java/junit:4
- dev-java/okio:0
-"
-
-DEPEND=">=virtual/jdk-1.7
- ${CDEPEND}"
-
-RDEPEND=">=virtual/jre-1.7
- ${CDEPEND}"
-
-JAVA_GENTOO_CLASSPATH="assertj-core-2,junit-4,okio"
-
-JAVA_SRC_PATH="${WORKDIR}/${MY_P}/${PN}/src"
-
-src_prepare() {
- # Some don't compile, not putting effort into it now
- rm -rf "${WORKDIR}/${PN}-${MY_P}/${PN}"/src/test
-}
diff --git a/dev-java/mvel/Manifest b/dev-java/mvel/Manifest
new file mode 100644
index 00000000000..4af3792b6c2
--- /dev/null
+++ b/dev-java/mvel/Manifest
@@ -0,0 +1 @@
+DIST mvel2-2.3.2.Final.tar.gz 2405839 BLAKE2B 5f12652a0f4375f6e24f18313d99a02bb86463cc1acc2f8845b815c9c7afcda410d67c9f1c30544f9ab1cd50a48ce0ab72e9cca94faafab776f3704b1d5fa087 SHA512 9d1c92bfe90aa4cfe5f4bbdd7eef2060bfaec3979c5c07a5baf3ddb4d84a00632dcaec266bab675b31d5b745bfa36a89dd5969ababeb64332069939a4df23dbc
diff --git a/dev-java/mvel/files/mvel-2.3.2-ignore-failing-tests.patch b/dev-java/mvel/files/mvel-2.3.2-ignore-failing-tests.patch
new file mode 100644
index 00000000000..1cfd9e8abc3
--- /dev/null
+++ b/dev-java/mvel/files/mvel-2.3.2-ignore-failing-tests.patch
@@ -0,0 +1,43 @@
+From fcf12bd0322556b4396a72a5402124d9543781d9 Mon Sep 17 00:00:00 2001
+From: Yuan Liao <liaoyuan@gmail.com>
+Date: Sun, 16 Jan 2022 09:48:48 -0800
+Subject: [PATCH] Ignore tests that fail even when run by Maven on JUnit 4.13.2
+
+To reproduce the failure, make sure to edit line 249 of pom.xml to use
+JUnit 4.13.2. Note that the failed tests are JUnit 3 tests, which
+cannot be ignored with the @org.junit.Ignore annotation.
+
+When no tests are ignored, only testMapAccessWithNestedMethodCall() will
+fail. However, ignoring that test will cause
+testMapAccessWithNestedProperty() to fail afterwards.
+
+Signed-off-by: Yuan Liao <liaoyuan@gmail.com>
+---
+ src/test/java/org/mvel2/tests/core/CoreConfidenceTests.java | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/test/java/org/mvel2/tests/core/CoreConfidenceTests.java b/src/test/java/org/mvel2/tests/core/CoreConfidenceTests.java
+index ea7661bb..1c92c327 100644
+--- a/src/test/java/org/mvel2/tests/core/CoreConfidenceTests.java
++++ b/src/test/java/org/mvel2/tests/core/CoreConfidenceTests.java
+@@ -3431,7 +3431,7 @@ public class CoreConfidenceTests extends AbstractTest {
+ assertTrue(result);
+ }
+
+- public void testMapAccessWithNestedMethodCall() {
++ public void noTestMapAccessWithNestedMethodCall() {
+ String str = "map[aMethod(1)] == \"one\"";
+
+ ParserConfiguration pconf = new ParserConfiguration();
+@@ -3446,7 +3446,7 @@ public class CoreConfidenceTests extends AbstractTest {
+ assertTrue(result);
+ }
+
+- public void testMapAccessWithNestedProperty() {
++ public void noTestMapAccessWithNestedProperty() {
+ String str = "map[key] == \"one\"";
+
+ ParserConfiguration pconf = new ParserConfiguration();
+--
+2.34.1
+
diff --git a/dev-java/mvel/files/mvel-2.3.2-update-supported-java-versions.patch b/dev-java/mvel/files/mvel-2.3.2-update-supported-java-versions.patch
new file mode 100644
index 00000000000..d019002cda1
--- /dev/null
+++ b/dev-java/mvel/files/mvel-2.3.2-update-supported-java-versions.patch
@@ -0,0 +1,51 @@
+From 04f476bbc3768d9052ae9c8a1b0aa53340a993b3 Mon Sep 17 00:00:00 2001
+From: Yuan Liao <liaoyuan@gmail.com>
+Date: Sun, 16 Jan 2022 08:01:46 -0800
+Subject: [PATCH] ASMAccessorOptimizer: Update supported Java versions as of
+ 2.4.14
+
+Squashed patch of the following commits:
+
+From: deaddowney <spamcontrol@mac.com>
+Date: Fri, 22 Jun 2018 09:38:24 -0400
+Subject: [PATCH 1/4] Mvel not working with Java 10 (11) GH Issue #159
+
+From: dieter sauvillers <dieter.sauvillers@corilus.be>
+Date: Tue, 2 Apr 2019 10:20:31 +0200
+Subject: [PATCH 2/4] mvel does not work with java 12 #185
+
+From: mmelko <mmelko@redhat.com>
+Date: Fri, 26 Jun 2020 08:55:24 +0200
+Subject: [PATCH 3/4] Fix building on java 14
+
+From: mariofusco <mario.fusco@gmail.com>
+Date: Mon, 24 Aug 2020 08:54:22 +0200
+Subject: [PATCH 4/4] drop compatibility with java versions lower than 1.4
+
+Signed-off-by: Yuan Liao <liaoyuan@gmail.com>
+---
+ .../mvel2/optimizers/impl/asm/ASMAccessorOptimizer.java | 7 +------
+ 1 file changed, 1 insertion(+), 6 deletions(-)
+
+diff --git a/src/main/java/org/mvel2/optimizers/impl/asm/ASMAccessorOptimizer.java b/src/main/java/org/mvel2/optimizers/impl/asm/ASMAccessorOptimizer.java
+index 45520538..4c4c876e 100644
+--- a/src/main/java/org/mvel2/optimizers/impl/asm/ASMAccessorOptimizer.java
++++ b/src/main/java/org/mvel2/optimizers/impl/asm/ASMAccessorOptimizer.java
+@@ -118,13 +118,8 @@ public class ASMAccessorOptimizer extends AbstractOptimizer implements AccessorO
+ OPCODES_VERSION = Opcodes.V1_4;
+ } else if (javaVersion.startsWith("1.5")) {
+ OPCODES_VERSION = Opcodes.V1_5;
+- } else if (javaVersion.startsWith("1.6")
+- || javaVersion.startsWith("1.7")
+- || javaVersion.startsWith("1.8")
+- || javaVersion.startsWith("9")) {
+- OPCODES_VERSION = Opcodes.V1_6;
+ } else {
+- OPCODES_VERSION = Opcodes.V1_2;
++ OPCODES_VERSION = Opcodes.V1_6;
+ }
+
+ String defaultNameSapce = getProperty("mvel2.namespace");
+--
+2.34.1
+
diff --git a/dev-java/mvel/files/mvel-2.3.2-update-version-in-output.patch b/dev-java/mvel/files/mvel-2.3.2-update-version-in-output.patch
new file mode 100644
index 00000000000..8b7250540b0
--- /dev/null
+++ b/dev-java/mvel/files/mvel-2.3.2-update-version-in-output.patch
@@ -0,0 +1,26 @@
+From 0a316a5cb0d889220fb3e730ea1471c1b4052736 Mon Sep 17 00:00:00 2001
+From: Yuan Liao <liaoyuan@gmail.com>
+Date: Sun, 16 Jan 2022 10:21:47 -0800
+Subject: [PATCH] Update program version shown in program output
+
+Signed-off-by: Yuan Liao <liaoyuan@gmail.com>
+---
+ src/main/java/org/mvel2/MVEL.java | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/main/java/org/mvel2/MVEL.java b/src/main/java/org/mvel2/MVEL.java
+index eafe17fc..6bbf5f06 100644
+--- a/src/main/java/org/mvel2/MVEL.java
++++ b/src/main/java/org/mvel2/MVEL.java
+@@ -45,7 +45,7 @@ import static org.mvel2.util.ParseTools.optimizeTree;
+ public class MVEL {
+ public static final String NAME = "MVEL (MVFLEX Expression Language)";
+ public static final String VERSION = "2.3";
+- public static final String VERSION_SUB = "0";
++ public static final String VERSION_SUB = "2";
+ public static final String CODENAME = "liberty";
+ static boolean DEBUG_FILE = getBoolean("mvel2.debug.fileoutput");
+ static String ADVANCED_DEBUGGING_FILE = System.getProperty("mvel2.debugging.file") == null ? "mvel_debug.txt" : System.getProperty("mvel2.debugging.file");
+--
+2.34.1
+
diff --git a/dev-java/jibx/metadata.xml b/dev-java/mvel/metadata.xml
index 69bf0a60204..8c54e97e66c 100644
--- a/dev-java/jibx/metadata.xml
+++ b/dev-java/mvel/metadata.xml
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>java@gentoo.org</email>
<name>Java</name>
</maintainer>
<upstream>
- <remote-id type="sourceforge">jibx</remote-id>
+ <remote-id type="github">mvel/mvel</remote-id>
</upstream>
</pkgmetadata>
diff --git a/dev-java/mvel/mvel-2.3.2-r1.ebuild b/dev-java/mvel/mvel-2.3.2-r1.ebuild
new file mode 100644
index 00000000000..0b93cdde5b4
--- /dev/null
+++ b/dev-java/mvel/mvel-2.3.2-r1.ebuild
@@ -0,0 +1,81 @@
+# Copyright 2021-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.mvel:mvel2:2.3.2.Final"
+
+# Note: This package has a mixture of JUnit 3 and JUnit 4 tests, all of which
+# can be run with JUnit 4. As of January 2022, JUnit 3 test launcher will only
+# run 2 tests out of nearly 1100 JUnit 3 tests in total, whereas JUnit 4 test
+# launcher can run all of them
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="MVFLEX Expression Language"
+HOMEPAGE="https://github.com/mvel/mvel"
+SRC_URI="https://github.com/mvel/mvel/archive/refs/tags/mvel2-${PV}.Final.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="2.3"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+DEPEND="
+ >=virtual/jdk-1.8:*
+"
+
+RDEPEND="
+ >=virtual/jre-1.8:*
+"
+
+S="${WORKDIR}/${PN}-${PN}2-${PV}.Final"
+
+JAVA_SRC_DIR="src/main/java"
+# Required due to use of '_' as identifiers in source files
+JAVADOC_ARGS="-source 8"
+# https://github.com/mvel/mvel/blob/mvel2-2.3.2.Final/pom.xml#L131
+JAVA_MAIN_CLASS="org.mvel2.sh.Main"
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_SRC_DIR="src/test/java"
+JAVA_TEST_RESOURCE_DIRS=( "src/test/resources" )
+JAVA_TEST_EXCLUDES=(
+ # No runnable methods
+ org.mvel2.tests.perftests.CompiledPerformanceTests
+ org.mvel2.tests.perftests.SimpleTests
+ org.mvel2.tests.core.MVELThreadTest
+ org.mvel2.tests.core.res.TestClass
+ org.mvel2.tests.core.res.TestInterface
+ org.mvel2.tests.core.res.TestMVEL197
+ org.mvel2.tests.templates.tests.res.TestPluginNode
+)
+# Significantly speed up test execution
+# https://github.com/mvel/mvel/blob/mvel2-2.3.2.Final/pom.xml#L158-L171
+JAVA_TEST_EXTRA_ARGS=(
+ -Dfile.encoding=UTF-8
+ -Dmvel.disable.jit=true
+ -Dmvel.tests.quick=true
+)
+
+pkg_setup() {
+ java-pkg-2_pkg_setup
+ # Fix org.mvel2.tests.core.PropertyAccessTests.testMVEL308 failure
+ # on Java 17, caused by java.lang.reflect.InaccessibleObjectException:
+ # module java.base does not "opens java.util" to unnamed module
+ # https://github.com/mvel/mvel/issues/282
+ ver_test "$(java-config -g PROVIDES_VERSION)" -ge 17 && \
+ JAVA_TEST_EXTRA_ARGS+=( --add-opens=java.base/java.util=ALL-UNNAMED )
+}
+
+src_prepare() {
+ # Clean up bundled JARs "manually" to prevent
+ # removal of JARs under JAVA_TEST_RESOURCE_DIRS
+ rm -r lib/ || die "Failed to remove bundled JARs"
+
+ eapply "${FILESDIR}/${P}-update-supported-java-versions.patch"
+ eapply "${FILESDIR}/${P}-update-version-in-output.patch"
+ use test && eapply "${FILESDIR}/${P}-ignore-failing-tests.patch"
+ java-pkg-2_src_prepare
+}
diff --git a/dev-java/netty-buffer/Manifest b/dev-java/netty-buffer/Manifest
index 32835590c2a..be03553487f 100644
--- a/dev-java/netty-buffer/Manifest
+++ b/dev-java/netty-buffer/Manifest
@@ -1,2 +1 @@
-DIST netty-4.0.21.Final.tar.gz 960489 BLAKE2B ef279fcc2d56baaee62841ad973702c585d5450a45e513ca6beafa295943878b88ed81b8a167091e77aa9f26bccbdcea4138230850dca57321f1241c4ff56d0b SHA512 5d432e9e433c22b82e67ed3463c6982ca95c2ad823165e1ca9a5046e598878f06aac4221be235f2bda15edfdb22028f2a4f74fb37d431f24a2636e4ec60fae74
DIST netty-4.0.36.Final.tar.gz 1267617 BLAKE2B 351b1f73b1a3c60fd843767254ae57e74d74cdfe570828b1a2e7aea55a203866ae4e232bad285c3937d8f2dc7689534ffb180fcd345c8cf10bced7048ec58ec3 SHA512 b222205963366d5a0f5539c7029dc47edea8d532fca05d169dfe12dbedf956959ba422a22254b09622db428b517da0fd0e58198d11e66193abdb6050481ccbe6
diff --git a/dev-java/netty-buffer/files/netty-buffer-4.0.21-build.xml b/dev-java/netty-buffer/files/netty-buffer-4.0.21-build.xml
deleted file mode 100644
index 376c30458ec..00000000000
--- a/dev-java/netty-buffer/files/netty-buffer-4.0.21-build.xml
+++ /dev/null
@@ -1,229 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- ====================================================================== -->
-<!-- Ant build file (http://ant.apache.org/) for Ant 1.6.2 or above. -->
-<!-- ====================================================================== -->
-
-<!-- ====================================================================== -->
-<!-- ===================== - DO NOT EDIT THIS FILE! - ===================== -->
-<!-- ====================================================================== -->
-<!-- -->
-<!-- Any modifications will be overwritten. -->
-<!-- -->
-<!-- Generated by Maven Ant Plugin on 5/15/14 7:12 PM -->
-<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/ -->
-<!-- -->
-<!-- ====================================================================== -->
-
-<project name="netty-buffer-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="netty-buffer-4.0.21.Final"/>
- <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>
- <path id="build.test.classpath">
- </path>
-
- <!-- ====================================================================== -->
- <!-- Cleaning up target -->
- <!-- ====================================================================== -->
-
- <target name="clean" description="Clean the output directory">
- <delete dir="${maven.build.dir}"/>
- </target>
-
- <!-- ====================================================================== -->
- <!-- Compilation target -->
- <!-- ====================================================================== -->
-
- <target name="compile" description="Compile the code">
- <mkdir dir="${maven.build.outputDir}"/>
- <javac destdir="${maven.build.outputDir}"
- nowarn="true"
- debug="true"
- optimize="true"
- deprecation="true"
- target="1.6"
- verbose="false"
- fork="true"
- memoryInitialSize="1024m"
- source="1.6">
- <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="true"
- debug="true"
- optimize="true"
- deprecation="true"
- target="1.6"
- verbose="false"
- fork="true"
- memoryInitialSize="1024m"
- source="1.6">
- <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="**/*Benchmark*.java"/>
- <exclude name="**/Abstract*"/>
- <exclude name="**/TestUtil*"/>
- </fileset>
- </batchtest>
- <batchtest todir="${maven.test.reports}" if="test">
- <fileset dir="${maven.build.testDir.0}">
- <include name="**/${test}.java"/>
- <exclude name="**/Abstract*"/>
- <exclude name="**/TestUtil*"/>
- </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="false"
- use="true"
- author="false"
- splitindex="false"
- nodeprecated="false"
- nodeprecatedlist="false"
- notree="false"
- noindex="false"
- nohelp="false"
- nonavbar="false"
- serialwarn="false"
- charset="ISO-8859-1"
- linksource="false"
- breakiterator="true"/>
- </target>
-
- <!-- ====================================================================== -->
- <!-- Package target -->
- <!-- ====================================================================== -->
-
- <target name="package" depends="compile,test" description="Package the application">
- <jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar"
- compress="true"
- index="false"
- basedir="${maven.build.outputDir}"
- excludes="**/package.html"/>
- </target>
-
- <!-- ====================================================================== -->
- <!-- A dummy target for the package named after the type it creates -->
- <!-- ====================================================================== -->
-
- <target name="jar" depends="package" description="Builds the jar for the application"/>
-
- <!-- ====================================================================== -->
- <!-- Download dependencies target -->
- <!-- ====================================================================== -->
-
- <target name="test-offline">
- <condition property="maven.mode.offline">
- <equals arg1="${maven.settings.offline}" arg2="true"/>
- </condition>
- </target>
-</project>
diff --git a/dev-java/netty-buffer/netty-buffer-4.0.21.ebuild b/dev-java/netty-buffer/netty-buffer-4.0.21.ebuild
deleted file mode 100644
index 48cbb2f8942..00000000000
--- a/dev-java/netty-buffer/netty-buffer-4.0.21.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc source test"