Version bump, add metalink and rtmp support, bugs #423303, #428446

Package-Manager: portage-2.1.10.65/cvs/Linux x86_64

5 files changed, 258 insertions, 21 deletions

diff --git a/net-misc/curl/ChangeLog b/net-misc/curl/ChangeLog
index 2e01a6da0e31..61cbc24db92b 100644
--- a/net-misc/curl/ChangeLog
+++ b/net-misc/curl/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/curl
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/ChangeLog,v 1.232 2012/07/24 14:16:29 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/ChangeLog,v 1.233 2012/07/29 14:46:03 blueness Exp $
+
+*curl-7.27.0 (29 Jul 2012)
+
+  29 Jul 2012; Anthony G. Basile <blueness@gentoo.org> +curl-7.27.0.ebuild,
+  +files/curl-7.27.0-prefix.patch, metadata.xml:
+  Version bump, add metalink and rtmp support, bugs #423303, #428446
 
   24 Jul 2012; Jeroen Roovers <jer@gentoo.org> curl-7.26.0.ebuild:
   Marked ~hppa (bug #427262).
diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index 355b312ffd3f..975e8f4acb89 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -5,6 +5,7 @@ AUX config.h.ed 501 SHA256 ab7941abb65756bc18dac7310e413ede974b1556fafdb5f8ba699
 AUX curl-7.18.2-prefix.patch 662 SHA256 ba5530d4ce9175eb54944716768ce33278e5de236cbeeb2a80caefff709ff0f8 SHA512 a7f53f47cb3bd13d01a226f11254c02f197b78d1a889af7840be621476f506324907f8a4aad491361021b98947931f1e5494f902b4bbce315e69a191ce2686c9 WHIRLPOOL ece9a7f1408f7bf49b6cc6f0ff5a988a77424e40f6406697e44ed1fb46b52c275cffe6561c1fe927269eeaf071ef5a97729fc2af0237dc334c7c9552cde7094d
 AUX curl-7.19.7-test241.patch 483 SHA256 e06c33750b5337b2700445a073b96d0ab817584fffbf24ac386668cd5e98d450 SHA512 d76aeaff9fe033db215f791cb647190a4349bc4fcc6cac04e886acba776dbe06710bb07084ce32fcd9858d4b5535a9b96ba12318ab52820ee92e6a8b22fb90a1 WHIRLPOOL 777fb1efe3e54fa987dc168d26489f4a9a208af1c43387618e26b603b8b4a2cab5f3347b285d97a0a4c62117bddf602b768537742e04e29b7aa06304075cb420
 AUX curl-7.20.0-strip-ldflags.patch 419 SHA256 eabd5d5ed0c154b834376a76334581c5ef0ef6a51ea7229c79e4cfc02bd446c6 SHA512 5246f307fc56169c3c34361052ce16aceb6fcb3647fe7c231b6c0d3396f8c55ea2b86eafc24395ae6e629a6ecc989e05c8b28d76263527438e43079dd3d77275 WHIRLPOOL 453a840568f63bcc67091f0e4d8e76b81607f20a6b02696f22c89eab8977925138fe3e96e75d100b9c085554299339016cfefa8a039c8609ef51684dffd4c16b
+AUX curl-7.27.0-prefix.patch 844 SHA256 93b14803f879182ff442433a14f7ff8e2a2548dc7aad401166d0ab25c5ef063d SHA512 33041d00dc1e3b70c97a2541e3e191656153f9d67d75feef9b3c9c6d1cce999fd71a0108f4712fa01a2c0d7f53a96d58a32f719cb7227b033926e6382e4b0bd8 WHIRLPOOL 5792435686ace59090936daf0aca4517171e21ba139663f2ddcdbc2df808bbe75710958f2b6412333eca9edc86b20e5a8402c5948a36695aeb228daf9d28a542
 AUX curl-fix-gnutls-nettle.patch 1186 SHA256 d7a0f1ae6dcd50adddc9d7cd6dfcdb6b5ba648c8b7f9f067a8bf56f4136f3679 SHA512 b88d4d71a1d55626aedea620e94a5b6064141c6ff0d8a64c784705d44d4a00dc789dd0a55a56320ca4c9f2b9914e72285447c9310bb4563b45d7f3430b18a0fa WHIRLPOOL 0206a8daf30f4c112c394555e455796cde7e71f632cc2b7f2612ef2cffb900d03001e5845d3683c34c6ae3aef1c1d8c4f5af30eac45d0ab621c9c0adb19397da
 AUX curl-respect-cflags-2.patch 1174 SHA256 a580b492e40bc01dcdf5527f7b69b06ef3a06a329314f48991de0ab9871e5cfe SHA512 f651f46462ff9662784ccb07063853c164171e76ff6e7dc917271c997bd392f51a97694704196af0df9adfde55640e91757eacc102a840ae288875dfe86dcf41 WHIRLPOOL 1c1b3a6755450396f5bb953fd6342f5597ddf6bb535373c561aeae0fa79a1646f31b03f0348443ca8ab21f7616dbf4344485ec0dd20abc4881c31c42616ba4a9
 AUX curl-respect-cflags-3.patch 406 SHA256 b87bf2c491b057bc5af5258fffcf72d7c5e86b03218f497f097eeca845c0bc0d SHA512 3219e4e67d534e35012909243fc8d69d58989462db44dd507c502e7aaa299f1d9a01392e2c83797cc2bdb53d503470c5d6e7bf94572a6ccc6e5eafcc0466bc54 WHIRLPOOL 5d61ec7f36376bd9712e0fc7984006462ab27a7e2003dd92a8d9e78e97a2e620a5cbf6a62855ebff45b2fbf9f0bca821ffdf6ce8ff81cf2a047af9e168fb61bd
@@ -14,16 +15,18 @@ DIST curl-7.21.4.tar.bz2 2256354 SHA256 d5337445462cbb4810ff73f14de4b259f825b218
 DIST curl-7.24.0.tar.bz2 2406936 SHA256 ebdb111088ff8b0e05b1d1b075e9f1608285e8105cc51e21caacf33d01812c16 SHA512 de40ecb08cdaeb64b99b9a70a59fc5e1d6ff18113df9586dd5199664bdbb10b2dcb2a134aa997fc05d12d7fdb016fddd9cbb8152a09caaee0d69866a0b08047a WHIRLPOOL e658358faddca5f7a19029614010e2c59930f5bdab86030bf3a51441ad64c34b746025f4cee06ae09b3a3b73516ea159976e2771507d96c98462652b6944d1be
 DIST curl-7.25.0.tar.bz2 2418060 SHA256 cfb29139dfeb2449bf8a89963c3aed7d87f034013f05564cc0330b435c90b491 SHA512 8053d942f145933a5a293ddc4d3fd7651ccacb57138d9fa23ecb623fd73bbc4d31027a1d3c664be639859f37e54461ace36c29a5063aed1e1fcf7aa0442afecf WHIRLPOOL a4310af47ab46dba203f89ae211509d117fcbb86d64e9f304eac9818f283775452c6f8f30715943336644d84e8149ed8da551bc876626c9f0f63fda4c5be7c33
 DIST curl-7.26.0.tar.bz2 2422651 SHA256 fced262f16eb6bfcdcea15e04a7905ffcb5ff04b14a19ca35b9df86d6720d26a SHA512 da67063bc9907088ef8ecd6039b7a6c8c104060bc060561f2f3a8c23bf2f0dcc06e2d240275d08bcfb72e7ac8b0c22c3e191125dab4cfaa757ee2a892cb49159 WHIRLPOOL 61f0611b42bb6a61758cec1647335071bf0503681de2bbf38f33b4b70d1beb2df546e61efabcab642b29b57c1c1ca9275470a35b47f21b77752bf7ba276fb6d0
+DIST curl-7.27.0.tar.bz2 2476068 SHA256 aba5582135c28470b46084da9747470c1c680485fc91f9f0d3f7928df8169398 SHA512 2a9abffedbf9dc29cd80e192758de9e6e9fd32f14fd3e4f3d0e97d5ab39d950692a8497d06508a5e59f579bf8468bf2648e878bdf96b43e3ef3ab59988a6dd3e WHIRLPOOL 4a1121f1c762e02c2215e7ce5b1cd67601d791643ca0b863b89d4de02005f2b041b8bc2e27320c3fe106ed8f09df3a537283b192fa4bd2ef3bde6432ba8d0197
 EBUILD curl-7.21.4.ebuild 3514 SHA256 90020645c61c93a010fc61c020179e42ebcea70ee191fc8d18ac45916d99a328 SHA512 c5b55fdd2ec42e113eb190e3eb5895bc14c6abc97768d3d616360628a7be9a84703b690a860f5037c76dd1bbe858ec04035d69213284756840ef597a1d4f9882 WHIRLPOOL 07bbe20b8deecca17161311b8ccda88c6593b9aa73a29257bdde53ef720733ef9f2c10ae748e3e7c81bced17f372068e5b57e8fd07e027d528f5905825fc2434
 EBUILD curl-7.24.0.ebuild 3726 SHA256 ae2afb4021a571cfdbeffa2705b8a202d303b3101176908b6563324ff40969f1 SHA512 d6c2fbc54617a66f6739cfa9a9372358d4bd08002f8e7717444b795f6cbf6b75f4c1f8b64b11d7775e31cc42acc151951acf11cf8605c80feabfa1ea0f1116fa WHIRLPOOL 4cdc34e1ee6826da1de7db2d9e97e1529119ad077a4c6628c9cfed4894a609236c8d726873f361120c34022cdd097f92df23e325926a5120dbf58cd3d634080e
 EBUILD curl-7.25.0-r1.ebuild 5834 SHA256 c14d3185b39d5ef166215b13d4e353f24945d2c8888ce99da8845e5ddfaad48d SHA512 868b5b3dcc038d124aa6a1dca8ff8957d9c76c5ec37ea2ea647c6ed15272066de53d439db99208ee20d146a5c505eb3b1044660e9e75c285ebc9c8353a3a6b11 WHIRLPOOL a35bd0a5d79f149ff9046c6ffb47a526e8569d06b72601fcf627df5805173ca2a27f4223ea9a78e181588383d2789a1ded8e37b9c20cb34561d7927930f4946b
 EBUILD curl-7.26.0.ebuild 6091 SHA256 e7a9b6e2da2b86aa15f68c9d4ab74fa7db274740677afd42e56c797b54ce60c4 SHA512 d1a02aebc621d7f95cdc634caa5eb6bb50d50ec7fe3f6cc3fbf0ae0d0de90be399ba342862cf7cdf9b974b39aee0d530f0de0a15e434dff15567ca0cc349200e WHIRLPOOL 98a7a36cdbaadc631c1ad0a644d34d4c68f26b0ce72ceefda4c965c1ac7bed52b7fedb1cd1aadf99cb6e1182363d8d4bb8e7b0e4845d5078cb76d55d6f081098
-MISC ChangeLog 37774 SHA256 8a924fb52a3c944f05521f4e56f7c4076a457e04a5b63d95eef3a324f453bced SHA512 e874164bc0c59ac9d3674ffbc3bc2389c564b4fd7df8c9b10511b12bbecbe3347d1ed701c5f8fd534e6da615da5d7182ea2aa03a94435f40615ad16e4329abe5 WHIRLPOOL 25163181c34c18004af9a46d6ded1ac77c11ff5e7e19afceed0a49d468b631f88448f3af01d77fd1a69edf320c445db222fa52086cf1e391598994abc22ed465
-MISC metadata.xml 741 SHA256 fac785fc33b177d6a7ce27f38f3bfd10b6d2a98b7f8856269ef033bc19fd592d SHA512 3475c8590790d10c37c6f34709c563ba48a69fdb146a4004a1ad19bf87eb63620fd022eec6edfcf7ba053223fcca54553f0ae232bf793a5937f5bd8840c92a9f WHIRLPOOL 6e3050a2bb9bfae34fe91df9a5eabdc65a640d9e3bff76b0c590dc0c7ce959329349e37ffdf568e931ff801c34abb4cd024977cdcb94ac75b478778e2e4898ca
+EBUILD curl-7.27.0.ebuild 6389 SHA256 4dbb78cc5c51915e36e86363853741b44d716993e2620ef1355b6729baa8dc67 SHA512 0c80f9ef2291cff0d3bac7b75a9cc2c0e08ac7402e8abcff05a14b0fd1b8f2139e36e3543a53f0b430b471553e05de42a4be3b52fb20d29c6bc71a433de1a79d WHIRLPOOL 0f1e83395472bc73d10a3683d87c201ad1c2c987f58cdff180899d8c75eed562a181dcc1e8bdda44354e4736c1e06d5145a137fb2bcd7c4a8eb1cc5342cf8ef1
+MISC ChangeLog 38002 SHA256 c4fd771230d63236f9b592a7bf524ebcd630a525b4df33cafae3e422d8b7f00b SHA512 7e2c1db2bab004189a9b105cd3f7330d15d9d19242bf0ed2c30a8037a667dfa009cd4435950582718ce2d55600add0378f5270c716f44c58f4cfc9410a30901e WHIRLPOOL cf4c0e4ce3d1bc82be7627e34694f20ad65defe2d0543dc432df4dbb5fbdd98ec0b51f928d0c541187af7e602854d3ba2b2eaa2d60fad35568e03d6d4be07e85
+MISC metadata.xml 847 SHA256 94b3fe2abeff0838aa4374c296d9a896563957a33ba84c1c194fac0455664f8b SHA512 52e3118cb86825cf0d7bb63c6aeec5a37eb9939c5def57f05e6b9d54187687bf60634da01b347e46de04da8ceeac084ce83c9b69ea7a2f2a45981371b3b68987 WHIRLPOOL 49f0c28c28e13b006238e4200acf2613c7ca6011b83ee6145c2ef6bf00ec496125c44d0cd714284e8e1e70b17b20fd675d2f933f7972bc4cf397cc17ff52745d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlAOrkMACgkQVWmRsqeSphOuegCfRDBkLeATKt8Hd7YsDbi1UDcv
-HD0An1j0JMqtMOrzBCovuK4uUN+tfTtj
-=abjw
+iEYEAREIAAYFAlAVTLYACgkQl5yvQNBFVTViEgCdHzP/VePYhmbU5t3inZK9hypS
+XWkAoIBdpEdJ04c8GhsSid/GFw5Wj9O7
+=c5V7
 -----END PGP SIGNATURE-----
diff --git a/net-misc/curl/curl-7.27.0.ebuild b/net-misc/curl/curl-7.27.0.ebuild
new file mode 100644
index 000000000000..8880641a41d7
--- /dev/null
+++ b/net-misc/curl/curl-7.27.0.ebuild
@@ -0,0 +1,204 @@
+# 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.27.0.ebuild,v 1.1 2012/07/29 14:46:03 blueness 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="~amd64 ~arm ~mips ~ppc ~ppc64 ~s390 ~sh ~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 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?] )
+	ares? ( net-dns/c-ares )
+	kerberos? ( virtual/krb5 )
+	metalink? ( media-libs/libmetalink )
+	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}
+	sys-apps/ed
+	virtual/pkgconfig
+	test? (
+		sys-apps/diffutils
+		dev-lang/perl
+	)"
+
+# 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.27.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 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 \
+		--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.27.0-prefix.patch b/net-misc/curl/files/curl-7.27.0-prefix.patch
new file mode 100644
index 000000000000..d01b698fd2c6
--- /dev/null
+++ b/net-misc/curl/files/curl-7.27.0-prefix.patch
@@ -0,0 +1,22 @@
+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,8 @@
+        	;;
+ 
+     --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"; t
++hen
+ 	   CURLLIBDIR="-L@libdir@ "
+ 	else
+ 	   CURLLIBDIR=""
diff --git a/net-misc/curl/metadata.xml b/net-misc/curl/metadata.xml
index 311f7123f079..8cdbd910ded9 100644
--- a/net-misc/curl/metadata.xml
+++ b/net-misc/curl/metadata.xml
@@ -1,19 +1,21 @@
 <?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="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="nss">Prefer NSS over openssl as the crypto engine</flag>
-    <flag name="ssl">Enable crypto engine support (via openssl if USE='-gnutls -nss')</flag>
-  </use>
+	<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="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">Enalbe 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>
 </pkgmetadata>