Remove xdm-setup init file. Less files better life :)

5 files changed, 10 insertions, 40 deletions

diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index d3c40769..019f6b56 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -1,9 +1,8 @@
-AUX xdm-setup.initd-1 339 RMD160 dd3f50da114627d2be776b41a0d7d967ebbff477 SHA1 d86813f810aab72b81a72c298c2d230554d8e82e SHA256 018bc6acc70c708d8e3935617b8da2b84a3f5502a4db4c4731c2eaea7d3f04c0
 AUX xdm.confd-3 853 RMD160 363cd18f760650923e16579bf55f661e93dad63b SHA1 0027b98f2aeb5c43219fa4f9b7d81a05101bec6f SHA256 00af0d957ff1b4f31c1aa4701d93a54080408548792deafac5414cbfa13b89ec
-AUX xdm.initd 5291 RMD160 6fd157486964749a236acc0eae43896c89ef31ca SHA1 441201185a8c101ea9646751b120d9261678bab7 SHA256 9eb59dda3a2984d255c286af78a9f8a04108c41805a2549a4f68122016dbe0fa
+AUX xdm.initd-2 5428 RMD160 85c40a4874e1f3358077056294947f4b5f7f7a3a SHA1 11ee3c7a7000ae4ac9ab7d33667c44f98193266f SHA256 8582cc4265da2f93f498252b88e0dc055f78152b1daa9fbd7ecc0852f463730c
 AUX xorg-server-1.9-nouveau-default.patch 916 RMD160 0ebdf0fb76364b7fd0c520c3a2f7cc2cc1a83446 SHA1 daddde0f4f4276e12b87354d2e6825ed5c74c6eb SHA256 a7ff421dd928e3025194279f9afb7cc033a896b3417abe339741e9c6ed4b54ea
 AUX xorg-server-disable-acpi.patch 663 RMD160 7074ca5276369b746ea7606a0795232aafe07c90 SHA1 d300a37dd2e0a8aa3965948c13f6995e6767841d SHA256 5b3cc7c8bea18fe3ba81851d2846d19ffd8fab9cdf5d8f3a274846847e734200
 AUX xorg-sets.conf 199 RMD160 33815115b6e8b8360af4f0778b0e2c5fb1a9aaee SHA1 b5a2fd01a97558fa909c67f510d8a59b55e20f57 SHA256 1201d0337ac69d9715f4454a86dfb8a7bd1ae6f4c2578042fc08f283a997597c
 DIST xorg-server-1.9.0.tar.bz2 5345092 RMD160 9d0152458e4d82681422705d9ab0c7808a0aa372 SHA1 a18d2212df80446b597b71b8948d133f52c399cc SHA256 1064f04c648285af9960e9c8e9cd5b8efabd58113c229e3af2408da39e829ad3
-EBUILD xorg-server-1.9.0.ebuild 7704 RMD160 f58fc602ed0d46f1d0aabbad87ad449c4600296c SHA1 445321c69cc797e7a5876506e80f1ab9119c114e SHA256 f39f67a9a04da6f5deaf93e5d36e26a14bf4fc910d59967a9ebc604ab4e8eecc
-EBUILD xorg-server-9999.ebuild 7704 RMD160 f58fc602ed0d46f1d0aabbad87ad449c4600296c SHA1 445321c69cc797e7a5876506e80f1ab9119c114e SHA256 f39f67a9a04da6f5deaf93e5d36e26a14bf4fc910d59967a9ebc604ab4e8eecc
+EBUILD xorg-server-1.9.0.ebuild 7515 RMD160 2b14d7454679e7a6344a095f67df67cbfe0740e6 SHA1 947f02e91b1c7c6bfe2e1277fd1bc71e903c913f SHA256 d14ca21822a51e26933cc9a9f93102f40724b80eb17b0e5e8257034c8b23b313
+EBUILD xorg-server-9999.ebuild 7515 RMD160 2b14d7454679e7a6344a095f67df67cbfe0740e6 SHA1 947f02e91b1c7c6bfe2e1277fd1bc71e903c913f SHA256 d14ca21822a51e26933cc9a9f93102f40724b80eb17b0e5e8257034c8b23b313
diff --git a/x11-base/xorg-server/files/xdm-setup.initd-1 b/x11-base/xorg-server/files/xdm-setup.initd-1
deleted file mode 100644
index 6ed3922c..00000000
--- a/x11-base/xorg-server/files/xdm-setup.initd-1
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/files/xdm-setup.initd-1,v 1.5 2009/09/24 17:07:56 williamh Exp $
-
-depend() {
-	need localmount
-}
-
-start() {
-	if get_bootparam "nox" ; then
-		touch /etc/.noxdm
-	fi
-}
diff --git a/x11-base/xorg-server/files/xdm.initd b/x11-base/xorg-server/files/xdm.initd-2
index 461661be..e8e954ea 100755
--- a/x11-base/xorg-server/files/xdm.initd
+++ b/x11-base/xorg-server/files/xdm.initd-2
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License, v2
-# $Header: $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/files/xdm.initd,v 1.1 2010/04/13 10:07:39 scarabeus Exp $
 
 # This is here to serve as a note to myself, and future developers.
 #
