Version bump

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

3 files changed, 266 insertions, 16 deletions

diff --git a/net-misc/curl/ChangeLog b/net-misc/curl/ChangeLog
index 2bacbef2fef1..53e6814a0055 100644
--- a/net-misc/curl/ChangeLog
+++ b/net-misc/curl/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/curl
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/ChangeLog,v 1.387 2014/12/01 09:14:20 ago Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/ChangeLog,v 1.388 2015/01/11 22:16:14 blueness Exp $
+
+*curl-7.40.0 (11 Jan 2015)
+
+  11 Jan 2015; Anthony G. Basile <blueness@gentoo.org> +curl-7.40.0.ebuild:
+  Version bump
 
   01 Dec 2014; Agostino Sarubbo <ago@gentoo.org> curl-7.39.0.ebuild:
   Stable for sparc, wrt bug #528840
diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index 1fd96f2142ec..28c521fabfb3 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -11,25 +11,27 @@ AUX curl-respect-cflags-3.patch 406 SHA256 b87bf2c491b057bc5af5258fffcf72d7c5e86
 DIST curl-7.36.0.tar.bz2 2809266 SHA256 1fbe82b89bcd6b7ccda8cb0ff076edc60e911595030e27689f4abd5ef7f3cfcd SHA512 ae471d382c9c8f321a987e7a5a302abe7cb2cae4204ea65234b02c73303abef7c995c50ce8219bd90d762fa63006d50293e4350e78aee2c2086b6f7aec09b01a WHIRLPOOL 0b9f5d8a2d41126e0ff735d3f863a943e9182ec5a2abdb8caac890232432df66fe422f4dcdbfcba1fbc925880435f3733c01b747185aaa5cd1cc96571025663f
 DIST curl-7.37.1.tar.bz2 3151531 SHA256 c3ef3cd148f3778ddbefb344117d7829db60656efe1031f9e3065fc0faa25136 SHA512 b6e3dacff43f5b3a47b1f927b14d6adb133e31b34d9ae76af0a3446dfe017351c3fc25daad4a604514843c8d0c6a4b06a7bd71908c9068d420180d1f486784fd WHIRLPOOL 2792e84d54297a8c14730156cfee1ce76542613c2e35ad6072861dd2eea2aa1289eb4e80eb221c124a3ea69466e465cfc305adae29fe089391064735e45f0bab
 DIST curl-7.39.0.tar.bz2 3241619 SHA256 b222566e7087cd9701b301dd6634b360ae118cc1cbc7697e534dc451102ea4e0 SHA512 9d82e29c0b40530080c62bc3b81e729092b6de0dc3551e709ab1e65cb451259a5380f155fc911664ef523f57ea4be80bb27b330b720ad9a8bc3d9b967bdc3fd2 WHIRLPOOL 05fe3cd33a7716f88b63d3f3d8e9da49dec166cb42064d52ec2a182f68e792e83dd16d53edd1cd1b996a5f262faed1e1163197e1c3f717827859bd73e1570c36
+DIST curl-7.40.0.tar.bz2 3266944 SHA256 899109eb3900fa6b8a2f995df7f449964292776a04763e94fae640700f883fba SHA512 4d1cd0aa0c4fd9f14559e2824389ed42222a456c268e92107ef4d3257af76d64e5a8f69e9a3fccb9d4c9ae232426ee8f8f58f7d2eaa3db789dfa4d919cf229a3 WHIRLPOOL 5e3f9038696d7476e76b1a848766a2068f20c6aa0392d4018e2d90529914a059b771d66937bbe28697925acaf96a2025eba77e4af9b331ab66ee1323cf079678
 EBUILD curl-7.36.0.ebuild 6124 SHA256 c36ec20cc6eb01b38c2f83ff0e6ba61336201cd76486d473cf4594d839dc236c SHA512 cd64a8e0d474ce9eb53a30bb2c2f52855a037ca50ccf79233a1d16c3f92c2abaa55c57a4ee0b66356b4121c7923e688b78c2df331cb2bfccbaee940085f4e52b WHIRLPOOL de73a5f404d6556995385568623580c460c116d15c56ad2cb837ceb239f4593460f266d4a831909bea136a52d204abe19fb9c06451a4a12f048b44affb03211a
 EBUILD curl-7.37.1.ebuild 7373 SHA256 67ba66277113c293c229fd332cff7e7e0ba413c80f0a80816b52d96b52e9c161 SHA512 94ffa9d6dab626cd85470d0d897d2876a4eb01e84a9689de7b65dbe144adfcc680976350d1d0b755d2bb1c3fd17a7a2b377a1a551087b7af1f06eb110ef7a6aa WHIRLPOOL 9ff7c967fed13648990d365afa52647b44ff0d4e5d8c964528a21143d9832c1065679e94b64b0afe40bd657733de606dcd79f39e0836a68edc16539d34cf1536
 EBUILD curl-7.39.0.ebuild 7315 SHA256 0a1c49652d6d65d672b0a6b5fcdcd1446e9665443460566d09d2e1e9426fb894 SHA512 48d6b89855d43359f166493dbcb08157bdc7dc63105190791dc8350567a9685071a5fe9761b124d6d43012c941ccf8f394e9ba9eecc1f20f673587650c4a2ae8 WHIRLPOOL e4f6f349a0ddc117bfe6c6d020482cfd9474b27312edcfb27c0af4783175f646cd0e2e3c29f306b266838f7f38511fec6dfd3cafcf973a4d4d4ae117a407bc16
