diff options
| author |   Alexandre Rostovtsev <tetromino@gentoo.org> | 2014-06-07 19:06:58 +0000 |
|---|---|---|
| committer | Alexandre Rostovtsev <tetromino@gentoo.org> | 2014-06-07 19:06:58 +0000 |
| commit | f8f59e23b2cee5dea2b2118d45555e926b95d617 (patch) | |
| tree | d495398ab542aa409180ede3b53bede89ba915ae /gnome-base/gnome-keyring | |
| parent | Version bump, bug#511536 (diff) | |
| download | gentoo-2-f8f59e23b2cee5dea2b2118d45555e926b95d617.tar.gz gentoo-2-f8f59e23b2cee5dea2b2118d45555e926b95d617.tar.bz2 gentoo-2-f8f59e23b2cee5dea2b2118d45555e926b95d617.zip | |
Make ssh-agent functionality optional, requested by chutzpah because gnome-keyring doesn't support some ssh key formats (ecdsa, ed25519).
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key CF0ADD61)
Diffstat (limited to 'gnome-base/gnome-keyring')
| -rw-r--r-- | gnome-base/gnome-keyring/ChangeLog | 7 | ||||
| -rw-r--r-- | gnome-base/gnome-keyring/gnome-keyring-3.12.2.ebuild | 6 | ||||
| -rw-r--r-- | gnome-base/gnome-keyring/metadata.xml | 4 |
3 files changed, 13 insertions, 4 deletions
diff --git a/gnome-base/gnome-keyring/ChangeLog b/gnome-base/gnome-keyring/ChangeLog index 647c9e23f83f..dbb88080fabc 100644 --- a/gnome-base/gnome-keyring/ChangeLog +++ b/gnome-base/gnome-keyring/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for gnome-base/gnome-keyring # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/ChangeLog,v 1.252 2014/05/31 07:10:49 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/ChangeLog,v 1.253 2014/06/07 19:06:58 tetromino Exp $ + + 07 Jun 2014; Alexandre Rostovtsev <tetromino@gentoo.org> + gnome-keyring-3.12.2.ebuild, metadata.xml: + Make ssh-agent functionality optional, requested by chutzpah because + gnome-keyring doesn't support some ssh key formats (ecdsa, ed25519). *gnome-keyring-3.12.2 (31 May 2014) diff --git a/gnome-base/gnome-keyring/gnome-keyring-3.12.2.ebuild b/gnome-base/gnome-keyring/gnome-keyring-3.12.2.ebuild index bfb698945d4c..fad3a9b57f61 100644 --- a/gnome-base/gnome-keyring/gnome-keyring-3.12.2.ebuild +++ b/gnome-base/gnome-keyring/gnome-keyring-3.12.2.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/gnome-keyring/gnome-keyring-3.12.2.ebuild,v 1.1 2014/05/31 07:10:49 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/gnome-keyring-3.12.2.ebuild,v 1.2 2014/06/07 19:06:58 tetromino Exp $ EAPI="5" GCONF_DEBUG="yes" # Not gnome macro but similar @@ -14,7 +14,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GnomeKeyring" LICENSE="GPL-2+ LGPL-2+" SLOT="0" -IUSE="+caps debug pam selinux" +IUSE="+caps debug pam selinux +ssh-agent" KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x86-solaris" RDEPEND=" @@ -66,8 +66,8 @@ src_configure() { $(use_enable pam) \ $(use_with pam pam-dir $(getpam_mod_dir)) \ $(use_enable selinux) \ + $(use_enable ssh-agent) \ --enable-doc \ - --enable-ssh-agent \ --enable-gpg-agent } diff --git a/gnome-base/gnome-keyring/metadata.xml b/gnome-base/gnome-keyring/metadata.xml index 20be5f6c6da1..1ab418096095 100644 --- a/gnome-base/gnome-keyring/metadata.xml +++ b/gnome-base/gnome-keyring/metadata.xml @@ -11,4 +11,8 @@ standard way for applications to manage certificates and keys on smart cards or secure storage. </longdescription> + <use> + <flag name="ssh-agent">Use GNOME Keyring to unlock SSH keys. + Recommended unless you are using ECDSA or Ed25519 keys.</flag> + </use> </pkgmetadata> |