Bump for 7.0RC2. Also add regenerated startx customization patch, which was

probably around longer than I've been using Linux.
(Portage version: 2.0.53_rc7)

5 files changed, 208 insertions, 12 deletions

diff --git a/x11-apps/xinit/ChangeLog b/x11-apps/xinit/ChangeLog
index e0d775c06c13..25925b667642 100644
--- a/x11-apps/xinit/ChangeLog
+++ b/x11-apps/xinit/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-apps/xinit
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/ChangeLog,v 1.23 2005/11/02 10:55:38 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/ChangeLog,v 1.24 2005/11/11 19:38:36 joshuabaergen Exp $
+
+*xinit-0.99.3 (11 Nov 2005)
+
+  11 Nov 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +files/gentoo-startx-customization-0.99.3.patch, +xinit-0.99.3.ebuild:
+  Bump for 7.0RC2.  Also add regenerated startx customization patch, which was
+  probably around longer than I've been using Linux.
 
   02 Nov 2005; Diego Pettenò <flameeyes@gentoo.org> xinit-0.99.2-r1.ebuild:
   If you use dopamd, inherit pam eclass.
diff --git a/x11-apps/xinit/Manifest b/x11-apps/xinit/Manifest
index d98dd42fafd2..1ac87bca36d9 100644
--- a/x11-apps/xinit/Manifest
+++ b/x11-apps/xinit/Manifest
@@ -1,10 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 1ecf17f5831cd61c98916f617307143d ChangeLog 3887
+MD5 2815b10cd745a69bb8abbedd6133a6fd ChangeLog 4179
 MD5 a0ce0f1c8a5771a1194f5895211a3f66 files/Xsession 2187
 MD5 2b07bc84cc3afab6b4de90b9e9c597c3 files/chooser.sh 1566
 MD5 25ca8e4cacf6c712886ea0e8a69a05fe files/digest-xinit-0.99.2-r1 64
+MD5 30803bb817492ff1c760da0c48d4b144 files/digest-xinit-0.99.3 64
+MD5 8eeb098734b1dde61e349ed74f7e8b28 files/gentoo-startx-customization-0.99.3.patch 3987
 MD5 c6b1ec1d810ca971703b0cc7291d3e7c files/gentoo-startx-customization.patch 3931
 MD5 8d14d094be7182b9870a0727a5d8e87b files/nolisten-tcp-and-black-background.patch 381
 MD5 965333ca03efda8a7302620a63c429f6 files/startDM.sh 922
@@ -13,10 +12,4 @@ MD5 49f1bd860cfa5fc4adb6023d8a1bb4f8 files/xinitrc 900
 MD5 708a3daf8950bbfe3aa231efb7533cb0 files/xserver.pamd 125
 MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
 MD5 ffc35e70872b2bcf32d0338bfefd2fd3 xinit-0.99.2-r1.ebuild 1144
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDaJs+j5H05b2HAEkRAlTqAJ9ivMANBD1mxzxII1+hDc/IpMYADQCbBoTi
-MMCa0849IbZ5ZZ7CU4IaLDw=
-=F/Ci
------END PGP SIGNATURE-----
+MD5 7f5ab5a844c343485b066452de952a4a xinit-0.99.3.ebuild 1151
diff --git a/x11-apps/xinit/files/digest-xinit-0.99.3 b/x11-apps/xinit/files/digest-xinit-0.99.3
new file mode 100644
index 000000000000..3a080625022f
--- /dev/null
+++ b/x11-apps/xinit/files/digest-xinit-0.99.3
@@ -0,0 +1 @@
+MD5 4ab49af18d4c48a3cfc31ab59d248841 xinit-0.99.3.tar.bz2 89417
diff --git a/x11-apps/xinit/files/gentoo-startx-customization-0.99.3.patch b/x11-apps/xinit/files/gentoo-startx-customization-0.99.3.patch
new file mode 100644
index 000000000000..ca9b2ecefec9
--- /dev/null
+++ b/x11-apps/xinit/files/gentoo-startx-customization-0.99.3.patch
@@ -0,0 +1,154 @@
+--- startx.cpp.old	2005-11-11 12:29:49.244146352 -0700
++++ startx.cpp	2005-11-11 12:34:11.169327672 -0700
+@@ -64,8 +64,6 @@
+ 
+ userserverrc=$HOME/.xserverrc
+ sysserverrc=XINITDIR/xserverrc
+-defaultclient=BINDIR/xterm
+-defaultserver=BINDIR/X
+ defaultclientargs=""
+ defaultserverargs="-nolisten tcp -br"
+ 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
+-        BINDIR/xinit $client $clientargs -- $server $display $serverargs
+-fi
+-#else
+-BINDIR/xinit $client $clientargs -- $server $display $serverargs
+-#endif
++cleanup() {
++    [ -n "$PID" ] && kill $PID > /dev/null 2>&1
+ 
+ if [ x"$removelist" != x ]; then
+     BINDIR/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
+--- xinit.c.old	2005-11-11 12:30:19.199592432 -0700
++++ xinit.c	2005-11-11 12:30:47.983216656 -0700
+@@ -446,6 +446,7 @@
+ 	signal(SIGINT, sigCatch);
+ 	signal(SIGHUP, sigCatch);
+ 	signal(SIGPIPE, sigCatch);
++	signal(SIGTERM, sigCatch);
+ #else
+ 	/* Let those signal interrupt the wait() call in the main loop */
+ 	memset(&sa, 0, sizeof sa);
+@@ -458,6 +459,7 @@
+ 	sigaction(SIGINT, &sa, NULL);
+ 	sigaction(SIGHUP, &sa, NULL);
+ 	sigaction(SIGPIPE, &sa, NULL);
++	sigaction(SIGTERM, &sa, NULL);
+ #endif
+ 	signal(SIGALRM, sigAlarm);
+ 	signal(SIGUSR1, sigUsr1);
diff --git a/x11-apps/xinit/xinit-0.99.3.ebuild b/x11-apps/xinit/xinit-0.99.3.ebuild
new file mode 100644
index 000000000000..150679a5b699
--- /dev/null
+++ b/x11-apps/xinit/xinit-0.99.3.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/xinit-0.99.3.ebuild,v 1.1 2005/11/11 19:38:36 joshuabaergen 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.Org xinit application"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~s390 ~sh ~sparc ~x86"
+RDEPEND="x11-libs/libX11
+		x11-wm/twm
+		x11-apps/xclock
+		x11-terms/xterm"
+DEPEND="${RDEPEND}"
+
+PATCHES="${FILESDIR}/nolisten-tcp-and-black-background.patch
+	${FILESDIR}/gentoo-startx-customization-0.99.3.patch"
+
+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
+	exeinto /etc/X11/Sessions
+	doexe ${FILESDIR}/Xsession
+	exeinto /etc/X11/xinit
+	doexe ${FILESDIR}/xinitrc
+	newinitd ${FILESDIR}/xdm.start xdm
+	newpamd ${FILESDIR}/xserver.pamd xserver
+}