Initial commit of portage overlay.

19 files changed, 852 insertions, 0 deletions

diff --git a/x11-apps/xinit/CVS/Entries b/x11-apps/xinit/CVS/Entries
new file mode 100644
index 0000000..e5fac66
--- /dev/null
+++ b/x11-apps/xinit/CVS/Entries
@@ -0,0 +1,5 @@
+D/files////
+/metadata.xml/1.1/Fri Sep  9 07:07:27 2005//
+/ChangeLog/1.39/Sun Apr  2 23:59:25 2006//
+/Manifest/1.61/Sun Apr  2 23:59:25 2006//
+/xinit-1.0.1.ebuild/1.10/Sun Apr  2 23:59:25 2006//
diff --git a/x11-apps/xinit/CVS/Repository b/x11-apps/xinit/CVS/Repository
new file mode 100644
index 0000000..5735815
--- /dev/null
+++ b/x11-apps/xinit/CVS/Repository
@@ -0,0 +1 @@
+gentoo-x86/x11-apps/xinit
diff --git a/x11-apps/xinit/CVS/Root b/x11-apps/xinit/CVS/Root
new file mode 100644
index 0000000..c108e17
--- /dev/null
+++ b/x11-apps/xinit/CVS/Root
@@ -0,0 +1 @@
+spyderous@cvs.gentoo.org:/var/cvsroot
diff --git a/x11-apps/xinit/ChangeLog b/x11-apps/xinit/ChangeLog
new file mode 100644
index 0000000..43b51b8
--- /dev/null
+++ b/x11-apps/xinit/ChangeLog
@@ -0,0 +1,180 @@
+# ChangeLog for x11-apps/xinit
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/ChangeLog,v 1.39 2006/03/31 20:12:12 flameeyes Exp $
+
+  31 Mar 2006; Diego Pettenò <flameeyes@gentoo.org> xinit-1.0.1.ebuild:
+  Add ~x86-fbsd keyword.
+
+  23 Mar 2006; Donnie Berkholz <spyderous@gentoo.org>; files/chooser.sh:
+  (#118072) Don't choose twm over valid XSESSION setting when the session
+  isn't in /etc/X11/Sessions/.
+
+  09 Mar 2006; Aron Griffis <agriffis@gentoo.org> xinit-1.0.1.ebuild:
+  Mark 1.0.1 ~ia64
+
+  14 Feb 2006; Markus Rothe <corsair@gentoo.org> xinit-1.0.1.ebuild:
+  Added ~ppc64
+
+  31 Jan 2006; Rene Nussbaumer <killerfox@gentoo.org> xinit-1.0.1.ebuild:
+  Unstable on hppa.
+
+  14 Jan 2006; Joshua Baergen <joshuabaergen@gentoo.org> xinit-1.0.1.ebuild:
+  xinit uses the GPL-2 among its other licenses.
+
+  26 Dec 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  -xinit-0.99.4.ebuild, -xinit-1.0.0.ebuild:
+  Pull old versions.
+
+  26 Dec 2005; Stefaan De Roeck <stefaan@gentoo.org> xinit-1.0.1.ebuild:
+  Marked ~alpha
+
+  25 Dec 2005; Doug Goldstein <cardoe@gentoo.org> xinit-1.0.1.ebuild:
+  adding ~ppc
+
+  24 Dec 2005; Joshua Baergen <joshuabaergen@gentoo.org> xinit-1.0.1.ebuild:
+  Add x11-apps/xrdb dependency per bug #116595 (Chris Mayo).  Dropped a couple
+  keywords to match xrdb.
+
+*xinit-1.0.1 (23 Dec 2005)
+
+  23 Dec 2005; Donnie Berkholz <spyderous@gentoo.org>; +xinit-1.0.1.ebuild:
+  Bump for 7.0.
+
+*xinit-1.0.0 (18 Dec 2005)
+
+  18 Dec 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +xinit-1.0.0.ebuild:
+  Bump for 7.0RC4.
+
+  09 Dec 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  -files/gentoo-startx-customization-0.99.3.patch,
+  -files/gentoo-startx-customization.patch:
+  Unused file.
+
+  09 Dec 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  -xinit-0.99.2-r1.ebuild, -xinit-0.99.3.ebuild:
+  Pull old versions.
+
+*xinit-0.99.4 (04 Dec 2005)
+
+  04 Dec 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +files/gentoo-startx-customization-0.99.4.patch, +xinit-0.99.4.ebuild:
+  Bump for 7.0RC3.
+
+*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.
+
+  30 Oct 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  xinit-0.99.2-r1.ebuild:
+  Add twm, xclock and xterm to RDEPEND since they're required for the fallback
+  state.
+
+  20 Oct 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  -xinit-0.99.0-r2.ebuild, -xinit-0.99.1_pre20050905-r3.ebuild,
+  -xinit-0.99.2.ebuild:
+  Drop old versions.
+
+*xinit-0.99.2-r1 (20 Oct 2005)
+
+  20 Oct 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +xinit-0.99.2-r1.ebuild:
+  Uncomment SNAPSHOT so that Makefile.am patch takes effect.
+
+*xinit-0.99.2 (20 Oct 2005)
+
+  20 Oct 2005; Donnie Berkholz <spyderous@gentoo.org>; +xinit-0.99.2.ebuild:
+  Bump for 7.0 RC1.
+
+  19 Oct 2005; Stephen P. Becker <geoman@gentoo.org>
+  xinit-0.99.1_pre20050905-r3.ebuild:
+  added ~mips keyword
+
+  09 Sep 2005; Donnie Berkholz <spyderous@gentoo.org>; +metadata.xml:
+  Add metadata.
+
+*xinit-0.99.1_pre20050905-r3 (08 Sep 2005)
+
+  08 Sep 2005; Joshua Baergen <joshuabaergen@gentoo.org> files/xinitrc,
+  -xinit-0.99.1_pre20050905-r2.ebuild, +xinit-0.99.1_pre20050905-r3.ebuild:
+  Use /etc/X11/X{modmap,resources} instead of /usr/lib/X11/xinit/...  Fixes bug
+  #89624.  Reference: bug #25273 comment 8.
+
+*xinit-0.99.1_pre20050905-r2 (07 Sep 2005)
+
+  07 Sep 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +files/xserver.pamd, -xinit-0.99.1_pre20050905-r1.ebuild,
+  +xinit-0.99.1_pre20050905-r2.ebuild:
+  Added /etc/pam.d/xserver from xorg-x11.
+
+  07 Sep 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  xinit-0.99.1_pre20050905-r1.ebuild:
+  Marked ~ppc.
+
+  06 Sep 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  -xinit-0.99.1_pre20050905.ebuild:
+  Remove old revision.
+
+*xinit-0.99.1_pre20050905-r1 (06 Sep 2005)
+
+  06 Sep 2005; Joshua Baergen <joshuabaergen@gentoo.org> +files/xdm.start,
+  +xinit-0.99.1_pre20050905-r1.ebuild:
+  Fixed snapshot SRC_URI and added xdm init script.
+
+*xinit-0.99.1_pre20050905 (06 Sep 2005)
+
+  06 Sep 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +xinit-0.99.1_pre20050905.ebuild, -xinit-0.99.1.ebuild:
+  Fixed version in anticipation of upstream release.
+
+*xinit-0.99.1 (05 Sep 2005)
+
+  05 Sep 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +xinit-0.99.1.ebuild:
+  New snapshot.
+
+  04 Sep 2005; MATSUU Takuto <matsuu@gentoo.org> xinit-0.99.0-r2.ebuild:
+  Added ~sh
+
+  20 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>; -xinit-0.99.0.ebuild,
+  -xinit-0.99.0-r1.ebuild:
+  Remove old versions.
+
+  20 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>; files/xinitrc:
+  System files shouldn't have a . prefix. Change to Xresources and Xmodmap.
+
+  16 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>; files/chooser.sh,
+  files/xinitrc:
+  Get rid of references to /usr/X11R6.
+
+  15 Aug 2005; Herbie Hopkins <herbs@gentoo.org> xinit-0.99.0-r2.ebuild:
+  Marked ~amd64.
+
+*xinit-0.99.0-r2 (14 Aug 2005)
+
+  14 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>; +files/Xsession,
+  +files/chooser.sh, +files/gentoo-startx-customization.patch,
+  +files/startDM.sh, +files/xinitrc, +xinit-0.99.0-r2.ebuild:
+  Add all the old Gentoo xinit stuff, so it works properly with /etc/rc.conf
+  and so on.
+
+*xinit-0.99.0-r1 (11 Aug 2005)
+
+  11 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  +files/nolisten-tcp-and-black-background.patch, +xinit-0.99.0-r1.ebuild:
+  By popular demand, add nolisten-tcp-and-black-background.patch.
+
+  08 Aug 2005; Ferris McCormick <fmccor@gentoo.org> xinit-0.99.0.ebuild:
+  Add ~sparc keyword (Modular X testing).
+
+*xinit-0.99.0 (08 Aug 2005)
+
+  08 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>; +xinit-0.99.0.ebuild:
+  Initial commit for modular X.
+
diff --git a/x11-apps/xinit/Manifest b/x11-apps/xinit/Manifest
new file mode 100644
index 0000000..1787ddb
--- /dev/null
+++ b/x11-apps/xinit/Manifest
@@ -0,0 +1,36 @@
+MD5 a73746cbad6ef003733f85f91f1b1f30 ChangeLog 6056
+RMD160 dbeec4ab7db39ed19511550cd5fe1fbd171a82a1 ChangeLog 6056
+SHA256 505869015b0d56676e0ece1da478d585ad9a2d79bafffdccbaad68d7f8381aca ChangeLog 6056
+MD5 a0ce0f1c8a5771a1194f5895211a3f66 files/Xsession 2187
+RMD160 ffb290e9a8656b17d7744797456a45df53cafd79 files/Xsession 2187
+SHA256 bdf2cceaafb71762bc1c6491f9bd8cc24089dea7ef65b0a030acadf7f4aa4ab3 files/Xsession 2187
+MD5 821912b0616c553a799e8404376e0158 files/chooser.sh 1506
+RMD160 164d582885f01a71bd5b6e6d824fcfcbedba2e9c files/chooser.sh 1506
+SHA256 e262a03579fd353020bac38213bfb9821875644b6f06228874f2c1d90d7a47a0 files/chooser.sh 1506
+MD5 c8f5beff4bef1118192ff37d20b3819a files/digest-xinit-1.0.2 235
+RMD160 4a431e028d1dda40bc62e2b5af370efd00d821d7 files/digest-xinit-1.0.2 235
+SHA256 a8f4441513332ff52b02d667e403ebb39418f3eb6df177c51899f70b21c59cd1 files/digest-xinit-1.0.2 235
+MD5 de00e8a136985faa77ce4bfa4e724ff8 files/gentoo-startx-customization-0.99.4.patch 3965
+RMD160 a1b2a04f2de1b40721536e75f224565cf0aba8c4 files/gentoo-startx-customization-0.99.4.patch 3965
+SHA256 9452459f4880b2de599a502425ccb6897386af5d0649772e6a67b6d0b0c568e8 files/gentoo-startx-customization-0.99.4.patch 3965
+MD5 8d14d094be7182b9870a0727a5d8e87b files/nolisten-tcp-and-black-background.patch 381
+RMD160 f767995059b6b3826e662ad71fd9348609383dc2 files/nolisten-tcp-and-black-background.patch 381
+SHA256 481252dd205a0eefcfdf1a265b2c359280363ceaf1460ca5eab42b9eb3b3c826 files/nolisten-tcp-and-black-background.patch 381
+MD5 965333ca03efda8a7302620a63c429f6 files/startDM.sh 922
+RMD160 1f1db006ad51e5b3ec5c43f9867a4489d341bd61 files/startDM.sh 922
+SHA256 36781509e239d5d7777e181c3d95462602bcc41a95f4881c3bca2a463086f9f7 files/startDM.sh 922
+MD5 2d8c9c76bd932f311ad86f490680d349 files/xdm.start 3418
+RMD160 cc2ab8c312c595edb7f181868783d91399ee1c2e files/xdm.start 3418
+SHA256 85623bc26002fa7626b2c07292fa55b9af10682f00221bcfb55bec7efa8ccdcc files/xdm.start 3418
+MD5 49f1bd860cfa5fc4adb6023d8a1bb4f8 files/xinitrc 900
+RMD160 83c79cd32df084f75c4b461ae3fe649a23016465 files/xinitrc 900
+SHA256 2061aa5e8a4e01f82aaebcec145ed087cd4b995baaf42e08ae241715b00e18d0 files/xinitrc 900
+MD5 708a3daf8950bbfe3aa231efb7533cb0 files/xserver.pamd 125
+RMD160 4b75f8bf5e68ac7181a22beaccc153ac250eb8e9 files/xserver.pamd 125
+SHA256 f179c3417b94295fe12776f9da4a08898a3ee4199e26abff6457717caeb29bb2 files/xserver.pamd 125
+MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
+RMD160 c1274bdccf57603d580de0075ba07a35b7509560 metadata.xml 156
+SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 metadata.xml 156
+MD5 c9b509d0abccb7e740ddd3429e4b7226 xinit-1.0.2.ebuild 1227
+RMD160 50a8c50b33b38c39865cef6b03f90f52246c5ab9 xinit-1.0.2.ebuild 1227
+SHA256 45d3bc30b1420d77de711c646bf8a1224a409514d636ff5c27221bdfb749f081 xinit-1.0.2.ebuild 1227
diff --git a/x11-apps/xinit/files/CVS/Entries b/x11-apps/xinit/files/CVS/Entries
new file mode 100644
index 0000000..60c59c4
--- /dev/null
+++ b/x11-apps/xinit/files/CVS/Entries
@@ -0,0 +1,10 @@
+/Xsession/1.1/Sun Aug 14 00:11:36 2005//
+/startDM.sh/1.1/Sun Aug 14 00:12:39 2005//
+/nolisten-tcp-and-black-background.patch/1.1/Sun Aug 14 00:11:36 2005//
+/xdm.start/1.1/Tue Sep  6 19:33:51 2005//
+/xinitrc/1.4/Tue Sep 20 03:14:05 2005//
+/xserver.pamd/1.1/Wed Sep  7 23:22:47 2005//
+/gentoo-startx-customization-0.99.4.patch/1.1/Sun Dec  4 22:06:52 2005//
+/digest-xinit-1.0.1/1.2/Tue Mar 14 00:34:19 2006//
+/chooser.sh/1.3/Thu Mar 23 07:56:22 2006//
+D
diff --git a/x11-apps/xinit/files/CVS/Repository b/x11-apps/xinit/files/CVS/Repository
new file mode 100644
index 0000000..7e69eef
--- /dev/null
+++ b/x11-apps/xinit/files/CVS/Repository
@@ -0,0 +1 @@
+gentoo-x86/x11-apps/xinit/files
diff --git a/x11-apps/xinit/files/CVS/Root b/x11-apps/xinit/files/CVS/Root
new file mode 100644
index 0000000..c108e17
--- /dev/null
+++ b/x11-apps/xinit/files/CVS/Root
@@ -0,0 +1 @@
+spyderous@cvs.gentoo.org:/var/cvsroot
diff --git a/x11-apps/xinit/files/Xsession b/x11-apps/xinit/files/Xsession
new file mode 100755
index 0000000..c86ccee
--- /dev/null
+++ b/x11-apps/xinit/files/Xsession
@@ -0,0 +1,107 @@
+#!/bin/sh
+# $XConsortium: Xsession /main/10 1995/12/18 18:21:28 gildea $
+
+case $# in
+1)
+	case $1 in
+	failsafe)
+		exec xterm -geometry 80x24-0-0
+		;;
+	esac
+esac
+
+# redirect errors to a file in user's home directory if we can
+for errfile in "$HOME/.xsession-errors" "${TMPDIR-/tmp}/xses-$USER" "/tmp/xses-$USER"
+do
+	if ( cp /dev/null "$errfile" 2> /dev/null )
+	then
+		chmod 600 "$errfile"
+		exec > "$errfile" 2>&1
+		break
+	fi
+done
+
+# clean up after xbanner
+if which freetemp 2> /dev/null ; then
+	freetemp
+fi
+
+startup=$HOME/.xsession
+
+userresources=$HOME/.Xresources 
+usermodmap=$HOME/.Xmodmap 
+userxkbmap=$HOME/.Xkbmap
+
+sysresources=/etc/X11/Xresources 
+sysmodmap=/etc/X11/Xmodmap 
+sysxkbmap=/etc/X11/Xkbmap
+
+rh6sysresources=/etc/X11/xinit/Xresources 
+rh6sysmodmap=/etc/X11/xinit/Xmodmap 
+
+
+# merge in defaults
+if [ -f "$rh6sysresources" ]; then
+    xrdb -merge "$rh6sysresources"
+fi
+
+if [ -f "$sysresources" ]; then
+    xrdb -merge "$sysresources"
+fi
+
+if [ -f "$userresources" ]; then
+    xrdb -merge "$userresources"
+fi
+
+# merge in keymaps
+if [ -f "$sysxkbmap" ]; then
+    setxkbmap `cat "$sysxkbmap"`
+    XKB_IN_USE=yes
+fi
+
+if [ -f "$userxkbmap" ]; then
+    setxkbmap `cat "$userxkbmap"`
+    XKB_IN_USE=yes
+fi
+
+#
+# Eeek, this seems like too much magic here
+#
+if [ -z "$XKB_IN_USE" -a ! -L /etc/X11/X ]; then
+    if grep '^exec.*/Xsun' /etc/X11/X > /dev/null 2>&1 && [ -f /etc/X11/XF86Config ]; then
+       xkbsymbols=`sed -n -e 's/^[     ]*XkbSymbols[   ]*"\(.*\)".*$/\1/p' /etc/X11/XF86Config`
+       if [ -n "$xkbsymbols" ]; then
+           setxkbmap -symbols "$xkbsymbols"
+           XKB_IN_USE=yes
+       fi
+    fi
+fi
+
+# xkb and xmodmap don't play nice together
+if [ -z "$XKB_IN_USE" ]; then
+    if [ -f "$rh6sysmodmap" ]; then
+       xmodmap "$rh6sysmodmap"
+    fi
+
+    if [ -f "$sysmodmap" ]; then
+       xmodmap "$sysmodmap"
+    fi
+
+    if [ -f "$usermodmap" ]; then
+       xmodmap "$usermodmap"
+    fi
+fi
+
+unset XKB_IN_USE
+
+if [ -x "$startup" ]; then
+	exec "$startup"
+elif [ -x "$HOME/.Xclients" ]; then
+	exec "$HOME/.Xclients"
+elif [ -x /etc/X11/xinit/Xclients ]; then
+	exec /etc/X11/xinit/Xclients
+elif [ -x /etc/X11/Xclients ]; then
+	exec /etc/X11/Xclients
+else
+	exec xsm
+fi
diff --git a/x11-apps/xinit/files/chooser.sh b/x11-apps/xinit/files/chooser.sh
new file mode 100755
index 0000000..b8ef45c
--- /dev/null
+++ b/x11-apps/xinit/files/chooser.sh
@@ -0,0 +1,61 @@
+#!/bin/sh
+# 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.3 2006/03/23 07:56:22 spyderous Exp $
+
+# If $XSESSION is "", source first /etc/conf.d/basic, and then /etc/rc.conf
+if [ -z "${XSESSION}" ]
+then
+	[ -f /etc/conf.d/basic ] && source /etc/conf.d/basic
+	[ -f /etc/rc.conf ] && source /etc/rc.conf
+fi
+
+# Find a match for $XSESSION in /etc/X11/Sessions
+GENTOO_SESSION=""
+for x in /etc/X11/Sessions/*
+do
+	if [ "`echo ${x##*/} | awk '{ print toupper($1) }'`" \
+		= "`echo ${XSESSION} | awk '{ print toupper($1) }'`" ]
+	then
+		GENTOO_SESSION=${x}
+		break
+	fi
+done
+
+GENTOO_EXEC=""
+
+if [ -n "${XSESSION}" ]; then
+	if [ -f /etc/X11/Sessions/${XSESSION} ]; then
+		if [ -x /etc/X11/Sessions/${XSESSION} ]; then
+			GENTOO_EXEC="/etc/X11/Sessions/${XSESSION}"
+		else
+			GENTOO_EXEC="/bin/sh /etc/X11/Sessions/${XSESSION}"
+		fi
+	elif [ -n "${GENTOO_SESSION}" ]; then
+		if [ -x "${GENTOO_SESSION}" ]; then
+			GENTOO_EXEC="${GENTOO_SESSION}"
+		else
+			GENTOO_EXEC="/bin/sh ${GENTOO_SESSION}"
+		fi
+	else
+		x=""
+		y=""
+		
+		for x in "${XSESSION}" \
+			"`echo ${XSESSION} | awk '{ print toupper($1) }'`" \
+			"`echo ${XSESSION} | awk '{ print tolower($1) }'`"
+		do
+			# Fall through ...
+			if [ -x "`which ${x} 2>/dev/null`" ]; then
+				GENTOO_EXEC="`which ${x} 2>/dev/null`"
+				break
+			fi
+		done
+	fi
+fi
+
+echo "${GENTOO_EXEC}"
+
+
+# vim:ts=4
diff --git a/x11-apps/xinit/files/digest-xinit-1.0.2 b/x11-apps/xinit/files/digest-xinit-1.0.2
new file mode 100644
index 0000000..29ec40d
--- /dev/null
+++ b/x11-apps/xinit/files/digest-xinit-1.0.2
@@ -0,0 +1,3 @@
+MD5 d591fafe69b57969b0521c461073a01f xinit-1.0.2.tar.bz2 96536
+RMD160 b3ced92e7ffb1afc3880799ed18f584e7f58d048 xinit-1.0.2.tar.bz2 96536
+SHA256 254ee0f81384fb184229d73d546fb07344c5448bbd4f4a66fef595ae49f8f395 xinit-1.0.2.tar.bz2 96536
diff --git a/x11-apps/xinit/files/gentoo-startx-customization-0.99.4.patch b/x11-apps/xinit/files/gentoo-startx-customization-0.99.4.patch
new file mode 100644
index 0000000..2544fb0
--- /dev/null
+++ b/x11-apps/xinit/files/gentoo-startx-customization-0.99.4.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=XTERM
+-defaultserver=XSERVER
+ 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
+-        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
+     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/files/nolisten-tcp-and-black-background.patch b/x11-apps/xinit/files/nolisten-tcp-and-black-background.patch
new file mode 100644
index 0000000..ab7f960
--- /dev/null
+++ b/x11-apps/xinit/files/nolisten-tcp-and-black-background.patch
@@ -0,0 +1,12 @@
+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/startDM.sh b/x11-apps/xinit/files/startDM.sh
new file mode 100755
index 0000000..ad2c9ea
--- /dev/null
+++ b/x11-apps/xinit/files/startDM.sh
@@ -0,0 +1,37 @@
+#!/bin/bash
+# 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/startDM.sh,v 1.1 2005/08/14 00:12:39 spyderous Exp $
+
+source /etc/init.d/functions.sh
+
+# We need to source /etc/profile for stuff like $LANG to work
+# bug #10190.
+source /etc/profile
+
+# Great new Gnome2 feature, AA
+# We enable this by default
+export GDK_USE_XFT=1
+
+if [ -e ${svcdir}/options/xdm/service ]
+then
+	retval=0
+	EXE="`cat ${svcdir}/options/xdm/service`"
+
+	/sbin/start-stop-daemon --start --quiet --exec ${EXE}
+	retval=$?
+	# Fix bug #26125 for slower systems
+	wait; sleep 2
+	
+	if [ "${retval}" -ne 0 ]
+	then
+		# there was a error running the DM
+		einfo "ERROR: could not start the Display Manager..."
+		# make sure we do not have a misbehaving DM
+		killall -9 ${EXE##*/}
+	fi
+fi
+
+
+# vim:ts=4
diff --git a/x11-apps/xinit/files/xdm.start b/x11-apps/xinit/files/xdm.start
new file mode 100755
index 0000000..fe4b191
--- /dev/null
+++ b/x11-apps/xinit/files/xdm.start
@@ -0,0 +1,147 @@
+#!/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.1 2005/09/06 19:33:51 joshuabaergen Exp $
+
+# This is here to serve as a note to myself, and future developers.
+#
+# Any Display manager (gdm,kdm,xdm) have 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() {
+	use xfs hotplug
+}
+
+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}"
+		#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
+		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/xinitrc b/x11-apps/xinit/files/xinitrc
new file mode 100644
index 0000000..f2ba1d7
--- /dev/null
+++ b/x11-apps/xinit/files/xinitrc
@@ -0,0 +1,43 @@
+#!/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"
+	exec /bin/sh "$HOME/.xinitrc"
+# 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/files/xserver.pamd b/x11-apps/xinit/files/xserver.pamd
new file mode 100644
index 0000000..b093f86
--- /dev/null
+++ b/x11-apps/xinit/files/xserver.pamd
@@ -0,0 +1,5 @@
+#%PAM-1.0
+auth       sufficient   pam_rootok.so
+auth       required     pam_permit.so
+
+account    required     pam_permit.so
diff --git a/x11-apps/xinit/metadata.xml b/x11-apps/xinit/metadata.xml
new file mode 100644
index 0000000..01c4c00
--- /dev/null
+++ b/x11-apps/xinit/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>x11</herd>
+</pkgmetadata>
diff --git a/x11-apps/xinit/xinit-1.0.2.ebuild b/x11-apps/xinit/xinit-1.0.2.ebuild
new file mode 100644
index 0000000..7f547c0
--- /dev/null
+++ b/x11-apps/xinit/xinit-1.0.2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/xinit-1.0.1.ebuild,v 1.10 2006/03/31 20:12:12 flameeyes 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="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+RDEPEND="x11-libs/libX11
+		x11-wm/twm
+		x11-apps/xclock
+		x11-apps/xrdb
+		x11-terms/xterm"
+DEPEND="${RDEPEND}"
+LICENSE="${LICENSE} GPL-2"
+
+PATCHES="${FILESDIR}/nolisten-tcp-and-black-background.patch
+	${FILESDIR}/gentoo-startx-customization-0.99.4.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
+}