Adding metadata

13 files changed, 150 insertions, 138 deletions

diff --git a/dev-java/jackcess/Manifest b/dev-java/jackcess/Manifest
index 95b315a20989..8b0c1cf99e50 100644
--- a/dev-java/jackcess/Manifest
+++ b/dev-java/jackcess/Manifest
@@ -1 +1,2 @@
 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.7.ebuild b/dev-java/jackcess/jackcess-4.0.7.ebuild
new file mode 100644
index 000000000000..768da2c43f0f
--- /dev/null
+++ b/dev-java/jackcess/jackcess-4.0.7.ebuild
@@ -0,0 +1,60 @@
+# 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.healthmarketscience.jackcess:jackcess:4.0.7"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="A pure Java library for reading from and writing to MS Access databases"
+HOMEPAGE="https://jackcess.sourceforge.io"
+SRC_URI="https://github.com/jahlborn/${PN}/archive/${P}.tar.gz -> ${P}-sources.tar.gz"
+S="${WORKDIR}/${PN}-${P}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~amd64-linux ~x86-linux ~ppc-macos"
+
+CP_DEPEND="
+	>=dev-java/commons-lang-3.17:3.6
+	>=dev-java/commons-logging-1.3.1:0[log4j]
+	>=dev-java/poi-5.2.5:0
+"
+
+DEPEND="
+	${CP_DEPEND}
+	>=virtual/jdk-1.8:*
+"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+	${CP_DEPEND}"
+
+PATCHES=( "${FILESDIR}/jackcess-4.0.0-fix-tests.patch" )
+
+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"
+
+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 #780585
+	java-pkg-2_src_prepare
+}
+
+src_test() {
+	export TZ=UTC
+	export LC_ALL=C
+	java-pkg-simple_src_test
+}
diff --git a/dev-java/jai-imageio-core/jai-imageio-core-1.4.0.ebuild b/dev-java/jai-imageio-core/jai-imageio-core-1.4.0-r1.ebuild
index 8f78550137de..33205e27e623 100644
--- a/dev-java/jai-imageio-core/jai-imageio-core-1.4.0.ebuild
+++ b/dev-java/jai-imageio-core/jai-imageio-core-1.4.0-r1.ebuild
@@ -1,10 +1,7 @@
 # Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom jai-imageio-core-jai-imageio-core-1.4.0/pom.xml --download-uri https://github.com/jai-imageio/jai-imageio-core/archive/refs/tags/jai-imageio-core-1.4.0.tar.gz --slot 0 --keywords "~amd64 ~arm64 ~ppc64 ~x86" --ebuild jai-imageio-core-1.4.0.ebuild
-
-EAPI=7
+EAPI=8
 
 JAVA_PKG_IUSE="doc source test"
 MAVEN_ID="com.github.jai-imageio:jai-imageio-core:1.4.0"
@@ -14,7 +11,8 @@ inherit java-pkg-2 java-pkg-simple
 
 DESCRIPTION="Java Advanced Imaging Image I/O Tools API core (standalone)"
 HOMEPAGE="https://github.com/jai-imageio/jai-imageio-core"
-SRC_URI="https://github.com/jai-imageio/${PN}/archive/refs/tags/${P}.tar.gz"
+SRC_URI="https://github.com/jai-imageio/${PN}/archive/${P}.tar.gz"
+S="${WORKDIR}"
 
 LICENSE="Sun-BSD-no-nuclear-2005"
 SLOT="0"
@@ -23,11 +21,9 @@ KEYWORDS="amd64 arm64 ppc64"
 DEPEND=">=virtual/jdk-1.8:*"
 RDEPEND=">=virtual/jre-1.8:*"
 
-S="${WORKDIR}"
-
-JAVA_SRC_DIR="${PN}-${P}/src/main/java"
 JAVA_RESOURCE_DIRS="${PN}-${P}/src/main/resources"
+JAVA_SRC_DIR="${PN}-${P}/src/main/java"
 
 JAVA_TEST_GENTOO_CLASSPATH="junit-4"
