Adding metadata

30 files changed, 188 insertions, 73 deletions

diff --git a/dev-python/asyncstdlib/Manifest b/dev-python/asyncstdlib/Manifest
index de424f10d2d0..32da1ce498bf 100644
--- a/dev-python/asyncstdlib/Manifest
+++ b/dev-python/asyncstdlib/Manifest
@@ -1,4 +1,2 @@
-DIST asyncstdlib-3.10.0.gh.tar.gz 45242 BLAKE2B 12fb7f96d9c7c6e7ddad67b6c25b805de95812f902e14935a11440c4c55437f550df18c388727d21745b99e6db97917849547fdf726a89c62136ce1d01b8545b SHA512 9e930fa906139d664575d7f41d4e5ddf7da62e02bc946efeadadf6631ae63c15ca2ac1b5793172424f9ad916d32bbd4a741de5844b247c2fa506b63431711933
 DIST asyncstdlib-3.10.1.gh.tar.gz 45230 BLAKE2B daefacbb5712d200dc61d99cbf0deaa50925cfe2e8203f01a8083531d762b838d9603110a07ac1e1a00f17f1bb8ee7dc1a759d35949570fe134d21c4e48993ae SHA512 05e0e64f8262cf3ba6f8e784490597397e0d6a74f2052da80bb531df557dd3143c032589c429a407049ed04b093757c7a09674c66110befd6ab66b0edf883909
