diff options
| author |   Alistair Bush <ali_bush@gentoo.org> | 2010-03-03 08:50:53 +0000 |
|---|---|---|
| committer | Alistair Bush <ali_bush@gentoo.org> | 2010-03-03 08:50:53 +0000 |
| commit | 83d459c5121bc33b0df984a57a38a98b3559c805 (patch) | |
| tree | 214fe0a7619ef02cde9e6134b904d197311facd1 /dev-util/eclipse-sdk | |
| parent | Mask dev-lang/squeak wrt #247363. (diff) | |
| download | historical-83d459c5121bc33b0df984a57a38a98b3559c805.tar.gz historical-83d459c5121bc33b0df984a57a38a98b3559c805.tar.bz2 historical-83d459c5121bc33b0df984a57a38a98b3559c805.zip | |
Make shell script POSIX compliant. Thanks for patch from Michał Górny <gentoo@mgorny.alt.pl>
Package-Manager: portage-2.1.7.17/cvs/Linux x86_64
Diffstat (limited to 'dev-util/eclipse-sdk')
| -rw-r--r-- | dev-util/eclipse-sdk/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-util/eclipse-sdk/Manifest | 4 | ||||
| -rw-r--r-- | dev-util/eclipse-sdk/files/3.5/eclipse-3.5 | 17 |
3 files changed, 17 insertions, 10 deletions
diff --git a/dev-util/eclipse-sdk/ChangeLog b/dev-util/eclipse-sdk/ChangeLog index 5b81674750e9..a9cadbbf6343 100644 --- a/dev-util/eclipse-sdk/ChangeLog +++ b/dev-util/eclipse-sdk/ChangeLog @@ -1,6 +1,10 @@ # 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.151 2010/02/09 10:57:02 ali_bush Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/eclipse-sdk/ChangeLog,v 1.152 2010/03/03 08:50:52 ali_bush Exp $ + + 03 Mar 2010; Alistair Bush <ali_bush@gentoo.org> files/3.5/eclipse-3.5: + Make shell script POSIX compliant. Thanks for patch from Michał Górny + <gentoo@mgorny.alt.pl> 09 Feb 2010; Alistair Bush <ali_bush@gentoo.org> +files/3.5/jvmarg.patch, eclipse-sdk-3.5.1.ebuild: diff --git a/dev-util/eclipse-sdk/Manifest b/dev-util/eclipse-sdk/Manifest index 927af3e7b668..20f24d57eeb2 100644 --- a/dev-util/eclipse-sdk/Manifest +++ b/dev-util/eclipse-sdk/Manifest @@ -20,7 +20,7 @@ AUX 3.4/eclipse_buildfix-pde.diff 470 RMD160 f5868f6da880e6e930051893cba3e4277e9 AUX 3.4/eclipserc 1001 RMD160 a008502defce8739022f3e4333cde1fb7f3de0f5 SHA1 b712b8b53e27214b0b51f01206b6252c9ef4ab9c SHA256 c1d66404893b11b5c4d743a974a61277508c5d3fcec0aad96f50f620d42c6191 AUX 3.4/fedora/eclipse-libupdatebuild2.patch 722 RMD160 6baa55ab7545f02e808ed05c901f77fb1d6709d4 SHA1 29f86a88e8ddc048e1fb4206a73824b2a4ed742d SHA256 ba7af44c1751b749591a53cb2c80852ef08f2f003917a5914042937e2d05b464 AUX 3.4/fedora/eclipse-pde.build-add-package-build.patch 11604 RMD160 ba63781fa77452e4c36eae7e07d81b7d39f5ec29 SHA1 7ee30f8fc2732125e1f2ba01038922d995b21456 SHA256 d361930896c940c09a7faf41f2c8d7843d56be9b90391e91538890062e5d7803 -AUX 3.5/eclipse-3.5 1532 RMD160 7d8abf8f2e1e1905c30bc38a56256ac1764d2061 SHA1 d31aead8603c96c37187eb4058c3b0d511e5b5c1 SHA256 cdb73e02303da8a6cd64028e110becaaf72a466faef932c66b2bff5b5dcf5fc7 +AUX 3.5/eclipse-3.5 1541 RMD160 f0625c1244ef52395d0f6e6fa9d30b4b7f5e647d SHA1 e553e7cff17cbd00e736ff2b5ff5ec36ca2b3121 SHA256 487cd70af50cefc7efd96f97168e87f525fb03e4483af95a24d939c4a209ba6d AUX 3.5/eclipserc-3.5 858 RMD160 f911438aa661be9ca8fc352dd372c9485d163ddb SHA1 abb1c369326be455d16bc42cf0a1b035aa145dc0 SHA256 0aea733c968ca064ad5ca95d5895778ecf7387826198b512e98d0cbb7dd353f1 AUX 3.5/jvmarg.patch 425 RMD160 89398d74090b98533733048b487d957f5ea2c843 SHA1 fe3e6fefbcfadac1c07765ab62bee9b910493962 SHA256 d7f71fb8415232c8a3d681244a5c78e858044e52398ded0062645a9e1ebdf335 AUX eclipse-3.2 1152 RMD160 6d7a2d67e1aa0fd011d056d2b287dc7196528b44 SHA1 3562c650d4e41f5186b396d31630c2faa7c132a9 SHA256 5f10f1cbae578c394e98b5d380c0d4f362620e7ff87fa3bde226e5533d34b8cf @@ -30,5 +30,5 @@ DIST eclipse-build-R0_4_0.tar.gz 164001 RMD160 c110ad217473c002aed5791547d9c18f9 DIST eclipse-sourceBuild-srcIncluded-3.4.zip 105671901 RMD160 91b93c4f1538efe98471c2f9ee9ccd6ff081816c SHA1 c3200eca6b51147e2c00f7da09ca1f45160fd08e SHA256 df829822473886aa62b15d9f95654f88e868634fb1b78ce0b12c550b85054e93 EBUILD eclipse-sdk-3.4-r2.ebuild 12539 RMD160 12af53e986db8e3f54b443e59e0f7f86485e245d SHA1 c788d6c79f25b5d501433fb94d6e44bdfa44164a SHA256 00fef63546ffead238b27f62c6e1b4c86831f457e9091c2f82a30e26e80f4e87 EBUILD eclipse-sdk-3.5.1.ebuild 10826 RMD160 3204307eefc4f34439a9781525829f50e9f9dbc0 SHA1 a0901493e7795f6eaa0b51b39a99fbf2a025ca40 SHA256 2ed865dbd5a534db81d9b4b13c22dc6cb2324c608a7401f37b872850ce741009 -MISC ChangeLog 29877 RMD160 cedf6390c629675ff002610161f915b0de0749a5 SHA1 5d0b1546c393b4fcdacd86f417c8108085b23560 SHA256 9739936c9683c299b82a1b3317f80772eda167bebabb28dea16af1bfa6b2a731 +MISC ChangeLog 30051 RMD160 f538f35140bf9ef714d7cefea4e83698274e4528 SHA1 08a50f538e62f946e3aec24ad5db2351f2f41c80 SHA256 86a2ff946ceaa26709abe21840406b78d7cc7ac96e9d30c31b5ecc0230080669 MISC metadata.xml 800 RMD160 f97cc4ac78898369a7706331bb14bc838519cf21 SHA1 21cd52a15acb6510aa3b955f78fb28a73cf58234 SHA256 76e243573c28c3d705f54745cfbcedd85dae3233b6ed00e2f81a61ac9caeeeaa diff --git a/dev-util/eclipse-sdk/files/3.5/eclipse-3.5 b/dev-util/eclipse-sdk/files/3.5/eclipse-3.5 index c1be21de4df8..f50a51ad629d 100644 --- a/dev-util/eclipse-sdk/files/3.5/eclipse-3.5 +++ b/dev-util/eclipse-sdk/files/3.5/eclipse-3.5 @@ -11,24 +11,27 @@ SLOT="3.5" -[ -f "/etc/eclipserc-${SLOT}" ] && source "/etc/eclipserc-${SLOT}" -[ -f "$HOME/gentoo/.eclipserc" ] && source "$HOME/gentoo/.eclipserc" +[ -f "/etc/eclipserc-${SLOT}" ] && . "/etc/eclipserc-${SLOT}" +[ -f "$HOME/gentoo/.eclipserc" ] && . "$HOME/gentoo/.eclipserc" ECLIPSE_HOME=${ECLIPSE_HOME:="/usr/lib/eclipse-${SLOT}"} ECLIPSE_BIN="${ECLIPSE_HOME}/eclipse" if [ ! -x "${ECLIPSE_BIN}" ] ; then echo "Failed to find executable '${ECLIPSE_BIN}'" > /dev/stderr - exit -1 + exit 1 fi if [ $(id -u) -eq 0 ] ; then - echo "Do not run eclipse as root user! Exiting ..." - exit -1 + echo "Do not run eclipse as root user! Exiting ..." > /dev/stderr + 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) |