gentoo Easter resync : 12.04.2020

7 files changed, 140 insertions, 2 deletions

diff --git a/dev-python/hiredis/Manifest b/dev-python/hiredis/Manifest
index 778346072c97..66fa081b28c1 100644
--- a/dev-python/hiredis/Manifest
+++ b/dev-python/hiredis/Manifest
@@ -1,4 +1,10 @@
+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-0.2.0.tar.gz 46113 BLAKE2B bb0479f99f5f705488846ff5e7b52d6e8a5c34519936aa747027e8a597271d3ba70efc2455f54c24248091a4477ac2a307cad7d89a03c96cb7d331e6b6e82a30 SHA512 9eb18ec089517340043d14938a213b139dc948dc9cf2f9c65e632bb4694ac22543b87a5875c1cea083e2bc8e303103c749047889cdb3e9d5680b586d34330c86
-EBUILD hiredis-0.2.0-r1.ebuild 480 BLAKE2B 90dcbea628e512b32100197a0f59c23a69b20eeef514f2adf8bf15db58d1f40dd60ff8a3e0573ce9a4af658d9a4cb1b9824dfb89f1a51ede235e7b263cf1483c SHA512 b7174432df609364de2661780e47d5acf74c05b1727a67506e338b1747e75dd36bc5b3846a0c2a0c14f8e1180afbc01f7f7c30e0030d57f7a05e8d7b84e815a6
+DIST hiredis-1.0.1.tar.gz 54460 BLAKE2B 90bdbd99f47b0765636dbeee9fc3cbb9c71fd7ba752a0d58ab9c2c9d2ee93bfc1a343465618d1127703ae09a4870d6691d7d5b52f59150849a448eae73c6a1d3 SHA512 8aa5e29b09f42826d746857d55b8042b40ffa3977386b0f8b2ea1b2ede0c28337f3df4bbd177192d8873570810bc9d0987f1f2b29f094f27adaa4aaf409c3a6b
+EBUILD hiredis-0.2.0-r1.ebuild 487 BLAKE2B 18fd4bced79c26fafb98b3446c31f181bdadc16dfe3a14175f15a428b6e963437621e6a58f1c3bdd0d22140aaebaab0221eba90cf2b94927b303e8c4815d552a SHA512 9655b58636bbbc6fce95309cf5b1ec0d6d12cf71929366d3ccf1d97af8c586a5657518b10be9aceaf2ecfb884be6d82347a2a1278d9b8adf8dc55f6c21ca56d4
+EBUILD hiredis-0.2.0-r3.ebuild 525 BLAKE2B d3b9e34c81f37060e1f6a88d3b5e0a1f2cb9576c549f15472c3768a0e6b64673be8f43d8592ccf5dbac4f834b309b0834a531a7b35e8ba98f66dc7e27fcd3588 SHA512 5b1a82fe717680ae0c24e0303109ebd11f705e69beada507c3f46c1e6044b1f7b09f21d9667141b378130e0507315421b0639d095f5e338f107861a9af99ad5f
+EBUILD hiredis-1.0.1.ebuild 616 BLAKE2B d4d95c69a52a84a3ce55ca555f7add20706a427eb1cf4e357e93393977f5dc0a5afd072392eae338c8a33e5735c2e816238b6710d9316bda8fbf3dea11ccc0be SHA512 91e029b28572ded589128c6eea47ba0331378229f15396be0020345b3e50a2ca195345a0fe5f0d2438c0486c7c844a76305d74a3c8d557867fc0241ed7b62069
 MISC metadata.xml 494 BLAKE2B 066e1d365169e3818e9b5d37f7a2c7812af63ccd2ef79ce1e8dd224b2aa4d110792441762e769791d2c93f5f90349390cb04671ebe4cd199117df20f6fa7d8bd SHA512 f378121293d91d941dcede71f7e7a1a3e6fe906aa5963bd2388f8538d4e696d0bdb16c4f44126105b43ec81b1ee9e36e9549e7557d76c6a032c1cae3a4103265
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/files/hiredis-1.0.1-api-0.14.patch b/dev-python/hiredis/files/hiredis-1.0.1-api-0.14.patch
new file mode 100644
index 000000000000..16c420228286
--- /dev/null
+++ b/dev-python/hiredis/files/hiredis-1.0.1-api-0.14.patch
@@ -0,0 +1,32 @@
+diff -Nur hiredis-1.0.1.orig/src/reader.c hiredis-1.0.1/src/reader.c
+--- hiredis-1.0.1.orig/src/reader.c	2019-11-13 11:38:29.000000000 +0100
++++ hiredis-1.0.1/src/reader.c	2020-04-01 13:15:19.852085240 +0200
+@@ -167,7 +167,7 @@
+ static void Reader_dealloc(hiredis_ReaderObject *self) {
+     // we don't need to free self->encoding as the buffer is managed by Python
+     // https://docs.python.org/3/c-api/arg.html#strings-and-buffers
+-    redisReplyReaderFree(self->reader);
++    redisReaderFree(self->reader);
+     Py_XDECREF(self->protocolErrorClass);
+     Py_XDECREF(self->replyErrorClass);
+ 
+@@ -271,7 +271,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;
+ 
+@@ -290,8 +290,8 @@
+         return NULL;
+     }
+ 
+-    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));
+         if (err != NULL) {
diff --git a/dev-python/hiredis/files/hiredis-1.0.1-system-libs.patch b/dev-python/hiredis/files/hiredis-1.0.1-system-libs.patch
new file mode 100644
index 000000000000..c11d0baa5639
--- /dev/null
+++ b/dev-python/hiredis/files/hiredis-1.0.1-system-libs.patch
@@ -0,0 +1,15 @@
+diff -Nur hiredis-1.0.1.orig/setup.py hiredis-1.0.1/setup.py
+--- hiredis-1.0.1.orig/setup.py	2019-11-13 11:38:29.000000000 +0100
++++ hiredis-1.0.1/setup.py	2020-03-19 08:18:53.414214592 +0100
+@@ -11,9 +11,8 @@
+   return module.__version__
+ 
+ ext = Extension("hiredis.hiredis",
+-  sources=sorted(glob.glob("src/*.c") +
+-                 ["vendor/hiredis/%s.c" % src for src in ("read", "sds")]),
+-  include_dirs=["vendor"])
++  sources=sorted(glob.glob("src/*.c")),
++  libraries=["hiredis"])
+ 
+ setup(
+   name="hiredis",
diff --git a/dev-python/hiredis/hiredis-0.2.0-r1.ebuild b/dev-python/hiredis/hiredis-0.2.0-r1.ebuild
index b3bde25c0dd4..811fc2e54e96 100644
--- a/dev-python/hiredis/hiredis-0.2.0-r1.ebuild
+++ b/dev-python/hiredis/hiredis-0.2.0-r1.ebuild
@@ -15,7 +15,7 @@ SLOT="0"
 KEYWORDS="amd64 arm x86"
 IUSE=""
 
-DEPEND=">=dev-libs/hiredis-0.13.1"
+DEPEND=">=dev-libs/hiredis-0.13.1:0/0.13"
 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
+)
diff --git a/dev-python/hiredis/hiredis-1.0.1.ebuild b/dev-python/hiredis/hiredis-1.0.1.ebuild
new file mode 100644
index 000000000000..1e14c85fa398
--- /dev/null
+++ b/dev-python/hiredis/hiredis-1.0.1.ebuild
@@ -0,0 +1,29 @@
+# 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}-system-libs.patch
+	"${FILESDIR}"/${P}-api-0.14.patch
+)
+
+python_test() {
+	cd test
+	"${EPYTHON}" -m unittest reader.ReaderTest || die "tests failed"
+}