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

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

[Aaron Bauman]

commit:     406d8e2a35a66a18173928b6e18eaf22ad4d41e9
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Tue Jun  4 21:46:31 2019 +0000
Commit:     Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Tue Jun 18 00:34:56 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=406d8e2a

dev-python/hiredis: remove unused patch

Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/12193
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>

 .../hiredis/files/hiredis-0.2.0-system-libs.patch  | 28 ----------------------
 1 file changed, 28 deletions(-)

diff --git a/dev-python/hiredis/files/hiredis-0.2.0-system-libs.patch b/dev-python/hiredis/files/hiredis-0.2.0-system-libs.patch
deleted file mode 100644
index 6cd22292deb..00000000000
--- a/dev-python/hiredis/files/hiredis-0.2.0-system-libs.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Remove vendor and var 'lib' from setup.py
-diff -u hiredis-0.2.0.orig/setup.py hiredis-0.2.0/setup.py
---- setup.py	2015-06-21 11:47:28.796472027 +0800
-+++ setup.py	2015-06-21 11:49:53.047949803 +0800
-@@ -40,12 +40,9 @@
- # supported Python versions is worse...
- #
- # Also see: https://github.com/pietern/hiredis-py/issues/15
--lib = ("hiredis_for_hiredis_py", {
--  "sources": ["vendor/hiredis/%s.c" % src for src in ("read", "sds")]})
- 
- ext = Extension("hiredis.hiredis",
--  sources=glob.glob("src/*.c"),
--  include_dirs=["vendor"])
-+  sources=glob.glob("src/*.c"))
- 
- setup(
-   name="hiredis",
-@@ -57,7 +54,6 @@
-   keywords=["Redis"],
-   license="BSD",
-   packages=["hiredis"],
--  libraries=[lib],
-   ext_modules=[ext],
- 
-   # Override "install_lib" command
-Common subdirectories: hiredis-0.2.0.orig/src and hiredis-0.2.0/src
-Common subdirectories: hiredis-0.2.0.orig/vendor and hiredis-0.2.0/vendor

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

[Aaron Bauman]

commit:     2faeb749e92da02b2bb0d93b1ab0ea051863517b
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Tue May 19 19:20:08 2020 +0000
Commit:     Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Tue Jun  2 04:27:59 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2faeb749

dev-python/hiredis: remove unused patches

Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>

 .../hiredis/files/hiredis-0.2.0-api-0.14.patch     | 32 ----------------------
 .../files/hiredis-0.2.0-r1-system-libs.patch       | 26 ------------------
 2 files changed, 58 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
deleted file mode 100644
index c957ad7aa29..00000000000
--- a/dev-python/hiredis/files/hiredis-0.2.0-api-0.14.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-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/files/hiredis-0.2.0-r1-system-libs.patch b/dev-python/hiredis/files/hiredis-0.2.0-r1-system-libs.patch
deleted file mode 100644
index 19d4bd8598f..00000000000
--- a/dev-python/hiredis/files/hiredis-0.2.0-r1-system-libs.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -ur hiredis-0.2.0.orig/setup.py hiredis-0.2.0/setup.py
---- hiredis-0.2.0.orig/setup.py	2015-04-03 16:08:45.000000000 +0200
-+++ hiredis-0.2.0/setup.py	2018-04-22 16:57:15.966520939 +0200
-@@ -40,12 +40,11 @@
- # supported Python versions is worse...
- #
- # Also see: https://github.com/pietern/hiredis-py/issues/15
--lib = ("hiredis_for_hiredis_py", {
--  "sources": ["vendor/hiredis/%s.c" % src for src in ("read", "sds")]})
- 
- ext = Extension("hiredis.hiredis",
-   sources=glob.glob("src/*.c"),
--  include_dirs=["vendor"])
-+  libraries=["hiredis"],
-+)
- 
- setup(
-   name="hiredis",
-@@ -57,7 +56,6 @@
-   keywords=["Redis"],
-   license="BSD",
-   packages=["hiredis"],
--  libraries=[lib],
-   ext_modules=[ext],
- 
-   # Override "install_lib" command