Adding metadata

author: Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> 2021-03-30 13:46:11 +0000
committer: Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> 2021-03-30 13:46:11 +0000
commit: 7da9cc3184c814f66312ba9693c3326ddab7c24c (patch)
tree: d301a3b4a2f8897b1ce6ba3f3f26ffdfd8ddd6cf /dev-python
parent: 70f18960a76e8d361f71ee03ccce00e11d199380 (diff)
download: baldeagleos-repo-7da9cc3184c814f66312ba9693c3326ddab7c24c.tar.gz
baldeagleos-repo-7da9cc3184c814f66312ba9693c3326ddab7c24c.tar.xz
baldeagleos-repo-7da9cc3184c814f66312ba9693c3326ddab7c24c.zip
115 files changed, 402 insertions, 3015 deletions
diff --git a/dev-python/Faker/Faker-7.0.1.ebuild b/dev-python/Faker/Faker-7.0.1.ebuild
new file mode 100644
index 000000000000..f88b1f2d978a
--- /dev/null
+++ b/dev-python/Faker/Faker-7.0.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 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="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/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 902aa30cbf45..1b5b20192592 100644
--- a/dev-python/Faker/Manifest
+++ b/dev-python/Faker/Manifest
@@ -5,3 +5,4 @@ DIST Faker-6.6.0.tar.gz 1114719 BLAKE2B 2e3639eba6ad74784ef30e2e7e6aa8b9fdc61c1d
 DIST Faker-6.6.1.tar.gz 1115484 BLAKE2B b5c99a61cf0937c10bf2eab0e34c51f38eb1aa7e87f47bbd8618874a24278bc7c2230acaffbea69f51cca760e3f3de73d32ccc487201c3bae7a544511aadac94 SHA512 a15c42291656d32f962ee50217e67cfd4038e39a6c4ba4cca6708d4ad9b4698a2b946d899e53968f4a9c2fee02c494ba756cbcc4014b16a8adeb73c83b9b428a
 DIST Faker-6.6.2.tar.gz 1115505 BLAKE2B 40bc09cafa1dfdda05bbf6c78380c5c3c0de85157dae856251063b0f099e32a08009a223dff70e3b3c037d572e4249cfee942b8749f78bd52506191dc180a13c SHA512 b6b75fd1891644e49d47acacfab9e705540003f18a8df413683e7ff0a3fb1283ede9f6020b19aee1a242a4a002ac1a34713701f283aae2089ee52d84c00764f4
 DIST Faker-6.6.3.tar.gz 1142318 BLAKE2B 7708b5fe576adee33bdd86076bd3bbf6ec785822183ac070ac8dad045e238291cb42367342b2d8ccb9bec4e36fda77680cfd08adedc7caf165e682d96ad833cf SHA512 d846e2a51f5b40d067abf4baa36aca3a8dfbaad585ca61c7146a33fb42e255a1a8ce173f74a379c5701b5aee02987bb89e0670287347ca866cacba93d0936dbf
+DIST Faker-7.0.1.tar.gz 1143226 BLAKE2B 0c5db5c718cb9d32e3c87d44e7fa66c8cf89a99f69988935f94a64460852d6c1f1ccb6c069795a6ea807c8de067cc3808121da7e07d8fdb326e27cb345141c42 SHA512 9a1aefaacd727bbf2e94239620948900e8bd33d5c3fa9cc30814850433cc5bbd4392d1f1d9f2c51d10e77cd1645d2d6919254663b438a45a7e1694988c58ac92
diff --git a/dev-python/arrow/Manifest b/dev-python/arrow/Manifest
index 6cf9e7466461..0d77cff8bfdf 100644
--- a/dev-python/arrow/Manifest
+++ b/dev-python/arrow/Manifest
@@ -1,5 +1,2 @@
-DIST arrow-0.17.0.tar.gz 97411 BLAKE2B d908f9e98b4046aa8afbde992e108106e0cb81d5d37a556ace06585b7d354fa75338e5c4e4263ece0d8d043f29f3909e3c200b2c79c744a4bd13319764667998 SHA512 30ab01c66ef1dfb7fb35dc8609ca19039fa3e37638ff0df681d0ffc9dbc832e9d3a577d9a45fc70ff3e74aacb6198b37e61ada22854572c57c27d7ecbef09caa
-DIST arrow-1.0.0.tar.gz 101951 BLAKE2B b8949dc2274f44020bd70e1013b3b3053789319daae0c630e17d2bac66d614e958b2d34ed9b06a1a5502a21684de10e053d4f1e70bfaf9a630548135d72f364f SHA512 4e487a0c1c6f55361b8ec673082d61efec1b27a32b19e2e599a344407737e5eea47ee8e2173b2f089e69a5638f99022870bb3ac57f31c16d5b4efd2858933fa8
 DIST arrow-1.0.1.tar.gz 102243 BLAKE2B bad601878bf692858db56967b456fa0c413faebcaaeee352ffe40933cfd915dca8dbbcc2ce4e4f37e03b393acdbfc94d49b8825664a9d1e246ae91a350e9cfcd SHA512 5500df4af6ac8c2858dc98a427a4b81d51d08a4bb44841ef03bbb3a57c9c9004a306e5d627a5202d5b7498dfb71c3602c1ec265666958a94b95861c901ecd79a
-DIST arrow-1.0.2.tar.gz 102330 BLAKE2B 2f7b737890aceceb265d2790d163c2d2325e78cc9045a95523b4e71d520f7d1fdb10efd18ccfc305bf10b27cf8f503a4e5bfc81897936b7c63600a3569ddd230 SHA512 a1ddfda75c84bd1e7708ba8368bbf672b1906bcd3a10cfb9ff867c72acd4da977089b4059b16de29c6112ce793e459f9eaa173f345bd25727c2dcbacbe235b05
 DIST arrow-1.0.3.tar.gz 102536 BLAKE2B 020b9b12a529f31c8054cfe98b99ee791cd1f2889422e4bb1b0bb6873ff4c1748951b63d20d2526af2bea3ff13b26d809b35eed36984d1063c35c334d76ee416 SHA512 f8da6574758ca1f319ed9d71e4fc6e44d3c3db0a6fe36c8868c3515ab789093660e3d57d6de60813cf2eb57c7a3a8bfe92facbb410a383528cb1fbc37d860b49
