Adding metadata

26 files changed, 263 insertions, 119 deletions

diff --git a/dev-python/anyio/Manifest b/dev-python/anyio/Manifest
index 25927514d995..0d7b5e886733 100644
--- a/dev-python/anyio/Manifest
+++ b/dev-python/anyio/Manifest
@@ -1 +1,2 @@
 DIST anyio-3.2.1.tar.gz 126277 BLAKE2B 510980c9251081d5188f7654279753051cd9f8221f2090fb99624612e48b6f5fc1f6d9f1808f1c329c350857f14ceaee0d72615857171de33dc35cc7ba35ab23 SHA512 ef78e5531a917e3a5ddc1106f45ba556ca147e52ab29ed6cb25a3bd287148a15a015942dde6b9535d683fbe5910affed27df6ce5c4049251610f689cd151ee89
+DIST anyio-3.4.0.tar.gz 135737 BLAKE2B 6023d051a10a067b8c86576dd80571a64c72a807c56235ecd7bad364b79b10c5b845c6b584c5310db01b3bfdd92deeaf64b855716b9fa817fe2fc590de33ec4c SHA512 276fb5fc243e2c7f80a069f604ef68eeaca923c0df6f533878f9bf2185e846e537a1b9a8f19260a3c9ad3aad70898884316e6783057044a936762f7eb1f1cb9a
diff --git a/dev-python/anyio/anyio-3.4.0.ebuild b/dev-python/anyio/anyio-3.4.0.ebuild
new file mode 100644
index 000000000000..273d1bf58fbb
--- /dev/null
+++ b/dev-python/anyio/anyio-3.4.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Compatibility layer for multiple asynchronous event loop implementations"
+HOMEPAGE="
+	https://github.com/agronholm/anyio
+	https://pypi.org/project/anyio/
+"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/idna-2.8[${PYTHON_USEDEP}]
+	>=dev-python/sniffio-1.1[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	test? (
+		>=dev-python/hypothesis-4.0[${PYTHON_USEDEP}]
+		>=dev-python/pytest-6.2[${PYTHON_USEDEP}]
+		>=dev-python/pytest-mock-3.6.1[${PYTHON_USEDEP}]
+		dev-python/trustme[${PYTHON_USEDEP}]
+		>=dev-python/uvloop-0.15[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests --install pytest
+distutils_enable_sphinx docs \
+	dev-python/sphinx_rtd_theme \
+	dev-python/sphinx-autodoc-typehints
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	distutils_install_for_testing --via-venv
+	epytest -m 'not network'
+}
diff --git a/dev-python/bandit/bandit-1.7.1.ebuild b/dev-python/bandit/bandit-1.7.1.ebuild
index 560ee846ef0d..29edc255ed71 100644
--- a/dev-python/bandit/bandit-1.7.1.ebuild
+++ b/dev-python/bandit/bandit-1.7.1.ebuild
@@ -13,8 +13,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="amd64 ~arm arm64 ~s390 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
@@ -26,17 +24,11 @@ BDEPEND="
 	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
 	test? (
 		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/hacking-2.0.0[${PYTHON_USEDEP}]
 		>=dev-python/testscenarios-0.5.0[${PYTHON_USEDEP}]
 		>=dev-python/testtools-2.3.0[${PYTHON_USEDEP}]
 		>=dev-python/beautifulsoup4-4.8.0[${PYTHON_USEDEP}]
 		>=dev-python/pylint-1.9.4[${PYTHON_USEDEP}]
-		dev-python/stestr[${PYTHON_USEDEP}]
 		dev-python/toml[${PYTHON_USEDEP}]
 	)"
 
-python_test() {
-	distutils_install_for_testing
-	"${EPYTHON}" -m stestr init || die
-	"${EPYTHON}" -m stestr run -v || die "Tests failes with ${EPYTHON}"
-}
+distutils_enable_tests --install unittest
diff --git a/dev-python/cython/Manifest b/dev-python/cython/Manifest
index f5be30f804bb..94d3b6198bde 100644
--- a/dev-python/cython/Manifest
+++ b/dev-python/cython/Manifest
@@ -2,3 +2,4 @@ DIST cython-0.29.21.gh.tar.gz 2088511 BLAKE2B 7a4ddabb65a519d3c71454ac8417438a3a
 DIST cython-0.29.23.gh.tar.gz 2093463 BLAKE2B c710b9bc9e05e0030dff3098857b349564fd167f7d9c47e2ef4e8897e072f67497b8ed3994f45135c21f8b2bf3a2cff016fec9a808b2bbe9712174dd0a6b1a3e SHA512 093b7a1d5c68f6e2d2b9b8adb9ac99e8967ddd0a66c0513a78e88bd55d96533dd8352b2478554fb53bf32a72d730967fb08ccb2eaa462da68f86891dceb4925a
 DIST cython-0.29.24.gh.tar.gz 2097245 BLAKE2B 9f5f2da0aed61d7fda2e14ea0669a2dd187cd053f3b82621342c7be29e26ff581b673a32e43bacd5c0df3e515f250eb23a64b1dae8911132fdca48175910a3dc SHA512 387a827f3cb7428248019744e3ed606a133d98ac882b83624d24ae0fdf8a8f2334978555d7d84e5cc4adaf715c541fef64e45bcbdda85ca33473c21f99360be8
 DIST cython-0.29.25.gh.tar.gz 2100012 BLAKE2B 497c2550c870c808f1c972d3e9ffedd6672544b9976653faac4a4125008e4472ae5a2e0db0510c8b2c5fd11f73a5885e0e4394bbce2f1327b7610bf59b64f640 SHA512 1d655bb4de8bd3480bcd579c32cd0e5bfc5cfc3d966d3d892b98cc86f59c9bd0522066c4c5dbc4c6abeb3ebe3fcd3f49ec873dd724f9ad04976635f652fdf9e3
+DIST cython-0.29.26.gh.tar.gz 2100616 BLAKE2B 9990d8fd14a8042b1a27a4f60fcc8f6d4be42a1e475f0e5d37bc6c60439ca00a1a70b49ab708ad2dfac5184a62c25d75f27ff158ef7f0df9132355c570a9aac6 SHA512 936449dd0031c2e2baeb4402a448d632324c1b66bf062ae0e632cf63dc27556607efb8446e8f913253b761627d3946283c2a60fdcad8c2434e1601fe4b0fb60e
diff --git a/dev-python/cython/cython-0.29.26.ebuild b/dev-python/cython/cython-0.29.26.ebuild
new file mode 100644
index 000000000000..3fdeb265b10a
--- /dev/null
+++ b/dev-python/cython/cython-0.29.26.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1 toolchain-funcs elisp-common
+
+DESCRIPTION="A Python to C compiler"
+HOMEPAGE="https://cython.org https://pypi.org/project/Cython/
+	https://github.com/cython/cython"
+SRC_URI="https://github.com/cython/cython/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+IUSE="emacs test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	emacs? ( >=app-editors/emacs-23.1:* )
+"
+BDEPEND="${RDEPEND}
+	test? (
+		$(python_gen_cond_dep 'dev-python/numpy[${PYTHON_USEDEP}]' \
+			'python3*')
+	)"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.29.22-spawn-multiprocessing.patch"
+	"${FILESDIR}/${PN}-0.29.23-test_exceptions-py310.patch"
+)
+
+SITEFILE=50cython-gentoo.el
+
+distutils_enable_sphinx docs
+
+python_compile() {
+	# Python gets confused when it is in sys.path before build.
+	local -x PYTHONPATH=
+
+	distutils-r1_python_compile
+}
+
+python_compile_all() {
+	use emacs && elisp-compile Tools/cython-mode.el
+}
+
+python_test() {
+	tc-export CC
+	# https://github.com/cython/cython/issues/1911
+	local -x CFLAGS="${CFLAGS} -fno-strict-overflow"
+	"${PYTHON}" runtests.py -vv --work-dir "${BUILD_DIR}"/tests ||
+		die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	local DOCS=( CHANGES.rst README.rst ToDo.txt USAGE.txt )
+	distutils-r1_python_install_all
+
+	if use emacs; then
+		elisp-install ${PN} Tools/cython-mode.*
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-python/exdown/exdown-0.9.0.ebuild b/dev-python/exdown/exdown-0.9.0.ebuild
index e91816ec7ce7..ed3c99a73baa 100644
--- a/dev-python/exdown/exdown-0.9.0.ebuild
+++ b/dev-python/exdown/exdown-0.9.0.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 DISTUTILS_USE_SETUPTOOLS=pyproject.toml
 PYTHON_COMPAT=( python3_{6,7,8,9,10} )
 
-inherit distutils-r1 virtualx
+inherit distutils-r1
 
 MY_P=pytest-codeblocks-${PV}
 DESCRIPTION="Extract code blocks from markdown"
@@ -14,16 +14,10 @@ HOMEPAGE="https://github.com/nschloe/pytest-codeblocks/"
 SRC_URI="
 	https://github.com/nschloe/pytest-codeblocks/archive/v${PV}.tar.gz
 		-> ${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/importlib_metadata[${PYTHON_USEDEP}]
-	' python3_7)
-"
-
 distutils_enable_tests pytest
diff --git a/dev-python/flake8/Manifest b/dev-python/flake8/Manifest
index bb87261c8e78..5b453f7bdf33 100644
--- a/dev-python/flake8/Manifest
+++ b/dev-python/flake8/Manifest
@@ -1,4 +1,2 @@
-DIST flake8-3.8.4.tar.gz 163583 BLAKE2B 221234931365912adffec99c7c6761d2f35918222bee902ade4d8009d24f6918c66d23fc4b973fe653152cc6857b62ba859780b0d9de53fb91b7ea0379bee9d0 SHA512 51ed09beed50175573e6184b404431b3f89aa6594c40c70ed8288982fe12c2a68992e36d69c99013188f03555bf9fef1ba4f111f8e389cef1e1daa69b41ff5b0
 DIST flake8-3.9.2.tar.gz 164777 BLAKE2B 1c991296a3e47e4c41f1196fcaf1e7ea059226dfb41657a52fc4f5a9023b54dba21dd99635398e12f37f52f6e498a0a1fb7d87aba0fe7098ebbdfb54dc5598b0 SHA512 618fe1b35070b24395e5d4da9fa1b1f6308abf6f85d8de71b8b553f84d70d9cd7d2a6f616fa1418db9a8b5ad3efab038f4e2d7c6020c0c1bdeb8157e666911fd
-DIST flake8-4.0.0.tar.gz 154732 BLAKE2B 3d469e3e12212051abfeb93943ac8ec310e607c86c06db47b5487544e582f39480e76bc8ea621c5dba6493592eff64b19cb2be9b6b122527c66993415fab15ab SHA512 202b89c9b93f10a09453a215bbcd4260513ee21e4c1b3591088779155a4ca7277a1c274edbb12fcaf33d29ebe9389a3c57ce5aa4e12434f17960dcb0f769680e
 DIST flake8-4.0.1.tar.gz 154905 BLAKE2B b93fea36236881da595ae924b056686e0cd35d2466c1858e3ee83262922df8bc38cf5cd40a910980d287d048572dc94eb8d7c8ee4b11ebd1b4a474dfca02490c SHA512 0bdbf0218ce893df1c3e61f51cd3f371a5c72bb49ef78fec39548b1684e49b024e91cf4e3dcea60ba1efc08727985ef485814c372461e062ff4f810da99a1796
diff --git a/dev-python/flake8/flake8-3.8.4.ebuild b/dev-python/flake8/flake8-3.8.4.ebuild
deleted file mode 100644
index fe297143f40a..000000000000
--- a/dev-python/flake8/flake8-3.8.4.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="A wrapper around PyFlakes, pep8 & mccabe"
-HOMEPAGE="https://gitlab.com/pycqa/flake8 https://pypi.org/project/flake8/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x64-macos"
-
-# requires.txt inc. mccabe however that creates a circular dep
-RDEPEND="
-	>=dev-python/pyflakes-2.2.0[${PYTHON_USEDEP}]
-	<dev-python/pyflakes-2.3.0[${PYTHON_USEDEP}]
-	>=dev-python/pycodestyle-2.6.0[${PYTHON_USEDEP}]
-	<dev-python/pycodestyle-2.7.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/importlib_metadata[${PYTHON_USEDEP}]' pypy3 python3_{6,7})
-"
-PDEPEND="
-	>=dev-python/mccabe-0.6.0[${PYTHON_USEDEP}]
-	<dev-python/mccabe-0.7.0[${PYTHON_USEDEP}]
-"
-BDEPEND="${RDEPEND}
-	test? (
-		${PDEPEND}
-		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source dev-python/sphinx-prompt dev-python/sphinx_rtd_theme
-distutils_enable_tests --install pytest
diff --git a/dev-python/flake8/flake8-4.0.0.ebuild b/dev-python/flake8/flake8-4.0.0.ebuild
deleted file mode 100644
index d614395b63d8..000000000000
--- a/dev-python/flake8/flake8-4.0.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="A wrapper around PyFlakes, pep8 & mccabe"
-HOMEPAGE="https://gitlab.com/pycqa/flake8 https://pypi.org/project/flake8/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
-
-# requires.txt inc. mccabe however that creates a circular dep
-RDEPEND="
-	>=dev-python/pyflakes-2.4.0[${PYTHON_USEDEP}]
-	<dev-python/pyflakes-2.5.0[${PYTHON_USEDEP}]
-	>=dev-python/pycodestyle-2.8.0[${PYTHON_USEDEP}]
-	<dev-python/pycodestyle-2.9.0[${PYTHON_USEDEP}]
-"
-PDEPEND="
-	>=dev-python/mccabe-0.6.0[${PYTHON_USEDEP}]
-	<dev-python/mccabe-0.7.0[${PYTHON_USEDEP}]
-"
-BDEPEND="${RDEPEND}
-	test? (
-		${PDEPEND}
-	)
-"
-
-distutils_enable_sphinx docs/source dev-python/sphinx-prompt dev-python/sphinx_rtd_theme
-distutils_enable_tests --install pytest
-
-src_prepare() {
-	# remove version-limited dep
-	sed -i -e '/importlib-metadata/d' setup.cfg || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/flake8/flake8-4.0.1-r1.ebuild b/dev-python/flake8/flake8-4.0.1-r1.ebuild
index b92f793e5709..56aff8bb0d04 100644
--- a/dev-python/flake8/flake8-4.0.1-r1.ebuild
+++ b/dev-python/flake8/flake8-4.0.1-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 # requires.txt inc. mccabe however that creates a circular dep
 RDEPEND="
diff --git a/dev-python/jsonschema/Manifest b/dev-python/jsonschema/Manifest
index 56a4e906ffb4..a03c23107cd4 100644
--- a/dev-python/jsonschema/Manifest
+++ b/dev-python/jsonschema/Manifest
@@ -1,3 +1,4 @@
 DIST jsonschema-3.2.0.tar.gz 167226 BLAKE2B f89a8198f6b7b4dd56b0320ddecdd834423cbeaf49fbbd1563007da61004322b92e25856ecc17b4d02e2162b2359ec5d7601826fe42cfcb7683ae16cf2baeb39 SHA512 acbb4cec730a8cdab9f070593ed896064fbe082d464ec362adc952e4985e9eaa12ad0f2d55a04018ffdaf675e54037999a7219533dad6b84bf609f5dfe21bbab
 DIST jsonschema-4.2.1.tar.gz 310668 BLAKE2B ba36be8abf0678fda773a9950f06e4d15f6a4c19fdd9f855310b80f45be1a25f44ce329c35667c4e107aab6ba381b02ff2caa305222932e2cbe733f293de82cc SHA512 349993c00e663f3efa2304e60c8b75e90c012d29faa498a01d5d2a5c47ddf0485f28894fd2ddf4766f9ab91e468f4b4f24a53390c72b7a31fae37d75c6f2b774
 DIST jsonschema-4.3.0.tar.gz 311317 BLAKE2B 6ec3d2cf05923657e9875b5f51b9356a730a7f9a1ab8e07bbf7226fdf1005f729a06c110ec52b62d12a4bba96a14dc647786398e66a6439de93fb38c02eef848 SHA512 3772952fb482660da86b0f71ed509ef267375a80ba2db0e4c12b9bb17f79c1f31f1a8ed2746a0bef76c620d61a63ccf967c77cc55255c7d3fe4e688dc0413b38
+DIST jsonschema-4.3.1.tar.gz 311425 BLAKE2B e524675d64fece5f7687d62ed043ffb35e7627c6d1f213fde3e9c2f35b929fc56b998d39e84148fe24c507361114e047540fcf23606f4d77b2bdfc0454c6d529 SHA512 621093b8964ea94dadd23aab7c0bbbf5eb23ae615b569278886a4213ef7adc779fddcd75cfff87e243087f788fca180f4472cd3bafe8f2f8157e30c04b5f33e7
diff --git a/dev-python/jsonschema/jsonschema-4.3.1.ebuild b/dev-python/jsonschema/jsonschema-4.3.1.ebuild
new file mode 100644
index 000000000000..dafaa8fef97b
--- /dev/null
+++ b/dev-python/jsonschema/jsonschema-4.3.1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_SETUPTOOLS=pyproject.toml
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+inherit distutils-r1
+
+DESCRIPTION="An implementation of JSON-Schema validation for Python"
+HOMEPAGE="https://pypi.org/project/jsonschema/ https://github.com/Julian/jsonschema"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	dev-python/attrs[${PYTHON_USEDEP}]
+	>=dev-python/pyrsistent-0.18.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/importlib_resources-1.4.0[${PYTHON_USEDEP}]
+	' pypy3 python3_8)
+"
+
+# formatter deps
+RDEPEND+="
+		dev-python/fqdn[${PYTHON_USEDEP}]
+		dev-python/idna[${PYTHON_USEDEP}]
+		dev-python/isoduration[${PYTHON_USEDEP}]
+		>=dev-python/jsonpointer-1.13[${PYTHON_USEDEP}]
+		dev-python/rfc3339-validator[${PYTHON_USEDEP}]
+		dev-python/rfc3986-validator[${PYTHON_USEDEP}]
+		dev-python/rfc3987[${PYTHON_USEDEP}]
+		dev-python/uritemplate[${PYTHON_USEDEP}]
+		>=dev-python/webcolors-1.11[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	test? (
+		dev-python/twisted[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# requires pip, does not make much sense for the users
+	jsonschema/tests/test_cli.py::TestCLIIntegration::test_license
+)
diff --git a/dev-python/keystoneauth/keystoneauth-4.4.0.ebuild b/dev-python/keystoneauth/keystoneauth-4.4.0.ebuild
index f73fa0e22f7a..9c9bf64ca639 100644
--- a/dev-python/keystoneauth/keystoneauth-4.4.0.ebuild
+++ b/dev-python/keystoneauth/keystoneauth-4.4.0.ebuild
@@ -27,7 +27,6 @@ BDEPEND="${CDEPEND}
 	test? (
 		>=dev-python/betamax-0.7.0[${PYTHON_USEDEP}]
 		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		dev-python/hacking[${PYTHON_USEDEP}]
 		>=dev-python/lxml-4.2.0[${PYTHON_USEDEP}]
 		>=dev-python/oauthlib-0.6.2[${PYTHON_USEDEP}]
 		>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
@@ -46,6 +45,8 @@ src_prepare() {
 	# relies on specific test runner name
 	sed -i -e 's:run\.py:unittest_or_fail.py:' \
 		keystoneauth1/tests/unit/test_session.py || die
+	# remove the test that requires hacking
+	rm keystoneauth1/tests/unit/test_hacking_checks.py || die
 	distutils-r1_src_prepare
 }
 
diff --git a/dev-python/openstacksdk/openstacksdk-0.59.0.ebuild b/dev-python/openstacksdk/openstacksdk-0.59.0.ebuild
index 91e2e8673e53..8c0e090c16aa 100644
--- a/dev-python/openstacksdk/openstacksdk-0.59.0.ebuild
+++ b/dev-python/openstacksdk/openstacksdk-0.59.0.ebuild
@@ -36,7 +36,6 @@ BDEPEND="${CDEPEND}
 		>=dev-python/ddt-1.0.1[${PYTHON_USEDEP}]
 		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
 		>=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}]
-		dev-python/hacking[${PYTHON_USEDEP}]
 		>=dev-python/prometheus_client-0.4.2[${PYTHON_USEDEP}]
 		>=dev-python/oslo-config-6.1.0[${PYTHON_USEDEP}]
 		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
@@ -67,6 +66,9 @@ src_prepare() {
 	sed -e 's:test_repr:_&:' \
 		-i openstack/tests/unit/test_resource.py || die
 
+	# requires hacking
+	rm openstack/tests/unit/test_hacking.py || die
+
 	distutils-r1_src_prepare
 }
 
diff --git a/dev-python/openstacksdk/openstacksdk-0.60.0.ebuild b/dev-python/openstacksdk/openstacksdk-0.60.0.ebuild
index 89f733dd4c30..d48ad9b4cfbf 100644
--- a/dev-python/openstacksdk/openstacksdk-0.60.0.ebuild
+++ b/dev-python/openstacksdk/openstacksdk-0.60.0.ebuild
@@ -36,7 +36,6 @@ BDEPEND="${CDEPEND}
 		>=dev-python/ddt-1.0.1[${PYTHON_USEDEP}]
 		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
 		>=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}]
-		dev-python/hacking[${PYTHON_USEDEP}]
 		>=dev-python/prometheus_client-0.4.2[${PYTHON_USEDEP}]
 		>=dev-python/oslo-config-6.1.0[${PYTHON_USEDEP}]
 		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
@@ -67,6 +66,9 @@ src_prepare() {
 	sed -e 's:test_repr:_&:' \
 		-i openstack/tests/unit/test_resource.py || die
 
+	# requires hacking
+	rm openstack/tests/unit/test_hacking.py || die
+
 	distutils-r1_src_prepare
 }
 
diff --git a/dev-python/openstacksdk/openstacksdk-0.61.0.ebuild b/dev-python/openstacksdk/openstacksdk-0.61.0.ebuild
index 89f733dd4c30..d952facded2b 100644
--- a/dev-python/openstacksdk/openstacksdk-0.61.0.ebuild
+++ b/dev-python/openstacksdk/openstacksdk-0.61.0.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{6,7,8,9,10} )
 inherit distutils-r1
 
 DESCRIPTION="A collection of libraries for building applications to work with OpenStack."
-HOMEPAGE="https://github.com/openstack/python-openstacksdk"
+HOMEPAGE="https://github.com/openstack/openstacksdk/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
@@ -36,7 +36,6 @@ BDEPEND="${CDEPEND}
 		>=dev-python/ddt-1.0.1[${PYTHON_USEDEP}]
 		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
 		>=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}]
-		dev-python/hacking[${PYTHON_USEDEP}]
 		>=dev-python/prometheus_client-0.4.2[${PYTHON_USEDEP}]
 		>=dev-python/oslo-config-6.1.0[${PYTHON_USEDEP}]
 		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
@@ -67,6 +66,9 @@ src_prepare() {
 	sed -e 's:test_repr:_&:' \
 		-i openstack/tests/unit/test_resource.py || die
 
+	# requires hacking
+	rm openstack/tests/unit/test_hacking.py || die
+
 	distutils-r1_src_prepare
 }
 
diff --git a/dev-python/os-client-config/os-client-config-2.1.0-r1.ebuild b/dev-python/os-client-config/os-client-config-2.1.0-r1.ebuild
index 2f01d8d38d53..38853f67b9a4 100644
--- a/dev-python/os-client-config/os-client-config-2.1.0-r1.ebuild
+++ b/dev-python/os-client-config/os-client-config-2.1.0-r1.ebuild
@@ -23,7 +23,6 @@ BDEPEND="
 	test? (
 		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
 		>=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}]
