summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPacho Ramos <pacho@gentoo.org>2015-06-20 10:44:26 +0000
committerPacho Ramos <pacho@gentoo.org>2015-06-20 10:44:26 +0000
commit304dabc92b5248782e6359d4a9d795ac23b04850 (patch)
tree2031f163c824ed14cee5e68f47ffbe1c48d5fc9e /gnome-base/gnome-keyring
parentbackport subslot dep on net-libs/zeromq (diff)
downloadgentoo-2-304dabc92b5248782e6359d4a9d795ac23b04850.tar.gz
gentoo-2-304dabc92b5248782e6359d4a9d795ac23b04850.tar.bz2
gentoo-2-304dabc92b5248782e6359d4a9d795ac23b04850.zip
Suggest people to set pinentry-gnome3 as default as discussed in bug #547456
(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)
Diffstat (limited to 'gnome-base/gnome-keyring')
-rw-r--r--gnome-base/gnome-keyring/ChangeLog5
-rw-r--r--gnome-base/gnome-keyring/gnome-keyring-3.16.0-r1.ebuild7
2 files changed, 10 insertions, 2 deletions
diff --git a/gnome-base/gnome-keyring/ChangeLog b/gnome-base/gnome-keyring/ChangeLog
index bd3969886b2c..fd43080cdbf6 100644
--- a/gnome-base/gnome-keyring/ChangeLog
+++ b/gnome-base/gnome-keyring/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for gnome-base/gnome-keyring
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/ChangeLog,v 1.273 2015/06/14 13:59:58 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/ChangeLog,v 1.274 2015/06/20 10:44:26 pacho Exp $
+
+ 20 Jun 2015; Pacho Ramos <pacho@gentoo.org> gnome-keyring-3.16.0-r1.ebuild:
+ Suggest people to set pinentry-gnome3 as default as discussed in bug #547456
*gnome-keyring-3.16.0-r1 (14 Jun 2015)
diff --git a/gnome-base/gnome-keyring/gnome-keyring-3.16.0-r1.ebuild b/gnome-base/gnome-keyring/gnome-keyring-3.16.0-r1.ebuild
index 9fc07a916aef..414229db00ee 100644
--- a/gnome-base/gnome-keyring/gnome-keyring-3.16.0-r1.ebuild
+++ b/gnome-base/gnome-keyring/gnome-keyring-3.16.0-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/gnome-keyring-3.16.0-r1.ebuild,v 1.1 2015/06/14 13:59:58 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/gnome-keyring-3.16.0-r1.ebuild,v 1.2 2015/06/20 10:44:26 pacho Exp $
EAPI="5"
GCONF_DEBUG="yes" # Not gnome macro but similar
@@ -77,4 +77,9 @@ pkg_postinst() {
# Never install as suid root, this breaks dbus activation, see bug #513870
use caps && fcaps -m 755 cap_ipc_lock usr/bin/gnome-keyring-daemon
gnome2_pkg_postinst
+
+ if ! [[ $(eselect pinentry show | grep "pinentry-gnome3") ]] ; then
+ ewarn "Please select pinentry-gnome3 as default pinentry provider:"
+ ewarn " # eselect pinentry set pinentry-gnome3"
+ fi
}