Version bump, security bug #465678

Package-Manager: portage-2.1.11.55/cvs/Linux x86_64
Manifest-Sign-Key: 0xF52D4BBA

5 files changed, 248 insertions, 17 deletions

diff --git a/net-misc/curl/ChangeLog b/net-misc/curl/ChangeLog
index edb86fda5bb9..0f2eb04184ab 100644
--- a/net-misc/curl/ChangeLog
+++ b/net-misc/curl/ChangeLog
@@ -1,6 +1,12 @@
 # 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.271 2013/03/24 18:29:11 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/ChangeLog,v 1.272 2013/04/17 22:54:23 blueness Exp $
+
+*curl-7.30.0 (17 Apr 2013)
+
+  17 Apr 2013; Anthony G. Basile <blueness@gentoo.org> +curl-7.30.0.ebuild,
+  +files/curl-7.30.0-prefix.patch, metadata.xml:
+  Version bump, security bug #465678
 
   24 Mar 2013; Anthony G. Basile <blueness@gentoo.org> -curl-7.27.0-r3.ebuild,
   -curl-7.28.0-r1.ebuild, -curl-7.28.1.ebuild:
diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index e83923935752..3767bf4b8821 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -11,6 +11,7 @@ AUX curl-7.27.0-prefix.patch 842 SHA256 c0ba42416ac1f75bd63c180494c0510dc4ab47d8
 AUX curl-7.28.0-fix-http-auth.patch 744 SHA256 dbd2f399e2425aaae51d05a7c9ca3af2649c7e901245fbc5f9483ac3038a56bb SHA512 16a3f5627782c2ab4b2e721a9346f2e10cd86c6cdf6b9e765d627b5e9f6a056ee72c34531bfd1e3e6d45fc5b0a0d535a475ecadacce58002881c934b77cd35d4 WHIRLPOOL 0a8ef5811e020ddf5697d6537fcfc48b3cf62cde6d4daedb8a67d64a4b1be5608ddd0e36b6488ff5c94159b836da461e29636b121fc4a8008e1edc7a82278eb3
 AUX curl-7.28.0-prefix.patch 845 SHA256 eaff1dd29bb735b1f18362db055be73789d9ad972316f4c21a2949f2ef02a6b3 SHA512 b2e6d87a18866544d4e94bc9f646f59bd36d549b686614c31c6021dac3f987ec804908055d5664011bf379b64fd47c9e780b8b27046f27ae5839ec4a6f180430 WHIRLPOOL c3c2ed9d958c05359c7632aa8db4d5452ab830fa0b634c169ad2c54be04cc171f318ac3986496b474988c2c87166da40c8627086e13affc4b7fd4780aeb3ee0c
 AUX curl-7.29.0-fix-null-pointer.patch 949 SHA256 817acd0a372aa4486696d3bcb93a28e228397ff446a49cf78da7c5b5042d36b9 SHA512 166c4377bce4ab9c8f951f258c3116aa86839397d89bd9ec9cbaf052552a311033402246f80f17f1c479754ce57943feb03b689533dbba3bc3aa3e6488365e9a WHIRLPOOL b43386731d1e7623bd15b65b49add43bd7f6e351c1603575701dfe4c85c5f1d811bbfe5103c88d621300dac407be51ccb1bc519ab325d8b42e4ca5183f9f448d
