>=openrc-0.12 and xdm init.d script from >-x11-base/xorg-server-1.14.3-r1 supports gdm-3.8 restarting (#463784 by Ian Stakenvicius, Chí-Thanh Christopher Nguyễn, Alexander Vershilov, William Hubbs...). Handle accessibility in a different way (#479516): xevie support disabled as it's obsolete and broken, drop deps not needed for a long time due upstream progressively dropping their support, remaining deps are only for fallback greeter. Regarding orca.desktop autostart, it will only be started (confirmed by me just now) when screen-reader-enabled gsetting is true.

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

3 files changed, 243 insertions, 5 deletions

diff --git a/gnome-base/gdm/ChangeLog b/gnome-base/gdm/ChangeLog
index a89f40981155..cc2e307df142 100644
--- a/gnome-base/gdm/ChangeLog
+++ b/gnome-base/gdm/ChangeLog
@@ -1,6 +1,18 @@
 # 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.382 2013/09/11 14:20:02 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/ChangeLog,v 1.383 2013/09/28 08:36:50 pacho Exp $
+
+*gdm-3.8.4-r1 (28 Sep 2013)
+
+  28 Sep 2013; Pacho Ramos <pacho@gentoo.org> +gdm-3.8.4-r1.ebuild:
+  >=openrc-0.12 and xdm init.d script from >-x11-base/xorg-server-1.14.3-r1
+  supports gdm-3.8 restarting (#463784 by Ian Stakenvicius, Chí-Thanh
+  Christopher Nguyễn, Alexander Vershilov, William Hubbs...). Handle
+  accessibility in a different way (#479516): xevie support disabled as it's
+  obsolete and broken, drop deps not needed for a long time due upstream
+  progressively dropping their support, remaining deps are only for fallback
+  greeter. Regarding orca.desktop autostart, it will only be started (confirmed
+  by me just now) when screen-reader-enabled gsetting is true.
 
   11 Sep 2013; Pacho Ramos <pacho@gentoo.org> gdm-3.8.4.ebuild:
   Rekeyword as bug #478076 is solved for ppc
diff --git a/gnome-base/gdm/Manifest b/gnome-base/gdm/Manifest
index b8faf384028b..27c8cee3a3ac 100644
--- a/gnome-base/gdm/Manifest
+++ b/gnome-base/gdm/Manifest
@@ -37,13 +37,14 @@ DIST gdm-gentoo-2012.09.25.tar.xz 1448 SHA256 f5978e4309e5486be41fec437a6e538dbf
 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 57785 SHA256 862b9eb2649ef3584c104473116a396eecca123d8fe77487749f4f458279c167 SHA512 47a8113258c7c9d4369d33ba45bff0b885183b9eea7f9c9b2ed4089ba7ce89e8c116f3e5b145c4e0ef71e15975797f18eb9e1953f4f37228e79f026b5cde0366 WHIRLPOOL 44c6c2138a0285671e1dc9efd94e1a81395a0a086298156e068b7e80f6f0e5d68b876e21df6514d3ae28cea41a9aabe253216c4438eca9e0a39651806bb5bec6
+MISC ChangeLog 58471 SHA256 889f876e371177c2e30f7a626674278b22e13713e886264bfcaff25b50b81b50 SHA512 335641826240969886528fe4f62e2c805426b2c6036eae4fe3897fa1f2c8acbd24de2c92c213d41333bfc6c01c4d413fbe86a4f239a1bd6064d43927d1464ef7 WHIRLPOOL f96458dc56cec2627a6296c950d7375fe93b6a88cbb22a2f2b6c9ec75f59babd87d97fe7cc3447f096b2a0a94888e0750824f4a187032b4eae6ca32bd95ec446
 MISC metadata.xml 1022 SHA256 37e58ae7dcad61901d81d13c5594664f8d4c6b6ff44171884e6ac65b3561625b SHA512 91b08a96b496de46786985dfc069d51886d6507a15c25b2731f8272bc8bc170644744b88216f9eb2943274a752ff4c6bb6577c543cded31d745d92cc7781e286 WHIRLPOOL 863c72a48f63279bcd4762e652c2c25b17b4d07fda26c3a43828240206d10bfb5e68461523572c081fdbcc9e097930c873d7e5604fd2d8d77e4cc6edec08885a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlIwfBIACgkQCaWpQKGI+9TqCQCdFfXKm41J1guu0nT3JZdaUFXk
-xW0Anj++cLqD1wfTM+QZ6v84Oi92y/BT
-=SbKE
+iEYEAREIAAYFAlJGlSMACgkQCaWpQKGI+9QRHACfaS0sfNerF3SZMeJDrjuqerV5
+hG0An1HtTdX1nD2lWxlv5wRhvnxnaLxO
+=1g0I
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/gdm/gdm-3.8.4-r1.ebuild b/gnome-base/gdm/gdm-3.8.4-r1.ebuild
new file mode 100644
index 000000000000..80c6ea8d26b8
--- /dev/null
+++ b/gnome-base/gdm/gdm-3.8.4-r1.ebuild
@@ -0,0 +1,225 @@
+# 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-r1.ebuild,v 1.1 2013/09/28 08:36:50 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"
+
+LICENSE="GPL-2+"
+SLOT="0"
+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
+# 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
+	>=x11-libs/gtk+-2.91.1:3
+	>=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
+	systemd? ( >=sys-apps/systemd-186[pam] )
+	!systemd? (
+		>=x11-base/xorg-server-1.14.3-r1
+		!<sys-apps/openrc-0.12 )
+	sys-auth/pambase[systemd?]
+
+	audit? ( sys-process/audit )
+	introspection? ( >=dev-libs/gobject-introspection-0.9.12 )
+	plymouth? ( sys-boot/plymouth )
+	selinux? ( sys-libs/libselinux )
+	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
+
+	fallback? ( x11-wm/metacity
+		accessibility? (
+			app-accessibility/orca
+			gnome-extra/at-spi:1 ) )
+	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 )
+"
+
+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
+	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() {
+	# 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"
+
+	# 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':" \
+			-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() {
+	# 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
+	# Xevie is obsolete, bug #482304
+	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 \
+		--without-console-kit \
+		--without-xevie \
+		$(use_with audit libaudit) \
+		$(use_enable fallback fallback-greeter) \
+		$(use_enable ipv6) \
+		$(use_with plymouth) \
+		$(use_with selinux) \
+		$(use_with systemd) \
+		$(use_enable systemd systemd-journal) \
+		$(systemd_with_unitdir) \
+		$(use_with tcpd tcp-wrappers) \
+		$(use_with xinerama) \
+		ITSTOOL=$(type -P true)
+}
+
+src_install() {
+	gnome2_src_install
+
+	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
+
+	# 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
+
+	readme.gentoo_create_doc
+}
+
+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}
+
+	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
+}