Make ebuild work when commons-collections installs more than one jar.

Package-Manager: portage-2.1.2.7

3 files changed, 28 insertions, 15 deletions

diff --git a/dev-java/commons-validator/ChangeLog b/dev-java/commons-validator/ChangeLog
index 40754249210f..1361780992cc 100644
--- a/dev-java/commons-validator/ChangeLog
+++ b/dev-java/commons-validator/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/commons-validator
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-validator/ChangeLog,v 1.39 2007/05/07 15:44:07 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-validator/ChangeLog,v 1.40 2007/05/17 20:25:30 betelgeuse Exp $
+
+  17 May 2007; Petteri Räty <betelgeuse@gentoo.org>
+  commons-validator-1.1.4-r1.ebuild:
+  Make ebuild work when commons-collections installs more than one jar.
 
   07 May 2007; Vlastimil Babka <caster@gentoo.org>
   commons-validator-1.1.4-r1.ebuild:
diff --git a/dev-java/commons-validator/Manifest b/dev-java/commons-validator/Manifest
index bb8e4a5b7dab..5124c9d7a401 100644
--- a/dev-java/commons-validator/Manifest
+++ b/dev-java/commons-validator/Manifest
@@ -1,13 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST commons-validator-1.1.4-gentoo-missingfiles.tar.bz2 4161 RMD160 cde4c6187078fbae86d0d05ccd2d15561efcf55c SHA1 c50c5e0c6c864e9c21a75e3553449a513098014a SHA256 40e6ec6f1856e2340bf86f331d4a628c0045f025645ba79dc2ce660132fab1bc
 DIST commons-validator-1.1.4-src.tar.gz 181446 RMD160 d9067980087e963083f96506319fb5f1a53549dd SHA1 1f8230619d30afe7c03e9fbd19eb0e9f2dfe1003 SHA256 02a46f9f3cd654d68471a62094b3bf1edc26f43e7fd4a2174fbcd30d49676844
-EBUILD commons-validator-1.1.4-r1.ebuild 2072 RMD160 2f9cd2b70bc7105c9d1d5018081568a591c2355a SHA1 f93e45101c57e0963715cd24d9ae3be348252661 SHA256 e0c96c586359a113d65f308d1b7fb7fa243b07d4fe65537e09c4427822a08be0
-MD5 dac934f9adf83cdddd82e1ad5ae7b078 commons-validator-1.1.4-r1.ebuild 2072
-RMD160 2f9cd2b70bc7105c9d1d5018081568a591c2355a commons-validator-1.1.4-r1.ebuild 2072
-SHA256 e0c96c586359a113d65f308d1b7fb7fa243b07d4fe65537e09c4427822a08be0 commons-validator-1.1.4-r1.ebuild 2072
-MISC ChangeLog 6386 RMD160 cbba9089c4a1397e66eaa39e3646ce0d818526e1 SHA1 c9938cc1b4348740562cc973f4941d3b9ac6d2c6 SHA256 2d4128614e64fd5e79ff592dd76a49f591872ac5fbef966d20b7ba652411ca89
-MD5 52641464f7cc078c742c6c17cea38b99 ChangeLog 6386
-RMD160 cbba9089c4a1397e66eaa39e3646ce0d818526e1 ChangeLog 6386
-SHA256 2d4128614e64fd5e79ff592dd76a49f591872ac5fbef966d20b7ba652411ca89 ChangeLog 6386
+EBUILD commons-validator-1.1.4-r1.ebuild 2065 RMD160 b0c076dbfc23c28c5b5297ea680c988850ef43df SHA1 19a7c0abfc8db675f750a25f34f17b9e9320d258 SHA256 782c5c9356282dbee9661a2371490cdc44ab3d8b10d36e6af9a52cf142c14364
+MD5 03aa4689dd2b6fcb3248579e8cda0a85 commons-validator-1.1.4-r1.ebuild 2065
+RMD160 b0c076dbfc23c28c5b5297ea680c988850ef43df commons-validator-1.1.4-r1.ebuild 2065
+SHA256 782c5c9356282dbee9661a2371490cdc44ab3d8b10d36e6af9a52cf142c14364 commons-validator-1.1.4-r1.ebuild 2065
+MISC ChangeLog 6553 RMD160 832f2781732cfe80a5b173eeb2a4c0ddfebd2775 SHA1 f662f3969648f1334f32ad32b0e6618622aa1bbd SHA256 0a9e1325105b02c2c7bc7079e46f5738157f884ac00a0d88e74cf69361125fa8
+MD5 dcfa8ce9280817d3b75e2543e231104c ChangeLog 6553
+RMD160 832f2781732cfe80a5b173eeb2a4c0ddfebd2775 ChangeLog 6553
+SHA256 0a9e1325105b02c2c7bc7079e46f5738157f884ac00a0d88e74cf69361125fa8 ChangeLog 6553
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157
@@ -15,3 +18,10 @@ SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 metadata
 MD5 ec112b32d55b7a6f301d8dc4cfbebd1b files/digest-commons-validator-1.1.4-r1 611
 RMD160 42e07d238ccdb64148025b4fbbb11942a584a27d files/digest-commons-validator-1.1.4-r1 611
 SHA256 4be65ab793d05def54d7f185ab41e065fd57b9aebde653b21c86542f5a427713 files/digest-commons-validator-1.1.4-r1 611
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.3 (GNU/Linux)
+
+iD8DBQFGTLo7cxLzpIGCsLQRAowPAJ0Wno6JQXWxO+FxFGhN4/LFsSbkKwCfWYHc
+l4VFoEQZPjF8pfuipox3X70=
+=yIOw
+-----END PGP SIGNATURE-----
diff --git a/dev-java/commons-validator/commons-validator-1.1.4-r1.ebuild b/dev-java/commons-validator/commons-validator-1.1.4-r1.ebuild
index c6397f65c066..fdf61577b69a 100644
--- a/dev-java/commons-validator/commons-validator-1.1.4-r1.ebuild
+++ b/dev-java/commons-validator/commons-validator-1.1.4-r1.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-validator/commons-validator-1.1.4-r1.ebuild,v 1.7 2007/05/07 15:44:07 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-validator/commons-validator-1.1.4-r1.ebuild,v 1.8 2007/05/17 20:25:30 betelgeuse Exp $
 
 JAVA_PKG_IUSE="doc examples source"
 inherit java-pkg-2 java-ant-2
@@ -44,14 +44,13 @@ src_unpack() {
 src_compile() {
 	local antflags="compile"
 
-	# Because the build.xml file uses <pathelement location=""> 
+	# Because the build.xml file uses <pathelement location="">
 	# we can only have only have one jar per property
 	antflags="${antflags} -Dcommons-logging.jar=$(java-pkg_getjar commons-logging commons-logging.jar)"
-	antflags="${antflags} -Dcommons-collections.jar=$(java-pkg_getjars commons-collections)"
 
-	use doc && antflags="${antflags} javadoc"
-
-	eant ${antflags} || die "build failed"
+	local col=$(java-pkg_getjar commons-collections	commons-collections.jar)
+	eant ${antflags} $(use_doc) \
+		-Dcommons-collections.jar="${col}" || die "build failed"
 	jar -cf ${PN}.jar -C target/classes/ . || die "could not create jar"
 }