Cleanup for security bug #474354

(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 0xF52D4BBA)

18 files changed, 13 insertions, 1527 deletions

diff --git a/net-misc/curl/ChangeLog b/net-misc/curl/ChangeLog
index d590d7332616..3fd1b6377579 100644
--- a/net-misc/curl/ChangeLog
+++ b/net-misc/curl/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for net-misc/curl
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/ChangeLog,v 1.297 2013/10/15 20:07:33 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/ChangeLog,v 1.298 2013/10/29 17:55:11 blueness Exp $
+
+  29 Oct 2013; Anthony G. Basile <blueness@gentoo.org> -curl-7.21.4.ebuild,
+  -curl-7.25.0-r1.ebuild, -curl-7.26.0.ebuild, -curl-7.29.0-r1.ebuild,
+  -curl-7.30.0.ebuild, -files/curl-7.18.2-prefix.patch,
+  -files/curl-7.19.7-test241.patch, -files/curl-7.20.0-strip-ldflags.patch,
+  -files/curl-7.27.0-curl-config.patch,
+  -files/curl-7.27.0-fix-metalink-gnutls.patch,
+  -files/curl-7.27.0-fix-nettle-include.patch, -files/curl-7.27.0-prefix.patch,
+  -files/curl-7.28.0-fix-http-auth.patch, -files/curl-7.28.0-prefix.patch,
+  -files/curl-7.29.0-fix-null-pointer.patch, -files/curl-respect-cflags.patch,
+  metadata.xml:
+  Cleanup for security bug #474354
 
 *curl-7.33.0 (15 Oct 2013)
 
