Adding metadata

18 files changed, 237 insertions, 304 deletions

diff --git a/dev-python/apipkg/Manifest b/dev-python/apipkg/Manifest
index 811043478cbd..05744dab1b03 100644
--- a/dev-python/apipkg/Manifest
+++ b/dev-python/apipkg/Manifest
@@ -1 +1,2 @@
 DIST apipkg-2.1.0.gh.tar.gz 13489 BLAKE2B 2ad670c6971b3fd6f56e35d3dceed25cd3950efbd9fb562595ea4313d50e9711a6099458eba3720dd5405335bef0ad1932bb2ad1e6db65c93df9f3b57b5caf56 SHA512 af74217f283be6dd1a674e12a2fc95739f90d9783caa095eccdea814a1da70b3cc1f756c2e150e5e5e75d1207857071aff97aa10bb2eadc83e04c42954c47df5
+DIST apipkg-2.1.1.gh.tar.gz 13541 BLAKE2B bba34b21d967512e2b08a1726dd97dfb432c3f4083661fd9f237948e5c962ebacf7ddf73ef7a34b24ee0a8481d203496504146b5b7627b195f1654fad338061e SHA512 be403398361bd88e04a676346e92df51fb410340858ca446a6a50af565183f15a88efd3d3bdcaa4d042680db35633c780466f4e8b4c9523cd0956fd04f84947a
diff --git a/dev-python/apipkg/apipkg-2.1.1.ebuild b/dev-python/apipkg/apipkg-2.1.1.ebuild
new file mode 100644
index 000000000000..08222cd2450c
--- /dev/null
+++ b/dev-python/apipkg/apipkg-2.1.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
+
+inherit distutils-r1
+
+MY_P=${P/_/}
+DESCRIPTION="Namespace control and lazy-import mechanism"
+HOMEPAGE="
+	https://github.com/pytest-dev/apipkg/
+	https://pypi.org/project/apipkg/
+"
+SRC_URI="
+	https://github.com/pytest-dev/apipkg/archive/v${PV/_/}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/imageio/Manifest b/dev-python/imageio/Manifest
index 45d6ed742db2..0ec2f518522e 100644
--- a/dev-python/imageio/Manifest
+++ b/dev-python/imageio/Manifest
@@ -1,2 +1,3 @@
 DIST imageio-2.18.0.gh.tar.gz 384312 BLAKE2B 5683ec01db358d9074c5e02c0006bf89e5978418d86b13ce93b1c0fb0800fb650b76d53bd4fdea94c69c185af3341e1e2e80c91815d0f74ebadcaa01ee497e5a SHA512 ddd7606f4b72e3a768b2f7f71d058d11df2bd6e48455240d17b2d93394808158c4f52289ea6f47b5c5655ec45e514aa4413248de0aff1806d28922723540aa50
 DIST imageio-2.19.0.gh.tar.gz 387467 BLAKE2B bd37ed1d8c147159a6e3dc951c512ddd1bdcc5c664ea1cae80d7eed4544b9329e92f711452442a459e776ec151db751d1d1c62a7d9e1165c18dcc5f0d05ec9c2 SHA512 effa3865259a1dab901a1ef2acf2cdbd57db96308b9edd8d489ff7421e51da0b2b8b8b93a7e3003bac43dd010c4f30aa683fd22236ea5d82af9d8d48b7b60db7
