From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 452F2138334 for ; Sat, 15 Sep 2018 21:44:17 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4988FE0C27; Sat, 15 Sep 2018 21:44:16 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0DB8FE0C27 for ; Sat, 15 Sep 2018 21:44:15 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 766E0335CD6 for ; Sat, 15 Sep 2018 21:44:14 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 779293C1 for ; Sat, 15 Sep 2018 21:44:11 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1537047837.91861399fe39186c5dbcc13de09a2024e95c1648.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-libs/libssh/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-libs/libssh/libssh-0.8.2.ebuild X-VCS-Directories: net-libs/libssh/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 91861399fe39186c5dbcc13de09a2024e95c1648 X-VCS-Branch: master Date: Sat, 15 Sep 2018 21:44:11 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: c3edc491-89df-400b-9e27-8cfa8d3e1fe4 X-Archives-Hash: 8501ad607d52ae24baa86e0db3c6a14f commit: 91861399fe39186c5dbcc13de09a2024e95c1648 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Sep 15 21:41:56 2018 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Sep 15 21:43:57 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91861399 net-libs/libssh: Fix USE=doc Closes: https://bugs.gentoo.org/665204 Package-Manager: Portage-2.3.49, Repoman-2.3.10 net-libs/libssh/libssh-0.8.2.ebuild | 30 +++++++++++------------------- 1 file changed, 11 insertions(+), 19 deletions(-) diff --git a/net-libs/libssh/libssh-0.8.2.ebuild b/net-libs/libssh/libssh-0.8.2.ebuild index 641c1853e98..d187c20721b 100644 --- a/net-libs/libssh/libssh-0.8.2.ebuild +++ b/net-libs/libssh/libssh-0.8.2.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