| 1 |
commit: 0da3b4bf1243fed8eaa398f2a4e45d55474b9447 |
| 2 |
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Dec 12 12:36:44 2018 +0000 |
| 4 |
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Dec 12 12:36:44 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0da3b4bf |
| 7 |
|
| 8 |
net-misc/curl: remove axtls support in 7.63.0 |
| 9 |
|
| 10 |
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org> |
| 11 |
Package-Manager: Portage-2.3.51, Repoman-2.3.11 |
| 12 |
|
| 13 |
net-misc/curl/curl-7.63.0.ebuild | 14 +++----------- |
| 14 |
1 file changed, 3 insertions(+), 11 deletions(-) |
| 15 |
|
| 16 |
diff --git a/net-misc/curl/curl-7.63.0.ebuild b/net-misc/curl/curl-7.63.0.ebuild |
| 17 |
index d13d87e7796..fe3a028e413 100644 |
| 18 |
--- a/net-misc/curl/curl-7.63.0.ebuild |
| 19 |
+++ b/net-misc/curl/curl-7.63.0.ebuild |
| 20 |
@@ -13,7 +13,7 @@ LICENSE="MIT" |
| 21 |
SLOT="0" |
| 22 |
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
| 23 |
IUSE="adns brotli http2 idn ipv6 kerberos ldap metalink rtmp samba ssh ssl static-libs test threads" |
| 24 |
-IUSE+=" curl_ssl_axtls curl_ssl_gnutls curl_ssl_libressl curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_winssl" |
| 25 |
+IUSE+=" curl_ssl_gnutls curl_ssl_libressl curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_winssl" |
| 26 |
IUSE+=" elibc_Winnt" |
| 27 |
|
| 28 |
#lead to lots of false negatives, bug #285669 |
| 29 |
@@ -22,10 +22,6 @@ RESTRICT="test" |
| 30 |
RDEPEND="ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] ) |
| 31 |
brotli? ( app-arch/brotli:=[${MULTILIB_USEDEP}] ) |
| 32 |
ssl? ( |
| 33 |
- curl_ssl_axtls? ( |
| 34 |
- net-libs/axtls:0=[${MULTILIB_USEDEP}] |
| 35 |
- app-misc/ca-certificates |
| 36 |
- ) |
| 37 |
curl_ssl_gnutls? ( |
| 38 |
net-libs/gnutls:0=[static-libs?,${MULTILIB_USEDEP}] |
| 39 |
dev-libs/nettle:0=[${MULTILIB_USEDEP}] |
| 40 |
@@ -79,7 +75,6 @@ REQUIRED_USE=" |
| 41 |
threads? ( !adns ) |
| 42 |
ssl? ( |
| 43 |
^^ ( |
| 44 |
- curl_ssl_axtls |
| 45 |
curl_ssl_gnutls |
| 46 |
curl_ssl_libressl |
| 47 |
curl_ssl_mbedtls |
| 48 |
@@ -123,13 +118,10 @@ multilib_src_configure() { |
| 49 |
# So start with all ssl providers off until proven otherwise |
| 50 |
# TODO: in the future, we may want to add wolfssl (https://www.wolfssl.com/) |
| 51 |
local myconf=() |
| 52 |
- myconf+=( --without-axtls --without-gnutls --without-mbedtls --without-nss --without-polarssl --without-ssl --without-winssl ) |
| 53 |
+ myconf+=( --without-gnutls --without-mbedtls --without-nss --without-polarssl --without-ssl --without-winssl ) |
| 54 |
myconf+=( --without-ca-fallback --with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt ) |
| 55 |
if use ssl ; then |
| 56 |
- if use curl_ssl_axtls; then |
| 57 |
- einfo "SSL provided by axtls" |
| 58 |
- myconf+=( --with-axtls ) |
| 59 |
- elif use curl_ssl_gnutls; then |
| 60 |
+ if use curl_ssl_gnutls; then |
| 61 |
einfo "SSL provided by gnutls" |
| 62 |
myconf+=( --with-gnutls --with-nettle ) |
| 63 |
elif use curl_ssl_libressl; then |
Archives