Bump.

Package-Manager: portage-2.1.4.4

27 files changed, 577 insertions, 22 deletions

diff --git a/x11-apps/mkfontdir/ChangeLog b/x11-apps/mkfontdir/ChangeLog
index 22617ed44e48..b11273424de7 100644
--- a/x11-apps/mkfontdir/ChangeLog
+++ b/x11-apps/mkfontdir/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-apps/mkfontdir
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/mkfontdir/ChangeLog,v 1.39 2007/10/09 09:18:10 dberkholz Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/mkfontdir/ChangeLog,v 1.40 2008/03/10 01:53:42 dberkholz Exp $
+
+*mkfontdir-1.0.4 (10 Mar 2008)
+
+  10 Mar 2008; Donnie Berkholz <dberkholz@gentoo.org>;
+  +mkfontdir-1.0.4.ebuild:
+  Bump.
 
   09 Oct 2007; Donnie Berkholz <dberkholz@gentoo.org>;
   -mkfontdir-1.0.2.ebuild:
diff --git a/x11-apps/mkfontdir/mkfontdir-1.0.4.ebuild b/x11-apps/mkfontdir/mkfontdir-1.0.4.ebuild
new file mode 100644
index 000000000000..1e1e1bbc7d1e
--- /dev/null
+++ b/x11-apps/mkfontdir/mkfontdir-1.0.4.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/mkfontdir/mkfontdir-1.0.4.ebuild,v 1.1 2008/03/10 01:53:42 dberkholz Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+
+inherit x-modular
+
+DESCRIPTION="create an index of X font files in a directory"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+
+RDEPEND="x11-apps/mkfontscale"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/mkfontscale/ChangeLog b/x11-apps/mkfontscale/ChangeLog
index 241ed4aab7eb..71c5adc583a4 100644
--- a/x11-apps/mkfontscale/ChangeLog
+++ b/x11-apps/mkfontscale/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-apps/mkfontscale
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/mkfontscale/ChangeLog,v 1.38 2007/10/09 09:17:22 dberkholz Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/mkfontscale/ChangeLog,v 1.39 2008/03/10 01:54:21 dberkholz Exp $
+
+*mkfontscale-1.0.4 (10 Mar 2008)
+
+  10 Mar 2008; Donnie Berkholz <dberkholz@gentoo.org>;
+  +mkfontscale-1.0.4.ebuild:
+  Bump.
 
   09 Oct 2007; Donnie Berkholz <dberkholz@gentoo.org>;
   -mkfontscale-1.0.1.ebuild:
diff --git a/x11-apps/mkfontscale/mkfontscale-1.0.4.ebuild b/x11-apps/mkfontscale/mkfontscale-1.0.4.ebuild
new file mode 100644
index 000000000000..d77c8ec5c64a
--- /dev/null
+++ b/x11-apps/mkfontscale/mkfontscale-1.0.4.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/mkfontscale/mkfontscale-1.0.4.ebuild,v 1.1 2008/03/10 01:54:21 dberkholz Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+
+inherit x-modular
+
+DESCRIPTION="create an index of scalable font files for X"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+
+RDEPEND="x11-libs/libfontenc
+	x11-libs/libX11
+	=media-libs/freetype-2*"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/x11perf/ChangeLog b/x11-apps/x11perf/ChangeLog
index bac8e8d226ea..a556eebe32ef 100644
--- a/x11-apps/x11perf/ChangeLog
+++ b/x11-apps/x11perf/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-apps/x11perf
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/x11perf/ChangeLog,v 1.20 2007/09/28 04:14:15 kumba Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/x11perf/ChangeLog,v 1.21 2008/03/10 01:54:57 dberkholz Exp $
+
+*x11perf-1.5 (10 Mar 2008)
+
+  10 Mar 2008; Donnie Berkholz <dberkholz@gentoo.org>; +x11perf-1.5.ebuild:
+  Bump.
 
   28 Sep 2007; Joshua Kinard <kumba@gentoo.org> x11perf-1.4.1.ebuild:
   Stable on mips, per #191615.
