commit: b363b4a7dee982367b4826075468c497c0d562d7 Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net> AuthorDate: Fri May 24 16:05:43 2024 +0000 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> CommitDate: Sat May 25 09:25:23 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b363b4a7
dev-java/qdox: ant-task optional for slot 1.12 Allows to emerge dev-java/ant[junit] without circular dependencies Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net> Closes: https://github.com/gentoo/gentoo/pull/36809 Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> dev-java/qdox/metadata.xml | 3 ++ ...qdox-1.12.1-r4.ebuild => qdox-1.12.1-r5.ebuild} | 32 ++++++++++++++-------- 2 files changed, 24 insertions(+), 11 deletions(-) diff --git a/dev-java/qdox/metadata.xml b/dev-java/qdox/metadata.xml index f00a4317cac4..fe50d6ed9393 100644 --- a/dev-java/qdox/metadata.xml +++ b/dev-java/qdox/metadata.xml @@ -12,4 +12,7 @@ <upstream> <remote-id type="github">paul-hammant/qdox</remote-id> </upstream> + <use> + <flag name="ant-task">Build the ant-task</flag> + </use> </pkgmetadata> diff --git a/dev-java/qdox/qdox-1.12.1-r4.ebuild b/dev-java/qdox/qdox-1.12.1-r5.ebuild similarity index 80% rename from dev-java/qdox/qdox-1.12.1-r4.ebuild rename to dev-java/qdox/qdox-1.12.1-r5.ebuild index cf1dc1eeb7d5..a4419f6cf68e 100644 --- a/dev-java/qdox/qdox-1.12.1-r4.ebuild +++ b/dev-java/qdox/qdox-1.12.1-r5.ebuild @@ -11,31 +11,35 @@ inherit java-pkg-2 DESCRIPTION="Parser for extracting class/interface/method definitions" HOMEPAGE="https://github.com/codehaus/qdox"; SRC_URI="https://github.com/codehaus/qdox/archive/${P}.tar.gz"; +S="${WORKDIR}/${PN}-${PN}-${PV}" LICENSE="Apache-2.0" SLOT="1.12" KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~ppc-macos ~x64-macos" +IUSE="ant-task" +REQUIRED_USE="test? ( ant-task )" -S="${WORKDIR}/${PN}-${PN}-${PV}" - -CDEPEND=">=dev-java/ant-1.10.14-r3:0" - -DEPEND=">=virtual/jdk-1.8:* +DEPEND=" + >=virtual/jdk-1.8:* dev-java/byaccj:0 - >=dev-java/jflex-1.6.1:0 + dev-java/jflex:0 dev-java/jmock:1.0 + ant-task? ( >=dev-java/ant-1.10.14-r3:0 ) test? ( dev-java/junit:0 ) - ${CDEPEND}" +" -RDEPEND=">=virtual/jre-1.8:* - ${CDEPEND}" +RDEPEND=" + >=virtual/jre-1.8:* + ant-task? ( >=dev-java/ant-1.10.14-r3:0 ) +" PATCHES=( "${FILESDIR}/jflex-1.6.1.patch" ) src_prepare() { - default + default #780585 + java-pkg-2_src_prepare if ! use test ; then rm src/java/com/thoughtworks/qdox/tools/QDoxTester.java @@ -52,12 +56,18 @@ src_compile() { # create jar mkdir -p build/classes || die - local cp="$(java-pkg_getjars --build-only ant,jmock-1.0)" + local cp="$(java-pkg_getjars --build-only jmock-1.0)" if use test ; then cp="${cp}:$(java-pkg_getjars --build-only junit)" fi + if use ant-task ; then + cp="${cp}:$(java-pkg_getjars --build-only ant)" + else + rm src/java/com/thoughtworks/qdox/ant/AbstractQdoxTask.java || die + fi + ejavac -sourcepath . -d build/classes -classpath "${cp}" \ $(find . -name "*.java") || die "Cannot compile sources"
