summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiroslav Šulc <fordfrog@gentoo.org>2009-05-08 16:49:26 +0000
committerMiroslav Šulc <fordfrog@gentoo.org>2009-05-08 16:49:26 +0000
commitb277a045d3e9e2077c8800378f8305d8a3f6cbd9 (patch)
tree864cc07077503284ba85af5183db6bd4e3e35ab8 /dev-util/netbeans
parentwhitespace (diff)
downloadhistorical-b277a045d3e9e2077c8800378f8305d8a3f6cbd9.tar.gz
historical-b277a045d3e9e2077c8800378f8305d8a3f6cbd9.tar.bz2
historical-b277a045d3e9e2077c8800378f8305d8a3f6cbd9.zip
netbeans-6.7_beta-r4: Fixed bug #268969 (thx Martin von Gagern <Martin.vGagern@gmx.net> for testing the solution)
Package-Manager: portage-2.1.6.13/cvs/Linux x86_64
Diffstat (limited to 'dev-util/netbeans')
-rw-r--r--dev-util/netbeans/ChangeLog7
-rw-r--r--dev-util/netbeans/Manifest4
-rw-r--r--dev-util/netbeans/netbeans-6.7_beta-r4.ebuild10
3 files changed, 16 insertions, 5 deletions
diff --git a/dev-util/netbeans/ChangeLog b/dev-util/netbeans/ChangeLog
index 2e60b77470f9..6e4729825f5f 100644
--- a/dev-util/netbeans/ChangeLog
+++ b/dev-util/netbeans/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for dev-util/netbeans
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/netbeans/ChangeLog,v 1.110 2009/05/03 22:42:14 fordfrog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/netbeans/ChangeLog,v 1.111 2009/05/08 16:49:26 fordfrog Exp $
+
+ 08 May 2009; Miroslav Šulc <fordfrog@gentoo.org>
+ netbeans-6.7_beta-r4.ebuild:
+ Fixed bug #268969 (thx Martin von Gagern <Martin.vGagern@gmx.net> for
+ testing the solution)
*netbeans-6.7_beta-r4 (03 May 2009)
diff --git a/dev-util/netbeans/Manifest b/dev-util/netbeans/Manifest
index 0cf5bd573cc8..5a1f56f3c28d 100644
--- a/dev-util/netbeans/Manifest
+++ b/dev-util/netbeans/Manifest
@@ -24,6 +24,6 @@ DIST netbeans-c++-5_5_1-linux.bin 9247744 RMD160 56c91ab483207b1d90554049263a2f2
EBUILD netbeans-3.6-r1.ebuild 3140 RMD160 ccfc3af6a20cad06d1a41965ea607322ff123cd9 SHA1 26281fb533e287171dc8d9408e63b4e8d8b9a646 SHA256 94a9463eb85659b0a3d224a4e7e1d071125f55c2d361db6a32221391a46746bb
EBUILD netbeans-5.5.1-r1.ebuild 15127 RMD160 4197f51f7ea021f28b52baab5e14e3c339a3a61b SHA1 c820a49082aa073b5515d8ea204fee24df054040 SHA256 6ef719e19de09aff5e02fd21de7c065f68f75084e5e6d2368f25ff0d3c6c78fd
EBUILD netbeans-6.5-r4.ebuild 39591 RMD160 aeda3cbba875f25e1223bf5ccac8aa937bc910db SHA1 6ca138e59d05bbf9c98fde6d9fb359f4bb2974cf SHA256 faf9d88505cae8d9b098a2501cb36eaf9d7490db5fbc56f1c293778939d1ff66
-EBUILD netbeans-6.7_beta-r4.ebuild 41246 RMD160 799dcbea298a7ac6680fc315fe9613b1779c0272 SHA1 7cf13967a464fcf744cc402cb910383743669193 SHA256 364689b9d8a68d90626b0ca2b2759573d861190c77c6729dfec3afb897cc0e07
-MISC ChangeLog 19878 RMD160 8488505ebd755aa1f797cce0f9b6436af88f7a88 SHA1 92561481aca8566b43ad980c815fbd24b713229a SHA256 d212ca244ab1dfec49c924ddc36004b80b15a175893c3f96da5354b81aa5cf3f
+EBUILD netbeans-6.7_beta-r4.ebuild 41326 RMD160 5e3b6c6510d4db252284388374c8559aa7266466 SHA1 07715863b74a3ede9141533b2d64fb07d1416ab0 SHA256 d6e3613f0dff46221536ba287bf14d057a1701b2e3d47a4fae6a13662dd13369
+MISC ChangeLog 20058 RMD160 708ce236ace86148cf99506a94ca6b7a69b3b6aa SHA1 eaf07649063f00d416490e8d5e55ebfdd009a0f9 SHA256 b28921ab21db90ce4a944991c5ac5f7acca15f54a468e3f1576819ba7d2fe35c
MISC metadata.xml 1301 RMD160 1e12597c731e35626197ed6ff4efc2094aa12e61 SHA1 8b0614fb5db9568c8b489908d62fcafc9b636f84 SHA256 14d98dfb63646fb6bc7d433f9626ffa7801ff1de38535167f9b0528dac0182a9
diff --git a/dev-util/netbeans/netbeans-6.7_beta-r4.ebuild b/dev-util/netbeans/netbeans-6.7_beta-r4.ebuild
index d2a7d39fc398..b2fe838cc37a 100644
--- a/dev-util/netbeans/netbeans-6.7_beta-r4.ebuild
+++ b/dev-util/netbeans/netbeans-6.7_beta-r4.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/netbeans/netbeans-6.7_beta-r4.ebuild,v 1.1 2009/05/03 22:42:14 fordfrog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/netbeans/netbeans-6.7_beta-r4.ebuild,v 1.2 2009/05/08 16:49:26 fordfrog Exp $
EAPI="2"
WANT_SPLIT_ANT="true"
@@ -595,7 +595,13 @@ src_compile() {
java-pkg_filter-compiler ecj-3.2 ecj-3.3 ecj-3.4
# Build the clusters
- ANT_TASKS="ant-nodeps ant-trax" ANT_OPTS="-Xmx1g -Djava.awt.headless=true" \
+ local heap=""
+ if use doc ; then
+ heap="-Xmx1536m"
+ else
+ heap="-Xmx1g"
+ fi
+ ANT_TASKS="ant-nodeps ant-trax" ANT_OPTS="${heap} -Djava.awt.headless=true" \
eant ${antflags} ${clusters} -f nbbuild/build.xml ${build_target} $(use_doc build-javadoc)
local locales=""