Add 1.6.0.06 to the workaround in startup scripts for bug #215150. No revbump, remerge eclipse if you hit the bug.

Package-Manager: portage-2.1.5_rc3

4 files changed, 11 insertions, 16 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/Manifest b/dev-util/eclipse-sdk/Manifest
index 4b89370c5194..a2a6fd99d46d 100644
--- a/dev-util/eclipse-sdk/Manifest
+++ b/dev-util/eclipse-sdk/Manifest
@@ -1,12 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 3.3/ant-osgi-manifest.mf 3165 RMD160 75444432268c9eef06cd4bb18352b77e426ed116 SHA1 c09dd82dee4708e8726b52569e25da0edda641df SHA256 1df8d7283d6f8fa3d1c3bbbbd832a5fd091f39b52d27d88b131064aeb81ab542
 AUX 3.3/disable-jdk6.diff 8875 RMD160 c14a9721c61b392cd3f57c9893afd0d0148a31ed SHA1 a9c55df75f28d4d09474c10a0df19c6797145d56 SHA256 46987a38e7394b2831915861946226b99fcbff607130ed9430f8e655cb97e64a
 AUX 3.3/disable-jdt-tool.diff 6111 RMD160 fcc8c0891d4fdd22ab8a8a2c90bf77b0cd1419eb SHA1 e7ac7fd9948774f16978f49d88c107c06abd6972 SHA256 cbffbc7e5c167b0d890d4f790280acb515b07734641e8737f17487757bdcc4cf
 AUX 3.3/disable-swt.diff 16961 RMD160 442d769aa58a06032f79ac1bd38324e5d743f33b SHA1 2b271daa5414403da84c37f6504df47baedda41b SHA256 dfd3092376afdea520287387397f38f1433e872fecce99f80c4e3ffeeff79744
 AUX 3.3/eclipse-3.3 1308 RMD160 2d13c201394446bf3604fa535a7bcbf1719e67d8 SHA1 8767136cf48c409234c1a88fad15a907a4d8e291 SHA256 2f17956b2bf919eae473217936689f70f60db93d7d2e85e958c3026ce8dc4d8f
-AUX 3.3/eclipse-3.3-r1 1693 RMD160 dec72f67651f9d2e9bb80f3b664130e3e94be6cc SHA1 aef22039453af57e0f560f51b1a296c4802a30c7 SHA256 4c5be4eb84f0b8b4710b04d7ab65286ddfbd1191cda406dc3e554ed8ab843e7d
+AUX 3.3/eclipse-3.3-r1 1735 RMD160 e1cb827402ab3ddad07b1a199b69759a31347b3f SHA1 379f407c1b03e4bc87b5a5a81ebe799e38b01e39 SHA256 8a2467ddc626c107d270efec5a9a272f840d07bd18145bb1fede0ac649d84592
 AUX 3.3/eclipse-jsch-api-update.patch 554 RMD160 7f45812032eeb0aed10ab8cffd5d9b4633032b3f SHA1 43d1caaf0369253a5a3b4159216e9cc49efa3ede SHA256 33616660eed6b57fcd7a3df040d86d93e7912d47bf4c690c17e844f4ad361b14
 AUX 3.3/eclipse-workbench-miscompile-workaround.diff 629 RMD160 a122e199f769147df84772e557ce719a531abfd2 SHA1 e5ad09c6c4a18747ac787258bc8041636c5e2aa4 SHA256 4ef77f3e0967731eb53561780285488fd32eebac8d8cdee39508ba2d157c3434
 AUX 3.3/eclipserc 858 RMD160 f911438aa661be9ca8fc352dd372c9485d163ddb SHA1 abb1c369326be455d16bc42cf0a1b035aa145dc0 SHA256 0aea733c968ca064ad5ca95d5895778ecf7387826198b512e98d0cbb7dd353f1
@@ -16,7 +13,7 @@ AUX 3.3/fedora/eclipse-pde.build-add-package-build.patch 11604 RMD160 ba63781fa7
 AUX 3.3/launcher_double-free.diff 340 RMD160 4574222833a92c9611bcb2a346d01b0fb406d39a SHA1 50d78fc4ca2f3ed935644f132a53bdf7b1b71ead SHA256 6af7bdc0ccd9d0fcfcfdc7f979bb947d1334065c551551213a2c47074626cc9c
 AUX 3.3/set-java-home.diff 417 RMD160 f4ec180dfad9c81e41f91cad562739a2d9198239 SHA1 d837d67cae0dcb0c1604e8756d7492043662d647 SHA256 6e0627318ab5249d16cbb1d42eb245c614298bccdaa8e36fcc2a0a290222b6e9
 AUX eclipse-3.2 1152 RMD160 6d7a2d67e1aa0fd011d056d2b287dc7196528b44 SHA1 3562c650d4e41f5186b396d31630c2faa7c132a9 SHA256 5f10f1cbae578c394e98b5d380c0d4f362620e7ff87fa3bde226e5533d34b8cf
