Gentoo Archives: gentoo-commits

From: Mikle Kolyada <zlogene@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-libs/libssh2/
Date: Sun, 02 May 2021 10:16:45
Message-Id: 1619950595.96949e6b84f5d4072d6db265c57af4cad897b9ce.zlogene@gentoo
1 commit: 96949e6b84f5d4072d6db265c57af4cad897b9ce
2 Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
3 AuthorDate: Sun May 2 10:15:51 2021 +0000
4 Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
5 CommitDate: Sun May 2 10:16:35 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=96949e6b
7
8 net-libs/libssh2: remove libressl support
9
10 Package-Manager: Portage-3.0.18, Repoman-3.0.2
11 Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
12
13 net-libs/libssh2/libssh2-1.9.0_p20200614-r1.ebuild | 5 ++---
14 net-libs/libssh2/libssh2-9999.ebuild | 5 ++---
15 2 files changed, 4 insertions(+), 6 deletions(-)
16
17 diff --git a/net-libs/libssh2/libssh2-1.9.0_p20200614-r1.ebuild b/net-libs/libssh2/libssh2-1.9.0_p20200614-r1.ebuild
18 index 1ee9017fd30..38c16aa85e4 100644
19 --- a/net-libs/libssh2/libssh2-1.9.0_p20200614-r1.ebuild
20 +++ b/net-libs/libssh2/libssh2-1.9.0_p20200614-r1.ebuild
21 @@ -14,7 +14,7 @@ S=${WORKDIR}/${PN}-${EGIT_COMMIT}
22 LICENSE="BSD"
23 SLOT="0"
24 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
25 -IUSE="gcrypt libressl mbedtls zlib"
26 +IUSE="gcrypt mbedtls zlib"
27 REQUIRED_USE="?? ( gcrypt mbedtls )"
28 RESTRICT="test"
29
30 @@ -23,8 +23,7 @@ RDEPEND="
31 !gcrypt? (
32 mbedtls? ( net-libs/mbedtls:0=[${MULTILIB_USEDEP}] )
33 !mbedtls? (
34 - !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
35 - libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
36 + >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}]
37 )
38 )
39 zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
40
41 diff --git a/net-libs/libssh2/libssh2-9999.ebuild b/net-libs/libssh2/libssh2-9999.ebuild
42 index 9144d257666..275a78e9da5 100644
43 --- a/net-libs/libssh2/libssh2-9999.ebuild
44 +++ b/net-libs/libssh2/libssh2-9999.ebuild
45 @@ -12,7 +12,7 @@ EGIT_REPO_URI="https://github.com/libssh2/libssh2"
46 LICENSE="BSD"
47 SLOT="0"
48 KEYWORDS=""
49 -IUSE="gcrypt libressl mbedtls zlib"
50 +IUSE="gcrypt mbedtls zlib"
51 REQUIRED_USE="?? ( gcrypt mbedtls )"
52 RESTRICT="test"
53
54 @@ -21,8 +21,7 @@ RDEPEND="
55 !gcrypt? (
56 mbedtls? ( net-libs/mbedtls:0=[${MULTILIB_USEDEP}] )
57 !mbedtls? (
58 - !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
59 - libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
60 + >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}]
61 )
62 )
63 zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )