x11-apps/xinit: prune ${FILESDIR}

Package-Manager: portage-2.2_rc42/cvs/Linux i686

6 files changed, 7 insertions, 547 deletions

diff --git a/x11-apps/xinit/ChangeLog b/x11-apps/xinit/ChangeLog
index a1005c0ca6b7..d7310b399683 100644
--- a/x11-apps/xinit/ChangeLog
+++ b/x11-apps/xinit/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-apps/xinit
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/ChangeLog,v 1.149 2009/10/01 12:23:43 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/ChangeLog,v 1.150 2009/10/01 14:34:30 remi Exp $
+
+  01 Oct 2009; Rémi Cardona <remi@gentoo.org> -files/xdm.initd-1,
+  -files/gentoo-startx-customization-1.0.4.patch, -files/xdm.start,
+  -files/xsession.env.d:
+  prune ${FILESDIR}
 
   01 Oct 2009; Rémi Cardona <remi@gentoo.org> -xinit-1.0.4.ebuild,
   -xinit-1.0.5-r1.ebuild, -xinit-1.0.5-r2.ebuild, -xinit-1.0.8.ebuild,
diff --git a/x11-apps/xinit/Manifest b/x11-apps/xinit/Manifest
index c96c79c6b61f..6c1f9553675d 100644
--- a/x11-apps/xinit/Manifest
+++ b/x11-apps/xinit/Manifest
@@ -1,22 +1,18 @@
 AUX Xsession 2187 RMD160 ffb290e9a8656b17d7744797456a45df53cafd79 SHA1 8ba8de5114871f8500f428a03f87a42714d0ce14 SHA256 bdf2cceaafb71762bc1c6491f9bd8cc24089dea7ef65b0a030acadf7f4aa4ab3
 AUX chooser.sh 1496 RMD160 4d474c23dc10f2f33006885305002df7fd3197f9 SHA1 7e8f6a8238add6a1501964821d0b3ffd1ad92b80 SHA256 70bde060d86c313b90ab21a8eb9b101b08637297a1a5b4dec13e1c305ec4d1e8
-AUX gentoo-startx-customization-1.0.4.patch 3863 RMD160 65d35c3aaf72861dbf393bb23aaac97763725891 SHA1 ab0acf592dfbdfe961489f3a417be350aefac1dd SHA256 eb0a88592a22203c9e7cb4ea3051f2b96adb244585ae4b990b384b6d8a35559c
 AUX gentoo-startx-customization-1.0.8.patch 3953 RMD160 cf0bc0b1439437b8a92a1f569445e8fbef1bb1cd SHA1 8020676fe7c9a2fed0c2a09cea0c273984a3cdc0 SHA256 29d6a004240672b86d6cc34e9cab5dcc88abcb84974d98b1085a9eb0dc852f38
 AUX nolisten-tcp-and-black-background.patch 381 RMD160 f767995059b6b3826e662ad71fd9348609383dc2 SHA1 8210062a9e3bac93e9d5b0a18633e6a98a6829f4 SHA256 481252dd205a0eefcfdf1a265b2c359280363ceaf1460ca5eab42b9eb3b3c826
 AUX startDM.sh 858 RMD160 d7ef866ddd09e3d4117b3363aaa6382a9b8cd153 SHA1 1b826dfb4d5a184d6d7cc1995d685b55c9c188ac SHA256 a7aca1e37e5b8fecb49aa96c4e2850547a47e154edabcdbd1cfcb8ab49337549
 AUX xdm-setup.initd-1 339 RMD160 8be48225ea6df9434d78981437cdbfdd29e10055 SHA1 15e723b54c27a422e9d53b98b3c5471e111817c2 SHA256 bce5865e7da9bcedeef66e8ce1b6fc7e303cf8d1f44ecb0e6347c045414a7d7d
 AUX xdm.confd-1 722 RMD160 3a4f800a37935e711112ede9c847837104e4100f SHA1 d3b2551ec7be8e5cfa42cc14e1d47ab37ac9f116 SHA256 1f6a2bb28e499698bbdba825d6dcbc81622579b1cf5c9e33538b252d254935c3
