gentoo resync : 03.11.2019

3 files changed, 24 insertions, 8 deletions

diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index 355004e9eb19..872b737f8ee8 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -6,5 +6,5 @@ DIST curl-7.65.3.tar.xz 2392472 BLAKE2B 25726e1f1568fad6a8419b29dde41bed4d9de4be
 DIST curl-7.66.0.tar.xz 2414840 BLAKE2B f5d731c304c826442a8509016d00b9c68438ef9102b3c844c15315181c307e338f79930dc548d7f189b944dd74cc7eeb19d130b5a967ea2efa9862d15ae78bab SHA512 81170e7e4fa9d99ee2038d96d7f2ab10dcf52435331c818c7565c1a733891720f845a08029915e52ba532c6a344c346e1678474624aac1cc333aea6d1eacde35
 EBUILD curl-7.65.0.ebuild 6953 BLAKE2B 3f0dcce2560ef08897189f44afd843e0322176d6e1368a9bf02211670d4b5fed096d23b1eeb02f89eb44d12f10f1e78839f8dac2a5ad66b225bba5d967942a39 SHA512 b554bca7de8c0cc32e2075d35103da865929fc29c447d9fd0314a161b3b300f3e89d0df2ff8dca15e2d2aa6484ec97ca4ba078cb14abfca57a7b43e8d93d90f5
 EBUILD curl-7.65.3.ebuild 7138 BLAKE2B 06732af10263c41e523f0b36637597fb81d51cd26eedbd198cc2cc59758da3c36e74fc2810296400df2576576b94255637e35c018751c91be9d8333a441b90ca SHA512 f13cbc01affb023970ec54686d09d56bf59660c634399383c709405074e9e77ffa476a418ca9b89aacadb1541b4f2e01c2180e871f1bf5885020b9f0e9ab6494
-EBUILD curl-7.66.0.ebuild 7223 BLAKE2B 6dd95d4ac83ecfca3684c2eaa15f3fe65f072a003eefdf00b72fe7434d6c3986bb964477945271a929f32d380ea5ebea816feac83cf4d5b662b0d43c18e892bd SHA512 58a2c03b1a2d19a1b839a6800c22f78ecf4ca48fcdd5c3fd374ba2bb8829d42db73ef822a3159ad27e00bff0006356677fe24eda09371153bd8aebf31d31a50b
-MISC metadata.xml 1016 BLAKE2B 3b6cced0cc67b21cd3b8939d2c75106cf72eb92f186e2cd12a3c55b3d58a9d1e216f21b090db920c7b0cf18c4744358f5642602d2cd1472bd36ad554b87e7d33 SHA512 dbf81245497503293ad73160f337cffac29f7e7771e2a026d840bbed04c994164e62f72523f677a4e2ae3b656c27f90d5aba518e46f05df819f8696bb66fdb1b
+EBUILD curl-7.66.0.ebuild 7570 BLAKE2B de2b7007a5b1a2510bc800eb137df7a002c8547277c7dd8a62ac7e424adb1201bd9d30eb5503b5a8dc38d4c7937e615cee5d6167556a5377185e1f52c8633794 SHA512 57364b4a92e680484f0fb704908520bdda772efe9cb7a39b6c2e0d3430624656ebc4464f64f08e5700d6424b52e18283dc7f28071b4e13ce7c8dc10d25f7d11e
+MISC metadata.xml 1219 BLAKE2B 981090b46e9e66661074be920692e688ebd351ad1770b3a1b76ac6f3b6cc66c70c370031affdf5f72b2141e04ab7e4e073b4bc1fcd0295624e14a929cc3714d1 SHA512 9f86ffa85c0ac69c7289a97a92d5e592a17e5cc23b62be980540cdc8702cf6151361be4f171446fca317d2dcb1c5879ba8ae1ad0b0d99ffb54366ca35df4052d
diff --git a/net-misc/curl/curl-7.66.0.ebuild b/net-misc/curl/curl-7.66.0.ebuild
index 86708b83a0ca..0c4c734a8049 100644
--- a/net-misc/curl/curl-7.66.0.ebuild
+++ b/net-misc/curl/curl-7.66.0.ebuild
@@ -11,9 +11,10 @@ SRC_URI="https://curl.haxx.se/download/${P}.tar.xz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="adns alt-svc brotli http2 idn ipv6 kerberos ldap metalink +progress-meter rtmp samba ssh ssl static-libs test threads"
 IUSE+=" curl_ssl_gnutls curl_ssl_libressl curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_winssl"
