From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org)
	by finch.gentoo.org with esmtp (Exim 4.60)
	(envelope-from <gentoo-commits+bounces-462351-garchives=archives.gentoo.org@lists.gentoo.org>)
	id 1STiy8-0001XA-6i
	for garchives@archives.gentoo.org; Mon, 14 May 2012 00:16:56 +0000
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 51767E0829;
	Mon, 14 May 2012 00:16:49 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
	by pigeon.gentoo.org (Postfix) with ESMTP id 0F77EE0829
	for <gentoo-commits@lists.gentoo.org>; Mon, 14 May 2012 00:16:48 +0000 (UTC)
Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6])
	(using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id 4B1661B4074
	for <gentoo-commits@lists.gentoo.org>; Mon, 14 May 2012 00:16:48 +0000 (UTC)
Received: by flycatcher.gentoo.org (Postfix, from userid 2306)
	id 071B92004C; Mon, 14 May 2012 00:16:47 +0000 (UTC)
From: "Alexandre Rostovtsev (tetromino)" <tetromino@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Reply-To: gentoo-dev@lists.gentoo.org, tetromino@gentoo.org
Subject: [gentoo-commits] gentoo-x86 commit in gnome-base/gdm: ChangeLog metadata.xml gdm-3.4.1.ebuild
X-VCS-Repository: gentoo-x86
X-VCS-Files: ChangeLog metadata.xml gdm-3.4.1.ebuild
X-VCS-Directories: gnome-base/gdm
X-VCS-Committer: tetromino
X-VCS-Committer-Name: Alexandre Rostovtsev
Content-Type: text/plain; charset=utf8
Message-Id: <20120514001647.071B92004C@flycatcher.gentoo.org>
Date: Mon, 14 May 2012 00:16:47 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: quoted-printable
X-Archives-Salt: 69080da7-7a4c-4165-8f2d-c2fa08b46e6c
X-Archives-Hash: 25c509168615d44cffe7051bf4e8b91f

tetromino    12/05/14 00:16:47

  Modified:             ChangeLog metadata.xml
  Added:                gdm-3.4.1.ebuild
  Log:
  Version bump for gnome-3.4. Adds optional (and untested) support for sy=
stemd session tracking and smooth transition from plymouth.
 =20
  (Portage version: 2.2.0_alpha104/cvs/Linux x86_64)

Revision  Changes    Path
1.352                gnome-base/gdm/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gdm/Cha=
ngeLog?rev=3D1.352&view=3Dmarkup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gdm/Cha=
ngeLog?rev=3D1.352&content-type=3Dtext/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gdm/Cha=
ngeLog?r1=3D1.351&r2=3D1.352

Index: ChangeLog
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /var/cvsroot/gentoo-x86/gnome-base/gdm/ChangeLog,v
retrieving revision 1.351
retrieving revision 1.352
diff -u -r1.351 -r1.352
--- ChangeLog	5 May 2012 05:38:07 -0000	1.351
+++ ChangeLog	14 May 2012 00:16:46 -0000	1.352
@@ -1,6 +1,15 @@
 # ChangeLog for gnome-base/gdm
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/ChangeLog,v 1.351 2012=
/05/05 05:38:07 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/ChangeLog,v 1.352 2012=
/05/14 00:16:46 tetromino Exp $
+
+*gdm-3.4.1 (14 May 2012)
+
+  14 May 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  +files/gdm-3.3.92.1-disable-accessibility.patch, +gdm-3.4.1.ebuild,
+  +files/gdm-3.4.1-plymouth.patch, +files/gdm-3.4.1-save-root-window.pat=
ch,
+  metadata.xml:
+  Version bump for gnome-3.4. Adds optional (and untested!) support for =
systemd
+  session tracking and smooth transition from plymouth.
=20
   05 May 2012; Jeff Horelick <jdhore@gentoo.org> gdm-2.20.11.ebuild,
   gdm-2.20.11-r1.ebuild, gdm-2.32.1.ebuild, gdm-2.32.1-r1.ebuild,



1.9                  gnome-base/gdm/metadata.xml

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gdm/met=
adata.xml?rev=3D1.9&view=3Dmarkup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gdm/met=
adata.xml?rev=3D1.9&content-type=3Dtext/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gdm/met=
adata.xml?r1=3D1.8&r2=3D1.9

Index: metadata.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /var/cvsroot/gentoo-x86/gnome-base/gdm/metadata.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- metadata.xml	31 Dec 2011 08:34:36 -0000	1.8
+++ metadata.xml	14 May 2012 00:16:46 -0000	1.9
@@ -14,8 +14,12 @@
 		OpenGL)</flag>
 	<flag name=3D"introspection">Use <pkg>dev-libs/gobject-introspection</p=
