Version bump and fix invalid gdm-fingerprint.pam. Drop old.

Package-Manager: portage-2.2.0_alpha191/cvs/Linux x86_64
Manifest-Sign-Key: 0xCF0ADD61

5 files changed, 100 insertions, 349 deletions

diff --git a/gnome-base/gdm/ChangeLog b/gnome-base/gdm/ChangeLog
index cad52abba3ea..297c1a9e275c 100644
--- a/gnome-base/gdm/ChangeLog
+++ b/gnome-base/gdm/ChangeLog
@@ -1,6 +1,13 @@
 # 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.377 2013/07/28 17:35:18 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/ChangeLog,v 1.378 2013/07/31 03:37:08 tetromino Exp $
+
+*gdm-3.8.4 (31 Jul 2013)
+
+  31 Jul 2013; Alexandre Rostovtsev <tetromino@gentoo.org> -gdm-3.6.2.ebuild,
+  -gdm-3.8.0.ebuild, +gdm-3.8.4.ebuild,
+  +files/gdm-3.8.4-fingerprint-auth.patch:
+  Version bump and fix invalid gdm-fingerprint.pam. Drop old.
 
   28 Jul 2013; Gilles Dartiguelongue <eva@gentoo.org> gdm-3.8.3.1.ebuild:
   Add missing configure switch to handle fallback mode.
diff --git a/gnome-base/gdm/Manifest b/gnome-base/gdm/Manifest
index f04d9b8533a6..f08615595a92 100644
--- a/gnome-base/gdm/Manifest
+++ b/gnome-base/gdm/Manifest
@@ -28,24 +28,28 @@ AUX gdm-3.6.0-selinux-automagic.patch 909 SHA256 9b1a3c5913e53f30641dc1177d39606
 AUX gdm-3.6.2-gdm-slave.xml-unicode.patch 792 SHA256 4e53f08356b9fbc0669bfe15df848d92b845244604a329ed4cfe753c94691990 SHA512 4f856ffeb3e9b720be24fdb2f231a3245b4fea2a503cfc74b5ebbf77418ae6c6cf377568f53da053efe42304e0bad9add2dc5d7a0571ed3152fb0ad0c16a9019 WHIRLPOOL 59fbab49f7420236a2a3a34f5b700b2b6306235d6f60b383886cdbd01f05153dc2c06a102c0baad8ed350ffdcaad7a1ba448abb2ac6d77a7e759c541f63f3b14
 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
 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.0.tar.xz 1665812 SHA256 4a0894ae50d1f090c6ccc450b74142243fff9ee17e2924c0f363ea51b3ba6bd5 SHA512 6de9a09777a66e1d0879bf43179aa40eaa8389123ff959fdcc34dfa71a3d75738ee0e90a47712934d1c4bfcc7e32f70a634640d53000907dfdf50f4b3118c7b5 WHIRLPOOL 8daa065867202a4de93dd553605698775da67c17944a0a8d4d932e1e867b733fc372aecd5c1e54c8690363fea6f858e47f54af7b70c13681a1931e2c694aa42e
 DIST gdm-3.8.3.1.tar.xz 1677900 SHA256 a8c8a32803e32c5d087c75c6be8160cfe4d15843953f07b599d653bac471320e SHA512 dc196115ab910cb4a5310ef7fda5fbb18a50cfd2f8df143a82305c040c75a3d34ead132fd885647133bb0a384cc7af15e2ead9f872e70476e47f7612e24248a1 WHIRLPOOL 6148c23cf9fa08a5f6f9d17b73179aaf5e756a314212a36bb9d496041bbdb42a739cbba52ded18ddb6c9566b7b32f8cf921b42675f0efa60dfd44768f911315a
