gentoo resync : 05.12.2021

3 files changed, 67 insertions, 2 deletions

diff --git a/dev-python/redis-py/Manifest b/dev-python/redis-py/Manifest
index a870ce6d04d8..835f6eca9321 100644
--- a/dev-python/redis-py/Manifest
+++ b/dev-python/redis-py/Manifest
@@ -1,4 +1,6 @@
 AUX redis-py-3.5.3-fix-user-tests.patch 2799 BLAKE2B ba74d41506b072455fe901d9ac4d819e3240b7ac63c06392fb7696aa2f026e10ea8a59403cae5ed3b5276aaad811f55a0447412039dd5382810bc853ad8d8b16 SHA512 ce203a5c52607accb3b30b591b1fcc0f82455053896f77b8f9561f5b0c4189cb58406d8261d5ee334b3b81fe1a8333ca9f2779594d0454e18d6742323c313a2e
 DIST redis-py-3.5.3.tar.gz 141112 BLAKE2B b953d553a3cfa2d6ba6f5aa35dfaf93865acbfad0e901a96082c3b1c027dc23b6ceedde185f24e86772522fbbf4f0a4d18e115a6b40aff6a65450bbe397d5c07 SHA512 eae6ac6b3e0f1366a9c29e5e2d9a5210e4627e62e3006159b1c290f36cd9c1c2c12cafe0944f7a010e04632b517874f230aa9411491993b7ecf2080546217206
+DIST redis-py-4.0.2.tar.gz 2262717 BLAKE2B 7db99843b4ee354b0841de1cacca001901b0614868e6cd545edb0f3705b7dc7d7a0ee755e2184ec1fb080a845a2f193ff5ab5a4dd99006eed6b9a1c89fbee131 SHA512 3f73ddd2ceb551fa447cfb4ecdc1d393957bbfd8c184ae3d357f9f47fff860f1c4684ec0fc3cb85fea530454456c17a98a2a56e592bef4cd9ad17bb405c1a0f7
 EBUILD redis-py-3.5.3.ebuild 1806 BLAKE2B d9e3f93ec21396b0778645c4cf9c4e5e97f67b239f50ddcbf9eeab17a049a670b349375c492ec67cebc39de46a9173aa95945b99707b0e85807bb9d7421cc0b9 SHA512 22c0588b1af33c055e8ffc5058da43c3e9201650094f54694b940ec0ad18fbc5c4979ead5004b180b5bfacd72e1007e3c2082f859ebe46060e35942ce1ecfc76
-MISC metadata.xml 512 BLAKE2B 7c3c694a5e666f78e358c0cd0ea0cac8c789c14d0c4ebb00d4fdd048d882a1e50af3b49062d821df0cf2428a996184831d3d41a4dcad38efd05f0f2df52af2a0 SHA512 dae5fa1157850aff0ca10335dc6c0acf4dab8a6ac85147dab9e6eef4fadbd784fffa1dc8b46f0a67176d73207b7b1c30512ee581f1e92733697ce4ecf6704aa6
+EBUILD redis-py-4.0.2.ebuild 1438 BLAKE2B 8c41a4909cc140d8e61656ecfbfcba83369bccbd9aa5050ebac03d5d12177ea2e90f22e969c684e1a4301b6f67879717ae79d3fc357a5abe1f4f64e57f18ade1 SHA512 fb19dd1a11d0ad73789e197e6810a4d8866701893a1939900eb3fb176031e86f3b43335fda545c9b37916c8ef46973e02c41124c351cd20e175e51846f448c3c
+MISC metadata.xml 506 BLAKE2B 0e5747e826132dd365bdf6d3a63f0936ed476bc69c4c4d55126e692039046f51f69b193ead0baa181090b11f69ab2a49220d8f906f9fe3fc18331b76ff9e0b0f SHA512 725d650bfe345b132588930a18ade44182ec07f6697d2fd8806dc208ab1556939926e8899fc6d43691101d971f9c1e011fb8a5675fdde4698dbf4c230db15c75
diff --git a/dev-python/redis-py/metadata.xml b/dev-python/redis-py/metadata.xml
index 93aefe765a0d..998ac9ce8e08 100644
--- a/dev-python/redis-py/metadata.xml
+++ b/dev-python/redis-py/metadata.xml
@@ -12,6 +12,6 @@
   <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">redis</remote-id>
-    <remote-id type="github">andymccurdy/redis-py</remote-id>
+    <remote-id type="github">redis/redis-py</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/redis-py/redis-py-4.0.2.ebuild b/dev-python/redis-py/redis-py-4.0.2.ebuild
new file mode 100644
index 000000000000..e5d090f56dec
--- /dev/null
+++ b/dev-python/redis-py/redis-py-4.0.2.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+inherit distutils-r1
+
+MY_PN="redis"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Python client for Redis key-value store"
+HOMEPAGE="https://github.com/redis/redis-py"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="
+	dev-python/deprecated[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		dev-db/redis
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# flaky test
+		tests/test_pubsub.py::TestPubSubDeadlock::test_pubsub_deadlock
+	)
+
+	epytest -k "not redismod"
+}
+
+src_test() {
+	local redis_pid="${T}"/redis.pid
+	local redis_port=6379
+	local redis_test_config="
+		daemonize yes
+		pidfile ${redis_pid}
+		port ${redis_port}
+		bind 127.0.0.1
+	"
+
+	# Spawn Redis itself for testing purposes
+	# NOTE: On sam@'s machine, spawning Redis can hang in the sandbox.
+	# I'm not restricting tests yet because this doesn't happen for anyone else AFAICT.
+	einfo "Spawning Redis"
+	einfo "NOTE: Port ${redis_port} must be free"
+	"${EPREFIX}"/usr/sbin/redis-server - <<< "${redis_test_config}" || die
+
+	# Run the tests
+	distutils-r1_src_test
+
+	# Clean up afterwards
+	kill "$(<"${redis_pid}")" || die
+}