+AUX curl-7.30.0-prefix.patch 880 SHA256 12204b7a522edbb133a3143b40b25805654d937e27ae66ba5d566a99afaa809a SHA512 c7cd13b9ccbd12ed01ea121ffece9c23b898a5b34698bae59ae1dd23b1cf2445180b84d80c4a640981f16dba5018df944f405dd5c660addab54ca21e0e673b7f WHIRLPOOL 6b60261dee31643b5db41c449ae6db14666f696470180c543ea39c3a11d7d6323057409be18a0a48a3335226ed5f78cee9fc2948dce9644e52481423147b49e5
 AUX curl-fix-gnutls-nettle.patch 1186 SHA256 d7a0f1ae6dcd50adddc9d7cd6dfcdb6b5ba648c8b7f9f067a8bf56f4136f3679 SHA512 b88d4d71a1d55626aedea620e94a5b6064141c6ff0d8a64c784705d44d4a00dc789dd0a55a56320ca4c9f2b9914e72285447c9310bb4563b45d7f3430b18a0fa WHIRLPOOL 0206a8daf30f4c112c394555e455796cde7e71f632cc2b7f2612ef2cffb900d03001e5845d3683c34c6ae3aef1c1d8c4f5af30eac45d0ab621c9c0adb19397da
 AUX curl-respect-cflags-3.patch 406 SHA256 b87bf2c491b057bc5af5258fffcf72d7c5e86b03218f497f097eeca845c0bc0d SHA512 3219e4e67d534e35012909243fc8d69d58989462db44dd507c502e7aaa299f1d9a01392e2c83797cc2bdb53d503470c5d6e7bf94572a6ccc6e5eafcc0466bc54 WHIRLPOOL 5d61ec7f36376bd9712e0fc7984006462ab27a7e2003dd92a8d9e78e97a2e620a5cbf6a62855ebff45b2fbf9f0bca821ffdf6ce8ff81cf2a047af9e168fb61bd
 AUX curl-respect-cflags.patch 8180 SHA256 fc9ac005a904efe408901cf2ee29359056bb1e49fe51a771377bedbae19bc665 SHA512 d7af93548e06b71af1295b44b0f32f510ab0833a38276f070da8a1a39f9aca6b8ef755faf62c90303a7680203f0cbc9b1796461b498202eeb2e2912110dc7b71 WHIRLPOOL c1d40e8252c6935ce5872981e987fd8953b71d631f2f6865748ab4a0a456014a9e4e9d29bad942753810d82211e886d1232f12f3e88b7478a602dfe5404eff41
@@ -18,26 +19,28 @@ DIST curl-7.21.4.tar.bz2 2256354 SHA256 d5337445462cbb4810ff73f14de4b259f825b218
 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.29.0.tar.bz2 2556495 SHA256 9d78e8bac6fa101679ca82e72a24e55918c5d495d29acb1eff62610929d3832f SHA512 b14f9aa1441d2d9c5fd35210388a97e7ffa758dc453b788d0e56b1595d3fa303793e4b086393c04861bd30e577f3acfe5aacae468f59516d8b5f3d0d8e007e57 WHIRLPOOL 211c314639faceb6d7547b78da4b61f076ed439f0f8c0b14167517bd49e0093b27dac2c6c96ad7b157a7390d8f38ad32005498fbe79dfd7a276dc2c2f43361fa
+DIST curl-7.30.0.tar.bz2 2625976 SHA256 6b1c410387bea82601baec85d6aa61955794672e36766407e99ade8d55aaaf11 SHA512 5ee8e1e8a0e650a1875198b21cb8f9d125a3790883efc6d6c21c029552b4eba1203d96c6830866ce735dae1b63d61455f0c6a7c8b540acbef77451caf23e9dd5 WHIRLPOOL 3d378db225deba8d3eed97cea7cb75aa4f42a6aba023559c00f579a95e6988cc7f5b2ffa5005e08d186057c0cbb432aed410c45e74dc22b1b7bde1eba5b9debc
 EBUILD curl-7.21.4.ebuild 3514 SHA256 90020645c61c93a010fc61c020179e42ebcea70ee191fc8d18ac45916d99a328 SHA512 c5b55fdd2ec42e113eb190e3eb5895bc14c6abc97768d3d616360628a7be9a84703b690a860f5037c76dd1bbe858ec04035d69213284756840ef597a1d4f9882 WHIRLPOOL 07bbe20b8deecca17161311b8ccda88c6593b9aa73a29257bdde53ef720733ef9f2c10ae748e3e7c81bced17f372068e5b57e8fd07e027d528f5905825fc2434
 EBUILD curl-7.25.0-r1.ebuild 5834 SHA256 c14d3185b39d5ef166215b13d4e353f24945d2c8888ce99da8845e5ddfaad48d SHA512 868b5b3dcc038d124aa6a1dca8ff8957d9c76c5ec37ea2ea647c6ed15272066de53d439db99208ee20d146a5c505eb3b1044660e9e75c285ebc9c8353a3a6b11 WHIRLPOOL a35bd0a5d79f149ff9046c6ffb47a526e8569d06b72601fcf627df5805173ca2a27f4223ea9a78e181588383d2789a1ded8e37b9c20cb34561d7927930f4946b
 EBUILD curl-7.26.0.ebuild 6086 SHA256 785de5565ed98c5e46bb1d526936047c6b44fe087a3269c3932037b32b6597f9 SHA512 b6007e66f7ecf15f7ac152c4d4f747376476e710ab47fec1c9c58bc05cc4a4d0e4e8095f0e35348896267b3ef792e9299ce48ba36da5aac112ddc75c47f38b67 WHIRLPOOL 3cfc5497af90423b2bd20cf77ae9c94d8f4d8f82cc74e6d93eccb503c19fb930a9e121e748c0e19cb6ffd876bab7b50830405069a40e2ed24651fc51a624c246
 EBUILD curl-7.29.0-r1.ebuild 6457 SHA256 3b9e97bba30e0994988cc2d6ae6cf80c2dca864fc1134712cd906772a5ed05e6 SHA512 58dfc671aa91a28ab780a3089a4fd4924051ed50f02961121e78f669aa27238d043c711e3846dd1cd6b88d899b63064850e942f518151d2102730ed05fd99ba1 WHIRLPOOL 8e8856e758bea9e22ef7f309553dda753c10d6ec22ae9ade13ddeb88f01e065c6ef900cc244588bc6c8ac1dd01f8b81a099e125ae2eff7195e3c57fa7f503a03
