gentoo auto-resync : 08:11:2024 - 03:03:27

25 files changed, 165 insertions, 150 deletions

diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index a6bb766da312..2ff6767fd6ff 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/jackcess/Manifest b/dev-java/jackcess/Manifest
index 5fa533c89984..96240962c770 100644
--- a/dev-java/jackcess/Manifest
+++ b/dev-java/jackcess/Manifest
@@ -1,4 +1,6 @@
 AUX jackcess-4.0.0-fix-tests.patch 665 BLAKE2B 6e2cc60406b84c64e896478dbed520834b193749121241abd97ea1d54079a1faed4830347ab4d99623244e344ae502a10e8cadcdd4dbd1ffce83fdd273af3e33 SHA512 70a1325cbf955b032fada56a05635175f285e722c4c2a4c0a3d59401fec2b8261ff8c4717cf3e4c05cdbe53517a142ce348bd6309883334519fcf05e37afccce
 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
 EBUILD jackcess-4.0.0.ebuild 1984 BLAKE2B 9369eee01094cafff86a78c76feb6e28e2d86f574023b4ed1aa0eb5437cdd38fb2f353405c414e4fa852ff29e76d435b3bcf61d74560753e5e6bfba685ad69e8 SHA512 ddc4baf06571b1241caea712b1627cd2026204a748c96da41860c9dfe30af8d794fdf7ab20b4e897606a38904f75087812c96e8604d7ae50f71ed59e73e3e682
-MISC metadata.xml 315 BLAKE2B 04a9ef5dc6dae2166726ffdbbb1ab50dbc42d44286f2e2392a3ac5277b08c3ace57ddf88791b08d822a5a08f0217f0f915a3d48be85e677050f4af68ed6e57c9 SHA512 333904e9a8b92f902c4903cbeca86a106acdb7783f6bedc79685b2a5c3afafda68a9e8d886048b21828d683c0359945f9f2f7752474fcc725eb772db57ad1867
+EBUILD jackcess-4.0.7.ebuild 1452 BLAKE2B d2ae3096816a1ed457950a4b2d7ed44b37107008569426b327c7a4f366ded1c5578644031b1a6f8b0792f995b5f37db3a7dcaea6cb16988f52814b093be90e63 SHA512 3b69b9bb225b6b3cb1172c62e66a1b71e54a12e5951463ec143d63d6752faa1f8d5fbcb8cb3ddf57002931021a9f237113edf5de31b995d159e10a38452a209d
+MISC metadata.xml 372 BLAKE2B 63ac19dbcf1f5f0245de609b081ad31e537defc6dea55da6179cda0b510fddb1a7451a0f4a6aca4cc8ac305eecfd56c1021879bf2e342101da5b7cd7eb165e0a SHA512 c5e882be72900ca5f8f011c352a47888baa7cdc63d92ae1c50f23435b36ef457b4aa7b23c1c64277e7287378b0ca821e38bcadeff7dbac1b7203bfeb678cfc06
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/jackcess/metadata.xml b/dev-java/jackcess/metadata.xml
index 68527723b496..c569b19c9503 100644
--- a/dev-java/jackcess/metadata.xml
+++ b/dev-java/jackcess/metadata.xml
@@ -7,5 +7,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">jackcess</remote-id>
+		<remote-id type="github">jahlborn/jackcess</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-java/jai-imageio-core/Manifest b/dev-java/jai-imageio-core/Manifest
index 563337a0ee55..6e774dede7f8 100644
--- a/dev-java/jai-imageio-core/Manifest
+++ b/dev-java/jai-imageio-core/Manifest
@@ -1,3 +1,3 @@
 DIST jai-imageio-core-1.4.0.tar.gz 1542191 BLAKE2B 3dc8de7cd8e375eb3b4e5a6524e0280bf295ffb0d29b2989a35789f8974f27a6ba50f1b3b82c88af0992cf6ce7b5fba28e38f2892b3ac34b2c20d7245035f2ec SHA512 20d361cbb040b692717acad56d12034ff695859f125acbac080092fb0423f5338bfbd9a39a968b67712f4f0a62cc02a51dc9e2cffbb886efb379c8a923a11ad8
