Add USE=http2 support to enable HTTP/2.0 support via nghttp2.

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0xD2E96200

4 files changed, 268 insertions, 8 deletions

diff --git a/net-misc/curl/ChangeLog b/net-misc/curl/ChangeLog
index ab476133cefd..a0cd1452b257 100644
--- a/net-misc/curl/ChangeLog
+++ b/net-misc/curl/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/curl
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/ChangeLog,v 1.413 2015/05/20 20:54:21 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/ChangeLog,v 1.414 2015/05/24 13:55:23 vapier Exp $
+
+*curl-7.42.1-r1 (24 May 2015)
+
+  24 May 2015; Mike Frysinger <vapier@gentoo.org> +curl-7.42.1-r1.ebuild,
+  metadata.xml:
+  Add USE=http2 support to enable HTTP/2.0 support via nghttp2.
 
   20 May 2015; Mikle Kolyada <zlogene@gentoo.org> curl-7.42.1.ebuild:
   sparc stable wrt bug #548130
diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index 34c2ca4134a0..a1903b941550 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -7,15 +7,24 @@ AUX curl-respect-cflags-3.patch 406 SHA256 b87bf2c491b057bc5af5258fffcf72d7c5e86
 DIST curl-7.42.0.tar.bz2 3330103 SHA256 32557d68542f5c6cc8437b5b8a945857b4c5c6b6276da909e35b783d1d66d08f SHA512 8a6bf3ad4462ee8b2370e85382275f1d646565bcedded070c4cd5c87a610bae200c5c2803515514796357b82cddcc4c0c82ad04793a3c5ea4f4230c51720aed6 WHIRLPOOL 9da3108732680c26d12dc8f55b6ec6294995cfca53d7fe7be5387c04466d51cd96439b9c0ca30335b1124bc5e287dc18a62c090c71e9f3b4eb084cdd821d5b77
 DIST curl-7.42.1.tar.bz2 3327304 SHA256 e2905973391ec2dfd7743a8034ad10eeb58dab8b3a297e7892a41a7999cac887 SHA512 846c2d2bc73d39240686bf54e4c02553a1ca1640123fef30538cfc8a6317650f4cb9f1cc882016b7826ef9c84cb92adbfa24e55d59d2e7203bdcb12835fb474f WHIRLPOOL ff826e11812334ebca650c54788bf1b81b2927f7b9607b10e79cc70f6d1f9b893aebc816914158243510ffaead3b15a21ce10e7180eeb175b0b503e9ac8b0c6e
 EBUILD curl-7.42.0.ebuild 7330 SHA256 7bdd50ea9c9e7585dfe2b4463b2ff22fd6f24537b1599a7e4824afd3f0db3116 SHA512 4acfafb5a42c6032377233c255e1cb3275d72d420a9ad082e988f32b504d33229d0ed6dad674a77e0cadf0e839605057ae6ea4b2ffdf354c7464bbed853f16d7 WHIRLPOOL 4934a2a827d1c9b3852e91d3026aa20a3d56c5bbae43c07548d58577e0f976901814a5001ea694d1d1c01166c458a1b0f3a4b002cf0b2c532a2e35aa045c147d
+EBUILD curl-7.42.1-r1.ebuild 7401 SHA256 0b1135abf5edf63b8f08f7a811f20f7161a8b17671648279e6757ba2bc12cfb9 SHA512 c6a9e4f8c767e96f593aae87f74738f8e1a5884b470b988e1f4254162aeb8708806eddfac179bb14bc2a8ca58b6607ac78e087c43c245cb017eb098d307e6a58 WHIRLPOOL 1132cd993dd50548688d0f7985c1091928df2732401c96311ac1920eb594191b696410d98b560eb3810265deca54c34923e700d04f7888e255bb4aa65e724818
 EBUILD curl-7.42.1.ebuild 7333 SHA256 5a4cf4ec663f9a31700f9e74e3c32c49c9e8c6cd8e69b23dc23a1ff11f256853 SHA512 615940b26d37c96a8cbf865100d9cd6a4bb7a2f86eacd05fe0d0575f4d7d60f3fd91e610f0a43ee7cf50999a9933fa37327936ed76bd43b628a70a76860bc76f WHIRLPOOL 2644fa40e81bda433c97a551710de075504c2101c2ed51d39dfe0e16d30fb40afe4e9d113d5f4afd911bba99d38ae09137aec6cf299e2f38e79dfbef67f72245