diff --git a/x11-apps/x11perf/x11perf-1.5.ebuild b/x11-apps/x11perf/x11perf-1.5.ebuild
new file mode 100644
index 000000000000..a49ec69ec1d5
--- /dev/null
+++ b/x11-apps/x11perf/x11perf-1.5.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/x11perf/x11perf-1.5.ebuild,v 1.1 2008/03/10 01:54:57 dberkholz Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+
+inherit x-modular
+
+DESCRIPTION="summarize x11perf results"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+RDEPEND="x11-libs/libX11
+	x11-libs/libXmu"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/xauth/ChangeLog b/x11-apps/xauth/ChangeLog
index d907419fe3c3..1b3f3a65622b 100644
--- a/x11-apps/xauth/ChangeLog
+++ b/x11-apps/xauth/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-apps/xauth
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xauth/ChangeLog,v 1.39 2007/10/09 09:07:08 dberkholz Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xauth/ChangeLog,v 1.40 2008/03/10 01:55:38 dberkholz Exp $
+
+*xauth-1.0.3 (10 Mar 2008)
+
+  10 Mar 2008; Donnie Berkholz <dberkholz@gentoo.org>; +xauth-1.0.3.ebuild:
+  Bump.
 
   09 Oct 2007; Donnie Berkholz <dberkholz@gentoo.org>; -xauth-1.0.1.ebuild:
   Drop old ebuilds.
diff --git a/x11-apps/xauth/xauth-1.0.3.ebuild b/x11-apps/xauth/xauth-1.0.3.ebuild
new file mode 100644
index 000000000000..bcb2c232c6c8
--- /dev/null
+++ b/x11-apps/xauth/xauth-1.0.3.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xauth/xauth-1.0.3.ebuild,v 1.1 2008/03/10 01:55:38 dberkholz Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+
+inherit x-modular
+
+DESCRIPTION="X authority file utility"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="ipv6"
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXau
+	x11-libs/libXext
+	x11-libs/libXmu"
+DEPEND="${RDEPEND}"
+
+CONFIGURE_OPTIONS="$(use_enable ipv6)"
diff --git a/x11-apps/xdm/ChangeLog b/x11-apps/xdm/ChangeLog
index f536876925b5..557053ec4e65 100644
--- a/x11-apps/xdm/ChangeLog
+++ b/x11-apps/xdm/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-apps/xdm
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xdm/ChangeLog,v 1.84 2008/03/07 15:56:31 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xdm/ChangeLog,v 1.85 2008/03/10 02:05:13 dberkholz Exp $
+
+*xdm-1.1.7 (10 Mar 2008)
+
+  10 Mar 2008; Donnie Berkholz <dberkholz@gentoo.org>; +xdm-1.1.7.ebuild:
+  Bump.
 
   07 Mar 2008; Brent Baude <ranger@gentoo.org> xdm-1.1.6-r1.ebuild:
   keyworded ~arch for ppc64, bug 211014