-EBUILD jai-imageio-core-1.4.0.ebuild 1182 BLAKE2B df2e6b7111931870d269eecfe618e622b2fa5219acc9af5818068efe7a1964eb99bcb197db32bfe4ab4047ac9df5b3312fa3778d8be2ceeffbd4969348ca08a6 SHA512 d07008b75894234b668a464289bffb2d0ca14dafdea42b7cc75df92c7bf4a7f2a8f6f81fab41c64fa66e86d316b11bd1b28f78ada904f6ae56666896607b9965
+EBUILD jai-imageio-core-1.4.0-r1.ebuild 852 BLAKE2B a4c85985455cdc5b9c7f6beff94064a3edcfe9e962fc4ca0d0903450cca221cad36edf747e633d83b58e7dab0374a6185a7d5fa65c38d922790f9b8d68a47690 SHA512 3375a8d29a191adb9e31d162308990f6f44a35264229c97c0824836c4866a56f222b55ae631c680a568675495f282d554b0f7481e38c20698ea17bc2e805f9c6
 MISC metadata.xml 681 BLAKE2B 09959f37fefc097c2c070264edb589bd08746952b4a662dbd53467ba3e1926ac612f8fd7e94182d6b8c866bd5c359e150463679dd23636ee42088f00cbfb4ca2 SHA512 caf76afd6bea207df2d6429d6cc35e53ad34d6b0834fdc74d2197ec06fbb403fc81c9c0a111d8987cffb72e7a75c25f30d95f6ac3362637c17ced1849fe33fb7
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/Manifest b/dev-java/jai-imageio-jpeg2000/Manifest
index 47b7eb1b35a5..c8cab6806387 100644
--- a/dev-java/jai-imageio-jpeg2000/Manifest
+++ b/dev-java/jai-imageio-jpeg2000/Manifest
@@ -1,3 +1,3 @@
 DIST jai-imageio-jpeg2000-1.4.0.tar.gz 499964 BLAKE2B 219b53d2264f819ed808495e5c559e8350f965ba100696f28e817ef27cf458fe2b05401957d81a3f4f208f59888a0607b72e4529fdfd37c6763cd1b8da1f2f5d SHA512 6c1129f735d1e6578e8feb233fe5462a62f503979d7afad9942acd749b39714e352df6133fad0b99f4fd84af82de10efbf91196eb0cc9d40c080c9546948f4eb
-EBUILD jai-imageio-jpeg2000-1.4.0.ebuild 1453 BLAKE2B 79b43ca896f473b9c7c410a3733daba82b8e39881988e35d8858d317e48c90f364b01c3a8716f1e68fabc4a70e25ab79cc904ace131fb786fdaba415941c68e6 SHA512 6c5bcdbfed7b9738b874d082800186da27726a852ae5be77939bb05cf726d168e99e72e390fbbe22db1eee0c03fe36847c9ac1a3eba7a8909970632b4b68559e
+EBUILD jai-imageio-jpeg2000-1.4.0-r1.ebuild 939 BLAKE2B 0238672ebc0e160fa1994569477130a8515103dcbe45f71cd91a1bef4c040aa8668531a0823165fb3cb4174e07cceff0d9cfd52d4023707305de87327a169b26 SHA512 fddcbc31e82d2fc9671e73f8e5380f26b28697a2720af5453fd8a58508b40c1c17de842a3d1ac609fb459582de17b940888e3754f76495f7e0303aa8e87bbf8b
 MISC metadata.xml 681 BLAKE2B 389c7956920b5a7a8e01a397fbbb02def0e4c5fef40eeea907268af108db06b5ab4237648d57bfa4a76ba950d1009f68dce6aef1d86bbe841f352421887e1a3b SHA512 69fec59eaad0e346d5a601fdbdab0988381225680118423d69ee214216dc4975f1ba1664dcb383269bba2da229eafbe96f76497dcce87a30c6b63945684df140
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/Manifest b/dev-java/jansi-native/Manifest
index 96b2e0f526b7..b206355d7203 100644
--- a/dev-java/jansi-native/Manifest
+++ b/dev-java/jansi-native/Manifest
@@ -1,3 +1,3 @@
 DIST jansi-native-1.8.tar.gz 33035 BLAKE2B 0008d1af45e8694d065beb7c55cf5e73aa1bff54aa9b83287490a307553ef6fb28f87011658f9fed54a3ba8d47497e2c267a94a63d50862d9ebf3e231b8eda23 SHA512 e5184bc8f5c819f54550791969df611df0b4fdfcfc6aaebf123d786a08a957e5854b15b2569871d5a9d0d20703a8831c99c42610a83fff77af3cf750b72a7fee
