7 files changed, 20 insertions, 217 deletions
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index c6e1dbd7f923..64fb003a5a78 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/icu4j/Manifest b/dev-java/icu4j/Manifest
index cd190fa83b1c..95966abcb7c9 100644
--- a/dev-java/icu4j/Manifest
+++ b/dev-java/icu4j/Manifest
@@ -1,5 +1,3 @@
-DIST icu4j-75.1.tar.gz 65866291 BLAKE2B ae9a2a8f9bf6f38a08c46c4c3695fa4096c831beab1af5b654e86c9d681eb32be727930aeb1fd866fe9f93a96abe807fd353d108b5fe7a4d8203ee33cc16d971 SHA512 08f8fce8a4dd85706d9f7c57fd021ba15c403ab2da33d9a122d7cb441e0e148deebf245a661e4ef53a30bfa8b7622c63035946fd8966be3927af322275b87ca3
 DIST icu4j-76.1.tar.gz 67524828 BLAKE2B 949b6b69e2201ba5b4538766d25e72a8d98daeb8b1bf376966a6f410febee8c75c031ce9e52a0e4908d5d01f4d0120526ac84178603ee3968c1a399fc0a7959c SHA512 b92e05f3b5022992dfc7881542ed957dc9a1bc0b86f28fa6123dd4ab295e2a91686672193017acc0e0b659c37c944a1d2222e4881d7c65046a1df9dfaa925f12
-EBUILD icu4j-75.1.ebuild 5507 BLAKE2B 9a07d9854b1675f1a5d29575c87a064e1adb303a91962ef016fad3438e0219e602b2d1461d0cfe2df786fb81d2765d225576c13c4a98b1127394415f2be55ff9 SHA512 b8aa84ce20a437a2de1f106a19bdfa7bafc56e403c77e3cd0d4f3a3a389a846020bc2db849737e02d619b4a1eedfff2ff74cb93b4be0c690c5f6c33e6d3185cb
 EBUILD icu4j-76.1-r1.ebuild 6230 BLAKE2B cb2dc913efcb4b6232aa5d68763aa9943b4d5930950a03176a714b3d0c3979de12f4cf4e0e5a5ad72bca8062a035d29698f2e9a9788ab7f116db62c6d19bebe7 SHA512 f231676d3ee1027f81145f086fec3a86619e4038a6f5ff2fc94ed75fc7615063e7a6633596c984fc19281156632610780cdd6df710107a273097dc957f7ef313
 MISC metadata.xml 408 BLAKE2B 8d73c37540d7adce52f3f5b316d7c322bdbbacc3fd2dea5e361352bff8efb3ec2a5b49ca4e7b97d15e8c668e52fe32f90ec1972bae78b9b3b3354973d8fc992a SHA512 eb7df20108b1ebcbf5dd9edd72c2089df2c675028824b4c04976e35b4c306dd459a40aa45b0ac7da5392552657cd1dbaf2fb17b269f9d58110a6ac40dc377b0c
