Version bump for 2.14

(Portage version: 2.1_pre6-r3)

9 files changed, 316 insertions, 21 deletions

diff --git a/gnome-base/gdm/ChangeLog b/gnome-base/gdm/ChangeLog
index 9daabe3dd77a..0f69328535fc 100644
--- a/gnome-base/gdm/ChangeLog
+++ b/gnome-base/gdm/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for gnome-base/gdm
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/ChangeLog,v 1.144 2006/03/15 00:50:19 allanonjl Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/ChangeLog,v 1.145 2006/03/17 23:43:37 compnerd Exp $
+
+  17 Mar 2006; Saleem Abdulrasool <compnerd@gentoo.org>
+  gdm-2.2.5.4-r5.ebuild, gdm-2.8.0.3.ebuild:
+  Backport mod-x deps
+
+*gdm-2.14.0 (17 Mar 2006)
+
+  17 Mar 2006; Saleem Abdulrasool <compnerd@gentoo.org>
+  +files/gdm-2.13.0.1-selinux-remove-attr.patch,
+  +files/gdm-2.13.0.7-gdm-dmx-intllibs.patch, +gdm-2.14.0.ebuild:
+  Version bump from upstream; locale build fix added by dang
 
   15 Mar 2006; John N. Laliberte <allanonjl@gentoo.org>
   gdm-2.8.0.1-r1.ebuild:
diff --git a/gnome-base/gdm/Manifest b/gnome-base/gdm/Manifest
index 19e658cf7817..a3e1a5b31818 100644
--- a/gnome-base/gdm/Manifest
+++ b/gnome-base/gdm/Manifest
@@ -1,6 +1,6 @@
-MD5 01db306459b9bdd3b496ab94261b53e6 ChangeLog 18366
-RMD160 b849e87dd9c9d186920f8edcde3a2050cc109b15 ChangeLog 18366
-SHA256 d4d0efdc4f727297912a3333f6d134745f53eb1abb39ac451d349658919fdeae ChangeLog 18366
+MD5 cfda9639ad40849f3bbf76bdabe3ba3a ChangeLog 18750
+RMD160 68f001854674ffbf3d08c72a64693feca92062a3 ChangeLog 18750
+SHA256 a2709822834e9ed001addc232b20784ac2ecc0c837c26b14c40a83581f3ee217 ChangeLog 18750
 MD5 2a4dc345919a4094ead16d7a122e40bf files/2.2.5/gnomerc 235
 RMD160 59cfaf71d564bced9a93bfb64120ed60b4791783 files/2.2.5/gnomerc 235
 SHA256 f98d23145170f3461481ae53a052c71bed117a88219efad4e82f99e2d1c2519a files/2.2.5/gnomerc 235
@@ -13,36 +13,48 @@ SHA256 26e15c400cfd87543df211d42f3440958652a33fcd57c3c77106377e74b96083 files/2.
 MD5 114395565e31f41b44d31d731f1478b0 files/2.2.5/security/console.apps/gdmconfig 66
 RMD160 78f41c2562a53d4c28cef8bef743f9c5274f0e15 files/2.2.5/security/console.apps/gdmconfig 66
 SHA256 2e9220bca60435531ebffae347da9f6e9cf41ee106d7f2a40e05a41f9d3bce21 files/2.2.5/security/console.apps/gdmconfig 66
+MD5 3ad7ede91d808101a4f5c51d7d0a5bbb files/digest-gdm-2.14.0 768
+RMD160 2c9f0619ff12d25d4e8a82bb1322a46b7f4c1c07 files/digest-gdm-2.14.0 768
+SHA256 6840a2e1db18614f0b5335363062b72bfb0374b0f84df8ddafb37ca2bb427c06 files/digest-gdm-2.14.0 768
 MD5 80ecdc9dea675084c39d7d30876acf5b files/digest-gdm-2.2.5.4-r5 65
 RMD160 4ae7b8b36123291e6ab3c7160376957ca8d58290 files/digest-gdm-2.2.5.4-r5 65
 SHA256 fd825e8a018be0bcd60e4a4e90a464a6a3983a8fbb8d4ced69488a0f8ea0e25e files/digest-gdm-2.2.5.4-r5 65
 MD5 15b02bfeac7e3c2ee0c333fe6ab1c8c7 files/digest-gdm-2.8.0.1-r1 771
 RMD160 561a0a6f05aae8b235d119ad3a8500fc4ee412a9 files/digest-gdm-2.8.0.1-r1 771
 SHA256 32c008c095e04af53ad3c1d66a92efb3bdbda19bd92d069537b0d1719d2b817c files/digest-gdm-2.8.0.1-r1 771
