Gentoo Archives: gentoo-commits

From: "Anthony G. Basile" <blueness@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/curl/
Date: Thu, 29 Sep 2016 15:44:22
Message-Id: 1475163834.1a73f761a45f9981863463021f9cd8e622711ffd.blueness@gentoo
1 commit: 1a73f761a45f9981863463021f9cd8e622711ffd
2 Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
3 AuthorDate: Thu Sep 29 15:43:54 2016 +0000
4 Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
5 CommitDate: Thu Sep 29 15:43:54 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a73f761
7
8 net-misc/curl: remove security vulnerable versions, bug #593716
9
10 Package-Manager: portage-2.2.28
11
12 net-misc/curl/Manifest | 5 -
13 net-misc/curl/curl-7.49.0.ebuild | 230 -----------------------------------
14 net-misc/curl/curl-7.49.1.ebuild | 251 ---------------------------------------
15 net-misc/curl/curl-7.50.0.ebuild | 251 ---------------------------------------
16 net-misc/curl/curl-7.50.1.ebuild | 251 ---------------------------------------
17 net-misc/curl/curl-7.50.2.ebuild | 251 ---------------------------------------
18 6 files changed, 1239 deletions(-)
19
20 diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
21 index 18c88bd..6cc617a 100644
22 --- a/net-misc/curl/Manifest
23 +++ b/net-misc/curl/Manifest
24 @@ -1,6 +1 @@
25 -DIST curl-7.49.0.tar.bz2 7458465 SHA256 14f44ed7b5207fea769ddb2c31bd9e720d37312e1c02315def67923a4a636078 SHA512 57a82185c082ea872a54c6f5a11ca24fe6131108c16255278671504afca848b9298681de9c9bb5905b9655295edf25c104d1301c4bbdb1f261d952a020d77111 WHIRLPOOL f5c4d15b7072d98e0760d7e5de59c307fb4e7f84125db7ebb2fc9f9d19e3ed35f937244579c00d9fb1e86604df277eab2a1eb14d7b339182e484a4925103dff7
26 -DIST curl-7.49.1.tar.bz2 7459866 SHA256 eb63cec4bef692eab9db459033f409533e6d10e20942f4b060b32819e81885f1 SHA512 665ef178c282c14f429498547b3711ef79faf85f6db7f4ec24259e2c6247f6ee234dda158ebc207d03f08b5198c5844480e054f24f054b2de6c6a15d4f1ce6e6 WHIRLPOOL 1c90843d78adb579ee796ceedcc2e148688dd572532c09bc62491fd82a7b859c3e27bea45fd462b78a5f3ce431b2ce833ac1772faad8b276889cdc90e44a6d98
27 -DIST curl-7.50.0.tar.bz2 7465962 SHA256 608dfe2db77f48db792c387e7791aca55a25f0b42385707ad927164199ecfa9a SHA512 f431c9895d260ef77dcff29e868c8d5180800d12f2bd89da8942422cec454432717e6ede6484d6b6711cb2bdd85e7e8f6ae23c59fd1f5b69acd569570c8efdd8 WHIRLPOOL ce677f42ce608340857dbe9cb6b5fc890eac535ebadd484dfd4291a2ffd031a111faf1f916a200e91ab9c6fd5755175efea1835321c20a0cb0743eaccf9305cc
28 -DIST curl-7.50.1.tar.bz2 7464809 SHA256 3c12c5f54ccaa1d40abc65d672107dcc75d3e1fcb38c267484334280096e5156 SHA512 94acd91fcf8ff2605e1ba2d086c2c366257b61eaf516b9ea44e574e315feb5b30f6e47d89051f259e026ef5dd9edde5f7b15a6af9ee6a38f641da354e1e677b1 WHIRLPOOL 437da96eb708a4822db77d27a0bf015b33e51105892c63d47b4fafe0e446ee03a7e580d1a519633d1b43bc5703adeb14399f8bdfc563c841be76892a7d00888f
29 -DIST curl-7.50.2.tar.bz2 7477028 SHA256 0c72105df4e9575d68bcf43aea1751056c1d29b1040df6194a49c5ac08f8e233 SHA512 5db4fba920f1627e545ddf774ceaafe3afce43c85aaa8aa7842337fe6cbc031aa597d9d80457c5d52bc7a0c218de30bb29802383e1d81e3f220186212dade342 WHIRLPOOL ff1034c19835168f1ad94a957bbcbec500f0a269b97951d66e4ec220a04b50386fedb971ee6a9331b920a55de781df3249a3d94e9764d1db2029cc77296bf0a2
30 DIST curl-7.50.3.tar.bz2 7478393 SHA256 7b7347d976661d02c84a1f4d6daf40dee377efdc45b9e2c77dedb8acf140d8ec SHA512 59012f0d9abd38d00e0b2db0cd5d8b513c08000354d31e7318007b688dc1eb71a0ac71a13acd40b0becc6199299091697b448d2e6895f90e103a23cd23f7f621 WHIRLPOOL 90d45150dd82433d29ac3eeaab1ed3a58a8e6ca20b41039a9988d4a73ceaf5b11b5b9c7ba7c9cce05e13056350691d80e52f5c12ae11ac7ffa91e32d56e0c056
31
32 diff --git a/net-misc/curl/curl-7.49.0.ebuild b/net-misc/curl/curl-7.49.0.ebuild
33 deleted file mode 100644
34 index f74b1d8..00000000
35 --- a/net-misc/curl/curl-7.49.0.ebuild
36 +++ /dev/null
37 @@ -1,230 +0,0 @@
38 -# Copyright 1999-2016 Gentoo Foundation
39 -# Distributed under the terms of the GNU General Public License v2
40 -# $Id$
41 -
42 -EAPI="5"
43 -
44 -inherit autotools eutils prefix multilib-minimal
45 -
46 -DESCRIPTION="A Client that groks URLs"
47 -HOMEPAGE="https://curl.haxx.se/"
48 -SRC_URI="https://curl.haxx.se/download/${P}.tar.bz2"
49 -
50 -LICENSE="MIT"
51 -SLOT="0"
52 -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 ~hppa-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
53 -IUSE="adns http2 idn ipv6 kerberos ldap metalink rtmp samba ssh ssl static-libs test threads"
54 -IUSE+=" curl_ssl_axtls curl_ssl_gnutls curl_ssl_libressl curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_polarssl curl_ssl_winssl"
55 -IUSE+=" elibc_Winnt"
56 -
57 -#lead to lots of false negatives, bug #285669
58 -RESTRICT="test"
59 -
60 -RDEPEND="ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
61 - ssl? (
62 - curl_ssl_axtls? (
63 - net-libs/axtls[${MULTILIB_USEDEP}]
64 - app-misc/ca-certificates
65 - )
66 - curl_ssl_gnutls? (
67 - net-libs/gnutls:0=[static-libs?,${MULTILIB_USEDEP}]
68 - dev-libs/nettle:0=[${MULTILIB_USEDEP}]
69 - app-misc/ca-certificates
70 - )
71 - curl_ssl_libressl? (
72 - dev-libs/libressl:0=[static-libs?,${MULTILIB_USEDEP}]
73 - )
74 - curl_ssl_mbedtls? (
75 - net-libs/mbedtls:0=[${MULTILIB_USEDEP}]
76 - app-misc/ca-certificates
77 - )
78 - curl_ssl_openssl? (
79 - dev-libs/openssl:0=[static-libs?,${MULTILIB_USEDEP}]
80 - )
81 - curl_ssl_nss? (
82 - dev-libs/nss:0[${MULTILIB_USEDEP}]
83 - app-misc/ca-certificates
84 - )
85 - curl_ssl_polarssl? (
86 - net-libs/polarssl:0=[${MULTILIB_USEDEP}]
87 - app-misc/ca-certificates
88 - )
89 - )
90 - http2? ( net-libs/nghttp2[${MULTILIB_USEDEP}] )
91 - idn? ( net-dns/libidn:0[static-libs?,${MULTILIB_USEDEP}] )
92 - adns? ( net-dns/c-ares:0[${MULTILIB_USEDEP}] )
93 - kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
94 - metalink? ( >=media-libs/libmetalink-0.1.1[${MULTILIB_USEDEP}] )
95 - rtmp? ( media-video/rtmpdump[${MULTILIB_USEDEP}] )
96 - ssh? ( net-libs/libssh2[static-libs?,${MULTILIB_USEDEP}] )
97 - sys-libs/zlib[${MULTILIB_USEDEP}]
98 - abi_x86_32? (
99 - !<=app-emulation/emul-linux-x86-baselibs-20140508-r13
100 - !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
101 - )"
102 -
103 -# Do we need to enforce the same ssl backend for curl and rtmpdump? Bug #423303
104 -# rtmp? (
105 -# media-video/rtmpdump
106 -# curl_ssl_gnutls? ( media-video/rtmpdump[gnutls] )
107 -# curl_ssl_openssl? ( media-video/rtmpdump[-gnutls,ssl] )
108 -# )
109 -
110 -# ssl providers to be added:
111 -# fbopenssl $(use_with spnego)
112 -
113 -DEPEND="${RDEPEND}
114 - >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
115 - test? (
116 - sys-apps/diffutils
117 - dev-lang/perl
118 - )"
119 -
120 -# c-ares must be disabled for threads
121 -# only one ssl provider can be enabled
122 -REQUIRED_USE="
123 - curl_ssl_winssl? ( elibc_Winnt )
124 - threads? ( !adns )
125 - ssl? (
126 - ^^ (
127 - curl_ssl_axtls
128 - curl_ssl_gnutls
129 - curl_ssl_libressl
130 - curl_ssl_mbedtls
131 - curl_ssl_nss
132 - curl_ssl_openssl
133 - curl_ssl_polarssl
134 - curl_ssl_winssl
135 - )
136 - )"
137 -
138 -DOCS=( CHANGES README docs/FEATURES docs/INTERNALS \
139 - docs/MANUAL docs/FAQ docs/BUGS docs/CONTRIBUTE )
140 -
141 -MULTILIB_WRAPPED_HEADERS=(
142 - /usr/include/curl/curlbuild.h
143 -)
144 -
145 -MULTILIB_CHOST_TOOLS=(
146 - /usr/bin/curl-config
147 -)
148 -
149 -src_prepare() {
150 - epatch \
151 - "${FILESDIR}"/${PN}-7.30.0-prefix.patch \
152 - "${FILESDIR}"/${PN}-respect-cflags-3.patch \
153 - "${FILESDIR}"/${PN}-fix-gnutls-nettle.patch
154 -
155 - sed -i '/LD_LIBRARY_PATH=/d' configure.ac || die #382241
156 -
157 - epatch_user
158 - eprefixify curl-config.in
159 - eautoreconf
160 -}
161 -
162 -multilib_src_configure() {
163 - # We make use of the fact that later flags override earlier ones
164 - # So start with all ssl providers off until proven otherwise
165 - local myconf=()
166 - myconf+=( --without-axtls --without-gnutls --without-mbedtls --without-nss --without-polarssl --without-ssl --without-winssl )
167 - myconf+=( --without-ca-fallback --with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt )
168 - if use ssl ; then
169 - if use curl_ssl_axtls; then
170 - einfo "SSL provided by axtls"
171 - myconf+=( --with-axtls )
172 - elif use curl_ssl_gnutls; then
173 - einfo "SSL provided by gnutls"
174 - myconf+=( --with-gnutls --with-nettle )
175 - elif use curl_ssl_libressl; then
176 - einfo "SSL provided by LibreSSL"
177 - myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs )
178 - elif use curl_ssl_mbedtls; then
179 - einfo "SSL provided by mbedtls"
180 - myconf+=( --with-mbedtls )
181 - elif use curl_ssl_nss; then
182 - einfo "SSL provided by nss"
183 - myconf+=( --with-nss )
184 - elif use curl_ssl_polarssl; then
185 - einfo "SSL provided by polarssl"
186 - myconf+=( --with-polarssl )
187 - elif use curl_ssl_openssl; then
188 - einfo "SSL provided by openssl"
189 - myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs )
190 - elif use curl_ssl_winssl; then
191 - einfo "SSL provided by Windows"
192 - myconf+=( --with-winssl )
193 - else
194 - eerror "We can't be here because of REQUIRED_USE."
195 - fi
196 - else
197 - einfo "SSL disabled"
198 - fi
199 -
200 - # These configuration options are organized alphabetically
201 - # within each category. This should make it easier if we
202 - # ever decide to make any of them contingent on USE flags:
203 - # 1) protocols first. To see them all do
204 - # 'grep SUPPORT_PROTOCOLS configure.ac'
205 - # 2) --enable/disable options second.
206 - # 'grep -- --enable configure | grep Check | awk '{ print $4 }' | sort
207 - # 3) --with/without options third.
208 - # grep -- --with configure | grep Check | awk '{ print $4 }' | sort
209 - ECONF_SOURCE="${S}" \
210 - econf \
211 - --enable-crypto-auth \
212 - --enable-dict \
213 - --enable-file \
214 - --enable-ftp \
215 - --enable-gopher \
216 - --enable-http \
217 - --enable-imap \
218 - $(use_enable ldap) \
219 - $(use_enable ldap ldaps) \
220 - --disable-ntlm-wb \
221 - --enable-pop3 \
222 - --enable-rt \
223 - --enable-rtsp \
224 - $(use_enable samba smb) \
225 - $(use_with ssh libssh2) \
226 - --enable-smtp \
227 - --enable-telnet \
228 - --enable-tftp \
229 - --enable-tls-srp \
230 - $(use_enable adns ares) \
231 - --enable-cookies \
232 - --enable-hidden-symbols \
233 - $(use_enable ipv6) \
234 - --enable-largefile \
235 - --without-libpsl \
236 - --enable-manual \
237 - --enable-proxy \
238 - --disable-soname-bump \
239 - --disable-sspi \
240 - $(use_enable static-libs static) \
241 - $(use_enable threads threaded-resolver) \
242 - --disable-versioned-symbols \
243 - --without-cyassl \
244 - --without-darwinssl \
245 - $(use_with idn libidn) \
246 - $(use_with kerberos gssapi "${EPREFIX}"/usr) \
247 - $(use_with metalink libmetalink) \
248 - $(use_with http2 nghttp2) \
249 - $(use_with rtmp librtmp) \
250 - --without-spnego \
251 - --without-winidn \
252 - --with-zlib \
253 - "${myconf[@]}"
254 -
255 - if ! multilib_is_native_abi; then
256 - # avoid building the client
257 - sed -i -e '/SUBDIRS/s:src::' Makefile || die
258 - sed -i -e '/SUBDIRS/s:scripts::' Makefile || die
259 - fi
260 -}
261 -
262 -multilib_src_install_all() {
263 - einstalldocs
264 - prune_libtool_files --all
265 -
266 - rm -rf "${ED}"/etc/
267 -}
268
269 diff --git a/net-misc/curl/curl-7.49.1.ebuild b/net-misc/curl/curl-7.49.1.ebuild
270 deleted file mode 100644
271 index a45340e..00000000
272 --- a/net-misc/curl/curl-7.49.1.ebuild
273 +++ /dev/null
274 @@ -1,251 +0,0 @@
275 -# Copyright 1999-2016 Gentoo Foundation
276 -# Distributed under the terms of the GNU General Public License v2
277 -# $Id$
278 -
279 -EAPI="5"
280 -
281 -inherit autotools eutils prefix multilib-minimal
282 -
283 -DESCRIPTION="A Client that groks URLs"
284 -HOMEPAGE="https://curl.haxx.se/"
285 -SRC_URI="https://curl.haxx.se/download/${P}.tar.bz2"
286 -
287 -LICENSE="MIT"
288 -SLOT="0"
289 -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 ~hppa-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
290 -IUSE="adns http2 idn ipv6 kerberos ldap metalink rtmp samba ssh ssl static-libs test threads"
291 -IUSE+=" curl_ssl_axtls curl_ssl_gnutls curl_ssl_libressl curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_polarssl curl_ssl_winssl"
292 -IUSE+=" elibc_Winnt"
293 -
294 -#lead to lots of false negatives, bug #285669
295 -RESTRICT="test"
296 -
297 -RDEPEND="ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
298 - ssl? (
299 - curl_ssl_axtls? (
300 - net-libs/axtls[${MULTILIB_USEDEP}]
301 - app-misc/ca-certificates
302 - )
303 - curl_ssl_gnutls? (
304 - net-libs/gnutls:0=[static-libs?,${MULTILIB_USEDEP}]
305 - dev-libs/nettle:0=[${MULTILIB_USEDEP}]
306 - app-misc/ca-certificates
307 - )
308 - curl_ssl_libressl? (
309 - dev-libs/libressl:0=[static-libs?,${MULTILIB_USEDEP}]
310 - )
311 - curl_ssl_mbedtls? (
312 - net-libs/mbedtls:0=[${MULTILIB_USEDEP}]
313 - app-misc/ca-certificates
314 - )
315 - curl_ssl_openssl? (
316 - dev-libs/openssl:0=[static-libs?,${MULTILIB_USEDEP}]
317 - )
318 - curl_ssl_nss? (
319 - dev-libs/nss:0[${MULTILIB_USEDEP}]
320 - app-misc/ca-certificates
321 - )
322 - curl_ssl_polarssl? (
323 - net-libs/polarssl:0=[${MULTILIB_USEDEP}]
324 - app-misc/ca-certificates
325 - )
326 - )
327 - http2? ( net-libs/nghttp2[${MULTILIB_USEDEP}] )
328 - idn? ( net-dns/libidn:0[static-libs?,${MULTILIB_USEDEP}] )
329 - adns? ( net-dns/c-ares:0[${MULTILIB_USEDEP}] )
330 - kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
331 - metalink? ( >=media-libs/libmetalink-0.1.1[${MULTILIB_USEDEP}] )
332 - rtmp? ( media-video/rtmpdump[${MULTILIB_USEDEP}] )
333 - ssh? ( net-libs/libssh2[static-libs?,${MULTILIB_USEDEP}] )
334 - sys-libs/zlib[${MULTILIB_USEDEP}]
335 - abi_x86_32? (
336 - !<=app-emulation/emul-linux-x86-baselibs-20140508-r13
337 - !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
338 - )"
339 -
340 -# Do we need to enforce the same ssl backend for curl and rtmpdump? Bug #423303
341 -# rtmp? (
342 -# media-video/rtmpdump
343 -# curl_ssl_gnutls? ( media-video/rtmpdump[gnutls] )
344 -# curl_ssl_openssl? ( media-video/rtmpdump[-gnutls,ssl] )
345 -# )
346 -
347 -# ssl providers to be added:
348 -# fbopenssl $(use_with spnego)
349 -
350 -DEPEND="${RDEPEND}
351 - >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
352 - test? (
353 - sys-apps/diffutils
354 - dev-lang/perl
355 - )"
356 -
357 -# c-ares must be disabled for threads
358 -# only one ssl provider can be enabled
359 -REQUIRED_USE="
360 - curl_ssl_winssl? ( elibc_Winnt )
361 - threads? ( !adns )
362 - ssl? (
363 - ^^ (
364 - curl_ssl_axtls
365 - curl_ssl_gnutls
366 - curl_ssl_libressl
367 - curl_ssl_mbedtls
368 - curl_ssl_nss
369 - curl_ssl_openssl
370 - curl_ssl_polarssl
371 - curl_ssl_winssl
372 - )
373 - )"
374 -
375 -DOCS=( CHANGES README docs/FEATURES docs/INTERNALS \
376 - docs/MANUAL docs/FAQ docs/BUGS docs/CONTRIBUTE )
377 -
378 -MULTILIB_WRAPPED_HEADERS=(
379 - /usr/include/curl/curlbuild.h
380 -)
381 -
382 -MULTILIB_CHOST_TOOLS=(
383 - /usr/bin/curl-config
384 -)
385 -
386 -src_prepare() {
387 - epatch \
388 - "${FILESDIR}"/${PN}-7.30.0-prefix.patch \
389 - "${FILESDIR}"/${PN}-respect-cflags-3.patch \
390 - "${FILESDIR}"/${PN}-fix-gnutls-nettle.patch
391 -
392 - sed -i '/LD_LIBRARY_PATH=/d' configure.ac || die #382241
393 -
394 - epatch_user
395 - eprefixify curl-config.in
396 - eautoreconf
397 -}
398 -
399 -multilib_src_configure() {
400 - # We make use of the fact that later flags override earlier ones
401 - # So start with all ssl providers off until proven otherwise
402 - local myconf=()
403 - myconf+=( --without-axtls --without-gnutls --without-mbedtls --without-nss --without-polarssl --without-ssl --without-winssl )
404 - myconf+=( --without-ca-fallback --with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt )
405 - if use ssl ; then
406 - if use curl_ssl_axtls; then
407 - einfo "SSL provided by axtls"
408 - myconf+=( --with-axtls )
409 - elif use curl_ssl_gnutls; then
410 - einfo "SSL provided by gnutls"
411 - myconf+=( --with-gnutls --with-nettle )
412 - elif use curl_ssl_libressl; then
413 - einfo "SSL provided by LibreSSL"
414 - myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs )
415 - elif use curl_ssl_mbedtls; then
416 - einfo "SSL provided by mbedtls"
417 - myconf+=( --with-mbedtls )
418 - elif use curl_ssl_nss; then
419 - einfo "SSL provided by nss"
420 - myconf+=( --with-nss )
421 - elif use curl_ssl_polarssl; then
422 - einfo "SSL provided by polarssl"
423 - myconf+=( --with-polarssl )
424 - elif use curl_ssl_openssl; then
425 - einfo "SSL provided by openssl"
426 - myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs )
427 - elif use curl_ssl_winssl; then
428 - einfo "SSL provided by Windows"
429 - myconf+=( --with-winssl )
430 - else
431 - eerror "We can't be here because of REQUIRED_USE."
432 - fi
433 - else
434 - einfo "SSL disabled"
435 - fi
436 -
437 - # These configuration options are organized alphabetically
438 - # within each category. This should make it easier if we
439 - # ever decide to make any of them contingent on USE flags:
440 - # 1) protocols first. To see them all do
441 - # 'grep SUPPORT_PROTOCOLS configure.ac'
442 - # 2) --enable/disable options second.
443 - # 'grep -- --enable configure | grep Check | awk '{ print $4 }' | sort
444 - # 3) --with/without options third.
445 - # grep -- --with configure | grep Check | awk '{ print $4 }' | sort
446 - ECONF_SOURCE="${S}" \
447 - econf \
448 - --enable-crypto-auth \
449 - --enable-dict \
450 - --enable-file \
451 - --enable-ftp \
452 - --enable-gopher \
453 - --enable-http \
454 - --enable-imap \
455 - $(use_enable ldap) \
456 - $(use_enable ldap ldaps) \
457 - --disable-ntlm-wb \
458 - --enable-pop3 \
459 - --enable-rt \
460 - --enable-rtsp \
461 - $(use_enable samba smb) \
462 - $(use_with ssh libssh2) \
463 - --enable-smtp \
464 - --enable-telnet \
465 - --enable-tftp \
466 - --enable-tls-srp \
467 - $(use_enable adns ares) \
468 - --enable-cookies \
469 - --enable-hidden-symbols \
470 - $(use_enable ipv6) \
471 - --enable-largefile \
472 - --without-libpsl \
473 - --enable-manual \
474 - --enable-proxy \
475 - --disable-soname-bump \
476 - --disable-sspi \
477 - $(use_enable static-libs static) \
478 - $(use_enable threads threaded-resolver) \
479 - --disable-versioned-symbols \
480 - --without-cyassl \
481 - --without-darwinssl \
482 - $(use_with idn libidn) \
483 - $(use_with kerberos gssapi "${EPREFIX}"/usr) \
484 - $(use_with metalink libmetalink) \
485 - $(use_with http2 nghttp2) \
486 - $(use_with rtmp librtmp) \
487 - --without-spnego \
488 - --without-winidn \
489 - --with-zlib \
490 - "${myconf[@]}"
491 -
492 - if ! multilib_is_native_abi; then
493 - # avoid building the client
494 - sed -i -e '/SUBDIRS/s:src::' Makefile || die
495 - sed -i -e '/SUBDIRS/s:scripts::' Makefile || die
496 - fi
497 -
498 - # Fix up the pkg-config file to be more robust.
499 - # https://github.com/curl/curl/issues/864
500 - local priv=() libs=()
501 - # We always enable zlib.
502 - libs+=( "-lz" )
503 - priv+=( "zlib" )
504 - if use http2; then
505 - libs+=( "-lnghttp2" )
506 - priv+=( "libnghttp2" )
507 - fi
508 - if use curl_ssl_openssl; then
509 - libs+=( "-lssl" "-lcrypto" )
510 - priv+=( "openssl" )
511 - fi
512 - grep -q Requires.private libcurl.pc && die "need to update ebuild"
513 - libs=$(printf '|%s' "${libs[@]}")
514 - sed -i -r \
515 - -e "/^Libs.private/s:(${libs#|})( |$)::g" \
516 - libcurl.pc || die
517 - echo "Requires.private: ${priv[*]}" >> libcurl.pc
518 -}
519 -
520 -multilib_src_install_all() {
521 - einstalldocs
522 - prune_libtool_files --all
523 -
524 - rm -rf "${ED}"/etc/
525 -}
526
527 diff --git a/net-misc/curl/curl-7.50.0.ebuild b/net-misc/curl/curl-7.50.0.ebuild
528 deleted file mode 100644
529 index a45340e..00000000
530 --- a/net-misc/curl/curl-7.50.0.ebuild
531 +++ /dev/null
532 @@ -1,251 +0,0 @@
533 -# Copyright 1999-2016 Gentoo Foundation
534 -# Distributed under the terms of the GNU General Public License v2
535 -# $Id$
536 -
537 -EAPI="5"
538 -
539 -inherit autotools eutils prefix multilib-minimal
540 -
541 -DESCRIPTION="A Client that groks URLs"
542 -HOMEPAGE="https://curl.haxx.se/"
543 -SRC_URI="https://curl.haxx.se/download/${P}.tar.bz2"
544 -
545 -LICENSE="MIT"
546 -SLOT="0"
547 -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 ~hppa-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
548 -IUSE="adns http2 idn ipv6 kerberos ldap metalink rtmp samba ssh ssl static-libs test threads"
549 -IUSE+=" curl_ssl_axtls curl_ssl_gnutls curl_ssl_libressl curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_polarssl curl_ssl_winssl"
550 -IUSE+=" elibc_Winnt"
551 -
552 -#lead to lots of false negatives, bug #285669
553 -RESTRICT="test"
554 -
555 -RDEPEND="ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
556 - ssl? (
557 - curl_ssl_axtls? (
558 - net-libs/axtls[${MULTILIB_USEDEP}]
559 - app-misc/ca-certificates
560 - )
561 - curl_ssl_gnutls? (
562 - net-libs/gnutls:0=[static-libs?,${MULTILIB_USEDEP}]
563 - dev-libs/nettle:0=[${MULTILIB_USEDEP}]
564 - app-misc/ca-certificates
565 - )
566 - curl_ssl_libressl? (
567 - dev-libs/libressl:0=[static-libs?,${MULTILIB_USEDEP}]
568 - )
569 - curl_ssl_mbedtls? (
570 - net-libs/mbedtls:0=[${MULTILIB_USEDEP}]
571 - app-misc/ca-certificates
572 - )
573 - curl_ssl_openssl? (
574 - dev-libs/openssl:0=[static-libs?,${MULTILIB_USEDEP}]
575 - )
576 - curl_ssl_nss? (
577 - dev-libs/nss:0[${MULTILIB_USEDEP}]
578 - app-misc/ca-certificates
579 - )
580 - curl_ssl_polarssl? (
581 - net-libs/polarssl:0=[${MULTILIB_USEDEP}]
582 - app-misc/ca-certificates
583 - )
584 - )
585 - http2? ( net-libs/nghttp2[${MULTILIB_USEDEP}] )
586 - idn? ( net-dns/libidn:0[static-libs?,${MULTILIB_USEDEP}] )
587 - adns? ( net-dns/c-ares:0[${MULTILIB_USEDEP}] )
588 - kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
589 - metalink? ( >=media-libs/libmetalink-0.1.1[${MULTILIB_USEDEP}] )
590 - rtmp? ( media-video/rtmpdump[${MULTILIB_USEDEP}] )
591 - ssh? ( net-libs/libssh2[static-libs?,${MULTILIB_USEDEP}] )
592 - sys-libs/zlib[${MULTILIB_USEDEP}]
593 - abi_x86_32? (
594 - !<=app-emulation/emul-linux-x86-baselibs-20140508-r13
595 - !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
596 - )"
597 -
598 -# Do we need to enforce the same ssl backend for curl and rtmpdump? Bug #423303
599 -# rtmp? (
600 -# media-video/rtmpdump
601 -# curl_ssl_gnutls? ( media-video/rtmpdump[gnutls] )
602 -# curl_ssl_openssl? ( media-video/rtmpdump[-gnutls,ssl] )
603 -# )
604 -
605 -# ssl providers to be added:
606 -# fbopenssl $(use_with spnego)
607 -
608 -DEPEND="${RDEPEND}
609 - >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
610 - test? (
611 - sys-apps/diffutils
612 - dev-lang/perl
613 - )"
614 -
615 -# c-ares must be disabled for threads
616 -# only one ssl provider can be enabled
617 -REQUIRED_USE="
618 - curl_ssl_winssl? ( elibc_Winnt )
619 - threads? ( !adns )
620 - ssl? (
621 - ^^ (
622 - curl_ssl_axtls
623 - curl_ssl_gnutls
624 - curl_ssl_libressl
625 - curl_ssl_mbedtls
626 - curl_ssl_nss
627 - curl_ssl_openssl
628 - curl_ssl_polarssl
629 - curl_ssl_winssl
630 - )
631 - )"
632 -
633 -DOCS=( CHANGES README docs/FEATURES docs/INTERNALS \
634 - docs/MANUAL docs/FAQ docs/BUGS docs/CONTRIBUTE )
635 -
636 -MULTILIB_WRAPPED_HEADERS=(
637 - /usr/include/curl/curlbuild.h
638 -)
639 -
640 -MULTILIB_CHOST_TOOLS=(
641 - /usr/bin/curl-config
642 -)
643 -
644 -src_prepare() {
645 - epatch \
646 - "${FILESDIR}"/${PN}-7.30.0-prefix.patch \
647 - "${FILESDIR}"/${PN}-respect-cflags-3.patch \
648 - "${FILESDIR}"/${PN}-fix-gnutls-nettle.patch
649 -
650 - sed -i '/LD_LIBRARY_PATH=/d' configure.ac || die #382241
651 -
652 - epatch_user
653 - eprefixify curl-config.in
654 - eautoreconf
655 -}
656 -
657 -multilib_src_configure() {
658 - # We make use of the fact that later flags override earlier ones
659 - # So start with all ssl providers off until proven otherwise
660 - local myconf=()
661 - myconf+=( --without-axtls --without-gnutls --without-mbedtls --without-nss --without-polarssl --without-ssl --without-winssl )
662 - myconf+=( --without-ca-fallback --with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt )
663 - if use ssl ; then
664 - if use curl_ssl_axtls; then
665 - einfo "SSL provided by axtls"
666 - myconf+=( --with-axtls )
667 - elif use curl_ssl_gnutls; then
668 - einfo "SSL provided by gnutls"
669 - myconf+=( --with-gnutls --with-nettle )
670 - elif use curl_ssl_libressl; then
671 - einfo "SSL provided by LibreSSL"
672 - myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs )
673 - elif use curl_ssl_mbedtls; then
674 - einfo "SSL provided by mbedtls"
675 - myconf+=( --with-mbedtls )
676 - elif use curl_ssl_nss; then
677 - einfo "SSL provided by nss"
678 - myconf+=( --with-nss )
679 - elif use curl_ssl_polarssl; then
680 - einfo "SSL provided by polarssl"
681 - myconf+=( --with-polarssl )
682 - elif use curl_ssl_openssl; then
683 - einfo "SSL provided by openssl"
684 - myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs )
685 - elif use curl_ssl_winssl; then
686 - einfo "SSL provided by Windows"
687 - myconf+=( --with-winssl )
688 - else
689 - eerror "We can't be here because of REQUIRED_USE."
690 - fi
691 - else
692 - einfo "SSL disabled"
693 - fi
694 -
695 - # These configuration options are organized alphabetically
696 - # within each category. This should make it easier if we
697 - # ever decide to make any of them contingent on USE flags:
698 - # 1) protocols first. To see them all do
699 - # 'grep SUPPORT_PROTOCOLS configure.ac'
700 - # 2) --enable/disable options second.
701 - # 'grep -- --enable configure | grep Check | awk '{ print $4 }' | sort
702 - # 3) --with/without options third.
703 - # grep -- --with configure | grep Check | awk '{ print $4 }' | sort
704 - ECONF_SOURCE="${S}" \
705 - econf \
706 - --enable-crypto-auth \
707 - --enable-dict \
708 - --enable-file \
709 - --enable-ftp \
710 - --enable-gopher \
711 - --enable-http \
712 - --enable-imap \
713 - $(use_enable ldap) \
714 - $(use_enable ldap ldaps) \
715 - --disable-ntlm-wb \
716 - --enable-pop3 \
717 - --enable-rt \
718 - --enable-rtsp \
719 - $(use_enable samba smb) \
720 - $(use_with ssh libssh2) \
721 - --enable-smtp \
722 - --enable-telnet \
723 - --enable-tftp \
724 - --enable-tls-srp \
725 - $(use_enable adns ares) \
726 - --enable-cookies \
727 - --enable-hidden-symbols \
728 - $(use_enable ipv6) \
729 - --enable-largefile \
730 - --without-libpsl \
731 - --enable-manual \
732 - --enable-proxy \
733 - --disable-soname-bump \
734 - --disable-sspi \
735 - $(use_enable static-libs static) \
736 - $(use_enable threads threaded-resolver) \
737 - --disable-versioned-symbols \
738 - --without-cyassl \
739 - --without-darwinssl \
740 - $(use_with idn libidn) \
741 - $(use_with kerberos gssapi "${EPREFIX}"/usr) \
742 - $(use_with metalink libmetalink) \
743 - $(use_with http2 nghttp2) \
744 - $(use_with rtmp librtmp) \
745 - --without-spnego \
746 - --without-winidn \
747 - --with-zlib \
748 - "${myconf[@]}"
749 -
750 - if ! multilib_is_native_abi; then
751 - # avoid building the client
752 - sed -i -e '/SUBDIRS/s:src::' Makefile || die
753 - sed -i -e '/SUBDIRS/s:scripts::' Makefile || die
754 - fi
755 -
756 - # Fix up the pkg-config file to be more robust.
757 - # https://github.com/curl/curl/issues/864
758 - local priv=() libs=()
759 - # We always enable zlib.
760 - libs+=( "-lz" )
761 - priv+=( "zlib" )
762 - if use http2; then
763 - libs+=( "-lnghttp2" )
764 - priv+=( "libnghttp2" )
765 - fi
766 - if use curl_ssl_openssl; then
767 - libs+=( "-lssl" "-lcrypto" )
768 - priv+=( "openssl" )
769 - fi
770 - grep -q Requires.private libcurl.pc && die "need to update ebuild"
771 - libs=$(printf '|%s' "${libs[@]}")
772 - sed -i -r \
773 - -e "/^Libs.private/s:(${libs#|})( |$)::g" \
774 - libcurl.pc || die
775 - echo "Requires.private: ${priv[*]}" >> libcurl.pc
776 -}
777 -
778 -multilib_src_install_all() {
779 - einstalldocs
780 - prune_libtool_files --all
781 -
782 - rm -rf "${ED}"/etc/
783 -}
784
785 diff --git a/net-misc/curl/curl-7.50.1.ebuild b/net-misc/curl/curl-7.50.1.ebuild
786 deleted file mode 100644
787 index d45c41e..00000000
788 --- a/net-misc/curl/curl-7.50.1.ebuild
789 +++ /dev/null
790 @@ -1,251 +0,0 @@
791 -# Copyright 1999-2016 Gentoo Foundation
792 -# Distributed under the terms of the GNU General Public License v2
793 -# $Id$
794 -
795 -EAPI="5"
796 -
797 -inherit autotools eutils prefix multilib-minimal
798 -
799 -DESCRIPTION="A Client that groks URLs"
800 -HOMEPAGE="https://curl.haxx.se/"
801 -SRC_URI="https://curl.haxx.se/download/${P}.tar.bz2"
802 -
803 -LICENSE="MIT"
804 -SLOT="0"
805 -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 ~hppa-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
806 -IUSE="adns http2 idn ipv6 kerberos ldap metalink rtmp samba ssh ssl static-libs test threads"
807 -IUSE+=" curl_ssl_axtls curl_ssl_gnutls curl_ssl_libressl curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_polarssl curl_ssl_winssl"
808 -IUSE+=" elibc_Winnt"
809 -
810 -#lead to lots of false negatives, bug #285669
811 -RESTRICT="test"
812 -
813 -RDEPEND="ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
814 - ssl? (
815 - curl_ssl_axtls? (
816 - net-libs/axtls[${MULTILIB_USEDEP}]
817 - app-misc/ca-certificates
818 - )
819 - curl_ssl_gnutls? (
820 - net-libs/gnutls:0=[static-libs?,${MULTILIB_USEDEP}]
821 - dev-libs/nettle:0=[${MULTILIB_USEDEP}]
822 - app-misc/ca-certificates
823 - )
824 - curl_ssl_libressl? (
825 - dev-libs/libressl:0=[static-libs?,${MULTILIB_USEDEP}]
826 - )
827 - curl_ssl_mbedtls? (
828 - net-libs/mbedtls:0=[${MULTILIB_USEDEP}]
829 - app-misc/ca-certificates
830 - )
831 - curl_ssl_openssl? (
832 - dev-libs/openssl:0=[static-libs?,${MULTILIB_USEDEP}]
833 - )
834 - curl_ssl_nss? (
835 - dev-libs/nss:0[${MULTILIB_USEDEP}]
836 - app-misc/ca-certificates
837 - )
838 - curl_ssl_polarssl? (
839 - net-libs/polarssl:0=[${MULTILIB_USEDEP}]
840 - app-misc/ca-certificates
841 - )
842 - )
843 - http2? ( net-libs/nghttp2[${MULTILIB_USEDEP}] )
844 - idn? ( net-dns/libidn:0[static-libs?,${MULTILIB_USEDEP}] )
845 - adns? ( net-dns/c-ares:0[${MULTILIB_USEDEP}] )
846 - kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
847 - metalink? ( >=media-libs/libmetalink-0.1.1[${MULTILIB_USEDEP}] )
848 - rtmp? ( media-video/rtmpdump[${MULTILIB_USEDEP}] )
849 - ssh? ( net-libs/libssh2[static-libs?,${MULTILIB_USEDEP}] )
850 - sys-libs/zlib[${MULTILIB_USEDEP}]
851 - abi_x86_32? (
852 - !<=app-emulation/emul-linux-x86-baselibs-20140508-r13
853 - !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
854 - )"
855 -
856 -# Do we need to enforce the same ssl backend for curl and rtmpdump? Bug #423303
857 -# rtmp? (
858 -# media-video/rtmpdump
859 -# curl_ssl_gnutls? ( media-video/rtmpdump[gnutls] )
860 -# curl_ssl_openssl? ( media-video/rtmpdump[-gnutls,ssl] )
861 -# )
862 -
863 -# ssl providers to be added:
864 -# fbopenssl $(use_with spnego)
865 -
866 -DEPEND="${RDEPEND}
867 - >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
868 - test? (
869 - sys-apps/diffutils
870 - dev-lang/perl
871 - )"
872 -
873 -# c-ares must be disabled for threads
874 -# only one ssl provider can be enabled
875 -REQUIRED_USE="
876 - curl_ssl_winssl? ( elibc_Winnt )
877 - threads? ( !adns )
878 - ssl? (
879 - ^^ (
880 - curl_ssl_axtls
881 - curl_ssl_gnutls
882 - curl_ssl_libressl
883 - curl_ssl_mbedtls
884 - curl_ssl_nss
885 - curl_ssl_openssl
886 - curl_ssl_polarssl
887 - curl_ssl_winssl
888 - )
889 - )"
890 -
891 -DOCS=( CHANGES README docs/FEATURES docs/INTERNALS \
892 - docs/MANUAL docs/FAQ docs/BUGS docs/CONTRIBUTE )
893 -
894 -MULTILIB_WRAPPED_HEADERS=(
895 - /usr/include/curl/curlbuild.h
896 -)
897 -
898 -MULTILIB_CHOST_TOOLS=(
899 - /usr/bin/curl-config
900 -)
901 -
902 -src_prepare() {
903 - epatch \
904 - "${FILESDIR}"/${PN}-7.30.0-prefix.patch \
905 - "${FILESDIR}"/${PN}-respect-cflags-3.patch \
906 - "${FILESDIR}"/${PN}-fix-gnutls-nettle.patch
907 -
908 - sed -i '/LD_LIBRARY_PATH=/d' configure.ac || die #382241
909 -
910 - epatch_user
911 - eprefixify curl-config.in
912 - eautoreconf
913 -}
914 -
915 -multilib_src_configure() {
916 - # We make use of the fact that later flags override earlier ones
917 - # So start with all ssl providers off until proven otherwise
918 - local myconf=()
919 - myconf+=( --without-axtls --without-gnutls --without-mbedtls --without-nss --without-polarssl --without-ssl --without-winssl )
920 - myconf+=( --without-ca-fallback --with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt )
921 - if use ssl ; then
922 - if use curl_ssl_axtls; then
923 - einfo "SSL provided by axtls"
924 - myconf+=( --with-axtls )
925 - elif use curl_ssl_gnutls; then
926 - einfo "SSL provided by gnutls"
927 - myconf+=( --with-gnutls --with-nettle )
928 - elif use curl_ssl_libressl; then
929 - einfo "SSL provided by LibreSSL"
930 - myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs )
931 - elif use curl_ssl_mbedtls; then
932 - einfo "SSL provided by mbedtls"
933 - myconf+=( --with-mbedtls )
934 - elif use curl_ssl_nss; then
935 - einfo "SSL provided by nss"
936 - myconf+=( --with-nss )
937 - elif use curl_ssl_polarssl; then
938 - einfo "SSL provided by polarssl"
939 - myconf+=( --with-polarssl )
940 - elif use curl_ssl_openssl; then
941 - einfo "SSL provided by openssl"
942 - myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs )
943 - elif use curl_ssl_winssl; then
944 - einfo "SSL provided by Windows"
945 - myconf+=( --with-winssl )
946 - else
947 - eerror "We can't be here because of REQUIRED_USE."
948 - fi
949 - else
950 - einfo "SSL disabled"
951 - fi
952 -
953 - # These configuration options are organized alphabetically
954 - # within each category. This should make it easier if we
955 - # ever decide to make any of them contingent on USE flags:
956 - # 1) protocols first. To see them all do
957 - # 'grep SUPPORT_PROTOCOLS configure.ac'
958 - # 2) --enable/disable options second.
959 - # 'grep -- --enable configure | grep Check | awk '{ print $4 }' | sort
960 - # 3) --with/without options third.
961 - # grep -- --with configure | grep Check | awk '{ print $4 }' | sort
962 - ECONF_SOURCE="${S}" \
963 - econf \
964 - --enable-crypto-auth \
965 - --enable-dict \
966 - --enable-file \
967 - --enable-ftp \
968 - --enable-gopher \
969 - --enable-http \
970 - --enable-imap \
971 - $(use_enable ldap) \
972 - $(use_enable ldap ldaps) \
973 - --disable-ntlm-wb \
974 - --enable-pop3 \
975 - --enable-rt \
976 - --enable-rtsp \
977 - $(use_enable samba smb) \
978 - $(use_with ssh libssh2) \
979 - --enable-smtp \
980 - --enable-telnet \
981 - --enable-tftp \
982 - --enable-tls-srp \
983 - $(use_enable adns ares) \
984 - --enable-cookies \
985 - --enable-hidden-symbols \
986 - $(use_enable ipv6) \
987 - --enable-largefile \
988 - --without-libpsl \
989 - --enable-manual \
990 - --enable-proxy \
991 - --disable-soname-bump \
992 - --disable-sspi \
993 - $(use_enable static-libs static) \
994 - $(use_enable threads threaded-resolver) \
995 - --disable-versioned-symbols \
996 - --without-cyassl \
997 - --without-darwinssl \
998 - $(use_with idn libidn) \
999 - $(use_with kerberos gssapi "${EPREFIX}"/usr) \
1000 - $(use_with metalink libmetalink) \
1001 - $(use_with http2 nghttp2) \
1002 - $(use_with rtmp librtmp) \
1003 - --without-spnego \
1004 - --without-winidn \
1005 - --with-zlib \
1006 - "${myconf[@]}"
1007 -
1008 - if ! multilib_is_native_abi; then
1009 - # avoid building the client
1010 - sed -i -e '/SUBDIRS/s:src::' Makefile || die
1011 - sed -i -e '/SUBDIRS/s:scripts::' Makefile || die
1012 - fi
1013 -
1014 - # Fix up the pkg-config file to be more robust.
1015 - # https://github.com/curl/curl/issues/864
1016 - local priv=() libs=()
1017 - # We always enable zlib.
1018 - libs+=( "-lz" )
1019 - priv+=( "zlib" )
1020 - if use http2; then
1021 - libs+=( "-lnghttp2" )
1022 - priv+=( "libnghttp2" )
1023 - fi
1024 - if use curl_ssl_openssl; then
1025 - libs+=( "-lssl" "-lcrypto" )
1026 - priv+=( "openssl" )
1027 - fi
1028 - grep -q Requires.private libcurl.pc && die "need to update ebuild"
1029 - libs=$(printf '|%s' "${libs[@]}")
1030 - sed -i -r \
1031 - -e "/^Libs.private/s:(${libs#|})( |$)::g" \
1032 - libcurl.pc || die
1033 - echo "Requires.private: ${priv[*]}" >> libcurl.pc
1034 -}
1035 -
1036 -multilib_src_install_all() {
1037 - einstalldocs
1038 - prune_libtool_files --all
1039 -
1040 - rm -rf "${ED}"/etc/
1041 -}
1042
1043 diff --git a/net-misc/curl/curl-7.50.2.ebuild b/net-misc/curl/curl-7.50.2.ebuild
1044 deleted file mode 100644
1045 index 243c05e..00000000
1046 --- a/net-misc/curl/curl-7.50.2.ebuild
1047 +++ /dev/null
1048 @@ -1,251 +0,0 @@
1049 -# Copyright 1999-2016 Gentoo Foundation
1050 -# Distributed under the terms of the GNU General Public License v2
1051 -# $Id$
1052 -
1053 -EAPI="5"
1054 -
1055 -inherit autotools eutils prefix multilib-minimal
1056 -
1057 -DESCRIPTION="A Client that groks URLs"
1058 -HOMEPAGE="https://curl.haxx.se/"
1059 -SRC_URI="https://curl.haxx.se/download/${P}.tar.bz2"
1060 -
1061 -LICENSE="MIT"
1062 -SLOT="0"
1063 -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 ~hppa-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
1064 -IUSE="adns http2 idn ipv6 kerberos ldap metalink rtmp samba ssh ssl static-libs test threads"
1065 -IUSE+=" curl_ssl_axtls curl_ssl_gnutls curl_ssl_libressl curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_polarssl curl_ssl_winssl"
1066 -IUSE+=" elibc_Winnt"
1067 -
1068 -#lead to lots of false negatives, bug #285669
1069 -RESTRICT="test"
1070 -
1071 -RDEPEND="ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
1072 - ssl? (
1073 - curl_ssl_axtls? (
1074 - net-libs/axtls[${MULTILIB_USEDEP}]
1075 - app-misc/ca-certificates
1076 - )
1077 - curl_ssl_gnutls? (
1078 - net-libs/gnutls:0=[static-libs?,${MULTILIB_USEDEP}]
1079 - dev-libs/nettle:0=[${MULTILIB_USEDEP}]
1080 - app-misc/ca-certificates
1081 - )
1082 - curl_ssl_libressl? (
1083 - dev-libs/libressl:0=[static-libs?,${MULTILIB_USEDEP}]
1084 - )
1085 - curl_ssl_mbedtls? (
1086 - net-libs/mbedtls:0=[${MULTILIB_USEDEP}]
1087 - app-misc/ca-certificates
1088 - )
1089 - curl_ssl_openssl? (
1090 - dev-libs/openssl:0=[static-libs?,${MULTILIB_USEDEP}]
1091 - )
1092 - curl_ssl_nss? (
1093 - dev-libs/nss:0[${MULTILIB_USEDEP}]
1094 - app-misc/ca-certificates
1095 - )
1096 - curl_ssl_polarssl? (
1097 - net-libs/polarssl:0=[${MULTILIB_USEDEP}]
1098 - app-misc/ca-certificates
1099 - )
1100 - )
1101 - http2? ( net-libs/nghttp2[${MULTILIB_USEDEP}] )
1102 - idn? ( net-dns/libidn:0[static-libs?,${MULTILIB_USEDEP}] )
1103 - adns? ( net-dns/c-ares:0[${MULTILIB_USEDEP}] )
1104 - kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
1105 - metalink? ( >=media-libs/libmetalink-0.1.1[${MULTILIB_USEDEP}] )
1106 - rtmp? ( media-video/rtmpdump[${MULTILIB_USEDEP}] )
1107 - ssh? ( net-libs/libssh2[static-libs?,${MULTILIB_USEDEP}] )
1108 - sys-libs/zlib[${MULTILIB_USEDEP}]
1109 - abi_x86_32? (
1110 - !<=app-emulation/emul-linux-x86-baselibs-20140508-r13
1111 - !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
1112 - )"
1113 -
1114 -# Do we need to enforce the same ssl backend for curl and rtmpdump? Bug #423303
1115 -# rtmp? (
1116 -# media-video/rtmpdump
1117 -# curl_ssl_gnutls? ( media-video/rtmpdump[gnutls] )
1118 -# curl_ssl_openssl? ( media-video/rtmpdump[-gnutls,ssl] )
1119 -# )
1120 -
1121 -# ssl providers to be added:
1122 -# fbopenssl $(use_with spnego)
1123 -
1124 -DEPEND="${RDEPEND}
1125 - >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
1126 - test? (
1127 - sys-apps/diffutils
1128 - dev-lang/perl
1129 - )"
1130 -
1131 -# c-ares must be disabled for threads
1132 -# only one ssl provider can be enabled
1133 -REQUIRED_USE="
1134 - curl_ssl_winssl? ( elibc_Winnt )
1135 - threads? ( !adns )
1136 - ssl? (
1137 - ^^ (
1138 - curl_ssl_axtls
1139 - curl_ssl_gnutls
1140 - curl_ssl_libressl
1141 - curl_ssl_mbedtls
1142 - curl_ssl_nss
1143 - curl_ssl_openssl
1144 - curl_ssl_polarssl
1145 - curl_ssl_winssl
1146 - )
1147 - )"
1148 -
1149 -DOCS=( CHANGES README docs/FEATURES docs/INTERNALS.md \
1150 - docs/MANUAL docs/FAQ docs/BUGS docs/CONTRIBUTE.md )
1151 -
1152 -MULTILIB_WRAPPED_HEADERS=(
1153 - /usr/include/curl/curlbuild.h
1154 -)
1155 -
1156 -MULTILIB_CHOST_TOOLS=(
1157 - /usr/bin/curl-config
1158 -)
1159 -
1160 -src_prepare() {
1161 - epatch \
1162 - "${FILESDIR}"/${PN}-7.30.0-prefix.patch \
1163 - "${FILESDIR}"/${PN}-respect-cflags-3.patch \
1164 - "${FILESDIR}"/${PN}-fix-gnutls-nettle.patch
1165 -
1166 - sed -i '/LD_LIBRARY_PATH=/d' configure.ac || die #382241
1167 -
1168 - epatch_user
1169 - eprefixify curl-config.in
1170 - eautoreconf
1171 -}
1172 -
1173 -multilib_src_configure() {
1174 - # We make use of the fact that later flags override earlier ones
1175 - # So start with all ssl providers off until proven otherwise
1176 - local myconf=()
1177 - myconf+=( --without-axtls --without-gnutls --without-mbedtls --without-nss --without-polarssl --without-ssl --without-winssl )
1178 - myconf+=( --without-ca-fallback --with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt )
1179 - if use ssl ; then
1180 - if use curl_ssl_axtls; then
1181 - einfo "SSL provided by axtls"
1182 - myconf+=( --with-axtls )
1183 - elif use curl_ssl_gnutls; then
1184 - einfo "SSL provided by gnutls"
1185 - myconf+=( --with-gnutls --with-nettle )
1186 - elif use curl_ssl_libressl; then
1187 - einfo "SSL provided by LibreSSL"
1188 - myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs )
1189 - elif use curl_ssl_mbedtls; then
1190 - einfo "SSL provided by mbedtls"
1191 - myconf+=( --with-mbedtls )
1192 - elif use curl_ssl_nss; then
1193 - einfo "SSL provided by nss"
1194 - myconf+=( --with-nss )
1195 - elif use curl_ssl_polarssl; then
1196 - einfo "SSL provided by polarssl"
1197 - myconf+=( --with-polarssl )
1198 - elif use curl_ssl_openssl; then
1199 - einfo "SSL provided by openssl"
1200 - myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs )
1201 - elif use curl_ssl_winssl; then
1202 - einfo "SSL provided by Windows"
1203 - myconf+=( --with-winssl )
1204 - else
1205 - eerror "We can't be here because of REQUIRED_USE."
1206 - fi
1207 - else
1208 - einfo "SSL disabled"
1209 - fi
1210 -
1211 - # These configuration options are organized alphabetically
1212 - # within each category. This should make it easier if we
1213 - # ever decide to make any of them contingent on USE flags:
1214 - # 1) protocols first. To see them all do
1215 - # 'grep SUPPORT_PROTOCOLS configure.ac'
1216 - # 2) --enable/disable options second.
1217 - # 'grep -- --enable configure | grep Check | awk '{ print $4 }' | sort
1218 - # 3) --with/without options third.
1219 - # grep -- --with configure | grep Check | awk '{ print $4 }' | sort
1220 - ECONF_SOURCE="${S}" \
1221 - econf \
1222 - --enable-crypto-auth \
1223 - --enable-dict \
1224 - --enable-file \
1225 - --enable-ftp \
1226 - --enable-gopher \
1227 - --enable-http \
1228 - --enable-imap \
1229 - $(use_enable ldap) \
1230 - $(use_enable ldap ldaps) \
1231 - --disable-ntlm-wb \
1232 - --enable-pop3 \
1233 - --enable-rt \
1234 - --enable-rtsp \
1235 - $(use_enable samba smb) \
1236 - $(use_with ssh libssh2) \
1237 - --enable-smtp \
1238 - --enable-telnet \
1239 - --enable-tftp \
1240 - --enable-tls-srp \
1241 - $(use_enable adns ares) \
1242 - --enable-cookies \
1243 - --enable-hidden-symbols \
1244 - $(use_enable ipv6) \
1245 - --enable-largefile \
1246 - --without-libpsl \
1247 - --enable-manual \
1248 - --enable-proxy \
1249 - --disable-soname-bump \
1250 - --disable-sspi \
1251 - $(use_enable static-libs static) \
1252 - $(use_enable threads threaded-resolver) \
1253 - --disable-versioned-symbols \
1254 - --without-cyassl \
1255 - --without-darwinssl \
1256 - $(use_with idn libidn) \
1257 - $(use_with kerberos gssapi "${EPREFIX}"/usr) \
1258 - $(use_with metalink libmetalink) \
1259 - $(use_with http2 nghttp2) \
1260 - $(use_with rtmp librtmp) \
1261 - --without-spnego \
1262 - --without-winidn \
1263 - --with-zlib \
1264 - "${myconf[@]}"
1265 -
1266 - if ! multilib_is_native_abi; then
1267 - # avoid building the client
1268 - sed -i -e '/SUBDIRS/s:src::' Makefile || die
1269 - sed -i -e '/SUBDIRS/s:scripts::' Makefile || die
1270 - fi
1271 -
1272 - # Fix up the pkg-config file to be more robust.
1273 - # https://github.com/curl/curl/issues/864
1274 - local priv=() libs=()
1275 - # We always enable zlib.
1276 - libs+=( "-lz" )
1277 - priv+=( "zlib" )
1278 - if use http2; then
1279 - libs+=( "-lnghttp2" )
1280 - priv+=( "libnghttp2" )
1281 - fi
1282 - if use curl_ssl_openssl; then
1283 - libs+=( "-lssl" "-lcrypto" )
1284 - priv+=( "openssl" )
1285 - fi
1286 - grep -q Requires.private libcurl.pc && die "need to update ebuild"
1287 - libs=$(printf '|%s' "${libs[@]}")
1288 - sed -i -r \
1289 - -e "/^Libs.private/s:(${libs#|})( |$)::g" \
1290 - libcurl.pc || die
1291 - echo "Requires.private: ${priv[*]}" >> libcurl.pc
1292 -}
1293 -
1294 -multilib_src_install_all() {
1295 - einstalldocs
1296 - prune_libtool_files --all
1297 -
1298 - rm -rf "${ED}"/etc/
1299 -}