Always needs junit and commons-logging to compile. Relaxed commons-jexl dependency for upcoming version bump and cleaned the ebuild.

Package-Manager: portage-2.1.2_rc4-r1

3 files changed, 36 insertions, 26 deletions

diff --git a/dev-java/commons-jelly/ChangeLog b/dev-java/commons-jelly/ChangeLog
index 80a7699e54af..97f643474f99 100644
--- a/dev-java/commons-jelly/ChangeLog
+++ b/dev-java/commons-jelly/ChangeLog
@@ -1,6 +1,11 @@
 # 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.4 2006/11/30 15:30:43 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-jelly/ChangeLog,v 1.5 2006/12/26 18:12:06 betelgeuse Exp $
+
+  26 Dec 2006; Petteri Räty <betelgeuse@gentoo.org>
+  commons-jelly-1.0-r1.ebuild:
+  Always needs junit and commons-logging to compile. Relaxed commons-jexl
+  dependency for upcoming version bump and cleaned the ebuild.
 
   30 Nov 2006; Vlastimil Babka <caster@gentoo.org>
   -commons-jelly-1.0.ebuild, commons-jelly-1.0-r1.ebuild:
diff --git a/dev-java/commons-jelly/Manifest b/dev-java/commons-jelly/Manifest
index c4011ccf6af0..7ecaa1d5fd9e 100644
--- a/dev-java/commons-jelly/Manifest
+++ b/dev-java/commons-jelly/Manifest
@@ -1,16 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX commons-jelly-1.0-gentoo.patch 2224 RMD160 ab9179ac39196b1dbe6fc8f9bffdc498ad363697 SHA1 9509b52e2841561c7ee50ff2bc96884764a4d55b SHA256 0e064c87ae4a2a91f7c98c546e0f3bf9f9ff4caf877e0c2f28a6b3443e6f3533
 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 1898 RMD160 f692169d675ffb1be0dbb35ce5db62638c277afe SHA1 857cc351ce5b568e5f6039db9a76f6df6c681b63 SHA256 0586c7ef99e7210861e23ef0c69c9facb3926f61f89837f45c5e7fdd183e1c66
-MD5 64a0edee5788d4145655c8e0c49a63d5 commons-jelly-1.0-r1.ebuild 1898
-RMD160 f692169d675ffb1be0dbb35ce5db62638c277afe commons-jelly-1.0-r1.ebuild 1898
-SHA256 0586c7ef99e7210861e23ef0c69c9facb3926f61f89837f45c5e7fdd183e1c66 commons-jelly-1.0-r1.ebuild 1898
-MISC ChangeLog 839 RMD160 6c55b312c2bd38e6f68bd4706cde0eec7d6fc112 SHA1 acdd17e857c1042d2ce775641dd368385f1f9aea SHA256 bd5d1faeabdbc743a642dcaa232a376e3202eeea5d0ff4f7cdc7dc5eb9e8f489
-MD5 13cb44dd2d28f933b99c6a750b0f7d1b ChangeLog 839
-RMD160 6c55b312c2bd38e6f68bd4706cde0eec7d6fc112 ChangeLog 839
-SHA256 bd5d1faeabdbc743a642dcaa232a376e3202eeea5d0ff4f7cdc7dc5eb9e8f489 ChangeLog 839
+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
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157
@@ -18,3 +21,10 @@ SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 metadata
 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)
+
+iD8DBQFFkWYCcxLzpIGCsLQRAtdHAJ9VqiURPxQUqXypU/5Mu0UOJS+CyACfX24T
+WFrPZgeQ5krjUW23VafvKdU=
+=mfXo
+-----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 8ac699b3aaaa..635a41e8e2d9 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
 # 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.2 2006/11/30 15:30:43 caster Exp $
+# $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 $
 
 inherit java-pkg-2 java-ant-2 eutils
 
@@ -21,20 +21,18 @@ RDEPEND=">=virtual/jre-1.4
 	dev-java/commons-discovery
 	dev-java/forehead
 	dev-java/jakarta-jstl
-	=dev-java/commons-jexl-1.0*
+	dev-java/commons-jexl
 	=dev-java/commons-beanutils-1.6*
 	dev-java/commons-collections
 	=dev-java/dom4j-1*
 	=dev-java/jaxen-1.1*
-	>=dev-java/xerces-2.7"
+	>=dev-java/xerces-2.7
+	dev-java/junit
+	dev-java/commons-logging"
 
 DEPEND=">=virtual/jdk-1.4
 	dev-java/ant-core
-	test? (
-		dev-java/junit
-		dev-java/ant-tasks
-		dev-java/commons-logging
-	)
+	test? ( dev-java/ant-tasks )
 	${RDEPEND}"
 
 S=${WORKDIR}/${MY_P}
@@ -51,18 +49,15 @@ src_unpack() {
 	java-pkg_jar-from commons-discovery,forehead,jakarta-jstl,commons-jexl-1.0
 	java-pkg_jar-from commons-beanutils-1.6,commons-collections
 	java-pkg_jar-from dom4j-1,jaxen-1.1,xerces-2
-
-	if use test; then
-		java-pkg_jar-from commons-logging
-	fi
+	java-pkg_jar-from commons-logging,junit
 }
 
 src_compile() {
-	local antflags="-Dlibdir=lib jar"
-	use doc && antflags="${antflags} javadoc"
-	use test && antflags="${antflags} test"
+	eant -Dlibdir=lib jar $(use_doc)
+}
 
-	eant ${antflags} || die "Ant failed"
+src_test() {
+	eant test -Dlibdir=lib
 }
 
 src_install() {
@@ -70,6 +65,6 @@ src_install() {
 
 	dodoc NOTICE.txt README.txt RELEASE-NOTES.txt
 
-	use doc && java-pkg_dohtml -r dist/docs/api
+	use doc && java-pkg_dojavadoc dist/docs/api
 	use source && java-pkg_dosrc src/java/*
 }