kg>
 		for introspection</flag>
+	<flag name=3D"plymouth">Enable support for smooth transition from
+		<pkg>sys-boot/plymouth</pkg></flag>
 	<flag name=3D"remote">Enables support for secure remote connections</fl=
ag>
 	<flag name=3D"smartcard">Enables experimental smartcard authentication<=
/flag>
+	<flag name=3D"systemd">Use <pkg>sys-apps/systemd</pkg> for session
+		tracking</flag>
 	<flag name=3D"xklavier">Use <pkg>x11-libs/libxklavier</pkg> for keyboar=
d
 		management</flag>
 </use>



1.1                  gnome-base/gdm/gdm-3.4.1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gdm/gdm=
-3.4.1.ebuild?rev=3D1.1&view=3Dmarkup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gdm/gdm=
-3.4.1.ebuild?rev=3D1.1&content-type=3Dtext/plain

Index: gdm-3.4.1.ebuild
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-3.4.1.ebuild,v 1.1 =
2012/05/14 00:16:46 tetromino Exp $

EAPI=3D"4"
GNOME2_LA_PUNT=3D"yes"

inherit autotools eutils gnome2 pam systemd

DESCRIPTION=3D"GNOME Display Manager"
HOMEPAGE=3D"http://www.gnome.org/projects/gdm/"

LICENSE=3D"GPL-2"
SLOT=3D"0"
KEYWORDS=3D"~amd64 ~sh ~x86"

IUSE=3D"accessibility +consolekit +fallback fprint +gnome-shell ipv6 gnom=
e-keyring +introspection plymouth selinux smartcard systemd tcpd test xin=
erama +xklavier"

# 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
COMMON_DEPEND=3D"
	>=3Ddev-libs/dbus-glib-0.74
	>=3Ddev-libs/glib-2.29.3:2
	>=3Dx11-libs/gtk+-2.91.1:3
	>=3Dx11-libs/pango-1.3
	dev-libs/nspr
	>=3Ddev-libs/nss-3.11.1
	>=3Dmedia-libs/fontconfig-2.5.0
	>=3Dmedia-libs/libcanberra-0.4[gtk3]
	>=3Dx11-misc/xdg-utils-1.0.2-r3
	>=3Dsys-power/upower-0.9
	>=3Dsys-apps/accountsservice-0.6.12

	gnome-base/dconf
	>=3Dgnome-base/gnome-settings-daemon-3.1.4
	gnome-base/gsettings-desktop-schemas
	sys-apps/dbus

	app-text/iso-codes

	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-apps/sessreg

	virtual/pam
	consolekit? ( sys-auth/consolekit )

	accessibility? ( x11-libs/libXevie )
	gnome-keyring? ( >=3Dgnome-base/gnome-keyring-2.22[pam] )
	introspection? ( >=3Ddev-libs/gobject-introspection-0.9.12 )
	plymouth? ( sys-boot/plymouth )
	selinux? ( sys-libs/libselinux )
	systemd? ( >=3Dsys-apps/systemd-39 )
	tcpd? ( >=3Dsys-apps/tcp-wrappers-7.6 )
	xinerama? ( x11-libs/libXinerama )
	xklavier? ( >=3Dx11-libs/libxklavier-4 )"
DEPEND=3D"${COMMON_DEPEND}
	test? ( >=3Ddev-libs/check-0.9.4 )
	xinerama? ( x11-proto/xineramaproto )
	app-text/docbook-xml-dtd:4.1.2
	sys-devel/gettext
	x11-proto/inputproto
	x11-proto/randrproto
	>=3Ddev-util/intltool-0.40.0
	>=3Dapp-text/scrollkeeper-0.1.4
	>=3Dapp-text/gnome-doc-utils-0.3.2
	virtual/pkgconfig"
