1 |
commit: 68b35832817cc0e2868603504fc81288c93a5758 |
2 |
Author: Tony Olagbaiye <bqv <AT> fron <DOT> io> |
3 |
AuthorDate: Tue Jan 3 07:23:58 2023 +0000 |
4 |
Commit: Tony Olagbaiye <gentoo <AT> fron <DOT> io> |
5 |
CommitDate: Tue Jan 3 07:23:58 2023 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=68b35832 |
7 |
|
8 |
net-misc/gnome-ssh-askpass: minor corrections |
9 |
|
10 |
Signed-off-by: Tony Olagbaiye <bqv <AT> fron.io> |
11 |
|
12 |
.../gnome-ssh-askpass-9.1_p1.ebuild | 23 ++++++++++++---------- |
13 |
1 file changed, 13 insertions(+), 10 deletions(-) |
14 |
|
15 |
diff --git a/net-misc/gnome-ssh-askpass/gnome-ssh-askpass-9.1_p1.ebuild b/net-misc/gnome-ssh-askpass/gnome-ssh-askpass-9.1_p1.ebuild |
16 |
index a17b5e22c..4de717ec4 100644 |
17 |
--- a/net-misc/gnome-ssh-askpass/gnome-ssh-askpass-9.1_p1.ebuild |
18 |
+++ b/net-misc/gnome-ssh-askpass/gnome-ssh-askpass-9.1_p1.ebuild |
19 |
@@ -22,10 +22,11 @@ REQUIRED_USE="|| ( gtk2 gtk3 )" |
20 |
|
21 |
RESTRICT="test" |
22 |
|
23 |
-DEPEND=" |
24 |
+RDEPEND=" |
25 |
gtk2? ( x11-libs/gtk+:2 ) |
26 |
gtk3? ( x11-libs/gtk+:3 ) |
27 |
" |
28 |
+DEPEND="${RDEPEND}" |
29 |
BDEPEND=" |
30 |
virtual/pkgconfig |
31 |
verify-sig? ( sec-keys/openpgp-keys-openssh ) |
32 |
@@ -43,22 +44,24 @@ src_configure() { |
33 |
} |
34 |
|
35 |
src_compile() { |
36 |
- pushd contrib |
37 |
+ pushd contrib || die |
38 |
|
39 |
use gtk2 && emake gnome-ssh-askpass2 |
40 |
use gtk3 && emake gnome-ssh-askpass3 |
41 |
|
42 |
- popd |
43 |
+ popd || die |
44 |
} |
45 |
|
46 |
src_install() { |
47 |
- use gtk2 && ( dobin contrib/gnome-ssh-askpass2; \ |
48 |
- echo "export SSH_ASKPASS='${EPREFIX}/usr/bin/gnome-ssh-askpass2'" > "${T}/99gnome_ssh_askpass" \ |
49 |
- || die "envd file creation failed" ) |
50 |
+ if use gtk2; then |
51 |
+ dobin contrib/gnome-ssh-askpass2; |
52 |
+ fi |
53 |
|
54 |
- use gtk3 && ( dobin contrib/gnome-ssh-askpass3; \ |
55 |
- echo "export SSH_ASKPASS='${EPREFIX}/usr/bin/gnome-ssh-askpass3'" > "${T}/99gnome_ssh_askpass" \ |
56 |
- || die "envd file creation failed" ) |
57 |
+ if use gtk3; then |
58 |
+ dobin contrib/gnome-ssh-askpass3; |
59 |
+ fi |
60 |
|
61 |
- doenvd "${T}"/99gnome_ssh_askpass |
62 |
+ newenvd - 99gnome_ssh_askpass <<-EOF |
63 |
+ export SSH_ASKPASS='${EPREFIX}/usr/bin/gnome-ssh-askpass$(usex gtk3 3 2)' |
64 |
+ EOF |
65 |
} |