-AUX xdm.initd-1 5207 RMD160 c95d2df2feff76770ece8f0ec86e9bb53d76a257 SHA1 faefdeeca446fff29da2f4e546a3b0bcc94e6372 SHA256 891c7b060c6b47c135b32ffd918a0b6add5e9c7c03893ee0c1d56b64bd7987ea
 AUX xdm.initd-2 5455 RMD160 d88b99f7b4e7f181ad7c5ee817b881e0f2f797b6 SHA1 d3656459d81e195e7c8d829f82d7a9a32f26592f SHA256 ea6567021649df1084e2bc136a12a067b8bdf70e44978c6e3560e37d47141a23
 AUX xdm.initd-3 5378 RMD160 a8f0f0dd7687c35d1c56dad074efd67624195d23 SHA1 307c4a46036ad63a09c2ccb69fc0d2c65ba5ab4f SHA256 59961db339fa8316802b1712ae306da529d50eae25419b0ef0a78735ea8ee323
-AUX xdm.start 3974 RMD160 67f3b69fc9c006146999271935e1ae06d093130a SHA1 12763e84e31632c0421159e8feca2f9855966b7b SHA256 151b697f62e335850118a5d7d113d83fb37f2a75407985cd1e433de93eb55ded
 AUX xinit-1.0.4-console-kit.patch 4956 RMD160 286437f158d6a9ec588377b01d2b336d391bff37 SHA1 8d1ef61ec11bdf0308474560f0ed5156a6714d5f SHA256 65fd0800ccdecca979c8943755c5656fd022b54a160b32489ad95495521949e4
 AUX xinitrc 1059 RMD160 3f3ae64f6056055d3d42e471a5dd4263aa1b66db SHA1 edd6919448086273a73b1de897afe93e01b046c8 SHA256 53871c9c3198b38d73b08da3837d1331240a5d45e987a5b8135e7116c02d8eff
 AUX xserver.pamd 125 RMD160 4b75f8bf5e68ac7181a22beaccc153ac250eb8e9 SHA1 e35845021328044659036b9f82a95c17f21beb25 SHA256 f179c3417b94295fe12776f9da4a08898a3ee4199e26abff6457717caeb29bb2
-AUX xsession.env.d 1146 RMD160 876f5de1da358d796cbc6563e29cb9832e150e24 SHA1 d9390b8c4b4432e2e0131bec686c14557086a534 SHA256 56c732b131072376e8649efd16072461b21c9973d89bb125c95d793002c1a924
 DIST xinit-1.0.8.tar.bz2 117049 RMD160 d01b299e6e96c2b5318aaec479c81670b94e2129 SHA1 0102d2fdc0df3d24077ba826cf57640da46140af SHA256 06c1049f6b63d1c368a1e03e2392097919b22ff24899e190de3577bffe6fe524
 EBUILD xinit-1.0.8-r4.ebuild 2146 RMD160 76cfb718bcfd7ab710a7e3bb609a42c60172654e SHA1 33f000c3b440b517e5a1d5c60e346e6af38874e6 SHA256 ff68cfbbd6f36428a7bfefa0d28e409bdf5492f2df1b309066e46f22543f7cd7
 EBUILD xinit-1.0.8-r7.ebuild 2282 RMD160 af442abba5f78d4208aa5e99e630384354ea80f0 SHA1 ee904a6ccaa3680331aae2b2238d430022c815ec SHA256 be7289008950fd658a10e59df310c9ba47b6e0d144d2ee8724781c5f53446ee5
 EBUILD xinit-1.0.8-r8.ebuild 2214 RMD160 a610d99e614ffde7a44f1e6eae999c63dba16fcd SHA1 6e1c178895c4abde928672e0a58264b0b28e4b6e SHA256 29bad6c1a8ff3026750f8aba7b58b48256a35e0310b82fe1f80046de9e37bafe
