diff options
| author |   Marcus D. Hanwell <cryos@gentoo.org> | 2008-10-04 21:41:18 +0000 |
|---|---|---|
| committer | Marcus D. Hanwell <cryos@gentoo.org> | 2008-10-04 21:41:18 +0000 |
| commit | d160fa0f870fe26d5d33afaa465957375c527c13 (patch) | |
| tree | c57396bdd971ace23de790e4e4719aa447d68631 /kde-base/kdebase-startkde/files | |
| parent | Depends on dev-libs/yaz (#239580) (diff) | |
| download | gentoo-2-d160fa0f870fe26d5d33afaa465957375c527c13.tar.gz gentoo-2-d160fa0f870fe26d5d33afaa465957375c527c13.tar.bz2 gentoo-2-d160fa0f870fe26d5d33afaa465957375c527c13.zip | |
Fixed some problems in the startkde script and removed KDEDIR from it -
no longer required.
Diffstat (limited to 'kde-base/kdebase-startkde/files')
| -rw-r--r-- | kde-base/kdebase-startkde/files/gentoo-startkde4.patch | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/kde-base/kdebase-startkde/files/gentoo-startkde4.patch b/kde-base/kdebase-startkde/files/gentoo-startkde4.patch index 7526e39160b6..d43f51ca0c0b 100644 --- a/kde-base/kdebase-startkde/files/gentoo-startkde4.patch +++ b/kde-base/kdebase-startkde/files/gentoo-startkde4.patch @@ -4,12 +4,12 @@ # because we still need to do some cleanup. trap 'echo GOT SIGHUP' HUP -+export KDEDIR=@REPLACE_PREFIX@ -+export PATH=${KDEDIR}/bin:$(echo ${PATH} | sed 's/$/:/g;s#/usr/kde/[^/]*/s\?bin/\?:##g;s/:$//g') -+export ROOTPATH=${KDEDIR}/sbin:${KDEDIR}/bin:$(echo ${PATH} | sed 's/$/:/g;s#/usr/kde/[^/]*/s\?bin/\?:##g;s/:$//g') ++_KDEDIR=@REPLACE_PREFIX@ ++export PATH=${_KDEDIR}/bin:$(echo ${PATH} | sed 's/$/:/g;s#/usr/kde/[^/]*/s\?bin/\?:##g;s/:$//g') ++export ROOTPATH=${_KDEDIR}/sbin:${_KDEDIR}/bin:$(echo ${PATH} | sed 's/$/:/g;s#/usr/kde/[^/]*/s\?bin/\?:##g;s/:$//g') +@REPLACE_LDPATH@ -+export STRIGI_PLUGIN_PATH="${KDEDIR}/@REPLACE_LIBDIR@/strigi:${STRIGI_PLUGIN_PATH}" -+export XDG_DATA_DIRS=${KDEDIR}/share:$(echo ${XDG_DATA_DIRS} | sed 's/$/:/g;s#/usr/kde/[^/]*/share/\?:##g;s/:$//g') ++export STRIGI_PLUGIN_PATH="${_KDEDIR}/@REPLACE_LIBDIR@/strigi:${STRIGI_PLUGIN_PATH}" ++export XDG_DATA_DIRS=${_KDEDIR}/share:$(echo ${XDG_DATA_DIRS} | sed 's/$/:/g;s#/usr/kde/[^/]*/share/\?:##g;s/:$//g') + +if [ -z "$HOME" ]; then + xmessage "HOME is unset. Your user config seems to be broken. Aborting." @@ -19,14 +19,14 @@ +# Gentoo: handle the possible home directory layout for config directory +# Note that we change the default KDEHOME in kdelibs to .kde4 or .kde${SLOT} +# for -kdeprefix and +kdeprefix respectively. -+if [ "${KDEDIR}" == "/usr" ]; then ++if [ "${_KDEDIR}" == "/usr" ]; then + # If the directory doesn't exist make it + [ -e "${HOME}/.kde4" ] || mkdir "$HOME/.kde4" +else + # Use multiple directories based upon the KDE directory -+ [ -e "$HOME/.kde$(basename $KDEDIR)" ] || mkdir "$HOME/.kde$(basename $KDEDIR)" -+ if [ ! -d "$HOME/.kde$(basename $KDEDIR)" ]; then -+ xmessage "$HOME/.kde$(basename $KDEDIR) exists but is not a dir. Aborting." ++ [ -e "$HOME/.kde$(basename $_KDEDIR)" ] || mkdir "$HOME/.kde$(basename $_KDEDIR)" ++ if [ ! -d "$HOME/.kde$(basename $_KDEDIR)" ]; then ++ xmessage "$HOME/.kde$(basename $_KDEDIR) exists but is not a dir. Aborting." + exit 1 + fi +fi @@ -39,7 +39,7 @@ done +# Gentoo part for FHS installs -+if [ "${KDEDIR}" == "/usr" ]; then ++if [ "${_KDEDIR}" == "/usr" ]; then + for file in "/etc/kde/startup/"*.sh; do + test -r "${file}" && . "${file}" + done @@ -53,7 +53,7 @@ done +# Gentoo part for FHS installs -+if [ "${KDEDIR}" == "/usr" ]; then ++if [ "${_KDEDIR}" == "/usr" ]; then + for file in "/etc/kde/shutdown/"*.sh; do + test -r "${file}" && . "${file}" + done |