summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Matthijs <axxo@gentoo.org>2004-08-31 06:15:30 +0000
committerThomas Matthijs <axxo@gentoo.org>2004-08-31 06:15:30 +0000
commit606cb7fbf848368d0cab85c240cf26c6a3f50c25 (patch)
tree5dcdddda9d5312be7676cc2b2b9d36081289a437 /dev-java/ant
parentmissing IUSE:nobeanutils, fixed various naming in $p and $jar, properly detec... (diff)
downloadgentoo-2-606cb7fbf848368d0cab85c240cf26c6a3f50c25.tar.gz
gentoo-2-606cb7fbf848368d0cab85c240cf26c6a3f50c25.tar.bz2
gentoo-2-606cb7fbf848368d0cab85c240cf26c6a3f50c25.zip
block ant-optional, depending on new ant-tasks-1.6.2-r3
Diffstat (limited to 'dev-java/ant')
-rw-r--r--dev-java/ant/ChangeLog5
-rw-r--r--dev-java/ant/Manifest4
-rw-r--r--dev-java/ant/ant-1.6.2-r4.ebuild5
3 files changed, 9 insertions, 5 deletions
diff --git a/dev-java/ant/ChangeLog b/dev-java/ant/ChangeLog
index 6cca52f4642b..54f3119c59c8 100644
--- a/dev-java/ant/ChangeLog
+++ b/dev-java/ant/ChangeLog
@@ -1,6 +1,9 @@
# 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.74 2004/08/30 20:15:10 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant/ChangeLog,v 1.75 2004/08/31 06:15:30 axxo Exp $
+
+ 31 Aug 2004; Thomas Matthijs <axxo@gentoo.org> ant-1.6.2-r4.ebuild:
+ block ant-optional, depending on new ant-tasks-1.6.2-r3
*ant-1.6.2-r4 (30 Aug 2004)
diff --git a/dev-java/ant/Manifest b/dev-java/ant/Manifest
index a11f57cb5f3b..8b0c0a204fc7 100644
--- a/dev-java/ant/Manifest
+++ b/dev-java/ant/Manifest
@@ -4,9 +4,9 @@ MD5 feb875c667f1fe035a07b0709bfa3b83 ant-1.6.1-r1.ebuild 2233
MD5 cdb8b5b010df8ff5460d310b98b2f086 ant-1.6.1.ebuild 2222
MD5 16df02d2f27b258ec276ae47cb5fb844 ant-1.6.2-r2.ebuild 2221
MD5 c658c82e510af29ddedca0f00f1d9cfd ant-1.6.0-r3.ebuild 1594
-MD5 d54739ef6df2487774115bcd95310020 ChangeLog 12375
+MD5 10438217512e838883f564bbe2a68bfc ChangeLog 12504
MD5 4dad079a28768d183022cff420f01281 metadata.xml 220
-MD5 f05e565eb1f8c657ea19abd976b15eb0 ant-1.6.2-r4.ebuild 2190
+MD5 e83ef196a3e48e6fe8afc4bc3057dbf8 ant-1.6.2-r4.ebuild 2214
MD5 9796e31a633d28a00242c76325bb85b4 files/20ant 26
MD5 742e94a3c64e9b5cddc7ce7863d1afac files/digest-ant-1.6.1 74
MD5 4383441650437fec5622070e48e4324c files/build.sh-exit-fix.patch.gz 256
diff --git a/dev-java/ant/ant-1.6.2-r4.ebuild b/dev-java/ant/ant-1.6.2-r4.ebuild
index 658c760b86cb..690d4ca07b1c 100644
--- a/dev-java/ant/ant-1.6.2-r4.ebuild
+++ b/dev-java/ant/ant-1.6.2-r4.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-r4.ebuild,v 1.1 2004/08/30 20:15:10 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant/ant-1.6.2-r4.ebuild,v 1.2 2004/08/31 06:15:30 axxo Exp $
inherit java-pkg eutils
@@ -15,11 +15,12 @@ IUSE="doc"
DEPEND="virtual/libc
>=virtual/jdk-1.4
+ !dev-java/ant-optional
>=dev-java/java-config-1.2"
RDEPEND=">=virtual/jdk-1.4
app-shells/bash
>=dev-java/java-config-1.2"
-PDEPEND="=dev-java/ant-tasks-1.6.2-r2"
+PDEPEND="=dev-java/ant-tasks-1.6.2-r3"
S="${WORKDIR}/apache-ant-${PV}"