-EBUILD jansi-native-1.8.ebuild 791 BLAKE2B 0fb9a0466b9d751d73b8ab26a4c91e66d4ae1428da34ce38157e6f09a8af436cbd18998978aecabf67950659da84ff6af659381f96c4bd467b3786047c9fd1d4 SHA512 108cd537b22c394b68472a8a8c33d2f28ee3692b5297248119051e8f251388d86ba3855535d58714f6afb9164cf0e1b68c6efa6013b82761f3dbb028f6ff1d1b
+EBUILD jansi-native-1.8-r1.ebuild 630 BLAKE2B 78966f4e9e936c1cd54ff9005e63c8c81f853c598690a213c0795f1091e3c94e29a719d4172b58f1bdef86c19d4acd3b8c3505088d24a2933373e6e707b5ff03 SHA512 2facc35cbf355f1c57ccea3b757b238b30b9797c0e1e008049b6a99b7192ec5f8df6afb59d8bebe231b82b94fabe70f3ebd9be6bd73341e99c9774a9368b42cc
 MISC metadata.xml 335 BLAKE2B ee3c6029a461c8e1828fff984456c1b06c74222920bfa84322c84ef47af2a3dda3e5566cbb08c24bb5e2356c1d8952d96ad12b6eb3fd04b64aff2128762145c0 SHA512 2bbe96cb6cc338917baa4674de8fcb33806a9b6afa217a2bdecd7c731e3cb4b0af1b46e6dd9d5281ab18ebc7f3f7fb2894c2dae936c62168b14faa2038f500a2
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/Manifest b/dev-java/jide-oss/Manifest
index f427cb94e696..05e5ce5d20d2 100644
--- a/dev-java/jide-oss/Manifest
+++ b/dev-java/jide-oss/Manifest
@@ -1,3 +1,3 @@
 DIST jide-oss-3.7.12.tar.gz 4819086 BLAKE2B 9f84b8f9e87b6e74844e11c925546b9a43ae99476c91b84be9269dd8e31658889c3cf38cd67c4a5ec94419d8c5ccecb600c55f747d15e3427e01eb146b0ee755 SHA512 f17ab94fd77237fa0891eb87972b0630a0709fbd7e5d07e6d8389fd18668747d13ca9f631f81cf1153f7d233131a0500e8e76dabf8d33fdce846db14f9958456
-EBUILD jide-oss-3.7.12-r1.ebuild 1812 BLAKE2B 0e6db2700ce12ec4b0b5e21f86d4db05dd1c9317e299f5998e9c44aac5aeba5f09c9c40b2b696537af36911b2d7becb385aea7a776e7ea457d2cddedacdd3649 SHA512 a1b0e04e9c8c7115f6ad62f641bb57c54d5c420f09fe787933d91f55eee593fd49f7991fb0d4cf65cea5be3a62aaf6c8401f28f1447262c3cfe4f048651011dd
+EBUILD jide-oss-3.7.12-r2.ebuild 1503 BLAKE2B 3c3bb9f89300d3a58ade76a2c37ba7e195803cc6ed384e1b50d01c7dc94ea63e46a49469c86f4ac638b585a87d3514bbaa197c9a5a6b530865953164b0a27c57 SHA512 eb9a4114adfc091b73fb67e27b3385a8107616da7d43893506f5e608eafa7b4ca6d5a6bd79ccf72d2e5e3cc59a55578d7dd80a6b0fbffd150cb422ba2d4e396f
 MISC metadata.xml 648 BLAKE2B 5cfa79058c3e1e448ea36658dc31dfc7cabad5e9b182c0323a7bfa4b5a2731fb1576077efa90f9b884c02581cb1a27690e4ff36a52d604ffc1fb6add83d2d5d4 SHA512 ec85bfd3f9a4311c5b0ab7314ff9f0e9806eed63cab859f7315b1e693bb74a516ba32786bec62ce826b4eed8e149f4d0e60de4a9cf1311da970f5b7ba443b865
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/Manifest b/dev-java/jline/Manifest
index b4c887b033ed..cf49192c8f6f 100644
--- a/dev-java/jline/Manifest
+++ b/dev-java/jline/Manifest
@@ -1,3 +1,3 @@
 DIST jline-2.14.6.tar.gz 116599 BLAKE2B a3576314d8bb4886e0297822e0f37b4cc4c49cad1c5ea71a61a2813b0afae7ba8a5d5ad914fe900c4dca6c2f3891551157ca4a3d24231e8731cda4b5dbe80b32 SHA512 9e141c9a112dcb4850db95a7c2cec9b84f11be1f6740a3a33c99ec2ed5f900f4dae7474058e14319ef79476121997afbdb248ca22559a82a905c31690afa1d51
