commit: 49d2ae8762c90af1364383e368f50e9a367974ab Author: Julian Ospald <hasufell <AT> gentoo <DOT> org> AuthorDate: Sun Oct 25 21:18:43 2015 +0000 Commit: Julian Ospald <hasufell <AT> gentoo <DOT> org> CommitDate: Sun Oct 25 21:18:43 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49d2ae87
dev-libs/libuv: cleanup old dev-libs/libuv/Manifest | 3 - dev-libs/libuv/files/01-libuv-0.11.25-tests.patch | 84 ----------------------- dev-libs/libuv/files/02-libuv-0.11.25-tests.patch | 44 ------------ dev-libs/libuv/libuv-0.11.25-r1.ebuild | 43 ------------ dev-libs/libuv/libuv-0.11.29.ebuild | 41 ----------- dev-libs/libuv/libuv-1.1.0.ebuild | 45 ------------ 6 files changed, 260 deletions(-) diff --git a/dev-libs/libuv/Manifest b/dev-libs/libuv/Manifest index 0edabf3..5631aad 100644 --- a/dev-libs/libuv/Manifest +++ b/dev-libs/libuv/Manifest @@ -1,6 +1,3 @@ -DIST libuv-0.11.25.tar.gz 393814 SHA256 b95a3e5eca9554998b7423ee786205e52731e82e2d24cbbd4f65af763de542fb SHA512 7e2b5befb76ee7b0c86e6a459ef276386fe60b511b64c33d01e656cbcf8ff833244c8601b7b83963bf00d64a999a5a186f14937308eed35b1496e0c829b37380 WHIRLPOOL 23d844d92100b49b598790a98cbac132c453f683fedf9c089cabf3bcafe1b9c064fab579fe5e7d95459de0046ac8f9d8b133ff79bd71efa5294e203a1c7afc6b -DIST libuv-0.11.29.tar.gz 486768 SHA256 fac45e72c2df30ddc9cbdf5002fc1363281d0e433831e3d43acb1036c2cabfc6 SHA512 91439c47b3af90a71c15ffcaf296b515c2723b2a4cd329b529b6d37a4d05d12bdf6ad6bca87079d17c9b79aab02634afddbcf53c70afcc1765dcaf49b9dd28b2 WHIRLPOOL d010c5f6e3c1a4262195b50087bc3408c6df726adbcd23abc27cf64ec1da6b159049a6d4f9d46c3cebaaa333b667cefe339d4fec6b1379a38940ee7f4376ec40 -DIST libuv-1.1.0.tar.gz 1010640 SHA256 e4ff513c18a6322898972b0b6ce986445bcd2c13710f4a46b10baf80b28599cf SHA512 2d801b8b12e6f9b179f62084d1c260b6443ae34523c12dbea8317ff34aa0a76f3df2ee38fb161aa6fd4092b6280a53c7ed599d04eb7ed0d250c1e60b4e584dea WHIRLPOOL 6d6b3eea2ddb54322d20125f1a0a61b8a00b1771ccb8bc0d7829229cabb3e363adc6f85b2d1ae2f506410a543c92404df9f545a57805ac278fab560d5a24de5e DIST libuv-1.4.2.tar.gz 1017992 SHA256 b9e424f69db0d1c3035c5f871cd9d7a3f4bace0a4db3e974bdbfa0cf95f6b741 SHA512 a2ee23d957b4b2c486c01a8ca0814cb42853d3496edcf2c39228fe9259317699954bd222abbcc4e7fda81b936ecfd64be3472230b319e8caab8e4bba0c835ced WHIRLPOOL 53727ec56b274523e445b23160a6a42d8b7fdf5b298480f0819a0cd4a19d811b59d00756eec2c9d69a34d8add96ff6103b44752df06d1346a13f2c979f52cc4a DIST libuv-1.5.0.tar.gz 1023438 SHA256 f9c6ad4b7a2c90d93c8e09d2e739bb46d199639c4d884ba30323359521b09367 SHA512 b6f6e685e66b72a0439eda35297fe5f98db598abd83deff0e9f614ef1f52ffc36717ded5e28aa2c32054c52f396ae826651c04e958f13e409a701558d777cee6 WHIRLPOOL aea128f28d336160cb2b616cd5a6dd479504be612d7b805c6bdcee529530dfb49b9bace254df9bbfceccdaed1086589defc94888b99657709c79299a13aa47e4 DIST libuv-1.6.1.tar.gz 1027771 SHA256 f558ede285878d6a69f6a6d43b5df0241f3c35d62ac989477bdbd418badd83d7 SHA512 3fe53352de312666c02ee6523bd0da3e8a8fb1704eb8c5016490ad3a2275aa1a529123e00173ea626afc284d9863cf5cb5ef4a114655c55925f46632ca5ad0d3 WHIRLPOOL 0ea59068acdc9c9a86521a5ae61148f182d14f39643b1c6df523e79faa249d5a6ab2bbb964bef6a0aff9bbf67d4119a801848421d0029a8f11d1a698213619a4 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 deleted file mode 100644 index 12eabc2..0000000 --- a/dev-libs/libuv/files/01-libuv-0.11.25-tests.patch +++ /dev/null @@ -1,84 +0,0 @@ -From f58b02f2cf068e1bed10bf9f632bad396d907de9 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Sa=C3=BAl=20Ibarra=20Corretg=C3=A9?= <[email protected]> -Date: Fri, 23 May 2014 09:25:23 +0200 -Subject: [PATCH] unix, windows: fix parsing scoped IPv6 addresses - ---- - src/inet.c | 37 +++++++++++++++++++++---------------- - 1 file changed, 21 insertions(+), 16 deletions(-) - -diff --git a/src/inet.c b/src/inet.c -index 0eb9438..36457f4 100644 ---- a/src/inet.c -+++ b/src/inet.c -@@ -17,6 +17,7 @@ - - #include <stdio.h> - #include <string.h> -+#include <stdlib.h> - - #if defined(_MSC_VER) && _MSC_VER < 1600 - # include "stdint-msvc2008.h" -@@ -159,11 +160,27 @@ static int inet_ntop6(const unsigned char *src, char *dst, size_t size) { - - - int uv_inet_pton(int af, const char* src, void* dst) { -+ if (src == NULL || dst == NULL) -+ return UV_EINVAL; -+ - switch (af) { - case AF_INET: - return (inet_pton4(src, dst)); -- case AF_INET6: -- return (inet_pton6(src, dst)); -+ case AF_INET6: { -+ int len; -+ char tmp[UV__INET6_ADDRSTRLEN], *s, *p; -+ s = (char*) src; -+ p = strchr(src, '%'); -+ if (p != NULL) { -+ s = tmp; -+ len = p - src; -+ if (len > UV__INET6_ADDRSTRLEN-1) -+ len = UV__INET6_ADDRSTRLEN-1; -+ memcpy(s, src, len); -+ s[len] = '\0'; -+ } -+ return inet_pton6(s, dst); -+ } - default: - return UV_EAFNOSUPPORT; - } -@@ -228,7 +245,7 @@ static int inet_pton6(const char *src, unsigned char *dst) { - curtok = src; - seen_xdigits = 0; - val = 0; -- while ((ch = *src++) != '\0' && ch != '%') { -+ while ((ch = *src++) != '\0') { - const char *pch; - - if ((pch = strchr((xdigits = xdigits_l), ch)) == NULL) -@@ -259,19 +276,7 @@ static int inet_pton6(const char *src, unsigned char *dst) { - continue; - } - if (ch == '.' && ((tp + sizeof(struct in_addr)) <= endp)) { -- int err; -- -- /* Scope id present, parse ipv4 addr without it */ -- pch = strchr(curtok, '%'); -- if (pch != NULL) { -- char tmp[sizeof "255.255.255.255"]; -- -- memcpy(tmp, curtok, pch - curtok); -- curtok = tmp; -- src = pch; -- } -- -- err = inet_pton4(curtok, tp); -+ int err = inet_pton4(curtok, tp); - if (err == 0) { - tp += sizeof(struct in_addr); - seen_xdigits = 0; --- -1.9.3 - 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 deleted file mode 100644 index d05783c..0000000 --- a/dev-libs/libuv/files/02-libuv-0.11.25-tests.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 02c2595fdc259fa15b9a927779cbe65f381f4b26 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Sa=C3=BAl=20Ibarra=20Corretg=C3=A9?= <[email protected]> -Date: Fri, 23 May 2014 16:36:57 +0200 -Subject: [PATCH] unix, windows: define UV__INET/6_ADDRSTRLEN constants - ---- - src/inet.c | 7 +++++-- - 1 file changed, 5 insertions(+), 2 deletions(-) - -diff --git a/src/inet.c b/src/inet.c -index 9220de6..0eb9438 100644 ---- a/src/inet.c -+++ b/src/inet.c -@@ -27,6 +27,9 @@ - #include "uv.h" - #include "uv-common.h" - -+#define UV__INET_ADDRSTRLEN 16 -+#define UV__INET6_ADDRSTRLEN 46 -+ - - static int inet_ntop4(const unsigned char *src, char *dst, size_t size); - static int inet_ntop6(const unsigned char *src, char *dst, size_t size); -@@ -49,7 +52,7 @@ int uv_inet_ntop(int af, const void* src, char* dst, size_t size) { - - static int inet_ntop4(const unsigned char *src, char *dst, size_t size) { - static const char fmt[] = "%u.%u.%u.%u"; -- char tmp[sizeof "255.255.255.255"]; -+ char tmp[UV__INET_ADDRSTRLEN]; - int l; - - #ifndef _WIN32 -@@ -74,7 +77,7 @@ static int inet_ntop6(const unsigned char *src, char *dst, size_t size) { - * Keep this in mind if you think this function should have been coded - * to use pointer overlays. All the world's not a VAX. - */ -- char tmp[sizeof "ffff:ffff:ffff:ffff:ffff:ffff:255.255.255.255"], *tp; -+ char tmp[UV__INET6_ADDRSTRLEN], *tp; - struct { int base, len; } best, cur; - unsigned int words[sizeof(struct in6_addr) / sizeof(uint16_t)]; - int i; --- -1.9.3 - diff --git a/dev-libs/libuv/libuv-0.11.25-r1.ebuild b/dev-libs/libuv/libuv-0.11.25-r1.ebuild deleted file mode 100644 index e9531fa..0000000 --- a/dev-libs/libuv/libuv-0.11.25-r1.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit eutils autotools multilib-minimal - -DESCRIPTION="A new platform layer for Node" -HOMEPAGE="https://github.com/libuv/libuv"; -SRC_URI="https://github.com/libuv/libuv/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD BSD-2 ISC MIT" -SLOT="0/11" -KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux" -IUSE="static-libs" - -DEPEND="virtual/pkgconfig" - -src_prepare() { - echo "m4_define([UV_EXTRA_AUTOMAKE_FLAGS], [serial-tests])" \ - > m4/libuv-extra-automake-flags.m4 || die - - epatch "${FILESDIR}"/0{1,2}-${P}-tests.patch - - eautoreconf -} - -multilib_src_configure() { - ECONF_SOURCE="${S}" econf \ - $(use_enable static-libs static) -} - -multilib_src_test() { - mkdir "${BUILD_DIR}"/test || die - cp -pPR "${S}"/test/fixtures "${BUILD_DIR}"/test/fixtures || die - default -} - -multilib_src_install_all() { - einstalldocs - prune_libtool_files -} diff --git a/dev-libs/libuv/libuv-0.11.29.ebuild b/dev-libs/libuv/libuv-0.11.29.ebuild deleted file mode 100644 index 7481d39..0000000 --- a/dev-libs/libuv/libuv-0.11.29.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit eutils autotools multilib-minimal - -DESCRIPTION="A new platform layer for Node" -HOMEPAGE="https://github.com/libuv/libuv"; -SRC_URI="https://github.com/libuv/libuv/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD BSD-2 ISC MIT" -SLOT="0/11" -KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" -IUSE="static-libs" - -DEPEND="virtual/pkgconfig" - -src_prepare() { - echo "m4_define([UV_EXTRA_AUTOMAKE_FLAGS], [serial-tests])" \ - > m4/libuv-extra-automake-flags.m4 || die - - eautoreconf -} - -multilib_src_configure() { - ECONF_SOURCE="${S}" econf \ - $(use_enable static-libs static) -} - -multilib_src_test() { - mkdir "${BUILD_DIR}"/test || die - cp -pPR "${S}"/test/fixtures "${BUILD_DIR}"/test/fixtures || die - default -} - -multilib_src_install_all() { - einstalldocs - prune_libtool_files -} diff --git a/dev-libs/libuv/libuv-1.1.0.ebuild b/dev-libs/libuv/libuv-1.1.0.ebuild deleted file mode 100644 index 6bbe6f6..0000000 --- a/dev-libs/libuv/libuv-1.1.0.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit eutils autotools multilib-minimal - -DESCRIPTION="A new platform layer for Node" -HOMEPAGE="https://github.com/joyent/libuv"; -SRC_URI="https://github.com/libuv/libuv/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD BSD-2 ISC MIT" -SLOT="0/1" -KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" -IUSE="static-libs" - -DEPEND="virtual/pkgconfig" - -src_prepare() { - echo "m4_define([UV_EXTRA_AUTOMAKE_FLAGS], [serial-tests])" \ - > m4/libuv-extra-automake-flags.m4 || die - - sed -i \ - -e '/libuv_la_CFLAGS/s#-g##' \ - Makefile.am || die "fixing CFLAGS failed!" - - eautoreconf -} - -multilib_src_configure() { - ECONF_SOURCE="${S}" econf \ - $(use_enable static-libs static) -} - -multilib_src_test() { - mkdir "${BUILD_DIR}"/test || die - cp -pPR "${S}"/test/fixtures "${BUILD_DIR}"/test/fixtures || die - default -} - -multilib_src_install_all() { - einstalldocs - prune_libtool_files -}