-JAVA_TEST_SRC_DIR="${PN}-${P}/src/test/java"
 JAVA_TEST_RESOURCE_DIRS="${PN}-${P}/src/test/resources"
+JAVA_TEST_SRC_DIR="${PN}-${P}/src/test/java"
diff --git a/dev-java/jai-imageio-jpeg2000/jai-imageio-jpeg2000-1.4.0.ebuild b/dev-java/jai-imageio-jpeg2000/jai-imageio-jpeg2000-1.4.0-r1.ebuild
index ed8e0ac6ef1a..35b593e79ae5 100644
--- a/dev-java/jai-imageio-jpeg2000/jai-imageio-jpeg2000-1.4.0.ebuild
+++ b/dev-java/jai-imageio-jpeg2000/jai-imageio-jpeg2000-1.4.0-r1.ebuild
@@ -1,10 +1,7 @@
 # Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom jai-imageio-jpeg2000-jai-imageio-jpeg2000-1.4.0/pom.xml --download-uri https://github.com/jai-imageio/jai-imageio-jpeg2000/archive/refs/tags/jai-imageio-jpeg2000-1.4.0.tar.gz --slot 0 --keywords "~amd64 ~arm64 ~ppc64 ~x86" --ebuild jai-imageio-jpeg2000-1.4.0.ebuild
-
-EAPI=7
+EAPI=8
 
 JAVA_PKG_IUSE="doc source test"
 MAVEN_ID="com.github.jai-imageio:jai-imageio-jpeg2000:1.4.0"
@@ -14,28 +11,28 @@ inherit java-pkg-2 java-pkg-simple
 
 DESCRIPTION="JPEG2000 support for Java Advanced Imaging Image I/O Tools API"
 HOMEPAGE="https://github.com/jai-imageio/jai-imageio-jpeg2000"
-SRC_URI="https://github.com/jai-imageio/${PN}/archive/refs/tags/${P}.tar.gz"
+SRC_URI="https://github.com/jai-imageio/${PN}/archive/${P}.tar.gz"
+S="${WORKDIR}"
 
 LICENSE="Sun-BSD-no-nuclear-2005"
 SLOT="0"
 KEYWORDS="amd64 arm64 ppc64"
 
-# Common dependencies
-# POM: ${PN}-${P}/pom.xml
-# com.github.jai-imageio:jai-imageio-core:1.4.0 -> >=dev-java/jai-imageio-core-1.4.0:0
+CP_DEPEND="dev-java/jai-imageio-core:0"
 
-CDEPEND="dev-java/jai-imageio-core:0"
-DEPEND="${CDEPEND}
-	>=virtual/jdk-1.8:*"
-RDEPEND="${CDEPEND}
-	>=virtual/jre-1.8:* "
+DEPEND="
+	${CP_DEPEND}
+	>=virtual/jdk-1.8:*
+"
 
-S="${WORKDIR}"
+RDEPEND="
+	${CP_DEPEND}
+	>=virtual/jre-1.8:*
+"
 
-JAVA_GENTOO_CLASSPATH="jai-imageio-core"
-JAVA_SRC_DIR="${PN}-${P}/src/main/java"
 JAVA_RESOURCE_DIRS="${PN}-${P}/src/main/resources"
+JAVA_SRC_DIR="${PN}-${P}/src/main/java"
 
 JAVA_TEST_GENTOO_CLASSPATH="junit-4"
-JAVA_TEST_SRC_DIR="${PN}-${P}/src/test/java"
 JAVA_TEST_RESOURCE_DIRS="${PN}-${P}/src/test/resources"
