bump to 2.20.5, mostly translation updates. Also fix bug #216664 and bug #216984.

Package-Manager: portage-2.1.5_rc5

4 files changed, 239 insertions, 197 deletions

diff --git a/gnome-base/gdm/ChangeLog b/gnome-base/gdm/ChangeLog
index c1c09f48909b..875276b05f88 100644
--- a/gnome-base/gdm/ChangeLog
+++ b/gnome-base/gdm/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-base/gdm
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/ChangeLog,v 1.267 2008/03/24 18:53:56 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/ChangeLog,v 1.268 2008/04/20 20:36:07 eva Exp $
+
+*gdm-2.20.5 (20 Apr 2008)
+
+  20 Apr 2008; Gilles Dartiguelongue <eva@gentoo.org> -gdm-2.18.4.ebuild,
+  +gdm-2.20.5.ebuild:
+  bump to 2.20.5, mostly translation updates. Also fix bug #216664 and bug
+  #216984.
 
   24 Mar 2008; Raúl Porcel <armin76@gentoo.org> gdm-2.20.4.ebuild:
   Add ~ia64/~sparc
diff --git a/gnome-base/gdm/Manifest b/gnome-base/gdm/Manifest
index 26e3f00f2085..c677f0754d0c 100644
--- a/gnome-base/gdm/Manifest
+++ b/gnome-base/gdm/Manifest
@@ -9,18 +9,20 @@ AUX gdm-2.20.3-logging.patch 646 RMD160 d7494ad8f39d82f72673d59466cc29b8b5c26bfc
 DIST gdm-2.18.4.tar.bz2 3459899 RMD160 4922af1321f707279c1eb6354d1c56cc39bce20e SHA1 8bf2c8745d7c38f5f08641abed4ca103cad0ecb8 SHA256 1491178239060f14d7258e94fb511ae056da6b5525d6a64b69be45fe061342c3
 DIST gdm-2.20.3.tar.bz2 3891861 RMD160 b6aace3153a9ba7adf4ed968ede9da19c3d706cb SHA1 de66323b890f2e65a33bb72c5937d1c95ee5bd89 SHA256 0d1c8e76fbebb2ba2b71c3adac3e7f6193971f75739978f81447e4127b898500
 DIST gdm-2.20.4.tar.bz2 3906797 RMD160 127b75a03192efe96785045dd8029c4ba0e91238 SHA1 2e8f4c088bfbf56aa145ac3214e8ee86683a70da SHA256 adb64d70d9c2bf87a2f67520f40bba29bd76726baee21440f8b24cf3f6336061
+DIST gdm-2.20.5-gentoo-files.tar.bz2 3214 RMD160 a075aa94fc3f6f2947bddf46f008979d62cc94d3 SHA1 9654caf36a91a83ffb5d4e53078a70e8c29a0b61 SHA256 47716f35eb1c6875e9c8e42120ff5f65da806aa06f15a48b082a6f5e5a94da83
+DIST gdm-2.20.5.tar.bz2 3911717 RMD160 07863ad88823bff6229766a5f8e505f5c3099599 SHA1 04d92b6b9a8c005b4a687d477b813bb4a357abd6 SHA256 c3b30948642456327bcc96599f9a09f9a6a36f427fc6eeefb80d27d8de5cc01c
 DIST gdm-2.8-gentoo-files-r2.tar.bz2 3101 RMD160 b1776e987bf87e7db34d73bdf7a8eebfdcd51e54 SHA1 0b41c955ec8980c011b856aa653102da485dd20c SHA256 c9335d71ab0a2ceca6a5959947aabf3728031e86dcb5536b7b57c6115c4ce53e
 DIST gentoo-gdm-theme-r3.tar.bz2 411703 RMD160 9188c8f2661163be72595a6b4924fae0648e7df5 SHA1 246a7ce67ad9d826b1cca6d90b53369b88be72ac SHA256 c7cbe97757ff93f0ffd42f9d9fb702278a361e830940a03901cda9943f44ba68
 EBUILD gdm-2.18.4-r1.ebuild 5270 RMD160 d6d1b25c75a1372d961ec9a2fc1e3ab08c5b8f88 SHA1 8edb89ee4b70237fa1f488250d6f82c34003d08b SHA256 d3224fd102191f5d7ff4cd34a229ecd84d0495a280b2ef264d1ae5ad51a3c86e
