Provide a pam configuration that also works in non-systemd setups (#486822 by Mike Auty), drop old.

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

5 files changed, 52 insertions, 302 deletions

diff --git a/gnome-base/gdm/ChangeLog b/gnome-base/gdm/ChangeLog
index cc2e307df142..f4f7904e1b77 100644
--- a/gnome-base/gdm/ChangeLog
+++ b/gnome-base/gdm/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for gnome-base/gdm
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/ChangeLog,v 1.383 2013/09/28 08:36:50 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/ChangeLog,v 1.384 2013/10/12 18:53:09 pacho Exp $
+
+*gdm-3.8.4-r2 (12 Oct 2013)
+
+  12 Oct 2013; Pacho Ramos <pacho@gentoo.org>
+  +files/gdm-3.8.4-pam-systemd.patch, +gdm-3.8.4-r2.ebuild,
+  -gdm-3.6.2-r1.ebuild, -gdm-3.8.4.ebuild:
+  Provide a pam configuration that also works in non-systemd setups (#486822 by
+  Mike Auty), drop old.
 
 *gdm-3.8.4-r1 (28 Sep 2013)
 
diff --git a/gnome-base/gdm/Manifest b/gnome-base/gdm/Manifest
index 27c8cee3a3ac..6d4eed52c381 100644
--- a/gnome-base/gdm/Manifest
+++ b/gnome-base/gdm/Manifest
@@ -29,22 +29,20 @@ AUX gdm-3.6.2-gdm-slave.xml-unicode.patch 792 SHA256 4e53f08356b9fbc0669bfe15df8
 AUX gdm-3.7.3.1-disable-accessibility.patch 831 SHA256 445a36bcc14340dc95b1328528dac135900c1b204121744a439279449439a4bb SHA512 e9981fc1aabb383897c8dc3a08b337c135a0f351862cd5a0e295d73c1dacccafafbae96825285bd1625652d0d91db6db5ef57cb537a473e239c13865536e0b0f WHIRLPOOL ca55f530be9365cdfdeb1ac0de4e0345cacbb8fd7d823b1410cec14835000093b83eb5a68c603abed9b3e281e27f4b05291b15d09125bfc358b57a4c6b47b3ce
 AUX gdm-3.7.90-fix-daemonize-regression.patch 4686 SHA256 60299beb4ad8e10d767e3d8cd54a0a07c78477a5714e6ec1029d20be91d240ce SHA512 03916fe97ce82e123c20675039d65d1f3f944055eb79140bb0c13785378be74913d9e022819d0d5895144b3618ffb3e9994d000ea2a8b9bb6d487907c28e70d6 WHIRLPOOL 45f442aa0ea8fdcf7ed9d608d34e45fb7965452d65053b85e99363ab5fd239c7c0c95b3cecc4790d4342f4176571d1a51b6c109d42fcebbb6c51075c28f14adf
 AUX gdm-3.8.4-fingerprint-auth.patch 919 SHA256 d7a24f252fe78f3a1ebfe4ab3c3ceceec3ad737be3d0d435d33695c34fbdca81 SHA512 abc0836a0e87cb0e9a276aa6c086a68505140db86c063ead56f4e457f2970a4e1df97f1b4b7b0b5dd03769ddb00c9b5c0be5af13430a2dfe1b00500017d5815c WHIRLPOOL f335a677c72f806d741fbfc5816d1dee7902cfe41eaf2a445f25a2601a9bd82d5eb60cd7ee999a8c2f576ece95b8966b13169c03aac81dc686305d223301627d
+AUX gdm-3.8.4-pam-systemd.patch 522 SHA256 e49e664ee08e7f56995572bdec41d27870261c1a145d50eb096b4ef8baebdbc1 SHA512 30ade75532a8f5a8cd375a519a1c84d2d7f78ee938c70b54cb87f4ee8b01ae7943db6dab42c3e37ea4e14fa9f983b639eb14f3cd269cc0ef68c8fcf3f8ed9744 WHIRLPOOL c0f042be3aa7f7924b37da5f565bd282fc9c81f7999362b440e55b38c0a628313b919803b54b378233c3af77e6dc769fa49341d07185b26bd8dbe512fc2f0f12
 DIST gdm-2.20.11.tar.bz2 4013059 SHA256 2e21c9a44941cd0033aaa6b381b563488bbdd0ad1a28ef05f7e0178891f1eaa2 SHA512 ca8ce81161c640ef2753a35b8eb0fd8669a7e42dc6272b2aa7b4a9f525b4d03dc46bb5aa8d41b69aaba36c8715a220c92e75c169ce9d5af39b25853505abeb39 WHIRLPOOL 0bdb90aef849c7b505ffb1b0af1b904970a9cd11c27cf631794b14a01b5e0fb01666a51b68cf288ae79057dd7bfca9a8f1ef9518ec5b04a4867eb7792c631765
 DIST gdm-2.20.9-gentoo-files-r1.tar.bz2 3494 SHA256 666c0bf1ba28ccc257bf1235b5286e1eb9e15230c0036413ab428e09c54238f9 SHA512 aaf0f4bfdb13f6dc81dbfe93b144343b6a8146698450fce9753396c92bef2c4e699f3f5c2ff9b88736432d2fcb861ab8dc423148109cb9194983e0c07baa8aa5 WHIRLPOOL 698cd66740872260a106f8174a51a44a45817112d696b2741fd537a10362308ffa8917df31190fe042c46b7ea76e2f8d1147f5c15e39cfb33f1f2f7e951ffb78
-DIST gdm-3.6.2.tar.xz 1627356 SHA256 fbf41bd68299eccdcf456c0869771999f75d3d9bf0f57ce1038db08b54e8cbb9 SHA512 0761cda9d26b6e665989e708be0f3dfa2fa85b997f4c5cfeb151b45e19114e6e1fcbd2c67a547e6698d83f3978e37203db3dcf2e5670356f6f93986ffc55d37e WHIRLPOOL 0396435f90b504605fe0555264de1202efea57f2a48a94035a4113828fe66ff117a4dde3eaa648591b26f902b84e9a8bfab117f29cc4a7ea31b45a0b8c965904
 DIST gdm-3.8.4.tar.xz 1677040 SHA256 db40fb66bf476721b6d333abe0bfed7feacdca7d492f971c86a3f1e5cccdb447 SHA512 a64df8a4b7e1000aadfe1433b1d0f5d9bd16eeca45f1fdf36adc207a9f1dd410cf8e888553205135952a6da30b8c9efd4a240fc3f454636e0c9e4f86414a3283 WHIRLPOOL 4d3fe4cbd084a169bce29481271c99a8e9523cd6b1d163e4e1dc5cd829097daf9339de538d43998109596b41bde34ff798d2eaf607f38c5c859ee3b526f7e04e
-DIST gdm-gentoo-2012.09.25.tar.xz 1448 SHA256 f5978e4309e5486be41fec437a6e538dbfca3451757f3282a557941c4e70700d SHA512 c9d1a4699c34ce8708a4e7eed1b38d66ead507a4a2a6b45f2ef6254d54b46c755c9195db0593d6aa6785a8986e2ef5235592071c0cae8c1c8963951ecdb7c079 WHIRLPOOL c0efd131977b0036431b9edd6932025247323f198dc1bd7195efb55d31fd6b106ebdf391944b0009cf7a3261e99160fa6041a26348fe020badf26d0785f5dcc8
 DIST gentoo-gdm-theme-r3.tar.bz2 411703 SHA256 c7cbe97757ff93f0ffd42f9d9fb702278a361e830940a03901cda9943f44ba68 SHA512 47485899c698a2f6c3dee540806c0bbdedeab77a31b1f2b191f7f98d0d88a580aeb8dddf16fc33226db0519c21d185112421b5c6e233883ea4f67c844028281a WHIRLPOOL bac9f9ef3e7e88401e605c34deca6e7c31e2d4456af3781252a91f7bc33084af27ecc9e4a74022767b25db23d8f70842a39225c8544f1c02229ad7f7af670d42
 EBUILD gdm-2.20.11-r1.ebuild 7213 SHA256 71ac1e2eaaac38e36b3a11fc9bd883399e57b0bcae84458804f15611b5bf05b0 SHA512 5b78fe76b6ce79f5cab0ff027c1bc117766c234acfa58869155e56cd4fe0aae5a2e971014f2d9ea15637dbc6fcc5d5e536b5f36a6e3e664b2b2cb68779d83b04 WHIRLPOOL 7837696f0f0e54045ae4df101b89aa8ac9147ce064a406ed604ef8c7c04b30953ba35a8773c6bc404a60d62f6bca124db486c498690a561d2e8112b5f4452b5d
-EBUILD gdm-3.6.2-r1.ebuild 8126 SHA256 be8c3d4418b2549a4fa35b737f86a805e90f73bb0b6acf260355419d7b2b0469 SHA512 c70eb5cffcf23693bc872704e23b3b41d64b7e428acdad51c5da77dc73964fd064796859c7d1dec29ef591377c3dfe1c5e28603576d096e53ccebf0d7fdc3c64 WHIRLPOOL a306fca2e9bfe8dec2c48e59c81fb95747a2dd8e49cfe8f781a0b99c8177d91d48869842bf9017a97a4d3852fc40d0f85ab596d097c20bded3b7135d4fa45ae2
 EBUILD gdm-3.8.4-r1.ebuild 6574 SHA256 95e00bf23dd0ffd4910f5a90d496854f2f84724213018e9c5f7eb9f38f484b1f SHA512 07bbbe17c9e13b5da2a0af288175c05653fd103d2a3f8dfd872eb17deff00bdf019bf736d1b7e49090bcae885defba50de1a4ab1ce9200212d39f1a36be9df72 WHIRLPOOL 255c4eeb23249b725c69f93cfa702010f47d7205bc4e6522986649bbc31f95513814a271af9514c27927edea808c3f4d0756764c9293291d6fe40ae74fb12d7c
-EBUILD gdm-3.8.4.ebuild 6836 SHA256 fab96fff9c0aa3db3a494d56bfdd887e291df8f261d4269750230702b5d09b83 SHA512 76548d11853b95383daf32d3bddc3757a8b2cb29531ecf4db9402e6a32b2e0896e848984bd35c7938dae6751cecef173ca11f21e2488693b3e1b17aa25683c47 WHIRLPOOL c8d024ce74cbb1bd75fe8de6a6e8837643b4ec33938dbfb74d053de3e8580dbf8f22da3a6bf4f2d28991896957d203b2d22deafec7f7fde1d91a03edd933a762
-MISC ChangeLog 58471 SHA256 889f876e371177c2e30f7a626674278b22e13713e886264bfcaff25b50b81b50 SHA512 335641826240969886528fe4f62e2c805426b2c6036eae4fe3897fa1f2c8acbd24de2c92c213d41333bfc6c01c4d413fbe86a4f239a1bd6064d43927d1464ef7 WHIRLPOOL f96458dc56cec2627a6296c950d7375fe93b6a88cbb22a2f2b6c9ec75f59babd87d97fe7cc3447f096b2a0a94888e0750824f4a187032b4eae6ca32bd95ec446
+EBUILD gdm-3.8.4-r2.ebuild 6783 SHA256 dcca053a6c76a587c8a6602048bbafc2783707b9e0945ac291f788f077bbbc9c SHA512 73193f7f1809d98fd0d36e1158272868c026ebc9905c2701a29af1c05dfd100a3057144790f7888c9cd03d67ce2ad9965e19f4382eb05bf4ccb67a55b0bbcdb8 WHIRLPOOL cacb2e196c26f70cd2d67aff2122073f0184d3db958d41b299c2da8517c2760b7adc1246e9d3c0df497b0173ab2de122e242eb51c78573b2734adb61306727f8
+MISC ChangeLog 58754 SHA256 b59bccf84d389adcb755be20e7b708afadd85cc8e0d107a9007bc7af7882594d SHA512 e0b95fac45d9c95e51996c442b20d4851c7df49fff9a06cedd8bd2f79e6cb2e4e69e41fb771df282b4a2275731f24bf72fe360925dd7b750ebfaca3519910610 WHIRLPOOL 4839250a59b2b9ef6bfe7b6b3891f626236eb5fda9a95d4e129c2c17b49aa752db01895117662378136058585cf5c27989536a8dc568781610a7f3fb4875db17
 MISC metadata.xml 1022 SHA256 37e58ae7dcad61901d81d13c5594664f8d4c6b6ff44171884e6ac65b3561625b SHA512 91b08a96b496de46786985dfc069d51886d6507a15c25b2731f8272bc8bc170644744b88216f9eb2943274a752ff4c6bb6577c543cded31d745d92cc7781e286 WHIRLPOOL 863c72a48f63279bcd4762e652c2c25b17b4d07fda26c3a43828240206d10bfb5e68461523572c081fdbcc9e097930c873d7e5604fd2d8d77e4cc6edec08885a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlJGlSMACgkQCaWpQKGI+9QRHACfaS0sfNerF3SZMeJDrjuqerV5
-hG0An1HtTdX1nD2lWxlv5wRhvnxnaLxO
-=1g0I
+iEYEAREIAAYFAlJZmpYACgkQCaWpQKGI+9SUiwCfQVJFNrDmXwNiVqj3tq5RiJl0
+GpkAnAgtlGVgalsZt5fNjsTKZgQoDDes
+=6Bnn
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/gdm/files/gdm-3.8.4-pam-systemd.patch b/gnome-base/gdm/files/gdm-3.8.4-pam-systemd.patch
new file mode 100644
index 000000000000..7ff0f35fd1a4
--- /dev/null
+++ b/gnome-base/gdm/files/gdm-3.8.4-pam-systemd.patch
@@ -0,0 +1,11 @@
+--- data/pam-exherbo/gdm-launch-environment.pam~	2013-06-27 16:39:45.000000000 +0200
++++ data/pam-exherbo/gdm-launch-environment.pam	2013-10-12 20:44:03.838894768 +0200
+@@ -8,7 +8,7 @@
+ 
+ password    required    pam_deny.so
+ 
+-session     required    pam_systemd.so kill-session-processes=1
++-session    optional    pam_systemd.so kill-session-processes=1
+ session     optional    pam_keyinit.so force revoke
+ session     required    pam_succeed_if.so audit quiet_success user = gdm
+ session     required    pam_permit.so
diff --git a/gnome-base/gdm/gdm-3.6.2-r1.ebuild b/gnome-base/gdm/gdm-3.6.2-r1.ebuild
deleted file mode 100644
index 65d3d5259434..000000000000
--- a/gnome-base/gdm/gdm-3.6.2-r1.ebuild
+++ /dev/null
@@ -1,264 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-3.6.2-r1.ebuild,v 1.2 2013/09/02 16:40:26 tetromino Exp $
-
-EAPI="5"
-GNOME2_LA_PUNT="yes"
-
-inherit autotools eutils gnome2 pam systemd user
-
-G_PV="2012.09.25"
-G_P="gdm-gentoo-${G_PV}"
-DESCRIPTION="GNOME Display Manager"
-HOMEPAGE="https://live.gnome.org/GDM"
-SRC_URI="${SRC_URI}
-	http://dev.gentoo.org/~tetromino/distfiles/${PN}/${G_P}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="accessibility audit +consolekit +fallback fprint +gnome-shell +introspection ipv6 ldap plymouth selinux smartcard systemd tcpd test xinerama"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
-
-# NOTE: x11-base/xorg-server dep is for X_SERVER_PATH etc, bug #295686
-# nspr used by smartcard extension
-# dconf, dbus and g-s-d are needed at install time for dconf update
-# libdaemon needed for our fix-daemonize-regression.patch
-COMMON_DEPEND="
-	app-text/iso-codes
-	>=dev-libs/glib-2.33.2:2
-	>=x11-libs/gtk+-2.91.1:3
-	dev-libs/libdaemon
-	>=x11-libs/pango-1.3
-	dev-libs/nspr
-	>=dev-libs/nss-3.11.1
-	>=gnome-base/dconf-0.11.6
-	>=gnome-base/gnome-settings-daemon-3.1.4
-	gnome-base/gsettings-desktop-schemas
-	>=media-libs/fontconfig-2.5.0
-	>=media-libs/libcanberra-0.4[gtk3]
-	sys-apps/dbus
-	>=sys-apps/accountsservice-0.6.12
-	>=sys-power/upower-0.9
-
-	x11-apps/sessreg
-	x11-base/xorg-server
-	x11-libs/libXi
-	x11-libs/libXau
-	x11-libs/libX11
-	x11-libs/libXdmcp
-	x11-libs/libXext
-	x11-libs/libXft
-	x11-libs/libXrandr
-	>=x11-misc/xdg-utils-1.0.2-r3
-
-	virtual/pam
-	sys-auth/pambase[systemd?]
-
-	accessibility? ( x11-libs/libXevie )
-	audit? ( sys-process/audit )
-	consolekit? ( >=sys-auth/consolekit-0.4.5_p20120320-r2 )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.12 )
-	plymouth? ( sys-boot/plymouth )
-	selinux? ( sys-libs/libselinux )
-	systemd? ( >=sys-apps/systemd-186[pam] )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-	xinerama? ( x11-libs/libXinerama )
-"
-# XXX: These deps are from session and desktop files in data/ directory
-# at-spi:1 is needed for at-spi-registryd (spawned by simple-chooser)
-# fprintd is used via dbus by gdm-fingerprint-extension
-# gnome-session-3.6 needed to avoid freezing with orca
-RDEPEND="${COMMON_DEPEND}
-	>=gnome-base/gnome-session-3.6
-	x11-apps/xhost
-	x11-themes/gnome-icon-theme-symbolic
-
-	accessibility? (
-		app-accessibility/gnome-mag
-		app-accessibility/gok
-		app-accessibility/orca
-		gnome-extra/at-spi:1 )
-	consolekit? ( gnome-extra/polkit-gnome )
-	fallback? ( x11-wm/metacity )
-	fprint? (
-		sys-auth/fprintd
-		sys-auth/pam_fprint )
-	gnome-shell? ( >=gnome-base/gnome-shell-3.1.90 )
-	!gnome-shell? ( x11-wm/metacity )
-	smartcard? (
-		app-crypt/coolkey
-		sys-auth/pam_pkcs11 )
-
-	!gnome-extra/fast-user-switch-applet
-"
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	>=dev-util/intltool-0.40.0
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-	x11-proto/inputproto
-	x11-proto/randrproto
-	test? ( >=dev-libs/check-0.9.4 )
-	xinerama? ( x11-proto/xineramaproto )
-"
-
-pkg_setup() {
-	enewgroup gdm
-	enewgroup video # Just in case it hasn't been created yet
-	enewuser gdm -1 -1 /var/lib/gdm gdm,video
-
-	# For compatibility with certain versions of nvidia-drivers, etc., need to
-	# ensure that gdm user is in the video group
-	if ! egetent group video | grep -q gdm; then
-		# FIXME XXX: is this at all portable, ldap-safe, etc.?
-		# XXX: egetent does not have a 1-argument form, so we can't use it to
-		# get the list of gdm's groups
-		local g=$(groups gdm)
-		elog "Adding user gdm to video group"
-		usermod -G video,${g// /,} gdm || die "Adding user gdm to video group failed"
-	fi
-}
-
-src_prepare() {
-	# GDM grabs VT2 instead of VT7, bug 261339, bug 284053, bug 288852
-	# XXX: We can now pass a hard-coded initial value; temporary fix
-	#epatch "${FILESDIR}/${PN}-2.32.0-fix-vt-problems.patch"
-
-	# daemonize so that the boot process can continue, bug #236701
-	epatch "${FILESDIR}/${PN}-3.6.0-fix-daemonize-regression.patch"
-
-	# make custom session work, bug #216984
-	epatch "${FILESDIR}/${PN}-3.2.1.1-custom-session.patch"
-
-	# ssh-agent handling must be done at xinitrc.d, bug #220603
-	epatch "${FILESDIR}/${PN}-2.32.0-xinitrc-ssh-agent.patch"
-
-	# automagic selinux :/
-	epatch "${FILESDIR}/${PN}-3.6.0-selinux-automagic.patch"
-
-	# spurious unicode characters causing build failure, bug #449062
-	# https://bugzilla.gnome.org/show_bug.cgi?id=690842
-	LC_ALL=C epatch "${FILESDIR}/${PN}-3.6.2-gdm-slave.xml-unicode.patch"
-
-	# don't load accessibility support at runtime when USE=-accessibility
-	use accessibility || epatch "${FILESDIR}/${PN}-3.3.92.1-disable-accessibility.patch"
-
-	# make gdm-fallback session the default if USE=-gnome-shell
-	if ! use gnome-shell; then
-		sed -e "s:'gdm-shell':'gdm-fallback':" \
-			-i data/00-upstream-settings || die "sed failed"
-	fi
-
-	mkdir -p "${S}"/m4
-	sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.ac || die
-	eautoreconf
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	DOCS="AUTHORS ChangeLog NEWS README TODO"
-
-	# PAM is the only auth scheme supported
-	# even though configure lists shadow and crypt
-	# they don't have any corresponding code.
-	# --with-at-spi-registryd-directory= needs to be passed explicitly because
-	# of https://bugzilla.gnome.org/show_bug.cgi?id=607643#c4
-	G2CONF="${G2CONF}
-		--disable-static
-		--localstatedir=${EPREFIX}/var
-		--with-xdmcp=yes
-		--enable-authentication-scheme=pam
-		--with-pam-prefix=${EPREFIX}/etc
-		--with-default-pam-config=none
-		--with-at-spi-registryd-directory=${EPREFIX}/usr/libexec
-		--with-consolekit-directory=${EPREFIX}/usr/lib/ConsoleKit
-		--with-initial-vt=7
-		$(use_with accessibility xevie)
-		$(use_with audit libaudit)
-		$(use_enable ipv6)
-		$(use_with consolekit console-kit)
-		$(use_with plymouth)
-		$(use_with selinux)
-		$(use_with systemd)
-		$(systemd_with_unitdir)
-		$(use_with tcpd tcp-wrappers)
-		$(use_with xinerama)
-		ITSTOOL=$(type -P true)"
-	gnome2_src_configure
-}
-
-src_install() {
-	gnome2_src_install
-
-	# our x11's scripts point to /usr/bin/gdm
-	dosym /usr/sbin/gdm-binary /usr/bin/gdm
-
-	# log, etc.
-	keepdir /var/log/gdm
-
-	# gdm user's home directory
-	keepdir /var/lib/gdm
-	fowners gdm:gdm /var/lib/gdm
-
-	# install XDG_DATA_DIRS gdm changes
-	echo 'XDG_DATA_DIRS="/usr/share/gdm"' > 99xdg-gdm
-	doenvd 99xdg-gdm
-
-	cd "${WORKDIR}/${G_P}"
-	local LDAP
-	use ldap && LDAP=yes
-	emake GDM_WELCOME="gdm-launch-environment" LDAP=${LDAP} EPREFIX="${EPREFIX}" \
-		SYSTEMD_UNITDIR="$(systemd_get_unitdir)" DESTDIR="${D}" install
-}
-
-pkg_postinst() {
-	local d ret
-
-	gnome2_pkg_postinst
-
-	dbus-launch dconf update || die "'dconf update' failed"
-
-	# bug #436456; gdm crashes if /var/lib/gdm subdirs are not owned by gdm:gdm
-	ret=0
-	ebegin "Fixing ${EROOT}var/lib/gdm ownership"
-	chown gdm:gdm "${EROOT}var/lib/gdm" || ret=1
-	for d in "${EROOT}var/lib/gdm/"{.cache,.config,.local}; do
-		[[ ! -e "${d}" ]] || chown -R gdm:gdm "${d}" || ret=1
-	done
-	eend ${ret}
-
-	elog "To make GDM start at boot, edit /etc/conf.d/xdm"
-	elog "and then execute 'rc-update add xdm default'."
-	elog "If you already have GDM running, you will need to restart it."
-
-	elog
-	elog "GDM ignores most non-localization environment variables. If you"
-	elog "need GDM to launch gnome-session with a particular environment,"
-	elog "you need to use pam_env.so in /etc/pam.d/gdm-welcome; see"
-	elog "the pam_env man page for more information."
-	elog
-
-	if has_version sys-auth/pambase[gnome-keyring]; then
-		elog "For passwordless login to unlock your keyring, you need to set an"
-		elog "empty password on your keyring. Use app-crypt/seahorse for that."
-	else
-		elog "To unlock your keyring on login, install sys-auth/pambase"
-		elog "with USE=gnome-keyring"
-	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
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-
-	if rc-config list default | grep -q xdm; then
-		elog "To remove GDM from startup please execute"
-		elog "'rc-update del xdm default'"
-	fi
-}
diff --git a/gnome-base/gdm/gdm-3.8.4.ebuild b/gnome-base/gdm/gdm-3.8.4-r2.ebuild
index c25746f3f2ff..572cc9908a0b 100644
--- a/gnome-base/gdm/gdm-3.8.4.ebuild
+++ b/gnome-base/gdm/gdm-3.8.4-r2.ebuild
@@ -1,24 +1,24 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-3.8.4.ebuild,v 1.3 2013/09/11 14:20:02 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-3.8.4-r2.ebuild,v 1.1 2013/10/12 18:53:09 pacho Exp $
 
 EAPI="5"
 GNOME2_LA_PUNT="yes"
 
 inherit autotools eutils gnome2 pam readme.gentoo systemd user
 
-DESCRIPTION="GNOME Display Manager"
-HOMEPAGE="https://live.gnome.org/GDM"
+DESCRIPTION="GNOME Display Manager for managing graphical display servers and user logins"
+HOMEPAGE="https://wiki.gnome.org/GDM"
 
 LICENSE="GPL-2+"
 SLOT="0"
-IUSE="accessibility audit fallback fprint +gnome-shell +introspection ipv6 plymouth selinux smartcard tcpd test xinerama"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sh ~x86"
+IUSE="accessibility audit fallback fprint +gnome-shell +introspection ipv6 plymouth selinux smartcard +systemd tcpd test xinerama"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
 
 # NOTE: x11-base/xorg-server dep is for X_SERVER_PATH etc, bug #295686
 # nspr used by smartcard extension
 # dconf, dbus and g-s-d are needed at install time for dconf update
-# systemd needed for proper restarting, bug #463784
+# We need either systemd or >=openrc-0.12 to restart gdm properly, bug #463784
 COMMON_DEPEND="
 	app-text/iso-codes
 	>=dev-libs/glib-2.35:2
@@ -47,10 +47,14 @@ COMMON_DEPEND="
 	>=x11-misc/xdg-utils-1.0.2-r3
 
 	virtual/pam
-	>=sys-apps/systemd-186[pam]
-	sys-auth/pambase[systemd]
+	systemd? ( >=sys-apps/systemd-186[pam] )
+	!systemd? (
+		>=x11-base/xorg-server-1.14.3-r1
+		sys-auth/consolekit
+		!<sys-apps/openrc-0.12
+	)
+	sys-auth/pambase[systemd?]
 
-	accessibility? ( x11-libs/libXevie )
 	audit? ( sys-process/audit )
 	introspection? ( >=dev-libs/gobject-introspection-0.9.12 )
 	plymouth? ( sys-boot/plymouth )
@@ -67,12 +71,10 @@ RDEPEND="${COMMON_DEPEND}
 	x11-apps/xhost
 	x11-themes/gnome-icon-theme-symbolic
 
-	accessibility? (
-		app-accessibility/gnome-mag
-		app-accessibility/gok
-		app-accessibility/orca
-		gnome-extra/at-spi:1 )
-	fallback? ( x11-wm/metacity )
+	fallback? ( x11-wm/metacity
+		accessibility? (
+			app-accessibility/orca
+			gnome-extra/at-spi:1 ) )
 	fprint? (
 		sys-auth/fprintd
 		sys-auth/pam_fprint )
@@ -134,15 +136,15 @@ src_prepare() {
 	# Gentoo does not have a fingerprint-auth pam stack
 	epatch "${FILESDIR}/${PN}-3.8.4-fingerprint-auth.patch"
 
+	# Make pam config compatible with non-systemd setups, bug #486822
+	epatch "${FILESDIR}/${PN}-3.8.4-pam-systemd.patch"
+
 	# make gdm-fallback session the default if USE=-gnome-shell
 	if ! use gnome-shell; then
 		sed -e "s:'gdm-shell':'gdm-fallback':" \
 			-i data/00-upstream-settings || die "sed failed"
 	fi
 
-	# don't load accessibility support at runtime when USE=-accessibility
-	use accessibility || epatch "${FILESDIR}/${PN}-3.7.3.1-disable-accessibility.patch"
-
 	mkdir -p "${S}"/m4
 	sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.ac || die
 	eautoreconf
@@ -156,6 +158,7 @@ src_configure() {
 	# they don't have any corresponding code.
 	# --with-at-spi-registryd-directory= needs to be passed explicitly because
 	# of https://bugzilla.gnome.org/show_bug.cgi?id=607643#c4
+	# Xevie is obsolete, bug #482304
 	gnome2_src_configure \
 		--with-run-dir=/run/gdm \
 		--localstatedir="${EPREFIX}"/var \
@@ -165,15 +168,15 @@ src_configure() {
 		--with-default-pam-config=exherbo \
 		--with-at-spi-registryd-directory="${EPREFIX}"/usr/libexec \
 		--with-initial-vt=7 \
-		--with-systemd \
-		--enable-systemd-journal \
-		--without-console-kit \
-		$(use_with accessibility xevie) \
+		--without-xevie \
 		$(use_with audit libaudit) \
 		$(use_enable fallback fallback-greeter) \
 		$(use_enable ipv6) \
 		$(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) \
 		$(use_with xinerama) \
@@ -224,10 +227,4 @@ pkg_postinst() {
 		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
-
-	if ! systemd_is_booted; then
-		ewarn "${PN} needs Systemd to be *running* for working"
-		ewarn "properly. Please follow the this guide to migrate:"
-		ewarn "http://wiki.gentoo.org/wiki/Systemd"
-	fi
 }