Adding metadata

5 files changed, 64 insertions, 24 deletions

diff --git a/dev-java/antlr/antlr-2.7.7-r9.ebuild b/dev-java/antlr/antlr-2.7.7-r10.ebuild
index a82c35657a74..10b9b6e1131d 100644
--- a/dev-java/antlr/antlr-2.7.7-r9.ebuild
+++ b/dev-java/antlr/antlr-2.7.7-r10.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-JAVA_PKG_IUSE="doc source"
+JAVA_PKG_IUSE="doc examples source"
 MAVEN_ID="antlr:antlr:2.7.7"
 
 inherit java-pkg-2 java-pkg-simple
@@ -11,23 +11,23 @@ inherit java-pkg-2 java-pkg-simple
 DESCRIPTION="A parser generator for many languages"
 HOMEPAGE="https://www.antlr2.org/"
 SRC_URI="https://www.antlr2.org/download/${P}.tar.gz"
+S="${WORKDIR}/${P}"
 
 LICENSE="public-domain"
 SLOT="0"
 KEYWORDS="amd64 arm64 ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="examples"
 
-RDEPEND=">=virtual/jre-1.8:*"
 DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
 
-S="${WORKDIR}/${P}"
-
+JAVA_MAIN_CLASS="antlr.Tool"
 JAVA_SRC_DIR="${S}/${PN}"
 
 DOCS=( CHANGES.txt README.txt )
 
 src_prepare() {
-	default
+	default #780585
+	java-pkg-2_src_prepare
 	java-pkg_clean
 
 	# Delete build files from examples.
@@ -39,12 +39,8 @@ src_configure() { :; }
 
 src_install() {
 	java-pkg-simple_src_install
-	java-pkg_dolauncher antlr --main antlr.Tool
 
 	use doc && java-pkg_dohtml -r doc/*
 	use examples && java-pkg_doexamples examples/java
 	use source && java-pkg_dosrc antlr
-
-	# https://bugs.gentoo.org/789582
-	einstalldocs
 }
diff --git a/dev-java/commons-io/Manifest b/dev-java/commons-io/Manifest
index e973b5e8fc40..636409e7d7c3 100644
--- a/dev-java/commons-io/Manifest
+++ b/dev-java/commons-io/Manifest
@@ -1,2 +1,4 @@
 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.18.0.ebuild b/dev-java/commons-io/commons-io-2.18.0.ebuild
new file mode 100644
index 000000000000..56e38e5d6014
--- /dev/null
+++ b/dev-java/commons-io/commons-io-2.18.0.ebuild
@@ -0,0 +1,40 @@
+# 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/icu4j/icu4j-76.1-r1.ebuild b/dev-java/icu4j/icu4j-76.1-r1.ebuild
index 0dc67c7d8a23..18d8e70c3df7 100644
--- a/dev-java/icu4j/icu4j-76.1-r1.ebuild
+++ b/dev-java/icu4j/icu4j-76.1-r1.ebuild
@@ -20,7 +20,7 @@ S="${WORKDIR}/icu-release-${PV/./-}/icu4j/main"
 
 LICENSE="icu"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64"
+KEYWORDS="~amd64 arm64 ~ppc64"
 
 DEPEND="
 	>=virtual/jdk-1.8:*
diff --git a/dev-java/jmock/jmock-1.2.0-r2.ebuild b/dev-java/jmock/jmock-1.2.0-r3.ebuild
index 6ba5eb3a2018..7225c30b6999 100644
--- a/dev-java/jmock/jmock-1.2.0-r2.ebuild
+++ b/dev-java/jmock/jmock-1.2.0-r3.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 JAVA_PKG_IUSE="doc source"
 
@@ -10,24 +10,26 @@ inherit java-pkg-2 java-pkg-simple
 DESCRIPTION="Library for testing Java code using mock objects"
 HOMEPAGE="http://jmock.org/"
 SRC_URI="http://jmock.org/downloads/${P}-jars.zip"
+S="${WORKDIR}/${P}"
 
 LICENSE="BSD"
 SLOT="1.0"
 KEYWORDS="amd64 arm64 ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
-CDEPEND="dev-java/junit:0"
-
-RDEPEND=">=virtual/jre-1.8:*
-	${CDEPEND}"
+CP_DEPEND="dev-java/junit:0"
 
-DEPEND="app-arch/unzip
+DEPEND="
+	${CP_DEPEND}
+	app-arch/unzip
 	>=virtual/jdk-1.8:*
-	${CDEPEND}"
+"
 
-S="${WORKDIR}/${P}"
+RDEPEND="
+	${CP_DEPEND}
+	>=virtual/jre-1.8:*
+"
 
 JAVA_SRC_DIR="src"
-JAVA_GENTOO_CLASSPATH="junit"
 
 PATCHES=(
 	# This patch isn't changing the behaviour if jmock per se.
@@ -42,7 +44,7 @@ src_unpack() {
 }
 
 src_prepare() {
-	default
-	find -name "*.class" -delete || die
-	rm *.jar || die
+	default #780585
+	java-pkg-2_src_prepare
+	java-pkg_clean
 }