Adding metadata

32 files changed, 314 insertions, 176 deletions

diff --git a/dev-python/aesara/Manifest b/dev-python/aesara/Manifest
index 7b7fc9493636..7075b24fde30 100644
--- a/dev-python/aesara/Manifest
+++ b/dev-python/aesara/Manifest
@@ -1,3 +1,4 @@
 DIST aesara-rel-2.0.12.tar.gz 8154749 BLAKE2B 0e39102e985e9f9ed49f65c76389d76702b5d8fbe8c3e1130c61dce7c43eb70f5c73fd3557ff9aeaa1d186b33bb5803a04a4a5b0ce41076af7e923d05ce3353d SHA512 e68f5ce0c64a678219421a0bfc957d1594dc34c887af6f6373c00888387e5da83dec44b68b9309146ae2fd60c0677039980a87ee87ecc0ad3db2fbc80213cc34
 DIST aesara-rel-2.1.2.tar.gz 8167162 BLAKE2B 727bdf6fb9765c8b60da585595ed7203071490c1dfc0895428ae3efe4a1e74a14bbdf2a76128a6840dedeabdfc997fd297dec23ff517247452433cbdc9449b9a SHA512 22ebd1290a0727f2cf1e106770c872d5f1d785c6946b8e4debcc29a34fddceccb11f0ec81850fd93dbff556aa300bf2ec1bd6eef1297d93e194ff832b442c453
 DIST aesara-rel-2.1.3.tar.gz 8170822 BLAKE2B dbbc4a453c5d7f9cd4ab2c925dd9293e835db23100686a8d7ab2c47182b1bc05f883eeb60d6f47f8f34e4187f3ac07b632cde43fe82a99e2145a2f699a2b3582 SHA512 52d1724eb7b3c9bae4bdbf1735db9ef96cdfa94f3e2281b255201d0baba260fe31f78c00719a53ce3c59ea9c66ff218d8acd7bc012b386942f29806c07ffc466
