5 files changed, 2 insertions, 85 deletions
diff --git a/dev-python/hiredis/Manifest b/dev-python/hiredis/Manifest
index a37c5406915f..46f8ead901c1 100644
--- a/dev-python/hiredis/Manifest
+++ b/dev-python/hiredis/Manifest
@@ -1,8 +1,4 @@
-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
 AUX hiredis-2.0.0-system-libs.patch 390 BLAKE2B bf64bb9ad6ca84c5cdabe505dfed0417e71d9585cd60c0fa2bd9627b2cb90f8502f5224d5854a14213a5b4a9e01814e23d2295dba0acc122102181fab955297c SHA512 04521b844c346f86a44608bca76f706ec5f70a35c6ce2678fd7c4b958e6053d56aac0fca0d301ec8bed6aaa369c883370ffb946930d46d0fc8c0f7f9e52f7bed
-DIST hiredis-1.1.0.tar.gz 54620 BLAKE2B 9991745d277e87efe836c1c8eabb2016ce401e2be52c7e1b3a154350776fae6fd3c49e3096da57231e42c57bf36ba692ce26bc993d0923b5246376d8694ad058 SHA512 ad37868376de91303c15ffe6109dc7fadb4f458efdd44b7ddc0a410937a389b8e062ab7d36b1aec3fe324ecafe6b1e5e6b92f547cbf619251dad22a28e02ee9c
 DIST hiredis-2.0.0.tar.gz 75807 BLAKE2B dc7535f117c8ecfb2c924fe44a1cba2f02271c544588249de6794ce3aec27f66038ecb9f6364ca87b71f66ba13870a3be192eb79c1f360d2eb6dcb6dcae41caa SHA512 b9a313acdd00676dc046713a81bbf4336959f49f09bd2828997c23ca41259935047c657a4b6f81913715141a75fb6bbe7fc4429c7a5b0f4bc3d5de66b9cfa909
-EBUILD hiredis-1.1.0.ebuild 711 BLAKE2B ea29b6b1b3715ad14044459e8afe8876716748b8ebcf38f6ec9d9d16ab6d08108efd5bf4f498101618354707f5afc65957ce38a02e491296d0fde4c2b5897a24 SHA512 414f9b7b60adc607f5fcf4ed4d4898a3513fcf0dcbc99bbad842e26b473b07bfd55cae75b1d737f4227e9911035608d205cabe68a69cdd3fa47d31065ba0e047
-EBUILD hiredis-2.0.0.ebuild 664 BLAKE2B 33feff366f8c7832224a086fa3a741ddf695eae454e4e117134161e61e978323eaa3bcc58199ed43a89d33dfc773d6ea0dd936ffc55fc359fcf0bcfa5d76efec SHA512 60beb20d611ef4f2564284a4eeb77fafa961f42e6aebe882580527f3bbdea1decdc1990cc6544bd8d8524da9e0894c3079f80a6e0ef8986e2c1eb22496341bca
+EBUILD hiredis-2.0.0.ebuild 662 BLAKE2B 19cfc847fb62d26e8a678b5aa1a8fe7b62ed2d306b73b3eb25466642c447f92bc05b9253e728aaf0b1ae817c1f3709d32fa57f7413ac34d9b94f023d7f01eb15 SHA512 c8c4fb4c1310d433691e8a45a3f06a9330473d59e09195535c7c1e1420ab01712bc003e4833abdaab2a5173e5b653b4673cd5d36533f7cfc63c4d139caa03c8f
 MISC metadata.xml 578 BLAKE2B 39cbb3058e829134e69701f8acf4c89995d6ef1553b911b956a38ce2432267b78a7db070713d230dc2895c5df0c8e8295278caa442642fe64378a5cfdf444ac4 SHA512 da2ecff30312f5eed7611b107bf678af6d1fa45d5d87f75474d70412d7a17db4a37dae578a3047c45758e22a8041c123fa349c5f23580fdc98439300335636a7
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
deleted file mode 100644
index 16c420228286..000000000000
--- a/dev-python/hiredis/files/hiredis-1.0.1-api-0.14.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-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
deleted file mode 100644
index c11d0baa5639..000000000000
--- a/dev-python/hiredis/files/hiredis-1.0.1-system-libs.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-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-1.1.0.ebuild b/dev-python/hiredis/hiredis-1.1.0.ebuild
deleted file mode 100644
index 68ec424e3aec..000000000000
--- a/dev-python/hiredis/hiredis-1.1.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python extension that wraps hiredis"
-HOMEPAGE="https://github.com/redis/hiredis-py/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE="system-libs"
-
-DEPEND="system-libs? ( dev-libs/hiredis:0/0.14 )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	use system-libs && PATCHES+=(
-		"${FILESDIR}"/${PN}-1.0.1-system-libs.patch
-		"${FILESDIR}"/${PN}-1.0.1-api-0.14.patch
-	)
-	default
-}
-
-python_test() {
-	cd test || die
-	"${EPYTHON}" -m unittest reader.ReaderTest || die "tests failed"
-}
diff --git a/dev-python/hiredis/hiredis-2.0.0.ebuild b/dev-python/hiredis/hiredis-2.0.0.ebuild
index c2881e5aae37..20a1453d27ce 100644
--- a/dev-python/hiredis/hiredis-2.0.0.ebuild
+++ b/dev-python/hiredis/hiredis-2.0.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="system-libs"
 
 DEPEND="system-libs? ( dev-libs/hiredis:0/1.0.0 )"