(#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)
 (Unsigned Manifest commit)

3 files changed, 15 insertions, 63 deletions

diff --git a/x11-apps/xinit/Manifest b/x11-apps/xinit/Manifest
index 46b4b36be5df..c3dcb8da2492 100644
--- a/x11-apps/xinit/Manifest
+++ b/x11-apps/xinit/Manifest
@@ -22,10 +22,10 @@ AUX xdm.confd 668 RMD160 336b367da62beb39bcf4ce60efc07c7c00dc7133 SHA1 57e33bae4
 MD5 1ef321642c38bfb020e92723722319fb files/xdm.confd 668
 RMD160 336b367da62beb39bcf4ce60efc07c7c00dc7133 files/xdm.confd 668
 SHA256 d8b6828dae11bd2e632c9000b087d59c66192e1e21183124e7bf90ddee09f128 files/xdm.confd 668
-AUX xdm.start 3719 RMD160 80ad992778d2c5f2192e1d5d59a9b40e59bbcc99 SHA1 33de9d7ffa8c48861430fcac867d5b9afc2f218e SHA256 1544955a586793068e7315ebb1d2250f174c95153c96ae74786ff5226756132a size 3719
-MD5 1bb8a37d25ca7401e54c84cfc02af115 files/xdm.start 3719
-RMD160 80ad992778d2c5f2192e1d5d59a9b40e59bbcc99 files/xdm.start 3719
-SHA256 1544955a586793068e7315ebb1d2250f174c95153c96ae74786ff5226756132a files/xdm.start 3719
+AUX xdm.start 3724 RMD160 e7cfcbfd0b466debf0f3d98e9388e4101b0b3a6f SHA1 4edc9ae723325b9e5395dca7c1f32404b5c15a0d SHA256 d69aba5abf26fb88c91681cf7ba65ec002b422024060bae1ad29fca14df4831c size 3724
+MD5 a2842f4b331e8332e362d4f0f98643f8 files/xdm.start 3724
+RMD160 e7cfcbfd0b466debf0f3d98e9388e4101b0b3a6f files/xdm.start 3724
+SHA256 d69aba5abf26fb88c91681cf7ba65ec002b422024060bae1ad29fca14df4831c files/xdm.start 3724
 AUX xinitrc 1059 RMD160 092565257dec801a10150785ce32d0ca729ae398 SHA1 388882a1687b8ca40c7a47f877a2d017d0120b01 SHA256 7f681943a905a4f1bc7ea400f8ef39fc0a1b62a1f4bb01b8a4037f5840beec93 size 1059
 MD5 84d641c4893196734309e0391aa4297b files/xinitrc 1059
 RMD160 092565257dec801a10150785ce32d0ca729ae398 files/xinitrc 1059
@@ -35,19 +35,18 @@ MD5 708a3daf8950bbfe3aa231efb7533cb0 files/xserver.pamd 125
 RMD160 4b75f8bf5e68ac7181a22beaccc153ac250eb8e9 files/xserver.pamd 125
 SHA256 f179c3417b94295fe12776f9da4a08898a3ee4199e26abff6457717caeb29bb2 files/xserver.pamd 125
 DIST xinit-1.0.2.tar.bz2 96536 RMD160 b3ced92e7ffb1afc3880799ed18f584e7f58d048 SHA256 254ee0f81384fb184229d73d546fb07344c5448bbd4f4a66fef595ae49f8f395 size 96536
-EBUILD xinit-1.0.2-r3.ebuild 1265 RMD160 f788ae14fe6d5bb85750b17961a4156b5b845bd8 SHA1 af1af86ec6de7b06a06b15a9b76b46225a993e96 SHA256 c2e929ea8b78a9155470c2e34740336d4e55200e2e90b7c32d3b9b8aa80181ff size 1265
-MD5 a3c6d963a9e7f1879dc1a7909f303e05 xinit-1.0.2-r3.ebuild 1265
-RMD160 f788ae14fe6d5bb85750b17961a4156b5b845bd8 xinit-1.0.2-r3.ebuild 1265
-SHA256 c2e929ea8b78a9155470c2e34740336d4e55200e2e90b7c32d3b9b8aa80181ff xinit-1.0.2-r3.ebuild 1265
-MISC ChangeLog 7921 RMD160 38ee58fbb11fa3a797f31757f75b38b748b94110 SHA1 d59d1b33507795d171115e8ff7de8b7a3886c640 SHA256 f2af406cea9062df5ca8e35bf03ea632d675045ea66747236f24173b67c40c86 size 7921
-MD5 bc4d3d652559e9ea8bef46fefeb0eaf9 ChangeLog 7921
-RMD160 38ee58fbb11fa3a797f31757f75b38b748b94110 ChangeLog 7921
-SHA256 f2af406cea9062df5ca8e35bf03ea632d675045ea66747236f24173b67c40c86 ChangeLog 7921
+EBUILD xinit-1.0.2-r4.ebuild 1265 RMD160 76d60b48c2de56b98739e515b0c7f57d0e439014 SHA1 188039a604610c6a3335de0e192eeb05a7b5a124 SHA256 37ee5b96e4fdc20eb5d5f21e70c7586824b801de319ff0d320080a25fbf84fc3 size 1265
+MD5 f8d57b45229d185018ac75caae68b394 xinit-1.0.2-r4.ebuild 1265
+RMD160 76d60b48c2de56b98739e515b0c7f57d0e439014 xinit-1.0.2-r4.ebuild 1265
+SHA256 37ee5b96e4fdc20eb5d5f21e70c7586824b801de319ff0d320080a25fbf84fc3 xinit-1.0.2-r4.ebuild 1265
+MISC ChangeLog 8198 RMD160 e1042eccda1424b209b49423783916de44d090c8 SHA1 553065ec47fa187712b57ba8880110b277cc5db5 SHA256 d760a363185786a1078ed6c019115dde628e0249bd617c259ddd0e5dcdcc718f size 8198
+MD5 c5eef3b58e1ce545e6eba2729e15c6d9 ChangeLog 8198
+RMD160 e1042eccda1424b209b49423783916de44d090c8 ChangeLog 8198
+SHA256 d760a363185786a1078ed6c019115dde628e0249bd617c259ddd0e5dcdcc718f ChangeLog 8198
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 size 156
 MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 metadata.xml 156
 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 metadata.xml 156
-MD5 c8f5beff4bef1118192ff37d20b3819a files/digest-xinit-1.0.2-r3 235
-RMD160 4a431e028d1dda40bc62e2b5af370efd00d821d7 files/digest-xinit-1.0.2-r3 235
-SHA256 a8f4441513332ff52b02d667e403ebb39418f3eb6df177c51899f70b21c59cd1 files/digest-xinit-1.0.2-r3 235
-size 235 files/digest-xinit-1.0.2-r3 235
+MD5 c8f5beff4bef1118192ff37d20b3819a files/digest-xinit-1.0.2-r4 235
+RMD160 4a431e028d1dda40bc62e2b5af370efd00d821d7 files/digest-xinit-1.0.2-r4 235
+SHA256 a8f4441513332ff52b02d667e403ebb39418f3eb6df177c51899f70b21c59cd1 files/digest-xinit-1.0.2-r4 235
diff --git a/x11-apps/xinit/files/digest-xinit-1.0.2-r3 b/x11-apps/xinit/files/digest-xinit-1.0.2-r3
deleted file mode 100644
index 29ec40dd3a6d..000000000000
--- a/x11-apps/xinit/files/digest-xinit-1.0.2-r3
+++ /dev/null
@@ -1,3 +0,0 @@
-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/xinit-1.0.2-r3.ebuild b/x11-apps/xinit/xinit-1.0.2-r3.ebuild
deleted file mode 100644
index af0206a731c5..000000000000
--- a/x11-apps/xinit/xinit-1.0.2-r3.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# 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-r3.ebuild,v 1.1 2006/04/21 22:26:37 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
-}