[gentoo-commits] proj/kde:master commit in: kde-base/kdebase-startkde/, kde-base/kdebase-startkde/files/

["Andreas K. Huettel" <dilfridge@gentoo.org>]

commit:     6bcb69c64b3e898f5508955a5d9344760ed9ad20
Author:     Andreas K. Huettel (dilfridge) <mail <AT> akhuettel <DOT> de>
AuthorDate: Sat Mar 26 18:31:59 2011 +0000
Commit:     Andreas K. Huettel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Mar 26 18:31:59 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=6bcb69c6

[kde-base/kdebase-startkde] Added session startup file from xinit with minor modifications. Please test.

(Portage version: 2.1.9.44/git/Linux x86_64, signed Manifest commit with key B6C5F7DE)

---
 kde-base/kdebase-startkde/files/sessionfile        |   96 ++++++++++++++++++++
 ...999.ebuild => kdebase-startkde-4.6.1-r2.ebuild} |    6 +-
 .../kdebase-startkde-4.6.9999.ebuild               |    4 +-
 .../kdebase-startkde/kdebase-startkde-9999.ebuild  |    4 +-
 4 files changed, 103 insertions(+), 7 deletions(-)

diff --git a/kde-base/kdebase-startkde/files/sessionfile b/kde-base/kdebase-startkde/files/sessionfile
new file mode 100755
index 0000000..bab47c2
--- /dev/null
+++ b/kde-base/kdebase-startkde/files/sessionfile
@@ -0,0 +1,96 @@
+#!/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
+

diff --git a/kde-base/kdebase-startkde/kdebase-startkde-4.6.9999.ebuild b/kde-base/kdebase-startkde/kdebase-startkde-4.6.1-r2.ebuild
similarity index 95%
copy from kde-base/kdebase-startkde/kdebase-startkde-4.6.9999.ebuild
copy to kde-base/kdebase-startkde/kdebase-startkde-4.6.1-r2.ebuild
index 013a898..e98f87d 100644
--- a/kde-base/kdebase-startkde/kdebase-startkde-4.6.9999.ebuild
+++ b/kde-base/kdebase-startkde/kdebase-startkde-4.6.1-r2.ebuild
@@ -9,7 +9,7 @@ KMNOMODULE="true"
 inherit kde4-meta multilib prefix
 
 DESCRIPTION="Startkde script, which starts a complete KDE session, and associated scripts"
-KEYWORDS=""
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 # The KDE apps called from the startkde script.
@@ -102,8 +102,8 @@ src_install() {
 	fi
 
 	# x11 session script
-	cat <<-EOF > "${T}/${KDE_X}"
-	#!/bin/sh
+	cp "${FILESDIR}/sessionfile" "${T}/${KDE_X}" || die
+	cat <<-EOF >> "${T}/${KDE_X}"
 	exec "${EKDEDIR}/bin/startkde"
 	EOF
 	exeinto /etc/X11/Sessions

diff --git a/kde-base/kdebase-startkde/kdebase-startkde-4.6.9999.ebuild b/kde-base/kdebase-startkde/kdebase-startkde-4.6.9999.ebuild
index 013a898..c3362c3 100644
--- a/kde-base/kdebase-startkde/kdebase-startkde-4.6.9999.ebuild
+++ b/kde-base/kdebase-startkde/kdebase-startkde-4.6.9999.ebuild
@@ -102,8 +102,8 @@ src_install() {
 	fi
 
 	# x11 session script
-	cat <<-EOF > "${T}/${KDE_X}"
-	#!/bin/sh
+	cp "${FILESDIR}/sessionfile" "${T}/${KDE_X}" || die
+	cat <<-EOF >> "${T}/${KDE_X}"
 	exec "${EKDEDIR}/bin/startkde"
 	EOF
 	exeinto /etc/X11/Sessions

diff --git a/kde-base/kdebase-startkde/kdebase-startkde-9999.ebuild b/kde-base/kdebase-startkde/kdebase-startkde-9999.ebuild
index c8fcffa..9686a49 100644
--- a/kde-base/kdebase-startkde/kdebase-startkde-9999.ebuild
+++ b/kde-base/kdebase-startkde/kdebase-startkde-9999.ebuild
@@ -101,8 +101,8 @@ src_install() {
 	fi
 
 	# x11 session script
-	cat <<-EOF > "${T}/${KDE_X}"
-	#!/bin/sh
+	cp "${FILESDIR}/sessionfile" "${T}/${KDE_X}" || die
+	cat <<-EOF >> "${T}/${KDE_X}"
 	exec "${EKDEDIR}/bin/startkde"
 	EOF
 	exeinto /etc/X11/Sessions