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 | c9f1d80957817894f3895733f70325668d769413 (patch) | |
| tree | fbd51f331707c85ddcc6ac8b4bf321f4ba5e7bc2 /dev-java/cocoon | |
| parent | Marking lv-4.51-r1 ppc64 for bug 243734 (diff) | |
| download | historical-c9f1d80957817894f3895733f70325668d769413.tar.gz historical-c9f1d80957817894f3895733f70325668d769413.tar.bz2 historical-c9f1d80957817894f3895733f70325668d769413.zip | |
Fix javadoc installation and raise memory limit. Fixes bug #245006. Thanks to Daniel Solano <gentoo@sattvik.com>.
Package-Manager: portage-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/Manifest | 14 | ||||
| -rw-r--r-- | dev-java/cocoon/cocoon-2.1.11.ebuild | 14 |
3 files changed, 24 insertions, 10 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/Manifest b/dev-java/cocoon/Manifest index 146481162085..111651b96971 100644 --- a/dev-java/cocoon/Manifest +++ b/dev-java/cocoon/Manifest @@ -1,4 +1,14 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + DIST cocoon-2.1.11-src.tar.gz 48674390 RMD160 44e65fea097f8cedb4cd0c9f4895017f11810083 SHA1 71b07b6f59eb1df86a87b48924cdf3392e256475 SHA256 4b1d9f8ebd75d6228b3d76802941a8f41bfc0836c21d9d8cab764521c800a60c -EBUILD cocoon-2.1.11.ebuild 1998 RMD160 dae25ba42659957ba500f501cc0ccb4d80e3f016 SHA1 d9e1bce211c8be229a3d84d8e2b5e7db1854a683 SHA256 df7ca93deff6d48d10089cfd0926c9b87805da30d4555b2183350433625cfbd7 -MISC ChangeLog 3611 RMD160 189e821eed775989bdba639175c91d0c5e5ae6ff SHA1 0a116f42bd0eb09ca8750bbeacef2c19f36530ce SHA256 d3324ab58f5332a8a0299ec98457dd6df0aca766df8979567f73abcbf4ade7e1 +EBUILD cocoon-2.1.11.ebuild 2045 RMD160 d07a50a7488c521ecfb64d5d77c9568b3cdb0ed3 SHA1 5d00fb3b1e2483e7d95efb9d3d3d734084884b7f SHA256 fbe6d6c381c4978ec3f4a52212c569bcc00d2d85f74a7ad923fbed9259c10557 +MISC ChangeLog 3809 RMD160 4ddec1868c7863405ce10bc6ec2b0dc1e19e75e7 SHA1 b509a0c153604b96b1b87eeb92d73a7fc0c7dac4 SHA256 2ced2c1e6ffbe92d0a3d0c39ac10324282b0664cce3bd36c8025d07c050a4e04 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.9 (GNU/Linux) + +iEYEARECAAYFAkk0XCgACgkQcxLzpIGCsLT91ACfaw8bkc5ykSQ62MSEhN0Q8LVI +PZ0AnAgWLDBUuz2sSlcTixcpfbM3zx03 +=fJG8 +-----END PGP SIGNATURE----- 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() { |