commit: 3022ef8b466b0d685bf70256b6faaee2a7fb06d1
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 9 12:04:34 2017 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Fri Jun 9 15:55:59 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3022ef8b
net-misc/curl: Drop curl_ssl_polarssl which was removed as part of bug #618356
Package-Manager: Portage-2.3.5, Repoman-2.3.2
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>
net-misc/curl/curl-7.53.0.ebuild | 10 +---------
net-misc/curl/curl-7.53.1.ebuild | 10 +---------
net-misc/curl/curl-7.54.0.ebuild | 10 +---------
3 files changed, 3 insertions(+), 27 deletions(-)
diff --git a/net-misc/curl/curl-7.53.0.ebuild b/net-misc/curl/curl-7.53.0.ebuild
index 490d6b4cca0..873681de9c4 100644
--- a/net-misc/curl/curl-7.53.0.ebuild
+++ b/net-misc/curl/curl-7.53.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 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos
~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="adns 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_polarssl curl_ssl_winssl"
+IUSE+=" curl_ssl_axtls 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
@@ -44,10 +44,6 @@ RDEPEND="ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
dev-libs/nss:0[${MULTILIB_USEDEP}]
app-misc/ca-certificates
)
- curl_ssl_polarssl? (
- net-libs/polarssl:0=[${MULTILIB_USEDEP}]
- app-misc/ca-certificates
- )
)
http2? ( net-libs/nghttp2[${MULTILIB_USEDEP}] )
idn? ( net-dns/libidn2:0[static-libs?,${MULTILIB_USEDEP}] )
@@ -92,7 +88,6 @@ REQUIRED_USE="
curl_ssl_mbedtls
curl_ssl_nss
curl_ssl_openssl
- curl_ssl_polarssl
curl_ssl_winssl
)
)"
@@ -142,9 +137,6 @@ multilib_src_configure() {
elif use curl_ssl_nss; then
einfo "SSL provided by nss"
myconf+=( --with-nss )
- elif use curl_ssl_polarssl; then
- einfo "SSL provided by polarssl"
- myconf+=( --with-polarssl )
elif use curl_ssl_openssl; then
einfo "SSL provided by openssl"
myconf+=( --with-ssl
--with-ca-path="${EPREFIX}"/etc/ssl/certs )
diff --git a/net-misc/curl/curl-7.53.1.ebuild b/net-misc/curl/curl-7.53.1.ebuild
index 93be06a9c60..5227717914f 100644
--- a/net-misc/curl/curl-7.53.1.ebuild
+++ b/net-misc/curl/curl-7.53.1.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-linux ~arm-linux ~x86-linux
~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris
~x64-solaris ~x86-solaris"
IUSE="adns 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_polarssl curl_ssl_winssl"
+IUSE+=" curl_ssl_axtls 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
@@ -44,10 +44,6 @@ RDEPEND="ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
dev-libs/nss:0[${MULTILIB_USEDEP}]
app-misc/ca-certificates
)
- curl_ssl_polarssl? (
- net-libs/polarssl:0=[${MULTILIB_USEDEP}]
- app-misc/ca-certificates
- )
)
http2? ( net-libs/nghttp2[${MULTILIB_USEDEP}] )
idn? ( net-dns/libidn2:0[static-libs?,${MULTILIB_USEDEP}] )
@@ -92,7 +88,6 @@ REQUIRED_USE="
curl_ssl_mbedtls
curl_ssl_nss
curl_ssl_openssl
- curl_ssl_polarssl
curl_ssl_winssl
)
)"
@@ -142,9 +137,6 @@ multilib_src_configure() {
elif use curl_ssl_nss; then
einfo "SSL provided by nss"
myconf+=( --with-nss )
- elif use curl_ssl_polarssl; then
- einfo "SSL provided by polarssl"
- myconf+=( --with-polarssl )
elif use curl_ssl_openssl; then
einfo "SSL provided by openssl"
myconf+=( --with-ssl
--with-ca-path="${EPREFIX}"/etc/ssl/certs )
diff --git a/net-misc/curl/curl-7.54.0.ebuild b/net-misc/curl/curl-7.54.0.ebuild
index 93be06a9c60..5227717914f 100644
--- a/net-misc/curl/curl-7.54.0.ebuild
+++ b/net-misc/curl/curl-7.54.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-linux ~arm-linux ~x86-linux
~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris
~x64-solaris ~x86-solaris"
IUSE="adns 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_polarssl curl_ssl_winssl"
+IUSE+=" curl_ssl_axtls 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
@@ -44,10 +44,6 @@ RDEPEND="ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
dev-libs/nss:0[${MULTILIB_USEDEP}]
app-misc/ca-certificates
)
- curl_ssl_polarssl? (
- net-libs/polarssl:0=[${MULTILIB_USEDEP}]
- app-misc/ca-certificates
- )
)
http2? ( net-libs/nghttp2[${MULTILIB_USEDEP}] )
idn? ( net-dns/libidn2:0[static-libs?,${MULTILIB_USEDEP}] )
@@ -92,7 +88,6 @@ REQUIRED_USE="
curl_ssl_mbedtls
curl_ssl_nss
curl_ssl_openssl
- curl_ssl_polarssl
curl_ssl_winssl
)
)"
@@ -142,9 +137,6 @@ multilib_src_configure() {
elif use curl_ssl_nss; then
einfo "SSL provided by nss"
myconf+=( --with-nss )
- elif use curl_ssl_polarssl; then
- einfo "SSL provided by polarssl"
- myconf+=( --with-polarssl )
elif use curl_ssl_openssl; then
einfo "SSL provided by openssl"
myconf+=( --with-ssl
--with-ca-path="${EPREFIX}"/etc/ssl/certs )
