From 76576228e3d9ce8655b5f8a2fb81afd35b62c2f7 Mon Sep 17 00:00:00 2001 From: Petteri Räty Date: Fri, 23 Mar 2007 22:55:35 +0000 Subject: Allow both ant-junit or ant-tasks to provide the junit task to allow this to be marked stable. (Portage version: 2.1.2.2) --- dev-java/commons-cli/ChangeLog | 7 ++++++- dev-java/commons-cli/commons-cli-1.0-r5.ebuild | 4 ++-- 2 files changed, 8 insertions(+), 3 deletions(-) (limited to 'dev-java') diff --git a/dev-java/commons-cli/ChangeLog b/dev-java/commons-cli/ChangeLog index 7eddfd87fa2d..26c8bb65e86a 100644 --- a/dev-java/commons-cli/ChangeLog +++ b/dev-java/commons-cli/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-java/commons-cli # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-cli/ChangeLog,v 1.27 2007/02/06 19:47:32 betelgeuse Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-cli/ChangeLog,v 1.28 2007/03/23 22:55:35 betelgeuse Exp $ + + 23 Mar 2007; Petteri Räty + commons-cli-1.0-r5.ebuild: + Allow both ant-junit or ant-tasks to provide the junit task to allow this to + be marked stable. 06 Feb 2007; Petteri Räty commons-cli-1.0-r5.ebuild: diff --git a/dev-java/commons-cli/commons-cli-1.0-r5.ebuild b/dev-java/commons-cli/commons-cli-1.0-r5.ebuild index e0a1c337f0bf..78672fe1171e 100644 --- a/dev-java/commons-cli/commons-cli-1.0-r5.ebuild +++ b/dev-java/commons-cli/commons-cli-1.0-r5.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-cli/commons-cli-1.0-r5.ebuild,v 1.7 2007/02/06 19:47:32 betelgeuse Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-cli/commons-cli-1.0-r5.ebuild,v 1.8 2007/03/23 22:55:35 betelgeuse Exp $ JAVA_PKG_IUSE="doc source test" inherit java-pkg-2 java-ant-2 eutils @@ -19,7 +19,7 @@ CDEPEND="dev-java/commons-logging RDEPEND=">=virtual/jre-1.4 ${CDEPEND}" DEPEND=">=virtual/jdk-1.4 - test? ( dev-java/ant-junit ) + test? ( || ( dev-java/ant-junit dev-java/ant-tasks ) ) dev-java/ant-core ${CDEPEND}" -- cgit v1.2.3-65-gdbad