-MD5 97ae11c23f88fbfd0eb6058b6a8d56b9 files/digest-gdm-2.8.0.3 211
-RMD160 67fed6302a09ff7075e6b4757623261b88d5a9bb files/digest-gdm-2.8.0.3 211
-SHA256 40ad943bd103b400353745a6f2249443283cf1e5ce0160651f3b272a07845964 files/digest-gdm-2.8.0.3 211
+MD5 631aa8e1ae777c2031e595f784b5deb5 files/digest-gdm-2.8.0.3 771
+RMD160 5365ae086ede6c9bbaf5ebad06bb7e15168c8ce6 files/digest-gdm-2.8.0.3 771
+SHA256 de9fed69598aea7227f7bc0c9dc8f5765d4dc673dab744418ebebb04ba5edbe1 files/digest-gdm-2.8.0.3 771
 MD5 6b6d0be7add58349e04329e1e4af41b9 files/digest-gdm-2.8.0.5 211
 RMD160 80b3afda58b8263a46c7b4cf982dbeadb998e926 files/digest-gdm-2.8.0.5 211
 SHA256 10d26e0fc13a111c78dc4eaa1567b4acb464006a9fe743ce149fc551c5040a78 files/digest-gdm-2.8.0.5 211
 MD5 360c677b5cc080f0ae7fad2f0caea4b1 files/digest-gdm-2.8.0.7 771
 RMD160 7c6b74240916a25a9670a8aed9f757f8c88cb660 files/digest-gdm-2.8.0.7 771
 SHA256 8cf0ae021fd73ccacaf2f3d24725d4af6f06532c1d4296aaff4fa4ad341fd8b8 files/digest-gdm-2.8.0.7 771
+MD5 4fd1e85595162e54a954871024b2858f files/gdm-2.13.0.1-selinux-remove-attr.patch 908
+RMD160 5d766a45d7c5db2453f9bdfaa7cdf02232bc66e5 files/gdm-2.13.0.1-selinux-remove-attr.patch 908
+SHA256 40074297200e3424a1baeb483d7fc50d9846a0c74ce46d72845090647d28d14b files/gdm-2.13.0.1-selinux-remove-attr.patch 908
 MD5 331171a0fb0735997e6e801f503621a7 files/gdm-2.13.0.4-esperanto.patch 384
 RMD160 84848a387df3a85ffa74b37356f7177df4c277f6 files/gdm-2.13.0.4-esperanto.patch 384
 SHA256 fab5e5cbd03e2dafe4f79e65dd534c06750b2a7e000a8eda1b08de137ff19f98 files/gdm-2.13.0.4-esperanto.patch 384
+MD5 7335514ee6ae656202ed2b442524a5ed files/gdm-2.13.0.7-gdm-dmx-intllibs.patch 894
+RMD160 a53dfd904b01ac6e265bf8ac23db69e476c4695a files/gdm-2.13.0.7-gdm-dmx-intllibs.patch 894
+SHA256 d90f0004ccb88efb00498fcec0a1839cb1a167e5a30d1369dc234a1d7c8068f6 files/gdm-2.13.0.7-gdm-dmx-intllibs.patch 894
 MD5 7dc28411b445f8459abba359b03f36b8 files/gdm-2.4.4-selinux_remove_attr.patch 826
 RMD160 0246f4b259af4e3af5561fdc9a5248607e120d63 files/gdm-2.4.4-selinux_remove_attr.patch 826
 SHA256 60abfa3ecfe8f21459162543e026debafe07d7cef527b56e25fc5065517dd487 files/gdm-2.4.4-selinux_remove_attr.patch 826