diff --git a/dev-python/arrow/arrow-0.17.0.ebuild b/dev-python/arrow/arrow-0.17.0.ebuild
deleted file mode 100644
index 9917ab775b9e..000000000000
--- a/dev-python/arrow/arrow-0.17.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Better dates and times for Python"
-HOMEPAGE="https://github.com/crsmithdev/arrow/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-
-RDEPEND="
-	>=dev-python/python-dateutil-2.7.0[${PYTHON_USEDEP}]"
-
-BDEPEND="
-	test? (
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-		dev-python/simplejson[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e '/addopts/d' tox.ini || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/arrow/arrow-1.0.0.ebuild b/dev-python/arrow/arrow-1.0.0.ebuild
deleted file mode 100644
index fbbddd1ffbaa..000000000000
--- a/dev-python/arrow/arrow-1.0.0.ebuild
+++ /dev/null
@@ -1,35 +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="Better dates and times for Python"
-HOMEPAGE="https://github.com/arrow-py/arrow/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-RDEPEND="
-	>=dev-python/python-dateutil-2.7.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-	' python3_7)"
-
-BDEPEND="
-	test? (
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-		dev-python/simplejson[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e '/addopts/d' tox.ini || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/arrow/arrow-1.0.1.ebuild b/dev-python/arrow/arrow-1.0.1.ebuild
index fbbddd1ffbaa..114964753b10 100644
--- a/dev-python/arrow/arrow-1.0.1.ebuild
+++ b/dev-python/arrow/arrow-1.0.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 RDEPEND="
 	>=dev-python/python-dateutil-2.7.0[${PYTHON_USEDEP}]
diff --git a/dev-python/arrow/arrow-1.0.2.ebuild b/dev-python/arrow/arrow-1.0.2.ebuild
deleted file mode 100644
index fbbddd1ffbaa..000000000000
--- a/dev-python/arrow/arrow-1.0.2.ebuild
+++ /dev/null
@@ -1,35 +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="Better dates and times for Python"
-HOMEPAGE="https://github.com/arrow-py/arrow/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-RDEPEND="
-	>=dev-python/python-dateutil-2.7.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-	' python3_7)"
-
-BDEPEND="
-	test? (
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-		dev-python/simplejson[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e '/addopts/d' tox.ini || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/autoprop/Manifest b/dev-python/autoprop/Manifest
index 6ca9ddbb7324..daa988f1d3c5 100644
--- a/dev-python/autoprop/Manifest
+++ b/dev-python/autoprop/Manifest
@@ -1 +1,2 @@
 DIST autoprop-1.0.2.tar.gz 11040 BLAKE2B b53bdbf79947002a0c319fa84c6033908948365d18a85dd2fd4139bff2125752e0bc3fc8f19e5d38c06cdc089f423cc8a720b8040593cfbda9c04c84b7cd4ffd SHA512 281c30fded6d79ed3bbb0de5b7a37c2cc5b985a4980974503b5bbb5940cd22f3c09c3b3d9d513d5cb95239519519b277bf43536407fedb593a43122ee32a8db6
+DIST autoprop-2.0.0.tar.gz 11705 BLAKE2B 0dd6401671250f9445aaaf20345035bec683eb7e7e3889ee6c89bbefd76bff9112c848ab4b95c47f09f2487af92c3c6a3404be17bc57f47c9be33f36ec369175 SHA512 7e2f9d2d950ac8f2b0e73b483940590dbb6eb342a36204cc36fff219375eb223c62d5c0dc864b0d1212593919f1625cd282f0467a5bf84d5c1e5c158cfcf6cc1
diff --git a/dev-python/autoprop/autoprop-2.0.0.ebuild b/dev-python/autoprop/autoprop-2.0.0.ebuild
new file mode 100644
index 000000000000..d092325a5c87
--- /dev/null
+++ b/dev-python/autoprop/autoprop-2.0.0.ebuild
@@ -0,0 +1,20 @@
+# 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="Infer properties from accessor methods"
+HOMEPAGE="
+	https://github.com/kalekundert/autoprop/
+	https://pypi.org/project/autoprop/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+KEYWORDS="~amd64"
+SLOT="0"
+
+distutils_enable_tests pytest
diff --git a/dev-python/autoprop/metadata.xml b/dev-python/autoprop/metadata.xml
index f8fe38dc6339..c5e4d861db18 100644
--- a/dev-python/autoprop/metadata.xml
+++ b/dev-python/autoprop/metadata.xml
@@ -5,18 +5,22 @@
   <email>3dprint@gentoo.org</email>
   <name>Gentoo 3D Printer Project</name>
  </maintainer>
+ <maintainer type="project">
+  <email>python@gentoo.org</email>
+  <name>Python</name>
+ </maintainer>
  <longdescription>
-        Properties are a feature in python that allow accessor functions (i.e. getters and setters) to masquerade as
-        regular attributes. This makes it possible to provide transparent APIs for classes that need to cache results,
-        lazily load data, maintain invariants, or react in any other way to attribute access.
+		Properties are a feature in python that allow accessor functions (i.e. getters and setters) to masquerade as
+		regular attributes. This makes it possible to provide transparent APIs for classes that need to cache results,
+		lazily load data, maintain invariants, or react in any other way to attribute access.
 
-        Unfortunately, making a property requires an annoying amount of boilerplate code. There are a few ways to
-        do it, but the most common and most succinct requires you to decorate two functions
-        (with two different decorators) and to type the name of the attribute three times.
+		Unfortunately, making a property requires an annoying amount of boilerplate code. There are a few ways to
+		do it, but the most common and most succinct requires you to decorate two functions
+		(with two different decorators) and to type the name of the attribute three times.
 
-        The autoprop module simplifies this process by searching your class for accessor methods and adding properties
-        corresponding to any such methods it finds.
-    </longdescription>
+		The autoprop module simplifies this process by searching your class for accessor methods and adding properties
+		corresponding to any such methods it finds.
+	</longdescription>
  <upstream>
   <remote-id type="github">kalekundert/autoprop</remote-id>
   <remote-id type="pypi">autoprop</remote-id>
diff --git a/dev-python/awscli/Manifest b/dev-python/awscli/Manifest
index 80f42185a2c9..8d710f9bd6d0 100644
--- a/dev-python/awscli/Manifest
+++ b/dev-python/awscli/Manifest
@@ -1,2 +1 @@
-DIST awscli-1.18.160.tar.gz 1882701 BLAKE2B cb797537646f27f8e09ac4674417ecac75fc691d6a7153d92cc810372721f3609ef37288cc8f226f09e1668b732bbe7d0b9195c2d0a29daca537b95181253fe9 SHA512 c69c617af4370f4d646051361cbf6d20add410a70bbc55a3fe3e8d5d957990dcaefa3991d61d14379d156919a2696303adb327ebb45f519fa557493c60f50489
 DIST awscli-1.19.3.tar.gz 1950305 BLAKE2B de9e11c2de811dea812e77a18dc9306044840ea586094cf57602cf4255723a7d94a20de414f8674d1ed6af2eed523024f61719299a3efcc492380d5d80c75575 SHA512 1034b82a9f1f0e92ae65bd28918f6f4422b0347435b4d2567b5004c370cbe1517d7fe275b672afd850ef6b99bee6f0b821097640a482626c800d19d095f42072
diff --git a/dev-python/awscli/awscli-1.18.160.ebuild b/dev-python/awscli/awscli-1.18.160.ebuild
deleted file mode 100644
index bcef8c90e27f..000000000000
--- a/dev-python/awscli/awscli-1.18.160.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-
-inherit bash-completion-r1 distutils-r1
-
-DESCRIPTION="Universal Command Line Environment for AWS"
-HOMEPAGE="https://pypi.org/project/awscli/"
-#SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-SRC_URI="https://github.com/aws/aws-cli/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86"
-IUSE="test"
-
-# requires network access
-RESTRICT="test"
-
-RDEPEND="
-	=dev-python/botocore-1.19*[${PYTHON_USEDEP}]
-	<dev-python/colorama-0.4.4[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/rsa[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
-	<dev-python/pyyaml-5.4.0[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-	)
-"
-
-S="${WORKDIR}/aws-cli-${PV}"
-
-python_test() {
-	nosetests -vv || die
-}
-
-python_install_all() {
-	newbashcomp bin/aws_bash_completer aws
-
-	insinto /usr/share/zsh/site-functions
-	newins bin/aws_zsh_completer.sh _aws
-
-	distutils-r1_python_install_all
-
-	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
-}
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index 86446d59e715..a39a0fddada7 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -1,25 +1,6 @@
-DIST boto3-1.16.63.tar.gz 345303 BLAKE2B e6877aeb3efd8018188eaf687b96e604f6b6b4910ae1a96d6f0d6db335f836d223f3f3216990a8a1eed3af91830ef8effd52f2c16148bb05dd4a6d69f777ef76 SHA512 25df3e65feb6c89c865021311d3c63bb52b5e48ef2e09813f548b1cc4c28b462969b4c3ec5192ab8b02ab9faef28f9ff042ea78f22d19a8df96f1211a9e1a763
-DIST boto3-1.17.12.tar.gz 346906 BLAKE2B 47ada52081fca432f23e6c373949bbea74c04396f9fbc15a9ec45654b2e077067c03bf633449e43079000e8be275322048a9f48ae0dd895b30cca2b16a61860a SHA512 76f8462604bded88b959f8a0ebcb4a4bc4bbb31de70c2d527e2d0420fbbd0f4bd014cb255f354648fb57a43600190573b41c6eba8a87c3186c5c93224fe59216
 DIST boto3-1.17.17.tar.gz 347835 BLAKE2B 7861befb9275b0cf36235749369f65b69845ef710404708c2c51c9223d370fd46eede4121be501eb9022f6a62a0158d2cad03ce4095640064def3a9d35be7478 SHA512 5d6bc48f9480963abcbf41c4b95e86ac6339f5386508be7108ec08e91c07c280786d3a4bec2b731c7b5710351e0398c4ab86f4fb95440e83936409b40e1c3015
-DIST boto3-1.17.18.tar.gz 347971 BLAKE2B 1390758e578763d0e8faba73e44e769224f6b3ff54e88798cd2d3a79c7d0fe5c3ef58a08e6a4aec70a7c3a64bbcbac22cd8471679951794fc1c0e48623f31008 SHA512 372baa35ddb770d65cd680544c9dd504a1e19b1052355b729f5b3ae8ef480ad4e250bef305671b1ec9741d953e813209398e8afe1bd396cc1e9c79221e34c629
-DIST boto3-1.17.19.tar.gz 348163 BLAKE2B 47b3f24dd7af7362fb37fb66bb333ac7a607b3d55790e47e3987d88f1ae09fe0a5bcafbbbe6245ecda378a8c56f6cfaa2a86c0b6e0dece58b0b6d2c819646a8c SHA512 ddfccb03335b3389a820a37e2e3ea40414291243291887be6dfd4243e43d918882e7386373578cf6474c5b8c5f592a15e650528b5cf61cb3b989522d4bff7ec1
-DIST boto3-1.17.20.tar.gz 348258 BLAKE2B b26a72e3861c8e45a11f4d8da3733cbdefe5e2b4a9328feac2e87a03c92e32efa0f896a60cc1a7e286ad3c93bfc07c1fd92612fed716607f7a408a837ec5954a SHA512 430d796ca12cf6497e70afcde7be5ab77910728bc0cc6cce74ceefc232d93e592d71864c33f403f75a8fb1bf67e7da9435e0f563d8d83b75d315c6ed50f779f1
-DIST boto3-1.17.21.tar.gz 348371 BLAKE2B 97799d4013e8ace6ebdfbb471c51743112e0d103fa1e13b947989c8da5b6517a2a6c088807519c735f5eb80ea1cedef3aae7aea5b2bd7b337af0ddc6744d91d9 SHA512 092e84c0e15a686634ae247295b5e525da605c9845950094525746df07e59082f36e90be66cb7726f6bc0ce4ac918aeb7e8f8efced98c1a002b8775d5ea68a04
 DIST boto3-1.17.22.tar.gz 348457 BLAKE2B 952650e5ebd51fe8f83ab9eeb0b9d76438865205cae75ff52fcb51aef38f2a3b61a0838dc7dbecac13f71774619a55b944bf8afc5894c93016c37b283e19cab0 SHA512 02a0e9f7723d61b5d21cc503f5dd3001aeb9433b989688728d5475e40852e84dfb0de6757f38c78b40b47d81321236aaf535aaa0b763deac8df9e4c1213c87b4
-DIST boto3-1.17.23.tar.gz 348518 BLAKE2B 53e918cbb39f4cc1a5fc9303817efe7fade551c0c6ff80ef4093871fe1c99a4e01bb9dbdf5815c4b46803a327878454971a88a8fa12053009a61afefacfe9b84 SHA512 f4e9ccfe4d7da3bec049f415e5236e00c701335b3eec842c2e6955e43b4b1ede834b116b6299f43c3cd6eae3d2496ffb58017b64730a3bc8c1913d603c9eadf9
-DIST boto3-1.17.24.tar.gz 349323 BLAKE2B 41a15fb92218d9aa936300054805b4cda52f373165e6d9f1f0b9f1edc0035e95a1134a407dd740856f8d28878e77ea669e6589ca20ab7af616390fda575d661c SHA512 57bc612e1f86edd2264364ad35c4a334a0ed98173d4f1e6808dce0b3c65dda4eb550fa231520aa67259a185d37e2b9e61e5ab4e1d7c41f7a0f22f270d1a07867
-DIST boto3-1.17.25.tar.gz 349475 BLAKE2B 272c5bebed211d015638a652109f2b56475e0d682ff585915061a495ce26ca6c12a5e844f9d4b73fca105c2f40e3fe7c1aa5bee045af284f45e74899cde3fde2 SHA512 d24c118a4af747360f226c9c6e98e26ad3dacf34f13dadb084fef4e7404d1141c66cf5d7074eeea2c792b134e7b83174bc0be0c387c478fd61de646118b41b9e
-DIST boto3-1.17.26.tar.gz 349529 BLAKE2B 8510b229aea7b725c6286772dff6d54a9df684eac7e455929c059fd02919238335c88af5c655e89bfb5821ac4b70415c8dbd2c549563d008823104d6d54088be SHA512 5ceb9dc557796471f4d582bdf47614a078285a83f9463acb92e5e59e9f82dbca379bf02c2288cf38cb5741f7860d6c8b23872305209d8a4ece697943cd06932d
 DIST boto3-1.17.27.tar.gz 349887 BLAKE2B 1fde4af489c98b8c4f77660ad278abf6641f70da3a0f84ff33d29d082cd283cd8a9faa17a3d9675ca26453f8928c57bb2e3966c607ab677ed814e544c6c928bb SHA512 9c3e45d17a179edf6ff75c9392a3e16323029e4bcefec757a6dd94ccfad5afe718bf91ca6a72ea59fa2791d5a87e9c4b84d147d35b7f584d2df0f73a623c13fb
-DIST boto3-1.17.28.tar.gz 350316 BLAKE2B a6fab50a064fd81337c013bb2516ba2baaa520aa8e7f08418ddaf9b6f0d99a1c8b8eb29b8fee6ab48620430153a0caf4bd296448e1de35a26a972d2e4bbf6df8 SHA512 c26800e18bb254707f0c7e7005b22b1270eae8bf0b8c13f6bcbbe46105ff7439b36c9c80863aefd1037df314abc687bf9b00045d12fb0d3b7337b02605810876
-DIST boto3-1.17.29.tar.gz 350960 BLAKE2B 8192d2ea8165b7d10ffdd56b30ba3fadf6f2373c61fc3a9b61713bd299f246ec1b00dce897254f954a93b3b7c150e1cbe8ddf4f0a5894a071e656963d3a06299 SHA512 f662a39aa66ffead103f1d8153ba4175a4905a96b152c1c23030ead3b731cdd008a50dea5f7192d719df2240f35e0290d9b4b3c00e87e77b5d396be7e707be8f
-DIST boto3-1.17.30.tar.gz 351634 BLAKE2B e6ad4b4e09ae45684ccd799da45dcf7844149b3dd735a378e90949fd4d533df494b93ef1b97c09057336bae63103bc03f8ce1e9500a5293c617fc8267bc35e89 SHA512 d2b6ac1307ccfe71fba12ea5838726c52c4f45a9467a9b0cf01c4e6898fa0744f6c7ea4cca7294b025dcd21b9e1f15d8aabd15c56e2796035b33e8e3c52f1e45
-DIST boto3-1.17.31.tar.gz 352268 BLAKE2B eefb7bcc3c6809fc03de2f175d5c3cfa750bc8650d56d5ee18608077a88a1c09ea79c2de1ce67f7d48129d5c948a7e5e30ab261c55a381ccf5c030dc42ff0ee0 SHA512 2d603a307575ff04877105ac98068d96b676faaa89b73ef470d9341951d5fcc148a57c7e80867d93bf257854ec700f61e48575ceebe19591091bbf2a68701138
-DIST boto3-1.17.32.tar.gz 352337 BLAKE2B 0d453ecd51d17291f10d2ffa4ae7b1036dced70a5ca0eafdc5f3073829942ecde57fe20f4d0139bfb2f75bdc47a000624281258ff621b98683ea41eae1a4bc71 SHA512 1bf61e3fcd2d650a534de5e7ed471bbdfeb2be6771f1dbde057ea2e3f3b6a29d6022011b5df90bae5c7ff231aec63ec49501cc3bd42421ec510d73e712060aad
 DIST boto3-1.17.33.tar.gz 352659 BLAKE2B b78e3ce86b32d23ade26d93d0c3ba86020a94becb42a866be6ee02f268819eb78fde398b4bd3125c5be6b493b28434c448411b9bd83eb631a3687019aa384ae0 SHA512 452cb1d165afe03a7603999033348524212d62742a026bc51677f5b64e9de98be2920c89f7aaf5999dd676c0c9ff098af055edc01edd97bad239815263ffbd38
-DIST boto3-1.17.34.tar.gz 353010 BLAKE2B a50c6a7d5fa6cf0336fe69d5a78d3dd5b651f6b475ec34bdb3242a3efc0614d567e6dbed1029f7b0483c9b699b30c9c42a676b23671677f1ee89ecbbf06e10f8 SHA512 f1b79b1b626aaa25631f3d99f44a15b2862face3aedff273910f43d44c04bd4211aff240d8f3231280170c5403b75e0058f4a466bdc9d9fb8ce044f32eb998ab
-DIST boto3-1.17.35.tar.gz 353497 BLAKE2B cf250901bfd67254c91dc468678d5935f076e37f5ead8a57bd8083ded3a0f24fbfa078b220c8c93310f2a75690226d374063ad9d0e022d39c2aaeab844e00bd3 SHA512 2d26f0009f4d3cd7a39c1b82426cfc3be18210ba7effaa31ce5ff0e1aa4ec26d0854f235f3e15be9db853242d348095c0c4691fd05a39921c25e948b4b1fef19
-DIST boto3-1.17.36.tar.gz 353804 BLAKE2B e7a863dc2b9761a15191e43dd32f50243934d163b1a2b3a08577579a5b5ff4496062699a2287ce8cc3445e8ffbda0ddcf9e4c24b98d57a43153cb0d0fac4b695 SHA512 a786499b2147ce6b2920230b9700fe0941b332290675e5897ad94b15d262452e93f9bcaf56f676f52eeea383269af553b95e478d9b554b3596721e578dc6160d
-DIST boto3-1.17.38.tar.gz 354416 BLAKE2B ac29b9bb2d589170567b0bf42ef7e3404bed83f9a5f5795b4468cd516c1f4e25c0f47e28e1c7f0dbbeb564782af32ae24c4a7429949f1e092045b974bcbfd96c SHA512 558a75f5e855997e98e20eebeb410fb2f7b125eb5c908e5aab873b89956d3c18be75d32c14a44e1cc7e838bb2ae1fdf37a1b4e4697bb311f4d47dc85e4e57831
 DIST boto3-1.17.39.tar.gz 354720 BLAKE2B bd5f9f676c346efc9264e42e802d0c5af5a3674cd4693019d39409e11958947c4a19982ce8572cc1be400f604b85428f6e964df175a71c35ffe11023b19cf733 SHA512 e12c08d06f68900291b36c71252d613a3a26298bdb9c665a1378ab5d26eacd65b496057aee74fedab6d5d955312d9225e63f7e0f1438d8fa739c2c1581d62297
-DIST boto3-1.17.7.tar.gz 346682 BLAKE2B 08c06dda1d59b4f555cad075673917b38cbf9ad8d0037f66027b17076e60b4d5fd32a93e088635320ebc3226a9cd8809c9208ec84f8588c26a77766b21dbee98 SHA512 2ba1817575c4a64c232c84a75a9d3b0db1de8634ded9aa31844930a82ccf4611805c6dd31b2e4d36cc9a2cc1813d233b4d7366305eaf28efd46a3b843d3c2993
+DIST boto3-1.17.40.tar.gz 355270 BLAKE2B f7f3af1882ee9188e37ac90f7ebd55b4cec016a12404dfa402da8bbbfaabb904e7d16a77e4f73b1e5da14550944a97672e5ccaa555f57662616233dbfd807cfb SHA512 6d21fbfac86e9a5992ecef35cc8b29c43bd9bb5823672eb8a375c239369edb775fbddf80f2d64209a4d106e2fd02e72583b6e5c8c6c98fdcb45ea17f1dfc0e41
diff --git a/dev-python/boto3/boto3-1.16.63.ebuild b/dev-python/boto3/boto3-1.16.63.ebuild
deleted file mode 100644
index ed20a9d55fa0..000000000000
--- a/dev-python/boto3/boto3-1.16.63.ebuild
+++ /dev/null
@@ -1,56 +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=bdepend
-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 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 nose
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# prevent an infinite loop
-	rm tests/functional/docs/test_smoke.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	nosetests -v tests/unit/ tests/functional/ || die "test failed under ${EPYTHON}"
-}
diff --git a/dev-python/boto3/boto3-1.17.12.ebuild b/dev-python/boto3/boto3-1.17.12.ebuild
deleted file mode 100644
index ed20a9d55fa0..000000000000
--- a/dev-python/boto3/boto3-1.17.12.ebuild
+++ /dev/null
@@ -1,56 +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=bdepend
-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 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 nose
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# prevent an infinite loop
-	rm tests/functional/docs/test_smoke.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	nosetests -v tests/unit/ tests/functional/ || die "test failed under ${EPYTHON}"
-}
diff --git a/dev-python/boto3/boto3-1.17.17.ebuild b/dev-python/boto3/boto3-1.17.17.ebuild
index 2df16964cdb0..ed20a9d55fa0 100644
--- a/dev-python/boto3/boto3-1.17.17.ebuild
+++ b/dev-python/boto3/boto3-1.17.17.ebuild
@@ -17,7 +17,7 @@ if [[ "${PV}" == "9999" ]]; then
 	BOTOCORE_PV=${PV}
 else
 	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
 
 	# botocore is x.(y+3).z
 	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
diff --git a/dev-python/boto3/boto3-1.17.19.ebuild b/dev-python/boto3/boto3-1.17.19.ebuild
deleted file mode 100644
index 2df16964cdb0..000000000000
--- a/dev-python/boto3/boto3-1.17.19.ebuild
+++ /dev/null
@@ -1,56 +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=bdepend
-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 ~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 nose
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# prevent an infinite loop
-	rm tests/functional/docs/test_smoke.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	nosetests -v tests/unit/ tests/functional/ || die "test failed under ${EPYTHON}"
-}
diff --git a/dev-python/boto3/boto3-1.17.20.ebuild b/dev-python/boto3/boto3-1.17.20.ebuild
deleted file mode 100644
index 2df16964cdb0..000000000000
--- a/dev-python/boto3/boto3-1.17.20.ebuild
+++ /dev/null
@@ -1,56 +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=bdepend
-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 ~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 nose
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# prevent an infinite loop
-	rm tests/functional/docs/test_smoke.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	nosetests -v tests/unit/ tests/functional/ || die "test failed under ${EPYTHON}"
-}
diff --git a/dev-python/boto3/boto3-1.17.21.ebuild b/dev-python/boto3/boto3-1.17.21.ebuild
deleted file mode 100644
index 2df16964cdb0..000000000000
--- a/dev-python/boto3/boto3-1.17.21.ebuild
+++ /dev/null
@@ -1,56 +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=bdepend
-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 ~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 nose
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# prevent an infinite loop
-	rm tests/functional/docs/test_smoke.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	nosetests -v tests/unit/ tests/functional/ || die "test failed under ${EPYTHON}"
-}
diff --git a/dev-python/boto3/boto3-1.17.23.ebuild b/dev-python/boto3/boto3-1.17.23.ebuild
deleted file mode 100644
index 2df16964cdb0..000000000000
--- a/dev-python/boto3/boto3-1.17.23.ebuild
+++ /dev/null
@@ -1,56 +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=bdepend
-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 ~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 nose
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# prevent an infinite loop
-	rm tests/functional/docs/test_smoke.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	nosetests -v tests/unit/ tests/functional/ || die "test failed under ${EPYTHON}"
-}
diff --git a/dev-python/boto3/boto3-1.17.24.ebuild b/dev-python/boto3/boto3-1.17.24.ebuild
deleted file mode 100644
index 2df16964cdb0..000000000000
--- a/dev-python/boto3/boto3-1.17.24.ebuild
+++ /dev/null
@@ -1,56 +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=bdepend
-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 ~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 nose
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# prevent an infinite loop
-	rm tests/functional/docs/test_smoke.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	nosetests -v tests/unit/ tests/functional/ || die "test failed under ${EPYTHON}"
-}
diff --git a/dev-python/boto3/boto3-1.17.25.ebuild b/dev-python/boto3/boto3-1.17.25.ebuild
deleted file mode 100644
index 2df16964cdb0..000000000000
--- a/dev-python/boto3/boto3-1.17.25.ebuild
+++ /dev/null
@@ -1,56 +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=bdepend
-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 ~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 nose
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# prevent an infinite loop
-	rm tests/functional/docs/test_smoke.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	nosetests -v tests/unit/ tests/functional/ || die "test failed under ${EPYTHON}"
-}
diff --git a/dev-python/boto3/boto3-1.17.26.ebuild b/dev-python/boto3/boto3-1.17.26.ebuild
deleted file mode 100644
index 2df16964cdb0..000000000000
--- a/dev-python/boto3/boto3-1.17.26.ebuild
+++ /dev/null
@@ -1,56 +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=bdepend
-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 ~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 nose
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# prevent an infinite loop
-	rm tests/functional/docs/test_smoke.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	nosetests -v tests/unit/ tests/functional/ || die "test failed under ${EPYTHON}"
-}
diff --git a/dev-python/boto3/boto3-1.17.28.ebuild b/dev-python/boto3/boto3-1.17.28.ebuild
deleted file mode 100644
index 2df16964cdb0..000000000000
--- a/dev-python/boto3/boto3-1.17.28.ebuild
+++ /dev/null
@@ -1,56 +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=bdepend
-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 ~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 nose
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# prevent an infinite loop
-	rm tests/functional/docs/test_smoke.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	nosetests -v tests/unit/ tests/functional/ || die "test failed under ${EPYTHON}"
-}
diff --git a/dev-python/boto3/boto3-1.17.29.ebuild b/dev-python/boto3/boto3-1.17.29.ebuild
deleted file mode 100644
index 2df16964cdb0..000000000000
--- a/dev-python/boto3/boto3-1.17.29.ebuild
+++ /dev/null
@@ -1,56 +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=bdepend
-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 ~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 nose
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# prevent an infinite loop
-	rm tests/functional/docs/test_smoke.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	nosetests -v tests/unit/ tests/functional/ || die "test failed under ${EPYTHON}"
-}
diff --git a/dev-python/boto3/boto3-1.17.30.ebuild b/dev-python/boto3/boto3-1.17.30.ebuild
deleted file mode 100644
index 2df16964cdb0..000000000000
--- a/dev-python/boto3/boto3-1.17.30.ebuild
+++ /dev/null
@@ -1,56 +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=bdepend
-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 ~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 nose
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# prevent an infinite loop
-	rm tests/functional/docs/test_smoke.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	nosetests -v tests/unit/ tests/functional/ || die "test failed under ${EPYTHON}"
-}
diff --git a/dev-python/boto3/boto3-1.17.31.ebuild b/dev-python/boto3/boto3-1.17.31.ebuild
deleted file mode 100644
index 2df16964cdb0..000000000000
--- a/dev-python/boto3/boto3-1.17.31.ebuild
+++ /dev/null
@@ -1,56 +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=bdepend
-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 ~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 nose
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# prevent an infinite loop
-	rm tests/functional/docs/test_smoke.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	nosetests -v tests/unit/ tests/functional/ || die "test failed under ${EPYTHON}"
-}
diff --git a/dev-python/boto3/boto3-1.17.32.ebuild b/dev-python/boto3/boto3-1.17.32.ebuild
deleted file mode 100644
index 2df16964cdb0..000000000000
--- a/dev-python/boto3/boto3-1.17.32.ebuild
+++ /dev/null
@@ -1,56 +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=bdepend
-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 ~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 nose
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# prevent an infinite loop
-	rm tests/functional/docs/test_smoke.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	nosetests -v tests/unit/ tests/functional/ || die "test failed under ${EPYTHON}"
-}
diff --git a/dev-python/boto3/boto3-1.17.34.ebuild b/dev-python/boto3/boto3-1.17.34.ebuild
deleted file mode 100644
index 2df16964cdb0..000000000000
--- a/dev-python/boto3/boto3-1.17.34.ebuild
+++ /dev/null
@@ -1,56 +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=bdepend
-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 ~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 nose
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# prevent an infinite loop
-	rm tests/functional/docs/test_smoke.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	nosetests -v tests/unit/ tests/functional/ || die "test failed under ${EPYTHON}"
-}
diff --git a/dev-python/boto3/boto3-1.17.35.ebuild b/dev-python/boto3/boto3-1.17.35.ebuild
deleted file mode 100644
index 2df16964cdb0..000000000000
--- a/dev-python/boto3/boto3-1.17.35.ebuild
+++ /dev/null
@@ -1,56 +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=bdepend
-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 ~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 nose
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# prevent an infinite loop
-	rm tests/functional/docs/test_smoke.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	nosetests -v tests/unit/ tests/functional/ || die "test failed under ${EPYTHON}"
-}
diff --git a/dev-python/boto3/boto3-1.17.36.ebuild b/dev-python/boto3/boto3-1.17.36.ebuild
deleted file mode 100644
index 2df16964cdb0..000000000000
--- a/dev-python/boto3/boto3-1.17.36.ebuild
+++ /dev/null
@@ -1,56 +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=bdepend
-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 ~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 nose
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# prevent an infinite loop
-	rm tests/functional/docs/test_smoke.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	nosetests -v tests/unit/ tests/functional/ || die "test failed under ${EPYTHON}"
-}
diff --git a/dev-python/boto3/boto3-1.17.38.ebuild b/dev-python/boto3/boto3-1.17.38.ebuild
deleted file mode 100644
index 2df16964cdb0..000000000000
--- a/dev-python/boto3/boto3-1.17.38.ebuild
+++ /dev/null
@@ -1,56 +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=bdepend
-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 ~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 nose
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# prevent an infinite loop
-	rm tests/functional/docs/test_smoke.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	nosetests -v tests/unit/ tests/functional/ || die "test failed under ${EPYTHON}"
-}
diff --git a/dev-python/boto3/boto3-1.17.18.ebuild b/dev-python/boto3/boto3-1.17.40.ebuild
index 2df16964cdb0..2df16964cdb0 100644
--- a/dev-python/boto3/boto3-1.17.18.ebuild
+++ b/dev-python/boto3/boto3-1.17.40.ebuild
diff --git a/dev-python/boto3/boto3-1.17.7.ebuild b/dev-python/boto3/boto3-1.17.7.ebuild
deleted file mode 100644
index 2df16964cdb0..000000000000
--- a/dev-python/boto3/boto3-1.17.7.ebuild
+++ /dev/null
@@ -1,56 +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=bdepend
-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 ~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 nose
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# prevent an infinite loop
-	rm tests/functional/docs/test_smoke.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	nosetests -v tests/unit/ tests/functional/ || die "test failed under ${EPYTHON}"
-}
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index 254ea02a2826..8b756992c5c6 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -1,25 +1,6 @@
-DIST botocore-1.19.63.tar.gz 7437996 BLAKE2B b55aa80cf4f17538e5876f61492d15916111c216aff455a1366d12293579bd2c3d4e9c5e2a51e91ee117ac0469743b898cd314abc693a466e99fe332deea95c2 SHA512 11c616f5574df986f576078c18a1f65149ccd01ac21575fd610e2dec0598387cc4d55c05a8ffeed3e7c2fb1809a699d6c6c0c9b57482cbb895146a6a1cddb65b
-DIST botocore-1.20.12.tar.gz 7466322 BLAKE2B 07eb28f5b0fef5ffb284a5eac0c78e3430c3539cc18178c8b6bcf10cc397e91c263d89fb08a5f9c6edcaf903602f08ba445836a771b19591ad2acf58cfc4e771 SHA512 c1dee323290e1e1fa31253e23d24671fcf4806872098a8b2e5e851348dcd078ad222f858e3e284a7daa151a3b8caaf6249440d468a3c86d786dc829627bfc4b3
 DIST botocore-1.20.17.tar.gz 7483893 BLAKE2B 5a9ea5c1d3bc5caa91ea939943d86236d58f24b440d7d0de96356836ee6417c62fece8e782f9fd81e14daefac8919a001adb95e67d42110709b7f07f849b71da SHA512 864f938d07b28341128c06186542c0c214a133f1b7a78990e357436463f7cd1a36031101f6588ee706073b78d4ef99571853658f77755eb9f0739882fc706634
