Fix OOM in javadoc when building with USE=doc. Bug #318323.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/dev-java/batik/ChangeLog b/dev-java/batik/ChangeLog
index 2c0c3dafd19678346c056569a82f86477cbd15ae..46b6ae4c8b3d5a038dcac0bb5873097cb3d73569 100644 (file)
--- a/dev-java/batik/ChangeLog
+++ b/dev-java/batik/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/batik
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/batik/ChangeLog,v 1.63 2009/10/03 20:36:55 caster Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/batik/ChangeLog,v 1.64 2010/05/05 15:07:01 caster Exp $
+
+  05 May 2010; Vlastimil Babka <caster@gentoo.org> batik-1.7-r2.ebuild:
+  Fix OOM in javadoc when building with USE=doc. Bug #318323.
 
   03 Oct 2009; Vlastimil Babka <caster@gentoo.org> -batik-1.6-r3.ebuild,
   -batik-1.6-r4.ebuild, -files/batik-1.6-dont-copy-deps.patch,

diff --git a/dev-java/batik/Manifest b/dev-java/batik/Manifest
index 4725d970ed30ee8c8c71eab3a8ff51d82cb3a571..188dd03b4e8ac8d380fbe260856220d79b39114f 100644 (file)
--- a/dev-java/batik/Manifest
+++ b/dev-java/batik/Manifest
@@ -1,4 +1,4 @@
 DIST batik-src-1.7.zip 15060504 RMD160 aba34d2e0cecf56ef3c79447bbaae2575c4933a1 SHA1 806f57b0200cc755903c2f6f55463f0dd5f6f7d6 SHA256 6bea593543a797561fa83651764e40b1b0ce01c1df21ab0359ade58e967379fd
-EBUILD batik-1.7-r2.ebuild 2384 RMD160 cd16cde284b9d124a26e0410a8858182868f441e SHA1 fcecec38cb1d1fc82be30b6fa00d8efdf551d05d SHA256 c71225b532122faa92218a8a5361bed85a0f975904709a9e4289635be28dd590
-MISC ChangeLog 8538 RMD160 ebe59ef27cec0d6fdd5b32d0141807d12a22b648 SHA1 613483820e2693e70b6bc8d57728ae6203f15408 SHA256 908a93fb3fbdfe893c7236ef7920e33e441240c84b8f937b80f5044cb77bbee7
+EBUILD batik-1.7-r2.ebuild 2557 RMD160 999caafcbc7f6d73c1884cb3d0617ead6cef8b3b SHA1 8e5216906f68ab8b3811e6d1046142eec0f41eb4 SHA256 cc990a0177ff2c34fa338fed5c82564ea753e1f3c6a3e8e678d098babc0996a4
+MISC ChangeLog 8673 RMD160 daa5f5e96e96df2c56aa8f30e9d4a9cda0ef823d SHA1 a8e97a670b5ef22e49c494856edc0444c9d90d44 SHA256 a6b5193ac04e12318c3f4a5cc9cd5357a2d05233e07824555e824a9c781639f9
 MISC metadata.xml 374 RMD160 6d3a700a3b332f27c8e9057336d0cf3a28f59cf1 SHA1 5626acb9b3091acbf59b8d69c0ba46f525ee0ce5 SHA256 f71a7581f22225196ad493f9f6c85e5379e3a62f482059827ae35ab66b834437

diff --git a/dev-java/batik/batik-1.7-r2.ebuild b/dev-java/batik/batik-1.7-r2.ebuild
index 5536f5d1a5f46b6a5e8dbe6f3f9e7fbb6f577c79..d1247b28fd22fe4c57bf89c81dab41f07fc901e6 100644 (file)
--- a/dev-java/batik/batik-1.7-r2.ebuild
+++ b/dev-java/batik/batik-1.7-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/batik/batik-1.7-r2.ebuild,v 1.5 2009/07/19 14:02:16 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/batik/batik-1.7-r2.ebuild,v 1.6 2010/05/05 15:07:01 caster Exp $
 
 EAPI=2
 JAVA_PKG_IUSE="doc"
@@ -30,6 +30,10 @@ RDEPEND=">=virtual/jre-1.4
 java_prepare() {
        java-ant_ignore-system-classes
        java-ant_rewrite-classpath contrib/rasterizertask/build.xml
+       for file in build.xml contrib/rasterizertask/build.xml; do
+               # bug #318323
+               java-ant_xml-rewrite -f ${file} -c -e javadoc -a failonerror -v yes -a maxmemory -v 256g
+       done
 
        cd lib
        rm -v *.jar build/*.jar || die