diff --git a/x11-apps/xdm/xdm-1.1.7.ebuild b/x11-apps/xdm/xdm-1.1.7.ebuild
new file mode 100644
index 000000000000..8518325028a8
--- /dev/null
+++ b/x11-apps/xdm/xdm-1.1.7.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xdm/xdm-1.1.7.ebuild,v 1.1 2008/03/10 02:05:13 dberkholz Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+
+inherit multilib x-modular pam
+
+DEFAULTVT="vt7"
+
+DESCRIPTION="X.Org xdm application"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="xprint ipv6 pam"
+
+RDEPEND="x11-apps/xrdb
+	x11-libs/libXdmcp
+	x11-libs/libXaw
+	>=x11-apps/xinit-1.0.2-r3
+	x11-libs/libXinerama
+	x11-libs/libX11
+	x11-libs/libXt
+	x11-apps/sessreg"
+DEPEND="${RDEPEND}
+	x11-proto/xineramaproto
+	x11-proto/xproto"
+
+PATCHES="${FILESDIR}/wtmp.patch
+	${FILESDIR}/xwilling-hang.patch"
+
+CONFIGURE_OPTIONS="$(use_enable xprint)
+	$(use_enable ipv6)
+	$(use_with pam)
+	--with-default-vt=${DEFAULTVT}
+	--with-xdmconfigdir=/etc/X11/xdm"
+
+pkg_setup() {
+	if use xprint && ! built_with_use x11-libs/libXaw xprint; then
+		die "Build x11-libs/libXaw with USE=xprint."
+	fi
+}
+
+src_install() {
+	x-modular_src_install
+	exeinto /usr/$(get_libdir)/X11/xdm
+	doexe "${FILESDIR}"/Xsession
+	newpamd "${FILESDIR}"/xdm.pamd xdm
+}
+
+pkg_preinst() {
+	x-modular_pkg_preinst
+
+	# Check for leftover /usr/lib/X11/xdm symlink
+	if [[ -L "/usr/lib/X11/xdm" ]]; then
+		ewarn "/usr/lib/X11/xdm is a symlink; deleting."
+		rm /usr/lib/X11/xdm
+	fi
+}
diff --git a/x11-apps/xev/ChangeLog b/x11-apps/xev/ChangeLog
index 5a64bfee9d16..2555b76c8566 100644
--- a/x11-apps/xev/ChangeLog
+++ b/x11-apps/xev/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-apps/xev
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xev/ChangeLog,v 1.19 2007/02/28 19:00:16 welp Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xev/ChangeLog,v 1.20 2008/03/10 01:56:52 dberkholz Exp $
+
+*xev-1.0.3 (10 Mar 2008)
+
+  10 Mar 2008; Donnie Berkholz <dberkholz@gentoo.org>; +xev-1.0.3.ebuild:
+  Bump.
 
   28 Feb 2007; Peter Weller <welp@gentoo.org> xev-1.0.2.ebuild:
   Keyworded x86-fbsd
diff --git a/x11-apps/xev/xev-1.0.3.ebuild b/x11-apps/xev/xev-1.0.3.ebuild
new file mode 100644
index 000000000000..7cb0e73c87b5
--- /dev/null
+++ b/x11-apps/xev/xev-1.0.3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xev/xev-1.0.3.ebuild,v 1.1 2008/03/10 01:56:52 dberkholz Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+
+inherit x-modular
+
+DESCRIPTION="print contents of X events"
+
+KEYWORDS="~alpha ~amd64 ~arm ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+
+RDEPEND="x11-libs/libX11"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/xfs/ChangeLog b/x11-apps/xfs/ChangeLog
index 3e8d345e4369..cc3d0e0311cd 100644
--- a/x11-apps/xfs/ChangeLog
+++ b/x11-apps/xfs/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-apps/xfs
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xfs/ChangeLog,v 1.50 2008/01/31 03:46:00 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xfs/ChangeLog,v 1.51 2008/03/10 01:57:30 dberkholz Exp $
+
+  10 Mar 2008; Donnie Berkholz <dberkholz@gentoo.org>; ChangeLog:
+  Bump.
 
   31 Jan 2008; Donnie Berkholz <dberkholz@gentoo.org>; -xfs-1.0.4.ebuild,
   -xfs-1.0.4-r1.ebuild:
