summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexey Shvetsov <alexxy@gentoo.org>2009-06-04 13:56:48 +0000
committerAlexey Shvetsov <alexxy@gentoo.org>2009-06-04 13:56:48 +0000
commit5a13ccd21de0abab5282365a5070ba7229e9b098 (patch)
tree0793ec455fa77a823da333d1bf4faf15ecd53b10 /kde-base/kdebase-startkde/files
parentFix variable test. Thx to salnx per forums for the fix. (diff)
downloadhistorical-5a13ccd21de0abab5282365a5070ba7229e9b098.tar.gz
historical-5a13ccd21de0abab5282365a5070ba7229e9b098.tar.bz2
historical-5a13ccd21de0abab5282365a5070ba7229e9b098.zip
Version bump KDE 4.2.4
Package-Manager: portage-2.2_rc33/cvs/Linux x86_64 RepoMan-Options: --force
Diffstat (limited to 'kde-base/kdebase-startkde/files')
-rw-r--r--kde-base/kdebase-startkde/files/gentoo-startkde4.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/kde-base/kdebase-startkde/files/gentoo-startkde4.patch b/kde-base/kdebase-startkde/files/gentoo-startkde4.patch
index 816bda1840a2..f1ccc92a43c8 100644
--- a/kde-base/kdebase-startkde/files/gentoo-startkde4.patch
+++ b/kde-base/kdebase-startkde/files/gentoo-startkde4.patch
@@ -4,12 +4,12 @@ diff -Naur kdebase-startkde-4.2.0-orig/startkde.cmake kdebase-startkde-4.2.0/sta
@@ -7,6 +7,37 @@
# 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')
-+ export XDG_CONFIG_DIRS=${_KDEDIR}/etc/xdg
++ export XDG_CONFIG_DIRS=${_KDEDIR}/etc/xdg:${XDG_CONFIG_DIRS}
+fi
+@REPLACE_LDPATH@
+export STRIGI_PLUGIN_PATH="${_KDEDIR}/@REPLACE_LIBDIR@/strigi:${STRIGI_PLUGIN_PATH}"
@@ -42,7 +42,7 @@ diff -Naur kdebase-startkde-4.2.0-orig/startkde.cmake kdebase-startkde-4.2.0/sta
@@ -214,6 +243,13 @@
done
done
-
+
+# Gentoo part for FHS installs
+if [ "${_KDEDIR}" = "/usr" ]; then
+ for file in "/etc/kde/startup/"*.sh; do
@@ -56,7 +56,7 @@ diff -Naur kdebase-startkde-4.2.0-orig/startkde.cmake kdebase-startkde-4.2.0/sta
@@ -427,6 +463,13 @@
done
done
-
+
+# Gentoo part for FHS installs
+if [ "${_KDEDIR}" = "/usr" ]; then
+ for file in "/etc/kde/shutdown/"*.sh; do