| 1 |
commit: bf87bbf6fb6364de9da61a716c3c5535968766bf |
| 2 |
Author: Stefan Strogin <steils <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Aug 5 21:43:47 2020 +0000 |
| 4 |
Commit: Stefan Strogin <steils <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Aug 5 21:47:12 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf87bbf6 |
| 7 |
|
| 8 |
net-misc/curl: fix USE=libressl logic, remove it from REQUIRED_USE |
| 9 |
|
| 10 |
USE=libressl must not be mutually exclusive to USE=openssl or any other |
| 11 |
USE flag. Also USE=openssl must be enabled when using USE=libressl, so |
| 12 |
that dependencies are checked correctly. |
| 13 |
|
| 14 |
Package-Manager: Portage-3.0.1, Repoman-2.3.23 |
| 15 |
Signed-off-by: Stefan Strogin <steils <AT> gentoo.org> |
| 16 |
|
| 17 |
net-misc/curl/curl-7.71.1-r1.ebuild | 14 +++----------- |
| 18 |
1 file changed, 3 insertions(+), 11 deletions(-) |
| 19 |
|
| 20 |
diff --git a/net-misc/curl/curl-7.71.1-r1.ebuild b/net-misc/curl/curl-7.71.1-r1.ebuild |
| 21 |
index 5b747bdf2ce..628e487a4f1 100644 |
| 22 |
--- a/net-misc/curl/curl-7.71.1-r1.ebuild |
| 23 |
+++ b/net-misc/curl/curl-7.71.1-r1.ebuild |
| 24 |
@@ -29,15 +29,13 @@ RDEPEND="ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] ) |
| 25 |
dev-libs/nettle:0=[${MULTILIB_USEDEP}] |
| 26 |
app-misc/ca-certificates |
| 27 |
) |
| 28 |
- libressl? ( |
| 29 |
- dev-libs/libressl:0=[static-libs?,${MULTILIB_USEDEP}] |
| 30 |
- ) |
| 31 |
mbedtls? ( |
| 32 |
net-libs/mbedtls:0=[${MULTILIB_USEDEP}] |
| 33 |
app-misc/ca-certificates |
| 34 |
) |
| 35 |
openssl? ( |
| 36 |
- dev-libs/openssl:0=[static-libs?,${MULTILIB_USEDEP}] |
| 37 |
+ !libressl? ( dev-libs/openssl:0=[static-libs?,${MULTILIB_USEDEP}] ) |
| 38 |
+ libressl? ( dev-libs/libressl:0=[static-libs?,${MULTILIB_USEDEP}] ) |
| 39 |
) |
| 40 |
nss? ( |
| 41 |
dev-libs/nss:0[${MULTILIB_USEDEP}] |
| 42 |
@@ -76,13 +74,11 @@ BDEPEND="virtual/pkgconfig |
| 43 |
)" |
| 44 |
|
| 45 |
# c-ares must be disabled for threads |
| 46 |
-# only one of libressl or openssl can be enabled |
| 47 |
# only one default ssl provider can be enabled |
| 48 |
REQUIRED_USE=" |
| 49 |
winssl? ( elibc_Winnt ) |
| 50 |
threads? ( !adns ) |
| 51 |
ssl? ( |
| 52 |
- libressl? ( !openssl ) |
| 53 |
^^ ( |
| 54 |
curl_ssl_gnutls |
| 55 |
curl_ssl_libressl |
| 56 |
@@ -131,10 +127,6 @@ multilib_src_configure() { |
| 57 |
einfo "SSL provided by gnutls" |
| 58 |
myconf+=( --with-gnutls --with-nettle ) |
| 59 |
fi |
| 60 |
- if use libressl || use curl_ssl_libressl; then |
| 61 |
- einfo "SSL provided by LibreSSL" |
| 62 |
- myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs ) |
| 63 |
- fi |
| 64 |
if use mbedtls || use curl_ssl_mbedtls; then |
| 65 |
einfo "SSL provided by mbedtls" |
| 66 |
myconf+=( --with-mbedtls ) |
| 67 |
@@ -143,7 +135,7 @@ multilib_src_configure() { |
| 68 |
einfo "SSL provided by nss" |
| 69 |
myconf+=( --with-nss ) |
| 70 |
fi |
| 71 |
- if use openssl || use curl_ssl_openssl; then |
| 72 |
+ if use openssl || use curl_ssl_openssl || use curl_ssl_libressl; then |
| 73 |
einfo "SSL provided by openssl" |
| 74 |
myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs ) |
| 75 |
fi |
Archives