-DIST asyncstdlib-3.9.1.gh.tar.gz 40224 BLAKE2B 8d1e564c9f5ac10c7f05dfa3933f695ae458685550fb67401f3bd0d1294ef0b170f5b385cdcf63c0096854538219a0dea77d4d80bd801f1a9b15f5ad3f2c562a SHA512 de7860d84cee7bfdc974a0677cc231323c86238bcb0bfd2f32a62b7356042aad647ee8d627393be35c5a134855d5f76967143ad8347df9d6258f46bc2b43a62a
-DIST asyncstdlib-3.9.2.gh.tar.gz 41963 BLAKE2B da40c23bacc58c1347aca94107e3026829d9b27645eddc47fc46a96cab4be7baa9ed3c31f6f0045b884130d4316394d6a0b6b44818b42b6e6c512c641847d556 SHA512 f5268451325b48b967747b5e1ffe4e773a5aae82c6d481781e6c95f483d972da2b3806c1117067256d22efaba1238787898667a6a50ac4b2512dac4b5343d2a2
+DIST asyncstdlib-3.10.2.gh.tar.gz 45697 BLAKE2B 8f9bbee8d2a4e9f6a60a5088ef00940f22c2aec79557070d1b13d8d7256179bddaf1130ace0393e95e06e077824dd862e27a6c5d644ae52dab2d80989bb08027 SHA512 be5a8cbb521b8082ad9898907bce1a888443eafb24e2030f9dfbb2dff293646376ad44ebbc53d12e539ad70af935d833f2f114e383171388b9d724f274eb8421
diff --git a/dev-python/asyncstdlib/asyncstdlib-3.10.0.ebuild b/dev-python/asyncstdlib/asyncstdlib-3.10.2.ebuild
index 5da889edab48..5da889edab48 100644
--- a/dev-python/asyncstdlib/asyncstdlib-3.10.0.ebuild
+++ b/dev-python/asyncstdlib/asyncstdlib-3.10.2.ebuild
diff --git a/dev-python/asyncstdlib/asyncstdlib-3.9.1.ebuild b/dev-python/asyncstdlib/asyncstdlib-3.9.1.ebuild
deleted file mode 100644
index cb4f8a2fda75..000000000000
--- a/dev-python/asyncstdlib/asyncstdlib-3.9.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=pyproject.toml
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-inherit distutils-r1
-
-DESCRIPTION="The missing async toolbox"
-HOMEPAGE="
-	https://github.com/maxfischer2781/asyncstdlib/
-	https://pypi.org/project/asyncstdlib/"
-SRC_URI="
-	https://github.com/maxfischer2781/asyncstdlib/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="dev-python/typing-extensions[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
diff --git a/dev-python/asyncstdlib/asyncstdlib-3.9.2.ebuild b/dev-python/asyncstdlib/asyncstdlib-3.9.2.ebuild
deleted file mode 100644
index 8897723b62ee..000000000000
--- a/dev-python/asyncstdlib/asyncstdlib-3.9.2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=pyproject.toml
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-inherit distutils-r1
-
-DESCRIPTION="The missing async toolbox"
-HOMEPAGE="
-	https://github.com/maxfischer2781/asyncstdlib/
-	https://pypi.org/project/asyncstdlib/"
-SRC_URI="
-	https://github.com/maxfischer2781/asyncstdlib/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-	' python3_7)"
-
-distutils_enable_tests pytest
diff --git a/dev-python/betamax-matchers/Manifest b/dev-python/betamax-matchers/Manifest
index 4b2ac992e4c6..7a529f121762 100644
--- a/dev-python/betamax-matchers/Manifest
+++ b/dev-python/betamax-matchers/Manifest
@@ -1 +1 @@
-DIST betamax-matchers-0.4.0.tar.gz 4205 BLAKE2B d9f626b61195135b260b0b4d43e0f62ed18721aef7c03602e117c9efedecb88fc891972b30aceed1fc29502a0982a18f8a57ce264f81fb89906e455b70b9afa0 SHA512 325a8165205c21193b4c136aa4d35a855f9529d6ed5809a1306ae7a3e7a49790928b68104da04a918ff3673ad2ede3e4bd901019bde460a8e42e2c5d96fb8abf
+DIST betamax-matchers-0.4.0.gh.tar.gz 5228 BLAKE2B ac4f3ed3df559e26eb88068ef39fe7b890bb003881b95dfe6a72d8622773d76e3b3879a74f508e3849064121086868ba183e53c86387d59d1cc0a1640006bea2 SHA512 202255d9895b118d03efa20aa64f5b099045750dcb9a1ad3eda164d3da372207f1bee8a40f63cdf179da90cfc4380e5a004e5f9c94f006a6f3dbc64e29766c86
diff --git a/dev-python/betamax-matchers/betamax-matchers-0.4.0.ebuild b/dev-python/betamax-matchers/betamax-matchers-0.4.0.ebuild
index cbfab128a14e..c3a8f4e282f9 100644
--- a/dev-python/betamax-matchers/betamax-matchers-0.4.0.ebuild
+++ b/dev-python/betamax-matchers/betamax-matchers-0.4.0.ebuild
@@ -1,26 +1,27 @@
-# Copyright 1999-2020 Gentoo Authors
+# 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="A group of experimental matchers for Betamax"
 HOMEPAGE="https://github.com/betamaxpy/betamax_matchers"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+SRC_URI="
+	https://github.com/betamaxpy/betamax_matchers/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+S="${WORKDIR}/${P/-/_}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 RDEPEND="
 	>=dev-python/betamax-0.3.2[${PYTHON_USEDEP}]
 	>=dev-python/requests-toolbelt-0.4.0[${PYTHON_USEDEP}]
 "
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
 
-# No tests
-RESTRICT=test
+distutils_enable_tests pytest
diff --git a/dev-python/boto3/boto3-1.18.53.ebuild b/dev-python/boto3/boto3-1.18.53.ebuild
index 30a0b44d3f8c..c00fbd35829c 100644
--- a/dev-python/boto3/boto3-1.18.53.ebuild
+++ b/dev-python/boto3/boto3-1.18.53.ebuild
@@ -17,7 +17,7 @@ if [[ "${PV}" == "9999" ]]; then
 	BOTOCORE_PV=${PV}
 else
 	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 arm arm64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 
 	# botocore is x.(y+3).z
 	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