-		dev-python/hacking[${PYTHON_USEDEP}]
 		>=dev-python/prometheus_client-0.4.2[${PYTHON_USEDEP}]
 		dev-python/python-glanceclient[${PYTHON_USEDEP}]
 		>=dev-python/oslo-config-6.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/protobuf-python/protobuf-python-3.19.1.ebuild b/dev-python/protobuf-python/protobuf-python-3.19.1.ebuild
index 125551facf78..37d84de604ae 100644
--- a/dev-python/protobuf-python/protobuf-python-3.19.1.ebuild
+++ b/dev-python/protobuf-python/protobuf-python-3.19.1.ebuild
@@ -23,7 +23,7 @@ HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/pro
 
 LICENSE="BSD"
 SLOT="0/30"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 BDEPEND="${PYTHON_DEPS}
 	~dev-libs/protobuf-${PV}
diff --git a/dev-python/pyflakes/pyflakes-2.4.0.ebuild b/dev-python/pyflakes/pyflakes-2.4.0.ebuild
index b73e8cf9f7bd..aa9f8ac468f2 100644
--- a/dev-python/pyflakes/pyflakes-2.4.0.ebuild
+++ b/dev-python/pyflakes/pyflakes-2.4.0.ebuild
@@ -12,6 +12,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 distutils_enable_tests unittest
diff --git a/dev-python/pysol_cards/pysol_cards-0.14.2.ebuild b/dev-python/pysol_cards/pysol_cards-0.14.2.ebuild
index 3743969809d8..d1cc5ea2f5bf 100644
--- a/dev-python/pysol_cards/pysol_cards-0.14.2.ebuild
+++ b/dev-python/pysol_cards/pysol_cards-0.14.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0 MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~riscv x86"
+KEYWORDS="amd64 arm64 ~riscv x86"
 
 RDEPEND="
 	dev-python/random2[${PYTHON_USEDEP}]
