gentoo resync : 28.04.2019

5 files changed, 90 insertions, 12 deletions

diff --git a/net-libs/nghttp2/Manifest b/net-libs/nghttp2/Manifest
index 9315c8f57646..bd9a3779618a 100644
--- a/net-libs/nghttp2/Manifest
+++ b/net-libs/nghttp2/Manifest
@@ -1,8 +1,10 @@
+AUX nghttp2-1.38.0-boost-1.70.0.patch 1950 BLAKE2B ed9f72c2f01912176d963fdfb955388c7d40a9ec4e7674f0629166de1d3c249c2f31a3e06c2f82c4186e1f48319bf0bc367e4b4aa25c10faa26ac6e0a118af25 SHA512 7da6199d64b2b1b6b5258841d2ef52fb5617f200de4c63021b4e9b85b9faa6894f4a9c8c9b1b0c35b2984845de5bd80c3ff6d1a67c1fb44cfb24eae0f0afa806
 DIST nghttp2-1.33.0.tar.xz 1554776 BLAKE2B 1b995d6385188423acbcd7c8b3a626a622270bc3079972885a1f707a9cc4ebb053f7347930ce217d2cf4277eab0a3309accb8f9ff18bd8ccc55c86aefa6246c3 SHA512 eeb0bf64fea115444c685c8a01c1017ce96be18adf88ffcdecad067de7012ca61c6b2b6a627b18e2572bba7bd77ec56a3ca4b1109f7a4b21220e8e28687b5b74
-DIST nghttp2-1.36.0.tar.xz 1629020 BLAKE2B 7c116988c22801688c50d6d514ddb904920cc54d3c3d141137e6ed8b2182ef4e670f0a0fdebaeabfe0df8cdea4cfd1ee3fb083628f035201f104de6f3614dd25 SHA512 4e0d5c5cdb4f1b7e5f12790850237f36649af4aa9596033392725972e4e0e5a33bb78bd1aa0735e35e489b523b7e9a236a7b5847dfca69bd7583fcab36c13c76
 DIST nghttp2-1.37.0.tar.xz 1628248 BLAKE2B ed5cdfda44b4e38a03d92352520eb765cc1da99080e0cd3e9d663efd5ef2ff219c6ccdbc16cfde001a8377afc796acef250913e1eb422ae2cac2eb95b8f98089 SHA512 67a4b9df3f7f0edad719011fa289d9aa9ef04f31ef3ccf826b861c8830ed24e0743a33b54ab66d198fec7edbf723852b38a2007b335d7f566f702f4b02297b0f
+DIST nghttp2-1.38.0-unbundle_http_parser.patch.xz 2616 BLAKE2B 3f15154d33f32c91aad87f23f56d761501e19e0b53b99d4df720f9e04d6d9c49a52118acbe3da87f8585c2b71b7b430ef60fc33465605f3bf9933635aabb924d SHA512 1b4377b34cf6428164011be9fc86efdd7ab8d3443edf197c45768beea0f843084a842c4cb2abc5179d6036ec99174557e06344ce67a07d98992de64d99faf3a6
+DIST nghttp2-1.38.0.tar.xz 1628356 BLAKE2B 0568d4ac5c1e5e6d7adf762815836502524d59fb55c623f344a8427638407a19447fe1a7753142aa205898f7bda6ebce8ef6f4d85edc6da98ffa98b83d4e363e SHA512 e432d52bcf77379ed5c10ceafb587ec8d66c56bb728cda56487b237cbab1d0073689624419ed306162dab3a51b91cfe0f59cb173b5d81346e2b6d0abd56635bc
 EBUILD nghttp2-1.33.0.ebuild 1861 BLAKE2B 6bf71fd220cacaa02e17ee2ecc6c7dbd9810a0c45d92f63cc09bbf6631d27a4c9126a1691f42b7a42db4ea934c38c1cb753b364577ca89cc4ec318947cb2bdc0 SHA512 9026b56ba1d3b18b02473da0de7d880c95aae9eb208705938142be394424db9d9c7ed2d2033252cf68861f9b1ccb6811f68ed4f660bd92f38f320df5b8456c10
