Version bump

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

3 files changed, 225 insertions, 16 deletions

diff --git a/net-misc/curl/ChangeLog b/net-misc/curl/ChangeLog
index 00a8346f9195..d5636589c740 100644
--- a/net-misc/curl/ChangeLog
+++ b/net-misc/curl/ChangeLog
@@ -1,6 +1,11 @@
 # 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.286 2013/07/30 03:16:23 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/ChangeLog,v 1.287 2013/08/12 10:58:13 blueness Exp $
+
+*curl-7.32.0 (12 Aug 2013)
+
+  12 Aug 2013; Anthony G. Basile <blueness@gentoo.org> +curl-7.32.0.ebuild:
+  Version bump
 
   30 Jul 2013; Mike Frysinger <vapier@gentoo.org> metadata.xml:
   Add more CPE tags.
diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index 7cdaf1772576..f7e729384c0b 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -21,28 +21,30 @@ DIST curl-7.26.0.tar.bz2 2422651 SHA256 fced262f16eb6bfcdcea15e04a7905ffcb5ff04b
 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
 DIST curl-7.31.0.tar.bz2 2679209 SHA256 a73b118eececff5de25111f35d1d0aafe1e71afdbb83082a8e44d847267e3e08 SHA512 56b69cf5ec6e4de2b38280fe03ce97dfad33f3f88d2147a0334dab5cd6cde30aef2f4d09761b1dc8d515b448b5c149aff7f15c6ccd235cdf951f3c021b360200 WHIRLPOOL a7b2fcab8c65edd83d89addf2c7fa3ea334d8554a4d69efe8ff40790e41d0dbe3bda0c471130f3401e39a79c1c264f141fd1843abfa588c2b58036474bc7d385
+DIST curl-7.32.0.tar.bz2 2727587 SHA256 8e3db42548e01407cb2f1407660c0f528b89ec7afda6264442fc2b229b95223b SHA512 bcb2f070f3bb85c9a876e4e7d443df0a66aabed395ef7542df1aac2672d31ee8d57e3b4fa1242dc773e7fb6ad05fae8cefe436a6fccf6f1824014669ef05647a WHIRLPOOL a6c27638ad7336c895cd9e92bc1c14148d9c95b420e55f4871466c285e433568c0088f2cb3f5f53c3c57916aa970c40939dc729ddebad9421873a0759cb99d78
 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
 EBUILD curl-7.30.0.ebuild 6400 SHA256 dcd016f8201edcceff214875cc2fb2cf801c479c68468f7969721a87daca18dd SHA512 47d2b6a91932b9da560e21849a9a6277c01525eddded3c42e255b560f7f708e81b664483c0f3f9d89ebfea4b96540cfe3d22add94bde36597c9cf0e6e72d226a WHIRLPOOL 82664aff146f5aa7d0671d13a15317c193615594940b3f13d71e1e53a51d8768ebfd7278e832f423a0056d7bc3eb44b0ebde458d6e5e89d06fb55940f1aeece9
 EBUILD curl-7.31.0.ebuild 6415 SHA256 09de61b3df9d2b05f92f47767ac71f615d6b27ff070346cb664ace0c1fc58f4c SHA512 edb4cd1ca1e2a9b1960c725719d1f2896598950176def7e2c5677a7e7b6be806e3a49010485ab25845b79521f018c7fe80ed1ee1853fbd827b4375543a541a4b WHIRLPOOL 291b565ef32af82cc502be89b7b9e8bd8ad6a4616af98b3b584deb1fe0c7b3456e2fa06a8aa4917bd9ba625732e7ad0772d352ed24a1500951376e5cea94283c