diff --git a/dev-python/python-socks/Manifest b/dev-python/python-socks/Manifest
index bd151d7bb157..4c8c4f127e9a 100644
--- a/dev-python/python-socks/Manifest
+++ b/dev-python/python-socks/Manifest
@@ -1,2 +1,3 @@
 DIST python-socks-1.2.4.gh.tar.gz 32192 BLAKE2B fa06f9158348292bef874c81623c11a54556db9c36cd7428d7a835428d152f3a4925d59e14d87518dfaae9e6937324e35db99bb5e1000f29fe9caf11fa2f8318 SHA512 6e70d8d98b2901e97250d30b350002944d979356bb6cd7dd4022af420e166076259a7b1aa4845d771243b18ab3f06ee955f07482c527835bb0135f0622d804be
 DIST python-socks-2.0.0.gh.tar.gz 38176 BLAKE2B 84711bd6747dd9ef8d7f47d90e7e1beeb99db7c51a370c01a272789e7d5356cdf3d0e3b1e822e1beb88a29ebbe23acac8f68206cf7a3f8b924f79d3783426f93 SHA512 088a606ca6e13de79cfa8b180d76e91cca129b3e1ffad2243e5924dc10530340924ea815eb9af0e53b5369daa9cf3e66b2f623da6913ed32916b91d24a47c1e4
