Added a note on the ServerTimeout option in case kdm dies for X taking too long to startup.

Package-Manager: portage-2.2_rc14/cvs/Linux 2.6.27-gentoo x86_64

3 files changed, 15 insertions, 4 deletions

diff --git a/kde-base/kdm/ChangeLog b/kde-base/kdm/ChangeLog
index 79c13c55d1cc..2a137c957acf 100644
--- a/kde-base/kdm/ChangeLog
+++ b/kde-base/kdm/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kdm
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/ChangeLog,v 1.141 2008/11/09 02:41:23 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/ChangeLog,v 1.142 2008/11/15 14:46:54 jmbsvicetto Exp $
+
+  15 Nov 2008; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  kdm-4.1.3.ebuild:
+  Added a note on the ServerTimeout option in case kdm dies for X taking too
+  long to startup.
 
 *kdm-4.1.3 (08 Nov 2008)
 
diff --git a/kde-base/kdm/Manifest b/kde-base/kdm/Manifest
index 217aad3bfebb..063709a79be0 100644
--- a/kde-base/kdm/Manifest
+++ b/kde-base/kdm/Manifest
@@ -11,6 +11,6 @@ DIST kdebase-workspace-4.1.3.tar.bz2 47502802 RMD160 c897891f2480fcb840b2525acd3
 EBUILD kdm-3.5.10.ebuild 2237 RMD160 b6800bb62cd8d3fee36b2573f4955fecb656343a SHA1 16bc5f92e85520e40430611f3c2cfa6be1a3df0f SHA256 e5a92a57d30c456c2f96ea32d7dcd2a068829bc2aa0e50d44e47cb3d3aab8b7c
 EBUILD kdm-3.5.9.ebuild 2287 RMD160 bc60955051cf5c95e98814b8972c069cb7e512f0 SHA1 2043b37e057e887e5e2798c555481444f504796d SHA256 4732b7906c42f0b28f3fd2d27c7ca9713e3d2104d711ac530472afb809430cc1
 EBUILD kdm-4.1.2.ebuild 1999 RMD160 27d22f33f027e033a86ca0884a85e085a742d3a6 SHA1 f968b8df55947dfa467249874a1f0383270a5809 SHA256 80e23ce38fdf0d9be6bca6a3156f75fafb53a18772d9631c41fa94848a8e7adf
-EBUILD kdm-4.1.3.ebuild 1997 RMD160 4b541f9c401e72d80ca21493f9a5d5cf9d6600a3 SHA1 5df600139b6006d2d4f3b63c838bda74b6be243b SHA256 65880df8ede663c33eeb90b0b60021020f0abfd0fea0514c8a3f4584c3424c8a
-MISC ChangeLog 19408 RMD160 6088802265f220ffd5608b5b3be58a67b840bd77 SHA1 48654939a8f0dcffb54748481ba2653aca14f7d8 SHA256 36fb7533aeba1f27f2e98ac9293eec9f506fe88935fd73861df1c5337b8a55f5
+EBUILD kdm-4.1.3.ebuild 2345 RMD160 8f5787d7cc687528823a1c307dc404f696f2da6c SHA1 5a38188e14d9fa62fb1f23120024ed7d843ec2b8 SHA256 8eec47a4b8d46076418896258eac30c5a63921a24c55b5290baa30fd755c3c64
+MISC ChangeLog 19594 RMD160 9a423e19dbe01d60bdd05ab25496f7e3ccea1978 SHA1 7616f1290936debf1a8735e964773d9fa8c60cc4 SHA256 7e0b50f52f471fc995a6a229634c4145483ccc4bb19b1b41bf1994b201a5c1bf
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
diff --git a/kde-base/kdm/kdm-4.1.3.ebuild b/kde-base/kdm/kdm-4.1.3.ebuild
index 35e6ca01c13a..cdef12dc7606 100644
--- a/kde-base/kdm/kdm-4.1.3.ebuild
+++ b/kde-base/kdm/kdm-4.1.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/kdm-4.1.3.ebuild,v 1.1 2008/11/09 02:41:23 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/kdm-4.1.3.ebuild,v 1.2 2008/11/15 14:46:54 jmbsvicetto Exp $
 
 EAPI="2"
 
@@ -62,4 +62,10 @@ pkg_postinst() {
 		cp "${ROOT}${KDEDIR}/share/apps/kdm/pics/users/root1.png" \
 			"${ROOT}${KDEDIR}/share/apps/kdm/faces/root.face.icon"
 	fi
+
+	elog "If when you restart xdm, kdm fails to start with a message like"
+	elog "\"gentoo kdm[2116]: X server startup timeout, terminating\""
+	elog "in /var/log/messages, uncomment the ServerTimeout line in"
+	elog "grep kdmrc /var/db/pkg/kde-base/kdm-4.1.3/CONTENTS | cut -f2 -d \" \""
+	elog "and be sure to increase the timeout - 60 should work"
 }