Adding metadata

author: Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> 2021-11-23 01:43:46 +0000
committer: Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> 2021-11-23 01:43:46 +0000
commit: 7bb6b4c233214c08b69376fa0061fd2534eaf4de (patch)
tree: 6ba537ae44ca411cad6fd8d285bce767a6e1f4d4 /dev-python
parent: 379fc91217fd8a25c5dfcebe0384d806c46d5167 (diff)
download: baldeagleos-repo-7bb6b4c233214c08b69376fa0061fd2534eaf4de.tar.gz
baldeagleos-repo-7bb6b4c233214c08b69376fa0061fd2534eaf4de.tar.xz
baldeagleos-repo-7bb6b4c233214c08b69376fa0061fd2534eaf4de.zip
44 files changed, 834 insertions, 198 deletions
diff --git a/dev-python/autobahn/Manifest b/dev-python/autobahn/Manifest
index 1374556c7806..308c6cdc5c02 100644
--- a/dev-python/autobahn/Manifest
+++ b/dev-python/autobahn/Manifest
@@ -1 +1,2 @@
+DIST autobahn-21.11.1.tar.gz 365165 BLAKE2B 91a12bf1fa9acd056246d86675c76fbcdb4de8914f4ab5e2c8ec06cf8e822cc1a72f8a7b39b520405cce32e2f32024ebbaa48ba024e1dc71b50da4e6f8913e19 SHA512 5a23272046ef67821e86c6bfe766273b3ba73a75fbc51c7864c2ab83ffb8d4e119022980f8b71c453118bf15b26ede8042aa0114e54caebbfb33555208093ac2
 DIST autobahn-21.3.1.tar.gz 351296 BLAKE2B d018c8820a1accc779decdb8d392d3ff6225f80674b468145a8f29b275d6f0b1021a226dc8bc72915a792591e6d4ae8d6a33a96cf705241990ac401c8342e2c5 SHA512 dd6bf6eba6f2880860c6fa42e3925bb15d36bfb9d2354ddeb0165972848e81a308723b7f9dcd6ec3426b6286f71cb2da453590810e5d891523d92acf9fd64c52
diff --git a/dev-python/autobahn/autobahn-21.11.1.ebuild b/dev-python/autobahn/autobahn-21.11.1.ebuild
new file mode 100644
index 000000000000..ccf56fe141ab
--- /dev/null
+++ b/dev-python/autobahn/autobahn-21.11.1.ebuild
@@ -0,0 +1,114 @@
+# 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} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+inherit distutils-r1 optfeature
+
+MY_P=${PN}-$(ver_rs 3 -)
+
+DESCRIPTION="WebSocket and WAMP for Twisted and Asyncio"
+HOMEPAGE="https://pypi.org/project/autobahn/
+	https://crossbar.io/autobahn/
+	https://github.com/crossbario/autobahn-python"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="test xbr"
+RESTRICT="!test? ( test )"
+
+# The order of deps is based on their appearance in setup.py
+# All extra deps should be included in test and in optfeature
+RDEPEND="
+	>=dev-python/zope-interface-5.2.0[${PYTHON_USEDEP}]
+	>=dev-python/twisted-20.3.0[${PYTHON_USEDEP}]
+	>=dev-python/attrs-20.3.0[${PYTHON_USEDEP}]
+	>=dev-python/txaio-21.2.1[${PYTHON_USEDEP}]
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	>=dev-python/hyperlink-21.0.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		>=dev-python/wsaccel-0.6.3[${PYTHON_USEDEP}]
+		>=dev-python/snappy-0.6.0[${PYTHON_USEDEP}]
+		>=dev-python/msgpack-1.0.2[${PYTHON_USEDEP}]
+		>=dev-python/ujson-4.0.2[${PYTHON_USEDEP}]
+		>=dev-python/cbor2-5.2.0[${PYTHON_USEDEP}]
+		>=dev-python/cbor-1.0.0[${PYTHON_USEDEP}]
+		>=dev-python/py-ubjson-0.16.1[${PYTHON_USEDEP}]
+		>=dev-python/flatbuffers-1.12[${PYTHON_USEDEP}]
+		>=dev-python/pyopenssl-20.0.1[${PYTHON_USEDEP}]
+		>=dev-python/service_identity-18.1.0[${PYTHON_USEDEP}]
+		>=dev-python/pynacl-1.4.0[${PYTHON_USEDEP}]
+		>=dev-python/pytrie-0.4[${PYTHON_USEDEP}]
+		>=dev-python/pyqrcode-1.2.1[${PYTHON_USEDEP}]
+		>=dev-python/cffi-1.14.5[${PYTHON_USEDEP}]
+		>=dev-python/argon2-cffi-20.1.0[${PYTHON_USEDEP}]
+		>=dev-python/passlib-1.7.4[${PYTHON_USEDEP}]
+
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+		dev-python/pytest-aiohttp[${PYTHON_USEDEP}]
+	)
+"
+
+python_prepare_all() {
+	if use xbr ; then
+		eerror "***************"
+		eerror "Required xbr dependencies are incomplete in Gentoo."
+		eerror "So this functionality will not yet work"
+		eerror "Please file a bug if this feature is needed"
+		eerror "***************"
+	else
+		# remove xbr components
+		export AUTOBAHN_STRIP_XBR="True"
+	fi
+
+	# avoid useless rust dependency
+	sed -i -e '/cryptography/s:>=3.4.6::' setup.py || die
+
+	# remove twisted plugin cache regen in setup.py
+	# to fix tinderbox sandbox issue
+	sed -e 's/regenerate Twisted plugin cache/DO NOT & in Gentoo\nexit()/' \
+		-i setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	einfo "Testing all, cryptosign using twisted"
+	local -x USE_TWISTED=true
+	cd "${BUILD_DIR}"/lib || die
+	"${EPYTHON}" -m twisted.trial autobahn || die "Tests failed with ${EPYTHON}"
+	unset USE_TWISTED
+
+	einfo "RE-testing cryptosign and component_aio using asyncio"
+	local -x USE_ASYNCIO=true
+	epytest autobahn/wamp/test/test_wamp_{cryptosign,component_aio}.py
+	unset USE_ASYNCIO
+
+	rm -f "${BUILD_DIR}"/lib/twisted/plugins/dropin.cache || die
+}
+
+pkg_postinst() {
+	optfeature "C-based WebSocket acceleration" "dev-python/wsaccel"
+	optfeature "non-standard WebSocket compression support" "dev-python/snappy"
+	optfeature "accelerated WAMP serialization support" \
+		"dev-python/msgpack dev-python/ujson dev-python/cbor2 dev-python/cbor dev-python/flatbuffers dev-python/py-ubjson"
+	optfeature "TLS transport encryption" \
+		"dev-python/pyopenssl dev-python/pynacl dev-python/pytrie dev-python/pyqrcode dev-python/service_identity"
+	optfeature "WAMP-SCRAM authentication" \
+		"dev-python/cffi dev-python/argon2-cffi dev-python/passlib"
+	optfeature "native SIMD acceleration" "dev-python/cffi"
+
+	python_foreach_impl twisted-regen-cache
+}
+
+pkg_postrm() {
+	python_foreach_impl twisted-regen-cache
+}
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index 854f4fe872c1..63e5cd45000a 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -2,6 +2,7 @@ DIST boto3-1.18.65.tar.gz 429858 BLAKE2B fbc80e0d8d10f6d02fcf9b86c6b4be03a9c9083
 DIST boto3-1.19.12.tar.gz 436654 BLAKE2B f92e756bc9f98105e3126e41cf0d6fab948bbd79f088ee4e0f0f5f319d4a6e542c0702b487404b316f794b304c43f9c26da026257476341971a7ce241538f506 SHA512 e6b20730f35bb422a2f74e978adc0bac77aa18b4e80eab5175dc117cf2762a7d8e53d390c50df24dada6f1d071d78309c69598ffb3f8d93fd45a3d1f772a866f
 DIST boto3-1.19.5.tar.gz 433567 BLAKE2B 52c12a4dd18d6f02326f8002b345cc5df224455fc862daa700326ae1df258979211d2753f01e1a106f237de393e483dc8926bb4ef0e08bafa575f20811dccd55 SHA512 fad05102f0c3e7e30a3342009f6b3ae28f52758f17a0c22b4da9a03dd10d7f9149ea2ec0119f55ec7280824bd8173653271821e82fcd54ef9fb9161b2d62df70
 DIST boto3-1.20.10.tar.gz 443886 BLAKE2B 891c5d45eed9fc0afac3e6e87f5f7d2100da779b6d863146d8a0804ed8caa732024d21cbd396a681067088080fc9b4e9afc3634d0f3e2483fa8ad5203e703054 SHA512 36ea0170aa62dba8f01f49d975c34dc3fa180ea82d583619844755d9eb8f5e5d141bce2ac044c1fee8dba4ce71ad5dc93b527e5ed4efbf303ef8abaae90b0a47
+DIST boto3-1.20.11.tar.gz 444945 BLAKE2B ead4a78e67c12dfeccfe2c55e88ff9ed0ed2d024d04a89f82f31c87fe01ddbb425ddcd0ce54955c02b4fc8468b3684a5289bd3a3da5fd5e472f8b8a88e75c26f SHA512 d68ee2b61f3aeb34b137a347c41e96da0d3f04fb700369886e5081290f29fb479f84992c92d5dc79cee67b8c74146590669f99ff21a6bfd2e04c8aff33b3d5d7
 DIST boto3-1.20.5.tar.gz 439166 BLAKE2B c140e15e497e6cdf6b4b77bb99e0a0f5ac01d5b5793f8bfb210b52bbc09e39e6fe06a957951375e0795210dc1c3b2a0afd2f498bc88e449d9e6846f2b357f016 SHA512 2823466e4851684253d4ce42a8c34e5cbdad6d04c823040fe2cebdf0cffb14d5d3f40e28d57ebec14533fab04ba74f27c25f078ddb8791b8f52d0424e11b39fc
 DIST boto3-1.20.6.tar.gz 440133 BLAKE2B b154714261372cebb8643d529b66fe3a42d30e056cf2a454092d598c51d0cdef723980834be6a36abb892d3022ae8ef67053b22bb176f540e67c3f37422155d8 SHA512 d8d66a761f03beeca10fea8446de1136d418a93b21065aebfefcafe2abfd9b5bbfa243594f54647ad80547e48348086e2be2de129b89f9ca71f308579f11a0b7
 DIST boto3-1.20.7.tar.gz 440428 BLAKE2B f1b2b36799e6c22a40c04226443f15f9174d68a02d2f731df84f6ff0962158e9d940ae5bc04d25fe99a74f105946026ccb66547838734294d649d661071c1e3b SHA512 85493a85789caa5453a4dafa1472c8ecd75c05a819227909092ae03690243eb103c1588cb10e5e5277ab9df49673b9b54fda064a412bdcf6b9e11238b277f450
diff --git a/dev-python/boto3/boto3-1.20.11.ebuild b/dev-python/boto3/boto3-1.20.11.ebuild
new file mode 100644
index 000000000000..ace657bcbe4d
--- /dev/null
+++ b/dev-python/boto3/boto3-1.20.11.ebuild
@@ -0,0 +1,59 @@
+# 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="The AWS SDK for Python"
+HOMEPAGE="https://github.com/boto/boto3"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/boto3"
+	inherit git-r3
+	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"
+
+	# botocore is x.(y+3).z
+	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
+fi
+
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# don't lock versions to narrow ranges
+	sed -e '/botocore/ d' \
+		-e '/jmespath/ d' \
+		-e '/s3transfer/ d' \
+		-i setup.py || die
+
+	# do not rely on bundled deps in botocore (sic!)
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	epytest tests/{functional,unit}
+}
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index 4f46617536df..b48d19bc9e87 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -2,6 +2,7 @@ DIST botocore-1.21.65.tar.gz 8261668 BLAKE2B c955019d06aa1b2f4503673b7d9009e5d6e
 DIST botocore-1.22.12.tar.gz 8343683 BLAKE2B df7b2c86f226df14dc8181e8506acc7dd660797311049e2342ec721e853af1158c845749a8143ec6677601420ce6140173da8df5d9e4550cdf9becfc944ebd3c SHA512 0ab78902711960f8373a91af379b4981ab29646cc9f94e49836deaa432695c503879ed0bbbf54e3641e50933b5ed658e48052ca2b8b8391f705284d9abd24c1f
 DIST botocore-1.22.5.tar.gz 8301083 BLAKE2B 91f9d38e7c5bcb0b8f58c04547ad45489f58d2240c6b7301cf632969a4a73cf4a1d51c8c68c8def27653c10041d2163ad7ca800dcf6fd07972b506bf2566cae3 SHA512 710a9eeee03dc79ca4ffacc4974f09ca769e1e3b8cb143f6f0349240dd8c2af8ee526a1dadb7310a26019363f683fc4149cb4c73d8b94a856a384fab7f84fb5c
 DIST botocore-1.23.10.tar.gz 8429267 BLAKE2B bcad034d600f17317e1036225a789c143d75ee2375965df60b3398d898fb49e5ceee7a5ac99cd7fb5f44f2bd89da7cee9406df6b493a53c93fcce5363d7735e5 SHA512 c2782cb8e360f1a921a0e630f2a6cc0f97f1ff0a974e89d95c0b602f201ebffe29a507759e9a83153cc3d9797f057d7bc6e4f6568f6965a7448be04b479c5b55
