From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 4002D138BED for ; Sun, 4 Oct 2015 20:03:22 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 043A9E07DB; Sun, 4 Oct 2015 20:03:20 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 7EF05E07DB for ; Sun, 4 Oct 2015 20:03:19 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4E1F5340877 for ; Sun, 4 Oct 2015 20:03:17 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 455B553F for ; Sun, 4 Oct 2015 20:03:15 +0000 (UTC) From: "Julian Ospald" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Julian Ospald" Message-ID: <1443988808.c7718c0faeccee1948ba19c34071c88db13e6f77.hasufell@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-libs/libssh/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-libs/libssh/libssh-0.7.1-r1.ebuild net-libs/libssh/libssh-9999.ebuild X-VCS-Directories: net-libs/libssh/ X-VCS-Committer: hasufell X-VCS-Committer-Name: Julian Ospald X-VCS-Revision: c7718c0faeccee1948ba19c34071c88db13e6f77 X-VCS-Branch: master Date: Sun, 4 Oct 2015 20:03:15 +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: 2b124a3e-d7e5-4eff-b798-f76f47db40c1 X-Archives-Hash: eaae97fb3c2d8811e16a14431b20f0d9 commit: c7718c0faeccee1948ba19c34071c88db13e6f77 Author: Julian Ospald gentoo org> AuthorDate: Sun Oct 4 20:00:08 2015 +0000 Commit: Julian Ospald gentoo org> CommitDate: Sun Oct 4 20:00:08 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c7718c0f net-libs/libssh: add libressl support .../{libssh-9999.ebuild => libssh-0.7.1-r1.ebuild} | 24 ++++++++++++++-------- net-libs/libssh/libssh-9999.ebuild | 9 +++++--- 2 files changed, 22 insertions(+), 11 deletions(-) diff --git a/net-libs/libssh/libssh-9999.ebuild b/net-libs/libssh/libssh-0.7.1-r1.ebuild similarity index 73% copy from net-libs/libssh/libssh-9999.ebuild copy to net-libs/libssh/libssh-0.7.1-r1.ebuild index 7fcefa9..52da66a 100644 --- a/net-libs/libssh/libssh-9999.ebuild +++ b/net-libs/libssh/libssh-0.7.1-r1.ebuild @@ -1,24 +1,28 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ EAPI=5 -inherit eutils cmake-multilib multilib git-r3 +MY_P=${PN}-${PV/_rc/rc} +inherit eutils cmake-multilib multilib DESCRIPTION="Access a working SSH implementation by means of a library" HOMEPAGE="http://www.libssh.org/" -EGIT_REPO_URI="git://git.libssh.org/projects/libssh.git" +SRC_URI="https://red.libssh.org/attachments/download/154/${MY_P}.tar.xz -> ${P}.tar.xz" LICENSE="LGPL-2.1" -KEYWORDS="" -SLOT="0" -IUSE="debug doc examples gcrypt gssapi pcap +sftp ssh1 server static-libs test zlib" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" +SLOT="0/4" # subslot = soname major version +IUSE="debug doc examples gcrypt gssapi libressl pcap +sftp ssh1 server static-libs test zlib" # Maintainer: check IUSE-defaults at DefineOptions.cmake RDEPEND=" zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] ) - !gcrypt? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] ) + !gcrypt? ( + !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] ) + libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] ) + ) gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] ) gssapi? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] ) " @@ -29,7 +33,11 @@ DEPEND="${RDEPEND} DOCS=( AUTHORS README ChangeLog ) -EGIT_MIN_CLONE_TYPE=single +S=${WORKDIR}/${MY_P} + +PATCHES=( + "${FILESDIR}"/${PN}-0.5.0-tests.patch +) src_prepare() { # just install the examples do not compile them diff --git a/net-libs/libssh/libssh-9999.ebuild b/net-libs/libssh/libssh-9999.ebuild index 7fcefa9..b76736e 100644 --- a/net-libs/libssh/libssh-9999.ebuild +++ b/net-libs/libssh/libssh-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -13,12 +13,15 @@ EGIT_REPO_URI="git://git.libssh.org/projects/libssh.git" LICENSE="LGPL-2.1" KEYWORDS="" SLOT="0" -IUSE="debug doc examples gcrypt gssapi pcap +sftp ssh1 server static-libs test zlib" +IUSE="debug doc examples gcrypt gssapi libressl pcap +sftp ssh1 server static-libs test zlib" # Maintainer: check IUSE-defaults at DefineOptions.cmake RDEPEND=" zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] ) - !gcrypt? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] ) + !gcrypt? ( + !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] ) + libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] ) + ) gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] ) gssapi? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] ) "