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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 0E245158094 for ; Fri, 26 Aug 2022 20:53:16 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EFB1CE0871; Fri, 26 Aug 2022 20:53:14 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D0843E0871 for ; Fri, 26 Aug 2022 20:53:14 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B7595341131 for ; Fri, 26 Aug 2022 20:53:13 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1E8A91E for ; Fri, 26 Aug 2022 20:53:12 +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: <1661547179.6dc73921a467924e32b4c3c65cf2b99c972b0bea.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-9999.ebuild X-VCS-Directories: net-libs/libssh/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 6dc73921a467924e32b4c3c65cf2b99c972b0bea X-VCS-Branch: master Date: Fri, 26 Aug 2022 20:53:12 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 31ae0ce0-bf9a-4a12-8f6e-51c0dbdc9ddb X-Archives-Hash: c11828c31199c4422879dd283a13d634 commit: 6dc73921a467924e32b4c3c65cf2b99c972b0bea Author: Andreas Sturmlechner gentoo org> AuthorDate: Fri Aug 26 20:44:55 2022 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Fri Aug 26 20:52:59 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6dc73921 net-libs/libssh: update EAPI 7 -> 8, update DOCS Signed-off-by: Andreas Sturmlechner gentoo.org> net-libs/libssh/libssh-9999.ebuild | 40 ++++++++++++++++++-------------------- 1 file changed, 19 insertions(+), 21 deletions(-) diff --git a/net-libs/libssh/libssh-9999.ebuild b/net-libs/libssh/libssh-9999.ebuild index d49e399b64d4..9b897cf8885e 100644 --- a/net-libs/libssh/libssh-9999.ebuild +++ b/net-libs/libssh/libssh-9999.ebuild @@ -1,14 +1,14 @@ # Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit cmake-multilib DESCRIPTION="Access a working SSH implementation by means of a library" HOMEPAGE="https://www.libssh.org/" -if [[ "${PV}" == *9999 ]] ; then +if [[ ${PV} == *9999* ]] ; then inherit git-r3 EGIT_REPO_URI="https://git.libssh.org/projects/libssh.git" else @@ -22,10 +22,8 @@ IUSE="debug doc examples gcrypt gssapi mbedtls pcap server +sftp static-libs tes # Maintainer: check IUSE-defaults at DefineOptions.cmake REQUIRED_USE="?? ( gcrypt mbedtls )" +RESTRICT="!test? ( test )" -BDEPEND=" - doc? ( app-doc/doxygen[dot] ) -" RDEPEND=" !gcrypt? ( !mbedtls? ( @@ -40,15 +38,15 @@ RDEPEND=" DEPEND="${RDEPEND} test? ( >=dev-util/cmocka-0.3.1[${MULTILIB_USEDEP}] - elibc_musl? ( sys-libs/argp-standalone ) ) + elibc_musl? ( sys-libs/argp-standalone ) + ) " +BDEPEND="doc? ( app-doc/doxygen[dot] )" -DOCS=( AUTHORS README ChangeLog ) +DOCS=( AUTHORS CHANGELOG README ) PATCHES=( "${FILESDIR}/${PN}-0.8.0-tests.patch" ) -RESTRICT+=" !test? ( test )" - src_prepare() { cmake_src_prepare @@ -79,17 +77,17 @@ multilib_src_configure() { -DWITH_NACL=OFF -DWITH_STACK_PROTECTOR=OFF -DWITH_STACK_PROTECTOR_STRONG=OFF - -DWITH_DEBUG_CALLTRACE="$(usex debug)" - -DWITH_DEBUG_CRYPTO="$(usex debug)" - -DWITH_GCRYPT="$(usex gcrypt)" - -DWITH_GSSAPI="$(usex gssapi)" - -DWITH_MBEDTLS="$(usex mbedtls)" - -DWITH_PCAP="$(usex pcap)" - -DWITH_SERVER="$(usex server)" - -DWITH_SFTP="$(usex sftp)" - -DBUILD_STATIC_LIB="$(usex static-libs)" - -DUNIT_TESTING="$(usex test)" - -DWITH_ZLIB="$(usex zlib)" + -DWITH_DEBUG_CALLTRACE=$(usex debug) + -DWITH_DEBUG_CRYPTO=$(usex debug) + -DWITH_GCRYPT=$(usex gcrypt) + -DWITH_GSSAPI=$(usex gssapi) + -DWITH_MBEDTLS=$(usex mbedtls) + -DWITH_PCAP=$(usex pcap) + -DWITH_SERVER=$(usex server) + -DWITH_SFTP=$(usex sftp) + -DBUILD_STATIC_LIB=$(usex static-libs) + -DUNIT_TESTING=$(usex test) + -DWITH_ZLIB=$(usex zlib) ) multilib_is_native_abi || mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON ) @@ -104,7 +102,7 @@ multilib_src_compile() { multilib_src_install() { cmake_src_install - multilib_is_native_abi && use doc && HTML_DOCS=( "${BUILD_DIR}"/doc/html/. ) + multilib_is_native_abi && use doc && local HTML_DOCS=( "${BUILD_DIR}"/doc/html/. ) use static-libs && dolib.a src/libssh.a