# 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
RDEPEND=3D"${COMMON_DEPEND}
	>=3Dgnome-base/gnome-session-2.91.92
	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? ( >=3Dgnome-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"

pkg_setup() {
	DOCS=3D"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=3D needs to be passed explicitly bec=
ause
	# of https://bugzilla.gnome.org/show_bug.cgi?id=3D607643#c4
	G2CONF=3D"${G2CONF}
		--disable-schemas-install
		--disable-static
		--localstatedir=3D${EPREFIX}/var
		--with-xdmcp=3Dyes
		--enable-authentication-scheme=3Dpam
		--with-pam-prefix=3D${EPREFIX}/etc
		--with-at-spi-registryd-directory=3D${EPREFIX}/usr/libexec
		$(use_with accessibility xevie)
		$(use_enable ipv6)
		$(use_enable xklavier libxklavier)
		$(use_with consolekit console-kit)
		$(use_with plymouth)
		$(use_with selinux)
		$(use_with systemd)
		$(use_with tcpd tcp-wrappers)
		$(use_with xinerama)"

	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=3D$(groups gdm)
		elog "Adding user gdm to video group"
		usermod -G video,${g// /,} gdm || die "Adding user gdm to video group f=
ailed"
	fi
}

src_prepare() {
	# remove unneeded linker directive for selinux, bug #41022
	epatch "${FILESDIR}/${PN}-2.32.0-selinux-remove-attr.patch"

	# daemonize so that the boot process can continue, bug #236701
	epatch "${FILESDIR}/${PN}-2.32.0-fix-daemonize-regression.patch"

	# GDM grabs VT2 instead of VT7, bug 261339, bug 284053, bug 288852
	epatch "${FILESDIR}/${PN}-2.32.0-fix-vt-problems.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"

	# fix libxklavier automagic support
	epatch "${FILESDIR}/${PN}-2.32.0-automagic-libxklavier-support.patch"

	# plymouth support (in next release)
	epatch "${FILESDIR}/${P}-save-root-window.patch"
	epatch "${FILESDIR}/${P}-plymouth.patch"

	# don't load accessibility support at runtime when USE=3D-accessibility
	use accessibility || epatch "${FILESDIR}/${PN}-3.3.92.1-disable-accessib=
ility.patch"

	# make gdm-fallback session the default if USE=3D-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
	intltoolize --force --copy --automake || die "intltoolize failed"
	eautoreconf

	gnome2_src_prepare
}

src_install() {
	gnome2_src_install

	# Install the systemd unit file
	systemd_dounit "${FILESDIR}/3.2.1.1/gdm.service"

	# gdm-binary should be gdm to work with our init (#5598)
	rm -f "${ED}/usr/sbin/gdm"
	ln -sfn /usr/sbin/gdm-binary "${ED}/usr/sbin/gdm"
	# our x11's scripts point to /usr/bin/gdm
	ln -sfn /usr/sbin/gdm-binary "${ED}/usr/bin/gdm"

	# log, etc.
	keepdir /var/log/gdm

	# add xinitrc.d scripts
	exeinto /etc/X11/xinit/xinitrc.d
	doexe "${FILESDIR}/49-keychain"
	doexe "${FILESDIR}/50-ssh-agent"

	# install XDG_DATA_DIRS gdm changes
	echo 'XDG_DATA_DIRS=3D"/usr/share/gdm"' > 99xdg-gdm
	doenvd 99xdg-gdm

	# install PAM files
	mkdir "${T}/pam.d" || die "mkdir failed"
	cp "${FILESDIR}/3.2.1.1"/gdm{,-autologin,-password,-fingerprint,-smartca=
rd,-welcome} \
		"${T}/pam.d" || die "cp failed"
	use gnome-keyring && sed -i "s:#Keyring=3D::g" "${T}/pam.d"/*
	dopamd "${T}/pam.d"/*
}

pkg_postinst() {
	gnome2_pkg_postinst

	dbus-launch dconf update || die "'dconf update' failed"

	ewarn
	ewarn "This is an EXPERIMENTAL release, please bear with its bugs and"
	ewarn "visit us on #gentoo-desktop if you have problems."
	ewarn

	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 use gnome-keyring; then
		elog "For autologin to unlock your keyring, you need to set an empty"
		elog "password on your keyring. Use app-crypt/seahorse for that."
	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

	# https://bugzilla.redhat.com/show_bug.cgi?id=3D513579
	# Lennart says this problem is fixed, but users are still reporting prob=
lems
	# XXX: Do we want this elog?
#	if has_version "media-libs/libcanberra[pulseaudio]" ; then
#		elog
#		elog "You have media-libs/libcanberra with the pulseaudio USE flag"
#		elog "enabled. GDM will start a pulseaudio process to play sounds. Thi=
s"
#		elog "process should automatically terminate when a user logs into a"
#		elog "desktop session. If GDM's pulseaudio fails to terminate and"
#		elog "causes problems for users' audio, you can prevent GDM from"
#		elog "starting pulseaudio by editing /var/lib/gdm/.pulse/client.conf"
#		elog "so it contains the following two lines:"
#		elog
#		elog "autospawn =3D no"
#		elog "daemon-binary =3D /bin/true"
#	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
}