-MISC ChangeLog 44915 SHA256 2587dec5d1f8a3f7f0ef01d8256dac9a6af4d85009c15587c2d9d23a7f403565 SHA512 c4d66f3bc896e284b5abc86d8f10b60d882d3404f5025b742aa2f380eade329ca0c89da5a2c5cad861562270f7140391a4e8e98e8faf4abfeebbc164e623e616 WHIRLPOOL e4caa1cd0557219cd8f5f8b4c90bfa224dc5fc1868d0ab8cfd9a4d4a9a7ccdf4ba444be9f54a0fd1743d533c36658511430aec718a59f54b56b0eec19d822f51
+EBUILD curl-7.32.0.ebuild 6415 SHA256 b14f1930075ec16283ac92d8e9fe869722af3a24b0e20fe8f1d946f215779a5b SHA512 2253747809b44e71c7a991f33ead62097acfed4c055f6c4f8cb118e724a94495a6d0c13c1a08623d32a0439e9592f3cb3f8ed9dcb379f7c73e1e9e76d74e0e9e WHIRLPOOL f53f565b2b0190027ce4f8afdc09cab2f866ee5a38088aa87b0401e6a828d3e5065a93f2500730577904f34168ffa3fe7e7100f532bdc1c459b331b0d2796c6a
+MISC ChangeLog 45037 SHA256 8ff31dc46dee46921bc63ac40ee3f9f0b63c2e82883fc6e227e296af9e90c54a SHA512 ea1e84dd983318f3f4cc7060eb66b5676e7d67562a6d04a6688ab50df03a385fe6ae967d9117c1fb81f181fc34a7862923722411cd8f8a7c41809fb07f16da9f WHIRLPOOL 81ed1bcd66fec42ab5fc2a7f52d8a2d0e5d864d4b3cd756b57c0b8bd8d9125d25319f3a59e94b2e36fad812ba58fb862ef87d3e0b8ea7bae615cd0ea396e7c89
 MISC metadata.xml 1090 SHA256 50d3634dd1888ad0aa1e233b900fa8633379614ead51aa82cb4ca9b55bd6a824 SHA512 0efed8c533b48fb4fc6d6ae41d5d3775a63b34d333f173d379ec4cf35db8be5a998cbefbf0ceeb68dadf577aab1058e3581f9e8bceb6818d658946f2cce67b7e WHIRLPOOL 3aa759cabe09bc4a806ca7779665b5753c9d336ab03ec55889c99a7701a0ddf8610cf2e58bd6ce46c0e354faf703a5b78ea832c99bb48cf3295db01eb18adb18
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCAAGBQJR9zAOAAoJELEHsLL7fEFWoKYQAL5cvdGm/g5DHTVG6PtLO/Mt
-fGjk/mvZ3S9TXSKktpqAatkQlnT4hrCiO1mkqGGZz3SkKZydYB2umXv3hmR/V+n1
-L/GqG3L2a51b3DWFIehrCMR+ZVSMSxMZN1GhvY8/i84AQKQW88NJ3mDecYpsh2Z9
-SKMSZRyH/TslVA9Uj+dK5Vrvww3zCpPSDH/9OgirNhKf/Kpd4iUiMCkL6n24Kuua
-2rsDkJIq8QlMsxCCYeDjgwWunbyc0R2ROKXy8QORzWID9FQfgY7CUfRkZFAssqlC
-r2L744cOBCgMjI5nUWVUFWHnNh6xDFMGeBCPZXgIGLT7RF2SBlpqREepmD8ACApA
-2ARWS5vT8JZlaQpUuJ/Bds6P4VHkdWJagv1LJv77HV5T3ZxxOmPi3QdN+KSuyQ8M
-OBmPVNaUVCifh0DbEXENACEkHo7naRQaOo9rhCWvdwq+b5E5Vrm6ChZVqdrausN+
-t0ARPKWxpm8Wx0yeZQnET0lEu7VJrgGDtvONM+mTwsUmtFQ+yXmsx7HnSQbFjWrv
-Z1VHZ0VaM4xDCaC1ZqG60jfNIip88IoayOST3dETRZAx8rR4ZTGrgfoo0Tw3PWiI
-SJl40VVAVYUP6PItjtfLbRno95m2cOJXimmeODC1geoSM5iSf//KJ+THS6WKDUXu
-lTkPoshkO8idtEASvFLh
-=1Qwq
+iQIcBAEBCAAGBQJSCMCVAAoJEJOE+m71LUu6PVgQAIB/e9YRFyGd/f5oyn3zEwII
+IuAVcP6qcmskhe1U78dc35OW+TYka+1LcxaUKsFZA5nVlclAaqy0d0dLGB8AZRnr
+a1GMkvgC6f1tbUw8Nl7jqWS5XdBBcRmSsAKGIYebBhpJCyRDidua1zfPvigIi1aW
+6iMLmiQpKKDHthcsGVPsZAJ62XoKm03OJmvll4WYusYln7D5x9yxtws6lucOKx28
+w+MagsFsirD/JT0iR4HnqQ7VJ/9G4mHpfyEvfzivn7C9ZDSYhYlfPiKknMg9wE54
+HU9G7jSaZ0hINCbx3DCI3PRdhjeeMtkKOwzBLjvbRJkWTXQJZNd5tkVmQ1Mopvqc
+L22LFv6kBWtT9zm8j9VwkRUDA0M08Is1Bgqh+VDk6hx1o6z5GzeYEtu+TWs1Q95A
+sah9fw2PldIlx8px9jd/6BlLAUibud3mLq2D964rOQHjH4i+nuvn5KnbINJQ0x9a
+qrcAWGDS/+kigiR3b3qoCr7P3eVK154hLd6Qeycvx7LIK+/BTIDAv5EezsD4SSBw
+xdzcqfFuNc7CAFwc80OH67ZWDln1JIM/DNSn+Jmryv40uSY/Zts/naVOJGz3WqS3
+by4kega0HthrpB9psoLki2D38v+ueTl4kO8LYW3n96LCdRH0nDm0GYGxZMSUmlMg
+N9j3XLHvoAEKd+IyFu5d
+=oERm
 -----END PGP SIGNATURE-----
diff --git a/net-misc/curl/curl-7.32.0.ebuild b/net-misc/curl/curl-7.32.0.ebuild
new file mode 100644
index 000000000000..88acac29fd27
--- /dev/null
+++ b/net-misc/curl/curl-7.32.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.32.0.ebuild,v 1.1 2013/08/12 10:58:13 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
+}