[gentoo-commits] repo/gentoo:master commit in: dev-java/commons-imaging/

["Miroslav Šulc" <fordfrog@gentoo.org>]

commit:     27d0494337eb83785e572702dd16ec3745e0a859
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Mon Feb  5 10:29:53 2024 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Tue Feb  6 09:27:32 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=27d04943

dev-java/commons-imaging: EAPI 5 -> 8

Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/35006/commits/2ca759e0ff1ae4b8b0a261bd3d537254eb28a845
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 .../commons-imaging/commons-imaging-0.97.ebuild    | 30 ++++++++++------------
 1 file changed, 13 insertions(+), 17 deletions(-)

diff --git a/dev-java/commons-imaging/commons-imaging-0.97.ebuild b/dev-java/commons-imaging/commons-imaging-0.97.ebuild
index f8c2ba3f2ef3..6017ef9c71e8 100644
--- a/dev-java/commons-imaging/commons-imaging-0.97.ebuild
+++ b/dev-java/commons-imaging/commons-imaging-0.97.ebuild
@@ -1,45 +1,41 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=8
 
-JAVA_PKG_IUSE="doc source"
+JAVA_PKG_IUSE="doc source test"
 
 inherit java-pkg-2 java-pkg-simple
 
 DESCRIPTION="A minimalistic realtime charting library for Java"
-HOMEPAGE="https://commons.apache.org/proper/commons-imaging"
-SRC_URI="mirror://apache/commons/sanselan/source/apache-sanselan-incubating-${PV}-src.tar.gz"
+HOMEPAGE="https://commons.apache.org/proper/commons-imaging/"
+SRC_URI="https://archive.apache.org/dist/commons/sanselan/source/apache-sanselan-incubating-${PV}-src.tar.gz"
+S="${WORKDIR}/sanselan-${PV}-incubator"
+
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="test"
 RESTRICT="test" # 5/48 failures, dunno why :(
 
-RDEPEND=">=virtual/jre-1.6"
-
-DEPEND=">=virtual/jdk-1.6
+DEPEND=">=virtual/jdk-1.8:*
 	test? ( dev-java/junit:4 )"
+RDEPEND=">=virtual/jre-1.8:*"
 
-S="${WORKDIR}/sanselan-${PV}-incubator"
 JAVA_ENCODING="ISO-8859-1"
 JAVA_SRC_DIR="src/main/java"
 
-java_prepare() {
+src_prepare() {
+	java-pkg-2_src_prepare
 	# Tsk, Windows developers…
 	find src/test/java -name "*.java" -exec sed -i 's:\\:/:g' {} + || die
 }
 
-src_install() {
-	java-pkg-simple_src_install
-	dodoc README.txt RELEASE_NOTES
-}
-
 src_test() {
 	local DIR="src/test/java"
 	local CP="${DIR}:${PN}.jar:$(java-pkg_getjars junit-4)"
 
-	local TESTS=$(find "${DIR}" -name "*Test.java" ! -name "*BaseTest.java" ! -name SanselanTest.java ! -name ByteSourceTest.java)
+	local TESTS=$(find "${DIR}" -name "*Test.java" \
+		! -name "*BaseTest.java" ! -name SanselanTest.java ! -name ByteSourceTest.java)
 	TESTS="${TESTS//src\/test\/java\/}"
 	TESTS="${TESTS//.java}"
 	TESTS="${TESTS//\//.}"