Don't enable 'fallback' by default as it depends on obsolete stuff, upstream wasn't caring much about it and will die in next cycle completely

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

4 files changed, 14 insertions, 245 deletions

diff --git a/gnome-base/gdm/ChangeLog b/gnome-base/gdm/ChangeLog
index c01d790614a1..0d2ee7dcb1cb 100644
--- a/gnome-base/gdm/ChangeLog
+++ b/gnome-base/gdm/ChangeLog
@@ -1,6 +1,11 @@
 # 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.380 2013/09/02 16:40:26 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/ChangeLog,v 1.381 2013/09/08 10:17:13 pacho Exp $
+
+  08 Sep 2013; Pacho Ramos <pacho@gentoo.org> -gdm-3.8.3.1.ebuild,
+  gdm-3.8.4.ebuild:
+  Don't enable 'fallback' by default as it depends on obsolete stuff, upstream
+  wasn't caring much about it and will die in next cycle completely
 
   02 Sep 2013; Alexandre Rostovtsev <tetromino@gentoo.org> gdm-3.6.2-r1.ebuild:
   gdm should not need pam_ck_connector.so (bug #483312, thanks to Samuli
diff --git a/gnome-base/gdm/Manifest b/gnome-base/gdm/Manifest
index f92606eb860a..31770091bd7f 100644
--- a/gnome-base/gdm/Manifest
+++ b/gnome-base/gdm/Manifest
@@ -32,24 +32,18 @@ AUX gdm-3.8.4-fingerprint-auth.patch 919 SHA256 d7a24f252fe78f3a1ebfe4ab3c3cecee
 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.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 8126 SHA256 be8c3d4418b2549a4fa35b737f86a805e90f73bb0b6acf260355419d7b2b0469 SHA512 c70eb5cffcf23693bc872704e23b3b41d64b7e428acdad51c5da77dc73964fd064796859c7d1dec29ef591377c3dfe1c5e28603576d096e53ccebf0d7fdc3c64 WHIRLPOOL a306fca2e9bfe8dec2c48e59c81fb95747a2dd8e49cfe8f781a0b99c8177d91d48869842bf9017a97a4d3852fc40d0f85ab596d097c20bded3b7135d4fa45ae2
-EBUILD gdm-3.8.3.1.ebuild 6723 SHA256 2185e8ea65a7e9c4d5993f42269780b23bbbb1dee73854cccef64b2a0c66c1e6 SHA512 410f62e2b4e384e45bde6540252af01381a9c3002046b192a821a9f8a2081d1541f8f500e007973ba37d69892a31a1795183484afc2be744c5c34b16a6491636 WHIRLPOOL 01944a2fe98c71c417a60cae034d6be57356b01c6d92ef8e73c168baaac864eb7c7ac88be84a494172436cbd6338b1882fc1eff0761de59f14d6205dabfb93b6
-EBUILD gdm-3.8.4.ebuild 6836 SHA256 e067fa830522dcd8538cd890499fd1fbb3fc70b4a544b58b96ce8dc39d2eb9b7 SHA512 277fbd1880b0d462e5c626aa91d3b965703c64af91e100f316efa487d56fe43d990a35d22617950a4a36a1689caa41889972a8ff5e3df0eadfd1bfa6b4a0ad3d WHIRLPOOL cb4a515b41b6f706a63663a28d4755df82284e1e570aa8dbfc050eb878d95b9293ec0bfc469d2ae12a3aa7099645fd0298775210f52a7452cef1467aa5d55e6b
-MISC ChangeLog 57444 SHA256 86319dad49f269188c527c74377b114d8a27521c6e6b84537539cd0e17c9554c SHA512 743b0c045477373f5cc031b37572662864e3152fc7e7c0e5fe592ac968c48f04fdd3505d61edf7f5b7e947c8cc153ffac0ffb816d748f70ab1f96a85d519fd15 WHIRLPOOL 7a72b816b3b3dd8e61664bcf8aad19dc43b6dbd09eeaadc6e74801f11d3b9705aa785021754241a54bb28ed58b631fef0c933d4bb257fcd817fc910e59a07feb
+EBUILD gdm-3.8.4.ebuild 6831 SHA256 f38e9dfb761998df3675b7106a9e0a29299a32d9656a39b04ab9255e7c19d33b SHA512 8059db19675fb80a1a24b1981c6b3638bf41a1ad548f1ad413fe97125b838faaafbc8d01e56e5e0c3d56458cf27a670052771aa7e60340efe10267f5e3f6467f WHIRLPOOL 918ba81248a52c8828a133d5521840cfd0748168aae0915f1b8c693f6feb948a0c525a1151418a73f821efb6a6a6ef740b8289654c79646b645fcf6b47c72c58
+MISC ChangeLog 57675 SHA256 df767ebf5b64caf4a3e37466b0e0ee0291618c1802a760bca44d0a20e7124a17 SHA512 c639eaf7c93482a84cfff7c1e538af8108fef0f25a1b9fd642d23d98207df8398f66e0865915d212cd4c47c4b94f70fd427053cace959f03e506f181c9a284f6 WHIRLPOOL 73418facbd7c683c090567a715919123a9eaa383acecdc77252ebbd39ae36e39efb006db6201591836eefcaac7bc98b075b88ebd3064c1f552b977e6551859ea
 MISC metadata.xml 1022 SHA256 37e58ae7dcad61901d81d13c5594664f8d4c6b6ff44171884e6ac65b3561625b SHA512 91b08a96b496de46786985dfc069d51886d6507a15c25b2731f8272bc8bc170644744b88216f9eb2943274a752ff4c6bb6577c543cded31d745d92cc7781e286 WHIRLPOOL 863c72a48f63279bcd4762e652c2c25b17b4d07fda26c3a43828240206d10bfb5e68461523572c081fdbcc9e097930c873d7e5604fd2d8d77e4cc6edec08885a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.21 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQEcBAEBCAAGBQJSJL97AAoJEJ0WA1zPCt1h5YMH/Rkog2d1DYFHgqleXWICJjAt
-bkknXWk74Ino62bpC2r5vlTI+ZmIjkqIaES7xZmahpxlAew1KM9QIPWvzpMR2AC7
-0KPPEwQCxt3ggyCNFUgiVwg/t0okcgu1oVRhXJ8iMrtdGR6ZkeUYMSdudBZOkPjE
-KEUQ8OdJtE3d1LGx4zd+tIup0qNpL/TFvXCjC5iNo9wVBhQLM1tNB6ftOHNwMcd+
-VNR69KuQGd9zjXQf9ErcabM3G0YaPtgzfuprgAC5GVBfl4QEgZPop5QtW1o/txAL
-Fj3s/l0XcuMVQoKKG7KnfnqA19FOwPpGZ3wpNmbTdPOeaA5jCFFrB4tiR6aiWkw=
-=qYVA
+iEYEAREIAAYFAlIsTqoACgkQCaWpQKGI+9T6LQCeLYWFiD/NTfaBZ7XcPcvpxCyB
+nh4An3NapmyeyyTwzSyvbf3TkOc+6w4M
+=wNCb
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/gdm/gdm-3.8.3.1.ebuild b/gnome-base/gdm/gdm-3.8.3.1.ebuild
deleted file mode 100644
index bf38714680e1..000000000000
--- a/gnome-base/gdm/gdm-3.8.3.1.ebuild
+++ /dev/null
@@ -1,230 +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.8.3.1.ebuild,v 1.6 2013/08/18 03:08:44 patrick 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 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
-# 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
-	>=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-apps/systemd-186[pam]
-	sys-auth/pambase[systemd]
-
-	accessibility? ( x11-libs/libXevie )
-	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
-
-	accessibility? (
-		app-accessibility/gnome-mag
-		app-accessibility/gok
-		app-accessibility/orca
-		gnome-extra/at-spi:1 )
-	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 )
-"
-
-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"
-
-	# 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
-
-	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
-	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
-
-	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
-
-	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
-}
diff --git a/gnome-base/gdm/gdm-3.8.4.ebuild b/gnome-base/gdm/gdm-3.8.4.ebuild
index 335e8b8f94d0..e5394a5dfaff 100644
--- a/gnome-base/gdm/gdm-3.8.4.ebuild
+++ b/gnome-base/gdm/gdm-3.8.4.ebuild
@@ -1,6 +1,6 @@
 # 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.1 2013/07/31 03:37:08 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-3.8.4.ebuild,v 1.2 2013/09/08 10:17:13 pacho Exp $
 
 EAPI="5"
 GNOME2_LA_PUNT="yes"
@@ -12,7 +12,7 @@ HOMEPAGE="https://live.gnome.org/GDM"
 
 LICENSE="GPL-2+"
 SLOT="0"
-IUSE="accessibility audit +fallback fprint +gnome-shell +introspection ipv6 plymouth selinux smartcard tcpd test xinerama"
+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