+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 8125 SHA256 3992ffe031d3244fa8fb8d349120e58ced57f15930246a65ead05bf0596d16de SHA512 ee3ad68374d8ffbf09c0eeb212a02b03c069ed30c10936136d8123364c0962cf10874844b2e4b6ebd1891e75e945eca439fefa8f6baaf0bc5ecba03ad3874333 WHIRLPOOL 18f95e54da52ebfca663ba5087f6d428707314ba7bcec70a4e716a8df177b6cadf59a20448a3e0a4d3c81ad7b8a11aa3f0ea9230d875ae0f82efff309c0b5989
-EBUILD gdm-3.6.2.ebuild 8038 SHA256 87b27f6d367dad8c2c4b28f0d103eb7c22faece16065bf4585e93e43d17646e5 SHA512 23fd18fd08928e2205f89744f3de9ca1b4ce9440bfbecd700bc0d150162122cbe8a019850580daac1130914fcc70783481a163a5aac47cbbd5b37018971db106 WHIRLPOOL bf9ffc84d8f50f248e083ecb518150f97e6d382b0c4220aec12c3cb9e216332aa66378b9c21261dc42e78392c4e35055b917b46e830809b9d1b3d821cf1723eb
-EBUILD gdm-3.8.0.ebuild 7896 SHA256 34d4c40b63d4771462422ad6d893f2098d087539ccecc102d87d8075f96fee7b SHA512 217e6602f64f1a0b39323376f516f8a814679128f51ef324385e3a1ca29b1decd1c17c105634e551e132f2970a80ad66ea939135334c176b0623ad1e69274bce WHIRLPOOL 1ef57963321faffd68972171b8bde16e49b86ef89a06c25f2ce242a3414cf6fff3e147d7d1d091d863fec6963334bb4e879239bbae07b387cad3ac4963cf42d8
 EBUILD gdm-3.8.3.1.ebuild 6720 SHA256 5d05f08425005ecb12c306559868b600db3e496491db0df16fbc0b8e607e4ec8 SHA512 ce119d9651e27ed0c9089c633e85194f7430f6f86cf3c0a3d58208256312015b247468c6bd2f40ad2202733d37772883ab28f709816207daefd96d2bccec9ee9 WHIRLPOOL 688681a313aba8436a1fac75841693ca28249ae3b95fae03b1d0d12517692262409c75043b700111efb0b184f97937c4af77d88ad5625bb6fe26742c11b6a3b0
-MISC ChangeLog 56937 SHA256 94d267626255fcf062df05aec31ba6fc502da49c7c1e21527f0f082832ea814a SHA512 563850c65a445b74610769141d2520dea0d4a004f3516517c55098f5ea160fdd3b27351432454adcf5da530083b8c8ef31c0ea0d1eb89b226656998e6ab24f0a WHIRLPOOL 1566ad92ac214cf92e0aa2dfe7725ffac314fb2da223130ecddf9ce9eb906d44e5ccf8d71ab6adcf7d16b27152a512e20d31a06f606df83348cf633130d4abac
+EBUILD gdm-3.8.4.ebuild 6836 SHA256 e067fa830522dcd8538cd890499fd1fbb3fc70b4a544b58b96ce8dc39d2eb9b7 SHA512 277fbd1880b0d462e5c626aa91d3b965703c64af91e100f316efa487d56fe43d990a35d22617950a4a36a1689caa41889972a8ff5e3df0eadfd1bfa6b4a0ad3d WHIRLPOOL cb4a515b41b6f706a63663a28d4755df82284e1e570aa8dbfc050eb878d95b9293ec0bfc469d2ae12a3aa7099645fd0298775210f52a7452cef1467aa5d55e6b
+MISC ChangeLog 57193 SHA256 94c0bf9957094f1a10eff51dfa4f161007e988037c237054c4cc5f482409954f SHA512 0440f9e01743193e38a704efb4294b2f0fa6c40ca46a68915edd0ec95fd6e8fc0a119ceac57c6c61788199b2ea4c72c2553bd462e77de179b32539c579a8e538 WHIRLPOOL 793fe02e05b081e1c1a19e72e5ae53e48553ae2995024fb32a923a4f097a9f1085dd65925b4f74ace0e3ec3238ce043d7ce469af480c6832cd95efa86e044c05
 MISC metadata.xml 1022 SHA256 37e58ae7dcad61901d81d13c5594664f8d4c6b6ff44171884e6ac65b3561625b SHA512 91b08a96b496de46786985dfc069d51886d6507a15c25b2731f8272bc8bc170644744b88216f9eb2943274a752ff4c6bb6577c543cded31d745d92cc7781e286 WHIRLPOOL 863c72a48f63279bcd4762e652c2c25b17b4d07fda26c3a43828240206d10bfb5e68461523572c081fdbcc9e097930c873d7e5604fd2d8d77e4cc6edec08885a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlH1VlcACgkQ1fmVwcYIWAbN7wCg0pX4DvBVbgULu9poxtj6rPGz
