From 21cb847419eda46b9ed7d040ea224ff58a0b922f Mon Sep 17 00:00:00 2001
From: Sven Wegener <swegener@gentoo.org>
Date: Wed, 1 Apr 2020 13:30:58 +0200
Subject: dev-python/hiredis: Revision bump for new dev-libs/hiredis API

Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Sven Wegener <swegener@gentoo.org>
---
 .../hiredis/files/hiredis-0.2.0-api-0.14.patch     | 32 ++++++++++++++++++++++
 dev-python/hiredis/hiredis-0.2.0-r2.ebuild         | 21 --------------
 dev-python/hiredis/hiredis-0.2.0-r3.ebuild         | 24 ++++++++++++++++
 3 files changed, 56 insertions(+), 21 deletions(-)
 create mode 100644 dev-python/hiredis/files/hiredis-0.2.0-api-0.14.patch
 delete mode 100644 dev-python/hiredis/hiredis-0.2.0-r2.ebuild
 create mode 100644 dev-python/hiredis/hiredis-0.2.0-r3.ebuild

(limited to 'dev-python/hiredis')

diff --git a/dev-python/hiredis/files/hiredis-0.2.0-api-0.14.patch b/dev-python/hiredis/files/hiredis-0.2.0-api-0.14.patch
new file mode 100644
index 000000000000..c957ad7aa29d
--- /dev/null
+++ b/dev-python/hiredis/files/hiredis-0.2.0-api-0.14.patch
@@ -0,0 +1,32 @@
+diff -Nur hiredis-0.2.0.orig/src/reader.c hiredis-0.2.0/src/reader.c
+--- hiredis-0.2.0.orig/src/reader.c	2015-04-02 23:49:10.000000000 +0200
++++ hiredis-0.2.0/src/reader.c	2020-04-01 13:26:50.504058251 +0200
+@@ -157,7 +157,7 @@
+ };
+ 
+ static void Reader_dealloc(hiredis_ReaderObject *self) {
+-    redisReplyReaderFree(self->reader);
++    redisReaderFree(self->reader);
+     if (self->encoding)
+         free(self->encoding);
+     Py_XDECREF(self->protocolErrorClass);
+@@ -267,7 +267,7 @@
+       goto error;
+     }
+ 
+-    redisReplyReaderFeed(self->reader, (char *)buf.buf + off, len);
++    redisReaderFeed(self->reader, (char *)buf.buf + off, len);
+     PyBuffer_Release(&buf);
+     Py_RETURN_NONE;
+ 
+@@ -281,8 +281,8 @@
+     PyObject *err;
+     char *errstr;
+ 
+-    if (redisReplyReaderGetReply(self->reader, (void**)&obj) == REDIS_ERR) {
+-        errstr = redisReplyReaderGetError(self->reader);
++    if (redisReaderGetReply(self->reader, (void**)&obj) == REDIS_ERR) {
++        errstr = redisReaderGetError(self->reader);
+         /* protocolErrorClass might be a callable. call it, then use it's type */
+         err = createError(self->protocolErrorClass, errstr, strlen(errstr));
+         obj = PyObject_Type(err);
diff --git a/dev-python/hiredis/hiredis-0.2.0-r2.ebuild b/dev-python/hiredis/hiredis-0.2.0-r2.ebuild
deleted file mode 100644
index e5ca7fa47cfd..000000000000
--- a/dev-python/hiredis/hiredis-0.2.0-r2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python extension that wraps hiredis"
-HOMEPAGE="https://github.com/pietern/hiredis-py"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-DEPEND=">=dev-libs/hiredis-0.13.1:="
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}"/${P}-r1-system-libs.patch )
diff --git a/dev-python/hiredis/hiredis-0.2.0-r3.ebuild b/dev-python/hiredis/hiredis-0.2.0-r3.ebuild
new file mode 100644
index 000000000000..c6aca79094e8
--- /dev/null
+++ b/dev-python/hiredis/hiredis-0.2.0-r3.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python extension that wraps hiredis"
+HOMEPAGE="https://github.com/pietern/hiredis-py"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+DEPEND=">=dev-libs/hiredis-0.14:="
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-r1-system-libs.patch
+	"${FILESDIR}"/${P}-api-0.14.patch
+)
-- 
cgit v1.2.3-65-gdbad