commit: b2fc9e981903524fd3b02791128e11e2928b6a90
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 5 14:47:31 2021 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Aug 5 14:47:31 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b2fc9e98
dev-python/hiredis: Remove old
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-python/hiredis/Manifest | 1 -
.../hiredis/files/hiredis-1.0.1-api-0.14.patch | 32 ----------------------
.../hiredis/files/hiredis-1.0.1-system-libs.patch | 15 ----------
dev-python/hiredis/hiredis-1.1.0.ebuild | 32 ----------------------
4 files changed, 80 deletions(-)
diff --git a/dev-python/hiredis/Manifest b/dev-python/hiredis/Manifest
index 5f1ab167b26..d7d0946290e 100644
--- a/dev-python/hiredis/Manifest
+++ b/dev-python/hiredis/Manifest
@@ -1,2 +1 @@
-DIST hiredis-1.1.0.tar.gz 54620 BLAKE2B
9991745d277e87efe836c1c8eabb2016ce401e2be52c7e1b3a154350776fae6fd3c49e3096da57231e42c57bf36ba692ce26bc993d0923b5246376d8694ad058
SHA512
ad37868376de91303c15ffe6109dc7fadb4f458efdd44b7ddc0a410937a389b8e062ab7d36b1aec3fe324ecafe6b1e5e6b92f547cbf619251dad22a28e02ee9c
DIST hiredis-2.0.0.tar.gz 75807 BLAKE2B
dc7535f117c8ecfb2c924fe44a1cba2f02271c544588249de6794ce3aec27f66038ecb9f6364ca87b71f66ba13870a3be192eb79c1f360d2eb6dcb6dcae41caa
SHA512
b9a313acdd00676dc046713a81bbf4336959f49f09bd2828997c23ca41259935047c657a4b6f81913715141a75fb6bbe7fc4429c7a5b0f4bc3d5de66b9cfa909
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 16c42022828..00000000000
--- 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 c11d0baa563..00000000000
--- 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 68ec424e3ae..00000000000
--- 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"
-}
