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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 482E5138334 for ; Wed, 12 Dec 2018 12:37:09 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2F900E0A83; Wed, 12 Dec 2018 12:37:08 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 E5217E0A83 for ; Wed, 12 Dec 2018 12:37:07 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 BE9BE335C5D for ; Wed, 12 Dec 2018 12:37:05 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A8AC54CB for ; Wed, 12 Dec 2018 12:37:02 +0000 (UTC) From: "Anthony G. Basile" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Anthony G. Basile" Message-ID: <1544618204.0da3b4bf1243fed8eaa398f2a4e45d55474b9447.blueness@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.63.0.ebuild X-VCS-Directories: net-misc/curl/ X-VCS-Committer: blueness X-VCS-Committer-Name: Anthony G. Basile X-VCS-Revision: 0da3b4bf1243fed8eaa398f2a4e45d55474b9447 X-VCS-Branch: master Date: Wed, 12 Dec 2018 12:37:02 +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: 6811fd34-7829-432a-8d68-8bdff06043ae X-Archives-Hash: d8b6fc97586374c30407938e44469f57 commit: 0da3b4bf1243fed8eaa398f2a4e45d55474b9447 Author: Anthony G. Basile gentoo org> AuthorDate: Wed Dec 12 12:36:44 2018 +0000 Commit: Anthony G. Basile gentoo org> CommitDate: Wed Dec 12 12:36:44 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0da3b4bf net-misc/curl: remove axtls support in 7.63.0 Signed-off-by: Anthony G. Basile gentoo.org> Package-Manager: Portage-2.3.51, Repoman-2.3.11 net-misc/curl/curl-7.63.0.ebuild | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/net-misc/curl/curl-7.63.0.ebuild b/net-misc/curl/curl-7.63.0.ebuild index d13d87e7796..fe3a028e413 100644 --- a/net-misc/curl/curl-7.63.0.ebuild +++ b/net-misc/curl/curl-7.63.0.ebuild @@ -13,7 +13,7 @@ LICENSE="MIT" SLOT="0" 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" IUSE="adns brotli http2 idn ipv6 kerberos ldap metalink rtmp samba ssh ssl static-libs test threads" -IUSE+=" curl_ssl_axtls curl_ssl_gnutls curl_ssl_libressl curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_winssl" +IUSE+=" curl_ssl_gnutls curl_ssl_libressl curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_winssl" IUSE+=" elibc_Winnt" #lead to lots of false negatives, bug #285669 @@ -22,10 +22,6 @@ RESTRICT="test" RDEPEND="ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] ) brotli? ( app-arch/brotli:=[${MULTILIB_USEDEP}] ) ssl? ( - curl_ssl_axtls? ( - net-libs/axtls:0=[${MULTILIB_USEDEP}] - app-misc/ca-certificates - ) curl_ssl_gnutls? ( net-libs/gnutls:0=[static-libs?,${MULTILIB_USEDEP}] dev-libs/nettle:0=[${MULTILIB_USEDEP}] @@ -79,7 +75,6 @@ REQUIRED_USE=" threads? ( !adns ) ssl? ( ^^ ( - curl_ssl_axtls curl_ssl_gnutls curl_ssl_libressl curl_ssl_mbedtls @@ -123,13 +118,10 @@ multilib_src_configure() { # So start with all ssl providers off until proven otherwise # TODO: in the future, we may want to add wolfssl (https://www.wolfssl.com/) local myconf=() - myconf+=( --without-axtls --without-gnutls --without-mbedtls --without-nss --without-polarssl --without-ssl --without-winssl ) + myconf+=( --without-gnutls --without-mbedtls --without-nss --without-polarssl --without-ssl --without-winssl ) myconf+=( --without-ca-fallback --with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt ) if use ssl ; then - if use curl_ssl_axtls; then - einfo "SSL provided by axtls" - myconf+=( --with-axtls ) - elif use curl_ssl_gnutls; then + if use curl_ssl_gnutls; then einfo "SSL provided by gnutls" myconf+=( --with-gnutls --with-nettle ) elif use curl_ssl_libressl; then