From 9452a6e87b6c2c70513bc47a2470bf9f1168920e Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 13 Jun 2020 10:39:22 +0100 Subject: gentoo resync : 13.06.2020 --- dev-python/hiredis/Manifest | 2 -- .../hiredis/files/hiredis-0.2.0-api-0.14.patch | 32 ---------------------- .../files/hiredis-0.2.0-r1-system-libs.patch | 26 ------------------ 3 files changed, 60 deletions(-) delete mode 100644 dev-python/hiredis/files/hiredis-0.2.0-api-0.14.patch delete mode 100644 dev-python/hiredis/files/hiredis-0.2.0-r1-system-libs.patch (limited to 'dev-python/hiredis') diff --git a/dev-python/hiredis/Manifest b/dev-python/hiredis/Manifest index 00f9c14f8da9..9bcf1a6afb61 100644 --- a/dev-python/hiredis/Manifest +++ b/dev-python/hiredis/Manifest @@ -1,5 +1,3 @@ -AUX hiredis-0.2.0-api-0.14.patch 1220 BLAKE2B 530407c625f8beeef8e879bfa4c6754d45adcccdbeb8cf2b7bda745972d751904b037385ca690d9d77a4c440b86cb7d378be00cce1ce0ab362ba12b22c4b2db9 SHA512 f741d3a8f52d3ae2c412f70c4e63ee78224a2a0bbfdcf963b240f0aba89a8c765f8f1c75d20a50da9304eed96927cc97e0dc83b525982d60889adb36f0f716e7 -AUX hiredis-0.2.0-r1-system-libs.patch 746 BLAKE2B 5819aad60d449d6516587855bfe1d3e873e58e06c86e523964f2b79a6c4de7b14267f63f5733313dec32e081133b8413cc36feb5afa61ff5fb43cc0a4da622e7 SHA512 4679b5b45654c22856278c59ddc37b405960504687cd0f055e74946fcc8e48e97d78f44a664e197cd96cc0ed73ada6ca9d48df05e086e98fd2139998d31a7bde AUX hiredis-1.0.1-api-0.14.patch 1332 BLAKE2B 08d5c2f1e85db8f0eb81e620c08f150c613f34f3e0e96716891dc60100dfbe5f3c74ad3bdd312db909951ceddc44f5516a14fb9719c7e8be7c676c93b5981db6 SHA512 3c32c157a9f86498c42bfad043577d981d611a6396408932595d7f58eef2737e7d9f3879c714e358c2233fdebd36958919875f8ff5da90775b4205625de0adb8 AUX hiredis-1.0.1-system-libs.patch 519 BLAKE2B 8ba885963970dfa0a32b38f4b03e26b2a295a480a7d2033082317ec3b2d598f02acce32c95a784b439d938402a41716d6885e9450dd642b7240af5c6625cced3 SHA512 fb646b968cc14d06de0ec2cbebd6ad1418e1bc0d7c03b529d5c1febe3db9f09933b23e9cf1aa80c6c382923d4b96ce0100709337eb375cbe08508ebbb842059c DIST hiredis-1.0.1.tar.gz 54460 BLAKE2B 90bdbd99f47b0765636dbeee9fc3cbb9c71fd7ba752a0d58ab9c2c9d2ee93bfc1a343465618d1127703ae09a4870d6691d7d5b52f59150849a448eae73c6a1d3 SHA512 8aa5e29b09f42826d746857d55b8042b40ffa3977386b0f8b2ea1b2ede0c28337f3df4bbd177192d8873570810bc9d0987f1f2b29f094f27adaa4aaf409c3a6b 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 c957ad7aa29d..000000000000 --- 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 19d4bd8598ff..000000000000 --- 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 -- cgit v1.2.3