Version bump with some fixes. Install a pkg-config file. Run tests against a isolated redis instance.

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!

4 files changed, 142 insertions, 19 deletions

diff --git a/dev-libs/hiredis/ChangeLog b/dev-libs/hiredis/ChangeLog
index 6fa27fc678b7..bc7ebff02664 100644
--- a/dev-libs/hiredis/ChangeLog
+++ b/dev-libs/hiredis/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-libs/hiredis
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/hiredis/ChangeLog,v 1.21 2015/06/06 18:59:32 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/hiredis/ChangeLog,v 1.22 2015/06/15 06:58:52 mgorny Exp $
+
+*hiredis-0.13.1 (15 Jun 2015)
+
+  15 Jun 2015; Michał Górny <mgorny@gentoo.org>
+  +files/hiredis-0.13.1-disable-network-tests.patch, +hiredis-0.13.1.ebuild:
+  Version bump with some fixes. Install a pkg-config file. Run tests against a
+  isolated redis instance.
 
   06 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
   Add github to remote-id in metadata.xml
diff --git a/dev-libs/hiredis/Manifest b/dev-libs/hiredis/Manifest
index feb92c3896a8..cd1772aee7b2 100644
--- a/dev-libs/hiredis/Manifest
+++ b/dev-libs/hiredis/Manifest
@@ -1,28 +1,31 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX hiredis-0.11.0-disable-network-tests.patch 1084 SHA256 25cc9f5a2ae873ddea7c02db73b6cb2f6a3414033debaab14add673d21d1860b SHA512 188460bdfd0c534b870303fd1f741ac09df6bcd65b5004d97c861d1ce9c6dbbab7708c5a04bcc20540b48f693e94180a991033fc7d5191ab12c5971e30308abe WHIRLPOOL e5d74ac465c899fd0718dbeb91504e0256e7aa8058dfd3a836f9eac612d55befe5a76809d251ea15573012e2f8b71ea9fbd54a61773f3ee2bdcfa1de7a75bcdf
+AUX hiredis-0.13.1-disable-network-tests.patch 1293 SHA256 647d7f1ea6c49d11114682fba946904226643ef243701d906550554e1777d3a1 SHA512 65f1a727d81ecf6ca9d529c59073a480589f372bd3e45d89b42e21772e90a60f2a3465abf2e7776acffd406592c616135ed0e9bf61f7fa12be5959a13f1a5952 WHIRLPOOL ddebf28efe651cf3efe250dfdb983ffc11d4b7331242dc21b9774e2872daf6363ae09aba002bdb1446a46c6ae4bcb73118ba79441137584b52386c77a8d9ac6f
 DIST hiredis-0.11.0.tar.gz 42137 SHA256 ff7b2849e55bf3589eecced7125934feb9645c36a4d490d001dc08c93553eafd SHA512 a506c3e09267bd431dea87fdb7f9a44fb1d4795cbecb31323fe2fb9d66c10351fbf6d931fdaf2731fc2d0a985234e5d6ba0c9e694374d2f414294d27b6f060b8 WHIRLPOOL 0d4d4385452b4fe3aabc7cbdbef95914fea685a65f44a6b2addaec8f0f7779ed7f72c50cfbb976e1838553746ae90f2ce8685c208727e450738ff2bb29cca144