-DIST botocore-1.20.18.tar.gz 7485852 BLAKE2B df22d0c74796ddc5c7046803039423e31784a2221556a0cb224f0a006870bb4406cf3e576fac1cc65457da0267dbed92159d98d4198c3beef1b995ef7565f06b SHA512 e1881ca20ffc0b3eaf59635a321f0191775b4c62f4aed4d8ada54dee6066ba85fa1af00bea00949ccb245dce4e1279eb1d120237da097420d95e1c3c95c50d6f
-DIST botocore-1.20.19.tar.gz 7479977 BLAKE2B 4193cb9975dcde134450968ffcf4cc07b7aece4bbd0d8306483f24eaba63c891cb88d0af640f602b03eb400e5815eb977fca0da927dae0eec82f2922e6c185da SHA512 f4d4ffb88edfb95a13b637c928701966d7903bf50c493926674d8c1c0e6004fa6ec2d9b63402fca5829af3d381ad04221c4154a08e2a0cab065110ab65d44fc1
-DIST botocore-1.20.20.tar.gz 7484162 BLAKE2B c9b14936ca8d59070cc99ec56fb7124c2c162f8b3473e3049f57218e41df8bc0bf20172bd65067d504e6317c917573e16d456169564d93dd969e69e87944fdb3 SHA512 aff520c93bea5b600d1c0decd20d49208b2dbf7113f435a633b4b4c68dd0dc46f04079c4e38132d03e5f9aed7a124bcdaaae55ed0126c002acd30954e9609352
-DIST botocore-1.20.21.tar.gz 7489798 BLAKE2B edaea4e14515e5ce5d1a84dcc466f9cc2720f6cf996d61b1ee9fbdb4164849fd3f22fb7321e007b02b7348e6134a20623be4768875de7f7f811e7ea4591197cf SHA512 41086b8f8dac26db5ffdc8d60969f5c2accc756535323d645e44456bdf6af71929211e31e3d73b6fb3ec0367752f8646dbbed2abc0f147b4b34ad462ecd86c48
 DIST botocore-1.20.22.tar.gz 7499474 BLAKE2B 14394f8de4de39d8073548409f08615452a1d3059a13287549e16ab8815dbf1ac975e0c116ebcbe7acb86055df29ca8d9f2e251f56386ed3cf15922eee9e5f1f SHA512 1c67de2456d5933a67966b0497492acec2954a2a397c856f54d06aa642ee286b8975a52d0df6b2b814bc817ae129b9965b0d5ba6711c75585b0e2127bcde823f
-DIST botocore-1.20.23.tar.gz 7499542 BLAKE2B abcc28ec69d30ddff06ac2e2f3e2c0dcd7311c6a4ba676c9d11059fa5f66de3cebf93b37b88da6204f74ce77e3dbf9da6829be7f9f0c62abb14310a6a2863c34 SHA512 d44d5619ffb288c99f9c5638ab84466a5776df986525a258349264697fd85842b25f67b177fb5a5cf87a5aade81fbbc87b731d4e7a8ff9156cfe12814fc915ec
-DIST botocore-1.20.24.tar.gz 7503493 BLAKE2B fdc1de907a8201ecc63435b2f3cef38ec40ac8cb6b23bf20140db3d5def46dae3a6d66ee0f1cf268bfa63fa9cbcd7f0835570a91b3c538c3303350499e3a1964 SHA512 26ab23f2b3fb8c5b6b0fbd3045761ae81b4abf07c3457307a3b79f7b2a3840b5f1bca5ca669aa98d2465c9c39bb1250f93f2254bace5bfc75849745804f29061
-DIST botocore-1.20.25.tar.gz 7508526 BLAKE2B 244b578cc0596e4fc6b225cd29d0b5ca2e42159dcc506ff3f0a730e3602166ca52bb1a4a2ea8049b86fe6409ac521e30d1f0ff02deec8550a4187579b9a43f9f SHA512 010aac3c0021c7406471cae2c0b13a33dde620b2d7e5df96170971459b9f425d9ffb2a3ad08a650c3097924ff12b34354983ef36336e2afd0172fc3a73f988e7
-DIST botocore-1.20.26.tar.gz 7510615 BLAKE2B bc8716642c09ec74f7d057bcd9608cbbad98fcb4caf09e0684a03744fda81c0483aebaa4c85e416dac7d54d0f2804aba59f15e714211b59edd824cd3067ed412 SHA512 30ce061c1b7e1830caaf7382352180f9316f8d1d806269726ef3bc00eeb7a3fc7689e43eb4666fe700ca2de564b427c4916289a555aca0138a630059462216c9
 DIST botocore-1.20.27.tar.gz 7518860 BLAKE2B 73a5a5302a0adfe9c72ec40f0edec8fc97f9dcec0428f5785f2546d50e4b8eb8a9c287b29218ebd8ebe091ef0fd022a5b0ba459aae435c363511484a936d2ffb SHA512 1b63295a2f6cdf2c06cc10cd35c350a07eb5326bbd42f2dc2084bb54cac3ebb40f0635180e227632184a6bbff3b58b67bd90878acbfa4cc61879b7b8e77f3fbc
-DIST botocore-1.20.28.tar.gz 7526082 BLAKE2B 523db8ca7ff9ae87ad30fe539f20b34f4627b3a60f58635778d81b7ab055ac7cfbe04b4c4ca6508284dd37f2e6b953210ed2def9608026490332d200f306f7a9 SHA512 f3af2bd784b96a2778361a83d0ad61e5108b0a90b3756575bc4b93aaddb13a0a07e6589f582f03ca95252b272e1f84c350c5a2e1f342f98627f70e8f42350c18
-DIST botocore-1.20.29.tar.gz 7533728 BLAKE2B 75ca3262805177118d0f1a6060d98badf54b07f3b607c4c1c0d057045f671474b11493819030a9e65080af0cdd48c8ea686836b7c9ef7bfe6098babf260f221d SHA512 92d3887929b34e5e6a80b1330e00e6a72d8cfd96b81cc36eed969361db4756607c7c447af73b05f5ff0c27699e32636df12627693c667dea0a9955d2553ea35e
-DIST botocore-1.20.30.tar.gz 7534280 BLAKE2B bfa6066e8e2c28475807b8a469257cc8fc6dfb17de231e25db411223a55bc897534e90aa2d7f2a89a21378f8dbbbae52e553333292c1726d11c60cfeea4f4f7a SHA512 3d0d2cc120a1aaa225ebbd2a9393e0d413653c44e55f99094f36d62993737a2f2b5d63a64225e207c4a21b60971fb40eb8c30059efe77cdad6681ce00d4da5ac
-DIST botocore-1.20.31.tar.gz 7544090 BLAKE2B c8c158f69463e2eaf3c817d7577bd449724bf0a409e65bd83734cb7af3c0211999e4f7d240da97f017829ee04cbd4f69af0e7ea589adcfb413498dfd831630c9 SHA512 a7f8c02b4518a25e1eb0299b3cec5791810e81b7b6b1d8c9ef2e94cd9fcba21bdcdfc3fe96955e134fc0acb78e27aff850ee352a718d2bf518c8480287a1eb26
-DIST botocore-1.20.32.tar.gz 7543258 BLAKE2B 464b1b32d32f25874cf73a57c281436a6c6095d69dbd90ac6566fbfacb58fea4162e61d58092708c243917398fb9c1898feb3ed7903515a0a2f24c6cf16278d3 SHA512 e7a7a1fac7fab4e6ec49e38909c306ed7f54b544ebe85cefb0a743aa44882707b51877d4872926be282117ecfeeef564f1345b2be8daed9cd54dcd970d5d6811
 DIST botocore-1.20.33.tar.gz 7543656 BLAKE2B eefd7b06c5a43780982616cfd640c6a1c5d9e919b403c0f78be06833e8e618b142cabacf2dd3b3e13cf351bbd5d0d42ef23b314355f68f7d9dc6aa9cae6e377f SHA512 6354ed7ebbe467ea96c0ea0e059acd2be0a40973d55998c0e006e73a67f2a69bd8009099f761af83e47022ad27698d3a21ffc2824ad4b74a687bc490239420e0
-DIST botocore-1.20.34.tar.gz 7545620 BLAKE2B 49f44aa2b4799ddf03adeb48790bcf23744a13e61cc1a64be67bfadf54a51213b99ae4cf26cdfc948482b7ffeff391a06f34eb4628bf2cbf6d8af1adb78f1932 SHA512 b85878eb36507687171136fd6d8b2d00a9a9fe0123d36b42906026ff3bad3580b0e6e6e8ee50c35f14a237acf9f354c6ecdfe38b14cce83fd65fa6873aa25d84
-DIST botocore-1.20.35.tar.gz 7547346 BLAKE2B 7fb58d475e8e57501346916759f4e0801f7c0ff61a60a1ffded2ff16cab6ef67d72f40169990673f294fe54bcd99eedd0ad4e2cf1fba39a237a17925d6c0f123 SHA512 b5fa8478ef7849951339ccc6d06948fd4e654deea5668eb0fd82813f3c095af8d67ad0986aa630e3cf579a1f2442100481e7a69ba7933e73b9178a1c599b05f0
-DIST botocore-1.20.36.tar.gz 7548154 BLAKE2B 6e96c80320cd782978b44086e02af13496ed4969c535e523552fde41dada5f21990f0eb5060cfbd229ab0524a862c547c32fb3ea5c860b69fd11ef11f94bca49 SHA512 970f40e3c9b8b8a97dfeb4e5add80758d9f63b7ffd3e757903830d3458d635fc38e44f8f497fb99c65a407c56ed4f96ea1a32f794fbcfd490ba45747148d4cea
-DIST botocore-1.20.38.tar.gz 7557920 BLAKE2B 9912f48f334a76e5dd9a4ddd7f79a4e1a958bfd6cbc4ebf66ff257882b49a27be28114747479148317caeba1198c486771f23f0953d8c2840b9b108c69258cec SHA512 ed068e799314881dfbd40c1e100e7572b70d302c6b694f0759f151e0acc643dde7cdcc3e3345e2607637761595fc5fc9162a2d931d8d8dfbcac02f6421953e28
 DIST botocore-1.20.39.tar.gz 7560051 BLAKE2B 0605b39e28e494add04d0f5ca559a3c1eac0011e332445fc66b4ee6a75c38f127eead72da287fdbc6da8cdb0f5ad90d18e4c71bc6641f2fe8784a1399cfd32d1 SHA512 2de58a1b585106280d292edd2a4d2f13c3c5d7ecddc24daf5a7ab65106f42a32bb700906cc19342c600cdb99d8f2ac1b951d4de5eb7f223a1c8f910ceae764d6
