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 A4AB0138334 for ; Mon, 1 Oct 2018 11:46:30 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7367CE095F; Mon, 1 Oct 2018 11:46:29 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 2E81DE095F for ; Mon, 1 Oct 2018 11:46:28 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 D30E4335D8F for ; Mon, 1 Oct 2018 11:46:20 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0326E3BD for ; Mon, 1 Oct 2018 11:46:19 +0000 (UTC) From: "Jeroen Roovers" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jeroen Roovers" Message-ID: <1538394370.d866d4705e1e4a092579a31df2815e3407950a19.jer@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-libs/libssh2/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-libs/libssh2/libssh2-1.8.0-r2.ebuild net-libs/libssh2/metadata.xml X-VCS-Directories: net-libs/libssh2/ X-VCS-Committer: jer X-VCS-Committer-Name: Jeroen Roovers X-VCS-Revision: d866d4705e1e4a092579a31df2815e3407950a19 X-VCS-Branch: master Date: Mon, 1 Oct 2018 11:46:19 +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: b777a9b5-96d3-4731-b54d-d0634f547b10 X-Archives-Hash: 828f1098b8f79f22a12e6e3ef2355a65 commit: d866d4705e1e4a092579a31df2815e3407950a19 Author: Jeroen Roovers gentoo org> AuthorDate: Mon Oct 1 11:45:43 2018 +0000 Commit: Jeroen Roovers gentoo org> CommitDate: Mon Oct 1 11:46:10 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d866d470 net-libs/libssh2: Add USE=mbedtls, switch to cmake for building * Add support for net-libs/mbedtls * Switch to cmake as the autotools build is even more broken * Remove USE=static-libs as that inhibits building shared libs * Use REQUIRED_USE to force choosing a crypto backend Package-Manager: Portage-2.3.50, Repoman-2.3.11 Signed-off-by: Jeroen Roovers gentoo.org> net-libs/libssh2/libssh2-1.8.0-r2.ebuild | 56 ++++++++++++++++++++++++++++++++ net-libs/libssh2/metadata.xml | 2 ++ 2 files changed, 58 insertions(+) diff --git a/net-libs/libssh2/libssh2-1.8.0-r2.ebuild b/net-libs/libssh2/libssh2-1.8.0-r2.ebuild new file mode 100644 index 00000000000..daf148cbce6 --- /dev/null +++ b/net-libs/libssh2/libssh2-1.8.0-r2.ebuild @@ -0,0 +1,56 @@ +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +inherit cmake-utils multilib-minimal + +DESCRIPTION="Library implementing the SSH2 protocol" +HOMEPAGE="https://www.libssh2.org" +SRC_URI="https://www.${PN}.org/download/${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris" +IUSE="gcrypt libressl mbedtls test zlib" +REQUIRED_USE=" + ?? ( gcrypt libressl mbedtls ) +" + +RDEPEND=" + !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] ) + gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] ) + libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] ) + mbedtls? ( net-libs/mbedtls ) + zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] ) +" +DEPEND="${RDEPEND}" + +PATCHES=( + "${FILESDIR}"/${PN}-1.8.0-libgcrypt-prefix.patch + "${FILESDIR}"/${PN}-1.8.0-mansyntax_sh.patch + "${FILESDIR}"/${PN}-1.8.0-openssl11-memleak.patch + "${FILESDIR}"/${PN}-1.8.0-openssl11.patch +) + +multilib_src_configure() { + local crypto_backend=OpenSSL + if use gcrypt; then + crypto_backend=Libgcrypt + elif use mbedtls; then + crypto_backend=mbedTLS + fi + + local mycmakeargs=( + -DBUILD_SHARED_LIBS=ON + -DCRYPTO_BACKEND=${crypto_backend} + -DENABLE_ZLIB_COMPRESSION=$(usex zlib) + ) + cmake-utils_src_configure +} + +multilib_src_install_all() { + einstalldocs + find "${D}" -name '*.la' -delete || die + mv "${D}"/usr/share/doc/${PN}/* "${D}"/usr/share/doc/${PF}/ || die + rm -r "${D}"/usr/share/doc/${PN}/ || die +} diff --git a/net-libs/libssh2/metadata.xml b/net-libs/libssh2/metadata.xml index e9e734ab02f..2149f2ed0c6 100644 --- a/net-libs/libssh2/metadata.xml +++ b/net-libs/libssh2/metadata.xml @@ -10,5 +10,7 @@ Use dev-libs/libgcrypt instead of dev-libs/openssl + Use dev-libs/libressl instead of dev-libs/openssl + Use net-libs/mbedtls instead of dev-libs/openssl