Adding metadata

42 files changed, 407 insertions, 846 deletions

diff --git a/dev-python/Faker/Faker-9.7.1.ebuild b/dev-python/Faker/Faker-9.7.1.ebuild
new file mode 100644
index 000000000000..1f1f09ada79c
--- /dev/null
+++ b/dev-python/Faker/Faker-9.7.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+inherit distutils-r1
+
+DESCRIPTION="A Python package that generates fake data for you"
+HOMEPAGE="https://github.com/joke2k/faker"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/python-dateutil-2.4.2[${PYTHON_USEDEP}]
+	>=dev-python/text-unidecode-1.3[${PYTHON_USEDEP}]
+	!dev-ruby/faker"
+BDEPEND="
+	test? (
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP},tiff]
+		dev-python/random2[${PYTHON_USEDEP}]
+		dev-python/validators[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
diff --git a/dev-python/Faker/Manifest b/dev-python/Faker/Manifest
index f4fc0b7db9b0..26409f10e5aa 100644
--- a/dev-python/Faker/Manifest
+++ b/dev-python/Faker/Manifest
@@ -1,3 +1,4 @@
 DIST Faker-9.3.1.tar.gz 1169930 BLAKE2B 464f092a5014ebfe2d6c1a83f8d30f13507835a35e8307a22accdd6da92dae02a541ae2f686d724686855ded7b7e0f3c1f3922de0040e22478d9b55b2833b84f SHA512 e7468b4d91b47ad22d300a37dfa21b91f354b46f845854a9fe8b40da61624dafea5fca4f519939fcc16a84e9d9d9f33f715dabf4e231b9950b4a5b3a37cfacd0
 DIST Faker-9.5.0.tar.gz 1176231 BLAKE2B 5b1fbdec6952ee18c4f7243e1776cc5b44b99b2120f9fe7dcf3ad6a633b46644645e5f836456a969b4861ab672f59ac4b14268bee55b0168a8cddbe96774f481 SHA512 a42a26583432f85466e5791a98ae91e168e2a3bbb04cc1fcd90c9c5d76d1d9e4de709852b832e1ebac01c365e7a6598e707cbf7c36799f97f080cb0ce3f60cdd
 DIST Faker-9.6.0.tar.gz 1171903 BLAKE2B 2d7a7fae74d25cb67a339400952e9b783d26fb0b623bf75543e1b3d2c83dde86a0cbecb462ad236a6799e6f2527fc6fdcef22996128c9d6a8e0a6193b9273b6d SHA512 6b68188ab6996d593fd029b2e62f3d2c0f22259ffa737c6700cf032b0528c9809699c57a849c34e0c40e37d6784155309832a0a795c8775d114d3d1033e9b3fe
+DIST Faker-9.7.1.tar.gz 1175336 BLAKE2B 0af66ad2b04a5ab97bd13945f6b0e2b39ea1ad3f3a9c11b6f8e86718ac27636e19a1ddcc79d202bc820b3fe23ae17cd604e8bc5a5a34904c71efd654c3612ec4 SHA512 8b88a7b04ac37d7e122045e0cbad06c929a4973cf8c88f71546bb3d1e955a704a863d3ac999eaaeae801edc1154d98f3f14a657e7c6b99bee5fee2d1b68a0613
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index c28ca76e0d68..0a5bf109b2c3 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -1,12 +1,4 @@
 DIST boto3-1.18.53.tar.gz 422176 BLAKE2B a07155f6be71c049479c1d2e47767bb2c6863075ea0085ca5cc4609e28aa8b0af0e2136754c0ed6fd05dfecab079f76d636e19e1b8af4b68220768cea6125e93 SHA512 ae774e3db52a90a0850b4bd90be105d4ab59b6478ed16e30e2cc5afec0664e2b13438ab7a460e570c680d49be240855b7c9ae30a373c83d50dda5da6b84d01b7
 DIST boto3-1.18.60.tar.gz 428327 BLAKE2B d559c7512c7ab1160dfec4616741002ce82357d3469747044bf79f90baba5e6e3d2f2ecf32ae4cad7522a341d846d199cf34555376d05d56cdbfccc75d0f9042 SHA512 e013ec97b4379cbd3f21f000974d8078a2710f29a9a7d34532fa06c9011fb566238d38d45abd5ecad5b26ad544f72b86ae191fe475bd0d729d290553cd461ff8
-DIST boto3-1.18.61.tar.gz 428681 BLAKE2B 54aa44e4c1756172b5feada7c32a52d32a7938f284ff4ecad9964f74a340ee0cea5bbf1cae189ce90e3a38902398c10af739ec41da895104b10198e63e0d5cb1 SHA512 361e326d003879e81a9de00d469f5b6910c44ec4a4a2109db96b30f46499cdd07e80bd2ba4aeb7be149d9c5a0ead08c1d574369ddc90e31fb564eaab944c6cde
-DIST boto3-1.18.62.tar.gz 428868 BLAKE2B cb3d5cf5a0b2a15e5d881ce262d9dede08aa56a99cc2f470befb15063395ca761c8715b1b1e853626ae42d6f136c74dd65fe8abe8f1fdf00dca48ac601f1ce0d SHA512 265707cfd9529fc4300c744dbd17a823b32593b8bd1e26ccde5b6e80d7fea61c60b0d0d5e6f3d6606b3c4870c608283b7adddace2d4975367c7e1e4a1d10e003
-DIST boto3-1.18.63.tar.gz 429243 BLAKE2B 67b61ebe0d5a7c4d83922a3ec110e5d4e33c705e2a38031f218d2e059b1f8d9428d7307f0b5a581a60ef23068793e61cf6597827ffbb2a8714aed1e0716ac361 SHA512 d8f83d9edd730d40063f2cda759ad527d811c3f4bc7a8c450c3d426c7842e35481ae138e53dca2ce6ab4a30d06610f454c31a0d3259d56fe553f5b6d1ad58db7
-DIST boto3-1.18.64.tar.gz 429469 BLAKE2B c0e423871631017ef9aa5f1e89ada9c82c4c81762f724f7919005cca7078cfb008fd489cf1498a3011b2de0a4b0ac8da1ab0a5aeb8cd54667f4607d8e9fa1168 SHA512 1d56868fb8d6699aa118d1296ae9535d08143329e1df5281b29f6e4b9b7452846d3988ffb6fb66eace93e605e6bac9e04cf2e67f0a25b2b90dde27b02212587a
 DIST boto3-1.18.65.tar.gz 429858 BLAKE2B fbc80e0d8d10f6d02fcf9b86c6b4be03a9c908318c507a7cde1eef0c36d8fe3a5d3be0f8c6178edfdd8bc82adf112f297a5f127cd2b442ce10fe4d37b3a21fa4 SHA512 631d8f618fb6d55b338b563e72e1ccc751b8937bb2660d033b885951ea5ec3ac6902f8c7b9918664d764be84fdef5af4e7a87d444cbc154ebf5ae06908f90714
-DIST boto3-1.19.0.tar.gz 430753 BLAKE2B 24b18d5ac312cac54952e6abc0da80e09c7618ba7c24903d5539d182ce7deb71a5f4198dd66f71650a35192d2146aa6754a25c8ba30138476e8b16b822eb3969 SHA512 4c127d2503e48a3c74367b13831fb5907aa398a173e2793362f070136092e6f2c37e3c4c0e1aed21c11b02d9ada31a22b842d83ef4d47ac78e3d4541a0afe717
-DIST boto3-1.19.1.tar.gz 430897 BLAKE2B fad3df04ce3dd909684dae90d7b83f4c06bb33fd488e6916179bb886f2753890e82b53c38fcceb3a3342be0681f112bb836f65e293b762431abd2ab1b2b71061 SHA512 cefa3cd811559cba4bd8b39b5d9ed1b2f45d4cce45a537bcde32b808872d8d48828562f6226a128c0befc842777fb07b1ad81b4abbe7b45113b748d4086bb289
-DIST boto3-1.19.2.tar.gz 431304 BLAKE2B 9fe4bea7087488b5bc0ea0583fd774ed5b968dd3f2c948536d4063c246ffd74a1bd988046daeb7b8145f46b8f7e1ce6ffe93f8e18f624f65558e1dff1988edf0 SHA512 e23835e1f5c7ab8c3776d6632725bdf9eb4c72b34df6426967833bd799697326f88da2dcd12d4f7232ffba9cbcdf180fccdacf7f7a713c670584fc36182f3393
-DIST boto3-1.19.3.tar.gz 432019 BLAKE2B aed6e6001a421a3c7a885aabafc233a0291684eb23eb15cd1bfa27e961dae8be1964aa2cb803f1a139ea423cd756d95ba015e55287dd3c2838c74bf69c0d2acc SHA512 8a7dc38ba705e73d1d5f2bc7aac79efa9a56dfe6c60c7be40458670368e131800e1d48a6d97f1b84ee18036ea69f397441529b3a0410a2ca8c2d9b95d3085827
-DIST boto3-1.19.4.tar.gz 432282 BLAKE2B b0a96b4eb5d8a7a0e2881040cee848cb23d14caf649078566f0404d6a354da52d6bd97c2adec3e58d1e1a9dd239fe4ac828c0f92be7c36019c55fc26fb97d210 SHA512 6c8fb967492e9990851e4de3feb76618893464c9e144280741c7d5d41655e3a90ce2629c64c1822847816791aef256416474e78b85565e83041a8b2630bf1421
+DIST boto3-1.19.5.tar.gz 433567 BLAKE2B 52c12a4dd18d6f02326f8002b345cc5df224455fc862daa700326ae1df258979211d2753f01e1a106f237de393e483dc8926bb4ef0e08bafa575f20811dccd55 SHA512 fad05102f0c3e7e30a3342009f6b3ae28f52758f17a0c22b4da9a03dd10d7f9149ea2ec0119f55ec7280824bd8173653271821e82fcd54ef9fb9161b2d62df70
diff --git a/dev-python/boto3/boto3-1.18.62.ebuild b/dev-python/boto3/boto3-1.18.62.ebuild
deleted file mode 100644
index 30a0b44d3f8c..000000000000
--- a/dev-python/boto3/boto3-1.18.62.ebuild
+++ /dev/null
@@ -1,53 +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="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/boto3-1.18.63.ebuild b/dev-python/boto3/boto3-1.18.63.ebuild
deleted file mode 100644
index 30a0b44d3f8c..000000000000
--- a/dev-python/boto3/boto3-1.18.63.ebuild
+++ /dev/null
@@ -1,53 +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="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/boto3-1.18.64.ebuild b/dev-python/boto3/boto3-1.18.64.ebuild
deleted file mode 100644
index 30a0b44d3f8c..000000000000
--- a/dev-python/boto3/boto3-1.18.64.ebuild
+++ /dev/null
@@ -1,53 +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="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/boto3-1.19.0.ebuild b/dev-python/boto3/boto3-1.19.0.ebuild
deleted file mode 100644
index 30a0b44d3f8c..000000000000
--- a/dev-python/boto3/boto3-1.19.0.ebuild
+++ /dev/null
@@ -1,53 +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="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/boto3-1.19.1.ebuild b/dev-python/boto3/boto3-1.19.1.ebuild
deleted file mode 100644
index 30a0b44d3f8c..000000000000
--- a/dev-python/boto3/boto3-1.19.1.ebuild
+++ /dev/null
@@ -1,53 +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="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/boto3-1.19.2.ebuild b/dev-python/boto3/boto3-1.19.2.ebuild
deleted file mode 100644
index 30a0b44d3f8c..000000000000
--- a/dev-python/boto3/boto3-1.19.2.ebuild
+++ /dev/null
@@ -1,53 +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="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/boto3-1.19.3.ebuild b/dev-python/boto3/boto3-1.19.3.ebuild
deleted file mode 100644
index 30a0b44d3f8c..000000000000
--- a/dev-python/boto3/boto3-1.19.3.ebuild
+++ /dev/null
@@ -1,53 +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="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/boto3-1.19.4.ebuild b/dev-python/boto3/boto3-1.19.4.ebuild
deleted file mode 100644
index 30a0b44d3f8c..000000000000
--- a/dev-python/boto3/boto3-1.19.4.ebuild
+++ /dev/null
@@ -1,53 +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="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/boto3-1.18.61.ebuild b/dev-python/boto3/boto3-1.19.5.ebuild
index 30a0b44d3f8c..30a0b44d3f8c 100644
--- a/dev-python/boto3/boto3-1.18.61.ebuild
+++ b/dev-python/boto3/boto3-1.19.5.ebuild
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index 792947bf328e..685c604dce94 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -1,12 +1,4 @@
 DIST botocore-1.21.53.tar.gz 8221904 BLAKE2B 79a87c9678fad9f3b4503740d9857579850eb2e6cf8371e233b9957b031e79aa04f28ce35b96826bfa4ff08c84a7ec646c8cd4302e5eb785530e8f3e2bf9b2f2 SHA512 0a3704d68a09a1afe53d4321d327036f4581d8c6942bc02f594c26d24fa2a60cfbbfab595cc3c4a4e9d3439790835739f7be8c3b572536feb655646c7800cf61
 DIST botocore-1.21.60.tar.gz 8253381 BLAKE2B f035a335f8d72c182f6fbd3f2216608bd5683e70ae11fd8646ff81416262ec802aac5b084f0cf96d23fd6767bbe678e35b24377d82186440b3ee55c977b42643 SHA512 7e801f67c670a85ebd0641fe8a51890dcea1a3a6f2253cca1213ee96a20497c1196c16b2576bcd2dc796b501117d609240c59b1077bbdc0f3021cf6659289e21
-DIST botocore-1.21.61.tar.gz 8255275 BLAKE2B 53f5e6c3af455bd92f59152d28ed7a598c1743c9cc648bf28922ce2833f53f7fa01de052109225117cc52126593bf51ca56765d35d1e25ced2a4a2a2f88326c5 SHA512 8cd110f78acb1dfc29f9eda5bcecdecba07e2846faab063c8d86294ae81935783e62c66f7588d505a2f6ca69445eaa80835011ac7b19e975e8dce9f65b28b429
-DIST botocore-1.21.62.tar.gz 8256122 BLAKE2B cf51c1aa4890dd3deb9da8b4c51b89cd4c006ec604d7728304938833c156450829693daa563f59a09f066428348f70f5d8b94172341ac30be072443f6330b612 SHA512 c34e512d1ebc60e7c37d3fb6856e43affbfc77cc21c971547725277df5325d8ae20acbf00fe2e89fc2c564d8a911a6a0db913c9ab6bd769e38596f2d8eba36b4
-DIST botocore-1.21.63.tar.gz 8256427 BLAKE2B 7b6a4d29005cdf127881a88b51ffb3162698df011d7345137537666e92a01a00e44c0fc7edc8ec4c17d3d30ddc5ae801b253b0704e70c37f6de1979cd2fe86fb SHA512 e67b56d3549bd70101f322da04eacca261c2afe9cd2c065ac290b4266fed5342cb8f15a2edc144006c5dc91692a95ac49d9d2fde86db4014511bdc3bd95d9193
-DIST botocore-1.21.64.tar.gz 8258628 BLAKE2B 5a335085224ed86eb2364a67198f1fe8d745102e38ed3cab47821d5bd03c6163ccd7754fc2201384d16d28c9aaf2c0ad447f97374e1b6414739688c788b3b122 SHA512 f40aca854103d97f8d36d178cd5a8fc19e1bde63476c570ae357f2526a82054c3e26a4db26a996df23d66a09bb4ef9354372010b726499cce0021d2dd48c7bb6
 DIST botocore-1.21.65.tar.gz 8261668 BLAKE2B c955019d06aa1b2f4503673b7d9009e5d6e07ee4348e730e6b4d11285f3030f676f0efda58a72dd92cac8c6ba0cb57f8f879eb5298009ecbd227904d18a453bf SHA512 955d24d2d486524af7bee57a56e2e903458030420198f3e6ab49d61be52b812a98444a9d0f86503b121270d6642345ffad6053ad143374dc56ab908b385afb0a
-DIST botocore-1.22.0.tar.gz 8275754 BLAKE2B f0acbccf0c451f6cdd75495c15140c8c65bad567ab9f43c0cf77de8b1736689865688816f3b60ab697552f872f7027d26046050828dc0ad7666d5567b3b613ae SHA512 7f39cb16573d9ae4649ad67bb402f2d2fbd371f8818ec2573f7826e71828c559e37e6759e2c6ab8a05d6fa97ce53bac0a94f6d30dea0c184a079e97d1fba3597
-DIST botocore-1.22.1.tar.gz 8276879 BLAKE2B 91b339fa62d5faf808273c26187d86e1c855b140a22d348d04b95a21be47e2d83081d25e97efb1f7fae899a8abb98311250062e43e998199aff90486c154b178 SHA512 95ac5c5a0ff4cc31cd4fc0973cef45c5a6bce5b82091bde2f2c0cd8215c65c11be6d4fc62ef76110287e01dc54eb9b69e5bda0f2ce39b728d36097834afd47ac
-DIST botocore-1.22.2.tar.gz 8277756 BLAKE2B 6f875956c08d02ac9d92dd6c3aa7ac98cafa018612a98a75e67d50b9ac47d9e0ca7fad535c07b13006b68345be3cccc8bdd56a338cc0599a6182922df736d65e SHA512 6e9853a1cb05b5c3cd7f125b98a7d8bd72c7d188829c1704ca79e77cdfe08e9d9901507f89ca09a60e095da150f4721dd1ba1e52209cabd1ed240a59b920b71e
-DIST botocore-1.22.3.tar.gz 8286647 BLAKE2B 724687f78f9a90c2cc6e93b1071b6c926f9a668cf73d471c84a11da45ef818ac943bf80318f84102ec68fb5147da704ca06bb6bae5ebee96fb80bb383020f392 SHA512 5a664943badc6d775e150751bfe2e6125c0d4f46f77b262d4dca6d8f4cdfa04e0eb458104e9f2f3d16f6d42251318cf9e2969a1ba359c8e09ca2f3bf1d151882
-DIST botocore-1.22.4.tar.gz 8289629 BLAKE2B 871dcf2d4d994984e8fc160f53afcb51a3328e05ffe2b7890665aa1e4bb4ac837aabc8be09dc64c105b99eafcae4f6146e6539ae9005e6cf570090f32a3ce86d SHA512 1931063e27c63d464bf858b54a1a31f0465c9effaf13fa3ddd91fff4701d7f4546cc81b67d0772e0e10a525443a9df90b8d07bee31d012e88a4292dd115f399b
+DIST botocore-1.22.5.tar.gz 8301083 BLAKE2B 91f9d38e7c5bcb0b8f58c04547ad45489f58d2240c6b7301cf632969a4a73cf4a1d51c8c68c8def27653c10041d2163ad7ca800dcf6fd07972b506bf2566cae3 SHA512 710a9eeee03dc79ca4ffacc4974f09ca769e1e3b8cb143f6f0349240dd8c2af8ee526a1dadb7310a26019363f683fc4149cb4c73d8b94a856a384fab7f84fb5c
diff --git a/dev-python/botocore/botocore-1.21.62.ebuild b/dev-python/botocore/botocore-1.21.62.ebuild
deleted file mode 100644
index 9cd77a5ad4d0..000000000000
--- a/dev-python/botocore/botocore-1.21.62.ebuild
+++ /dev/null
@@ -1,50 +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="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-1.21.63.ebuild b/dev-python/botocore/botocore-1.21.63.ebuild
deleted file mode 100644
index 9cd77a5ad4d0..000000000000
--- a/dev-python/botocore/botocore-1.21.63.ebuild
+++ /dev/null
@@ -1,50 +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="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-1.21.64.ebuild b/dev-python/botocore/botocore-1.21.64.ebuild
deleted file mode 100644
index 9cd77a5ad4d0..000000000000
--- a/dev-python/botocore/botocore-1.21.64.ebuild
+++ /dev/null
@@ -1,50 +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="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-1.22.0.ebuild b/dev-python/botocore/botocore-1.22.0.ebuild
deleted file mode 100644
index 9cd77a5ad4d0..000000000000
--- a/dev-python/botocore/botocore-1.22.0.ebuild
+++ /dev/null
@@ -1,50 +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="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-1.22.1.ebuild b/dev-python/botocore/botocore-1.22.1.ebuild
deleted file mode 100644
index 9cd77a5ad4d0..000000000000
--- a/dev-python/botocore/botocore-1.22.1.ebuild
+++ /dev/null
@@ -1,50 +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="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-1.22.2.ebuild b/dev-python/botocore/botocore-1.22.2.ebuild
deleted file mode 100644
index 9cd77a5ad4d0..000000000000
--- a/dev-python/botocore/botocore-1.22.2.ebuild
+++ /dev/null
@@ -1,50 +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="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-1.22.3.ebuild b/dev-python/botocore/botocore-1.22.3.ebuild
deleted file mode 100644
index 9cd77a5ad4d0..000000000000
--- a/dev-python/botocore/botocore-1.22.3.ebuild
+++ /dev/null
@@ -1,50 +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="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-1.22.4.ebuild b/dev-python/botocore/botocore-1.22.4.ebuild
deleted file mode 100644
index 9cd77a5ad4d0..000000000000
--- a/dev-python/botocore/botocore-1.22.4.ebuild
+++ /dev/null
@@ -1,50 +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="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-1.21.61.ebuild b/dev-python/botocore/botocore-1.22.5.ebuild
index 9cd77a5ad4d0..9cd77a5ad4d0 100644
--- a/dev-python/botocore/botocore-1.21.61.ebuild
+++ b/dev-python/botocore/botocore-1.22.5.ebuild
diff --git a/dev-python/cfn-lint/Manifest b/dev-python/cfn-lint/Manifest
index d0233fe01fe3..4c036b2066af 100644
--- a/dev-python/cfn-lint/Manifest
+++ b/dev-python/cfn-lint/Manifest
@@ -2,3 +2,4 @@ DIST cfn-lint-0.53.1.tar.gz 7561747 BLAKE2B 2561a04344c567cf9e1e62cdd65e6de0bf8e
 DIST cfn-lint-0.54.1.tar.gz 7605760 BLAKE2B 3ce3895ed67b50fab85cb13ab34c2f1a8339a7e68467a82be7c9dde67cef0c700d3d9fcf3cac18afc657abef81316d5c770b8fe97ebdcfc81ca5b97e17fbf011 SHA512 742059b42c3df5a50102d437a11b03890f1579bc5769ca72a033477c9335b5a5d4b5a02973615b98ba9b8ee4022b86c82edac3490a0ec8c9a3f241afe84a9d03
 DIST cfn-lint-0.54.2.tar.gz 7658613 BLAKE2B a29a55756bc4f3fa2ebecc02365025911af238938717c7fd42d5b0707f80ec4149b1986fa3bd66cd704c20468437ee25a47d23c0e551f8e0793eed15499a8361 SHA512 185e0231bb49521b33232678bbd610004821872a5ba4f29bf6c7a4b1df884ab216ce7b4b61af164da7ae31ec83bed066d045c743bc7687690fe542d6f7f6b71e
 DIST cfn-lint-0.54.3.tar.gz 7806470 BLAKE2B b61cb4b46e7c9d04aa70d2542e2aee0d029cc265ca3b85d9bd1c9ddcf2d22a56b28d74f27d6ccf5348cef7224e1ca9d1efec3e5a7b478e8bb87afcb0d39b3da8 SHA512 40e593f0bf092dafca7d7a801deaf2e09c37f4421d58b9244a2da533c3079da076dab70cb974868fd3eb9300ef69897414b03854f8e8fee139e1f5b4781795fc
+DIST cfn-lint-0.54.4.tar.gz 7835716 BLAKE2B 1709adda09a08b02f4a2637af1ed2a43c096d8f9eef91b3cfbac55365e0910be64c632e28e403356742396b72a4af6c88740b27d13a67b62b5f5af98c8639e43 SHA512 f31b8fc407adf75b1eb54a29719b39298494efcdba65e68610e28ca1d066dfdb3fa051e8a90fe589793683c01e49d1bab30832255153e8932bd9caca96b54441
diff --git a/dev-python/cfn-lint/cfn-lint-0.54.4.ebuild b/dev-python/cfn-lint/cfn-lint-0.54.4.ebuild
new file mode 100644
index 000000000000..e11ded664f96
--- /dev/null
+++ b/dev-python/cfn-lint/cfn-lint-0.54.4.ebuild
@@ -0,0 +1,51 @@
+# 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.38.0[${PYTHON_USEDEP}]
+	dev-python/jsonpatch[${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/six-1.11[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests --install unittest
+
+PATCHES=(
+	"${FILESDIR}/cfn-lint-0.30.1-tests.patch"
+)
+
+src_prepare() {
+	# unpin the deps
+	sed -e 's:~=[0-9.]*::' -i setup.py || die
+	# requires git checkout
+	sed -e 's:test_update_docs:_&:' \
+		-i test/unit/module/maintenance/test_update_documentation.py || die
+	# requires Internet
+	sed -e 's:test_update_resource_specs_python:_&:' \
+		-i test/unit/module/maintenance/test_update_resource_specs.py || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/imageio/Manifest b/dev-python/imageio/Manifest
index dd7ab85042d1..654b90731b61 100644
--- a/dev-python/imageio/Manifest
+++ b/dev-python/imageio/Manifest
@@ -1 +1,2 @@
+DIST imageio-2.10.1.gh.tar.gz 334497 BLAKE2B 979107dec1c18c87a6620be90d68d24e37ae75f7418fafbe67d78fbc3de38b2ccd810e120501061d88a0029674ba814507ac73852b89559413f427986398819b SHA512 2af953f6c2eda3bf1fe3cf74a241bfb7cdb01ff3712f3d7526ceb1aad38499e481fd90eb782324264804c07fcb4425bcd0983be1ef0ec1d86a9b632098944f5a
 DIST imageio-2.9.0.gh.tar.gz 298291 BLAKE2B b36b0a5bf74938177353ffce103d7479a2b15442623d400261dac485b5cc7e8743b18e92d938fcfe2b68dfdef1d1417308e5441112ff851481cc768b76ab56d0 SHA512 a325ad4f0913219b87418d4f57fddc3f1e4c1be4102e933aa0c236317044d2a5ded623bbe86b92d3f2004bb9386ccb3f0cc03b7b118f9faa6f320dd147157ed6
diff --git a/dev-python/imageio/imageio-2.10.1.ebuild b/dev-python/imageio/imageio-2.10.1.ebuild
new file mode 100644
index 000000000000..3101497b5429
--- /dev/null
+++ b/dev-python/imageio/imageio-2.10.1.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 library for reading and writing image data"
+HOMEPAGE="https://imageio.github.io/"
+SRC_URI="
+	https://github.com/imageio/imageio/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+PROPERTIES="test_network"
+RESTRICT="test"
+
+RDEPEND="
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	media-libs/freeimage
+"
+BDEPEND="
+	test? (
+		dev-python/psutil[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# Fails because of system installed freeimage
+	tests/test_core.py::test_findlib2
+	# Needs unpackaged imageio_ffmpeg
+	tests/test_ffmpeg.py
+	tests/test_ffmpeg_info.py
+)
diff --git a/dev-python/peewee/Manifest b/dev-python/peewee/Manifest
index ed67a21c31a4..a0660b009779 100644
--- a/dev-python/peewee/Manifest
+++ b/dev-python/peewee/Manifest
@@ -1 +1,2 @@
 DIST peewee-3.14.4.tar.gz 882123 BLAKE2B e20848eaa7cd93ea5fcea152ffbfdbab694d9fea7ee8b945c029fee8d6c4a263317fbb0506df31d490611a2b2ac0718b0fdbea875f0013eb1f3f71941f12a26b SHA512 261856f4b691b8f5610d041a049148f213c22348a7e50514f7792932c1f4e8735b4dddb8a29c42e583c38e89551df2f05951d81bda0c47a80dc1eeeb0345f30f
+DIST peewee-3.14.7.tar.gz 891167 BLAKE2B eb8e095fc76ac8984f43fe57ea691eb570551fe07e43092a1d7acb023fbcf9cb1f3e921a428695c8e88d959cdf306c426a8fd3f3a58443a752521e161caa31ee SHA512 ea416fda8c39f08236d2f3b440ac6229a40b37caba7d487e1be34a75a05ff880eabb9423033043dfbfe25ab887fad8dcc8fcf2a3778836f19ae2c1ad8df77d96
diff --git a/dev-python/peewee/peewee-3.14.7.ebuild b/dev-python/peewee/peewee-3.14.7.ebuild
new file mode 100644
index 000000000000..0f35a057c153
--- /dev/null
+++ b/dev-python/peewee/peewee-3.14.7.ebuild
@@ -0,0 +1,35 @@
+# 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="sqlite"
+
+inherit distutils-r1
+
+DESCRIPTION="Small Python ORM"
+HOMEPAGE="https://github.com/coleifer/peewee/"
+SRC_URI="https://github.com/coleifer/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+	test? ( dev-python/psycopg[${PYTHON_USEDEP}] )
+"
+
+distutils_enable_sphinx docs
+
+python_test() {
+	"${EPYTHON}" ./runtests.py -v 2 || die "tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use examples && DOCS=( examples/ )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/phonenumbers/Manifest b/dev-python/phonenumbers/Manifest
index 196f966464d6..e9714de74407 100644
--- a/dev-python/phonenumbers/Manifest
+++ b/dev-python/phonenumbers/Manifest
@@ -2,3 +2,4 @@ DIST phonenumbers-8.12.31.tar.gz 2258495 BLAKE2B 7b08961cf50382857b5bdbeef640091
 DIST phonenumbers-8.12.33.tar.gz 2268271 BLAKE2B bbf84efe22806357f03f647952a66d58538975a932b290ca8d3f83996868a2320aa0d18b0094167f6e38514cde800163eb2240c89e7a244c3b1596743b20b39f SHA512 d156a501c1950ecd98eaa0515dfa8c8d38ad470344461ea3dd1f579091a60472b5998e98b3d7ba5b02db45bee94b1ee8db7543464677f5d79b36469717997f6e
 DIST phonenumbers-8.12.34.tar.gz 2268424 BLAKE2B c7094d0bdd11ee6d797314efc7d3353acf2711e6f7ac1c2861b611e98b7b7183af14ac8f0252772ccbd50f6b6e135143429cbe6191de85f3900e336ec1534a09 SHA512 9a751ce7748bb5fa19c3b25697599c07e169a136f10eb149e839f97bcb803f6ea79213152b4cc900ad288227b576f1ccaca443a97b06d7c12651cc9134771026
 DIST phonenumbers-8.12.35.tar.gz 2268389 BLAKE2B cd1a8613e8948d2abc1ae74d1be989330623fa6f8d22f0c529a88f0ddf20e70af3ca27300610c75783b71d675f5fd999b5c43bd6306d12f1576a520bbb9d0c65 SHA512 8c8599cafeca26d56ab488da8d9c7f959921527777188b3a9432ce3f47dded2df41fba34968a8c2a1a6dc816097bac8f25c060653d96c0904c2b83185d29fbae
+DIST phonenumbers-8.12.36.tar.gz 2268432 BLAKE2B 43ddd80c0dd32acbfe9c872c8cc3e84c4022524198c9baf65c802425f189e4501add440f55676f6d3540dc9acdcaa8a4420f3311928e8e505866e3d7d139e641 SHA512 d918027400bd29f48c9bd6ec2e9190f16619c3ceb33cffb752e797990356f88042188d9bec328071ca4723a1c5bfc1e11c4aa9cf9cde81fb8996a6fa262455d5
diff --git a/dev-python/phonenumbers/phonenumbers-8.12.36.ebuild b/dev-python/phonenumbers/phonenumbers-8.12.36.ebuild
new file mode 100644
index 000000000000..717843f08927
--- /dev/null
+++ b/dev-python/phonenumbers/phonenumbers-8.12.36.ebuild
@@ -0,0 +1,19 @@
+# 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 port of Google's libphonenumber"
+HOMEPAGE="https://github.com/daviddrysdale/python-phonenumbers"
+SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DOCS=(README.md)
+
+distutils_enable_tests setup.py
diff --git a/dev-python/pyparsing/Manifest b/dev-python/pyparsing/Manifest
index fb0d52f8b908..852301052054 100644
--- a/dev-python/pyparsing/Manifest
+++ b/dev-python/pyparsing/Manifest
@@ -1,3 +1,4 @@
 DIST pyparsing_2.4.7.tar.gz 648158 BLAKE2B 24525b4ee7876e245b9eb270f0e3e22fe2d8b398f9777ad3b3657b8a1227dcbd25983aa64a3f3018debdbffc1a042c732e6b3a09800e081c7acac7b97da15317 SHA512 c7a546729f86a2b5176e2482b566b9fd715b03e495aaef4d720b21307bb03f385dbc849247f8d266cb3d92be0a83c34ce4995b655ce85318355d5a0d42d6991e
 DIST pyparsing_3.0.0.tar.gz 935578 BLAKE2B 2932fb8da83f4f7b0ba98057002c870ab54f50bb93cea3f1da1cb9bba87fd8a6066c7bbee700667663285226ad6bf637f340160ccf7b7b06616e1140a7b93ce3 SHA512 1400370a6e7518940b7965645578028588af5a4ec1c379d57c924f036c86e342a9a60f1dd5c700ce8a4dbcd16afb55a2a4c371548c8bac6c53338b5cc349f4d8
 DIST pyparsing_3.0.1.tar.gz 936219 BLAKE2B cc7dc4670f37a09e98c8bda785bac4121150f1a48438cc42c6fbf0546531e7fc674f2bfe1c85aba66ac1075b9c086d9ee30672a3eebc60efec21fd51772f577f SHA512 70f2f957c713a88979ae95de8834a79c777196a2a6d47a25bf930cdefdc3120919147a33119ada0d33c53bb215fcddfa969b0d1630d2979c9e685d85e5c57414
+DIST pyparsing_3.0.3.tar.gz 938435 BLAKE2B 5237244693759ffc19637b4d8ee52f98b7160160c1f422a1720b9a8848025f37cb8b314aae505acb7696cc1546c495d049a6a93b3824d784b89aee3565001a4a SHA512 19735a3125620716a0a843156e6e9285c7811aa4db876fdc9fed7413dff77c0670fea5a0a16bc074704c6fec45f0129d1a3680b2123abf3c414fa75d73e03d36
diff --git a/dev-python/pyparsing/pyparsing-3.0.3.ebuild b/dev-python/pyparsing/pyparsing-3.0.3.ebuild
new file mode 100644
index 000000000000..798e1d9c0ea4
--- /dev/null
+++ b/dev-python/pyparsing/pyparsing-3.0.3.ebuild
@@ -0,0 +1,44 @@
+# Copyright 2004-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# please keep this ebuild at EAPI 7 -- sys-apps/portage dep
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+inherit distutils-r1
+
+MY_P=${P/-/_}
+DESCRIPTION="Easy-to-use Python module for text parsing"
+HOMEPAGE="https://github.com/pyparsing/pyparsing https://pypi.org/project/pyparsing/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${MY_P}.tar.gz"
+S=${WORKDIR}/${PN}-${MY_P}
+
+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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="examples"
+
+distutils_enable_tests pytest
+
+EPYTEST_IGNORE=(
+	# railroad-diagrams not packaged (and not suitable for packaging yet)
+	tests/test_diagram.py
+)
+
+EPYTEST_DESELECT=(
+	# also railroad-diagrams
+	tests/test_unit.py::Test02_WithoutPackrat::testEmptyExpressionsAreHandledProperly
+	tests/test_unit.py::Test04_WithPackrat::testEmptyExpressionsAreHandledProperly
+	tests/test_unit.py::Test06_WithBoundedPackrat::testEmptyExpressionsAreHandledProperly
+	tests/test_unit.py::Test08_WithUnboundedPackrat::testEmptyExpressionsAreHandledProperly
+	tests/test_unit.py::Test09_WithLeftRecursionParsing::testEmptyExpressionsAreHandledProperly
+	tests/test_unit.py::Test10_WithLeftRecursionParsingBoundedMemo::testEmptyExpressionsAreHandledProperly
+)
+
+python_install_all() {
+	if use examples; then
+		docompress -x /usr/share/doc/${PF}/examples
+		dodoc -r examples
+	fi
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/python-dbusmock/Manifest b/dev-python/python-dbusmock/Manifest
index bce430d03a03..e730a536e227 100644
--- a/dev-python/python-dbusmock/Manifest
+++ b/dev-python/python-dbusmock/Manifest
@@ -1 +1,2 @@
 DIST python-dbusmock-0.24.0.tar.gz 81907 BLAKE2B 5fc8653228d9278c74e623d385c798ba078da5d8309a95e88a893d3ceb1736568f93196defcde1845bfee193ec2e7abb4197a663f612dfe4ff58ac9c0bb189e3 SHA512 531c2d427da28098d7dac91cd5be1c38be15dfc9495314a150523e56c10ffda846667dfda39cc47c8278ad41800fe39d6608f24da44ff2ae7d53f0413826d96c
+DIST python-dbusmock-0.24.1.tar.gz 85781 BLAKE2B 2364ace9354cf626354aca5ada8b6fffe08dc742ffcf9f734c7214d5b0e982cfefdf238063e6b077cb1da832e758eb4eee74c00200f11927117c2faf9c72785a SHA512 705c974be203ae9104a703146e40420c59342ec1a6f3804e1d8e81c13401e95f5850ecc6e2b6e16bda4c9cc9f6ab0f82b5c829f4af947ff7d337ab8e63534596
diff --git a/dev-python/python-dbusmock/python-dbusmock-0.24.1.ebuild b/dev-python/python-dbusmock/python-dbusmock-0.24.1.ebuild
new file mode 100644
index 000000000000..4a170d4c1028
--- /dev/null
+++ b/dev-python/python-dbusmock/python-dbusmock-0.24.1.ebuild
@@ -0,0 +1,33 @@
+# 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="xml(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Easily create mock objects on D-Bus for software testing"
+HOMEPAGE="https://github.com/martinpitt/python-dbusmock"
+SRC_URI="
+	https://github.com/martinpitt/python-dbusmock/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]"
+
+distutils_enable_tests unittest
+
+src_prepare() {
+	# needed for unittest discovery
+	> tests/__init__.py || die
+	# linter tests, fragile to newer linter versions
+	rm tests/test_code.py || die
+
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/python-fcl/metadata.xml b/dev-python/python-fcl/metadata.xml
index d32393e9b0fa..14655d8a23bb 100644
--- a/dev-python/python-fcl/metadata.xml
+++ b/dev-python/python-fcl/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
- <maintainer type="project">
-  <email>3dprint@gentoo.org</email>
-  <name>Gentoo 3D Printer Project</name>
- </maintainer>
  <longdescription>
         Python-FCL is an (unofficial) Python interface for the Flexible Collision Library (FCL), an excellent C++
         library for performing proximity and collision queries on pairs of geometric models.
diff --git a/dev-python/python-xmlsec/Manifest b/dev-python/python-xmlsec/Manifest
index 8b21cbd08819..d283c819e1cd 100644
--- a/dev-python/python-xmlsec/Manifest
+++ b/dev-python/python-xmlsec/Manifest
@@ -1 +1,2 @@
 DIST python-xmlsec-1.3.11.tar.gz 75023 BLAKE2B 87fe4b47a9df6bc2fb2f1a459fa20240d9d5c92e0f7fa9bfc466e1fbfc0e3f12d90d01f5c7a6eac1389ea3252b8267a545203edf34c30117573bada9a7f5481a SHA512 fe0144d67edcad366b1d0f4615983f5630afd8f22aa056f46d1e6564f1c3114c0a469675e64a06591540515b0d12b5bf9304845f5138b24e15acaf4e5b861961
+DIST python-xmlsec-1.3.12.tar.gz 77722 BLAKE2B b5ecece8063b823cdbe4d58967d10026bdc6f3774954021a3739d579ba3c5a08130af1792921c7892e6bc3d00f88ac83ab30e862775e419e0dad40b990b10cbe SHA512 19c5e3bf58b4b0f8a1cca3e60c08348b02ae298620f8c02b8cfb325aecf0313cb2bd1af89507b754ebe4c35af3b031e232d15ddcd42deae0821c9c0d7571aa7c
diff --git a/dev-python/python-xmlsec/python-xmlsec-1.3.12.ebuild b/dev-python/python-xmlsec/python-xmlsec-1.3.12.ebuild
new file mode 100644
index 000000000000..07727ee72459
--- /dev/null
+++ b/dev-python/python-xmlsec/python-xmlsec-1.3.12.ebuild
@@ -0,0 +1,43 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+inherit distutils-r1
+
+DESCRIPTION="Python bindings for the XML Security Library"
+HOMEPAGE="https://github.com/mehcode/python-xmlsec"
+SRC_URI="https://github.com/mehcode/python-xmlsec/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+RDEPEND="dev-libs/xmlsec:=
+	dev-python/lxml[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-python/pkgconfig[${PYTHON_USEDEP}]
+	dev-python/wheel[${PYTHON_USEDEP}]
+	test? (
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+	)"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.3.11-fix-xml-testfail.patch"
+)
+
+EPYTEST_DESELECT=(
+	# Fragile based on black version?
+	tests/test_type_stubs.py::test_xmlsec_constants_stub
+)
+
+distutils_enable_tests --install pytest
+
+python_prepare_all() {
+	sed -e "s:use_scm_version=.*:version='${PV}',:" \
+		-e "/setup_requires/ d" \
+		-i setup.py || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/sybil/Manifest b/dev-python/sybil/Manifest
index c7aaeb7e1830..d344d3574395 100644
--- a/dev-python/sybil/Manifest
+++ b/dev-python/sybil/Manifest
@@ -1 +1,2 @@
 DIST sybil-2.0.1.tar.gz 29316 BLAKE2B cf03bc1595efab535d1248b9d267dcd01547f02539977c12b8753e70d13ea0744a6ab76dc1e44fd1c46d192577aa4c1a9b5d5d52678928acfd63937358fa3e33 SHA512 4f3be7686c1acf6812623a756fa79b41e3fbe5d4c3b4c7cf5dfe39fbe56806b4ef3acd24e25968ab9119b2c65ad5c30eabe32f1a93fb62ba8d3893ef123e69f0
+DIST sybil-3.0.0.tar.gz 38011 BLAKE2B 7a42d5b0f3f13ac111d9edc9f74cb4d968f49680bb33d267ee762e830b134fa8c2e1697834d6a6a7aa09c9cd1dc52552379ca43e6667ee844f54f34b8bd3ffc7 SHA512 b6f5b5ebdeeab2ecbe17b6f83f0bc7e83e68f8e784b6a0eea292020db42294f8a1d0288d208f8a5803d5866038c3226f0b7d0d177c91469c4651364078d1bb4d
diff --git a/dev-python/sybil/files/sybil-3.0.0-test-order.patch b/dev-python/sybil/files/sybil-3.0.0-test-order.patch
new file mode 100644
index 000000000000..1badf5b06a19
--- /dev/null
+++ b/dev-python/sybil/files/sybil-3.0.0-test-order.patch
@@ -0,0 +1,45 @@
+From 4d1e1c891bd619a0dec0a265a930bf49050833d1 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Wed, 27 Oct 2021 13:07:01 +0200
+Subject: [PATCH] Restore sorting of test paths to make tests reliable again
+
+11496eb5761761b687ad4889b4173d3124caa844 has replaced the all_documents
+method with a direct call to glob.  This has implicitly resulted
+in removal of path sorting that in turn means that the test output
+depends on filesystem order now and is no longer reliable.
+In particular, the tests can now fail randomly depending
+on the underlying filesystem, unpack/checkout order, etc.  Restore
+explicit sorting to make test order predictable again.
+
+Fixes #34
+---
+ sybil/integration/unittest.py | 2 +-
+ tests/test_sybil.py           | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/sybil/integration/unittest.py b/sybil/integration/unittest.py
+index 7129ddf..ce34caf 100644
+--- a/sybil/integration/unittest.py
++++ b/sybil/integration/unittest.py
+@@ -38,7 +38,7 @@ def unittest_integration(sybil: 'Sybil'):
+ 
+     def load_tests(loader=None, tests=None, pattern=None):
+         suite = TestSuite()
+-        for path in sybil.path.glob('**/*'):
++        for path in sorted(sybil.path.glob('**/*')):
+             if path.is_file() and sybil.should_parse(path):
+                 document = sybil.parse(path)
+ 
+diff --git a/tests/test_sybil.py b/tests/test_sybil.py
+index 74a04ea..72a5aea 100644
+--- a/tests/test_sybil.py
++++ b/tests/test_sybil.py
+@@ -243,7 +243,7 @@ def parse(document):
+ 
+ def test_namespace(capsys):
+     sybil = Sybil([parse], path='./samples')
+-    documents = [sybil.parse(p) for p in sybil.path.glob('sample*.txt')]
++    documents = [sybil.parse(p) for p in sorted(sybil.path.glob('sample*.txt'))]
+     actual = []
+     for document in documents:
+         for example in document:
diff --git a/dev-python/sybil/sybil-3.0.0.ebuild b/dev-python/sybil/sybil-3.0.0.ebuild
new file mode 100644
index 000000000000..29d41741b077
--- /dev/null
+++ b/dev-python/sybil/sybil-3.0.0.ebuild
@@ -0,0 +1,21 @@
+# 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} )
+inherit distutils-r1
+
+DESCRIPTION="Automated testing for the examples in your documentation"
+HOMEPAGE="https://github.com/simplistix/sybil"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+
+distutils_enable_tests pytest
+
+PATCHES=(
+	"${FILESDIR}"/${P}-test-order.patch
+)
diff --git a/dev-python/textdistance/Manifest b/dev-python/textdistance/Manifest
index 4a3aedf10276..811e9e228875 100644
--- a/dev-python/textdistance/Manifest
+++ b/dev-python/textdistance/Manifest
@@ -1 +1,2 @@
 DIST textdistance-4.2.1.tar.gz 45095 BLAKE2B c0b7fec8adb3a90fc2f3c939a39492887a4989e16d6bd9c548fceb1d5020323d2782dabdb69ae17dc4c3cd795425b3fbdf9bb6041b1ef7df840c2b3a9e2a7e05 SHA512 daff22077800e42ae266edd8614a1300f3f2d080868dbd38e14d035f19853e555485d27ab0392401318e0c4ddc81fbf1b537dd3aa1ba25d7a89e5f0edde8ce46
+DIST textdistance-4.2.2.tar.gz 45089 BLAKE2B 8b08db743a56c289cc10a9ceb606612acb2a13d12cd12f9627870a4748c415804bde7c3f1aee54d59a49053731727827dbbd5f4ed6c2cfcc302166575ba382ca SHA512 f181686153e6e8f1541a15ac752e6a86698445713732858e63b6465c96dfeb582d2ea6cad1f7c526a3dc60796d58064355480bc6ced7dc69268a5c0abbfabdb7
diff --git a/dev-python/textdistance/textdistance-4.2.2.ebuild b/dev-python/textdistance/textdistance-4.2.2.ebuild
new file mode 100644
index 000000000000..9195dafd19c0
--- /dev/null
+++ b/dev-python/textdistance/textdistance-4.2.2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+inherit distutils-r1
+
+DESCRIPTION="Compute distance between the two texts"
+HOMEPAGE="https://github.com/life4/textdistance"
+SRC_URI="
+	https://github.com/life4/textdistance/archive/${PV}.tar.gz
+		-> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="
+	test? (
+		dev-python/abydos[${PYTHON_USEDEP}]
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+		dev-python/isort[${PYTHON_USEDEP}]
+		dev-python/jellyfish[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/python-levenshtein[${PYTHON_USEDEP}]
+		dev-python/pyxDamerauLevenshtein[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests --install pytest
+
+EPYTEST_DESELECT=(
+	tests/test_external.py
+)