diff --git a/dev-python/botocore/botocore-1.21.53.ebuild b/dev-python/botocore/botocore-1.21.53.ebuild
index 9cd77a5ad4d0..456513a56081 100644
--- a/dev-python/botocore/botocore-1.21.53.ebuild
+++ b/dev-python/botocore/botocore-1.21.53.ebuild
@@ -16,7 +16,7 @@ if [[ "${PV}" == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 arm arm64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 RDEPEND="
diff --git a/dev-python/cachelib/cachelib-0.3.0.ebuild b/dev-python/cachelib/cachelib-0.3.0.ebuild
index 16349581676e..2e233afce07c 100644
--- a/dev-python/cachelib/cachelib-0.3.0.ebuild
+++ b/dev-python/cachelib/cachelib-0.3.0.ebuild
@@ -17,7 +17,6 @@ KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 
 BDEPEND="
 	test? (
-		dev-db/redis
 		dev-python/pylibmc[${PYTHON_USEDEP}]
 		dev-python/pytest-xprocess[${PYTHON_USEDEP}]
 		dev-python/redis-py[${PYTHON_USEDEP}]
@@ -26,3 +25,8 @@ BDEPEND="
 	)"
 
 distutils_enable_tests pytest
+
+EPYTEST_IGNORE=(
+	# bug #818523
+	tests/test_redis_cache.py
+)
diff --git a/dev-python/cachelib/cachelib-0.4.1.ebuild b/dev-python/cachelib/cachelib-0.4.1.ebuild
index 16349581676e..2e233afce07c 100644
--- a/dev-python/cachelib/cachelib-0.4.1.ebuild
+++ b/dev-python/cachelib/cachelib-0.4.1.ebuild
@@ -17,7 +17,6 @@ KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 
 BDEPEND="
 	test? (
-		dev-db/redis
 		dev-python/pylibmc[${PYTHON_USEDEP}]
 		dev-python/pytest-xprocess[${PYTHON_USEDEP}]
 		dev-python/redis-py[${PYTHON_USEDEP}]
@@ -26,3 +25,8 @@ BDEPEND="
 	)"
 
 distutils_enable_tests pytest
+
+EPYTEST_IGNORE=(
+	# bug #818523
+	tests/test_redis_cache.py
+)
diff --git a/dev-python/charset_normalizer/charset_normalizer-2.0.6.ebuild b/dev-python/charset_normalizer/charset_normalizer-2.0.6.ebuild
index 0c26b60c4321..6421d85fd7a3 100644
--- a/dev-python/charset_normalizer/charset_normalizer-2.0.6.ebuild
+++ b/dev-python/charset_normalizer/charset_normalizer-2.0.6.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/github3/Manifest b/dev-python/github3/Manifest
index 94e50de93cb8..9c0b8ccbb109 100644
--- a/dev-python/github3/Manifest
+++ b/dev-python/github3/Manifest
@@ -1 +1,2 @@
 DIST github3-1.3.0.tar.gz 35345711 BLAKE2B 37d5b574c228b9e3c7ddd60931140679dcfa2a410964d25cfa51d621a0bc72cf4c5340ae3565c0112a3f5373aa064bdc4663dc2d3c4fdf3d0008239bd3498362 SHA512 0568d9730764fb81975da2ba336f1cdb2196de687fe6e68cb3dc2ac432bbcb201f1d78647ac2606a105ea00e6b244cb79b7222f88ebf305a9b7783c2b21e5a1b
+DIST github3-2.0.0.gh.tar.gz 35361555 BLAKE2B eafbabeb1557e55c27b268feaee4a0b49428ede7a419cb36163dc0437baa53a952b026971f07b30be2c33ed63d4c0b855369ee5260d4a3425e86dea101deea8c SHA512 92b044d0f0362c45773f8982043ab4e31cf180a955351fb9b035a8b2ed884330201d0cbb0e5f8f877c30cf6512f2e3864646a1bb1fe47e258a696720172d64b0
diff --git a/dev-python/github3/github3-2.0.0.ebuild b/dev-python/github3/github3-2.0.0.ebuild
new file mode 100644
index 000000000000..830ac68d4718
--- /dev/null
+++ b/dev-python/github3/github3-2.0.0.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="A wrapper for the GitHub API written in python"
+HOMEPAGE="https://github3py.readthedocs.io/en/master/"
+SRC_URI="
+	https://github.com/sigmavirus24/${PN}.py/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+S="${WORKDIR}/${PN}.py-${PV}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-vcs/git
+	>=dev-python/requests-2.18.0[${PYTHON_USEDEP}]
+	>=dev-python/uritemplate-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.6.0[${PYTHON_USEDEP}]
+	>=dev-python/jwcrypto-0.5.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		>=dev-python/betamax-0.8.0[${PYTHON_USEDEP}]
+		>=dev-python/betamax-matchers-0.1.0[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
diff --git a/dev-python/icalendar/Manifest b/dev-python/icalendar/Manifest
index 98e286b300dd..af26a5e4c397 100644
--- a/dev-python/icalendar/Manifest
+++ b/dev-python/icalendar/Manifest
@@ -1,2 +1,3 @@
 DIST icalendar-4.0.7.tar.gz 78569 BLAKE2B b5d980335b1a9d8135ad9ec037e140f3ae49c3e8db6736b9e469748e3bd51c43f39fc5f9dc443de46d4d4c5856ec74bb548a8d1b47b7e52278fdc2e269be0cbe SHA512 97f7184ddc42ade2a447af5112f5bd18ea9a89ef25ea3983cc2213fefe2c59255102b7babcd49b3e04cbe435d75d2712dd57eebc1bf1c20c54aae7081ba24379
 DIST icalendar-4.0.8.tar.gz 78761 BLAKE2B b1e9aa01319eab769f5b93635e6ff019ed2cf4b7d00bf4a68b9cabe76c70fb18c64fbb8851e0f4920d53dc444fd0ba7518b84f6ca424488a89377f35c133ea12 SHA512 0cc636d7009f808d64cd3255757974d4d52b79139f79db09124ef3e7f9ce1d29eb3e007428e884a58ee3434dbbca8289a05692c593ea3cc68ae10c7c4320a9c3
+DIST icalendar-4.0.9.tar.gz 84254 BLAKE2B c1ca7a7730404f7079e8fac8270f98a60ecd4e657f2b2b3d376d620f12c11a0db6dcd5713f7d2d4935c859d544497fa544b22ffb1a83be9c11ec2ea3923da93b SHA512 2eeb69da89207fe91661dfa6e9c2a623eb3be2fb5a48e999e87a881d7fecc1f339764124601b0610a14ce809f238c6731f30f2071bb4706206de10181365d1dd
diff --git a/dev-python/icalendar/icalendar-4.0.9.ebuild b/dev-python/icalendar/icalendar-4.0.9.ebuild
new file mode 100644
index 000000000000..869375a1ce2e
--- /dev/null
+++ b/dev-python/icalendar/icalendar-4.0.9.ebuild
@@ -0,0 +1,29 @@
+# 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="Package used for parsing and generating iCalendar files (RFC 2445)"
+HOMEPAGE="https://github.com/collective/icalendar"
+SRC_URI="mirror://pypi/i/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]"
+
+distutils_enable_sphinx docs
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# reset conf.py to not read version from an installed instance
+	sed -e "s:pkg_resources.get_distribution('icalendar').version:'${PV}':" \
+		-i docs/conf.py || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/libvirt-python/libvirt-python-7.7.0.ebuild b/dev-python/libvirt-python/libvirt-python-7.7.0.ebuild
index 8b7e36eb7c9f..2b5a57448d2c 100644
--- a/dev-python/libvirt-python/libvirt-python-7.7.0.ebuild
+++ b/dev-python/libvirt-python/libvirt-python-7.7.0.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} = *9999* ]]; then
 else
 	SRC_URI="https://libvirt.org/sources/python/${MY_P}.tar.gz
 		verify-sig? ( https://libvirt.org/sources/python/${MY_P}.tar.gz.asc )"
-	KEYWORDS="amd64 ~arm64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 	RDEPEND="app-emulation/libvirt:0/${PV}"
 fi
 S="${WORKDIR}/${P%_rc*}"
diff --git a/dev-python/lunr/Manifest b/dev-python/lunr/Manifest
index 1d83c31e7356..e6d8863902a8 100644
--- a/dev-python/lunr/Manifest
+++ b/dev-python/lunr/Manifest
@@ -1 +1,2 @@
 DIST lunr-0.6.0.tar.gz 839533 BLAKE2B fce81bfe0e12138b8ab335ecec828ac18be13f0d9f823218de11d701c4d44f54c06360c4c8f1c96fd36b634094b6f10bd964c9d4e154dc208cad1f36e4b32f47 SHA512 2067c34c12f77ab0fb32c7f800ea3c647a1073c061a14f2b72b2b95fc8d624429aa37e85992eee5d5b24add179eab1d81af52af09f0db67d6cae459a5faa0925
+DIST lunr-0.6.1.tar.gz 853421 BLAKE2B 7cc1624c91d07fa4e30ae789cbdffa1d98c011bd17a314bdb498ecfb7941fca7f0b6f36738377d10c17a7e400f8555be52fee8a1e03d3dfd8d931db88c4e25c9 SHA512 991569b6657c4cba653c999aa7610768303d1b184142c7f82a6c8ab44459b01cf7ae7db9f3bc45512161452b73e3b4cfbac3e8f7a0738e1f4b1429a8d8fe73e1
diff --git a/dev-python/lunr/lunr-0.6.1.ebuild b/dev-python/lunr/lunr-0.6.1.ebuild
new file mode 100644
index 000000000000..cb1876c81f2c
--- /dev/null
+++ b/dev-python/lunr/lunr-0.6.1.ebuild
@@ -0,0 +1,32 @@
+# 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} )
+
+DOCS_BUILDER="mkdocs"
+
+inherit distutils-r1 docs
+
+DESCRIPTION="A Python implementation of Lunr.js"
+HOMEPAGE="https://github.com/yeraydiazdiaz/lunr.py"
+SRC_URI="https://github.com/yeraydiazdiaz/lunr.py/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}.py-${PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-python/nltk[${PYTHON_USEDEP}]"
+
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	tests/acceptance_tests
+)
diff --git a/dev-python/matplotlib-inline/matplotlib-inline-0.1.3.ebuild b/dev-python/matplotlib-inline/matplotlib-inline-0.1.3.ebuild
index 68dd199cae43..71dca09e17b1 100644
--- a/dev-python/matplotlib-inline/matplotlib-inline-0.1.3.ebuild
+++ b/dev-python/matplotlib-inline/matplotlib-inline-0.1.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/matplotlib[${PYTHON_USEDEP}]
diff --git a/dev-python/matplotlib-inline/metadata.xml b/dev-python/matplotlib-inline/metadata.xml
index 39e2b538de40..612f4367f692 100644
--- a/dev-python/matplotlib-inline/metadata.xml
+++ b/dev-python/matplotlib-inline/metadata.xml
@@ -8,4 +8,5 @@
   <remote-id type="pypi">matplotlib-inline</remote-id>
  </upstream>
  <origin>gentoo-staging</origin>
