diff options
Diffstat (limited to 'dev-java/ant')
| -rw-r--r-- | dev-java/ant/ant-1.10.14-r3.ebuild (renamed from dev-java/ant/ant-1.10.14-r2.ebuild) | 16 | ||||
| -rw-r--r-- | dev-java/ant/ant-1.10.9.ebuild | 47 | ||||
| -rw-r--r-- | dev-java/ant/metadata.xml | 1 |
3 files changed, 8 insertions, 56 deletions
diff --git a/dev-java/ant/ant-1.10.14-r2.ebuild b/dev-java/ant/ant-1.10.14-r3.ebuild index 9a6c7aacc165..d1d0486dd712 100644 --- a/dev-java/ant/ant-1.10.14-r2.ebuild +++ b/dev-java/ant/ant-1.10.14-r3.ebuild @@ -20,9 +20,9 @@ S="${WORKDIR}/apache-${P}" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" -IUSE="bcel bsf commonslogging commonsnet jai jakartamail javamail jdepend jsch junit junit4 - junitlauncher log4j oro regexp resolver testutil xalan xz" +KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" +IUSE="antlr bcel bsf commonslogging commonsnet imageio jai jakartamail javamail jdepend + jmf jsch junit junit4 junitlauncher log4j oro regexp resolver swing testutil xalan xz" # At least 10 test cases would fail without network PROPERTIES="test_network" @@ -71,9 +71,7 @@ DEPEND=" ) xz? ( dev-java/xz-java:0 ) " -PDEPEND="~dev-java/ant-core-${PV}:0" RDEPEND=" - !<dev-java/ant-core-1.10.14 !dev-java/ant-apache-regexp !dev-java/ant-apache-log4j !dev-java/ant-apache-xalan2 @@ -143,7 +141,7 @@ src_prepare() { eprefixify "src/script/ant" ANT_TASKS=( - ant-antlr # no dependencies + $(use antlr && echo ant-antlr) # no dependencies $(use bcel && echo ant-apache-bcel) $(use bsf && echo ant-apache-bsf) # REQUIRED_USE for tests $(use log4j && echo ant-apache-log4j) @@ -153,12 +151,12 @@ src_prepare() { $(use xalan && echo ant-apache-xalan2) $(use commonslogging && echo ant-commons-logging) $(use commonsnet && echo ant-commons-net) - ant-imageio # no dependencies + $(use imageio && echo ant-imageio) # no dependencies $(use jai && echo ant-jai) $(use jakartamail && echo ant-jakartamail) $(use javamail && echo ant-javamail) $(use jdepend && echo ant-jdepend) - ant-jmf # no dependencies + $(use jmf && echo ant-jmf) # no dependencies $(use jsch && echo ant-jsch) $(use junit && echo ant-junit) # REQUIRED_USE for junit4 and for testutil $(use junit4 && echo ant-junit4) @@ -167,7 +165,7 @@ src_prepare() { # available on https://www.netrexx.org/downloads.nsp and states: # "IBM's last NetRexx release, suitable for JVM versions 1.5 and below [...]" # $(use netrexx && echo ant-netrexx) # src/etc/poms/ant-netrexx/pom.xml - ant-swing # no dependencies + $(use swing && echo ant-swing) # no dependencies $(use testutil && echo ant-testutil) $(use xz && echo ant-xz) ) diff --git a/dev-java/ant/ant-1.10.9.ebuild b/dev-java/ant/ant-1.10.9.ebuild deleted file mode 100644 index e68c9948a493..000000000000 --- a/dev-java/ant/ant-1.10.9.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="Java-based build tool similar to 'make' that uses XML configuration files" -HOMEPAGE="https://ant.apache.org/" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" - -IUSE="X +antlr +bcel +bsf +commonslogging +commonsnet jai +javamail +jdepend jmf - +jsch +junit +junit4 +junitlauncher +log4j +oro +regexp +resolver swing testutil xz" - -DEPEND="~dev-java/ant-core-${PV}" - -RDEPEND="${DEPEND} - ~dev-java/ant-core-${PV} - ~dev-java/ant-junit-${PV} - ~dev-java/ant-apache-xalan2-${PV} - antlr? ( ~dev-java/ant-antlr-${PV} ) - bcel? ( ~dev-java/ant-apache-bcel-${PV} ) - bsf? ( ~dev-java/ant-apache-bsf-${PV} ) - commonslogging? ( ~dev-java/ant-commons-logging-${PV} ) - commonsnet? ( ~dev-java/ant-commons-net-${PV} ) - jai? ( ~dev-java/ant-jai-${PV} ) - javamail? ( ~dev-java/ant-javamail-${PV} ) - jdepend? ( ~dev-java/ant-jdepend-${PV} ) - jmf? ( ~dev-java/ant-jmf-${PV} ) - jsch? ( ~dev-java/ant-jsch-${PV} ) - junit? ( ~dev-java/ant-junit-${PV} ) - junit4? ( ~dev-java/ant-junit4-${PV} ) - junitlauncher? ( ~dev-java/ant-junitlauncher-${PV} ) - log4j? ( ~dev-java/ant-apache-log4j-${PV} ) - oro? ( ~dev-java/ant-apache-oro-${PV} ) - regexp? ( ~dev-java/ant-apache-regexp-${PV} ) - resolver? ( ~dev-java/ant-apache-resolver-${PV} ) - swing? ( ~dev-java/ant-swing-${PV} ) - testutil? ( ~dev-java/ant-testutil-${PV} ) - X? ( ~dev-java/ant-swing-${PV} ) - xz? ( ~dev-java/ant-xz-${PV} ) -" - -S="${WORKDIR}" - -src_compile() { :; } diff --git a/dev-java/ant/metadata.xml b/dev-java/ant/metadata.xml index e99b1884787b..198cd9259ca3 100644 --- a/dev-java/ant/metadata.xml +++ b/dev-java/ant/metadata.xml @@ -17,6 +17,7 @@ (<pkg>dev-java/bsf</pkg>)</flag> <flag name="commonslogging">Enable commons-logging Ant tasks</flag> <flag name="commonsnet">Enable commons-net Ant tasks</flag> + <flag name="imageio">Enable imageio Ant tasks</flag> <flag name="jai">Enable JAI (Java Imaging) Ant task</flag> <flag name="jakartamail">Enable Jakartamail Ant task</flag> <flag name="javamail">Enable JavaMail Ant task</flag> |