summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'dev-java')
-rw-r--r--dev-java/asm/Manifest1
-rw-r--r--dev-java/asm/asm-9.7.1_p20241213.ebuild98
-rw-r--r--dev-java/bcmail/Manifest1
-rw-r--r--dev-java/bcmail/bcmail-1.78.1.ebuild65
-rw-r--r--dev-java/bcmail/bcmail-1.79.ebuild2
-rw-r--r--dev-java/bcpg/Manifest1
-rw-r--r--dev-java/bcpg/bcpg-1.78.1.ebuild69
-rw-r--r--dev-java/bcpg/bcpg-1.79.ebuild2
-rw-r--r--dev-java/bcpkix/Manifest2
-rw-r--r--dev-java/bcpkix/bcpkix-1.78.1.ebuild108
-rw-r--r--dev-java/bcpkix/bcpkix-1.79.ebuild2
-rw-r--r--dev-java/bcprov/Manifest2
-rw-r--r--dev-java/bcprov/bcprov-1.78.1.ebuild106
-rw-r--r--dev-java/bcprov/bcprov-1.79.ebuild2
-rw-r--r--dev-java/bcutil/Manifest1
-rw-r--r--dev-java/bcutil/bcutil-1.78.1.ebuild61
-rw-r--r--dev-java/bcutil/bcutil-1.79.ebuild2
-rw-r--r--dev-java/bnd-annotation/bnd-annotation-7.1.0.ebuild4
-rw-r--r--dev-java/bnd-ant/Manifest1
-rw-r--r--dev-java/bnd-ant/bnd-ant-7.0.0.ebuild46
-rw-r--r--dev-java/bnd-ant/bnd-ant-7.1.0.ebuild4
-rw-r--r--dev-java/bnd-util/bnd-util-7.1.0.ebuild4
-rw-r--r--dev-java/bnd/Manifest1
-rw-r--r--dev-java/bnd/bnd-7.0.0.ebuild100
-rw-r--r--dev-java/bnd/bnd-7.1.0-r1.ebuild (renamed from dev-java/bnd/bnd-7.1.0.ebuild)6
-rw-r--r--dev-java/bndlib/bndlib-7.0.0.ebuild4
-rw-r--r--dev-java/bndlib/bndlib-7.1.0.ebuild4
-rw-r--r--dev-java/byte-buddy/Manifest1
-rw-r--r--dev-java/byte-buddy/byte-buddy-1.14.0.ebuild161
-rw-r--r--dev-java/byte-buddy/byte-buddy-1.15.10.ebuild4
-rw-r--r--dev-java/caffeine/Manifest1
-rw-r--r--dev-java/caffeine/caffeine-2.6.2-r1.ebuild33
-rw-r--r--dev-java/caffeine/caffeine-2.9.3.ebuild4
-rw-r--r--dev-java/cglib/cglib-3.3.0-r3.ebuild71
-rw-r--r--dev-java/checker-framework-qual/Manifest1
-rw-r--r--dev-java/checker-framework-qual/checker-framework-qual-3.48.3.ebuild4
-rw-r--r--dev-java/checker-framework-qual/checker-framework-qual-3.48.4.ebuild23
-rw-r--r--dev-java/commons-io/Manifest2
-rw-r--r--dev-java/commons-io/commons-io-2.17.0.ebuild40
-rw-r--r--dev-java/commons-io/commons-io-2.18.0.ebuild2
-rw-r--r--dev-java/commons-logging/Manifest2
-rw-r--r--dev-java/commons-logging/commons-logging-1.3.1.ebuild153
-rw-r--r--dev-java/commons-logging/commons-logging-1.3.4-r1.ebuild2
-rw-r--r--dev-java/commons-vfs/commons-vfs-2.0-r4.ebuild4
-rw-r--r--dev-java/easymock/easymock-3.3.1-r2.ebuild70
-rw-r--r--dev-java/eclipse-ecj/eclipse-ecj-4.33.ebuild4
-rw-r--r--dev-java/error-prone-annotations/error-prone-annotations-2.36.0.ebuild4
-rw-r--r--dev-java/fontbox/Manifest1
-rw-r--r--dev-java/fontbox/fontbox-2.0.27.ebuild63
-rw-r--r--dev-java/fontbox/fontbox-2.0.32.ebuild2
-rw-r--r--dev-java/fop/fop-2.10-r1.ebuild (renamed from dev-java/fop/fop-2.10.ebuild)4
-rw-r--r--dev-java/gradle-bin/Manifest1
-rw-r--r--dev-java/gradle-bin/gradle-bin-8.12.ebuild59
-rw-r--r--dev-java/gradle-bin/metadata.xml21
-rw-r--r--dev-java/guava-testlib/Manifest1
-rw-r--r--dev-java/guava-testlib/guava-testlib-33.3.1.ebuild4
-rw-r--r--dev-java/guava-testlib/guava-testlib-33.4.0.ebuild68
-rw-r--r--dev-java/guava/Manifest1
-rw-r--r--dev-java/guava/guava-33.3.1.ebuild4
-rw-r--r--dev-java/guava/guava-33.4.0.ebuild40
-rw-r--r--dev-java/jackcess/Manifest1
-rw-r--r--dev-java/jackcess/jackcess-4.0.0.ebuild73
-rw-r--r--dev-java/jackcess/jackcess-4.0.7.ebuild2
-rw-r--r--dev-java/jackrabbit-webdav/jackrabbit-webdav-2.10.1-r3.ebuild4
-rw-r--r--dev-java/jakarta-annotation-api/Manifest1
-rw-r--r--dev-java/jakarta-annotation-api/jakarta-annotation-api-2.1.1.ebuild30
-rw-r--r--dev-java/jakarta-annotation-api/jakarta-annotation-api-3.0.0.ebuild4
-rw-r--r--dev-java/java-diff-utils/java-diff-utils-4.15.ebuild4
-rw-r--r--dev-java/javaparser-core/Manifest1
-rw-r--r--dev-java/javaparser-core/javaparser-core-3.26.3.ebuild59
-rw-r--r--dev-java/javassist/Manifest1
-rw-r--r--dev-java/javassist/javassist-3.29.2.ebuild55
-rw-r--r--dev-java/javassist/javassist-3.30.2.ebuild2
-rw-r--r--dev-java/jbig2-imageio/Manifest1
-rw-r--r--dev-java/jbig2-imageio/jbig2-imageio-3.0.3.ebuild41
-rw-r--r--dev-java/jbig2-imageio/jbig2-imageio-3.0.4.ebuild2
-rw-r--r--dev-java/jchart2d/jchart2d-3.2.2-r2.ebuild (renamed from dev-java/jchart2d/jchart2d-3.2.2-r1.ebuild)2
-rw-r--r--dev-java/jdbc-postgresql/jdbc-postgresql-42.7.3.ebuild4
-rw-r--r--dev-java/jdbc-postgresql/jdbc-postgresql-42.7.4.ebuild4
-rw-r--r--dev-java/jetbrains-annotations/jetbrains-annotations-26.0.1.ebuild4
-rw-r--r--dev-java/jol-core/Manifest1
-rw-r--r--dev-java/jol-core/jol-core-0.17.ebuild36
-rw-r--r--dev-java/json-simple/Manifest1
-rw-r--r--dev-java/json-simple/json-simple-4.0.1.ebuild26
-rw-r--r--dev-java/json-smart/Manifest1
-rw-r--r--dev-java/json-smart/json-smart-2.5.1.ebuild70
-rw-r--r--dev-java/json/Manifest1
-rw-r--r--dev-java/json/json-20241224.ebuild81
-rw-r--r--dev-java/junit/junit-5.10.3-r1.ebuild (renamed from dev-java/junit/junit-5.10.3.ebuild)4
-rw-r--r--dev-java/libg/libg-7.1.0.ebuild4
-rw-r--r--dev-java/mill-bin/Manifest2
-rw-r--r--dev-java/mill-bin/mill-bin-0.12.4.ebuild25
-rw-r--r--dev-java/mill-bin/mill-bin-0.12.5.ebuild25
-rw-r--r--dev-java/mockito/mockito-2.28.2-r1.ebuild4
-rw-r--r--dev-java/mockito/mockito-2.28.2.ebuild106
-rw-r--r--dev-java/open-test-reporting-events/Manifest1
-rw-r--r--dev-java/open-test-reporting-events/open-test-reporting-events-0.2.0_pre1.ebuild68
-rw-r--r--dev-java/openjdk-bin/Manifest18
-rw-r--r--dev-java/openjdk-bin/metadata.xml1
-rw-r--r--dev-java/openjdk-bin/openjdk-bin-21.0.5_p11.ebuild4
-rw-r--r--dev-java/openjdk-bin/openjdk-bin-23.0.1_p11.ebuild134
-rw-r--r--dev-java/openjdk-bin/openjdk-bin-25_p4_beta.ebuild (renamed from dev-java/openjdk-bin/openjdk-bin-24_p20_beta.ebuild)2
-rw-r--r--dev-java/openjdk-jre-bin/openjdk-jre-bin-21.0.5_p11.ebuild4
-rw-r--r--dev-java/openjdk/Manifest2
-rw-r--r--dev-java/openjdk/files/openjdk-23_p37-LIBFONTMANAGER_CFLAGS.patch12
-rw-r--r--dev-java/openjdk/openjdk-21.0.5_p11-r1.ebuild (renamed from dev-java/openjdk/openjdk-21.0.5_p11.ebuild)5
-rw-r--r--dev-java/openjdk/openjdk-25_p4.ebuild (renamed from dev-java/openjdk/openjdk-23.0.1_p11.ebuild)23
-rw-r--r--dev-java/pdfbox/Manifest1
-rw-r--r--dev-java/pdfbox/pdfbox-2.0.27.ebuild259
-rw-r--r--dev-java/pdfbox/pdfbox-2.0.32.ebuild2
-rw-r--r--dev-java/protobuf-java/Manifest3
-rw-r--r--dev-java/protobuf-java/protobuf-java-4.29.1.ebuild4
-rw-r--r--dev-java/protobuf-java/protobuf-java-4.29.2.ebuild (renamed from dev-java/protobuf-java/protobuf-java-4.27.2.ebuild)35
-rw-r--r--dev-java/protobuf-java/protobuf-java-4.29.3.ebuild152
-rw-r--r--dev-java/randomized-runner/Manifest1
-rw-r--r--dev-java/randomized-runner/randomized-runner-2.8.0.ebuild57
-rw-r--r--dev-java/randomized-runner/randomized-runner-2.8.2.ebuild4
-rw-r--r--dev-java/saslprep/saslprep-1.1-r2.ebuild (renamed from dev-java/saslprep/saslprep-1.1-r1.ebuild)6
-rw-r--r--dev-java/scala-cli-bin/Manifest3
-rw-r--r--dev-java/scala-cli-bin/scala-cli-bin-1.5.4.ebuild78
-rw-r--r--dev-java/scram/scram-2.1.ebuild4
-rw-r--r--dev-java/scram/scram-3.1.ebuild4
-rw-r--r--dev-java/stringprep/stringprep-1.1.ebuild4
-rw-r--r--dev-java/stringprep/stringprep-2.2.ebuild4
-rw-r--r--dev-java/swt/Manifest4
-rw-r--r--dev-java/swt/files/as-needed-and-flag-fixes-3.6.patch243
-rw-r--r--dev-java/swt/files/swt-3.7-manifest17
-rw-r--r--dev-java/swt/files/swt-3.7.2-gio_launch-URI-x86.patch121
-rw-r--r--dev-java/swt/files/swt-3.7.2-gio_launch-URI.patch121
-rw-r--r--dev-java/swt/swt-3.7.2-r4.ebuild169
-rw-r--r--dev-java/swt/swt-4.34-r1.ebuild153
-rw-r--r--dev-java/swt/swt-4.34.ebuild4
-rw-r--r--dev-java/velocity/Manifest1
-rw-r--r--dev-java/velocity/velocity-2.4.ebuild113
-rw-r--r--dev-java/xmlgraphics-commons/Manifest2
-rw-r--r--dev-java/xmlgraphics-commons/xmlgraphics-commons-2.9.ebuild50
-rw-r--r--dev-java/xmpbox/Manifest1
-rw-r--r--dev-java/xmpbox/xmpbox-2.0.27.ebuild56
-rw-r--r--dev-java/xmpbox/xmpbox-2.0.32.ebuild2
139 files changed, 1353 insertions, 2835 deletions
diff --git a/dev-java/asm/Manifest b/dev-java/asm/Manifest
index 1e9b4964dedf..dcec05010889 100644
--- a/dev-java/asm/Manifest
+++ b/dev-java/asm/Manifest
@@ -1 +1,2 @@
DIST asm-ASM_9_7_1.tar.bz2 1378103 BLAKE2B f7da3a9c1bcf76398c9e9b9b86d60f8854e5248632a8b2d76605851e29ee1807713fb28c9e76012ec8f9444c44e3a151ed409cd120c34ab8d3495fdc9c84edcb SHA512 77ae76464eec97dbc8129c4a746d13f0d286d2033f909b65e0e34858e1785616b7bee22faa92128b91eb39cbd849e262efe574b73ed2859920add457d6422dd0
+DIST asm-cc341b5f0c24ea6688f615faff597612f0d596fb.tar.bz2 1380914 BLAKE2B f60f866ea14d63ae763212aebed715294eef3019f9878ebbbc80a63283e5176a446a90419c09e8a9210359e481a7aabb1977716d6467b77af0d3166c669c3676 SHA512 ce9adbf3e9c4d7f947e7ca63f51983c6d9bb4d4af73934c6779802caa242bc4d7f552069a8b835c16d8d32027fb4e634236adfd10f27a5563ed80fdc81b1a53d
diff --git a/dev-java/asm/asm-9.7.1_p20241213.ebuild b/dev-java/asm/asm-9.7.1_p20241213.ebuild
new file mode 100644
index 000000000000..4e3aa23b078d
--- /dev/null
+++ b/dev-java/asm/asm-9.7.1_p20241213.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# tests not enabled because of missing eclass support of junit-jupiter
+JAVA_PKG_IUSE="doc source"
+MAVEN_PROVIDES="
+ org.ow2.asm:asm-bom:${PV}
+ org.ow2.asm:asm:${PV}
+ org.ow2.asm:asm-analysis:${PV}
+ org.ow2.asm:asm-commons:${PV}
+ org.ow2.asm:asm-tree:${PV}
+ org.ow2.asm:asm-util:${PV}
+"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Bytecode manipulation framework for Java"
+HOMEPAGE="https://asm.ow2.io"
+MY_P="ASM_${PV//./_}"
+MY_COMMIT="cc341b5f0c24ea6688f615faff597612f0d596fb"
+SRC_URI="https://gitlab.ow2.org/asm/asm/-/archive/${MY_COMMIT}/asm-${MY_COMMIT}.tar.bz2"
+S="${WORKDIR}/asm-${MY_COMMIT}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x64-macos"
+
+DEPEND=">=virtual/jdk-11:*"
+RDEPEND=">=virtual/jre-1.8:*"
+
+ASM_MODULES=( "asm" "asm-tree" "asm-analysis" "asm-commons" "asm-util" )
+JAVADOC_SRC_DIRS=(
+ asm/src/main/java
+ asm-tree/src/main/java
+ asm-analysis/src/main/java
+ asm-commons/src/main/java
+ asm-util/src/main/java
+)
+
+src_prepare() {
+ default
+ local module
+ touch asm.module || die
+ for module in "${ASM_MODULES[@]}"; do
+ module=${module/-/.}
+ cat > ${module/./-}/src/main/java/module-info.java <<-EOF || die
+ open module org.objectweb.${module/analysis/tree.analysis} {
+ $(cat asm.module)
+ requires java.base;
+ exports org.objectweb.${module/analysis/tree.analysis};
+ }
+ EOF
+ echo "requires transitive org.objectweb.${module/analysis/tree.analysis};" \
+ >> asm.module || die
+ done
+ sed -e '/^$/d' \
+ -e '/asm;/p;s:\(asm\)\(;\):\1.signature\2:' \
+ -i asm/src/main/java/module-info.java || die
+ sed -e '/analysis/d' \
+ -i asm-commons/src/main/java/module-info.java || die
+ sed -e '/commons/d' \
+ -i asm-util/src/main/java/module-info.java || die
+}
+
+src_compile() {
+ local module
+ for module in "${ASM_MODULES[@]}"; do
+ einfo "Compiling ${module}"
+ JAVA_JAR_FILENAME="${module}.jar"
+ JAVA_SRC_DIR="${module}/src/main/java"
+ java-pkg-simple_src_compile
+ JAVA_GENTOO_CLASSPATH_EXTRA+=":${module}.jar"
+ rm -r target || die
+ done
+
+ if use doc; then
+ einfo "Compiling javadocs"
+ for module in "${ASM_MODULES[@]}"; do
+ rm "${module}/src/main/java/module-info.java" || die
+ JAVA_SRC_DIR+=("${module}/src/main/java")
+ done
+ ejavadoc
+ fi
+}
+
+src_install() {
+ JAVA_JAR_FILENAME="asm.jar"
+ java-pkg-simple_src_install
+ local module
+ for module in asm-{analysis,commons,tree,util}; do
+ java-pkg_dojar ${module}.jar
+ if use source; then
+ java-pkg_dosrc "${module}/src/main/java/*"
+ fi
+ done
+}
diff --git a/dev-java/bcmail/Manifest b/dev-java/bcmail/Manifest
index d5ddb1650319..0f48e2de86f2 100644
--- a/dev-java/bcmail/Manifest
+++ b/dev-java/bcmail/Manifest
@@ -1,2 +1 @@
-DIST bc-java-r1rv78v1.tar.gz 47211344 BLAKE2B 6d28e69db8ad0043a5cd6c0a4f6901ff40884be4baf60ee40d4cb5487d799e6ac5ef4282b5d6e7f873e45607394890dd26e3150c9c1729bd5346d9cc8f30f240 SHA512 87e6ecd6fea47877d9d7a196f58c5b45a7f026f18f17b71d4155061fad024194c30ce0fc44ea3e879b17f310a6626407f345a8e8970781afec4551f2aa688223
DIST bc-java-r1rv79.tar.gz 47563177 BLAKE2B 7ca8b64ab004fb70399e950e8c588b19d110596790525ce30aeec3f2c6501bffd1bab6854c6bf1499f101e33e0ac8127c2cdaa34e5531c430e4f00fb145202f3 SHA512 294241371f536e8a9be8ff2307eaad433620c9becb26a00f6b225ea31488bc40dd8b01d20c18e47c105c7a8f1b2415136608d82811581fad4718db02e9c882a3
diff --git a/dev-java/bcmail/bcmail-1.78.1.ebuild b/dev-java/bcmail/bcmail-1.78.1.ebuild
deleted file mode 100644
index 2bc397385abe..000000000000
--- a/dev-java/bcmail/bcmail-1.78.1.ebuild
+++ /dev/null
@@ -1,65 +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="org.bouncycastle:bcmail-jdk18on:${PV}"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="The Bouncy Castle Java S/MIME APIs for handling S/MIME protocols"
-HOMEPAGE="https://www.bouncycastle.org/java.html"
-MY_PV="r$(ver_rs 1 'rv' 2 'v')"
-SRC_URI="https://github.com/bcgit/bc-java/archive/${MY_PV}.tar.gz -> bc-java-${MY_PV}.tar.gz"
-S="${WORKDIR}/bc-java-${MY_PV}/mail"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm64 ppc64"
-
-CP_DEPEND="
- ~dev-java/bcpkix-${PV}:0
- ~dev-java/bcprov-${PV}:0
- ~dev-java/bcutil-${PV}:0
- dev-java/javax-mail:0
-"
-
-DEPEND="
- ${CP_DEPEND}
- dev-java/jakarta-activation:1
- >=virtual/jdk-11:*
-"
-
-RDEPEND="
- ${CP_DEPEND}
- >=virtual/jre-1.8:*
-"
-
-DOCS=( ../{README,SECURITY}.md )
-HTML_DOCS=( ../{CONTRIBUTORS,index}.html )
-
-JAVA_AUTOMATIC_MODULE_NAME="org.bouncycastle.mail"
-JAVA_CLASSPATH_EXTRA="jakarta-activation-1"
-JAVA_RESOURCE_DIRS="src/main/resources"
-JAVA_SRC_DIR=(
- "src/main/java"
- "src/main/jdk1.9"
-)
-
-JAVA_TEST_GENTOO_CLASSPATH="junit-4"
-JAVA_TEST_RESOURCE_DIRS=( "src/test/resources" "../pkix/src/main/resources" )
-JAVA_TEST_RUN_ONLY="org.bouncycastle.mail.smime.test.AllTests"
-JAVA_TEST_SRC_DIR="src/test/java"
-
-src_prepare() {
- java-pkg-2_src_prepare
- java-pkg_clean ..
-}
-
-src_install() {
- docinto html
- dodoc -r ../docs
- java-pkg-simple_src_install
-}
diff --git a/dev-java/bcmail/bcmail-1.79.ebuild b/dev-java/bcmail/bcmail-1.79.ebuild
index 41ca49edd04a..2bc397385abe 100644
--- a/dev-java/bcmail/bcmail-1.79.ebuild
+++ b/dev-java/bcmail/bcmail-1.79.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/bc-java-${MY_PV}/mail"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="amd64 arm64 ~ppc64"
+KEYWORDS="amd64 arm64 ppc64"
CP_DEPEND="
~dev-java/bcpkix-${PV}:0
diff --git a/dev-java/bcpg/Manifest b/dev-java/bcpg/Manifest
index d5ddb1650319..0f48e2de86f2 100644
--- a/dev-java/bcpg/Manifest
+++ b/dev-java/bcpg/Manifest
@@ -1,2 +1 @@
-DIST bc-java-r1rv78v1.tar.gz 47211344 BLAKE2B 6d28e69db8ad0043a5cd6c0a4f6901ff40884be4baf60ee40d4cb5487d799e6ac5ef4282b5d6e7f873e45607394890dd26e3150c9c1729bd5346d9cc8f30f240 SHA512 87e6ecd6fea47877d9d7a196f58c5b45a7f026f18f17b71d4155061fad024194c30ce0fc44ea3e879b17f310a6626407f345a8e8970781afec4551f2aa688223
DIST bc-java-r1rv79.tar.gz 47563177 BLAKE2B 7ca8b64ab004fb70399e950e8c588b19d110596790525ce30aeec3f2c6501bffd1bab6854c6bf1499f101e33e0ac8127c2cdaa34e5531c430e4f00fb145202f3 SHA512 294241371f536e8a9be8ff2307eaad433620c9becb26a00f6b225ea31488bc40dd8b01d20c18e47c105c7a8f1b2415136608d82811581fad4718db02e9c882a3
diff --git a/dev-java/bcpg/bcpg-1.78.1.ebuild b/dev-java/bcpg/bcpg-1.78.1.ebuild
deleted file mode 100644
index 1d04452ce005..000000000000
--- a/dev-java/bcpg/bcpg-1.78.1.ebuild
+++ /dev/null
@@ -1,69 +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="org.bouncycastle:bcpg-jdk18on:${PV}"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Java cryptography APIs"
-HOMEPAGE="https://www.bouncycastle.org/java.html"
-MY_PV="r$(ver_rs 1 'rv' 2 'v')"
-SRC_URI="https://github.com/bcgit/bc-java/archive/${MY_PV}.tar.gz -> bc-java-${MY_PV}.tar.gz"
-S="${WORKDIR}/bc-java-${MY_PV}/pg"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm64 ppc64"
-
-CP_DEPEND="
- ~dev-java/bcprov-${PV}:0
- ~dev-java/bcutil-${PV}:0
-"
-
-DEPEND="
- ${CP_DEPEND}
- >=virtual/jdk-11:*
-"
-
-RDEPEND="
- ${CP_DEPEND}
- >=virtual/jre-1.8:*
-"
-
-DOCS=( ../{README,SECURITY}.md )
-HTML_DOCS=( ../{CONTRIBUTORS,index}.html )
-
-JAVA_SRC_DIR=(
- "src/main/java"
- "src/main/jdk1.9"
-)
-
-JAVA_AUTOMATIC_MODULE_NAME="org.bouncycastle.pg"
-JAVA_TEST_GENTOO_CLASSPATH="junit-4"
-JAVA_TEST_RESOURCE_DIRS="src/test/resources"
-JAVA_TEST_SRC_DIR="src/test/java"
-
-src_prepare() {
- java-pkg-2_src_prepare
- java-pkg_clean ..
-}
-
-src_test() {
- pushd src/test/java || die
- local JAVA_TEST_RUN_ONLY=$(find * \
- -name "AllTests.java" )
- popd || die
- JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}"
- JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}"
- java-pkg-simple_src_test
-}
-
-src_install() {
- docinto html
- dodoc -r ../docs
- java-pkg-simple_src_install
-}
diff --git a/dev-java/bcpg/bcpg-1.79.ebuild b/dev-java/bcpg/bcpg-1.79.ebuild
index c0e9b5868cea..1d04452ce005 100644
--- a/dev-java/bcpg/bcpg-1.79.ebuild
+++ b/dev-java/bcpg/bcpg-1.79.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/bc-java-${MY_PV}/pg"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="amd64 arm64 ~ppc64"
+KEYWORDS="amd64 arm64 ppc64"
CP_DEPEND="
~dev-java/bcprov-${PV}:0
diff --git a/dev-java/bcpkix/Manifest b/dev-java/bcpkix/Manifest
index f227ab547b8b..d43d603a6a73 100644
--- a/dev-java/bcpkix/Manifest
+++ b/dev-java/bcpkix/Manifest
@@ -1,4 +1,2 @@
-DIST bc-java-r1rv78v1.tar.gz 47211344 BLAKE2B 6d28e69db8ad0043a5cd6c0a4f6901ff40884be4baf60ee40d4cb5487d799e6ac5ef4282b5d6e7f873e45607394890dd26e3150c9c1729bd5346d9cc8f30f240 SHA512 87e6ecd6fea47877d9d7a196f58c5b45a7f026f18f17b71d4155061fad024194c30ce0fc44ea3e879b17f310a6626407f345a8e8970781afec4551f2aa688223
DIST bc-java-r1rv79.tar.gz 47563177 BLAKE2B 7ca8b64ab004fb70399e950e8c588b19d110596790525ce30aeec3f2c6501bffd1bab6854c6bf1499f101e33e0ac8127c2cdaa34e5531c430e4f00fb145202f3 SHA512 294241371f536e8a9be8ff2307eaad433620c9becb26a00f6b225ea31488bc40dd8b01d20c18e47c105c7a8f1b2415136608d82811581fad4718db02e9c882a3
-DIST bc-test-data-r1rv78v1.tar.gz 2084599485 BLAKE2B a4f67d4ab35321aba52696345cf1ac605866fede41d3b99aa42194f37b587fe7bdebd3ac264379b37416bf5f5c456cd78126126799257c28183e4b71a98b4225 SHA512 cc35260189f2100eb883c30f7a15b7c10f564e7e44e02c61373e7f56a03ab9971350c6798bcbb7a4c4508f5022a0a986fdcd8862449b937765dbf567e2f370ed
DIST bc-test-data-r1rv79.tar.gz 2101723062 BLAKE2B 1fa25babfbcaa855dfcf2ae8727f6a7a5221837127cc295a4c15dce515908418c9e052af101d6fc984c4b5ce204286b7361da29dbefad1b95603d6b1571603a0 SHA512 e14c1bf96a6010447cd13a680a87249a4e6d0661cc46b437e8b2e1098f3e80482dc9038446aad495ba72e1254e9c07e49b1ac848177b02ac36e10710fcd06413
diff --git a/dev-java/bcpkix/bcpkix-1.78.1.ebuild b/dev-java/bcpkix/bcpkix-1.78.1.ebuild
deleted file mode 100644
index ee1c18616966..000000000000
--- a/dev-java/bcpkix/bcpkix-1.78.1.ebuild
+++ /dev/null
@@ -1,108 +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="org.bouncycastle:bcpkix-jdk18on:${PV}"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple check-reqs
-
-DESCRIPTION="Java APIs for CMS, PKCS, EAC, TSP, CMP, CRMF, OCSP, and certificate generation"
-HOMEPAGE="https://www.bouncycastle.org/java.html"
-MY_PV="r$(ver_rs 1 'rv' 2 'v')"
-SRC_URI="https://github.com/bcgit/bc-java/archive/${MY_PV}.tar.gz -> bc-java-${MY_PV}.tar.gz
- test? ( https://github.com/bcgit/bc-test-data/archive/${MY_PV}.tar.gz -> bc-test-data-${MY_PV}.tar.gz )"
-S="${WORKDIR}/bc-java-${MY_PV}/pkix"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm64 ppc64"
-
-# 1) testSANMismatchIP(org.bouncycastle.est.test.TestHostNameAuthorizer)
-# org.bouncycastle.est.ESTException: localhost.me: Temporary failure in name resolution HTTP Status Code: 0
-PROPERTIES="test_network"
-RESTRICT="test"
-
-CDEPEND="
- ~dev-java/bcprov-${PV}:0
- ~dev-java/bcutil-${PV}:0
-"
-
-DEPEND="
- ${CDEPEND}
- >=virtual/jdk-11:*
-"
-
-RDEPEND="
- ${CDEPEND}
- >=virtual/jre-1.8:*
-"
-
-DOCS=( ../{README,SECURITY}.md )
-HTML_DOCS=( ../{CONTRIBUTORS,index}.html )
-
-JAVA_AUTOMATIC_MODULE_NAME="org.bouncycastle.pkix"
-JAVA_GENTOO_CLASSPATH="bcprov,bcutil"
-JAVA_SRC_DIR=(
- "src/main/java"
- "src/main/jdk1.9"
-)
-
-JAVA_TEST_EXTRA_ARGS="-Dbc.test.data.home=${S}/../core/src/test/data"
-JAVA_TEST_GENTOO_CLASSPATH="junit-4"
-JAVA_TEST_RESOURCE_DIRS="src/test/resources"
-JAVA_TEST_SRC_DIR="src/test/java"
-
-# https://bugs.gentoo.org/823347
-check_env() {
- if use test; then
- # this is needed only for tests
- CHECKREQS_MEMORY="2048M"
- check-reqs_pkg_pretend
- fi
-}
-
-# https://bugs.gentoo.org/823347
-pkg_pretend() {
- check_env
-}
-
-# https://bugs.gentoo.org/823347
-pkg_setup() {
- check_env
- java-pkg-2_pkg_setup
-}
-
-src_unpack() {
- unpack bc-java-${MY_PV}.tar.gz
- use test && unpack bc-test-data-${MY_PV}.tar.gz
-}
-
-src_prepare() {
- java-pkg-2_src_prepare
- java-pkg_clean ..
-}
-
-# https://bugs.gentoo.org/823347
-src_test() {
- mv ../../bc-test-data-${MY_PV} bc-test-data || die "cannot move bc-test-data"
-
- JAVA_TEST_EXTRA_ARGS+=" -Xmx${CHECKREQS_MEMORY}"
- pushd src/test/java || die
- local JAVA_TEST_RUN_ONLY=$(find * \
- -name "AllTests.java" \
- )
- popd
- einfo "${JAVA_TEST_RUN_ONLY}"
- JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}"
- JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}"
- java-pkg-simple_src_test
-}
-
-src_install() {
- docinto html
- dodoc -r ../docs
- java-pkg-simple_src_install
-}
diff --git a/dev-java/bcpkix/bcpkix-1.79.ebuild b/dev-java/bcpkix/bcpkix-1.79.ebuild
index 13b701319340..a6071a21ae44 100644
--- a/dev-java/bcpkix/bcpkix-1.79.ebuild
+++ b/dev-java/bcpkix/bcpkix-1.79.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/bc-java-${MY_PV}/pkix"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="amd64 arm64 ~ppc64"
+KEYWORDS="amd64 arm64 ppc64"
# 1) testSANMismatchIP(org.bouncycastle.est.test.TestHostNameAuthorizer)
# org.bouncycastle.est.ESTException: localhost.me: Temporary failure in name resolution HTTP Status Code: 0
diff --git a/dev-java/bcprov/Manifest b/dev-java/bcprov/Manifest
index f227ab547b8b..d43d603a6a73 100644
--- a/dev-java/bcprov/Manifest
+++ b/dev-java/bcprov/Manifest
@@ -1,4 +1,2 @@
-DIST bc-java-r1rv78v1.tar.gz 47211344 BLAKE2B 6d28e69db8ad0043a5cd6c0a4f6901ff40884be4baf60ee40d4cb5487d799e6ac5ef4282b5d6e7f873e45607394890dd26e3150c9c1729bd5346d9cc8f30f240 SHA512 87e6ecd6fea47877d9d7a196f58c5b45a7f026f18f17b71d4155061fad024194c30ce0fc44ea3e879b17f310a6626407f345a8e8970781afec4551f2aa688223
DIST bc-java-r1rv79.tar.gz 47563177 BLAKE2B 7ca8b64ab004fb70399e950e8c588b19d110596790525ce30aeec3f2c6501bffd1bab6854c6bf1499f101e33e0ac8127c2cdaa34e5531c430e4f00fb145202f3 SHA512 294241371f536e8a9be8ff2307eaad433620c9becb26a00f6b225ea31488bc40dd8b01d20c18e47c105c7a8f1b2415136608d82811581fad4718db02e9c882a3
-DIST bc-test-data-r1rv78v1.tar.gz 2084599485 BLAKE2B a4f67d4ab35321aba52696345cf1ac605866fede41d3b99aa42194f37b587fe7bdebd3ac264379b37416bf5f5c456cd78126126799257c28183e4b71a98b4225 SHA512 cc35260189f2100eb883c30f7a15b7c10f564e7e44e02c61373e7f56a03ab9971350c6798bcbb7a4c4508f5022a0a986fdcd8862449b937765dbf567e2f370ed
DIST bc-test-data-r1rv79.tar.gz 2101723062 BLAKE2B 1fa25babfbcaa855dfcf2ae8727f6a7a5221837127cc295a4c15dce515908418c9e052af101d6fc984c4b5ce204286b7361da29dbefad1b95603d6b1571603a0 SHA512 e14c1bf96a6010447cd13a680a87249a4e6d0661cc46b437e8b2e1098f3e80482dc9038446aad495ba72e1254e9c07e49b1ac848177b02ac36e10710fcd06413
diff --git a/dev-java/bcprov/bcprov-1.78.1.ebuild b/dev-java/bcprov/bcprov-1.78.1.ebuild
deleted file mode 100644
index ead554fcdd3a..000000000000
--- a/dev-java/bcprov/bcprov-1.78.1.ebuild
+++ /dev/null
@@ -1,106 +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="org.bouncycastle:bcprov-jdk18on:${PV}"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple check-reqs
-
-DESCRIPTION="Java cryptography APIs"
-HOMEPAGE="https://www.bouncycastle.org/java.html"
-MY_PV="r$(ver_rs 1 'rv' 2 'v')"
-SRC_URI="https://github.com/bcgit/bc-java/archive/${MY_PV}.tar.gz -> bc-java-${MY_PV}.tar.gz
- test? ( https://github.com/bcgit/bc-test-data/archive/${MY_PV}.tar.gz -> bc-test-data-${MY_PV}.tar.gz )"
-S="${WORKDIR}/bc-java-${MY_PV}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm64 ppc64"
-
-DEPEND=">=virtual/jdk-11:*"
-RDEPEND=">=virtual/jre-1.8:*"
-
-DOCS=( {README,SECURITY}.md )
-HTML_DOCS=( {CONTRIBUTORS,index}.html )
-
-check_env() {
- if use test; then
- # this is needed only for tests
- CHECKREQS_MEMORY="2048M"
- check-reqs_pkg_pretend
- fi
-}
-
-pkg_pretend() {
- check_env
-}
-
-pkg_setup() {
- check_env
- java-pkg-2_pkg_setup
-}
-
-src_unpack() {
- unpack bc-java-${MY_PV}.tar.gz
- use test && unpack bc-test-data-${MY_PV}.tar.gz
-}
-
-src_prepare() {
- java-pkg-2_src_prepare
- # TBD: unboundid-ldapsdk should be packaged from source.
- java-pkg_clean ! -path "./libs/unboundid-ldapsdk-6.0.8.jar"
-}
-
-src_compile() {
- JAVA_RESOURCE_DIRS=(
- "core/src/main/resources"
- "prov/src/main/resources"
- )
- JAVA_SRC_DIR=(
- "core/src/main/java"
- "prov/src/main/java"
- "prov/src/main/jdk1.9"
- )
- java-pkg-simple_src_compile
-}
-
-src_test() {
- mv ../bc-test-data-${MY_PV} bc-test-data || die "cannot move bc-test-data"
-
- JAVA_TEST_EXTRA_ARGS="-Dtest.java.version.prefix=$(java-config -g PROVIDES_VERSION)"
- JAVA_TEST_EXTRA_ARGS+=" -Dbc.test.data.home=${S}/core/src/test/data"
- JAVA_TEST_EXTRA_ARGS+=" -Xmx${CHECKREQS_MEMORY}"
- JAVA_TEST_GENTOO_CLASSPATH="junit-4"
-
- einfo "Testing \"core\""
- JAVA_TEST_RESOURCE_DIRS="core/src/test/resources"
- JAVA_TEST_SRC_DIR="core/src/test/java"
- pushd core/src/test/java || die
- local JAVA_TEST_RUN_ONLY=$(find * \
- -name "AllTests.java" )
- popd || die
- JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}"
- JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}"
- java-pkg-simple_src_test
-
- einfo "Testing bcprov"
- JAVA_GENTOO_CLASSPATH_EXTRA=":core.jar:libs/unboundid-ldapsdk-6.0.8.jar"
- JAVA_TEST_RESOURCE_DIRS="prov/src/test/resources"
- JAVA_TEST_SRC_DIR="prov/src/test/java"
- pushd prov/src/test/java || die
- local JAVA_TEST_RUN_ONLY=$(find * \
- -name "AllTests.java" )
- popd || die
- JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}"
- JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}"
- java-pkg-simple_src_test
-}
-
-src_install() {
- docinto html
- dodoc -r docs
- java-pkg-simple_src_install
-}
diff --git a/dev-java/bcprov/bcprov-1.79.ebuild b/dev-java/bcprov/bcprov-1.79.ebuild
index ee9f4a32cc02..70ba74807cc8 100644
--- a/dev-java/bcprov/bcprov-1.79.ebuild
+++ b/dev-java/bcprov/bcprov-1.79.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/bc-java-${MY_PV}"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="amd64 arm64 ~ppc64"
+KEYWORDS="amd64 arm64 ppc64"
DEPEND=">=virtual/jdk-11:*"
RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/bcutil/Manifest b/dev-java/bcutil/Manifest
index d5ddb1650319..0f48e2de86f2 100644
--- a/dev-java/bcutil/Manifest
+++ b/dev-java/bcutil/Manifest
@@ -1,2 +1 @@
-DIST bc-java-r1rv78v1.tar.gz 47211344 BLAKE2B 6d28e69db8ad0043a5cd6c0a4f6901ff40884be4baf60ee40d4cb5487d799e6ac5ef4282b5d6e7f873e45607394890dd26e3150c9c1729bd5346d9cc8f30f240 SHA512 87e6ecd6fea47877d9d7a196f58c5b45a7f026f18f17b71d4155061fad024194c30ce0fc44ea3e879b17f310a6626407f345a8e8970781afec4551f2aa688223
DIST bc-java-r1rv79.tar.gz 47563177 BLAKE2B 7ca8b64ab004fb70399e950e8c588b19d110596790525ce30aeec3f2c6501bffd1bab6854c6bf1499f101e33e0ac8127c2cdaa34e5531c430e4f00fb145202f3 SHA512 294241371f536e8a9be8ff2307eaad433620c9becb26a00f6b225ea31488bc40dd8b01d20c18e47c105c7a8f1b2415136608d82811581fad4718db02e9c882a3
diff --git a/dev-java/bcutil/bcutil-1.78.1.ebuild b/dev-java/bcutil/bcutil-1.78.1.ebuild
deleted file mode 100644
index 888cbb5b742e..000000000000
--- a/dev-java/bcutil/bcutil-1.78.1.ebuild
+++ /dev/null
@@ -1,61 +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="org.bouncycastle:bcutil-jdk18on:${PV}"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Java APIs for ASN.1 extension and utility APIs used to support bcpkix and bctls"
-HOMEPAGE="https://www.bouncycastle.org/java.html"
-MY_PV="r$(ver_rs 1 'rv' 2 'v')"
-SRC_URI="https://github.com/bcgit/bc-java/archive/${MY_PV}.tar.gz -> bc-java-${MY_PV}.tar.gz"
-S="${WORKDIR}/bc-java-${MY_PV}/util"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm64 ppc64"
-
-CDEPEND="~dev-java/bcprov-${PV}:0"
-
-DEPEND="
- ${CDEPEND}
- >=virtual/jdk-11:*
-"
-
-RDEPEND="
- ${CDEPEND}
- >=virtual/jre-1.8:*
-"
-
-DOCS=( ../{README,SECURITY}.md )
-HTML_DOCS=( ../{CONTRIBUTORS,index}.html )
-
-JAVA_AUTOMATIC_MODULE_NAME="org.bouncycastle.util"
-JAVA_GENTOO_CLASSPATH="bcprov"
-JAVA_SRC_DIR=(
- "src/main/java"
- "src/main/jdk1.9"
-)
-
-JAVA_TEST_GENTOO_CLASSPATH="junit-4"
-JAVA_TEST_RESOURCE_DIRS="src/test/resources"
-JAVA_TEST_RUN_ONLY=(
- "org.bouncycastle.asn1.util.test.AllTests"
- "org.bouncycastle.oer.test.AllTests"
-)
-JAVA_TEST_SRC_DIR="src/test/java"
-
-src_prepare() {
- java-pkg-2_src_prepare
- java-pkg_clean ..
-}
-
-src_install() {
- docinto html
- dodoc -r ../docs
- java-pkg-simple_src_install
-}
diff --git a/dev-java/bcutil/bcutil-1.79.ebuild b/dev-java/bcutil/bcutil-1.79.ebuild
index 1fc6d548d0e0..888cbb5b742e 100644
--- a/dev-java/bcutil/bcutil-1.79.ebuild
+++ b/dev-java/bcutil/bcutil-1.79.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/bc-java-${MY_PV}/util"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="amd64 arm64 ~ppc64"
+KEYWORDS="amd64 arm64 ppc64"
CDEPEND="~dev-java/bcprov-${PV}:0"
diff --git a/dev-java/bnd-annotation/bnd-annotation-7.1.0.ebuild b/dev-java/bnd-annotation/bnd-annotation-7.1.0.ebuild
index 939ae99fc8ea..7b8979c026db 100644
--- a/dev-java/bnd-annotation/bnd-annotation-7.1.0.ebuild
+++ b/dev-java/bnd-annotation/bnd-annotation-7.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -15,7 +15,7 @@ S="${WORKDIR}/bnd-${PV/_rc/.RC}"
LICENSE="Apache-2.0 EPL-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64"
+KEYWORDS="amd64 ~arm64 ~ppc64"
DEPEND="
dev-java/osgi-cmpn:8
diff --git a/dev-java/bnd-ant/Manifest b/dev-java/bnd-ant/Manifest
index efb6528140b2..f909d128d99e 100644
--- a/dev-java/bnd-ant/Manifest
+++ b/dev-java/bnd-ant/Manifest
@@ -1,2 +1 @@
-DIST aQute.bnd-7.0.0.tar.gz 172496438 BLAKE2B a2e443b0e4a2eb278a8e1df86456fea22ffb8147adc00c9f300cbd32b226218bb64ccca3da3bcd0d79b07567a7b4cf4456b96224d6abf59486fa08ca6170d0ba SHA512 11d34a7d1a9b2fb2e8c112d414a06c281ccde9a7b06c62043e19d83e85ea64fdf022dd4493a14dd2dcf6adee392a1e9bf1ab05a6d690a328f29d7019045bca8c
DIST aQute.bnd-7.1.0.tar.gz 173448302 BLAKE2B 53c7fbbde15f27b0f96e1685ce7d4a03951360f57c9139ee36013138fae70034b0fe6b72300c2d9a0fe9dc5d2f8b5a75462e396e0383dd8b46237b43021bb35b SHA512 161a383b37cd2e6f75958d68c476c1e4fa581afc095e6c6081e4aa1822672f7ace0ec0948ee6bd5eba0c5d3490ef081bb7f4e5851ef590d4e6b9634a75963028
diff --git a/dev-java/bnd-ant/bnd-ant-7.0.0.ebuild b/dev-java/bnd-ant/bnd-ant-7.0.0.ebuild
deleted file mode 100644
index 5a039feb28ae..000000000000
--- a/dev-java/bnd-ant/bnd-ant-7.0.0.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"
-MAVEN_ID="biz.aQute.bnd:biz.aQute.bnd.ant:${PV}"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Bnd Ant Tasks"
-HOMEPAGE="https://bnd.bndtools.org/"
-SRC_URI="https://github.com/bndtools/bnd/archive/${PV}.tar.gz -> aQute.bnd-${PV}.tar.gz"
-S="${WORKDIR}/bnd-${PV}"
-
-LICENSE="Apache-2.0 EPL-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-
-DEPEND="
- dev-java/ant:0
- ~dev-java/bnd-${PV}:0
- >=virtual/jdk-17:*"
-RDEPEND=">=virtual/jre-17:*"
-
-JAVA_AUTOMATIC_MODULE_NAME="biz.aQute.bnd.ant"
-JAVA_CLASSPATH_EXTRA="
- ant
- bnd
-"
-
-JAVA_RESOURCE_DIRS="res"
-JAVA_SRC_DIR="biz.aQute.bnd.ant/src"
-
-src_prepare() {
- default #780585
- java-pkg-2_src_prepare
- mkdir res || die
-
- # java-pkg-simple wants resources in JAVA_RESOURCE_DIRS
- pushd biz.aQute.bnd.ant/src > /dev/null || die
- find -type f \
- ! -name '*.java' \
- | xargs cp --parent -t ../../res || die
- popd > /dev/null || die
-}
diff --git a/dev-java/bnd-ant/bnd-ant-7.1.0.ebuild b/dev-java/bnd-ant/bnd-ant-7.1.0.ebuild
index 4dac2056cc13..4cf40c036d62 100644
--- a/dev-java/bnd-ant/bnd-ant-7.1.0.ebuild
+++ b/dev-java/bnd-ant/bnd-ant-7.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -15,7 +15,7 @@ S="${WORKDIR}/bnd-${PV/_rc/.RC}"
LICENSE="Apache-2.0 EPL-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
DEPEND="
dev-java/ant:0
diff --git a/dev-java/bnd-util/bnd-util-7.1.0.ebuild b/dev-java/bnd-util/bnd-util-7.1.0.ebuild
index 2ba4cf1dd138..a77c7edbcdca 100644
--- a/dev-java/bnd-util/bnd-util-7.1.0.ebuild
+++ b/dev-java/bnd-util/bnd-util-7.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -15,7 +15,7 @@ S="${WORKDIR}/bnd-${PV/_rc/.RC}"
LICENSE="Apache-2.0 EPL-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
CP_DEPEND="dev-java/osgi-annotation:0"
diff --git a/dev-java/bnd/Manifest b/dev-java/bnd/Manifest
index efb6528140b2..f909d128d99e 100644
--- a/dev-java/bnd/Manifest
+++ b/dev-java/bnd/Manifest
@@ -1,2 +1 @@
-DIST aQute.bnd-7.0.0.tar.gz 172496438 BLAKE2B a2e443b0e4a2eb278a8e1df86456fea22ffb8147adc00c9f300cbd32b226218bb64ccca3da3bcd0d79b07567a7b4cf4456b96224d6abf59486fa08ca6170d0ba SHA512 11d34a7d1a9b2fb2e8c112d414a06c281ccde9a7b06c62043e19d83e85ea64fdf022dd4493a14dd2dcf6adee392a1e9bf1ab05a6d690a328f29d7019045bca8c
DIST aQute.bnd-7.1.0.tar.gz 173448302 BLAKE2B 53c7fbbde15f27b0f96e1685ce7d4a03951360f57c9139ee36013138fae70034b0fe6b72300c2d9a0fe9dc5d2f8b5a75462e396e0383dd8b46237b43021bb35b SHA512 161a383b37cd2e6f75958d68c476c1e4fa581afc095e6c6081e4aa1822672f7ace0ec0948ee6bd5eba0c5d3490ef081bb7f4e5851ef590d4e6b9634a75963028
diff --git a/dev-java/bnd/bnd-7.0.0.ebuild b/dev-java/bnd/bnd-7.0.0.ebuild
deleted file mode 100644
index fa2a82a1e3f0..000000000000
--- a/dev-java/bnd/bnd-7.0.0.ebuild
+++ /dev/null
@@ -1,100 +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"
-MAVEN_ID="biz.aQute.bnd:biz.aQute.bnd:${PV}"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="bndlib: A Swiss Army Knife for OSGi"
-HOMEPAGE="https://bnd.bndtools.org/"
-SRC_URI="https://github.com/bndtools/bnd/archive/${PV}.tar.gz -> aQute.bnd-${PV}.tar.gz"
-S="${WORKDIR}/${P}"
-
-LICENSE="Apache-2.0 EPL-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-
-BDEPEND="app-arch/zip"
-
-CP_DEPEND="
- ~dev-java/bndlib-${PV}:0
- dev-java/felix-resolver:0
- dev-java/guava:0
- dev-java/javaparser-core:0
- dev-java/jline:2
- dev-java/jtwig-core:0
- dev-java/osgi-annotation:0
- dev-java/osgi-cmpn:8
- dev-java/osgi-core:0
- dev-java/slf4j-simple:0
- dev-java/snakeyaml:0
- dev-java/xz-java:0
-"
-
-DEPEND="${CP_DEPEND}
- dev-java/commons-lang:3.6
- dev-java/eclipse-jdt-annotation:0
- dev-java/felix-gogo-runtime:0
- dev-java/slf4j-api:0
- dev-java/jtwig-reflection:0
- dev-java/osgi-service-log:0
- dev-java/osgi-service-subsystem:0
- >=virtual/jdk-17:*"
-
-RDEPEND="${CP_DEPEND}
- >=virtual/jre-17:*"
-
-PATCHES=(
- "${FILESDIR}/bnd-7.0.0-aQute.bnd.main.bnd.patch"
-)
-
-JAVA_AUTOMATIC_MODULE_NAME="biz.aQute.bnd"
-JAVA_CLASSPATH_EXTRA="
- commons-lang-3.6
- eclipse-jdt-annotation
- jtwig-reflection
- felix-gogo-runtime
- osgi-service-subsystem
- slf4j-api
-"
-JAVA_MAIN_CLASS="aQute.bnd.main.bnd"
-JAVA_RESOURCE_DIRS="res"
-JAVA_SRC_DIR=(
- "biz.aQute.bnd.exporters/src"
- "biz.aQute.bnd.reporter/src"
- "biz.aQute.bnd/src"
- "biz.aQute.remote/src"
- "biz.aQute.repository/src"
- "biz.aQute.resolve/src"
-)
-
-src_prepare() {
- default #780585
- java-pkg-2_src_prepare
- mkdir res || die
-
- # java-pkg-simple wants resources in JAVA_RESOURCE_DIRS
- pushd biz.aQute.bnd/src > /dev/null || die
- find -type f \
- ! -name '*.java' \
- | xargs cp --parent -t ../../res || die
- popd > /dev/null || die
-}
-
-src_compile() {
- # There is another version of osgi-service-log in osgi-core-0
- JAVA_GENTOO_CLASSPATH_EXTRA=":$(java-pkg_getjars --build-only osgi-service-log)"
- java-pkg-simple_src_compile
-
- # remove classes which are not in upstream's jar file
- zip -d ${PN}.jar \
- "*/remote/agent/*" \
- "*/remote/embedded/*" \
- "*/remote/main/*" \
- "*/remote/plugin/*" \
- "*/remote/test/*" \
- || die
-}
diff --git a/dev-java/bnd/bnd-7.1.0.ebuild b/dev-java/bnd/bnd-7.1.0-r1.ebuild
index 8a0cc65df29a..b7a5ea224d45 100644
--- a/dev-java/bnd/bnd-7.1.0.ebuild
+++ b/dev-java/bnd/bnd-7.1.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -15,7 +15,7 @@ S="${WORKDIR}/${P/_rc/.RC}"
LICENSE="Apache-2.0 EPL-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
BDEPEND="app-arch/zip"
@@ -23,7 +23,7 @@ CP_DEPEND="
~dev-java/bndlib-${PV}:0
dev-java/felix-resolver:0
dev-java/guava:0
- dev-java/javaparser-core:0
+ <=dev-java/javaparser-core-3.13.10:0
dev-java/jline:2
dev-java/jtwig-core:0
dev-java/osgi-annotation:0
diff --git a/dev-java/bndlib/bndlib-7.0.0.ebuild b/dev-java/bndlib/bndlib-7.0.0.ebuild
index e699671229c9..621bb7bd3c4c 100644
--- a/dev-java/bndlib/bndlib-7.0.0.ebuild
+++ b/dev-java/bndlib/bndlib-7.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -15,7 +15,7 @@ S="${WORKDIR}/bnd-${PV}"
LICENSE="Apache-2.0 EPL-2.0"
SLOT="0"
-KEYWORDS="amd64 arm64 ppc64"
+KEYWORDS="amd64 ppc64"
CP_DEPEND="
~dev-java/bnd-annotation-${PV}:0
diff --git a/dev-java/bndlib/bndlib-7.1.0.ebuild b/dev-java/bndlib/bndlib-7.1.0.ebuild
index 532ebab39fd4..fca4c94c6ffb 100644
--- a/dev-java/bndlib/bndlib-7.1.0.ebuild
+++ b/dev-java/bndlib/bndlib-7.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -15,7 +15,7 @@ S="${WORKDIR}/bnd-${PV/_rc/.RC}"
LICENSE="Apache-2.0 EPL-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
CP_DEPEND="
~dev-java/bnd-annotation-${PV}:0
diff --git a/dev-java/byte-buddy/Manifest b/dev-java/byte-buddy/Manifest
index 9fc8709af89a..b9be7b28c952 100644
--- a/dev-java/byte-buddy/Manifest
+++ b/dev-java/byte-buddy/Manifest
@@ -1,3 +1,2 @@
-DIST byte-buddy-1.14.0.tar.gz 1989303 BLAKE2B c284f54ebc6bf67e4706380f0876f403fcf5ae172a690888d13d6b3399cf41bf1fd8890bf15059f71a9457ec6343254ad1f421f8e4975aa70dd9a2103ab59610 SHA512 e6ccda287935b5ff7104d5c0e4904b0595918a21bcc90c6ac5b2358cc0371b22a4fcac2a95dde9e377c5d1e43077c8b57ea9520a9093b2380ab53c830f107ced
DIST byte-buddy-1.15.10.tar.gz 2057524 BLAKE2B 7f5e178b3ea31fb30379e49d69f34ba1b9953d705a54c3609bb771f66962af776dee95ea10ab7049e50351362ff87c164782bc4b1b782985ac8f122e5833cb4e SHA512 3b7a02475433193efe8a8e20378369ec18f10c81dd90b428d5393c45fe261f678b1707c92923381b8a3030f8a2e8525fe95e3337ca7e5455cdc5fc2647416d2a
DIST byte-buddy-1.15.11.tar.gz 2059994 BLAKE2B b5b11de938d2b96518c01cf1bcebb0f34ca6ccdb81e519e0177fa371f438da9ca5aba5749d1a7af0f42a2359c55228f3cbfbfe32f158d4a18fe7f02a5d5bf4f2 SHA512 9e663dfee80e6ae9e4983a39177a94f160e52e3ef1dec54b8f6a90e32c18ae5b36c9e791fd605b43754b2667f6efd7e15a1f7b0ce6c5034945567aef8a6b8aa8
diff --git a/dev-java/byte-buddy/byte-buddy-1.14.0.ebuild b/dev-java/byte-buddy/byte-buddy-1.14.0.ebuild
deleted file mode 100644
index 13232b00c524..000000000000
--- a/dev-java/byte-buddy/byte-buddy-1.14.0.ebuild
+++ /dev/null
@@ -1,161 +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/raphw/byte-buddy/archive/byte-buddy-1.12.23.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild byte-buddy-1.12.23.ebuild
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_PROVIDES="net.bytebuddy:byte-buddy-agent:1.12.23 net.bytebuddy:byte-buddy:1.12.23"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Offers convenience for attaching an agent to the local or a remote VM"
-HOMEPAGE="https://bytebuddy.net"
-SRC_URI="https://github.com/raphw/byte-buddy/archive/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm64 ppc64"
-
-DEPEND="
- >=virtual/jdk-11:*
- dev-java/asm:9
- dev-java/findbugs-annotations:0
- dev-java/jna:4
- dev-java/jsr305:0
- test? (
- dev-java/mockito:4
- )
-"
-
-RDEPEND=">=virtual/jre-1.8:*"
-
-S="${WORKDIR}/byte-buddy-${P}"
-
-JAVA_CLASSPATH_EXTRA="
- asm-9
- findbugs-annotations
- jsr305
- jna-4
-"
-
-src_prepare() {
- default
- # https://github.com/raphw/byte-buddy/blob/byte-buddy-1.12.20/byte-buddy-agent/pom.xml#L142-L176
- cat > byte-buddy-agent/src/main/java/module-info.java <<-EOF || die
- module net.bytebuddy.agent {
- requires java.instrument;
- requires static jdk.attach;
- requires static com.sun.jna;
- requires static com.sun.jna.platform;
- requires java.base;
- exports net.bytebuddy.agent;
- exports net.bytebuddy.agent.utility.nullability;
- }
- EOF
-
- # instead of shading byte-buddy-dep we move it into byte-buddy.
- mv byte-buddy{-dep,}/src/main/java || die "cannot move sources"
-
- # https://github.com/raphw/byte-buddy/blob/byte-buddy-1.12.20/byte-buddy/pom.xml#L159-L195
- local exports="$( \
- sed -n '/<packages.list.external>/,/<\/packages.list.external/p' \
- byte-buddy/pom.xml \
- | sed -e 's:^:exports :' -e 's:,:;:' \
- | grep -v 'packages.list.external\|shade' | tr -s '[:space:]' \
- )" || die
- cat > byte-buddy/src/main/java/module-info.java <<-EOF || die
- module net.bytebuddy {
- requires static java.instrument;
- requires static java.management;
- requires static jdk.unsupported;
- requires static net.bytebuddy.agent;
- requires static com.sun.jna;
- requires static com.sun.jna.platform;
- requires java.base;
- ${exports}
- }
- EOF
-}
-
-src_compile() {
- einfo "Compiling byte-buddy-agent.jar"
- JAVA_JAR_FILENAME="byte-buddy-agent.jar"
- JAVA_RESOURCE_DIRS="byte-buddy-agent/src/main/resources"
- JAVA_SRC_DIR="byte-buddy-agent/src/main/java"
- java-pkg-simple_src_compile
- JAVA_GENTOO_CLASSPATH_EXTRA+=":byte-buddy-agent.jar"
- rm -r target || die
-
- einfo "Compiling byte-buddy.jar"
- JAVA_JAR_FILENAME="byte-buddy.jar"
- JAVA_MAIN_CLASS="net.bytebuddy.build.Plugin\$Engine\$Default"
- JAVA_RESOURCE_DIRS=()
- JAVA_SRC_DIR="byte-buddy/src/main/java"
- java-pkg-simple_src_compile
- JAVA_GENTOO_CLASSPATH_EXTRA+=":byte-buddy.jar"
- rm -r target || die
-
- if use doc; then
- einfo "Compiling javadocs"
- rm byte-buddy-agent/src/main/java/module-info.java || die
- JAVA_SRC_DIR=(
- "byte-buddy-agent/src/main/java"
- "byte-buddy/src/main/java"
- )
- JAVA_JAR_FILENAME="ignoreme.jar"
- java-pkg-simple_src_compile
- fi
-}
-
-src_test() {
- # instead of shading byte-buddy-dep we move it into byte-buddy.
- mv byte-buddy{-dep,}/src/test || die "cannot move tests"
-
- # @Ignore one of 4 tests, https://bugs.gentoo.org/863386
- sed \
- -e '/import org.junit.Test/a import org.junit.Ignore;' \
- -e '/testIgnoreExistingField()/i @Ignore' \
- -i byte-buddy/src/test/java/net/bytebuddy/build/CachedReturnPluginOtherTest.java || die
-
- # @Ignore one of 39 tests, https://bugs.gentoo.org/863386
- sed \
- -e '/import org.junit.Test/a import org.junit.Ignore;' \
- -e '/testNoParameterNameAndModifiers()/i @Ignore' \
- -i byte-buddy/src/test/java/net/bytebuddy/description/method/AbstractMethodDescriptionTest.java || die
-
- JAVA_TEST_GENTOO_CLASSPATH="junit-4,mockito-4"
-
- einfo "Testing byte-buddy-agent"
- # https://github.com/raphw/byte-buddy/issues/1321#issuecomment-1252776459
- JAVA_TEST_EXTRA_ARGS=( -Dnet.bytebuddy.test.jnapath="${EPREFIX}/usr/$(get_libdir)/jna-4/" )
- JAVA_TEST_SRC_DIR="byte-buddy-agent/src/test/java"
- java-pkg-simple_src_test
-
- einfo "Testing byte-buddy"
- JAVA_TEST_RESOURCE_DIRS=( byte-buddy/src/test/{resources,precompiled*} )
- JAVA_TEST_SRC_DIR="byte-buddy/src/test/java"
-
- JAVA_TEST_EXCLUDES=(
- # all tests in this class fail, https://bugs.gentoo.org/863386
- net.bytebuddy.build.CachedReturnPluginTest
- )
- java-pkg-simple_src_test
-}
-
-src_install() {
- java-pkg_dojar "byte-buddy-agent.jar"
- java-pkg_dojar "byte-buddy.jar"
-
- if use doc; then
- java-pkg_dojavadoc target/api
- fi
-
- if use source; then
- java-pkg_dosrc "byte-buddy-agent/src/main/java/*"
- java-pkg_dosrc "byte-buddy/src/main/java/*"
- fi
-}
diff --git a/dev-java/byte-buddy/byte-buddy-1.15.10.ebuild b/dev-java/byte-buddy/byte-buddy-1.15.10.ebuild
index a1021afe6a00..f082462e97d5 100644
--- a/dev-java/byte-buddy/byte-buddy-1.15.10.ebuild
+++ b/dev-java/byte-buddy/byte-buddy-1.15.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -16,7 +16,7 @@ S="${WORKDIR}/byte-buddy-${P}"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64"
+KEYWORDS="amd64 arm64 ppc64"
DEPEND="
>=dev-java/asm-9.7.1:9
diff --git a/dev-java/caffeine/Manifest b/dev-java/caffeine/Manifest
index 2602d39646eb..4448aeb74435 100644
--- a/dev-java/caffeine/Manifest
+++ b/dev-java/caffeine/Manifest
@@ -1,2 +1 @@
-DIST caffeine-2.6.2-sources.jar 715580 BLAKE2B 882cac33d205c8186232c64010b4e25e805d3d188d6a9e6ca151187b55d5ee3a3d5641566f5e8d32de596fab3dae8967c74f3d60e2321b34374ce996382322fe SHA512 52a8c67648e2a6bb1c600d99712473a64911f2b6c8fe6c924ba98e72b4b040a1094fa5c93ae2bae8734d352634bc72960711afd152566ef02f6bad4c84e510c8
DIST caffeine-2.9.3-sources.jar 730835 BLAKE2B 5864ead593cb46caa23aac18fb424429009dbe5f9a70bb95bd16d73181f57ec5cd8ce1110af6e8766e757e5ea8a546c8eef4d4c26dced12722ff05f7278e0939 SHA512 e9b479ce30d4fc6337fef3a03a149c5fb2bfa48dbe0845374baf62e9b91049b8badbc5543d135b3473cf0c7bfd2b3717254376b55005ca301ce804537f879c48
diff --git a/dev-java/caffeine/caffeine-2.6.2-r1.ebuild b/dev-java/caffeine/caffeine-2.6.2-r1.ebuild
deleted file mode 100644
index 600b25a150e4..000000000000
--- a/dev-java/caffeine/caffeine-2.6.2-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source"
-MAVEN_ID="com.github.ben-manes.caffeine:caffeine:${PV}"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="A high performance caching library"
-HOMEPAGE="https://github.com/ben-manes/caffeine"
-SRC_URI="https://repo1.maven.org/maven2/com/github/ben-manes/caffeine/caffeine/${PV}/caffeine-${PV}-sources.jar"
-# Compiling from Github tarball would require to be packaged at least
-# package com.squareup.javapoet
-# package MethodSpec
-# package TypeSpec
-# SRC_URI="https://github.com/ben-manes/caffeine/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-# S="${WORKDIR}/${P}/caffeine"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc64"
-
-BDEPEND="app-arch/unzip"
-CP_DEPEND="dev-java/jsr305:0"
-# min java 11 for bug #919464
-DEPEND="${CP_DEPEND}
- >=virtual/jdk-11:*"
-RDEPEND="${CP_DEPEND}
- >=virtual/jre-1.8:*"
-
-JAVA_AUTOMATIC_MODULE_NAME="com.github.benmanes.caffeine"
diff --git a/dev-java/caffeine/caffeine-2.9.3.ebuild b/dev-java/caffeine/caffeine-2.9.3.ebuild
index 12549520678d..6a37ed9e67ab 100644
--- a/dev-java/caffeine/caffeine-2.9.3.ebuild
+++ b/dev-java/caffeine/caffeine-2.9.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2023-2024 Gentoo Authors
+# Copyright 2023-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -20,7 +20,7 @@ SRC_URI="https://repo1.maven.org/maven2/com/github/ben-manes/caffeine/caffeine/$
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64"
+KEYWORDS="amd64 ~arm64 ppc64"
BDEPEND="app-arch/unzip"
CP_DEPEND="
diff --git a/dev-java/cglib/cglib-3.3.0-r3.ebuild b/dev-java/cglib/cglib-3.3.0-r3.ebuild
new file mode 100644
index 000000000000..32dcc2c635c1
--- /dev/null
+++ b/dev-java/cglib/cglib-3.3.0-r3.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# doc USE flag is not in IUSE as the docs does not compile because of errors
+JAVA_PKG_IUSE="examples source test"
+MAVEN_ID="cglib:cglib:3.3.0"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_PV=RELEASE_${PV//./_}
+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="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64"
+
+CP_DEPEND="
+ >=dev-java/ant-1.10.14-r3:0
+ >=dev-java/asm-9.7.1_p20241213:0
+"
+DEPEND="
+ >=virtual/jdk-1.8:*
+ ${CP_DEPEND}
+"
+RDEPEND="
+ >=virtual/jre-1.8:*
+ ${CP_DEPEND}
+"
+
+JAVA_SRC_DIR="${MY_P}/${PN}/src/main/java"
+JAVA_RESOURCE_DIRS="${MY_P}/${PN}/src/main/resources"
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_SRC_DIR="${MY_P}/${PN}/src/test/java"
+JAVA_TEST_EXCLUDES=(
+ "net.sf.cglib.CodeGenTestCase" # not a test class
+ "net.sf.cglib.TestAll"
+ "net.sf.cglib.TestGenerator" # not a test class
+ "net.sf.cglib.proxy.TestEnhancer" # broken tests
+ "net.sf.cglib.proxy.TestInterceptor" # not a test class
+ "net.sf.cglib.reflect.TestFastClass" # broken tests
+)
+
+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
+
+ local vm_version="$(java-config -g PROVIDES_VERSION)"
+ if ver_test "${vm_version}" -ge "17" ; then
+ JAVA_TEST_EXTRA_ARGS+=( --add-opens=java.base/java.lang=ALL-UNNAMED )
+ fi
+
+ java-pkg-simple_src_test
+}
+
+src_install() {
+ java-pkg-simple_src_install
+
+ use examples && java-pkg_doexamples --subdir samples ${MY_P}/cglib-sample/src/main/java
+}
diff --git a/dev-java/checker-framework-qual/Manifest b/dev-java/checker-framework-qual/Manifest
index 4db3e92f52fb..d6f41fa35595 100644
--- a/dev-java/checker-framework-qual/Manifest
+++ b/dev-java/checker-framework-qual/Manifest
@@ -1,2 +1,3 @@
DIST checker-framework-3.47.0.tar.gz 8335232 BLAKE2B 4b6d8f5bb055402e6b368640eb42e4e13173dc847a4b8145e7c306856cab2151c17bfbd2c3a645708e9b7525a1e3f73d4c28c3ae24d038ac0c3119d8fcf671df SHA512 17188ab83ee8c91fb112ed0f750611c7fb5fc17f80a0bbd9b19f1514902770c2a227cf879fb581c8c915fa9827febaa8e67a0188c70df625268118344a281fbd
DIST checker-framework-3.48.3.tar.gz 8345833 BLAKE2B 6c3f2c641414a7cb388ee2ed672a572ca40157e89976f472c58d1a04d74ec2e24893421757fea1bbaee9791e7fbb6d617cba1c5cdda284debd87250299820518 SHA512 a0a41e7bd70d85b8dcb23d358c0a6f10884f4e119e5ae5e1d17c283beab02ba4183f56b4a07d88e9e30bb4b25ebbd003bde2ecf399bf647d23e46869d414e2d6
+DIST checker-framework-3.48.4.tar.gz 8347976 BLAKE2B 29a874f406ca20d12563950e6f7603c94e8c0672871ec8c3f05bc7f37629cc7fc26ae8743283e55cc69f4eb8c40e1e8fc123ba636d19bba3084cd9f1b36a8b0c SHA512 6495e328c041e0b5fc0fddfc4e5811171531933e7154f95eb39113d7aaa78b08a83860426406f66461614f53c024a55a9486a3dd736bc04fb9c306ab3349157f
diff --git a/dev-java/checker-framework-qual/checker-framework-qual-3.48.3.ebuild b/dev-java/checker-framework-qual/checker-framework-qual-3.48.3.ebuild
index 5444f35ed4dc..cfcc7c1b8c23 100644
--- a/dev-java/checker-framework-qual/checker-framework-qual-3.48.3.ebuild
+++ b/dev-java/checker-framework-qual/checker-framework-qual-3.48.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -15,7 +15,7 @@ S="${WORKDIR}/checker-framework-checker-framework-${PV}/checker-qual"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64"
+KEYWORDS="~amd64 arm64 ~ppc64"
DEPEND=">=virtual/jdk-11:*" # module-info
RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/checker-framework-qual/checker-framework-qual-3.48.4.ebuild b/dev-java/checker-framework-qual/checker-framework-qual-3.48.4.ebuild
new file mode 100644
index 000000000000..435d4b3f0da2
--- /dev/null
+++ b/dev-java/checker-framework-qual/checker-framework-qual-3.48.4.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="org.checkerframework:checker-qual:${PV}"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Annotations for type-checking by the Checker Framework"
+HOMEPAGE="https://checkerframework.org/"
+SRC_URI="https://github.com/typetools/checker-framework/archive/checker-framework-${PV}.tar.gz"
+S="${WORKDIR}/checker-framework-checker-framework-${PV}/checker-qual"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64"
+
+DEPEND=">=virtual/jdk-11:*" # module-info
+RDEPEND=">=virtual/jre-1.8:*"
+
+JAVA_SRC_DIR="src/main/java"
diff --git a/dev-java/commons-io/Manifest b/dev-java/commons-io/Manifest
index 636409e7d7c3..70fcc8f9d7a4 100644
--- a/dev-java/commons-io/Manifest
+++ b/dev-java/commons-io/Manifest
@@ -1,4 +1,2 @@
-DIST commons-io-2.17.0-src.tar.gz 652908 BLAKE2B c87f10584d7933215aa24e8bde1037eced0738098149e9423371a1fef0255e36e38a6c92cdafd75eecbf56d13c4c38d479fe2706afc86224900fcaf7cae5e5f5 SHA512 5681b7bab9e34e9051e4f7a48925ecdf5d8814894c2626298dfca7aa0566c2dc46c15843850e3e14a3e05613ae9ef9fd08077042931e2fe552057f9c1bee6b69
-DIST commons-io-2.17.0-src.tar.gz.asc 488 BLAKE2B 451dcfbc952994a2402a7657fb0702572c8873c977681236c26326eec15316d543a39a48530760cf8a7c8b8469c7d18b1a7f88a80ab096d1604c33ec050c9b27 SHA512 8708d9cd17a2805c385006fbd5d0db883b593c67ff4afaaac507ca2dbe9f4b2e51cc1c492577b2e2cc6151a766264f1b3cd7c4b526fe16afa814d7ae29d2722c
DIST commons-io-2.18.0-src.tar.gz 670984 BLAKE2B 3d8ffbd602cf31e89cb42059e9a7f836d46baaf687662a44dd1d110978faa6926008ba5efcbf55e4f89138c5782be848bf8d1ccb5ed4ef10bb3bdbb750905b4d SHA512 0abc1dc252a72825c5256793780a6e1fa91b8a60436bf6badab1eba8a41f44e1e69b2b90b44c641ddfb78c28f95848e13ffc611793dedf68751bbb5272f86f85
DIST commons-io-2.18.0-src.tar.gz.asc 488 BLAKE2B 2c88e3374a839fb58ef25422c33e120699b319ebdf2baa8f72180e0db8089a4b9b851fc648c0508aad9c7707c463fbb9b849b3eaf545f101195083a4dffae160 SHA512 8101ffb12f3253e71f0234eb8a5a04d88bc7e8777cabfc88ac64f50b416dd6b4be28f8dfd14d09a97a63257c159fab4b512584085550ce965fcfd97cdb637a9e
diff --git a/dev-java/commons-io/commons-io-2.17.0.ebuild b/dev-java/commons-io/commons-io-2.17.0.ebuild
deleted file mode 100644
index 68c6d5fe4ea6..000000000000
--- a/dev-java/commons-io/commons-io-2.17.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# No tests, #839681
-JAVA_PKG_IUSE="doc source"
-MAVEN_ID="commons-io:commons-io:${PV}"
-
-inherit java-pkg-2 java-pkg-simple verify-sig
-
-DESCRIPTION="Utility classes, stream implementations, file filters, and much more"
-HOMEPAGE="https://commons.apache.org/proper/commons-io/"
-SRC_URI="mirror://apache/commons/io/source/${P}-src.tar.gz
- verify-sig? ( https://archive.apache.org/dist/commons/io/source/${P}-src.tar.gz.asc )"
-S="${WORKDIR}/${P}-src"
-
-LICENSE="Apache-2.0"
-SLOT="1"
-KEYWORDS="amd64 arm64 ppc64 ~amd64-linux ~x86-linux ~ppc-macos"
-
-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-11:*" # module-info
-RDEPEND=">=virtual/jre-1.8:*"
-
-JAVA_SRC_DIR="src/main/java"
-
-src_compile() {
- JAVA_JAR_FILENAME="org.apache.${PN}.jar"
- java-pkg-simple_src_compile # creates a legacy jar file without module-info
-
- jdeps --generate-module-info \
- src/main/java \
- --multi-release 9 \
- "${JAVA_JAR_FILENAME}" || die
-
- JAVA_JAR_FILENAME="${PN}.jar"
- java-pkg-simple_src_compile # creates the final jar file including module-info
-}
diff --git a/dev-java/commons-io/commons-io-2.18.0.ebuild b/dev-java/commons-io/commons-io-2.18.0.ebuild
index 56e38e5d6014..68c6d5fe4ea6 100644
--- a/dev-java/commons-io/commons-io-2.18.0.ebuild
+++ b/dev-java/commons-io/commons-io-2.18.0.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${P}-src"
LICENSE="Apache-2.0"
SLOT="1"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 arm64 ppc64 ~amd64-linux ~x86-linux ~ppc-macos"
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-logging/Manifest b/dev-java/commons-logging/Manifest
index 7e4642ee4d7d..871372457348 100644
--- a/dev-java/commons-logging/Manifest
+++ b/dev-java/commons-logging/Manifest
@@ -1,4 +1,2 @@
-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
DIST commons-logging-1.3.4-src.tar.gz 195717 BLAKE2B ba691ea0033c14f54fcb525faeadd4b330e063f73175c5ee40a4f50f159f1b264efb9f40661c4af3902ddca7d43f8f9b84e7a77bf1eeb3b237b31f566fc98aab SHA512 a4049d8d7ea0d97f337e169fa5f572e32be1882e07102ab004d8b2de74170cb075a251ee9603590d6e10bee5933651e8e33e108a734fc100e8b2d5acd669cb44
DIST commons-logging-1.3.4-src.tar.gz.asc 488 BLAKE2B a9cdc993891ff39bb8ebeaa3eefdecee1adb062ed77449dfa1dad75a43cf5aa5678f014d24765ebff7b761498abfc795d3bb68359a73f8de98cb4ac115cb68da SHA512 1c132b87f03ca54887172e45c36e1d8c66d4f12a2a6a2da84e0d6cf3ac2cd2366193829fac0393837371bc1cd34215cd6318c9e7ea6c406c11d9f0dce28b3143
diff --git a/dev-java/commons-logging/commons-logging-1.3.1.ebuild b/dev-java/commons-logging/commons-logging-1.3.1.ebuild
deleted file mode 100644
index 5c2c4113e057..000000000000
--- a/dev-java/commons-logging/commons-logging-1.3.1.ebuild
+++ /dev/null
@@ -1,153 +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="commons-logging:commons-logging:${PV}"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-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/"
-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 arm64 ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="log4j"
-
-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
- )"
-
-DEPEND="${COMMON_DEPEND}
- >=virtual/jdk-11:*"
-
-RDEPEND="${COMMON_DEPEND}
- >=virtual/jre-1.8:*"
-
-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_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() {
- java-pkg-simple_src_compile
-
- pushd target/classes > /dev/null || die
-
- # Need Automatic-Module-Name also for the other JAR files
- jar xvf ../../commons-logging.jar META-INF/MANIFEST.MF || die
-
- # 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
-
- # 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' \
- ! -name 'LogFactoryImpl*.class' \
- ) || die
-
- popd > /dev/null || die
-}
-
-src_test() {
- # Do not run Log4j tests because these tests use an Appender to verify
- # logging correctness. The log4j-12-api bridge no longer supports using an
- # Appender for verifications since the methods for adding an Appender in
- # the bridge "are largely no-ops". This means an Appender's state would
- # never be changed by log4j-12-api after new messages are logged. The test
- # cases, however, expect changes to the Appender's state in such an event,
- # so they would fail with log4j-12-api.
- # https://logging.apache.org/log4j/log4j-2.8/log4j-1.2-api/index.html
- 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.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 jakarta-servlet-api-4)"
- -Dcommons-logging="commons-logging.jar"
- -Dcommons-logging-api="commons-logging-api.jar"
- -Dcommons-logging-adapters="commons-logging-adapters.jar"
- -Dtestclasses="target/test-classes"
- )
- if use log4j; then
- JAVA_TEST_EXTRA_ARGS+=" -Dlog4j12=$(java-pkg_getjars log4j-12-api-2,log4j-core-2)"
- fi
- JAVA_TEST_GENTOO_CLASSPATH="junit-4"
- JAVA_TEST_RESOURCE_DIRS="src/test/resources"
- JAVA_TEST_SRC_DIR="src/test/java"
- java-pkg-simple_src_test
-}
-
-src_install() {
- java-pkg-simple_src_install
- java-pkg_dojar commons-logging-api.jar commons-logging-adapters.jar
-}
diff --git a/dev-java/commons-logging/commons-logging-1.3.4-r1.ebuild b/dev-java/commons-logging/commons-logging-1.3.4-r1.ebuild
index a5429bc2802e..b8e7eed45094 100644
--- a/dev-java/commons-logging/commons-logging-1.3.4-r1.ebuild
+++ b/dev-java/commons-logging/commons-logging-1.3.4-r1.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${P}-src"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 arm64 ~ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 arm64 ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
IUSE="log4j"
# src/test/java/org/apache/commons/logging/tccl/logfactory/AdaptersTcclTestCase.java:26:
diff --git a/dev-java/commons-vfs/commons-vfs-2.0-r4.ebuild b/dev-java/commons-vfs/commons-vfs-2.0-r4.ebuild
index a0badac9a380..f83938ac5b4d 100644
--- a/dev-java/commons-vfs/commons-vfs-2.0-r4.ebuild
+++ b/dev-java/commons-vfs/commons-vfs-2.0-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -14,7 +14,7 @@ S="${WORKDIR}/${P}/core"
LICENSE="Apache-2.0"
SLOT="2"
-KEYWORDS="amd64 arm64 ppc64 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc64 ~amd64-linux ~x86-linux"
CP_DEPEND="
>=dev-java/ant-1.10.14-r3:0
diff --git a/dev-java/easymock/easymock-3.3.1-r2.ebuild b/dev-java/easymock/easymock-3.3.1-r2.ebuild
new file mode 100644
index 000000000000..721625b7729b
--- /dev/null
+++ b/dev-java/easymock/easymock-3.3.1-r2.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="org.easymock:easymock:3.3.1"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Mock Objects for interfaces in JUnit tests by generating them on the fly"
+HOMEPAGE="https://easymock.org/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/refs/tags/${P}.tar.gz"
+S="${WORKDIR}/${PN}-${P}"
+
+LICENSE="Apache-2.0"
+SLOT="3.2"
+KEYWORDS="~amd64 ~arm64 ~ppc64"
+
+CDEPEND="
+ >=dev-java/cglib-3.3.0-r3:0
+ dev-java/junit:4
+ dev-java/objenesis:0
+"
+
+DEPEND="
+ >=virtual/jdk-1.8:*
+ ${CDEPEND}
+"
+
+RDEPEND="
+ >=virtual/jre-1.8:*
+ ${CDEPEND}
+"
+
+JAVA_ENCODING="ISO-8859-1"
+
+JAVA_GENTOO_CLASSPATH="cglib,junit-4,objenesis"
+JAVA_SRC_DIR=(
+ "${PN}/src/main/java"
+ "${PN}/src/samples/java"
+)
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_SRC_DIR="${PN}/src/test/java"
+JAVA_TEST_EXCLUDES=(
+ "org.easymock.tests2.EasyMockAnnotationsTest" # "java.lang.InstantiationException" (12 x)
+ "org.easymock.tests.BaseEasyMockRunnerTest" # No runnable methods
+)
+
+src_prepare() {
+ default
+ # error: package com.google.dexmaker.stock does not exist
+ eapply "${FILESDIR}"/3.3.1-r1-no-android.patch
+ rm easymock/src/main/java/org/easymock/internal/AndroidClassProxyFactory.java || die
+ # cannot find symbol o = ProxyBuilder.forClass(ArrayList.class)
+ rm easymock/src/test/java/org/easymock/tests2/ClassExtensionHelperTest.java || die
+}
+
+src_test() {
+ # ClassLoader.defineClass(java.lang.String,byte[],int,int,java.security.ProtectionDomain) throws
+ # java.lang.ClassFormatError accessible: module java.base does not "opens java.lang" to unnamed module @66da75e4
+ local vm_version="$(java-config -g PROVIDES_VERSION)"
+ if ver_test "${vm_version}" -ge 17; then
+ JAVA_TEST_EXTRA_ARGS+=( --add-opens=java.base/java.lang=ALL-UNNAMED )
+ JAVA_TEST_EXTRA_ARGS+=( --add-opens=java.base/java.io=ALL-UNNAMED )
+ fi
+ java-pkg-simple_src_test
+}
diff --git a/dev-java/eclipse-ecj/eclipse-ecj-4.33.ebuild b/dev-java/eclipse-ecj/eclipse-ecj-4.33.ebuild
index 9c70b5f1d581..a29983fb49d8 100644
--- a/dev-java/eclipse-ecj/eclipse-ecj-4.33.ebuild
+++ b/dev-java/eclipse-ecj/eclipse-ecj-4.33.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -19,7 +19,7 @@ S="${WORKDIR}"
LICENSE="EPL-1.0"
SLOT="4.33"
-KEYWORDS="~amd64 ~arm64 ~ppc64"
+KEYWORDS="amd64 ~arm64 ~ppc64"
BDEPEND="app-arch/unzip"
COMMON_DEP="app-eselect/eselect-java"
diff --git a/dev-java/error-prone-annotations/error-prone-annotations-2.36.0.ebuild b/dev-java/error-prone-annotations/error-prone-annotations-2.36.0.ebuild
index 6f831c3b913f..d33f4e2fe4b2 100644
--- a/dev-java/error-prone-annotations/error-prone-annotations-2.36.0.ebuild
+++ b/dev-java/error-prone-annotations/error-prone-annotations-2.36.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -15,7 +15,7 @@ S="${WORKDIR}/error-prone-${PV}/annotations"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64"
+KEYWORDS="~amd64 arm64 ~ppc64"
DEPEND=">=virtual/jdk-11:*" # module-info
RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/fontbox/Manifest b/dev-java/fontbox/Manifest
index a015e94c5be2..68ca3ca2f4aa 100644
--- a/dev-java/fontbox/Manifest
+++ b/dev-java/fontbox/Manifest
@@ -6,6 +6,5 @@ DIST NotoSansSC-Regular.otf 8481960 BLAKE2B 3eee2c1e6be5e013d2ed679ccb361221e3e4
DIST OpenSans-Regular.pfb 100962 BLAKE2B ff906c67a79df9d8deb9736f7439ba5429b72940b6a6fa49751fdea88adef70a3b57f28b2c31014da3206efe601095a8caeb98382fb36f8544afd0bec5cce355 SHA512 2787fcecc0feb1c9e6ff0d8de6193658413863e44eaab572751ca7e6c3b369c0a9731f4952cb0821f307760f0422f77c5f0d3fe7df6b054643fb39423e8d70ee
DIST SourceSansProBold.otf 104072 BLAKE2B 2c6538ed97cca04a6a38a1bcca7def6c9e923f0e7a773c2715d50ca1a526b1ff683bc6544155b1e170fb828c3923d6b22cdf7017f9da9de164523f328c1cc187 SHA512 28a044a2685fbc8da7810d9ac7b6b93a95542d504d7d8e671f009b8ebb2f5b70c974be7ea78974b188d8e6ab17d65b08f276c054927857315d5aad26f6fe36fc
DIST ipag00303.zip 4295310 BLAKE2B b68dd7dd7a7320894d782350c4598572c31d6ef492f9572adc2aac20ca98b5c5027995c0169bf815bc1e3a64d635b0e2d4e378b749e034f2fe718bcb7901d40a SHA512 59535137c649a2f8bdbb463cd716426811a6003a65883ca6e45bb0af1d526b3889af0fba3a353e90bc8d373cd32b90a27ff9ff6916ecbccb42e922c09e9b046a
-DIST pdfbox-2.0.27-src.zip 15770627 BLAKE2B 9f93d597141ff3da39b69da3ce989a0cc7f4020071e5cb1609a8b86d0f12a3219037cb4c7b276acf58ee6b07d842b6d7c76e14fdf79e9efdeac401048e345f89 SHA512 59a5675f5d1d34f092adc019679f7d10e7e93c0f554a002ac29d48cbffcaa600d930309fa94a92191c01ead8da905cbb37ce5e233dcc9b8732a881d4abf75def
DIST pdfbox-2.0.32-src.zip 17094201 BLAKE2B a48677819bab371d82a956affa8a9b55a8dca2627bb301b56facb4408229639162550c67eccc843b903e28a3f6258db4b0c096c2b40c134c1f0bf6085ff122d0 SHA512 bdad289bda79e78774dd4dedb8b0531f20382038e96232eb6c55508e2187ca3d7512072e87cd293fe6d1b9967d7e6a44f39b09a3af59872bf2f307275a65f546
DIST pdfbox-2.0.32-src.zip.asc 195 BLAKE2B a3c1f8078ded155bfecca3c15ec8c9ae648ab6dbfa9c023715eabdf72f092920b0c0ddedaafed3fc6a186f05c9880fbaa703eb088b704964ac4bb8bd5dd386e8 SHA512 b6aff86c09f75234c57ae079eff71e098377e27a1b0d55911b2cd466ff74c5d529c9cd45ba20653adae3a9b5f9ecfc3e9d6df0647bae59a7b651f128ef3b39e5
diff --git a/dev-java/fontbox/fontbox-2.0.27.ebuild b/dev-java/fontbox/fontbox-2.0.27.ebuild
deleted file mode 100644
index f707ac643437..000000000000
--- a/dev-java/fontbox/fontbox-2.0.27.ebuild
+++ /dev/null
@@ -1,63 +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 mirror://apache/pdfbox/2.0.27/pdfbox-2.0.27-src.zip --slot 0 --keywords "~amd64 ~arm64 ~ppc64 ~x86" --ebuild fontbox-2.0.27.ebuild
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.apache.pdfbox:fontbox:2.0.27"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="An open source Java library for parsing font files"
-HOMEPAGE="https://pdfbox.apache.org/"
-SRC_URI="mirror://apache/pdfbox/${PV}/pdfbox-${PV}-src.zip
- test? (
- https://issues.apache.org/jira/secure/attachment/12684264/SourceSansProBold.otf
- https://issues.apache.org/jira/secure/attachment/12896461/NotoEmoji-Regular.ttf
- https://issues.apache.org/jira/secure/attachment/12809395/DejaVuSansMono.ttf
- https://issues.apache.org/jira/secure/attachment/13036376/NotoSansSC-Regular.otf
- https://mirrors.ctan.org/fonts/opensans/type1/OpenSans-Regular.pfb
- )"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm64 ppc64"
-
-# Common dependencies
-# POM: pom.xml
-# commons-logging:commons-logging:1.2 -> >=dev-java/commons-logging-1.2:0
-
-CP_DEPEND="dev-java/commons-logging:0"
-DEPEND="${CP_DEPEND}
- >=virtual/jdk-1.8:*"
-RDEPEND="${CP_DEPEND}
- >=virtual/jre-1.8:*"
-BDEPEND="app-arch/unzip"
-
-S="${WORKDIR}/pdfbox-${PV}/${PN}"
-
-JAVA_AUTOMATIC_MODULE_NAME="org.apache.fontbox"
-JAVA_RESOURCE_DIRS="src/main/resources"
-JAVA_SRC_DIR="src/main/java"
-
-JAVA_TEST_GENTOO_CLASSPATH="junit-4"
-JAVA_TEST_RESOURCE_DIRS="src/test/resources"
-JAVA_TEST_SRC_DIR="src/test/java"
-
-src_test() {
- mkdir --parents target/{pdfs,fonts} || die
- cp \
- "${DISTDIR}"/SourceSansProBold.otf \
- "${DISTDIR}"/NotoEmoji-Regular.ttf \
- "${DISTDIR}"/DejaVuSansMono.ttf \
- "${DISTDIR}"/NotoSansSC-Regular.otf \
- "target/pdfs" || die
- cp "${DISTDIR}"/OpenSans-Regular.pfb \
- "target/fonts" || die
-
- java-pkg-simple_src_test
-}
diff --git a/dev-java/fontbox/fontbox-2.0.32.ebuild b/dev-java/fontbox/fontbox-2.0.32.ebuild
index 2f33b542c920..6bcad5bf6362 100644
--- a/dev-java/fontbox/fontbox-2.0.32.ebuild
+++ b/dev-java/fontbox/fontbox-2.0.32.ebuild
@@ -27,7 +27,7 @@ S="${WORKDIR}/pdfbox-${PV}/${PN}"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 arm64 ~ppc64"
+KEYWORDS="amd64 arm64 ppc64"
VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/pdfbox.apache.org.asc"
BDEPEND="
diff --git a/dev-java/fop/fop-2.10.ebuild b/dev-java/fop/fop-2.10-r1.ebuild
index 07e4bc1319a9..7f308bf708e0 100644
--- a/dev-java/fop/fop-2.10.ebuild
+++ b/dev-java/fop/fop-2.10-r1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
S="${WORKDIR}/${P}"
LICENSE="Apache-2.0"
-SLOT="2.8"
+SLOT="0"
KEYWORDS="amd64 ~arm64 ~ppc64"
VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/xmlgraphics-fop.apache.org.asc"
@@ -206,6 +206,6 @@ src_install() {
if use doc; then
java-pkg_dojavadoc target/api
fi
- java-pkg_dolauncher "fop-${SLOT}" --main "org.apache.fop.cli.Main"
+ java-pkg_dolauncher "fop" --main "org.apache.fop.cli.Main"
einstalldocs
}
diff --git a/dev-java/gradle-bin/Manifest b/dev-java/gradle-bin/Manifest
index a788d521af99..64663e265392 100644
--- a/dev-java/gradle-bin/Manifest
+++ b/dev-java/gradle-bin/Manifest
@@ -1,4 +1,5 @@
DIST gradle-bin-8.10.2.zip 227989293 BLAKE2B 3eaafca3c06bb82b6c95026421f40d1e24f590d2660f781aca8f3eaac72a8077bbb735297465d8ad430507003fd9231db848369e96542276098614942076258f SHA512 b2fbf57701e7d8f02b425988afe3fcad7a22814823b4748db68ea4c1c7f3027110b3d3b5f6797eded037cc28356b630b1bd6b24e0169107b85abdc860184ee53
+DIST gradle-bin-8.12.zip 229762718 BLAKE2B e3a8429c0e2012a58243743b25f6adf45b722032162df64dbf8e28293b7be71649f3084328726bbfed9351870b7126c171428dabadd5c6be7d08a029fc518d2a SHA512 238d3ca819e1ec8c5b14e25481eff1e0d25e71c151f14ebfeb6a1787f189c6a18a239570e5215f762608769fed90c6eeab3c26c30b40bb897faccabdb46b9f89
DIST gradle-bin-8.4.zip 212870963 BLAKE2B da32c1010e85f6cded0c1b539b243db6d41fcd033266be3b03b389e6a2e317bea17ddbe65c597c7ea82628cc5bec913954ec998d018b68daa67d39f9a8958e7e SHA512 52d5f622b8ad0ab36ff84589733b47423b12f94211086a84eca9810690af29e396877f1155ee31279c4325e98cd1d55b32137d52efcf48eb1e258caeece08f22
DIST gradle-bin-8.5.zip 218636663 BLAKE2B 0360f240f6183abec540f7755a966767a8dc175ca0ea047273e05c4b2219fd80cb92e62e9b961481d646157418cc91ea211eb83530cc6ec815ea790f6ad8380a SHA512 37a1c2989c46dad0f843565d05fd29010df10ac199d81f0ccddf56ffd490642039046d43a320ba04d1f87cbbc6d4cebf20ff66ce45ec005931cfc85aee2e0180
DIST gradle-bin-8.7.zip 224435312 BLAKE2B 1926765aea8931b25a9f0b7b9a224dd70756cfd337eecb364c6d288486187dd6311f888c7e1c36b1fc81b454c3514d2807884343e7782f1be45fce03e611496b SHA512 fc18863654cbe8dd2357f388c0fc5f699ca2d40ffd32c283f00cfd5bda94e1711ab7b7a3b154e7da66c17468f00c3c72fe6b6603c4a29617b33b0f292cbac3de
diff --git a/dev-java/gradle-bin/gradle-bin-8.12.ebuild b/dev-java/gradle-bin/gradle-bin-8.12.ebuild
new file mode 100644
index 000000000000..ec8906f55248
--- /dev/null
+++ b/dev-java/gradle-bin/gradle-bin-8.12.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2
+
+MY_PN=${PN%%-bin}
+MY_P="${MY_PN}-${PV/_rc/-rc-}"
+
+DESCRIPTION="A project automation and build tool with a Groovy based DSL"
+HOMEPAGE="https://gradle.org"
+SRC_URI="https://services.gradle.org/distributions/${MY_P}-all.zip -> ${P}.zip"
+
+S="${WORKDIR}/${MY_P}"
+LICENSE="Apache-2.0"
+SLOT="${PV}"
+KEYWORDS="~amd64"
+
+DEPEND="app-eselect/eselect-gradle"
+BDEPEND="app-arch/unzip"
+RDEPEND="
+ ${DEPEND}
+ >=virtual/jre-1.8:*
+"
+
+src_compile() {
+ :
+}
+
+src_install() {
+ local gradle_dir="/usr/share/${PN}-${SLOT}"
+
+ if use source; then
+ java-pkg_dosrc src
+ fi
+
+ docinto html
+ dodoc -r docs/release-notes.html
+ if use doc; then
+ dodoc -r docs/{dsl,userguide}
+ java-pkg_dojavadoc docs/javadoc
+ fi
+
+ insinto "${gradle_dir}"
+ doins -r bin/ lib/
+ fperms 755 "${gradle_dir}/bin/gradle"
+ dosym "${gradle_dir}/bin/gradle" "/usr/bin/${PN}-${SLOT}"
+}
+
+pkg_postinst() {
+ eselect gradle update ifunset
+}
+
+pkg_postrm() {
+ eselect gradle update ifunset
+}
diff --git a/dev-java/gradle-bin/metadata.xml b/dev-java/gradle-bin/metadata.xml
index a16401d9805a..39a065022e21 100644
--- a/dev-java/gradle-bin/metadata.xml
+++ b/dev-java/gradle-bin/metadata.xml
@@ -1,12 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>flow@gentoo.org</email>
- <name>Florian Schmaus</name>
- </maintainer>
- <maintainer type="project">
- <email>java@gentoo.org</email>
- <name>Java</name>
- </maintainer>
+ <maintainer type="person">
+ <email>flow@gentoo.org</email>
+ <name>Florian Schmaus</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>java@gentoo.org</email>
+ <name>Java</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">gradle/gradle</remote-id>
+ <bugs-to>https://github.com/gradle/gradle/issues</bugs-to>
+ <changelog>https://github.com/gradle/gradle/releases</changelog>
+ </upstream>
</pkgmetadata>
diff --git a/dev-java/guava-testlib/Manifest b/dev-java/guava-testlib/Manifest
index 95ff24c734e4..5d2bb63cd36b 100644
--- a/dev-java/guava-testlib/Manifest
+++ b/dev-java/guava-testlib/Manifest
@@ -1,3 +1,4 @@
DIST guava-33.3.0.tar.gz 5819234 BLAKE2B 26c5f97b927f4afeb8c5d68714a54ef62bfc3995da8cf98d2022edd93054bb7e0bd38598adcefc209d04a246e3da50346e213ad49152e1fc0c91463cd8f0dea3 SHA512 122a10c98820443cbfc5769e1aaa5843becfc0e2e7119d0f2544d86bd265da1fc48c4113cb706f92d84ab896fc58583b80e7dc91b6cd13f9ee9996ae8457f02c
DIST guava-33.3.1.tar.gz 5827149 BLAKE2B f8ad29e921d7de7d4eeb65812a24dec9ee27feab7d8294ac037ac526c8069a652d7381af92afd457339ff394488d7c56d562e116b2508f105ced32080f727d78 SHA512 d357953607266b844d5711821a261b110bf44c32713a7c889aebc32e7a8e63aaa8126f1f1aee7c6ad3cf44830bd231a19fc09d802f1abeaff42096470214b0c3
+DIST guava-33.4.0.tar.gz 5900161 BLAKE2B 85201845218bfba9150e1190259588d46113c5267bf492f54a7d789e8ba7e890fa79e44a0fdf378949899b93f7df12d7480a38ccec4bc756b581f5b6529318a2 SHA512 6534867f40e2a63e7268e3dec1bc3ee0caafb89c77abc2fa2527b2612ecae17d01803f3968bee9844b3948cdb039b9c61ffdbba5309841c9a6a8d14118af970d
DIST truth-1.4.2.jar 275487 BLAKE2B 9c0dce92648f734ab88a0faf1a1e5328d747efffd29aa8f12b7ed2b2c87036ce18bf3195348f9ffce848842a240179fa60e9625c6997439a4cedce6aac6c2b77 SHA512 5f29cb259f2cf63e8a908061d2a58b28ecf12366a03564c8e63c33cdbdb21935ac95ed7b68437b015a2bd055732c88ec8ca1e55b45b99a2cb3e9dd53cb0b87cc
diff --git a/dev-java/guava-testlib/guava-testlib-33.3.1.ebuild b/dev-java/guava-testlib/guava-testlib-33.3.1.ebuild
index d62428453c97..143739c0474f 100644
--- a/dev-java/guava-testlib/guava-testlib-33.3.1.ebuild
+++ b/dev-java/guava-testlib/guava-testlib-33.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -18,7 +18,7 @@ S="${WORKDIR}/guava-${PV}"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64"
+KEYWORDS="~amd64 arm64 ~ppc64"
CP_DEPEND="
>=dev-java/error-prone-annotations-2.36.0:0
diff --git a/dev-java/guava-testlib/guava-testlib-33.4.0.ebuild b/dev-java/guava-testlib/guava-testlib-33.4.0.ebuild
new file mode 100644
index 000000000000..ef9546542cd9
--- /dev/null
+++ b/dev-java/guava-testlib/guava-testlib-33.4.0.ebuild
@@ -0,0 +1,68 @@
+# 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.guava:guava-testlib:${PV}-jre"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+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.4.2/truth-1.4.2.jar )"
+S="${WORKDIR}/guava-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64"
+
+CP_DEPEND="
+ >=dev-java/error-prone-annotations-2.36.0:0
+ ~dev-java/guava-${PV}:0
+ dev-java/jsr305:0
+ dev-java/junit:4
+"
+
+DEPEND="
+ ${CP_DEPEND}
+ >=dev-java/checker-framework-qual-3.48.2:0
+ dev-java/j2objc-annotations:0
+ >=virtual/jdk-1.8:*
+"
+
+RDEPEND="
+ ${CP_DEPEND}
+ >=virtual/jre-1.8:*
+"
+
+JAVA_CLASSPATH_EXTRA="checker-framework-qual j2objc-annotations"
+JAVA_SRC_DIR="${PN}/src"
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_SRC_DIR="${PN}/test"
+
+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.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 36560547d45b..3de8ae4f5545 100644
--- a/dev-java/guava/Manifest
+++ b/dev-java/guava/Manifest
@@ -1,2 +1,3 @@
DIST guava-33.3.0.tar.gz 5819234 BLAKE2B 26c5f97b927f4afeb8c5d68714a54ef62bfc3995da8cf98d2022edd93054bb7e0bd38598adcefc209d04a246e3da50346e213ad49152e1fc0c91463cd8f0dea3 SHA512 122a10c98820443cbfc5769e1aaa5843becfc0e2e7119d0f2544d86bd265da1fc48c4113cb706f92d84ab896fc58583b80e7dc91b6cd13f9ee9996ae8457f02c
DIST guava-33.3.1.tar.gz 5827149 BLAKE2B f8ad29e921d7de7d4eeb65812a24dec9ee27feab7d8294ac037ac526c8069a652d7381af92afd457339ff394488d7c56d562e116b2508f105ced32080f727d78 SHA512 d357953607266b844d5711821a261b110bf44c32713a7c889aebc32e7a8e63aaa8126f1f1aee7c6ad3cf44830bd231a19fc09d802f1abeaff42096470214b0c3
+DIST guava-33.4.0.tar.gz 5900161 BLAKE2B 85201845218bfba9150e1190259588d46113c5267bf492f54a7d789e8ba7e890fa79e44a0fdf378949899b93f7df12d7480a38ccec4bc756b581f5b6529318a2 SHA512 6534867f40e2a63e7268e3dec1bc3ee0caafb89c77abc2fa2527b2612ecae17d01803f3968bee9844b3948cdb039b9c61ffdbba5309841c9a6a8d14118af970d
diff --git a/dev-java/guava/guava-33.3.1.ebuild b/dev-java/guava/guava-33.3.1.ebuild
index 5d43bdc9619a..ae156ec16168 100644
--- a/dev-java/guava/guava-33.3.1.ebuild
+++ b/dev-java/guava/guava-33.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -15,7 +15,7 @@ S="${WORKDIR}/${P}"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64"
+KEYWORDS="~amd64 arm64 ~ppc64"
CP_DEPEND="
>=dev-java/error-prone-annotations-2.36.0:0
diff --git a/dev-java/guava/guava-33.4.0.ebuild b/dev-java/guava/guava-33.4.0.ebuild
new file mode 100644
index 000000000000..c4fdbeb247cb
--- /dev/null
+++ b/dev-java/guava/guava-33.4.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="com.google.guava:guava:${PV}-jre"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="A collection of Google's core Java libraries"
+HOMEPAGE="https://github.com/google/guava"
+SRC_URI="https://github.com/google/guava/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${P}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64"
+
+CP_DEPEND="
+ >=dev-java/error-prone-annotations-2.36.0:0
+ dev-java/j2objc-annotations:0
+ dev-java/jsr305:0
+"
+
+DEPEND="
+ ${CP_DEPEND}
+ >=dev-java/checker-framework-qual-3.48.2:0
+ >=virtual/jdk-1.8:*
+"
+
+RDEPEND="
+ ${CP_DEPEND}
+ >=virtual/jre-1.8:*
+"
+
+JAVA_AUTOMATIC_MODULE_NAME="com.google.common"
+JAVA_CLASSPATH_EXTRA="checker-framework-qual"
+JAVA_GENTOO_CLASSPATH_EXTRA=":futures/failureaccess/src"
+JAVA_SRC_DIR="guava/src"
diff --git a/dev-java/jackcess/Manifest b/dev-java/jackcess/Manifest
index 8b0c1cf99e50..1e499a5f029c 100644
--- a/dev-java/jackcess/Manifest
+++ b/dev-java/jackcess/Manifest
@@ -1,2 +1 @@
-DIST jackcess-4.0.0-sources.tar.gz 12140889 BLAKE2B 44bdd0ba74e9e462364506e563b2e5db8a6581686a0b1ab7d9995d2dfce164593eb533986ac666a7f79180478a8a16ccc8ef57a7af08045cb671a3a5269f84a6 SHA512 514ecf235943183e0b3813550adf801cc4ab1734137ae0b131f5e3dca9f774f2a866bec397ccc8d37d65e9c3f0c4c995baee091480eb8e2bb91e85894c2a27e6
DIST jackcess-4.0.7-sources.tar.gz 12257727 BLAKE2B 5d19d5aef02388342d881214e6956eb118e74fd4dcc6b750df927c888e689eb94bf605952c30884b0b0c4bfd1ae651c8b96cc908dd2dbf0fa7506fd789c14fa0 SHA512 3867019b50e8734938c08e562a57cd16b49f664865b8dbe904c418d73dc750492c6f94bccecd9c9a9d2ab2be51a211d49416a5dcb5130ac96aef7a9aeef7a3e0
diff --git a/dev-java/jackcess/jackcess-4.0.0.ebuild b/dev-java/jackcess/jackcess-4.0.0.ebuild
deleted file mode 100644
index 3f4f7d3ef2c4..000000000000
--- a/dev-java/jackcess/jackcess-4.0.0.ebuild
+++ /dev/null
@@ -1,73 +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/jahlborn/jackcess/archive/refs/tags/jackcess-4.0.0.tar.gz --slot 1 --keywords "~amd64 ~arm64 ~ppc64 ~x86" --ebuild jackcess-4.0.0.ebuild
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="com.healthmarketscience.jackcess:jackcess:4.0.0"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="A pure Java library for reading from and writing to MS Access databases"
-HOMEPAGE="https://jackcess.sourceforge.io"
-SRC_URI="https://github.com/jahlborn/${PN}/archive/refs/tags/${P}.tar.gz -> ${P}-sources.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="1"
-KEYWORDS="amd64 arm64 ppc64 ~amd64-linux ~x86-linux ~ppc-macos"
-
-# Common dependencies
-# POM: pom.xml
-# commons-logging:commons-logging:1.2 -> >=dev-java/commons-logging-1.2:0
-# org.apache.commons:commons-lang3:3.10 -> >=dev-java/commons-lang-3.11:3.6
-# org.apache.poi:poi:4.0.0 -> >=dev-java/poi-5.0.0:0
-
-CDEPEND="
- >=dev-java/commons-lang-3.11:3.6
- >=dev-java/commons-logging-1.2:0
- >=dev-java/poi-5.0.0:0
-"
-
-DEPEND="
- >=virtual/jdk-1.8:*
- ${CDEPEND}
-"
-
-RDEPEND="
- >=virtual/jre-1.8:*
- ${CDEPEND}"
-
-S="${WORKDIR}/${PN}-${P}"
-
-PATCHES=(
- "${FILESDIR}/${P}-fix-tests.patch"
-)
-
-JAVA_GENTOO_CLASSPATH="commons-logging,commons-lang-3.6,poi"
-JAVA_SRC_DIR="src/main/java"
-JAVA_RESOURCE_DIRS="src/main/resources"
-
-JAVA_TEST_GENTOO_CLASSPATH="junit-4"
-JAVA_TEST_SRC_DIR="src/test/java"
-JAVA_TEST_RESOURCE_DIRS="src/test/resources"
-
-JAVA_TEST_EXCLUDES=(
- # initializationError(com.healthmarketscience.jackcess.TestUtil)
- # org.junit.runners.model.InvalidTestClassError: Invalid test class 'com.healthmarketscience.jackcess.TestUtil'
- "com.healthmarketscience.jackcess.TestUtil"
-)
-
-src_prepare() {
- default
- java-utils-2_src_prepare
-}
-
-src_test() {
- export TZ=UTC
- export LC_ALL=C
- java-pkg-simple_src_test
-}
diff --git a/dev-java/jackcess/jackcess-4.0.7.ebuild b/dev-java/jackcess/jackcess-4.0.7.ebuild
index 284d41f5c1eb..a0c5b1e5fbf9 100644
--- a/dev-java/jackcess/jackcess-4.0.7.ebuild
+++ b/dev-java/jackcess/jackcess-4.0.7.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}-${P}"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 arm64 ~ppc64 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 arm64 ppc64 ~amd64-linux ~x86-linux ~ppc-macos"
CP_DEPEND="
>=dev-java/commons-lang-3.17:3.6
diff --git a/dev-java/jackrabbit-webdav/jackrabbit-webdav-2.10.1-r3.ebuild b/dev-java/jackrabbit-webdav/jackrabbit-webdav-2.10.1-r3.ebuild
index 278fab98fadf..9f1c6c912f8a 100644
--- a/dev-java/jackrabbit-webdav/jackrabbit-webdav-2.10.1-r3.ebuild
+++ b/dev-java/jackrabbit-webdav/jackrabbit-webdav-2.10.1-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -16,7 +16,7 @@ SRC_URI="mirror://apache/${MY_PN}/${PV}/${MY_PN}-${PV}-src.zip"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 arm64 ppc64"
+KEYWORDS="amd64 ppc64"
S="${WORKDIR}/${MY_PN}-${PV}/${PN}"
diff --git a/dev-java/jakarta-annotation-api/Manifest b/dev-java/jakarta-annotation-api/Manifest
index a858d613fbba..0751b5eede46 100644
--- a/dev-java/jakarta-annotation-api/Manifest
+++ b/dev-java/jakarta-annotation-api/Manifest
@@ -1,2 +1 @@
-DIST jakarta-annotation-api-2.1.1.tar.gz 83788 BLAKE2B be9904337199bd8cf9e5748d53b4536b3562446d499992b97c7e413e2e2d9ae0c8ba50d601950a0feec8bce4c4c35093b7b8f87ad60ea407452f502996045e54 SHA512 8a61cb8a9da55efd7c5172aa9a134eae7d94489a66ef749c619a7fc596122fd50f3dda7a954d78f664132c72ce999d2d3ad01b70e1d2cb2072c881327de11d82
DIST jakarta-annotation-api-3.0.0.tar.gz 86848 BLAKE2B 3eab46e3840bb121d1abeb1d839d00cab1db881e444613b60fa62e8412587c6a8e6a16ae89483698887631d7121f71104611dd052fd1ce6606fa2e708a4f0cc2 SHA512 9cbd14df082b2fd51e5ab92b72fad0a8f2db16e72d89f5942663dacc38ba5118ec1199a07756b9507f51ba143b9869bad32b8b8e41c9ddbef7c7c080557cb340
diff --git a/dev-java/jakarta-annotation-api/jakarta-annotation-api-2.1.1.ebuild b/dev-java/jakarta-annotation-api/jakarta-annotation-api-2.1.1.ebuild
deleted file mode 100644
index 8de7b9bc5d1c..000000000000
--- a/dev-java/jakarta-annotation-api/jakarta-annotation-api-2.1.1.ebuild
+++ /dev/null
@@ -1,30 +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"
-MAVEN_ID="jakarta.annotation:jakarta.annotation-api:2.1.1"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Jakarta Annotations API"
-HOMEPAGE="https://projects.eclipse.org/projects/ee4j.ca"
-SRC_URI="https://github.com/eclipse-ee4j/common-annotations-api/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/common-annotations-api-${PV}"
-
-LICENSE="EPL-2.0 GPL-2-with-classpath-exception"
-SLOT="0"
-KEYWORDS="amd64 arm64 ppc64"
-
-DEPEND="
- >=virtual/jdk-11:*
-"
-
-RDEPEND="
- >=virtual/jre-1.8:*
-"
-
-DOCS=( {CONTRIBUTING,NOTICE,README}.md )
-
-JAVA_SRC_DIR="api/src/main/java"
diff --git a/dev-java/jakarta-annotation-api/jakarta-annotation-api-3.0.0.ebuild b/dev-java/jakarta-annotation-api/jakarta-annotation-api-3.0.0.ebuild
index 7d5404665521..1003626c65b7 100644
--- a/dev-java/jakarta-annotation-api/jakarta-annotation-api-3.0.0.ebuild
+++ b/dev-java/jakarta-annotation-api/jakarta-annotation-api-3.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -15,7 +15,7 @@ S="${WORKDIR}/common-annotations-api-${PV}"
LICENSE="EPL-2.0 GPL-2-with-classpath-exception"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64"
+KEYWORDS="amd64 arm64 ppc64"
DEPEND=">=virtual/jdk-11:*"
RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/java-diff-utils/java-diff-utils-4.15.ebuild b/dev-java/java-diff-utils/java-diff-utils-4.15.ebuild
index f121bb744078..df0d2ec686f0 100644
--- a/dev-java/java-diff-utils/java-diff-utils-4.15.ebuild
+++ b/dev-java/java-diff-utils/java-diff-utils-4.15.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -16,7 +16,7 @@ S="${WORKDIR}/java-diff-utils-java-diff-utils-parent-${PV}/java-diff-utils"
LICENSE="Apache-2.0"
SLOT="4"
-KEYWORDS="~amd64 ~arm64 ~ppc64"
+KEYWORDS="~amd64 arm64 ~ppc64"
RESTRICT="test" #839681
DEPEND=">=virtual/jdk-1.8:*"
diff --git a/dev-java/javaparser-core/Manifest b/dev-java/javaparser-core/Manifest
index 44d5620a8988..6fb603dab526 100644
--- a/dev-java/javaparser-core/Manifest
+++ b/dev-java/javaparser-core/Manifest
@@ -1 +1,2 @@
DIST javaparser-3.13.10.tar.gz 7043664 BLAKE2B 5d2e35cfa22dbcb425365e2e7806c46b989b92a84472fbd80d42716fbb2a5ddcad2daec6214be689b1dcc6541890527e422953c083e713e9f1d22ce5b3035e90 SHA512 b90a6b7b2fbb6a13cc36cdd17acd09a22adb9e62311862c2a67a9ea339b98e245c93ba371645e3c695e76966b21e3bc01accf040482e30b2b6882a5569db5806
+DIST javaparser-3.26.3.tar.gz 18493336 BLAKE2B a3a01239caf9f215bb470c060eff82b8db607fab6cffa637b06937f4e80f1fd530f1991e750aa5c91b9b0b5a173e77eb84c104a14d1353b7de233a56cd8284dc SHA512 8e109eec868e5aeceb2c91e09f04286f4e9944601359febe80bc29074b6eb306fd058a93e41cf7824ce88a392026321cca637a8cf601e6100b74b06a4fe39b80
diff --git a/dev-java/javaparser-core/javaparser-core-3.26.3.ebuild b/dev-java/javaparser-core/javaparser-core-3.26.3.ebuild
new file mode 100644
index 000000000000..d623f5d390b8
--- /dev/null
+++ b/dev-java/javaparser-core/javaparser-core-3.26.3.ebuild
@@ -0,0 +1,59 @@
+# Copyright 2023-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="com.github.javaparser:javaparser-core:${PV}"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Java 1-21 Parser and Abstract Syntax Tree for Java"
+HOMEPAGE="https://javaparser.org/"
+SRC_URI="https://github.com/javaparser/javaparser/archive/${P/core/parent}.tar.gz -> javaparser-${PV}.tar.gz"
+S="${WORKDIR}/javaparser-${P/core/parent}"
+
+LICENSE="Apache-2.0 LGPL-3"
+# dev-java/bnd-7.1.0 seems not to like this version.
+# biz.aQute.bnd.reporter/src/biz/aQute/bnd/reporter/codesnippet/JavaSnippetReader.java:20: error: cannot find symbol
+# import com.github.javaparser.printer.PrettyPrinterConfiguration;
+# ^
+# symbol: class PrettyPrinterConfiguration
+# location: package com.github.javaparser.printer
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+
+JAVACC_SLOT="7.0.13"
+BDEPEND="dev-java/javacc:${JAVACC_SLOT}"
+
+# Does not compile with >=jdk:21 (not even with 'mvn clean compile'):
+# javaparser-core/src/main/java/com/github/javaparser/ast/NodeList.java:243:
+# error: getLast() in NodeList cannot implement getLast() in List
+# public Optional<N> getLast() {
+# ^
+# return type Optional<N> is not compatible with N
+# where N,E are type-variables:
+# N extends Node declared in class NodeList
+# E extends Object declared in interface List
+DEPEND="<virtual/jdk-21:*"
+RDEPEND=">=virtual/jre-1.8:*"
+
+DOCS=( CONTRIBUTING.md changelog.md readme.md )
+
+JAVA_AUTOMATIC_MODULE_NAME="com.github.javaparser.core"
+JAVA_SRC_DIR=(
+ "${PN}/src/main/java"
+ "${PN}/src/main/java-templates"
+ "${PN}/src/main/javacc-support"
+)
+
+src_prepare() {
+ java-pkg-2_src_prepare
+
+ mkdir -p "${PN}/src/main/java/com/github/javaparser"
+ javacc-${JAVACC_SLOT} -GRAMMAR_ENCODING=UTF-8 \
+ -JDK_VERSION=1.8 \
+ -OUTPUT_DIRECTORY="${PN}/src/main/java/com/github/javaparser" \
+ "javaparser-core/src/main/javacc/java.jj" \
+ || die "Code generation with java.jj failed"
+}
diff --git a/dev-java/javassist/Manifest b/dev-java/javassist/Manifest
index 473ed4889900..badb790c1177 100644
--- a/dev-java/javassist/Manifest
+++ b/dev-java/javassist/Manifest
@@ -1,2 +1 @@
-DIST javassist-3.29.2.tar.gz 1293705 BLAKE2B 23101970a3fe9e4428b9e2e55ec2973663b537b2e205db55952bce116eb0cdd327e156f9bebf16a3c4322d8e5002d612067b14e8d234e87524361b5f08c9ecde SHA512 651f48d9138b54d4816611c077614bbb15f8189d755c2c2c7e5c2dfb35ad8f48cd9d2e0532edbd565456a923b3166eaecdde8702d65c70a32eb21c2d42f67bfc
DIST javassist-3.30.2.tar.gz 1295788 BLAKE2B e54fc5eb0b61c3f706d3d91169fc2ed76b8b5f43c8b4ef9eca3fa8c0001d30fd700bfc3f92c2d1a6e0960910977e6086dfda37602bbc36addaaad9cab253333f SHA512 d4bcfc1dbf94f6727eceb2aa33c9c7b9bfd2087d91e3b8b38df86f79975c26b677301eca900e6fef5415f995428d107f93cb5ee5a0d634a82e14bc0199b49a62
diff --git a/dev-java/javassist/javassist-3.29.2.ebuild b/dev-java/javassist/javassist-3.29.2.ebuild
deleted file mode 100644
index 87d13e19f38e..000000000000
--- a/dev-java/javassist/javassist-3.29.2.ebuild
+++ /dev/null
@@ -1,55 +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="org.javassist:javassist:3.29.2-GA"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="A class library for editing bytecodes in Java."
-HOMEPAGE="https://www.javassist.org"
-SRC_URI="https://github.com/jboss-javassist/javassist/archive/rel_${PV//./_}_ga.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-rel_${PV//./_}_ga"
-
-LICENSE="Apache-2.0 LGPL-2.1 MPL-1.1"
-SLOT="3"
-KEYWORDS="amd64 arm64 ppc64 ~amd64-linux ~x86-linux"
-
-DEPEND="
- >=virtual/jdk-11:*
- test? ( dev-java/hamcrest-library:1.3 )
-"
-
-RDEPEND=">=virtual/jre-1.8:*"
-
-DOCS=( Changes.md README.md )
-HTML_DOCS=( tutorial/{brown.css,tutorial.html,tutorial2.html,tutorial3.html} )
-
-PATCHES=( "${FILESDIR}/javassist-3.29.2-gentoo.patch" )
-
-JAVA_AUTOMATIC_MODULE_NAME="org.javassist"
-JAVA_MAIN_CLASS="javassist.CtClass"
-JAVA_SRC_DIR="src/main"
-
-JAVA_TEST_GENTOO_CLASSPATH="hamcrest-library-1.3,junit-4"
-JAVA_TEST_RESOURCE_DIRS="src/test/resources"
-JAVA_TEST_RUN_ONLY="javassist.JvstTest" # pom.xml, line 167
-JAVA_TEST_SRC_DIR="src/test"
-
-src_prepare() {
- default #780585
- java-pkg-2_src_prepare
- java-pkg_clean javassist.jar
-}
-
-src_test() {
- default
- einfo "Testing"
- JAVA_PKG_WANT_SOURCE=11
- JAVA_PKG_WANT_TARGET=11
- JAVAC_ARGS="-g -parameters"
- java-pkg-simple_src_test
-}
diff --git a/dev-java/javassist/javassist-3.30.2.ebuild b/dev-java/javassist/javassist-3.30.2.ebuild
index fd3122df656a..c18f7a90bca9 100644
--- a/dev-java/javassist/javassist-3.30.2.ebuild
+++ b/dev-java/javassist/javassist-3.30.2.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}-rel_${PV//./_}_ga"
LICENSE="Apache-2.0 LGPL-2.1 MPL-1.1"
SLOT="3"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm64 ppc64 ~amd64-linux ~x86-linux"
DEPEND="
>=virtual/jdk-11:*
diff --git a/dev-java/jbig2-imageio/Manifest b/dev-java/jbig2-imageio/Manifest
index 3f4c44c3eb75..044b0759daf1 100644
--- a/dev-java/jbig2-imageio/Manifest
+++ b/dev-java/jbig2-imageio/Manifest
@@ -1,3 +1,2 @@
-DIST jbig2-imageio-3.0.3-src.zip 2079380 BLAKE2B bb05f81bfdef00b1a0ffcb7a2df2617fe5f5a83957249266917e775ceab57282ee289aedb198c6639201e85df83e89b8cfe8cf2d865fff863d1f2a5acd439721 SHA512 5350b4ce89af72eea5069f6ea5fc830238e4df711712506405aaf0e14546a1b07155b8c5225b47f0d40ce2821032426a2987adbe0df63c536cae4fb319b5c700
DIST jbig2-imageio-3.0.4-src.zip 2068836 BLAKE2B 92e1d3e50703c09cb8e22951e403b24531905d31f83f54db08abddb86b3a7a1e206c8d4bf6cf3f41777069158e3268180de09ef7803cbaf7cbc8a67390420971 SHA512 382acb53e0bb56595f7eb8c382369a48a000ced22ff4d101ec89316c749b5afd344c6303a3e6c75b12e949f1efe688e18bd1b8b0b5deb449a581b1c97c35e672
DIST jbig2-imageio-3.0.4-src.zip.asc 195 BLAKE2B 1790d4435b8924642cc7361cd7555e31a5b8f30d536ade0c1aac0b1f304f55483f3ac720351ac7824e4d2de7f37158a5115d8642cd2c8130207b561d62059a28 SHA512 91e19f12e1de463280b058c3e7de702ab7f1fd6dc6c4e3fcf922e5f9364b49ee347635579dd83afc5ee2d617e117d591333c4e1f7d26e01898f1b8297b78ac70
diff --git a/dev-java/jbig2-imageio/jbig2-imageio-3.0.3.ebuild b/dev-java/jbig2-imageio/jbig2-imageio-3.0.3.ebuild
deleted file mode 100644
index 3989709b8320..000000000000
--- a/dev-java/jbig2-imageio/jbig2-imageio-3.0.3.ebuild
+++ /dev/null
@@ -1,41 +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 jbig2-imageio-3.0.3/pom.xml --download-uri https://downloads.apache.org/pdfbox/jbig2-imageio/3.0.3/jbig2-imageio-3.0.3-src.zip --slot 0 --keywords "~amd64 ~arm64 ~ppc64 ~x86" --ebuild jbig2-imageio-3.0.3.ebuild
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.apache.pdfbox:jbig2-imageio:3.0.3"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="PDFBox JBIG2 ImageIO plugin"
-HOMEPAGE="https://pdfbox.apache.org"
-SRC_URI="https://downloads.apache.org/pdfbox/${PN}/${PV}/${P}-src.zip"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm64 ppc64"
-
-DEPEND=">=virtual/jdk-1.8:*"
-RDEPEND=">=virtual/jre-1.8:*"
-BDEPEND="app-arch/unzip"
-
-S="${WORKDIR}"
-
-JAVA_SRC_DIR="${P}/src/main/java"
-JAVA_RESOURCE_DIRS="${P}/src/main/resources"
-
-JAVA_TEST_GENTOO_CLASSPATH="junit-4"
-JAVA_TEST_SRC_DIR="${P}/src/test/java"
-JAVA_TEST_RESOURCE_DIRS="${P}/src/test/resources"
-
-JAVA_TEST_EXCLUDES=(
- # org.junit.runners.model.InvalidTestClassError: Invalid test class
- # 1. Test class should have exactly one public constructor
- "org.apache.pdfbox.jbig2.util.TestServiceImpl"
- "org.apache.pdfbox.jbig2.util.TestService"
-)
diff --git a/dev-java/jbig2-imageio/jbig2-imageio-3.0.4.ebuild b/dev-java/jbig2-imageio/jbig2-imageio-3.0.4.ebuild
index 324457ec48a8..dace39231ea3 100644
--- a/dev-java/jbig2-imageio/jbig2-imageio-3.0.4.ebuild
+++ b/dev-java/jbig2-imageio/jbig2-imageio-3.0.4.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 arm64 ~ppc64"
+KEYWORDS="amd64 arm64 ppc64"
VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/pdfbox.apache.org.asc"
BDEPEND="
diff --git a/dev-java/jchart2d/jchart2d-3.2.2-r1.ebuild b/dev-java/jchart2d/jchart2d-3.2.2-r2.ebuild
index f7b83ec0b7a9..39ae7001d24c 100644
--- a/dev-java/jchart2d/jchart2d-3.2.2-r1.ebuild
+++ b/dev-java/jchart2d/jchart2d-3.2.2-r2.ebuild
@@ -18,7 +18,7 @@ SLOT="0"
KEYWORDS="~amd64"
CP_DEPEND="dev-java/jide-oss:0
- dev-java/xmlgraphics-commons:2"
+ >=dev-java/xmlgraphics-commons-2.10:0"
DEPEND=">=virtual/jdk-1.8:*
${CP_DEPEND}"
diff --git a/dev-java/jdbc-postgresql/jdbc-postgresql-42.7.3.ebuild b/dev-java/jdbc-postgresql/jdbc-postgresql-42.7.3.ebuild
index f4388dd69826..912d0a1f42af 100644
--- a/dev-java/jdbc-postgresql/jdbc-postgresql-42.7.3.ebuild
+++ b/dev-java/jdbc-postgresql/jdbc-postgresql-42.7.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -16,7 +16,7 @@ S="${WORKDIR}/postgresql-${PV}-jdbc-src"
LICENSE="BSD-2"
SLOT="0"
-KEYWORDS="amd64 ppc64"
+KEYWORDS="amd64 ~ppc64"
# package se.jiderhamn.classloader does not exist
# package se.jiderhamn.classloader.leak does not exist
# package uk.org.webcompere.systemstubs.environment does not exist
diff --git a/dev-java/jdbc-postgresql/jdbc-postgresql-42.7.4.ebuild b/dev-java/jdbc-postgresql/jdbc-postgresql-42.7.4.ebuild
index a7d3d95b2a68..28bc03928685 100644
--- a/dev-java/jdbc-postgresql/jdbc-postgresql-42.7.4.ebuild
+++ b/dev-java/jdbc-postgresql/jdbc-postgresql-42.7.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -16,7 +16,7 @@ S="${WORKDIR}/postgresql-${PV}-jdbc-src"
LICENSE="BSD-2"
SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
# package se.jiderhamn.classloader does not exist
# package se.jiderhamn.classloader.leak does not exist
# package uk.org.webcompere.systemstubs.environment does not exist
diff --git a/dev-java/jetbrains-annotations/jetbrains-annotations-26.0.1.ebuild b/dev-java/jetbrains-annotations/jetbrains-annotations-26.0.1.ebuild
index 596a02691f70..df72f7386058 100644
--- a/dev-java/jetbrains-annotations/jetbrains-annotations-26.0.1.ebuild
+++ b/dev-java/jetbrains-annotations/jetbrains-annotations-26.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2024 Gentoo Authors
+# Copyright 2024-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -15,7 +15,7 @@ S="${WORKDIR}/${P/jetbrains/java}"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
DEPEND=">=virtual/jdk-11:*" # module-info
RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/jol-core/Manifest b/dev-java/jol-core/Manifest
index f47b3094ce86..4307276fc4a7 100644
--- a/dev-java/jol-core/Manifest
+++ b/dev-java/jol-core/Manifest
@@ -1 +1,2 @@
DIST jol-0.16.tar.gz 120373 BLAKE2B 06301e1802c89c76038aec2247cbb45d96cc74afa9f099500f8e5f33b919117e85744bc2b8214b6c9e765a2579a43f256eecc2ba8537e76c81aceaa8694f49dc SHA512 d9abf579d0230f2b6d0e0a33ee11c9599b4f36d945239dd8670bbd00591137c2229e5251b32dd5405fd4b08e0070af70e6b04e4ea4be0c28c4d5bc94874858de
+DIST jol-0.17.tar.gz 121365 BLAKE2B 3bacae2bba0f76799b0d9700201d908e1e04bad5276139b9661e969a0818e526eae1d6a0b0adf38501ef974dd18016710365f9fd578ecf4116896bb1dd44b51a SHA512 ea9424b43779a535a5463bdb11fc760f5fd5ee99ec9fb2706ddff48136739b488d9cebb690cd1d6fd30e5b4e66a2aa024bc878ffad0e56807aa499000d96b239
diff --git a/dev-java/jol-core/jol-core-0.17.ebuild b/dev-java/jol-core/jol-core-0.17.ebuild
new file mode 100644
index 000000000000..ef35447f37fe
--- /dev/null
+++ b/dev-java/jol-core/jol-core-0.17.ebuild
@@ -0,0 +1,36 @@
+# Copyright 2022-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.openjdk.jol:jol-core:0.17"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_PN="${PN%-core}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Java Object Layout: Core"
+HOMEPAGE="https://openjdk.org/projects/code-tools/jol/"
+SRC_URI="https://github.com/openjdk/jol/archive/${PV}.tar.gz -> jol-${PV}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2-with-classpath-exception"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64"
+
+DEPEND="
+ >=virtual/jdk-1.8:*
+ test? (
+ dev-java/asm:0
+ )
+"
+
+RDEPEND=">=virtual/jre-1.8:*"
+
+JAVA_RESOURCE_DIRS="${PN}/src/main/resources"
+JAVA_SRC_DIR="${PN}/src/main/java"
+JAVA_TEST_GENTOO_CLASSPATH="junit-4,asm"
+JAVA_TEST_SRC_DIR="${PN}/src/test/java"
diff --git a/dev-java/json-simple/Manifest b/dev-java/json-simple/Manifest
index ca0205d6e68a..62ded9a54c51 100644
--- a/dev-java/json-simple/Manifest
+++ b/dev-java/json-simple/Manifest
@@ -1 +1,2 @@
DIST json-simple-2.3.1.tar.gz 56230 BLAKE2B c4a196ffa67a729a1964db8c30b95ccb0bef0c213a76e37e463153a895a5fdb8c6f02f6d188d28f0b56665bf24c75dbdeeb42d88297c8df5e1b409606b0f04f2 SHA512 b80ea33480f8b32511ee2db5cfacc9c02cb5dbf0765b41fb76e099f41ac6c0ea69d75fdf0a5f783e3bfb7b4f200c49ca192a3321e0d8480b3a8b67ada469dbb1
+DIST json-simple-4.0.1.tar.gz 47731 BLAKE2B 59092065dcad7488e61e19f5af0ff823b76099d035dace4e0a41d7002fff0e35541956b137c84b68e8bf8d116fd997a6384b7397bce99eb0fe23f4cbec4b351c SHA512 a55919c90589276fcf6105f782faef42b08770e831f404f6e58450e3b24b6dfaeb9165abdd5323e64eb9d28c5e2c2e61de8fb2aa51d184f58b0362a240f4c19a
diff --git a/dev-java/json-simple/json-simple-4.0.1.ebuild b/dev-java/json-simple/json-simple-4.0.1.ebuild
new file mode 100644
index 000000000000..71a9c542fde0
--- /dev/null
+++ b/dev-java/json-simple/json-simple-4.0.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="source doc test"
+MAVEN_ID="com.github.cliftonlabs:json-simple:4.0.1"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Java 7+ toolkit to quickly develop RFC 4627 JSON compatible applications"
+HOMEPAGE="https://www.json.org"
+SRC_URI="https://github.com/cliftonlabs/json-simple/archive/json-simple-${PV}.tar.gz"
+S="${WORKDIR}/${PN}-${P}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64"
+
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
+
+JAVA_SRC_DIR="src/main/java"
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_SRC_DIR="src/test/java"
diff --git a/dev-java/json-smart/Manifest b/dev-java/json-smart/Manifest
index 08a0756cd16f..f45dcc2bb20b 100644
--- a/dev-java/json-smart/Manifest
+++ b/dev-java/json-smart/Manifest
@@ -1,2 +1,3 @@
DIST json-smart-1.3.3.tar.gz 49430 BLAKE2B 805e16e0de5321a2e8164468757e9b722849f0fe90fd6822cc99f7afffd9f4e480fc4e14c2bbd12b325a27abc8ca7e93b4a17ce56ac352117cef336e1ebb3fe9 SHA512 c6006c6a00a085ea8810e18889450d11240dc3671351f20602214db418107808df1f413fe67c199d6529e4c0087f2533601826666ac4fa493bcaf72d2c18ed83
DIST json-smart-2.5.0.tar.gz 88839 BLAKE2B 25760bd9c9ddecfef2fc3e60fc28b83def2223c7fc1e52ef39b3e6d01e5f2f29f36a35bfd43fc4d6ce6d5df5fcb25f59b1c86e1864a3044c69a6d0010335280b SHA512 4bffadf68998da4b63b34bcc9dbf804fd2b21b8d9514de4e155127d5a2eb3db74c7e396959b54c61c08e169eeed85dff3ad2f1d899cfddca53e501c45cebae21
+DIST json-smart-2.5.1.tar.gz 91171 BLAKE2B 21e83eadb15dbaa43ebe1fc9a5fd9500d4d233571dc4b65f417d7179630fde8a47e44cb652b2f598a2a6f46569876e8cac4769752dd4db179dc01b274514ef02 SHA512 00454e1debcebe009300a8f5d53b24b5c1917d173c9f3b98278236b52584631ab0e8bbf18c193f181e77537fb335b5bb31c1978918dc4f6e0ca82c44adb6797b
diff --git a/dev-java/json-smart/json-smart-2.5.1.ebuild b/dev-java/json-smart/json-smart-2.5.1.ebuild
new file mode 100644
index 000000000000..cb994b59522c
--- /dev/null
+++ b/dev-java/json-smart/json-smart-2.5.1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_PROVIDES="
+ net.minidev:accessors-smart:${PV}
+ net.minidev:json-smart:${PV}
+"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="JSON Small and Fast Parser"
+HOMEPAGE="https://urielch.github.io"
+SRC_URI="https://github.com/netplex/json-smart-v2/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-v2-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+RESTRICT="test" #839681
+
+DEPEND="
+ dev-java/asm:0
+ >=virtual/jdk-1.8:*
+"
+
+RDEPEND=">=virtual/jre-1.8:*"
+
+JAVADOC_CLASSPATH="asm"
+JAVADOC_SRC_DIRS=(
+ accessors-smart/src/main/java
+ json-smart/src/main/java
+)
+
+src_compile() {
+ einfo "Compiling accessors-smart.jar"
+ JAVA_CLASSPATH_EXTRA="asm"
+ JAVA_JAR_FILENAME="accessors-smart.jar"
+ JAVA_SRC_DIR="accessors-smart/src/main/java"
+ java-pkg-simple_src_compile
+ JAVA_GENTOO_CLASSPATH_EXTRA+=":accessors-smart.jar"
+ rm -r target || die
+
+ einfo "Compiling json-smart.jar"
+ JAVA_JAR_FILENAME="json-smart.jar"
+ JAVA_SRC_DIR="json-smart/src/main/java"
+ java-pkg-simple_src_compile
+ JAVA_GENTOO_CLASSPATH_EXTRA+=":json-smart.jar"
+ rm -r target || die
+
+ use doc && ejavadoc
+}
+
+src_install() {
+ einstalldocs
+ java-pkg_dojar "accessors-smart.jar"
+ java-pkg_dojar "json-smart.jar"
+
+ if use doc; then
+ java-pkg_dojavadoc target/api
+ fi
+
+ if use source; then
+ java-pkg_dosrc "accessors-smart/src/main/java/*"
+ java-pkg_dosrc "json-smart/src/main/java/*"
+ fi
+}
diff --git a/dev-java/json/Manifest b/dev-java/json/Manifest
index b2d756b94a7f..49cfea20357d 100644
--- a/dev-java/json/Manifest
+++ b/dev-java/json/Manifest
@@ -1,2 +1,3 @@
DIST json-20240303.tar.gz 245665 BLAKE2B 3462398895ab6da9610dac8851f2aa4528359e255015fd59a160fe99443819fa5bb57eb30ce177238d06abe95aaae9847cc85e4eee59c90edf7732bd823d9b89 SHA512 22465216eca7e4721aacca7b519d0bf1b0fe20b2de68ef0b6c62feae811e11203bfc733d8e9c97e2aa5b6ed30c74eefc601025b31807e51d496666412516afc9
+DIST json-20241224.tar.gz 260438 BLAKE2B a531f8009cada5bbb9cd7207ce20ed1b1d358bc6533b9678a7845c31714351bac3406fd85663bf7e3fcc9cf4249221a6a5599b1d841a82e924f594ae6a46e848 SHA512 d487201c20c4c36714a944297fd0a175006ddc742e077bbb2a0e541c8b52fafc0169bc984e5a5f085e580e5a770fa30f0588c2f15ad761f6afae22134b544797
DIST json-path-2.9.0.jar 276633 BLAKE2B bb83d6c6d972ea05dce3ef9878c0db0b93d6168cb796b63365a4615434c24edaad86bf021d6bf8736d67504ed8803c423efe01a323e094a59854cd9e73eb6862 SHA512 9a9dbb2cd36662c8049419ed891290602baeca2549eb7df62122cb20c91e66bc8c2c0e5e13199c4a70bf0b6e62ea4c2601f84e4c79d2af25ff1704481c86740a
diff --git a/dev-java/json/json-20241224.ebuild b/dev-java/json/json-20241224.ebuild
new file mode 100644
index 000000000000..f8e8b002e74a
--- /dev/null
+++ b/dev-java/json/json-20241224.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.json:json:${PV}"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple check-reqs
+
+DESCRIPTION="A reference implementation of a JSON package in Java"
+HOMEPAGE="https://github.com/stleary/JSON-java"
+JPV="2.9.0"
+SRC_URI="https://github.com/stleary/JSON-java/archive/${PV}.tar.gz -> ${P}.tar.gz
+ test? (
+ https://repo1.maven.org/maven2/com/jayway/jsonpath/json-path/${JPV}/json-path-${JPV}.jar
+ )"
+S="${WORKDIR}/JSON-java-${PV}"
+
+LICENSE="JSON"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="
+ >=virtual/jdk-1.8:*
+ test? (
+ dev-java/asm:0
+ dev-java/json-smart:0
+ dev-java/mockito:4
+ dev-java/slf4j-api:0
+ )
+"
+
+RDEPEND=">=virtual/jre-1.8:*"
+
+DOCS=( {CONTRIBUTING,README,SECURITY}.md )
+
+JAVA_AUTOMATIC_MODULE_NAME="org.json"
+JAVA_SRC_DIR="src/main/java"
+
+JAVA_TEST_GENTOO_CLASSPATH="
+ asm
+ json-smart
+ junit-4
+ mockito-4
+ slf4j-api
+"
+JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+JAVA_TEST_SRC_DIR="src/test/java"
+
+check_env() {
+ if use test; then
+ # this is needed only for tests
+ CHECKREQS_MEMORY="2048M"
+ check-reqs_pkg_pretend
+ fi
+}
+
+pkg_pretend() {
+ check_env
+}
+
+pkg_setup() {
+ check_env
+ java-pkg-2_pkg_setup
+}
+
+src_test() {
+ # setting Xms for bug #930723
+ # gradlew: DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"
+ JAVA_TEST_EXTRA_ARGS=" -Xmx${CHECKREQS_MEMORY}"
+ JAVA_GENTOO_CLASSPATH_EXTRA="${DISTDIR}/json-path-${JPV}.jar" # Test compile dependency
+
+ local vm_version="$(java-config -g PROVIDES_VERSION)"
+ if ver_test "${vm_version}" -ge 17; then
+ JAVA_TEST_EXTRA_ARGS+=( --add-opens=java.base/java.lang=ALL-UNNAMED )
+ JAVA_TEST_EXTRA_ARGS+=( --add-opens=java.base/java.io=ALL-UNNAMED )
+ fi
+ java-pkg-simple_src_test
+}
diff --git a/dev-java/junit/junit-5.10.3.ebuild b/dev-java/junit/junit-5.10.3-r1.ebuild
index 81a4571700d9..ecdba73eeb83 100644
--- a/dev-java/junit/junit-5.10.3.ebuild
+++ b/dev-java/junit/junit-5.10.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -28,7 +28,7 @@ IUSE="doc migration-support suite vintage"
CP_DEPEND="
dev-java/apiguardian-api:0
dev-java/opentest4j:0
- dev-java/open-test-reporting-events:0
+ <=dev-java/open-test-reporting-events-0.1.0_pre1:0
dev-java/picocli:0
dev-java/univocity-parsers:0
"
diff --git a/dev-java/libg/libg-7.1.0.ebuild b/dev-java/libg/libg-7.1.0.ebuild
index 4aeca1dfcea8..4085cb221b2f 100644
--- a/dev-java/libg/libg-7.1.0.ebuild
+++ b/dev-java/libg/libg-7.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -15,7 +15,7 @@ S="${WORKDIR}/bnd-${PV/_rc/.RC}"
LICENSE="Apache-2.0 EPL-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
# aQute.bnd.test.jupiter does not exist
# org.assertj.core.api.junit.jupiter does not exist
RESTRICT="test" #839681
diff --git a/dev-java/mill-bin/Manifest b/dev-java/mill-bin/Manifest
index 57a46177b725..db7fc946ce68 100644
--- a/dev-java/mill-bin/Manifest
+++ b/dev-java/mill-bin/Manifest
@@ -3,3 +3,5 @@ DIST mill-bin-0.11.7 59806165 BLAKE2B bc97d64a692a33a482752828a703cb22d44bafeeb3
DIST mill-bin-0.12.0 67781970 BLAKE2B f705100c1b6a847cfbd9ccb8f170f9ec376a0d88c282741b20433f36377fc8cf132dbde3d1f6554799fc6fca4e7611b713a8fb1463a65791fcfe8c2924e2fe2a SHA512 9ed44a2438513ec77edf1d5d13dfa3c4a3156abf8fcc3e179572a81b3d62247109e2a48b947dfacf7ecfd335e564b30872e3dc1079890cb9d312da379c707764
DIST mill-bin-0.12.1 67788135 BLAKE2B cfd10c21342159ebca4363c26df36bdb6512901112a419ad014ae3ae2f513d291f9e2d47293224d99eb7edc631e07dae846ad5f81ac53177f96ca16f1d2a7667 SHA512 9fe8d6dc01085503733ab5dc9af11f31da1859d67129ba300f9731eea1304545b4784bc0fb72694b7b74413987a91ce15ad8edf5812867ea2450c1a218761977
DIST mill-bin-0.12.3 65455398 BLAKE2B 522a7c14b2408a73b471aa9fc677106c3b485ae127c912625bc65a0ff8e3fb71d73b5e98a623d01b7db5c9586f0cca227c2ec448f03f158430310befe97aedd3 SHA512 a6bef9a14a9bed714f53af9d2ef5a3513b76556a625126612b6112b75070e6aa2b420ba8c89f47c176e3c76209614124f52b42f9b7e17a44099fa6e236bdbe7b
+DIST mill-bin-0.12.4 65746110 BLAKE2B 8e2ca4b04eb1eb7ca3ab1ac239465b423fdc9c81d4708f91249cb8e243a9210bcc346a2f90310f88387868e6f5ee4cd6b79d399129c5d4f8639094acb8bc427b SHA512 3890b9c06e662e35a1bde9cb89efbc709a7fb64328eab7b9aeabe6bc946edd82a157f6d57cd2e6e8265a040f2342b27b9e714402adfbbf951587eb5ca4ec3a4b
+DIST mill-bin-0.12.5 65797309 BLAKE2B 8b31ac28b4a78bcd1f10a42d4669f9a582e5f0698a697621a45b371025bb98a26fd92e4bf01edb4ef95373761c96954101c5ad13c1773fac649340816d2959b7 SHA512 0248b457f01687bf9dc5e248ec61aa16a2a08abf28ce22170defadb4be34ff69919a95a2f599b5ae4acc41caace2386e2a033b0858e73676b3f7049d47b232d4
diff --git a/dev-java/mill-bin/mill-bin-0.12.4.ebuild b/dev-java/mill-bin/mill-bin-0.12.4.ebuild
new file mode 100644
index 000000000000..e33ff36d8393
--- /dev/null
+++ b/dev-java/mill-bin/mill-bin-0.12.4.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PN=${PN%-bin}
+
+DESCRIPTION="A Java/Scala build tool"
+HOMEPAGE="https://mill-build.org/"
+SRC_URI="https://github.com/com-lihaoyi/${MY_PN}/releases/download/${PV}/${PV}-assembly -> ${P}"
+S="${WORKDIR}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND=">=virtual/jre-1.8:*"
+
+src_unpack() {
+ :
+}
+
+src_install() {
+ newbin "${DISTDIR}"/${P} ${MY_PN}
+}
diff --git a/dev-java/mill-bin/mill-bin-0.12.5.ebuild b/dev-java/mill-bin/mill-bin-0.12.5.ebuild
new file mode 100644
index 000000000000..74207d3f4661
--- /dev/null
+++ b/dev-java/mill-bin/mill-bin-0.12.5.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PN=${PN%-bin}
+
+DESCRIPTION="A Java/Scala build tool"
+HOMEPAGE="https://mill-build.org/"
+SRC_URI="https://github.com/com-lihaoyi/${MY_PN}/releases/download/${PV}/${PV}-assembly -> ${P}"
+S="${WORKDIR}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND=">=virtual/jre-1.8:*"
+
+src_unpack() {
+ :
+}
+
+src_install() {
+ newbin "${DISTDIR}"/${P} ${MY_PN}
+}
diff --git a/dev-java/mockito/mockito-2.28.2-r1.ebuild b/dev-java/mockito/mockito-2.28.2-r1.ebuild
index 6b413be4b92e..3bbd8b65d910 100644
--- a/dev-java/mockito/mockito-2.28.2-r1.ebuild
+++ b/dev-java/mockito/mockito-2.28.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -16,7 +16,7 @@ S="${WORKDIR}/${P}"
LICENSE="MIT"
SLOT="2"
-KEYWORDS="~amd64 ~arm64 ~ppc64"
+KEYWORDS="amd64 arm64 ppc64"
# Tests need a version of byte-buddy supporting Java 21. #930103
CP_DEPEND="
diff --git a/dev-java/mockito/mockito-2.28.2.ebuild b/dev-java/mockito/mockito-2.28.2.ebuild
deleted file mode 100644
index 92706ad5b55e..000000000000
--- a/dev-java/mockito/mockito-2.28.2.ebuild
+++ /dev/null
@@ -1,106 +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="org.mockito:mockito-core:${PV}"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Mockito mock objects library core API and implementation"
-HOMEPAGE="https://github.com/mockito/mockito"
-SRC_URI="https://github.com/mockito/mockito/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${P}"
-
-LICENSE="MIT"
-SLOT="2"
-KEYWORDS="amd64 ~arm64 ppc64"
-
-CP_DEPEND="
- dev-java/asm:9
- dev-java/byte-buddy:0
- dev-java/objenesis:0
-"
-
-DEPEND="
- dev-java/junit:4
- dev-java/opentest4j:0
- >=virtual/jdk-1.8:*
- ${CP_DEPEND}
- test? ( dev-java/assertj-core:3 )
-"
-
-RDEPEND="
- >=virtual/jre-1.8:*
- ${CP_DEPEND}
-"
-
-# see https://bugs.gentoo.org/903897
-PATCHES=(
- "${FILESDIR}/mockito-2.28.2-skip-failing-tests.patch"
- "${FILESDIR}/mockito-2.28.2-fix-unused-stubbings-test.patch"
-)
-
-JAVA_AUTOMATIC_MODULE_NAME="org.mockito"
-JAVA_CLASSPATH_EXTRA="junit-4 opentest4j"
-JAVA_SRC_DIR="src/main/java"
-
-JAVA_TEST_EXCLUDES=(
- org.mockito.internal.junit.JUnitRuleTest # We run it in JAVA_TEST_RUN_ONLY
- org.mockito.internal.util.reflection.DummyClassForTests # No runnable methods
- org.mockito.internal.util.reflection.DummyParentClassForTests # No runnable methods
- org.mockito.junit.TestableJUnitRunner # No runnable methods
- org.mockitoutil.TestBase # No runnable methods
-)
-JAVA_TEST_GENTOO_CLASSPATH="assertj-core-3,junit-4"
-JAVA_TEST_RUN_ONLY=(
- # This needs to run separately, otherwise one of its 4 tests would fail.
- org.mockito.internal.junit.JUnitRuleTest
-)
-JAVA_TEST_SRC_DIR="src/test/java"
-
-src_prepare() {
- java-pkg-2_src_prepare
- default
- # dev-java/byte-buddy is built from byte-buddy-dep without shaded stuff.
- sed \
- -e 's:net.bytebuddy.jar.asm:org.objectweb.asm:' \
- -i src/main/java/org/mockito/internal/creation/bytebuddy/MockMethodAdvice.java \
- -i src/main/java/org/mockito/internal/creation/bytebuddy/InlineBytecodeGenerator.java || die
-}
-
-src_compile() {
- java-pkg-simple_src_compile
- mv target/classes/org/mockito/internal/creation/bytebuddy/inject/MockMethodDispatcher.{class,raw} || die
- jar ufv mockito.jar -C target/classes org/mockito/internal/creation/bytebuddy/inject/MockMethodDispatcher.raw || die
-}
-
-src_test() {
- # Increasing number of test failures with higher Java versions
- # Test failures are documented in https://bugs.gentoo.org/903897
- local vm_version="$(java-config -g PROVIDES_VERSION)"
- if ver_test "${vm_version}" -ge 11; then
- JAVA_TEST_EXCLUDES+=(
- org.mockito.internal.stubbing.defaultanswers.ReturnsMocksTest
- org.mockitousage.bugs.GenericsMockitoAnnotationsTest
- )
- fi
- if ver_test "${vm_version}" -ge 17; then
- JAVA_TEST_EXCLUDES+=(
- org.concurrentmockito.ThreadsRunAllTestsHalfManualTest
- org.mockitousage.matchers.InvalidUseOfMatchersTest
- org.mockitousage.serialization.DeepStubsSerializableTest
- org.mockitousage.stubbing.StubbingWithDelegateTest
- )
- JAVA_TEST_EXTRA_ARGS+=( --add-opens=java.base/java.io=ALL-UNNAMED )
- JAVA_TEST_EXTRA_ARGS+=( --add-opens=java.base/java.lang=ALL-UNNAMED )
- JAVA_TEST_EXTRA_ARGS+=( --add-opens=java.base/sun.reflect.generics.reflectiveObjects=ALL-UNNAMED )
- fi
- # First run what needs to run separately
- java-pkg-simple_src_test
- # And then the other tests
- JAVA_TEST_RUN_ONLY=""
- java-pkg-simple_src_test
-}
diff --git a/dev-java/open-test-reporting-events/Manifest b/dev-java/open-test-reporting-events/Manifest
index 9ca788989fa9..32e628468570 100644
--- a/dev-java/open-test-reporting-events/Manifest
+++ b/dev-java/open-test-reporting-events/Manifest
@@ -1 +1,2 @@
DIST open-test-reporting-0.1.0-M1.tar.gz 98076 BLAKE2B 1780f24776ddbb31752044c7ebee85cd852425b295b2c61d25e36856123e0d9cd4420ecb4f88e17bba52746dd209a5160bfe3bf0c05ac544a0a94e74c49ce1b2 SHA512 75523de2342b1b1027e68eb738ffef8571d6bb81b2cb0d87c26b097d8aac98f52728a6a5f46420ce8bb051d60b226646aef47ec00eee5876b833ba4e1121f5c7
+DIST open-test-reporting-0.2.0-M1.tar.gz 1055220 BLAKE2B 9e0431e607ec9e4b4584d0a4508f4522724df851c3fcda4ddfbdd3b7202569c414de19bd45cb1093fd38dc7d4c7c982ee38b20cbec5d61b5e7d7baf5869f7efe SHA512 89ea03cf4e4b46a781d081cf7191f82f89c32c33f79bdc9b16f6f9046dc6913621d4a67885932f6dba4915a4357d0e77fd9f6b48f81d13aa601d75faeef9f77c
diff --git a/dev-java/open-test-reporting-events/open-test-reporting-events-0.2.0_pre1.ebuild b/dev-java/open-test-reporting-events/open-test-reporting-events-0.2.0_pre1.ebuild
new file mode 100644
index 000000000000..730a117287bf
--- /dev/null
+++ b/dev-java/open-test-reporting-events/open-test-reporting-events-0.2.0_pre1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 2023-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_PROVIDES=(
+ "org.opentest4j.reporting:open-test-reporting-schema:${PV}-M1"
+ "org.opentest4j.reporting:open-test-reporting-events:${PV}-M1"
+)
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Language-agnostic test reporting format and tooling"
+HOMEPAGE="https://github.com/ota4j-team/open-test-reporting"
+MY_PV="${PV/_pre/-M}"
+SRC_URI="https://github.com/ota4j-team/open-test-reporting/archive/r${MY_PV}.tar.gz -> open-test-reporting-${MY_PV}.tar.gz"
+S="${WORKDIR}/open-test-reporting-r${MY_PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64"
+
+DEPEND="
+ dev-java/apiguardian-api:0
+ >=virtual/jdk-1.8:*
+"
+
+RDEPEND=">=virtual/jre-1.8:*"
+
+JAVA_CLASSPATH_EXTRA="apiguardian-api"
+JAVADOC_CLASSPATH="${JAVA_CLASSPATH_EXTRA}"
+JAVADOC_SRC_DIRS=(
+ "schema/src/main/java"
+ "events/src/main/java"
+)
+
+src_compile() {
+ einfo "open-test-reporting-schema.jar"
+ JAVA_AUTOMATIC_MODULE_NAME="org.opentest4j.reporting.schema"
+ JAVA_JAR_FILENAME="open-test-reporting-schema.jar"
+ JAVA_RESOURCE_DIRS="schema/src/main/resources"
+ JAVA_SRC_DIR="schema/src/main/java"
+ java-pkg-simple_src_compile
+ JAVA_GENTOO_CLASSPATH_EXTRA+=":open-test-reporting-schema.jar"
+ rm -r target || die
+
+ einfo "open-test-reporting-events.jar"
+ JAVA_AUTOMATIC_MODULE_NAME="org.opentest4j.reporting.events"
+ JAVA_JAR_FILENAME="open-test-reporting-events.jar"
+ JAVA_RESOURCE_DIRS=()
+ JAVA_SRC_DIR="events/src/main/java"
+ java-pkg-simple_src_compile
+ JAVA_GENTOO_CLASSPATH_EXTRA+=":open-test-reporting-events.jar"
+ rm -r target || die
+
+ use doc && ejavadoc
+}
+
+src_install() {
+ java-pkg_dojar "open-test-reporting-schema.jar"
+ java-pkg-simple_src_install
+
+ if use source; then
+ java-pkg_dosrc "schema/src/main/java/*"
+ java-pkg_dosrc "events/src/main/java/*"
+ fi
+}
diff --git a/dev-java/openjdk-bin/Manifest b/dev-java/openjdk-bin/Manifest
index 4a1ae24a308a..51aaa078e95d 100644
--- a/dev-java/openjdk-bin/Manifest
+++ b/dev-java/openjdk-bin/Manifest
@@ -1,9 +1,9 @@
-DIST OpenJDK-jdk_aarch64_alpine-linux_hotspot_24_20-ea.tar.gz 213486173 BLAKE2B 429486689b28a436462d20691919ff90f242ea0d7f9e2f35c10596cb21780c14cfc8434531e2c75af0a486cec9004a815815ce0ac759a99612c8d325fd925230 SHA512 e003b0f91325560891c831e4e37a641699685b8e32f032040c65bf75c7557f89673976bd87ece4ad31a8e5b46f7854a830d553f91804379661319da087d9a9f1
-DIST OpenJDK-jdk_aarch64_linux_hotspot_24_20-ea.tar.gz 213435180 BLAKE2B 0163fbc674b7f04dc69bf2d57444e2f9625f22050a6ae09bd976d9d393d69c3b557332302a6ff0cc58e04ea910bb4f2bc5fda677024c06ac568df6cc57698d11 SHA512 b6fd2b0750e22dd986314314e126932dc95475314636733083d1d0f50c1e298371d418cad098e0062f6e4a3b3d4a2f50e3cf2e7954db407b01ea5f3432e606d2
-DIST OpenJDK-jdk_ppc64le_linux_hotspot_24_20-ea.tar.gz 214984344 BLAKE2B c6582a845579246f920b0ab94657870650669a30e45f0435a4ad8b63657771b5a708cf5aa417f87d9e2a7dde7fae0603864e21558e022fd39cfa818d1d5bd20b SHA512 f5e8644094b737a3eb8b1d40b2140fbc283e9c397c0dd23bc53c4678430abf84dc8f2e264ac4aee824b135e30dd3df390d8a38af5b7e7ac74e945ce081984f91
-DIST OpenJDK-jdk_riscv64_linux_hotspot_24_20-ea.tar.gz 211454913 BLAKE2B c5aec2757115c71abf2a3d711c5cc8074661ba558d7657ceb1774e2a59681a58a08e167eb17aeae7140a61aa8f32cab891c56130ea74db490a51795d81a148c6 SHA512 78e601771ce3b22c3ec361aceac53184524eccb6ae0e0434be415a7af4cd528253facaf8d161bdec691946394f8fdc47a0b37d8fd3cffae0627dbcbd347ccf98
-DIST OpenJDK-jdk_x64_alpine-linux_hotspot_24_20-ea.tar.gz 215768214 BLAKE2B 32dc974b0e13a14c79c77333bc2208b29455f5c1f2818bc2480b09ae7ff1f48e2ea9c03ae80264a4bf389bdf3df9f17157456576e943fd71713fae97110404d9 SHA512 62f1776e1b34fd5950450745e1de81ade2f882037b8bb707926c9deec19101d3623e1c9d76702d577458cbaf0d1239be5674d3752e8d58eb0200e4b446464fe1
-DIST OpenJDK-jdk_x64_linux_hotspot_24_20-ea.tar.gz 215528275 BLAKE2B abfe4b018d32fcd8c814033bfea181300b3c166694e2e3e58dbba53bf7d2b6236294e619837474cefdea972d229588e41b488d7043aca9533bc14376dcf79da9 SHA512 b7ccdb432f7f837acfbe6e617486d032bf6da191ab767e2a607ca4cea0e46b58ebc4d91b9e8611771ae0814ed60db4f9c9def3d1987b85c9f2c31bb43d6bbabc
+DIST OpenJDK-jdk_aarch64_alpine-linux_hotspot_25_4-ea.tar.gz 138221825 BLAKE2B bd623e9df390057606ce1eee4461932fadf140a8151aa8e23bcf48cfc26bebe234428e18f8ef44c0e776dc18bc76718e444563afd0990232c8b34d98fa497985 SHA512 c61d906e2ebbf734ebe685a9fb730bf4c935399cba44b1d7d47da9912b4260ebc96148f89c1d3e240d369e53a697c5eab67aa2dcc32e1f351d72afda450dd4c8
+DIST OpenJDK-jdk_aarch64_linux_hotspot_25_4-ea.tar.gz 138259949 BLAKE2B 1c4f4ad984625421bcf13f5b061da8c84a722d2dba8ff68cb6ed030a81a1402beba117af5f17fdff38c1fdae3d8d7bada727aad954f93c3cc506e9bc7e67df49 SHA512 53f49ee4ab18e09fcd23112bc0efe9e00f1c5a4ce272e09130e77e8b028a01070c7fc0560e48b03b3be5dca1e2001dd64b7609ae089dd1eaf62e5836d09ea5e0
+DIST OpenJDK-jdk_ppc64le_linux_hotspot_25_4-ea.tar.gz 138782171 BLAKE2B 9b638ab531838b296365409d50671e622ae1f13591dd3ceb8c53f568384972952b4f456a6f56f01f8695e6f55d611edfe05de5fd6718374039f58d42f533c85a SHA512 0f59cab7a817559b32964b8ddee7a27afd3ff451c7ea0d75cb2c237afffa112438e9c5446e34dd9a40dad77e0c5e3cee11f77fdeaf5b45cba83c9e23ed90bdb2
+DIST OpenJDK-jdk_riscv64_linux_hotspot_25_4-ea.tar.gz 137112283 BLAKE2B 9c4862f11615397d9052e21e6453c0e5d3a3d30bb4e8175705c3871260a964fbb04bad6a22d7d86de0eb17ebca5992c0371fc595183523cb83a41e0ecc036536 SHA512 628ec58034d0aa8091f63ce01abc454b2011f1b6e9e605c3a629c3409606ccab5a192c5bb524e75613345dfeb8f4a4465bae1bafa7898e9ee2dc2f6a0ed139e3
+DIST OpenJDK-jdk_x64_alpine-linux_hotspot_25_4-ea.tar.gz 139335710 BLAKE2B 50e089ae6eda25706ce5ccd6edd4b285e630fa8988b781a969ab19b25a0bca38c8fd755aab1ab90943f1e48f709dd14cc63de6b2827b063e418d867551253973 SHA512 b0b51fde46013b9721f4f629518fc7055b67a3e1d4cb9b142998fad028c43672a5fe0500042904d07907e6e1944c52f2aa32c5a3221801592452ad84424f73f1
+DIST OpenJDK-jdk_x64_linux_hotspot_25_4-ea.tar.gz 139230556 BLAKE2B 9bc07e9edd6b7510303c872acc2e930ceb55b26fcd083dea6728bb5bf8d2ed7e1d898dc1e5b80e49903820eb03015178fce38c17bc5d282948f3643a2e24c704 SHA512 3affbbafc267c007ab43dc82dd1f8da01a35743fa77ac872831e0f4bcd0facc0d2435e5a8b0053ba2dd6cec9b64e80da437dce3283dc2443d027c8c6e4af66f6
DIST OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.25_9.tar.gz 192125336 BLAKE2B e083ce8691f8462310eeaa7495d26519754f5bfadc8a786dd188f1dad4dc36164eea9220125340b43c9e6b4321be6e26d66a9c18247a6462e4cae9f453fe1171 SHA512 860fff5eff6ef2a29062aac0ee7f90d80dca417fb58ccbf9a9f2ca96a8dc4798a00dab42deedbc64a371d0356b17e6cd12cdc2b2879edfcec9463ffc004ce5fb
DIST OpenJDK11U-jdk_arm_linux_hotspot_11.0.25_9.tar.gz 182871332 BLAKE2B ac6ba9e02fcec38dbb685cdebf379ecdcb5041bc53a71a0896baf7f2628faaa0dd1402b045a57010e2495c16e48116fd1216fe6d4b6cf35cbc996dafe8516e0a SHA512 db0761f8b0baa82c61567a869f2c23da61470d055ecbd73c7693a7be37167282af7387006f22a0c7a46e1e71591615fac0431925987af8fb8e36d77207669856
DIST OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.25_9.tar.gz 177532830 BLAKE2B 5a2e15a9cd601dfbc6749875ee53de1ca5d41c41335e52588c778412499c4825b9108bcf8dacbe250814ff5664d8b8fceefceb738dc24c3ab3d13d292fa3d027 SHA512 8ba8c210717046ab167eeccfc8a3b18e34e77262a0aef866b6268cbd5b91bfd6ed90003ce7de852d6e24f923e044839092e5faac2f3df6273b8b3868eb7e7398
@@ -23,12 +23,6 @@ DIST OpenJDK21U-jdk_ppc64le_linux_hotspot_21.0.5_11.tar.gz 206643081 BLAKE2B e8b
DIST OpenJDK21U-jdk_riscv64_linux_hotspot_21.0.5_11.tar.gz 202809140 BLAKE2B 7ca8b039b8859856d853751f09da0d5ec84021a4c670610a5c51cba78867ba5fcf3a825a3e5d7fe1a1d75fdc00a4aeaa1439f18c24355f15838c35df2d697c8d SHA512 5c4f050d2bafa8187acb0c2fdfbc047a4560d6eed9e79a2e7298e4b0c6e05da7ba13fc78ef024b68668450d8664436bf0ba4a05fb7580bc00b4991d79b41b2e5
DIST OpenJDK21U-jdk_x64_alpine-linux_hotspot_21.0.5_11.tar.gz 207005595 BLAKE2B b63e61e46b0fe40ae81adbcf3e9f694ac82620abe80f64ccbd4d39ddd065b3fa53afa3cc6b3182d0b28e858ae70f4921bdda6e322a2ade29776d372e28190d25 SHA512 562509cc29ef465d718e3978c848e09c2f8adce9b6376a1c762076018a1a570466656d670784aba231d336dd25fba6b5bbb87960e8990914921f635173aa49ab
DIST OpenJDK21U-jdk_x64_linux_hotspot_21.0.5_11.tar.gz 206798126 BLAKE2B ed139c216a82ed9c258bc3b48fccee184f8facd4f53f607ed6db79b7fe01193a41d3097bece31b5bf53c6964c96ac5e4f473f27fbb57a3e24b58149f3bd3db3c SHA512 0b5abec819b5c49a5e3feeb80ec97f508cb4436129b94a44195eacf24ff19077a6ed49381074a37f8c9f8fc71b9964f0ff035b62eb594290574c355f8231965a
-DIST OpenJDK23U-jdk_aarch64_alpine-linux_hotspot_23.0.1_11.tar.gz 212364285 BLAKE2B 72987f790c8c3b7fbf1f07eaa36a4e87cebeed3d62c9aed36ea1baa718243c31d39c93a31cfb53b3f54228a34f6eaf3338fb9c98c792d476a676a474ee745f7a SHA512 bdebae0e2648c9a6e9334e5bf7ad3c42baef900d6c7f941d41903f2156177064d9d2c45ce37d776b5f513948320abe73eb056646da2b6fe04a662513aac44574
-DIST OpenJDK23U-jdk_aarch64_linux_hotspot_23.0.1_11.tar.gz 212358248 BLAKE2B 7d08e73b742a9405d4eb84aeca0d94c1a52abe738a8e72c49e42741893501ebded0b2c498ac5a379bd922cab483688e8e49ffd80d1686913bb0c1b250824d2e0 SHA512 2bc1d9e3a2741e1359915a2479b6f09a3877a6fbb9e358e01e0e5305585c3b974a7847da08857692bc2a65e9dadc77b443739ad1d963941ded37ea97ab8329a0
-DIST OpenJDK23U-jdk_ppc64le_linux_hotspot_23.0.1_11.tar.gz 213965373 BLAKE2B 945e1956d5ad1ab3400ee2a930d4263dbec506dc4654e36dc0a2b59aee57d024351a3a1789d8576773519db7853edf475f983c719e87e2f2f3b492bd90f6f129 SHA512 67921f45b7830dde531dd3a2ea70c9de01fba1db26d7ae7c7be8276b6d7f1c4cb5eaf12c023eeb74edcd83730bdcb88c2e8ac734af4a0c328a50e9402cc4ce69
-DIST OpenJDK23U-jdk_riscv64_linux_hotspot_23.0.1_11.tar.gz 210270830 BLAKE2B 5f637d1cbe29f51376bd4d53acb2bc71c8ea829290c932f396a40edc5d9edd6fec0dccd06ff4ef3c1698f318446014a4921155e8a56c69c5437f75da52cd2c74 SHA512 b17949738831ac9f608425d6d26837d44d6154f8a7cd29a70e862fb27c1fa38a4fd226db78de39cfe79d2439d2565e9c2548645a77101a6eb65c86755f063e50
-DIST OpenJDK23U-jdk_x64_alpine-linux_hotspot_23.0.1_11.tar.gz 214667027 BLAKE2B 0dc31688d75fe2498f86eb115d6b258e3bb60272005487275731481d4e56a5ea4c37f7467e2d2498c534d33405242b45784123d67f732bbbbc7f1fb3272bac4f SHA512 01772bd293cc87b95deafef5a0a72443c89d8e2baf19c71229d789d48900bc1c3dff1354226ecd92ae9fa6e27e15bd09e60ba52eabd8102854a2958744e49d53
-DIST OpenJDK23U-jdk_x64_linux_hotspot_23.0.1_11.tar.gz 214453113 BLAKE2B 214c74408ef2397425f374c6183d4d7d9e27ad5401199f6b7e48faf8a42a0bc2e5918896b0ebd47e0590acedb535669fe8e53858a76ee3bf0d8732155a7cecee SHA512 bcfc8ea1d835afcfbafc9f99c9e897588bf01e219dda936a4bda7e4982ff0b2cc2f21f5e3deadb0e1cf86a9a58295a25f8f82f9fadd2eab520817350a6a862c1
DIST OpenJDK8U-jdk_aarch64_linux_hotspot_8u432b06.tar.gz 102158189 BLAKE2B bcb350a98234a7483eacf6387b20563965c514d3f92620283540e1e9f0d578263f0d1490e3f230d638f69189926b9d02a12b17bfaf246e5a4da5096739a4073a SHA512 6f5921e08bcf6af7d8011df2fe380b32da2bd43ab88c014503899f55ae55df128aca2e1e90b64faac698730cba55dd80567dc023a00b8bd829f6e48a565f8f61
DIST OpenJDK8U-jdk_arm_linux_hotspot_8u432b06.tar.gz 98353185 BLAKE2B 38d09e21378af517f3ff24b17bdad3263dd4b88b7989d359bc8ac79ef6bcb65dc397dab8811e2d83cc56578dc72de3dc41d90328070b4b93352303c29fe4899c SHA512 f3f8ca2e51d04388b30a6cd52e906b0dd88ecf17da221ca6420581e8e2504f57900efae84a36a3ec3f0fa2c774d5ee79a272a9e13c7a0326cda2f11c2525638f
DIST OpenJDK8U-jdk_ppc64le_linux_hotspot_8u432b06.tar.gz 100556456 BLAKE2B ad3b5b0cf06bb76062e96d9f3dc82378e523734f6252b21af2bd63565f1c084ed535348cd5c95c67193a45785bc52ecad839e557ab7c82c022ae15ce62c682d2 SHA512 f63a81fff5e653ee7421d269fc5243b3af068408051c883475ee4be86501ecd4951a9228b40135dead84a2363d0bd87e5136908b3dbbfc354631a00b1dc4d9e1
diff --git a/dev-java/openjdk-bin/metadata.xml b/dev-java/openjdk-bin/metadata.xml
index 0c01c4d5dd44..d079faef0191 100644
--- a/dev-java/openjdk-bin/metadata.xml
+++ b/dev-java/openjdk-bin/metadata.xml
@@ -19,5 +19,6 @@
<remote-id type="github">adoptium/temurin11-binaries</remote-id>
<remote-id type="github">adoptium/temurin17-binaries</remote-id>
<remote-id type="github">adoptium/temurin21-binaries</remote-id>
+ <remote-id type="github">adoptium/temurin25-binaries</remote-id>
</upstream>
</pkgmetadata>
diff --git a/dev-java/openjdk-bin/openjdk-bin-21.0.5_p11.ebuild b/dev-java/openjdk-bin/openjdk-bin-21.0.5_p11.ebuild
index 7fc34d184029..a4636d98d3cc 100644
--- a/dev-java/openjdk-bin/openjdk-bin-21.0.5_p11.ebuild
+++ b/dev-java/openjdk-bin/openjdk-bin-21.0.5_p11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -42,7 +42,7 @@ S="${WORKDIR}/jdk-${MY_PV}"
LICENSE="GPL-2-with-classpath-exception"
SLOT=$(ver_cut 1)
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv"
IUSE="alsa cups headless-awt selinux source"
RDEPEND="
diff --git a/dev-java/openjdk-bin/openjdk-bin-23.0.1_p11.ebuild b/dev-java/openjdk-bin/openjdk-bin-23.0.1_p11.ebuild
deleted file mode 100644
index ef32c37add26..000000000000
--- a/dev-java/openjdk-bin/openjdk-bin-23.0.1_p11.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit java-vm-2 toolchain-funcs
-
-abi_uri() {
- local baseuri="https://github.com/adoptium/temurin$(ver_cut 1)-binaries/releases/download/jdk-${MY_PV}/"
- local musl=
- local os=linux
-
- case ${2} in
- *-macos) os=mac ;;
- *-solaris) os=solaris ;;
- esac
-
- if [[ ${3} == musl ]]; then
- os=alpine-linux
- musl=true
- fi
-
- echo "${2-$1}? (
- ${musl:+ elibc_musl? ( }
- ${baseuri}/OpenJDK$(ver_cut 1)U-jdk_${1}_${os}_hotspot_${MY_PV//+/_}.tar.gz
- ${musl:+ ) } )"
-}
-
-MY_PV=${PV/_p/+}
-
-DESCRIPTION="Prebuilt Java JDK binaries provided by Eclipse Temurin"
-HOMEPAGE="https://adoptium.net"
-SRC_URI="
- $(abi_uri aarch64 arm64)
- $(abi_uri aarch64 arm64 musl)
- $(abi_uri ppc64le ppc64)
- $(abi_uri x64 amd64)
- $(abi_uri x64 amd64 musl)
- $(abi_uri riscv64 riscv)
-"
-S="${WORKDIR}/jdk-${MY_PV%_beta}"
-
-LICENSE="GPL-2-with-classpath-exception"
-SLOT=$(ver_cut 1)
-# KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv"
-IUSE="alsa cups headless-awt selinux source"
-
-RDEPEND="
- >=sys-apps/baselayout-java-0.1.0-r1
- kernel_linux? (
- media-libs/fontconfig:1.0
- media-libs/freetype:2
- media-libs/harfbuzz
- elibc_glibc? ( >=sys-libs/glibc-2.2.5:* )
- elibc_musl? ( sys-libs/musl )
- sys-libs/zlib
- alsa? ( media-libs/alsa-lib )
- cups? ( net-print/cups )
- selinux? ( sec-policy/selinux-java )
- !headless-awt? (
- x11-libs/libX11
- x11-libs/libXext
- x11-libs/libXi
- x11-libs/libXrender
- x11-libs/libXtst
- )
- )"
-
-RESTRICT="preserve-libs splitdebug"
-QA_PREBUILT="*"
-
-pkg_pretend() {
- if [[ "$(tc-is-softfloat)" != "no" ]]; then
- die "These binaries require a hardfloat system."
- fi
-}
-
-src_unpack() {
- default
- if [[ ${A} == *_mac_* ]] ; then
- mv -v "${S}/Contents/Home/"* "${S}" || die
- rm -Rf "${S}/Contents" # drop macOS executable
- fi
-}
-
-src_install() {
- local dest="/opt/${P}"
- local ddest="${ED}/${dest#/}"
-
- # on macOS if they would exist they would be called .dylib, but most
- # importantly, there are no different providers, so everything
- # that's shipped works.
- if [[ ${A} != *_mac_* ]] ; then
- # Not sure why they bundle this as it's commonly available and they
- # only do so on x86_64. It's needed by libfontmanager.so. IcedTea
- # also has an explicit dependency while Oracle seemingly dlopens it.
- rm -vf lib/libfreetype.so || die
-
- # prefer system copy # https://bugs.gentoo.org/776676
- rm -vf lib/libharfbuzz.so || die
-
- # Oracle and IcedTea have libjsoundalsa.so depending on
- # libasound.so.2 but AdoptOpenJDK only has libjsound.so. Weird.
- if ! use alsa ; then
- rm -v lib/libjsound.* || die
- fi
-
- if use headless-awt ; then
- rm -v lib/lib*{[jx]awt,splashscreen}* || die
- fi
- fi
-
- if ! use source ; then
- rm -v lib/src.zip || die
- fi
-
- rm -v lib/security/cacerts || die
- dosym -r /etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts
-
- dodir "${dest}"
- cp -pPR * "${ddest}" || die
-
- # provide stable symlink
- dosym "${P}" "/opt/${PN}-${SLOT}"
-
- java-vm_install-env "${FILESDIR}"/${PN}.env.sh
- java-vm_set-pax-markings "${ddest}"
- java-vm_revdep-mask
- java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
-}
-
-pkg_postinst() {
- java-vm-2_pkg_postinst
-}
diff --git a/dev-java/openjdk-bin/openjdk-bin-24_p20_beta.ebuild b/dev-java/openjdk-bin/openjdk-bin-25_p4_beta.ebuild
index 0d6bc9a78d7a..1df73d6d9ac5 100644
--- a/dev-java/openjdk-bin/openjdk-bin-24_p20_beta.ebuild
+++ b/dev-java/openjdk-bin/openjdk-bin-25_p4_beta.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
diff --git a/dev-java/openjdk-jre-bin/openjdk-jre-bin-21.0.5_p11.ebuild b/dev-java/openjdk-jre-bin/openjdk-jre-bin-21.0.5_p11.ebuild
index 9fe0d3158b43..a2dced3a8d7e 100644
--- a/dev-java/openjdk-jre-bin/openjdk-jre-bin-21.0.5_p11.ebuild
+++ b/dev-java/openjdk-jre-bin/openjdk-jre-bin-21.0.5_p11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -21,7 +21,7 @@ SRC_URI="
DESCRIPTION="Prebuilt Java JRE binaries provided by Eclipse Temurin"
HOMEPAGE="https://adoptium.net/"
LICENSE="GPL-2-with-classpath-exception"
-KEYWORDS="~amd64"
+KEYWORDS="amd64 arm64"
IUSE="alsa cups headless-awt selinux"
RDEPEND="
diff --git a/dev-java/openjdk/Manifest b/dev-java/openjdk/Manifest
index f8f289eda29c..11fc442fb4a2 100644
--- a/dev-java/openjdk/Manifest
+++ b/dev-java/openjdk/Manifest
@@ -2,7 +2,7 @@ DIST openjdk-11.0.18-riscv.patch.xz 272672 BLAKE2B b079612032a5bf135b05bdd1da16f
DIST openjdk-11.0.25_p9.tar.gz 116541441 BLAKE2B 5be0d6e1996860f0d8f36732758207044668fdbd6e9c9b21b96c897d526f2d86a931f2b8d732ebe4b668679c0e48cb49a472baf29d4ea5785dc4edb0d8a5de2f SHA512 25971b26d04dd111a21c112f694968c8d56c3692a62eb1366a1f49617a308a3a0cb37ab92ff02cff727041d6e32cbbc345f313db46df58f9e933a801a1588e8b
DIST openjdk-17.0.13_p11.tar.gz 107315661 BLAKE2B e403a8f33d4e79dd5c77a5dbfc991b443e15bddefe7cfde6cbd6f8df29f1cf499d0bd467d23f0c1b89b92b1dca16ebfb398a5c64b8787f787465a8a5f50bdfce SHA512 6f2220b3b0b9ab4441968d487858449f0e58400bfbbf8cc322b6c9393ab44869ea27285bed1022ac531f0a9eec5b7d6a07db4f7e78b094bb5ca8cedd5f40711a
DIST openjdk-21.0.5_p11.tar.gz 112679148 BLAKE2B 6cfb2ab73e1bcc5d74c28f56e163778ca42fa1b9eda5367f2198827eae04d5a269926c97b326d1e71b2a57f2780588f538db8d3a81f367903fd967534747d3af SHA512 2fdfdb7e21fcaf97590fa54317f87169d5fdabf38027f4f6570942b2af637fc9ace3d35c3bbb0df29720e7a0f6d6a4087253a713389743ed7947e433d7b8103b
-DIST openjdk-23.0.1_p11.tar.gz 116677478 BLAKE2B ad5e8ea1f4c55627941909473401ce54a690c36d3162b108bafceb3a8a15982711876864067c960322092fa1855f4b0e199a870f1ce74e360456dccc569010a7 SHA512 9c60352aa792c2802adc14426aaeb81ea97d2462fba3e7d5692912447e64fc22c6058bf24c41ac18c72eac6759cb627e6ce174b9b407f370dd28d22838142510
+DIST openjdk-25_p4.tar.gz 122617240 BLAKE2B 21f31c40b80e4a7112894bae989c3c67b659ed45c5eca8b2c24d102db2aa259337ec8c6045472bb92383997273a7631cdc8a0ad3c84b120bcd7d1df00dad51b6 SHA512 c5ae04c92008ba868496623eb47edb67317876115af868c49653b3b2d7dfd736dba4ce76e648da5521d5121824f49e3bf9da81d9f411aed761949d29b64cb480
DIST openjdk-8.432_p06.tar.gz 92765730 BLAKE2B 9c3823ed0394730cdbf306a92062656a793dd7b57a333319282a6aa01a8150927227d3e91ee2ee975108b8c3aa2b0b87669af2971dfc27a6400fb7c4ef22d246 SHA512 263642d56915e0533c154ab51148b0f6a9860b243dddf5bbb70f49174d07dd505393fa6e257bfa34eca6e95ecd4f271737fa48fee8db93e624e8336fe488eb83
DIST openjdk-bootstrap-11.0.13_p8-ppc64.tar.xz 108215404 BLAKE2B 5e6c0b905b34b437137922b73a9724da96b8832186fea945f8c73d941db822ca1cc5718f3ecb4607ed98d1f8241c9f365b54caaf978863e8b84680a94f067b5d SHA512 732e2220219d42be10589fcaf2420da87ebc8564b4afc6bd02f61f31cdca9c31b339366e34d374fb814499b92f8aa796435a18f28e10c8cb00d9a0f5953bb60e
DIST openjdk-bootstrap-11.0.13_p8-x86.tar.xz 105420236 BLAKE2B d3137ad497937a9a04dedf38776f3ac45bf3b115d275991fd8582b72ade48390b6aa8ad89e0b4d34fa6a787a3c413dab20b32ef347dc8733544e810150c55d29 SHA512 f71a7ef8fbf19b0595dd7d4ebe52bbe1c95b8c17f34d092472c5f5ce8caf52a053f22db8587f1649f9a96ad01c0c632be343342812f5a8cc4ff843b33b8d9b0f
diff --git a/dev-java/openjdk/files/openjdk-23_p37-LIBFONTMANAGER_CFLAGS.patch b/dev-java/openjdk/files/openjdk-23_p37-LIBFONTMANAGER_CFLAGS.patch
deleted file mode 100644
index bc4d96dfc141..000000000000
--- a/dev-java/openjdk/files/openjdk-23_p37-LIBFONTMANAGER_CFLAGS.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-src/java.desktop/share/native/libfontmanager/HBShaper_Panama.c:27:10: fatal error: hb.h: No such file or directory
-
---- jdk23u-jdk-23-ga/make/modules/java.desktop/lib/ClientLibraries.gmk~ 2024-08-20 17:57:04.000000000 +0200
-+++ jdk23u-jdk-23-ga/make/modules/java.desktop/lib/ClientLibraries.gmk 2024-09-20 10:00:52.460817053 +0200
-@@ -279,6 +279,7 @@ endif
- ################################################################################
-
- ifeq ($(USE_EXTERNAL_HARFBUZZ), true)
-+ LIBFONTMANAGER_CFLAGS += $(HARFBUZZ_CFLAGS)
- LIBFONTMANAGER_EXTRA_SRC =
- LIBFONTMANAGER_LIBS += $(HARFBUZZ_LIBS)
- else
diff --git a/dev-java/openjdk/openjdk-21.0.5_p11.ebuild b/dev-java/openjdk/openjdk-21.0.5_p11-r1.ebuild
index bb3ad26ff08a..258d469289b7 100644
--- a/dev-java/openjdk/openjdk-21.0.5_p11.ebuild
+++ b/dev-java/openjdk/openjdk-21.0.5_p11-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -46,7 +46,7 @@ S="${WORKDIR}/jdk${SLOT}u-jdk-${MY_PV//+/-}"
LICENSE="GPL-2-with-classpath-exception"
SLOT="${MY_PV%%[.+]*}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
# lto temporarily disabled due to https://bugs.gentoo.org/916735
IUSE="alsa big-endian cups debug doc examples headless-awt javafx +jbootstrap selinux source +system-bootstrap systemtap"
@@ -209,6 +209,7 @@ src_configure() {
--with-lcms="${XPAK_BOOTSTRAP:-system}"
--with-libjpeg="${XPAK_BOOTSTRAP:-system}"
--with-libpng="${XPAK_BOOTSTRAP:-system}"
+ --with-stdc++lib=dynamic
--with-native-debug-symbols=$(usex debug internal none)
--with-vendor-name="Gentoo"
--with-vendor-url="https://gentoo.org"
diff --git a/dev-java/openjdk/openjdk-23.0.1_p11.ebuild b/dev-java/openjdk/openjdk-25_p4.ebuild
index c88d48ceb72d..8d8d8b9b9b4f 100644
--- a/dev-java/openjdk/openjdk-23.0.1_p11.ebuild
+++ b/dev-java/openjdk/openjdk-25_p4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -7,7 +7,6 @@ inherit check-reqs flag-o-matic java-pkg-2 java-vm-2 multiprocessing toolchain-f
# variable name format: <UPPERCASE_KEYWORD>_XPAK
PPC64_XPAK="21.0.0_p35" # big-endian bootstrap tarball
-X86_XPAK="21.0.0_p35"
# Usage: bootstrap_uri <keyword> <version> [extracond]
# Example: $(bootstrap_uri ppc64 17.0.1_p12 big-endian)
@@ -30,23 +29,25 @@ bootstrap_uri() {
# you will see, for example, jdk-17.0.4.1-ga and jdk-17.0.4.1+1, both point
# 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"
+# MY_PV="${PV%_p*}-ga" # '-ga' isn't available
+MY_PV="${PV/_p/+}"
DESCRIPTION="Open source implementation of the Java programming language"
HOMEPAGE="https://openjdk.org"
SRC_URI="
- https://github.com/${PN}/jdk23u/archive/jdk-${MY_PV}.tar.gz
+ https://github.com/${PN}/jdk/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//+/-}"
+# S="${WORKDIR}/jdk${SLOT}u-jdk-${MY_PV//+/-}"
+S="${WORKDIR}/jdk-jdk-${MY_PV//+/-}"
LICENSE="GPL-2-with-classpath-exception"
SLOT="${MY_PV%%[.+]*}"
-# KEYWORDS="" # not LTS
+# KEYWORDS="" # LTS but not yet released
# lto temporarily disabled due to https://bugs.gentoo.org/916735
IUSE="alsa big-endian cups debug doc examples headless-awt javafx +jbootstrap selinux source +system-bootstrap systemtap"
@@ -54,7 +55,7 @@ IUSE="alsa big-endian cups debug doc examples headless-awt javafx +jbootstrap se
REQUIRED_USE="
javafx? ( alsa !headless-awt )
!system-bootstrap? ( jbootstrap )
- !system-bootstrap? ( || ( ppc64 x86 ) )
+ !system-bootstrap? ( ppc64 )
"
COMMON_DEPEND="
@@ -109,8 +110,6 @@ DEPEND="
)
"
-PATCHES=( "${FILESDIR}/openjdk-23_p37-LIBFONTMANAGER_CFLAGS.patch" )
-
# The space required to build varies wildly depending on USE flags,
# ranging from 2GB to 16GB. This function is certainly not exact but
# should be close enough to be useful.
@@ -177,9 +176,6 @@ src_configure() {
export JDK_HOME
fi
- # Work around stack alignment issue, bug #647954. in case we ever have x86
- use x86 && append-flags -mincoming-stack-boundary=2
-
# bug 906987; append-cppflags doesnt work
use elibc_musl && append-flags -D_LARGEFILE64_SOURCE
@@ -211,6 +207,7 @@ src_configure() {
--with-lcms="${XPAK_BOOTSTRAP:-system}"
--with-libjpeg="${XPAK_BOOTSTRAP:-system}"
--with-libpng="${XPAK_BOOTSTRAP:-system}"
+ --with-stdc++lib=dynamic
--with-native-debug-symbols=$(usex debug internal none)
--with-vendor-name="Gentoo"
--with-vendor-url="https://gentoo.org"
diff --git a/dev-java/pdfbox/Manifest b/dev-java/pdfbox/Manifest
index bbbfdbca4ea2..45d488e2a062 100644
--- a/dev-java/pdfbox/Manifest
+++ b/dev-java/pdfbox/Manifest
@@ -39,6 +39,5 @@ DIST genko_oc_shiryo1.pdf 124896 BLAKE2B c3a9921afb052ee4fe5080a1f1e66d991e3041f
DIST ipag00303.zip 4295310 BLAKE2B b68dd7dd7a7320894d782350c4598572c31d6ef492f9572adc2aac20ca98b5c5027995c0169bf815bc1e3a64d635b0e2d4e378b749e034f2fe718bcb7901d40a SHA512 59535137c649a2f8bdbb463cd716426811a6003a65883ca6e45bb0af1d526b3889af0fba3a353e90bc8d373cd32b90a27ff9ff6916ecbccb42e922c09e9b046a
DIST ipagp00303.zip 4295877 BLAKE2B e096303106029daaedae9befb003f70c2c7d00b858f89f5f8fffb9fc73679e63ec0dde8e0304cad2c611aa74d3cf1bfea56b9ac35e6838953d38b028654f5434 SHA512 26d0a9bfba7f5457a98b0bf45a4a6b081bca4140047a0886625691231459f8c81a6cdbe523e9abcbd45fd7caed21d78f1baf3a2cf9167320f6b79be3d697cb5b
DIST n019003l.pfb 79155 BLAKE2B 2995cd6e35de2d49cc6d4a5f6c7461396b23e14c6403cd7aecedbd5cec904fd0c42a114c4c5f5079fd1fad306dd8ddba649a13424ec5183395fb0fc1cbe2abb9 SHA512 8eafe21ffa6f3d7d0a50e9f4e5bcdeb727e804b552d74e65b709e778c9ed4605e5aa63743be285f0bc17ad162768583fec4196e1d1146d98f8703359247f22d0
-DIST pdfbox-2.0.27-src.zip 15770627 BLAKE2B 9f93d597141ff3da39b69da3ce989a0cc7f4020071e5cb1609a8b86d0f12a3219037cb4c7b276acf58ee6b07d842b6d7c76e14fdf79e9efdeac401048e345f89 SHA512 59a5675f5d1d34f092adc019679f7d10e7e93c0f554a002ac29d48cbffcaa600d930309fa94a92191c01ead8da905cbb37ce5e233dcc9b8732a881d4abf75def
DIST pdfbox-2.0.32-src.zip 17094201 BLAKE2B a48677819bab371d82a956affa8a9b55a8dca2627bb301b56facb4408229639162550c67eccc843b903e28a3f6258db4b0c096c2b40c134c1f0bf6085ff122d0 SHA512 bdad289bda79e78774dd4dedb8b0531f20382038e96232eb6c55508e2187ca3d7512072e87cd293fe6d1b9967d7e6a44f39b09a3af59872bf2f307275a65f546
DIST pdfbox-2.0.32-src.zip.asc 195 BLAKE2B a3c1f8078ded155bfecca3c15ec8c9ae648ab6dbfa9c023715eabdf72f092920b0c0ddedaafed3fc6a186f05c9880fbaa703eb088b704964ac4bb8bd5dd386e8 SHA512 b6aff86c09f75234c57ae079eff71e098377e27a1b0d55911b2cd466ff74c5d529c9cd45ba20653adae3a9b5f9ecfc3e9d6df0647bae59a7b651f128ef3b39e5
diff --git a/dev-java/pdfbox/pdfbox-2.0.27.ebuild b/dev-java/pdfbox/pdfbox-2.0.27.ebuild
deleted file mode 100644
index ffe02a58ecd9..000000000000
--- a/dev-java/pdfbox/pdfbox-2.0.27.ebuild
+++ /dev/null
@@ -1,259 +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 mirror://apache/pdfbox/2.0.27/pdfbox-2.0.27-src.zip --slot 0 --keywords "~amd64 ~arm64 ~ppc64 ~x86" --ebuild pdfbox-2.0.27.ebuild
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.apache.pdfbox:pdfbox:2.0.27"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Java library and utilities for working with PDF documents"
-HOMEPAGE="https://pdfbox.apache.org/"
-SRC_URI="mirror://apache/${PN}/${PV}/${P}-src.zip
- test? (
- https://issues.apache.org/jira/secure/attachment/12481683/1.pdf -> PDFBOX-1031-1.pdf
- https://issues.apache.org/jira/secure/attachment/12481684/2.pdf -> PDFBOX-1031-2.pdf
- https://issues.apache.org/jira/secure/attachment/12486525/1_testfile1.pdf -> PDFBOX-1065-1.pdf
- https://issues.apache.org/jira/secure/attachment/12486526/2_testfile1.pdf -> PDFBOX-1065-2.pdf
- https://issues.apache.org/jira/secure/attachment/12490774/a.pdf -> PDFBOX-1100-1.pdf
- https://issues.apache.org/jira/secure/attachment/12490775/b.pdf -> PDFBOX-1100-2.pdf
- https://issues.apache.org/jira/secure/attachment/12848122/SF1199AEG%20%28Complete%29.pdf -> PDFBOX-3656.pdf
- https://issues.apache.org/jira/secure/attachment/12852207/test.pdf -> PDFBOX-3682.pdf
- https://issues.apache.org/jira/secure/attachment/12888957/079977.pdf -> PDFBOX-3940-079977.pdf
- https://issues.apache.org/jira/secure/attachment/12867113/202097.pdf -> PDFBOX-3785-202097.pdf
- https://issues.apache.org/jira/secure/attachment/12890031/670064.pdf -> PDFBOX-3947-670064.pdf
- https://issues.apache.org/jira/secure/attachment/12890034/EUWO6SQS5TM4VGOMRD3FLXZHU35V2CP2.pdf -> PDFBOX-3948-EUWO6SQS5TM4VGOMRD3FLXZHU35V2CP2.pdf
- https://issues.apache.org/jira/secure/attachment/12890037/MKFYUGZWS3OPXLLVU2Z4LWCTVA5WNOGF.pdf -> PDFBOX-3949-MKFYUGZWS3OPXLLVU2Z4LWCTVA5WNOGF.pdf
- https://issues.apache.org/jira/secure/attachment/12890042/23EGDHXSBBYQLKYOKGZUOVYVNE675PRD.pdf -> PDFBOX-3950-23EGDHXSBBYQLKYOKGZUOVYVNE675PRD.pdf
- https://issues.apache.org/jira/secure/attachment/12890047/FIHUZWDDL2VGPOE34N6YHWSIGSH5LVGZ.pdf -> PDFBOX-3951-FIHUZWDDL2VGPOE34N6YHWSIGSH5LVGZ.pdf
- https://issues.apache.org/jira/secure/attachment/12892097/c687766d68ac766be3f02aaec5e0d713_2.pdf -> PDFBOX-3964-c687766d68ac766be3f02aaec5e0d713_2.pdf
- https://issues.apache.org/jira/secure/attachment/12893582/63NGFQRI44HQNPIPEJH5W2TBM6DJZWMI.pdf -> PDFBOX-3977-63NGFQRI44HQNPIPEJH5W2TBM6DJZWMI.pdf
- https://issues.apache.org/jira/secure/attachment/12896905/GeneralForbearance.pdf -> PDFBOX-3999-GeneralForbearance.pdf
- https://issues.apache.org/jira/secure/attachment/12919726/sample.pdf -> PDFBOX-4197.pdf
- https://issues.apache.org/jira/secure/attachment/12938094/Quelldatei.pdf -> PDFBOX-4308.pdf
- https://issues.apache.org/jira/secure/attachment/12952086/form.pdf -> PDFBOX-4408.pdf
- https://issues.apache.org/jira/secure/attachment/12953423/000314.pdf -> PDFBOX-4418-000314.pdf
- https://issues.apache.org/jira/secure/attachment/12953421/000671.pdf -> PDFBOX-4418-000671.pdf
- https://issues.apache.org/jira/secure/attachment/12953866/000746.pdf -> PDFBOX-4423-000746.pdf
- https://issues.apache.org/jira/secure/attachment/12966453/cryptfilter.pdf -> PDFBOX-4517-cryptfilter.pdf
- https://issues.apache.org/jira/secure/attachment/12991833/PDFBOX-4750-test.pdf -> PDFBOX-4750.pdf
- https://issues.apache.org/jira/secure/attachment/12914331/WXMDXCYRWFDCMOSFQJ5OAJIAFXYRZ5OA.pdf -> PDFBOX-4153-WXMDXCYRWFDCMOSFQJ5OAJIAFXYRZ5OA.pdf
- https://issues.apache.org/jira/secure/attachment/12962991/NeS1078.pdf -> PDFBOX-4490.pdf
- https://issues.apache.org/jira/secure/attachment/12784025/PDFBOX-3208-L33MUTT2SVCWGCS6UIYL5TH3PNPXHIS6.pdf
- https://issues.apache.org/jira/secure/attachment/12867102/PDFBOX-3783-72GLBIGUC6LB46ELZFBARRJTLN4RBSQM.pdf
- https://issues.apache.org/jira/secure/attachment/12929821/16bit.png -> PDFBOX-4184-16bit.png
- https://issues.apache.org/jira/secure/attachment/12943502/ArrayIndexOutOfBoundsException%20COSParser -> PDFBOX-4338.pdf
- https://issues.apache.org/jira/secure/attachment/12943503/NullPointerException%20COSParser -> PDFBOX-4339.pdf
- https://issues.apache.org/jira/secure/attachment/12867433/genko_oc_shiryo1.pdf
- https://moji.or.jp/wp-content/ipafont/IPAfont/ipag00303.zip
- https://moji.or.jp/wp-content/ipafont/IPAfont/ipagp00303.zip
- https://issues.apache.org/jira/secure/attachment/12911053/n019003l.pfb
- https://issues.apache.org/jira/secure/attachment/12949710/032163.jpg -> PDFBOX-4184-032163.jpg
- https://issues.apache.org/jira/secure/attachment/13025718/lotus.jpg -> PDFBOX-5196-lotus.jpg
- https://issues.apache.org/jira/secure/attachment/13002695/13._Korona_szallo_vegzes_13.09.26.eredeti.pdf -> PDFBOX-4831.pdf
- )"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm64 ppc64"
-IUSE="+tools"
-
-PROPERTIES="test_network"
-RESTRICT="test"
-
-# Common dependencies
-# POM: pom.xml
-# commons-logging:commons-logging:1.2 -> >=dev-java/commons-logging-1.2:0
-# org.apache.pdfbox:fontbox:2.0.27 -> >=dev-java/fontbox-2.0.27:0
-# org.bouncycastle:bcmail-jdk15on:1.70 -> !!!artifactId-not-found!!!
-# org.bouncycastle:bcprov-jdk15on:1.70 -> !!!artifactId-not-found!!!
-
-CP_DEPEND="
- dev-java/bcmail:0
- dev-java/bcprov:0
- dev-java/commons-logging:0
- ~dev-java/fontbox-${PV}:0
-"
-
-# Compile dependencies
-# POM: pom.xml
-# test? com.github.jai-imageio:jai-imageio-core:1.4.0 -> >=dev-java/jai-imageio-core-1.4.0:0
-# test? com.github.jai-imageio:jai-imageio-jpeg2000:1.4.0 -> >=dev-java/jai-imageio-jpeg2000-1.4.0:0
-# test? com.googlecode.java-diff-utils:diffutils:1.3.0 -> >=dev-java/java-diff-utils-1.3.0:0
-# test? junit:junit:4.13.2 -> >=dev-java/junit-4.13.2:4
-# test? org.apache.pdfbox:jbig2-imageio:3.0.4 -> !!!suitable-mavenVersion-not-found!!!
-# test? org.mockito:mockito-core:4.8.0 -> >=dev-java/mockito-4.8.0:4
-
-DEPEND="${CP_DEPEND}
- >=virtual/jdk-1.8:*
- test? (
- dev-java/jai-imageio-core:0
- dev-java/jai-imageio-jpeg2000:0
- dev-java/java-diff-utils:0
- dev-java/jbig2-imageio:0
- dev-java/mockito:4
- )"
-
-RDEPEND="${CP_DEPEND}
- >=virtual/jre-1.8:*"
-
-BDEPEND="app-arch/unzip"
-
-DOCS=( README.md {NOTICE,RELEASE-NOTES}.txt )
-
-S="${WORKDIR}/${P}"
-
-JAVA_GENTOO_CLASSPATH_EXTRA="pdfbox.jar:pdfbox-debugger.jar"
-JAVA_TEST_GENTOO_CLASSPATH="jai-imageio-core,jai-imageio-jpeg2000,java-diff-utils,jbig2-imageio,junit-4,mockito-4"
-
-JAVA_TEST_EXCLUDES=(
- # excluded upstream according to
- # https://github.com/apache/pdfbox/blob/2.0.27/pdfbox/pom.xml#L123
- "org.apache.pdfbox.rendering.TestPDFToImage"
-
- # Causing test failures. Upstream does not run these tests.
- "org.apache.pdfbox.cos.TestCOSBase"
- "org.apache.pdfbox.cos.TestCOSNumber"
-)
-
-src_compile() {
- einfo "Compiling pdfbox"
- JAVA_AUTOMATIC_MODULE_NAME="org.apache.pdfbox"
- JAVA_JAR_FILENAME="pdfbox.jar"
- JAVA_RESOURCE_DIRS="pdfbox/src/main/resources"
- JAVA_SRC_DIR="pdfbox/src/main/java"
- java-pkg-simple_src_compile
-
- if use tools; then
- einfo "Compiling debugger"
- JAVA_AUTOMATIC_MODULE_NAME=""
- JAVA_JAR_FILENAME="pdfbox-debugger.jar"
- JAVA_RESOURCE_DIRS="debugger/src/main/resources"
- JAVA_SRC_DIR="debugger/src/main/java"
- java-pkg-simple_src_compile
-
- einfo "Compiling pdfbox-tools"
- JAVA_JAR_FILENAME="pdfbox-tools.jar"
- JAVA_RESOURCE_DIRS=""
- JAVA_SRC_DIR="tools/src/main/java"
- java-pkg-simple_src_compile
- fi
-
- if use doc; then
- einfo "Compiling javadocs"
- JAVA_SRC_DIR=(
- "${S}/pdfbox/src/main/java"
- "${S}/debugger/src/main/java"
- )
- if use tools; then
- JAVA_SRC_DIR+=( "${S}/tools/src/main/java" )
- fi
- JAVA_JAR_FILENAME="ignoreme.jar"
- java-pkg-simple_src_compile
- fi
-}
-
-src_test() {
- # @Ignore 2 tests which otherwise would fail
- # 'mvn test' skips them
- sed \
- -e '/import org.junit.Test/a import org.junit.Ignore;' \
- -e '/testPDFBox3826()/i @Ignore' \
- -e '/testPDFBox5484()/i @Ignore' \
- -i pdfbox/src/test/java/org/apache/pdfbox/pdmodel/font/PDFontTest.java || die
-
- einfo "Testing pdfbox"
- JAVA_TEST_SRC_DIR="pdfbox/src/test/java"
- JAVA_TEST_RESOURCE_DIRS="pdfbox/src/test/resources"
-
- # tests failed with S="${WORKDIR}/${P}"
- find pdfbox/src/test/ -type f -exec sed -i 's:src/test/resources:pdfbox/src/test/resources:' {} + || die
-
- mkdir --parents target/pdfs || die
- cp \
- "${DISTDIR}"/PDFBOX-1031-1.pdf \
- "${DISTDIR}"/PDFBOX-1031-2.pdf \
- "${DISTDIR}"/PDFBOX-1065-1.pdf \
- "${DISTDIR}"/PDFBOX-1065-2.pdf \
- "${DISTDIR}"/PDFBOX-1100-1.pdf \
- "${DISTDIR}"/PDFBOX-1100-2.pdf \
- "${DISTDIR}"/PDFBOX-3656.pdf \
- "${DISTDIR}"/PDFBOX-3682.pdf \
- "${DISTDIR}"/PDFBOX-3940-079977.pdf \
- "${DISTDIR}"/PDFBOX-3785-202097.pdf \
- "${DISTDIR}"/PDFBOX-3947-670064.pdf \
- "${DISTDIR}"/PDFBOX-3948-EUWO6SQS5TM4VGOMRD3FLXZHU35V2CP2.pdf \
- "${DISTDIR}"/PDFBOX-3949-MKFYUGZWS3OPXLLVU2Z4LWCTVA5WNOGF.pdf \
- "${DISTDIR}"/PDFBOX-3950-23EGDHXSBBYQLKYOKGZUOVYVNE675PRD.pdf \
- "${DISTDIR}"/PDFBOX-3951-FIHUZWDDL2VGPOE34N6YHWSIGSH5LVGZ.pdf \
- "${DISTDIR}"/PDFBOX-3964-c687766d68ac766be3f02aaec5e0d713_2.pdf \
- "${DISTDIR}"/PDFBOX-3977-63NGFQRI44HQNPIPEJH5W2TBM6DJZWMI.pdf \
- "${DISTDIR}"/PDFBOX-3999-GeneralForbearance.pdf \
- "${DISTDIR}"/PDFBOX-4197.pdf \
- "${DISTDIR}"/PDFBOX-4308.pdf \
- "${DISTDIR}"/PDFBOX-4408.pdf \
- "${DISTDIR}"/PDFBOX-4418-000314.pdf \
- "${DISTDIR}"/PDFBOX-4418-000671.pdf \
- "${DISTDIR}"/PDFBOX-4423-000746.pdf \
- "${DISTDIR}"/PDFBOX-4517-cryptfilter.pdf \
- "${DISTDIR}"/PDFBOX-4750.pdf \
- "${DISTDIR}"/PDFBOX-4153-WXMDXCYRWFDCMOSFQJ5OAJIAFXYRZ5OA.pdf \
- "${DISTDIR}"/PDFBOX-4490.pdf \
- "${DISTDIR}"/PDFBOX-3208-L33MUTT2SVCWGCS6UIYL5TH3PNPXHIS6.pdf \
- "${DISTDIR}"/PDFBOX-3783-72GLBIGUC6LB46ELZFBARRJTLN4RBSQM.pdf \
- "${DISTDIR}"/PDFBOX-4338.pdf \
- "${DISTDIR}"/PDFBOX-4339.pdf \
- "${DISTDIR}"/genko_oc_shiryo1.pdf \
- "${DISTDIR}"/PDFBOX-4831.pdf \
- "target/pdfs" || die
-
- mkdir target/fonts || die
- cp "${DISTDIR}"/n019003l.pfb "target/fonts" || die
- unzip "${DISTDIR}"/ipag00303.zip -d "target/fonts" || die
- unzip "${DISTDIR}"/ipagp00303.zip -d "target/fonts" || die
-
- mkdir target/imgs || die
- cp \
- "${DISTDIR}"/PDFBOX-5196-lotus.jpg \
- "${DISTDIR}"/PDFBOX-4184-032163.jpg \
- "${DISTDIR}"/PDFBOX-4184-16bit.png \
- "target/imgs" || die
-
- java-pkg-simple_src_test
- rm -r target/test-classes || die # avoid to run previous tests again
-
- if use tools; then
- einfo "Testing pdfbox-tools"
- find tools/src/test/ -type f -exec sed -i 's:src/test/resources:tools/src/test/resources:' {} + || die
- JAVA_TEST_SRC_DIR="tools/src/test/java"
- JAVA_TEST_RESOURCE_DIRS="tools/src/test/resources"
- java-pkg-simple_src_test
- fi
-}
-
-src_install() {
- default
-
- java-pkg_dojar "pdfbox.jar"
- if use tools; then
- java-pkg_dojar "pdfbox-debugger.jar"
- java-pkg_dojar "pdfbox-tools.jar"
- java-pkg_dolauncher ${PN} --main org.apache.pdfbox.tools.PDFBox
- fi
-
- if use doc; then
- java-pkg_dojavadoc target/api
- fi
-
- if use source; then
- java-pkg_dosrc \
- "${S}/pdfbox/src/main/java/*" \
- "${S}/debugger/src/main/java/*" \
- "${S}/tools/src/main/java/*"
- fi
-}
diff --git a/dev-java/pdfbox/pdfbox-2.0.32.ebuild b/dev-java/pdfbox/pdfbox-2.0.32.ebuild
index 07947842d4d5..4f9eaa1c47a4 100644
--- a/dev-java/pdfbox/pdfbox-2.0.32.ebuild
+++ b/dev-java/pdfbox/pdfbox-2.0.32.ebuild
@@ -60,7 +60,7 @@ S="${WORKDIR}/${P}"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 arm64 ~ppc64"
+KEYWORDS="amd64 arm64 ppc64"
IUSE="+tools"
PROPERTIES="test_network"
diff --git a/dev-java/protobuf-java/Manifest b/dev-java/protobuf-java/Manifest
index 6bf868efd1e4..a029cdbdd17a 100644
--- a/dev-java/protobuf-java/Manifest
+++ b/dev-java/protobuf-java/Manifest
@@ -1,4 +1,5 @@
-DIST protobuf-27.2.tar.gz 6282174 BLAKE2B 86d12e9f87e8e1c2961ad517115c8689a8dd984722513816d8d626e59a76f5e7a698a90cbf6007daacf66c6053c9ff28108ff113579a442ce61cd221178bda44 SHA512 664c66b62cf1ed0c65d9b910d8e67d4d5d471113697f1b8edf1573cd5c0fc8e850ac53ce984e48e6c6b9cbbefa12f8530058384e7388e65a59c1e46d03772397
DIST protobuf-28.3.tar.gz 9256608 BLAKE2B 05162124676abe18300481e9f985fd2cfb09b052d06670a993e79ef02f3daf0d5380b521977ebc2362d4094486151ea285fe1c98a1d2f3799b18a1fa422fdc13 SHA512 a91e175fed7eb01c4240842a5af73a7d3cefccbb10885434bceeb7bc89ab6c56a74912cee290bf46e81d4026f3c9c2b10faad5545816064e215c4bae7908263d
DIST protobuf-29.1.tar.gz 9363710 BLAKE2B 8d43358c17f14a807391f37796226b9cedef3ef27ef536a6cb50a7a336a80fe221777ba669f3cee7e6a33a4decfc64e3b091d658de73e24a708297e2a539322c SHA512 eb604b473e09a5a001bf451ccd417cdb8732ebd3c2075fa46f3d0e48b7ed4d458f05d2e09eedc71c0f4252ba18d3161837efb7a2eed46d78b9eb3cc9b45f96ff
+DIST protobuf-29.2.tar.gz 9348408 BLAKE2B 847798474bc6a76b9badfdbf605e118dece5e321e81242d7fa1bf5f5d17ee05a3d365ec112dc6d861cade97efff8be1d5d04006a5144f613bdb3ff5eacc63b99 SHA512 aeb21773edc3dd92a6c1ba6ccd721cc8a20d61230a5309c75ee3ef19baa554c228a6d1095f191ccc18f10183b646f3140dfe6526f5812bcaa64b7d5260572643
+DIST protobuf-29.3.tar.gz 9348951 BLAKE2B 8d37daac6f0d832e5bff5c56b9be73fce1fe016ca4e905f4c66d8fea20fabbee54a6be2c824f503d40f8492a4ec6280a539c454de9a118b69ebc57f2afe3d965 SHA512 0c776133f5789d21baa8860cb41e7926a162d74810a01722b762a78f93e559494e903fcaa092515bfe2ce057fd065a5dd000b316edb1af32c2ef9dbadf02b4c6
DIST truth-1.1.3.jar 243021 BLAKE2B a59149038c62ef5dd352b13d4b393e1b7715fbafe5ed86ec2d16d722c738a31dcdca10132fc73b17b367ac4309e5407ba2e489f8d4c8fbca60ce5f35ae75d1e3 SHA512 f29a9fb070aff8a32358a7b6c8998c0095de5d8d68afa7f7bac759c7050309deff929e767657ecbbefd96163460f10255ca01bc567ab30df4834b9d916a4fae8
diff --git a/dev-java/protobuf-java/protobuf-java-4.29.1.ebuild b/dev-java/protobuf-java/protobuf-java-4.29.1.ebuild
index d8c59df716a3..dba71ddc49ae 100644
--- a/dev-java/protobuf-java/protobuf-java-4.29.1.ebuild
+++ b/dev-java/protobuf-java/protobuf-java-4.29.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2008-2024 Gentoo Authors
+# Copyright 2008-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -24,7 +24,7 @@ S="${WORKDIR}/protobuf-${MY_PV}"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~amd64-linux ~x86-linux ~x64-macos"
IUSE="system-protoc"
BDEPEND="
diff --git a/dev-java/protobuf-java/protobuf-java-4.27.2.ebuild b/dev-java/protobuf-java/protobuf-java-4.29.2.ebuild
index 679d42cc7238..494374fa8dcd 100644
--- a/dev-java/protobuf-java/protobuf-java-4.27.2.ebuild
+++ b/dev-java/protobuf-java/protobuf-java-4.29.2.ebuild
@@ -12,21 +12,23 @@ inherit java-pkg-2 java-pkg-simple cmake
DESCRIPTION="Core Protocol Buffers library"
HOMEPAGE="https://protobuf.dev"
# Currently we bundle the binary version of truth.jar used only for tests, we don't install it.
-# And we build artifact 4.27.2 from the 27.2 tarball in order to allow sharing the tarball with
+# And we build artifact 4.29.2 from the 29.2 tarball in order to allow sharing the tarball with
# dev-libs/protobuf.
MY_PV4="${PV#4.}"
MY_PV="${MY_PV4/_rc/-rc}"
-SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${MY_PV}.tar.gz -> protobuf-${MY_PV}.tar.gz
- test? ( https://repo1.maven.org/maven2/com/google/truth/truth/1.1.3/truth-1.1.3.jar )"
+MY_P="protobuf-${MY_PV}.tar.gz"
+TV="1.1.3"
+SRC_URI="https://github.com/protocolbuffers/protobuf/releases/download/v${MY_PV}/${MY_P}
+ test? ( https://repo1.maven.org/maven2/com/google/truth/truth/${TV}/truth-${TV}.jar )"
S="${WORKDIR}/protobuf-${MY_PV}"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~amd64-linux ~x86-linux ~x64-macos"
IUSE="system-protoc"
BDEPEND="
- system-protoc? ( ~dev-libs/protobuf-${MY_PV4}:0 )
+ system-protoc? ( ~dev-libs/protobuf-${MY_PV4}:0[protoc] )
!system-protoc? ( >=dev-cpp/abseil-cpp-20230802.0 )
"
DEPEND="
@@ -56,14 +58,12 @@ run-protoc() {
src_prepare() {
# If the corrsponding version of system-protoc is not available we build protoc locally
- if use system-protoc; then
- default # apply patches
- else
+ if ! use system-protoc; then
cmake_src_prepare
fi
java-pkg-2_src_prepare
- # https://github.com/protocolbuffers/protobuf/blob/v27.2/java/core/generate-sources-build.xml
+ # ${S}/java/core/generate-sources-build.xml
einfo "Replace variables in generate-sources-build.xml"
sed \
-e 's:${generated.sources.dir}:java/core/src/main/java:' \
@@ -73,7 +73,7 @@ src_prepare() {
-e '/project\|echo\|mkdir\|exec/d' \
-i java/core/generate-sources-build.xml || die "sed to sources failed"
- # https://github.com/protocolbuffers/protobuf/blob/v27.2/java/core/generate-test-sources-build.xml
+ # ${S}/java/core/generate-test-sources-build.xml
einfo "Replace variables in generate-test-sources-build.xml"
sed \
-e 's:${generated.testsources.dir}:java/core/src/test/java:' \
@@ -93,17 +93,13 @@ src_configure() {
-Dprotobuf_BUILD_TESTS=OFF
-Dprotobuf_ABSL_PROVIDER=package
)
- if use system-protoc; then
- :
- else
+ if ! use system-protoc; then
cmake_src_configure
fi
}
src_compile() {
- if use system-protoc; then
- :
- else
+ if ! use system-protoc; then
cmake_src_compile
fi
@@ -116,12 +112,7 @@ src_compile() {
}
src_test() {
- # https://github.com/protocolbuffers/protobuf/blob/v27.2/java/core/pom.xml#L63-L71
- jar cvf testdata.jar \
- -C src google/protobuf/testdata/golden_message_oneof_implemented \
- -C src google/protobuf/testdata/golden_packed_fields_message || die
-
- JAVA_GENTOO_CLASSPATH_EXTRA="${DISTDIR}/truth-1.1.3.jar:testdata.jar"
+ JAVA_GENTOO_CLASSPATH_EXTRA="${DISTDIR}/truth-${TV}.jar"
# google/protobuf/java_features.proto: File not found.
cp {java/core/src/main/resources,src}/google/protobuf/java_features.proto || die
diff --git a/dev-java/protobuf-java/protobuf-java-4.29.3.ebuild b/dev-java/protobuf-java/protobuf-java-4.29.3.ebuild
new file mode 100644
index 000000000000..11ee57d92df5
--- /dev/null
+++ b/dev-java/protobuf-java/protobuf-java-4.29.3.ebuild
@@ -0,0 +1,152 @@
+# Copyright 2008-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="com.google.protobuf:protobuf-java:${PV}"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple cmake
+
+DESCRIPTION="Core Protocol Buffers library"
+HOMEPAGE="https://protobuf.dev"
+# Currently we bundle the binary version of truth.jar used only for tests, we don't install it.
+# And we build artifact 4.29.3 from the 29.3 tarball in order to allow sharing the tarball with
+# dev-libs/protobuf.
+MY_PV4="${PV#4.}"
+MY_PV="${MY_PV4/_rc/-rc}"
+MY_P="protobuf-${MY_PV}.tar.gz"
+TV="1.1.3"
+SRC_URI="https://github.com/protocolbuffers/protobuf/releases/download/v${MY_PV}/${MY_P}
+ test? ( https://repo1.maven.org/maven2/com/google/truth/truth/${TV}/truth-${TV}.jar )"
+S="${WORKDIR}/protobuf-${MY_PV}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~amd64-linux ~x86-linux ~x64-macos"
+IUSE="system-protoc"
+
+BDEPEND="
+ system-protoc? ( ~dev-libs/protobuf-${MY_PV4}:0[protoc] )
+ !system-protoc? ( >=dev-cpp/abseil-cpp-20230802.0 )
+"
+DEPEND="
+ >=virtual/jdk-1.8:*
+ test? (
+ dev-java/guava:0
+ dev-java/mockito:4
+ )
+"
+RDEPEND=">=virtual/jre-1.8:*"
+
+JAVA_AUTOMATIC_MODULE_NAME="com.google.protobuf"
+JAVA_JAR_FILENAME="protobuf.jar"
+JAVA_RESOURCE_DIRS="java/core/src/main/resources"
+JAVA_SRC_DIR="java/core/src/main/java"
+
+JAVA_TEST_GENTOO_CLASSPATH="guava,junit-4,mockito-4"
+JAVA_TEST_SRC_DIR="java/core/src/test/java"
+
+run-protoc() {
+ if use system-protoc; then
+ protoc $1
+ else
+ "${BUILD_DIR}"/protoc $1
+ fi
+}
+
+src_prepare() {
+ # If the corrsponding version of system-protoc is not available we build protoc locally
+ if ! use system-protoc; then
+ cmake_src_prepare
+ fi
+ java-pkg-2_src_prepare
+
+ # ${S}/java/core/generate-sources-build.xml
+ einfo "Replace variables in generate-sources-build.xml"
+ sed \
+ -e 's:${generated.sources.dir}:java/core/src/main/java:' \
+ -e 's:${protobuf.java_source.dir}:java/core/src/main/resources:' \
+ -e 's:${protobuf.source.dir}:src:' \
+ -e 's:^.*value="::' -e 's:\"/>::' \
+ -e '/project\|echo\|mkdir\|exec/d' \
+ -i java/core/generate-sources-build.xml || die "sed to sources failed"
+
+ # ${S}/java/core/generate-test-sources-build.xml
+ einfo "Replace variables in generate-test-sources-build.xml"
+ sed \
+ -e 's:${generated.testsources.dir}:java/core/src/test/java:' \
+ -e 's:${protobuf.source.dir}:src:' \
+ -e 's:${test.proto.dir}:java/core/src/test/proto:' \
+ -e 's:^.*value="::' -e 's:\"/>::' \
+ -e '/project\|mkdir\|exec\|Also generate/d' \
+ -i java/core/generate-test-sources-build.xml || die "sed to test sources failed"
+
+ # Split the file in two parts, one for each run-protoc call
+ awk '/--java_out/{x="test-sources-build-"++i;}{print > x;}' \
+ java/core/generate-test-sources-build.xml || die
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -Dprotobuf_BUILD_TESTS=OFF
+ -Dprotobuf_ABSL_PROVIDER=package
+ )
+ if ! use system-protoc; then
+ cmake_src_configure
+ fi
+}
+
+src_compile() {
+ if ! use system-protoc; then
+ cmake_src_compile
+ fi
+
+ einfo "Run protoc to generate sources"
+ run-protoc \
+ @java/core/generate-sources-build.xml \
+ || die "protoc sources failed"
+
+ java-pkg-simple_src_compile
+}
+
+src_test() {
+ JAVA_GENTOO_CLASSPATH_EXTRA="${DISTDIR}/truth-${TV}.jar"
+
+ # google/protobuf/java_features.proto: File not found.
+ cp {java/core/src/main/resources,src}/google/protobuf/java_features.proto || die
+
+ einfo "Running protoc on first part of generate-test-sources-build.xml"
+ run-protoc @test-sources-build-1 \
+ || die "run-protoc test-sources-build-1 failed"
+
+ einfo "Running protoc on second part of generate-test-sources-build.xml"
+ run-protoc @test-sources-build-2 \
+ || die "run-protoc test-sources-build-2 failed"
+
+ # java/core/src/test/java/editions_unittest/TestDelimited.java:2867:
+ # error: package editions_unittest.MessageImport does not exist
+ rm java/core/src/test/java/com/google/protobuf/TextFormatTest.java || die
+
+ einfo "Running tests"
+ # Invalid test class 'map_test.MapInitializationOrderTest':
+ # 1. Test class should have exactly one public constructor
+ # Invalid test class 'protobuf_unittest.CachedFieldSizeTest':
+ # 1. Test class should have exactly one public constructor
+ pushd "${JAVA_TEST_SRC_DIR}" || die
+ local JAVA_TEST_RUN_ONLY=$(find * \
+ -path "**/*Test.java" \
+ ! -path "**/Abstract*Test.java" \
+ ! -name "MapInitializationOrderTest.java" \
+ ! -path '*protobuf_unittest/CachedFieldSizeTest.java'
+ )
+ popd
+ JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}"
+ JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}"
+ java-pkg-simple_src_test
+}
+
+src_install() {
+ java-pkg-simple_src_install
+}
diff --git a/dev-java/randomized-runner/Manifest b/dev-java/randomized-runner/Manifest
index fb49dab86549..b384b1faa896 100644
--- a/dev-java/randomized-runner/Manifest
+++ b/dev-java/randomized-runner/Manifest
@@ -1,2 +1 @@
-DIST randomized-runner-2.8.0.tar.gz 1506178 BLAKE2B 0f142b5f90ea0aaf0934415ad772bf1363c75d371fb964398259e46af1879f2cd3520c9d3eff60b1614bef7fd64003d3ff868302cdc5421197085133dd856ba4 SHA512 e7fba917bf30a7ae4ea68301ec26bfa1b5659ea6124417ef494cc915b26bb07343ce8784dfd718032410ae750601f73ad56cd0a1bab3b2013559fc020694fb7f
DIST randomized-runner-2.8.2.tar.gz 1508257 BLAKE2B 5b590ef8c19e7e928b3e8bfdd95bc20019922419e464da6e2189a37db3239d3e6beb7b2712c3e9d50ba16d758ad51dfcb17d91912163054a3b0697fdd2dded31 SHA512 e180b32f5bdad1028cade2e0e4daad9211b9ff2556bd80b27e062a0f2292d9cbc215154ba8a629429c0e477f979f7a2f29c675c9bfed16286fb9ab4367e59555
diff --git a/dev-java/randomized-runner/randomized-runner-2.8.0.ebuild b/dev-java/randomized-runner/randomized-runner-2.8.0.ebuild
deleted file mode 100644
index 3bbf53b90023..000000000000
--- a/dev-java/randomized-runner/randomized-runner-2.8.0.ebuild
+++ /dev/null
@@ -1,57 +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/randomizedtesting/randomizedtesting/archive/release/2.8.0.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild randomized-runner-2.8.0.ebuild
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="com.carrotsearch.randomizedtesting:randomizedtesting-runner:2.8.0"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="JUnit test runner and plugins for running JUnit tests with pseudo-randomness"
-HOMEPAGE="https://labs.carrotsearch.com/randomizedtesting.html"
-SRC_URI="https://github.com/randomizedtesting/randomizedtesting/archive/release/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm64 ppc64"
-
-CP_DEPEND="
- dev-java/junit:4
-"
-
-DEPEND="
- >=virtual/jdk-1.8:*
- ${CP_DEPEND}
- test? (
- dev-java/assertj-core:3
- )
-"
-
-RDEPEND="
- >=virtual/jre-1.8:*
- ${CP_DEPEND}"
-
-DOCS=( ../{CHANGES,CONTRIBUTING,README}.txt )
-
-S="${WORKDIR}/randomizedtesting-release-${PV}/${PN}"
-
-JAVA_SRC_DIR="src/main/java"
-
-JAVA_TEST_GENTOO_CLASSPATH="assertj-core-3,junit-4"
-JAVA_TEST_SRC_DIR="src/test/java"
-
-src_test() {
- local vm_version="$(java-config -g PROVIDES_VERSION)"
- if [[ "${vm_version}" -ge "17" ]] ; then
- JAVA_TEST_EXTRA_ARGS+=( --add-opens=java.base/java.lang=ALL-UNNAMED )
- JAVA_TEST_EXTRA_ARGS+=( --add-opens=java.base/java.util=ALL-UNNAMED )
- JAVA_TEST_EXTRA_ARGS+=( --add-opens=java.base/sun.nio.fs=ALL-UNNAMED )
- fi
-
- java-pkg-simple_src_test
-}
diff --git a/dev-java/randomized-runner/randomized-runner-2.8.2.ebuild b/dev-java/randomized-runner/randomized-runner-2.8.2.ebuild
index 4ad376fc8c6a..cf6edd323b25 100644
--- a/dev-java/randomized-runner/randomized-runner-2.8.2.ebuild
+++ b/dev-java/randomized-runner/randomized-runner-2.8.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -16,7 +16,7 @@ S="${WORKDIR}/randomizedtesting-release-${PV}/${PN}"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64"
+KEYWORDS="amd64 arm64 ppc64"
CP_DEPEND="dev-java/junit:4"
diff --git a/dev-java/saslprep/saslprep-1.1-r1.ebuild b/dev-java/saslprep/saslprep-1.1-r2.ebuild
index 9fc2ec1f9f2f..adebf53a875d 100644
--- a/dev-java/saslprep/saslprep-1.1-r1.ebuild
+++ b/dev-java/saslprep/saslprep-1.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -14,9 +14,9 @@ SRC_URI="https://repo1.maven.org/maven2/com/ongres/stringprep/saslprep/${PV}/sas
LICENSE="BSD-2"
SLOT="0"
-KEYWORDS="amd64 ppc64"
+KEYWORDS="amd64 ~ppc64"
-CP_DEPEND="dev-java/stringprep:0"
+CP_DEPEND="~dev-java/stringprep-${PV}:0"
DEPEND=">=virtual/jdk-1.8:*
${CP_DEPEND}"
RDEPEND=">=virtual/jre-1.8:*
diff --git a/dev-java/scala-cli-bin/Manifest b/dev-java/scala-cli-bin/Manifest
index 58df934e0a5f..6d82f7da4276 100644
--- a/dev-java/scala-cli-bin/Manifest
+++ b/dev-java/scala-cli-bin/Manifest
@@ -1,3 +1,6 @@
DIST scala-cli-amd64-1.5.1.gz 34375992 BLAKE2B 4af5f420df9ef15e4252bc65dc17b3c9df516e784cf5d5e48cc93686c6a068e13b5098c552d8c9155739eb56cecb7e410289025f3281135b9d7d4cfc5e0d5cd5 SHA512 0adcc503fd7de00d0df97c5c31c7fca18e6ce4e6f91b8a07ae4f94107b289f7301513d22ab6ab06f74a956b0ceb648cd487105ab5289c477c52287466e1d6e45
+DIST scala-cli-amd64-1.5.4.gz 34280702 BLAKE2B 9bbfa286a66bfb41dce3222496a302b30f45c021cf2c82a3657c4de786f91ce79b4c551213bbaa4cc3ca34b289c9c440203aeb65093633f79df538881c5cb08e SHA512 bc905499117e24b78c5beca91fb4cf34063c2bb48000b920c085346ae11db15b9c0905ec6846794ac706bd06874130e8981a2f5ff4a47f5f93a1238e530e3709
DIST scala-cli-arm64-1.5.1.gz 34284162 BLAKE2B 1db3c49d52a47ab276600d6e29179a920256ba56262cac0368dd8e8ddfd6f1b570a5124b64bc4005a7212801ad8615997a3f91f807e878a989e1359d053ea10e SHA512 026cfde5c108df8d91acf3394a53dfb49a962cd6ac1a1be78c4601afa4823d410205ad147bb8830b17923d209a0333d75b50dede1a00208081f64928e4198364
+DIST scala-cli-arm64-1.5.4.gz 34215069 BLAKE2B 0e54f4580a5c28c8992ca48ed96e5d31104016320060c2e56c1687267211b03401ed3f5486138f80abe5349bd218bf86966c9f57d44240aa6a2416e7af52f797 SHA512 ad90eb6436f1d82d9625cce250fc5c8d614dab9d9918dd8243993a5df6648f91f4969df96ead50774cf9712d22f161a5852ba47746f89b27f8225850f3f3395d
DIST scala-cli-non-native-1.5.1 8105280 BLAKE2B 2957eeda0c27f6c91de9cb36f103d5f9bfdcff5110e8c5b51c6067c756c1592f6e5e94f59b9471260bcd50369f50874ca6901466e4bc2e654e51c3666763620e SHA512 600b66c8db534f6e04c8a3ada969b998bb5923e9ec2322dc1919032c4221bfb3c259dda7abdf7f862d9693d4658fedef607d6a85094d1e6c6ed7f4655d9a8146
+DIST scala-cli-non-native-1.5.4 8122943 BLAKE2B 10e3ef02dcdc72e3d3ca0de693242d82ea18fc6358c955a71be77a0086bd6f67ec7ceddabb1746a00f125a55a0bad2800d54dfc0d94fc53cbd6ffb8ae185f604 SHA512 f0068a4b7f338b5fd59020270a2fb7bc15773bee3fb12a52311ef3b587e2ceb7f3cbe81480d2198e68f3bb1997f2861ddd90f89a7c7bc0c153d4f541075fa6c3
diff --git a/dev-java/scala-cli-bin/scala-cli-bin-1.5.4.ebuild b/dev-java/scala-cli-bin/scala-cli-bin-1.5.4.ebuild
new file mode 100644
index 000000000000..8265419c2174
--- /dev/null
+++ b/dev-java/scala-cli-bin/scala-cli-bin-1.5.4.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit bash-completion-r1
+
+UPSTREAM_PV=${PV/_/-}
+UPSTREAM_PV=${UPSTREAM_PV/rc/RC}
+
+DESCRIPTION="CLI to interact with Scala and Java"
+HOMEPAGE="https://scala-cli.virtuslab.org/"
+SRC_URI="
+ !amd64? ( !arm64? (
+ https://github.com/VirtusLab/scala-cli/releases/download/v${UPSTREAM_PV}/scala-cli
+ -> scala-cli-non-native-${UPSTREAM_PV}
+ ) )
+ amd64? (
+ https://github.com/VirtusLab/scala-cli/releases/download/v${UPSTREAM_PV}/scala-cli-x86_64-pc-linux.gz
+ -> scala-cli-amd64-${UPSTREAM_PV}.gz
+ )
+ arm64? (
+ https://github.com/VirtusLab/scala-cli/releases/download/v${UPSTREAM_PV}/scala-cli-aarch64-pc-linux.gz
+ -> scala-cli-arm64-${UPSTREAM_PV}.gz
+ )
+"
+
+S="${WORKDIR}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+
+# A JRE is not strictly required if native images of scala-cli are used
+# (amd64, arm64). However we may want a system JRE anyway, and having JRE
+# in RDEPEND reduces the chances that scala-cli needs to install one
+# for the user.
+RDEPEND="
+ >=virtual/jre-11
+ sys-libs/zlib
+"
+BDEPEND="!amd64? ( !arm64? ( >=virtual/jre-11 ) )"
+
+QA_TEXTRELS="*"
+QA_FLAGS_IGNORED="/usr/bin/scala-cli"
+
+src_prepare() {
+ default
+
+ if use amd64; then
+ mv scala-cli-amd64-${UPSTREAM_PV} scala-cli || die
+ elif use arm64; then
+ mv scala-cli-arm64-${UPSTREAM_PV} scala-cli || die
+ else
+ mv scala-cli-non-native-${UPSTREAM_PV} scala-cli || die
+ fi
+
+ chmod +x scala-cli || die
+}
+
+src_compile() {
+ for shell in bash zsh; do
+ ./scala-cli install-completions \
+ --shell ${shell} \
+ --env \
+ --output "${S}" \
+ > ${shell}-completion || die
+ done
+}
+
+src_install() {
+ dobin scala-cli
+
+ newbashcomp bash-completion scala-cli
+
+ insinto /usr/share/zsh/site-functions
+ doins zsh/_scala-cli
+}
diff --git a/dev-java/scram/scram-2.1.ebuild b/dev-java/scram/scram-2.1.ebuild
index 44dc7af7a78c..fc3c8a03ce1a 100644
--- a/dev-java/scram/scram-2.1.ebuild
+++ b/dev-java/scram/scram-2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -16,7 +16,7 @@ S="${WORKDIR}/${P}"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="amd64 ppc64"
+KEYWORDS="amd64 ~ppc64"
CP_DEPEND="dev-java/saslprep:0"
diff --git a/dev-java/scram/scram-3.1.ebuild b/dev-java/scram/scram-3.1.ebuild
index 5d9dc470f1fa..4169595b9bc8 100644
--- a/dev-java/scram/scram-3.1.ebuild
+++ b/dev-java/scram/scram-3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -16,7 +16,7 @@ S="${WORKDIR}/${P}"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
RESTRICT="test" #839681
CP_DEPEND="
diff --git a/dev-java/stringprep/stringprep-1.1.ebuild b/dev-java/stringprep/stringprep-1.1.ebuild
index 2ef732f9f9f5..142c8b3c1a14 100644
--- a/dev-java/stringprep/stringprep-1.1.ebuild
+++ b/dev-java/stringprep/stringprep-1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -14,7 +14,7 @@ SRC_URI="https://repo1.maven.org/maven2/com/ongres/stringprep/stringprep/${PV}/s
LICENSE="BSD-2"
SLOT="0"
-KEYWORDS="amd64 ppc64"
+KEYWORDS="amd64 ~ppc64"
DEPEND=">=virtual/jdk-1.8:*"
RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/stringprep/stringprep-2.2.ebuild b/dev-java/stringprep/stringprep-2.2.ebuild
index 0c0be2c3c2c4..115283bc012c 100644
--- a/dev-java/stringprep/stringprep-2.2.ebuild
+++ b/dev-java/stringprep/stringprep-2.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -16,7 +16,7 @@ S="${WORKDIR}/${P}"
LICENSE="BSD-2"
SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc64"
DEPEND=">=virtual/jdk-11:*" # module-info
RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/swt/Manifest b/dev-java/swt/Manifest
index 2a5a03f3edac..0580293991bf 100644
--- a/dev-java/swt/Manifest
+++ b/dev-java/swt/Manifest
@@ -1,6 +1,3 @@
-DIST swt-3.7.2-gtk-linux-ppc64.zip 5688113 BLAKE2B bb102da40a3f63d63ca6a56d4c57ade55d7fe8d6206acf9e60caa0a8600b5c2cec6c0304cd2ab532948f03ff0706e8b2928ae9e93ef0019051044dad3fe7b1c0 SHA512 750aaa43560bbf6f82f7f8cd9338abc88578f4f0b9aadaec9bc8a5c3d1ad593619cdf01d202cbf06766090ee977989ea7904643669c61971973951d8428b57d0
-DIST swt-3.7.2-gtk-linux-x86.zip 5374609 BLAKE2B 04d44b9fffcedc6ce255e2651377ac6968bb41c44cee403f063c159962d9d43a5c9529026819ddb1c8eea98cd11ed818075c37f4e9851d2e95532dc166e570ce SHA512 9f58864d05eba2648e4b5d5c958172f5c0c7c730209525b3d6f607586daaefea4d5ba1013e80c0c11948f01c553044b0a98c81688b33c14114ba79c7ce620426
-DIST swt-3.7.2-gtk-linux-x86_64.zip 5671443 BLAKE2B 953fc9eab6d1f2750b1a1345cddf4aa6969567cb75977f87ee50668d367e55dda8be2ff836d87b780005c22132fa783b475f422c093617fd02f478eadd96076d SHA512 d60ae1d3f3b0577f7e3018139f93069c89d021064fec2f3f4074f95cfae56abdc0c7d531cb904ad3911482543cddcc3f6646ff47192073f4bde97c79e13612b7
DIST swt-4.10-gtk-linux-ppc64le.zip 3848264 BLAKE2B 214861fde6987906fb24f3187936f3bcb49aebed54fe242427c3737bf6761e8f77d049c376f30ca0fc33e74a1e8a48b6aff6d9863775ee9c33fea7cb2edd1309 SHA512 1b3ede58c2b41abae76f58a303bd3fbf1849ba8be3fd6518325bc22400e960c3ab542e7351b1bc08053e2746ea3e28812e04c2d1789cb1e19ea28745c8a5f39a
DIST swt-4.10-gtk-linux-x86_64.zip 3844306 BLAKE2B 0e0ed21708acce347fd025920ee635f586c460f8a9c05a7067fd70eed9da999b4a62a5febd17f0c5546ab15198336038e4ab49a1bd588d49ffb39450353a1911 SHA512 9dd946cb7c11446f553f06b8af516167519bab00d4a89f626cd612be6d18e50023fc537aa3d844a8f7a56a767df00410efe4dd20e2bfd930639330a1e279a7a0
DIST swt-4.29-gtk-linux-aarch64.zip 3836724 BLAKE2B 8c905df298688686ee22c9f2021560856f7ac7b6a92dad744b27cd30530c6ff76470fdcbb79b91ada01f28c43b8f694c334ff1337d692366ae9dc0319f7e46e2 SHA512 44ff572b57631b1b6a98192f60624758d90f54a2b2272c6bbb140ece39e65bb4086cf08fbc50c5f2e388e7b410b28fc014b87a8560062053b4c131970fa38b17
@@ -20,4 +17,5 @@ DIST swt-4.33-gtk-linux-ppc64le.zip 3966353 BLAKE2B 0ab4a75ac1efdedfcacdd235f45b
DIST swt-4.33-gtk-linux-x86_64.zip 3950557 BLAKE2B 6cf4f48e32bcfa40082c08a78dd8d64e9454db3859533696c7cc7cd37639ac7df980d9cfd13abaa80e95e44ad619b96944387363d2fb93d7de34f5f25052bd54 SHA512 3211a5480b886c542f99e29b715b5b1221ba679b572f1de6ca68bdb7b06eec6863c68fbddb9b70d74f13e501c3d76a220c7c8b466031b6c0a25bba5c011f8a63
DIST swt-4.34-gtk-linux-aarch64.zip 4001004 BLAKE2B 4ed2ba9b61cecfda5bad8a3701dccfb12f78617222b24a96e0752bcc481fed96afc31c8053ab38f9b0cc41e46d0c33ddd0c5f04ddba194e7a8725f6856a60d52 SHA512 1c6ab66d02ff27ec45124e46e349a99e6d20f63511c32afbd70ec4d835a86e4f1f83205c67259697bb86250758ac625460bdd105123897f53b233d1e54283cb1
DIST swt-4.34-gtk-linux-ppc64le.zip 4038598 BLAKE2B 8dd08a73c06c99cf286a894fbe42f8eb74592e4a42d03e184bc8941d067f564e2a1f13d27436ae7e0be44f5a28a0e2124d49dbae6261d841b39d832d3024e31e SHA512 c7c9048f1fc3730f27926d606301100c491b44ee5bab594d4a52bda8f0652302b0954b91d86bd7418532d596c332235a044f04bc677e4e36f33d316819a2a44b
+DIST swt-4.34-gtk-linux-riscv64.zip 4009994 BLAKE2B a7f4d3f830df978b31c0d0f07c8c3db2cbf222d8aa72d7dffd178b6c51b3e93e474eb76a78413518acda64d3e55ceab224d597733887a5bdd0ec4c73c9cc407b SHA512 abd2912878bad153b7e2cf15bdc68c713aa7fd5e33bed5569f4a2400f25f6342e95453a2331ce610905f0f8e0d171841b69e7fc50d43a07edd1f7a05f0a27815
DIST swt-4.34-gtk-linux-x86_64.zip 4021887 BLAKE2B b9d549db7e143ea79200355e59e393a1305fd30cedfe39d94cd2f02947a62a1a2dc8bea45726e59dddd2360117e8ae757b3f597a37d84bed4e88bf8d4f957797 SHA512 486e18d150e23adb197e2f88448a1c7a48d8ef0d20751b358975460b21792f59a2d7ee55ad2340de381deb5d5508dada2e01087e58fa64690a92271bd3bbc7e7
diff --git a/dev-java/swt/files/as-needed-and-flag-fixes-3.6.patch b/dev-java/swt/files/as-needed-and-flag-fixes-3.6.patch
deleted file mode 100644
index d6cc763ea968..000000000000
--- a/dev-java/swt/files/as-needed-and-flag-fixes-3.6.patch
+++ /dev/null
@@ -1,243 +0,0 @@
---- a/make_linux.mak
-+++ b/make_linux.mak
-@@ -66,7 +66,7 @@
- # Uncomment for Native Stats tool
- #NATIVE_STATS = -DNATIVE_STATS
-
--MOZILLACFLAGS = -O \
-+MOZILLACFLAGS = $(CXXFLAGS) \
- -DSWT_VERSION=$(SWT_VERSION) \
- $(NATIVE_STATS) \
- -DMOZILLA_STRICT_API=1 \
-@@ -107,7 +107,7 @@
- WEBKIT_OBJECTS = swt.o webkit.o webkit_structs.o webkit_stats.o
- GLX_OBJECTS = swt.o glx.o glx_structs.o glx_stats.o
-
--CFLAGS = -O -Wall \
-+CFLAGS += \
- -DSWT_VERSION=$(SWT_VERSION) \
- $(NATIVE_STATS) \
- -DLINUX -DGTK \
-@@ -131,13 +131,13 @@
- make_swt: $(SWT_LIB) $(SWTPI_LIB)
-
- $(SWT_LIB): $(SWT_OBJECTS)
-- $(CC) $(LFLAGS) -o $(SWT_LIB) $(SWT_OBJECTS)
-+ $(CC) $(LDFLAGS) $(LFLAGS) -o $(SWT_LIB) $(SWT_OBJECTS)
-
- callback.o: callback.c callback.h
- $(CC) $(CFLAGS) -DUSE_ASSEMBLER -c callback.c
-
- $(SWTPI_LIB): $(SWTPI_OBJECTS)
-- $(CC) $(LFLAGS) -o $(SWTPI_LIB) $(SWTPI_OBJECTS) $(GTKLIBS)
-+ $(CC) $(LDFLAGS) $(LFLAGS) -o $(SWTPI_LIB) $(SWTPI_OBJECTS) $(GTKLIBS)
-
- swt.o: swt.c swt.h
- $(CC) $(CFLAGS) -c swt.c
-@@ -156,7 +156,7 @@
- make_cairo: $(CAIRO_LIB)
-
- $(CAIRO_LIB): $(CAIRO_OBJECTS)
-- $(CC) $(LFLAGS) -o $(CAIRO_LIB) $(CAIRO_OBJECTS) $(CAIROLIBS)
-+ $(CC) $(LDFLAGS) $(LFLAGS) -o $(CAIRO_LIB) $(CAIRO_OBJECTS) $(CAIROLIBS)
-
- cairo.o: cairo.c cairo.h swt.h
- $(CC) $(CFLAGS) $(CAIROCFLAGS) -c cairo.c
-@@ -172,7 +172,7 @@
- make_cde: $(CDE_LIB)
-
- $(CDE_LIB): $(CDE_OBJECTS)
-- $(CC) $(LFLAGS) -o $(CDE_LIB) $(CDE_OBJECTS) $(CDE_LIBS)
-+ $(CC) $(LDFLAGS) $(LFLAGS) -o $(CDE_LIB) $(CDE_OBJECTS) $(CDE_LIBS)
-
- #
- # AWT lib
-@@ -180,7 +180,7 @@
- make_awt:$(AWT_LIB)
-
- $(AWT_LIB): $(AWT_OBJECTS)
-- $(CC) $(AWT_LFLAGS) -o $(AWT_LIB) $(AWT_OBJECTS) $(AWT_LIBS)
-+ $(CC) $(LDFLAGS) $(AWT_LFLAGS) -o $(AWT_LIB) $(AWT_OBJECTS) $(AWT_LIBS)
-
- #
- # Atk lib
-@@ -188,7 +188,7 @@
- make_atk: $(ATK_LIB)
-
- $(ATK_LIB): $(ATK_OBJECTS)
-- $(CC) $(LFLAGS) -o $(ATK_LIB) $(ATK_OBJECTS) $(ATKLIBS)
-+ $(CC) $(LDFLAGS) $(LFLAGS) -o $(ATK_LIB) $(ATK_OBJECTS) $(ATKLIBS)
-
- atk.o: atk.c atk.h
- $(CC) $(CFLAGS) $(ATKCFLAGS) -c atk.c
-@@ -205,7 +205,7 @@
- make_gnome: $(GNOME_LIB)
-
- $(GNOME_LIB): $(GNOME_OBJECTS)
-- $(CC) $(LFLAGS) -o $(GNOME_LIB) $(GNOME_OBJECTS) $(GNOMELIBS)
-+ $(CC) $(LDFLAGS) $(LFLAGS) -o $(GNOME_LIB) $(GNOME_OBJECTS) $(GNOMELIBS)
-
- gnome.o: gnome.c
- $(CC) $(CFLAGS) $(GNOMECFLAGS) -c gnome.c
-@@ -222,7 +222,7 @@
- make_mozilla:$(MOZILLA_LIB)
-
- $(MOZILLA_LIB): $(MOZILLA_OBJECTS)
-- $(CXX) -o $(MOZILLA_LIB) $(MOZILLA_OBJECTS) $(MOZILLALFLAGS) ${MOZILLA_LIBS}
-+ $(CXX) $(LDFLAGS) -o $(MOZILLA_LIB) $(MOZILLA_OBJECTS) $(MOZILLALFLAGS) ${MOZILLA_LIBS}
-
- xpcom.o: xpcom.cpp
- $(CXX) $(MOZILLACFLAGS) $(MOZILLAEXCLUDES) ${MOZILLA_INCLUDES} -c xpcom.cpp
-@@ -242,7 +242,7 @@
- make_xulrunner:$(XULRUNNER_LIB)
-
- $(XULRUNNER_LIB): $(XULRUNNER_OBJECTS)
-- $(CXX) -o $(XULRUNNER_LIB) $(XULRUNNER_OBJECTS) $(MOZILLALFLAGS) ${XULRUNNER_LIBS}
-+ $(CXX) $(LDFLAGS) -o $(XULRUNNER_LIB) $(XULRUNNER_OBJECTS) $(MOZILLALFLAGS) ${XULRUNNER_LIBS}
-
- xpcomxul.o: xpcom.cpp
- $(CXX) -o xpcomxul.o $(MOZILLACFLAGS) $(XULRUNNEREXCLUDES) ${XULRUNNER_INCLUDES} -c xpcom.cpp
-@@ -262,7 +262,7 @@
- make_xpcominit:$(XPCOMINIT_LIB)
-
- $(XPCOMINIT_LIB): $(XPCOMINIT_OBJECTS)
-- $(CXX) -o $(XPCOMINIT_LIB) $(XPCOMINIT_OBJECTS) $(MOZILLALFLAGS) ${XULRUNNER_LIBS}
-+ $(CXX) $(LDFLAGS) -o $(XPCOMINIT_LIB) $(XPCOMINIT_OBJECTS) $(MOZILLALFLAGS) ${XULRUNNER_LIBS}
-
- xpcominit.o: xpcominit.cpp
- $(CXX) $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcominit.cpp
-@@ -279,7 +279,7 @@
- make_webkit: $(WEBKIT_LIB)
-
- $(WEBKIT_LIB): $(WEBKIT_OBJECTS)
-- $(CC) $(LFLAGS) -o $(WEBKIT_LIB) $(WEBKIT_OBJECTS) $(WEBKITLIBS)
-+ $(CC) $(LDFLAGS) $(LFLAGS) -o $(WEBKIT_LIB) $(WEBKIT_OBJECTS) $(WEBKITLIBS)
-
- webkit.o: webkitgtk.c
- $(CC) $(CFLAGS) $(WEBKITCFLAGS) -c webkitgtk.c -o webkit.o
-@@ -296,7 +296,7 @@
- make_glx: $(GLX_LIB)
-
- $(GLX_LIB): $(GLX_OBJECTS)
-- $(CC) $(LFLAGS) -o $(GLX_LIB) $(GLX_OBJECTS) $(GLXLIBS)
-+ $(CC) $(LDFLAGS) $(LFLAGS) -o $(GLX_LIB) $(GLX_OBJECTS) $(GLXLIBS)
-
- glx.o: glx.c
- $(CC) $(CFLAGS) $(GLXCFLAGS) -c glx.c
---- a/make_freebsd.mak
-+++ b/make_freebsd.mak
-@@ -64,7 +64,7 @@
- # Uncomment for Native Stats tool
- #NATIVE_STATS = -DNATIVE_STATS
-
--MOZILLACFLAGS = -O \
-+MOZILLACFLAGS += \
- -DSWT_VERSION=$(SWT_VERSION) \
- $(NATIVE_STATS) \
- -DMOZILLA_STRICT_API=1 \
-@@ -91,7 +91,7 @@
- XPCOMINIT_OBJECTS = swt.o xpcominit.o xpcominit_structs.o xpcominit_stats.o
- GLX_OBJECTS = swt.o glx.o glx_structs.o glx_stats.o
-
--CFLAGS = -O -Wall \
-+CFLAGS += \
- -DSWT_VERSION=$(SWT_VERSION) \
- $(NATIVE_STATS) \
- -DFREEBSD -DGTK \
-@@ -115,13 +115,13 @@
- make_swt: $(SWT_LIB) $(SWTPI_LIB)
-
- $(SWT_LIB): $(SWT_OBJECTS)
-- $(CC) $(LFLAGS) -o $(SWT_LIB) $(SWT_OBJECTS)
-+ $(CC) $(LDFLAGS) $(LFLAGS) -o $(SWT_LIB) $(SWT_OBJECTS)
-
- callback.o: callback.c callback.h
- $(CC) $(CFLAGS) -DUSE_ASSEMBLER -c callback.c
-
- $(SWTPI_LIB): $(SWTPI_OBJECTS)
-- $(CC) $(LFLAGS) -o $(SWTPI_LIB) $(SWTPI_OBJECTS) $(GTKLIBS)
-+ $(CC) $(LDFLAGS) $(LFLAGS) -o $(SWTPI_LIB) $(SWTPI_OBJECTS) $(GTKLIBS)
-
- swt.o: swt.c swt.h
- $(CC) $(CFLAGS) -c swt.c
-@@ -140,7 +140,7 @@
- make_cairo: $(CAIRO_LIB)
-
- $(CAIRO_LIB): $(CAIRO_OBJECTS)
-- $(CC) $(LFLAGS) -o $(CAIRO_LIB) $(CAIRO_OBJECTS) $(CAIROLIBS)
-+ $(CC) $(LDFLAGS) $(LFLAGS) -o $(CAIRO_LIB) $(CAIRO_OBJECTS) $(CAIROLIBS)
-
- cairo.o: cairo.c cairo.h swt.h
- $(CC) $(CFLAGS) $(CAIROCFLAGS) -c cairo.c
-@@ -156,7 +156,7 @@
- make_cde: $(CDE_LIB)
-
- $(CDE_LIB): $(CDE_OBJECTS)
-- $(CC) $(LFLAGS) -o $(CDE_LIB) $(CDE_OBJECTS) $(CDE_LIBS)
-+ $(CC) $(LDFLAGS) $(LFLAGS) -o $(CDE_LIB) $(CDE_OBJECTS) $(CDE_LIBS)
-
- #
- # AWT lib
-@@ -164,7 +164,7 @@
- make_awt:$(AWT_LIB)
-
- $(AWT_LIB): $(AWT_OBJECTS)
-- $(CC) $(AWT_LFLAGS) -o $(AWT_LIB) $(AWT_OBJECTS) $(AWT_LIBS)
-+ $(CC) $(LDFLAGS) $(AWT_LFLAGS) -o $(AWT_LIB) $(AWT_OBJECTS) $(AWT_LIBS)
-
- #
- # Atk lib
-@@ -172,7 +172,7 @@
- make_atk: $(ATK_LIB)
-
- $(ATK_LIB): $(ATK_OBJECTS)
-- $(CC) $(LFLAGS) -o $(ATK_LIB) $(ATK_OBJECTS) $(ATKLIBS)
-+ $(CC) $(LDFLAGS) $(LFLAGS) -o $(ATK_LIB) $(ATK_OBJECTS) $(ATKLIBS)
-
- atk.o: atk.c atk.h
- $(CC) $(CFLAGS) $(ATKCFLAGS) -c atk.c
-@@ -189,7 +189,7 @@
- make_gnome: $(GNOME_LIB)
-
- $(GNOME_LIB): $(GNOME_OBJECTS)
-- $(CC) $(LFLAGS) -o $(GNOME_LIB) $(GNOME_OBJECTS) $(GNOMELIBS)
-+ $(CC) $(LDFLAGS) $(LFLAGS) -o $(GNOME_LIB) $(GNOME_OBJECTS) $(GNOMELIBS)
-
- gnome.o: gnome.c
- $(CC) $(CFLAGS) $(GNOMECFLAGS) -c gnome.c
-@@ -206,7 +206,7 @@
- make_mozilla:$(MOZILLA_LIB)
-
- $(MOZILLA_LIB): $(MOZILLA_OBJECTS)
-- $(CXX) -o $(MOZILLA_LIB) $(MOZILLA_OBJECTS) $(MOZILLALFLAGS) ${MOZILLA_LIBS}
-+ $(CXX) $(LDFLAGS) -o $(MOZILLA_LIB) $(MOZILLA_OBJECTS) $(MOZILLALFLAGS) ${MOZILLA_LIBS}
-
- xpcom.o: xpcom.cpp
- $(CXX) $(MOZILLACFLAGS) ${MOZILLA_INCLUDES} -c xpcom.cpp
-@@ -226,7 +226,7 @@
- make_xulrunner:$(XULRUNNER_LIB)
-
- $(XULRUNNER_LIB): $(XULRUNNER_OBJECTS)
-- $(CXX) -o $(XULRUNNER_LIB) $(XULRUNNER_OBJECTS) $(MOZILLALFLAGS) ${XULRUNNER_LIBS}
-+ $(CXX) $(LDFLAGS) -o $(XULRUNNER_LIB) $(XULRUNNER_OBJECTS) $(MOZILLALFLAGS) ${XULRUNNER_LIBS}
-
- xpcomxul.o: xpcom.cpp
- $(CXX) -o xpcomxul.o $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcom.cpp
-@@ -252,7 +252,7 @@
- make_xpcominit:$(XPCOMINIT_LIB)
-
- $(XPCOMINIT_LIB): $(XPCOMINIT_OBJECTS)
-- $(CXX) -o $(XPCOMINIT_LIB) $(XPCOMINIT_OBJECTS) $(MOZILLALFLAGS) ${XULRUNNER_LIBS}
-+ $(CXX) $(LDFLAGS) -o $(XPCOMINIT_LIB) $(XPCOMINIT_OBJECTS) $(MOZILLALFLAGS) ${XULRUNNER_LIBS}
-
- xpcominit.o: xpcominit.cpp
- $(CXX) $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcominit.cpp
-@@ -269,7 +269,7 @@
- make_glx: $(GLX_LIB)
-
- $(GLX_LIB): $(GLX_OBJECTS)
-- $(CC) $(LFLAGS) -o $(GLX_LIB) $(GLX_OBJECTS) $(GLXLIBS)
-+ $(CC) $(LDFLAGS) $(LFLAGS) -o $(GLX_LIB) $(GLX_OBJECTS) $(GLXLIBS)
-
- glx.o: glx.c
- $(CC) $(CFLAGS) $(GLXCFLAGS) -c glx.c
diff --git a/dev-java/swt/files/swt-3.7-manifest b/dev-java/swt/files/swt-3.7-manifest
deleted file mode 100644
index bddcbb48b041..000000000000
--- a/dev-java/swt/files/swt-3.7-manifest
+++ /dev/null
@@ -1,17 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin
-Fragment-Host: org.eclipse.swt; bundle-version="[3.0.0,4.0.0)"
-Bundle-SymbolicName: org.eclipse.swt.gtk.linux.SWT_ARCH; singleton:=true
-Bundle-Version: 3.7
-Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=linux) (osgi.arch=SWT_ARCH))
-Export-Package: org.eclipse.swt.internal.accessibility.gtk; x-internal:=true,
- org.eclipse.swt.internal.cairo; x-internal:=true,
- org.eclipse.swt.internal.cde; x-internal:=true,
- org.eclipse.swt.internal.gnome; x-internal:=true,
- org.eclipse.swt.internal.gtk; x-internal:=true,
- org.eclipse.swt.internal.opengl.glx; x-internal:=true
- org.eclipse.swt.internal.webkit; x-internal:=true
-
diff --git a/dev-java/swt/files/swt-3.7.2-gio_launch-URI-x86.patch b/dev-java/swt/files/swt-3.7.2-gio_launch-URI-x86.patch
deleted file mode 100644
index cab0e0cdb573..000000000000
--- a/dev-java/swt/files/swt-3.7.2-gio_launch-URI-x86.patch
+++ /dev/null
@@ -1,121 +0,0 @@
-Program.launch will first attempt to open files using libgio and then fallback
-to gnome-vfs. gio_launch uses g_file_new_for_path which fails when passed a
-URI. If swt was built with USE="-gnome" then the fallback fails as well,
-making it appear that a package has a dependency on swt[gnome] when it does
-not.
-
-Caused by: java.lang.UnsatisfiedLinkError: Could not load SWT library. Reasons:
- no swt-gnome-gtk-3740 in java.library.path
- no swt-gnome-gtk in java.library.path
- Can't load library: /home/xxx/.swt/lib/linux/x86_64/libswt-gnome-gtk-3740.so
- Can't load library: /home/xxx/.swt/lib/linux/x86_64/libswt-gnome-gtk.so
-
-Use g_file_new_for_commandline_arg instead.
-
-https://bugs.gentoo.org/424151
-
-
---- a/os.c
-+++ b/os.c
-@@ -3059,6 +3059,30 @@ fail:
- }
- #endif
-
-+#ifndef NO__1g_1file_1new_1for_1commandline_1arg
-+JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1file_1new_1for_1commandline_1arg)
-+ (JNIEnv *env, jclass that, jbyteArray arg0)
-+{
-+ jbyte *lparg0=NULL;
-+ jintLong rc = 0;
-+ OS_NATIVE_ENTER(env, that, _1g_1file_1new_1for_1commandline_1arg_FUNC);
-+ if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
-+/*
-+ rc = (jintLong)g_file_new_for_commandline_arg(lparg0);
-+*/
-+ {
-+ LOAD_FUNCTION(fp, g_file_new_for_commandline_arg)
-+ if (fp) {
-+ rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jbyte *))fp)(lparg0);
-+ }
-+ }
-+fail:
-+ if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
-+ OS_NATIVE_EXIT(env, that, _1g_1file_1new_1for_1commandline_1arg_FUNC);
-+ return rc;
-+}
-+#endif
-+
- #ifndef NO__1g_1file_1new_1for_1path
- JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1file_1new_1for_1path)
- (JNIEnv *env, jclass that, jbyteArray arg0)
---- a/os_custom.h
-+++ b/os_custom.h
-@@ -280,6 +280,7 @@
- #define g_file_icon_get_file_LIB LIB_GIO
- #define g_file_info_get_content_type_LIB LIB_GIO
- #define g_file_info_get_modification_time_LIB LIB_GIO
-+#define g_file_new_for_commandline_arg_LIB LIB_GIO
- #define g_file_new_for_path_LIB LIB_GIO
- #define g_file_new_for_uri_LIB LIB_GIO
- #define g_file_read_LIB LIB_GIO
---- a/os_stats.c
-+++ b/os_stats.c
-@@ -18,8 +18,8 @@
-
- #ifdef NATIVE_STATS
-
--int OS_nativeFunctionCount = 1396;
--int OS_nativeFunctionCallCount[1396];
-+int OS_nativeFunctionCount = 1397;
-+int OS_nativeFunctionCallCount[1397];
- char * OS_nativeFunctionNames[] = {
- #ifndef JNI64
- "Call__IIII",
-@@ -250,6 +250,7 @@ char * OS_nativeFunctionNames[] = {
- "_1g_1file_1icon_1get_1file",
- "_1g_1file_1info_1get_1content_1type",
- "_1g_1file_1info_1get_1modification_1time",
-+ "_1g_1file_1new_1for_1commandline_1arg",
- "_1g_1file_1new_1for_1path",
- "_1g_1file_1new_1for_1uri",
- "_1g_1file_1query_1info",
---- a/os_stats.h
-+++ b/os_stats.h
-@@ -258,6 +258,7 @@ typedef enum {
- _1g_1file_1icon_1get_1file_FUNC,
- _1g_1file_1info_1get_1content_1type_FUNC,
- _1g_1file_1info_1get_1modification_1time_FUNC,
-+ _1g_1file_1new_1for_1commandline_1arg_FUNC,
- _1g_1file_1new_1for_1path_FUNC,
- _1g_1file_1new_1for_1uri_FUNC,
- _1g_1file_1query_1info_FUNC,
---- a/src/org/eclipse/swt/internal/gtk/OS.java
-+++ b/src/org/eclipse/swt/internal/gtk/OS.java
-@@ -2113,6 +2113,16 @@ public static final int /*long*/ g_file_new_for_path(byte[] fileName) {
- }
- }
- /** @method flags=dynamic */
-+public static final native int /*long*/ _g_file_new_for_commandline_arg(byte[] fileName);
-+public static final int /*long*/ g_file_new_for_commandline_arg(byte[] fileName) {
-+ lock.lock();
-+ try {
-+ return _g_file_new_for_commandline_arg(fileName);
-+ } finally {
-+ lock.unlock();
-+ }
-+}
-+/** @method flags=dynamic */
- public static final native int /*long*/ _g_file_new_for_uri(byte[] fileName);
- public static final int /*long*/ g_file_new_for_uri(byte[] fileName) {
- lock.lock();
---- a/src/org/eclipse/swt/program/Program.java
-+++ b/src/org/eclipse/swt/program/Program.java
-@@ -954,7 +954,7 @@ static boolean gio_isExecutable(String fileName) {
- static boolean gio_launch(String fileName) {
- boolean result = false;
- byte[] fileNameBuffer = Converter.wcsToMbcs (null, fileName, true);
-- int /*long*/ file = OS.g_file_new_for_path (fileNameBuffer);
-+ int /*long*/ file = OS.g_file_new_for_commandline_arg (fileNameBuffer);
- if (file != 0) {
- int /*long*/ uri = OS.g_file_get_uri (file);
- if (uri != 0) {
diff --git a/dev-java/swt/files/swt-3.7.2-gio_launch-URI.patch b/dev-java/swt/files/swt-3.7.2-gio_launch-URI.patch
deleted file mode 100644
index bbb28573072b..000000000000
--- a/dev-java/swt/files/swt-3.7.2-gio_launch-URI.patch
+++ /dev/null
@@ -1,121 +0,0 @@
-Program.launch will first attempt to open files using libgio and then fallback
-to gnome-vfs. gio_launch uses g_file_new_for_path which fails when passed a
-URI. If swt was built with USE="-gnome" then the fallback fails as well,
-making it appear that a package has a dependency on swt[gnome] when it does
-not.
-
-Caused by: java.lang.UnsatisfiedLinkError: Could not load SWT library. Reasons:
- no swt-gnome-gtk-3740 in java.library.path
- no swt-gnome-gtk in java.library.path
- Can't load library: /home/xxx/.swt/lib/linux/x86_64/libswt-gnome-gtk-3740.so
- Can't load library: /home/xxx/.swt/lib/linux/x86_64/libswt-gnome-gtk.so
-
-Use g_file_new_for_commandline_arg instead.
-
-https://bugs.gentoo.org/424151
-
-
---- a/os.c
-+++ b/os.c
-@@ -3059,6 +3059,30 @@ fail:
- }
- #endif
-
-+#ifndef NO__1g_1file_1new_1for_1commandline_1arg
-+JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1file_1new_1for_1commandline_1arg)
-+ (JNIEnv *env, jclass that, jbyteArray arg0)
-+{
-+ jbyte *lparg0=NULL;
-+ jintLong rc = 0;
-+ OS_NATIVE_ENTER(env, that, _1g_1file_1new_1for_1commandline_1arg_FUNC);
-+ if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
-+/*
-+ rc = (jintLong)g_file_new_for_commandline_arg(lparg0);
-+*/
-+ {
-+ LOAD_FUNCTION(fp, g_file_new_for_commandline_arg)
-+ if (fp) {
-+ rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jbyte *))fp)(lparg0);
-+ }
-+ }
-+fail:
-+ if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
-+ OS_NATIVE_EXIT(env, that, _1g_1file_1new_1for_1commandline_1arg_FUNC);
-+ return rc;
-+}
-+#endif
-+
- #ifndef NO__1g_1file_1new_1for_1path
- JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1file_1new_1for_1path)
- (JNIEnv *env, jclass that, jbyteArray arg0)
---- a/os_custom.h
-+++ b/os_custom.h
-@@ -280,6 +280,7 @@
- #define g_file_icon_get_file_LIB LIB_GIO
- #define g_file_info_get_content_type_LIB LIB_GIO
- #define g_file_info_get_modification_time_LIB LIB_GIO
-+#define g_file_new_for_commandline_arg_LIB LIB_GIO
- #define g_file_new_for_path_LIB LIB_GIO
- #define g_file_new_for_uri_LIB LIB_GIO
- #define g_file_read_LIB LIB_GIO
---- a/os_stats.c
-+++ b/os_stats.c
-@@ -18,8 +18,8 @@
-
- #ifdef NATIVE_STATS
-
--int OS_nativeFunctionCount = 1396;
--int OS_nativeFunctionCallCount[1396];
-+int OS_nativeFunctionCount = 1397;
-+int OS_nativeFunctionCallCount[1397];
- char * OS_nativeFunctionNames[] = {
- #ifndef JNI64
- "Call__IIII",
-@@ -250,6 +250,7 @@ char * OS_nativeFunctionNames[] = {
- "_1g_1file_1icon_1get_1file",
- "_1g_1file_1info_1get_1content_1type",
- "_1g_1file_1info_1get_1modification_1time",
-+ "_1g_1file_1new_1for_1commandline_1arg",
- "_1g_1file_1new_1for_1path",
- "_1g_1file_1new_1for_1uri",
- "_1g_1file_1query_1info",
---- a/os_stats.h
-+++ b/os_stats.h
-@@ -258,6 +258,7 @@ typedef enum {
- _1g_1file_1icon_1get_1file_FUNC,
- _1g_1file_1info_1get_1content_1type_FUNC,
- _1g_1file_1info_1get_1modification_1time_FUNC,
-+ _1g_1file_1new_1for_1commandline_1arg_FUNC,
- _1g_1file_1new_1for_1path_FUNC,
- _1g_1file_1new_1for_1uri_FUNC,
- _1g_1file_1query_1info_FUNC,
---- a/src/org/eclipse/swt/internal/gtk/OS.java
-+++ b/src/org/eclipse/swt/internal/gtk/OS.java
-@@ -2113,6 +2113,16 @@ public static final long /*int*/ g_file_new_for_path(byte[] fileName) {
- }
- }
- /** @method flags=dynamic */
-+public static final native long /*int*/ _g_file_new_for_commandline_arg(byte[] fileName);
-+public static final long /*int*/ g_file_new_for_commandline_arg(byte[] fileName) {
-+ lock.lock();
-+ try {
-+ return _g_file_new_for_commandline_arg(fileName);
-+ } finally {
-+ lock.unlock();
-+ }
-+}
-+/** @method flags=dynamic */
- public static final native long /*int*/ _g_file_new_for_uri(byte[] fileName);
- public static final long /*int*/ g_file_new_for_uri(byte[] fileName) {
- lock.lock();
---- a/src/org/eclipse/swt/program/Program.java
-+++ b/src/org/eclipse/swt/program/Program.java
-@@ -954,7 +954,7 @@ static boolean gio_isExecutable(String fileName) {
- static boolean gio_launch(String fileName) {
- boolean result = false;
- byte[] fileNameBuffer = Converter.wcsToMbcs (null, fileName, true);
-- long /*int*/ file = OS.g_file_new_for_path (fileNameBuffer);
-+ long /*int*/ file = OS.g_file_new_for_commandline_arg (fileNameBuffer);
- if (file != 0) {
- long /*int*/ uri = OS.g_file_get_uri (file);
- if (uri != 0) {
diff --git a/dev-java/swt/swt-3.7.2-r4.ebuild b/dev-java/swt/swt-3.7.2-r4.ebuild
deleted file mode 100644
index 2fc62ad8c429..000000000000
--- a/dev-java/swt/swt-3.7.2-r4.ebuild
+++ /dev/null
@@ -1,169 +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"
-
-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/swt/"
-SRC_URI="
- amd64? ( ${MY_DMF}/${MY_P}-gtk-linux-x86_64.zip )
- ppc? ( ${MY_DMF}/${MY_P}-gtk-linux-x86.zip )
- ppc64? ( ${MY_DMF}/${MY_P}-gtk-linux-ppc64.zip )
- x86? ( ${MY_DMF}/${MY_P}-gtk-linux-x86.zip )"
-
-LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1"
-SLOT="3.7"
-KEYWORDS="amd64 ppc64"
-IUSE="cairo opengl"
-
-BDEPEND="
- app-arch/unzip
- virtual/pkgconfig
-"
-COMMON_DEPEND="
- app-accessibility/at-spi2-core:2
- dev-libs/glib
- >=x11-libs/gtk+-2.6.8:2
- x11-libs/libXtst
- cairo? ( x11-libs/cairo )
- opengl? (
- virtual/glu
- virtual/opengl
- )"
-DEPEND="${COMMON_DEPEND}
- >=virtual/jdk-1.8:*[-headless-awt]
- x11-base/xorg-proto
- x11-libs/libX11
- x11-libs/libXrender
- x11-libs/libXt
- x11-libs/libXtst"
-RDEPEND="${COMMON_DEPEND}
- >=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() {
- default
- unpack "./src.zip"
-}
-
-src_prepare() {
- 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
-
- 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() {
- 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
- 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
- [[ ${ARCH} == "amd64" || ${ARCH} == "ppc64" ]] && export SWT_PTR_CFLAGS=-DJNI64
-
- local make="emake -f make_linux.mak NO_STRIP=y CC=$(tc-getCC) CXX=$(tc-getCXX)"
-
- einfo "Building AWT library"
- ${make} make_awt
-
- 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
-
- java-pkg-simple_src_compile
-}
-
-src_install() {
- swtArch=${ARCH}
- use amd64 && swtArch=x86_64
-
- sed "s/SWT_ARCH/${swtArch}/" "${FILESDIR}/${PN}-${SLOT}-manifest" > "MANIFEST_TMP.MF" || die
- use cairo || sed -i -e "/ org.eclipse.swt.internal.cairo; x-internal:=true,/d" "MANIFEST_TMP.MF"
- sed -i -e "/ org.eclipse.swt.internal.gnome; x-internal:=true,/d" "MANIFEST_TMP.MF" || die
- use opengl || sed -i -e "/ org.eclipse.swt.internal.opengl.glx; x-internal:=true,/d" "MANIFEST_TMP.MF"
- sed -i -e "/ org.eclipse.swt.internal.webkit; x-internal:=true,/d" "MANIFEST_TMP.MF" || die
- java-osgi_newjar-fromfile "swt.jar" "MANIFEST_TMP.MF" "Standard Widget Toolkit for GTK 2.0"
-
- java-pkg_sointo /usr/$(get_libdir)
- java-pkg_doso *.so
-
- docinto html
- dodoc about.html
-}
diff --git a/dev-java/swt/swt-4.34-r1.ebuild b/dev-java/swt/swt-4.34-r1.ebuild
new file mode 100644
index 000000000000..62431e6e5bb6
--- /dev/null
+++ b/dev-java/swt/swt-4.34-r1.ebuild
@@ -0,0 +1,153 @@
+# 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}-202411201800"
+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 )
+ riscv? ( ${MY_DMF}/${MY_P}-gtk-linux-riscv64.zip )"
+S="${WORKDIR}/library"
+
+LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1"
+SLOT="4.34"
+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/swt/swt-4.34.ebuild b/dev-java/swt/swt-4.34.ebuild
index 78532d57cbf3..33b2ac1eeb71 100644
--- a/dev-java/swt/swt-4.34.ebuild
+++ b/dev-java/swt/swt-4.34.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -21,7 +21,7 @@ S="${WORKDIR}/library"
LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1"
SLOT="4.34"
-KEYWORDS="~amd64 ~arm64 ~ppc64"
+KEYWORDS="~amd64 arm64 ~ppc64"
IUSE="cairo opengl webkit"
BDEPEND="
diff --git a/dev-java/velocity/Manifest b/dev-java/velocity/Manifest
index f30870a05ae7..3c972ffcdd9f 100644
--- a/dev-java/velocity/Manifest
+++ b/dev-java/velocity/Manifest
@@ -1,3 +1,2 @@
DIST velocity-2.3_p20240314.tar.gz 440967 BLAKE2B c5fcea7af49d6c46d5c0943efe82f3c04d921afc2c53201b97842ae71714e7035d075c147b3bea71e959db12dd970b7879ade73bbc23bab09a1fd262e21f2fc6 SHA512 9055e780d2a3c798bfe30e5c7859a7311c4984b551d7b2ffa68c57c076549326d0ddae31eabff8009ea021c749331d34c71eee8cab55599dea5f3c8dba841a02
DIST velocity-2.4.1.tar.gz 445671 BLAKE2B 3a142303bd7bb1a6e012b9d33f96078fa925249bd62287e166e45faca7ad605b1b57f8f72b4829d009e4c11f54780727d919a96bcc081d83c26adf0a61eaecaa SHA512 3e821eaeb705e6ede8a51a8d3bff00d26909c20738bed92f5ef9600f3736709324807f7bbb93f5d431e60380b9a4f757f47cca6ec64e8e774c7ec1e4708d25f1
-DIST velocity-2.4.tar.gz 444952 BLAKE2B 0db598bad6743383e62e89acc55b887f28108b6065c3e615b78485e4f94c9f1a316bff7c04d66052541d6173311e97dab28142dad69e6caca168b2a2fcc28637 SHA512 b3f7ae68fa2e0f30193f089a2e8ee5366e71726d93e85fa2f4c3f95d20aa599df053ee7103c71b01c89fe08dd5276e5a2c7da3e26eaffeafd94c078241a9e264
diff --git a/dev-java/velocity/velocity-2.4.ebuild b/dev-java/velocity/velocity-2.4.ebuild
deleted file mode 100644
index e3727ab40d9f..000000000000
--- a/dev-java/velocity/velocity-2.4.ebuild
+++ /dev/null
@@ -1,113 +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="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/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-engine-${PV}/${PN}-engine-core"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64"
-
-CP_DEPEND="
- dev-java/commons-lang:3.6
- dev-java/slf4j-api:0
-"
-
-DEPEND="
- ${CP_DEPEND}
- dev-java/commons-io:1
- >=virtual/jdk-1.8:*
- test? (
- dev-db/hsqldb:0
- dev-java/slf4j-simple:0
- )
-"
-
-RDEPEND="
- ${CP_DEPEND}
- >=virtual/jre-1.8:*
-"
-
-JAVACC_SLOT="7.0.13"
-BDEPEND="dev-java/javacc:${JAVACC_SLOT}"
-
-JAVA_CLASSPATH_EXTRA="commons-io-1"
-JAVA_RESOURCE_DIRS="src/main/resources"
-JAVA_SRC_DIR="src/main/java"
-JAVA_TEST_EXTRA_ARGS="-Dtest.compare.dir=target/test-classes -Dtest.result.dir=results"
-JAVA_TEST_GENTOO_CLASSPATH="junit-4,hsqldb,slf4j-simple"
-JAVA_TEST_RESOURCE_DIRS="src/test/resources"
-JAVA_TEST_SRC_DIR="src/test/java"
-
-src_prepare() {
- java-pkg-2_src_prepare
-
- cp -r src/main/{,resources/org/apache/velocity/runtime}/parser || die
-
- sed -e "s/\${project.version}/${PV}/" \
- src/main/java-templates/org/apache/velocity/runtime/VelocityEngineVersion.java > \
- src/main/java/org/apache/velocity/runtime/VelocityEngineVersion.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-${JAVACC_SLOT}" -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-${JAVACC_SLOT}" -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'"
-}
-
-src_test() {
- pushd src/test/java > /dev/null || die
- # DataSourceResourceLoaderTestCase.java requires configured jdbc
- local JAVA_TEST_RUN_ONLY=$(find * \
- -name "*TestCase.java" \
- ! -name "BaseTestCase.java" \
- ! -name "DataSourceResourceLoaderTestCase.java" \
- )
- JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}"
- JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}"
- popd > /dev/null || die
- java-pkg-simple_src_test
-}
diff --git a/dev-java/xmlgraphics-commons/Manifest b/dev-java/xmlgraphics-commons/Manifest
index 89201781a570..0e4e361500e7 100644
--- a/dev-java/xmlgraphics-commons/Manifest
+++ b/dev-java/xmlgraphics-commons/Manifest
@@ -1,4 +1,2 @@
DIST xmlgraphics-commons-2.10-src.tar.gz 1618901 BLAKE2B 4ce0bda4715d8d9326f2c42f4d2f0eac65ea59dd527c42927f1a0096526cd54e90e0d71087060a05bf9819f4bac17b14eee08dfce41b950edd26c7a4dcc9669a SHA512 49b055891e6b76f3c357b616c34f152033ccf807432d55dd57ac83c41234c224d1a716f77ae7ef24ff49d9f376dfa6b161cde18b258d94438a467a4ad91be21d
DIST xmlgraphics-commons-2.10-src.tar.gz.asc 833 BLAKE2B 15a9aa963695863bf27624f3f1afc6f3b1277bc58a01a103f76a4c25060e31f38e3e155bf240c816839cc216834ee0d4e639c3b60a91de9a4dde39c29c54af12 SHA512 5f44396867501ab2ab58c1da8e6212d873457eb6d4de545058f84530f05f0bfddf319b2c4bb5a711bf48cca402d7c68e5efae3a0ada71742a706f3b14290dec3
-DIST xmlgraphics-commons-2.9-src.tar.gz 2236891 BLAKE2B 5071418eb2773ade7d48faa00a45834ee392603adb7844ce7b7ffc6ab41f0d655ce29265fc56326093b06b7e2cb1b1f4b95ab5e0f339c05cca4e0eb71d59f368 SHA512 896a5fe41277783021075df0de1aa109a7f05416af6b0141301a2452197d85df0daef28f5c2a71802644cbff3bfe79579a1544000a4c1b5cec4c211d8effd521
-DIST xmlgraphics-commons-2.9-src.tar.gz.asc 833 BLAKE2B e85533d2509dc49f42346e373a416c8215600ff84a393ca6de545fce6e73d704a8146a257522e66a254248ebdbc6770e0040658223582184e0d8fd71f95bd941 SHA512 e52f02efba535192455b47a4adbb903426e51163083297eb7be83146e2c7ead913f4c0a51345681123afa64fbb3bffcea982a81fd2b92be2aa4c135082ed8e17
diff --git a/dev-java/xmlgraphics-commons/xmlgraphics-commons-2.9.ebuild b/dev-java/xmlgraphics-commons/xmlgraphics-commons-2.9.ebuild
deleted file mode 100644
index 1fbf7d2b6de3..000000000000
--- a/dev-java/xmlgraphics-commons/xmlgraphics-commons-2.9.ebuild
+++ /dev/null
@@ -1,50 +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="org.apache.xmlgraphics:xmlgraphics-commons:2.9"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple verify-sig
-
-DESCRIPTION="XML Graphics Commons"
-HOMEPAGE="https://xmlgraphics.apache.org/commons/"
-SRC_URI="mirror://apache/xmlgraphics/commons/source/${P}-src.tar.gz
- verify-sig? ( https://downloads.apache.org/xmlgraphics/commons/source/xmlgraphics-commons-${PV}-src.tar.gz.asc )"
-
-S="${WORKDIR}/${P}"
-
-LICENSE="Apache-2.0"
-SLOT="2"
-KEYWORDS="amd64 arm64 ppc64"
-
-CP_DEPEND="
- dev-java/commons-io:1
- dev-java/commons-logging:0
-"
-
-DEPEND="${CP_DEPEND}
- >=virtual/jdk-1.8:*
- test? (
- dev-java/mockito:4
- dev-java/xml-commons-resolver:0
- )"
-
-RDEPEND="${CP_DEPEND}
- >=virtual/jre-1.8:*"
-
-BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-xmlgraphics-commons )"
-VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/xmlgraphics-commons.apache.org.asc"
-
-DOCS=( NOTICE README )
-
-JAVA_RESOURCE_DIRS="src/main/resources"
-JAVA_SRC_DIR="src/main/java"
-
-JAVA_TEST_EXTRA_ARGS=( -ea )
-JAVA_TEST_GENTOO_CLASSPATH="junit-4,mockito-4,xml-commons-resolver"
-# Some *.{png,tiff,txt,xmp} are misplaced in "src/test/java".
-JAVA_TEST_RESOURCE_DIRS=( "src/test/resources" "src/test/java" )
-JAVA_TEST_SRC_DIR="src/test/java"
diff --git a/dev-java/xmpbox/Manifest b/dev-java/xmpbox/Manifest
index 412af2065364..d3677ab5b642 100644
--- a/dev-java/xmpbox/Manifest
+++ b/dev-java/xmpbox/Manifest
@@ -1,3 +1,2 @@
-DIST pdfbox-2.0.27-src.zip 15770627 BLAKE2B 9f93d597141ff3da39b69da3ce989a0cc7f4020071e5cb1609a8b86d0f12a3219037cb4c7b276acf58ee6b07d842b6d7c76e14fdf79e9efdeac401048e345f89 SHA512 59a5675f5d1d34f092adc019679f7d10e7e93c0f554a002ac29d48cbffcaa600d930309fa94a92191c01ead8da905cbb37ce5e233dcc9b8732a881d4abf75def
DIST pdfbox-2.0.32-src.zip 17094201 BLAKE2B a48677819bab371d82a956affa8a9b55a8dca2627bb301b56facb4408229639162550c67eccc843b903e28a3f6258db4b0c096c2b40c134c1f0bf6085ff122d0 SHA512 bdad289bda79e78774dd4dedb8b0531f20382038e96232eb6c55508e2187ca3d7512072e87cd293fe6d1b9967d7e6a44f39b09a3af59872bf2f307275a65f546
DIST pdfbox-2.0.32-src.zip.asc 195 BLAKE2B a3c1f8078ded155bfecca3c15ec8c9ae648ab6dbfa9c023715eabdf72f092920b0c0ddedaafed3fc6a186f05c9880fbaa703eb088b704964ac4bb8bd5dd386e8 SHA512 b6aff86c09f75234c57ae079eff71e098377e27a1b0d55911b2cd466ff74c5d529c9cd45ba20653adae3a9b5f9ecfc3e9d6df0647bae59a7b651f128ef3b39e5
diff --git a/dev-java/xmpbox/xmpbox-2.0.27.ebuild b/dev-java/xmpbox/xmpbox-2.0.27.ebuild
deleted file mode 100644
index d7d33f1ac5e1..000000000000
--- a/dev-java/xmpbox/xmpbox-2.0.27.ebuild
+++ /dev/null
@@ -1,56 +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 mirror://apache/pdfbox/2.0.27/pdfbox-2.0.27-src.zip --slot 0 --keywords "~amd64 ~arm64 ~ppc64 ~x86" --ebuild xmpbox-2.0.27.ebuild
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.apache.pdfbox:xmpbox:2.0.27"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="An open source Java tool that implements Adobe's XMP(TM) specification"
-HOMEPAGE="https://pdfbox.apache.org"
-SRC_URI="mirror://apache/pdfbox/${PV}/pdfbox-${PV}-src.zip"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm64 ppc64"
-
-# Common dependencies
-# POM: pom.xml
-# commons-logging:commons-logging:1.2 -> >=dev-java/commons-logging-1.2:0
-
-CP_DEPEND="dev-java/jaxb-api:2"
-
-# Compile dependencies
-# POM: pom.xml
-# javax.xml.bind:jaxb-api:2.3.1 -> !!!groupId-not-found!!!
-# POM: pom.xml
-# test? junit:junit:4.13.2 -> >=dev-java/junit-4.13.2:4
-
-DEPEND="${CP_DEPEND}
- >=virtual/jdk-1.8:*"
-
-RDEPEND="${CP_DEPEND}
- >=virtual/jre-1.8:*"
-
-BDEPEND="app-arch/unzip"
-
-S="${WORKDIR}/pdfbox-${PV}/${PN}"
-
-JAVA_SRC_DIR="src/main/java"
-
-JAVA_TEST_GENTOO_CLASSPATH="junit-4"
-JAVA_TEST_SRC_DIR="src/test/java"
-JAVA_TEST_RESOURCE_DIRS="src/test/resources"
-
-JAVA_TEST_EXCLUDES=(
- # 1) initializationError(org.apache.xmpbox.parser.PropMappingTest)
- # org.junit.runners.model.InvalidTestClassError: Invalid test class 'org.apache.xmpbox.parser.PropMappingTest':
- # 1. No runnable methods
- org.apache.xmpbox.parser.PropMappingTest
-)
diff --git a/dev-java/xmpbox/xmpbox-2.0.32.ebuild b/dev-java/xmpbox/xmpbox-2.0.32.ebuild
index f08ef88d4761..87fd3b7ba3b8 100644
--- a/dev-java/xmpbox/xmpbox-2.0.32.ebuild
+++ b/dev-java/xmpbox/xmpbox-2.0.32.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/pdfbox-${PV}/${PN}"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 arm64 ~ppc64"
+KEYWORDS="amd64 arm64 ppc64"
VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/pdfbox.apache.org.asc"
BDEPEND="