+ <stabilize-allarches/>
 </pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/matplotlib/files/matplotlib-3.4.3-test-extra.patch b/dev-python/matplotlib/files/matplotlib-3.4.3-test-extra.patch
index 3f76705745df..cf641ff753ef 100644
--- a/dev-python/matplotlib/files/matplotlib-3.4.3-test-extra.patch
+++ b/dev-python/matplotlib/files/matplotlib-3.4.3-test-extra.patch
@@ -23,3 +23,16 @@ index 55e375311..684f38fb7 100644
 -- 
 2.32.0
 
+diff --git a/lib/matplotlib/tests/test_image.py b/lib/matplotlib/tests/test_image.py
+index c635564..4352942 100644
+--- a/lib/matplotlib/tests/test_image.py
++++ b/lib/matplotlib/tests/test_image.py
+@@ -872,7 +872,7 @@ def test_imshow_endianess():
+ 
+ 
+ @image_comparison(['imshow_masked_interpolation'],
+-                  tol=0 if platform.machine() == 'x86_64' else 0.01,
++                  tol=0.01,
+                   remove_text=True, style='mpl20')
+ def test_imshow_masked_interpolation():
+ 
diff --git a/dev-python/moto/moto-2.2.6.ebuild b/dev-python/moto/moto-2.2.6.ebuild
index b76e77a4b433..c8851cb7d5b7 100644
--- a/dev-python/moto/moto-2.2.6.ebuild
+++ b/dev-python/moto/moto-2.2.6.ebuild
@@ -65,6 +65,14 @@ python_test() {
 		# incompatible versions?
 		tests/test_core/test_decorator_calls.py
 		tests/test_s3/test_s3_classdecorator.py
+		# Needs network (or docker?) but not marked as such, bug #807031
+		# TODO: report upstream
+		tests/test_batch/test_batch_jobs.py::test_terminate_job
+		tests/test_batch/test_batch_jobs.py::test_cancel_running_job
+		tests/test_batch/test_batch_jobs.py::test_dependencies
+		tests/test_batch/test_batch_jobs.py::test_container_overrides
+		tests/test_sqs/test_integration.py::test_invoke_function_from_sqs_exception
+		tests/test_sqs/test_sqs_integration.py::test_invoke_function_from_sqs_exception
 	)
 
 	# pytest-django causes freezegun try to mangle stuff inside django
