Really fix the vt issue with plymouth (#453392#c10), drop old

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

4 files changed, 11 insertions, 237 deletions

diff --git a/gnome-base/gdm/ChangeLog b/gnome-base/gdm/ChangeLog
index 3095d340f3e5..b958eae85094 100644
--- a/gnome-base/gdm/ChangeLog
+++ b/gnome-base/gdm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-base/gdm
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/ChangeLog,v 1.403 2014/05/04 12:10:05 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/ChangeLog,v 1.404 2014/05/10 19:37:26 pacho Exp $
+
+  10 May 2014; Pacho Ramos <pacho@gentoo.org> -gdm-3.10.0.1.ebuild,
+  gdm-3.10.0.1-r1.ebuild:
+  Really fix the vt issue with plymouth (#453392#c10), drop old
 
   04 May 2014; Pacho Ramos <pacho@gentoo.org> gdm-3.10.0.1-r1.ebuild:
   x86 stable, bug 508862
diff --git a/gnome-base/gdm/Manifest b/gnome-base/gdm/Manifest
index b7d7a28483d8..06707e04dd0a 100644
--- a/gnome-base/gdm/Manifest
+++ b/gnome-base/gdm/Manifest
@@ -27,15 +27,14 @@ DIST gdm-3.12.1.tar.xz 1505728 SHA256 41a009252bf491dadd7644b3e74be5c9364b1971b5
 DIST gentoo-gdm-theme-r3.tar.bz2 411703 SHA256 c7cbe97757ff93f0ffd42f9d9fb702278a361e830940a03901cda9943f44ba68 SHA512 47485899c698a2f6c3dee540806c0bbdedeab77a31b1f2b191f7f98d0d88a580aeb8dddf16fc33226db0519c21d185112421b5c6e233883ea4f67c844028281a WHIRLPOOL bac9f9ef3e7e88401e605c34deca6e7c31e2d4456af3781252a91f7bc33084af27ecc9e4a74022767b25db23d8f70842a39225c8544f1c02229ad7f7af670d42
 DIST tango-gentoo-v1.1.tar.gz 29322 SHA256 518efa4257c8e689488399db23397a89f4dcd5990ce537ef6215860ad5606eb0 SHA512 87d47ddab68361db6d99866c51705dcb3e198f8345a1096859acf2c6cca5099dd23c7fb30d124f52c4933ea38fd45fadffbbe6ecbdfa84f5b60938a4824f9045 WHIRLPOOL 9e1635a505ea48f4fe8bdb3b8b3b43cfb9cf99e3204194c51361b198886e719921cfacbc15f9f6407aa7d0c4af178e24c74b998fc370fa2329040e5be1baf153
 EBUILD gdm-2.20.11-r1.ebuild 7373 SHA256 0a27e4a2c37ba6980cc886ddfafdbce65c88d29cd66b79c95d04832f3b993b10 SHA512 493f7d8863fda71849ea7c3385889c1bfa3fe1e95060d0b4c1842338c46aaa912474de38c8531158cdba12db0e24baff1e9b215ab9ad52d6ea8504a857398fc4 WHIRLPOOL d89f68ad7b60493bf6f0bd1cb725942da9b050a10c9cc2c955f541f9e19a1b7ca99fccee6fb2b5dcf944c074c6dde70befb81f2f15a0bff730a53f7698867af3
-EBUILD gdm-3.10.0.1-r1.ebuild 6958 SHA256 7f4f618fd99d792279b62d03eb8f179d178628807d5740c63d6f975f48f079ff SHA512 b213e0605986fd1a36f610e369585c2f5c2be1adc5637a32341e690ea236ce55c5f71fc5c757084dcccadb139360b8adb30c0646d8d1d5bb14f8b66881baf010 WHIRLPOOL e6aa0cd4be41281b3a64616ab5b07c4afef55b7406b28cf1ae9af79fe22df9ca5511122ad8f5b6d7d2ef9085c08891bdfd4a915164456ba4362f8bfb1ab54298
-EBUILD gdm-3.10.0.1.ebuild 6653 SHA256 168259b626b5039d82f029aa49eab8e4626407d0ef7ec631d72ab099627222b6 SHA512 65dfadc0e5b802f6e8009be6202d720059139138223776faa61de3381e5078d773d2d7f39207060d37c376d0bc949d28997d3a728d36fd837367c826e9782309 WHIRLPOOL a0ca3a518bce7c30ef9b3c1ec67715b08a303e16002bf1d34c9e3c8f73672367a7ee613fa7a22d9862ca38761cd263f4b907f7f9ebfaec2f3938e50ef46c095b
+EBUILD gdm-3.10.0.1-r1.ebuild 6934 SHA256 bcead6db10a9b83f559a4ed80124edb8f2694c773de67bc42e6de74f1368161d SHA512 e68a1f8ee888b1ba2b44fa7fc44b47c68a90fbcf3f198fd6ae83c39ecd2f6ee0a3ddb3d576ec2d8a58a2bb6184fbd88f17071c15791b6894a5d31280158b2af6 WHIRLPOOL 35dda1238551c9b4c950518dec0a14f2c285161a77b4aea2e5b414d0d5a39b433f2a28aab531e09d5ba83a92f7e0aa20791d2ef49c9cdc6dfdb7bd5b241c95b2
 EBUILD gdm-3.12.1.ebuild 6796 SHA256 5fc2fd0781f3a516582fc5920c22179f93badc8f4d151aa741ad6efb349a88d0 SHA512 3ff50e2f1b570c237557ef169a706c5c86ba9637c0f00583b5d52af41b7dd34a91036d5d0dfb60c8d28ebdafd7c5a335cf805ea7be41c326f7a65feb6415a9cc WHIRLPOOL 4ad6faa551364b7566694af7d649bc2ca578347830c8f72040e4f851da80795233ebe4cd136decf934c06b01e134f2ce930a44f48a3319d3cff3ba6baa022e8b
-MISC ChangeLog 61745 SHA256 16e8df3a5a9c2a4666c28b7a9aadb6dbf4b802559b63235bc695b56d1c097d13 SHA512 110c3c4cc3fd74ec732b61acf79e1fb7f1c330a0b098095a4fee0338a94eaa6875e75a78615d8e601a4a679830a637b3fbdfdfc98b06285a59ee258cff8f0b4c WHIRLPOOL 20ee0257e11a82b37419a697ac339cdc7b9324c7e4a519d6648705dda135cd684da5ac69b40b7509d3c893bd85da691e9b18902926076e4f65e927daf74d01ed
+MISC ChangeLog 61904 SHA256 0d5b8223dd4c92159cec2a8f8a27c093ead93ccedd1b9d48699e06f63f6fc3cf SHA512 2412cac7060bc34ab4eaa42f2baf2956ed1c0e521f5f4ec8de538cc67493ee8a1548e9afa1747b9adc10edb4be7cd1da2947b2c0dc1325c9403c236e7b812c33 WHIRLPOOL 5c817db842e0f355ee96960ab1047dd74ed92ea4cfb3410b98c4db83c9ad4b040011b583e09273b7bff96bdac9055f344606166fb50d5774446a032abd905e94
 MISC metadata.xml 734 SHA256 ef71a7383585093a248a016783da93359975e3d91a4dbc14572d209fe7a44106 SHA512 512897b71e9fe9b1bc119f57ccea852341de68970b6c113d281a7422d6df449c28744301f46aa38190c5f9cb7b4ddf6ed37a44034201e592c097106a92c83b78 WHIRLPOOL d59b6d8ef1776254e52854e08896ae563c48dcdd5c9ca139f7b80085a81931aeb589f926f713e6cd8b24b8023c06e89d47b2ca0958bf63a3917ad398c76f3d16
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlNmLh4ACgkQCaWpQKGI+9SiKACfV/1LZ+g45u6C48TBCncjN85W
-nV4Anip+H+N1akQsST79tkaYao748SCs
-=a/yr
+iEYEAREIAAYFAlNuf/cACgkQCaWpQKGI+9SnXACfTLpZBCiferIk6aelYXFSNLn2
+DBEAoIB6D9IWQPX9+twbacdXjQKIiMw5
+=YVUW
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/gdm/gdm-3.10.0.1-r1.ebuild b/gnome-base/gdm/gdm-3.10.0.1-r1.ebuild
index e2fea0984293..e6e2567cae03 100644
--- a/gnome-base/gdm/gdm-3.10.0.1-r1.ebuild
+++ b/gnome-base/gdm/gdm-3.10.0.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-3.10.0.1-r1.ebuild,v 1.6 2014/05/04 12:10:05 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-3.10.0.1-r1.ebuild,v 1.7 2014/05/10 19:37:26 pacho Exp $
 
 EAPI="5"
 GNOME2_LA_PUNT="yes"
@@ -168,7 +168,6 @@ src_configure() {
 		--with-default-pam-config=exherbo \
 		--with-at-spi-registryd-directory="${EPREFIX}"/usr/libexec \
 		--with-consolekit-directory="${EPREFIX}"/usr/lib/ConsoleKit \
-		--with-initial-vt=7 \
 		--without-xevie \
 		$(use_with audit libaudit) \
 		$(use_enable ipv6) \
diff --git a/gnome-base/gdm/gdm-3.10.0.1.ebuild b/gnome-base/gdm/gdm-3.10.0.1.ebuild
deleted file mode 100644
index 878e3d699620..000000000000
--- a/gnome-base/gdm/gdm-3.10.0.1.ebuild
+++ /dev/null
@@ -1,228 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-3.10.0.1.ebuild,v 1.7 2014/04/27 01:46:41 patrick Exp $
-
-EAPI="5"
-GNOME2_LA_PUNT="yes"
-
-inherit autotools eutils gnome2 pam readme.gentoo systemd user
-
-DESCRIPTION="GNOME Display Manager for managing graphical display servers and user logins"
-HOMEPAGE="https://wiki.gnome.org/GDM"
-
-SRC_URI="${SRC_URI}
-	branding? ( http://www.mail-archive.com/tango-artists@lists.freedesktop.org/msg00043/tango-gentoo-v1.1.tar.gz )
-"
-
-LICENSE="
-	GPL-2+
-	branding? ( CC-Sampling-Plus-1.0 )
-"
-
-SLOT="0"
-IUSE="accessibility audit branding fprint +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
-	>=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
-
-	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:0=[pam] )
-	!systemd? (
-		>=x11-base/xorg-server-1.14.3-r1
-		>=sys-auth/consolekit-0.4.5_p20120320-r2
-		!<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
-# 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
-	>=gnome-base/gnome-shell-3.1.90
-	gnome-extra/polkit-gnome:0
-	x11-apps/xhost
-	x11-themes/gnome-icon-theme-symbolic
-
-	accessibility? (
-		>=app-accessibility/orca-3.10
-		app-accessibility/caribou
-		gnome-extra/mousetweaks )
-	fprint? (
-		sys-auth/fprintd
-		sys-auth/pam_fprint )
-
-	!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.\n
-	\n
-	You may need to install app-crypt/coolkey and sys-auth/pam_pkcs11
-	for smartcard support
-"
-
-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"
-
-	# Gentoo does not have a fingerprint-auth pam stack
-	epatch "${FILESDIR}/${PN}-3.8.4-fingerprint-auth.patch"
-
-	# Show logo when branding is enabled
-	use branding && epatch "${FILESDIR}/${PN}-3.8.4-logo.patch"
-
-	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-consolekit-directory="${EPREFIX}"/usr/lib/ConsoleKit \
-		--with-initial-vt=7 \
-		--without-xevie \
-		$(use_with audit libaudit) \
-		$(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) \
-		ITSTOOL=$(type -P true)
-}
-
-src_install() {
-	gnome2_src_install
-
-	if ! use accessibility ; then
-		rm "${ED}"/usr/share/gdm/greeter/autostart/orca-autostart.desktop || die
-	fi
-
-	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
-
-	use branding && newicon "${WORKDIR}/tango-gentoo-v1.1/scalable/gentoo.svg" gentoo-gdm.svg
-
-	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
-}