commit:     a3275e3d96000ecc0b9dc5bed0fa8fc8d680e3a4
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 23 08:45:21 2018 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Sun Sep 23 08:45:41 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a3275e3d

gnome-base/gnome-keyring: followup ebuild fixes

Apparently somehow didn't have these staged for commit and push.
Remove unused versionator inherit, honor USE=ssh-agent for openssh
dep, and don't force enable ssh agent.
But because a USE based $(use_enable ssh-agent) was after the wrong
always enabling passing, this isn't in a revbump, as the USE flag
was honored and everyone has openssh anyways.

Package-Manager: Portage-2.3.49, Repoman-2.3.10

 gnome-base/gnome-keyring/gnome-keyring-3.28.2.ebuild | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/gnome-base/gnome-keyring/gnome-keyring-3.28.2.ebuild 
b/gnome-base/gnome-keyring/gnome-keyring-3.28.2.ebuild
index 9c67aff73b7..a10d93c2724 100644
--- a/gnome-base/gnome-keyring/gnome-keyring-3.28.2.ebuild
+++ b/gnome-base/gnome-keyring/gnome-keyring-3.28.2.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 GNOME2_LA_PUNT="yes"
 PYTHON_COMPAT=( python2_7 )
 
-inherit fcaps gnome2 pam python-any-r1 versionator virtualx
+inherit fcaps gnome2 pam python-any-r1 virtualx
 
 DESCRIPTION="Password and keyring managing daemon"
 HOMEPAGE="https://wiki.gnome.org/Projects/GnomeKeyring";
@@ -25,7 +25,7 @@ RDEPEND="
        pam? ( virtual/pam )
        selinux? ( sec-policy/selinux-gnome )
        >=app-crypt/gnupg-2.0.28:=
-       net-misc/openssh
+       ssh-agent? ( net-misc/openssh )
 "
 DEPEND="${RDEPEND}
        >=app-eselect/eselect-pinentry-0.5
@@ -52,7 +52,6 @@ src_prepare() {
 
 src_configure() {
        gnome2_src_configure \
-               --enable-ssh-agent \
                $(use_with caps libcap-ng) \
                $(use_enable pam) \
                $(use_with pam pam-dir $(getpam_mod_dir)) \

Reply via email to