diff --git a/dev-python/moto/moto-2.2.9.ebuild b/dev-python/moto/moto-2.2.9.ebuild
index 16d08bf5742d..e764805f180b 100644
--- a/dev-python/moto/moto-2.2.9.ebuild
+++ b/dev-python/moto/moto-2.2.9.ebuild
@@ -69,6 +69,14 @@ python_test() {
 		tests/test_swf/responses/test_timeouts.py::test_activity_task_heartbeat_timeout_boto3
 		tests/test_swf/responses/test_timeouts.py::test_decision_task_start_to_close_timeout_boto3
 		tests/test_swf/responses/test_timeouts.py::test_workflow_execution_start_to_close_timeout_boto3
+		# Needs network (or docker?) but not marked as such, bug #807031
+		# TODO: report upstream
+		tests/test_batch/test_batch_jobs.py::test_terminate_job
+		tests/test_batch/test_batch_jobs.py::test_cancel_running_job
+		tests/test_batch/test_batch_jobs.py::test_dependencies
+		tests/test_batch/test_batch_jobs.py::test_container_overrides
+		tests/test_sqs/test_integration.py::test_invoke_function_from_sqs_exception
+		tests/test_sqs/test_sqs_integration.py::test_invoke_function_from_sqs_exception
 	)
 
 	# pytest-django causes freezegun try to mangle stuff inside django