diff --git a/net-misc/curl/curl-7.21.4.ebuild b/net-misc/curl/curl-7.21.4.ebuild
deleted file mode 100644
index 49433c9cb9ac..000000000000
--- a/net-misc/curl/curl-7.21.4.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.21.4.ebuild,v 1.14 2012/05/05 03:20:41 jdhore Exp $
-
-# NOTE: If you bump this ebuild, make sure you bump dev-python/pycurl!
-
-EAPI=4
-
-inherit autotools multilib eutils libtool 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="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="ares gnutls idn ipv6 kerberos ldap nss ssh ssl static-libs test threads"
-
-RDEPEND="ldap? ( net-nds/openldap )
-	ssl? (
-		gnutls? ( net-libs/gnutls dev-libs/libgcrypt app-misc/ca-certificates )
-		nss? ( !gnutls? ( dev-libs/nss app-misc/ca-certificates ) )
-		!gnutls? ( !nss? ( dev-libs/openssl ) )
-	)
-	idn? ( net-dns/libidn )
-	ares? ( >=net-dns/c-ares-1.4.0 )
-	kerberos? ( virtual/krb5 )
-	ssh? ( >=net-libs/libssh2-0.16 )"
-
-# rtmpdump ( media-video/rtmpdump )  / --with-librtmp
-# fbopenssl (not in gentoo) --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
-	)"
-# used - but can do without in self test: net-misc/stunnel
-
-# ares must be disabled for threads and both can be disabled
-# one can use wether gnutls or nss if ssl is enabled
-REQUIRED_USE="threads? ( !ares )
-	gnutls? ( ssl )
-	nss? ( ssl )"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-7.20.0-strip-ldflags.patch \
-		"${FILESDIR}"/${PN}-7.19.7-test241.patch \
-		"${FILESDIR}"/${PN}-7.18.2-prefix.patch \
-		"${FILESDIR}"/${PN}-respect-cflags.patch
-
-	eprefixify curl-config.in
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-
-	myconf="$(use_enable ldap)
-		$(use_enable ldap ldaps)
-		$(use_with idn libidn)
-		$(use_with kerberos gssapi "${EPREFIX}"/usr)
-		$(use_with ssh libssh2)
-		$(use_enable static-libs static)
-		$(use_enable ipv6)
-		$(use_enable threads threaded-resolver)
-		$(use_enable ares)
-		--enable-http
-		--enable-ftp
-		--enable-gopher
-		--enable-file
-		--enable-dict
-		--enable-manual
-		--enable-telnet
-		--enable-smtp
-		--enable-pop3
-		--enable-imap
-		--enable-rtsp
-		--enable-nonblocking
-		--enable-largefile
-		--enable-maintainer-mode
-		--disable-sspi
-		--without-krb4
-		--without-librtmp
-		--without-spnego"
-
-	if use ssl ; then
-		if use gnutls; then
-			myconf+=" --without-ssl --with-gnutls --without-nss"
-			myconf+=" --with-ca-bundle=${EPREFIX}/etc/ssl/certs/ca-certificates.crt"
-		elif use nss; then
-			myconf+=" --without-ssl --without-gnutls --with-nss"
-			myconf+=" --with-ca-bundle=${EPREFIX}/etc/ssl/certs/ca-certificates.crt"
-		else
-			myconf+=" --without-gnutls --without-nss --with-ssl"
-			myconf+=" --without-ca-bundle --with-ca-path=${EPREFIX}/etc/ssl/certs"
-		fi
-	else
-		myconf+=" --without-gnutls --without-nss --without-ssl"
-	fi
-
-	econf ${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	find "${ED}" -name '*.la' -exec rm -f {} +
-	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
-
-	dodoc CHANGES README
-	dodoc docs/FEATURES docs/INTERNALS
-	dodoc docs/MANUAL docs/FAQ docs/BUGS docs/CONTRIBUTE
-}
diff --git a/net-misc/curl/curl-7.25.0-r1.ebuild b/net-misc/curl/curl-7.25.0-r1.ebuild
deleted file mode 100644
index 635832c95a14..000000000000
--- a/net-misc/curl/curl-7.25.0-r1.ebuild
+++ /dev/null
@@ -1,185 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.25.0-r1.ebuild,v 1.15 2012/07/20 01:59:05 jdhore Exp $
-
-EAPI="4"
-
-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="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="ares idn ipv6 kerberos ldap 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?] )
-				( <net-libs/gnutls-2.12 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?] )
-	ares? ( net-dns/c-ares )
-	kerberos? ( virtual/krb5 )
-	ssh? ( net-libs/libssh2[static-libs?] )
-	sys-libs/zlib"
-
-# ssl providers to be added:
-# fbopenssl  $(use_with spnego)
-
-# rtmpdump ( media-video/rtmpdump )  / --with-librtmp
-# krb4 http://web.mit.edu/kerberos/www/krb4-end-of-life.html
-
-DEPEND="${RDEPEND}
-	sys-apps/ed
-	virtual/pkgconfig
-	test? (
-		sys-apps/diffutils
-		dev-lang/perl
-	)"
-# used - but can do without in self test: net-misc/stunnel
-
-# ares must be disabled for threads
-# only one ssl provider can be enabled
-REQUIRED_USE="threads? ( !ares )
-	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.19.7-test241.patch \
-		"${FILESDIR}"/${PN}-7.18.2-prefix.patch \
-		"${FILESDIR}"/${PN}-respect-cflags-3.patch \
-		"${FILESDIR}"/${PN}-fix-gnutls-nettle.patch
-	sed -i '/LD_LIBRARY_PATH=/d' configure.ac || die #382241
-
-	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-cyassl --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 \
-		--without-librtmp \
-		--enable-rtsp \
-		$(use_with ssh libssh2) \
-		--enable-smtp \
-		--enable-telnet \
-		--enable-tftp \
-		$(use_enable ares) \
-		--enable-cookies \
-		--enable-hidden-symbols \
-		$(use_enable ipv6) \
-		--enable-largefile \
-		--enable-manual \
-		--enable-nonblocking \
-		--enable-proxy \
-		--disable-soname-bump \
-		--disable-sspi \
-		$(use_enable static-libs static) \
-		$(use_enable threads threaded-resolver) \
-		--disable-versioned-symbols \
-		$(use_with idn libidn) \
-		$(use_with kerberos gssapi "${EPREFIX}"/usr) \
-		--without-krb4 \
-		--without-spnego \
-		--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/curl-7.26.0.ebuild b/net-misc/curl/curl-7.26.0.ebuild
deleted file mode 100644
index cd4952bee790..000000000000
--- a/net-misc/curl/curl-7.26.0.ebuild
+++ /dev/null
@@ -1,193 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.26.0.ebuild,v 1.12 2013/09/06 17:26:15 blueness Exp $
-
-EAPI="4"
-
-WANT_AUTOMAKE="1.12"
-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="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="ares idn ipv6 kerberos ldap ssh ssl static-libs test threads"
-IUSE="${IUSE} curl_ssl_axtls curl_ssl_cyassl 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_cyassl? ( net-libs/cyassl 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?] )
-				( <net-libs/gnutls-2.12 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?] )
-	ares? ( net-dns/c-ares )
-	kerberos? ( virtual/krb5 )
-	ssh? ( net-libs/libssh2[static-libs?] )
-	sys-libs/zlib"
-
-# ssl providers to be added:
-# fbopenssl  $(use_with spnego)
-
-# rtmpdump ( media-video/rtmpdump )  / --with-librtmp
-# krb4 http://web.mit.edu/kerberos/www/krb4-end-of-life.html
-
-DEPEND="${RDEPEND}
-	sys-apps/ed
-	virtual/pkgconfig
-	test? (
-		sys-apps/diffutils
-		dev-lang/perl
-	)"
-# used - but can do without in self test: net-misc/stunnel
-
-# ares must be disabled for threads
-# only one ssl provider can be enabled
-REQUIRED_USE="threads? ( !ares )
-	ssl? (
-		^^ (
-			curl_ssl_axtls
-			curl_ssl_cyassl
-			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.18.2-prefix.patch \
-		"${FILESDIR}"/${PN}-respect-cflags-3.patch \
-		"${FILESDIR}"/${PN}-fix-gnutls-nettle.patch
-	sed -i '/LD_LIBRARY_PATH=/d' configure.ac || die #382241
-
-	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-cyassl --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_cyassl; then
-			einfo "SSL provided by cyassl"
-			einfo "NOTE: cyassl is meant for embedded systems and"
-			einfo "may not be the best choice as an ssl provider"
-			myconf+=( --with-cyassl )
-		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 \
-		--without-librtmp \
-		--enable-rtsp \
-		$(use_with ssh libssh2) \
-		--enable-smtp \
-		--enable-telnet \
-		--enable-tftp \
-		$(use_enable ares) \
-		--enable-cookies \
-		--enable-hidden-symbols \
-		$(use_enable ipv6) \
-		--enable-largefile \
-		--enable-manual \
-		--enable-nonblocking \
-		--enable-proxy \
-		--disable-soname-bump \
-		--disable-sspi \
-		$(use_enable static-libs static) \
-		$(use_enable threads threaded-resolver) \
-		--disable-versioned-symbols \
-		$(use_with idn libidn) \
-		$(use_with kerberos gssapi "${EPREFIX}"/usr) \
-		--without-krb4 \
-		--without-spnego \
-		--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/curl-7.29.0-r1.ebuild b/net-misc/curl/curl-7.29.0-r1.ebuild
deleted file mode 100644
index cdf7c3a93937..000000000000
--- a/net-misc/curl/curl-7.29.0-r1.ebuild
+++ /dev/null
@@ -1,203 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.29.0-r1.ebuild,v 1.13 2013/03/15 13:30:15 ago Exp $
-
-EAPI="4"
-
-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="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="adns idn ipv6 kerberos ldap metalink rtmp ssh ssl static-libs test threads"
-IUSE="${IUSE} curl_ssl_axtls curl_ssl_cyassl 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_cyassl? ( net-libs/cyassl 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_polarssl? ( media-video/rtmpdump[polarssl] )
-#		curl_ssl_openssl? ( media-video/rtmpdump[-gnutls,-polarssl,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_cyassl
-			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.28.0-prefix.patch \
-		"${FILESDIR}"/${PN}-respect-cflags-3.patch \
-		"${FILESDIR}"/${PN}-fix-gnutls-nettle.patch \
-		"${FILESDIR}"/${PN}-7.29.0-fix-null-pointer.patch
-	sed -i '/LD_LIBRARY_PATH=/d' configure.ac || die #382241
-
-	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-cyassl --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_cyassl; then
-			einfo "SSL provided by cyassl"
-			einfo "NOTE: cyassl is meant for embedded systems and"
-			einfo "may not be the best choice as an ssl provider"
-			myconf+=( --with-cyassl )
-		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-darwinssl \
-		$(use_with idn libidn) \
-		$(use_with kerberos gssapi "${EPREFIX}"/usr) \
-		--without-krb4 \
-		$(use_with metalink libmetalink)  \
-		$(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/curl-7.30.0.ebuild b/net-misc/curl/curl-7.30.0.ebuild
deleted file mode 100644
index e5f3654b3bfb..000000000000
--- a/net-misc/curl/curl-7.30.0.ebuild
+++ /dev/null
@@ -1,202 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.30.0.ebuild,v 1.12 2013/06/09 16:02:00 ago 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="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="adns idn ipv6 kerberos ldap metalink rtmp ssh ssl static-libs test threads"
-IUSE="${IUSE} curl_ssl_axtls curl_ssl_cyassl 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_cyassl? ( net-libs/cyassl 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_polarssl? ( media-video/rtmpdump[polarssl] )
-#		curl_ssl_openssl? ( media-video/rtmpdump[-gnutls,-polarssl,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_cyassl
-			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
-	sed -i '/LD_LIBRARY_PATH=/d' configure.ac || die #382241
-
-	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-cyassl --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_cyassl; then
-			einfo "SSL provided by cyassl"
-			einfo "NOTE: cyassl is meant for embedded systems and"
-			einfo "may not be the best choice as an ssl provider"
-			myconf+=( --with-cyassl )
-		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-darwinssl \
-		$(use_with idn libidn) \
-		$(use_with kerberos gssapi "${EPREFIX}"/usr) \
-		--without-krb4 \
-		$(use_with metalink libmetalink)  \
-		$(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.18.2-prefix.patch b/net-misc/curl/files/curl-7.18.2-prefix.patch
deleted file mode 100644
index 9f7761f4edc8..000000000000
--- a/net-misc/curl/files/curl-7.18.2-prefix.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- curl-config.in.orig	2008-10-10 13:43:19.000000000 +0200
-+++ curl-config.in	2008-10-10 13:43:56.000000000 +0200
-@@ -181,7 +181,7 @@
- 	;;
- 
-     --cflags)
--       	if test "X@includedir@" = "X/usr/include"; then
-+       	if test "X@includedir@" = "X@GENTOO_PORTAGE_EPREFIX@/usr/include"; then
-           echo ""
-         else
-           echo "-I@includedir@"
-@@ -189,7 +189,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.19.7-test241.patch b/net-misc/curl/files/curl-7.19.7-test241.patch
deleted file mode 100644
index 7297c1b5b13e..000000000000
--- a/net-misc/curl/files/curl-7.19.7-test241.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- tests/data/test241.orig	2008-11-20 08:12:35.000000000 +1100
-+++ tests/data/test241	2009-11-05 14:22:07.000000000 +1100
-@@ -33,7 +33,7 @@
- HTTP-IPv6 GET (using ip6-localhost)
-  </name>
-  <command>
---g "http://ip6-localhost:%HTTP6PORT/241"
-+-g "http://::1:%HTTP6PORT/241"
- </command>
- <precheck>
- ./server/resolve --ipv6 ip6-localhost
-@@ -48,7 +48,7 @@
- </strip>
- <protocol>
- GET /241 HTTP/1.1

--Host: ip6-localhost:%HTTP6PORT

-+Host: ::1:%HTTP6PORT

- Accept: */*

- 

- </protocol>
diff --git a/net-misc/curl/files/curl-7.20.0-strip-ldflags.patch b/net-misc/curl/files/curl-7.20.0-strip-ldflags.patch
deleted file mode 100644
index 8c074fbd4edd..000000000000
--- a/net-misc/curl/files/curl-7.20.0-strip-ldflags.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- curl-config.in.orig	2007-09-14 07:36:18.000000000 +1000
-+++ curl-config.in	2007-09-14 07:37:14.000000000 +1000
-@@ -187,9 +187,9 @@
- 	   CURLLIBDIR=""
- 	fi
- 	if test "X@REQUIRE_LIB_DEPS@" = "Xyes"; then
--	  echo ${CURLLIBDIR}-lcurl @LDFLAGS@ @LIBCURL_LIBS@ @LIBS@
-+	  echo ${CURLLIBDIR}-lcurl @LIBCURL_LIBS@ @LIBS@
- 	else
--	  echo ${CURLLIBDIR}-lcurl @LDFLAGS@ @LIBS@
-+	  echo ${CURLLIBDIR}-lcurl @LIBS@
- 	fi
- 	;;
- 
diff --git a/net-misc/curl/files/curl-7.27.0-curl-config.patch b/net-misc/curl/files/curl-7.27.0-curl-config.patch
deleted file mode 100644
index 06f0eb263fdc..000000000000
--- a/net-misc/curl/files/curl-7.27.0-curl-config.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -Naur curl-7.27.0.orig/curl-config.in curl-7.27.0/curl-config.in
---- curl-7.27.0.orig/curl-config.in	2012-05-25 23:56:17.000000000 +0200
-+++ curl-7.27.0/curl-config.in	2012-07-31 22:07:36.539655495 +0200
-@@ -135,9 +135,9 @@
-           CPPFLAG_CURL_STATICLIB=""
-         fi
-        	if test "X@includedir@" = "X/usr/include"; then
--          echo "$(CPPFLAG_CURL_STATICLIB)"
-+          echo "${CPPFLAG_CURL_STATICLIB}"
-         else
--          echo "$(CPPFLAG_CURL_STATICLIB)-I@includedir@"
-+          echo "${CPPFLAG_CURL_STATICLIB}-I@includedir@"
-         fi
-        	;;
- 
diff --git a/net-misc/curl/files/curl-7.27.0-fix-metalink-gnutls.patch b/net-misc/curl/files/curl-7.27.0-fix-metalink-gnutls.patch
deleted file mode 100644
index 7cbd98b1a704..000000000000
--- a/net-misc/curl/files/curl-7.27.0-fix-metalink-gnutls.patch
+++ /dev/null
@@ -1,148 +0,0 @@
-From 9f304291bd72aae66944cd7523707e1b88c6ad7b Mon Sep 17 00:00:00 2001
-From: Daniel Stenberg <daniel@haxx.se>
-Date: Mon, 6 Aug 2012 19:20:35 +0200
-Subject: [PATCH] metalink: change code order to build with gnutls-nettle
-
-Bug: http://curl.haxx.se/bug/view.cgi?id=3554668
-Reported by: Anthony G. Basile
----
- src/tool_metalink.c |  116 +++++++++++++++++++++++++--------------------------
- 1 file changed, 58 insertions(+), 58 deletions(-)
-
-diff --git a/src/tool_metalink.c b/src/tool_metalink.c
-index 5491815..3a24a15 100644
---- a/src/tool_metalink.c
-+++ b/src/tool_metalink.c
-@@ -82,64 +82,6 @@
-     return PARAM_NO_MEM; \
- } WHILE_FALSE
- 
--const digest_params MD5_DIGEST_PARAMS[] = {
--  {
--    (Curl_digest_init_func) MD5_Init,
--    (Curl_digest_update_func) MD5_Update,
--    (Curl_digest_final_func) MD5_Final,
--    sizeof(MD5_CTX),
--    16
--  }
--};
--
--const digest_params SHA1_DIGEST_PARAMS[] = {
--  {
--    (Curl_digest_init_func) SHA1_Init,
--    (Curl_digest_update_func) SHA1_Update,
--    (Curl_digest_final_func) SHA1_Final,
--    sizeof(SHA_CTX),
--    20
--  }
--};
--
--const digest_params SHA256_DIGEST_PARAMS[] = {
--  {
--    (Curl_digest_init_func) SHA256_Init,
--    (Curl_digest_update_func) SHA256_Update,
--    (Curl_digest_final_func) SHA256_Final,
--    sizeof(SHA256_CTX),
--    32
--  }
--};
--
--static const metalink_digest_def SHA256_DIGEST_DEF[] = {
--  {"sha-256", SHA256_DIGEST_PARAMS}
--};
--
--static const metalink_digest_def SHA1_DIGEST_DEF[] = {
--  {"sha-1", SHA1_DIGEST_PARAMS}
--};
--
--static const metalink_digest_def MD5_DIGEST_DEF[] = {
--  {"md5", MD5_DIGEST_PARAMS}
--};
--
--/*
-- * The alias of supported hash functions in the order by preference
-- * (basically stronger hash comes first). We included "sha-256" and
-- * "sha256". The former is the name defined in the IANA registry named
-- * "Hash Function Textual Names". The latter is widely (and
-- * historically) used in Metalink version 3.
-- */
--static const metalink_digest_alias digest_aliases[] = {
--  {"sha-256", SHA256_DIGEST_DEF},
--  {"sha256", SHA256_DIGEST_DEF},
--  {"sha-1", SHA1_DIGEST_DEF},
--  {"sha1", SHA1_DIGEST_DEF},
--  {"md5", MD5_DIGEST_DEF},
--  {NULL, NULL}
--};
--
- #ifdef USE_GNUTLS_NETTLE
- 
- static void MD5_Init(MD5_CTX *ctx)
-@@ -251,6 +193,64 @@ static void SHA256_Final(unsigned char digest[32], SHA256_CTX *ctx)
- 
- #endif /* CRYPTO LIBS */
- 
-+const digest_params MD5_DIGEST_PARAMS[] = {
-+  {
-+    (Curl_digest_init_func) MD5_Init,
-+    (Curl_digest_update_func) MD5_Update,
-+    (Curl_digest_final_func) MD5_Final,
-+    sizeof(MD5_CTX),
-+    16
-+  }
-+};
-+
-+const digest_params SHA1_DIGEST_PARAMS[] = {
-+  {
-+    (Curl_digest_init_func) SHA1_Init,
-+    (Curl_digest_update_func) SHA1_Update,
-+    (Curl_digest_final_func) SHA1_Final,
-+    sizeof(SHA_CTX),
-+    20
-+  }
-+};
-+
-+const digest_params SHA256_DIGEST_PARAMS[] = {
-+  {
-+    (Curl_digest_init_func) SHA256_Init,
-+    (Curl_digest_update_func) SHA256_Update,
-+    (Curl_digest_final_func) SHA256_Final,
-+    sizeof(SHA256_CTX),
-+    32
-+  }
-+};
-+
-+static const metalink_digest_def SHA256_DIGEST_DEF[] = {
-+  {"sha-256", SHA256_DIGEST_PARAMS}
-+};
-+
-+static const metalink_digest_def SHA1_DIGEST_DEF[] = {
-+  {"sha-1", SHA1_DIGEST_PARAMS}
-+};
-+
-+static const metalink_digest_def MD5_DIGEST_DEF[] = {
-+  {"md5", MD5_DIGEST_PARAMS}
-+};
-+
-+/*
-+ * The alias of supported hash functions in the order by preference
-+ * (basically stronger hash comes first). We included "sha-256" and
-+ * "sha256". The former is the name defined in the IANA registry named
-+ * "Hash Function Textual Names". The latter is widely (and
-+ * historically) used in Metalink version 3.
-+ */
-+static const metalink_digest_alias digest_aliases[] = {
-+  {"sha-256", SHA256_DIGEST_DEF},
-+  {"sha256", SHA256_DIGEST_DEF},
-+  {"sha-1", SHA1_DIGEST_DEF},
-+  {"sha1", SHA1_DIGEST_DEF},
-+  {"md5", MD5_DIGEST_DEF},
-+  {NULL, NULL}
-+};
-+
- digest_context *Curl_digest_init(const digest_params *dparams)
- {
-   digest_context *ctxt;
--- 
-1.7.10.4
-
diff --git a/net-misc/curl/files/curl-7.27.0-fix-nettle-include.patch b/net-misc/curl/files/curl-7.27.0-fix-nettle-include.patch
deleted file mode 100644
index b0a81657fd89..000000000000
--- a/net-misc/curl/files/curl-7.27.0-fix-nettle-include.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 986c7949c0638bebb99bd08d63216433254c2185 Mon Sep 17 00:00:00 2001
-From: Daniel Stenberg <daniel@haxx.se>
-Date: Mon, 6 Aug 2012 15:04:25 +0200
-Subject: [PATCH] gtls: fix build failure by including nettle-specific headers
-
-Bug: http://curl.haxx.se/bug/view.cgi?id=3554668
-Reported by: Anthony G. Basile
----
- lib/gtls.c |    5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/lib/gtls.c b/lib/gtls.c
-index d981ef1..c750a6f 100644
---- a/lib/gtls.c
-+++ b/lib/gtls.c
-@@ -34,7 +34,10 @@
- 
- #include <gnutls/gnutls.h>
- #include <gnutls/x509.h>
--#ifndef USE_GNUTLS_NETTLE
-+#ifdef USE_GNUTLS_NETTLE
-+#include <gnutls/crypto.h>
-+#include <nettle/md5.h>
-+#else
- #include <gcrypt.h>
- #endif
- 
--- 
-1.7.10.4
-
diff --git a/net-misc/curl/files/curl-7.27.0-prefix.patch b/net-misc/curl/files/curl-7.27.0-prefix.patch
deleted file mode 100644
index 4f37d8b473f6..000000000000
--- a/net-misc/curl/files/curl-7.27.0-prefix.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -Naur curl-7.27.0.orig//curl-config.in curl-7.27.0/curl-config.in
---- curl-7.27.0.orig//curl-config.in	2012-05-25 17:56:17.000000000 -0400
-+++ curl-7.27.0/curl-config.in	2012-07-29 06:47:37.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.28.0-fix-http-auth.patch b/net-misc/curl/files/curl-7.28.0-fix-http-auth.patch
deleted file mode 100644
index 441fd3f47e33..000000000000
--- a/net-misc/curl/files/curl-7.28.0-fix-http-auth.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Revert "zero out auth structs before transfer" which breaks http/https auth.
-
-See:
-https://bugs.gentoo.org/show_bug.cgi?id=438718
-https://sourceforge.net/tracker/?func=detail&aid=3577557&group_id=976&atid=100976
-
---
-diff --git a/lib/transfer.c b/lib/transfer.c
-index 2ad5fad..a00469e 100644
---- a/lib/transfer.c
-+++ b/lib/transfer.c
-@@ -1433,10 +1433,6 @@ CURLcode Curl_pretransfer(struct SessionHandle *data)
- 
-   data->state.ssl_connect_retry = FALSE;
- 
--  /* zero out auth state */
--  memset(&data->state.authhost, 0, sizeof(struct auth));
--  memset(&data->state.authproxy, 0, sizeof(struct auth));
--
-   data->state.authproblem = FALSE;
-   data->state.authhost.want = data->set.httpauth;
-   data->state.authproxy.want = data->set.proxyauth;
diff --git a/net-misc/curl/files/curl-7.28.0-prefix.patch b/net-misc/curl/files/curl-7.28.0-prefix.patch
deleted file mode 100644
index 377d03b06121..000000000000
--- a/net-misc/curl/files/curl-7.28.0-prefix.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -Nuar curl-7.28.0.orig/curl-config.in curl-7.28.0/curl-config.in
---- curl-7.28.0.orig/curl-config.in	2012-08-08 17:38:25.000000000 -0400
-+++ curl-7.28.0/curl-config.in	2012-10-13 17:11:30.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.29.0-fix-null-pointer.patch b/net-misc/curl/files/curl-7.29.0-fix-null-pointer.patch
deleted file mode 100644
index 3a20c8ab19b2..000000000000
--- a/net-misc/curl/files/curl-7.29.0-fix-null-pointer.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Fix NULL pointer reference when closing an unused multi handle.
-
-This is commit da3fc1e from upstream, modulo test 1508.
-
-X-Gentoo-Bug: 456842
-X-Gentoo-Bug-URL: https://bugs.gentoo.org/456842
-Reported-by: Thomas McShane <firewrks@yahoo.com>
-
-diff --git a/lib/multi.c b/lib/multi.c
-index fa0afb9..706df23 100644
---- a/lib/multi.c
-+++ b/lib/multi.c
-@@ -1773,10 +1773,12 @@ CURLMcode curl_multi_cleanup(CURLM *multi_handle)
-     /* Close all the connections in the connection cache */
-     close_all_connections(multi);
- 
--    multi->closure_handle->dns.hostcache = multi->hostcache;
--    Curl_hostcache_clean(multi->closure_handle);
-+    if(multi->closure_handle) {
-+      multi->closure_handle->dns.hostcache = multi->hostcache;
-+      Curl_hostcache_clean(multi->closure_handle);
- 
--    Curl_close(multi->closure_handle);
-+      Curl_close(multi->closure_handle);
-+    }
-     multi->closure_handle = NULL;
- 
-     Curl_hash_destroy(multi->sockhash);
diff --git a/net-misc/curl/files/curl-respect-cflags.patch b/net-misc/curl/files/curl-respect-cflags.patch
deleted file mode 100644
index c0ea64e15207..000000000000
--- a/net-misc/curl/files/curl-respect-cflags.patch
+++ /dev/null
@@ -1,281 +0,0 @@
-diff -urN curl-7.21.4.old/m4/curl-compilers.m4 curl-7.21.4/m4/curl-compilers.m4
---- curl-7.21.4.old/m4/curl-compilers.m4	2011-02-19 18:05:43.000000000 +0100
-+++ curl-7.21.4/m4/curl-compilers.m4	2011-02-19 18:11:04.000000000 +0100
-@@ -86,19 +86,19 @@
-     clangvhi=`echo $clangver | cut -d . -f1`
-     clangvlo=`echo $clangver | cut -d . -f2`
-     compiler_num=`(expr $clangvhi "*" 100 + $clangvlo) 2>/dev/null`
--    flags_dbg_all="-g -g0 -g1 -g2 -g3"
--    flags_dbg_all="$flags_dbg_all -ggdb"
--    flags_dbg_all="$flags_dbg_all -gstabs"
--    flags_dbg_all="$flags_dbg_all -gstabs+"
--    flags_dbg_all="$flags_dbg_all -gcoff"
--    flags_dbg_all="$flags_dbg_all -gxcoff"
--    flags_dbg_all="$flags_dbg_all -gdwarf-2"
--    flags_dbg_all="$flags_dbg_all -gvms"
--    flags_dbg_yes="-g"
--    flags_dbg_off="-g0"
--    flags_opt_all="-O -O0 -O1 -O2 -Os -O3 -O4"
--    flags_opt_yes="-Os"
--    flags_opt_off="-O0"
-+    flags_dbg_all=""
-+    flags_dbg_all=""
-+    flags_dbg_all=""
-+    flags_dbg_all=""
-+    flags_dbg_all=""
-+    flags_dbg_all=""
-+    flags_dbg_all=""
-+    flags_dbg_all=""
-+    flags_dbg_yes=""
-+    flags_dbg_off=""
-+    flags_opt_all=""
-+    flags_opt_yes=""
-+    flags_opt_off=""
-   else
-     AC_MSG_RESULT([no])
-   fi
-@@ -117,12 +117,12 @@
-     test "$curl_cv_have_def___DECC_VER" = "yes"; then
-     AC_MSG_RESULT([yes])
-     compiler_id="DEC_C"
--    flags_dbg_all="-g -g0 -g1 -g2 -g3"
--    flags_dbg_yes="-g2"
--    flags_dbg_off="-g0"
--    flags_opt_all="-O -O0 -O1 -O2 -O3 -O4"
--    flags_opt_yes="-O1"
--    flags_opt_off="-O0"
-+    flags_dbg_all=""
-+    flags_dbg_yes=""
-+    flags_dbg_off=""
-+    flags_opt_all=""
-+    flags_opt_yes=""
-+    flags_opt_off=""
-   else
-     AC_MSG_RESULT([no])
-   fi
-@@ -146,19 +146,19 @@
-     gccvhi=`echo $gccver | cut -d . -f1`
-     gccvlo=`echo $gccver | cut -d . -f2`
-     compiler_num=`(expr $gccvhi "*" 100 + $gccvlo) 2>/dev/null`
--    flags_dbg_all="-g -g0 -g1 -g2 -g3"
--    flags_dbg_all="$flags_dbg_all -ggdb"
--    flags_dbg_all="$flags_dbg_all -gstabs"
--    flags_dbg_all="$flags_dbg_all -gstabs+"
--    flags_dbg_all="$flags_dbg_all -gcoff"
--    flags_dbg_all="$flags_dbg_all -gxcoff"
--    flags_dbg_all="$flags_dbg_all -gdwarf-2"
--    flags_dbg_all="$flags_dbg_all -gvms"
--    flags_dbg_yes="-g"
--    flags_dbg_off="-g0"
--    flags_opt_all="-O -O0 -O1 -O2 -O3 -Os"
--    flags_opt_yes="-O2"
--    flags_opt_off="-O0"
-+    flags_dbg_all=""
-+    flags_dbg_all=""
-+    flags_dbg_all=""
-+    flags_dbg_all=""
-+    flags_dbg_all=""
-+    flags_dbg_all=""
-+    flags_dbg_all=""
-+    flags_dbg_all=""
-+    flags_dbg_yes=""
-+    flags_dbg_off=""
-+    flags_opt_all=""
-+    flags_opt_yes=""
-+    flags_opt_off=""
-   else
-     AC_MSG_RESULT([no])
-   fi
-@@ -175,12 +175,12 @@
-   if test "$curl_cv_have_def___HP_cc" = "yes"; then
-     AC_MSG_RESULT([yes])
-     compiler_id="HP_UX_C"
--    flags_dbg_all="-g -s"
--    flags_dbg_yes="-g"
--    flags_dbg_off="-s"
--    flags_opt_all="-O +O0 +O1 +O2 +O3 +O4"
--    flags_opt_yes="+O2"
--    flags_opt_off="+O0"
-+    flags_dbg_all=""
-+    flags_dbg_yes=""
-+    flags_dbg_off=""
-+    flags_opt_all=""
-+    flags_opt_yes=""
-+    flags_opt_off=""
-   else
-     AC_MSG_RESULT([no])
-   fi
-@@ -197,19 +197,19 @@
-   if test "$curl_cv_have_def___IBMC__" = "yes"; then
-     AC_MSG_RESULT([yes])
-     compiler_id="IBM_C"
--    flags_dbg_all="-g -g0 -g1 -g2 -g3"
--    flags_dbg_yes="-g"
-+    flags_dbg_all=""
-+    flags_dbg_yes=""
-     flags_dbg_off=""
--    flags_opt_all="-O -O0 -O1 -O2 -O3 -O4 -O5"
--    flags_opt_all="$flags_opt_all -qnooptimize"
--    flags_opt_all="$flags_opt_all -qoptimize=0"
--    flags_opt_all="$flags_opt_all -qoptimize=1"
--    flags_opt_all="$flags_opt_all -qoptimize=2"
--    flags_opt_all="$flags_opt_all -qoptimize=3"
--    flags_opt_all="$flags_opt_all -qoptimize=4"
--    flags_opt_all="$flags_opt_all -qoptimize=5"
--    flags_opt_yes="-O2"
--    flags_opt_off="-qnooptimize"
-+    flags_opt_all=""
-+    flags_opt_all=""
-+    flags_opt_all=""
-+    flags_opt_all=""
-+    flags_opt_all=""
-+    flags_opt_all=""
-+    flags_opt_all=""
-+    flags_opt_all=""
-+    flags_opt_yes=""
-+    flags_opt_off=""
-   else
-     AC_MSG_RESULT([no])
-   fi
-@@ -230,27 +230,27 @@
-     CURL_CHECK_DEF([__unix__], [], [silent])
-     if test "$curl_cv_have_def___unix__" = "yes"; then
-       compiler_id="INTEL_UNIX_C"
--      flags_dbg_all="-g -g0"
--      flags_dbg_yes="-g"
--      flags_dbg_off="-g0"
--      flags_opt_all="-O -O0 -O1 -O2 -O3 -Os"
--      flags_opt_yes="-O2"
--      flags_opt_off="-O0"
-+      flags_dbg_all=""
-+      flags_dbg_yes=""
-+      flags_dbg_off=""
-+      flags_opt_all=""
-+      flags_opt_yes=""
-+      flags_opt_off=""
-     else
-       compiler_id="INTEL_WINDOWS_C"
--      flags_dbg_all="/ZI /Zi /zI /zi /ZD /Zd /zD /zd /Z7 /z7 /Oy /Oy-"
--      flags_dbg_all="$flags_dbg_all /debug"
--      flags_dbg_all="$flags_dbg_all /debug:none"
--      flags_dbg_all="$flags_dbg_all /debug:minimal"
--      flags_dbg_all="$flags_dbg_all /debug:partial"
--      flags_dbg_all="$flags_dbg_all /debug:full"
--      flags_dbg_all="$flags_dbg_all /debug:semantic_stepping"
--      flags_dbg_all="$flags_dbg_all /debug:extended"
--      flags_dbg_yes="/Zi /Oy-"
--      flags_dbg_off="/debug:none /Oy-"
--      flags_opt_all="/O /O0 /O1 /O2 /O3 /Od /Og /Og- /Oi /Oi-"
--      flags_opt_yes="/O2"
--      flags_opt_off="/Od"
-+      flags_dbg_all=""
-+      flags_dbg_all=""
-+      flags_dbg_all=""
-+      flags_dbg_all=""
-+      flags_dbg_all=""
-+      flags_dbg_all=""
-+      flags_dbg_all=""
-+      flags_dbg_all=""
-+      flags_dbg_yes=""
-+      flags_dbg_off=""
-+      flags_opt_all=""
-+      flags_opt_yes=""
-+      flags_opt_off=""
-     fi
-   else
-     AC_MSG_RESULT([no])
-@@ -268,8 +268,8 @@
-   if test "$curl_cv_have_def___LCC__" = "yes"; then
-     AC_MSG_RESULT([yes])
-     compiler_id="LCC"
--    flags_dbg_all="-g"
--    flags_dbg_yes="-g"
-+    flags_dbg_all=""
-+    flags_dbg_yes=""
-     flags_dbg_off=""
-     flags_opt_all=""
-     flags_opt_yes=""
-@@ -294,12 +294,12 @@
-     test "$compiler_id" = "unknown"; then
-     AC_MSG_RESULT([yes])
-     compiler_id="SGI_MIPS_C"
--    flags_dbg_all="-g -g0 -g1 -g2 -g3"
--    flags_dbg_yes="-g"
--    flags_dbg_off="-g0"
--    flags_opt_all="-O -O0 -O1 -O2 -O3 -Ofast"
--    flags_opt_yes="-O2"
--    flags_opt_off="-O0"
-+    flags_dbg_all=""
-+    flags_dbg_yes=""
-+    flags_dbg_off=""
-+    flags_opt_all=""
-+    flags_opt_yes=""
-+    flags_opt_off=""
-   else
-     AC_MSG_RESULT([no])
-   fi
-@@ -321,12 +321,12 @@
-      test "$curl_cv_have_def__COMPILER_VERSION" = "yes"); then
-     AC_MSG_RESULT([yes])
-     compiler_id="SGI_MIPSPRO_C"
--    flags_dbg_all="-g -g0 -g1 -g2 -g3"
--    flags_dbg_yes="-g"
--    flags_dbg_off="-g0"
--    flags_opt_all="-O -O0 -O1 -O2 -O3 -Ofast"
--    flags_opt_yes="-O2"
--    flags_opt_off="-O0"
-+    flags_dbg_all=""
-+    flags_dbg_yes=""
-+    flags_dbg_off=""
-+    flags_opt_all=""
-+    flags_opt_yes=""
-+    flags_opt_off=""
-   else
-     AC_MSG_RESULT([no])
-   fi
-@@ -343,11 +343,11 @@
-   if test "$curl_cv_have_def___SUNPRO_C" = "yes"; then
-     AC_MSG_RESULT([yes])
-     compiler_id="SUNPRO_C"
--    flags_dbg_all="-g -s"
--    flags_dbg_yes="-g"
--    flags_dbg_off="-s"
--    flags_opt_all="-O -xO -xO1 -xO2 -xO3 -xO4 -xO5"
--    flags_opt_yes="-xO2"
-+    flags_dbg_all=""
-+    flags_dbg_yes=""
-+    flags_dbg_off=""
-+    flags_opt_all=""
-+    flags_opt_yes=""
-     flags_opt_off=""
-   else
-     AC_MSG_RESULT([no])
-@@ -365,8 +365,8 @@
-   if test "$curl_cv_have_def___TINYC__" = "yes"; then
-     AC_MSG_RESULT([yes])
-     compiler_id="TINY_C"
--    flags_dbg_all="-g -b"
--    flags_dbg_yes="-g"
-+    flags_dbg_all=""
-+    flags_dbg_yes=""
-     flags_dbg_off=""
-     flags_opt_all=""
-     flags_opt_yes=""
-@@ -389,12 +389,12 @@
-     CURL_CHECK_DEF([__UNIX__], [], [silent])
-     if test "$curl_cv_have_def___UNIX__" = "yes"; then
-       compiler_id="WATCOM_UNIX_C"
--      flags_dbg_all="-g1 -g1+ -g2 -g3"
--      flags_dbg_yes="-g2"
-+      flags_dbg_all=""
-+      flags_dbg_yes=""
-       flags_dbg_off=""
--      flags_opt_all="-O0 -O1 -O2 -O3"
--      flags_opt_yes="-O2"
--      flags_opt_off="-O0"
-+      flags_opt_all=""
-+      flags_opt_yes=""
-+      flags_opt_off=""
-     else
-       compiler_id="WATCOM_WINDOWS_C"
-       flags_dbg_all=""
diff --git a/net-misc/curl/metadata.xml b/net-misc/curl/metadata.xml
index 95bef496087e..acec1e2d9af6 100644
--- a/net-misc/curl/metadata.xml
+++ b/net-misc/curl/metadata.xml
@@ -10,11 +10,8 @@
 		<name>Greg Kroah-Hartman</name>
 	</maintainer>
 	<use>
-		<flag name="ares">Enabled c-ares dns support</flag>
 		<flag name="ssh">Enabled SSH urls in curl using libssh2</flag>
-		<flag name="gnutls">Prefer gnutls over nss and openssl as the crypto engine</flag>
 		<flag name="metalink">Enable metalink support</flag>
-		<flag name="nss">Prefer NSS over openssl as the crypto engine</flag>
 		<flag name="ssl">Enable crypto engine support (via openssl if USE='-gnutls -nss')</flag>
 		<flag name="rtmp">Enable Enables RTMPDump Streaming Media support</flag>
 	</use>