-EBUILD jline-2.14.6.ebuild 1395 BLAKE2B d6362d552ca9a0c78ad48da17939a9f66e48df6272ab447658363ff0f7bedb323753ad7ab7cff8f4be9e07d6738ce50a259865299643a72fa8bbb1af1cc48a80 SHA512 31fb8f820da9e220a7fdcaf493be7ca7e26399b6bb7504572321394c0dca19c3041c99add7de48be04680f4dd699f0b8d6960d90052bc90eee08f5641def9805
+EBUILD jline-2.14.6-r1.ebuild 1275 BLAKE2B ba3d1e92837ab11ac24073900b370f2ba0c8b29f334f4f72004ea6b34f4afc637ebd62f855ee2029b97ef24a6bdc2e30d3e888c6828f3a1654d6df71931170b3 SHA512 cb73bcc14804062ede192d125aff1f6207837b05e0bcb84cedd40f88dd0b10bcda7c7f785a14a2c379e4a7a1008bd54d8300f9be405dd58bc0510fe5ddc96c4b
 MISC metadata.xml 376 BLAKE2B 5879728bea0aa1b1d38110a053b6144407077d14968a0f45a76079388a302071ecb543c67366d3b3bbb30768eba852f07100e89253a7cdd9342614828d171a3c SHA512 363bc722f4e7908aba60f0c655265b289614ba80338ad381b92f2cd6e2214331b76fda29855a5a0fda992de7f03acb3a48e4bca10cb0147b5b302f499a5b25bb
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/Manifest b/dev-java/junit-clptr/Manifest
index cc5c54101b4b..d8c1ae4257a0 100644
--- a/dev-java/junit-clptr/Manifest
+++ b/dev-java/junit-clptr/Manifest
@@ -1,3 +1,3 @@
 DIST junit-clptr-1.2.2-sources.tar.gz 11418 BLAKE2B 9089cb4ce38ac4318ff7a26db978a1b1a9bf70d4efd4c35e94a88a312d05100cd53a2ebe7b162885904e0cec04a513393e3e5a137ec3ecba684b70653cef22e6 SHA512 28400aca95686d67bb81c7ce8fd0bd2804ec33cabc86aceb01cbb2fd42d89b3c4b4c5f3a1670ecd3d0b486a087ebbd3e7b41fd18061c0653246b17bae557032d
