commit:     b6ec58af73546948642a4239300bfe22b4953113
Author:     Matt Jolly <Matt.Jolly <AT> footclan <DOT> ninja>
AuthorDate: Mon Sep 18 08:54:25 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Sep 18 09:01:05 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b6ec58af

net-misc/curl: make openssl and nghttp3 mutually exclusive (again)

This was applied for 8.2.1 but the live ebuild template was missed
so we get to play the game again for 8.3.0!

Bug: https://bugs.gentoo.org/912029
Closes: https://bugs.gentoo.org/914277
Signed-off-by: Matt Jolly <Matt.Jolly <AT> footclan.ninja>
Closes: https://github.com/gentoo/gentoo/pull/32894
Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-misc/curl/curl-8.3.0.ebuild | 2 ++
 net-misc/curl/curl-9999.ebuild  | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/net-misc/curl/curl-8.3.0.ebuild b/net-misc/curl/curl-8.3.0.ebuild
index 8a2356959332..2761514f73e0 100644
--- a/net-misc/curl/curl-8.3.0.ebuild
+++ b/net-misc/curl/curl-8.3.0.ebuild
@@ -30,6 +30,7 @@ RESTRICT="!test? ( test )"
 
 # Only one default ssl provider can be enabled
 # The default ssl provider needs its USE satisfied
+# nghttp3 = https://bugs.gentoo.org/912029
 REQUIRED_USE="
        ssl? (
                ^^ (
@@ -43,6 +44,7 @@ REQUIRED_USE="
        curl_ssl_mbedtls? ( mbedtls )
        curl_ssl_openssl? ( openssl )
        curl_ssl_rustls? ( rustls )
+       nghttp3? ( !openssl )
 "
 
 # cURL's docs and CI/CD are great resources for confirming supported versions

diff --git a/net-misc/curl/curl-9999.ebuild b/net-misc/curl/curl-9999.ebuild
index 8a2356959332..2761514f73e0 100644
--- a/net-misc/curl/curl-9999.ebuild
+++ b/net-misc/curl/curl-9999.ebuild
@@ -30,6 +30,7 @@ RESTRICT="!test? ( test )"
 
 # Only one default ssl provider can be enabled
 # The default ssl provider needs its USE satisfied
+# nghttp3 = https://bugs.gentoo.org/912029
 REQUIRED_USE="
        ssl? (
                ^^ (
@@ -43,6 +44,7 @@ REQUIRED_USE="
        curl_ssl_mbedtls? ( mbedtls )
        curl_ssl_openssl? ( openssl )
        curl_ssl_rustls? ( rustls )
+       nghttp3? ( !openssl )
 "
 
 # cURL's docs and CI/CD are great resources for confirming supported versions

Reply via email to