-MISC ChangeLog 57260 SHA256 2710baaf547d976a1da063f3325506b31b7dc0bd3054ec6364da0dde2dd3421c SHA512 672006b949c1cc0df59863ea3d1221434158b67a6c5faec9e2ba1d5f404236e12a5f8b6c477d4f3d968df6247831a751dfbf9e2354abe11148e2a0e6454d983c WHIRLPOOL 12bae7d8662b406bb9ed2e45cd63691b58b65f0f25e866d3df394b0e8a09fbdcba400df4301cb9285fbb87a13a979c6958107ea5d1fd23a657d415ab66b9875c
+EBUILD curl-7.40.0.ebuild 7363 SHA256 1f4c57807c01eee23c15917c8686d8eef54f1cb3fdb5bbc69027d9620147aebe SHA512 1e5b8b35d1c63783b2f4fbc0d94783251fca08dd9409c58353e8e75cac0f5a68f1245ea459d0133929d26adb59791a260af9d2e1c9bf826078d9de4a74308575 WHIRLPOOL ad25ce9e3ec4854222412c0f3104c4f6b3ae5c1a58cf6a532335745b7719d6425c3f489b98f0da7ddf4de7cc0e304ccdb98a02eeb0e579eece1279b38a785e04
+MISC ChangeLog 57385 SHA256 6ffab73674e88573054f9b4924c7c3e1e8537108c8f67cab33c74f9328842296 SHA512 10aed3c635ffe060ebd16bcec4dd2efc55589f75bce95c193491732dab5a3a91f2229289cd237544759b014861de2a17ebba293ad8cb4aa8ee302998fdfb88c7 WHIRLPOOL c700e25546c248a3c1a9a50d99ea17d0aae4e170854060d7d7eb81de01cb35f72a62dd1397061dacb6d2841385618e65594b52767a701bc7fa128609b981d08e
 MISC metadata.xml 868 SHA256 df66fe73acfdaff0fda0595656e112e6cfd4aebde2c52237c868c8031306e12e SHA512 a948ea9d372475d680c6f6fe4617ea5151d4378b1d5ea09e0566a88e403c9ed0a562c5426340bb1b03cf58a99c1f22411973bf215aa37ce8d30662a0e0101e4b WHIRLPOOL 0e058b6bb29d6c997a36a2563402b969b6dfa06912c3f8b854f8d89eb4113aa7fb376594ac0c756f1b59b3080aa508dab09426a9dfa982de56733f097baf9f37
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUfDFtAAoJELp701BxlEWfQqIP/AgiMJwC2pTus8Gw1MimnTo4
-wJD6QZr0BjmBvUsvdcv1JnXdBaGePgtg2I0M5qV4q3Jg+vhCDnZhgA2jUfCyrPVq
-sHuT2qM94+R5s9NmRvghgraA1rMT6cL24gxajV0yr9JG84fbANkOU+ds/229e5Aa
-KCHzDXe7fylACeWwRpHKgLO4sGAJWI0PC4ZECM6xZwWgRB3+gi1HmIhUFjyJ68SE
-FoaHIlEG+SWNGOww11JXFI8Ovh4uLYC7m7kAToVPWnPxWhPfH3YYTu430IZddz8t
-xeMfM5+tIk0pQ9nVDf5GAKhNZARww6y94/v9t9Hj9EXHj5jc8qZ75+3a23ynMBYK
-6uwC7Y03Sbbtcgm++LmY5ESG88iXAnQ4QjZNxhfyfkVA9Pjf/ER28nAhMm4Zt5+I
-teD1p3YJ8SVcianghFF506Zm6sS08hoJMCTgmwrTZU/PeEenypyxd841Edxh6ixv
-vEEXU08kglK9kbVhjMlm6sCxm27QSrzI0W/HZdvFlAukOSsRve/q5VeFrosnAvf1
-HbykYeT6QVxdj5s0ancKrVsTtllZuh65dWtBopA1N7HtDULEdIgqOoPmmO57xuEo
-+If5UAs4eL9SFKzK7g+A4Qm27eC/zRV9eMVmnPJ04eEPEKdQjLUh4/IViE0VTkNe
-CxaT/rYt/DpUyHSs2D5K
-=/uZI
+iQIcBAEBCAAGBQJUsvaGAAoJEJOE+m71LUu6IiYQAJh7b5XhqJlprOouZvF2cUbg
+xbr3AyT2DphqKg+BT7TDJmeh9dB+pGGXNr5fdE2Glqpb2x63QAoqkqm583dRqToC
+P4DABBonL9GQS8iK1f2p4Tw/7G92Kqa+pQg48PxktiQ7w4QA/pHFFQRH2Uf0iw7m
+tjG4RYk9WnIQmPam+OY8Cm2QmFjSV6wQhSWp41Nc+3ef6b/8ekHvSy97Ci+Q5la3
+vV+ofOXxjrh6Cou/ZA93LEMwWwqPcsJgNeR7FtNIltvsi08CyW43+sLP5x5vtmYF
+GIHxKnoFzC2N6XpUL+9SqPkZGXK80TfAyH+L4Oo/eGA/tMGbzI5lRWJ52VU0OERv
+BRGrU29roxKS1G18kJCYBPpA5DEjBZDY/7fBJx9E7tXGqOmvYK0p/d+/jcB8gMhL
+thHkHTah5Ys3RCu8j2y0yqURs4Fn/aF0VGQhY52f5XoaZqQujDAAFA3qiur7/CR4
+B6LambJyi+r0gwLtZ7CSnsDYS+lhujC/C100Gog7ucsVgdHMb1q5t9hclcr7ExDU
+/qgg9rmWfR8MHTC1auUElxKXdX71l7u7jlm8PvU3lYVGQfS1HJGK8eG9rDOxz/wD
+fVxJ441GTJWHSAB+O2iPYtd4+jzqBRePyVyZr3NHWiMQ19ceDGgdO6gHPv00yaEc
+OQwHx6YEtAYXwEXfovqD
+=1ztt
 -----END PGP SIGNATURE-----