-u+AAn2bgWT7NN3cFxZ7dhSh/aYDGd2MZ
-=hSnM
+iQEcBAEBCAAGBQJR+IZpAAoJEJ0WA1zPCt1hklgH/1k69uQ2OAMZKeBMSvGi1l/P
+WSclvL0OTKRAMd7V1tqjP+yrMYKMu5khK/18HGzkExBC/YN3bS8xEoYewleB5Wit
+WSnhEnnrCAsa4UXp/A/sgeIo7SO8X2aNDqY9/rPee2jmIZz3R+lgOCU3ztken9VZ
+KL32+yqLavYD65286HW/15mW2Yg9y5X4nRbFQa5yKR9b7BCrZfSQHFfxZRKHXPuj
+O5txK5jbxkRxTG3cXva4CRf4SAqsMHVa+jNMRIfy8tGiAKFDEh1eSrMuD2I0UE+N
+573mmMHsgfR2s28NcXtohyB7vpokXD+svjmS8QXg1UXEo52/ZMnc+OSCvO78Aa8=
+=au1n
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/gdm/files/gdm-3.8.4-fingerprint-auth.patch b/gnome-base/gdm/files/gdm-3.8.4-fingerprint-auth.patch
new file mode 100644
index 000000000000..3b56daf2a32a
--- /dev/null
+++ b/gnome-base/gdm/files/gdm-3.8.4-fingerprint-auth.patch
@@ -0,0 +1,29 @@
+From 6139570c977561549747d5200b33be9786e95529 Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Tue, 30 Jul 2013 22:56:30 -0400
+Subject: [PATCH] Gentoo does not have a fingerprint-auth pam stack
+
+---
+ data/pam-exherbo/gdm-fingerprint.pam | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/data/pam-exherbo/gdm-fingerprint.pam b/data/pam-exherbo/gdm-fingerprint.pam
+index 41639ec..d9633fb 100644
+--- a/data/pam-exherbo/gdm-fingerprint.pam
++++ b/data/pam-exherbo/gdm-fingerprint.pam
+@@ -1,6 +1,11 @@
+ account  include  system-login
+ 
+-auth     substack fingerprint-auth
++auth     optional pam_env.so
++auth     required pam_tally2.so onerr=succeed
++auth     required pam_shells.so
++auth     required pam_nologin.so
++auth     required pam_fprintd.so
++auth     required pam_permit.so
+ auth     optional pam_gnome_keyring.so
+ 
+ password required pam_deny.so
+-- 
+1.8.3.2
+
diff --git a/gnome-base/gdm/gdm-3.6.2.ebuild b/gnome-base/gdm/gdm-3.6.2.ebuild
deleted file mode 100644
index e4c707054133..000000000000
--- a/gnome-base/gdm/gdm-3.6.2.ebuild
+++ /dev/null
@@ -1,263 +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.ebuild,v 1.10 2013/05/05 11:24:19 jlec 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 )
-	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-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.0.ebuild b/gnome-base/gdm/gdm-3.8.4.ebuild
index 2f99cbb52304..335e8b8f94d0 100644
--- a/gnome-base/gdm/gdm-3.8.0.ebuild
+++ b/gnome-base/gdm/gdm-3.8.4.ebuild
@@ -1,33 +1,28 @@
 # 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.0.ebuild,v 1.2 2013/05/05 11:24:19 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-3.8.4.ebuild,v 1.1 2013/07/31 03:37:08 tetromino Exp $
 
 EAPI="5"
 GNOME2_LA_PUNT="yes"
 
-inherit autotools eutils gnome2 pam systemd user
+inherit autotools eutils gnome2 pam readme.gentoo 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"
+IUSE="accessibility audit +fallback fprint +gnome-shell +introspection ipv6 plymouth selinux smartcard tcpd test xinerama"
+KEYWORDS="~amd64 ~arm ~ppc64 ~sh ~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
+# systemd needed for proper restarting, bug #463784
 COMMON_DEPEND="
 	app-text/iso-codes
 	>=dev-libs/glib-2.35: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
