Make the ebuild work when commons-collections installs multiple jars.

Package-Manager: portage-2.1.2.7

3 files changed, 19 insertions, 15 deletions

diff --git a/dev-java/struts/ChangeLog b/dev-java/struts/ChangeLog
index d5861bb299e4..ef7572cf2a2e 100644
--- a/dev-java/struts/ChangeLog
+++ b/dev-java/struts/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/struts
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/struts/ChangeLog,v 1.33 2007/05/17 20:09:57 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/struts/ChangeLog,v 1.34 2007/05/17 20:38:39 betelgeuse Exp $
+
+  17 May 2007; Petteri Räty <betelgeuse@gentoo.org> struts-1.1-r5.ebuild:
+  Make the ebuild work when commons-collections installs multiple jars.
 
   17 May 2007; Petteri Räty <betelgeuse@gentoo.org> -struts-1.1-r4.ebuild:
   Remove generation 1 ebuild.
diff --git a/dev-java/struts/Manifest b/dev-java/struts/Manifest
index aade6aedad3c..c8573a6265b9 100644
--- a/dev-java/struts/Manifest
+++ b/dev-java/struts/Manifest
@@ -3,18 +3,18 @@ Hash: SHA1
 
 DIST jakarta-struts-1.1-src.tar.gz 9944708 RMD160 92ba28d9505fce58f8082f6c531ad901d3b87308 SHA1 641a3a7d2a9076ec1acfb5f3c2e86e1f831e89fd SHA256 f0b24f40a038d92fabd861f39978d81795e630462c4d2970922f085d92a664e7
 DIST struts-1.2.9-src.tar.gz 5754377 RMD160 da420cc0991a3f9056005d977ce1c46325aa9ea9 SHA1 2f461536eab7246c7ef3d647b142860b19bfd99d SHA256 7354437d04b666fc6d302b0fd14a3bb971a6389085d9f7a5ea4b25eed289400e
-EBUILD struts-1.1-r5.ebuild 2251 RMD160 8f29490e817bf3be0a10615cffd39efbccdbaf97 SHA1 3b84d6a51a468c5c815c654e45e73acc2f2f1d29 SHA256 dba12830f3e65e2bd2c922525d00cf942e54f582ec3f6f6d5ea0dc17044e8045
-MD5 c47087d65bc91ee4bd773dbc01d2256f struts-1.1-r5.ebuild 2251
-RMD160 8f29490e817bf3be0a10615cffd39efbccdbaf97 struts-1.1-r5.ebuild 2251
-SHA256 dba12830f3e65e2bd2c922525d00cf942e54f582ec3f6f6d5ea0dc17044e8045 struts-1.1-r5.ebuild 2251
+EBUILD struts-1.1-r5.ebuild 2289 RMD160 59c5556ff79be04788fe24e080a3fecd1f8dd1f0 SHA1 72d05f1b066b1713a47d6791eef6290524fc8c7b SHA256 27fb4a8211621f1c84cd2d0f518ea236acb15f986db354b8405d2bc229dab0ac
+MD5 beb81edc21db015c40921014cf4884c5 struts-1.1-r5.ebuild 2289
+RMD160 59c5556ff79be04788fe24e080a3fecd1f8dd1f0 struts-1.1-r5.ebuild 2289
+SHA256 27fb4a8211621f1c84cd2d0f518ea236acb15f986db354b8405d2bc229dab0ac struts-1.1-r5.ebuild 2289
 EBUILD struts-1.2.9-r1.ebuild 2655 RMD160 a388ca106bbeb4358a96bf5a64c4ac09cc3f8070 SHA1 9e13f6ae6f1cfe8dcc7d282833b1e100cb1f0d7c SHA256 fee2ef6d732c229c6abcd2fa4bc8c62b3daf4270b969792f06402fc37a58b75c
 MD5 68890a7ab78bcd0f68e03d18cf327009 struts-1.2.9-r1.ebuild 2655
 RMD160 a388ca106bbeb4358a96bf5a64c4ac09cc3f8070 struts-1.2.9-r1.ebuild 2655
 SHA256 fee2ef6d732c229c6abcd2fa4bc8c62b3daf4270b969792f06402fc37a58b75c struts-1.2.9-r1.ebuild 2655
