Adding metadata

45 files changed, 480 insertions, 437 deletions

diff --git a/dev-python/apispec/Manifest b/dev-python/apispec/Manifest
index e909ce8e2d48..632b5e9b5d12 100644
--- a/dev-python/apispec/Manifest
+++ b/dev-python/apispec/Manifest
@@ -1,8 +1,2 @@
-DIST apispec-4.4.1.tar.gz 64424 BLAKE2B b46390659334f5ce5aa83fd15207f5d1ad6d0e9c530f9e7d2b1a0f6a787498aad065153cde9237ce1ab408256e5cd698bbc674dc0316eb4ed16b874ce34611c4 SHA512 fea0787598ca93711eaa231675f97623eb3d6eb224e11c40e66857b95f48724618bf7a9bfda476b56c1c96fe70bb61675966b1f3fb073fe3f7e4da91e78d3d90
-DIST apispec-4.4.2.tar.gz 64660 BLAKE2B 1e53d4b3f8856e76565690773085dfcbaaab4e1771186eb8ea35f469d7c65b8d5bd6319af0ee32539de96ce5ff1889a15d74ac764d7bb9d0b415648af87d28db SHA512 8f8070ec1a084e5c5dda02d30103ff25a2fe096839aa2b1a75858297377e312e29a2d1cf4d373a53b7bffcbe9108489c2a2516e0e053c2de12ef90044b6b7e17
-DIST apispec-4.5.0.tar.gz 65423 BLAKE2B ce6cc6f466d274db6aa5f8b27c3a9340daff7934b9293c501b5305b4a6ccbd22e8b12a163e20e5e02d571a8177adb6d5b3196ffa46ae68f2931b6c3ced2b4d0c SHA512 0abb186182513a6d7e4aeeeb80cd8976eebe7c40932ca7c53cd8be149e65a768235436382bab2006a79bcdf345cde55fd69eb3f28f8d14cde5fe064f7c7a76ad
-DIST apispec-4.6.0.tar.gz 66147 BLAKE2B 98127cb2bf938cc1928e13e1169804eea174351a0f4eeaabc801da711d0861bc35a9761e9f1bc478a44d6a85989a1aba1840b3e472599064240a880fda8e45b4 SHA512 b030e5400a9abce06576406f83befb298814617e06729f29c2ee70517cf456901b67e60880b3b4baec096717a91341e8268bcd8e01fd566b7c6e03709afd7c3b
-DIST apispec-4.7.0.tar.gz 66274 BLAKE2B dbb14dd831eddeb9f086643b6182ccc3e529e22ad7e31d1d4dd2dce54edf76c6cf01a74438383df5ccec18cf863334d5cdbd45214791c01632d7f7efa63f7aa3 SHA512 53c0a1e6db81439a7c3f8e933cac28003dd84444e65986a29aef8a6ec761999c84417902448288d69c5873d12dded2156e79bedc5bd4bd0fd472ea014e65a6c7
-DIST apispec-4.7.1.tar.gz 66356 BLAKE2B f78ab7f10c7a10f3d62b4d02e5a33cc1972aea0b33af1c485a11c2c415b2913a4d8151a9aa44de9876fa1ec6ebe02d448fb50dcc573e6a4779265ee07bda0329 SHA512 e5ead9a867d9dd18f2fb7509b6ef4afd9ec04cc102f55684a66e8f5ebe1b8e3e4129c62b7fd50f0a337547336375cee612e1bec620fa957f8f90d11968538c8e
-DIST apispec-5.0.0.gh.tar.gz 68795 BLAKE2B 42b4ea7d825fc94c6ca904df56a900b52ecd3fda78b3079103370c6cb362cea6338251d344c970c0ad0380d8b39931f6fc38f3e71dc4c31ace0763c6e9721f73 SHA512 1e3d4c06713081d90d5d8650e7aeedd12248ef9a43ced6681be4e9dbf4563b7390cabf3423ea2c1bfda6900cd193efa4e2cacdac77350fcf2e83cfc30580c98e
 DIST apispec-5.1.0.gh.tar.gz 69990 BLAKE2B 0fc488abae9657c9996775c460b97b66a782b82012bf3c1bb6a1623600b03c71bc80eb556d60720e00b07551a5c3b44b40f709bffbb05b10603485af9122cd6b SHA512 ebcb6ddc71be541c152f18eaf2462f09c5860b689d34581723dc8f70f4da59966c34ea6f1282be2ea38cb4524af224a96bcfe974f5fcc62bf4939c644aa6df48