-MD5 c4d34959dd6c05056e5852277f76d250 gdm-2.2.5.4-r5.ebuild 4413
-RMD160 1811cacf40bcefe018164cdfa15bae2bddbd52bf gdm-2.2.5.4-r5.ebuild 4413
-SHA256 5a41d8efdadd954dc64d979bf1384e692d5fd236395964d18a9c891fb8c77b0c gdm-2.2.5.4-r5.ebuild 4413
+MD5 a6db1a9c15ede3e8bb60e4df671dc417 gdm-2.14.0.ebuild 4271
+RMD160 83b9857d65d035e059a1a6bc351e433e64ba44f0 gdm-2.14.0.ebuild 4271
+SHA256 664cf7d04dab8c4b33fe9f785da69127aff715d2d2ba75adc68deb5d326601ff gdm-2.14.0.ebuild 4271
+MD5 481ab3c667830296fb05e05104b22066 gdm-2.2.5.4-r5.ebuild 4686
+RMD160 aa28efeca8d3e2d33c489c3fdf09741e14cf7c1b gdm-2.2.5.4-r5.ebuild 4686
+SHA256 a81fe6d01fec891e9773362a854f8520e18439330313553e3c6808224fc7f62e gdm-2.2.5.4-r5.ebuild 4686
 MD5 29bcf41847bd426969896a31ee11294a gdm-2.8.0.1-r1.ebuild 3706
 RMD160 4a436b88a00d59e495c5dbbbcb34fb270f8a1a96 gdm-2.8.0.1-r1.ebuild 3706
 SHA256 855e08e283c3b8210fa6bb75f05b8080e59346f8e008714631fbc2d7a7eefd85 gdm-2.8.0.1-r1.ebuild 3706
-MD5 8f6a78446d13bd82aacfb29a9d4eaa24 gdm-2.8.0.3.ebuild 3649
-RMD160 88af3ede4f868a4c064db77fc5694cafdebba618 gdm-2.8.0.3.ebuild 3649
-SHA256 93762c04054c4b9e97efe8f7ef49ca48944d53120952414c3af782a20411a137 gdm-2.8.0.3.ebuild 3649
+MD5 a77105e392d3026260cea4d353cd07c3 gdm-2.8.0.3.ebuild 3922
+RMD160 e268a592dc35926c41954a3ba748b66c1add998b gdm-2.8.0.3.ebuild 3922
+SHA256 6cabb6b9af12a71500a9c9467aeefd736bcefedf8e315eb9b7cb1336b43a887b gdm-2.8.0.3.ebuild 3922
 MD5 53241a71e9a8463c65ed6d1503f3ff00 gdm-2.8.0.5.ebuild 3957
 RMD160 152814493f14255687d9a3452210076ba000cb05 gdm-2.8.0.5.ebuild 3957
 SHA256 c958831d9b056e9b79954c6aa1abe8e8681ca79ca66169e78ca2dfc8951e2c93 gdm-2.8.0.5.ebuild 3957
diff --git a/gnome-base/gdm/files/digest-gdm-2.14.0 b/gnome-base/gdm/files/digest-gdm-2.14.0
new file mode 100644
index 000000000000..427c668d95d9
--- /dev/null
+++ b/gnome-base/gdm/files/digest-gdm-2.14.0
@@ -0,0 +1,9 @@
+MD5 1f82485c4e8cd8ca2f1523a91a624eff gdm-2.14.0.tar.bz2 2997013
+RMD160 1a152d4d2dde11f70be24e6dade98721c3d7c5a1 gdm-2.14.0.tar.bz2 2997013
+SHA256 32a88d7583cbd59beba2c6c8b3f4a6b52a55acd4a3b03c5a32e15fa8e38edfbe gdm-2.14.0.tar.bz2 2997013
+MD5 a23df5fecb624744c016ad2fe8ebe5e8 gdm-2.8-gentoo-files-r2.tar.bz2 3101
+RMD160 b1776e987bf87e7db34d73bdf7a8eebfdcd51e54 gdm-2.8-gentoo-files-r2.tar.bz2 3101
+SHA256 c9335d71ab0a2ceca6a5959947aabf3728031e86dcb5536b7b57c6115c4ce53e gdm-2.8-gentoo-files-r2.tar.bz2 3101
+MD5 02d70f412218f8da910ae6f317aae4b9 gentoo-gdm-theme-r2.tar.bz2 418934
+RMD160 58088fe8a8141938a3efb9352020b14731d6ac56 gentoo-gdm-theme-r2.tar.bz2 418934
+SHA256 29927ac5a0d265703150ffee4eaa4399eace73792365eacfd4174b36c4a9909e gentoo-gdm-theme-r2.tar.bz2 418934
diff --git a/gnome-base/gdm/files/digest-gdm-2.8.0.3 b/gnome-base/gdm/files/digest-gdm-2.8.0.3
index 188ee7a2df69..ae67f2759833 100644
--- a/gnome-base/gdm/files/digest-gdm-2.8.0.3
+++ b/gnome-base/gdm/files/digest-gdm-2.8.0.3
@@ -1,3 +1,9 @@
+MD5 a23df5fecb624744c016ad2fe8ebe5e8 gdm-2.8-gentoo-files-r2.tar.bz2 3101
+RMD160 b1776e987bf87e7db34d73bdf7a8eebfdcd51e54 gdm-2.8-gentoo-files-r2.tar.bz2 3101
+SHA256 c9335d71ab0a2ceca6a5959947aabf3728031e86dcb5536b7b57c6115c4ce53e gdm-2.8-gentoo-files-r2.tar.bz2 3101
 MD5 e5fc040850ae90c456716d3dd6493f27 gdm-2.8.0.3.tar.bz2 3920359
