diff options
| author |   Thomas Matthijs <axxo@gentoo.org> | 2004-09-01 20:43:24 +0000 |
|---|---|---|
| committer | Thomas Matthijs <axxo@gentoo.org> | 2004-09-01 20:43:24 +0000 |
| commit | a207a03e8b5c4f585393de776d91d3a0b8d0d1b4 (patch) | |
| tree | a9b0cb4ddd1515419d0329ad4417bd2ef363a51a /dev-java | |
| parent | block on ant-optional (diff) | |
| download | gentoo-2-a207a03e8b5c4f585393de776d91d3a0b8d0d1b4.tar.gz gentoo-2-a207a03e8b5c4f585393de776d91d3a0b8d0d1b4.tar.bz2 gentoo-2-a207a03e8b5c4f585393de776d91d3a0b8d0d1b4.zip | |
remove ant-optional from wrapper, move block on optional to tasks, add block on older ant-tasks
Diffstat (limited to 'dev-java')
| -rw-r--r-- | dev-java/ant/ChangeLog | 7 | ||||
| -rw-r--r-- | dev-java/ant/ant-1.6.2-r5.ebuild | 4 | ||||
| -rw-r--r-- | dev-java/ant/files/1.6.2-r5/ant | 4 |
3 files changed, 10 insertions, 5 deletions
diff --git a/dev-java/ant/ChangeLog b/dev-java/ant/ChangeLog index 3e4b70a55508..16e3d1722fe5 100644 --- a/dev-java/ant/ChangeLog +++ b/dev-java/ant/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-java/ant # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/ant/ChangeLog,v 1.77 2004/08/31 18:04:58 axxo Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/ant/ChangeLog,v 1.78 2004/09/01 20:43:24 axxo Exp $ + + 01 Sep 2004; Thomas Matthijs <axxo@gentoo.org> files/1.6.2-r5/ant, + ant-1.6.2-r5.ebuild: + remove ant-optional from wrapper, move block on optional to tasks, add block + on older ant-tasks 31 Aug 2004; Thomas Matthijs <axxo@gentoo.org> -files/1.6.2-r4/ant, -ant-1.6.2-r4.ebuild: diff --git a/dev-java/ant/ant-1.6.2-r5.ebuild b/dev-java/ant/ant-1.6.2-r5.ebuild index 20d7a915c881..dcdf4c367c69 100644 --- a/dev-java/ant/ant-1.6.2-r5.ebuild +++ b/dev-java/ant/ant-1.6.2-r5.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/ant/ant-1.6.2-r5.ebuild,v 1.1 2004/08/31 17:54:44 axxo Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/ant/ant-1.6.2-r5.ebuild,v 1.2 2004/09/01 20:43:24 axxo Exp $ inherit java-pkg eutils @@ -15,7 +15,7 @@ IUSE="doc" DEPEND="virtual/libc >=virtual/jdk-1.4 - !dev-java/ant-optional + !<dev-java/ant-tasks-${PV} >=dev-java/java-config-1.2" RDEPEND=">=virtual/jdk-1.4 app-shells/bash diff --git a/dev-java/ant/files/1.6.2-r5/ant b/dev-java/ant/files/1.6.2-r5/ant index 1f6fec412169..e4e948c53e6b 100644 --- a/dev-java/ant/files/1.6.2-r5/ant +++ b/dev-java/ant/files/1.6.2-r5/ant @@ -15,7 +15,7 @@ # limitations under the License. # Edited for Gentoo Linux -# $Header: /var/cvsroot/gentoo-x86/dev-java/ant/files/1.6.2-r5/ant,v 1.1 2004/08/31 17:54:44 axxo Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/ant/files/1.6.2-r5/ant,v 1.2 2004/09/01 20:43:24 axxo Exp $ # Extract launch and ant arguments, (see details below). ant_exec_args= @@ -102,7 +102,7 @@ else fi # add in the dependency .jar files -LOCALCLASSPATH="${LOCALCLASSPATH}:`java-config --classpath=ant,ant-optional,ant-tasks,log4j,xerces-2,xalan,junit,antlr,bcel,bsh,commons-beanutils,commons-logging,commons-net,oro,jdepend,jsch,regexp-bin,regexp,rhino,jython,jython-bin,jta,jaf,javamail 2> /dev/null`" +LOCALCLASSPATH="${LOCALCLASSPATH}:`java-config --classpath=ant,ant-tasks,log4j,xerces-2,xalan,junit,antlr,bcel,bsh,commons-beanutils,commons-logging,commons-net,oro,jdepend,jsch,regexp,regexp-bin,rhino,jython,jython-bin,jta,jaf,javamail 2> /dev/null`" if [ -n "$JAVA_HOME" ] ; then if [ -f "$JAVA_HOME/lib/tools.jar" ] ; then |