committing changes in /etc after emerge run

Package changes:
+x11-apps/xinit-1.3.1-r1

diff --git a/.etckeeper b/.etckeeper
index 796dc1c0f14e128d7d86d7221b5d689ee724e782..b2c7d20879ad2732f0839d0ad22ab50a83524196 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -66,16 +66,23 @@ maybe chmod 0644 './NetworkManager/system-connections/.keep_net-misc_networkmana
 maybe chmod 0755 './UPower'
 maybe chmod 0644 './UPower/UPower.conf'
 maybe chmod 0755 './X11'
+maybe chmod 0755 './X11/Sessions'
+maybe chmod 0755 './X11/Sessions/Xsession'
 maybe chmod 0755 './X11/app-defaults'
 maybe chmod 0644 './X11/app-defaults/XDvi'
+maybe chmod 0755 './X11/chooser.sh'
 maybe chmod 0755 './X11/mwm'
 maybe chmod 0644 './X11/mwm/system.mwmrc'
+maybe chmod 0755 './X11/startDM.sh'
 maybe chmod 0755 './X11/xinit'
+maybe chmod 0644 './X11/xinit/xinitrc'
 maybe chmod 0755 './X11/xinit/xinitrc.d'
+maybe chmod 0755 './X11/xinit/xinitrc.d/00-xhost'
 maybe chmod 0755 './X11/xinit/xinitrc.d/10-xdg-menu-gnome'
 maybe chmod 0755 './X11/xinit/xinitrc.d/70-seahorse-agent'
 maybe chmod 0755 './X11/xinit/xinitrc.d/80-dbus'
 maybe chmod 0755 './X11/xinit/xinitrc.d/90-consolekit'
+maybe chmod 0755 './X11/xinit/xserverrc'
 maybe chmod 0755 './abcde'
 maybe chmod 0644 './abcde/abcde.conf'
 maybe chmod 0755 './acpi'

diff --git a/X11/Sessions/Xsession b/X11/Sessions/Xsession
new file mode 100755 (executable)
index 0000000..c86ccee
--- /dev/null
+++ b/X11/Sessions/Xsession
@@ -0,0 +1,107 @@
+#!/bin/sh
+# $XConsortium: Xsession /main/10 1995/12/18 18:21:28 gildea $
+
+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
+
+startup=$HOME/.xsession
+
+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
+
+if [ -x "$startup" ]; then
+       exec "$startup"
+elif [ -x "$HOME/.Xclients" ]; then
+       exec "$HOME/.Xclients"
+elif [ -x /etc/X11/xinit/Xclients ]; then
+       exec /etc/X11/xinit/Xclients
+elif [ -x /etc/X11/Xclients ]; then
+       exec /etc/X11/Xclients
+else
+       exec xsm
+fi

