net-misc/curl: Sync with Gentoo

It's from Gentoo commit a4e4f560028082b774a6bc6950be4e2c39b26b24.
This commit is contained in:
Flatcar Buildbot 2023-09-04 07:14:13 +00:00 committed by Krzesimir Nowak
parent e980e1de9e
commit 3c04a130d8
3 changed files with 22 additions and 10 deletions

View File

@ -51,13 +51,13 @@ RDEPEND="
sys-libs/zlib[${MULTILIB_USEDEP}] sys-libs/zlib[${MULTILIB_USEDEP}]
adns? ( net-dns/c-ares:=[${MULTILIB_USEDEP}] ) adns? ( net-dns/c-ares:=[${MULTILIB_USEDEP}] )
brotli? ( app-arch/brotli:=[${MULTILIB_USEDEP}] ) brotli? ( app-arch/brotli:=[${MULTILIB_USEDEP}] )
http2? ( net-libs/nghttp2:=[${MULTILIB_USEDEP}] ) http2? ( >=net-libs/nghttp2-1.12.0:=[${MULTILIB_USEDEP}] )
idn? ( net-dns/libidn2:=[static-libs?,${MULTILIB_USEDEP}] ) idn? ( net-dns/libidn2:=[static-libs?,${MULTILIB_USEDEP}] )
kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] ) kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] ) ldap? ( net-nds/openldap:=[static-libs?,${MULTILIB_USEDEP}] )
nghttp3? ( nghttp3? (
net-libs/nghttp3[${MULTILIB_USEDEP}] >=net-libs/nghttp3-0.11.0[${MULTILIB_USEDEP}]
net-libs/ngtcp2[ssl,${MULTILIB_USEDEP}] >=net-libs/ngtcp2-0.15.0[gnutls,ssl,-openssl,${MULTILIB_USEDEP}]
) )
rtmp? ( media-video/rtmpdump[${MULTILIB_USEDEP}] ) rtmp? ( media-video/rtmpdump[${MULTILIB_USEDEP}] )
ssh? ( net-libs/libssh2[${MULTILIB_USEDEP}] ) ssh? ( net-libs/libssh2[${MULTILIB_USEDEP}] )

View File

@ -30,6 +30,7 @@ RESTRICT="!test? ( test )"
# Only one default ssl provider can be enabled # Only one default ssl provider can be enabled
# The default ssl provider needs its USE satisfied # The default ssl provider needs its USE satisfied
# nghttp3 = https://bugs.gentoo.org/912029
REQUIRED_USE=" REQUIRED_USE="
ssl? ( ssl? (
^^ ( ^^ (
@ -45,19 +46,20 @@ REQUIRED_USE="
curl_ssl_nss? ( nss ) curl_ssl_nss? ( nss )
curl_ssl_openssl? ( openssl ) curl_ssl_openssl? ( openssl )
curl_ssl_rustls? ( rustls ) curl_ssl_rustls? ( rustls )
nghttp3? ( !openssl )
" "
RDEPEND=" RDEPEND="
sys-libs/zlib[${MULTILIB_USEDEP}] sys-libs/zlib[${MULTILIB_USEDEP}]
adns? ( net-dns/c-ares:=[${MULTILIB_USEDEP}] ) adns? ( net-dns/c-ares:=[${MULTILIB_USEDEP}] )
brotli? ( app-arch/brotli:=[${MULTILIB_USEDEP}] ) brotli? ( app-arch/brotli:=[${MULTILIB_USEDEP}] )
http2? ( >=net-libs/nghttp2-1.15.0:=[${MULTILIB_USEDEP}] ) http2? ( >=net-libs/nghttp2-1.12.0:=[${MULTILIB_USEDEP}] )
idn? ( net-dns/libidn2:=[static-libs?,${MULTILIB_USEDEP}] ) idn? ( net-dns/libidn2:=[static-libs?,${MULTILIB_USEDEP}] )
kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] ) kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
ldap? ( net-nds/openldap:=[static-libs?,${MULTILIB_USEDEP}] ) ldap? ( net-nds/openldap:=[static-libs?,${MULTILIB_USEDEP}] )
nghttp3? ( nghttp3? (
net-libs/nghttp3[${MULTILIB_USEDEP}] >=net-libs/nghttp3-0.13.0[${MULTILIB_USEDEP}]
net-libs/ngtcp2[ssl,${MULTILIB_USEDEP}] >=net-libs/ngtcp2-0.17.0[gnutls,ssl,-openssl,${MULTILIB_USEDEP}]
) )
rtmp? ( media-video/rtmpdump[${MULTILIB_USEDEP}] ) rtmp? ( media-video/rtmpdump[${MULTILIB_USEDEP}] )
ssh? ( net-libs/libssh2[${MULTILIB_USEDEP}] ) ssh? ( net-libs/libssh2[${MULTILIB_USEDEP}] )
@ -85,6 +87,7 @@ RDEPEND="
) )
zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] ) zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )
" "
DEPEND="${RDEPEND}" DEPEND="${RDEPEND}"
BDEPEND=" BDEPEND="
dev-lang/perl dev-lang/perl