@@ -52,15 +47,14 @@ COMMON_DEPEND="
 	>=x11-misc/xdg-utils-1.0.2-r3
 
 	virtual/pam
-	sys-auth/pambase[consolekit?,systemd?]
+	>=sys-apps/systemd-186[pam]
+	sys-auth/pambase[systemd]
 
 	accessibility? ( x11-libs/libXevie )
 	audit? ( sys-process/audit )
-	consolekit? ( >=sys-auth/consolekit-0.4.5_p20120320-r2[pam] )
 	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 )
 "
@@ -78,7 +72,6 @@ RDEPEND="${COMMON_DEPEND}
 		app-accessibility/gok
 		app-accessibility/orca
 		gnome-extra/at-spi:1 )
-	consolekit? ( gnome-extra/polkit-gnome )
 	fallback? ( x11-wm/metacity )
 	fprint? (
 		sys-auth/fprintd
@@ -102,6 +95,15 @@ DEPEND="${COMMON_DEPEND}
 	xinerama? ( x11-proto/xineramaproto )
 "
 
+DOC_CONTENTS="
+	To make GDM start at boot, run:\n
+	# systemctl enable gdm.service\n
+	\n
+	For passwordless login to unlock your keyring, you need to install
+	sys-auth/pambase with USE=gnome-keyring and set an empty password
+	on your keyring. Use app-crypt/seahorse for that.
+"
+
 pkg_setup() {
 	enewgroup gdm
 	enewgroup video # Just in case it hasn't been created yet
@@ -120,23 +122,18 @@ pkg_setup() {
 }
 
 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
-	# FIXME
-#	epatch "${FILESDIR}/${PN}-2.32.0-fix-vt-problems.patch"
-
-	# daemonize so that the boot process can continue, bug #236701
-	epatch "${FILESDIR}/${PN}-3.7.90-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 :/
+	# Fix automagic selinux, upstream bug #704188
 	epatch "${FILESDIR}/${PN}-3.6.0-selinux-automagic.patch"
 
+	# Gentoo does not have a fingerprint-auth pam stack
+	epatch "${FILESDIR}/${PN}-3.8.4-fingerprint-auth.patch"
+
 	# make gdm-fallback session the default if USE=-gnome-shell
 	if ! use gnome-shell; then
 		sed -e "s:'gdm-shell':'gdm-fallback':" \
@@ -159,35 +156,36 @@ 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
-	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
+	gnome2_src_configure \
+		--with-run-dir=/run/gdm \
+		--localstatedir="${EPREFIX}"/var \
+		--disable-static \
+		--with-xdmcp=yes \
+		--enable-authentication-scheme=pam \
+		--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) \
+		$(use_with audit libaudit) \
+		$(use_enable fallback fallback-greeter) \
+		$(use_enable ipv6) \
+		$(use_with plymouth) \
+		$(use_with selinux) \
+		$(systemd_with_unitdir) \
+		$(use_with tcpd tcp-wrappers) \
+		$(use_with xinerama) \
+		ITSTOOL=$(type -P true)
 }
 
 src_install() {
 	gnome2_src_install
 
-	# our x11's scripts point to /usr/bin/gdm
-	dosym /usr/sbin/gdm /usr/bin/gdm
+	insinto /etc/X11/xinit/xinitrc.d
+	newins "${FILESDIR}/49-keychain-r1" 49-keychain
+	newins "${FILESDIR}/50-ssh-agent-r1" 50-ssh-agent
 
 	# log, etc.
 	keepdir /var/log/gdm
@@ -200,11 +198,7 @@ src_install() {
 	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
+	readme.gentoo_create_doc
 }
 
 pkg_postinst() {
@@ -216,44 +210,24 @@ pkg_postinst() {
 
 	# bug #436456; gdm crashes if /var/lib/gdm subdirs are not owned by gdm:gdm
 	ret=0
-	ebegin "Fixing ${EROOT}var/lib/gdm ownership"
+	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
+	readme.gentoo_print_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
-}
-
-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'"
+	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
 }