diff --git a/dev-java/icu4j/icu4j-75.1.ebuild b/dev-java/icu4j/icu4j-75.1.ebuild
deleted file mode 100644
index 0472a16f07f5..000000000000
--- a/dev-java/icu4j/icu4j-75.1.ebuild
+++ /dev/null
@@ -1,192 +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_PROVIDES="
-	com.ibm.icu:icu4j:${PV}
-	com.ibm.icu:icu4j-charset:${PV}
-	com.ibm.icu:icu4j-localespi:${PV}
-"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="A set of Java libraries providing Unicode and Globalization support"
-HOMEPAGE="https://icu.unicode.org"
-SRC_URI="https://github.com/unicode-org/icu/archive/release-${PV/./-}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/icu-release-${PV/./-}/icu4j/main"
-
-LICENSE="icu"
-SLOT="0"
-KEYWORDS="amd64 arm64 ppc64"
-
-DEPEND="
-	>=virtual/jdk-1.8:*
-	test? (
-		dev-java/gson:0
-		dev-java/junitparams:0
-		)
-"
-
-RDEPEND=">=virtual/jre-1.8:*"
-
-DOCS=( ../../{CONTRIBUTING,README,SECURITY}.md )
-HTML_DOCS=( ../{APIChangeReport,readme}.html )
-
-src_compile() {
-	JAVA_GENTOO_CLASSPATH_EXTRA="icu4j.jar:icu4j-charset.jar:icu4j-localespi.jar"
-
-	einfo "Compiling icu4j.jar"
-	JAVA_AUTOMATIC_MODULE_NAME="com.ibm.icu"
-	JAVA_JAR_FILENAME="icu4j.jar"
-	JAVA_MAIN_CLASS="com.ibm.icu.util.VersionInfo"
-	JAVA_RESOURCE_DIRS=(
-		collate/src/main/resources
-		core/src/main/resources
-		currdata/src/main/resources
-		langdata/src/main/resources
-		regiondata/src/main/resources
-		translit/src/main/resources
-	)
-	JAVA_SRC_DIR=(
-		collate/src/main/java
-		core/src/main/java
-		currdata/src/main/java
-		langdata/src/main/java
-		regiondata/src/main/java
-		translit/src/main/java
-	)
-	java-pkg-simple_src_compile
-	rm -r target || die
-
-	einfo "Compiling icu4j-charset.jar"
-	JAVA_AUTOMATIC_MODULE_NAME="com.ibm.icu.charset"
-	JAVA_JAR_FILENAME="icu4j-charset.jar"
-	JAVA_MAIN_CLASS=""
-	JAVA_RESOURCE_DIRS=( charset/src/main/resources )
-	JAVA_SRC_DIR=( charset/src/main/java )
-	java-pkg-simple_src_compile
-	rm -r target || die
-
-	einfo "Compiling icu4j-localespi.jar"
-	JAVA_AUTOMATIC_MODULE_NAME="com.ibm.icu.localespi"
-	JAVA_JAR_FILENAME="icu4j-localespi.jar"
-	JAVA_RESOURCE_DIRS=( localespi/src/main/resources )
-	JAVA_SRC_DIR=( localespi/src/main/java )
-	java-pkg-simple_src_compile
-	rm -r target || die
-
-	einfo "Generating javadocs"
-	JAVADOC_SRC_DIRS=(
-		collate/src/main/java
-		core/src/main/java
-		currdata/src/main/java
-		langdata/src/main/java
-		regiondata/src/main/java
-		translit/src/main/java
-		charset/src/main/java
-		localespi/src/main/java
-	)
-	use doc && ejavadoc
-}
-
-src_test () {
-	# TZ needed for some tests in com/ibm/icu/dev/test/format/DateFormatTest
-	export LC_ALL="en_US.UTF-8" TZ="US/Pacific"
-
-	JAVA_TEST_EXTRA_ARGS="-Djava.locale.providers=CLDR,COMPAT,SPI"
-	JAVA_TEST_GENTOO_CLASSPATH="gson,junit-4,junitparams"
-
-	einfo "Compiling framework-tests.jar"
-	JAVA_AUTOMATIC_MODULE_NAME="com.ibm.icu.framework"
-	JAVA_JAR_FILENAME="framework-tests.jar"
-	JAVA_MAIN_CLASS="com.ibm.icu.dev.test.TestAll"
-	JAVA_RESOURCE_DIRS=( framework/src/test/resources )
-	JAVA_SRC_DIR=( framework/src/test/java )
-	java-pkg-simple_src_compile
-	JAVA_GENTOO_CLASSPATH_EXTRA+=":framework-tests.jar"
-
-	einfo "Testing core aka icu4j.jar"
-	JAVA_TEST_RESOURCE_DIRS="core/src/test/resources"
-	JAVA_TEST_SRC_DIR="core/src/test/java"
-	pushd "${JAVA_TEST_SRC_DIR}" || die
-		# exclude invalid tests, not run by "mvn test"
-		local JAVA_TEST_RUN_ONLY=$(find * \
-			-name "*Test*.java" \
-			! -name "ChineseTestCase.java" \
-			! -name "DataDrivenNumberFormatTestUtility.java" \
-			! -name "*Helper.java" \
-			! -name "ModuleTest.java" \
-			! -name "*Sample.java" \
-			! -name "TestCase.java" \
-			! -name "*TestData*.java" \
-			! -name "*TestFmwk.java" \
-			! -name "TestMessages.java" \
-			! -name "TestUtils.java" \
-			)
-	popd
-	JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}"
-	JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}"
-	java-pkg-simple_src_test
-
-	einfo "Creating core-tests.jar"
-	jar cvf core-tests.jar -C target/test-classes .
-	JAVA_GENTOO_CLASSPATH_EXTRA+=":core-tests.jar"
-	JAVA_TEST_RUN_ONLY=""
-
-	einfo "Testing collate"
-	JAVA_TEST_RESOURCE_DIRS="collate/src/test/resources"
-	JAVA_TEST_SRC_DIR="collate/src/test/java"
-	java-pkg-simple_src_test
-
-	einfo "Testing translit"
-	JAVA_TEST_EXCLUDES=(
-		# Invalid test classes, No runnable methods
-		com.ibm.icu.dev.test.TestBoilerplate
-		com.ibm.icu.dev.test.translit.TestUtility
-	)
-	JAVA_TEST_RESOURCE_DIRS="translit/src/test/resources"
-	JAVA_TEST_SRC_DIR="translit/src/test/java"
-	java-pkg-simple_src_test
-
-	einfo "Testing charset"
-	JAVA_TEST_RESOURCE_DIRS=""
-	JAVA_TEST_SRC_DIR="charset/src/test/java"
-	java-pkg-simple_src_test
-
-	einfo "Testing common_tests"
-	# "mvn test" runs only 90 tests here, Gentoo runs 99 but 9 of them fail.
-	# coverage tests fail because test handlers for the parametrized tests
-	# are not defined so the tests are broken and cannot succeed
-	JAVA_TEST_EXCLUDES=( com.ibm.icu.dev.test.serializable.CoverageTest )
-	JAVA_TEST_RESOURCE_DIRS=""
-	JAVA_TEST_SRC_DIR="common_tests/src/test/java"
-	java-pkg-simple_src_test
-
-	einfo "Testing localespi"
-	JAVA_TEST_RESOURCE_DIRS=""
-	JAVA_TEST_SRC_DIR="localespi/src/test/java"
-	# Invalid test classes, No runnable methods
-	JAVA_TEST_EXCLUDES=( com.ibm.icu.dev.test.localespi.TestUtil )
-	# https://bugs.gentoo.org/827212, "mvn test" does not run it at all
-	local vm_version="$(java-config -g PROVIDES_VERSION)"
-	if [[ "${vm_version}" != "1.8" ]] ; then
-		java-pkg-simple_src_test
-	fi
-}
-
-src_install() {
-	default
-	java-pkg_dojar "icu4j.jar"
-	java-pkg_dojar "icu4j-charset.jar"
-	java-pkg_dojar "icu4j-localespi.jar"
-
-	if use doc; then
-		java-pkg_dojavadoc target/api
-	fi
-	if use source; then
-		java-pkg_dosrc "classes"
-	fi
-}
diff --git a/dev-java/jgoodies-looks/Manifest b/dev-java/jgoodies-looks/Manifest
index 4a24f2337cb3..92f704954a07 100644
--- a/dev-java/jgoodies-looks/Manifest
+++ b/dev-java/jgoodies-looks/Manifest
@@ -1,3 +1,3 @@
 DIST jgoodies-looks-2_6_0.zip 2444893 BLAKE2B 97d00131cf07f609141c97e4fd3e6b3c93f67dc879eb0ad99469c602e7e30b0d78dc4bd59202db1a3a503dec6c92ea061a176ef11e6c5f4fc26a86c697cf961f SHA512 1c33413379f391109d1db35bdf301acf0cc6d66bf8aa1026280015946bddb230b4cc1d233b700d46a519fb02c169df4670c874058f5e636e1e924a9d3a42442a