-EBUILD nghttp2-1.36.0.ebuild 1872 BLAKE2B 8e94360bbf5d914e4db55b362d60b8786a9158670b72134b47226c9d01a62b3b6004110ade64611dd653521092b3be2c19820fa9b5aa8430ff7e8da1efff62b2 SHA512 2a0c52c49d6d256e8b32c04100533cc73fed972d269a1d3ef3484159112537b24c8daea962893e031aeb4e4a49307fccb81c4ac6eb2d9d185df43fa617459c1c
-EBUILD nghttp2-1.37.0.ebuild 1872 BLAKE2B 8e94360bbf5d914e4db55b362d60b8786a9158670b72134b47226c9d01a62b3b6004110ade64611dd653521092b3be2c19820fa9b5aa8430ff7e8da1efff62b2 SHA512 2a0c52c49d6d256e8b32c04100533cc73fed972d269a1d3ef3484159112537b24c8daea962893e031aeb4e4a49307fccb81c4ac6eb2d9d185df43fa617459c1c
-EBUILD nghttp2-9999.ebuild 1949 BLAKE2B 56a3fc7ee584692bbf9219aaba3a56c0aa57f7b4479d6da0a12c77ce8b999a1db1aec3cf76203536cdd42254dd8c42ef2df63ba08fade93a0dc674502012858c SHA512 fe76714b538e6f49c44c3beb212f98b17644575a9b049981c44a4537d7501cf9b3f6bbdd2351a3c286d8c1e1c9acce09843eb86660b5ecfb38785ce920db4aef
+EBUILD nghttp2-1.37.0.ebuild 1892 BLAKE2B 5d49eb20ebd6563773800574e2f5c316846658faea3c3febd032da50e432315da6cd6fb83a08561d8410edae24144a443921bc8b7f85304eabf0e9e5219cd2aa SHA512 e3c3e507147a76f30f6668fa334f92d29e63eb9266c718546b256dbbf982002e610817a7cbc6eb4166831e7bbb83855a4a6ad0f7414524f2e5e0fa962265b0b6
+EBUILD nghttp2-1.38.0.ebuild 2339 BLAKE2B 72c0ef2b68b53ac0958777a24aea5ac86ce6af3645997c807b362330b390448086a90824880f62af8e8e83775c0f749c810f11130ddeb25f5ccbce63fc11145f SHA512 ace59fb64bf3e442c0717a72f94cf85f3c3af3b024bc531b7c16689cadb6511d26779c381933912480bb80c03fe0f1cc062ee2d397ad1d3d4c480c790025eecc
+EBUILD nghttp2-9999.ebuild 1966 BLAKE2B 162c885ba4fce06d57655a5d615c3dd7a1b6f01c1baa3b66b61b51ba5a5d83ee11426389f97ce74fc05dea22273418c8b0afe10e59fa52507b18de3ee48fdb98 SHA512 5be35f51f0e4d48e7e5a8bc47f21c73b20e2b7cb0da5c9800499a3387b761ef53e5f7e0b2643253c671481bcad33beaebea2320e154ce7d6f890739e9cd4ace1
 MISC metadata.xml 492 BLAKE2B 76628f4a35c08fe73292c1c50fc6bc90dd44527ee36fb44ff4630a606fe27d9a950afe412fe1565c9eb85355c6fff13400ecb1da5d8c5de8a4765d40b23686f3 SHA512 0e67d6891d7fef473f906db3456a34b4c61f762bf87af6583ce1d477ff090cb69c749669e5cc1a3ef21ee9de3484ea1a094a5971c539edd32a0ab810a4867dcf