-EBUILD gdm-2.18.4.ebuild 5171 RMD160 9e6e507bff078543f0201737f82f656566cd28a9 SHA1 69440f226d1ba377c86b2e5c5d4017b9f5501dc0 SHA256 5aeb00c4a500025cb4eed2606b71ffa217483645ecfd12ba7a2823e54a7a2cc8
 EBUILD gdm-2.20.3.ebuild 5524 RMD160 00e95bcda06fd71d8cdf5792e9b9844589f55ca8 SHA1 5b499d45a07c065fd0681131fb9d7099ae820a08 SHA256 fdea28f1995f7559e9d8017a13e27450b33122235d63b955835413defb378b23
 EBUILD gdm-2.20.4.ebuild 5488 RMD160 178c3ec7801c067fa519aa6463c6d052c11d3612 SHA1 0a91a497523fecba8a96715596cbac9658552bb7 SHA256 cb7820714cb1cadc0d0041490a3663799ee5056aa7ae90f6b2ea8b1d31885432
-MISC ChangeLog 35992 RMD160 9eebad2fe61153ecae4219fc2032cb3c47ebddc8 SHA1 b3d4b0bf2b523d763fff6ee7e80cab93eb88e1cf SHA256 39268fb5f0416de549f4e34c8b4906ddf9b2f380af135e7c6133febaa8589bdf
+EBUILD gdm-2.20.5.ebuild 6131 RMD160 d160b53c5d336f82e52493b446f1d28eda645d79 SHA1 4a03f01c7d317d63f239d58d3ffae5920fb8389a SHA256 c7644d7823443a7195c12b5c77e4c7a584faddc7abdf15613fbb01660e489d27
+MISC ChangeLog 36198 RMD160 f40c7ca726f5846c2cb533b681d0436c300e76c8 SHA1 91b061ac820fe0a87e79e1c6ffaf6aed691cff60 SHA256 8143559f78833b8b7bd7d30c59ae52648885a13afe73f4349f83bc7bda7b58c2
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
+Version: GnuPG v2.0.9 (GNU/Linux)
 