diff --git a/x11-apps/xfs/xfs-1.0.6.ebuild b/x11-apps/xfs/xfs-1.0.6.ebuild
new file mode 100644
index 000000000000..6cf3bf2fbf48
--- /dev/null
+++ b/x11-apps/xfs/xfs-1.0.6.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xfs/xfs-1.0.6.ebuild,v 1.1 2008/03/10 01:57:30 dberkholz Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+
+inherit x-modular
+
+DESCRIPTION="X font server"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="ipv6"
+
+RDEPEND="x11-apps/ttmkfdir
+	x11-libs/libFS
+	x11-libs/libXfont"
+DEPEND="${RDEPEND}
+	x11-proto/fontsproto"
+
+CONFIGURE_OPTIONS="$(use_enable ipv6) --libdir=/etc"
+
+pkg_setup() {
+	enewgroup xfs 33
+	enewuser xfs 33 -1 /etc/X11/fs xfs
+}
+
+src_unpack() {
+	x-modular_unpack_source
+	x-modular_patch_source
+
+	sed -i -e "s:^configdir =.*:configdir = \$(sysconfdir)/X11/fs:g" \
+		"${S}"/Makefile.am
+
+	x-modular_reconf_source
+}
+
+src_install() {
+	x-modular_src_install
+
+	insinto /etc/X11/fs
+	newins "${FILESDIR}"/xfs.config config
+	newinitd "${FILESDIR}"/xfs.start xfs
+	newconfd "${FILESDIR}"/xfs.conf.d xfs
+}
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
+}
diff --git a/x11-apps/xkbcomp/ChangeLog b/x11-apps/xkbcomp/ChangeLog
index 6781a358061d..0fc691715fc9 100644
--- a/x11-apps/xkbcomp/ChangeLog
+++ b/x11-apps/xkbcomp/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-apps/xkbcomp
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xkbcomp/ChangeLog,v 1.44 2007/10/09 09:02:58 dberkholz Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xkbcomp/ChangeLog,v 1.45 2008/03/10 01:58:56 dberkholz Exp $
+
+*xkbcomp-1.0.4 (10 Mar 2008)
+
+  10 Mar 2008; Donnie Berkholz <dberkholz@gentoo.org>;
+  +xkbcomp-1.0.4.ebuild:
+  Bump.
 
   09 Oct 2007; Donnie Berkholz <dberkholz@gentoo.org>;
   -xkbcomp-1.0.2.ebuild:
diff --git a/x11-apps/xkbcomp/xkbcomp-1.0.4.ebuild b/x11-apps/xkbcomp/xkbcomp-1.0.4.ebuild
new file mode 100644
index 000000000000..2510284b8f11
--- /dev/null
+++ b/x11-apps/xkbcomp/xkbcomp-1.0.4.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xkbcomp/xkbcomp-1.0.4.ebuild,v 1.1 2008/03/10 01:58:56 dberkholz Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+
+inherit x-modular multilib
+
+DESCRIPTION="compile XKB keyboard description"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libxkbfile"
+DEPEND="${RDEPEND}"
+
+src_install() {
+	x-modular_src_install
+
+	dodir usr/share/X11/xkb
+	dosym ../../../bin/xkbcomp /usr/share/X11/xkb/xkbcomp
+
+	# (#122214) We should create this directory here, since xkeyboard-config
+	# and any other set of layouts will symlink to it.
+	dodir /var/lib/xkb
+	keepdir /var/lib/xkb
+}
diff --git a/x11-apps/xprop/ChangeLog b/x11-apps/xprop/ChangeLog
index 696beeb24836..80052d00063d 100644
--- a/x11-apps/xprop/ChangeLog
+++ b/x11-apps/xprop/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-apps/xprop
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xprop/ChangeLog,v 1.31 2008/02/05 11:37:42 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xprop/ChangeLog,v 1.32 2008/03/10 01:59:37 dberkholz Exp $
+
+*xprop-1.0.4 (10 Mar 2008)
+
+  10 Mar 2008; Donnie Berkholz <dberkholz@gentoo.org>; +xprop-1.0.4.ebuild:
+  Bump.
 
   05 Feb 2008; Markus Rothe <corsair@gentoo.org> xprop-1.0.3.ebuild:
   Stable on ppc64
diff --git a/x11-apps/xprop/xprop-1.0.4.ebuild b/x11-apps/xprop/xprop-1.0.4.ebuild
new file mode 100644
index 000000000000..68f0a8a3fa39
--- /dev/null
+++ b/x11-apps/xprop/xprop-1.0.4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xprop/xprop-1.0.4.ebuild,v 1.1 2008/03/10 01:59:37 dberkholz Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+
+inherit x-modular
+
+DESCRIPTION="property displayer for X"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+RDEPEND="x11-libs/libXmu
+	x11-libs/libX11"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/xrandr/ChangeLog b/x11-apps/xrandr/ChangeLog
index f6228386f480..87396528e9cb 100644
--- a/x11-apps/xrandr/ChangeLog
+++ b/x11-apps/xrandr/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-apps/xrandr
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xrandr/ChangeLog,v 1.45 2007/10/09 08:44:53 dberkholz Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xrandr/ChangeLog,v 1.46 2008/03/10 02:00:19 dberkholz Exp $
+
+*xrandr-1.2.3 (10 Mar 2008)
+
+  10 Mar 2008; Donnie Berkholz <dberkholz@gentoo.org>; +xrandr-1.2.3.ebuild:
+  Bump.
 
   09 Oct 2007; Donnie Berkholz <dberkholz@gentoo.org>; -xrandr-1.0.2.ebuild,
   -xrandr-1.2.0.ebuild, -xrandr-1.2.1.ebuild:
