rm

(Portage version: 2.2_rc61/cvs/Linux x86_64)

8 files changed, 7 insertions, 705 deletions

diff --git a/x11-apps/xinit/ChangeLog b/x11-apps/xinit/ChangeLog
index 76329555d7be..cf8e695d8a76 100644
--- a/x11-apps/xinit/ChangeLog
+++ b/x11-apps/xinit/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-apps/xinit
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/ChangeLog,v 1.178 2010/01/19 18:48:35 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/ChangeLog,v 1.179 2010/01/23 19:03:07 scarabeus Exp $
+
+  23 Jan 2010; Tomáš Chvátal <scarabeus@gentoo.org> -files/xdm.confd-1,
+  -files/xinit-1.0.4-console-kit.patch, -xinit-1.0.8-r10.ebuild,
+  -files/gentoo-startx-customization-1.0.8.patch, -files/xdm.initd-3,
+  -files/nolisten-tcp-and-black-background.patch, -files/xinitrc:
+  rm
 
   19 Jan 2010; Raúl Porcel <armin76@gentoo.org> xinit-1.2.0-r3.ebuild:
   s390 stable wrt #294958
diff --git a/x11-apps/xinit/files/gentoo-startx-customization-1.0.8.patch b/x11-apps/xinit/files/gentoo-startx-customization-1.0.8.patch
deleted file mode 100644
index c78283d8cdd9..000000000000
--- a/x11-apps/xinit/files/gentoo-startx-customization-1.0.8.patch
+++ /dev/null
@@ -1,151 +0,0 @@
-diff -urN xinit-1.0.8.orig/startx.cpp xinit-1.0.8/startx.cpp
---- xinit-1.0.8.orig/startx.cpp	2008-03-08 21:26:55.000000000 -0800
-+++ xinit-1.0.8/startx.cpp	2008-03-08 21:27:32.000000000 -0800
-@@ -71,8 +71,6 @@
- 
- userserverrc=$HOME/.xserverrc
- sysserverrc=XINITDIR/xserverrc
--defaultclient=XTERM
--defaultserver=XSERVER
- defaultclientargs=""
- defaultserverargs="-nolisten tcp -br"
- clientargs=""
-@@ -158,63 +156,44 @@
- 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"
-+if [ x"$serverargs" = x ]; then
-+	serverargs="$defaultserverargs"
- #ifdef __APPLE__
- 	display="$defaultdisplay"
- #endif
--    else
--	server=$defaultserver
--    fi
- fi
- 
- if [ x"$enable_xauth" = x1 ] ; then
-@@ -279,15 +258,8 @@
-     done
- fi
- 
--#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"$enable_xauth" = x1 ] ; then
-     if [ x"$removelist" != x ]; then
-@@ -315,3 +287,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.8.orig/xinit.c xinit-1.0.8/xinit.c
---- xinit-1.0.8.orig/xinit.c	2008-03-08 21:26:55.000000000 -0800
-+++ xinit-1.0.8/xinit.c	2008-03-08 21:27:06.000000000 -0800
-@@ -479,6 +479,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/nolisten-tcp-and-black-background.patch b/x11-apps/xinit/files/nolisten-tcp-and-black-background.patch
deleted file mode 100644
index ab7f9600bb9b..000000000000
--- a/x11-apps/xinit/files/nolisten-tcp-and-black-background.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN xinit-0.99.0/startx.cpp xinit-0.99.0/startx.cpp
---- xinit-0.99.0/startx.cpp	2003-09-15 04:24:58.000000000 -0400
-+++ xinit-0.99.0/startx.cpp	2003-09-15 04:28:50.000000000 -0400
-@@ -53,7 +53,7 @@
- sysclientrc=XINITDIR/xinitrc
- sysserverrc=XINITDIR/xserverrc
- defaultclientargs=""
--defaultserverargs=""
-+defaultserverargs="-nolisten tcp -br"
- clientargs=""
- serverargs=""
- 
diff --git a/x11-apps/xinit/files/xdm.confd-1 b/x11-apps/xinit/files/xdm.confd-1
deleted file mode 100644
index aa1219e02a9a..000000000000
--- a/x11-apps/xinit/files/xdm.confd-1
+++ /dev/null
@@ -1,12 +0,0 @@
-# We always try and start X on a static VT. The various DMs normally default
-# to using VT7. If you wish to use the xdm init script, then you should ensure
-# that the VT checked is the same VT your DM wants to use. We do this check to
-# ensure that you have't accidently configured something to run on the VT
-# in your /etc/inittab file so that you don't get a dead keyboard.
-CHECKVT=7
-
-# What display manager do you use ?  [ xdm | gdm | kdm | kdm-3.5 | kdm-4.0 | gpe | entrance ]
-# NOTE: If this is set in /etc/rc.conf, that setting will override this one.
-# KDE-specific note: kdm-3.5 and kdm-4.0 are just examples. You will find all 
-# possible versions by looking at the directories in /usr/kde/.
-DISPLAYMANAGER="xdm"
diff --git a/x11-apps/xinit/files/xdm.initd-3 b/x11-apps/xinit/files/xdm.initd-3
deleted file mode 100755
index f5335c09a250..000000000000
--- a/x11-apps/xinit/files/xdm.initd-3
+++ /dev/null
@@ -1,202 +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-3,v 1.7 2009/10/07 16:59:42 williamh 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 xdm-setup
-
-	# 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 #180163) 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 lircmd
-	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=
-			;;
-		gpe)
-			EXE=/usr/bin/gpe-dm
-			PIDFILE=/var/run/gpe-dm.pid
-			;;
-		*)
-			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
-		if ! [ -x "/usr/bin/xdm" ] ; then
-			echo "ERROR: Please set your DISPLAYMANAGER variable in /etc/conf.d/xdm,"
-			echo "	or install x11-apps/xdm package"
-			eend 255
-		fi
-	fi
-}
-
-# 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 [ -f /etc/.noxdm ]; then
-		einfo "Skipping ${EXE}, /etc/.noxdm found"
-		rm /etc/.noxdm
-		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/xinit-1.0.4-console-kit.patch b/x11-apps/xinit/files/xinit-1.0.4-console-kit.patch
deleted file mode 100644
index 645e4e532ffb..000000000000
--- a/x11-apps/xinit/files/xinit-1.0.4-console-kit.patch
+++ /dev/null
@@ -1,197 +0,0 @@
-diff --git a/Makefile.am b/Makefile.am
-index babc2f3..9b912a3 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -24,8 +24,8 @@ XINITDIR = $(libdir)/X11/xinit
- bin_PROGRAMS = xinit
- bin_SCRIPTS = startx
- 
--xinit_CFLAGS = $(XINIT_CFLAGS) -DXINITDIR=\"$(XINITDIR)\" -DBINDIR=\"$(bindir)\"
--xinit_LDADD = $(XINIT_LIBS)
-+xinit_CFLAGS = $(XINIT_CFLAGS) $(CK_CFLAGS) -DXINITDIR=\"$(XINITDIR)\" -DBINDIR=\"$(bindir)\"
-+xinit_LDADD = $(XINIT_LIBS) $(CK_LIBS)
- 
- xinit_SOURCES =	\
-         xinit.c
-diff --git a/configure.ac b/configure.ac
-index 1aee1d2..5775db3 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -47,6 +47,7 @@ DEFAULT_XMODMAP=xmodmap
- DEFAULT_TWM=twm
- DEFAULT_XCLOCK=xclock
- DEFAULT_XTERM=xterm
-+DEFAULT_CK=yes
- # You always want to specify the full path to the X server
- DEFAULT_XSERVER=${bindir}/X
- DEFAULT_XAUTH=xauth
-@@ -104,6 +105,20 @@ esac
- AC_SUBST(XINIT_CFLAGS)
- AC_SUBST(XINIT_LIBS)
- 
-+# Check for ConsoleKit
-+AC_ARG_WITH(consolekit,
-+	 AS_HELP_STRING([--with-consolekit], [Use ConsoleKit in xinit]),
-+	[CK="$withval"],
-+	[CK="$DEFAULT_CK"])
-+if test "x$CK" != xno ; then
-+	PKG_CHECK_MODULES(CK, ck-connector,
-+		have_conkit=yes,
-+		[have_conkit=no; echo no])
-+	if test "x$have_conkit" = xyes ; then
-+		AC_DEFINE(USE_CONKIT, 1, [Define if you have ConsoleKit])
-+	fi
-+fi
-+
- AC_PATH_PROGS(MCOOKIE, [mcookie], [$MCOOKIE],
-   [$PATH:/bin:/usr/bin:/usr/lib:/usr/libexec:/usr/local/bin])
- if test "x$MCOOKIE" != x ; then
-diff --git a/startx.cpp b/startx.cpp
-index 42421ef..998c7f8 100644
---- a/startx.cpp
-+++ b/startx.cpp
-@@ -222,6 +222,12 @@ EOF
-     fi
- done
- 
-+if [ x"$display" != x ]; then
-+    export DISPLAY=$display
-+else
-+    export DISPLAY=:0
-+fi
-+
- #if defined(__SCO__) || defined(__UNIXWARE__)
- if [ "$REMOTE_SERVER" = "TRUE" ]; then
-         exec SHELL_CMD ${client}
-diff --git a/xinit.c b/xinit.c
-index 46dee54..c2c4527 100644
---- a/xinit.c
-+++ b/xinit.c
-@@ -39,6 +39,12 @@ in this Software without prior written authorization from The Open Group.
- #include <ctype.h>
- #include <stdint.h>
- 
-+#ifdef USE_CONKIT
-+#include <ck-connector.h>
-+#include <X11/Xatom.h>
-+static CkConnector *ckc = NULL;
-+#endif /* USE_CONKIT */
-+
- #ifdef X_POSIX_C_SOURCE
- #define _POSIX_C_SOURCE X_POSIX_C_SOURCE
- #include <signal.h>
-@@ -521,6 +527,39 @@ processTimeout(int timeout, char *string)
- 	return( serverpid != pidfound );
- }
- 
-+
-+#ifdef USE_CONKIT
-+static void
-+register_new_session_with_console_kit (void)
-+{
-+	static char conkitbuf[256];
-+	DBusError   error;
-+
-+	ckc = ck_connector_new ();
-+	if (ckc == NULL) {
-+		Error ("Cannot register with ConsoleKit: OOM creating CkConnector\n");
-+		goto out;
-+	}
-+
-+	dbus_error_init (&error);
-+	if (!ck_connector_open_session (ckc, &error)) {
-+		Error ("Cannot register with ConsoleKit: %s: %s\n", error.name, error.message);
-+		goto out;
-+	}
-+
-+	/* If we managed to register with ConsoleKit, put the
-+	 * environment variable XDG_SESSION_COOKIE=cookie as second
-+	 * element in newenviron. See set_environment() where we
-+	 * earlier have made sure there is room...
-+	 */
-+	conkitbuf[sizeof (conkitbuf) - 1] = '\0';
-+	snprintf (conkitbuf, sizeof (conkitbuf) - 1, "XDG_SESSION_COOKIE=%s", ck_connector_get_cookie (ckc));
-+	newenviron[1] = conkitbuf;
-+out:
-+	;
-+}
-+#endif /* USE_CONKIT */
-+
- static int
- startServer(char *server[])
- {
-@@ -631,6 +670,12 @@ startServer(char *server[])
- 		break;
- 	}
- 
-+#ifdef USE_CONKIT
-+	if (serverpid != -1 ) {
-+		register_new_session_with_console_kit ();
-+	}
-+#endif /* USE_CONKIT */
-+
- 	return(serverpid);
- }
- 
-@@ -775,6 +820,13 @@ shutdown(void)
- 				clientpid);
- 	}
- 
-+#ifdef USE_CONKIT
-+	if (ckc != NULL) {
-+		ck_connector_unref (ckc);
-+		ckc = NULL;
-+	}
-+#endif
-+
- 	if (serverpid < 0)
- 		return;
- 	errno = 0;
-@@ -811,6 +863,13 @@ shutdown(void)
-  * make a new copy of environment that has room for DISPLAY
-  */
- 
-+
-+#ifdef USE_CONKIT
-+#define NUM_EXTRA_ENV_VARS 4
-+#else
-+#define NUM_EXTRA_ENV_VARS 3
-+#endif
-+
- static void 
- set_environment(void)
- {
-@@ -822,11 +881,11 @@ set_environment(void)
-     for (oldPtr = environ; *oldPtr; oldPtr++) ;
- 
-     nenvvars = (oldPtr - environ);
--    newenviron = (char **) malloc ((nenvvars + 3) * sizeof(char **));
-+    newenviron = (char **) malloc ((nenvvars + NUM_EXTRA_ENV_VARS) * sizeof(char **));
-     if (!newenviron) {
- 	fprintf (stderr,
- 		 "%s:  unable to allocate %d pointers for environment\n",
--		 program, nenvvars + 3);
-+		 program, nenvvars + NUM_EXTRA_ENV_VARS);
- 	exit (1);
-     }
- 
-@@ -836,10 +895,18 @@ set_environment(void)
-     newPtr = newenviron;
-     *newPtr++ = displaybuf;
- 
-+#ifdef USE_CONKIT
-+    *newPtr++ = "XDG_SESSION_COOKIE=";
-+#endif
-+
-     /* copy pointers to other variables */
-     for (oldPtr = environ; *oldPtr; oldPtr++) {
- 	if (strncmp (*oldPtr, "DISPLAY=", 8) != 0
--	 && strncmp (*oldPtr, "WINDOWPATH=", 11) != 0) {
-+	 && strncmp (*oldPtr, "WINDOWPATH=", 11) != 0
-+#ifdef USE_CONKIT
-+	 && strncmp (*oldPtr, "XDG_SESSION_COOKIE=", 19) != 0
-+#endif
-+	 ) {
- 	    *newPtr++ = *oldPtr;
- 	}
-     }
diff --git a/x11-apps/xinit/files/xinitrc b/x11-apps/xinit/files/xinitrc
deleted file mode 100644
index 6072d116d08d..000000000000
--- a/x11-apps/xinit/files/xinitrc
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/bin/sh
-# $Xorg: xinitrc.cpp,v 1.3 2000/08/17 19:54:30 cpqbld Exp $
-
-userresources=$HOME/.Xresources
-usermodmap=$HOME/.Xmodmap
-xinitdir=/etc/X11
-sysresources=$xinitdir/Xresources
-sysmodmap=$xinitdir/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
-
-# First try ~/.xinitrc
-if [ -f "$HOME/.xinitrc" ]; then
-	XINITRC="$HOME/.xinitrc"
-	if [ -x $XINITRC ]; then
-		# if the x bit is set on .xinitrc
-		# it means the xinitrc is not a
-		# shell script but something else
-		exec $XINITRC
-	else
-		exec /bin/sh "$HOME/.xinitrc"
-	fi
-# If not present, try the system default
-elif [ -n "`/etc/X11/chooser.sh`" ]; then
-	exec "`/etc/X11/chooser.sh`"
-# Failsafe
-else
-	# start some nice programs
-	twm &
-	xclock -geometry 50x50-1+1 &
-	xterm -geometry 80x50+494+51 &
-	xterm -geometry 80x20+494-0 &
-	exec xterm -geometry 80x66+0+0 -name login
-fi
diff --git a/x11-apps/xinit/xinit-1.0.8-r10.ebuild b/x11-apps/xinit/xinit-1.0.8-r10.ebuild
deleted file mode 100644
index 9ec0f5608308..000000000000
--- a/x11-apps/xinit/xinit-1.0.8-r10.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/xinit-1.0.8-r10.ebuild,v 1.7 2009/10/18 14:14:53 ranger Exp $
-
-EAPI="2"
-
-# Must be before x-modular eclass is inherited
-# This is enabled due to modified Makefile.am from the patches
-SNAPSHOT="yes"
-
-inherit x-modular pam
-
-DESCRIPTION="X Window System initializer"
-
-LICENSE="${LICENSE} GPL-2"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE="consolekit minimal pam"
-
-RDEPEND="
-	x11-apps/xauth
-	x11-libs/libX11
-	consolekit? (
-		sys-auth/consolekit
-		sys-apps/dbus[X]
-	)
-"
-DEPEND="${RDEPEND}"
-PDEPEND="!minimal? (
-		x11-apps/xclock
-		x11-apps/xrdb
-		x11-apps/xsm
-		x11-terms/xterm
-		x11-wm/twm
-	)
-"
-
-PATCHES=( "${FILESDIR}"/nolisten-tcp-and-black-background.patch
-	"${FILESDIR}"/gentoo-startx-customization-1.0.8.patch
-	"${FILESDIR}"/xinit-1.0.4-console-kit.patch )
-
-pkg_setup() {
-	CONFIGURE_OPTIONS="$(use_with consolekit)"
-}
-
-src_prepare() {
-	x-modular_patch_source
-
-	sed -i -e "s:^XINITDIR.*:XINITDIR = \$(sysconfdir)/X11/xinit:g" "${S}/Makefile.am"
-
-	x-modular_reconf_source
-}
-
-src_install() {
-	x-modular_src_install
-	exeinto /etc/X11
-	doexe "${FILESDIR}"/chooser.sh "${FILESDIR}"/startDM.sh || die
-	exeinto /etc/X11/Sessions
-	doexe "${FILESDIR}"/Xsession || die
-	exeinto /etc/X11/xinit
-	doexe "${FILESDIR}"/xinitrc || die
-	newinitd "${FILESDIR}"/xdm.initd-3 xdm
-	newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup
-	newconfd "${FILESDIR}"/xdm.confd-1 xdm
-	newpamd "${FILESDIR}"/xserver.pamd xserver
-}
-
-pkg_postinst() {
-	x-modular_pkg_postinst
-	ewarn "If you use startx to start X instead of a login manager like gdm/kdm,"
-	ewarn "you can set the XSESSION variable to anything in /etc/X11/Sessions/ or"
-	ewarn "any executable. When you run startx, it will run this as the login session."
-	ewarn "You can set this in a file in /etc/env.d/ for the entire system,"
-	ewarn "or set it per-user in ~/.bash_profile (or similar for other shells)."
-	ewarn "Here's an example of setting it for the whole system:"
-	ewarn "    echo XSESSION=\"Gnome\" > /etc/env.d/90xsession"
-	ewarn "    env-update && source /etc/profile"
-	ewarn
-	ewarn "If you use the nox boot option to prevent x from starting on boot,"
-	ewarn "you should now use gentoo=nox."
-}