--- /usr/portage/gnome-base/gdm/gdm-3.8.4-r1.ebuild	2013-09-28 09:36:50.000000000 +0100
+++ /usr/portage/gnome-base/gdm/gdm-3.8.4-r1.ebuild	2013-10-02 11:57:24.981771971 +0100
@@ -50,7 +50,8 @@ 
 	systemd? ( >=sys-apps/systemd-186[pam] )
 	!systemd? (
 		>=x11-base/xorg-server-1.14.3-r1
-		!<sys-apps/openrc-0.12 )
+		!<sys-apps/openrc-0.12 
+		sys-auth/consolekit )
 	sys-auth/pambase[systemd?]
 
 	audit? ( sys-process/audit )
@@ -140,6 +141,11 @@ 
 			-i data/00-upstream-settings || die "sed failed"
 	fi
 
+    if ! use systemd; then
+	    sed -e "s:^.*systemd.*$::" \
+		    -i data/pam-*/*.pam || die "sed failed"
+	fi
+
 	mkdir -p "${S}"/m4
 	sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.ac || die
 	eautoreconf
@@ -163,7 +169,6 @@ 
 		--with-default-pam-config=exherbo \
 		--with-at-spi-registryd-directory="${EPREFIX}"/usr/libexec \
 		--with-initial-vt=7 \
-		--without-console-kit \
 		--without-xevie \
 		$(use_with audit libaudit) \
 		$(use_enable fallback fallback-greeter) \
@@ -171,6 +176,7 @@ 
 		$(use_with plymouth) \
 		$(use_with selinux) \
 		$(use_with systemd) \
+		$(use_with !systemd console-kit) \
 		$(use_enable systemd systemd-journal) \
 		$(systemd_with_unitdir) \
 		$(use_with tcpd tcp-wrappers) \