diff options
| author |   Petteri Räty <betelgeuse@gentoo.org> | 2007-05-17 20:38:39 +0000 |
|---|---|---|
| committer | Petteri Räty <betelgeuse@gentoo.org> | 2007-05-17 20:38:39 +0000 |
| commit | 69ef4aa9733e2ee5134d8d81637ab780bc117f21 (patch) | |
| tree | c6a5309ef0e0814ec3a5da4c7cd6439a1b320789 /dev-java/struts | |
| parent | Version bump; logic of toolkit USE flags fixed. (diff) | |
| download | gentoo-2-69ef4aa9733e2ee5134d8d81637ab780bc117f21.tar.gz gentoo-2-69ef4aa9733e2ee5134d8d81637ab780bc117f21.tar.bz2 gentoo-2-69ef4aa9733e2ee5134d8d81637ab780bc117f21.zip | |
Make the ebuild work when commons-collections installs multiple jars.
(Portage version: 2.1.2.7)
Diffstat (limited to 'dev-java/struts')
| -rw-r--r-- | dev-java/struts/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-java/struts/struts-1.1-r5.ebuild | 7 |
2 files changed, 8 insertions, 4 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/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/*/* } |