diff options
author | Tomas Chvatal <scarabeus@gentoo.org> | 2010-08-10 13:02:43 +0000 |
---|---|---|
committer | Tomas Chvatal <scarabeus@gentoo.org> | 2010-08-10 13:02:43 +0000 |
commit | 692f51548647da804fb6609a456a4f80ee19e3c0 (patch) | |
tree | 5394509ce1a86bb7eb57de7e5ecda8bda7ec753f /kde-base/kdebase-startkde/files | |
parent | Drop unused patch. (diff) | |
download | gentoo-2-692f51548647da804fb6609a456a4f80ee19e3c0.tar.gz gentoo-2-692f51548647da804fb6609a456a4f80ee19e3c0.tar.bz2 gentoo-2-692f51548647da804fb6609a456a4f80ee19e3c0.zip |
Drop unused patch.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'kde-base/kdebase-startkde/files')
-rw-r--r-- | kde-base/kdebase-startkde/files/gentoo-startkde4-1.patch | 67 |
1 files changed, 0 insertions, 67 deletions
diff --git a/kde-base/kdebase-startkde/files/gentoo-startkde4-1.patch b/kde-base/kdebase-startkde/files/gentoo-startkde4-1.patch deleted file mode 100644 index 652f76c0fefd..000000000000 --- a/kde-base/kdebase-startkde/files/gentoo-startkde4-1.patch +++ /dev/null @@ -1,67 +0,0 @@ -diff -Naur kdebase-startkde-4.2.0-orig/startkde.cmake kdebase-startkde-4.2.0/startkde.cmake ---- kdebase-startkde-4.2.0-orig/startkde.cmake 2009-01-17 05:00:28.000000000 -0600 -+++ kdebase-startkde-4.2.0/startkde.cmake 2009-02-21 12:52:02.000000000 -0600 -@@ -7,6 +7,35 @@ - # because we still need to do some cleanup. - trap 'echo GOT SIGHUP' HUP - -+_KDEDIR=@REPLACE_PREFIX@ -+if [ "$_KDEDIR" != "/usr" ]; then -+ 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') -+fi -+@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') -+ -+if [ -z "$HOME" ]; then -+ xmessage "HOME is unset. Your user config seems to be broken. Aborting." -+ exit 1 -+fi -+ -+# 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 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." -+ exit 1 -+ fi -+fi -+ - # Check if a KDE session already is running and whether it's possible to connect to X - kcheckrunning - kcheckrunning_result=$? -@@ -214,6 +243,13 @@ - done - done - -+# Gentoo part for FHS installs -+if [ "${_KDEDIR}" = "/usr" ]; then -+ for file in "/etc/kde/startup/"*.sh; do -+ test -r "${file}" && . "${file}" -+ done -+fi -+ - # Set the path for Qt plugins provided by KDE - if test -n "$QT_PLUGIN_PATH"; then - QT_PLUGIN_PATH="$QT_PLUGIN_PATH:`kde4-config --path qtplugins`" -@@ -427,6 +463,13 @@ - done - done - -+# Gentoo part for FHS installs -+if [ "${_KDEDIR}" = "/usr" ]; then -+ for file in "/etc/kde/shutdown/"*.sh; do -+ test -r "${file}" && . "${file}" -+ done -+fi -+ - unset KDE_FULL_SESSION - xprop -root -remove KDE_FULL_SESSION - unset KDE_SESSION_VERSION |