+DIST botocore-1.23.11.tar.gz 8445108 BLAKE2B 16e486ff61e2b7822d6db74ed5829ce4e0cdc69b32c6d6b08b5790eca9856c409844b67a0545f9c22e8cbd90bfb5f6f0b0f8be1f1924f9814235390eca71d853 SHA512 625fd439da1bab2be4bf4621ace23ad5c815fe80933dc89d1489016424eb53dcaa2b8f476cf920ae0a800c05bce9dbef594e794c7131cce4e81eee81381f1f64
 DIST botocore-1.23.5.tar.gz 8374467 BLAKE2B 467092e7d8aa5ccb756132669049865445a47205913964c1c944b20caaf100b1efdd1bf3af9c5416ff079b487e6d4d08ffe6208e2b352d09655cc5be21c88739 SHA512 6afca19b724f9019f21e5993ce970d605b95d31c1a4e969ec1b4080510a5a120b3fa0cfd5ade973a9203bd6b7983a3dbca2f7a03108a9167392efd60d5e2fe9b
 DIST botocore-1.23.6.tar.gz 8387968 BLAKE2B 415a177d591a0ef369f17b8f02563be0fb53bc4e65c2767f41ca11300939585a10146874b6ac5297cdd3dcb36cf6fd2065fd09f3c612c4ba1d954b03a5b15579 SHA512 a46e45b7bb67d7c4bcc5508f38448b9ed3778ed6b6080239459b22b7f753adaf12e8d64496f7d7c71b33bb17ae1744000e9269ea0f545286e56fabe39e7f0340
 DIST botocore-1.23.7.tar.gz 8391467 BLAKE2B dd6cad44c1b8109b76c44bfffa45e74da0fbeaa027429860640e33134dc5f6e5bb813b46d8b662d80b89af46d437c6fb962f0e0ab1edbeca3ee790f3b6d029bf SHA512 a3270da3b6d906bc2372af221400e14039868598ccd56f40f976bcc2638f300ae9990ff367f76e5b5cdf8d46a8a37716865f9a40ca7e79b73a5b8dbcb2b1af7f
diff --git a/dev-python/botocore/botocore-1.23.11.ebuild b/dev-python/botocore/botocore-1.23.11.ebuild
new file mode 100644
index 000000000000..43b65ed32e9b
--- /dev/null
+++ b/dev-python/botocore/botocore-1.23.11.ebuild
@@ -0,0 +1,64 @@
+# 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="Low-level, data-driven core of boto 3"
+HOMEPAGE="https://github.com/boto/botocore"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/botocore"
+	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"
+fi
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/jmespath[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
+)
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests pytest
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || die
+
+	# unbundle deps
+	rm -r botocore/vendored || die
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# rely on bundled six
+		tests/functional/test_six_imports.py::test_no_bare_six_imports
+		tests/functional/test_six_threading.py::test_six_thread_safety
+	)
+
+	epytest tests/{functional,unit}
+}
diff --git a/dev-python/cfn-lint/Manifest b/dev-python/cfn-lint/Manifest
index 5276fd99b086..95689081179b 100644
--- a/dev-python/cfn-lint/Manifest
+++ b/dev-python/cfn-lint/Manifest
@@ -2,3 +2,4 @@ DIST cfn-lint-0.54.3.tar.gz 7806470 BLAKE2B b61cb4b46e7c9d04aa70d2542e2aee0d029c
 DIST cfn-lint-0.54.4.tar.gz 7835716 BLAKE2B 1709adda09a08b02f4a2637af1ed2a43c096d8f9eef91b3cfbac55365e0910be64c632e28e403356742396b72a4af6c88740b27d13a67b62b5f5af98c8639e43 SHA512 f31b8fc407adf75b1eb54a29719b39298494efcdba65e68610e28ca1d066dfdb3fa051e8a90fe589793683c01e49d1bab30832255153e8932bd9caca96b54441
 DIST cfn-lint-0.56.0.tar.gz 8069291 BLAKE2B 6a6b0481f857e3360d2abeb372415a43ae59ed54f2c1ef08ea079f32442bea9f30a7222233cfadd398922994bc70aa78e92b8807d7386ca4b979548622d3e5f4 SHA512 f12ca4ba831c32d7c9c8079ed9d59baf6346a2c4a09cf2af0a8b258dc551b381983cb346800b37e6df3022fbb6f09ee186b44bb9ba3e0a2713c8faabce83f67b
 DIST cfn-lint-0.56.1.tar.gz 8095525 BLAKE2B a9db57f17c0f5bcc0950aa61b109488154dfb67997224f7c49f35c324ada7e4881ab2bd2048df344b78668db5e26eb365712cc0a1b8d2b2349cc53c7e97b35b1 SHA512 0857139094fcfd8d935c526986319a67cddb7fc42ec1297b29f797299699d068ddbb0fdd30736b2ba1b647c905c6c7be4946915d98a23119fdb6bb70b23adef1