+IUSE+=" nghttp3 quiche"
 IUSE+=" elibc_Winnt"
 
 #lead to lots of false negatives, bug #285669
@@ -43,6 +44,11 @@ RDEPEND="ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
 		)
 	)
 	http2? ( net-libs/nghttp2[${MULTILIB_USEDEP}] )
+	nghttp3? (
+		net-libs/nghttp3[${MULTILIB_USEDEP}]
+		net-libs/ngtcp2[ssl,${MULTILIB_USEDEP}]
+	)
+	quiche? ( net-libs/quiche[${MULTILIB_USEDEP}] )
 	idn? ( net-dns/libidn2:0=[static-libs?,${MULTILIB_USEDEP}] )
 	adns? ( net-dns/c-ares:0[${MULTILIB_USEDEP}] )
 	kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
@@ -201,9 +207,9 @@ multilib_src_configure() {
 		$(use_with kerberos gssapi "${EPREFIX}"/usr) \
 		$(use_with metalink libmetalink) \
 		$(use_with http2 nghttp2) \
-		--without-nghttp3 \
-		--without-ngtcp2 \
-		--without-quiche \
+		$(use_with nghttp3) \
+		$(use_with nghttp3 ngtcp2) \
+		$(use_with quiche) \
 		$(use_with rtmp librtmp) \
 		$(use_with brotli) \
 		--without-schannel \
@@ -230,6 +236,14 @@ multilib_src_configure() {
 		libs+=( "-lnghttp2" )
 		priv+=( "libnghttp2" )
 	fi
+	if use quiche; then
+		libs+=( "-lquiche" )
+		priv+=( "libquiche" )
+	fi
+	if use nghttp3; then
+		libs+=( "-lnghttp3" "-lngtcp2" )
+		priv+=( "libnghttp3" "-libtcp2" )
+	fi
 	if use ssl && use curl_ssl_openssl; then
 		libs+=( "-lssl" "-lcrypto" )
 		priv+=( "openssl" )
diff --git a/net-misc/curl/metadata.xml b/net-misc/curl/metadata.xml
index a4deda9a7a5f..b62cf6ee3c7c 100644
--- a/net-misc/curl/metadata.xml
+++ b/net-misc/curl/metadata.xml
@@ -8,8 +8,10 @@
 	<use>
 		<flag name="alt-svc">Enable alt-svc support</flag>
 		<flag name="brotli">Enable brotli compression support</flag>
-		<flag name="http2">Enabled HTTP/2.0 support</flag>
-		<flag name="ssh">Enabled SSH urls in curl using libssh2</flag>
+		<flag name="http2">Enable HTTP/2.0 support</flag>
+		<flag name="nghttp3">Enable HTTP/3.0 support using <pkg>net-libs/nghttp3</pkg> and <pkg>net-libs/ngtcp2</pkg></flag>
+		<flag name="quiche">Enable HTTP/3.0 support using <pkg>net-libs/quiche</pkg></flag>
+		<flag name="ssh">Enable SSH urls in curl using libssh2</flag>
 		<flag name="metalink">Enable metalink support</flag>
 		<flag name="progress-meter">Enable the progress meter</flag>
 		<flag name="ssl">Enable crypto engine support (via openssl if USE='-gnutls -nss')</flag>