Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: Jason Donenfeld <zx2c4@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: www-client/lynx/, net-im/prosody/, net-libs/ldns/, net-dns/nsd/, eclass/, ...
Date: Wed, 02 Mar 2016 13:01:46
Message-Id: 1456923696.bac4d6e0819038d116bd8c69d4f6d8092e687363.zx2c4@gentoo
1 commit: bac4d6e0819038d116bd8c69d4f6d8092e687363
2 Author: Jason A. Donenfeld <zx2c4 <AT> gentoo <DOT> org>
3 AuthorDate: Wed Mar 2 13:00:48 2016 +0000
4 Commit: Jason Donenfeld <zx2c4 <AT> gentoo <DOT> org>
5 CommitDate: Wed Mar 2 13:01:36 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bac4d6e0
7
8 Add libressl support to many packages
9
10 Package maintainers will likely want to cleanup various things for this
11 experimental USE flag.
12
13 dev-lua/luacrypto/luacrypto-0.3.2-r1.ebuild | 3 ++-
14 dev-lua/luasec/luasec-0.5.ebuild | 4 ++--
15 eclass/ssl-cert.eclass | 17 ++++++++++++-----
16 media-video/rtmpdump/rtmpdump-2.4_p20131018.ebuild | 4 ++--
17 media-video/rtmpdump/rtmpdump-9999.ebuild | 4 ++--
18 net-dns/nsd/nsd-4.1.7.ebuild | 4 ++--
19 net-im/bitlbee/bitlbee-3.4.1.ebuild | 4 ++--
20 net-im/bitlbee/bitlbee-9999.ebuild | 4 ++--
21 net-im/prosody/prosody-0.9.10.ebuild | 4 ++--
22 net-irc/irssi/irssi-0.8.17.ebuild | 4 ++--
23 net-irc/irssi/irssi-9999.ebuild | 4 ++--
24 net-libs/ldns/ldns-1.6.17-r1.ebuild | 15 ++++++++++++---
25 net-libs/serf/serf-1.3.8-r1.ebuild | 4 ++--
26 www-client/lynx/lynx-2.8.9_pre6.ebuild | 4 ++--
27 14 files changed, 48 insertions(+), 31 deletions(-)
28
29 diff --git a/dev-lua/luacrypto/luacrypto-0.3.2-r1.ebuild b/dev-lua/luacrypto/luacrypto-0.3.2-r1.ebuild
30 index a431caa..5667900 100644
31 --- a/dev-lua/luacrypto/luacrypto-0.3.2-r1.ebuild
32 +++ b/dev-lua/luacrypto/luacrypto-0.3.2-r1.ebuild
33 @@ -13,10 +13,11 @@ SRC_URI="https://github.com/mkottman/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
34 LICENSE="MIT"
35 SLOT="0"
36 KEYWORDS="~amd64 ~x86"
37 +IUSE="libressl"
38
39 RDEPEND="
40 >=dev-lang/lua-5.1:0
41 - dev-libs/openssl:0"
42 + !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl:0 )"
43 DEPEND="${RDEPEND}
44 virtual/pkgconfig"
45
46
47 diff --git a/dev-lua/luasec/luasec-0.5.ebuild b/dev-lua/luasec/luasec-0.5.ebuild
48 index 0a63236..d456bb5 100644
49 --- a/dev-lua/luasec/luasec-0.5.ebuild
50 +++ b/dev-lua/luasec/luasec-0.5.ebuild
51 @@ -13,12 +13,12 @@ SRC_URI="https://github.com/brunoos/luasec/archive/${P}.tar.gz"
52 LICENSE="MIT"
53 SLOT="0"
54 KEYWORDS="amd64 arm x86"
55 -IUSE=""
56 +IUSE="libressl"
57
58 RDEPEND="
59 >=dev-lang/lua-5.1:0[deprecated]
60 dev-lua/luasocket
61 - dev-libs/openssl:0"
62 + !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl:= )"
63 DEPEND="${RDEPEND}
64 virtual/pkgconfig"
65
66
67 diff --git a/eclass/ssl-cert.eclass b/eclass/ssl-cert.eclass
68 index 33bee2f..053e101 100644
69 --- a/eclass/ssl-cert.eclass
70 +++ b/eclass/ssl-cert.eclass
71 @@ -23,11 +23,18 @@
72 # Use flag to append dependency to.
73 : ${SSL_CERT_USE:=ssl}
74
75 -if [[ "${SSL_CERT_MANDATORY}" == "0" ]]; then
76 - DEPEND="${SSL_CERT_USE}? ( dev-libs/openssl )"
77 - IUSE="${SSL_CERT_USE}"
78 -else
79 - DEPEND="dev-libs/openssl"
80 +# @ECLASS-VARIABLE: SSL_DEPS_SKIP
81 +# @DESCRIPTION:
82 +# Set to non zero to skip adding to DEPEND and IUSE.
83 +: ${SSL_DEPS_SKIP:=0}
84 +
85 +if [[ "${SSL_DEPS_SKIP}" == "0" ]]; then
86 + if [[ "${SSL_CERT_MANDATORY}" == "0" ]]; then
87 + DEPEND="${SSL_CERT_USE}? ( dev-libs/openssl )"
88 + IUSE="${SSL_CERT_USE}"
89 + else
90 + DEPEND="dev-libs/openssl"
91 + fi
92 fi
93
94 # @FUNCTION: gen_cnf
95
96 diff --git a/media-video/rtmpdump/rtmpdump-2.4_p20131018.ebuild b/media-video/rtmpdump/rtmpdump-2.4_p20131018.ebuild
97 index 3141617..d89eaa0 100644
98 --- a/media-video/rtmpdump/rtmpdump-2.4_p20131018.ebuild
99 +++ b/media-video/rtmpdump/rtmpdump-2.4_p20131018.ebuild
100 @@ -14,12 +14,12 @@ SRC_URI="https://dev.gentoo.org/~hwoarang/distfiles/${P}.tar.gz"
101 LICENSE="GPL-2 LGPL-2.1"
102 SLOT="0"
103 KEYWORDS="amd64 ~arm hppa ~mips ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
104 -IUSE="gnutls polarssl ssl"
105 +IUSE="gnutls polarssl ssl libressl"
106
107 DEPEND="ssl? (
108 gnutls? ( >=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP}] )
109 polarssl? ( !gnutls? ( >=net-libs/polarssl-1.3.4[${MULTILIB_USEDEP}] ) )
110 - !gnutls? ( !polarssl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] ) )
111 + !gnutls? ( !polarssl? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] ) libressl? ( dev-libs/libressl ) ) )
112 >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
113 )"
114 RDEPEND="${DEPEND}"
115
116 diff --git a/media-video/rtmpdump/rtmpdump-9999.ebuild b/media-video/rtmpdump/rtmpdump-9999.ebuild
117 index ccc1198..399c535 100644
118 --- a/media-video/rtmpdump/rtmpdump-9999.ebuild
119 +++ b/media-video/rtmpdump/rtmpdump-9999.ebuild
120 @@ -14,12 +14,12 @@ EGIT_REPO_URI="git://git.ffmpeg.org/rtmpdump"
121 LICENSE="GPL-2 LGPL-2.1"
122 SLOT="0"
123 KEYWORDS=""
124 -IUSE="gnutls polarssl ssl"
125 +IUSE="gnutls polarssl ssl libressl"
126
127 DEPEND="ssl? (
128 gnutls? ( >=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP}] )
129 polarssl? ( !gnutls? ( >=net-libs/polarssl-1.3.4[${MULTILIB_USEDEP}] ) )
130 - !gnutls? ( !polarssl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] ) )
131 + !gnutls? ( !polarssl? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] ) libressl? ( dev-libs/libressl ) ) )
132 >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
133 )"
134 RDEPEND="${DEPEND}"
135
136 diff --git a/net-dns/nsd/nsd-4.1.7.ebuild b/net-dns/nsd/nsd-4.1.7.ebuild
137 index 6eeec8b..b8dab32 100644
138 --- a/net-dns/nsd/nsd-4.1.7.ebuild
139 +++ b/net-dns/nsd/nsd-4.1.7.ebuild
140 @@ -18,12 +18,12 @@ SRC_URI="http://www.nlnetlabs.nl/downloads/${PN}/${MY_P}.tar.gz"
141 LICENSE="BSD"
142 SLOT="0"
143 KEYWORDS="~amd64 ~x86"
144 -IUSE="bind8-stats ipv6 libevent minimal-responses mmap munin +nsec3 ratelimit root-server runtime-checks ssl"
145 +IUSE="bind8-stats ipv6 libevent minimal-responses mmap munin +nsec3 ratelimit root-server runtime-checks ssl libressl"
146
147 RDEPEND="
148 virtual/yacc
149 libevent? ( dev-libs/libevent )
150 - ssl? ( dev-libs/openssl:0= )
151 + ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) )
152 munin? ( net-analyzer/munin )
153 "
154 DEPEND="
155
156 diff --git a/net-im/bitlbee/bitlbee-3.4.1.ebuild b/net-im/bitlbee/bitlbee-3.4.1.ebuild
157 index 4c281c9..2390ec6 100644
158 --- a/net-im/bitlbee/bitlbee-3.4.1.ebuild
159 +++ b/net-im/bitlbee/bitlbee-3.4.1.ebuild
160 @@ -15,7 +15,7 @@ LICENSE="GPL-2"
161 SLOT="0"
162 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
163 IUSE="debug gnutls ipv6 +xmpp libevent msn nss +oscar otr +plugins purple selinux
164 - skype ssl test twitter +yahoo xinetd"
165 + skype ssl test twitter +yahoo xinetd libressl"
166
167 COMMON_DEPEND="
168 >=dev-libs/glib-2.16
169 @@ -25,7 +25,7 @@ COMMON_DEPEND="
170 gnutls? ( net-libs/gnutls )
171 !gnutls? (
172 nss? ( dev-libs/nss )
173 - !nss? ( ssl? ( dev-libs/openssl:0 ) )
174 + !nss? ( ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl:= ) ) )
175 )
176 "
177 DEPEND="${COMMON_DEPEND}
178
179 diff --git a/net-im/bitlbee/bitlbee-9999.ebuild b/net-im/bitlbee/bitlbee-9999.ebuild
180 index fb77fd8..181f319 100644
181 --- a/net-im/bitlbee/bitlbee-9999.ebuild
182 +++ b/net-im/bitlbee/bitlbee-9999.ebuild
183 @@ -21,7 +21,7 @@ HOMEPAGE="http://www.bitlbee.org/"
184 LICENSE="GPL-2"
185 SLOT="0"
186 IUSE="debug gnutls ipv6 +xmpp libevent msn nss +oscar otr +plugins purple selinux
187 - skype ssl test twitter +yahoo xinetd"
188 + skype ssl test twitter +yahoo xinetd libressl"
189
190 COMMON_DEPEND="
191 >=dev-libs/glib-2.16
192 @@ -31,7 +31,7 @@ COMMON_DEPEND="
193 gnutls? ( net-libs/gnutls )
194 !gnutls? (
195 nss? ( dev-libs/nss )
196 - !nss? ( ssl? ( dev-libs/openssl:0 ) )
197 + !nss? ( ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl:= ) ) )
198 )
199 "
200 DEPEND="${COMMON_DEPEND}
201
202 diff --git a/net-im/prosody/prosody-0.9.10.ebuild b/net-im/prosody/prosody-0.9.10.ebuild
203 index 91ab49e..962870a 100644
204 --- a/net-im/prosody/prosody-0.9.10.ebuild
205 +++ b/net-im/prosody/prosody-0.9.10.ebuild
206 @@ -15,13 +15,13 @@ SRC_URI="http://prosody.im/tmp/${MY_PV}/${MY_P}.tar.gz"
207 LICENSE="MIT"
208 SLOT="0"
209 KEYWORDS="~amd64 ~arm ~x86"
210 -IUSE="ipv6 libevent mysql postgres sqlite ssl zlib jit"
211 +IUSE="ipv6 libevent mysql postgres sqlite ssl zlib jit libressl"
212
213 DEPEND="net-im/jabber-base
214 !jit? ( >=dev-lang/lua-5.1:0 )
215 jit? ( dev-lang/luajit:2 )
216 >=net-dns/libidn-1.1
217 - dev-libs/openssl:0"
218 + !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl:= )"
219 RDEPEND="${DEPEND}
220 >=dev-lua/luaexpat-1.3.0
221 dev-lua/luafilesystem
222
223 diff --git a/net-irc/irssi/irssi-0.8.17.ebuild b/net-irc/irssi/irssi-0.8.17.ebuild
224 index 2663f33..7024abf 100644
225 --- a/net-irc/irssi/irssi-0.8.17.ebuild
226 +++ b/net-irc/irssi/irssi-0.8.17.ebuild
227 @@ -18,11 +18,11 @@ SRC_URI="http://irssi.org/files/${MY_P}.tar.bz2"
228 LICENSE="GPL-2"
229 SLOT="0"
230 KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
231 -IUSE="ipv6 +perl selinux ssl socks5 +proxy"
232 +IUSE="ipv6 +perl selinux ssl socks5 +proxy libressl"
233
234 CDEPEND="sys-libs/ncurses:0=
235 >=dev-libs/glib-2.6.0
236 - ssl? ( dev-libs/openssl:= )
237 + ssl? ( !libressl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) )
238 perl? ( dev-lang/perl )
239 socks5? ( >=net-proxy/dante-1.1.18 )"
240
241
242 diff --git a/net-irc/irssi/irssi-9999.ebuild b/net-irc/irssi/irssi-9999.ebuild
243 index 45f10a9..3572a44 100644
244 --- a/net-irc/irssi/irssi-9999.ebuild
245 +++ b/net-irc/irssi/irssi-9999.ebuild
246 @@ -13,11 +13,11 @@ HOMEPAGE="http://irssi.org/"
247 LICENSE="GPL-2"
248 SLOT="0"
249 KEYWORDS=""
250 -IUSE="ipv6 +perl selinux ssl socks5 +proxy"
251 +IUSE="ipv6 +perl selinux ssl socks5 +proxy libressl"
252
253 CDEPEND="sys-libs/ncurses
254 >=dev-libs/glib-2.6.0
255 - ssl? ( dev-libs/openssl:= )
256 + ssl? ( !libressl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) )
257 perl? ( dev-lang/perl )
258 socks5? ( >=net-proxy/dante-1.1.18 )"
259 DEPEND="${CDEPEND}
260
261 diff --git a/net-libs/ldns/ldns-1.6.17-r1.ebuild b/net-libs/ldns/ldns-1.6.17-r1.ebuild
262 index cf6e735..ad7d166 100644
263 --- a/net-libs/ldns/ldns-1.6.17-r1.ebuild
264 +++ b/net-libs/ldns/ldns-1.6.17-r1.ebuild
265 @@ -21,10 +21,19 @@ REQUIRED_USE="ecdsa? ( ssl )
266 python? ( ${PYTHON_REQUIRED_USE} )"
267
268 RDEPEND="
269 - dane? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] )
270 - ecdsa? ( >=dev-libs/openssl-1.0.1h-r2:0[-bindist,${MULTILIB_USEDEP}] )
271 - gost? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] )
272 python? ( ${PYTHON_DEPS} )
273 + dane? (
274 + !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] )
275 + libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
276 + )
277 + ecdsa? (
278 + !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[-bindist,${MULTILIB_USEDEP}] )
279 + libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
280 + )
281 + gost? (
282 + !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] )
283 + libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
284 + )
285 ssl? (
286 !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] )
287 libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
288
289 diff --git a/net-libs/serf/serf-1.3.8-r1.ebuild b/net-libs/serf/serf-1.3.8-r1.ebuild
290 index 93b5314..a6127b0 100644
291 --- a/net-libs/serf/serf-1.3.8-r1.ebuild
292 +++ b/net-libs/serf/serf-1.3.8-r1.ebuild
293 @@ -13,11 +13,11 @@ SRC_URI="https://serf.googlecode.com/svn/src_releases/${P}.tar.bz2"
294 LICENSE="Apache-2.0"
295 SLOT="1"
296 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
297 -IUSE="kerberos static-libs"
298 +IUSE="kerberos static-libs libressl"
299
300 RDEPEND="dev-libs/apr:1=
301 dev-libs/apr-util:1=
302 - dev-libs/openssl:0=
303 + !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
304 sys-libs/zlib:0=
305 kerberos? ( virtual/krb5 )"
306 DEPEND="${RDEPEND}
307
308 diff --git a/www-client/lynx/lynx-2.8.9_pre6.ebuild b/www-client/lynx/lynx-2.8.9_pre6.ebuild
309 index 265115a..7aace03 100644
310 --- a/www-client/lynx/lynx-2.8.9_pre6.ebuild
311 +++ b/www-client/lynx/lynx-2.8.9_pre6.ebuild
312 @@ -25,13 +25,13 @@ SRC_URI="http://lynx.isc.org/current/${MY_P}.tar.bz2"
313 LICENSE="GPL-2"
314 SLOT="0"
315 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
316 -IUSE="bzip2 cjk gnutls idn ipv6 nls ssl unicode"
317 +IUSE="bzip2 cjk gnutls idn ipv6 nls ssl unicode libressl"
318
319 RDEPEND="sys-libs/ncurses:0=[unicode?]
320 sys-libs/zlib
321 nls? ( virtual/libintl )
322 ssl? (
323 - !gnutls? ( >=dev-libs/openssl-0.9.8 )
324 + !gnutls? ( !libressl? ( >=dev-libs/openssl-0.9.8 ) libressl? ( dev-libs/libressl ) )
325 gnutls? (
326 dev-libs/libgcrypt:0
327 >=net-libs/gnutls-2.6.4
Report Message
Find on MARC Find on Google Groups