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

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

commit:     1942b43e6379c92ef9d5e153ac7c74a0445345ec
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Tue Nov  5 07:33:40 2024 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Thu Nov  7 07:37:04 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1942b43e

dev-java/jline: style update, update EAPI 7 -> 8

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

 ...{jline-2.14.6.ebuild => jline-2.14.6-r1.ebuild} | 33 ++++++++++------------
 1 file changed, 15 insertions(+), 18 deletions(-)

diff --git a/dev-java/jline/jline-2.14.6.ebuild b/dev-java/jline/jline-2.14.6-r1.ebuild
similarity index 80%
rename from dev-java/jline/jline-2.14.6.ebuild
rename to 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
-}