diff --git a/dev-python/pandas/pandas-1.3.3.ebuild b/dev-python/pandas/pandas-1.3.3.ebuild
index 4ef6f81004df..ddae4ec4ab6c 100644
--- a/dev-python/pandas/pandas-1.3.3.ebuild
+++ b/dev-python/pandas/pandas-1.3.3.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${P/_/}"
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~x86"
 IUSE="doc full-support minimal test X"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pluggy/metadata.xml b/dev-python/pluggy/metadata.xml
index ac514967c2d3..cfe662c35d9b 100644
--- a/dev-python/pluggy/metadata.xml
+++ b/dev-python/pluggy/metadata.xml
@@ -9,4 +9,5 @@
   <remote-id type="pypi">pluggy</remote-id>
  </upstream>
  <origin>gentoo-staging</origin>
+ <stabilize-allarches/>
 </pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/pluggy/pluggy-1.0.0.ebuild b/dev-python/pluggy/pluggy-1.0.0.ebuild
index 9ba151234a60..6ec1d19c3670 100644
--- a/dev-python/pluggy/pluggy-1.0.0.ebuild
+++ b/dev-python/pluggy/pluggy-1.0.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${P: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"
 
 RDEPEND="$(python_gen_cond_dep \
 	'dev-python/importlib_metadata[${PYTHON_USEDEP}]' pypy3)"
diff --git a/dev-python/pyjwt/Manifest b/dev-python/pyjwt/Manifest
index 2bb4d7ca4ee3..6fc93fb5fbaf 100644
--- a/dev-python/pyjwt/Manifest
+++ b/dev-python/pyjwt/Manifest
@@ -1,3 +1,4 @@
 DIST PyJWT-1.7.1.tar.gz 41979 BLAKE2B 5604b309838b2dfb2f95e18e291c43703954664aa8acb7439072f002c1c8a1e49ff2c21d907be77a4d2f86e695ec71970d550aad2541252ac85bd7133e300b28 SHA512 70cd38127b6848933992c8b88303725ef71bfb430ad42eb63247e549b0bdab2a194137349d43ab02a1c97212dbc89f447ee3f0c5403dd14632b8b4b6b9235fc4
 DIST PyJWT-2.1.0.tar.gz 60092 BLAKE2B 59bde5f73558c74c964136ce0e8e9b5db6b76d226805fdb8aa8f201f00dceed0036693aa9295fa0ebac03c8fdac29a28f2aa79c697155c0ca744d1549e9bb47a SHA512 d701919c6cf06acb45cb0762a4ab7cc5e6ea247fbc0de80d0efdd1fc4b966c0d27c7400869858bbdc457b200586635aeefa8a38b85db818df6a8713f9bda8ab8
 DIST PyJWT-2.2.0.tar.gz 62200 BLAKE2B d527442cfafb8b540062f879e7c4a4f15acd9d88ff472764cfc077a220f42bd56e13d2aca9660008a118a9232071a45157c684f95987771c38cc631ee4745961 SHA512 e1cd8ba4fbde2adc906e18b04a925101f28091b4b23e39a1335ca6b933ab63132d07b2a4865399216ada17285b09f03bcf7fd1a12c238e7d4f15e7c9c1e32c75
+DIST PyJWT-2.3.0.tar.gz 62279 BLAKE2B 0f4cea0cee2461e5f829b2bba40fb6d2646d5bccaa8e6b2d26ba7379386a64dc9f5204ea607edec98fc0102facf3cc5595e5e97523e9a567e0cf0b072542a3f5 SHA512 c6a1d8c3ce87d2122aa4ce4e19c5d2683aeffae6fb29b20fa17e2dfb1a07faf721beb8ca390d3acdeb85a1476025ca5af4fcdb1019f84c8c1bf229246a7aafe3
diff --git a/dev-python/pyjwt/pyjwt-2.3.0.ebuild b/dev-python/pyjwt/pyjwt-2.3.0.ebuild
new file mode 100644
index 000000000000..7069f26b2215
--- /dev/null
+++ b/dev-python/pyjwt/pyjwt-2.3.0.ebuild
@@ -0,0 +1,29 @@
+# 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 optfeature
+
+MY_PN="PyJWT"
+DESCRIPTION="JSON Web Token implementation in Python"
+HOMEPAGE="https://github.com/jpadilla/pyjwt/ https://pypi.org/project/PyJWT/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+S="${WORKDIR}"/${MY_PN}-${PV}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="!dev-python/python-jwt"
+BDEPEND="
+	test? (
+		>=dev-python/cryptography-3.3.1[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+pkg_postinst() {
+	optfeature "cryptography" dev-python/cryptography
+}
diff --git a/dev-python/twisted/twisted-21.7.0.ebuild b/dev-python/twisted/twisted-21.7.0.ebuild
index c8587e876b49..3d9366967ca2 100644
--- a/dev-python/twisted/twisted-21.7.0.ebuild
+++ b/dev-python/twisted/twisted-21.7.0.ebuild
@@ -17,7 +17,7 @@ S=${WORKDIR}/${PN}-${P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="conch crypt http2 serial test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/utidylib/utidylib-0.7-r2.ebuild b/dev-python/utidylib/utidylib-0.7-r2.ebuild
index c87d380007c5..8a43bd1cf447 100644
--- a/dev-python/utidylib/utidylib-0.7-r2.ebuild
+++ b/dev-python/utidylib/utidylib-0.7-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/nijel/utidylib/archive/v${PV}.tar.gz -> ${P}.gh.tar.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 ~riscv x86"
+KEYWORDS="amd64 ~arm64 ppc ~ppc64 ~riscv x86"
 
 RDEPEND="|| ( app-text/tidy-html5 >=app-text/htmltidy-5.0.0 )"