diff options
| author |   Petteri Räty <betelgeuse@gentoo.org> | 2008-12-01 21:50:17 +0000 |
|---|---|---|
| committer | Petteri Räty <betelgeuse@gentoo.org> | 2008-12-01 21:50:17 +0000 |
| commit | 05482823d3939a80cb8d54ba4bd3958ff77c10ef (patch) | |
| tree | 4dcdc76d811549a37d81a2271098d0b28d88a2a4 /dev-java/cocoon | |
| parent | Marking lv-4.51-r1 ppc64 for bug 243734 (diff) | |
| download | gentoo-2-05482823d3939a80cb8d54ba4bd3958ff77c10ef.tar.gz gentoo-2-05482823d3939a80cb8d54ba4bd3958ff77c10ef.tar.bz2 gentoo-2-05482823d3939a80cb8d54ba4bd3958ff77c10ef.zip | |
Fix javadoc installation and raise memory limit. Fixes bug #245006. Thanks to Daniel Solano <gentoo@sattvik.com>.
(Portage version: 2.1.6_rc2/cvs/Linux 2.6.27-gentoo-r2 i686)
Diffstat (limited to 'dev-java/cocoon')
| -rw-r--r-- | dev-java/cocoon/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-java/cocoon/cocoon-2.1.11.ebuild | 14 |
2 files changed, 12 insertions, 8 deletions
diff --git a/dev-java/cocoon/ChangeLog b/dev-java/cocoon/ChangeLog index 5b7c9e50e3ef..c0fe0ace2f1f 100644 --- a/dev-java/cocoon/ChangeLog +++ b/dev-java/cocoon/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-java/cocoon # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/cocoon/ChangeLog,v 1.14 2008/09/13 22:55:01 caster Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/cocoon/ChangeLog,v 1.15 2008/12/01 21:50:17 betelgeuse Exp $ + + 01 Dec 2008; Petteri Räty <betelgeuse@gentoo.org> cocoon-2.1.11.ebuild: + Fix javadoc installation and raise memory limit. Fixes bug #245006. Thanks + to Daniel Solano <gentoo@sattvik.com>. 13 Sep 2008; Vlastimil Babka <caster@gentoo.org> -files/cocoon.properties, -files/web.xml, -cocoon-2.1.6.ebuild: diff --git a/dev-java/cocoon/cocoon-2.1.11.ebuild b/dev-java/cocoon/cocoon-2.1.11.ebuild index a7f0a8216240..65ed291ed84b 100644 --- a/dev-java/cocoon/cocoon-2.1.11.ebuild +++ b/dev-java/cocoon/cocoon-2.1.11.ebuild @@ -1,9 +1,8 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/cocoon/cocoon-2.1.11.ebuild,v 1.1 2008/07/13 10:54:47 nelchael Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/cocoon/cocoon-2.1.11.ebuild,v 1.2 2008/12/01 21:50:17 betelgeuse Exp $ JAVA_PKG_IUSE="doc" -WANT_ANT_TASKS="" inherit java-pkg-2 java-ant-2 @@ -16,8 +15,7 @@ SLOT="0" KEYWORDS="~x86 ~ppc ~amd64" IUSE="" -DEPEND=">=virtual/jdk-1.5 - >=dev-java/ant-core-1.5.3" +DEPEND=">=virtual/jdk-1.5" RDEPEND=">=virtual/jre-1.5" # I know this way of building cocoon is not the best, it will be fixed for @@ -36,6 +34,7 @@ src_unpack() { echo "exclude.webapp.idldocs=true" >> local.build.properties fi java-ant_bsfix_files tools/targets/*-build.xml + sed -i -e 's/maxmemory="192m"/maxmemory="384m"/' tools/src/blocks-build.xsl } src_compile() { @@ -55,11 +54,12 @@ src_install() { doins "${S}/lib/${i}"/* done - dodoc CREDITS.txt INSTALL.txt KEYS README.txt + dodoc CREDITS.txt INSTALL.txt KEYS README.txt || die + + use doc && java-pkg_dojavadoc build/cocoon/javadocs + docinto legal dodoc legal/* - - use doc && java-pkg_dojavadoc build/webapp/api } pkg_postinst() { |