diff options
Diffstat (limited to 'dev-java/ant-tasks/ant-tasks-1.6.2-r10.ebuild')
| -rw-r--r-- | dev-java/ant-tasks/ant-tasks-1.6.2-r10.ebuild | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/dev-java/ant-tasks/ant-tasks-1.6.2-r10.ebuild b/dev-java/ant-tasks/ant-tasks-1.6.2-r10.ebuild index 06fd0c13a003..85961228d155 100644 --- a/dev-java/ant-tasks/ant-tasks-1.6.2-r10.ebuild +++ b/dev-java/ant-tasks/ant-tasks-1.6.2-r10.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-tasks/ant-tasks-1.6.2-r10.ebuild,v 1.1 2005/05/14 16:10:22 luckyduck Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-tasks/ant-tasks-1.6.2-r10.ebuild,v 1.2 2005/07/09 14:10:07 axxo Exp $ inherit java-pkg eutils @@ -13,9 +13,9 @@ SLOT="0" KEYWORDS="~x86 ~amd64 ~ppc ~sparc ~ppc64" IUSE="javamail noantlr nobcel nobeanutils nobsh nobsf nocommonsnet nocommonslogging nojdepend nojsch nojython nolog4j nooro noregexp norhino noxalan noxerces" -DEPEND="=dev-java/ant-core-${PV}* +RDEPEND=">=virtual/jre-1.4 + =dev-java/ant-core-${PV}* !dev-java/ant-optional - >=dev-java/java-config-1.2 >=dev-java/junit-3.8 !nolog4j? ( >=dev-java/log4j-1.2.8 ) !noxerces? ( >=dev-java/xerces-2.6.2-r1 ) @@ -27,14 +27,16 @@ DEPEND="=dev-java/ant-core-${PV}* !nocommonslogging? ( >=dev-java/commons-logging-1.0.3 ) !nocommonsnet? ( >=dev-java/commons-net-1.1.0 ) !nobcel? ( >=dev-java/bcel-5.1 ) - !nooro? ( =dev-java/jakarta-oro-2.0.8-r1 ) + !nooro? ( >=dev-java/jakarta-oro-2.0.8-r1 ) !norhino? ( =dev-java/rhino-1.5* ) !nojdepend? ( >=dev-java/jdepend-2.6 ) !nojsch? ( >=dev-java/jsch-0.1.12 ) !noregexp? ( >=dev-java/jakarta-regexp-1.3-r2 ) !nojython? ( >=dev-java/jython-2.1-r5 ) javamail? ( >=dev-java/sun-javamail-bin-1.3 )" -RDEPEND="${DEPEND}" +DEPEND=">=virtual/jdk-1.4 + >=dev-java/java-config-1.2 + ${RDEPEND}" S="${WORKDIR}/apache-ant-${PV}" @@ -54,7 +56,7 @@ src_compile() { export THREADS_FLAG="green" fi - local p="ant-core,junit" + local p="ant-core,junit" libs use noantlr || p="${p},antlr" use nobcel || p="${p},bcel" use nobeanutils || p="${p},commons-beanutils-1.6" @@ -74,7 +76,7 @@ src_compile() { use javamail && p="${p},sun-javamail-bin,sun-jaf-bin" - libs=$(java-config -p ${p}) + libs=$(java-pkg_getjars ${p}) CLASSPATH="." ./build.sh -Ddist.dir=${D}/usr/share/ant-core -lib ${libs} || die "build failed" } |