+DIST hiredis-0.13.1.tar.gz 54912 SHA256 8865105e15331156a74b64aafbfd3f8c784a8375e003a55512dcca3d82168487 SHA512 70b533a6cfbc3ce2b64018978e4f4460ca9a204ede92b571638ed4f04960199be0704cff16fcaf368e5c997a01e3b2da98e3c556c2f05c8316381f989684fcf1 WHIRLPOOL 6b2884217544a78153b33d4bc758f8d5bfe2cf29a16c768df7ffefbe7def43c7ae1477f1826790fdc64999b272bd33f72e10a968e606324366cb2b5539a0df71
 EBUILD hiredis-0.11.0-r1.ebuild 1245 SHA256 8be27d49ca6b801c960524ceb9d77716e1aced253c375d0aa52c6b75fbd001d6 SHA512 6898142de0bb0c5bccfaec3d8565cfaaf9e2ab9e19d804f1235fdc465867b8134f51d1147fe6ad7fbea8da35077948b1873658dd70029c699430ee59eba20744 WHIRLPOOL db018a48cab6f97a0851d99c75c5c875e7676d5a7b6e3320fb80406255951e229ee330e4c461a0ccdb2669b1f7c11b6ccbb8a70fbafd72a09bb36ee9fd2b00b4
 EBUILD hiredis-0.11.0.ebuild 1004 SHA256 d9b0ac228b999e660ecbbffee0b107e9376d582e6f4c626b4c00fb94be470f28 SHA512 4ab6f218bab4af7a10fced5dcf4efc0ea1b32dd7226d626001c9ab8cbea4cb7a52046f6741ca448494d41280ea8e435bdda6568dc41341ad100920939b699d3c WHIRLPOOL 5b9f54a09417cfd6e95de6aecc4adccf410389b2d8543766eee65fb41b3ecb88a390ccf9f7537eb890798c0520db16e2d911d8f0aa049e74ca10fd6ce064b541
-MISC ChangeLog 2788 SHA256 adbf78f44f955c33caf4052e20c440d33c468dbe513b333223fb0640ff0c61f3 SHA512 ea0c600c1a64e34e120e7b72a70215a0b0247ceebb8d5c49c5de430d6396709f6751b7979ccf1ec1dd145f842f612cb545c56d2200f6735384312b9c0ac453d0 WHIRLPOOL de639fbf3c0285667951aef9325cdfa6e9436cb101fbd0f1cd40f441729afdfb3e5de57c837e0917cfbe18755906d2d0ac1d7d65866066d0ea2be0007b3a0d1a
+EBUILD hiredis-0.13.1.ebuild 1877 SHA256 163e51ed5461330bdc48d15cdf9a851c46965623ffdd87d29089367a947e1f45 SHA512 82a96f05224f6894251980bcee99b819c10497c69057a988200d383cd681fff984e38b37ca2e2a9beb56343da5ad6017fbd84725a843d7e7b173f42678ea3215 WHIRLPOOL 5f1326672d549aedabc8be731c35b797693299a896b84205c559508fd9ce28a0a3ec2450bbeca192c23833f32fe22f20a4afccfb04d715d9ff62a1f9860f26a5
+MISC ChangeLog 3055 SHA256 d1875c093b00442aec43b0d899822f4ce0abb2a041c9632cb36e4e144649d234 SHA512 130d030e6b12e033f82898736a2b782d3fcfd3c741145613b6e9e80cfcaf04104df6c88ddab2347b41585847a1bebc7c6adc209677058a77535ec99baa9461a8 WHIRLPOOL d47799f9731eb0a398867f0bf4f7f5ec7f4fa4e879d4554378345dfb6c90cef5cc14d35dee32f4db7b6379024f0cc3ad9868174c758c05a4df09d006996171fe
 MISC metadata.xml 322 SHA256 b1218374fc7356b9e0ce46480f58d9ec272da8b3536d9d97d9d5015406ea7063 SHA512 de58b7b238d68afaa45377053354d1b09a06222f9172dc3aa1c8061b1989675a7e4fd6847b18b82483da17c9a97fc039b35a518687cb0b89ae7bc723b36ec9d9 WHIRLPOOL 4b0d66eb533646ad8b1a7ee3f5ca422cb9481027ca216923efa1dae4dbd9f2abf99933fb088bf200ee9a5d13e09aa21edc1dffd15b71ea544a31580d833dd26b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
 