-DIST botocore-1.20.7.tar.gz 7458254 BLAKE2B 8b9a1edda73e2564d3a3d67c6b3542d1ec9372403cb4d88396e58dfbcb5987821f278f2757e079e1ab32e03243ed3a6d1023ecc591b965512b3af5e2d43ea7b0 SHA512 9b023a31be866a50b94017a28aca40b5fe2e720959c928a3fd93db96041f3886049717f50461222a09572c0c56c5961a4614b80e400e4fa6d8b3ff4b4ab681df
+DIST botocore-1.20.40.tar.gz 7564881 BLAKE2B a9a84867960fdd9a97f429c25410433ee7775134b358f67bddecf84308abe1c24e3f7f0f36e5df9da88e17b4002ff99f9494c45320289472022bd3a041fad177 SHA512 cd63670d3820d18be933d225ce238b72496236f7d3aa82b385071735f59f59128502eae80093385bf95a7ba33f78ce8baff6be55e88a4539e6ee5c7816484fd6
diff --git a/dev-python/botocore/botocore-1.19.63.ebuild b/dev-python/botocore/botocore-1.19.63.ebuild
deleted file mode 100644
index 4c682b6b25d3..000000000000
--- a/dev-python/botocore/botocore-1.19.63.ebuild
+++ /dev/null
@@ -1,59 +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="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 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/mock[${PYTHON_USEDEP}]
-		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 nose
-
-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}"
-}
diff --git a/dev-python/botocore/botocore-1.20.12.ebuild b/dev-python/botocore/botocore-1.20.12.ebuild
deleted file mode 100644
index 4c682b6b25d3..000000000000
--- a/dev-python/botocore/botocore-1.20.12.ebuild
+++ /dev/null
@@ -1,59 +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="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 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/mock[${PYTHON_USEDEP}]
-		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 nose
-
-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}"
-}
diff --git a/dev-python/botocore/botocore-1.20.17.ebuild b/dev-python/botocore/botocore-1.20.17.ebuild
index 9d681f87244c..4c682b6b25d3 100644
--- a/dev-python/botocore/botocore-1.20.17.ebuild
+++ b/dev-python/botocore/botocore-1.20.17.ebuild
@@ -16,7 +16,7 @@ if [[ "${PV}" == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
 fi
 
 RDEPEND="
diff --git a/dev-python/botocore/botocore-1.20.19.ebuild b/dev-python/botocore/botocore-1.20.19.ebuild
deleted file mode 100644
index 9d681f87244c..000000000000
--- a/dev-python/botocore/botocore-1.20.19.ebuild
+++ /dev/null
@@ -1,59 +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="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 ~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/mock[${PYTHON_USEDEP}]
-		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 nose
-
-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}"
-}
diff --git a/dev-python/botocore/botocore-1.20.20.ebuild b/dev-python/botocore/botocore-1.20.20.ebuild
deleted file mode 100644
index 9d681f87244c..000000000000
--- a/dev-python/botocore/botocore-1.20.20.ebuild
+++ /dev/null
@@ -1,59 +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="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 ~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/mock[${PYTHON_USEDEP}]
-		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 nose
-
-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}"
-}
diff --git a/dev-python/botocore/botocore-1.20.21.ebuild b/dev-python/botocore/botocore-1.20.21.ebuild
deleted file mode 100644
index 9d681f87244c..000000000000
--- a/dev-python/botocore/botocore-1.20.21.ebuild
+++ /dev/null
@@ -1,59 +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="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 ~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/mock[${PYTHON_USEDEP}]
-		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 nose
-
-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}"
-}
diff --git a/dev-python/botocore/botocore-1.20.23.ebuild b/dev-python/botocore/botocore-1.20.23.ebuild
deleted file mode 100644
index 9d681f87244c..000000000000
--- a/dev-python/botocore/botocore-1.20.23.ebuild
+++ /dev/null
@@ -1,59 +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="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 ~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/mock[${PYTHON_USEDEP}]
-		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 nose
-
-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}"
-}
diff --git a/dev-python/botocore/botocore-1.20.24.ebuild b/dev-python/botocore/botocore-1.20.24.ebuild
deleted file mode 100644
index 9d681f87244c..000000000000
--- a/dev-python/botocore/botocore-1.20.24.ebuild
+++ /dev/null
@@ -1,59 +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="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 ~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/mock[${PYTHON_USEDEP}]
-		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 nose
-
-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}"
-}
diff --git a/dev-python/botocore/botocore-1.20.25.ebuild b/dev-python/botocore/botocore-1.20.25.ebuild
deleted file mode 100644
index 9d681f87244c..000000000000
--- a/dev-python/botocore/botocore-1.20.25.ebuild
+++ /dev/null
@@ -1,59 +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="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 ~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/mock[${PYTHON_USEDEP}]
-		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 nose
-
-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}"
-}
diff --git a/dev-python/botocore/botocore-1.20.26.ebuild b/dev-python/botocore/botocore-1.20.26.ebuild
deleted file mode 100644
index 9d681f87244c..000000000000
--- a/dev-python/botocore/botocore-1.20.26.ebuild
+++ /dev/null
@@ -1,59 +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="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 ~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/mock[${PYTHON_USEDEP}]
-		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 nose
-
-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}"
-}
diff --git a/dev-python/botocore/botocore-1.20.28.ebuild b/dev-python/botocore/botocore-1.20.28.ebuild
deleted file mode 100644
index 9d681f87244c..000000000000
--- a/dev-python/botocore/botocore-1.20.28.ebuild
+++ /dev/null
@@ -1,59 +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="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 ~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/mock[${PYTHON_USEDEP}]
-		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 nose
-
-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}"
-}
diff --git a/dev-python/botocore/botocore-1.20.29.ebuild b/dev-python/botocore/botocore-1.20.29.ebuild
deleted file mode 100644
index 9d681f87244c..000000000000
--- a/dev-python/botocore/botocore-1.20.29.ebuild
+++ /dev/null
@@ -1,59 +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="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 ~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/mock[${PYTHON_USEDEP}]
-		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 nose
-
-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}"
-}
diff --git a/dev-python/botocore/botocore-1.20.30.ebuild b/dev-python/botocore/botocore-1.20.30.ebuild
deleted file mode 100644
index 9d681f87244c..000000000000
--- a/dev-python/botocore/botocore-1.20.30.ebuild
+++ /dev/null
@@ -1,59 +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="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 ~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/mock[${PYTHON_USEDEP}]
-		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 nose
-
-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}"
-}
diff --git a/dev-python/botocore/botocore-1.20.31.ebuild b/dev-python/botocore/botocore-1.20.31.ebuild
deleted file mode 100644
index 9d681f87244c..000000000000
--- a/dev-python/botocore/botocore-1.20.31.ebuild
+++ /dev/null
@@ -1,59 +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="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 ~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/mock[${PYTHON_USEDEP}]
-		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 nose
-
-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}"
-}
diff --git a/dev-python/botocore/botocore-1.20.32.ebuild b/dev-python/botocore/botocore-1.20.32.ebuild
deleted file mode 100644
index 9d681f87244c..000000000000
--- a/dev-python/botocore/botocore-1.20.32.ebuild
+++ /dev/null
@@ -1,59 +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="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 ~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/mock[${PYTHON_USEDEP}]
-		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 nose
-
-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}"
-}
diff --git a/dev-python/botocore/botocore-1.20.34.ebuild b/dev-python/botocore/botocore-1.20.34.ebuild
deleted file mode 100644
index 9d681f87244c..000000000000
--- a/dev-python/botocore/botocore-1.20.34.ebuild
+++ /dev/null
@@ -1,59 +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="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 ~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/mock[${PYTHON_USEDEP}]
-		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 nose
-
-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}"
-}
diff --git a/dev-python/botocore/botocore-1.20.35.ebuild b/dev-python/botocore/botocore-1.20.35.ebuild
deleted file mode 100644
index 9d681f87244c..000000000000
--- a/dev-python/botocore/botocore-1.20.35.ebuild
+++ /dev/null
@@ -1,59 +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="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 ~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/mock[${PYTHON_USEDEP}]
-		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 nose
-
-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}"
-}
diff --git a/dev-python/botocore/botocore-1.20.36.ebuild b/dev-python/botocore/botocore-1.20.36.ebuild
deleted file mode 100644
index 9d681f87244c..000000000000
--- a/dev-python/botocore/botocore-1.20.36.ebuild
+++ /dev/null
@@ -1,59 +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="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 ~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/mock[${PYTHON_USEDEP}]
-		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 nose
-
-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}"
-}
diff --git a/dev-python/botocore/botocore-1.20.38.ebuild b/dev-python/botocore/botocore-1.20.38.ebuild
deleted file mode 100644
index 9d681f87244c..000000000000
--- a/dev-python/botocore/botocore-1.20.38.ebuild
+++ /dev/null
@@ -1,59 +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="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 ~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/mock[${PYTHON_USEDEP}]
-		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 nose
-
-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}"
-}
diff --git a/dev-python/botocore/botocore-1.20.18.ebuild b/dev-python/botocore/botocore-1.20.40.ebuild
index 9d681f87244c..9d681f87244c 100644
--- a/dev-python/botocore/botocore-1.20.18.ebuild
+++ b/dev-python/botocore/botocore-1.20.40.ebuild
diff --git a/dev-python/botocore/botocore-1.20.7.ebuild b/dev-python/botocore/botocore-1.20.7.ebuild
deleted file mode 100644
index 9d681f87244c..000000000000
--- a/dev-python/botocore/botocore-1.20.7.ebuild
+++ /dev/null
@@ -1,59 +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="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 ~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/mock[${PYTHON_USEDEP}]
-		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 nose
-
-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}"
-}
diff --git a/dev-python/breathe/Manifest b/dev-python/breathe/Manifest
index 5cab0cadd9f4..228cccbe30d2 100644
--- a/dev-python/breathe/Manifest
+++ b/dev-python/breathe/Manifest
@@ -1 +1,2 @@
 DIST breathe-4.27.0.tar.gz 186352 BLAKE2B fd4cac6e32a4988812085a71ea6b7222058d6856c377c9ad147da4a9eed980904f09cc04d9524bb20d6495d593c3fb3aa05792b1f0a6a8ce58bff4ca3c29d643 SHA512 b5fc79f8d7728b39e5667d1d763b02a4c0556d9b79ee6b138dc7b1951d9896d18cac1d418401edcb5eb7c4da416c77f177b40b34f85a7ea823cc2d8a4bf6dda4
+DIST breathe-4.28.0.tar.gz 187954 BLAKE2B fc17eb9fb47f01907a3edeb316a427c9f06b802189cb860fa43bf7333a2897c36b2ed6ed008ca30e6e5c856d10fcf55df53ed05997ea60c29aade84cc1e5111a SHA512 a02ff717e4f50d336c91aa943a6a15b7ad834e3896d63c3ec31b3d10ff098400c53fb80fd3441e115194942722e5fce8f9b858fc3a3ba691aac900e0b415906a
diff --git a/dev-python/breathe/breathe-4.28.0.ebuild b/dev-python/breathe/breathe-4.28.0.ebuild
new file mode 100644
index 000000000000..fc33165df342
--- /dev/null
+++ b/dev-python/breathe/breathe-4.28.0.ebuild
@@ -0,0 +1,31 @@
+# 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="Sphinx Doxygen renderer"
+HOMEPAGE="https://breathe.readthedocs.io/en/latest/"
+SRC_URI="https://github.com/michaeljones/breathe/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	app-doc/doxygen
+	dev-python/docutils[${PYTHON_USEDEP}]
+	>=dev-python/sphinx-3.0.0[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-texlive/texlive-bibtexextra
+	dev-texlive/texlive-fontsextra
+	dev-texlive/texlive-fontutils
+	dev-texlive/texlive-latex
+	dev-texlive/texlive-latexextra
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/cachelib/Manifest b/dev-python/cachelib/Manifest
index 2bf766570b7c..c95aaa1f639f 100644
--- a/dev-python/cachelib/Manifest
+++ b/dev-python/cachelib/Manifest
@@ -1,2 +1 @@
 DIST cachelib-0.1.1.tar.gz 10192 BLAKE2B ce1ac03498e331c0df405e99b26f24cf38f21243c60d90ca3b0fab599abce5ac8c59ba8c566216d761fea170d64934c63fd74f9733c50aa3ebe382c54b80bcfa SHA512 865dba727427907227b021ecc5962738c85fb74f898acfe1612e48247ada9eda3eddb72c3c29c700fe4275ed699accc5af9526afbaf0dfbfb3a1a1a6370cc3d6
-DIST cachelib-0.1.tar.gz 9844 BLAKE2B 7281a3851281c2babd3d144db0e22270e5c196eaaf62f975844f9972538e571a36a855f8a0209e2f38d1a962dd52d0d7fcefa1f6d3b97c3f5dcd119585c7ade8 SHA512 8ed41a14f3bc36393ecdce7dcc0023ce954900f4541463cf08b823b6c11a28532812c9873d32991f023986ed2ded39a560ee556447bc6d4c3e45c3d4d749c2b9
diff --git a/dev-python/cachelib/cachelib-0.1.1.ebuild b/dev-python/cachelib/cachelib-0.1.1.ebuild
index 4be310696b47..176b4fce3b1d 100644
--- a/dev-python/cachelib/cachelib-0.1.1.ebuild
+++ b/dev-python/cachelib/cachelib-0.1.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE=""
 
 BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/cachelib/cachelib-0.1.ebuild b/dev-python/cachelib/cachelib-0.1.ebuild
deleted file mode 100644
index dddbdebf7b38..000000000000
--- a/dev-python/cachelib/cachelib-0.1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Collection of cache libraries in the same API interface. Extracted from werkzeug"
-HOMEPAGE="https://pypi.org/project/cachelib/ https://github.com/pallets/cachelib"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE=""
-
-BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/cachelib/metadata.xml b/dev-python/cachelib/metadata.xml
index 5a4ea86b2bb6..5ec6df696391 100644
--- a/dev-python/cachelib/metadata.xml
+++ b/dev-python/cachelib/metadata.xml
@@ -9,4 +9,5 @@
   <remote-id type="github">pallets/cachelib</remote-id>
  </upstream>
  <origin>gentoo-staging</origin>
+ <stabilize-allarches/>
 </pkgmetadata>
 \ No newline at end of file
diff --git a/dev-python/djangorestframework/Manifest b/dev-python/djangorestframework/Manifest
index e95b2a7e64bb..cc4cc8a41f20 100644
--- a/dev-python/djangorestframework/Manifest
+++ b/dev-python/djangorestframework/Manifest
@@ -1 +1,2 @@
 DIST django-rest-framework-3.12.2.gh.tar.gz 8856613 BLAKE2B 77d0b3bad38c7829387de752d913eb758935615213d8f8ada9422ecf25142383c1b11a1c95d5fc9f4cf7634e494119ddcb236c810e85429fa8cd4ecd1ef88132 SHA512 7c3e712897562eff14ddfa4ded6627d6b4263001e0c9a4047b92da43c0fd86e8ac9d09bb54bb87ce0d4e7743553c4733a60b18327f7e4d481cb9898593731467
+DIST django-rest-framework-3.12.4.gh.tar.gz 8856507 BLAKE2B 48150e8d966ddd169a2b58d90656efa8f9f549c9d2fdee6025254fba2a6221704fe6bcb246567c8acb963f76ea56046935d3190c7c391daf4773b100a641ba02 SHA512 406b5354809b94e371a2c7d4b62ce66c18a1f60bd02574cba603ad4c44faa4297bdbbd6ee50de63fe21d2aae18386e05d46983a506bddd17f06ce610d5b727c9
diff --git a/dev-python/djangorestframework/djangorestframework-3.12.4.ebuild b/dev-python/djangorestframework/djangorestframework-3.12.4.ebuild
new file mode 100644
index 000000000000..858df1cc373f
--- /dev/null
+++ b/dev-python/djangorestframework/djangorestframework-3.12.4.ebuild
@@ -0,0 +1,40 @@
+# 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
+
+MY_P=django-rest-framework-${PV}
+DESCRIPTION="Web APIs with django made easy"
+HOMEPAGE="https://www.django-rest-framework.org/"
+SRC_URI="
+	https://github.com/encode/django-rest-framework/archive/${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND=">=dev-python/django-1.11[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		dev-python/coreapi[${PYTHON_USEDEP}]
+		dev-python/coreschema[${PYTHON_USEDEP}]
+		dev-python/pytest-django[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local deselect=(
+		# TODO
+		tests/test_description.py::TestViewNamesAndDescriptions::test_markdown
+	)
+
+	epytest ${deselect[@]/#/--deselect }
+}
diff --git a/dev-python/fonttools/Manifest b/dev-python/fonttools/Manifest
index 3b24cc5a6653..8213b0ea047c 100644
--- a/dev-python/fonttools/Manifest
+++ b/dev-python/fonttools/Manifest
@@ -1,2 +1 @@
-DIST fonttools-4.18.2.tar.gz 2499129 BLAKE2B 1ae93418121942e4303e4b138b192a30195d25c87e8c6204b508cc6a5b7a87608fcde7acbb6a2e8fb3c71ea59938827dabbe1556b7edad537523f6f0b3615696 SHA512 ceec3656c674ff5c43f4dc7cdf1468ddaf5c8bbe569d865fb015a9251ac089caedcf3dcea82c93a0c367576fcd7d65451642a6ab5d3093d941aa391b50070d53
 DIST fonttools-4.21.1.tar.gz 2531249 BLAKE2B 7f507f85061c67da0003ed2c4f685b22ccf0e6c5067adb934772ef0832656bbe092d1282b30b5a40071cd3a3219f5cfd810e06e9cd3f85ddd8fa93538134c943 SHA512 8c54809ab9f39e34f482ee6b17dbf8b309e8bfa0bde783e24195c1f2949ded64591c5e79565136ec8492c0095d593db20779d3f28b933f8e40e54b610130e0f4
diff --git a/dev-python/fonttools/fonttools-4.18.2.ebuild b/dev-python/fonttools/fonttools-4.18.2.ebuild
deleted file mode 100644
index 526747c102cb..000000000000
--- a/dev-python/fonttools/fonttools-4.18.2.ebuild
+++ /dev/null
@@ -1,51 +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} )
-PYTHON_REQ_USE="xml(+)"
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="Library for manipulating TrueType, OpenType, AFM and Type1 fonts"
-HOMEPAGE="https://github.com/fonttools/fonttools/"
-SRC_URI="https://github.com/fonttools/fonttools/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos"
-RESTRICT="!test? ( test )"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	test? (
-		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
-
-		>=dev-python/fs-2.4.9[${PYTHON_USEDEP}]
-		app-arch/brotli[python,${PYTHON_USEDEP}]
-		app-arch/zopfli
-	)"
-
-python_prepare_all() {
-	# When dev-python/pytest-shutil is installed, we get weird import errors.
-	# This is due to incomplete nesting in the Tests/ tree:
-	#
-	#   Tests/feaLib/__init__.py
-	#   Tests/ufoLib/__init__.py
-	#   Tests/svgLib/path/__init__.py
-	#   Tests/otlLib/__init__.py
-	#   Tests/varLib/__init__.py
-	#
-	# This tree requires an __init__.py in Tests/svgLib/ too, bug #701148.
-	touch Tests/svgLib/__init__.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	# virtualx used when matplotlib is installed causing plot module tests to run
-	virtx pytest -vv Tests fontTools
-}
diff --git a/dev-python/fonttools/fonttools-4.21.1.ebuild b/dev-python/fonttools/fonttools-4.21.1.ebuild
index d34270c299ce..aba21adf0c33 100644
--- a/dev-python/fonttools/fonttools-4.21.1.ebuild
+++ b/dev-python/fonttools/fonttools-4.21.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/fonttools/fonttools/archive/${PV}.tar.gz -> ${P}.tar
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos"
 RESTRICT="!test? ( test )"
 IUSE="test"
 
