From e9c8fb6a642e740a972c15a5f8aa92c5976cc030 Mon Sep 17 00:00:00 2001
From: Frank Brehm <frank.brehm@profitbricks.com>
Date: Mon, 7 Dec 2015 18:15:11 +0100
Subject: [PATCH] saving uncommitted changes in /etc prior to emerge run

---
 X11/chooser.sh    |  2 +-
 X11/startDM.sh    |  2 +-
 X11/xinit/xinitrc | 68 +++++++++--------------------------------------
 3 files changed, 14 insertions(+), 58 deletions(-)

diff --git a/X11/chooser.sh b/X11/chooser.sh
index f24be46..6d14a71 100755
--- a/X11/chooser.sh
+++ b/X11/chooser.sh
@@ -2,7 +2,7 @@
 # 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 $
+# $Id$
 
 # Find a match for $XSESSION in /etc/X11/Sessions
 GENTOO_SESSION=""
diff --git a/X11/startDM.sh b/X11/startDM.sh
index ebb7970..0265659 100755
--- a/X11/startDM.sh
+++ b/X11/startDM.sh
@@ -1,7 +1,7 @@
 #!/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 $
+# $Id$
 
 # We need to source /etc/profile for stuff like $LANG to work
 # bug #10190.
diff --git a/X11/xinit/xinitrc b/X11/xinit/xinitrc
index e6dd7fe..1109fc3 100644
--- a/X11/xinit/xinitrc
+++ b/X11/xinit/xinitrc
@@ -1,46 +1,3 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 #!/bin/sh
 
 userresources=$HOME/.Xresources
@@ -84,26 +41,25 @@ fi
 
 # start some nice programs
 
-
 if [ -n "`/etc/X11/chooser.sh`" ]; then
-	command="`/etc/X11/chooser.sh`"
+ command="`/etc/X11/chooser.sh`"
 else
-	failsafe="yes"
+ 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
+ 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
+ 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
+ exec $command
 fi
-- 
2.39.5