| 1 |
commit: c7718c0faeccee1948ba19c34071c88db13e6f77 |
| 2 |
Author: Julian Ospald <hasufell <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Oct 4 20:00:08 2015 +0000 |
| 4 |
Commit: Julian Ospald <hasufell <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Oct 4 20:00:08 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c7718c0f |
| 7 |
|
| 8 |
net-libs/libssh: add libressl support |
| 9 |
|
| 10 |
.../{libssh-9999.ebuild => libssh-0.7.1-r1.ebuild} | 24 ++++++++++++++-------- |
| 11 |
net-libs/libssh/libssh-9999.ebuild | 9 +++++--- |
| 12 |
2 files changed, 22 insertions(+), 11 deletions(-) |
| 13 |
|
| 14 |
diff --git a/net-libs/libssh/libssh-9999.ebuild b/net-libs/libssh/libssh-0.7.1-r1.ebuild |
| 15 |
similarity index 73% |
| 16 |
copy from net-libs/libssh/libssh-9999.ebuild |
| 17 |
copy to net-libs/libssh/libssh-0.7.1-r1.ebuild |
| 18 |
index 7fcefa9..52da66a 100644 |
| 19 |
--- a/net-libs/libssh/libssh-9999.ebuild |
| 20 |
+++ b/net-libs/libssh/libssh-0.7.1-r1.ebuild |
| 21 |
@@ -1,24 +1,28 @@ |
| 22 |
-# Copyright 1999-2014 Gentoo Foundation |
| 23 |
+# Copyright 1999-2015 Gentoo Foundation |
| 24 |
# Distributed under the terms of the GNU General Public License v2 |
| 25 |
# $Id$ |
| 26 |
|
| 27 |
EAPI=5 |
| 28 |
|
| 29 |
-inherit eutils cmake-multilib multilib git-r3 |
| 30 |
+MY_P=${PN}-${PV/_rc/rc} |
| 31 |
+inherit eutils cmake-multilib multilib |
| 32 |
|
| 33 |
DESCRIPTION="Access a working SSH implementation by means of a library" |
| 34 |
HOMEPAGE="http://www.libssh.org/" |
| 35 |
-EGIT_REPO_URI="git://git.libssh.org/projects/libssh.git" |
| 36 |
+SRC_URI="https://red.libssh.org/attachments/download/154/${MY_P}.tar.xz -> ${P}.tar.xz" |
| 37 |
|
| 38 |
LICENSE="LGPL-2.1" |
| 39 |
-KEYWORDS="" |
| 40 |
-SLOT="0" |
| 41 |
-IUSE="debug doc examples gcrypt gssapi pcap +sftp ssh1 server static-libs test zlib" |
| 42 |
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" |
| 43 |
+SLOT="0/4" # subslot = soname major version |
| 44 |
+IUSE="debug doc examples gcrypt gssapi libressl pcap +sftp ssh1 server static-libs test zlib" |
| 45 |
# Maintainer: check IUSE-defaults at DefineOptions.cmake |
| 46 |
|
| 47 |
RDEPEND=" |
| 48 |
zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] ) |
| 49 |
- !gcrypt? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] ) |
| 50 |
+ !gcrypt? ( |
| 51 |
+ !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] ) |
| 52 |
+ libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] ) |
| 53 |
+ ) |
| 54 |
gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] ) |
| 55 |
gssapi? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] ) |
| 56 |
" |
| 57 |
@@ -29,7 +33,11 @@ DEPEND="${RDEPEND} |
| 58 |
|
| 59 |
DOCS=( AUTHORS README ChangeLog ) |
| 60 |
|
| 61 |
-EGIT_MIN_CLONE_TYPE=single |
| 62 |
+S=${WORKDIR}/${MY_P} |
| 63 |
+ |
| 64 |
+PATCHES=( |
| 65 |
+ "${FILESDIR}"/${PN}-0.5.0-tests.patch |
| 66 |
+) |
| 67 |
|
| 68 |
src_prepare() { |
| 69 |
# just install the examples do not compile them |
| 70 |
|
| 71 |
diff --git a/net-libs/libssh/libssh-9999.ebuild b/net-libs/libssh/libssh-9999.ebuild |
| 72 |
index 7fcefa9..b76736e 100644 |
| 73 |
--- a/net-libs/libssh/libssh-9999.ebuild |
| 74 |
+++ b/net-libs/libssh/libssh-9999.ebuild |
| 75 |
@@ -1,4 +1,4 @@ |
| 76 |
-# Copyright 1999-2014 Gentoo Foundation |
| 77 |
+# Copyright 1999-2015 Gentoo Foundation |
| 78 |
# Distributed under the terms of the GNU General Public License v2 |
| 79 |
# $Id$ |
| 80 |
|
| 81 |
@@ -13,12 +13,15 @@ EGIT_REPO_URI="git://git.libssh.org/projects/libssh.git" |
| 82 |
LICENSE="LGPL-2.1" |
| 83 |
KEYWORDS="" |
| 84 |
SLOT="0" |
| 85 |
-IUSE="debug doc examples gcrypt gssapi pcap +sftp ssh1 server static-libs test zlib" |
| 86 |
+IUSE="debug doc examples gcrypt gssapi libressl pcap +sftp ssh1 server static-libs test zlib" |
| 87 |
# Maintainer: check IUSE-defaults at DefineOptions.cmake |
| 88 |
|
| 89 |
RDEPEND=" |
| 90 |
zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] ) |
| 91 |
- !gcrypt? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] ) |
| 92 |
+ !gcrypt? ( |
| 93 |
+ !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] ) |
| 94 |
+ libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] ) |
| 95 |
+ ) |
| 96 |
gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] ) |
| 97 |
gssapi? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] ) |
| 98 |
" |
Archives