From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A95A9158089 for ; Mon, 18 Sep 2023 09:01:55 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A45A02BC03C; Mon, 18 Sep 2023 09:01:54 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 87DE22BC03C for ; Mon, 18 Sep 2023 09:01:54 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8DCDE335CD6 for ; Mon, 18 Sep 2023 09:01:53 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E748F11D9 for ; Mon, 18 Sep 2023 09:01:51 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1695027665.b6ec58af73546948642a4239300bfe22b4953113.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/curl/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-misc/curl/curl-8.3.0.ebuild net-misc/curl/curl-9999.ebuild X-VCS-Directories: net-misc/curl/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: b6ec58af73546948642a4239300bfe22b4953113 X-VCS-Branch: master Date: Mon, 18 Sep 2023 09:01:51 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 38c0d188-b959-4590-8c86-04a4c6614620 X-Archives-Hash: c3b61384adb9dc8e89cf8277c4798826 commit: b6ec58af73546948642a4239300bfe22b4953113 Author: Matt Jolly footclan ninja> AuthorDate: Mon Sep 18 08:54:25 2023 +0000 Commit: Sam James gentoo 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 footclan.ninja> Closes: https://github.com/gentoo/gentoo/pull/32894 Signed-off-by: Sam James 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