-AUX eclipse-3.2-r1 1562 RMD160 f11a8dfb60fd0533226af0b37c826b006e4c252a SHA1 1dba908097505b0b56d9a01c823ed3334a17f875 SHA256 8f90e02d4921b7a0b621aad7dc0b71f58f533c8c178ffbde743c03a36d868122
+AUX eclipse-3.2-r1 1604 RMD160 ebc7ff4eb6b776e653d23fc7934690f1c782185e SHA1 e538c6d2454b977acf2b706636ac3db77b06b1ee SHA256 35ff6dc5124e8f868ae5fd9493fcb3c75d5f52fda30d5c50238dfc42e3ecbc7a
 DIST eclipse-sdk-3.2.1-r1-patches.tar.bz2 85951 RMD160 55a0f98229feb47d936acbcdcf7ad42074ebdb5c SHA1 4af81d8615dbfbd771136c441ee8a7b53096b468 SHA256 fa9f8d047d8375ab55eaca12c110bd9faf9eb5452af2a70d038afd5a6b4b5171
 DIST eclipse-sourceBuild-srcIncluded-3.2.1.zip 82433420 RMD160 9648176b79adac7217371e5b8dee7aeb4cd458db SHA1 a27bae4ff9f866a1fab995eae2da00ab2be5e840 SHA256 2d6a0628333d068b6ab678c42f925d71df1c003035543830a30e3ee80fb855c7
 DIST eclipse-sourceBuild-srcIncluded-3.3.1.1.zip 94267330 RMD160 78d19b528e99c3f3416de099ab5dcd59430fc9ac SHA1 901f4c66acf4c988fc08f78f3ffcd45b3748b344 SHA256 e4c24d54a2b9bc630f961320c61f8e804255f49b141370d240ce0444eb89a658
@@ -24,12 +21,5 @@ EBUILD eclipse-sdk-3.2.1-r2.ebuild 12774 RMD160 432060d99495abfb5ecdc8bf23820a09
 EBUILD eclipse-sdk-3.2.1-r3.ebuild 12794 RMD160 6c15ed3c5255bbab8ac5678276fff456c790b098 SHA1 341796121de64022d97e6abe9e26119b101c46c3 SHA256 a89756c5e2a04cbe59c2d6bd7d2aa23a8a022f08ab92518071174b8ba443d50d
 EBUILD eclipse-sdk-3.3.1.1-r1.ebuild 12067 RMD160 af6a4cb69fcd8d96ccb80d4ed3a1beaba75ee1d3 SHA1 865f1a39cc2b8978645a58f4d2d38b52b272416f SHA256 fc9b93ad3ef5b87ee15ca66372d5fb4984c26d1dd43de28cdc423c5228a29019
 EBUILD eclipse-sdk-3.3.1.1.ebuild 12044 RMD160 d99d56d8f490ccaa9620f720ed2e19050897e61c SHA1 a5dd5c15d199356d43c2c58e74fc965e65870b6e SHA256 51529185a6754b18a536c19bc34316895be21c33def79517b76260cfd289e6e8
-MISC ChangeLog 28010 RMD160 c035f7a17398edbe88e9c409a35d24c0b0b4fcd8 SHA1 555f91d317875af02fef53dd038e4bb3abd5b971 SHA256 fc7d9a062e37eb565cc9e51ec6b1b5437d471fd56c4d34267dd8bbe8a43e6f45
+MISC ChangeLog 28231 RMD160 f505fcd00e77e8194b398651a4d7110b0405b6ff SHA1 f25ff9e686c2a5f164d978dc80525ef898af84c8 SHA256 8e8439100e6e74e908fd170d0757716b9a557e25d0104c0f4bdb260681606fe5
 MISC metadata.xml 800 RMD160 f97cc4ac78898369a7706331bb14bc838519cf21 SHA1 21cd52a15acb6510aa3b955f78fb28a73cf58234 SHA256 76e243573c28c3d705f54745cfbcedd85dae3233b6ed00e2f81a61ac9caeeeaa
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkf+bVYACgkQkKaRLQcq0GKD0wCgiDIBpc8boTK72RhvF2/LroAj
-nt4AnjXIRNIdEOpnMiNhellCdjL7wV3C
-=V6Bo
------END PGP SIGNATURE-----
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