summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVlastimil Babka <caster@gentoo.org>2008-07-16 14:41:51 +0000
committerVlastimil Babka <caster@gentoo.org>2008-07-16 14:41:51 +0000
commit5f4a3add6351bcda4c60e49b7fac1de0ade2705f (patch)
tree3f194018362e4e46187b15ca9a631c5454cce4e0 /dev-java
parentfix exec stacks with mmx asm, still bug #93279 (diff)
downloadgentoo-2-5f4a3add6351bcda4c60e49b7fac1de0ade2705f.tar.gz
gentoo-2-5f4a3add6351bcda4c60e49b7fac1de0ade2705f.tar.bz2
gentoo-2-5f4a3add6351bcda4c60e49b7fac1de0ade2705f.zip
Revbump to update ant version in startup script to fix detection of optional tasks. Fixes bug #231968.
(Portage version: 2.2_rc1/cvs/Linux 2.6.25-gentoo-r4 x86_64)
Diffstat (limited to 'dev-java')
-rw-r--r--dev-java/ant-core/ChangeLog9
-rw-r--r--dev-java/ant-core/ant-core-1.7.1-r1.ebuild (renamed from dev-java/ant-core/ant-core-1.7.1.ebuild)2
-rw-r--r--dev-java/ant-core/files/1.7.1-ant6
3 files changed, 12 insertions, 5 deletions
diff --git a/dev-java/ant-core/ChangeLog b/dev-java/ant-core/ChangeLog
index 2705a1a457f0..ca4ef5a0992d 100644
--- a/dev-java/ant-core/ChangeLog
+++ b/dev-java/ant-core/ChangeLog
@@ -1,11 +1,18 @@
# ChangeLog for dev-java/ant-core
# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/ChangeLog,v 1.83 2008/07/14 22:16:49 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/ChangeLog,v 1.84 2008/07/16 14:41:51 caster Exp $
# Ant-core blocks lower/older versions of ant-tasks,
# since it will not run when there is a version mismatch betwean the 2 packages
# Please unemerge ant-tasks when updating ant-core.
+*ant-core-1.7.1-r1 (16 Jul 2008)
+
+ 16 Jul 2008; Vlastimil Babka <caster@gentoo.org> files/1.7.1-ant,
+ -ant-core-1.7.1.ebuild, +ant-core-1.7.1-r1.ebuild:
+ Revbump to update ant version in startup script to fix detection of
+ optional tasks. Fixes bug #231968.
+
14 Jul 2008; Vlastimil Babka <caster@gentoo.org> ant-core-1.7.1.ebuild:
Add note about removed ant-tasks to pkg_postinst messages.
diff --git a/dev-java/ant-core/ant-core-1.7.1.ebuild b/dev-java/ant-core/ant-core-1.7.1-r1.ebuild
index 1a8cd637afd0..417acea68add 100644
--- a/dev-java/ant-core/ant-core-1.7.1.ebuild
+++ b/dev-java/ant-core/ant-core-1.7.1-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/ant-core-1.7.1.ebuild,v 1.2 2008/07/14 22:16:49 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/ant-core-1.7.1-r1.ebuild,v 1.1 2008/07/16 14:41:51 caster Exp $
# don't depend on itself
JAVA_ANT_DISABLE_ANT_CORE_DEP=true
diff --git a/dev-java/ant-core/files/1.7.1-ant b/dev-java/ant-core/files/1.7.1-ant
index 92f9ad266763..d31519cafd70 100644
--- a/dev-java/ant-core/files/1.7.1-ant
+++ b/dev-java/ant-core/files/1.7.1-ant
@@ -16,7 +16,7 @@
# limitations under the License.
# Edited for Gentoo Linux
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/files/1.7.1-ant,v 1.1 2008/07/14 21:41:46 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/files/1.7.1-ant,v 1.2 2008/07/16 14:41:51 caster Exp $
# Extract launch and ant arguments, (see details below).
ant_exec_args=
@@ -122,8 +122,8 @@ if [[ "${ANT_TASKS}" == "all" ]]; then
if [[ -d /usr/share/ant/tasks ]]; then
ANT_TASKS="${ANT_TASKS} "/usr/share/ant/tasks/*
fi
- if [[ -d /usr/share/ant/tasks-1.7.0 ]]; then
- ANT_TASKS="${ANT_TASKS} "/usr/share/ant/tasks-1.7.0/*
+ if [[ -d /usr/share/ant/tasks-1.7.1 ]]; then
+ ANT_TASKS="${ANT_TASKS} "/usr/share/ant/tasks-1.7.1/*
fi
# if set to "none", make ANT_TASKS empty list
elif [[ "${ANT_TASKS}" == "none" ]]; then