commit:     e2f266e1dc6b035f6a106c47036049eb084b74e6
Author:     Matt Jolly <kangie <AT> gentoo <DOT> org>
AuthorDate: Wed Apr  2 11:38:50 2025 +0000
Commit:     Matt Jolly <kangie <AT> gentoo <DOT> org>
CommitDate: Wed Apr  2 11:39:13 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e2f266e1

net-misc/curl: add 8.13.0, drop 8.13.0_rc3-r1

Signed-off-by: Matt Jolly <kangie <AT> gentoo.org>

 net-misc/curl/Manifest                                          | 4 ++--
 net-misc/curl/{curl-8.13.0_rc3-r1.ebuild => curl-8.13.0.ebuild} | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index 74528f45a213..0673944d8b53 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -2,5 +2,5 @@ DIST curl-8.11.1.tar.xz 2751236 BLAKE2B 
a87ec2c78c5d6daf44eee4cf8e3ed124849d067f
 DIST curl-8.11.1.tar.xz.asc 488 BLAKE2B 
53d58ebb8ab722d8394b7ce94b646c876324cd89b3e47d9129bddcfbb6db338c1dbe93a5e72a25caf7be9ddd450c2b0832cfee17beb8ba701bdeefe653235d53
 SHA512 
c09bedb67e83fb8ca3ad73c5bd0d92fed7fc2c26dbe5a71cccb193fd151c7219713241a9fe74baefcd1d008cfafba78142bf04cec24dd4a88d67179184d35824
 DIST curl-8.12.1.tar.xz 2768160 BLAKE2B 
2b3e3d91041881c0951ad470736266105d3b9720440b808fe382baa493a30075aba52eb1d329fb1f148e27cd76290d82e121e7f4abf695f215456a10e26ade3e
 SHA512 
88915468fa1bb7256e3dd6c9d058ada6894faa1e3e7800c7d9bfee3e8be4081ae57e7f2bf260c5342b709499fc4302ddc2d7864e25bfa3300fa07f118a3de603
 DIST curl-8.12.1.tar.xz.asc 488 BLAKE2B 
2a6563609c9f7ada84ca2c7048ad9406809eef4cc958760d2ab3d1b7be58d26247e579bd025870609e80ebb00295026aae30614b84e3a81bdf3ed3dbd0f5ed70
 SHA512 
41fc5582935090d13940d86974fdea3ea901dd5dab156c16029a87f811d2535172c59dc8dc366f2ffc37bcf85accbecb5aa765bc7b83c2991a3ef402bf25af69
-DIST curl-8.13.0-rc3.tar.xz 2792136 BLAKE2B 
af18c877ca6e9fb3e75265f86b3f3416e12b4160b71de00dfb82d687f11f457faf2f7dddde557474631ac7148cada1add189ac4ed002c41745bd546309093312
 SHA512 
72c0e0b8b0bc9117ab911b97bab6b1502d877f5a72a34091b68e48c046e45dfd188f24f270c0200f4df3f1a70933ada00f3a73a0aa078ec2b125fa5a9294d33f
-DIST curl-8.13.0-rc3.tar.xz.asc 488 BLAKE2B 
8778af342578bace6ddea93c719fb74b8a9b85ffb53938f46888c48cb9eef53bd018b4df421c2ceaecae5a8058a32b3b058e7965ba8b092eb17fef69168ab3f4
 SHA512 
a2d94a898824fabc1c4834f9e5719fb65311d0f218f6170e80fe1a04c6f842f9fbf589d281767ab916f668ff7087bb318b819a1fb26790640df136f335ff3b99
+DIST curl-8.13.0.tar.xz 2773628 BLAKE2B 
6869634ad50f015d5c7526699034d5a3f27d9588bc32eacc8080dbd6c690f63b1f25cee40d3fdf8fd9dd8535c305ea9c5edf1d5a02bc6d9ce60fd8c88230aca0
 SHA512 
d266e460f162ee455b56726e5b7247b2d1aa5265ae12081513fc0c5c79e785a594097bc71d505dc9bcd2c2f6f1ff6f4bab9dbd9d120bb76d06c5be8521a8ca7d
+DIST curl-8.13.0.tar.xz.asc 488 BLAKE2B 
bd568ec32a44ef7c14c38e4830bcc7711dac726e950325292f1e5de76e619839685300c5afac32330127324327e71ce0d6e574f6e95bcc4a48957345152bc86a
 SHA512 
07f79c7fd7c305c96e10a5f52797254aed7d2a1f3577c8626b8d617855ceb82634ac6787bfa0b7130a4ed72c3a9945d3c9ba5b7be54df8bafa07ded1c62ef2be

diff --git a/net-misc/curl/curl-8.13.0_rc3-r1.ebuild 
b/net-misc/curl/curl-8.13.0.ebuild
similarity index 98%
rename from net-misc/curl/curl-8.13.0_rc3-r1.ebuild
rename to net-misc/curl/curl-8.13.0.ebuild
index 7c358f28d7a5..bdceb348fcc7 100644
--- a/net-misc/curl/curl-8.13.0_rc3-r1.ebuild
+++ b/net-misc/curl/curl-8.13.0.ebuild
@@ -32,7 +32,7 @@ fi
 
 LICENSE="BSD curl ISC test? ( BSD-4 )"
 SLOT="0"
-IUSE="+adns +alt-svc brotli debug +ftp gnutls gopher +hsts +http2 +http3 
+httpsrr idn +imap kerberos ldap"
+IUSE="+adns +alt-svc brotli debug ech +ftp gnutls gopher +hsts +http2 +http3 
+httpsrr idn +imap kerberos ldap"
 IUSE+=" mbedtls +openssl +pop3 +psl +quic rtmp rustls samba sasl-scram +smtp 
ssh ssl static-libs test"
 IUSE+=" telnet +tftp +websockets zstd"
 # These select the default tls implementation / which quic impl to use
@@ -53,6 +53,7 @@ RESTRICT="!test? ( test )"
 # HTTP/3 and MultiSSL are mutually exclusive; it's not clear if MultiSSL 
offers any benefit at all in the modern day.
 # https://github.com/curl/curl/commit/65ece771f4602107d9cdd339dff4b420280a2c2e
 REQUIRED_USE="
+       ech? ( rustls )
        httpsrr? ( adns )
        quic? (
                ^^ (
@@ -300,7 +301,7 @@ multilib_src_configure() {
                --enable-digest-auth
                --enable-dnsshuffle
                --enable-doh
-               --disable-ech
+               $(use_enable ech)
                --enable-http-auth
                --enable-ipv6
                --enable-kerberos-auth
@@ -408,8 +409,7 @@ multilib_src_test() {
        # this ends up breaking when nproc is huge (like -j80).
        # The network sandbox causes tests 241 and 1083 to fail; these are 
typically skipped
        # as most gentoo users don't have an 'ip6-localhost'
-       # 1308: https://github.com/curl/curl/issues/16890
-       multilib_is_native_abi && emake test TFLAGS="-n -v -a -k -am -p 
-j$((2*$(makeopts_jobs))) !241 !1083 $(usex rustls "!1308")"
+       multilib_is_native_abi && emake test TFLAGS="-n -v -a -k -am -p 
-j$((2*$(makeopts_jobs))) !241 !1083"
 }
 
 multilib_src_install() {

Reply via email to