From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1194131-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id B34C3138359
for <garchives@archives.gentoo.org>; Wed, 5 Aug 2020 21:52:33 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id C2A01E08F9;
Wed, 5 Aug 2020 21:52:32 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 8B965E08F9
for <gentoo-commits@lists.gentoo.org>; Wed, 5 Aug 2020 21:52:32 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 9E10F34F437
for <gentoo-commits@lists.gentoo.org>; Wed, 5 Aug 2020 21:52:30 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 1771B253
for <gentoo-commits@lists.gentoo.org>; Wed, 5 Aug 2020 21:52:29 +0000 (UTC)
From: "Stefan Strogin" <steils@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Stefan Strogin" <steils@gentoo.org>
Message-ID: <1596664032.bf87bbf6fb6364de9da61a716c3c5535968766bf.steils@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/curl/
X-VCS-Repository: repo/gentoo
X-VCS-Files: net-misc/curl/curl-7.71.1-r1.ebuild
X-VCS-Directories: net-misc/curl/
X-VCS-Committer: steils
X-VCS-Committer-Name: Stefan Strogin
X-VCS-Revision: bf87bbf6fb6364de9da61a716c3c5535968766bf
X-VCS-Branch: master
Date: Wed, 5 Aug 2020 21:52:29 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 02f8a858-cb7a-4628-b097-90b7eef66755
X-Archives-Hash: 1fe5e7cec40c8af38e542909d4a93fc8
commit: bf87bbf6fb6364de9da61a716c3c5535968766bf
Author: Stefan Strogin <steils <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 5 21:43:47 2020 +0000
Commit: Stefan Strogin <steils <AT> gentoo <DOT> org>
CommitDate: Wed Aug 5 21:47:12 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf87bbf6
net-misc/curl: fix USE=libressl logic, remove it from REQUIRED_USE
USE=libressl must not be mutually exclusive to USE=openssl or any other
USE flag. Also USE=openssl must be enabled when using USE=libressl, so
that dependencies are checked correctly.
Package-Manager: Portage-3.0.1, Repoman-2.3.23
Signed-off-by: Stefan Strogin <steils <AT> gentoo.org>
net-misc/curl/curl-7.71.1-r1.ebuild | 14 +++-----------
1 file changed, 3 insertions(+), 11 deletions(-)
diff --git a/net-misc/curl/curl-7.71.1-r1.ebuild b/net-misc/curl/curl-7.71.1-r1.ebuild
index 5b747bdf2ce..628e487a4f1 100644
--- a/net-misc/curl/curl-7.71.1-r1.ebuild
+++ b/net-misc/curl/curl-7.71.1-r1.ebuild
@@ -29,15 +29,13 @@ RDEPEND="ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
dev-libs/nettle:0=[${MULTILIB_USEDEP}]
app-misc/ca-certificates
)
- libressl? (
- dev-libs/libressl:0=[static-libs?,${MULTILIB_USEDEP}]
- )
mbedtls? (
net-libs/mbedtls:0=[${MULTILIB_USEDEP}]
app-misc/ca-certificates
)
openssl? (
- dev-libs/openssl:0=[static-libs?,${MULTILIB_USEDEP}]
+ !libressl? ( dev-libs/openssl:0=[static-libs?,${MULTILIB_USEDEP}] )
+ libressl? ( dev-libs/libressl:0=[static-libs?,${MULTILIB_USEDEP}] )
)
nss? (
dev-libs/nss:0[${MULTILIB_USEDEP}]
@@ -76,13 +74,11 @@ BDEPEND="virtual/pkgconfig
)"
# c-ares must be disabled for threads
-# only one of libressl or openssl can be enabled
# only one default ssl provider can be enabled
REQUIRED_USE="
winssl? ( elibc_Winnt )
threads? ( !adns )
ssl? (
- libressl? ( !openssl )
^^ (
curl_ssl_gnutls
curl_ssl_libressl
@@ -131,10 +127,6 @@ multilib_src_configure() {
einfo "SSL provided by gnutls"
myconf+=( --with-gnutls --with-nettle )
fi
- if use libressl || use curl_ssl_libressl; then
- einfo "SSL provided by LibreSSL"
- myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs )
- fi
if use mbedtls || use curl_ssl_mbedtls; then
einfo "SSL provided by mbedtls"
myconf+=( --with-mbedtls )
@@ -143,7 +135,7 @@ multilib_src_configure() {
einfo "SSL provided by nss"
myconf+=( --with-nss )
fi
- if use openssl || use curl_ssl_openssl; then
+ if use openssl || use curl_ssl_openssl || use curl_ssl_libressl; then
einfo "SSL provided by openssl"
myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs )
fi