@@ -37,7 +37,7 @@
 # 04 March 2002
 
 depend() {
-	need localmount xdm-setup
+	need localmount xdm
 
 	# this should start as early as possible
 	# we can't do 'before *' as that breaks it
@@ -52,7 +52,6 @@ depend() {
 
 	# Start before X
 	use consolekit xfs
-	@HALD_DEPEND@
 }
 
 setup_dm() {
@@ -127,8 +126,8 @@ start() {
 	local EXE= NAME= PIDFILE=
 	setup_dm
 
-	if [ -f /etc/.noxdm ] ; then
-		einfo "Skipping ${EXE}, /etc/.noxdm found"
+	if [ -f /etc/.noxdm ] || get_bootparam "nox" ; then
+		einfo "Skipping ${EXE##*/}, /etc/.noxdm found or \"nox\" bootparam passed."
 		rm /etc/.noxdm
 		return 0
 	fi
@@ -200,4 +199,4 @@ stop() {
 	return ${retval}
 }
 
-# vim: set ts=4 :
\ No newline at end of file
+# vim: set ts=4 :
diff --git a/x11-base/xorg-server/xorg-server-1.9.0.ebuild b/x11-base/xorg-server/xorg-server-1.9.0.ebuild
index 49c0a85c..ce65340c 100644
--- a/x11-base/xorg-server/xorg-server-1.9.0.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.9.0.ebuild
@@ -201,14 +201,7 @@ src_install() {
 			|| die "couldn't install xorg.conf.example"
 	fi
 
-	# install the xdm.init
-	cp "${FILESDIR}"/xdm.initd "${T}"
-	sed -i \
-		-e "/@HALD_DEPEND@/ d" \
-		"${T}"/xdm.initd \
-		|| die "sed failed"
-	newinitd "${T}"/xdm.initd xdm || die "initd file install failed"
-	newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup || die
+	newinitd "${FILESDIR}"/xdm.initd-2 xdm || die "initd file install failed"
 	newconfd "${FILESDIR}"/xdm.confd-3 xdm || die
 
 	# install the @x11-module-rebuild set for Portage
diff --git a/x11-base/xorg-server/xorg-server-9999.ebuild b/x11-base/xorg-server/xorg-server-9999.ebuild
index 49c0a85c..ce65340c 100644
--- a/x11-base/xorg-server/xorg-server-9999.ebuild
+++ b/x11-base/xorg-server/xorg-server-9999.ebuild
@@ -201,14 +201,7 @@ src_install() {
 			|| die "couldn't install xorg.conf.example"
 	fi
 
-	# install the xdm.init
-	cp "${FILESDIR}"/xdm.initd "${T}"
-	sed -i \
-		-e "/@HALD_DEPEND@/ d" \
-		"${T}"/xdm.initd \
-		|| die "sed failed"
-	newinitd "${T}"/xdm.initd xdm || die "initd file install failed"
-	newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup || die
+	newinitd "${FILESDIR}"/xdm.initd-2 xdm || die "initd file install failed"
 	newconfd "${FILESDIR}"/xdm.confd-3 xdm || die
 
 	# install the @x11-module-rebuild set for Portage