Added missing file and missing die, bug 371115

(Portage version: 2.1.10.1/cvs/Linux x86_64)

3 files changed, 104 insertions, 3 deletions

diff --git a/kde-base/kdebase-startkde/ChangeLog b/kde-base/kdebase-startkde/ChangeLog
index 060f7a0fee15..eefd278a381d 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-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-startkde/ChangeLog,v 1.236 2011/06/11 06:46:53 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-startkde/ChangeLog,v 1.237 2011/06/11 08:11:43 dilfridge Exp $
+
+  11 Jun 2011; Andreas K. Huettel <dilfridge@gentoo.org> +files/KDE-4,
+  kdebase-startkde-4.6.4.ebuild:
+  Added missing file and missing die, bug 371115
 
   11 Jun 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   +files/gentoo-startkde4-4.patch:
diff --git a/kde-base/kdebase-startkde/files/KDE-4 b/kde-base/kdebase-startkde/files/KDE-4
new file mode 100755
index 000000000000..86a49d88eec8
--- /dev/null
+++ b/kde-base/kdebase-startkde/files/KDE-4
@@ -0,0 +1,97 @@
+#!/bin/sh
+# $XConsortium: Xsession /main/10 1995/12/18 18:21:28 gildea $
+
+# source of this file: x11-apps/xinit-1.3.0-r2
+
+case $# in
+1)
+	case $1 in
+	failsafe)
+		exec xterm -geometry 80x24-0-0
+		;;
+	esac
+esac
+
+# redirect errors to a file in user's home directory if we can
+for errfile in "$HOME/.xsession-errors" "${TMPDIR-/tmp}/xses-$USER" "/tmp/xses-$USER"
+do
+	if ( cp /dev/null "$errfile" 2> /dev/null )
+	then
+		chmod 600 "$errfile"
+		exec > "$errfile" 2>&1
+		break
+	fi
+done
+
+# clean up after xbanner
+if which freetemp 2> /dev/null ; then
+	freetemp
+fi
+
+userresources=$HOME/.Xresources
+usermodmap=$HOME/.Xmodmap
+userxkbmap=$HOME/.Xkbmap
+
+sysresources=/etc/X11/Xresources
+sysmodmap=/etc/X11/Xmodmap
+sysxkbmap=/etc/X11/Xkbmap
+
+rh6sysresources=/etc/X11/xinit/Xresources
+rh6sysmodmap=/etc/X11/xinit/Xmodmap
+
+
+# merge in defaults
+if [ -f "$rh6sysresources" ]; then
+    xrdb -merge "$rh6sysresources"
+fi
+
+if [ -f "$sysresources" ]; then
+    xrdb -merge "$sysresources"
+fi
+
+if [ -f "$userresources" ]; then
+    xrdb -merge "$userresources"
+fi
+
+# merge in keymaps
+if [ -f "$sysxkbmap" ]; then
+    setxkbmap `cat "$sysxkbmap"`
+    XKB_IN_USE=yes
+fi
+
+if [ -f "$userxkbmap" ]; then
+    setxkbmap `cat "$userxkbmap"`
+    XKB_IN_USE=yes
+fi
+
+#
+# Eeek, this seems like too much magic here
+#
+if [ -z "$XKB_IN_USE" -a ! -L /etc/X11/X ]; then
+    if grep '^exec.*/Xsun' /etc/X11/X > /dev/null 2>&1 && [ -f /etc/X11/XF86Config ]; then
+       xkbsymbols=`sed -n -e 's/^[     ]*XkbSymbols[   ]*"\(.*\)".*$/\1/p' /etc/X11/XF86Config`
+       if [ -n "$xkbsymbols" ]; then
+           setxkbmap -symbols "$xkbsymbols"
+           XKB_IN_USE=yes
+       fi
+    fi
+fi
+
+# xkb and xmodmap don't play nice together
+if [ -z "$XKB_IN_USE" ]; then
+    if [ -f "$rh6sysmodmap" ]; then
+       xmodmap "$rh6sysmodmap"
+    fi
+
+    if [ -f "$sysmodmap" ]; then
+       xmodmap "$sysmodmap"
+    fi
+
+    if [ -f "$usermodmap" ]; then
+       xmodmap "$usermodmap"
+    fi
+fi
+
+unset XKB_IN_USE
+
+exec "@GENTOO_PORTAGE_EPREFIX@/usr/bin/startkde"
diff --git a/kde-base/kdebase-startkde/kdebase-startkde-4.6.4.ebuild b/kde-base/kdebase-startkde/kdebase-startkde-4.6.4.ebuild
index 06a604aff34b..25b3f5731cf9 100644
--- a/kde-base/kdebase-startkde/kdebase-startkde-4.6.4.ebuild
+++ b/kde-base/kdebase-startkde/kdebase-startkde-4.6.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-startkde/kdebase-startkde-4.6.4.ebuild,v 1.1 2011/06/10 17:59:53 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-startkde/kdebase-startkde-4.6.4.ebuild,v 1.2 2011/06/11 08:11:43 dilfridge Exp $
 
 EAPI=4
 
@@ -50,7 +50,7 @@ PATCHES=("${FILESDIR}/gentoo-startkde4-4.patch")
 src_prepare() {
 	kde4-meta_src_prepare
 
-	cp "${FILESDIR}/KDE-4" "${T}"
+	cp "${FILESDIR}/KDE-4" "${T}" || die
 
 	# fix ${EPREFIX}
 	eprefixify startkde.cmake "${T}/KDE-4"