(#133060) Also use hald, or it's possible to log in without the desktop environment handling events (Tiziano Müller).

(Portage version: 2.1_pre10-r2)

4 files changed, 57 insertions, 3 deletions

diff --git a/x11-apps/xinit/ChangeLog b/x11-apps/xinit/ChangeLog
index 9cf3b564007a..eb381ef76b93 100644
--- a/x11-apps/xinit/ChangeLog
+++ b/x11-apps/xinit/ChangeLog
@@ -1,6 +1,13 @@
 # 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.49 2006/04/23 23:11:21 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/ChangeLog,v 1.50 2006/05/11 23:58:42 spyderous Exp $
+
+*xinit-1.0.2-r4 (11 May 2006)
+
+  11 May 2006; Donnie Berkholz <spyderous@gentoo.org>; files/xdm.start,
+  -xinit-1.0.2-r3.ebuild, +xinit-1.0.2-r4.ebuild:
+  (#133060) Also use hald, or it's possible to log in without the desktop
+  environment handling events (Tiziano Müller).
 
   23 Apr 2006; Donnie Berkholz <spyderous@gentoo.org>; files/xdm.confd:
   (#131032) Also note that for dynamic VT, you need to remove the VT arg from
diff --git a/x11-apps/xinit/files/digest-xinit-1.0.2-r4 b/x11-apps/xinit/files/digest-xinit-1.0.2-r4
new file mode 100644
index 000000000000..29ec40dd3a6d
--- /dev/null
+++ b/x11-apps/xinit/files/digest-xinit-1.0.2-r4
@@ -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/xdm.start b/x11-apps/xinit/files/xdm.start
index 3e98513fbb7c..fa6552ea14ff 100755
--- a/x11-apps/xinit/files/xdm.start
+++ b/x11-apps/xinit/files/xdm.start
@@ -1,7 +1,7 @@
 #!/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.4 2006/04/21 23:40:14 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/files/xdm.start,v 1.5 2006/05/11 23:58:42 spyderous Exp $
 
 # This is here to serve as a note to myself, and future developers.
 #
@@ -47,7 +47,7 @@ depend() {
 	before alsasound net.lo
 
 	# Start before X
-	use acpid xfs
+	use acpid hald xfs
 }
 
 setup_dm() {
diff --git a/x11-apps/xinit/xinit-1.0.2-r4.ebuild b/x11-apps/xinit/xinit-1.0.2-r4.ebuild
new file mode 100644
index 000000000000..43a038403e72
--- /dev/null
+++ b/x11-apps/xinit/xinit-1.0.2-r4.ebuild
@@ -0,0 +1,44 @@
+# 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.2-r4.ebuild,v 1.1 2006/05/11 23:58:42 spyderous 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
+	newconfd ${FILESDIR}/xdm.confd xdm
+	newpamd ${FILESDIR}/xserver.pamd xserver
+}