diff --git a/dev-python/google-api-core/Manifest b/dev-python/google-api-core/Manifest
index 7658c74d06eb..ed9b55794238 100644
--- a/dev-python/google-api-core/Manifest
+++ b/dev-python/google-api-core/Manifest
@@ -1,3 +1,4 @@
 DIST google-api-core-1.26.0.tar.gz 132817 BLAKE2B f077e5f7a50de69ef3707d3e9a54f3b4948c458ee1eda058778fda618b202e7fd5fb7a116b9b153bf77bdbda858a91616e2f201d2aac45d8654a44001f52c71f SHA512 2e35f231936d06a6c05dbc4930da881e17c53d10224ed394d7deec9fcc45647ccb3dc72316912c31300bc5d3776467d6aab160660695c9919f28fdf73bfd2ffe
 DIST google-api-core-1.26.1.tar.gz 132880 BLAKE2B f1872c1240b0b40385fce0496c676c2408501600710ec51cdcbfa8c5f0f15858ef62860f33022bd9ceaffbca25ec83cc1879b7ec7c3a3b119e5e3cc4ac043a0f SHA512 138bd10895006885761f34932bf8f4b0776c2f3a2c2038d97d1837d961088b4a19cbd84321a493b81cad4727374949e87c59b7f649507a7cb356e6457a94cb1f
 DIST google-api-core-1.26.2.tar.gz 133082 BLAKE2B ea574b5ef08406c2452b6e9b5acf055f675bb1a0b966d7adc83c830f761d2ac5fe53d2ea6fa6d47e75b1fa1dcbf144836f4865b7f1ab0688aee20d54df214b01 SHA512 da58f871cbe95d5dc040a50da192750afee9804145aa0fba07434d085f799bf8c18ac29fd1c733ffe76c9109be7e76323b0c307d48d74fcd0d73e51e5120ccce