-EBUILD jgoodies-looks-2.6.0-r1.ebuild 786 BLAKE2B cbe2261710f11e003ae320ca824681fb53ea6aacee6b9001f5a1d315761df587e1b6f7673d60eaf50be1d4373ba71fa133d77c149c4408b111cace9fe2da1444 SHA512 55c264ad7d136887d08d094769d74525df2c73a71b634b8acbfb5e9d18d5419a0612073eb4ec9337a8fd8d582a9bcc5790e22efc0fe55f002398361cdebea6be
+EBUILD jgoodies-looks-2.6.0-r2.ebuild 739 BLAKE2B 7f3d144317739acefa35332d8780c44a1db05aeb423769521420bb390eb659c8712fdd46bd05be22bd7088fa87510314c4065684a883c27810990041a86cda9d SHA512 85552ab87e9b605a63ccb2ff96a29e36b4e4732c32fb6d9f3caaee19f5ca57f8fc8e69e8aa9d25c88ccebaca2bbe78cf7371dc82c0901d3a0d1e10a628d7a788
 MISC metadata.xml 237 BLAKE2B 7c3263833976c18611a5cba44845af4d80f2f86c48cf587a657292ed0074022088cef88756e3209b292252dce5c0eea307c4f2f45f28b8517609124708f7d09a SHA512 e8227b536eb45569cbf744907106e101d1aa6bf9ba8337783786d719ab107d8bda0fde5dd7067d168181d694b4161b12d1ef3cb5a83b14971b21aa4479670559
