From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 91455158042 for ; Thu, 7 Nov 2024 07:37:09 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E17EAE0D13; Thu, 7 Nov 2024 07:37:08 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C5583E0D13 for ; Thu, 7 Nov 2024 07:37:08 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DC3B1340BEF for ; Thu, 7 Nov 2024 07:37:07 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 779231A26 for ; Thu, 7 Nov 2024 07:37:06 +0000 (UTC) From: "Miroslav Šulc" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Miroslav Šulc" Message-ID: <1730965024.1942b43e6379c92ef9d5e153ac7c74a0445345ec.fordfrog@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-java/jline/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-java/jline/jline-2.14.6-r1.ebuild dev-java/jline/jline-2.14.6.ebuild X-VCS-Directories: dev-java/jline/ X-VCS-Committer: fordfrog X-VCS-Committer-Name: Miroslav Šulc X-VCS-Revision: 1942b43e6379c92ef9d5e153ac7c74a0445345ec X-VCS-Branch: master Date: Thu, 7 Nov 2024 07:37:06 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 9d428358-e04f-4dd3-a6b7-cd4b214c5c04 X-Archives-Hash: 80a33cc92d3608f398bf2b3ae3a13857 commit: 1942b43e6379c92ef9d5e153ac7c74a0445345ec Author: Volkmar W. Pogatzki pogatzki net> AuthorDate: Tue Nov 5 07:33:40 2024 +0000 Commit: Miroslav Šulc gentoo 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 pogatzki.net> Closes: https://github.com/gentoo/gentoo/pull/39208/commits/18015b4ef28a838f51675de9d822cb305a12ad0d Signed-off-by: Miroslav Šulc 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 -}