From: Petteri Räty <betelgeuse@gentoo.org>
Date: Fri, 23 Mar 2007 22:55:35 +0000 (+0000)
Subject: Allow both ant-junit or ant-tasks to provide the junit task to allow this to be marke... 
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=cca4987dff0751cef40bebf2840f1a22f2b926a1;p=gentoo.git

Allow both ant-junit or ant-tasks to provide the junit task to allow this to be marked stable.
Package-Manager: portage-2.1.2.2
---

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 <betelgeuse@gentoo.org>
+  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 <betelgeuse@gentoo.org>
   commons-cli-1.0-r5.ebuild:
diff --git a/dev-java/commons-cli/Manifest b/dev-java/commons-cli/Manifest
index a1e9ebbb0144..006b88f9f5a8 100644
--- a/dev-java/commons-cli/Manifest
+++ b/dev-java/commons-cli/Manifest
@@ -14,14 +14,14 @@ EBUILD commons-cli-1.0-r4.ebuild 1609 RMD160 9aef570d2625ac6f9e0781c255e18f222e5
 MD5 b25f74f6e33b9431548773cd49bdd72e commons-cli-1.0-r4.ebuild 1609
 RMD160 9aef570d2625ac6f9e0781c255e18f222e5133fe commons-cli-1.0-r4.ebuild 1609
 SHA256 d589435b288eccb9f231cf2b90e887096c9a8045ff42a2d6f153ec1f1958eca9 commons-cli-1.0-r4.ebuild 1609
-EBUILD commons-cli-1.0-r5.ebuild 1279 RMD160 c4744f27495df7097cbca25c46f69d21653ec754 SHA1 a3ce93d6bc215dcd2aee86a2866bef9b666a5d1d SHA256 1946bc7d146c070768bdd050e04cdc05e85d0c033e3f4c76b2925cc239260492
-MD5 254558a2a503e42cb692c0a091ea50fc commons-cli-1.0-r5.ebuild 1279
-RMD160 c4744f27495df7097cbca25c46f69d21653ec754 commons-cli-1.0-r5.ebuild 1279
-SHA256 1946bc7d146c070768bdd050e04cdc05e85d0c033e3f4c76b2925cc239260492 commons-cli-1.0-r5.ebuild 1279
-MISC ChangeLog 4114 RMD160 03a7343c4e56038584dc921422362595f4502188 SHA1 e5e2096412bddde40e517892a188f1be08841d69 SHA256 4f79dd43cc68f07c2db536ab5e6bf564bbaf6e07b5e1a778e5e95076fddaf5d8
-MD5 d2d24127c31696d5f21c0e33d5b3552f ChangeLog 4114
-RMD160 03a7343c4e56038584dc921422362595f4502188 ChangeLog 4114
-SHA256 4f79dd43cc68f07c2db536ab5e6bf564bbaf6e07b5e1a778e5e95076fddaf5d8 ChangeLog 4114
+EBUILD commons-cli-1.0-r5.ebuild 1305 RMD160 5dd3871e2479df18430198638d3e940ed272d825 SHA1 3493d20be1aeb550f8e3d20be7bfde46bafa21ca SHA256 1bfa22f7ae59ec822dd87b83530b4048c8defc5a16868c997559ba5258fd9d55
+MD5 a9bf63cf12ed13e7333ed7410d42defb commons-cli-1.0-r5.ebuild 1305
+RMD160 5dd3871e2479df18430198638d3e940ed272d825 commons-cli-1.0-r5.ebuild 1305
+SHA256 1bfa22f7ae59ec822dd87b83530b4048c8defc5a16868c997559ba5258fd9d55 commons-cli-1.0-r5.ebuild 1305
+MISC ChangeLog 4296 RMD160 b156292d49bbd72443308aa04bbd2fe6af97abbf SHA1 69553bb64435e2f9c6b1383a3154e2f0d09e497d SHA256 bad850ed82c30114583497424e56c9aac3ff7645a4362a6dba7f4458448357a4
+MD5 323b548de3705b4d6a86423aa0b4f79e ChangeLog 4296
+RMD160 b156292d49bbd72443308aa04bbd2fe6af97abbf ChangeLog 4296
+SHA256 bad850ed82c30114583497424e56c9aac3ff7645a4362a6dba7f4458448357a4 ChangeLog 4296
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157
@@ -33,9 +33,9 @@ MD5 122734c89e73972b32a56d81a06c8fa1 files/digest-commons-cli-1.0-r5 232
 RMD160 2c1fd6034b918bd744c903ae81a01539ed71d356 files/digest-commons-cli-1.0-r5 232
 SHA256 e6405828df63ae65405c8d0179a59d35d48d61978567edd62087dc966247894f files/digest-commons-cli-1.0-r5 232
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.1 (GNU/Linux)
+Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFFyNtecxLzpIGCsLQRAh6EAJ9XnONFsCmDHY73mT3x70KOleCirgCfbE4o
-Xpi8X2I59jqJwVerQpmCPug=
-=vvg+
+iD8DBQFGBFrwcxLzpIGCsLQRAlvWAJ939iIZgWasSM9ULm4vPtYCU54/aQCdEaU7
+OIj4p3D2Dem9aoNvrlqcYC0=
+=NXdD
 -----END PGP SIGNATURE-----
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}"