-MISC ChangeLog 23959 RMD160 10ee14caed7cbb73deed466b8c7a2790a2ef7ddf SHA1 c2bbb4822be22a6c22dbfdf056a75e2623d45a79 SHA256 54b1b51c88d534709ed7afaca45dffe9291abc67cced1dafe838bf7943fec6d4
+MISC ChangeLog 24140 RMD160 58ccaa83fe07424c3b5c9de4777f16f2ed5bd81d SHA1 03f74eaffbc8339ae36f043ea1e663cb06165fd9 SHA256 a3089494158d97f48a639def2c852ca7c02e8cc16aadff702caa85cbc91f28e5
 MISC metadata.xml 272 RMD160 d0b40c3604f1b076f4ea2ead421b7361de293dce SHA1 9105900f56ba880d256b70bce06dd1cb69b1d4e6 SHA256 0e394010bdee148e101784bb38e4b1cdb106da7e2e5a7fc4fde946c65d0e4f7d
diff --git a/x11-apps/xinit/files/gentoo-startx-customization-1.0.4.patch b/x11-apps/xinit/files/gentoo-startx-customization-1.0.4.patch
deleted file mode 100644
index 16ef63fbd91f..000000000000
--- a/x11-apps/xinit/files/gentoo-startx-customization-1.0.4.patch
+++ /dev/null
@@ -1,148 +0,0 @@
-diff -urN xinit-1.0.4.orig/startx.cpp xinit-1.0.4/startx.cpp
---- xinit-1.0.4.orig/startx.cpp	2007-07-13 21:54:34.000000000 -0700
-+++ xinit-1.0.4/startx.cpp	2007-07-13 21:55:49.000000000 -0700
-@@ -64,8 +64,6 @@
- 
- userserverrc=$HOME/.xserverrc
- sysserverrc=XINITDIR/xserverrc
--defaultclient=XTERM
--defaultserver=XSERVER
- defaultclientargs=""
- defaultserverargs=""
- clientargs=""
-@@ -107,60 +105,41 @@
- whoseargs="client"
- while [ x"$1" != x ]; do
-     case "$1" in
--    XCOMM '' required to prevent cpp from treating "/*" as a C comment.
--    /''*|\./''*)
--	if [ "$whoseargs" = "client" ]; then
--	    if [ x"$clientargs" = x ]; then
--		client="$1"
--	    else
--		clientargs="$clientargs $1"
--	    fi
--	else
--	    if [ x"$serverargs" = x ]; then
--		server="$1"
--	    else
--		serverargs="$serverargs $1"
--	    fi
--	fi
--	;;
--    --)
--	whoseargs="server"
--	;;
--    *)
--	if [ "$whoseargs" = "client" ]; then
--	    clientargs="$clientargs $1"
--	else
--	    XCOMM display must be the FIRST server argument
--	    if [ x"$serverargs" = x ] && @@
--		 expr "$1" : ':[0-9][0-9]*$' > /dev/null 2>&1; then
--		display="$1"
--	    else
--		serverargs="$serverargs $1"
--	    fi
--	fi
--	;;
-+      /''*|\.*)       if [ "$whoseargs" = "client" ]; then
-+                  if [ "x$clientargs" = x ]; then
-+                      clientargs="$1"
-+                  else
-+                      clientargs="$clientargs $1"
-+                  fi
-+              else
-+                  if [ "x$serverargs" = x ]; then
-+                      serverargs="$1"
-+                  else
-+                      serverargs="$serverargs $1"
-+                  fi
-+              fi ;;
-+      --)     whoseargs="server" ;;
-+      *)      if [ "$whoseargs" = "client" ]; then
-+                  if [ "x$clientargs" = x ]; then
-+                      clientargs="$defaultclientargs $1"
-+                  else
-+                      clientargs="$clientargs $1"
-+                  fi
-+              else
-+                  case "$1" in
-+                      :[0-9]*) display="$1"; serverargs="$serverargs $1";;
-+                      *) serverargs="$serverargs $1" ;;
-+                  esac
-+              fi ;;
-     esac
-     shift
- done
- 
--XCOMM process client arguments
--if [ x"$client" = x ]; then
--    XCOMM if no client arguments either, use rc file instead
--    if [ x"$clientargs" = x ]; then
--	client="$defaultclientargs"
--    else
--	client=$defaultclient
--    fi
-+if [ x"$clientargs" = x ]; then
-+	clientargs="$defaultclientargs"
- fi
--
--XCOMM process server arguments
--if [ x"$server" = x ]; then
--    XCOMM if no server arguments or display either, use rc file instead
--    if [ x"$serverargs" = x -a x"$display" = x ]; then
--	server="$defaultserverargs"
--    else
--	server=$defaultserver
--    fi
-+if [ x"$serverargs" = x ]; then
-+	serverargs="$defaultserverargs"
- fi
- 
- if [ x"$XAUTHORITY" = x ]; then
-@@ -217,15 +196,8 @@
- 
- #endif
- 
--#if defined(__SCO__) || defined(__UNIXWARE__)
--if [ "$REMOTE_SERVER" = "TRUE" ]; then
--        exec SHELL_CMD ${client}
--else
--        XINIT $client $clientargs -- $server $display $serverargs
--fi
--#else
--XINIT $client $clientargs -- $server $display $serverargs
--#endif
-+cleanup() {
-+    [ -n "$PID" ] && kill $PID > /dev/null 2>&1
- 
- if [ x"$removelist" != x ]; then
-     XAUTH remove $removelist
-@@ -251,3 +223,15 @@
- #if defined(sun)
- kbd_mode -a
- #endif
-+}
-+
-+
-+trap cleanup 0
-+
-+xinit $clientargs -- $serverargs -deferglyphs 16 &
-+
-+PID=$!
-+
-+wait $PID
-+
-+unset PID
-diff -urN xinit-1.0.4.orig/xinit.c xinit-1.0.4/xinit.c
---- xinit-1.0.4.orig/xinit.c	2007-07-13 21:54:34.000000000 -0700
-+++ xinit-1.0.4/xinit.c	2007-07-13 21:59:14.000000000 -0700
-@@ -423,6 +423,7 @@
- 	sigaction(SIGINT, &sa, NULL);
- 	sigaction(SIGHUP, &sa, NULL);
- 	sigaction(SIGPIPE, &sa, NULL);
-+	sigaction(SIGTERM, &sa, NULL);
- 
- 	signal(SIGALRM, sigAlarm);
- 	signal(SIGUSR1, sigUsr1);
diff --git a/x11-apps/xinit/files/xdm.initd-1 b/x11-apps/xinit/files/xdm.initd-1
deleted file mode 100755
index 6cd1c78b388a..000000000000
--- a/x11-apps/xinit/files/xdm.initd-1
+++ /dev/null
@@ -1,204 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/files/xdm.initd-1,v 1.4 2008/01/13 22:27:32 philantrop Exp $
-
-# This is here to serve as a note to myself, and future developers.
-#
-# Any Display manager (gdm,kdm,xdm) has the following problem:  if
-# it is started before any getty, and no vt is specified, it will
-# usually run on vt2.  When the getty on vt2 then starts, and the
-# DM is already started, the getty will take control of the keyboard,
-# leaving us with a "dead" keyboard.
-#
-# Resolution: add the following line to /etc/inittab
-#
-#  x:a:once:/etc/X11/startDM.sh
-#
-# and have /etc/X11/startDM.sh start the DM in daemon mode if
-# a lock is present (with the info of what DM should be started),
-# else just fall through.
-#
-# How this basically works, is the "a" runlevel is a additional
-# runlevel that you can use to fork processes with init, but the
-# runlevel never gets changed to this runlevel.  Along with the "a"
-# runlevel, the "once" key word means that startDM.sh will only be
-# run when we specify it to run, thus eliminating respawning
-# startDM.sh when "xdm" is not added to the default runlevel, as was
-# done previously.
-#
-# This script then just calls "telinit a", and init will run
-# /etc/X11/startDM.sh after the current runlevel completes (this
-# script should only be added to the actual runlevel the user is
-# using).
-#
-# Martin Schlemmer
-# aka Azarah
-# 04 March 2002
-
-
-# Start X Font Server before X
-depend() {
-	need localmount
-
-	# this should start as early as possible
-	# we can't do 'before *' as that breaks it
-	# (#139824) Start after ypbind and autofs for network authentication
-	# (#145219) Could use lirc mouse as input device
-	# (#70689 comment #92) Start after consolefont to avoid display corruption
-	after bootmisc consolefont modules netmount
-	after readahead-list ypbind autofs openvpn gpm lircd
-	before alsasound
-
-	# Start before X
-	use acpid consolekit hald xfs
-}
-
-setup_dm() {
-	local MY_XDM="$(echo "${DISPLAYMANAGER}" | tr '[:upper:]' '[:lower:]')"
-
-	# Load our root path from profile.env
-	# Needed for kdm
-	PATH="${PATH}:$(. /etc/profile.env; echo "${ROOTPATH}")"
-
-	case "${MY_XDM}" in
-		kdm|kde|kde2|kde3)
-			EXE="$(which kdm)"
-			# kdm takes too long to create a pidfile for baselayout-2
-			#PIDFILE=/var/run/kdm.pid
-			PIDFILE=
-			;;
-		kdm-*)
-			EXE="/usr/kde/${MY_XDM#kdm-}/bin/kdm"
-			PIDFILE=
-			;;
-		entrance*)
-			EXE=/usr/sbin/entranced
-			PIDFILE=/var/lib/entranced.pid
-			;;
-		gdm|gnome)
-			EXE=/usr/bin/gdm
-			[ "${RC_UNAME}" != "Linux" ] && NAME=gdm-binary
-			PIDFILE=/var/run/gdm.pid
-			;;
-		wdm)
-			EXE=/usr/bin/wdm
-			PIDFILE=
-			;;
-		*)
-			EXE=
-			# Fix #65586, where MY_XDM is empty so EXE=somedir
-			[ -x "/usr/bin/${MY_XDM}" ] && [ -f "/usr/bin/${MY_XDM}" ] \
-				&& EXE="/usr/bin/${MY_XDM}"
-			if [ -z "${EXE}" ] ; then
-				EXE=/usr/bin/xdm
-				PIDFILE=/var/run/xdm.pid
-			fi
-			;;
-	esac
-
-	if ! [ -x "${EXE}" ] ; then
-		EXE=/usr/bin/xdm
-		PIDFILE=/var/run/xdm.pid
-	fi
-}
-
-cmdline_opt() {
-	if [ $# -ne 1 ] || ! [ -r /proc/cmdline ]; then
-		return 1
-	fi
-
-	for opt in $(cat /proc/cmdline) ; do
-		[ "${opt}" = "${1}" ] && return 0
-	done
-
-	return 1
-}
-
-# Check to see if something is defined on our VT
-vtstatic() {
-	if [ -e /etc/inittab ] ; then
-		grep -Eq "^[^#]+.*\<tty$1\>" /etc/inittab 
-	elif [ -e /etc/ttys ] ; then
-		grep -q "^ttyv$(($1 - 1))" /etc/ttys
-	else
-		return 1
-	fi
-}
-
-start() {
-	local EXE= NAME= PIDFILE=
-	setup_dm
-	
-	if cmdline_opt nox ; then
-		einfo "Skipping ${EXE}, received 'nox'"
-		return 0
-	fi
-	
-	ebegin "Setting up ${EXE##*/}"
-	#save the prefered DM
-	save_options "service" "${EXE}"
-	save_options "name"    "${NAME}"
-	save_options "pidfile" "${PIDFILE}"
-
-	if [ -n "${CHECKVT-y}" ] ; then
-		if vtstatic "${CHECKVT:-7}" ; then
-			if [ -x /sbin/telinit ] && [ "${SOFTLEVEL}" != "BOOT" ] && [ "${RC_SOFTLEVEL}" != "BOOT" ] ; then
-				ewarn "Something is already defined on VT ${CHECKVT:-7}, will start X later"
-				telinit a >/dev/null 2>/dev/null
-				return 0
-			else
-				eerror "Something is already defined on VT ${CHECKVT:-7}, not starting"
-				return 1
-			fi
-		fi
-	fi
-	
-	/etc/X11/startDM.sh
-	eend 0
-}
-
-stop() {
-	local retval=0
-	local curvt=
-	if [ -t 0 ] ; then
-		if type fgconsole >/dev/null 2>/dev/null ; then
-			curvt="$(fgconsole 2>/dev/null)"
-		else
-			curvt="$(tty)"
-			case "${curvt}" in
-				/dev/ttyv[0-9]*) curvt="${curvt#/dev/ttyv*}" ;;
-				*) curvt= ;;
-			esac
-		fi
-	fi
-	local myexe="$(get_options "service")"
-	local myname="$(get_options "name")"
-	local mypidfile="$(get_options "pidfile")"
-	local myservice=${myexe##*/}
-
-	[ -z "${myexe}" ] && return 0
-
-	ebegin "Stopping ${myservice}"
-
-	if start-stop-daemon --quiet --test --stop --exec "${myexe}" ; then
-		start-stop-daemon --stop --exec "${myexe}" --retry TERM/5/TERM/5 \
-			${mypidfile:+--pidfile} ${mypidfile} \
-			${myname:+--name} ${myname}
-		retval=$?
-	fi
-
-	# switch back to original vt
-	if [ -n "${curvt}" ] ; then
-		if type chvt >/dev/null 2>/dev/null ; then
-			chvt "${curvt}"
-		else
-			vidcontrol -s "$((${curvt} + 1))"	
-		fi
-	fi
-	eend ${retval} "Error stopping ${myservice}"
-	
-	return ${retval}
-}
-
-# vim: set ts=4 :
diff --git a/x11-apps/xinit/files/xdm.start b/x11-apps/xinit/files/xdm.start
deleted file mode 100755
index baf325c7099d..000000000000
--- a/x11-apps/xinit/files/xdm.start
+++ /dev/null
@@ -1,164 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/files/xdm.start,v 1.11 2006/11/22 20:08:45 dberkholz Exp $
-
-# This is here to serve as a note to myself, and future developers.
-#
-# Any Display manager (gdm,kdm,xdm) has the following problem:  if
-# it is started before any getty, and no vt is specified, it will
-# usually run on vt2.  When the getty on vt2 then starts, and the
-# DM is already started, the getty will take control of the keyboard,
-# leaving us with a "dead" keyboard.
-#
-# Resolution: add the following line to /etc/inittab
-#
-#  x:a:once:/etc/X11/startDM.sh
-#
-# and have /etc/X11/startDM.sh start the DM in daemon mode if
-# a lock is present (with the info of what DM should be started),
-# else just fall through.
-#
-# How this basically works, is the "a" runlevel is a additional
-# runlevel that you can use to fork processes with init, but the
-# runlevel never gets changed to this runlevel.  Along with the "a"
-# runlevel, the "once" key word means that startDM.sh will only be
-# run when we specify it to run, thus eliminating respawning
-# startDM.sh when "xdm" is not added to the default runlevel, as was
-# done previously.
-#
-# This script then just calls "telinit a", and init will run
-# /etc/X11/startDM.sh after the current runlevel completes (this
-# script should only be added to the actual runlevel the user is
-# using).
-#
-# Martin Schlemmer
-# aka Azarah
-# 04 March 2002
-
-
-# Start X Font Server before X
-depend() {
-	need localmount
-
-	# this should start as early as possible
-	# we can't do 'before *' as that breaks it
-	# (#139824) Start after ypbind and autofs for network authentication
-	# (#145219) Could use lirc mouse as input device
-	# (#70689 comment #92) Start after consolefont to avoid display corruption
-	after bootmisc readahead-list ypbind autofs openvpn gpm netmount lircd consolefont
-	before alsasound net.lo
-
-	# Start before X
-	use acpid hald xfs
-}
-
-setup_dm() {
-	source /etc/profile.env
-	export PATH="/bin:/sbin:/usr/bin:/usr/sbin:${ROOTPATH}"
-
-	local MY_XDM="$(echo ${DISPLAYMANAGER} | awk '{ print tolower($1) }')"
-	case "${MY_XDM}" in
-		kdm|kde|kde2|kde3)
-			EXE="$(which kdm)"
-			;;
-		entrance*)
-			EXE="$(which entranced)"
-			;;
-		gdm|gnome)
-			EXE=/usr/bin/gdm
-			;;
-		wdm)
-			EXE=/usr/bin/wdm
-			;;
-		*)
-			EXE=
-			# Fix #65586, where MY_XDM is empty so EXE=somedir
-			[ -x "/usr/bin/${MY_XDM}" -a -f "/usr/bin/${MY_XDM}" ] \
-				&& EXE="/usr/bin/${MY_XDM}"
-			[ -z "${EXE}" ] && EXE="/usr/bin/xdm"
-			;;
-	esac
-
-	test ! -x "${EXE}" && EXE=/usr/bin/xdm
-
-	SERVICE="${EXE##*/}"
-}
-
-cmdline_opt() {
-	if [[ "$#" -ne 1 ]]; then
-		return 1
-	fi
-
-	for opt in $(</proc/cmdline); do
-		case ${opt} in
-			${1}) eval ${1}="true" ;;
-		esac
-	done
-}
-
-nox() {
-	# Don't start X if we were passed 'nox' at boot (#83680)
-	cmdline_opt nox
-
-	if [[ "$?" -ne 0 ]]; then
-		return 1
-	fi
-
-	if [[ -n "${nox}" ]]; then
-		return 0
-	else
-		return 1
-	fi
-}
-
-start() {
-	setup_dm
-	
-	if nox; then
-		einfo "Skipping ${EXE}, received 'nox'"
-	else
-		ebegin "Setting up ${SERVICE}"
-		#save the prefered DM
-		save_options "service" "${EXE}"
-
-		# Start as soon as possible if XSTATICVT is set
-		if [ "${XSTATICVT}" = "yes" ] ; then
-			/etc/X11/startDM.sh
-		else
-			#tell init to run /etc/X11/startDM.sh after current
-			#runlevel is finished (should *not* be in the "boot"
-			#                      runlevel).
-			/sbin/telinit a &>/dev/null
-		fi
-		eend 0
-	fi
-
-}
-
-stop() {
-	local retval=0
-	local curvt="$(fgconsole)"
-	local myexe="$(get_options "service")"
-	local myservice="${myexe##*/}"
-	
-	ebegin "Stopping ${myservice}"
-	rm -f ${svcdir}/options/xdm/service
-	
-	if [ "$(ps -A | grep -e "${myservice}")" ]
-	then
-		start-stop-daemon --stop --quiet \
-			--exec ${myexe} &>/dev/null
-		
-		retval=$?
-	fi
-	
-	#switch back to original vt
-	chvt "${curvt}" &>/dev/null
-	eend ${retval} "Error stopping ${myservice}."
-	
-	return ${retval}
-}
-
-
-# vim:ts=4
diff --git a/x11-apps/xinit/files/xsession.env.d b/x11-apps/xinit/files/xsession.env.d
deleted file mode 100644
index c108d3d44e48..000000000000
--- a/x11-apps/xinit/files/xsession.env.d
+++ /dev/null
@@ -1,25 +0,0 @@
-# /etc/env.d/90xsession
-
-# XSESSION is a new variable to control what window manager to start
-# default with X if run with xdm, startx or xinit.  The default behavior
-# is to look in /etc/X11/Sessions/ and run the script in matching the
-# value that XSESSION is set to.  The support scripts are smart enough to
-# look in all bin directories if it cant find a match in /etc/X11/Sessions/,
-# so setting it to "enlightenment" can also work.  This is basically used
-# as a way for the system admin to configure a default system wide WM,
-# allthough it will work if the user export XSESSION in his .bash_profile, etc.
-#
-# NOTE:  1) this behaviour is overridden when a ~/.xinitrc exists, and startx
-#           is called.
-#        2) even if ~/.xsession exists, if XSESSION can be resolved, it will
-#           be executed rather than ~/.xsession, else KDM breaks ...
-#
-# Defaults depending on what you install currently include:
-#
-# Gnome - will start gnome-session
-# kde-<version> - will start startkde (look in /etc/X11/Sessions/)
-# Xfce4 - will start a XFCE4 session
-# Xsession - will start a terminal and a few other nice apps
-
-#XSESSION="Gnome"
-