diff --git a/net-libs/nghttp2/files/nghttp2-1.38.0-boost-1.70.0.patch b/net-libs/nghttp2/files/nghttp2-1.38.0-boost-1.70.0.patch
new file mode 100644
index 000000000000..cc1100a0b0ba
--- /dev/null
+++ b/net-libs/nghttp2/files/nghttp2-1.38.0-boost-1.70.0.patch
@@ -0,0 +1,50 @@
+From cbba1ebf8fcecb24392f0cc07b1235b17d0de9d8 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Adam=20Go=C5=82=C4=99biowski?= <adamg@pld-linux.org>
+Date: Thu, 18 Apr 2019 12:35:54 +0200
+Subject: [PATCH] asio: support boost-1.70
+
+In boost 1.70, deprecated get_io_context() has finally been removed.
+Introduce GET_IO_SERVICE macro that based on boost version uses
+old get_io_service() interface (boost < 1.70), or get_executor().context()
+for boost 1.70+.
+
+Commit based idea seen in monero-project/monero@17769db9462e5201befcb05f86ccbaeabf35caf8
+---
+ src/asio_server_connection.h | 10 ++++++++--
+ 1 file changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/src/asio_server_connection.h b/src/asio_server_connection.h
+index 6be794060..56924c71a 100644
+--- a/src/asio_server_connection.h
++++ b/src/asio_server_connection.h
+@@ -51,6 +51,12 @@
+ #include "util.h"
+ #include "template.h"
+ 
++#if BOOST_VERSION >= 107000
++#define GET_IO_SERVICE(s) ((boost::asio::io_context&)(s).get_executor().context())
++#else
++#define GET_IO_SERVICE(s) ((s).get_io_service())
++#endif
++
+ namespace nghttp2 {
+ 
+ namespace asio_http2 {
+@@ -71,7 +77,7 @@ class connection : public std::enable_shared_from_this<connection<socket_type>>,
+       SocketArgs &&... args)
+       : socket_(std::forward<SocketArgs>(args)...),
+         mux_(mux),
+-        deadline_(socket_.get_io_service()),
++        deadline_(GET_IO_SERVICE(socket_)),
+         tls_handshake_timeout_(tls_handshake_timeout),
+         read_timeout_(read_timeout),
+         writing_(false),
+@@ -82,7 +88,7 @@ class connection : public std::enable_shared_from_this<connection<socket_type>>,
+     boost::system::error_code ec;
+ 
+     handler_ = std::make_shared<http2_handler>(
+-        socket_.get_io_service(), socket_.lowest_layer().remote_endpoint(ec),
++        GET_IO_SERVICE(socket_), socket_.lowest_layer().remote_endpoint(ec),
+         [this]() { do_write(); }, mux_);
+     if (handler_->start() != 0) {
+       stop();
diff --git a/net-libs/nghttp2/nghttp2-1.37.0.ebuild b/net-libs/nghttp2/nghttp2-1.37.0.ebuild
index 20f89187f0fb..f27032d7957e 100644
--- a/net-libs/nghttp2/nghttp2-1.37.0.ebuild
+++ b/net-libs/nghttp2/nghttp2-1.37.0.ebuild
@@ -64,5 +64,7 @@ multilib_src_configure() {
 }
 
 multilib_src_install_all() {
-	use static-libs || find "${ED%/}"/usr -name '*.la' -delete
+	if ! use static-libs ; then
+		find "${ED}"/usr -name '*.la' -delete || die
+	fi
 }
diff --git a/net-libs/nghttp2/nghttp2-1.36.0.ebuild b/net-libs/nghttp2/nghttp2-1.38.0.ebuild
index 20f89187f0fb..23ae1e8d57ba 100644
--- a/net-libs/nghttp2/nghttp2-1.36.0.ebuild
+++ b/net-libs/nghttp2/nghttp2-1.38.0.ebuild
@@ -5,16 +5,19 @@
 
 EAPI=7
 
-inherit multilib-minimal
+inherit autotools multilib-minimal
 
 if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/nghttp2/nghttp2.git"
 	inherit git-r3
 else
 	SRC_URI="https://github.com/nghttp2/nghttp2/releases/download/v${PV}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 fi
 
+# 675772
+SRC_URI+=" https://dev.gentoo.org/~polynomial-c/${PN}-1.38.0-unbundle_http_parser.patch.xz"
+
 DESCRIPTION="HTTP/2 C Library"
 HOMEPAGE="https://nghttp2.org/"
 
@@ -30,8 +33,12 @@ RDEPEND="
 	cxx? (
 		${SSL_DEPEND}
 		dev-libs/boost:=[${MULTILIB_USEDEP},threads]
+		>=net-libs/http-parser-2.9.1:=[${MULTILIB_USEDEP}]
+	)
+	hpack-tools? (
+		>=dev-libs/jansson-2.5
+		>=net-libs/http-parser-2.9.1:=
 	)
-	hpack-tools? ( >=dev-libs/jansson-2.5 )
 	jemalloc? ( dev-libs/jemalloc[${MULTILIB_USEDEP}] )
 	utils? (
 		${SSL_DEPEND}
@@ -44,13 +51,26 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	test? ( >=dev-util/cunit-2.1[${MULTILIB_USEDEP}] )"
 
+PATCHES=(
+	"${WORKDIR}/${PN}-1.38.0-unbundle_http_parser.patch" # 675772
+	"${FILESDIR}/${P}-boost-1.70.0.patch" #683368
+)
+
+src_prepare() {
+	default
+	# Remove bundled stuff
+	rm -r third-party/http-parser || die
+	eautoreconf
+}
+
 multilib_src_configure() {
 	local myeconfargs=(
 		--disable-examples
 		--disable-failmalloc
+		--disable-python-bindings
 		--disable-werror
+		--without-bundled-http_parser
 		--without-cython
-		--disable-python-bindings
 		$(use_enable cxx asio-lib)
 		$(use_enable debug)
 		$(multilib_native_use_enable hpack-tools)
@@ -64,5 +84,7 @@ multilib_src_configure() {
 }
 
 multilib_src_install_all() {
-	use static-libs || find "${ED%/}"/usr -name '*.la' -delete
+	if ! use static-libs ; then
+		find "${ED}"/usr -name '*.la' -delete || die
+	fi
 }
diff --git a/net-libs/nghttp2/nghttp2-9999.ebuild b/net-libs/nghttp2/nghttp2-9999.ebuild
index e5d039fc7180..0950bfb1def2 100644
--- a/net-libs/nghttp2/nghttp2-9999.ebuild
+++ b/net-libs/nghttp2/nghttp2-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # TODO: Add python support.
@@ -69,5 +69,7 @@ multilib_src_configure() {
 }
 
 multilib_src_install_all() {
-	use static-libs || find "${ED%/}"/usr -name '*.la' -delete
+	if ! use static-libs ; then
+		find "${ED}"/usr -name '*.la' -delete || die
+	fi
 }