+DIST apispec-5.1.1.gh.tar.gz 70296 BLAKE2B 339706890d23c796ea73c23735c5655694315a8a8017eba8f69574ed4e85ddf9a65c3a26482a78f08a118afd19e3c9bbcc9d264bb770941d7affbf7cf85eb925 SHA512 4e0e2959699c735c5242aa1a954392d97ea4809aafbd8d091f608baf7397a31964852588c474acb84e8755a62849837d741eb1e5fdf1cd5304f46c852e346d03
diff --git a/dev-python/apispec/apispec-4.4.1.ebuild b/dev-python/apispec/apispec-4.4.1.ebuild
deleted file mode 100644
index 603322cd6fc5..000000000000
--- a/dev-python/apispec/apispec-4.4.1.ebuild
+++ /dev/null
@@ -1,41 +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} )
-
-inherit distutils-r1
-
-DESCRIPTION="A pluggable API specification generator."
-HOMEPAGE="https://github.com/marshmallow-code/apispec/"
-SRC_URI="https://github.com/marshmallow-code/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
-"
-BDEPEND="${RDEPEND}
-	test? (
-		dev-python/bottle[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/marshmallow[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs \
-	dev-python/sphinx-issues \
-	dev-python/sphinx_rtd_theme
-
-python_test() {
-	local deselect=(
-		# requires unpackaged prance
-		tests/test_ext_marshmallow_openapi.py::test_openapi_tools_validate_v2
-		tests/test_ext_marshmallow_openapi.py::test_openapi_tools_validate_v3
-	)
-
-	epytest ${deselect[@]/#/--deselect }
-}
diff --git a/dev-python/apispec/apispec-4.4.2.ebuild b/dev-python/apispec/apispec-4.4.2.ebuild
deleted file mode 100644
index 603322cd6fc5..000000000000
--- a/dev-python/apispec/apispec-4.4.2.ebuild
+++ /dev/null
@@ -1,41 +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} )
-
-inherit distutils-r1
-
-DESCRIPTION="A pluggable API specification generator."
-HOMEPAGE="https://github.com/marshmallow-code/apispec/"
-SRC_URI="https://github.com/marshmallow-code/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
-"
-BDEPEND="${RDEPEND}
-	test? (
-		dev-python/bottle[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/marshmallow[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs \
-	dev-python/sphinx-issues \
-	dev-python/sphinx_rtd_theme
-
-python_test() {
-	local deselect=(
-		# requires unpackaged prance
-		tests/test_ext_marshmallow_openapi.py::test_openapi_tools_validate_v2
-		tests/test_ext_marshmallow_openapi.py::test_openapi_tools_validate_v3
-	)
-
-	epytest ${deselect[@]/#/--deselect }
-}
diff --git a/dev-python/apispec/apispec-4.5.0.ebuild b/dev-python/apispec/apispec-4.5.0.ebuild
deleted file mode 100644
index 603322cd6fc5..000000000000
--- a/dev-python/apispec/apispec-4.5.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="A pluggable API specification generator."
-HOMEPAGE="https://github.com/marshmallow-code/apispec/"
-SRC_URI="https://github.com/marshmallow-code/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
-"
-BDEPEND="${RDEPEND}
-	test? (
-		dev-python/bottle[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/marshmallow[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs \
-	dev-python/sphinx-issues \
-	dev-python/sphinx_rtd_theme
-
-python_test() {
-	local deselect=(
-		# requires unpackaged prance
-		tests/test_ext_marshmallow_openapi.py::test_openapi_tools_validate_v2
-		tests/test_ext_marshmallow_openapi.py::test_openapi_tools_validate_v3
-	)
-
-	epytest ${deselect[@]/#/--deselect }
-}
diff --git a/dev-python/apispec/apispec-4.6.0.ebuild b/dev-python/apispec/apispec-4.6.0.ebuild
deleted file mode 100644
index 603322cd6fc5..000000000000
--- a/dev-python/apispec/apispec-4.6.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="A pluggable API specification generator."
-HOMEPAGE="https://github.com/marshmallow-code/apispec/"
-SRC_URI="https://github.com/marshmallow-code/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
-"
-BDEPEND="${RDEPEND}
-	test? (
-		dev-python/bottle[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/marshmallow[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs \
-	dev-python/sphinx-issues \
-	dev-python/sphinx_rtd_theme
-
-python_test() {
-	local deselect=(
-		# requires unpackaged prance
-		tests/test_ext_marshmallow_openapi.py::test_openapi_tools_validate_v2
-		tests/test_ext_marshmallow_openapi.py::test_openapi_tools_validate_v3
-	)
-
-	epytest ${deselect[@]/#/--deselect }
-}
diff --git a/dev-python/apispec/apispec-4.7.0.ebuild b/dev-python/apispec/apispec-4.7.0.ebuild
deleted file mode 100644
index 47153474840d..000000000000
--- a/dev-python/apispec/apispec-4.7.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="A pluggable API specification generator."
-HOMEPAGE="https://github.com/marshmallow-code/apispec/"
-SRC_URI="https://github.com/marshmallow-code/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
-"
-BDEPEND="${RDEPEND}
-	test? (
-		dev-python/bottle[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/marshmallow[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs \
-	dev-python/sphinx-issues \
-	dev-python/sphinx_rtd_theme
-
-python_test() {
-	local deselect=(
-		# requires unpackaged prance
-		tests/test_ext_marshmallow_openapi.py::test_openapi_tools_validate_v2
-		tests/test_ext_marshmallow_openapi.py::test_openapi_tools_validate_v3
-	)
-
-	epytest ${deselect[@]/#/--deselect }
-}
diff --git a/dev-python/apispec/apispec-4.7.1.ebuild b/dev-python/apispec/apispec-4.7.1.ebuild
deleted file mode 100644
index 50cd6fd62726..000000000000
--- a/dev-python/apispec/apispec-4.7.1.ebuild
+++ /dev/null
@@ -1,40 +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="A pluggable API specification generator."
-HOMEPAGE="https://github.com/marshmallow-code/apispec/"
-SRC_URI="https://github.com/marshmallow-code/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
-"
-BDEPEND="${RDEPEND}
-	test? (
-		dev-python/bottle[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/marshmallow[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs \
-	dev-python/sphinx-issues \
-	dev-python/sphinx_rtd_theme
-
-python_test() {
-	local deselect=(
-		# requires unpackaged prance
-		tests/test_ext_marshmallow_openapi.py::test_openapi_tools_validate_v2
-		tests/test_ext_marshmallow_openapi.py::test_openapi_tools_validate_v3
-	)
-
-	epytest ${deselect[@]/#/--deselect }
-}
diff --git a/dev-python/apispec/apispec-5.0.0.ebuild b/dev-python/apispec/apispec-5.1.1.ebuild
index 15a45af604f4..2c4670e20be3 100644
--- a/dev-python/apispec/apispec-5.0.0.ebuild
+++ b/dev-python/apispec/apispec-5.1.1.ebuild
@@ -31,12 +31,8 @@ distutils_enable_sphinx docs \
 	dev-python/sphinx-issues \
 	dev-python/sphinx_rtd_theme
 
-python_test() {
-	local deselect=(
-		# requires unpackaged prance
-		tests/test_ext_marshmallow_openapi.py::test_openapi_tools_validate_v2
-		tests/test_ext_marshmallow_openapi.py::test_openapi_tools_validate_v3
-	)
-
-	epytest ${deselect[@]/#/--deselect }
-}
+EPYTEST_DESELECT=(
+	# requires unpackaged prance
+	tests/test_ext_marshmallow_openapi.py::test_openapi_tools_validate_v2
+	tests/test_ext_marshmallow_openapi.py::test_openapi_tools_validate_v3
+)
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index 2c5ef064e80d..0267c534e2a6 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -8,3 +8,4 @@ DIST boto3-1.18.45.tar.gz 419575 BLAKE2B 27896cfc3bd11c13d21bc272b2648917e1f99be
 DIST boto3-1.18.46.tar.gz 420373 BLAKE2B 9e354e4ba7b7361734dbfd0ef6296fa2f0c2deae9c42312ae2c6860b09e26acb338a5e06c342622b8384b1b49ff1518975723c6e1a3c988d42611f22f4daec24 SHA512 4bfa76936e7b1f7ddab3d9e4ff16dd59144f0c7acf2d595a3ccc6a186c52ce154f790e11f8c6bed72d0ea14f9c706d1af56a865ad6519e4fea7670f2f3176601
 DIST boto3-1.18.47.tar.gz 420701 BLAKE2B e58f528d876a29cd992a414e84a807a4fefdeb14b37e0c520f677d61270acd2bd534bd49ccb571d21f41a210946a1897f324a1c41a7e5fd9fe86a8689bc835da SHA512 67075c3d25a99bb3bda44f5108004a672b7f52f00f945f7643063d8c435854d14ffdc98d88d48e80caef850e4d765a7a9a894410398c56518a5cd30e32a7e481
 DIST boto3-1.18.48.tar.gz 420028 BLAKE2B d6bbf60141f2806519bdd0f4f364698ac7ab6e8a3987771df184ecfa69a43b235a9a21fb128d8f39d2015065d69ecd1e86978465223b220464044640f50d11ad SHA512 f0ef373396ad44e28f8707455ea16951bc4df23958734123ffcdca3efc1e668816b093d0a361a27286f19f129d02390fa36f196c5df0f589c05dc8b839d157bc
+DIST boto3-1.18.49.tar.gz 420662 BLAKE2B 92995cd06f19e26200ea51e6d171914ddbb20b860b286b34cf97ffc6c9ee4f29b59073d84cc7d99b2cd5349bbaff03ac004431ae2cf65af571044c6c52634f55 SHA512 4d94e11b974857709dc7907bd31a3eab087eafff3938286803d4d1bc850d90e4dd82be747a3a9c4725bb15e3670a12c8bd239a98df23198c498519d196279dc0
diff --git a/dev-python/boto3/boto3-1.18.49.ebuild b/dev-python/boto3/boto3-1.18.49.ebuild
new file mode 100644
index 000000000000..30a0b44d3f8c
--- /dev/null
+++ b/dev-python/boto3/boto3-1.18.49.ebuild
@@ -0,0 +1,53 @@
+# 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
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	epytest tests/{functional,unit}
+}
diff --git a/dev-python/boto3/metadata.xml b/dev-python/boto3/metadata.xml
index bbf43c688e3e..8def06555c4b 100644
--- a/dev-python/boto3/metadata.xml
+++ b/dev-python/boto3/metadata.xml
@@ -5,10 +5,6 @@
   <email>chutzpah@gentoo.org</email>
   <name>Patrick McLean</name>
  </maintainer>
- <maintainer type="person">
-  <email>slashbeast@gentoo.org</email>
-  <name>Piotr Karbowski</name>
- </maintainer>
  <maintainer type="project">
   <email>python@gentoo.org</email>
   <name>Python</name>
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index bc912a631736..2695ca34d188 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -8,3 +8,4 @@ DIST botocore-1.21.45.tar.gz 8170610 BLAKE2B e55cc819188ae61c1427a3a7e3ff008d85c
 DIST botocore-1.21.46.tar.gz 8175719 BLAKE2B 8c171e07e5c68b1d3721c0d5052b09d2c5522f0ed899453441e72c744e117f7479995ff2fde222c2c1fdcfe382464b9bc0898367a3d79b1e53dbfc60d855e10c SHA512 3ec64d160ec682d287fc1cadeb5ef4ed50a3157f98cd18514d75ec9e60ea73b4dde5a419e7a07c490216d8d67c29d214b88ff9fa1ef3a8b0bf176f11fb9cfcab
 DIST botocore-1.21.47.tar.gz 8183951 BLAKE2B 930fdccd5d45fb1fb88fec2370e65bff5eb7241ea3a666f1f0bfeb11ee3e1e5bb715d658ac1f340c0565f16bbba48fa57c7460aef0e0595486303f62f79df244 SHA512 705fa363bdd4663f774e349e448666d7bfd47c77b57689d6cc12039419c8a4f820d7edd01de9689cd56fee3d59138ea9bd803b4402c8b5fac95cd2de76fb1558
 DIST botocore-1.21.48.tar.gz 8180642 BLAKE2B 9efa407e69caebd7a8c8f058c356b024ac5f7ad1675c099bef1f593b391aab5901853e4c0b0a9989ac190bdbc8e869a2f0dd2670ce483f14f1f2b993971c4652 SHA512 1319679897ec3ed07a489a52d0d3e6a9abc529bb1c1aa458f1b51d1035d7e8bc203ba830fef2354fd07f058b3bb4ba140af34cb1616b509ecda08f5a18b2ed49
+DIST botocore-1.21.49.tar.gz 8202118 BLAKE2B cdda23ddbd1d9540c8dc1e53763bfccf9984a8df65683f1bb9e7541beca866beba75fd76a983c14c953224cdc19749b0e0af7e17529b4bd41869b5a2bfa49d0a SHA512 4a85a0bef518b57942b57fe01b10c588c3cceb1d8c7fa14e4bdc2e0c53fd3bf5b19947659870ce4af57bdabc4036d9a8c15b53530b7ec312e33b5bb91a784781
diff --git a/dev-python/botocore/botocore-1.21.49.ebuild b/dev-python/botocore/botocore-1.21.49.ebuild
new file mode 100644
index 000000000000..9cd77a5ad4d0
--- /dev/null
+++ b/dev-python/botocore/botocore-1.21.49.ebuild
@@ -0,0 +1,50 @@
+# 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
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	epytest tests/{functional,unit}
+}
diff --git a/dev-python/botocore/botocore-9999.ebuild b/dev-python/botocore/botocore-9999.ebuild
index 1e038034ab1d..9cd77a5ad4d0 100644
--- a/dev-python/botocore/botocore-9999.ebuild
+++ b/dev-python/botocore/botocore-9999.ebuild
@@ -37,22 +37,14 @@ PATCHES=(
 
 distutils_enable_sphinx docs/source \
 	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests nose
+distutils_enable_tests pytest
 
 src_prepare() {
 	# unpin deps
 	sed -i -e "s:>=.*':':" setup.py || die
-	# very unstable
-	sed -i -e 's:test_stress_test_token_bucket:_&:' \
-		tests/functional/retries/test_bucket.py || die
 	distutils-r1_src_prepare
 }
 
 python_test() {
-	# note: suites need to be run separately as one of the unit tests
-	# seems to be leaking mocks and breaking a few functional tests
-	nosetests -v tests/unit ||
-		die "unit tests failed under ${EPYTHON}"
-	nosetests -v tests/functional ||
-		die "functional tests failed under ${EPYTHON}"
+	epytest tests/{functional,unit}
 }
diff --git a/dev-python/botocore/metadata.xml b/dev-python/botocore/metadata.xml
index 58239a40a962..3b9f7f37b0db 100644
--- a/dev-python/botocore/metadata.xml
+++ b/dev-python/botocore/metadata.xml
@@ -5,10 +5,6 @@
   <email>chutzpah@gentoo.org</email>
   <name>Patrick McLean</name>
  </maintainer>
- <maintainer type="person">
-  <email>slashbeast@gentoo.org</email>
-  <name>Piotr Karbowski</name>
- </maintainer>
  <maintainer type="project">
   <email>python@gentoo.org</email>
   <name>Python</name>
diff --git a/dev-python/curtsies/Manifest b/dev-python/curtsies/Manifest
index 3579c3c90021..534657e5fdd2 100644
--- a/dev-python/curtsies/Manifest
+++ b/dev-python/curtsies/Manifest
@@ -1,2 +1,3 @@
 DIST curtsies-0.3.5.tar.gz 53472 BLAKE2B 7ff50b8cf4b1b5016f15eee00333a1de38a31d97444f6462c7ec0429a1656bad442126880f770bff575dde8456660169cfadf63fed804b2c7890d700d792cc87 SHA512 e46ab3f79e2385055e4f3f9bc1d2c341605b93c21a0e6c42f4807b1801d37f70cfbdd1006db1ec12257e95d91aedddd95aa31a7de99bbfc09a6f0ee473497747
 DIST curtsies-0.3.6.tar.gz 53259 BLAKE2B 358e4d7a3ad8e5f705041cf8fdab9a26f0829d57dac93d23d1a524cb5bf2ca784aff9ea17d0e1c73ef4112f2b5b826f80d4c8d300ecd4ed53b031b3e81c78052 SHA512 3ba7050a614c992c6117e61758e378c82467f413f507277ddb78e42c03dbefe34c4fc4a60b29a8f8b24e8141b0521c87df81421fce5c7c64c28f6156b5af8207
+DIST curtsies-0.3.7.tar.gz 52487 BLAKE2B b5fdae3a2bc3900aa4221a39244fe3c781e004d378952af82c6275cb23fa53830f7f54ce5430287c8a5131ca220fb4aa7cddf33a4b913b27de35f1e275578b23 SHA512 a3c197a49c85f644fce3507380f6c77b857e2e97141634178b5d7c6b7673e90407fce68550c329dd4267e69e10fda3133522baadd765269b61e3f9fb800b7193
diff --git a/dev-python/curtsies/curtsies-0.3.7.ebuild b/dev-python/curtsies/curtsies-0.3.7.ebuild
new file mode 100644
index 000000000000..047b7c049ce1
--- /dev/null
+++ b/dev-python/curtsies/curtsies-0.3.7.ebuild
@@ -0,0 +1,27 @@
+# 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="Curses-like terminal wrapper, with colored strings"
+HOMEPAGE="https://github.com/bpython/curtsies"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-python/blessings-1.5[${PYTHON_USEDEP}]
+	dev-python/cwcwidth[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pyte[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/ddt/Manifest b/dev-python/ddt/Manifest
index 5ae63a494f6e..4800f9aebf47 100644
--- a/dev-python/ddt/Manifest
+++ b/dev-python/ddt/Manifest
@@ -1 +1,2 @@
 DIST ddt-1.4.2.tar.gz 17802 BLAKE2B c6ee061c48f5954f22bce20c255fa4c52aed9b756a22ec3678108abd78e66294c3f1e0316c4fcf2cc4fd6337915efbadf7bd123a2144ea38151079b85f2905a5 SHA512 f494c266af0f018d0c354309674cbf8c98bd8ba31ceb1820243ec1d92449ce712a21d22340fbfb4b1d850f4496a4cfcb4c24b346e88587c3dc025e2ef9496ad2
+DIST ddt-1.4.3.tar.gz 17862 BLAKE2B f19bbf282180614e1c8e3967a6af4e4696e1a9fce90c07a4438c7b2415ff1e85caf9c113ef3b4d89c11b2afd5ebb66b23c58b18e91a6416bfc1fc85851e75861 SHA512 ac66dd0d20c49df6fae6e86dfa1dce6d4326f985f17ad955ec2c7bdb2e411bf633baf2d3b244cd49ac45eb91e976a33460e73e4d155e17fbf90418062c6ca187
diff --git a/dev-python/ddt/ddt-1.4.3.ebuild b/dev-python/ddt/ddt-1.4.3.ebuild
new file mode 100644
index 000000000000..189ce5b803e9
--- /dev/null
+++ b/dev-python/ddt/ddt-1.4.3.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="A library to multiply test cases"
+HOMEPAGE="
+	https://pypi.org/project/ddt/
+	https://github.com/datadriventests/ddt/"
+SRC_URI="
+	https://github.com/datadriventests/ddt/archive/${PV}.tar.gz
+		-> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+BDEPEND="
+	test? (
+		dev-python/six[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
diff --git a/dev-python/django-mptt/Manifest b/dev-python/django-mptt/Manifest
index 4354c73b53bf..cdc0defa20c1 100644
--- a/dev-python/django-mptt/Manifest
+++ b/dev-python/django-mptt/Manifest
@@ -1,5 +1,2 @@
-DIST django-mptt-0.11.0.tar.gz 98300 BLAKE2B cbae24143007dfe8913aacf4cbe22bbccdf929617adc31640c2d429d6ea8be727a937be0aa8353e82862b9fe8c571397db4dd3877015eb17c2c5a56172cc66a5 SHA512 21af30007661db1474628b6f8af86a3f6de52494efe1aaf9235f8b1660ba153f0de3ad91ff979588e4b681b00b44652a05146df7d3951d6ee62da38a1900fd89
-DIST django-mptt-0.13.1.gh.tar.gz 302287 BLAKE2B 915e3066862be4d0883ba540cf584d917994ecbf83182726f5d39a40b61850e4ef1fade2c12325237f2c345de14ca6e54362712eb7bdbdf553eb6ebbf321075f SHA512 bc64d24f8d889109a054f270802f8ce6308c12bf3b9ebe1ba818d42e6c1f9d8904b8cad996e71e03c7f77ed80d912a7d8bb920cccc0e2fff170e754816367f40
-DIST django-mptt-0.13.2.gh.tar.gz 303658 BLAKE2B 8b9e968091be35d1b20816874f8a27cef065c11a25d5ac08192d01909be5a748ab96f0377a09b8a86ded5881d8ce075530bdd3a46c92065dd2f66d734853c27a SHA512 52e8631af11006a0ef1739d1f9c22d34fe39fd790dd45edb6bcde5f4ad875d6f2f0087aa4928d5e5b391b69728e67c2d8b6d10976714735eafe7b3b48e20d123
 DIST django-mptt-0.13.3.gh.tar.gz 303670 BLAKE2B 0185ecf3576ab7fe48ec4d7b2259e7cd88f2c5e3a8c96aa1ee555b7f0adabed4b787db84bcc4b2831746b410f0f58364df8fab9ce1768f1e1b9d1ff8a2869730 SHA512 602f45d4353dca80ec2285366c87eb60ff6a39a09990a041236f737371715166e9a8e360a83b4419c0ded7a206f73e4754de602aabef18f89e7db85ce8c651ea
-DIST django-mptt-0.13.gh.tar.gz 302525 BLAKE2B 21b2fde5c81d83321bf7569d2064db87aec3c184f27cf3fc3bd34421be04212188e15f79a575b08aabb3a7b95d116bf3e5f0fb57c56cadf9ad2ac166e8e77845 SHA512 63dbb61dab59d42b5e747f35370a0840d40ed465979d1f93e66561cf4c0726635cae774f87e39cc1ac480847f3ccf0eb65dc8593759a0860d586e334fdd37256
+DIST django-mptt-0.13.4.gh.tar.gz 303688 BLAKE2B 66ae7a0e15a7ff281af2154f216970a6a9b249a713b3ae987f0fbdb60b95129fdfc96c05924c0285da33f11c59baf6e069830c3079c64164d838d9d34231a4a9 SHA512 86786763db060227b41e2e340df5d52062fb6e8c54f832611bc90d01102411d45dc217e8d84eece84ebbe4fc9727d06e7c368ae15c253aaf02117705dbae8c47
diff --git a/dev-python/django-mptt/django-mptt-0.11.0.ebuild b/dev-python/django-mptt/django-mptt-0.11.0.ebuild
deleted file mode 100644
index ddc9ff0d783a..000000000000
--- a/dev-python/django-mptt/django-mptt-0.11.0.ebuild
+++ /dev/null
@@ -1,22 +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} )
-inherit distutils-r1
-
-DESCRIPTION="utilities for modified preorder tree traversal and trees of model instances"
-HOMEPAGE="https://github.com/django-mptt/django-mptt"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	>=dev-python/django-1.11[${PYTHON_USEDEP}]
-	dev-python/django-js-asset[${PYTHON_USEDEP}]
-"
-
-DEPEND="${RDEPEND}"
diff --git a/dev-python/django-mptt/django-mptt-0.13.2.ebuild b/dev-python/django-mptt/django-mptt-0.13.2.ebuild
deleted file mode 100644
index e861ed8dfcd1..000000000000
--- a/dev-python/django-mptt/django-mptt-0.13.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="utilities for modified preorder tree traversal and trees of model instances"
-HOMEPAGE="https://github.com/django-mptt/django-mptt"
-SRC_URI="
-	https://github.com/django-mptt/django-mptt/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	>=dev-python/django-1.11[${PYTHON_USEDEP}]
-	dev-python/django-js-asset[${PYTHON_USEDEP}]
-"
-
-python_test() {
-	"${EPYTHON}" tests/manage.py test -v2 myapp ||
-		die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/django-mptt/django-mptt-0.13.1.ebuild b/dev-python/django-mptt/django-mptt-0.13.4.ebuild
index e861ed8dfcd1..e861ed8dfcd1 100644
--- a/dev-python/django-mptt/django-mptt-0.13.1.ebuild
+++ b/dev-python/django-mptt/django-mptt-0.13.4.ebuild
diff --git a/dev-python/django-mptt/django-mptt-0.13.ebuild b/dev-python/django-mptt/django-mptt-0.13.ebuild
deleted file mode 100644
index 65e94e9aa5e6..000000000000
--- a/dev-python/django-mptt/django-mptt-0.13.ebuild
+++ /dev/null
@@ -1,31 +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="utilities for modified preorder tree traversal and trees of model instances"
-HOMEPAGE="https://github.com/django-mptt/django-mptt"
-SRC_URI="
-	https://github.com/django-mptt/django-mptt/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	>=dev-python/django-1.11[${PYTHON_USEDEP}]
-	dev-python/django-js-asset[${PYTHON_USEDEP}]
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-test-install.patch
-)
-
-python_test() {
-	"${EPYTHON}" tests/manage.py test -v2 myapp ||
-		die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/django-mptt/files/django-mptt-0.13-test-install.patch b/dev-python/django-mptt/files/django-mptt-0.13-test-install.patch
deleted file mode 100644
index 886d5c6e4ebd..000000000000
--- a/dev-python/django-mptt/files/django-mptt-0.13-test-install.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 6bc5860575d491e8cf1edbabee7b07f1c072bdba Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Sat, 21 Aug 2021 09:45:45 +0200
-Subject: [PATCH] Do not install tests.myapp
-
-Fix options.packages.find.exclude to cover subpackages of "tests"
-recursively.  Otherwise, tests.myapp is installed.
----
- setup.cfg | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/setup.cfg b/setup.cfg
-index b4094dc..b8ebee3 100644
---- a/setup.cfg
-+++ b/setup.cfg
-@@ -44,6 +44,7 @@ tests =
- [options.packages.find]
- exclude =
-     tests
-+    tests.*
-     myapp
- 
- [flake8]
--- 
-2.33.0
-
diff --git a/dev-python/doc8/Manifest b/dev-python/doc8/Manifest
index 02a4c2b515fb..e5144e18d0bb 100644
--- a/dev-python/doc8/Manifest
+++ b/dev-python/doc8/Manifest
@@ -1,2 +1,3 @@
 DIST doc8-0.6.0.tar.gz 21547 BLAKE2B 84908a28e46fa970db7510d5fec7815028b9e65bec3cb5c0352f4ed88560765bde4c76aea3ba803ce737dff1856b702b21cebcf151587f6ae2870d4d1126d0a5 SHA512 1858334d3a0247d4d30c311bd7f13be66a6cdb6131f9d24dc10e38efaed6e08c8c7d11b776ff5dac7d6ae5eeb1cb7ef03523bc3e244794625a8ac1346cc05d75
 DIST doc8-0.9.0.tar.gz 30995 BLAKE2B 9960e223e9ada9646a0e302230714dbeef1525bf9a912ec1b7a8a0c5e4bf2d2307c2303524668d770ddb38d0b30e4a868e5a2280b7c6ffc1b4b80854f2576e75 SHA512 ebff512dfffb7d21d9173f0ff6ca282810334abfbd9c95570dba4e27796e79bc8d14fd2914c029a3cbf235766305dfa37ca565e2e20d32c63ea741f8ce4d1ae2
+DIST doc8-0.9.1.tar.gz 31122 BLAKE2B 84708d05414fe1545558910d0d74ae9612091500efb1880062910b395f1244c6edb1fe1c95ff97a177fcbb4127fcbc4b819a749f90c8384c0c23e9041af12b25 SHA512 058403a808ec2d55cf732c8eb0e28f6902c935a6fe0fd4e3ce1a11088888f32875a416adf478b81192948ebd581548b2d1591581222f1e841e97777980a80d69
diff --git a/dev-python/doc8/doc8-0.9.1.ebuild b/dev-python/doc8/doc8-0.9.1.ebuild
new file mode 100644
index 000000000000..72995396cb31
--- /dev/null
+++ b/dev-python/doc8/doc8-0.9.1.ebuild
@@ -0,0 +1,37 @@
+# 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
+
+DESCRIPTION="Style checker for Sphinx (or other) RST documentation"
+HOMEPAGE="http://git.openstack.org/cgit/stackforge/doc8"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	dev-python/pbr[${PYTHON_USEDEP}]
+	dev-python/chardet[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/restructuredtext-lint[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/stevedore[${PYTHON_USEDEP}]"
+BDEPEND="
+	dev-python/pbr[${PYTHON_USEDEP}]
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/testtools[${PYTHON_USEDEP}]
+		dev-python/toml[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests unittest
+
+pkg_postinst() {
+	optfeature "checking pyproject.toml projects" dev-python/toml
+}
diff --git a/dev-python/filelock/Manifest b/dev-python/filelock/Manifest
index 321382d6b25b..8154b7579ce6 100644
--- a/dev-python/filelock/Manifest
+++ b/dev-python/filelock/Manifest
@@ -1 +1,2 @@
 DIST py-filelock-3.0.12.tar.gz 587613 BLAKE2B 3eb765e4cb251ace50fcaf3b7cf52939e697d5a710b87eb2f0ea0cf66f554b90bda2e95754b82e1544e45d0abd8dea861f52cdf9c7de0f1e91a8f5c8e0f9759c SHA512 0f30b54b9de2540f023855effcc582b18fedcee6681f21e1733f1b60dbd39eb148e3830bc798a44c5e8c22e7ea8ca26b6d4547fae79dacc78c62b819a3d84683
+DIST py-filelock-3.1.0.tar.gz 584958 BLAKE2B 29ce6c14ece7a45104ceda46bbb261730f7bf3e7df9d20be783a8e8324ca350e8b02a099f4273aff953281e10d305772c3572a72377f1039d0763c3d87173289 SHA512 cffca48f9e7b39a750bcecdbd4a1c8fd2a57c0eddd41fb735930ecb954550620ab89994cc159b6f0ada2cc0961a097e5e2c2ac380de424b59b111a3290682b86
diff --git a/dev-python/filelock/filelock-3.1.0.ebuild b/dev-python/filelock/filelock-3.1.0.ebuild
new file mode 100644
index 000000000000..2518396b809d
--- /dev/null
+++ b/dev-python/filelock/filelock-3.1.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 2018-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+inherit distutils-r1
+
+MY_P=py-filelock-${PV}
+DESCRIPTION="A platform independent file lock for Python"
+HOMEPAGE="https://github.com/benediktschmitt/py-filelock
+	https://pypi.org/project/filelock/"
+SRC_URI="https://github.com/benediktschmitt/py-filelock/archive/${PV}.tar.gz -> ${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Unlicense"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+distutils_enable_tests pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/google-auth/Manifest b/dev-python/google-auth/Manifest
index e6dabd720f08..c86e50b482b2 100644
--- a/dev-python/google-auth/Manifest
+++ b/dev-python/google-auth/Manifest
@@ -1,2 +1,3 @@
 DIST google-auth-2.0.2.tar.gz 180445 BLAKE2B d4e9e7dcfd690f5eedf301e989c4a2dedf509e7c3068e4f547ea43f870979a6001d21849a7102321f6f843196f0a4e0a14f888bd3b43701c301aea3a7f94ed60 SHA512 b8cec2fec4105715edad3242f20ac26b7ab2591903785ed5c31c1af19f7a23e14e93e0d4c3644dca76db5ec0353b8a1baba0224d67987067c5580c75592a04e8
 DIST google-auth-2.1.0.tar.gz 181817 BLAKE2B 806f3541163bd2f66a533730eb0064b4697716ab58595dc678fdef106dd49dd328378710650e77efc962547834808124eda934b69cc4ef18931624822710d90f SHA512 1460ad02c6ac549245433567583f76eea680ea941b2917887f7fda3f2f6d04c5b16e536368a2f2c0016acd2bacf894d1eafa9b26f148f66b212590eb0388d181
+DIST google-auth-2.2.0.tar.gz 183667 BLAKE2B ac71dfe657126f96fd78f4fde110630dd5e1fc2864579a199309725795ba337fa7a2771cccbaba9d12fd35639ef67a78cb71bfd2e1a8e963cfc62507b2513ec3 SHA512 00a2a28f5237bba58a578726ac6d3290eec37486343a0f2c1c1764c14db137cd68db776890cd2556516579b54ddbb7516c08782959f87867a1e30756821e489c
diff --git a/dev-python/google-auth/google-auth-2.2.0.ebuild b/dev-python/google-auth/google-auth-2.2.0.ebuild
new file mode 100644
index 000000000000..5dbfea8e2d83
--- /dev/null
+++ b/dev-python/google-auth/google-auth-2.2.0.ebuild
@@ -0,0 +1,50 @@
+# 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
+
+DESCRIPTION="Google Authentication Library"
+HOMEPAGE="
+	https://github.com/googleapis/google-auth-library-python/
+	https://pypi.org/project/google-auth/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	>=dev-python/cachetools-2.0.0[${PYTHON_USEDEP}]
+	dev-python/namespace-google[${PYTHON_USEDEP}]
+	>=dev-python/pyasn1-0.1.7[${PYTHON_USEDEP}]
+	>=dev-python/pyasn1-modules-0.2.1[${PYTHON_USEDEP}]
+	>=dev-python/rsa-3.1.4[${PYTHON_USEDEP}]
+	"
+BDEPEND="
+	test? (
+		dev-python/cryptography[${PYTHON_USEDEP}]
+		dev-python/flask[${PYTHON_USEDEP}]
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		dev-python/grpcio[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/moto[${PYTHON_USEDEP}]
+		dev-python/oauth2client[${PYTHON_USEDEP}]
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+		dev-python/pytest-localserver[${PYTHON_USEDEP}]
+		dev-python/pyu2f[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/responses[${PYTHON_USEDEP}]
+		dev-python/urllib3[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+python_install_all() {
+	distutils-r1_python_install_all
+	find "${ED}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/jupyter_packaging/Manifest b/dev-python/jupyter_packaging/Manifest
index 1ed0d03c617c..c85c5b7e15f1 100644
--- a/dev-python/jupyter_packaging/Manifest
+++ b/dev-python/jupyter_packaging/Manifest
@@ -1,3 +1,2 @@
-DIST jupyter_packaging-0.10.2.tar.gz 21735 BLAKE2B 92de31e6835a2228f85b008b0fa3b3b8b5ebd175399fa82ee79d328f97b50c09a86dbc325e0378a7f946de34522d4af12fa5997507895ff6d85e77d4e7d38e3c SHA512 c1f5562b8fd72d64998d32d1a85dd1af2b730fa7e4a0d9e2036ea4d5a607ce02b1e9c641f01997ea3b0d6e047fa797009ce3c2ca52ef866ec9c7492ef836e679
-DIST jupyter_packaging-0.10.3.tar.gz 21530 BLAKE2B 43392f938d40e859e79f42b7942a199f808218c1da697c48a8ae0b1c5a4e8a408f983196e9d148edbf17d1725186216ed79446bd42fe8f18baaf8fc9f66efe1c SHA512 7634a056d506328af6e963ac7a8d6ac5fdb5d5303a31495af2275a7feca3732b60aeebb332cdc009ab690aa4185f5b3687ae002300b4885620cb9f2da6d2c79e
 DIST jupyter_packaging-0.10.4.tar.gz 21698 BLAKE2B 5490443e197861a53587fe744d749162e412b88bc5c1e5917cd6c145254e4feecbb8b3e3853bf5a3e360fc9ee20c3345af9c7a245aeb1b03639d99d1d69cb377 SHA512 066abaaa00be8154ea39cc3db0bfa4cfe03864c3e50a741f416606c2f8a2d2e0202943f390905ee46f99414168705b9c3519609c6ea16b3b7d54820631c3ba46
+DIST jupyter_packaging-0.10.6.tar.gz 21836 BLAKE2B 921e763e11c3973442fa819559d921618aab4010ae7cd4ca3314acb53c7fd7be68f10af46b4d0c9888d2648c0e28565c22ad47270a9d9a1c950640b38a2a1078 SHA512 1b59219dc14c3e44c0f100e9a46b614a8c4395fc26937622515e82f4ffa35c29d8101d6f56a3d496da9279e1e7fc58a91af83bca2b50875afaf1745706ce466d
diff --git a/dev-python/jupyter_packaging/jupyter_packaging-0.10.2.ebuild b/dev-python/jupyter_packaging/jupyter_packaging-0.10.2.ebuild
deleted file mode 100644
index d3b800f9e2f4..000000000000
--- a/dev-python/jupyter_packaging/jupyter_packaging-0.10.2.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} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Tools to help build and install Jupyter Python packages"
-HOMEPAGE="https://jupyter.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/tomlkit[${PYTHON_USEDEP}]
-	dev-python/wheel[${PYTHON_USEDEP}]
-	dev-python/deprecation[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# Skip the tests that try to install things or call pip
-	rm tests/test_build_api.py \
-		tests/test_datafiles_install.py \
-		tests/test_install.py || die
-	# Permission Denied (tries to write to site_packages)
-	sed -i -e 's/test_create_cmdclass/_&/' \
-		tests/test_deprecated.py || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/jupyter_packaging/jupyter_packaging-0.10.3.ebuild b/dev-python/jupyter_packaging/jupyter_packaging-0.10.6.ebuild
index bcd095358848..cfdaff89f360 100644
--- a/dev-python/jupyter_packaging/jupyter_packaging-0.10.3.ebuild
+++ b/dev-python/jupyter_packaging/jupyter_packaging-0.10.6.ebuild
@@ -1,11 +1,10 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 PYTHON_COMPAT=( python3_{6,7,8,9,10} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
-
 inherit distutils-r1
 
 DESCRIPTION="Tools to help build and install Jupyter Python packages"
diff --git a/dev-python/nuitka/Manifest b/dev-python/nuitka/Manifest
index df731ca1bc3c..30b4ed0f3481 100644
--- a/dev-python/nuitka/Manifest
+++ b/dev-python/nuitka/Manifest
@@ -1,2 +1,3 @@
 DIST Nuitka-0.6.16.3.tar.gz 2965278 BLAKE2B fc015f78912688e3d3b0833e7c126833352aeda7ac2599685a007445c43a7099407c4797eba47d5254fb5befde9482c210b920f4c7e38a2d82dbb5331125abee SHA512 a46af040774fd3523b64c1a113f6d0251c8d45108686017dae07429107f5057025bbcfefc7ed2b86da32c69516285d3af55fe234d25d6949562a96b0eb3f5293
 DIST Nuitka-0.6.16.4.tar.gz 2963879 BLAKE2B a6a0029f06aac5ea8fb0fec81ac5b1c5b7bb0ed85bdd0f0308ac74140792360684f42cf79f7ff7e604de3729584b335671ff57f0805aac2154ef1ea88bbbf245 SHA512 e2c73b19e459c31b85adf79270e258ca3c431364ec90b51682a7a324aebfeab1ab7703421e8646e18e0bef62f5f5636bbbda74d0ec0e4666e1571d71d41971b2
+DIST Nuitka-0.6.17.tar.gz 3144123 BLAKE2B 07d95a987eb6c772cd58f8bd0bb7aca638c475e4e90b6a58af890e63b5d3bec9125efa54ba54925311a38cc06b3c8e60a86ce18be7f189da111798fe77da3bd5 SHA512 8678cb9cbc30d9a9a139f98ae94d7f881295bbfb5f450faafb335cce7243979ad3dbf81946024a67edea177f2baae9d694d9e93abc5389f34dddd06595158eff
diff --git a/dev-python/nuitka/nuitka-0.6.17.ebuild b/dev-python/nuitka/nuitka-0.6.17.ebuild
new file mode 100644
index 000000000000..acc004a70528
--- /dev/null
+++ b/dev-python/nuitka/nuitka-0.6.17.ebuild
@@ -0,0 +1,48 @@
+# 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 flag-o-matic optfeature
+
+DESCRIPTION="Python to native compiler"
+HOMEPAGE="https://www.nuitka.net"
+SRC_URI="https://nuitka.net/releases/${P^}.tar.gz"
+S="${WORKDIR}/${P^}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-util/scons[${PYTHON_USEDEP}]"
+BDEPEND="
+	${RDEPEND}
+	test? ( dev-util/ccache )
+"
+
+DOCS=( Changelog.pdf Developer_Manual.pdf README.pdf )
+
+distutils-r1_src_prepare() {
+	# remove vendored version of SCons that is Python2 only
+	# this should be removed when upstream removes support for Python2
+	rm -vR "${S}/${PN}/build/inline_copy/lib/scons-2.3.2/SCons"  || die
+	eapply_user
+}
+
+python_install() {
+	distutils-r1_python_install
+	python_optimize
+	doman doc/nuitka.1 doc/nuitka3.1 doc/nuitka3-run.1 doc/nuitka-run.1
+}
+
+python_test() {
+	append-ldflags -Wl,--no-warn-search-mismatch
+	./tests/basics/run_all.py search || die
+}
+
+pkg_postinst() {
+	optfeature "support for stand-alone executables" app-admin/chrpath
+}
diff --git a/dev-python/pycryptodome/pycryptodome-3.10.4.ebuild b/dev-python/pycryptodome/pycryptodome-3.10.4.ebuild
index 8282446572db..ef9b741281f0 100644
--- a/dev-python/pycryptodome/pycryptodome-3.10.4.ebuild
+++ b/dev-python/pycryptodome/pycryptodome-3.10.4.ebuild
@@ -18,7 +18,7 @@ SRC_URI="
 
 LICENSE="BSD-2 Unlicense"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="
diff --git a/dev-python/requests-cache/requests-cache-0.7.4.ebuild b/dev-python/requests-cache/requests-cache-0.7.4.ebuild
index 41344c1c4ae0..4e96121dab34 100644
--- a/dev-python/requests-cache/requests-cache-0.7.4.ebuild
+++ b/dev-python/requests-cache/requests-cache-0.7.4.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	dev-python/cattrs[${PYTHON_USEDEP}]
diff --git a/dev-python/sentry-sdk/Manifest b/dev-python/sentry-sdk/Manifest
index d94c9a67f13b..4fe2570e0cb0 100644
--- a/dev-python/sentry-sdk/Manifest
+++ b/dev-python/sentry-sdk/Manifest
@@ -1,3 +1,4 @@
 DIST sentry-sdk-1.3.1.tar.gz 219705 BLAKE2B 3fc8f81a5f762f400c70ae1c83ab46e97ec4641a61b86dc5b5a2cdbc22395b60fd53cef2d3d2dbfaaceb2d0bd32b842344fcaab898900b7dee2bd34ae3660f8b SHA512 60d819880b3d5316cad1ae4d236820f410c22c75c97d54d681f43ac6dfb503d3c5817314dd2db37107902b4e28d4f981ade200413388ecaf534135829723ef38
 DIST sentry-sdk-1.4.0.tar.gz 230870 BLAKE2B 8cad1f0046219b60af982d3a01ae67aa1b018c4c8815c2adae834beeea6015057791abff6e1213a4a5902fe62e56f232dcb0cb355927c2f986751145dc633962 SHA512 b1f3021b4a67c2c4e13109ec3e189d1e133f07ecad18bc3e0ebd7b99e90b53aa83cac2cc567b8b47763892a9e06e1795aca497f146cbaae15952c880f9c160cd
 DIST sentry-sdk-1.4.1.tar.gz 230985 BLAKE2B 0c193d5d564377d484e8e1ba2d30580ad373114e6a1eb3c4d38af6d9745aa788d1369836c4686b80503a027810273cd3a2d1833a6df18d32e1f352f6fb418c8c SHA512 b38ce6448553a05158690808ed4e7013c44f35922c1eb1662f3f9fa73e1c5f9d8a5385eccb8ebd062eae27b7e037ce0c204778ffd24b9ccf38b14d8e511d4cc9
+DIST sentry-sdk-1.4.2.tar.gz 231026 BLAKE2B 760d84b15ef6d002a3dbd92ce99efcd16738d4db9a2b47775d0da19649b85a0f3cd234a8ce98111599b27ad5c1e7eb901ff745d57c558f5603d4ea59b3ff5795 SHA512 227d5edb6e6585749df5e873e2c7c6191f96ea6071a22b44fb4901d5466218ca718ac81ec23a7c176c52734fad1f43331e58d670ee62c1892bf7768dd71f9fab
diff --git a/dev-python/sentry-sdk/sentry-sdk-1.4.2.ebuild b/dev-python/sentry-sdk/sentry-sdk-1.4.2.ebuild
new file mode 100644
index 000000000000..37378f0e763e
--- /dev/null
+++ b/dev-python/sentry-sdk/sentry-sdk-1.4.2.ebuild
@@ -0,0 +1,72 @@
+# 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 client for Sentry"
+HOMEPAGE="https://sentry.io/ https://pypi.org/project/sentry-sdk/"
+SRC_URI="https://github.com/getsentry/sentry-python/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/sentry-python-${PV}"
+
+LICENSE="PSF-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="
+	dev-python/urllib3[${PYTHON_USEDEP}]
+	dev-python/certifi[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/asttokens[${PYTHON_USEDEP}]
+		dev-python/django[${PYTHON_USEDEP}]
+		dev-python/executing[${PYTHON_USEDEP}]
+		dev-python/eventlet[${PYTHON_USEDEP}]
+		dev-python/fakeredis[${PYTHON_USEDEP}]
+		dev-python/flask-login[${PYTHON_USEDEP}]
+		dev-python/gevent[${PYTHON_USEDEP}]
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+		dev-python/pyrsistent[${PYTHON_USEDEP}]
+		dev-python/pytest-aiohttp[${PYTHON_USEDEP}]
+		dev-python/pytest-django[${PYTHON_USEDEP}]
+		dev-python/pytest-forked[${PYTHON_USEDEP}]
+		dev-python/pytest-localserver[${PYTHON_USEDEP}]
+		dev-python/werkzeug[${PYTHON_USEDEP}]
+		dev-python/zope-event[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local deselect=(
+		# tests require Internet access
+		tests/integrations/httpx/test_httpx.py
+		tests/integrations/requests/test_requests.py
+		tests/integrations/stdlib/test_httplib.py
+		# wtf is it supposed to do?!
+		tests/integrations/gcp/test_gcp.py
+		# hangs
+		'tests/test_transport.py::test_transport_works[eventlet'
+		# TODO
+		'tests/test_basics.py::test_auto_enabling_integrations_catches_import_error'
+		tests/test_client.py::test_databag_depth_stripping
+		tests/test_client.py::test_databag_string_stripping
+		tests/test_client.py::test_databag_breadth_stripping
+		# incompatible version?
+		tests/integrations/falcon/test_falcon.py
+		# test_circular_references: apparently fragile
+		'tests/integrations/threading/test_threading.py::test_circular_references'
+		# test for new feature, fails with IndexError
+		tests/integrations/wsgi/test_wsgi.py::test_session_mode_defaults_to_request_mode_in_wsgi_handler
+	)
+
+	# Prevent tests/integrations/modules/test_modules.py:test_basic failure
+	# Needs to detect sentry-sdk in the installed modules
+	distutils_install_for_testing
+
+	epytest ${deselect[@]/#/--deselect }
+}
diff --git a/dev-python/sphinxcontrib-doxylink/Manifest b/dev-python/sphinxcontrib-doxylink/Manifest
index be9be98343d9..a5e1c8e4f6cc 100644
--- a/dev-python/sphinxcontrib-doxylink/Manifest
+++ b/dev-python/sphinxcontrib-doxylink/Manifest
@@ -1,3 +1,4 @@
 DIST sphinxcontrib-doxylink-1.10.tar.gz 20217 BLAKE2B b5b1128d8b60e91b655b2efb093afc77f10e39912c841d2241576c0ed7f1c6d23c92272ee988435958155b9506d22dd5a8b0373bda7059040b38869aea37f9ef SHA512 08beb65cb22b02ae253bd526da00cee322cc72fc00214818f3d5fa503d36725a08f67c6b46f13fec10b1d9963cd7c7ecf57109342d7a2ba991cdba0fa6ef8125
+DIST sphinxcontrib-doxylink-1.11.tar.gz 22043 BLAKE2B 73d137d2c7df594c71def4d422040eb46028192c13a38b7f765dcbda82034936e3985309254b536d9ba49a32e2d9df9c8eb7886b7a365bbc0440e901cb0250c9 SHA512 14a3511c6958d05f6209c292563068e58410e6833821c8339fa95c511ac2c8987b05097a423313345f2c7e9c1dfd17136bd8684520341160fdaefae1bcc2dcc2
 DIST sphinxcontrib-doxylink-1.8.tar.gz 20005 BLAKE2B e435a65f3931c91e0d7d44d1cb4ebc8e7683ab906864e37a0ac31fc6655dba60cf53ef3d91b9e0ce440e86319ec45e0d81cf43459e02ac7e45c8d1ecbc2a9881 SHA512 1c53af2502fbb493a5834ae3eb05428dd296300f8027b5dd8d93cd67a03ea572ac81a0c3c8e6ddc9017a0b7a0859757d61ea67b73b3ed69fb1db76244ffd6874
 DIST sphinxcontrib-doxylink-1.9.tar.gz 20175 BLAKE2B ebff920929c29ecdff9ecb02ca3d7d4992b0da8a34497d9e2dc4b3cd66a5996264e0ab459f69c0ec83bfe60681beac56f981ecc72e128a08f095b4b0296061c5 SHA512 78ffc2d2babe6502bc8818116cca7da079f6ea9ab3f43efa587dbe5efe15d2492be6e763850c9a01e6053332871277dbbd7998803d0ab54616e93878d51c92b1
diff --git a/dev-python/sphinxcontrib-doxylink/sphinxcontrib-doxylink-1.11.ebuild b/dev-python/sphinxcontrib-doxylink/sphinxcontrib-doxylink-1.11.ebuild
new file mode 100644
index 000000000000..f45a7a732dfb
--- /dev/null
+++ b/dev-python/sphinxcontrib-doxylink/sphinxcontrib-doxylink-1.11.ebuild
@@ -0,0 +1,37 @@
+# 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="Extension to link to external Doxygen API documentation"
+HOMEPAGE="https://pypi.org/project/sphinxcontrib-doxylink/ https://pythonhosted.org/sphinxcontrib-doxylink/ https://github.com/sphinx-contrib/doxylink"
+SRC_URI="https://github.com/sphinx-contrib/doxylink/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/doxylink-${PV}"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-python/sphinx-1.0[${PYTHON_USEDEP}]
+	dev-python/namespace-sphinxcontrib[${PYTHON_USEDEP}]
+	dev-python/pyparsing[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	test? (
+		app-doc/doxygen
+		dev-python/python-dateutil[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx doc
+
+python_install_all() {
+	distutils-r1_python_install_all
+	find "${ED}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/spyder/spyder-5.1.5.ebuild b/dev-python/spyder/spyder-5.1.5-r1.ebuild
index 54d78304dfff..8882f46a6813 100644
--- a/dev-python/spyder/spyder-5.1.5.ebuild
+++ b/dev-python/spyder/spyder-5.1.5-r1.ebuild
@@ -136,12 +136,14 @@ python_prepare_all() {
 		-e '/python-lsp-server/d' \
 		-e '/parso/d' \
 		-e '/jedi/d' \
+		-e '/pylint/d' \
 			{setup.py,requirements/conda.txt} || die
 	sed -i \
 		-e "/^PYLS_REQVER/c\PYLS_REQVER = '>=0.0.1'" \
 		-e "/^PYLSP_REQVER/c\PYLSP_REQVER = '>=0.0.1'" \
 		-e "/^PARSO_REQVER/c\PARSO_REQVER = '>=0.0.1'" \
 		-e "/^JEDI_REQVER/c\JEDI_REQVER = '>=0.0.1'" \
+		-e "/^PYLINT_REQVER/c\PYLINT_REQVER = '>=0.0.1'" \
 			spyder/dependencies.py || die
 
 	# do not check deps, fails because we removed pyqt5 dependency above
diff --git a/dev-python/xmlschema/Manifest b/dev-python/xmlschema/Manifest
index 44b9db69f14e..656e48c1b063 100644
--- a/dev-python/xmlschema/Manifest
+++ b/dev-python/xmlschema/Manifest
@@ -1,2 +1,3 @@
 DIST xmlschema-1.7.0.tar.gz 370433 BLAKE2B 0270151705ca65d4b0f587e2ac75f7273a20242a0a315b4b954a6ccad6d46d7d093330a4c40d74a44c0c55af021da1c4ddde85f8431e0779d30e2164a599a335 SHA512 c4620f205cbdccef95a38eab6e6a5d6082681e3ff71708376f0ddeecd75a5c53f686fd740a41e98afd2ec5ec0f14be913b6c65bce80fab0143fa5fe1cc8a2ab6
 DIST xmlschema-1.7.1.tar.gz 372165 BLAKE2B a534c42d5405eefdfd0c595f1ea02a703c8f5a225f9a46ea4fe9885d09de4b87bc5ddb470fabaf3e01093012346247d34fd56495641815fe04f4fa1919f9f53f SHA512 4ad8ef9d91aa2e0b06d64aa06cc380898976c8c1b4efe049b67948b4534bb8edc3a3450cf5e242a004a039e8e29b23954138a0192ac6355fdeecb77e6284c3d9
+DIST xmlschema-1.8.0.tar.gz 379305 BLAKE2B dcc3fc5860dede681912f578b548bfe39feb5fda3dd7c5f0ed7f85fce247489d492b062b789acce6679cab835b31c1f77eb82ae43b83c5af5b749a4e93c991d1 SHA512 b4622030e959383729074554e80606dce6e731b9c4e3393c60a02d592acf66f07e50f12d65867fad31e18494e04a8bb1bdadcf22f110d91708e8a0fa89848e2e
diff --git a/dev-python/xmlschema/xmlschema-1.8.0.ebuild b/dev-python/xmlschema/xmlschema-1.8.0.ebuild
new file mode 100644
index 000000000000..c2371d4ee1a5
--- /dev/null
+++ b/dev-python/xmlschema/xmlschema-1.8.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="An XML Schema validator and decoder"
+HOMEPAGE="https://github.com/sissaschool/xmlschema https://pypi.org/project/xmlschema/"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/elementpath-2.2.2[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		${RDEPEND}
+		dev-python/jinja[${PYTHON_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
+	)"
+
+python_test() {
+	"${EPYTHON}" tests/test_all.py -v ||
+		die "Tests fail with ${EPYTHON}"
+}