View File

@ -47,17 +47,24 @@ REQUIRED_USE="
curl_ssl_rustls? ( rustls ) curl_ssl_rustls? ( rustls )
" "
# cURL's docs and CI/CD are great resources for confirming supported versions
# particulary for fast-moving targets like HTTP/2 and TCP/2 e.g.:
# - https://github.com/curl/curl/blob/master/docs/HTTP3.md
# - https://github.com/curl/curl/blob/master/.github/workflows/quiche-linux.yml
# However 'supported' vs 'works' are two entirely different things; be sane but
# don't be afraid to require a later version.
RDEPEND=" RDEPEND="
sys-libs/zlib[${MULTILIB_USEDEP}] sys-libs/zlib[${MULTILIB_USEDEP}]
adns? ( net-dns/c-ares:=[${MULTILIB_USEDEP}] ) adns? ( net-dns/c-ares:=[${MULTILIB_USEDEP}] )
brotli? ( app-arch/brotli:=[${MULTILIB_USEDEP}] ) brotli? ( app-arch/brotli:=[${MULTILIB_USEDEP}] )
http2? ( >=net-libs/nghttp2-1.15.0:=[${MULTILIB_USEDEP}] ) http2? ( >=net-libs/nghttp2-1.12.0:=[${MULTILIB_USEDEP}] )
idn? ( net-dns/libidn2:=[static-libs?,${MULTILIB_USEDEP}] ) idn? ( net-dns/libidn2:=[static-libs?,${MULTILIB_USEDEP}] )
kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] ) kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
ldap? ( net-nds/openldap:=[static-libs?,${MULTILIB_USEDEP}] ) ldap? ( net-nds/openldap:=[static-libs?,${MULTILIB_USEDEP}] )
nghttp3? ( nghttp3? (
net-libs/nghttp3[${MULTILIB_USEDEP}] >=net-libs/nghttp3-0.14.0[${MULTILIB_USEDEP}]
net-libs/ngtcp2[ssl,${MULTILIB_USEDEP}] >=net-libs/ngtcp2-0.18.0[gnutls,ssl,-openssl,${MULTILIB_USEDEP}]
) )
rtmp? ( media-video/rtmpdump[${MULTILIB_USEDEP}] ) rtmp? ( media-video/rtmpdump[${MULTILIB_USEDEP}] )
ssh? ( net-libs/libssh2[${MULTILIB_USEDEP}] ) ssh? ( net-libs/libssh2[${MULTILIB_USEDEP}] )
@ -85,7 +92,9 @@ RDEPEND="
) )
zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] ) zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )
" "
DEPEND="${RDEPEND}" DEPEND="${RDEPEND}"
BDEPEND=" BDEPEND="
dev-lang/perl dev-lang/perl
virtual/pkgconfig virtual/pkgconfig