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 C3A7F138334 for ; Fri, 5 Oct 2018 18:21:06 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 64FFEE089E; Fri, 5 Oct 2018 18:21:05 +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 3E492E089E for ; Fri, 5 Oct 2018 18:21:05 +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 DBA6C335C9F for ; Fri, 5 Oct 2018 18:21:03 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 04D503F6 for ; Fri, 5 Oct 2018 18:21:02 +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: <1538763658.9e69c9a316fd7c0d34c954d01b843158ee5b6ab2.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 X-VCS-Directories: net-libs/libssh2/ X-VCS-Committer: jer X-VCS-Committer-Name: Jeroen Roovers X-VCS-Revision: 9e69c9a316fd7c0d34c954d01b843158ee5b6ab2 X-VCS-Branch: master Date: Fri, 5 Oct 2018 18:21:02 +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: 43e7e70b-ccd9-47b9-b13a-5b7efab037e1 X-Archives-Hash: d39936310241e5c9fb4f41700616932c commit: 9e69c9a316fd7c0d34c954d01b843158ee5b6ab2 Author: Jeroen Roovers gentoo org> AuthorDate: Fri Oct 5 18:20:43 2018 +0000 Commit: Jeroen Roovers gentoo org> CommitDate: Fri Oct 5 18:20:58 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e69c9a3 net-libs/libssh2: Add RESTRICT=test Many of the tests require app-emulation/docker to be set up and working. 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 | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/net-libs/libssh2/libssh2-1.8.0-r2.ebuild b/net-libs/libssh2/libssh2-1.8.0-r2.ebuild index 76496b69216..501d50e4569 100644 --- a/net-libs/libssh2/libssh2-1.8.0-r2.ebuild +++ b/net-libs/libssh2/libssh2-1.8.0-r2.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=6 -inherit cmake-utils multilib-minimal +inherit cmake-multilib DESCRIPTION="Library implementing the SSH2 protocol" HOMEPAGE="https://www.libssh2.org" @@ -11,10 +11,11 @@ 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" +IUSE="gcrypt libressl mbedtls zlib" REQUIRED_USE=" ?? ( gcrypt libressl mbedtls ) " +RESTRICT="test" RDEPEND=" !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] ) @@ -23,7 +24,9 @@ RDEPEND=" mbedtls? ( net-libs/mbedtls[${MULTILIB_USEDEP}] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] ) " -DEPEND="${RDEPEND}" +DEPEND=" + ${RDEPEND} +" PATCHES=( "${FILESDIR}"/${PN}-1.8.0-libgcrypt-prefix.patch