summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Chvatal <scarabeus@gentoo.org>2009-04-28 14:36:20 +0000
committerTomas Chvatal <scarabeus@gentoo.org>2009-04-28 14:36:20 +0000
commitbb4084c6c44d3846eb5f1b41fe09103237caa0c8 (patch)
tree9829e100827581a31476c55854672d3235698629 /kde-base
parentsh stable (diff)
downloadgentoo-2-bb4084c6c44d3846eb5f1b41fe09103237caa0c8.tar.gz
gentoo-2-bb4084c6c44d3846eb5f1b41fe09103237caa0c8.tar.bz2
gentoo-2-bb4084c6c44d3846eb5f1b41fe09103237caa0c8.zip
Remove unused patch file.
(Portage version: 2.2_rc31/cvs/Linux x86_64)
Diffstat (limited to 'kde-base')
-rw-r--r--kde-base/kdebase-startkde/ChangeLog6
-rw-r--r--kde-base/kdebase-startkde/files/gentoo-startkde.patch50
2 files changed, 5 insertions, 51 deletions
diff --git a/kde-base/kdebase-startkde/ChangeLog b/kde-base/kdebase-startkde/ChangeLog
index 47e16cc5e496..1f880e51686d 100644
--- a/kde-base/kdebase-startkde/ChangeLog
+++ b/kde-base/kdebase-startkde/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for kde-base/kdebase-startkde
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-startkde/ChangeLog,v 1.156 2009/04/17 06:15:10 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-startkde/ChangeLog,v 1.157 2009/04/28 14:36:20 scarabeus Exp $
+
+ 28 Apr 2009; Tomas Chvatal <scarabeus@gentoo.org>
+ -files/gentoo-startkde.patch:
+ Remove unused patch file.
17 Apr 2009; Alexey Shvetsov <alexxy@gentoo.org> kdebase-startkde-4.2.2,
kdebase-startkde-4.2.2-r1:
diff --git a/kde-base/kdebase-startkde/files/gentoo-startkde.patch b/kde-base/kdebase-startkde/files/gentoo-startkde.patch
deleted file mode 100644
index e2f73172127e..000000000000
--- a/kde-base/kdebase-startkde/files/gentoo-startkde.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-diff --git a/startkde.cmake b/startkde.cmake
-index ea2f4f2..7be9831 100755
---- a/startkde.cmake
-+++ b/startkde.cmake
-@@ -2,11 +2,45 @@
- #
- # DEFAULT KDE STARTUP SCRIPT ( @KDE_VERSION_STRING@ )
- #
-+# vim: set filetype=sh :
-
- # When the X server dies we get a HUP signal from xinit. We must ignore it
- # because we still need to do some cleanup.
- trap 'echo GOT SIGHUP' HUP
-
-+# Gentoo: setup environment, filter other slotted KDE installs from PATH
-+export KDEDIR=@REPLACE_PREFIX@
-+export KDEDIRS=/usr:/usr/local:${KDEDIR}
-+export PATH=${KDEDIR}/bin:$(echo ${PATH} | sed 's#/usr/kde/[^/]*/s\?bin:##g')
-+export ROOTPATH=${KDEDIR}/sbin:${KDEDIR}/bin:$(echo ${PATH} | sed 's#/usr/kde/[^/]*/s\?bin:##g')
-+export LDPATH=@REPLACE_LIBS@:${LDPATH}
-+
-+# Gentoo: Handle the ~/.kde symlink to ~/.kde$(version)
-+# This is needed to sanely mix multiple slotted KDE versions,
-+# without hosing settings of an older KDE version.
-+[ -e "$HOME/.kde$(basename $KDEDIR)" ] || mkdir "$HOME/.kde$(basename $KDEDIR)"
-+if [ -z "$HOME" ]; then
-+ xmessage "HOME is unset. Your user config seems to be broken. Aborting."
-+ exit 1
-+elif [ ! -d "$HOME/.kde$(basename $KDEDIR)" ]; then
-+ xmessage "$HOME/.kde$(basename $KDEDIR) exists but is not a dir. Aborting."
-+ exit 1
-+elif [ -n "$KDEHOME" ]; then
-+ xmessage "You've set $KDEHOME manually. This script currently does not support a non-standard location for $KDEHOME. Please unset it and use the standard." > /dev/null 2>/dev/null
-+ exit 1
-+elif [ -L "$HOME/.kde" ]; then
-+ rm "$HOME/.kde"
-+ ln -sf ".kde$(basename $KDEDIR)" "$HOME/.kde"
-+elif [ ! -e "$HOME/.kde" ]; then
-+ ln -s ".kde$(basename $KDEDIR)" "$HOME/.kde"
-+elif [ -d "$HOME/.kde" ]; then
-+ xmessage "~/.kde is not a symlink. Please move ~/.kde to ~/.kde3.5 (if appropriate) and symlink ~/.kde to it." > /dev/null 2>/dev/null
-+ exit 1
-+else
-+ xmessage "~/.kde is not a symlink or a dir. Make it a symlink to .kde$(basename $KDEDIR) or remove it." > /dev/null 2>/dev/null
-+ exit 1
-+fi
-+
- # Check if a KDE session already is running
- if kcheckrunning >/dev/null 2>&1; then
- echo "KDE seems to be already running on this display."