+DIST python-socks-2.0.1.gh.tar.gz 40710 BLAKE2B 185131be6e2ef85e3d1cb41ff03e57c1d3e8921c04d11df4d3e1d3c7ed6f3cd10459730d0cc5ad63981dcfe0f8cd987f0f287a70f6727727550d63c0ff6040bc SHA512 08afe55b9a5e8d1c0aa5150511e7d3918fd8c6da10bb80037baa4f3c8004fa9e50b30ce7bda26e73f77208b64cb85544029ffd2edf197f6a23614b3c7f56114b
diff --git a/dev-python/python-socks/python-socks-2.0.1.ebuild b/dev-python/python-socks/python-socks-2.0.1.ebuild
new file mode 100644
index 000000000000..c235cf212663
--- /dev/null
+++ b/dev-python/python-socks/python-socks-2.0.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="SOCKS4, SOCKS5, HTTP tunneling functionality for Python"
+HOMEPAGE="
+	https://pypi.org/project/python-socks/
+	https://github.com/romis2012/python-socks/"
+SRC_URI="
+	https://github.com/romis2012/python-socks/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+
+# curio is not packaged
+# asyncio is the only backend we have, so dep on its deps unconditionally
+# TODO: revisit
+RDEPEND="dev-python/async_timeout[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		$(python_gen_cond_dep '
+			>=dev-python/anyio-3.4.0[${PYTHON_USEDEP}]
+			dev-python/trio[${PYTHON_USEDEP}]
+		' 'python*')
+		dev-python/async_timeout[${PYTHON_USEDEP}]
+		dev-python/flask[${PYTHON_USEDEP}]
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+		dev-python/yarl[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
diff --git a/dev-python/sniffio/sniffio-1.2.0.ebuild b/dev-python/sniffio/sniffio-1.2.0.ebuild
index 4180e2355505..a4112cfce4f5 100644
--- a/dev-python/sniffio/sniffio-1.2.0.ebuild
+++ b/dev-python/sniffio/sniffio-1.2.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Sniff out which async library your code is running under"
@@ -20,11 +20,7 @@ KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86"
 
 distutils_enable_tests pytest
 
-python_test() {
-	local deselect=(
-		# curio is not packaged
-		sniffio/_tests/test_sniffio.py::test_curio
-	)
-
-	epytest ${deselect[@]/#/--deselect }
-}
+EPYTEST_DESELECT=(
+	# curio is not packaged
+	sniffio/_tests/test_sniffio.py::test_curio
+)
diff --git a/dev-python/spyder-terminal/Manifest b/dev-python/spyder-terminal/Manifest
index e0fb93701ffe..f974a682b8dc 100644
--- a/dev-python/spyder-terminal/Manifest
+++ b/dev-python/spyder-terminal/Manifest
@@ -1 +1,2 @@
 DIST spyder-terminal-1.1.0.tar.gz 10097302 BLAKE2B efcdec7614534b8d3b5cf8b5aad0d6bd2d8358fdc0b0095be02dbac1c68fef63d1a325dc1005be18b4a679861e256aacad20f847c4c12eec603e605705b0982b SHA512 05d1850b01a6c3ae8607450f965dbebf4589026f318dbe599fe3c74d585fc093f4fc6cdd35ed26a9a052c11353d511d0602933fddc52f4cc94983d8a7cd75f32
+DIST spyder-terminal-1.2.0.tar.gz 9482212 BLAKE2B 1da89ebae0ca8514bb745ca1a629795239857ef78c5cbfd79f814eb4b18ab34ad633b4a4eeaff6fa7489eece76b53c23d1a9ba33e102b5eab63a6f919886f2af SHA512 a5f0262ec1f9558fbc5cb51d47c34e44ea254cee46dac9a60bf7b6497f6bc3e105096a3323218c462dbff23acc345a404656b6df80d9360102ea80da7188307f
diff --git a/dev-python/spyder-terminal/spyder-terminal-1.2.0.ebuild b/dev-python/spyder-terminal/spyder-terminal-1.2.0.ebuild
new file mode 100644
index 000000000000..84b577125a85
--- /dev/null
+++ b/dev-python/spyder-terminal/spyder-terminal-1.2.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Run system terminals inside Spyder"
+HOMEPAGE="https://github.com/spyder-ide/spyder-terminal"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT BSD Apache-2.0 BSD-2 ISC CC-BY-4.0 ZLIB WTFPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/coloredlogs[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	>=dev-python/spyder-5.2.0[${PYTHON_USEDEP}]
+	>=dev-python/terminado-0.10.0[${PYTHON_USEDEP}]
+	www-servers/tornado[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/tempest/tempest-29.2.0.ebuild b/dev-python/tempest/tempest-29.2.0.ebuild
index e8babae038ca..c809c0babb13 100644
--- a/dev-python/tempest/tempest-29.2.0.ebuild
+++ b/dev-python/tempest/tempest-29.2.0.ebuild
@@ -36,7 +36,6 @@ RDEPEND="
 BDEPEND="
 	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
 	test? (
-		dev-python/hacking[${PYTHON_USEDEP}]
 		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
 		dev-python/stestr[${PYTHON_USEDEP}]
 	)
@@ -51,6 +50,9 @@ src_prepare() {
 	rm tempest/tests/test_list_tests.py || die
 	rm tempest/tests/lib/cmd/test_check_uuid.py || die
 
+	# remove dep on hacking
+	rm tempest/tests/test_hacking.py || die
+
 	distutils-r1_src_prepare
 }