summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Huber <johu@gentoo.org>2017-01-01 16:43:35 +0100
committerJohannes Huber <johu@gentoo.org>2017-01-01 16:43:35 +0100
commitf214c23214cb27da660d5f50f85f82d26d75b0cc (patch)
tree211d8333bd7a93d4882f5d47ddb3434e9869138b /net-libs
parentapp-text/poppler: Remove 0.42.0 (diff)
downloadgentoo-f214c23214cb27da660d5f50f85f82d26d75b0cc.tar.gz
gentoo-f214c23214cb27da660d5f50f85f82d26d75b0cc.tar.bz2
gentoo-f214c23214cb27da660d5f50f85f82d26d75b0cc.zip
net-libs/libssh: Sync live with release
Package-Manager: Portage-2.3.3, Repoman-2.3.1
Diffstat (limited to 'net-libs')
-rw-r--r--net-libs/libssh/libssh-9999.ebuild37
1 files changed, 21 insertions, 16 deletions
diff --git a/net-libs/libssh/libssh-9999.ebuild b/net-libs/libssh/libssh-9999.ebuild
index b76736e13ce1..47aedfd0bd36 100644
--- a/net-libs/libssh/libssh-9999.ebuild
+++ b/net-libs/libssh/libssh-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=5
+EAPI=6
inherit eutils cmake-multilib multilib git-r3
@@ -25,7 +25,8 @@ RDEPEND="
gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] )
gssapi? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
"
-DEPEND="${RDEPEND}
+DEPEND="
+ ${RDEPEND}
doc? ( app-doc/doxygen )
test? ( >=dev-util/cmocka-0.3.1[${MULTILIB_USEDEP}] )
"
@@ -45,18 +46,19 @@ src_prepare() {
multilib_src_configure() {
local mycmakeargs=(
- $(cmake-utils_use_with debug DEBUG_CALLTRACE)
- $(cmake-utils_use_with debug DEBUG_CRYPTO)
- $(cmake-utils_use_with gcrypt)
- $(cmake-utils_use_with gssapi)
- $(cmake-utils_use_with pcap)
- $(cmake-utils_use_with server)
- $(cmake-utils_use_with sftp)
- $(cmake-utils_use_with ssh1)
- $(cmake-utils_use_with static-libs STATIC_LIB)
- $(cmake-utils_use_with test STATIC_LIB)
- $(cmake-utils_use_with test TESTING)
- $(cmake-utils_use_with zlib)
+ -DWITH_DEBUG_CALLTRACE="$(usex debug)"
+ -DWITH_DEBUG_CRYPTO="$(usex debug)"
+ -DWITH_GCRYPT="$(usex gcrypt)"
+ -DWITH_GSSAPI="$(usex gssapi)"
+ -DWITH_NACL=no
+ -DWITH_PCAP="$(usex pcap)"
+ -DWITH_SERVER="$(usex server)"
+ -DWITH_SFTP="$(usex sftp)"
+ -DWITH_SSH1="$(usex ssh1)"
+ -DWITH_STATIC_LIB="$(usex static-libs)"
+ -DWITH_STATIC_LIB="$(usex test)"
+ -DWITH_TESTING="$(usex test)"
+ -DWITH_ZLIB="$(usex zlib)"
)
cmake-utils_src_configure
@@ -70,7 +72,10 @@ multilib_src_compile() {
multilib_src_install() {
cmake-utils_src_install
- multilib_is_native_abi && use doc && dohtml -r doc/html/.
+ if multilib_is_native_abi && use doc ; then
+ docinto html
+ dodoc -r doc/html/.
+ fi
use static-libs || rm -f "${D}"/usr/$(get_libdir)/libssh{,_threads}.a
}