| 1 |
commit: 334a5ba9db9c620e265d3c4848a2e8afa4a3b3d2 |
| 2 |
Author: Julian Ospald <hasufell <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Sep 20 14:51:22 2015 +0000 |
| 4 |
Commit: Julian Ospald <hasufell <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Sep 20 16:38:01 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=334a5ba9 |
| 7 |
|
| 8 |
net-libs/libssh2: add libressl support |
| 9 |
|
| 10 |
.../{libssh2-9999.ebuild => libssh2-1.6.0-r1.ebuild} | 16 +++++++++------- |
| 11 |
net-libs/libssh2/libssh2-9999.ebuild | 8 ++++++-- |
| 12 |
2 files changed, 15 insertions(+), 9 deletions(-) |
| 13 |
|
| 14 |
diff --git a/net-libs/libssh2/libssh2-9999.ebuild b/net-libs/libssh2/libssh2-1.6.0-r1.ebuild |
| 15 |
similarity index 65% |
| 16 |
copy from net-libs/libssh2/libssh2-9999.ebuild |
| 17 |
copy to net-libs/libssh2/libssh2-1.6.0-r1.ebuild |
| 18 |
index a41ca40..631d0ba 100644 |
| 19 |
--- a/net-libs/libssh2/libssh2-9999.ebuild |
| 20 |
+++ b/net-libs/libssh2/libssh2-1.6.0-r1.ebuild |
| 21 |
@@ -5,19 +5,22 @@ |
| 22 |
EAPI=5 |
| 23 |
|
| 24 |
AUTOTOOLS_AUTORECONF=true |
| 25 |
-EGIT_REPO_URI="https://github.com/libssh2/libssh2" |
| 26 |
-inherit autotools-multilib git-r3 |
| 27 |
+inherit autotools-multilib |
| 28 |
|
| 29 |
DESCRIPTION="Library implementing the SSH2 protocol" |
| 30 |
HOMEPAGE="http://www.libssh2.org/" |
| 31 |
-SRC_URI="" |
| 32 |
+SRC_URI="http://www.${PN}.org/download/${P}.tar.gz" |
| 33 |
|
| 34 |
LICENSE="BSD" |
| 35 |
SLOT="0" |
| 36 |
-KEYWORDS="" |
| 37 |
-IUSE="gcrypt static-libs test zlib" |
| 38 |
+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" |
| 39 |
+IUSE="gcrypt libressl static-libs test zlib" |
| 40 |
|
| 41 |
-DEPEND="!gcrypt? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] ) |
| 42 |
+DEPEND=" |
| 43 |
+ !gcrypt? ( |
| 44 |
+ !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] ) |
| 45 |
+ libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] ) |
| 46 |
+ ) |
| 47 |
gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] ) |
| 48 |
zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )" |
| 49 |
RDEPEND="${DEPEND}" |
| 50 |
@@ -28,7 +31,6 @@ PATCHES=( "${FILESDIR}"/${PN}-1.4.2-pkgconfig.patch ) |
| 51 |
|
| 52 |
src_prepare() { |
| 53 |
sed -i -e 's|mansyntax.sh||g' tests/Makefile.am || die |
| 54 |
- ln -s ../src/libssh2_config.h.in example/libssh2_config.h.in || die |
| 55 |
autotools-multilib_src_prepare |
| 56 |
} |
| 57 |
|
| 58 |
|
| 59 |
diff --git a/net-libs/libssh2/libssh2-9999.ebuild b/net-libs/libssh2/libssh2-9999.ebuild |
| 60 |
index a41ca40..8d3718b 100644 |
| 61 |
--- a/net-libs/libssh2/libssh2-9999.ebuild |
| 62 |
+++ b/net-libs/libssh2/libssh2-9999.ebuild |
| 63 |
@@ -15,9 +15,13 @@ SRC_URI="" |
| 64 |
LICENSE="BSD" |
| 65 |
SLOT="0" |
| 66 |
KEYWORDS="" |
| 67 |
-IUSE="gcrypt static-libs test zlib" |
| 68 |
+IUSE="gcrypt libressl static-libs test zlib" |
| 69 |
|
| 70 |
-DEPEND="!gcrypt? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] ) |
| 71 |
+DEPEND=" |
| 72 |
+ !gcrypt? ( |
| 73 |
+ !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] ) |
| 74 |
+ libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] ) |
| 75 |
+ ) |
| 76 |
gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] ) |
| 77 |
zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )" |
| 78 |
RDEPEND="${DEPEND}" |
Archives