commit: 9a759f9a58b3b42fd0939bb4070f61a003eb2b0b Author: Sven Wegener <swegener <AT> gentoo <DOT> org> AuthorDate: Wed Apr 1 11:36:03 2020 +0000 Commit: Sven Wegener <swegener <AT> gentoo <DOT> org> CommitDate: Wed Apr 1 11:37:28 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a759f9a
dev-python/hiredis: Version bump Package-Manager: Portage-2.3.89, Repoman-2.3.20 Signed-off-by: Sven Wegener <swegener <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.0.1.ebuild | 24 ++++++++++++++++ 4 files changed, 72 insertions(+) diff --git a/dev-python/hiredis/Manifest b/dev-python/hiredis/Manifest index 03eb100b294..a24f01ae4f0 100644 --- a/dev-python/hiredis/Manifest +++ b/dev-python/hiredis/Manifest @@ -1 +1,2 @@ DIST hiredis-0.2.0.tar.gz 46113 BLAKE2B bb0479f99f5f705488846ff5e7b52d6e8a5c34519936aa747027e8a597271d3ba70efc2455f54c24248091a4477ac2a307cad7d89a03c96cb7d331e6b6e82a30 SHA512 9eb18ec089517340043d14938a213b139dc948dc9cf2f9c65e632bb4694ac22543b87a5875c1cea083e2bc8e303103c749047889cdb3e9d5680b586d34330c86 +DIST hiredis-1.0.1.tar.gz 54460 BLAKE2B 90bdbd99f47b0765636dbeee9fc3cbb9c71fd7ba752a0d58ab9c2c9d2ee93bfc1a343465618d1127703ae09a4870d6691d7d5b52f59150849a448eae73c6a1d3 SHA512 8aa5e29b09f42826d746857d55b8042b40ffa3977386b0f8b2ea1b2ede0c28337f3df4bbd177192d8873570810bc9d0987f1f2b29f094f27adaa4aaf409c3a6b 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 00000000000..16c42022828 --- /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 00000000000..c11d0baa563 --- /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-1.0.1.ebuild b/dev-python/hiredis/hiredis-1.0.1.ebuild new file mode 100644 index 00000000000..bc7739eaeec --- /dev/null +++ b/dev-python/hiredis/hiredis-1.0.1.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}-system-libs.patch + "${FILESDIR}"/${P}-api-0.14.patch +)