-MISC ChangeLog 5616 RMD160 888aeb03832b18c93dfe21b5b42990f2ad61cc96 SHA1 a9fd1cbc7eb275b851229c09b20d88eb4dc901bd SHA256 a1e83966fb8783bff933dbb30dadde6546be57ebde9d9eba79dd0dc0bc0e3741
-MD5 0a855e2ac24f5c2c686999067dd41183 ChangeLog 5616
-RMD160 888aeb03832b18c93dfe21b5b42990f2ad61cc96 ChangeLog 5616
-SHA256 a1e83966fb8783bff933dbb30dadde6546be57ebde9d9eba79dd0dc0bc0e3741 ChangeLog 5616
+MISC ChangeLog 5764 RMD160 86c23b80a8c1971afbbaeb68922b855071b56dae SHA1 a6d92aabfeb61985423a594aa1e8c9a68031f419 SHA256 06b6f912e9c61ee4e6a8a8b3ffb5f428b205839cd6fd88a8521bafbf3861ccf7
+MD5 83344f76be191ba93fdc08e7d887ccb7 ChangeLog 5764
+RMD160 86c23b80a8c1971afbbaeb68922b855071b56dae ChangeLog 5764
+SHA256 06b6f912e9c61ee4e6a8a8b3ffb5f428b205839cd6fd88a8521bafbf3861ccf7 ChangeLog 5764
 MISC metadata.xml 446 RMD160 cef996f6ba3e4f162c7c3cb01f767fbf140fb77c SHA1 23aa61ce80aba8d36a44ab8b5716d2f938736f94 SHA256 ec0f1085c4de877f6864625a8a5d94aa7fb8589d1329c3113600210770e65c33
 MD5 78a33d5e50bccb529dda947894c83d5d metadata.xml 446
 RMD160 cef996f6ba3e4f162c7c3cb01f767fbf140fb77c metadata.xml 446
@@ -28,7 +28,7 @@ SHA256 43e79b85ca106a5e434d5781e616ac42d843ad950aa24c25912455e10625a365 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFGTLaWcxLzpIGCsLQRAm5HAJ0YqU/WYkt53hGqAITLpk8iiJKeqwCffLGS
-ddqh3ZzAtgxWFHgK/beLso0=
-=1k04
+iD8DBQFGTL1QcxLzpIGCsLQRAgSAAJ9plbepjIiyEVajiAxGkRV1dYJBwwCfd9Lg
+bFIeZ3hOA7hfGuKN9Vw3ZjA=
+=XPTO
 -----END PGP SIGNATURE-----
diff --git a/dev-java/struts/struts-1.1-r5.ebuild b/dev-java/struts/struts-1.1-r5.ebuild
index 17009a8177b2..48ef8cbe21f1 100644
--- a/dev-java/struts/struts-1.1-r5.ebuild
+++ b/dev-java/struts/struts-1.1-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/struts/struts-1.1-r5.ebuild,v 1.1 2007/04/28 23:50:26 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/struts/struts-1.1-r5.ebuild,v 1.2 2007/05/17 20:38:39 betelgeuse Exp $
 
 WANT_ANT_TASKS="ant-trax"
 JAVA_PKG_IUSE="doc source"
@@ -33,7 +33,8 @@ S=${WORKDIR}/jakarta-${P}-src
 src_compile() {
 	local antflags="compile.library"
 	antflags="${antflags} -Dcommons-beanutils.jar=$(java-pkg_getjar commons-beanutils-1.6 commons-beanutils.jar)"
-	antflags="${antflags} -Dcommons-collections.jar=$(java-pkg_getjars commons-collections)"
+	antflags="${antflags} -Dcommons-collections.jar=$(java-pkg_getjar \
+		commons-collections commons-collections.jar)"
 	antflags="${antflags} -Dstruts-legacy.jar=$(java-pkg_getjars struts-legacy)"
 	antflags="${antflags} -Dcommons-digester.jar=$(java-pkg_getjars commons-digester)"
 	antflags="${antflags} -Dcommons-fileupload.jar=$(java-pkg_getjars commons-fileupload)"
@@ -53,7 +54,7 @@ src_install() {
 	insinto /usr/share/${PN}-${SLOT}/lib
 	doins target/library/*.tld
 
-	dodoc README STATUS
+	dodoc README STATUS || die
 	use doc && java-pkg_dojavadoc target/documentation/api
 	use source && java-pkg_dosrc src/*/*
 }