1 |
commit: f214c23214cb27da660d5f50f85f82d26d75b0cc |
2 |
Author: Johannes Huber <johu <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Jan 1 15:43:35 2017 +0000 |
4 |
Commit: Johannes Huber <johu <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Jan 1 15:43:35 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f214c232 |
7 |
|
8 |
net-libs/libssh: Sync live with release |
9 |
|
10 |
Package-Manager: Portage-2.3.3, Repoman-2.3.1 |
11 |
|
12 |
net-libs/libssh/libssh-9999.ebuild | 37 +++++++++++++++++++++---------------- |
13 |
1 file changed, 21 insertions(+), 16 deletions(-) |
14 |
|
15 |
diff --git a/net-libs/libssh/libssh-9999.ebuild b/net-libs/libssh/libssh-9999.ebuild |
16 |
index b76736e..47aedfd 100644 |
17 |
--- a/net-libs/libssh/libssh-9999.ebuild |
18 |
+++ b/net-libs/libssh/libssh-9999.ebuild |
19 |
@@ -1,8 +1,8 @@ |
20 |
-# Copyright 1999-2015 Gentoo Foundation |
21 |
+# Copyright 1999-2017 Gentoo Foundation |
22 |
# Distributed under the terms of the GNU General Public License v2 |
23 |
# $Id$ |
24 |
|
25 |
-EAPI=5 |
26 |
+EAPI=6 |
27 |
|
28 |
inherit eutils cmake-multilib multilib git-r3 |
29 |
|
30 |
@@ -25,7 +25,8 @@ RDEPEND=" |
31 |
gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] ) |
32 |
gssapi? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] ) |
33 |
" |
34 |
-DEPEND="${RDEPEND} |
35 |
+DEPEND=" |
36 |
+ ${RDEPEND} |
37 |
doc? ( app-doc/doxygen ) |
38 |
test? ( >=dev-util/cmocka-0.3.1[${MULTILIB_USEDEP}] ) |
39 |
" |
40 |
@@ -45,18 +46,19 @@ src_prepare() { |
41 |
|
42 |
multilib_src_configure() { |
43 |
local mycmakeargs=( |
44 |
- $(cmake-utils_use_with debug DEBUG_CALLTRACE) |
45 |
- $(cmake-utils_use_with debug DEBUG_CRYPTO) |
46 |
- $(cmake-utils_use_with gcrypt) |
47 |
- $(cmake-utils_use_with gssapi) |
48 |
- $(cmake-utils_use_with pcap) |
49 |
- $(cmake-utils_use_with server) |
50 |
- $(cmake-utils_use_with sftp) |
51 |
- $(cmake-utils_use_with ssh1) |
52 |
- $(cmake-utils_use_with static-libs STATIC_LIB) |
53 |
- $(cmake-utils_use_with test STATIC_LIB) |
54 |
- $(cmake-utils_use_with test TESTING) |
55 |
- $(cmake-utils_use_with zlib) |
56 |
+ -DWITH_DEBUG_CALLTRACE="$(usex debug)" |
57 |
+ -DWITH_DEBUG_CRYPTO="$(usex debug)" |
58 |
+ -DWITH_GCRYPT="$(usex gcrypt)" |
59 |
+ -DWITH_GSSAPI="$(usex gssapi)" |
60 |
+ -DWITH_NACL=no |
61 |
+ -DWITH_PCAP="$(usex pcap)" |
62 |
+ -DWITH_SERVER="$(usex server)" |
63 |
+ -DWITH_SFTP="$(usex sftp)" |
64 |
+ -DWITH_SSH1="$(usex ssh1)" |
65 |
+ -DWITH_STATIC_LIB="$(usex static-libs)" |
66 |
+ -DWITH_STATIC_LIB="$(usex test)" |
67 |
+ -DWITH_TESTING="$(usex test)" |
68 |
+ -DWITH_ZLIB="$(usex zlib)" |
69 |
) |
70 |
|
71 |
cmake-utils_src_configure |
72 |
@@ -70,7 +72,10 @@ multilib_src_compile() { |
73 |
multilib_src_install() { |
74 |
cmake-utils_src_install |
75 |
|
76 |
- multilib_is_native_abi && use doc && dohtml -r doc/html/. |
77 |
+ if multilib_is_native_abi && use doc ; then |
78 |
+ docinto html |
79 |
+ dodoc -r doc/html/. |
80 |
+ fi |
81 |
|
82 |
use static-libs || rm -f "${D}"/usr/$(get_libdir)/libssh{,_threads}.a |
83 |
} |