Bump.

(Portage version: 2.1.4.4)

3 files changed, 220 insertions, 1 deletions

diff --git a/x11-apps/xinit/ChangeLog b/x11-apps/xinit/ChangeLog
index 0596e2e6c048..2511fa6b88d2 100644
--- a/x11-apps/xinit/ChangeLog
+++ b/x11-apps/xinit/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-apps/xinit
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/ChangeLog,v 1.112 2008/01/13 22:27:31 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/ChangeLog,v 1.113 2008/03/10 01:58:15 dberkholz Exp $
+
+*xinit-1.0.8 (10 Mar 2008)
+
+  10 Mar 2008; Donnie Berkholz <dberkholz@gentoo.org>;
+  +files/gentoo-startx-customization-1.0.8.patch, +xinit-1.0.8.ebuild:
+  Bump.
 
 *xinit-1.0.5-r2 (13 Jan 2008)
 
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
new file mode 100644
index 000000000000..c78283d8cdd9
--- /dev/null
+++ b/x11-apps/xinit/files/gentoo-startx-customization-1.0.8.patch
@@ -0,0 +1,151 @@
+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/xinit-1.0.8.ebuild b/x11-apps/xinit/xinit-1.0.8.ebuild
new file mode 100644
index 000000000000..e3f25178dff3
--- /dev/null
+++ b/x11-apps/xinit/xinit-1.0.8.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2008 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.ebuild,v 1.1 2008/03/10 01:58:15 dberkholz Exp $
+
+# 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="hal minimal pam"
+
+RDEPEND="x11-apps/xauth
+	x11-libs/libX11
+	hal? ( sys-auth/consolekit )"
+DEPEND="${RDEPEND}"
+PDEPEND="!minimal? ( x11-wm/twm
+				x11-apps/xclock
+				x11-apps/xrdb
+				x11-apps/xsm
+				x11-terms/xterm )"
+
+PATCHES="${FILESDIR}/nolisten-tcp-and-black-background.patch
+	${FILESDIR}/gentoo-startx-customization-1.0.8.patch
+	${FILESDIR}/xinit-1.0.4-console-kit.patch"
+
+CONFIGURE_OPTIONS="$(use_with hal consolekit)"
+
+pkg_setup() {
+	if use hal; then
+		if ! built_with_use sys-apps/dbus X ; then
+			eerror "You MUST build sys-apps/dbus with the X USE flag enabled."
+			die "You MUST build sys-apps/dbus with the X USE flag enabled."
+		fi
+	fi
+}
+
+src_unpack() {
+	x-modular_unpack_source
+	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-1 xdm
+	newconfd "${FILESDIR}"/xdm.confd-1 xdm
+	newpamd "${FILESDIR}"/xserver.pamd xserver
+}