diff options
| author |   Vlastimil Babka <caster@gentoo.org> | 2006-10-02 21:26:17 +0000 |
|---|---|---|
| committer | Vlastimil Babka <caster@gentoo.org> | 2006-10-02 21:26:17 +0000 |
| commit | 7e4a6b63e75cabfac07705c508717ee0125fea68 (patch) | |
| tree | e856b80651b6e98e323859c1ab111afe29c6781b /dev-java/ant-core | |
| parent | Update 2.1.9 ebuild to include fixes from 2.2.1 ebuild, and fix (diff) | |
| download | gentoo-2-7e4a6b63e75cabfac07705c508717ee0125fea68.tar.gz gentoo-2-7e4a6b63e75cabfac07705c508717ee0125fea68.tar.bz2 gentoo-2-7e4a6b63e75cabfac07705c508717ee0125fea68.zip | |
Block on older ant-tasks to prevent breakages during update, solves bug #149661.
(Portage version: 2.1.2_pre2)
Diffstat (limited to 'dev-java/ant-core')
| -rw-r--r-- | dev-java/ant-core/ChangeLog | 7 | ||||
| -rw-r--r-- | dev-java/ant-core/ant-core-1.6.5-r14.ebuild | 5 |
2 files changed, 9 insertions, 3 deletions
diff --git a/dev-java/ant-core/ChangeLog b/dev-java/ant-core/ChangeLog index b124a7c95e50..e1b79859e589 100644 --- a/dev-java/ant-core/ChangeLog +++ b/dev-java/ant-core/ChangeLog @@ -1,11 +1,16 @@ # ChangeLog for dev-java/ant-core # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/ChangeLog,v 1.49 2006/09/17 03:53:12 wormo Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/ChangeLog,v 1.50 2006/10/02 21:26:17 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. + 02 Oct 2006; Vlastimil Babka <caster@gentoo.org> + ant-core-1.6.5-r14.ebuild: + Block on older ant-tasks to prevent breakages during update, solves bug + #149661. + 16 Sep 2006; Stephanie Lockwood-Childs <wormo@gentoo.org> ant-core-1.6.5-r2.ebuild: stable on ppc, thanks to report by Carl Hudkins (Bug #147754) diff --git a/dev-java/ant-core/ant-core-1.6.5-r14.ebuild b/dev-java/ant-core/ant-core-1.6.5-r14.ebuild index 595158d0e993..cb6fd6485575 100644 --- a/dev-java/ant-core/ant-core-1.6.5-r14.ebuild +++ b/dev-java/ant-core/ant-core-1.6.5-r14.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 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.6.5-r14.ebuild,v 1.1 2006/09/13 09:28:31 caster Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/ant-core-1.6.5-r14.ebuild,v 1.2 2006/10/02 21:26:17 caster Exp $ inherit java-pkg-2 eutils toolchain-funcs java-ant-2 @@ -17,7 +17,8 @@ IUSE="doc source" DEPEND="${RDEPEND} source? ( app-arch/zip ) - >=virtual/jdk-1.4" + >=virtual/jdk-1.4 + !<dev-java/ant-tasks-${PV}" RDEPEND=">=virtual/jdk-1.4 >=dev-java/java-config-1.2" |