summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'dev-java')
-rw-r--r--dev-java/ant-apache-bsf/ant-apache-bsf-1.10.9-r1.ebuild (renamed from dev-java/ant-apache-bsf/ant-apache-bsf-1.10.9.ebuild)4
-rw-r--r--dev-java/ant-core/ant-core-1.10.14.ebuild26
-rw-r--r--dev-java/ant-core/metadata.xml5
-rw-r--r--dev-java/ant-swing/ant-swing-1.10.9.ebuild4
-rw-r--r--dev-java/ant-testutil/ant-testutil-1.10.9.ebuild4
-rw-r--r--dev-java/ant/Manifest2
-rw-r--r--dev-java/ant/ant-1.10.14-r2.ebuild396
-rw-r--r--dev-java/ant/files/1.10.9-launch.patch361
-rw-r--r--dev-java/ant/files/ant-1.10.14-AntTest.patch28
-rw-r--r--dev-java/ant/files/ant-1.10.14-AntlibTest.patch40
-rw-r--r--dev-java/ant/files/ant-1.10.14-JavaTest.patch102
-rw-r--r--dev-java/ant/files/ant-1.10.14-LinkTest.patch87
-rw-r--r--dev-java/ant/files/ant-1.10.14-PathTest.patch30
-rw-r--r--dev-java/ant/metadata.xml7
-rw-r--r--dev-java/antunit/Manifest2
-rw-r--r--dev-java/antunit/antunit-1.4.1-r1.ebuild54
-rw-r--r--dev-java/antunit/files/antunit-1.4.1-gentoo.patch62
-rw-r--r--dev-java/antunit/metadata.xml10
-rw-r--r--dev-java/apache-rat-core/Manifest1
-rw-r--r--dev-java/apache-rat-core/apache-rat-core-0.13.ebuild69
-rw-r--r--dev-java/apache-rat-core/files/apache-rat-core-0.13-commons-lang3.patch39
-rw-r--r--dev-java/apache-rat-core/metadata.xml8
-rw-r--r--dev-java/apache-rat-tasks/Manifest1
-rw-r--r--dev-java/apache-rat-tasks/apache-rat-tasks-0.13.ebuild71
-rw-r--r--dev-java/apache-rat-tasks/files/apache-rat-tasks-0.13-fix-tests.patch41
-rw-r--r--dev-java/apache-rat-tasks/metadata.xml8
-rw-r--r--dev-java/apache-rat/apache-rat-0.15-r1.ebuild109
-rw-r--r--dev-java/aspectj/aspectj-1.9.7-r1.ebuild (renamed from dev-java/aspectj/aspectj-1.9.7.ebuild)10
-rw-r--r--dev-java/aspectj/metadata.xml4
-rw-r--r--dev-java/auto-service-annotations/Manifest1
-rw-r--r--dev-java/auto-service-annotations/auto-service-annotations-1.1.1.ebuild24
-rw-r--r--dev-java/auto-service-annotations/metadata.xml10
-rw-r--r--dev-java/batik/Manifest2
-rw-r--r--dev-java/batik/batik-1.17-r1.ebuild (renamed from dev-java/batik/batik-1.16-r2.ebuild)4
-rw-r--r--dev-java/batik/batik-1.17.ebuild247
-rw-r--r--dev-java/bcmail/Manifest2
-rw-r--r--dev-java/bcmail/bcmail-1.77-r1.ebuild (renamed from dev-java/bcmail/bcmail-1.76.ebuild)15
-rw-r--r--dev-java/bcpg/Manifest2
-rw-r--r--dev-java/bcpg/bcpg-1.77.ebuild (renamed from dev-java/bcpg/bcpg-1.76.ebuild)12
-rw-r--r--dev-java/bcpkix/Manifest4
-rw-r--r--dev-java/bcpkix/bcpkix-1.77.ebuild (renamed from dev-java/bcpkix/bcpkix-1.76.ebuild)18
-rw-r--r--dev-java/bcprov/Manifest4
-rw-r--r--dev-java/bcprov/bcprov-1.77.ebuild (renamed from dev-java/bcprov/bcprov-1.76.ebuild)18
-rw-r--r--dev-java/bcutil/Manifest2
-rw-r--r--dev-java/bcutil/bcutil-1.77.ebuild (renamed from dev-java/bcutil/bcutil-1.76.ebuild)15
-rw-r--r--dev-java/bnd-annotation/Manifest (renamed from dev-java/aqute-bnd-annotation/Manifest)1
-rw-r--r--dev-java/bnd-annotation/bnd-annotation-6.3.1.ebuild (renamed from dev-java/aqute-bnd-annotation/aqute-bnd-annotation-6.3.1.ebuild)2
-rw-r--r--dev-java/bnd-annotation/bnd-annotation-7.0.0.ebuild29
-rw-r--r--dev-java/bnd-annotation/metadata.xml10
-rw-r--r--dev-java/bnd-junit/Manifest1
-rw-r--r--dev-java/bnd-junit/bnd-junit-2.1.0-r2.ebuild48
-rw-r--r--dev-java/bnd-junit/metadata.xml11
-rw-r--r--dev-java/bnd-util/Manifest1
-rw-r--r--dev-java/bnd-util/bnd-util-7.0.0.ebuild43
-rw-r--r--dev-java/bnd-util/metadata.xml10
-rw-r--r--dev-java/bndlib/Manifest2
-rw-r--r--dev-java/bndlib/bndlib-2.1.0-r1.ebuild72
-rw-r--r--dev-java/bndlib/bndlib-7.0.0.ebuild55
-rw-r--r--dev-java/bndlib/metadata.xml13
-rw-r--r--dev-java/bsf/Manifest1
-rw-r--r--dev-java/bsf/bsf-2.4.0-r3.ebuild109
-rw-r--r--dev-java/bsf/bsf-2.4.0-r5.ebuild77
-rw-r--r--dev-java/bsf/files/bsf-2.4.0-PyJavaInstance.patch35
-rw-r--r--dev-java/bsf/files/bsf-2.4.0-build-properties.xml44
-rw-r--r--dev-java/bsf/metadata.xml4
-rw-r--r--dev-java/caffeine/Manifest1
-rw-r--r--dev-java/caffeine/caffeine-2.6.2.ebuild33
-rw-r--r--dev-java/caffeine/metadata.xml10
-rw-r--r--dev-java/checker-framework-qual/Manifest2
-rw-r--r--dev-java/checker-framework-qual/checker-framework-qual-3.42.0.ebuild (renamed from dev-java/checker-framework-qual/checker-framework-qual-3.14.0.ebuild)14
-rw-r--r--dev-java/checker-framework-qual/metadata.xml3
-rw-r--r--dev-java/commons-collections/Manifest3
-rw-r--r--dev-java/commons-collections/commons-collections-3.2.2-r1.ebuild70
-rw-r--r--dev-java/commons-collections/commons-collections-3.2.2-r2.ebuild51
-rw-r--r--dev-java/commons-collections/commons-collections-4.4-r1.ebuild68
-rw-r--r--dev-java/commons-collections/commons-collections-4.4-r2.ebuild59
-rw-r--r--dev-java/commons-collections/metadata.xml6
-rw-r--r--dev-java/commons-compress/Manifest2
-rw-r--r--dev-java/commons-compress/commons-compress-1.25.0.ebuild41
-rw-r--r--dev-java/commons-compress/metadata.xml11
-rw-r--r--dev-java/commons-daemon/Manifest2
-rw-r--r--dev-java/commons-daemon/commons-daemon-1.3.3.ebuild56
-rw-r--r--dev-java/commons-daemon/commons-daemon-1.3.4.ebuild2
-rw-r--r--dev-java/commons-httpclient/Manifest1
-rw-r--r--dev-java/commons-httpclient/commons-httpclient-3.1-r3.ebuild54
-rw-r--r--dev-java/commons-imaging/Manifest2
-rw-r--r--dev-java/commons-imaging/commons-imaging-0.97.ebuild45
-rw-r--r--dev-java/commons-imaging/commons-imaging-1.0_alpha3-r2.ebuild36
-rw-r--r--dev-java/commons-imaging/commons-imaging-1.0_alpha3.ebuild37
-rw-r--r--dev-java/commons-imaging/files/commons-imaging-1.0_alpha3-PngChunk.javadoc.patch12
-rw-r--r--dev-java/concurrentlinkedhashmap-lru/Manifest1
-rw-r--r--dev-java/concurrentlinkedhashmap-lru/concurrentlinkedhashmap-lru-1.4.2.ebuild36
-rw-r--r--dev-java/concurrentlinkedhashmap-lru/metadata.xml10
-rw-r--r--dev-java/coursier-bin/Manifest1
-rw-r--r--dev-java/coursier-bin/coursier-bin-2.1.8.ebuild30
-rw-r--r--dev-java/cpptasks/cpptasks-1.0_beta5-r2.ebuild64
-rw-r--r--dev-java/eclipse-ecj/Manifest3
-rw-r--r--dev-java/eclipse-ecj/eclipse-ecj-4.15-r1.ebuild65
-rw-r--r--dev-java/eclipse-ecj/eclipse-ecj-4.26-r2.ebuild (renamed from dev-java/eclipse-ecj/eclipse-ecj-4.27-r2.ebuild)28
-rw-r--r--dev-java/eclipse-ecj/eclipse-ecj-4.30-r1.ebuild (renamed from dev-java/eclipse-ecj/eclipse-ecj-4.29-r1.ebuild)20
-rw-r--r--dev-java/eclipse-ecj/files/ecj-4.157
-rw-r--r--dev-java/eclipse-ecj/files/ecj-4.26 (renamed from dev-java/eclipse-ecj/files/ecj-4.29)10
-rw-r--r--dev-java/eclipse-ecj/files/ecj-4.30 (renamed from dev-java/eclipse-ecj/files/ecj-4.27)6
-rw-r--r--dev-java/eclipse-jdt-annotation/Manifest1
-rw-r--r--dev-java/eclipse-jdt-annotation/eclipse-jdt-annotation-4.30.ebuild24
-rw-r--r--dev-java/eclipse-jdt-annotation/metadata.xml10
-rw-r--r--dev-java/emma/emma-2.0.5312-r4.ebuild52
-rw-r--r--dev-java/emma/emma-2.0.5312-r5.ebuild84
-rw-r--r--dev-java/emma/emma-2.0.5312-r6.ebuild82
-rw-r--r--dev-java/error-prone-annotations/Manifest2
-rw-r--r--dev-java/error-prone-annotations/error-prone-annotations-2.24.0.ebuild (renamed from dev-java/error-prone-annotations/error-prone-annotations-2.16.ebuild)8
-rw-r--r--dev-java/failureaccess/Manifest2
-rw-r--r--dev-java/failureaccess/failureaccess-32.1.3.ebuild (renamed from dev-java/failureaccess/failureaccess-32.1.2.ebuild)2
-rw-r--r--dev-java/felix-gogo-runtime/Manifest2
-rw-r--r--dev-java/felix-gogo-runtime/felix-gogo-runtime-1.1.6.ebuild55
-rw-r--r--dev-java/felix-gogo-runtime/files/felix-gogo-runtime-1.1.6-skip-tests-non-java-8.patch22
-rw-r--r--dev-java/felix-gogo-runtime/metadata.xml12
-rw-r--r--dev-java/fop/Manifest2
-rw-r--r--dev-java/fop/files/fop-2.8-skip-failing-tests.patch48
-rw-r--r--dev-java/fop/fop-2.8-r1.ebuild188
-rw-r--r--dev-java/fop/fop-2.9.ebuild19
-rw-r--r--dev-java/gin/metadata.xml4
-rw-r--r--dev-java/glassfish-persistence/Manifest1
-rw-r--r--dev-java/glassfish-persistence/files/glassfish-persistence-1.0-python2.7-sax-parser.patch11
-rw-r--r--dev-java/glassfish-persistence/glassfish-persistence-1.0-r2.ebuild39
-rw-r--r--dev-java/glassfish-persistence/metadata.xml7
-rw-r--r--dev-java/gradle-bin/Manifest12
-rw-r--r--dev-java/gradle-bin/gradle-bin-6.8.3.ebuild61
-rw-r--r--dev-java/gradle-bin/gradle-bin-7.1.1.ebuild61
-rw-r--r--dev-java/gradle-bin/gradle-bin-7.2.ebuild61
-rw-r--r--dev-java/gradle-bin/gradle-bin-7.3.3.ebuild61
-rw-r--r--dev-java/gradle-bin/gradle-bin-7.4.2.ebuild61
-rw-r--r--dev-java/gradle-bin/gradle-bin-7.6.1.ebuild61
-rw-r--r--dev-java/gradle-bin/gradle-bin-8.0.2.ebuild61
-rw-r--r--dev-java/gradle-bin/gradle-bin-8.1.1.ebuild61
-rw-r--r--dev-java/gradle-bin/gradle-bin-8.2.1.ebuild61
-rw-r--r--dev-java/gradle-bin/gradle-bin-8.3.ebuild61
-rw-r--r--dev-java/gradle-bin/gradle-bin-8.4.ebuild4
-rw-r--r--dev-java/gradle-bin/gradle-bin-8.5.ebuild (renamed from dev-java/gradle-bin/gradle-bin-7.5.1.ebuild)4
-rw-r--r--dev-java/gson/Manifest3
-rw-r--r--dev-java/gson/files/gson-2.10.2-GsonVersionDiagnosticsTest.patch13
-rw-r--r--dev-java/gson/gson-2.10.2_pre20231128.ebuild (renamed from dev-java/gson/gson-2.10.1.ebuild)52
-rw-r--r--dev-java/guava-testlib/Manifest4
-rw-r--r--dev-java/guava-testlib/guava-testlib-33.0.0.ebuild (renamed from dev-java/guava-testlib/guava-testlib-32.1.2.ebuild)14
-rw-r--r--dev-java/guava-testlib/metadata.xml3
-rw-r--r--dev-java/guava/Manifest2
-rw-r--r--dev-java/guava/guava-33.0.0.ebuild (renamed from dev-java/guava/guava-32.1.2-r1.ebuild)22
-rw-r--r--dev-java/guice/metadata.xml1
-rw-r--r--dev-java/gwt/metadata.xml4
-rw-r--r--dev-java/htmlcleaner/Manifest1
-rw-r--r--dev-java/htmlcleaner/files/htmlcleaner-2.24-fix-tests.patch26
-rw-r--r--dev-java/htmlcleaner/htmlcleaner-2.26.ebuild55
-rw-r--r--dev-java/htmlcleaner/htmlcleaner-2.29.ebuild2
-rw-r--r--dev-java/icedtea-bin/metadata.xml4
-rw-r--r--dev-java/icedtea-web/icedtea-web-1.8.8-r1.ebuild6
-rw-r--r--dev-java/icedtea/icedtea-3.21.0.ebuild6
-rw-r--r--dev-java/icedtea/metadata.xml4
-rw-r--r--dev-java/icu4j/Manifest2
-rw-r--r--dev-java/icu4j/icu4j-73.2.ebuild240
-rw-r--r--dev-java/icu4j/icu4j-74.2.ebuild193
-rw-r--r--dev-java/jakarta-mail/files/jakarta-mail-2.0.1-LogManagerPropertiesTest.patch11
-rw-r--r--dev-java/jakarta-mail/jakarta-mail-2.0.1.ebuild42
-rw-r--r--dev-java/jakartaee-migration/Manifest1
-rw-r--r--dev-java/jakartaee-migration/jakartaee-migration-1.0.7-r1.ebuild6
-rw-r--r--dev-java/jakartaee-migration/jakartaee-migration-1.0.7-r2.ebuild94
-rw-r--r--dev-java/jakartaee-migration/jakartaee-migration-1.0.8.ebuild72
-rw-r--r--dev-java/jakartaee-migration/metadata.xml11
-rw-r--r--dev-java/java-config/java-config-2.3.3-r1.ebuild2
-rw-r--r--dev-java/java-diff-utils/java-diff-utils-4.12.ebuild2
-rw-r--r--dev-java/javacc/javacc-5.0-r5.ebuild73
-rw-r--r--dev-java/javax-mail/Manifest3
-rw-r--r--dev-java/javax-mail/javax-mail-1.6.7-r2.ebuild (renamed from dev-java/javax-mail/javax-mail-1.6.7-r1.ebuild)36
-rw-r--r--dev-java/jctools-core/Manifest2
-rw-r--r--dev-java/jctools-core/files/jctools-core-4.0.3-increase-TEST_TIMEOUT.patch13
-rw-r--r--dev-java/jctools-core/jctools-core-4.0.2.ebuild4
-rw-r--r--dev-java/jctools-core/jctools-core-4.0.3.ebuild (renamed from dev-java/jctools-core/jctools-core-4.0.1.ebuild)34
-rw-r--r--dev-java/jdbc-postgresql/Manifest2
-rw-r--r--dev-java/jdbc-postgresql/jdbc-postgresql-42.6.0.ebuild52
-rw-r--r--dev-java/jdbc-postgresql/jdbc-postgresql-42.7.1.ebuild58
-rw-r--r--dev-java/jdepend/jdepend-2.10-r1.ebuild25
-rw-r--r--dev-java/jdepend/jdepend-2.10.ebuild28
-rw-r--r--dev-java/jdepend/metadata.xml11
-rw-r--r--dev-java/jmh-core/Manifest2
-rw-r--r--dev-java/jmh-core/jmh-core-1.37.ebuild (renamed from dev-java/jmh-core/jmh-core-1.35.ebuild)28
-rw-r--r--dev-java/jmh-generator-annprocess/Manifest1
-rw-r--r--dev-java/jmh-generator-annprocess/jmh-generator-annprocess-1.37.ebuild28
-rw-r--r--dev-java/jmh-generator-annprocess/metadata.xml (renamed from dev-java/osgi-compendium/metadata.xml)3
-rw-r--r--dev-java/jna/Manifest1
-rw-r--r--dev-java/jna/jna-5.14.0-r1.ebuild198
-rw-r--r--dev-java/jsch-agent-proxy/jsch-agent-proxy-0.0.9.ebuild24
-rw-r--r--dev-java/json-smart/json-smart-2.5.0.ebuild4
-rw-r--r--dev-java/json/Manifest3
-rw-r--r--dev-java/json/json-20220320.ebuild57
-rw-r--r--dev-java/json/json-20231013-r1.ebuild4
-rw-r--r--dev-java/json/json-20240205.ebuild61
-rw-r--r--dev-java/jtidy/jtidy-938.ebuild2
-rw-r--r--dev-java/jtwig-core/Manifest1
-rw-r--r--dev-java/jtwig-core/jtwig-core-5.87.0.ebuild64
-rw-r--r--dev-java/jtwig-core/metadata.xml10
-rw-r--r--dev-java/jtwig-reflection/Manifest1
-rw-r--r--dev-java/jtwig-reflection/jtwig-reflection-5.87.0.ebuild67
-rw-r--r--dev-java/jtwig-reflection/metadata.xml10
-rw-r--r--dev-java/leiningen-bin/Manifest4
-rw-r--r--dev-java/leiningen-bin/leiningen-bin-2.11.1.ebuild62
-rw-r--r--dev-java/leiningen-bin/leiningen-bin-2.11.2.ebuild62
-rw-r--r--dev-java/libg/Manifest2
-rw-r--r--dev-java/libg/libg-2.1.0-r2.ebuild48
-rw-r--r--dev-java/libg/libg-7.0.0.ebuild51
-rw-r--r--dev-java/libg/metadata.xml13
-rw-r--r--dev-java/lz4-java/files/lz4-java-1.8.0-gentoo-classpath.xml7
-rw-r--r--dev-java/lz4-java/files/lz4-java-1.8.0-print-os-props.patch31
-rw-r--r--dev-java/lz4-java/files/lz4-java-1.8.0-r1-Makefile47
-rw-r--r--dev-java/lz4-java/files/lz4-java-1.8.0-skip-ivy.patch91
-rw-r--r--dev-java/lz4-java/lz4-java-1.8.0-r1.ebuild101
-rw-r--r--dev-java/lz4-java/lz4-java-1.8.0-r4.ebuild10
-rw-r--r--dev-java/maven-bin/Manifest2
-rw-r--r--dev-java/maven-bin/maven-bin-3.9.6.ebuild (renamed from dev-java/maven-bin/maven-bin-3.9.5-r1.ebuild)2
-rw-r--r--dev-java/mill-bin/Manifest1
-rw-r--r--dev-java/mill-bin/mill-bin-0.11.6.ebuild26
-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/mvel-2.3.2-r1.ebuild81
-rw-r--r--dev-java/mvel/mvel-2.5.0.ebuild4
-rw-r--r--dev-java/openjdk-bin/Manifest1
-rw-r--r--dev-java/openjdk-bin/metadata.xml4
-rw-r--r--dev-java/openjdk-bin/openjdk-bin-21.0.1_p12.ebuild5
-rw-r--r--dev-java/openjdk-jre-bin/metadata.xml4
-rw-r--r--dev-java/openjdk/metadata.xml5
-rw-r--r--dev-java/openjdk/openjdk-11.0.20.1_p1.ebuild4
-rw-r--r--dev-java/openjdk/openjdk-17.0.8.1_p1.ebuild4
-rw-r--r--dev-java/openjdk/openjdk-21.0.1_p12.ebuild4
-rw-r--r--dev-java/openjdk/openjdk-8.382_p05-r2.ebuild (renamed from dev-java/openjdk/openjdk-8.382_p05.ebuild)3
-rw-r--r--dev-java/openjfx/metadata.xml4
-rw-r--r--dev-java/openjfx/openjfx-8.1000-r2.ebuild (renamed from dev-java/openjfx/openjfx-8.1000-r1.ebuild)12
-rw-r--r--dev-java/osgi-compendium/Manifest1
-rw-r--r--dev-java/osgi-compendium/osgi-compendium-4.3.1-r4.ebuild37
-rw-r--r--dev-java/osgi-core-api/Manifest1
-rw-r--r--dev-java/osgi-core-api/metadata.xml8
-rw-r--r--dev-java/osgi-core-api/osgi-core-api-5.0.0-r2.ebuild29
-rw-r--r--dev-java/osgi-enterprise-api/Manifest1
-rw-r--r--dev-java/osgi-enterprise-api/metadata.xml8
-rw-r--r--dev-java/osgi-enterprise-api/osgi-enterprise-api-5.0.0-r3.ebuild37
-rw-r--r--dev-java/osgi-foundation/Manifest1
-rw-r--r--dev-java/osgi-foundation/files/osgi-foundation-1.2.0-build.xml218
-rw-r--r--dev-java/osgi-foundation/osgi-foundation-1.2.0-r2.ebuild28
-rw-r--r--dev-java/osgi-service-log/Manifest1
-rw-r--r--dev-java/osgi-service-log/metadata.xml (renamed from dev-java/aqute-bnd-annotation/metadata.xml)0
-rw-r--r--dev-java/osgi-service-log/osgi-service-log-1.3.0.ebuild31
-rw-r--r--dev-java/osgi-service-subsystem/Manifest1
-rw-r--r--dev-java/osgi-service-subsystem/metadata.xml (renamed from dev-java/osgi-foundation/metadata.xml)1
-rw-r--r--dev-java/osgi-service-subsystem/osgi-service-subsystem-1.1.0.ebuild32
-rw-r--r--dev-java/parboiled/Manifest1
-rw-r--r--dev-java/parboiled/metadata.xml11
-rw-r--r--dev-java/parboiled/parboiled-1.4.1.ebuild68
-rw-r--r--dev-java/plexus-classworlds/Manifest1
-rw-r--r--dev-java/plexus-classworlds/plexus-classworlds-2.6.0.ebuild59
-rw-r--r--dev-java/plexus-classworlds/plexus-classworlds-2.7.0.ebuild2
-rw-r--r--dev-java/protobuf-java/Manifest4
-rw-r--r--dev-java/protobuf-java/protobuf-java-3.23.3.ebuild164
-rw-r--r--dev-java/protobuf-java/protobuf-java-3.25.1.ebuild (renamed from dev-java/protobuf-java/protobuf-java-3.24.2.ebuild)23
-rw-r--r--dev-java/protobuf-java/protobuf-java-3.25.2.ebuild166
-rw-r--r--dev-java/relaxng-datatype/Manifest1
-rw-r--r--dev-java/relaxng-datatype/relaxng-datatype-1.0-r3.ebuild35
-rw-r--r--dev-java/saxon/saxon-9.2.0.6-r3.ebuild7
-rw-r--r--dev-java/sbt/metadata.xml4
-rw-r--r--dev-java/scala-cli-bin/Manifest9
-rw-r--r--dev-java/scala-cli-bin/metadata.xml1
-rw-r--r--dev-java/scala-cli-bin/scala-cli-bin-1.1.0.ebuild (renamed from dev-java/scala-cli-bin/scala-cli-bin-1.0.2.ebuild)2
-rw-r--r--dev-java/scala-cli-bin/scala-cli-bin-1.1.1.ebuild78
-rw-r--r--dev-java/scram/Manifest2
-rw-r--r--dev-java/scram/metadata.xml3
-rw-r--r--dev-java/scram/scram-2.1.ebuild63
-rw-r--r--dev-java/snappy/files/1.1.7.8-unbundle-snappy.patch54
-rw-r--r--dev-java/snappy/snappy-1.1.10.5-r1.ebuild125
-rw-r--r--dev-java/stringtemplate/Manifest5
-rw-r--r--dev-java/stringtemplate/files/stringtemplate-3.2.1-TestStringTemplate.patch11
-rw-r--r--dev-java/stringtemplate/files/stringtemplate-4.3.4-BaseTest-javac-source-target.patch (renamed from dev-java/stringtemplate/files/stringtemplate-4.3.1-BaseTest-javac-source-target.patch)6
-rw-r--r--dev-java/stringtemplate/files/stringtemplate-4.3.4-Java21-TestRenderers.patch41
-rw-r--r--dev-java/stringtemplate/metadata.xml1
-rw-r--r--dev-java/stringtemplate/stringtemplate-3.2.1-r3.ebuild (renamed from dev-java/stringtemplate/stringtemplate-3.2.1-r2.ebuild)53
-rw-r--r--dev-java/stringtemplate/stringtemplate-4.3.4.ebuild (renamed from dev-java/stringtemplate/stringtemplate-4.3.2.ebuild)33
-rw-r--r--dev-java/swt/Manifest6
-rw-r--r--dev-java/swt/swt-4.29.ebuild2
-rw-r--r--dev-java/swt/swt-4.30-r1.ebuild (renamed from dev-java/swt/swt-4.28-r1.ebuild)19
-rw-r--r--dev-java/tomcat-native/Manifest6
-rw-r--r--dev-java/tomcat-native/tomcat-native-1.2.38.ebuild84
-rw-r--r--dev-java/tomcat-native/tomcat-native-1.2.39.ebuild2
-rw-r--r--dev-java/tomcat-native/tomcat-native-2.0.6.ebuild2
-rw-r--r--dev-java/tomcat-native/tomcat-native-2.0.7.ebuild (renamed from dev-java/tomcat-native/tomcat-native-2.0.5.ebuild)6
-rw-r--r--dev-java/validation-api/Manifest1
-rw-r--r--dev-java/validation-api/metadata.xml2
-rw-r--r--dev-java/validation-api/validation-api-1.0.0-r1.ebuild20
-rw-r--r--dev-java/validation-api/validation-api-1.1.0-r2.ebuild (renamed from dev-java/validation-api/validation-api-1.1.0-r1.ebuild)6
-rw-r--r--dev-java/waffle-jna/Manifest1
-rw-r--r--dev-java/waffle-jna/metadata.xml10
-rw-r--r--dev-java/waffle-jna/waffle-jna-3.3.0.ebuild47
-rw-r--r--dev-java/woodstox-core/woodstox-core-6.4.0-r1.ebuild (renamed from dev-java/woodstox-core/woodstox-core-6.4.0.ebuild)4
-rw-r--r--dev-java/xalan-serializer/xalan-serializer-2.7.3-r1.ebuild (renamed from dev-java/xalan-serializer/xalan-serializer-2.7.3.ebuild)4
-rw-r--r--dev-java/xalan/xalan-2.7.3-r1.ebuild (renamed from dev-java/xalan/xalan-2.7.3.ebuild)4
-rw-r--r--dev-java/xerces/xerces-2.12.2-r2.ebuild (renamed from dev-java/xerces/xerces-2.12.2-r1.ebuild)12
-rw-r--r--dev-java/xmlgraphics-commons/Manifest2
-rw-r--r--dev-java/xmlgraphics-commons/xmlgraphics-commons-2.8.ebuild72
-rw-r--r--dev-java/xmlgraphics-commons/xmlgraphics-commons-2.9.ebuild2
-rw-r--r--dev-java/xmlunit/xmlunit-1.6-r2.ebuild43
306 files changed, 4964 insertions, 4227 deletions
diff --git a/dev-java/ant-apache-bsf/ant-apache-bsf-1.10.9.ebuild b/dev-java/ant-apache-bsf/ant-apache-bsf-1.10.9-r1.ebuild
index f6ba1618b0fe..04cdcf48579c 100644
--- a/dev-java/ant-apache-bsf/ant-apache-bsf-1.10.9.ebuild
+++ b/dev-java/ant-apache-bsf/ant-apache-bsf-1.10.9-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -12,7 +12,7 @@ inherit ant-tasks
KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
IUSE="python javascript tcl"
-DEPEND=">=dev-java/bsf-2.4.0-r1:2.3[python?,javascript?,tcl?]"
+DEPEND=">=dev-java/bsf-2.4.0-r1:2.3[javascript?,tcl?]"
RDEPEND="${DEPEND}"
pkg_postinst() {
diff --git a/dev-java/ant-core/ant-core-1.10.14.ebuild b/dev-java/ant-core/ant-core-1.10.14.ebuild
new file mode 100644
index 000000000000..db4cfbb97de3
--- /dev/null
+++ b/dev-java/ant-core/ant-core-1.10.14.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit java-pkg-2
+
+DESCRIPTION="Compatibility link to ant-core for >=dev-java/ant-1.10.14"
+HOMEPAGE="https://ant.apache.org/"
+S="${WORKDIR}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 ~x86"
+
+DEPEND="
+ ~dev-java/ant-${PV}:0
+ >=virtual/jdk-1.8:*
+"
+RDEPEND=">=virtual/jre-1.8:*"
+
+src_compile() { :; }
+
+src_install() {
+ java-pkg_regjar /usr/share/ant-core/lib/ant.jar
+}
diff --git a/dev-java/ant-core/metadata.xml b/dev-java/ant-core/metadata.xml
index 4221e170cbc0..d0bcffb03628 100644
--- a/dev-java/ant-core/metadata.xml
+++ b/dev-java/ant-core/metadata.xml
@@ -5,4 +5,9 @@
<email>java@gentoo.org</email>
<name>Java</name>
</maintainer>
+ <upstream>
+ <bugs-to>https://bz.apache.org/bugzilla/enter_bug.cgi?product=Ant</bugs-to>
+ <doc>https://ant.apache.org/manual/</doc>
+ <remote-id type="github">apache/ant</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-java/ant-swing/ant-swing-1.10.9.ebuild b/dev-java/ant-swing/ant-swing-1.10.9.ebuild
index e204f8e1393e..c8dfb08b3aa2 100644
--- a/dev-java/ant-swing/ant-swing-1.10.9.ebuild
+++ b/dev-java/ant-swing/ant-swing-1.10.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -12,4 +12,4 @@ inherit ant-tasks
DESCRIPTION="Apache Ant's optional tasks for Swing"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
diff --git a/dev-java/ant-testutil/ant-testutil-1.10.9.ebuild b/dev-java/ant-testutil/ant-testutil-1.10.9.ebuild
index 23d1ace04929..1f1b85e2d3ba 100644
--- a/dev-java/ant-testutil/ant-testutil-1.10.9.ebuild
+++ b/dev-java/ant-testutil/ant-testutil-1.10.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -9,7 +9,7 @@ ANT_TASK_JREVER=1.8
inherit ant-tasks
DESCRIPTION="Apache Ant's optional test utility classes"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
CDEPEND="dev-java/ant-core:0"
diff --git a/dev-java/ant/Manifest b/dev-java/ant/Manifest
new file mode 100644
index 000000000000..a5c99e19154a
--- /dev/null
+++ b/dev-java/ant/Manifest
@@ -0,0 +1,2 @@
+DIST apache-ant-1.10.14-src.tar.gz 4692736 BLAKE2B b07a2e61fecd4f10056ca2688615ccf02c551bba0f5749f50c2be710e90306e8044b7c557359300654d93971d94520e92f593da44b1c20626db4701d499cddff SHA512 435f97a276d88a86022c5f0680f3c2a16dc36be95adac3d797a2609d96921840a57393c8f5ef8313193146115bd6a87bd4790a4a272c44f7beec892fd6528c10
+DIST apache-ant-1.10.14-src.tar.gz.asc 833 BLAKE2B d9a4b4b3cb22762f25b34651dc81c2f13af38e73fdca27bc2de562539cd8f1692744ac5ccf535a2c61d3035a129f30bafac133872f9ba0ed7b259393b0f4cdf6 SHA512 ff2e79c991f68a5c38c0b47556ca5f5301c1a8be219a9eddf8d2e17b09eed7f0426770c2dc18114ea432f0200ac824d71da633ad7881025692ce5ad4baa899ee
diff --git a/dev-java/ant/ant-1.10.14-r2.ebuild b/dev-java/ant/ant-1.10.14-r2.ebuild
new file mode 100644
index 000000000000..86d121ae7f7e
--- /dev/null
+++ b/dev-java/ant/ant-1.10.14-r2.ebuild
@@ -0,0 +1,396 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_PROVIDES="
+ org.apache.ant:ant:${PV}
+ org.apache.ant:ant-launcher:${PV}
+"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple verify-sig prefix
+
+DESCRIPTION="Java-based build tool similar to 'make' that uses XML configuration files"
+HOMEPAGE="https://ant.apache.org/"
+SRC_URI="mirror://apache/ant/source/apache-${P}-src.tar.gz
+ verify-sig? ( https://downloads.apache.org/ant/source/apache-${P}-src.tar.gz.asc )"
+S="${WORKDIR}/apache-${P}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 ~x86"
+IUSE="bcel bsf commonslogging commonsnet jai jakartamail javamail jdepend jsch junit junit4
+ junitlauncher log4j oro regexp resolver testutil xalan xz"
+
+# At least 10 test cases would fail without network
+PROPERTIES="test_network"
+RESTRICT="test"
+
+REQUIRED_USE="
+ junit4? ( junit )
+ test? ( bsf )
+ testutil? ( junit )
+"
+
+VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/ant.apache.org.asc"
+BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-ant )"
+# jdk-11:* because it needs java/util/spi/ToolProvider, available since Java 9.
+DEPEND="
+ >=virtual/jdk-11:*
+ bcel? ( dev-java/bcel:0 )
+ bsf? ( dev-java/bsf:2.3 )
+ commonslogging? ( dev-java/commons-logging:0 )
+ commonsnet? ( dev-java/commons-net:0 )
+ jai? ( dev-java/sun-jai-bin:0 )
+ jakartamail? ( dev-java/jakarta-mail:0 )
+ javamail? (
+ dev-java/jakarta-activation-api:1
+ dev-java/javax-mail:0
+ )
+ jdepend? ( >=dev-java/jdepend-2.10-r1:0 )
+ jsch? ( dev-java/jsch:0 )
+ junit4? ( dev-java/junit:4 )
+ junit? ( dev-java/junit:4 )
+ junitlauncher? ( dev-java/junit:5[vintage] )
+ log4j? ( dev-java/log4j-12-api:2 )
+ oro? ( dev-java/jakarta-oro:2.0 )
+ regexp? ( dev-java/jakarta-regexp:1.4 )
+ resolver? ( dev-java/xml-commons-resolver:0 )
+ test? (
+ dev-java/antunit:0
+ dev-java/bsf:2.3[javascript]
+ dev-java/bsh:0
+ dev-java/hamcrest-library:1.3
+ dev-java/xerces:2
+ )
+ xalan? (
+ dev-java/xalan:0
+ dev-java/xalan-serializer:0
+ )
+ xz? ( dev-java/xz-java:0 )
+"
+PDEPEND="~dev-java/ant-core-${PV}:0"
+RDEPEND="
+ !<dev-java/ant-core-1.10.14
+ !dev-java/ant-apache-regexp
+ !dev-java/ant-apache-log4j
+ !dev-java/ant-apache-xalan2
+ !dev-java/ant-commons-logging
+ !dev-java/ant-swing
+ !dev-java/ant-junit4
+ !dev-java/ant-testutil
+ !dev-java/ant-junitlauncher
+ !dev-java/ant-jai
+ !dev-java/ant-commons-net
+ !dev-java/ant-apache-bsf
+ !dev-java/ant-jmf
+ !dev-java/ant-apache-oro
+ !dev-java/ant-javamail
+ !dev-java/ant-junit
+ !dev-java/ant-jdepend
+ !dev-java/ant-antlr
+ !dev-java/ant-apache-bcel
+ !dev-java/ant-apache-resolver
+ !dev-java/ant-jsch
+ !dev-java/ant-xz
+ >=virtual/jre-1.8:*
+"
+
+DOCS=( CONTRIBUTORS INSTALL NOTICE README WHATSNEW )
+PATCHES=(
+ "${FILESDIR}/1.10.9-launch.patch" # reusing this patch since the script has not changed
+ "${FILESDIR}/ant-1.10.14-AntlibTest.patch" # skips 1 of 6 tests
+ "${FILESDIR}/ant-1.10.14-AntTest.patch" # skips 1 of 32 tests
+ "${FILESDIR}/ant-1.10.14-JavaTest.patch" # skips 12 of 38 tests
+ "${FILESDIR}/ant-1.10.14-LinkTest.patch" # skips 4 of 67 tests
+ "${FILESDIR}/ant-1.10.14-PathTest.patch" # skips 1 of 33 tests
+)
+
+JAVADOC_SRC_DIRS=(
+ ant
+ ant-launcher/src/main
+)
+JAVA_TEST_GENTOO_CLASSPATH="
+ bsh
+ hamcrest-library-1.3
+ junit-4
+ xerces-2
+"
+JAVA_TEST_RESOURCE_DIRS=(
+ "src/etc/testcases"
+ "src/main"
+)
+JAVA_TEST_SRC_DIR="src/tests/junit"
+
+# $1 ant-apache-bsf (source directory)
+# $2 bsf-2.3 (classpath of external dependency)
+taskdeps() {
+ if [[ ${task} == $1 ]]; then
+ JAVA_CLASSPATH_EXTRA="${2}"
+ JAVADOC_CLASSPATH+=" ${2}"
+ JAVADOC_SRC_DIRS+=( "${task}/src/main" )
+ JAVA_RESOURCE_DIRS="${3}"
+ fi
+}
+
+src_prepare() {
+ default #780585
+ java-pkg-2_src_prepare
+ java-pkg_clean ! -path "./src/etc/*" # keep test resources
+
+ eprefixify "src/script/ant"
+
+ ANT_TASKS=(
+ ant-antlr # no dependencies
+ $(use bcel && echo ant-apache-bcel)
+ $(use bsf && echo ant-apache-bsf) # REQUIRED_USE for tests
+ $(use log4j && echo ant-apache-log4j)
+ $(use oro && echo ant-apache-oro) # ORO is retired - replace with java.util.regex?
+ $(use regexp && echo ant-apache-regexp)
+ $(use resolver && echo ant-apache-resolver)
+ $(use xalan && echo ant-apache-xalan2)
+ $(use commonslogging && echo ant-commons-logging)
+ $(use commonsnet && echo ant-commons-net)
+ ant-imageio # no dependencies
+ $(use jai && echo ant-jai)
+ $(use jakartamail && echo ant-jakartamail)
+ $(use javamail && echo ant-javamail)
+ $(use jdepend && echo ant-jdepend)
+ ant-jmf # no dependencies
+ $(use jsch && echo ant-jsch)
+ $(use junit && echo ant-junit) # REQUIRED_USE for junit4 and for testutil
+ $(use junit4 && echo ant-junit4)
+ $(use junitlauncher && echo ant-junitlauncher)
+ # depends on "com.ibm.netrexx:netrexx:2.0.5" which is
+ # available on https://www.netrexx.org/downloads.nsp and states:
+ # "IBM's last NetRexx release, suitable for JVM versions 1.5 and below [...]"
+ # $(use netrexx && echo ant-netrexx) # src/etc/poms/ant-netrexx/pom.xml
+ ant-swing # no dependencies
+ $(use testutil && echo ant-testutil)
+ $(use xz && echo ant-xz)
+ )
+
+ # defaultManifest.mf
+ sed -e "s:\${project.version}:${PV}:" \
+ -i src/main/org/apache/tools/ant/defaultManifest.mf || die
+
+ # version.txt
+ local mydate="$(date '+%B %d %Y')"
+ echo "VERSION=${PV}" > src/main/org/apache/tools/ant/version.txt || die
+ echo "DATE=${mydate}" >> src/main/org/apache/tools/ant/version.txt || die
+
+ # src directory for ant.jar
+ mkdir ant || die "cannot create src directory for ant"
+ cp -r {src/main/,ant}/org || die "cannot copy ant sources"
+
+ # resources directory for ant.jar according to lines 317-325 src/etc/poms/ant/pom.xml
+ local INCLUDES=( $(
+ sed -n '/<resources>/,/<\/resources>/p' \
+ src/etc/poms/ant/pom.xml \
+ | grep org \
+ | sed -e 's:.*<include>\(.*\)</include>:\1:' || die
+ ))
+ cp -r {src/,ant}/resources || die "cannot copy ant resources"
+ pushd src/main > /dev/null || die "pushd src/main"
+ cp --parents -v "${INCLUDES[@]}" ../../ant/resources || die "CANNOT"
+ popd > /dev/null || die "popd"
+
+ # Remove sources according to lines 158-187 src/etc/poms/ant/pom.xml
+ # We don't remove anything from src/main/org
+ local EXCLUDES=$(
+ sed -n '/<excludes>/,/<\/excludes/p' \
+ src/etc/poms/ant/pom.xml \
+ | grep org \
+ | sed -e 's:<exclude>\(.*\)</exclude>:ant/\1:' || die
+ )
+ rm -r ${EXCLUDES} || die
+ # Remove one more file directly, could not get it with sed.
+ rm ant/org/apache/tools/ant/taskdefs/optional/ANTLR.java || die
+
+ # Same handling for everything between <testExcludes> </testExcludes>
+ # Removing non-existing files is not possible: We ignore them ( grep -v ).
+ local TEST_EXCLUDES=$(
+ sed -n '/<testExcludes>/,/<\/testExcludes/p' \
+ src/etc/poms/ant/pom.xml \
+ | grep org \
+ | grep -v CommonsLoggingListener \
+ | grep -v Log4jListener \
+ | sed -e 's:<exclude>\(.*\)</exclude>:src/tests/junit/\1:' || die
+ )
+ rm -r ${TEST_EXCLUDES} || die
+
+ # Prepare a separate JAVA_SRC_DIR directory for each jar file to be created.
+ einfo "Copy source files of ant-tasks"
+ local task
+ for task in ant-launcher "${ANT_TASKS[@]}"; do
+ # "${task}/src/main" will be JAVA_SRC_DIR
+ mkdir -p "${task}/src/main" || die "mkdir ${task}"
+ # Read from pom.xml the file names which can still contain wildcards
+ local INCLUDES=( $(
+ sed -n '/<includes>/,/<\/includes>/p' "src/etc/poms/${task}/pom.xml" \
+ | grep org \
+ | sed -e 's:.*<include>\(.*\)</include>:\1:' || die
+ ))
+ local sourcefile
+ # Resolve wildcards in file names using find and copy the files to the corresponding
+ # "${task}"/src/main directory
+ # echo "${INCLUDES[@]}"
+ for sourcefile in "${INCLUDES[@]}"; do
+ # einfo "${task}: ${sourcefile}"
+ # Parameter substitution % to remove trailing slash from ${sourcefile}.
+ # Applies to ant-jdepend and ant-junitlauncher where find would otherwise fail.
+ find \
+ -path "./src/*/${sourcefile%/}" \
+ -exec cp -r --parents "{}" \
+ "${task}/src/main" \;
+ done
+ # tree "${task}"
+ done
+
+ # JAVA_RESOURCE_DIRS for ant-junit
+ mkdir -p ant-junit/src/resources/org/apache/tools/ant/taskdefs/optional/junit/xsl \
+ || die "junit resource dir"
+ cp src/etc/{junit-frames,junit-noframes,junit-frames-saxon,junit-noframes-saxon}.xsl \
+ ant-junit/src/resources/org/apache/tools/ant/taskdefs/optional/junit/xsl \
+ || die "junit resources"
+}
+
+src_compile() {
+ einfo "Compiling ant-launcher.jar"
+ JAVA_JAR_FILENAME="ant-launcher.jar"
+ JAVA_MAIN_CLASS="org.apache.tools.ant.launch.Launcher"
+ JAVA_SRC_DIR="ant-launcher/src/main"
+ java-pkg-simple_src_compile
+ JAVA_GENTOO_CLASSPATH_EXTRA+=":ant-launcher.jar"
+ rm -r target || die
+
+ einfo "Compiling ant.jar"
+ JAVA_JAR_FILENAME="ant.jar"
+ JAVA_LAUNCHER_FILENAME="ant"
+ JAVA_MAIN_CLASS="org.apache.tools.ant.Main"
+ JAVA_RESOURCE_DIRS="ant/resources"
+ JAVA_SRC_DIR="ant"
+ java-pkg-simple_src_compile
+ JAVA_GENTOO_CLASSPATH_EXTRA+=":ant.jar"
+ rm -r target || die
+
+ local task
+ for task in "${ANT_TASKS[@]}"; do
+ einfo "Compiling ${task}"
+ JAVA_JAR_FILENAME="${task}.jar"
+ JAVA_MAIN_CLASS=""
+ JAVA_RESOURCE_DIRS=""
+ JAVA_SRC_DIR=""
+
+ JAVA_SRC_DIR="${task}/src/main"
+ taskdeps ant-apache-bcel bcel
+ taskdeps ant-apache-bsf bsf-2.3
+ taskdeps ant-apache-log4j log4j-12-api-2
+ taskdeps ant-apache-oro jakarta-oro-2.0
+ taskdeps ant-apache-regexp jakarta-regexp-1.4
+ taskdeps ant-apache-resolver xml-commons-resolver
+ taskdeps ant-apache-xalan2 xalan
+ taskdeps ant-commons-logging commons-logging
+ taskdeps ant-commons-net commons-net
+ taskdeps ant-jai sun-jai-bin
+ taskdeps ant-jakartamail jakarta-mail
+ taskdeps ant-javamail 'javax-mail jakarta-activation-api-1'
+ taskdeps ant-jdepend jdepend
+ taskdeps ant-jsch jsch
+ taskdeps ant-junit junit-4 ant-junit/src/resources
+ taskdeps ant-junit4 junit-4
+ taskdeps ant-junitlauncher junit-5
+ # $(use netrexx && echo ant-netrexx)
+ taskdeps ant-xz xz-java
+
+ java-pkg-simple_src_compile
+ JAVA_GENTOO_CLASSPATH_EXTRA+=":${task}.jar"
+ rm -fr target || die
+ done
+ use doc && ejavadoc
+}
+
+src_test() {
+ # Avoid "--with-dependencies" as used by JAVA_TEST_GENTOO_CLASSPATH.
+ # dev-java/antunit has a circular dependency with dev-java/ant[test]
+ JAVA_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjars --build-only antunit)"
+ # according to line 115 src/etc/poms/ant/pom.xml
+ jar -cvf src/etc/testcases/org/apache/tools/ant/taskdefs/test2-antlib.jar \
+ -C src/etc/testcases taskdefs/test.antlib.xml || die "cannot test2-antlib.jar"
+
+ JAVA_TEST_EXCLUDES=(
+ # according to lines 1956-1964 build.xml (abstract classes, not testcases)
+ org.apache.tools.ant.taskdefs.TaskdefsTest
+ org.apache.tools.ant.BuildFileTest
+ org.apache.tools.ant.util.regexp.RegexpMatcherTest
+ org.apache.tools.ant.util.regexp.RegexpTest
+ org.apache.tools.ant.types.selectors.BaseSelectorTest
+ # according to line 1970 build.xml (helper classes, not testcases)
+ org.apache.tools.ant.TestHelper
+ # lines 2097-2102 build.xml (interactive tests)
+ org.apache.tools.ant.taskdefs.TestProcess # 1. No runnable methods
+ # 1) testAll(org.apache.tools.ant.taskdefs.InitializeClassTest)
+ # /var/tmp/portage/dev-java/ant-1.10.14/work/apache-ant-1.10.14/
+ # src/etc/testcases/taskdefs/initializeclass.xml:24: Java returned: 1
+ # <pathelement path="${build.tests.value}"/>
+ # <pathelement location="${java.home}/lib/classes.zip"/>
+ org.apache.tools.ant.taskdefs.InitializeClassTest # Tests run: 1, Failures: 1
+ )
+
+# tests with patches to be revisited
+# JAVA_TEST_RUN_ONLY=(
+# org.apache.tools.ant.taskdefs.AntlibTest # Tests run: 6, Failures: 1 test2-antlib.jar?
+# org.apache.tools.ant.taskdefs.AntTest # Tests run: 32, Failures: 1
+# org.apache.tools.ant.taskdefs.JavaTest # Tests run: 38, Failures: 12
+# org.apache.tools.ant.taskdefs.modules.LinkTest # Tests run: 67, Failures: 4
+# org.apache.tools.ant.types.PathTest # Tests run: 33, Failures: 1
+# )
+
+ # according to lines 276-297 src/etc/poms/ant/pom.xml
+ JAVA_TEST_EXTRA_ARGS=(
+ -Dant.home="${ANT_HOME}"
+ -Dbuild.classes.value=../../../target/test-classes # needed for org.apache.tools.ant.taskdefs.SignJarTest
+ -Dbuild.tests.value=target/test-classes
+ -Doffline=true
+ -Dant.test.basedir.ignore=true
+ )
+ java-pkg-simple_src_test
+}
+
+src_install() {
+ java-pkg_dojar ant.jar ant-launcher.jar
+
+ # Compatibility symlink, should be removed after transition period.
+ dosym -r /usr/share/ant{,-core}/lib/ant.jar
+
+ for task in "${ANT_TASKS[@]}"; do
+ java-pkg_dojar "${task}.jar"
+ java-pkg_register-ant-task --version "${PV}" "${task}"
+ done
+
+ dobin src/script/ant
+
+ dodir /usr/share/ant/bin
+ for each in antRun antRun.pl runant.pl runant.py ; do
+ dobin "${S}/src/script/${each}"
+ done
+
+ insinto /usr/share/ant/etc
+ doins -r src/etc/*.xsl
+ insinto /usr/share/ant/etc/checkstyle
+ doins -r src/etc/checkstyle/*.xsl
+
+ echo "ANT_HOME=\"${EPREFIX}/usr/share/ant\"" > "${T}/20ant"
+ doenvd "${T}/20ant"
+
+ einstalldocs
+ if use doc; then
+ java-pkg_dojavadoc target/api
+ docinto html
+ dodoc -r manual
+ fi
+
+ use source && java-pkg_dosrc src/main/*
+}
diff --git a/dev-java/ant/files/1.10.9-launch.patch b/dev-java/ant/files/1.10.9-launch.patch
new file mode 100644
index 000000000000..7babe6740fa9
--- /dev/null
+++ b/dev-java/ant/files/1.10.9-launch.patch
@@ -0,0 +1,361 @@
+diff --git a/src/script/ant b/src/script/ant
+index 81107b5..a501081 100644
+--- a/src/script/ant
++++ b/src/script/ant
+@@ -1,4 +1,4 @@
+-#! /bin/sh
++#!@GENTOO_PORTAGE_EPREFIX@/bin/bash
+
+ # Licensed to the Apache Software Foundation (ASF) under one or more
+ # contributor license agreements. See the NOTICE file distributed with
+@@ -15,6 +15,10 @@
+ # See the License for the specific language governing permissions and
+ # limitations under the License.
+
++# Edited for Gentoo Linux
++
++EPREFIX="@GENTOO_PORTAGE_EPREFIX@"
++
+ # Extract launch and ant arguments, (see details below).
+ ant_exec_args=
+ no_config=false
+@@ -83,9 +87,9 @@ if $no_config; then
+ usejikes=$use_jikes_default
+ else
+ # load system-wide ant configuration (ONLY if ANT_HOME has NOT been set)
+- if [ -z "$ANT_HOME" -o "$ANT_HOME" = "/usr/share/ant" ]; then
+- if [ -f "/etc/ant.conf" ]; then
+- . /etc/ant.conf
++ if [ -z "$ANT_HOME" -o "$ANT_HOME" = "${EPREFIX}/usr/share/ant" ]; then
++ if [ -f "${EPREFIX}/etc/ant.conf" ]; then
++ . "${EPREFIX}"/etc/ant.conf
+ fi
+ fi
+
+@@ -106,69 +110,23 @@ else
+ fi
+ fi
+
+-# Setup Java environment in rpm mode
+-if $rpm_mode; then
+- if [ -f /usr/share/java-utils/java-functions ]; then
+- . /usr/share/java-utils/java-functions
+- set_jvm
+- set_javacmd
+- fi
+-fi
+-
+-# OS specific support. $var _must_ be set to either true or false.
+-cygwin=false;
+-darwin=false;
+-mingw=false;
+-case "`uname`" in
+- CYGWIN*)
+- cygwin=true
+- ;;
+- Darwin*)
+- darwin=true
+- if [ -z "$JAVA_HOME" ]; then
+- if [ -x '/usr/libexec/java_home' ]; then
+- JAVA_HOME=`/usr/libexec/java_home`
+- elif [ -d "/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Home" ]; then
+- JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Home
+- fi
+- fi
+- ;;
+- MINGW*)
+- mingw=true
+- ;;
+-esac
+-
+-if [ -z "$ANT_HOME" -o ! -d "$ANT_HOME" ]; then
+- ## resolve links - $0 may be a link to ant's home
+- PRG="$0"
+- progname=`basename "$0"`
+-
+- # need this for relative symlinks
+- while [ -h "$PRG" ]; do
+- ls=`ls -ld "$PRG"`
+- link=`expr "$ls" : '.*-> \(.*\)$'`
+- if expr "$link" : '/.*' > /dev/null; then
+- PRG="$link"
+- else
+- PRG=`dirname "$PRG"`"/$link"
+- fi
+- done
+-
+- ANT_HOME=`dirname "$PRG"`/..
++export WANT_JAVA_CONFIG=2
+
+- # make it fully qualified
+- ANT_HOME=`cd "$ANT_HOME" > /dev/null && pwd`
++# Always get JAVA_HOME from java-config, unless ANT_RESPECT_JAVA_HOME is set
++# Use GENTOO_VM to change which VM is used instead.
++if [[ -z "${ANT_RESPECT_JAVA_HOME}" || -z "${JAVA_HOME}" ]]; then
++ export JAVA_HOME="$(java-config -g JAVA_HOME)"
+ fi
+
+-# For Cygwin and Mingw, ensure paths are in UNIX format before
+-# anything is touched
+-if $cygwin; then
+- [ -n "$ANT_HOME" ] && ANT_HOME=`cygpath --unix "$ANT_HOME"`
+- [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
++if [ -z $JAVA_HOME ] ; then
++ echo 'Error: No JDK found!'
++ echo "Try using java-config script to set your JDK"
++ echo "Remember that you need a JDK not a JRE"
++ exit 1
+ fi
+-if $mingw; then
+- [ -n "$ANT_HOME" ] && ANT_HOME="`(cd "$ANT_HOME"; pwd)`"
+- [ -n "$JAVA_HOME" ] && JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`"
++
++if [[ -z "${ANT_HOME}" ]] ; then
++ ANT_HOME="${EPREFIX}"/usr/share/ant
+ fi
+
+ # set ANT_LIB location
+@@ -176,14 +134,7 @@ ANT_LIB="${ANT_HOME}/lib"
+
+ if [ -z "$JAVACMD" ]; then
+ if [ -n "$JAVA_HOME" ]; then
+- # IBM's JDK on AIX uses strange locations for the executables
+- if [ -x "$JAVA_HOME/jre/sh/java" ]; then
+- JAVACMD="$JAVA_HOME/jre/sh/java"
+- elif [ -x "$JAVA_HOME/jre/bin/java" ]; then
+- JAVACMD="$JAVA_HOME/jre/bin/java"
+- else
+ JAVACMD="$JAVA_HOME/bin/java"
+- fi
+ else
+ JAVACMD=`which java 2> /dev/null `
+ if [ -z "$JAVACMD" ]; then
+@@ -200,88 +151,61 @@ if [ ! -x "$JAVACMD" ]; then
+ exit 1
+ fi
+
+-# Build local classpath using just the launcher in non-rpm mode or
+-# use the Jpackage helper in rpm mode with basic and default jars
+-# specified in the ant.conf configuration. Because the launcher is
+-# used, libraries linked in ANT_HOME/lib will also be included, but this
+-# is discouraged as it is not java-version safe. A user should
+-# request optional jars and their dependencies via the OPT_JAR_LIST
+-# variable
+-if $rpm_mode && [ -x /usr/bin/build-classpath ]; then
+- LOCALCLASSPATH="$(/usr/bin/build-classpath ant ant-launcher jaxp_parser_impl xml-commons-apis)"
+-
+- # If no optional jars have been specified then build the default list
+- if [ -z "$OPT_JAR_LIST" ]; then
+- for file in /etc/ant.d/*; do
+- if [ -f "$file" ]; then
+- case "$file" in
+- *~|*#*|*.rpmsave|*.rpmnew)
+- ;;
+- *)
+- for dep in `cat "$file"`; do
+- OPT_JAR_LIST="$OPT_JAR_LIST${OPT_JAR_LIST:+ }$dep"
+- done
+- ;;
+- esac
+- fi
+- done
+- fi
+-
+- # If the user requested to try to add some other jars to the classpath
+- if [ -n "$OPT_JAR_LIST" ]; then
+- _OPTCLASSPATH="$(/usr/bin/build-classpath $OPT_JAR_LIST 2> /dev/null)"
+- if [ -n "$_OPTCLASSPATH" ]; then
+- LOCALCLASSPATH="$LOCALCLASSPATH:$_OPTCLASSPATH"
+- fi
+- fi
+-
+- # Explicitly add javac path to classpath, assume JAVA_HOME set
+- # properly in rpm mode
+- if [ -f "$JAVA_HOME/lib/tools.jar" ]; then
+- LOCALCLASSPATH="$LOCALCLASSPATH:$JAVA_HOME/lib/tools.jar"
+- fi
+- if [ -f "$JAVA_HOME/lib/classes.zip" ]; then
+- LOCALCLASSPATH="$LOCALCLASSPATH:$JAVA_HOME/lib/classes.zip"
+- fi
++if [ -z "$LOCALCLASSPATH" ] ; then
++ LOCALCLASSPATH=$ANT_LIB/ant-launcher.jar
++else
++ LOCALCLASSPATH=$ANT_LIB/ant-launcher.jar:$LOCALCLASSPATH
++fi
++
++# if ANT_TASKS is not set, default to "all"
++ANT_TASKS="${ANT_TASKS:-all}"
++
++# if ANT_TASKS is set to "all", get the tasks list from /usr/share/ant/tasks/
++if [[ "${ANT_TASKS}" == "all" ]]; then
++ ANT_TASKS=""
++ # but only if it exists
++ if [[ -d "${EPREFIX}"/usr/share/ant/tasks ]]; then
++ ANT_TASKS="${ANT_TASKS} ${EPREFIX}"/usr/share/ant/tasks/*
++ fi
++ if [[ -d "${EPREFIX}"/usr/share/ant/tasks-1.8.2 ]]; then
++ ANT_TASKS="${ANT_TASKS} ${EPREFIX}"/usr/share/ant/tasks-1.8.2/*
++ fi
++# if set to "none", make ANT_TASKS empty list
++elif [[ "${ANT_TASKS}" == "none" ]]; then
++ ANT_TASKS=""
++fi
++# otherwise ANT_TASKS defines explicit task list
++
++# construct the tasks list separated with commas to pass to java-config
++TASKS_LIST=""
++for task in $ANT_TASKS; do
++ TASKS_LIST="${TASKS_LIST},$(basename $task)"
++done
++TASKS_LIST=${TASKS_LIST#,}
+
+- # if CLASSPATH_OVERRIDE env var is set, LOCALCLASSPATH will be
+- # user CLASSPATH first and ant-found jars after.
+- # In that case, the user CLASSPATH will override ant-found jars
+- #
+- # if CLASSPATH_OVERRIDE is not set, we'll have the normal behaviour
+- # with ant-found jars first and user CLASSPATH after
+- if [ -n "$CLASSPATH" ]; then
+- # merge local and specified classpath
+- if [ -z "$LOCALCLASSPATH" ]; then
+- LOCALCLASSPATH="$CLASSPATH"
+- elif [ -n "$CLASSPATH_OVERRIDE" ]; then
+- LOCALCLASSPATH="$CLASSPATH:$LOCALCLASSPATH"
+- else
+- LOCALCLASSPATH="$LOCALCLASSPATH:$CLASSPATH"
+- fi
++# get the classpath for optional tasks and their dependency .jar files
++if [[ -n "${TASKS_LIST}" ]] ; then
++ ANT_TASKS_CLASSPATH="-lib \"$(java-config -dp ${TASKS_LIST})\""
++ ANT_TASKS_LIBPATH="-Djava.library.path=\"$(java-config -di ${TASKS_LIST})\""
++else
++ ANT_TASKS_CLASSPATH=""
++ ANT_TASKS_LIBPATH=""
++fi
+
+- # remove class path from launcher -cp option
+- CLASSPATH=""
+- fi
++# determine where to get tools.jar from
++if [[ -n "${ANT_RESPECT_JAVA_HOME}" ]]; then
++ TOOLS_JAR="${JAVA_HOME}/lib/tools.jar"
+ else
+- # not using rpm_mode; use launcher to determine classpaths
+- if [ -z "$LOCALCLASSPATH" ]; then
+- LOCALCLASSPATH=$ANT_LIB/ant-launcher.jar
+- else
+- LOCALCLASSPATH=$ANT_LIB/ant-launcher.jar:$LOCALCLASSPATH
+- fi
++ TOOLS_JAR="$(java-config --tools)"
+ fi
+
+-if [ -n "$JAVA_HOME" ]; then
+- # OSX hack to make Ant work with jikes
+- if $darwin; then
+- OSXHACK="${JAVA_HOME}/../Classes"
+- if [ -d "${OSXHACK}" ]; then
+- for i in "${OSXHACK}"/*.jar; do
+- JIKESPATH="$JIKESPATH:$i"
+- done
+- fi
+- fi
++if [[ -n "${TOOLS_JAR}" ]] ; then
++ LOCALCLASSPATH="$LOCALCLASSPATH:${TOOLS_JAR}"
++elif [[ $(java-config -f) != apple-jdk-bin* ]] ; then
++ echo "Warning: Unable to determine tools.jar location."
++ echo " If build fails because sun.* classes could not be found,"
++ echo " Make sure you are using a JDK, not JRE as your user/system VM."
++ echo " and that you have java-config version 2.0.30 or above installed."
+ fi
+
+ # Allow Jikes support (off by default)
+@@ -289,29 +213,6 @@ if $usejikes; then
+ ANT_OPTS="$ANT_OPTS -Dbuild.compiler=jikes"
+ fi
+
+-# For Cygwin, switch paths to appropriate format before running java
+-# For PATHs convert to unix format first, then to windows format to ensure
+-# both formats are supported. Probably this will fail on directories with ;
+-# in the name in the path. Let's assume that paths containing ; are more
+-# rare than windows style paths on cygwin.
+-if $cygwin; then
+- if [ "$OS" = "Windows_NT" ] && cygpath -m .>/dev/null 2>/dev/null; then
+- format=mixed
+- else
+- format=windows
+- fi
+- [ -n "$ANT_HOME" ] && ANT_HOME=`cygpath --$format "$ANT_HOME"`
+- ANT_LIB=`cygpath --$format "$ANT_LIB"`
+- [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --$format "$JAVA_HOME"`
+- LCP_TEMP=`cygpath --path --unix "$LOCALCLASSPATH"`
+- LOCALCLASSPATH=`cygpath --path --$format "$LCP_TEMP"`
+- if [ -n "$CLASSPATH" ]; then
+- CP_TEMP=`cygpath --path --unix "$CLASSPATH"`
+- CLASSPATH=`cygpath --path --$format "$CP_TEMP"`
+- fi
+- CYGHOME=`cygpath --$format "$HOME"`
+-fi
+-
+ # Show script help if requested
+ if $show_help; then
+ echo $0 '[script options] [options] [target [target2 [target3] ..]]'
+@@ -326,49 +227,20 @@ if $show_help; then
+ echo ' launch script'
+ echo ''
+ fi
+-# add a second backslash to variables terminated by a backslash under cygwin
+-if $cygwin; then
+- case "$ANT_HOME" in
+- *\\ )
+- ANT_HOME="$ANT_HOME\\"
+- ;;
+- esac
+- case "$CYGHOME" in
+- *\\ )
+- CYGHOME="$CYGHOME\\"
+- ;;
+- esac
+- case "$JIKESPATH" in
+- *\\ )
+- JIKESPATH="$JIKESPATH\\"
+- ;;
+- esac
+- case "$LOCALCLASSPATH" in
+- *\\ )
+- LOCALCLASSPATH="$LOCALCLASSPATH\\"
+- ;;
+- esac
+- case "$CLASSPATH" in
+- *\\ )
+- CLASSPATH="$CLASSPATH\\"
+- ;;
+- esac
+-fi
++
+ # Execute ant using eval/exec to preserve spaces in paths,
+ # java options, and ant args
+ ant_sys_opts=
+-if [ -n "$CYGHOME" ]; then
+- if [ -n "$JIKESPATH" ]; then
+- ant_sys_opts="-Djikes.class.path=\"$JIKESPATH\" -Dcygwin.user.home=\"$CYGHOME\""
+- else
+- ant_sys_opts="-Dcygwin.user.home=\"$CYGHOME\""
+- fi
+-else
+- if [ -n "$JIKESPATH" ]; then
+- ant_sys_opts="-Djikes.class.path=\"$JIKESPATH\""
+- fi
++
++if [ -n "$JIKESPATH" ]; then
++ ant_sys_opts="-Djikes.class.path=\"$JIKESPATH\""
+ fi
+-ant_exec_command="exec \"\$JAVACMD\" $ANT_OPTS -classpath \"\$LOCALCLASSPATH\" -Dant.home=\"\$ANT_HOME\" -Dant.library.dir=\"\$ANT_LIB\" $ant_sys_opts org.apache.tools.ant.launch.Launcher $ANT_ARGS -cp \"\$CLASSPATH\""
++
++ant_exec_command="exec \"${JAVACMD}\" ${ANT_OPTS} -classpath \"${LOCALCLASSPATH}\" \
++ -Dant.home=\"${ANT_HOME}\" -Dant.library.dir=\"${ANT_LIB}\" ${ant_sys_opts} \
++ ${ANT_TASKS_LIBPATH} org.apache.tools.ant.launch.Launcher \
++ ${ANT_TASKS_CLASSPATH} ${ANT_ARGS} -cp \"${CLASSPATH}\""
++
+ if $ant_exec_debug; then
+ # using printf to avoid echo line continuation and escape interpretation confusion
+ printf "%s\n" "$ant_exec_command $ant_exec_args"
diff --git a/dev-java/ant/files/ant-1.10.14-AntTest.patch b/dev-java/ant/files/ant-1.10.14-AntTest.patch
new file mode 100644
index 000000000000..2e2e7fe38d96
--- /dev/null
+++ b/dev-java/ant/files/ant-1.10.14-AntTest.patch
@@ -0,0 +1,28 @@
+There was 1 failure:
+1) testAntCoreLib(org.apache.tools.ant.taskdefs.AntTest)
+java.lang.AssertionError: found ant.core.lib in: /var/tmp/portage/dev-java/ant-core-1.10.14/work/apache-ant-1.10.14/target/test-classes
+ at org.junit.Assert.fail(Assert.java:89)
+ at org.junit.Assert.assertTrue(Assert.java:42)
+ at org.apache.tools.ant.taskdefs.AntTest.testAntCoreLib(AntTest.java:377)
+
+FAILURES!!!
+Tests run: 32, Failures: 1
+--- a/src/tests/junit/org/apache/tools/ant/taskdefs/AntTest.java
++++ b/src/tests/junit/org/apache/tools/ant/taskdefs/AntTest.java
+@@ -33,6 +33,7 @@ import org.junit.After;
+ import org.junit.Before;
+ import org.junit.Rule;
+ import org.junit.Test;
++import org.junit.Ignore;
+
+ import static org.hamcrest.Matchers.containsString;
+ import static org.junit.Assert.assertEquals;
+@@ -369,7 +370,7 @@ public class AntTest {
+ assertEquals("dadctb", buildRule.getLog());
+ }
+
+- @Test
++ @Test @Ignore
+ public void testAntCoreLib() {
+ // Cf. #42263
+ buildRule.executeTarget("sub-show-ant.core.lib");
diff --git a/dev-java/ant/files/ant-1.10.14-AntlibTest.patch b/dev-java/ant/files/ant-1.10.14-AntlibTest.patch
new file mode 100644
index 000000000000..d45925272beb
--- /dev/null
+++ b/dev-java/ant/files/ant-1.10.14-AntlibTest.patch
@@ -0,0 +1,40 @@
+There was 1 failure:
+1) testAntlibResource(org.apache.tools.ant.taskdefs.AntlibTest)
+/var/tmp/portage/dev-java/ant-core-1.10.14/work/apache-ant-1.10.14/src/etc/testcases/taskdefs/antlib.xml:43: Problem: failed to create task or type mytask2
+Cause: The name is undefined.
+Action: Check the spelling.
+Action: Check that any custom tasks/types have been declared.
+Action: Check that any <presetdef>/<macrodef> declarations have taken place.
+
+ at org.apache.tools.ant.UnknownElement.getNotFoundException(UnknownElement.java:506)
+ at org.apache.tools.ant.UnknownElement.makeObject(UnknownElement.java:438)
+ at org.apache.tools.ant.UnknownElement.maybeConfigure(UnknownElement.java:166)
+ at org.apache.tools.ant.Task.perform(Task.java:349)
+ at org.apache.tools.ant.Target.execute(Target.java:449)
+ at org.apache.tools.ant.Target.performTasks(Target.java:470)
+ at org.apache.tools.ant.Project.executeSortedTargets(Project.java:1401)
+ at org.apache.tools.ant.Project.executeTarget(Project.java:1374)
+ at org.apache.tools.ant.BuildFileRule.executeTarget(BuildFileRule.java:197)
+ at org.apache.tools.ant.taskdefs.AntlibTest.testAntlibResource(AntlibTest.java:67)
+
+FAILURES!!!
+Tests run: 6, Failures: 1
+--- a/src/tests/junit/org/apache/tools/ant/taskdefs/AntlibTest.java
++++ b/src/tests/junit/org/apache/tools/ant/taskdefs/AntlibTest.java
+@@ -24,6 +24,7 @@ import org.apache.tools.ant.Task;
+ import org.junit.Before;
+ import org.junit.Rule;
+ import org.junit.Test;
++import org.junit.Ignore;
+
+ import static org.junit.Assert.assertEquals;
+ import static org.junit.Assert.assertNotNull;
+@@ -61,7 +62,7 @@ public class AntlibTest {
+ * can collect several antlibs in one Definer call.
+ * @see <a href="https://issues.apache.org/bugzilla/show_bug.cgi?id=24024">bug 24024</a>
+ */
+- @Test
++ @Test @Ignore
+ public void testAntlibResource() {
+ assertNotNull("build.tests.value not set", System.getProperty("build.tests.value"));
+ buildRule.executeTarget("antlib.resource");
diff --git a/dev-java/ant/files/ant-1.10.14-JavaTest.patch b/dev-java/ant/files/ant-1.10.14-JavaTest.patch
new file mode 100644
index 000000000000..9143cba43ca2
--- /dev/null
+++ b/dev-java/ant/files/ant-1.10.14-JavaTest.patch
@@ -0,0 +1,102 @@
+bug #922775
+--- a/src/tests/junit/org/apache/tools/ant/taskdefs/JavaTest.java
++++ b/src/tests/junit/org/apache/tools/ant/taskdefs/JavaTest.java
+@@ -42,6 +42,7 @@ import org.junit.AssumptionViolatedException;
+ import org.junit.Before;
+ import org.junit.Rule;
+ import org.junit.Test;
++import org.junit.Ignore;
+ import org.junit.rules.ExpectedException;
+
+ import static org.hamcrest.Matchers.containsString;
+@@ -241,7 +242,7 @@ public class JavaTest {
+ buildRule.executeTarget("testRunFailFoeFork");
+ }
+
+- @Test
++ @Test @Ignore
+ public void testExcepting() {
+ buildRule.executeTarget("testExcepting");
+ assertThat(buildRule.getLog(), containsString("Exception raised inside called program"));
+@@ -253,7 +254,7 @@ public class JavaTest {
+ assertThat(buildRule.getLog(), containsString("Java Result:"));
+ }
+
+- @Test
++ @Test @Ignore
+ public void testExceptingFoe() {
+ thrown.expect(BuildException.class);
+ thrown.expectMessage("Exception raised inside called program");
+@@ -267,13 +268,13 @@ public class JavaTest {
+ buildRule.executeTarget("testExceptingFoeFork");
+ }
+
+- @Test
++ @Test @Ignore
+ public void testResultPropertyZero() {
+ buildRule.executeTarget("testResultPropertyZero");
+ assertEquals("0", buildRule.getProject().getProperty("exitcode"));
+ }
+
+- @Test
++ @Test @Ignore
+ public void testResultPropertyNonZero() {
+ buildRule.executeTarget("testResultPropertyNonZero");
+ assertEquals("2", buildRule.getProject().getProperty("exitcode"));
+@@ -301,12 +302,12 @@ public class JavaTest {
+ buildRule.executeTarget("testRunFailWithFailOnError");
+ }
+
+- @Test
++ @Test @Ignore
+ public void testRunSuccessWithFailOnError() {
+ buildRule.executeTarget("testRunSuccessWithFailOnError");
+ }
+
+- @Test
++ @Test @Ignore
+ public void testSpawn() throws InterruptedException {
+ File logFile = FILE_UTILS.createTempFile("spawn", "log",
+ new File(buildRule.getProject().getProperty("output")), false, false);
+@@ -326,27 +327,27 @@ public class JavaTest {
+ assertTrue("log file exists", logFile.exists());
+ }
+
+- @Test
++ @Test @Ignore
+ public void testRedirect1() {
+ buildRule.executeTarget("redirect1");
+ }
+
+- @Test
++ @Test @Ignore
+ public void testRedirect2() {
+ buildRule.executeTarget("redirect2");
+ }
+
+- @Test
++ @Test @Ignore
+ public void testRedirect3() {
+ buildRule.executeTarget("redirect3");
+ }
+
+- @Test
++ @Test @Ignore
+ public void testRedirector1() {
+ buildRule.executeTarget("redirector1");
+ }
+
+- @Test
++ @Test @Ignore
+ public void testRedirector2() {
+ buildRule.executeTarget("redirector2");
+ }
+@@ -397,7 +398,7 @@ public class JavaTest {
+ assertEquals("foo", buildRule.getProject().getProperty("input.value"));
+ }
+
+- @Test
++ @Test @Ignore
+ public void testFlushedInput() throws Exception {
+ final PipedOutputStream out = new PipedOutputStream();
+ final PipedInputStream in = new PipedInputStream(out);
diff --git a/dev-java/ant/files/ant-1.10.14-LinkTest.patch b/dev-java/ant/files/ant-1.10.14-LinkTest.patch
new file mode 100644
index 000000000000..23075707fb9b
--- /dev/null
+++ b/dev-java/ant/files/ant-1.10.14-LinkTest.patch
@@ -0,0 +1,87 @@
+There were 4 failures:
+1) testLocalesInAttributeAndNested(org.apache.tools.ant.taskdefs.modules.LinkTest)
+java.lang.AssertionError: Verifying that image has access to locales specified during linking. expected:<0> but was:<1>
+ at org.junit.Assert.fail(Assert.java:89)
+ at org.junit.Assert.failNotEquals(Assert.java:835)
+ at org.junit.Assert.assertEquals(Assert.java:647)
+ at org.apache.tools.ant.taskdefs.modules.LinkTest.verifyLocales(LinkTest.java:289)
+ at org.apache.tools.ant.taskdefs.modules.LinkTest.testLocalesInAttributeAndNested(LinkTest.java:330)
+2) testLocales(org.apache.tools.ant.taskdefs.modules.LinkTest)
+java.lang.AssertionError: Verifying that image has access to locales specified during linking. expected:<0> but was:<1>
+ at org.junit.Assert.fail(Assert.java:89)
+ at org.junit.Assert.failNotEquals(Assert.java:835)
+ at org.junit.Assert.assertEquals(Assert.java:647)
+ at org.apache.tools.ant.taskdefs.modules.LinkTest.verifyLocales(LinkTest.java:289)
+ at org.apache.tools.ant.taskdefs.modules.LinkTest.testLocales(LinkTest.java:306)
+3) testNestedLocales(org.apache.tools.ant.taskdefs.modules.LinkTest)
+java.lang.AssertionError: Verifying that image has access to locales specified during linking. expected:<0> but was:<1>
+ at org.junit.Assert.fail(Assert.java:89)
+ at org.junit.Assert.failNotEquals(Assert.java:835)
+ at org.junit.Assert.assertEquals(Assert.java:647)
+ at org.apache.tools.ant.taskdefs.modules.LinkTest.verifyLocales(LinkTest.java:289)
+ at org.apache.tools.ant.taskdefs.modules.LinkTest.testNestedLocales(LinkTest.java:315)
+4) testIgnoreSigning(org.apache.tools.ant.taskdefs.modules.LinkTest)
+/var/tmp/portage/dev-java/ant-core-1.10.14/work/apache-ant-1.10.14/src/etc/testcases/taskdefs/link.xml:1119: exec returned: 1
+ at org.apache.tools.ant.taskdefs.ExecTask.runExecute(ExecTask.java:675)
+ at org.apache.tools.ant.taskdefs.ExecTask.runExec(ExecTask.java:699)
+ at org.apache.tools.ant.taskdefs.ExecTask.execute(ExecTask.java:527)
+ at org.apache.tools.ant.UnknownElement.execute(UnknownElement.java:299)
+ at java.base/jdk.internal.reflect.DirectMethodHandleAccessor.invoke(DirectMethodHandleAccessor.java:103)
+ at java.base/java.lang.reflect.Method.invoke(Method.java:580)
+ at org.apache.tools.ant.dispatch.DispatchUtils.execute(DispatchUtils.java:99)
+ at org.apache.tools.ant.Task.perform(Task.java:350)
+ at org.apache.tools.ant.Target.execute(Target.java:449)
+ at org.apache.tools.ant.Target.performTasks(Target.java:470)
+ at org.apache.tools.ant.Project.executeSortedTargets(Project.java:1401)
+ at org.apache.tools.ant.Project.executeTarget(Project.java:1374)
+ at org.apache.tools.ant.BuildFileRule.executeTarget(BuildFileRule.java:197)
+ at org.apache.tools.ant.taskdefs.modules.LinkTest.testIgnoreSigning(LinkTest.java:901)
+
+FAILURES!!!
+Tests run: 67, Failures: 4
+--- a/src/tests/junit/org/apache/tools/ant/taskdefs/modules/LinkTest.java
++++ b/src/tests/junit/org/apache/tools/ant/taskdefs/modules/LinkTest.java
+@@ -46,6 +46,7 @@ import org.junit.Assume;
+ import org.junit.Before;
+ import org.junit.Rule;
+ import org.junit.Test;
++import org.junit.Ignore;
+ import org.junit.rules.ExpectedException;
+
+ import org.apache.tools.ant.BuildException;
+@@ -297,7 +298,7 @@ public class LinkTest {
+ + "not specified during linking.", 0, exitCode);
+ }
+
+- @Test
++ @Test @Ignore
+ public void testLocales()
+ throws IOException,
+ InterruptedException {
+@@ -306,7 +307,7 @@ public class LinkTest {
+ verifyLocales();
+ }
+
+- @Test
++ @Test @Ignore
+ public void testNestedLocales()
+ throws IOException,
+ InterruptedException {
+@@ -321,7 +322,7 @@ public class LinkTest {
+ buildRule.executeTarget("locales-nested-missing-name");
+ }
+
+- @Test
++ @Test @Ignore
+ public void testLocalesInAttributeAndNested()
+ throws IOException,
+ InterruptedException {
+@@ -896,7 +897,7 @@ public class LinkTest {
+ 1, nonLinkCount);
+ }
+
+- @Test
++ @Test @Ignore
+ public void testIgnoreSigning() {
+ buildRule.executeTarget("ignoresigning");
+ verifyImageBuiltNormally();
diff --git a/dev-java/ant/files/ant-1.10.14-PathTest.patch b/dev-java/ant/files/ant-1.10.14-PathTest.patch
new file mode 100644
index 000000000000..022377ecc4d7
--- /dev/null
+++ b/dev-java/ant/files/ant-1.10.14-PathTest.patch
@@ -0,0 +1,30 @@
+There was 1 failure:
+1) testDirSet(org.apache.tools.ant.types.PathTest)
+java.lang.AssertionError: expected:<1> but was:<0>
+ at org.junit.Assert.fail(Assert.java:89)
+ at org.junit.Assert.failNotEquals(Assert.java:835)
+ at org.junit.Assert.assertEquals(Assert.java:647)
+ at org.junit.Assert.assertEquals(Assert.java:633)
+ at org.apache.tools.ant.types.PathTest.testDirSet(PathTest.java:585)
+
+FAILURES!!!
+Tests run: 33, Failures: 1
+--- a/src/tests/junit/org/apache/tools/ant/types/PathTest.java
++++ b/src/tests/junit/org/apache/tools/ant/types/PathTest.java
+@@ -29,6 +29,7 @@ import org.apache.tools.ant.taskdefs.condition.Os;
+ import org.junit.Before;
+ import org.junit.Rule;
+ import org.junit.Test;
++import org.junit.Ignore;
+ import org.junit.rules.ExpectedException;
+
+ import static org.hamcrest.Matchers.endsWith;
+@@ -570,7 +571,7 @@ public class PathTest {
+ assertEquals(project.resolveFile("build.xml").getAbsolutePath(), l[0]);
+ }
+
+- @Test
++ @Test @Ignore
+ public void testDirSet() {
+ DirSet d = new DirSet();
+ d.setProject(project);
diff --git a/dev-java/ant/metadata.xml b/dev-java/ant/metadata.xml
index 219a679d237b..fbae5fba582e 100644
--- a/dev-java/ant/metadata.xml
+++ b/dev-java/ant/metadata.xml
@@ -13,6 +13,7 @@
<flag name="commonslogging">Enable commons-logging Ant tasks</flag>
<flag name="commonsnet">Enable commons-net Ant tasks</flag>
<flag name="jai">Enable JAI (Java Imaging) Ant task</flag>
+ <flag name="jakartamail">Enable Jakartamail Ant task</flag>
<flag name="javamail">Enable JavaMail Ant task</flag>
<flag name="jdepend">Enable Jdepend Ant tasks</flag>
<flag name="jmf">Enable JMF (Java Media Framework) Ant tasks</flag>
@@ -26,6 +27,12 @@
<flag name="resolver">Enable Apache Resolver Ant tasks</flag>
<flag name="swing">Enable Swing Ant tasks</flag>
<flag name="testutil">Enable optional test util classes</flag>
+ <flag name="xalan">Enable Apache Xalan2 Ant tasks</flag>
<flag name="xz">Enable XZ Ant tasks</flag>
</use>
+ <upstream>
+ <bugs-to>https://bz.apache.org/bugzilla/enter_bug.cgi?product=Ant</bugs-to>
+ <doc>https://ant.apache.org/manual/</doc>
+ <remote-id type="github">apache/ant</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-java/antunit/Manifest b/dev-java/antunit/Manifest
new file mode 100644
index 000000000000..765c72b8f4c9
--- /dev/null
+++ b/dev-java/antunit/Manifest
@@ -0,0 +1,2 @@
+DIST apache-ant-antunit-1.4.1-src.tar.bz2 125017 BLAKE2B 2c092d22eaf716c52bd6c6ce43d1e33c1f599621ee383303c97553f9dc2d0708cf58420338184f8877cd2b0fc053c9742b04cd869583db7b2fc2dedfb4a2dddd SHA512 7c59f0e918f5ec8edbf10bdbcdca1c9bd2ba2a7b27ade69aa4ca92c0c058c434be517799ce795309c0f1c00726a1c77650101b0d1cbe189db5379b15d29ad305
+DIST apache-ant-antunit-1.4.1-src.tar.bz2.asc 224 BLAKE2B c56e3d8005b1a39e42b85fad3c542aa4dd894d9e6cc61a8ea34bce33a8fb3f56d142cb77372fd4d664d46427365d24078b7429480f689245eb31d771c525f90e SHA512 3ad2cca4240e2714d7c435828b3a3d3cbe1e57647400237ce2a96a714d877605199ccf54a2266ff35081ed9f3e23ca46306b30293c1981e55ccbbc61591ad760
diff --git a/dev-java/antunit/antunit-1.4.1-r1.ebuild b/dev-java/antunit/antunit-1.4.1-r1.ebuild
new file mode 100644
index 000000000000..e859fb18c06b
--- /dev/null
+++ b/dev-java/antunit/antunit-1.4.1-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.apache.ant:ant-antunit:${PV}"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple verify-sig
+
+DESCRIPTION="An Antlib that provides a test framework for Apache Ant tasks and types"
+HOMEPAGE="https://ant.apache.org/antlibs/antunit/"
+SRC_URI="mirror://apache/ant/antlibs/${PN}/source/apache-ant-${P}-src.tar.bz2
+ verify-sig? ( https://downloads.apache.org/ant/antlibs/antunit/source/apache-ant-${P}-src.tar.bz2.asc )"
+S="${WORKDIR}/apache-ant-${P}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 ~x86"
+
+VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/ant.apache.org.asc"
+BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-ant )"
+# reset to ant-core:0 when ready
+CP_DEPEND="
+ >=dev-java/ant-1.10.14:0
+ dev-java/junit:4
+"
+DEPEND="${CP_DEPEND}
+ >=virtual/jdk-1.8:*
+ test? ( >=dev-java/ant-1.10.14:0[junit,testutil] )
+"
+RDEPEND="${CP_DEPEND}
+ >=virtual/jre-1.8:*"
+
+DOCS=( NOTICE README WHATSNEW )
+HTML_DOCS=( README.html )
+PATCHES=(
+ # Some tests expect classes in "build" instead in "target" directory.
+ "${FILESDIR}/antunit-1.4.1-gentoo.patch"
+)
+
+JAVA_RESOURCE_DIRS="res"
+JAVA_SRC_DIR="src/main"
+JAVA_TEST_GENTOO_CLASSPATH="ant"
+JAVA_TEST_SRC_DIR="src/tests/junit"
+
+src_prepare() {
+ default #780585
+ java-pkg-2_src_prepare
+ # java-pkg-simple.eclass wants resources in JAVA_RESOURCE_DIRS
+ mkdir -p "res/org/apache/ant/antunit" || die
+ cp {src/main,res}/org/apache/ant/antunit/antlib.xml || die
+}
diff --git a/dev-java/antunit/files/antunit-1.4.1-gentoo.patch b/dev-java/antunit/files/antunit-1.4.1-gentoo.patch
new file mode 100644
index 000000000000..7aeccf662bc7
--- /dev/null
+++ b/dev-java/antunit/files/antunit-1.4.1-gentoo.patch
@@ -0,0 +1,62 @@
+--- a/src/etc/testcases/antunit/java-io.xml
++++ b/src/etc/testcases/antunit/java-io.xml
+@@ -30,7 +30,7 @@ under the License.
+ <target name="testTaskHandlingOutput">
+ <java classname="org.apache.ant.antunit.AntUnitTest$HelloWorld"
+ outputproperty="propertyToSet"
+- classpath="build/test-classes"
++ classpath="target/test-classes"
+ failonerror="true"
+ />
+ <au:assertEquals expected="HelloWorld" actual="${propertyToSet}" />
+--- a/src/etc/testcases/assert.xml
++++ b/src/etc/testcases/assert.xml
+@@ -156,28 +156,28 @@ under the License.
+ <au:assertDestIsUptodate
+ src="../../main/org/apache/ant/antunit/AssertTask.java"
+
+- dest="../../../build/classes/org/apache/ant/antunit/AssertTask.class"/>
++ dest="../../../target/classes/org/apache/ant/antunit/AssertTask.class"/>
+ </target>
+
+ <target name="assertDestIsUptodateFail">
+ <au:assertDestIsUptodate
+ dest="../../main/org/apache/ant/antunit/AssertTask.java"
+
+- src="../../../build/classes/org/apache/ant/antunit/AssertTask.class"/>
++ src="../../../target/classes/org/apache/ant/antunit/AssertTask.class"/>
+ </target>
+
+ <target name="assertDestIsOutofdatePass">
+ <au:assertDestIsOutofdate
+ dest="../../main/org/apache/ant/antunit/AssertTask.java"
+
+- src="../../../build/classes/org/apache/ant/antunit/AssertTask.class"/>
++ src="../../../target/classes/org/apache/ant/antunit/AssertTask.class"/>
+ </target>
+
+ <target name="assertDestIsOutofdateFail">
+ <au:assertDestIsOutofdate
+ src="../../main/org/apache/ant/antunit/AssertTask.java"
+
+- dest="../../../build/classes/org/apache/ant/antunit/AssertTask.class"/>
++ dest="../../../target/classes/org/apache/ant/antunit/AssertTask.class"/>
+ </target>
+
+ <target name="assertFilesMatchPass">
+--- a/src/tests/junit/org/apache/ant/antunit/AssertTest.java
++++ b/src/tests/junit/org/apache/ant/antunit/AssertTest.java
+@@ -137,11 +137,11 @@ public class AssertTest extends BuildFileTest {
+ }
+ public void testDestIsUptodateFail() {
+ testFail("assertDestIsUptodateFail",
+- "Expected '../../main/org/apache/ant/antunit/AssertTask.java' to be more recent than '../../../build/classes/org/apache/ant/antunit/AssertTask.class'");
++ "Expected '../../main/org/apache/ant/antunit/AssertTask.java' to be more recent than '../../../target/classes/org/apache/ant/antunit/AssertTask.class'");
+ }
+ public void testDestIsOutofdateFail() {
+ testFail("assertDestIsOutofdateFail",
+- "Expected '../../main/org/apache/ant/antunit/AssertTask.java' to be more recent than '../../../build/classes/org/apache/ant/antunit/AssertTask.class'");
++ "Expected '../../main/org/apache/ant/antunit/AssertTask.java' to be more recent than '../../../target/classes/org/apache/ant/antunit/AssertTask.class'");
+ }
+ public void testFilesMatchFail() {
+ testFail("assertFilesMatchFail",
diff --git a/dev-java/antunit/metadata.xml b/dev-java/antunit/metadata.xml
new file mode 100644
index 000000000000..8c6f551aec20
--- /dev/null
+++ b/dev-java/antunit/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>java@gentoo.org</email>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">apache/ant-antlibs-antunit</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-java/apache-rat-core/Manifest b/dev-java/apache-rat-core/Manifest
deleted file mode 100644
index bb5c63616d58..000000000000
--- a/dev-java/apache-rat-core/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST apache-rat-0.13-src.tar.bz2 197443 BLAKE2B 5880894bf48e62c97fefebe5672964a78016ba045ca6a13a9b100c1a15cf0a6933edc22c41cb3552f30ebea0486fd6b415f60902f0af7d96663611bfef1a1781 SHA512 564cb2b0f21c98ca5c10566417c0d2732cd177efb68607589e43bcf64eeedee7a570dbea7ef4d6237f6438ecb40d382cb96bd0d6f60c1d1ba1f76778f15ee26a
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
deleted file mode 100644
index 5e26db26f1a7..000000000000
--- a/dev-java/apache-rat-core/apache-rat-core-0.13.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 apache-rat-core/pom.xml --download-uri https://mirrors.nav.ro/apache//creadur/apache-rat-0.13/apache-rat-0.13-src.tar.bz2 --slot 0 --keywords "~amd64 ~x86" --ebuild apache-rat-core-0.13.ebuild
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.apache.rat:apache-rat-core:0.13"
-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"
-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"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-# Common dependencies
-# POM: ${PN}/pom.xml
-# commons-cli:commons-cli:1.3.1 -> >=dev-java/commons-cli-1.3.1:1
-# commons-collections:commons-collections:3.2.2 -> !!!suitble-mavenVersion-not-found!!!
-# commons-io:commons-io:2.2 -> >=dev-java/commons-io-2.8.0:1
-# commons-lang:commons-lang:2.6 -> >=dev-java/commons-lang-2.6:2.1
-# org.apache.commons:commons-compress:1.11 -> >=dev-java/commons-compress-1.20:0
-# org.apache.rat:apache-rat-api:0.13 -> >=dev-java/apache-rat-api-0.13:0
-
-CDEPEND="
- >=dev-java/commons-cli-1.3.1:1
- >=dev-java/commons-compress-1.20:0
- dev-java/commons-collections:0
- >=dev-java/commons-io-2.8.0:1
- dev-java/commons-lang:3.6
-"
-
-DEPEND="
- >=virtual/jdk-1.8:*
- ${CDEPEND}
-"
-
-RDEPEND="
- >=virtual/jre-1.8:*
- ${CDEPEND}"
-
-S="${WORKDIR}/apache-rat-${PV}/${PN}"
-
-PATCHES=(
- "${FILESDIR}/${P}-commons-lang3.patch"
-)
-
-JAVA_GENTOO_CLASSPATH="commons-cli-1,commons-collections,commons-io-1,commons-lang-3.6,commons-compress"
-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_prepare() {
- default
- java-utils-2_src_prepare
-}
diff --git a/dev-java/apache-rat-core/files/apache-rat-core-0.13-commons-lang3.patch b/dev-java/apache-rat-core/files/apache-rat-core-0.13-commons-lang3.patch
deleted file mode 100644
index 77a90207cbcf..000000000000
--- a/dev-java/apache-rat-core/files/apache-rat-core-0.13-commons-lang3.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff --git a/src/main/java/org/apache/rat/Report.java b/src/main/java/org/apache/rat/Report.java
-index de4a2e7..ecb8ddf 100644
---- a/src/main/java/org/apache/rat/Report.java
-+++ b/src/main/java/org/apache/rat/Report.java
-@@ -21,7 +21,7 @@ package org.apache.rat;
- import org.apache.commons.cli.*;
- import org.apache.commons.io.FileUtils;
- import org.apache.commons.io.filefilter.*;
--import org.apache.commons.lang.StringUtils;
-+import org.apache.commons.lang3.StringUtils;
- import org.apache.rat.api.RatException;
- import org.apache.rat.report.IReportable;
- import org.apache.rat.report.RatReport;
-diff --git a/src/main/java/org/apache/rat/document/impl/guesser/GuessUtils.java b/src/main/java/org/apache/rat/document/impl/guesser/GuessUtils.java
-index d56a672..d6b7f4d 100644
---- a/src/main/java/org/apache/rat/document/impl/guesser/GuessUtils.java
-+++ b/src/main/java/org/apache/rat/document/impl/guesser/GuessUtils.java
-@@ -20,7 +20,7 @@ package org.apache.rat.document.impl.guesser;
-
- import java.util.Locale;
-
--import org.apache.commons.lang.StringUtils;
-+import org.apache.commons.lang3.StringUtils;
-
- public class GuessUtils {
-
-diff --git a/src/main/java/org/apache/rat/report/claim/impl/xml/SimpleXmlClaimReporter.java b/src/main/java/org/apache/rat/report/claim/impl/xml/SimpleXmlClaimReporter.java
-index 02e21d6..5001dff 100644
---- a/src/main/java/org/apache/rat/report/claim/impl/xml/SimpleXmlClaimReporter.java
-+++ b/src/main/java/org/apache/rat/report/claim/impl/xml/SimpleXmlClaimReporter.java
-@@ -18,7 +18,7 @@
- */
- package org.apache.rat.report.claim.impl.xml;
-
--import org.apache.commons.lang.time.DateFormatUtils;
-+import org.apache.commons.lang3.time.DateFormatUtils;
- import org.apache.rat.api.Document;
- import org.apache.rat.api.MetaData;
- import org.apache.rat.api.RatException;
diff --git a/dev-java/apache-rat-core/metadata.xml b/dev-java/apache-rat-core/metadata.xml
deleted file mode 100644
index 6ef2d50cf07e..000000000000
--- a/dev-java/apache-rat-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/apache-rat-tasks/Manifest b/dev-java/apache-rat-tasks/Manifest
deleted file mode 100644
index bb5c63616d58..000000000000
--- a/dev-java/apache-rat-tasks/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST apache-rat-0.13-src.tar.bz2 197443 BLAKE2B 5880894bf48e62c97fefebe5672964a78016ba045ca6a13a9b100c1a15cf0a6933edc22c41cb3552f30ebea0486fd6b415f60902f0af7d96663611bfef1a1781 SHA512 564cb2b0f21c98ca5c10566417c0d2732cd177efb68607589e43bcf64eeedee7a570dbea7ef4d6237f6438ecb40d382cb96bd0d6f60c1d1ba1f76778f15ee26a
diff --git a/dev-java/apache-rat-tasks/apache-rat-tasks-0.13.ebuild b/dev-java/apache-rat-tasks/apache-rat-tasks-0.13.ebuild
deleted file mode 100644
index cdc925c1a2f0..000000000000
--- a/dev-java/apache-rat-tasks/apache-rat-tasks-0.13.ebuild
+++ /dev/null
@@ -1,71 +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 apache-rat-tasks/pom.xml --download-uri https://mirrors.nav.ro/apache//creadur/apache-rat-0.13/apache-rat-0.13-src.tar.bz2 --slot 0 --keywords "~amd64 ~x86" --ebuild apache-rat-tasks-0.13.ebuild
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.apache.rat:apache-rat-tasks:0.13"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="A plugin for Apache Ant that runs Apache Rat to audit the source"
-HOMEPAGE="https://creadur.apache.org/rat/apache-rat-tasks/"
-SRC_URI="mirror://apache//creadur/apache-rat-${PV}/apache-rat-${PV}-src.tar.bz2"
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-# Common dependencies
-# POM: ${PN}/pom.xml
-# org.apache.rat:apache-rat-core:0.13 -> >=dev-java/apache-rat-core-0.13:0
-
-CDEPEND="
- dev-java/ant-core:0
- ~dev-java/apache-rat-core-${PV}:0
-"
-
-# Compile dependencies
-# POM: ${PN}/pom.xml
-# org.apache.ant:ant:1.9.12 -> !!!groupId-not-found!!!
-# POM: ${PN}/pom.xml
-# test? junit:junit:4.12 -> >=dev-java/junit-4.12:4
-# test? org.apache.ant:ant-antunit:1.4 -> !!!groupId-not-found!!!
-# test? org.apache.ant:ant-testutil:1.9.12 -> !!!groupId-not-found!!!
-
-DEPEND="
- >=virtual/jdk-1.8:*
- ${CDEPEND}
- test? (
- dev-java/ant-testutil:0
- )"
-
-RDEPEND="
- >=virtual/jre-1.8:*
- ${CDEPEND}"
-
-S="${WORKDIR}/apache-rat-${PV}/${PN}"
-
-PATCHES=(
- "${FILESDIR}/${P}-fix-tests.patch"
-)
-
-JAVA_GENTOO_CLASSPATH="ant-core,apache-rat-core"
-JAVA_SRC_DIR="src/main/java"
-JAVA_RESOURCE_DIRS=(
- "src/main/resources"
-)
-
-JAVA_TEST_GENTOO_CLASSPATH="ant-testutil,junit-4"
-JAVA_TEST_SRC_DIR="src/test/java"
-JAVA_TEST_RESOURCE_DIRS=(
- "src/test/resources"
-)
-
-src_prepare() {
- default
- java-utils-2_src_prepare
-}
diff --git a/dev-java/apache-rat-tasks/files/apache-rat-tasks-0.13-fix-tests.patch b/dev-java/apache-rat-tasks/files/apache-rat-tasks-0.13-fix-tests.patch
deleted file mode 100644
index 536b68371c3a..000000000000
--- a/dev-java/apache-rat-tasks/files/apache-rat-tasks-0.13-fix-tests.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-diff --git a/src/test/resources/antunit/report-junit.xml b/src/test/resources/antunit/report-junit.xml
-index 54b0c9c..d12fee4 100644
---- a/src/test/resources/antunit/report-junit.xml
-+++ b/src/test/resources/antunit/report-junit.xml
-@@ -48,7 +48,7 @@
- <target name="all"/>
-
- <target name="testWithReportSentToFile">
-- <property name="report.file" location="${output.dir}/selftest.report"/>
-+ <property name="report.file" location="../../../../target/anttasks/selftest.report"/>
- <rat:report reportFile="${report.file}">
- <file file="${ant.file}"/>
- </rat:report>
-@@ -88,22 +88,22 @@
- <target name="testAddLicenseHeaders">
- <delete dir="${output.dir}/it-sources"/>
- <mkdir dir="${output.dir}/it-sources"/>
-- <copy file="src/test/resources/antunit/index.apt" tofile="${output.dir}/it-sources/index.apt"/>
-+ <copy file="index.apt" tofile="../../../../target/anttasks/it-sources/index.apt"/>
- <rat:report addLicenseHeaders="true">
-- <file file="${output.dir}/it-sources/index.apt"/>
-+ <file file="../../../../target/anttasks/it-sources/index.apt"/>
- </rat:report>
- </target>
-
- <target name="testISO88591">
- <rat:report format="xml">
-- <file file="src/test/resources/org/example/iso-8859-1.html"/>
-+ <file file="../../../../src/test/resources/org/example/iso-8859-1.html"/>
- </rat:report>
- </target>
-
- <target name="testISO88591WithReportFile">
-- <property name="report.file" location="${output.dir}/selftest.report"/>
-+ <property name="report.file" location="../../../../target/anttasks/selftest.report"/>
- <rat:report reportFile="${report.file}" format="xml">
-- <file file="src/test/resources/org/example/iso-8859-1.html"/>
-+ <file file="../../../../src/test/resources/org/example/iso-8859-1.html"/>
- </rat:report>
- </target>
- </project>
diff --git a/dev-java/apache-rat-tasks/metadata.xml b/dev-java/apache-rat-tasks/metadata.xml
deleted file mode 100644
index 6ef2d50cf07e..000000000000
--- a/dev-java/apache-rat-tasks/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/apache-rat/apache-rat-0.15-r1.ebuild b/dev-java/apache-rat/apache-rat-0.15-r1.ebuild
new file mode 100644
index 000000000000..a4c08c2c66fe
--- /dev/null
+++ b/dev-java/apache-rat/apache-rat-0.15-r1.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# javadoc is broken for java 17, see https://bugs.gentoo.org/914458
+JAVA_PKG_IUSE="doc source test"
+MAVEN_PROVIDES="
+ org.apache.rat:apache-rat-core:${PV}
+ org.apache.rat:apache-rat-tasks:${PV}
+"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple verify-sig
+
+DESCRIPTION="Apache Rat is a release audit tool, focused on licenses"
+HOMEPAGE="https://creadur.apache.org/rat/"
+SRC_URI="mirror://apache//creadur/${P}/${P}-src.tar.bz2
+ verify-sig? ( https://archive.apache.org/dist/creadur/${P}/${P}-src.tar.bz2.asc )"
+S="${WORKDIR}/${P}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~x86"
+
+CP_DEPEND="
+ >=dev-java/ant-1.10.14:0
+ dev-java/commons-cli:1
+ dev-java/commons-collections:4
+ dev-java/commons-compress:0
+ dev-java/commons-io:1
+ dev-java/commons-lang:3.6
+"
+
+DEPEND="${CP_DEPEND}
+ >=virtual/jdk-1.8:*
+ test? ( >=dev-java/ant-1.10.14:0[junit,testutil] )"
+RDEPEND="${CP_DEPEND}
+ >=virtual/jre-1.8:*"
+
+BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-creadur )"
+VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/creadur.apache.org.asc"
+
+DOCS=( NOTICE README.md README.txt RELEASE-NOTES.txt RELEASE_NOTES.txt )
+
+PATCHES=( "${FILESDIR}/apache-rat-0.15-fix-tests.patch" )
+
+JAVADOC_SRC_DIRS=(
+ "${PN}-core/src/main/java"
+ "${PN}-tasks/src/main/java"
+)
+
+src_prepare() {
+ default #780585
+ java-pkg-2_src_prepare
+}
+
+src_compile() {
+ einfo "Compiling apache-rat-core.jar"
+ JAVA_JAR_FILENAME="${PN}-core.jar"
+ JAVA_RESOURCE_DIRS="${PN}-core/src/main/resources"
+ JAVA_SRC_DIR="${PN}-core/src/main/java"
+ java-pkg-simple_src_compile
+ JAVA_GENTOO_CLASSPATH_EXTRA+=":${PN}-core.jar"
+ rm -r target || die
+
+ einfo "Compiling apache-rat-tasks.jar"
+ JAVA_JAR_FILENAME="${PN}-tasks.jar"
+ JAVA_RESOURCE_DIRS="${PN}-tasks/src/main/resources"
+ JAVA_SRC_DIR="${PN}-tasks/src/main/java"
+ java-pkg-simple_src_compile
+ JAVA_GENTOO_CLASSPATH_EXTRA+=":${PN}-tasks.jar"
+ rm -r target || die
+
+ # javadoc is broken for java 17, see https://bugs.gentoo.org/914458
+ JAVADOC_CLASSPATH="${JAVA_GENTOO_CLASSPATH}"
+ use doc && ejavadoc
+}
+
+src_test() {
+ JAVA_TEST_GENTOO_CLASSPATH="ant,junit-4"
+
+ einfo "Testing apache-rat-core"
+ cp -r "${PN}"-core/src/{main,test} src || die
+ JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+ JAVA_TEST_SRC_DIR="src/test/java"
+ java-pkg-simple_src_test
+ rm -r src/{main,test} || die
+
+ einfo "Testing apache-rat-tasks"
+ cp -r "${PN}"-tasks/src/{main,test} src || die
+ mkdir -p target/it-sources || die
+ JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+ JAVA_TEST_SRC_DIR="src/test/java"
+ java-pkg-simple_src_test
+}
+
+src_install() {
+ java-pkg_dojar "${PN}-core.jar"
+ java-pkg_dojar "${PN}-tasks.jar"
+ java-pkg_dolauncher "${PN}" --main org.apache.rat.Report
+
+ use doc && java-pkg_dojavadoc target/api
+
+ if use source; then
+ java-pkg_dosrc "${PN}-core/src/main/java/*"
+ java-pkg_dosrc "${PN}-tasks/src/main/java/*"
+ fi
+}
diff --git a/dev-java/aspectj/aspectj-1.9.7.ebuild b/dev-java/aspectj/aspectj-1.9.7-r1.ebuild
index 4f7ef2231ed2..e3b7c408c182 100644
--- a/dev-java/aspectj/aspectj-1.9.7.ebuild
+++ b/dev-java/aspectj/aspectj-1.9.7-r1.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
JAVA_PKG_IUSE="doc source"
inherit java-pkg-2 java-pkg-simple
DESCRIPTION="A seamless aspect-oriented extension to the Java programming language"
HOMEPAGE="https://eclipse.org/aspectj/"
-SRC_URI="https://github.com/eclipse/org.aspectj/archive/refs/tags/V${PV//./_}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/eclipse-aspectj/aspectj/archive/V${PV//./_}.tar.gz -> ${P}.tar.gz"
LICENSE="EPL-1.0"
SLOT="0"
@@ -16,7 +16,7 @@ KEYWORDS="amd64 x86"
CDEPEND="dev-java/asm:9
dev-java/commons-logging:0
- dev-java/ant-apache-regexp:0"
+ dev-java/jakarta-regexp:1.4"
DEPEND="${CDEPEND}
>=virtual/jdk-1.8:*"
RDEPEND="${CDEPEND}
@@ -26,7 +26,7 @@ BDEPEND="app-arch/zip"
S=${WORKDIR}/org.${P//./_}
JAVA_GENTOO_CLASSPATH_EXTRA="aspectjweaver.jar"
-JAVA_GENTOO_CLASSPATH="commons-logging,asm-9,ant-apache-regexp"
+JAVA_GENTOO_CLASSPATH="commons-logging,asm-9,jakarta-regexp-1.4"
JAVA_ENCODING="iso8859-1"
src_compile() {
diff --git a/dev-java/aspectj/metadata.xml b/dev-java/aspectj/metadata.xml
index 5c762e7860f2..32a6a916de1c 100644
--- a/dev-java/aspectj/metadata.xml
+++ b/dev-java/aspectj/metadata.xml
@@ -6,7 +6,7 @@
<name>Java</name>
</maintainer>
<upstream>
- <remote-id type="github">eclipse/org.aspectj</remote-id>
- <bugs-to>https://www.eclipse.org/aspectj/bugs.php</bugs-to>
+ <bugs-to>https://github.com/eclipse-aspectj/aspectj/issues</bugs-to>
+ <remote-id type="github">eclipse-aspectj/aspectj</remote-id>
</upstream>
</pkgmetadata>
diff --git a/dev-java/auto-service-annotations/Manifest b/dev-java/auto-service-annotations/Manifest
new file mode 100644
index 000000000000..2ef345ae2602
--- /dev/null
+++ b/dev-java/auto-service-annotations/Manifest
@@ -0,0 +1 @@
+DIST auto-service-1.1.1.tar.gz 422101 BLAKE2B 9050607917f6637e77d234074787662b32f0e245a8e61b233cb664834e50ad41523bf89869e7e7b44a9e77db22c99481dce6b7c8051934b4e159fab37f060b36 SHA512 4e18c422103d6857724d5fcb28fc2f12cdaeacd7a47ebdc1982e9cd2e9d83a90e571c5e14332e3fcaac3a9e1ecf947f0e9e89a87c0c3bb1dc2e401b1a76ca044
diff --git a/dev-java/auto-service-annotations/auto-service-annotations-1.1.1.ebuild b/dev-java/auto-service-annotations/auto-service-annotations-1.1.1.ebuild
new file mode 100644
index 000000000000..0ae78daf656a
--- /dev/null
+++ b/dev-java/auto-service-annotations/auto-service-annotations-1.1.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="com.google.auto.service:auto-service-annotations:${PV}"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Provider-configuration files for ServiceLoader"
+HOMEPAGE="https://github.com/google/auto/"
+SRC_URI="https://github.com/google/auto/archive/auto-service-${PV}.tar.gz"
+S="${WORKDIR}/auto-auto-service-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
+
+JAVA_AUTOMATIC_MODULE_NAME="com.google.auto.service"
+JAVA_SRC_DIR="service/annotations/src/main/java"
diff --git a/dev-java/auto-service-annotations/metadata.xml b/dev-java/auto-service-annotations/metadata.xml
new file mode 100644
index 000000000000..5b0a6ef06e06
--- /dev/null
+++ b/dev-java/auto-service-annotations/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>java@gentoo.org</email>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">google/auto</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-java/batik/Manifest b/dev-java/batik/Manifest
index 883b9e84cf5b..38cde9303492 100644
--- a/dev-java/batik/Manifest
+++ b/dev-java/batik/Manifest
@@ -1,4 +1,2 @@
-DIST batik-src-1.16.tar.gz 13495722 BLAKE2B 041442b5485588a23b6e335cc46630b3c73fb8a36157e8bc77baa7b399bf7986549039f27e89727ebc98b8492095b957c8c6deb12b232a39784844e4c5edf6ab SHA512 024ab7a204d00b6c855e26c62a326dfcde5fb486a7635890c6fcb37d421c7195ae04b3d292daabc0fcb6564f55bfa93d6fef15cf4c2dad77e569ca17d1eeb250
-DIST batik-src-1.16.tar.gz.asc 833 BLAKE2B fdcfb26b9cc0d4fb0c37ce42d65628629ab0c27257ebe07715d5b2786500515125a240957c9ba76333aa54320905273031354cf09ee29e3a79fc7529640ebf03 SHA512 7fc3450d2b4d19e03528707fc20d6e18af926938ad24ad7460cc1c423c6c40507059fff2e2921d82fc582a4b486a75141fb407d450b043e2cc5007e0c2d486ea
DIST batik-src-1.17.tar.gz 13578640 BLAKE2B c77f994674dd8e8054ad6f753e53304ce6daad9b9eadceef053ede0c746872528ecd1caa6e87064d41892fed0c39f07936779851777208229f817bf84cb529b2 SHA512 0879f298142630e96931f429ade5e7107d2d981c6c3a99b8f2ddca8e26ea4fde1b7c717d06412c57d64759bed6c5f2d056970d59e19e66caafb926cb30078516
DIST batik-src-1.17.tar.gz.asc 833 BLAKE2B 33836c8f0cbc878410ce8b2738dbbb4dc47d6067c5f58febb3460d836424b1c1d815f369bd7aeb15a8ed9371628e03731c1338aa6524c8a935c48b8092e3bb1e SHA512 513bd3d5c212ce4d98daa911f36e1b00e2f2b7a637e93ea116a2ebe848e20664d722ccf6c8928eac7170fa84d3b38eec86a71c8a0a7e21fd8622c8d475991c60
diff --git a/dev-java/batik/batik-1.16-r2.ebuild b/dev-java/batik/batik-1.17-r1.ebuild
index e86745d88df5..b389f8994bd7 100644
--- a/dev-java/batik/batik-1.16-r2.ebuild
+++ b/dev-java/batik/batik-1.17-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -229,7 +229,7 @@ src_install() {
_EOF_
java-pkg_register-environment-variable \
gjl_java_args \
- "-Djava.security.policy=file:${EPREFIX}${java_policy_file}"
+ "\$gjl_java_args -Djava.security.policy=file:${EPREFIX}${java_policy_file}"
if use doc; then
java-pkg_dojavadoc target/api
diff --git a/dev-java/batik/batik-1.17.ebuild b/dev-java/batik/batik-1.17.ebuild
deleted file mode 100644
index 62259c27b4a4..000000000000
--- a/dev-java/batik/batik-1.17.ebuild
+++ /dev/null
@@ -1,247 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.apache.xmlgraphics:batik:${PV}"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit desktop java-pkg-2 java-pkg-simple xdg-utils verify-sig
-
-DESCRIPTION="XML Graphics Batik"
-HOMEPAGE="https://xmlgraphics.apache.org/batik/"
-SRC_URI="mirror://apache/xmlgraphics/batik/source/batik-src-${PV}.tar.gz
- verify-sig? ( https://downloads.apache.org/xmlgraphics/batik/source/batik-src-${PV}.tar.gz.asc )"
-S="${WORKDIR}/batik-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="1.16"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-
-CP_DEPEND="
- dev-java/jacl:0
- dev-java/rhino:1.6
- dev-java/xalan:0
- dev-java/xml-commons-external:1.4
- dev-java/xmlgraphics-commons:2
-"
-
-DEPEND="
- ${CP_DEPEND}
- >=virtual/jdk-1.8:*
-"
-
-RDEPEND="
- ${CP_DEPEND}
- >=virtual/jre-1.8:*
-"
-
-BDEPEND="
- app-arch/zip
- verify-sig? ( sec-keys/openpgp-keys-apache-xmlgraphics-batik )
-"
-
-VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/xmlgraphics-batik.apache.org.asc"
-
-DOCS=( CHANGES NOTICE README )
-
-# Modules batik-rasterizer-ext and batik-squiggle-ext, upstream puts their jar files in the extensions
-# directory, see batik-extension/src/main/resources/org/apache/batik/extensions/README.txt
-# We comment them out but keep them in the mudules list for later.
-# The same for batik-test-old which depends on fop-transcoder-allinone which itself depends on batik.
-# We also don't build batik-shared-resources since we install those resources on global scope.
-# And we don't build batik-all. Instead we install the modules.
-# BATIK_MODULES is the "Reactor Build Order" extracted from the output of "mvn dependency:tree":
-# mvn -DskipTests dependency:tree \
-# | sed -n '/Reactor Build Order:/,/Building org/p' \
-# | cut -d':' -f2 | cut -d' ' -f1 | grep 'batik-' || die
-BATIK_MODULES=(
-# batik-shared-resources
- batik-constants
- batik-i18n
- batik-test
- batik-util
- batik-awt-util
- batik-css
- batik-ext
- batik-xml
- batik-dom
- batik-parser
- batik-svg-dom
- batik-anim
- batik-gvt
- batik-script
- batik-bridge
- batik-svggen
- batik-transcoder
- batik-codec
- batik-extension
- batik-gui-util
- batik-svgrasterizer
-# batik-rasterizer-ext
- batik-rasterizer
- batik-slideshow
- batik-swing
- batik-svgbrowser
-# batik-squiggle-ext
- batik-squiggle
- batik-svgpp
- batik-ttf2svg
-# batik-all
- batik-test-swing
- batik-test-svg
-# batik-test-old
-)
-
-src_prepare() {
- java-pkg_clean
- java-pkg-2_src_prepare
- # We drop support for jython due to bug #825486.
- rm batik-script/src/main/java/org/apache/batik/script/jpython/JPythonInterpreter.java || die
- rm batik-script/src/main/java/org/apache/batik/script/jpython/JPythonInterpreterFactory.java || die
-
- cat > "batik-squiggle-${SLOT}.desktop" <<-EOF || die
- [Desktop Entry]
- Name=Squiggle
- Comment=SVG browser
- Exec=batik-squiggle-${SLOT}
- Icon=init
- Terminal=false
- Type=Application
- Categories=Graphics;VectorGraphics;
- MimeType=image/svg+xml
- EOF
-}
-
-src_compile() {
- # We loop over the modules list and compile the jar files.
- local module
- for module in "${BATIK_MODULES[@]}"; do
- einfo "Compiling ${module}"
-
- JAVA_JAR_FILENAME="${module}.jar"
- JAVA_MAIN_CLASS=""
- JAVA_RESOURCE_DIRS=""
- JAVA_SRC_DIR=""
-
- # Not all of the modules have resources.
- if [[ -d "${module}/src/main/resources" ]]; then
- JAVA_RESOURCE_DIRS="${module}/src/main/resources"
- fi
-
- # Get Main-Class from the module's pom.xml
- JAVA_MAIN_CLASS=$( sed -n 's:.*<mainClass>\(.*\)</mainClass>:\1:p' "${module}/pom.xml" )
-
- # Some modules don't have source code.
- if [[ -d "${module}/src/main/java/org" ]]; then
- JAVA_SRC_DIR="${module}/src/main/java"
- java-pkg-simple_src_compile
- else
- # This case applies to batik-rasterizer.
- if [[ -d "${module}/src/main/resources/org" ]]; then
- jar -cfe "${module}.jar" "${JAVA_MAIN_CLASS}" -C "${module}/src/main/resources" . || die
- # Else for batik-squiggle (also batik-rasterizer-ext, batik-squiggle-ext)
- else
- # Create the JAR file (not possible without adding at least one file).
- jar -cfe "${module}.jar" "${JAVA_MAIN_CLASS}" -C . README || die
- zip -d "${module}.jar" "README" || die
- fi
- fi
-
- JAVA_GENTOO_CLASSPATH_EXTRA+=":${module}.jar"
-
- rm -fr target || die
- done
-
- if use doc; then
- JAVA_SRC_DIR=""
- JAVA_JAR_FILENAME="ignoreme.jar"
-
- for module in "${BATIK_MODULES[@]}"; do
- # Some modules don't have source code
- if [[ -d "${module}/src/main/java/org" ]]; then
- JAVA_SRC_DIR+=( "${module}/src/main/java" )
- fi
- done
-
- java-pkg-simple_src_compile
- fi
-}
-
-src_test() {
- JAVA_TEST_GENTOO_CLASSPATH="junit-4"
-
- for module in "${BATIK_MODULES[@]}"; do
- einfo "Testing ${module}"
-
- JAVA_TEST_SRC_DIR=""
- JAVA_TEST_RESOURCE_DIRS=""
- JAVA_TEST_RUN_ONLY=""
-
- if [[ -d "${module}/src/test/resources" ]]; then
- JAVA_TEST_RESOURCE_DIRS="${module}/src/test/resources"
- fi
-
- # https://github.com/apache/xmlgraphics-batik/blob/refs/tags/batik-1_14/batik-util/pom.xml#L74-L75
- if [[ "${module}" == batik-util ]]; then
- JAVA_TEST_RUN_ONLY="org.apache.batik.util.Base64TestCases"
- fi
-
- if [[ -d "${module}/src/test/java/org" ]]; then
- JAVA_TEST_SRC_DIR="${module}/src/test/java"
- java-pkg-simple_src_test
- fi
- done
-}
-
-src_install() {
- einstalldocs
- domenu "batik-squiggle-${SLOT}.desktop"
- newicon -s scalable \
- batik-svgbrowser/src/main/resources/org/apache/batik/apps/svgbrowser/resources/init.svg \
- squiggle-${SLOT}.svg
-
- for module in "${BATIK_MODULES[@]}"; do
- JAVA_MAIN_CLASS=$( sed -n 's:.*<mainClass>\(.*\)</mainClass>:\1:p' "${module}/pom.xml" )
-
- java-pkg_dojar "${module}.jar"
-
- # Add a launcher if the module has a MainClass.
- if [[ -n "${JAVA_MAIN_CLASS}" ]]; then
- java-pkg_dolauncher "${module}-${SLOT}" --main "${JAVA_MAIN_CLASS}"
- fi
-
- # Some modules don't have source code
- if [[ -d "${module}/src/main/java/org" ]]; then
- if use source; then
- java-pkg_dosrc "${module}/src/main/java/*"
- fi
- fi
- done
-
- local java_policy_file="${JAVA_PKG_SHAREPATH}/etc/${PN}.policy"
- insinto "$(dirname "${java_policy_file}")"
- newins - "$(basename "${java_policy_file}")" <<- _EOF_
- grant codeBase "file:${EPREFIX}${JAVA_PKG_JARDEST}/-" {
- permission java.security.AllPermission;
- };
- _EOF_
- java-pkg_register-environment-variable \
- gjl_java_args \
- "-Djava.security.policy=file:${EPREFIX}${java_policy_file}"
-
- if use doc; then
- java-pkg_dojavadoc target/api
- fi
-}
-
-pkg_postinst() {
- xdg_desktop_database_update
- xdg_icon_cache_update
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
- xdg_icon_cache_update
-}
diff --git a/dev-java/bcmail/Manifest b/dev-java/bcmail/Manifest
index 880e2012db6f..680d64e45a8b 100644
--- a/dev-java/bcmail/Manifest
+++ b/dev-java/bcmail/Manifest
@@ -1 +1 @@
-DIST bc-java-r1rv76.tar.gz 31256952 BLAKE2B b791ef3da7189bc6990935aaad7c331c1bf6a45af0cdfc72056ae0cf1723e57ce15a76060251f6de630b0729ffe22ba4718255c103a8ab66db61f2e46f1201c8 SHA512 7d408821408bbabd209d9507b061f3113822878c12b12a040c829f5a8c6bdf8450719aef60c423025824bec1fcb6c63d8478d1f84f3cb1d692fdbacde6d9ce6e
+DIST bc-java-r1rv77.tar.gz 31402744 BLAKE2B 1ca1e1dac1ed3d613ae66f08cd8a954e63d43a49ed402f5bd7c30cf1f0830ad29104aa91a9a0a3cbbb5ea750392bc285172a1ab38f2aba1600fa3ca4c469b4f5 SHA512 d75a0ce94bd006499eef9393491347ae70544643c93c2f7591df3ff0179bd477a5066891c7c3bdeb09bd693093c9dc7d29c48462a1d539e464cbf2ee9c1dfce4
diff --git a/dev-java/bcmail/bcmail-1.76.ebuild b/dev-java/bcmail/bcmail-1.77-r1.ebuild
index 478e8647dbd2..fc5a0ce57369 100644
--- a/dev-java/bcmail/bcmail-1.76.ebuild
+++ b/dev-java/bcmail/bcmail-1.77-r1.ebuild
@@ -1,17 +1,19 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.bouncycastle:bcmail-jdk18on:1.76"
+MAVEN_ID="org.bouncycastle:bcmail-jdk18on:${PV}"
JAVA_TESTING_FRAMEWORKS="junit-4"
inherit java-pkg-2 java-pkg-simple
DESCRIPTION="The Bouncy Castle Java S/MIME APIs for handling S/MIME protocols"
HOMEPAGE="https://www.bouncycastle.org/java.html"
-SRC_URI="https://github.com/bcgit/bc-java/archive/r${PV/./rv}.tar.gz -> bc-java-r${PV/./rv}.tar.gz"
+MY_PV="r${PV/./rv}"
+SRC_URI="https://github.com/bcgit/bc-java/archive/${MY_PV}.tar.gz -> bc-java-${MY_PV}.tar.gz"
+S="${WORKDIR}/bc-java-${MY_PV}/mail"
LICENSE="BSD"
SLOT="0"
@@ -21,10 +23,10 @@ CP_DEPEND="
~dev-java/bcpkix-${PV}:0
~dev-java/bcprov-${PV}:0
~dev-java/bcutil-${PV}:0
- dev-java/jakarta-activation:1
dev-java/javax-mail:0
"
DEPEND="${CP_DEPEND}
+ dev-java/jakarta-activation:1
>=virtual/jdk-11:*"
RDEPEND="${CP_DEPEND}
>=virtual/jre-1.8:*"
@@ -32,9 +34,8 @@ RDEPEND="${CP_DEPEND}
DOCS=( ../{README,SECURITY}.md )
HTML_DOCS=( ../{CONTRIBUTORS,index}.html )
-S="${WORKDIR}/bc-java-r${PV/./rv}/mail"
-
JAVA_AUTOMATIC_MODULE_NAME="org.bouncycastle.mail"
+JAVA_CLASSPATH_EXTRA="jakarta-activation-1"
JAVA_RESOURCE_DIRS="src/main/resources"
JAVA_SRC_DIR=(
"src/main/java"
@@ -47,7 +48,7 @@ JAVA_TEST_RUN_ONLY="org.bouncycastle.mail.smime.test.AllTests"
JAVA_TEST_SRC_DIR="src/test/java"
src_prepare() {
- default
+ java-pkg-2_src_prepare
java-pkg_clean ..
}
diff --git a/dev-java/bcpg/Manifest b/dev-java/bcpg/Manifest
index 880e2012db6f..680d64e45a8b 100644
--- a/dev-java/bcpg/Manifest
+++ b/dev-java/bcpg/Manifest
@@ -1 +1 @@
-DIST bc-java-r1rv76.tar.gz 31256952 BLAKE2B b791ef3da7189bc6990935aaad7c331c1bf6a45af0cdfc72056ae0cf1723e57ce15a76060251f6de630b0729ffe22ba4718255c103a8ab66db61f2e46f1201c8 SHA512 7d408821408bbabd209d9507b061f3113822878c12b12a040c829f5a8c6bdf8450719aef60c423025824bec1fcb6c63d8478d1f84f3cb1d692fdbacde6d9ce6e
+DIST bc-java-r1rv77.tar.gz 31402744 BLAKE2B 1ca1e1dac1ed3d613ae66f08cd8a954e63d43a49ed402f5bd7c30cf1f0830ad29104aa91a9a0a3cbbb5ea750392bc285172a1ab38f2aba1600fa3ca4c469b4f5 SHA512 d75a0ce94bd006499eef9393491347ae70544643c93c2f7591df3ff0179bd477a5066891c7c3bdeb09bd693093c9dc7d29c48462a1d539e464cbf2ee9c1dfce4
diff --git a/dev-java/bcpg/bcpg-1.76.ebuild b/dev-java/bcpg/bcpg-1.77.ebuild
index 343650de4d43..cc3e0343f4be 100644
--- a/dev-java/bcpg/bcpg-1.76.ebuild
+++ b/dev-java/bcpg/bcpg-1.77.ebuild
@@ -1,17 +1,19 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.bouncycastle:bcpg-jdk18on:1.76"
+MAVEN_ID="org.bouncycastle:bcpg-jdk18on:${PV}"
JAVA_TESTING_FRAMEWORKS="junit-4"
inherit java-pkg-2 java-pkg-simple
DESCRIPTION="Java cryptography APIs"
HOMEPAGE="https://www.bouncycastle.org/java.html"
-SRC_URI="https://github.com/bcgit/bc-java/archive/r${PV/./rv}.tar.gz -> bc-java-r${PV/./rv}.tar.gz"
+MY_PV="r${PV/./rv}"
+SRC_URI="https://github.com/bcgit/bc-java/archive/${MY_PV}.tar.gz -> bc-java-${MY_PV}.tar.gz"
+S="${WORKDIR}/bc-java-${MY_PV}/pg"
LICENSE="BSD"
SLOT="0"
@@ -26,8 +28,6 @@ RDEPEND="${CP_DEPEND}
DOCS=( ../{README,SECURITY}.md )
HTML_DOCS=( ../{CONTRIBUTORS,index}.html )
-S="${WORKDIR}/bc-java-r${PV/./rv}/pg"
-
JAVA_SRC_DIR=(
"src/main/java"
"src/main/jdk1.9"
@@ -39,7 +39,7 @@ JAVA_TEST_RESOURCE_DIRS="src/test/resources"
JAVA_TEST_SRC_DIR="src/test/java"
src_prepare() {
- default
+ java-pkg-2_src_prepare
java-pkg_clean ..
}
diff --git a/dev-java/bcpkix/Manifest b/dev-java/bcpkix/Manifest
index b8411158075e..34f73ef00305 100644
--- a/dev-java/bcpkix/Manifest
+++ b/dev-java/bcpkix/Manifest
@@ -1,2 +1,2 @@
-DIST bc-java-r1rv76.tar.gz 31256952 BLAKE2B b791ef3da7189bc6990935aaad7c331c1bf6a45af0cdfc72056ae0cf1723e57ce15a76060251f6de630b0729ffe22ba4718255c103a8ab66db61f2e46f1201c8 SHA512 7d408821408bbabd209d9507b061f3113822878c12b12a040c829f5a8c6bdf8450719aef60c423025824bec1fcb6c63d8478d1f84f3cb1d692fdbacde6d9ce6e
-DIST bc-test-data-r1rv76.tar.gz 2074813467 BLAKE2B 3d1bd122a907e4c46f3c8b84c4d27b3327b6c6deaded623e5bc9842d00c62bdeb521b1be3bdd495ffa10f2d1facc73d41176829eda4511827d24eb0f62fccef9 SHA512 3de068667ce9572530fa6422bdbc4455d7f1edd85e12166e7a266a447ed0ffab50c33cc5a99e668caf79156f87d86512a5507534469d3e6f479b908d4d2a1fb7
+DIST bc-java-r1rv77.tar.gz 31402744 BLAKE2B 1ca1e1dac1ed3d613ae66f08cd8a954e63d43a49ed402f5bd7c30cf1f0830ad29104aa91a9a0a3cbbb5ea750392bc285172a1ab38f2aba1600fa3ca4c469b4f5 SHA512 d75a0ce94bd006499eef9393491347ae70544643c93c2f7591df3ff0179bd477a5066891c7c3bdeb09bd693093c9dc7d29c48462a1d539e464cbf2ee9c1dfce4
+DIST bc-test-data-r1rv77.tar.gz 2074825965 BLAKE2B b797821719ba0dcdd091e0fd4f14c79058a15702973978a055bcc998ff541a8c5e96feb757647a9696e4bbfa28bf80a317066a51fd4daac7b2508111d0d217b1 SHA512 c8701a270ddcfde353b480caa62e2237776b50b0937ac015ee3e5221a74d0817de9bc67f1fa9f53f5e48d861dbf94339cb45a08cb4dad37f1340f754cb1d910e
diff --git a/dev-java/bcpkix/bcpkix-1.76.ebuild b/dev-java/bcpkix/bcpkix-1.77.ebuild
index f81d320078e6..c4e5b0c09115 100644
--- a/dev-java/bcpkix/bcpkix-1.76.ebuild
+++ b/dev-java/bcpkix/bcpkix-1.77.ebuild
@@ -1,18 +1,20 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.bouncycastle:bcpkix-jdk18on:1.76"
+MAVEN_ID="org.bouncycastle:bcpkix-jdk18on:${PV}"
JAVA_TESTING_FRAMEWORKS="junit-4"
inherit java-pkg-2 java-pkg-simple check-reqs
DESCRIPTION="Java APIs for CMS, PKCS, EAC, TSP, CMP, CRMF, OCSP, and certificate generation"
HOMEPAGE="https://www.bouncycastle.org/java.html"
-SRC_URI="https://github.com/bcgit/bc-java/archive/r${PV/./rv}.tar.gz -> bc-java-r${PV/./rv}.tar.gz
- test? ( https://github.com/bcgit/bc-test-data/archive/r${PV/./rv}.tar.gz -> bc-test-data-r${PV/./rv}.tar.gz )"
+MY_PV="r${PV/./rv}"
+SRC_URI="https://github.com/bcgit/bc-java/archive/${MY_PV}.tar.gz -> bc-java-${MY_PV}.tar.gz
+ test? ( https://github.com/bcgit/bc-test-data/archive/${MY_PV}.tar.gz -> bc-test-data-${MY_PV}.tar.gz )"
+S="${WORKDIR}/bc-java-${MY_PV}/pkix"
LICENSE="BSD"
SLOT="0"
@@ -35,8 +37,6 @@ RDEPEND="${CDEPEND}
DOCS=( ../{README,SECURITY}.md )
HTML_DOCS=( ../{CONTRIBUTORS,index}.html )
-S="${WORKDIR}/bc-java-r${PV/./rv}/pkix"
-
JAVA_AUTOMATIC_MODULE_NAME="org.bouncycastle.pkix"
JAVA_GENTOO_CLASSPATH="bcprov,bcutil"
JAVA_SRC_DIR=(
@@ -70,8 +70,8 @@ pkg_setup() {
}
src_unpack() {
- unpack bc-java-r${PV/./rv}.tar.gz
- use test && unpack bc-test-data-r${PV/./rv}.tar.gz
+ unpack bc-java-${MY_PV}.tar.gz
+ use test && unpack bc-test-data-${MY_PV}.tar.gz
}
src_prepare() {
@@ -81,7 +81,7 @@ src_prepare() {
# https://bugs.gentoo.org/823347
src_test() {
- mv ../../bc-test-data-r${PV/./rv} bc-test-data || die "cannot move bc-test-data"
+ mv ../../bc-test-data-${MY_PV} bc-test-data || die "cannot move bc-test-data"
JAVA_TEST_EXTRA_ARGS+=" -Xmx${CHECKREQS_MEMORY}"
pushd src/test/java || die
diff --git a/dev-java/bcprov/Manifest b/dev-java/bcprov/Manifest
index def9e26aa563..a9a299b3af1d 100644
--- a/dev-java/bcprov/Manifest
+++ b/dev-java/bcprov/Manifest
@@ -1,4 +1,4 @@
DIST bc-java-r1rv74.tar.gz 31236157 BLAKE2B ffdfe7aa34f361a559051f31fc57eeff39f7d080e4de4a94bdd0d79d92172b2646efa122edaf067633d6a840015e17271c186122598c18e3226622428fa9e1e7 SHA512 887183f825a8834ff512a66fa3f9075259b3266c2861e6e046990bd2dda80b896a8fd221ff2982a127de79fe998727ecc12cade4e6c381f2a152a72ee575d8a1
-DIST bc-java-r1rv76.tar.gz 31256952 BLAKE2B b791ef3da7189bc6990935aaad7c331c1bf6a45af0cdfc72056ae0cf1723e57ce15a76060251f6de630b0729ffe22ba4718255c103a8ab66db61f2e46f1201c8 SHA512 7d408821408bbabd209d9507b061f3113822878c12b12a040c829f5a8c6bdf8450719aef60c423025824bec1fcb6c63d8478d1f84f3cb1d692fdbacde6d9ce6e
+DIST bc-java-r1rv77.tar.gz 31402744 BLAKE2B 1ca1e1dac1ed3d613ae66f08cd8a954e63d43a49ed402f5bd7c30cf1f0830ad29104aa91a9a0a3cbbb5ea750392bc285172a1ab38f2aba1600fa3ca4c469b4f5 SHA512 d75a0ce94bd006499eef9393491347ae70544643c93c2f7591df3ff0179bd477a5066891c7c3bdeb09bd693093c9dc7d29c48462a1d539e464cbf2ee9c1dfce4
DIST bc-test-data-r1rv74.tar.gz 2074813647 BLAKE2B 8060ee31fa45fbceecb3ed57bc5d8195c8ea72c732e56f2c5f5adf9f785e76934300fe2b07aabc4fa5672c2eb39b5b7aad1393a7ff47dd42a048fa110b9a1db6 SHA512 8a8aa2e372b533a8bca5dc81a94c08c50470446c1457a487b18a96620841b8035344148bcb46b4e211c287ca42b0ee2db29ea402967bf55b8bb0958eb5fbabae
-DIST bc-test-data-r1rv76.tar.gz 2074813467 BLAKE2B 3d1bd122a907e4c46f3c8b84c4d27b3327b6c6deaded623e5bc9842d00c62bdeb521b1be3bdd495ffa10f2d1facc73d41176829eda4511827d24eb0f62fccef9 SHA512 3de068667ce9572530fa6422bdbc4455d7f1edd85e12166e7a266a447ed0ffab50c33cc5a99e668caf79156f87d86512a5507534469d3e6f479b908d4d2a1fb7
+DIST bc-test-data-r1rv77.tar.gz 2074825965 BLAKE2B b797821719ba0dcdd091e0fd4f14c79058a15702973978a055bcc998ff541a8c5e96feb757647a9696e4bbfa28bf80a317066a51fd4daac7b2508111d0d217b1 SHA512 c8701a270ddcfde353b480caa62e2237776b50b0937ac015ee3e5221a74d0817de9bc67f1fa9f53f5e48d861dbf94339cb45a08cb4dad37f1340f754cb1d910e
diff --git a/dev-java/bcprov/bcprov-1.76.ebuild b/dev-java/bcprov/bcprov-1.77.ebuild
index 765e01e1dfd4..9e17d73d8035 100644
--- a/dev-java/bcprov/bcprov-1.76.ebuild
+++ b/dev-java/bcprov/bcprov-1.77.ebuild
@@ -1,18 +1,20 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.bouncycastle:bcprov-jdk18on:1.76"
+MAVEN_ID="org.bouncycastle:bcprov-jdk18on:${PV}"
JAVA_TESTING_FRAMEWORKS="junit-4"
inherit java-pkg-2 java-pkg-simple check-reqs
DESCRIPTION="Java cryptography APIs"
HOMEPAGE="https://www.bouncycastle.org/java.html"
-SRC_URI="https://github.com/bcgit/bc-java/archive/r${PV/./rv}.tar.gz -> bc-java-r${PV/./rv}.tar.gz
- test? ( https://github.com/bcgit/bc-test-data/archive/r${PV/./rv}.tar.gz -> bc-test-data-r${PV/./rv}.tar.gz )"
+MY_PV="r${PV/./rv}"
+SRC_URI="https://github.com/bcgit/bc-java/archive/${MY_PV}.tar.gz -> bc-java-${MY_PV}.tar.gz
+ test? ( https://github.com/bcgit/bc-test-data/archive/${MY_PV}.tar.gz -> bc-test-data-${MY_PV}.tar.gz )"
+S="${WORKDIR}/bc-java-${MY_PV}"
LICENSE="BSD"
SLOT="0"
@@ -25,8 +27,6 @@ BDEPEND="app-arch/zip"
DOCS=( {README,SECURITY}.md )
HTML_DOCS=( {CONTRIBUTORS,index}.html )
-S="${WORKDIR}/bc-java-r${PV/./rv}"
-
check_env() {
if use test; then
# this is needed only for tests
@@ -45,8 +45,8 @@ pkg_setup() {
}
src_unpack() {
- unpack bc-java-r${PV/./rv}.tar.gz
- use test && unpack bc-test-data-r${PV/./rv}.tar.gz
+ unpack bc-java-${MY_PV}.tar.gz
+ use test && unpack bc-test-data-${MY_PV}.tar.gz
}
src_prepare() {
@@ -69,7 +69,7 @@ src_compile() {
}
src_test() {
- mv ../bc-test-data-r${PV/./rv} bc-test-data || die "cannot move bc-test-data"
+ mv ../bc-test-data-${MY_PV} bc-test-data || die "cannot move bc-test-data"
JAVA_TEST_EXTRA_ARGS="-Dbc.test.data.home=${S}/core/src/test/data"
JAVA_TEST_EXTRA_ARGS+=" -Xmx${CHECKREQS_MEMORY}"
diff --git a/dev-java/bcutil/Manifest b/dev-java/bcutil/Manifest
index 880e2012db6f..680d64e45a8b 100644
--- a/dev-java/bcutil/Manifest
+++ b/dev-java/bcutil/Manifest
@@ -1 +1 @@
-DIST bc-java-r1rv76.tar.gz 31256952 BLAKE2B b791ef3da7189bc6990935aaad7c331c1bf6a45af0cdfc72056ae0cf1723e57ce15a76060251f6de630b0729ffe22ba4718255c103a8ab66db61f2e46f1201c8 SHA512 7d408821408bbabd209d9507b061f3113822878c12b12a040c829f5a8c6bdf8450719aef60c423025824bec1fcb6c63d8478d1f84f3cb1d692fdbacde6d9ce6e
+DIST bc-java-r1rv77.tar.gz 31402744 BLAKE2B 1ca1e1dac1ed3d613ae66f08cd8a954e63d43a49ed402f5bd7c30cf1f0830ad29104aa91a9a0a3cbbb5ea750392bc285172a1ab38f2aba1600fa3ca4c469b4f5 SHA512 d75a0ce94bd006499eef9393491347ae70544643c93c2f7591df3ff0179bd477a5066891c7c3bdeb09bd693093c9dc7d29c48462a1d539e464cbf2ee9c1dfce4
diff --git a/dev-java/bcutil/bcutil-1.76.ebuild b/dev-java/bcutil/bcutil-1.77.ebuild
index 27836258fffc..03c870ae5331 100644
--- a/dev-java/bcutil/bcutil-1.76.ebuild
+++ b/dev-java/bcutil/bcutil-1.77.ebuild
@@ -1,17 +1,19 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.bouncycastle:bcutil-jdk18on:1.76"
+MAVEN_ID="org.bouncycastle:bcutil-jdk18on:${PV}"
JAVA_TESTING_FRAMEWORKS="junit-4"
inherit java-pkg-2 java-pkg-simple
DESCRIPTION="Java APIs for ASN.1 extension and utility APIs used to support bcpkix and bctls"
HOMEPAGE="https://www.bouncycastle.org/java.html"
-SRC_URI="https://github.com/bcgit/bc-java/archive/r${PV/./rv}.tar.gz -> bc-java-r${PV/./rv}.tar.gz"
+MY_PV="r${PV/./rv}"
+SRC_URI="https://github.com/bcgit/bc-java/archive/${MY_PV}.tar.gz -> bc-java-${MY_PV}.tar.gz"
+S="${WORKDIR}/bc-java-${MY_PV}/util"
LICENSE="BSD"
SLOT="0"
@@ -26,8 +28,6 @@ RDEPEND="${CDEPEND}
DOCS=( ../{README,SECURITY}.md )
HTML_DOCS=( ../{CONTRIBUTORS,index}.html )
-S="${WORKDIR}/bc-java-r${PV/./rv}/util"
-
JAVA_AUTOMATIC_MODULE_NAME="org.bouncycastle.util"
JAVA_GENTOO_CLASSPATH="bcprov"
JAVA_SRC_DIR=(
@@ -36,16 +36,15 @@ JAVA_SRC_DIR=(
)
JAVA_TEST_GENTOO_CLASSPATH="junit-4"
-JAVA_TEST_SRC_DIR="src/test/java"
JAVA_TEST_RESOURCE_DIRS="src/test/resources"
-
JAVA_TEST_RUN_ONLY=(
"org.bouncycastle.asn1.util.test.AllTests"
"org.bouncycastle.oer.test.AllTests"
)
+JAVA_TEST_SRC_DIR="src/test/java"
src_prepare() {
- default
+ java-pkg-2_src_prepare
java-pkg_clean ..
}
diff --git a/dev-java/aqute-bnd-annotation/Manifest b/dev-java/bnd-annotation/Manifest
index 5b277a425cec..4a41f3f9f080 100644
--- a/dev-java/aqute-bnd-annotation/Manifest
+++ b/dev-java/bnd-annotation/Manifest
@@ -1 +1,2 @@
+DIST aQute.bnd-7.0.0.tar.gz 172496438 BLAKE2B a2e443b0e4a2eb278a8e1df86456fea22ffb8147adc00c9f300cbd32b226218bb64ccca3da3bcd0d79b07567a7b4cf4456b96224d6abf59486fa08ca6170d0ba SHA512 11d34a7d1a9b2fb2e8c112d414a06c281ccde9a7b06c62043e19d83e85ea64fdf022dd4493a14dd2dcf6adee392a1e9bf1ab05a6d690a328f29d7019045bca8c
DIST biz.aQute.bnd.annotation-6.3.1-sources.jar 50600 BLAKE2B 6ace86a803c378be17b4ecfb658eb17e9c95f4f8797cdf22cbb9a5acb2a382fe0ee6791ad0280a2de9d9e85fbe2732487e693b2c93f08145b3633810f480f8b9 SHA512 751855a173e6d5f9d09f6d63775b97d971cebbfc019053988ec7fe144d0f49b4d09b9a2339d63bb43cea51d09d7d766554255f727cad8d73d9c196097e58d0fd
diff --git a/dev-java/aqute-bnd-annotation/aqute-bnd-annotation-6.3.1.ebuild b/dev-java/bnd-annotation/bnd-annotation-6.3.1.ebuild
index 0ec922b091fb..9522fc6820a9 100644
--- a/dev-java/aqute-bnd-annotation/aqute-bnd-annotation-6.3.1.ebuild
+++ b/dev-java/bnd-annotation/bnd-annotation-6.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# Skeleton command:
diff --git a/dev-java/bnd-annotation/bnd-annotation-7.0.0.ebuild b/dev-java/bnd-annotation/bnd-annotation-7.0.0.ebuild
new file mode 100644
index 000000000000..a66b70291b68
--- /dev/null
+++ b/dev-java/bnd-annotation/bnd-annotation-7.0.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="biz.aQute.bnd:biz.aQute.bnd.annotation:${PV}"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="bnd Annotations Library"
+HOMEPAGE="https://bnd.bndtools.org/"
+SRC_URI="https://github.com/bndtools/bnd/archive/${PV}.tar.gz -> aQute.bnd-${PV}.tar.gz"
+S="${WORKDIR}/bnd-${PV}"
+
+LICENSE="Apache-2.0 EPL-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
+
+DEPEND="
+ dev-java/osgi-cmpn:8
+ >=virtual/jdk-11:*
+"
+
+RDEPEND=">=virtual/jre-1.8:*"
+
+JAVA_AUTOMATIC_MODULE_NAME="biz.aQute.bnd.annotation"
+JAVA_CLASSPATH_EXTRA="osgi-cmpn-8"
+JAVA_SRC_DIR="biz.aQute.bnd.annotation/src"
diff --git a/dev-java/bnd-annotation/metadata.xml b/dev-java/bnd-annotation/metadata.xml
new file mode 100644
index 000000000000..cb6317e530db
--- /dev/null
+++ b/dev-java/bnd-annotation/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>java@gentoo.org</email>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">bndtools/bnd</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-java/bnd-junit/Manifest b/dev-java/bnd-junit/Manifest
deleted file mode 100644
index 068af0665527..000000000000
--- a/dev-java/bnd-junit/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST bndlib-2.1.0.tar.gz 123217291 BLAKE2B ab8e6876b13db538746f77aa1fe7800e5a3b5e539e1980da78f69c64344f4964bf0a21f2329f7684b055d0de39a10c8df36e030922e9933b29fccb9a35aa669a SHA512 6965143ced45c15fc2316716de32e80506cc411d52309b24313fff37e0713a45ad200d5b3701f0d47a131a3163ec266ed8acb4544884cd1c59c9716c7a2b285e
diff --git a/dev-java/bnd-junit/bnd-junit-2.1.0-r2.ebuild b/dev-java/bnd-junit/bnd-junit-2.1.0-r2.ebuild
deleted file mode 100644
index 3c659d744e29..000000000000
--- a/dev-java/bnd-junit/bnd-junit-2.1.0-r2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="test"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Junit plugin for bndlib, a swiss army knife for OSGi"
-HOMEPAGE="http://www.aqute.biz/Bnd/Bnd"
-SRC_URI="https://github.com/bndtools/bnd/archive/${PV}.REL.tar.gz -> bndlib-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-CDEPEND="
- dev-java/osgi-core-api:0
- dev-java/bndlib:0"
-
-DEPEND="
- ${CDEPEND}
- virtual/jdk:1.8
- test? ( dev-java/junit:4 )"
-
-RDEPEND="
- ${CDEPEND}
- virtual/jre:1.8"
-
-S="${WORKDIR}/bnd-${PV}.REL/biz.aQute.junit"
-
-EANT_BUILD_TARGET="build"
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_GENTOO_CLASSPATH="bndlib,junit-4,osgi-core-api"
-
-# Tests appear broken and cause a circular dependency.
-RESTRICT="test"
-
-src_prepare() {
- default
- java-pkg_clean
- cp ../cnf/build.xml . || die
-}
-
-src_install() {
- java-pkg_newjar generated/biz.aQute.junit.jar
-}
diff --git a/dev-java/bnd-junit/metadata.xml b/dev-java/bnd-junit/metadata.xml
deleted file mode 100644
index 94feb65b0b18..000000000000
--- a/dev-java/bnd-junit/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">bndtools/bnd</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/dev-java/bnd-util/Manifest b/dev-java/bnd-util/Manifest
new file mode 100644
index 000000000000..a890570b45c8
--- /dev/null
+++ b/dev-java/bnd-util/Manifest
@@ -0,0 +1 @@
+DIST aQute.bnd-7.0.0.tar.gz 172496438 BLAKE2B a2e443b0e4a2eb278a8e1df86456fea22ffb8147adc00c9f300cbd32b226218bb64ccca3da3bcd0d79b07567a7b4cf4456b96224d6abf59486fa08ca6170d0ba SHA512 11d34a7d1a9b2fb2e8c112d414a06c281ccde9a7b06c62043e19d83e85ea64fdf022dd4493a14dd2dcf6adee392a1e9bf1ab05a6d690a328f29d7019045bca8c
diff --git a/dev-java/bnd-util/bnd-util-7.0.0.ebuild b/dev-java/bnd-util/bnd-util-7.0.0.ebuild
new file mode 100644
index 000000000000..686d1ca62757
--- /dev/null
+++ b/dev-java/bnd-util/bnd-util-7.0.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="biz.aQute.bnd:biz.aQute.bnd.util:${PV}"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="AQute Bnd Utilities"
+HOMEPAGE="https://bnd.bndtools.org/"
+SRC_URI="https://github.com/bndtools/bnd/archive/${PV}.tar.gz -> aQute.bnd-${PV}.tar.gz"
+S="${WORKDIR}/bnd-${PV}"
+
+LICENSE="Apache-2.0 EPL-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
+
+CP_DEPEND="dev-java/osgi-annotation:0"
+
+DEPEND="${CP_DEPEND}
+ ~dev-java/bnd-annotation-${PV}:0
+ ~dev-java/libg-${PV}:0
+ dev-java/osgi-cmpn:8
+ dev-java/osgi-core:0
+ dev-java/slf4j-api:0
+ >=virtual/jdk-17:*
+"
+
+RDEPEND="${CP_DEPEND}
+ >=virtual/jre-17:*
+"
+
+JAVA_AUTOMATIC_MODULE_NAME="biz.aQute.bnd.util"
+JAVA_CLASSPATH_EXTRA="
+ bnd-annotation
+ libg
+ osgi-cmpn-8
+ osgi-core
+ slf4j-api
+"
+JAVA_SRC_DIR="biz.aQute.bnd.util/src"
diff --git a/dev-java/bnd-util/metadata.xml b/dev-java/bnd-util/metadata.xml
new file mode 100644
index 000000000000..cb6317e530db
--- /dev/null
+++ b/dev-java/bnd-util/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>java@gentoo.org</email>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">bndtools/bnd</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-java/bndlib/Manifest b/dev-java/bndlib/Manifest
index 068af0665527..a890570b45c8 100644
--- a/dev-java/bndlib/Manifest
+++ b/dev-java/bndlib/Manifest
@@ -1 +1 @@
-DIST bndlib-2.1.0.tar.gz 123217291 BLAKE2B ab8e6876b13db538746f77aa1fe7800e5a3b5e539e1980da78f69c64344f4964bf0a21f2329f7684b055d0de39a10c8df36e030922e9933b29fccb9a35aa669a SHA512 6965143ced45c15fc2316716de32e80506cc411d52309b24313fff37e0713a45ad200d5b3701f0d47a131a3163ec266ed8acb4544884cd1c59c9716c7a2b285e
+DIST aQute.bnd-7.0.0.tar.gz 172496438 BLAKE2B a2e443b0e4a2eb278a8e1df86456fea22ffb8147adc00c9f300cbd32b226218bb64ccca3da3bcd0d79b07567a7b4cf4456b96224d6abf59486fa08ca6170d0ba SHA512 11d34a7d1a9b2fb2e8c112d414a06c281ccde9a7b06c62043e19d83e85ea64fdf022dd4493a14dd2dcf6adee392a1e9bf1ab05a6d690a328f29d7019045bca8c
diff --git a/dev-java/bndlib/bndlib-2.1.0-r1.ebuild b/dev-java/bndlib/bndlib-2.1.0-r1.ebuild
deleted file mode 100644
index f78e091b0744..000000000000
--- a/dev-java/bndlib/bndlib-2.1.0-r1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="test"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="A swiss army knife for OSGi"
-HOMEPAGE="https://bnd.bndtools.org/"
-SRC_URI="https://github.com/bndtools/bnd/archive/${PV}.REL.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-CDEPEND="dev-java/libg:0
- dev-java/osgi-compendium:0
- dev-java/osgi-core-api:0
- dev-java/osgi-enterprise-api:0"
-
-# Tests appear broken and cause a circular dependency.
-# test? ( dev-java/bnd-junit:0 )
-DEPEND="virtual/jdk:1.8
- ${CDEPEND}
- test? ( dev-java/junit:4 )"
-
-RDEPEND="virtual/jre:1.8
- ${CDEPEND}"
-
-S="${WORKDIR}/bnd-${PV}.REL/biz.aQute.${PN}"
-
-EANT_BUILD_TARGET="build"
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-# Tests appear broken and cause a circular dependency.
-RESTRICT="test"
-
-src_prepare() {
- default
- # Move the correct build.xml into place, needed for testing.
- cp ../cnf/build.xml . || die
-
- # Remove bundled jar files.
- find . -name '*.jar' -delete > /dev/null
-
- if ! use test ; then
- rm -rf src/aQute/bnd/test || die "Failed to remove tests."
- fi
-}
-
-src_compile() {
- local extra_cp=""
-
- if use test ; then
- extra_cp=":$(java-pkg_getjars --build-only junit-4)"
- fi
-
- EANT_EXTRA_ARGS="-Dgentoo.classpath=$(java-pkg_getjars libg):$(java-pkg_getjars osgi-compendium):$(java-pkg_getjars osgi-core-api):$(java-pkg_getjars osgi-enterprise-api)${extra_cp}" \
- java-pkg-2_src_compile
-}
-
-EANT_TEST_GENTOO_CLASSPATH="junit-4,bnd-junit"
-src_test() {
- java-pkg-2_src_test
-}
-
-src_install() {
- java-pkg_newjar generated/biz.aQute.${PN}.jar
-}
diff --git a/dev-java/bndlib/bndlib-7.0.0.ebuild b/dev-java/bndlib/bndlib-7.0.0.ebuild
new file mode 100644
index 000000000000..4a6bee66518d
--- /dev/null
+++ b/dev-java/bndlib/bndlib-7.0.0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="biz.aQute.bnd:biz.aQute.bndlib:${PV}"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="bndlib: A Swiss Army Knife for OSGi"
+HOMEPAGE="https://bnd.bndtools.org/"
+SRC_URI="https://github.com/bndtools/bnd/archive/${PV}.tar.gz -> aQute.bnd-${PV}.tar.gz"
+S="${WORKDIR}/bnd-${PV}"
+
+LICENSE="Apache-2.0 EPL-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
+
+CP_DEPEND="
+ ~dev-java/bnd-annotation-${PV}:0
+ ~dev-java/bnd-util-${PV}:0
+ ~dev-java/libg-${PV}:0
+ dev-java/osgi-annotation:0
+ dev-java/osgi-cmpn:8
+ dev-java/osgi-core:0
+ dev-java/slf4j-api:0
+"
+
+DEPEND="${CP_DEPEND}
+ dev-java/osgi-service-log:0
+ >=virtual/jdk-17:*
+"
+
+RDEPEND="${CP_DEPEND}
+ >=virtual/jre-17:*
+"
+
+JAVA_AUTOMATIC_MODULE_NAME="biz.aQute.bndlib"
+JAVA_CLASSPATH_EXTRA="osgi-service-log"
+JAVA_RESOURCE_DIRS="res"
+JAVA_SRC_DIR="biz.aQute.bndlib/src"
+
+src_prepare() {
+ java-pkg-2_src_prepare
+ mkdir res || die
+
+ # java-pkg-simple wants resources in JAVA_RESOURCE_DIRS
+ mv biz.aQute.bndlib/img res || die
+ pushd biz.aQute.bndlib/src > /dev/null || die
+ find -type f \
+ ! -name '*.java' \
+ | xargs cp --parent -t ../../res || die
+ popd > /dev/null || die
+}
diff --git a/dev-java/bndlib/metadata.xml b/dev-java/bndlib/metadata.xml
index 94feb65b0b18..cb6317e530db 100644
--- a/dev-java/bndlib/metadata.xml
+++ b/dev-java/bndlib/metadata.xml
@@ -1,11 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="project">
- <email>java@gentoo.org</email>
- <name>Java</name>
- </maintainer>
- <upstream>
- <remote-id type="github">bndtools/bnd</remote-id>
- </upstream>
+ <maintainer type="project">
+ <email>java@gentoo.org</email>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">bndtools/bnd</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-java/bsf/Manifest b/dev-java/bsf/Manifest
index aeacf27f9b5a..4add2dfdfd39 100644
--- a/dev-java/bsf/Manifest
+++ b/dev-java/bsf/Manifest
@@ -1 +1,2 @@
DIST bsf-src-2.4.0.tar.gz 299749 BLAKE2B 41f3cfe77b1ccf6b78493df7f5f288b397234b3236977c4b7d2e6c85b330e40319474419f560eefa1632da4d0524593b8c3e0c66cd27b852749b1405c20df5a6 SHA512 a1e7564fd14abbf725fee75c4b0ba5f92d7eada0e242ad05897753bb4afe639d859c42cae1d684e8dd9151409d4cc68e1a422a70bc74d8016144cc30d03a2d43
+DIST bsf-src-2.4.0.tar.gz.asc 191 BLAKE2B c4d17ee6df06aa2da70b9e733cb9890cef2f0f22124d8699400494496c4045851feb006e53ee4f4d09e926d982afd4057c08caf791fd4ea8a8bef5f576d6d8a1 SHA512 b82d1f9e6cd6bc3b3228ceb8f5f0679e8dd95c2200328accafa0ee9fd4b4065367e071d0fa718ecdc34e11c6b14456a671d4e8e74d2b56dea4e8fc3db73c4392
diff --git a/dev-java/bsf/bsf-2.4.0-r3.ebuild b/dev-java/bsf/bsf-2.4.0-r3.ebuild
deleted file mode 100644
index ce4e977848a5..000000000000
--- a/dev-java/bsf/bsf-2.4.0-r3.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-JAVA_PKG_IUSE="doc examples source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Bean Script Framework"
-HOMEPAGE="https://commons.apache.org/proper/commons-bsf/"
-SRC_URI="mirror://apache/commons/bsf/source/${PN}-src-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="2.3"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-
-# If you add new ones, add them to ant-apache-bsf too for use dependencies
-IUSE="javascript python tcl"
-
-CDEPEND="
- python? (
- dev-java/jython:2.7
- )
- javascript? (
- dev-java/rhino:1.6
- )
- tcl? (
- dev-java/jacl:0
- )
- dev-java/xalan:0
- dev-java/commons-logging:0"
-
-RDEPEND="
- ${CDEPEND}
- >=virtual/jre-1.8:*"
-
-DEPEND="
- ${CDEPEND}
- >=virtual/jdk-1.8:*"
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-
-src_prepare() {
- default
- rm -v lib/*.jar || die
- rm samples/*/*.class || die
-
- java-ant_ignore-system-classes
-
- # somebody forgot to add them to source tarball... fetched from svn
- cp "${FILESDIR}/${P}-build-properties.xml" build-properties.xml || die
-
- # Silence javadoc.
- java-ant_xml-rewrite -f build.xml -c \
- -e javadoc \
- -a failonerror \
- -v no
-
- # http://bugs.jython.org/issue1814
- # Also, bsf is an old project (2011) and hasn't officially taken the leap to
- # jython-2.7. This patch fixes the issue.
- eapply "${FILESDIR}"/${P}-PyJavaInstance.patch
-}
-
-src_compile() {
- local pkgs="commons-logging,xalan"
- local antflags="-Dxalan.present=true"
-
- if use python; then
- antflags="${antflags} -Djython.present=true"
- pkgs="${pkgs},jython-2.7"
- fi
- if use javascript; then
- antflags="${antflags} -Drhino.present=true"
- pkgs="${pkgs},rhino-1.6"
- fi
- if use tcl; then
- antflags="${antflags} -Djacl.present=true"
- pkgs="${pkgs},jacl"
- fi
-
- local cp="$(java-pkg_getjars ${pkgs})"
- eant -Dgentoo.classpath="${cp}" ${antflags} jar
-
- # stupid clean
- mv build/lib/${PN}.jar "${S}" || die
- use doc && eant -Dgentoo.classpath="${cp}" ${antflags} javadocs
-}
-
-src_install() {
- java-pkg_dojar ${PN}.jar
-
- java-pkg_dolauncher ${PN} --main org.apache.bsf.Main
-
- dodoc CHANGES.txt NOTICE.txt README.txt RELEASE-NOTE.txt TODO.txt
-
- use doc && java-pkg_dojavadoc build/javadocs
- use examples && java-pkg_doexamples samples
- use source && java-pkg_dosrc src/org
-
- java-pkg_register-optional-dependency bsh,groovy-1,jruby
-}
-
-pkg_postinst() {
- elog "Support for python, javascript, and tcl is controlled via USE flags."
- elog "Also, following languages can be supported just by installing"
- elog "respective package with USE=\"bsf\": BeanShell (dev-java/bsh),"
- elog "Groovy (dev-java/groovy) and JRuby (dev-java/jruby)"
-}
diff --git a/dev-java/bsf/bsf-2.4.0-r5.ebuild b/dev-java/bsf/bsf-2.4.0-r5.ebuild
new file mode 100644
index 000000000000..b3abd4a8391e
--- /dev/null
+++ b/dev-java/bsf/bsf-2.4.0-r5.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2024 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 verify-sig
+
+DESCRIPTION="Bean Script Framework"
+HOMEPAGE="https://commons.apache.org/proper/commons-bsf/"
+SRC_URI="mirror://apache/commons/bsf/source/bsf-src-${PV}.tar.gz
+ verify-sig? ( https://downloads.apache.org/commons/bsf/source/bsf-src-${PV}.tar.gz.asc )"
+S="${WORKDIR}/${P}"
+
+LICENSE="Apache-2.0"
+SLOT="2.3"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+
+# If you add new ones, add them to ant-apache-bsf too for use dependencies
+IUSE="javascript tcl"
+
+VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/commons.apache.org.asc"
+BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-commons )"
+CDEPEND="
+ dev-java/commons-logging:0
+ dev-java/xalan:0
+ javascript? ( dev-java/rhino:1.6 )
+ tcl? ( dev-java/jacl:0 )
+"
+DEPEND="${CDEPEND}
+ >=virtual/jdk-1.8:*"
+RDEPEND="${CDEPEND}
+ >=virtual/jre-1.8:*"
+
+DOCS=( CHANGES.txt NOTICE.txt README.txt RELEASE-NOTE.txt TODO.txt )
+
+JAVA_GENTOO_CLASSPATH="
+ commons-logging
+ xalan
+"
+JAVA_MAIN_CLASS="org.apache.bsf.Main"
+JAVA_RESOURCE_DIRS="res"
+JAVA_SRC_DIR="src"
+
+src_prepare() {
+ java-pkg-2_src_prepare
+ rm -r src/org/apache/bsf/engines/{java,javaclass,jython,netrexx} || die
+ if use javascript; then
+ JAVA_GENTOO_CLASSPATH+=" rhino-1.6"
+ else
+ rm -r src/org/apache/bsf/engines/javascript || die
+ fi
+ if use tcl; then
+ JAVA_GENTOO_CLASSPATH+=" jacl"
+ else
+ rm -r src/org/apache/bsf/engines/jacl || die
+ fi
+ # java-pkg-simple.eclass wants resources in JAVA_RESOURCE_DIRS
+ mkdir res || die "create res"
+ pushd src > /dev/null || die "pushd"
+ find -type f -name '*.properties' \
+ | xargs cp --parent -t ../res || die "copy resources"
+ popd > /dev/null
+}
+
+src_install() {
+ java-pkg-simple_src_install
+# java-pkg_register-optional-dependency bsh,groovy-1,jruby
+}
+
+pkg_postinst() {
+ elog "Support for javascript and tcl is controlled via USE flags."
+ elog "Also, following languages can be supported just by installing"
+ elog "respective package with USE=\"bsf\": BeanShell (dev-java/bsh),"
+ elog "Groovy (dev-java/groovy) and JRuby (dev-java/jruby)"
+}
diff --git a/dev-java/bsf/files/bsf-2.4.0-PyJavaInstance.patch b/dev-java/bsf/files/bsf-2.4.0-PyJavaInstance.patch
deleted file mode 100644
index 4e8c4de7b015..000000000000
--- a/dev-java/bsf/files/bsf-2.4.0-PyJavaInstance.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- a/src/org/apache/bsf/engines/jython/JythonEngine.java.orig 2015-07-04 08:00:17.120000000 +0000
-+++ b/src/org/apache/bsf/engines/jython/JythonEngine.java 2015-07-04 08:04:55.230000000 +0000
-@@ -26,7 +26,7 @@
- import org.apache.bsf.util.BSFFunctions;
- import org.python.core.Py;
- import org.python.core.PyException;
--import org.python.core.PyJavaInstance;
-+import org.python.core.PyJavaType;
- import org.python.core.PyObject;
- import org.python.util.InteractiveInterpreter;
-
-@@ -110,8 +110,9 @@
-
- Object result = interp.eval ("bsf_temp_fn()");
-
-- if (result != null && result instanceof PyJavaInstance)
-- result = ((PyJavaInstance)result).__tojava__(Object.class);
-+ if (result != null && result instanceof PyJavaType)
-+ //result = ((PyJavaInstance)result).__tojava__(Object.class);
-+ result = PyJavaType.wrapJavaObject(result).__tojava__(Object.class);
- return result;
- } catch (PyException e) {
- throw new BSFException (BSFException.REASON_EXECUTION_ERROR,
-@@ -126,8 +127,9 @@
- Object script) throws BSFException {
- try {
- Object result = interp.eval (byteify(script.toString ()));
-- if (result != null && result instanceof PyJavaInstance)
-- result = ((PyJavaInstance)result).__tojava__(Object.class);
-+ if (result != null && result instanceof PyJavaType)
-+ //result = ((PyJavaInstance)result).__tojava__(Object.class);
-+ result = PyJavaType.wrapJavaObject(result).__tojava__(Object.class);
- return result;
- } catch (PyException e) {
- throw new BSFException (BSFException.REASON_EXECUTION_ERROR,
diff --git a/dev-java/bsf/files/bsf-2.4.0-build-properties.xml b/dev-java/bsf/files/bsf-2.4.0-build-properties.xml
deleted file mode 100644
index 6d716ed00563..000000000000
--- a/dev-java/bsf/files/bsf-2.4.0-build-properties.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<project name="props">
- <property name="project.name" value="bsf"/>
- <property name="project.fullName" value="Bean Scripting Framework"/>
- <property name="project.version" value="2.4.0"/>
- <property name="project.debug" value="on"/>
- <property name="project.deprecation" value="on"/>
-
- <property name="build.file" value="build.xml"/>
- <property name="build.properties.file" value="build-properties.xml"/>
- <property name="build.dir" value="build"/>
- <property name="build.dest" value="build/classes"/>
- <property name="build.lib" value="build/lib"/>
- <property name="build.lib.win32" value="build/lib/win32"/>
- <property name="build.samples" value="build/samples"/>
- <property name="build.samples.calc" value="build/samples/calc"/>
- <property name="build.samples.scriptedui" value="build/samples/scriptedui"/>
- <property name="build.samples.xsl" value="build/samples/xsl"/>
- <property name="build.javadocs" value="build/javadocs"/>
- <property name="build.tests" value="build/testcases" />
-
- <property name="dist.dir" value="dist"/>
- <property name="dist.dir.root" value="${dist.dir}/${project.name}-${project.version}"/>
- <property name="dist.bin.file" value="${dist.dir}/${project.name}-bin-${project.version}"/>
- <property name="dist.src.file" value="${dist.dir}/${project.name}-src-${project.version}"/>
-
- <property name="packages" value="org.apache.*"/>
-
- <property name="samples.dir" value="samples"/>
-
- <property name="site.src" location="xdocs"/>
- <property name="site.dest" location="docs"/>
- <property name="site.projectFile" value="stylesheets/project.xml"/>
-
- <property name="source.level" value="1.4" />
-
- <property name="src.dir" value="src"/>
-
- <property name="templ.path" location="xdocs/stylesheets"/>
-
- <property name="tests.dir" value="test"/>
-
- <property name="velocity.props" location="${site.src}/velocity.properties"/>
-</project>
diff --git a/dev-java/bsf/metadata.xml b/dev-java/bsf/metadata.xml
index b193994fe63e..90f0e6f3943c 100644
--- a/dev-java/bsf/metadata.xml
+++ b/dev-java/bsf/metadata.xml
@@ -5,7 +5,9 @@
<email>java@gentoo.org</email>
<name>Java</name>
</maintainer>
-
+<upstream>
+ <remote-id type="github">apache/commons-bsf</remote-id>
+</upstream>
<longdescription>
Bean Scripting Framework (BSF) is a set of Java classes which provides
scripting language support within Java applications, and access to Java
diff --git a/dev-java/caffeine/Manifest b/dev-java/caffeine/Manifest
new file mode 100644
index 000000000000..5fe009e7d56c
--- /dev/null
+++ b/dev-java/caffeine/Manifest
@@ -0,0 +1 @@
+DIST caffeine-2.6.2-sources.jar 715580 BLAKE2B 882cac33d205c8186232c64010b4e25e805d3d188d6a9e6ca151187b55d5ee3a3d5641566f5e8d32de596fab3dae8967c74f3d60e2321b34374ce996382322fe SHA512 52a8c67648e2a6bb1c600d99712473a64911f2b6c8fe6c924ba98e72b4b040a1094fa5c93ae2bae8734d352634bc72960711afd152566ef02f6bad4c84e510c8
diff --git a/dev-java/caffeine/caffeine-2.6.2.ebuild b/dev-java/caffeine/caffeine-2.6.2.ebuild
new file mode 100644
index 000000000000..e55aadd659b2
--- /dev/null
+++ b/dev-java/caffeine/caffeine-2.6.2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 2023-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="com.github.ben-manes.caffeine:caffeine:${PV}"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="A high performance caching library"
+HOMEPAGE="https://github.com/ben-manes/caffeine"
+SRC_URI="https://repo1.maven.org/maven2/com/github/ben-manes/caffeine/caffeine/${PV}/caffeine-${PV}-sources.jar"
+# Compiling from Github would require to be packaged at least
+# package com.squareup.javapoet
+# package MethodSpec
+# package TypeSpec
+# SRC_URI="https://github.com/ben-manes/caffeine/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+# S="${WORKDIR}/${P}/caffeine"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ppc64 x86"
+
+BDEPEND="app-arch/unzip"
+CP_DEPEND="dev-java/jsr305:0"
+DEPEND="${CP_DEPEND}
+ >=virtual/jdk-1.8:*"
+RDEPEND="${CP_DEPEND}
+ >=virtual/jre-1.8:*"
+
+JAVA_AUTOMATIC_MODULE_NAME="com.github.benmanes.caffeine"
diff --git a/dev-java/caffeine/metadata.xml b/dev-java/caffeine/metadata.xml
new file mode 100644
index 000000000000..8168da8f9820
--- /dev/null
+++ b/dev-java/caffeine/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>java@gentoo.org</email>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">ben-manes/caffeine</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-java/checker-framework-qual/Manifest b/dev-java/checker-framework-qual/Manifest
index 420abc50100b..a520abac15a6 100644
--- a/dev-java/checker-framework-qual/Manifest
+++ b/dev-java/checker-framework-qual/Manifest
@@ -1 +1 @@
-DIST checker-framework-3.14.0.tar.gz 7788010 BLAKE2B e05647b7a551cb1e53c32ea65c1d5a28ed7a968310223664704722c58b6df188e80581df383937fef6ebed5042e7234281b55069fde1f4cb34853495c4e2fbff SHA512 14be47e823ba67b6fcb7a8033632a2dd56341bd0d2a56c7501b50eab5e471622372eb4b62f4e78e33be019c15f44d075d146ece98fa3316e7cb24346db98c238
+DIST checker-framework-3.42.0.tar.gz 8280060 BLAKE2B c2f7c192eb9a7a26b66e46f0c22c18a05ec8cc3c4c01d444e7f14e41c89db83b5d2738f78e3b16eea9cd9ebf3138171bbc6fabb195bdd9776defa06d75e516d6 SHA512 310578593509674b2d36353b2044009ac98b50906d715f1168a96490a1b87aa8227c1713f64adeabd98e370fb1a6a25dd148a5700ff6f4f28ba6b69ba505c149
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.42.0.ebuild
index 57becae21d2e..5831dfb7010b 100644
--- a/dev-java/checker-framework-qual/checker-framework-qual-3.14.0.ebuild
+++ b/dev-java/checker-framework-qual/checker-framework-qual-3.42.0.ebuild
@@ -1,19 +1,18 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-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"
+SRC_URI="https://github.com/typetools/checker-framework/archive/checker-framework-${PV}.tar.gz"
+S="${WORKDIR}/checker-framework-checker-framework-${PV}/checker-qual"
+
LICENSE="MIT"
SLOT="0"
KEYWORDS="amd64 ~arm arm64 ppc64 x86"
@@ -21,6 +20,5 @@ KEYWORDS="amd64 ~arm arm64 ppc64 x86"
DEPEND=">=virtual/jdk-1.8:*"
RDEPEND=">=virtual/jre-1.8:*"
-S="${WORKDIR}/${MY_PN}-${MY_P}/checker-qual"
-
+JAVA_AUTOMATIC_MODULE_NAME="org.checkerframework.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
index ca606ae4ec36..29b8e33bf4e4 100644
--- a/dev-java/checker-framework-qual/metadata.xml
+++ b/dev-java/checker-framework-qual/metadata.xml
@@ -5,6 +5,9 @@
<email>java@gentoo.org</email>
<name>Java</name>
</maintainer>
+ <upstream>
+ <remote-id type="github">typetools/checker-framework</remote-id>
+ </upstream>
<longdescription>
The Checker Framework enhances Java's type system to make it
more powerful and useful. This lets software developers detect
diff --git a/dev-java/commons-collections/Manifest b/dev-java/commons-collections/Manifest
index 7038859c5ae2..ce4044f37b42 100644
--- a/dev-java/commons-collections/Manifest
+++ b/dev-java/commons-collections/Manifest
@@ -1,3 +1,4 @@
DIST commons-collections-3.2.2-src.tar.gz 630693 BLAKE2B a70cebe9526291d5207db7edd7c9b50060413880d41dcb28c01cf05f7e00a9f5e1560012c3c3c763162412282db9512bc2b64a5788f210c5c8866943d912dafb SHA512 2e8ef638f07515b028a3e7e97851fcf1d9023a2c188e211bd1e936f35d3d91c2885adf3b1103ad17dfb7aeea6e7a67ce7826ee346a8a29c1aa7c6b0cf14e9230
DIST commons-collections-3.2.2-src.tar.gz.asc 819 BLAKE2B a7d170b03613cddddc284908d95287fc092c01b125c5adffebfc493daf9119e0c9d82fdc7d8ce1865ef45a1e015072f5a09181abcba5b17c9c48d7c6333279da SHA512 c5d33518ed5343b38c10e317f677266858bd9614eff7fdc13a2e0131fe71836c3694f49898843e6978496d7dd2f976b82922230a44cde1eac5f6cdfdb822dcd0
-DIST commons-collections-4.4-src.tar.gz 703008 BLAKE2B f4a0e858eb7412bdd431894f923a4731685ceb2463bee002401d8048cc40534f002ec0291aa67297e061a50b624d3de8f64e227f513ab1f3620e38d1d6858255 SHA512 2110e73eda97ca52a886cb708f21d8609a83655861594f3b6eb7a15b777d42eeeefc5d3b28ffc6ecc5e4f0b3fd5407f80019c2ce006f970f55455ef33eee47ee
+DIST commons-collections4-4.4-src.tar.gz 703008 BLAKE2B f4a0e858eb7412bdd431894f923a4731685ceb2463bee002401d8048cc40534f002ec0291aa67297e061a50b624d3de8f64e227f513ab1f3620e38d1d6858255 SHA512 2110e73eda97ca52a886cb708f21d8609a83655861594f3b6eb7a15b777d42eeeefc5d3b28ffc6ecc5e4f0b3fd5407f80019c2ce006f970f55455ef33eee47ee
+DIST commons-collections4-4.4-src.tar.gz.asc 499 BLAKE2B 8217d8c8714d2c07a66eca22069b40e2d1012881385172bedd29d52f14ae5c6e287ce2f097f1bde77af06677c776e45c3e67dc6c885709f6c97f61155252131c SHA512 533c47ad2cb6b6926ea8e4aaf9072b6c7a0c9d4a6becb31163a33a6cba8a9888534b74701935a0f0e797c10cbc688331d9abefc3d4085edcd9a7d29260f735ae
diff --git a/dev-java/commons-collections/commons-collections-3.2.2-r1.ebuild b/dev-java/commons-collections/commons-collections-3.2.2-r1.ebuild
deleted file mode 100644
index 77421d30330b..000000000000
--- a/dev-java/commons-collections/commons-collections-3.2.2-r1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="commons-collections:commons-collections:3.2.2"
-
-inherit java-pkg-2 java-ant-2 verify-sig
-
-DESCRIPTION="Jakarta-Commons Collections Component"
-HOMEPAGE="https://commons.apache.org/collections/"
-SRC_URI="https://archive.apache.org/dist/commons/collections/source/commons-collections-${PV}-src.tar.gz
- verify-sig? ( https://archive.apache.org/dist/commons/collections/source/commons-collections-${PV}-src.tar.gz.asc )"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos"
-RESTRICT="!test? ( test )"
-
-DEPEND="
- >=virtual/jdk-1.8:*
- test? (
- dev-java/junit:0
- dev-java/ant-junit:0
- )"
-
-RDEPEND=">=virtual/jre-1.8:*"
-
-BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-commons )"
-VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/commons.apache.org.asc"
-
-S="${WORKDIR}/${P}-src"
-
-PATCHES=(
- "${FILESDIR}/${P}-fixes.patch"
-)
-
-src_prepare() {
- default
-}
-
-src_compile() {
- local antflags
- if use test; then
- antflags="tf.jar -Djunit.jar=$(java-pkg_getjars --build-only junit)"
- fi
- eant jar $(use_doc) ${antflags}
-}
-
-src_test() {
- if [[ "${ARCH}" = "ppc" ]]; then
- einfo "tests are disabled on ppc"
- else
- ANT_TASKS="ant-junit" eant testjar -Djunit.jar="$(java-pkg_getjars junit)"
- fi
-}
-
-src_install() {
- java-pkg_newjar build/${P}.jar ${PN}.jar
- use test && \
- java-pkg_newjar build/${PN}-testframework-${PV}.jar \
- ${PN}-testframework.jar
-
- java-pkg_dohtml *.html
- if use doc; then
- java-pkg_dojavadoc build/docs/apidocs
- fi
- use source && java-pkg_dosrc src/java/*
-}
diff --git a/dev-java/commons-collections/commons-collections-3.2.2-r2.ebuild b/dev-java/commons-collections/commons-collections-3.2.2-r2.ebuild
new file mode 100644
index 000000000000..7ec6cb15cb8c
--- /dev/null
+++ b/dev-java/commons-collections/commons-collections-3.2.2-r2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="commons-collections:commons-collections:${PV}"
+JAVA_TESTING_FRAMEWORKS="junit"
+
+inherit java-pkg-2 java-pkg-simple verify-sig
+
+DESCRIPTION="Jakarta-Commons Collections Component"
+HOMEPAGE="https://commons.apache.org/collections/"
+SRC_URI="https://archive.apache.org/dist/commons/collections/source/${P}-src.tar.gz
+ verify-sig? ( https://archive.apache.org/dist/commons/collections/source/${P}-src.tar.gz.asc )"
+S="${WORKDIR}/${P}-src"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos"
+
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/commons.apache.org.asc"
+BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-commons )"
+# broken with jdk:21 - https://bugs.gentoo.org/916445
+DEPEND="
+ <=virtual/jdk-17:*
+ test? ( dev-java/junit:0 )
+"
+RDEPEND=">=virtual/jre-1.8:*"
+
+DOCS=( {NOTICE,README,RELEASE-NOTES}.txt )
+HTML_DOCS=( {DEVELOPERS-GUIDE,PROPOSAL}.html )
+
+PATCHES=( "${FILESDIR}/${P}-fixes.patch" )
+
+JAVA_SRC_DIR="src/java"
+JAVA_TEST_GENTOO_CLASSPATH="junit"
+JAVA_TEST_SRC_DIR="src/test"
+
+src_prepare() {
+ default #780585
+ java-pkg-2_src_prepare
+}
+
+src_test() {
+ if [[ "${ARCH}" = "ppc" ]]; then
+ einfo "tests are disabled on ppc"
+ else
+ java-pkg-simple_src_test
+ fi
+}
diff --git a/dev-java/commons-collections/commons-collections-4.4-r1.ebuild b/dev-java/commons-collections/commons-collections-4.4-r1.ebuild
deleted file mode 100644
index 5c4b6e0ebaee..000000000000
--- a/dev-java/commons-collections/commons-collections-4.4-r1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri mirror://apache/commons/collections/source/commons-collections4-4.4-src.tar.gz --slot 4 --keywords "~amd64 ~arm64 ~ppc64 ~x86" --ebuild commons-collections-4.4.ebuild
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.apache.commons:commons-collections4:4.4"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Extends the JCF classes with new interfaces, implementations and utilities"
-HOMEPAGE="https://commons.apache.org/proper/commons-collections/"
-SRC_URI="mirror://apache/commons/collections/source/${PN}4-${PV}-src.tar.gz -> ${P}-src.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="4"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-# Compile dependencies
-# POM: pom.xml
-# test? junit:junit:4.12 -> >=dev-java/junit-4.13.2:4
-# test? org.apache.commons:commons-lang3:3.9 -> >=dev-java/commons-lang-3.12.0:3.6
-# test? org.easymock:easymock:4.0.2 -> !!!suitable-mavenVersion-not-found!!!
-
-DEPEND="
- >=virtual/jdk-1.8:*
- test? (
- dev-java/easymock:3.2
- dev-java/commons-lang:3.6
- )
-"
-
-RDEPEND="
- >=virtual/jre-1.8:*
-"
-
-DOCS=( {CONTRIBUTING,README}.md {LICENSE,NOTICE,RELEASE-NOTES}.txt )
-HTML_DOCS=( {DEVELOPERS-GUIDE,PROPOSAL}.html )
-
-S="${WORKDIR}/commons-collections4-${PV}-src"
-
-JAVA_SRC_DIR="src/main/java"
-
-JAVA_TEST_GENTOO_CLASSPATH="junit-4,commons-lang-3.6,easymock-3.2"
-JAVA_TEST_SRC_DIR="src/test/java"
-JAVA_TEST_RESOURCE_DIRS="src/test/resources"
-JAVA_AUTOMATIC_MODULE_NAME="org.apache.commons.collections4"
-
-src_test() {
- # https://github.com/apache/commons-collections/blob/cab58b3a8093a2f6b84f12783a3fb358747310f7/pom.xml#L542-L550
- pushd src/test/java || die
- local TESTS=$(find * -name "*Test.java" ! -name "TestUtils.java" ! -name "Abstract*.java" ! -name "BulkTest.java")
- TESTS="${TESTS//.java}"
- TESTS="${TESTS//\//.}"
- popd
-
- JAVA_TEST_RUN_ONLY=( "${TESTS}" )
- java-pkg-simple_src_test
-}
-
-src_install() {
- default # https://bugs.gentoo.org/789582
- java-pkg-simple_src_install
-}
diff --git a/dev-java/commons-collections/commons-collections-4.4-r2.ebuild b/dev-java/commons-collections/commons-collections-4.4-r2.ebuild
new file mode 100644
index 000000000000..059e87b91233
--- /dev/null
+++ b/dev-java/commons-collections/commons-collections-4.4-r2.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.apache.commons:commons-collections4:${PV}"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple verify-sig
+
+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
+ verify-sig? ( https://downloads.apache.org/commons/collections/source/${PN}4-${PV}-src.tar.gz.asc )"
+S="${WORKDIR}/commons-collections4-${PV}-src"
+
+LICENSE="Apache-2.0"
+SLOT="4"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
+
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/commons.apache.org.asc"
+BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-commons )"
+# broken with jdk:21 - https://bugs.gentoo.org/916445
+DEPEND="
+ <=virtual/jdk-17:*
+ test? (
+ dev-java/easymock:3.2
+ dev-java/commons-lang:3.6
+ )
+"
+RDEPEND=">=virtual/jre-1.8:*"
+
+DOCS=( {CONTRIBUTING,README}.md {NOTICE,RELEASE-NOTES}.txt )
+HTML_DOCS=( {DEVELOPERS-GUIDE,PROPOSAL}.html )
+
+JAVA_AUTOMATIC_MODULE_NAME="org.apache.commons.collections4"
+JAVA_SRC_DIR="src/main/java"
+JAVA_TEST_GENTOO_CLASSPATH="
+ commons-lang-3.6
+ easymock-3.2
+ junit-4
+"
+JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+JAVA_TEST_SRC_DIR="src/test/java"
+
+src_test() {
+ # https://github.com/apache/commons-collections/blob/commons-commons-collections-4.4/pom.xml#L542-L550
+ pushd src/test/java || die
+ local JAVA_TEST_RUN_ONLY=$(find * \
+ -name "*Test.java" \
+ ! -name "TestUtils.java" \
+ ! -name "Abstract*.java" \
+ ! -name "BulkTest.java")
+ JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}"
+ JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}"
+ popd
+ java-pkg-simple_src_test
+}
diff --git a/dev-java/commons-collections/metadata.xml b/dev-java/commons-collections/metadata.xml
index 62a57c23950f..23e31dd764c3 100644
--- a/dev-java/commons-collections/metadata.xml
+++ b/dev-java/commons-collections/metadata.xml
@@ -5,6 +5,12 @@
<email>java@gentoo.org</email>
<name>Java</name>
</maintainer>
+ <upstream>
+ <bugs-to>https://issues.apache.org/jira/projects/COLLECTIONS/issues</bugs-to>
+ <changelog>https://commons.apache.org/proper/commons-collections/changes-report.html</changelog>
+ <doc>https://commons.apache.org/proper/commons-collections/userguide.html</doc>
+ <remote-id type="github">apache/commons-collections</remote-id>
+ </upstream>
<longdescription>
The Apache Commons Collections package contains types that extend and augment the Java Collections Framework.
</longdescription>
diff --git a/dev-java/commons-compress/Manifest b/dev-java/commons-compress/Manifest
index e433074b748e..9602eaf51057 100644
--- a/dev-java/commons-compress/Manifest
+++ b/dev-java/commons-compress/Manifest
@@ -1 +1,3 @@
DIST commons-compress-1.21-src.tar.gz 15165800 BLAKE2B 3fed32af039860c6b434c485f0c78939ed810a224a12680ddf1d9d6ed540f4e74530edd0e0077fd41af31404c296a607db912465cfd725c31446bc6fa7b8df8a SHA512 8041371b491057435ca62390e70b30031e4d21e80c37d9cb922fdffa794b56aee3b5d60d8241e4db0cecc28c82dfdaafbe52b2175e26062da169fec8efbb17e1
+DIST commons-compress-1.25.0-src.tar.gz 48385431 BLAKE2B d0ddf5ebc405355c771532dc64ddcacb6a8eb0053eb64a07890136b9f5a2ab2ae8dec33c64a80ee9d902b4c74295e80b1bf66178c19e19bfd0d4cd31acbbcc44 SHA512 58d9ed8160af2842fe4338ae265d591b9f96293f8997c420721e86f8c8ffce5b3a5dbc83b87b813ea68505b56cbddd02332540f0a4e01bdc7f7f36e357ba2b7a
+DIST commons-compress-1.25.0-src.tar.gz.asc 488 BLAKE2B 4a530dee5953e9fa11d99fe7bbfaadd16eef8eb48b50a4edd6c1416766c11d261e9af4632f0601d5cc2d97e73be4e7e0c1a15857e9e5e4a43c54ba9ddaa0e65d SHA512 4ced6e60590ab110c948766cdd86349e66605f9711b650ba8f4514dfd0cfb22c7b8d356a9e4433b3dfa4ceffddc3de53f8a1f174ab33d80e9f77d7469ed916ae
diff --git a/dev-java/commons-compress/commons-compress-1.25.0.ebuild b/dev-java/commons-compress/commons-compress-1.25.0.ebuild
new file mode 100644
index 000000000000..9eca7a8afbba
--- /dev/null
+++ b/dev-java/commons-compress/commons-compress-1.25.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Not ready for running tests, https://bugs.gentoo.org/839681
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="org.apache.commons:commons-compress:${PV}"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple verify-sig
+
+DESCRIPTION="Java API for working with archive files"
+HOMEPAGE="https://commons.apache.org/proper/commons-compress/"
+SRC_URI="mirror://apache/commons/compress/source/${P}-src.tar.gz
+ verify-sig? ( https://downloads.apache.org/commons/compress/source/${P}-src.tar.gz.asc )"
+S="${WORKDIR}/${P}-src"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/commons.apache.org.asc"
+BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-commons )"
+CP_DEPEND="
+ dev-java/asm:9
+ dev-java/brotli-dec:0
+ dev-java/xz-java:0
+ dev-java/zstd-jni:0
+"
+DEPEND="${CP_DEPEND}
+ >=virtual/jdk-11:*
+ dev-java/osgi-core:0"
+RDEPEND="${CP_DEPEND}
+ >=virtual/jre-1.8:*"
+
+JAVA_AUTOMATIC_MODULE_NAME="org.apache.commons.compress"
+JAVA_CLASSPATH_EXTRA="osgi-core"
+JAVA_ENCODING="iso-8859-1"
+JAVA_MAIN_CLASS="org.apache.commons.compress.archivers.Lister"
+JAVA_SRC_DIR="src/main/java"
diff --git a/dev-java/commons-compress/metadata.xml b/dev-java/commons-compress/metadata.xml
index 6021501589e0..add1db7ad802 100644
--- a/dev-java/commons-compress/metadata.xml
+++ b/dev-java/commons-compress/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>
+ <upstream>
+ <remote-id type="github">apache/commons-compress</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-java/commons-daemon/Manifest b/dev-java/commons-daemon/Manifest
index 4135d040e978..2255e60c5501 100644
--- a/dev-java/commons-daemon/Manifest
+++ b/dev-java/commons-daemon/Manifest
@@ -1,4 +1,2 @@
-DIST commons-daemon-1.3.3-src.tar.gz 290415 BLAKE2B c9c175ba52cef25ce6d1b56c7466aa5e775ed1ac3ca7c710c3519574c35e8a66ff5846313de8da594511ad411e802b7e0b647cbfd66a50abaaa0d39574a4e103 SHA512 ec246e2c05d66408374ba56b3715b13f8f24f89af11fa00c2381dc19c188f1b6228f19351c97d5774808a804b83fdbdfb8f537d099db062c39ffd281c142ee77
-DIST commons-daemon-1.3.3-src.tar.gz.asc 873 BLAKE2B 01fc7ec60393f2077a2bbf80aacb1a03b821cb52f88d87010f26a5811e2695d08b7c01193d00c2fb1a28bb875b63a5a0a935feadf7c1f00c4799aafa32592804 SHA512 c42b36acd45665daeda06a59006f05fd9846817e4e1065ef89dfedef060216ecce0316d06400437e4fb5138cf41c2fe52790cd5da9306c64e3000a3765bad2a2
DIST commons-daemon-1.3.4-src.tar.gz 290834 BLAKE2B be57fbf89cad23fb4108e97b8e75d8380ff5b286068edfed65cd3539971375949ec80fd5aeece50a6498642f60e26498eb37ea3778f503d7498662ae79ecd14e SHA512 bb36d88bc21a5777245012b2a73ee0e764b85715731f54cc4ff09343e95ccb18fc6c68b3ae9c680fb45a60c7ef5ed0f9e40991c2c03246dd7f8dd65031eddf24
DIST commons-daemon-1.3.4-src.tar.gz.asc 873 BLAKE2B f7886e67e2cfb0211d3271d79c251d07e5b0d7f7819566891e838619021ab9e3f468e3647f2f901d41a6d00f12b30adfa2d16f828ac5ce526666caab30ab8001 SHA512 eae6b01844bf5c49a95a60f4b59e0b989488728edb209252779f83e33ea3eeb53900a5fdeee5d953b231b241ba14a27c77967bdd3fe5acf2d9c6da50c225c79b
diff --git a/dev-java/commons-daemon/commons-daemon-1.3.3.ebuild b/dev-java/commons-daemon/commons-daemon-1.3.3.ebuild
deleted file mode 100644
index 839625a12d88..000000000000
--- a/dev-java/commons-daemon/commons-daemon-1.3.3.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2023 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/daemon/source/commons-daemon-1.3.3-src.tar.gz --slot 0 --keywords "~amd64 ~ppc64 ~x86" --ebuild commons-daemon-1.3.3.ebuild
-
-EAPI=8
-
-# No tests because "package org.junit.jupiter.api does not exist"
-JAVA_PKG_IUSE="doc source"
-MAVEN_ID="commons-daemon:commons-daemon:1.3.3"
-
-inherit java-pkg-2 java-pkg-simple toolchain-funcs verify-sig
-
-DESCRIPTION="Tools to allow Java programs to run as UNIX daemons"
-HOMEPAGE="https://commons.apache.org/proper/commons-daemon/"
-SRC_URI="mirror://apache/commons/daemon/source/${P}-src.tar.gz
- verify-sig? ( https://downloads.apache.org/commons/daemon/source/${P}-src.tar.gz.asc )"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
-
-DEPEND=">=virtual/jdk-1.8:*"
-RDEPEND=">=virtual/jre-1.8:*"
-
-BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-commons )"
-VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/commons.apache.org.asc"
-
-DOCS=( {CONTRIBUTING,README}.md {HOWTO-RELEASE,NOTICE,RELEASE-NOTES}.txt )
-HTML_DOCS=( PROPOSAL.html )
-PATCHES=( "${FILESDIR}/commons-daemon-1.3.1-Make.patch" )
-
-S="${WORKDIR}/${P}-src"
-
-JAVA_ENCODING="iso-8859-1"
-JAVA_SRC_DIR="src/main/java"
-
-src_prepare() {
- default #780585
- java-pkg-2_src_prepare
-}
-
-src_compile() {
- java-pkg-simple_src_compile
-
- pushd src/native/unix || die
- ./configure
- emake AR="$(tc-getAR)"
- popd
-}
-
-src_install() {
- java-pkg-simple_src_install
- dobin src/native/unix/jsvc
-}
diff --git a/dev-java/commons-daemon/commons-daemon-1.3.4.ebuild b/dev-java/commons-daemon/commons-daemon-1.3.4.ebuild
index ede046cf7682..fcc845ad0c9a 100644
--- a/dev-java/commons-daemon/commons-daemon-1.3.4.ebuild
+++ b/dev-java/commons-daemon/commons-daemon-1.3.4.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${P}-src"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86"
+KEYWORDS="amd64 ppc64 x86"
RESTRICT="test" #839681
VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/commons.apache.org.asc"
diff --git a/dev-java/commons-httpclient/Manifest b/dev-java/commons-httpclient/Manifest
index a8ecdcddf113..f2e83ed5113b 100644
--- a/dev-java/commons-httpclient/Manifest
+++ b/dev-java/commons-httpclient/Manifest
@@ -1 +1,2 @@
DIST commons-httpclient-3.1-src.tar.gz 1882664 BLAKE2B ccf96bedad09011ee20eae38aae1fdfdd6fea5a8226f4b4d156762080c286c71b34c149035abfd61e70c55a1de84ab3cd38d73c3228f591dd8e16c0a7e79c3a5 SHA512 e73ceeba3f34a35c30b24a3c6cb8dfc2102ff21079a5ff9270935908cb2f707d366c2f31a53fbdafa99673cc2b82e05470a2bf40d96767c72b2ab037c0f55490
+DIST commons-httpclient-3.1-src.tar.gz.asc 189 BLAKE2B 44661748db96429682a82d8dba5ad71d0d1fc2aaf03e2f1dda059985757547a78ab04dff38863ca421e65d13100a68c8cb909ed4c34e0a66a837b6fdb91baf63 SHA512 3832c90048de4db1f96efecd2f467153f0bdce1ebd533b848b8fc78a92da0bba3ba8bb3447e6c8d34f4c1c731a5b41ab941754a1509728ff4ea96e238927ab09
diff --git a/dev-java/commons-httpclient/commons-httpclient-3.1-r3.ebuild b/dev-java/commons-httpclient/commons-httpclient-3.1-r3.ebuild
new file mode 100644
index 000000000000..8fddddf7510f
--- /dev/null
+++ b/dev-java/commons-httpclient/commons-httpclient-3.1-r3.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="commons-httpclient:commons-httpclient:3.1"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple verify-sig
+
+DESCRIPTION="The Jakarta Commons HttpClient library"
+HOMEPAGE="https://hc.apache.org/httpclient-legacy/"
+SRC_URI="mirror://apache/httpcomponents/${PN}/source/${P}-src.tar.gz
+ verify-sig? ( https://downloads.apache.org/httpcomponents/commons-httpclient/source/${P}-src.tar.gz.asc )"
+S="${WORKDIR}/${P}"
+
+LICENSE="Apache-2.0"
+SLOT="3"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 ~x86"
+
+# Tests run: 2036, Failures: 91
+RESTRICT="test"
+
+VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/httpclient.commons.apache.org.asc"
+BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-commons-httpclient )"
+DEPEND="
+ dev-java/commons-logging:0
+ dev-java/commons-codec:0
+ >=virtual/jdk-1.8:*
+ test? ( >=dev-java/ant-1.10.14:0[junit] )
+"
+RDEPEND=">=virtual/jre-1.8:*"
+
+DOCS=( NOTICE README RELEASE_NOTES )
+
+JAVA_ENCODING="ISO-8859-1"
+JAVA_CLASSPATH_EXTRA="
+ commons-logging
+ commons-codec
+"
+JAVA_SRC_DIR="src/java"
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_SRC_DIR="src/test"
+
+src_prepare() {
+ java-pkg-2_src_prepare
+ rm -r docs/apidocs || die "clean apidocs"
+}
+
+src_install() {
+ java-pkg-simple_src_install
+ use doc && docinto html dodoc -r docs
+}
diff --git a/dev-java/commons-imaging/Manifest b/dev-java/commons-imaging/Manifest
index 5472b1ce60c6..f9c3e790ff64 100644
--- a/dev-java/commons-imaging/Manifest
+++ b/dev-java/commons-imaging/Manifest
@@ -1 +1,3 @@
DIST commons-imaging-1.0-alpha3-src.tar.gz 39966281 BLAKE2B f0fbb6d7ae0c12be19fe13d3ff4e1cced5acfe7ea72326528c67b57fade73c0acee3eb8eaa62b3d40c473c0c2faf7f60ec190bc0954c5159405358bfac4efd42 SHA512 16300adb5873fef464bedfdce7e1368f52add8d33087f059667840880b8666024feeecdb278a53d5c3d8e76d01ab921ea146d41ca688757f0cf0c2f2b32b0d53
+DIST commons-imaging-1.0-alpha3-src.tar.gz.asc 833 BLAKE2B b28631badf344fa476a99db78e26a9453d033d21dba8484b2621a4cb0295ea262f58d2df4f8afd6d8090ecd0ea98ec2dca0168e2b401d662c335ad1ef9518b98 SHA512 b7e6691d5eac6f81657dc42aa69184da7fd1bf364da391ac4e1a27991d9a8bbba23296d58b874b4c69a20d39c3c1e821ca19c312f3e71b3acd8903156a2a0a1d
+DIST apache-sanselan-incubating-0.97-src.tar.gz 33317875 BLAKE2B c9db6c30accc308d2c5d5977b84da118ab50b010b3728665a75dab13f9fecb70075e2d2208a62fabc57af7396f7c39b1ec498e0840e5a2c9c8de9b95d2dd597a SHA512 b7e8af01f4b4ca812313bbf573758d9c0e1355266bfb83898336b14c4b492a8979f2a593f00d53c076e83cf807a049df624491a26623cfbceb00560b748f05f2
diff --git a/dev-java/commons-imaging/commons-imaging-0.97.ebuild b/dev-java/commons-imaging/commons-imaging-0.97.ebuild
new file mode 100644
index 000000000000..6017ef9c71e8
--- /dev/null
+++ b/dev-java/commons-imaging/commons-imaging-0.97.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="A minimalistic realtime charting library for Java"
+HOMEPAGE="https://commons.apache.org/proper/commons-imaging/"
+SRC_URI="https://archive.apache.org/dist/commons/sanselan/source/apache-sanselan-incubating-${PV}-src.tar.gz"
+S="${WORKDIR}/sanselan-${PV}-incubator"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+RESTRICT="test" # 5/48 failures, dunno why :(
+
+DEPEND=">=virtual/jdk-1.8:*
+ test? ( dev-java/junit:4 )"
+RDEPEND=">=virtual/jre-1.8:*"
+
+JAVA_ENCODING="ISO-8859-1"
+JAVA_SRC_DIR="src/main/java"
+
+src_prepare() {
+ java-pkg-2_src_prepare
+ # Tsk, Windows developers…
+ find src/test/java -name "*.java" -exec sed -i 's:\\:/:g' {} + || die
+}
+
+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_alpha3-r2.ebuild b/dev-java/commons-imaging/commons-imaging-1.0_alpha3-r2.ebuild
new file mode 100644
index 000000000000..73382ff1998c
--- /dev/null
+++ b/dev-java/commons-imaging/commons-imaging-1.0_alpha3-r2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="org.apache.commons:commons-imaging:${PV/_/-}"
+
+inherit java-pkg-2 java-pkg-simple verify-sig
+
+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/${P/_/-}-src.tar.gz
+ verify-sig? ( https://downloads.apache.org/commons/imaging/source/${P/_/-}-src.tar.gz.asc )"
+S="${WORKDIR}/${P/_/-}-src"
+
+LICENSE="Apache-2.0"
+SLOT="1"
+KEYWORDS="~amd64 ~x86"
+
+VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/commons.apache.org.asc"
+BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-commons )"
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
+
+DOCS=( {NOTICE,RELEASE-NOTES}.txt README.md )
+PATCHES=( "${FILESDIR}/commons-imaging-1.0_alpha3-PngChunk.javadoc.patch" )
+
+JAVA_SRC_DIR="src/main/java"
+JAVA_RESOURCE_DIRS="src/main/resources"
+JAVA_AUTOMATIC_MODULE_NAME="org.apache.commons.imaging"
+
+src_prepare() {
+ default #780585
+ java-pkg-2_src_prepare
+}
diff --git a/dev-java/commons-imaging/commons-imaging-1.0_alpha3.ebuild b/dev-java/commons-imaging/commons-imaging-1.0_alpha3.ebuild
deleted file mode 100644
index 338fc76ea1a4..000000000000
--- a/dev-java/commons-imaging/commons-imaging-1.0_alpha3.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri mirror://apache/commons/imaging/source/commons-imaging-1.0-alpha3-src.tar.gz --slot 0 --keywords "~amd64 ~x86" --ebuild commons-imaging-1.0_alpha3.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"
-JAVA_AUTOMATIC_MODULE_NAME="org.apache.commons.imaging"
diff --git a/dev-java/commons-imaging/files/commons-imaging-1.0_alpha3-PngChunk.javadoc.patch b/dev-java/commons-imaging/files/commons-imaging-1.0_alpha3-PngChunk.javadoc.patch
new file mode 100644
index 000000000000..03f8074b8f3a
--- /dev/null
+++ b/dev-java/commons-imaging/files/commons-imaging-1.0_alpha3-PngChunk.javadoc.patch
@@ -0,0 +1,12 @@
+https://bugs.gentoo.org/861767
+--- a/src/main/java/org/apache/commons/imaging/formats/png/chunks/PngChunk.java
++++ b/src/main/java/org/apache/commons/imaging/formats/png/chunks/PngChunk.java
+@@ -24,7 +24,7 @@ import org.apache.commons.imaging.common.BinaryFileParser;
+ * A PNG image is composed of several chunks. This is the base class for the chunks,
+ * used by the parser.
+ *
+- * @see <a href="https://en.wikipedia.org/wiki/Portable_Network_Graphics#%22Chunks%22_within_the_file>Portable_Network_Graphics</a>
++ * @see <a href="https://en.wikipedia.org/wiki/Portable_Network_Graphics#%22Chunks%22_within_the_file">Portable_Network_Graphics</a>
+ */
+ public class PngChunk extends BinaryFileParser {
+ public final int length;
diff --git a/dev-java/concurrentlinkedhashmap-lru/Manifest b/dev-java/concurrentlinkedhashmap-lru/Manifest
new file mode 100644
index 000000000000..1e9c38335e81
--- /dev/null
+++ b/dev-java/concurrentlinkedhashmap-lru/Manifest
@@ -0,0 +1 @@
+DIST concurrentlinkedhashmap-lru-1.4.2.tar.gz 245357 BLAKE2B ac743e2be30195f171154c179ac1b4a6bc6b563b080555c664cdd57fc30d083525f03a8367a891e1087623d455adef27c7ff7416b5c8523c01fc3d5ef775a185 SHA512 95f33cdeb2e3e65be0fa26a825339c4c60eb830e07895fbae731103ef14a9599137f8fad18f9b0a582ec2552ccc1391f5d0338837395e35c1d28de977614a199
diff --git a/dev-java/concurrentlinkedhashmap-lru/concurrentlinkedhashmap-lru-1.4.2.ebuild b/dev-java/concurrentlinkedhashmap-lru/concurrentlinkedhashmap-lru-1.4.2.ebuild
new file mode 100644
index 000000000000..1cc5901e7454
--- /dev/null
+++ b/dev-java/concurrentlinkedhashmap-lru/concurrentlinkedhashmap-lru-1.4.2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="com.googlecode.concurrentlinkedhashmap:concurrentlinkedhashmap-lru:${PV}"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="A high performance version of java.util.LinkedHashMap for use as software cache"
+HOMEPAGE="https://github.com/ben-manes/concurrentlinkedhashmap"
+SRC_URI="https://github.com/ben-manes/concurrentlinkedhashmap/archive/${P}.tar.gz"
+S="${WORKDIR}/${PN%lru}${P}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+CP_DEPEND="dev-java/jsr305:0"
+
+RDEPEND=">=virtual/jre-1.8:*
+ ${CP_DEPEND}"
+DEPEND=">=virtual/jdk-1.8:*
+ ${CP_DEPEND}"
+
+JAVA_SRC_DIR="src/main/java"
+
+src_prepare() {
+ java-pkg-2_src_prepare
+ # https://github.com/ben-manes/concurrentlinkedhashmap/issues/46#issuecomment-160696203
+ rm src/main/java/com/googlecode/concurrentlinkedhashmap/ConcurrentHashMapV8.java || die
+ sed \
+ -e 's/ConcurrentHashMapV8/ConcurrentHashMap/' \
+ -i src/main/java/com/googlecode/concurrentlinkedhashmap/ConcurrentLinkedHashMap.java || die
+}
diff --git a/dev-java/concurrentlinkedhashmap-lru/metadata.xml b/dev-java/concurrentlinkedhashmap-lru/metadata.xml
new file mode 100644
index 000000000000..fe2d156a4574
--- /dev/null
+++ b/dev-java/concurrentlinkedhashmap-lru/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>java@gentoo.org</email>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">ben-manes/concurrentlinkedhashmap</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-java/coursier-bin/Manifest b/dev-java/coursier-bin/Manifest
index d8d59c15783b..a8c781924e73 100644
--- a/dev-java/coursier-bin/Manifest
+++ b/dev-java/coursier-bin/Manifest
@@ -1,2 +1,3 @@
DIST coursier-bin-2.1.5.gz 20679081 BLAKE2B 8ab0d971949b7a5527c82686fab9d62f6dc360ce7ff72bfc4d5a123401e577f17b2392e9a919aebe1c988a477a273d77cd3eb86dcb7b73c0c1a609cccac77eea SHA512 6397f13f82c91079575f58ccbd35e788a2760179cf5c11a986962e3bbe9c669b6e06730a6ff12e0aeb26198df4448e822e927a5d6bd031f67dab8072835979f6
DIST coursier-bin-2.1.7.gz 20790038 BLAKE2B 6e362ae784fcb7007f0adc58604d72dba33cb37f0726883b69f9f298e38759e3acea0232edac30c7cb34c5b837598e6b2c0947345938bce196f7a326a4aa3f0e SHA512 b6df4d7ad89f735989dfb4bb8cacbdf1559dd5ea4f494b7e72df544bd24a3a208738cf37d1cfd7944bb6aebc0e1b6d32b1bfd48c9f333cf54919a055afd5348e
+DIST coursier-bin-2.1.8.gz 20863902 BLAKE2B 13ce0a1aa6dd2c1272567a76f3a762e31d9d6794e034e033d5d5accd0b6c534702fc62b5cab83070bb1081c7072ad7a04be86c38b4929d75f2d1f050f320820d SHA512 9cc8f13ecd0c166d46aaeeedb9279eb2885a7edac24c5b106ca30968c4c6fc5f47efe3a38e7aa6864dee517a7bc2cfba71fdd32741d295887bdb62594832bb9e
diff --git a/dev-java/coursier-bin/coursier-bin-2.1.8.ebuild b/dev-java/coursier-bin/coursier-bin-2.1.8.ebuild
new file mode 100644
index 000000000000..af4c8329d0bf
--- /dev/null
+++ b/dev-java/coursier-bin/coursier-bin-2.1.8.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+get_orig_coursier_pv() {
+ local orig_pv=$(ver_rs 3 -)
+ orig_pv=${orig_pv/rc/RC}
+ orig_pv=${orig_pv/pre/M}
+ echo "${orig_pv}"
+}
+
+DESCRIPTION="Java/Scala artifact fetching, bundling and deploying"
+HOMEPAGE="https://get-coursier.io/"
+SRC_URI="https://github.com/coursier/coursier/releases/download/v$(get_orig_coursier_pv)/cs-x86_64-pc-linux.gz -> ${P}.gz"
+
+KEYWORDS="~amd64"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+S="${WORKDIR}"
+
+RDEPEND=">=virtual/jre-8"
+
+QA_FLAGS_IGNORED="usr/bin/coursier"
+QA_TEXTRELS="usr/bin/coursier"
+
+src_install() {
+ newbin "${P}" coursier
+}
diff --git a/dev-java/cpptasks/cpptasks-1.0_beta5-r2.ebuild b/dev-java/cpptasks/cpptasks-1.0_beta5-r2.ebuild
new file mode 100644
index 000000000000..45b3f283d970
--- /dev/null
+++ b/dev-java/cpptasks/cpptasks-1.0_beta5-r2.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2024 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-1.10.14:0
+ dev-java/xerces:2
+"
+
+DEPEND="
+ >=virtual/jdk-1.8:*
+ ${CP_DEPEND}
+ test? (
+ >=dev-java/ant-1.10.14:0[junit]
+ 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/eclipse-ecj/Manifest b/dev-java/eclipse-ecj/Manifest
index 3166accfca73..b68a29378f06 100644
--- a/dev-java/eclipse-ecj/Manifest
+++ b/dev-java/eclipse-ecj/Manifest
@@ -1,4 +1,3 @@
DIST ecjsrc-4.15.jar 2166228 BLAKE2B 794e0ba1a19b325e2dd8ad0b288ccbe04866627670b50d39dd327c13fe1fac56200eb3a6c1c3d1af043cad795508b9b714a5243049671414b5a62a97725d3297 SHA512 ada55b2522cf26570f0cd43f415eb5cf20e6840f83dadc72e1ae474ebf10eadca73f9fa3d1db51e13fd2762c38cd3e3567db3c7840d43ae3d8665ebe35e1889d
DIST ecjsrc-4.26.jar 2347137 BLAKE2B 22e627178fe35f34cee7ba63e740ef2699bca691d460c81e97c2f18c197042cc0d901eea988331b3fa2ac7daa87daef9ee90bc1e62901935a6f2f3fe5f1e8534 SHA512 e53534160e6a2cdc8c5db7caec617d5671eb59954a86b9dcb36a514024c3205167c8416560796ce61d1aa188f551660f3bfd8eab46fefe9111c8f0b7a977342f
-DIST ecjsrc-4.27.jar 2301849 BLAKE2B 77f35d1a9f36086e8515dc9437894b84c88fd440bd48b5248b141191bc04babfcf1af288643ed21e41cb054bdcfa94125a7eb139cbec9ead97e366c65c1dbe95 SHA512 689fe9ed2327f1d0e89fd13c3543369e0e13d7f15f521fc7667352e7f8d7f0b48107bc180ac16cfad375449cc2b61de74bc8ca56c95cab9ef172260a9d3a530b
-DIST ecjsrc-4.29.jar 2319437 BLAKE2B 2ce2432a80c725a169337737908bc8d1fb531e57380e05e069558463ffece2f4851635796550d14c3383c1e365c06802937618dd3ddd90472a541f1ca491dc91 SHA512 d9ead697d8e880b3bc537117446453d21f648a0bcbe3044123acfd7c9118dae12211ebba1efc4a0fe890ea25d80634da09792398caea7121c87c084eb921e78f
+DIST ecjsrc-4.30.jar 2330181 BLAKE2B 7f3ba7f8dbfcaea9f8bbcdb8161ae8f164e2bf3469cf2242b6b7df5d375c98322f810b9c6de7209f622740a2cc61704915d255559bd376bf158b114e30a17d40 SHA512 ddc1569082fad0dcf91a9d41d5ef5f2f694f007e1378af5f5f28893aeb91e99acef91af59c762010eba071fa8b8b8a9d367b08e23f91b8c73ceacc6e6150bb23
diff --git a/dev-java/eclipse-ecj/eclipse-ecj-4.15-r1.ebuild b/dev-java/eclipse-ecj/eclipse-ecj-4.15-r1.ebuild
new file mode 100644
index 000000000000..6f1440c1f82f
--- /dev/null
+++ b/dev-java/eclipse-ecj/eclipse-ecj-4.15-r1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple prefix
+
+DMF="R-${PV}-202003050155"
+
+DESCRIPTION="Eclipse Compiler for Java"
+HOMEPAGE="https://www.eclipse.org/"
+SRC_URI="https://archive.eclipse.org/eclipse/downloads/drops4/${DMF}/ecjsrc-${PV}.jar"
+S="${WORKDIR}"
+
+LICENSE="EPL-1.0"
+KEYWORDS="amd64 ~arm ~arm64"
+SLOT="4.15"
+
+BDEPEND="
+ app-arch/unzip
+ app-arch/zip
+"
+COMMON_DEP="app-eselect/eselect-java"
+DEPEND="${COMMON_DEP}
+ >=dev-java/ant-1.10.14:0
+ >=virtual/jdk-11:*"
+RDEPEND="${COMMON_DEP}
+ !dev-java/ant-eclipse-ecj:4.15
+ >=virtual/jre-1.8:*"
+
+JAVA_AUTOMATIC_MODULE_NAME="org.eclipse.jdt.core.compiler.batch"
+JAVA_CLASSPATH_EXTRA="ant"
+JAVA_JAR_FILENAME="ecj.jar"
+JAVA_LAUNCHER_FILENAME="ecj-${SLOT}"
+JAVA_MAIN_CLASS="org.eclipse.jdt.internal.compiler.batch.Main"
+JAVA_RESOURCE_DIRS="res"
+
+src_prepare() {
+ java-pkg-2_src_prepare
+
+ mkdir "${JAVA_RESOURCE_DIRS}" || die
+ find org META-INF -type f \
+ ! -name '*.java' \
+ | xargs cp --parent -t "${JAVA_RESOURCE_DIRS}" || die
+}
+
+src_install() {
+ java-pkg-simple_src_install
+ insinto /usr/share/java-config-2/compiler
+ doins "${FILESDIR}/ecj-${SLOT}"
+ eprefixify "${ED}"/usr/share/java-config-2/compiler/ecj-${SLOT}
+}
+
+pkg_postinst() {
+ einfo "To select between slots of ECJ..."
+ einfo " # eselect ecj"
+
+ eselect ecj update ecj-${SLOT}
+}
+
+pkg_postrm() {
+ eselect ecj update
+}
diff --git a/dev-java/eclipse-ecj/eclipse-ecj-4.27-r2.ebuild b/dev-java/eclipse-ecj/eclipse-ecj-4.26-r2.ebuild
index c71988b8619d..8843146e1f91 100644
--- a/dev-java/eclipse-ecj/eclipse-ecj-4.27-r2.ebuild
+++ b/dev-java/eclipse-ecj/eclipse-ecj-4.26-r2.ebuild
@@ -1,43 +1,37 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
JAVA_PKG_IUSE="doc source"
-# 3.33.0 according to
-# https://github.com/eclipse-jdt/eclipse.jdt.core/blob/R4_27/org.eclipse.jdt.core.compiler.batch/pom.xml#L20
-MAVEN_ID="org.eclipse.jdt:org.eclipse.jdt.core.compiler.batch:3.33.0"
inherit java-pkg-2 java-pkg-simple prefix
-DMF="R-${PV}-202303020300"
+DMF="R-${PV}-202211231800"
DESCRIPTION="Eclipse Compiler for Java"
HOMEPAGE="https://www.eclipse.org/"
-SRC_URI="https://download.eclipse.org/eclipse/downloads/drops4/${DMF}/ecjsrc-${PV}.jar"
+SRC_URI="https://archive.eclipse.org/eclipse/downloads/drops4/${DMF}/ecjsrc-${PV}.jar"
S="${WORKDIR}"
LICENSE="EPL-1.0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-SLOT="4.27"
+KEYWORDS="amd64 ~arm ~arm64"
+SLOT="4.26"
BDEPEND="
app-arch/unzip
app-arch/zip
"
COMMON_DEP="app-eselect/eselect-java"
-# ElementsImpl9.java:206: error:
-# method does not override or implement a method from a supertype
DEPEND="${COMMON_DEP}
- dev-java/ant-core:0
- >=virtual/jdk-21:*"
+ >=dev-java/ant-1.10.14:0
+ >=virtual/jdk-17:*"
RDEPEND="${COMMON_DEP}
+ !dev-java/ant-eclipse-ecj:4.26
>=virtual/jre-11:*"
-DOCS=( org/eclipse/jdt/core/README.md )
-
JAVA_AUTOMATIC_MODULE_NAME="org.eclipse.jdt.core.compiler.batch"
-JAVA_CLASSPATH_EXTRA="ant-core"
+JAVA_CLASSPATH_EXTRA="ant"
JAVA_JAR_FILENAME="ecj.jar"
JAVA_LAUNCHER_FILENAME="ecj-${SLOT}"
JAVA_MAIN_CLASS="org.eclipse.jdt.internal.compiler.batch.Main"
@@ -47,14 +41,14 @@ src_prepare() {
java-pkg-2_src_prepare
mkdir "${JAVA_RESOURCE_DIRS}" || die
- find -type f \
+ find org META-INF -type f \
! -name '*.java' \
| xargs cp --parent -t "${JAVA_RESOURCE_DIRS}" || die
}
src_compile() {
java-pkg-simple_src_compile
- # Error: A JNI error has occurred, please check your installation and try again
+ #925083
# Exception in thread "main" java.lang.SecurityException: Invalid signature file digest for Manifest main attributes
zip -d ecj.jar "META-INF/ECLIPSE_.RSA" || die "Failed to remove ECLIPSE_.RSA"
zip -d ecj.jar "META-INF/ECLIPSE_.SF" || die "Failed to remove ECLIPSE_.SF"
diff --git a/dev-java/eclipse-ecj/eclipse-ecj-4.29-r1.ebuild b/dev-java/eclipse-ecj/eclipse-ecj-4.30-r1.ebuild
index 0de20cf2511c..8198793a6a85 100644
--- a/dev-java/eclipse-ecj/eclipse-ecj-4.29-r1.ebuild
+++ b/dev-java/eclipse-ecj/eclipse-ecj-4.30-r1.ebuild
@@ -1,25 +1,25 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
JAVA_PKG_IUSE="doc source"
-# 3.35.0 according to
-# https://github.com/eclipse-jdt/eclipse.jdt.core/blob/R4_29/org.eclipse.jdt.core.compiler.batch/pom.xml#L20
-MAVEN_ID="org.eclipse.jdt:org.eclipse.jdt.core.compiler.batch:3.35.0"
+# 3.36.0 according to
+# https://github.com/eclipse-jdt/eclipse.jdt.core/blob/R4_30/org.eclipse.jdt.core.compiler.batch/pom.xml#L20
+MAVEN_ID="org.eclipse.jdt:org.eclipse.jdt.core.compiler.batch:3.36.0"
inherit java-pkg-2 java-pkg-simple prefix
-DMF="R-${PV}-202309031000"
+DMF="R-${PV/_rc/RC}-202312010110"
DESCRIPTION="Eclipse Compiler for Java"
HOMEPAGE="https://www.eclipse.org/"
-SRC_URI="https://download.eclipse.org/eclipse/downloads/drops4/${DMF}/ecjsrc-${PV}.jar"
+SRC_URI="https://download.eclipse.org/eclipse/downloads/drops4/${DMF}/ecjsrc-${PV/_rc/RC}.jar"
S="${WORKDIR}"
LICENSE="EPL-1.0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-SLOT="4.29"
+KEYWORDS="~amd64 ~arm64"
+SLOT="4.30"
BDEPEND="
app-arch/unzip
@@ -29,7 +29,7 @@ COMMON_DEP="app-eselect/eselect-java"
# ElementsImpl9.java:206: error:
# method does not override or implement a method from a supertype
DEPEND="${COMMON_DEP}
- dev-java/ant-core:0
+ >=dev-java/ant-1.10.14:0
>=virtual/jdk-21:*"
# Parser.java:1095: error:
# pattern matching in instanceof is not supported in -source 11
@@ -39,7 +39,7 @@ RDEPEND="${COMMON_DEP}
DOCS=( org/eclipse/jdt/core/README.md )
JAVA_AUTOMATIC_MODULE_NAME="org.eclipse.jdt.core.compiler.batch"
-JAVA_CLASSPATH_EXTRA="ant-core"
+JAVA_CLASSPATH_EXTRA="ant"
JAVA_JAR_FILENAME="ecj.jar"
JAVA_LAUNCHER_FILENAME="ecj-${SLOT}"
JAVA_MAIN_CLASS="org.eclipse.jdt.internal.compiler.batch.Main"
diff --git a/dev-java/eclipse-ecj/files/ecj-4.15 b/dev-java/eclipse-ecj/files/ecj-4.15
new file mode 100644
index 000000000000..f943dedcc19b
--- /dev/null
+++ b/dev-java/eclipse-ecj/files/ecj-4.15
@@ -0,0 +1,7 @@
+JAVAC="@GENTOO_PORTAGE_EPREFIX@/usr/bin/ecj-4.15"
+PACKAGE="=dev-java/ant-eclipse-ecj-4.15*"
+SUPPORTED_TARGET="1.1 1.2 1.3 1.4 1.5 1.6 1.7 1.8 9 10 11 12 13"
+SUPPORTED_SOURCE="1.3 1.4 1.5 1.6 1.7 1.8 9 10 11 12 13"
+ANT_BUILD_COMPILER="org.eclipse.jdt.core.JDTCompilerAdapter"
+ANT_BUILD_COMPILER_DEPS="eclipse-ecj-4.15,ant-eclipse-ecj-4.15"
+GENERATION="2"
diff --git a/dev-java/eclipse-ecj/files/ecj-4.29 b/dev-java/eclipse-ecj/files/ecj-4.26
index 4cb14c005ddf..950088453264 100644
--- a/dev-java/eclipse-ecj/files/ecj-4.29
+++ b/dev-java/eclipse-ecj/files/ecj-4.26
@@ -1,7 +1,7 @@
-JAVAC="@GENTOO_PORTAGE_EPREFIX@/usr/bin/ecj-4.29"
-PACKAGE="=dev-java/ant-eclipse-ecj-4.29*"
-SUPPORTED_TARGET="1.1 1.2 1.3 1.4 1.5 1.6 1.7 1.8 9 10 11 12 13 14 15 16 17 18 19 20 21"
-SUPPORTED_SOURCE="1.3 1.4 1.5 1.6 1.7 1.8 9 10 11 12 13 14 15 16 17 18 19 20 21"
+JAVAC="@GENTOO_PORTAGE_EPREFIX@/usr/bin/ecj-4.25"
+PACKAGE="=dev-java/ant-eclipse-ecj-4.25*"
+SUPPORTED_TARGET="1.1 1.2 1.3 1.4 1.5 1.6 1.7 1.8 9 10 11 12 13 14 15 16 17 18 19"
+SUPPORTED_SOURCE="1.3 1.4 1.5 1.6 1.7 1.8 9 10 11 12 13 14 15 16 17 18 19"
ANT_BUILD_COMPILER="org.eclipse.jdt.core.JDTCompilerAdapter"
-ANT_BUILD_COMPILER_DEPS="eclipse-ecj-4.29,ant-eclipse-ecj-4.29"
+ANT_BUILD_COMPILER_DEPS="eclipse-ecj-4.26,ant-eclipse-ecj-4.26"
GENERATION="2"
diff --git a/dev-java/eclipse-ecj/files/ecj-4.27 b/dev-java/eclipse-ecj/files/ecj-4.30
index 7b66f97ff0c7..65b04403b711 100644
--- a/dev-java/eclipse-ecj/files/ecj-4.27
+++ b/dev-java/eclipse-ecj/files/ecj-4.30
@@ -1,7 +1,7 @@
-JAVAC="@GENTOO_PORTAGE_EPREFIX@/usr/bin/ecj-4.27"
-PACKAGE="=dev-java/ant-eclipse-ecj-4.27*"
+JAVAC="@GENTOO_PORTAGE_EPREFIX@/usr/bin/ecj-4.30"
+PACKAGE="=dev-java/ant-eclipse-ecj-4.30*"
SUPPORTED_TARGET="1.1 1.2 1.3 1.4 1.5 1.6 1.7 1.8 9 10 11 12 13 14 15 16 17 18 19 20 21"
SUPPORTED_SOURCE="1.3 1.4 1.5 1.6 1.7 1.8 9 10 11 12 13 14 15 16 17 18 19 20 21"
ANT_BUILD_COMPILER="org.eclipse.jdt.core.JDTCompilerAdapter"
-ANT_BUILD_COMPILER_DEPS="eclipse-ecj-4.27,ant-eclipse-ecj-4.27"
+ANT_BUILD_COMPILER_DEPS="eclipse-ecj-4.30,ant-eclipse-ecj-4.30"
GENERATION="2"
diff --git a/dev-java/eclipse-jdt-annotation/Manifest b/dev-java/eclipse-jdt-annotation/Manifest
new file mode 100644
index 000000000000..4bcbba688975
--- /dev/null
+++ b/dev-java/eclipse-jdt-annotation/Manifest
@@ -0,0 +1 @@
+DIST eclipse.jdt.core-4.30.tar.gz 13729445 BLAKE2B 9458ec92e3561d42505a602bb637c678c99b1997e2ba530048298d587cad9861066233e7f8e4b1cb22fd30ce50159aabc4e12295fb8231cc8840cdaac4f967a7 SHA512 b51c3ccc098b9100ad653baec7bbff108344ff0402de1cbb7e0f75d97c7b5b64a9746bc7b7f2faee8126bbb5a5f421fe7c54c428cc6403662626f4a566a9ead5
diff --git a/dev-java/eclipse-jdt-annotation/eclipse-jdt-annotation-4.30.ebuild b/dev-java/eclipse-jdt-annotation/eclipse-jdt-annotation-4.30.ebuild
new file mode 100644
index 000000000000..f21d16d11598
--- /dev/null
+++ b/dev-java/eclipse-jdt-annotation/eclipse-jdt-annotation-4.30.ebuild
@@ -0,0 +1,24 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="org.eclipse.jdt:org.eclipse.jdt.annotation:2.2.800"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="JDT Annotations for Enhanced Null Analysis"
+HOMEPAGE="https://projects.eclipse.org/projects/eclipse.jdt"
+SRC_URI="https://github.com/eclipse-jdt/eclipse.jdt.core/archive//R${PV//./_}.tar.gz -> eclipse.jdt.core-${PV}.tar.gz"
+S="${WORKDIR}/eclipse.jdt.core-R${PV//./_}/org.eclipse.jdt.annotation"
+
+LICENSE="EPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND=">=virtual/jre-1.8:*"
+DEPEND=">=virtual/jdk-1.8:*"
+
+JAVA_AUTOMATIC_MODULE_NAME="org.eclipse.jdt.annotation"
diff --git a/dev-java/eclipse-jdt-annotation/metadata.xml b/dev-java/eclipse-jdt-annotation/metadata.xml
new file mode 100644
index 000000000000..7ac29f83dafb
--- /dev/null
+++ b/dev-java/eclipse-jdt-annotation/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>java@gentoo.org</email>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">eclipse-jdt/eclipse.jdt.core</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-java/emma/emma-2.0.5312-r4.ebuild b/dev-java/emma/emma-2.0.5312-r4.ebuild
deleted file mode 100644
index 0ea013aa1a3e..000000000000
--- a/dev-java/emma/emma-2.0.5312-r4.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Free Java code coverage tool"
-HOMEPAGE="http://emma.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}-src.zip"
-
-LICENSE="CPL-1.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-IUSE="+launcher"
-
-CDEPEND="
- dev-java/ant-core
- launcher? ( !sci-biology/emboss )"
-
-RDEPEND="
- ${CDEPEND}
- >=virtual/jre-1.8:*"
-
-DEPEND="
- ${CDEPEND}
- >=virtual/jdk-1.8:*"
-
-BDEPEND="app-arch/unzip"
-
-EANT_BUILD_TARGET="build"
-
-src_prepare() {
- default
- eapply "${FILESDIR}/${P}-java15api.patch"
- # bcp mangling unneccessary for 1.4+ and breaks with IBM 1.6 - bug #220463
- sed -e '/bootclasspathref/d' -e '/extdirs/d' -i build.xml || die
-}
-
-src_install() {
- java-pkg_dojar "dist/${PN}.jar"
- java-pkg_dojar "dist/${PN}_ant.jar"
- java-pkg_register-ant-task
-
- use launcher && java-pkg_dolauncher ${PN} --main emmarun
-
- # One of these does not have java sources
- use source && java-pkg_dosrc */*/com 2> /dev/null
-}
diff --git a/dev-java/emma/emma-2.0.5312-r5.ebuild b/dev-java/emma/emma-2.0.5312-r5.ebuild
new file mode 100644
index 000000000000..ba18147cfcf8
--- /dev/null
+++ b/dev-java/emma/emma-2.0.5312-r5.ebuild
@@ -0,0 +1,84 @@
+# Copyright 2023-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_PROVIDES="
+ emma:emma:${PV}
+ emma:emma_ant:${PV}
+"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Free Java code coverage tool"
+HOMEPAGE="https://emma.sourceforge.net/"
+SRC_URI="mirror://sourceforge/project/emma/emma-release/${PV}/${P}-src.zip"
+S="${WORKDIR}/${P}"
+
+LICENSE="CPL-1.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
+
+IUSE="+launcher"
+
+BDEPEND="app-arch/unzip"
+CP_DEPEND="dev-java/ant-core:0"
+DEPEND="${CP_DEPEND}
+ >=virtual/jdk-1.8:*"
+RDEPEND="${CP_DEPEND}
+ >=virtual/jre-1.8:*
+ launcher? ( !sci-biology/emboss:0 )"
+
+PATCHES=( "${FILESDIR}/emma-2.0.5312-java15api.patch" )
+
+src_prepare() {
+ default #780585
+}
+
+src_compile() {
+ einfo "Compiling emma.jar"
+ JAVA_JAR_FILENAME="emma.jar"
+ JAVA_MAIN_CLASS="emmarun"
+ JAVA_RESOURCE_DIRS=( core/res )
+ JAVA_SRC_DIR=( core/data core/java1{2,3,4} )
+ java-pkg-simple_src_compile
+ JAVA_GENTOO_CLASSPATH_EXTRA+=":emma.jar"
+ rm -r target || die
+
+ einfo "Compiling emma_ant.jar"
+ JAVA_JAR_FILENAME="emma_ant.jar"
+ JAVA_MAIN_CLASS="com.vladium.emma.ANTMain"
+ JAVA_RESOURCE_DIRS=()
+ JAVA_SRC_DIR=( ant/ant1{4,5} )
+ java-pkg-simple_src_compile
+ JAVA_GENTOO_CLASSPATH_EXTRA+=":emma_ant.jar"
+ rm -r target || die
+
+ if use doc; then
+ einfo "Compiling javadocs"
+ JAVA_SRC_DIR=(
+ core/data core/java1{2,3,4}
+ ant/ant1{4,5}
+ )
+ JAVA_JAR_FILENAME="ignoreme.jar"
+ java-pkg-simple_src_compile
+ fi
+}
+
+src_install() {
+ java-pkg_dojar "emma.jar" "emma_ant.jar"
+ java-pkg_register-ant-task
+
+ use launcher && java-pkg_dolauncher ${PN} --main emmarun
+
+ if use doc; then
+ java-pkg_dojavadoc target/api
+ fi
+
+ if use source; then
+ java-pkg_dosrc core/data/*
+ java-pkg_dosrc core/java1{2,3,4}/*
+ java-pkg_dosrc ant/ant1{4,5}*
+ fi
+}
diff --git a/dev-java/emma/emma-2.0.5312-r6.ebuild b/dev-java/emma/emma-2.0.5312-r6.ebuild
new file mode 100644
index 000000000000..fd0432aee669
--- /dev/null
+++ b/dev-java/emma/emma-2.0.5312-r6.ebuild
@@ -0,0 +1,82 @@
+# Copyright 2023-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_PROVIDES="
+ emma:emma:${PV}
+ emma:emma_ant:${PV}
+"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Free Java code coverage tool"
+HOMEPAGE="https://emma.sourceforge.net/"
+SRC_URI="mirror://sourceforge/project/emma/emma-release/${PV}/${P}-src.zip"
+S="${WORKDIR}/${P}"
+
+LICENSE="CPL-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64"
+
+IUSE="+launcher"
+
+BDEPEND="app-arch/unzip"
+CP_DEPEND=">=dev-java/ant-1.10.14:0"
+DEPEND="${CP_DEPEND}
+ >=virtual/jdk-1.8:*"
+RDEPEND="${CP_DEPEND}
+ >=virtual/jre-1.8:*
+ launcher? ( !sci-biology/emboss:0 )"
+
+PATCHES=( "${FILESDIR}/emma-2.0.5312-java15api.patch" )
+
+JAVADOC_CLASSPATH="ant"
+JAVADOC_SRC_DIRS=(
+ core/data core/java1{2,3,4}
+ ant/ant1{4,5}
+)
+
+src_prepare() {
+ default #780585
+}
+
+src_compile() {
+ einfo "Compiling emma.jar"
+ JAVA_JAR_FILENAME="emma.jar"
+ JAVA_MAIN_CLASS="emmarun"
+ JAVA_RESOURCE_DIRS=( core/res )
+ JAVA_SRC_DIR=( core/data core/java1{2,3,4} )
+ java-pkg-simple_src_compile
+ JAVA_GENTOO_CLASSPATH_EXTRA+=":emma.jar"
+ rm -r target || die
+
+ einfo "Compiling emma_ant.jar"
+ JAVA_JAR_FILENAME="emma_ant.jar"
+ JAVA_MAIN_CLASS="com.vladium.emma.ANTMain"
+ JAVA_RESOURCE_DIRS=()
+ JAVA_SRC_DIR=( ant/ant1{4,5} )
+ java-pkg-simple_src_compile
+ JAVA_GENTOO_CLASSPATH_EXTRA+=":emma_ant.jar"
+ rm -r target || die
+
+ use doc && ejavadoc
+}
+
+src_install() {
+ java-pkg_dojar "emma.jar" "emma_ant.jar"
+ java-pkg_register-ant-task
+
+ use launcher && java-pkg_dolauncher ${PN} --main emmarun
+
+ if use doc; then
+ java-pkg_dojavadoc target/api
+ fi
+
+ if use source; then
+ java-pkg_dosrc core/data/*
+ java-pkg_dosrc core/java1{2,3,4}/*
+ java-pkg_dosrc ant/ant1{4,5}*
+ fi
+}
diff --git a/dev-java/error-prone-annotations/Manifest b/dev-java/error-prone-annotations/Manifest
index 9cb3038bb4fa..4a467474141e 100644
--- a/dev-java/error-prone-annotations/Manifest
+++ b/dev-java/error-prone-annotations/Manifest
@@ -1 +1 @@
-DIST error-prone-2.16.tar.gz 2685946 BLAKE2B e10d38e5d0f6be102d64c4d24543f525c192300665a141d136d4bcb1db0e8553c16828411b60e2bca0d27a89fe7e094ac2fc2a367028091a4ad28b303c023a43 SHA512 c61d14e237ae45f3d1196e03ecdb5e77aa8aaa2f5983eee3667cc73951a12b1f0c85bd8a15c477c18fd517d486024d3b1f115928affb3697afc064d561b5f405
+DIST error-prone-2.24.0.tar.gz 2808121 BLAKE2B a112cb2c2699b2522321c89f7875cf5978748f653225db2ce89dbca16eacb357689db79c1d584c034f987178e523baa07cedd43ecb96a53941cb2ebd3c26fe63 SHA512 9c3626c7d9e05a3dacf190c6e463b66ef5cb7b0de3b049884e243502ef7bb325c92433f2ac65dfcd72ddc0edada88dde0822c4fe91043de552d69f3b06611c26
diff --git a/dev-java/error-prone-annotations/error-prone-annotations-2.16.ebuild b/dev-java/error-prone-annotations/error-prone-annotations-2.24.0.ebuild
index d000706c8189..0c56d4a3fbca 100644
--- a/dev-java/error-prone-annotations/error-prone-annotations-2.16.ebuild
+++ b/dev-java/error-prone-annotations/error-prone-annotations-2.24.0.ebuild
@@ -1,9 +1,6 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/google/error-prone/archive/v2.16.tar.gz --slot 0 --keywords "~amd64 ~arm64 ~ppc64 ~x86" --ebuild error-prone-annotations-2.16.ebuild
-
EAPI=8
JAVA_PKG_IUSE="doc source"
@@ -14,6 +11,7 @@ inherit java-pkg-2 java-pkg-simple
DESCRIPTION="Java annotations for the Error Prone static analysis tool"
HOMEPAGE="https://errorprone.info"
SRC_URI="https://github.com/google/error-prone/archive/v${PV}.tar.gz -> error-prone-${PV}.tar.gz"
+S="${WORKDIR}/error-prone-${PV}/annotations"
LICENSE="Apache-2.0"
SLOT="0"
@@ -22,7 +20,5 @@ KEYWORDS="amd64 ~arm arm64 ppc64 x86"
DEPEND=">=virtual/jdk-1.8:*"
RDEPEND=">=virtual/jre-1.8:*"
-S="${WORKDIR}/error-prone-${PV}/annotations"
-
JAVA_AUTOMATIC_MODULE_NAME="com.google.errorprone.annotations"
JAVA_SRC_DIR="src/main/java"
diff --git a/dev-java/failureaccess/Manifest b/dev-java/failureaccess/Manifest
index beb166188cf0..8b31a66a0288 100644
--- a/dev-java/failureaccess/Manifest
+++ b/dev-java/failureaccess/Manifest
@@ -1 +1 @@
-DIST guava-32.1.2.tar.gz 5746736 BLAKE2B e10f9ca81acfd14c0bdc595d777c2738f88e35d3caf2ebaec5b3f3dcd6ee87672830671b8f99b0ce030d040adcbf0a88a4cba13a42dfb980bc926540b663167e SHA512 43a9b6068bd4b636f742a6a418a34f3b4d218a0ec14b39d5fbe67b4d3c11813295c3c0eb2cf41b5de7a2383eaba639001faab60dbf3821b7546e29fe9cf3dd78
+DIST guava-32.1.3.tar.gz 5757923 BLAKE2B 6bba8f721399f3d346410f1d00f0f5d97e14e347cdcab70465b449c7d7226fc5d194c25f257029eca15d426ec23e5907632a526120387eb465b3132571855862 SHA512 8efd8072e0aafaa851e18a69af011cbaeba207a7ee2dbe2daee9f70729c1c785d054197e6bf032d30065245070088f9f2d7f1a01f244b00325a3ede9d00fb9ec
diff --git a/dev-java/failureaccess/failureaccess-32.1.2.ebuild b/dev-java/failureaccess/failureaccess-32.1.3.ebuild
index fff769f48fc7..753445e72cb5 100644
--- a/dev-java/failureaccess/failureaccess-32.1.2.ebuild
+++ b/dev-java/failureaccess/failureaccess-32.1.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
diff --git a/dev-java/felix-gogo-runtime/Manifest b/dev-java/felix-gogo-runtime/Manifest
new file mode 100644
index 000000000000..a252dc474e84
--- /dev/null
+++ b/dev-java/felix-gogo-runtime/Manifest
@@ -0,0 +1,2 @@
+DIST felix-gogo-runtime-1.1.6.tar.gz 117060 BLAKE2B 5ffbc36688f7f69595c5087910e6b9007b57d4b60a6d18d9adee473987193b5fc478cf241229a32044abebf3e796394591e2626ad5560d1cbde0dfb572d62f7f SHA512 0cf431767506a0ca3f78a4e7c666bb9da7301d9968078653ef67deccc73da80e15e01e19ecd6e499215faa4236d46a4f4179b54798ba4d847cfe8a0d858e44ee
+DIST felix-gogo-runtime-1.1.6.tar.gz.asc 833 BLAKE2B 12ef2c9bf4d5f6e5dee1a10b1d6afcd366805361181f2621ed98f3c4a36db155e7c1b493152e528cd3a8e46ca12e61bda140a2e4c13b133374bb10ec47c4554a SHA512 05b8247508c477ad374f18e7dc22faa9d116c3416b6390173366391b6f7a726cbb604adcaecc013faf51b03cbde57f09d95891a283045d35ed809e01ae7d5dae
diff --git a/dev-java/felix-gogo-runtime/felix-gogo-runtime-1.1.6.ebuild b/dev-java/felix-gogo-runtime/felix-gogo-runtime-1.1.6.ebuild
new file mode 100644
index 000000000000..e81222268b29
--- /dev/null
+++ b/dev-java/felix-gogo-runtime/felix-gogo-runtime-1.1.6.ebuild
@@ -0,0 +1,55 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.apache.felix:org.apache.felix.gogo.runtime:${PV}"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple verify-sig
+
+DESCRIPTION="Apache Felix Gogo Runtime"
+HOMEPAGE="https://felix.apache.org/documentation/subprojects/apache-felix-gogo.html"
+SRC_URI="mirror://apache/felix/org.apache.${PN//-/.}-${PV}-source-release.tar.gz -> ${P}.tar.gz
+ verify-sig? ( https://dlcdn.apache.org/felix/org.apache.${PN//-/.}-${PV}-source-release.tar.gz.asc -> ${P}.tar.gz.asc )"
+S="${WORKDIR}/org.apache.felix.gogo.runtime-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64"
+
+CP_DEPEND="
+ dev-java/osgi-annotation:0
+ dev-java/osgi-cmpn:8
+ dev-java/osgi-core:0
+"
+DEPEND="${CP_DEPEND}
+ >=virtual/jdk-1.8:*
+ test? (
+ dev-java/mockito:2
+ )
+"
+RDEPEND="${CP_DEPEND}
+ >=virtual/jre-1.8:*
+"
+
+BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-felix )"
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/felix.apache.org.asc"
+
+PATCHES=( "${FILESDIR}/${P}-skip-tests-non-java-8.patch" )
+
+JAVA_SRC_DIR="src/main/java"
+JAVA_TEST_EXCLUDES=(
+ #Invalid test class No runnable methods
+ org.apache.felix.gogo.runtime.TestEvaluate
+)
+JAVA_TEST_GENTOO_CLASSPATH="
+ junit-4
+ mockito-2
+"
+JAVA_TEST_SRC_DIR="src/test/java"
+
+src_prepare() {
+ default
+}
diff --git a/dev-java/felix-gogo-runtime/files/felix-gogo-runtime-1.1.6-skip-tests-non-java-8.patch b/dev-java/felix-gogo-runtime/files/felix-gogo-runtime-1.1.6-skip-tests-non-java-8.patch
new file mode 100644
index 000000000000..270b01be759a
--- /dev/null
+++ b/dev-java/felix-gogo-runtime/files/felix-gogo-runtime-1.1.6-skip-tests-non-java-8.patch
@@ -0,0 +1,22 @@
+skip tests that fail with java > 1.8 if java > 1.8 is used
+
+we compare here just that the first part of the version is 1
+which is true only for version 1.8, other versions have first number
+like 11, 17, 21 and those fail the condition hence the remaining tests
+are skipped
+we cannot use System.version() here as this is available only since java 9
+
+--- a/src/test/java/org/apache/felix/gogo/runtime/TestParser.java
++++ b/src/test/java/org/apache/felix/gogo/runtime/TestParser.java
+@@ -149,9 +149,10 @@ public class TestParser extends AbstractParserTest
+ assertEquals("def", c.execute("echo def|grep d.*|capture"));
+ assertEquals("def", c.execute("echoout def|grep d.*|capture"));
+ assertEquals("def", c.execute("myecho def|grep d.*|capture"));
+- assertEquals("def", c.execute("(echoout abc; echoout def; echoout ghi)|grep d.*|capture"));
+ assertEquals("", c.execute("echoout def; echoout ghi | grep d.* | capture"));
+ assertEquals("hello world", c.execute("echo hello world|capture"));
++ org.junit.Assume.assumeTrue("1".equals(System.getProperty("java.version").split("\\.")[0]));
++ assertEquals("def", c.execute("(echoout abc; echoout def; echoout ghi)|grep d.*|capture"));
+ assertEquals("defghi", c.execute("(echoout abc; echoout def; echoout ghi)|grep 'def|ghi'|capture"));
+ }
+
diff --git a/dev-java/felix-gogo-runtime/metadata.xml b/dev-java/felix-gogo-runtime/metadata.xml
new file mode 100644
index 000000000000..b2e227e0b6b2
--- /dev/null
+++ b/dev-java/felix-gogo-runtime/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>java@gentoo.org</email>
+ </maintainer>
+ <upstream>
+ <bugs-to>https://issues.apache.org/jira/browse/FELIX</bugs-to>
+ <doc>https://felix.apache.org/documentation/subprojects/apache-felix-gogo.html</doc>
+ <remote-id type="github">apache/felix-dev</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-java/fop/Manifest b/dev-java/fop/Manifest
index 5080bc909c93..09319bb63d30 100644
--- a/dev-java/fop/Manifest
+++ b/dev-java/fop/Manifest
@@ -1,6 +1,4 @@
DIST fop-2.7-jars.tar.xz 7348 BLAKE2B 79a5b4f1948bbc9628e571a9873494e2d2088d7a90296e81e03cafa6ecd8f9d1c8dd6779d15c47a0e110304aa07e706c56412e3766a84e0a66c8224fdd92f61c SHA512 71c39cbb20416dc29beb8628ae8bac2a663c0b0d1f0418a241f3795a2d5e01159572c210b5a2d2eff8274247dc3631980de50fea4f94182ddde095d0e5e605c6
-DIST fop-2.8-src.tar.gz 22855369 BLAKE2B 183649f531068b8f7513613c89f9f66a48894ab97a659e110b91853d5dffc1664d3830a8ced9ba221e22ca02fc51aed991ddee0e927cab59b9160a504f6dab02 SHA512 22e1737b5cd87dc5e014838e2ad867ccf46bdc564fb5c231cc6b4c1f8a9862864679ea7ddf143126058553ed90045941fb07aa2657db9e3ed35660ce11169357
-DIST fop-2.8-src.tar.gz.asc 833 BLAKE2B f761b427bac89249ab4ab5f2194468e44f997e28ed77392a785764fb60dd2fbbc716ef881e2009a3dbad416ef195fc8ae4d2ebdbd63c3fb3f47d355acab8389b SHA512 c25e94ac4a72c9ff9bfa487369ee1510ab5b19a6178f14f5076b9cf0548044e79eca707025e962c63d268d0f48661cc7110f604036957e447f8413cdb582d3de
DIST fop-2.9-src.tar.gz 20642865 BLAKE2B 6ab265ddfb1c07b9266687930af21ac4653438800772da836dbceb14de126333dcff50c2cea1352ad77988ec7f7a3d4eef91341983edc13684abf2531634eb0a SHA512 d346c8fffd0d3ff5e803bea4233ce171972ded39b0c475b367333e37247da8f9e823c7e2e75fab735bf9282654d67befa2fa473f53a199cbd96b0f7305b3c093
DIST fop-2.9-src.tar.gz.asc 833 BLAKE2B 284f04d450bcfb6583d353ae21bbadad8da14b59d946e094453b564e700c8cfdcb448ed206a5a246b725b453a1b3feea69f96ff3b2a683320bce6743cc5a167f SHA512 404d5df54cf84ddb11c7f5ebc6772d61cd04fc434dea421429a9a270e1d0ca17f61df8a33600db5a41c6d45f828a67fc26becfa9b4ac18342e9dfb4781dd0bdc
DIST fop-hyph-2.0.jar 6655933 BLAKE2B bfbefcc2ebd9a9a467c23a70d7cef256f83cf2335f6e17db6bbefceaf8a3cee78de0302f269d096eb3238b3f4883429e09cc640bed11a42da4ef67ab9f0cb164 SHA512 3d5f27623008c7beba5332387bd42c501b7ae1dddfc98014b3fb35273394ca5f0a4ce69e7726090ec468c9b4f7983fb8b1a5759f49e81ea342c81c61311d87b3
diff --git a/dev-java/fop/files/fop-2.8-skip-failing-tests.patch b/dev-java/fop/files/fop-2.8-skip-failing-tests.patch
deleted file mode 100644
index 729795e93fd2..000000000000
--- a/dev-java/fop/files/fop-2.8-skip-failing-tests.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-# https://bugs.gentoo.org/903880
---- a/fop-core/src/test/java/org/apache/fop/accessibility/fo/FO2StructureTreeConverterTestCase.java
-+++ b/fop-core/src/test/java/org/apache/fop/accessibility/fo/FO2StructureTreeConverterTestCase.java
-@@ -43,6 +43,7 @@ import javax.xml.transform.stream.StreamSource;
-
- import org.custommonkey.xmlunit.Diff;
- import org.junit.Test;
-+import org.junit.Ignore;
- import org.w3c.dom.Document;
- import org.xml.sax.SAXException;
- import org.xml.sax.helpers.AttributesImpl;
-@@ -144,7 +145,7 @@ public class FO2StructureTreeConverterTestCase {
- assertNull(d.getStructureTreeEventHandler().startNode("table-body", null, null));
- }
-
-- @Test
-+ @Test @Ignore
- public void testRemoveBlocks() throws Exception {
- keepEmptyTags = false;
- compare("<fo:root xmlns:fo=\"http://www.w3.org/1999/XSL/Format\">\n"
-@@ -180,7 +181,7 @@ public class FO2StructureTreeConverterTestCase {
- + "</structure-tree-sequence>\n");
- }
-
-- @Test
-+ @Test @Ignore
- public void testRemoveTableHeader() throws Exception {
- keepEmptyTags = false;
- String fo = IOUtils.toString(getResource("table-artifact.fo"), "utf8").replace("role=\"artifact\"", "");
---- a/fop-core/src/test/java/org/apache/fop/render/pdf/PDFEncodingTestCase.java
-+++ b/fop-core/src/test/java/org/apache/fop/render/pdf/PDFEncodingTestCase.java
-@@ -25,6 +25,7 @@ import java.io.File;
- import java.io.IOException;
-
- import org.junit.Test;
-+import org.junit.Ignore;
- import org.xml.sax.SAXException;
-
- import static org.junit.Assert.assertEquals;
-@@ -61,7 +62,7 @@ public class PDFEncodingTestCase extends BasePDFTest {
- * Test using a standard FOP font
- * @throws Exception checkstyle wants a comment here, even a silly one
- */
-- @Test
-+ @Test @Ignore
- public void testPDFEncodingWithStandardFont() throws Exception {
-
- /* If the PDF encoding is correct, a text dump of the generated PDF file contains this (excerpts)
diff --git a/dev-java/fop/fop-2.8-r1.ebuild b/dev-java/fop/fop-2.8-r1.ebuild
deleted file mode 100644
index 89f3be35d3bc..000000000000
--- a/dev-java/fop/fop-2.8-r1.ebuild
+++ /dev/null
@@ -1,188 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.apache.xmlgraphics:fop:${PV}"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple verify-sig
-
-DESCRIPTION="XML Graphics Format Object Processor All-In-One"
-HOMEPAGE="https://xmlgraphics.apache.org/fop/"
-SRC_URI="
- mirror://apache/xmlgraphics/fop/source/${P}-src.tar.gz
- https://dev.gentoo.org/~flow/distfiles/fop/fop-2.7-jars.tar.xz
- verify-sig? ( https://www.apache.org/dist/xmlgraphics/fop/source/${P}-src.tar.gz.asc )
- test? ( https://repo1.maven.org/maven2/net/sf/offo/fop-hyph/2.0/fop-hyph-2.0.jar )
-"
-S="${WORKDIR}/fop-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="2.8"
-KEYWORDS="amd64 ~arm64 ppc64 x86"
-
-CP_DEPEND="
- dev-java/batik:1.16
- dev-java/commons-io:1
- dev-java/commons-logging:0
- dev-java/fontbox:0
- dev-java/qdox:1.12
- dev-java/xmlgraphics-commons:2
-"
-
-DEPEND="${CP_DEPEND}
- >=virtual/jdk-1.8:*
- dev-java/ant-core:0
- dev-java/javax-servlet-api:2.2
- dev-java/sun-jai-bin:0
- test? (
- dev-java/mockito:2
- dev-java/pdfbox:0
- dev-java/xmlunit:1
- )
-"
-
-RDEPEND="${CP_DEPEND}
- >=virtual/jre-1.8:*"
-
-BDEPEND="dev-java/xalan:0"
-
-DOCS=( NOTICE README )
-
-PATCHES=( "${FILESDIR}/fop-2.8-skip-failing-tests.patch" )
-
-JAVA_CLASSPATH_EXTRA="
- ant-core
- javax-servlet-api-2.2
- sun-jai-bin
-"
-
-BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-apache-xmlgraphics-fop )"
-VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/xmlgraphics-fop.apache.org.asc"
-
-src_unpack() {
- if use verify-sig; then
- verify-sig_verify_detached "${DISTDIR}"/${P}-src.tar.gz{,.asc}
- fi
- default
-}
-
-src_prepare() {
- java-pkg_clean
- java-pkg-2_src_prepare
- default
-}
-
-src_compile() {
- JAVA_JAR_FILENAME="fop-util.jar"
- JAVA_SRC_DIR="fop-util/src/main/java"
- java-pkg-simple_src_compile
- JAVA_GENTOO_CLASSPATH_EXTRA+=":fop-util.jar"
- rm -r target || die
-
- JAVA_JAR_FILENAME="fop-events.jar"
- JAVA_RESOURCE_DIRS="fop-events/src/main/resources"
- JAVA_SRC_DIR="fop-events/src/main/java"
- java-pkg-simple_src_compile
- JAVA_GENTOO_CLASSPATH_EXTRA+=":fop-events.jar"
- rm -r target || die
-
- JAVA_JAR_FILENAME="fop-core.jar"
- JAVA_MAIN_CLASS=$( sed -n 's:.*<mainClass>\(.*\)</mainClass>:\1:p' fop-core/pom.xml )
- JAVA_RESOURCE_DIRS="fop-core/src/main/resources"
- JAVA_SRC_DIR="fop-core/src/main/java"
- # Code generation according to
- # https://github.com/apache/xmlgraphics-fop/blob/fop-2_8/fop-core/pom.xml#L156-L225
- pushd fop-core/src/main/codegen/fonts > /dev/null || die
- local fonts=$(find . -name "Courier*.xml" \
- -o -name "Helvetica*.xml" \
- -o -name "Times*.xml" \
- -o -name "Symbol.xml" \
- -o -name "ZapfDingbats.xml"
- )
- for font in ${fonts}; do \
- xalan -XSLTC \
- -IN $font \
- -XSL font-file.xsl \
- -OUT ../../java/org/apache/fop/fonts/base14/${font//.xml}.java || die
- done
- xalan -XSLTC \
- -IN encodings.xml \
- -XSL code-point-mapping.xsl \
- -OUT ../../java/org/apache/fop/fonts/base14/CodePointMapping.java || die
- popd > /dev/null || die
- java-pkg-simple_src_compile
-
- # Update "fop-core.jar" with "event-mode.xml" files produced manually
- # by running "mvn package".
- # Upstream does this with maven-antrun-plugin:
- # https://github.com/apache/xmlgraphics-fop/blob/fop-2_8/fop-core/pom.xml#L269-L290
- mkdir event-model && pushd $_ > /dev/null || die
- jar -xf "${WORKDIR}/fop-2.7-core-event-models.jar"
- popd > /dev/null || die
-
- jar -uf "fop-core.jar" -C event-model . || die
- JAVA_GENTOO_CLASSPATH_EXTRA+=":fop-core.jar"
- rm -r target || die
-
- if use doc; then \
- JAVA_SRC_DIR=(
- "fop-util/src/main/java"
- "fop-events/src/main/java"
- "fop-core/src/main/java"
- )
- JAVA_JAR_FILENAME="ignoreme.jar"
- java-pkg-simple_src_compile
- fi
-}
-
-src_test() {
- JAVA_TEST_GENTOO_CLASSPATH="junit-4,mockito-2,pdfbox,xmlunit-1"
-
- einfo "Testing fop-events"
- JAVA_TEST_EXCLUDES="org.apache.fop.events.TestEventProducer"
- JAVA_TEST_SRC_DIR="fop-events/src/test/java"
- # This jar file was created manually from the output of "mvn test".
- # Upstream does this with maven-antrun-plugin
- jar -xf "${WORKDIR}/fop-2.7-test-event-model.jar" || die
- java-pkg-simple_src_test
-
- einfo "Testing fop-core"
- pushd fop-core/src/test/java > /dev/null || die
- # Excluding one test, see https://bugs.gentoo.org/903880
- local JAVA_TEST_RUN_ONLY=$(find * -type f \
- -name "*TestCase.java" \
- ! -name 'MissingLanguageWarningTestCase.java' \
- )
- JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}"
- JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}"
- popd > /dev/null || die
- # https://github.com/apache/xmlgraphics-fop/blob/fop-2_8/fop-core/pom.xml#L297-L307
- # <workingDirectory>../fop</workingDirectory>
- pushd fop > /dev/null || die
- JAVA_GENTOO_CLASSPATH_EXTRA="${DISTDIR}/fop-hyph-2.0.jar"
- JAVA_GENTOO_CLASSPATH_EXTRA+=":../fop-util.jar"
- JAVA_GENTOO_CLASSPATH_EXTRA+=":../fop-events.jar"
- JAVA_GENTOO_CLASSPATH_EXTRA+=":../fop-core.jar"
- JAVA_TEST_RESOURCE_DIRS="../fop-core/src/test/resources"
- JAVA_TEST_SRC_DIR="../fop-core/src/test/java"
- java-pkg-simple_src_test
- popd > /dev/null || die
-}
-
-src_install() {
- local module
- for module in fop-util fop-events fop-core ; do
- java-pkg_dojar "${module}.jar"
- if use source; then
- java-pkg_dosrc "${module}/src/main/java/*"
- fi
- done
- if use doc; then
- java-pkg_dojavadoc target/api
- fi
- java-pkg_dolauncher "fop-${SLOT}" --main "org.apache.fop.cli.Main"
- einstalldocs
-}
diff --git a/dev-java/fop/fop-2.9.ebuild b/dev-java/fop/fop-2.9.ebuild
index 63bf4d2080f1..e691baf0a9e9 100644
--- a/dev-java/fop/fop-2.9.ebuild
+++ b/dev-java/fop/fop-2.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -14,14 +14,21 @@ HOMEPAGE="https://xmlgraphics.apache.org/fop/"
SRC_URI="
mirror://apache/xmlgraphics/fop/source/${P}-src.tar.gz
https://dev.gentoo.org/~flow/distfiles/fop/fop-2.7-jars.tar.xz
- verify-sig? ( https://www.apache.org/dist/xmlgraphics/fop/source/${P}-src.tar.gz.asc )
+ verify-sig? ( https://downloads.apache.org/xmlgraphics/fop/source/${P}-src.tar.gz.asc )
test? ( https://repo1.maven.org/maven2/net/sf/offo/fop-hyph/2.0/fop-hyph-2.0.jar )
"
S="${WORKDIR}/fop-${PV}"
LICENSE="Apache-2.0"
SLOT="2.8"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ppc64 x86"
+
+VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/xmlgraphics-fop.apache.org.asc"
+
+BDEPEND="
+ dev-java/xalan:0
+ verify-sig? ( sec-keys/openpgp-keys-apache-xmlgraphics-fop )
+"
CP_DEPEND="
dev-java/batik:1.16
@@ -47,8 +54,6 @@ DEPEND="${CP_DEPEND}
RDEPEND="${CP_DEPEND}
>=virtual/jre-1.8:*"
-BDEPEND="dev-java/xalan:0"
-
DOCS=( NOTICE README )
PATCHES=(
@@ -64,8 +69,6 @@ JAVA_CLASSPATH_EXTRA="
sun-jai-bin
"
-BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-xmlgraphics-fop )"
-VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/xmlgraphics-fop.apache.org.asc"
src_unpack() {
if use verify-sig; then
verify-sig_verify_detached "${DISTDIR}"/${P}-src.tar.gz{,.asc}
@@ -151,6 +154,8 @@ src_test() {
# This jar file was created manually from the output of "mvn test".
# Upstream does this with maven-antrun-plugin
jar -xf "${WORKDIR}/fop-2.7-test-event-model.jar" || die
+ mkdir generated-test || die
+ mv {target/test-classes,generated-test}/org || die
java-pkg-simple_src_test
einfo "Testing fop-core"
diff --git a/dev-java/gin/metadata.xml b/dev-java/gin/metadata.xml
index 0aaeb43aefdc..ffdab2e387f8 100644
--- a/dev-java/gin/metadata.xml
+++ b/dev-java/gin/metadata.xml
@@ -1,10 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>gienah@gentoo.org</email>
- <name>Mark Wright</name>
- </maintainer>
<maintainer type="project">
<email>java@gentoo.org</email>
<name>Java</name>
diff --git a/dev-java/glassfish-persistence/Manifest b/dev-java/glassfish-persistence/Manifest
deleted file mode 100644
index bdd1ede41798..000000000000
--- a/dev-java/glassfish-persistence/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST glassfish-9_0-b48-src.zip 35162972 BLAKE2B ff96f2135c6bbdc60eadab6a6bd60b623ac1a3635e4465591ee75f6c1229e83f9f6424b46e42eb333eb6edd3ba1aba51897ab80ca5bd5c754e516a27a03381d9 SHA512 512ccd1c89a1bbd88ca1e45b1e60693bd3c4a6c6ffa19376febb786eb73556f27bc0ce4f0e760d6d80b0711206f6701e7c7da70ef3a5e0084ad0482246506a48
diff --git a/dev-java/glassfish-persistence/files/glassfish-persistence-1.0-python2.7-sax-parser.patch b/dev-java/glassfish-persistence/files/glassfish-persistence-1.0-python2.7-sax-parser.patch
deleted file mode 100644
index 51b1e8af9429..000000000000
--- a/dev-java/glassfish-persistence/files/glassfish-persistence-1.0-python2.7-sax-parser.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- glassfish/bootstrap/build.xml
-+++ glassfish/bootstrap/build.xml
-@@ -23,7 +23,7 @@
- -->
-
- <!DOCTYPE project [
-- <!ENTITY glassfish SYSTEM "file:./glassfish.xml">
-+ <!ENTITY glassfish SYSTEM "file:glassfish.xml">
- ]>
-
- <project name="Top Level Build" default="all" basedir=".">
diff --git a/dev-java/glassfish-persistence/glassfish-persistence-1.0-r2.ebuild b/dev-java/glassfish-persistence/glassfish-persistence-1.0-r2.ebuild
deleted file mode 100644
index 9bfaadee8841..000000000000
--- a/dev-java/glassfish-persistence/glassfish-persistence-1.0-r2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Glassfish implementation of persistence API"
-HOMEPAGE="https://javaee.github.io/glassfish/"
-SRC_URI="https://download.java.net/javaee5/fcs_branch/promoted/source/glassfish-9_0-b48-src.zip"
-
-LICENSE="CDDL"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-BDEPEND="app-arch/unzip"
-DEPEND=">=virtual/jdk-1.8:*"
-RDEPEND=">=virtual/jre-1.8:*"
-
-S="${WORKDIR}/glassfish"
-
-EANT_BUILD_XML="persistence-api/build.xml"
-EANT_BUILD_TARGET="all"
-
-PATCHES=(
- "${FILESDIR}"/${P}-python2.7-sax-parser.patch
-)
-
-src_prepare() {
- default
-}
-
-src_install() {
- cd "${WORKDIR}"/publish/glassfish || die
- java-pkg_newjar lib/javaee.jar
-
- insinto /usr/share/${PN}/lib/schemas
- doins lib/schemas/*.xsd
-}
diff --git a/dev-java/glassfish-persistence/metadata.xml b/dev-java/glassfish-persistence/metadata.xml
deleted file mode 100644
index 851b900d2361..000000000000
--- a/dev-java/glassfish-persistence/metadata.xml
+++ /dev/null
@@ -1,7 +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>
-</pkgmetadata>
diff --git a/dev-java/gradle-bin/Manifest b/dev-java/gradle-bin/Manifest
index 539c6ffe4fde..846f9187a6c0 100644
--- a/dev-java/gradle-bin/Manifest
+++ b/dev-java/gradle-bin/Manifest
@@ -1,12 +1,2 @@
-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.3.zip 158875257 BLAKE2B 94f86e06da3eae4a9522d35a28577d033d64ce1bc2f36d0f5c1992e9b92ec311d25bd98bbeaf4b8a9869f22d93e14c88952e12166e436a0a6c206541d1f967aa SHA512 03f2bdd77202788cd43bb3e3a6390340f4d083d69ade5a53e0163204fb85307f5bbbbf4e04077c6ae558bc36ab3c478674f941079bc14a8344f55631fbba1490
-DIST gradle-bin-7.4.2.zip 159315974 BLAKE2B c7c8dbe82d22dec699d1997a781f3a66110c9910dfe67df2304c48cead96c130ca072550b8c5fa2362744cd2ea3c9723c45a6ecf6e0737fe3c9b7e286b44f4ae SHA512 2e1d05486baa9661d5c8ffead2df87874a66f6cfc958ee6840432b89d221d8b0af9e3cad3675766f5413d12aa61c5b5fb0dd82f4164e5da3022865eba9ceadbf
-DIST gradle-bin-7.5.1.zip 166101707 BLAKE2B e018f8ae0e4cbe1fff2e3fb3029ef4c3f35e1bf541ce75f22561e16c43d8501c2f2501db72081656a836ab1c3358020dbf0be3499e7c16b385d9940c852c62ae SHA512 89189d529df1258a01ad2e6c38b1374dfb3a1440706c1c7f27ace89b6fd5b6849f9809f209e3e410f226aeeb9348d144de70397ac94b4e59fd311a2b0dee0dc9
-DIST gradle-bin-7.6.1.zip 165594858 BLAKE2B 623ed41b7e0dfbfa015578c6915ca382cb441082e181f96d00d058a1bd42b5e749b807f8c0444c4cd41de17a7f754960f55aa69e8dd4339bd64444432ad8748e SHA512 72d051d8cf348c13dda20eec56526a3c212e9a9635920b3260281e2f98cf113ffaf4efb8efbb96081c36b9fae847c291125e24d175d6fb832b8dd6e0e74779ae
-DIST gradle-bin-8.0.2.zip 167671533 BLAKE2B e5cb4bef61ea89cfbf42c72c14e739f049b4930521dabaeb88fa6e2fffec81d6ee6514b615a6c1732db3bad4539e72ebbbeeb37b2f22a72fd2d2e08f7bf8d1b8 SHA512 70f114e353ec3e114b003e733e21c47fd26d2777363d015872aa9eab73c68b3186f77698aa1d72d4f4eedb2c53b0cd47a98f26ef5f0a9b2c1e42c6c877cca80f
-DIST gradle-bin-8.1.1.zip 168381151 BLAKE2B 334727108ccfd374daaa91c363ebf10d8b13e00c61fe14e097b3baa5bb8bf0d2fdde509ef4ac0d90db1fd075c7552a0f7ba90b67d549e45a3c1cb37d036ae000 SHA512 185a831dc37b946e348f9d98ff88eefaad303cdb385d45a5f65c401dd51d4d0c1225d8d716e7345167e53d41cade2bf3008bbde1d66a18d9a4925a589853b598
-DIST gradle-bin-8.2.1.zip 193042584 BLAKE2B 10381d2601c707c6a391fb515e753d583eec0d7e89213fef690df4259aedbdde0ea8981e474eae5c7b21ff12d621897158271c5e2ee964190bca02bf6882c237 SHA512 a3d05873460c4045e2b43c41e39120b444ad5896c6561104ccf8cca4e58fa95bd512e356faa3a507b0e3c4212548002ff02845791dd42518635f4bc6ae67475b
-DIST gradle-bin-8.3.zip 200258206 BLAKE2B f9909266e2887971f2f7480dbfe441c040fcd2ae12146bd9393d0836bca48f931124e60a1095d79ba6b172136ebb1734976e28d255aa3f16a22125a2662b80f1 SHA512 c328b597ff0c28b8071c050b6f1e57bf3eccca4d0eaeda0974700fc2d380667aca2e1a7b3548314519e99b7a823ede4c83a5786147a6a002d081920afa9c490b
DIST gradle-bin-8.4.zip 212870963 BLAKE2B da32c1010e85f6cded0c1b539b243db6d41fcd033266be3b03b389e6a2e317bea17ddbe65c597c7ea82628cc5bec913954ec998d018b68daa67d39f9a8958e7e SHA512 52d5f622b8ad0ab36ff84589733b47423b12f94211086a84eca9810690af29e396877f1155ee31279c4325e98cd1d55b32137d52efcf48eb1e258caeece08f22
+DIST gradle-bin-8.5.zip 218636663 BLAKE2B 0360f240f6183abec540f7755a966767a8dc175ca0ea047273e05c4b2219fd80cb92e62e9b961481d646157418cc91ea211eb83530cc6ec815ea790f6ad8380a SHA512 37a1c2989c46dad0f843565d05fd29010df10ac199d81f0ccddf56ffd490642039046d43a320ba04d1f87cbbc6d4cebf20ff66ce45ec005931cfc85aee2e0180
diff --git a/dev-java/gradle-bin/gradle-bin-6.8.3.ebuild b/dev-java/gradle-bin/gradle-bin-6.8.3.ebuild
deleted file mode 100644
index 1e7b593a8227..000000000000
--- a/dev-java/gradle-bin/gradle-bin-6.8.3.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-IUSE="doc"
-JAVA_PKG_IUSE="source"
-
-inherit java-pkg-2
-
-MY_PN=${PN%%-bin}
-MY_P="${MY_PN}-${PV/_rc/-rc-}"
-
-DESCRIPTION="A project automation and build tool with a Groovy based DSL"
-SRC_URI="https://services.gradle.org/distributions/${MY_P}-all.zip -> ${P}.zip"
-HOMEPAGE="https://www.gradle.org/"
-
-LICENSE="Apache-2.0"
-SLOT="${PV}"
-KEYWORDS="amd64 x86"
-
-DEPEND="app-eselect/eselect-gradle"
-BDEPEND="app-arch/unzip"
-RDEPEND="
- ${DEPEND}
- >=virtual/jre-1.8:*
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_compile() {
- :
-}
-
-src_install() {
- local gradle_dir="/usr/share/${PN}-${SLOT}"
-
- if use source; then
- java-pkg_dosrc src
- fi
-
- docinto html
- dodoc -r docs/release-notes.html
- if use doc; then
- dodoc -r docs/{dsl,userguide}
- java-pkg_dojavadoc docs/javadoc
- fi
-
- insinto "${gradle_dir}"
- doins -r bin/ lib/
- fperms 755 "${gradle_dir}/bin/gradle"
- dosym "${gradle_dir}/bin/gradle" "/usr/bin/${PN}-${SLOT}"
-}
-
-pkg_postinst() {
- eselect gradle update ifunset
-}
-
-pkg_postrm() {
- eselect gradle update ifunset
-}
diff --git a/dev-java/gradle-bin/gradle-bin-7.1.1.ebuild b/dev-java/gradle-bin/gradle-bin-7.1.1.ebuild
deleted file mode 100644
index 1e7b593a8227..000000000000
--- a/dev-java/gradle-bin/gradle-bin-7.1.1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-IUSE="doc"
-JAVA_PKG_IUSE="source"
-
-inherit java-pkg-2
-
-MY_PN=${PN%%-bin}
-MY_P="${MY_PN}-${PV/_rc/-rc-}"
-
-DESCRIPTION="A project automation and build tool with a Groovy based DSL"
-SRC_URI="https://services.gradle.org/distributions/${MY_P}-all.zip -> ${P}.zip"
-HOMEPAGE="https://www.gradle.org/"
-
-LICENSE="Apache-2.0"
-SLOT="${PV}"
-KEYWORDS="amd64 x86"
-
-DEPEND="app-eselect/eselect-gradle"
-BDEPEND="app-arch/unzip"
-RDEPEND="
- ${DEPEND}
- >=virtual/jre-1.8:*
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_compile() {
- :
-}
-
-src_install() {
- local gradle_dir="/usr/share/${PN}-${SLOT}"
-
- if use source; then
- java-pkg_dosrc src
- fi
-
- docinto html
- dodoc -r docs/release-notes.html
- if use doc; then
- dodoc -r docs/{dsl,userguide}
- java-pkg_dojavadoc docs/javadoc
- fi
-
- insinto "${gradle_dir}"
- doins -r bin/ lib/
- fperms 755 "${gradle_dir}/bin/gradle"
- dosym "${gradle_dir}/bin/gradle" "/usr/bin/${PN}-${SLOT}"
-}
-
-pkg_postinst() {
- eselect gradle update ifunset
-}
-
-pkg_postrm() {
- eselect gradle update ifunset
-}
diff --git a/dev-java/gradle-bin/gradle-bin-7.2.ebuild b/dev-java/gradle-bin/gradle-bin-7.2.ebuild
deleted file mode 100644
index fe6f492c7e4e..000000000000
--- a/dev-java/gradle-bin/gradle-bin-7.2.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-IUSE="doc"
-JAVA_PKG_IUSE="source"
-
-inherit java-pkg-2
-
-MY_PN=${PN%%-bin}
-MY_P="${MY_PN}-${PV/_rc/-rc-}"
-
-DESCRIPTION="A project automation and build tool with a Groovy based DSL"
-SRC_URI="https://services.gradle.org/distributions/${MY_P}-all.zip -> ${P}.zip"
-HOMEPAGE="https://www.gradle.org/"
-
-LICENSE="Apache-2.0"
-SLOT="${PV}"
-KEYWORDS="amd64 x86"
-
-DEPEND="app-eselect/eselect-gradle"
-BDEPEND="app-arch/unzip"
-RDEPEND="
- ${DEPEND}
- >=virtual/jre-1.8:*
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_compile() {
- :
-}
-
-src_install() {
- local gradle_dir="/usr/share/${PN}-${SLOT}"
-
- if use source; then
- java-pkg_dosrc src
- fi
-
- docinto html
- dodoc -r docs/release-notes.html
- if use doc; then
- dodoc -r docs/{dsl,userguide}
- java-pkg_dojavadoc docs/javadoc
- fi
-
- insinto "${gradle_dir}"
- doins -r bin/ lib/
- fperms 755 "${gradle_dir}/bin/gradle"
- dosym "${gradle_dir}/bin/gradle" "/usr/bin/${PN}-${SLOT}"
-}
-
-pkg_postinst() {
- eselect gradle update ifunset
-}
-
-pkg_postrm() {
- eselect gradle update ifunset
-}
diff --git a/dev-java/gradle-bin/gradle-bin-7.3.3.ebuild b/dev-java/gradle-bin/gradle-bin-7.3.3.ebuild
deleted file mode 100644
index fe6f492c7e4e..000000000000
--- a/dev-java/gradle-bin/gradle-bin-7.3.3.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-IUSE="doc"
-JAVA_PKG_IUSE="source"
-
-inherit java-pkg-2
-
-MY_PN=${PN%%-bin}
-MY_P="${MY_PN}-${PV/_rc/-rc-}"
-
-DESCRIPTION="A project automation and build tool with a Groovy based DSL"
-SRC_URI="https://services.gradle.org/distributions/${MY_P}-all.zip -> ${P}.zip"
-HOMEPAGE="https://www.gradle.org/"
-
-LICENSE="Apache-2.0"
-SLOT="${PV}"
-KEYWORDS="amd64 x86"
-
-DEPEND="app-eselect/eselect-gradle"
-BDEPEND="app-arch/unzip"
-RDEPEND="
- ${DEPEND}
- >=virtual/jre-1.8:*
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_compile() {
- :
-}
-
-src_install() {
- local gradle_dir="/usr/share/${PN}-${SLOT}"
-
- if use source; then
- java-pkg_dosrc src
- fi
-
- docinto html
- dodoc -r docs/release-notes.html
- if use doc; then
- dodoc -r docs/{dsl,userguide}
- java-pkg_dojavadoc docs/javadoc
- fi
-
- insinto "${gradle_dir}"
- doins -r bin/ lib/
- fperms 755 "${gradle_dir}/bin/gradle"
- dosym "${gradle_dir}/bin/gradle" "/usr/bin/${PN}-${SLOT}"
-}
-
-pkg_postinst() {
- eselect gradle update ifunset
-}
-
-pkg_postrm() {
- eselect gradle update ifunset
-}
diff --git a/dev-java/gradle-bin/gradle-bin-7.4.2.ebuild b/dev-java/gradle-bin/gradle-bin-7.4.2.ebuild
deleted file mode 100644
index fe6f492c7e4e..000000000000
--- a/dev-java/gradle-bin/gradle-bin-7.4.2.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-IUSE="doc"
-JAVA_PKG_IUSE="source"
-
-inherit java-pkg-2
-
-MY_PN=${PN%%-bin}
-MY_P="${MY_PN}-${PV/_rc/-rc-}"
-
-DESCRIPTION="A project automation and build tool with a Groovy based DSL"
-SRC_URI="https://services.gradle.org/distributions/${MY_P}-all.zip -> ${P}.zip"
-HOMEPAGE="https://www.gradle.org/"
-
-LICENSE="Apache-2.0"
-SLOT="${PV}"
-KEYWORDS="amd64 x86"
-
-DEPEND="app-eselect/eselect-gradle"
-BDEPEND="app-arch/unzip"
-RDEPEND="
- ${DEPEND}
- >=virtual/jre-1.8:*
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_compile() {
- :
-}
-
-src_install() {
- local gradle_dir="/usr/share/${PN}-${SLOT}"
-
- if use source; then
- java-pkg_dosrc src
- fi
-
- docinto html
- dodoc -r docs/release-notes.html
- if use doc; then
- dodoc -r docs/{dsl,userguide}
- java-pkg_dojavadoc docs/javadoc
- fi
-
- insinto "${gradle_dir}"
- doins -r bin/ lib/
- fperms 755 "${gradle_dir}/bin/gradle"
- dosym "${gradle_dir}/bin/gradle" "/usr/bin/${PN}-${SLOT}"
-}
-
-pkg_postinst() {
- eselect gradle update ifunset
-}
-
-pkg_postrm() {
- eselect gradle update ifunset
-}
diff --git a/dev-java/gradle-bin/gradle-bin-7.6.1.ebuild b/dev-java/gradle-bin/gradle-bin-7.6.1.ebuild
deleted file mode 100644
index 7d07ab9dc4b0..000000000000
--- a/dev-java/gradle-bin/gradle-bin-7.6.1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-IUSE="doc"
-JAVA_PKG_IUSE="source"
-
-inherit java-pkg-2
-
-MY_PN=${PN%%-bin}
-MY_P="${MY_PN}-${PV/_rc/-rc-}"
-
-DESCRIPTION="A project automation and build tool with a Groovy based DSL"
-SRC_URI="https://services.gradle.org/distributions/${MY_P}-all.zip -> ${P}.zip"
-HOMEPAGE="https://www.gradle.org/"
-
-LICENSE="Apache-2.0"
-SLOT="${PV}"
-KEYWORDS="amd64 x86"
-
-DEPEND="app-eselect/eselect-gradle"
-BDEPEND="app-arch/unzip"
-RDEPEND="
- ${DEPEND}
- >=virtual/jre-1.8:*
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_compile() {
- :
-}
-
-src_install() {
- local gradle_dir="/usr/share/${PN}-${SLOT}"
-
- if use source; then
- java-pkg_dosrc src
- fi
-
- docinto html
- dodoc -r docs/release-notes.html
- if use doc; then
- dodoc -r docs/{dsl,userguide}
- java-pkg_dojavadoc docs/javadoc
- fi
-
- insinto "${gradle_dir}"
- doins -r bin/ lib/
- fperms 755 "${gradle_dir}/bin/gradle"
- dosym "${gradle_dir}/bin/gradle" "/usr/bin/${PN}-${SLOT}"
-}
-
-pkg_postinst() {
- eselect gradle update ifunset
-}
-
-pkg_postrm() {
- eselect gradle update ifunset
-}
diff --git a/dev-java/gradle-bin/gradle-bin-8.0.2.ebuild b/dev-java/gradle-bin/gradle-bin-8.0.2.ebuild
deleted file mode 100644
index 7d07ab9dc4b0..000000000000
--- a/dev-java/gradle-bin/gradle-bin-8.0.2.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-IUSE="doc"
-JAVA_PKG_IUSE="source"
-
-inherit java-pkg-2
-
-MY_PN=${PN%%-bin}
-MY_P="${MY_PN}-${PV/_rc/-rc-}"
-
-DESCRIPTION="A project automation and build tool with a Groovy based DSL"
-SRC_URI="https://services.gradle.org/distributions/${MY_P}-all.zip -> ${P}.zip"
-HOMEPAGE="https://www.gradle.org/"
-
-LICENSE="Apache-2.0"
-SLOT="${PV}"
-KEYWORDS="amd64 x86"
-
-DEPEND="app-eselect/eselect-gradle"
-BDEPEND="app-arch/unzip"
-RDEPEND="
- ${DEPEND}
- >=virtual/jre-1.8:*
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_compile() {
- :
-}
-
-src_install() {
- local gradle_dir="/usr/share/${PN}-${SLOT}"
-
- if use source; then
- java-pkg_dosrc src
- fi
-
- docinto html
- dodoc -r docs/release-notes.html
- if use doc; then
- dodoc -r docs/{dsl,userguide}
- java-pkg_dojavadoc docs/javadoc
- fi
-
- insinto "${gradle_dir}"
- doins -r bin/ lib/
- fperms 755 "${gradle_dir}/bin/gradle"
- dosym "${gradle_dir}/bin/gradle" "/usr/bin/${PN}-${SLOT}"
-}
-
-pkg_postinst() {
- eselect gradle update ifunset
-}
-
-pkg_postrm() {
- eselect gradle update ifunset
-}
diff --git a/dev-java/gradle-bin/gradle-bin-8.1.1.ebuild b/dev-java/gradle-bin/gradle-bin-8.1.1.ebuild
deleted file mode 100644
index 7d07ab9dc4b0..000000000000
--- a/dev-java/gradle-bin/gradle-bin-8.1.1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-IUSE="doc"
-JAVA_PKG_IUSE="source"
-
-inherit java-pkg-2
-
-MY_PN=${PN%%-bin}
-MY_P="${MY_PN}-${PV/_rc/-rc-}"
-
-DESCRIPTION="A project automation and build tool with a Groovy based DSL"
-SRC_URI="https://services.gradle.org/distributions/${MY_P}-all.zip -> ${P}.zip"
-HOMEPAGE="https://www.gradle.org/"
-
-LICENSE="Apache-2.0"
-SLOT="${PV}"
-KEYWORDS="amd64 x86"
-
-DEPEND="app-eselect/eselect-gradle"
-BDEPEND="app-arch/unzip"
-RDEPEND="
- ${DEPEND}
- >=virtual/jre-1.8:*
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_compile() {
- :
-}
-
-src_install() {
- local gradle_dir="/usr/share/${PN}-${SLOT}"
-
- if use source; then
- java-pkg_dosrc src
- fi
-
- docinto html
- dodoc -r docs/release-notes.html
- if use doc; then
- dodoc -r docs/{dsl,userguide}
- java-pkg_dojavadoc docs/javadoc
- fi
-
- insinto "${gradle_dir}"
- doins -r bin/ lib/
- fperms 755 "${gradle_dir}/bin/gradle"
- dosym "${gradle_dir}/bin/gradle" "/usr/bin/${PN}-${SLOT}"
-}
-
-pkg_postinst() {
- eselect gradle update ifunset
-}
-
-pkg_postrm() {
- eselect gradle update ifunset
-}
diff --git a/dev-java/gradle-bin/gradle-bin-8.2.1.ebuild b/dev-java/gradle-bin/gradle-bin-8.2.1.ebuild
deleted file mode 100644
index afe46bd7d1c6..000000000000
--- a/dev-java/gradle-bin/gradle-bin-8.2.1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-IUSE="doc"
-JAVA_PKG_IUSE="source"
-
-inherit java-pkg-2
-
-MY_PN=${PN%%-bin}
-MY_P="${MY_PN}-${PV/_rc/-rc-}"
-
-DESCRIPTION="A project automation and build tool with a Groovy based DSL"
-SRC_URI="https://services.gradle.org/distributions/${MY_P}-all.zip -> ${P}.zip"
-HOMEPAGE="https://www.gradle.org/"
-
-LICENSE="Apache-2.0"
-SLOT="${PV}"
-KEYWORDS="amd64 ~x86"
-
-DEPEND="app-eselect/eselect-gradle"
-BDEPEND="app-arch/unzip"
-RDEPEND="
- ${DEPEND}
- >=virtual/jre-1.8:*
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_compile() {
- :
-}
-
-src_install() {
- local gradle_dir="/usr/share/${PN}-${SLOT}"
-
- if use source; then
- java-pkg_dosrc src
- fi
-
- docinto html
- dodoc -r docs/release-notes.html
- if use doc; then
- dodoc -r docs/{dsl,userguide}
- java-pkg_dojavadoc docs/javadoc
- fi
-
- insinto "${gradle_dir}"
- doins -r bin/ lib/
- fperms 755 "${gradle_dir}/bin/gradle"
- dosym "${gradle_dir}/bin/gradle" "/usr/bin/${PN}-${SLOT}"
-}
-
-pkg_postinst() {
- eselect gradle update ifunset
-}
-
-pkg_postrm() {
- eselect gradle update ifunset
-}
diff --git a/dev-java/gradle-bin/gradle-bin-8.3.ebuild b/dev-java/gradle-bin/gradle-bin-8.3.ebuild
deleted file mode 100644
index afe46bd7d1c6..000000000000
--- a/dev-java/gradle-bin/gradle-bin-8.3.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-IUSE="doc"
-JAVA_PKG_IUSE="source"
-
-inherit java-pkg-2
-
-MY_PN=${PN%%-bin}
-MY_P="${MY_PN}-${PV/_rc/-rc-}"
-
-DESCRIPTION="A project automation and build tool with a Groovy based DSL"
-SRC_URI="https://services.gradle.org/distributions/${MY_P}-all.zip -> ${P}.zip"
-HOMEPAGE="https://www.gradle.org/"
-
-LICENSE="Apache-2.0"
-SLOT="${PV}"
-KEYWORDS="amd64 ~x86"
-
-DEPEND="app-eselect/eselect-gradle"
-BDEPEND="app-arch/unzip"
-RDEPEND="
- ${DEPEND}
- >=virtual/jre-1.8:*
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_compile() {
- :
-}
-
-src_install() {
- local gradle_dir="/usr/share/${PN}-${SLOT}"
-
- if use source; then
- java-pkg_dosrc src
- fi
-
- docinto html
- dodoc -r docs/release-notes.html
- if use doc; then
- dodoc -r docs/{dsl,userguide}
- java-pkg_dojavadoc docs/javadoc
- fi
-
- insinto "${gradle_dir}"
- doins -r bin/ lib/
- fperms 755 "${gradle_dir}/bin/gradle"
- dosym "${gradle_dir}/bin/gradle" "/usr/bin/${PN}-${SLOT}"
-}
-
-pkg_postinst() {
- eselect gradle update ifunset
-}
-
-pkg_postrm() {
- eselect gradle update ifunset
-}
diff --git a/dev-java/gradle-bin/gradle-bin-8.4.ebuild b/dev-java/gradle-bin/gradle-bin-8.4.ebuild
index 6fceca3ae5c8..1d63ca89fe19 100644
--- a/dev-java/gradle-bin/gradle-bin-8.4.ebuild
+++ b/dev-java/gradle-bin/gradle-bin-8.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -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.5.1.ebuild b/dev-java/gradle-bin/gradle-bin-8.5.ebuild
index 0e7b49ee8847..61b08c49be55 100644
--- a/dev-java/gradle-bin/gradle-bin-7.5.1.ebuild
+++ b/dev-java/gradle-bin/gradle-bin-8.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -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/gson/Manifest b/dev-java/gson/Manifest
index 357c58725dd7..be2124b47485 100644
--- a/dev-java/gson/Manifest
+++ b/dev-java/gson/Manifest
@@ -1 +1,2 @@
-DIST gson-parent-2.10.1.tar.gz 394777 BLAKE2B e118a7c39b17c4119b4140f3c105fef4c3cb07580dbc530d9bfd59edc4f152f62ac5ff93db1a3861c73758e369ecef4f8ed4e94d556869291469764ea848bbbd SHA512 074f40f7f9aa48daf5b5a3ec371713db02f6f8fceb959b01e8a16732862645d2350f3276ab7ff8021d48082f890b53c6e80d992af6af4b74e4646f85494b8e70
+DIST gson-2.10.2_pre20231128.tar.gz 451312 BLAKE2B d16e0510e0806fd33e8d49b5a8fb73e969b89acb2598ca34a43faa97a09debc99466ab472176d60d617aa20b2190884def25881f0bf651e96be2c1bb9a976d70 SHA512 37f2073e5eee2cb85626040552ac750f4917abd05e3b7944c30a2d5ace6888424870a95a0ceba89bf2dadf9ab33e6bbae1591509b84f35aba4521780764c0877
+DIST truth-1.1.3.jar 243021 BLAKE2B a59149038c62ef5dd352b13d4b393e1b7715fbafe5ed86ec2d16d722c738a31dcdca10132fc73b17b367ac4309e5407ba2e489f8d4c8fbca60ce5f35ae75d1e3 SHA512 f29a9fb070aff8a32358a7b6c8998c0095de5d8d68afa7f7bac759c7050309deff929e767657ecbbefd96163460f10255ca01bc567ab30df4834b9d916a4fae8
diff --git a/dev-java/gson/files/gson-2.10.2-GsonVersionDiagnosticsTest.patch b/dev-java/gson/files/gson-2.10.2-GsonVersionDiagnosticsTest.patch
new file mode 100644
index 000000000000..9feeb0aa3797
--- /dev/null
+++ b/dev-java/gson/files/gson-2.10.2-GsonVersionDiagnosticsTest.patch
@@ -0,0 +1,13 @@
+support our versioning schemes
+
+--- a/src/test/java/com/google/gson/functional/GsonVersionDiagnosticsTest.java
++++ b/src/test/java/com/google/gson/functional/GsonVersionDiagnosticsTest.java
+@@ -35,7 +35,7 @@ import org.junit.Test;
+ public class GsonVersionDiagnosticsTest {
+ // We require a patch number, even if it is .0, consistent with https://semver.org/#spec-item-2.
+ private static final Pattern GSON_VERSION_PATTERN =
+- Pattern.compile("(\\(GSON \\d\\.\\d+\\.\\d)(?:[-.][A-Z]+)?\\)$");
++ Pattern.compile("(\\(GSON \\d\\.\\d+\\.\\d)(?:[-.][A-Z]+|_[a-z]+[0-9]+)?\\)$");
+
+ private Gson gson;
+
diff --git a/dev-java/gson/gson-2.10.1.ebuild b/dev-java/gson/gson-2.10.2_pre20231128.ebuild
index 96e7d452fb78..a8894239bea7 100644
--- a/dev-java/gson/gson-2.10.1.ebuild
+++ b/dev-java/gson/gson-2.10.2_pre20231128.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -11,15 +11,27 @@ inherit java-pkg-2 java-pkg-simple
DESCRIPTION="Gson JSON library"
HOMEPAGE="https://github.com/google/gson"
-SRC_URI="https://github.com/google/gson/archive/gson-parent-${PV}.tar.gz"
-S="${WORKDIR}/gson-gson-parent-${PV}/gson"
+# SRC_URI="https://github.com/google/gson/archive/gson-parent-${PV}.tar.gz"
+# S="${WORKDIR}/gson-gson-parent-${PV}/gson"
+MY_COMMIT="b17b1a0e98dcaf4b61823e1f0c29dda44c0ea3d5"
+SRC_URI="https://github.com/google/gson/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz
+ test? ( https://repo1.maven.org/maven2/com/google/truth/truth/1.1.3/truth-1.1.3.jar )"
+S="${WORKDIR}/gson-${MY_COMMIT}/gson"
LICENSE="Apache-2.0"
SLOT="2.6"
KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-DEPEND=">=virtual/jdk-17:*"
-RDEPEND=">=virtual/jre-1.8:*"
+DEPEND="
+ dev-java/error-prone-annotations:0
+ >=virtual/jdk-17:*
+ test? (
+ dev-java/guava:0
+ dev-java/guava-testlib:0
+ )"
+# src/test/java/com/google/gson/functional/Java17RecordTest.java:78:
+# error: records are not supported in -source 11
+RDEPEND=">=virtual/jre-17:*"
DOCS=(
../CHANGELOG.md
@@ -29,6 +41,10 @@ DOCS=(
../UserGuide.md
)
+PATCHES=( "${FILESDIR}/gson-2.10.2-GsonVersionDiagnosticsTest.patch" )
+
+JAVA_CLASSPATH_EXTRA="error-prone-annotations"
+JAVA_RESOURCE_DIRS="src/main/resources"
JAVA_SRC_DIR=(
"src/main/java"
"src/main/java-templates"
@@ -37,23 +53,35 @@ JAVA_SRC_DIR=(
JAVA_TEST_EXCLUDES=(
# requires the test class to be obfuscated using proguard which we do not have atm
"com.google.gson.functional.EnumWithObfuscatedTest"
- # FAILURES!!!
- # Tests run: 1258, Failures: 2
# testComGoogleGsonAnnotationsPackage(com.google.gson.regression.OSGiTest)
# junit.framework.AssertionFailedError: Cannot find com.google.gson OSGi bundle manifest
"com.google.gson.regression.OSGiTest"
)
-JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_GENTOO_CLASSPATH="
+ guava
+ guava-testlib
+ junit-4
+"
JAVA_TEST_RESOURCE_DIRS="src/test/resources"
JAVA_TEST_SRC_DIR="src/test/java"
src_prepare() {
+ default #780585
java-pkg-2_src_prepare
sed -e "s/\${project.version}/${PV}/g" \
-i src/main/java-templates/com/google/gson/internal/GsonBuildConfig.java \
|| die "Failed to set version"
- # error: records are not supported in -source 8
- # This test would pass "OK (25 tests)" only with >=jre-17
- # pom.xml, lines 20-22
- rm src/test/java/com/google/gson/functional/Java17RecordTest.java || die
+}
+
+src_compile() {
+ if ! use test; then
+ JAVA_PKG_WANT_SOURCE="1.8"
+ JAVA_PKG_WANT_TARGET="1.8"
+ fi
+ java-pkg-simple_src_compile
+}
+
+src_test() {
+ JAVA_GENTOO_CLASSPATH_EXTRA="${DISTDIR}/truth-1.1.3.jar:testdata.jar"
+ java-pkg-simple_src_test
}
diff --git a/dev-java/guava-testlib/Manifest b/dev-java/guava-testlib/Manifest
index 2c2239d9e6bf..9e4363a3129a 100644
--- a/dev-java/guava-testlib/Manifest
+++ b/dev-java/guava-testlib/Manifest
@@ -1,2 +1,2 @@
-DIST guava-32.1.2.tar.gz 5746736 BLAKE2B e10f9ca81acfd14c0bdc595d777c2738f88e35d3caf2ebaec5b3f3dcd6ee87672830671b8f99b0ce030d040adcbf0a88a4cba13a42dfb980bc926540b663167e SHA512 43a9b6068bd4b636f742a6a418a34f3b4d218a0ec14b39d5fbe67b4d3c11813295c3c0eb2cf41b5de7a2383eaba639001faab60dbf3821b7546e29fe9cf3dd78
-DIST truth-1.1.3.jar 243021 BLAKE2B a59149038c62ef5dd352b13d4b393e1b7715fbafe5ed86ec2d16d722c738a31dcdca10132fc73b17b367ac4309e5407ba2e489f8d4c8fbca60ce5f35ae75d1e3 SHA512 f29a9fb070aff8a32358a7b6c8998c0095de5d8d68afa7f7bac759c7050309deff929e767657ecbbefd96163460f10255ca01bc567ab30df4834b9d916a4fae8
+DIST guava-33.0.0.tar.gz 5779322 BLAKE2B b7790f4207e2061b364f3dfac8d3f6f0de180f33f1f1c24078c40b6e69d3a372fc7f681bdd51a670a4b913c0e537731ecbff849a08411c250de4dc6b255e70cf SHA512 4f97aca4621a703b69535c1d56c0b09b3b4ed893e3f136ae5622fe727ce43f920dcdf39a6e8c9667d4f51eccc7f8297c088bc3c34e1f8d6e84a0b7164855ce7c
+DIST truth-1.1.5.jar 244558 BLAKE2B c6a0889c9b50334d16cedff3974a1526b190b56a082d986dbcfce40c902a1d0e8689e387edc5b5f54f6b1ae079f2efd1e785398711b7b9363ed4dc6c1fe297f8 SHA512 b840a4ff9bd44189b0ada2770e53669b6368ad06b40a182d7ddb497866df872892f8ee5139f707f53b83cf0b860073f9d24a0f711dfb15b2f64b63e3f5013749
diff --git a/dev-java/guava-testlib/guava-testlib-32.1.2.ebuild b/dev-java/guava-testlib/guava-testlib-33.0.0.ebuild
index f2a7f38e6762..dfe7882178a8 100644
--- a/dev-java/guava-testlib/guava-testlib-32.1.2.ebuild
+++ b/dev-java/guava-testlib/guava-testlib-33.0.0.ebuild
@@ -1,9 +1,8 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-# No tests because "error: package com.google.common.truth does not exist"
JAVA_PKG_IUSE="doc source test"
MAVEN_ID="com.google.guava:guava-testlib:${PV}-jre"
JAVA_TESTING_FRAMEWORKS="junit-4"
@@ -14,7 +13,7 @@ DESCRIPTION="A set of java classes to assist the tests for Guava itself"
HOMEPAGE="https://github.com/google/guava"
# Currently we bundle the binary version of truth.jar used only for tests, we don't install it.
SRC_URI="https://github.com/google/guava/archive/v${PV}.tar.gz -> guava-${PV}.tar.gz
- test? ( https://repo1.maven.org/maven2/com/google/truth/truth/1.1.3/truth-1.1.3.jar )"
+ test? ( https://repo1.maven.org/maven2/com/google/truth/truth/1.1.5/truth-1.1.5.jar )"
S="${WORKDIR}/guava-${PV}"
LICENSE="Apache-2.0"
@@ -22,25 +21,26 @@ SLOT="0"
KEYWORDS="amd64 ~arm arm64 ppc64 x86"
CP_DEPEND="
- dev-java/checker-framework-qual:0
- dev-java/error-prone-annotations:0
+ >=dev-java/error-prone-annotations-2.24.0:0
~dev-java/guava-${PV}:0
- dev-java/j2objc-annotations:0
dev-java/jsr305:0
dev-java/junit:4
"
DEPEND="${CP_DEPEND}
+ dev-java/checker-framework-qual:0
+ dev-java/j2objc-annotations:0
>=virtual/jdk-1.8:*"
RDEPEND="${CP_DEPEND}
>=virtual/jre-1.8:*"
+JAVA_CLASSPATH_EXTRA="checker-framework-qual j2objc-annotations"
JAVA_SRC_DIR="${PN}/src"
JAVA_TEST_GENTOO_CLASSPATH="junit-4"
JAVA_TEST_SRC_DIR="${PN}/test"
src_test() {
- JAVA_GENTOO_CLASSPATH_EXTRA="${DISTDIR}/truth-1.1.3.jar:testdata.jar"
+ JAVA_GENTOO_CLASSPATH_EXTRA="${DISTDIR}/truth-1.1.5.jar:testdata.jar"
java-pkg-simple_src_test
}
diff --git a/dev-java/guava-testlib/metadata.xml b/dev-java/guava-testlib/metadata.xml
index 8f8ff281cf6a..5dcc33c704ec 100644
--- a/dev-java/guava-testlib/metadata.xml
+++ b/dev-java/guava-testlib/metadata.xml
@@ -4,6 +4,9 @@
<maintainer type="project">
<email>java@gentoo.org</email>
</maintainer>
+ <upstream>
+ <remote-id type="github">google/guava</remote-id>
+ </upstream>
<longdescription>
Guava testlib is a set of java classes used for more convenient unit testing - particularly to assist the tests for Guava itself.
</longdescription>
diff --git a/dev-java/guava/Manifest b/dev-java/guava/Manifest
index beb166188cf0..044968475684 100644
--- a/dev-java/guava/Manifest
+++ b/dev-java/guava/Manifest
@@ -1 +1 @@
-DIST guava-32.1.2.tar.gz 5746736 BLAKE2B e10f9ca81acfd14c0bdc595d777c2738f88e35d3caf2ebaec5b3f3dcd6ee87672830671b8f99b0ce030d040adcbf0a88a4cba13a42dfb980bc926540b663167e SHA512 43a9b6068bd4b636f742a6a418a34f3b4d218a0ec14b39d5fbe67b4d3c11813295c3c0eb2cf41b5de7a2383eaba639001faab60dbf3821b7546e29fe9cf3dd78
+DIST guava-33.0.0.tar.gz 5779322 BLAKE2B b7790f4207e2061b364f3dfac8d3f6f0de180f33f1f1c24078c40b6e69d3a372fc7f681bdd51a670a4b913c0e537731ecbff849a08411c250de4dc6b255e70cf SHA512 4f97aca4621a703b69535c1d56c0b09b3b4ed893e3f136ae5622fe727ce43f920dcdf39a6e8c9667d4f51eccc7f8297c088bc3c34e1f8d6e84a0b7164855ce7c
diff --git a/dev-java/guava/guava-32.1.2-r1.ebuild b/dev-java/guava/guava-33.0.0.ebuild
index dfa306985777..b47d69abc5a9 100644
--- a/dev-java/guava/guava-32.1.2-r1.ebuild
+++ b/dev-java/guava/guava-33.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -18,22 +18,18 @@ SLOT="0"
KEYWORDS="amd64 ~arm arm64 ppc64 x86"
CP_DEPEND="
- dev-java/checker-framework-qual:0
- dev-java/error-prone-annotations:0
- ~dev-java/failureaccess-${PV}:0
+ >=dev-java/error-prone-annotations-2.24.0:0
dev-java/j2objc-annotations:0
dev-java/jsr305:0
"
-DEPEND="
- >=virtual/jdk-1.8:*
- ${CP_DEPEND}
-"
-
-RDEPEND="
- >=virtual/jre-1.8:*
- ${CP_DEPEND}
-"
+DEPEND="${CP_DEPEND}
+ dev-java/checker-framework-qual:0
+ >=virtual/jdk-1.8:*"
+RDEPEND="${CP_DEPEND}
+ >=virtual/jre-1.8:*"
JAVA_AUTOMATIC_MODULE_NAME="com.google.common"
+JAVA_CLASSPATH_EXTRA="checker-framework-qual"
+JAVA_GENTOO_CLASSPATH_EXTRA=":futures/failureaccess/src"
JAVA_SRC_DIR="guava/src"
diff --git a/dev-java/guice/metadata.xml b/dev-java/guice/metadata.xml
index fbbc13fd826c..a8f059e86374 100644
--- a/dev-java/guice/metadata.xml
+++ b/dev-java/guice/metadata.xml
@@ -6,7 +6,6 @@
<name>Java</name>
</maintainer>
<upstream>
- <remote-id type="google-code">google-guice</remote-id>
<remote-id type="github">google/guice</remote-id>
</upstream>
</pkgmetadata>
diff --git a/dev-java/gwt/metadata.xml b/dev-java/gwt/metadata.xml
index 18f25b56258f..cd120d3bccba 100644
--- a/dev-java/gwt/metadata.xml
+++ b/dev-java/gwt/metadata.xml
@@ -1,10 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>gienah@gentoo.org</email>
- <name>Mark Wright</name>
- </maintainer>
<maintainer type="project">
<email>java@gentoo.org</email>
<name>Java</name>
diff --git a/dev-java/htmlcleaner/Manifest b/dev-java/htmlcleaner/Manifest
index ee70232228bb..e19159c540f6 100644
--- a/dev-java/htmlcleaner/Manifest
+++ b/dev-java/htmlcleaner/Manifest
@@ -1,2 +1 @@
-DIST htmlcleaner-2.26-src.zip 414195 BLAKE2B c73533054bf7a8a66a767e53cbafecca1f174cb3be16e116ddd0e025e627603e225323e9095ea40b38a06c661ebe9f2a9e1f53736bf74fd8a2e41d909381c4fb SHA512 df1f9ccc696d538289a0addd19f8d955a3bcb0da88640208c513b2f4f0c4a3ee516b459aa3aae25d36d6ec09c4082b96484df287fb422add2eb160072668af5a
DIST htmlcleaner-src-2.29.zip 394326 BLAKE2B 6317e5dd51facd901e7a5bdc72322c58deb5d3a2e2d0a784e6cd71b938c7b46b7a612d0610a1e5f96ac6c55714942e00ffa68f2259416fe1e6be8cb5ad96c0b3 SHA512 87c3884f56c01d4f34be71b5a016a839f949f03ea429a3c10cc5518fe954b09aa42d05fdf821e7b0bf2115787cffff6ae72dbe13e3d7e08537c4ffbf51d6b34f
diff --git a/dev-java/htmlcleaner/files/htmlcleaner-2.24-fix-tests.patch b/dev-java/htmlcleaner/files/htmlcleaner-2.24-fix-tests.patch
deleted file mode 100644
index 0e10ccee4816..000000000000
--- a/dev-java/htmlcleaner/files/htmlcleaner-2.24-fix-tests.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/src/test/java/org/htmlcleaner/DomSerializerTest.java b/src/test/java/org/htmlcleaner/DomSerializerTest.java
-index b09c6d6..f4e83f0 100644
---- a/src/test/java/org/htmlcleaner/DomSerializerTest.java
-+++ b/src/test/java/org/htmlcleaner/DomSerializerTest.java
-@@ -132,7 +132,7 @@ public class DomSerializerTest extends AbstractHtmlCleanerTest {
- + "</html>";
-
- final String expectedOutput =
-- "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n"
-+ "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
- + "<html>\n" +
- " <head/>\n" +
- " <body>\n" +
-diff --git a/src/test/java/org/htmlcleaner/TraversalDomSerializerTest.java b/src/test/java/org/htmlcleaner/TraversalDomSerializerTest.java
-index 3e1d1e9..d406c40 100644
---- a/src/test/java/org/htmlcleaner/TraversalDomSerializerTest.java
-+++ b/src/test/java/org/htmlcleaner/TraversalDomSerializerTest.java
-@@ -143,7 +143,7 @@ public class TraversalDomSerializerTest extends AbstractHtmlCleanerTest {
- + "</html>";
-
- final String expectedOutput =
-- "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n"
-+ "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
- + "<html>\n" +
- " <head/>\n" +
- " <body>\n" +
diff --git a/dev-java/htmlcleaner/htmlcleaner-2.26.ebuild b/dev-java/htmlcleaner/htmlcleaner-2.26.ebuild
deleted file mode 100644
index 11ae5880fbc2..000000000000
--- a/dev-java/htmlcleaner/htmlcleaner-2.26.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="net.sourceforge.htmlcleaner:htmlcleaner:2.26"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="HTML parser written in Java that can be used as a tool, library or Ant task"
-HOMEPAGE="http://htmlcleaner.sourceforge.net/"
-SRC_URI="mirror://sourceforge/project/htmlcleaner/htmlcleaner/htmlcleaner%20v${PV}/htmlcleaner-${PV}-src.zip"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-CP_DEPEND="dev-java/jdom:2"
-
-RDEPEND="
- ${CP_DEPEND}
- >=virtual/jre-1.8:*
-"
-
-DEPEND="
- ${CP_DEPEND}
- dev-java/ant-core:0
- >=virtual/jdk-1.8:*
- test? ( dev-java/junit:4 )
-"
-
-BDEPEND="app-arch/unzip"
-
-PATCHES=(
- "${FILESDIR}/${PN}-2.24-fix-tests.patch"
-)
-
-JAVA_CLASSPATH_EXTRA="ant-core"
-JAVA_SRC_DIR="src/main/java"
-JAVA_MAIN_CLASS="org.htmlcleaner.CommandLine"
-JAVA_TEST_GENTOO_CLASSPATH="junit-4"
-
-src_prepare() {
- default # https://bugs.gentoo.org/780585
-}
-
-src_install() {
- java-pkg-simple_src_install
- java-pkg_register-ant-task
-
- insinto "${JAVA_PKG_SHAREPATH}"
- newins example.xml default.xml
-}
diff --git a/dev-java/htmlcleaner/htmlcleaner-2.29.ebuild b/dev-java/htmlcleaner/htmlcleaner-2.29.ebuild
index 39354c4424da..a3637d08cc40 100644
--- a/dev-java/htmlcleaner/htmlcleaner-2.29.ebuild
+++ b/dev-java/htmlcleaner/htmlcleaner-2.29.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/project/htmlcleaner/htmlcleaner/htmlcleaner%20v${P
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
BDEPEND="app-arch/unzip"
CP_DEPEND="dev-java/jdom:2"
diff --git a/dev-java/icedtea-bin/metadata.xml b/dev-java/icedtea-bin/metadata.xml
index 97520fe245f0..ba41cd79150b 100644
--- a/dev-java/icedtea-bin/metadata.xml
+++ b/dev-java/icedtea-bin/metadata.xml
@@ -1,10 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>gyakovlev@gentoo.org</email>
- <name>Georgy Yakovlev</name>
- </maintainer>
<maintainer type="project">
<email>java@gentoo.org</email>
<name>Java</name>
diff --git a/dev-java/icedtea-web/icedtea-web-1.8.8-r1.ebuild b/dev-java/icedtea-web/icedtea-web-1.8.8-r1.ebuild
index 186bb18591b3..f36cb218a52d 100644
--- a/dev-java/icedtea-web/icedtea-web-1.8.8-r1.ebuild
+++ b/dev-java/icedtea-web/icedtea-web-1.8.8-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -23,10 +23,10 @@ RESTRICT="test"
BDEPEND="
app-arch/zip
- sys-devel/bc
+ app-alternatives/bc
virtual/pkgconfig
virtual/rust
- doc? ( sys-devel/bc )
+ doc? ( app-alternatives/bc )
"
# Build within Portage using JDK 11+ (also presumably 9+) fails during
diff --git a/dev-java/icedtea/icedtea-3.21.0.ebuild b/dev-java/icedtea/icedtea-3.21.0.ebuild
index 9e6737770814..2cfc8e518512 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-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)
@@ -100,7 +100,7 @@ X_DEPEND="
# The Javascript requirement is obsolete; OpenJDK 8+ has Nashorn
COMMON_DEP="
>=dev-libs/glib-2.26:2=
- >=dev-util/systemtap-1
+ >=dev-debug/systemtap-1
media-libs/fontconfig:1.0=
>=media-libs/freetype-2.5.3:2=
>=sys-libs/zlib-1.2.3
@@ -142,7 +142,7 @@ DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP} ${CUPS_COMMON_DEP} ${X_COMMON_DEP} ${X_
dev-java/icedtea-bin:8
dev-java/icedtea:8
)
- app-arch/cpio
+ app-alternatives/cpio
app-arch/unzip
app-arch/zip
app-misc/ca-certificates
diff --git a/dev-java/icedtea/metadata.xml b/dev-java/icedtea/metadata.xml
index ed7f1f695903..8887f265c2c5 100644
--- a/dev-java/icedtea/metadata.xml
+++ b/dev-java/icedtea/metadata.xml
@@ -5,10 +5,6 @@
<email>gnu_andrew@member.fsf.org</email>
<name>Andrew John Hughes</name>
</maintainer>
- <maintainer type="person">
- <email>gyakovlev@gentoo.org</email>
- <name>Georgy Yakovlev</name>
- </maintainer>
<maintainer type="project">
<email>java@gentoo.org</email>
<name>Java</name>
diff --git a/dev-java/icu4j/Manifest b/dev-java/icu4j/Manifest
index 654f43047d9e..2333f7ea8c09 100644
--- a/dev-java/icu4j/Manifest
+++ b/dev-java/icu4j/Manifest
@@ -1 +1 @@
-DIST icu-73.2.tar.gz 81522943 BLAKE2B 006d7ccab04385f0aa60e2e60b616be9598f448f27d9b0f6dba554874bfe1dd442ba0719a7677ba8aba7e4e0f05e5e50dca74855a900da1f496aad0cd54c3cdc SHA512 f234fb9c76af62dad59e159ef7f7792aca563d88f2988d3d1ecc8be6250837beb9a530ec121e0949f6925ee8e5171a0d04fa41a0c50d9993c4061fa55be6836e
+DIST icu-74.2.tar.gz 65888936 BLAKE2B 81d5acddbfc58a859906cb61660b6f230b88f4a1b1cfd56838843e9445b5858d3dd4888707026340581322143f6a4b7b81f53b6431fd5d4cc3fb90531c4d82fb SHA512 728ae0f09ffc802d675bcf5b849e3081472de8417736bf8b7df0f4db9d1fb8073779be76536764c9111f7cb0e5ab2d2af6c644cc24be432b9eeae9063802ad6c
diff --git a/dev-java/icu4j/icu4j-73.2.ebuild b/dev-java/icu4j/icu4j-73.2.ebuild
deleted file mode 100644
index bb57ea2829c9..000000000000
--- a/dev-java/icu4j/icu4j-73.2.ebuild
+++ /dev/null
@@ -1,240 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="com.ibm.icu:icu4j:${PV}"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="A set of Java libraries providing Unicode and Globalization support"
-HOMEPAGE="https://icu.unicode.org"
-SRC_URI="https://github.com/unicode-org/icu/archive/release-${PV/./-}.tar.gz -> icu-${PV}.tar.gz"
-S="${WORKDIR}/icu-release-${PV/./-}/icu4j/main"
-
-LICENSE="icu"
-SLOT="70"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-DEPEND=">=virtual/jdk-1.8:*
- test? ( dev-java/junitparams:0 )"
-
-RDEPEND=">=virtual/jre-1.8:*"
-
-HTML_DOCS=( ../{APIChangeReport,readme}.html )
-
-JAVA_TEST_EXCLUDES=(
- # Invalid tests, not run by maven
- "com.ibm.icu.dev.data.TestDataElements_testtypes"
- "com.ibm.icu.dev.data.resources.TestDataElements_en_Latn_US"
- "com.ibm.icu.dev.data.resources.TestDataElements_en_US"
- "com.ibm.icu.dev.data.resources.TestDataElements_fr_Latn_FR"
- "com.ibm.icu.dev.data.resources.TestDataElements_te"
- "com.ibm.icu.dev.data.resources.TestMessages"
- "com.ibm.icu.dev.test.ModuleTest"
- "com.ibm.icu.dev.test.TestBoilerplate"
- "com.ibm.icu.dev.test.TestDataModule"
- "com.ibm.icu.dev.test.bidi.TestData"
- "com.ibm.icu.dev.test.calendar.ChineseTestCase"
- "com.ibm.icu.dev.test.calendar.TestCase"
- "com.ibm.icu.dev.test.format.ExhaustivePersonNameFormatterTest"
- "com.ibm.icu.dev.test.localespi.TestUtil"
- "com.ibm.icu.dev.test.message2.TestCase"
- "com.ibm.icu.dev.test.stringprep.TestData"
- "com.ibm.icu.dev.test.translit.TestUtility"
- # Maven: [INFO] Tests run: 364, Failures: 0, Errors: 0, Skipped: 0
- "com.ibm.icu.dev.test.serializable.CompatibilityTest" # Tests run: 364, Failures: 4
- # Maven: [INFO] Tests run: 90, Failures: 0, Errors: 0, Skipped: 0
- "com.ibm.icu.dev.test.serializable.CoverageTest" # Tests run: 99, Failures: 9
- # Following tests need to run separately:
- com.ibm.icu.dev.test.calendar.CalendarRegressionTest
- com.ibm.icu.dev.test.calendar.CompatibilityTest
- com.ibm.icu.dev.test.calendar.DataDrivenCalendarTest
- com.ibm.icu.dev.test.calendar.HolidayTest
- com.ibm.icu.dev.test.calendar.IndianTest
- com.ibm.icu.dev.test.calendar.IslamicTest
- com.ibm.icu.dev.test.calendar.JapaneseTest
- com.ibm.icu.dev.test.format.DataDrivenFormatTest
- com.ibm.icu.dev.test.format.DateFormatRegressionTest
- com.ibm.icu.dev.test.format.DateFormatRoundTripTest
- com.ibm.icu.dev.test.format.DateIntervalFormatTest
- com.ibm.icu.dev.test.format.DateTimeGeneratorTest
- com.ibm.icu.dev.test.format.TestMessageFormat
- com.ibm.icu.dev.test.message2.MessageFormat2Test
- com.ibm.icu.dev.test.message2.Mf2FeaturesTest
- com.ibm.icu.dev.test.message2.Mf2IcuTest
- com.ibm.icu.dev.test.timezone.TimeZoneBoundaryTest
- com.ibm.icu.dev.test.util.CurrencyTest
-)
-JAVA_TEST_EXTRA_ARGS="-Djava.locale.providers=CLDR,COMPAT,SPI"
-JAVA_TEST_GENTOO_CLASSPATH="junit-4,junitparams"
-JAVA_TEST_RESOURCE_DIRS=(
- tests/res/collate/src
- tests/res/core/src
- tests/res/translit/src
-)
-JAVA_TEST_SRC_DIR=(
- tests/charset/src
- tests/collate/src
- tests/core/src
- tests/localespi/src
- tests/packaging/src
- tests/translit/src
-)
-
-src_prepare() {
- java-pkg_clean ! -path "./shared/data/*" # keep icudata.jar, icutzdata.jar, testdata.jar
- java-pkg-2_src_prepare
-
- # java-pkg-simple.eclass wants resources in JAVA_RESOURCE_DIRS
- mkdir -p resources || die
-
- pushd classes > /dev/null || die
- find -type f \
- ! -name '*.java' \
- ! -name 'license.html' \
- | xargs cp --parent -t ../resources || die
- popd > /dev/null || die
-
- pushd resources/core/src > /dev/null || die
- # icudata and icutzdata for "icu4j.jar"
- jar -xf "${S}"/shared/data/icudata.jar || die
- jar -xf "${S}"/shared/data/icutzdata.jar || die
- # move these resources to "icu4j-charset.jar"
- mkdir -p "${S}"/resources/charset/src/com/ibm/icu/impl/data/icudt"$(ver_cut 1)"b || die
- mv com/ibm/icu/impl/data/icudt"$(ver_cut 1)"b/{*.cnv,cnvalias.icu} \
- "${S}"/resources/charset/src/com/ibm/icu/impl/data/icudt"$(ver_cut 1)"b || die
-
- # create 9 files com/ibm/icu/impl/data/icudt69b/*/fullLocaleNames.lst
- for dir in $(find com/ibm/icu/impl/data/icudt"$(ver_cut 1)"b/ -type d ! -name 'unit' -exec echo {} +); do
- ls -1 $dir/*.res | sed -e 's%.*\/%%' -e 's%\..*$%%' -e '/pool/d' -e '/res_index/d' -e '/tzdbNames/d'\
- > $dir/'fullLocaleNames.lst';
- done || die "fullLocaleNames.lst failed"
- popd > /dev/null || die
-
- if use test; then
- # initializationError(com.ibm.icu.dev.data.resources.TestDataElements)
- # but test_excluding it would kill tousands of other tests.
- mkdir -p tests/framework/src/com/ibm/icu/dev/data/resources || die
- mv tests/{core,framework}/src/com/ibm/icu/dev/data/resources/TestDataElements.java || die
-
- # Separate tests resources
- mkdir tests/res || die
- pushd tests > /dev/null || die
- find -type f \
- ! -name '*.java' \
- | xargs cp --parent -t res || die
- popd > /dev/null || die
-
- cp -r ../tools/misc/{src,resources} || die
- find ../tools/misc/resources -type f -name '*.java' -exec rm -rf {} + || die
- fi
-}
-
-src_compile() {
- einfo "Compiling icu4j.jar"
- JAVA_AUTOMATIC_MODULE_NAME="com.ibm.icu"
- JAVA_JAR_FILENAME="icu4j.jar"
- JAVA_MAIN_CLASS="com.ibm.icu.util.VersionInfo"
- JAVA_RESOURCE_DIRS="resources/core/src"
- JAVA_SRC_DIR=(
- classes/collate/src
- classes/core/src
- classes/currdata/src
- classes/langdata/src
- classes/regiondata/src
- classes/translit/src
- )
- java-pkg-simple_src_compile
- JAVA_GENTOO_CLASSPATH_EXTRA+=":icu4j.jar"
- rm -r target || die
-
- einfo "Compiling icu4j-charset.jar"
- JAVA_AUTOMATIC_MODULE_NAME="com.ibm.icu.charset"
- JAVA_JAR_FILENAME="icu4j-charset.jar"
- JAVA_MAIN_CLASS=""
- JAVA_RESOURCE_DIRS="resources/charset/src"
- JAVA_SRC_DIR=( classes/charset/src )
- java-pkg-simple_src_compile
- JAVA_GENTOO_CLASSPATH_EXTRA+=":icu4j-charset.jar"
- rm -r target || die
-
- einfo "Compiling icu4j-localespi.jar"
- JAVA_AUTOMATIC_MODULE_NAME="com.ibm.icu.localespi"
- JAVA_JAR_FILENAME="icu4j-localespi.jar"
- JAVA_RESOURCE_DIRS="resources/localespi/src"
- JAVA_SRC_DIR=( classes/localespi/src )
- java-pkg-simple_src_compile
- JAVA_GENTOO_CLASSPATH_EXTRA+=":icu4j-localespi.jar"
- rm -r target || die
-
- # main/test/framework
- # needed for compilicg the tests
- # but "No runnable methods" ("Invalid test class")
- if use test; then
- JAVA_JAR_FILENAME="framework.jar"
- JAVA_RESOURCE_DIRS=( tests/res/framework/src ../tools/misc/resources )
- JAVA_SRC_DIR=( tests/framework/src ../tools/misc/src )
- java-pkg-simple_src_compile
- rm -fr target || die
- fi
-
- # javadocs
- if use doc; then
- JAVA_JAR_FILENAME="ignoreme.jar"
- JAVA_SRC_DIR=( classes )
- java-pkg-simple_src_compile
- fi
-}
-
-src_test () {
- # TZ needed for some tests in com/ibm/icu/dev/test/format/DateFormatTest
- export LC_ALL="en_US.UTF-8" TZ="US/Pacific"
- JAVA_GENTOO_CLASSPATH_EXTRA+=":framework.jar:shared/data/testdata.jar"
-
- JAVA_TEST_RUN_ONLY=(
- com.ibm.icu.dev.test.rbbi.AbstractBreakIteratorTests
- com.ibm.icu.dev.test.calendar.CalendarRegressionTest
- com.ibm.icu.dev.test.calendar.CompatibilityTest
- com.ibm.icu.dev.test.calendar.DataDrivenCalendarTest
- com.ibm.icu.dev.test.calendar.HolidayTest
- com.ibm.icu.dev.test.calendar.IndianTest
- com.ibm.icu.dev.test.calendar.IslamicTest
- com.ibm.icu.dev.test.calendar.JapaneseTest
- com.ibm.icu.dev.test.format.DataDrivenFormatTest
- com.ibm.icu.dev.test.format.DateFormatRegressionTest
- com.ibm.icu.dev.test.format.DateFormatRoundTripTest
- com.ibm.icu.dev.test.format.DateIntervalFormatTest
- com.ibm.icu.dev.test.format.DateTimeGeneratorTest
- com.ibm.icu.dev.test.format.TestMessageFormat
- com.ibm.icu.dev.test.message2.MessageFormat2Test
- com.ibm.icu.dev.test.message2.Mf2FeaturesTest
- com.ibm.icu.dev.test.message2.Mf2IcuTest
- com.ibm.icu.dev.test.timezone.TimeZoneBoundaryTest
- com.ibm.icu.dev.test.util.CurrencyTest
- )
- java-pkg-simple_src_test
-
- JAVA_TEST_RUN_ONLY=()
- # ../maven-build/maven-icu4j-localespi/pom.xml#L133-L143
- 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"
- java-pkg_dojar "icu4j-charset.jar"
- java-pkg_dojar "icu4j-localespi.jar"
-
- if use doc; then
- java-pkg_dojavadoc target/api
- fi
- if use source; then
- java-pkg_dosrc "classes"
- fi
-}
diff --git a/dev-java/icu4j/icu4j-74.2.ebuild b/dev-java/icu4j/icu4j-74.2.ebuild
new file mode 100644
index 000000000000..8f2660e0cdd6
--- /dev/null
+++ b/dev-java/icu4j/icu4j-74.2.ebuild
@@ -0,0 +1,193 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_PROVIDES="
+ com.ibm.icu:icu4j:${PV}
+ com.ibm.icu:icu4j-charset:${PV}
+ com.ibm.icu:icu4j-localespi:${PV}
+"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="A set of Java libraries providing Unicode and Globalization support"
+HOMEPAGE="https://icu.unicode.org"
+SRC_URI="https://github.com/unicode-org/icu/archive/release-${PV/./-}.tar.gz -> icu-${PV}.tar.gz"
+S="${WORKDIR}/icu-release-${PV/./-}/icu4j/main"
+
+LICENSE="icu"
+SLOT="70"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
+
+DEPEND="
+ >=virtual/jdk-1.8:*
+ test? ( dev-java/junitparams:0 )
+"
+
+RDEPEND=">=virtual/jre-1.8:*"
+
+DOCS=( ../../{CONTRIBUTING,README,SECURITY}.md )
+HTML_DOCS=( ../{APIChangeReport,readme}.html )
+
+src_compile() {
+ JAVA_GENTOO_CLASSPATH_EXTRA="icu4j.jar:icu4j-charset.jar:icu4j-localespi.jar"
+
+ einfo "Compiling icu4j.jar"
+ JAVA_AUTOMATIC_MODULE_NAME="com.ibm.icu"
+ JAVA_JAR_FILENAME="icu4j.jar"
+ JAVA_MAIN_CLASS="com.ibm.icu.util.VersionInfo"
+ JAVA_RESOURCE_DIRS=(
+ collate/src/main/resources
+ core/src/main/resources
+ currdata/src/main/resources
+ langdata/src/main/resources
+ regiondata/src/main/resources
+ translit/src/main/resources
+ )
+ JAVA_SRC_DIR=(
+ collate/src/main/java
+ core/src/main/java
+ currdata/src/main/java
+ langdata/src/main/java
+ regiondata/src/main/java
+ translit/src/main/java
+ )
+ java-pkg-simple_src_compile
+ rm -r target || die
+
+ einfo "Compiling icu4j-charset.jar"
+ JAVA_AUTOMATIC_MODULE_NAME="com.ibm.icu.charset"
+ JAVA_JAR_FILENAME="icu4j-charset.jar"
+ JAVA_MAIN_CLASS=""
+ JAVA_RESOURCE_DIRS=( charset/src/main/resources )
+ JAVA_SRC_DIR=( charset/src/main/java )
+ java-pkg-simple_src_compile
+ rm -r target || die
+
+ einfo "Compiling icu4j-localespi.jar"
+ JAVA_AUTOMATIC_MODULE_NAME="com.ibm.icu.localespi"
+ JAVA_JAR_FILENAME="icu4j-localespi.jar"
+ JAVA_RESOURCE_DIRS=( localespi/src/main/resources )
+ JAVA_SRC_DIR=( localespi/src/main/java )
+ java-pkg-simple_src_compile
+ rm -r target || die
+
+ # javadocs
+ if use doc; then
+ einfo "Compiling javadocs"
+ JAVA_JAR_FILENAME="ignoreme.jar"
+ JAVA_SRC_DIR=(
+ collate/src/main/java
+ core/src/main/java
+ currdata/src/main/java
+ langdata/src/main/java
+ regiondata/src/main/java
+ translit/src/main/java
+ charset/src/main/java
+ localespi/src/main/java
+ )
+ java-pkg-simple_src_compile
+ fi
+}
+
+src_test () {
+ # TZ needed for some tests in com/ibm/icu/dev/test/format/DateFormatTest
+ export LC_ALL="en_US.UTF-8" TZ="US/Pacific"
+
+ JAVA_TEST_EXTRA_ARGS="-Djava.locale.providers=CLDR,COMPAT,SPI"
+ JAVA_TEST_GENTOO_CLASSPATH="junit-4,junitparams"
+
+ einfo "Compiling framework-tests.jar"
+ JAVA_AUTOMATIC_MODULE_NAME="com.ibm.icu.framework"
+ JAVA_JAR_FILENAME="framework-tests.jar"
+ JAVA_MAIN_CLASS="com.ibm.icu.dev.test.TestAll"
+ JAVA_RESOURCE_DIRS=( framework/src/test/resources )
+ JAVA_SRC_DIR=( framework/src/test/java )
+ java-pkg-simple_src_compile
+ JAVA_GENTOO_CLASSPATH_EXTRA+=":framework-tests.jar"
+
+ einfo "Testing core aka icu4j.jar"
+ JAVA_TEST_RESOURCE_DIRS="core/src/test/resources"
+ JAVA_TEST_SRC_DIR="core/src/test/java"
+ pushd "${JAVA_TEST_SRC_DIR}" || die
+ # exclude invalid tests, not run by "mvn test"
+ local JAVA_TEST_RUN_ONLY=$(find * \
+ -name "*Test*.java" \
+ ! -name "ChineseTestCase.java" \
+ ! -name "DataDrivenNumberFormatTestUtility.java" \
+ ! -name "*Helper.java" \
+ ! -name "ModuleTest.java" \
+ ! -name "*Sample.java" \
+ ! -name "TestCase.java" \
+ ! -name "*TestData*.java" \
+ ! -name "*TestFmwk.java" \
+ ! -name "TestMessages.java" \
+ ! -name "TestUtils.java" \
+ )
+ popd
+ JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}"
+ JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}"
+ java-pkg-simple_src_test
+
+ einfo "Creating core-tests.jar"
+ jar cvf core-tests.jar -C target/test-classes .
+ JAVA_GENTOO_CLASSPATH_EXTRA+=":core-tests.jar"
+ JAVA_TEST_RUN_ONLY=""
+
+ einfo "Testing collate"
+ JAVA_TEST_RESOURCE_DIRS="collate/src/test/resources"
+ JAVA_TEST_SRC_DIR="collate/src/test/java"
+ java-pkg-simple_src_test
+
+ einfo "Testing translit"
+ JAVA_TEST_EXCLUDES=(
+ # Invalid test classes, No runnable methods
+ com.ibm.icu.dev.test.TestBoilerplate
+ com.ibm.icu.dev.test.translit.TestUtility
+ )
+ JAVA_TEST_RESOURCE_DIRS="translit/src/test/resources"
+ JAVA_TEST_SRC_DIR="translit/src/test/java"
+ java-pkg-simple_src_test
+
+ einfo "Testing charset"
+ JAVA_TEST_RESOURCE_DIRS=""
+ JAVA_TEST_SRC_DIR="charset/src/test/java"
+ java-pkg-simple_src_test
+
+ einfo "Testing common_tests"
+ # "mvn test" runs only 90 tests here, Gentoo runs 99 but 9 of them fail.
+ # coverage tests fail because test handlers for the parametrized tests
+ # are not defined so the tests are broken and cannot succeed
+ JAVA_TEST_EXCLUDES=( com.ibm.icu.dev.test.serializable.CoverageTest )
+ JAVA_TEST_RESOURCE_DIRS=""
+ JAVA_TEST_SRC_DIR="common_tests/src/test/java"
+ java-pkg-simple_src_test
+
+ einfo "Testing localespi"
+ JAVA_TEST_RESOURCE_DIRS=""
+ JAVA_TEST_SRC_DIR="localespi/src/test/java"
+ # Invalid test classes, No runnable methods
+ JAVA_TEST_EXCLUDES=( com.ibm.icu.dev.test.localespi.TestUtil )
+ # https://bugs.gentoo.org/827212, "mvn test" does not run it at all
+ 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"
+ java-pkg_dojar "icu4j-charset.jar"
+ java-pkg_dojar "icu4j-localespi.jar"
+
+ if use doc; then
+ java-pkg_dojavadoc target/api
+ fi
+ if use source; then
+ java-pkg_dosrc "classes"
+ fi
+}
diff --git a/dev-java/jakarta-mail/files/jakarta-mail-2.0.1-LogManagerPropertiesTest.patch b/dev-java/jakarta-mail/files/jakarta-mail-2.0.1-LogManagerPropertiesTest.patch
new file mode 100644
index 000000000000..7848f1e77c9a
--- /dev/null
+++ b/dev-java/jakarta-mail/files/jakarta-mail-2.0.1-LogManagerPropertiesTest.patch
@@ -0,0 +1,11 @@
+--- a/src/test/java/com/sun/mail/util/logging/LogManagerPropertiesTest.java
++++ b/src/test/java/com/sun/mail/util/logging/LogManagerPropertiesTest.java
+@@ -78,7 +78,7 @@ public class LogManagerPropertiesTest extends AbstractLogging {
+ assertEquals(Arrays.toString(declared), 0, declared.length);
+ }
+
+- @Test
++ @Test @Ignore
+ public void testCheckAccessPresent() {
+ LogManager m = LogManager.getLogManager();
+ m.checkAccess();
diff --git a/dev-java/jakarta-mail/jakarta-mail-2.0.1.ebuild b/dev-java/jakarta-mail/jakarta-mail-2.0.1.ebuild
index 2fcf73b3a66e..0e12088b9f5e 100644
--- a/dev-java/jakarta-mail/jakarta-mail-2.0.1.ebuild
+++ b/dev-java/jakarta-mail/jakarta-mail-2.0.1.ebuild
@@ -1,9 +1,6 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/jakartaee/mail-api/archive/2.0.1.tar.gz --slot 0 --keywords "~amd64" --ebuild jakarta-mail-2.0.1.ebuild
-
EAPI=8
JAVA_PKG_IUSE="doc source test"
@@ -15,31 +12,22 @@ inherit java-pkg-2 java-pkg-simple
DESCRIPTION="Implementation of the Jakarta Mail API"
HOMEPAGE="https://github.com/jakartaee/mail-api"
SRC_URI="https://github.com/jakartaee/mail-api/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/mail-api-${PV}/mail"
LICENSE="EPL-1.0 EPL-2.0 GPL-2-with-classpath-exception"
SLOT="0"
KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-# Common dependencies
-# POM: pom.xml
-# com.sun.activation:jakarta.activation:2.0.1 -> >=dev-java/jakarta-activation-2.0.1:2
-
CP_DEPEND="dev-java/jakarta-activation:2"
-DEPEND="
- >=virtual/jdk-11:*
- ${CP_DEPEND}
-"
+DEPEND="${CP_DEPEND}
+ >=virtual/jdk-11:*"
-RDEPEND="
- >=virtual/jre-1.8:*
- ${CP_DEPEND}
-"
+RDEPEND="${CP_DEPEND}
+ >=virtual/jre-1.8:*"
DOCS=( ../{CONTRIBUTING,NOTICE,README}.md )
-S="${WORKDIR}/mail-api-${PV}/mail"
-
JAVA_ENCODING="iso-8859-1"
JAVA_SRC_DIR="src/main/java"
@@ -56,15 +44,25 @@ src_prepare() {
}
src_test() {
+ # test failure with jdk:21
+ # 1) testCheckAccessPresent(com.sun.mail.util.logging.LogManagerPropertiesTest)
+ # java.lang.UnsupportedOperationException:
+ # The Security Manager is deprecated and will be removed in a future release
+ # at java.base/java.lang.System.setSecurityManager(System.java:429)
+ # at com.sun.mail.util.logging.LogManagerPropertiesTest.testCheckAccessPresent(LogManagerPropertiesTest.java:89)
+ # https://github.com/jakartaee/mail-api/pull/704#issuecomment-1911924741
+ local vm_version="$(java-config -g PROVIDES_VERSION)"
+ if ver_test "${vm_version}" -ge 21; then
+ eapply "${FILESDIR}/jakarta-mail-2.0.1-LogManagerPropertiesTest.patch"
+ fi
pushd src/test/java || die
# Selection according to 137,138 pom.xml
- # This one does not run because of
+ # MailHandlerTest does not run because of
# "java.io.IOException: Permission denied"
# excluding it costs 141 tests.
- # 1) com.sun.mail.util.logging.MailHandlerTest
local JAVA_TEST_RUN_ONLY=$(find * \
- \( -wholename "**/*TestSuite.java" \
- -o -wholename "**/*Test.java" \) \
+ \( -path "**/*TestSuite.java" \
+ -o -path "**/*Test.java" \) \
! -name "MailHandlerTest.java" \
)
JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}"
diff --git a/dev-java/jakartaee-migration/Manifest b/dev-java/jakartaee-migration/Manifest
index 085e1f137a17..b2977130e476 100644
--- a/dev-java/jakartaee-migration/Manifest
+++ b/dev-java/jakartaee-migration/Manifest
@@ -1 +1,2 @@
DIST jakartaee-migration-1.0.7-sources.tar.gz 43381 BLAKE2B 9a1a6bfd217f77890940240c6c860e21e0b72c758a63426a0c63009213738a9322a758d4525a9a8a8c69883c490edf128d8b70a6120ede431da434c4d1408e19 SHA512 f7edd70b997b2ae2a93b14b93c5b6dcb80de04f554125729f89e62eddaecfbfea21b304226887edb029c8a7b255b50a55a38381d017c7d44859f2e56b912f25a
+DIST jakartaee-migration-1.0.8-sources.tar.gz 43466 BLAKE2B f9ffbb46ef6a26c9884e1d3eb55f283556cf8dbaf0955c9efe7e9766f77eadaae1e5bd066225948e9d97adac0f2f34fee3d6ad552bbbdad7303a0abb98d3070c SHA512 ecb1db63cb258b1b8c0e8106ea171e80e66622a48cafa62f8fb75e1b1ba6d539cfefc5dfe0ba9536d06b102c599afeba80d094598d2af3fe1d2ca153ef61ced8
diff --git a/dev-java/jakartaee-migration/jakartaee-migration-1.0.7-r1.ebuild b/dev-java/jakartaee-migration/jakartaee-migration-1.0.7-r1.ebuild
index 4308d151f1bf..021d35532658 100644
--- a/dev-java/jakartaee-migration/jakartaee-migration-1.0.7-r1.ebuild
+++ b/dev-java/jakartaee-migration/jakartaee-migration-1.0.7-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -77,8 +77,8 @@ src_prepare() {
src_test() {
# we need to create jar files for the tests the same way as it's done using pom.xml
local implementation_version=$(grep Implementation-Version pom.xml | grep -oE "[0-9]+\.[0-9]+\.[0-9]+")
- mkdir -p target/test-classes/META-INF || die
- pushd target/test-classes || die
+ mkdir -p generated-test/META-INF || die
+ pushd generated-test || die
echo "Implementation-Version: ${implementation_version}" > META-INF/MANIFEST.MF
ejavac -d . -encoding ${JAVA_ENCODING} $(find "${S}/${JAVA_TEST_SRC_DIR}" -name CommonGatewayInterface.java) || die
jar cfm cgi-api.jar META-INF/MANIFEST.MF $(find -name CommonGatewayInterface.class) || die
diff --git a/dev-java/jakartaee-migration/jakartaee-migration-1.0.7-r2.ebuild b/dev-java/jakartaee-migration/jakartaee-migration-1.0.7-r2.ebuild
new file mode 100644
index 000000000000..7e8daacf6943
--- /dev/null
+++ b/dev-java/jakartaee-migration/jakartaee-migration-1.0.7-r2.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.apache.tomcat:jakartaee-migration:1.0.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"
+HOMEPAGE="https://tomcat.apache.org"
+SRC_URI="mirror://apache/tomcat/${PN}/v${PV}/source/${P}-src.tar.gz -> ${P}-sources.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64"
+
+# Common dependencies
+# POM: pom.xml
+# commons-io:commons-io:2.11.0 -> >=dev-java/commons-io-2.11.0:1
+# org.apache.bcel:bcel:6.6.0 -> >=dev-java/bcel-6.6.0:0
+# org.apache.commons:commons-compress:1.22 -> !!!suitable-mavenVersion-not-found!!!
+
+CDEPEND="
+ >=dev-java/ant-1.10.14-r1:0
+ dev-java/bcel:0
+ dev-java/commons-compress:0
+ dev-java/commons-io:1
+"
+
+# Compile dependencies
+# POM: pom.xml
+# org.apache.ant:ant:1.10.12 -> !!!suitable-mavenVersion-not-found!!!
+# POM: pom.xml
+# test? junit:junit:4.13.2 -> >=dev-java/junit-4.13.2:4
+
+# we need jdk-11 just for some tests as those need stuff from newer jdk,
+# otherwise the package as of version 1.0.7 compiles fine with jdk 1.8
+# with tests disabled
+# see bug https://bugs.gentoo.org/910499
+
+DEPEND="
+ >=virtual/jdk-11:*
+ ${CDEPEND}
+"
+
+RDEPEND="
+ >=virtual/jre-1.8:*
+ ${CDEPEND}"
+
+S="${WORKDIR}/${P}"
+
+JAVA_LAUNCHER_FILENAME="${PN}"
+
+JAVA_GENTOO_CLASSPATH="ant,bcel,commons-compress,commons-io-1"
+JAVA_SRC_DIR="src/main/java"
+JAVA_MAIN_CLASS="org.apache.tomcat.jakartaee.MigrationCLI"
+JAVA_RESOURCE_DIRS=(
+ "src/main/resources"
+)
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_SRC_DIR="src/test/java"
+JAVA_TEST_RESOURCE_DIRS=(
+ "src/test/resources"
+)
+JAVA_TEST_EXCLUDES=(
+ "org.apache.tomcat.jakartaee.TesterConstants"
+)
+
+src_prepare() {
+ default
+ sed -i "s/\${project.version}/${PV}/g" src/main/resources/info.properties
+}
+
+src_test() {
+ # we need to create jar files for the tests the same way as it's done using pom.xml
+ local implementation_version=$(grep Implementation-Version pom.xml | grep -oE "[0-9]+\.[0-9]+\.[0-9]+")
+ mkdir -p generated-test/META-INF || die
+ pushd generated-test || die
+ echo "Implementation-Version: ${implementation_version}" > META-INF/MANIFEST.MF
+ ejavac -d . -encoding ${JAVA_ENCODING} $(find "${S}/${JAVA_TEST_SRC_DIR}" -name CommonGatewayInterface.java) || die
+ jar cfm cgi-api.jar META-INF/MANIFEST.MF $(find -name CommonGatewayInterface.class) || die
+ ejavac -d . -encoding ${JAVA_ENCODING} $(find "${S}/${JAVA_TEST_SRC_DIR}" -name HelloCGI.java) || die
+ jar cfm hellocgi.jar META-INF/MANIFEST.MF $(find -name HelloCGI.class) || die
+ for enc in rsa dsa ec; do
+ cp hellocgi.jar hellocgi-signed-${enc}.jar || die
+ jarsigner -keystore "${S}/src/test/resources/keystore.p12" -storepass apache hellocgi-signed-${enc}.jar ${enc} || die
+ done
+ popd
+
+ java-pkg-simple_src_test
+}
diff --git a/dev-java/jakartaee-migration/jakartaee-migration-1.0.8.ebuild b/dev-java/jakartaee-migration/jakartaee-migration-1.0.8.ebuild
new file mode 100644
index 000000000000..41b5ca2d7e47
--- /dev/null
+++ b/dev-java/jakartaee-migration/jakartaee-migration-1.0.8.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.apache.tomcat:jakartaee-migration:1.0.8"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Apache Tomcat tool for migration from Java EE 8 to Jakarta EE 9"
+HOMEPAGE="https://tomcat.apache.org"
+SRC_URI="mirror://apache/tomcat/${PN}/v${PV}/source/${P}-src.tar.gz -> ${P}-sources.tar.gz"
+S="${WORKDIR}/${P}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64"
+
+CP_DEPEND="
+ >=dev-java/ant-1.10.14-r1:0
+ dev-java/bcel:0
+ dev-java/commons-compress:0
+ dev-java/commons-io:1
+"
+
+# we need jdk-11 just for some tests as those need stuff from newer jdk,
+# otherwise the package as of version 1.0.7 compiles fine with jdk 1.8
+# with tests disabled
+# see bug https://bugs.gentoo.org/910499
+
+DEPEND="${CP_DEPEND}
+ >=virtual/jdk-11:*"
+
+RDEPEND="${CP_DEPEND}
+ >=virtual/jre-1.8:*"
+
+JAVA_MAIN_CLASS="org.apache.tomcat.jakartaee.MigrationCLI"
+JAVA_RESOURCE_DIRS="src/main/resources"
+JAVA_SRC_DIR="src/main/java"
+
+JAVA_TEST_EXCLUDES=(
+ "org.apache.tomcat.jakartaee.TesterConstants"
+)
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+JAVA_TEST_SRC_DIR="src/test/java"
+
+src_prepare() {
+ java-pkg-2_src_prepare
+ sed -i "s/\${project.version}/${PV}/g" src/main/resources/info.properties
+}
+
+src_test() {
+ # we need to create jar files for the tests the same way as it's done using pom.xml
+ local implementation_version=$(grep Implementation-Version pom.xml | grep -oE "[0-9]+\.[0-9]+\.[0-9]+")
+ mkdir -p generated-test/META-INF || die
+ pushd generated-test || die
+ echo "Implementation-Version: ${implementation_version}" > META-INF/MANIFEST.MF
+ ejavac -d . -encoding ${JAVA_ENCODING} $(find "${S}/${JAVA_TEST_SRC_DIR}" -name CommonGatewayInterface.java) || die
+ jar cfm cgi-api.jar META-INF/MANIFEST.MF $(find -name CommonGatewayInterface.class) || die
+ ejavac -d . -encoding ${JAVA_ENCODING} $(find "${S}/${JAVA_TEST_SRC_DIR}" -name HelloCGI.java) || die
+ jar cfm hellocgi.jar META-INF/MANIFEST.MF $(find -name HelloCGI.class) || die
+ for enc in rsa dsa ec; do
+ cp hellocgi.jar hellocgi-signed-${enc}.jar || die
+ jarsigner -keystore "${S}/src/test/resources/keystore.p12" -storepass apache hellocgi-signed-${enc}.jar ${enc} || die
+ done
+ popd
+
+ java-pkg-simple_src_test
+}
diff --git a/dev-java/jakartaee-migration/metadata.xml b/dev-java/jakartaee-migration/metadata.xml
index 6021501589e0..e9aebc513f50 100644
--- a/dev-java/jakartaee-migration/metadata.xml
+++ b/dev-java/jakartaee-migration/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>
+ <upstream>
+ <remote-id type="github">apache/tomcat-jakartaee-migration</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-java/java-config/java-config-2.3.3-r1.ebuild b/dev-java/java-config/java-config-2.3.3-r1.ebuild
index b63dbff8d490..ab1cb1b890e9 100644
--- a/dev-java/java-config/java-config-2.3.3-r1.ebuild
+++ b/dev-java/java-config/java-config-2.3.3-r1.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} = 9999 ]]; then
EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/java-config.git"
else
SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+ KEYWORDS="amd64 ~arm arm64 ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
fi
DESCRIPTION="Java environment configuration query tool"
diff --git a/dev-java/java-diff-utils/java-diff-utils-4.12.ebuild b/dev-java/java-diff-utils/java-diff-utils-4.12.ebuild
index bb67109d452d..eda5f5df35e7 100644
--- a/dev-java/java-diff-utils/java-diff-utils-4.12.ebuild
+++ b/dev-java/java-diff-utils/java-diff-utils-4.12.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/java-diff-utils-java-diff-utils-parent-${PV}/java-diff-utils"
LICENSE="Apache-2.0"
SLOT="4"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ppc64 x86"
RESTRICT="test" #839681
BDEPEND="app-arch/unzip"
diff --git a/dev-java/javacc/javacc-5.0-r5.ebuild b/dev-java/javacc/javacc-5.0-r5.ebuild
new file mode 100644
index 000000000000..a30bdb682c9e
--- /dev/null
+++ b/dev-java/javacc/javacc-5.0-r5.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2024 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.github.io/javacc/"
+SRC_URI="http://java.net/projects/${PN}/downloads/download/${P}src.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+
+KEYWORDS="amd64 ~arm ~arm64 ppc64 ~x86"
+
+CDEPEND="dev-java/junit:0"
+
+RDEPEND="
+ ${CDEPEND}
+ >=virtual/jre-1.8:*"
+
+DEPEND="
+ ${CDEPEND}
+ >=virtual/jdk-1.8:*
+ test? ( >=dev-java/ant-1.10.14:0[junit] )"
+
+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 #780585
+
+ 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/javax-mail/Manifest b/dev-java/javax-mail/Manifest
index 25170c74c15f..35dd8eaf5b5a 100644
--- a/dev-java/javax-mail/Manifest
+++ b/dev-java/javax-mail/Manifest
@@ -1 +1,2 @@
-DIST javax-mail-1.6.7.tar.gz 1854297 BLAKE2B 70dac40cdf67c413db3370f9cdf5b9786fcebce4ba12725758bf6120a2b6874e079a5beef08ee1190e30bfe2f14ad21e73ef1710c982e3f658a2f2f11e524f2e SHA512 9e8754839efb43d14ade6189428c4b86f5fc180e2e18b4e121a9463aaa52c34a431dbf05a6264ef8221faf0b09cc08f914ff758cbb3931df97cea1a897c54c08
+DIST javax-mail-1.6.7-java21.patch 108038 BLAKE2B 41dd770dc9de5b17d9a4b4a427f31fd3158d45420a3bf1b7949075f1c65103c4093d945e224d70fec66045c314d41aca721b8a7667b6c839fd3f1c3d448c00a4 SHA512 f6f777f7a158114707196321f4480c98bd04ab9a807cbc65a6166bbb55dd9e33853ec4074a5fd23540a1d70629368f1e187e9e839c2bd775ad6d309b4d59fca7
+DIST javax-mail-1.6.7.tar.gz 1854403 BLAKE2B b6681995202c5fd9ed978314d79a6e3c6ee0edeecbbcdb147b94e1f789f7706e090342df8e6491dc23a67d9b3b2b12150cdd0c8ab17a120d1bc0dd4e153be846 SHA512 eb9d1bf863ef2404bdcfde4d9c23089e8d6f76c3f8fd2fc817dd365811636d23d57a60e6991e0349842b1f29b5a1b36b3af78533077858fd2d4550560d2e2d8c
diff --git a/dev-java/javax-mail/javax-mail-1.6.7-r1.ebuild b/dev-java/javax-mail/javax-mail-1.6.7-r2.ebuild
index cb0feeaf01ef..f19bd8c2717b 100644
--- a/dev-java/javax-mail/javax-mail-1.6.7-r1.ebuild
+++ b/dev-java/javax-mail/javax-mail-1.6.7-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -11,45 +11,42 @@ inherit java-pkg-2 java-pkg-simple
DESCRIPTION="Jakarta Mail API"
HOMEPAGE="https://jakartaee.github.io/mail-api/"
-SRC_URI="https://github.com/jakartaee/mail-api/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/mail-${PV}/mail"
+SRC_URI="https://github.com/jakartaee/mail-api/archive/${PV}.tar.gz -> ${P}.tar.gz
+ https://github.com/jakartaee/mail-api/commit/86ee859eb1.patch -> ${P}-java21.patch"
+S="${WORKDIR}/mail-api-${PV}"
LICENSE="EPL-1.0 EPL-2.0 GPL-2-with-classpath-exception"
SLOT="0"
KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-CDEPEND="
- dev-java/jakarta-activation:1
-"
-
DEPEND="
+ dev-java/jakarta-activation:1
>=virtual/jdk-11:*
- ${CDEPEND}
"
-RDEPEND="
- >=virtual/jre-1.8:*
- ${CDEPEND}"
+RDEPEND=">=virtual/jre-1.8:*"
-DOCS=( ../{NOTICE,README}.md )
+DOCS=( {NOTICE,README}.md )
+PATCHES=( "${DISTDIR}/javax-mail-1.6.7-java21.patch" ) #917068
src_prepare() {
+ default #780585
java-pkg-2_src_prepare
- mv src/main/{resources,java}/javax/mail/Version.java || die
+ mv mail/src/main/{resources,java}/javax/mail/Version.java || die
}
+JAVA_CLASSPATH_EXTRA="jakarta-activation-1"
JAVA_ENCODING="iso-8859-1"
-JAVA_GENTOO_CLASSPATH="jakarta-activation-1"
-JAVA_RESOURCE_DIRS="src/main/resources"
-JAVA_SRC_DIR="src/main/java"
+JAVA_RESOURCE_DIRS="mail/src/main/resources"
+JAVA_SRC_DIR="mail/src/main/java"
JAVA_TEST_EXTRA_ARGS=( -ea )
JAVA_TEST_GENTOO_CLASSPATH="junit-4"
-JAVA_TEST_RESOURCE_DIRS="src/test/resources"
-JAVA_TEST_SRC_DIR="src/test/java"
+JAVA_TEST_RESOURCE_DIRS="mail/src/test/resources"
+JAVA_TEST_SRC_DIR="mail/src/test/java"
src_test() {
- pushd src/test/java || die
+ pushd mail/src/test/java || die
# Selection according to 137,138 pom.xml
# 1) com.sun.mail.util.logging.MailHandlerTest
# java.io.IOException: Permission denied
@@ -60,6 +57,5 @@ src_test() {
JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}"
JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}"
popd
-
java-pkg-simple_src_test
}
diff --git a/dev-java/jctools-core/Manifest b/dev-java/jctools-core/Manifest
index cce5c24db238..8ac9a9cdd6db 100644
--- a/dev-java/jctools-core/Manifest
+++ b/dev-java/jctools-core/Manifest
@@ -1,2 +1,2 @@
-DIST jctools-4.0.1.tar.gz 4234647 BLAKE2B 652cfc70d92a37e04056e306050b156632ba92b2cacd9b759556ea92e1b9b6dda3d766e33936cdd92ec690abb6fb51a562305f82746f500f89d9d797e27f9c54 SHA512 9c8f55be4640f7b1315e7f93c20cf6b4b8d84c542103d69a2e34c0abe00c25fb362b6d8c4042feb4462559e5f6babd90ab0a59a66c3d407e13004ff02ce95c8f
DIST jctools-4.0.2.tar.gz 4237275 BLAKE2B 9bac4f8442f7a64aac47208ecf98799506244783d71a5444b6a3ff74ddca4e16232cf19dd5e7a9243dfcc3510674717982ef915759c8b6b2de74d4711d996302 SHA512 d19237929ab18360427efdf2844adc08589fc8ba2838b1f983118e1d6f1270bacad34477cb000e6bc85aeab38e7e337c397181b4351681f18977547c5b2e8f37
+DIST jctools-4.0.3.tar.gz 4237279 BLAKE2B be74c2b0997ec68b90249c8d2b841737fffa4e09724a25b5f5e15b8c4bbf811215023358bc674ed20f81d06a10db3ac2428b29d159ac99ef6dff7e6c36bf7fe2 SHA512 3d7cede6beba54871365cc2f49dc30f014a6f36a5e1f66e9cebd523d202806d49f24c23dbfd6bef0c25cbea0ca230b5d1afefd2b83b0150d335e8e99b6cec90f
diff --git a/dev-java/jctools-core/files/jctools-core-4.0.3-increase-TEST_TIMEOUT.patch b/dev-java/jctools-core/files/jctools-core-4.0.3-increase-TEST_TIMEOUT.patch
new file mode 100644
index 000000000000..6eccce942b62
--- /dev/null
+++ b/dev-java/jctools-core/files/jctools-core-4.0.3-increase-TEST_TIMEOUT.patch
@@ -0,0 +1,13 @@
+https://bugs.gentoo.org/863977
+https://bugs.gentoo.org/924135
+--- a/src/test/java/org/jctools/util/TestUtil.java
++++ b/src/test/java/org/jctools/util/TestUtil.java
+@@ -19,7 +19,7 @@ import static org.jctools.util.UnpaddedQueueFactory.newUnpaddedQueue;
+ public class TestUtil {
+ public static final int CONCURRENT_TEST_DURATION = Integer.getInteger("org.jctools.concTestDurationMs", 500);
+ public static final int CONCURRENT_TEST_THREADS = Integer.getInteger("org.jctools.concTestThreads", Math.min(4, Runtime.getRuntime().availableProcessors()));
+- public static final int TEST_TIMEOUT = 30000;
++ public static final int TEST_TIMEOUT = 60000;
+ private static final AtomicInteger threadIndex = new AtomicInteger();
+ public static void sleepQuietly(long timeMs) {
+ LockSupport.parkNanos(TimeUnit.MILLISECONDS.toNanos(timeMs));
diff --git a/dev-java/jctools-core/jctools-core-4.0.2.ebuild b/dev-java/jctools-core/jctools-core-4.0.2.ebuild
index 7b344074414a..9a8538d94a9b 100644
--- a/dev-java/jctools-core/jctools-core-4.0.2.ebuild
+++ b/dev-java/jctools-core/jctools-core-4.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -16,7 +16,7 @@ S="${WORKDIR}/JCTools-${PV}/jctools-core"
LICENSE="Apache-2.0"
SLOT="3"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
DEPEND="
dev-java/osgi-annotation:0
diff --git a/dev-java/jctools-core/jctools-core-4.0.1.ebuild b/dev-java/jctools-core/jctools-core-4.0.3.ebuild
index f72f40a764d5..bd095315bc5c 100644
--- a/dev-java/jctools-core/jctools-core-4.0.1.ebuild
+++ b/dev-java/jctools-core/jctools-core-4.0.3.ebuild
@@ -1,13 +1,10 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/JCTools/JCTools/archive/v4.0.1.tar.gz --slot 3 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild jctools-core-4.0.1.ebuild
-
EAPI=8
JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.jctools:jctools-core:4.0.1"
+MAVEN_ID="org.jctools:jctools-core:${PV}"
JAVA_TESTING_FRAMEWORKS="junit-4"
inherit java-pkg-2 java-pkg-simple
@@ -15,29 +12,37 @@ inherit java-pkg-2 java-pkg-simple
DESCRIPTION="Java Concurrency Tools Core Library"
HOMEPAGE="https://jctools.github.io/JCTools/"
SRC_URI="https://github.com/JCTools/JCTools/archive/v${PV}.tar.gz -> jctools-${PV}.tar.gz"
+S="${WORKDIR}/JCTools-${PV}/jctools-core"
LICENSE="Apache-2.0"
SLOT="3"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-DEPEND=">=virtual/jdk-1.8:*
+DEPEND="
+ dev-java/osgi-annotation:0
+ >=virtual/jdk-1.8:*
test? (
dev-java/guava-testlib:0
- dev-java/hamcrest-library:1.3
+ dev-java/hamcrest:0
)"
RDEPEND=">=virtual/jre-1.8:*"
DOCS=( ../{README,RELEASE-NOTES}.md )
-
-S="${WORKDIR}/JCTools-${PV}/jctools-core"
+PATCHES=( "${FILESDIR}/jctools-core-4.0.3-increase-TEST_TIMEOUT.patch" )
JAVA_AUTOMATIC_MODULE_NAME="org.jctools.core"
+JAVA_CLASSPATH_EXTRA="osgi-annotation"
JAVA_SRC_DIR="src/main/java"
-JAVA_TEST_GENTOO_CLASSPATH="guava-testlib,hamcrest-library-1.3,junit-4"
+JAVA_TEST_GENTOO_CLASSPATH="guava-testlib,hamcrest,junit-4"
JAVA_TEST_SRC_DIR="src/test/java"
+src_prepare() {
+ default #780585
+ java-pkg-2_src_prepare
+}
+
# Using the defaults of java-pkg-simple would skip more than half the number of tests.
src_test() {
# org.jetbrains.kotlinx.lincheck is not yet packaged
@@ -47,9 +52,6 @@ src_test() {
# "org.jctools.queues.QueueSanityTest"
# "org.jctools.queues.ScQueueRemoveTest"
# "org.jctools.util.TestUtil"
- # Test timeout on arm64, https://bugs.gentoo.org/863977
- # "org.jctools.queues.atomic.AtomicMpqSanityTestMpscLinked"
- # "org.jctools.queues.MpqSanityTestMpscLinked"
pushd src/test/java || die
local JAVA_TEST_RUN_ONLY=$(find * \
\( -name "*Test*.java" \
@@ -59,12 +61,10 @@ src_test() {
! -name "QueueSanityTest.java" \
! -name "ScQueueRemoveTest.java" \
! -name "TestUtil.java" \
- ! -name "AtomicMpqSanityTestMpscLinked.java" \
- ! -name "MpqSanityTestMpscLinked.java" \
)
popd
JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}"
JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}"
java-pkg-simple_src_test
- # OK (7226 tests)
+ # OK (8746 tests)
}
diff --git a/dev-java/jdbc-postgresql/Manifest b/dev-java/jdbc-postgresql/Manifest
index 974801227dbe..ac27a538f20a 100644
--- a/dev-java/jdbc-postgresql/Manifest
+++ b/dev-java/jdbc-postgresql/Manifest
@@ -1 +1 @@
-DIST postgresql-jdbc-42.6.0.src.tar.gz 986703 BLAKE2B 24784805583d66f14370031015ff9c53faa2b512c5092b40294c8c1b7aa5e5128910a93f816138dc4a32fdd42dea165cc37c23c2f6d9b9aa5f36269d66e43d95 SHA512 8abf85b4be716ac94d312588d2bc69a56f803f3da573731ec66be0139b87eaa533965ad1431aa705ab17bf2b413b55a8ed038fa8181897df7c83582457449793
+DIST postgresql-jdbc-42.7.1.src.tar.gz 1000212 BLAKE2B 9c09931f15dc0a6dd72fec5148d6eea48226bc2af0de44111c8ea6c3ed798357139aa25c65cc3e6aea33e55201c86864c0e30f5c9b5eadbc980399fbc2f68e36 SHA512 a722415cb29551a59a830c6287873e9ba0cb75e1aa456175b8678caa96be871f42b9294c25a532a67109c7a7e48e3d6d7d5773e99ffb124019b1895430b213ef
diff --git a/dev-java/jdbc-postgresql/jdbc-postgresql-42.6.0.ebuild b/dev-java/jdbc-postgresql/jdbc-postgresql-42.6.0.ebuild
deleted file mode 100644
index bafd90834dd0..000000000000
--- a/dev-java/jdbc-postgresql/jdbc-postgresql-42.6.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://jdbc.postgresql.org/download/postgresql-jdbc-42.6.0.src.tar.gz --slot 0 --keywords "~amd64 ~ppc64 ~x86" --ebuild jdbc-postgresql-42.6.0.ebuild
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source"
-MAVEN_ID="org.postgresql:postgresql:42.6.0"
-# We don't have junit-vintage and junit-jupiter.
-# JAVA_TESTING_FRAMEWORKS="junit-vintage junit-jupiter junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Java JDBC 4.2 (JRE 8+) driver for PostgreSQL database"
-HOMEPAGE="https://jdbc.postgresql.org/"
-SRC_URI="https://jdbc.postgresql.org/download/postgresql-jdbc-${PV}.src.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
-
-# Common dependencies
-# POM: pom.xml
-# com.ongres.scram:client:2.1 -> >=dev-java/scram-2.1:0
-# uk.org.webcompere:system-stubs-jupiter:2.0.1 -> !!!groupId-not-found!!!
-
-CP_DEPEND="dev-java/scram:0"
-
-# Compile dependencies
-# POM: pom.xml
-# test? junit:junit:4.13 -> >=dev-java/junit-4.13.2:4
-# test? org.junit.jupiter:junit-jupiter-api:5.8.2 -> !!!groupId-not-found!!!
-# test? org.junit.jupiter:junit-jupiter-engine:5.8.2 -> !!!groupId-not-found!!!
-# test? org.junit.jupiter:junit-jupiter-params:5.8.2 -> !!!groupId-not-found!!!
-# test? org.junit.vintage:junit-vintage-engine:5.8.2 -> !!!groupId-not-found!!!
-# test? se.jiderhamn:classloader-leak-test-framework:1.1.1 -> !!!groupId-not-found!!!
-
-DEPEND="
- >=virtual/jdk-1.8:*
- ${CP_DEPEND}"
-
-RDEPEND="
- >=virtual/jre-1.8:*
- ${CP_DEPEND}"
-
-S="${WORKDIR}/postgresql-${PV}-jdbc-src"
-
-JAVA_MAIN_CLASS="org.postgresql.util.PGJDBCMain"
-JAVA_SRC_DIR="src/main/java"
-JAVA_RESOURCE_DIRS="src/main/resources"
diff --git a/dev-java/jdbc-postgresql/jdbc-postgresql-42.7.1.ebuild b/dev-java/jdbc-postgresql/jdbc-postgresql-42.7.1.ebuild
new file mode 100644
index 000000000000..ab85f684bb07
--- /dev/null
+++ b/dev-java/jdbc-postgresql/jdbc-postgresql-42.7.1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.postgresql:postgresql:${PV}"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Java JDBC 4.2 (JRE 8+) driver for PostgreSQL database"
+HOMEPAGE="https://jdbc.postgresql.org/"
+SRC_URI="https://jdbc.postgresql.org/download/postgresql-jdbc-${PV}.src.tar.gz"
+S="${WORKDIR}/postgresql-${PV}-jdbc-src"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="amd64 ppc64 x86"
+# package se.jiderhamn.classloader does not exist
+# package se.jiderhamn.classloader.leak does not exist
+# package uk.org.webcompere.systemstubs.environment does not exist
+# package uk.org.webcompere.systemstubs.jupiter does not exist
+# package uk.org.webcompere.systemstubs.properties does not exist
+# package uk.org.webcompere.systemstubs.resource does not exist
+RESTRICT="test" #839681
+
+DEPEND="
+ dev-java/checker-framework-qual:0
+ dev-java/jna:4
+ dev-java/osgi-cmpn:8
+ dev-java/osgi-core:0
+ dev-java/scram:0
+ dev-java/waffle-jna:0
+ >=virtual/jdk-1.8:*
+ test? ( dev-java/junit:5 )
+"
+
+RDEPEND=">=virtual/jre-1.8:*"
+
+JAVA_CLASSPATH_EXTRA="
+ checker-framework-qual
+ jna-4
+ osgi-cmpn-8
+ osgi-core
+ scram
+ waffle-jna
+"
+JAVA_AUTOMATIC_MODULE_NAME="org.postgresql.jdbc"
+JAVA_MAIN_CLASS="org.postgresql.util.PGJDBCMain"
+JAVA_RESOURCE_DIRS="src/main/resources"
+JAVA_SRC_DIR="src/main/java"
+JAVA_TEST_GENTOO_CLASSPATH="
+ junit-4
+ junit-5
+"
+JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+JAVA_TEST_SRC_DIR="src/test/java"
diff --git a/dev-java/jdepend/jdepend-2.10-r1.ebuild b/dev-java/jdepend/jdepend-2.10-r1.ebuild
new file mode 100644
index 000000000000..dcf930ec4582
--- /dev/null
+++ b/dev-java/jdepend/jdepend-2.10-r1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Traverses Java class file directories and generates design quality metrics"
+HOMEPAGE="https://github.com/clarkware/jdepend"
+SRC_URI="https://github.com/clarkware/jdepend/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${P}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+RESTRICT="test" #921147
+
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
+JAVA_SRC_DIR="src"
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_SRC_DIR="test"
diff --git a/dev-java/jdepend/jdepend-2.10.ebuild b/dev-java/jdepend/jdepend-2.10.ebuild
deleted file mode 100644
index 3c0c49c331b5..000000000000
--- a/dev-java/jdepend/jdepend-2.10.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Traverses Java class file directories and generates design quality metrics"
-HOMEPAGE="https://github.com/clarkware/jdepend"
-SRC_URI="https://github.com/clarkware/jdepend/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-
-DEPEND=">=virtual/jdk-1.8:*"
-RDEPEND=">=virtual/jre-1.8:*"
-
-src_install() {
- java-pkg_newjar dist/jdepend-${PV}.jar
- dodoc README.md LICENSE.md ClassFileFormat-Java5.pdf
- docinto html
- dodoc -r docs/*
- use doc && java-pkg_dojavadoc build/docs/api
- use source && java-pkg_dosrc src/*
-}
diff --git a/dev-java/jdepend/metadata.xml b/dev-java/jdepend/metadata.xml
index 6021501589e0..df92bf507738 100644
--- a/dev-java/jdepend/metadata.xml
+++ b/dev-java/jdepend/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>
+ <upstream>
+ <remote-id type="github">clarkware/jdepend</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-java/jmh-core/Manifest b/dev-java/jmh-core/Manifest
index 918f4672b6dd..396f6a6ab0c2 100644
--- a/dev-java/jmh-core/Manifest
+++ b/dev-java/jmh-core/Manifest
@@ -1 +1 @@
-DIST jmh-core-1.35.tar.gz 645087 BLAKE2B ce33167a58c2eaf64c38148f27493c86ac9c0084cb58a438b49148b41d3e2db66d8a78e0be8a78db39aebf06fc0b5767be61100b22ce77e018ac8ca29c05c17f SHA512 53ce7300f5e10f1efcb639f0d4d01adad48cadc8daea2e00db34113e42b192e49a6a04cc2b5fd4d291ac81a73a5b30613d22390722d35f54139f14ebbb01013c
+DIST jmh-1.37.tar.gz 658673 BLAKE2B 696997907f3505f84ed400d75f46625b9f2aa9faf8a6d4250e6380db9088a8d6a61792eed8163703cb0003dba6ee5a2061d08a1b09bed5c058612142cd594469 SHA512 a3aac7d2e774dd7e7457cc1dce9edbe5923fcdae266854d709b926580638a28057bd6b32b8d7dedc4707ab2ae9aa7d5cda04eb72b0116f1cb98480a8b8b02707
diff --git a/dev-java/jmh-core/jmh-core-1.35.ebuild b/dev-java/jmh-core/jmh-core-1.37.ebuild
index 6d518ed16c03..0fcaad366369 100644
--- a/dev-java/jmh-core/jmh-core-1.35.ebuild
+++ b/dev-java/jmh-core/jmh-core-1.37.ebuild
@@ -1,17 +1,18 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.openjdk.jmh:jmh-core:1.35"
+MAVEN_ID="org.openjdk.jmh:jmh-core:${PV}"
JAVA_TESTING_FRAMEWORKS="junit-4"
inherit java-pkg-2 java-pkg-simple
DESCRIPTION="Harness for building, running, and analysing nano/micro/milli/macro benchmarks"
-HOMEPAGE="https://openjdk.java.net/projects/code-tools/jmh/"
-SRC_URI="https://github.com/openjdk/jmh/archive/${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://openjdk.org/projects/code-tools/jmh/"
+SRC_URI="https://github.com/openjdk/jmh/archive/${PV}.tar.gz -> jmh-${PV}.tar.gz"
+S="${WORKDIR}/jmh-${PV}"
LICENSE="Apache-2.0"
SLOT="0"
@@ -21,22 +22,15 @@ CP_DEPEND="
dev-java/commons-math:3
dev-java/jopt-simple:0"
-DEPEND=">=virtual/jdk-1.8:*
- ${CP_DEPEND}"
-
-RDEPEND=">=virtual/jre-1.8:*
- ${CP_DEPEND}"
+DEPEND="${CP_DEPEND}
+ >=virtual/jdk-1.8:*"
-S="${WORKDIR}/jmh-${PV}"
+RDEPEND="${CP_DEPEND}
+ >=virtual/jre-1.8:*"
-JAVA_SRC_DIR="jmh-core/src/main/java"
JAVA_RESOURCE_DIRS="jmh-core/src/main/resources"
+JAVA_SRC_DIR="jmh-core/src/main/java"
JAVA_TEST_GENTOO_CLASSPATH="junit-4"
-JAVA_TEST_SRC_DIR="jmh-core/src/test/java"
JAVA_TEST_RESOURCE_DIRS="jmh-core/src/test/resources"
-
-src_install() {
- default # https://bugs.gentoo.org/789582
- java-pkg-simple_src_install
-}
+JAVA_TEST_SRC_DIR="jmh-core/src/test/java"
diff --git a/dev-java/jmh-generator-annprocess/Manifest b/dev-java/jmh-generator-annprocess/Manifest
new file mode 100644
index 000000000000..396f6a6ab0c2
--- /dev/null
+++ b/dev-java/jmh-generator-annprocess/Manifest
@@ -0,0 +1 @@
+DIST jmh-1.37.tar.gz 658673 BLAKE2B 696997907f3505f84ed400d75f46625b9f2aa9faf8a6d4250e6380db9088a8d6a61792eed8163703cb0003dba6ee5a2061d08a1b09bed5c058612142cd594469 SHA512 a3aac7d2e774dd7e7457cc1dce9edbe5923fcdae266854d709b926580638a28057bd6b32b8d7dedc4707ab2ae9aa7d5cda04eb72b0116f1cb98480a8b8b02707
diff --git a/dev-java/jmh-generator-annprocess/jmh-generator-annprocess-1.37.ebuild b/dev-java/jmh-generator-annprocess/jmh-generator-annprocess-1.37.ebuild
new file mode 100644
index 000000000000..a4d3d8c5c886
--- /dev/null
+++ b/dev-java/jmh-generator-annprocess/jmh-generator-annprocess-1.37.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="org.openjdk.jmh:jmh-generator-annprocess:${PV}"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Harness for building, running, and analysing nano/micro/milli/macro benchmarks"
+HOMEPAGE="https://openjdk.org/projects/code-tools/jmh/"
+SRC_URI="https://github.com/openjdk/jmh/archive/${PV}.tar.gz -> jmh-${PV}.tar.gz"
+S="${WORKDIR}/jmh-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+DEPEND="
+ dev-java/jmh-core:0
+ >=virtual/jdk-1.8:*
+"
+RDEPEND=">=virtual/jre-1.8:*"
+
+JAVA_CLASSPATH_EXTRA="jmh-core"
+JAVA_RESOURCE_DIRS="jmh-generator-annprocess/src/main/resources"
+JAVA_SRC_DIR="jmh-generator-annprocess/src/main/java"
diff --git a/dev-java/osgi-compendium/metadata.xml b/dev-java/jmh-generator-annprocess/metadata.xml
index 4221e170cbc0..09c955c1f8a5 100644
--- a/dev-java/osgi-compendium/metadata.xml
+++ b/dev-java/jmh-generator-annprocess/metadata.xml
@@ -5,4 +5,7 @@
<email>java@gentoo.org</email>
<name>Java</name>
</maintainer>
+ <upstream>
+ <remote-id type="github">openjdk/jmh</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-java/jna/Manifest b/dev-java/jna/Manifest
index 5a75b4046036..667bee66b18f 100644
--- a/dev-java/jna/Manifest
+++ b/dev-java/jna/Manifest
@@ -1 +1,2 @@
DIST jna-5.13.0.tar.gz 116027625 BLAKE2B 1f2bc7ab28adefa0bbad122957ed2c6ef55ab88e79b30c05f0d2d88e0e05152f7bb5e28097906a7e24f78304dfa2b225587adb0ada205ca3c2ceac1cdbab3f04 SHA512 aefd0becc03bb7fd753e8c5cdcbcb20f6d590125a5fb03048bef0024e826ab0254b750e22a8bb26bea38cc89262ad45e5030b666cb2c857b01b15a6a55379a0f
+DIST jna-5.14.0.tar.gz 116167104 BLAKE2B 3ccb9e53e843690f9c90272c2e94fb2d903dd9bbcb7b6294a6ed3d973d3945c2b3fe5ac5e4c472830a7d07f4f32d84e781bb2ae3bd73cdd1894392331554e2cd SHA512 5758898052b3b099cd8b40046f764813377970a428e66370ba2a7125403661e25379d55fdb0ff75de32d66cbff20f0a05f438b2ca18804cc53f2edf4b1927ff0
diff --git a/dev-java/jna/jna-5.14.0-r1.ebuild b/dev-java/jna/jna-5.14.0-r1.ebuild
new file mode 100644
index 000000000000..183ba4f35027
--- /dev/null
+++ b/dev-java/jna/jna-5.14.0-r1.ebuild
@@ -0,0 +1,198 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_PROVIDES="
+ net.java.dev.jna:jna:${PV}
+ net.java.dev.jna:jna-platform:${PV}
+"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple toolchain-funcs
+
+DESCRIPTION="Java Native Access"
+HOMEPAGE="https://github.com/java-native-access/jna"
+SRC_URI="https://github.com/java-native-access/jna/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${P}"
+
+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:*
+ x11-base/xorg-proto:0
+ test? (
+ dev-java/reflections:0
+ )
+ ${CDEPEND}
+ x11-libs/libXt
+"
+
+RDEPEND="
+ >=virtual/jre-1.8:*
+ ${CDEPEND}
+"
+
+DOCS=( README.md CHANGES.md OTHERS TODO )
+PATCHES=(
+ "${FILESDIR}/5.11.0-makefile-flags.patch"
+ "${FILESDIR}/jna-5.11.0-no-Werror.patch"
+ "${FILESDIR}/jna-5.13.0-testpath.patch"
+ "${FILESDIR}/jna-5.13.0-LibCTest.patch"
+)
+
+src_prepare() {
+ default
+ java-pkg-2_src_prepare
+ java-pkg_clean
+ mkdir -p "res/META-INF" || die
+ echo "Main-Class: com.sun.jna.Native" > "res/META-INF/MANIFEST.MF" || die
+
+ # https://github.com/java-native-access/jna/blob/5.13.0/build.xml#L402-L407
+ sed \
+ -e "/VERSION =/s:TEMPLATE:${PV}:" \
+ -e '/VERSION_NATIVE =/s:TEMPLATE:5.1.0:' \
+ -i src/com/sun/jna/Version.java || die
+}
+
+src_compile() {
+ einfo "Compiling jna.jar"
+ JAVA_AUTOMATIC_MODULE_NAME="com.sun.jna"
+ JAVA_JAR_FILENAME="jna.jar"
+ JAVA_RESOURCE_DIRS="res"
+ JAVA_SRC_DIR="src"
+ java-pkg-simple_src_compile
+ JAVA_GENTOO_CLASSPATH_EXTRA+=":jna.jar"
+ rm -r target || die
+
+ einfo "Compiling jna-platform.jar"
+ JAVA_AUTOMATIC_MODULE_NAME="com.sun.jna.platform"
+ JAVA_JAR_FILENAME="jna-platform.jar"
+ JAVA_RESOURCE_DIRS=""
+ JAVA_SRC_DIR="contrib/platform/src"
+ java-pkg-simple_src_compile
+ JAVA_GENTOO_CLASSPATH_EXTRA+=":jna-platform.jar"
+ rm -r target || die
+
+ if use doc; then
+ einfo "Compiling javadocs"
+ JAVA_SRC_DIR=(
+ "src"
+ "contrib/platform/src"
+ )
+ JAVA_JAR_FILENAME="ignoreme.jar"
+ java-pkg-simple_src_compile
+ fi
+
+ einfo "Generating headers com_sun_jna_Native.h com_sun_jna_Function.h"
+ ejavac -h native -classpath "src" \
+ "src/com/sun/jna/Function.java" \
+ "src/com/sun/jna/Native.java" || die
+
+ einfo "Building native library"
+ cd native || die
+ local args=(
+ CC="$(tc-getCC)"
+ STRIP=true
+ DYNAMIC_LIBFFI=true
+ )
+ # Using -j1 since otherwise fails to build:
+ # cannot find ../build/native/libtestlib.so: No such file or directory
+ # [Makefile:505: ../build/native/libtestlib2.so] Error 1
+ emake -j1 "${args[@]}"
+}
+
+src_test() {
+ JAVA_TEST_EXTRA_ARGS=(
+ -Djna.nosys=true
+ -Djna.boot.library.path=build/native
+ -Djna.library.path=build/native
+ )
+ JAVA_TEST_GENTOO_CLASSPATH="
+ junit-4
+ reflections
+ "
+
+ JAVA_TEST_SRC_DIR="contrib/platform/test"
+ rm -r contrib/platform/test/com/sun/jna/platform/{mac,unix,win32} || die
+ JAVA_TEST_EXCLUDES=(
+ # 1) testGetXAttr(com.sun.jna.platform.linux.XAttrUtilTest)
+ # java.io.IOException: errno: 95
+ # at com.sun.jna.platform.linux.XAttrUtil.setXAttr(XAttrUtil.java:85)
+ # at com.sun.jna.platform.linux.XAttrUtil.setXAttr(XAttrUtil.java:70)
+ # at com.sun.jna.platform.linux.XAttrUtil.setXAttr(XAttrUtil.java:56)
+ # at com.sun.jna.platform.linux.XAttrUtilTest.testGetXAttr(XAttrUtilTest.java:83)
+ # 2) setXAttr(com.sun.jna.platform.linux.XAttrUtilTest)
+ # java.io.IOException: errno: 95
+ # at com.sun.jna.platform.linux.XAttrUtil.setXAttr(XAttrUtil.java:85)
+ # at com.sun.jna.platform.linux.XAttrUtil.setXAttr(XAttrUtil.java:70)
+ # at com.sun.jna.platform.linux.XAttrUtil.setXAttr(XAttrUtil.java:56)
+ # at com.sun.jna.platform.linux.XAttrUtilTest.setXAttr(XAttrUtilTest.java:53)
+ com.sun.jna.platform.linux.XAttrUtilTest
+ )
+ java-pkg-simple_src_test
+
+ JAVA_TEST_SRC_DIR="test"
+ rm -r test/com/sun/jna/wince || die
+ rm -r test/com/sun/jna/win32 || die
+
+ # 1) testLoadFromJarAbsolute(com.sun.jna.LibraryLoadTest)
+ # java.lang.UnsatisfiedLinkError: Unable to load library '/libtestlib-jar.so':
+ # /libtestlib-jar.so: cannot open shared object file: No such file or directory
+ jar cvf build/jna-test.jar \
+ -C build/native libtestlib-jar.so \
+ -C test com/sun/jna/data || die
+ JAVA_GENTOO_CLASSPATH_EXTRA+=":build/jna-test.jar"
+
+ JAVA_TEST_EXCLUDES=(
+ com.sun.jna.CallbacksTest # Needs to run separately
+ com.sun.jna.DirectTest # Needs to run separately
+ com.sun.jna.NativeTest # Needs to run separately
+ com.sun.jna.TypeMapperTest # Needs to run separately
+ com.sun.jna.UnionTest # Needs to run separately
+ com.sun.jna.VMCrashProtectionTest # Needs to run separately
+ )
+ java-pkg-simple_src_test
+
+ JAVA_TEST_RUN_ONLY=(
+ com.sun.jna.CallbacksTest
+ com.sun.jna.DirectTest
+ com.sun.jna.UnionTest
+ )
+ java-pkg-simple_src_test
+
+ JAVA_TEST_RUN_ONLY=( com.sun.jna.NativeTest )
+ java-pkg-simple_src_test
+
+ JAVA_TEST_RUN_ONLY=( com.sun.jna.VMCrashProtectionTest )
+ java-pkg-simple_src_test
+
+ JAVA_TEST_RUN_ONLY=( com.sun.jna.TypeMapperTest )
+ java-pkg-simple_src_test
+}
+
+src_install() {
+ default
+ java-pkg_dojar jna.jar jna-platform.jar
+ java-pkg_doso build/native/libjnidispatch.so
+
+ if use doc; then
+ java-pkg_dojavadoc target/api
+ fi
+
+ if use source; then
+ java-pkg_dosrc "src/*"
+ java-pkg_dosrc "contrib/platform/src/*"
+ fi
+}
diff --git a/dev-java/jsch-agent-proxy/jsch-agent-proxy-0.0.9.ebuild b/dev-java/jsch-agent-proxy/jsch-agent-proxy-0.0.9.ebuild
index eea65095cac2..0a12a3826469 100644
--- a/dev-java/jsch-agent-proxy/jsch-agent-proxy-0.0.9.ebuild
+++ b/dev-java/jsch-agent-proxy/jsch-agent-proxy-0.0.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# Skeleton command:
@@ -40,6 +40,16 @@ S="${WORKDIR}/jsch-agent-proxy-${MY_COMMIT}"
JAVA_GENTOO_CLASSPATH="jna-4,jsch"
JAVA_GENTOO_CLASSPATH_EXTRA="jsch-agentproxy-core.jar:jsch-agentproxy-pageant.jar:jsch-agentproxy-sshagent.jar:jsch-agentproxy-usocket-jna.jar:jsch-agentproxy-usocket-nc.jar"
+JAVADOC_CLASSPATH="${JAVA_GENTOO_CLASSPATH}"
+JAVADOC_SRC_DIRS=(
+ "${PN}-core"
+ "${PN}-jsch"
+ "${PN}-pageant"
+ "${PN}-sshagent"
+ "${PN}-usocket-jna"
+ "${PN}-usocket-nc"
+ "${PN}-connector-factory"
+)
src_compile() {
JAVA_SRC_DIR="${PN}-core"
@@ -77,17 +87,7 @@ src_compile() {
java-pkg-simple_src_compile
rm -fr target || die
- JAVA_SRC_DIR=(
- "${PN}-core"
- "${PN}-jsch"
- "${PN}-pageant"
- "${PN}-sshagent"
- "${PN}-usocket-jna"
- "${PN}-usocket-nc"
- "${PN}-connector-factory"
- )
- JAVA_JAR_FILENAME="ignoreme.jar"
- java-pkg-simple_src_compile
+ use doc && ejavadoc
}
src_install() {
diff --git a/dev-java/json-smart/json-smart-2.5.0.ebuild b/dev-java/json-smart/json-smart-2.5.0.ebuild
index bed1dc2846b3..04a95c02d05f 100644
--- a/dev-java/json-smart/json-smart-2.5.0.ebuild
+++ b/dev-java/json-smart/json-smart-2.5.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -19,7 +19,7 @@ S="${WORKDIR}/${PN}-v2-${PV}"
LICENSE="Apache-2.0"
SLOT="2"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
RESTRICT="test" #839681
DEPEND="
diff --git a/dev-java/json/Manifest b/dev-java/json/Manifest
index 549c5a166a89..4b7a16b268c1 100644
--- a/dev-java/json/Manifest
+++ b/dev-java/json/Manifest
@@ -1,3 +1,4 @@
-DIST json-20220320.tar.gz 229462 BLAKE2B 9d549e4e905e2a63985b0b2d9a6cfbf7483776799d6b907455356940b48242fda9344874f1625da06215991eae1cfa1e87f3f8f0a204807795ed50f3f9afdbc2 SHA512 1bcd99c69201ea6609a41ec1679467504cd129a8c5a9caede0829cd8eb70b0e59e504a4bc409f57e6b27091e11acbf6108830c6f1fe16919d0cb1daff643bdf0
DIST json-20231013.tar.gz 240211 BLAKE2B c0594f89c2b02273c736c0fc362f1e3d519d3d88b7e708e64bbd5ca202f539368e9856e311dd9ad42a24c317cfd727feed5af215fbc5e9bbcb18e797323684c8 SHA512 4c5eb3e9ef77825c9e7b874c9084b5bb75b39c527c3cb419fc45171e0d11b24796931a2d16255500ed86610da3ac7805b302ec0b1051f97c97795580dca7c183
+DIST json-20240205.tar.gz 245788 BLAKE2B 2c4fa44aa16a53cce153879af6a31364e21e9cc140bc7472535d2a8d2d0fc346502fd4a6e5022d326c80fe23557ce4ce408faf142bcdeec0c9b22aca13b044df SHA512 55e79510819b8e318e15b04cab317fdfd9785ac6b8fe60ef740b2f1eb7298548622556b968def89f4f2eb7761765149f192747b0966698b431cfeb9f2ea72284
DIST json-path-2.1.0.jar 189658 BLAKE2B 2813abfc3b6c758f600bb5e8f8b73eac8dc2a642d461bc26c569a650378ea65cebf691afe975fa2dca406eb324863c36c4623b21c1df2cb83c92e6859b5a9d85 SHA512 c16fc68a04945ad49eb96c38f68a8b4ff351ab1bbc51685f42d22723b2dee4b827ba45cb6b8167199e3f4d22e668ef58665558beec8e11399ac547e9fcebd9f6
+DIST json-path-2.4.0.jar 223186 BLAKE2B b184f1b8241bd9b4c5d10662354f31044ea90bddfa7a08c0c995a02e7e50b04d11076d61af2988c2fee49401ad37593f89dd2dbc0bfa0e1b5b1d0653a592eea1 SHA512 b55b30cf85ca12e6a492fd48d4b6bb0b1f3ba610c195aa1a36eda2a80e24bf7688a6a802362d398108e822f6dcb7b713cf421bb4208897fc4f5cc7b8b9b4c97c
diff --git a/dev-java/json/json-20220320.ebuild b/dev-java/json/json-20220320.ebuild
deleted file mode 100644
index 86e62eab5ee3..000000000000
--- a/dev-java/json/json-20220320.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://codeload.github.com/stleary/JSON-java/tar.gz/20220320 --slot 0 --keywords "~amd64 ~x86" --ebuild json-20220320.ebuild
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source"
-MAVEN_ID="org.json:json:20220320"
-# We don't have com.jayway.jsonpath:json-path
-# JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="A reference implementation of a JSON package in Java"
-HOMEPAGE="https://github.com/stleary/JSON-java"
-SRC_URI="https://codeload.github.com/stleary/JSON-java/tar.gz/${PV} -> ${P}.tar.gz"
-
-LICENSE="JSON"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-# Compile dependencies
-# POM: pom.xml
-# test? com.jayway.jsonpath:json-path:2.1.0 -> !!!groupId-not-found!!!
-# test? junit:junit:4.13.1 -> >=dev-java/junit-4.13.2:4
-# test? org.mockito:mockito-core:1.9.5 -> >=dev-java/mockito-1.9.5:0
-
-DEPEND="
- >=virtual/jdk-1.8:*"
-# test? (
-# !!!groupId-not-found!!!
-# >=dev-java/mockito-1.9.5:0
-# )
-#"
-
-RDEPEND="
- >=virtual/jre-1.8:*
-"
-
-DOCS=( {README,SECURITY}.md )
-
-S="${WORKDIR}/JSON-java-${PV}"
-
-JAVA_SRC_DIR="src/main/java"
-
-# JAVA_TEST_GENTOO_CLASSPATH="!!!groupId-not-found!!!,junit-4,mockito"
-# JAVA_TEST_SRC_DIR="src/test/java"
-# JAVA_TEST_RESOURCE_DIRS=(
-# "src/test/resources"
-# )
-
-src_install() {
- default # https://bugs.gentoo.org/789582
- java-pkg-simple_src_install
-}
diff --git a/dev-java/json/json-20231013-r1.ebuild b/dev-java/json/json-20231013-r1.ebuild
index a11eb3f69c95..33b11fb0702e 100644
--- a/dev-java/json/json-20231013-r1.ebuild
+++ b/dev-java/json/json-20231013-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -19,7 +19,7 @@ S="${WORKDIR}/JSON-java-${PV}"
LICENSE="JSON"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
DEPEND="
>=virtual/jdk-1.8:*
diff --git a/dev-java/json/json-20240205.ebuild b/dev-java/json/json-20240205.ebuild
new file mode 100644
index 000000000000..fda4c5cc15d8
--- /dev/null
+++ b/dev-java/json/json-20240205.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.json:json:${PV}"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="A reference implementation of a JSON package in Java"
+HOMEPAGE="https://github.com/stleary/JSON-java"
+JPV="2.4.0"
+SRC_URI="https://codeload.github.com/stleary/JSON-java/tar.gz/${PV} -> ${P}.tar.gz
+ test? (
+ https://repo1.maven.org/maven2/com/jayway/jsonpath/json-path/${JPV}/json-path-${JPV}.jar
+ )"
+S="${WORKDIR}/JSON-java-${PV}"
+
+LICENSE="JSON"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+ >=virtual/jdk-1.8:*
+ test? (
+ dev-java/asm:9
+ dev-java/json-smart:2
+ dev-java/mockito:4
+ dev-java/slf4j-api:0
+ )
+"
+
+RDEPEND=">=virtual/jre-1.8:*"
+
+DOCS=( {CONTRIBUTING,README,SECURITY}.md )
+
+JAVA_AUTOMATIC_MODULE_NAME="org.json"
+JAVA_SRC_DIR="src/main/java"
+
+JAVA_TEST_GENTOO_CLASSPATH="
+ asm-9
+ json-smart-2
+ junit-4
+ mockito-4
+ slf4j-api
+"
+JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+JAVA_TEST_SRC_DIR="src/test/java"
+
+src_test() {
+ JAVA_GENTOO_CLASSPATH_EXTRA="${DISTDIR}/json-path-${JPV}.jar" # Test compile dependency
+
+ local vm_version="$(java-config -g PROVIDES_VERSION)"
+ if ver_test "${vm_version}" -ge 17; then
+ JAVA_TEST_EXTRA_ARGS+=( --add-opens=java.base/java.lang=ALL-UNNAMED )
+ JAVA_TEST_EXTRA_ARGS+=( --add-opens=java.base/java.io=ALL-UNNAMED )
+ fi
+ java-pkg-simple_src_test
+}
diff --git a/dev-java/jtidy/jtidy-938.ebuild b/dev-java/jtidy/jtidy-938.ebuild
index a358bb13a064..63fdea8d2708 100644
--- a/dev-java/jtidy/jtidy-938.ebuild
+++ b/dev-java/jtidy/jtidy-938.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://master.dl.sourceforge.net/project/jtidy/JTidy/r${PV}/jtidy-r${P
LICENSE="HTML-Tidy W3C"
SLOT="9"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
BDEPEND="app-arch/unzip"
CP_DEPEND="dev-java/ant-core:0"
diff --git a/dev-java/jtwig-core/Manifest b/dev-java/jtwig-core/Manifest
new file mode 100644
index 000000000000..0f09a0671e7a
--- /dev/null
+++ b/dev-java/jtwig-core/Manifest
@@ -0,0 +1 @@
+DIST jtwig-core-5.87.0.tar.gz 212205 BLAKE2B 4c7386e0719c05bca6a8ee977e7b936931c095a675b9c7bc83708e7603da7ac8017cdd270d76e148ddf8037da38ca6448c4b20649c47f0e26c8c949e6a6e094a SHA512 245e8e8a4be48be0ad2e803f6868dc9b7190cf4ee2ed33a1e8c7b439d56fa5eeffeb47134f96790f9d98adb664fe40c773990056aaf7c30b665612986dde5202
diff --git a/dev-java/jtwig-core/jtwig-core-5.87.0.ebuild b/dev-java/jtwig-core/jtwig-core-5.87.0.ebuild
new file mode 100644
index 000000000000..0ef9f03eac1c
--- /dev/null
+++ b/dev-java/jtwig-core/jtwig-core-5.87.0.ebuild
@@ -0,0 +1,64 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.jtwig:jtwig-core:${PV}.RELEASE"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Jtwig Reflection Library"
+HOMEPAGE="https://github.com/jtwig/jtwig-core"
+SRC_URI="https://github.com/jtwig/jtwig-core/archive/${PV}.RELEASE.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${P}.RELEASE"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+# no tests because
+# net.jperf does not exist
+# org.unitils.reflectionassert does not exist
+RESTRICT="test"
+
+DEPEND="
+ dev-java/commons-lang:3.6
+ dev-java/concurrentlinkedhashmap-lru:0
+ dev-java/guava:0
+ dev-java/jtwig-reflection:0
+ dev-java/parboiled:0
+ dev-java/slf4j-api:0
+ >=virtual/jdk-1.8:*
+ test? (
+ dev-java/commons-io:1
+ dev-java/commons-lang:3.6
+ dev-java/hamcrest:0
+ dev-java/mockito:0
+ )
+"
+
+RDEPEND="
+ >=virtual/jre-1.8:*
+"
+
+JAVA_CLASSPATH_EXTRA="
+ commons-lang-3.6
+ concurrentlinkedhashmap-lru
+ guava
+ jtwig-reflection
+ parboiled
+ slf4j-api
+"
+
+JAVA_SRC_DIR="src/main/java"
+
+JAVA_TEST_GENTOO_CLASSPATH="
+ commons-io-1
+ commons-lang-3.6
+ hamcrest
+ junit-4
+ mockito
+"
+JAVA_TEST_SRC_DIR="src/test/java"
+JAVA_TEST_RESOURCE_DIRS="src/test/resources"
diff --git a/dev-java/jtwig-core/metadata.xml b/dev-java/jtwig-core/metadata.xml
new file mode 100644
index 000000000000..488c6bf7458e
--- /dev/null
+++ b/dev-java/jtwig-core/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>java@gentoo.org</email>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">jtwig/jtwig</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-java/jtwig-reflection/Manifest b/dev-java/jtwig-reflection/Manifest
new file mode 100644
index 000000000000..abbce93fde11
--- /dev/null
+++ b/dev-java/jtwig-reflection/Manifest
@@ -0,0 +1 @@
+DIST jtwig-reflection-5.87.0.tar.gz 70500 BLAKE2B 526e009bfabd3ed5d9034285f28980a52fafeee635e07446f32533ea7f6e4546d164ddc577fa25aabdcd80f64b953752a8c48405858534739d52c19474273fcf SHA512 87e4129833951c5c2903d574a9c4986219c7eb61d7ca2c657ecdeb9890d79149ff610ad7ad0002119ba5db0953f342d648eb46d9553185794d7bb7cb0a79e3ab
diff --git a/dev-java/jtwig-reflection/jtwig-reflection-5.87.0.ebuild b/dev-java/jtwig-reflection/jtwig-reflection-5.87.0.ebuild
new file mode 100644
index 000000000000..5ef4ef633b90
--- /dev/null
+++ b/dev-java/jtwig-reflection/jtwig-reflection-5.87.0.ebuild
@@ -0,0 +1,67 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.jtwig:jtwig-reflection:${PV}.RELEASE"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Jtwig Reflection Library"
+HOMEPAGE="https://github.com/jtwig/jtwig-reflection"
+SRC_URI="https://github.com/jtwig/jtwig-reflection/archive/${PV}.RELEASE.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${P}.RELEASE"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64"
+
+DEPEND="
+ dev-java/commons-lang:3.6
+ dev-java/guava:0
+ dev-java/slf4j-api:0
+ >=virtual/jdk-1.8:*
+ test? (
+ dev-java/commons-io:1
+ dev-java/hamcrest:0
+ dev-java/mockito:0
+ )
+"
+
+RDEPEND="
+ >=virtual/jre-1.8:*
+"
+
+JAVA_CLASSPATH_EXTRA="
+ commons-lang-3.6
+ guava
+ slf4j-api
+"
+
+JAVA_SRC_DIR="src/main/java"
+
+JAVA_TEST_EXCLUDES=(
+ # Invalid test class; No runnable methods
+ org.jtwig.reflection.integration.example.TestArgumentValueResolver
+ org.jtwig.reflection.integration.example.TestArgumentResolver
+ org.jtwig.reflection.integration.example.TestArgument
+)
+JAVA_TEST_GENTOO_CLASSPATH="
+ commons-io-1
+ hamcrest
+ junit-4
+ mockito
+"
+JAVA_TEST_SRC_DIR="src/test/java"
+
+src_test() {
+ # Unable to make field private final byte[] java.lang.String.value accessible:
+ # module java.base does not "opens java.lang" to unnamed module @3bc9f433
+ local vm_version="$(java-config -g PROVIDES_VERSION)"
+ if ver_test "${vm_version}" -ge 17; then
+ JAVA_TEST_EXTRA_ARGS+=( --add-opens=java.base/java.lang=ALL-UNNAMED )
+ fi
+ java-pkg-simple_src_test
+}
diff --git a/dev-java/jtwig-reflection/metadata.xml b/dev-java/jtwig-reflection/metadata.xml
new file mode 100644
index 000000000000..488c6bf7458e
--- /dev/null
+++ b/dev-java/jtwig-reflection/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>java@gentoo.org</email>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">jtwig/jtwig</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-java/leiningen-bin/Manifest b/dev-java/leiningen-bin/Manifest
index 573922fb97a0..e926bd0e5d8e 100644
--- a/dev-java/leiningen-bin/Manifest
+++ b/dev-java/leiningen-bin/Manifest
@@ -1,2 +1,6 @@
+DIST leiningen-2.11.1-standalone.jar 16481190 BLAKE2B 62f77411cc1d76ef15a7dee3185e109fdfe2f4c7273fb23b5d1aad13e7cc09f95bb71efaef190b890892cffab3ebcff84f0829105df824e8942367c96f388ca3 SHA512 9549bfebe79d4358ec94493df1f261ac8f84fae1b00c5a0e7a1c52b8d38f30b1b51241246224890b02cdad7ca388567b1e57aae850ba77878faf091d9d0e8d66
+DIST leiningen-2.11.1.sh 7467 BLAKE2B 7c82fde4cca990ef31fe6e207c872d6cfad69d0afc906119d069140831dc9e66e4fab8742c610eb922b14a3f4dec3c525c8a0598e426d78830d4136bace7a0f6 SHA512 9399bd4f37a9326d928b73c2f43b438545ea1c87942c365a86958345e95f86059d2d6fa18a68b20cc615193f69909620089c6f7aa8b8ab22c9fbc0f04852f6a5
+DIST leiningen-2.11.2-standalone.jar 16481883 BLAKE2B 556e9fdcd5f8c14e046ff8e12f9c5d52c214f0c7cf8af9469e140dc21187a0cb2d5acc02b0ab48b110278d5143cdeef2b4eb8d2945d5acaf568cfe35e1877c04 SHA512 a49e82acccdaae4f619796adf1ef9d0cfc4998c01f4c918520bb3f757b9f7808fb5c65241f79aea730d1e90181c9c2983b7219ef0893103f7abcedf94afcafd5
+DIST leiningen-2.11.2.sh 7467 BLAKE2B bfd9031e1f0c2b8cedf435832f2da5f45ac4c9fbdb2684f4900b43e62c3ffec03781ca2491f1a305c480a7fa8bf5cccf9e934ecc12e6e0ce1da539d9d8fe01dd SHA512 b4e0c553148f81bced1d8df09811f337352149bba879b0828fdeb6efd176fcebf0c4f263a5c8b74241b6a2dd7df52d932271cbf8f11f71279b498f8a9e2399b4
DIST leiningen-2.9.8-standalone.jar 12834369 BLAKE2B 6c9bc9a2f990bb4959aa06f8f8b31c1084f0d2bad2e19c8343fb7e8a02acb6f6173737cbf36b028e113577ef26e380d7ace035316dee840c6da92512afa7ac0b SHA512 de4989bf31fe86bfb943d90b683dd17a7417c267e67ac8036967ed352e47a4361b8b6ec8378a1e6cf24fd8df51bcabb9578bc8f487d812c9fb5c2f5f476016cd
DIST leiningen-2.9.8.sh 4555 BLAKE2B c876d19a4ba9a53d84c31874af442e57e6184ce1f7145512355a88b833d2d236bd73eef93f260d22b51e6200c5579c3721a8b6bcb16d516e503a98a2eaf26126 SHA512 58cba7d457c98546e530ad821273cb3f51445ed3191022d0963dd51683cb6b24d0f7d557da34313083b0df11a2c9885bf6d5bb073dea736731de95e8fbbca492
diff --git a/dev-java/leiningen-bin/leiningen-bin-2.11.1.ebuild b/dev-java/leiningen-bin/leiningen-bin-2.11.1.ebuild
new file mode 100644
index 000000000000..81887709ff36
--- /dev/null
+++ b/dev-java/leiningen-bin/leiningen-bin-2.11.1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit java-pkg-2
+
+MY_PN="${PN%-bin}"
+MY_PNV="${MY_PN}-${PV}"
+
+DESCRIPTION="Automate Clojure projects without setting your hair on fire"
+HOMEPAGE="https://leiningen.org/"
+SRC_URI="
+ https://github.com/technomancy/${MY_PN}/releases/download/${PV}/${MY_PNV}-standalone.jar
+ https://raw.githubusercontent.com/technomancy/${MY_PN}/${PV}/bin/lein-pkg -> ${MY_PNV}.sh
+"
+
+LICENSE="EPL-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86 ~x64-macos"
+
+RDEPEND=">=virtual/jre-1.8"
+DEPEND=">=virtual/jdk-1.8"
+
+RESTRICT="test"
+
+src_unpack() {
+ mkdir -p "${S}" || die "Can't mkdir ${S}"
+ cd "${S}" || die "Can't enter ${S}"
+ for file in ${A}; do
+ einfo "Copying ${file}"
+ cp "${DISTDIR}/${file}" "${S}/" || die "Can't copy ${file}"
+ done
+}
+
+src_prepare() {
+ einfo "Copying leinrc"
+ cp "${FILESDIR}/leinrc" "${S}/" || die "Can't copy leinrc"
+ einfo "Patching leinrc"
+ sed -i "s^@@PN@@^${PN}^" "${S}/leinrc" || die "Can't patch leinrc"
+
+ einfo "Renaming lein-pkg"
+ # Rename generically to help user patching
+ mv "${S}/${MY_PNV}.sh" "${S}/lein" || die "Can't rename to lein"
+
+ einfo "Patching lein"
+ java-pkg_init_paths_
+ sed -i "s|^LEIN_JAR=.*$|LEIN_JAR=${EPREFIX}/${JAVA_PKG_JARDEST#/}/${PN}.jar|" "${S}/lein" \
+ || die "Can't patch LEIN_JAR in lein"
+
+ default
+}
+
+src_compile() { :; }
+
+src_install() {
+ dobin "${S}/lein"
+ java-pkg_newjar "${MY_PNV}-standalone.jar"
+ insinto /etc
+ doins "${S}/leinrc"
+ fperms 0644 "/etc/leinrc"
+}
diff --git a/dev-java/leiningen-bin/leiningen-bin-2.11.2.ebuild b/dev-java/leiningen-bin/leiningen-bin-2.11.2.ebuild
new file mode 100644
index 000000000000..81887709ff36
--- /dev/null
+++ b/dev-java/leiningen-bin/leiningen-bin-2.11.2.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit java-pkg-2
+
+MY_PN="${PN%-bin}"
+MY_PNV="${MY_PN}-${PV}"
+
+DESCRIPTION="Automate Clojure projects without setting your hair on fire"
+HOMEPAGE="https://leiningen.org/"
+SRC_URI="
+ https://github.com/technomancy/${MY_PN}/releases/download/${PV}/${MY_PNV}-standalone.jar
+ https://raw.githubusercontent.com/technomancy/${MY_PN}/${PV}/bin/lein-pkg -> ${MY_PNV}.sh
+"
+
+LICENSE="EPL-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86 ~x64-macos"
+
+RDEPEND=">=virtual/jre-1.8"
+DEPEND=">=virtual/jdk-1.8"
+
+RESTRICT="test"
+
+src_unpack() {
+ mkdir -p "${S}" || die "Can't mkdir ${S}"
+ cd "${S}" || die "Can't enter ${S}"
+ for file in ${A}; do
+ einfo "Copying ${file}"
+ cp "${DISTDIR}/${file}" "${S}/" || die "Can't copy ${file}"
+ done
+}
+
+src_prepare() {
+ einfo "Copying leinrc"
+ cp "${FILESDIR}/leinrc" "${S}/" || die "Can't copy leinrc"
+ einfo "Patching leinrc"
+ sed -i "s^@@PN@@^${PN}^" "${S}/leinrc" || die "Can't patch leinrc"
+
+ einfo "Renaming lein-pkg"
+ # Rename generically to help user patching
+ mv "${S}/${MY_PNV}.sh" "${S}/lein" || die "Can't rename to lein"
+
+ einfo "Patching lein"
+ java-pkg_init_paths_
+ sed -i "s|^LEIN_JAR=.*$|LEIN_JAR=${EPREFIX}/${JAVA_PKG_JARDEST#/}/${PN}.jar|" "${S}/lein" \
+ || die "Can't patch LEIN_JAR in lein"
+
+ default
+}
+
+src_compile() { :; }
+
+src_install() {
+ dobin "${S}/lein"
+ java-pkg_newjar "${MY_PNV}-standalone.jar"
+ insinto /etc
+ doins "${S}/leinrc"
+ fperms 0644 "/etc/leinrc"
+}
diff --git a/dev-java/libg/Manifest b/dev-java/libg/Manifest
index 068af0665527..a890570b45c8 100644
--- a/dev-java/libg/Manifest
+++ b/dev-java/libg/Manifest
@@ -1 +1 @@
-DIST bndlib-2.1.0.tar.gz 123217291 BLAKE2B ab8e6876b13db538746f77aa1fe7800e5a3b5e539e1980da78f69c64344f4964bf0a21f2329f7684b055d0de39a10c8df36e030922e9933b29fccb9a35aa669a SHA512 6965143ced45c15fc2316716de32e80506cc411d52309b24313fff37e0713a45ad200d5b3701f0d47a131a3163ec266ed8acb4544884cd1c59c9716c7a2b285e
+DIST aQute.bnd-7.0.0.tar.gz 172496438 BLAKE2B a2e443b0e4a2eb278a8e1df86456fea22ffb8147adc00c9f300cbd32b226218bb64ccca3da3bcd0d79b07567a7b4cf4456b96224d6abf59486fa08ca6170d0ba SHA512 11d34a7d1a9b2fb2e8c112d414a06c281ccde9a7b06c62043e19d83e85ea64fdf022dd4493a14dd2dcf6adee392a1e9bf1ab05a6d690a328f29d7019045bca8c
diff --git a/dev-java/libg/libg-2.1.0-r2.ebuild b/dev-java/libg/libg-2.1.0-r2.ebuild
deleted file mode 100644
index 426364b8ed10..000000000000
--- a/dev-java/libg/libg-2.1.0-r2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="test"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Lots of small utilities for bndlib, a swiss army knife for OSGi"
-HOMEPAGE="https://bnd.bndtools.org/"
-SRC_URI="https://github.com/bndtools/bnd/archive/${PV}.REL.tar.gz -> bndlib-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-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
-# if bndlib tests pass that libg is sufficiently tested, in the future we should
-# look whether it is feasible to combine the packages or otherwise temporarily
-# build biz.aquite.bndlib and biz.aqute.junit in this package.
-RESTRICT="test"
-
-DEPEND=">=virtual/jdk-1.8:*"
-RDEPEND=">=virtual/jre-1.8:*"
-
-S="${WORKDIR}/bnd-${PV}.REL/aQute.${PN}"
-
-EANT_BUILD_TARGET="build"
-
-src_prepare() {
- default
- # Move the correct build.xml into place, needed for testing.
- cp ../cnf/build.xml . || die "Failed to move build file into the right place."
-
- # Remove bundled jar files.
- find . -name '*.jar' -delete
-
- # Remove test files
- if ! use test ; then
- find src/test -name '*.java' -delete || die "Failed to remove test files."
- fi
-}
-
-src_install() {
- java-pkg_newjar generated/aQute.${PN}.jar
-}
diff --git a/dev-java/libg/libg-7.0.0.ebuild b/dev-java/libg/libg-7.0.0.ebuild
new file mode 100644
index 000000000000..7acbb7965c60
--- /dev/null
+++ b/dev-java/libg/libg-7.0.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="biz.aQute.bnd:aQute.libg:${PV}"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="A library to be statically linked. Contains many small utilities"
+HOMEPAGE="https://bnd.bndtools.org/"
+SRC_URI="https://github.com/bndtools/bnd/archive/${PV}.tar.gz -> aQute.bnd-${PV}.tar.gz"
+S="${WORKDIR}/bnd-${PV}"
+
+LICENSE="Apache-2.0 EPL-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
+# aQute.bnd.test.jupiter does not exist
+# org.assertj.core.api.junit.jupiter does not exist
+RESTRICT="test" #839681
+
+CP_DEPEND="
+ dev-java/slf4j-api:0
+"
+
+# compile error with jdk:21, restricting to jdk:17
+# aQute.libg/src/aQute/lib/collections/SortedList.java:31: error: types List<T> and SortedSet<T> are incompatible;
+# public class SortedList<T> implements SortedSet<T>, List<T> {
+# ^
+# both define reversed(), but with unrelated return types
+# where T is a type-variable:
+# T extends Object declared in class SortedList
+DEPEND="${CP_DEPEND}
+ ~dev-java/bnd-annotation-${PV}:0
+ dev-java/osgi-cmpn:8
+ virtual/jdk:17
+"
+
+# aQute.libg/src/aQute/libg/uri/URIUtil.java:161:
+# error: switch expressions are not supported in -source 11
+RDEPEND="${CP_DEPEND}
+ >=virtual/jre-17:*
+"
+
+JAVA_AUTOMATIC_MODULE_NAME="aQute.libg"
+JAVA_CLASSPATH_EXTRA="
+ bnd-annotation
+ osgi-cmpn-8
+"
+JAVA_SRC_DIR="aQute.libg/src"
diff --git a/dev-java/libg/metadata.xml b/dev-java/libg/metadata.xml
index 94feb65b0b18..cb6317e530db 100644
--- a/dev-java/libg/metadata.xml
+++ b/dev-java/libg/metadata.xml
@@ -1,11 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="project">
- <email>java@gentoo.org</email>
- <name>Java</name>
- </maintainer>
- <upstream>
- <remote-id type="github">bndtools/bnd</remote-id>
- </upstream>
+ <maintainer type="project">
+ <email>java@gentoo.org</email>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">bndtools/bnd</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-java/lz4-java/files/lz4-java-1.8.0-gentoo-classpath.xml b/dev-java/lz4-java/files/lz4-java-1.8.0-gentoo-classpath.xml
deleted file mode 100644
index 2392679c4a69..000000000000
--- a/dev-java/lz4-java/files/lz4-java-1.8.0-gentoo-classpath.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<project name="gentoo-classpath">
- <path id="mvel.classpath">
- <pathelement path="${gentoo.classpath}" />
- </path>
-</project>
diff --git a/dev-java/lz4-java/files/lz4-java-1.8.0-print-os-props.patch b/dev-java/lz4-java/files/lz4-java-1.8.0-print-os-props.patch
deleted file mode 100644
index d4363b6853e4..000000000000
--- a/dev-java/lz4-java/files/lz4-java-1.8.0-print-os-props.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From b8d50d44ba1c0e4b5bf297f7499ad0fb5b82706e Mon Sep 17 00:00:00 2001
-From: Yuan Liao <liaoyuan@gmail.com>
-Date: Wed, 19 Jan 2022 10:09:14 -0800
-Subject: [PATCH] build.xml: Add target that prints JVM system properties os.*
-
-The Gentoo custom JNI Makefile needs some of those properties.
-
-Signed-off-by: Yuan Liao <liaoyuan@gmail.com>
----
- build.xml | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/build.xml b/build.xml
-index b7940ab..96e52ea 100644
---- a/build.xml
-+++ b/build.xml
-@@ -62,6 +62,11 @@
- <javaversion atleast="10"/>
- </condition>
-
-+ <target name="os-props"
-+ description="echo values of JVM system properties os.* to file os.properties">
-+ <echoproperties prefix="os." destfile="os.properties" />
-+ </target>
-+
- <target name="clean" description="clean working copy">
- <delete dir="${build}" />
- <delete dir="${dist}" />
---
-2.34.1
-
diff --git a/dev-java/lz4-java/files/lz4-java-1.8.0-r1-Makefile b/dev-java/lz4-java/files/lz4-java-1.8.0-r1-Makefile
deleted file mode 100644
index 4a766552c65e..000000000000
--- a/dev-java/lz4-java/files/lz4-java-1.8.0-r1-Makefile
+++ /dev/null
@@ -1,47 +0,0 @@
-# Gentoo custom Makefile for the JNI portion of lz4-java
-#
-# Adapted from the logic for target "compile-jni" in build.xml,
-# but uses lz4 installed on the system. This Makefile respects
-# custom CFLAGS and LDFLAGS settings, whereas build.xml does not.
-
-# Java system properties read by build.xml
-PLATFORM ?= linux
-SRC ?= src
-BUILD ?= build
-JAVA_HOME ?=
-# Requires lz4-java-*-print-os-props.patch
-OS_ARCH := $(shell ant os-props 2>&1 > /dev/null && \
- grep 'os\.arch=' os.properties | sed -e 's/os\.arch=//')
-
-MKDIR_P = mkdir -p
-
-SRC_DIR := $(SRC)/jni
-OBJS_DIR_PREFIX := $(BUILD)/objects
-OBJS_DIR := $(OBJS_DIR_PREFIX)/$(SRC_DIR)
-OUT_DIR := $(BUILD)/jni/net/jpountz/util/$(PLATFORM)/$(OS_ARCH)
-
-SRC_FILES := $(wildcard $(SRC_DIR)/*.c)
-OBJS := $(addprefix $(OBJS_DIR_PREFIX)/,$(SRC_FILES:.c=.o))
-SONAME = liblz4-java.so
-
-# C compiler arguments may be obtained by running 'ant -v compile-jni',
-# as long as dev-java/cpptasks is in the classpath
-CFLAGS := -fPIC $(CFLAGS)
-
-$(OUT_DIR)/$(SONAME): $(OBJS) | $(OUT_DIR)
- # '-llz4' must be listed after this package's objects
- # https://wiki.gentoo.org/wiki/Project:Quality_Assurance/As-needed#Importance_of_linking_order
- $(CC) $(CFLAGS) -shared $(LDFLAGS) -Wl,-soname,$(SONAME) -o $@ $^ -llz4
-
-$(OBJS_DIR_PREFIX)/%.o: %.c | $(OBJS_DIR)
- $(CC) $(CFLAGS) -c -o $@ \
- -I$(JAVA_HOME)/../include -I$(JAVA_HOME)/../include/$(PLATFORM) \
- -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/$(PLATFORM) \
- -I$(BUILD)/jni-headers \
- $<
-
-$(OUT_DIR):
- $(MKDIR_P) $@
-
-$(OBJS_DIR):
- $(MKDIR_P) $@
diff --git a/dev-java/lz4-java/files/lz4-java-1.8.0-skip-ivy.patch b/dev-java/lz4-java/files/lz4-java-1.8.0-skip-ivy.patch
deleted file mode 100644
index 26c09e147072..000000000000
--- a/dev-java/lz4-java/files/lz4-java-1.8.0-skip-ivy.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-From 95ae85542f39cecd1af6a3e661ad6120195d2304 Mon Sep 17 00:00:00 2001
-From: Yuan Liao <liaoyuan@gmail.com>
-Date: Mon, 20 Dec 2021 09:57:31 -0800
-Subject: [PATCH] build.xml: Skip Ivy logic and use Gentoo classpath
-
-Signed-off-by: Yuan Liao <liaoyuan@gmail.com>
----
- build.xml | 22 +++++++---------------
- 1 file changed, 7 insertions(+), 15 deletions(-)
-
-diff --git a/build.xml b/build.xml
-index b7940ab..ff321c6 100644
---- a/build.xml
-+++ b/build.xml
-@@ -20,6 +20,8 @@
- xmlns:junit4="antlib:com.carrotsearch.junit4"
- xmlns:mvn="antlib:org.apache.maven.artifact.ant">
-
-+ <import file="gentoo-classpath.xml" />
-+
- <property name="src" location="src"/>
- <property name="build" location="build"/>
- <property name="dist" location="dist"/>
-@@ -81,8 +83,6 @@
- </target>
-
- <target name="install-cpptasks" unless="cpptasks.available">
-- <ivy:cachepath organisation="ant-contrib" module="cpptasks" revision="1.0b5"
-- inline="true" conf="default" transitive="true" pathid="cpptasks.classpath"/>
- <taskdef uri="antlib:net.sf.antcontrib.cpptasks" resource="net/sf/antcontrib/cpptasks/antlib.xml" classpathref="cpptasks.classpath"/>
- <property name="cpptasks.available" value="true"/>
- </target>
-@@ -117,22 +117,14 @@
-
- <target name="init">
- <tstamp />
-- <ivy:resolve file="${ivy.xml.name}" conf="test" />
-- <ivy:retrieve />
- </target>
-
- <target name="install-junit4" depends="init" unless="junit4.available">
-- <taskdef uri="antlib:com.carrotsearch.junit4">
-- <classpath>
-- <fileset dir="${lib}" includes="*.jar" />
-- </classpath>
-- </taskdef>
-+ <taskdef uri="antlib:com.carrotsearch.junit4" resource="com/carrotsearch/junit4/antlib.xml" classpath="${gentoo.classpath}"/>
- <property name="junit4.available" value="true" />
- </target>
-
- <target name="generate-sources" depends="init">
-- <ivy:cachepath organisation="org.mvel" module="mvel2" revision="2.3.2.Final"
-- inline="true" conf="default" transitive="true" pathid="mvel.classpath"/>
- <mkdir dir="${build}/java" />
- <java
- fork="true"
-@@ -244,12 +236,12 @@
- <pathelement path="${build}/classes" />
- <pathelement path="${build}/unsafe-classes" />
- <pathelement path="${build}/generated-classes" />
-- <fileset dir="lib" includes="*.jar" />
-+ <pathelement path="${gentoo.classpath}" />
- </path>
-
- <path id="compile.tests.classpath.with.jar">
- <pathelement path="${lz4-java.jar}" />
-- <fileset dir="lib" includes="*.jar" />
-+ <pathelement path="${gentoo.classpath}" />
- </path>
-
- <path id="test.classpath">
-@@ -260,14 +252,14 @@
- <pathelement path="${build}/unsafe-classes" />
- <pathelement path="${build}/generated-classes" />
- <pathelement path="${build}/test-classes" />
-- <fileset dir="${lib}" includes="*.jar" />
-+ <pathelement path="${gentoo.classpath}" />
- </path>
-
- <path id="test.classpath.with.jar">
- <pathelement path="${lz4-java.jar}" />
- <pathelement path="${src}/test-resources" />
- <pathelement path="${build}/test-classes" />
-- <fileset dir="${lib}" includes="*.jar" />
-+ <pathelement path="${gentoo.classpath}" />
- </path>
-
- <target name="test" description="run tests">
---
-2.32.0
-
diff --git a/dev-java/lz4-java/lz4-java-1.8.0-r1.ebuild b/dev-java/lz4-java/lz4-java-1.8.0-r1.ebuild
deleted file mode 100644
index 993a8803f183..000000000000
--- a/dev-java/lz4-java/lz4-java-1.8.0-r1.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# 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.lz4:lz4-java:1.8.0"
-
-inherit java-pkg-2 java-ant-2 toolchain-funcs
-
-DESCRIPTION="LZ4 compression for Java"
-HOMEPAGE="https://github.com/lz4/lz4-java"
-SRC_URI="https://github.com/lz4/lz4-java/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-# Tests require com.carrotsearch.randomizedtesting:junit4-ant, which is yet to
-# be packaged. Some extra steps are required before running the tests:
-# 1. Download junit4-ant 2.7.x from https://mvnrepository.com/artifact/com.carrotsearch.randomizedtesting/junit4-ant
-# 2. Set EANT_GENTOO_CLASSPATH_EXTRA to the path to junit4-ant-2.7.*.jar
-# 3. ppc64 only: Install test dependencies that are unkeyworded
-# 4. Set ALLOW_TEST="all"
-RESTRICT="test"
-
-CDEPEND="
- app-arch/lz4:=
-"
-
-# The version requirement on mvel is strict; mvel-2.4.* generates source files
-# incorrectly, which causes build failure of this package
-DEPEND="
- >=virtual/jdk-1.8:*
- dev-java/mvel:2.3
- dev-libs/xxhash
- test? (
- dev-java/junit:4
- !ppc64? (
- dev-java/randomized-runner:0
- )
- )
- ${CDEPEND}
-"
-
-RDEPEND="
- >=virtual/jre-1.8:*
- ${CDEPEND}
-"
-
-# Ant is only needed to generate JNI headers;
-# the JNI shared object will be built by the custom Makefile
-EANT_BUILD_TARGET="compile-java generate-headers"
-EANT_DOC_TARGET="docs"
-EANT_EXTRA_ARGS="-Djava.io.tmpdir=${T}"
-EANT_TEST_GENTOO_CLASSPATH="randomized-runner"
-
-pkg_setup() {
- java-pkg-2_pkg_setup
- local build_only_cp="$(java-pkg_getjars --build-only mvel-2.3)"
- if [[ -z "${EANT_GENTOO_CLASSPATH_EXTRA}" ]]; then
- EANT_GENTOO_CLASSPATH_EXTRA="${build_only_cp}"
- else
- EANT_GENTOO_CLASSPATH_EXTRA+=":${build_only_cp}"
- fi
-}
-
-src_prepare() {
- eapply "${FILESDIR}/${P}-print-os-props.patch"
- eapply "${FILESDIR}/${P}-skip-ivy.patch"
- cp "${FILESDIR}/${P}-r1-Makefile" Makefile || die "Failed to copy Makefile"
- cp "${FILESDIR}/${P}-gentoo-classpath.xml" gentoo-classpath.xml ||
- die "Failed to copy Gentoo classpath injection XML"
- java-pkg-2_src_prepare
- rm -r src/resources || die "Failed to remove pre-built shared libraries"
-}
-
-src_compile() {
- java-pkg-2_src_compile
- emake CC="$(tc-getCC)" JAVA_HOME="${JAVA_HOME}"
- # JNI has already been built by the Makefile at this point
- # Also pretend cpptasks is available, which is required by build.xml
- EANT_EXTRA_ARGS+=" -Dcpptasks.available=true -Dskip.jni=true"
- # Manually call 'ant jar' to include the JNI shared object in JAR
- eant jar -f "${EANT_BUILD_XML}" ${EANT_EXTRA_ARGS}
-}
-
-src_test() {
- java-pkg-2_src_test
-}
-
-src_install() {
- java-pkg_newjar 'dist/${ivy.module}.jar'
- java-pkg_doso $(find build/jni -name "*.so")
- use doc && java-pkg_dojavadoc build/docs
- # Ant project's 'sources' target generates a source JAR rather than a Zip
- # archive; we simply let java-utils-2.eclass create the source Zip archive
- # from the same source directories the 'sources' target would access
- # https://github.com/lz4/lz4-java/blob/1.8.0/build.xml#L323-L330
- use source && java-pkg_dosrc src/java/* src/java-unsafe/*
-}
diff --git a/dev-java/lz4-java/lz4-java-1.8.0-r4.ebuild b/dev-java/lz4-java/lz4-java-1.8.0-r4.ebuild
index 430ed388f301..9e2b264421f8 100644
--- a/dev-java/lz4-java/lz4-java-1.8.0-r4.ebuild
+++ b/dev-java/lz4-java/lz4-java-1.8.0-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2023 Gentoo Authors
+# Copyright 2023-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -16,7 +16,7 @@ S="${WORKDIR}/${P}"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
DEPEND="
app-arch/lz4:=
@@ -69,14 +69,12 @@ src_compile() {
mkdir -p build/objects/src/jni
mkdir -p build/jni/net/jpountz/util/linux/amd64
"$(tc-getCC)" ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} \
- -I$(java-config -O)/../include -I$(java-config -O)/../include/linux \
- -I$(java-config -O)/include -I$(java-config -O)/include/linux \
+ $(java-pkg_get-jni-cflags) \
-Ibuild/jni-headers \
-c -o build/objects/src/jni/net_jpountz_lz4_LZ4JNI.o \
src/jni/net_jpountz_lz4_LZ4JNI.c
"$(tc-getCC)" ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} \
- -I$(java-config -O)/../include -I$(java-config -O)/../include/linux \
- -I$(java-config -O)/include -I$(java-config -O)/include/linux \
+ $(java-pkg_get-jni-cflags) \
-Ibuild/jni-headers \
-c -o build/objects/src/jni/net_jpountz_xxhash_XXHashJNI.o \
src/jni/net_jpountz_xxhash_XXHashJNI.c
diff --git a/dev-java/maven-bin/Manifest b/dev-java/maven-bin/Manifest
index 60cd3afc1713..7158eea18442 100644
--- a/dev-java/maven-bin/Manifest
+++ b/dev-java/maven-bin/Manifest
@@ -1,2 +1,2 @@
DIST apache-maven-3.8.8-bin.tar.gz 8296049 BLAKE2B af6353193365ed33e8f2f0a7e4d31933132751f142ebbdb68aab7a74ad2dda6593bf34cef9d8d56d6c93ff93293b75517a10a5c1c048733b8c911f4ac150bdf6 SHA512 332088670d14fa9ff346e6858ca0acca304666596fec86eea89253bd496d3c90deae2be5091be199f48e09d46cec817c6419d5161fb4ee37871503f472765d00
-DIST apache-maven-3.9.5-bin.tar.gz 9359994 BLAKE2B d73d5bc7f5028068492ed7710897b370e4a97592bef0ff055ce2d7dea222bb348f5886b7b5e86ce2787296e90e1a35eab057208c1edbadd5c82447116a14f3f4 SHA512 4810523ba025104106567d8a15a8aa19db35068c8c8be19e30b219a1d7e83bcab96124bf86dc424b1cd3c5edba25d69ec0b31751c136f88975d15406cab3842b
+DIST apache-maven-3.9.6-bin.tar.gz 9410508 BLAKE2B 2a99f002912e6c0fcf9f78f0553553898cf39c17bd7c8b58269c8a7d061c425c62a2f557a686fd2b1f114ef1f47aab6e9b318555235bb436e8c7e5c8b1a0dd9d SHA512 706f01b20dec0305a822ab614d51f32b07ee11d0218175e55450242e49d2156386483b506b3a4e8a03ac8611bae96395fd5eec15f50d3013d5deed6d1ee18224
diff --git a/dev-java/maven-bin/maven-bin-3.9.5-r1.ebuild b/dev-java/maven-bin/maven-bin-3.9.6.ebuild
index 12476315273c..99a723fc7721 100644
--- a/dev-java/maven-bin/maven-bin-3.9.5-r1.ebuild
+++ b/dev-java/maven-bin/maven-bin-3.9.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
diff --git a/dev-java/mill-bin/Manifest b/dev-java/mill-bin/Manifest
index 958c591e5812..8a7f956466f7 100644
--- a/dev-java/mill-bin/Manifest
+++ b/dev-java/mill-bin/Manifest
@@ -1,2 +1,3 @@
DIST mill-bin-0.11.4 61557418 BLAKE2B 712ad3df280f38b01a617fbefafad50c9c87af74ef618b8ab4e8fa8c066089087966230e005eaca55d56c1242e6380278a5fb63efc9d2438b9b0d549605dc17e SHA512 601eecf62f9f6651ccd874b02a16ff0f451b1b60861341a61e78e11d813cb1d5a938922f77942282f388b6497c6eadd4d972d1c237cdadb1b8aba3975e29050b
DIST mill-bin-0.11.5 52760276 BLAKE2B 1583403fba8782d759a5d56513e2d40cd81ffb68d4947b638052cc6108d6d6516f7fc16e9cf516fc7c2c60820d2d6fcb5c15179bcef715c6d75f25c6802fe711 SHA512 673d636fc64fff01289ad642f2f861f6da18d3e652cdd645e3d2487daf1baf4616515e31540a03f67dbc354efff4f48a6881e1ceecfb966eb24d7675abb6dff7
+DIST mill-bin-0.11.6 52778046 BLAKE2B 5f05b14cafba4e6b40b89572310a2b06ddbf1839a2da0dbdfe73a63606c9b1262fed686f7ffb17dc178072242136a4b334a2ae89b2fdc7274bffee928ff3c5fe SHA512 9f187b00d37f8d0bb97b7cd08c57e59e081c835e25f83e6c65bf2ca425f4325a6c641f7082ef700dac30ab6d4f59da5492136eeab21c898f11a259b89d55e9b8
diff --git a/dev-java/mill-bin/mill-bin-0.11.6.ebuild b/dev-java/mill-bin/mill-bin-0.11.6.ebuild
new file mode 100644
index 000000000000..5b24c097e25e
--- /dev/null
+++ b/dev-java/mill-bin/mill-bin-0.11.6.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2024 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/mvel/Manifest b/dev-java/mvel/Manifest
index 63212e9bcedb..41568dbf8e17 100644
--- a/dev-java/mvel/Manifest
+++ b/dev-java/mvel/Manifest
@@ -1,2 +1 @@
-DIST mvel2-2.3.2.Final.tar.gz 2405839 BLAKE2B 5f12652a0f4375f6e24f18313d99a02bb86463cc1acc2f8845b815c9c7afcda410d67c9f1c30544f9ab1cd50a48ce0ab72e9cca94faafab776f3704b1d5fa087 SHA512 9d1c92bfe90aa4cfe5f4bbdd7eef2060bfaec3979c5c07a5baf3ddb4d84a00632dcaec266bab675b31d5b745bfa36a89dd5969ababeb64332069939a4df23dbc
DIST mvel2-2.5.0.Final.tar.gz 2182715 BLAKE2B 1e8dbde4b75e36ea4d285ab45c0040957b9af7b5819786daf6469ae509c9c1e16ba2b201a05f9f9cf1c694bac816afd2d613226a8eb3b06f9049a898c6586b85 SHA512 29ca1ef8fdc4cbb97b5847f59e7c3118e837022d7292b507869208da1798b55d0445c40214d72c159e610d7094df7002c091296b2b31775a1ad0606f622d12b5
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
deleted file mode 100644
index 1cfd9e8abc36..000000000000
--- a/dev-java/mvel/files/mvel-2.3.2-ignore-failing-tests.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-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
deleted file mode 100644
index d019002cda1f..000000000000
--- a/dev-java/mvel/files/mvel-2.3.2-update-supported-java-versions.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-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
deleted file mode 100644
index 8b7250540b05..000000000000
--- a/dev-java/mvel/files/mvel-2.3.2-update-version-in-output.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-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/mvel/mvel-2.3.2-r1.ebuild b/dev-java/mvel/mvel-2.3.2-r1.ebuild
deleted file mode 100644
index 2fc29e17956e..000000000000
--- a/dev-java/mvel/mvel-2.3.2-r1.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# 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/mvel/mvel-2.5.0.ebuild b/dev-java/mvel/mvel-2.5.0.ebuild
index 79dbf2350f51..dc7079a91c1c 100644
--- a/dev-java/mvel/mvel-2.5.0.ebuild
+++ b/dev-java/mvel/mvel-2.5.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 Gentoo Authors
+# Copyright 2021-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}-${PN}2-${PV}.Final"
LICENSE="Apache-2.0"
SLOT="2.5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
DEPEND="
dev-java/asm:9
diff --git a/dev-java/openjdk-bin/Manifest b/dev-java/openjdk-bin/Manifest
index b0ce2ae92307..72d59e96abe7 100644
--- a/dev-java/openjdk-bin/Manifest
+++ b/dev-java/openjdk-bin/Manifest
@@ -12,6 +12,7 @@ DIST OpenJDK17U-jdk_x64_alpine-linux_hotspot_17.0.8.1_1.tar.gz 191374032 BLAKE2B
DIST OpenJDK17U-jdk_x64_linux_hotspot_17.0.8.1_1.tar.gz 192053612 BLAKE2B bd59524805f7af5883b7fd20ff13b77594ec6841c28b028ff589419ff31cc7f152c6b177bc133b7749c413c22a7e8bdeab6e2f705ceb49617bb89dd6be6727a4 SHA512 3856cea7abfacfeda499200ff09427ce7f2e96f25eb556cb27eecc83f0f8c5b3fcb831a00dcf0202d6dbb191e2a23e2d0f928dcfc503dbfc582193245ecd2522
DIST OpenJDK17U-jdk_x64_mac_hotspot_17.0.8.1_1.tar.gz 187618128 BLAKE2B 0413bb2bb928906f8aa09a6dae161fd91b4cc17a81ec822d4553322f1505f8141d10d308ddfb632c1678d2685dd95d999d09de5888aee056ca95847cca26b29e SHA512 b2ba614ca966acc6c03563a248638051abe0851b9b6932e8d93748307250f32b5fd8cef70c8c308aba4f97c02c4791cc7193b19f5b2f407f6c2d003fcf2416a6
DIST OpenJDK21U-jdk_aarch64_linux_hotspot_21.0.1_12.tar.gz 205976031 BLAKE2B 86b00c0c8da5c7ef97e993c1a863c715eca4384f892bf184e094ea4abdeac5e47a54159d1aadedd420e3c4e0d3644ce33589aa8bd1f83f5d67bd19c340951a8d SHA512 ed05b9733e8270fe73dab86fb9320689a6613dd2d6a5807a47a2e22f081feefd9729e39521c85f3f443687bd103918850a9bd3a27d1a64b8519bb37c7454e5e8
+DIST OpenJDK21U-jdk_ppc64le_linux_hotspot_21.0.1_12.tar.gz 207081261 BLAKE2B 859761c9d508f692f38369d16050f3d2c0715e84617838f728646baa90e3ce3ac1fc5fffa508f9f45aa8d01cf5a867dfc6849538ff39164e2ca70c27875a59b2 SHA512 1e955bd71b738d5260314c9ddd6b006683a1f10854d0bb41535df65dcb828f78f1f9bc021fc3c51d5bcafcae402cb16b683c31f4d854adb4d54440dada3920ac
DIST OpenJDK21U-jdk_x64_alpine-linux_hotspot_21.0.1_12.tar.gz 206892255 BLAKE2B f51f7093e3c94c3ae766a36d2ab9da83e5789a6eb586b5ca2f6417c1b58134a1debe80a64fcd80ca7ec8605670bd73ba6cfca2e6a299b12423b7f8a5fcc46f22 SHA512 28dc24c8023c06f1ca765b81d06ea17a6ba2448ac0a2190633266211b82a78be03e3a0f27e52ee9a23919696b8c744ba9e2cf1a325f99b7a29fb276a9428735a
DIST OpenJDK21U-jdk_x64_linux_hotspot_21.0.1_12.tar.gz 207852818 BLAKE2B 294b849b8a0e851c034d63533fe844e528b05886a4803b3f5c73e0e9b5db1a79462963d0c90da2ae5967f1b7eac1521ddc199cdbff8fadd1875bace5a0f0d2f5 SHA512 496ed15dcba607cd1b9e6786932429f9d213d2ea22203bf8cbed61880655ee046bfc4c07b7b0d54285081ddf242fd8957ba34c8be75f5fb2ae0aac16f9b8ef3a
DIST OpenJDK8U-jdk_aarch64_linux_hotspot_8u382b05.tar.gz 102105707 BLAKE2B 5edec97bb60d983bcc299914c5bad8e89aef70f31ff1f5b26cbd430cbacc8b41c6d04906a9ea3a1eb6cf2601ae81279a871a1eb77c3297abb5454e213f2583b0 SHA512 11219c825f8ac0fcdd16120f89b2e7951c651595eb0be762cb511bad8cf44d3bc3136ba6f71b5ded8a9745fe5a143416b0ef4422c1cbbe62f110e4fa5f39c7ed
diff --git a/dev-java/openjdk-bin/metadata.xml b/dev-java/openjdk-bin/metadata.xml
index c09a0d4ca3e7..7adf9448bc9e 100644
--- a/dev-java/openjdk-bin/metadata.xml
+++ b/dev-java/openjdk-bin/metadata.xml
@@ -1,10 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>gyakovlev@gentoo.org</email>
- <name>Georgy Yakovlev</name>
- </maintainer>
<maintainer type="project">
<email>java@gentoo.org</email>
<name>Java</name>
diff --git a/dev-java/openjdk-bin/openjdk-bin-21.0.1_p12.ebuild b/dev-java/openjdk-bin/openjdk-bin-21.0.1_p12.ebuild
index 3d125fc60923..c45432f5aea4 100644
--- a/dev-java/openjdk-bin/openjdk-bin-21.0.1_p12.ebuild
+++ b/dev-java/openjdk-bin/openjdk-bin-21.0.1_p12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -31,6 +31,7 @@ SLOT=$(ver_cut 1)
SRC_URI="
$(abi_uri aarch64 arm64)
+ $(abi_uri ppc64le ppc64)
$(abi_uri x64 amd64)
$(abi_uri x64 amd64 musl)
"
@@ -38,7 +39,7 @@ SRC_URI="
DESCRIPTION="Prebuilt Java JDK binaries provided by Eclipse Temurin"
HOMEPAGE="https://adoptium.net"
LICENSE="GPL-2-with-classpath-exception"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="~amd64 ~arm64 ~ppc64"
IUSE="alsa cups headless-awt selinux source"
RDEPEND="
diff --git a/dev-java/openjdk-jre-bin/metadata.xml b/dev-java/openjdk-jre-bin/metadata.xml
index f60a999cf34f..b4bbaa93f791 100644
--- a/dev-java/openjdk-jre-bin/metadata.xml
+++ b/dev-java/openjdk-jre-bin/metadata.xml
@@ -1,10 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>gyakovlev@gentoo.org</email>
- <name>Georgy Yakovlev</name>
- </maintainer>
<maintainer type="project">
<email>java@gentoo.org</email>
<name>Java</name>
diff --git a/dev-java/openjdk/metadata.xml b/dev-java/openjdk/metadata.xml
index 201e1fe75f50..bb834a6a0f83 100644
--- a/dev-java/openjdk/metadata.xml
+++ b/dev-java/openjdk/metadata.xml
@@ -1,10 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>gyakovlev@gentoo.org</email>
- <name>Georgy Yakovlev</name>
- </maintainer>
<maintainer type="project">
<email>java@gentoo.org</email>
<name>Java</name>
@@ -23,7 +19,6 @@
<flag name="javafx" restrict="&lt;=dev-java/openjdk-9">Provide JavaFX support via <pkg>dev-java/openjfx</pkg></flag>
<flag name="javafx" restrict="&gt;=dev-java/openjdk-11">Import OpenJFX modules at build time, via <pkg>dev-java/openjfx</pkg></flag>
<flag name="jbootstrap">Build OpenJDK twice, the second time using the result of the first</flag>
- <flag name="lto">Enable Link Time Optimization (LTO)</flag>
<flag name="source">Install JVM sources</flag>
<flag name="system-bootstrap">Bootstrap using installed openjdk</flag>
<flag name="systemtap" restrict="&gt;=dev-java/openjdk-11">Enable SystemTAP/DTrace tracing</flag>
diff --git a/dev-java/openjdk/openjdk-11.0.20.1_p1.ebuild b/dev-java/openjdk/openjdk-11.0.20.1_p1.ebuild
index 9c455e1a1a45..36fec8b7b302 100644
--- a/dev-java/openjdk/openjdk-11.0.20.1_p1.ebuild
+++ b/dev-java/openjdk/openjdk-11.0.20.1_p1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -66,7 +66,7 @@ COMMON_DEPEND="
media-libs/lcms:2=
sys-libs/zlib
media-libs/libjpeg-turbo:0=
- systemtap? ( dev-util/systemtap )
+ systemtap? ( dev-debug/systemtap )
"
# Many libs are required to build, but not to run, make is possible to remove
diff --git a/dev-java/openjdk/openjdk-17.0.8.1_p1.ebuild b/dev-java/openjdk/openjdk-17.0.8.1_p1.ebuild
index 2d8881fa4e09..3f1d61a220af 100644
--- a/dev-java/openjdk/openjdk-17.0.8.1_p1.ebuild
+++ b/dev-java/openjdk/openjdk-17.0.8.1_p1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -69,7 +69,7 @@ COMMON_DEPEND="
media-libs/lcms:2=
sys-libs/zlib
media-libs/libjpeg-turbo:0=
- systemtap? ( dev-util/systemtap )
+ systemtap? ( dev-debug/systemtap )
"
# Many libs are required to build, but not to run, make is possible to remove
diff --git a/dev-java/openjdk/openjdk-21.0.1_p12.ebuild b/dev-java/openjdk/openjdk-21.0.1_p12.ebuild
index 7332163ebc89..df6a3e6a4ed3 100644
--- a/dev-java/openjdk/openjdk-21.0.1_p12.ebuild
+++ b/dev-java/openjdk/openjdk-21.0.1_p12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -63,7 +63,7 @@ COMMON_DEPEND="
media-libs/lcms:2=
sys-libs/zlib
media-libs/libjpeg-turbo:0=
- systemtap? ( dev-util/systemtap )
+ systemtap? ( dev-debug/systemtap )
"
# Many libs are required to build, but not to run, make is possible to remove
diff --git a/dev-java/openjdk/openjdk-8.382_p05.ebuild b/dev-java/openjdk/openjdk-8.382_p05-r2.ebuild
index 9b1632baec83..a0f00644cae2 100644
--- a/dev-java/openjdk/openjdk-8.382_p05.ebuild
+++ b/dev-java/openjdk/openjdk-8.382_p05-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -64,7 +64,6 @@ DEPEND="
dev-java/openjdk-bin:${SLOT}
dev-java/icedtea-bin:${SLOT}
dev-java/openjdk:${SLOT}
- dev-java/icedtea:${SLOT}
)
"
diff --git a/dev-java/openjfx/metadata.xml b/dev-java/openjfx/metadata.xml
index 06173f63487a..ea592d9837e1 100644
--- a/dev-java/openjfx/metadata.xml
+++ b/dev-java/openjfx/metadata.xml
@@ -1,10 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>gyakovlev@gentoo.org</email>
- <name>Georgy Yakovlev</name>
- </maintainer>
<maintainer type="project">
<email>java@gentoo.org</email>
</maintainer>
diff --git a/dev-java/openjfx/openjfx-8.1000-r1.ebuild b/dev-java/openjfx/openjfx-8.1000-r2.ebuild
index 66e046c74241..ef27aefdb985 100644
--- a/dev-java/openjfx/openjfx-8.1000-r1.ebuild
+++ b/dev-java/openjfx/openjfx-8.1000-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020-2023 Gentoo Authors
+# Copyright 2020-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -29,14 +29,14 @@ RESTRICT="test" # needs junit version we don't have, fragile
DEPEND="
app-arch/unzip
- >=dev-java/ant-core-1.8.2:0
+ >=dev-java/ant-1.10.14:0
>=dev-java/antlr-2.7.7-r7:0
dev-java/antlr:3
dev-java/openjdk:8
dev-java/stringtemplate:0
dev-java/swt:4.10[cairo,opengl]
- sys-devel/bison
- sys-devel/flex
+ app-alternatives/yacc
+ app-alternatives/lex
virtual/jdk:1.8
virtual/pkgconfig
"
@@ -120,8 +120,8 @@ src_prepare() {
done
local swt_file_name="$(java-pkg_getjars swt-4.10)"
- java-pkg_jar-from --build-only --into "${d}" ant-core ant.jar ant-1.8.2.jar
- java-pkg_jar-from --build-only --into "${d}" ant-core ant-launcher.jar ant-launcher-1.8.2.jar
+ java-pkg_jar-from --build-only --into "${d}" ant ant.jar ant-1.8.2.jar
+ java-pkg_jar-from --build-only --into "${d}" ant ant-launcher.jar ant-launcher-1.8.2.jar
java-pkg_jar-from --build-only --into "${d}" antlr antlr.jar antlr-2.7.7.jar
java-pkg_jar-from --build-only --into "${d}" antlr-3 antlr-tool.jar antlr-3.1.3.jar
java-pkg_jar-from --build-only --into "${d}" antlr-3 antlr-runtime.jar antlr-runtime-3.1.3.jar
diff --git a/dev-java/osgi-compendium/Manifest b/dev-java/osgi-compendium/Manifest
deleted file mode 100644
index d6df9666bf82..000000000000
--- a/dev-java/osgi-compendium/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST osgi.cmpn-4.3.1.jar 741615 BLAKE2B 6f6058c07fd7744f0369d05cdf607b4d4fe51bbdf567c6a6c951413b0627eb1dbb6e56f65641a8472198d0aedca378da4715c26ebe05aa4e7ef80adb1020175f SHA512 803e929b4b7cfee13a3ffa2c60ad03775afd8409c972bf26e3f79abc590466c2d885bdc339d9af2a3e8fda9cdf082d23a298362ac37935b0ede0719dee27e9f9
diff --git a/dev-java/osgi-compendium/osgi-compendium-4.3.1-r4.ebuild b/dev-java/osgi-compendium/osgi-compendium-4.3.1-r4.ebuild
deleted file mode 100644
index 0ca616b9fb7c..000000000000
--- a/dev-java/osgi-compendium/osgi-compendium-4.3.1-r4.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2023 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="OSGi Service Platform Compendium API (Companion Code)"
-HOMEPAGE="https://docs.osgi.org"
-SRC_URI="https://docs.osgi.org/download/r4v43/osgi.cmpn-${PV}.jar"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-CP_DEPEND="
- dev-java/glassfish-persistence:0
- dev-java/osgi-core-api:0
- dev-java/osgi-foundation:0
- dev-java/jakarta-servlet-api:4"
-
-DEPEND="${CP_DEPEND}
- >=virtual/jdk-1.8:*"
-
-RDEPEND="${CP_DEPEND}
- >=virtual/jre-1.8:*"
-
-BDEPEND="app-arch/unzip"
-
-JAVA_SRC_DIR="OSGI-OPT/src"
-
-src_prepare() {
- default
- rm -r org || die
-}
diff --git a/dev-java/osgi-core-api/Manifest b/dev-java/osgi-core-api/Manifest
deleted file mode 100644
index 2560625ee59f..000000000000
--- a/dev-java/osgi-core-api/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST osgi.core-5.0.0.jar 418232 BLAKE2B d7cfb8b2c6ff955ffc8252f248eb7bec562d16598e1a56fb50f12c099adae8b5268bc26003e166794eaee8fa6cb116ce388eb1981ef5a09394c05b7ea8655f0d SHA512 de7c5aa327a4361b81d953951488b84071e525cfd3e50f0334450b8c1b25733248de9459239ee7091f8961ac8b047a0492d692fb7cd408a0ec07df090ea9e2c3
diff --git a/dev-java/osgi-core-api/metadata.xml b/dev-java/osgi-core-api/metadata.xml
deleted file mode 100644
index 6021501589e0..000000000000
--- a/dev-java/osgi-core-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/osgi-core-api/osgi-core-api-5.0.0-r2.ebuild b/dev-java/osgi-core-api/osgi-core-api-5.0.0-r2.ebuild
deleted file mode 100644
index 36af959c037c..000000000000
--- a/dev-java/osgi-core-api/osgi-core-api-5.0.0-r2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source"
-MAVEN_ID="org.osgi:org.osgi.core:5.0.0"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="OSGi Service Platform Core API (Companion Code)"
-HOMEPAGE="http://www.osgi.org/Specifications/HomePage"
-SRC_URI="http://www.osgi.org/download/r5/osgi.core-${PV}.jar"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x64-macos"
-
-RDEPEND=">=virtual/jre-1.8:*"
-
-DEPEND=">=virtual/jdk-1.8:*
- app-arch/unzip"
-
-JAVA_SRC_DIR="OSGI-OPT/src"
-
-src_prepare() {
- default
- rm -r org || die
-}
diff --git a/dev-java/osgi-enterprise-api/Manifest b/dev-java/osgi-enterprise-api/Manifest
deleted file mode 100644
index 02c8f1895e3e..000000000000
--- a/dev-java/osgi-enterprise-api/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST osgi.enterprise-5.0.0.jar 479506 BLAKE2B 2bd53b50e469388d132a6d3ebd78d4040093f8c1d79299fd87412853d959f7559f04287567eeea47635fe287a3e9d3812ac9303a5d39ec35135ab3c58bd0b010 SHA512 0404c05afd8cb3ef8b826b0f08deeb03b0027ca99e091953d39ef69674809c5b899e0f2c8efb685df5fce070c2aafcf813e470fbb538d4ec3b480a8060351144
diff --git a/dev-java/osgi-enterprise-api/metadata.xml b/dev-java/osgi-enterprise-api/metadata.xml
deleted file mode 100644
index 6021501589e0..000000000000
--- a/dev-java/osgi-enterprise-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/osgi-enterprise-api/osgi-enterprise-api-5.0.0-r3.ebuild b/dev-java/osgi-enterprise-api/osgi-enterprise-api-5.0.0-r3.ebuild
deleted file mode 100644
index bf8943b5ed02..000000000000
--- a/dev-java/osgi-enterprise-api/osgi-enterprise-api-5.0.0-r3.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2023 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="OSGi Enterprise Release 5 Companion Code"
-HOMEPAGE="http://www.osgi.org/Main/HomePage"
-SRC_URI="https://docs.osgi.org/download/r5/osgi.enterprise-${PV}.jar"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-RESTRICT="bindist"
-
-CP_DEPEND="dev-java/glassfish-persistence:0
- dev-java/osgi-core-api:0
- dev-java/javax-servlet-api:2.5"
-
-RDEPEND="${CP_DEPEND}
- >=virtual/jre-1.8:*"
-
-DEPEND="${CP_DEPEND}
- >=virtual/jdk-1.8:*"
-
-BDEPEND="app-arch/unzip"
-
-JAVA_SRC_DIR="OSGI-OPT/src"
-
-src_prepare() {
- default
- rm -r org || die
-}
diff --git a/dev-java/osgi-foundation/Manifest b/dev-java/osgi-foundation/Manifest
deleted file mode 100644
index cfeb1169a491..000000000000
--- a/dev-java/osgi-foundation/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST osgi-foundation-1.2.0.tar.xz 45176 BLAKE2B 4b5432dfaad9134f402b5f448a8d7ba5f626a7b160bbc953914352a28f745725da851b6c5f2122f820b52f2fd8ad463c2df5c8ae3e2b46ef8bb9d56d89d90f1b SHA512 6523dd6b4cd8205aa3359fae4640ff6b17a1944aec6bf23acf0d6e4eb33839a9b9049e8df0c55a4f35013b40b1df2391a53ed68df682a317c35dca504e9b996b
diff --git a/dev-java/osgi-foundation/files/osgi-foundation-1.2.0-build.xml b/dev-java/osgi-foundation/files/osgi-foundation-1.2.0-build.xml
deleted file mode 100644
index a33f09709ada..000000000000
--- a/dev-java/osgi-foundation/files/osgi-foundation-1.2.0-build.xml
+++ /dev/null
@@ -1,218 +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/11/13 9:36 AM -->
-<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/ -->
-<!-- -->
-<!-- ====================================================================== -->
-
-<project name="org.osgi.foundation-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.osgi.foundation-1.2.0"/>
- <property name="maven.build.dir" value="target"/>
- <property name="maven.build.outputDir" value="${maven.build.dir}/classes"/>
- <property name="maven.build.srcDir.0" value="src/main/java"/>
- <property name="maven.build.resourceDir.0" value="src/main/resources"/>
- <property name="maven.build.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"/>
- <path id="build.test.classpath">
- <pathelement location="${maven.repo.local}/junit/junit/3.8.1/junit-3.8.1.jar"/>
- <pathelement location="${maven.repo.local}/easymock/easymock/1.2_Java1.3/easymock-1.2_Java1.3.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.3"
- verbose="false"
- fork="false"
- source="1.3">
- <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.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}/junit/junit/3.8.1"/>
- <get src="http://people.apache.org/repo/m2-snapshot-repository/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="false"
- ignoreerrors="true"/>
- <get src="http://repo.maven.apache.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="false"
- ignoreerrors="true"/>
- <mkdir dir="${maven.repo.local}/easymock/easymock/1.2_Java1.3"/>
- <get src="http://people.apache.org/repo/m2-snapshot-repository/easymock/easymock/1.2_Java1.3/easymock-1.2_Java1.3.jar"
- dest="${maven.repo.local}/easymock/easymock/1.2_Java1.3/easymock-1.2_Java1.3.jar"
- usetimestamp="false"
- ignoreerrors="true"/>
- <get src="http://repo.maven.apache.org/maven2/easymock/easymock/1.2_Java1.3/easymock-1.2_Java1.3.jar"
- dest="${maven.repo.local}/easymock/easymock/1.2_Java1.3/easymock-1.2_Java1.3.jar"
- usetimestamp="false"
- ignoreerrors="true"/>
- </target>
-
-</project>
diff --git a/dev-java/osgi-foundation/osgi-foundation-1.2.0-r2.ebuild b/dev-java/osgi-foundation/osgi-foundation-1.2.0-r2.ebuild
deleted file mode 100644
index 7adbb2f51fdd..000000000000
--- a/dev-java/osgi-foundation/osgi-foundation-1.2.0-r2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="OSGi R4 Foundation EE by Apache Felix"
-HOMEPAGE="http://felix.apache.org/"
-SRC_URI="https://dev.gentoo.org/~tomwij/files/dist/${P}.tar.xz"
-
-LICENSE="Apache-2.0 OSGi-Specification-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-DEPEND=">=virtual/jdk-1.8:*"
-RDEPEND=">=virtual/jre-1.8:*"
-
-src_prepare() {
- default
- cp "${FILESDIR}"/${P}-build.xml "${S}"/build.xml || die
-}
-
-src_install() {
- java-pkg_newjar target/org.osgi.foundation-${PV}.jar org.osgi.foundation.jar
-}
diff --git a/dev-java/osgi-service-log/Manifest b/dev-java/osgi-service-log/Manifest
new file mode 100644
index 000000000000..cd0e597315ba
--- /dev/null
+++ b/dev-java/osgi-service-log/Manifest
@@ -0,0 +1 @@
+DIST org.osgi.service.log-1.3.0-sources.jar 12012 BLAKE2B 005f7e71b2a16bee5b097ffd207667d59a0743bb278669c59e6cf56c183a8dd063190ddff2071c2945c41410fbb86c4534ad7116fb56d4d621bbbbc0659b54ef SHA512 06757188027245690b0655105acd94534844d2e118b9ec4ab7ac0c910fcebb22dcf0fd53e20ad053b4c6e97461bfe4ffddf1b2b11045f2659518afec0baef105
diff --git a/dev-java/aqute-bnd-annotation/metadata.xml b/dev-java/osgi-service-log/metadata.xml
index 75321cfb5598..75321cfb5598 100644
--- a/dev-java/aqute-bnd-annotation/metadata.xml
+++ b/dev-java/osgi-service-log/metadata.xml
diff --git a/dev-java/osgi-service-log/osgi-service-log-1.3.0.ebuild b/dev-java/osgi-service-log/osgi-service-log-1.3.0.ebuild
new file mode 100644
index 000000000000..ed34ecd1a58d
--- /dev/null
+++ b/dev-java/osgi-service-log/osgi-service-log-1.3.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 2023-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="org.osgi:org.osgi.service.log:${PV}"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="OSGi Companion Code for org.osgi.service.log"
+HOMEPAGE="https://www.osgi.org/"
+SRC_URI="https://repo1.maven.org/maven2/org/osgi/org.osgi.service.log/${PV}/org.osgi.service.log-${PV}-sources.jar"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
+
+CP_DEPEND="dev-java/osgi-core:0"
+
+DEPEND="${CP_DEPEND}
+ dev-java/osgi-annotation:0
+ >=virtual/jdk-1.8:*"
+
+RDEPEND="${CP_DEPEND}
+ >=virtual/jre-1.8:*"
+
+BDEPEND="app-arch/unzip"
+
+JAVA_AUTOMATIC_MODULE_NAME="org.osgi.service.log"
+JAVA_CLASSPATH_EXTRA="osgi-annotation"
diff --git a/dev-java/osgi-service-subsystem/Manifest b/dev-java/osgi-service-subsystem/Manifest
new file mode 100644
index 000000000000..0b9e27d8c3c1
--- /dev/null
+++ b/dev-java/osgi-service-subsystem/Manifest
@@ -0,0 +1 @@
+DIST osgi-service-subsystem-1.1.0-sources.jar 24552 BLAKE2B a69fc49b88aa43baa5f56a94a4d8dc55f7ef596a4a39b86f68c652bf02f878c51a25a15cc0bad5f38b23f644137c2082011f8fd3658185ab068ea8bdd551a3d3 SHA512 d0ed0c99525d0860c24b3783902230fc05ccd830a22c16a355d7d6e851919caa64bd23082fcd5f9ebf939b4e1b86e8e52225343401552a89f1e6c1d5892fd162
diff --git a/dev-java/osgi-foundation/metadata.xml b/dev-java/osgi-service-subsystem/metadata.xml
index 4221e170cbc0..75321cfb5598 100644
--- a/dev-java/osgi-foundation/metadata.xml
+++ b/dev-java/osgi-service-subsystem/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/osgi-service-subsystem/osgi-service-subsystem-1.1.0.ebuild b/dev-java/osgi-service-subsystem/osgi-service-subsystem-1.1.0.ebuild
new file mode 100644
index 000000000000..31791787d08a
--- /dev/null
+++ b/dev-java/osgi-service-subsystem/osgi-service-subsystem-1.1.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="org.osgi:org.osgi.service.subsystem:${PV}"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="OSGi Companion Code for org.osgi.service.subsystem"
+HOMEPAGE="https://www.osgi.org/"
+SRC_URI="https://repo1.maven.org/maven2/org/osgi/org.${PN//-/.}/${PV}/org.${PN//-/.}-${PV}-sources.jar -> ${P}-sources.jar"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+BDEPEND="app-arch/unzip"
+
+CP_DEPEND="
+ dev-java/osgi-annotation:0
+ dev-java/osgi-core:0
+"
+
+DEPEND="${CP_DEPEND}
+ >=virtual/jdk-1.8:*
+"
+
+RDEPEND="${CP_DEPEND}
+ >=virtual/jre-1.8:*
+"
diff --git a/dev-java/parboiled/Manifest b/dev-java/parboiled/Manifest
new file mode 100644
index 000000000000..ef31eb68bb3d
--- /dev/null
+++ b/dev-java/parboiled/Manifest
@@ -0,0 +1 @@
+DIST parboiled-1.4.1.tar.gz 230536 BLAKE2B 99e8e99d9b1b5de7420491967213be94c5895ba6abfd797f4f681834b3773784fc94c5a7d000574cd65dd0dff46857cc19c9430691899f82edf324c764c193dd SHA512 3c502013168f76178398861e2b23089a5c3df0ec36f44830300dc935844026df9f6d5dd7c40babcd4c6a58bff84c0f2134930a19ef49bcd61efbdab3c093ef9c
diff --git a/dev-java/parboiled/metadata.xml b/dev-java/parboiled/metadata.xml
new file mode 100644
index 000000000000..c48f3cb552ec
--- /dev/null
+++ b/dev-java/parboiled/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>java@gentoo.org</email>
+ </maintainer>
+ <upstream>
+ <doc>https://github.com/sirthias/parboiled/wiki/</doc>
+ <remote-id type="github">sirthias/parboiled</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-java/parboiled/parboiled-1.4.1.ebuild b/dev-java/parboiled/parboiled-1.4.1.ebuild
new file mode 100644
index 000000000000..cbb0bf538479
--- /dev/null
+++ b/dev-java/parboiled/parboiled-1.4.1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_PROVIDES="
+ org.parboiled:parboiled-core:${PV}
+ org.parboiled:parboiled-java:${PV}
+"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Elegant parsing in Java and Scala - lightweight, easy-to-use, powerful"
+HOMEPAGE="https://github.com/sirthias/parboiled"
+SRC_URI="https://github.com/sirthias/parboiled/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${P}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+CP_DEPEND="dev-java/asm:9"
+DEPEND="${CP_DEPEND}
+ >=virtual/jdk-11:*"
+RDEPEND="${CP_DEPEND}
+ >=virtual/jre-1.8:*"
+
+src_compile() {
+ einfo "Compiling parboiled-core"
+ JAVA_JAR_FILENAME="parboiled-core.jar"
+ JAVA_SRC_DIR="parboiled-core/src/main/java"
+ java-pkg-simple_src_compile
+ JAVA_GENTOO_CLASSPATH_EXTRA+=":parboiled-core.jar"
+ rm -r target || die
+
+ einfo "Compiling parboiled-java"
+ JAVA_JAR_FILENAME="parboiled-java.jar"
+ JAVA_SRC_DIR="parboiled-java/src/main/java"
+ java-pkg-simple_src_compile
+ JAVA_GENTOO_CLASSPATH_EXTRA+=":parboiled-java.jar"
+ rm -r target || die
+
+ if use doc; then
+ JAVA_SRC_DIR=(
+ "parboiled-core/src/main/java"
+ "parboiled-java/src/main/java"
+ )
+ JAVA_JAR_FILENAME="ignoreme.jar"
+ java-pkg-simple_src_compile
+ fi
+}
+
+src_install() {
+ default
+
+ java-pkg_dojar "parboiled-core.jar"
+ java-pkg_dojar "parboiled-java.jar"
+
+ if use doc; then
+ java-pkg_dojavadoc target/api
+ fi
+
+ if use source; then
+ java-pkg_dosrc "parboiled-core/src/main/java/*"
+ java-pkg_dosrc "parboiled-java/src/main/java/*"
+ fi
+}
diff --git a/dev-java/plexus-classworlds/Manifest b/dev-java/plexus-classworlds/Manifest
index 048135928211..444a9642dc6e 100644
--- a/dev-java/plexus-classworlds/Manifest
+++ b/dev-java/plexus-classworlds/Manifest
@@ -1,2 +1 @@
-DIST plexus-classworlds-2.6.0.tar.gz 57221 BLAKE2B 7cef274981101eab85247c1a19420ebbb626b671312579ea665fc3d82e9eb8caba55955ccbc38ccd54e19c55ec1683b6a99a2cd96b08bf7ace57355a8e958d1f SHA512 d6ef17a4651da99975bcfc04f89ba128d891efc9047dc9b8afa52bd092d07268d44a7424a3a3700209bb56452f035ac1071c58ae6dc961b7e991efee1c0e117e
DIST plexus-classworlds-2.7.0.tar.gz 60221 BLAKE2B 8adbad24c057982dd3da6ce221175cf0b3e6585316de02434214d7d470b24220edaa94f4191cb2febfc4e3006a78cd3be5cc0f793438a5009ee20ef8c602768b SHA512 625d83c1a08a15e0d85984518eaec36bf001e562c49df4d5028e9fec1a9fdc69faa88066441da3cedd803fc20932fcaef9f2e924a485e0a0dcde60a600b32c7f
diff --git a/dev-java/plexus-classworlds/plexus-classworlds-2.6.0.ebuild b/dev-java/plexus-classworlds/plexus-classworlds-2.6.0.ebuild
deleted file mode 100644
index d5eca2023894..000000000000
--- a/dev-java/plexus-classworlds/plexus-classworlds-2.6.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.codehaus.plexus:plexus-classworlds:2.6.0"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="The class loader framework of the Plexus project"
-HOMEPAGE="https://codehaus-plexus.github.io/plexus-classworlds/"
-SRC_URI="https://github.com/codehaus-plexus/plexus-classworlds/archive/plexus-classworlds-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-DEPEND="
- >=virtual/jdk-1.8:*
- test? (
- dev-java/commons-logging
- dev-java/xml-commons-external:1.4
- )
-"
-RDEPEND=">=virtual/jre-1.8:*"
-
-S="${WORKDIR}/${PN}-${P}"
-
-JAVA_MAIN_CLASS="org.codehaus.plexus.classworlds.launcher.Launcher"
-JAVA_SRC_DIR="src/main/java/"
-
-JAVA_TEST_GENTOO_CLASSPATH="junit-4"
-JAVA_TEST_SRC_DIR="src/test/java"
-JAVA_TEST_RESOURCE_DIRS="src/test/test-data"
-JAVA_TEST_EXCLUDES="org.codehaus.plexus.classworlds.TestUtil"
-
-src_prepare() {
- default
- # Ignore one test case testing the presence of ant-core
- sed \
- -e '/testConfigure_Valid/i @Ignore' \
- -e '/import org.junit.Test/a import org.junit.Ignore;' \
- -i src/test/java/org/codehaus/plexus/classworlds/launcher/ConfiguratorTest.java || die
-}
-
-src_test(){
- mkdir -p target/test-lib || die
- # https://github.com/codehaus-plexus/plexus-classworlds/blob/plexus-classworlds-2.6.0/pom.xml#L159-L161
- ln -s "$(java-pkg_getjars --build-only xml-commons-external-1.4)" \
- target/test-lib/xml-apis-1.3.02.jar || die
- # symlinking works only if java-pkg_getjars finds only one file
- # but commons-logging has multiple jar files.
- ln -s "${SYSROOT}"/usr/share/commons-logging/lib/commons-logging.jar \
- target/test-lib/commons-logging-1.0.3.jar || die
- java-pkg-simple_src_test
-}
diff --git a/dev-java/plexus-classworlds/plexus-classworlds-2.7.0.ebuild b/dev-java/plexus-classworlds/plexus-classworlds-2.7.0.ebuild
index 1c6f4ade8267..5d46ae9f6f12 100644
--- a/dev-java/plexus-classworlds/plexus-classworlds-2.7.0.ebuild
+++ b/dev-java/plexus-classworlds/plexus-classworlds-2.7.0.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}-${P}"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
DEPEND="
>=virtual/jdk-1.8:*
diff --git a/dev-java/protobuf-java/Manifest b/dev-java/protobuf-java/Manifest
index 60307769f3dc..bb3385cf9a07 100644
--- a/dev-java/protobuf-java/Manifest
+++ b/dev-java/protobuf-java/Manifest
@@ -1,3 +1,5 @@
DIST protobuf-23.0.tar.gz 5039837 BLAKE2B 63e02590b03fd9206cdfc4a26edeb2fa55dac902f5365c33c9e9340a722f552e4a5c82d1a0b25b84fcb675d5d06b768fd92cf472743d2361295129ae9faa02f3 SHA512 46c263fab189fdc310c7310d1a3d9e76472e5d96f16228bc4b946d4211afc64188d563ec70250c11a3dd05d18158b72ccf173567bd59aa45310eff62cd5f194d
-DIST protobuf-24.2.tar.gz 5179130 BLAKE2B a1e3da4e95072391fa4abf671a9eb77806f1b3864219e1e0c024156558e2ecd9e3cabee367efaf15626a199ae413dced3f29f601820611d37dd733c92ffc06c0 SHA512 fee9f5fc0e615e49347320e37b560112f43d13c63050701e25b3348e9d4aa59e80c7d810f7da12764b1b9eeee8efa35be7743c5ebbb0a12c78f5924f1544c356
+DIST protobuf-23.3.tar.gz 5043803 BLAKE2B ee2edee230969555c9ef95069c7b1d6c23c3d1f8ea1b2249fb3e9f6fcf63312c6e10e9da65b80629fb08d5fb08d05a19bb9c752c25b892c1e3fd6f18b9279eb3 SHA512 646af367dbc61b42e322cf0b335f360e428b272e2b1f5361b2f17c18d3dc9dddd615e1279436028b1a42275a0beadda37c2c934fc27d6c892131cc8d526d8b3b
+DIST protobuf-25.1.tar.gz 5878124 BLAKE2B a0b917e4518b07b221afd01e801e45b5b6fa35c7ccf8c21120d6a63f7174e53cc37d0516b1802d9243f8bb37b72b7f460a36dcbf0fffb09e011b05315c53efc3 SHA512 d2fad2188118ced2cd951bdb472d72cc9e9b2158c88eeca652c76332a884b5b5b4b58628f7777272fa693140753823584ea9c7924f1655b1d5a363f59bdf7a4c
+DIST protobuf-25.2.tar.gz 5878387 BLAKE2B 1ee7a48d3a481f523ff240c79e8cacb39b6a7e2c671279812cbffd5ce9be595034461fba41f03bed363133118c1b92bd14bcfd8c4e46ac6368e6407a23fb02ea SHA512 66f0b177eae0e2e40b8b17c8f411cd9dec5355dcfc145b8a79426e6367babcc28b9a8078bbe4ba2de47a82811a2e1a89d36955d6fa0c8d391cfeada4eb160fdb
DIST truth-1.1.3.jar 243021 BLAKE2B a59149038c62ef5dd352b13d4b393e1b7715fbafe5ed86ec2d16d722c738a31dcdca10132fc73b17b367ac4309e5407ba2e489f8d4c8fbca60ce5f35ae75d1e3 SHA512 f29a9fb070aff8a32358a7b6c8998c0095de5d8d68afa7f7bac759c7050309deff929e767657ecbbefd96163460f10255ca01bc567ab30df4834b9d916a4fae8
diff --git a/dev-java/protobuf-java/protobuf-java-3.23.3.ebuild b/dev-java/protobuf-java/protobuf-java-3.23.3.ebuild
new file mode 100644
index 000000000000..484bbc788521
--- /dev/null
+++ b/dev-java/protobuf-java/protobuf-java-3.23.3.ebuild
@@ -0,0 +1,164 @@
+# Copyright 2008-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="com.google.protobuf:protobuf-java:3.23.3"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple cmake
+
+DESCRIPTION="Core Protocol Buffers library"
+HOMEPAGE="https://protobuf.dev"
+# Currently we bundle the binary version of truth.jar used only for tests, we don't install it.
+# And we build artifact 3.23.3 from the 23.3 tarball in order to allow sharing the tarball with
+# dev-libs/protobuf.
+SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${PV#3.}.tar.gz -> protobuf-${PV#3.}.tar.gz
+ test? ( https://repo1.maven.org/maven2/com/google/truth/truth/1.1.3/truth-1.1.3.jar )"
+S="${WORKDIR}/protobuf-${PV#3.}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+IUSE="system-protoc"
+
+BDEPEND="
+ system-protoc? ( ~dev-libs/protobuf-${PV#3.}:0 )
+ !system-protoc? ( >=dev-cpp/abseil-cpp-20230125.3 )
+"
+DEPEND="
+ >=virtual/jdk-1.8:*
+ test? (
+ dev-java/guava:0
+ dev-java/mockito:4
+ )
+"
+RDEPEND=">=virtual/jre-1.8:*"
+
+PATCHES=(
+ "${FILESDIR}/protobuf-java-3.23.0-unittest_retention.proto.patch"
+)
+
+JAVA_AUTOMATIC_MODULE_NAME="com.google.protobuf"
+JAVA_JAR_FILENAME="protobuf.jar"
+JAVA_RESOURCE_DIRS="java/core/src/main/resources"
+JAVA_SRC_DIR="java/core/src/main/java"
+
+JAVA_TEST_GENTOO_CLASSPATH="guava,junit-4,mockito-4"
+JAVA_TEST_SRC_DIR="java/core/src/test/java"
+
+run-protoc() {
+ if use system-protoc; then
+ protoc $1
+ else
+ "${BUILD_DIR}"/protoc $1
+ fi
+}
+
+src_prepare() {
+ # If the corrsponding version of system-protoc is not available we build protoc locally
+ if use system-protoc; then
+ default # apply patches
+ else
+ cmake_src_prepare
+ fi
+ java-pkg-2_src_prepare
+
+ mkdir "${JAVA_RESOURCE_DIRS}" || die
+ # https://github.com/protocolbuffers/protobuf/blob/v23.3/java/core/pom.xml#L43-L62
+ PROTOS=( $(sed \
+ -n '/google\/protobuf.*\.proto/s:.*<include>\(.*\)</include>:\1:p' \
+ "${S}/java/core/pom.xml") ) || die
+ pushd src > /dev/null || die
+ cp --parents -v "${PROTOS[@]}" ../"${JAVA_RESOURCE_DIRS}" || die
+ popd > /dev/null || die
+
+ # https://github.com/protocolbuffers/protobuf/blob/v23.3/java/core/generate-sources-build.xml
+ einfo "Replace variables in generate-sources-build.xml"
+ sed \
+ -e 's:${generated.sources.dir}:java/core/src/main/java:' \
+ -e 's:${protobuf.source.dir}:src:' \
+ -e 's:^.*value="::' -e 's:\"/>::' \
+ -e '/project\|echo\|mkdir\|exec/d' \
+ -i java/core/generate-sources-build.xml || die "sed to sources failed"
+
+ # https://github.com/protocolbuffers/protobuf/blob/v23.3/java/core/generate-test-sources-build.xml
+ einfo "Replace variables in generate-test-sources-build.xml"
+ sed \
+ -e 's:${generated.testsources.dir}:java/core/src/test/java:' \
+ -e 's:${protobuf.source.dir}:src:' \
+ -e 's:${test.proto.dir}:java/core/src/test/proto:' \
+ -e 's:^.*value="::' -e 's:\"/>::' \
+ -e '/project\|mkdir\|exec\|Also generate/d' \
+ -i java/core/generate-test-sources-build.xml || die "sed to test sources failed"
+
+ # Split the file in two parts, one for each run-protoc call
+ awk '/--java_out/{x="test-sources-build-"++i;}{print > x;}' \
+ java/core/generate-test-sources-build.xml || die
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -Dprotobuf_BUILD_TESTS=OFF
+ -Dprotobuf_ABSL_PROVIDER=package
+ )
+ if use system-protoc; then
+ :
+ else
+ cmake_src_configure
+ fi
+}
+
+src_compile() {
+ if use system-protoc; then
+ :
+ else
+ cmake_src_compile
+ fi
+
+ einfo "Run protoc to generate sources"
+ run-protoc \
+ @java/core/generate-sources-build.xml \
+ || die "protoc sources failed"
+
+ java-pkg-simple_src_compile
+}
+
+src_test() {
+ # https://github.com/protocolbuffers/protobuf/blob/v23.3/java/core/pom.xml#L63-L71
+ jar cvf testdata.jar \
+ -C src google/protobuf/testdata/golden_message_oneof_implemented \
+ -C src google/protobuf/testdata/golden_packed_fields_message || die
+
+ JAVA_GENTOO_CLASSPATH_EXTRA="${DISTDIR}/truth-1.1.3.jar:testdata.jar"
+
+ einfo "Running protoc on first part of generate-test-sources-build.xml"
+ run-protoc @test-sources-build-1 \
+ || die "run-protoc test-sources-build-1 failed"
+
+ einfo "Running protoc on second part of generate-test-sources-build.xml"
+ run-protoc @test-sources-build-2 \
+ || die "run-protoc test-sources-build-2 failed"
+
+ einfo "Running tests"
+ # Invalid test class 'map_test.MapInitializationOrderTest':
+ # 1. Test class should have exactly one public constructor
+ # Invalid test class 'protobuf_unittest.CachedFieldSizeTest':
+ # 1. Test class should have exactly one public constructor
+ pushd "${JAVA_TEST_SRC_DIR}" || die
+ local JAVA_TEST_RUN_ONLY=$(find * \
+ -path "**/*Test.java" \
+ ! -path "**/Abstract*Test.java" \
+ ! -name "MapInitializationOrderTest.java" \
+ ! -path '*protobuf_unittest/CachedFieldSizeTest.java'
+ )
+ popd
+ JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}"
+ JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}"
+ java-pkg-simple_src_test
+}
+
+src_install() {
+ java-pkg-simple_src_install
+}
diff --git a/dev-java/protobuf-java/protobuf-java-3.24.2.ebuild b/dev-java/protobuf-java/protobuf-java-3.25.1.ebuild
index cbedc3f3e508..2c2fc51fb3b6 100644
--- a/dev-java/protobuf-java/protobuf-java-3.24.2.ebuild
+++ b/dev-java/protobuf-java/protobuf-java-3.25.1.ebuild
@@ -4,7 +4,7 @@
EAPI=8
JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="com.google.protobuf:protobuf-java:3.24.2"
+MAVEN_ID="com.google.protobuf:protobuf-java:${PV}"
JAVA_TESTING_FRAMEWORKS="junit-4"
inherit java-pkg-2 java-pkg-simple cmake
@@ -12,7 +12,7 @@ inherit java-pkg-2 java-pkg-simple cmake
DESCRIPTION="Core Protocol Buffers library"
HOMEPAGE="https://protobuf.dev"
# Currently we bundle the binary version of truth.jar used only for tests, we don't install it.
-# And we build artifact 3.24.0 from the 24.0 tarball in order to allow sharing the tarball with
+# And we build artifact 3.25.1 from the 25.1 tarball in order to allow sharing the tarball with
# dev-libs/protobuf.
MY_PV3="${PV#3.}"
MY_PV="${MY_PV3/_rc/-rc}"
@@ -25,20 +25,19 @@ SLOT="0"
KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
IUSE="system-protoc"
+BDEPEND="
+ system-protoc? ( ~dev-libs/protobuf-${MY_PV3}:0 )
+ !system-protoc? ( >=dev-cpp/abseil-cpp-20230802.0 )
+"
DEPEND="
>=virtual/jdk-1.8:*
test? (
dev-java/guava:0
dev-java/mockito:4
- )
+ )
"
RDEPEND=">=virtual/jre-1.8:*"
-BDEPEND="
- system-protoc? ( ~dev-libs/protobuf-${MY_PV3}:0 )
- !system-protoc? ( >=dev-cpp/abseil-cpp-20230125.3 )
-"
-
PATCHES=(
"${FILESDIR}/protobuf-java-3.23.0-unittest_retention.proto.patch"
)
@@ -69,7 +68,7 @@ src_prepare() {
java-pkg-2_src_prepare
mkdir "${JAVA_RESOURCE_DIRS}" || die
- # https://github.com/protocolbuffers/protobuf/blob/v24.2/java/core/pom.xml#L43-L62
+ # https://github.com/protocolbuffers/protobuf/blob/v25.1/java/core/pom.xml#L43-L62
PROTOS=( $(sed \
-n '/google\/protobuf.*\.proto/s:.*<include>\(.*\)</include>:\1:p' \
"${S}/java/core/pom.xml") ) || die
@@ -77,7 +76,7 @@ src_prepare() {
cp --parents -v "${PROTOS[@]}" ../"${JAVA_RESOURCE_DIRS}" || die
popd > /dev/null || die
- # https://github.com/protocolbuffers/protobuf/blob/v24.2/java/core/generate-sources-build.xml
+ # https://github.com/protocolbuffers/protobuf/blob/v25.1/java/core/generate-sources-build.xml
einfo "Replace variables in generate-sources-build.xml"
sed \
-e 's:${generated.sources.dir}:java/core/src/main/java:' \
@@ -86,7 +85,7 @@ src_prepare() {
-e '/project\|echo\|mkdir\|exec/d' \
-i java/core/generate-sources-build.xml || die "sed to sources failed"
- # https://github.com/protocolbuffers/protobuf/blob/v24.2/java/core/generate-test-sources-build.xml
+ # https://github.com/protocolbuffers/protobuf/blob/v25.1/java/core/generate-test-sources-build.xml
einfo "Replace variables in generate-test-sources-build.xml"
sed \
-e 's:${generated.testsources.dir}:java/core/src/test/java:' \
@@ -129,7 +128,7 @@ src_compile() {
}
src_test() {
- # https://github.com/protocolbuffers/protobuf/blob/v24.2/java/core/pom.xml#L63-L71
+ # https://github.com/protocolbuffers/protobuf/blob/v25.1/java/core/pom.xml#L63-L71
jar cvf testdata.jar \
-C src google/protobuf/testdata/golden_message_oneof_implemented \
-C src google/protobuf/testdata/golden_packed_fields_message || die
diff --git a/dev-java/protobuf-java/protobuf-java-3.25.2.ebuild b/dev-java/protobuf-java/protobuf-java-3.25.2.ebuild
new file mode 100644
index 000000000000..5276064d1543
--- /dev/null
+++ b/dev-java/protobuf-java/protobuf-java-3.25.2.ebuild
@@ -0,0 +1,166 @@
+# Copyright 2008-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="com.google.protobuf:protobuf-java:${PV}"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple cmake
+
+DESCRIPTION="Core Protocol Buffers library"
+HOMEPAGE="https://protobuf.dev"
+# Currently we bundle the binary version of truth.jar used only for tests, we don't install it.
+# And we build artifact 3.25.2 from the 25.2 tarball in order to allow sharing the tarball with
+# dev-libs/protobuf.
+MY_PV3="${PV#3.}"
+MY_PV="${MY_PV3/_rc/-rc}"
+SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${MY_PV}.tar.gz -> protobuf-${MY_PV}.tar.gz
+ test? ( https://repo1.maven.org/maven2/com/google/truth/truth/1.1.3/truth-1.1.3.jar )"
+S="${WORKDIR}/protobuf-${MY_PV}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+IUSE="system-protoc"
+
+BDEPEND="
+ system-protoc? ( ~dev-libs/protobuf-${MY_PV3}:0 )
+ !system-protoc? ( >=dev-cpp/abseil-cpp-20230802.0 )
+"
+DEPEND="
+ >=virtual/jdk-1.8:*
+ test? (
+ dev-java/guava:0
+ dev-java/mockito:4
+ )
+"
+RDEPEND=">=virtual/jre-1.8:*"
+
+PATCHES=(
+ "${FILESDIR}/protobuf-java-3.23.0-unittest_retention.proto.patch"
+)
+
+JAVA_AUTOMATIC_MODULE_NAME="com.google.protobuf"
+JAVA_JAR_FILENAME="protobuf.jar"
+JAVA_RESOURCE_DIRS="java/core/src/main/resources"
+JAVA_SRC_DIR="java/core/src/main/java"
+
+JAVA_TEST_GENTOO_CLASSPATH="guava,junit-4,mockito-4"
+JAVA_TEST_SRC_DIR="java/core/src/test/java"
+
+run-protoc() {
+ if use system-protoc; then
+ protoc $1
+ else
+ "${BUILD_DIR}"/protoc $1
+ fi
+}
+
+src_prepare() {
+ # If the corrsponding version of system-protoc is not available we build protoc locally
+ if use system-protoc; then
+ default # apply patches
+ else
+ cmake_src_prepare
+ fi
+ java-pkg-2_src_prepare
+
+ mkdir "${JAVA_RESOURCE_DIRS}" || die
+ # https://github.com/protocolbuffers/protobuf/blob/v25.2/java/core/pom.xml#L43-L62
+ PROTOS=( $(sed \
+ -n '/google\/protobuf.*\.proto/s:.*<include>\(.*\)</include>:\1:p' \
+ "${S}/java/core/pom.xml") ) || die
+ pushd src > /dev/null || die
+ cp --parents -v "${PROTOS[@]}" ../"${JAVA_RESOURCE_DIRS}" || die
+ popd > /dev/null || die
+
+ # https://github.com/protocolbuffers/protobuf/blob/v25.2/java/core/generate-sources-build.xml
+ einfo "Replace variables in generate-sources-build.xml"
+ sed \
+ -e 's:${generated.sources.dir}:java/core/src/main/java:' \
+ -e 's:${protobuf.source.dir}:src:' \
+ -e 's:^.*value="::' -e 's:\"/>::' \
+ -e '/project\|echo\|mkdir\|exec/d' \
+ -i java/core/generate-sources-build.xml || die "sed to sources failed"
+
+ # https://github.com/protocolbuffers/protobuf/blob/v25.2/java/core/generate-test-sources-build.xml
+ einfo "Replace variables in generate-test-sources-build.xml"
+ sed \
+ -e 's:${generated.testsources.dir}:java/core/src/test/java:' \
+ -e 's:${protobuf.source.dir}:src:' \
+ -e 's:${test.proto.dir}:java/core/src/test/proto:' \
+ -e 's:^.*value="::' -e 's:\"/>::' \
+ -e '/project\|mkdir\|exec\|Also generate/d' \
+ -i java/core/generate-test-sources-build.xml || die "sed to test sources failed"
+
+ # Split the file in two parts, one for each run-protoc call
+ awk '/--java_out/{x="test-sources-build-"++i;}{print > x;}' \
+ java/core/generate-test-sources-build.xml || die
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -Dprotobuf_BUILD_TESTS=OFF
+ -Dprotobuf_ABSL_PROVIDER=package
+ )
+ if use system-protoc; then
+ :
+ else
+ cmake_src_configure
+ fi
+}
+
+src_compile() {
+ if use system-protoc; then
+ :
+ else
+ cmake_src_compile
+ fi
+
+ einfo "Run protoc to generate sources"
+ run-protoc \
+ @java/core/generate-sources-build.xml \
+ || die "protoc sources failed"
+
+ java-pkg-simple_src_compile
+}
+
+src_test() {
+ # https://github.com/protocolbuffers/protobuf/blob/v25.2/java/core/pom.xml#L63-L71
+ jar cvf testdata.jar \
+ -C src google/protobuf/testdata/golden_message_oneof_implemented \
+ -C src google/protobuf/testdata/golden_packed_fields_message || die
+
+ JAVA_GENTOO_CLASSPATH_EXTRA="${DISTDIR}/truth-1.1.3.jar:testdata.jar"
+
+ einfo "Running protoc on first part of generate-test-sources-build.xml"
+ run-protoc @test-sources-build-1 \
+ || die "run-protoc test-sources-build-1 failed"
+
+ einfo "Running protoc on second part of generate-test-sources-build.xml"
+ run-protoc @test-sources-build-2 \
+ || die "run-protoc test-sources-build-2 failed"
+
+ einfo "Running tests"
+ # Invalid test class 'map_test.MapInitializationOrderTest':
+ # 1. Test class should have exactly one public constructor
+ # Invalid test class 'protobuf_unittest.CachedFieldSizeTest':
+ # 1. Test class should have exactly one public constructor
+ pushd "${JAVA_TEST_SRC_DIR}" || die
+ local JAVA_TEST_RUN_ONLY=$(find * \
+ -path "**/*Test.java" \
+ ! -path "**/Abstract*Test.java" \
+ ! -name "MapInitializationOrderTest.java" \
+ ! -path '*protobuf_unittest/CachedFieldSizeTest.java'
+ )
+ popd
+ JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}"
+ JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}"
+ java-pkg-simple_src_test
+}
+
+src_install() {
+ java-pkg-simple_src_install
+}
diff --git a/dev-java/relaxng-datatype/Manifest b/dev-java/relaxng-datatype/Manifest
index d03c886f2cbc..826bed701f04 100644
--- a/dev-java/relaxng-datatype/Manifest
+++ b/dev-java/relaxng-datatype/Manifest
@@ -1,2 +1 @@
-DIST relaxng-datatype-1.0.zip 74033 BLAKE2B 15b488e914cab28fb9ade71b491d961ffa4f683f66759e96cd53dcf69edd39d423b5562831698bb3e03191396c86a2a93369f14d278f3c55a90728031d1921d3 SHA512 712b99209e927e8929c46797cf3733993cc2740bfbafb458c518e5e130a7860a19dee45acd360a9d7179137f9340c3edeb514cacf501233cca515b38e60d6b79
DIST relaxngDatatype-20020414-sources.jar 11666 BLAKE2B b2505d61dc36a12d7b31ad84db6813dbfac04aedd6805568103a310ee88586995cc98dbeecc38744bd767f8dd2ced5257400365aaab859b05676949abd187316 SHA512 6d3335d08b620a1b5d401871b1e92dbbea6b9d954e5c7eba1a4f535afe8c6ddf51a5f07db69805409525f4dfdbe34d13cc3392acd8e7e16b100f7e708cee0380
diff --git a/dev-java/relaxng-datatype/relaxng-datatype-1.0-r3.ebuild b/dev-java/relaxng-datatype/relaxng-datatype-1.0-r3.ebuild
deleted file mode 100644
index 5d093ae064b9..000000000000
--- a/dev-java/relaxng-datatype/relaxng-datatype-1.0-r3.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source"
-
-MY_PN="relaxngDatatype"
-MY_P="${MY_PN}-${PV}"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Interface between RELAX NG validators and datatype libraries"
-HOMEPAGE="https://relaxng.org/"
-SRC_URI="mirror://sourceforge/relaxng/${MY_P}.zip -> ${P}.zip"
-
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-LICENSE="BSD"
-SLOT="0"
-
-DEPEND=">=virtual/jdk-1.8:*"
-RDEPEND=">=virtual/jre-1.8:*"
-BDEPEND="app-arch/unzip"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
- default
- java-pkg_clean
-}
-
-src_install() {
- java-pkg-simple_src_install
- einstalldocs
-}
diff --git a/dev-java/saxon/saxon-9.2.0.6-r3.ebuild b/dev-java/saxon/saxon-9.2.0.6-r3.ebuild
index 54b7feedaeb0..f1e4921e2821 100644
--- a/dev-java/saxon/saxon-9.2.0.6-r3.ebuild
+++ b/dev-java/saxon/saxon-9.2.0.6-r3.ebuild
@@ -16,10 +16,11 @@ SLOT="9"
KEYWORDS="amd64 ~arm arm64 ppc64 x86"
CDEPEND="
- dev-java/xom:0
- dev-java/jdom:0
+ dev-java/ant-core:0
dev-java/dom4j:1
- dev-java/ant-core"
+ dev-java/jdom:0
+ dev-java/xom:0
+"
RDEPEND="
${CDEPEND}
diff --git a/dev-java/sbt/metadata.xml b/dev-java/sbt/metadata.xml
index 1f19867ca177..feefedbb43eb 100644
--- a/dev-java/sbt/metadata.xml
+++ b/dev-java/sbt/metadata.xml
@@ -1,9 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer type="person">
- <email>gienah@gentoo.org</email>
-</maintainer>
+<!-- maintainer-needed -->
<longdescription lang="en">
The interactive build tool.
Use Scala to define your tasks. Then run them in parallel from the shell.
diff --git a/dev-java/scala-cli-bin/Manifest b/dev-java/scala-cli-bin/Manifest
index 8b1096cfe80b..72bdd1c4d8da 100644
--- a/dev-java/scala-cli-bin/Manifest
+++ b/dev-java/scala-cli-bin/Manifest
@@ -1,6 +1,9 @@
-DIST scala-cli-amd64-1.0.2.gz 33215510 BLAKE2B 288475cbd346260423188b4db038dd8cce2f5885bf0346e8a74b08cd02a2c44204fec37aaf6207ff6447beb4740df725bae6a0a129682ebedc1028ae5f0ec316 SHA512 ac18b43bd37717b2aab6b1056b727aba40f57eed33d1fc5f1903c3729f0344ed30ed595f2a60bff2c65ee3a6d4439e8ee4bcf95fc38baf059d4a66de9696cded
DIST scala-cli-amd64-1.0.4.gz 33291617 BLAKE2B bd97626e7e95fb6b2a82fd424673078b89f5f4270087c667193e4de1ceff614076e73b728ba1f0334d5f9d7aa6f52c660487d52bf8fb49a786f7fe4ce18a0428 SHA512 447acafd47041cd173a06b5d113cd30adee76a2c161b2efc98b8ece60082d5b98189fd9b3da1f048061d306343cacb9b67566daa78ce8fe54dc82dd90a1e34bc
-DIST scala-cli-arm64-1.0.2.gz 33058672 BLAKE2B a82b18eec6235100cbbd7ff1503283e5ef29ba0798f67b44f69b329aa0f1f525cc910a7b4a923f98c8b113d06bac6e1c5ba963d62204462635ef4eed3d0b7f85 SHA512 b1dc9de26d30336f283202aa23ba1c76baddcea21d4c8c4c0e5114de979c62ba3e2b483302d4f396c84e802497127a36d589dae2826f76e1d02760314f6f0765
+DIST scala-cli-amd64-1.1.0.gz 33673708 BLAKE2B 332f5a974949af49914de8fdb3129b0937fbce842616d6fefe16f7aff89baf6be1ba536d0ee6ff9bc1dd2b5ebfa51943bd0c6279ef83b95bd25a337530fa1295 SHA512 ba7ebb321a27e95f786027257c3f50dac1d12e0cc33abde24dc7c5dffb2f57a11c3ea67d92ed487968c49ff9ec3eaf5d1d62065beda5b6fa373d09b9126f4529
+DIST scala-cli-amd64-1.1.1.gz 33754319 BLAKE2B 91fb5e9b828a2c6c6dd984b421bb101ea1ae03c85d94eda14ba79433d29a88cb2850cb376c212f677c1b8167a0a21b320aeb0e4e63a29e6c8502d76babc1543d SHA512 1e0cd5eee280e208090961e4b6d216d472fef360f13e0f4e28412b9a52883d65c97e3fe70c8ce5cf96e6cd866f14b175454175be9df3bdc5c229fb2f121c925a
DIST scala-cli-arm64-1.0.4.gz 33185346 BLAKE2B 2b0131a56ed3f67fb5d5f25db6c511dc7d9e9128089e6826fa7d859b1457f03a99e290cc63f185820ea849a857f40d667d5db7a378dabcf545cdcdefded6a577 SHA512 3ff1c025a1035aa6a8550de17e85bc5c483007d5f07f03e0d792d6dc9ed1b18eb26909b3c7195fde12056a3b84ffa69dc53c01ec21b34187c1d7188a0a023aaa
-DIST scala-cli-non-native-1.0.2 9633113 BLAKE2B d63fe324533393158ac945c3070843787c844584c3f8bdc141f6106fa22adf244c2ca5e010801c549b0a56ecf500495c754ed9e6186f74359b373c4d776645ff SHA512 c6e6262af236a315960a3d16dfebc7adaf88f830d43e68f89220f2cf250d57d083bd2b9231fd13a0b3adc723ed17200592b55a2a17ccd582b9cc3ceebf52a29b
+DIST scala-cli-arm64-1.1.0.gz 33575885 BLAKE2B ebccbe86044b4708a356060a16f06bb94df01d261ab7dabe8eba8e644c121864cdee99debf95468d936cbff670413ec47e1ef903a9071b267a61c5fe46738c1a SHA512 6a85529be06a8d43d729c5a795bb0dcdb2680bd7ef3de471fee908e91249401262e8322019c640d4eb45d0a15ed0073ff51b24d61846228f46c36bfb48731408
+DIST scala-cli-arm64-1.1.1.gz 33656505 BLAKE2B b943f370c9375fec5cec3c63628ecd9e416b569ec2d692422f217b2506c104a1c3bb415569581d68c9476bf892b4a087e7b95b2310955dd0f9af52edc90af2e9 SHA512 79836261613bafe4710c1d904ec39e88c1862b3021f7b37ac5004c6079c762e68550522fbb7240e48e7408f844f648ab92c12cb568ebc63bb3e01f1992a7eaf3
DIST scala-cli-non-native-1.0.4 7553232 BLAKE2B 9299b20dddec80d12e738af4b283e816de5bae23262510146cd33a9b175f2a343f52932fbd3254974bd4219d2903f32772409f234423d3a027b6b0f02268e584 SHA512 4e5281ef7f8a886ad79746477d852f485ccad317568a64ee513e691dcd9a9121c2aed51f6170b959f0226fb81efe9aa1f8ecf1d94a84a0b387c349adfb756762
+DIST scala-cli-non-native-1.1.0 7728727 BLAKE2B 05deb93b91029721a21bac729aa9b370e05909e67bbade921e00d09c3a37e851e519188bff73dc614c3f5768834ae56f94623347735e756a6bcb0c4c81c8713c SHA512 13e426915794df757b6eb029d2545316bd9f4b9ba6f58cf59a546227d6997741cf681ce0c5e721e8e95cb9e420702f2d28f004df1780637dc9b39fd3bc4c884a
+DIST scala-cli-non-native-1.1.1 7779964 BLAKE2B 08849ce4a6fbf1e6eb2e4fafd2e29522e535c0795d6f1acbcd25ec4523d14dcae4a746f3729786db8f62a3770e6fdbd78a76477b182b32945454ac19a2f8217c SHA512 61c2a1a325f83e19102cd2f5d6b89d37b9914d64f86da6218258f064a6a8e5ab927d28b278363316446611e2cbdc8e4687616ea2b001da00ecbafb4207eabeb2
diff --git a/dev-java/scala-cli-bin/metadata.xml b/dev-java/scala-cli-bin/metadata.xml
index c4efbfd85748..27dc5e6617c8 100644
--- a/dev-java/scala-cli-bin/metadata.xml
+++ b/dev-java/scala-cli-bin/metadata.xml
@@ -6,6 +6,7 @@
<name>Florian Schmaus</name>
</maintainer>
<upstream>
+ <changelog>https://github.com/VirtusLab/scala-cli/releases</changelog>
<remote-id type="github">VirtusLab/scala-cli</remote-id>
<bugs-to>https://github.com/VirtusLab/scala-cli/issues</bugs-to>
</upstream>
diff --git a/dev-java/scala-cli-bin/scala-cli-bin-1.0.2.ebuild b/dev-java/scala-cli-bin/scala-cli-bin-1.1.0.ebuild
index 67f4eefef2f4..d73c7e68ad79 100644
--- a/dev-java/scala-cli-bin/scala-cli-bin-1.0.2.ebuild
+++ b/dev-java/scala-cli-bin/scala-cli-bin-1.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
diff --git a/dev-java/scala-cli-bin/scala-cli-bin-1.1.1.ebuild b/dev-java/scala-cli-bin/scala-cli-bin-1.1.1.ebuild
new file mode 100644
index 000000000000..dc0659cfd5ec
--- /dev/null
+++ b/dev-java/scala-cli-bin/scala-cli-bin-1.1.1.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit bash-completion-r1
+
+UPSTREAM_PV=${PV/_/-}
+UPSTREAM_PV=${UPSTREAM_PV/rc/RC}
+
+DESCRIPTION="CLI to interact with Scala and Java"
+HOMEPAGE="https://scala-cli.virtuslab.org/"
+SRC_URI="
+ !amd64? ( !arm64? (
+ https://github.com/VirtusLab/scala-cli/releases/download/v${UPSTREAM_PV}/scala-cli
+ -> scala-cli-non-native-${UPSTREAM_PV}
+ ) )
+ amd64? (
+ https://github.com/VirtusLab/scala-cli/releases/download/v${UPSTREAM_PV}/scala-cli-x86_64-pc-linux.gz
+ -> scala-cli-amd64-${UPSTREAM_PV}.gz
+ )
+ arm64? (
+ https://github.com/VirtusLab/scala-cli/releases/download/v${UPSTREAM_PV}/scala-cli-aarch64-pc-linux.gz
+ -> scala-cli-arm64-${UPSTREAM_PV}.gz
+ )
+"
+
+KEYWORDS="~amd64 ~arm64"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+S="${WORKDIR}"
+
+# A JRE is not strictly required if native images of scala-cli are used
+# (amd64, arm64). However we may want a system JRE anyway, and having JRE
+# in RDEPEND reduces the chances that scala-cli needs to install one
+# for the user.
+RDEPEND="
+ >=virtual/jre-11
+ sys-libs/zlib
+"
+BDEPEND="!amd64? ( !arm64? ( >=virtual/jre-11 ) )"
+
+QA_TEXTRELS="*"
+QA_FLAGS_IGNORED="/usr/bin/scala-cli"
+
+src_prepare() {
+ default
+
+ if use amd64; then
+ mv scala-cli-amd64-${UPSTREAM_PV} scala-cli || die
+ elif use arm64; then
+ mv scala-cli-arm64-${UPSTREAM_PV} scala-cli || die
+ else
+ mv scala-cli-non-native-${UPSTREAM_PV} scala-cli || die
+ fi
+
+ chmod +x scala-cli || die
+}
+
+src_compile() {
+ for shell in bash zsh; do
+ ./scala-cli install-completions \
+ --shell ${shell} \
+ --env \
+ --output "${S}" \
+ > ${shell}-completion || die
+ done
+}
+
+src_install() {
+ dobin scala-cli
+
+ newbashcomp bash-completion scala-cli
+
+ insinto /usr/share/zsh/site-functions
+ doins zsh/_scala-cli
+}
diff --git a/dev-java/scram/Manifest b/dev-java/scram/Manifest
index 42494f4d9f77..5ba3c94824d5 100644
--- a/dev-java/scram/Manifest
+++ b/dev-java/scram/Manifest
@@ -1 +1 @@
-DIST scram-2.1.tar.gz 64263 BLAKE2B 59b71ee0faa32d2478e38e4275b7c83efb3f7a3ede0c068a8c0a6fe970248d22b539c50b97127b1b757839758d119b395fedd85d85425bd019e0972c2df20ef4 SHA512 e0757b306db03c56f03fa0907e46693337854c152a321cae1b109a1c16b0cb5be2482a92d64a420432a3ea31371990cbac444f965abde89c04083005b30012ef
+DIST scram-2.1.tar.bz2 52442 BLAKE2B e9ec2367251770c4adb3d4bf62702c8ca13264fd12270dfb4f138c740536eb508a383486a81e1ab2bb0f8d4792642d033180c0e43ac287917543249fd16c8a76 SHA512 e2807d2c4b7984b5d9f53cb5ea6f9b2c2d5b48b5e695f25fb775cb3f22672851a9299cfe95912f109205c74817cf9f2fd706f8d49e473257e2571f409ec34044
diff --git a/dev-java/scram/metadata.xml b/dev-java/scram/metadata.xml
index 75321cfb5598..0feb6155dbc1 100644
--- a/dev-java/scram/metadata.xml
+++ b/dev-java/scram/metadata.xml
@@ -4,4 +4,7 @@
<maintainer type="project">
<email>java@gentoo.org</email>
</maintainer>
+ <upstream>
+ <remote-id type="gitlab">ongresinc/scram</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-java/scram/scram-2.1.ebuild b/dev-java/scram/scram-2.1.ebuild
index c29fd451b086..6e7eeccf9430 100644
--- a/dev-java/scram/scram-2.1.ebuild
+++ b/dev-java/scram/scram-2.1.ebuild
@@ -1,9 +1,6 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom common/pom.xml --download-uri https://gitlab.com/ongresinc/scram/-/archive/2.1/scram-2.1.tar.gz --slot 0 --keywords "~amd64 ~ppc64 ~x86" --ebuild scram-2.1.ebuild
-
EAPI=8
JAVA_PKG_IUSE="doc source test"
@@ -14,43 +11,36 @@ inherit java-pkg-2 java-pkg-simple
DESCRIPTION="Java Implementation of the Salted Challenge Response Authentication Mechanism"
HOMEPAGE="https://gitlab.com/ongresinc/scram"
-SRC_URI="https://gitlab.com/ongresinc/${PN}/-/archive/${PV}/${P}.tar.gz"
+SRC_URI="https://gitlab.com/ongresinc/${PN}/-/archive/${PV}/${P}.tar.bz2"
+S="${WORKDIR}/${P}"
LICENSE="BSD"
SLOT="0"
KEYWORDS="amd64 ppc64 x86"
-# Common dependencies
-# POM: common/pom.xml
-# com.ongres.stringprep:saslprep:1.1 -> >=dev-java/stringprep-2.0:0
-
-CP_DEPEND="
- dev-java/saslprep:0
-"
-
-# Compile dependencies
-# POM: common/pom.xml
-# com.google.code.findbugs:annotations:3.0.1 -> !!!artifactId-not-found!!!
-# com.google.code.findbugs:jsr305:3.0.1 -> >=dev-java/jsr305-3.0.2:0
-# POM: common/pom.xml
-# test? junit:junit:4.12 -> >=dev-java/junit-4.13.2:4
+CP_DEPEND="dev-java/saslprep:0"
-DEPEND="
- >=virtual/jdk-1.8:*
- ${CP_DEPEND}
+DEPEND="${CP_DEPEND}
dev-java/findbugs-annotations:0
dev-java/jsr305:0
+ >=virtual/jdk-1.8:*
test? ( dev-java/stringprep:0 )
"
-RDEPEND="
+RDEPEND="${CP_DEPEND}
>=virtual/jre-1.8:*
- ${CP_DEPEND}"
+"
DOCS=( CHANGELOG NOTICE README.md )
-S="${WORKDIR}/${P}"
-
+JAVADOC_CLASSPATH="
+ findbugs-annotations
+ saslprep
+"
+JAVADOC_SRC_DIRS=(
+ "common/src/main/java"
+ "client/src/main/java"
+)
JAVA_CLASSPATH_EXTRA="findbugs-annotations,jsr305"
JAVA_TEST_GENTOO_CLASSPATH="junit-4,stringprep"
@@ -69,21 +59,11 @@ src_compile() {
JAVA_GENTOO_CLASSPATH_EXTRA+=":client.jar"
rm -r target || die
- if use doc; then
- einfo "Compiling javadocs"
- JAVA_SRC_DIR=(
- "common/src/main/java"
- "client/src/main/java"
- )
- JAVA_JAR_FILENAME="ignoreme.jar"
- java-pkg-simple_src_compile
- fi
+ use doc && ejavadoc
}
src_test() {
- einfo "Testing module common"
- JAVA_TEST_SRC_DIR="common/src/test/java"
- java-pkg-simple_src_test
+ cp -r {common,client}/src/test/java || die
einfo "Testing module cwclientcommon"
JAVA_TEST_SRC_DIR="client/src/test/java"
@@ -91,12 +71,9 @@ src_test() {
}
src_install() {
- default
+ JAVA_JAR_FILENAME="client.jar"
+ java-pkg-simple_src_install
java-pkg_dojar "common.jar"
- java-pkg_dojar "client.jar"
- if use doc; then
- java-pkg_dojavadoc target/api
- fi
if use source; then
java-pkg_dosrc "common/src/main/java/*"
java-pkg_dosrc "client/src/main/java/*"
diff --git a/dev-java/snappy/files/1.1.7.8-unbundle-snappy.patch b/dev-java/snappy/files/1.1.7.8-unbundle-snappy.patch
deleted file mode 100644
index 6113019be3ea..000000000000
--- a/dev-java/snappy/files/1.1.7.8-unbundle-snappy.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 0821c87..04f0435 100644
---- a/Makefile
-+++ b/Makefile
-@@ -8,7 +8,8 @@
-
- SNAPPY_OUT:=$(TARGET)/snappy-$(SNAPPY_VERSION)-$(os_arch)
- SNAPPY_ARCHIVE:=$(TARGET)/snappy-$(SNAPPY_VERSION).tar.gz
--SNAPPY_CC:=snappy-sinksource.cc snappy-stubs-internal.cc snappy.cc
-+#SNAPPY_CC:=snappy-sinksource.cc snappy-stubs-internal.cc snappy.cc
-+SNAPPY_CC:=
- SNAPPY_SRC_DIR:=$(TARGET)/snappy-$(SNAPPY_VERSION)
- SNAPPY_SRC:=$(addprefix $(SNAPPY_SRC_DIR)/,$(SNAPPY_CC))
- SNAPPY_GIT_REPO_URL:=https://github.com/google/snappy
-@@ -100,7 +101,8 @@
-
- $(SRC)/org/xerial/snappy/BitShuffleNative.h: $(TARGET)/jni-classes/org/xerial/snappy/BitShuffleNative.class
-
--$(SNAPPY_SRC): $(SNAPPY_GIT_UNPACKED)
-+$(SNAPPY_SRC):
-+# $(SNAPPY_GIT_UNPACKED)
-
- # aarch64 can use big-endian optimzied code
- ifeq ($(OS_ARCH),aarch64)
-@@ -122,7 +124,7 @@
- $(CXX) $(CXXFLAGS) -c $< -o $@
-
- $(SNAPPY_OUT)/$(LIBNAME): $(SNAPPY_OBJ)
-- $(CXX) $(CXXFLAGS) -o $@ $+ $(LINKFLAGS)
-+ $(CXX) $(CXXFLAGS) -o $@ $+ $(LINKFLAGS) -lsnappy
- # Workaround for strip Protocol error when using VirtualBox on Mac
- cp $@ /tmp/$(@F)
- $(STRIP) /tmp/$(@F)
-@@ -140,9 +142,9 @@
- #snappy-jar-version:=snappy-java-$(shell perl -npe "s/version in ThisBuild\s+:=\s+\"(.*)\"/\1/" version.sbt | sed -e "/^$$/d")
- snappy-jar-version:=snappy
-
--native: jni-header snappy-header $(NATIVE_DLL)
--native-nocmake: jni-header $(NATIVE_DLL)
--snappy: native $(TARGET)/$(snappy-jar-version).jar
-+native: $(NATIVE_DLL)
-+native-nocmake: $(NATIVE_DLL)
-+snappy: native
-
- native-all: native win32 win64 native-arm linux32 linux64 linux-ppc64le
-
-@@ -151,6 +153,7 @@
- cp $(SNAPPY_OUT)/$(LIBNAME) $@
- @mkdir -p $(NATIVE_TARGET_DIR)
- cp $(SNAPPY_OUT)/$(LIBNAME) $(NATIVE_TARGET_DIR)/$(LIBNAME)
-+ cp $< $(TARGET)/
-
- package: $(TARGET)/$(snappy-jar-version).jar
-
diff --git a/dev-java/snappy/snappy-1.1.10.5-r1.ebuild b/dev-java/snappy/snappy-1.1.10.5-r1.ebuild
new file mode 100644
index 000000000000..e62e034435de
--- /dev/null
+++ b/dev-java/snappy/snappy-1.1.10.5-r1.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.xerial.snappy:snappy-java:${PV}"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple toolchain-funcs check-reqs
+
+DESCRIPTION="Snappy compressor/decompressor for Java"
+HOMEPAGE="https://github.com/xerial/snappy-java/"
+# ::gentoo does not have hadoop-common packaged. Currently we bundle the binary version.
+# It's used for testing only and does not get installed.
+HCV="3.3.5"
+SRC_URI="https://github.com/xerial/snappy-java/archive/v${PV}.tar.gz -> ${P}.tar.gz
+ test? ( https://repo1.maven.org/maven2/org/apache/hadoop/hadoop-common/${HCV}/hadoop-common-${HCV}.jar )"
+S="${WORKDIR}/snappy-java-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="1.1"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 ~x86"
+
+CP_DEPEND="dev-java/osgi-core:0"
+
+CDEPEND="
+ app-arch/snappy
+ dev-libs/bitshuffle
+"
+
+DEPEND=">=virtual/jdk-1.8:*
+ ${CP_DEPEND}
+ ${CDEPEND}
+ test? (
+ >=dev-java/ant-1.10.14:0[junit4]
+ dev-java/commons-io:1
+ dev-java/commons-lang:3.6
+ dev-java/plexus-classworlds:0
+ dev-java/xerial-core:0
+ )"
+
+RDEPEND=">=virtual/jre-1.8:*
+ ${CP_DEPEND}
+ ${CDEPEND}"
+
+PATCHES=(
+ "${FILESDIR}/1.1.7.8-java-version-target.patch"
+ "${FILESDIR}/snappy-1.1.10.1-unbundle-snappy.patch"
+ "${FILESDIR}/1.1.7.8-unbundle-bitshuffle.patch"
+ "${FILESDIR}/1.1.7.8-gentoo.patch"
+ "${FILESDIR}/snappy-1.1.10.5-SnappyOutputStreamTest.patch"
+ "${FILESDIR}/snappy-1.1.10.1-commons-lang3.patch"
+)
+
+JAVA_RESOURCE_DIRS="src/main/resources"
+JAVA_SRC_DIR="src/main/java"
+
+JAVA_TEST_GENTOO_CLASSPATH="
+ commons-io-1
+ commons-lang-3.6
+ junit-4
+ plexus-classworlds
+ xerial-core
+"
+JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+JAVA_TEST_SRC_DIR="src/test/java"
+
+check_env() {
+ if use test; then
+ # this is needed only for tests
+ CHECKREQS_MEMORY="2560M"
+ check-reqs_pkg_pretend
+ fi
+}
+
+pkg_pretend() {
+ check_env
+}
+
+pkg_setup() {
+ check_env
+ java-pkg-2_pkg_setup
+}
+
+src_prepare() {
+ default
+ java-pkg-2_src_prepare
+ # remove pre-compiled sofiles
+ rm -r src/main/resources/org/xerial/snappy/native || die
+ rm -r src/test/resources/lib || die
+}
+
+src_compile() {
+ emake \
+ CXX="$(tc-getCXX)" \
+ JAVA_SOURCE="$(java-pkg_get-source)" \
+ JAVA_TARGET="$(java-pkg_get-target)"
+
+ java-pkg-simple_src_compile
+}
+
+src_test() {
+ JAVA_GENTOO_CLASSPATH_EXTRA="${DISTDIR}/hadoop-common-${HCV}.jar"
+ JAVA_TEST_EXTRA_ARGS=( -Xmx${CHECKREQS_MEMORY} )
+ local vm_version="$(java-config -g PROVIDES_VERSION)"
+ if ver_test "${vm_version}" -ge 17; then
+ java-pkg-simple_src_test
+ else
+ einfo "Tests need jdk-17 to pass."
+ fi
+}
+
+src_install() {
+ java-pkg-simple_src_install
+
+ local jniext=.so
+ if [[ ${CHOST} == *-darwin* ]] ; then
+ jniext=.jnilib
+ # avoid install_name check failure
+ install_name_tool -id "@loader_path/libsnappyjava${jniext}" \
+ "target/libsnappyjava${jniext}"
+ fi
+ java-pkg_doso "target/libsnappyjava${jniext}"
+}
diff --git a/dev-java/stringtemplate/Manifest b/dev-java/stringtemplate/Manifest
index 3e6c9904de13..99391fd2990b 100644
--- a/dev-java/stringtemplate/Manifest
+++ b/dev-java/stringtemplate/Manifest
@@ -1,3 +1,4 @@
-DIST ST4-4.3.2-sources.jar 198754 BLAKE2B 667953642ed2721d1a7c7e94d90a1f8690cfa9c31c391e9b5089f04c64728dac75edc9cd0e529607cad4c1b07abaf45719c2cbab9e962a5feef657b59c3baccc SHA512 7de339d34adf6b9207a23e8936092ea4fde78bf1faa63cee869673e91ba73d0fcbaa555602d0905c7347e894985613c63ff4ce04825decc34c896da5a687d42f
+DIST ST4-4.3.4-sources.jar 198780 BLAKE2B 25f9b4baf43075ddbc946933a517e8361f88d152c4caba29a88770ab229c1b40636ebc4ccdf52a2132d94974e0d81dd114e4018658d178a2c44228007450ab7d SHA512 83ff2e17659c37407b91c83e7fcd3b5d44b206f6fdaaf8034122a3c9490778aeb24ecf90778b9dc9d6836bc59a01d75bacce71e27aadb8a5fa22b9373f7f7878
+DIST ST4-4.3.4.tar.gz 436814 BLAKE2B 40aba1cb009b669ad00285b4cdffa66632c38267f42b6b973bdb0a2f57f3c46fc13d1a929ac4745c104d658f127a63081ed5dde4c813c10e60ce7df3490d3517 SHA512 5061663c3130a50b03aaf1800a04103afae7db59758bc7957914b07718e50a139c5d486f90098368500c46d3d751ea1659c63531126fb146fb77eaeb6e244ea2
+DIST stringtemplate-3.2.1-4-java21-compatibility.patch 1973 BLAKE2B b48891549f1d9a3386b0a44a78f453a7938122e5b0b5eeba98888bfa843aea4e5732b4dbcf6aac66272c9fe5aeb9ed98aabcf3edcd155f43d5ad0c1d4d4cdd57 SHA512 8dcf841affc0e7da006b13bf4c5d44fc5315aa4790926e8598650b519fd57a4c322e4292ba58561c921308697a4be1b8b6528931eb79e6a9f2e9f7d1370599cc
DIST stringtemplate-3.2.1.tar.gz 107877 BLAKE2B e099aaef047de12706ca4c771f28742dc48ec14a577b2384b32850e304b29284436b3c850846136cbd37481ff48cfb2fd5935d2de3aafa5c817ae24f62579435 SHA512 76203182302d42a0f79de7e8a22f44c59ddc5604761034e420b6973894e0ca1e6154cbcb322ec6f9a064ee89cc5f6478b775a716692c80c7f0c77566aa8a0e25
-DIST stringtemplate-4.3.2.tar.gz 437013 BLAKE2B 0fb0fd62314a1fa5045285966b28aaf8f18579261722c0383e4ec8b3198aff59fd0e9760dcd43d8ecddf795ce3b2a882f3f339ec56d117a4b5b22e9c2718d679 SHA512 d6150f86ce458b5c74d533016bc3168fad969fc1d814d01c5ad3be2f866f7aa531357a903565f31afa3ba62423acc760b7762865e0ee5dd3af4ea546f6be25e1
diff --git a/dev-java/stringtemplate/files/stringtemplate-3.2.1-TestStringTemplate.patch b/dev-java/stringtemplate/files/stringtemplate-3.2.1-TestStringTemplate.patch
new file mode 100644
index 000000000000..e12b3c63b26a
--- /dev/null
+++ b/dev-java/stringtemplate/files/stringtemplate-3.2.1-TestStringTemplate.patch
@@ -0,0 +1,11 @@
+https://bugs.gentoo.org/916571
+--- a/test/org/antlr/stringtemplate/test/TestStringTemplate.java
++++ b/test/org/antlr/stringtemplate/test/TestStringTemplate.java
+@@ -28,6 +28,7 @@
+ package org.antlr.stringtemplate.test;
+
+ import org.antlr.stringtemplate.*;
++import org.antlr.stringtemplate.StringTemplate;
+ import org.antlr.stringtemplate.language.AngleBracketTemplateLexer;
+ import org.antlr.stringtemplate.language.DefaultTemplateLexer;
+ import org.junit.Test;
diff --git a/dev-java/stringtemplate/files/stringtemplate-4.3.1-BaseTest-javac-source-target.patch b/dev-java/stringtemplate/files/stringtemplate-4.3.4-BaseTest-javac-source-target.patch
index 5824425ce35b..7c31d6b5a893 100644
--- a/dev-java/stringtemplate/files/stringtemplate-4.3.1-BaseTest-javac-source-target.patch
+++ b/dev-java/stringtemplate/files/stringtemplate-4.3.4-BaseTest-javac-source-target.patch
@@ -10,10 +10,8 @@ Signed-off-by: Yuan Liao <liaoyuan@gmail.com>
test/org/stringtemplate/v4/test/BaseTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/test/org/stringtemplate/v4/test/BaseTest.java b/test/org/stringtemplate/v4/test/BaseTest.java
-index 536d686..74a3949 100644
---- a/test/org/stringtemplate/v4/test/BaseTest.java
-+++ b/test/org/stringtemplate/v4/test/BaseTest.java
+--- a/stringtemplate4-ST4-4.3.4/test/org/stringtemplate/v4/test/BaseTest.java
++++ b/stringtemplate4-ST4-4.3.4/test/org/stringtemplate/v4/test/BaseTest.java
@@ -258,7 +258,7 @@ public abstract class BaseTest {
fileManager.getJavaFileObjectsFromFiles(files);
diff --git a/dev-java/stringtemplate/files/stringtemplate-4.3.4-Java21-TestRenderers.patch b/dev-java/stringtemplate/files/stringtemplate-4.3.4-Java21-TestRenderers.patch
new file mode 100644
index 000000000000..127f5e0a4b61
--- /dev/null
+++ b/dev-java/stringtemplate/files/stringtemplate-4.3.4-Java21-TestRenderers.patch
@@ -0,0 +1,41 @@
+there are different space characters used in java 21 (narrow space)
+
+--- a/stringtemplate4-ST4-4.3.4/test/org/stringtemplate/v4/test/TestRenderers.java
++++ b/stringtemplate4-ST4-4.3.4/test/org/stringtemplate/v4/test/TestRenderers.java
+@@ -77,6 +77,8 @@ public class TestRenderers extends BaseTest {
+ String expecting = "datetime: 7/5/05, 12:00 AM";
+ if ( javaVersion.startsWith("1.6") || javaVersion.startsWith("1.7") || javaVersion.startsWith("1.8") ) {
+ expecting = "datetime: 7/5/05 12:00 AM";
++ } else if ( javaVersion.startsWith("21") ) {
++ expecting = "datetime: 7/5/05, 12:00 AM";
+ }
+ String result = st.render();
+ assertEquals(expecting, result);
+@@ -106,6 +108,8 @@ public class TestRenderers extends BaseTest {
+ String expecting = " datetime: 7/5/05, 12:00 AM ";
+ if ( javaVersion.startsWith("1.6") || javaVersion.startsWith("1.7") || javaVersion.startsWith("1.8") ) {
+ expecting = " datetime: 7/5/05 12:00 AM ";
++ } else if ( javaVersion.startsWith("21") ) {
++ expecting = " datetime: 7/5/05, 12:00 AM ";
+ }
+ String result = st.render();
+ assertEquals(expecting, result);
+@@ -126,6 +130,8 @@ public class TestRenderers extends BaseTest {
+ String expecting = " datetime: Tuesday, July 5, 2005 at 12:00:00 AM Pacific Daylight Time ";
+ if ( javaVersion.startsWith("1.6") || javaVersion.startsWith("1.7") || javaVersion.startsWith("1.8") ) {
+ expecting = " datetime: Tuesday, July 5, 2005 12:00:00 AM PDT ";
++ } else if ( javaVersion.startsWith("21") ) {
++ expecting = " datetime: Tuesday, July 5, 2005, 12:00:00 AM Pacific Daylight Time ";
+ }
+ String result = st.render();
+ assertEquals(expecting, result);
+@@ -160,6 +166,9 @@ public class TestRenderers extends BaseTest {
+ ST st = group.getInstanceOf("dateThing");
+ st.add("created", new GregorianCalendar(2005, 7 - 1, 5));
+ String expecting = " time: 12:00:00 AM ";
++ if ( javaVersion.startsWith("21") ) {
++ expecting = " time: 12:00:00 AM ";
++ }
+ String result = st.render();
+ assertEquals(expecting, result);
+ }
diff --git a/dev-java/stringtemplate/metadata.xml b/dev-java/stringtemplate/metadata.xml
index fb8783e44aee..b4aba6185def 100644
--- a/dev-java/stringtemplate/metadata.xml
+++ b/dev-java/stringtemplate/metadata.xml
@@ -6,6 +6,7 @@
<name>Java</name>
</maintainer>
<upstream>
+ <remote-id type="github">antlr/stringtemplate3</remote-id>
<remote-id type="github">antlr/stringtemplate4</remote-id>
</upstream>
</pkgmetadata>
diff --git a/dev-java/stringtemplate/stringtemplate-3.2.1-r2.ebuild b/dev-java/stringtemplate/stringtemplate-3.2.1-r3.ebuild
index 12ea0035a6ed..544099d09244 100644
--- a/dev-java/stringtemplate/stringtemplate-3.2.1-r2.ebuild
+++ b/dev-java/stringtemplate/stringtemplate-3.2.1-r3.ebuild
@@ -1,59 +1,52 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 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/antlr/stringtemplate3/archive/68f2a42e8038f8e716e9666909ea485ee8aff45a.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild stringtemplate-3.2.1-r2.ebuild
-
-EAPI=7
+EAPI=8
JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.antlr:stringtemplate:3.2.2"
+MAVEN_ID="org.antlr:stringtemplate:${PV}"
JAVA_TESTING_FRAMEWORKS="junit-4"
inherit java-pkg-2 java-pkg-simple
-MY_COMMIT="68f2a42e8038f8e716e9666909ea485ee8aff45a"
DESCRIPTION="A Java template engine"
HOMEPAGE="https://www.stringtemplate.org/"
-SRC_URI="https://github.com/antlr/stringtemplate3/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
+MY_COMMIT="68f2a42e8038f8e716e9666909ea485ee8aff45a"
+DEB="3.2.1-4"
+SRC_URI="https://github.com/antlr/stringtemplate3/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz
+ https://sources.debian.org/data/main/s/${PN}/${DEB}/debian/patches/java21-compatibility.patch \
+ -> ${PN}-${DEB}-java21-compatibility.patch"
+S="${WORKDIR}/${PN}3-${MY_COMMIT}"
LICENSE="BSD-1"
SLOT="0"
KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris"
-# Common dependencies
-# POM: pom.xml
-# antlr:antlr:2.7.7 -> >=dev-java/antlr-2.7.7:0
-
-CDEPEND="
- dev-java/antlr:0
-"
-
-DEPEND="
- >=virtual/jdk-1.8:*
- ${CDEPEND}
-"
-
-RDEPEND="
- >=virtual/jre-1.8:*
- ${CDEPEND}
-"
+CP_DEPEND="dev-java/antlr:0"
+DEPEND="${CP_DEPEND}
+ >=virtual/jdk-1.8:*"
+RDEPEND="${CP_DEPEND}
+ >=virtual/jre-1.8:*"
DOCS=( {CHANGES,README}.txt )
+PATCHES=(
+ "${DISTDIR}/stringtemplate-${DEB}-java21-compatibility.patch"
+ "${FILESDIR}/stringtemplate-3.2.1-TestStringTemplate.patch"
+)
-S="${WORKDIR}/${PN}3-${MY_COMMIT}"
-
-JAVA_GENTOO_CLASSPATH="antlr"
JAVA_SRC_DIR="src"
-
JAVA_TEST_GENTOO_CLASSPATH="junit-4"
JAVA_TEST_SRC_DIR="test"
JAVA_TEST_RESOURCE_DIRS="test"
+src_prepare() {
+ default #780585
+ java-pkg-2_src_prepare
+}
+
src_compile() {
local G; for G in action template angle.bracket.template eval group interface; do # from build.xml
antlr -o src/org/antlr/stringtemplate/language/{,${G}.g} || die
done
-
java-pkg-simple_src_compile
}
diff --git a/dev-java/stringtemplate/stringtemplate-4.3.2.ebuild b/dev-java/stringtemplate/stringtemplate-4.3.4.ebuild
index 86fa55098e53..dd01fef37fd3 100644
--- a/dev-java/stringtemplate/stringtemplate-4.3.2.ebuild
+++ b/dev-java/stringtemplate/stringtemplate-4.3.4.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.antlr:ST4:4.3.2"
+MAVEN_ID="org.antlr:ST4:${PV}"
JAVA_TESTING_FRAMEWORKS="junit-4"
inherit java-pkg-2 java-pkg-simple
@@ -16,8 +16,10 @@ HOMEPAGE="https://www.stringtemplate.org/"
# Tarball for the test suite and DOCS files
SRC_URI="
https://repo1.maven.org/maven2/org/antlr/ST4/${PV}/ST4-${PV}-sources.jar
- https://github.com/antlr/${PN}4/archive/${PV}.tar.gz -> ${P}.tar.gz
+ https://github.com/antlr/stringtemplate4/archive/ST4-${PV}.tar.gz
"
+S="${WORKDIR}"
+TARBALL_S="${S}/${PN}4-ST4-${PV}"
LICENSE="BSD"
SLOT="4"
@@ -44,9 +46,6 @@ RDEPEND="
${CP_DEPEND}
"
-S="${WORKDIR}"
-TARBALL_S="${S}/${PN}4-${PV}"
-
JAVA_SRC_DIR="org"
JAVA_TEST_GENTOO_CLASSPATH="junit-4,antlr-tool-3.5"
@@ -54,23 +53,22 @@ JAVA_TEST_SRC_DIR="${TARBALL_S}/test"
JAVA_TEST_RESOURCE_DIRS=( "${TARBALL_S}/test/resources" )
DOCS=( "${TARBALL_S}/"{CHANGES.txt,README.md} )
+PATCHES=( "${FILESDIR}/stringtemplate-4.3.4-BaseTest-javac-source-target.patch" )
src_prepare() {
- # Do not call java-pkg_clean; otherwise, it would remove
- # ${TARBALL_S}/test/test.jar, which is merely used as a
- # test resource file, does not contain any *.class files,
- # and is required to pass the tests as of version 4.3.2
- pushd "${TARBALL_S}" > /dev/null ||
- die "Failed to enter directory storing tarball contents"
- eapply "${FILESDIR}/${PN}-4.3.1-BaseTest-javac-source-target.patch"
- popd > /dev/null ||
- die "Failed to leave directory storing tarball contents"
+ default #780585
java-pkg-2_src_prepare
+ # keep test.jar - it is required to pass the tests as of version 4.3.2
+ java-pkg_clean ! -path */test.jar
# Some of these tests requires a graphical display.
rm -v "${JAVA_TEST_SRC_DIR}/org/stringtemplate/v4/test/TestEarlyEvaluation.java" || die
}
src_test() {
+ local vm_version="$(java-config -g PROVIDES_VERSION)"
+ if ver_test "${vm_version}" -ge 21; then
+ eapply "${FILESDIR}/stringtemplate-4.3.4-Java21-TestRenderers.patch"
+ fi
# Make sure no older versions of this slot are present in the classpath
# https://bugs.gentoo.org/834138#c4
local old_ver_cp="$(nonfatal java-pkg_getjars "${PN}-${SLOT}")"
@@ -96,8 +94,3 @@ src_test() {
JAVA_GENTOO_CLASSPATH_EXTRA+="${new_test_cp}"
java-pkg-simple_src_test
}
-
-src_install() {
- java-pkg-simple_src_install
- einstalldocs # https://bugs.gentoo.org/789582
-}
diff --git a/dev-java/swt/Manifest b/dev-java/swt/Manifest
index c05938dd3fbb..75b83fcd9ee2 100644
--- a/dev-java/swt/Manifest
+++ b/dev-java/swt/Manifest
@@ -3,9 +3,9 @@ DIST swt-3.7.2-gtk-linux-x86.zip 5374609 BLAKE2B 04d44b9fffcedc6ce255e2651377ac6
DIST swt-3.7.2-gtk-linux-x86_64.zip 5671443 BLAKE2B 953fc9eab6d1f2750b1a1345cddf4aa6969567cb75977f87ee50668d367e55dda8be2ff836d87b780005c22132fa783b475f422c093617fd02f478eadd96076d SHA512 d60ae1d3f3b0577f7e3018139f93069c89d021064fec2f3f4074f95cfae56abdc0c7d531cb904ad3911482543cddcc3f6646ff47192073f4bde97c79e13612b7
DIST swt-4.10-gtk-linux-ppc64le.zip 3848264 BLAKE2B 214861fde6987906fb24f3187936f3bcb49aebed54fe242427c3737bf6761e8f77d049c376f30ca0fc33e74a1e8a48b6aff6d9863775ee9c33fea7cb2edd1309 SHA512 1b3ede58c2b41abae76f58a303bd3fbf1849ba8be3fd6518325bc22400e960c3ab542e7351b1bc08053e2746ea3e28812e04c2d1789cb1e19ea28745c8a5f39a
DIST swt-4.10-gtk-linux-x86_64.zip 3844306 BLAKE2B 0e0ed21708acce347fd025920ee635f586c460f8a9c05a7067fd70eed9da999b4a62a5febd17f0c5546ab15198336038e4ab49a1bd588d49ffb39450353a1911 SHA512 9dd946cb7c11446f553f06b8af516167519bab00d4a89f626cd612be6d18e50023fc537aa3d844a8f7a56a767df00410efe4dd20e2bfd930639330a1e279a7a0
-DIST swt-4.28-gtk-linux-aarch64.zip 3836289 BLAKE2B 3460e8bcde76cae74d3fba94198b2f0a6b8ed21c4f123003a216421db4af03686f43a26ce00cf4c59c56f8a31b88626482ae5f13f2e92c06e2147658fa482aeb SHA512 d91ff48ca384de057d70f3a886691193bd88960c6da0e37fb4ef695c32399c0d3ab87f6174075e5637046e7b2b22a73e4b03e0133a2bdb7ee584d4fa53baa11c
-DIST swt-4.28-gtk-linux-ppc64le.zip 3860453 BLAKE2B 8de275767f1bd0b68a58744804c71314760fb3d56a396db32917376583830bb0307b5169f0f8c56a200180aaf7e871a1ab01e2ed682c16a49d2d236d1ae3bc3a SHA512 56d7f82b249924966184be29d4cdac454308169247b5c7819b77f592eef7f434ba5e913d95688411667940c354cb9d9db023935925914053e04117a654e2ad91
-DIST swt-4.28-gtk-linux-x86_64.zip 3856600 BLAKE2B 6725d0a261444d113af74e36d8bc451d2a8f3fbecb13f137877d4ac3acf427944b4eeb782967bddbd30c0af88ab0c8976020731c2c70c318012053ccdde83b17 SHA512 81c42fc08432c031f8c2d862fde5ac59c96ff0b70109fb1a65b00c22f136c696d7aa9ec02416660cb71691f3c9d36de553a68315cb4e9aeee86290114e69a829
DIST swt-4.29-gtk-linux-aarch64.zip 3836724 BLAKE2B 8c905df298688686ee22c9f2021560856f7ac7b6a92dad744b27cd30530c6ff76470fdcbb79b91ada01f28c43b8f694c334ff1337d692366ae9dc0319f7e46e2 SHA512 44ff572b57631b1b6a98192f60624758d90f54a2b2272c6bbb140ece39e65bb4086cf08fbc50c5f2e388e7b410b28fc014b87a8560062053b4c131970fa38b17
DIST swt-4.29-gtk-linux-ppc64le.zip 3860955 BLAKE2B f24f8224581425dc86926a147f2f4c644f086cb7907e03bfca64df93ef5ce8341f519acc91e90c0af4eede65797ac019c17a410ff0312306714fa26ddb4234b4 SHA512 09326b5204970d9db2cede4aebf11c7f24a47c30b6bc49764dda1d0a33fa83c7c4755797cac387d1814a29ad2574e45244b994e5df0c7ef2fd1375fc7877814b
DIST swt-4.29-gtk-linux-x86_64.zip 3857122 BLAKE2B ac4416044f93eaed396ac10edb74eb5ebcbb967797109f57580bd0ac7c1e3752e8895c5ff1b315aa32b5d5b5ce8e1440badb8b9c3138a0eaeb4df63098919a8c SHA512 c92381e4d1479c219e174c027e54af781e674b266334a5e087f5821935e0a87696f40afbc9fe6f9ffaa00b5204165d9ff6476031b5e4e2df8aea1a54aeb2e65e
+DIST swt-4.30-gtk-linux-aarch64.zip 3836637 BLAKE2B 4cedb6eae73e03c32f6c226560f8e7bcbde5b6fc57579255e793fd5d01a5ff80f8b673dd7035eb7f2693abadd98bd0cfdb2eec632c05995552a9a1f1b673b8cc SHA512 dfdddd12ba30373d3ee7f0337b42d3a4f55a55dc898be9c97fbcc3d841c082d00190a75513272076c5709ee626e8af3f77c7c2dc518aa9289e80e33f4b134907
+DIST swt-4.30-gtk-linux-ppc64le.zip 3860636 BLAKE2B a535c1bcc6c668905f4d4aaa8c5ae7f3b8f48fc95004522d09924ae54d5172b18f80169d78633e960ce0c5141e5b34492d1dd05188a0b1f48d9f79d286bd2982 SHA512 5a17bd7752343da638466ac28de460d9fa9f0e777d1e48625ddb6c5538704e36cd97439d1bf8f07ad34a32b7d5f27f19d8877e8a9bb9094b4a74bdbb1dc126f7
+DIST swt-4.30-gtk-linux-x86_64.zip 3856990 BLAKE2B 0ea29a5f286fb4bb362758629226bcd6f27716afae7abb80cb37e7d4b72f0c835d63a196384465d3bc74135c42454a74c75455c094204e6329229ad8ca1fda78 SHA512 3802bd1dc84c7d684dac6b0b21de6b4958dd0c736a6b42176cf734806f04ae9dfdb18515ec5249eeff5f6bb716bf327a7a10e79d68cc487a1ad02267394507a1
diff --git a/dev-java/swt/swt-4.29.ebuild b/dev-java/swt/swt-4.29.ebuild
index 6f8aaa2c1780..08361076b0b5 100644
--- a/dev-java/swt/swt-4.29.ebuild
+++ b/dev-java/swt/swt-4.29.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1"
SLOT="4.27"
-KEYWORDS="~amd64 arm64 ppc64"
+KEYWORDS="amd64 arm64 ppc64"
IUSE="cairo opengl webkit"
COMMON_DEP="
diff --git a/dev-java/swt/swt-4.28-r1.ebuild b/dev-java/swt/swt-4.30-r1.ebuild
index 8868a156b623..f0ea9b557f4b 100644
--- a/dev-java/swt/swt-4.28-r1.ebuild
+++ b/dev-java/swt/swt-4.30-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -8,7 +8,7 @@ JAVA_PKG_IUSE="doc source"
inherit flag-o-matic java-pkg-2 java-pkg-simple toolchain-funcs
MY_PV="${PV/_rc/RC}"
-MY_DMF="https://download.eclipse.org/eclipse/downloads/drops4/R-${MY_PV}-202306050440"
+MY_DMF="https://download.eclipse.org/eclipse/downloads/drops4/R-${MY_PV}-202312010110"
MY_P="${PN}-${MY_PV}"
DESCRIPTION="GTK based SWT Library"
@@ -19,7 +19,7 @@ SRC_URI="
ppc64? ( ${MY_DMF}/${MY_P}-gtk-linux-ppc64le.zip )"
LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1"
-SLOT="4.27"
+SLOT="4.30"
KEYWORDS="amd64 arm64 ppc64"
IUSE="cairo opengl webkit"
@@ -37,14 +37,15 @@ COMMON_DEP="
net-libs/webkit-gtk:4.1
)"
DEPEND="${COMMON_DEP}
- >=virtual/jdk-11:*[-headless-awt]
+ >=virtual/jdk-17:*[-headless-awt]
x11-base/xorg-proto
x11-libs/libX11
x11-libs/libXrender
x11-libs/libXt
x11-libs/libXtst"
+# error: pattern matching in instanceof is not supported in -source 11
RDEPEND="${COMMON_DEP}
- >=virtual/jre-1.8:*"
+ >=virtual/jre-17:*"
BDEPEND="
app-arch/unzip
virtual/pkgconfig
@@ -72,8 +73,12 @@ src_prepare() {
java-pkg_clean
mkdir src || die "mkdir failed"
mv org src || die "moving java sources failed"
- find src -type f ! -name '*.java' | xargs \
- cp --parent -t resources -v || die "copying resources failed"
+ pushd src > /dev/null || die
+ find -type f ! -name '*.java' \
+ | xargs \
+ cp --parent -t ../resources -v \
+ || die "copying resources failed"
+ popd > /dev/null || die
cp version.txt resources || die "adding version.txt failed"
}
diff --git a/dev-java/tomcat-native/Manifest b/dev-java/tomcat-native/Manifest
index cf8dae797115..e6b7d10ea6cf 100644
--- a/dev-java/tomcat-native/Manifest
+++ b/dev-java/tomcat-native/Manifest
@@ -1,8 +1,6 @@
-DIST tomcat-native-1.2.38-src.tar.gz 439234 BLAKE2B 603a905db25b86792717023707598abb4da125ad16b7e69e4a48ec0eb9056bc0b566520d4df004566bbc15c8bcfe843992baebb6bd1c86b210ce9f0fc0733ca0 SHA512 973c0dc8d241827aa98f72026d4de67928344c221570abbb7f97380fe56a9ad602b159a5448c6048d88d73fa0ade8c1ab12df293fee513d0e4896847b16206e6
-DIST tomcat-native-1.2.38-src.tar.gz.asc 873 BLAKE2B 6b7ccf31b7b0b7ac9493c4751309c6b62c269332f5fd49a9df391846a140f2797e1587e3c644b4aa65fa6eef8dfea8fe19b7f5714ffb5ddcf836c601f281bc5b SHA512 b6a7c12ac7387c4ee17e5b5d50d588b16470874f70bcb49b96a25159bab8b51ff5a5dc7d33fa73c8eb33e673e2b947aad4b603b1e8755f7e186052763c2575f5
DIST tomcat-native-1.2.39-src.tar.gz 438209 BLAKE2B 499e2221be7a3aac47950530b044242dd308e943cdffd4af29d35121b60bd9b7040a404e8a70320cc853d41e4a06b41cad66a87d665e3692791299a0f16658f4 SHA512 b90c72255406f48552025a2e78dbd8c30a3492be2c283875c86a0b4a0f1f71b0420d4f91fb5ba181ef29d528824b2d5dfc63f51ee68e8d04fe6e67bd89e397f7
DIST tomcat-native-1.2.39-src.tar.gz.asc 873 BLAKE2B 59976744119c03771b597d3d4f5d84a5a9e5feb81c0efe351e827b5e06e84c8adde8407ef4d27ec3b201763806e74804a51e9a209641c127328d44b79e22351e SHA512 78144c9ce5d5acc9d051b6d41fff2016d37062a11011ecad8ba52569c910efe5bcd5f177e576601ab4e7f7e53ce9dfe54f6a2c42cb87651ca5c2fedcf284eb21
-DIST tomcat-native-2.0.5-src.tar.gz 539017 BLAKE2B 405a4064bcf49ee04a7670c516adc64b19ebebbbfdc50735952c057d36b475c785bd9976778f491796b3fce5bd5aa158199ec624f20e8adbc65f920974543533 SHA512 03ed1951597bb6a6ade8d715546a0d635d261381737abd27b63aa552c69f9ca49405d0252b6bc2d878bfd64e87439f146ecd84ccbfc82661ba16379c493615a4
-DIST tomcat-native-2.0.5-src.tar.gz.asc 873 BLAKE2B 2e043d011f482ab963088441a37d2cfddec973253f7c909a747afac71393b76bc2e33ff37e9a18e8f9b6caac8ba86ab3a076ea722577416e4b409d8e44d56e24 SHA512 22a87c14c31bc62383cfb227e8dbd106fe017f84d802ec0e4d22d48af6ad4dd0d020bc59bed3a8335e2b4b15e0fd44ec3a4062bf86c73bbf00151c4ff0d12d7c
DIST tomcat-native-2.0.6-src.tar.gz 539277 BLAKE2B 4a1ee7a87ff72b449a3638d38cdd40185e02ee09aa8ee9ea26ff6cfdc3f54b1e8aec6fb0296b51f8a72a72de7a9c504410d1df4d3547b709deebfb005ebbdd01 SHA512 d714fb96f880d0d565c58d25bb803fa9a144a6d87e825ad8d00aeac833b40a5512f888b94b3109853f8ee28b176b24fde95fb2d2a70ce65181a51ca7fc60cdab
DIST tomcat-native-2.0.6-src.tar.gz.asc 873 BLAKE2B f78fb9c67632fc6fd6768fb699fa4c875db0364537ef41f6aa8c099eb05260a43ed7e2dd7b0f501c6814aff3b7d0928f318473ba78bfac7bcac3092952c08edc SHA512 6601bb1f731ad3b8ef1dbd6d2522952223d794568d42cce363ed95e05e641b2c742ed696ce65d546fcb3d0f80b362befc9cdaa060d1bd77beb90749c3a417a08
+DIST tomcat-native-2.0.7-src.tar.gz 538131 BLAKE2B ef973c830e3e3e04f4bf7bd711915b1ac5f28e34832edd0750117a5d6b00f9a7fa9e390858d23bfaeeb08ad825d7dcc1e95967c00d4ada96cac83377fca7bea6 SHA512 625b334271494f7c86c06d6a8c6d13c06d9d6094f65cccbdc8d3df13ee2aae4cb42ad326e20bcbf8a8f141240111778991882f9bf87793b09a2920433d6c8c85
+DIST tomcat-native-2.0.7-src.tar.gz.asc 833 BLAKE2B 081f40de6fdc5ad819a167e0150a2e03ab8d4fd679be0dbabac9a9f2aabffd2fa36fd6a9c764deefd419576dcda07bc1b22ea2f14c04eddbfa7f94e4834bec7e SHA512 16a96a3c3b55d258ad0820c30392f37643f433c563b74a983109492569d06a399471acc42c7f07b87b50bff8711bc10ed278bfa183807bcdde1355e6b8058605
diff --git a/dev-java/tomcat-native/tomcat-native-1.2.38.ebuild b/dev-java/tomcat-native/tomcat-native-1.2.38.ebuild
deleted file mode 100644
index 13489020d644..000000000000
--- a/dev-java/tomcat-native/tomcat-native-1.2.38.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2023 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 autotools java-pkg-2 java-pkg-simple verify-sig
-
-DESCRIPTION="Allows Tomcat to use certain native resources for better performance"
-HOMEPAGE="https://tomcat.apache.org/native-doc/"
-SRC_URI="mirror://apache/tomcat/tomcat-connectors/native/${PV}/source/${P}-src.tar.gz
- verify-sig? (
- https://downloads.apache.org/tomcat/tomcat-connectors/native/${PV}/source/tomcat-native-${PV}-src.tar.gz.asc
- )"
-S=${WORKDIR}/${P}-src/native
-
-KEYWORDS="amd64 ~x86"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="static-libs"
-
-DEPEND="
- >=virtual/jdk-1.8:*
-"
-RDEPEND="
- dev-libs/apr:1=
- dev-libs/openssl:0/3
- >=virtual/jre-1.8:*
-"
-BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-tomcat-connectors )"
-VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/tomcat-connectors.apache.org.asc"
-
-JAVA_RESOURCE_DIRS="../resources"
-JAVA_SRC_DIR="../java"
-JAVA_TEST_GENTOO_CLASSPATH="junit-4"
-JAVA_TEST_SRC_DIR="../test"
-
-DOCS=( ../{CHANGELOG.txt,NOTICE,README.txt} )
-
-src_prepare() {
- java-pkg-2_src_prepare
- mkdir -p "${JAVA_RESOURCE_DIRS}/META-INF" || die
- sed -ne '/attribute name/s:^.*name="\(.*\)" value="\(.*\)".*$:\1\: \2:p' \
- ../build.xml \
- | sed "s:\${version}:${PV}:" \
- > "${JAVA_RESOURCE_DIRS}/META-INF/MANIFEST.MF" || die
-}
-
-src_configure() {
- local myeconfargs=(
- --with-apr="${EPREFIX}"/usr/bin/apr-1-config
- --with-ssl="${EPREFIX}"/usr
- )
- econf "${myeconfargs[@]}"
-}
-
-src_compile() {
- java-pkg-simple_src_compile
- default
-}
-
-src_test() {
- # Adjusting "String testFile =" path in TestFile.java:29 to match ${S}
- sed \
- -e '/String testFile =/s&test/&../test/&' \
- -i ../test/org/apache/tomcat/jni/TestFile.java || die
-
- JAVA_TEST_EXTRA_ARGS=( -Djava.library.path=".libs" )
- java-pkg-simple_src_test
-}
-
-src_install() {
- java-pkg-simple_src_install
- java-pkg_doso .libs/*.so*
- dodoc -r ../docs
- ! use static-libs && find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
- elog "For more information, please visit"
- elog "https://tomcat.apache.org/tomcat-9.0-doc/apr.html"
-}
diff --git a/dev-java/tomcat-native/tomcat-native-1.2.39.ebuild b/dev-java/tomcat-native/tomcat-native-1.2.39.ebuild
index 171f99f2468b..5d246c6ecdab 100644
--- a/dev-java/tomcat-native/tomcat-native-1.2.39.ebuild
+++ b/dev-java/tomcat-native/tomcat-native-1.2.39.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-connectors/native/${PV}/source/${P}-src.t
)"
S=${WORKDIR}/${P}-src/native
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
LICENSE="Apache-2.0"
SLOT="0"
IUSE="static-libs"
diff --git a/dev-java/tomcat-native/tomcat-native-2.0.6.ebuild b/dev-java/tomcat-native/tomcat-native-2.0.6.ebuild
index cdae6f3d9fd3..be927b30c60d 100644
--- a/dev-java/tomcat-native/tomcat-native-2.0.6.ebuild
+++ b/dev-java/tomcat-native/tomcat-native-2.0.6.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-connectors/native/${PV}/source/${P}-src.t
)"
S=${WORKDIR}/${P}-src/native
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
LICENSE="Apache-2.0"
SLOT="2"
IUSE="static-libs"
diff --git a/dev-java/tomcat-native/tomcat-native-2.0.5.ebuild b/dev-java/tomcat-native/tomcat-native-2.0.7.ebuild
index 31e7d134cca8..03965f330c13 100644
--- a/dev-java/tomcat-native/tomcat-native-2.0.5.ebuild
+++ b/dev-java/tomcat-native/tomcat-native-2.0.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -6,7 +6,7 @@ EAPI=8
JAVA_PKG_IUSE="doc source test"
JAVA_TESTING_FRAMEWORKS="junit-4"
-inherit autotools java-pkg-2 java-pkg-simple verify-sig
+inherit java-pkg-2 java-pkg-simple verify-sig
DESCRIPTION="Allows Tomcat to use certain native resources for better performance"
HOMEPAGE="https://tomcat.apache.org/native-doc/"
@@ -16,7 +16,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-connectors/native/${PV}/source/${P}-src.t
)"
S=${WORKDIR}/${P}-src/native
-KEYWORDS="amd64 ~x86"
+KEYWORDS="~amd64 ~x86"
LICENSE="Apache-2.0"
SLOT="2"
IUSE="static-libs"
diff --git a/dev-java/validation-api/Manifest b/dev-java/validation-api/Manifest
index 30458ba26cd4..dcac63ba7efc 100644
--- a/dev-java/validation-api/Manifest
+++ b/dev-java/validation-api/Manifest
@@ -1,2 +1 @@
-DIST validation-api-1.0.0.GA-sources.jar 65220 BLAKE2B cee01d9979671bc2d64a22f21d608d50ddf6eca730a7c0d1fee3c4c05fab0af200153a48491b8d54a5a29b84a220f841c85264446117e25e89bd306bdd764843 SHA512 88bcde2fc9446b09cb24e73137cd16ed54953a6d93f33e8500ca196e4cec07ac03ebc446f4629291e6437d2f3757802236e56974cd3023bb25886e69e2330fc0
DIST validation-api-1.1.0.jar 94671 BLAKE2B c28f6b2ca52094f33e82d2e7c71e52ef57c503c5d50f34646ee28a9f61ea7e4da7f494f41b5f8a34ce6108ca1b75fa2d0f08eb9aab15cf033e825afc2eefdf19 SHA512 aa15184ff004357f1cdee693008587a3aa180a8f24392847258672c4a2e5a537cf189049ef95febb1a87968a42223f7736e22e00fe9307678c117f7ab6b944a8
diff --git a/dev-java/validation-api/metadata.xml b/dev-java/validation-api/metadata.xml
index 8d626a41d89c..535a0cd95681 100644
--- a/dev-java/validation-api/metadata.xml
+++ b/dev-java/validation-api/metadata.xml
@@ -6,6 +6,6 @@
<name>Java</name>
</maintainer>
<upstream>
- <remote-id type="github">eclipse-ee4j/beanvalidation-api</remote-id>
+ <remote-id type="github">jakartaee/validation</remote-id>
</upstream>
</pkgmetadata>
diff --git a/dev-java/validation-api/validation-api-1.0.0-r1.ebuild b/dev-java/validation-api/validation-api-1.0.0-r1.ebuild
deleted file mode 100644
index 316ac36886b4..000000000000
--- a/dev-java/validation-api/validation-api-1.0.0-r1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Bean Validation (JSR-303) API"
-HOMEPAGE="https://beanvalidation.org/"
-SRC_URI="https://repository.jboss.org/nexus/service/local/repo_groups/public/content/javax/validation/${PN}/${PV}.GA/${P}.GA-sources.jar"
-
-LICENSE="Apache-2.0"
-SLOT="1.0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND=">=virtual/jdk-1.8:*"
-RDEPEND=">=virtual/jre-1.8:*"
-BDEPEND="app-arch/unzip"
diff --git a/dev-java/validation-api/validation-api-1.1.0-r1.ebuild b/dev-java/validation-api/validation-api-1.1.0-r2.ebuild
index 1f63794e937b..fe8bd82bedc9 100644
--- a/dev-java/validation-api/validation-api-1.1.0-r1.ebuild
+++ b/dev-java/validation-api/validation-api-1.1.0-r2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
JAVA_PKG_IUSE="doc source"
@@ -15,8 +15,6 @@ LICENSE="Apache-2.0"
SLOT="1.0"
KEYWORDS="amd64 x86"
-IUSE=""
-
BDEPEND="app-arch/unzip"
RDEPEND=">=virtual/jre-1.8"
DEPEND=">=virtual/jdk-1.8"
diff --git a/dev-java/waffle-jna/Manifest b/dev-java/waffle-jna/Manifest
new file mode 100644
index 000000000000..de2a4d7a3e97
--- /dev/null
+++ b/dev-java/waffle-jna/Manifest
@@ -0,0 +1 @@
+DIST waffle-parent-3.3.0.tar.gz 2147273 BLAKE2B a4f9c06898c50616013870bb383632d0b97e4f527da9b7b1acad9945f275181844d94b6533891a371f588115f60efdf791d5f64e03f938950a8dd48415f1f56f SHA512 e09154761dc5902e97b9dc57c9523bffe401fce33797346bbd5595390db3adaf5eed27d2ac7f98b7504aeb471c5f1a0c0a5104bd819a937e15c67123ecdd5891
diff --git a/dev-java/waffle-jna/metadata.xml b/dev-java/waffle-jna/metadata.xml
new file mode 100644
index 000000000000..a9d1f1367512
--- /dev/null
+++ b/dev-java/waffle-jna/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>java@gentoo.org</email>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">Waffle/waffle</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-java/waffle-jna/waffle-jna-3.3.0.ebuild b/dev-java/waffle-jna/waffle-jna-3.3.0.ebuild
new file mode 100644
index 000000000000..7d9114ca8512
--- /dev/null
+++ b/dev-java/waffle-jna/waffle-jna-3.3.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 2023-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="com.github.waffle:waffle-jna:${PV}"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Enable drop-in Windows Single Sign On for popular Java web servers"
+HOMEPAGE="https://waffle.github.io/waffle/"
+SRC_URI="https://github.com/Waffle/waffle/archive/waffle-parent-${PV}.tar.gz"
+S="${WORKDIR}/waffle-waffle-parent-${PV}/Source/JNA/waffle-jna"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ppc64 x86"
+RESTRICT="test" #839681
+
+DEPEND="
+ dev-java/caffeine:0
+ dev-java/checker-framework-qual:0
+ dev-java/jakarta-servlet-api:4
+ dev-java/jna:4
+ dev-java/slf4j-api:0
+ >=virtual/jdk-1.8:*
+ test? ( dev-java/junit:5 )
+"
+RDEPEND=">=virtual/jre-1.8:*"
+
+JAVA_AUTOMATIC_MODULE_NAME="waffle.jna"
+JAVA_CLASSPATH_EXTRA="
+ caffeine
+ checker-framework-qual
+ jakarta-servlet-api-4
+ jna-4
+ slf4j-api
+"
+JAVA_RESOURCE_DIR="src/main/resources"
+JAVA_SRC_DIR="src/main/java"
+JAVA_TEST_GENTOO_CLASSPATH="
+ assertj-core-3
+ junit-5
+"
+JAVA_TEST_SRC_DIR="src/test/java"
diff --git a/dev-java/woodstox-core/woodstox-core-6.4.0.ebuild b/dev-java/woodstox-core/woodstox-core-6.4.0-r1.ebuild
index e3ac3d714258..f709dc1853a1 100644
--- a/dev-java/woodstox-core/woodstox-core-6.4.0.ebuild
+++ b/dev-java/woodstox-core/woodstox-core-6.4.0-r1.ebuild
@@ -43,7 +43,7 @@ CP_DEPEND="
DEPEND="${CP_DEPEND}
>=virtual/jdk-11:*
- dev-java/aqute-bnd-annotation:0
+ dev-java/bnd-annotation:0
dev-java/osgi-core:0"
RDEPEND="${CP_DEPEND}
@@ -53,7 +53,7 @@ DOCS=( {README,SECURITY}.md release-notes/{CREDITS,VERSION} )
S="${WORKDIR}/woodstox-${P}"
-JAVA_CLASSPATH_EXTRA="aqute-bnd-annotation,osgi-core"
+JAVA_CLASSPATH_EXTRA="bnd-annotation,osgi-core"
JAVA_SRC_DIR=( "src/main/java" "src/moditect" )
JAVA_RESOURCE_DIRS="src/main/resources"
diff --git a/dev-java/xalan-serializer/xalan-serializer-2.7.3.ebuild b/dev-java/xalan-serializer/xalan-serializer-2.7.3-r1.ebuild
index ac8cfa2b4bc9..d3a34a76b1ca 100644
--- a/dev-java/xalan-serializer/xalan-serializer-2.7.3.ebuild
+++ b/dev-java/xalan-serializer/xalan-serializer-2.7.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -19,7 +19,7 @@ LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-DEPEND="virtual/jdk:1.8"
+DEPEND=">=virtual/jdk-1.8:*"
RDEPEND=">=virtual/jre-1.8:*"
BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-xalan-j )"
diff --git a/dev-java/xalan/xalan-2.7.3.ebuild b/dev-java/xalan/xalan-2.7.3-r1.ebuild
index 523e44d542b7..c49a110bfdde 100644
--- a/dev-java/xalan/xalan-2.7.3.ebuild
+++ b/dev-java/xalan/xalan-2.7.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -27,7 +27,7 @@ CP_DEPEND="
"
DEPEND="${CP_DEPEND}
- virtual/jdk:1.8"
+ >=virtual/jdk-1.8:*"
RDEPEND="${CP_DEPEND}
>=virtual/jre-1.8:*"
diff --git a/dev-java/xerces/xerces-2.12.2-r1.ebuild b/dev-java/xerces/xerces-2.12.2-r2.ebuild
index c74ab4cdedaa..6aed07e1a9e0 100644
--- a/dev-java/xerces/xerces-2.12.2-r1.ebuild
+++ b/dev-java/xerces/xerces-2.12.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -21,16 +21,9 @@ CP_DEPEND="
dev-java/xml-commons-external:1.4
dev-java/xml-commons-resolver:0"
-# JDK 11+ already privides the following file and the compilation
-# fails if xerces provides it too. On contrary, compilation on 1.8
-# fails if we don't provide the file because it's not part of 1.8.
-# By restricting compilation to 1.8 and providing the file we build
-# a jar that should work both on 1.8 and also on the newer versions
-# of JDK.
-# the file: "org/w3c/dom/html/HTMLDOMImplementation.class"
DEPEND="
${CP_DEPEND}
- virtual/jdk:1.8"
+ >=virtual/jdk-1.8:*"
RDEPEND="
${CP_DEPEND}
@@ -44,6 +37,7 @@ HTML_DOCS=( {LICENSE.DOM-documentation,LICENSE.DOM-software,LICENSE-SAX,Readme}.
S="${WORKDIR}/${P//./_}"
+JAVADOC_ARGS="-source 8" #922332
JAVA_SRC_DIR="src"
JAVA_RESOURCE_DIRS="resources"
diff --git a/dev-java/xmlgraphics-commons/Manifest b/dev-java/xmlgraphics-commons/Manifest
index 012eebd4866a..2abe373cdc3b 100644
--- a/dev-java/xmlgraphics-commons/Manifest
+++ b/dev-java/xmlgraphics-commons/Manifest
@@ -1,4 +1,2 @@
-DIST xmlgraphics-commons-2.8-src.tar.gz 2243271 BLAKE2B 86456adf4b9610e580b3b4f87c362dc1259c2f2bb4d4abb0dc3d765ee2cc5fb3df54597f5a5fa620a813dee83cd7549771d2b4116d20077103e389f1942903a0 SHA512 3e6c397a7444c4ce1d1aeda96a7c9abfd3d8d57a0997d7d6ae2be36303dd17550b7b92fd86eac832566bbeefccdd06619e31c0d907cd6b953a8eb934d7fa618b
-DIST xmlgraphics-commons-2.8-src.tar.gz.asc 833 BLAKE2B d68b6fe36b44764c44b67baca02a50f01644aaf2e8ed6571caeffd7724b6284860bd81d5a2ddcbefde6411bd5c9ed072f853cd178f862541f9f49aea3e023e21 SHA512 6e17a628ddd253c44d62a7f08d615f5a484bb6433482e6e217e794620396150b327f2e89836f62aafde3050ac0677432e0b12b645c57ae74cc11e093d86ac43c
DIST xmlgraphics-commons-2.9-src.tar.gz 2236891 BLAKE2B 5071418eb2773ade7d48faa00a45834ee392603adb7844ce7b7ffc6ab41f0d655ce29265fc56326093b06b7e2cb1b1f4b95ab5e0f339c05cca4e0eb71d59f368 SHA512 896a5fe41277783021075df0de1aa109a7f05416af6b0141301a2452197d85df0daef28f5c2a71802644cbff3bfe79579a1544000a4c1b5cec4c211d8effd521
DIST xmlgraphics-commons-2.9-src.tar.gz.asc 833 BLAKE2B e85533d2509dc49f42346e373a416c8215600ff84a393ca6de545fce6e73d704a8146a257522e66a254248ebdbc6770e0040658223582184e0d8fd71f95bd941 SHA512 e52f02efba535192455b47a4adbb903426e51163083297eb7be83146e2c7ead913f4c0a51345681123afa64fbb3bffcea982a81fd2b92be2aa4c135082ed8e17
diff --git a/dev-java/xmlgraphics-commons/xmlgraphics-commons-2.8.ebuild b/dev-java/xmlgraphics-commons/xmlgraphics-commons-2.8.ebuild
deleted file mode 100644
index 9ff492354a4c..000000000000
--- a/dev-java/xmlgraphics-commons/xmlgraphics-commons-2.8.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri mirror://apache/xmlgraphics/commons/source/2.8-src.tar.gz --slot 2 --keywords "~amd64 ~arm64 ~ppc64 ~x86" --ebuild xmlgraphics-commons-2.8.ebuild
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.apache.xmlgraphics:xmlgraphics-commons:2.8"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple verify-sig
-
-DESCRIPTION="XML Graphics Commons"
-HOMEPAGE="https://xmlgraphics.apache.org/commons/"
-SRC_URI="mirror://apache/xmlgraphics/commons/source/${P}-src.tar.gz
- verify-sig? ( https://downloads.apache.org/xmlgraphics/commons/source/xmlgraphics-commons-${PV}-src.tar.gz.asc )"
-
-LICENSE="Apache-2.0"
-SLOT="2"
-KEYWORDS="amd64 arm64 ppc64 x86"
-
-# Common dependencies
-# POM: pom.xml
-# commons-io:commons-io:2.11.0 -> >=dev-java/commons-io-2.11.0:1
-# commons-logging:commons-logging:1.2 -> >=dev-java/commons-logging-1.2:0
-
-CP_DEPEND="
- dev-java/commons-io:1
- dev-java/commons-logging:0
-"
-
-# Compile dependencies
-# POM: pom.xml
-# test? junit:junit:4.11 -> >=dev-java/junit-4.13.2:4
-# test? org.mockito:mockito-core:2.28.2 -> >=dev-java/mockito-4.8.0:4
-# test? xml-resolver:xml-resolver:1.2 -> >=dev-java/xml-commons-resolver-1.2:0
-
-DEPEND="${CP_DEPEND}
- >=virtual/jdk-1.8:*
- test? (
- dev-java/mockito:4
- dev-java/xml-commons-resolver:0
- )"
-
-RDEPEND="${CP_DEPEND}
- >=virtual/jre-1.8:*"
-
-BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-xmlgraphics-commons )"
-VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/xmlgraphics-commons.apache.org.asc"
-
-DOCS=( NOTICE README )
-
-S="${WORKDIR}/${P}"
-
-JAVA_RESOURCE_DIRS="src/main/resources"
-JAVA_SRC_DIR="src/main/java"
-
-JAVA_TEST_EXTRA_ARGS=( -ea )
-JAVA_TEST_GENTOO_CLASSPATH="junit-4,mockito-4,xml-commons-resolver"
-# Some *.{png,tiff,txt,xmp} are misplaced in "src/main/java".
-JAVA_TEST_RESOURCE_DIRS=( "src/test/resources" "src/test/java" )
-JAVA_TEST_SRC_DIR="src/test/java"
-
-src_test() {
- local vm_version="$(java-config -g PROVIDES_VERSION)"
- if ver_test "${vm_version}" -ge 11; then
- JAVA_TEST_EXCLUDES="org.apache.xmlgraphics.image.loader.CorruptImagesTestCase"
- fi
- java-pkg-simple_src_test
-}
diff --git a/dev-java/xmlgraphics-commons/xmlgraphics-commons-2.9.ebuild b/dev-java/xmlgraphics-commons/xmlgraphics-commons-2.9.ebuild
index a64ec681a815..2c0a190b489a 100644
--- a/dev-java/xmlgraphics-commons/xmlgraphics-commons-2.9.ebuild
+++ b/dev-java/xmlgraphics-commons/xmlgraphics-commons-2.9.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${P}"
LICENSE="Apache-2.0"
SLOT="2"
-KEYWORDS="~amd64 arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ppc64 x86"
CP_DEPEND="
dev-java/commons-io:1
diff --git a/dev-java/xmlunit/xmlunit-1.6-r2.ebuild b/dev-java/xmlunit/xmlunit-1.6-r2.ebuild
new file mode 100644
index 000000000000..1fd0fa19c5e3
--- /dev/null
+++ b/dev-java/xmlunit/xmlunit-1.6-r2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="xmlunit:xmlunit:1.6"
+JAVA_TESTING_FRAMEWORKS="junit"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="XMLUnit extends JUnit and NUnit to enable unit testing of XML"
+HOMEPAGE="https://sourceforge.net/projects/xmlunit/ https://www.xmlunit.org"
+SRC_URI="mirror://sourceforge/project/xmlunit/xmlunit%20for%20Java/XMLUnit%20for%20Java%20${PV}/${P}-src.zip"
+S="${WORKDIR}/${P}"
+
+LICENSE="BSD"
+SLOT="1"
+KEYWORDS="amd64 ~arm64 ppc64 ~x86"
+
+BDEPEND="app-arch/unzip"
+CP_DEPEND="dev-java/junit:0"
+DEPEND="${CP_DEPEND}
+ >=virtual/jdk-1.8:*
+ doc? ( app-text/docbook-xsl-stylesheets:0 )
+ test? ( >=dev-java/ant-1.10.14:0[junit] )
+"
+
+RDEPEND="${CP_DEPEND}
+ >=virtual/jre-1.8:*"
+
+JAVA_SRC_DIR="src/java"
+JAVA_TEST_EXTRA_ARGS=( -Dbasedir="." )
+JAVA_TEST_RESOURCE_DIRS="tests/etc"
+JAVA_TEST_SRC_DIR="tests/java"
+
+src_install() {
+ java-pkg-simple_src_install
+ if use doc; then
+ docinto html
+ dodoc -r userguide
+ fi
+}