| 1 |
betelgeuse 08/12/01 21:50:17 |
| 2 |
|
| 3 |
Modified: ChangeLog cocoon-2.1.11.ebuild |
| 4 |
Log: |
| 5 |
Fix javadoc installation and raise memory limit. Fixes bug #245006. Thanks to Daniel Solano <gentoo@×××××××.com>. |
| 6 |
(Portage version: 2.1.6_rc2/cvs/Linux 2.6.27-gentoo-r2 i686) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.15 dev-java/cocoon/ChangeLog |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/cocoon/ChangeLog?rev=1.15&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/cocoon/ChangeLog?rev=1.15&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/cocoon/ChangeLog?r1=1.14&r2=1.15 |
| 14 |
|
| 15 |
Index: ChangeLog |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/dev-java/cocoon/ChangeLog,v |
| 18 |
retrieving revision 1.14 |
| 19 |
retrieving revision 1.15 |
| 20 |
diff -u -r1.14 -r1.15 |
| 21 |
--- ChangeLog 13 Sep 2008 22:55:01 -0000 1.14 |
| 22 |
+++ ChangeLog 1 Dec 2008 21:50:17 -0000 1.15 |
| 23 |
@@ -1,6 +1,10 @@ |
| 24 |
# ChangeLog for dev-java/cocoon |
| 25 |
# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 |
| 26 |
-# $Header: /var/cvsroot/gentoo-x86/dev-java/cocoon/ChangeLog,v 1.14 2008/09/13 22:55:01 caster Exp $ |
| 27 |
+# $Header: /var/cvsroot/gentoo-x86/dev-java/cocoon/ChangeLog,v 1.15 2008/12/01 21:50:17 betelgeuse Exp $ |
| 28 |
+ |
| 29 |
+ 01 Dec 2008; Petteri Räty <betelgeuse@g.o> cocoon-2.1.11.ebuild: |
| 30 |
+ Fix javadoc installation and raise memory limit. Fixes bug #245006. Thanks |
| 31 |
+ to Daniel Solano <gentoo@×××××××.com>. |
| 32 |
|
| 33 |
13 Sep 2008; Vlastimil Babka <caster@g.o> -files/cocoon.properties, |
| 34 |
-files/web.xml, -cocoon-2.1.6.ebuild: |
| 35 |
|
| 36 |
|
| 37 |
|
| 38 |
1.2 dev-java/cocoon/cocoon-2.1.11.ebuild |
| 39 |
|
| 40 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/cocoon/cocoon-2.1.11.ebuild?rev=1.2&view=markup |
| 41 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/cocoon/cocoon-2.1.11.ebuild?rev=1.2&content-type=text/plain |
| 42 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/cocoon/cocoon-2.1.11.ebuild?r1=1.1&r2=1.2 |
| 43 |
|
| 44 |
Index: cocoon-2.1.11.ebuild |
| 45 |
=================================================================== |
| 46 |
RCS file: /var/cvsroot/gentoo-x86/dev-java/cocoon/cocoon-2.1.11.ebuild,v |
| 47 |
retrieving revision 1.1 |
| 48 |
retrieving revision 1.2 |
| 49 |
diff -u -r1.1 -r1.2 |
| 50 |
--- cocoon-2.1.11.ebuild 13 Jul 2008 10:54:47 -0000 1.1 |
| 51 |
+++ cocoon-2.1.11.ebuild 1 Dec 2008 21:50:17 -0000 1.2 |
| 52 |
@@ -1,9 +1,8 @@ |
| 53 |
# Copyright 1999-2008 Gentoo Foundation |
| 54 |
# Distributed under the terms of the GNU General Public License v2 |
| 55 |
-# $Header: /var/cvsroot/gentoo-x86/dev-java/cocoon/cocoon-2.1.11.ebuild,v 1.1 2008/07/13 10:54:47 nelchael Exp $ |
| 56 |
+# $Header: /var/cvsroot/gentoo-x86/dev-java/cocoon/cocoon-2.1.11.ebuild,v 1.2 2008/12/01 21:50:17 betelgeuse Exp $ |
| 57 |
|
| 58 |
JAVA_PKG_IUSE="doc" |
| 59 |
-WANT_ANT_TASKS="" |
| 60 |
|
| 61 |
inherit java-pkg-2 java-ant-2 |
| 62 |
|
| 63 |
@@ -16,8 +15,7 @@ |
| 64 |
KEYWORDS="~x86 ~ppc ~amd64" |
| 65 |
IUSE="" |
| 66 |
|
| 67 |
-DEPEND=">=virtual/jdk-1.5 |
| 68 |
- >=dev-java/ant-core-1.5.3" |
| 69 |
+DEPEND=">=virtual/jdk-1.5" |
| 70 |
RDEPEND=">=virtual/jre-1.5" |
| 71 |
|
| 72 |
# I know this way of building cocoon is not the best, it will be fixed for |
| 73 |
@@ -36,6 +34,7 @@ |
| 74 |
echo "exclude.webapp.idldocs=true" >> local.build.properties |
| 75 |
fi |
| 76 |
java-ant_bsfix_files tools/targets/*-build.xml |
| 77 |
+ sed -i -e 's/maxmemory="192m"/maxmemory="384m"/' tools/src/blocks-build.xsl |
| 78 |
} |
| 79 |
|
| 80 |
src_compile() { |
| 81 |
@@ -55,11 +54,12 @@ |
| 82 |
doins "${S}/lib/${i}"/* |
| 83 |
done |
| 84 |
|
| 85 |
- dodoc CREDITS.txt INSTALL.txt KEYS README.txt |
| 86 |
+ dodoc CREDITS.txt INSTALL.txt KEYS README.txt || die |
| 87 |
+ |
| 88 |
+ use doc && java-pkg_dojavadoc build/cocoon/javadocs |
| 89 |
+ |
| 90 |
docinto legal |
| 91 |
dodoc legal/* |
| 92 |
- |
| 93 |
- use doc && java-pkg_dojavadoc build/webapp/api |
| 94 |
} |
| 95 |
|
| 96 |
pkg_postinst() { |
Archives