diff --git a/net-misc/curl/curl-7.40.0.ebuild b/net-misc/curl/curl-7.40.0.ebuild
new file mode 100644
index 000000000000..cfc8fde60536
--- /dev/null
+++ b/net-misc/curl/curl-7.40.0.ebuild
@@ -0,0 +1,243 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.40.0.ebuild,v 1.1 2015/01/11 22:16:14 blueness Exp $
+
+EAPI="5"
+
+inherit autotools eutils prefix multilib-minimal
+
+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 ~arm64 ~hppa ~ia64 ~m68k ~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 samba ssh ssl static-libs test threads"
+IUSE="${IUSE} curl_ssl_axtls curl_ssl_gnutls curl_ssl_nss +curl_ssl_openssl curl_ssl_polarssl curl_ssl_winssl"
+IUSE="${IUSE} elibc_Winnt"
+
+#lead to lots of false negatives, bug #285669
+RESTRICT="test"
+
+RDEPEND="ldap? ( >=net-nds/openldap-2.4.38-r1[${MULTILIB_USEDEP}] )
+	ssl? (
+		curl_ssl_axtls? (
+			>=net-libs/axtls-1.4.9-r1[${MULTILIB_USEDEP}]
+			app-misc/ca-certificates
+		)
+		curl_ssl_gnutls? (
+			|| (
+				(
+					>=net-libs/gnutls-3.2.15[static-libs?,${MULTILIB_USEDEP}]
+					>=dev-libs/nettle-2.6[${MULTILIB_USEDEP}]
+				)
+				(
+					=net-libs/gnutls-2.12*[nettle,static-libs?,${MULTILIB_USEDEP}]
+					>=dev-libs/nettle-2.6[${MULTILIB_USEDEP}]
+				)
+				(
+					=net-libs/gnutls-2.12*[-nettle,static-libs?,${MULTILIB_USEDEP}]
+					>=dev-libs/libgcrypt-1.5.3[static-libs?,${MULTILIB_USEDEP}]
+				)
+			)
+			app-misc/ca-certificates
+		)
+		curl_ssl_openssl? (
+			>=dev-libs/openssl-1.0.1h-r2[static-libs?,${MULTILIB_USEDEP}]
+		)
+		curl_ssl_nss? (
+			>=dev-libs/nss-3.15.4[${MULTILIB_USEDEP}]
+			app-misc/ca-certificates
+		)
+		curl_ssl_polarssl? (
+			>=net-libs/polarssl-1.3.4:=[${MULTILIB_USEDEP}]
+			app-misc/ca-certificates
+		)
+	)
+	idn? ( >=net-dns/libidn-1.28[static-libs?,${MULTILIB_USEDEP}] )
+	adns? ( >=net-dns/c-ares-1.10.0-r1[${MULTILIB_USEDEP}] )
+	kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
+	metalink? ( >=media-libs/libmetalink-0.1.1[${MULTILIB_USEDEP}] )
+	rtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] )
+	ssh? ( >=net-libs/libssh2-1.4.3[static-libs?,${MULTILIB_USEDEP}] )
+	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+	abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-baselibs-20140508-r13
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+	)"
+
+# Do we need to enforce the same ssl backend for curl and rtmpdump? Bug #423303
+#	rtmp? (
+#		media-video/rtmpdump
+#		curl_ssl_gnutls? ( media-video/rtmpdump[gnutls] )
+#		curl_ssl_openssl? ( media-video/rtmpdump[-gnutls,ssl] )
+#	)
+
+# ssl providers to be added:
+# fbopenssl  $(use_with spnego)
+
+# krb4 http://web.mit.edu/kerberos/www/krb4-end-of-life.html
+
+DEPEND="${RDEPEND}
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+	test? (
+		sys-apps/diffutils
+		dev-lang/perl
+	)"
+
+# c-ares must be disabled for threads
+# only one ssl provider can be enabled
+REQUIRED_USE="
+	curl_ssl_winssl? ( elibc_Winnt )
+	threads? ( !adns )
+	ssl? (
+		^^ (
+			curl_ssl_axtls
+			curl_ssl_gnutls
+			curl_ssl_openssl
+			curl_ssl_nss
+			curl_ssl_polarssl
+			curl_ssl_winssl
+		)
+	)"
+
+DOCS=( CHANGES README docs/FEATURES docs/INTERNALS \
+	docs/MANUAL docs/FAQ docs/BUGS docs/CONTRIBUTE)
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/curl/curlbuild.h
+)
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/curl-config
+)
+
+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
+
+	epatch_user
+	eprefixify curl-config.in
+	eautoreconf
+}
+
+multilib_src_configure() {
+	einfo "\033[1;32m**************************************************\033[00m"
+
+	# We make use of the fact that later flags override earlier ones
+	# So start with all ssl providers off until proven otherwise
+	local myconf=()
+	myconf+=( --without-axtls --without-gnutls --without-nss --without-polarssl --without-ssl --without-winssl )
+	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.2.15[${MULTILIB_USEDEP}]" || has_version "=net-libs/gnutls-2.12*[nettle,${MULTILIB_USEDEP}]"; 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
+		if use curl_ssl_winssl; then
+			einfo "SSL provided by Windows"
+			myconf+=( --with-winssl )
+		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_SOURCE="${S}" \
+	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_enable samba smb) \
+		$(use_with ssh libssh2) \
+		--enable-smtp \
+		--enable-telnet \
+		--enable-tftp \
+		$(use_enable adns ares) \
+		--enable-cookies \
+		--enable-hidden-symbols \
+		$(use_enable ipv6) \
+		--enable-largefile \
+		--enable-manual \
+		--enable-proxy \
+		--disable-soname-bump \
+		--disable-sspi \
+		$(use_enable static-libs static) \
+		$(use_enable threads threaded-resolver) \
+		--disable-versioned-symbols \
+		--without-cyassl \
+		--without-darwinssl \
+		$(use_with idn libidn) \
+		$(use_with kerberos gssapi "${EPREFIX}"/usr) \
+		--without-krb4 \
+		$(use_with metalink libmetalink) \
+		--without-nghttp2 \
+		$(use_with rtmp librtmp) \
+		--without-spnego \
+		--without-winidn \
+		--with-zlib \
+		"${myconf[@]}"
+
+	if ! multilib_is_native_abi; then
+		# avoid building the client
+		sed -i -e '/SUBDIRS/s:src::' Makefile || die
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	prune_libtool_files --all
+
+	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
+}