commit: fbe54646a8a951c872c49d51147d6f246af61409 Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net> AuthorDate: Fri May 24 10:10:46 2024 +0000 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> 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 <gentoo <AT> pogatzki.net> Closes: https://github.com/gentoo/gentoo/pull/32820 Signed-off-by: Miroslav Šulc <fordfrog <AT> 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 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd";> <pkgmetadata> -<maintainer type="project"> - <email>[email protected]</email> - <name>Java</name> -</maintainer> + <maintainer type="project"> + <email>[email protected]</email> + <name>Java</name> + </maintainer> + <use> + <flag name="ant-task">Build and register the ant-task</flag> + </use> </pkgmetadata>
