diff options
author | James Le Cuirot <chewi@gentoo.org> | 2015-04-28 20:35:40 +0000 |
---|---|---|
committer | James Le Cuirot <chewi@gentoo.org> | 2015-04-28 20:35:40 +0000 |
commit | 732897e68ea6723ca388049e8efa085ded66f8bb (patch) | |
tree | d67440e16da0b3f9eb5a3f57b7195dc1c7184dd7 /eclass/ant-tasks.eclass | |
parent | removing swift based on git master (because keeping up to date on deps sucks) (diff) | |
download | gentoo-2-732897e68ea6723ca388049e8efa085ded66f8bb.tar.gz gentoo-2-732897e68ea6723ca388049e8efa085ded66f8bb.tar.bz2 gentoo-2-732897e68ea6723ca388049e8efa085ded66f8bb.zip |
Skip java-dep-check for ant tasks wrt bug #298955. Fix missing
ant-core dependency SLOT. Fix recording of BUILD_DEPEND. Fix
java-pkg_ensure-dep matching and adjust the error message. Fix
automatic loading of ant-junit and junit wrt bug #513522 among others.
Diffstat (limited to 'eclass/ant-tasks.eclass')
-rw-r--r-- | eclass/ant-tasks.eclass | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/eclass/ant-tasks.eclass b/eclass/ant-tasks.eclass index f8973f15f378..2887ea83ff1e 100644 --- a/eclass/ant-tasks.eclass +++ b/eclass/ant-tasks.eclass @@ -1,9 +1,9 @@ # Eclass for building dev-java/ant-* packages # -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License, v2 or later # Author Vlastimil Babka <caster@gentoo.org> -# $Header: /var/cvsroot/gentoo-x86/eclass/ant-tasks.eclass,v 1.16 2013/10/05 12:07:01 caster Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ant-tasks.eclass,v 1.17 2015/04/28 20:35:40 chewi Exp $ # @ECLASS: ant-tasks.eclass # @MAINTAINER: @@ -98,7 +98,7 @@ SRC_URI="${UPSTREAM_PREFIX}/${MY_P}-src.tar.bz2 LICENSE="Apache-2.0" SLOT="0" -RDEPEND="~dev-java/ant-core-${PV}" +RDEPEND="~dev-java/ant-core-${PV}:0" DEPEND="${RDEPEND}" if [[ -z "${ANT_TASK_DISABLE_VM_DEPS}" ]]; then |