+DIST imageio-2.19.1.gh.tar.gz 388314 BLAKE2B 447c2a666d6337926964d977fe45ec30d7995f486b59e03e8a0a68491db2fbcbffbb73946d51080fde5d2627d70fde1f6260f98205ff447e54b7349abdc839fd SHA512 01df54a84c7522ff8ffbc0141fb0ee3416f7b0e04d131473e02c8e18adac384d8f6f2e3f3148229c1d16509465b4a4597e38707bfc8991c6288f4ea1758b4101
diff --git a/dev-python/imageio/imageio-2.19.1.ebuild b/dev-python/imageio/imageio-2.19.1.ebuild
new file mode 100644
index 000000000000..65cad728e477
--- /dev/null
+++ b/dev-python/imageio/imageio-2.19.1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python library for reading and writing image data"
+HOMEPAGE="
+	https://imageio.readthedocs.io/en/stable/
+	https://github.com/imageio/imageio/
+	https://pypi.org/project/imageio/
+"
+SRC_URI="
+	https://github.com/imageio/imageio/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+# over 50% of tests rely on Internet
+PROPERTIES="test_network"
+RESTRICT="test"
+
+RDEPEND="
+	>=dev-python/numpy-1.20.0[${PYTHON_USEDEP}]
+	>=dev-python/pillow-8.3.2[${PYTHON_USEDEP}]
+	media-libs/freeimage
+"
+# requests for fsspec[github]
+BDEPEND="
+	test? (
+		dev-python/fsspec[${PYTHON_USEDEP}]
+		dev-python/imageio-ffmpeg[${PYTHON_USEDEP}]
+		dev-python/psutil[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/tifffile[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# Fails because of system installed freeimage
+	tests/test_core.py::test_findlib2
+	# Tries to download ffmpeg binary ?!
+	tests/test_ffmpeg.py::test_get_exe_installed
+)
diff --git a/dev-python/json5/Manifest b/dev-python/json5/Manifest
index eb363da6f955..45844a6e9546 100644
--- a/dev-python/json5/Manifest
+++ b/dev-python/json5/Manifest
@@ -1,2 +1,3 @@
 DIST json5-0.9.6.tar.gz 109927 BLAKE2B 91e01250a6a4bb3f2f8baa6a425b0721fac3888366c36de7aeed3f82123a48d91b06a1fb7458ef93f99a9bbf9f6b81e7d665a64f52652c495df99bb7af0d5cfd SHA512 6e1d8bc602ab7a13e4b495dc27df438b55f7474284af3a828f3fcae51f4b595e5a7d3be9693cdea4930721e2205db966392ba154d7b80ba7b9b6c9a7c0e7f7af
 DIST pyjson5-0.9.7.gh.tar.gz 110326 BLAKE2B 5d6da6654db8b902b211119d20be56dd3d8171100af3924c9dfe03f3bbae3581f0253e18985cf6ad8742d5b3454862ae39c56dee23bf7c1e849851755d71410e SHA512 625d1954105fdb358dafe4d1216201485ae47d3fb3c75c5a7b896899ecd5c59d92f675ff3d3349a7dc69d1dafa395b10d4a7c71f9dbd43d962965e03e5e799ac
+DIST pyjson5-0.9.8.gh.tar.gz 110629 BLAKE2B 7a2acfbf1228e8f143a19775750e6d020376d63b2b036eac75be032b7baed1e6b93ea3ee842b0c200db6f44dc0f16f3c6c2f18cb165b24918334a48f237f2a9f SHA512 e1fb7a7457bdc68c33e2d73ddae8913aeec6f001e25a70234f7233d8d28b8eee8dd023c76e26dec0d0a2051e8e2cd731044dbe7dc15af9ec95f0ce806fabac72
diff --git a/dev-python/json5/json5-0.9.8.ebuild b/dev-python/json5/json5-0.9.8.ebuild
new file mode 100644
index 000000000000..d4526e0a8fd6
--- /dev/null
+++ b/dev-python/json5/json5-0.9.8.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+
+inherit distutils-r1
+
+MY_P=pyjson5-${PV}
+DESCRIPTION="A Python implementation of the JSON5 data format"
+HOMEPAGE="
+	https://github.com/dpranke/pyjson5/
+	https://pypi.org/project/json5/
+"
+SRC_URI="
+	https://github.com/dpranke/pyjson5/archive/refs/tags/v${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+distutils_enable_tests pytest
diff --git a/dev-python/jupyter_client/Manifest b/dev-python/jupyter_client/Manifest
index 69531887efb5..b2bffcfbe2c9 100644
--- a/dev-python/jupyter_client/Manifest
+++ b/dev-python/jupyter_client/Manifest
@@ -1,2 +1,3 @@
 DIST jupyter_client-7.1.2.tar.gz 326163 BLAKE2B 0cc11210cc3a472585d21acb836e316540d768c8c9ccc4a024720b278f3e2425e645080d8dcd501c118b3759bd354bf4f384821e87f1be0b7525addad6c267e0 SHA512 7baadc7d508c25ea588d0d7a6da8eb5a28fe4dbce32c9dfa1f9b2b82c7c3d7ae8c034cc03414b3eafec620931bd760c0844421197c01a3d25597af18f6e60060
 DIST jupyter_client-7.3.0.tar.gz 328515 BLAKE2B a5e0ad2f44c2171d75848f057c3d582e66b308d0d0fb8d7c8c7266e51009f2281a1ff5b0f92b7a5491709a43dccd6aa69f45681cfb6b79008082f5a955212b61 SHA512 5edf711afe9799fadee901de404ffed5b152618ccab960777a5f17cdb5adc6b945b189502f1dc7b2728fc0abceb668e54f9543eb952738d02500f109df6fa913
+DIST jupyter_client-7.3.1.tar.gz 328697 BLAKE2B 9bdca39d974c21e1674f58a7aaa51a6b96e4dc307f918aacc403146827df5ad7a867243dd2df95e717ab7ebd62367817e4f43cae562f47147b4271d72240600e SHA512 86a98288f1be5321b8495d78770501ca45fe3139a482ec41606253eef69eaf4d3f284d1c373d9df64efe28428f32cd1a3b19842a7331b3ac200d780e7a786407
diff --git a/dev-python/jupyter_client/jupyter_client-7.3.1.ebuild b/dev-python/jupyter_client/jupyter_client-7.3.1.ebuild
new file mode 100644
index 000000000000..874b2625b5c8
--- /dev/null
+++ b/dev-python/jupyter_client/jupyter_client-7.3.1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Jupyter protocol implementation and client libraries"
+HOMEPAGE="https://jupyter.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	dev-python/entrypoints[${PYTHON_USEDEP}]
+	>=dev-python/jupyter_core-4.9.2[${PYTHON_USEDEP}]
+	>=dev-python/nest_asyncio-1.5.4[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.8.2[${PYTHON_USEDEP}]
+	dev-python/pyzmq[${PYTHON_USEDEP}]
+	>=www-servers/tornado-6.0[${PYTHON_USEDEP}]
+	dev-python/traitlets[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		>=dev-python/ipykernel-6.5[${PYTHON_USEDEP}]
+		dev-python/ipython[${PYTHON_USEDEP}]
+		>=dev-python/pytest-asyncio-0.18[${PYTHON_USEDEP}]
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-7.0.6-test-timeout.patch
+)
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# relax pyzmq dep
+	sed -i -e '/pyzmq/s:>=.*::' requirements.txt || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/pynest2d/Manifest b/dev-python/pynest2d/Manifest
index 953b96b37059..6e5a58045d41 100644
--- a/dev-python/pynest2d/Manifest
+++ b/dev-python/pynest2d/Manifest
@@ -1,3 +1 @@
-DIST pynest2d-4.12.1.tar.gz 18448 BLAKE2B 5432d7acfe600afd32a0fb4543728eed351dea442ff23c9397182919f43015c4aed530aa7ec5b59c75d6373ea6ed122262d7018eb12cdd1b4586bf3ec960586b SHA512 0494efbc0ad6379fde4bdf9cdfe902cb4cbce30129771d34e01661b58ee38d6256910e10184c121de3b2d7139e6dbfee5b4e039d7d35507347efa2c475977625
 DIST pynest2d-4.13_beta.tar.gz 18455 BLAKE2B 1c5cbc72d8557f6c8031ea6e5b7e0344c7315dacfe3bf96dc98cd5fc353574811100728f665a27d538c1a9dfb90dce8a7fca477be9f8b589c6174364cc072bfb SHA512 b1918efa18c8d3b641271803ada6fd9122e456181854bb7a62dc574673791ad5a294d239c79cfc4590cb1ef760d410fed5764e81e938df64f5646751746b1250
-DIST pynest2d-4.9.1.tar.gz 18252 BLAKE2B ea98af68e7b60d615eaf6e90a68b37f8e26aa181fafecc2470b5d93d1d20a9667f5a8c903be87d419cedf47befd4e9ce757a90880c0ef19e7bb920147b2443b2 SHA512 f208e13cace4345fe691beebfe61895cbf81b7f90c19adf6a63b592928abd8591fed5c10e5b12d60c375684398856ea8d569fe8d1893a049e45d89b0ffcfc51d
diff --git a/dev-python/pynest2d/files/pynest2d-4.8.0-fix-cpp-version.patch b/dev-python/pynest2d/files/pynest2d-4.8.0-fix-cpp-version.patch
deleted file mode 100644
index 1fe895892de2..000000000000
--- a/dev-python/pynest2d/files/pynest2d-4.8.0-fix-cpp-version.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -17,7 +17,7 @@ find_package(Boost REQUIRED)  # Dependency of libnest2d.
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DLIBNEST2D_GEOMETRIES_clipper -DLIBNEST2D_OPTIMIZERS_nlopt -DLIBNEST2D_THREADING_std")  # Tell libnest2d to use Clipper and NLopt, and standard threads.
-
- # Some build options.
--set(CMAKE_CXX_STANDARD 11)
-+set(CMAKE_CXX_STANDARD 14)
- if(APPLE AND CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++")
- endif()
diff --git a/dev-python/pynest2d/files/pynest2d-4.8.0-required-flags-from-Libnest2D-target.patch b/dev-python/pynest2d/files/pynest2d-4.8.0-required-flags-from-Libnest2D-target.patch
deleted file mode 100644
index c2c9452756fb..000000000000
--- a/dev-python/pynest2d/files/pynest2d-4.8.0-required-flags-from-Libnest2D-target.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-See https://github.com/Ultimaker/pynest2d/pull/3
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -10,11 +10,7 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
- find_package(PythonInterp 3.5 REQUIRED)  # Dependency of SIP.
- find_package(PythonLibs 3.5 REQUIRED)  # Dependency of SIP.
- find_package(SIP REQUIRED)  # To create Python bindings.
--find_package(libnest2d REQUIRED)  # The library we're creating bindings for.
--find_package(Clipper REQUIRED)  # Dependency of libnest2d.
--find_package(NLopt REQUIRED)  # Dependency of libnest2d.
--find_package(Boost REQUIRED)  # Dependency of libnest2d.
--set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DLIBNEST2D_GEOMETRIES_clipper -DLIBNEST2D_OPTIMIZERS_nlopt -DLIBNEST2D_THREADING_std")  # Tell libnest2d to use Clipper and NLopt, and standard threads.
-+find_package(Libnest2D REQUIRED)  # The library we're creating bindings for.
-
- # Some build options.
- set(CMAKE_CXX_STANDARD 11)
-@@ -45,5 +41,5 @@ set(SIP_EXTRA_FILES_DEPEND
- )
-
- set(SIP_EXTRA_OPTIONS -g)  # Always release the GIL before calling C++ methods.
--include_directories(src/ ${SIP_INCLUDE_DIRS} ${Python3_INCLUDE_DIRS} ${CLIPPER_INCLUDE_DIRS} ${NLopt_INCLUDE_DIRS} ${LIBNEST2D_INCLUDE_DIRS})
--add_sip_python_module(pynest2d src/Pynest2D.sip ${CLIPPER_LIBRARIES} ${NLopt_LIBRARIES})
-+include_directories(src/ ${SIP_INCLUDE_DIRS})
-+add_sip_python_module(pynest2d src/Pynest2D.sip Libnest2D::libnest2d_headeronly)
diff --git a/dev-python/pynest2d/pynest2d-4.12.1.ebuild b/dev-python/pynest2d/pynest2d-4.12.1.ebuild
deleted file mode 100644
index 1b5466c2ad6a..000000000000
--- a/dev-python/pynest2d/pynest2d-4.12.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-inherit cmake python-single-r1
-
-DESCRIPTION="Python bindings for libnest2d"
-HOMEPAGE="https://github.com/Ultimaker/pynest2d"
-SRC_URI="https://github.com/Ultimaker/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-libs/libnest2d
-	$(python_gen_cond_dep '<dev-python/sip-5[${PYTHON_USEDEP}]')
-	"
-
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.12.1-required-flags-from-Libnest2D-target.patch
-)
diff --git a/dev-python/pynest2d/pynest2d-4.9.1.ebuild b/dev-python/pynest2d/pynest2d-4.9.1.ebuild
deleted file mode 100644
index efd788b52a2d..000000000000
--- a/dev-python/pynest2d/pynest2d-4.9.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-inherit cmake python-single-r1
-
-DESCRIPTION="Python bindings for libnest2d"
-HOMEPAGE="https://github.com/Ultimaker/pynest2d"
-SRC_URI="https://github.com/Ultimaker/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-libs/libnest2d
-	$(python_gen_cond_dep '<dev-python/sip-5[${PYTHON_USEDEP}]')
-	"
-
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.8.0-required-flags-from-Libnest2D-target.patch
-	"${FILESDIR}"/${PN}-4.8.0-fix-cpp-version.patch
-)
diff --git a/dev-python/redis-py/Manifest b/dev-python/redis-py/Manifest
index 05c8cd6700ba..d7a67e552f33 100644
--- a/dev-python/redis-py/Manifest
+++ b/dev-python/redis-py/Manifest
@@ -1,2 +1,3 @@
 DIST redis-py-4.1.4.tar.gz 2352106 BLAKE2B a7f40d381e3e1d295d2ce88f0adb897704d0065ee7d5bb00108c2c8c67ef649ea63d4ca06dbbe2b21b2f92d70d96f8e2d32a7992ecf702bb4c73589f30c1bae8 SHA512 6dd1bc7622529382901b2fe6e63a5f9d6a4b89175b486c879a63cc8f0e708737431dfe5b834124f0d33f34540ac54813a0e6953bbed3a9dbd226597b4b1cb3ae
 DIST redis-py-4.2.2.tar.gz 2421362 BLAKE2B ab59a649e8bc08d706536f994f0462505cea39828072884739b1a6434b45fd120e3b8acb51e8e88ec9fe0ce9acc0bfd6a5ff92bb67080724c7b121ef539af16f SHA512 80673d48cd97af1c5ebc67e919f16891ccb20cd30bc06619ddffeb117ad87f82b73f9b9bda6d36829bc51a35aa3c9b2af7c879ec665cc9664bdd86ac6510095b
+DIST redis-py-4.3.0.gh.tar.gz 4605505 BLAKE2B a7cdf8941f99291f6c6f53e6b11b1cd45fd64d0d96e11848d648964518a970275152c00c3aec3a0342ffc5a4805624344076154d007684ce90137f37df4d90f7 SHA512 881f250f04cd0376d2e617ff07cba3c4f987574d64b0813890310412293c7825bb11a5117b65b27dad05bbdff250f44a736d542ee116034b7a644c6e58f981fd
diff --git a/dev-python/redis-py/redis-py-4.3.0.ebuild b/dev-python/redis-py/redis-py-4.3.0.ebuild
new file mode 100644
index 000000000000..0a8f178b9ea3
--- /dev/null
+++ b/dev-python/redis-py/redis-py-4.3.0.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python client for Redis key-value store"
+HOMEPAGE="
+	https://github.com/redis/redis-py/
+	https://pypi.org/project/redis/
+"
+SRC_URI="
+	https://github.com/redis/redis-py/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/async_timeout-4.0.2[${PYTHON_USEDEP}]
+	>=dev-python/deprecated-1.2.3[${PYTHON_USEDEP}]
+	>=dev-python/packaging-20.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		<dev-db/redis-7
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+		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
+	)
+
+	# TODO: try to run more servers?
+	epytest -m "not redismod and not onlycluster and not replica and not ssl"
+}
+
+src_test() {
+	local redis_pid="${T}"/redis.pid
+	local redis_port=6379
+
+	# 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
+	"${EPREFIX}"/usr/sbin/redis-server - <<- EOF || die "Unable to start redis server"
+		daemonize yes
+		pidfile ${redis_pid}
+		port ${redis_port}
+		bind 127.0.0.1
+	EOF
+
+	# Run the tests
+	distutils-r1_src_test
+
+	# Clean up afterwards
+	kill "$(<"${redis_pid}")" || die
+}
diff --git a/dev-python/uranium/Manifest b/dev-python/uranium/Manifest
index 955910a6060a..47338ce1361d 100644
--- a/dev-python/uranium/Manifest
+++ b/dev-python/uranium/Manifest
@@ -1,3 +1 @@
-DIST uranium-4.12.1.tar.gz 1071662 BLAKE2B bb4bbcd9129dcb724a553c327a90619d12c3daaee3468ed194f8ab98f112d503638fd3ba340e67e12268d0aab23bf1cd9b4ee364c0204761949d2a58fbdfcf96 SHA512 bdf118341a52ac957ae8cc0acf2fb2c7381f9082e82c190a038333845ffc0fefa8c92702438898a63ccca9f0add69312b43168b993fcd38fe4f3ee3856b36eb9
 DIST uranium-4.13.0.tar.gz 1072294 BLAKE2B 3d5110ec4fc6bbfbf085d1f2c177ae19305d7e3828cfe44f7e83aa07397224e3c4e5441f83684f49f21fc6579eb7d3e7fc176eae80c76c3b10354757c01ecc40 SHA512 bba41754670b42eb92826fe1c2380b76afb62d16158c07f960315dbd77c55932d29dff594d71aff8eafc2f58d1aac4a14b0f6fc36a0a352872077b97c0d7f555