-iD8DBQFICp4nj9hvisErhMIRApsCAJ48fsWDJK9XMBIhGEtixxrh62UlBgCgo2Q1
-ccMxvaFsCzLOyFYyha9Ri8o=
-=ZvJP
+iEYEARECAAYFAkgLqUYACgkQ1fmVwcYIWAagOQCg4cWzs5L7HutcjjrHW9XdIWOq
+cdMAoN+5qjJyPQBTV5xITUWSs3RTnRz7
+=FKNA
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/gdm/gdm-2.18.4.ebuild b/gnome-base/gdm/gdm-2.18.4.ebuild
deleted file mode 100644
index 18c435462dc8..000000000000
--- a/gnome-base/gdm/gdm-2.18.4.ebuild
+++ /dev/null
@@ -1,190 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-2.18.4.ebuild,v 1.12 2008/01/14 07:44:04 compnerd Exp $
-
-inherit eutils pam gnome2
-
-DESCRIPTION="GNOME Display Manager"
-HOMEPAGE="http://www.gnome.org/projects/gdm/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd"
-IUSE="accessibility branding ipv6 pam selinux tcpd xinerama elibc_glibc"
-
-# Name of the tarball with gentoo specific files
-GDM_EXTRA="${PN}-2.8-gentoo-files-r2"
-
-SRC_URI="${SRC_URI}
-		 mirror://gentoo/${GDM_EXTRA}.tar.bz2
-		 branding? ( mirror://gentoo/gentoo-gdm-theme-r3.tar.bz2 )"
-
-# glib dep is because of bug #193061
-RDEPEND="pam?	(
-					virtual/pam
-					sys-auth/consolekit
-				)
-	!pam? ( elibc_glibc? ( sys-apps/shadow ) )
-	>=dev-libs/glib-2.12
-	>=x11-libs/gtk+-2.6
-	>=x11-libs/pango-1.3
-	>=gnome-base/libglade-2
-	>=gnome-base/libgnomecanvas-2
-	>=gnome-base/librsvg-1.1.1
-	>=dev-libs/libxml2-2.4.12
-	>=media-libs/libart_lgpl-2.3.11
-	>=dev-libs/dbus-glib-0.71
-	accessibility? ( x11-libs/libXevie )
-	selinux? ( sys-libs/libselinux )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-	x11-libs/libX11
-	x11-libs/libXdmcp
-	x11-libs/libXi
-	x11-libs/libXext
-	xinerama? ( x11-libs/libXinerama )
-	x11-libs/libdmx
-	x11-libs/libXau
-	x11-apps/sessreg"
-DEPEND="${RDEPEND}
-	x11-proto/inputproto
-	x11-proto/dmxproto
-	sys-devel/gettext
-	app-admin/eselect
-	>=dev-util/pkgconfig-0.9
-	>=dev-util/intltool-0.35
-	>=app-text/gnome-doc-utils-0.3.2
-	>=app-text/scrollkeeper-0.1.4"
-
-DOCS="AUTHORS ChangeLog NEWS README TODO"
-MAKEOPTS="${MAKEOPTS} -j1"
-
-pkg_setup() {
-	G2CONF="--sysconfdir=/etc/X11         \
-		--localstatedir=/var              \
-		--with-xdmcp                      \
-		--with-pam-prefix=/etc            \
-		$(use_enable accessibility xevie) \
-		$(use_enable ipv6)                \
-		$(use_with selinux)               \
-		$(use_with tcpd tcp-wrappers)     \
-		$(use_with xinerama)"
-
-	if use pam; then
-		G2CONF="${G2CONF} --enable-authentication-scheme=pam \
-						  --with-console-kit=yes"
-	else
-		G2CONF="${G2CONF} --enable-console-helper=no \
-						  --with-console-kit=no"
-		if use elibc_glibc; then
-			G2CONF="${G2CONF} --enable-authentication-scheme=shadow"
-		else
-			G2CONF="${G2CONF} --enable-authentication-scheme=crypt"
-		fi
-	fi
-
-	enewgroup gdm
-	enewuser gdm -1 -1 /var/lib/gdm gdm
-}
-
-src_unpack() {
-	gnome2_src_unpack
-
-	# remove unneeded linker directive for selinux (#41022)
-	epatch "${FILESDIR}"/${PN}-2.13.0.1-selinux-remove-attr.patch
-
-	# Fix missing intllib
-	epatch "${FILESDIR}"/${PN}-2.18.0-gdm-dmx-intllibs.patch
-}
-
-src_install() {
-	gnome2_src_install
-
-	local gentoodir="${WORKDIR}/${GDM_EXTRA}"
-
-	# gdm-binary should be gdm to work with our init (#5598)
-	rm -f "${D}"/usr/sbin/gdm
-	dosym /usr/sbin/gdm-binary /usr/sbin/gdm
-
-	# our x11's scripts point to /usr/bin/gdm
-	dosym /usr/sbin/gdm-binary /usr/bin/gdm
-
-	# log, etc.
-	keepdir /var/log/gdm
-	keepdir /var/gdm
-
-	chown root:gdm "${D}"/var/gdm
-	chmod 1770 "${D}"/var/gdm
-
-	# use our own session script
-	rm -f "${D}"/etc/X11/gdm/Xsession
-	exeinto /etc/X11/gdm
-	doexe "${gentoodir}"/Xsession
-
-	# add a custom xsession .desktop by default (#44537)
-	exeinto /etc/X11/dm/Sessions
-	doexe "${gentoodir}"/custom.desktop
-
-	# We replace the pam stuff by our own
-	rm -rf "${D}"/etc/pam.d
-
-	dopamd "${gentoodir}"/pam.d/*
-	dopamsecurity console.apps "${gentoodir}"/security/console.apps/gdmsetup
-
-	# use graphical greeter local
-	dosed "s:#Greeter=/usr/libexec/gdmlogin:Greeter=/usr/libexec/gdmgreeter:" \
-		/usr/share/gdm/defaults.conf
-
-	# list available users
-	dosed "s:^#MinimalUID=.*:MinimalUID=1000:" /usr/share/gdm/defaults.conf
-	dosed "s:^#IncludeAll=.*:IncludeAll=true:" /usr/share/gdm/defaults.conf
-
-	# Fix old X11R6 paths
-	dosed "s:/usr/X11R6/bin:/usr/bin:" /usr/share/gdm/defaults.conf
-
-	# Move Gentoo theme in
-	if use branding ; then
-		mv "${WORKDIR}"/gentoo-* "${D}"/usr/share/gdm/themes
-	fi
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	elog "To make GDM start at boot, edit /etc/conf.d/xdm"
-	elog "and then execute 'rc-update add xdm default'."
-	elog
-	elog "GDM has changed the location of its configuration file.  Please"
-	elog "edit /etc/X11/gdm/custom.conf.  The factory defaults are located"
-	elog "at /usr/share/gdm/{defaults.conf,factory-defaults.conf}"
-	elog
-	elog "See README.install for more information about the change."
-	elog
-
-	if [ -f "/etc/X11/gdm/gdm.conf" ]; then
-		elog "You had /etc/X11/gdm/gdm.conf which is the old configuration"
-		elog "file.  It has been moved to /etc/X11/gdm/gdm-pre-gnome-2.16"
-		mv /etc/X11/gdm/gdm.conf /etc/X11/gdm/gdm-pre-gnome-2.16
-	fi
-
-	# Soft restart, assumes Gentoo defaults for file locations
-	# Do restart after gdm.conf move above
-	FIFOFILE=/var/gdm/.gdmfifo
-	PIDFILE=/var/run/gdm.pid
-
-	if [ -w ${FIFOFILE} ] ; then
-		if [ -f ${PIDFILE} ] ; then
-			if kill -0 `cat ${PIDFILE}`; then
-				(echo;echo SOFT_RESTART) >> ${FIFOFILE}
-			fi
-		fi
-	fi
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-
-	if [[ "$(rc-config list default | grep xdm)" != "" ]] ; then
-		elog "To remove GDM from startup please execute"
-		elog "'rc-update del xdm default'"
-	fi
-}
diff --git a/gnome-base/gdm/gdm-2.20.5.ebuild b/gnome-base/gdm/gdm-2.20.5.ebuild
new file mode 100644
index 000000000000..52f0abb68975
--- /dev/null
+++ b/gnome-base/gdm/gdm-2.20.5.ebuild
@@ -0,0 +1,223 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-2.20.5.ebuild,v 1.1 2008/04/20 20:36:07 eva Exp $
+
+inherit autotools eutils pam gnome2
+
+DESCRIPTION="GNOME Display Manager"
+HOMEPAGE="http://www.gnome.org/projects/gdm/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~sparc ~x86 ~x86-fbsd"
+
+IUSE_LIBC="elibc_glibc"
+IUSE="accessibility afs branding dmx ipv6 keyring pam remote selinux tcpd xinerama $IUSE_LIBC"
+
+# Name of the tarball with gentoo specific files
+GDM_EXTRA="${PN}-2.20.5-gentoo-files"
+
+SRC_URI="${SRC_URI}
+		 mirror://gentoo/${GDM_EXTRA}.tar.bz2
+		 branding? ( mirror://gentoo/gentoo-gdm-theme-r3.tar.bz2 )"
+
+RDEPEND="dev-libs/dbus-glib
+		 >=dev-libs/glib-2.12
+		 >=x11-libs/gtk+-2.6
+		 >=x11-libs/pango-1.3
+		 >=gnome-base/libglade-2
+		 >=gnome-base/libgnomecanvas-2
+		 >=gnome-base/librsvg-1.1.1
+		 >=dev-libs/libxml2-2.4.12
+		 >=media-libs/libart_lgpl-2.3.11
+		 x11-libs/gksu
+		 x11-libs/libXi
+		 x11-libs/libXau
+		 x11-libs/libX11
+		 x11-libs/libXext
+		 x11-apps/sessreg
+		 x11-libs/libXdmcp
+		 xinerama? ( x11-libs/libXinerama )
+		 sys-auth/consolekit
+		 accessibility? ( x11-libs/libXevie )
+		 afs? ( net-fs/openafs sys-libs/lwp )
+		 dmx? ( x11-libs/libdmx )
+		 keyring? ( >=gnome-base/gnome-keyring-2.22 )
+		 pam? (
+			virtual/pam
+			>=sys-auth/pambase-20080318
+		 )
+		 !pam? ( elibc_glibc? ( sys-apps/shadow ) )
+		 remote? ( gnome-extra/zenity )
+		 selinux? ( sys-libs/libselinux )
+		 tcpd? ( >=sys-apps/tcp-wrappers-7.6 )"
+DEPEND="${RDEPEND}
+		dmx? ( x11-proto/dmxproto )
+		sys-devel/gettext
+		x11-proto/inputproto
+		>=dev-util/intltool-0.35
+		>=dev-util/pkgconfig-0.19
+		>=app-text/scrollkeeper-0.1.4
+		>=app-text/gnome-doc-utils-0.3.2"
+
+DOCS="AUTHORS ChangeLog NEWS README TODO"
+
+pkg_setup() {
+	G2CONF="${G2CONF}
+		--with-prefetch
+		--sysconfdir=/etc/X11
+		--localstatedir=/var
+		--with-xdmcp=yes
+		--with-pam-prefix=/etc
+		--with-console-kit=yes
+		$(use_enable accessibility xevie)
+		$(use_enable ipv6)
+		$(use_enable remote secureremote)
+		$(use_with selinux)
+		$(use_with tcpd tcp-wrappers)
+		$(use_with xinerama)"
+
+	if use dmx ; then
+		G2CONF="${G2CONF} --with-dmx=yes"
+	else
+		G2CONF="${G2CONF} --with-dmx=no"
+	fi
+
+	if use keyring && ! built_with_use gnome-base/gnome-keyring pam; then
+		eerror "You need to build gnome-base/gnome-keyring with USE=\"pam\""
+		eerror "for USE=\"keyring\" to have any effect on this package."
+	fi
+
+	if use pam; then
+		G2CONF="${G2CONF} --enable-authentication-scheme=pam"
+
+		if use keyring && ! built_with_use sys-auth/pambase gnome; then
+			eerror "You need USE=\"gnome\" in sys-auth/pambase for proper keyring"
+			eerror "unlocking at login time. It will not work properly otherwise."
+		fi
+	else
+		G2CONF="${G2CONF} --enable-console-helper=no"
+		if use elibc_glibc ; then
+			G2CONF="${G2CONF} --enable-authentication-scheme=shadow"
+		else
+			G2CONF="${G2CONF} --enable-authentication-scheme=crypt"
+		fi
+	fi
+
+	enewgroup gdm
+	enewuser gdm -1 -1 /var/lib/gdm gdm
+}
+
+src_unpack() {
+	gnome2_src_unpack
+
+	# remove unneeded linker directive for selinux (#41022)
+	epatch "${FILESDIR}/${PN}-2.13.0.1-selinux-remove-attr.patch"
+
+	# Add gksu to gdmsetup menu entry
+	epatch "${FILESDIR}/${PN}-2.20.2-gksu.patch"
+}
+
+src_install() {
+	gnome2_src_install
+
+	local gentoodir="${WORKDIR}/${GDM_EXTRA}"
+
+	# gdm-binary should be gdm to work with our init (#5598)
+	rm -f "${D}/usr/sbin/gdm"
+	dosym /usr/sbin/gdm-binary /usr/sbin/gdm
+
+	# our x11's scripts point to /usr/bin/gdm
+	dosym /usr/sbin/gdm-binary /usr/bin/gdm
+
+	# log, etc.
+	keepdir /var/log/gdm
+	keepdir /var/gdm
+
+	fowners root:gdm /var/gdm
+	fperms 1770 /var/gdm
+
+	# use our own session script
+	rm -f "${D}/etc/X11/gdm/Xsession"
+	exeinto /etc/X11/gdm
+	doexe "${gentoodir}/Xsession"
+
+	# add a custom xsession .desktop by default (#44537)
+	exeinto /etc/X11/dm/Sessions
+	doexe "${gentoodir}/custom.desktop"
+
+	# avoid file collision, bug #213118
+	rm -f "${D}/usr/share/xsessions/gnome.desktop"
+
+	# We replace the pam stuff by our own
+	rm -rf "${D}/etc/pam.d"
+
+	if use pam ; then
+		use keyring && sed -i "s:#Keyring=::g" "${gentoodir}"/pam.d/*
+
+		dopamd "${gentoodir}"/pam.d/*
+		dopamsecurity console.apps "${gentoodir}/security/console.apps/gdmsetup"
+	fi
+
+	# use graphical greeter local
+	dosed "s:#Greeter=/usr/libexec/gdmlogin:Greeter=/usr/libexec/gdmgreeter:" \
+		/usr/share/gdm/defaults.conf
+
+	# list available users
+	dosed "s:^#MinimalUID=.*:MinimalUID=1000:" /usr/share/gdm/defaults.conf
+	dosed "s:^#IncludeAll=.*:IncludeAll=true:" /usr/share/gdm/defaults.conf
+
+	# Fix old X11R6 paths
+	dosed "s:/usr/X11R6/bin:/usr/bin:" /usr/share/gdm/defaults.conf
+
+	# Move Gentoo theme in
+	if use branding ; then
+		mv "${WORKDIR}"/gentoo-*  "${D}/usr/share/gdm/themes"
+	fi
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	elog "To make GDM start at boot, edit /etc/conf.d/xdm"
+	elog "and then execute 'rc-update add xdm default'."
+
+	elog "GDM has changed the location of its configuration file.  Please"
+	elog "edit /etc/X11/gdm/custom.conf.  The factory defaults are located"
+	elog "at /usr/share/gdm/{defaults.conf,factory-defaults.conf}"
+
+	elog "See README.install for more information about the change."
+
+	if use keyring; then
+		elog "For autologin to unlock your keyring, you need to set an empty"
+		elog "password on your keyring. Use app-crypt/seahorse for that."
+	fi
+
+	if [ -f "/etc/X11/gdm/gdm.conf" ]; then
+		elog "You had /etc/X11/gdm/gdm.conf which is the old configuration"
+		elog "file.  It has been moved to /etc/X11/gdm/gdm-pre-gnome-2.16"
+		mv /etc/X11/gdm/gdm.conf /etc/X11/gdm/gdm-pre-gnome-2.16
+	fi
+
+	# Soft restart, assumes Gentoo defaults for file locations
+	# Do restart after gdm.conf move above
+	FIFOFILE=/var/gdm/.gdmfifo
+	PIDFILE=/var/run/gdm.pid
+
+	if [ -w ${FIFOFILE} ] ; then
+		if [ -f ${PIDFILE} ] ; then
+			if kill -0 `cat ${PIDFILE}`; then
+				(echo;echo SOFT_RESTART) >> ${FIFOFILE}
+			fi
+		fi
+	fi
+}
+
+pkg_postrm() {
+	gnome2_pkg_postrm
+
+	if [[ "$(rc-config list default | grep xdm)" != "" ]] ; then
+		elog "To remove GDM from startup please execute"
+		elog "'rc-update del xdm default'"
+	fi
+}