summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'dev-java')
-rw-r--r--dev-java/ant-contrib/ant-contrib-1.0_beta6_pre20201123-r2.ebuild (renamed from dev-java/ant-contrib/ant-contrib-1.0_beta6_pre20201123-r1.ebuild)18
-rw-r--r--dev-java/ant-ivy/ant-ivy-2.5.0-r2.ebuild (renamed from dev-java/ant-ivy/ant-ivy-2.5.0-r1.ebuild)31
-rw-r--r--dev-java/ant-ivy/metadata.xml4
-rw-r--r--dev-java/ant/Manifest4
-rw-r--r--dev-java/ant/ant-1.10.14-r3.ebuild4
-rw-r--r--dev-java/antlr-tool/antlr-tool-3.5.3-r1.ebuild (renamed from dev-java/antlr-tool/antlr-tool-3.5.3.ebuild)4
-rw-r--r--dev-java/antlr-tool/antlr-tool-4.9.3-r2.ebuild (renamed from dev-java/antlr-tool/antlr-tool-4.9.3-r1.ebuild)2
-rw-r--r--dev-java/antlr-tool/files/antlr-tool-3.5.3-java21.patch11
-rw-r--r--dev-java/antlr/antlr-3.2-r2.ebuild (renamed from dev-java/antlr/antlr-3.2-r1.ebuild)17
-rw-r--r--dev-java/antlr/files/antlr-3.2-java21.patch31
-rw-r--r--dev-java/assertj-core/Manifest1
-rw-r--r--dev-java/assertj-core/assertj-core-2.3.0-r1.ebuild35
-rw-r--r--dev-java/auto-service-annotations/auto-service-annotations-1.1.1.ebuild4
-rw-r--r--dev-java/bnd-ant/bnd-ant-7.0.0.ebuild2
-rw-r--r--dev-java/bnd/bnd-7.0.0.ebuild2
-rw-r--r--dev-java/byaccj/byaccj-1.15-r3.ebuild4
-rw-r--r--dev-java/c3p0/c3p0-0.9.5.5-r1.ebuild4
-rw-r--r--dev-java/cglib/cglib-3.3.0-r2.ebuild (renamed from dev-java/cglib/cglib-3.3.0-r1.ebuild)16
-rw-r--r--dev-java/checker-framework-qual/Manifest2
-rw-r--r--dev-java/checker-framework-qual/checker-framework-qual-3.43.0.ebuild (renamed from dev-java/checker-framework-qual/checker-framework-qual-3.42.0.ebuild)0
-rw-r--r--dev-java/commons-codec/Manifest2
-rw-r--r--dev-java/commons-codec/commons-codec-1.16.0.ebuild46
-rw-r--r--dev-java/commons-codec/commons-codec-1.16.1.ebuild2
-rw-r--r--dev-java/commons-compress/Manifest2
-rw-r--r--dev-java/commons-compress/commons-compress-1.26.0-r1.ebuild44
-rw-r--r--dev-java/commons-compress/commons-compress-1.26.1.ebuild2
-rw-r--r--dev-java/commons-compress/files/commons-compress-1.21-asm7+.patch164
-rw-r--r--dev-java/commons-lang/Manifest2
-rw-r--r--dev-java/commons-lang/commons-lang-3.13.0.ebuild29
-rw-r--r--dev-java/commons-lang/commons-lang-3.14.0.ebuild2
-rw-r--r--dev-java/commons-logging/Manifest3
-rw-r--r--dev-java/commons-logging/commons-logging-1.3.1.ebuild (renamed from dev-java/commons-logging/commons-logging-1.3.0_pre20230319.ebuild)80
-rw-r--r--dev-java/commons-net/Manifest2
-rw-r--r--dev-java/commons-net/commons-net-3.10.0.ebuild2
-rw-r--r--dev-java/commons-net/commons-net-3.9.0.ebuild39
-rw-r--r--dev-java/commons-validator/Manifest1
-rw-r--r--dev-java/commons-validator/commons-validator-1.7.ebuild63
-rw-r--r--dev-java/commons-validator/commons-validator-1.8.0.ebuild2
-rw-r--r--dev-java/commons-vfs/commons-vfs-2.0-r4.ebuild (renamed from dev-java/commons-vfs/commons-vfs-2.0-r3.ebuild)43
-rw-r--r--dev-java/commons-vfs/files/commons-vfs-2.0-build.xml298
-rw-r--r--dev-java/commons-vfs/files/commons-vfs-2.0-utf8.patch13
-rw-r--r--dev-java/concurrentlinkedhashmap-lru/concurrentlinkedhashmap-lru-1.4.2.ebuild2
-rw-r--r--dev-java/cortado/Manifest1
-rw-r--r--dev-java/cortado/cortado-0.6.0-r3.ebuild37
-rw-r--r--dev-java/cpptasks/cpptasks-1.0_beta5-r2.ebuild2
-rw-r--r--dev-java/cpptasks/cpptasks-1.0_beta5-r3.ebuild50
-rw-r--r--dev-java/cpptasks/files/cpptasks-1.0_beta5-test-classpath.patch33
-rw-r--r--dev-java/eclipse-ecj/Manifest2
-rw-r--r--dev-java/eclipse-ecj/eclipse-ecj-4.20.ebuild2
-rw-r--r--dev-java/eclipse-ecj/eclipse-ecj-4.27-r1.ebuild (renamed from dev-java/eclipse-ecj/eclipse-ecj-4.27.ebuild)5
-rw-r--r--dev-java/eclipse-ecj/eclipse-ecj-4.32.ebuild (renamed from dev-java/eclipse-ecj/eclipse-ecj-4.15-r1.ebuild)34
-rw-r--r--dev-java/eclipse-ecj/files/ecj-4.157
-rw-r--r--dev-java/eclipse-ecj/files/ecj-4.327
-rw-r--r--dev-java/eclipse-jdt-annotation/eclipse-jdt-annotation-4.30.ebuild2
-rw-r--r--dev-java/emma/emma-2.0.5312-r6.ebuild2
-rw-r--r--dev-java/error-prone-annotations/Manifest2
-rw-r--r--dev-java/error-prone-annotations/error-prone-annotations-2.27.1-r1.ebuild (renamed from dev-java/error-prone-annotations/error-prone-annotations-2.24.0.ebuild)2
-rw-r--r--dev-java/felix-gogo-runtime/felix-gogo-runtime-1.1.6.ebuild2
-rw-r--r--dev-java/fop/fop-2.9-r1.ebuild (renamed from dev-java/fop/fop-2.9.ebuild)15
-rw-r--r--dev-java/freenet-ext/freenet-ext-29-r1.ebuild (renamed from dev-java/freenet-ext/freenet-ext-29.ebuild)7
-rw-r--r--dev-java/gin/Manifest1
-rw-r--r--dev-java/gin/gin-2.1.2-r1.ebuild72
-rw-r--r--dev-java/gin/metadata.xml13
-rw-r--r--dev-java/gradle-bin/gradle-bin-8.7.ebuild2
-rw-r--r--dev-java/gson/gson-2.10.2_pre20231128-r1.ebuild (renamed from dev-java/gson/gson-2.10.2_pre20231128.ebuild)0
-rw-r--r--dev-java/guava-testlib/Manifest4
-rw-r--r--dev-java/guava-testlib/guava-testlib-33.2.0.ebuild (renamed from dev-java/guava-testlib/guava-testlib-33.0.0.ebuild)26
-rw-r--r--dev-java/guava/Manifest2
-rw-r--r--dev-java/guava/guava-33.2.0.ebuild (renamed from dev-java/guava/guava-33.0.0.ebuild)2
-rw-r--r--dev-java/guice/guice-5.1.0-r1.ebuild (renamed from dev-java/guice/guice-5.1.0.ebuild)34
-rw-r--r--dev-java/gwt/Manifest2
-rw-r--r--dev-java/gwt/files/gwt-2.9.0-jsinterop-classpath.patch20
-rw-r--r--dev-java/gwt/files/gwt-2.9.0-remove-git-usage.patch26
-rw-r--r--dev-java/gwt/gwt-2.9.0-r3.ebuild94
-rw-r--r--dev-java/gwt/metadata.xml17
-rw-r--r--dev-java/htmlcleaner/htmlcleaner-2.29-r1.ebuild2
-rw-r--r--dev-java/httpcomponents-client/Manifest1
-rw-r--r--dev-java/httpcomponents-client/httpcomponents-client-4.5.13-r1.ebuild74
-rw-r--r--dev-java/httpcomponents-client/httpcomponents-client-4.5.13-r2.ebuild69
-rw-r--r--dev-java/httpcore/Manifest1
-rw-r--r--dev-java/httpcore/files/httpcore-4.4.14-skipFailingTest.patch55
-rw-r--r--dev-java/httpcore/httpcore-4.4.14-r1.ebuild56
-rw-r--r--dev-java/httpcore/httpcore-4.4.14.ebuild54
-rw-r--r--dev-java/icedtea-bin/Manifest14
-rw-r--r--dev-java/icedtea-bin/files/icedtea-bin.env.sh17
-rw-r--r--dev-java/icedtea-bin/icedtea-bin-3.16.0-r2.ebuild135
-rw-r--r--dev-java/icedtea-bin/metadata.xml11
-rw-r--r--dev-java/icu4j/Manifest2
-rw-r--r--dev-java/icu4j/icu4j-75.1.ebuild (renamed from dev-java/icu4j/icu4j-74.2.ebuild)37
-rw-r--r--dev-java/iso-relax/iso-relax-20050331-r6.ebuild (renamed from dev-java/iso-relax/iso-relax-20050331-r5.ebuild)24
-rw-r--r--dev-java/j2objc-annotations/Manifest2
-rw-r--r--dev-java/j2objc-annotations/j2objc-annotations-3.0.0-r1.ebuild (renamed from dev-java/j2objc-annotations/j2objc-annotations-2.8.ebuild)11
-rw-r--r--dev-java/jacl/jacl-1.4.1-r2.ebuild4
-rw-r--r--dev-java/jakarta-mail-api/Manifest1
-rw-r--r--dev-java/jakarta-mail-api/jakarta-mail-api-2.1.1.ebuild68
-rw-r--r--dev-java/jakarta-mail-api/jakarta-mail-api-2.1.3.ebuild2
-rw-r--r--dev-java/jakarta-xml-soap-api/files/jakarta-xml-soap-api-1.4.2-dropSecurityManager.patch14
-rw-r--r--dev-java/jakarta-xml-soap-api/jakarta-xml-soap-api-1.4.2-r2.ebuild (renamed from dev-java/jakarta-xml-soap-api/jakarta-xml-soap-api-1.4.2-r1.ebuild)13
-rw-r--r--dev-java/java-dep-check/java-dep-check-0.5-r3.ebuild (renamed from dev-java/java-dep-check/java-dep-check-0.5-r2.ebuild)4
-rw-r--r--dev-java/javacc/Manifest1
-rw-r--r--dev-java/javacc/javacc-5.0-r5.ebuild73
-rw-r--r--dev-java/javacc/javacc-7.0.13.ebuild2
-rw-r--r--dev-java/javacc/javacc-7.0.4.ebuild2
-rw-r--r--dev-java/javacup/Manifest1
-rw-r--r--dev-java/javacup/javacup-11b_p20160615.ebuild92
-rw-r--r--dev-java/javacup/metadata.xml6
-rw-r--r--dev-java/javaparser-core/javaparser-core-3.13.10.ebuild2
-rw-r--r--dev-java/javatoolkit/javatoolkit-0.6.7-r1.ebuild (renamed from dev-java/javatoolkit/javatoolkit-0.6.7.ebuild)6
-rw-r--r--dev-java/javax-persistence-api/javax-persistence-api-2.2-r1.ebuild (renamed from dev-java/javax-persistence-api/javax-persistence-api-2.2.ebuild)4
-rw-r--r--dev-java/jaxb-api/Manifest1
-rw-r--r--dev-java/jaxb-api/jaxb-api-4.0.0.ebuild42
-rw-r--r--dev-java/jaxb-api/jaxb-api-4.0.2.ebuild2
-rw-r--r--dev-java/jbitcollider-core/jbitcollider-core-0.8-r2.ebuild (renamed from dev-java/jbitcollider-core/jbitcollider-core-0.8-r1.ebuild)19
-rw-r--r--dev-java/jcalendar/jcalendar-1.4-r2.ebuild43
-rw-r--r--dev-java/jchart2d/jchart2d-3.2.2-r1.ebuild4
-rw-r--r--dev-java/jdom/jdom-1.1.3-r2.ebuild38
-rw-r--r--dev-java/jflex/jflex-1.6.1-r2.ebuild (renamed from dev-java/jflex/jflex-1.6.1-r1.ebuild)20
-rw-r--r--dev-java/jflex/jflex-1.6.1-r3.ebuild135
-rw-r--r--dev-java/jflex/metadata.xml11
-rw-r--r--dev-java/jimfs/Manifest2
-rw-r--r--dev-java/jimfs/jimfs-1.3.0.ebuild70
-rw-r--r--dev-java/jimfs/metadata.xml (renamed from dev-java/validation-api/metadata.xml)3
-rw-r--r--dev-java/jsch/jsch-0.1.55.ebuild4
-rw-r--r--dev-java/jtds/jtds-1.3.1-r1.ebuild4
-rw-r--r--dev-java/jtidy/Manifest1
-rw-r--r--dev-java/jtidy/files/jtidy-1.0-build.xml.patch31
-rw-r--r--dev-java/jtidy/jtidy-1.0-r1.ebuild54
-rw-r--r--dev-java/jtidy/jtidy-1.0-r2.ebuild (renamed from dev-java/jtidy/jtidy-938.ebuild)18
-rw-r--r--dev-java/jtwig-core/jtwig-core-5.87.0.ebuild2
-rw-r--r--dev-java/jtwig-reflection/jtwig-reflection-5.87.0.ebuild2
-rw-r--r--dev-java/junit/Manifest4
-rw-r--r--dev-java/junit/junit-3.8.2-r2.ebuild2
-rw-r--r--dev-java/junit/junit-4.13.2-r1.ebuild46
-rw-r--r--dev-java/junit/junit-4.13.2_p20240222.ebuild2
-rw-r--r--dev-java/junit/junit-5.10.2.ebuild (renamed from dev-java/junit/junit-5.9.2.ebuild)20
-rw-r--r--dev-java/lucene/Manifest3
-rw-r--r--dev-java/lucene/files/lucene-2.4.1-javacc.home.patch13
-rw-r--r--dev-java/lucene/files/lucene-2.4.1-skipFailingTest.patch25
-rw-r--r--dev-java/lucene/lucene-2.4.1-r3.ebuild83
-rw-r--r--dev-java/lucene/lucene-2.4.1-r4.ebuild82
-rw-r--r--dev-java/maven-bin/Manifest2
-rw-r--r--dev-java/maven-bin/maven-bin-3.9.7.ebuild63
-rw-r--r--dev-java/maven-bin/maven-bin-3.9.8.ebuild63
-rw-r--r--dev-java/mockito/mockito-1.9.5-r4.ebuild (renamed from dev-java/mockito/mockito-1.9.5-r3.ebuild)4
-rw-r--r--dev-java/openjdk-bin/Manifest47
-rw-r--r--dev-java/openjdk-bin/openjdk-bin-11.0.23_p9.ebuild (renamed from dev-java/openjdk-bin/openjdk-bin-11.0.22_p7.ebuild)0
-rw-r--r--dev-java/openjdk-bin/openjdk-bin-17.0.11_p9.ebuild (renamed from dev-java/openjdk-bin/openjdk-bin-17.0.10_p7.ebuild)0
-rw-r--r--dev-java/openjdk-bin/openjdk-bin-21.0.3_p9.ebuild (renamed from dev-java/openjdk-bin/openjdk-bin-21.0.2_p13.ebuild)3
-rw-r--r--dev-java/openjdk-bin/openjdk-bin-8.412_p08.ebuild (renamed from dev-java/openjdk-bin/openjdk-bin-8.402_p06.ebuild)0
-rw-r--r--dev-java/openjdk-jre-bin/Manifest8
-rw-r--r--dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.23_p9.ebuild (renamed from dev-java/openjdk-jre-bin/openjdk-jre-bin-17.0.8.1_p1.ebuild)4
-rw-r--r--dev-java/openjdk-jre-bin/openjdk-jre-bin-17.0.11_p9.ebuild (renamed from dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.20.1_p1.ebuild)4
-rw-r--r--dev-java/openjdk-jre-bin/openjdk-jre-bin-21.0.3_p9.ebuild (renamed from dev-java/openjdk-jre-bin/openjdk-jre-bin-21.0.1_p12.ebuild)4
-rw-r--r--dev-java/openjdk-jre-bin/openjdk-jre-bin-8.412_p08.ebuild (renamed from dev-java/openjdk-jre-bin/openjdk-jre-bin-8.382_p05.ebuild)4
-rw-r--r--dev-java/openjdk/Manifest9
-rw-r--r--dev-java/openjdk/openjdk-11.0.23_p9.ebuild (renamed from dev-java/openjdk/openjdk-11.0.22_p7.ebuild)13
-rw-r--r--dev-java/openjdk/openjdk-17.0.11_p9.ebuild (renamed from dev-java/openjdk/openjdk-17.0.10_p7.ebuild)13
-rw-r--r--dev-java/openjdk/openjdk-21.0.3_p9.ebuild (renamed from dev-java/openjdk/openjdk-21.0.2_p13.ebuild)13
-rw-r--r--dev-java/openjdk/openjdk-8.412_p08.ebuild (renamed from dev-java/openjdk/openjdk-8.402_p06-r1.ebuild)25
-rw-r--r--dev-java/osgi-service-subsystem/osgi-service-subsystem-1.1.0.ebuild2
-rw-r--r--dev-java/parboiled/parboiled-1.4.1.ebuild2
-rw-r--r--dev-java/plexus-classworlds/plexus-classworlds-2.7.0-r1.ebuild (renamed from dev-java/plexus-classworlds/plexus-classworlds-2.7.0.ebuild)6
-rw-r--r--dev-java/protobuf-java/metadata.xml8
-rw-r--r--dev-java/protobuf-java/protobuf-java-3.23.3.ebuild4
-rw-r--r--dev-java/qdox/metadata.xml3
-rw-r--r--dev-java/qdox/qdox-1.12.1-r5.ebuild (renamed from dev-java/qdox/qdox-1.12.1-r3.ebuild)36
-rw-r--r--dev-java/rhino/rhino-1.7.14-r1.ebuild (renamed from dev-java/rhino/rhino-1.7.14.ebuild)6
-rw-r--r--dev-java/sax/sax-2.2.1-r5.ebuild4
-rw-r--r--dev-java/saxon/metadata.xml3
-rw-r--r--dev-java/saxon/saxon-6.5.5-r3.ebuild4
-rw-r--r--dev-java/saxon/saxon-9.2.0.6-r4.ebuild (renamed from dev-java/saxon/saxon-9.2.0.6-r3.ebuild)11
-rw-r--r--dev-java/saxon/saxon-9.2.0.6-r5.ebuild67
-rw-r--r--dev-java/sbt/metadata.xml3
-rw-r--r--dev-java/swingx-ws/swingx-ws-1.0_p20110515-r2.ebuild4
-rw-r--r--dev-java/swt/Manifest3
-rw-r--r--dev-java/swt/files/build.xml17
-rw-r--r--dev-java/swt/swt-3.7.2-r4.ebuild (renamed from dev-java/swt/swt-3.7.2-r3.ebuild)118
-rw-r--r--dev-java/swt/swt-4.10-r4.ebuild (renamed from dev-java/swt/swt-4.10-r2.ebuild)83
-rw-r--r--dev-java/swt/swt-4.29-r1.ebuild (renamed from dev-java/swt/swt-4.29.ebuild)5
-rw-r--r--dev-java/swt/swt-4.30-r2.ebuild (renamed from dev-java/swt/swt-4.30-r1.ebuild)3
-rw-r--r--dev-java/swt/swt-4.31-r1.ebuild (renamed from dev-java/swt/swt-4.31.ebuild)5
-rw-r--r--dev-java/swt/swt-4.32.ebuild152
-rw-r--r--dev-java/tomcat-native/Manifest2
-rw-r--r--dev-java/tomcat-native/tomcat-native-1.2.39.ebuild86
-rw-r--r--dev-java/tomcat-native/tomcat-native-1.3.0.ebuild2
-rw-r--r--dev-java/tomcat-servlet-api/tomcat-servlet-api-4.1.40-r1.ebuild (renamed from dev-java/tomcat-servlet-api/tomcat-servlet-api-4.1.40.ebuild)41
-rw-r--r--dev-java/validation-api/Manifest1
-rw-r--r--dev-java/validation-api/validation-api-1.1.0-r2.ebuild20
-rw-r--r--dev-java/velocity/Manifest1
-rw-r--r--dev-java/velocity/files/velocity-2.3-skipSecurityManager.patch11
-rw-r--r--dev-java/velocity/velocity-2.3.ebuild146
-rw-r--r--dev-java/velocity/velocity-2.3_p20240314.ebuild2
-rw-r--r--dev-java/wsdl4j/wsdl4j-1.6.3.ebuild4
-rw-r--r--dev-java/xmlunit/xmlunit-1.6-r2.ebuild2
-rw-r--r--dev-java/xpp2/xpp2-2.1.10-r4.ebuild82
-rw-r--r--dev-java/xz-java/metadata.xml3
-rw-r--r--dev-java/xz-java/xz-java-1.9-r2.ebuild (renamed from dev-java/xz-java/xz-java-1.9-r1.ebuild)11
197 files changed, 1902 insertions, 2552 deletions
diff --git a/dev-java/ant-contrib/ant-contrib-1.0_beta6_pre20201123-r1.ebuild b/dev-java/ant-contrib/ant-contrib-1.0_beta6_pre20201123-r2.ebuild
index 38db7e73b27e..172467ec6ed4 100644
--- a/dev-java/ant-contrib/ant-contrib-1.0_beta6_pre20201123-r1.ebuild
+++ b/dev-java/ant-contrib/ant-contrib-1.0_beta6_pre20201123-r2.ebuild
@@ -1,9 +1,6 @@
-# Copyright 1999-2021 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/cniweb/ant-contrib/archive/0228412be2ef648cfabc1d74416d3188755aff9b.tar.gz --slot 0 --keywords "~amd64 ~ppc64 ~x86" --ebuild ant-contrib-1.0_beta6_pre20201123.ebuild
-
EAPI=8
JAVA_PKG_IUSE="doc source test"
@@ -14,8 +11,9 @@ inherit java-pkg-2 java-pkg-simple
MY_COMMIT="0228412be2ef648cfabc1d74416d3188755aff9b"
DESCRIPTION="Ant-contrib tasks for Apache Ant"
-HOMEPAGE="http://ant-contrib.sourceforge.net"
+HOMEPAGE="https://ant-contrib.sourceforge.net/"
SRC_URI="https://github.com/cniweb/${PN}/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${MY_COMMIT}/${PN}"
LICENSE="Apache-2.0"
SLOT="0"
@@ -34,7 +32,7 @@ RESTRICT="test"
# xerces:xercesImpl:2.12.0 -> >=dev-java/xerces-2.12.0:2
CDEPEND="
- dev-java/ant-core:0
+ >=dev-java/ant-1.10.14-r3:0
dev-java/ant-ivy:2
dev-java/bcel:0
dev-java/commons-httpclient:3
@@ -49,20 +47,18 @@ CDEPEND="
DEPEND="${CDEPEND}
>=virtual/jdk-1.8:*
test? (
- dev-java/ant-core:0
+ >=dev-java/ant-1.10.14-r3:0[junit4]
)"
RDEPEND="${CDEPEND}
>=virtual/jre-1.8:*"
-S="${WORKDIR}/${PN}-${MY_COMMIT}/${PN}"
-
# JAVA_GENTOO_CLASSPATH="commons-httpclient-3,ant-core,bcel,ant-ivy-2,!!!groupId-not-found!!!,xerces-2"
-JAVA_GENTOO_CLASSPATH="commons-httpclient-3,ant-core,bcel,ant-ivy-2,xerces-2"
+JAVA_GENTOO_CLASSPATH="commons-httpclient-3,ant,bcel,ant-ivy-2,xerces-2"
JAVA_SRC_DIR="src/main/java"
JAVA_RESOURCE_DIRS="src/main/resources"
-JAVA_TEST_GENTOO_CLASSPATH="junit-4,ant-core"
+JAVA_TEST_GENTOO_CLASSPATH="junit-4,ant"
JAVA_TEST_SRC_DIR="test/src"
JAVA_TEST_RESOURCE_DIRS="test/resources"
diff --git a/dev-java/ant-ivy/ant-ivy-2.5.0-r1.ebuild b/dev-java/ant-ivy/ant-ivy-2.5.0-r2.ebuild
index fff42019b905..0158c70768f5 100644
--- a/dev-java/ant-ivy/ant-ivy-2.5.0-r1.ebuild
+++ b/dev-java/ant-ivy/ant-ivy-2.5.0-r2.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
@@ -11,7 +11,7 @@ inherit java-pkg-2 java-pkg-simple java-osgi
DESCRIPTION="Ivy is a free java based dependency manager"
HOMEPAGE="https://ant.apache.org/ivy/"
-SRC_URI="mirror://apache/ant/ivy/${PV}/apache-ivy-${PV}-src.tar.gz"
+SRC_URI="https://archive.apache.org/dist/ant/ivy/${PV}/apache-ivy-${PV}-src.tar.gz"
LICENSE="Apache-2.0"
SLOT="2"
@@ -21,7 +21,7 @@ PROPERTIES="test_network"
RESTRICT="test"
CDEPEND="
- dev-java/ant-core:0
+ >=dev-java/ant-1.10.14-r3:0
dev-java/bcpg:0
dev-java/bcprov:0
dev-java/httpcomponents-client
@@ -31,10 +31,7 @@ CDEPEND="
dev-java/jsch:0
dev-java/jsch-agent-proxy:0
test? (
- dev-java/ant-junit:0
- dev-java/ant-junit4:0
- dev-java/ant-junitlauncher:0
- dev-java/ant-testutil:0
+ >=dev-java/ant-1.10.14-r3:0[junit,junit4,junitlauncher,testutil]
dev-java/hamcrest-core:1.3
dev-java/hamcrest-library:1.3
dev-java/xmlunit:1
@@ -50,12 +47,28 @@ DOCS=( LICENSE NOTICE README.adoc )
S="${WORKDIR}/apache-ivy-${PV}"
-JAVA_GENTOO_CLASSPATH="ant-core,bcpg,bcprov,httpcomponents-client-4,commons-vfs-2,httpcore,jakarta-oro-2.0,jsch,jsch-agent-proxy"
+JAVA_GENTOO_CLASSPATH="
+ ant
+ bcpg
+ bcprov
+ httpcomponents-client-4
+ commons-vfs-2
+ httpcore
+ jakarta-oro-2.0
+ jsch
+ jsch-agent-proxy
+"
JAVA_MAIN_CLASS="org.apache.ivy.Main"
JAVA_SRC_DIR="src/java"
JAVA_RESOURCE_DIRS="resources/java"
-JAVA_TEST_GENTOO_CLASSPATH="ant-junit,ant-junit4,ant-junitlauncher,ant-testutil,hamcrest-core-1.3,hamcrest-library-1.3,junit-4,xmlunit-1"
+JAVA_TEST_GENTOO_CLASSPATH="
+ ant
+ hamcrest-core-1.3
+ hamcrest-library-1.3
+ junit-4
+ xmlunit-1
+"
JAVA_TEST_SRC_DIR="test-src/java"
JAVA_TEST_RESOURCE_DIRS="test"
JAVA_GENTOO_CLASSPATH_EXTRA="ant-ivy.jar:test.jar:custom-resolver.jar"
diff --git a/dev-java/ant-ivy/metadata.xml b/dev-java/ant-ivy/metadata.xml
index 91e2ba1cf10c..84db44eaed66 100644
--- a/dev-java/ant-ivy/metadata.xml
+++ b/dev-java/ant-ivy/metadata.xml
@@ -16,7 +16,7 @@
</longdescription>
<upstream>
<remote-id type="github">apache/ant-ivy</remote-id>
- <doc>https://ant.apache.org/ivy/history/2.5.0</doc>
- <bugs-to>https://issues.apache.org/jira/browse/IVY </bugs-to>
+ <doc>https://ant.apache.org/ivy/history/2.5.0/</doc>
+ <bugs-to>https://issues.apache.org/jira/browse/IVY</bugs-to>
</upstream>
</pkgmetadata>
diff --git a/dev-java/ant/Manifest b/dev-java/ant/Manifest
index a5c99e19154a..4fdf2d20cd0a 100644
--- a/dev-java/ant/Manifest
+++ b/dev-java/ant/Manifest
@@ -1,2 +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
+DIST apache-ant-1.10.14-src.tar.xz 3779488 BLAKE2B 40091c208c795d03b8f34656594cbf6c414f345cdacf637ece89a19a3ab0373cd8d65c342e0c4603569f9120f8f99a0b2eae8df874e6183649b39d7b88c614b8 SHA512 52936dfceb808a11dc842d2dc957a031508689270b59a2a6e3589f40465f6fa1aae87b189737cdd83eadfaf41b0c3f1ba2579bbd07591153107a5a27422521bd
+DIST apache-ant-1.10.14-src.tar.xz.asc 833 BLAKE2B 4f8b1bb8bbd6d77b6e9eedf86818d42bb448e1b394e00590163e96967e36fe8e8e73e3f4fbf3b5bd1dab51cf69a39b99409bd8604cb7695cd6ae875ff13344a9 SHA512 2b91eda436210247ba39b82ba8aa1859051cf9baaf8ac8b551052e7986aeaa03c8b594347b8a734e08d12d8e270e29bf89b814562550a418abd0d2393ad4ac66
diff --git a/dev-java/ant/ant-1.10.14-r3.ebuild b/dev-java/ant/ant-1.10.14-r3.ebuild
index e79a4cbf5562..e0ad3fce1fed 100644
--- a/dev-java/ant/ant-1.10.14-r3.ebuild
+++ b/dev-java/ant/ant-1.10.14-r3.ebuild
@@ -14,8 +14,8 @@ 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 )"
+SRC_URI="mirror://apache/ant/source/apache-${P}-src.tar.xz
+ verify-sig? ( https://downloads.apache.org/ant/source/apache-${P}-src.tar.xz.asc )"
S="${WORKDIR}/apache-${P}"
LICENSE="Apache-2.0"
diff --git a/dev-java/antlr-tool/antlr-tool-3.5.3.ebuild b/dev-java/antlr-tool/antlr-tool-3.5.3-r1.ebuild
index 0d99b11e44be..1997ce8c081f 100644
--- a/dev-java/antlr-tool/antlr-tool-3.5.3.ebuild
+++ b/dev-java/antlr-tool/antlr-tool-3.5.3-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
@@ -58,9 +58,11 @@ JAVA_TEST_GENTOO_CLASSPATH="junit-4"
JAVA_TEST_SRC_DIR="${TARBALL_S}/tool/src/test/java"
DOCS=( "${TARBALL_S}/tool/CHANGES.txt" )
+PATCHES=( "${FILESDIR}/antlr-tool-3.5.3-java21.patch" )
src_prepare() {
java-pkg_clean
+ default #780585
java-pkg-2_src_prepare
# Some tests fail under Java 8 in ways that probably aren't limited
diff --git a/dev-java/antlr-tool/antlr-tool-4.9.3-r1.ebuild b/dev-java/antlr-tool/antlr-tool-4.9.3-r2.ebuild
index eaf876b5e1b3..2891b009c53f 100644
--- a/dev-java/antlr-tool/antlr-tool-4.9.3-r1.ebuild
+++ b/dev-java/antlr-tool/antlr-tool-4.9.3-r2.ebuild
@@ -32,7 +32,7 @@ CP_DEPEND="
~dev-java/antlr-runtime-${PV}:${SLOT}
dev-java/antlr-runtime:3.5
dev-java/jakarta-json-api:1
- dev-java/icu4j:0
+ >=dev-java/icu4j-74.2-r1:0
dev-java/stringtemplate:4
dev-java/treelayout:0
"
diff --git a/dev-java/antlr-tool/files/antlr-tool-3.5.3-java21.patch b/dev-java/antlr-tool/files/antlr-tool-3.5.3-java21.patch
new file mode 100644
index 000000000000..2e196df96ef9
--- /dev/null
+++ b/dev-java/antlr-tool/files/antlr-tool-3.5.3-java21.patch
@@ -0,0 +1,11 @@
+bug #919481
+--- a/org/antlr/codegen/templates/Java/ST.stg
++++ b/org/antlr/codegen/templates/Java/ST.stg
+@@ -32,6 +32,7 @@
+ @outputFile.imports() ::= <<
+ <@super.imports()>
+ import org.antlr.stringtemplate.*;
++import org.antlr.stringtemplate.StringTemplate;
+ import org.antlr.stringtemplate.language.*;
+ import java.util.HashMap;
+ >>
diff --git a/dev-java/antlr/antlr-3.2-r1.ebuild b/dev-java/antlr/antlr-3.2-r2.ebuild
index bf4946c25c62..9b58f9bff97e 100644
--- a/dev-java/antlr/antlr-3.2-r1.ebuild
+++ b/dev-java/antlr/antlr-3.2-r2.ebuild
@@ -1,7 +1,7 @@
-# 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 test"
@@ -11,19 +11,20 @@ DESCRIPTION="A parser generator for many languages"
HOMEPAGE="https://www.antlr3.org/"
SRC_URI="https://www.antlr3.org/download/${P}.tar.gz
https://www.antlr3.org/download/${P}.jar" # Prebuilt version needed.
+S="${WORKDIR}/${P}"
LICENSE="BSD"
SLOT="3"
KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
RESTRICT="!test? ( test )"
-CDEPEND=">=dev-java/antlr-2.7.7-r7:0
+CP_DEPEND=">=dev-java/antlr-2.7.7-r7:0
dev-java/stringtemplate:0"
-RDEPEND="${CDEPEND}
+RDEPEND="${CP_DEPEND}
>=virtual/jre-1.8:*"
-DEPEND="${CDEPEND}
+DEPEND="${CP_DEPEND}
>=virtual/jdk-1.8:*
test? ( dev-java/junit:4 )"
@@ -31,11 +32,10 @@ PATCHES=(
# These fixes have been applied in 3.5.
"${FILESDIR}/${PV}-test-fixes.patch"
"${FILESDIR}/${PV}-java-8.patch"
+ "${FILESDIR}/antlr-3.2-java21.patch"
)
-S="${WORKDIR}/${P}"
JAVA_GENTOO_CLASSPATH_EXTRA="${S}/${PN}-runtime.jar"
-JAVA_GENTOO_CLASSPATH="antlr,stringtemplate"
src_unpack() {
unpack ${P}.tar.gz
@@ -49,7 +49,8 @@ src_prepare() {
# to the tests. This is bad but upstream is never going to update
# 3.2 even though other projects still rely on it. If any issues
# arise, we can only put pressure on those projects to upgrade.
- if java-pkg_is-vm-version-ge 1.8; then
+ local vm_version="$(java-config -g PROVIDES_VERSION)"
+ if ver_test "${vm_version}" -ge 1.8; then
rm -v tool/src/test/java/org/antlr/test/Test{DFAConversion,SemanticPredicates,TopologicalSort}.java || die
fi
diff --git a/dev-java/antlr/files/antlr-3.2-java21.patch b/dev-java/antlr/files/antlr-3.2-java21.patch
new file mode 100644
index 000000000000..8d885f9a5f11
--- /dev/null
+++ b/dev-java/antlr/files/antlr-3.2-java21.patch
@@ -0,0 +1,31 @@
+bug #919684
+--- a/tool/src/main/java/org/antlr/codegen/CodeGenerator.java
++++ b/tool/src/main/java/org/antlr/codegen/CodeGenerator.java
+@@ -36,6 +36,7 @@ import org.antlr.Tool;
+ import org.antlr.analysis.*;
+ import org.antlr.misc.*;
+ import org.antlr.stringtemplate.*;
++import org.antlr.stringtemplate.StringTemplate;
+ import org.antlr.stringtemplate.language.AngleBracketTemplateLexer;
+ import org.antlr.tool.*;
+
+--- a/tool/src/main/antlr2/org/antlr/grammar/v2/codegen.g
++++ b/tool/src/main/antlr2/org/antlr/grammar/v2/codegen.g
+@@ -32,6 +32,7 @@ header {
+ import org.antlr.misc.*;
+ import java.util.*;
+ import org.antlr.stringtemplate.*;
++ import org.antlr.stringtemplate.StringTemplate;
+ import antlr.TokenWithIndex;
+ import antlr.CommonToken;
+ import org.antlr.codegen.*;
+--- a/tool/src/main/resources/org/antlr/codegen/templates/Java/ST.stg
++++ b/tool/src/main/resources/org/antlr/codegen/templates/Java/ST.stg
+@@ -33,6 +33,7 @@ group ST;
+ @outputFile.imports() ::= <<
+ <@super.imports()>
+ import org.antlr.stringtemplate.*;
++import org.antlr.stringtemplate.StringTemplate;
+ import org.antlr.stringtemplate.language.*;
+ import java.util.HashMap;
+ >>
diff --git a/dev-java/assertj-core/Manifest b/dev-java/assertj-core/Manifest
index 6d5c5f3a7ea0..7e6324ac741b 100644
--- a/dev-java/assertj-core/Manifest
+++ b/dev-java/assertj-core/Manifest
@@ -1,2 +1 @@
-DIST assertj-core-2.3.0.tar.gz 611609 BLAKE2B b99a01f67da75bad18e08df739c10943012f75eda9855ed906d407e474eeafe9a30be2e761de0bc791d72a6ff8c7ec8181cd37c6b6c9126f073df82a974163c3 SHA512 da67930d45afde12d317579edb62b5cff546283ea6a252c9b297f21b74404d7cfb63372d339f51733322205b89d35734e97888085387fb1a83c80d5963b05fd3
DIST assertj-core-3.10.0.tar.gz 1100495 BLAKE2B 4050060e027588d9c62abd5f4c6b77affd96d94a6474c4acc750a946cd3906787f9b2194627abff6d2e0849d590f5a74bbc702b41de6cbfaa09fae951a1012cf SHA512 3763768c5572e133de69735b01fd64432c4330723aa7e6cc0de42e5948cb2d455ae52d9ada66391fb41e47c261816fe12a00d07962e253f0da13ef49255fc5c6
diff --git a/dev-java/assertj-core/assertj-core-2.3.0-r1.ebuild b/dev-java/assertj-core/assertj-core-2.3.0-r1.ebuild
deleted file mode 100644
index 018ad72c7861..000000000000
--- a/dev-java/assertj-core/assertj-core-2.3.0-r1.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"
-MAVEN_ID="org.assertj:assertj-core:2.3.0"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Java library that provides a fluent interface for writing assertions"
-HOMEPAGE="https://joel-costigliola.github.io/assertj/"
-SRC_URI="https://github.com/assertj/assertj-core/archive/assertj-core-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-SLOT="2"
-
-CDEPEND="dev-java/cglib:3
- dev-java/junit:4"
-
-DEPEND="${CDEPEND}
- >=virtual/jdk-1.8:*"
-
-RDEPEND="${CDEPEND}
- >=virtual/jre-1.8:*"
-
-S="${WORKDIR}/${PN}-${P}"
-JAVA_SRC_DIR="src/main/java"
-JAVA_GENTOO_CLASSPATH="cglib-3,junit-4"
-
-src_install() {
- java-pkg-simple_src_install
- dodoc {CONTRIBUTING,README}.md
-}
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
index 0ae78daf656a..4cc72084bcfb 100644
--- 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
@@ -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
@@ -15,7 +15,7 @@ S="${WORKDIR}/auto-auto-service-${PV}"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
DEPEND=">=virtual/jdk-1.8:*"
RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/bnd-ant/bnd-ant-7.0.0.ebuild b/dev-java/bnd-ant/bnd-ant-7.0.0.ebuild
index 0627d8d73189..236236e86726 100644
--- a/dev-java/bnd-ant/bnd-ant-7.0.0.ebuild
+++ b/dev-java/bnd-ant/bnd-ant-7.0.0.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/bnd-${PV}"
LICENSE="Apache-2.0 EPL-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64"
+KEYWORDS="amd64 ~arm ~arm64 ~x86"
DEPEND="
dev-java/ant:0
diff --git a/dev-java/bnd/bnd-7.0.0.ebuild b/dev-java/bnd/bnd-7.0.0.ebuild
index fd077cefc878..b01e8447356e 100644
--- a/dev-java/bnd/bnd-7.0.0.ebuild
+++ b/dev-java/bnd/bnd-7.0.0.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${P}"
LICENSE="Apache-2.0 EPL-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64"
+KEYWORDS="amd64 ~arm ~arm64 ~x86"
BDEPEND="app-arch/zip"
diff --git a/dev-java/byaccj/byaccj-1.15-r3.ebuild b/dev-java/byaccj/byaccj-1.15-r3.ebuild
index 70d92d0ce0ef..a7d59bbf3ade 100644
--- a/dev-java/byaccj/byaccj-1.15-r3.ebuild
+++ b/dev-java/byaccj/byaccj-1.15-r3.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
@@ -8,7 +8,7 @@ inherit toolchain-funcs
DESCRIPTION="A Java extension of BSD YACC-compatible parser generator"
HOMEPAGE="https://byaccj.sourceforge.net/"
MY_P="${PN}${PV}_src"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+SRC_URI="https://downloads.sourceforge.net/${PN}/${MY_P}.tar.gz"
LICENSE="public-domain"
SLOT="0"
diff --git a/dev-java/c3p0/c3p0-0.9.5.5-r1.ebuild b/dev-java/c3p0/c3p0-0.9.5.5-r1.ebuild
index fe4312864b67..4111832765af 100644
--- a/dev-java/c3p0/c3p0-0.9.5.5-r1.ebuild
+++ b/dev-java/c3p0/c3p0-0.9.5.5-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
@@ -10,7 +10,7 @@ inherit java-pkg-2 java-ant-2
DESCRIPTION="JDBC drivers with JNDI-bindable DataSources"
HOMEPAGE="https://www.mchange.com/projects/c3p0/"
-SRC_URI="mirror://sourceforge/project/c3p0/c3p0-src/c3p0-${PV}/${P}.src.tgz"
+SRC_URI="https://downloads.sourceforge.net/project/c3p0/c3p0-src/c3p0-${PV}/${P}.src.tgz"
LICENSE="|| ( EPL-1.0 LGPL-2.1 )"
SLOT="0"
diff --git a/dev-java/cglib/cglib-3.3.0-r1.ebuild b/dev-java/cglib/cglib-3.3.0-r2.ebuild
index 64fd2b7900fc..fc4bba040586 100644
--- a/dev-java/cglib/cglib-3.3.0-r1.ebuild
+++ b/dev-java/cglib/cglib-3.3.0-r2.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
@@ -16,26 +16,25 @@ MY_P=cglib-${MY_PV}
DESCRIPTION="cglib is a powerful, high performance and quality Code Generation Library"
HOMEPAGE="https://github.com/cglib/cglib"
SRC_URI="https://github.com/cglib/cglib/archive//${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
+S="${WORKDIR}"
LICENSE="Apache-2.0"
SLOT="3"
KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-CDEPEND="dev-java/ant-core:0
+CP_DEPEND="
+ >=dev-java/ant-1.10.14-r3:0
dev-java/asm:9
"
DEPEND="
>=virtual/jdk-1.8:*
- ${CDEPEND}
+ ${CP_DEPEND}
"
RDEPEND="
>=virtual/jre-1.8:*
- ${CDEPEND}
+ ${CP_DEPEND}
"
-S="${WORKDIR}"
-
-JAVA_GENTOO_CLASSPATH="asm-9 ant-core"
JAVA_SRC_DIR="${MY_P}/${PN}/src/main/java"
JAVA_RESOURCE_DIRS="${MY_P}/${PN}/src/main/resources"
@@ -54,7 +53,8 @@ src_test() {
# Caused by: net.sf.cglib.core.CodeGenerationException:
# java.lang.reflect.InaccessibleObjectException-->Unable to make protected final java.lang.Class
# java.lang.ClassLoader.defineClass(java.lang.String,byte[],int,int,java.security.ProtectionDomain)
- # throws java.lang.ClassFormatError accessible: module java.base does not "opens java.lang" to unnamed module @42bb2aee
+ # throws java.lang.ClassFormatError accessible: \
+ # module java.base does not "opens java.lang" to unnamed module @42bb2aee
local vm_version="$(java-config -g PROVIDES_VERSION)"
if ver_test "${vm_version}" -ge "17" ; then
diff --git a/dev-java/checker-framework-qual/Manifest b/dev-java/checker-framework-qual/Manifest
index a520abac15a6..a5959914cdf3 100644
--- a/dev-java/checker-framework-qual/Manifest
+++ b/dev-java/checker-framework-qual/Manifest
@@ -1 +1 @@
-DIST checker-framework-3.42.0.tar.gz 8280060 BLAKE2B c2f7c192eb9a7a26b66e46f0c22c18a05ec8cc3c4c01d444e7f14e41c89db83b5d2738f78e3b16eea9cd9ebf3138171bbc6fabb195bdd9776defa06d75e516d6 SHA512 310578593509674b2d36353b2044009ac98b50906d715f1168a96490a1b87aa8227c1713f64adeabd98e370fb1a6a25dd148a5700ff6f4f28ba6b69ba505c149
+DIST checker-framework-3.43.0.tar.gz 8306595 BLAKE2B bcabe8e5a0de20615980048780528b6fcb1946f8793b9cd7c3b12afeb4688c6eb91724fd111419a243801b1456537cd40994d062f2ac341e904c93c285c530ad SHA512 73f6d6d45cf926b23160fc6089596f27b33b1ae6b8489aa3a2c2e0d8330331c331ce87d0826de8f512432d469f96330e77a4323082b3db4af5f5abf81ba06295
diff --git a/dev-java/checker-framework-qual/checker-framework-qual-3.42.0.ebuild b/dev-java/checker-framework-qual/checker-framework-qual-3.43.0.ebuild
index 5831dfb7010b..5831dfb7010b 100644
--- a/dev-java/checker-framework-qual/checker-framework-qual-3.42.0.ebuild
+++ b/dev-java/checker-framework-qual/checker-framework-qual-3.43.0.ebuild
diff --git a/dev-java/commons-codec/Manifest b/dev-java/commons-codec/Manifest
index f3f96becb4b7..6493f8c68cff 100644
--- a/dev-java/commons-codec/Manifest
+++ b/dev-java/commons-codec/Manifest
@@ -1,4 +1,2 @@
-DIST commons-codec-1.16.0-src.tar.gz 447581 BLAKE2B 111151b4cf409dbc6f69106ed30f2cfd60a1ab3aa15eb0cfe80ff1c2a06875f6856e387f66751c26f58dc29907ae7a03b16f23f7860114839df298a6c37d9fdd SHA512 5212beae43a59d5a92c80f87640278913bf07d6527ead573710391a8b5c813af67f8086de5cd80f4b06845752652684d7c28f6236f5a8bd0bd6a8b89dc0d9532
-DIST commons-codec-1.16.0-src.tar.gz.asc 488 BLAKE2B 96ac95b5efbc812b5df0d002eeff874ff23e05e0229e4f49bf29aaf9c75b32845adeb803c9c8d4d3b190bf2bfab626c59cb2fa2b2439b5611b158d27b73d4c0c SHA512 03f9281e93cd4a1cf42878bd25045368bc72a50edace9b38a977658e7e83b45bfe835065e80e0838a5e57d16a8737624ab388cdcd3fee58ec2114ff4fc241816
DIST commons-codec-1.16.1-src.tar.gz 450009 BLAKE2B da06c823fae5e106c27b10274fb159e3de62827fe1bb1ace8d65377da26d012534636a8ac58a558b653ba3a7e868bb2f7d94b2ea820b5ddc6400fd4d288c6ba9 SHA512 8e2d40ae625c04e61b0dd7473dea0b32fdd13a6d3aad47b8b052952ca46f57d3df4917133f523ea147305a1c7ed9267cce7c4fa34d901496e36e9d5de9856e61
DIST commons-codec-1.16.1-src.tar.gz.asc 488 BLAKE2B d3f193b602339714728875189ae90a49f70f9efb70076e73bdc460ccca99aea832a7cf0b18ecd212b016787f8cc96a1e30f9cb0af7b83f05db2dfba00d71c144 SHA512 a0716601374f17add25698eb5abd111c560c258f4ab18278b6bd857b2bf32916b5e4e590ce8c39a0bdef3b83e16e9330ce84268dec810db7dfab1679cace85af
diff --git a/dev-java/commons-codec/commons-codec-1.16.0.ebuild b/dev-java/commons-codec/commons-codec-1.16.0.ebuild
deleted file mode 100644
index 3f139af22920..000000000000
--- a/dev-java/commons-codec/commons-codec-1.16.0.ebuild
+++ /dev/null
@@ -1,46 +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-codec:commons-codec:${PV}"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple verify-sig
-
-DESCRIPTION="Implementations of common encoders and decoders in Java"
-HOMEPAGE="https://commons.apache.org/proper/commons-codec/"
-SRC_URI="mirror://apache/commons/codec/source/${P}-src.tar.gz
- verify-sig? ( https://downloads.apache.org/commons/codec/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"
-RESTRICT="test" #839681
-
-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:*
- test? (
- dev-java/commons-lang:3.6
- dev-java/hamcrest:0
- dev-java/junit:5[migration-support]
- )
-"
-RDEPEND=">=virtual/jre-1.8:*"
-
-JAVA_AUTOMATIC_MODULE_NAME="org.apache.commons.codec"
-JAVA_RESOURCE_DIRS="src/main/resources"
-JAVA_SRC_DIR="src/main/java"
-
-JAVA_TEST_GENTOO_CLASSPATH="
- junit-4
- junit-5
- commons-lang-3.6
- hamcrest
-"
-JAVA_TEST_RESOURCE_DIRS="src/test/resources"
-JAVA_TEST_SRC_DIR="src/test/java"
diff --git a/dev-java/commons-codec/commons-codec-1.16.1.ebuild b/dev-java/commons-codec/commons-codec-1.16.1.ebuild
index e092312d1927..96485a4fea70 100644
--- a/dev-java/commons-codec/commons-codec-1.16.1.ebuild
+++ b/dev-java/commons-codec/commons-codec-1.16.1.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${P}-src"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux"
RESTRICT="test" #839681
VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/commons.apache.org.asc"
diff --git a/dev-java/commons-compress/Manifest b/dev-java/commons-compress/Manifest
index 752307f08507..531be855daa7 100644
--- a/dev-java/commons-compress/Manifest
+++ b/dev-java/commons-compress/Manifest
@@ -1,4 +1,2 @@
-DIST commons-compress-1.26.0-src.tar.gz 54670636 BLAKE2B e29adcab9a10a7d4ada3624afb0d674a592fbd76d93badea833af355415a4e4adb1f954a2986cc9d1ae78dc84cd0380de0f21366cf7ae582e9d89f2cb2cea943 SHA512 9348e2792d67fe977cbfcede80ab95de96e582c3f7239e16e99360decac4e7703f57d4cfec9535cd4a0f884319df851eb5e44214ba8c3dd321cc6ea67f9d1abb
-DIST commons-compress-1.26.0-src.tar.gz.asc 488 BLAKE2B 0b51158ad0eeb91c8ecad1a6d87afd482ddaae7c6d4fd1d86b586886b1d6ba4073d9e6846a84334593676f1a6bb337b250009ddfc0f67838bab38238cd5d2a4c SHA512 31080e6fba38574d84b0af09450eba3c0b4b2781c50e432d5ce0e128a8b3edd105ad75908177c1aa8942d68a095d47e7f3f4d141c8f2227828b294f3da6b343c
DIST commons-compress-1.26.1-src.tar.gz 54843710 BLAKE2B 84c4c1363a4396a06773a8c120f5f32d98fceaa139e33a2a27df79a9aea41b8084a93a5735b0c4cd17fa88c404060af2336ab20f127acceb0da948ff170164c3 SHA512 096c94344a9bbcd021a3cce0869456cf6d22ca5136b63de017922d7c3de5d94b591961fe550201b654f9dc90b2cd8f32ef9bf1e507fddfb2e2f7c33bddc790c4
DIST commons-compress-1.26.1-src.tar.gz.asc 488 BLAKE2B 4df27d6d7ab226eb87ca6b7691c677b95d59c2d37f44ced6a5c0586aefa2506c9a635d869fd181526149416c228a8859a961386ca98519dc080709a55d9264c9 SHA512 b9533d63f961022ca42e79f8aed91a6c4b8a91cb0f3aa095a4ffa2202ed87d171f6c0d32babfbd730eb0c250be2331da4bd12e5251f7e7076f78536d20d96ced
diff --git a/dev-java/commons-compress/commons-compress-1.26.0-r1.ebuild b/dev-java/commons-compress/commons-compress-1.26.0-r1.ebuild
deleted file mode 100644
index f229ec9ba6d4..000000000000
--- a/dev-java/commons-compress/commons-compress-1.26.0-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# 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/commons-codec:0
- >=dev-java/commons-io-2.15.1:1
- dev-java/commons-lang:3.6
- 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/commons-compress-1.26.1.ebuild b/dev-java/commons-compress/commons-compress-1.26.1.ebuild
index b51066f5a17e..c8764e448be2 100644
--- a/dev-java/commons-compress/commons-compress-1.26.1.ebuild
+++ b/dev-java/commons-compress/commons-compress-1.26.1.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${P}-src"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+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 )"
diff --git a/dev-java/commons-compress/files/commons-compress-1.21-asm7+.patch b/dev-java/commons-compress/files/commons-compress-1.21-asm7+.patch
deleted file mode 100644
index e20fa89787dc..000000000000
--- a/dev-java/commons-compress/files/commons-compress-1.21-asm7+.patch
+++ /dev/null
@@ -1,164 +0,0 @@
-From 7709c8be97147e8d5c5d7fa42d076504931ba9e0 Mon Sep 17 00:00:00 2001
-From: Stephan Blecher <token_github@blecher.at>
-Date: Tue, 10 Aug 2021 14:39:21 +0200
-Subject: [PATCH] COMPRESS-582: update harmony to ASM >= 7.0
-
----
- pom.xml | 5 +--
- .../harmony/pack200/Pack200ClassReader.java | 2 +-
- .../compress/harmony/pack200/Segment.java | 35 +++++++++++++++----
- .../harmony/pack200/tests/ArchiveTest.java | 0
- 4 files changed, 32 insertions(+), 10 deletions(-)
- mode change 100644 => 100755 src/test/java/org/apache/commons/compress/harmony/pack200/tests/ArchiveTest.java
-
-diff --git a/pom.xml b/pom.xml
-index 28f50f06a..1c6844d24 100644
---- a/pom.xml
-+++ b/pom.xml
-@@ -78,6 +78,7 @@ Brotli, Zstandard and ar, cpio, jar, tar, zip, dump, 7z, arj.
- <commons.jacoco.version>0.8.7</commons.jacoco.version>
- <commons.japicmp.version>0.15.3</commons.japicmp.version>
- <commons.javadoc.version>3.3.0</commons.javadoc.version>
-+ <asm.version>7.0</asm.version>
- </properties>
-
- <issueManagement>
-@@ -119,9 +120,9 @@ Brotli, Zstandard and ar, cpio, jar, tar, zip, dump, 7z, arj.
-
- <!-- Pack200 -->
- <dependency>
-- <groupId>asm</groupId>
-+ <groupId>org.ow2.asm</groupId>
- <artifactId>asm</artifactId>
-- <version>3.2</version>
-+ <version>${asm.version}</version>
- <optional>true</optional>
- </dependency>
-
-diff --git a/src/main/java/org/apache/commons/compress/harmony/pack200/Pack200ClassReader.java b/src/main/java/org/apache/commons/compress/harmony/pack200/Pack200ClassReader.java
-index 2a017bc01..7022b7b30 100644
---- a/src/main/java/org/apache/commons/compress/harmony/pack200/Pack200ClassReader.java
-+++ b/src/main/java/org/apache/commons/compress/harmony/pack200/Pack200ClassReader.java
-@@ -40,7 +40,7 @@ public int readUnsignedShort(final int index) {
- // Doing this to check whether last load-constant instruction was ldc (18) or ldc_w (19)
- // TODO: Assess whether this impacts on performance
- final int unsignedShort = super.readUnsignedShort(index);
-- if (b[index - 1] == 19) {
-+ if (index > 0 && b[index - 1] == 19) {
- lastUnsignedShort = unsignedShort;
- } else {
- lastUnsignedShort = Short.MIN_VALUE;
-diff --git a/src/main/java/org/apache/commons/compress/harmony/pack200/Segment.java b/src/main/java/org/apache/commons/compress/harmony/pack200/Segment.java
-index 0609aa4c2..1bc73a018 100644
---- a/src/main/java/org/apache/commons/compress/harmony/pack200/Segment.java
-+++ b/src/main/java/org/apache/commons/compress/harmony/pack200/Segment.java
-@@ -32,12 +32,20 @@
- import org.objectweb.asm.FieldVisitor;
- import org.objectweb.asm.Label;
- import org.objectweb.asm.MethodVisitor;
-+import org.objectweb.asm.Opcodes;
- import org.objectweb.asm.Type;
-
-+
- /**
- * A Pack200 archive consists of one or more Segments.
- */
--public class Segment implements ClassVisitor {
-+public class Segment extends ClassVisitor {
-+
-+ public static int ASM_API = Opcodes.ASM4; /* see https://asm.ow2.io/javadoc/org/objectweb/asm/Opcodes.html#ASM4 */
-+
-+ public Segment() {
-+ super(ASM_API);
-+ }
-
- private SegmentHeader segmentHeader;
- private CpBands cpBands;
-@@ -255,8 +263,12 @@ public void visitEnd() {
- *
- * It delegates to BcBands for bytecode related visits and to ClassBands for everything else.
- */
-- public class SegmentMethodVisitor implements MethodVisitor {
--
-+ public class SegmentMethodVisitor extends MethodVisitor {
-+
-+ public SegmentMethodVisitor() {
-+ super(ASM_API);
-+ }
-+
- @Override
- public AnnotationVisitor visitAnnotation(final String desc, final boolean visible) {
- return new SegmentAnnotationVisitor(MetadataBandGroup.CONTEXT_METHOD, desc, visible);
-@@ -427,7 +439,7 @@ public ClassBands getClassBands() {
- /**
- * SegmentAnnotationVisitor implements <code>AnnotationVisitor</code> to visit Annotations found in a class file.
- */
-- public class SegmentAnnotationVisitor implements AnnotationVisitor {
-+ public class SegmentAnnotationVisitor extends AnnotationVisitor {
-
- private int context = -1;
- private int parameter = -1;
-@@ -443,17 +455,20 @@ public ClassBands getClassBands() {
- private final List nestPairN = new ArrayList();
-
- public SegmentAnnotationVisitor(final int context, final String desc, final boolean visible) {
-+ super(ASM_API);
- this.context = context;
- this.desc = desc;
- this.visible = visible;
- }
-
- public SegmentAnnotationVisitor(final int context) {
-+ super(ASM_API);
- this.context = context;
- }
-
- public SegmentAnnotationVisitor(final int context, final int parameter, final String desc,
- final boolean visible) {
-+ super(ASM_API);
- this.context = context;
- this.parameter = parameter;
- this.desc = desc;
-@@ -478,7 +493,7 @@ public AnnotationVisitor visitAnnotation(String name, final String desc) {
- nameRU.add(name);
- nestTypeRS.add(desc);
- nestPairN.add(Integer.valueOf(0));
-- return new AnnotationVisitor() {
-+ return new AnnotationVisitor(context, av) {
- @Override
- public void visit(final String name, final Object value) {
- final Integer numPairs = (Integer) nestPairN.remove(nestPairN.size() - 1);
-@@ -552,7 +567,7 @@ public void visitEnum(String name, final String desc, final String value) {
- }
- }
-
-- public class ArrayVisitor implements AnnotationVisitor {
-+ public class ArrayVisitor extends AnnotationVisitor {
-
- private final int indexInCaseArrayN;
- private final List caseArrayN;
-@@ -561,6 +576,8 @@ public void visitEnum(String name, final String desc, final String value) {
- private final List T;
-
- public ArrayVisitor(final List caseArrayN, final List T, final List nameRU, final List values) {
-+ super(ASM_API);
-+
- this.caseArrayN = caseArrayN;
- this.T = T;
- this.nameRU = nameRU;
-@@ -612,7 +629,11 @@ public void visitEnum(final String name, final String desc, final String value)
- * SegmentFieldVisitor implements <code>FieldVisitor</code> to visit the metadata relating to fields in a class
- * file.
- */
-- public class SegmentFieldVisitor implements FieldVisitor {
-+ public class SegmentFieldVisitor extends FieldVisitor {
-+
-+ public SegmentFieldVisitor() {
-+ super(ASM_API);
-+ }
-
- @Override
- public AnnotationVisitor visitAnnotation(final String desc, final boolean visible) {
-diff --git a/src/test/java/org/apache/commons/compress/harmony/pack200/tests/ArchiveTest.java b/src/test/java/org/apache/commons/compress/harmony/pack200/tests/ArchiveTest.java
-old mode 100644
-new mode 100755
diff --git a/dev-java/commons-lang/Manifest b/dev-java/commons-lang/Manifest
index 1ba8bac86a69..32bc9f65cb7e 100644
--- a/dev-java/commons-lang/Manifest
+++ b/dev-java/commons-lang/Manifest
@@ -1,4 +1,2 @@
-DIST commons-lang-3.13.0-sources.tar.gz 1133483 BLAKE2B bf2239b03129f3cc6104c8ff66ac9d0c2dc7367111e4a8c4d76b5e2773c56a17607e28b24f5d7283b2119c3421f1526dac4ef98ed16da9e8bf9d033fbb7a4b80 SHA512 6fca0ce86aea84458021360bac3f6775135a1a5c1826194921e2d4ead7c12f6ac560e7c3fc240112f862aaee24be8754c37dd867f45e9449cde4a388018d8691
-DIST commons-lang-3.13.0-sources.tar.gz.asc 488 BLAKE2B ecfc26f598b4a683a14803f5eee42f9b9ebfc7c02dac5b9fdc72ef97839e80ac648489da4e136f94044852fb09eff05bc08021cf1678ea9c19065a5b69c1375f SHA512 4d9dca040d9f06791f7f67ad7313e5a2c6bc19a07a62ae4dbcd10712afbcc51e926258938a54f0507d8cd1486041b46b29ed070b488b55833c30cbb6786c4145
DIST commons-lang-3.14.0-src.tar.gz 1153353 BLAKE2B 78d116864e488baf5c0c241b2304244f207c7b56b2f72006648de217d407d7c577a43ed89d78b0c868a2842eb1985c842e214078cc8e55bc5d93fac5553fa2ed SHA512 1ee4176c3588c11594a79f416a1f34b063cddb10c2124a37640fee48e5d8135091573002b6bf1eda5a60a324c1125665dadc93f9bfda32c9270c35113b6e1bea
DIST commons-lang-3.14.0-src.tar.gz.asc 488 BLAKE2B 3ef9b7529a1681e2687f533bf8d45a8394f6633e0a56e8e17ae63b2f8631f94c854b35e50b0f780908ffdcd0f8a8d99d8132aaa1ade5e932ee1ff56181b1ce77 SHA512 025673c12587970de5ebb62aad0d2d34cdbd57c575ebb6c83359b975b3d1ec50ff3caa544395ad04aecd59df454a12a769025635aa55d860195e39086ddcf47e
diff --git a/dev-java/commons-lang/commons-lang-3.13.0.ebuild b/dev-java/commons-lang/commons-lang-3.13.0.ebuild
deleted file mode 100644
index ebcca6edf83b..000000000000
--- a/dev-java/commons-lang/commons-lang-3.13.0.ebuild
+++ /dev/null
@@ -1,29 +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"
-MAVEN_ID="org.apache.commons:commons-lang3:3.13.0"
-
-inherit java-pkg-2 java-pkg-simple verify-sig
-
-DESCRIPTION="Commons components to manipulate core java classes"
-HOMEPAGE="https://commons.apache.org/proper/commons-lang/"
-SRC_URI="https://archive.apache.org/dist/commons/lang/source/${PN}3-${PV}-src.tar.gz -> ${P}-sources.tar.gz
- verify-sig? ( https://archive.apache.org/dist/commons/lang/source/${PN}3-${PV}-src.tar.gz.asc -> ${P}-sources.tar.gz.asc )"
-
-S="${WORKDIR}/${PN}3-${PV}-src"
-
-LICENSE="Apache-2.0"
-SLOT="3.6"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
-
-DEPEND=">=virtual/jdk-1.8:*"
-RDEPEND=">=virtual/jre-1.8:*"
-BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-commons )"
-VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/commons.apache.org.asc"
-
-JAVA_AUTOMATIC_MODULE_NAME="org.apache.commons.lang3"
-JAVA_ENCODING="ISO-8859-1"
-JAVA_SRC_DIR="src/main/java"
diff --git a/dev-java/commons-lang/commons-lang-3.14.0.ebuild b/dev-java/commons-lang/commons-lang-3.14.0.ebuild
index 51add8c5a5af..556c3414c385 100644
--- a/dev-java/commons-lang/commons-lang-3.14.0.ebuild
+++ b/dev-java/commons-lang/commons-lang-3.14.0.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${PN}3-${PV}-src"
LICENSE="Apache-2.0"
SLOT="3.6"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
DEPEND=">=virtual/jdk-1.8:*"
RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/commons-logging/Manifest b/dev-java/commons-logging/Manifest
index 25360c6e9487..e45becaca4a5 100644
--- a/dev-java/commons-logging/Manifest
+++ b/dev-java/commons-logging/Manifest
@@ -1 +1,2 @@
-DIST commons-logging-1.3.0_pre20230319.tar.gz 184984 BLAKE2B 01b46bdb657dfaf3ffb55b3440b416d61a419a3358e4d240cc7e25794f38e0061e14ee77e5578aedf1b50006d6ec65016c9e837bd13c4dab9a2182604fe85c72 SHA512 b586be5dd891572aa55c3066c3fb7d57ba5f31c0bfaa768b80cd8c1c5c659a8c718b4cb42e6c65332b52f073462432c0f81e4aaf1535afb781da9a7884cdc07e
+DIST commons-logging-1.3.1-src.tar.gz 189156 BLAKE2B 23308b2bff6ea67620b0f07f49a63ffdbd07833fc0d9a6654386f4c17c9125abef5ad2afb6d8c798dcb98bc3e99bd8d94d35b9deec569c3aec1dde20f69e1a1d SHA512 ffda970d086601df4b476caf8bd01d1bdc22dd7f8846a22287036f7f000ce6cf0a757d16621910f041f8d90aa6066819454b3977dd005ca66817bec59e91e91f
+DIST commons-logging-1.3.1-src.tar.gz.asc 488 BLAKE2B 3225a62f6269224f1b52907631be03d97cde65d1c7a76c06b6a23b9e30b1cee08b048eb4fdaa41b0a6b5bcf090b54c9dc54307fb1629b039b786fd426572a4d1 SHA512 6f13f85a5aeab1099ebfca38a6173384050b1f1c2e7eac93d978587c92751ddd24d583e39bc5a949f0caec66ca141d265147e63e9e2afea2094bda4667936a86
diff --git a/dev-java/commons-logging/commons-logging-1.3.0_pre20230319.ebuild b/dev-java/commons-logging/commons-logging-1.3.1.ebuild
index e7ce766be362..d070c40f2dee 100644
--- a/dev-java/commons-logging/commons-logging-1.3.0_pre20230319.ebuild
+++ b/dev-java/commons-logging/commons-logging-1.3.1.ebuild
@@ -1,63 +1,87 @@
-# 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="commons-logging:commons-logging:1.3.0"
+MAVEN_ID="commons-logging:commons-logging:${PV}"
JAVA_TESTING_FRAMEWORKS="junit-4"
-inherit java-pkg-2 java-pkg-simple
+inherit java-pkg-2 java-pkg-simple verify-sig
DESCRIPTION="Thin adapter allowing configurable bridging to other well known logging systems"
HOMEPAGE="https://commons.apache.org/proper/commons-logging/"
-MY_COMMIT="d376d3128663e53de4af948e161291e7ec0c6ec1"
-SRC_URI="https://github.com/apache/${PN}/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-${MY_COMMIT}"
+SRC_URI="mirror://apache/commons/logging/source/${P}-src.tar.gz
+ verify-sig? ( https://downloads.apache.org/commons/logging/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 ~ppc-macos ~x64-macos ~x64-solaris"
IUSE="log4j"
-CDEPEND="
+VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/commons.apache.org.asc"
+BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-commons )"
+COMMON_DEPEND="
+ dev-java/jakarta-servlet-api:4
+ dev-java/slf4j-api:0
log4j? (
dev-java/log4j-12-api:2
dev-java/log4j-api:2
- dev-java/log4j-core:2
- )
-"
+ )"
-DEPEND="${CDEPEND}
- dev-java/javax-servlet-api:2.5
- >=virtual/jdk-1.8:*
-"
+DEPEND="${COMMON_DEPEND}
+ >=virtual/jdk-11:*"
-RDEPEND="${CDEPEND}
+RDEPEND="${COMMON_DEPEND}
>=virtual/jre-1.8:*"
-DOCS=( README.md src/changes/changes.xml )
+DOCS=( NOTICE.txt src/changes/changes.xml )
+HTML_DOCS=( PROPOSAL.html )
JAVA_AUTOMATIC_MODULE_NAME="org.apache.commons.logging"
JAVA_ENCODING="iso-8859-1"
-JAVA_CLASSPATH_EXTRA="javax-servlet-api-2.5"
+JAVA_GENTOO_CLASSPATH="
+ jakarta-servlet-api-4
+ slf4j-api
+"
JAVA_SRC_DIR="src/main/java"
src_prepare() {
java-pkg-2_src_prepare
+
+ # javax-servlet-api and log4j* do not presently provide module-info
+ cat > src/main/java/module-info.java <<-EOF || die
+ module org.apache.commons.logging {
+ // requires static org.apache.logging.log4j;
+ requires static org.slf4j;
+ requires static java.logging;
+ // requires static log4j;
+ // requires static servlet.api;
+ // requires static org.apache.log4j;
+ requires java.base;
+ exports org.apache.commons.logging;
+ exports org.apache.commons.logging.impl;
+ uses org.apache.commons.logging.LogFactory;
+ }
+ EOF
+
# https://avalon.apache.org/closed.html Apache Avalon has closed.
rm src/main/java/org/apache/commons/logging/impl/{Avalon,LogKit}Logger.java || die
rm src/test/java/org/apache/commons/logging/{avalon/AvalonLogger,logkit/Standard}TestCase.java || die
if use !log4j; then
rm src/main/java/org/apache/commons/logging/impl/Log4JLogger.java || die
+ rm src/main/java/org/apache/commons/logging/impl/Log4jApiLogFactory.java || die
+ else
+ JAVA_GENTOO_CLASSPATH+="
+ log4j-12-api-2
+ log4j-api-2
+ "
fi
}
src_compile() {
- if use log4j; then
- JAVA_GENTOO_CLASSPATH="log4j-12-api-2,log4j-api-2,log4j-core-2"
- fi
java-pkg-simple_src_compile
pushd target/classes > /dev/null || die
@@ -65,14 +89,14 @@ src_compile() {
# Need Automatic-Module-Name also for the other JAR files
jar xvf ../../commons-logging.jar META-INF/MANIFEST.MF || die
- # https://github.com/apache/commons-logging/blob/058cf5ee350cd83d1ab28b000ad6be903ca160c5/pom.xml#L215-L236
+ # pom.xml, lines 81-103
jar -cvfm ../../commons-logging-api.jar META-INF/MANIFEST.MF \
$(find . -type f -name '*.class' \
! -name 'Jdk13LumberjackLogger.class' \
! -name 'ServletContextCleaner.class' \
) || die
- # https://github.com/apache/commons-logging/blob/058cf5ee350cd83d1ab28b000ad6be903ca160c5/pom.xml#L240-L257
+ # pom.xml, lines 205-124
jar -cvfm ../../commons-logging-adapters.jar META-INF/MANIFEST.MF \
$(find . -type f -path './org/apache/commons/logging/impl/**.class' \
! -name 'WeakHashtable*.class' \
@@ -94,13 +118,21 @@ src_test() {
rm src/test/java/org/apache/commons/logging/pathable/ParentFirstTestCase.java || die # Log4JLogger
rm src/test/java/org/apache/commons/logging/pathable/ChildFirstTestCase.java || die # Log4JLogger
rm -r src/test/java/org/apache/commons/logging/log4j || die
+ rm src/test/java/org/apache/commons/logging/log4j2/CallerInformationTestCase.java || die
+ # error: package ch.qos.logback.classic does not exist
+ rm src/test/java/org/apache/commons/logging/slf4j/CallerInformationTestCase.java || die
JAVA_TEST_EXCLUDES=(
- org.apache.commons.logging.security.SecurityForbiddenTestCase # 2 tests 1 failing
org.apache.commons.logging.jdk14.TestHandler # No runnable methods
+ # junit.framework.AssertionFailedError: Wrong factory retrieved through
+ # ServiceLoader: org.apache.commons.logging.impl.Slf4jLogFactory
+ org.apache.commons.logging.serviceloader.ServiceLoaderTestCase
+ # junit.framework.ComparisonFailure: Log class expected:<...ommons.logging.impl.[NoOp]Log>
+ # but was:<...ommons.logging.impl.[Slf4jLogFactory$Slf4j]Log>
+ org.apache.commons.logging.noop.NoOpLogTestCase
)
JAVA_TEST_EXTRA_ARGS=(
- -Dservlet-api="$(java-pkg_getjars javax-servlet-api-2.5)"
+ -Dservlet-api="$(java-pkg_getjars jakarta-servlet-api-4)"
-Dcommons-logging="commons-logging.jar"
-Dcommons-logging-api="commons-logging-api.jar"
-Dcommons-logging-adapters="commons-logging-adapters.jar"
diff --git a/dev-java/commons-net/Manifest b/dev-java/commons-net/Manifest
index a5f5fc2ada38..ff3a88cde8b6 100644
--- a/dev-java/commons-net/Manifest
+++ b/dev-java/commons-net/Manifest
@@ -1,4 +1,2 @@
DIST commons-net-3.10.0-src.tar.gz 450082 BLAKE2B 0df46b21ca298393500494e41d918b3fc6e700485c4d9dfb2bab61d8f834a4f44dd881c464c4008731deec9fc82ca36e0442022f0942b3e59e384a2b44329660 SHA512 d9d80255feddfb434d3baa629aa9e6d8feffd530c5e3172106fec55bbc986f6423a46dc9e737a1bb7020c62447229e6b83d0b7f9582d041e1def423536cc92dd
DIST commons-net-3.10.0-src.tar.gz.asc 488 BLAKE2B 31a15e952c55079e595f33be1730126b85c669b481c649e401cb4617a5489fc3e3025e8c172f8193b190b16fe55d9c78c171d16d4adf7fa1a8e71648e295bc77 SHA512 ab27b1fa2c02d79eff26f93697fafc54f22a7368db631bb6f7173b8702cda10836ac8b656df987135fe5c1d39a557840fefb0355d8d52f0e4815808d4938de18
-DIST commons-net-3.9.0-src.tar.gz 440911 BLAKE2B d7f24bff2e36d727bc12bf700b5a5ba9bf6b34a1d63cf892124b81ced113e4b66ebdb8b1eb54fbac33b76efcfc7333150c8d5ce87039cc7204ebf16bb64c8044 SHA512 a2d4ef4937701f28304fdb9a39a0d4a8fdd5fd7ae84c6d647a6b9e05eee68cb4fde8ae9eedd94f45fdc0194d160dd9f64b3c1cfbdd8bcea2214e9826ace32877
-DIST commons-net-3.9.0-src.tar.gz.asc 488 BLAKE2B 7999c63348fdb63de670cf1ace3c928796c663aa960494e0d4a398529b19c4834e9c3d2d8dbdb13e2ba392909e1761458c99332f35e39e0efb0f212b3c0f32de SHA512 72da1fe78bc6c0dea70d171c3c60c7eee8387bb28244f8b67bf38b66c3e7f2c183e4413c3f090a5b1a591ce64a6d43434093425f44c10a9dd03f0b354306e017
diff --git a/dev-java/commons-net/commons-net-3.10.0.ebuild b/dev-java/commons-net/commons-net-3.10.0.ebuild
index d49ece23e44e..d4161a272d96 100644
--- a/dev-java/commons-net/commons-net-3.10.0.ebuild
+++ b/dev-java/commons-net/commons-net-3.10.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://apache/commons/net/source/commons-net-${PV}-src.tar.gz
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+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:*"
diff --git a/dev-java/commons-net/commons-net-3.9.0.ebuild b/dev-java/commons-net/commons-net-3.9.0.ebuild
deleted file mode 100644
index fd0d7b728a57..000000000000
--- a/dev-java/commons-net/commons-net-3.9.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc examples source"
-MAVEN_ID="commons-net:commons-net:3.9.0"
-# No tests, junit-jupiter and junit-vintage are not packaged.
-# JAVA_TESTING_FRAMEWORKS="junit-vintage junit-jupiter"
-
-inherit java-pkg-2 java-pkg-simple verify-sig
-
-DESCRIPTION="Client-oriented Java library to implement many Internet protocols"
-HOMEPAGE="https://commons.apache.org/proper/commons-net/"
-SRC_URI="mirror://apache/commons/net/source/commons-net-${PV}-src.tar.gz
- verify-sig? ( https://downloads.apache.org/commons/net/source/commons-net-${PV}-src.tar.gz.asc )"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-
-DEPEND=">=virtual/jdk-1.8:*"
-RDEPEND=">=virtual/jre-1.8:*"
-BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-commons )"
-VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/commons.apache.org.asc"
-
-DOCS=(
- CONTRIBUTING.md
- NOTICE.txt
- README.md
- RELEASE-NOTES.txt
-)
-
-S="${WORKDIR}/${P}-src"
-
-JAVA_AUTOMATIC_MODULE_NAME="org.apache.commons.net"
-JAVA_ENCODING="iso-8859-1"
-JAVA_RESOURCE_DIRS="src/main/resources"
-JAVA_SRC_DIR="src/main/java"
diff --git a/dev-java/commons-validator/Manifest b/dev-java/commons-validator/Manifest
index 05a4e983603d..c8d595696045 100644
--- a/dev-java/commons-validator/Manifest
+++ b/dev-java/commons-validator/Manifest
@@ -1,3 +1,2 @@
-DIST commons-validator-1.7-src.tar.gz 289870 BLAKE2B 576c6ac00187b67618eee251a69e7166cd817bb6184f4cf138a226539fc100a1a4e32ebc4ef6cea567aff581d11c63a817a9dad4836142de4d9a3b313d59a31b SHA512 4007872fda856e9e154f325270748081920d21a716143389713706ca0e5a8ec3c88b9b978d75801a5926723764a81f1dbfd77a8fd4b361b16cd65e84cf47a868
DIST commons-validator-1.8.0-src.tar.gz 291779 BLAKE2B 0a0a0f9019b39ff1899be2f65e5e6750e12ed7b6833cc7e03279b5bedd3b3c3e02561891ba8885b50c356d103dabe207bf18adf04d8e6ba627397c5b81656603 SHA512 f0c2662e5db0bbc6ee9d05d5508caa02bf45b7c7ada92f4a97a867848f3d704b35552d47859a46567705194248e7b88cd8df8f082939012ab60b6aed446e36b2
DIST commons-validator-1.8.0-src.tar.gz.asc 488 BLAKE2B 9e9b7f54f430c5a42de8af6d8c55a0f4029e3a41f0bc41efb08863a9470f0935ad23d6ba6757cf4d5e28c11626e15ae392807ae9c33529a3feb15b90a2316ca5 SHA512 f04709f64026560bfd2f5cc51ebf373d44359452f41af73b53d105059a6760786f49d89837c624cd133875de0a37358af1cf587a6db567e7cc76ce823efa9efd
diff --git a/dev-java/commons-validator/commons-validator-1.7.ebuild b/dev-java/commons-validator/commons-validator-1.7.ebuild
deleted file mode 100644
index b71d4a85a4b9..000000000000
--- a/dev-java/commons-validator/commons-validator-1.7.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://artfiles.org/apache.org//commons/validator/source/commons-validator-1.7-src.tar.gz --slot 0 --keywords "~amd64 ~ppc64 ~x86" --ebuild commons-validator-1.7.ebuild
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="commons-validator:commons-validator:1.7"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Commons component to validate user input, or data input"
-HOMEPAGE="https://commons.apache.org/proper/commons-validator/"
-SRC_URI="mirror://apache/commons/validator/source/${P}-src.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
-
-# Common dependencies
-# POM: pom.xml
-# commons-beanutils:commons-beanutils:1.9.4 -> >=dev-java/commons-beanutils-1.9.4:1.7
-# commons-collections:commons-collections:3.2.2 -> >=dev-java/commons-collections-3.2.2:0
-# commons-digester:commons-digester:2.1 -> >=dev-java/commons-digester-2.1:2.1
-# commons-logging:commons-logging:1.2 -> >=dev-java/commons-logging-1.2:0
-
-CDEPEND="
- dev-java/commons-beanutils:1.7
- dev-java/commons-digester:2.1
- dev-java/commons-logging:0
-"
-
-# Compile dependencies
-# POM: pom.xml
-# test? junit:junit:4.13 -> >=dev-java/junit-4.13.1:4
-# test? org.apache.commons:commons-csv:1.6 -> dev-java/commons-csv:0
-# test? org.bitstrings.test:junit-clptr:1.2.2 -> dev-java/junit-clptr:0
-#
-# restricting for compilation to jdk 1.8 just because of tests which
-# are not adjusted by upstream for jdk 11, otherwise the package works fine with jdk 11
-
-DEPEND="${CDEPEND}
- virtual/jdk:1.8
- test? (
- dev-java/commons-csv:0
- dev-java/junit-clptr:0
- )
-"
-RDEPEND="${CDEPEND}
- >=virtual/jre-1.8:*"
-
-S="${WORKDIR}/${P}-src"
-
-JAVA_GENTOO_CLASSPATH="commons-beanutils-1.7,commons-digester-2.1,commons-logging"
-JAVA_SRC_DIR="src/main/java"
-JAVA_RESOURCE_DIRS="src/main/resources"
-
-JAVA_TEST_GENTOO_CLASSPATH="commons-csv,junit-4,junit-clptr"
-JAVA_TEST_SRC_DIR="src/test/java"
-JAVA_TEST_RESOURCE_DIRS="src/test/resources"
diff --git a/dev-java/commons-validator/commons-validator-1.8.0.ebuild b/dev-java/commons-validator/commons-validator-1.8.0.ebuild
index 293c25a82599..e92d0c4c8374 100644
--- a/dev-java/commons-validator/commons-validator-1.8.0.ebuild
+++ b/dev-java/commons-validator/commons-validator-1.8.0.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-vfs/commons-vfs-2.0-r3.ebuild b/dev-java/commons-vfs/commons-vfs-2.0-r4.ebuild
index 418ad23cc41f..00e0b245b14b 100644
--- a/dev-java/commons-vfs/commons-vfs-2.0-r3.ebuild
+++ b/dev-java/commons-vfs/commons-vfs-2.0-r4.ebuild
@@ -3,9 +3,9 @@
EAPI=8
-JAVA_PKG_IUSE="source"
+JAVA_PKG_IUSE="doc source"
-inherit java-pkg-2 java-ant-2
+inherit java-pkg-2 java-pkg-simple
DESCRIPTION="A single API for accessing various different file systems"
HOMEPAGE="https://commons.apache.org/vfs/"
@@ -16,8 +16,8 @@ LICENSE="Apache-2.0"
SLOT="2"
KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux"
-CDEPEND="
- dev-java/ant:0
+CP_DEPEND="
+ >=dev-java/ant-1.10.14-r3:0
dev-java/commons-collections:0
dev-java/commons-logging:0
dev-java/commons-net:0
@@ -25,26 +25,19 @@ CDEPEND="
dev-java/jackrabbit-webdav:0
dev-java/jsch:0"
-DEPEND="${CDEPEND}
+DEPEND="${CP_DEPEND}
>=virtual/jdk-1.8:*"
-RDEPEND="${CDEPEND}
+RDEPEND="${CP_DEPEND}
>=virtual/jre-1.8:*"
PATCHES=(
"${FILESDIR}"/${P}-incompatibility.patch
+ "${FILESDIR}"/commons-vfs-2.0-utf8.patch
)
-EANT_GENTOO_CLASSPATH="
- ant
- commons-collections
- commons-logging
- commons-net
- commons-httpclient-3
- jackrabbit-webdav
- jsch
-"
-EANT_EXTRA_ARGS="-Dlibdir=${T}"
+JAVA_RESOURCE_DIRS="resources/src/main/java"
+JAVA_SRC_DIR="src/main/java"
# The build.xml is generated from maven and can't run the tests properly
# Use maven test to execute these manually but that means downloading deps from
@@ -55,17 +48,9 @@ EANT_EXTRA_ARGS="-Dlibdir=${T}"
#}
src_prepare() {
- default
- cp "${FILESDIR}"/${P}-build.xml build.xml || die
-
- java-ant_rewrite-classpath
- java-ant_ignore-system-classes
-}
-
-src_install() {
- java-pkg_newjar target/*.jar
-
- # [javadoc] No javadoc created, no need to post-process anything
-# use doc && java-pkg_dojavadoc target/site/apidocs
- use source && java-pkg_dosrc src/main/java
+ default #780585
+ java-pkg-2_src_prepare
+ mkdir resources || die
+ find src/main/java -type f ! -name '*.java' ! -name 'package.html' \
+ | xargs cp --parent -t resources || die
}
diff --git a/dev-java/commons-vfs/files/commons-vfs-2.0-build.xml b/dev-java/commons-vfs/files/commons-vfs-2.0-build.xml
deleted file mode 100644
index 753e93d669f2..000000000000
--- a/dev-java/commons-vfs/files/commons-vfs-2.0-build.xml
+++ /dev/null
@@ -1,298 +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/29/13 3:05 PM -->
-<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/ -->
-<!-- -->
-<!-- ====================================================================== -->
-
-<project name="commons-vfs2-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="commons-vfs2-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/java"/>
- <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.build.testResourceDir.1" value=".."/>
- <property name="maven.test.reports" value="${maven.build.dir}/test-reports"/>
- <property name="maven.reporting.outputDirectory" value="${maven.build.dir}/site"/>
-
- <property name="maven.repo.local" value="${user.home}/.m2/repository"/>
- <property name="maven.settings.offline" value="false"/>
- <property name="maven.settings.interactiveMode" value="true"/>
-
- <!-- ====================================================================== -->
- <!-- Defining classpaths -->
- <!-- ====================================================================== -->
-
- <path id="build.classpath">
- <pathelement location="${maven.repo.local}/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar"/>
- <pathelement location="${maven.repo.local}/ant/ant/1.6.2/ant-1.6.2.jar"/>
- <pathelement location="${maven.repo.local}/commons-net/commons-net/2.2/commons-net-2.2.jar"/>
- <pathelement location="${maven.repo.local}/commons-collections/commons-collections/3.1/commons-collections-3.1.jar"/>
- <pathelement location="${maven.repo.local}/commons-httpclient/commons-httpclient/3.1/commons-httpclient-3.1.jar"/>
- <pathelement location="${maven.repo.local}/commons-codec/commons-codec/1.2/commons-codec-1.2.jar"/>
- <pathelement location="${maven.repo.local}/org/apache/jackrabbit/jackrabbit-webdav/1.5.2/jackrabbit-webdav-1.5.2.jar"/>
- <pathelement location="${maven.repo.local}/org/apache/jackrabbit/jackrabbit-jcr-commons/1.5.2/jackrabbit-jcr-commons-1.5.2.jar"/>
- <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.5.3/slf4j-api-1.5.3.jar"/>
- <pathelement location="${maven.repo.local}/com/jcraft/jsch/0.1.42/jsch-0.1.42.jar"/>
- <pathelement location="${maven.repo.local}/org/apache/maven/scm/maven-scm-api/1.4/maven-scm-api-1.4.jar"/>
- <pathelement location="${maven.repo.local}/org/codehaus/plexus/plexus-utils/1.5.6/plexus-utils-1.5.6.jar"/>
- <pathelement location="${maven.repo.local}/org/apache/maven/scm/maven-scm-provider-svnexe/1.4/maven-scm-provider-svnexe-1.4.jar"/>
- <pathelement location="${maven.repo.local}/org/apache/maven/scm/maven-scm-provider-svn-commons/1.4/maven-scm-provider-svn-commons-1.4.jar"/>
- <pathelement location="${maven.repo.local}/regexp/regexp/1.3/regexp-1.3.jar"/>
- </path>
- <path id="build.test.classpath">
- <pathelement location="${maven.repo.local}/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar"/>
- <pathelement location="${maven.repo.local}/ant/ant/1.6.2/ant-1.6.2.jar"/>
- <pathelement location="${maven.repo.local}/commons-net/commons-net/2.2/commons-net-2.2.jar"/>
- <pathelement location="${maven.repo.local}/org/apache/commons/commons-compress/1.1/commons-compress-1.1.jar"/>
- <pathelement location="${maven.repo.local}/commons-collections/commons-collections/3.1/commons-collections-3.1.jar"/>
- <pathelement location="${maven.repo.local}/commons-httpclient/commons-httpclient/3.1/commons-httpclient-3.1.jar"/>
- <pathelement location="${maven.repo.local}/commons-codec/commons-codec/1.2/commons-codec-1.2.jar"/>
- <pathelement location="${maven.repo.local}/org/apache/jackrabbit/jackrabbit-webdav/1.5.2/jackrabbit-webdav-1.5.2.jar"/>
- <pathelement location="${maven.repo.local}/org/apache/jackrabbit/jackrabbit-jcr-commons/1.5.2/jackrabbit-jcr-commons-1.5.2.jar"/>
- <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.5.3/slf4j-api-1.5.3.jar"/>
- <pathelement location="${maven.repo.local}/com/jcraft/jsch/0.1.42/jsch-0.1.42.jar"/>
- <pathelement location="${maven.repo.local}/junit/junit/4.8.2/junit-4.8.2.jar"/>
- <pathelement location="${maven.repo.local}/org/apache/maven/scm/maven-scm-api/1.4/maven-scm-api-1.4.jar"/>
- <pathelement location="${maven.repo.local}/org/codehaus/plexus/plexus-utils/1.5.6/plexus-utils-1.5.6.jar"/>
- <pathelement location="${maven.repo.local}/org/apache/maven/scm/maven-scm-provider-svnexe/1.4/maven-scm-provider-svnexe-1.4.jar"/>
- <pathelement location="${maven.repo.local}/org/apache/maven/scm/maven-scm-provider-svn-commons/1.4/maven-scm-provider-svn-commons-1.4.jar"/>
- <pathelement location="${maven.repo.local}/regexp/regexp/1.3/regexp-1.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}"
- encoding="iso-8859-1"
- nowarn="false"
- debug="true"
- optimize="false"
- deprecation="true"
- target="1.5"
- verbose="false"
- fork="false"
- source="1.5">
- <src>
- <pathelement location="${maven.build.srcDir.0}"/>
- </src>
- <classpath refid="build.classpath"/>
- </javac>
- <copy todir="${maven.build.outputDir}">
- <fileset dir="${maven.build.resourceDir.0}">
- <exclude name="**/*.java"/>
- </fileset>
- </copy>
- <mkdir dir="${maven.build.outputDir}/META-INF"/>
- <copy todir="${maven.build.outputDir}/META-INF">
- <fileset dir="${maven.build.resourceDir.1}">
- <include name="NOTICE.txt"/>
- <include name="LICENSE.txt"/>
- </fileset>
- </copy>
- </target>
-
- <!-- ====================================================================== -->
- <!-- Test-compilation target -->
- <!-- ====================================================================== -->
-
- <target name="compile-tests"
- depends="compile"
- description="Compile the test code"
- unless="maven.test.skip">
- <mkdir dir="${maven.build.testOutputDir}"/>
- <javac destdir="${maven.build.testOutputDir}"
- encoding="iso-8859-1"
- nowarn="false"
- debug="true"
- optimize="false"
- deprecation="true"
- target="1.5"
- verbose="false"
- fork="false"
- source="1.5">
- <src>
- <pathelement location="${maven.build.testDir.0}"/>
- </src>
- <classpath>
- <path refid="build.test.classpath"/>
- <pathelement location="${maven.build.outputDir}"/>
- </classpath>
- </javac>
- <copy todir="${maven.build.testOutputDir}">
- <fileset dir="${maven.build.testResourceDir.0}"/>
- </copy>
- <mkdir dir="${maven.build.testOutputDir}/META-INF"/>
- <copy todir="${maven.build.testOutputDir}/META-INF">
- <fileset dir="${maven.build.testResourceDir.1}">
- <include name="NOTICE.txt"/>
- <include name="LICENSE.txt"/>
- </fileset>
- </copy>
- </target>
-
- <!-- ====================================================================== -->
- <!-- Run all tests -->
- <!-- ====================================================================== -->
-
- <target name="test"
- depends="compile-tests, junit-missing"
- unless="junit.skipped"
- description="Run the test cases">
- <mkdir dir="${maven.test.reports}"/>
- <junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir=".">
- <sysproperty key="basedir" value="."/>
- <formatter type="xml"/>
- <formatter type="plain" usefile="false"/>
- <classpath>
- <path refid="build.test.classpath"/>
- <pathelement location="${maven.build.outputDir}"/>
- <pathelement location="${maven.build.testOutputDir}"/>
- </classpath>
- <batchtest todir="${maven.test.reports}" unless="test">
- <fileset dir="${maven.build.testDir.0}">
- <include name="**/Test*.java"/>
- <include name="**/*Test.java"/>
- <include name="**/*TestCase.java"/>
- <exclude name="**/RunTest.java"/>
- <exclude name="**/*$*"/>
- </fileset>
- </batchtest>
- <batchtest todir="${maven.test.reports}" if="test">
- <fileset dir="${maven.build.testDir.0}">
- <include name="**/${test}.java"/>
- <exclude name="**/RunTest.java"/>
- <exclude name="**/*$*"/>
- </fileset>
- </batchtest>
- </junit>
- </target>
-
- <target name="test-junit-present">
- <available classname="junit.framework.Test" property="junit.present"/>
- </target>
-
- <target name="test-junit-status"
- depends="test-junit-present">
- <condition property="junit.missing">
- <and>
- <isfalse value="${junit.present}"/>
- <isfalse value="${maven.test.skip}"/>
- </and>
- </condition>
- <condition property="junit.skipped">
- <or>
- <isfalse value="${junit.present}"/>
- <istrue value="${maven.test.skip}"/>
- </or>
- </condition>
- </target>
-
- <target name="junit-missing"
- depends="test-junit-status"
- if="junit.missing">
- <echo>=================================== WARNING ===================================</echo>
- <echo> JUnit is not present in your $ANT_HOME/lib directory. Tests not executed.</echo>
- <echo>===============================================================================</echo>
- </target>
-
- <!-- ====================================================================== -->
- <!-- Javadoc target -->
- <!-- ====================================================================== -->
-
- <target name="javadoc" description="Generates the Javadoc of the application">
- <javadoc sourcepath="${maven.build.srcDir.0}"
- packagenames="*"
- destdir="${maven.reporting.outputDirectory}/apidocs"
- access="protected"
- old="false"
- verbose="false"
- encoding="iso-8859-1"
- version="true"
- use="true"
- author="true"
- splitindex="false"
- nodeprecated="false"
- nodeprecatedlist="false"
- notree="false"
- noindex="false"
- nohelp="false"
- nonavbar="false"
- serialwarn="false"
- charset="ISO-8859-1"
- source="1.5"
- linksource="true"
- breakiterator="false">
- <link href="http://download.oracle.com/javase/6/docs/api/"/>
- </javadoc>
- </target>
-
- <!-- ====================================================================== -->
- <!-- Package target -->
- <!-- ====================================================================== -->
-
- <target name="package" depends="compile,test" description="Package the application">
- <jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar"
- compress="true"
- index="false"
- basedir="${maven.build.outputDir}"
- excludes="**/package.html">
- </jar>
- </target>
-
- <!-- ====================================================================== -->
- <!-- A dummy target for the package named after the type it creates -->
- <!-- ====================================================================== -->
-
- <target name="jar" depends="package" description="Builds the jar for the application"/>
-
- <!-- ====================================================================== -->
- <!-- Download dependencies target -->
- <!-- ====================================================================== -->
-
- <target name="test-offline">
- <condition property="maven.mode.offline">
- <equals arg1="${maven.settings.offline}" arg2="true"/>
- </condition>
- </target>
-
- <target name="get-deps"
- depends="test-offline"
- description="Download all dependencies"
- unless="maven.mode.offline">
- </target>
-
-</project>
diff --git a/dev-java/commons-vfs/files/commons-vfs-2.0-utf8.patch b/dev-java/commons-vfs/files/commons-vfs-2.0-utf8.patch
new file mode 100644
index 000000000000..199fb380c3cb
--- /dev/null
+++ b/dev-java/commons-vfs/files/commons-vfs-2.0-utf8.patch
@@ -0,0 +1,13 @@
+diff --git a/src/main/java/org/apache/commons/vfs2/FileSystemManager.java b/src/main/java/org/apache/commons/vfs2/FileSystemManager.java
+index bb8cc2a..1e26559 100644
+--- a/src/main/java/org/apache/commons/vfs2/FileSystemManager.java
++++ b/src/main/java/org/apache/commons/vfs2/FileSystemManager.java
+@@ -98,7 +98,7 @@ public interface FileSystemManager
+ FileObject resolveFile(String name, FileSystemOptions fileSystemOptions)
+ throws FileSystemException;
+
+- /**
++ /**
+ * Locates a file by name. The name is resolved as described
+ * <a href="#naming">above</a>. That is, the name can be either
+ * an absolute URI, an absolute file name, or a relative path to
diff --git a/dev-java/concurrentlinkedhashmap-lru/concurrentlinkedhashmap-lru-1.4.2.ebuild b/dev-java/concurrentlinkedhashmap-lru/concurrentlinkedhashmap-lru-1.4.2.ebuild
index 89a267f52c52..4f495a844c3e 100644
--- a/dev-java/concurrentlinkedhashmap-lru/concurrentlinkedhashmap-lru-1.4.2.ebuild
+++ b/dev-java/concurrentlinkedhashmap-lru/concurrentlinkedhashmap-lru-1.4.2.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${PN%lru}${P}"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64"
+KEYWORDS="amd64 ~arm ~arm64 ~x86"
CP_DEPEND="dev-java/jsr305:0"
diff --git a/dev-java/cortado/Manifest b/dev-java/cortado/Manifest
index df5b340e6078..3ddb27a53bab 100644
--- a/dev-java/cortado/Manifest
+++ b/dev-java/cortado/Manifest
@@ -1 +1,2 @@
DIST cortado-0.6.0.tar.gz 233854 BLAKE2B 54ace339a6038b46bbf2d993eb911f1845f8717dcf4eeaae0fcd807488a0293bb6618fe72ffa5bc425dc9f7d47f5362ff55168191aab15dbed59547f7c1d72dd SHA512 56113259da05a73f4d4e7aca92d031fa934987ad3607a69b31666c9e452330a95728e7780c45d825ddeb9c0815ace479d7a55df0e68a50e63a76ddf5602c76da
+DIST cortado-sun.audio-Java-9.patch 1653 BLAKE2B aa365d4c8746cb69aba3c78c1db37560808c99b73a1a0a4b8170e6df630faf526b793f4aaf5bdbaa28ecb9cf63cd97986400c6bc0acf59c9ddd9f12a9022e1be SHA512 e78468ee40b4eaae7da49de0d820a66c0ccb23a75974499de7e7cb9c8c6870521c4c5587b5d791e45c9d2316354dae422ff41ac0c6128381aa820d57f74a5527
diff --git a/dev-java/cortado/cortado-0.6.0-r3.ebuild b/dev-java/cortado/cortado-0.6.0-r3.ebuild
new file mode 100644
index 000000000000..94d8827d6314
--- /dev/null
+++ b/dev-java/cortado/cortado-0.6.0-r3.ebuild
@@ -0,0 +1,37 @@
+# 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
+
+DESCRIPTION="Multimedia framework for Java written by Fluendo"
+HOMEPAGE="https://www.theora.org/cortado/"
+SRC_URI="https://downloads.xiph.org/releases/cortado/${P}.tar.gz
+ https://sources.debian.org/data/main/c/cortado/0.6.0-5/debian/patches/sun.audio-Java-9.patch
+ -> cortado-sun.audio-Java-9.patch"
+S="${WORKDIR}/${P}"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
+
+DOCS=( ChangeLog HACKING NEWS README RELEASE TODO )
+
+PATCHES=( "${DISTDIR}/cortado-sun.audio-Java-9.patch" )
+
+JAVA_SRC_DIR="src"
+
+src_prepare() {
+ default #780585
+ java-pkg-2_src_prepare
+ cat > scripts/get-revision <<-EOF || die
+ #!/bin/sh
+ echo ${PV}
+ EOF
+}
diff --git a/dev-java/cpptasks/cpptasks-1.0_beta5-r2.ebuild b/dev-java/cpptasks/cpptasks-1.0_beta5-r2.ebuild
index 425390046c7e..4908c223c0ce 100644
--- a/dev-java/cpptasks/cpptasks-1.0_beta5-r2.ebuild
+++ b/dev-java/cpptasks/cpptasks-1.0_beta5-r2.ebuild
@@ -9,7 +9,7 @@ inherit java-pkg-2 java-ant-2
DESCRIPTION="Ant-tasks to compile various source languages and produce executables"
HOMEPAGE="https://ant-contrib.sourceforge.net/"
-SRC_URI="mirror://sourceforge/ant-contrib/ant-contrib/${P/_/-}/${P/_beta/b}.tar.gz"
+SRC_URI="https://downloads.sourceforge.net/ant-contrib/ant-contrib/${P/_/-}/${P/_beta/b}.tar.gz"
S="${WORKDIR}/${P/_beta/b}"
LICENSE="Apache-2.0"
diff --git a/dev-java/cpptasks/cpptasks-1.0_beta5-r3.ebuild b/dev-java/cpptasks/cpptasks-1.0_beta5-r3.ebuild
new file mode 100644
index 000000000000..c588ecf5dcc6
--- /dev/null
+++ b/dev-java/cpptasks/cpptasks-1.0_beta5-r3.ebuild
@@ -0,0 +1,50 @@
+# 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"
+JAVA_TESTING_FRAMEWORKS="junit"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Ant-tasks to compile various source languages and produce executables"
+HOMEPAGE="https://ant-contrib.sourceforge.net"
+SRC_URI="https://downloads.sourceforge.net/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="${CP_DEPEND}
+ >=virtual/jdk-1.8:*
+ test? (
+ >=dev-java/ant-1.10.14:0[junit]
+ dev-java/junit:0
+ )
+"
+
+RDEPEND="${CP_DEPEND}
+ >=virtual/jre-1.8:*
+"
+
+DOCS=( NOTICE )
+
+JAVA_RESOURCE_DIRS="src/main/resources"
+JAVA_SRC_DIR="src/main/java"
+JAVA_TEST_GENTOO_CLASSPATH="junit"
+JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+JAVA_TEST_RUN_ONLY=( net.sf.antcontrib.cpptasks.TestAllClasses )
+JAVA_TEST_SRC_DIR="src/test/java"
+
+src_install() {
+ java-pkg-simple_src_install
+ java-pkg_register-ant-task
+ use examples && java-pkg_doexamples src/samples/*
+}
diff --git a/dev-java/cpptasks/files/cpptasks-1.0_beta5-test-classpath.patch b/dev-java/cpptasks/files/cpptasks-1.0_beta5-test-classpath.patch
deleted file mode 100644
index 02754ce7f1ed..000000000000
--- a/dev-java/cpptasks/files/cpptasks-1.0_beta5-test-classpath.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 732e296e780633e3dce1bace28a4abae04f506c7 Mon Sep 17 00:00:00 2001
-From: Yuan Liao <liaoyuan@gmail.com>
-Date: Sat, 15 Jan 2022 10:58:28 -0800
-Subject: [PATCH] Prevent test classpath from being overwritten by
- java-ant-2.eclass
-
-Signed-off-by: Yuan Liao <liaoyuan@gmail.com>
----
- build.xml | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/build.xml b/build.xml
-index ed3a0f7..24a3114 100644
---- a/build.xml
-+++ b/build.xml
-@@ -176,8 +176,12 @@
- deprecation="false"
- target="${javac.target}"
- source="${javac.source}"
-- optimize="false"
-- classpath="${build.lib}/${name}.jar;${java.class.path}"/>
-+ optimize="false">
-+ <classpath>
-+ <pathelement location="${build.lib}/${name}.jar" />
-+ <pathelement location="${java.class.path}" />
-+ </classpath>
-+ </javac>
- <jar jarfile="${tests.build.lib}/${name}_test.jar">
- <fileset dir="." includes="NOTICE LICENSE"/>
- <fileset dir="${tests.build.classes}"/>
---
-2.34.1
-
diff --git a/dev-java/eclipse-ecj/Manifest b/dev-java/eclipse-ecj/Manifest
index 3f8812e6ada6..6b1083ddddd7 100644
--- a/dev-java/eclipse-ecj/Manifest
+++ b/dev-java/eclipse-ecj/Manifest
@@ -1,6 +1,6 @@
-DIST ecjsrc-4.15.jar 2166228 BLAKE2B 794e0ba1a19b325e2dd8ad0b288ccbe04866627670b50d39dd327c13fe1fac56200eb3a6c1c3d1af043cad795508b9b714a5243049671414b5a62a97725d3297 SHA512 ada55b2522cf26570f0cd43f415eb5cf20e6840f83dadc72e1ae474ebf10eadca73f9fa3d1db51e13fd2762c38cd3e3567db3c7840d43ae3d8665ebe35e1889d
DIST ecjsrc-4.20.jar 2255761 BLAKE2B 42e16e1bd3d90b8d9bf3e57f83b3e06f2857a20db3e3ac065ce39e95fc47e75de33186115c36dede691bc37fd55fa8123f2220d13f3d5819404f5de702b10fd2 SHA512 fb27c0a37ed5cdfdcdbc904d067bfdd0477ddfd873a6cd8477d3b473734fd0e37329f0e9ab85dc5f89994d68d9886a488bd88568bc00e25f54c1a5a468dc1384
DIST ecjsrc-4.26.jar 2347137 BLAKE2B 22e627178fe35f34cee7ba63e740ef2699bca691d460c81e97c2f18c197042cc0d901eea988331b3fa2ac7daa87daef9ee90bc1e62901935a6f2f3fe5f1e8534 SHA512 e53534160e6a2cdc8c5db7caec617d5671eb59954a86b9dcb36a514024c3205167c8416560796ce61d1aa188f551660f3bfd8eab46fefe9111c8f0b7a977342f
DIST ecjsrc-4.27.jar 2301849 BLAKE2B 77f35d1a9f36086e8515dc9437894b84c88fd440bd48b5248b141191bc04babfcf1af288643ed21e41cb054bdcfa94125a7eb139cbec9ead97e366c65c1dbe95 SHA512 689fe9ed2327f1d0e89fd13c3543369e0e13d7f15f521fc7667352e7f8d7f0b48107bc180ac16cfad375449cc2b61de74bc8ca56c95cab9ef172260a9d3a530b
DIST ecjsrc-4.30.jar 2330181 BLAKE2B 7f3ba7f8dbfcaea9f8bbcdb8161ae8f164e2bf3469cf2242b6b7df5d375c98322f810b9c6de7209f622740a2cc61704915d255559bd376bf158b114e30a17d40 SHA512 ddc1569082fad0dcf91a9d41d5ef5f2f694f007e1378af5f5f28893aeb91e99acef91af59c762010eba071fa8b8b8a9d367b08e23f91b8c73ceacc6e6150bb23
DIST ecjsrc-4.31.jar 2347993 BLAKE2B edb1a525646fc3152661a6583ab5c50a1dd7f06dac0b7cdae0913843e0ed6ef2c9862889351557857140c79c479505aeca154958b649d05ace6a5b83f6ccac45 SHA512 3e72ae5e5209dd80f7b3f208aeb0a6eece28ab416c56eedd590c67724c6a905b39b8f27a41394e3cf6a96acc16a9c7dd91d12df9651bc289839648036ac2d430
+DIST ecjsrc-4.32.jar 2357386 BLAKE2B f6c440b13eb3cd014f317d9232a7db713621b3bcb902bc385561fc4ce68711c9fde021920b535fafb4db7e93d515e23c9d57ac3506539915e1ba33ce37a4570a SHA512 e45cfe0df73f5ec83efeeb12785c2efab9977e927de8766507668f104fea4fefeaa59695988d977734fee4ccd43da43da798976177bb3b15a87ca2966e448d9e
diff --git a/dev-java/eclipse-ecj/eclipse-ecj-4.20.ebuild b/dev-java/eclipse-ecj/eclipse-ecj-4.20.ebuild
index 9e78dd4ea2d0..b892008977f0 100644
--- a/dev-java/eclipse-ecj/eclipse-ecj-4.20.ebuild
+++ b/dev-java/eclipse-ecj/eclipse-ecj-4.20.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://projects.eclipse.org/projects/eclipse.jdt"
SRC_URI="https://archive.eclipse.org/eclipse/downloads/drops4/${DMF}/ecjsrc-${PV/_rc/RC}.jar"
LICENSE="EPL-1.0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
SLOT="4.20"
BDEPEND="app-arch/unzip"
diff --git a/dev-java/eclipse-ecj/eclipse-ecj-4.27.ebuild b/dev-java/eclipse-ecj/eclipse-ecj-4.27-r1.ebuild
index 590dc3324bcb..5b3748f2682d 100644
--- a/dev-java/eclipse-ecj/eclipse-ecj-4.27.ebuild
+++ b/dev-java/eclipse-ecj/eclipse-ecj-4.27-r1.ebuild
@@ -17,14 +17,15 @@ HOMEPAGE="https://projects.eclipse.org/projects/eclipse.jdt"
SRC_URI="https://archive.eclipse.org/eclipse/downloads/drops4/${DMF}/ecjsrc-${PV/_rc/RC}.jar"
LICENSE="EPL-1.0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
SLOT="4.27"
BDEPEND="app-arch/unzip"
COMMON_DEP="app-eselect/eselect-java"
+# jdk-21 for https://bugs.gentoo.org/931195
DEPEND="${COMMON_DEP}
dev-java/ant:0
- >=virtual/jdk-17:*"
+ >=virtual/jdk-21:*"
RDEPEND="${COMMON_DEP}
>=virtual/jre-11:*"
diff --git a/dev-java/eclipse-ecj/eclipse-ecj-4.15-r1.ebuild b/dev-java/eclipse-ecj/eclipse-ecj-4.32.ebuild
index 63723662da43..3eefeac04654 100644
--- a/dev-java/eclipse-ecj/eclipse-ecj-4.15-r1.ebuild
+++ b/dev-java/eclipse-ecj/eclipse-ecj-4.32.ebuild
@@ -4,31 +4,36 @@
EAPI=8
JAVA_PKG_IUSE="doc source"
+# 3.38.0 according to
+# https://github.com/eclipse-jdt/eclipse.jdt.core/blob/R4_32/org.eclipse.jdt.core.compiler.batch/pom.xml#L20
+MAVEN_ID="org.eclipse.jdt:org.eclipse.jdt.core.compiler.batch:3.38.0"
inherit java-pkg-2 java-pkg-simple prefix
-DMF="R-${PV}-202003050155"
+DMF="R-${PV/_rc/RC}-202406010610"
DESCRIPTION="Eclipse Compiler for Java"
HOMEPAGE="https://projects.eclipse.org/projects/eclipse.jdt"
-SRC_URI="https://archive.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 ~arm ~arm64 ~ppc64 x86"
-SLOT="4.15"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+SLOT="4.32"
-BDEPEND="
- app-arch/unzip
- app-arch/zip
-"
+BDEPEND="app-arch/unzip"
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-1.10.14:0
- >=virtual/jdk-11:*"
+ >=dev-java/ant-1.10.14-r3:0
+ >=virtual/jdk-21:*"
+# Parser.java:1095: error:
+# pattern matching in instanceof is not supported in -source 11
RDEPEND="${COMMON_DEP}
- !dev-java/ant-eclipse-ecj:4.15
- >=virtual/jre-1.8:*"
+ >=virtual/jre-17:*"
+
+DOCS=( org/eclipse/jdt/core/README.md )
JAVA_AUTOMATIC_MODULE_NAME="org.eclipse.jdt.core.compiler.batch"
JAVA_CLASSPATH_EXTRA="ant"
@@ -40,8 +45,11 @@ JAVA_RESOURCE_DIRS="res"
src_prepare() {
java-pkg-2_src_prepare
+ # Exception in thread "main" java.lang.SecurityException: Invalid signature file digest for Manifest main attributes
+ rm META-INF/ECLIPSE_* || die
+
mkdir "${JAVA_RESOURCE_DIRS}" || die
- find org META-INF -type f \
+ find -type f \
! -name '*.java' \
| xargs cp --parent -t "${JAVA_RESOURCE_DIRS}" || die
}
diff --git a/dev-java/eclipse-ecj/files/ecj-4.15 b/dev-java/eclipse-ecj/files/ecj-4.15
deleted file mode 100644
index f943dedcc19b..000000000000
--- a/dev-java/eclipse-ecj/files/ecj-4.15
+++ /dev/null
@@ -1,7 +0,0 @@
-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.32 b/dev-java/eclipse-ecj/files/ecj-4.32
new file mode 100644
index 000000000000..8f4574ac16e1
--- /dev/null
+++ b/dev-java/eclipse-ecj/files/ecj-4.32
@@ -0,0 +1,7 @@
+JAVAC="@GENTOO_PORTAGE_EPREFIX@/usr/bin/ecj-4.32"
+PACKAGE="=dev-java/eclipse-ecj-4.32*"
+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 22"
+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 22"
+ANT_BUILD_COMPILER="org.eclipse.jdt.core.JDTCompilerAdapter"
+ANT_BUILD_COMPILER_DEPS="eclipse-ecj-4.32"
+GENERATION="2"
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
index 388dee136ffc..0aed027c4072 100644
--- a/dev-java/eclipse-jdt-annotation/eclipse-jdt-annotation-4.30.ebuild
+++ b/dev-java/eclipse-jdt-annotation/eclipse-jdt-annotation-4.30.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/eclipse.jdt.core-R${PV//./_}/org.eclipse.jdt.annotation"
LICENSE="EPL-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64"
+KEYWORDS="amd64 ~arm ~arm64 ~x86"
RDEPEND=">=virtual/jre-1.8:*"
DEPEND=">=virtual/jdk-1.8:*"
diff --git a/dev-java/emma/emma-2.0.5312-r6.ebuild b/dev-java/emma/emma-2.0.5312-r6.ebuild
index 10a18486c01d..5d554fb81287 100644
--- a/dev-java/emma/emma-2.0.5312-r6.ebuild
+++ b/dev-java/emma/emma-2.0.5312-r6.ebuild
@@ -13,7 +13,7 @@ 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"
+SRC_URI="https://downloads.sourceforge.net/project/emma/emma-release/${PV}/${P}-src.zip"
S="${WORKDIR}/${P}"
LICENSE="CPL-1.0"
diff --git a/dev-java/error-prone-annotations/Manifest b/dev-java/error-prone-annotations/Manifest
index 4a467474141e..f1084eef66fc 100644
--- a/dev-java/error-prone-annotations/Manifest
+++ b/dev-java/error-prone-annotations/Manifest
@@ -1 +1 @@
-DIST error-prone-2.24.0.tar.gz 2808121 BLAKE2B a112cb2c2699b2522321c89f7875cf5978748f653225db2ce89dbca16eacb357689db79c1d584c034f987178e523baa07cedd43ecb96a53941cb2ebd3c26fe63 SHA512 9c3626c7d9e05a3dacf190c6e463b66ef5cb7b0de3b049884e243502ef7bb325c92433f2ac65dfcd72ddc0edada88dde0822c4fe91043de552d69f3b06611c26
+DIST error-prone-2.27.1.tar.gz 2826681 BLAKE2B 8f848a89e97ea939dc4b81751a40d7b6bec64807ddca0d078bc02599bb663fa8a8d10d566536c33c4d50b3af21cf613bb282ac3403fe5345a20361627e116e5a SHA512 54d288dd5d5f23ae052eacc92ce304b2743aa56a524ad1b235ecd35cc4ecd72b44ec0c3fee319076466b8e90c20095fd5191d59b9c48cbe5bd940e189b1a073e
diff --git a/dev-java/error-prone-annotations/error-prone-annotations-2.24.0.ebuild b/dev-java/error-prone-annotations/error-prone-annotations-2.27.1-r1.ebuild
index 0c56d4a3fbca..ee798f4c460f 100644
--- a/dev-java/error-prone-annotations/error-prone-annotations-2.24.0.ebuild
+++ b/dev-java/error-prone-annotations/error-prone-annotations-2.27.1-r1.ebuild
@@ -17,7 +17,7 @@ LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-DEPEND=">=virtual/jdk-1.8:*"
+DEPEND=">=virtual/jdk-11:*"
RDEPEND=">=virtual/jre-1.8:*"
JAVA_AUTOMATIC_MODULE_NAME="com.google.errorprone.annotations"
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
index 1367fbdf68df..a31b155dd9a4 100644
--- 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
@@ -17,7 +17,7 @@ S="${WORKDIR}/org.apache.felix.gogo.runtime-${PV}"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64"
+KEYWORDS="amd64 ~arm ~arm64 ~x86"
CP_DEPEND="
dev-java/osgi-annotation:0
diff --git a/dev-java/fop/fop-2.9.ebuild b/dev-java/fop/fop-2.9-r1.ebuild
index e691baf0a9e9..c9268c877d7d 100644
--- a/dev-java/fop/fop-2.9.ebuild
+++ b/dev-java/fop/fop-2.9-r1.ebuild
@@ -31,19 +31,19 @@ BDEPEND="
"
CP_DEPEND="
+ >=dev-java/ant-1.10.14-r3:0
dev-java/batik:1.16
dev-java/commons-io:1
dev-java/commons-logging:0
dev-java/fontbox:0
+ dev-java/javax-servlet-api:2.2
dev-java/qdox:1.12
+ dev-java/sun-jai-bin:0
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
@@ -63,12 +63,6 @@ PATCHES=(
"${FILESDIR}/fop-2.9-FO2StructureTreeConverterTestCase.patch"
)
-JAVA_CLASSPATH_EXTRA="
- ant-core
- javax-servlet-api-2.2
- sun-jai-bin
-"
-
src_unpack() {
if use verify-sig; then
verify-sig_verify_detached "${DISTDIR}"/${P}-src.tar.gz{,.asc}
@@ -83,6 +77,9 @@ src_prepare() {
}
src_compile() {
+ # while ant could install multiple jar files we only need ant.jar
+ JAVA_GENTOO_CLASSPATH_EXTRA=":$(java-pkg_getjar ant ant.jar)"
+
JAVA_JAR_FILENAME="fop-util.jar"
JAVA_SRC_DIR="fop-util/src/main/java"
java-pkg-simple_src_compile
diff --git a/dev-java/freenet-ext/freenet-ext-29.ebuild b/dev-java/freenet-ext/freenet-ext-29-r1.ebuild
index 9cac638d5835..afdb83a3f7f7 100644
--- a/dev-java/freenet-ext/freenet-ext-29.ebuild
+++ b/dev-java/freenet-ext/freenet-ext-29-r1.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
@@ -21,7 +21,10 @@ DEPEND="
dev-libs/gmp:0=
>=virtual/jdk-1.8:*
"
-RDEPEND=">=virtual/jre-1.8:*"
+RDEPEND="
+ dev-libs/gmp
+ >=virtual/jre-1.8:*
+"
PATCHES=(
"${FILESDIR}/freenet-ext-29-convert-jcpuid.patch"
diff --git a/dev-java/gin/Manifest b/dev-java/gin/Manifest
deleted file mode 100644
index 5908cb81423c..000000000000
--- a/dev-java/gin/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST gin-2.1.2.tar.gz 4100895 BLAKE2B ba9dcd333d51460f8e108253b7a5aeb92fa521b7d2b5133285917dc398264f581b1384b7e002b4d2ac677edc0e62a43b8718e02514ea942d90e2836dd5c66c40 SHA512 cfd11497d358217e3e6e0a024f461bd8fbd23cb39262c447c2729799b9aa3252967f866da9253c03de72a5dc43ee5cf1e7f6353f388b296af33e1e7be2bb8ddd
diff --git a/dev-java/gin/gin-2.1.2-r1.ebuild b/dev-java/gin/gin-2.1.2-r1.ebuild
deleted file mode 100644
index 43bf6656dd6e..000000000000
--- a/dev-java/gin/gin-2.1.2-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="source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Google Gin (GWT INjection)"
-HOMEPAGE="https://gwtplus.github.io/google-gin/"
-SRC_URI="https://github.com/gwtplus/google-gin/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-RESTRICT="mirror"
-SLOT="2.1"
-LICENSE="Apache-2.0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-CDEPEND="
- dev-java/aopalliance:1
- dev-java/javax-inject:0
- dev-java/gwt:2.8
- dev-java/validation-api:1.0
-"
-RDEPEND="
- ${CDEPEND}
- >=virtual/jre-1.8:*"
-DEPEND="
- ${CDEPEND}
- virtual/jdk:1.8"
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-EANT_BUILD_XML="build.xml"
-EANT_GENTOO_CLASSPATH="
- aopalliance-1
- javax-inject
- gwt-2.8
- validation-api-1.0
-"
-
-S="${WORKDIR}/google-gin-${PV}"
-
-JAVA_RM_FILES=(
- trunk/lib/aopalliance.jar
- trunk/lib/javax.inject.jar
- lib/aopalliance.jar
- lib/javax.inject.jar
-)
-
-src_compile() {
- local EANT_BUILD_TARGET="compile"
- GWT_HOME="${ESYSROOT}/usr/share/gwt-2.8/lib" \
- java-pkg-2_src_compile
- EANT_BUILD_TARGET="jars"
- GWT_HOME="${ESYSROOT}/usr/share/gwt-2.8/lib" \
- java-pkg-2_src_compile
-}
-
-src_test() {
- GWT_HOME="${ESYSROOT}/usr/share/gwt-2.8/lib" \
- ant test || die
-}
-
-src_install() {
- java-pkg_newjar \
- out/dist/${P}-src.jar ${PN}-src.jar
- java-pkg_newjar \
- out/dist/${P}.jar ${PN}.jar
- java-pkg_dojar \
- lib/*.jar
-}
diff --git a/dev-java/gin/metadata.xml b/dev-java/gin/metadata.xml
deleted file mode 100644
index ffdab2e387f8..000000000000
--- a/dev-java/gin/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>java@gentoo.org</email>
- <name>Java</name>
- </maintainer>
- <longdescription lang="en">
- Gin (GWT INjection) brings automatic dependency injection to
- GWT client-side code. Gin is built on top of Guice and uses (a
- subset of) Guice's binding language.
- </longdescription>
-</pkgmetadata>
diff --git a/dev-java/gradle-bin/gradle-bin-8.7.ebuild b/dev-java/gradle-bin/gradle-bin-8.7.ebuild
index 61b08c49be55..1d63ca89fe19 100644
--- a/dev-java/gradle-bin/gradle-bin-8.7.ebuild
+++ b/dev-java/gradle-bin/gradle-bin-8.7.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://www.gradle.org/"
LICENSE="Apache-2.0"
SLOT="${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
DEPEND="app-eselect/eselect-gradle"
BDEPEND="app-arch/unzip"
diff --git a/dev-java/gson/gson-2.10.2_pre20231128.ebuild b/dev-java/gson/gson-2.10.2_pre20231128-r1.ebuild
index 4247c08c2190..4247c08c2190 100644
--- a/dev-java/gson/gson-2.10.2_pre20231128.ebuild
+++ b/dev-java/gson/gson-2.10.2_pre20231128-r1.ebuild
diff --git a/dev-java/guava-testlib/Manifest b/dev-java/guava-testlib/Manifest
index 9e4363a3129a..909dfaa7631a 100644
--- a/dev-java/guava-testlib/Manifest
+++ b/dev-java/guava-testlib/Manifest
@@ -1,2 +1,2 @@
-DIST guava-33.0.0.tar.gz 5779322 BLAKE2B b7790f4207e2061b364f3dfac8d3f6f0de180f33f1f1c24078c40b6e69d3a372fc7f681bdd51a670a4b913c0e537731ecbff849a08411c250de4dc6b255e70cf SHA512 4f97aca4621a703b69535c1d56c0b09b3b4ed893e3f136ae5622fe727ce43f920dcdf39a6e8c9667d4f51eccc7f8297c088bc3c34e1f8d6e84a0b7164855ce7c
-DIST truth-1.1.5.jar 244558 BLAKE2B c6a0889c9b50334d16cedff3974a1526b190b56a082d986dbcfce40c902a1d0e8689e387edc5b5f54f6b1ae079f2efd1e785398711b7b9363ed4dc6c1fe297f8 SHA512 b840a4ff9bd44189b0ada2770e53669b6368ad06b40a182d7ddb497866df872892f8ee5139f707f53b83cf0b860073f9d24a0f711dfb15b2f64b63e3f5013749
+DIST guava-33.2.0.tar.gz 5812764 BLAKE2B ebfc20be079385e1bf4822b1402323d468c49604f585b514c1e6d40c64803df2f9848b73c63961976908ea8e6250f5e706add1619fc0ee0befaeacab02da075f SHA512 8807dd320af652cffc83ac930e6191b36c8942bc8bfe16cec5503e0721e2fe8a36d6636eb45d650c0ccd60c67fafe4f5aa8595ad454a822fd6888d4e1f22d466
+DIST truth-1.4.2.jar 275487 BLAKE2B 9c0dce92648f734ab88a0faf1a1e5328d747efffd29aa8f12b7ed2b2c87036ce18bf3195348f9ffce848842a240179fa60e9625c6997439a4cedce6aac6c2b77 SHA512 5f29cb259f2cf63e8a908061d2a58b28ecf12366a03564c8e63c33cdbdb21935ac95ed7b68437b015a2bd055732c88ec8ca1e55b45b99a2cb3e9dd53cb0b87cc
diff --git a/dev-java/guava-testlib/guava-testlib-33.0.0.ebuild b/dev-java/guava-testlib/guava-testlib-33.2.0.ebuild
index dfe7882178a8..ca8893700df5 100644
--- a/dev-java/guava-testlib/guava-testlib-33.0.0.ebuild
+++ b/dev-java/guava-testlib/guava-testlib-33.2.0.ebuild
@@ -7,13 +7,13 @@ JAVA_PKG_IUSE="doc source test"
MAVEN_ID="com.google.guava:guava-testlib:${PV}-jre"
JAVA_TESTING_FRAMEWORKS="junit-4"
-inherit java-pkg-2 java-pkg-simple
+inherit java-pkg-2 java-pkg-simple check-reqs
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.5/truth-1.1.5.jar )"
+ test? ( https://repo1.maven.org/maven2/com/google/truth/truth/1.4.2/truth-1.4.2.jar )"
S="${WORKDIR}/guava-${PV}"
LICENSE="Apache-2.0"
@@ -21,7 +21,7 @@ SLOT="0"
KEYWORDS="amd64 ~arm arm64 ppc64 x86"
CP_DEPEND="
- >=dev-java/error-prone-annotations-2.24.0:0
+ >=dev-java/error-prone-annotations-2.27.1:0
~dev-java/guava-${PV}:0
dev-java/jsr305:0
dev-java/junit:4
@@ -40,7 +40,25 @@ JAVA_SRC_DIR="${PN}/src"
JAVA_TEST_GENTOO_CLASSPATH="junit-4"
JAVA_TEST_SRC_DIR="${PN}/test"
+check_env() {
+ if use test; then
+ # this is needed only for tests
+ CHECKREQS_MEMORY="1024M"
+ check-reqs_pkg_pretend
+ fi
+}
+
+pkg_pretend() {
+ check_env
+}
+
+pkg_setup() {
+ check_env
+ java-pkg-2_pkg_setup
+}
+
src_test() {
- JAVA_GENTOO_CLASSPATH_EXTRA="${DISTDIR}/truth-1.1.5.jar:testdata.jar"
+ JAVA_GENTOO_CLASSPATH_EXTRA="${DISTDIR}/truth-1.4.2.jar:testdata.jar"
+ JAVA_TEST_EXTRA_ARGS="-Xmx${CHECKREQS_MEMORY}"
java-pkg-simple_src_test
}
diff --git a/dev-java/guava/Manifest b/dev-java/guava/Manifest
index 044968475684..bd3ef1d79f18 100644
--- a/dev-java/guava/Manifest
+++ b/dev-java/guava/Manifest
@@ -1 +1 @@
-DIST guava-33.0.0.tar.gz 5779322 BLAKE2B b7790f4207e2061b364f3dfac8d3f6f0de180f33f1f1c24078c40b6e69d3a372fc7f681bdd51a670a4b913c0e537731ecbff849a08411c250de4dc6b255e70cf SHA512 4f97aca4621a703b69535c1d56c0b09b3b4ed893e3f136ae5622fe727ce43f920dcdf39a6e8c9667d4f51eccc7f8297c088bc3c34e1f8d6e84a0b7164855ce7c
+DIST guava-33.2.0.tar.gz 5812764 BLAKE2B ebfc20be079385e1bf4822b1402323d468c49604f585b514c1e6d40c64803df2f9848b73c63961976908ea8e6250f5e706add1619fc0ee0befaeacab02da075f SHA512 8807dd320af652cffc83ac930e6191b36c8942bc8bfe16cec5503e0721e2fe8a36d6636eb45d650c0ccd60c67fafe4f5aa8595ad454a822fd6888d4e1f22d466
diff --git a/dev-java/guava/guava-33.0.0.ebuild b/dev-java/guava/guava-33.2.0.ebuild
index b47d69abc5a9..052a43b0fdd5 100644
--- a/dev-java/guava/guava-33.0.0.ebuild
+++ b/dev-java/guava/guava-33.2.0.ebuild
@@ -18,7 +18,7 @@ SLOT="0"
KEYWORDS="amd64 ~arm arm64 ppc64 x86"
CP_DEPEND="
- >=dev-java/error-prone-annotations-2.24.0:0
+ >=dev-java/error-prone-annotations-2.27.1:0
dev-java/j2objc-annotations:0
dev-java/jsr305:0
"
diff --git a/dev-java/guice/guice-5.1.0.ebuild b/dev-java/guice/guice-5.1.0-r1.ebuild
index e1ee08998250..4f2610fff44c 100644
--- a/dev-java/guice/guice-5.1.0.ebuild
+++ b/dev-java/guice/guice-5.1.0-r1.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 core/pom.xml --download-uri https://github.com/google/guava/archive/v30.1.1.tar.gz --slot 5 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x866" --ebuild guice-5.1.0.ebuild
-
EAPI=8
JAVA_PKG_IUSE="doc source test"
@@ -15,6 +12,7 @@ inherit java-pkg-2 java-pkg-simple
DESCRIPTION="Guice is a lightweight dependency injection framework for Java 6 and above"
HOMEPAGE="https://github.com/google/guice"
SRC_URI="https://github.com/google/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${P}"
LICENSE="Apache-2.0"
SLOT="4"
@@ -23,32 +21,17 @@ KEYWORDS="amd64 ~arm arm64 ppc64 x86"
# Most of the test dependencies are missing in Gentoo.
RESTRICT="test"
-# Common dependencies
-# POM: core/pom.xml
-# aopalliance:aopalliance:1.0 -> >=dev-java/aopalliance-1.0:1
-# com.google.guava:guava:30.1-jre -> >=dev-java/guava-30.1.1:0
-# javax.inject:javax.inject:1 -> >=dev-java/javax-inject-1:0
-# org.ow2.asm:asm:9.2 -> >=dev-java/asm-9.2:9
-
CP_DEPEND="
dev-java/aopalliance:1
dev-java/asm:9
+ dev-java/error-prone-annotations:0
dev-java/guava:0
dev-java/javax-inject:0
"
-# Compile dependencies
-# POM: core/pom.xml
-# test? biz.aQute:bnd:0.0.384 -> !!!groupId-not-found!!!
-# test? com.google.guava:guava-testlib:30.1-jre -> >=dev-java/guava-testlib-30.1.1:0
-# test? com.google.truth:truth:0.45 -> !!!groupId-not-found!!!
-# test? javax.inject:javax.inject-tck:1 -> !!!artifactId-not-found!!!
-# test? junit:junit:4.13 -> >=dev-java/junit-4.13.2:4
-# test? org.apache.felix:org.apache.felix.framework:3.0.5 -> !!!groupId-not-found!!!
-
DEPEND="
>=virtual/jdk-1.8:*
- ${CDEPEND}
+ ${CP_DEPEND}
test? (
dev-java/guava-testlib:0
)
@@ -60,8 +43,6 @@ RDEPEND="
DOCS=( {COPYING,{CONTRIBUTING,README}.md} )
-S="${WORKDIR}/${P}"
-
JAVA_SRC_DIR=( "core/src" )
JAVA_RESOURCE_DIRS=( "core/res" )
@@ -70,12 +51,7 @@ JAVA_TEST_SRC_DIR=( "core/test" )
JAVA_TEST_RESOURCE_DIRS=( "core/test" )
src_prepare() {
- default
+ java-pkg-2_src_prepare
mkdir -p "core/res/com/google/inject/" || die
cp core/{src,res}/com/google/inject/BUILD || die
}
-
-src_install() {
- default # https://bugs.gentoo.org/789582
- java-pkg-simple_src_install
-}
diff --git a/dev-java/gwt/Manifest b/dev-java/gwt/Manifest
deleted file mode 100644
index 095834180d62..000000000000
--- a/dev-java/gwt/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST gwt-2.9.0.tar.gz 13081965 BLAKE2B 8b18e4cad6df9b1a2336bdf537a26def021ccd950299a6064e9a7328d0161c093f56284cce7b8a0e0a0c72b0dc9604e5e5527332d1878afd19a3c95eed5129a7 SHA512 424484a42f28387734a89a3a12b48716031e194e3a712a5e7cbdb66f77ab68e72ff8751f70a4048f4b9f35d92948c285490fd8e23c34d5c5e5558fee33952bf5
-DIST gwt-tools-194772ed94078802d8030136796de344eb1fdbe1.tar.gz 575902138 BLAKE2B 518ed1752cc82a527521525e181db712a641d36db203f511bdcc5206de314aa1eb693415b690fc42f38c9beabaffc484ad6ec3444e3cd8b4f2a3fa2ab9505f11 SHA512 0365d664b4b14ec833c922c8fab5df269e69ac8f1526315810f4922132439b880ee15e7e8b80e8b505469a374ba4a47998c7ed07b5f53227d50100247fade82b
diff --git a/dev-java/gwt/files/gwt-2.9.0-jsinterop-classpath.patch b/dev-java/gwt/files/gwt-2.9.0-jsinterop-classpath.patch
deleted file mode 100644
index 55d14fab15d3..000000000000
--- a/dev-java/gwt/files/gwt-2.9.0-jsinterop-classpath.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-# It's unclear how upstream gets their "dev.compile.test" target to compile
-# without this - it could be that their testing is done with the local tools/
-# dir, and that some assumptions are made somewhere in the build system that
-# don't apply when the tools dir is elsewhere. Either way, this fixes it.
-#
-# a Pull Request (of sorts) has been issued with upstream to incorporate this
-# change. I would list the PR link here, but they use gerrit, and i don't
-# understand what happened to my submission after I issued
-# `git push upstream HEAD:refs/for/master`
-
---- a/dev/build.xml
-+++ b/dev/build.xml
-@@ -60,6 +60,7 @@
- <pathelement
- location="${gwt.tools.lib}/streamhtmlparser/streamhtmlparser-jsilver-r10/streamhtmlparser-jsilver-r10-1.5-rebased.jar"/>
- <pathelement location="${gwt.build.lib}/gwt-dev-${build.host.platform}.jar"/>
-+ <pathelement location="${gwt.tools.lib}/jsinterop/jsinterop-annotations-2.0.0.jar"/>
- <pathelement location="${alldeps.jar}"/>
- </classpath>
- </gwt.javac>
diff --git a/dev-java/gwt/files/gwt-2.9.0-remove-git-usage.patch b/dev-java/gwt/files/gwt-2.9.0-remove-git-usage.patch
deleted file mode 100644
index 9ebbafb99099..000000000000
--- a/dev-java/gwt/files/gwt-2.9.0-remove-git-usage.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-# This git stuff in the ant configs is useful during development, since it does
-# something or other withe git revision and sets some sort of sentinel file.
-# Since this package is for a release, we don't need it.
---- a/common.ant.xml
-+++ b/common.ant.xml
-@@ -277,16 +277,16 @@
-
- <macrodef name="gwt.getgitinfo" description="Identifies the GIT info of a workspace">
- <sequential>
-- <exec executable="git" searchpath="true" outputproperty="gwt.gitrev">
-- <arg line="rev-parse --short HEAD"/>
-- </exec>
-+ <!-- <exec executable="git" searchpath="true" outputproperty="gwt.gitrev"> -->
-+ <!-- <arg line="rev-parse - -short HEAD"/> -->
-+ <!-- </exec> -->
- <!-- Generally, filtering requires a sentinel file so that changes to git rev will
- be noticed as invalidating the previously-generated filter output. This property
- names where such a sentinel lives; it is tested with <available/> and created
- with <touch/> -->
- <mkdir dir="${project.build}/sentinels"/>
- <property name="filter.sentinel"
-- location="${project.build}/sentinels/gwt-${gwt.version}-git-${gwt.gitrev}"/>
-+ location="${project.build}/sentinels/gwt-${gwt.version}"/>
- </sequential>
- </macrodef>
-
diff --git a/dev-java/gwt/gwt-2.9.0-r3.ebuild b/dev-java/gwt/gwt-2.9.0-r3.ebuild
deleted file mode 100644
index a86cdb15be16..000000000000
--- a/dev-java/gwt/gwt-2.9.0-r3.ebuild
+++ /dev/null
@@ -1,94 +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
-
-GWT_TOOLS_COMMIT="194772ed94078802d8030136796de344eb1fdbe1"
-GWT_TOOLS_PN="tools"
-
-DESCRIPTION="Google Web Toolkit library"
-HOMEPAGE="https://www.gwtproject.org/"
-SRC_URI="https://github.com/gwtproject/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
- https://github.com/gwtproject/${GWT_TOOLS_PN}/archive/${GWT_TOOLS_COMMIT}.tar.gz -> ${PN}-${GWT_TOOLS_PN}-${GWT_TOOLS_COMMIT}.tar.gz"
-# While the test suite does compile and does execute with an exit status of 0,
-# there are many tests that end with FAILED status. It is unclear if this is
-# expected from upstream or not, but in order to keep things honest, the test
-# suite is being restricted
-RESTRICT="mirror test"
-SLOT="2.8"
-LICENSE="Apache-2.0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-CDEPEND="
- dev-java/guava:0
- dev-java/rhino:1.6
- dev-java/asm:9
- dev-java/eclipse-ecj:4.15
- dev-java/validation-api:1.0
-"
-
-RDEPEND="
- ${CDEPEND}
- >=virtual/jre-1.8:*"
-DEPEND="
- ${CDEPEND}
- virtual/jdk:1.8
-"
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-EANT_BUILD_TARGET="build"
-EANT_GENTOO_CLASSPATH="
- asm-9
- guava
- rhino-1.6
- eclipse-ecj-4.15
- validation-api-1.0
-"
-
-PATCHES=(
- "${FILESDIR}/${PN}-2.9.0-jsinterop-classpath.patch"
- "${FILESDIR}/${PN}-2.9.0-remove-git-usage.patch"
-)
-
-src_prepare() {
- default
-
- java-pkg-2_src_prepare
-}
-
-src_compile() {
- # the default setup assumes that you've placed these in ${S}/tools. We put
- # it in ${WORKDIR} though
- export GWT_TOOLS="${WORKDIR}/${GWT_TOOLS_PN}-${GWT_TOOLS_COMMIT}"
- export GWT_VERSION="${PV}"
-
- java-pkg-2_src_compile
-}
-
-src_test() {
- local -x ANT_OPTS=-Dfile.encoding=UTF-8
- local -x TZ=America/Los_Angeles
-
- java-pkg-2_src_test
-}
-
-src_install() {
- local i18nCreater_launcher_args=(
- i18nCreater
- --main com.google.gwt.i18n.tools.I18NCreater
- --jar gwt-dev.jar
- )
- local webAppCreator_launcher_args=(
- webAppCreator
- --main com.google.gwt.user.tools.WebAppCreator
- --jar gwt-dev.jar
- )
-
- java-pkg_dojar build/lib/*.jar
- java-pkg_dolauncher ${i18nCreater_launcher_args[@]}
- java-pkg_dolauncher ${webAppCreator_launcher_args[@]}
-}
diff --git a/dev-java/gwt/metadata.xml b/dev-java/gwt/metadata.xml
deleted file mode 100644
index cd120d3bccba..000000000000
--- a/dev-java/gwt/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>java@gentoo.org</email>
- <name>Java</name>
- </maintainer>
- <longdescription lang="en">
- GWT is a development toolkit for building and optimizing
- complex browser-based applications. Its goal is to enable
- productive development of high-performance web applications
- without the developer having to be an expert in browser
- quirks, XMLHttpRequest, and JavaScript. It’s open source,
- completely free, and used by thousands of developers around
- the world.
- </longdescription>
-</pkgmetadata>
diff --git a/dev-java/htmlcleaner/htmlcleaner-2.29-r1.ebuild b/dev-java/htmlcleaner/htmlcleaner-2.29-r1.ebuild
index ed7088f6cec6..c1e1a9887879 100644
--- a/dev-java/htmlcleaner/htmlcleaner-2.29-r1.ebuild
+++ b/dev-java/htmlcleaner/htmlcleaner-2.29-r1.ebuild
@@ -11,7 +11,7 @@ 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="https://htmlcleaner.sourceforge.net/"
-SRC_URI="mirror://sourceforge/project/htmlcleaner/htmlcleaner/htmlcleaner%20v${PV}/htmlcleaner-src-${PV}.zip"
+SRC_URI="https://downloads.sourceforge.net/project/htmlcleaner/htmlcleaner/htmlcleaner%20v${PV}/htmlcleaner-src-${PV}.zip"
LICENSE="BSD"
SLOT="0"
diff --git a/dev-java/httpcomponents-client/Manifest b/dev-java/httpcomponents-client/Manifest
index 9706b591e796..66ff2b793020 100644
--- a/dev-java/httpcomponents-client/Manifest
+++ b/dev-java/httpcomponents-client/Manifest
@@ -1 +1,2 @@
DIST httpcomponents-client-4.5.13-src.tar.gz 824131 BLAKE2B 1507c81749a92afcf8b170b606761236d71b02d8b8b257d753a0f09abbdc297057df39661e827dee52804a2138de7d201b2a837418cbec21085fd3ffd558b51c SHA512 421e413fb2206fa95b6428ff067cdf2b440d2d3d4503cc3ca9bcf70ccd8ed1b8273ec4fe0703e6a8cd7612940b7ed966d9f163dbfeb8bf699ae2a8b2e0866d05
+DIST httpcomponents-client-4.5.13-src.tar.gz.asc 183 BLAKE2B 76b19170412672c8f4f30bcf96e1512ada5c6217a62ac1937d53c99223d687b363dc276365f2b0b6cd57abfd9d7d3a829e58f9c634081d84f05b558a61806402 SHA512 2af6ec691f0ebe6ceec4ca462e12638c8cfdb238fb4120195db1d9faca255b41119b6ddf34734ae29333256c91e1a0f1805192c0a2f1206093226e56e846cfc9
diff --git a/dev-java/httpcomponents-client/httpcomponents-client-4.5.13-r1.ebuild b/dev-java/httpcomponents-client/httpcomponents-client-4.5.13-r1.ebuild
deleted file mode 100644
index 5c35d1fb5ad7..000000000000
--- a/dev-java/httpcomponents-client/httpcomponents-client-4.5.13-r1.ebuild
+++ /dev/null
@@ -1,74 +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 httpcomponents-client-4.5.13/httpclient/pom.xml --download-uri https://github.com/apache/httpcomponents-client/archive/refs/tags/rel/v4.5.13.tar.gz --slot 4 --keywords "~amd64 ~ppc64 ~x86" --ebuild commons-httpclient-4.5.13.ebuild
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.apache.httpcomponents:httpclient:4.5.13"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Apache HttpComponents Client"
-HOMEPAGE="https://hc.apache.org/httpcomponents-client"
-SRC_URI="mirror://apache/httpcomponents/httpclient/source/httpcomponents-client-${PV}-src.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="4"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-# Common dependencies
-# POM: httpcomponents-client-${PV}/httpclient/pom.xml
-# commons-codec:commons-codec:1.11 -> >=dev-java/commons-codec-1.15:0
-# commons-logging:commons-logging:1.2 -> >=dev-java/commons-logging-1.2:0
-# org.apache.httpcomponents:httpcore:4.4.13 -> >=dev-java/httpcore-4.4.14:0
-
-CDEPEND="
- dev-java/commons-codec:0
- dev-java/commons-logging:0
- dev-java/httpcore:0
-"
-
-# Compile dependencies
-# POM: httpcomponents-client-${PV}/httpclient/pom.xml
-# test? junit:junit:4.11 -> >=dev-java/junit-4.13.2:4
-# test? org.mockito:mockito-core:1.10.19 -> >=dev-java/mockito-1.9.5:0
-
-DEPEND="${CDEPEND}
- >=virtual/jdk-1.8:*
- test? (
- dev-java/hamcrest-core:1.3
- dev-java/mockito:0
- )"
-
-RDEPEND="${CDEPEND}
- >=virtual/jre-1.8:*"
-
-DOCS=( ../{LICENSE,NOTICE,README,RELEASE_NOTES}.txt )
-
-S="${WORKDIR}/httpcomponents-client-${PV}/httpclient"
-
-JAVA_GENTOO_CLASSPATH="commons-codec,commons-logging,httpcore"
-JAVA_SRC_DIR=(
- "src/main/java"
- "src/main/java-deprecated"
-)
-JAVA_RESOURCE_DIRS="src/main/resources"
-
-JAVA_TEST_GENTOO_CLASSPATH="junit-4,mockito,hamcrest-core-1.3"
-JAVA_TEST_SRC_DIR="src/test/java"
-JAVA_TEST_RESOURCE_DIRS="src/test/resources"
-
-JAVA_TEST_EXCLUDES=(
- # Tests run: 929, Failures: 1
- # javax.net.ssl.SSLHandshakeException: Remote host terminated the handshake
- "org.apache.http.conn.ssl.TestSSLSocketFactory"
-)
-
-src_install() {
- default
- java-pkg-simple_src_install
-}
diff --git a/dev-java/httpcomponents-client/httpcomponents-client-4.5.13-r2.ebuild b/dev-java/httpcomponents-client/httpcomponents-client-4.5.13-r2.ebuild
new file mode 100644
index 000000000000..2b074d240ff4
--- /dev/null
+++ b/dev-java/httpcomponents-client/httpcomponents-client-4.5.13-r2.ebuild
@@ -0,0 +1,69 @@
+# 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.httpcomponents:httpclient:${PV}"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple verify-sig
+
+DESCRIPTION="Apache HttpComponents Client"
+HOMEPAGE="https://hc.apache.org/httpcomponents-client-5.2.x/"
+SRC_URI="mirror://apache/httpcomponents/httpclient/source/${P}-src.tar.gz
+ verify-sig? ( https://downloads.apache.org/httpcomponents/httpclient/source/${P}-src.tar.gz.asc )"
+S="${WORKDIR}/httpcomponents-client-${PV}/httpclient"
+
+LICENSE="Apache-2.0"
+SLOT="4"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
+
+VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/httpcomponents-client.hc.apache.org.asc"
+BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-httpcomponents-client )"
+
+CDEPEND="
+ dev-java/commons-codec:0
+ dev-java/commons-logging:0
+ dev-java/httpcore:0
+"
+
+DEPEND="${CDEPEND}
+ >=virtual/jdk-1.8:*
+ test? (
+ dev-java/hamcrest-core:1.3
+ dev-java/mockito:0
+ )"
+
+RDEPEND="${CDEPEND}
+ >=virtual/jre-1.8:*"
+
+DOCS=( ../{NOTICE,README,RELEASE_NOTES}.txt )
+
+JAVA_GENTOO_CLASSPATH="commons-codec,commons-logging,httpcore"
+JAVA_SRC_DIR=(
+ "src/main/java"
+ "src/main/java-deprecated"
+)
+JAVA_RESOURCE_DIRS="src/main/resources"
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4,mockito,hamcrest-core-1.3"
+JAVA_TEST_SRC_DIR="src/test/java"
+JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+
+JAVA_TEST_EXCLUDES=(
+ # Tests run: 929, Failures: 1
+ # javax.net.ssl.SSLHandshakeException: Remote host terminated the handshake
+ "org.apache.http.conn.ssl.TestSSLSocketFactory"
+)
+
+src_test() {
+ # https://bugs.gentoo.org/923602
+ 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.net=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/httpcore/Manifest b/dev-java/httpcore/Manifest
index 58259b00cd12..719bf090c35f 100644
--- a/dev-java/httpcore/Manifest
+++ b/dev-java/httpcore/Manifest
@@ -1 +1,2 @@
DIST httpcomponents-core-4.4.14-src.tar.gz 591869 BLAKE2B d6f4900d8781cf7189edb2dfa9c1157b02584e8c66cde02dc261b0e29cdfb971e0323ce4478966b8e125df475ab1014fbee5b4bdf411eb118647f47f95c8f1a7 SHA512 9c713c7ea4e966a35ed391bc2a3aa10a0963cd21978c028dbd0790c9c2a6592385c7b2f135ea2836e6c495d9faea1bdcc65aa994bd5548bc2d84db38d5dbb713
+DIST httpcomponents-core-4.4.14-src.tar.gz.asc 215 BLAKE2B 52aae4a503ff720f87538283c9215b7a8be9d5d2744c5ad6e86c7d44924ba18e8ef8d55af570543c2d52f20ce8a3918266773c274382e2c495087cd3e247232a SHA512 0824d3adecc5d1cbaf19dbb8674fd192b9d04cff9091475e5e55a18f6012ef11c2d0829d643e1003e8e18f9d2f0964ee0402a7b0e2e3f21b34dcb0676e1392e9
diff --git a/dev-java/httpcore/files/httpcore-4.4.14-skipFailingTest.patch b/dev-java/httpcore/files/httpcore-4.4.14-skipFailingTest.patch
new file mode 100644
index 000000000000..5c722c5e714d
--- /dev/null
+++ b/dev-java/httpcore/files/httpcore-4.4.14-skipFailingTest.patch
@@ -0,0 +1,55 @@
+There was 1 failure:
+1) testRequestTargetHostFallback(org.apache.http.protocol.TestStandardInterceptors)
+org.mockito.exceptions.base.MockitoException:
+Mockito cannot mock this class: class java.net.InetAddress
+Mockito can only mock visible & non-final classes.
+If you're not sure why you're getting this error, please report to the mailing list.
+ at org.apache.http.protocol.TestStandardInterceptors.testRequestTargetHostFallback(TestStandardInterceptors.java:372)
+ ... 31 trimmed
+Caused by: org.mockito.cglib.core.CodeGenerationException: java.lang.reflect.InvocationTargetException-->null
+ at org.mockito.cglib.core.AbstractClassGenerator.create(AbstractClassGenerator.java:238)
+ at org.mockito.cglib.proxy.Enhancer.createHelper(Enhancer.java:378)
+ at org.mockito.cglib.proxy.Enhancer.createClass(Enhancer.java:318)
+ at org.mockito.internal.creation.jmock.ClassImposterizer.createProxyClass(ClassImposterizer.java:110)
+ at org.mockito.internal.creation.jmock.ClassImposterizer.imposterise(ClassImposterizer.java:62)
+ at org.mockito.internal.creation.jmock.ClassImposterizer.imposterise(ClassImposterizer.java:56)
+ at org.mockito.internal.creation.CglibMockMaker.createMock(CglibMockMaker.java:23)
+ at org.mockito.internal.util.MockUtil.createMock(MockUtil.java:26)
+ at org.mockito.internal.MockitoCore.mock(MockitoCore.java:51)
+ at org.mockito.Mockito.mock(Mockito.java:1243)
+ at org.mockito.Mockito.mock(Mockito.java:1120)
+ ... 33 more
+Caused by: java.lang.reflect.InvocationTargetException
+ at java.base/jdk.internal.reflect.DirectMethodHandleAccessor.invoke(DirectMethodHandleAccessor.java:118)
+ at java.base/java.lang.reflect.Method.invoke(Method.java:580)
+ at org.mockito.cglib.core.ReflectUtils.defineClass(ReflectUtils.java:385)
+ at org.mockito.cglib.core.AbstractClassGenerator.create(AbstractClassGenerator.java:220)
+ ... 43 more
+Caused by: java.lang.IncompatibleClassChangeError: class $java.net.InetAddress$$EnhancerByMockitoWithCGLIB$$d2bd6316 cannot inherit from sealed class java.net.InetAddress
+ at java.base/java.lang.ClassLoader.defineClass1(Native Method)
+ at java.base/java.lang.ClassLoader.defineClass(ClassLoader.java:1027)
+ at java.base/jdk.internal.reflect.DirectMethodHandleAccessor.invoke(DirectMethodHandleAccessor.java:103)
+ ... 46 more
+
+FAILURES!!!
+Tests run: 665, Failures: 1
+
+--- a/src/test/java/org/apache/http/protocol/TestStandardInterceptors.java
++++ b/src/test/java/org/apache/http/protocol/TestStandardInterceptors.java
+@@ -44,6 +44,7 @@ import org.apache.http.message.BasicHttpRequest;
+ import org.apache.http.message.BasicHttpResponse;
+ import org.junit.Assert;
+ import org.junit.Test;
++import org.junit.Ignore;
+ import org.mockito.Mockito;
+
+ public class TestStandardInterceptors {
+@@ -365,7 +366,7 @@ public class TestStandardInterceptors {
+ Assert.assertEquals("somehost:8080", header.getValue());
+ }
+
+- @Test
++ @Test @Ignore
+ public void testRequestTargetHostFallback() throws Exception {
+ final HttpContext context = new BasicHttpContext(null);
+ final BasicHttpRequest request = new BasicHttpRequest("GET", "/");
diff --git a/dev-java/httpcore/httpcore-4.4.14-r1.ebuild b/dev-java/httpcore/httpcore-4.4.14-r1.ebuild
new file mode 100644
index 000000000000..f554a2b55b78
--- /dev/null
+++ b/dev-java/httpcore/httpcore-4.4.14-r1.ebuild
@@ -0,0 +1,56 @@
+# 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.httpcomponents:httpcore:4.4.14"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple verify-sig
+
+DESCRIPTION="Apache HttpComponents Core (blocking I/O)"
+HOMEPAGE="https://hc.apache.org/httpcomponents-core-5.2.x/"
+SRC_URI="https://archive.apache.org/dist/httpcomponents/httpcore/source/httpcomponents-core-${PV}-src.tar.gz
+ verify-sig? (
+ https://archive.apache.org/dist/httpcomponents/httpcore/source/httpcomponents-core-${PV}-src.tar.gz.asc
+ )"
+S="${WORKDIR}/httpcore"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
+
+VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/httpcomponents-core.hc.apache.org.asc"
+BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-httpcomponents-httpcore )"
+DEPEND=">=virtual/jdk-1.8:*
+ test? (
+ dev-java/commons-logging:0
+ dev-java/mockito:0
+ )"
+
+RDEPEND=">=virtual/jre-1.8:*"
+
+DOCS=( ../{LICENSE,NOTICE,README,RELEASE_NOTES}.txt )
+
+JAVA_SRC_DIR=(
+ "src/main/java"
+ "src/main/java-deprecated"
+)
+JAVA_RESOURCE_DIRS="src/main/resources"
+
+JAVA_TEST_GENTOO_CLASSPATH="commons-logging,junit-4,mockito"
+JAVA_TEST_SRC_DIR="src/test/java"
+JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+
+src_test() {
+ # https://bugs.gentoo.org/923603
+ 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.net=ALL-UNNAMED )
+ JAVA_TEST_EXTRA_ARGS+=( --add-opens=java.base/java.io=ALL-UNNAMED )
+ eapply "${FILESDIR}/httpcore-4.4.14-skipFailingTest.patch"
+ fi
+ java-pkg-simple_src_test
+}
diff --git a/dev-java/httpcore/httpcore-4.4.14.ebuild b/dev-java/httpcore/httpcore-4.4.14.ebuild
deleted file mode 100644
index ff51d1ba0fdb..000000000000
--- a/dev-java/httpcore/httpcore-4.4.14.ebuild
+++ /dev/null
@@ -1,54 +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 httpcore/pom.xml --download-uri https://mirror.netcologne.de/apache.org//httpcomponents/httpcore/source/httpcomponents-core-4.4.14-src.tar.gz --slot 0 --keywords "~amd64 ~ppc64 ~x86" --ebuild httpcomponents-core-4.4.14.ebuild
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.apache.httpcomponents:httpcore:4.4.14"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Apache HttpComponents Core (blocking I/O)"
-HOMEPAGE="https://hc.apache.org/httpcomponents-core-ga"
-SRC_URI="mirror://apache/httpcomponents/httpcore/source/httpcomponents-core-${PV}-src.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-# Compile dependencies
-# POM: httpcore/pom.xml
-# test? commons-logging:commons-logging:1.2 -> >=dev-java/commons-logging-1.2:0
-# test? junit:junit:4.12 -> >=dev-java/junit-4.13.2:4
-# test? org.mockito:mockito-core:1.10.19 -> >=dev-java/mockito-1.9.5:0
-
-DEPEND=">=virtual/jdk-1.8:*
- test? (
- dev-java/commons-logging:0
- dev-java/mockito:0
- )"
-
-RDEPEND=">=virtual/jre-1.8:*"
-
-DOCS=( ../{LICENSE,NOTICE,README,RELEASE_NOTES}.txt )
-
-S="${WORKDIR}/httpcore"
-
-JAVA_SRC_DIR=(
- "src/main/java"
- "src/main/java-deprecated"
-)
-JAVA_RESOURCE_DIRS="src/main/resources"
-
-JAVA_TEST_GENTOO_CLASSPATH="commons-logging,junit-4,mockito"
-JAVA_TEST_SRC_DIR="src/test/java"
-JAVA_TEST_RESOURCE_DIRS="src/test/resources"
-
-src_install() {
- default
- java-pkg-simple_src_install
-}
diff --git a/dev-java/icedtea-bin/Manifest b/dev-java/icedtea-bin/Manifest
deleted file mode 100644
index 21af4ba8ba10..000000000000
--- a/dev-java/icedtea-bin/Manifest
+++ /dev/null
@@ -1,14 +0,0 @@
-DIST icedtea-bin-core-3.16.0-amd64.tar.xz 62350972 BLAKE2B 0980787ee1f619907e958fcbf6c75674115adc325abe4d428e46842eab9a26fc2666f3b0498e79de0451a63d01c83302501fc5f861c4ffc7f5914dd7adbb4cf8 SHA512 0f79408811fa5b3ab60e72b3fcb8510234a22d698c66f0d5a8f06b67bead0f4a215b771065d6d189fddd25f762b64732a28fd69ad402ef57aa5cedeca745552b
-DIST icedtea-bin-core-3.16.0-arm.tar.xz 58351704 BLAKE2B a1fbd5744d3155861e7de5a85a508f8199295568d92efd840a7fc81b9eaed755366fa3212d3039d87c77215168fc6ab9baaa5c92531fc11c1099e6ea486fce48 SHA512 84624b80bfb0035b714c38f92a9982c11bae3137fe70d030111c6b2c253472c0c857edfea1a16d646a5e9c4d3215fc66d7f9bf96e8184ae1b5c75a5c3c844549
-DIST icedtea-bin-core-3.16.0-arm64.tar.xz 61918380 BLAKE2B 8f6778bd63fe037f19115d094ae32294f84a57782b63f32997c80ff580a5a13ff3beec37bae809e45fa4dc174c10335c9040119207a9489b33df590f79398b1d SHA512 dc0bbcb15c897a8f3e83e56877c5a3b7f29740a122597fc26b7f6c43eeb07c32407db060954a262ab1db92cfa6cafc44c7fad131c53c4a811938da5e76c89fe2
-DIST icedtea-bin-core-3.16.0-ppc64.tar.xz 55356056 BLAKE2B 265635ef70f244696dc09baa6cfef628d794ff851edeebb2d4b531aff4a25dafb902c4f3cbe527540ba65d76da2f3d4234b14cca16d5439d2e92f551a5aaf478 SHA512 840b0faed3882324392ad1f7ce8123d9d2f53f33576bb5eec37357d2aab292c21d947867d8b20a34de6fc25c8e1d5dc5c7f541cebe5b008b79bc9daf9250910d
-DIST icedtea-bin-core-3.16.0-ppc64le.tar.xz 55356384 BLAKE2B ffa6c0e381b20a3a9d78a61519a0d47715dbd82f9472c5335fb9e2b4dff6948486cf85f6f4f416462158a3476b9a228fdb9c0725294a58bcdc91058d60811bd9 SHA512 d9902159044135e1ff5d3b200f5fe283249a2be1da6705b9fdc94eb88c2d199ed3a5c80e70ae89aa870a05110e649e93d4710605c85db15dca360bc66d2c60da
-DIST icedtea-bin-core-3.16.0-x86.tar.xz 61745436 BLAKE2B efb37cb8ac00c6fe2a45bed9b829fc5410062105b373ba77012ec2d8f8deff03dcb88288025dcc8a8300d28139068ef202d2c709fe5aad4b8ed2ab1edd54c412 SHA512 3df52ec949d8d5ba6cd046841160fab1637666e506f536664506c1de0e74f1b2620836706cca8e194ded575761299ecb3b3f83e295e6dfed8222de1949a73077
-DIST icedtea-bin-doc-3.16.0.tar.xz 11613128 BLAKE2B de8224c7e3a62178c6cc5a4c883c3c90a2712049f9e6687bf0a0d93a8dc9bd3abc562486c483c7b72bd17fa5c376495b0739babf10b1282acbd3e41beb3d1cd4 SHA512 dd3bb69de2d0f720f18700a97a549c21b67569d12a982d2fbe39eef8bf876e0f02af673e70d53ac59891377e4d48f3cc05f60d1b1dac0c7d9969a4a07e346fc6
-DIST icedtea-bin-examples-3.16.0-amd64.tar.xz 1855056 BLAKE2B 678e887ac613df96e7b255bdd6de4a9644f1b5940fbd036d88dfc1b74154d8e1e4032a380586965d727c5d9ebd2d1c4ba7d7d62a88d8994e5400eacc3f83d6dd SHA512 afea08925258e6e9d7bdabdf3078d6b580680fa43fb44589b6e0faa07ab78fea0d25e30bd22ae92317a77007ab0b30c9b3e16decf0e78bc1ff88ffa780b9d25b
-DIST icedtea-bin-examples-3.16.0-arm.tar.xz 1839892 BLAKE2B c5824fbf698f4861baa32f973f2040ae72f5a92f889309bb1aeed03c652114c89f38394559c2619c36dccc075205b91fbd6ae97d9de7554c9144fe059fc9a9db SHA512 6fb4ac90bac679cb2d1827ead49fcd1b2acac27aca3af77c7aa7c771317281d7ffe477f2c1365ee78a21ab9694c9beba38516f053ad954e78f6f5b8bfb991151
-DIST icedtea-bin-examples-3.16.0-arm64.tar.xz 1850400 BLAKE2B 577206b3b15f5eb7dfcbccbb02e209354f99e780c5989eba8f21fdca3630f7188c1b4a0c845a556ccd93916a7f6182ec9932983ee22fa37cfcb47b28fac62e41 SHA512 ff80389720947f781f48b8f39bd49a7b096eea03f48bc70d588bc326256676b568a743b70e5d13ccf161da81fd4fceef5e8a1913991a5805391de7e93e913662
-DIST icedtea-bin-examples-3.16.0-ppc64.tar.xz 1864968 BLAKE2B e806ccb1d430e42b1ae75954a8ab4dcb9d7f2e6a00b9cf0343716ef18943d66e46834859fb90c50d7553dcda3502f4f3b73c060e2cbfaec883aa98ef7c874807 SHA512 9bd762776178d117c20fabb90558f80d97d4392a4015a26729437e50f82e7bcd55a6c1e12df45726ae484d20df3bc4867e392242588062d926ae4d3b14b8b679
-DIST icedtea-bin-examples-3.16.0-ppc64le.tar.xz 1863432 BLAKE2B fa227b246e5ddb9197c065fa27092b9114ee5423e7d914ceb9dfd3491fb2ddb60707379fb50ece1e8d4834cfe24cc82cb37e341aafc338623c4720bb74f4c4af SHA512 8efa40365c0689e9fdb3d2c350d95a837706219442b46305e3314185afc9cf0dfab51854bddabdf0f6abc50ce9f45b4c3cac66d6d7a4fd472e58f0070507599e
-DIST icedtea-bin-examples-3.16.0-x86.tar.xz 1861512 BLAKE2B 3ee3bc1d9bde79aea9e765ad06e29b76617f00077d28ca08042ff23434edbdfa012033bfc5c2e4ca5bf1485b079ce412c399a9ed9ea5df137e627f1d74cadb30 SHA512 df247ee749d9fd41a3bde5c28a8894cff837ff0725c8d45b89134e294d1cba2493de9d7bbab15b6098c464ed11dc317892df87f10f14b507cc3f27e872c92637
-DIST icedtea-bin-src-3.16.0.tar.xz 45993284 BLAKE2B 748ce12cf4231af2410523b394f91afffbdb774a73a0754e6df5c124c9c9f8f8cffed82fa84ec5a9940de80127ca9018379f72085b3de1a2ced3146df27aa943 SHA512 546364dcf4a20d7aa6fc68c465f9c77c3a6c24b9b8889629152dc2424b3d9f818d56ea678ecbdcb58e499c1564f246a75d6b9ff00925d9ecc305dec94ba60548
diff --git a/dev-java/icedtea-bin/files/icedtea-bin.env.sh b/dev-java/icedtea-bin/files/icedtea-bin.env.sh
deleted file mode 100644
index 9734e8a604c0..000000000000
--- a/dev-java/icedtea-bin/files/icedtea-bin.env.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-VERSION="IcedTea JDK ${PV}$(multilib_is_native_abi || printf ' ('${ABI}')')"
-JAVA_HOME="${EPREFIX}/opt/icedtea-bin-${PV}$(multilib_is_native_abi || printf -- -${ABI})"
-JDK_HOME="${EPREFIX}/opt/icedtea-bin-${PV}$(multilib_is_native_abi || printf -- -${ABI})"
-JAVAC="\${JAVA_HOME}/bin/javac"
-PATH="\${JAVA_HOME}/bin:\${JAVA_HOME}/jre/bin"
-ROOTPATH="\${JAVA_HOME}/bin:\${JAVA_HOME}/jre/bin"
-LDPATH="\${JAVA_HOME}/jre/lib/$(get_system_arch)/:\${JAVA_HOME}/jre/lib/$(get_system_arch)/server/"
-MANPATH="${EPREFIX}/opt/icedtea-bin-${PV}/man"
-PROVIDES_TYPE="JDK JRE"
-PROVIDES_VERSION="1.${SLOT}"
-# Taken from sun.boot.class.path property
-BOOTCLASSPATH="\${JAVA_HOME}/jre/lib/resources.jar:\${JAVA_HOME}/jre/lib/rt.jar:\${JAVA_HOME}/jre/lib/sunrsasign.jar:\${JAVA_HOME}/jre/lib/jsse.jar:\${JAVA_HOME}/jre/lib/jce.jar:\${JAVA_HOME}/jre/lib/charsets.jar:\${JAVA_HOME}/jre/lib/jfr.jar"
-GENERATION="2"
-ENV_VARS="JAVA_HOME JDK_HOME JAVAC PATH ROOTPATH LDPATH MANPATH"
diff --git a/dev-java/icedtea-bin/icedtea-bin-3.16.0-r2.ebuild b/dev-java/icedtea-bin/icedtea-bin-3.16.0-r2.ebuild
deleted file mode 100644
index d81265453bcb..000000000000
--- a/dev-java/icedtea-bin/icedtea-bin-3.16.0-r2.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# pkgcheck reports that multilib-build is not used but in fact it is used
-# from files/icedtea-bin.env.sh so DO NOT REMOVE THAT CLASS even if pkgcheck
-# says it's unused
-inherit java-vm-2 multilib-build toolchain-funcs
-
-abi_uri() {
- echo "${2-$1}? (
- ${BASE_URI}/${PN}-core-${PV}${3+-r${3}}-${1}.tar.xz
- examples? ( ${BASE_URI}/${PN}-examples-${PV}${3+-r${3}}-${1}.tar.xz )
- )"
-}
-
-BASE_URI="https://dev.gentoo.org/~gyakovlev/distfiles"
-SRC_URI="
- doc? ( ${BASE_URI}/${PN}-doc-${PV}.tar.xz )
- source? ( ${BASE_URI}/${PN}-src-${PV}.tar.xz )
- big-endian? ( $(abi_uri ppc64) )
- !big-endian? ( $(abi_uri ppc64le ppc64) )
- $(abi_uri amd64)
- $(abi_uri arm)
- $(abi_uri arm64)
- $(abi_uri x86)
-"
-
-DESCRIPTION="A Gentoo-made binary build of the IcedTea JDK"
-HOMEPAGE="http://icedtea.classpath.org"
-
-LICENSE="GPL-2-with-classpath-exception"
-SLOT="8"
-KEYWORDS="-* amd64 ~arm arm64 ppc64 x86"
-IUSE="+alsa big-endian cups doc examples +gtk headless-awt pulseaudio selinux source"
-
-REQUIRED_USE="gtk? ( !headless-awt )"
-
-RESTRICT="preserve-libs strip"
-QA_PREBUILT="opt/.*"
-
-DEPEND="app-arch/xz-utils"
-
-RDEPEND="
- >=dev-libs/glib-2.60.7:2
- >=media-libs/fontconfig-2.13:1.0
- >=media-libs/freetype-2.9.1:2
- >=media-libs/lcms-2.9:2
- >=sys-apps/baselayout-java-0.1.0-r1
- >=sys-libs/zlib-1.2.11-r2
- virtual/jpeg-compat:62
- alsa? ( >=media-libs/alsa-lib-1.2 )
- cups? ( >=net-print/cups-2.0 )
- gtk? (
- >=dev-libs/atk-2.32.0
- >=x11-libs/cairo-1.16.0
- x11-libs/gdk-pixbuf:2
- >=x11-libs/gtk+-2.24:2
- >=x11-libs/pango-1.42
- )
- selinux? ( sec-policy/selinux-java )
- virtual/ttf-fonts
- !headless-awt? (
- media-libs/giflib:0/7
- =media-libs/libpng-1.6*
- >=x11-libs/libX11-1.6
- >=x11-libs/libXcomposite-0.4
- >=x11-libs/libXext-1.3
- >=x11-libs/libXi-1.7
- >=x11-libs/libXrender-0.9.10
- >=x11-libs/libXtst-1.2
- )
-"
-
-PDEPEND="pulseaudio? ( dev-java/icedtea-sound )"
-
-S="${WORKDIR}"
-
-pkg_pretend() {
- if [[ "$(tc-is-softfloat)" != "no" ]]; then
- die "These binaries require a hardfloat system."
- fi
-}
-
-src_prepare() {
- default
-
- # I wouldn't normally use -f below but symlinks in the arm files
- # make this fail otherwise and any other approach would be tedious.
-
- if ! use alsa; then
- rm -fv */jre/lib/*/libjsoundalsa.* || die
- fi
-
- if use headless-awt; then
- rm -fvr */jre/lib/*/lib*{[jx]awt,splashscreen}* \
- */{,jre/}bin/policytool */bin/appletviewer || die
- fi
-}
-
-src_install() {
- local dest="/opt/${P}"
- local ddest="${ED}/${dest#/}"
- dodir "${dest}"
-
- dodoc ${P}-${ABI}/doc/{ASSEMBLY_EXCEPTION,AUTHORS,NEWS,README,THIRD_PARTY_README}
- use doc && dodoc -r ${P}/doc/html
-
- # doins doesn't preserve executable bits.
- cp -pRP ${P}-${ABI}/{bin,include,jre,lib,man} "${ddest}" || die
-
- if use examples; then
- cp -pRP ${P}-${ABI}/{demo,sample} "${ddest}" || die
- fi
-
- if use source; then
- cp ${P}/src.zip "${ddest}" || die
- fi
-
- # use system-wide cacert store
- rm "${ddest}"/jre/lib/security/cacerts || die
- dosym ../../../../../etc/ssl/certs/java/cacerts "${dest}"/jre/lib/security/cacerts
-
- java-vm_install-env "${FILESDIR}/icedtea-bin.env.sh"
-
- # Both icedtea itself and the icedtea ebuild set PAX markings but we
- # disable them for the icedtea-bin build because the line below will
- # respect end-user settings when icedtea-bin is actually installed.
- java-vm_set-pax-markings "${ddest}"
-
- # Each invocation appends to the config.
- java-vm_revdep-mask "${EPREFIX}${dest}"
- java-vm_sandbox-predict /proc/self/coredump_filter
-}
diff --git a/dev-java/icedtea-bin/metadata.xml b/dev-java/icedtea-bin/metadata.xml
deleted file mode 100644
index ba41cd79150b..000000000000
--- a/dev-java/icedtea-bin/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>
- <use>
- <flag name="headless-awt">Don't install the X backend for AWT, needed by some GUIs (used to be X flag)</flag>
- </use>
-</pkgmetadata>
diff --git a/dev-java/icu4j/Manifest b/dev-java/icu4j/Manifest
index 2333f7ea8c09..95e67ccfac14 100644
--- a/dev-java/icu4j/Manifest
+++ b/dev-java/icu4j/Manifest
@@ -1 +1 @@
-DIST icu-74.2.tar.gz 65888936 BLAKE2B 81d5acddbfc58a859906cb61660b6f230b88f4a1b1cfd56838843e9445b5858d3dd4888707026340581322143f6a4b7b81f53b6431fd5d4cc3fb90531c4d82fb SHA512 728ae0f09ffc802d675bcf5b849e3081472de8417736bf8b7df0f4db9d1fb8073779be76536764c9111f7cb0e5ab2d2af6c644cc24be432b9eeae9063802ad6c
+DIST icu4j-75.1.tar.gz 65866291 BLAKE2B ae9a2a8f9bf6f38a08c46c4c3695fa4096c831beab1af5b654e86c9d681eb32be727930aeb1fd866fe9f93a96abe807fd353d108b5fe7a4d8203ee33cc16d971 SHA512 08f8fce8a4dd85706d9f7c57fd021ba15c403ab2da33d9a122d7cb441e0e148deebf245a661e4ef53a30bfa8b7622c63035946fd8966be3927af322275b87ca3
diff --git a/dev-java/icu4j/icu4j-74.2.ebuild b/dev-java/icu4j/icu4j-75.1.ebuild
index df2c5aa4daba..bae11e47634a 100644
--- a/dev-java/icu4j/icu4j-74.2.ebuild
+++ b/dev-java/icu4j/icu4j-75.1.ebuild
@@ -15,7 +15,7 @@ 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"
+SRC_URI="https://github.com/unicode-org/icu/archive/release-${PV/./-}.tar.gz -> ${P}.tar.gz"
S="${WORKDIR}/icu-release-${PV/./-}/icu4j/main"
LICENSE="icu"
@@ -24,7 +24,10 @@ KEYWORDS="amd64 ~arm arm64 ppc64 x86"
DEPEND="
>=virtual/jdk-1.8:*
- test? ( dev-java/junitparams:0 )
+ test? (
+ dev-java/gson:0
+ dev-java/junitparams:0
+ )
"
RDEPEND=">=virtual/jre-1.8:*"
@@ -75,22 +78,18 @@ src_compile() {
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
+ einfo "Generating javadocs"
+ JAVADOC_SRC_DIRS=(
+ 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
+ )
+ use doc && ejavadoc
}
src_test () {
@@ -98,7 +97,7 @@ src_test () {
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"
+ JAVA_TEST_GENTOO_CLASSPATH="gson,junit-4,junitparams"
einfo "Compiling framework-tests.jar"
JAVA_AUTOMATIC_MODULE_NAME="com.ibm.icu.framework"
diff --git a/dev-java/iso-relax/iso-relax-20050331-r5.ebuild b/dev-java/iso-relax/iso-relax-20050331-r6.ebuild
index e0990c5abb6d..6359c5cb8203 100644
--- a/dev-java/iso-relax/iso-relax-20050331-r5.ebuild
+++ b/dev-java/iso-relax/iso-relax-20050331-r6.ebuild
@@ -1,7 +1,7 @@
-# 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"
@@ -10,30 +10,20 @@ inherit java-pkg-2 java-pkg-simple
DESCRIPTION="Interfaces useful for applications which support RELAX Core"
HOMEPAGE="http://www.xml.gr.jp/relax/"
SRC_URI="mirror://gentoo/${P}.tar.bz2"
+S="${WORKDIR}/${P}"
LICENSE="MIT"
SLOT="0"
KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
-RESTRICT="test"
-
-CDEPEND="dev-java/ant-core:0"
-
-DEPEND="
- ${CDEPEND}
+CP_DEPEND=">=dev-java/ant-1.10.14-r3:0"
+DEPEND="${CP_DEPEND}
>=virtual/jdk-1.8:*"
-
-RDEPEND="
- ${CDEPEND}
- >=virtual/jre-1.8:*"
-
-S="${WORKDIR}/${P}"
-
-JAVA_GENTOO_CLASSPATH="ant-core"
+RDEPEND=">=virtual/jre-1.8:*"
JAVA_SRC_DIR="src"
src_prepare() {
- default
+ java-pkg-2_src_prepare
java-pkg_clean
}
diff --git a/dev-java/j2objc-annotations/Manifest b/dev-java/j2objc-annotations/Manifest
index 7ce33bc9a26c..f3cf7f8491c0 100644
--- a/dev-java/j2objc-annotations/Manifest
+++ b/dev-java/j2objc-annotations/Manifest
@@ -1 +1 @@
-DIST j2objc-2.8.tar.gz 29383083 BLAKE2B a2d288b95fac5d5fafbf5e3c8c7c862e41ba9562f6a3f367ee03574db0f07e030f7812de7d0cf63c97acdbbf8ddd8128fe14e89e97623d6d3cf7b85071e160b3 SHA512 f93a77db3a672691666de317010e455aceb20313a40217270cf4cfd082a0443f7f5cf6f53f06a1006d0a2788c199685a574b0acb435dccdc4e419a2340451860
+DIST j2objc-3.0.0.tar.gz 29562144 BLAKE2B b0dc9aeef148ee29154062228049b4db86648fb66b93d224d536a3c0b7e56eb4850d38761b59c6728b005e1520a7a3c07ef3bdb3662d9cad52794ec3ce533426 SHA512 b7e295e448caa61d03c12cde77266ab397f27a5632ab01944571736a79860fa0375279f27fcb1870d0452bde4d8b50ee453a88a23e5b92c1ef0411d4212f3779
diff --git a/dev-java/j2objc-annotations/j2objc-annotations-2.8.ebuild b/dev-java/j2objc-annotations/j2objc-annotations-3.0.0-r1.ebuild
index 3d69f0171861..7b1be4f994d1 100644
--- a/dev-java/j2objc-annotations/j2objc-annotations-2.8.ebuild
+++ b/dev-java/j2objc-annotations/j2objc-annotations-3.0.0-r1.ebuild
@@ -1,30 +1,27 @@
-# 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"
-# Yes. version is "2.2" regardless ${PV} being "2.8".
-# See https://github.com/google/j2objc/blob/2.8/annotations/pom.xml#L32-L35
-MAVEN_ID="com.google.j2objc:j2objc-annotations:2.2"
+MAVEN_ID="com.google.j2objc:j2objc-annotations:${PV}"
inherit java-pkg-2 java-pkg-simple
DESCRIPTION="Annotations for the J2ObjC Java to Objective-C translator"
HOMEPAGE="https://developers.google.com/j2objc/"
SRC_URI="https://github.com/google/j2objc/archive/${PV}.tar.gz -> j2objc-${PV}.tar.gz"
+S="${WORKDIR}/j2objc-${PV}/annotations"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-DEPEND="virtual/jdk:1.8"
+DEPEND=">=virtual/jdk-11:*"
RDEPEND=">=virtual/jre-1.8:*"
DOCS=( ../{CONTRIBUTING,README}.md )
-S="${WORKDIR}/j2objc-${PV}/annotations"
-
JAVA_SRC_DIR="src/main/java"
src_prepare() {
diff --git a/dev-java/jacl/jacl-1.4.1-r2.ebuild b/dev-java/jacl/jacl-1.4.1-r2.ebuild
index f1cd44ee2aaa..53e9a0ae85f6 100644
--- a/dev-java/jacl/jacl-1.4.1-r2.ebuild
+++ b/dev-java/jacl/jacl-1.4.1-r2.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
@@ -8,7 +8,7 @@ inherit java-pkg-2 java-pkg-simple
DESCRIPTION="Jacl is an implementation of Tcl written in Java"
HOMEPAGE="http://tcljava.sourceforge.net"
-SRC_URI="mirror://sourceforge/project/tcljava/jacl/${PV}/jacl${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://downloads.sourceforge.net/project/tcljava/jacl/${PV}/jacl${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
diff --git a/dev-java/jakarta-mail-api/Manifest b/dev-java/jakarta-mail-api/Manifest
index 0c2e67d3398e..f1de9f7bc250 100644
--- a/dev-java/jakarta-mail-api/Manifest
+++ b/dev-java/jakarta-mail-api/Manifest
@@ -1,2 +1 @@
-DIST jakarta-mail-api-2.1.1.tar.gz 1214949 BLAKE2B d92861ed3c957db8d7fda2ec25269ed7b3ec27d55c6b8865278cd6b1dcdef750ecb126136760f15bf86216c14bb00a856a60719f6121ccb87b41523662754ab1 SHA512 e367c27d85aa9513ab1a4ff0a1eb9ef947b6fad6b0c24263c5f0c0befc8f152e193eedb4a0c9687aa3decac07615094904639e11db395d25dd45c5d9fd8677cc
DIST jakarta-mail-api-2.1.3.tar.gz 1219840 BLAKE2B 6fff0fc63bcdb9f52e02c957408fffdc77be9733bc612f461500b23212572407b3a26dcef2434043d6b38011f8f8c8983a450a043f540c9217783247cf2bfd2b SHA512 274f8dfac3d228df4161a293ef02ca22cd7e411ee9143216eb6784a8bd049b9d2849566ce78baee0ba8e65ed5a7e84b4e03d8b551ac1e6273de1ed44e7798931
diff --git a/dev-java/jakarta-mail-api/jakarta-mail-api-2.1.1.ebuild b/dev-java/jakarta-mail-api/jakarta-mail-api-2.1.1.ebuild
deleted file mode 100644
index 9a5fec2d653a..000000000000
--- a/dev-java/jakarta-mail-api/jakarta-mail-api-2.1.1.ebuild
+++ /dev/null
@@ -1,68 +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="jakarta.mail:jakarta.mail-api:2.1.1"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Jakarta Mail API 2.1 Specification API"
-HOMEPAGE="https://jakartaee.github.io/mail-api/"
-SRC_URI="https://github.com/jakartaee/mail-api/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/mail-api-${PV}/api"
-
-LICENSE="EPL-1.0 EPL-2.0 GPL-2-with-classpath-exception"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-DEPEND="
- dev-java/jakarta-activation-api:2
- >=virtual/jdk-11:*
- test? (
- >=dev-java/angus-activation-1.0.0-r1:0
- )
-"
-
-RDEPEND=">=virtual/jre-1.8:*"
-
-DOCS=( ../{CONTRIBUTING,NOTICE,README}.md )
-
-JAVA_CLASSPATH_EXTRA="jakarta-activation-api-2"
-JAVA_SRC_DIR="src/main/"
-
-JAVA_TEST_GENTOO_CLASSPATH="junit-4,angus-activation"
-JAVA_TEST_RESOURCE_DIRS="src/test/resources"
-JAVA_TEST_SRC_DIR="src/test/java"
-
-src_test() {
- rm src/test/java/module-info.java || die
-
- # There was 1 failure:
- # 1) doesNotExist(jakarta.mail.util.FactoryFinderTest)
- # java.lang.NullPointerException
- # at jakarta.mail.util.FactoryFinderTest.doesNotExist(FactoryFinderTest.java:55)
- sed \
- -e '/import org.junit.Test/a import org.junit.Ignore;' \
- -e '/doesNotExist/i @Ignore' \
- -i src/test/java/jakarta/mail/util/FactoryFinderTest.java || die
-
- # These tests need to run separately, otherwise would fail
- JAVA_TEST_EXCLUDES=(
- jakarta.mail.internet.ContentDispositionNoStrictTest
- jakarta.mail.internet.WindowsFileNamesTest
- jakarta.mail.internet.AppleFileNamesTest
- )
- java-pkg-simple_src_test
-
- JAVA_TEST_RUN_ONLY="jakarta.mail.internet.ContentDispositionNoStrictTest"
- java-pkg-simple_src_test
-
- JAVA_TEST_RUN_ONLY="jakarta.mail.internet.WindowsFileNamesTest"
- java-pkg-simple_src_test
-
- JAVA_TEST_RUN_ONLY="jakarta.mail.internet.AppleFileNamesTest"
- java-pkg-simple_src_test
-}
diff --git a/dev-java/jakarta-mail-api/jakarta-mail-api-2.1.3.ebuild b/dev-java/jakarta-mail-api/jakarta-mail-api-2.1.3.ebuild
index 2f43cfc96efe..0bd19f854bc1 100644
--- a/dev-java/jakarta-mail-api/jakarta-mail-api-2.1.3.ebuild
+++ b/dev-java/jakarta-mail-api/jakarta-mail-api-2.1.3.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/mail-api-${PV}/api"
LICENSE="EPL-1.0 EPL-2.0 GPL-2-with-classpath-exception"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
DEPEND="
dev-java/jakarta-activation-api:2
diff --git a/dev-java/jakarta-xml-soap-api/files/jakarta-xml-soap-api-1.4.2-dropSecurityManager.patch b/dev-java/jakarta-xml-soap-api/files/jakarta-xml-soap-api-1.4.2-dropSecurityManager.patch
new file mode 100644
index 000000000000..a94489044d7f
--- /dev/null
+++ b/dev-java/jakarta-xml-soap-api/files/jakarta-xml-soap-api-1.4.2-dropSecurityManager.patch
@@ -0,0 +1,14 @@
+bug #923606
+--- a/api/src/test/java/javax/xml/soap/test/SAAJFactoryTest.java
++++ b/api/src/test/java/javax/xml/soap/test/SAAJFactoryTest.java
+@@ -165,9 +165,7 @@ public class SAAJFactoryTest {
+ }
+
+ private void enableSM() {
+- System.setSecurityManager(null);
+- System.setProperty("java.security.policy", classesDir + "javax/xml/soap/test.policy");
+- System.setSecurityManager(new SecurityManager());
++ // no-op
+ }
+
+ protected MessageFactory factory() throws Throwable {
diff --git a/dev-java/jakarta-xml-soap-api/jakarta-xml-soap-api-1.4.2-r1.ebuild b/dev-java/jakarta-xml-soap-api/jakarta-xml-soap-api-1.4.2-r2.ebuild
index 3186460aa436..fc7c2c78bdec 100644
--- a/dev-java/jakarta-xml-soap-api/jakarta-xml-soap-api-1.4.2-r1.ebuild
+++ b/dev-java/jakarta-xml-soap-api/jakarta-xml-soap-api-1.4.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022-2023 Gentoo Authors
+# Copyright 2022-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -12,6 +12,7 @@ inherit java-pkg-2 java-pkg-simple
DESCRIPTION="SOAP with Attachments API for Java (SAAJ) API (Eclipse Project for JAX-WS)"
HOMEPAGE="https://projects.eclipse.org/projects/ee4j.jaxws"
SRC_URI="https://github.com/jakartaee/saaj-api/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/saaj-api-${PV}"
# EDL-1.0 equivalent to BSD
# - 'SPDX-License-Identifier: BSD-3-Clause' in source files' headers
@@ -35,7 +36,9 @@ RDEPEND="
${CP_DEPEND}
"
-S="${WORKDIR}/saaj-api-${PV}"
+PATCHES=(
+ "${FILESDIR}/jakarta-xml-soap-api-1.4.2-dropSecurityManager.patch"
+)
JAVA_SRC_DIR="api/src/main/java"
@@ -46,7 +49,7 @@ JAVA_TEST_EXTRA_ARGS=( -Xbootclasspath/a:target/classes )
DOCS=( CONTRIBUTING.md NOTICE.md README.md )
-src_install() {
- java-pkg-simple_src_install
- einstalldocs # https://bugs.gentoo.org/789582
+src_prepare() {
+ default #780585
+ java-pkg-2_src_prepare
}
diff --git a/dev-java/java-dep-check/java-dep-check-0.5-r2.ebuild b/dev-java/java-dep-check/java-dep-check-0.5-r3.ebuild
index 39cd7d500a85..0ab6c71728ef 100644
--- a/dev-java/java-dep-check/java-dep-check-0.5-r2.ebuild
+++ b/dev-java/java-dep-check/java-dep-check-0.5-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2016-2023 Gentoo Authors
+# Copyright 2016-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -19,8 +19,8 @@ RDEPEND=">=virtual/jre-1.8:*
${CP_DEPEND}"
DEPEND=">=virtual/jdk-1.8:*
${CP_DEPEND}"
+PDEPEND="dev-java/javatoolkit:0"
-JAVA_LAUNCHER_FILENAME="${PN}"
JAVA_MAIN_CLASS="javadepchecker.Main"
src_unpack() {
diff --git a/dev-java/javacc/Manifest b/dev-java/javacc/Manifest
index b05142bce90b..aea384cd1646 100644
--- a/dev-java/javacc/Manifest
+++ b/dev-java/javacc/Manifest
@@ -1,4 +1,3 @@
DIST javacc-4.1.tar.gz 769476 BLAKE2B c2a22fa78ff4dcf1e36221a23ca1e3cd1eecb473a59ea94ce52e298673f6bd18c0ea0cf757dd68885696ebc8cc724d271c69c923a21ffa433d03c1062b1201ee SHA512 911e5e9f062561ade1748dcef3596e0f25c399c4d52dd174773783dadf24a4ceea8d3feab9ab08880370677959051d8557aed815d4c4184f5ecd5789ee8a5754
-DIST javacc-5.0src.tar.gz 810123 BLAKE2B 6833e79a33c7ae8b28902d1c372162a2f9e326629f0d4c1936a8c3638d3aa3f6bd5713aca8398ba5f1ff963fe585eb683fcd3009602ee592ba79692c8ba0f3d6 SHA512 91896a0affac1c4fd00a093a731dfd02bda548d1a4d83e1077ed36a67f4f9deab0ce9f2d0212fd4c08ab00065d3029533adbafbc026a22ca071285093bd3bba6
DIST javacc-7.0.13.tar.gz 3199783 BLAKE2B 7e3dddbe53a6e417a31bb7386d154c0e9589f17f88e652f5e146a4e344d72cd948d4d8e55fab753bb983e5d31971efc948c1ecdca4e875031bea3f8a38bfc082 SHA512 ed71e47fc4a382c9c53067bbf73bd9736ee0c41d65e328d5e4843cd71c88d3b7715d7a8fe38f10152ef7ef3be064abf9e801c6ea78066c4fcbabf124dfc4e144
DIST javacc-7.0.4.tar.gz 2842349 BLAKE2B e5a2e24c99e5e3883270cf0e3931d7667e5b5b49a11c1d9b79b98767f74f4addf2dc7d3d620550bc1b5bb0bfbef8bf07af48a40d250d0902d97c8215f6cb8e01 SHA512 b93c93e8490aae9a26b0de948896ec6d7a044c205d09584c3908988e24a3ea63a1147365115b17a15c6fb311c44f53ddff7c11f092731cbd05d3ec1950ef57f1
diff --git a/dev-java/javacc/javacc-5.0-r5.ebuild b/dev-java/javacc/javacc-5.0-r5.ebuild
deleted file mode 100644
index 6df77f9fca66..000000000000
--- a/dev-java/javacc/javacc-5.0-r5.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# 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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-
-CDEPEND="dev-java/junit:0"
-
-RDEPEND="
- ${CDEPEND}
- >=virtual/jre-1.8:*"
-
-DEPEND="
- ${CDEPEND}
- >=virtual/jdk-1.8:*
- test? ( >=dev-java/ant-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/javacc/javacc-7.0.13.ebuild b/dev-java/javacc/javacc-7.0.13.ebuild
index 29c7faf60f0d..3a111cb197bb 100644
--- a/dev-java/javacc/javacc-7.0.13.ebuild
+++ b/dev-java/javacc/javacc-7.0.13.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${PN}-${P}"
LICENSE="BSD-2"
SLOT="7.0.13"
-KEYWORDS="~amd64 ~arm ~arm64"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
DEPEND="
>=virtual/jdk-1.8:*
diff --git a/dev-java/javacc/javacc-7.0.4.ebuild b/dev-java/javacc/javacc-7.0.4.ebuild
index 2451936f64aa..58d0ccdccbcb 100644
--- a/dev-java/javacc/javacc-7.0.4.ebuild
+++ b/dev-java/javacc/javacc-7.0.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/javacc/javacc/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD-2"
SLOT="7.0.4"
-KEYWORDS="~amd64 ~arm ~arm64"
+KEYWORDS="amd64 ~arm ~arm64 ~x86"
DEPEND="
>=virtual/jdk-1.8:*
diff --git a/dev-java/javacup/Manifest b/dev-java/javacup/Manifest
index e86cdb7e2e96..5bb555f43821 100644
--- a/dev-java/javacup/Manifest
+++ b/dev-java/javacup/Manifest
@@ -1 +1,2 @@
DIST java-cup-src-11b-20151001.tar.gz 313405 BLAKE2B 126944916d120dd2150e4a665fea6d216f3d55e002a72b581621df726e4bf0e0664f9ff925189c97162582277c08a4f121e056299ea5a3f5c10cc31d7c0feb9c SHA512 70bb6a0e13fe52694980040205fcf5b3e904c4a07e50c7740c55cc3bb481496c5c071377757b94f59807b936b8c4fdde5423d78cc2d12a7ada1870f71cd9f47e
+DIST java-cup-src-11b-20160615.tar.gz 313847 BLAKE2B 0031cdb73471512162f69fff6ed47e91d78769c5162f37d4fdcef1c4b4be17ec9e950eda973a8842ae95423840be6c43a335180584b81c4618ea43cbfa926972 SHA512 532a8169f8e1ed2c637c66e7e21cc90eea363732870fbf4e3d66acbff03de3ba0583cefb7b4e7b8f8cb0c9bf1ca92dd5a59111860612bc7544e8beab87f5fbda
diff --git a/dev-java/javacup/javacup-11b_p20160615.ebuild b/dev-java/javacup/javacup-11b_p20160615.ebuild
new file mode 100644
index 000000000000..a66896a46441
--- /dev/null
+++ b/dev-java/javacup/javacup-11b_p20160615.ebuild
@@ -0,0 +1,92 @@
+# 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
+
+DESCRIPTION="CUP Parser Generator for Java"
+HOMEPAGE="https://www2.cs.tum.edu/projects/cup/"
+SRC_URI="https://www2.cs.tum.edu/projects/cup/releases/java-cup-src-${PV/_p/-}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="ant-task"
+
+DEPEND="${CP_DEPEND}
+ >=dev-java/jflex-1.6.1-r3:0
+ >=virtual/jdk-1.8:*
+ ant-task? ( >=dev-java/ant-1.10.14-r3:0 )"
+RDEPEND="${CP_DEPEND}
+ >=virtual/jre-1.8:*
+ ant-task? ( >=dev-java/ant-1.10.14-r3:0 )"
+
+DOCS=( changelog.txt )
+HTML_DOCS=( manual.html )
+
+JAVA_MAIN_CLASS="java_cup/Main"
+JAVA_SRC_DIR=( "src" "java" )
+
+src_prepare() {
+ java-pkg-2_src_prepare
+ if use ant-task; then
+ JAVA_GENTOO_CLASSPATH+="ant"
+ else
+ rm src/java_cup/anttask/CUPTask.java || die
+ fi
+}
+
+src_compile() {
+ if has_version \>=${CATEGORY}/${PN}-11b:${SLOT}; then
+ einfo "Get path of installed JAVACUP"
+ CP_CUP="$(java-pkg_getjar --build-only javacup javacup.jar)"
+ else
+ einfo "Get path of bundled JAVACUP"
+ CP_CUP="$(echo bin/java-cup-*.jar)"
+ fi
+ einfo "Path to JAVACUP is ${CP_CUP}"
+
+ einfo "Get path to jflex"
+ CP_FLEX="$(java-pkg_getjars --build-only jflex)"
+ einfo "Path to jflex is ${CP_FLEX}"
+
+ einfo "Generate parser with: ${CP_CUP}"
+ "$(java-config -J)" -jar "${CP_CUP}" \
+ -interface -destdir "java" -parser "parser" -symbols "sym" \
+ cup/parser.cup || die
+
+ einfo "Generate lexer"
+ # https://jflex.de/manual.html#running-jflex
+ $(java-config -J) -cp "${CP_CUP}:${CP_FLEX}" jflex.Main \
+ flex/Lexer.jflex -d java/javacup || die
+
+ einfo "Build intermediate jar"
+ JAVA_JAR_FILENAME="seco.jar"
+ java-pkg-simple_src_compile
+
+ einfo "Remove classes and generated code"
+ rm -rv java/* target/classes/ || die
+
+ einfo "Regenerate parser with intermediate jar file"
+ "$(java-config -J)" -jar ./seco.jar \
+ -interface -destdir "java" -parser "parser" -symbols "sym" \
+ cup/parser.cup || die
+
+ einfo "Regenerate lexer with intermediate jar file"
+ $(java-config -J) -cp "$(echo ./seco.jar):${CP_FLEX}" jflex.Main \
+ flex/Lexer.jflex -d java/javacup || die
+
+ einfo "Build final jar with regenerated parser and lexer"
+ JAVA_JAR_FILENAME="${PN}.jar"
+ java-pkg-simple_src_compile
+ "$(java-config --jar)" cvf "${PN}-runtime.jar" -C target/classes java_cup/runtime || die
+}
+
+src_install() {
+ java-pkg-simple_src_install
+ java-pkg_dojar "${PN}.jar" "${PN}-runtime.jar"
+ use ant-task && java-pkg_register-ant-task
+}
diff --git a/dev-java/javacup/metadata.xml b/dev-java/javacup/metadata.xml
index 4221e170cbc0..565315fe27ec 100644
--- a/dev-java/javacup/metadata.xml
+++ b/dev-java/javacup/metadata.xml
@@ -5,4 +5,10 @@
<email>java@gentoo.org</email>
<name>Java</name>
</maintainer>
+ <upstream>
+ <remote-id type="github">ultimate-pa/javacup</remote-id>
+ </upstream>
+ <use>
+ <flag name="ant-task">Build and register the ant-task</flag>
+ </use>
</pkgmetadata>
diff --git a/dev-java/javaparser-core/javaparser-core-3.13.10.ebuild b/dev-java/javaparser-core/javaparser-core-3.13.10.ebuild
index aeef1b1b9b05..3f8887785b01 100644
--- a/dev-java/javaparser-core/javaparser-core-3.13.10.ebuild
+++ b/dev-java/javaparser-core/javaparser-core-3.13.10.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/javaparser-${PV}"
LICENSE="Apache-2.0 LGPL-3"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64"
+KEYWORDS="amd64 ~arm ~arm64 ~x86"
JAVACC_SLOT="7.0.4"
diff --git a/dev-java/javatoolkit/javatoolkit-0.6.7.ebuild b/dev-java/javatoolkit/javatoolkit-0.6.7-r1.ebuild
index e0d6e70346ee..c1e3431b5381 100644
--- a/dev-java/javatoolkit/javatoolkit-0.6.7.ebuild
+++ b/dev-java/javatoolkit/javatoolkit-0.6.7-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
PYTHON_REQ_USE="xml(+)"
DISTUTILS_USE_SETUPTOOLS=no
@@ -17,6 +17,8 @@ LICENSE="GPL-2"
SLOT="0"
KEYWORDS="amd64 ~arm arm64 ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
python_prepare_all() {
hprefixify src/py/buildparser src/py/findclass setup.py
distutils-r1_python_prepare_all
diff --git a/dev-java/javax-persistence-api/javax-persistence-api-2.2.ebuild b/dev-java/javax-persistence-api/javax-persistence-api-2.2-r1.ebuild
index 9350a857e77e..6526ed970920 100644
--- a/dev-java/javax-persistence-api/javax-persistence-api-2.2.ebuild
+++ b/dev-java/javax-persistence-api/javax-persistence-api-2.2-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
@@ -12,7 +12,7 @@ DESCRIPTION="Persistence API"
HOMEPAGE="https://www.jcp.org/en/jsr/detail?id=220"
SRC_URI="https://repo1.maven.org/maven2/javax/persistence/${PN/-/.}/${PV}/${PN/-/.}-${PV}-sources.jar"
-LICENSE="CDDL"
+LICENSE="EPL-1.0 BSD"
SLOT="0"
KEYWORDS="amd64 ~arm arm64 ppc64 x86"
diff --git a/dev-java/jaxb-api/Manifest b/dev-java/jaxb-api/Manifest
index f15afae30ea2..26a0e66387da 100644
--- a/dev-java/jaxb-api/Manifest
+++ b/dev-java/jaxb-api/Manifest
@@ -1,4 +1,3 @@
DIST jaxb-api-2.3.3.tar.gz 193025 BLAKE2B 1cf4461fdc67cc05ee43e880c254290b9dbe8a40b1dc39444d8fb6656698876a4bb16c679ee551ec7baa95c07eaf83e2fe5638a71eafbb158805c14c38888cb8 SHA512 37d6705fc1563f0d35a215e2f176473ee5e817a4a3017afe22042a4235c86b8556ea1fb23210d07ca7ea3cd1e0a3271daa4be8c9652cfe92ce2898f1381de3bf
DIST jaxb-api-3.0.1.tar.gz 420695 BLAKE2B 70da435e75f6fcb155d57ee20659897d7d1a72dc38e77f0348eaa767b56e2c5fbb7df88c3b0c794cfc7eaad3d839550a197288dab59520a63562f083388764c0 SHA512 16d62a1fd6045a57f1d215227ce75860340c286eb0986b1086a0312dbc8ca8119b25533c42fe54f367231ec1c34795fec6a9355417f71ce826ee28d5fb6cf9fe
-DIST jaxb-api-4.0.0.tar.gz 543827 BLAKE2B 12a113126290fdf46270d2713d88836e8f5d01059127747a343816a10deb45ecc8c8dc8cf2cf7e2b71754977900645d4fef6e08fa8c47f583945fea34bc62357 SHA512 eb4eab396b894ab801433e0e31f93a4980f3913176a1960591a69e4fd55f10f316a7edb712df323c59f7dc9ca6cebacb7257be06aec72446059dd8b93c6de175
DIST jaxb-api-4.0.2.tar.gz 544391 BLAKE2B fc143248645eb7ea5e17724531c3b6bd902d8c787c735abf16a97259850386d330de67b96837fcbb2be74182e0abbca585e4d6766dd4efffc31b73cb6040e336 SHA512 9fa4cb55a2771011d372fee670672062a12d9eb12aeb3a250ec86cc7814d9ea9fe80aca01039b37f96d5997b15938b2371d8fa323a132caf3be1093e76db1869
diff --git a/dev-java/jaxb-api/jaxb-api-4.0.0.ebuild b/dev-java/jaxb-api/jaxb-api-4.0.0.ebuild
deleted file mode 100644
index 09661390a579..000000000000
--- a/dev-java/jaxb-api/jaxb-api-4.0.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="jakarta.xml.bind:jakarta.xml.bind-api:4.0.0"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Jakarta XML Binding API"
-HOMEPAGE="https://github.com/eclipse-ee4j/jaxb-api"
-SRC_URI="https://github.com/eclipse-ee4j/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="EPL-1.0"
-SLOT="4"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-CP_DEPEND="dev-java/jakarta-activation:2"
-
-DEPEND="${CP_DEPEND}
- >=virtual/jdk-11:*"
-
-RDEPEND="${CP_DEPEND}
- >=virtual/jre-1.8:*"
-
-DOCS=( {CONTRIBUTING,NOTICE,README}.md )
-
-S="${WORKDIR}/${P}"
-
-JAVA_SRC_DIR="api/src/main/java"
-JAVA_RESOURCE_DIRS="api/src/main/resources"
-
-JAVA_TEST_GENTOO_CLASSPATH="junit-4"
-JAVA_TEST_SRC_DIR="jaxb-api-test/src/test/java"
-JAVA_TEST_RESOURCE_DIRS="jaxb-api-test/src/test/resources"
-
-src_install() {
- default # https://bugs.gentoo.org/789582
- java-pkg-simple_src_install
-}
diff --git a/dev-java/jaxb-api/jaxb-api-4.0.2.ebuild b/dev-java/jaxb-api/jaxb-api-4.0.2.ebuild
index 98d999e2aa19..d0a0b6381a1a 100644
--- a/dev-java/jaxb-api/jaxb-api-4.0.2.ebuild
+++ b/dev-java/jaxb-api/jaxb-api-4.0.2.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${P}"
LICENSE="EPL-1.0"
SLOT="4"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
CP_DEPEND="dev-java/jakarta-activation:2"
diff --git a/dev-java/jbitcollider-core/jbitcollider-core-0.8-r1.ebuild b/dev-java/jbitcollider-core/jbitcollider-core-0.8-r2.ebuild
index 00b7f87a10dc..a72404f111ad 100644
--- a/dev-java/jbitcollider-core/jbitcollider-core-0.8-r1.ebuild
+++ b/dev-java/jbitcollider-core/jbitcollider-core-0.8-r2.ebuild
@@ -1,19 +1,19 @@
-# 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
JAVA_PKG_IUSE="doc source"
MY_PN="jBitcollider"
MY_P="${MY_PN}-${PV}"
-JAVA_SRC_DIR="plugins/org.bitpedia.collider.core/src"
inherit java-pkg-2 java-pkg-simple
DESCRIPTION="Core classes of jBitcollider: org.bitpedia.collider.core"
-HOMEPAGE="http://bitcollider.sourceforge.net/"
-SRC_URI="mirror://sourceforge/project/bitcollider/jBitcollider%20%28Java%29/${PV}/${MY_P}.zip"
+HOMEPAGE="https://bitcollider.sourceforge.net"
+SRC_URI="https://downloads.sourceforge.net/project/bitcollider/jBitcollider%20%28Java%29/${PV}/${MY_P}.zip"
+S="${WORKDIR}/${MY_P}"
LICENSE="public-domain"
SLOT="0"
@@ -23,14 +23,9 @@ DEPEND=">=virtual/jdk-1.8:*"
RDEPEND=">=virtual/jre-1.8:*"
BDEPEND="app-arch/unzip"
-S="${WORKDIR}/${MY_P}"
+JAVA_SRC_DIR="plugins/org.bitpedia.collider.core/src"
src_prepare() {
- default
-
- rm -v lib/*.jar || die
- rm -v plugins/*/lib/*.jar || die
- rm -v plugins/org.bitpedia.collider.*/bin/org/bitpedia/collider/*/*.class || die
- rm -v plugins/org.bitpedia.collider.core/bin/org/bitpedia/util/*.class || die
java-pkg-2_src_prepare
+ java-pkg_clean
}
diff --git a/dev-java/jcalendar/jcalendar-1.4-r2.ebuild b/dev-java/jcalendar/jcalendar-1.4-r2.ebuild
new file mode 100644
index 000000000000..cc3c29b2f91c
--- /dev/null
+++ b/dev-java/jcalendar/jcalendar-1.4-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"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Java date chooser bean for graphically picking a date"
+HOMEPAGE="https://toedter.com/jcalendar/"
+SRC_URI="https://www.toedter.com/download/${P}.zip"
+
+LICENSE="LGPL-2.1"
+SLOT="1.2"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="app-arch/unzip"
+
+CP_DEPEND="dev-java/jgoodies-looks:2.6"
+
+DEPEND="
+ ${CP_DEPEND}
+ >=virtual/jdk-1.8:*"
+
+RDEPEND="
+ ${CP_DEPEND}
+ >=virtual/jre-1.8:*"
+
+JAVA_MAIN_CLASS="com.toedter.calendar.demo.JCalendarDemo"
+JAVA_RESOURCE_DIRS="res"
+JAVA_SRC_DIR="src"
+
+src_prepare() {
+ java-pkg-2_src_prepare
+ java-pkg_clean
+ mkdir -p res/META-INF || die
+ mv src/jcalendar.manifest res/META-INF/MANIFEST.MF || die
+ pushd src > /dev/null || die
+ find com -type f ! -name '*.java' \
+ | xargs cp --parents -t ../res || die
+ popd > /dev/null || die
+}
diff --git a/dev-java/jchart2d/jchart2d-3.2.2-r1.ebuild b/dev-java/jchart2d/jchart2d-3.2.2-r1.ebuild
index fe2e13524222..52ae935d3ef8 100644
--- a/dev-java/jchart2d/jchart2d-3.2.2-r1.ebuild
+++ b/dev-java/jchart2d/jchart2d-3.2.2-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
@@ -11,7 +11,7 @@ inherit java-pkg-2 java-pkg-simple
DESCRIPTION="A minimalistic realtime charting library for Java"
HOMEPAGE="http://jchart2d.sourceforge.net"
-SRC_URI="mirror://sourceforge/project/jchart2d/jchart2d/sources/jchart2d-eclipse-project-${PV}.zip"
+SRC_URI="https://downloads.sourceforge.net/project/jchart2d/jchart2d/sources/jchart2d-eclipse-project-${PV}.zip"
LICENSE="LGPL-2.1+"
SLOT="0"
diff --git a/dev-java/jdom/jdom-1.1.3-r2.ebuild b/dev-java/jdom/jdom-1.1.3-r2.ebuild
new file mode 100644
index 000000000000..e321b981d167
--- /dev/null
+++ b/dev-java/jdom/jdom-1.1.3-r2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2024 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-pkg-simple
+
+DESCRIPTION="Java API to manipulate XML data"
+HOMEPAGE="http://jdom.org"
+SRC_URI="http://jdom.org/dist/binary/archive/${P}.tar.gz"
+S="${WORKDIR}/${PN}"
+
+LICENSE="JDOM"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
+
+DOCS=( {CHANGES,COMMITTERS,README,TODO}.txt )
+
+JAVA_SRC_DIR="src"
+
+src_prepare() {
+ java-pkg-2_src_prepare
+ java-pkg_clean
+
+ # circular dependency with jaxen-1.2[jdom]
+ rm -v src/java/org/jdom/xpath/JaxenXPath.java \
+ || die "Unable to remove Jaxen Binding class."
+}
+
+src_install() {
+ java-pkg-simple_src_install
+ use examples && java-pkg_doexamples samples
+}
diff --git a/dev-java/jflex/jflex-1.6.1-r1.ebuild b/dev-java/jflex/jflex-1.6.1-r2.ebuild
index 58580490d2fc..17d1b99fd468 100644
--- a/dev-java/jflex/jflex-1.6.1-r1.ebuild
+++ b/dev-java/jflex/jflex-1.6.1-r2.ebuild
@@ -1,7 +1,7 @@
-# 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"
@@ -10,6 +10,7 @@ inherit java-pkg-2 java-pkg-simple
DESCRIPTION="JFlex is a lexical analyzer generator for Java"
HOMEPAGE="https://www.jflex.de/"
SRC_URI="https://${PN}.de/${P}.tar.gz"
+S="${WORKDIR}/${P}"
LICENSE="BSD"
SLOT="0"
@@ -17,7 +18,7 @@ KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~ppc-macos ~x64-macos"
IUSE="examples test vim-syntax"
RESTRICT="!test? ( test )"
-CDEPEND="dev-java/ant-core:0"
+CDEPEND=">=dev-java/ant-1.10.14:0"
RDEPEND=">=virtual/jre-1.8:*
vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
@@ -29,7 +30,6 @@ DEPEND=">=virtual/jdk-1.8:*
PDEPEND="dev-java/javacup:0"
-S="${WORKDIR}/${P}"
JAVA_SRC_DIR="src/main/java"
src_prepare() {
@@ -59,17 +59,19 @@ src_configure() {
JAVACUP=$(echo lib/java-cup-*.jar)
fi
- JAVA_GENTOO_CLASSPATH_EXTRA="$(java-pkg_getjars --build-only ant-core):${JAVACUP}"
+ JAVA_GENTOO_CLASSPATH_EXTRA="$(java-pkg_getjar --build-only ant ant.jar):${JAVACUP}"
}
jflex_compile() {
- java "${@}" jflex.Main -d ${JAVA_SRC_DIR}/${PN} --skel src/main/${PN}/skeleton.nested src/main/${PN}/LexScan.flex || die
+ java "${@}" jflex.Main -d ${JAVA_SRC_DIR}/${PN} \
+ --skel src/main/${PN}/skeleton.nested src/main/${PN}/LexScan.flex || die
java-pkg-simple_src_compile
java-pkg_addres ${PN}.jar src/main/resources
}
src_compile() {
- java -jar "${JAVACUP}" -destdir ${JAVA_SRC_DIR}/${PN} -package ${PN} -parser LexParse -interface src/main/cup/LexParse.cup || die
+ java -jar "${JAVACUP}" -destdir ${JAVA_SRC_DIR}/${PN} -package ${PN} \
+ -parser LexParse -interface src/main/cup/LexParse.cup || die
# The IcedTea ARM HotSpot port (as of 2.6.1) hangs when running
# jflex. We have patched jflex to fix it but we have to run the
@@ -77,8 +79,8 @@ src_compile() {
# http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2678.
use arm && local JFLEX_ARGS="-Xint"
- # First compile (without doc/source) using the bundled jflex.
- JAVA_PKG_IUSE= jflex_compile -cp "lib/${P}.jar:${JAVACUP}" ${JFLEX_ARGS}
+ # First compile using the bundled jflex.
+ jflex_compile -cp "lib/${P}.jar:${JAVACUP}" ${JFLEX_ARGS}
# Then recompile using the fresh jflex.
jflex_compile -cp "${PN}.jar:${JAVACUP}"
diff --git a/dev-java/jflex/jflex-1.6.1-r3.ebuild b/dev-java/jflex/jflex-1.6.1-r3.ebuild
new file mode 100644
index 000000000000..ae329e176675
--- /dev/null
+++ b/dev-java/jflex/jflex-1.6.1-r3.ebuild
@@ -0,0 +1,135 @@
+# 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
+
+DESCRIPTION="JFlex is a lexical analyzer generator for Java"
+HOMEPAGE="https://www.jflex.de/"
+SRC_URI="https://${PN}.de/${P}.tar.gz"
+S="${WORKDIR}/${P}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~ppc-macos ~x64-macos"
+IUSE="ant-task examples test vim-syntax"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="test? ( ant-task )"
+
+RDEPEND="
+ >=virtual/jre-1.8:*
+ ant-task? ( >=dev-java/ant-1.10.14-r3:0 )
+ vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
+"
+
+DEPEND="
+ >=virtual/jdk-1.8:*
+ ant-task? ( >=dev-java/ant-1.10.14-r3:0 )
+ test? ( dev-java/junit:4 )
+"
+
+PDEPEND=">=dev-java/javacup-11b_p20160615:0"
+
+JAVA_SRC_DIR="src/main/java"
+
+src_prepare() {
+ eapply_user
+ java-pkg-2_src_prepare
+
+ # See below for details.
+ eapply "${FILESDIR}/icedtea-arm.patch"
+
+ # We need the bundled jflex.jar.
+ rm -rv ${JAVA_SRC_DIR}/java_cup examples/pom.xml || die
+
+ # Remove the bundled java-cup.jar if unneeded.
+ if has_version ${PDEPEND}; then
+ rm -v lib/java-cup-*.jar || die
+ fi
+}
+
+src_configure() {
+ # javacup is a cyclic dependency. Use the package if we have it,
+ # otherwise use the bundled version and install the package later.
+ if has_version ${PDEPEND}; then
+ # Use PORTAGE_QUIET to suppress a QA warning that is spurious
+ # thanks to has_version above. This is Portage-specific but
+ # showing the warning elsewhere isn't the end of the world.
+ JAVACUP=$(PORTAGE_QUIET=1 java-pkg_getjar --build-only javacup javacup.jar)
+ else
+ JAVACUP=$(echo lib/java-cup-*.jar)
+ fi
+
+ JAVA_GENTOO_CLASSPATH_EXTRA="${JAVACUP}"
+ if use ant-task; then
+ JAVA_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant ant.jar)"
+ else
+ rm src/main/java/jflex/anttask/JFlexTask.java || die
+ fi
+}
+
+jflex_compile() {
+ java "${@}" jflex.Main -d ${JAVA_SRC_DIR}/${PN} \
+ --skel src/main/${PN}/skeleton.nested src/main/${PN}/LexScan.flex || die
+ java-pkg-simple_src_compile
+ java-pkg_addres ${PN}.jar src/main/resources
+}
+
+src_compile() {
+ java -jar "${JAVACUP}" -destdir ${JAVA_SRC_DIR}/${PN} -package ${PN} \
+ -parser LexParse -interface src/main/cup/LexParse.cup || die
+
+ # The IcedTea ARM HotSpot port (as of 2.6.1) hangs when running
+ # jflex. We have patched jflex to fix it but we have to run the
+ # bundled version first. -Xint works around the problem. See
+ # http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2678.
+ use arm && local JFLEX_ARGS="-Xint"
+
+ # First compile using the bundled jflex.
+ jflex_compile -cp "lib/${P}.jar:${JAVACUP}" ${JFLEX_ARGS}
+
+ # Then recompile using the fresh jflex.
+ jflex_compile -cp "${PN}.jar:${JAVACUP}"
+}
+
+src_install() {
+ java-pkg-simple_src_install
+ java-pkg_dolauncher ${PN} --main ${PN}.Main
+
+ java-pkg_register-dependency javacup javacup-runtime.jar
+ use ant-task && java-pkg_register-ant-task
+
+ use examples && java-pkg_doexamples examples
+ dodoc {changelog,README}.md
+
+ if use doc; then
+ dodoc doc/*.pdf
+ docinto html
+ dodoc doc/*.{css,html,png} doc/COPYRIGHT
+ fi
+
+ if use vim-syntax; then
+ insinto /usr/share/vim/vimfiles/syntax
+ doins lib/${PN}.vim
+ fi
+}
+
+src_test() {
+ if use arm && java-pkg_current-vm-matches oracle-jdk-bin-1.8; then
+ # This results in a StackOverflowError as of 1.8.0.65 but works
+ # fine on icedtea:7. Don't know about icedtea:8 yet.
+ rm -v src/test/java/jflex/EmitterTest.java || die
+ fi
+
+ local CP="src/test/java:${PN}.jar:${JAVA_GENTOO_CLASSPATH_EXTRA}:$(java-pkg_getjars junit-4)"
+
+ local TESTS=$(find src/test/java -name "*Test*.java" -printf "%P\n")
+ TESTS="${TESTS//.java}"
+ TESTS="${TESTS//\//.}"
+
+ ejavac -classpath "${CP}" $(find src/test/java -name "*.java")
+ ejunit4 -classpath "${CP}" ${TESTS}
+}
diff --git a/dev-java/jflex/metadata.xml b/dev-java/jflex/metadata.xml
index 6021501589e0..3c0e0377e098 100644
--- a/dev-java/jflex/metadata.xml
+++ b/dev-java/jflex/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>
+ <use>
+ <flag name="ant-task">Build and register the ant-task</flag>
+ </use>
</pkgmetadata>
diff --git a/dev-java/jimfs/Manifest b/dev-java/jimfs/Manifest
new file mode 100644
index 000000000000..b43255dddabd
--- /dev/null
+++ b/dev-java/jimfs/Manifest
@@ -0,0 +1,2 @@
+DIST jimfs-1.3.0.tar.gz 157568 BLAKE2B 1febcf132c162ebb87ec9507bc12e05d6a9354195f36b0e198fd50faa22284608adafd1989a79390271ced4c063dda44c477fc7ae051c32960afca0f4f2ee2b7 SHA512 1c769ba74d45de1656fd30bd695b61caaa5ec9bd6c6e051310d371012fa6c746d0b2ba85d3f94490ebfb9f74ca75f173b879144673f8e3af8fde1a132725490d
+DIST truth-1.1.3.jar 243021 BLAKE2B a59149038c62ef5dd352b13d4b393e1b7715fbafe5ed86ec2d16d722c738a31dcdca10132fc73b17b367ac4309e5407ba2e489f8d4c8fbca60ce5f35ae75d1e3 SHA512 f29a9fb070aff8a32358a7b6c8998c0095de5d8d68afa7f7bac759c7050309deff929e767657ecbbefd96163460f10255ca01bc567ab30df4834b9d916a4fae8
diff --git a/dev-java/jimfs/jimfs-1.3.0.ebuild b/dev-java/jimfs/jimfs-1.3.0.ebuild
new file mode 100644
index 000000000000..bb73a2d2a856
--- /dev/null
+++ b/dev-java/jimfs/jimfs-1.3.0.ebuild
@@ -0,0 +1,70 @@
+# 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="com.google.jimfs:jimfs:${PV}"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="An in-memory file system for Java 7+"
+HOMEPAGE="https://github.com/google/jimfs"
+SRC_URI="https://github.com/google/jimfs/archive/v${PV}.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}/${P}/jimfs"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
+
+CP_DEPEND="
+ dev-java/auto-service-annotations:0
+ dev-java/error-prone-annotations:0
+ dev-java/guava:0
+ >=dev-java/icu4j-74.2-r1:0
+ dev-java/jsr305:0
+"
+
+DEPEND="${CP_DEPEND}
+ dev-java/checker-framework-qual:0
+ >=virtual/jdk-1.8:*
+ test? (
+ dev-java/guava-testlib:0
+ )"
+
+RDEPEND="${CP_DEPEND}
+ >=virtual/jre-1.8:*"
+
+JAVA_CLASSPATH_EXTRA="checker-framework-qual"
+JAVA_AUTOMATIC_MODULE_NAME="com.google.common.jimfs"
+JAVA_RESOURCE_DIRS="src/main/res"
+JAVA_SRC_DIR="src/main/java"
+JAVA_TEST_GENTOO_CLASSPATH="guava-testlib junit-4"
+JAVA_TEST_SRC_DIR="src/test/java"
+
+src_prepare() {
+ java-pkg-2_src_prepare
+ mkdir -p src/main/res/META-INF/services || die
+ echo "com.google.common.jimfs.SystemJimfsFileSystemProvider" > \
+ src/main/res/META-INF/services/java.nio.file.spi.FileSystemProvider || die
+}
+
+src_test() {
+ JAVA_GENTOO_CLASSPATH_EXTRA="${DISTDIR}/truth-1.1.3.jar"
+ # Using the defaults of java-pkg-simple would exclude
+ # several tests which are run by "mvn test".
+ pushd src/test/java > /dev/null || die
+ local JAVA_TEST_RUN_ONLY=$(find * \
+ -name "*Test.java" \
+ ! -name AbstractGlob*.java \
+ ! -name AbstractPathMatcherTest.java \
+ ! -name AbstractJimfsIntegrationTest.java \
+ ! -name AbstractAttributeProviderTest.java \
+ )
+ popd > /dev/null
+ JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}"
+ JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}"
+ java-pkg-simple_src_test
+}
diff --git a/dev-java/validation-api/metadata.xml b/dev-java/jimfs/metadata.xml
index 535a0cd95681..e1353ba1e585 100644
--- a/dev-java/validation-api/metadata.xml
+++ b/dev-java/jimfs/metadata.xml
@@ -3,9 +3,8 @@
<pkgmetadata>
<maintainer type="project">
<email>java@gentoo.org</email>
- <name>Java</name>
</maintainer>
<upstream>
- <remote-id type="github">jakartaee/validation</remote-id>
+ <remote-id type="github">google/jimfs</remote-id>
</upstream>
</pkgmetadata>
diff --git a/dev-java/jsch/jsch-0.1.55.ebuild b/dev-java/jsch/jsch-0.1.55.ebuild
index 33cc6811dfc7..3b319db72cf5 100644
--- a/dev-java/jsch/jsch-0.1.55.ebuild
+++ b/dev-java/jsch/jsch-0.1.55.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
# Skeleton command:
@@ -13,7 +13,7 @@ inherit java-pkg-2 java-pkg-simple
DESCRIPTION="JSch is a pure Java implementation of SSH2"
HOMEPAGE="http://www.jcraft.com/jsch/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.zip"
+SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.zip"
LICENSE="BSD"
SLOT="0"
diff --git a/dev-java/jtds/jtds-1.3.1-r1.ebuild b/dev-java/jtds/jtds-1.3.1-r1.ebuild
index d5b7dd1cd11a..650c6251d4b3 100644
--- a/dev-java/jtds/jtds-1.3.1-r1.ebuild
+++ b/dev-java/jtds/jtds-1.3.1-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
@@ -9,7 +9,7 @@ inherit java-pkg-2 java-pkg-simple
DESCRIPTION="jTDS - SQL Server and Sybase JDBC driver"
HOMEPAGE="http://jtds.sourceforge.net"
-SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV}/${P}-src.zip"
+SRC_URI="https://downloads.sourceforge.net/project/${PN}/${PN}/${PV}/${P}-src.zip"
LICENSE="LGPL-2.1"
SLOT="1.3"
diff --git a/dev-java/jtidy/Manifest b/dev-java/jtidy/Manifest
index bd28d25f9377..e09ee53ded98 100644
--- a/dev-java/jtidy/Manifest
+++ b/dev-java/jtidy/Manifest
@@ -1,2 +1 @@
DIST jtidy-1.0.zip 240642 BLAKE2B 96e312f2b938f75124a966ad6ecbae39a6822a0d362e98265226409b6c407cfbd1cf1eac2adac522cb02174159392c25bab3abb18c6dce591a0d398cef367306 SHA512 be73dfd2f65ec53a3c1a9b9014a62011f58f5f337bbd2b3939c5f8f54c225fa7718717bf84348bc07a37411c20b1e82f300ba4fc865d7019ada6b1f8d081440a
-DIST jtidy-r938-sources.zip 240642 BLAKE2B 96e312f2b938f75124a966ad6ecbae39a6822a0d362e98265226409b6c407cfbd1cf1eac2adac522cb02174159392c25bab3abb18c6dce591a0d398cef367306 SHA512 be73dfd2f65ec53a3c1a9b9014a62011f58f5f337bbd2b3939c5f8f54c225fa7718717bf84348bc07a37411c20b1e82f300ba4fc865d7019ada6b1f8d081440a
diff --git a/dev-java/jtidy/files/jtidy-1.0-build.xml.patch b/dev-java/jtidy/files/jtidy-1.0-build.xml.patch
deleted file mode 100644
index ba5e04a7f976..000000000000
--- a/dev-java/jtidy/files/jtidy-1.0-build.xml.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- a/build.xml.orig 2015-12-01 21:10:36.689000000 +0000
-+++ b/build.xml 2015-12-01 21:11:05.642000000 +0000
-@@ -9,11 +9,7 @@
- <property name="srczip" value="jtidy-${version}-sources.zip"/>
- <property name="allzip" value="jtidy-${version}.zip"/>
-
-- <target name="clean">
-- <delete dir="${target}"/>
-- </target>
--
-- <target name="jar" depends="clean">
-+ <target name="jar">
- <mkdir dir="${target}"/>
- <mkdir dir="${bin}"/>
- <javac srcdir="${src}" destdir="${bin}" source="1.4" target="1.4"/>
-@@ -30,13 +26,13 @@
- </jar>
- </target>
-
-- <target name="javadoc" depends="clean">
-+ <target name="javadoc">
- <javadoc sourcepath="${src}" destdir="${target}/${doc}" windowtitle=" JTidy ${version} " doctitle="JTidy ${version} API documentation">
- <tag name="todo" scope="all" description="To do:"/>
- </javadoc>
- </target>
-
-- <target name="src" depends="clean">
-+ <target name="src">
- <zip destfile="${target}/${srczip}">
- <fileset dir=".">
- <include name="${src}/**"/>
diff --git a/dev-java/jtidy/jtidy-1.0-r1.ebuild b/dev-java/jtidy/jtidy-1.0-r1.ebuild
deleted file mode 100644
index 7c227fdf5e9e..000000000000
--- a/dev-java/jtidy/jtidy-1.0-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-MY_PV="r938"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Java port of HTML Tidy, an HTML syntax checker and pretty printer"
-HOMEPAGE="http://jtidy.sourceforge.net/"
-SRC_URI="mirror://sourceforge/project/${PN}/JTidy/${MY_PV}/${PN}-${MY_PV}-sources.zip -> ${P}.zip"
-LICENSE="HTML-Tidy W3C"
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
-
-CDEPEND="dev-java/ant-core:0"
-
-DEPEND="
- ${CDEPEND}
- >=virtual/jdk-1.8:*"
-
-RDEPEND="
- ${CDEPEND}
- >=virtual/jre-1.8:*"
-
-BDEPEND="
- app-arch/unzip"
-
-JAVA_ANT_ENCODING="UTF-8"
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-EANT_GENTOO_CLASSPATH="ant-core"
-EANT_BUILD_TARGET="jar"
-
-S="${WORKDIR}"
-
-PATCHES=(
- "${FILESDIR}"/"${P}-build.xml.patch"
-)
-
-src_prepare() {
- default
-}
-
-src_install() {
- java-pkg_newjar "target/${MY_P}.jar"
- java-pkg_dolauncher "jtidy" --main org.w3c.tidy.Tidy
-
- use doc && java-pkg_dojavadoc target/javadoc/
- use source && java-pkg_dosrc src/main/java
-}
diff --git a/dev-java/jtidy/jtidy-938.ebuild b/dev-java/jtidy/jtidy-1.0-r2.ebuild
index 63fdea8d2708..3121a966d659 100644
--- a/dev-java/jtidy/jtidy-938.ebuild
+++ b/dev-java/jtidy/jtidy-1.0-r2.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
@@ -8,21 +8,23 @@ MAVEN_ID="net.sf.jtidy:jtidy:r${PV}"
inherit java-pkg-2 java-pkg-simple
+MY_PV="r938"
+MY_P="${PN}-${MY_PV}"
+
DESCRIPTION="a Java port of HTML Tidy, a HTML syntax checker and pretty printer"
HOMEPAGE="https://sourceforge.net/projects/jtidy/"
-SRC_URI="https://master.dl.sourceforge.net/project/jtidy/JTidy/r${PV}/jtidy-r${PV}-sources.zip"
+SRC_URI="https://downloads.sourceforge.net/project/${PN}/JTidy/${MY_PV}/${PN}-${MY_PV}-sources.zip -> ${P}.zip"
LICENSE="HTML-Tidy W3C"
-SLOT="9"
-KEYWORDS="amd64"
+SLOT="0"
+KEYWORDS="amd64 ppc64 x86"
BDEPEND="app-arch/unzip"
-CP_DEPEND="dev-java/ant-core:0"
-
+CP_DEPEND=">=dev-java/ant-1.10.14-r3:0"
DEPEND="${CP_DEPEND}
- >=virtual/jdk-1.8 "
+ >=virtual/jdk-1.8:*"
RDEPEND="${CP_DEPEND}
- >=virtual/jre-1.8"
+ >=virtual/jre-1.8:*"
JAVA_MAIN_CLASS="org.w3c.tidy.Tidy"
JAVA_RESOURCE_DIRS="src/main/resources"
diff --git a/dev-java/jtwig-core/jtwig-core-5.87.0.ebuild b/dev-java/jtwig-core/jtwig-core-5.87.0.ebuild
index 1ae3c516fb3d..4750629545a8 100644
--- a/dev-java/jtwig-core/jtwig-core-5.87.0.ebuild
+++ b/dev-java/jtwig-core/jtwig-core-5.87.0.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${P}.RELEASE"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64"
+KEYWORDS="amd64 ~arm ~arm64 ~x86"
# no tests because
# net.jperf does not exist
# org.unitils.reflectionassert does not exist
diff --git a/dev-java/jtwig-reflection/jtwig-reflection-5.87.0.ebuild b/dev-java/jtwig-reflection/jtwig-reflection-5.87.0.ebuild
index aaac0c8e5c2c..46276ea49c1f 100644
--- a/dev-java/jtwig-reflection/jtwig-reflection-5.87.0.ebuild
+++ b/dev-java/jtwig-reflection/jtwig-reflection-5.87.0.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${P}.RELEASE"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64"
+KEYWORDS="amd64 ~arm ~arm64 ~x86"
DEPEND="
dev-java/commons-lang:3.6
diff --git a/dev-java/junit/Manifest b/dev-java/junit/Manifest
index 68aac7156ad4..7c157778f793 100644
--- a/dev-java/junit/Manifest
+++ b/dev-java/junit/Manifest
@@ -1,4 +1,4 @@
-DIST junit-4.13.2.tar.gz 1077147 BLAKE2B c083982cd604812ba3375f90e0486bb3683ecbc3b08e3d14d4541845c5b91cd85100fe86028c70a7cec4e1ab6f6794bcb9333686b3c9b0705eacb75ac36e64da SHA512 29f8f8717efe50b9c7e27805a699f3664a0a068e32ce93e3a1a2bc67a045417490ac04251ef8f8bbd21c77a759bf7e4c6b7a5a07141227bd17de0c526c5031bb
DIST junit-4.13.2_p20240222.tar.gz 1007781 BLAKE2B 4eeab59aa7ff3cc65c73318acb562523e6ba781da6a0baf28f8fa82042f1affddb583d188c550207a7e267b3475f4a546e8e25eba61d5ba36d13bd7e277ad156 SHA512 89506413b7aca7c2d0b41c8297dde48c1b90a44133bfb3ebf300247c7837839a3aff2d785d891ddb8762427d718eacf016a1d67e2e24edda05f4eae36ca311f1
-DIST junit-5.9.2.tar.gz 2882173 BLAKE2B 6baf8768654b399d64237a110dcb6a821ab7dc8964254a5d00f7ffb65c789818aed51ad7042a963a47669042baaeec87b5d0453643a2b0eeeaf6393a42c75fd6 SHA512 5673577f773042b4e253241d27298a60dbac239502788e1d999fbe0d3ffe76b29c90d4fb43660f2e2e00e3e9b8d4c1b6b909ff95dc6e87ccb6f7b009ae6b0e78
+DIST junit-5.10.2.tar.gz 2942035 BLAKE2B 4880df74b7cbf23acd34c716f9fce26edd28b31c14d720e129e9e1f06aa35b70c447a0d87904e083a54663fba17e0b2b470678dc32480e0a11c5ebf46d5fe38e SHA512 c36ff7c2bd21f9a64c93b836fc1017a8a96ebcc0079cf1d95b09f5b764435178c2dc2336f2493e7e4df561013693dce4f08dfe0cf3bd76cc9b820313f64d064f
DIST junit3.8.2.zip 461426 BLAKE2B 8fbef1ccdf7f71c611976d63f45838f4cb2564da5f5064e7abc39931a3c99039a40660093aba2cc3c70af761171125f434c16c52021226f2e92fdf23597dbf25 SHA512 f203332ccc2bdc38c683a95bdbe448f38cbfbeea81ecc431bf9ebf0a3292f0150fcfe5cd5dd6da481be034366820f95775a33581931aed9e4cc12a6ff27e3930
+DIST junit5-java18-compatibility.patch 742 BLAKE2B 89bfa36330278cdee2f7f66ed5527895e650a7b490d3f3695772a27541be1d8383c1742bab4e8494f3a84c29f93f553880a3bd5cd4d84792cf662fbc33a6e594 SHA512 5a9a562eb61a875764da369ff40da6ff95c6de8b3b3ecb612634112076741d75d6eab385743843b4fe7ca8a1827960e06550f6e90c8b7ef75b55006b41c416cd
diff --git a/dev-java/junit/junit-3.8.2-r2.ebuild b/dev-java/junit/junit-3.8.2-r2.ebuild
index da6bba7b5fed..79144cb8e889 100644
--- a/dev-java/junit/junit-3.8.2-r2.ebuild
+++ b/dev-java/junit/junit-3.8.2-r2.ebuild
@@ -10,7 +10,7 @@ inherit java-pkg-2 java-pkg-simple
DESCRIPTION="Simple framework to write repeatable tests"
HOMEPAGE="https://junit.org/"
-SRC_URI="mirror://sourceforge/project/junit/junit/${PV}/junit${PV}.zip"
+SRC_URI="https://downloads.sourceforge.net/project/junit/junit/${PV}/junit${PV}.zip"
S="${WORKDIR}/junit${PV}"
LICENSE="CPL-1.0"
diff --git a/dev-java/junit/junit-4.13.2-r1.ebuild b/dev-java/junit/junit-4.13.2-r1.ebuild
deleted file mode 100644
index 0fa825c0272c..000000000000
--- a/dev-java/junit/junit-4.13.2-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# 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="junit:junit:${PV}"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Simple framework to write repeatable tests"
-HOMEPAGE="https://junit.org/junit4/"
-SRC_URI="https://github.com/${PN}-team/${PN}4/archive/r${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}4-r${PV}"
-
-LICENSE="EPL-1.0"
-SLOT="4"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-
-CP_DEPEND="dev-java/hamcrest-core:1.3"
-# not suitable for jdk:21 #916398
-DEPEND="${CP_DEPEND}
- <=virtual/jdk-17:*
- test? ( dev-java/hamcrest-library:1.3 )"
-RDEPEND="${CP_DEPEND}
- >=virtual/jre-1.8:*"
-
-JAVA_AUTOMATIC_MODULE_NAME="junit"
-JAVA_ENCODING="ISO-8859-1"
-JAVA_RESOURCE_DIRS="src/main/resources"
-JAVA_SRC_DIR="src/main/java"
-
-JAVA_TEST_GENTOO_CLASSPATH="hamcrest-core-1.3,hamcrest-library-1.3"
-JAVA_TEST_SRC_DIR="src/test/java"
-JAVA_TEST_RESOURCE_DIRS="src/test/resources"
-
-src_test() {
- cd "${JAVA_TEST_SRC_DIR}" || die
-
- local CP=".:../resources:${S}/${PN}.jar:$(java-pkg_getjars ${JAVA_TEST_GENTOO_CLASSPATH})"
-
- ejavac -cp "${CP}" -d . $(find * -name "*.java")
- # pom.xml lines 264-268
- java -cp "${CP}" -Djava.awt.headless=true \
- org.junit.runner.JUnitCore org.junit.tests.AllTests || die "Running junit failed"
-}
diff --git a/dev-java/junit/junit-4.13.2_p20240222.ebuild b/dev-java/junit/junit-4.13.2_p20240222.ebuild
index 3ca8e79546cc..6a2ce43fc405 100644
--- a/dev-java/junit/junit-4.13.2_p20240222.ebuild
+++ b/dev-java/junit/junit-4.13.2_p20240222.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}4-${MY_COMMIT}"
LICENSE="EPL-1.0"
SLOT="4"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
CP_DEPEND="dev-java/hamcrest-core:1.3"
DEPEND="${CP_DEPEND}
diff --git a/dev-java/junit/junit-5.9.2.ebuild b/dev-java/junit/junit-5.10.2.ebuild
index 46efd8fcf0d8..9429d37e25d6 100644
--- a/dev-java/junit/junit-5.9.2.ebuild
+++ b/dev-java/junit/junit-5.10.2.ebuild
@@ -10,16 +10,19 @@ EAPI=8
# multiple times to build multiple modules, but the eclass always
# installs each module's Javadoc to the same directory, which would
# trigger an error when the second module's Javadoc is installed.
-JAVA_PKG_IUSE="source"
+JAVA_PKG_IUSE="source test"
inherit java-pkg-2 java-pkg-simple
DESCRIPTION="Simple framework to write repeatable tests"
HOMEPAGE="https://junit.org/junit5/"
-SRC_URI="https://github.com/junit-team/junit5/archive/r${PV}.tar.gz -> ${P}.tar.gz"
+DEB="5.10.1-1"
+SRC_URI="https://github.com/junit-team/junit5/archive/r${PV}.tar.gz -> ${P}.tar.gz
+ https://sources.debian.org/data/main/j/junit5/${DEB}/debian/patches/18-java-compatibility.patch \
+ -> junit5-java18-compatibility.patch"
S="${WORKDIR}/junit5-r${PV}"
-LICENSE="EPL-2.0"
+LICENSE="EPL-2.0"
SLOT="5"
KEYWORDS="amd64 ~arm arm64 ppc64 x86"
IUSE="doc migration-support suite vintage"
@@ -45,6 +48,7 @@ DEPEND="
>=virtual/jdk-11:*
${CP_DEPEND}
${COND_DEPEND}
+ test? ( dev-java/jimfs:0 )
"
RDEPEND="
@@ -53,6 +57,15 @@ RDEPEND="
${COND_DEPEND}
"
+PATCHES=(
+ "${DISTDIR}/junit5-java18-compatibility.patch"
+)
+
+src_prepare() {
+ default #780585
+ java-pkg-2_src_prepare
+}
+
src_configure() {
# Please make sure to declare a module's dependencies before the module itself.
# Useful upstream documentation regarding modules and dependencies:
@@ -297,6 +310,7 @@ src_test() {
"@${example_sources}"
local test_cp="${example_classes}:${JUNIT5_TEST_RESOURCE_DIR}:$(junit5_gen_cp)"
+ test_cp="${test_cp}:$(java-pkg_getjars --build-only --with-dependencies jimfs)"
ejavac -d "${test_classes}" -encoding "${JAVA_ENCODING}" \
-classpath "${test_cp}" ${JAVAC_ARGS} \
"@${test_sources}"
diff --git a/dev-java/lucene/Manifest b/dev-java/lucene/Manifest
index 32bc29febef6..8c052711ebb3 100644
--- a/dev-java/lucene/Manifest
+++ b/dev-java/lucene/Manifest
@@ -1 +1,2 @@
-DIST lucene-2.4.1.tar.gz 5057003 BLAKE2B 3e2a29cfa94b367f1e62f60a2f7b7e195c788048564fb061ade4b1babcb2fd71e36b282049d3816c3faaaa3dacc07f4a7dbdb0504a659ea3ab8e06e247debcba SHA512 cf227eea4aeee904ccf5316ee7f2399864bf28b9c01e044ef27232dd483c3a5f0ecc8836633f44acfa41ffee6bf1c530e756ef45fa77ac1d15e1f83129b7aa5e
+DIST lucene-2.4.1-src.tar.gz 5057003 BLAKE2B 3e2a29cfa94b367f1e62f60a2f7b7e195c788048564fb061ade4b1babcb2fd71e36b282049d3816c3faaaa3dacc07f4a7dbdb0504a659ea3ab8e06e247debcba SHA512 cf227eea4aeee904ccf5316ee7f2399864bf28b9c01e044ef27232dd483c3a5f0ecc8836633f44acfa41ffee6bf1c530e756ef45fa77ac1d15e1f83129b7aa5e
+DIST lucene-2.4.1-src.tar.gz.asc 189 BLAKE2B 614fc428936d49caac1072e5c4fe5a31d86545220483f1e60fee6560b3bf1d661eb718013c8211ff701758aff37ebe3ffe18bb0a94d90b75962d1e74b8005f6b SHA512 38eee5a062ca11c638b3a0e131ffe133b49e9c759216d854f2be99e27a8445408b1097df28436e6155f551df0ddf9ca16a286652c9ce12dc114228bbd125dba2
diff --git a/dev-java/lucene/files/lucene-2.4.1-javacc.home.patch b/dev-java/lucene/files/lucene-2.4.1-javacc.home.patch
new file mode 100644
index 000000000000..9668b6de1ff4
--- /dev/null
+++ b/dev-java/lucene/files/lucene-2.4.1-javacc.home.patch
@@ -0,0 +1,13 @@
+diff --git a/common-build.xml b/common-build.xml
+index 3fa75d1..1e695cf 100644
+--- a/common-build.xml
++++ b/common-build.xml
+@@ -110,7 +110,7 @@
+ <available
+ property="javacc.present"
+ classname="org.javacc.parser.Main"
+- classpath="${javacc.home}/bin/lib/javacc.jar"
++ classpath="${javacc.home}/javacc.jar"
+ />
+
+ <available
diff --git a/dev-java/lucene/files/lucene-2.4.1-skipFailingTest.patch b/dev-java/lucene/files/lucene-2.4.1-skipFailingTest.patch
new file mode 100644
index 000000000000..d8e3611539aa
--- /dev/null
+++ b/dev-java/lucene/files/lucene-2.4.1-skipFailingTest.patch
@@ -0,0 +1,25 @@
+[junit]
+[junit] Testsuite: org.apache.lucene.index.TestIndexInput
+[junit] Tests run: 2, Failures: 1, Errors: 0, Skipped: 0, Time elapsed: 0.069 sec
+[junit]
+[junit] Testcase: testRead(org.apache.lucene.index.TestIndexInput): FAILED
+[junit] expected:<[]> but was:<[��]>
+[junit] junit.framework.ComparisonFailure: expected:<[]> but was:<[��]>
+[junit] at org.apache.lucene.index.TestIndexInput.testRead(TestIndexInput.java:89)
+[junit]
+[junit]
+[junit] Test org.apache.lucene.index.TestIndexInput FAILED
+
+https://bugs.gentoo.org/312437
+
+--- a/src/test/org/apache/lucene/index/TestIndexInput.java
++++ b/src/test/org/apache/lucene/index/TestIndexInput.java
+@@ -23,7 +23,7 @@ import org.apache.lucene.store.IndexInput;
+ import java.io.IOException;
+
+ public class TestIndexInput extends LuceneTestCase {
+- public void testRead() throws IOException {
++ public void noTestRead() throws IOException {
+ IndexInput is = new MockIndexInput(new byte[] {
+ (byte) 0x80, 0x01,
+ (byte) 0xFF, 0x7F,
diff --git a/dev-java/lucene/lucene-2.4.1-r3.ebuild b/dev-java/lucene/lucene-2.4.1-r3.ebuild
deleted file mode 100644
index 01cdd2a220ea..000000000000
--- a/dev-java/lucene/lucene-2.4.1-r3.ebuild
+++ /dev/null
@@ -1,83 +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"
-JAVA_PKG_BSFIX_ALL="no"
-JAVA_PKG_BSFIX_NAME="build.xml common-build.xml"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="High-performance, full-featured text search engine written entirely in Java"
-HOMEPAGE="https://lucene.apache.org"
-SRC_URI="https://archive.apache.org/dist/${PN}/java/${P}-src.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="2.4"
-KEYWORDS="amd64 x86"
-
-CDEPEND="
- dev-java/javacc:0"
-
-# Restricting to jdk:1.8 since it fails to build with openjdk-17
-# BUILD FAILED
-# /var/tmp/portage/dev-java/lucene-2.4.1-r3/work/lucene-2.4.1/build.xml:52: rmic does not exist under Java 15 and higher,
-# use rmic of an older JDK and explicitly set the executable attribute
-DEPEND="
- ${CDEPEND}
- virtual/jdk:1.8
- test? (
- dev-java/junit:0
- dev-java/ant-core:0
- )"
-
-RDEPEND="
- ${CDEPEND}
- >=virtual/jre-1.8:*"
-
-src_prepare() {
- default
- java-pkg_clean
- sed -i -e '/-Xmax/ d' common-build.xml || die
-
- # Portage marks shese files as bogus for some reason.
- find . -type f -name instruction_arrow.png -exec rm -v {} \; || die
-}
-
-src_compile() {
- # regenerate javacc files just because we can
- # put javacc.jar on ant's classpath here even when <javacc> task
- # doesn't use it - it's to fool the <available> test, first time
- # it's useful not to have ignoresystemclasses=true...
- ANT_TASKS="ant-core javacc" \
- eant \
- -Djavacc.home="${EPREFIX}"/usr/share/javacc/lib \
- javacc
- ANT_TASKS="none" \
- eant \
- -Dversion=${PV} \
- jar-core \
- jar-demo \
- $(use_doc javadocs-core javadocs-demo)
-}
-
-src_test() {
- java-ant_rewrite-classpath common-build.xml
- EANT_GENTOO_CLASSPATH="junit ant-core" \
- ANT_TASKS="ant-junit" \
- eant \
- test-core
-}
-
-src_install() {
- einstalldocs
- java-pkg_newjar "build/${PN}-core-${PV}.jar" "${PN}-core.jar"
- java-pkg_newjar "build/${PN}-demos-${PV}.jar" "${PN}-demos.jar"
-
- if use doc; then
- dodoc -r docs
- java-pkg_dohtml -r build/docs/api
- fi
- use source && java-pkg_dosrc src/java/org
-}
diff --git a/dev-java/lucene/lucene-2.4.1-r4.ebuild b/dev-java/lucene/lucene-2.4.1-r4.ebuild
new file mode 100644
index 000000000000..c69bb031e695
--- /dev/null
+++ b/dev-java/lucene/lucene-2.4.1-r4.ebuild
@@ -0,0 +1,82 @@
+# 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-ant-2 verify-sig
+
+DESCRIPTION="High-performance, full-featured text search engine written entirely in Java"
+HOMEPAGE="https://lucene.apache.org"
+SRC_URI="https://archive.apache.org/dist/${PN}/java/${P}-src.tar.gz
+ verify-sig? ( https://archive.apache.org/dist/${PN}/java/${P}-src.tar.gz.asc )"
+
+LICENSE="Apache-2.0"
+SLOT="2.4"
+KEYWORDS="~amd64 ~x86"
+
+VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/lucene.apache.org.asc"
+BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-lucene )"
+
+# Restricting to jdk:1.8 since it fails to build with openjdk-17
+# BUILD FAILED
+# /var/tmp/portage/dev-java/lucene-2.4.1-r3/work/lucene-2.4.1/build.xml:52: \
+# rmic does not exist under Java 15 and higher,
+# use rmic of an older JDK and explicitly set the executable attribute
+DEPEND="
+ dev-java/javacc:0
+ virtual/jdk:1.8
+ test? (
+ >=dev-java/ant-1.10.14-r3:0[junit]
+ dev-java/junit:0
+ )"
+
+RDEPEND=">=virtual/jre-1.8:*"
+
+PATCHES=(
+ "${FILESDIR}/lucene-2.4.1-skipFailingTest.patch"
+ "${FILESDIR}/lucene-2.4.1-javacc.home.patch"
+)
+
+src_prepare() {
+ default #780585
+ java-pkg-2_src_prepare
+ java-pkg_clean
+
+ cat > build.properties <<-EOF || die
+ junit-location.jar=$(java-pkg_getjars --build-only junit)
+ javacc.home=${EPREFIX}/usr/share/javacc/lib/
+ EOF
+ # stop scrambling the build.xml
+ touch "${T}/java-ant-2_src_configure-run"
+
+ rm docs/skin/images/instruction_arrow.png || die #: broken IDAT window length
+ rm docs/images/instruction_arrow.png || die #: broken IDAT window length
+}
+
+src_compile() {
+ eant javacc
+
+ eant \
+ -Dversion=${PV} \
+ jar-core \
+ jar-demo \
+ $(use_doc javadocs-core javadocs-demo)
+}
+
+src_test() {
+ eant test-core
+}
+
+src_install() {
+ einstalldocs
+ java-pkg_newjar "build/${PN}-core-${PV}.jar" "${PN}-core.jar"
+ java-pkg_newjar "build/${PN}-demos-${PV}.jar" "${PN}-demos.jar"
+
+ if use doc; then
+ dodoc -r docs
+ java-pkg_dohtml -r build/docs/api
+ fi
+ use source && java-pkg_dosrc src/java/org
+}
diff --git a/dev-java/maven-bin/Manifest b/dev-java/maven-bin/Manifest
index 7158eea18442..3410e210679f 100644
--- a/dev-java/maven-bin/Manifest
+++ b/dev-java/maven-bin/Manifest
@@ -1,2 +1,4 @@
DIST apache-maven-3.8.8-bin.tar.gz 8296049 BLAKE2B af6353193365ed33e8f2f0a7e4d31933132751f142ebbdb68aab7a74ad2dda6593bf34cef9d8d56d6c93ff93293b75517a10a5c1c048733b8c911f4ac150bdf6 SHA512 332088670d14fa9ff346e6858ca0acca304666596fec86eea89253bd496d3c90deae2be5091be199f48e09d46cec817c6419d5161fb4ee37871503f472765d00
DIST apache-maven-3.9.6-bin.tar.gz 9410508 BLAKE2B 2a99f002912e6c0fcf9f78f0553553898cf39c17bd7c8b58269c8a7d061c425c62a2f557a686fd2b1f114ef1f47aab6e9b318555235bb436e8c7e5c8b1a0dd9d SHA512 706f01b20dec0305a822ab614d51f32b07ee11d0218175e55450242e49d2156386483b506b3a4e8a03ac8611bae96395fd5eec15f50d3013d5deed6d1ee18224
+DIST apache-maven-3.9.7-bin.tar.gz 9581488 BLAKE2B 2cdf5c06cf59913314bc50813f37061d6db3413991511588889863ddbedb590fc601247c9e25a31eca2d4d12a1e7fa4b3ca39575cd096c11c220346014ffa65b SHA512 f64913f89756264f2686e241f3f4486eca5d0dfdbb97077b0efc389cad376053824d58caa35c39648453ca58639f85335f9be9c8f217bfdb0c2d5ff2a9428fac
+DIST apache-maven-3.9.8-bin.tar.gz 9083702 BLAKE2B c636ea861d1c96938490453600cac513caf54843ffc26f45e22a655e737af93689d492e3b3055b184a33a1975aaa50a681a29412ebfd036dfd8e2c61043f6291 SHA512 7d171def9b85846bf757a2cec94b7529371068a0670df14682447224e57983528e97a6d1b850327e4ca02b139abaab7fcb93c4315119e6f0ffb3f0cbc0d0b9a2
diff --git a/dev-java/maven-bin/maven-bin-3.9.7.ebuild b/dev-java/maven-bin/maven-bin-3.9.7.ebuild
new file mode 100644
index 000000000000..d30a1ed61465
--- /dev/null
+++ b/dev-java/maven-bin/maven-bin-3.9.7.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit java-pkg-2
+
+MY_PN=apache-${PN%%-bin}
+MY_PV=${PV/_alpha/-alpha-}
+MY_P="${MY_PN}-${MY_PV}"
+MY_MV="${PV%%.*}"
+
+DESCRIPTION="Project Management and Comprehension Tool for Java"
+HOMEPAGE="https://maven.apache.org/"
+SRC_URI="mirror://apache/maven/maven-${MY_MV}/${PV}/binaries/${MY_P}-bin.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="Apache-2.0"
+SLOT="3.9"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+ >=virtual/jdk-1.8:*
+ app-eselect/eselect-java"
+
+RDEPEND="
+ >=virtual/jre-1.8:*"
+
+MAVEN="${PN}-${SLOT}"
+MAVEN_SHARE="/usr/share/${MAVEN}"
+
+QA_FLAGS_IGNORED=(
+ "${MAVEN_SHARE}/lib/jansi-native/linux32/libjansi.so"
+ "${MAVEN_SHARE}/lib/jansi-native/linux64/libjansi.so"
+)
+
+# TODO:
+# We should use jars from packages, instead of what is bundled.
+src_install() {
+ dodir "${MAVEN_SHARE}"
+
+ cp -Rp bin boot conf lib "${ED}/${MAVEN_SHARE}" || die "failed to copy"
+
+ java-pkg_regjar "${ED}/${MAVEN_SHARE}"/boot/*.jar
+ java-pkg_regjar "${ED}/${MAVEN_SHARE}"/lib/*.jar
+
+ dodoc NOTICE README.txt
+
+ dodir /usr/bin
+ dosym "${MAVEN_SHARE}/bin/mvn" "${EPREFIX}/usr/bin/mvn-${SLOT}"
+
+ # See bug #342901.
+ echo "CONFIG_PROTECT=\"${MAVEN_SHARE}/conf\"" > "${T}/25${MAVEN}" || die
+ doenvd "${T}/25${MAVEN}"
+}
+
+pkg_postinst() {
+ eselect maven update mvn-${SLOT}
+}
+
+pkg_postrm() {
+ eselect maven update
+}
diff --git a/dev-java/maven-bin/maven-bin-3.9.8.ebuild b/dev-java/maven-bin/maven-bin-3.9.8.ebuild
new file mode 100644
index 000000000000..d30a1ed61465
--- /dev/null
+++ b/dev-java/maven-bin/maven-bin-3.9.8.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit java-pkg-2
+
+MY_PN=apache-${PN%%-bin}
+MY_PV=${PV/_alpha/-alpha-}
+MY_P="${MY_PN}-${MY_PV}"
+MY_MV="${PV%%.*}"
+
+DESCRIPTION="Project Management and Comprehension Tool for Java"
+HOMEPAGE="https://maven.apache.org/"
+SRC_URI="mirror://apache/maven/maven-${MY_MV}/${PV}/binaries/${MY_P}-bin.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="Apache-2.0"
+SLOT="3.9"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+ >=virtual/jdk-1.8:*
+ app-eselect/eselect-java"
+
+RDEPEND="
+ >=virtual/jre-1.8:*"
+
+MAVEN="${PN}-${SLOT}"
+MAVEN_SHARE="/usr/share/${MAVEN}"
+
+QA_FLAGS_IGNORED=(
+ "${MAVEN_SHARE}/lib/jansi-native/linux32/libjansi.so"
+ "${MAVEN_SHARE}/lib/jansi-native/linux64/libjansi.so"
+)
+
+# TODO:
+# We should use jars from packages, instead of what is bundled.
+src_install() {
+ dodir "${MAVEN_SHARE}"
+
+ cp -Rp bin boot conf lib "${ED}/${MAVEN_SHARE}" || die "failed to copy"
+
+ java-pkg_regjar "${ED}/${MAVEN_SHARE}"/boot/*.jar
+ java-pkg_regjar "${ED}/${MAVEN_SHARE}"/lib/*.jar
+
+ dodoc NOTICE README.txt
+
+ dodir /usr/bin
+ dosym "${MAVEN_SHARE}/bin/mvn" "${EPREFIX}/usr/bin/mvn-${SLOT}"
+
+ # See bug #342901.
+ echo "CONFIG_PROTECT=\"${MAVEN_SHARE}/conf\"" > "${T}/25${MAVEN}" || die
+ doenvd "${T}/25${MAVEN}"
+}
+
+pkg_postinst() {
+ eselect maven update mvn-${SLOT}
+}
+
+pkg_postrm() {
+ eselect maven update
+}
diff --git a/dev-java/mockito/mockito-1.9.5-r3.ebuild b/dev-java/mockito/mockito-1.9.5-r4.ebuild
index b3f923f412a9..6c673f92d0ab 100644
--- a/dev-java/mockito/mockito-1.9.5-r3.ebuild
+++ b/dev-java/mockito/mockito-1.9.5-r4.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 @@ SLOT="0"
KEYWORDS="amd64 ~arm arm64 ppc64 x86"
CP_DEPEND="
- dev-java/ant-core:0
+ >=dev-java/ant-1.10.14-r3:0
dev-java/hamcrest-core:0
dev-java/junit:4
dev-java/objenesis:0
diff --git a/dev-java/openjdk-bin/Manifest b/dev-java/openjdk-bin/Manifest
index eed4ebaa2d60..9c05c23032b7 100644
--- a/dev-java/openjdk-bin/Manifest
+++ b/dev-java/openjdk-bin/Manifest
@@ -1,23 +1,24 @@
-DIST OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.22_7.tar.gz 191713436 BLAKE2B 2d0381ca8dc4bdc07330f79c7e290bdb60a28fe21122d4db1810dc036e7213071d327470b20361db1435fe2d5492e7d3815f3e244597d3d76a9f7894b515783f SHA512 a0772607ede5642051446dc742180fd4e42fbe78602eb3b874b00930ea4ba19eefdcf6a130f378b6cc7dde414a3db2259edb1ad570da4a7951a73bebc5a90b9b
-DIST OpenJDK11U-jdk_arm_linux_hotspot_11.0.22_7.tar.gz 182591395 BLAKE2B 858c6033c161dfe6c1475037bce5d538ca7b95b95b65a75edff03d0292e64d1ac2e3c2ed008b52938d9811e35a94ed694df2801605b55d6732c6c1c1b68b547b SHA512 aa0be475706f6cca490ff81389e131fb512efaa948d722b108a7060355af77134210c2509711f9c8bf4d32130cba813dc460c093d831ac8de539571ab3d08f20
-DIST OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.22_7.tar.gz 177146946 BLAKE2B 2e285abcde91eb578c88e81c6a737d6c6e00d58001325eaed7fd332d4d42588779192ae73f3de598cf725c9cd08860ff3a0db29f7fae54a6a404cbdf0db0b2ad SHA512 6288e599a54f1e2e02dd0eef5f0aae051ae8b15ed30e924c7018ac52d2eeb2572934557b7e722df7f704568656c8a8f93797dd2e86fdc3f0f32ffd004f803419
-DIST OpenJDK11U-jdk_x64_alpine-linux_hotspot_11.0.22_7.tar.gz 193744131 BLAKE2B 2cdbf676ecc860dd8ec13d959f9f63537e4b14feb0627cc360602a377c8a7193a2db67cb71f462939ab252f2ff3be1b46a15c25a7c1c1f1632254b1ea09eeef9 SHA512 81dabded0d6cee459ade96992d4002910448aa5fa091fd1b6c376a585c382d449bc63f5e51ba0c21e5fdd81f3e1d58e1d27f0b6016daca775644610087f3b090
-DIST OpenJDK11U-jdk_x64_linux_hotspot_11.0.22_7.tar.gz 195002045 BLAKE2B 1898bcc1c1d97668238a13c70226b14f325a7c5be55f393ce2e6373fa0764a38633511a485257d05e173670e20b8c0195fb63d7143f41a1296556e5d59a8fe00 SHA512 00d75269a88c3d879907408f76ca1ee5a1ed48914e1ac27fa4faadf66a12fbccd6235d23be6c0d096a508c6ed996884ff2fe206290c061c2542835050476cfa5
-DIST OpenJDK11U-jdk_x64_mac_hotspot_11.0.22_7.tar.gz 187409838 BLAKE2B edbbb534fad7d6b50c79253d7c8bc1369f413fd1748a4f160003db2e01d8b907c115a5a3815de85e25a16c74bf0d316cccf7e0a508a488c51c476511876d5d54 SHA512 3371785f6bcc27dea59b074798795c91f3a0fc2241ea24d9e04bdb98fd77ebc1ccb058d1b34ea56660a7bac92e60192396a9d8b85b8983f1617bddf50d118276
-DIST OpenJDK17U-jdk_aarch64_linux_hotspot_17.0.10_7.tar.gz 190867185 BLAKE2B dfac2c4383af080b8101e73d141f6ecaf38f44a0b8e88fddf8e33eb0454fccb22075e00a8eb3031c33a0d63a079da634b128766f4ab4fed70c8da999c8f8a568 SHA512 74447bacae664b5a1a420605d1c3b68a7be8deb230cc08700b23bb159ef10acb613595505f711906aa132aec2a25d5151f178cd9982d0d254a4d31a7396b4aef
-DIST OpenJDK17U-jdk_aarch64_mac_hotspot_17.0.10_7.tar.gz 178168341 BLAKE2B 425cac786cd7bd758d40ad76bdfc96969e2ca2b1ecf20c449a7e42b77020881f7c7414099b7ff9df482ce4698c680af4d819a928efb4e4608c54266412fcb2f5 SHA512 006773423fa46d61d1111a74bf1a41d50cb419d4a2855d0257a11282f9ab966a59e6bf22044b46d3a29041c37942f2f69780ee38002e8443da2bd40543ce0948
-DIST OpenJDK17U-jdk_arm_linux_hotspot_17.0.10_7.tar.gz 189087918 BLAKE2B e8c70966cd362ac26e748c4efb16bbe3816d27bbec5d3b2448b77bc07f8f17b6c77dd7cddcccd1256e621db93653e3aed2ebf1f895606023b00fdf3a98232b57 SHA512 17d540bfa9fd458fb214dc550df4bd1bd563630712b23549d61182d3c5dcf39cf016510b2318655e9bff594e40b960d7754200ba6184ea23bab40ed2d8e9c06f
-DIST OpenJDK17U-jdk_ppc64le_linux_hotspot_17.0.10_7.tar.gz 191584458 BLAKE2B 77ad2b213ee0957afdf6c204b2c987f568f62071ef282b8eb44d041980e44d5b964e4403324555f98caccd8736278ede2b486a4647ffbe669d4a285d19bf6507 SHA512 f808ad1d20ec025925653f6fe4566d6075c242b0f60f3dca3d0b46ec309ff3dd30637b9d2d2937b0fd2dff5a3ffd9e675766ea56a6bccc00a991266101d63db0
-DIST OpenJDK17U-jdk_x64_alpine-linux_hotspot_17.0.10_7.tar.gz 191453728 BLAKE2B 61e54448c7540f43c11ec55ffffe07ba43bbb60bcbc2acd07a3a06562ffbf7bd5b25c2a91540ead82978c43ef30ac2adbae1554d0718156b28bb34d46882020a SHA512 b7eded9bef2bbfa38b6350914df472e10daf82600af8090b59ce01cd0d2e6efd02f0bf28920cbcd3f7da2018e5642d8e5a282337ad969c8b9a8c35c0ae4890d3
-DIST OpenJDK17U-jdk_x64_linux_hotspot_17.0.10_7.tar.gz 192205930 BLAKE2B 1c1ae9515a273ff7d7d4ef806fcb6d101e127f224912626982fbe848375f240bfca69815173b65c8c3ecc7019bb681ef43665bf3fe82d5c4333da057a35c976d SHA512 fcbb1bc62d484a8b851ea22d725921f72a4ce7ace33c1db737e7294aac17b74cd7ae9a366cac09d328be66e742916f0191fafaf531641610e652d24390df591a
-DIST OpenJDK17U-jdk_x64_mac_hotspot_17.0.10_7.tar.gz 180364858 BLAKE2B ded64698ee98c051b4f2bdbf7d30eb27bbc5418742306bd07fe87b0cf7cc579adc553bc2a16f8b15d2fe1950b463195ca3f3d414494491435fca052faedb8bf8 SHA512 4c199bbf2584d4a360caced88bb6f297417469334d3a3007f5a172f2fd3a41a492968fc0ad32a4f8424e4d6712d01060aef2531957edccc100f6cb58bbfce000
-DIST OpenJDK21U-jdk_aarch64_linux_hotspot_21.0.2_13.tar.gz 206857501 BLAKE2B 108d924b2f41d179ece7678a18b5805b76eb187608c4a698bd77d21a5db7956f0aad34764addb507846c11e41af576c0e99c578325db9f2f5aebed02b0bff4e8 SHA512 a41a31915ea64cbdae4e9b81057df579d8456a5ca5e224497e862dbb207275f9d84dd91d9c9cce4d81b03d21d3d4305e3276d064ec1e32b6d1f272f157c82f56
-DIST OpenJDK21U-jdk_ppc64le_linux_hotspot_21.0.2_13.tar.gz 208115806 BLAKE2B 1462c0cc0488d02109035b06e17c68d5ee21c62b8565e214f91980af8f1bd0e689c439fb546d3e9556b6df42b545c6d349601cf1bbed77c175dc7d5b1b8e0959 SHA512 7991d8779aea00f9016a37dd290b3b4bd5189201cd87425fd337f346907887a61e7030d4180cb3d60af3f5f478135bec1698235c0ef2c2b2cac73a4e1d1b630b
-DIST OpenJDK21U-jdk_x64_alpine-linux_hotspot_21.0.2_13.tar.gz 207838511 BLAKE2B 1c2dd157fadd7d8ab0660dd181de223431fdcb5f4ca201ba3c827bd044c435d8ffd059600f38b378984bb002f03403c16addf999ace7128a426b0948ce9b4971 SHA512 1b2f58c224bb6fde53a4e5d2693d881ce61b47ac36ff735558fb38a8d30e4826fec046048d3681ce18e1c63a60e1f999b8f474ac6794dd1197bd88926df3d0ca
-DIST OpenJDK21U-jdk_x64_linux_hotspot_21.0.2_13.tar.gz 208796351 BLAKE2B 64741e3e58c08424ba6c7f46af42e391e3172a83415fc346b22ac92c9eeb6f1b42bc02d6392f9ceaa449d4266ed58872600f6cfecf622739f7496676caeebcda SHA512 691ec4d447933c59696944cdb5d5de86fc1332b2c730dc6624f546c0d30456cb3583d53f38d7531f69195e807092c1d03d923d73d5e6883185cae935db1ed7ce
-DIST OpenJDK8U-jdk_aarch64_linux_hotspot_8u402b06.tar.gz 102121884 BLAKE2B 78d6cb02f1c264eeb47f0ed7c6ea63cb0923119fb718be4f493423e9ef16546d810fadae82321fd1465528375383f0a65c6fe1a0bb091829ad14a9fc1f91296c SHA512 3a1bb7f684032d6130006597d1665ff063490a155bcbe720bb9cb94ff0368df1d86646923dad8965e6cecc12d05618e348f1b9d260a9fab3b9fb275c3350cf91
-DIST OpenJDK8U-jdk_arm_linux_hotspot_8u402b06.tar.gz 98319479 BLAKE2B 6b59e92767566e8abf7bd360f6b0b543ceb514c3b1677ef1610596998390dba74e54cd673cff764677c11316f88ab05fe0080549ab063eec5bf42ac6f97343af SHA512 6595b35a5d883d17de56fcac638a4936397e01c2a132269ce66e325a8cb0fc6b437ab16062c1decaf5a93b6597e72034e2aef1ddbe5442f23575f31504a3767c
-DIST OpenJDK8U-jdk_ppc64le_linux_hotspot_8u402b06.tar.gz 100525497 BLAKE2B b3ca75fd946ea70dd8fcbc444b361e02b3249144795b0d2786892e6ec668802ae3b2f082fabe1d9e91e5db5877d6774f5c56f5fc382b38e739070e54e95bdca5 SHA512 e00df5042f7f813153689e33e7e64b23efbe2b64d8a11e60072f50f0ba38a61cf66214c535d75175f9ed99f67c22857ccc36d62c9c34962a7385e4b9c880c5d0
-DIST OpenJDK8U-jdk_x64_alpine-linux_hotspot_8u402b06.tar.gz 100908305 BLAKE2B 3beb70ed7c99f80fb338fd8580f6b6ee9a4af0d7034abff59c0f8d42255fe83a3e9b9847d82dd4bb793439a64dc9d5fcc2d407f4bfd09625bf8be3ad92bf0e5f SHA512 e5563646a505923c1f2342a884c94e24c06de14dd6da21c3cb010bcf1e4c481ff7cdbae8cecfb70bf52a4c5d23a9fa87e38b1c7b8b84f99b0a8b3e8ca25242aa
-DIST OpenJDK8U-jdk_x64_linux_hotspot_8u402b06.tar.gz 103003119 BLAKE2B c97a924fe236ec0ad30eb70fb9ad2bea19065a22622d68dabb86be02eccdb30707bc00af98f46246fc8242f0bff4be8d5becfd32bf6cb015dd443d94e2722489 SHA512 22259ee3d98ed49e38f7c78efc200f72ee1fe5c02830e79061d16cc634df3276d1e17a113354bfd3d575ebf3b56e128848d03ae3dd5c06cc1954e33ad395b9e9
-DIST OpenJDK8U-jdk_x64_mac_hotspot_8u402b06.tar.gz 109474943 BLAKE2B e277cf06d893aa75f9aee91894fa6177c52fa556128614b80755af3c1bb16036daf972b4267c5c02d6e187c6bd52713eeeffd93e23f8d7a2897ad01149e8545c SHA512 718a120a1c6a861cba900ad267f646177e1b56d9646068121341ae9ce52a9ae9a20afa173d85c4870d539105f94b75685108c019da84bd23e973ce80e2356841
+DIST OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.23_9.tar.gz 192013902 BLAKE2B 6a4b47b9a3397d3436bd55a16a459a3cab3f8a2a7dc3285b3bde8db13f0e66d5e094803df0c5901a17272e6378161caada6f27845184e2efd17a6761661299c8 SHA512 90e53418efc7c34d7cf0691d566f07a84f02bd2d34cdee0c9c343e27c8d9bfd4d1bf86f104ae33a47274932ab8ba6ec8071a35e7d613129d03e439ae3382452c
+DIST OpenJDK11U-jdk_arm_linux_hotspot_11.0.23_9.tar.gz 182785851 BLAKE2B 453ca29859e749a9050f8b6627696ab6d38ee5e83ab69b1d159eb3b7c0bae68104cf68ca21b87123b4fc61059e528ba4ed0ee29fa4759f33a3cf46182f52a48a SHA512 af8ed3659f8ff07f5e5c135d96a7368d326f5b19e3d73077a3fa701716f6e415d4a784ff6c5f81267eb1b3d2e171a688126253f1c3197fc80ea260826ebad5a0
+DIST OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.23_9.tar.gz 177453532 BLAKE2B aa98f381f2ac4f208ced4dac4f4b01d20cfd27c8ccc75a0c41db6a57b67ca11d87b8133cb0af96283f646e5e90612f9ad69db5129e6f50518ad2eb0a53c86db1 SHA512 c590fa032593db48531d49977c95d1f884fe751472d927d0d0bc15f36ec35f71ea53c9acafa3dc00c4b25e88d4c18ab590b42f8057a277e16947c3ce31362381
+DIST OpenJDK11U-jdk_x64_alpine-linux_hotspot_11.0.23_9.tar.gz 193956832 BLAKE2B bc334b59bbb021812ee7064b1915b6106923d41a74a3acf5b5d8fbcf50f6e0d467a96da22f996252422b08f5c7864418c552a102a18f3bd9cb14e5b4904656e5 SHA512 f0992a7fdb1acadf8cb19a94822e7a75f7453033cc0a3432f9efface7827b4a7ebb1ff67a81774da83844afdb046461415f50ddf11192863e88ab06889c86836
+DIST OpenJDK11U-jdk_x64_linux_hotspot_11.0.23_9.tar.gz 195220527 BLAKE2B b2f024fdd2d72e78c86f562fbd37684c9d9639472d66e15b4b882c35241c500c09467e97440249bf69f4e63ef99d3f057b0e79852b67d55c5518d041cba2d657 SHA512 ccccb5003b78cff0cbf471d9b885ebd5805b5a21dd71afdb03a0d447cd6715e781dbf01f11970f7632b8181147fe0090f7fe8fc46c8732d2b17f0978f01934a4
+DIST OpenJDK11U-jdk_x64_mac_hotspot_11.0.23_9.tar.gz 187689918 BLAKE2B c1ccebd2bfeccdf64f1ab0c781e4ba5f2701f6c70de81486c6b4d91bb1d1df367f58fa66bf8f073ed47413649905a306ad3f75c6696e1d0510ce02fe3453d255 SHA512 93974938c10d58b182a7bda49e21e26806a01a03fe72915ca559df3e02c694b3b88ed11c49987bc2ca7c1acabda0892d8c22a4ab19ed8b796dd02f29c44dbff0
+DIST OpenJDK17U-jdk_aarch64_linux_hotspot_17.0.11_9.tar.gz 191052267 BLAKE2B 837cd3f3e9cdff7b66d1a8e10e2e8ebb9db1168fad2982fd523eb8067ca017efdc05e577b93af74623558d04a8458dc1d790c9626e7ed2d6568bf7fc22a44925 SHA512 eeeacbd0f8daa1d62663f7ec95fb7dd3ff855a0187347e3c1ddb4a5d13e494c1a940b43b5fdf75480963d65dd4d94330570b751fa7cde540124ed2164c176870
+DIST OpenJDK17U-jdk_aarch64_mac_hotspot_17.0.11_9.tar.gz 178367345 BLAKE2B 7f1c8f77ab8ce9ce401947e51cc3051491df1579409f7ecb73107f091b58d6e7fce2004604951dfad019cd60e8da84fd4ee9f8987f92c9363889b310ee098e54 SHA512 0283452e56b3fbd85af33a7939ec8ae69624241ef07224152de55c5aafb1a5cb8423b8a211b5fadf8f5ea50aa0e5ed8211d02abf1398473ddf3ef13f2ba3f1c4
+DIST OpenJDK17U-jdk_arm_linux_hotspot_17.0.11_9.tar.gz 189349607 BLAKE2B 2508ca965c27b1cf6457a595418ee9cd0450f9633a2fb80605a58a4bb7546cebb95b04c0d66bb14107c75fdff9fb678d78cdb879316929a3da6863579d4df9dd SHA512 bb76dcc65f65bbd3a256a54cea00eddb25312f1a1e2ed30fd3088bd44e9f8db7bb2ff3a6776b5ff6733ea7afc02928ef9e2bae296325fb1b8eb9b66b4e6f4a87
+DIST OpenJDK17U-jdk_ppc64le_linux_hotspot_17.0.11_9.tar.gz 191737628 BLAKE2B d78a0a64bf936bf85a4f9fe1c9299d1db4773e10cd308afa5167d61ce35ea7415d2a94a1dc160345fa5aa3d3a7b730235801789db147d62dae621572ca060fe7 SHA512 9ae308f12b5c74b48aed4ef2312d7e0b23e9fa73b7d78eb3576037b0fcbcfc3a5381ebc448fb41279e770d5994c46bdda6822b97181fa3d3365da63c8b0ecadf
+DIST OpenJDK17U-jdk_x64_alpine-linux_hotspot_17.0.11_9.tar.gz 191615499 BLAKE2B 4b342ebf3da0cf49d448b95dec6b04819d2ab2e31327b793b9d9aef86b4e78ce33a54995a5d0608d14214f3d0fde73d0ad334c9b0e3c5d2cbb6d40c4bb22637f SHA512 7773843e3b2a02ccb70c3ea49639c723f5da715dcb3e27ed85dbd2182648621a5822c49728436377c8e8af4d20231ba5b861e45be17efe44a5a81a92c225a851
+DIST OpenJDK17U-jdk_x64_linux_hotspot_17.0.11_9.tar.gz 192396023 BLAKE2B 1e5f12041d9c17195f242d7d36edf6995b1f71cb52ca211773faaa0cca6af983ec8c7885d58d4b87b38a0a26f71d088c104cdbcb84fdfffd97643f2a09a2a4ed SHA512 f11e61d91ad27ca31196ded87d06b5e379e4e652c09ffdd5c3d73cdc9fe6c46cd7785838c70514897645213ff6c6948227be27d7fd773949f1055338966ba275
+DIST OpenJDK17U-jdk_x64_mac_hotspot_17.0.11_9.tar.gz 180563846 BLAKE2B f9bf368e39d95cce40413caeb98192f88f90cad7dcb486ef5e1d7369cfc346603d37de88c049930b958043621e44c103e020354eb80faff0cf83fac8dc7497a7 SHA512 999ad1fb7c822e9000e734c86e70e73aa572ec1a75d14219b391e9d358d1dba1fd0d9d568df4c28d8ca88fd4341e24feee2f840b6c35c4c530d2cd174dd797b1
+DIST OpenJDK21U-jdk_aarch64_linux_hotspot_21.0.3_9.tar.gz 205794447 BLAKE2B 4d6ac1fa90b81be10cd32be76665dc26bae59a5c288d1b1f87e396ea356bf46f73b58db06b5b09417714f4638550d7ade55792f276f39dabc100345efd18c28f SHA512 b9cea7a7f4405c66722b3562e0ded7362475146753b1fcc4ad0d068264e9f228b8547dae704c6ce2be9c4a879902c2fbd93524176ffa02ddcb3edc4d4f6759cb
+DIST OpenJDK21U-jdk_ppc64le_linux_hotspot_21.0.3_9.tar.gz 207595331 BLAKE2B 7358f61aaee85fc5ac584307f1d5372de17aa06676aa823de157236e4332184b9212e74cc4214845a9e834ebac88d41ba185d1823257254174a960db88cb0574 SHA512 dafe0f31867f2ef817f188fe1222adefae72fe4443ec95eba8f18d60c141bdca0f63c2591c834c470c7b15d011618c97c45bbc65e746cdc47ba9be9a2f2ce523
+DIST OpenJDK21U-jdk_riscv64_linux_hotspot_21.0.3_9.tar.gz 203760093 BLAKE2B 6be42a229745d9f8616b2738a3301642b8358b542625af01aa943779a029e4ef16f70eec437a22e2215a720d99420a01d498093c54387374ab8169a517eff9d9 SHA512 d10f6dea263dcf32e4e356f941fd275a64a4ad331db638332788623240f0f30869932542857653a65fca0e18a49d154fe2dce5bcf645c878ce86efa02fe05471
+DIST OpenJDK21U-jdk_x64_alpine-linux_hotspot_21.0.3_9.tar.gz 207940807 BLAKE2B 331e80062987c1932c24c8ecee8456240261ab43da04df2e5782f28c9683226e74116b2d8b5dac7047ce62e1ccaa5020fb9d94b98c515e9c94445ac8165f9692 SHA512 149dc0e7f058443787e99641b0c996ea7ac15d171abcf03778ca6a44769583cae5e507415b16fd8de5015d2acfef4705910cd43289cdfe624d07280e7b7ad961
+DIST OpenJDK21U-jdk_x64_linux_hotspot_21.0.3_9.tar.gz 207698369 BLAKE2B 27dbfba74a3dc46ff98c982208e10c1c40940cfb90db0d756e8038cbb1c5f45e30ac3ca07b408a3593c471d0f5ea75bb652902d49786490e9ad5ba290ca91162 SHA512 cd9e6054989a838004490f6162f6831397e5498033777d90da224f0aa4809e0f5c8a14459e6f30d441fa1238371d7db9718e2c606c38862b803dda824bbdba1f
+DIST OpenJDK8U-jdk_aarch64_linux_hotspot_8u412b08.tar.gz 102116126 BLAKE2B 19f8deee04fe5521323ead5193ff7b383979afa32c4375bdef7ce53b868dd7cb317bcd208b94d373c353f5480433cb3a28beeacbb7f42b501058acdfe6917079 SHA512 e2c5e17eda6a25b8f12c8fe5a50b5c58a9b52bf9cdac7213e2b0eb7ea0c99ba0d3c31ecbaea834443fac12adacfe506ecbe3a487abd16846c6619678ac24c4ee
+DIST OpenJDK8U-jdk_arm_linux_hotspot_8u412b08.tar.gz 98318417 BLAKE2B 11ec1cb2e793da8252511dee62ad193b67b3bc5c8aa91dbd6b1e8aa2d2f7e2e342528d145e0eb9e26b17b7e81c9ff17586f068b4d146f6789b157026aff67099 SHA512 84eab7b032fb55e02870013f9a87d0898ece12c52c560c0600d8d2ecb4901cc64e6e5cd44375ec6785a5c8f139263e8b6b32d348149e22200c962438fabea9fe
+DIST OpenJDK8U-jdk_ppc64le_linux_hotspot_8u412b08.tar.gz 100529230 BLAKE2B 1498ff1c4d89f65a41a565cf3d6949f715bc8783a33b70e6cf7b44e513ddf7ade1242e2a0a95b582813ab212fb2367a5f17f794f54b5e458f0e23dd22e74123d SHA512 cf80eb66063559d4fbe062d8a198490468e4936c9e0b27ffe04912b4468a2d1f4d12fffe5df5fede38b44870b65a7f0cd85545f7031957b12a7d1a368a7770c6
+DIST OpenJDK8U-jdk_x64_alpine-linux_hotspot_8u412b08.tar.gz 100923084 BLAKE2B 9c9b0d7f95983a44f040efa83c69100163b1450d04102000d4f75361e9164024697380c055fdb31bac2ef4dabc05df592bbf342e716d8f438954b89236ff0986 SHA512 07b721e57225165d3dbc51c1d8f79f269e75fa3fe946ab76e933d1d3645dd19b3e7e8ea924d4f510382b5bcebbf073e262010c0e4655e0282379cce9d411eeab
+DIST OpenJDK8U-jdk_x64_linux_hotspot_8u412b08.tar.gz 103005511 BLAKE2B f3df80c160d723df67700363ed6f40f3308a7625635b5afcb1656c77c9f78cc2796c5878aac0bda6cbde8d6551371ed15223de6aa8e75c01ba3e4848285a88eb SHA512 6f7df3fbb34c5971b7bbc4bafbe0179983abfa0aee212cc810e2656697cf0a7f4736cbbf6755cc88cc885d7beb5c15482a21d5287c52bae560988cf80908ca05
+DIST OpenJDK8U-jdk_x64_mac_hotspot_8u412b08.tar.gz 109506799 BLAKE2B bdf043df0df0f0fe100e80a464a0fe8c60e7c80ab7ca5e7481c8f7458b793a24b0f2d93ec482b5f0de7a65b3d068322b7b3a9e9c9ec5c5b61342cb85232db847 SHA512 4d774c3f0794d7403dfbf953e7e9d635b71c463bb193ffb4cc98e98455ff7a448f0bbf290a28c9290e3d9affc7390eeb4be88ad48cbfb60d9f605e57158f5058
diff --git a/dev-java/openjdk-bin/openjdk-bin-11.0.22_p7.ebuild b/dev-java/openjdk-bin/openjdk-bin-11.0.23_p9.ebuild
index 879465da18c0..879465da18c0 100644
--- a/dev-java/openjdk-bin/openjdk-bin-11.0.22_p7.ebuild
+++ b/dev-java/openjdk-bin/openjdk-bin-11.0.23_p9.ebuild
diff --git a/dev-java/openjdk-bin/openjdk-bin-17.0.10_p7.ebuild b/dev-java/openjdk-bin/openjdk-bin-17.0.11_p9.ebuild
index 43345bca275a..43345bca275a 100644
--- a/dev-java/openjdk-bin/openjdk-bin-17.0.10_p7.ebuild
+++ b/dev-java/openjdk-bin/openjdk-bin-17.0.11_p9.ebuild
diff --git a/dev-java/openjdk-bin/openjdk-bin-21.0.2_p13.ebuild b/dev-java/openjdk-bin/openjdk-bin-21.0.3_p9.ebuild
index c45432f5aea4..664b82161cd3 100644
--- a/dev-java/openjdk-bin/openjdk-bin-21.0.2_p13.ebuild
+++ b/dev-java/openjdk-bin/openjdk-bin-21.0.3_p9.ebuild
@@ -34,12 +34,13 @@ SRC_URI="
$(abi_uri ppc64le ppc64)
$(abi_uri x64 amd64)
$(abi_uri x64 amd64 musl)
+ $(abi_uri riscv64 riscv)
"
DESCRIPTION="Prebuilt Java JDK binaries provided by Eclipse Temurin"
HOMEPAGE="https://adoptium.net"
LICENSE="GPL-2-with-classpath-exception"
-KEYWORDS="~amd64 ~arm64 ~ppc64"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv"
IUSE="alsa cups headless-awt selinux source"
RDEPEND="
diff --git a/dev-java/openjdk-bin/openjdk-bin-8.402_p06.ebuild b/dev-java/openjdk-bin/openjdk-bin-8.412_p08.ebuild
index f93a2a4afad5..f93a2a4afad5 100644
--- a/dev-java/openjdk-bin/openjdk-bin-8.402_p06.ebuild
+++ b/dev-java/openjdk-bin/openjdk-bin-8.412_p08.ebuild
diff --git a/dev-java/openjdk-jre-bin/Manifest b/dev-java/openjdk-jre-bin/Manifest
index 94d314d5a60d..0fdfd5362f70 100644
--- a/dev-java/openjdk-jre-bin/Manifest
+++ b/dev-java/openjdk-jre-bin/Manifest
@@ -1,4 +1,4 @@
-DIST OpenJDK11U-jre_x64_linux_hotspot_11.0.20.1_1.tar.gz 43033465 BLAKE2B 484ec2b8512e2c759840157608ae4b7cdd2729533589a8ad1ba718779e88319fa02da4c9f59b56dea93123646ca7a55e84675985679a25f5163d7511b8147f66 SHA512 4a962e2ee8c885753b7bc25c3a30af307bee2c8829438eb85b9a7b20abd72fa22b340cfb9b6a0721e8fb00379bd3a230653daa52f5f1e3e6d5ed028ea2066c99
-DIST OpenJDK17U-jre_x64_linux_hotspot_17.0.8.1_1.tar.gz 46332104 BLAKE2B cd27d457ecb64a17cd86fb7f348e7868b6a5e4bb59a98971dabfcdc213e4afc70dc7c1c912dcf209c9a3931ce2abece961480cc06039b565e09f70e55269ceb9 SHA512 773f39ec8f66d1285df74706014c690f3ade9c960bc27c5032bd4c100b2e89c3d4a23150af548128bdf499d64ba1567aa065f4a39f5e583600d86414d283f66f
-DIST OpenJDK21U-jre_x64_linux_hotspot_21.0.1_12.tar.gz 52453828 BLAKE2B d53bf2929431c9ce4026ae2fb9b950fedc9e756f52013a2ecdad804ccf28e33447f5278f159fb881791d1a0952d959232085549f2ef1b563979c3f15713a00e6 SHA512 568844305c490abbd9a20aa89b48b8ece4bb1b75145d6e6dc89220bdb6049bc70f8bd8c6a789983d7bbbdbc64d78129515443fe86c03064592354b455869e8af
-DIST OpenJDK8U-jre_x64_linux_hotspot_8u382b05.tar.gz 41389960 BLAKE2B e79d0d6b08a0f2066c877b3f970742a209f1b56a46dd4e5bc3b3942b590ae4eb0e72ac9b909d2e0d9b61bee76d507d9df8def88c16ec87930152b8375c6272e5 SHA512 536e2b3f87907aa2d79938dae3f92efa5d6402ae252e147beb9ddc3f81b1001a8031e4eba7132b0640dad36652fb619b761e038a88246442fc8592d5fe8a9c41
+DIST OpenJDK11U-jre_x64_linux_hotspot_11.0.23_9.tar.gz 43361001 BLAKE2B 7f5fe24de2f0967ceeaee783430fc1aa9d8c510d955eff2e10c9d94058a2985308e99a57f1dffb3adb3cee9d90d0a553abcb5438a41a0cda054b0a260e435f31 SHA512 82b4b021b7fb136a9016623cd6ab7b4ac1f5fc3bff69594b74c8b2b0305d6b0c7d20d12759062826dc27ce0b50ea176bcec76960d3d458549e11a5452b7df014
+DIST OpenJDK17U-jre_x64_linux_hotspot_17.0.11_9.tar.gz 46382823 BLAKE2B 79612a8a73cee7a8ac022779a12077fa613ff7b18d8d5d198c42ae886cba21c46a1919422249696a74b5e5491542b88b57244eaa74f3b1bc8ae63ae851d10d40 SHA512 a98534b49a71a1bb6488aff4f1d2fc4fdcadfbaa17ef1ca3003568aed8498b3d3618c065334dd6bd9cffab0af15b6cbc980353e09da66c5ac69f0c96f9b0a889
+DIST OpenJDK21U-jre_x64_linux_hotspot_21.0.3_9.tar.gz 52430722 BLAKE2B 32a969bfd1a6e334db34db6f12317810a81b60b0f6c4c978aee3fb588ed30daca0b54089feba7721a51f71d2ebb89d453aba8e7ded29f524d5923a3804828d88 SHA512 2fefc61c36f4cf4bbe722aef93aced8dc4b76d2fddeb91ad8687dc54f7afd9dff03df25ff12214bbd66fcbd637ff0ca5a21a1d839e60da9622904284bc2abfee
+DIST OpenJDK8U-jre_x64_linux_hotspot_8u412b08.tar.gz 41415973 BLAKE2B 1372ef4f608eaecd4a82c8e5598e67b91d4b200818a896c2977f40d7c228377ad033187e5afda7cd812b37950b998bc764c155d952a62b7bf7c625299b9477d9 SHA512 f1e3a168724fd9826262d1f4e895d0809618414231e246750f96522bc89fb4f27fed83f83dd548ddd859b519512ac7a080c6a3482a9d129275102aed973eab28
diff --git a/dev-java/openjdk-jre-bin/openjdk-jre-bin-17.0.8.1_p1.ebuild b/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.23_p9.ebuild
index 7e2efc602026..4bac8986b66a 100644
--- a/dev-java/openjdk-jre-bin/openjdk-jre-bin-17.0.8.1_p1.ebuild
+++ b/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.23_p9.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 @@ SRC_URI="
"
DESCRIPTION="Prebuilt Java JRE binaries provided by Eclipse Temurin"
-HOMEPAGE="https://adoptopenjdk.net"
+HOMEPAGE="https://adoptium.net/"
LICENSE="GPL-2-with-classpath-exception"
KEYWORDS="amd64"
IUSE="alsa cups headless-awt selinux"
diff --git a/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.20.1_p1.ebuild b/dev-java/openjdk-jre-bin/openjdk-jre-bin-17.0.11_p9.ebuild
index 7e2efc602026..4bac8986b66a 100644
--- a/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.20.1_p1.ebuild
+++ b/dev-java/openjdk-jre-bin/openjdk-jre-bin-17.0.11_p9.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 @@ SRC_URI="
"
DESCRIPTION="Prebuilt Java JRE binaries provided by Eclipse Temurin"
-HOMEPAGE="https://adoptopenjdk.net"
+HOMEPAGE="https://adoptium.net/"
LICENSE="GPL-2-with-classpath-exception"
KEYWORDS="amd64"
IUSE="alsa cups headless-awt selinux"
diff --git a/dev-java/openjdk-jre-bin/openjdk-jre-bin-21.0.1_p12.ebuild b/dev-java/openjdk-jre-bin/openjdk-jre-bin-21.0.3_p9.ebuild
index 1aba636df50a..9fe0d3158b43 100644
--- a/dev-java/openjdk-jre-bin/openjdk-jre-bin-21.0.1_p12.ebuild
+++ b/dev-java/openjdk-jre-bin/openjdk-jre-bin-21.0.3_p9.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 @@ SRC_URI="
"
DESCRIPTION="Prebuilt Java JRE binaries provided by Eclipse Temurin"
-HOMEPAGE="https://adoptopenjdk.net"
+HOMEPAGE="https://adoptium.net/"
LICENSE="GPL-2-with-classpath-exception"
KEYWORDS="~amd64"
IUSE="alsa cups headless-awt selinux"
diff --git a/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.382_p05.ebuild b/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.412_p08.ebuild
index 1071fa2afe06..30f0a4d988c1 100644
--- a/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.382_p05.ebuild
+++ b/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.412_p08.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
@@ -15,7 +15,7 @@ MY_PV=$(ver_rs 1 'u' 2 '-' ${PV//p/b})
SLOT="$(ver_cut 1)"
DESCRIPTION="Prebuilt Java JRE binaries provided by Eclipse Temurin"
-HOMEPAGE="https://adoptium.net"
+HOMEPAGE="https://adoptium.net/"
SRC_URI="
$(abi_uri x64 amd64)
"
diff --git a/dev-java/openjdk/Manifest b/dev-java/openjdk/Manifest
index 10c371cdcac3..430e128de96e 100644
--- a/dev-java/openjdk/Manifest
+++ b/dev-java/openjdk/Manifest
@@ -1,8 +1,8 @@
DIST openjdk-11.0.18-riscv.patch.xz 272672 BLAKE2B b079612032a5bf135b05bdd1da16f2823772a5d9a18447a435f191daf78c5429a15c2e9ea64758dc9b26ee2a88275532b4f27714b2a7e4489f920c0ed2f5003b SHA512 c0426f243c5aa581d90366cb01ce811e34883a9d8a0298cab420378470e8eb427a56932ca1fbb5ed57e7430be2b38c6bc4491028ebaa25be0a938ba0bb2baf45
-DIST openjdk-11.0.22_p7.tar.gz 116235391 BLAKE2B 50b845b8f1e316da37e45c94a1890939659b554a314a1a455903e8cc58465cd69cd485548b6b42c445150187e37df5cf946d52bca754236a198f6aa10d7de37e SHA512 b88d0db9750d8201dfb4b027045de4023be766e42cca7a3ff5e0cb28db4c6da3f146a57819a6b81cb33e5837726986bcc3780ecf88bf525f445c2cd35a3993d8
-DIST openjdk-17.0.10_p7.tar.gz 106398664 BLAKE2B 48cb2bc7d063da25a62834734ba4a887d26a27a8d84c535255df67419bf4f6d8b060c48ef37bd7324e14e957a141791380d4d9e42335a90f72dc34bc7b1d12fe SHA512 c2dfd66debdce488de044efcfc3f57cc9eb07ead2cfb7dd6e28e5748d48ec89f0c326a4c3f4a5c740019b8e5a02b858d93dd74a0c6626de445144b9840d3a426
-DIST openjdk-21.0.2_p13.tar.gz 112252812 BLAKE2B a7cbdc67d05a4e7db75ddb7043f06928c599139bd6eab02a23749194eb340f82038061036e84961ed124b8c8a0320bc3a2a890100b643765e1a87b8b129f30f9 SHA512 01a2f57dc432ea31f64d79092ae722f752e7ff111291cb5fb874046079a0fee985ede9d3aac991d946c9c6e712854827dd45284ff4cf39592add3629dbb94ace
-DIST openjdk-8.402_p06.tar.gz 93136112 BLAKE2B 023422ca2b4dfc08fd3642e3cb3ec0503d57d09dbcb54841e4a04f67a6cd118712cba90b7760eaf9135f9f001f7c15221c4bcb19986547fb2b6b3fb852bb8af4 SHA512 476d195ef500d8dd2013b17de0669a77ef8076b55c2753eb88b1a13f7a48526b1be7a1befabd284eb9ee8411df19ab1f39c81287ab659984d2d67e8aa7192d79
+DIST openjdk-11.0.23_p9.tar.gz 116316363 BLAKE2B a3745b2afe9d2529daf89aceed43025aca72a353210b0987aacb32af971262077411e9a2b6cfd938ca9d0c93c8762759b9207a13cee0808288674671164e3a36 SHA512 3851063289042ed467a9cb636eba7170a0feeaa3e5d19bda6c30a186ea624e4ae1b308006652acb9c9820c2065382bd719ee130b7a1a0524fe25ecd639f8a51d
+DIST openjdk-17.0.11_p9.tar.gz 106574173 BLAKE2B 3db4763527d1acb83a2d492c3e94dc571065b844cf2ac56b7377a821cf2cb48af405b9fef73f477502bedc2c119ac57a115315140af04d51dbab5a78dfa6c789 SHA512 77baa3ec3ff2d06b28121342357311d1d5ca2ddd9ac7982b1aa5fc745b49519d2f95d14226ad4ac413d9a0ecf0e49d15078cabbba0b2897d0c6883b92ef0b5e9
+DIST openjdk-21.0.3_p9.tar.gz 112404688 BLAKE2B e73688fdd2e4f4da144f66058e4ff68da4a557d9c7693c7854ba6c7e1a12155abec4aa0fcd724f62333060c4b4f7488f827c1b5499fe5667743516101f7f2fa6 SHA512 efc2d03a7e7afed62a2cdc9f7707d056ed62d63f513394d7e3c6bbe11980ac492a2cad144021cea4180f4c93f1a481bdd65cb61156023a3f14ba596fd9c0eb60
+DIST openjdk-8.412_p08.tar.gz 93003614 BLAKE2B 71a3825bf69bb196ae219f5125e8452f634be2ff7b9f42a4829f6581f0a143bfec95013971c6f6b8f402c11efa34443f55a7f89d4133eac0b05a6d1cd6e0324d SHA512 d198f26474a4bd0b5e09c3c3aa53fbf77f217b8cd23499f7e661224048e925e0e020b28264b6ce7401baf83f8ffd8e3247788e2f5e7188509dea8b06f9fa0572
DIST openjdk-bootstrap-11.0.13_p8-ppc64.tar.xz 108215404 BLAKE2B 5e6c0b905b34b437137922b73a9724da96b8832186fea945f8c73d941db822ca1cc5718f3ecb4607ed98d1f8241c9f365b54caaf978863e8b84680a94f067b5d SHA512 732e2220219d42be10589fcaf2420da87ebc8564b4afc6bd02f61f31cdca9c31b339366e34d374fb814499b92f8aa796435a18f28e10c8cb00d9a0f5953bb60e
DIST openjdk-bootstrap-11.0.13_p8-x86.tar.xz 105420236 BLAKE2B d3137ad497937a9a04dedf38776f3ac45bf3b115d275991fd8582b72ade48390b6aa8ad89e0b4d34fa6a787a3c413dab20b32ef347dc8733544e810150c55d29 SHA512 f71a7ef8fbf19b0595dd7d4ebe52bbe1c95b8c17f34d092472c5f5ce8caf52a053f22db8587f1649f9a96ad01c0c632be343342812f5a8cc4ff843b33b8d9b0f
DIST openjdk-bootstrap-11.0.14_p9-riscv.tar.xz 104601676 BLAKE2B 5f976e8a626a829fae70ad6c007f10bfeff79e29c85d6c75fb2f5ff8984fd2a2bd44ee6e07958dbbdaaed761c6839d375e1b5ba6cffc63b02ad9e2c9178310db SHA512 580dec81626553fe3e7afd0f6385a733ba80a0502cf0f9e8bdc973048887290c9ab6171267d61d8838c4ece4de58c9ca8b78540bd52b1757495a27175057ec64
@@ -12,4 +12,5 @@ DIST openjdk-bootstrap-17.0.2_p8-arm64-musl.tar.xz 115353932 BLAKE2B 0cc4ab07808
DIST openjdk-bootstrap-17.0.3_p7-riscv.tar.xz 113344052 BLAKE2B 69ae326c600ecf1840a0874b1e26545779434b979e195a3bc7975615f873cd9ffce324f291e56a2800edc304447845baec774b2a08964afde274bd8e0dd3f704 SHA512 4a483faa32b26758f6fae605fdb3d3b77814c627a3a560e91ca88e2d36a88543a53f019a59b5a6456b87ca671e8b7129d5766210bd5cd52125cb3a040ec2a23f
DIST openjdk-bootstrap-21.0.0_p35-ppc64.tar.xz 125375264 BLAKE2B 28802995f393dc76362dae766f8b598fd56085051418075d4c426293e6431b441ea38a2d2e4676fc89173d10324e3aafac52c97a5d9459bb0199168a07807e16 SHA512 cbd3992450c44764373c25313f6ce32f0c8a47abec557e4a10f7f8517435bf450ba5ac9fa9c8cdfb41f1536b55829d733426dc12dc2b5a2eebf5a94e9094752a
DIST openjdk-bootstrap-21.0.0_p35-x86.tar.xz 120906212 BLAKE2B c3a56f4e51a8aca1c318b9c32bebdb4c09e42d80416ce1843bc80077f09466b7f54627ab6992f9149fdabdb4d5557c3cad6b5e93b37ba3d89d84f736fc07a57a SHA512 40f0cf60adaebd0c6ae11badb6b71727a5cc64c89077731b0f7cc82f203297b9b780ae43ec74eca9dd5a64de1209f519c2ad0f9083c017cf474d1020206f762c
+DIST openjdk-bootstrap-8.402_p06-ppc64.tar.xz 34476368 BLAKE2B 1f896772f5e40a2793c5d9294e65e429c94204f91e91bfd76ff780e1d6318741c2052c3f20e59abcfb7018924983b5c9f386f14f912660e3e86296185f348482 SHA512 7bace068c5ac7604ad9db3ed655a52a4a90195efbf2fc342389cf7929d82d3f7b861fe700c16f513599bf9c064a87c9aa5966d7bd45aa7ed5e55ec317667be6a
DIST openjdk-bootstrap-8.402_p06-x86.tar.xz 37076244 BLAKE2B bd50f84e8ac2ee9850c158c7e7d9fae9741112230dcd6e314163911921d63e3222cd3f4ab9d08bbaacbf6d9bfce9a1a9336e21088fba6396613489a701b30797 SHA512 fe5719e0bbf9bcd6eb9790ebd4da34e7f6c99fe4b7d41de2b5d00b20ebe76a77d857c726d1a71b7f40657ca2a9aa08eaa9efc1ab4be60016f66af95530b454b5
diff --git a/dev-java/openjdk/openjdk-11.0.22_p7.ebuild b/dev-java/openjdk/openjdk-11.0.23_p9.ebuild
index a5a6cc2d4a63..60f9354ff576 100644
--- a/dev-java/openjdk/openjdk-11.0.22_p7.ebuild
+++ b/dev-java/openjdk/openjdk-11.0.23_p9.ebuild
@@ -1,9 +1,9 @@
# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-inherit eapi8-dosym check-reqs flag-o-matic java-pkg-2 java-vm-2 multiprocessing toolchain-funcs
+inherit check-reqs flag-o-matic java-pkg-2 java-vm-2 multiprocessing toolchain-funcs
# don't change versioning scheme
# to find correct _p number, look at
@@ -14,7 +14,6 @@ inherit eapi8-dosym check-reqs flag-o-matic java-pkg-2 java-vm-2 multiprocessing
# we need -ga tag to fetch tarball and unpack it, but exact number everywhere else to
# set build version properly
MY_PV="${PV%_p*}-ga"
-SLOT="${MY_PV%%[.+]*}"
# variable name format: <UPPERCASE_KEYWORD>_XPAK
PPC64_XPAK="11.0.13_p8" # big-endian bootstrap tarball
@@ -38,7 +37,7 @@ bootstrap_uri() {
DESCRIPTION="Open source implementation of the Java programming language"
HOMEPAGE="https://openjdk.org"
SRC_URI="
- https://github.com/${PN}/jdk${SLOT}u/archive/refs/tags/jdk-${MY_PV}.tar.gz
+ https://github.com/${PN}/jdk11u/archive/jdk-${MY_PV}.tar.gz
-> ${P}.tar.gz
!system-bootstrap? (
$(bootstrap_uri ppc64 ${PPC64_XPAK} big-endian)
@@ -47,8 +46,10 @@ SRC_URI="
)
riscv? ( https://dev.gentoo.org/~arthurzam/distfiles/dev-java/openjdk/openjdk-11.0.18-riscv.patch.xz )
"
+S="${WORKDIR}/jdk${SLOT}u-jdk-${MY_PV}"
LICENSE="GPL-2-with-classpath-exception"
+SLOT="${MY_PV%%[.+]*}"
KEYWORDS="amd64 ~arm arm64 ppc64 ~riscv x86"
IUSE="alsa big-endian cups debug doc examples headless-awt javafx +jbootstrap lto selinux source system-bootstrap systemtap"
@@ -110,8 +111,6 @@ DEPEND="
)
"
-S="${WORKDIR}/jdk${SLOT}u-jdk-${MY_PV}"
-
# The space required to build varies wildly depending on USE flags,
# ranging from 2GB to 16GB. This function is certainly not exact but
# should be close enough to be useful.
@@ -288,7 +287,7 @@ src_install() {
dodir "${dest}"
cp -pPR * "${ddest}" || die
- dosym8 -r /etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts
+ dosym -r /etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts
# must be done before running itself
java-vm_set-pax-markings "${ddest}"
diff --git a/dev-java/openjdk/openjdk-17.0.10_p7.ebuild b/dev-java/openjdk/openjdk-17.0.11_p9.ebuild
index 0b834a1a41a4..0bd209de601f 100644
--- a/dev-java/openjdk/openjdk-17.0.10_p7.ebuild
+++ b/dev-java/openjdk/openjdk-17.0.11_p9.ebuild
@@ -1,9 +1,9 @@
# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-inherit check-reqs eapi8-dosym flag-o-matic java-pkg-2 java-vm-2 multiprocessing toolchain-funcs
+inherit check-reqs flag-o-matic java-pkg-2 java-vm-2 multiprocessing toolchain-funcs
# variable name format: <UPPERCASE_KEYWORD>_XPAK
ARM64_XPAK="17.0.2_p8" # musl bootstrap install
@@ -33,12 +33,11 @@ bootstrap_uri() {
# to exact same commit sha. we should always use the full version.
# -ga tag is just for humans to easily identify General Availability release tag.
MY_PV="${PV%_p*}-ga"
-SLOT="${MY_PV%%[.+]*}"
DESCRIPTION="Open source implementation of the Java programming language"
HOMEPAGE="https://openjdk.org"
SRC_URI="
- https://github.com/${PN}/jdk${SLOT}u/archive/refs/tags/jdk-${MY_PV}.tar.gz
+ https://github.com/${PN}/jdk17u/archive/jdk-${MY_PV}.tar.gz
-> ${P}.tar.gz
!system-bootstrap? (
$(bootstrap_uri arm64 ${ARM64_XPAK} elibc_musl)
@@ -47,8 +46,10 @@ SRC_URI="
$(bootstrap_uri riscv ${RISCV_XPAK})
)
"
+S="${WORKDIR}/jdk${SLOT}u-jdk-${MY_PV//+/-}"
LICENSE="GPL-2-with-classpath-exception"
+SLOT="${MY_PV%%[.+]*}"
KEYWORDS="amd64 ~arm arm64 ppc64 ~riscv x86"
IUSE="alsa big-endian cups debug doc examples headless-awt javafx +jbootstrap lto selinux source system-bootstrap systemtap"
@@ -110,8 +111,6 @@ DEPEND="
)
"
-S="${WORKDIR}/jdk${SLOT}u-jdk-${MY_PV//+/-}"
-
# The space required to build varies wildly depending on USE flags,
# ranging from 2GB to 16GB. This function is certainly not exact but
# should be close enough to be useful.
@@ -297,7 +296,7 @@ src_install() {
dodir "${dest}"
cp -pPR * "${ddest}" || die
- dosym8 -r /etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts
+ dosym -r /etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts
# must be done before running itself
java-vm_set-pax-markings "${ddest}"
diff --git a/dev-java/openjdk/openjdk-21.0.2_p13.ebuild b/dev-java/openjdk/openjdk-21.0.3_p9.ebuild
index 9da45c9869b2..943ac23576da 100644
--- a/dev-java/openjdk/openjdk-21.0.2_p13.ebuild
+++ b/dev-java/openjdk/openjdk-21.0.3_p9.ebuild
@@ -1,9 +1,9 @@
# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-inherit check-reqs eapi8-dosym flag-o-matic java-pkg-2 java-vm-2 multiprocessing toolchain-funcs
+inherit check-reqs flag-o-matic java-pkg-2 java-vm-2 multiprocessing toolchain-funcs
# variable name format: <UPPERCASE_KEYWORD>_XPAK
PPC64_XPAK="21.0.0_p35" # big-endian bootstrap tarball
@@ -31,20 +31,21 @@ bootstrap_uri() {
# to exact same commit sha. we should always use the full version.
# -ga tag is just for humans to easily identify General Availability release tag.
MY_PV="${PV%_p*}-ga"
-SLOT="${MY_PV%%[.+]*}"
DESCRIPTION="Open source implementation of the Java programming language"
HOMEPAGE="https://openjdk.org"
SRC_URI="
- https://github.com/${PN}/jdk${SLOT}u/archive/refs/tags/jdk-${MY_PV}.tar.gz
+ https://github.com/${PN}/jdk21u/archive/jdk-${MY_PV}.tar.gz
-> ${P}.tar.gz
!system-bootstrap? (
$(bootstrap_uri ppc64 ${PPC64_XPAK} big-endian)
$(bootstrap_uri x86 ${X86_XPAK})
)
"
+S="${WORKDIR}/jdk${SLOT}u-jdk-${MY_PV//+/-}"
LICENSE="GPL-2-with-classpath-exception"
+SLOT="${MY_PV%%[.+]*}"
KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
IUSE="alsa big-endian cups debug doc examples headless-awt javafx +jbootstrap lto selinux source +system-bootstrap systemtap"
@@ -107,8 +108,6 @@ DEPEND="
)
"
-S="${WORKDIR}/jdk${SLOT}u-jdk-${MY_PV//+/-}"
-
# The space required to build varies wildly depending on USE flags,
# ranging from 2GB to 16GB. This function is certainly not exact but
# should be close enough to be useful.
@@ -296,7 +295,7 @@ src_install() {
dodir "${dest}"
cp -pPR * "${ddest}" || die
- dosym8 -r /etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts
+ dosym -r /etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts
# must be done before running itself
java-vm_set-pax-markings "${ddest}"
diff --git a/dev-java/openjdk/openjdk-8.402_p06-r1.ebuild b/dev-java/openjdk/openjdk-8.412_p08.ebuild
index 902c433e73dd..d006b5c56f80 100644
--- a/dev-java/openjdk/openjdk-8.402_p06-r1.ebuild
+++ b/dev-java/openjdk/openjdk-8.412_p08.ebuild
@@ -1,9 +1,9 @@
# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-inherit check-reqs eapi8-dosym flag-o-matic java-pkg-2 java-vm-2 multiprocessing toolchain-funcs
+inherit check-reqs flag-o-matic java-pkg-2 java-vm-2 multiprocessing toolchain-funcs
# don't change versioning scheme
# to find correct _p number, look at
@@ -14,10 +14,10 @@ inherit check-reqs eapi8-dosym flag-o-matic java-pkg-2 java-vm-2 multiprocessing
# we need -ga tag to fetch tarball and unpack it, but exact number everywhere else to
# set build version properly
MY_PV="$(ver_rs 1 'u' 2 '-' ${PV%_p*}-ga)"
-SLOT="${PV%%[.+]*}"
# variable name format: <UPPERCASE_KEYWORD>_XPAK
X86_XPAK="8.402_p06"
+PPC64_XPAK="8.402_p06"
# Usage: bootstrap_uri <keyword> <version> [extracond]
# Example: $(bootstrap_uri x86 8.402_p06)
@@ -36,16 +36,19 @@ bootstrap_uri() {
DESCRIPTION="Open source implementation of the Java programming language"
HOMEPAGE="https://openjdk.org"
SRC_URI="
- https://github.com/openjdk/jdk${SLOT}u/archive/refs/tags/jdk${MY_PV}.tar.gz
+ https://github.com/openjdk/jdk8u/archive/jdk${MY_PV}.tar.gz
-> ${P}.tar.gz
!system-bootstrap? (
$(bootstrap_uri x86 ${X86_XPAK})
+ $(bootstrap_uri ppc64 ${PPC64_XPAK} big-endian)
)
"
+S="${WORKDIR}/jdk${SLOT}u-jdk${MY_PV}"
LICENSE="GPL-2-with-classpath-exception"
+SLOT="${PV%%[.+]*}"
KEYWORDS="amd64 arm64 ppc64 x86"
-IUSE="alsa debug cups doc examples headless-awt javafx +jbootstrap selinux system-bootstrap source"
+IUSE="alsa big-endian debug cups doc examples headless-awt javafx +jbootstrap selinux system-bootstrap source"
COMMON_DEPEND="
media-libs/freetype:2=
@@ -83,9 +86,11 @@ DEPEND="
x11-libs/libXrender
x11-libs/libXt
x11-libs/libXtst
- || (
- dev-java/openjdk-bin:${SLOT}
- dev-java/openjdk:${SLOT}
+ system-bootstrap? (
+ || (
+ dev-java/openjdk-bin:${SLOT}
+ dev-java/openjdk:${SLOT}
+ )
)
"
@@ -95,8 +100,6 @@ BDEPEND="
PDEPEND="javafx? ( dev-java/openjfx:${SLOT} )"
-S="${WORKDIR}/jdk${SLOT}u-jdk${MY_PV}"
-
PATCHES=(
"${FILESDIR}/openjdk-8-insantiate-arrayallocator.patch"
"${FILESDIR}/openjdk-8.402_p06-0001-Fix-Wint-conversion.patch"
@@ -261,7 +264,7 @@ src_install() {
dodir "${dest}"
cp -pPR * "${ddest}" || die
- dosym8 -r /etc/ssl/certs/java/cacerts "${dest}"/jre/lib/security/cacerts
+ dosym -r /etc/ssl/certs/java/cacerts "${dest}"/jre/lib/security/cacerts
java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
java-vm_set-pax-markings "${ddest}"
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
index bf9263365faa..d0c03f8e0c0a 100644
--- 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
@@ -14,7 +14,7 @@ SRC_URI="https://repo1.maven.org/maven2/org/osgi/org.${PN//-/.}/${PV}/org.${PN//
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64"
+KEYWORDS="amd64 ~arm ~arm64 ~x86"
BDEPEND="app-arch/unzip"
diff --git a/dev-java/parboiled/parboiled-1.4.1.ebuild b/dev-java/parboiled/parboiled-1.4.1.ebuild
index f8cc8b64aa06..483a65d41c3c 100644
--- a/dev-java/parboiled/parboiled-1.4.1.ebuild
+++ b/dev-java/parboiled/parboiled-1.4.1.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${P}"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64"
+KEYWORDS="amd64 ~arm ~arm64 ~x86"
CP_DEPEND="dev-java/asm:9"
DEPEND="${CP_DEPEND}
diff --git a/dev-java/plexus-classworlds/plexus-classworlds-2.7.0.ebuild b/dev-java/plexus-classworlds/plexus-classworlds-2.7.0-r1.ebuild
index 5d46ae9f6f12..b61697448e9a 100644
--- a/dev-java/plexus-classworlds/plexus-classworlds-2.7.0.ebuild
+++ b/dev-java/plexus-classworlds/plexus-classworlds-2.7.0-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
@@ -21,7 +21,7 @@ KEYWORDS="amd64 ~arm arm64 ppc64 x86"
DEPEND="
>=virtual/jdk-1.8:*
test? (
- dev-java/ant-core:0
+ >=dev-java/ant-1.10.14-r3:0
dev-java/commons-logging:0
dev-java/xml-commons-external:1.4
)
@@ -41,7 +41,7 @@ src_test(){
# java.io.FileNotFoundException: target/test-lib/xml-apis-1.3.02.jar
mkdir -p target/test-lib || die
java-pkg_jar-from --into target/test-lib xml-commons-external-1.4 xml-commons-external.jar xml-apis-1.3.02.jar
- java-pkg_jar-from --into target/test-lib ant-core ant.jar ant-1.9.0.jar
+ java-pkg_jar-from --into target/test-lib ant ant.jar ant-1.9.0.jar
java-pkg_jar-from --into target/test-lib commons-logging commons-logging.jar commons-logging-1.0.3.jar
java-pkg-simple_src_test
}
diff --git a/dev-java/protobuf-java/metadata.xml b/dev-java/protobuf-java/metadata.xml
index 20b09444fc60..8b9311211599 100644
--- a/dev-java/protobuf-java/metadata.xml
+++ b/dev-java/protobuf-java/metadata.xml
@@ -1,14 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person" proxied="yes">
- <email>arfrever.fta@gmail.com</email>
- <name>Arfrever Frehtes Taifersar Arahesis</name>
- </maintainer>
- <maintainer type="project">
- <email>cjk@gentoo.org</email>
- <name>Cjk</name>
- </maintainer>
<maintainer type="project">
<email>java@gentoo.org</email>
</maintainer>
diff --git a/dev-java/protobuf-java/protobuf-java-3.23.3.ebuild b/dev-java/protobuf-java/protobuf-java-3.23.3.ebuild
index 484bbc788521..ae709f9e7ea1 100644
--- a/dev-java/protobuf-java/protobuf-java-3.23.3.ebuild
+++ b/dev-java/protobuf-java/protobuf-java-3.23.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2008-2023 Gentoo Authors
+# Copyright 2008-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -20,7 +20,7 @@ S="${WORKDIR}/protobuf-${PV#3.}"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos"
IUSE="system-protoc"
BDEPEND="
diff --git a/dev-java/qdox/metadata.xml b/dev-java/qdox/metadata.xml
index f00a4317cac4..fe50d6ed9393 100644
--- a/dev-java/qdox/metadata.xml
+++ b/dev-java/qdox/metadata.xml
@@ -12,4 +12,7 @@
<upstream>
<remote-id type="github">paul-hammant/qdox</remote-id>
</upstream>
+ <use>
+ <flag name="ant-task">Build the ant-task</flag>
+ </use>
</pkgmetadata>
diff --git a/dev-java/qdox/qdox-1.12.1-r3.ebuild b/dev-java/qdox/qdox-1.12.1-r5.ebuild
index 9f0982c09a7e..a4419f6cf68e 100644
--- a/dev-java/qdox/qdox-1.12.1-r3.ebuild
+++ b/dev-java/qdox/qdox-1.12.1-r5.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
@@ -11,31 +11,35 @@ inherit java-pkg-2
DESCRIPTION="Parser for extracting class/interface/method definitions"
HOMEPAGE="https://github.com/codehaus/qdox"
SRC_URI="https://github.com/codehaus/qdox/archive/${P}.tar.gz"
+S="${WORKDIR}/${PN}-${PN}-${PV}"
LICENSE="Apache-2.0"
SLOT="1.12"
KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~ppc-macos ~x64-macos"
+IUSE="ant-task"
+REQUIRED_USE="test? ( ant-task )"
-S="${WORKDIR}/${PN}-${PN}-${PV}"
-
-CDEPEND="dev-java/ant-core:0"
-
-DEPEND=">=virtual/jdk-1.8:*
+DEPEND="
+ >=virtual/jdk-1.8:*
dev-java/byaccj:0
- >=dev-java/jflex-1.6.1:0
+ dev-java/jflex:0
dev-java/jmock:1.0
+ ant-task? ( >=dev-java/ant-1.10.14-r3:0 )
test? ( dev-java/junit:0 )
- ${CDEPEND}"
+"
-RDEPEND=">=virtual/jre-1.8:*
- ${CDEPEND}"
+RDEPEND="
+ >=virtual/jre-1.8:*
+ ant-task? ( >=dev-java/ant-1.10.14-r3:0 )
+"
PATCHES=(
"${FILESDIR}/jflex-1.6.1.patch"
)
src_prepare() {
- default
+ default #780585
+ java-pkg-2_src_prepare
if ! use test ; then
rm src/java/com/thoughtworks/qdox/tools/QDoxTester.java
@@ -52,12 +56,18 @@ src_compile() {
# create jar
mkdir -p build/classes || die
- local cp="$(java-pkg_getjars --build-only ant-core,jmock-1.0)"
+ local cp="$(java-pkg_getjars --build-only jmock-1.0)"
if use test ; then
cp="${cp}:$(java-pkg_getjars --build-only junit)"
fi
+ if use ant-task ; then
+ cp="${cp}:$(java-pkg_getjars --build-only ant)"
+ else
+ rm src/java/com/thoughtworks/qdox/ant/AbstractQdoxTask.java || die
+ fi
+
ejavac -sourcepath . -d build/classes -classpath "${cp}" \
$(find . -name "*.java") || die "Cannot compile sources"
@@ -74,7 +84,7 @@ src_compile() {
}
src_test() {
- java -cp "${S}"/dist/${PN}.jar:$(java-pkg_getjars --build-only ant-core,junit,jmock-1.0) \
+ java -cp "${S}"/dist/${PN}.jar:$(java-pkg_getjars --build-only ant,junit,jmock-1.0) \
com.thoughtworks.qdox.tools.QDoxTester src || die "Tests failed!"
}
diff --git a/dev-java/rhino/rhino-1.7.14.ebuild b/dev-java/rhino/rhino-1.7.14-r1.ebuild
index 0826d783bf62..8676a8e192ab 100644
--- a/dev-java/rhino/rhino-1.7.14.ebuild
+++ b/dev-java/rhino/rhino-1.7.14-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
@@ -30,7 +30,7 @@ RESTRICT="test"
DEPEND=">=virtual/jdk-1.8:*
test? (
- dev-java/ant-junit:0
+ >=dev-java/ant-1.10.14-r3:0[junit]
dev-java/emma:0
dev-java/jakarta-xml-soap-api:1
dev-java/jmh-core:0
@@ -50,7 +50,7 @@ JAVA_SRC_DIR=( "src" "toolsrc" "xmlimplsrc" )
JAVA_RESOURCE_DIRS="res"
JAVA_MAIN_CLASS="org.mozilla.javascript.tools.shell.Main"
-JAVA_TEST_GENTOO_CLASSPATH="ant-junit,emma,hamcrest-core-1.3,jakarta-xml-soap-api-1,jmh-core,junit-4,snakeyaml"
+JAVA_TEST_GENTOO_CLASSPATH="ant,emma,hamcrest-core-1.3,jakarta-xml-soap-api-1,jmh-core,junit-4,snakeyaml"
JAVA_TEST_SRC_DIRS="testsrc"
JAVA_TEST_RESOURCE_DIRS="testres"
diff --git a/dev-java/sax/sax-2.2.1-r5.ebuild b/dev-java/sax/sax-2.2.1-r5.ebuild
index d367d673cb21..5bda68b0b794 100644
--- a/dev-java/sax/sax-2.2.1-r5.ebuild
+++ b/dev-java/sax/sax-2.2.1-r5.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
@@ -11,7 +11,7 @@ inherit java-pkg-2 java-pkg-simple
DESCRIPTION="SAX: Simple API for XML in Java"
HOMEPAGE="http://sax.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_PN}.zip -> ${P}.zip"
+SRC_URI="https://downloads.sourceforge.net/${PN}/${MY_PN}.zip -> ${P}.zip"
LICENSE="public-domain"
SLOT="0"
diff --git a/dev-java/saxon/metadata.xml b/dev-java/saxon/metadata.xml
index 4a2440bdfc71..796069569107 100644
--- a/dev-java/saxon/metadata.xml
+++ b/dev-java/saxon/metadata.xml
@@ -8,4 +8,7 @@
<upstream>
<remote-id type="sourceforge">saxon</remote-id>
</upstream>
+ <use>
+ <flag name="ant-task">BUILD and register the ant-task</flag>
+ </use>
</pkgmetadata>
diff --git a/dev-java/saxon/saxon-6.5.5-r3.ebuild b/dev-java/saxon/saxon-6.5.5-r3.ebuild
index 3562e1307373..8dd6a5a954af 100644
--- a/dev-java/saxon/saxon-6.5.5-r3.ebuild
+++ b/dev-java/saxon/saxon-6.5.5-r3.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
@@ -9,7 +9,7 @@ inherit java-pkg-2 java-pkg-simple
DESCRIPTION="Set of tools for processing XML documents"
HOMEPAGE="https://www.saxonica.com/index.html https://saxon.sourceforge.net/"
-SRC_URI="mirror://sourceforge/project/saxon/saxon6/${PV}/saxon${PV//./-}.zip"
+SRC_URI="https://downloads.sourceforge.net/project/saxon/saxon6/${PV}/saxon${PV//./-}.zip"
LICENSE="MPL-1.1"
SLOT="6.5"
diff --git a/dev-java/saxon/saxon-9.2.0.6-r3.ebuild b/dev-java/saxon/saxon-9.2.0.6-r4.ebuild
index f1e4921e2821..1513e7c8fedb 100644
--- a/dev-java/saxon/saxon-9.2.0.6-r3.ebuild
+++ b/dev-java/saxon/saxon-9.2.0.6-r4.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
@@ -9,14 +9,15 @@ inherit java-pkg-2 java-ant-2
DESCRIPTION="A XSLT and XQuery Processor"
HOMEPAGE="https://www.saxonica.com/index.html https://saxon.sourceforge.net/"
-SRC_URI="mirror://sourceforge/project/saxon/Saxon-HE/$(ver_cut 1-2)/saxonhe${PV//./-}source.zip"
+SRC_URI="https://downloads.sourceforge.net/project/saxon/Saxon-HE/$(ver_cut 1-2)/saxonhe${PV//./-}source.zip"
+S="${WORKDIR}"
LICENSE="MPL-1.0"
SLOT="9"
KEYWORDS="amd64 ~arm arm64 ppc64 x86"
CDEPEND="
- dev-java/ant-core:0
+ >=dev-java/ant-1.10.14-r3:0
dev-java/dom4j:1
dev-java/jdom:0
dev-java/xom:0
@@ -32,8 +33,6 @@ DEPEND="
BDEPEND="app-arch/unzip"
-S="${WORKDIR}"
-
# prepare eclass variables
JAVA_ANT_REWRITE_CLASSPATH="yes"
JAVA_ANT_CLASSPATH_TAGS="javac javadoc"
@@ -73,7 +72,7 @@ src_prepare() {
src_compile() {
local gcp="$(java-pkg_getjars dom4j-1,jdom,xom)"
- gcp="${gcp}:$(java-pkg_getjars --build-only ant-core)"
+ gcp="${gcp}:$(java-pkg_getjar --build-only ant ant.jar)"
eant -Dgentoo.classpath="${gcp}" jar $(use_doc)
}
diff --git a/dev-java/saxon/saxon-9.2.0.6-r5.ebuild b/dev-java/saxon/saxon-9.2.0.6-r5.ebuild
new file mode 100644
index 000000000000..474bdfb14787
--- /dev/null
+++ b/dev-java/saxon/saxon-9.2.0.6-r5.ebuild
@@ -0,0 +1,67 @@
+# 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
+
+DESCRIPTION="A XSLT and XQuery Processor"
+HOMEPAGE="https://www.saxonica.com/index.html https://saxon.sourceforge.net/"
+SRC_URI="https://downloads.sourceforge.net/saxon/Saxon-HE/$(ver_cut 1-2)/saxonhe${PV//./-}source.zip"
+
+LICENSE="MPL-1.0"
+SLOT="9"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="ant-task"
+
+BDEPEND="app-arch/unzip"
+CP_DEPEND="
+ dev-java/dom4j:1
+ dev-java/jdom:0
+ dev-java/xom:0
+"
+DEPEND="${CP_DEPEND}
+ >=virtual/jdk-1.8:*
+ ant-task? ( >=dev-java/ant-1.10.14-r3:0 )"
+RDEPEND="${CP_DEPEND}
+ >=virtual/jre-1.8:*
+ ant-task? ( >=dev-java/ant-1.10.14-r3:0 )"
+
+JAVA_ENCODING="iso-8859-1"
+JAVA_RESOURCE_DIRS="resources"
+
+src_prepare() {
+ java-pkg-2_src_prepare
+
+ # Fedora-inspired removal.
+
+ # deadNET.
+ rm -rv net/sf/saxon/dotnet || die
+
+ # Depends on XQJ (javax.xml.xquery).
+ rm -rv net/sf/saxon/xqj || die
+
+ # This requires a EE edition feature (com.saxonica.xsltextn).
+ rm -v net/sf/saxon/option/sql/SQLElementFactory.java || die
+
+ if use ant-task; then
+ JAVA_GENTOO_CLASSPATH+="ant"
+ else
+ rm net/sf/saxon/ant/AntTransform.java || die
+ fi
+
+ mkdir resources || die
+ cat > "resources/edition.properties" <<-EOF
+ config=net.sf.saxon.Configuration
+ platform=net.sf.saxon.java.JavaPlatform
+ EOF
+}
+
+src_install() {
+ java-pkg-simple_src_install
+ java-pkg_dolauncher ${PN}${SLOT}-transform --main net.sf.saxon.Transform
+ java-pkg_dolauncher ${PN}${SLOT}-query --main net.sf.saxon.Query
+ use ant-task && java-pkg_register-ant-task
+}
diff --git a/dev-java/sbt/metadata.xml b/dev-java/sbt/metadata.xml
index feefedbb43eb..9844fcc90ace 100644
--- a/dev-java/sbt/metadata.xml
+++ b/dev-java/sbt/metadata.xml
@@ -7,4 +7,7 @@ The interactive build tool.
Use Scala to define your tasks. Then run them in parallel from the shell.
</longdescription>
<use><flag name="binary">Install from (Gentoo-compiled) binary instead of building from sources. Set this when you run out of memory during build.</flag></use>
+<upstream>
+<remote-id type="github">sbt/sbt</remote-id>
+</upstream>
</pkgmetadata>
diff --git a/dev-java/swingx-ws/swingx-ws-1.0_p20110515-r2.ebuild b/dev-java/swingx-ws/swingx-ws-1.0_p20110515-r2.ebuild
index 92355258c5ef..3900e1d0a5c4 100644
--- a/dev-java/swingx-ws/swingx-ws-1.0_p20110515-r2.ebuild
+++ b/dev-java/swingx-ws/swingx-ws-1.0_p20110515-r2.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
@@ -10,7 +10,7 @@ inherit java-pkg-2 java-pkg-simple
DESCRIPTION="Utilities and widgets to integrate Swing GUIs with web applications"
HOMEPAGE="https://java.net/projects/swingx-ws/"
-SRC_URI="mirror://sourceforge/bt747/Development/${MY_P}.zip"
+SRC_URI="https://downloads.sourceforge.net/bt747/Development/${MY_P}.zip"
LICENSE="LGPL-2.1"
SLOT="bt747"
KEYWORDS="~amd64 ~x86"
diff --git a/dev-java/swt/Manifest b/dev-java/swt/Manifest
index bdc642795cb1..166e78f0c03c 100644
--- a/dev-java/swt/Manifest
+++ b/dev-java/swt/Manifest
@@ -12,3 +12,6 @@ DIST swt-4.30-gtk-linux-x86_64.zip 3856990 BLAKE2B 0ea29a5f286fb4bb362758629226b
DIST swt-4.31-gtk-linux-aarch64.zip 4019864 BLAKE2B 597f9c2ce1382aacd4667c7d1fc350b2318d8b1577dfc32a0139efb9d26e7c32703a0fb2507876ef441c47901d46ba522ea40714f9b88f1d517e3d9d24c2416a SHA512 636e3a4e7adc21ab8ee3ecdc3f85bbd0ad5786836492cf0096f99177716043150b41807cc456f4813ebb1797092761bb227809e8594bf64155b438973cc84bfc
DIST swt-4.31-gtk-linux-ppc64le.zip 4036590 BLAKE2B da9ad8a7e0bf168b024c4e1fbdbcc01154ec0d7e8b38b2912ba7edf1bf8239f05a9ce1f08790174158ebb788c9cc3adf754d13942fc8aa0fe9d4a53177a814ff SHA512 bf8f3f45b4229db383839a64b7d08294340ab2f0c623be8e382609b5ff9a59683229bb308d49480ffb01596ab050d45f97894fec99c0d4eb710e60c40b864531
DIST swt-4.31-gtk-linux-x86_64.zip 4039479 BLAKE2B 6f7e434acf57cd03dd5e938b1b1c578339b3d7817202681a15420ebdec3be10b95b1bf5eca6f1cf71de9a5a0c390d2d6ee903c2a71e8974e03987cc52322e44d SHA512 da61610ce00fc46893ec3ee6d5d7ed5cc59312002c6946a3748cff1a776af75bad0026512b412ef1622ca0bee124764ed8ee7f5f87364cff945b296feb86e74b
+DIST swt-4.32-gtk-linux-aarch64.zip 3991281 BLAKE2B 99fece9547e801661bb65f699780eb95cb626efd78e1bd79dec15d5fb63e03805ab6c6f75b98648cfad194d800c11cbe6a3c23250f4c4084072aea2aa4cde10c SHA512 adf5d207ba35bfa43fad2c4c64d72a4b56e8830efa0f817b158ad0bd4508eca9c83c43ebebb843c4fb75cb33835a6490b8b0b2a993bfa3507b62fba50345607a
+DIST swt-4.32-gtk-linux-ppc64le.zip 4028301 BLAKE2B 1ed2590ffe01836dc9209b8323db25204c157a829f4af10f20509c30f268c88e89a9e252aebd9a4a0d3337fa20b1a3d76040b768918f7a2f7c8a6313314d14b8 SHA512 713f762fab2d5eea125844912fafdc3eb42bfb76c2caac5612972714e07b66de0e2a71ae29a51c86b2ad76c32761842ad209f8b59c931ea727dc03b2161b40f2
+DIST swt-4.32-gtk-linux-x86_64.zip 4011746 BLAKE2B 5d2784f9a18684d539ea576560bb5fecbbf59960cbd8ce901c9b152df087decb2db28ebf9fbf12c710f6dde71583e9002ca0ac85d5ca7a7ce17286ad1666c5c8 SHA512 f4d511595cccf104cda35c6f314e3689508e18e5da85bb2e8bdd408d9b8d4ab3371e851b3b96ba0f835b3ff0a079c4ed887661e586ab0ce06a52abf69ba243be
diff --git a/dev-java/swt/files/build.xml b/dev-java/swt/files/build.xml
deleted file mode 100644
index ea775871bf09..000000000000
--- a/dev-java/swt/files/build.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<project name="SWT" default="jar" basedir=".">
- <property name="src" location="."/>
- <property name="build" location="build"/>
-
- <target name="init">
- <tstamp/>
- <mkdir dir="${build}"/>
- </target>
-
- <target name="compile" depends="init" description="Compile the SWT toolset">
- <javac srcdir="${src}" destdir="${build}"/>
- </target>
-
- <target name="jar">
- <jar destfile="swt.jar" basedir="${build}"/>
- </target>
-</project>
diff --git a/dev-java/swt/swt-3.7.2-r3.ebuild b/dev-java/swt/swt-3.7.2-r4.ebuild
index eb993b82f314..18bc97088217 100644
--- a/dev-java/swt/swt-3.7.2-r3.ebuild
+++ b/dev-java/swt/swt-3.7.2-r4.ebuild
@@ -1,16 +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
-inherit java-pkg-2 java-ant-2 java-osgi toolchain-funcs
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple java-osgi toolchain-funcs
MY_PV="${PV/_rc/RC}"
MY_DMF="https://archive.eclipse.org/eclipse/downloads/drops/R-${MY_PV}-201202080800"
MY_P="${PN}-${MY_PV}"
DESCRIPTION="GTK based SWT Library"
-HOMEPAGE="https://www.eclipse.org/"
+HOMEPAGE="https://www.eclipse.org/swt/"
SRC_URI="
amd64? ( ${MY_DMF}/${MY_P}-gtk-linux-x86_64.zip )
ppc? ( ${MY_DMF}/${MY_P}-gtk-linux-x86.zip )
@@ -22,84 +24,101 @@ SLOT="3.7"
KEYWORDS="amd64 ppc64 x86"
IUSE="cairo opengl"
+BDEPEND="
+ app-arch/unzip
+ virtual/pkgconfig
+"
COMMON_DEPEND="
- >=dev-libs/atk-1.10.2
- >=dev-libs/glib-2.6
+ app-accessibility/at-spi2-core:2
+ dev-libs/glib
>=x11-libs/gtk+-2.6.8:2
x11-libs/libXtst
- cairo? ( >=x11-libs/cairo-1.4.14 )
+ cairo? ( x11-libs/cairo )
opengl? (
virtual/glu
virtual/opengl
)"
-BDEPEND="
- app-arch/unzip
- virtual/pkgconfig
-"
DEPEND="${COMMON_DEPEND}
- virtual/jdk:1.8
+ >=virtual/jdk-1.8:*[-headless-awt]
x11-base/xorg-proto
x11-libs/libX11
x11-libs/libXrender
x11-libs/libXt
- >=x11-libs/libXtst-1.1.0"
+ x11-libs/libXtst"
RDEPEND="${COMMON_DEPEND}
- >=virtual/jre-1.4"
-
-S="${WORKDIR}"
+ >=virtual/jre-1.8:*"
# JNI libraries don't need SONAME, bug #253756
QA_SONAME="usr/lib.*/libswt-.*.so"
+JAVA_RESOURCE_DIRS="resources"
+JAVA_SRC_DIR="src"
+
PATCHES=(
# Fix Makefiles to respect flags and work with --as-needed
"${FILESDIR}"/as-needed-and-flag-fixes-3.6.patch
)
src_unpack() {
- local DISTFILE=${A}
- unzip -jq "${DISTDIR}"/${DISTFILE} "*src.zip" || die "Unable to extract distfile"
+ default
unpack "./src.zip"
-
- # Cleanup the redirtied directory structure
- rm -rf about_files/ || die
}
src_prepare() {
- # Replace the build.xml to allow compilation without Eclipse tasks
- cp "${FILESDIR}/build.xml" "${S}/build.xml" || die "Unable to update build.xml"
- mkdir "${S}/src" && mv "${S}/org" "${S}/src" || die "Unable to restructure SWT sources"
+ default #780585
+ java-pkg-2_src_prepare
+ java-pkg_clean
+
+ mkdir resources src || die "mkdir failed"
+ mv org src || die "moving java sources failed"
case ${ARCH} in
ppc|x86) eapply "${FILESDIR}"/${P}-gio_launch-URI-x86.patch ;;
*) eapply "${FILESDIR}"/${P}-gio_launch-URI.patch ;;
esac
- default
+ 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"
}
src_compile() {
- # Drop jikes support as it seems to be unfriendly with SWT
- java-pkg_filter-compiler jikes
-
local AWT_ARCH
local JAWTSO="libjawt.so"
- if [[ $(tc-arch) == 'x86' ]] ; then
- AWT_ARCH="i386"
- elif [[ $(tc-arch) == 'ppc' ]] ; then
- AWT_ARCH="ppc"
- elif [[ $(tc-arch) == 'ppc64' ]] ; then
- AWT_ARCH="ppc64"
- else
- AWT_ARCH="amd64"
- fi
- if [[ -f "${JAVA_HOME}/jre/lib/${AWT_ARCH}/${JAWTSO}" ]]; then
- export AWT_LIB_PATH="${JAVA_HOME}/jre/lib/${AWT_ARCH}"
- elif [[ -f "${JAVA_HOME}/jre/bin/${JAWTSO}" ]]; then
- export AWT_LIB_PATH="${JAVA_HOME}/jre/bin"
- elif [[ -f "${JAVA_HOME}/$(get_libdir)/${JAWTSO}" ]] ; then
- export AWT_LIB_PATH="${JAVA_HOME}/$(get_libdir)"
- else
+# if [[ $(tc-arch) == 'x86' ]] ; then
+# AWT_ARCH="i386"
+# elif [[ $(tc-arch) == 'ppc' ]] ; then
+# AWT_ARCH="ppc"
+# elif [[ $(tc-arch) == 'ppc64' ]] ; then
+# AWT_ARCH="ppc64"
+# else
+# AWT_ARCH="amd64"
+# fi
+# if [[ -f "${JAVA_HOME}/jre/lib/${AWT_ARCH}/${JAWTSO}" ]]; then
+# export AWT_LIB_PATH="${JAVA_HOME}/jre/lib/${AWT_ARCH}"
+# elif [[ -f "${JAVA_HOME}/jre/bin/${JAWTSO}" ]]; then
+# export AWT_LIB_PATH="${JAVA_HOME}/jre/bin"
+# elif [[ -f "${JAVA_HOME}/$(get_libdir)/${JAWTSO}" ]] ; then
+# export AWT_LIB_PATH="${JAVA_HOME}/$(get_libdir)"
+# else
+ IFS=":" read -r -a ldpaths <<< $(java-config -g LDPATH)
+
+ for libpath in "${ldpaths[@]}"; do
+ if [[ -f "${libpath}/${JAWTSO}" ]]; then
+ export AWT_LIB_PATH="${libpath}"
+ break
+ # this is a workaround for broken LDPATH in <=openjdk-8.292_p10 and <=dev-java/openjdk-bin-8.292_p10
+ elif [[ -f "${libpath}/$(tc-arch)/${JAWTSO}" ]]; then
+ export AWT_LIB_PATH="${libpath}/$(tc-arch)"
+ break
+ fi
+ done
+
+ if [[ -z "${AWT_LIB_PATH}" ]]; then
eerror "${JAWTSO} not found in the JDK being used for compilation!"
die "cannot build AWT library"
fi
@@ -128,16 +147,7 @@ src_compile() {
${make} make_glx
fi
- einfo "Building JNI libraries"
- eant compile
-
- einfo "Copying missing files"
- cp -i "${S}/version.txt" "${S}/build/version.txt" || die
- cp -i "${S}/src/org/eclipse/swt/internal/SWTMessages.properties" \
- "${S}/build/org/eclipse/swt/internal/" || die
-
- einfo "Packing JNI libraries"
- eant jar
+ java-pkg-simple_src_compile
}
src_install() {
diff --git a/dev-java/swt/swt-4.10-r2.ebuild b/dev-java/swt/swt-4.10-r4.ebuild
index 4e117a49acf6..9c3211738446 100644
--- a/dev-java/swt/swt-4.10-r2.ebuild
+++ b/dev-java/swt/swt-4.10-r4.ebuild
@@ -1,16 +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
-inherit flag-o-matic java-pkg-2 java-ant-2 toolchain-funcs java-osgi
+JAVA_PKG_IUSE="doc source"
+
+inherit flag-o-matic java-pkg-2 java-pkg-simple toolchain-funcs java-osgi
MY_PV="${PV/_rc/RC}"
MY_DMF="https://archive.eclipse.org/eclipse/downloads/drops4/R-${MY_PV}-201812060815"
MY_P="${PN}-${MY_PV}"
DESCRIPTION="GTK based SWT Library"
-HOMEPAGE="https://www.eclipse.org/"
+HOMEPAGE="https://www.eclipse.org/swt/"
SRC_URI="
amd64? ( ${MY_DMF}/${MY_P}-gtk-linux-x86_64.zip )
ppc64? ( ${MY_DMF}/${MY_P}-gtk-linux-ppc64le.zip )"
@@ -20,13 +22,17 @@ SLOT="4.10"
KEYWORDS="amd64 ppc64"
IUSE="cairo opengl webkit"
+BDEPEND="
+ app-arch/unzip
+ virtual/pkgconfig
+"
COMMON_DEP="
- >=dev-libs/atk-1.10.2
- >=dev-libs/glib-2.32
+ app-accessibility/at-spi2-core:2
+ dev-libs/glib
>=x11-libs/gtk+-2.6.8:2
x11-libs/libXtst
- cairo? ( >=x11-libs/cairo-1.4.14 )
- opengl? (
+ cairo? ( x11-libs/cairo )
+ opengl? (
virtual/glu
virtual/opengl
)
@@ -39,54 +45,54 @@ DEPEND="${COMMON_DEP}
x11-libs/libX11
x11-libs/libXrender
x11-libs/libXt
- >=x11-libs/libXtst-1.1.0"
+ x11-libs/libXtst"
RDEPEND="${COMMON_DEP}
- >=virtual/jre-1.8:*"
-BDEPEND="
- app-arch/unzip
- virtual/pkgconfig
-"
-
-S="${WORKDIR}"
+ >=virtual/jre-1.8:*
+ x11-libs/libX11"
# JNI libraries don't need SONAME, bug #253756
QA_SONAME='usr/lib[^/]*/libswt-[^/]+.so'
+JAVA_RESOURCE_DIRS="resources"
+JAVA_SRC_DIR="src"
+
PATCHES=(
"${FILESDIR}"/${P}-as-needed-and-flag-fixes.patch
)
src_unpack() {
- local DISTFILE=${A}
- unzip -jq "${DISTDIR}"/${DISTFILE} swt.jar src.zip || die "Unable to extract distfile"
+ default
unpack "./src.zip"
-
- # Cleanup the redirtied directory structure
- rm -rf about_files/ || die
}
src_prepare() {
- # Replace the build.xml to allow compilation without Eclipse tasks
- cp "${FILESDIR}/build.xml" "${S}/build.xml" || die "Unable to update build.xml"
- mkdir "${S}/src" && mv "${S}/org" "${S}/src" || die "Unable to restructure SWT sources"
-
- # Apply patches
- default
+ default #780585
+ java-pkg-2_src_prepare
+ # .css stuff is essential at least for running net-p2p/biglybt
+ unzip swt.jar 'org/eclipse/swt/internal/gtk/*.css' -d resources || die
+ java-pkg_clean
# Define missing g_thread_supported() to be already started.
sed -i '1s/^/#define g_thread_supported() 1\n\n/' "${S}"/os_custom.h || die
# Webext is also in the library directory
sed -i 's|findResource([^,]\+|findResource("swt"|' \
- "${S}"/src/org/eclipse/swt/browser/WebKit.java || die
+ org/eclipse/swt/browser/WebKit.java || die
+
+ mkdir src || die "mkdir failed"
+ mv org src || die "moving java sources 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"
}
src_compile() {
append-cflags -fcommon # https://bugs.gentoo.org/707838
- # Drop jikes support as it seems to be unfriendly with SWT
- java-pkg_filter-compiler jikes
-
local JAWTSO="libjawt.so"
IFS=":" read -r -a ldpaths <<< $(java-config -g LDPATH)
@@ -115,6 +121,7 @@ src_compile() {
local make="emake -f make_linux.mak NO_STRIP=y CC=$(tc-getCC) CXX=$(tc-getCXX)"
einfo "Building AWT library"
+ export SWT_JAVA_HOME="$(java-config -g JAVA_HOME)"
${make} make_awt AWT_LIBS="-L\$(AWT_LIB_PATH) -Wl,-rpath,\$(AWT_LIB_PATH) -ljawt \`pkg-config --libs x11\`"
einfo "Building SWT library"
@@ -135,20 +142,10 @@ src_compile() {
if use webkit ; then
einfo "Building WebKit component"
- ${make} make_webkit make_webkit2extension
+ ${make} make_webkit
fi
- einfo "Building JNI libraries"
- eant compile
-
- einfo "Copying missing files"
- cp -i "${S}/version.txt" "${S}/build/version.txt" || die
- cp -i "${S}/src/org/eclipse/swt/internal/SWTMessages.properties" \
- "${S}/build/org/eclipse/swt/internal/" || die
- unzip swt.jar 'org/eclipse/swt/internal/gtk/*.css' -d build || die
-
- einfo "Packing JNI libraries"
- eant jar
+ java-pkg-simple_src_compile
}
src_install() {
diff --git a/dev-java/swt/swt-4.29.ebuild b/dev-java/swt/swt-4.29-r1.ebuild
index 08361076b0b5..6dbc30c768f9 100644
--- a/dev-java/swt/swt-4.29.ebuild
+++ b/dev-java/swt/swt-4.29-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
@@ -44,7 +44,8 @@ DEPEND="${COMMON_DEP}
x11-libs/libXt
x11-libs/libXtst"
RDEPEND="${COMMON_DEP}
- >=virtual/jre-1.8:*"
+ >=virtual/jre-1.8:*
+ x11-libs/libX11"
BDEPEND="
app-arch/unzip
virtual/pkgconfig
diff --git a/dev-java/swt/swt-4.30-r1.ebuild b/dev-java/swt/swt-4.30-r2.ebuild
index f0ea9b557f4b..61d849831270 100644
--- a/dev-java/swt/swt-4.30-r1.ebuild
+++ b/dev-java/swt/swt-4.30-r2.ebuild
@@ -45,7 +45,8 @@ DEPEND="${COMMON_DEP}
x11-libs/libXtst"
# error: pattern matching in instanceof is not supported in -source 11
RDEPEND="${COMMON_DEP}
- >=virtual/jre-17:*"
+ >=virtual/jre-17:*
+ x11-libs/libX11"
BDEPEND="
app-arch/unzip
virtual/pkgconfig
diff --git a/dev-java/swt/swt-4.31.ebuild b/dev-java/swt/swt-4.31-r1.ebuild
index bcfb034a7ae1..382a538ccff2 100644
--- a/dev-java/swt/swt-4.31.ebuild
+++ b/dev-java/swt/swt-4.31-r1.ebuild
@@ -21,7 +21,7 @@ S="${WORKDIR}/library"
LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1"
SLOT="4.31"
-KEYWORDS="~amd64 ~arm64 ~ppc64"
+KEYWORDS="amd64 arm64 ppc64"
IUSE="cairo opengl webkit"
BDEPEND="
@@ -50,7 +50,8 @@ DEPEND="${COMMON_DEP}
x11-libs/libXtst"
# error: pattern matching in instanceof is not supported in -source 11
RDEPEND="${COMMON_DEP}
- >=virtual/jre-17:*"
+ >=virtual/jre-17:*
+ x11-libs/libX11"
HTML_DOCS=( ../about.html )
diff --git a/dev-java/swt/swt-4.32.ebuild b/dev-java/swt/swt-4.32.ebuild
new file mode 100644
index 000000000000..0dc6a896fb7a
--- /dev/null
+++ b/dev-java/swt/swt-4.32.ebuild
@@ -0,0 +1,152 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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}-202406010610"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="GTK based SWT Library"
+HOMEPAGE="https://www.eclipse.org/swt/"
+SRC_URI="
+ amd64? ( ${MY_DMF}/${MY_P}-gtk-linux-x86_64.zip )
+ arm64? ( ${MY_DMF}/${MY_P}-gtk-linux-aarch64.zip )
+ ppc64? ( ${MY_DMF}/${MY_P}-gtk-linux-ppc64le.zip )"
+S="${WORKDIR}/library"
+
+LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1"
+SLOT="4.32"
+KEYWORDS="~amd64 ~arm64 ~ppc64"
+IUSE="cairo opengl webkit"
+
+BDEPEND="
+ app-arch/unzip
+ virtual/pkgconfig
+"
+COMMON_DEP="
+ app-accessibility/at-spi2-core:2
+ dev-libs/glib
+ x11-libs/gtk+:3
+ x11-libs/libXtst
+ cairo? ( x11-libs/cairo )
+ opengl? (
+ virtual/glu
+ virtual/opengl
+ )
+ webkit? (
+ net-libs/webkit-gtk:4.1
+ )"
+DEPEND="${COMMON_DEP}
+ >=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-17:*
+ x11-libs/libX11"
+
+HTML_DOCS=( ../about.html )
+
+JAVA_RESOURCE_DIRS="../resources"
+JAVA_SRC_DIR="../src"
+
+PATCHES=(
+ "${FILESDIR}/swt-4.27-as-needed-and-flag-fixes.patch"
+)
+
+src_unpack() {
+ default
+ unpack "./src.zip"
+}
+
+src_prepare() {
+ default #780585
+ java-pkg-2_src_prepare
+ # .css stuff is essential at least for running net-p2p/biglybt
+ unzip ../swt.jar 'org/eclipse/swt/internal/gtk/*.css' -d resources || die
+ java-pkg_clean
+ cd .. || die
+ mkdir resources src || die "mkdir failed"
+ find org -type f -name '*.java' \
+ | xargs \
+ cp --parent -t src -v \
+ || die "copying resources failed"
+ find org -type f ! -name '*.java' \
+ | xargs \
+ cp --parent -t resources -v \
+ || die "copying resources failed"
+ cp version.txt resources || die "adding version.txt failed"
+}
+
+src_compile() {
+ append-cflags -fcommon # https://bugs.gentoo.org/707838
+
+ local JAWTSO="libjawt.so"
+ IFS=":" read -r -a ldpaths <<< $(java-config -g LDPATH)
+
+ for libpath in "${ldpaths[@]}"; do
+ if [[ -f "${libpath}/${JAWTSO}" ]]; then
+ export AWT_LIB_PATH="${libpath}"
+ break
+ # this is a workaround for broken LDPATH in <=openjdk-8.292_p10 and <=dev-java/openjdk-bin-8.292_p10
+ elif [[ -f "${libpath}/$(tc-arch)/${JAWTSO}" ]]; then
+ export AWT_LIB_PATH="${libpath}/$(tc-arch)"
+ break
+ fi
+ done
+
+ if [[ -z "${AWT_LIB_PATH}" ]]; then
+ eerror "${JAWTSO} not found in the JDK being used for compilation!"
+ die "cannot build AWT library"
+ fi
+
+ # Fix the pointer size for AMD64
+ export SWT_PTR_CFLAGS=-DJNI64
+
+ # Bug #461784, g_thread_init is deprecated since glib-2.32.
+ append-cflags -DNO__1g_1thread_1init
+
+ local make="emake -f make_linux.mak NO_STRIP=y CC=$(tc-getCC) CXX=$(tc-getCXX)"
+
+ einfo "Building AWT library"
+ export SWT_JAVA_HOME="$(java-config -g JAVA_HOME)"
+ ${make} make_awt AWT_LIBS="-L\$(AWT_LIB_PATH) -Wl,-rpath,\$(AWT_LIB_PATH) -ljawt \`pkg-config --libs x11\`"
+
+ einfo "Building SWT library"
+ ${make} make_swt
+
+ einfo "Building JAVA-AT-SPI bridge"
+ ${make} make_atk
+
+ if use cairo ; then
+ einfo "Building CAIRO support"
+ ${make} make_cairo
+ fi
+
+ if use opengl ; then
+ einfo "Building OpenGL component"
+ ${make} make_glx
+ fi
+
+ if use webkit ; then
+ einfo "Building WebKit component"
+ ${make} make_webkit
+ fi
+
+ java-pkg-simple_src_compile
+}
+
+src_install() {
+ java-pkg-simple_src_install
+
+ java-pkg_sointo "/usr/$(get_libdir)/swt"
+ java-pkg_doso *.so
+}
diff --git a/dev-java/tomcat-native/Manifest b/dev-java/tomcat-native/Manifest
index fbe53cf14904..7aace8ac6336 100644
--- a/dev-java/tomcat-native/Manifest
+++ b/dev-java/tomcat-native/Manifest
@@ -1,5 +1,3 @@
-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-1.3.0-src.tar.gz 345276 BLAKE2B 73e8433e12bdd88036509f4ffbd2c0ed25b367567728829a56918d082627d43643865c492f4bc8eac4551e2ed82648ada71e6decfb45c173a856ab2fda6e01a5 SHA512 5a6c7337280774525c97e36e24d7d278ba15edd63c66cec1b3e5ecdc472f8d0535e31eac83cf0bdc68810eb779e2a118d6b4f6238b509f69a71d037c905fa433
DIST tomcat-native-1.3.0-src.tar.gz.asc 833 BLAKE2B b7e05447643000ffda0d66143c199192b41843f10ae89874c353d613f612a6d481be3081aa971b640a3bedc6c903be7d052c418e2abc2d7d6db42924c7b3cf91 SHA512 9cfc137cd13086ccf421376a006164e6e6e14844636457db0cf7c0f699a1b1ceab28a52bd80da71dc9e190bdf84676abfdbe07a0cabecfc59b7845ac82a171e5
DIST tomcat-native-2.0.7-src.tar.gz 538131 BLAKE2B ef973c830e3e3e04f4bf7bd711915b1ac5f28e34832edd0750117a5d6b00f9a7fa9e390858d23bfaeeb08ad825d7dcc1e95967c00d4ada96cac83377fca7bea6 SHA512 625b334271494f7c86c06d6a8c6d13c06d9d6094f65cccbdc8d3df13ee2aae4cb42ad326e20bcbf8a8f141240111778991882f9bf87793b09a2920433d6c8c85
diff --git a/dev-java/tomcat-native/tomcat-native-1.2.39.ebuild b/dev-java/tomcat-native/tomcat-native-1.2.39.ebuild
deleted file mode 100644
index e1e3cd36a857..000000000000
--- a/dev-java/tomcat-native/tomcat-native-1.2.39.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# 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 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} )
-PATCHES=( "${FILESDIR}/tomcat-native-1.2.39-slibtool.patch" )
-
-src_prepare() {
- default #780585
- 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.3.0.ebuild b/dev-java/tomcat-native/tomcat-native-1.3.0.ebuild
index a927ad1ef0ad..d560c27c933d 100644
--- a/dev-java/tomcat-native/tomcat-native-1.3.0.ebuild
+++ b/dev-java/tomcat-native/tomcat-native-1.3.0.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-servlet-api/tomcat-servlet-api-4.1.40.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-4.1.40-r1.ebuild
index 4cddc788557a..d782f8ef763d 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-4.1.40.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-4.1.40-r1.ebuild
@@ -1,38 +1,35 @@
-# 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
JAVA_PKG_IUSE="doc source"
-inherit java-pkg-2 java-ant-2
+inherit java-pkg-2 java-pkg-simple
MY_P="apache-${P/-servlet-api/}-src"
DESCRIPTION="Tomcat's Servlet API 2.3/JSP API 1.2 implementation"
HOMEPAGE="https://tomcat.apache.org/"
SRC_URI="https://archive.apache.org/dist/tomcat/tomcat-4/v${PV}/src/${MY_P}.tar.gz"
-DEPEND=">=virtual/jdk-1.8"
-RDEPEND=">=virtual/jre-1.8"
+
+S="${WORKDIR}/${MY_P}/servletapi"
+
LICENSE="Apache-2.0"
SLOT="2.3"
KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE=""
-S="${WORKDIR}/${MY_P}/servletapi"
-src_unpack() {
- unpack ${A}
- cd "${S}"
-
- einfo "Removing bundled jars and classes"
- find "${WORKDIR}/${MY_P}" '(' -name '*.class' -o -name '*.jar' ')' -delete
-}
-
-EANT_BUILD_TARGET="all"
-
-src_install() {
- java-pkg_dojar dist/lib/servlet.jar
+DEPEND=">=virtual/jdk-1.8"
+RDEPEND=">=virtual/jre-1.8"
- use doc && java-pkg_dohtml -r dist/docs/*
- use source && java-pkg_dosrc src/share/javax
- dodoc dist/README.txt
+JAVA_RESOURCE_DIRS="res/src/share"
+JAVA_SRC_DIR="src/share"
+
+src_prepare() {
+ java-pkg-2_src_prepare
+ mkdir src/share/javax/servlet/{,jsp/}resources || die
+ mv src/share/dtd/web-app* src/share/javax/servlet/resources || die
+ mv src/share/dtd/* src/share/javax/servlet/jsp/resources || die
+ mkdir res || die
+ find src -type f ! -name '*.java' ! -name '*.gif' \
+ | xargs cp --parent -t res || die
}
diff --git a/dev-java/validation-api/Manifest b/dev-java/validation-api/Manifest
deleted file mode 100644
index dcac63ba7efc..000000000000
--- a/dev-java/validation-api/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST validation-api-1.1.0.jar 94671 BLAKE2B c28f6b2ca52094f33e82d2e7c71e52ef57c503c5d50f34646ee28a9f61ea7e4da7f494f41b5f8a34ce6108ca1b75fa2d0f08eb9aab15cf033e825afc2eefdf19 SHA512 aa15184ff004357f1cdee693008587a3aa180a8f24392847258672c4a2e5a537cf189049ef95febb1a87968a42223f7736e22e00fe9307678c117f7ab6b944a8
diff --git a/dev-java/validation-api/validation-api-1.1.0-r2.ebuild b/dev-java/validation-api/validation-api-1.1.0-r2.ebuild
deleted file mode 100644
index fe8bd82bedc9..000000000000
--- a/dev-java/validation-api/validation-api-1.1.0-r2.ebuild
+++ /dev/null
@@ -1,20 +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="Bean Validation (JSR-303) API"
-HOMEPAGE="https://beanvalidation.org/"
-SRC_URI="https://repo1.maven.org/maven2/javax/validation/${PN}/${PV}.Final/${P}.Final-sources.jar -> ${P}.jar"
-
-LICENSE="Apache-2.0"
-SLOT="1.0"
-KEYWORDS="amd64 x86"
-
-BDEPEND="app-arch/unzip"
-RDEPEND=">=virtual/jre-1.8"
-DEPEND=">=virtual/jdk-1.8"
diff --git a/dev-java/velocity/Manifest b/dev-java/velocity/Manifest
index bafc24692cd9..7920653cd469 100644
--- a/dev-java/velocity/Manifest
+++ b/dev-java/velocity/Manifest
@@ -1,2 +1 @@
-DIST velocity-2.3.tar.gz 443754 BLAKE2B 16b7aaa87eb6be899f40d09ee8aa50b2ac24dd59c33f29b944d46ea84a77de07cd69f344632b4b829b92a92fe6ccd75cf79e021787b2ca59a79040aa08a53eed SHA512 987f2991a96fa8fae43ff2f72d6a57b25b1cb7d98b7def7a1a6e9a308c8b5b86e394444c47ee0eca8b70d41b341759c7309404dc4b952dbc65fc3a5b92d46cdb
DIST velocity-2.3_p20240314.tar.gz 440967 BLAKE2B c5fcea7af49d6c46d5c0943efe82f3c04d921afc2c53201b97842ae71714e7035d075c147b3bea71e959db12dd970b7879ade73bbc23bab09a1fd262e21f2fc6 SHA512 9055e780d2a3c798bfe30e5c7859a7311c4984b551d7b2ffa68c57c076549326d0ddae31eabff8009ea021c749331d34c71eee8cab55599dea5f3c8dba841a02
diff --git a/dev-java/velocity/files/velocity-2.3-skipSecurityManager.patch b/dev-java/velocity/files/velocity-2.3-skipSecurityManager.patch
deleted file mode 100644
index 3375bce00eac..000000000000
--- a/dev-java/velocity/files/velocity-2.3-skipSecurityManager.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-bug #923612
---- a/src/test/java/org/apache/velocity/test/issues/VelTools66TestCase.java
-+++ b/src/test/java/org/apache/velocity/test/issues/VelTools66TestCase.java
-@@ -58,7 +58,6 @@ public class VelTools66TestCase
- Velocity.RUNTIME_LOG_INSTANCE, new TestLogger());
-
- Velocity.init();
-- System.setSecurityManager(new TestSecurityManager());
-
- }
-
diff --git a/dev-java/velocity/velocity-2.3.ebuild b/dev-java/velocity/velocity-2.3.ebuild
deleted file mode 100644
index fd0fb1074e25..000000000000
--- a/dev-java/velocity/velocity-2.3.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# 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/apache/velocity-engine/archive/refs/tags/2.3.tar.gz --slot 0 --keywords "~amd64 ~x86" --ebuild velocity-2.3.ebuild
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.apache.velocity:velocity-engine-core:2.3"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Apache Velocity is a general purpose template engine"
-HOMEPAGE="https://velocity.apache.org"
-SRC_URI="https://github.com/apache/${PN}-engine/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-# Common dependencies
-# POM: pom.xml
-# commons-io:commons-io:2.8.0 -> >=dev-java/commons-io-2.8.0:1
-# org.apache.commons:commons-lang3:3.11 -> >=dev-java/commons-lang-3.11:3.6
-# org.slf4j:slf4j-api:1.7.30 -> >=dev-java/slf4j-api-1.7.30:0
-
-CDEPEND="
- >=dev-java/commons-io-2.8.0:1
- >=dev-java/commons-lang-3.11:3.6
- >=dev-java/slf4j-api-1.7.30:0
-"
-
-# Compile dependencies
-# POM: pom.xml
-# test? junit:junit:4.13.2 -> >=dev-java/junit-4.13.2:4
-# test? org.hsqldb:hsqldb:2.5.1 -> !!!groupId-not-found!!!
-# test? org.slf4j:slf4j-simple:1.7.30 -> >=dev-java/slf4j-simple-1.7.30:0
-
-DEPEND="
- >=virtual/jdk-1.8:*
- ${CDEPEND}
- test? (
- dev-db/hsqldb:0
- >=dev-java/slf4j-simple-1.7.30:0
- )
-"
-
-RDEPEND="
- >=virtual/jre-1.8:*
- ${CDEPEND}
-"
-
-BDEPEND="
- dev-java/javacc:0
-"
-
-S="${WORKDIR}/${PN}-engine-${PV}/${PN}-engine-core"
-PATCHES=( "${FILESDIR}/velocity-2.3-skipSecurityManager.patch" )
-
-JAVA_GENTOO_CLASSPATH="commons-io-1,commons-lang-3.6,slf4j-api"
-JAVA_SRC_DIR="src/main/java"
-JAVA_RESOURCE_DIRS="src/main/resources"
-
-JAVA_TEST_GENTOO_CLASSPATH="junit-4,hsqldb,slf4j-simple"
-JAVA_TEST_SRC_DIR="src/test/java"
-JAVA_TEST_RESOURCE_DIRS="src/test/resources"
-
-JAVA_TEST_EXCLUDES=(
- # org.junit.runners.model.InvalidTestClassError: Invalid test class, No runnable methods
- "org.apache.velocity.test.RenderVelocityTemplateTest"
- "org.apache.velocity.test.provider.TestNumber"
- "org.apache.velocity.test.provider.TestProvider"
- "org.apache.velocity.test.sql.TestDataSource"
- "org.apache.velocity.test.misc.TestContext"
-
- # java.lang.IllegalArgumentException: Test class can only have one constructor
- "org.apache.velocity.test.misc.TestLogger"
-
- # junit.framework.AssertionFailedError: Class org.apache.velocity.test.sql.BaseSQLTest has no public constructor TestCase(String name) or TestCase()
- "org.apache.velocity.test.sql.BaseSQLTest"
-
- # requires configured jdbc
- # junit.framework.AssertionFailedError: Exception in constructor: testSimpleTemplate (java.lang.NullPointerException
- # junit.framework.AssertionFailedError: Exception in constructor: testNullTimestamp (java.lang.NullPointerException
- # junit.framework.AssertionFailedError: Exception in constructor: testMacroInvocation (java.lang.NullPointerException
- # junit.framework.AssertionFailedError: Exception in constructor: testRenderTool (java.lang.NullPointerException
- "org.apache.velocity.test.sql.DataSourceResourceLoaderTestCase"
-)
-
-src_prepare() {
- default #780585
- java-pkg-2_src_prepare
-
- cp -v "${JAVA_SRC_DIR}-templates/org/apache/velocity/runtime/VelocityEngineVersion.java" \
- "${JAVA_SRC_DIR}/org/apache/velocity/runtime/VelocityEngineVersion.java" || die
-
- sed -i "s/\${project.version}/${PV}/g" \
- "${JAVA_SRC_DIR}/org/apache/velocity/runtime/VelocityEngineVersion.java" || die
-
- # fix paths for tests
- sed -i \
- -e "s%System.getProperty(\"test.compare.dir\")%\"${S}/target/test-classes\"%g" \
- -e "s%System.getProperty(\"test.result.dir\")%\"${S}/results\"%g" \
- "${JAVA_TEST_SRC_DIR}/org/apache/velocity/test/TemplateTestBase.java" || die
-
- sed -i \
- -e 's/\${parser.basename}/Standard/g' \
- -e 's/\${parser.package}/org.apache.velocity.runtime.parser/g' \
- -e 's/\${parser.char.asterisk}/\*/g' \
- -e 's/\${parser.char.at}/\@/g' \
- -e 's/\${parser.char.dollar}/\$/g' \
- -e 's/\${parser.char.hash}/\#/g' \
- "${S}/src/main/parser/Parser.jjt" || die
-
- # File "StandardParserTreeConstants.java" does not exist. Will create one.
- # File "StandardParserVisitor.java" does not exist. Will create one.
- # File "JJTStandardParserState.java" does not exist. Will create one.
- jjtree -GRAMMAR_ENCODING=UTF-8 \
- -JDK_VERSION=1.8 \
- -BUILD_NODE_FILES=false \
- -MULTI=true \
- -NODE_PACKAGE=org.apache.velocity.runtime.parser.node \
- -NODE_USES_PARSER=true \
- -STATIC=false \
- -OUTPUT_DIRECTORY="${JAVA_SRC_DIR}/org/apache/velocity/runtime/parser/node" \
- "${S}/src/main/parser/Parser.jjt" \
- || die "Code generation via jjtree failed"
-
- javacc -GRAMMAR_ENCODING=UTF-8 \
- -JDK_VERSION=1.8 \
- -STATIC=false \
- -DEBUG_PARSER=false \
- -DEBUG_LOOKAHEAD=false \
- -DEBUG_TOKEN_MANAGER=false \
- -BUILD_PARSER=true \
- -TOKEN_MANAGER_USES_PARSER=true \
- -OUTPUT_DIRECTORY="${JAVA_SRC_DIR}" \
- "${JAVA_SRC_DIR}/org/apache/velocity/runtime/parser/node/Parser.jj" \
- || die "Parser.java code generation via javacc failed"
-
- # Avoid "error: duplicate class: org.apache.velocity.runtime.parser...."
- rm -v "${JAVA_SRC_DIR}/CharStream.java" || die "cannot remove 'CharStream.java'"
- rm -v "${JAVA_SRC_DIR}/ParseException.java" || die "cannot remove 'ParseException.java'"
-}
diff --git a/dev-java/velocity/velocity-2.3_p20240314.ebuild b/dev-java/velocity/velocity-2.3_p20240314.ebuild
index 9fc3d0f5f420..948e71a0394d 100644
--- a/dev-java/velocity/velocity-2.3_p20240314.ebuild
+++ b/dev-java/velocity/velocity-2.3_p20240314.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${PN}-engine-${MY_COMMIT}/${PN}-engine-core"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
CP_DEPEND="
>=dev-java/commons-io-2.8.0:1
diff --git a/dev-java/wsdl4j/wsdl4j-1.6.3.ebuild b/dev-java/wsdl4j/wsdl4j-1.6.3.ebuild
index bcb97bf3f850..d3a6b474d0af 100644
--- a/dev-java/wsdl4j/wsdl4j-1.6.3.ebuild
+++ b/dev-java/wsdl4j/wsdl4j-1.6.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
@@ -10,7 +10,7 @@ inherit java-pkg-2 java-pkg-simple
DESCRIPTION="Web Services Description Language for Java Toolkit (WSDL4J)"
HOMEPAGE="https://wsdl4j.sourceforge.net"
TCK_V="1.2"
-SRC_URI="mirror://sourceforge/project/wsdl4j/WSDL4J/${PV}/wsdl4j-src-${PV}.zip"
+SRC_URI="https://downloads.sourceforge.net/project/wsdl4j/WSDL4J/${PV}/wsdl4j-src-${PV}.zip"
LICENSE="CPL-1.0"
SLOT="0"
diff --git a/dev-java/xmlunit/xmlunit-1.6-r2.ebuild b/dev-java/xmlunit/xmlunit-1.6-r2.ebuild
index c71644977437..d94ddaaab432 100644
--- a/dev-java/xmlunit/xmlunit-1.6-r2.ebuild
+++ b/dev-java/xmlunit/xmlunit-1.6-r2.ebuild
@@ -11,7 +11,7 @@ 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"
+SRC_URI="https://downloads.sourceforge.net/project/xmlunit/xmlunit%20for%20Java/XMLUnit%20for%20Java%20${PV}/${P}-src.zip"
S="${WORKDIR}/${P}"
LICENSE="BSD"
diff --git a/dev-java/xpp2/xpp2-2.1.10-r4.ebuild b/dev-java/xpp2/xpp2-2.1.10-r4.ebuild
new file mode 100644
index 000000000000..0e785ac7de74
--- /dev/null
+++ b/dev-java/xpp2/xpp2-2.1.10-r4.ebuild
@@ -0,0 +1,82 @@
+# 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="pull-parser:pull-parser:2"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_PN="PullParser"
+MY_P="${MY_PN}${PV}"
+
+DESCRIPTION="A streaming pull XML parser used to quickly process input elements"
+HOMEPAGE="https://web.archive.org/web/20130904163229/http://www.extreme.indiana.edu/xgws/xsoap/xpp/xpp2/"
+SRC_URI="https://web.archive.org/web/20130904173708/http://www.extreme.indiana.edu/xgws/xsoap/xpp/download/PullParser2/${MY_P}.tgz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="Apache-1.1 IBM"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+
+# Some failures, partly because we haven't patched Xerces but probably
+# also because this software is ancient. :(
+RESTRICT="test"
+
+CP_DEPEND="dev-java/xerces:2"
+DEPEND="${CP_DEPEND}
+ >=virtual/jdk-1.8:*
+ test? ( dev-java/junit:4 )"
+RDEPEND="${CP_DEPEND}
+ >=virtual/jre-1.8:*"
+
+PATCHES=( "${FILESDIR}/${P}-fix-java5+.patch" )
+
+JAVADOC_ARGS="-source 8"
+JAVA_RESOURCE_DIRS="res"
+JAVA_SRC_DIR="src/java"
+
+src_prepare() {
+ default #780585
+ java-pkg-2_src_prepare
+ java-pkg_clean
+ mkdir res || die
+ cp -r src/java/impl/factory/META-INF res || die
+ touch "res/PullParser${PV}_VERSION" || die
+
+ mv src/{java/,}tests || die
+ mv src/{java/,}samples || die
+}
+
+src_compile() {
+ java-pkg-simple_src_compile
+ rm xpp2.jar || die
+ JAVA_JAR_FILENAME="PullParser.jar"
+
+ cp -r target/classes parser || die
+ rm -r parser/org/gjt/xpp/x2impl || die
+ rm parser/org/gjt/xpp/impl/PullParserFactorySmallImpl.class || die
+ jar cvf PullParser.jar -C parser . || die
+
+ cp -r target/classes standard || die
+ rm -r standard/{javax,org/xml} || die
+ rm -r standard/org/gjt/xpp/{jaxp11,sax2,x2impl} || die
+ rm standard/org/gjt/xpp/impl/PullParserFactorySmallImpl.class || die
+ jar cvf PullParser-standard.jar -C standard . || die
+
+ cp -r target/classes intf || die
+ rm -r intf/{javax,org/xml,org/gjt/xpp/{impl,jaxp11,sax2,x2impl}} || die
+ rm -r intf/META-INF || die
+ jar cvf PullParser-intf.jar -C intf . || die
+
+ cp -r target/classes x2 || die
+ rm -r x2/org/gjt/xpp/impl/{pullparser,tokenizer} || die
+ rm x2/org/gjt/xpp/impl/PullParserFactory* || die
+ jar cvf PullParser-x2.jar -C x2 . || die
+}
+
+src_install() {
+ java-pkg-simple_src_install
+ java-pkg_dojar PullParser-{standard,intf,x2}.jar
+}
diff --git a/dev-java/xz-java/metadata.xml b/dev-java/xz-java/metadata.xml
index 4221e170cbc0..312995bd9c40 100644
--- a/dev-java/xz-java/metadata.xml
+++ b/dev-java/xz-java/metadata.xml
@@ -5,4 +5,7 @@
<email>java@gentoo.org</email>
<name>Java</name>
</maintainer>
+ <upstream>
+ <remote-id type="github">tukaani-project/xz-java</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-java/xz-java/xz-java-1.9-r1.ebuild b/dev-java/xz-java/xz-java-1.9-r2.ebuild
index 0b7ed480b07a..8d285914f327 100644
--- a/dev-java/xz-java/xz-java-1.9-r1.ebuild
+++ b/dev-java/xz-java/xz-java-1.9-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
@@ -18,7 +18,7 @@ LICENSE="public-domain"
SLOT="0"
KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-DEPEND=">=virtual/jdk-1.8:*"
+DEPEND=">=virtual/jdk-11:*"
RDEPEND=">=virtual/jre-1.8:*"
BDEPEND="
@@ -28,10 +28,15 @@ BDEPEND="
VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/lassecollin.asc"
-JAVA_SRC_DIR="src/org"
+JAVA_SRC_DIR="src9"
DOCS=( README NEWS COPYING THANKS )
+src_prepare() {
+ java-pkg-2_src_prepare
+ mv src{,9}/org || die
+}
+
src_install() {
java-pkg-simple_src_install
use examples && java-pkg_doexamples src/*Demo.java