Missed the actual init script changes last time. Add it now, with a rewritten depend() section by UberLord.

Package-Manager: portage-2.1_pre7-r5

5 files changed, 41 insertions, 20 deletions

diff --git a/x11-apps/xinit/ChangeLog b/x11-apps/xinit/ChangeLog
index d5540e781158..baee78ad8d51 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.45 2006/04/20 06:37:42 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/ChangeLog,v 1.46 2006/04/21 22:26:37 spyderous Exp $
+
+*xinit-1.0.2-r3 (21 Apr 2006)
+
+  21 Apr 2006; Donnie Berkholz <spyderous@gentoo.org>; files/xdm.start,
+  -xinit-1.0.2-r2.ebuild, +xinit-1.0.2-r3.ebuild:
+  Missed the actual init script changes last time. Add it now, with a
+  rewritten depend() section by UberLord.
 
   20 Apr 2006; Donnie Berkholz <spyderous@gentoo.org>; files/xdm.confd:
   Add a note that rc.conf overrides this DISPLAYMANAGER setting, even though
diff --git a/x11-apps/xinit/Manifest b/x11-apps/xinit/Manifest
index 00e2a6d4ec8d..27806c87891d 100644
--- a/x11-apps/xinit/Manifest
+++ b/x11-apps/xinit/Manifest
@@ -1,15 +1,15 @@
-MD5 189c84bb758ac05c9688a630fd37d81e ChangeLog 7199
-RMD160 8b90872a6bc7439e9586e437281419f82f81c6f4 ChangeLog 7199
-SHA256 f5d50e6a46a7e5fa05b2f069bd3fcc9cf653e69881c9c6ceba3e604b6d76afe6 ChangeLog 7199
+MD5 19aad3b17dc371ec3e0a673440fe2fd6 ChangeLog 7465
+RMD160 b2979bdb6d7321e8ce6be665ddea0592c9212c3b ChangeLog 7465
+SHA256 4c8e19d375b52e26e37e7988195493078cc98f0c7c1b58745fa5e0a8f06ac75a ChangeLog 7465
 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-r2 235
-RMD160 4a431e028d1dda40bc62e2b5af370efd00d821d7 files/digest-xinit-1.0.2-r2 235
-SHA256 a8f4441513332ff52b02d667e403ebb39418f3eb6df177c51899f70b21c59cd1 files/digest-xinit-1.0.2-r2 235
+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
 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
@@ -22,9 +22,9 @@ SHA256 36781509e239d5d7777e181c3d95462602bcc41a95f4881c3bca2a463086f9f7 files/st
 MD5 4bf619123010af8f624f4082f1f73b68 files/xdm.confd 500
 RMD160 746a5994745c93ae6a034f612dbf2e0df7da323d files/xdm.confd 500
 SHA256 1f6225e4c0b1e6eb50a35f394e33032acbdac100c987c92d5cc521e6bbfbbaae files/xdm.confd 500
-MD5 2d8c9c76bd932f311ad86f490680d349 files/xdm.start 3418
-RMD160 cc2ab8c312c595edb7f181868783d91399ee1c2e files/xdm.start 3418
-SHA256 85623bc26002fa7626b2c07292fa55b9af10682f00221bcfb55bec7efa8ccdcc files/xdm.start 3418
+MD5 fbbbfa49f79d6e7512d3341f47dafe45 files/xdm.start 3705
+RMD160 41688db5966401b07c06b883d97eacd7cae10813 files/xdm.start 3705
+SHA256 2eafb8017c708f1c78e04b0ab50dfd82a147b2c0b00c4430467b7679991326e4 files/xdm.start 3705
 MD5 84d641c4893196734309e0391aa4297b files/xinitrc 1059
 RMD160 092565257dec801a10150785ce32d0ca729ae398 files/xinitrc 1059
 SHA256 7f681943a905a4f1bc7ea400f8ef39fc0a1b62a1f4bb01b8a4037f5840beec93 files/xinitrc 1059
@@ -34,6 +34,6 @@ SHA256 f179c3417b94295fe12776f9da4a08898a3ee4199e26abff6457717caeb29bb2 files/xs
 MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 metadata.xml 156
 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 metadata.xml 156
-MD5 389582adee6d6387151a18963dc9f0c7 xinit-1.0.2-r2.ebuild 1265
-RMD160 a5e29821515390a168d698c54693e9054a951279 xinit-1.0.2-r2.ebuild 1265
-SHA256 f5a5ccfa9b19202dedb08c3a19c2256b812faf6137d61491865fb93e37eed215 xinit-1.0.2-r2.ebuild 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
diff --git a/x11-apps/xinit/files/digest-xinit-1.0.2-r2 b/x11-apps/xinit/files/digest-xinit-1.0.2-r3
index 29ec40dd3a6d..29ec40dd3a6d 100644
--- a/x11-apps/xinit/files/digest-xinit-1.0.2-r2
+++ b/x11-apps/xinit/files/digest-xinit-1.0.2-r3
diff --git a/x11-apps/xinit/files/xdm.start b/x11-apps/xinit/files/xdm.start
index fe4b191d2ea0..09c119ba88d1 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.1 2005/09/06 19:33:51 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/files/xdm.start,v 1.2 2006/04/21 22:26:37 spyderous Exp $
 
 # This is here to serve as a note to myself, and future developers.
 #
@@ -39,7 +39,15 @@
 
 # Start X Font Server before X
 depend() {
-	use xfs hotplug
+	need localmount
+
+	# this should start as early as possible
+	# we can't do 'before *' as that breaks it
+	after bootmisc
+	before alsasound net.lo
+
+	# Start before X
+	use acpid xfs
 }
 
 setup_dm() {
@@ -110,10 +118,16 @@ start() {
 		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
+
+		# Start as soon as possible if XSTATICVT is set
+		if [ "${XSTATICVT}" = "yes" ] ; then
+			/etc/X11/startDM.sh
+		else
+			#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
+		fi
 		eend 0
 	fi
 
diff --git a/x11-apps/xinit/xinit-1.0.2-r2.ebuild b/x11-apps/xinit/xinit-1.0.2-r3.ebuild
index 44b72234a968..af0206a731c5 100644
--- a/x11-apps/xinit/xinit-1.0.2-r2.ebuild
+++ b/x11-apps/xinit/xinit-1.0.2-r3.ebuild
@@ -1,6 +1,6 @@
 # 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-r2.ebuild,v 1.1 2006/04/20 06:27:09 spyderous Exp $
+# $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