From: frank <frank@bruni.home.brehm-online.com>
Date: Tue, 17 Jan 2012 14:18:32 +0000 (+0100)
Subject: committing changes in /etc after emerge run
X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=92be42a49f5416237284c0973cb6500ec104ca18;p=config%2Fbruni%2Fetc.git

committing changes in /etc after emerge run

Package changes:
+kde-base/kdebase-startkde-4.7.4
---

diff --git a/.etckeeper b/.etckeeper
index b399f5d1..9f4c1650 100755
--- a/.etckeeper
+++ b/.etckeeper
@@ -71,6 +71,7 @@ maybe chmod 0644 './UPower/UPower.conf'
 maybe chmod 0755 './X11'
 maybe chmod 0755 './X11/Sessions'
 maybe chmod 0755 './X11/Sessions/Gnome'
+maybe chmod 0755 './X11/Sessions/KDE-4'
 maybe chmod 0755 './X11/Sessions/Xfce4'
 maybe chmod 0755 './X11/Sessions/Xsession'
 maybe chmod 0755 './X11/Sessions/fluxbox'
@@ -997,6 +998,11 @@ maybe chmod 0755 './java-config-2/build'
 maybe chmod 0644 './java-config-2/build/compilers.conf'
 maybe chmod 0644 './java-config-2/build/jdk.conf'
 maybe chmod 0644 './java-config-2/virtuals'
+maybe chmod 0755 './kde'
+maybe chmod 0755 './kde/shutdown'
+maybe chmod 0644 './kde/shutdown/agent-shutdown.sh'
+maybe chmod 0755 './kde/startup'
+maybe chmod 0644 './kde/startup/agent-startup.sh'
 maybe chmod 0755 './kernel'
 maybe chmod 0755 './kernel/postinst.d'
 maybe chmod 0644 './kernel/postinst.d/.keep_sys-apps_debianutils-0'
diff --git a/X11/Sessions/KDE-4 b/X11/Sessions/KDE-4
new file mode 100755
index 00000000..29fb10a5
--- /dev/null
+++ b/X11/Sessions/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 "/usr/bin/startkde"
diff --git a/kde/shutdown/agent-shutdown.sh b/kde/shutdown/agent-shutdown.sh
new file mode 100644
index 00000000..07cf7477
--- /dev/null
+++ b/kde/shutdown/agent-shutdown.sh
@@ -0,0 +1,13 @@
+#!/bin/sh
+#
+# This file is executed at kde shutdown.
+# Uncomment the following lines to kill the agents
+# that were started at session startup.
+
+#if [ -n "${GPG_AGENT_INFO}" ]; then
+#  kill $(echo ${GPG_AGENT_INFO} | cut -d':' -f 2) >/dev/null 2>&1
+#fi
+
+#if [ -n "${SSH_AGENT_PID}" ]; then
+#  eval "$(ssh-agent -s -k)"
+#fi
diff --git a/kde/startup/agent-startup.sh b/kde/startup/agent-startup.sh
new file mode 100644
index 00000000..4b99f6e8
--- /dev/null
+++ b/kde/startup/agent-startup.sh
@@ -0,0 +1,29 @@
+# Agents startup file
+#
+# This file is sourced at kde startup, so that
+# the environment variables set here are available
+# throughout the session.
+
+# Uncomment the following lines to start gpg-agent
+# and/or ssh-agent at kde startup.
+# If you do so, do not forget to uncomment the respective
+# lines in KDEDIR/shutdown/agent-shutdown.sh to
+# properly kill the agents when the session ends.
+
+#if [ -x /usr/bin/gpg-agent ]; then
+#  eval "$(/usr/bin/gpg-agent --daemon)"
+#fi 
+
+#if [ -x /usr/bin/ssh-agent ]; then
+#  eval "$(/usr/bin/ssh-agent -s)"
+#fi
+
+# Uncomment the following lines to start rxvt-unicode which has the ability to
+# run multiple terminals in one single process, thus starting up faster and 
+# saving resources.
+# The --opendisplay ensures that the daemon quits when the X server terminates,
+# therefore we don't need matching lines in agent-shutdown.sh.
+
+#if [ -x /usr/bin/urxvtd ]; then
+#	/usr/bin/urxvtd --opendisplay --fork --quiet
+#fi