Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: www-client/elinks/
Date: Fri, 07 Aug 2020 17:58:10
Message-Id: 1596823067.ecf767fe583c3b8e3e3e697cdced7c0e6e4755c4.sam@gentoo
1 commit: ecf767fe583c3b8e3e3e697cdced7c0e6e4755c4
2 Author: Felix Janda <felix.janda <AT> posteo <DOT> de>
3 AuthorDate: Sun Aug 2 22:07:27 2020 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Fri Aug 7 17:57:47 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ecf767fe
7
8 www-client/elinks: add support for gnutls
9
10 Signed-off-by: Felix Janda <felix.janda <AT> posteo.de>
11 Signed-off-by: Sam James <sam <AT> gentoo.org>
12
13 www-client/elinks/elinks-9999.ebuild | 18 +++++++++++-------
14 1 file changed, 11 insertions(+), 7 deletions(-)
15
16 diff --git a/www-client/elinks/elinks-9999.ebuild b/www-client/elinks/elinks-9999.ebuild
17 index 0fd8b8d67f7..16eb304d3e7 100644
18 --- a/www-client/elinks/elinks-9999.ebuild
19 +++ b/www-client/elinks/elinks-9999.ebuild
20 @@ -15,7 +15,7 @@ HOMEPAGE="http://elinks.or.cz/"
21 LICENSE="GPL-2"
22 SLOT="0"
23 KEYWORDS=""
24 -IUSE="bittorrent brotli bzip2 debug finger ftp gopher gpm guile idn ipv6
25 +IUSE="bittorrent brotli bzip2 debug finger ftp gopher gpm gnutls guile idn ipv6
26 javascript libressl lua +mouse nls nntp perl ruby samba ssl tre unicode X xml zlib"
27
28 BDEPEND="virtual/pkgconfig"
29 @@ -31,8 +31,11 @@ RDEPEND="
30 ruby? ( dev-lang/ruby:* dev-ruby/rubygems:* )
31 samba? ( net-fs/samba )
32 ssl? (
33 - !libressl? ( dev-libs/openssl:0= )
34 - libressl? ( dev-libs/libressl:0= )
35 + !gnutls? (
36 + !libressl? ( dev-libs/openssl:0= )
37 + libressl? ( dev-libs/libressl:0= )
38 + )
39 + gnutls? ( net-libs/gnutls:= )
40 )
41 tre? ( dev-libs/tre )
42 X? ( x11-libs/libX11 x11-libs/libXt )
43 @@ -96,11 +99,12 @@ src_configure() {
44 myconf+=( --enable-fastmem )
45 fi
46
47 - # NOTE about GNUTSL SSL support (from the README -- 25/12/2002)
48 - # As GNUTLS is not yet 100% stable and its support in ELinks is not so well
49 - # tested yet, it's recommended for users to give a strong preference to OpenSSL whenever possible.
50 if use ssl ; then
51 - myconf+=( --with-openssl="${EPREFIX}"/usr )
52 + if use gnutls ; then
53 + myconf+=( --with-gnutls )
54 + else
55 + myconf+=( --with-openssl="${EPREFIX}"/usr )
56 + fi
57 else
58 myconf+=( --without-openssl --without-gnutls )
59 fi