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 6D562139085 for ; Sun, 1 Jan 2017 15:43:59 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C2887E0B73; Sun, 1 Jan 2017 15:43:58 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A06DBE0B73 for ; Sun, 1 Jan 2017 15:43:58 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9CD2D340DD8 for ; Sun, 1 Jan 2017 15:43:57 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4B66B25B5 for ; Sun, 1 Jan 2017 15:43:55 +0000 (UTC) From: "Johannes Huber" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Johannes Huber" Message-ID: <1483285415.f214c23214cb27da660d5f50f85f82d26d75b0cc.johu@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-libs/libssh/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-libs/libssh/libssh-9999.ebuild X-VCS-Directories: net-libs/libssh/ X-VCS-Committer: johu X-VCS-Committer-Name: Johannes Huber X-VCS-Revision: f214c23214cb27da660d5f50f85f82d26d75b0cc X-VCS-Branch: master Date: Sun, 1 Jan 2017 15:43:55 +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: 6cf2e168-bf19-47e2-9dc1-03d497fbd130 X-Archives-Hash: 93a2bd71f829331382b3842da2ef7947 commit: f214c23214cb27da660d5f50f85f82d26d75b0cc Author: Johannes Huber gentoo org> AuthorDate: Sun Jan 1 15:43:35 2017 +0000 Commit: Johannes Huber gentoo org> CommitDate: Sun Jan 1 15:43:35 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f214c232 net-libs/libssh: Sync live with release Package-Manager: Portage-2.3.3, Repoman-2.3.1 net-libs/libssh/libssh-9999.ebuild | 37 +++++++++++++++++++++---------------- 1 file changed, 21 insertions(+), 16 deletions(-) diff --git a/net-libs/libssh/libssh-9999.ebuild b/net-libs/libssh/libssh-9999.ebuild index b76736e..47aedfd 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 }