Gentoo Archives: gentoo-commits

From: Julian Ospald <hasufell@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/libuv/, dev-libs/libuv/files/
Date: Sun, 25 Oct 2015 21:20:35
Message-Id: 1445807923.49d2ae8762c90af1364383e368f50e9a367974ab.hasufell@gentoo
1 commit: 49d2ae8762c90af1364383e368f50e9a367974ab
2 Author: Julian Ospald <hasufell <AT> gentoo <DOT> org>
3 AuthorDate: Sun Oct 25 21:18:43 2015 +0000
4 Commit: Julian Ospald <hasufell <AT> gentoo <DOT> org>
5 CommitDate: Sun Oct 25 21:18:43 2015 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49d2ae87
7
8 dev-libs/libuv: cleanup old
9
10 dev-libs/libuv/Manifest | 3 -
11 dev-libs/libuv/files/01-libuv-0.11.25-tests.patch | 84 -----------------------
12 dev-libs/libuv/files/02-libuv-0.11.25-tests.patch | 44 ------------
13 dev-libs/libuv/libuv-0.11.25-r1.ebuild | 43 ------------
14 dev-libs/libuv/libuv-0.11.29.ebuild | 41 -----------
15 dev-libs/libuv/libuv-1.1.0.ebuild | 45 ------------
16 6 files changed, 260 deletions(-)
17
18 diff --git a/dev-libs/libuv/Manifest b/dev-libs/libuv/Manifest
19 index 0edabf3..5631aad 100644
20 --- a/dev-libs/libuv/Manifest
21 +++ b/dev-libs/libuv/Manifest
22 @@ -1,6 +1,3 @@
23 -DIST libuv-0.11.25.tar.gz 393814 SHA256 b95a3e5eca9554998b7423ee786205e52731e82e2d24cbbd4f65af763de542fb SHA512 7e2b5befb76ee7b0c86e6a459ef276386fe60b511b64c33d01e656cbcf8ff833244c8601b7b83963bf00d64a999a5a186f14937308eed35b1496e0c829b37380 WHIRLPOOL 23d844d92100b49b598790a98cbac132c453f683fedf9c089cabf3bcafe1b9c064fab579fe5e7d95459de0046ac8f9d8b133ff79bd71efa5294e203a1c7afc6b
24 -DIST libuv-0.11.29.tar.gz 486768 SHA256 fac45e72c2df30ddc9cbdf5002fc1363281d0e433831e3d43acb1036c2cabfc6 SHA512 91439c47b3af90a71c15ffcaf296b515c2723b2a4cd329b529b6d37a4d05d12bdf6ad6bca87079d17c9b79aab02634afddbcf53c70afcc1765dcaf49b9dd28b2 WHIRLPOOL d010c5f6e3c1a4262195b50087bc3408c6df726adbcd23abc27cf64ec1da6b159049a6d4f9d46c3cebaaa333b667cefe339d4fec6b1379a38940ee7f4376ec40
25 -DIST libuv-1.1.0.tar.gz 1010640 SHA256 e4ff513c18a6322898972b0b6ce986445bcd2c13710f4a46b10baf80b28599cf SHA512 2d801b8b12e6f9b179f62084d1c260b6443ae34523c12dbea8317ff34aa0a76f3df2ee38fb161aa6fd4092b6280a53c7ed599d04eb7ed0d250c1e60b4e584dea WHIRLPOOL 6d6b3eea2ddb54322d20125f1a0a61b8a00b1771ccb8bc0d7829229cabb3e363adc6f85b2d1ae2f506410a543c92404df9f545a57805ac278fab560d5a24de5e
26 DIST libuv-1.4.2.tar.gz 1017992 SHA256 b9e424f69db0d1c3035c5f871cd9d7a3f4bace0a4db3e974bdbfa0cf95f6b741 SHA512 a2ee23d957b4b2c486c01a8ca0814cb42853d3496edcf2c39228fe9259317699954bd222abbcc4e7fda81b936ecfd64be3472230b319e8caab8e4bba0c835ced WHIRLPOOL 53727ec56b274523e445b23160a6a42d8b7fdf5b298480f0819a0cd4a19d811b59d00756eec2c9d69a34d8add96ff6103b44752df06d1346a13f2c979f52cc4a
27 DIST libuv-1.5.0.tar.gz 1023438 SHA256 f9c6ad4b7a2c90d93c8e09d2e739bb46d199639c4d884ba30323359521b09367 SHA512 b6f6e685e66b72a0439eda35297fe5f98db598abd83deff0e9f614ef1f52ffc36717ded5e28aa2c32054c52f396ae826651c04e958f13e409a701558d777cee6 WHIRLPOOL aea128f28d336160cb2b616cd5a6dd479504be612d7b805c6bdcee529530dfb49b9bace254df9bbfceccdaed1086589defc94888b99657709c79299a13aa47e4
28 DIST libuv-1.6.1.tar.gz 1027771 SHA256 f558ede285878d6a69f6a6d43b5df0241f3c35d62ac989477bdbd418badd83d7 SHA512 3fe53352de312666c02ee6523bd0da3e8a8fb1704eb8c5016490ad3a2275aa1a529123e00173ea626afc284d9863cf5cb5ef4a114655c55925f46632ca5ad0d3 WHIRLPOOL 0ea59068acdc9c9a86521a5ae61148f182d14f39643b1c6df523e79faa249d5a6ab2bbb964bef6a0aff9bbf67d4119a801848421d0029a8f11d1a698213619a4
29
30 diff --git a/dev-libs/libuv/files/01-libuv-0.11.25-tests.patch b/dev-libs/libuv/files/01-libuv-0.11.25-tests.patch
31 deleted file mode 100644
32 index 12eabc2..0000000
33 --- a/dev-libs/libuv/files/01-libuv-0.11.25-tests.patch
34 +++ /dev/null
35 @@ -1,84 +0,0 @@
36 -From f58b02f2cf068e1bed10bf9f632bad396d907de9 Mon Sep 17 00:00:00 2001
37 -From: =?UTF-8?q?Sa=C3=BAl=20Ibarra=20Corretg=C3=A9?= <saghul@×××××.com>
38 -Date: Fri, 23 May 2014 09:25:23 +0200
39 -Subject: [PATCH] unix, windows: fix parsing scoped IPv6 addresses
40 -
41 ----
42 - src/inet.c | 37 +++++++++++++++++++++----------------
43 - 1 file changed, 21 insertions(+), 16 deletions(-)
44 -
45 -diff --git a/src/inet.c b/src/inet.c
46 -index 0eb9438..36457f4 100644
47 ---- a/src/inet.c
48 -+++ b/src/inet.c
49 -@@ -17,6 +17,7 @@
50 -
51 - #include <stdio.h>
52 - #include <string.h>
53 -+#include <stdlib.h>
54 -
55 - #if defined(_MSC_VER) && _MSC_VER < 1600
56 - # include "stdint-msvc2008.h"
57 -@@ -159,11 +160,27 @@ static int inet_ntop6(const unsigned char *src, char *dst, size_t size) {
58 -
59 -
60 - int uv_inet_pton(int af, const char* src, void* dst) {
61 -+ if (src == NULL || dst == NULL)
62 -+ return UV_EINVAL;
63 -+
64 - switch (af) {
65 - case AF_INET:
66 - return (inet_pton4(src, dst));
67 -- case AF_INET6:
68 -- return (inet_pton6(src, dst));
69 -+ case AF_INET6: {
70 -+ int len;
71 -+ char tmp[UV__INET6_ADDRSTRLEN], *s, *p;
72 -+ s = (char*) src;
73 -+ p = strchr(src, '%');
74 -+ if (p != NULL) {
75 -+ s = tmp;
76 -+ len = p - src;
77 -+ if (len > UV__INET6_ADDRSTRLEN-1)
78 -+ len = UV__INET6_ADDRSTRLEN-1;
79 -+ memcpy(s, src, len);
80 -+ s[len] = '\0';
81 -+ }
82 -+ return inet_pton6(s, dst);
83 -+ }
84 - default:
85 - return UV_EAFNOSUPPORT;
86 - }
87 -@@ -228,7 +245,7 @@ static int inet_pton6(const char *src, unsigned char *dst) {
88 - curtok = src;
89 - seen_xdigits = 0;
90 - val = 0;
91 -- while ((ch = *src++) != '\0' && ch != '%') {
92 -+ while ((ch = *src++) != '\0') {
93 - const char *pch;
94 -
95 - if ((pch = strchr((xdigits = xdigits_l), ch)) == NULL)
96 -@@ -259,19 +276,7 @@ static int inet_pton6(const char *src, unsigned char *dst) {
97 - continue;
98 - }
99 - if (ch == '.' && ((tp + sizeof(struct in_addr)) <= endp)) {
100 -- int err;
101 --
102 -- /* Scope id present, parse ipv4 addr without it */
103 -- pch = strchr(curtok, '%');
104 -- if (pch != NULL) {
105 -- char tmp[sizeof "255.255.255.255"];
106 --
107 -- memcpy(tmp, curtok, pch - curtok);
108 -- curtok = tmp;
109 -- src = pch;
110 -- }
111 --
112 -- err = inet_pton4(curtok, tp);
113 -+ int err = inet_pton4(curtok, tp);
114 - if (err == 0) {
115 - tp += sizeof(struct in_addr);
116 - seen_xdigits = 0;
117 ---
118 -1.9.3
119 -
120
121 diff --git a/dev-libs/libuv/files/02-libuv-0.11.25-tests.patch b/dev-libs/libuv/files/02-libuv-0.11.25-tests.patch
122 deleted file mode 100644
123 index d05783c..0000000
124 --- a/dev-libs/libuv/files/02-libuv-0.11.25-tests.patch
125 +++ /dev/null
126 @@ -1,44 +0,0 @@
127 -From 02c2595fdc259fa15b9a927779cbe65f381f4b26 Mon Sep 17 00:00:00 2001
128 -From: =?UTF-8?q?Sa=C3=BAl=20Ibarra=20Corretg=C3=A9?= <saghul@×××××.com>
129 -Date: Fri, 23 May 2014 16:36:57 +0200
130 -Subject: [PATCH] unix, windows: define UV__INET/6_ADDRSTRLEN constants
131 -
132 ----
133 - src/inet.c | 7 +++++--
134 - 1 file changed, 5 insertions(+), 2 deletions(-)
135 -
136 -diff --git a/src/inet.c b/src/inet.c
137 -index 9220de6..0eb9438 100644
138 ---- a/src/inet.c
139 -+++ b/src/inet.c
140 -@@ -27,6 +27,9 @@
141 - #include "uv.h"
142 - #include "uv-common.h"
143 -
144 -+#define UV__INET_ADDRSTRLEN 16
145 -+#define UV__INET6_ADDRSTRLEN 46
146 -+
147 -
148 - static int inet_ntop4(const unsigned char *src, char *dst, size_t size);
149 - static int inet_ntop6(const unsigned char *src, char *dst, size_t size);
150 -@@ -49,7 +52,7 @@ int uv_inet_ntop(int af, const void* src, char* dst, size_t size) {
151 -
152 - static int inet_ntop4(const unsigned char *src, char *dst, size_t size) {
153 - static const char fmt[] = "%u.%u.%u.%u";
154 -- char tmp[sizeof "255.255.255.255"];
155 -+ char tmp[UV__INET_ADDRSTRLEN];
156 - int l;
157 -
158 - #ifndef _WIN32
159 -@@ -74,7 +77,7 @@ static int inet_ntop6(const unsigned char *src, char *dst, size_t size) {
160 - * Keep this in mind if you think this function should have been coded
161 - * to use pointer overlays. All the world's not a VAX.
162 - */
163 -- char tmp[sizeof "ffff:ffff:ffff:ffff:ffff:ffff:255.255.255.255"], *tp;
164 -+ char tmp[UV__INET6_ADDRSTRLEN], *tp;
165 - struct { int base, len; } best, cur;
166 - unsigned int words[sizeof(struct in6_addr) / sizeof(uint16_t)];
167 - int i;
168 ---
169 -1.9.3
170 -
171
172 diff --git a/dev-libs/libuv/libuv-0.11.25-r1.ebuild b/dev-libs/libuv/libuv-0.11.25-r1.ebuild
173 deleted file mode 100644
174 index e9531fa..0000000
175 --- a/dev-libs/libuv/libuv-0.11.25-r1.ebuild
176 +++ /dev/null
177 @@ -1,43 +0,0 @@
178 -# Copyright 1999-2015 Gentoo Foundation
179 -# Distributed under the terms of the GNU General Public License v2
180 -# $Id$
181 -
182 -EAPI=5
183 -
184 -inherit eutils autotools multilib-minimal
185 -
186 -DESCRIPTION="A new platform layer for Node"
187 -HOMEPAGE="https://github.com/libuv/libuv"
188 -SRC_URI="https://github.com/libuv/libuv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
189 -
190 -LICENSE="BSD BSD-2 ISC MIT"
191 -SLOT="0/11"
192 -KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
193 -IUSE="static-libs"
194 -
195 -DEPEND="virtual/pkgconfig"
196 -
197 -src_prepare() {
198 - echo "m4_define([UV_EXTRA_AUTOMAKE_FLAGS], [serial-tests])" \
199 - > m4/libuv-extra-automake-flags.m4 || die
200 -
201 - epatch "${FILESDIR}"/0{1,2}-${P}-tests.patch
202 -
203 - eautoreconf
204 -}
205 -
206 -multilib_src_configure() {
207 - ECONF_SOURCE="${S}" econf \
208 - $(use_enable static-libs static)
209 -}
210 -
211 -multilib_src_test() {
212 - mkdir "${BUILD_DIR}"/test || die
213 - cp -pPR "${S}"/test/fixtures "${BUILD_DIR}"/test/fixtures || die
214 - default
215 -}
216 -
217 -multilib_src_install_all() {
218 - einstalldocs
219 - prune_libtool_files
220 -}
221
222 diff --git a/dev-libs/libuv/libuv-0.11.29.ebuild b/dev-libs/libuv/libuv-0.11.29.ebuild
223 deleted file mode 100644
224 index 7481d39..0000000
225 --- a/dev-libs/libuv/libuv-0.11.29.ebuild
226 +++ /dev/null
227 @@ -1,41 +0,0 @@
228 -# Copyright 1999-2015 Gentoo Foundation
229 -# Distributed under the terms of the GNU General Public License v2
230 -# $Id$
231 -
232 -EAPI=5
233 -
234 -inherit eutils autotools multilib-minimal
235 -
236 -DESCRIPTION="A new platform layer for Node"
237 -HOMEPAGE="https://github.com/libuv/libuv"
238 -SRC_URI="https://github.com/libuv/libuv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
239 -
240 -LICENSE="BSD BSD-2 ISC MIT"
241 -SLOT="0/11"
242 -KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
243 -IUSE="static-libs"
244 -
245 -DEPEND="virtual/pkgconfig"
246 -
247 -src_prepare() {
248 - echo "m4_define([UV_EXTRA_AUTOMAKE_FLAGS], [serial-tests])" \
249 - > m4/libuv-extra-automake-flags.m4 || die
250 -
251 - eautoreconf
252 -}
253 -
254 -multilib_src_configure() {
255 - ECONF_SOURCE="${S}" econf \
256 - $(use_enable static-libs static)
257 -}
258 -
259 -multilib_src_test() {
260 - mkdir "${BUILD_DIR}"/test || die
261 - cp -pPR "${S}"/test/fixtures "${BUILD_DIR}"/test/fixtures || die
262 - default
263 -}
264 -
265 -multilib_src_install_all() {
266 - einstalldocs
267 - prune_libtool_files
268 -}
269
270 diff --git a/dev-libs/libuv/libuv-1.1.0.ebuild b/dev-libs/libuv/libuv-1.1.0.ebuild
271 deleted file mode 100644
272 index 6bbe6f6..0000000
273 --- a/dev-libs/libuv/libuv-1.1.0.ebuild
274 +++ /dev/null
275 @@ -1,45 +0,0 @@
276 -# Copyright 1999-2015 Gentoo Foundation
277 -# Distributed under the terms of the GNU General Public License v2
278 -# $Id$
279 -
280 -EAPI=5
281 -
282 -inherit eutils autotools multilib-minimal
283 -
284 -DESCRIPTION="A new platform layer for Node"
285 -HOMEPAGE="https://github.com/joyent/libuv"
286 -SRC_URI="https://github.com/libuv/libuv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
287 -
288 -LICENSE="BSD BSD-2 ISC MIT"
289 -SLOT="0/1"
290 -KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
291 -IUSE="static-libs"
292 -
293 -DEPEND="virtual/pkgconfig"
294 -
295 -src_prepare() {
296 - echo "m4_define([UV_EXTRA_AUTOMAKE_FLAGS], [serial-tests])" \
297 - > m4/libuv-extra-automake-flags.m4 || die
298 -
299 - sed -i \
300 - -e '/libuv_la_CFLAGS/s#-g##' \
301 - Makefile.am || die "fixing CFLAGS failed!"
302 -
303 - eautoreconf
304 -}
305 -
306 -multilib_src_configure() {
307 - ECONF_SOURCE="${S}" econf \
308 - $(use_enable static-libs static)
309 -}
310 -
311 -multilib_src_test() {
312 - mkdir "${BUILD_DIR}"/test || die
313 - cp -pPR "${S}"/test/fixtures "${BUILD_DIR}"/test/fixtures || die
314 - default
315 -}
316 -
317 -multilib_src_install_all() {
318 - einstalldocs
319 - prune_libtool_files
320 -}