[gentoo-commits] repo/gentoo:master commit in: dev-python/hiredis/, dev-python/hiredis/files/

[Sven Wegener]

commit:     21cb847419eda46b9ed7d040ea224ff58a0b922f
Author:     Sven Wegener <swegener <AT> gentoo <DOT> org>
AuthorDate: Wed Apr  1 11:30:58 2020 +0000
Commit:     Sven Wegener <swegener <AT> gentoo <DOT> org>
CommitDate: Wed Apr  1 11:37:20 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21cb8474

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 <AT> gentoo.org>

 .../hiredis/files/hiredis-0.2.0-api-0.14.patch     | 32 ++++++++++++++++++++++
 ...dis-0.2.0-r2.ebuild => hiredis-0.2.0-r3.ebuild} |  7 +++--
 2 files changed, 37 insertions(+), 2 deletions(-)

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 00000000000..c957ad7aa29
--- /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-r3.ebuild
similarity index 76%
rename from dev-python/hiredis/hiredis-0.2.0-r2.ebuild
rename to dev-python/hiredis/hiredis-0.2.0-r3.ebuild
index e5ca7fa47cf..c6aca79094e 100644
--- a/dev-python/hiredis/hiredis-0.2.0-r2.ebuild
+++ b/dev-python/hiredis/hiredis-0.2.0-r3.ebuild
@@ -15,7 +15,10 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
 IUSE=""
 
-DEPEND=">=dev-libs/hiredis-0.13.1:="
+DEPEND=">=dev-libs/hiredis-0.14:="
 RDEPEND="${DEPEND}"
 
-PATCHES=( "${FILESDIR}"/${P}-r1-system-libs.patch )
+PATCHES=(
+	"${FILESDIR}"/${P}-r1-system-libs.patch
+	"${FILESDIR}"/${P}-api-0.14.patch
+)