curl: upgraded package to upstream
Upgraded net-misc/curl to version 7.36.0 on amd64, arm, x86
BUG=chromium:407235
TEST=`FEATURES=test emerge-link curl` works.
TEST=cbuildbot x86-generic-full amd64-generic-full chromiumos-sdk
Change-Id: Ib15fae9497b572e14ea0e52f2a95f0ca1fd2976b
Reviewed-on: https://chromium-review.googlesource.com/214420
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Commit-Queue: Alex Deymo <deymo@chromium.org>
Tested-by: Alex Deymo <deymo@chromium.org>
diff --git a/metadata/md5-cache/net-misc/curl-7.36.0 b/metadata/md5-cache/net-misc/curl-7.36.0
new file mode 100644
index 0000000..8cae24b
--- /dev/null
+++ b/metadata/md5-cache/net-misc/curl-7.36.0
@@ -0,0 +1,15 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=ldap? ( net-nds/openldap ) ssl? ( curl_ssl_axtls? ( net-libs/axtls app-misc/ca-certificates ) curl_ssl_gnutls? ( || ( ( >=net-libs/gnutls-3[static-libs?] dev-libs/nettle ) ( =net-libs/gnutls-2.12*[nettle,static-libs?] dev-libs/nettle ) ( =net-libs/gnutls-2.12*[-nettle,static-libs?] dev-libs/libgcrypt[static-libs?] ) ) app-misc/ca-certificates ) curl_ssl_openssl? ( dev-libs/openssl[static-libs?] ) curl_ssl_nss? ( dev-libs/nss app-misc/ca-certificates ) curl_ssl_polarssl? ( net-libs/polarssl:= app-misc/ca-certificates ) ) idn? ( net-dns/libidn[static-libs?] ) adns? ( net-dns/c-ares ) kerberos? ( virtual/krb5 ) metalink? ( >=media-libs/libmetalink-0.1.0 ) rtmp? ( media-video/rtmpdump ) ssh? ( net-libs/libssh2[static-libs?] ) sys-libs/zlib virtual/pkgconfig test? ( sys-apps/diffutils dev-lang/perl ) || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DESCRIPTION=A Client that groks URLs
+EAPI=5
+HOMEPAGE=http://curl.haxx.se/
+IUSE=adns idn ipv6 kerberos ldap metalink rtmp ssh ssl static-libs test threads curl_ssl_axtls curl_ssl_gnutls curl_ssl_nss +curl_ssl_openssl curl_ssl_polarssl
+KEYWORDS=*
+LICENSE=MIT
+RDEPEND=ldap? ( net-nds/openldap ) ssl? ( curl_ssl_axtls? ( net-libs/axtls app-misc/ca-certificates ) curl_ssl_gnutls? ( || ( ( >=net-libs/gnutls-3[static-libs?] dev-libs/nettle ) ( =net-libs/gnutls-2.12*[nettle,static-libs?] dev-libs/nettle ) ( =net-libs/gnutls-2.12*[-nettle,static-libs?] dev-libs/libgcrypt[static-libs?] ) ) app-misc/ca-certificates ) curl_ssl_openssl? ( dev-libs/openssl[static-libs?] ) curl_ssl_nss? ( dev-libs/nss app-misc/ca-certificates ) curl_ssl_polarssl? ( net-libs/polarssl:= app-misc/ca-certificates ) ) idn? ( net-dns/libidn[static-libs?] ) adns? ( net-dns/c-ares ) kerberos? ( virtual/krb5 ) metalink? ( >=media-libs/libmetalink-0.1.0 ) rtmp? ( media-video/rtmpdump ) ssh? ( net-libs/libssh2[static-libs?] ) sys-libs/zlib
+REQUIRED_USE=threads? ( !adns ) ssl? ( ^^ ( curl_ssl_axtls curl_ssl_gnutls curl_ssl_openssl curl_ssl_nss curl_ssl_polarssl ) )
+RESTRICT=test
+SLOT=0
+SRC_URI=http://curl.haxx.se/download/curl-7.36.0.tar.bz2
+_eclasses_=autotools 1b0fa473be98091220edff9f51d06153 eutils a108f00cccac414097bcbbbb5de01762 libtool eba09ed440f2692f73024ff3621a1f4b multilib fac675dcccf94392371a6abee62d909f multiprocessing 1512bdfe7004902b8cd2c466fc3df772 prefix 21058c21ca48453d771df15500873ede toolchain-funcs 48b38a216afb92db6314d6c3187abea3
+_md5_=26943c6cdadb31ce1a748bc0e6bf44ca
diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
new file mode 100644
index 0000000..5c1ee0d
--- /dev/null
+++ b/net-misc/curl/Manifest
@@ -0,0 +1 @@
+DIST curl-7.36.0.tar.bz2 2809266 SHA256 1fbe82b89bcd6b7ccda8cb0ff076edc60e911595030e27689f4abd5ef7f3cfcd SHA512 ae471d382c9c8f321a987e7a5a302abe7cb2cae4204ea65234b02c73303abef7c995c50ce8219bd90d762fa63006d50293e4350e78aee2c2086b6f7aec09b01a WHIRLPOOL 0b9f5d8a2d41126e0ff735d3f863a943e9182ec5a2abdb8caac890232432df66fe422f4dcdbfcba1fbc925880435f3733c01b747185aaa5cd1cc96571025663f
diff --git a/net-misc/curl/curl-7.36.0.ebuild b/net-misc/curl/curl-7.36.0.ebuild
new file mode 100644
index 0000000..ed3ee52
--- /dev/null
+++ b/net-misc/curl/curl-7.36.0.ebuild
@@ -0,0 +1,198 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.36.0.ebuild,v 1.18 2014/07/15 13:33:30 blueness Exp $
+
+EAPI="5"
+
+inherit autotools eutils prefix
+
+DESCRIPTION="A Client that groks URLs"
+HOMEPAGE="http://curl.haxx.se/"
+SRC_URI="http://curl.haxx.se/download/${P}.tar.bz2"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="*"
+IUSE="adns idn ipv6 kerberos ldap metalink rtmp ssh ssl static-libs test threads"
+IUSE="${IUSE} curl_ssl_axtls curl_ssl_gnutls curl_ssl_nss +curl_ssl_openssl curl_ssl_polarssl"
+
+#lead to lots of false negatives, bug #285669
+RESTRICT="test"
+
+RDEPEND="ldap? ( net-nds/openldap )
+ ssl? (
+ curl_ssl_axtls? ( net-libs/axtls app-misc/ca-certificates )
+ curl_ssl_gnutls? (
+ || (
+ ( >=net-libs/gnutls-3[static-libs?] dev-libs/nettle )
+ ( =net-libs/gnutls-2.12*[nettle,static-libs?] dev-libs/nettle )
+ ( =net-libs/gnutls-2.12*[-nettle,static-libs?] dev-libs/libgcrypt[static-libs?] )
+ )
+ app-misc/ca-certificates
+ )
+ curl_ssl_openssl? ( dev-libs/openssl[static-libs?] )
+ curl_ssl_nss? ( dev-libs/nss app-misc/ca-certificates )
+ curl_ssl_polarssl? ( net-libs/polarssl:= app-misc/ca-certificates )
+ )
+ idn? ( net-dns/libidn[static-libs?] )
+ adns? ( net-dns/c-ares )
+ kerberos? ( virtual/krb5 )
+ metalink? ( >=media-libs/libmetalink-0.1.0 )
+ rtmp? ( media-video/rtmpdump )
+ ssh? ( net-libs/libssh2[static-libs?] )
+ sys-libs/zlib"
+
+# Do we need to enforce the same ssl backend for curl and rtmpdump? Bug #423303
+# rtmp? (
+# media-video/rtmpdump
+# curl_ssl_gnutls? ( media-video/rtmpdump[gnutls] )
+# curl_ssl_openssl? ( media-video/rtmpdump[-gnutls,ssl] )
+# )
+
+# ssl providers to be added:
+# fbopenssl $(use_with spnego)
+
+# krb4 http://web.mit.edu/kerberos/www/krb4-end-of-life.html
+
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ test? (
+ sys-apps/diffutils
+ dev-lang/perl
+ )"
+
+# c-ares must be disabled for threads
+# only one ssl provider can be enabled
+REQUIRED_USE="
+ threads? ( !adns )
+ ssl? (
+ ^^ (
+ curl_ssl_axtls
+ curl_ssl_gnutls
+ curl_ssl_openssl
+ curl_ssl_nss
+ curl_ssl_polarssl
+ )
+ )"
+
+DOCS=( CHANGES README docs/FEATURES docs/INTERNALS \
+ docs/MANUAL docs/FAQ docs/BUGS docs/CONTRIBUTE)
+
+src_prepare() {
+ epatch \
+ "${FILESDIR}"/${PN}-7.30.0-prefix.patch \
+ "${FILESDIR}"/${PN}-respect-cflags-3.patch \
+ "${FILESDIR}"/${PN}-fix-gnutls-nettle.patch \
+ "${FILESDIR}"/${P}-hostcheck.patch #507494
+
+ sed -i '/LD_LIBRARY_PATH=/d' configure.ac || die #382241
+
+ epatch_user
+ eprefixify curl-config.in
+ eautoreconf
+}
+
+src_configure() {
+ einfo "\033[1;32m**************************************************\033[00m"
+
+ # We make use of the fact that later flags override earlier ones
+ # So start with all ssl providers off until proven otherwise
+ local myconf=()
+ myconf+=( --without-axtls --without-gnutls --without-nss --without-polarssl --without-ssl )
+ myconf+=( --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"
+ einfo "NOTE: axtls is meant for embedded systems and"
+ einfo "may not be the best choice as an ssl provider"
+ myconf+=( --with-axtls )
+ fi
+ if use curl_ssl_gnutls; then
+ einfo "SSL provided by gnutls"
+ if has_version ">=net-libs/gnutls-3" || has_version "=net-libs/gnutls-2.12*[nettle]"; then
+ einfo "gnutls compiled with dev-libs/nettle"
+ myconf+=( --with-gnutls --with-nettle )
+ else
+ einfo "gnutls compiled with dev-libs/libgcrypt"
+ myconf+=( --with-gnutls --without-nettle )
+ fi
+ fi
+ if use curl_ssl_nss; then
+ einfo "SSL provided by nss"
+ myconf+=( --with-nss )
+ fi
+ if use curl_ssl_polarssl; then
+ einfo "SSL provided by polarssl"
+ einfo "NOTE: polarssl is meant for embedded systems and"
+ einfo "may not be the best choice as an ssl provider"
+ myconf+=( --with-polarssl )
+ fi
+ if use curl_ssl_openssl; then
+ einfo "SSL provided by openssl"
+ myconf+=( --with-ssl --without-ca-bundle --with-ca-path="${EPREFIX}"/etc/ssl/certs )
+ fi
+ else
+ einfo "SSL disabled"
+ fi
+ einfo "\033[1;32m**************************************************\033[00m"
+
+ # These configuration options are organized alphabetically
+ # within each category. This should make it easier if we
+ # ever decide to make any of them contingent on USE flags:
+ # 1) protocols first. To see them all do
+ # 'grep SUPPORT_PROTOCOLS configure.ac'
+ # 2) --enable/disable options second.
+ # 'grep -- --enable configure | grep Check | awk '{ print $4 }' | sort
+ # 3) --with/without options third.
+ # grep -- --with configure | grep Check | awk '{ print $4 }' | sort
+ econf \
+ --enable-dict \
+ --enable-file \
+ --enable-ftp \
+ --enable-gopher \
+ --enable-http \
+ --enable-imap \
+ $(use_enable ldap) \
+ $(use_enable ldap ldaps) \
+ --enable-pop3 \
+ --enable-rtsp \
+ $(use_with ssh libssh2) \
+ --enable-smtp \
+ --enable-telnet \
+ --enable-tftp \
+ $(use_enable adns ares) \
+ --enable-cookies \
+ --enable-hidden-symbols \
+ $(use_enable ipv6) \
+ --enable-largefile \
+ --enable-manual \
+ --enable-proxy \
+ --disable-soname-bump \
+ --disable-sspi \
+ $(use_enable static-libs static) \
+ $(use_enable threads threaded-resolver) \
+ --disable-versioned-symbols \
+ --without-cyassl \
+ --without-darwinssl \
+ $(use_with idn libidn) \
+ $(use_with kerberos gssapi "${EPREFIX}"/usr) \
+ --without-krb4 \
+ $(use_with metalink libmetalink) \
+ --without-nghttp2 \
+ $(use_with rtmp librtmp) \
+ --without-spnego \
+ --without-winidn \
+ --without-winssl \
+ --with-zlib \
+ "${myconf[@]}"
+}
+
+src_install() {
+ default
+ find "${ED}" -name '*.la' -delete
+ rm -rf "${ED}"/etc/
+
+ # https://sourceforge.net/tracker/index.php?func=detail&aid=1705197&group_id=976&atid=350976
+ insinto /usr/share/aclocal
+ doins docs/libcurl/libcurl.m4
+}
diff --git a/net-misc/curl/files/curl-7.30.0-configure.patch b/net-misc/curl/files/curl-7.30.0-configure.patch
new file mode 100644
index 0000000..7ced394
--- /dev/null
+++ b/net-misc/curl/files/curl-7.30.0-configure.patch
@@ -0,0 +1,44 @@
+From 1436c8690383aaf91ea340df94d0b18ed4908820 Mon Sep 17 00:00:00 2001
+From: naota <naota@elisp.net>
+Date: Sun, 23 Feb 2014 22:32:51 +0900
+Subject: [PATCH] configure: Tiny fix to honor POSIX
+
+Change "==" to "=" to honor POSIX test construction.
+---
+ configure.ac | 14 +++++++-------
+ 1 file changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 9dc6866..ee207f9 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -2469,19 +2469,19 @@ AC_HELP_STRING([--disable-versioned-symbols], [Disable versioned symbols in shar
+ AC_MSG_RESULT(yes)
+ if test "x$OPENSSL_ENABLED" = "x1"; then
+ versioned_symbols_flavour="OPENSSL_"
+- elif test "x$GNUTLS_ENABLED" == "x1"; then
++ elif test "x$GNUTLS_ENABLED" = "x1"; then
+ versioned_symbols_flavour="GNUTLS_"
+- elif test "x$NSS_ENABLED" == "x1"; then
++ elif test "x$NSS_ENABLED" = "x1"; then
+ versioned_symbols_flavour="NSS_"
+- elif test "x$POLARSSL_ENABLED" == "x1"; then
++ elif test "x$POLARSSL_ENABLED" = "x1"; then
+ versioned_symbols_flavour="POLARSSL_"
+- elif test "x$CYASSL_ENABLED" == "x1"; then
++ elif test "x$CYASSL_ENABLED" = "x1"; then
+ versioned_symbols_flavour="CYASSL_"
+- elif test "x$AXTLS_ENABLED" == "x1"; then
++ elif test "x$AXTLS_ENABLED" = "x1"; then
+ versioned_symbols_flavour="AXTLS_"
+- elif test "x$WINSSL_ENABLED" == "x1"; then
++ elif test "x$WINSSL_ENABLED" = "x1"; then
+ versioned_symbols_flavour="WINSSL_"
+- elif test "x$DARWINSSL_ENABLED" == "x1"; then
++ elif test "x$DARWINSSL_ENABLED" = "x1"; then
+ versioned_symbols_flavour="DARWINSSL_"
+ else
+ versioned_symbols_flavour=""
+--
+1.8.5.5
+
diff --git a/net-misc/curl/files/curl-7.30.0-prefix.patch b/net-misc/curl/files/curl-7.30.0-prefix.patch
new file mode 100644
index 0000000..fd495c4
--- /dev/null
+++ b/net-misc/curl/files/curl-7.30.0-prefix.patch
@@ -0,0 +1,21 @@
+diff -Naur curl-7.30.0.orig/curl-config.in curl-7.30.0/curl-config.in
+--- curl-7.30.0.orig/curl-config.in 2013-02-06 09:44:37.000000000 -0500
++++ curl-7.30.0/curl-config.in 2013-04-17 18:43:56.000000000 -0400
+@@ -134,7 +134,7 @@
+ else
+ CPPFLAG_CURL_STATICLIB=""
+ fi
+- if test "X@includedir@" = "X/usr/include"; then
++ if test "X@includedir@" = "X@GENTOO_PORTAGE_EPREFIX@/usr/include"; then
+ echo "$CPPFLAG_CURL_STATICLIB"
+ else
+ echo "${CPPFLAG_CURL_STATICLIB}-I@includedir@"
+@@ -142,7 +142,7 @@
+ ;;
+
+ --libs)
+- if test "X@libdir@" != "X/usr/lib" -a "X@libdir@" != "X/usr/lib64"; then
++ if test "X@libdir@" != "X@GENTOO_PORTAGE_EPREFIX@/usr/lib" -a "X@libdir@" != "X@GENTOO_PORTAGE_EPREFIX@/usr/lib64"; then
+ CURLLIBDIR="-L@libdir@ "
+ else
+ CURLLIBDIR=""
diff --git a/net-misc/curl/files/curl-7.35.0-tests.patch b/net-misc/curl/files/curl-7.35.0-tests.patch
new file mode 100644
index 0000000..d86a305
--- /dev/null
+++ b/net-misc/curl/files/curl-7.35.0-tests.patch
@@ -0,0 +1,31 @@
+From ffb8a21d85bde8b626e5dc52ce25f0447ee49f89 Mon Sep 17 00:00:00 2001
+From: Steve Holme <steve_holme@hotmail.com>
+Date: Sun, 2 Feb 2014 11:01:10 +0000
+Subject: [PATCH] tests: Fixed test172 cookie expiry
+
+The test contains a cookie jar file where one of the cookies has an
+expiry date of 1391252187 -- Sat, 1 Feb 2014 10:56:27 GMT which has
+now expired. Updated to Wed, 14 Oct 2037 16:36:33 GMT as per test
+179.
+
+Reported-by: Adam Sampson
+Bug: http://curl.haxx.se/bug/view.cgi?id=1330
+---
+ tests/data/test172 | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/data/test172 b/tests/data/test172
+index b3efae9..3d53418 100644
+--- a/tests/data/test172
++++ b/tests/data/test172
+@@ -36,7 +36,7 @@ http://%HOSTIP:%HTTPPORT/we/want/172 -b log/jar172.txt -b "tool=curl; name=fool"
+
+ .%HOSTIP TRUE /silly/ FALSE 0 ismatch this
+ .%HOSTIP TRUE / FALSE 0 partmatch present
+-%HOSTIP FALSE /we/want/ FALSE 1391252187 nodomain value
++%HOSTIP FALSE /we/want/ FALSE 2139150993 nodomain value
+ </file>
+ </client>
+
+--
+1.8.5.5
diff --git a/net-misc/curl/files/curl-7.36.0-hostcheck.patch b/net-misc/curl/files/curl-7.36.0-hostcheck.patch
new file mode 100644
index 0000000..243159d
--- /dev/null
+++ b/net-misc/curl/files/curl-7.36.0-hostcheck.patch
@@ -0,0 +1,27 @@
+From a8c7cf62811d688efeff49f8f9ab942b525ebfd4 Mon Sep 17 00:00:00 2001
+From: Dan Fandrich <dan@coneharvesters.com>
+Date: Wed, 26 Mar 2014 22:27:34 +0100
+Subject: [PATCH] hostcheck: added a system include to define struct in_addr
+
+---
+ lib/hostcheck.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/lib/hostcheck.c b/lib/hostcheck.c
+index 162c522..42eb2ee 100644
+--- a/lib/hostcheck.c
++++ b/lib/hostcheck.c
+@@ -26,6 +26,10 @@
+ defined(USE_GSKIT)
+ /* these backends use functions from this file */
+
++#ifdef HAVE_NETINET_IN_H
++#include <netinet/in.h>
++#endif
++
+ #include "hostcheck.h"
+ #include "rawstr.h"
+ #include "inet_pton.h"
+--
+1.9.1
+
diff --git a/net-misc/curl/files/curl-7.37.0-host-krb5-config.patch b/net-misc/curl/files/curl-7.37.0-host-krb5-config.patch
new file mode 100644
index 0000000..7f0f57b
--- /dev/null
+++ b/net-misc/curl/files/curl-7.37.0-host-krb5-config.patch
@@ -0,0 +1,43 @@
+From 6a733c43489cf6e6570e24b38a45fa47d18b9de1 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Sun, 15 Jun 2014 12:42:30 +0200
+Subject: [PATCH] Respect host tool prefixes for krb5-config.
+
+That is, use ${host_alias}-krb5-config if available. This improves
+cross-compilation support and fixes multilib on Gentoo.
+---
+ configure.ac | 11 +++++++++--
+ 1 file changed, 9 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index d9b7a24..1c33b37 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1209,7 +1209,9 @@ if test x"$want_gss" = xyes; then
+ AC_MSG_RESULT(yes)
+
+ if test -z "$GSSAPI_INCS"; then
+- if test -f "$GSSAPI_ROOT/bin/krb5-config"; then
++ if test -n "$host_alias" -a -f "$GSSAPI_ROOT/bin/$host_alias-krb5-config"; then
++ GSSAPI_INCS=`$GSSAPI_ROOT/bin/$host_alias-krb5-config --cflags gssapi`
++ elif test -f "$GSSAPI_ROOT/bin/krb5-config"; then
+ GSSAPI_INCS=`$GSSAPI_ROOT/bin/krb5-config --cflags gssapi`
+ elif test "$GSSAPI_ROOT" != "yes"; then
+ GSSAPI_INCS="-I$GSSAPI_ROOT/include"
+@@ -1301,7 +1303,12 @@ if test x"$want_gss" = xyes; then
+ LIBS="-lgss $LIBS"
+ ;;
+ *)
+- if test -f "$GSSAPI_ROOT/bin/krb5-config"; then
++ if test -n "$host_alias" -a -f "$GSSAPI_ROOT/bin/$host_alias-krb5-config"; then
++ dnl krb5-config doesn't have --libs-only-L or similar, put everything
++ dnl into LIBS
++ gss_libs=`$GSSAPI_ROOT/bin/$host_alias-krb5-config --libs gssapi`
++ LIBS="$gss_libs $LIBS"
++ elif test -f "$GSSAPI_ROOT/bin/krb5-config"; then
+ dnl krb5-config doesn't have --libs-only-L or similar, put everything
+ dnl into LIBS
+ gss_libs=`$GSSAPI_ROOT/bin/krb5-config --libs gssapi`
+--
+2.0.0
+
diff --git a/net-misc/curl/files/curl-fix-gnutls-nettle.patch b/net-misc/curl/files/curl-fix-gnutls-nettle.patch
new file mode 100644
index 0000000..fbacb77
--- /dev/null
+++ b/net-misc/curl/files/curl-fix-gnutls-nettle.patch
@@ -0,0 +1,27 @@
+diff -Naur curl-7.25.0.orig//configure.ac curl-7.25.0/configure.ac
+--- curl-7.25.0.orig//configure.ac 2012-04-04 17:24:48.000000000 -0400
++++ curl-7.25.0/configure.ac 2012-04-04 17:23:07.000000000 -0400
+@@ -1823,20 +1823,9 @@
+
+ if test "$GNUTLS_ENABLED" = "1"; then
+ USE_GNUTLS_NETTLE=
+- # First check if we can detect either crypto library via transitive linking
+- AC_CHECK_LIB(gnutls, nettle_MD5Init, [ USE_GNUTLS_NETTLE=1 ])
+- if test "$USE_GNUTLS_NETTLE" = ""; then
+- AC_CHECK_LIB(gnutls, gcry_control, [ USE_GNUTLS_NETTLE=0 ])
+- fi
+- # If not, try linking directly to both of them to see if they are available
+- if test "$USE_GNUTLS_NETTLE" = ""; then
+- AC_CHECK_LIB(nettle, nettle_MD5Init, [ USE_GNUTLS_NETTLE=1 ])
+- fi
+- if test "$USE_GNUTLS_NETTLE" = ""; then
+- AC_CHECK_LIB(gcrypt, gcry_control, [ USE_GNUTLS_NETTLE=0 ])
+- fi
+- if test "$USE_GNUTLS_NETTLE" = ""; then
+- AC_MSG_ERROR([GnuTLS found, but neither gcrypt nor nettle found])
++ AC_ARG_WITH(nettle)
++ if test "x$withval" = "xyes"; then
++ USE_GNUTLS_NETTLE=1
+ fi
+ if test "$USE_GNUTLS_NETTLE" = "1"; then
+ AC_DEFINE(USE_GNUTLS_NETTLE, 1, [if GnuTLS uses nettle as crypto backend])
diff --git a/net-misc/curl/files/curl-respect-cflags-3.patch b/net-misc/curl/files/curl-respect-cflags-3.patch
new file mode 100644
index 0000000..4a4a614
--- /dev/null
+++ b/net-misc/curl/files/curl-respect-cflags-3.patch
@@ -0,0 +1,14 @@
+diff --git a/configure.ac b/configure.ac
+index e9b49c7..e374ab6 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -280,9 +280,6 @@ dnl **********************************************************************
+
+ CURL_CHECK_COMPILER
+ CURL_SET_COMPILER_BASIC_OPTS
+-CURL_SET_COMPILER_DEBUG_OPTS
+-CURL_SET_COMPILER_OPTIMIZE_OPTS
+-CURL_SET_COMPILER_WARNING_OPTS
+
+ if test "$compiler_id" = "INTEL_UNIX_C"; then
+ #
diff --git a/net-misc/curl/metadata.xml b/net-misc/curl/metadata.xml
new file mode 100644
index 0000000..67963a5
--- /dev/null
+++ b/net-misc/curl/metadata.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer>
+ <email>blueness@gentoo.org</email>
+ <name>Anthony G. Basile</name>
+ </maintainer>
+ <maintainer>
+ <email>gregkh@gentoo.org</email>
+ <name>Greg Kroah-Hartman</name>
+ </maintainer>
+ <use>
+ <flag name="ssh">Enabled SSH urls in curl using libssh2</flag>
+ <flag name="metalink">Enable metalink support</flag>
+ <flag name="ssl">Enable crypto engine support (via openssl if USE='-gnutls -nss')</flag>
+ <flag name="rtmp">Enable RTMP Streaming Media support</flag>
+ </use>
+ <upstream>
+ <remote-id type="cpe">cpe:/a:curl:curl</remote-id>
+ <remote-id type="cpe">cpe:/a:curl:libcurl</remote-id>
+ <remote-id type="cpe">cpe:/a:haxx:curl</remote-id>
+ <remote-id type="cpe">cpe:/a:haxx:libcurl</remote-id>
+ </upstream>
+</pkgmetadata>