-EBUILD junit-clptr-1.2.2.ebuild 1087 BLAKE2B e6b69118562fbb9567fcfcdb08a158571e271c43d246592809c73b3a6512bd0bfe3ef3b4e3456c1a08f4a364c31d8a9bdab81070b4726056cf2d151ef5097fde SHA512 9a26c79e3d94a8cf2472b742298ecc207dcafe7b8c3f629332f10c6499b1ff178ac24bb6826b41bc61b69a7912bb0446c6b2399fe8aa57901d9d73eab6e84262
-MISC metadata.xml 414 BLAKE2B c9f78424051f0f72a7d80dd49f535369e04fc0b1b472b6963c028b331598de9f81bdcdb630d3daafc6eadcb92e4e83b0baeabdcf77d49c06ccaf94c1d9ca46d4 SHA512 f6939cdba0d7ec03bdadd7b183324f29d8a5d6fc54a4cf0517da23c97a31f5e0701d361f6972195d723d136e3c6e7df312edc3535f402b35c3e5016ce3a6f0a4
+EBUILD junit-clptr-1.2.2-r1.ebuild 709 BLAKE2B aab1471437bf7fb3fad70b31b3ded44a8f415dfa1b5fb14b8fd0d04148fdb19cf0624cd85aeb3a8981a4acba9a9f5b7f492e7d4ec57c79b75e92fac23510bad7 SHA512 10d13573cf30fc66bb3bb6b1dbd3ee90167728ce0b64e91e85e544a48db7b106349d6db7510b945a3071ef74469ca56f0dcc4866f46ae6dd5003df33b8bb5269
+MISC metadata.xml 476 BLAKE2B 7cc3197521993f2bc5ebb384169acc8396beda33f1b3936754b24a14d0f39e8e5836950fed5a79e72080d80397dcda39fc7a9b38d3f1c6a0062a200824256888 SHA512 e254880fdee5bfb8ad1c921d72255765e8eac2cfa87c9557fa26acb7bff760464d1c17211bc33911a2dbde3c19b7920641bbde617f78b2c7c370adf9de4bae75
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/junit-clptr/metadata.xml b/dev-java/junit-clptr/metadata.xml
index 645a73add6c7..7fef0aef9e43 100644
--- a/dev-java/junit-clptr/metadata.xml
+++ b/dev-java/junit-clptr/metadata.xml
@@ -8,5 +8,6 @@
 	<upstream>
 		<bugs-to>https://github.com/bitstrings/junit-clptr/issues</bugs-to>
 		<changelog>https://github.com/bitstrings/junit-clptr/commits/master</changelog>
+		<remote-id type="github">bitstrings/junit-clptr</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-java/junitparams/Manifest b/dev-java/junitparams/Manifest
index ab91d31f7265..6949aa16b192 100644
--- a/dev-java/junitparams/Manifest
+++ b/dev-java/junitparams/Manifest
@@ -1,4 +1,4 @@
 AUX junitparams-1.1.1-test.patch 1894 BLAKE2B 8c2aacc726a9d5ac733971f20aa06ab21e1ac31cfa14cf23e11b0541777f22291417710f944fd3f6554791ea8deae022e42ea0af5177f6d97a542d55f510b8d4 SHA512 cae119b7c22b65e42a252d70bc92ad05cae568b2257d9640a498bc7cb15e3917f32c9fafd6b06ded8f739b4825c1662a8c4625114aab1252f4adf58cf52f1f34
 DIST junitparams-1.1.1.tar.gz 96180 BLAKE2B 0b12d61841d13c893d90f1a28e6b881930a66a9359b368b601a9ee9ced1fa82ff17c9142610e1ed122684e454b86a46d9d2cf451544a900b0a86399484df141c SHA512 77e25bff2f821e8be4f3747c58e550b728aace1dac4ac98f0cd8f99235d6a2b0129e61d7f90063d5f85dd3dd4b0e5d0614e3591633bdcf5dfa452c62a114acae