-DIST uranium-4.9.1.tar.gz 1038046 BLAKE2B 3304e89e0a22fbda0e9e57aaf88f6f11979eb5273d6c8a69f5ec9f050741561f67667a76e2136148808862026e2330f3b5043141ed8d69d255632a8c3c869def SHA512 e665a1ff8ebfc629e4bc2253533a3332d8f8804155432af921ad2e7251d5725daf9346cc5f110595914ac6f0d194db6d7e06dfcd3795b57e35b3d5e6dae594a7
diff --git a/dev-python/uranium/uranium-4.12.1.ebuild b/dev-python/uranium/uranium-4.12.1.ebuild
deleted file mode 100644
index b171005ed650..000000000000
--- a/dev-python/uranium/uranium-4.12.1.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_SINGLE_IMPL=1
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-inherit cmake distutils-r1
-
-MY_PN="Uranium"
-
-DESCRIPTION="A Python framework for building 3D printing related applications"
-HOMEPAGE="https://github.com/Ultimaker/Uranium"
-SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86"
-IUSE="debug doc test"
-
-BDEPEND="${PYTHON_DEPS}
-	sys-devel/gettext
-	doc? ( app-doc/doxygen[dot] )
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/pytest[${PYTHON_USEDEP}]
-			dev-python/mypy[${PYTHON_USEDEP}]
-			dev-python/twisted[${PYTHON_USEDEP}]
-		')
-	)"
-
-DEPEND="${PYTHON_DEPS}
-	~dev-libs/libarcus-${PV}:=[python,${PYTHON_SINGLE_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/cryptography[${PYTHON_USEDEP}]
-		dev-python/PyQt5[${PYTHON_USEDEP},declarative,network,svg]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		>=dev-python/scipy-1.1[${PYTHON_USEDEP}]
-		sci-libs/shapely[${PYTHON_USEDEP}]
-	')"
-
-RDEPEND="${DEPEND}
-	dev-qt/qtquickcontrols:5
-	dev-qt/qtquickcontrols2:5"
-
-DOCS=( README.md )
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	python_fix_shebang .
-
-	if ! use doc ; then
-		sed -i -e '/add_custom_target(doc/d' CMakeLists.txt || die
-	fi
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCURA_BINARY_DATA_DIRECTORY:STRING="/usr/share/cura/"
-		-DGETTEXT_MSGINIT_EXECUTABLE="msginit"
-	)
-
-	if ! use debug; then
-		sed -i -e 's logging.DEBUG logging.ERROR g' \
-		 plugins/ConsoleLogger/ConsoleLogger.py \
-		 plugins/FileLogger/FileLogger.py || die
-	fi
-
-	sed -i \
-		-e "s/find_package(PythonInterp 3 REQUIRED/find_package(Python3 ${EPYTHON##python} EXACT REQUIRED COMPONENTS Interpreter/g" \
-		CMakeLists.txt cmake/UraniumPluginInstall.cmake
-
-	sed -i \
-		-e "s/find_package(Python3 REQUIRED/find_package(Python3 ${EPYTHON##python} EXACT REQUIRED/g" \
-		-e 's/set(Python3_EXECUTABLE ${PYTHON_EXECUTABLE})//g' \
-		cmake/UraniumPluginInstall.cmake
-
-	sed -i \
-		-e "s lib\${LIB_SUFFIX}/python\${PYTHON_VERSION_MAJOR}.\${PYTHON_VERSION_MINOR}/site-packages $(python_get_sitedir) g" \
-		-e 's cmake-${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} cmake g' \
-		CMakeLists.txt
-
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-
-	use doc && cmake_src_compile doc
-}
-
-src_install() {
-	cmake_src_install
-
-	python_optimize "${ED}"/usr
-}
diff --git a/dev-python/uranium/uranium-4.9.1.ebuild b/dev-python/uranium/uranium-4.9.1.ebuild
deleted file mode 100644
index 567e1c5e308a..000000000000
--- a/dev-python/uranium/uranium-4.9.1.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_SINGLE_IMPL=1
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-inherit cmake distutils-r1
-
-MY_PN="Uranium"
-
-DESCRIPTION="A Python framework for building 3D printing related applications"
-HOMEPAGE="https://github.com/Ultimaker/Uranium"
-SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="debug doc test"
-
-BDEPEND="${PYTHON_DEPS}
-	sys-devel/gettext
-	doc? ( app-doc/doxygen[dot] )
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/pytest[${PYTHON_USEDEP}]
-			dev-python/mypy[${PYTHON_USEDEP}]
-			dev-python/twisted[${PYTHON_USEDEP}]
-		')
-	)"
-
-DEPEND="${PYTHON_DEPS}
-	~dev-libs/libarcus-${PV}:=[python,${PYTHON_SINGLE_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/cryptography[${PYTHON_USEDEP}]
-		dev-python/PyQt5[${PYTHON_USEDEP},declarative,network,svg]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		>=dev-python/scipy-1.1[${PYTHON_USEDEP}]
-		sci-libs/shapely[${PYTHON_USEDEP}]
-	')"
-
-RDEPEND="${DEPEND}
-	dev-qt/qtquickcontrols:5
-	dev-qt/qtquickcontrols2:5"
-
-DOCS=( README.md )
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	python_fix_shebang .
-
-	if ! use doc ; then
-		sed -i -e '/add_custom_target(doc/d' CMakeLists.txt || die
-	fi
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCURA_BINARY_DATA_DIRECTORY:STRING="/usr/share/cura/"
-		-DGETTEXT_MSGINIT_EXECUTABLE="msginit"
-	)
-
-	if ! use debug; then
-		sed -i -e 's logging.DEBUG logging.ERROR g' \
-		 plugins/ConsoleLogger/ConsoleLogger.py \
-		 plugins/FileLogger/FileLogger.py || die
-	fi
-
-	sed -i \
-		-e "s/find_package(PythonInterp 3 REQUIRED/find_package(Python3 ${EPYTHON##python} EXACT REQUIRED COMPONENTS Interpreter/g" \
-		CMakeLists.txt cmake/UraniumPluginInstall.cmake
-
-	sed -i \
-		-e "s/find_package(Python3 REQUIRED/find_package(Python3 ${EPYTHON##python} EXACT REQUIRED/g" \
-		-e 's/set(Python3_EXECUTABLE ${PYTHON_EXECUTABLE})//g' \
-		cmake/UraniumPluginInstall.cmake
-
-	sed -i \
-		-e "s lib\${LIB_SUFFIX}/python\${PYTHON_VERSION_MAJOR}.\${PYTHON_VERSION_MINOR}/site-packages $(python_get_sitedir) g" \
-		-e 's cmake-${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} cmake g' \
-		CMakeLists.txt
-
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-
-	use doc && cmake_src_compile doc
-}
-
-src_install() {
-	cmake_src_install
-
-	python_optimize "${ED}"/usr
-}