commit: c7718c0faeccee1948ba19c34071c88db13e6f77 Author: Julian Ospald <hasufell <AT> gentoo <DOT> org> AuthorDate: Sun Oct 4 20:00:08 2015 +0000 Commit: Julian Ospald <hasufell <AT> gentoo <DOT> 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}] ) "