Bump to 3.2.1.1 from the gnome overlay. Notable changes: new gnome-shell based greete...
authorAlexandre Rostovtsev <tetromino@gentoo.org>
Sat, 5 Nov 2011 08:19:52 +0000 (08:19 +0000)
committerAlexandre Rostovtsev <tetromino@gentoo.org>
Sat, 5 Nov 2011 08:19:52 +0000 (08:19 +0000)
Package-Manager: portage-2.2.0_alpha72/cvs/Linux x86_64

gnome-base/gdm/ChangeLog
gnome-base/gdm/Manifest
gnome-base/gdm/files/gdm-3.2.1.1-custom-session.patch [new file with mode: 0644]
gnome-base/gdm/files/gdm-3.2.1.1-disable-accessibility.patch [new file with mode: 0644]
gnome-base/gdm/gdm-3.2.1.1-r1.ebuild [new file with mode: 0644]
gnome-base/gdm/metadata.xml

index f49c56ce9b747ae87c8913f1ae6f67dd08b94095..ce3bc8d6abc4152f8541ff470ecee175b33641d2 100644 (file)
@@ -1,6 +1,21 @@
 # ChangeLog for gnome-base/gdm
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/ChangeLog,v 1.347 2011/10/30 15:56:11 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/ChangeLog,v 1.348 2011/11/05 08:19:52 tetromino Exp $
+
+*gdm-3.2.1.1-r1 (05 Nov 2011)
+
+  05 Nov 2011; Alexandre Rostovtsev <tetromino@gentoo.org>
+  +gdm-3.2.1.1-r1.ebuild, +files/gdm-3.2.1.1-custom-session.patch,
+  +files/gdm-3.2.1.1-disable-accessibility.patch:
+  Bump to 3.2.1.1 from the gnome overlay. Notable changes: new gnome-shell
+  based greeter that uses opengl (emerge with USE=-gnome-shell if you want to
+  use the boring, old-fashioned greeter); user information is now obtained
+  from accountsservices; the way that gdm launches its greeter sessions was
+  completely overhauled. There is also optional support for fingerprint and
+  smartcard authentication which is basically UNTESTED due to lack of hardware.
+  Enable fprint or smartcard USE flags if you want to experiment!
+  Dropped alpha, ia64, sparc keywords due to new accountsservice and
+  gnome-settings-daemon-3.2 dependencies.
 
   30 Oct 2011; Raúl Porcel <armin76@gentoo.org> gdm-2.20.11-r1.ebuild:
   alpha/ia64/sh/sparc stable wrt #385699
index 989f4c18aca20583e4533a91fe4cbfb3fc830249..5c463a1335d050b953d055d718131ec84c4e439f 100644 (file)
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX 49-keychain 181 RMD160 32ce131e93fc2d8640edee72ad42124537860156 SHA1 b4518f9d8ba65d0cf4d64ded844e59be343088d3 SHA256 d73e07847bfa6ac69938aa309f5c137d4c36248cedf9834db1315ba1b2b87140
 AUX 50-ssh-agent 243 RMD160 14327252dc1da75bdb49380960434a613b28cfa6 SHA1 e808be7a34324b269d493585990f134e82cc722a SHA256 f0790148b975ef1e7a37ffe8f5d90f943746f0a3bcf9d7fad8500219e2114042
@@ -17,20 +17,25 @@ AUX gdm-2.32.0-fix-daemonize-regression.patch 4048 RMD160 4219fec833f0e62a10e52d
 AUX gdm-2.32.0-fix-vt-problems.patch 6156 RMD160 7c739dd278194e1a30672635e35b05f798ec9996 SHA1 6428abdc3c493c4b9f69fcaef8dcb88a910f4d14 SHA256 12da81b8085d76ce3099f1af0ec588c07c3f020f341f825683f4855c9303731e
 AUX gdm-2.32.0-selinux-remove-attr.patch 851 RMD160 10dc29802fb29047188bff7aafe979a5e15e030a SHA1 d78bde425b7a141c91767c3e639ee0011feddadc SHA256 ad13d4b1253dca7d5ac362bcce9f5861c2830a3df32e5370a5a0d975c32ec258
 AUX gdm-2.32.0-xinitrc-ssh-agent.patch 863 RMD160 6ea58bdc1fa24d41f3c51fc7cdbabc05417053f0 SHA1 ad98258168b84c80d581085804b61649ac67e4d5 SHA256 71231d08baf41ee7b91c33c3d8a731c078d1d29328e09223efb1f579bacdaffe
