summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVlastimil Babka <caster@gentoo.org>2008-04-17 08:43:39 +0000
committerVlastimil Babka <caster@gentoo.org>2008-04-17 08:43:39 +0000
commit5b86f54a3e71bb374f0114b0961cd5d1737b5393 (patch)
tree3789966075a4f451a009f257bdcf234d012ffa7f /dev-util/eclipse-sdk
parentunrar new snapshot (diff)
downloadgentoo-2-5b86f54a3e71bb374f0114b0961cd5d1737b5393.tar.gz
gentoo-2-5b86f54a3e71bb374f0114b0961cd5d1737b5393.tar.bz2
gentoo-2-5b86f54a3e71bb374f0114b0961cd5d1737b5393.zip
Add 1.6.0.06 to the workaround in startup scripts for bug #215150. No revbump, remerge eclipse if you hit the bug.
(Portage version: 2.1.5_rc3)
Diffstat (limited to 'dev-util/eclipse-sdk')
-rw-r--r--dev-util/eclipse-sdk/ChangeLog7
-rw-r--r--dev-util/eclipse-sdk/files/3.3/eclipse-3.3-r12
-rw-r--r--dev-util/eclipse-sdk/files/eclipse-3.2-r12
3 files changed, 8 insertions, 3 deletions
diff --git a/dev-util/eclipse-sdk/ChangeLog b/dev-util/eclipse-sdk/ChangeLog
index 011232cd8c85..502720a435ac 100644
--- a/dev-util/eclipse-sdk/ChangeLog
+++ b/dev-util/eclipse-sdk/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for dev-util/eclipse-sdk
# Copyright 2003-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/eclipse-sdk/ChangeLog,v 1.143 2008/04/10 19:40:25 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/eclipse-sdk/ChangeLog,v 1.144 2008/04/17 08:43:37 caster Exp $
+
+ 17 Apr 2008; Vlastimil Babka <caster@gentoo.org> files/eclipse-3.2-r1,
+ files/3.3/eclipse-3.3-r1:
+ Add 1.6.0.06 to the workaround in startup scripts for bug #215150. No
+ revbump, remerge eclipse if you hit the bug.
10 Apr 2008; Markus Meier <maekke@gentoo.org> eclipse-sdk-3.2.1-r3.ebuild:
amd64/x86 stable, bug #215150
diff --git a/dev-util/eclipse-sdk/files/3.3/eclipse-3.3-r1 b/dev-util/eclipse-sdk/files/3.3/eclipse-3.3-r1
index 26a50e86dae6..5f8c89fbdf1b 100644
--- a/dev-util/eclipse-sdk/files/3.3/eclipse-3.3-r1
+++ b/dev-util/eclipse-sdk/files/3.3/eclipse-3.3-r1
@@ -36,7 +36,7 @@ if [[ "${ECLIPSE_MAX_PERMSIZE}" ]]; then VM_ARGS="${VM_ARGS} -XX:MaxPermSize=${E
# workaround for bug #215150
if [[ $(java-config -f) == sun-jdk-1.6 || $(java-config -f) == sun-jre-bin-1.6 ]]; then
- if [[ $(java-config -g VERSION) == *1.6.0.04 || $(java-config -g VERSION) == *1.6.0.05 ]]; then
+ if [[ $(java-config -g VERSION) == *1.6.0.06 || $(java-config -g VERSION) == *1.6.0.05 || $(java-config -g VERSION) == *1.6.0.04 ]]; then
echo "Performing workaround for bug #215150"
VM_ARGS="${VM_ARGS} -XX:CompileCommand=exclude,org/eclipse/core/internal/dtree/DataTreeNode,forwardDeltaWith"
fi
diff --git a/dev-util/eclipse-sdk/files/eclipse-3.2-r1 b/dev-util/eclipse-sdk/files/eclipse-3.2-r1
index 5aca928c25f0..466cc3f62691 100644
--- a/dev-util/eclipse-sdk/files/eclipse-3.2-r1
+++ b/dev-util/eclipse-sdk/files/eclipse-3.2-r1
@@ -35,7 +35,7 @@ fi
# workaround for bug #215150
if [[ $(java-config -f) == sun-jdk-1.6 || $(java-config -f) == sun-jre-bin-1.6 ]]; then
- if [[ $(java-config -g VERSION) == *1.6.0.04 || $(java-config -g VERSION) == *1.6.0.05 ]]; then
+ if [[ $(java-config -g VERSION) == *1.6.0.06 || $(java-config -g VERSION) == *1.6.0.05 || $(java-config -g VERSION) == *1.6.0.04 ]]; then
echo "Performing workaround for bug #215150"
VM_ARGS="${VM_ARGS} -XX:CompileCommand=exclude,org/eclipse/core/internal/dtree/DataTreeNode,forwardDeltaWith"
fi