diff options
| author |   Pacho Ramos <pacho@gentoo.org> | 2014-02-28 23:05:46 +0000 |
|---|---|---|
| committer | Pacho Ramos <pacho@gentoo.org> | 2014-02-28 23:05:46 +0000 |
| commit | 14cc53d1c0614e0d2d1f47ddacd5073b6e005877 (patch) | |
| tree | a66f2ad54f64c6132eaae66fc62b2f358fe1d59b /gnome-base/gdm | |
| parent | Version bump (diff) | |
| download | gentoo-2-14cc53d1c0614e0d2d1f47ddacd5073b6e005877.tar.gz gentoo-2-14cc53d1c0614e0d2d1f47ddacd5073b6e005877.tar.bz2 gentoo-2-14cc53d1c0614e0d2d1f47ddacd5073b6e005877.zip | |
Not RDEPEND on coolkey and pam_pkcs11 as discussed on IRC and bugs #502204 #502200
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)
Diffstat (limited to 'gnome-base/gdm')
| -rw-r--r-- | gnome-base/gdm/ChangeLog | 6 | ||||
| -rw-r--r-- | gnome-base/gdm/gdm-3.10.0.1.ebuild | 10 |
2 files changed, 10 insertions, 6 deletions
diff --git a/gnome-base/gdm/ChangeLog b/gnome-base/gdm/ChangeLog index 6925fc7b67e8..9442376050cb 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.392 2014/02/22 21:37:55 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/ChangeLog,v 1.393 2014/02/28 23:05:46 pacho Exp $ + + 28 Feb 2014; Pacho Ramos <pacho@gentoo.org> gdm-3.10.0.1.ebuild: + Not RDEPEND on coolkey and pam_pkcs11 as discussed on IRC and bugs #502204 + #502200 22 Feb 2014; Pacho Ramos <pacho@gentoo.org> gdm-3.10.0.1.ebuild: Fix wrong commit, bug 502160 diff --git a/gnome-base/gdm/gdm-3.10.0.1.ebuild b/gnome-base/gdm/gdm-3.10.0.1.ebuild index 7777048b5a24..7fdbd6f9f91b 100644 --- a/gnome-base/gdm/gdm-3.10.0.1.ebuild +++ b/gnome-base/gdm/gdm-3.10.0.1.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.ebuild,v 1.2 2014/02/01 09:12:31 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-3.10.0.1.ebuild,v 1.3 2014/02/28 23:05:46 pacho Exp $ EAPI="5" GNOME2_LA_PUNT="yes" @@ -83,9 +83,6 @@ RDEPEND="${COMMON_DEPEND} fprint? ( sys-auth/fprintd sys-auth/pam_fprint ) - smartcard? ( - app-crypt/coolkey - sys-auth/pam_pkcs11 ) !gnome-extra/fast-user-switch-applet " @@ -106,7 +103,10 @@ DOC_CONTENTS=" \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. + 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() { |