Gentoo Archives: gentoo-commits

From: "Mike Frysinger (vapier)" <vapier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-misc/curl: curl-7.22.0.ebuild curl-7.23.1.ebuild ChangeLog curl-7.21.4.ebuild metadata.xml curl-7.21.7.ebuild curl-7.21.6.ebuild curl-7.21.7-r2.ebuild
Date: Thu, 01 Dec 2011 21:11:17
Message-Id: 20111201211106.A1E8E20034@flycatcher.gentoo.org
1 vapier 11/12/01 21:11:06
2
3 Modified: curl-7.22.0.ebuild curl-7.23.1.ebuild ChangeLog
4 curl-7.21.4.ebuild metadata.xml curl-7.21.7.ebuild
5 curl-7.21.6.ebuild curl-7.21.7-r2.ebuild
6 Log:
7 Convert USE=libssh2 to USE=ssh to match other packages, and to match the functionality provided rather than the library implementation.
8
9 (Portage version: 2.2.0_alpha75/cvs/Linux x86_64)
10
11 Revision Changes Path
12 1.3 net-misc/curl/curl-7.22.0.ebuild
13
14 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/curl/curl-7.22.0.ebuild?rev=1.3&view=markup
15 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/curl/curl-7.22.0.ebuild?rev=1.3&content-type=text/plain
16 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/curl/curl-7.22.0.ebuild?r1=1.2&r2=1.3
17
18 Index: curl-7.22.0.ebuild
19 ===================================================================
20 RCS file: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.22.0.ebuild,v
21 retrieving revision 1.2
22 retrieving revision 1.3
23 diff -u -r1.2 -r1.3
24 --- curl-7.22.0.ebuild 14 Nov 2011 17:10:55 -0000 1.2
25 +++ curl-7.22.0.ebuild 1 Dec 2011 21:11:06 -0000 1.3
26 @@ -1,6 +1,6 @@
27 # Copyright 1999-2011 Gentoo Foundation
28 # Distributed under the terms of the GNU General Public License v2
29 -# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.22.0.ebuild,v 1.2 2011/11/14 17:10:55 angelos Exp $
30 +# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.22.0.ebuild,v 1.3 2011/12/01 21:11:06 vapier Exp $
31
32 EAPI=4
33
34 @@ -13,7 +13,7 @@
35 LICENSE="MIT"
36 SLOT="0"
37 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
38 -IUSE="ares gnutls idn ipv6 kerberos ldap libssh2 nss ssl static-libs test threads"
39 +IUSE="ares gnutls idn ipv6 kerberos ldap nss ssh ssl static-libs test threads"
40
41 RDEPEND="ldap? ( net-nds/openldap )
42 gnutls? ( net-libs/gnutls dev-libs/libgcrypt app-misc/ca-certificates )
43 @@ -22,7 +22,7 @@
44 idn? ( net-dns/libidn )
45 ares? ( >=net-dns/c-ares-1.6 )
46 kerberos? ( virtual/krb5 )
47 - libssh2? ( >=net-libs/libssh2-0.16 )"
48 + ssh? ( >=net-libs/libssh2-0.16 )"
49
50 # rtmpdump ( media-video/rtmpdump ) / --with-librtmp
51 # fbopenssl (not in gentoo) --with-spnego
52 @@ -58,7 +58,7 @@
53 $(use_enable ldap ldaps)
54 $(use_with idn libidn)
55 $(use_with kerberos gssapi "${EPREFIX}"/usr)
56 - $(use_with libssh2)
57 + $(use_with ssh libssh2)
58 $(use_enable static-libs static)
59 $(use_enable ipv6)
60 $(use_enable threads threaded-resolver)
61
62
63
64 1.3 net-misc/curl/curl-7.23.1.ebuild
65
66 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/curl/curl-7.23.1.ebuild?rev=1.3&view=markup
67 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/curl/curl-7.23.1.ebuild?rev=1.3&content-type=text/plain
68 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/curl/curl-7.23.1.ebuild?r1=1.2&r2=1.3
69
70 Index: curl-7.23.1.ebuild
71 ===================================================================
72 RCS file: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.23.1.ebuild,v
73 retrieving revision 1.2
74 retrieving revision 1.3
75 diff -u -r1.2 -r1.3
76 --- curl-7.23.1.ebuild 1 Dec 2011 20:59:54 -0000 1.2
77 +++ curl-7.23.1.ebuild 1 Dec 2011 21:11:06 -0000 1.3
78 @@ -1,6 +1,6 @@
79 # Copyright 1999-2011 Gentoo Foundation
80 # Distributed under the terms of the GNU General Public License v2
81 -# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.23.1.ebuild,v 1.2 2011/12/01 20:59:54 vapier Exp $
82 +# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.23.1.ebuild,v 1.3 2011/12/01 21:11:06 vapier Exp $
83
84 EAPI=4
85
86 @@ -13,7 +13,7 @@
87 LICENSE="MIT"
88 SLOT="0"
89 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
90 -IUSE="ares gnutls idn ipv6 kerberos ldap libssh2 nss ssl static-libs test threads"
91 +IUSE="ares gnutls idn ipv6 kerberos ldap nss ssh ssl static-libs test threads"
92
93 RDEPEND="ldap? ( net-nds/openldap )
94 gnutls? ( net-libs/gnutls dev-libs/libgcrypt app-misc/ca-certificates )
95 @@ -22,7 +22,7 @@
96 idn? ( net-dns/libidn )
97 ares? ( >=net-dns/c-ares-1.6 )
98 kerberos? ( virtual/krb5 )
99 - libssh2? ( >=net-libs/libssh2-0.16 )"
100 + ssh? ( >=net-libs/libssh2-0.16 )"
101
102 # rtmpdump ( media-video/rtmpdump ) / --with-librtmp
103 # fbopenssl (not in gentoo) --with-spnego
104 @@ -73,7 +73,7 @@
105 $(use_enable ldap ldaps) \
106 $(use_with idn libidn) \
107 $(use_with kerberos gssapi "${EPREFIX}"/usr) \
108 - $(use_with libssh2) \
109 + $(use_with ssh libssh2) \
110 $(use_enable static-libs static) \
111 $(use_enable ipv6) \
112 $(use_enable threads threaded-resolver) \
113
114
115
116 1.196 net-misc/curl/ChangeLog
117
118 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/curl/ChangeLog?rev=1.196&view=markup
119 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/curl/ChangeLog?rev=1.196&content-type=text/plain
120 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/curl/ChangeLog?r1=1.195&r2=1.196
121
122 Index: ChangeLog
123 ===================================================================
124 RCS file: /var/cvsroot/gentoo-x86/net-misc/curl/ChangeLog,v
125 retrieving revision 1.195
126 retrieving revision 1.196
127 diff -u -r1.195 -r1.196
128 --- ChangeLog 1 Dec 2011 20:59:54 -0000 1.195
129 +++ ChangeLog 1 Dec 2011 21:11:06 -0000 1.196
130 @@ -1,6 +1,12 @@
131 # ChangeLog for net-misc/curl
132 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
133 -# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/ChangeLog,v 1.195 2011/12/01 20:59:54 vapier Exp $
134 +# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/ChangeLog,v 1.196 2011/12/01 21:11:06 vapier Exp $
135 +
136 + 01 Dec 2011; Mike Frysinger <vapier@g.o> curl-7.21.4.ebuild,
137 + curl-7.21.6.ebuild, curl-7.21.7.ebuild, curl-7.21.7-r2.ebuild,
138 + curl-7.22.0.ebuild, curl-7.23.1.ebuild, metadata.xml:
139 + Convert USE=libssh2 to USE=ssh to match other packages, and to match the
140 + functionality provided rather than the library implementation.
141
142 01 Dec 2011; Mike Frysinger <vapier@g.o> curl-7.23.1.ebuild:
143 Move into ~arch w/Christoph blessing.
144
145
146
147 1.12 net-misc/curl/curl-7.21.4.ebuild
148
149 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/curl/curl-7.21.4.ebuild?rev=1.12&view=markup
150 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/curl/curl-7.21.4.ebuild?rev=1.12&content-type=text/plain
151 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/curl/curl-7.21.4.ebuild?r1=1.11&r2=1.12
152
153 Index: curl-7.21.4.ebuild
154 ===================================================================
155 RCS file: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.21.4.ebuild,v
156 retrieving revision 1.11
157 retrieving revision 1.12
158 diff -u -r1.11 -r1.12
159 --- curl-7.21.4.ebuild 12 Jun 2011 14:39:31 -0000 1.11
160 +++ curl-7.21.4.ebuild 1 Dec 2011 21:11:06 -0000 1.12
161 @@ -1,6 +1,6 @@
162 # Copyright 1999-2011 Gentoo Foundation
163 # Distributed under the terms of the GNU General Public License v2
164 -# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.21.4.ebuild,v 1.11 2011/06/12 14:39:31 armin76 Exp $
165 +# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.21.4.ebuild,v 1.12 2011/12/01 21:11:06 vapier Exp $
166
167 # NOTE: If you bump this ebuild, make sure you bump dev-python/pycurl!
168
169 @@ -15,7 +15,7 @@
170 LICENSE="MIT"
171 SLOT="0"
172 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
173 -IUSE="ares gnutls idn ipv6 kerberos ldap libssh2 nss ssl static-libs test threads"
174 +IUSE="ares gnutls idn ipv6 kerberos ldap nss ssh ssl static-libs test threads"
175
176 RDEPEND="ldap? ( net-nds/openldap )
177 ssl? (
178 @@ -26,7 +26,7 @@
179 idn? ( net-dns/libidn )
180 ares? ( >=net-dns/c-ares-1.4.0 )
181 kerberos? ( virtual/krb5 )
182 - libssh2? ( >=net-libs/libssh2-0.16 )"
183 + ssh? ( >=net-libs/libssh2-0.16 )"
184
185 # rtmpdump ( media-video/rtmpdump ) / --with-librtmp
186 # fbopenssl (not in gentoo) --with-spnego
187 @@ -62,7 +62,7 @@
188 $(use_enable ldap ldaps)
189 $(use_with idn libidn)
190 $(use_with kerberos gssapi "${EPREFIX}"/usr)
191 - $(use_with libssh2)
192 + $(use_with ssh libssh2)
193 $(use_enable static-libs static)
194 $(use_enable ipv6)
195 $(use_enable threads threaded-resolver)
196
197
198
199 1.11 net-misc/curl/metadata.xml
200
201 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/curl/metadata.xml?rev=1.11&view=markup
202 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/curl/metadata.xml?rev=1.11&content-type=text/plain
203 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/curl/metadata.xml?r1=1.10&r2=1.11
204
205 Index: metadata.xml
206 ===================================================================
207 RCS file: /var/cvsroot/gentoo-x86/net-misc/curl/metadata.xml,v
208 retrieving revision 1.10
209 retrieving revision 1.11
210 diff -u -r1.10 -r1.11
211 --- metadata.xml 24 Sep 2011 10:09:47 -0000 1.10
212 +++ metadata.xml 1 Dec 2011 21:11:06 -0000 1.11
213 @@ -7,7 +7,7 @@
214 </maintainer>
215 <use>
216 <flag name="ares">Enabled c-ares dns support</flag>
217 - <flag name="libssh2">Enabled SSH urls in curl using libssh2</flag>
218 + <flag name="ssh">Enabled SSH urls in curl using libssh2</flag>
219 <flag name="gnutls">Prefer gnutls over nss and openssl as the crypto engine</flag>
220 <flag name="nss">Prefer NSS over openssl as the crypto engine</flag>
221 <flag name="ssl">Enable crypto engine support (via openssl if USE='-gnutls -nss')</flag>
222
223
224
225 1.5 net-misc/curl/curl-7.21.7.ebuild
226
227 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/curl/curl-7.21.7.ebuild?rev=1.5&view=markup
228 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/curl/curl-7.21.7.ebuild?rev=1.5&content-type=text/plain
229 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/curl/curl-7.21.7.ebuild?r1=1.4&r2=1.5
230
231 Index: curl-7.21.7.ebuild
232 ===================================================================
233 RCS file: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.21.7.ebuild,v
234 retrieving revision 1.4
235 retrieving revision 1.5
236 diff -u -r1.4 -r1.5
237 --- curl-7.21.7.ebuild 23 Jul 2011 11:43:48 -0000 1.4
238 +++ curl-7.21.7.ebuild 1 Dec 2011 21:11:06 -0000 1.5
239 @@ -1,6 +1,6 @@
240 # Copyright 1999-2011 Gentoo Foundation
241 # Distributed under the terms of the GNU General Public License v2
242 -# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.21.7.ebuild,v 1.4 2011/07/23 11:43:48 angelos Exp $
243 +# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.21.7.ebuild,v 1.5 2011/12/01 21:11:06 vapier Exp $
244
245 # NOTE: If you bump this ebuild, make sure you bump dev-python/pycurl!
246
247 @@ -15,7 +15,7 @@
248 LICENSE="MIT"
249 SLOT="0"
250 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
251 -IUSE="ares gnutls idn ipv6 kerberos ldap libssh2 nss ssl static-libs test threads"
252 +IUSE="ares gnutls idn ipv6 kerberos ldap nss ssh ssl static-libs test threads"
253
254 RDEPEND="ldap? ( net-nds/openldap )
255 ssl? (
256 @@ -26,7 +26,7 @@
257 idn? ( net-dns/libidn )
258 ares? ( >=net-dns/c-ares-1.6 )
259 kerberos? ( virtual/krb5 )
260 - libssh2? ( >=net-libs/libssh2-0.16 )"
261 + ssh? ( >=net-libs/libssh2-0.16 )"
262
263 # rtmpdump ( media-video/rtmpdump ) / --with-librtmp
264 # fbopenssl (not in gentoo) --with-spnego
265 @@ -63,7 +63,7 @@
266 $(use_enable ldap ldaps)
267 $(use_with idn libidn)
268 $(use_with kerberos gssapi "${EPREFIX}"/usr)
269 - $(use_with libssh2)
270 + $(use_with ssh libssh2)
271 $(use_enable static-libs static)
272 $(use_enable ipv6)
273 $(use_enable threads threaded-resolver)
274
275
276
277 1.2 net-misc/curl/curl-7.21.6.ebuild
278
279 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/curl/curl-7.21.6.ebuild?rev=1.2&view=markup
280 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/curl/curl-7.21.6.ebuild?rev=1.2&content-type=text/plain
281 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/curl/curl-7.21.6.ebuild?r1=1.1&r2=1.2
282
283 Index: curl-7.21.6.ebuild
284 ===================================================================
285 RCS file: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.21.6.ebuild,v
286 retrieving revision 1.1
287 retrieving revision 1.2
288 diff -u -r1.1 -r1.2
289 --- curl-7.21.6.ebuild 23 May 2011 08:51:20 -0000 1.1
290 +++ curl-7.21.6.ebuild 1 Dec 2011 21:11:06 -0000 1.2
291 @@ -1,6 +1,6 @@
292 # Copyright 1999-2011 Gentoo Foundation
293 # Distributed under the terms of the GNU General Public License v2
294 -# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.21.6.ebuild,v 1.1 2011/05/23 08:51:20 scarabeus Exp $
295 +# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.21.6.ebuild,v 1.2 2011/12/01 21:11:06 vapier Exp $
296
297 # NOTE: If you bump this ebuild, make sure you bump dev-python/pycurl!
298
299 @@ -15,7 +15,7 @@
300 LICENSE="MIT"
301 SLOT="0"
302 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
303 -IUSE="ares gnutls idn ipv6 kerberos ldap libssh2 nss ssl static-libs test threads"
304 +IUSE="ares gnutls idn ipv6 kerberos ldap nss ssh ssl static-libs test threads"
305
306 RDEPEND="ldap? ( net-nds/openldap )
307 ssl? (
308 @@ -26,7 +26,7 @@
309 idn? ( net-dns/libidn )
310 ares? ( >=net-dns/c-ares-1.4.0 )
311 kerberos? ( virtual/krb5 )
312 - libssh2? ( >=net-libs/libssh2-0.16 )"
313 + ssh? ( >=net-libs/libssh2-0.16 )"
314
315 # rtmpdump ( media-video/rtmpdump ) / --with-librtmp
316 # fbopenssl (not in gentoo) --with-spnego
317 @@ -62,7 +62,7 @@
318 $(use_enable ldap ldaps)
319 $(use_with idn libidn)
320 $(use_with kerberos gssapi "${EPREFIX}"/usr)
321 - $(use_with libssh2)
322 + $(use_with ssh libssh2)
323 $(use_enable static-libs static)
324 $(use_enable ipv6)
325 $(use_enable threads threaded-resolver)
326
327
328
329 1.4 net-misc/curl/curl-7.21.7-r2.ebuild
330
331 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/curl/curl-7.21.7-r2.ebuild?rev=1.4&view=markup
332 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/curl/curl-7.21.7-r2.ebuild?rev=1.4&content-type=text/plain
333 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/curl/curl-7.21.7-r2.ebuild?r1=1.3&r2=1.4
334
335 Index: curl-7.21.7-r2.ebuild
336 ===================================================================
337 RCS file: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.21.7-r2.ebuild,v
338 retrieving revision 1.3
339 retrieving revision 1.4
340 diff -u -r1.3 -r1.4
341 --- curl-7.21.7-r2.ebuild 21 Aug 2011 15:40:07 -0000 1.3
342 +++ curl-7.21.7-r2.ebuild 1 Dec 2011 21:11:06 -0000 1.4
343 @@ -1,6 +1,6 @@
344 # Copyright 1999-2011 Gentoo Foundation
345 # Distributed under the terms of the GNU General Public License v2
346 -# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.21.7-r2.ebuild,v 1.3 2011/08/21 15:40:07 angelos Exp $
347 +# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.21.7-r2.ebuild,v 1.4 2011/12/01 21:11:06 vapier Exp $
348
349 EAPI=4
350
351 @@ -13,7 +13,7 @@
352 LICENSE="MIT"
353 SLOT="0"
354 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
355 -IUSE="ares gnutls idn ipv6 kerberos ldap libssh2 nss ssl static-libs test threads"
356 +IUSE="ares gnutls idn ipv6 kerberos ldap nss ssh ssl static-libs test threads"
357
358 RDEPEND="ldap? ( net-nds/openldap )
359 ssl? (
360 @@ -24,7 +24,7 @@
361 idn? ( net-dns/libidn )
362 ares? ( >=net-dns/c-ares-1.6 )
363 kerberos? ( virtual/krb5 )
364 - libssh2? ( >=net-libs/libssh2-0.16 )"
365 + ssh? ( >=net-libs/libssh2-0.16 )"
366
367 # rtmpdump ( media-video/rtmpdump ) / --with-librtmp
368 # fbopenssl (not in gentoo) --with-spnego
369 @@ -63,7 +63,7 @@
370 $(use_enable ldap ldaps)
371 $(use_with idn libidn)
372 $(use_with kerberos gssapi "${EPREFIX}"/usr)
373 - $(use_with libssh2)
374 + $(use_with ssh libssh2)
375 $(use_enable static-libs static)
376 $(use_enable ipv6)
377 $(use_enable threads threaded-resolver)