-EBUILD junitparams-1.1.1-r1.ebuild 1602 BLAKE2B e3487f6d0b988d163441f76369b1801b4bd46f194a0123521dd91d0c51fe8de93f57dc0ebf55b516eb6fdcdff59107934487a5baa5991e263171d757b7e0a652 SHA512 1419a3ef8fe772f4155bdfd6d37b97d15fb338df49d809950c0f119495e76a6814af9ec88336ee0c57d27223e91ef83a89590c86d17e6f7449e397eb561d7ee8
+EBUILD junitparams-1.1.1-r2.ebuild 1162 BLAKE2B 9bfae0d4af200729a7e060c0ff988ede462aa011e13fd7d7fd8bb1ed11c59200eeee06ca1e9ad747f2183531e6f6d7282f19a1b9a3593bb7f9ceb54b3c29e843 SHA512 86f1f54273e9d82e1d3f15d69d87e60889dde201af44140318a80939d74b5c37b278fb405435d7723a4403b913e7047be93508829e5764cc197fa0beb37bbd9d
 MISC metadata.xml 437 BLAKE2B 67db2ff59007450448d4de713df69f7999909a2070c093bd65f994d98fedcb92aa7b262d1da757e19c401fd8380acd234469a3b8abc9a70d412aaf1059699efa SHA512 02fcfa155548a74dbf633c5ac5fd69a3bf6303b202e16dd96948c58d22bd05cc2575cd8a82b51b961b20c4f0b65ba41cda63d5981ff652c1000c5d6912de5f31
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 60acfcc284d4..48caab493a1c 100644
--- a/dev-java/lzmajio/Manifest
+++ b/dev-java/lzmajio/Manifest
@@ -1,3 +1,3 @@
-DIST lzmajio-0.95.tar.gz 20790 BLAKE2B e24a5f4778bb135ce3ab519dfc8357cf3abc04d564b8d365f7cbad579be7ff86b4d24156720954bab882d7ade8e5145e533fd477c1925f6a9353c90dd5a2e511 SHA512 65736a66ec8f5eb63688edda912718f4e9b0518c68b0b1eed3df26e7b6bb15728024c637b4cf40f6ab52168c913cce91bd7cafefca7515e0f3e386738cedc6e5
-EBUILD lzmajio-0.95-r3.ebuild 681 BLAKE2B ef83504e66eed6990de2e9d3434d407ab9c8e3cd144515739b03f7fed76a41932c0efb7b83ad1a89b4e3fa2e183bc6f0a02b72dc8082d80648df5fbc9a7eba83 SHA512 2e959cbc9d593910a7747fc54559763b22f185330860824a507267c2ed9c206e730a1c4eef32b8ca950a04635ef08592bde2f619c8311686bd4ddfa1f74856fd
+DIST lzmajio-0.95.tar.gz 20501 BLAKE2B 0b45d55c0fb56ff97eecc2ed3fb2dc5a5321ff33e78aa51e71c9e074c69006b3db449d95959d346bb5fb7b87bc104e8ad11d198537315106e27ac3edb7af07db SHA512 c9b9e2655259cda24ce60956c3aba320e661f8639fb88f614bb2e63ce8c747e92d4a37b6233f1962a5e655364b24f49e7370f7af13dfde41f9d2217c6c1ae788
+EBUILD lzmajio-0.95-r4.ebuild 662 BLAKE2B 9f6ef2b576b1cc2556f543f00a440222a89475ee8c0eb91b729f3e0472fc6a9d5beedf606d60c690dcbf0bb0b8da0f008bd9099b25327e9c2d477310767a94a4 SHA512 07771596636956af7c5d4ba9ee5d36d0e91ec5c69e4bbb67ca41c4e9c0c8e3a9fc267fd4247ebade3741cfd093801ef979fe4b4ee815c94dbf9b43cdb5ee7570
 MISC metadata.xml 316 BLAKE2B a2a8304780ad07929f974f94fef764d164318fc7a6fe7609849f4c876a1d70aa230645c0fa57d3305aa660fd8007ff01a33a5e49207c9f5a5957d94c3914bf4f SHA512 bc7f7be2b949c35a3a1a0e36f326c0f24d59f83001e6625e96039207dcd9119371dc231c4bf4eefc8e3d94e2ddfcfa4c96d17e197e8e8b926e01d8b4e2a5f8c6
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/Manifest b/dev-java/mersennetwister/Manifest
index c8a74f482adb..fbe5523a91b7 100644
--- a/dev-java/mersennetwister/Manifest
+++ b/dev-java/mersennetwister/Manifest
@@ -1,3 +1,3 @@
 DIST mersennetwister-0_pre23765.tar.bz2 4974 BLAKE2B 3a609f7319f365234ebac8ae7b9accd447b9a506cf7cbf45c59bb2c44099e3ee780ea7754db91f96ff6f33fa84f65f20acda58d058aba30345114808ca90e65d SHA512 3c3b970da3ddc3a0b7fda299916781551867b6ce3c8ecb1f89670783d4d51e2681b07c6b2dfc15e11a03c8b949f4880b0bf1511dde2cb4ad0600688809d38e46