diff --git a/x11-apps/xrandr/xrandr-1.2.3.ebuild b/x11-apps/xrandr/xrandr-1.2.3.ebuild
new file mode 100644
index 000000000000..36ca63503884
--- /dev/null
+++ b/x11-apps/xrandr/xrandr-1.2.3.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xrandr/xrandr-1.2.3.ebuild,v 1.1 2008/03/10 02:00:19 dberkholz Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+
+inherit x-modular
+
+DESCRIPTION="primitive command line interface to RandR extension"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+
+RDEPEND=">=x11-libs/libXrandr-1.2
+	x11-libs/libX11"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/xrdb/ChangeLog b/x11-apps/xrdb/ChangeLog
index 09b2398fc2e1..7553d422383d 100644
--- a/x11-apps/xrdb/ChangeLog
+++ b/x11-apps/xrdb/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-apps/xrdb
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xrdb/ChangeLog,v 1.43 2007/12/20 00:04:34 cla Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xrdb/ChangeLog,v 1.44 2008/03/10 02:00:59 dberkholz Exp $
+
+*xrdb-1.0.5 (10 Mar 2008)
+
+  10 Mar 2008; Donnie Berkholz <dberkholz@gentoo.org>; +xrdb-1.0.5.ebuild:
+  Bump.
 
   19 Dec 2007; Dawid Węgliński <cla@gentoo.org> xrdb-1.0.4.ebuild:
   Stable on x86 (bug #202087)
diff --git a/x11-apps/xrdb/xrdb-1.0.5.ebuild b/x11-apps/xrdb/xrdb-1.0.5.ebuild
new file mode 100644
index 000000000000..cadc00ac838c
--- /dev/null
+++ b/x11-apps/xrdb/xrdb-1.0.5.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xrdb/xrdb-1.0.5.ebuild,v 1.1 2008/03/10 02:00:59 dberkholz Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+
+inherit x-modular
+
+DESCRIPTION="X server resource database utility"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+
+RDEPEND="x11-libs/libXmu
+	x11-libs/libX11"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/xset/ChangeLog b/x11-apps/xset/ChangeLog
index 54d52b4a9d0f..dda4bfcb7844 100644
--- a/x11-apps/xset/ChangeLog
+++ b/x11-apps/xset/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-apps/xset
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xset/ChangeLog,v 1.36 2007/12/20 00:24:46 cla Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xset/ChangeLog,v 1.37 2008/03/10 02:01:40 dberkholz Exp $
+
+*xset-1.0.4 (10 Mar 2008)
+
+  10 Mar 2008; Donnie Berkholz <dberkholz@gentoo.org>; +xset-1.0.4.ebuild:
+  Bump.
 
   19 Dec 2007; Dawid Węgliński <cla@gentoo.org> xset-1.0.3.ebuild:
   Stable on x86 (bug #202087)
diff --git a/x11-apps/xset/xset-1.0.4.ebuild b/x11-apps/xset/xset-1.0.4.ebuild
new file mode 100644
index 000000000000..b0deff123719
--- /dev/null
+++ b/x11-apps/xset/xset-1.0.4.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xset/xset-1.0.4.ebuild,v 1.1 2008/03/10 02:01:40 dberkholz Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+
+inherit x-modular
+
+DESCRIPTION="X.Org xset application"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+
+RDEPEND="x11-libs/libXmu
+	x11-libs/libXfontcache"
+DEPEND="${RDEPEND}"