diff --git a/dev-java/jgoodies-looks/jgoodies-looks-2.6.0-r1.ebuild b/dev-java/jgoodies-looks/jgoodies-looks-2.6.0-r2.ebuild
index bcb30c654081..dd773d43632c 100644
--- a/dev-java/jgoodies-looks/jgoodies-looks-2.6.0-r1.ebuild
+++ b/dev-java/jgoodies-looks/jgoodies-looks-2.6.0-r2.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"
 
@@ -12,35 +12,33 @@ MY_PV=${PV//./_}
 MY_P="${PN}-${MY_PV}"
 
 DESCRIPTION="JGoodies Looks Library"
-HOMEPAGE="http://www.jgoodies.com/"
+HOMEPAGE="https://www.jgoodies.com"
 SRC_URI="http://www.jgoodies.com/download/libraries/${MY_PN}/${MY_P}.zip"
+S="${WORKDIR}"/${P}
 
 LICENSE="BSD"
 SLOT="2.6"
 KEYWORDS="amd64"
-IUSE=""
 
-CDEPEND="dev-java/jgoodies-common:1.8"
+CP_DEPEND="dev-java/jgoodies-common:1.8"
 
 RDEPEND="
-	${CDEPEND}
-	virtual/jre:1.8"
+	${CP_DEPEND}
+	virtual/jre:1.8
+"
 
 DEPEND="
-	${CDEPEND}
-	virtual/jdk:1.8"
-
-BDEPEND="
-	app-arch/unzip"
+	${CP_DEPEND}
+	virtual/jdk:1.8
+"
 
-S="${WORKDIR}"/${P}
+BDEPEND="app-arch/unzip"
 
 JAVA_SRC_DIR="src"
-JAVA_GENTOO_CLASSPATH="jgoodies-common-1.8"
 
 src_prepare() {
-	default
+	java-pkg-2_src_prepare
 	mkdir src || die
 	unzip ${P}-sources.jar -d src || die
-	rm "${S}"/pom.xml "${S}"/*.jar || die
+	rm "${S}"/*.jar || die
 }
diff --git a/dev-java/sun-jai-bin/Manifest b/dev-java/sun-jai-bin/Manifest
index 9e2be3fa5e6b..734d4a36dfbe 100644
--- a/dev-java/sun-jai-bin/Manifest
+++ b/dev-java/sun-jai-bin/Manifest
@@ -1,4 +1,4 @@
 DIST jai-1_1_3-lib-linux-amd64.tar.gz 3510451 BLAKE2B c16dc0e04127bf57df6390dc9d99a1e44040c0fe81ccacc88698493d3fd3483aae12d664a89bc13939655d21ce2d92b64537b073c0d1063bbf91e18129da5eb4 SHA512 5089b696baabdea9622683aa7a3569daf724fd7fa8a4f1c95073b9e96ff5c37fc55a9e3a6fe499abafe61f5f4a109770bd27172ae6711ab7b4da3de55d8b0f56
 DIST jai-1_1_3-lib-linux-i586.tar.gz 3501711 BLAKE2B eec4976124a9701367e7b61c652ed619df69fa12eb02c5288d9d1ba4845ca7e2315514fba1f75f15c8bbb90cba981972961e8d1e843a8a8ac2b000e5e4917975 SHA512 bd142eea557b68d10d26a18b6b0d04e5cb42212e98268035b1b3615d6489bbc4fa07ad141fd04fc5ae3c74f1703c9ade77130cbf8a61603b4b271e3a0e06e860
-EBUILD sun-jai-bin-1.1.3-r2.ebuild 1102 BLAKE2B 9fab35407e1a3a2ac82f2364f01736e6c77d77bd7dbc53cced0b33b318af6693b384f82d4f08db75d3cb1805e6773924fc416a8898d3ff31f998695faebea0c4 SHA512 841a127c0298348f59da7f15e23aa9be7475074995ae37723c021fe80ae8e53611b58b0e7d58443bf3f065001d3c74571ae9358193eeda738feb054cfc54e84a
+EBUILD sun-jai-bin-1.1.3-r3.ebuild 1122 BLAKE2B 0452a6ce194a47fe04d0b5449a9ecdf12fed091e3508b8cd3fa135bbbfefc4269ccbd05e613d51add202fdaeb905e65399ae741577e0da3bda33ebebd1a3d54a SHA512 71b4033c95db535a03d53c9adee6f8a220d42ac359131cf4f3829764103e03a47fb60a089c73255b271f4ee364b091d032fbbfd58188aa475538913455c0b116
 MISC metadata.xml 233 BLAKE2B 2b385ca77219f08b2874b3a4a91a0c836d3cb45ec44b05babb33d590c56ceb5337ecb93a8450a37f8e6bbf4cfc1455892e8142d22e0a1d527d40361e2dce350b SHA512 1acc975a7dc3344bc63282d652ca00d8245970b58353b4fd00f09a4859db3eaba2dcd85e1537d424b7174e4f9c01c2ffb10ec6d107b5c895c9ca20730666de7f
diff --git a/dev-java/sun-jai-bin/sun-jai-bin-1.1.3-r2.ebuild b/dev-java/sun-jai-bin/sun-jai-bin-1.1.3-r3.ebuild
index f1c288ab984c..b376b9b497d3 100644
--- a/dev-java/sun-jai-bin/sun-jai-bin-1.1.3-r2.ebuild
+++ b/dev-java/sun-jai-bin/sun-jai-bin-1.1.3-r3.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit java-pkg-2
 
 MY_PV=${PV//./_}
 DESCRIPTION="JAI is a class library for managing images"
-HOMEPAGE="https://jai.dev.java.net/"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 
 BASE=https://download.java.net/media/jai/builds/release/${MY_PV}
 MY_P="jai-${MY_PV}"
@@ -15,20 +15,19 @@ SRC_URI="
 	!amd64? ( ${BASE}/${MY_P}-lib-linux-i586.tar.gz )
 	amd64? ( ${BASE}/${MY_P}-lib-linux-amd64.tar.gz )"
 
+S=${WORKDIR}/${MY_P}
+
 LICENSE="sun-bcla-jai"
 SLOT="0"
 KEYWORDS="amd64 arm64 ppc64"
 
-DEPEND=""
 RDEPEND="virtual/jre:1.8"
 
 RESTRICT="bindist mirror"
 QA_PREBUILT="*"
 
-S=${WORKDIR}/${MY_P}
-
 src_prepare() {
-	default
+	java-pkg-2_src_prepare
 	rm LICENSE-jai.txt || die
 }