+DIST aesara-rel-2.2.0.tar.gz 8164718 BLAKE2B 3a3c0fe8db807df8932f92b292b7a06a1d8880e136b09a65a66e861d04e02367bd6d688ca41d2d399d97a0543f8664533c64072ae6f9ced49220643107aea98e SHA512 be6fc667041fb6dda770785629afd3e286442092d263200e9fc3ac635ea027e21ae37041f0b5c5e318956a042c36a7aa5e671f4f35a8e0faef604d39fa68d122
diff --git a/dev-python/aesara/aesara-2.2.0.ebuild b/dev-python/aesara/aesara-2.2.0.ebuild
new file mode 100644
index 000000000000..5687dd835470
--- /dev/null
+++ b/dev-python/aesara/aesara-2.2.0.ebuild
@@ -0,0 +1,70 @@
+# Copyright 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 optfeature
+
+MY_P=aesara-rel-${PV}
+DESCRIPTION="Library for operating on mathematical expressions with multi-dimensional arrays"
+HOMEPAGE="https://github.com/aesara-devs/aesara"
+SRC_URI="https://github.com/aesara-devs/aesara/archive/rel-${PV}.tar.gz -> ${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	dev-python/filelock[${PYTHON_USEDEP}]
+	>=dev-python/numpy-1.17.0[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/scipy[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_sphinx doc 'dev-python/sphinx_rtd_theme'
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	sed -i -e "s/tests.\*/tests\*/" setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	local exclude=(
+		# speed tests are unreliable
+		tests/scan/test_basic.py::test_speed
+		tests/scan/test_basic.py::test_speed_rnn
+		tests/scan/test_basic.py::test_speed_batchrnn
+		tests/link/test_vm.py::test_speed
+		tests/link/test_vm.py::test_speed_lazy
+		tests/tensor/test_gc.py::test_merge_opt_runtime
+
+		# rounding problem?
+		# https://github.com/aesara-devs/aesara/issues/477
+		tests/tensor/test_math_scipy.py::TestGammaUBroadcast::test_good
+		tests/tensor/test_math_scipy.py::TestGammaUInplaceBroadcast::test_good
+	)
+
+	distutils_install_for_testing
+	# we do not package numba
+	epytest ${exclude[@]/#/--deselect } \
+		--ignore tests/link/test_numba.py \
+		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
+}
+
+# https://dev.gentoo.org/~mgorny/python-guide/concept.html#packaging-pkgutil-style-namespaces-in-gentoo
+python_install() {
+	rm "${BUILD_DIR}"/lib/bin/__init__.py || die
+	distutils-r1_python_install
+}
+
+pkg_postinst() {
+	optfeature "GPU code generation/execution on NVIDIA gpus" dev-util/nvidia-cuda-toolkit dev-util/nvidia-cuda-sdk
+	optfeature "GPU/CPU code generation on CUDA and OpenCL devices" dev-libs/libgpuarray dev-python/pycuda
+}
diff --git a/dev-python/argh/argh-0.26.2-r2.ebuild b/dev-python/argh/argh-0.26.2-r2.ebuild
index ab545193b411..ad2748b304fa 100644
--- a/dev-python/argh/argh-0.26.2-r2.ebuild
+++ b/dev-python/argh/argh-0.26.2-r2.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://pythonhosted.org/argh/"
 SRC_URI="mirror://pypi/a/${PN}/${P}.tar.gz"
 
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86"
 LICENSE="LGPL-3"
 
 BDEPEND="
diff --git a/dev-python/bareos/Manifest b/dev-python/bareos/Manifest
index aadbcffc4236..57cbe868cd0d 100644
--- a/dev-python/bareos/Manifest
+++ b/dev-python/bareos/Manifest
@@ -1,2 +1,2 @@
 DIST bareos-19.2.8.tar.gz 12604929 BLAKE2B c3af2d0a62b861a4ad5ca5c115a2039356009b7524505e1beb9004636fd09dd2b6ca784a5aae8c1cec3db518fb047cde429c469b8298a6bb473b097012358302 SHA512 60bbbbd949a63f978cf1ed7d0cfc22c22f117d8c2700eb47531e15b2d91fc700c522519f0b816cd1040283f09b4c81f36910c66c8b6f4bf1ff22180e979bdeb5
-DIST bareos-20.0.1.tar.gz 13324751 BLAKE2B ae52233a912492e7a31372b5124e7dfb6dd9dabc6545116cc49435cc078512a4380076484c7f802a7fbeb70e6683c053d97eae9348230820c4105e9be6e9af51 SHA512 94023b21a8c8a020ad5f01153a115c45e7479b204bbd834cdc89aa0f10878ea199738835f9d831922ca10b2a077aa8725f8356f205d5dc414712ef24d1c3e7d4
+DIST bareos-20.0.2.tar.gz 13333946 BLAKE2B f035fc8b98bf176bd675895b459ac78fa43575a686af11d5c43ff6b86451894d9aaa53600f87253da29dac06271c01bb269777284d903001821918405499e536 SHA512 f3a0f481a2c9b3a422f4db3e094587c97fe10e2ea5e7a8ba44e9971b0a11746ae4ad598ea469d5c8ec0dfb962e4104c00931397905aebbf3e22af49834043994
diff --git a/dev-python/bareos/bareos-20.0.1.ebuild b/dev-python/bareos/bareos-20.0.2.ebuild
index b3f5d7c2300b..b3f5d7c2300b 100644
--- a/dev-python/bareos/bareos-20.0.1.ebuild
+++ b/dev-python/bareos/bareos-20.0.2.ebuild
diff --git a/dev-python/future/files/future-0.18.2-py3.10.patch b/dev-python/future/files/future-0.18.2-py3.10.patch
new file mode 100644
index 000000000000..65cbc8e7a40d
--- /dev/null
+++ b/dev-python/future/files/future-0.18.2-py3.10.patch
@@ -0,0 +1,29 @@
+From ca1362a4250b7124d9ae03506eb80a767f06e282 Mon Sep 17 00:00:00 2001
+From: Arthur Zamarin <arthurzam@gentoo.org>
+Date: Fri, 20 Aug 2021 10:15:59 +0300
+Subject: [PATCH] Fix for Python3.10
+
+Signed-off-by: Arthur Zamarin <arthurzam@gentoo.org>
+---
+ src/future/moves/test/support.py | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/src/future/moves/test/support.py b/src/future/moves/test/support.py
+index e9aa0f4..4ae2ffd 100644
+--- a/src/future/moves/test/support.py
++++ b/src/future/moves/test/support.py
+@@ -3,6 +3,11 @@ from future.standard_library import suspend_hooks
+ from future.utils import PY3
+ 
+ if PY3:
++    try:
++        from test.support.os_helper import *
++        from test.support.warnings_helper import *
++    except ImportError:
++        pass
+     from test.support import *
+ else:
+     __future_module__ = True
+-- 
+2.33.0
+
diff --git a/dev-python/future/future-0.18.2-r1.ebuild b/dev-python/future/future-0.18.2-r1.ebuild
index cea7fbef06cf..ddca61073a2e 100644
--- a/dev-python/future/future-0.18.2-r1.ebuild
+++ b/dev-python/future/future-0.18.2-r1.ebuild
@@ -13,7 +13,6 @@ 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 ~amd64-linux ~x86-linux"
-IUSE="doc"
 
 BDEPEND="
 	test? (
@@ -29,13 +28,12 @@ PATCHES=(
 	"${FILESDIR}"/${P}-tests.patch
 	"${FILESDIR}"/${P}-py39.patch
 	"${FILESDIR}"/${P}-py39-fileurl.patch
+	"${FILESDIR}"/${P}-py3.10.patch
 )
 
-python_prepare_all() {
+EPYTEST_DESELECT=(
 	# tests requiring network access
-	rm tests/test_future/test_requests.py || die
-	sed -i -e 's:test.*request_http:_&:' \
-		tests/test_future/test_standard_library.py || die
-
-	distutils-r1_python_prepare_all
-}
+	tests/test_future/test_requests.py
+	tests/test_future/test_standard_library.py::TestStandardLibraryReorganization::test_moves_urllib_request_http
+	tests/test_future/test_standard_library.py::TestStandardLibraryReorganization::test_urllib_request_http
+)
diff --git a/dev-python/future/metadata.xml b/dev-python/future/metadata.xml
index b0611db0e68a..125838876b6c 100644
--- a/dev-python/future/metadata.xml
+++ b/dev-python/future/metadata.xml
@@ -9,4 +9,5 @@
   <remote-id type="pypi">future</remote-id>
  </upstream>
  <origin>gentoo-staging</origin>
+ <stabilize-allarches/>
 </pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/hypothesis/Manifest b/dev-python/hypothesis/Manifest
index 24233ea7fc92..7620ec10adb0 100644
--- a/dev-python/hypothesis/Manifest
+++ b/dev-python/hypothesis/Manifest
@@ -1,3 +1,4 @@
 DIST hypothesis-python-6.14.5.tar.gz 9135819 BLAKE2B 2e42949f81024038b901231a8446203388c8052ebaacf4a87d21356265fd1c09c9aa8b191dcd65780d45cc52ed9d48bb16440fc553addb4671e0ad901213ef64 SHA512 d047eea19129d5855bee5f012f5c91fe1f0de40228600fadad9c76709f951c003450f613f59848064b58f9d0e559b54b44744ae0aae689687488b6506cc8fe1a
 DIST hypothesis-python-6.14.7.tar.gz 9136527 BLAKE2B 46176df0ffac48d3bff68a83b03b316506236e8a89365c419d61d0e8dae98a54961da3715377475ba7ce89d9d989e63b75eed1473758896c13bc8c0937617b12 SHA512 bb04434893c7cf937c1f1fc733fc424b48e87ec00d3f650ad85b1749b37f18b3a4718c346739d9121b4461d46516ee1af934a34922cc6ec626defa5ffb1e531b
 DIST hypothesis-python-6.14.8.tar.gz 9137594 BLAKE2B 421c3fdb13e172bdb93cd15f625dd1fbae576ab37b48181eb82e6f1ebed92284a3c2ea4d0314f9dfd735f3ccd968465b28b94525614a7cb0834985f8cdae79df SHA512 3f99bf54e01a7d6945d898b8065b3241a1d9fc871adc9e3bec9cfe187e36651aee78eb57fa69e28405a668a0f784a5dc90acf213211d0c060a1e9a82de8e243e
+DIST hypothesis-python-6.14.9.tar.gz 9138640 BLAKE2B 3cda0edace7b3a1c373bdd61267013874fe78ae18aa7fda02759ac451f7e576614a61c3ce1d588e24afe4333f61680d89eb30f6f055e41fee91312c791b1af5d SHA512 a32d4f09ae6a44354d136164a517ea53c653fccb3e21a39ac63df78ebdf695c887f13749d2f310ac67863b6645a85dca73ef0bfab077aefe0486e445f6a85dce
diff --git a/dev-python/hypothesis/hypothesis-6.14.9.ebuild b/dev-python/hypothesis/hypothesis-6.14.9.ebuild
new file mode 100644
index 000000000000..dd1c9fc2cc45
--- /dev/null
+++ b/dev-python/hypothesis/hypothesis-6.14.9.ebuild
@@ -0,0 +1,67 @@
+# 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(+),sqlite"
+
+inherit distutils-r1 multiprocessing optfeature
+
+DESCRIPTION="A library for property based testing"
+HOMEPAGE="https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/"
+SRC_URI="https://github.com/HypothesisWorks/${PN}/archive/${PN}-python-${PV}.tar.gz"
+S="${WORKDIR}/${PN}-${PN}-python-${PV}/${PN}-python"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+IUSE="cli"
+
+RDEPEND="
+	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
+	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
+	cli? (
+		$(python_gen_cond_dep '
+			dev-python/black[${PYTHON_USEDEP}]
+			dev-python/click[${PYTHON_USEDEP}]
+		' python3_{7..9})
+	)
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pexpect[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		!!<dev-python/typing-3.7.4.1
+	)
+"
+
+distutils_enable_tests --install pytest
+
+python_prepare() {
+	if ! use cli || ! has "${EPYTHON}" python3.{7..9}; then
+		sed -i -e '/console_scripts/d' setup.py || die
+	fi
+}
+
+python_test() {
+	# disable autoloading pytest-asyncio in nested pytest calls
+	#local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	# since we disabled autoloading, load necessary plugins explicitly
+	#local -x PYTEST_PLUGINS=xdist.plugin
+
+	distutils_install_for_testing
+	epytest tests/cover tests/pytest tests/quality \
+		-p no:pytest-describe \
+		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
+}
+
+pkg_postinst() {
+	optfeature "datetime support" dev-python/pytz
+	optfeature "dateutil support" dev-python/python-dateutil
+	optfeature "numpy support" dev-python/numpy
+	optfeature "django support" dev-python/django dev-python/pytz
+	optfeature "pandas support" dev-python/pandas
+	optfeature "pytest support" dev-python/pytest
+}
diff --git a/dev-python/iocapture/iocapture-0.1.2-r2.ebuild b/dev-python/iocapture/iocapture-0.1.2-r2.ebuild
index a10b012059a1..1c72a8a7f9b7 100644
--- a/dev-python/iocapture/iocapture-0.1.2-r2.ebuild
+++ b/dev-python/iocapture/iocapture-0.1.2-r2.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://pypi.org/project/iocapture/"
 SRC_URI="https://github.com/oinume/iocapture/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86"
 LICENSE="MIT"
 
 BDEPEND="
diff --git a/dev-python/jedi/jedi-0.17.2-r1.ebuild b/dev-python/jedi/jedi-0.17.2-r1.ebuild
index 23a716d10735..94758978adcf 100644
--- a/dev-python/jedi/jedi-0.17.2-r1.ebuild
+++ b/dev-python/jedi/jedi-0.17.2-r1.ebuild
@@ -23,7 +23,7 @@ SRC_URI="
 LICENSE="MIT
 	test? ( Apache-2.0 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
 
 RDEPEND="=dev-python/parso-0.7*[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/jsonpickle/jsonpickle-2.0.0.ebuild b/dev-python/jsonpickle/jsonpickle-2.0.0.ebuild
index 611efbbb40ca..b009b4464e2b 100644
--- a/dev-python/jsonpickle/jsonpickle-2.0.0.ebuild
+++ b/dev-python/jsonpickle/jsonpickle-2.0.0.ebuild
@@ -4,8 +4,7 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
-inherit distutils-r1
+inherit distutils-r1 optfeature
 
 DESCRIPTION="Python library for serializing any arbitrary object graph into JSON"
 HOMEPAGE="https://github.com/jsonpickle/jsonpickle/ https://pypi.org/project/jsonpickle/"
@@ -15,35 +14,50 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
 
-# There are optional json backends serializer/deserializers in addition to those selected here
-# jsonlib, yajl.
-RDEPEND="
-	dev-python/feedparser[${PYTHON_USEDEP}]
-	dev-python/simplejson[${PYTHON_USEDEP}]
-	dev-python/ujson[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/importlib_metadata[${PYTHON_USEDEP}]
-	' python3_7)
-"
 # toml via setuptools_scm[toml]
 BDEPEND="
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	dev-python/toml[${PYTHON_USEDEP}]"
+	dev-python/toml[${PYTHON_USEDEP}]
+	test? (
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pandas[${PYTHON_USEDEP}]
+		dev-python/simplejson[${PYTHON_USEDEP}]
+		dev-python/sqlalchemy[${PYTHON_USEDEP}]
+		dev-python/ujson[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/feedparser[${PYTHON_USEDEP}]
+		' python3_{8,9})
+	)"
 
-distutils_enable_sphinx "docs/source"
+distutils_enable_sphinx docs \
+	dev-python/jaraco-packaging \
+	dev-python/rst-linker
 distutils_enable_tests pytest
 
 python_prepare_all() {
-	# too many dependencies
-	rm tests/pandas_test.py || die
-	# broken with gmpy
-	rm tests/ecdsa_test.py || die
-
 	sed -i -e 's:--flake8 --black --cov::' pytest.ini || die
-
 	distutils-r1_python_prepare_all
 }
 
 python_test() {
-	pytest -vv tests || die "Tests failed with ${EPYTHON}"
+	local EPYTEST_IGNORE=(
+		# unpackaged bson dependency
+		tests/bson_test.py
+		# broken when gmpy is installed
+		# https://github.com/jsonpickle/jsonpickle/issues/328
+		# https://github.com/jsonpickle/jsonpickle/issues/316
+		tests/ecdsa_test.py
+	)
+	# There is a problem with packaging feedparser with python 3.10, so skip
+	[[ ${EPYTHON} == python3_10 ]] && EPYTEST_IGNORE+=(
+		tests/feedparser_test.py
+	)
+	epytest
+}
+
+pkg_postinst() {
+	# Unpackaged optional backends: yajl, demjson
+	optfeature "encoding numpy-based data" dev-python/numpy
+	optfeature "encoding pandas objects" dev-python/pandas
+	optfeature "fast JSON backend" dev-python/simplejson
 }
diff --git a/dev-python/jupyter_client/Manifest b/dev-python/jupyter_client/Manifest
index c085884a134e..af17171e1111 100644
--- a/dev-python/jupyter_client/Manifest
+++ b/dev-python/jupyter_client/Manifest
@@ -1,2 +1,2 @@
 DIST jupyter_client-6.1.12.tar.gz 301499 BLAKE2B 8041b84ad2e89413ee60d1aee2e49a67a89b5aad1c3118c8fa7d7d719c8ec2acbc72278c9aaea095cdcb89235800d09b1792b2138c09a4aad59ceaaf695af431 SHA512 f31ff1a24b264c32d35d07491785e1d77935cdb463243e90e4aadcb0a093a074cdce75f01662591766588f39b146077639ca697f71157309dc92f12ae04d5cdd
-DIST jupyter_client-7.0.0.tar.gz 317271 BLAKE2B 446b0b5dfea840a2faf25445217d870654836cd1e63057d9fb8e596960da1528684ec51b452d1059ab83317ff9da3c65cf5c8b14c3f2cfbba7dbcfdeec0e31b5 SHA512 dadcd06a4c63e441c60edc9fb8ed49d14a1309822042d7f8cbc48943d394da720117ca829fe38e419f775025cdb01227e47f077f89f8ce5403efbeb1a1d1ef2c
+DIST jupyter_client-7.0.1.tar.gz 317467 BLAKE2B bcaa4f58071e0c90e81afb010a10ad221793a186aba0e7ae233538c810b787e3a0bc734735cd20750500c9d74d6c5f548f7deaf3daa3e989d75b5f9cbb5344ee SHA512 5665018294e87b0ae0fe58a7281e205e1668c3676f7092128f4c6ce8eb13e53983fc888508e913085beb29b13b1aa46307c4bf1c8c25bfe1f9efcfb7254bdf3a
diff --git a/dev-python/jupyter_client/jupyter_client-7.0.0.ebuild b/dev-python/jupyter_client/jupyter_client-7.0.1.ebuild
index 55d2e029c1b8..9143c344e41d 100644
--- a/dev-python/jupyter_client/jupyter_client-7.0.0.ebuild
+++ b/dev-python/jupyter_client/jupyter_client-7.0.1.ebuild
@@ -33,3 +33,11 @@ BDEPEND="
 	)"
 
 distutils_enable_tests pytest
+
+python_test() {
+	local deselect=(
+		jupyter_client/tests/test_kernelmanager.py::TestKernelManagerShutDownGracefully::test_signal_kernel_subprocesses
+		jupyter_client/tests/test_kernelmanager.py::TestKernelManagerShutDownGracefully::test_async_signal_kernel_subprocesses
+	)
+	epytest ${deselect[@]/#/--deselect }
+}
diff --git a/dev-python/parso/parso-0.7.1-r1.ebuild b/dev-python/parso/parso-0.7.1-r1.ebuild
index 5cdd6a116e3d..2431e7e42f72 100644
--- a/dev-python/parso/parso-0.7.1-r1.ebuild
+++ b/dev-python/parso/parso-0.7.1-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/davidhalter/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
 
 distutils_enable_sphinx docs
 distutils_enable_tests pytest
diff --git a/dev-python/pydns/metadata.xml b/dev-python/pydns/metadata.xml
index 3dc3e6873f9f..b56e67441461 100644
--- a/dev-python/pydns/metadata.xml
+++ b/dev-python/pydns/metadata.xml
@@ -14,4 +14,5 @@
   <remote-id type="launchpad">py3dns</remote-id>
  </upstream>
  <origin>gentoo-staging</origin>
+ <stabilize-allarches/>
 </pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/pydns/pydns-3.2.1.ebuild b/dev-python/pydns/pydns-3.2.1.ebuild
index e2c8ccc87bd6..1580058af305 100644
--- a/dev-python/pydns/pydns-3.2.1.ebuild
+++ b/dev-python/pydns/pydns-3.2.1.ebuild
@@ -6,11 +6,10 @@ EAPI=7
 PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
 inherit distutils-r1
 
-MY_PN="${PN/py/py3}"
-MY_P="${MY_PN}-${PV}"
+MY_P="${PN/py/py3}-${PV}"
 DESCRIPTION="Python DNS (Domain Name System) library"
 HOMEPAGE="https://launchpad.net/py3dns"
-SRC_URI="https://launchpad.net/${MY_PN}/trunk/${PV}/+download/${MY_P}.tar.gz"
+SRC_URI="https://launchpad.net/py3dns/trunk/${PV}/+download/${MY_P}.tar.gz"
 S="${WORKDIR}/${MY_P}"
 
 LICENSE="CNRI"
diff --git a/dev-python/pypax/pypax-0.9.5.ebuild b/dev-python/pypax/pypax-0.9.5.ebuild
index 4a5364d44435..632870d30c36 100644
--- a/dev-python/pypax/pypax-0.9.5.ebuild
+++ b/dev-python/pypax/pypax-0.9.5.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://dev.gentoo.org/~blueness/elfix/elfix-${PV}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
 	S="${WORKDIR}/elfix-${PV}"
 fi
 
diff --git a/dev-python/pyspf/metadata.xml b/dev-python/pyspf/metadata.xml
index 42b27a6a3f5c..d49a78559ff6 100644
--- a/dev-python/pyspf/metadata.xml
+++ b/dev-python/pyspf/metadata.xml
@@ -9,4 +9,5 @@
   <remote-id type="pypi">pyspf</remote-id>
  </upstream>
  <origin>gentoo-staging</origin>
+ <stabilize-allarches/>
 </pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/pyspf/pyspf-2.0.14.ebuild b/dev-python/pyspf/pyspf-2.0.14.ebuild
index 5e9424f9e6b1..5f23722fa47b 100644
--- a/dev-python/pyspf/pyspf-2.0.14.ebuild
+++ b/dev-python/pyspf/pyspf-2.0.14.ebuild
@@ -22,13 +22,10 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-python/authres[${PYTHON_USEDEP}]
-	|| (
-		dev-python/pydns:3[${PYTHON_USEDEP}]
-		dev-python/dnspython[${PYTHON_USEDEP}]
-	)
+	dev-python/dnspython[${PYTHON_USEDEP}]
 "
 
-DEPEND="
+BDEPEND="
 	test? (
 		${RDEPEND}
 		dev-python/pyyaml[${PYTHON_USEDEP}]
@@ -36,7 +33,6 @@ DEPEND="
 "
 
 python_test() {
-	pushd test &> /dev/null || die
-	"${PYTHON}" testspf.py || die
-	popd &> /dev/null || die
+	cd test || die
+	"${EPYTHON}" testspf.py || die "Test fail with ${EPYTHON}"
 }
diff --git a/dev-python/python-varlink/Manifest b/dev-python/python-varlink/Manifest
index dc585c6ac0e2..db8f04d33764 100644
--- a/dev-python/python-varlink/Manifest
+++ b/dev-python/python-varlink/Manifest
@@ -1 +1 @@
-DIST python-varlink-30.3.0.tar.gz 40124 BLAKE2B a93fe2fad156dfd8f74841846dbe9da127d01e837ad0ae750658b0391da006c913eef663e4777ad2fc6c9c2d19746e52d7e66c49cdd43f0417db9d558d4b5dee SHA512 1aac105d62452144525d8b4c59dbd7a70a9cf82589cce0b98ac56e457d985d2c370f8ce99d209294b4a4cfe1683ae2bc1a280ea5a8878ecd4bcf2951ff0b802d
+DIST python-varlink-30.3.1.gh.tar.gz 39921 BLAKE2B d717eb662cd14fffd7620fb8f3eee5ae8431b77a437a783ba090802a26d0225439eb9305050863c85a6c33dbdd28709262858bf407a08333b177057304695c93 SHA512 13a0176694ee31121998a2dd88bf57d840ec20b0ccac63b574c4f12ef5c9bfbfbd67bdc7a8d362cd1c256e393d8c3691d1efc58aabaf8f5ec26067a55157a6cd
diff --git a/dev-python/python-varlink/files/python-varlink-30.3.1-fix.py3.10.patch b/dev-python/python-varlink/files/python-varlink-30.3.1-fix.py3.10.patch
new file mode 100644
index 000000000000..e85826f6bc0e
--- /dev/null
+++ b/dev-python/python-varlink/files/python-varlink-30.3.1-fix.py3.10.patch
@@ -0,0 +1,30 @@
+From 0a9014ad564131ee98dc8c4c1f9cc0c5e29d5dac Mon Sep 17 00:00:00 2001
+From: Arthur Zamarin <arthurzam@gentoo.org>
+Date: Fri, 20 Aug 2021 10:37:42 +0300
+Subject: [PATCH] Python3.10: fix import collections
+
+Signed-off-by: Arthur Zamarin <arthurzam@gentoo.org>
+---
+ varlink/scanner.py | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/varlink/scanner.py b/varlink/scanner.py
+index d5a0e7b..58ced74 100644
+--- a/varlink/scanner.py
++++ b/varlink/scanner.py
+@@ -21,7 +21,11 @@ try:
+ except:  # Python 2
+     from argparse import Namespace as SimpleNamespace
+ 
+-from collections import (Set, OrderedDict, Mapping)
++try:
++    from collections.abc import (Set, Mapping)
++    from collections import OrderedDict
++except ImportError:
++    from collections import (Set, OrderedDict, Mapping)
+ 
+ from .error import (MethodNotFound, InvalidParameter)
+ 
+-- 
+2.33.0
+
diff --git a/dev-python/python-varlink/metadata.xml b/dev-python/python-varlink/metadata.xml
index 73c44e2eb916..d896d87cf7a6 100644
--- a/dev-python/python-varlink/metadata.xml
+++ b/dev-python/python-varlink/metadata.xml
@@ -9,4 +9,5 @@
   <remote-id type="pypi">varlink</remote-id>
  </upstream>
  <origin>gentoo-staging</origin>
+ <stabilize-allarches/>
 </pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/python-varlink/python-varlink-30.3.0.ebuild b/dev-python/python-varlink/python-varlink-30.3.0.ebuild
deleted file mode 100644
index e3cfe2aee14e..000000000000
--- a/dev-python/python-varlink/python-varlink-30.3.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 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="Python implementation of the Varlink protocol"
-HOMEPAGE="https://github.com/varlink/python"
-SRC_URI="https://github.com/varlink/python/archive/${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-KEYWORDS="~amd64"
-RESTRICT="test"
-RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/future[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
-S="${WORKDIR}/python-${PV}"
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-
-	sed -e 's|^[[:space:]]*setuptools_scm$||' \
-		-i setup.cfg || die
-}
-
-python_test() {
-	esetup.py test || die "tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/python-varlink/python-varlink-30.3.1.ebuild b/dev-python/python-varlink/python-varlink-30.3.1.ebuild
new file mode 100644
index 000000000000..60f8ed2fc2cf
--- /dev/null
+++ b/dev-python/python-varlink/python-varlink-30.3.1.ebuild
@@ -0,0 +1,34 @@
+# 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="Python implementation of the Varlink protocol"
+HOMEPAGE="https://github.com/varlink/python"
+SRC_URI="
+	https://github.com/varlink/python/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+S="${WORKDIR}/python-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="dev-python/future[${PYTHON_USEDEP}]"
+
+PATCHES=(
+	"${FILESDIR}/${P}-fix.py3.10.patch"
+)
+
+distutils_enable_tests unittest
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+
+	sed -e '/setuptools_scm/d' -i setup.cfg || die
+	sed -e "s/use_scm_version=True/version='${PV}'/" -i setup.py || die
+}
diff --git a/dev-python/translate-toolkit/translate-toolkit-3.4.0.ebuild b/dev-python/translate-toolkit/translate-toolkit-3.4.0.ebuild
index abd026f783a1..5cbdbfd9ce2d 100644
--- a/dev-python/translate-toolkit/translate-toolkit-3.4.0.ebuild
+++ b/dev-python/translate-toolkit/translate-toolkit-3.4.0.ebuild
@@ -50,28 +50,32 @@ PATCHES=(
 )
 
 python_test() {
-	local deselect=(
+	local EPYTEST_DESELECT=(
 		# Fails with network-sandbox (and even with it off but w/ softer fail)
-		--deselect 'tests/xliff_conformance/test_xliff_conformance.py::test_open_office_to_xliff'
-		--deselect 'tests/xliff_conformance/test_xliff_conformance.py::test_po_to_xliff'
+		'tests/xliff_conformance/test_xliff_conformance.py::test_open_office_to_xliff'
+		'tests/xliff_conformance/test_xliff_conformance.py::test_po_to_xliff'
+	)
+	local EPYTEST_IGNORE=(
+		# unpackaged fluent.*
+		translate/storage/test_fluent.py
 	)
 
 	if ! use ini; then
-		deselect+=(
-			--ignore translate/convert/test_ini2po.py
-			--ignore translate/convert/test_po2ini.py
+		EPYTEST_IGNORE+=(
+			translate/convert/test_ini2po.py
+			translate/convert/test_po2ini.py
 		)
 	fi
 
 	if ! use subtitles; then
-		deselect+=(
-			--ignore translate/storage/test_subtitles.py
+		EPYTEST_IGNORE+=(
+			translate/storage/test_subtitles.py
 		)
 	fi
 
 	# translate/storage/test_mo.py needs 'pocompile'
 	distutils_install_for_testing
-	epytest "${deselect[@]}"
+	epytest
 }
 
 python_install_all() {
diff --git a/dev-python/watchdog/Manifest b/dev-python/watchdog/Manifest
index 9875e645dfdf..85874b93c6f5 100644
--- a/dev-python/watchdog/Manifest
+++ b/dev-python/watchdog/Manifest
@@ -1,5 +1,3 @@
 DIST watchdog-1.0.2.tar.gz 91796 BLAKE2B 001cbe82ff8aff0c4e56e4d1f02519047580cccb48466566ad7c9c1f462f90a9a036cf90846eb38ec4fb24ff1df2a1ddfec20b3f0587afdc1f938ada1bb0b1ef SHA512 e87a0955ce822daabd7d030804876698f98ed2aad58486e26a94585763655302063f091b653abd385ea99642361b6253d8e051d96019b243a77b078ba86b0d6e
-DIST watchdog-2.0.3.tar.gz 95524 BLAKE2B 568e9d66efbfa98c19dab704681dbc48f869b59d51d7c7ff7ce1fd7465efcc6233f871e7f9276f2732692645491f2fd197a639b17e9a3d8abb76d0148a934796 SHA512 e1c506e4ead8c3ee8d19e456b67623f3a1823007be6c1fad0d76c697205696183e7bd15e46c21bf61abce6dd16d267e55da8986633eeee337d10c609318fb958
-DIST watchdog-2.1.1.tar.gz 96703 BLAKE2B cbcaff41de6111a3c9c2ff00b7c0a9ce1a769bb2b0f8e2af841a0783dd7f3a55f46003863b05eb983531211743fd112a6e63944193e10e8dd296523a1da27d59 SHA512 5b9eb75bc7b8642a8246f426a992265bbe2e5d82a3fcdd543289db7734701bdca1a868b02edfdc26ea239a89d80dd5322e410b949e419c66bdcc0645241d826b
 DIST watchdog-2.1.2.tar.gz 97407 BLAKE2B a847089409537391287a146670864c7721344ba8a6378c89483e9e08abe3f61690bfca48016f628ab0e6b0ff317679db3c72e27594e049ea03334dd20c305008 SHA512 2a127faffebb35f0b14d578570a4c5a7c27d6bd38042e34ea50f4b654be1ca07b193dfa72dfe25442d3e6da746f1cfbdda71c38be1386cc5a3e69204843c16f1
 DIST watchdog-2.1.4.tar.gz 98695 BLAKE2B 2a15b362c6e776146df4738096fe0cd8ec49894c6b767e86ed5749c2f97447fb890f172ec989a17140594070eefa1fa2b40275aff5ba9d212f77a059ac3ead25 SHA512 88bed725c045f59091902a1fe4673036a679d263c71269e36125df2a4c851864bddee0cf4f8c3f20bfc2d5f735804b7c7b1ff07a3d89d8649bfa16d3e7e1fe21
diff --git a/dev-python/watchdog/watchdog-1.0.2.ebuild b/dev-python/watchdog/watchdog-1.0.2.ebuild
index 5eb55c041cb4..dd63c4a0a26b 100644
--- a/dev-python/watchdog/watchdog-1.0.2.ebuild
+++ b/dev-python/watchdog/watchdog-1.0.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/gorakhargosh/${PN}/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc x86"
+KEYWORDS="~amd64 ~x86"
 
 CDEPEND="dev-python/pyyaml[${PYTHON_USEDEP}]"
 RDEPEND="${CDEPEND}
diff --git a/dev-python/watchdog/watchdog-2.0.3.ebuild b/dev-python/watchdog/watchdog-2.0.3.ebuild
deleted file mode 100644
index 3cd9ef5daa37..000000000000
--- a/dev-python/watchdog/watchdog-2.0.3.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-
-inherit distutils-r1 optfeature
-
-DESCRIPTION="Python API and shell utilities to monitor file system events"
-HOMEPAGE="https://github.com/gorakhargosh/watchdog"
-SRC_URI="https://github.com/gorakhargosh/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc x86"
-
-CDEPEND="dev-python/pyyaml[${PYTHON_USEDEP}]"
-RDEPEND="${CDEPEND}
-	dev-python/argh[${PYTHON_USEDEP}]"
-DEPEND="${CDEPEND}
-	test? (
-		>=dev-python/pytest-timeout-0.3[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e '/--cov/d' setup.cfg || die
-	default
-}
-
-python_test() {
-	epytest -p no:django
-}
-
-pkg_postinst() {
-	optfeature "Bash completion" dev-python/argcomplete
-}
diff --git a/dev-python/watchdog/watchdog-2.1.1.ebuild b/dev-python/watchdog/watchdog-2.1.1.ebuild
deleted file mode 100644
index 9429240f8886..000000000000
--- a/dev-python/watchdog/watchdog-2.1.1.ebuild
+++ /dev/null
@@ -1,43 +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 )
-inherit distutils-r1 optfeature
-
-DESCRIPTION="Python API and shell utilities to monitor file system events"
-HOMEPAGE="https://github.com/gorakhargosh/watchdog"
-SRC_URI="https://github.com/gorakhargosh/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-CDEPEND="dev-python/pyyaml[${PYTHON_USEDEP}]"
-RDEPEND="${CDEPEND}
-	dev-python/argh[${PYTHON_USEDEP}]"
-DEPEND="${CDEPEND}
-	test? (
-		>=dev-python/pytest-timeout-0.3[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e '/--cov/d' setup.cfg || die
-	default
-}
-
-python_test() {
-	local deselect=()
-	[[ ${EPYTHON} == pypy3 ]] && deselect+=(
-		tests/test_inotify_buffer.py::test_move_internal_batch
-	)
-
-	epytest -p no:django ${deselect[@]/#/--deselect }
-}
-
-pkg_postinst() {
-	optfeature "Bash completion" dev-python/argcomplete
-}
diff --git a/dev-python/watchdog/watchdog-2.1.2.ebuild b/dev-python/watchdog/watchdog-2.1.2.ebuild
index dbfdc7d3ff3a..775e5a75cf05 100644
--- a/dev-python/watchdog/watchdog-2.1.2.ebuild
+++ b/dev-python/watchdog/watchdog-2.1.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/gorakhargosh/${PN}/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 arm arm64 ~ia64 ppc ppc64 ~riscv ~sparc x86"
 
 CDEPEND="dev-python/pyyaml[${PYTHON_USEDEP}]"
 RDEPEND="${CDEPEND}