-MISC ChangeLog 43224 SHA256 08f05e6f1a07e26460aaa100dba481a28ecfabeff29f189ab36daa14fc4302ff SHA512 fc3759d13d759c818c0048d2514f6ebe74810caa80090500944badef19b6594db0a0cc838c9232a0728f3a97ed64d4f63139e6339d0b5ac6c02655ee3c1bdbbf WHIRLPOOL b4ba9bb43a707a25b37d0637a6ff955a62942548646d2a218c7b54fddca710b2fa3321638bb8ea681bc5be90a7b4dc7aae1a04f5ae733d425cd2200615e01449
-MISC metadata.xml 914 SHA256 5ef1a7aa505389d5251c676a19babf3da6cd327391a731c51142d98c6a592f5f SHA512 1a8dbd0b7ae28fb8a91c566ff1766d166c188c382f050a2738551ca691305154cf387464df4090aeb2b3b7c38cf54895754407e6865adf88ebd030429a9a55f3 WHIRLPOOL 376247a5eeaa313864f6abe1860976a3bdac08f438c9eac8a92ebb58811f1bf3893023314cf931023a96db093c49edf9a972ca367b118c9d7d5f006bf7c5912d
+EBUILD curl-7.30.0.ebuild 6415 SHA256 afd4cb4de56af4f6d992cf33c43e4c979cd673b4dd3167da1310eeea64b51177 SHA512 076ad2a823107da94aa6f9fe65a8be8f2e7840629fb60c586d3377928750c5bb43503b0578a3f6d9b02ffea294fea7e5994a0946d404ac6ad57d2df559112125 WHIRLPOOL 2eee10d5a43bbc8e3b58aee7315bb8ed93f9499e2485c68314c9259110a5b2cb4c555402941a166f2084514723d8f8c5de37f78422893def084921dfcb73134f
+MISC ChangeLog 43415 SHA256 ab58012f646b81978b20abb240fe7b27558db8469932d6b67cad6f181c81f4c5 SHA512 35776e6530d7aa53f6f41795a848487eb187ab925f5aa58fc78ab8ed39b13a89d963e652d6581cf6450bea5676b66390aa4f0e8a9e1f1cfdc06fa23d4d8eaeba WHIRLPOOL 69fe43dbd55e7cf9fdf3671b4ed0ba57d632cf5e37541e4e2cf42dd57ffd7dbf3a7b0334be07f8770796f0b8272d9af55b85763e3aec178af480f416ecccf5d3
+MISC metadata.xml 847 SHA256 7070c7b6514344535e09da0ab001fa610bb85853f495423d6d5db83f8f3d919c SHA512 6312bbf511e8df8f46908c6fd4967103c726dc23c09a7a7f03bde146ca2ffe50b11361cc88b2268280c5cdac2fcdf16e3e2bcd6a59692172c01610b5726baabc WHIRLPOOL e1a1965a3af5b147aa855ee48e279f5a47fd8d1387fc1e0f1fc935c33076f83c976d02a4dc54fa91845a8f0407fa99a76a05cc14ceeea3da9594b30d371bdbf0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRT0XoAAoJEJOE+m71LUu6llkQALXfTH0HX29TAatLfsrhy3L+
-20WnexNf1rM02hncFm4NTbKsKPzeGqpgS3apJM4CuXKgwNpRYrgM1wMFjQOxgv2A
-AdCbSgCc2uWEgBwEEGss6alS5WBAg0fBUvgcOALVPi/0qIbW0oRSD10M7Tzch7/L
-aES52qnnwS4YVfsol4KJp+PVxEQRXiLSWQ+Si8LnC/hYZrd5vCQMSuhV7HAQ3TPl
-f1//NX7V8ih1Wq14QBTHeN14Vo8EHmPb/wrlRlrv3nhEO9b2+/+VUCzUX+QnEcPd
-Kz+UDg01RtcFg4s+yCfFcV9i4x8ebkogEAtE1bjp0gDgg1gb4c5nYt97HDvsv/DL
-vsPY5knZRPlRUY9gk14lKEDgRXkaiTYY0KPXFIcqurl429MwVqvxi97khXR05McT
-kWkntehONf6BFaKkwUt2ToN9YAxuWT5+tRQsY9fWzmok2Bzr4oypDp7UD0QGCkyu
-DqDh+E3y+sIEeTIas6Ng4CfMjWCycWPqMgncfA/Vt/nit24U6Mwihg/4SS7S/fZU
-eAjaT/vQXhRz+YaDRIyKhbsXcwcclshAzmyWLXhGutiz4mA4xBTIwuu+95AHBz2q
-NgkxdBCmgl1FWIiQeWCI0bLLirgTbg3OjNsrer7Wl8v/uEUtzWKPCH6eRzcFrNWn
-QY9W/lhIbXTnLygjYlcU
-=G7QU
+iQIcBAEBCAAGBQJRbyghAAoJEJOE+m71LUu6n6oP/0CU8IzzqSaNVzayESsNY/6/
+anc8bSvZvrFAqLpALvLqcFv4MhLsrZ7KC1hr/sNeJv0nlQmDlZg3Ta/gHEEL2BmH
+UzidBTYmdLSMGaKjz4AZ3D/BXeORX9kcVwRTugYrhnCm+NgPttJRWt+pTLoP7btL
+G+0FAtcjEsBoZGXFSOd+fAOKTOlWzhWWNFdrGJrrXs05CWIGfllc4GweRwD9UD4N
+b2fULePidgimQQOlfBEmB8fL/35hxAJRFs8Eq1uKQuyh2qmv5HUq4A6PFyRozEiY
+PX7mSgiyyrbvCn9WyXBh+zc35QYIS1cStc+cB1LDtrhk1gadvQgarrhmP32HZeZ4
+Hw6c9u8VkU5VrQLXIPt4c7BxMPnMaqbBDrKRYDuXiki+CVCZH8A+frfjDqxsm6Y1
+q9+P+y0ScQHcxLeU7kOrTT79UWlAJN7sfkOUzClHymHFEootRiWlFW4M6hPzm1ur
+aOcewc+iymdWxXG7yz31Y/iq2woIsFqJsr5887UK5EUEkyJPshwSWkQBkuvRKcUT
+jWFRiSfR5oXwaa6yzGhWAsr1kouBTmthZRqDshtvJGJ5QcQ2kqsS6zAPgon4VTmK
+fg2RIZAd1QHGyBoZhu3h67e0SoAiIZnjw0mwx+itD5a3VsQMs//19lxJgavk+vST
+Rj6Qazthz5bBmxouuNFp
+=0Qmd
 -----END PGP SIGNATURE-----
diff --git a/net-misc/curl/curl-7.30.0.ebuild b/net-misc/curl/curl-7.30.0.ebuild
new file mode 100644
index 000000000000..173fee7084f6
--- /dev/null
+++ b/net-misc/curl/curl-7.30.0.ebuild
@@ -0,0 +1,202 @@
+# 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.1 2013/04/17 22:54:23 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="~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.30.0-prefix.patch b/net-misc/curl/files/curl-7.30.0-prefix.patch
new file mode 100644
index 000000000000..fd495c49b132
--- /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/metadata.xml b/net-misc/curl/metadata.xml
index cecce28c1d0a..40f8885ed968 100644
--- a/net-misc/curl/metadata.xml
+++ b/net-misc/curl/metadata.xml
@@ -14,7 +14,6 @@
 		<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="nonblocking">Enable nonblocking communication</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>