gentoo auto-resync : 10:08:2024 - 11:05:14

5 files changed, 2 insertions, 150 deletions

diff --git a/dev-python/hiredis/Manifest b/dev-python/hiredis/Manifest
index 1da169cb3b46..d25f96a53e38 100644
--- a/dev-python/hiredis/Manifest
+++ b/dev-python/hiredis/Manifest
@@ -1,9 +1,4 @@
-AUX hiredis-2.2.2-system-libs.patch 1421 BLAKE2B d10de294e0e15ec1b816505c852b0e82140874bd3f1434515ecd69d04236efcc8fbf24f6b261db138979d1547892bf71e1c3c5e74317ef43c3597b379c03231e SHA512 dcc64f1a83cfe5c956c65c1bf1f9ef31b3c66e393d0dcec342f9f8cd6265a41309a03ddae7d86fa85806a05dac7bb89d29a3b7ebb955d62409fbb719e7c8004a
 AUX hiredis-2.4.0-system-libs.patch 911 BLAKE2B 618badc5a11e47f6df2fb34c22d1719387c2625d9afd9bf06ebd04c0c2ed8196858fde3a5925da6b89a5a2c1af7473ef5e744a491207aae0794f1cb6b6b1e8fe SHA512 33fc3436003f055c2fb040a49ca2aa3b1b1af84bde20c123c89754709868282a87fd99597df5f2b0508622ce71c75056b3e584964c5acb235e26b7e0b972a813
-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
-EBUILD hiredis-2.3.2.ebuild 829 BLAKE2B 09fc7edd9f67f06504c64beb661be802e95988947ed1ce8aeb185012148df5e7fe5c1644e3b104fcd395eac3d8fcd5e33344d2b7071d564a240a19f402f3ff43 SHA512 93abb4c40a4e989b4f1bd9929d40c8ff6b47966a52051b289773b5db756fca31649d4296e563bc91a32f2744367b1d52ad9d2b1e1203e0d55e64cae617f85ce1
-EBUILD hiredis-2.4.0.ebuild 833 BLAKE2B 15b29883fa248184280d76340e6ee9571d3b387197cc667433be8de45a11841f59e9a8d9fa2661a5a072ed65c8a68c95e5c69c44dae566dcf81ebcd5bd16e2d4 SHA512 ccef0f176cc12cb868c8d9e7a879d2a5339621c2d8b1216754976b86d6b2ebbf250444752e1cceedccb80e56a037fb44b62090b9aba2df26f40c3d4c3762305f
-EBUILD hiredis-3.0.0.ebuild 830 BLAKE2B cef1a2616fcc4618e5abf9db0ec253c9e89381b4af25a2891f6fba4e47d9ec5b2b6e295543e7a72374e46a645cd425cde41c3ea55d30f25e61d2159c0ce32a1d SHA512 6376ab1a20b91b151eba390e0a0f0a1f32eaf585ac99a938d881ac4f2aaeacfab0618fe0d7dc2d3ac2eee0877efb41ccb5e0bd686fbb5b85ad92f2beb639d0fb
+EBUILD hiredis-3.0.0.ebuild 829 BLAKE2B 4befac3378bea8387458d0dab270fb9fdbc7f4c8a94274b31667ad8f567e59deaf9fade13333a2e2725e96779f63018b99833a931cd915762da16b647ce1cd39 SHA512 b6f735815e7d31d548d0fbd7aeed2d2064cd9e31857faf58656628ff14bc0609780899773cfb4e6cf847719393c8edf86c943feabd3f53c2f5cbbcf5acf82632
 MISC metadata.xml 493 BLAKE2B 9ea63c09baa3e95097afce5edb30a2e1f358eedcc41fbd6f66492e3701bce65fa91e83c236d69b39ddde17f3d92401ca39ec70fbe12b6bc74dcde3e6e2495490 SHA512 42cc38851c3ffaddeb32aefed35551a444fdd1e9463dfca2f320a184445567174b44de84981dbd4613029abfcef28a69208bbb2857811308667cb54102357c83
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
-}
diff --git a/dev-python/hiredis/hiredis-3.0.0.ebuild b/dev-python/hiredis/hiredis-3.0.0.ebuild
index fa5f96e0ab37..f85f0493d578 100644
--- a/dev-python/hiredis/hiredis-3.0.0.ebuild
+++ b/dev-python/hiredis/hiredis-3.0.0.ebuild
@@ -23,7 +23,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
 
 DEPEND="
 	>=dev-libs/hiredis-1.0.0:=