+RMD160 1067d04ca3748a6d7b5bdddfcb6e31689ee1a098 gdm-2.8.0.3.tar.bz2 3920359
+SHA256 3cdad9eba66f580c197ee25e96e22d65c54c07ec3897c09813d91f91c952444e gdm-2.8.0.3.tar.bz2 3920359
 MD5 02d70f412218f8da910ae6f317aae4b9 gentoo-gdm-theme-r2.tar.bz2 418934
-MD5 a23df5fecb624744c016ad2fe8ebe5e8 gdm-2.8-gentoo-files-r2.tar.bz2 3101
+RMD160 58088fe8a8141938a3efb9352020b14731d6ac56 gentoo-gdm-theme-r2.tar.bz2 418934
+SHA256 29927ac5a0d265703150ffee4eaa4399eace73792365eacfd4174b36c4a9909e gentoo-gdm-theme-r2.tar.bz2 418934
diff --git a/gnome-base/gdm/files/gdm-2.13.0.1-selinux-remove-attr.patch b/gnome-base/gdm/files/gdm-2.13.0.1-selinux-remove-attr.patch
new file mode 100644
index 000000000000..7af2f9a18ffc
--- /dev/null
+++ b/gnome-base/gdm/files/gdm-2.13.0.1-selinux-remove-attr.patch
@@ -0,0 +1,24 @@
+diff --exclude-from=/home/dang/.diffrc -u -ruN gdm-2.13.0.1.orig/configure gdm-2.13.0.1/configure
+--- gdm-2.13.0.1.orig/configure	2005-11-14 17:34:33.000000000 -0500
++++ gdm-2.13.0.1/configure	2005-11-18 14:59:31.000000000 -0500
+@@ -31700,7 +31700,7 @@
+ #define HAVE_SELINUX 1
+ _ACEOF
+ 
+-	EXTRA_DAEMON_LIBS="$EXTRA_DAEMON_LIBS -lselinux -lattr"
++	EXTRA_DAEMON_LIBS="$EXTRA_DAEMON_LIBS -lselinux"
+ fi
+ 
+ #
+diff --exclude-from=/home/dang/.diffrc -u -ruN gdm-2.13.0.1.orig/configure.ac gdm-2.13.0.1/configure.ac
+--- gdm-2.13.0.1.orig/configure.ac	2005-11-14 17:13:40.000000000 -0500
++++ gdm-2.13.0.1/configure.ac	2005-11-18 14:59:23.000000000 -0500
+@@ -750,7 +750,7 @@
+ 	AC_CHECK_LIB(selinux,setexeccon,/bin/true)
+ 	AC_CHECK_LIB(selinux,is_selinux_enabled,/bin/true)
+ 	AC_DEFINE(HAVE_SELINUX)
+-	EXTRA_DAEMON_LIBS="$EXTRA_DAEMON_LIBS -lselinux -lattr"
++	EXTRA_DAEMON_LIBS="$EXTRA_DAEMON_LIBS -lselinux"
+ fi
+ 
+ #
diff --git a/gnome-base/gdm/files/gdm-2.13.0.7-gdm-dmx-intllibs.patch b/gnome-base/gdm/files/gdm-2.13.0.7-gdm-dmx-intllibs.patch
new file mode 100644
index 000000000000..7aac378042e2
--- /dev/null
+++ b/gnome-base/gdm/files/gdm-2.13.0.7-gdm-dmx-intllibs.patch
@@ -0,0 +1,22 @@
+diff --exclude-from=/home/dang/.diffrc -u -ruN gdm-2.13.0.7.orig/utils/gdm-dmx-reconnect-proxy.c gdm-2.13.0.7/utils/gdm-dmx-reconnect-proxy.c
+--- gdm-2.13.0.7.orig/utils/gdm-dmx-reconnect-proxy.c	2006-01-18 18:33:17.000000000 -0500
++++ gdm-2.13.0.7/utils/gdm-dmx-reconnect-proxy.c	2006-01-31 15:59:04.000000000 -0500
+@@ -22,6 +22,7 @@
+ #include <stdlib.h>
+ #include <glib.h>
+ #include <glib/gi18n.h>
++#include <locale.h>
+ 
+ #include <X11/Xlib.h>
+ #include <X11/extensions/dmxext.h>
+diff --exclude-from=/home/dang/.diffrc -u -ruN gdm-2.13.0.7.orig/utils/Makefile.am gdm-2.13.0.7/utils/Makefile.am
+--- gdm-2.13.0.7.orig/utils/Makefile.am	2006-01-15 16:26:35.000000000 -0500
++++ gdm-2.13.0.7/utils/Makefile.am	2006-01-31 15:51:20.000000000 -0500
+@@ -52,6 +52,7 @@
+ 	gdm-dmx-reconnect-proxy.c
+ 
+ gdm_dmx_reconnect_proxy_LDADD = \
++	$(INTLLIBS)		\
+ 	$(GLIB_LIBS) \
+ 	$(X_EXTRA_LIBS) \
+ 	$(X_LIBS) \
diff --git a/gnome-base/gdm/gdm-2.14.0.ebuild b/gnome-base/gdm/gdm-2.14.0.ebuild
new file mode 100644
index 000000000000..75f2c282596f
--- /dev/null
+++ b/gnome-base/gdm/gdm-2.14.0.ebuild
@@ -0,0 +1,173 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-2.14.0.ebuild,v 1.1 2006/03/17 23:43:37 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 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="accessibility ipv6 pam selinux tcpd xinerama"
+
+# Name of the tarball with gentoo specific files
+GDM_EXTRA="${PN}-2.8-gentoo-files-r2"
+
+SRC_URI="${SRC_URI}
+	mirror://gentoo/gentoo-gdm-theme-r2.tar.bz2
+	mirror://gentoo/${GDM_EXTRA}.tar.bz2"
+
+RDEPEND="pam? ( virtual/pam )
+	!pam? ( sys-apps/shadow )
+	>=dev-libs/glib-2.8
+	>=x11-libs/gtk+-2.6
+	>=x11-libs/pango-1.3
+	>=gnome-base/libglade-1.109
+	>=gnome-base/libgnome-1.96
+	>=gnome-base/libgnomeui-1.96
+	>=gnome-base/libgnomecanvas-1.109
+	>=gnome-base/librsvg-1.1.1
+	>=dev-libs/libxml2-2.4.12
+	>=media-libs/libart_lgpl-2.3.11
+	selinux? ( sys-libs/libselinux )
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
+	||	(
+			(
+				x11-libs/libX11
+				x11-libs/libXdmcp
+				x11-libs/libXi
+				x11-libs/libXext
+				x11-libs/libXinerama
+				x11-libs/libdmx
+				x11-libs/libXau
+				x11-apps/sessreg
+				accessibility? ( x11-libs/libXevie )
+			)
+			virtual/x11
+		)
+	sys-devel/gettext"
+
+DEPEND="${RDEPEND}
+	||	(
+			(
+				x11-proto/inputproto
+				x11-proto/dmxproto
+			)
+			virtual/x11
+		)
+	>=dev-util/pkgconfig-0.9
+	>=dev-util/intltool-0.28
+	>=app-text/scrollkeeper-0.1.4"
+
+DOCS="AUTHORS ChangeLog NEWS README TODO"
+USE_DESTDIR="1"
+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"
+	else
+		G2CONF="${G2CONF} --enable-console-helper=no \
+			--enable-authentication-scheme=shadow"
+	fi
+
+	enewgroup gdm
+	enewuser gdm -1 -1 /var/lib/gdm gdm
+}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	# 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.13.0.7-gdm-dmx-intllibs.patch
+
+	gnome2_omf_fix docs/*/Makefile.in docs/Makefile.in
+}
+
+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:" \
+		/etc/X11/gdm/gdm.conf
+	# list available users
+	dosed "s:^#MinimalUID=.*:MinimalUID=1000:" /etc/X11/gdm/gdm.conf
+	dosed "s:^#IncludeAll=.*:IncludeAll=true:" /etc/X11/gdm/gdm.conf
+	# Fix old X11R6 paths
+	dosed "s:/usr/X11R6/bin:/usr/bin:" /etc/X11/gdm/gdm.conf
+
+	# Move Gentoo theme in
+	mv ${WORKDIR}/gentoo-*  ${D}/usr/share/gdm/themes
+}
+
+pkg_postinst() {
+
+	gnome2_pkg_postinst
+
+	# Soft restart, assumes Gentoo defaults for file locations
+	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
+
+	einfo "To make GDM start at boot, edit /etc/rc.conf"
+	einfo "and then execute 'rc-update add xdm default'."
+
+}
+
+pkg_postrm() {
+	gnome2_pkg_postrm
+
+	einfo "To remove GDM from startup please execute"
+	einfo "'rc-update del xdm default'"
+}
diff --git a/gnome-base/gdm/gdm-2.2.5.4-r5.ebuild b/gnome-base/gdm/gdm-2.2.5.4-r5.ebuild
index 1f2ce0825722..1950673f27ab 100644
--- a/gnome-base/gdm/gdm-2.2.5.4-r5.ebuild
+++ b/gnome-base/gdm/gdm-2.2.5.4-r5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-2.2.5.4-r5.ebuild,v 1.26 2005/01/08 23:57:29 slarti Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-2.2.5.4-r5.ebuild,v 1.27 2006/03/17 23:43:37 compnerd Exp $
 
 DESCRIPTION="GNOME Display Manager"
 HOMEPAGE="http://www.gnome.org/"
@@ -17,10 +17,29 @@ DEPEND=">=sys-libs/pam-0.72
 	>=sys-apps/tcp-wrappers-7.6
 	>=gnome-base/gnome-libs-1.4.1.2-r1
 	>=gnome-base/libglade-0.17-r1
-	>=media-libs/gdk-pixbuf-0.11.0-r1"
+	>=media-libs/gdk-pixbuf-0.11.0-r1
+	||	(
+			(
+				x11-libs/libX11
+				x11-libs/libXdmcp
+				x11-libs/libXi
+				x11-libs/libXext
+				x11-libs/libXinerama
+				x11-libs/libdmx
+				x11-libs/libXau
+				x11-apps/sessreg
+			)
+			virtual/x11
+		)"
 
 RDEPEND="${DEPEND}
-	virtual/x11
+	||	(
+			(
+				x11-proto/inputproto
+				x11-proto/dmxproto
+			)
+			virtual/x11
+		)
 	gnome? ( >=gnome-base/gnome-core-1.4.0.6 )"
 
 src_unpack() {
diff --git a/gnome-base/gdm/gdm-2.8.0.3.ebuild b/gnome-base/gdm/gdm-2.8.0.3.ebuild
index 04568fb64ed9..538848ca3988 100644
--- a/gnome-base/gdm/gdm-2.8.0.3.ebuild
+++ b/gnome-base/gdm/gdm-2.8.0.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-2.8.0.3.ebuild,v 1.9 2005/11/24 18:30:13 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-2.8.0.3.ebuild,v 1.10 2006/03/17 23:43:37 compnerd Exp $
 
 inherit eutils pam gnome2
 
@@ -31,11 +31,30 @@ RDEPEND="pam? ( virtual/pam )
 	>=gnome-base/librsvg-1.1.1
 	>=dev-libs/libxml2-2.4.12
 	>=media-libs/libart_lgpl-2.3.11
-	virtual/x11
+	||	(
+			(
+				x11-libs/libX11
+				x11-libs/libXdmcp
+				x11-libs/libXi
+				x11-libs/libXext
+				x11-libs/libXinerama
+				x11-libs/libdmx
+				x11-libs/libXau
+				x11-apps/sessreg
+			)
+			virtual/x11
+		)
 	selinux? ( sys-libs/libselinux )
 	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )"
 
 DEPEND="${RDEPEND}
+	||	(
+			(
+				x11-proto/inputproto
+				x11-proto/dmxproto
+			)
+			virtual/x11
+		)
 	dev-util/pkgconfig
 	>=dev-util/intltool-0.28
 	>=app-text/scrollkeeper-0.1.4"