+DIST google-api-core-1.26.3.tar.gz 133409 BLAKE2B ca3c63769f87cc79483d5ac52646cb044fa21e4f702a945994aeffad71b5be6bd1105e7aa3ec489c943d8adb1148f1c5eb868d64d71f0bcc4a6084ff470acf05 SHA512 8a7753ee30f6f3bb78265b083d8fb80a48021ab32c849ddadaf969263e5a63bfaeb3010b584440d5c5f1c4e0dcd4e8fcd4df16321ccb03d3c0932e19502bbe4c
diff --git a/dev-python/google-api-core/google-api-core-1.26.3.ebuild b/dev-python/google-api-core/google-api-core-1.26.3.ebuild
new file mode 100644
index 000000000000..1f2741cdc81a
--- /dev/null
+++ b/dev-python/google-api-core/google-api-core-1.26.3.ebuild
@@ -0,0 +1,44 @@
+# Copyright 2020-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="Core Library for Google Client Libraries"
+HOMEPAGE="https://github.com/googleapis/python-api-core
+	https://googleapis.dev/python/google-api-core/latest"
+SRC_URI="https://github.com/googleapis/${PN//google/python}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${P//google/python}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	dev-python/namespace-google[${PYTHON_USEDEP}]
+	dev-python/protobuf-python[${PYTHON_USEDEP}]
+	dev-python/googleapis-common-protos[${PYTHON_USEDEP}]
+	>=dev-python/google-auth-1.21.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.18.0[${PYTHON_USEDEP}]
+	<dev-python/requests-3[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/grpcio[${PYTHON_USEDEP}]
+		dev-python/rsa[${PYTHON_USEDEP}]
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests --install pytest
+
+python_install_all() {
+	distutils-r1_python_install_all
+	find "${D}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/google-auth-oauthlib/Manifest b/dev-python/google-auth-oauthlib/Manifest
index 382e5fd6b3b3..1106f6f5c541 100644
--- a/dev-python/google-auth-oauthlib/Manifest
+++ b/dev-python/google-auth-oauthlib/Manifest
@@ -1,2 +1,3 @@
 DIST google-auth-library-python-oauthlib-0.4.3.gh.tar.gz 48020 BLAKE2B bc5e575f3eb7b8b876deb13aaff0d1b900555bcbc609259dc72c9f01f595283feffea6aaaf91acf835b313629fe4c4c76dee8ea877b6ae37c3c01633c63909e4 SHA512 f6fa0e525b0aef6f4359954cb2c8020ee86544862318721d439d153cae3e75527b0e0a312572dc936fab7702da8c6af42ce9242d1e73f48c0a822973e470a4a9
+DIST google-auth-library-python-oauthlib-0.4.4.gh.tar.gz 48322 BLAKE2B f812b43e1e867090aa3ae4fbda7523324a182f6e1eae39fd865d23279b04cde08ee2263b83d1c2eb3555a8db3a9b01869d8148c0e603ba8fe9698dc8d052fc11 SHA512 5b17ceccca24216a0354513ae2a1b14f2aab9760e0ff0f87840a64de85a730a4115f5e44b359093f4ab0a9ec8fea41bfffb7b5aeca833574419ea6021a382240
 DIST google-auth-oauthlib-0.4.1.tar.gz 18687 BLAKE2B 1c9028f6b4c306bbee51fba5b55950d129d56ff5154645a166998c0c720b125202731f1cfed60837b8103d56fcdeeb818e39491b243a8d761969f73d9f88f67b SHA512 123707139353db8e05c81138af834e35007d323f0e19ae79088ad5ca4be86dda6c0df91e2f7794711475227a60312fab9101c91b49817bf8b84866ea6374c943
diff --git a/dev-python/google-auth-oauthlib/google-auth-oauthlib-0.4.4.ebuild b/dev-python/google-auth-oauthlib/google-auth-oauthlib-0.4.4.ebuild
new file mode 100644
index 000000000000..004f9ffed3ec
--- /dev/null
+++ b/dev-python/google-auth-oauthlib/google-auth-oauthlib-0.4.4.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+inherit distutils-r1
+
+MY_P=google-auth-library-python-oauthlib-${PV}
+DESCRIPTION="Google Authentication Library"
+HOMEPAGE="
+	https://pypi.org/project/google-auth-oauthlib/
+	https://github.com/googleapis/google-auth-library-python-oauthlib"
+SRC_URI="
+	https://github.com/googleapis/google-auth-library-python-oauthlib/archive/v${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/click-6.0.0[${PYTHON_USEDEP}]
+	>=dev-python/google-auth-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-oauthlib-0.7.0[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	test? ( dev-python/mock[${PYTHON_USEDEP}] )
+"
+
+distutils_enable_tests pytest
+DOCS=( LICENSE README.rst )
diff --git a/dev-python/hypothesis/Manifest b/dev-python/hypothesis/Manifest
index 42e0c567db29..e07172618b57 100644
--- a/dev-python/hypothesis/Manifest
+++ b/dev-python/hypothesis/Manifest
@@ -1,6 +1,4 @@
-DIST hypothesis-python-6.2.0.tar.gz 9108590 BLAKE2B 73a6b71c68aec1ec51f791187bbe5be679d5e3b4da9e66745767dafb109d298b0c61bd461ed838a0c75884d155fb408bddebc75d1cf887629da5cf5d6b053e03 SHA512 b249124f90d1d68aa6e106965b0ae78e37f095be0adc1833895f0895357d46c907074e2abe458be566708ba006b6c4375908b40ef89d52300fd41ad63abc2e52
 DIST hypothesis-python-6.3.4.tar.gz 9112374 BLAKE2B 78867f0ff142d6059a20c437c3fab333de06eff5247d93c1e70f75d801e54984c20da01322b7d4d4999cb30f2c59c6e7cf955fe60ecc0e90b452b8ddf6b6f2ff SHA512 7baee8758d86afbb0a8a16e18b2f14d3870ee2f5623857fc691ca1afc7f0c6555b367fbe758ff02c08af492b4569ef2aeb8d61bf3bd91ac458312a43b02d02f6
-DIST hypothesis-python-6.4.3.tar.gz 9113616 BLAKE2B f3761a22b574edc0b001a25c836c3a845fb3a1396dbc4afc2caa1f31870793cfca8646e6b9b45386e835fce97b9bc68226018c50675931e48968e9502ad41844 SHA512 010d140538bd6a361326d00bf38a50ffbbe08adc55cc7597cf69563b5d028335493c1925bcb91f618afd87f4d754e8109776be89f229e8b25b91510fbf64d7bd
 DIST hypothesis-python-6.6.0.tar.gz 9117847 BLAKE2B bb88ebee9db53f1c5753730d04e5dfe6a39ac4c5f7d534778b22b813ba188a55de6ad8a34f611f7863d1c3287be39ed7e10981e9d6ed8d8dd106688f154c3a49 SHA512 a446b4a11c6ee013225bfcd58e26efc6c9d867545d9bcf90a19468cb01fc5e2c5a7280ff9a80d4a1adbfe06dd155df6152941d5f53869d85e1d259e68a33a5e2
 DIST hypothesis-python-6.8.1.tar.gz 9119495 BLAKE2B 4d98e30a04f652af79dd49e921b856124a312b63f087a6fd200282e9b0a0cd6fcad1a42a6008406bc347f21bf9cd6c5ff2db79d013987281f59365bd9d91550d SHA512 2f25e994438479b5faa15b2038146ab385445bf2722b0951ff55f324b074248d7322c4c6f3e9c659c18d0aa94150eea4c6567a7ac24debf2de4b32bab37a4dcc
 DIST hypothesis-python-6.8.3.tar.gz 9120421 BLAKE2B 9511f63aafe499316750ec8a993726d4e8db87b42fb772cf79cde1be18b23e99f55c1a2638f3ee7afadae5f323792322cf87b747ac428146fea2abc92793f8f5 SHA512 83660978dc4ff49a04d7167994821a18c769039c49dcbc515b28591651bb9ab2121e3a7267cb20281efade85003a5808e0898fda5dfe1e4be563a03d4688085c
diff --git a/dev-python/hypothesis/hypothesis-6.2.0.ebuild b/dev-python/hypothesis/hypothesis-6.2.0.ebuild
deleted file mode 100644
index ae5823a0725d..000000000000
--- a/dev-python/hypothesis/hypothesis-6.2.0.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
-PYTHON_REQ_USE="threads(+),sqlite"
-
-inherit distutils-r1 eutils multiprocessing optfeature
-
-DESCRIPTION="A library for property based testing"
-HOMEPAGE="https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/"
-SRC_URI="https://github.com/HypothesisWorks/${PN}/archive/${PN}-python-${PV}.tar.gz"
-S="${WORKDIR}/${PN}-${PN}-python-${PV}/${PN}-python"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-IUSE="cli test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
-	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
-	cli? (
-		$(python_gen_cond_dep '
-			dev-python/black[${PYTHON_USEDEP}]
-			dev-python/click[${PYTHON_USEDEP}]
-		' 'python*')
-	)
-"
-BDEPEND="
-	test? (
-		${RDEPEND}
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		<dev-python/pytest-6.2[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		!!<dev-python/typing-3.7.4.1
-	)
-"
-
-python_prepare() {
-	if ! use cli || [[ ${EPYTHON} != python* ]]; then
-		sed -i -e '/console_scripts/d' setup.py || die
-	fi
-}
-
-python_test() {
-	distutils_install_for_testing --via-root
-	pytest -vv tests/cover tests/pytest tests/quality \
-		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" ||
-		die "Tests fail with ${EPYTHON}"
-}
-
-pkg_postinst() {
-	optfeature "datetime support" dev-python/pytz
-	optfeature "dateutil support" dev-python/python-dateutil
-	optfeature "numpy support" dev-python/numpy
-	optfeature "django support" dev-python/django dev-python/pytz
-	optfeature "pandas support" dev-python/pandas
-	optfeature "pytest support" dev-python/pytest
-}
diff --git a/dev-python/hypothesis/hypothesis-6.3.4.ebuild b/dev-python/hypothesis/hypothesis-6.3.4.ebuild
index 380ab8117add..6dbcfe242e0a 100644
--- a/dev-python/hypothesis/hypothesis-6.3.4.ebuild
+++ b/dev-python/hypothesis/hypothesis-6.3.4.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}-${PN}-python-${PV}/${PN}-python"
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 IUSE="cli"
 
 RDEPEND="
diff --git a/dev-python/hypothesis/hypothesis-6.4.3.ebuild b/dev-python/hypothesis/hypothesis-6.4.3.ebuild
deleted file mode 100644
index 380ab8117add..000000000000
--- a/dev-python/hypothesis/hypothesis-6.4.3.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
-PYTHON_REQ_USE="threads(+),sqlite"
-
-inherit distutils-r1 eutils multiprocessing optfeature
-
-DESCRIPTION="A library for property based testing"
-HOMEPAGE="https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/"
-SRC_URI="https://github.com/HypothesisWorks/${PN}/archive/${PN}-python-${PV}.tar.gz"
-S="${WORKDIR}/${PN}-${PN}-python-${PV}/${PN}-python"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
-IUSE="cli"
-
-RDEPEND="
-	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
-	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
-	cli? (
-		$(python_gen_cond_dep '
-			dev-python/black[${PYTHON_USEDEP}]
-			dev-python/click[${PYTHON_USEDEP}]
-		' 'python*')
-	)
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		!!<dev-python/typing-3.7.4.1
-	)
-"
-
-distutils_enable_tests --install pytest
-
-python_prepare() {
-	if ! use cli || [[ ${EPYTHON} != python* ]]; then
-		sed -i -e '/console_scripts/d' setup.py || die
-	fi
-}
-
-python_test() {
-	distutils_install_for_testing --via-root
-	pytest -vv tests/cover tests/pytest tests/quality \
-		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" ||
-		die "Tests fail with ${EPYTHON}"
-}
-
-pkg_postinst() {
-	optfeature "datetime support" dev-python/pytz
-	optfeature "dateutil support" dev-python/python-dateutil
-	optfeature "numpy support" dev-python/numpy
-	optfeature "django support" dev-python/django dev-python/pytz
-	optfeature "pandas support" dev-python/pandas
-	optfeature "pytest support" dev-python/pytest
-}
diff --git a/dev-python/importlib_metadata/Manifest b/dev-python/importlib_metadata/Manifest
index 01e8b8dea8c1..f03908375455 100644
--- a/dev-python/importlib_metadata/Manifest
+++ b/dev-python/importlib_metadata/Manifest
@@ -1,7 +1,5 @@
-DIST importlib_metadata-3.4.0.tar.gz 33841 BLAKE2B e2ac38c0f6fc5ecf78d3a4018715282b176f448e0a9f2cb16320812c1f9ca18f797b2ddfa85a96d83f6ff9540b486abcd8b5a38fa7f9261abbde4a88962e765d SHA512 d17aae60ca79ddb3c2e60218144e7a3e055b2807e8ca4e55f0d0c1ae428323ab7d832e4178dd05a60f1de2f157497a6261afa7baa8f91bec85d042303869fb67
+DIST importlib_metadata-3.10.0.tar.gz 39679 BLAKE2B fbdd454c5b028a796507088af2f031a762cb69db69105b10a74958b32495e4e7cce74ad3fc96e48dad4282583f55e2c700d105f0ea5d1b32756ef6cc83fb404e SHA512 374a6230430c2bf9efb85760e7974fd8f79914b3537d1f28e607151154497e0d921ba62cae19e6f4049b7205e83286e82b5cde4e87edc3260fa375e576e114f7
 DIST importlib_metadata-3.7.0.tar.gz 36517 BLAKE2B b96ac99bbc9ed7c961635a598d46bf409f11b008453123f3236feaf3650f7c6fe262c803dbf6b65bbe42ca4ea9990b559d3f03dde2287b19f0f7ff21668a3a3a SHA512 c11c503412cb5f18a235dbff13eb0d5b24a2a7510f32cb8fc4abec3259987de9e5a01692aef729c5d7c7fe597156b1317abc357d49726ef1026172995b080631
-DIST importlib_metadata-3.7.1.tar.gz 36595 BLAKE2B c4eaf3671ec48610ce310a2609625ab77496252953c2d0567cc4824c39a8601ef99fb3ffd5d7968eb7aa358aaedf0ab81d87271afdddac68d7bd3a70971b153a SHA512 b301c6c72b185d893e5e400dbd9417b2ba94122073d6cb163c9e9949fb13762ddc57b34dbba1330b55bef47073fc72a6a4b5689adf9af819a68be603c9d64c9e
 DIST importlib_metadata-3.7.2.tar.gz 36644 BLAKE2B 11e8f0c012d405a7059842fbc0aa1edfd8313a01b12b36e40c5a542b17f6ebe5284e945967f080c5934758820354f131df81e84d1fa4d5e6ac1660dac055a914 SHA512 ecf630c83c08895d566fbf3f435d4bfc5c0336dff1c682e6413598749c13720211aad4085dd7b9a88ca4218ef5514cd730a6f13c2c53be6cc349edd142106204
 DIST importlib_metadata-3.7.3.tar.gz 37193 BLAKE2B 0de5f4ece99db9ec4f86e9b967c8583d06a5bda939a7bdb137dba3c6a9d7fd034802d9fa0eb5bf209ae5ada89ebd0f3120557d3fa2b300739ebff2ff1bb6edb8 SHA512 1d6ee80edb3e5efb56deb0676ef42ba72fdaf124504023954cb3b1192e5378c3370a35b5e77708f3d9a19c02f0d89a1ba08a919a7aaec5e284f54c2eb3c61fc1
 DIST importlib_metadata-3.8.2.tar.gz 38973 BLAKE2B 40b001870608003a9beaa513e5f7dad0217884719a78a64dd74bad3db275ac30bc226d57f61aa644fcd0425bc69e06ce66555aa92132e89d36ecd5519c7d32d9 SHA512 c4ca5055c759b588b42708a9ca903d4cda91614385cc39016c5126e37e1f3bd0faafe7ec0cf6d58553ac71c1a028f0f74d0ba3d66135e97d75b051ea4f71cbeb
-DIST importlib_metadata-3.9.0.tar.gz 39430 BLAKE2B 099600e6691425265c92726c80a9b0f86cc7b1f6af1968647c1dbaa30e92921b03e97b684f5128fe434f870b4f4ac25c66df3c5ad1b41119c3fcf543d48d7a50 SHA512 fe635ed3ada20e6209315d619c918cac3782b52edb95099d41d9a6849b1bc56940f50641be17b859f54b9b33eac86c7c059b3a58d1d119fb1f90e2d6de62529d
diff --git a/dev-python/importlib_metadata/importlib_metadata-3.7.1.ebuild b/dev-python/importlib_metadata/importlib_metadata-3.10.0.ebuild
index eb45b99adc44..eb45b99adc44 100644
--- a/dev-python/importlib_metadata/importlib_metadata-3.7.1.ebuild
+++ b/dev-python/importlib_metadata/importlib_metadata-3.10.0.ebuild
diff --git a/dev-python/importlib_metadata/importlib_metadata-3.4.0.ebuild b/dev-python/importlib_metadata/importlib_metadata-3.4.0.ebuild
deleted file mode 100644
index d692c07b3f1b..000000000000
--- a/dev-python/importlib_metadata/importlib_metadata-3.4.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# Included in Python >= 3.8
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Read metadata from Python packages"
-HOMEPAGE="https://github.com/python/importlib_metadata"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-RDEPEND="
-	$(python_gen_cond_dep 'dev-python/typing-extensions[${PYTHON_USEDEP}]' python3_{6,7})
-	dev-python/zipp[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/importlib_resources-1.3.0[${PYTHON_USEDEP}]
-		dev-python/packaging[${PYTHON_USEDEP}]
-		dev-python/pyfakefs[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs dev-python/jaraco-packaging dev-python/rst-linker
-distutils_enable_tests unittest
-
-python_prepare_all() {
-	# Skip a test that requires pep517 which is not in the tree
-	sed -e 's:test_find_local:_&:' -i tests/test_integration.py || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/importlib_metadata/importlib_metadata-3.7.0.ebuild b/dev-python/importlib_metadata/importlib_metadata-3.7.0.ebuild
index eb45b99adc44..8aab6d04df8c 100644
--- a/dev-python/importlib_metadata/importlib_metadata-3.7.0.ebuild
+++ b/dev-python/importlib_metadata/importlib_metadata-3.7.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 RDEPEND="
 	$(python_gen_cond_dep 'dev-python/typing-extensions[${PYTHON_USEDEP}]' python3_{6,7})
diff --git a/dev-python/importlib_metadata/importlib_metadata-3.9.0.ebuild b/dev-python/importlib_metadata/importlib_metadata-3.9.0.ebuild
deleted file mode 100644
index eb45b99adc44..000000000000
--- a/dev-python/importlib_metadata/importlib_metadata-3.9.0.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
-
-# NB: this package extends beyond built-in importlib stuff in py3.8+
-# new entry_point API not yet included in cpython release
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="Read metadata from Python packages"
-HOMEPAGE="https://github.com/python/importlib_metadata"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
-
-RDEPEND="
-	$(python_gen_cond_dep 'dev-python/typing-extensions[${PYTHON_USEDEP}]' python3_{6,7})
-	dev-python/zipp[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/packaging[${PYTHON_USEDEP}]
-		dev-python/pyfakefs[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			dev-python/importlib_resources[${PYTHON_USEDEP}]
-		' pypy3 python3_{7,8})
-	)
-"
-
-distutils_enable_sphinx docs dev-python/jaraco-packaging dev-python/rst-linker
-distutils_enable_tests unittest
-
-python_prepare_all() {
-	# Skip a test that requires pep517 which is not in the tree
-	sed -e 's:test_find_local:_&:' -i tests/test_integration.py || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/inflect/Manifest b/dev-python/inflect/Manifest
index 04ac4717b8e5..3e46385a00e3 100644
--- a/dev-python/inflect/Manifest
+++ b/dev-python/inflect/Manifest
@@ -1,3 +1,2 @@
-DIST inflect-5.0.2.tar.gz 71323 BLAKE2B 42b2524b00a8b71aca6f164de9b57708be172ce63bc62480e951d082bd68f082ad2fadb502321a5fc97ffa3af95f26935d0de855144863b9bd1dfbdf3bdae516 SHA512 ea97ec4a4a1a94a6218e60c20d63e483026beb1901abe2fa69f186a823f8a786b9a82af231fc42bf705146f650fdbfa5ff660cfbe821eceb53891ef2e91eaec3
 DIST inflect-5.2.0.tar.gz 73664 BLAKE2B cf2327eb0aca6319b43076a0f52d7e5c52bad3be45cbc094e620d6219b0b05021d05c289992b36d3221d1e582352497fb278d9225ece49ddc0630f91199b1617 SHA512 2883ffccd28c436908783855a282ff4346c74b14fe5899ed6b9fde0f0f1b97063119f7fbe927f1bf0d16761623abcdfe21439c12311bd2a11a70245b89fbce0b
 DIST inflect-5.3.0.tar.gz 74127 BLAKE2B 20c591012a5a6692c3da3a39f4aeaaae290da5ba723af5c9ac90f7d28112a1894acf082633f8f673f6d903f756b9bb70c6c3366762e872cf7ca6c6d5edf1c99c SHA512 f5baf65fb7a6ba59c91a36a17acb0abda3efc74fef56b3a3d99c100b2c6e94c5aafb08ab37310ce410631ac928e9c24a4a4c5e6b5c7d8f907c3d999f4a70cce4
diff --git a/dev-python/inflect/inflect-5.0.2.ebuild b/dev-python/inflect/inflect-5.0.2.ebuild
deleted file mode 100644
index 26b563eca2bf..000000000000
--- a/dev-python/inflect/inflect-5.0.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Correctly inflect words and numbers"
-HOMEPAGE="https://github.com/jaraco/inflect"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv s390 sparc x86 ~x64-macos"
-
-BDEPEND="
-	>=dev-python/setuptools_scm-3.4.1[${PYTHON_USEDEP}]
-	dev-python/toml[${PYTHON_USEDEP}]
-"
-
-distutils_enable_sphinx docs '>=dev-python/jaraco-packaging-3.2' \
-	'>=dev-python/rst-linker-1.9' dev-python/alabaster
-distutils_enable_tests pytest
-
-python_test() {
-	# Override pytest options to skip flake8
-	pytest -vv tests --override-ini="addopts=--doctest-modules" \
-		|| die "tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/inflect/inflect-5.2.0.ebuild b/dev-python/inflect/inflect-5.2.0.ebuild
index e978ce90ce44..1c281fe381ea 100644
--- a/dev-python/inflect/inflect-5.2.0.ebuild
+++ b/dev-python/inflect/inflect-5.2.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv s390 sparc x86 ~x64-macos"
 
 BDEPEND="
 	>=dev-python/setuptools_scm-3.4.1[${PYTHON_USEDEP}]
diff --git a/dev-python/ipaddr/ipaddr-2.2.0-r1.ebuild b/dev-python/ipaddr/ipaddr-2.2.0-r1.ebuild
index 1b6c1720206e..399d0c98a6be 100644
--- a/dev-python/ipaddr/ipaddr-2.2.0-r1.ebuild
+++ b/dev-python/ipaddr/ipaddr-2.2.0-r1.ebuild
@@ -5,7 +5,6 @@ EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=no
 PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-
 inherit distutils-r1
 
 DESCRIPTION="Python IP address manipulation library"
@@ -17,9 +16,7 @@ SLOT="0"
 KEYWORDS="amd64 arm arm64 ~ppc64 x86"
 
 python_prepare() {
-	if python_is_python3; then
-		2to3 -n -w --no-diffs *.py || die
-	fi
+	2to3 -n -w --no-diffs *.py || die
 }
 
 python_test() {
diff --git a/dev-python/keyring/Manifest b/dev-python/keyring/Manifest
index 24fcc3d5c5c2..9e053dcccd3d 100644
--- a/dev-python/keyring/Manifest
+++ b/dev-python/keyring/Manifest
@@ -1,4 +1,3 @@
-DIST keyring-22.0.1.tar.gz 47782 BLAKE2B ec9f5c0418b2c279f111cbcb8ccc1fc05f64e859e2e675041289a639c7e2d4681e562c9c023e46f1eacb99f88114af97545ad36f71037db0b77e83d927785ce0 SHA512 2e264570d2e905ce4862d71fe4b02fcf0631218a693292c13159fdbad0032e91d81910f84d787e948057e2f428fcf8677ebdd83af4da54c3359347f642db0441
 DIST keyring-22.3.0.tar.gz 48195 BLAKE2B f990c1c5fd87115cfb22a0e1d84712c1299334e5db89049f04718dba9b31dddbc0ec91950bdf529310955341d1250a6a62b1f1b76b0d552cb7cbf09748892b3d SHA512 c71ba8ec7b69661b2929ed5aa7b8baca7b5164a267dbb901adc2b7bc2cef1eb0ec8931f1021d69cfb0e31514ff922dfb03fd784feb12d1dc7229d4e5e759bb5e
 DIST keyring-23.0.0.tar.gz 48218 BLAKE2B a71e86e91b874d2b82477ebcd93687592864095bc20bbda898b934e6f888e2ef666d462fe27ffc5fcbafb909c44b8e816c46d138865c53afcb12dd5d04a7c761 SHA512 4fd83ab0e73bc748b593bdcc2d8df608c7ef4ad9b64b58db611995eb3cb98d1bd5b5a312ab15f7322f33359fe12bd1b02eed1dbaae50455abb9e84e367976c4e
 DIST keyring-23.0.1.tar.gz 48614 BLAKE2B dd56b92464934a7596bba97c5a1990eb2b3bf33da2eb469aa028ad346c09fa14687cc9214cb48ed82c0f32fc4fcf779391a00a5c9fffdff25f31e7f70f2bd731 SHA512 9f779e419049aef699c67dcb93277f336a2063b42394a4ff2350b8e72b81fe6763f6a6fbe8f358e90bf31540513095e2e56b83742841ee567e5d46b91995c063
diff --git a/dev-python/keyring/keyring-22.0.1.ebuild b/dev-python/keyring/keyring-22.0.1.ebuild
deleted file mode 100644
index 9abcf62fb1c7..000000000000
--- a/dev-python/keyring/keyring-22.0.1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Provides access to the system keyring service"
-HOMEPAGE="https://github.com/jaraco/keyring"
-SRC_URI="https://github.com/jaraco/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="PSF-2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~x64-macos"
-
-RDEPEND="
-	dev-python/secretstorage[${PYTHON_USEDEP}]
-	dev-python/entrypoints[${PYTHON_USEDEP}]
-	dev-python/jeepney[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/importlib_metadata[${PYTHON_USEDEP}]
-	' pypy3 python3_7)
-"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	dev-python/toml[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs \
-	dev-python/jaraco-packaging \
-	dev-python/rst-linker
-
-python_prepare_all() {
-	rm tests/backends/test_kwallet.py || die
-
-	distutils-r1_python_prepare_all
-
-	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-}
diff --git a/dev-python/keyring/keyring-22.3.0.ebuild b/dev-python/keyring/keyring-22.3.0.ebuild
index a0324ff45ea7..9abcf62fb1c7 100644
--- a/dev-python/keyring/keyring-22.3.0.ebuild
+++ b/dev-python/keyring/keyring-22.3.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/jaraco/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 SLOT="0"
 LICENSE="PSF-2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~x64-macos"
 
 RDEPEND="
 	dev-python/secretstorage[${PYTHON_USEDEP}]
diff --git a/dev-python/lit/lit-11.1.0.ebuild b/dev-python/lit/lit-11.1.0.ebuild
index 65bccb533284..29b0f59dd358 100644
--- a/dev-python/lit/lit-11.1.0.ebuild
+++ b/dev-python/lit/lit-11.1.0.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm ~arm64 ~ppc64 ~riscv x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/markdown/Manifest b/dev-python/markdown/Manifest
index 63fb7a4fd48a..1664e656113a 100644
--- a/dev-python/markdown/Manifest
+++ b/dev-python/markdown/Manifest
@@ -1,3 +1,2 @@
 DIST Markdown-2.6.11.tar.gz 274132 BLAKE2B 0d14d308c97d925db83d71f3b9be5622e77ee4a159fced15c811390b39950e81bff9ffc567f32e878cbc44014640ab0a2f596258cfd0dce6b66029105cec7370 SHA512 4e7dd3e04f181fa2751a359aede301fb29a23b9af74867ff9d1d0fdd051dcd16d04a5891e37aff0b309649c5fd13363802ec7e10fc33896e9453991efcab4a66
-DIST Markdown-3.3.3.tar.gz 319531 BLAKE2B b7a527a7d202ee955106ecddb75541285589cb006a0cb3e587f06bb06aa3be8bdf8e976a35cc2ca63b2f085a8b462f8e8d5fad84710561dc105e533939c04204 SHA512 b8e42c1471d155be6cc9aa0b6ce649454b09d36df1de51ef7e45043ae3c1c87b9b09e1fae4c680a771bee52e7fa8ea82548b78b2ffb1d38e85785f0b0de25b36
 DIST Markdown-3.3.4.tar.gz 322192 BLAKE2B 37122305112440b85d7f0e5e1bf90bafe15a8bcb84e8d8bdd9b4183dcb4be1010d287450062bab7dc9017d8e618f84a8245e6fd35f8204e5e2ece14d302fb13b SHA512 37422619dd8f542bfcf7975c92e76a39e4eeeb42386727d52037869cee1617f8efcb74a382a9c7cb903907ebf3643a27ba0de583bc0dbd327a36e72bbf8520af
diff --git a/dev-python/markdown/markdown-3.3.3.ebuild b/dev-python/markdown/markdown-3.3.3.ebuild
deleted file mode 100644
index 731d64fe8bb4..000000000000
--- a/dev-python/markdown/markdown-3.3.3.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python implementation of the markdown markup language"
-HOMEPAGE="
-	https://python-markdown.github.io/
-	https://pypi.org/project/Markdown/
-	https://github.com/Python-Markdown/markdown"
-SRC_URI="mirror://pypi/M/${PN^}/${P^}.tar.gz"
-S="${WORKDIR}/${P^}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="doc"
-
-# importlib_metadata is only necessary for <python:3.8 according to setup.py
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/importlib_metadata[${PYTHON_USEDEP}]
-	' python3_{6,7} pypy3)
-"
-BDEPEND="
-	test? (
-		dev-python/pygments[${PYTHON_USEDEP}]
-		dev-python/pytidylib[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests unittest
-
-python_install_all() {
-	use doc && dodoc -r docs/
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/markdown/markdown-3.3.4.ebuild b/dev-python/markdown/markdown-3.3.4.ebuild
index 531892b4d031..731d64fe8bb4 100644
--- a/dev-python/markdown/markdown-3.3.4.ebuild
+++ b/dev-python/markdown/markdown-3.3.4.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${P^}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="doc"
 
 # importlib_metadata is only necessary for <python:3.8 according to setup.py
diff --git a/dev-python/marshmallow/Manifest b/dev-python/marshmallow/Manifest
index 7d5d0a601fdd..d84a6134ec43 100644
--- a/dev-python/marshmallow/Manifest
+++ b/dev-python/marshmallow/Manifest
@@ -1,3 +1,4 @@
 DIST marshmallow-3.10.0.tar.gz 172801 BLAKE2B 1d1f5d531a9704a9b82170347e2c5dd2b3fd4488204a05f9be7705a39e5a6a42342bcce1438484c22944a6fb4470a731825314ed7ced79dbaf9cc195f049d9b2 SHA512 41520a7cfde483ca06a69e49ab04f8972932d0fbf7a6c75ef568779b55d5f2f666aead4c161e03416e9b90fba71fd73b3f14630f0d7050b8a7fe7a4bb50d5bf0
 DIST marshmallow-3.11.0.tar.gz 173648 BLAKE2B 66bc79b880551c106fa88dfea3c17a171db8b7516be570882e0d686af335bb8e2667782a84a8503c2f5d5d6c4f273c93160138b97a285478f15a9aea656e6d55 SHA512 a9b2a2bb8830b1b9c773921f0a7154db3dee1840f8a6cd41a74464ed0cf91f946d00ccf8df32ed875de0201df067b0a310ddfc653e48179ca32450e48fbc06cf
+DIST marshmallow-3.11.1.tar.gz 173844 BLAKE2B edd816ccd254dc52e01a2e067ff3037fa5206ae5badb1e9b46d83d3bdcd926d324c39321e4fa2b4fdf276158d36c2d3634086f76086dececaa24213bbb765e42 SHA512 ebb6b20ffc1b199408ede0c88d1512cada14cf7220315100398137b8374940c03dda2e6449ab9135963598ab321669068a9eca0e1c4cd2f3f2454eba19db04bd
 DIST marshmallow-3.5.1.tar.gz 168839 BLAKE2B 8abf8e8d45d37794c3c615f6dac8ccd0acb76357e92ddaa4c23232b7aefba63db9bd42fb7f13dd99f9ea2ec4c7608459bc36014f9344ab91894176d0f02259c9 SHA512 89b3abce9e31dad6a20cf8ceef62270c8f95cbdf80965b6d29f1728d37d51171a020463da9d0354688183ea07e3f47a0ddab8694da13fe238f11a3dc755d4d6e
diff --git a/dev-python/marshmallow/marshmallow-3.11.1.ebuild b/dev-python/marshmallow/marshmallow-3.11.1.ebuild
new file mode 100644
index 000000000000..324a790f5e9d
--- /dev/null
+++ b/dev-python/marshmallow/marshmallow-3.11.1.ebuild
@@ -0,0 +1,26 @@
+# 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 library for converting to and from native Python datatypes"
+HOMEPAGE="https://github.com/marshmallow-code/marshmallow/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pytz[${PYTHON_USEDEP}]
+		dev-python/simplejson[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
diff --git a/dev-python/pecan/metadata.xml b/dev-python/pecan/metadata.xml
index 643733464e16..21abd15435b8 100644
--- a/dev-python/pecan/metadata.xml
+++ b/dev-python/pecan/metadata.xml
@@ -9,4 +9,5 @@
   <remote-id type="pypi">pecan</remote-id>
  </upstream>
  <origin>gentoo-staging</origin>
+ <stabilize-allarches/>
 </pkgmetadata>
 \ No newline at end of file
diff --git a/dev-python/pyfakefs/Manifest b/dev-python/pyfakefs/Manifest
index e6debd61e9af..46e821ec32dd 100644
--- a/dev-python/pyfakefs/Manifest
+++ b/dev-python/pyfakefs/Manifest
@@ -1,2 +1 @@
-DIST pyfakefs-4.3.3.tar.gz 194498 BLAKE2B 4ad300889e8c8462f4a237c2a12a9d93cbaaff6e9e6347e667bc366abf9705023eb1838c4291488c10a51d5209810c773edcb08c58e3759ccd9f851b17ea82e1 SHA512 e4cc3603496705216c1ea1448f835a19efa5a1429f3ecd67911ab2dc76d6754af7bb25312a6b15046355af26b8b72528acf68db50960d2eaba8bb3ef80fccaa0
 DIST pyfakefs-4.4.0.tar.gz 196236 BLAKE2B d19fb44320d9c7eab1e97ee4123da548f1e3b2f8f6b0e3be762b6228677fa165ed1b60364481c53f54e79e50a2f98d298e7ff6e65f40aa9c4e372a0f72e19d52 SHA512 774e5e213ee8ce17759cdeaa4ce1d70c43df25f0885c73c7e8aa923973a43f48d9fb19d45105a6a5c5d1c6a0c54c22fe4d80ec3ec92ac7cd97c50fb532af90bc
diff --git a/dev-python/pyfakefs/pyfakefs-4.3.3.ebuild b/dev-python/pyfakefs/pyfakefs-4.3.3.ebuild
deleted file mode 100644
index b0bcade455c0..000000000000
--- a/dev-python/pyfakefs/pyfakefs-4.3.3.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
-DISTUTILS_IN_SOURCE_BUILD=1
-
-inherit distutils-r1
-
-DESCRIPTION="a fake file system that mocks the Python file system modules"
-HOMEPAGE="https://github.com/jmcgeheeiv/pyfakefs/ https://pypi.org/project/pyfakefs/"
-SRC_URI="https://github.com/jmcgeheeiv/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-distutils_enable_tests pytest
-
-python_test() {
-	"${EPYTHON}" -m pyfakefs.tests.all_tests -v || die "tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/pyfakefs/pyfakefs-4.4.0.ebuild b/dev-python/pyfakefs/pyfakefs-4.4.0.ebuild
index 4dbe57f0c6a3..b0bcade455c0 100644
--- a/dev-python/pyfakefs/pyfakefs-4.4.0.ebuild
+++ b/dev-python/pyfakefs/pyfakefs-4.4.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/jmcgeheeiv/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/pylint/Manifest b/dev-python/pylint/Manifest
index 00af651eb242..bfbf0cdc5707 100644
--- a/dev-python/pylint/Manifest
+++ b/dev-python/pylint/Manifest
@@ -1,3 +1,2 @@
-DIST pylint-2.6.2.tar.gz 680364 BLAKE2B 59bd18d5458f86a7279a7fc895f1564fc575c27e7ad7b4a668456d6005cc2a4d920e2221c2ec3f447c1c63376e1b35f1e1c5177c355f52872d3c556aa63ae462 SHA512 75e88aea23e4e68714451d22b0a6a2106a4821c05cdd7d077e12ea7f6198959ebdace6824b1e2fb42a632051e049a2c84eb93990a7b6af23c7fee7e2f56bf6ec
 DIST pylint-2.7.1.tar.gz 708916 BLAKE2B 606637ff25daccba741ae5bcdecb6a2be50bc17393009193a29312b4a218622d23287a0f0c5a81e79e77cc54dfe529483ad01fa39445103f240addaa3ad58bf7 SHA512 eebf1d3da5ca072cb912ecffebf183c79f2f8b2c2b14044751aad202d75d06d1c06abb561d4581990b92fe54c06b570a1de39b792b0d729cf300c01c82c4e3c0
 DIST pylint-2.7.2.tar.gz 709177 BLAKE2B 5e4daeb19b6b18d570f4d78b01cc5023d5d245840160fdbddb194ab7036118742ffe3075ee27c37bd7a700d11d9006dc9abaaba9cf9596ae1b63941f139da7ac SHA512 800b210fbe5665db390d5c885d103856dc474b4e43d2f752bdcfcea36121132c26eecdcb67620c4a90456823f11a33568de4d37d59eea692dcd1751d931420f7
diff --git a/dev-python/pylint/files/pylint-2.5.3-tests.patch b/dev-python/pylint/files/pylint-2.5.3-tests.patch
deleted file mode 100644
index 72a42e4caaeb..000000000000
--- a/dev-python/pylint/files/pylint-2.5.3-tests.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/tests/test_self.py b/tests/test_self.py
-index 6c27fd6c..9fde0214 100644
---- a/tests/test_self.py
-+++ b/tests/test_self.py
-@@ -686,6 +686,7 @@ class TestRunTC:
-         )
- 
-     @staticmethod
-+    @pytest.mark.skip("seems to be failing to import nonexistant module")
-     def test_do_not_import_files_from_local_directory(tmpdir):
-         p_astroid = tmpdir / "astroid.py"
-         p_astroid.write("'Docstring'\nimport completely_unknown\n")
diff --git a/dev-python/pylint/pylint-2.6.2.ebuild b/dev-python/pylint/pylint-2.6.2.ebuild
deleted file mode 100644
index cc7d8ba0a7b2..000000000000
--- a/dev-python/pylint/pylint-2.6.2.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# Not ready for Python 3.9 yet: https://github.com/PyCQA/pylint/issues/3895
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-PYTHON_REQ_USE="threads(+)"
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1 optfeature
-
-DESCRIPTION="Python code static checker"
-HOMEPAGE="https://www.logilab.org/project/pylint
-	https://pypi.org/project/pylint/
-	https://github.com/pycqa/pylint"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86"
-IUSE="examples"
-
-# Mirror requirements from pylint/__pkginfo__.py
-RDEPEND="
-	>=dev-python/astroid-2.4.0[${PYTHON_USEDEP}]
-	<dev-python/astroid-2.5[${PYTHON_USEDEP}]
-	>=dev-python/isort-4.2.5[${PYTHON_USEDEP}]
-	<dev-python/isort-6[${PYTHON_USEDEP}]
-	>=dev-python/mccabe-0.6[${PYTHON_USEDEP}]
-	<dev-python/mccabe-0.7[${PYTHON_USEDEP}]
-	>=dev-python/toml-0.7.1[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/six[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.4.4-sphinx-theme.patch"
-	"${FILESDIR}/${PN}-2.5.3-tests.patch"
-)
-
-distutils_enable_sphinx doc --no-autodoc
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# we don't want to run the benchmarking tests
-	rm -f tests/benchmark/test_baseline_benchmarks.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	doman man/{pylint,pyreverse}.1
-	if use examples ; then
-		docompress -x "/usr/share/doc/${PF}/examples"
-		docinto examples
-		dodoc -r examples/.
-	fi
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pylint/pylint-2.7.1.ebuild b/dev-python/pylint/pylint-2.7.1.ebuild
index 8de8f6ed6b54..a747b2ec473b 100644
--- a/dev-python/pylint/pylint-2.7.1.ebuild
+++ b/dev-python/pylint/pylint-2.7.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86"
 IUSE="examples"
 
 # Mirror requirements from pylint/__pkginfo__.py
diff --git a/dev-python/responses/Manifest b/dev-python/responses/Manifest
index d8d15070131d..b4cb69a87319 100644
--- a/dev-python/responses/Manifest
+++ b/dev-python/responses/Manifest
@@ -1,3 +1,4 @@
 DIST responses-0.12.1.tar.gz 27123 BLAKE2B 2c77e3ac48e7430e2c91321a946c09746953b3aa2a93aff1ad277f849bc57fe8033d405cd0c391111ba31e523ecb2dfa5bc475519fb1224dff5247925eb54616 SHA512 cc840920895c5ab02b546d6441636197e93c4dc7346a801a14d663a30a761d78a0be73e820cdd5963e52d882958d9ea7873df6fcd6c032d99a230109b5c0ddb8
 DIST responses-0.13.0.tar.gz 30265 BLAKE2B fdf111b143fb47cb9d175a3718dabe1d23199e02719ece741a6416d25dc8ecf5fc67243c9f8d982b758524db45145d494131aa3f3659f04ff60c147da0fd9947 SHA512 84a542a4d1faccb3d530357db6e1edcf666c82a2eb3bfd86a5478fa96878bd42f82ffdec358f68e954838f5dd7dfa4aa6acf3dad7e0d1881fb8816a422b0e755
 DIST responses-0.13.1.tar.gz 30290 BLAKE2B 823ef6e9e6d760d4516770255c96a8ccd326be8a1b864eb176497b613f9ec97bc0916e8f80e32275859f91129cd1b7a90ee9c8620721ea6ee03440bc4e7500cd SHA512 b6628c5890a9034c003fe1e7ea656474fa553c56fe29e025645f28d524368d4f4e65268ccb384fd514f620fc5f5d008937697161868efefb0760d56a9174e1d6
+DIST responses-0.13.2.tar.gz 30302 BLAKE2B d90059e12518841af0276777a77c28aa96ffa5fcdea9ff1ce2d7a5b0c7e225b1b6253bc38bce534b8447de43365e7315b3ee667e6d845206a9a7a3c3c0d27227 SHA512 cac338cd2c2b3c0193de779ef47830471ed17f2df7d94c30acea0117dfe508550a1dec471fbf249320637125322a5a40273be568b330989a272870afaea0bd04
diff --git a/dev-python/responses/responses-0.13.2.ebuild b/dev-python/responses/responses-0.13.2.ebuild
new file mode 100644
index 000000000000..1f498bbb2533
--- /dev/null
+++ b/dev-python/responses/responses-0.13.2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Utility for mocking out the Python Requests library"
+HOMEPAGE="https://github.com/getsentry/responses"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-python/requests-2.0[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.10[${PYTHON_USEDEP}]
+	dev-python/cookies[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	test? (
+		dev-python/pytest-localserver[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/rsa/Manifest b/dev-python/rsa/Manifest
index 47b4e14214f6..bac0514f8f70 100644
--- a/dev-python/rsa/Manifest
+++ b/dev-python/rsa/Manifest
@@ -1,2 +1 @@
-DIST python-rsa-version-4.7.1.gh.tar.gz 65085 BLAKE2B e63200a7861f13177d042ae92dbb9f8eb4ba3c30174e21b12cb4d84d9a39d3cbb59d6dacec5d4e3d2375ca100bf48c12dabff3f90011f3a3c795ece9e863893f SHA512 f06eee5d6e72c11cdf68ee756ffef7fd9d002ee93939158593ee6d0b5cf1abbfad31c50f6cfd4676d9f64247faee6019d8b214d22324706c82d07068f55ebd94
 DIST python-rsa-version-4.7.2.gh.tar.gz 65177 BLAKE2B 513d6f346813d6bc67de23ee419d70f310155303df40174d47343786f735e00446d8874f51fdea0d7dc890bc8986bb2861746328d7200e8704197adde99d68ad SHA512 4ab64868be00b74b64931453f684bc7f68cfea92cee651e957411e4dc5084e5f8e300fda01cf5187df2f3b455ea40d233488a2e777c9d669d457f67325b420f0
diff --git a/dev-python/rsa/rsa-4.7.1.ebuild b/dev-python/rsa/rsa-4.7.1.ebuild
deleted file mode 100644
index 63d7f31a1102..000000000000
--- a/dev-python/rsa/rsa-4.7.1.ebuild
+++ /dev/null
@@ -1,37 +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
-
-MY_P=python-rsa-version-${PV}
-DESCRIPTION="Pure-Python RSA implementation"
-HOMEPAGE="
-	https://stuvel.eu/rsa/
-	https://pypi.org/project/rsa/"
-SRC_URI="
-	https://github.com/sybrenstuvel/python-rsa/archive/version-${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ~ppc64 sparc x86"
-
-RDEPEND="
-	>=dev-python/pyasn1-0.1.3[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? ( dev-python/mock[${PYTHON_USEDEP}] )
-"
-
-distutils_enable_tests unittest
-
-src_prepare() {
-	rm tests/test_mypy.py || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/rsa/rsa-4.7.2.ebuild b/dev-python/rsa/rsa-4.7.2.ebuild
index 21dbd9cb6042..63d7f31a1102 100644
--- a/dev-python/rsa/rsa-4.7.2.ebuild
+++ b/dev-python/rsa/rsa-4.7.2.ebuild
@@ -20,7 +20,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ppc ~ppc64 sparc x86"
 
 RDEPEND="
 	>=dev-python/pyasn1-0.1.3[${PYTHON_USEDEP}]
diff --git a/dev-python/ruamel-yaml/Manifest b/dev-python/ruamel-yaml/Manifest
index a08a8466fd19..301cc72e3b90 100644
--- a/dev-python/ruamel-yaml/Manifest
+++ b/dev-python/ruamel-yaml/Manifest
@@ -1,3 +1,4 @@
 DIST ruamel-yaml-0.16.13.tar.xz 178756 BLAKE2B 19ee4713786a33853f42256e5cd3187e9e19b931ebd83a133365de3f080721c5a6f5fb41ff3079473461df47a0ab149981c5e94d08321da8b3c9eb311c226945 SHA512 1366fc0b3b5ea2699ca324636403576134ccc7c725b13c21a7752d1b16c644c93c7f7d82ddc337087d2c02947f95263d7a3fdd162f552ac3a78fa36f1f17b3f1
 DIST ruamel-yaml-0.17.0.tar.xz 177532 BLAKE2B 8935acef9210f61283a659ffeb1137524b374b26b49e48677a49233f30e4abdd709357dcfe6f0e998405fed9143e0848825418e4af60f3d37f10f957d15f8555 SHA512 a6532c6f02f03211f6afe25c051c192c8b791e71cc32a9f6acaf830f7ed0e80531326ba436902870500bea5509cb36bd89f1b4a9a7c919b8069d6bc0eed2c2b8
+DIST ruamel-yaml-0.17.2.tar.xz 177648 BLAKE2B 6cc62131027823ab71033c01f4638d6e36bd642ebbe2d92bd44ef7d501f3bdf6104afe192947d50915f9b1d7bc35972be285b8ee455a3d351fa31c39701fc563 SHA512 0d75f6de1ec9e0e65e65227a8dbe4acd41e79748be12592fae879916437b272673fc810940cdd52ad0cd185b129cfa82c72d3ab6e7020e857fe89aca6329af81
 DIST ruamel.yaml-0.16.12.tar.gz 147355 BLAKE2B 6e91116029dba57b81580f4ce34a066fc49ec2c6167c2bd6ec2ae940b16bc12ba53cbd4c62f9ae3975664917ce990b050e9f15b434f5ff66f9dece5426049c9d SHA512 21be4d956d01164b84233c3d3945a4e56351a8fc59c35a8e71b1276da84aa43b125e3860f9884e95a1f895bc53e0b85b6d3f0f4b03512d629a892d8664e3ecd6
diff --git a/dev-python/ruamel-yaml/ruamel-yaml-0.17.2.ebuild b/dev-python/ruamel-yaml/ruamel-yaml-0.17.2.ebuild
new file mode 100644
index 000000000000..decbe5e1340b
--- /dev/null
+++ b/dev-python/ruamel-yaml/ruamel-yaml-0.17.2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+
+inherit distutils-r1
+
+MY_PN="${PN//-/.}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="YAML parser/emitter that supports roundtrip comment preservation"
+HOMEPAGE="
+	https://pypi.org/project/ruamel.yaml/
+	https://sourceforge.net/p/ruamel-yaml/"
+# PyPI tarballs do not include tests
+SRC_URI="mirror://sourceforge/ruamel-dl-tagged-releases/${MY_P}.tar.xz -> ${P}.tar.xz"
+S="${WORKDIR}"/${MY_P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="
+	dev-python/namespace-ruamel[${PYTHON_USEDEP}]
+	dev-python/ruamel-yaml-clib[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		dev-python/ruamel-std-pathlib[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+# Old PyYAML tests from lib/ require special set-up and are invoked indirectly
+# via test_z_olddata, tell pytest itself to leave the subdir alone.
+python_test() {
+	local deselect=()
+
+	[[ ${EPYTHON} == pypy3 ]] && deselect+=(
+		_test/test_deprecation.py::test_collections_deprecation
+	)
+
+	epytest --ignore _test/lib/ ${deselect[@]/#/--deselect }
+}
+
+python_install() {
+	distutils-r1_python_install --single-version-externally-managed
+	find "${ED}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/terminado/Manifest b/dev-python/terminado/Manifest
index a85a3ad8de98..7e89fa8a8769 100644
--- a/dev-python/terminado/Manifest
+++ b/dev-python/terminado/Manifest
@@ -1,2 +1,3 @@
 DIST terminado-0.8.3.tar.gz 21165 BLAKE2B ec031cb7828840a4f299aa25de0030d5b7993119fd41b71e698dd032f4fd31ea725a9b610dc53a71d480ee74b49a1d072d76555b434da4f5fee2479efa03fdec SHA512 441355cdc919b6f04b1bf1eb870f24e0bd6c7ef412e72e1747707049b1fa0d6676644e3646007f2653b3df00e1f30048d9dc40d73f0827b2bbfc0821549e140b
 DIST terminado-0.9.1.tar.gz 12335 BLAKE2B 7f4d7794b8bccb3d7eafd5ab35130521633c391d19fcc93e02c24f3937c7f186e786d12047dde066807ee2ace3ee7db4f0607fc9c10dc976344c32398b5da23b SHA512 429d2417cfc5521ee471febae6d893764cc0f1c7024c272951a178db5e2d20ce64af499393cd020ff6b424dc8b07d69a70da5789b39b49510a5789351a6f04f4
+DIST terminado-0.9.4.tar.gz 13934 BLAKE2B 8544d70a7c561005370bbb2b16db593ac9e4453b729b58d641b99066dc1255e294b712958d54a35a92d85e30b918a1122d24e97400b967858b542498d76305b5 SHA512 ab297e60c1adb25b5fbfcd0246db12f5df3acceeac3357af310602da3915345cb2d4fb460cc303cc4b5b5df237e750ce123ac0ed98a9bf7c6e8493783398cbc9
diff --git a/dev-python/terminado/terminado-0.9.4.ebuild b/dev-python/terminado/terminado-0.9.4.ebuild
new file mode 100644
index 000000000000..3589fe1290df
--- /dev/null
+++ b/dev-python/terminado/terminado-0.9.4.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=pyproject.toml
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Terminals served to term.js using Tornado websockets"
+HOMEPAGE="https://pypi.org/project/terminado/ https://github.com/jupyter/terminado"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	dev-python/ptyprocess[${PYTHON_USEDEP}]
+	www-servers/tornado[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+
+src_test() {
+	# workaround new readline defaults
+	echo "set enable-bracketed-paste off" > "${T}"/inputrc || die
+	local -x INPUTRC="${T}"/inputrc
+	distutils-r1_src_test
+}
diff --git a/dev-python/tqdm/Manifest b/dev-python/tqdm/Manifest
index bc4ff621566f..5292b795f009 100644
--- a/dev-python/tqdm/Manifest
+++ b/dev-python/tqdm/Manifest
@@ -1,3 +1,2 @@
-DIST tqdm-4.57.0.tar.gz 167590 BLAKE2B 30852febdcb69d1f0c6a7416ec7611a79896d643e18c658bb19e52196b4998d8ff9ef708c92d09d9804d8c0210b378dc8a3d58ef2b788a65835cd95ddf3406e4 SHA512 5393ffe6cbb5b41a3c51efdd14169936fcae9dd635b7a35d64f44157f2c855914dbd5c8aa933c4830a16867c83a73c0734e0ebee548392d2c73cae4e6aba531f
 DIST tqdm-4.58.0.tar.gz 167844 BLAKE2B 9a28aa91b330714f6f4d178ca793f9bc1ce5988417b38dc5a9af06c36b8949d0f23de846bc1fb87f7dac2a3b09028c4d216659f84a8ce2125de0a7870d8bc4b4 SHA512 a97a7fc1d5a181d326e91bd017cf9737fd2322f375b8efe5e53c8e49c7986edcdea39086f5057a6d2584a16e2a45b5a679055ba08c83d813fff0a61050b71b45
 DIST tqdm-4.59.0.tar.gz 168620 BLAKE2B 0e3467c777d36bcfaa9f004a587bff70f171cfd7ecdca46d3a6f894afa3694873b7c50c860da31b0147f3233bb419e0c74762797d64e79b938bea813f8a38b92 SHA512 be7ffe2f5e28dd2c653fdafd26cdfab6c89f1fd257420f9ab47460230318183b4934370261d7d5939d05f55b907e2d3982cbef078d372d9a4167e1df42c895a8
diff --git a/dev-python/tqdm/tqdm-4.57.0.ebuild b/dev-python/tqdm/tqdm-4.57.0.ebuild
deleted file mode 100644
index e98fff6f8208..000000000000
--- a/dev-python/tqdm/tqdm-4.57.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
-
-inherit distutils-r1
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/tqdm/tqdm"
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~x64-macos"
-fi
-
-DESCRIPTION="Add a progress meter to your loops in a second"
-HOMEPAGE="https://github.com/tqdm/tqdm"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="examples"
-
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	dev-python/toml[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-python_test() {
-	# Skip unpredictable performance tests
-	pytest -vv --ignore 'tests/tests_perf.py' ||
-		die "Tests failed with ${EPYTHON}"
-}
-
-python_install() {
-	doman "${BUILD_DIR}"/lib/tqdm/tqdm.1
-	rm "${BUILD_DIR}"/lib/tqdm/tqdm.1 || die
-	distutils-r1_python_install
-}
-
-python_install_all() {
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/tqdm/tqdm-4.58.0.ebuild b/dev-python/tqdm/tqdm-4.58.0.ebuild
index 5caf7e58ff9e..e98fff6f8208 100644
--- a/dev-python/tqdm/tqdm-4.58.0.ebuild
+++ b/dev-python/tqdm/tqdm-4.58.0.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/tqdm/tqdm"
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~x64-macos"
 fi
 
 DESCRIPTION="Add a progress meter to your loops in a second"
diff --git a/dev-python/xlsxwriter/Manifest b/dev-python/xlsxwriter/Manifest
index 71911589bb3c..44c15d978a1d 100644
--- a/dev-python/xlsxwriter/Manifest
+++ b/dev-python/xlsxwriter/Manifest
@@ -1 +1,2 @@
+DIST XlsxWriter-RELEASE_1.3.8.tar.gz 32860748 BLAKE2B ef60f0a28cf07c3cf9f13ead3dd02ac952ae6fbd92cb88a2e8ee7593ddb53cc705e1cc4315e943e4c2634bf7a1520184951972b19b7c8d0ba9d70f0814020cbe SHA512 1c2826daf3ed68a1148bf690defe1ba3d2af2640fe398e7741d12f146198823f27659bf8d604ac05c02fb262db218651ad57baf470623ba41009a0b5f4d8f598
 DIST xlsxwriter-1.3.7-tests.tar.gz 32545996 BLAKE2B 789ee62a955422629f5a1ab80924774a98c34b2276f9fbc865d6a9d0e31778a49c5b4be72b3f7db55a13ff1d265514bd1dfaadb9243b21faa8ed2740db60ebd7 SHA512 516be34f5f5fd64835a4015c6eb23c23e8aabb34adc189a50f6ff4afe5cb31f01282870ce037679d14e0c40757f1ed51d26b4cb8fecdf952b4c38b6638d1d72f
diff --git a/dev-python/xlsxwriter/xlsxwriter-1.3.8.ebuild b/dev-python/xlsxwriter/xlsxwriter-1.3.8.ebuild
new file mode 100644
index 000000000000..cbf8e34eedd0
--- /dev/null
+++ b/dev-python/xlsxwriter/xlsxwriter-1.3.8.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+
+inherit distutils-r1
+
+TAG=RELEASE_${PV}
+MY_P=XlsxWriter-${TAG}
+DESCRIPTION="Python module for creating Excel XLSX files"
+HOMEPAGE="https://github.com/jmcnamara/XlsxWriter"
+SRC_URI="
+	https://github.com/jmcnamara/XlsxWriter/archive/${TAG}.tar.gz
+		-> ${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+distutils_enable_tests pytest
author	Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net>	2021-03-30 13:46:11 +0000
committer	Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net>	2021-03-30 13:46:11 +0000
commit	7da9cc3184c814f66312ba9693c3326ddab7c24c (patch)
tree	d301a3b4a2f8897b1ce6ba3f3f26ffdfd8ddd6cf /dev-python
parent	70f18960a76e8d361f71ee03ccce00e11d199380 (diff)
download	baldeagleos-repo-7da9cc3184c814f66312ba9693c3326ddab7c24c.tar.gz baldeagleos-repo-7da9cc3184c814f66312ba9693c3326ddab7c24c.tar.xz baldeagleos-repo-7da9cc3184c814f66312ba9693c3326ddab7c24c.zip