summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlistair Bush <ali_bush@gentoo.org>2011-04-03 07:58:50 +0000
committerAlistair Bush <ali_bush@gentoo.org>2011-04-03 07:58:50 +0000
commit04351fdab5d3fb382e04506358a7a4d317513ed8 (patch)
treee83d9526c700f1ed61d681700f81b36105b8140d /dev-util/eclipse-sdk
parentInstall 99-iscan.rules to /lib/udev instead of /etc/udev. (diff)
downloadhistorical-04351fdab5d3fb382e04506358a7a4d317513ed8.tar.gz
historical-04351fdab5d3fb382e04506358a7a4d317513ed8.tar.bz2
historical-04351fdab5d3fb382e04506358a7a4d317513ed8.zip
Fix for #274545. Thanks to Christoph Brill
Package-Manager: portage-2.1.9.45/cvs/Linux x86_64
Diffstat (limited to 'dev-util/eclipse-sdk')
-rw-r--r--dev-util/eclipse-sdk/ChangeLog7
-rw-r--r--dev-util/eclipse-sdk/Manifest14
-rw-r--r--dev-util/eclipse-sdk/files/3.4/eclipse-3.47
3 files changed, 12 insertions, 16 deletions
diff --git a/dev-util/eclipse-sdk/ChangeLog b/dev-util/eclipse-sdk/ChangeLog
index 10eac770357f..50848005541d 100644
--- a/dev-util/eclipse-sdk/ChangeLog
+++ b/dev-util/eclipse-sdk/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-util/eclipse-sdk
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/eclipse-sdk/ChangeLog,v 1.158 2010/04/13 12:01:54 fauli Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/eclipse-sdk/ChangeLog,v 1.159 2011/04/03 07:58:50 ali_bush Exp $
+
+ 03 Apr 2011; Alistair Bush <ali_bush@gentoo.org> files/3.4/eclipse-3.4:
+ Fix for #274545. Thanks to Christoph Brill
13 Apr 2010; Christian Faulhammer <fauli@gentoo.org>
eclipse-sdk-3.5.1-r1.ebuild:
diff --git a/dev-util/eclipse-sdk/Manifest b/dev-util/eclipse-sdk/Manifest
index b2aea451aa90..d9b606c070b2 100644
--- a/dev-util/eclipse-sdk/Manifest
+++ b/dev-util/eclipse-sdk/Manifest
@@ -1,6 +1,3 @@
------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
@@ -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 3.4/ant-osgi-manifest.mf 3165 RMD160 75444432268c9eef06cd4bb18352b77e426ed116 SHA1 c09dd82dee4708e8726b52569e25da0edda641df SHA256 1df8d7283d6f8fa3d1c3bbbbd832a5fd091f39b52d27d88b131064aeb81ab542
-AUX 3.4/eclipse-3.4 1287 RMD160 aa2b164c3e51d2813f00e1cbcbf3471de3732298 SHA1 f12f6643ffcfe2040c354c81db4d7073c9366906 SHA256 e834ada06a933ab9eb42c78b378b302f2a78150c911b7e6e324e2ccfc3dfcf60
+AUX 3.4/eclipse-3.4 1294 RMD160 c8a70c19abe5e32e57beceac93388b0dfd1b3513 SHA1 a8ab079d828747315916e029e3d9dc909394db40 SHA256 4c55a2bd05a68afcfb63abf78ba96841a6588d538260b05887068c28a145b24b
AUX 3.4/eclipse_String.compareTo.diff 1883 RMD160 e8bec8213808cfc7ee213ce0eeb4fc130da500a2 SHA1 c259d3683df513ac66b7161f5cd452899e654644 SHA256 1b81dcc85230d19419c4535057119bb9d5f4ad1bd59f0a821865e51aaa0a2208
AUX 3.4/eclipse_build-libs.diff 2054 RMD160 0d74a889ecfb10d62e7cb20bad73c956e8225503 SHA1 3c570014221537debd8ac568d7ab94da18d8ebb4 SHA256 ce181b5dd7dc47bbb60b965c0241b126a4b5edfdddae762596ed882fdbd637bf
AUX 3.4/eclipse_buildfix-pde.diff 470 RMD160 f5868f6da880e6e930051893cba3e4277e927fb5 SHA1 f6ca5a75a40cff1d132af2b0d32367de744d4c62 SHA256 99450b348f6d41a489adfd51e1132f640eb8c43dfc4e9dd8e026aec66b41e30a
@@ -36,12 +33,5 @@ DIST eclipse-sourceBuild-srcIncluded-3.4.zip 105671901 RMD160 91b93c4f1538efe984
EBUILD eclipse-sdk-3.4-r2.ebuild 12539 RMD160 12af53e986db8e3f54b443e59e0f7f86485e245d SHA1 c788d6c79f25b5d501433fb94d6e44bdfa44164a SHA256 00fef63546ffead238b27f62c6e1b4c86831f457e9091c2f82a30e26e80f4e87
EBUILD eclipse-sdk-3.5.1-r1.ebuild 11121 RMD160 3ab643ae3a37097924a1247ba81ee116acb17865 SHA1 e50b14d529c35f3044fc40e0fd1563c900d65acb SHA256 835551954a7568abb6f5acf883332b91f53450d9f2a73bea94e2e8ca1a4f0f38
EBUILD eclipse-sdk-3.5.1.ebuild 10826 RMD160 3204307eefc4f34439a9781525829f50e9f9dbc0 SHA1 a0901493e7795f6eaa0b51b39a99fbf2a025ca40 SHA256 2ed865dbd5a534db81d9b4b13c22dc6cb2324c608a7401f37b872850ce741009
-MISC ChangeLog 30970 RMD160 d72844fb14a772a797e15dcf21191c0a8a2174e5 SHA1 466a76e0b0643648277869dc4a65c6691759d20d SHA256 921090047a671d6e938e0db5e4cd74122ed038175a5a75890049ca1236b3793a
+MISC ChangeLog 31093 RMD160 31470584b8e493057f703d93b71c26d08a35a80b SHA1 7d926a8caf8784753792709385164f4f9b4d0035 SHA256 7ef1eb105fbd1f6be1792e8ced0489050849858171c3efaaae77aa0daa2435cc
MISC metadata.xml 800 RMD160 f97cc4ac78898369a7706331bb14bc838519cf21 SHA1 21cd52a15acb6510aa3b955f78fb28a73cf58234 SHA256 76e243573c28c3d705f54745cfbcedd85dae3233b6ed00e2f81a61ac9caeeeaa
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iEYEARECAAYFAkvEXTgACgkQNQqtfCuFnePjnACgjR5ZcJuruo5uptVPNnqGNhBL
-IwsAnRRmjOZ8OaVin3rgmvtVg9MSw9vG
-=PoB2
------END PGP SIGNATURE-----
diff --git a/dev-util/eclipse-sdk/files/3.4/eclipse-3.4 b/dev-util/eclipse-sdk/files/3.4/eclipse-3.4
index 30beb7736ecc..c7dba1c94d8c 100644
--- a/dev-util/eclipse-sdk/files/3.4/eclipse-3.4
+++ b/dev-util/eclipse-sdk/files/3.4/eclipse-3.4
@@ -27,8 +27,11 @@ if [ $(id -u) -eq 0 ] ; then
exit -1
fi
-[[ "$(java-config -f)" =~ "gcj" ]] \
- && export JAVA_PKG_CLASSMAP="${ECLIPSE_HOME}/eclipse.gcjdb"
+case "$(java-config -f)" in
+ *gcj*)
+ export JAVA_PKG_CLASSMAP="${ECLIPSE_HOME}/eclipse.gcjdb"
+ ;;
+esac
eval $(gjl --package "swt-${SLOT}" --get-args)