diff --git a/X11/chooser.sh b/X11/chooser.sh
new file mode 100755 (executable)
index 0000000..f24be46
--- /dev/null
+++ b/X11/chooser.sh
@@ -0,0 +1,52 @@
+#!/bin/sh
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License, v2
+# Author:  Martin Schlemmer <azarah@gentoo.org>
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/files/chooser.sh,v 1.5 2009/11/14 14:18:43 scarabeus Exp $
+
+# Find a match for $XSESSION in /etc/X11/Sessions
+GENTOO_SESSION=""
+for x in /etc/X11/Sessions/* ; do
+       if [ "`echo ${x##*/} | awk '{ print toupper($1) }'`" \
+               = "`echo ${XSESSION} | awk '{ print toupper($1) }'`" ]; then
+               GENTOO_SESSION=${x}
+               break
+       fi
+done
+
+GENTOO_EXEC=""
+
+if [ -n "${XSESSION}" ]; then
+       if [ -f /etc/X11/Sessions/${XSESSION} ]; then
+               if [ -x /etc/X11/Sessions/${XSESSION} ]; then
+                       GENTOO_EXEC="/etc/X11/Sessions/${XSESSION}"
+               else
+                       GENTOO_EXEC="/bin/sh /etc/X11/Sessions/${XSESSION}"
+               fi
+       elif [ -n "${GENTOO_SESSION}" ]; then
+               if [ -x "${GENTOO_SESSION}" ]; then
+                       GENTOO_EXEC="${GENTOO_SESSION}"
+               else
+                       GENTOO_EXEC="/bin/sh ${GENTOO_SESSION}"
+               fi
+       else
+               x=""
+               y=""
+               
+               for x in "${XSESSION}" \
+                       "`echo ${XSESSION} | awk '{ print toupper($1) }'`" \
+                       "`echo ${XSESSION} | awk '{ print tolower($1) }'`"
+               do
+                       # Fall through ...
+                       if [ -x "`which ${x} 2>/dev/null`" ]; then
+                               GENTOO_EXEC="`which ${x} 2>/dev/null`"
+                               break
+                       fi
+               done
+       fi
+fi
+
+echo "${GENTOO_EXEC}"
+
+
+# vim:ts=4

diff --git a/X11/startDM.sh b/X11/startDM.sh
new file mode 100755 (executable)
index 0000000..ebb7970
--- /dev/null
+++ b/X11/startDM.sh
@@ -0,0 +1,31 @@
+#!/bin/sh
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License, v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/files/startDM.sh,v 1.5 2011/01/22 15:35:49 lxnay Exp $
+
+# We need to source /etc/profile for stuff like $LANG to work
+# bug #10190.
+. /etc/profile
+
+. /etc/init.d/functions.sh
+
+# baselayout-1 compat
+if ! type get_options >/dev/null 2>/dev/null ; then
+       [ -r "${svclib}"/sh/rc-services.sh ] && . "${svclib}"/sh/rc-services.sh
+fi
+
+# Great new Gnome2 feature, AA
+# We enable this by default
+export GDK_USE_XFT=1
+
+export SVCNAME=xdm
+EXEC="$(get_options service)"
+NAME="$(get_options name)"
+PIDFILE="$(get_options pidfile)"
+START_STOP_ARGS="$(get_options start_stop_args)"
+
+start-stop-daemon --start --exec ${EXEC} \
+${NAME:+--name} ${NAME} ${PIDFILE:+--pidfile} ${PIDFILE} ${START_STOP_ARGS} || \
+eerror "ERROR: could not start the Display Manager"
+
+# vim:ts=4

diff --git a/X11/xinit/xinitrc b/X11/xinit/xinitrc
new file mode 100644 (file)
index 0000000..334d0ee
--- /dev/null
+++ b/X11/xinit/xinitrc
@@ -0,0 +1,66 @@
+#!/bin/sh
+
+userresources=$HOME/.Xresources
+usermodmap=$HOME/.Xmodmap
+sysresources=/etc/X11/xinit/Xresources
+sysmodmap=/etc/X11/xinit/Xmodmap
+
+# merge in defaults and keymaps
+
+if [ -f $sysresources ]; then
+
+
+
+
+
+
+
+    xrdb -merge $sysresources
+
+fi
+
+if [ -f $sysmodmap ]; then
+    xmodmap $sysmodmap
+fi
+
+if [ -f "$userresources" ]; then
+
+
+
+
+
+
+
+    xrdb -merge "$userresources"
+
+fi
+
+if [ -f "$usermodmap" ]; then
+    xmodmap "$usermodmap"
+fi
+
+# start some nice programs
+
+
+if [ -n "`/etc/X11/chooser.sh`" ]; then
+       command="`/etc/X11/chooser.sh`"
+else
+       failsafe="yes"
+fi
+
+if [ -d /etc/X11/xinit/xinitrc.d ] ; then
+       for f in /etc/X11/xinit/xinitrc.d/* ; do
+               [ -x "$f" ] && . "$f"
+       done
+       unset f
+fi
+
+if [ -n "$failsafe" ]; then
+       twm &
+       xclock -geometry 50x50-1+1 &
+       xterm -geometry 80x50+494+51 &
+       xterm -geometry 80x20+494-0 &
+       exec xterm -geometry 80x66+0+0 -name login
+else
+       exec $command
+fi

diff --git a/X11/xinit/xinitrc.d/00-xhost b/X11/xinit/xinitrc.d/00-xhost
new file mode 100755 (executable)
index 0000000..82cf103
--- /dev/null
+++ b/X11/xinit/xinitrc.d/00-xhost
@@ -0,0 +1,7 @@
+#!/bin/sh
+# Allow all local connections from the current UID
+# This fixes issues with hostname changes (usually by dhcp clients)
+# see bug 287498 for more info
+
+[ -x /usr/bin/xhost ] && [ -x /usr/bin/id ] &&
+       xhost +si:localuser:`id -un` > /dev/null 2>&1

diff --git a/X11/xinit/xserverrc b/X11/xinit/xserverrc
new file mode 100755 (executable)
index 0000000..b4de252
--- /dev/null
+++ b/X11/xinit/xserverrc
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec /usr/bin/X -nolisten tcp "$@"