+AUX gdm-3.2.1.1-custom-session.patch 1317 RMD160 20a1dd5608f4154fe53fae4def03f509769da878 SHA1 4acf8ed9b11eb531505c0c58805f1b37948fcb77 SHA256 75bd1bdc0d396fee71ff41c2657f922a4c8e290c891cc72f47647ab832d0c285
+AUX gdm-3.2.1.1-disable-accessibility.patch 1637 RMD160 12f69b9b67fc6dbb0a57ed25f0d0ea68167f53f2 SHA1 0e6580f88768d2f8c20d2cfdf5d9c8ecb7f84e66 SHA256 60ef48cf07dab78c3f09e5e57cd9138398cfe1d5de4b17408d3c08da58239932
 DIST gdm-2.20.11.tar.bz2 4013059 RMD160 e400bb8a0b78a2e8b0da98edd2e0f3a7a0267f04 SHA1 be23bdf32b7a4254ac80983f4edf25cafa847ff3 SHA256 2e21c9a44941cd0033aaa6b381b563488bbdd0ad1a28ef05f7e0178891f1eaa2
 DIST gdm-2.20.9-gentoo-files-r1.tar.bz2 3494 RMD160 9d8f9954bd0d8b657a2faf2516b4548b9f1556d3 SHA1 28ceedb42440fdb50dffa7e69b18f213b00e3935 SHA256 666c0bf1ba28ccc257bf1235b5286e1eb9e15230c0036413ab428e09c54238f9
 DIST gdm-2.32.1.tar.bz2 2441685 RMD160 70526a3ddec3ff8a1313243641bf807a2218f3ae SHA1 75017d6acfc8e158e0df848629431021b25998a5 SHA256 7ba9cb2a8efb9856994467b14e4837a281fcf6d9dc9a267ea38a9aae1ec55abc
+DIST gdm-3.2.1.1-gentoo-files.tar.xz 996 RMD160 29fa24d0e0a4961d7e14a348fb620bcb4ad62828 SHA1 46651e31d865321de4de56841315ca5b27079d91 SHA256 610f7a1652996d77462773994adb5fd396ed973bbd9df51daa301004d38ca10a
+DIST gdm-3.2.1.1.tar.xz 1632116 RMD160 ec62806f2c0694f84ec34889af25021e2662375e SHA1 bf1b93249044e87eb535cc1dcf3d4457b24261fd SHA256 85a1383f93870fb5d47a938cc2e04b6f0d74cb611a2b5d94d9651b78a5ccffbd
 DIST gentoo-gdm-theme-r3.tar.bz2 411703 RMD160 9188c8f2661163be72595a6b4924fae0648e7df5 SHA1 246a7ce67ad9d826b1cca6d90b53369b88be72ac SHA256 c7cbe97757ff93f0ffd42f9d9fb702278a361e830940a03901cda9943f44ba68
 EBUILD gdm-2.20.11-r1.ebuild 7220 RMD160 4e8e841fca070f7ca8d0c4c1011f24e39de62dec SHA1 f47a0fb2bee680710994354c60592a36ccb21bec SHA256 21c254f249c1410f0f6d1e4112b440bac690f317ffd3a7dd9668f81e152dffd4
 EBUILD gdm-2.20.11.ebuild 6981 RMD160 d89e163666b53c173578abce9846fed4dde4d5f9 SHA1 5dff7be8ab624c3b15b5dfe6bfb14ae1afc6f0d7 SHA256 174e8685993d432e3cad052626a318f6b622a07954d873ac79c27db0d8ebe3f5
 EBUILD gdm-2.32.1-r1.ebuild 5596 RMD160 69277cc8730fe8c9b5157db0fb8175ee5828e427 SHA1 c71e7cddf7f3fb6701901415170ef73c9e3460d0 SHA256 98ba7249fea7956e4978528c65c183499aa29bac33a317ea8a2325ff6f3b1e6c
 EBUILD gdm-2.32.1.ebuild 5602 RMD160 921d0774cb460a577868e5c68d4b57e6d73c1368 SHA1 b62cedc7eb647f0dd7f493c059a54691d124f349 SHA256 c75ebeeaa77288325da04258e6d12ae4bd7ed4d3c3b8ebc87d4399802e0ce262
