1 |
commit: 93dd53558807ac23f00cfa0fb8c8420511640e1f |
2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Jul 29 07:51:08 2019 +0000 |
4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Jul 29 07:51:08 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93dd5355 |
7 |
|
8 |
net-libs/nghttp2: Removed old. |
9 |
|
10 |
Package-Manager: Portage-2.3.69, Repoman-2.3.16 |
11 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
12 |
|
13 |
net-libs/nghttp2/Manifest | 3 - |
14 |
.../files/nghttp2-1.38.0-boost-1.70.0.patch | 50 ------------ |
15 |
net-libs/nghttp2/nghttp2-1.33.0.ebuild | 68 ---------------- |
16 |
net-libs/nghttp2/nghttp2-1.38.0.ebuild | 90 ---------------------- |
17 |
4 files changed, 211 deletions(-) |
18 |
|
19 |
diff --git a/net-libs/nghttp2/Manifest b/net-libs/nghttp2/Manifest |
20 |
index d6c7e2be829..42a7d750f38 100644 |
21 |
--- a/net-libs/nghttp2/Manifest |
22 |
+++ b/net-libs/nghttp2/Manifest |
23 |
@@ -1,4 +1 @@ |
24 |
-DIST nghttp2-1.33.0.tar.xz 1554776 BLAKE2B 1b995d6385188423acbcd7c8b3a626a622270bc3079972885a1f707a9cc4ebb053f7347930ce217d2cf4277eab0a3309accb8f9ff18bd8ccc55c86aefa6246c3 SHA512 eeb0bf64fea115444c685c8a01c1017ce96be18adf88ffcdecad067de7012ca61c6b2b6a627b18e2572bba7bd77ec56a3ca4b1109f7a4b21220e8e28687b5b74 |
25 |
-DIST nghttp2-1.38.0-unbundle_http_parser.patch.xz 2616 BLAKE2B 3f15154d33f32c91aad87f23f56d761501e19e0b53b99d4df720f9e04d6d9c49a52118acbe3da87f8585c2b71b7b430ef60fc33465605f3bf9933635aabb924d SHA512 1b4377b34cf6428164011be9fc86efdd7ab8d3443edf197c45768beea0f843084a842c4cb2abc5179d6036ec99174557e06344ce67a07d98992de64d99faf3a6 |
26 |
-DIST nghttp2-1.38.0.tar.xz 1628356 BLAKE2B 0568d4ac5c1e5e6d7adf762815836502524d59fb55c623f344a8427638407a19447fe1a7753142aa205898f7bda6ebce8ef6f4d85edc6da98ffa98b83d4e363e SHA512 e432d52bcf77379ed5c10ceafb587ec8d66c56bb728cda56487b237cbab1d0073689624419ed306162dab3a51b91cfe0f59cb173b5d81346e2b6d0abd56635bc |
27 |
DIST nghttp2-1.39.1.tar.xz 1634512 BLAKE2B 66444de067200a7dd66f162c22fd258471d336b1ba02f579a675b5d9dfcbf1600fcfb92a37797842a0482bd0f5c850008508d3d41f7afddc47f7c9330fb34b43 SHA512 36558ed03c59086086abbf144ec7c54c60de3fea00a9ea594feea7186a779781cbb66a08c9b34265892dea382b42b875f551e85331cfa0086e357f9b27b919fa |
28 |
|
29 |
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 |
30 |
deleted file mode 100644 |
31 |
index cc1100a0b0b..00000000000 |
32 |
--- a/net-libs/nghttp2/files/nghttp2-1.38.0-boost-1.70.0.patch |
33 |
+++ /dev/null |
34 |
@@ -1,50 +0,0 @@ |
35 |
-From cbba1ebf8fcecb24392f0cc07b1235b17d0de9d8 Mon Sep 17 00:00:00 2001 |
36 |
-From: =?UTF-8?q?Adam=20Go=C5=82=C4=99biowski?= <adamg@×××××××××.org> |
37 |
-Date: Thu, 18 Apr 2019 12:35:54 +0200 |
38 |
-Subject: [PATCH] asio: support boost-1.70 |
39 |
- |
40 |
-In boost 1.70, deprecated get_io_context() has finally been removed. |
41 |
-Introduce GET_IO_SERVICE macro that based on boost version uses |
42 |
-old get_io_service() interface (boost < 1.70), or get_executor().context() |
43 |
-for boost 1.70+. |
44 |
- |
45 |
-Commit based idea seen in monero-project/monero@17769db9462e5201befcb05f86ccbaeabf35caf8 |
46 |
---- |
47 |
- src/asio_server_connection.h | 10 ++++++++-- |
48 |
- 1 file changed, 8 insertions(+), 2 deletions(-) |
49 |
- |
50 |
-diff --git a/src/asio_server_connection.h b/src/asio_server_connection.h |
51 |
-index 6be794060..56924c71a 100644 |
52 |
---- a/src/asio_server_connection.h |
53 |
-+++ b/src/asio_server_connection.h |
54 |
-@@ -51,6 +51,12 @@ |
55 |
- #include "util.h" |
56 |
- #include "template.h" |
57 |
- |
58 |
-+#if BOOST_VERSION >= 107000 |
59 |
-+#define GET_IO_SERVICE(s) ((boost::asio::io_context&)(s).get_executor().context()) |
60 |
-+#else |
61 |
-+#define GET_IO_SERVICE(s) ((s).get_io_service()) |
62 |
-+#endif |
63 |
-+ |
64 |
- namespace nghttp2 { |
65 |
- |
66 |
- namespace asio_http2 { |
67 |
-@@ -71,7 +77,7 @@ class connection : public std::enable_shared_from_this<connection<socket_type>>, |
68 |
- SocketArgs &&... args) |
69 |
- : socket_(std::forward<SocketArgs>(args)...), |
70 |
- mux_(mux), |
71 |
-- deadline_(socket_.get_io_service()), |
72 |
-+ deadline_(GET_IO_SERVICE(socket_)), |
73 |
- tls_handshake_timeout_(tls_handshake_timeout), |
74 |
- read_timeout_(read_timeout), |
75 |
- writing_(false), |
76 |
-@@ -82,7 +88,7 @@ class connection : public std::enable_shared_from_this<connection<socket_type>>, |
77 |
- boost::system::error_code ec; |
78 |
- |
79 |
- handler_ = std::make_shared<http2_handler>( |
80 |
-- socket_.get_io_service(), socket_.lowest_layer().remote_endpoint(ec), |
81 |
-+ GET_IO_SERVICE(socket_), socket_.lowest_layer().remote_endpoint(ec), |
82 |
- [this]() { do_write(); }, mux_); |
83 |
- if (handler_->start() != 0) { |
84 |
- stop(); |
85 |
|
86 |
diff --git a/net-libs/nghttp2/nghttp2-1.33.0.ebuild b/net-libs/nghttp2/nghttp2-1.33.0.ebuild |
87 |
deleted file mode 100644 |
88 |
index 8e3d343e95f..00000000000 |
89 |
--- a/net-libs/nghttp2/nghttp2-1.33.0.ebuild |
90 |
+++ /dev/null |
91 |
@@ -1,68 +0,0 @@ |
92 |
-# Copyright 1999-2018 Gentoo Authors |
93 |
-# Distributed under the terms of the GNU General Public License v2 |
94 |
- |
95 |
-# TODO: Add python support. |
96 |
- |
97 |
-EAPI=7 |
98 |
- |
99 |
-inherit multilib-minimal |
100 |
- |
101 |
-if [[ ${PV} == 9999 ]] ; then |
102 |
- EGIT_REPO_URI="https://github.com/nghttp2/nghttp2.git" |
103 |
- inherit git-r3 |
104 |
-else |
105 |
- SRC_URI="https://github.com/nghttp2/nghttp2/releases/download/v${PV}/${P}.tar.xz" |
106 |
- KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd" |
107 |
-fi |
108 |
- |
109 |
-DESCRIPTION="HTTP/2 C Library" |
110 |
-HOMEPAGE="https://nghttp2.org/" |
111 |
- |
112 |
-LICENSE="MIT" |
113 |
-SLOT="0/1.14" # <C++>.<C> SONAMEs |
114 |
-IUSE="cxx debug hpack-tools jemalloc libressl static-libs test +threads utils xml" |
115 |
- |
116 |
-SSL_DEPEND=" |
117 |
- !libressl? ( >=dev-libs/openssl-1.0.2:0=[-bindist,${MULTILIB_USEDEP}] ) |
118 |
- libressl? ( dev-libs/libressl:=[${MULTILIB_USEDEP}] ) |
119 |
-" |
120 |
-RDEPEND=" |
121 |
- cxx? ( |
122 |
- ${SSL_DEPEND} |
123 |
- dev-libs/boost:=[${MULTILIB_USEDEP},threads] |
124 |
- ) |
125 |
- hpack-tools? ( >=dev-libs/jansson-2.5 ) |
126 |
- jemalloc? ( dev-libs/jemalloc[${MULTILIB_USEDEP}] ) |
127 |
- utils? ( |
128 |
- ${SSL_DEPEND} |
129 |
- >=dev-libs/libev-4.15[${MULTILIB_USEDEP}] |
130 |
- >=sys-libs/zlib-1.2.3[${MULTILIB_USEDEP}] |
131 |
- net-dns/c-ares:=[${MULTILIB_USEDEP}] |
132 |
- ) |
133 |
- xml? ( >=dev-libs/libxml2-2.7.7:2[${MULTILIB_USEDEP}] )" |
134 |
-DEPEND="${RDEPEND} |
135 |
- virtual/pkgconfig |
136 |
- test? ( >=dev-util/cunit-2.1[${MULTILIB_USEDEP}] )" |
137 |
- |
138 |
-multilib_src_configure() { |
139 |
- local myeconfargs=( |
140 |
- --disable-examples |
141 |
- --disable-failmalloc |
142 |
- --disable-werror |
143 |
- --without-cython |
144 |
- --disable-python-bindings |
145 |
- $(use_enable cxx asio-lib) |
146 |
- $(use_enable debug) |
147 |
- $(multilib_native_use_enable hpack-tools) |
148 |
- $(use_enable static-libs static) |
149 |
- $(use_enable threads) |
150 |
- $(multilib_native_use_enable utils app) |
151 |
- $(multilib_native_use_with jemalloc) |
152 |
- $(multilib_native_use_with xml libxml2) |
153 |
- ) |
154 |
- ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" |
155 |
-} |
156 |
- |
157 |
-multilib_src_install_all() { |
158 |
- use static-libs || find "${ED%/}"/usr -name '*.la' -delete |
159 |
-} |
160 |
|
161 |
diff --git a/net-libs/nghttp2/nghttp2-1.38.0.ebuild b/net-libs/nghttp2/nghttp2-1.38.0.ebuild |
162 |
deleted file mode 100644 |
163 |
index 23ae1e8d57b..00000000000 |
164 |
--- a/net-libs/nghttp2/nghttp2-1.38.0.ebuild |
165 |
+++ /dev/null |
166 |
@@ -1,90 +0,0 @@ |
167 |
-# Copyright 1999-2019 Gentoo Authors |
168 |
-# Distributed under the terms of the GNU General Public License v2 |
169 |
- |
170 |
-# TODO: Add python support. |
171 |
- |
172 |
-EAPI=7 |
173 |
- |
174 |
-inherit autotools multilib-minimal |
175 |
- |
176 |
-if [[ ${PV} == 9999 ]] ; then |
177 |
- EGIT_REPO_URI="https://github.com/nghttp2/nghttp2.git" |
178 |
- inherit git-r3 |
179 |
-else |
180 |
- SRC_URI="https://github.com/nghttp2/nghttp2/releases/download/v${PV}/${P}.tar.xz" |
181 |
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" |
182 |
-fi |
183 |
- |
184 |
-# 675772 |
185 |
-SRC_URI+=" https://dev.gentoo.org/~polynomial-c/${PN}-1.38.0-unbundle_http_parser.patch.xz" |
186 |
- |
187 |
-DESCRIPTION="HTTP/2 C Library" |
188 |
-HOMEPAGE="https://nghttp2.org/" |
189 |
- |
190 |
-LICENSE="MIT" |
191 |
-SLOT="0/1.14" # <C++>.<C> SONAMEs |
192 |
-IUSE="cxx debug hpack-tools jemalloc libressl static-libs test +threads utils xml" |
193 |
- |
194 |
-SSL_DEPEND=" |
195 |
- !libressl? ( >=dev-libs/openssl-1.0.2:0=[-bindist,${MULTILIB_USEDEP}] ) |
196 |
- libressl? ( dev-libs/libressl:=[${MULTILIB_USEDEP}] ) |
197 |
-" |
198 |
-RDEPEND=" |
199 |
- cxx? ( |
200 |
- ${SSL_DEPEND} |
201 |
- dev-libs/boost:=[${MULTILIB_USEDEP},threads] |
202 |
- >=net-libs/http-parser-2.9.1:=[${MULTILIB_USEDEP}] |
203 |
- ) |
204 |
- hpack-tools? ( |
205 |
- >=dev-libs/jansson-2.5 |
206 |
- >=net-libs/http-parser-2.9.1:= |
207 |
- ) |
208 |
- jemalloc? ( dev-libs/jemalloc[${MULTILIB_USEDEP}] ) |
209 |
- utils? ( |
210 |
- ${SSL_DEPEND} |
211 |
- >=dev-libs/libev-4.15[${MULTILIB_USEDEP}] |
212 |
- >=sys-libs/zlib-1.2.3[${MULTILIB_USEDEP}] |
213 |
- net-dns/c-ares:=[${MULTILIB_USEDEP}] |
214 |
- ) |
215 |
- xml? ( >=dev-libs/libxml2-2.7.7:2[${MULTILIB_USEDEP}] )" |
216 |
-DEPEND="${RDEPEND} |
217 |
- virtual/pkgconfig |
218 |
- test? ( >=dev-util/cunit-2.1[${MULTILIB_USEDEP}] )" |
219 |
- |
220 |
-PATCHES=( |
221 |
- "${WORKDIR}/${PN}-1.38.0-unbundle_http_parser.patch" # 675772 |
222 |
- "${FILESDIR}/${P}-boost-1.70.0.patch" #683368 |
223 |
-) |
224 |
- |
225 |
-src_prepare() { |
226 |
- default |
227 |
- # Remove bundled stuff |
228 |
- rm -r third-party/http-parser || die |
229 |
- eautoreconf |
230 |
-} |
231 |
- |
232 |
-multilib_src_configure() { |
233 |
- local myeconfargs=( |
234 |
- --disable-examples |
235 |
- --disable-failmalloc |
236 |
- --disable-python-bindings |
237 |
- --disable-werror |
238 |
- --without-bundled-http_parser |
239 |
- --without-cython |
240 |
- $(use_enable cxx asio-lib) |
241 |
- $(use_enable debug) |
242 |
- $(multilib_native_use_enable hpack-tools) |
243 |
- $(use_enable static-libs static) |
244 |
- $(use_enable threads) |
245 |
- $(multilib_native_use_enable utils app) |
246 |
- $(multilib_native_use_with jemalloc) |
247 |
- $(multilib_native_use_with xml libxml2) |
248 |
- ) |
249 |
- ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" |
250 |
-} |
251 |
- |
252 |
-multilib_src_install_all() { |
253 |
- if ! use static-libs ; then |
254 |
- find "${ED}"/usr -name '*.la' -delete || die |
255 |
- fi |
256 |
-} |