diff options
| author |   Vlastimil Babka <caster@gentoo.org> | 2006-12-09 12:52:38 +0000 |
|---|---|---|
| committer | Vlastimil Babka <caster@gentoo.org> | 2006-12-09 12:52:38 +0000 |
| commit | 55c34fcc5cdbff3b6f663566c09985e94fac7735 (patch) | |
| tree | 9f8b232ce10b481ea8c929b2348cfe6381c01e99 /dev-java/ant-core | |
| parent | Fix #157589 (diff) | |
| download | gentoo-2-55c34fcc5cdbff3b6f663566c09985e94fac7735.tar.gz gentoo-2-55c34fcc5cdbff3b6f663566c09985e94fac7735.tar.bz2 gentoo-2-55c34fcc5cdbff3b6f663566c09985e94fac7735.zip | |
Block on dev-java/ant-optional because some people still seem to have it. If you get the block, unmerge ant-optional.
(Portage version: 2.1.2_rc3)
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 2604c3836f87..0127721ddf80 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.58 2006/12/06 21:09:54 caster Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/ChangeLog,v 1.59 2006/12/09 12:52:38 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. + 09 Dec 2006; Vlastimil Babka <caster@gentoo.org> + ant-core-1.6.5-r14.ebuild: + Block on dev-java/ant-optional because some people still seem to have it. If + you get the block, unmerge ant-optional. + 06 Dec 2006; Vlastimil Babka <caster@gentoo.org> -files/1.6.2-ant, -files/1.6.2-scp.patch, -files/rpmbuild.patch, -ant-core-1.6.2-r5.ebuild, -ant-core-1.6.5-r2.ebuild: 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 ec655217fdff..821a081cc11e 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.9 2006/11/29 15:31:29 caster Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/ant-core-1.6.5-r14.ebuild,v 1.10 2006/12/09 12:52:38 caster Exp $ inherit java-pkg-2 eutils toolchain-funcs java-ant-2 @@ -17,7 +17,8 @@ IUSE="doc source" DEPEND="source? ( app-arch/zip ) >=virtual/jdk-1.4 - !<dev-java/ant-tasks-${PV}" + !<dev-java/ant-tasks-${PV} + !dev-java/ant-optional" RDEPEND=">=virtual/jdk-1.4 >=dev-java/java-config-1.2" |