-MISC ChangeLog 48303 RMD160 7d3454bbdef62a5f2d0624477ef9d87df1d95d69 SHA1 5fc148c61e7ae15673859f65b5e5867353c4ea3a SHA256 58347dea3b8d6c6339a5a8ec012880e8cc15455cf7c4125f6d1134f5025af228
-MISC metadata.xml 536 RMD160 53b21d3083b79fe916434c4031a06d108130185c SHA1 b1e22aa4ac145b16471c105709861ffff6585795 SHA256 9d8a22879d6e19a12a8f47ed551cdf440fec0d7057ff0a12feec1c5752c9ce2d
+EBUILD gdm-3.2.1.1-r1.ebuild 8538 RMD160 cc334c8e325335028cca8825033ff82231dec4e2 SHA1 e1a211e8411c5bcb5c624aa933d7728faff08c13 SHA256 9fd444e1e9cbae769c5a07e73a6d94ba90bef3e8edc55ff206836853bdd1359a
+MISC ChangeLog 49150 RMD160 b94dbd4a5bb59ff9b9cee613bd69565e31e70227 SHA1 73a1417671ae01d924db35c727f1278ed35e4199 SHA256 322d4c4adbe818d4c0d055dfbf1ec13c12dcc8792a856d0dc41f8dbb0809013d
+MISC metadata.xml 914 RMD160 0b4fafbdb6fe9d54da1e3f9773fd158d0a81d5d4 SHA1 e175fe2fea96347e191465d9a63320ce3ced44f2 SHA256 efbc3886382ee7ea1ca1dbef1e49bdfb1086c0a5e352525a7cff58ac54fc1ec7
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk6tc6EACgkQuQc30/atMkDgcwCgmQw7Fi8ySDw64ASIkxoCCOCZ
-3bgAoJ2I6qsS5MJvOqbfQ742+wW6eWZT
-=k+Rw
+iF4EAREIAAYFAk608a0ACgkQdjK8w9WeBnBkmQEAsLRrCU7iliUM5IwFSBP8C/u4
+8xBwOIRITbKbSVcgPogA/j41ad8+WqNl+nL9IQeYczNeyErOEl2MINVd/feoKAxD
+=XHvo
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/gdm/files/gdm-3.2.1.1-custom-session.patch b/gnome-base/gdm/files/gdm-3.2.1.1-custom-session.patch
new file mode 100644 (file)
index 0000000..0642f7c
--- /dev/null
@@ -0,0 +1,51 @@
+From b96c19976b6876648fd91949f78f06cf5d269b18 Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue <eva@gentoo.org>
+Date: Tue, 2 Nov 2010 23:19:07 +0100
+Subject: [PATCH] make custom session work
+
+Gentoo bug: #216984
+
+fix custom sessions not doing sourcing in the proper order.
+---
+ data/Xsession.in |   18 +++++++++---------
+ 1 files changed, 9 insertions(+), 9 deletions(-)
+
+diff --git a/data/Xsession.in b/data/Xsession.in
+index 118518c..201be92 100755
+--- a/data/Xsession.in
++++ b/data/Xsession.in
+@@ -155,15 +155,6 @@ fi
+ 
+ xhost +si:localuser:`id -un` || :
+ 
+-# run all system xinitrc shell scripts.
+-if [ -d /etc/X11/xinit/xinitrc.d ]; then
+-    for i in /etc/X11/xinit/xinitrc.d/* ; do
+-        if [ -x "$i" -a ! -d "$i" ]; then
+-          . "$i"
+-        fi
+-    done
+-fi
+-
+ if [ "x$command" = "xcustom" ] ; then
+   if [ -x "$HOME/.xsession" ]; then
+     command="$HOME/.xsession"
+@@ -191,6 +182,15 @@ if [ "x$command" = "xdefault" ] ; then
+   fi
+ fi
+ 
++# run all system xinitrc shell scripts.
++if [ -d /etc/X11/xinit/xinitrc.d ]; then
++    for i in /etc/X11/xinit/xinitrc.d/* ; do
++        if [ -x "$i" -a ! -d "$i" ]; then
++          . "$i"
++        fi
++    done
++fi
++
+ # add ssh-agent if found
+ sshagent="`gdmwhich ssh-agent`"
+ if [ -n "$sshagent" ] && [ -x "$sshagent" ] && [ -z "$SSH_AUTH_SOCK" ]; then
+-- 
+1.7.7
+
diff --git a/gnome-base/gdm/files/gdm-3.2.1.1-disable-accessibility.patch b/gnome-base/gdm/files/gdm-3.2.1.1-disable-accessibility.patch
new file mode 100644 (file)
index 0000000..ab8325f
--- /dev/null
@@ -0,0 +1,65 @@
+From 91bd106c72362e51fbfa6966bc71dd0bb12d479d Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gmail.com>
+Date: Wed, 14 Sep 2011 22:09:56 -0400
+Subject: [PATCH] Disable a11y in gconf and gsettings defaults
+
+---
+ data/00-upstream-settings  |    6 +++---
+ data/session-setup.entries |    4 ++--
+ 2 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/data/00-upstream-settings b/data/00-upstream-settings
+index 1511b7b..87410cb 100644
+--- a/data/00-upstream-settings
++++ b/data/00-upstream-settings
+@@ -7,7 +7,7 @@
+ #
+ 
+ [org/gnome/desktop/a11y/keyboard]
+-enable=true
++enable=false
+ 
+ [org/gnome/desktop/background]
+ show-desktop-icons=false
+@@ -16,7 +16,7 @@ show-desktop-icons=false
+ exec='/bin/true'
+ 
+ [org/gnome/desktop/interface]
+-toolkit-accessibility=true
++toolkit-accessibility=false
+ 
+ [org/gnome/desktop/lockdown]
+ disable-application-handlers=true
+@@ -35,7 +35,7 @@ session-name='gdm-shell'
+ event-sounds=true
+ 
+ [org/gnome/settings-daemon/plugins/a11y-keyboard]
+-active=true
++active=false
+ 
+ [org/gnome/settings-daemon/plugins/a11y-settings]
+ active=false
+diff --git a/data/session-setup.entries b/data/session-setup.entries
+index b84e16f..a47d761 100644
+--- a/data/session-setup.entries
++++ b/data/session-setup.entries
+@@ -406,14 +406,14 @@
+     <entry>
+       <key>/desktop/gnome/interface/accessibility</key>
+       <value>
+-        <bool>true</bool>
++        <bool>false</bool>
+       </value>
+     </entry>
+ 
+     <entry>
+       <key>/desktop/gnome/accessibility/keyboard/enable</key>
+       <value>
+-        <bool>true</bool>
++        <bool>false</bool>
+       </value>
+     </entry>
+ 
+-- 
+1.7.7
+
diff --git a/gnome-base/gdm/gdm-3.2.1.1-r1.ebuild b/gnome-base/gdm/gdm-3.2.1.1-r1.ebuild
new file mode 100644 (file)
index 0000000..b5a6f8e
--- /dev/null
@@ -0,0 +1,269 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-3.2.1.1-r1.ebuild,v 1.1 2011/11/05 08:19:52 tetromino Exp $
+
+EAPI="4"
+GNOME2_LA_PUNT="yes"
+GCONF_DEBUG="yes"
+
+inherit autotools eutils gnome2 pam systemd
+
+DESCRIPTION="GNOME Display Manager"
+HOMEPAGE="http://www.gnome.org/projects/gdm/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~sh ~x86"
+
+IUSE_LIBC="elibc_glibc"
+IUSE="accessibility +consolekit fprint +gnome-shell ipv6 gnome-keyring +introspection selinux smartcard tcpd test xinerama +xklavier $IUSE_LIBC"
+
+# Name of the tarball with gentoo specific files
+GDM_EXTRA="${PN}-3.2.1.1-gentoo-files"
+
+SRC_URI="${SRC_URI}
+       http://dev.gentoo.org/~tetromino/distfiles/gdm/${GDM_EXTRA}.tar.xz"
+
+# 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="
+       >=dev-libs/dbus-glib-0.74
+       >=dev-libs/glib-2.29.3:2
+       >=x11-libs/gtk+-2.91.1:3
+       >=x11-libs/pango-1.3
+       dev-libs/nspr
+       >=dev-libs/nss-3.11.1
+       >=media-libs/fontconfig-2.5.0
+       >=media-libs/libcanberra-0.4[gtk3]
+       >=gnome-base/gconf-2.31.3
+       >=x11-misc/xdg-utils-1.0.2-r3
+       >=sys-power/upower-0.9
+       >=sys-apps/accountsservice-0.6.12
+
+       gnome-base/dconf
+       >=gnome-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? ( >=gnome-base/gnome-keyring-2.22[pam] )
+       introspection? ( >=dev-libs/gobject-introspection-0.9.12 )
+       selinux? ( sys-libs/libselinux )
+       tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
+       xinerama? ( x11-libs/libXinerama )
+       xklavier? ( >=x11-libs/libxklavier-4 )"
+DEPEND="${COMMON_DEPEND}
+       test? ( >=dev-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
+       >=dev-util/intltool-0.40.0
+       >=dev-util/pkgconfig-0.19
+       >=app-text/scrollkeeper-0.1.4
+       >=app-text/gnome-doc-utils-0.3.2"
+# 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="${COMMON_DEPEND}
+       >=gnome-base/gnome-session-2.91.92
+       x11-apps/xhost
+
+       accessibility? (
+               app-accessibility/gnome-mag
+               app-accessibility/gok
+               app-accessibility/orca
+               gnome-extra/at-spi:1 )
+       consolekit? ( gnome-extra/polkit-gnome )
+       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"
+
+pkg_setup() {
+       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-schemas-install
+               --disable-static
+               --localstatedir=${EPREFIX}/var
+               --with-xdmcp=yes
+               --enable-authentication-scheme=pam
+               --with-pam-prefix=${EPREFIX}/etc
+               --with-at-spi-registryd-directory=${EPREFIX}/usr/libexec
+               $(use_with accessibility xevie)
+               $(use_enable ipv6)
+               $(use_enable xklavier libxklavier)
+               $(use_with consolekit console-kit)
+               $(use_with selinux)
+               $(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=$(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() {
+       gnome2_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"
+
+       # don't load accessibility support at runtime when USE=-accessibility
+       use accessibility || epatch "${FILESDIR}/${PN}-3.2.1.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
+       intltoolize --force --copy --automake || die "intltoolize failed"
+       eautoreconf
+}
+
+src_install() {
+       gnome2_src_install
+
+       local gentoodir="${WORKDIR}/${GDM_EXTRA}"
+
+       # Install the systemd unit file
+       systemd_dounit "${gentoodir}/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" || die "doexe 2 failed"
+       doexe "${FILESDIR}/50-ssh-agent" || die "doexe 3 failed"
+
+       # install XDG_DATA_DIRS gdm changes
+       echo 'XDG_DATA_DIRS="/usr/share/gdm"' > 99xdg-gdm
+       doenvd 99xdg-gdm || die "doenvd failed"
+
+       # install PAM files
+       use gnome-keyring && sed -i "s:#Keyring=::g" "${gentoodir}"/pam.d/*
+       dopamd "${gentoodir}"/pam.d/gdm{,-autologin,-password,-fingerprint,-smartcard,-welcome}
+}
+
+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=513579
+       # Lennart says this problem is fixed, but users are still reporting problems
+       # 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. This"
+#              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 = no"
+#              elog "daemon-binary = /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
+}
index 3ff57ea787b11c5ab4238a3fce52db682e0c7c02..126b49076e55cf78bc5399e116d5250ee2b9df5e 100644 (file)
@@ -3,10 +3,17 @@
 <pkgmetadata>
 <herd>gnome</herd>
 <use>
-       <flag name="dmx">Enables Distributed Multihead X (DMX) support</flag>
-       <flag name="remote">Enables support for secure remote connections</flag>
        <flag name="consolekit">Allow proper handling of removable media according
                to who is actually present on the machine.</flag>
+       <flag name="dmx">Enables Distributed Multihead X (DMX) support</flag>
+       <flag name="fprint">Enables experimental fingerprint authentication using
+               <pkg>sys-auth/fprintd</pkg></flag>
+       <flag name="gnome-shell">Enables a greeter based on GNOME Shell (uses
+               OpenGL)</flag>
+       <flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg>
+               for introspection</flag>
+       <flag name="remote">Enables support for secure remote connections</flag>
+       <flag name="smartcard">Enables experimental smartcard authentication</flag>
        <flag name="xklavier">Use <pkg>x11-libs/libxklavier</pkg> for keyboard
                management</flag>
 </use>