-iQJ8BAEBCgBmBQJVc0MVXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiuxIP/3igjSjLgqaOeKDqxtrlm6Yf
-HgBAKWFbQ0Dyd0yeRtrPzIlhwlsuoBvdfpxj5JKum6xgv/m7N/oUW536ODIi2T+Z
-EP8eFpcvOHhjrfR1kINukc1bMndvhEgBQ4flDL+k9BG8BHpQzrDnF9VX6961FKQC
-QELu4B3fSu2yFOCoKs/6T6rC0oAiIs9VEI4YNAYiuBHc1tw25itkp7eIF98G1Gau
-kGTt4QrddzktA2sernChDDtYvCstU0z7gE4MMAzDu/nJV23ZfcGjtBkDBMCvom0H
-Ss77WeHDgQX4e9W2Tet2lY/psF2031IqyOH0/SqxDLGQQJxAfB5Diyo700JWAvEi
-pAj4E7xeVNF8cwrLaKz8d0OC+gVqjRHwSWKEi50bMNhH9x1k0OHNv5q4JYpZlTjY
-ZvHgcbnjEDRF96vVEv/0Ipjhfkt6DPUA/TNadTcxL5CbY6T+JlGisMUgVSpTHoyN
-Z3Bu4Ty5Na4uGPFRYKEY/8c+Sv7ynrD23F38Q2YHpJZQ23I+JvFtiOr1yvFl7vXJ
-BCD1OvbjejMptFv0F31gYl3VAPIW/bxXQgpyt8ehgsyP+hFQw5dqwNawI//CpC2o
-AAtqzz+M/qSvPLswmW9VChRKBsQLozTIqlzbC/yaqk2pKsf6MqJiaYuBW5IFRFiA
-hPDPKuDOG/29DQDBGRHA
-=9jna
+iQJ8BAEBCABmBQJVfnetXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOmw0P/R592NHdTr/N3EP87YBz04sn
+QBOsvUE3xS/GTPPQiNpK40SKK1s98YZmvHgaChv6WUcad5mZvo3GP0rUhsx3XL2+
+jC8uGgTqX9NtHVi86kSq5hV1pXOnS7xIE2ZewnB8NL5N5W/Fdlq4d7+hAaWighog
+1tWC3+Q06QNV4FvXbHCnhgTSA2BXeaXcxD8IM2ykDMJjROz8wIlCKhU60AxH7vas
+2QjlFybOzPMzqJM5zrdu4HKvUh5ZEm9/FulaqZhTqY/wYXulR6U3KgZlJ32niv3j
+i87xQtuHTDJJ5679Ij/vPvJy9Su4NY1GtfYvsB9rltz817g6Qrxocw3Au6Z0nogo
+ZBWRoUQ/NNRfU6QGUz4iRjyhmrnE1NaSsbKuOBszyr1PXDVG5JMthbiiKfw5Z7lZ
+eBgCnp0yRRPYZ1Tgs2+zrOqR6FX+hD1HhH1s01YTGR516bkgGk419DQJvIhpI53N
+aKUJC4aoGT9F4bH5wUrRPE6jk4imWOXWckdf/Dt+1oRM0yEOGrJV6ZNdNMJxavrp
+TyYaLjmFHGNO9JpzUJk/D3XWDVlvHZQLQe7TLyUo9yZr+TBDqyEQQ9dZV+u2FGAV
+neG3Qa4c+sT8NeGsnNnUuJYcPP1wDgu+xFBn2y4UA8cHW660sAR1/FLtJrCuVEBQ
+L5f5Rk2keuUpvQ+0CbAC
+=pD2w
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/hiredis/files/hiredis-0.13.1-disable-network-tests.patch b/dev-libs/hiredis/files/hiredis-0.13.1-disable-network-tests.patch
new file mode 100644
index 000000000000..2fcbb076d5df
--- /dev/null
+++ b/dev-libs/hiredis/files/hiredis-0.13.1-disable-network-tests.patch
@@ -0,0 +1,36 @@
+diff --git test.c test.c
+index 8fde554..89ed6a0 100644
+--- test.c
++++ test.c
+@@ -343,6 +343,7 @@ static void test_free_null(void) {
+ static void test_blocking_connection_errors(void) {
+     redisContext *c;
+ 
++#if 0
+     test("Returns error when host cannot be resolved: ");
+     c = redisConnect((char*)"idontexist.test", 6379);
+     test_cond(c->err == REDIS_ERR_OTHER &&
+@@ -353,6 +354,7 @@ static void test_blocking_connection_errors(void) {
+          strcmp(c->errstr,"Temporary failure in name resolution") == 0 ||
+          strcmp(c->errstr,"no address associated with name") == 0));
+     redisFree(c);
++#endif
+ 
+     test("Returns error when the port is not open: ");
+     c = redisConnect((char*)"localhost", 1);
+@@ -773,6 +775,7 @@ int main(int argc, char **argv) {
+     test_blocking_connection_errors();
+     test_free_null();
+ 
++#if 0
+     printf("\nTesting against TCP connection (%s:%d):\n", cfg.tcp.host, cfg.tcp.port);
+     cfg.type = CONN_TCP;
+     test_blocking_connection(cfg);
+@@ -781,6 +784,7 @@ int main(int argc, char **argv) {
+     test_invalid_timeout_errors(cfg);
+     test_append_formatted_commands(cfg);
+     if (throughput) test_throughput(cfg);
++#endif
+ 
+     printf("\nTesting against Unix socket connection (%s):\n", cfg.unix.path);
+     cfg.type = CONN_UNIX;
diff --git a/dev-libs/hiredis/hiredis-0.13.1.ebuild b/dev-libs/hiredis/hiredis-0.13.1.ebuild
new file mode 100644
index 000000000000..d6b25d3fc9d4
--- /dev/null
+++ b/dev-libs/hiredis/hiredis-0.13.1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/hiredis/hiredis-0.13.1.ebuild,v 1.1 2015/06/15 06:58:52 mgorny Exp $
+
+EAPI=5
+
+inherit eutils multilib
+
+DESCRIPTION="Minimalistic C client library for the Redis database"
+HOMEPAGE="http://github.com/redis/hiredis"
+SRC_URI="http://github.com/redis/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc64 ~x86 ~x86-fbsd ~x64-solaris"
+IUSE="examples static-libs test"
+
+DEPEND="test? ( dev-db/redis )"
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-disable-network-tests.patch"
+
+	# use GNU ld syntax on Solaris
+	sed -i -e '/DYLIB_MAKE_CMD=.* -G/d' Makefile || die
+}
+
+_build() {
+	emake \
+		AR="$(tc-getAR)" \
+		CC="$(tc-getCC)" \
+		PREFIX="${EPREFIX%/}/usr" \
+		LIBRARY_PATH="$(get_libdir)" \
+		ARCH= \
+		DEBUG= \
+		OPTIMIZATION="${CPPFLAGS}" \
+		"$@"
+}
+
+src_compile() {
+	# The static lib re-uses the same objects as the shared lib, so
+	# overhead is low w/creating it all the time.  It's also needed
+	# by the tests.
+	_build dynamic static hiredis.pc
+}
+
+src_test() {
+	local REDIS_PID="${T}"/hiredis.pid
+	local REDIS_SOCK="${T}"/hiredis.sock
+	local REDIS_PORT=56379
+	local REDIS_TEST_CONFIG="daemonize yes
+		pidfile ${REDIS_PID}
+		port ${REDIS_PORT}
+		bind 127.0.0.1
+		unixsocket //${REDIS_SOCK}"
+
+	_build hiredis-test
+
+	/usr/sbin/redis-server - <<< "${REDIS_TEST_CONFIG}" || die
+	./hiredis-test -h 127.0.0.1 -p ${REDIS_PID} -s ${REDIS_SOCK}
+	local ret=$?
+
+	kill "$(<"${REDIS_PID}")" || die
+	[ ${ret} != "0" ] && die "tests failed"
+}
+
+src_install() {
+	_build PREFIX="${ED%/}/usr" install
+	if use static-libs; then
+		rm "${ED%/}/usr/$(get_libdir)/libhiredis.a" || die
+	fi
+	use examples && dodoc -r examples
+
+	insinto /usr/$(get_libdir)/pkgconfig
+	doins ${PN}.pc
+
+	dodoc CHANGELOG.md README.md
+}