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 (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A6C241581D3 for ; Sat, 25 May 2024 09:21:50 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8FC2EE2A05; Sat, 25 May 2024 09:21:49 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 52BC5E2A04 for ; Sat, 25 May 2024 09:21:49 +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) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9153733FECD for ; Sat, 25 May 2024 09:21:48 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E8B921B49 for ; Sat, 25 May 2024 09:21:46 +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: <1716628884.fbe54646a8a951c872c49d51147d6f246af61409.fordfrog@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-java/jflex/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-java/jflex/jflex-1.6.1-r3.ebuild dev-java/jflex/metadata.xml X-VCS-Directories: dev-java/jflex/ X-VCS-Committer: fordfrog X-VCS-Committer-Name: Miroslav Šulc X-VCS-Revision: fbe54646a8a951c872c49d51147d6f246af61409 X-VCS-Branch: master Date: Sat, 25 May 2024 09:21:46 +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: 684275e4-66f6-4735-bf7d-07889b4af91d X-Archives-Hash: f4115e5c95175b5d4d40e7d872129b81 commit: fbe54646a8a951c872c49d51147d6f246af61409 Author: Volkmar W. Pogatzki pogatzki net> AuthorDate: Fri May 24 10:10:46 2024 +0000 Commit: Miroslav Šulc gentoo org> CommitDate: Sat May 25 09:21:24 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fbe54646 dev-java/jflex: ant-task optional - help to break circular dependency on dev-java/ant[junit] Signed-off-by: Volkmar W. Pogatzki pogatzki.net> Closes: https://github.com/gentoo/gentoo/pull/32820 Signed-off-by: Miroslav Šulc gentoo.org> dev-java/jflex/jflex-1.6.1-r3.ebuild | 27 ++++++++++++++++++--------- dev-java/jflex/metadata.xml | 11 +++++++---- 2 files changed, 25 insertions(+), 13 deletions(-) diff --git a/dev-java/jflex/jflex-1.6.1-r3.ebuild b/dev-java/jflex/jflex-1.6.1-r3.ebuild index 4ce051add85d..ae329e176675 100644 --- a/dev-java/jflex/jflex-1.6.1-r3.ebuild +++ b/dev-java/jflex/jflex-1.6.1-r3.ebuild @@ -15,18 +15,21 @@ S="${WORKDIR}/${P}" LICENSE="BSD" SLOT="0" KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~ppc-macos ~x64-macos" -IUSE="examples test vim-syntax" +IUSE="ant-task examples test vim-syntax" RESTRICT="!test? ( test )" +REQUIRED_USE="test? ( ant-task )" -CDEPEND=">=dev-java/ant-1.10.14:0" - -RDEPEND=">=virtual/jre-1.8:* +RDEPEND=" + >=virtual/jre-1.8:* + ant-task? ( >=dev-java/ant-1.10.14-r3:0 ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) - ${CDEPEND}" +" -DEPEND=">=virtual/jdk-1.8:* +DEPEND=" + >=virtual/jdk-1.8:* + ant-task? ( >=dev-java/ant-1.10.14-r3:0 ) test? ( dev-java/junit:4 ) - ${CDEPEND}" +" PDEPEND=">=dev-java/javacup-11b_p20160615:0" @@ -34,6 +37,7 @@ JAVA_SRC_DIR="src/main/java" src_prepare() { eapply_user + java-pkg-2_src_prepare # See below for details. eapply "${FILESDIR}/icedtea-arm.patch" @@ -59,7 +63,12 @@ src_configure() { JAVACUP=$(echo lib/java-cup-*.jar) fi - JAVA_GENTOO_CLASSPATH_EXTRA="$(java-pkg_getjar --build-only ant ant.jar):${JAVACUP}" + JAVA_GENTOO_CLASSPATH_EXTRA="${JAVACUP}" + if use ant-task; then + JAVA_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant ant.jar)" + else + rm src/main/java/jflex/anttask/JFlexTask.java || die + fi } jflex_compile() { @@ -91,7 +100,7 @@ src_install() { java-pkg_dolauncher ${PN} --main ${PN}.Main java-pkg_register-dependency javacup javacup-runtime.jar - java-pkg_register-ant-task + use ant-task && java-pkg_register-ant-task use examples && java-pkg_doexamples examples dodoc {changelog,README}.md diff --git a/dev-java/jflex/metadata.xml b/dev-java/jflex/metadata.xml index 6021501589e0..3c0e0377e098 100644 --- a/dev-java/jflex/metadata.xml +++ b/dev-java/jflex/metadata.xml @@ -1,8 +1,11 @@ - - java@gentoo.org - Java - + + java@gentoo.org + Java + + + Build and register the ant-task +