+JAVA_TEST_SRC_DIR="${PN}-${P}/src/test/java"
diff --git a/dev-java/jansi-native/jansi-native-1.8.ebuild b/dev-java/jansi-native/jansi-native-1.8-r1.ebuild
index 8de28dab8b6d..be23a1a14613 100644
--- a/dev-java/jansi-native/jansi-native-1.8.ebuild
+++ b/dev-java/jansi-native/jansi-native-1.8-r1.ebuild
@@ -1,42 +1,33 @@
 # Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI=8
 
 JAVA_PKG_IUSE="doc source"
 
 inherit vcs-snapshot java-pkg-2 java-pkg-simple
 
 DESCRIPTION="Native JNI component for dev-java/jansi"
-HOMEPAGE="http://fusesource.github.io/jansi/"
+HOMEPAGE="https://fusesource.github.io/jansi/"
 SRC_URI="https://github.com/fusesource/${PN}/archive/${P}.tar.gz"
+S="${WORKDIR}/${P}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="amd64 arm64 ppc64"
 
-CDEPEND="dev-java/hawtjni-runtime:0"
+CP_DEPEND="dev-java/hawtjni-runtime:0"
 
-DEPEND="${CDEPEND}
-	>=virtual/jdk-1.8"
+DEPEND="
+	${CP_DEPEND}
+	>=virtual/jdk-1.8
+"
 
-RDEPEND="${CDEPEND}
-	>=virtual/jre-1.8"
+RDEPEND="
+	${CP_DEPEND}
+	>=virtual/jre-1.8
+"
 
-S="${WORKDIR}/${P}"
+DOCS=( {changelog,readme}.md )
 
 JAVA_SRC_DIR="src/main/java"
-JAVA_GENTOO_CLASSPATH="hawtjni-runtime"
-
-src_prepare() {
-	# Easier to use java-pkg-simple.
-	rm -v pom.xml || die
-
-	default
-}
-
-src_install() {
-	java-pkg-simple_src_install
-
-	dodoc {changelog,readme}.md
-}
diff --git a/dev-java/jide-oss/jide-oss-3.7.12-r1.ebuild b/dev-java/jide-oss/jide-oss-3.7.12-r2.ebuild
index 39bb51991972..07effbc5a455 100644
--- a/dev-java/jide-oss/jide-oss-3.7.12-r1.ebuild
+++ b/dev-java/jide-oss/jide-oss-3.7.12-r2.ebuild
@@ -1,10 +1,7 @@
 # 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/jidesoft/jide-oss/archive/19083238ce00ecbd7370f856cb64ea69dae669a5.tar.gz --slot 0 --keywords "~amd64 ~x86" --ebuild jide-oss.3.7.12-r2.ebuild
-
-EAPI=7
+EAPI=8
 
 JAVA_PKG_IUSE="doc source test"
 MAVEN_ID="com.jidesoft:jide-oss:3.7.12"
@@ -16,6 +13,7 @@ inherit java-pkg-2 java-pkg-simple
 DESCRIPTION="JIDE Common Layer (Professional Swing Components)"
 HOMEPAGE="https://github.com/jidesoft/jide-oss"
 SRC_URI="https://github.com/jidesoft/jide-oss/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${MY_COMMIT}"
 
 LICENSE="GPL-2-with-classpath-exception"
 SLOT="0"
@@ -26,16 +24,14 @@ KEYWORDS="~amd64"
 DEPEND="virtual/jdk:1.8"
 RDEPEND="virtual/jre:1.8"
 
-DOCS=( {LICENSE,'Readme JDK9',README}.txt libs/README_lib )
-
-S="${WORKDIR}/${PN}-${MY_COMMIT}"
+DOCS=( {'Readme JDK9',README}.txt libs/README_lib )
 
 JAVA_GENTOO_CLASSPATH_EXTRA="libs/ui.jar"
-JAVA_SRC_DIR=( "src" "src-jdk8" )
 JAVA_RESOURCE_DIRS=( "src" "properties" )
+JAVA_SRC_DIR=( "src" "src-jdk8" )
 
