1 |
commit: a3275e3d96000ecc0b9dc5bed0fa8fc8d680e3a4 |
2 |
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Sep 23 08:45:21 2018 +0000 |
4 |
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Sep 23 08:45:41 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a3275e3d |
7 |
|
8 |
gnome-base/gnome-keyring: followup ebuild fixes |
9 |
|
10 |
Apparently somehow didn't have these staged for commit and push. |
11 |
Remove unused versionator inherit, honor USE=ssh-agent for openssh |
12 |
dep, and don't force enable ssh agent. |
13 |
But because a USE based $(use_enable ssh-agent) was after the wrong |
14 |
always enabling passing, this isn't in a revbump, as the USE flag |
15 |
was honored and everyone has openssh anyways. |
16 |
|
17 |
Package-Manager: Portage-2.3.49, Repoman-2.3.10 |
18 |
|
19 |
gnome-base/gnome-keyring/gnome-keyring-3.28.2.ebuild | 5 ++--- |
20 |
1 file changed, 2 insertions(+), 3 deletions(-) |
21 |
|
22 |
diff --git a/gnome-base/gnome-keyring/gnome-keyring-3.28.2.ebuild b/gnome-base/gnome-keyring/gnome-keyring-3.28.2.ebuild |
23 |
index 9c67aff73b7..a10d93c2724 100644 |
24 |
--- a/gnome-base/gnome-keyring/gnome-keyring-3.28.2.ebuild |
25 |
+++ b/gnome-base/gnome-keyring/gnome-keyring-3.28.2.ebuild |
26 |
@@ -5,7 +5,7 @@ EAPI=6 |
27 |
GNOME2_LA_PUNT="yes" |
28 |
PYTHON_COMPAT=( python2_7 ) |
29 |
|
30 |
-inherit fcaps gnome2 pam python-any-r1 versionator virtualx |
31 |
+inherit fcaps gnome2 pam python-any-r1 virtualx |
32 |
|
33 |
DESCRIPTION="Password and keyring managing daemon" |
34 |
HOMEPAGE="https://wiki.gnome.org/Projects/GnomeKeyring" |
35 |
@@ -25,7 +25,7 @@ RDEPEND=" |
36 |
pam? ( virtual/pam ) |
37 |
selinux? ( sec-policy/selinux-gnome ) |
38 |
>=app-crypt/gnupg-2.0.28:= |
39 |
- net-misc/openssh |
40 |
+ ssh-agent? ( net-misc/openssh ) |
41 |
" |
42 |
DEPEND="${RDEPEND} |
43 |
>=app-eselect/eselect-pinentry-0.5 |
44 |
@@ -52,7 +52,6 @@ src_prepare() { |
45 |
|
46 |
src_configure() { |
47 |
gnome2_src_configure \ |
48 |
- --enable-ssh-agent \ |
49 |
$(use_with caps libcap-ng) \ |
50 |
$(use_enable pam) \ |
51 |
$(use_with pam pam-dir $(getpam_mod_dir)) \ |