diff options
| author |   Vlastimil Babka <caster@gentoo.org> | 2007-02-24 00:32:20 +0000 |
|---|---|---|
| committer | Vlastimil Babka <caster@gentoo.org> | 2007-02-24 00:32:20 +0000 |
| commit | cc68832e41ee9e100b3320b3e24f055bde02afde (patch) | |
| tree | 5010b899961e727f0149f1c4a3d454c40440229e /dev-java/ant-core | |
| parent | Version bump, wrt bug 165555 (diff) | |
| download | gentoo-2-cc68832e41ee9e100b3320b3e24f055bde02afde.tar.gz gentoo-2-cc68832e41ee9e100b3320b3e24f055bde02afde.tar.bz2 gentoo-2-cc68832e41ee9e100b3320b3e24f055bde02afde.zip | |
Block on <dev-java/ant-1.7.0 to beat one possible source of bug #166077. Add java-ant-2 to inherit.
(Portage version: 2.1.2-r10)
Diffstat (limited to 'dev-java/ant-core')
| -rw-r--r-- | dev-java/ant-core/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-java/ant-core/ant-core-1.7.0.ebuild | 14 |
2 files changed, 16 insertions, 4 deletions
diff --git a/dev-java/ant-core/ChangeLog b/dev-java/ant-core/ChangeLog index 9537fddceb4d..0871bde50c1e 100644 --- a/dev-java/ant-core/ChangeLog +++ b/dev-java/ant-core/ChangeLog @@ -1,11 +1,15 @@ # ChangeLog for dev-java/ant-core # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/ChangeLog,v 1.67 2007/01/27 00:48:57 caster Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/ChangeLog,v 1.68 2007/02/24 00:32:20 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. + 24 Feb 2007; Vlastimil Babka <caster@gentoo.org> ant-core-1.7.0.ebuild: + Block on <dev-java/ant-1.7.0 to beat one possible source of bug #166077. + Add java-ant-2 to inherit. + 27 Jan 2007; Vlastimil Babka <caster@gentoo.org> ant-core-1.7.0.ebuild: Add ~ia64 keyword, bug #159820. diff --git a/dev-java/ant-core/ant-core-1.7.0.ebuild b/dev-java/ant-core/ant-core-1.7.0.ebuild index f99edc5a8aaa..bd7ba1ff83ef 100644 --- a/dev-java/ant-core/ant-core-1.7.0.ebuild +++ b/dev-java/ant-core/ant-core-1.7.0.ebuild @@ -1,8 +1,12 @@ # Copyright 1999-2007 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.0.ebuild,v 1.7 2007/01/27 00:48:57 caster Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/ant-core-1.7.0.ebuild,v 1.8 2007/02/24 00:32:20 caster Exp $ -inherit java-pkg-2 +# don't depend on itself +JAVA_ANT_DISABLE_ANT_CORE_DEP=true +# rewriting build.xml files for the testcases has no reason atm +JAVA_PKG_BSFIX_ALL=no +inherit java-pkg-2 java-ant-2 MY_P="apache-ant-${PV}" @@ -16,8 +20,12 @@ SLOT="0" KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd" IUSE="doc source" +# 1.7.0 instead of $PV in blocks is intentional, >1.7.0 upgrades should +# be block free (but these fixed blocks should stay there for users upgrading +# from <1.7.0 to >1.7.0 of course) RDEPEND=">=virtual/jdk-1.4 - !<dev-java/ant-tasks-${PV} + !<dev-java/ant-tasks-1.7.0 + !<dev-java/ant-1.7.0 !dev-java/ant-optional" DEPEND="${RDEPEND} source? ( app-arch/zip )" |