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 30DA81395E2 for ; Mon, 14 Nov 2016 19:58:39 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0F8EFE08F8; Mon, 14 Nov 2016 19:58:37 +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 E8C3DE08F8 for ; Mon, 14 Nov 2016 19:58:36 +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 8EF0F34168F for ; Mon, 14 Nov 2016 19:58:35 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A3E31308 for ; Mon, 14 Nov 2016 19:58:33 +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: <1479153391.4e8593b96bccbd718fa152ca4999aafa34db70a9.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-9999.ebuild X-VCS-Directories: net-libs/libssh2/ X-VCS-Committer: jer X-VCS-Committer-Name: Jeroen Roovers X-VCS-Revision: 4e8593b96bccbd718fa152ca4999aafa34db70a9 X-VCS-Branch: master Date: Mon, 14 Nov 2016 19:58:33 +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: b976cdbf-08e7-4761-9477-c77f3fd1692f X-Archives-Hash: 51daf7244affb14a5037295110be5380 commit: 4e8593b96bccbd718fa152ca4999aafa34db70a9 Author: Jeroen Roovers gentoo org> AuthorDate: Mon Nov 14 19:56:31 2016 +0000 Commit: Jeroen Roovers gentoo org> CommitDate: Mon Nov 14 19:56:31 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e8593b9 net-libs/libssh2: Drop upstream patch (bug #599716 by Tomáš Mózes). Fix various issues. Package-Manager: portage-2.3.2 net-libs/libssh2/libssh2-9999.ebuild | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/net-libs/libssh2/libssh2-9999.ebuild b/net-libs/libssh2/libssh2-9999.ebuild index 29287af..2ea9ae8 100644 --- a/net-libs/libssh2/libssh2-9999.ebuild +++ b/net-libs/libssh2/libssh2-9999.ebuild @@ -2,12 +2,10 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 +EAPI=6 +inherit autotools git-r3 multilib-minimal -AUTOTOOLS_AUTORECONF=true EGIT_REPO_URI="https://github.com/libssh2/libssh2" -inherit autotools-multilib git-r3 - DESCRIPTION="Library implementing the SSH2 protocol" HOMEPAGE="http://www.libssh2.org/" SRC_URI="" @@ -23,26 +21,31 @@ DEPEND=" libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] ) ) gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] ) - zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )" + zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] ) +" RDEPEND="${DEPEND}" DOCS=( README ) -PATCHES=( "${FILESDIR}"/${PN}-1.8.0-libgcrypt-prefix.patch ) - src_prepare() { + default + sed -i -e 's|mansyntax.sh||g' tests/Makefile.am || die ln -s ../src/libssh2_config.h.in example/libssh2_config.h.in || die - autotools-multilib_src_prepare + + eautoreconf } multilib_src_configure() { # Disable tests that require extra permissions (bug #333319) use test && local -x ac_cv_path_SSHD= - local myeconfargs=( - $(use_with zlib libz) - $(usex gcrypt --with-libgcrypt --with-openssl) - ) - autotools-utils_src_configure + local crypto + if use gcrypt; then + crypto=libgcrypt + else + crypto=openssl + fi + + ECONF_SOURCE="${S}" econf --with-crypto=${crypto} }