-MISC ChangeLog 60302 SHA256 f5303ddf1fefb5edfdc49040f2924727363eb5147689fb74c2c190c0a89ed47f SHA512 54875a9a1dbf442822f87ce9157c711ff248adf3eff6e1ac20df4c8513340bdc787ff6ed3054848c5f75fa6facebd8a828c1c0dbcfd438c12565c9369174e517 WHIRLPOOL 386b525b3526a137b76352cafedcef867bb7c473c8c97995b9910ce8d87c91a2d79d106cad579fb6ddf9bfa827cc4d23079daeb92179a337ddf9543a0e0eb5f2
-MISC metadata.xml 868 SHA256 df66fe73acfdaff0fda0595656e112e6cfd4aebde2c52237c868c8031306e12e SHA512 a948ea9d372475d680c6f6fe4617ea5151d4378b1d5ea09e0566a88e403c9ed0a562c5426340bb1b03cf58a99c1f22411973bf215aa37ce8d30662a0e0101e4b WHIRLPOOL 0e058b6bb29d6c997a36a2563402b969b6dfa06912c3f8b854f8d89eb4113aa7fb376594ac0c756f1b59b3080aa508dab09426a9dfa982de56733f097baf9f37
+MISC ChangeLog 60487 SHA256 040b1443f539b8d50f701299083c9b6ebc87a6a862fa7fbe43871ca6cd86a705 SHA512 af0eff11754ecba4f1684c7abda5029f3d34e00cb644254b9cdcf8889c899198895d19aafc500fd8786e845327d5bc39722269230da2b5053c64ccaf38b96513 WHIRLPOOL 97cb192621f6d885b175274517d0f9bba10059781c60144758774c451f261c6886f00cf1caef287ec31b95e225af64c3167e5450c1a4faa2a341c630cdf2b0ae
+MISC metadata.xml 921 SHA256 d3c43ab15fa845713c7e6426d90f4275aa040338ca7cff233b23077d69455c32 SHA512 d198f91342ed3225747cf39d90922961eba3610ffd431411957175b5a65fe24d0b61d7094982e8cd9154037fb03eaf27e53696a5148059f62bb21f0ce15a3fb2 WHIRLPOOL 09255be7573f028488bf38ea49cc0bb26820dc5b7c339471cf801bc22445b5a7b939a459a1cbd7a076d7d7805a0c039767b73ff9d2261ec7983c488d6b44cf9b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iJwEAQEIAAYFAlVc9AUACgkQG9wOWsQutdZpiQP/Q2/WuO0QtR/G/GQJe1y35nyD
-lwJ3MFrTrvr+shnfQABTM21T/ILFL+/US6nVTbYXNjWP4qUNwcoKk+T0ESQioAEz
-YzEu1EXGI6rFDz1UK1SCBl8PfoOc5mb8LOGufvJt1jQUsEYWABgg5I9WsM5VYijT
-wvqYjBki83e7yJTH268=
-=1D6F
+iQIcBAEBCAAGBQJVYdhLAAoJEPGu1DbS6WIAOBgP/1NTE3+G0eh2U3WlRlDt/Lla
+S5GoVaqif+SyJ+p+dR5w4pVQ61mZoKu8dOe5XrpfWgMfJ4EGjSWWIYt1MxpJrvFw
+pNxIRblNrOYS2spTqISxC5Q7fQzwyTxsf9W5ZfCZnbrnqURHWe5wlyb4EbNzeBXq
+WO04F/Zwppbvia5sDgYhqtnZp4ZTBsVTXTk1+za/NJE08sLgd8ExHb1Pv106hGIU
+Z+2yVNSyuPF3MnSZ4vh6YZaTveM0va8y7p2K4kfaQ+9DPk8EtHvyj4EQTgZ/jC8+
+D6pFuVLvZF2GLCz7ISMbFcx+MaUkkCeSa8mm1Tg2HwRt3lRmGMJc0mn8M6em0145
+VVrQyEwjxm+NsdMVynPKr405VgyqvFsF79jLF+AjACs/yaoamKrKkmNo2mfYUjB8
+E4rbOLKqQy0V6wTdahEkUEMEvBURz3+sgLPCunFnvu66BKqNegVDFypUYPyW7cpT
+cV3alulqZc7MuOB0J0Gc2PWs+i9tv732pRtxOjTiepZ5MIX1vtcgWT+FiAKK5+Qv
+Q7zUWfdo7yWA0pqOjWtYcc/5Uc5Ad4adHUhTz5pn00gPw2Y1a/1OVPCNnR8c68Yk
+n/Zw+NM51HfUpKR+W59ef0O1FRIbFuA+wVtOwg96sLwSe99tcJDtnLSE/oKlCSy2
+FgK4B+cii9Cx0TQg5OK7
+=dIiI
 -----END PGP SIGNATURE-----
diff --git a/net-misc/curl/curl-7.42.1-r1.ebuild b/net-misc/curl/curl-7.42.1-r1.ebuild
new file mode 100644
index 000000000000..492285d969d0
--- /dev/null
+++ b/net-misc/curl/curl-7.42.1-r1.ebuild
@@ -0,0 +1,244 @@
+# 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.42.1-r1.ebuild,v 1.1 2015/05/24 13:55:23 vapier 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 http2 idn ipv6 kerberos ldap metalink rtmp samba ssh ssl static-libs test threads"
+IUSE+=" curl_ssl_axtls curl_ssl_gnutls curl_ssl_nss +curl_ssl_openssl curl_ssl_polarssl curl_ssl_winssl"
+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
+		)
+	)
+	http2? ( =net-libs/nghttp2-0.7*[${MULTILIB_USEDEP}] )
+	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 --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) \
+		$(use_with http2 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
+}
diff --git a/net-misc/curl/metadata.xml b/net-misc/curl/metadata.xml
index 67963a566c17..e0695ccfdf9a 100644
--- a/net-misc/curl/metadata.xml
+++ b/net-misc/curl/metadata.xml
@@ -10,6 +10,7 @@
 		<name>Greg Kroah-Hartman</name>
 	</maintainer>
 	<use>
+		<flag name="http2">Enabled HTTP/2.0 support</flag>
 		<flag name="ssh">Enabled SSH urls in curl using libssh2</flag>
 		<flag name="metalink">Enable metalink support</flag>
 		<flag name="ssl">Enable crypto engine support (via openssl if USE='-gnutls -nss')</flag>