Use split-ant for the test use flag.

Package-Manager: portage-2.1.2-r7

diff --git a/dev-java/commons-cli/ChangeLog b/dev-java/commons-cli/ChangeLog
index bbf677cb56d1f9b8b6ebbf5558d27f43e130ecbb..7eddfd87fa2d49ab256834c4b14b2cad4b968c95 100644 (file)
--- a/dev-java/commons-cli/ChangeLog
+++ b/dev-java/commons-cli/ChangeLog
@@ -1,6 +1,10 @@
 # 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.26 2007/01/25 11:52:05 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-cli/ChangeLog,v 1.27 2007/02/06 19:47:32 betelgeuse Exp $
+
+  06 Feb 2007; Petteri Räty <betelgeuse@gentoo.org>
+  commons-cli-1.0-r5.ebuild:
+  Use split-ant for the test use flag.
 
   25 Jan 2007; Vlastimil Babka <caster@gentoo.org>
   +files/commons-cli-1.0-build.xml.patch, commons-cli-1.0-r5.ebuild:

diff --git a/dev-java/commons-cli/Manifest b/dev-java/commons-cli/Manifest
index fa5813c6e5d5e4e945778cc6c3b70231b3a00fe7..a1e9ebbb014460eed1071868eeb0d233c4106b04 100644 (file)
--- a/dev-java/commons-cli/Manifest
+++ b/dev-java/commons-cli/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX commons-cli-1.0-build.xml.patch 538 RMD160 f79ef3f22208148bd1eac16d13f39517ab260429 SHA1 826f57ba4f61cb64ad0bf14616e5e46d03127799 SHA256 a646f9ad190583253f1881c0cf71464e93b755bea5d4bbe605906e8ee1325533
 MD5 43014e5f5d8c10141c8239149a93da89 files/commons-cli-1.0-build.xml.patch 538
 RMD160 f79ef3f22208148bd1eac16d13f39517ab260429 files/commons-cli-1.0-build.xml.patch 538
@@ -11,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 1269 RMD160 d3d67565f2a18c095e78fcc6e89c2eda9336312a SHA1 0e1aa222dea11bb72ef0abb4c94518bd868f0401 SHA256 e981546169ee968250a017aceb31fe6df92edafd05672d2aeb2eb4069638b2b2
-MD5 315103725c28c4ee905535a0a91367c0 commons-cli-1.0-r5.ebuild 1269
-RMD160 d3d67565f2a18c095e78fcc6e89c2eda9336312a commons-cli-1.0-r5.ebuild 1269
-SHA256 e981546169ee968250a017aceb31fe6df92edafd05672d2aeb2eb4069638b2b2 commons-cli-1.0-r5.ebuild 1269
-MISC ChangeLog 3988 RMD160 eda652f3e938ee4c43d520f115fed0ecdd8e4a45 SHA1 a4acb095a8ec2f62c8ba160b0602f22d464e610c SHA256 d4f83836704f5220a438fd66a53178a5a5be4ad8291a4abb91e1cdc028df8290
-MD5 b78a01facfde6bf7c8213e0b52a44dde ChangeLog 3988
-RMD160 eda652f3e938ee4c43d520f115fed0ecdd8e4a45 ChangeLog 3988
-SHA256 d4f83836704f5220a438fd66a53178a5a5be4ad8291a4abb91e1cdc028df8290 ChangeLog 3988
+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
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157
@@ -29,3 +32,10 @@ SHA256 e6405828df63ae65405c8d0179a59d35d48d61978567edd62087dc966247894f files/di
 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)
+
+iD8DBQFFyNtecxLzpIGCsLQRAh6EAJ9XnONFsCmDHY73mT3x70KOleCirgCfbE4o
+Xpi8X2I59jqJwVerQpmCPug=
+=vvg+
+-----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 f92f2256fbf4914a16f8fdea88a12edb39769ba8..e0a1c337f0bf9ce2ed58c2b381bf287b3d6579af 100644 (file)
--- 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.6 2007/01/25 11:52:05 caster Exp $
+# $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 $
 
 JAVA_PKG_IUSE="doc source test"
 inherit java-pkg-2 java-ant-2 eutils
@@ -19,13 +19,13 @@ CDEPEND="dev-java/commons-logging
 RDEPEND=">=virtual/jre-1.4
        ${CDEPEND}"
 DEPEND=">=virtual/jdk-1.4
-       test? ( =dev-java/junit-3*  dev-java/ant )
-       !test? ( dev-java/ant-core )
+       test? ( dev-java/ant-junit )
+       dev-java/ant-core
        ${CDEPEND}"
 
 src_unpack() {
        unpack ${A}
-       cd ${S}
+       cd "${S}"
 
        epatch ${FILESDIR}/${P}-build.xml.patch
 
@@ -36,13 +36,13 @@ src_unpack() {
 
 src_test() {
        java-pkg_jar-from --into lib junit
-       eant test
+       ANT_TASKS="ant-junit" eant test
 }
 
 src_install() {
        java-pkg_newjar target/${P}.jar
 
-       dodoc README.txt
+       dodoc README.txt || die
        use doc && java-pkg_dojavadoc target/docs/apidocs
        use source && java-pkg_dosrc src/java/org
 }