+DIST cfn-lint-0.56.2.tar.gz 8139815 BLAKE2B 70e2657801fa7c995e6a92c36bfd49195af80b1477da651cf10a234ebf8f0aba2382e8512efc1adfeace6503d0e5afffb09e4a80e7f9464ebb6f2d53b57f84fc SHA512 9169d81b3144fa28c48372971b6197aa3a85b6365d7e45c22967ea388896b5df65e1daf6889984b8ece46b938c91c349fcde01ed9e0bf4780b549163f8948866
diff --git a/dev-python/cfn-lint/cfn-lint-0.56.2.ebuild b/dev-python/cfn-lint/cfn-lint-0.56.2.ebuild
new file mode 100644
index 000000000000..16397777fde5
--- /dev/null
+++ b/dev-python/cfn-lint/cfn-lint-0.56.2.ebuild
@@ -0,0 +1,54 @@
+# 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="CloudFormation Linter"
+HOMEPAGE="https://pypi.org/project/cfn-lint/ https://github.com/aws-cloudformation/cfn-lint/"
+SRC_URI="
+	https://github.com/aws-cloudformation/cfn-lint/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	>=dev-python/aws-sam-translator-1.40.0[${PYTHON_USEDEP}]
+	dev-python/jsonpatch[${PYTHON_USEDEP}]
+	>=dev-python/jschema_to_python-1.2.3[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
+	dev-python/junit-xml[${PYTHON_USEDEP}]
+	dev-python/networkx[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-5.4[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.15.0[${PYTHON_USEDEP}]
+	>=dev-python/sarif_om-1.0.4[${PYTHON_USEDEP}]
+	>=dev-python/six-1.11[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests --install pytest
+
+EPYTEST_DESELECT=(
+	# TODO
+	test/unit/module/test_template.py::TestTemplate::test_build_graph
+	# requires git repo
+	test/unit/module/maintenance/test_update_documentation.py::TestUpdateDocumentation::test_update_docs
+	# Internet
+	test/unit/module/formatters/test_formatters.py::TestFormatters::test_sarif_formatter
+	test/unit/module/maintenance/test_update_resource_specs.py::TestUpdateResourceSpecs::test_update_resource_specs_python_2
+	test/unit/module/maintenance/test_update_resource_specs.py::TestUpdateResourceSpecs::test_update_resource_specs_python_3
+)
+
+src_prepare() {
+	# unpin the deps
+	sed -e 's:~=[0-9.]*::' -i setup.py || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/cmd2/Manifest b/dev-python/cmd2/Manifest
index 865b4faf447c..2883889d60da 100644
--- a/dev-python/cmd2/Manifest
+++ b/dev-python/cmd2/Manifest
@@ -1,3 +1,4 @@
 DIST cmd2-2.2.0.tar.gz 667076 BLAKE2B babdf4034ea45cebce0a9b037e0bef0127c924e358c68ab6a2b95e73ed3be4577dead28d2eebce721432fefe7d2590a3e904ba84dc17bf7c06e3f777dc7b0db0 SHA512 20c204c5e5996e18face62066a179a9833c468724a947042a3b5aaf49940cad0c773ea22e7f40b8c721f7362dcefa9eb72072710072e608c4adab615332bdc22
 DIST cmd2-2.3.0.tar.gz 673314 BLAKE2B a4ec117af937157d9d4c74d73652bb89998289b9f6ae1548cf064a7f5d964aa77576b00f5c530886f04a2f39f3969a26da4a5752a654b6cbb8b2cbde40907831 SHA512 615b88abd64e0909fc9d24a495060d2d45cf962b2293b91e3bb4e24fa0f90e8e6c07fe5c29a2e0915392fac365960cca418aa4e27b50718c45e9d91397802f30
 DIST cmd2-2.3.1.tar.gz 675209 BLAKE2B 492567f78c72349d3781d8372103bf3db0ec1016989fb946bf3b2f5d28505e9c4a2caee1dd1d0f2d4a2a63e6ad5512eea2ecd9d41e7009d429372c0e0c6890f3 SHA512 2f2de90c90bd6773d37c11367b3e77245d2a0e96925874d9ad45ce421e32d6cb02ca51d8bf702c4d2c0ee763b322a36ed508aa2013374f1b4513208fd2c49096
+DIST cmd2-2.3.2.tar.gz 675745 BLAKE2B 5e2f2066642685cca8a0aa703b885b257ec61516f59409e1daf7f53abdb6b0ad7b2b37ba3df691eb6371293ab328aa150b1029cfd4428b3974e9d37829a96223 SHA512 5192bd0b54bfa7deed14c035e4463b8c5ac1aeb49a55d6288190279429fce307950d0218fc60dd19639e05c82a7a5a1dad60529927c16afa5ede9ce84ac76cca
diff --git a/dev-python/cmd2/cmd2-2.3.2.ebuild b/dev-python/cmd2/cmd2-2.3.2.ebuild
new file mode 100644
index 000000000000..bb132cac6252
--- /dev/null
+++ b/dev-python/cmd2/cmd2-2.3.2.ebuild
@@ -0,0 +1,52 @@
+# 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 virtualx
+
+DESCRIPTION="Extra features for standard library's cmd module"
+HOMEPAGE="https://github.com/python-cmd2/cmd2"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	dev-python/attrs[${PYTHON_USEDEP}]
+	>=dev-python/colorama-0.3.7[${PYTHON_USEDEP}]
+	>=dev-python/pyperclip-1.6[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/wcwidth[${PYTHON_USEDEP}]
+"
+# pyperclip uses clipboard backends in the following preference order:
+# pygtk, xclip, xsel, klipper, qtpy, pyqt5, pyqt4.
+# klipper is known to be broken in Xvfb, and therefore causes test
+# failures.  to avoid them, we must ensure that one of the backends
+# preferred to it is available (i.e. xclip or xsel) + which(1).
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		sys-apps/which
+		|| (
+			x11-misc/xclip
+			x11-misc/xsel
+		)
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	distutils-r1_src_prepare
+	sed -i -e '/--cov/d' setup.cfg || die
+}
+
+src_test() {
+	# tests rely on very specific text wrapping...
+	local -x COLUMNS=80
+	virtx distutils-r1_src_test
+}
diff --git a/dev-python/cryptography/Manifest b/dev-python/cryptography/Manifest
index d8fdbea4f3cb..a0c5b902b4b4 100644
--- a/dev-python/cryptography/Manifest
+++ b/dev-python/cryptography/Manifest
@@ -1,11 +1,11 @@
 DIST Inflector-0.11.4.crate 17438 BLAKE2B eaf0c7f983b3186e9bc89353021a10592f2877e46585bd50b96db9b087343d1199c7b6cf3fa53cd274fb6d33de025a904b8aa31a7ac9599ae3689ecdbcec34cd SHA512 f1f6463e033b6d3c16c51dc1e1a3f5569954308b95b59058294b7f9310919bbda797e99e6a07529071bb83f0688867a243997d33795a7136b0af73977004296e
 DIST aliasable-0.1.3.crate 6169 BLAKE2B c23840c7f1df86109e004aa1929d7355bd815c69ce8c5a316c9e2810851b7faf91c7480924d67cf83520e94b86dc0cc1b90b0dcc84b446a15ba5cccc1bae95ca SHA512 a60e4280335638b36a72e51514843229fdd0cc89cb670fcf159f882a687c04ecbddcc52a1dcc3cbe8647e5308af3939037934a157facdddcc4834dcd3cb16dc8
 DIST asn1-0.4.2.crate 19947 BLAKE2B 9ebb387236a990b052a153cd590b300c18cdc539b7a2b9a922b3904069f6d9e83e651849b4a69dc779eb47937230bd7712f9ba6a23a87497101428a8341c0df0 SHA512 b661eeefdfafd47732c0c5e6f7d3c4bf74cda08c8bce09bf1b5e5594712bf1ed4d209c5ce849213defbf4226f0949f692c6d2930a6da314d2e9efcb97c57628c
-DIST asn1-0.6.4.crate 24957 BLAKE2B d3a9dde3ecf5cafe43f234a0b408c7000414384973c0d0a3e31c3c63a321e738dc0cb00960bb2057afe4bf64e85e3eb1e9d2d5b80887b369960719a85e883942 SHA512 47c699a151665bbb0ed4094df28d05183672b53cbf217756da13ad2f221da2843d787766ceef74d092ab4788723fd10242eeb6d9e7874ba0271c5ef6c972ad22
 DIST asn1-0.8.6.crate 26140 BLAKE2B 8231f10b25923f9d09648e864d32f40db6235f582bf2bc2855fa9b6849415eeff865a64a7dcdf03b614c527e260b2821e1df6a36b6578a09a6ed8679d8373c85 SHA512 be6176eab1df61b2eec0accf8af46893affa44b4ba1125d9f11f0fff4d663f487dc6c4ee1d61db3c12a413c69957246a4f6919c62aefa34a1a34885ac1f78750
+DIST asn1-0.8.7.crate 26288 BLAKE2B 702fdd34d5489b74cad023969c8873c6d469bd58376fc86fc124638ffe677f2d7f2592d28219ba741597d3791716b1303cff1fa6352f5df0fa41fdd0add628fd SHA512 4cccfa41423784cb82a0dc4fb0a23da7a14d7be883e22ec4263c219d9f14b1fb90d84f59750e11c561a494cbe6171494f60f9cdf1d1510411d579306c47f06a5
 DIST asn1_derive-0.4.2.crate 3085 BLAKE2B f1cb33bd274db523dd8d66a687816574f8276dcf955b88a3a5a98d05eb0c9b8f0448b569c9dcdea8f428d35468f761cbbd81302ea0ecb4ad51345398d454f7a2 SHA512 4f8a9049a72068dde63066f74bb4308a11720421243cc5243e476c95e24e0a418b26eb1f4d7e1c1d0c3fb79dbb2817f58a5d95c5d257b4367f92f84c7dd7af59
-DIST asn1_derive-0.6.4.crate 4327 BLAKE2B 4c065c7d93ef2f3fe9da60e4f5902cd26cd425af9a788f4afffa522a8034cbd38c285c8de4d169ef8a2473dfb76b09a5fe1237e32909727a8e3388878370f73b SHA512 f982bc0917c867f70262efe33605f47f7e0ee86209bf556b29d7c1a64aa09d49a94b2f9114b8f182ed35fc365b03214f742dc93f7a53810cd7ac5e927b6fc476
 DIST asn1_derive-0.8.6.crate 4305 BLAKE2B 3a844cc73e3ebef2ef5f1fa4cadbcb1ac0fd3ea476cfb607fde7c68e81a3b12061665c60350e548d20d479b4651228b62fdbb0838d488a1822a95dbb21472cb9 SHA512 706fa08d6e8d4d75d444793a203d1539c0851461fc78bc01f91ca466c45b0050e1131c2ce7925fca1ce9548b6d1f250857b34ad826c7089868a1e203a0d4c8e4
+DIST asn1_derive-0.8.7.crate 4305 BLAKE2B cc1fe4a8c27730e65164daaed5d2d346364f08a47439e012f670db82190dba50cfbdf720cb253d7a057cb4b560b8ce73c557c639e90856e27d632995643dc45f SHA512 44c36d43761d8890354d40c0fe6f5b700bd9d90867ba258437d325fc6e2549921255b47107a2fb556f462194e468f0cb6d27f7bd644e2ffba8d98b0b8d84ee1a
 DIST autocfg-1.0.1.crate 12908 BLAKE2B 40c53cab298e4f26634c3acff3ece6a3371188d91dbf377ed664eabedcde20536edaa93daf406618f37edde019f049a6e7b9a47f627344587dbd126bee2b5e3a SHA512 630b348acb98b012e97804e6325d03c89abc22f2157762c59144c04e6c733daf550bdc7f0fe0b9f3b50e15dae8c1c3c4bdfce3d805b02f0fc987311f5332419b
 DIST base64-0.13.0.crate 62070 BLAKE2B b957f65cdb1e28baeca0cefc92fa98be797409b7dabd15e0e88db6cdfb89779b662cba9f2270fbf3b7b66948fdc46c118b8040a78ab72049c48a928fa802bee0 SHA512 991a72999839daa232f508c5b24e7d3225e8a26db8d1d0e747881b115af9e408b92374e163b31e0b0d324c1c2e57e8e38d66861b61eb0a1dba87bb5871940151
 DIST bitflags-1.2.1.crate 16745 BLAKE2B 0fa6d3ce44aad7616d5cd02aad8c1d0b0fed4022650eb43067c4a72e6fc88da05442674fa51826e4858a47c9de233e1ba2229820af094197cd11bb416ceffb2b SHA512 ad89b3798845e23737a620bba581c2ff1ff3e15bac12555c765e201d2c0b90ecea0cdbc5b5b1a3fa9858c385e8e041f8226f5acfae5bbbe9925643fff2bf3f0b
@@ -14,30 +14,27 @@ DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b
 DIST chrono-0.4.19.crate 155663 BLAKE2B c92c273fb6475bbb2546dfb75eaa23321bc8f9a5fa8a7c652f527649b96ff8718fa932f52b500b02a4acae7837df5bdb14f69cb821d4962be2790dbd1d023a54 SHA512 a119349bfc2243a249f1d18b1ae548a04b30fecb75913a56f26d1ff8c0eb53097a2674d9141e2094018191cbbc1620843fbddaf52999824e077c1157f0907980
 DIST cryptography-3.3.2.tar.gz 539883 BLAKE2B e35de90362b24170c4025f67914e60c16fbf37fce6bcd5d6f3fe32e5a9bb60de8edbebcb1ff0450fabc9c244d4b1a4618c720b630f28c747fea17e9bf008f01f SHA512 55f6ee13342b3209b1fcb310f4c4d33d22856ee785cb2347e6ad36c34e9b42f6e0d5bece8e458b09663a5b78e34c4567fe7a211b51ca71f55ccc93e3f62dc5e4
 DIST cryptography-3.4.8.tar.gz 35746288 BLAKE2B 750a265a5b518fdc992bf8a402792ff849129286751185f931ea82ebf4c9d3dabfed680ec2eb1c73d4c773ef2feac6186e251365921fbc67044b89bc040d311e SHA512 4007cb3a4312bd8053491741474309e9f39c21fe37e66b6a832ae837cf2e9330b71caa9bfc6d6692764336684c26809cb794521800b7f6dadce4367a588117ff
-DIST cryptography-35.0.0.tar.gz 35759264 BLAKE2B 25c6b84ea8c65914af9462dbf2430cef8d554234df0d632c4082c197af09635fcd82e3e98aa0b94fc444a9be8ba6fd9955e4e49daaedb705d8456f26d1e54ab3 SHA512 b52b71ced261263e5a9e5856e3fb76b284bba4924160f6e8ad585f6148f79846a3e15d05fc8585020ec00b1e35114fbb0129bdc3acdabf1c60bb4d935767eb30
 DIST cryptography-3e0ab39756b05b2b7170e3a2c8b339f27fe56627.tar.gz 35809717 BLAKE2B b5f3d8f723e9acb156c50433069ee5be8691042220bbd8e3ee2ed54b0c2198d73985fa48a156ac7327b3fee481c241878a2139c5fc6d29c39f5157d5d366f4c5 SHA512 0d3f4ff2f878860a5116d5496a9f01b9c308e98366fa3bfe09d66e93b67c6928332fdf654852f42276688e087eb584bc6511de31649898a2b21f688c420c988d
+DIST cryptography-5d21990c32d0f93df4e54ef4ee7ff3a2dae3c3da.tar.gz 35828292 BLAKE2B 6ad06308300a5ec5c61d62814cf39721de1d47efcb0c9c18951723f6342119f31263df0e23052ae02e9538d7613a93ea3c60f66e39606ef0e30d876656896dce SHA512 3932ad6a372860fd03a335818a610af8bc2568e63d51e9862acc19fc2a552c20f802c738bd13d3aa1594d79ced2b0471c35adacef6bc4b2cc3098af5196b0e33
 DIST cryptography_vectors-3.3.2.tar.gz 35168168 BLAKE2B 3991a16556ae5be0d153cfe302dd9a860918a80bd0bdef7104f3c170ba63941c4b1ff74750bc12329422a6061161cb6452bea60e191d85c0d79e0852566c6c0b SHA512 18590adb96a6f04b8a41d4346b126b8adfc854cbcec85f8c1c0a23b1b363f215b37da60ea94a481b8fd7752f07fba515b08fc18faf2e29fb858e133129971f7c
 DIST ctor-0.1.20.crate 9328 BLAKE2B bc2f4ce53f6b7d6a2fb441317a3f91b8852c541261f95f0b7d12adb35ec1c943810242ce71e514445479c5d225b735cd50fa4dfb514e6b121be753555ab3c30c SHA512 877f4663f8079a368d198a3351e98551c6d8123dd5e53b812529b77b09f1c08296e6df817d7429e4c70a73a6203fd98bce5ec2ce7b09baabe4f348bd54a9c0dd
 DIST ghost-0.1.2.crate 12777 BLAKE2B 34293c1ec8412ef207627ca2a041f2dd8822c2d8990df8e0f17ffdfc865a1662991a80680c484ddef505758578177d358c2e56003003a2cb685f07a41d6a9feb SHA512 4258fdfab59946a4955f053cf0b73f964d5bdf25ac9357ef8f4cb21948299fb749bf0c0e89a9c1e95a8606e74c6b3a3630fb4f6316815d83882a9531e3b78b5a
 DIST indoc-0.3.6.crate 9663 BLAKE2B ca7a1f4d3cbedbee0ba0a3f19c4b3352ff90927eef744b7e4f1d60855d4dc4265202972e81e0fc06d1222d8d5fb322efc4ef669af7396b251248a1e45c91def2 SHA512 e900aa3b001df0fdbf1f543d8b679af317e85a1f95e26fc556213f2826a4f6c82d8c4f3f82de435e3591f8bc14e78eb22668d901dcbe2287f46740e0291afacd
 DIST indoc-impl-0.3.6.crate 7933 BLAKE2B 93e232e360e8f02943ef9a9cabf16bc863d792d8096b8d9a13a07f0b7b396db590abf83b5444f082317059dad7578ffae974dbc8a7e56fbdbab817b7d2534725 SHA512 18406587ee56a09dd2062cee456af697efa903343de42c0ff618a64ddf2bf7efed5da02e7220fed2636c555a6ae18059018f5c3c9b44ba8d3e5a34ea5b53c806
-DIST instant-0.1.11.crate 5408 BLAKE2B ea26c11694002f667b5c42a93feb9acacaf7824a7f618809c56d0916dd8f9b045a544fdb793aa5a64b1cef00a648bbf71e6addaff69829563bf09a7525c62bf2 SHA512 659eefd86f9aae74c96bb3f1359b92052c43a4d589b3a591d76c0d4298adb53a013a0a811b0fb5caf588aa093a51589aa63bcfb7450b8cd6edc0d73a4ed169b3
 DIST instant-0.1.12.crate 6128 BLAKE2B 728923f757c1ee4e4a7afb90e460eed81392068961240a538e5c6468e15a0b6491f590fb5f6cc46e6d78901ca232351f65abb9f2f230d8f4983c5e58c4011902 SHA512 fae494c00111c51c840f9dd6a10febe403e27ebb933dd16633a213e9c20f2bc11adeb431c71f8a6713bf88f270a010941e15d83df294e658791934f83a5d2407
 DIST instant-0.1.9.crate 5213 BLAKE2B fe208faa09852079c603930e88b7d0392a89a55d3b934ad45ffb0c9e44df5ef7e8189ba2fa12452f1c8a6416d6f7c0655365ba959bedf2b78228613944be8278 SHA512 3915f67c3629ec93296d56c4cda0cf97b29b1a70930a9d546abb9518139d4c2f35062563a5094e84841ddb1f00b0f3df9dc00801d96c01994765221edf03ef7c
 DIST inventory-0.1.10.crate 11572 BLAKE2B 8b5044c9996fd53f726652617ad7f25e3c57e5c54aac12edf0c2b41ec7d4d9388e37d8613a7e39301130d9ce4f3412b48380fa9e04bba8229d5ed2ce383a8879 SHA512 5c5f34ab3ef5b89b27a353ac5c570b9f2970288f10ae3dcaf7356ef48affcba8ae7d17406206c88e319a95f133ae69a33d43b219814b682df34219bd0cfd5eae
 DIST inventory-impl-0.1.10.crate 6228 BLAKE2B 4aa7cddfc306e192ca635e5d32fa9cc61d59824f24bbc67ad6b6996578ca0fecf8e7d04e970720b9261eaef2977dd0773ac1eed35ddffe6c075a6d92007fc276 SHA512 860cb40c77d269b8f8c71db96ee71917a33f8d9b7ed5f24e06e38d0adc5e93dad73ee6688627798cabc7536c42c519788d74ee3bc8abb13b754f7e70be663a32
 DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8
-DIST libc-0.2.103.crate 540563 BLAKE2B cc99ae88783e6f3044ecec5154e0de81a7f792b89415cc2736eb4a436edd316277d690971c4aa0eff7935b5a355c8966805c4ee72c5fec8caecf65a29c13caf9 SHA512 79e1c99bfeb30283f85742cf17867000301bbe022c6b2ace415b4a767068dd64b09581bcc802d42150e45849f5adf8ee2720a0c695324d87d3d96a5c554a216d
 DIST libc-0.2.106.crate 554765 BLAKE2B 06e33a62555369d84a47bf5822f3e9b1762bd69ae0a75abc483ee2b1e9427c60452af11c39a079526ce5bd8e71789fef6b693511ed9fbfd20b31f98f4f929b9a SHA512 8e80cc41c8373b9228d1d21bf5de3f14aaa9ed4eb5aed337041e561f821db0d1a5936d676368443ad2009ed684aa8f0c7762def02df25a891f57288e7e6af2ec
+DIST libc-0.2.107.crate 554639 BLAKE2B 583cc24943707bbd53823f15fddfececd7acadb5a4d7dc5d0eb07d7b4d851b93500f1e4081b70c6ce3cc76700bdd6c4173ba710fdd52af7776ec7f31aefa3714 SHA512 df1586889c97d45c95f47495f8285c273c143f1861e632b326345ee66da63c227c064d9e12a6a1b48cfb866c70010a4ad407fed120a1a808da7a345777a8f909
 DIST libc-0.2.94.crate 511713 BLAKE2B 6ad3fe9aa5ea5fb06a7b2beeb68fa245e5ed7d19aa7e4b21c9e2ab73da11a9249913e604f0f87fbcc82676cceee16f14403cd2f27ae462730e1682c539666283 SHA512 316717d2e46b57c200d67d0ebb4fb162cb1f0b688895b9eb6075924cda3be8ba7fae85319692682178b6fc5cb2764e8b3a9d3e7ce234fd8a21a0a9c453ca174c
 DIST lock_api-0.4.4.crate 20356 BLAKE2B 1b4a648467eba49232df5c595d7c5a0444018269a67db1768c7711d9d1a903a1dd00f99d8654c30186a470c035abdcec9994c8b1a347fc559c684b1792ec7f49 SHA512 655c8a1503b6e7f833b4c62109e1c5005727054847bff81e17d4159f91c02ac97512da0673ab227d17bc9ed0342fe3476247daf74cbc9a0b470e68c648ba706e
 DIST lock_api-0.4.5.crate 25199 BLAKE2B c91adefaa0dc3efa786957794b67cf219f5159909179282c13c7e3b68d73a0acebac29438cfcb39b75cbe87bc181e981ab4ff2776134621d8ea92e7a6aaf966a SHA512 d6cd948a4183a73e8b91b9167d551e72dd75820c76123fb0839f8389c7872d2c46dbcf5785d7600ecc4e27f3d214f476585b9c39e85f70500eb8d012e5ff9535
 DIST num-integer-0.1.44.crate 22216 BLAKE2B e1c08427e006cde6f2084adadb6086e87e6d6f8bb8dfa757a8228aa671e862a366e4bd8ca5e0500008c18bab128aead9bd5b1e53568a4f40afadcaf3882ee98f SHA512 d07e27ede02a1d007373935fd91e57a26e0e84ae14bbe24be66763baae6850788bd64ad2598d2bde4f4fad6c8a4675c40bfe0927164b16b9b69de5e9a83d9771
 DIST num-traits-0.2.14.crate 45476 BLAKE2B ae310d9d5640acc3e45e1e5d1d2f519539795922c0058ee940c94c94b6654b39358b7c18dd23a276f2c1b16a30dd4de4cbc8575bcda6a5c11e70665d670e6439 SHA512 c3028eca9f7b718de0db3a36cf3e462bdba43562d52c9b809ed4cc0aa6af403aea542d6d4da743cd1dd541397815a3c5a84cef4d6e40122994e4be6a62319b2e
 DIST once_cell-1.8.0.crate 28925 BLAKE2B 7681b1a7497b5711e663773c1a7e076f333c06c10d3f289079a781c36f050c1620cc279742ea8e5b15ec48f3d6038a6079bbda7fee3ae8e1128bd916d53ed43a SHA512 88e55c9433225ce85a08353168c87fca2237615482160a5c28f3ac17f06d48c63e0c21b5f7ef81f82ca133436e371802ea099453844f1c111003bcb6ba89e827
-DIST ouroboros-0.11.1.crate 5929 BLAKE2B 6f786c06bcc751f7e7857808d6f7fe14beb1fe96957ab360d86276918ebee48a70f4ac886c3355c849db34d4a2a5ecc31bf04625553e8b435c0ab8ebc5066e66 SHA512 072aaf12a8c0a9aa4c17db26787d06d2e0f292618674638adc35d0a80ea56556c9c42652ea8c44582c9bf028fdbf0f4ba841d946649a2e7c401c600a3a236daa
 DIST ouroboros-0.13.0.crate 5929 BLAKE2B ff54f4ed318f7a1875612a4ed5762c60de516f43825f0ecf23e5343958e5c8af68ae4aecc1daf913e58d21183ac037af047be015ef1e5c227ab4750e763ed4ab SHA512 3f5bbf3b9bcb7c8e8f5723ead9d7bc205137973efe7ffe474db707264c4b65e4645d9b9de87e515a1e55831f64d4be719ff7059cf8ed899a71548e3fbfcb0b42
-DIST ouroboros_macro-0.11.1.crate 15355 BLAKE2B 093e8395f4fc17a656b601967bdd8a67308cad04e1e49d4fe5d7645c62787b36585be09351e52048c0f2f57933ab03c86327abc380aad2baf992c647322607d9 SHA512 fc1554b70ba1aa71b85d7c3e406664633511619e75c21371c39d50bdabdbf87522c60fff03f4d4e1d33a1dc387cf22572f3f67d2375b071eaabb497cc73fe6d3
 DIST ouroboros_macro-0.13.0.crate 15755 BLAKE2B 16b65a6417ef147d15083c51c96b382a96a71fae124f1baae91432c5de7585edf7ca3f3f8e35b303d3e3c17a411f740d1dccc3382d541c0e7ded22bda81a838e SHA512 976a548c0691f04f797f10a89da2ac4e1d84efca2876308a9b69d8513bfcfcbd5e07cdb62584b80ba83d5839e14b072bf331ecbd1c20fd65e1c2d731f947ce05
 DIST parking_lot-0.11.1.crate 39854 BLAKE2B 5a097d7016811de4ca7d21e8a811a96b2e857b5224b176cf7a3bc160c0a0678c9100423e3c096c5056e2df3a4dcba17a590cc64eb1d648355c153c5cdf9db228 SHA512 17e394ac8b62656177a12fcfd246d9bb59be468a5ac174e4d6d8b4ffd0411497d3ce943ca5deab184cebf5c1bbca97b4273f79bf210c78d7f4b6f5e9d68026a2
 DIST parking_lot-0.11.2.crate 39869 BLAKE2B 67c555e87b68f5763a7790563fd8d542e126bcb77f91267f3b76c51fd73060a2c32dcb91f9d0db7ea772e555d91576c8d7ff48053a9c35fbd3b749d2459a660c SHA512 526b176363dffa59501c18324bb723a3846ef5b0ff9bf1d890e40ad10e7023284f7c8012eda87520eaa94515ee828d9ef52692a9ed590a55e176383d6d472f9e
@@ -45,25 +42,23 @@ DIST parking_lot_core-0.8.3.crate 32147 BLAKE2B 5218cfbff706c4388fef31c885c7a5d5
 DIST parking_lot_core-0.8.5.crate 32466 BLAKE2B 44d9cb65444ea93fded7e216e3bdbe2256ba1611f5cb6f80d67a01e71d428b81e6c7fc73cb928e2125f34bac0abf4d1da39f622e813dff89b01fed7632308b7e SHA512 c4315df551748d1ae77655e4d9f8c90f911498856e5358009e9e02e410bb8085f006f369188b0753a298371ebd74a5c383d848b65e31b55f3462381308c83a00
 DIST paste-0.1.18.crate 12259 BLAKE2B ed72b93a27166b0989743c2528d4a41f4b87ffdd0c588557d11a5f37f85d5b8f03ced86150af6209f9fa8d0f6efee705769b26a2f4dc3363f35cc3ac12c0e6ad SHA512 a4d9c75f6f358d6c86eb0a66cdf22eedec180db37358ca2870a992e215d5b389b7991837d8f2769742ac1b093674cb4352ef9d6754a249253472fbcb3a81c001
 DIST paste-impl-0.1.18.crate 9451 BLAKE2B e465c4c7eef44d02eb1b61b5290090513607b452f4adc11487947b7047ddc44905d7a02df827feb2142f0e74583afdd9648c1c66086f10e1bd861b663200bf8c SHA512 c635efee46cb251b76ee9427432f81a0d944cdf1d0a95693d824c6085e7dea7e1e3f48c692ae27946f69e4e78d8080220058acf98e5c8a78482007349f8a7a4b
-DIST pem-0.8.3.crate 9395 BLAKE2B 7d4cf8a8b3e55ca8fe39bc65c6616c5ea0f91bda666493688d98e06ea9fc3c83d0b0a1a10b4c5deff685efe2f9858f63fab765b82a1c79d1d5412a5e6a706dc1 SHA512 30421492b14ca94ad8bf7e3d80315f2cbc129fac18655f33e2866e4de20201f9b3e9109c273c5bcd7b45ecc0ccdb8f7e6d8ead07278890d1a043688752f572cb
 DIST pem-1.0.1.crate 9669 BLAKE2B fd75f3a45125e1510a65edbec9125c8b33fc4db6aecd8e375ba29e9d55ac67d81f51b8c780888ec0f47e9b7df18b42394db8bdbb597e85767a5098b78575a19b SHA512 1464c572b6b100294b0992c5cee6cb12774d4b7199436580f502960bfdbacac0f8824915d2c7bac8c4d998ba87b1551a1f3c2b68eb298df62c261766b5d0cb5f
 DIST proc-macro-error-1.0.4.crate 25293 BLAKE2B ef918c5efaf2545ab38787c8d0c07315af00431139e4dff66346bf798e3a429f91d12a79776c150412fdda0b158a72badd5e1044ac4d6917f8482d4b5a7110b7 SHA512 8a47bc9d3e24e9561d1e384d8f5a633284c2cf9b5e6733c5f9d1dbfe1870ccc8e2152482852e50b551cecb68e009148585b910ffb0508a7b4875598eaf8657db
 DIST proc-macro-error-attr-1.0.4.crate 7971 BLAKE2B 98e2925881c2be186e22c2c439697e91d43f807eb61a5d13e3b0b4321ed50a74f3d699942c04b89b6fea0f156bb5d19ebcf22f9cd4b98a7e6917c437600ed823 SHA512 2606afa9ec78d7dad4500c98d3a5ecbd02c6b53ab829c742bed7f57b322a95238ab4e01cf268746815f1424fd9b02eddfa30e72f98c66106f57765f3d3116495
 DIST proc-macro-hack-0.5.19.crate 15556 BLAKE2B 98c22fc3e5f5fa8b6f44d15de42b6ffcc82ba3f98a07ffa48bcbc5d3abcfca6af136c5d0d8c7f1ca34261ed8f8c9c17a394231f97a4c342c81aa7f8b9e74b203 SHA512 9e4cbec41056438287f5b23086264c86e2f0cdc193064006556736377b2954229de13a585149b9995002c9aee3334ee2a80ae4afdcc96cabe7ed2bf718476952
 DIST proc-macro2-1.0.26.crate 38233 BLAKE2B e44a5d98fbf75130c0eeb8fad6d025ce66fe41cc5ef882f418bd8c9e5d228d712020e309dad68e2f862e5f9216a1103fd6e69953e17c213166467b335f604802 SHA512 e6d39cc0d5ec644e3fb424347bde0a82a8ce8549745a1a827bf4dc21f6248471935b5499c3b6d1b7a129f0ddc560754254c528ac39fb1fce2ec3bd9520afc3e2
-DIST proc-macro2-1.0.29.crate 38772 BLAKE2B 742c2602afc4beddc96b688d105fd93b1dbdb3cfced724aaf542e97120d374d334e90cfbf02ab62741dd052a272dc583b7d2e1992da3d1b8ff260414c65ac89e SHA512 b3b3b7c6988afeb92209c7e0362f45f9c207611a74bb63bc7746b86fb9ab0d74fea9e7a2d9bc8ac943225ea439540726ffc13711dc5bcb056c1821fc99e8dc63
 DIST proc-macro2-1.0.32.crate 41003 BLAKE2B e8da70dae2ee75aa2c344602e55cbbf9ee5316ff6182c870b64f9fe4b33e60b9fb1a22137acf357615331f2e4079ab1e8964a2cb0234fa439d1b3d8d514c2eff SHA512 8631714c226c8a6fb330a529f42214216057eca85cfa63afd3de8600d2638e2be45efa54155ce73625883bcbabc2c56cb865ad9dda04e2c7092d955caed48abf
 DIST pyo3-0.13.2.crate 281372 BLAKE2B 22ffcd9fa239efc205e5efcefb6ffbe99a979209aca357174e461826ae8edc1824da820df04bd8af4d07afd550b6a03fce75bc24e83970e7d2ec8cdc0aa17dca SHA512 3d4198a60e9c3abc619e5cac7198288bde294a789b6f84ec87a411d5eaad93d5d55043e8ec218cb0aa09a7289be7fd5bfa0b74be188e2b67c6c646cc2aec66d3
-DIST pyo3-0.14.5.crate 330805 BLAKE2B 6ab0b487da4986a91c4360b2f5783fe77514d99ab79aa4fac18c4889e1f0077cf3d58ada0762d96c1cb7c93a6f2f0ebbe852ea881a23b1b5b39f6b974cc965b7 SHA512 050cf757cf3d07dad46af1bfb0a0fc4b4b7ef677af15d2119ef3eb83cf0bcaa02540c7e5c04a0c0653813e6041221754d3af6b6ac6041e9287fb9d50121c5b35
 DIST pyo3-0.15.0.crate 363718 BLAKE2B 06c11156f56fcb96ea615c9b10cfa64b601ddc8510f05b9c248fc47b9a03c2cc2d92e27e04a58c39fbb1ff7d04916fcf0e6a301c3cc48260574860631eff58ae SHA512 cbc3a1663a7da9ba651f896726ec12f29376acfe7b8a201b5847117a02b1a954301efbee69308bd154ad5493bbfec665e959ae61f160cb1a15d3ebecc6e47c4a
-DIST pyo3-build-config-0.14.5.crate 21440 BLAKE2B 8f0529a38b35893f82461d18c456eea1791c410c3af391443df892b897fb3f98d06bc802fd5a3c4750464fc91b532e703322c6637960e8c5bafd6f21ca0de61f SHA512 d955296d122219f5b06e29c23ec9f384e0f3aba2c5300d355fe755472de855e1ccb0393aafaae31288676d6fe85a936e61ce5f9232fcdda2366e865f28eacdea
+DIST pyo3-0.15.1.crate 370722 BLAKE2B b755c93d8dca8e778b886ed1d16e83ddca483d0f6c932b3241edb2e1211306cb0257d2a6bc31ba4298335f277898e59aad67e9f675ed4ad9a2bb9d596400bda3 SHA512 9168911db76f2c9629615c997accfc4234bf91cc72293dcdb3db14b4e93f93af9df3b3aa7900384121719aeda4a0b6dd68c0cb380bfe5424724b0be5303c02e6
 DIST pyo3-build-config-0.15.0.crate 22033 BLAKE2B 31ea8684caf4a5157390542ab9f5ae5eeb512fab88e3456ff56d9699eb7b16fa382c45dbef03acfd4901904a460e65d5f0242245b6d13237d37a99da51d385f7 SHA512 82c3dd527d879558487f9369c2f201be9860199393bfa90838dcc5f991fc40be6ac457a766081dd24f516f160d1f567529601dde41a9f3f61c981dceedb8275e
+DIST pyo3-build-config-0.15.1.crate 22095 BLAKE2B 47803b389f30f15f487daf96d32e374ebc83b1b41ddee1d2dcadd1a0fbaef40c4c1af2312b86ec085637e3192b1bd213c93b5f4e8dee173d81e510f480fa6953 SHA512 a9aae6bb4a4a56f7857262276bf1c95510912a367e32470b871f2fe2d6adbffd87247ed2e3b5fa2dfd273a3b0e139d92f25f3228e15c6d8c206c6ba919f38a9c
 DIST pyo3-macros-0.13.2.crate 5434 BLAKE2B 881b49ad2f6dbf0f60f7d9d648beb1b2f10266ede0f2d893e4bf0fa574563933f3540f93eabfa31ff2a73970e1a86d0ec1103ce7c0dc565670ad16bd99d10986 SHA512 3847c60f9e3f7150f46e68164fd35582994597eefcc70542ecf95afc7411785cea5b0eedd978b1c4baf2067ff8f2cdd93778affc82e11dcb264c09ba6ea0d788
-DIST pyo3-macros-0.14.5.crate 7658 BLAKE2B 7ebadd9c391b4171768df6493ba7ab6e70d2a34ab0d728f1b3b91caa6a0a0fae2274c613bc4c231673a7e37fc33b12a9d2da109e894d44761e61d37d76b6fb33 SHA512 6a4870f7a5fa0ad156a08999395136430dfaa2253fb73089ca3a37094f548c01e2989aab47738fe3705033df8ec4fc76de4242465b0a842974d66471ca152b2a
 DIST pyo3-macros-0.15.0.crate 7488 BLAKE2B d515acb7f0649a0912d8a977da612d5b3fd938f2c27ec9aa4c3b336af43d54a594162d3c5c7079d4129646ce13ed93548aab6fed96b61c6a26073e66b60dd235 SHA512 b2ba7f2a68b65f442fbdc7fd27121e8beca0a0499d1a0682f4e4108f0bf19ef3f8a8b3366cee01170c3db9c1e3d334b9313c467fb2c944b0d5eca0ed84995cc4
+DIST pyo3-macros-0.15.1.crate 7555 BLAKE2B c7d87c150678efbb5dd6ef98da9997676ef3e7f8628a79f01a3ecbf94cc8b2d0752573d894fd769fb8791f30bcfd03a5c9f76cce73c00be90c1488faed63198d SHA512 1969b5ec6dd26ff2d534fe43143e44b91b66e05c61281b64f96fda47ff7826f625c658412d7587520df7455a67cd970a9aa49c7544ffb70a425314a0cff65060
 DIST pyo3-macros-backend-0.13.2.crate 33106 BLAKE2B df7d9cbb06932c7d01f809bb5cc9230a680f0da7f1231a1c509a7338713722a1a35e456faa81a36d21a16612a1c611b6ce5d018c87210b59e4153ba0addab568 SHA512 ee136e214a6f06b6dccec378d6a73a318408cd55795ffb00c18428b40cca1e2f45c3a98e85c82c68f0f2715b8187237f2bb3dd1e94b95288e2bed1bf6a6d042e
-DIST pyo3-macros-backend-0.14.5.crate 39447 BLAKE2B f7ff78088d490f95d77537a15954c90faf444a275091fdb081677c4890323e2822ef9f5bb7125f2e08c2362bd66ce6b74dd74f8c9e828cda18fec20d24c517e5 SHA512 8ae85d7846c06b6b68c74309b79c0edf5b608f443b1ece7a30a56df62f1d74c0910ccc1cfa460ef1954c7f978772b94827f50dca6165760acf76b0015d357011
 DIST pyo3-macros-backend-0.15.0.crate 45520 BLAKE2B d9b1e936ddf578b1803432bb564a9bc1e37bfcd6c4fe0efade474c1fd07ab13c83a4b9ecab8de15220dd70efe07894869c822f53a9235ef184740e9e4f82319b SHA512 8fffbc3b7649b530827dc77395fb925c1c97d09fa624c2e41febeacfcad25dfccf9d60f21b5e65430a18a106dce0f1d943a694f8790473137a02b632f9cc7e9c
+DIST pyo3-macros-backend-0.15.1.crate 46111 BLAKE2B fabde516114a001e7f9ec1a1f422c5819ad5bceb4db36ecf2ef5dfde397d4d3c7dc7a8acf11cafde4156594e90a4f95d51dbefa43ee8bc172441d3f81eb299b2 SHA512 6c62fd1bc50666f63f9854947e9d88ae385159d90d026e0179d91aa151fef8403b23f55eab6f3340b1455b23d411083780c49198afacc267b49a52ee9c4999a4
 DIST quote-1.0.10.crate 29960 BLAKE2B fbd4e3e0e0f452e64b30399fdfaef318cead505d05f0c61db61a7aa3cd5a3300220b4ba2656603f88bc0b535390ab4d0ec101a919ace1d442a3e979f08e8d48f SHA512 08613679b564ea7d750117d3a2907ba957d5d595bdfa8016344f99a232c72c6b08acb882dff45c34c9e4c8f93f879fb308b36125572722aac04fbc6bb0c666f0
 DIST quote-1.0.9.crate 25042 BLAKE2B 26ef31e89fd2f0cc21ff65f8072f30c7977ac634d2536cf9845a0894d6659f62a96cd0a6ee48f7706036c2c1b898ef8c9167bd62714ad0c9cba4fb02f30922af SHA512 dd6cdaea183b85400531ef01e56657edbec0d8f7c27898c1e591b72dff755fa5875b33ca320bd65be0e9aecfc6a61ec119a4bd1291e9f2057fca642ab5b198c8
 DIST redox_syscall-0.2.10.crate 23582 BLAKE2B 7253dd96415e7b70df488c208d86c250c670b1245ac6573a59085faabbde9e33fabfacd233e7d737e365493db14008c180274b41ea0a4af5f6f98eec666a873f SHA512 ef012eb4bffe32119e50ecdbef4cc31f6e84a344e94f026484fe4e2c904f94053a8b6249fb6bd8ada31b3ecfbf0096085283bb68aeb62b1b01b57f35794aee92
@@ -75,7 +70,6 @@ DIST smallvec-1.6.1.crate 26444 BLAKE2B ca6c50a63acdd93a2131654d99e50545a6e2d08e
 DIST smallvec-1.7.0.crate 27459 BLAKE2B a740a4b7448a4c8d1bef59cfb6dc9a52145e40eeb38028c64c880f31800cd3a4cb8be17394742239dfa7fb692c749f9edf70e6df02abd7a1bff288eec38ba24e SHA512 d061e0059cd6bd1636424374848aa1d4edd21f75605844a7855ff5d343dbdb71e6eb14bd70de7947ae7ab58f04ff096a5e77aa9a1ac14cef59f657685c846156
 DIST stable_deref_trait-1.2.0.crate 8054 BLAKE2B 287a65c3e5b47213544a43e57c60a54add60b4c2e3c8d042407d860cc950ba7ca01a2e67ce56aed6744992b61ec1f9aed3321e3d88482e33129548b7d51df205 SHA512 a13cfb22723f1f2cf089b2d07d657846f50c37bc0438d1a76096bea30214cad226b7a422c21f9e191ce87071da8a141d61882aedf9e0203a5fffdfda86a5fb03
 DIST syn-1.0.72.crate 232500 BLAKE2B 8f71f7fb66426f78eec3439688b0468fbef582c8ca912781f19607acd9e8371f2230b305a96f613c16f7299e66fdb2395dc037e1093d3897864bd2bf50ab3d7e SHA512 f01e2ef74fc3f84a753c1c379c24e3c63f3c575d72ab865f8e7d51f4dee4293ac8197b4e123ebaa942e9199bf0a0d8194e57a5aa6314bee6951d3d458dfc3da9
-DIST syn-1.0.77.crate 233424 BLAKE2B 8738d1940d538c48d2ae469af1e48a33364a47a0b4af6edb4bb6de5d1fb1330757a488d6fbd6bf4711cb04761f37f9c2be13a09bded867b4b229e7123dc7805a SHA512 3e5ef87be2f3fefac57e011447c9902c779ed67c88919021e6d24540e1a22f4308acfe8b92bb78cc83069d8fa03429985f9b14c8bd185af8fabc6e78213322e7
 DIST syn-1.0.81.crate 234144 BLAKE2B 7258c4a0ad0eb0c807912c297233eeb195d22b44cb2078e13e43eb90f1c82ecda6f7672ab072832ce130ccb953c1bb23c8440a3df77b714f462fe39cc6e6e1a3 SHA512 288ddaf4dc5ad2fdb3bc36800d94b53e2bfe9ac74a61a5d158bfcad3728955bebac6a900a5881c7d4abde4f3759515a1dd877e1421c226b85aff99a5ee649390
 DIST unicode-xid-0.2.2.crate 14955 BLAKE2B 6c6da49ac08dbd8b3248272224d6bff96b9cd1f36029b1937a58a0b929c3a48326053305ed49e73edd70f572f5abbc4817cedc899c69e3457805ad056669f6af SHA512 92ffd0dd34e3ca235ecf110b38c447d3ec1faa23d76c112457f28d432f92fa6b5f428bc5e1bfd278f361f55426dd96e19ecb0d3eff6cf250892f069c52bd89a8
 DIST unindent-0.1.7.crate 8346 BLAKE2B cbf76fd18e49332e61275ab204cef1fc4dee58091307f8cbe2107d3a8441551055541583f1d643d4d15f9cc17a8405f540f0c53548f5b2379dd70791a03640cb SHA512 d3f4543f97f1386f63306a206074de1d10077ae968ea6eb6638545eeaf8cef662e1c84a15788e9df640eeb6af4cbc187721ec01af43984e4eeb2dfb0423c6d70
diff --git a/dev-python/cryptography/cryptography-35.0.0.ebuild b/dev-python/cryptography/cryptography-36.0.0.ebuild
index 97d93103a31c..800a532ee0e7 100644
--- a/dev-python/cryptography/cryptography-35.0.0.ebuild
+++ b/dev-python/cryptography/cryptography-36.0.0.ebuild
@@ -6,13 +6,11 @@ CARGO_OPTIONAL=yes
 PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
 PYTHON_REQ_USE="threads(+)"
 
-#CRYPTOGRAPHY_SRC_HASH=c7fbef767a94ee1569ae0630006fdb144d6a4e8d
-
 CRATES="
 Inflector-0.11.4
 aliasable-0.1.3
-asn1-0.6.4
-asn1_derive-0.6.4
+asn1-0.8.7
+asn1_derive-0.8.7
 autocfg-1.0.1
 base64-0.13.0
 bitflags-1.3.2
@@ -20,36 +18,36 @@ cfg-if-1.0.0
 chrono-0.4.19
 indoc-0.3.6
 indoc-impl-0.3.6
-instant-0.1.11
+instant-0.1.12
 lazy_static-1.4.0
-libc-0.2.103
+libc-0.2.107
 lock_api-0.4.5
 num-integer-0.1.44
 num-traits-0.2.14
 once_cell-1.8.0
-ouroboros-0.11.1
-ouroboros_macro-0.11.1
+ouroboros-0.13.0
+ouroboros_macro-0.13.0
 parking_lot-0.11.2
 parking_lot_core-0.8.5
 paste-0.1.18
 paste-impl-0.1.18
-pem-0.8.3
+pem-1.0.1
 proc-macro-error-1.0.4
 proc-macro-error-attr-1.0.4
 proc-macro-hack-0.5.19
-proc-macro2-1.0.29
-pyo3-0.14.5
-pyo3-build-config-0.14.5
-pyo3-macros-0.14.5
-pyo3-macros-backend-0.14.5
-quote-1.0.9
+proc-macro2-1.0.32
+pyo3-0.15.1
+pyo3-build-config-0.15.1
+pyo3-macros-0.15.1
+pyo3-macros-backend-0.15.1
+quote-1.0.10
 redox_syscall-0.2.10
 regex-1.5.4
 regex-syntax-0.6.25
 scopeguard-1.1.0
 smallvec-1.7.0
 stable_deref_trait-1.2.0
-syn-1.0.77
+syn-1.0.81
 unicode-xid-0.2.2
 unindent-0.1.7
 version_check-0.9.3
@@ -57,13 +55,12 @@ winapi-0.3.9
 winapi-i686-pc-windows-gnu-0.4.0
 winapi-x86_64-pc-windows-gnu-0.4.0
 "
-
 inherit cargo distutils-r1 multiprocessing
 
+GIT_TAG="5d21990c32d0f93df4e54ef4ee7ff3a2dae3c3da"
 DESCRIPTION="Library providing cryptographic recipes and primitives"
 HOMEPAGE="https://github.com/pyca/cryptography/ https://pypi.org/project/cryptography/"
-#SRC_URI="https://github.com/pyca/${PN}/archive/${CRYPTOGRAPHY_SRC_HASH}.tar.gz -> ${PF}.tar.gz
-SRC_URI="https://github.com/pyca/cryptography/archive/refs/tags/${PV}.tar.gz -> ${PF}.tar.gz
+SRC_URI="https://github.com/pyca/cryptography/archive/${GIT_TAG}.tar.gz -> ${PN}-${GIT_TAG}.tar.gz
 	$(cargo_crate_uris ${CRATES})"
 
 # MIT and BSD-3-Clause come from rust dependencies, some dependencies are also Apache 2.0 exclusively,
@@ -75,7 +72,7 @@ IUSE="libressl"
 
 DEPEND="
 	!libressl? ( >=dev-libs/openssl-1.0.2o-r6:0= )
-	libressl? ( <dev-libs/libressl-3.4.0:0= )
+	libressl? ( dev-libs/libressl:0= )
 "
 RDEPEND="
 	$(python_gen_cond_dep '
@@ -96,10 +93,9 @@ BDEPEND="
 	)
 "
 
-#S="${WORKDIR}/cryptography-${CRYPTOGRAPHY_SRC_HASH}"
-
 # Files built without CFLAGS/LDFLAGS, acceptable for rust
 QA_FLAGS_IGNORED="usr/lib.*/py.*/site-packages/cryptography/hazmat/bindings/_rust.abi3.so"
+S="${WORKDIR}/${PN}-${GIT_TAG}"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/hypothesis/Manifest b/dev-python/hypothesis/Manifest
index 46a4550d4db2..c3dd5541b91b 100644
--- a/dev-python/hypothesis/Manifest
+++ b/dev-python/hypothesis/Manifest
@@ -4,3 +4,4 @@ DIST hypothesis-python-6.24.5.tar.gz 9168940 BLAKE2B 719efd5c307708f3fa205e2096e
 DIST hypothesis-python-6.24.6.tar.gz 9169209 BLAKE2B 448eedad86d41c766d2bb450f18965592e5f8c53bfc341a081591ae916be00e2a9d5e82633059753e6c47b7905cb09a94e634463cd90bd65c87598f8d92bc58c SHA512 6cd13eb1bf33d5a72debbc262f691949b60ee8bcf6a1c3c263a55b4cc4498c1bd0568088f541ef68152219e9a12d7cfd2a53a3d37a6bba0cec7b2b57b4500e42
 DIST hypothesis-python-6.25.0.tar.gz 9170363 BLAKE2B 505aebee64882de9516a653d7906b0d739d2077fd3d2d5bffa2532111d37ca4cdd62ce768dfedf9b9987d1750af7851a015d7feafbed77ab131d15e62f8ec6f1 SHA512 a22ee5632d77dd7c3570b4c5b9faa04c2ee6e7f101d87a3046ee5206b8a444367311573d39c02b12a6ec5b626ab8b89b523bed7e387da59ee3d673601e3f8015
 DIST hypothesis-python-6.27.0.tar.gz 9172229 BLAKE2B e5d69923579877a4abaa740663a36510452e10cb782c1c239db03ae22bad9898ba881d808d33ecedaf9319130e619ccadfe87ad9719b1fb05bbcbcd9683d8bba SHA512 54083e0fff2e1af8d3cd91b0e059565091e63058029a501a098228a5b1a411fe652ac542e847c0b03407f9b3f27ca5358b43b15740d6e9e0c882c94ef9e48bad
+DIST hypothesis-python-6.27.1.tar.gz 9173425 BLAKE2B 0fa35a863cbddb9bdd592622247abe7a9bdfc6e4624d1a0913b58a47c29d4c507a1aee8f29f9b6080628894a41140801f567bd5b5f1e83b5505b33089992e10b SHA512 3e2f1d4d268f998ccb6bf3784844d82ff3f276074b13c82fabf87a98441764dcbab576348e77ef4c71cd5f6839f92f978e52571f7e290efc680df984eb2ddebe
diff --git a/dev-python/hypothesis/hypothesis-6.27.1.ebuild b/dev-python/hypothesis/hypothesis-6.27.1.ebuild
new file mode 100644
index 000000000000..8b48444a4699
--- /dev/null
+++ b/dev-python/hypothesis/hypothesis-6.27.1.ebuild
@@ -0,0 +1,62 @@
+# 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 ~m68k ~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() {
+	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/iso8601/Manifest b/dev-python/iso8601/Manifest
index 4b619f9e4e59..7265d903a4be 100644
--- a/dev-python/iso8601/Manifest
+++ b/dev-python/iso8601/Manifest
@@ -1,2 +1,3 @@
 DIST iso8601-0.1.16.tar.gz 19599 BLAKE2B ea09dc8f2d339de895e420e1efd6207b7138ba34b37186d86df099fc404a2880b146e20b904cddb69e4dbe777c56b41ad6e04191da8d2062d87b37af4e61c124 SHA512 b049de4c5fb21bca2e3183e82c86149ac7cab684ad8c7281cb8ffc2c0e53a86b00f68f260cff659c19f8814a35970462d2dbd06b21bbc42ed1507b583df7e25e
 DIST iso8601-1.0.0.tar.gz 12294 BLAKE2B 71983fdb2d47dd4699af60ee8bb31e94c1b4aab91aad6b107896429ddccc8dd087c955df812ca088667a082febd5f65fdf3c2cb10974f14e32d0f9605ce0c13b SHA512 137fdbe891889428331883c745fc341b7b066e681d7ffa339bd3484663974f35ac0d9f25eaa438603c8d982821832f8f2fddb2a3906889e62affda6d8cfb38e6
+DIST iso8601-1.0.1.tar.gz 12525 BLAKE2B d5211464ad2e4774b25964a38eea95b63bc5fa7619f3d4e40326242b51340a3bc89d690b8112373450d183235ae3cca2888f2f17d604a730f965f04e73d5d331 SHA512 45e18b80b543fb0f9869810378ccaf17e46e046c2739901e881fb40a5b99315fdf893567e50e68a243ae72e268339ed486c07dbc98539904e4096d3357dca04d
diff --git a/dev-python/iso8601/iso8601-1.0.1.ebuild b/dev-python/iso8601/iso8601-1.0.1.ebuild
new file mode 100644
index 000000000000..2cdf8bf83102
--- /dev/null
+++ b/dev-python/iso8601/iso8601-1.0.1.ebuild
@@ -0,0 +1,19 @@
+# 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} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Simple module to parse ISO 8601 dates"
+HOMEPAGE="https://pypi.org/project/iso8601/"
+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 ~x64-solaris"
+
+distutils_enable_tests pytest
diff --git a/dev-python/jupyter_client/Manifest b/dev-python/jupyter_client/Manifest
index eebfe0039ef6..b07246c99a7c 100644
--- a/dev-python/jupyter_client/Manifest
+++ b/dev-python/jupyter_client/Manifest
@@ -1,2 +1,3 @@
 DIST jupyter_client-6.1.12.tar.gz 301499 BLAKE2B 8041b84ad2e89413ee60d1aee2e49a67a89b5aad1c3118c8fa7d7d719c8ec2acbc72278c9aaea095cdcb89235800d09b1792b2138c09a4aad59ceaaf695af431 SHA512 f31ff1a24b264c32d35d07491785e1d77935cdb463243e90e4aadcb0a093a074cdce75f01662591766588f39b146077639ca697f71157309dc92f12ae04d5cdd
 DIST jupyter_client-7.0.6.tar.gz 320572 BLAKE2B 5c853fbdad3bc044ffaba27534d9bc4682797660cdb5d45121ae8f6cbf0fc5511c6a9fad14d26bd82daef17b32be14e51bf86c2ae672ed9b310141b29307ff9c SHA512 c836ba061da0461d6d27eb0405ba295ff67bf2c99011a21c9695da139c0a14513de292cdfff3ee00c2e1029c2a51f95094ad875a5f9cdec2fd99c3c079526e3b
+DIST jupyter_client-7.1.0.tar.gz 323501 BLAKE2B fa431f70b327a98be3958b2c39a2aa07ab0ec3752f069bc5e6d0645ac0660074974c871b159002dcbf3054c97860dc6b0e289c34826d929f0493479cd9f37ed2 SHA512 eb9456088c19d3780d943fb9457ded5e006afb7e7ebd726d8a253f91107d8e1839cac16e25466c902ff33ed2777e97e18b08e24092ddbb062aa9cf6336dc8921
diff --git a/dev-python/jupyter_client/jupyter_client-7.1.0.ebuild b/dev-python/jupyter_client/jupyter_client-7.1.0.ebuild
new file mode 100644
index 000000000000..25b8195b436a
--- /dev/null
+++ b/dev-python/jupyter_client/jupyter_client-7.1.0.ebuild
@@ -0,0 +1,44 @@
+# 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} )
+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.6.0[${PYTHON_USEDEP}]
+	>=dev-python/nest_asyncio-1.5[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
+	>=dev-python/pyzmq-14.4.0[${PYTHON_USEDEP}]
+	>=www-servers/tornado-4.1[${PYTHON_USEDEP}]
+	dev-python/traitlets[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		dev-python/ipykernel[${PYTHON_USEDEP}]
+		dev-python/ipython[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+	)"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-7.0.6-test-timeout.patch
+)
+
+EPYTEST_DESELECT=(
+	jupyter_client/tests/test_kernelmanager.py::TestKernelManagerShutDownGracefully::test_signal_kernel_subprocesses
+	jupyter_client/tests/test_kernelmanager.py::TestKernelManagerShutDownGracefully::test_async_signal_kernel_subprocesses
+)
+
+distutils_enable_tests pytest
diff --git a/dev-python/pandas/pandas-1.3.4.ebuild b/dev-python/pandas/pandas-1.3.4.ebuild
index 6cd1c297a11a..97e74fcc010d 100644
--- a/dev-python/pandas/pandas-1.3.4.ebuild
+++ b/dev-python/pandas/pandas-1.3.4.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${P/_/}"
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~x86"
+KEYWORDS="~amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~x86"
 IUSE="doc full-support minimal test X"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pillow/pillow-8.4.0.ebuild b/dev-python/pillow/pillow-8.4.0.ebuild
index f0548ff00371..de745058cd74 100644
--- a/dev-python/pillow/pillow-8.4.0.ebuild
+++ b/dev-python/pillow/pillow-8.4.0.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="HPND"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="examples imagequant +jpeg jpeg2k lcms test tiff tk truetype webp xcb zlib"
 REQUIRED_USE="test? ( jpeg jpeg2k tiff truetype )"
 RESTRICT="!test? ( test )"
diff --git a/dev-python/pipenv/Manifest b/dev-python/pipenv/Manifest
index 705aed4da95d..62ae2d9f3907 100644
--- a/dev-python/pipenv/Manifest
+++ b/dev-python/pipenv/Manifest
@@ -1 +1,2 @@
+DIST pipenv-2021.11.9.tar.gz 11652360 BLAKE2B ab7d733e0c44a8551d2b786680646f5efa9effdc6b6a74fc0b8286336c84b9795229036cc8b7179a4ee3d6c91701d82fdd2e8303c7c9a9da1e06eb78fb2a0214 SHA512 6ad44fe70d3e3f5bbdedb891c76ad1c37863e6f4215c34f2ef6aa1a35b89fb6262f8c55f7f2e71544e550d66d20567f12ce4698f9e3a899853aa49a0849c3189
 DIST pipenv-2021.5.29.tar.gz 11607230 BLAKE2B 8eef8e79fbdfaf85a949437d06d9f8b48f7eaa6e4769f6d4ed90b01c0ebf70c282fc90581cce5ffcab0aeb6bc9ad770a8b4425f355a06e0fc4cd56fb221386e2 SHA512 4fa018c13d4babe856bf5671cf5d18a95f4af4b6d4fc64c4919825fe04004ed3d8979ca335b851c6e24dad081475f6fb5b925eeff58c6fb5cffc450b967ed1cd
diff --git a/dev-python/pipenv/files/pipenv-2021-11-9-remove-attr-vendor-import.patch b/dev-python/pipenv/files/pipenv-2021-11-9-remove-attr-vendor-import.patch
new file mode 100644
index 000000000000..2454d04f12ef
--- /dev/null
+++ b/dev-python/pipenv/files/pipenv-2021-11-9-remove-attr-vendor-import.patch
@@ -0,0 +1,25 @@
+From 0c31638a41a95ada109a3fd13e1e8380d2b8a731 Mon Sep 17 00:00:00 2001
+From: Oz N Tiram <oz.tiram@gmail.com>
+Date: Thu, 11 Nov 2021 13:05:13 +0100
+Subject: [PATCH 1/2] Remove vendored attr.
+
+---
+ pipenv/installers.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/pipenv/installers.py b/pipenv/installers.py
+index 5baa1933..f7982ab6 100644
+--- a/pipenv/installers.py
++++ b/pipenv/installers.py
+@@ -3,7 +3,7 @@ import operator
+ import re
+ from abc import ABCMeta, abstractmethod
+ 
+-from pipenv.vendor import attr
++import attr
+ from pipenv.utils import find_windows_executable, subprocess_run
+ 
+ 
+-- 
+2.32.0
+
diff --git a/dev-python/pipenv/files/pipenv-2021-11-9-remove-colorama-vendor-import.patch b/dev-python/pipenv/files/pipenv-2021-11-9-remove-colorama-vendor-import.patch
new file mode 100644
index 000000000000..4677b0860da2
--- /dev/null
+++ b/dev-python/pipenv/files/pipenv-2021-11-9-remove-colorama-vendor-import.patch
@@ -0,0 +1,67 @@
+From 6e994dbc81c326b507c6f3119dfab56113dc17c3 Mon Sep 17 00:00:00 2001
+From: Oz N Tiram <oz.tiram@gmail.com>
+Date: Thu, 11 Nov 2021 13:05:41 +0100
+Subject: [PATCH 2/2] Remove vendored colorama
+
+---
+ pipenv/patched/crayons.py                                   | 2 +-
+ pipenv/vendor/yaspin/core.py                                | 2 +-
+ tasks/vendoring/patches/patched/crayons.patch               | 2 +-
+ tasks/vendoring/patches/vendor/yaspin-signal-handling.patch | 2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/pipenv/patched/crayons.py b/pipenv/patched/crayons.py
+index d7644a21..19b0d695 100644
+--- a/pipenv/patched/crayons.py
++++ b/pipenv/patched/crayons.py
+@@ -13,7 +13,7 @@ import re
+ import sys
+ 
+ from pipenv.vendor import shellingham
+-from pipenv.vendor import colorama
++import colorama
+ 
+ PY3 = sys.version_info[0] >= 3
+ 
+diff --git a/pipenv/vendor/yaspin/core.py b/pipenv/vendor/yaspin/core.py
+index d8a0716c..c9be016c 100644
+--- a/pipenv/vendor/yaspin/core.py
++++ b/pipenv/vendor/yaspin/core.py
+@@ -19,7 +19,7 @@ import time
+ from typing import List, Set, Union
+ 
+ from termcolor import colored
+-from pipenv.vendor import colorama
++import colorama
+ from pipenv.vendor.vistir import cursor
+ 
+ from .base_spinner import Spinner, default_spinner
+diff --git a/tasks/vendoring/patches/patched/crayons.patch b/tasks/vendoring/patches/patched/crayons.patch
+index 2760ca81..d021bfb1 100644
+--- a/tasks/vendoring/patches/patched/crayons.patch
++++ b/tasks/vendoring/patches/patched/crayons.patch
+@@ -10,7 +10,7 @@ index 455d3e90..de735daf 100644
+ -
+ -import colorama
+ +from pipenv.vendor import shellingham
+-+from pipenv.vendor import colorama
+++import colorama
+  
+ +PY3 = sys.version_info[0] >= 3
+ +
+diff --git a/tasks/vendoring/patches/vendor/yaspin-signal-handling.patch b/tasks/vendoring/patches/vendor/yaspin-signal-handling.patch
+index 705650c3..95feb1c0 100644
+--- a/tasks/vendoring/patches/vendor/yaspin-signal-handling.patch
++++ b/tasks/vendoring/patches/vendor/yaspin-signal-handling.patch
+@@ -6,7 +6,7 @@ index 76dc2439..d8a0716c 100644
+  from typing import List, Set, Union
+  
+  from termcolor import colored
+-+from pipenv.vendor import colorama
+++import colorama
+ +from pipenv.vendor.vistir import cursor
+  
+  from .base_spinner import Spinner, default_spinner
+-- 
+2.32.0
+
diff --git a/dev-python/pipenv/pipenv-2021.11.9.ebuild b/dev-python/pipenv/pipenv-2021.11.9.ebuild
new file mode 100644
index 000000000000..19596156b12d
--- /dev/null
+++ b/dev-python/pipenv/pipenv-2021.11.9.ebuild
@@ -0,0 +1,65 @@
+# 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
+
+MY_PV=${PV/_beta/b}
+DESCRIPTION="Python Development Workflow for Humans"
+HOMEPAGE="https://github.com/pypa/pipenv https://pypi.org/project/pipenv/"
+SRC_URI="https://github.com/pypa/pipenv/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/${PN}-${MY_PV}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-${PV//./-}-remove-attr-vendor-import.patch"
+	"${FILESDIR}/${PN}-${PV//./-}-remove-colorama-vendor-import.patch"
+	)
+
+RDEPEND="
+	${PYTHON_DEPS}
+	dev-python/attrs[${PYTHON_USEDEP}]
+	dev-python/certifi[${PYTHON_USEDEP}]
+	>=dev-python/colorama-0.4.4[${PYTHON_USEDEP}]
+	>=dev-python/jinja-3.0.1[${PYTHON_USEDEP}]
+	dev-python/pip[${PYTHON_USEDEP}]
+	>=dev-python/virtualenv-20.0.35[${PYTHON_USEDEP}]
+	dev-python/virtualenv-clone[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.26.0[${PYTHON_USEDEP}]
+	>=dev-python/wheel-0.36.0[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	${RDEPEND}
+	test? (
+		dev-python/flaky[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+	)
+"
+
+src_prepare() {
+	# remove vendored versions
+	# see https://bugs.gentoo.org/717666
+	rm -vR "${S}/${PN}/vendor/attr/" || die
+	rm -vR "${S}/${PN}/vendor/colorama/" || die
+	rm -vR "${S}/${PN}/vendor/requests/" || die
+	# not actually used by pipenv, but included in pipenv
+	rm -vR "${S}/${PN}/vendor/jinja2/" || die
+	rm -vR "${S}/${PN}/vendor/wheel/" || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	pytest -vvv -x -m "not cli and not needs_internet" tests/unit/ || die
+}
diff --git a/dev-python/pytz_deprecation_shim/pytz_deprecation_shim-0.1.0_p0-r1.ebuild b/dev-python/pytz_deprecation_shim/pytz_deprecation_shim-0.1.0_p0-r1.ebuild
index bbca3ace85b8..26bba26457bd 100644
--- a/dev-python/pytz_deprecation_shim/pytz_deprecation_shim-0.1.0_p0-r1.ebuild
+++ b/dev-python/pytz_deprecation_shim/pytz_deprecation_shim-0.1.0_p0-r1.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 
 RDEPEND="
 	$(python_gen_cond_dep '
diff --git a/dev-python/pyyaml/pyyaml-6.0.ebuild b/dev-python/pyyaml/pyyaml-6.0.ebuild
index 69db6a8781a2..7179d432a1b2 100644
--- a/dev-python/pyyaml/pyyaml-6.0.ebuild
+++ b/dev-python/pyyaml/pyyaml-6.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/yaml/pyyaml/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
 
 LICENSE="MIT"
 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"
+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="examples"
 
 RDEPEND="dev-libs/libyaml:="
diff --git a/dev-python/redis-py/Manifest b/dev-python/redis-py/Manifest
index fb2f7d6f986a..60c1bce0736f 100644
--- a/dev-python/redis-py/Manifest
+++ b/dev-python/redis-py/Manifest
@@ -1 +1,2 @@
 DIST redis-py-3.5.3.tar.gz 141112 BLAKE2B b953d553a3cfa2d6ba6f5aa35dfaf93865acbfad0e901a96082c3b1c027dc23b6ceedde185f24e86772522fbbf4f0a4d18e115a6b40aff6a65450bbe397d5c07 SHA512 eae6ac6b3e0f1366a9c29e5e2d9a5210e4627e62e3006159b1c290f36cd9c1c2c12cafe0944f7a010e04632b517874f230aa9411491993b7ecf2080546217206
+DIST redis-py-4.0.2.tar.gz 2262717 BLAKE2B 7db99843b4ee354b0841de1cacca001901b0614868e6cd545edb0f3705b7dc7d7a0ee755e2184ec1fb080a845a2f193ff5ab5a4dd99006eed6b9a1c89fbee131 SHA512 3f73ddd2ceb551fa447cfb4ecdc1d393957bbfd8c184ae3d357f9f47fff860f1c4684ec0fc3cb85fea530454456c17a98a2a56e592bef4cd9ad17bb405c1a0f7
diff --git a/dev-python/redis-py/redis-py-4.0.2.ebuild b/dev-python/redis-py/redis-py-4.0.2.ebuild
new file mode 100644
index 000000000000..ccefac5ea7ba
--- /dev/null
+++ b/dev-python/redis-py/redis-py-4.0.2.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..10} pypy3 )
+inherit distutils-r1
+
+MY_PN="redis"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Python client for Redis key-value store"
+HOMEPAGE="https://github.com/redis/redis-py"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+	dev-python/deprecated[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		dev-db/redis
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local redis_pid="${T}"/redis.pid
+	local redis_port=6379
+	local redis_test_config="
+		daemonize yes
+		pidfile ${redis_pid}
+		port ${redis_port}
+		bind 127.0.0.1
+	"
+
+	# Spawn Redis itself for testing purposes
+	# NOTE: On sam@'s machine, spawning Redis can hang in the sandbox.
+	# I'm not restricting tests yet because this doesn't happen for anyone else AFAICT.
+	elog "Spawning Redis"
+	elog "NOTE: Port ${redis_port} must be free"
+	"${EPREFIX}"/usr/sbin/redis-server - <<< "${redis_test_config}" || die
+
+	# Run the tests
+	epytest -k "not redismod"
+
+	# Clean up afterwards
+	local pid=$(<"${redis_pid}")
+	kill "${pid}" || die
+	local retries=10
+	while [[ -f ${redis_pid} ]]; do
+		sleep 1
+		if [[ $(( retries-- )) -eq 0 ]]; then
+			die "redis did not stop"
+		fi
+	done
+}
diff --git a/dev-python/reportlab/reportlab-3.6.2.ebuild b/dev-python/reportlab/reportlab-3.6.2.ebuild
index 4bba1393256f..176ece4cd747 100644
--- a/dev-python/reportlab/reportlab-3.6.2.ebuild
+++ b/dev-python/reportlab/reportlab-3.6.2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
 
 DEPEND="
 	media-libs/freetype
diff --git a/dev-python/rope/Manifest b/dev-python/rope/Manifest
index 015118a67749..a52b96d5b9e7 100644
--- a/dev-python/rope/Manifest
+++ b/dev-python/rope/Manifest
@@ -1 +1,2 @@
 DIST rope-0.21.0.tar.gz 256456 BLAKE2B f9ed997933794caaeaee7c9951ea46c1fc50983f93433b227151366f720198f96966faa28993d2a8a54e667a34cc318c322068bc47fd38789c9604aea9586c53 SHA512 b1b882087b235849b04beeb85c253eecdcc06e0d75ba54975db9c4e60e68178f7acb87a58a9a24dc942994cfbfc3662e05000d00965278697b0db412411b4c44
+DIST rope-0.22.0.tar.gz 260138 BLAKE2B 11aff47af50225d66ade44a63a2c747bc11f0adcec1abed2dff71466f088f1460b3eec541db326af545f89907eb9d4f518c24ec8a445ca07b3116573883123ec SHA512 ead82eba834890d90a6972cc432d153b977a123588621712b50decf1f1bfff03cd411e3615dff63a5272cf4a46b32791ea625f30e3dfdf9d1969081a99544396
diff --git a/dev-python/rope/rope-0.22.0.ebuild b/dev-python/rope/rope-0.22.0.ebuild
new file mode 100644
index 000000000000..a85054180d87
--- /dev/null
+++ b/dev-python/rope/rope-0.22.0.ebuild
@@ -0,0 +1,41 @@
+# 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 refactoring library"
+HOMEPAGE="https://github.com/python-rope/rope"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc"
+
+# Dependency for docbuild documentation which is not noted in
+# setup.py, using standard docutils builds docs successfully.
+BDEPEND="
+	doc? ( dev-python/docutils[${PYTHON_USEDEP}] )
+	test? ( dev-python/pytest-timeout[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
+
+python_compile_all() {
+	if use doc; then
+		pushd docs > /dev/null || die
+		mkdir build || die
+		local i
+		for i in ./*.rst; do
+			rst2html.py $i > ./build/${i/rst/html} || die
+		done
+		popd > /dev/null || die
+	fi
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/build/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/tinycss2/Manifest b/dev-python/tinycss2/Manifest
index ccd31e79f3e7..b16817c0ddc8 100644
--- a/dev-python/tinycss2/Manifest
+++ b/dev-python/tinycss2/Manifest
@@ -1,2 +1,3 @@
 DIST css-parsing-tests-c5749e51dda3868b3e8062e65a36584c2fec8059.gh.tar.gz 35758 BLAKE2B d834011c3ac774eb79b35e2e74f3854ddc2bb871531a32194041d6f98bde3dc68db67baea25d5463a03e057197144237be69fee4eacfb8edb73167e6e4faf7be SHA512 ef44eb1144a6484f308fabe4187310b2ef0067f328bf5213969d87c475fccae3d716dc66640a0a554ab2a3d7da0efb3a168a288ac6eef7722f3ae46959943b49
 DIST tinycss2-1.1.0.gh.tar.gz 28205 BLAKE2B 46ba3f705522067e5b7aa5fdbc89f8980598e7e81b39114052b428e8c21b1a90fb3a9082bd51bbc0c6719adf6f0be285683b125886afe1a957013164f3b89428 SHA512 e1ed2679c09a0814d6deca069c68521e6ceef80f4a9cc16ab359dc5ee7ef97d0c7335680702548b023b1a48c5aeb838e29bf1b55f64698913dd16ae33a478a2b
+DIST tinycss2-1.1.1.gh.tar.gz 28261 BLAKE2B f86b25be62c4c107dd6dca0b9e49605bc0c04b6ec48c4283fa7a5a33249032dcc3a42bdb9910d6235da4c4ddbf581ef8ebdc404c3bb32eeca7f355c0081e6fb7 SHA512 788b57fbadd299a4d4745bcc1814a2ebf6db76e337f2de2637ffc1610a3dac5a70f01bb9ffbb2afbdb0c638a6b23cc1b2f199eebfbb77d84906a9da5dfecada6
diff --git a/dev-python/tinycss2/tinycss2-1.1.1.ebuild b/dev-python/tinycss2/tinycss2-1.1.1.ebuild
new file mode 100644
index 000000000000..9820b7df6c23
--- /dev/null
+++ b/dev-python/tinycss2/tinycss2-1.1.1.ebuild
@@ -0,0 +1,39 @@
+# 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
+
+CSS_TEST_COMMIT_ID=c5749e51dda3868b3e8062e65a36584c2fec8059
+
+DESCRIPTION="A complete yet simple CSS parser for Python"
+HOMEPAGE="https://github.com/Kozea/tinycss2/
+	https://pypi.org/project/tinycss2/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+SRC_URI="
+	https://github.com/Kozea/tinycss2/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz
+	test? (
+		https://github.com/SimonSapin/css-parsing-tests/archive/${CSS_TEST_COMMIT_ID}.tar.gz
+			-> css-parsing-tests-${CSS_TEST_COMMIT_ID}.gh.tar.gz
+	)"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND=">=dev-python/webencodings-0.4[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e '/addopts/d' pyproject.toml || die
+	if use test; then
+		mv "${WORKDIR}/css-parsing-tests-${CSS_TEST_COMMIT_ID}"/* \
+			tests/css-parsing-tests/ || die
+	fi
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/tzlocal/Manifest b/dev-python/tzlocal/Manifest
index bcfedd9b083d..eb6f45f34c95 100644
--- a/dev-python/tzlocal/Manifest
+++ b/dev-python/tzlocal/Manifest
@@ -1,6 +1,2 @@
 DIST tzlocal-2.1.gh.tar.gz 18463 BLAKE2B 73e886cfb6d13bebc1a15a222da60f368a15dc5a097acac74990b1d76bdaa229be8f12ff735d1828ccd78c4c8d06eb5bc0a07da695d70251af1e67e4fb71037e SHA512 2679cebdc2692d9e0e1c9b714994ad881896f53e75ef407229a67c9fee9d27617638a2919865cb67e21e2bbd6e3bc13f2568343037e06603236f25a96aa6863d
-DIST tzlocal-3.0.gh.tar.gz 18924 BLAKE2B 340739015ce0fae245ddcb2d3f6250886261a81a49c9db7960515e178090183d3a826ee494763503023c033d3d9c19771aad865d4c1150350a118250aab23362 SHA512 9060eb325783d183bfaf7038476031a2ea22fd4ba50f6b5caf3d8eda15d9c90e557c64a0218c7e3c3df51f385378fe8a17f10871abb038012e1d05a9547918c3
-DIST tzlocal-4.0.1.gh.tar.gz 22737 BLAKE2B 0b84ab7ac80397d2d72e0627d3766e1f6a6402c3d0505f0ff0fc02fc524b372a92e0fe948f1f8ec59b0ccfae64f8240bddc8800fe988627a87aec5b8937a6df9 SHA512 0e83e9cba7d74690677d32087a82a54bf1f80dde121d6eed80ca0a80851832ef197cfab07728353619904706b989bbb4c9ca1736e7e1e6c710ad4ec93f74ac22
-DIST tzlocal-4.0.2.gh.tar.gz 22978 BLAKE2B 4c1d7ed518ed6984f2dd055ab4bdeeb9acee1c2fae14160ab8752adae8cc16969ec822d0b20d2b77d40d6b52a929f44d83b2537dffbd3b7db6c016145b870ec0 SHA512 4624bfda1e712bf898a4d3a8e4be20082689caf533bc340f0dede068323a4848328e7c4a2bb0d63e4ed59258ef5f21654d47135419360f73d0bdb7c38aee2906
-DIST tzlocal-4.0.gh.tar.gz 22582 BLAKE2B 35ef0b9f64e0b2758ecda19669957666ffcd807197cfef74583d94a3e2ca01811e55b27228522723dec140dd4ede69e30585d850f03f55db084d975e871d2f63 SHA512 8bb31f3d85256aaab2a803c34ea35677a25ae2bf339d54a1fb4466d035631d9f22ea465448d7905d607a17c6b1180cbc619ce06b39c3ebe724270bc048bd96ed
 DIST tzlocal-4.1.gh.tar.gz 23449 BLAKE2B 1ed3518395674af5b8066825f6a9f1dde411aa0bb534e65e9da44399042bb25ca45b61650bd7ce81d4912c3d5e1fde132d002d189fe388cd6bd4b7ed6d05bb79 SHA512 f6518c95b1e0ac0424a9f51f8ae0d39a50cacb510c8358a4fab077059e57959dd7b83d82ba455e9f7cca9bfc9224662f979d391a09d5516d172f1d6d3292779a
diff --git a/dev-python/tzlocal/tzlocal-3.0.ebuild b/dev-python/tzlocal/tzlocal-3.0.ebuild
deleted file mode 100644
index 0f42d01cf2d0..000000000000
--- a/dev-python/tzlocal/tzlocal-3.0.ebuild
+++ /dev/null
@@ -1,27 +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} )
-inherit distutils-r1
-
-DESCRIPTION="tzinfo object for the local timezone"
-HOMEPAGE="https://github.com/regebro/tzlocal"
-SRC_URI="https://github.com/regebro/tzlocal/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
-IUSE=""
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/backports-zoneinfo[${PYTHON_USEDEP}]
-	' python3_8 pypy3)"
-BDEPEND="
-	test? (
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
diff --git a/dev-python/tzlocal/tzlocal-4.0.1.ebuild b/dev-python/tzlocal/tzlocal-4.0.1.ebuild
deleted file mode 100644
index d01efb839e87..000000000000
--- a/dev-python/tzlocal/tzlocal-4.0.1.ebuild
+++ /dev/null
@@ -1,27 +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} )
-inherit distutils-r1
-
-DESCRIPTION="tzinfo object for the local timezone"
-HOMEPAGE="https://github.com/regebro/tzlocal"
-SRC_URI="https://github.com/regebro/tzlocal/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-RDEPEND="
-	dev-python/pytz_deprecation_shim[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/backports-zoneinfo[${PYTHON_USEDEP}]
-	' python3_8 pypy3)"
-BDEPEND="
-	test? (
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
diff --git a/dev-python/tzlocal/tzlocal-4.0.2.ebuild b/dev-python/tzlocal/tzlocal-4.0.2.ebuild
deleted file mode 100644
index d01efb839e87..000000000000
--- a/dev-python/tzlocal/tzlocal-4.0.2.ebuild
+++ /dev/null
@@ -1,27 +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} )
-inherit distutils-r1
-
-DESCRIPTION="tzinfo object for the local timezone"
-HOMEPAGE="https://github.com/regebro/tzlocal"
-SRC_URI="https://github.com/regebro/tzlocal/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-RDEPEND="
-	dev-python/pytz_deprecation_shim[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/backports-zoneinfo[${PYTHON_USEDEP}]
-	' python3_8 pypy3)"
-BDEPEND="
-	test? (
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
diff --git a/dev-python/tzlocal/tzlocal-4.0.ebuild b/dev-python/tzlocal/tzlocal-4.0.ebuild
deleted file mode 100644
index 948453243c09..000000000000
--- a/dev-python/tzlocal/tzlocal-4.0.ebuild
+++ /dev/null
@@ -1,27 +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} )
-inherit distutils-r1
-
-DESCRIPTION="tzinfo object for the local timezone"
-HOMEPAGE="https://github.com/regebro/tzlocal"
-SRC_URI="https://github.com/regebro/tzlocal/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/pytz_deprecation_shim[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/backports-zoneinfo[${PYTHON_USEDEP}]
-	' python3_8 pypy3)"
-BDEPEND="
-	test? (
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
diff --git a/dev-python/tzlocal/tzlocal-4.1.ebuild b/dev-python/tzlocal/tzlocal-4.1.ebuild
index 0c75adb39d3a..b2dea2ecb142 100644
--- a/dev-python/tzlocal/tzlocal-4.1.ebuild
+++ b/dev-python/tzlocal/tzlocal-4.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/regebro/tzlocal/archive/${PV}.tar.gz -> ${P}.gh.tar.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 
 RDEPEND="
 	dev-python/pytz_deprecation_shim[${PYTHON_USEDEP}]
diff --git a/dev-python/ujson/Manifest b/dev-python/ujson/Manifest
index dcd817865795..41526044101d 100644
--- a/dev-python/ujson/Manifest
+++ b/dev-python/ujson/Manifest
@@ -1 +1,2 @@
 DIST ujson-4.2.0.tar.gz 7129419 BLAKE2B 478ff6a3de9603478e9b747935ebc966f980dc832252974dda444b2ccb53878b3565ebdf7e8c223c687304d5f95607027d0652956d1f804cf2d80df6ce19be1a SHA512 894316eeeafe80eb3328958f4336c1989c9591caf84de5a9442f9d028c85f67d08e7c295e74f5828abc93ad56ffa2d12b98ebe0ecf4bca27ae37642fbffe47e4
+DIST ujson-4.3.0.tar.gz 7129405 BLAKE2B 434a686d319415391910c2d8358b97b27221fe8ec725394c066126e9f0b05f8624db6fd2b372add7d3629733f108e8a0d4b840328499aadf43dda3397e07aef9 SHA512 62a84562a95dbbd0825c9c961f8b769c908201c56a1981bb22809f11e7330f68a1c5fa86c182a6c7823a4d780b1afba186b6203be88eb0ec30a4e2f99e51062e
diff --git a/dev-python/ujson/ujson-4.3.0.ebuild b/dev-python/ujson/ujson-4.3.0.ebuild
new file mode 100644
index 000000000000..b673dda64ffb
--- /dev/null
+++ b/dev-python/ujson/ujson-4.3.0.ebuild
@@ -0,0 +1,22 @@
+# 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
+
+DESCRIPTION="Ultra fast JSON encoder and decoder for Python"
+HOMEPAGE="https://pypi.org/project/ujson/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? ( dev-python/pytz[${PYTHON_USEDEP}] )
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/zstandard/Manifest b/dev-python/zstandard/Manifest
index d3375dcd5f82..093e0aae667c 100644
--- a/dev-python/zstandard/Manifest
+++ b/dev-python/zstandard/Manifest
@@ -1,2 +1 @@
-DIST zstandard-0.15.2.tar.gz 1012864 BLAKE2B 3239a7003d8869182becbaf952b43da8923518e4b5202b115d59fc1492d26bf9703c1ea2dcf525459da023470c134c70525bd040a2d728d24861f7bc1e3a8948 SHA512 0102f3522145c80ec096e9dfac34a5bdd2a98b43b50b8c1e99bcfb0057904c551ababeeb82ced5f8b65945d42b39479cbc29472058679af1f8f91b68ae79f70f
 DIST zstandard-0.16.0.tar.gz 563633 BLAKE2B 8d896dcbd8ef9f9b28825d35792d02c3c447fa82ccef067deb925394c21da8f19a7faa4fbe84700fe5a0871af6d33d218c6134829d08eed93fd5ef43c3d0058c SHA512 f528cace58c1f1ec0fbea96e1646d92b05077ab6f5919eec07dc7b4fcfadf97dc848238928276fdb4333fb2cd035509af472ee352608661c3de681bc8dbed318
diff --git a/dev-python/zstandard/zstandard-0.15.2-r1.ebuild b/dev-python/zstandard/zstandard-0.15.2-r1.ebuild
deleted file mode 100644
index 3e8df4170745..000000000000
--- a/dev-python/zstandard/zstandard-0.15.2-r1.ebuild
+++ /dev/null
@@ -1,42 +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
-
-DESCRIPTION="Zstandard Bindings for Python"
-HOMEPAGE="https://pypi.org/project/zstandard/ https://github.com/indygreg/python-zstandard"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-DEPEND="
-	app-arch/zstd:="
-RDEPEND="${DEPEND}
-	$(python_gen_cond_dep '>=dev-python/cffi-1.14.0-r2:=[${PYTHON_USEDEP}]' 'python*')
-"
-BDEPEND="
-	test? ( dev-python/hypothesis[${PYTHON_USEDEP}] )"
-
-distutils_enable_tests setup.py
-
-src_prepare() {
-	# the C backend is repeatedly broken, so force CFFI instead
-	sed -e '/PYTHON_ZSTANDARD_IMPORT_POLICY/s:default:cffi:' \
-		-i zstandard/__init__.py || die
-	# unreliable, fails on x86
-	sed -e 's:test_estimated_compression_context_size:_&:' \
-		-i tests/test_data_structures.py || die
-
-	distutils-r1_src_prepare
-
-	mydistutilsargs=(
-		--no-c-backend
-		--system-zstd
-	)
-}
diff --git a/dev-python/zstandard/zstandard-0.16.0.ebuild b/dev-python/zstandard/zstandard-0.16.0.ebuild
index 43bbd2dbb624..34327b6b454e 100644
--- a/dev-python/zstandard/zstandard-0.16.0.ebuild
+++ b/dev-python/zstandard/zstandard-0.16.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 DEPEND="
 	app-arch/zstd:="
author	Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net>	2021-11-23 01:43:46 +0000
committer	Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net>	2021-11-23 01:43:46 +0000
commit	7bb6b4c233214c08b69376fa0061fd2534eaf4de (patch)
tree	6ba537ae44ca411cad6fd8d285bce767a6e1f4d4 /dev-python
parent	379fc91217fd8a25c5dfcebe0384d806c46d5167 (diff)
download	baldeagleos-repo-7bb6b4c233214c08b69376fa0061fd2534eaf4de.tar.gz baldeagleos-repo-7bb6b4c233214c08b69376fa0061fd2534eaf4de.tar.xz baldeagleos-repo-7bb6b4c233214c08b69376fa0061fd2534eaf4de.zip