From f42cbe632f4ce159f5666f4fcf4dcae900b4c2dd Mon Sep 17 00:00:00 2001 From: =?utf8?q?Petteri=20R=C3=A4ty?= Date: Sat, 10 Feb 2007 14:28:42 +0000 Subject: [PATCH] Use split ant for test depends. Package-Manager: portage-2.1.2-r9 --- dev-java/commons-jelly/ChangeLog | 8 +++++-- dev-java/commons-jelly/Manifest | 24 +++++++++---------- .../commons-jelly/commons-jelly-1.0-r1.ebuild | 10 ++++---- 3 files changed, 23 insertions(+), 19 deletions(-) diff --git a/dev-java/commons-jelly/ChangeLog b/dev-java/commons-jelly/ChangeLog index 97f643474f99..73200052a68b 100644 --- a/dev-java/commons-jelly/ChangeLog +++ b/dev-java/commons-jelly/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-java/commons-jelly -# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-jelly/ChangeLog,v 1.5 2006/12/26 18:12:06 betelgeuse Exp $ +# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-jelly/ChangeLog,v 1.6 2007/02/10 14:28:42 betelgeuse Exp $ + + 10 Feb 2007; Petteri Räty + commons-jelly-1.0-r1.ebuild: + Use split ant for test depends. 26 Dec 2006; Petteri Räty commons-jelly-1.0-r1.ebuild: diff --git a/dev-java/commons-jelly/Manifest b/dev-java/commons-jelly/Manifest index 7ecaa1d5fd9e..7ceb43fab6bc 100644 --- a/dev-java/commons-jelly/Manifest +++ b/dev-java/commons-jelly/Manifest @@ -6,14 +6,14 @@ MD5 54a1c7c1840da66a583e5ec54ddb94c1 files/commons-jelly-1.0-gentoo.patch 2224 RMD160 ab9179ac39196b1dbe6fc8f9bffdc498ad363697 files/commons-jelly-1.0-gentoo.patch 2224 SHA256 0e064c87ae4a2a91f7c98c546e0f3bf9f9ff4caf877e0c2f28a6b3443e6f3533 files/commons-jelly-1.0-gentoo.patch 2224 DIST commons-jelly-1.0-src.tar.gz 174769 RMD160 c273e80fb10327a833d192e89500a08302d68c58 SHA1 a0aedfa7ce69288277cc3c06b1d832a7a97affe5 SHA256 113d606361845d08dab69f187690bf5dcfb5e9ca8fab780135898eb6d0a8d7d1 -EBUILD commons-jelly-1.0-r1.ebuild 1788 RMD160 1aea302b1c0051d605310a1a15a2806ea681252f SHA1 7b4b51dc1b2f51fe431d20e365b72155d9d887d1 SHA256 01e49c22074f719a441038c5a1335239acfec33172ad7cd82a8d6c2cd1c8333c -MD5 64f0bf2d52b19a4b2254164ae8a3069d commons-jelly-1.0-r1.ebuild 1788 -RMD160 1aea302b1c0051d605310a1a15a2806ea681252f commons-jelly-1.0-r1.ebuild 1788 -SHA256 01e49c22074f719a441038c5a1335239acfec33172ad7cd82a8d6c2cd1c8333c commons-jelly-1.0-r1.ebuild 1788 -MISC ChangeLog 1065 RMD160 e8d96a683868aa0bed9279dde4c1a60cccbe970c SHA1 a6cef9dc0e2a2b2b7bbef9795e091dc6c0047ba3 SHA256 23bcd8411ee32d6efd7a10ffd37b130bd66d56226124c4cecaaf1215fb340140 -MD5 d4e29dddfd883c61f8e827967d1c1319 ChangeLog 1065 -RMD160 e8d96a683868aa0bed9279dde4c1a60cccbe970c ChangeLog 1065 -SHA256 23bcd8411ee32d6efd7a10ffd37b130bd66d56226124c4cecaaf1215fb340140 ChangeLog 1065 +EBUILD commons-jelly-1.0-r1.ebuild 1817 RMD160 39c19a93d407cc090b2f188a7d6dfa7e52dbd92e SHA1 902b228a0a3317ba40873422d99ee89169970022 SHA256 121b638a5b85d27a5c4f3e8d6a469b29c7c6ebead527b84d6c2e840668cedcf2 +MD5 d4fa30af9ab2af025c79604f721af827 commons-jelly-1.0-r1.ebuild 1817 +RMD160 39c19a93d407cc090b2f188a7d6dfa7e52dbd92e commons-jelly-1.0-r1.ebuild 1817 +SHA256 121b638a5b85d27a5c4f3e8d6a469b29c7c6ebead527b84d6c2e840668cedcf2 commons-jelly-1.0-r1.ebuild 1817 +MISC ChangeLog 1184 RMD160 10497d6a42b51b7254aba0490617ddef084b4893 SHA1 a79b6c56799f01aa6899d3a92723c18f16db5c52 SHA256 447e2eac7aecc36afdfc69b2501125be62eeb7f8f30d4ed50214a96aa2021c65 +MD5 3ea7d29a54f313834dbd65f03f29fa2d ChangeLog 1184 +RMD160 10497d6a42b51b7254aba0490617ddef084b4893 ChangeLog 1184 +SHA256 447e2eac7aecc36afdfc69b2501125be62eeb7f8f30d4ed50214a96aa2021c65 ChangeLog 1184 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157 @@ -22,9 +22,9 @@ MD5 3744be2052ab79799a9e41563ba89d34 files/digest-commons-jelly-1.0-r1 265 RMD160 038eb778e7c03b78590531801634d23690eaa86d files/digest-commons-jelly-1.0-r1 265 SHA256 f60bf1dba04b835d8f1c15d2a3ca7034489e1364e604ee8f0df384485808529c files/digest-commons-jelly-1.0-r1 265 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.6 (GNU/Linux) +Version: GnuPG v2.0.2 (GNU/Linux) -iD8DBQFFkWYCcxLzpIGCsLQRAtdHAJ9VqiURPxQUqXypU/5Mu0UOJS+CyACfX24T -WFrPZgeQ5krjUW23VafvKdU= -=mfXo +iD8DBQFFzdahcxLzpIGCsLQRArlaAJwKRAta9QH3xFA1+nTbN65icx0DpQCdFGdJ +LfvaxL0AuiUKfRCHtIdLCog= +=+GbK -----END PGP SIGNATURE----- diff --git a/dev-java/commons-jelly/commons-jelly-1.0-r1.ebuild b/dev-java/commons-jelly/commons-jelly-1.0-r1.ebuild index 635a41e8e2d9..4a883b4db870 100644 --- a/dev-java/commons-jelly/commons-jelly-1.0-r1.ebuild +++ b/dev-java/commons-jelly/commons-jelly-1.0-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-jelly/commons-jelly-1.0-r1.ebuild,v 1.3 2006/12/26 18:12:06 betelgeuse Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-jelly/commons-jelly-1.0-r1.ebuild,v 1.4 2007/02/10 14:28:42 betelgeuse Exp $ inherit java-pkg-2 java-ant-2 eutils @@ -32,7 +32,7 @@ RDEPEND=">=virtual/jre-1.4 DEPEND=">=virtual/jdk-1.4 dev-java/ant-core - test? ( dev-java/ant-tasks ) + test? ( dev-java/ant-junit ) ${RDEPEND}" S=${WORKDIR}/${MY_P} @@ -57,13 +57,13 @@ src_compile() { } src_test() { - eant test -Dlibdir=lib + ANT_TASKS="ant-junit" eant test -Dlibdir=lib } src_install() { java-pkg_newjar target/${P}.jar ${PN}.jar - dodoc NOTICE.txt README.txt RELEASE-NOTES.txt + dodoc NOTICE.txt README.txt RELEASE-NOTES.txt || die use doc && java-pkg_dojavadoc dist/docs/api use source && java-pkg_dosrc src/java/* -- 2.26.2