commit: f615633911632aeb66164d6c4f82e7dc28df8846 Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Sat Aug 10 06:44:10 2024 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Sat Aug 10 06:44:10 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6156339
dev-python/hiredis: Remove old Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> dev-python/hiredis/Manifest | 2 - .../hiredis/files/hiredis-2.2.2-system-libs.patch | 53 ---------------------- dev-python/hiredis/hiredis-2.3.2.ebuild | 45 ------------------ dev-python/hiredis/hiredis-2.4.0.ebuild | 45 ------------------ 4 files changed, 145 deletions(-) diff --git a/dev-python/hiredis/Manifest b/dev-python/hiredis/Manifest index 9c650e9c85cb..dbb9d4231330 100644 --- a/dev-python/hiredis/Manifest +++ b/dev-python/hiredis/Manifest @@ -1,3 +1 @@ -DIST hiredis-py-2.3.2.gh.tar.gz 19076 BLAKE2B 4a3e747765f559407b3ad84524bc1040e3a530723b5756320743fc20400bc70e867d48e71696d732a5fa5eb231199cbefb6f487d0b5ece6fc8f6c41f10f3c0d8 SHA512 1a22ab324f9675973c3dc37c55d6dd9cf43fbc161003003a73b2e1dfbb3fed7dcb1433f4fc51045a88cb2735f7c8495b93a819a0a9f6300e05b0cc85160eaace -DIST hiredis-py-2.4.0.gh.tar.gz 19076 BLAKE2B a5b047db044801e5dabdd5bcaefb5a89cce472f45baa6a3d590b09014446695ed84baaa46bc4d8a809cc6ffa2a2e219e03b62268ee9f818ef5e9c770cd064591 SHA512 638184fff812cf2c0d0e731be98e22c37c2c07db539ce2ad1e5d45e8f399864bc49e5e26cd0b1fcdf7db9fc776a664f8541229ef00da0b597c4be4f3ab7461cf DIST hiredis-py-3.0.0.gh.tar.gz 19055 BLAKE2B 2ad3c185b6a70ebb509e0d34b1a1122784c74ecc843c966620a20d122e05dcb11129dbb7f76a7956081d147881edc2c66264fda1109e6990ef2171f15b339da7 SHA512 64abc15f73eaf65e16b1c3f98c21cf31823ffeb7131b89eeefee9856654c016867903d9a5d8c7ab0bdb24922076a67cb553c4298abcccd69ad0d5ba2d18c8a67 diff --git a/dev-python/hiredis/files/hiredis-2.2.2-system-libs.patch b/dev-python/hiredis/files/hiredis-2.2.2-system-libs.patch deleted file mode 100644 index 67f6a5650f66..000000000000 --- a/dev-python/hiredis/files/hiredis-2.2.2-system-libs.patch +++ /dev/null @@ -1,53 +0,0 @@ ---- hiredis-2.2.2.orig/setup.py -+++ hiredis-2.2.2/setup.py -@@ -18,8 +18,7 @@ - - - def get_sources(): -- hiredis_sources = ("alloc", "async", "hiredis", "net", "read", "sds", "sockcompat") -- return sorted(glob.glob("src/*.c") + ["vendor/hiredis/%s.c" % src for src in hiredis_sources]) -+ return sorted(glob.glob("src/*.c")) - - - def get_linker_args(): -@@ -38,17 +37,16 @@ - - def get_libraries(): - if 'win32' in sys.platform: -- return ["ws2_32", ] -+ return ["ws2_32", "hiredis"] - else: -- return [] -+ return ["hiredis"] - - - ext = Extension("hiredis.hiredis", - sources=get_sources(), - extra_compile_args=get_compiler_args(), - extra_link_args=get_linker_args(), -- libraries=get_libraries(), -- include_dirs=["vendor"]) -+ libraries=get_libraries()) - - setup( - name="hiredis", ---- hiredis-2.2.2.orig/src/pack.c -+++ hiredis-2.2.2/src/pack.c -@@ -16,7 +16,7 @@ - extern sds sdsnewlen(const void *init, size_t initlen); - #endif - --#include <hiredis/sdsalloc.h> -+#include <hiredis/sds.h> - - PyObject * - pack_command(PyObject *cmd) -@@ -32,7 +32,7 @@ - } - - Py_ssize_t tokens_number = PyTuple_Size(cmd); -- sds *tokens = s_malloc(sizeof(sds) * tokens_number); -+ sds *tokens = sds_malloc(sizeof(sds) * tokens_number); - if (tokens == NULL) - { - return PyErr_NoMemory(); diff --git a/dev-python/hiredis/hiredis-2.3.2.ebuild b/dev-python/hiredis/hiredis-2.3.2.ebuild deleted file mode 100644 index 661374875657..000000000000 --- a/dev-python/hiredis/hiredis-2.3.2.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_EXT=1 -DISTUTILS_USE_PEP517="setuptools" -PYTHON_COMPAT=( python3_{10..13} pypy3 ) - -inherit distutils-r1 - -MY_P=hiredis-py-${PV} -DESCRIPTION="Python extension that wraps hiredis" -HOMEPAGE=" - https://github.com/redis/hiredis-py/ - https://pypi.org/project/hiredis/ -" -SRC_URI=" - https://github.com/redis/hiredis-py/archive/v${PV}.tar.gz - -> ${MY_P}.gh.tar.gz -" -S=${WORKDIR}/${MY_P} - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86" - -DEPEND=" - >=dev-libs/hiredis-1.0.0:= -" -RDEPEND=" - ${DEPEND} -" - -PATCHES=( - "${FILESDIR}"/hiredis-2.2.2-system-libs.patch -) - -distutils_enable_tests pytest - -python_test() { - local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 - rm -rf hiredis || die - epytest -} diff --git a/dev-python/hiredis/hiredis-2.4.0.ebuild b/dev-python/hiredis/hiredis-2.4.0.ebuild deleted file mode 100644 index a7183e750350..000000000000 --- a/dev-python/hiredis/hiredis-2.4.0.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_EXT=1 -DISTUTILS_USE_PEP517="setuptools" -PYTHON_COMPAT=( python3_{10..13} pypy3 ) - -inherit distutils-r1 - -MY_P=hiredis-py-${PV} -DESCRIPTION="Python extension that wraps hiredis" -HOMEPAGE=" - https://github.com/redis/hiredis-py/ - https://pypi.org/project/hiredis/ -" -SRC_URI=" - https://github.com/redis/hiredis-py/archive/v${PV}.tar.gz - -> ${MY_P}.gh.tar.gz -" -S=${WORKDIR}/${MY_P} - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86" - -DEPEND=" - >=dev-libs/hiredis-1.0.0:= -" -RDEPEND=" - ${DEPEND} -" - -PATCHES=( - "${FILESDIR}"/hiredis-2.4.0-system-libs.patch -) - -distutils_enable_tests pytest - -python_test() { - local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 - rm -rf hiredis || die - epytest -}