-EBUILD mersennetwister-0_pre23765-r2.ebuild 489 BLAKE2B d424fd24c6771e76b9c200155cb95bb89995d42f37fe774ed624f18f072f93879aa3e76c5ba181aa2f1caf9ccd955424b75921290810f2427a2e89b8a80dd705 SHA512 1b9da1c38eae14e82d60e18a1c81a42ed76ae9de1abf7811c11e9436a45225e5f0639581cc7e221e07d73039e79ead8de38aa83f5707e3adae363b58c4c725c5
+EBUILD mersennetwister-0_pre23765-r3.ebuild 483 BLAKE2B dc8844465f1678abf918322a79064cd63a5bca83c2906d2d02f6be0677367f5bce79e964d01f3ca891b060effb894adba6bb42d79021c594e3d0325d2e793ab1 SHA512 34a86e2d36939bdd6c8d664eab5e38fee02c66625920a3321dff8f3f295a6bb63b1392deaeee0632afca25ee09a57b18a115f2a6f09df44409a62a7deaa2d51f
 MISC metadata.xml 237 BLAKE2B 7c3263833976c18611a5cba44845af4d80f2f86c48cf587a657292ed0074022088cef88756e3209b292252dce5c0eea307c4f2f45f28b8517609124708f7d09a SHA512 e8227b536eb45569cbf744907106e101d1aa6bf9ba8337783786d719ab107d8bda0fde5dd7067d168181d694b4161b12d1ef3cb5a83b14971b21aa4479670559
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/Manifest b/dev-java/xml-commons-external/Manifest
index 73426caf3cb2..c5886ed117fb 100644
--- a/dev-java/xml-commons-external/Manifest
+++ b/dev-java/xml-commons-external/Manifest
@@ -1,3 +1,3 @@
 DIST xml-commons-external-1.4.01.jar 656529 BLAKE2B c51ca760c23759d4f4ad11fcb44caa1cb0bcb2785d9095ed56dba9b0d5fe57370a9d9aaeed5a8e0c1fa67918237ce693590bac791200add2e85155ab87ffe40b SHA512 f00773eec613453d0e1b7b0857b01c51d1926079f38e172953c4ef0350f063439acc8b5967f947c8d15a73e5d53e8887c3bf30122d5f7c553bcef349e5a8cb9a
-EBUILD xml-commons-external-1.4.01-r2.ebuild 749 BLAKE2B 37e9063fe827ba4185cd9aa0c21be92ef9f418dcd7c43110763df0d9ee95c2f865455812a9dfcf2d97d60e27e9bc9754caa6ef2acc7135973f7824e788ae629f SHA512 e2a9ebaded5c3de431a3526823b2bdd49c800b30af4c19c1c63316554e0f0ab4cd5c57dc82d098e7b074c6dd4d1aa40c1f9ecdd2367c98b5b7b71202ab695fdd
+EBUILD xml-commons-external-1.4.01-r3.ebuild 749 BLAKE2B add46054856e558bdbe2ebeab838db5771bbf65afac3ed815fd6b2def1662b4bf98cc4f1e8dae74a8a0fa4c5d5357b707b16c917b4b963c5a4340975c0ba868d SHA512 71b655e34e190b5bcc76c5db997247bc2986d6e520b9d90d22b68b02dfed85ae1401209b88c0ea3dad20959c78f905d7c1ab356317eb52f8b87324e3fc471878
 MISC metadata.xml 233 BLAKE2B 2b385ca77219f08b2874b3a4a91a0c836d3cb45ec44b05babb33d590c56ceb5337ecb93a8450a37f8e6bbf4cfc1455892e8142d22e0a1d527d40361e2dce350b SHA512 1acc975a7dc3344bc63282d652ca00d8245970b58353b4fd00f09a4859db3eaba2dcd85e1537d424b7174e4f9c01c2ffb10ec6d107b5c895c9ca20730666de7f
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"