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, 01 Sep 2022 14:05:28
Message-Id: 1662041118.2a1bfcbd5d722a1f7aee9d91f7c3a173c6773849.blueness@gentoo
1 commit: 2a1bfcbd5d722a1f7aee9d91f7c3a173c6773849
2 Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
3 AuthorDate: Thu Sep 1 14:04:47 2022 +0000
4 Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
5 CommitDate: Thu Sep 1 14:05:18 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a1bfcbd
7
8 net-misc/curl: cleanup older stable versions
9
10 Package-Manager: Portage-3.0.30, Repoman-3.0.3
11 Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>
12
13 net-misc/curl/Manifest | 4 -
14 net-misc/curl/curl-7.79.1-r1.ebuild | 293 ------------------------------------
15 net-misc/curl/curl-7.83.1.ebuild | 288 -----------------------------------
16 net-misc/curl/metadata.xml | 1 -
17 4 files changed, 586 deletions(-)
18
19 diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
20 index ade38f0e36d0..a31545ac99db 100644
21 --- a/net-misc/curl/Manifest
22 +++ b/net-misc/curl/Manifest
23 @@ -1,7 +1,3 @@
24 -DIST curl-7.79.1.tar.xz 2465212 BLAKE2B 2b694f96661c0aa0a136fdae4159e0ca8e811557c5a1f0b47cccaaad122f3ddbdaa6450c3835290955baf9357e872ee105a8cb0912064af3d3e38d16beb124ad SHA512 1edb71647a7f4dbb070baf1a019b4751aefeda793ff523c504410bb5cc74e5bffc52f20dd889697d1585f9ca3c4e81b1a9caadd182c30c8358ffd25f33e4db4d
25 -DIST curl-7.79.1.tar.xz.asc 488 BLAKE2B cf1864b15ee4b47a61a03968c4fd9526d4c8d0c5a8a0a1357de61758640e6dfda57334df1e63afd94c0064b7e61527623dd20446b27fa0130e0bf92c647d9820 SHA512 4f7930fde0a21358cf0bd8d5cbde5a05efc34202265b4744e59f49d9dc269987f47b4ead77c33e2ae03acabd7b6d6a731c69b91999eea70542f49d9ea0c2ba94
26 -DIST curl-7.83.1.tar.xz 2474940 BLAKE2B 491427b12f082c2246ef6cb2a129340079db28bd93b4381889e7328bef1d61a79bb57cba4b8372759baa4f6e77644966ed95cfa8f839ee9db634786757fb1ce0 SHA512 2f63327d6d3687ba36fb7b8d5d3d15599eca33ebfb08681613612ea9c4b629d3b6ce4d2742fa1ebd7a997ed332001d3a4c798985f9277c83b9e7a9aecdb1b1ee
27 -DIST curl-7.83.1.tar.xz.asc 488 BLAKE2B 78f7a6d9a32cab97e9ce26430eb2be2bc4e20552cf8c59238f30f127e9d7af5b4f9808c3fe0846c18c8f7a67b49f2f75d865d17b7760bb664872934799949441 SHA512 f0d29de315488c844eb81ed5a89ed6334910970224c8cac43e7e6f2d58c35ad0064c0b6122e69b3a34ce91f4b56873c63e2e8aea1c602ef40711bfd62a01b191
28 DIST curl-7.84.0.tar.xz 2477944 BLAKE2B 811a63285f39a598bc4fd73ae4b8e23e5146b93dcf3eea805345792b7dddd85bbd54240d9871a0dc9f058d58fd7ea7f4efbcb82727218e8afaaae3600bad55e1 SHA512 86231866a35593a1637fbc0c6af3b6761bdfd99fb35580cc52970c36f19604f93dce59fea67a1d5bb4b455f719307599c7916c77d14f2b661f6bf7fb1ca716ce
29 DIST curl-7.84.0.tar.xz.asc 488 BLAKE2B d74dea89fa89b6ed0a928e01987669f7dde0bcbb30423ea0f3af9f31eea1e059d458629d80455d772264d744fab236d4f506545afa1bfbd6ded7e2b27192a7c8 SHA512 80ff5274277ad97448fa53511bab6e8a1c302bcb25fc0916d78b8dc6c6af43d944c37c4ed46668b651cc639ec4964780725117ca0e85168ea66ad7cc98d29702
30 DIST curl-7.85.0.tar.xz 2480648 BLAKE2B 7d0e0212541c05352040391b400e0314e0d38a96b199dfd70ccaaca3fd7f809b7ed96b877c4663c06fc05c483468521458255dcf025226f1bdf4d6c9dd9b8873 SHA512 b57cc31649a4f47cc4b482f56a85c86c8e8aaeaf01bc1b51b065fdb9145a9092bc52535e52a85a66432eb163605b2edbf5bc5c33ea6e40e50f26a69ad1365cbd
31
32 diff --git a/net-misc/curl/curl-7.79.1-r1.ebuild b/net-misc/curl/curl-7.79.1-r1.ebuild
33 deleted file mode 100644
34 index ac8292e30cfe..000000000000
35 --- a/net-misc/curl/curl-7.79.1-r1.ebuild
36 +++ /dev/null
37 @@ -1,293 +0,0 @@
38 -# Copyright 1999-2022 Gentoo Authors
39 -# Distributed under the terms of the GNU General Public License v2
40 -
41 -EAPI="7"
42 -
43 -inherit autotools prefix multilib-minimal verify-sig
44 -
45 -DESCRIPTION="A Client that groks URLs"
46 -HOMEPAGE="https://curl.haxx.se/"
47 -SRC_URI="https://curl.haxx.se/download/${P}.tar.xz
48 - verify-sig? ( https://curl.haxx.se/download/${P}.tar.xz.asc )"
49 -
50 -LICENSE="curl"
51 -SLOT="0"
52 -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
53 -IUSE="adns alt-svc brotli +ftp gnutls gopher hsts +http2 idn +imap ipv6 kerberos ldap mbedtls nss +openssl +pop3 +progress-meter rtmp samba +smtp ssh ssl sslv3 static-libs test telnet +tftp threads winssl zstd"
54 -IUSE+=" curl_ssl_gnutls curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_winssl"
55 -IUSE+=" nghttp3 quiche"
56 -VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/danielstenberg.asc
57 -
58 -# c-ares must be disabled for threads
59 -# only one default ssl provider can be enabled
60 -REQUIRED_USE="
61 - winssl? ( elibc_Winnt )
62 - threads? ( !adns )
63 - ssl? (
64 - ^^ (
65 - curl_ssl_gnutls
66 - curl_ssl_mbedtls
67 - curl_ssl_nss
68 - curl_ssl_openssl
69 - curl_ssl_winssl
70 - )
71 - )"
72 -
73 -# lead to lots of false negatives, bug #285669
74 -RESTRICT="!test? ( test )"
75 -
76 -RDEPEND="ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] )
77 - brotli? ( app-arch/brotli:=[${MULTILIB_USEDEP}] )
78 - ssl? (
79 - gnutls? (
80 - net-libs/gnutls:0=[static-libs?,${MULTILIB_USEDEP}]
81 - dev-libs/nettle:0=[${MULTILIB_USEDEP}]
82 - app-misc/ca-certificates
83 - )
84 - mbedtls? (
85 - net-libs/mbedtls:0=[${MULTILIB_USEDEP}]
86 - app-misc/ca-certificates
87 - )
88 - openssl? (
89 - dev-libs/openssl:0=[sslv3(-)=,static-libs?,${MULTILIB_USEDEP}]
90 - )
91 - nss? (
92 - dev-libs/nss:0[${MULTILIB_USEDEP}]
93 - app-misc/ca-certificates
94 - )
95 - )
96 - http2? ( net-libs/nghttp2:=[${MULTILIB_USEDEP}] )
97 - nghttp3? (
98 - net-libs/nghttp3[${MULTILIB_USEDEP}]
99 - net-libs/ngtcp2[ssl,${MULTILIB_USEDEP}]
100 - )
101 - quiche? ( >=net-libs/quiche-0.3.0[${MULTILIB_USEDEP}] )
102 - idn? ( net-dns/libidn2:0=[static-libs?,${MULTILIB_USEDEP}] )
103 - adns? ( net-dns/c-ares:0=[${MULTILIB_USEDEP}] )
104 - kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
105 - rtmp? ( media-video/rtmpdump[${MULTILIB_USEDEP}] )
106 - ssh? ( net-libs/libssh2[${MULTILIB_USEDEP}] )
107 - sys-libs/zlib[${MULTILIB_USEDEP}]
108 - zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )"
109 -
110 -# Do we need to enforce the same ssl backend for curl and rtmpdump? Bug #423303
111 -# rtmp? (
112 -# media-video/rtmpdump
113 -# curl_ssl_gnutls? ( media-video/rtmpdump[gnutls] )
114 -# curl_ssl_openssl? ( media-video/rtmpdump[-gnutls,ssl] )
115 -# )
116 -
117 -# ssl providers to be added:
118 -# fbopenssl $(use_with spnego)
119 -
120 -DEPEND="${RDEPEND}"
121 -BDEPEND="dev-lang/perl
122 - virtual/pkgconfig
123 - test? (
124 - sys-apps/diffutils
125 - dev-lang/perl
126 - )
127 - verify-sig? ( sec-keys/openpgp-keys-danielstenberg )"
128 -
129 -DOCS=( CHANGES README docs/{FEATURES.md,INTERNALS.md,FAQ,BUGS.md,CONTRIBUTE.md} )
130 -
131 -MULTILIB_WRAPPED_HEADERS=(
132 - /usr/include/curl/curlbuild.h
133 -)
134 -
135 -MULTILIB_CHOST_TOOLS=(
136 - /usr/bin/curl-config
137 -)
138 -
139 -PATCHES=(
140 - "${FILESDIR}"/${PN}-7.30.0-prefix.patch
141 - "${FILESDIR}"/${PN}-respect-cflags-3.patch
142 -)
143 -
144 -src_prepare() {
145 - default
146 -
147 - eprefixify curl-config.in
148 - eautoreconf
149 -}
150 -
151 -multilib_src_configure() {
152 - # We make use of the fact that later flags override earlier ones
153 - # So start with all ssl providers off until proven otherwise
154 - # TODO: in the future, we may want to add wolfssl (https://www.wolfssl.com/)
155 - local myconf=()
156 -
157 - myconf+=( --without-gnutls --without-mbedtls --without-nss --without-polarssl --without-ssl --without-winssl )
158 - myconf+=( --without-ca-fallback --with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt )
159 - #myconf+=( --without-default-ssl-backend )
160 - if use ssl ; then
161 - if use gnutls || use curl_ssl_gnutls; then
162 - einfo "SSL provided by gnutls"
163 - myconf+=( --with-gnutls --with-nettle )
164 - fi
165 - if use mbedtls || use curl_ssl_mbedtls; then
166 - einfo "SSL provided by mbedtls"
167 - myconf+=( --with-mbedtls )
168 - fi
169 - if use nss || use curl_ssl_nss; then
170 - einfo "SSL provided by nss"
171 - myconf+=( --with-nss )
172 - fi
173 - if use openssl || use curl_ssl_openssl; then
174 - einfo "SSL provided by openssl"
175 - myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs )
176 - fi
177 - if use winssl || use curl_ssl_winssl; then
178 - einfo "SSL provided by Windows"
179 - myconf+=( --with-winssl )
180 - fi
181 -
182 - if use curl_ssl_gnutls; then
183 - einfo "Default SSL provided by gnutls"
184 - myconf+=( --with-default-ssl-backend=gnutls )
185 - elif use curl_ssl_mbedtls; then
186 - einfo "Default SSL provided by mbedtls"
187 - myconf+=( --with-default-ssl-backend=mbedtls )
188 - elif use curl_ssl_nss; then
189 - einfo "Default SSL provided by nss"
190 - myconf+=( --with-default-ssl-backend=nss )
191 - elif use curl_ssl_openssl; then
192 - einfo "Default SSL provided by openssl"
193 - myconf+=( --with-default-ssl-backend=openssl )
194 - elif use curl_ssl_winssl; then
195 - einfo "Default SSL provided by Windows"
196 - myconf+=( --with-default-ssl-backend=winssl )
197 - else
198 - eerror "We can't be here because of REQUIRED_USE."
199 - fi
200 -
201 - else
202 - einfo "SSL disabled"
203 - fi
204 -
205 - # These configuration options are organized alphabetically
206 - # within each category. This should make it easier if we
207 - # ever decide to make any of them contingent on USE flags:
208 - # 1) protocols first. To see them all do
209 - # 'grep SUPPORT_PROTOCOLS configure.ac'
210 - # 2) --enable/disable options second.
211 - # 'grep -- --enable configure | grep Check | awk '{ print $4 }' | sort
212 - # 3) --with/without options third.
213 - # grep -- --with configure | grep Check | awk '{ print $4 }' | sort
214 -
215 - myconf+=(
216 - $(use_enable alt-svc)
217 - --enable-crypto-auth
218 - --enable-dict
219 - --disable-ech
220 - --enable-file
221 - $(use_enable ftp)
222 - $(use_enable gopher)
223 - $(use_enable hsts)
224 - --enable-http
225 - $(use_enable imap)
226 - $(use_enable ldap)
227 - $(use_enable ldap ldaps)
228 - --enable-ntlm
229 - --disable-ntlm-wb
230 - $(use_enable pop3)
231 - --enable-rt
232 - --enable-rtsp
233 - $(use_enable samba smb)
234 - $(use_with ssh libssh2)
235 - $(use_enable smtp)
236 - $(use_enable telnet)
237 - $(use_enable tftp)
238 - --enable-tls-srp
239 - $(use_enable adns ares)
240 - --enable-cookies
241 - --enable-dateparse
242 - --enable-dnsshuffle
243 - --enable-doh
244 - --enable-hidden-symbols
245 - --enable-http-auth
246 - $(use_enable ipv6)
247 - --enable-largefile
248 - --enable-manual
249 - --enable-mime
250 - --enable-netrc
251 - $(use_enable progress-meter)
252 - --enable-proxy
253 - --disable-sspi
254 - $(use_enable static-libs static)
255 - $(use_enable threads threaded-resolver)
256 - $(use_enable threads pthreads)
257 - --disable-versioned-symbols
258 - --without-amissl
259 - --without-bearssl
260 - $(use_with brotli)
261 - --without-cyassl
262 - --without-fish-functions-dir
263 - $(use_with http2 nghttp2)
264 - --without-hyper
265 - $(use_with idn libidn2)
266 - $(use_with kerberos gssapi "${EPREFIX}"/usr)
267 - --without-libgsasl
268 - --without-libpsl
269 - $(use_with nghttp3)
270 - $(use_with nghttp3 ngtcp2)
271 - $(use_with quiche)
272 - $(use_with rtmp librtmp)
273 - --without-rustls
274 - --without-schannel
275 - --without-secure-transport
276 - --without-spnego
277 - --without-winidn
278 - --without-wolfssl
279 - --with-zlib
280 - $(use_with zstd)
281 - )
282 -
283 - ECONF_SOURCE="${S}" \
284 - econf "${myconf[@]}"
285 -
286 - if ! multilib_is_native_abi; then
287 - # avoid building the client
288 - sed -i -e '/SUBDIRS/s:src::' Makefile || die
289 - sed -i -e '/SUBDIRS/s:scripts::' Makefile || die
290 - fi
291 -
292 - # Fix up the pkg-config file to be more robust.
293 - # https://github.com/curl/curl/issues/864
294 - local priv=() libs=()
295 - # We always enable zlib.
296 - libs+=( "-lz" )
297 - priv+=( "zlib" )
298 - if use http2; then
299 - libs+=( "-lnghttp2" )
300 - priv+=( "libnghttp2" )
301 - fi
302 - if use quiche; then
303 - libs+=( "-lquiche" )
304 - priv+=( "quiche" )
305 - fi
306 - if use nghttp3; then
307 - libs+=( "-lnghttp3" "-lngtcp2" )
308 - priv+=( "libnghttp3" "-libtcp2" )
309 - fi
310 - if use ssl && use curl_ssl_openssl; then
311 - libs+=( "-lssl" "-lcrypto" )
312 - priv+=( "openssl" )
313 - fi
314 - grep -q Requires.private libcurl.pc && die "need to update ebuild"
315 - libs=$(printf '|%s' "${libs[@]}")
316 - sed -i -r \
317 - -e "/^Libs.private/s:(${libs#|})( |$)::g" \
318 - libcurl.pc || die
319 - echo "Requires.private: ${priv[*]}" >> libcurl.pc
320 -}
321 -
322 -multilib_src_test() {
323 - multilib_is_native_abi && default_src_test
324 -}
325 -
326 -multilib_src_install_all() {
327 - einstalldocs
328 - find "${ED}" -type f -name '*.la' -delete || die
329 - rm -rf "${ED}"/etc/ || die
330 -}
331
332 diff --git a/net-misc/curl/curl-7.83.1.ebuild b/net-misc/curl/curl-7.83.1.ebuild
333 deleted file mode 100644
334 index a3fd859195dc..000000000000
335 --- a/net-misc/curl/curl-7.83.1.ebuild
336 +++ /dev/null
337 @@ -1,288 +0,0 @@
338 -# Copyright 1999-2022 Gentoo Authors
339 -# Distributed under the terms of the GNU General Public License v2
340 -
341 -EAPI="8"
342 -
343 -inherit autotools prefix multilib-minimal verify-sig
344 -
345 -DESCRIPTION="A Client that groks URLs"
346 -HOMEPAGE="https://curl.haxx.se/"
347 -SRC_URI="https://curl.haxx.se/download/${P}.tar.xz
348 - verify-sig? ( https://curl.haxx.se/download/${P}.tar.xz.asc )"
349 -
350 -LICENSE="curl"
351 -SLOT="0"
352 -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
353 -IUSE="adns alt-svc brotli +ftp gnutls gopher hsts +http2 idn +imap ipv6 kerberos ldap mbedtls nss +openssl +pop3 +progress-meter rtmp samba +smtp ssh ssl sslv3 static-libs test telnet +tftp threads zstd"
354 -IUSE+=" curl_ssl_gnutls curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl"
355 -IUSE+=" nghttp3 quiche"
356 -VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/danielstenberg.asc
357 -
358 -# c-ares must be disabled for threads
359 -# only one default ssl provider can be enabled
360 -REQUIRED_USE="
361 - threads? ( !adns )
362 - ssl? (
363 - ^^ (
364 - curl_ssl_gnutls
365 - curl_ssl_mbedtls
366 - curl_ssl_nss
367 - curl_ssl_openssl
368 - )
369 - )"
370 -
371 -# lead to lots of false negatives, bug #285669
372 -RESTRICT="!test? ( test )"
373 -
374 -RDEPEND="ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] )
375 - brotli? ( app-arch/brotli:=[${MULTILIB_USEDEP}] )
376 - ssl? (
377 - gnutls? (
378 - net-libs/gnutls:0=[static-libs?,${MULTILIB_USEDEP}]
379 - dev-libs/nettle:0=[${MULTILIB_USEDEP}]
380 - app-misc/ca-certificates
381 - )
382 - mbedtls? (
383 - net-libs/mbedtls:0=[${MULTILIB_USEDEP}]
384 - app-misc/ca-certificates
385 - )
386 - openssl? (
387 - dev-libs/openssl:0=[sslv3(-)=,static-libs?,${MULTILIB_USEDEP}]
388 - )
389 - nss? (
390 - dev-libs/nss:0[${MULTILIB_USEDEP}]
391 - app-misc/ca-certificates
392 - )
393 - )
394 - http2? ( net-libs/nghttp2:=[${MULTILIB_USEDEP}] )
395 - nghttp3? (
396 - net-libs/nghttp3[${MULTILIB_USEDEP}]
397 - net-libs/ngtcp2[ssl,${MULTILIB_USEDEP}]
398 - )
399 - quiche? ( >=net-libs/quiche-0.3.0[${MULTILIB_USEDEP}] )
400 - idn? ( net-dns/libidn2:0=[static-libs?,${MULTILIB_USEDEP}] )
401 - adns? ( net-dns/c-ares:0=[${MULTILIB_USEDEP}] )
402 - kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
403 - rtmp? ( media-video/rtmpdump[${MULTILIB_USEDEP}] )
404 - ssh? ( net-libs/libssh2[${MULTILIB_USEDEP}] )
405 - sys-libs/zlib[${MULTILIB_USEDEP}]
406 - zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )"
407 -
408 -# Do we need to enforce the same ssl backend for curl and rtmpdump? Bug #423303
409 -# rtmp? (
410 -# media-video/rtmpdump
411 -# curl_ssl_gnutls? ( media-video/rtmpdump[gnutls] )
412 -# curl_ssl_openssl? ( media-video/rtmpdump[-gnutls,ssl] )
413 -# )
414 -
415 -DEPEND="${RDEPEND}"
416 -BDEPEND="dev-lang/perl
417 - virtual/pkgconfig
418 - test? (
419 - sys-apps/diffutils
420 - )
421 - verify-sig? ( sec-keys/openpgp-keys-danielstenberg )"
422 -
423 -DOCS=( CHANGES README docs/{FEATURES.md,INTERNALS.md,FAQ,BUGS.md,CONTRIBUTE.md} )
424 -
425 -MULTILIB_WRAPPED_HEADERS=(
426 - /usr/include/curl/curlbuild.h
427 -)
428 -
429 -MULTILIB_CHOST_TOOLS=(
430 - /usr/bin/curl-config
431 -)
432 -
433 -PATCHES=(
434 - "${FILESDIR}"/${PN}-7.30.0-prefix.patch
435 - "${FILESDIR}"/${PN}-respect-cflags-3.patch
436 -)
437 -
438 -src_prepare() {
439 - default
440 -
441 - eprefixify curl-config.in
442 - eautoreconf
443 -}
444 -
445 -multilib_src_configure() {
446 - # We make use of the fact that later flags override earlier ones
447 - # So start with all ssl providers off until proven otherwise
448 - # TODO: in the future, we may want to add wolfssl (https://www.wolfssl.com/)
449 - local myconf=()
450 -
451 - myconf+=( --without-gnutls --without-mbedtls --without-nss --without-ssl )
452 - myconf+=( --without-ca-fallback --with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt )
453 - #myconf+=( --without-default-ssl-backend )
454 - if use ssl ; then
455 - if use gnutls || use curl_ssl_gnutls; then
456 - einfo "SSL provided by gnutls"
457 - myconf+=( --with-gnutls --with-nettle )
458 - fi
459 - if use mbedtls || use curl_ssl_mbedtls; then
460 - einfo "SSL provided by mbedtls"
461 - myconf+=( --with-mbedtls )
462 - fi
463 - if use nss || use curl_ssl_nss; then
464 - einfo "SSL provided by nss"
465 - myconf+=( --with-nss --with-nss-deprecated )
466 - fi
467 - if use openssl || use curl_ssl_openssl; then
468 - einfo "SSL provided by openssl"
469 - myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs )
470 - fi
471 -
472 - if use curl_ssl_gnutls; then
473 - einfo "Default SSL provided by gnutls"
474 - myconf+=( --with-default-ssl-backend=gnutls )
475 - elif use curl_ssl_mbedtls; then
476 - einfo "Default SSL provided by mbedtls"
477 - myconf+=( --with-default-ssl-backend=mbedtls )
478 - elif use curl_ssl_nss; then
479 - einfo "Default SSL provided by nss"
480 - myconf+=( --with-default-ssl-backend=nss )
481 - elif use curl_ssl_openssl; then
482 - einfo "Default SSL provided by openssl"
483 - myconf+=( --with-default-ssl-backend=openssl )
484 - else
485 - eerror "We can't be here because of REQUIRED_USE."
486 - fi
487 -
488 - else
489 - einfo "SSL disabled"
490 - fi
491 -
492 - # These configuration options are organized alphabetically
493 - # within each category. This should make it easier if we
494 - # ever decide to make any of them contingent on USE flags:
495 - # 1) protocols first. To see them all do
496 - # 'grep SUPPORT_PROTOCOLS configure.ac'
497 - # 2) --enable/disable options second.
498 - # 'grep -- --enable configure | grep Check | awk '{ print $4 }' | sort
499 - # 3) --with/without options third.
500 - # grep -- --with configure | grep Check | awk '{ print $4 }' | sort
501 -
502 - myconf+=(
503 - $(use_enable alt-svc)
504 - --enable-crypto-auth
505 - --enable-dict
506 - --disable-ech
507 - --enable-file
508 - $(use_enable ftp)
509 - $(use_enable gopher)
510 - $(use_enable hsts)
511 - --enable-http
512 - $(use_enable imap)
513 - $(use_enable ldap)
514 - $(use_enable ldap ldaps)
515 - --enable-ntlm
516 - --disable-ntlm-wb
517 - $(use_enable pop3)
518 - --enable-rt
519 - --enable-rtsp
520 - $(use_enable samba smb)
521 - $(use_with ssh libssh2)
522 - $(use_enable smtp)
523 - $(use_enable telnet)
524 - $(use_enable tftp)
525 - --enable-tls-srp
526 - $(use_enable adns ares)
527 - --enable-cookies
528 - --enable-dateparse
529 - --enable-dnsshuffle
530 - --enable-doh
531 - --enable-symbol-hiding
532 - --enable-http-auth
533 - $(use_enable ipv6)
534 - --enable-largefile
535 - --enable-manual
536 - --enable-mime
537 - --enable-netrc
538 - $(use_enable progress-meter)
539 - --enable-proxy
540 - --disable-sspi
541 - $(use_enable static-libs static)
542 - $(use_enable threads threaded-resolver)
543 - $(use_enable threads pthreads)
544 - --disable-versioned-symbols
545 - --without-amissl
546 - --without-bearssl
547 - $(use_with brotli)
548 - --without-fish-functions-dir
549 - $(use_with http2 nghttp2)
550 - --without-hyper
551 - $(use_with idn libidn2)
552 - $(use_with kerberos gssapi "${EPREFIX}"/usr)
553 - --without-libgsasl
554 - --without-libpsl
555 - --without-msh3
556 - $(use_with nghttp3)
557 - $(use_with nghttp3 ngtcp2)
558 - $(use_with quiche)
559 - $(use_with rtmp librtmp)
560 - --without-rustls
561 - --without-schannel
562 - --without-secure-transport
563 - --without-winidn
564 - --without-wolfssl
565 - --with-zlib
566 - $(use_with zstd)
567 - )
568 -
569 - ECONF_SOURCE="${S}" \
570 - econf "${myconf[@]}"
571 -
572 - if ! multilib_is_native_abi; then
573 - # avoid building the client
574 - sed -i -e '/SUBDIRS/s:src::' Makefile || die
575 - sed -i -e '/SUBDIRS/s:scripts::' Makefile || die
576 - fi
577 -
578 - # Fix up the pkg-config file to be more robust.
579 - # https://github.com/curl/curl/issues/864
580 - local priv=() libs=()
581 - # We always enable zlib.
582 - libs+=( "-lz" )
583 - priv+=( "zlib" )
584 - if use http2; then
585 - libs+=( "-lnghttp2" )
586 - priv+=( "libnghttp2" )
587 - fi
588 - if use quiche; then
589 - libs+=( "-lquiche" )
590 - priv+=( "quiche" )
591 - fi
592 - if use nghttp3; then
593 - libs+=( "-lnghttp3" "-lngtcp2" )
594 - priv+=( "libnghttp3" "-libtcp2" )
595 - fi
596 - if use ssl && use curl_ssl_openssl; then
597 - libs+=( "-lssl" "-lcrypto" )
598 - priv+=( "openssl" )
599 - fi
600 - grep -q Requires.private libcurl.pc && die "need to update ebuild"
601 - libs=$(printf '|%s' "${libs[@]}")
602 - sed -i -r \
603 - -e "/^Libs.private/s:(${libs#|})( |$)::g" \
604 - libcurl.pc || die
605 - echo "Requires.private: ${priv[*]}" >> libcurl.pc
606 -}
607 -
608 -multilib_src_test() {
609 - # See https://github.com/curl/curl/blob/master/tests/runtests.pl#L5721
610 - # -n: no valgrind (unreliable in sandbox and doesn't work correctly on all arches)
611 - # -v: verbose
612 - # -a: keep going on failure (so we see everything which breaks, not just 1st test)
613 - # -k: keep test files after completion
614 - # -am: automake style TAP output
615 - # -p: print logs if test fails
616 - # Note: if needed, we can disable tests. See e.g. Fedora's packaging
617 - # or just read https://github.com/curl/curl/tree/master/tests#run.
618 - multilib_is_native_abi && emake test TFLAGS="-n -v -a -k -am -p"
619 -}
620 -
621 -multilib_src_install_all() {
622 - einstalldocs
623 - find "${ED}" -type f -name '*.la' -delete || die
624 - rm -rf "${ED}"/etc/ || die
625 -}
626
627 diff --git a/net-misc/curl/metadata.xml b/net-misc/curl/metadata.xml
628 index a6e835644b81..22b15ab2126b 100644
629 --- a/net-misc/curl/metadata.xml
630 +++ b/net-misc/curl/metadata.xml
631 @@ -28,7 +28,6 @@
632 <flag name="sslv3">Support for the old/insecure SSLv3 protocol</flag>
633 <flag name="telnet">Enable Telnet protocol support</flag>
634 <flag name="tftp">Enable TFTP support</flag>
635 - <flag name="winssl">Enable winssl ssl backend</flag>
636 <flag name="zstd">Enable zstd compression</flag>
637 </use>
638 <upstream>