-JAVA_TEST_SRC_DIR="test"
 JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_SRC_DIR="test"
 
 JAVA_TEST_EXCLUDES=(
 	"com.jidesoft.swing.CornerScrollerVisualTest" # No runnable methods
@@ -48,11 +44,6 @@ JAVA_TEST_EXCLUDES=(
 )
 
 src_prepare() {
-	default
+	java-pkg-2_src_prepare
 	rm libs/junit-4.10.jar || die
 }
-
-src_install() {
-	default
-	java-pkg-simple_src_install
-}
diff --git a/dev-java/jline/jline-2.14.6.ebuild b/dev-java/jline/jline-2.14.6-r1.ebuild
index aaa438bb7511..50628992ff30 100644
--- a/dev-java/jline/jline-2.14.6.ebuild
+++ b/dev-java/jline/jline-2.14.6-r1.ebuild
@@ -1,11 +1,10 @@
 # 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_SRC_DIR="src/main/java"
-JAVA_GENTOO_CLASSPATH="jansi,jansi-native"
+
 inherit java-pkg-2 java-pkg-simple
 
 DESCRIPTION="A Java library for handling console input"
@@ -17,30 +16,34 @@ LICENSE="BSD"
 SLOT="2"
 KEYWORDS="amd64 arm64 ppc64"
 IUSE="test"
+
 # Needs yet-unpackaged powermock for tests
 RESTRICT="!test? ( test ) test"
 
-CDEPEND="
+CP_DEPEND="
 	dev-java/jansi:0
 	dev-java/jansi-native:0"
 
 DEPEND="
+	${CP_DEPEND}
+	>=virtual/jdk-1.8:*
 	test? (
 		dev-java/easymock:3.2
 		dev-java/junit:4
 	)
-	${CDEPEND}
-	>=virtual/jdk-1.8:*"
+"
 
 RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.8:*"
+	${CP_DEPEND}
+	>=virtual/jre-1.8:*
+"
 
-src_prepare() {
-	default
+DOCS=( {CHANGELOG,README}.md )
+
+JAVA_SRC_DIR="src/main/java"
 
-	# Easier to use java-pkg-simple.
-	rm -v pom.xml || die
+src_prepare() {
+	java-pkg-2_src_prepare
 
 	# Don't forget the resources!
 	mkdir -p target/classes || die
@@ -58,9 +61,3 @@ src_test() {
 	ejavac -cp "${CP}" -d . $(find * -name "*.java" || die)
 	ejunit4 -classpath "${CP}" ${TESTS}
 }
-
-src_install() {
-	java-pkg-simple_src_install
-
-	dodoc {CHANGELOG,README}.md
-}
diff --git a/dev-java/junit-clptr/junit-clptr-1.2.2.ebuild b/dev-java/junit-clptr/junit-clptr-1.2.2-r1.ebuild
index 8f5b3a458408..d1e2eaaa043a 100644
--- a/dev-java/junit-clptr/junit-clptr-1.2.2.ebuild
+++ b/dev-java/junit-clptr/junit-clptr-1.2.2-r1.ebuild
@@ -1,10 +1,7 @@
 # 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/bitstrings/junit-clptr/archive/refs/tags/1.2.2.tar.gz --slot 0 --keywords "~amd64 ~x86" --ebuild junit-clptr-1.2.2.ebuild
-
-EAPI=7
+EAPI=8
 
 JAVA_PKG_IUSE="doc source"
 MAVEN_ID="org.bitstrings.test:junit-clptr:1.2.2"
@@ -12,34 +9,27 @@ MAVEN_ID="org.bitstrings.test:junit-clptr:1.2.2"
 inherit java-pkg-2 java-pkg-simple
 
 DESCRIPTION="ClassLoader per Test runner for JUnit 4.12+"
-HOMEPAGE="http://nexus.sonatype.org/oss-repository-hosting.html/junit-clptr"
+HOMEPAGE="https://github.com/bitstrings/junit-clptr"
 SRC_URI="https://github.com/bitstrings/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}-sources.tar.gz"
+S="${WORKDIR}/${P}"
+
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="amd64 ppc64"
 
-# Common dependencies
-# POM: pom.xml
-# junit:junit:4.12 -> >=dev-java/junit-4.13.2:4
-
-CDEPEND="
+CP_DEPEND="
 	dev-java/junit:4
 "
 
 DEPEND="
+	${CP_DEPEND}
 	>=virtual/jdk-1.8:*
-	${CDEPEND}
 "
 
 RDEPEND="
+	${CP_DEPEND}
 	>=virtual/jre-1.8:*
-	${CDEPEND}
 "
 
-S="${WORKDIR}/${P}"
-
-JAVA_GENTOO_CLASSPATH="junit-4"
+JAVA_RESOURCE_DIRS="src/main/resources"
 JAVA_SRC_DIR="src/main/java"
-JAVA_RESOURCE_DIRS=(
-	"src/main/resources"
-)
diff --git a/dev-java/junitparams/junitparams-1.1.1-r1.ebuild b/dev-java/junitparams/junitparams-1.1.1-r2.ebuild
index 9b511a320bec..0b40cf5e590e 100644
--- a/dev-java/junitparams/junitparams-1.1.1-r1.ebuild
+++ b/dev-java/junitparams/junitparams-1.1.1-r2.ebuild
@@ -1,10 +1,7 @@
 # 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/Pragmatists/JUnitParams/archive/refs/tags/JUnitParams-1.1.1.tar.gz --slot 0 --keywords "~amd64 ~arm64 ~ppc64 ~x86" --ebuild junitparams-1.1.1.ebuild
-
-EAPI=7
+EAPI=8
 
 JAVA_PKG_IUSE="doc source test"
 MAVEN_ID="pl.pragmatists:JUnitParams:1.1.1"
@@ -14,22 +11,15 @@ inherit java-pkg-2 java-pkg-simple
 
 DESCRIPTION="Better parameterised tests for JUnit"
 HOMEPAGE="https://github.com/Pragmatists/JUnitParams"
-SRC_URI="https://github.com/Pragmatists/JUnitParams/archive/refs/tags/JUnitParams-${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/Pragmatists/JUnitParams/archive/JUnitParams-${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/JUnitParams-JUnitParams-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="amd64 arm64 ppc64"
 
-# Common dependencies
-# POM: pom.xml
-# junit:junit:4.12 -> >=dev-java/junit-4.12:4
-
 CP_DEPEND="dev-java/junit:4"
 
-# Compile dependencies
-# POM: pom.xml
-# test? org.assertj:assertj-core:1.7.1 -> >=dev-java/assertj-core-2.3.0:2
-
 DEPEND="
 	>=virtual/jdk-1.8:*
 	${CP_DEPEND}
@@ -40,19 +30,16 @@ DEPEND="
 
 RDEPEND="
 	>=virtual/jre-1.8:*
-	${CP_DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/junitparams-1.1.1-test.patch
-)
+	${CP_DEPEND}
+"
 
-S="${WORKDIR}/JUnitParams-JUnitParams-${PV}"
+PATCHES=( "${FILESDIR}"/junitparams-1.1.1-test.patch )
 
 JAVA_SRC_DIR="src/main/java"
 
 JAVA_TEST_GENTOO_CLASSPATH="assertj-core-3"
-JAVA_TEST_SRC_DIR="src/test/java"
 JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+JAVA_TEST_SRC_DIR="src/test/java"
 
 JAVA_TEST_EXCLUDES=(
 	# java.lang.RuntimeException: Could not find method: paramsForSuperclassMethod so no params were used.
@@ -60,5 +47,6 @@ JAVA_TEST_EXCLUDES=(
 )
 
 src_prepare() {
-	default
+	default #780585
+	java-pkg-2_src_prepare
 }
diff --git a/dev-java/lzmajio/Manifest b/dev-java/lzmajio/Manifest
index cf220190b755..43b00f07f497 100644
--- a/dev-java/lzmajio/Manifest
+++ b/dev-java/lzmajio/Manifest
@@ -1 +1 @@
-DIST lzmajio-0.95.tar.gz 20790 BLAKE2B e24a5f4778bb135ce3ab519dfc8357cf3abc04d564b8d365f7cbad579be7ff86b4d24156720954bab882d7ade8e5145e533fd477c1925f6a9353c90dd5a2e511 SHA512 65736a66ec8f5eb63688edda912718f4e9b0518c68b0b1eed3df26e7b6bb15728024c637b4cf40f6ab52168c913cce91bd7cafefca7515e0f3e386738cedc6e5
+DIST lzmajio-0.95.tar.gz 20501 BLAKE2B 0b45d55c0fb56ff97eecc2ed3fb2dc5a5321ff33e78aa51e71c9e074c69006b3db449d95959d346bb5fb7b87bc104e8ad11d198537315106e27ac3edb7af07db SHA512 c9b9e2655259cda24ce60956c3aba320e661f8639fb88f614bb2e63ce8c747e92d4a37b6233f1962a5e655364b24f49e7370f7af13dfde41f9d2217c6c1ae788
diff --git a/dev-java/lzmajio/lzmajio-0.95-r3.ebuild b/dev-java/lzmajio/lzmajio-0.95-r4.ebuild
index 4b1b53de7ee9..d0b2f3fb47e1 100644
--- a/dev-java/lzmajio/lzmajio-0.95-r3.ebuild
+++ b/dev-java/lzmajio/lzmajio-0.95-r4.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,23 +10,23 @@ inherit java-pkg-2 java-pkg-simple
 DESCRIPTION="LzmaInputStream/LzmaOutputStream interacting with underlying LZMA en-/decoders"
 HOMEPAGE="https://contrapunctus.net/league/haques/lzmajio/
 	https://github.com/league/lzmajio"
-SRC_URI="https://github.com/league/${P}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/league/lzmajio/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${P}"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="amd64 ~arm64"
 
-CDEPEND="dev-java/lzma:0"
+CP_DEPEND="dev-java/lzma:0"
 
 RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.8:*"
+	${CP_DEPEND}
+	>=virtual/jre-1.8:*
+"
 
 DEPEND="
-	${CDEPEND}
-	>=virtual/jdk-1.8:*"
-
-S="${WORKDIR}/${P}"
+	${CP_DEPEND}
+	>=virtual/jdk-1.8:*
+"
 
-JAVA_GENTOO_CLASSPATH="lzma"
 JAVA_SRC_DIR="net"
diff --git a/dev-java/mersennetwister/mersennetwister-0_pre23765-r2.ebuild b/dev-java/mersennetwister/mersennetwister-0_pre23765-r3.ebuild
index f55868287475..47624e139641 100644
--- a/dev-java/mersennetwister/mersennetwister-0_pre23765-r2.ebuild
+++ b/dev-java/mersennetwister/mersennetwister-0_pre23765-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"
 
@@ -14,9 +14,10 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 ~arm64"
-IUSE=""
 
-RDEPEND=">=virtual/jre-1.8:*"
 DEPEND="
 	source? ( app-arch/zip )
-	>=virtual/jdk-1.8:*"
+	>=virtual/jdk-1.8:*
+"
+
+RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/xml-commons-external/xml-commons-external-1.4.01-r2.ebuild b/dev-java/xml-commons-external/xml-commons-external-1.4.01-r3.ebuild
index ee1bcece646b..abb1deb23085 100644
--- a/dev-java/xml-commons-external/xml-commons-external-1.4.01-r2.ebuild
+++ b/dev-java/xml-commons-external/xml-commons-external-1.4.01-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"
 MAVEN_ID="xml-apis:xml-apis:1.4.01"
@@ -19,8 +19,8 @@ LICENSE="Apache-2.0"
 SLOT="1.4"
 KEYWORDS="amd64 arm64 ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 
-RDEPEND=">=virtual/jre-1.8:*"
-DEPEND=">=virtual/jdk-1.8:*"
 BDEPEND="source? ( app-arch/zip )"
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
 
 JAVADOC_ARGS="-source 8"