Added patches.

(Portage version: 2.1.4)

3 files changed, 89 insertions, 1 deletions

diff --git a/kde-base/kdebase/ChangeLog b/kde-base/kdebase/ChangeLog
index 925ef2d1033b..1bbaa2bebd4a 100644
--- a/kde-base/kdebase/ChangeLog
+++ b/kde-base/kdebase/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdebase
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/ChangeLog,v 1.412 2008/01/17 23:44:32 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/ChangeLog,v 1.413 2008/01/18 00:12:20 philantrop Exp $
+
+  18 Jan 2008; Wulf C. Krueger <philantrop@gentoo.org>
+  +files/kdebase-4.0.0-pam-optional.patch, +files/gentoo-startkde.patch:
+  Added patches.
 
 *kdebase-4.0.0 (17 Jan 2008)
 
diff --git a/kde-base/kdebase/files/gentoo-startkde.patch b/kde-base/kdebase/files/gentoo-startkde.patch
new file mode 100644
index 000000000000..2aa30b943fc7
--- /dev/null
+++ b/kde-base/kdebase/files/gentoo-startkde.patch
@@ -0,0 +1,55 @@
+    Added a patch to KDE/kdebase/workspace/startkde.cmake to start kde the gentoo way.
+---
+ kdebase/workspace/startkde.cmake |   31 +++++++++++++++++++++++++++++++
+ 1 files changed, 31 insertions(+), 0 deletions(-)
+
+diff --git a/kdebase/workspace/startkde.cmake b/kdebase/workspace/startkde.cmake
+index ea2f4f2..438e4e8 100755
+--- a/kdebase/workspace/startkde.cmake
++++ b/kdebase/workspace/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."
diff --git a/kde-base/kdebase/files/kdebase-4.0.0-pam-optional.patch b/kde-base/kdebase/files/kdebase-4.0.0-pam-optional.patch
new file mode 100644
index 000000000000..6fb54f05c547
--- /dev/null
+++ b/kde-base/kdebase/files/kdebase-4.0.0-pam-optional.patch
@@ -0,0 +1,29 @@
+diff --git a/kdebase/workspace/cmake/modules/FindPAM.cmake b/kdebase/workspace/cmake/modules/FindPAM.cmake
+index 3499836..cd1c2bb 100644
+--- a/kdebase/workspace/cmake/modules/FindPAM.cmake
++++ b/kdebase/workspace/cmake/modules/FindPAM.cmake
+@@ -5,6 +5,8 @@
+ #  PAM_INCLUDE_DIR - the pam include directory
+ #  PAM_LIBRARIES - libpam library
+ 
++if (WITH_PAM)
++
+ if (PAM_INCLUDE_DIR AND PAM_LIBRARY)
+ 	# Already in cache, be silent
+ 	set(PAM_FIND_QUIETLY TRUE)
+@@ -72,3 +74,5 @@ else (PAM_FOUND)
+ endif (PAM_FOUND)
+ 
+ mark_as_advanced(PAM_INCLUDE_DIR PAM_LIBRARY DL_LIBRARY PAM_MESSAGE_CONST)
++
++endif (WITH_PAM)
+diff --git a/kdebase/workspace/cmake/modules/UnixAuth.cmake b/kdebase/workspace/cmake/modules/UnixAuth.cmake
+index ed8ab9e..ce3bcc2 100644
+--- a/kdebase/workspace/cmake/modules/UnixAuth.cmake
++++ b/kdebase/workspace/cmake/modules/UnixAuth.cmake
+@@ -1,4 +1,4 @@
+-find_package(PAM)
++macro_optional_find_package(PAM)
+ 
+ set(UNIXAUTH_LIBRARIES)
+ set(UNIXAUTH_INCLUDE_DIRS)