Make tests pass for commons-cli-1.2.

Package-Manager: portage-2.1.6.7/cvs/Linux i686

4 files changed, 13 insertions, 7 deletions

diff --git a/dev-java/commons-cli/ChangeLog b/dev-java/commons-cli/ChangeLog
index 4e7ada03f5e7..df523519d77c 100644
--- a/dev-java/commons-cli/ChangeLog
+++ b/dev-java/commons-cli/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/commons-cli
 # Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-cli/ChangeLog,v 1.40 2009/03/27 19:54:47 elvanor Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-cli/ChangeLog,v 1.41 2009/04/19 17:10:46 elvanor Exp $
+
+  19 Apr 2009; Jean-Noël Rivasseau <elvanor@gentoo.org>
+  files/build-1.2.xml, commons-cli-1.2.ebuild:
+  Make tests pass.
 
 *commons-cli-1.2 (27 Mar 2009)
 
diff --git a/dev-java/commons-cli/Manifest b/dev-java/commons-cli/Manifest
index 8ff315b067ab..9552bcf9ab4c 100644
--- a/dev-java/commons-cli/Manifest
+++ b/dev-java/commons-cli/Manifest
@@ -1,4 +1,4 @@
-AUX build-1.2.xml 10752 RMD160 edaa06217733f6661c62459cd897665092787dc5 SHA1 e25af29e731c6c8917937188864c668c3cf5a9c6 SHA256 5c726085aa84fa1f50e2285dbd263e3734eff91284a86b56751f2f1a478efdb2
+AUX build-1.2.xml 10797 RMD160 fa9394d9129b5aec3c4128bc4b14001c023db716 SHA1 9be7b14daf9333379125a3594aaeab29d0d62a65 SHA256 c3ffe37be5fcfab0fb2bc8506a8f43bbf2a6db98131409a62fae312a5cd88117
 AUX commons-cli-1.0-build.xml.patch 538 RMD160 f79ef3f22208148bd1eac16d13f39517ab260429 SHA1 826f57ba4f61cb64ad0bf14616e5e46d03127799 SHA256 a646f9ad190583253f1881c0cf71464e93b755bea5d4bbe605906e8ee1325533
 AUX commons-cli-1.0-gentoo.diff 4407 RMD160 c6db9a74f8f0c1f3649f2c64bdfd9fb0f3683c03 SHA1 dabb6e45b7d925acbd79a21521c8fc44348101ac SHA256 03cbd6e210c3cb0521e0db870d40248c2f5279f3639e67cc2ef71d467b5b16fb
 DIST cli-1.0-src.tar.gz 37046 RMD160 85404f803751f50e980c4cd976cd930f6be0ef9f SHA1 83966ccd4f7cb2e23ef746bd2cf8b0e0b585fa87 SHA256 fa4bf0850c896a9d5679f30d9921a98b3d262678019433f36ef810235ae58ec8
@@ -6,6 +6,6 @@ DIST commons-cli-1.1-src.tar.gz 63320 RMD160 c778f9b084185e601662b554630465213b6
 DIST commons-cli-1.2-src.tar.gz 68594 RMD160 b49ac30c33c49920d8317663c00eb55b7a78ec61 SHA1 0aa042a0e35d96afaffbfb6cdbdad3e16d67fd7c SHA256 b589cd675866aec12a068e0717f2bd52ead6128c43ba1612a8815db1df7f6e67
 EBUILD commons-cli-1.0-r5.ebuild 1218 RMD160 277518b13c6c8a7bd91d304984fe30a85d6a1cec SHA1 e9d06ce3df1694b19537a8801d772bb9034b2068 SHA256 7f0b7337f6ac9782b44d333896a0b5c99bf63107109a515b9b3edd9451ebdb91
 EBUILD commons-cli-1.1.ebuild 998 RMD160 2a3a27bb1e4042ad745381fe7dc9e00e2d260d6a SHA1 335c9ade8d8393afed22ad972fcef47116c2456d SHA256 d4c30e46658b3147ce9551cc6e7522e9961ecc8d7d9e66adbb56976371359212
-EBUILD commons-cli-1.2.ebuild 1436 RMD160 891da489cdb66a537196c20716792db426bc1c93 SHA1 e18d7b36a21d5ea09625c172ad70eb45e8daff71 SHA256 bea04980768c8251fb564c598e08a35dffe04b756c86b1d05d806c179d098ade
-MISC ChangeLog 5817 RMD160 9fea2d4cd0c1b007d9c4bcebe0ba1ea3a7cb9490 SHA1 44c39cdc696e88210475e828f8e9740913044830 SHA256 6835f3bade8beb72bf21a368610d32061c2d2394a127e245192ea14e42970011
+EBUILD commons-cli-1.2.ebuild 1446 RMD160 3bde395745b9b43b7f081df471b98c64794d7627 SHA1 5d8ba3cc3a1c3915463744efb14b0ddd63d75d33 SHA256 3c4d0712727d31d8fa32cefcb9ed2252b1252144bcd9f4a7f04f24f066d283b0
+MISC ChangeLog 5941 RMD160 b693a99d60211c5b9bbcf96d22ef6e3ce4969b94 SHA1 9f7f08636607af5d20043bbc820681a728bdc14e SHA256 69ab74eb4abacd09f92661cad6a6c0af55189fb8f3e16a2eea0b5e003b015e95
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
diff --git a/dev-java/commons-cli/commons-cli-1.2.ebuild b/dev-java/commons-cli/commons-cli-1.2.ebuild
index ed965440b5bf..2206340af825 100644
--- a/dev-java/commons-cli/commons-cli-1.2.ebuild
+++ b/dev-java/commons-cli/commons-cli-1.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 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.2.ebuild,v 1.2 2009/03/27 20:14:30 elvanor Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-cli/commons-cli-1.2.ebuild,v 1.3 2009/04/19 17:10:46 elvanor Exp $
 
 # Upstream switched to Maven as a build system. Current build.xml file was generated by running mvn ant:ant
 # A bit of tweaking was required unfortunately
@@ -20,8 +20,7 @@ SLOT="1"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
 IUSE=""
 
-# Tests currently fail, upstream bug: https://issues.apache.org/jira/browse/CLI-178
-RESTRICT="test"
+RESTRICT=""
 
 RDEPEND=">=virtual/jre-1.4"
 # Blocking junit for https://bugs.gentoo.org/show_bug.cgi?id=215659
@@ -46,6 +45,8 @@ src_install() {
 	use source && java-pkg_dosrc src/java/org
 }
 
+# org.apache.commons.cli.ParserTestCase should not be ran, so we removed this class in build.xml
+
 src_test() {
 	ANT_TASKS="ant-junit"
 	eant -Djunit.present="true" test
diff --git a/dev-java/commons-cli/files/build-1.2.xml b/dev-java/commons-cli/files/build-1.2.xml
index 1138d81f0ebc..a6752eee3daa 100644
--- a/dev-java/commons-cli/files/build-1.2.xml
+++ b/dev-java/commons-cli/files/build-1.2.xml
@@ -139,6 +139,7 @@
           <include name="**/*Test.java"/>
           <include name="**/*TestCase.java"/>
           <exclude name="**/*Abstract*Test.java"/>
+		  <exclude name="**/ParserTestCase.java"/>
         </fileset>
       </batchtest>
       <batchtest todir="${maven.test.reports}" if="test">