[gentoo-commits] repo/gentoo:master commit in: net-libs/libssh/

[Lars Wendler]

commit:     9f4411cbbd77fa4f4b6b3165fe51568e8a1d8df2
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 21 16:13:19 2018 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Fri Sep 21 16:13:19 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f4411cb

net-libs/libssh: Synced live ebuild.

Package-Manager: Portage-2.3.49, Repoman-2.3.10

 net-libs/libssh/libssh-9999.ebuild | 30 +++++++++++-------------------
 1 file changed, 11 insertions(+), 19 deletions(-)

diff --git a/net-libs/libssh/libssh-9999.ebuild 
b/net-libs/libssh/libssh-9999.ebuild
index 641c1853e98..d187c20721b 100644
--- a/net-libs/libssh/libssh-9999.ebuild
+++ b/net-libs/libssh/libssh-9999.ebuild
@@ -23,6 +23,8 @@ SLOT="0/4" # subslot = soname major version
 IUSE="debug doc examples gcrypt gssapi libressl mbedtls pcap server +sftp 
static-libs test zlib"
 # Maintainer: check IUSE-defaults at DefineOptions.cmake
 
+REQUIRED_USE="?? ( gcrypt mbedtls ) test? ( static-libs )"
+
 RDEPEND="
        !gcrypt? (
                !mbedtls? (
@@ -36,27 +38,21 @@ RDEPEND="
        zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
 "
 DEPEND="${RDEPEND}
-       doc? ( app-doc/doxygen )
+       doc? ( app-doc/doxygen[dot] )
        test? ( >=dev-util/cmocka-0.3.1[${MULTILIB_USEDEP}] )
 "
 
-REQUIRED_USE="?? ( gcrypt mbedtls )"
-
 DOCS=( AUTHORS README ChangeLog )
 
 S="${WORKDIR}/${MY_P}"
 
-PATCHES=(
-       "${FILESDIR}/${PN}-0.8.0-tests.patch"
-)
+PATCHES=( "${FILESDIR}/${PN}-0.8.0-tests.patch" )
 
 src_prepare() {
        cmake-utils_src_prepare
 
-       # just install the examples do not compile them
-       sed -i \
-               -e '/add_subdirectory(examples)/s/^/#DONOTWANT/' \
-               CMakeLists.txt || die
+       # just install the examples, do not compile them
+       cmake_comment_add_subdirectory examples
 
        # keyfile torture test is currently broken
        sed -i \
@@ -78,27 +74,22 @@ multilib_src_configure() {
                -DWITH_SFTP="$(usex sftp)"
                -DWITH_STACK_PROTECTOR=OFF
                -DWITH_STATIC_LIB="$(usex static-libs)"
-               -DWITH_STATIC_LIB="$(usex test)"
                -DWITH_ZLIB="$(usex zlib)"
        )
 
+       multilib_is_native_abi || mycmakeargs+=( 
-DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON )
+
        cmake-utils_src_configure
 }
 
 multilib_src_compile() {
        cmake-utils_src_compile
-       multilib_is_native_abi && use doc && cmake-utils_src_compile doc
+       multilib_is_native_abi && use doc && cmake-utils_src_compile docs
 }
 
 multilib_src_install() {
        cmake-utils_src_install
-
-       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.a
+       use doc && HTML_DOCS=( "${BUILD_DIR}"/doc/html/. )
 
        # compatibility symlink until all consumers have been updated
        # to no longer use libssh_threads.so
@@ -106,6 +97,7 @@ multilib_src_install() {
 }
 
 multilib_src_install_all() {
+       use mbedtls && DOCS+=( README.mbedtls )
        einstalldocs
 
        if use examples; then