Adding metadata

30 files changed, 460 insertions, 244 deletions

diff --git a/dev-python/Faker/Faker-8.10.1.ebuild b/dev-python/Faker/Faker-8.10.1.ebuild
deleted file mode 100644
index b9fd92931d21..000000000000
--- a/dev-python/Faker/Faker-8.10.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-inherit distutils-r1
-
-DESCRIPTION="A Python package that generates fake data for you"
-HOMEPAGE="https://github.com/joke2k/faker"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND=">=dev-python/python-dateutil-2.4.2[${PYTHON_USEDEP}]
-	>=dev-python/text-unidecode-1.3[${PYTHON_USEDEP}]
-	!dev-ruby/faker"
-BDEPEND="
-	test? (
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP},tiff]
-		dev-python/random2[${PYTHON_USEDEP}]
-		dev-python/validators[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
diff --git a/dev-python/Faker/Faker-8.10.2.ebuild b/dev-python/Faker/Faker-8.10.2.ebuild
deleted file mode 100644
index b9fd92931d21..000000000000
--- a/dev-python/Faker/Faker-8.10.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-inherit distutils-r1
-
-DESCRIPTION="A Python package that generates fake data for you"
-HOMEPAGE="https://github.com/joke2k/faker"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND=">=dev-python/python-dateutil-2.4.2[${PYTHON_USEDEP}]
-	>=dev-python/text-unidecode-1.3[${PYTHON_USEDEP}]
-	!dev-ruby/faker"
-BDEPEND="
-	test? (
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP},tiff]
-		dev-python/random2[${PYTHON_USEDEP}]
-		dev-python/validators[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
diff --git a/dev-python/Faker/Faker-8.10.3.ebuild b/dev-python/Faker/Faker-8.10.3.ebuild
deleted file mode 100644
index b9fd92931d21..000000000000
--- a/dev-python/Faker/Faker-8.10.3.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-inherit distutils-r1
-
-DESCRIPTION="A Python package that generates fake data for you"
-HOMEPAGE="https://github.com/joke2k/faker"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND=">=dev-python/python-dateutil-2.4.2[${PYTHON_USEDEP}]
-	>=dev-python/text-unidecode-1.3[${PYTHON_USEDEP}]
-	!dev-ruby/faker"
-BDEPEND="
-	test? (
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP},tiff]
-		dev-python/random2[${PYTHON_USEDEP}]
-		dev-python/validators[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
diff --git a/dev-python/Faker/Faker-8.11.0.ebuild b/dev-python/Faker/Faker-8.11.0.ebuild
deleted file mode 100644
index b9fd92931d21..000000000000
--- a/dev-python/Faker/Faker-8.11.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-inherit distutils-r1
-
-DESCRIPTION="A Python package that generates fake data for you"
-HOMEPAGE="https://github.com/joke2k/faker"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND=">=dev-python/python-dateutil-2.4.2[${PYTHON_USEDEP}]
-	>=dev-python/text-unidecode-1.3[${PYTHON_USEDEP}]
-	!dev-ruby/faker"
-BDEPEND="
-	test? (
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP},tiff]
-		dev-python/random2[${PYTHON_USEDEP}]
-		dev-python/validators[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
diff --git a/dev-python/Faker/Faker-8.10.0.ebuild b/dev-python/Faker/Faker-8.12.1.ebuild
index b9fd92931d21..1f1f09ada79c 100644
--- a/dev-python/Faker/Faker-8.10.0.ebuild
+++ b/dev-python/Faker/Faker-8.12.1.ebuild
@@ -14,7 +14,8 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-RDEPEND=">=dev-python/python-dateutil-2.4.2[${PYTHON_USEDEP}]
+RDEPEND="
+	>=dev-python/python-dateutil-2.4.2[${PYTHON_USEDEP}]
 	>=dev-python/text-unidecode-1.3[${PYTHON_USEDEP}]
 	!dev-ruby/faker"
 BDEPEND="
diff --git a/dev-python/Faker/Faker-8.8.2.ebuild b/dev-python/Faker/Faker-8.8.2.ebuild
deleted file mode 100644
index 0473bf2016c8..000000000000
--- a/dev-python/Faker/Faker-8.8.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# 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} )
-inherit distutils-r1
-
-DESCRIPTION="A Python package that generates fake data for you"
-HOMEPAGE="https://github.com/joke2k/faker"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND=">=dev-python/python-dateutil-2.4.2[${PYTHON_USEDEP}]
-	>=dev-python/text-unidecode-1.3[${PYTHON_USEDEP}]
-	!dev-ruby/faker"
-BDEPEND="
-	test? (
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP},tiff]
-		dev-python/random2[${PYTHON_USEDEP}]
-		dev-python/validators[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
diff --git a/dev-python/Faker/Faker-8.9.0.ebuild b/dev-python/Faker/Faker-8.9.0.ebuild
deleted file mode 100644
index b9fd92931d21..000000000000
--- a/dev-python/Faker/Faker-8.9.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-inherit distutils-r1
-
-DESCRIPTION="A Python package that generates fake data for you"
-HOMEPAGE="https://github.com/joke2k/faker"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND=">=dev-python/python-dateutil-2.4.2[${PYTHON_USEDEP}]
-	>=dev-python/text-unidecode-1.3[${PYTHON_USEDEP}]
-	!dev-ruby/faker"
-BDEPEND="
-	test? (
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP},tiff]
-		dev-python/random2[${PYTHON_USEDEP}]
-		dev-python/validators[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
diff --git a/dev-python/Faker/Faker-8.9.1.ebuild b/dev-python/Faker/Faker-8.9.1.ebuild
deleted file mode 100644
index b9fd92931d21..000000000000
--- a/dev-python/Faker/Faker-8.9.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-inherit distutils-r1
-
-DESCRIPTION="A Python package that generates fake data for you"
-HOMEPAGE="https://github.com/joke2k/faker"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND=">=dev-python/python-dateutil-2.4.2[${PYTHON_USEDEP}]
-	>=dev-python/text-unidecode-1.3[${PYTHON_USEDEP}]
-	!dev-ruby/faker"
-BDEPEND="
-	test? (
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP},tiff]
-		dev-python/random2[${PYTHON_USEDEP}]
-		dev-python/validators[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
diff --git a/dev-python/Faker/Manifest b/dev-python/Faker/Manifest
index 67cb86eb3c17..5ecddc1878cb 100644
--- a/dev-python/Faker/Manifest
+++ b/dev-python/Faker/Manifest
@@ -1,9 +1,2 @@
-DIST Faker-8.10.0.tar.gz 1149474 BLAKE2B 2a5304acb1ce88230660a468756ee79abc7ae0b6aeb850e3d05bb694cb9e5b596b1d9de4c8f1e82c208a3281efc026a290b6d96cd17bc6c523d22fcd61eaf756 SHA512 0d035663677bea9ef4a66c6f0cf5fb1e648e948deb4db07b352a8b8881f5774a9432524bef10e60f28d5d586ac66f0e207c3ad218edffd6071fa6ac614ac950b
-DIST Faker-8.10.1.tar.gz 1144158 BLAKE2B 7463566a8bf2f510ab89b7fd67ee3aea80ce65725063f83798a6f7ce959a1e5c4eef82504adc124add6ff028d6e248871123d0992f715d46485daa6d64d4179b SHA512 c5bb3b376757fe025255de67a184dfae959c834e937825515eaae083a2ce931f2c00ed1ade7ccba49adf182570cf533526e583e6a45c4fa08b41e22544139227
-DIST Faker-8.10.2.tar.gz 1150102 BLAKE2B 5ca744d201a7822cbe35791757a73628d3c12f6521ca55bc2d340c974cb6e76362f87395cbc858e4681738440cf676e9f9bf7a8002b908ff564dc6703ef794e0 SHA512 5a148327df7c34623c0d8c154e6181a183a0aa484659e5872013f0b9c510418690278550ebbed6eb984c87cef588fd862b213295a379b5be3433afe312181103
-DIST Faker-8.10.3.tar.gz 1149954 BLAKE2B 665ed95be11f734ed2ae9b593a4e287cc53b041521ab223efc045f061133e983de500ef12a858d7420342a500926297565b7c50674fe5533b985a00816251031 SHA512 a5969f04dd96660b3e62ece20ce4d92de9c781faa1742e45404b0a6f04dc7521c9532c519df06c4b3e9a815dde43837b7ab7628ef25ed3b60bda49c927b8ace7
-DIST Faker-8.11.0.tar.gz 1150354 BLAKE2B 9799163239afef521d352dea601a63f2702536380891182c72f856bf442441ed654412ba035dd4964ea9ca3f2c19e0737e0225a58178a2edffcc52b06047e2f1 SHA512 5a42ea5c843272f9f70edc88e405f0b309f6e6ae5c061d1f1ca7ed01f40688539371a1bce5084a0de3e424f3eb50443430ff1fafd1ef0a035d385d80b16cae2c
 DIST Faker-8.12.0.tar.gz 1151218 BLAKE2B b55d1b1bac6a580c51fdd3f87919cbcea107aff309bce4d2092ec77046dc40c67650f3c53d176147b6b433008e7487dae9e096eb9ba6c8722ec54ce5d6d39449 SHA512 5df90c0976cb8b5e96f4c6645a984e813130fd22f25b5fb99b7cd28b6e079eec54b19f8ca643b795be15f41b9f5b677e89db1379615479983f0b5519a6dd56b4
-DIST Faker-8.8.2.tar.gz 1148529 BLAKE2B 279984479ad4f790dc7acd74b5ccd1cf5f32689b8b1ccf2152d7dfaa6fc7b4699d9827c16f83bb86e298723b6906a5cc40c2fa7f75439b5af5fc78c1af99a3f6 SHA512 4273008bf9ab693a40da2f93ff1fe40e9e7b102a2d5439f09096b6754b82dc26310666da65723b363f628365c97d44dd290e1e7065b7a9d862130baa292325b7
-DIST Faker-8.9.0.tar.gz 1148829 BLAKE2B b24a7fa87886cb38850808de2ffe1ceafab3c548c694af30d53b1f415d329264fe7e53f33f46b913d16310dd83d95fe591689a308bb7d4c653254e39defaa24b SHA512 d2e26ae140c30ae8069f8e0fd75bb9bf54aa00a7271b327e37dd248520256e137d192082071bc36a584fc864c54c050107ddecb40624288636c6b41caf1ea574
-DIST Faker-8.9.1.tar.gz 1148890 BLAKE2B 2cab6461bf6067d9dfd8872c19c8c11fa25ffef82b61b7e7676ffc187346d228703424a73278678f19263423716c74ecd47cfc1c17bf54d38bba712e456650b8 SHA512 f7016b320c7394b0eccc06e833a80e227cdbad9c0f34eb9f8f4413f56a4743f58bbd7ec5eac3b8c0642e7764c6c5986707d493f0c84daa75575a12061631c9c5
+DIST Faker-8.12.1.tar.gz 1151131 BLAKE2B fd59a337ed95429b34b2f9c1530a9db6ef4ec921d1c194e90e794ea6316fd8c79b8f2aa416ad8806cd2f4c31cca8d1d2cf60209a6bb4a75a708345a0bfb0a572 SHA512 e359b015d4908130b12ca6dd8c7e4801011de383eececb62f3ac76cb621cad1c9a873c5de989932405f7a30b33aef8969fb9788a331620db3d6c3ad1e5a657c4
diff --git a/dev-python/PyContracts/PyContracts-1.8.14-r1.ebuild b/dev-python/PyContracts/PyContracts-1.8.14-r1.ebuild
index 8c2625f7df0c..148f17a44b17 100644
--- a/dev-python/PyContracts/PyContracts-1.8.14-r1.ebuild
+++ b/dev-python/PyContracts/PyContracts-1.8.14-r1.ebuild
@@ -3,13 +3,12 @@
 
 EAPI=7
 
-DISTUTILS_USE_SETUPTOOLS=bdepend
 PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
 
-inherit distutils-r1
+inherit distutils-r1 optfeature
 
 DESCRIPTION="Declare constraints on function parameters and return values"
-HOMEPAGE="https://andreacensi.github.com/contracts/ https://pypi.org/project/PyContracts/"
+HOMEPAGE="https://andreacensi.github.io/contracts/ https://pypi.org/project/PyContracts/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
@@ -22,5 +21,19 @@ RDEPEND="
 	dev-python/pyparsing[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]
 "
+BDEPEND="
+	test? ( $(python_gen_cond_dep '
+		dev-python/numpy[${PYTHON_USEDEP}]
+		' 'python*' )
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-fix-py3.10.patch"
+)
 
 distutils_enable_tests nose
+
+pkg_postinst() {
+	optfeature "constraints on numpy arrays" dev-python/numpy
+}
diff --git a/dev-python/PyContracts/files/PyContracts-1.8.14-fix-py3.10.patch b/dev-python/PyContracts/files/PyContracts-1.8.14-fix-py3.10.patch
new file mode 100644
index 000000000000..754b40efabd8
--- /dev/null
+++ b/dev-python/PyContracts/files/PyContracts-1.8.14-fix-py3.10.patch
@@ -0,0 +1,150 @@
+From d23ee2902e9e9aeffec86cbdb7a392d71be70861 Mon Sep 17 00:00:00 2001
+From: slorg1 <slorg1@gmail.com>
+Date: Tue, 16 Apr 2019 14:13:52 -0400
+Subject: [PATCH] + upgrade to use collections.abc as needed for python 3.6+
+
+--- a/src/contracts/library/map.py
++++ b/src/contracts/library/map.py
+@@ -1,7 +1,11 @@
+ from ..interface import Contract, ContractNotRespected
+ from ..syntax import (W, contract_expression, O, S, add_contract, add_keyword,
+     Keyword)
+-import collections
++
++try:
++    import collections.abc as collectionsAbc  # python 3.6+
++except ImportError:
++    import collections as collectionsAbc
+ 
+ 
+ class Map(Contract):
+@@ -13,7 +17,7 @@ def __init__(self, length=None, key_c=None, value_c=None, where=None):
+         self.value_c = value_c
+ 
+     def check_contract(self, context, value, silent):
+-        if not isinstance(value, collections.Mapping):
++        if not isinstance(value, collectionsAbc.Mapping):
+             error = 'Expected a Mapping, got %r.' % value.__class__.__name__
+             raise ContractNotRespected(contract=self, error=error,
+                                        value=value, context=context)
+--- a/src/contracts/library/miscellaneous_aliases.py
++++ b/src/contracts/library/miscellaneous_aliases.py
+@@ -1,12 +1,16 @@
+-import collections
+-
++try:
++    import collections.abc as collectionsAbc  # python 3.6+
++except ImportError:
++    import collections as collectionsAbc
+ 
+ 
+ def ist(C):
++
+     def f(x):
+         f.__name__ = 'isinstance_of_%s' % C.__name__
+         if not isinstance(x, C):
+             raise ValueError('Value is not an instance of %s.' % C.__name__)
++
+     return f
+ 
+ 
+@@ -14,33 +18,32 @@ def m_new_contract(name, f):
+     from contracts.library.extensions import CheckCallable
+     from contracts.library.extensions import Extension
+     Extension.registrar[name] = CheckCallable(f)
+-    
+ 
+-m_new_contract('Container', ist(collections.Container))
+-# todo: Iterable(x)
+-m_new_contract('Iterable', ist(collections.Iterable))
+-
+-m_new_contract('Hashable', ist(collections.Hashable))
+ 
++m_new_contract('Container', ist(collectionsAbc.Container))
++# todo: Iterable(x)
++m_new_contract('Iterable', ist(collectionsAbc.Iterable))
+ 
++m_new_contract('Hashable', ist(collectionsAbc.Hashable))
+ 
+-m_new_contract('Iterator', ist(collections.Iterator))
+-m_new_contract('Sized', ist(collections.Sized))
+-m_new_contract('Callable', ist(collections.Callable))
+-m_new_contract('Sequence', ist(collections.Sequence))
+-m_new_contract('Set', ist(collections.Set))
+-m_new_contract('MutableSequence', ist(collections.MutableSequence))
+-m_new_contract('MutableSet', ist(collections.MutableSet))
+-m_new_contract('Mapping', ist(collections.Mapping))
+-m_new_contract('MutableMapping', ist(collections.MutableMapping))
+-#new_contract('MappingView', ist(collections.MappingView))
+-#new_contract('ItemsView', ist(collections.ItemsView))
+-#new_contract('ValuesView', ist(collections.ValuesView))
++m_new_contract('Iterator', ist(collectionsAbc.Iterator))
++m_new_contract('Sized', ist(collectionsAbc.Sized))
++m_new_contract('Callable', ist(collectionsAbc.Callable))
++m_new_contract('Sequence', ist(collectionsAbc.Sequence))
++m_new_contract('Set', ist(collectionsAbc.Set))
++m_new_contract('MutableSequence', ist(collectionsAbc.MutableSequence))
++m_new_contract('MutableSet', ist(collectionsAbc.MutableSet))
++m_new_contract('Mapping', ist(collectionsAbc.Mapping))
++m_new_contract('MutableMapping', ist(collectionsAbc.MutableMapping))
++# new_contract('MappingView', ist(collections.MappingView))
++# new_contract('ItemsView', ist(collections.ItemsView))
++# new_contract('ValuesView', ist(collections.ValuesView))
+ 
+ 
+ # Not a lambda to have better messages
+-def is_None(x): 
++def is_None(x):
+     return x is None
+ 
++
+ m_new_contract('None', is_None)
+ m_new_contract('NoneType', is_None)
+--- a/src/contracts/library/seq.py
++++ b/src/contracts/library/seq.py
+@@ -1,7 +1,12 @@
+ from ..interface import Contract, ContractNotRespected
+ from ..syntax import (add_contract, W, contract_expression, O, S, add_keyword,
+     Keyword)
+-import collections
++
++try:
++    import collections.abc as collectionsAbc  # python 3.6+
++except ImportError:
++    import collections as collectionsAbc
++
+ from past.builtins import xrange
+ 
+ try:
+@@ -38,7 +43,7 @@ def check_contract(self, context, value, silent):
+ 
+             return
+ 
+-        if not isinstance(value, collections.Sequence):
++        if not isinstance(value, collectionsAbc.Sequence):
+             error = 'Expected a Sequence, got %r.' % value.__class__.__name__
+             raise ContractNotRespected(self, error, value, context)
+ 
+--- a/src/contracts/library/sets.py
++++ b/src/contracts/library/sets.py
+@@ -1,7 +1,10 @@
+ from ..interface import Contract, ContractNotRespected, describe_type
+ from ..syntax import (Keyword, O, S, W, add_contract, add_keyword,
+     contract_expression)
+-import collections
++try:
++    import collections.abc as collectionsAbc  # python 3.6+
++except ImportError:
++    import collections as collectionsAbc
+ 
+ 
+ class ASet(Contract):
+@@ -13,7 +16,7 @@ def __init__(self, length_contract=None,
+         self.elements_contract = elements_contract
+ 
+     def check_contract(self, context, value, silent):
+-        if not isinstance(value, collections.Set):
++        if not isinstance(value, collectionsAbc.Set):
+             error = 'Expected a set, got %r.' % describe_type(value)
+             raise ContractNotRespected(self, error, value, context)
+ 
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index 0ff4fe883d22..ca4db4964397 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -4,4 +4,5 @@ DIST boto3-1.18.24.tar.gz 404333 BLAKE2B fd0857a3462485a8cb633888ad6cae1578f32f7
 DIST boto3-1.18.25.tar.gz 404826 BLAKE2B 629a7c76ec4125c93a57f5e103d0b6e5fe360038bfc73a87369a035b321b6b143cc61fb2092f70f2dc6b07f6444180e64cafeb2e31a8f1e73b195abe06979c52 SHA512 a8f2c1a6248a75f67848bf75970535c71c098bb326ab9e344d7ab53e02562383be7acb0b41a18bc031459e0751e62bf29c3db17242ea4ebf0d7f88636251872a
 DIST boto3-1.18.26.tar.gz 405107 BLAKE2B b851a4358fb2b7cc6a6468f09690ebf91e0348e7bbc878fbe403d8eadf023601673673aa62841a94045e55fac353bc632e419afd2483e124798477e0325a86a6 SHA512 941f41639c551b9ea140a003d215c87e209e0933031cdef717bba406a6957266447e8532aef00069c3e5e482b999c094eb89c9f2df084ad7154724b6d3ab3158
 DIST boto3-1.18.27.tar.gz 405813 BLAKE2B d3da4db8133c9ad7b979a6a765f0f6d7d72e558b31753b4cef376123dcbc3964a315303fe7205d382abd6ce42bb3afb10e867908e9567c36703c94ec0c44c027 SHA512 5e29a58e898b5d6a3b0e20669c4a18bef788b8856041d0c8e8fcaa603de167c7301db1eabcc11d326f0d33fd7b7ab8b408b804cf763667d6313df1e71d0210e4
+DIST boto3-1.18.28.tar.gz 406268 BLAKE2B 1379f65f46f287a541b098b3ae183bc7d0a6c40a58f6241d97ce39ffdde4f0655e755fe56890fda767b57c6cf7bd565d95745dbbeb80f42f729f561f6e8d9a82 SHA512 98c0d94dd4971f833677947dbfbdcd495a26fda60592130842cf2f22b8929c6f72f971294d9ddc4923372706bf7f37d3d4cb0ede32afc6955d8253c19ddab63f
 DIST boto3-1.18.7.tar.gz 395640 BLAKE2B 6a9fa1dd55644806fe93271805f35fbe0c4cb65d1de08dded2d2f57fcefa96e32c4ebe7b60743c52c0898222bc06d33dbd03d304bbef327b88022450a7943e2c SHA512 20e7fedab7d061ab02f391e9baf36cb554e7f194f38d24d5a75f76715b2acf1b51b6adce5d8cf5a2a0d29df73566db00b8813a219d45a194d9a8eb93d0dab570
diff --git a/dev-python/boto3/boto3-1.18.28.ebuild b/dev-python/boto3/boto3-1.18.28.ebuild
new file mode 100644
index 000000000000..bee358e1c595
--- /dev/null
+++ b/dev-python/boto3/boto3-1.18.28.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+inherit distutils-r1
+
+DESCRIPTION="The AWS SDK for Python"
+HOMEPAGE="https://github.com/boto/boto3"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/boto3"
+	inherit git-r3
+	BOTOCORE_PV=${PV}
+else
+	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+	# botocore is x.(y+3).z
+	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
+fi
+
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests 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 fd9a2c05bf97..b6ccc751b81f 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -4,4 +4,5 @@ DIST botocore-1.21.24.tar.gz 8048949 BLAKE2B 2948da75d445114d5489d3f7cef1d8bef93
 DIST botocore-1.21.25.tar.gz 8063998 BLAKE2B b3e4563cd36825468b6c7755fa101d13260519240b856fa26166d5bb034352431a29e816dc9e7d60f4c10e9d3b5fd152342749cc19a75a9c35ba228023da3f48 SHA512 cf91fc16047d0168d743db5bd95003a2ae06dc72ca586c622690e8c7be546bca050ba81eaf49fd860eb42e3a0046ef99e3927772b6893ddfdaf57a1071489714
 DIST botocore-1.21.26.tar.gz 8065456 BLAKE2B d6cd96e35ae31e6c440abad2a76f23d2ce6e2e0d5ecbe275fc0404cebaaf0a14245735adc39cc6d7fe5feb9530120cfa403f061af3c188623f6ba1ad01cd8d12 SHA512 3b57a6bcbdb018f0bc20afec8844f07f7135658b29329d0ed4d5579db1a8cc05e5725335560f5786b77c2f7590879ed7dcf6c043e0efd3f16960689c64f1b061
 DIST botocore-1.21.27.tar.gz 8076120 BLAKE2B e7928438ec4b100ef00d202899fae47c7bba4a351206172598718fa042c61c3d84a7559e45fe41ef4e736639faa538220b22d74c8652d980b4c339489129d793 SHA512 32f03f274329741096f3c82181dfbf6c337189e04db0890baf834364a6aedc09b33c1a0936fe53c6e51197d0f2385269dc2f3f8f75e62f260a11dba970ee6d0d
+DIST botocore-1.21.28.tar.gz 8079306 BLAKE2B 26dce445746a9da1b0cf62b622597396f9b4e735701f9260fd9863410b28b884e70e41b446b8349df39c81696b64632450f4ebb3e3f7865175e538f1b465898c SHA512 29534e51465bc7ac7b6f2e2c48472768c26caa5089f4c7f4a23cc2411fd55fde473388ad181a0b5a36650a6c1252ecb3e2b65e30510adc40f6edd6ce0c89f484
 DIST botocore-1.21.7.tar.gz 7977343 BLAKE2B 19c5bf5de40ab131585e30bb85486fcffc3428808811b312b33578174ce31a691f4f4d955462120f05d2aad2cd5e5772789704eee641760fb67099aa3cddc9b5 SHA512 db1bb36faa6857a1cc717e5d591954415bb948178ee2be90ab9c32c11b1fb45c5b5aff87dfacd907c2f11bc7cdd2cd4de2ee9c847fa8cda4e5f0814a828b1019
diff --git a/dev-python/botocore/botocore-1.21.28.ebuild b/dev-python/botocore/botocore-1.21.28.ebuild
new file mode 100644
index 000000000000..5684261bd4b3
--- /dev/null
+++ b/dev-python/botocore/botocore-1.21.28.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+inherit distutils-r1
+
+DESCRIPTION="Low-level, data-driven core of boto 3"
+HOMEPAGE="https://github.com/boto/botocore"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/botocore"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/jmespath[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/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/google-api-python-client/Manifest b/dev-python/google-api-python-client/Manifest
index c76c29b9c069..82abc62586eb 100644
--- a/dev-python/google-api-python-client/Manifest
+++ b/dev-python/google-api-python-client/Manifest
@@ -1,3 +1,4 @@
 DIST google-api-python-client-2.13.0.tar.gz 25562934 BLAKE2B 6ce955995c0f2fa5d09e1c90e65d38a7f321421199f53957fb58934c1f067de03a48f47f1d161c9ad2cb852663316c5d0f873a32b9eedd7fffaa2b067d84ae05 SHA512 d2b0cf3c250a500e774970790390025119102e24eaf8c7a0c170139cf322c37f4c8cd3f406a41d18deb2597dfeb21e6304e173cfaafb4d6faeff23b2215d4072
 DIST google-api-python-client-2.14.1.tar.gz 25415625 BLAKE2B 2b843a6ec6345e51c5a92c0285c2b8ae195928bec61b73033fbc64d8e55c34ae39d8d542534d89edac36d6ddc6c12b6acf11a25dbcbc06f72776799a70606659 SHA512 e22600b9b87d646775780d0f45043753e4dea24e898faf16ae49f2c91677282700b45de993d085923c006f2948747a6afa2e58b38f42f934f1602401faa30d22
 DIST google-api-python-client-2.17.0.tar.gz 26302010 BLAKE2B 1d4a63825b79ff252b318d988aaa572a7567c4b3e19d110ec480d03c4ffcd16b16a19c4b54f51288a21e34a3a280c8077aa983da8eacaad1f176fb485ea7e89c SHA512 1967539825490530bb4330940bf69bc1bb25035b2079797185bb359c350fc111188b188e2d21dbd0009f8658a6dbb11539beed2aa5ce03daa142d7cbd330e466
+DIST google-api-python-client-2.18.0.tar.gz 26442309 BLAKE2B 84f0cadeed015e9e0cafa209f6256b6262822f7161728aa5eba88f0def718b11c555bd0d87867c1e1ebb02e93046cec068e4ac0f855c55b7abf34a8d51d42fdc SHA512 19b06a252c440d5bb8454fc79487f4009ff73a7bd4882b2d33a354d4c4f287a6ea09f30cff94df4c1d1e898ca237d8e118a7fd5e63022133338d944dcec1243c
diff --git a/dev-python/google-api-python-client/google-api-python-client-2.18.0.ebuild b/dev-python/google-api-python-client/google-api-python-client-2.18.0.ebuild
new file mode 100644
index 000000000000..8647284e7595
--- /dev/null
+++ b/dev-python/google-api-python-client/google-api-python-client-2.18.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+inherit distutils-r1
+
+DESCRIPTION="Google API Client for Python"
+HOMEPAGE="https://github.com/googleapis/google-api-python-client"
+SRC_URI="https://github.com/googleapis/google-api-python-client/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	>=dev-python/httplib2-0.15[${PYTHON_USEDEP}]
+	<dev-python/httplib2-1[${PYTHON_USEDEP}]
+	dev-python/google-api-core[${PYTHON_USEDEP}]
+	>=dev-python/google-auth-1.35.0[${PYTHON_USEDEP}]
+	>=dev-python/google-auth-httplib2-0.1.0[${PYTHON_USEDEP}]
+	>=dev-python/uritemplate-3.0.0[${PYTHON_USEDEP}]
+	<dev-python/uritemplate-4[${PYTHON_USEDEP}]
+	"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/oauth2client[${PYTHON_USEDEP}]
+		dev-python/pandas[${PYTHON_USEDEP}]
+		dev-python/parameterized[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests --install pytest
+
+src_prepare() {
+	find tests -name '*.py' -exec \
+		sed -i -e 's:unittest2 as ::' {} + || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local deselect=(
+		# require Internet access (and credentials)
+		tests/test_discovery.py::DiscoveryErrors::test_credentials_and_credentials_file_mutually_exclusive
+		tests/test_discovery.py::DiscoveryFromDocument::test_api_endpoint_override_from_client_options_mapping_object
+	)
+
+	distutils_install_for_testing
+	epytest tests ${deselect[@]/#/--deselect }
+}
diff --git a/dev-python/pebble/Manifest b/dev-python/pebble/Manifest
index e3816daa30cf..e4ee3a0c530d 100644
--- a/dev-python/pebble/Manifest
+++ b/dev-python/pebble/Manifest
@@ -1,2 +1,3 @@
 DIST Pebble-4.6.1.tar.gz 24800 BLAKE2B 5030b1206eb263ac4584b4dc5a6b2d13c39af827245c5f1574b30138a80ac4eb501374e22109bf20c4bafc21105cea7030d30f68fb9f48e77400b028f30c37be SHA512 0d6c04a45af66f8d849225e87158f33e8ec218943008dc385c5b13187f816d7e7a2fb485ab1a230b8d5e2ab23fc9fd18efc57ef3f15dc5caefad9b75cd149de1
 DIST Pebble-4.6.2.tar.gz 25877 BLAKE2B eee4835ecf9a2a83ef4ce58be3f87c41fb9a4469695218e5c4f4b779b4f14b8d8097bf9d9e9cd60cbd12a8261c7715f2356d7e8c700e633738d9313ce6373b3a SHA512 a46b66539ce8a51417bc7a396da82a9d3f63b69be09f9d2d647c0e5c52e920a1b68f7543ef06c3d3231807c965a7ddf93ae5ad1ffcacec98b8bd15e2eabb60ff
+DIST Pebble-4.6.3.tar.gz 25888 BLAKE2B 71f9e4c77d7dcc841f8c3a5e9d3df764727c27fc1ee5bb8250e33d49ce006ee94c11309f469f2ebb79aa720fd58ac2741b240aaad8f6d3c18be68189f180b639 SHA512 92cbb5ac01cc6fe57055facb6bcb6a64e19eb5eb3a3ae5fead32d4dd1001a3c70fbf85ef832dffc6b6bb81af6b1c275e12a61eda421176548a7bd5a928056313
diff --git a/dev-python/pebble/pebble-4.6.3.ebuild b/dev-python/pebble/pebble-4.6.3.ebuild
new file mode 100644
index 000000000000..f59ffb6d6c2f
--- /dev/null
+++ b/dev-python/pebble/pebble-4.6.3.ebuild
@@ -0,0 +1,22 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+inherit distutils-r1
+
+MY_P=${P^}
+DESCRIPTION="Threading and multiprocessing eye-candy"
+HOMEPAGE="
+	https://pypi.org/project/Pebble/
+	https://pebble.readthedocs.io/
+	https://github.com/noxdafox/pebble"
+SRC_URI="mirror://pypi/${MY_P::1}/${PN^}/${MY_P}.tar.gz"
+S=${WORKDIR}/${P^}
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+
+distutils_enable_tests pytest
diff --git a/dev-python/phonenumbers/Manifest b/dev-python/phonenumbers/Manifest
index 247bfeb074d4..1c0cf82401da 100644
--- a/dev-python/phonenumbers/Manifest
+++ b/dev-python/phonenumbers/Manifest
@@ -2,3 +2,4 @@ DIST phonenumbers-8.12.27.tar.gz 2258133 BLAKE2B 73a295a464a0e4e7d32f3633a0a1495
 DIST phonenumbers-8.12.28.tar.gz 2258298 BLAKE2B 02713540accf8c77c37acd7f69ffe3d1fe972124e4c8e82aa56f390d9906b10771c5a1a845c9b1adab602b041c38f4eeac6ee76d0e3382d542d64bcff5788fcc SHA512 49678b2b44038938733413d9bdd56904bb1a55bff9e1fa9a2636ceca18233c2ecdcc0fba8da5d1eb09e28c3c5d0eed61dcfcec1da729b7e599fcbc895ee47ead
 DIST phonenumbers-8.12.29.tar.gz 2258737 BLAKE2B 6a885e4ba28d7093746cd754a5fb60cb62b002a42d4331bb1cdfc2291b39b6da6d3c6673364e4715c09186bebf05b11988cf3beb8ed1690826ef800d07b17e7c SHA512 23e88f9a8bb801bb7a95cd5ef74527572d315e69b2db1c9c38c84d83293d99a015492f010321c9dc0596a5f40dc63453a42e2fd5a7d9dabae7ac0b78967876d7
 DIST phonenumbers-8.12.30.tar.gz 2257690 BLAKE2B 24d30fd69684b48f4cc5366dd419869f591c9556c2c1622775d9f479528aa15b817767f57f97a2789257024b0fde25467a8c88ecb210fa977269a9ab5f25a3e4 SHA512 0e824ac7dc2ba5a994a9af83c4f5d82eb0f31e64c7dabca6cb047185853f9a93fcd145e3c575fd43f76f6c48246954c4be2c6147081d311439cfaf456af629b8
+DIST phonenumbers-8.12.31.tar.gz 2258495 BLAKE2B 7b08961cf50382857b5bdbeef640091967e3c14f3949c8975028fef4192c7776a2f7619c6fbe177f4b46de44de9103cc62ddd949f5e1c882f742ab2a80619cb9 SHA512 28b608a81a452638e25eaa1311e42384725c55cb8f438e9ab54006b8b8cebd0ae848449f1ab6758884113b3cecae21729c3b4d8e1bbab1120df0d82c9ebe7f04
diff --git a/dev-python/phonenumbers/phonenumbers-8.12.31.ebuild b/dev-python/phonenumbers/phonenumbers-8.12.31.ebuild
new file mode 100644
index 000000000000..717843f08927
--- /dev/null
+++ b/dev-python/phonenumbers/phonenumbers-8.12.31.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+inherit distutils-r1
+
+DESCRIPTION="Python port of Google's libphonenumber"
+HOMEPAGE="https://github.com/daviddrysdale/python-phonenumbers"
+SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DOCS=(README.md)
+
+distutils_enable_tests setup.py
diff --git a/dev-python/pockets/Manifest b/dev-python/pockets/Manifest
index f94e6731c7fb..c7365505cc16 100644
--- a/dev-python/pockets/Manifest
+++ b/dev-python/pockets/Manifest
@@ -1 +1,2 @@
+DIST pockets-0.9.1.gh.tar.gz 42077 BLAKE2B 0cdc5a63389b7c01df9a2e63fc1e18edfb8471da8084832b3381141459932146fd46e2e1cf8f87fbf33fea8204a46596566be62ca6c5780985f0d7bd18d5d3e3 SHA512 a24418759bc133a0c62cf0a606a851d00cf1bd280c731065b92fb96a5274a45bc2266a4e1fec3db929aacec5baab774667052e7b732a53c4c4a217663c02ec7b
 DIST pockets-0.9.1.tar.gz 24993 BLAKE2B 9962655f755bb96853f1b4450f2bdcbd111ba945dc3a5cdaad84bb43a84150e7384ecb3c5758274b9cf578adc1c8991c163c56f72a00a00bf8fed634397e02af SHA512 436f2fd8cfb9c5612733b1163d381f52c28b8749de28f5e0de609d012ccfc10ad77a31851d3e1010feef5b517f287f1e5c7fc4b447e7b080e5536fdaf8d2e9d6
diff --git a/dev-python/pockets/pockets-0.9.1-r2.ebuild b/dev-python/pockets/pockets-0.9.1-r2.ebuild
new file mode 100644
index 000000000000..e0bf5ca1f9de
--- /dev/null
+++ b/dev-python/pockets/pockets-0.9.1-r2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+
+inherit distutils-r1
+
+# No tags upstream, https://github.com/RobRuana/pockets/issues/5
+COMMIT="777724c8eabaf76f6d0c5e4837c982d110509b2e"
+
+DESCRIPTION="Collection of helpful Python tools"
+HOMEPAGE="https://pockets.readthedocs.io/ https://pypi.org/project/pockets/"
+SRC_URI="
+	https://github.com/RobRuana/pockets/archive/${COMMIT}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
+BDEPEND="test? ( dev-python/pytz[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e 's/description-file/description_file/g' "${S}/setup.cfg" ||die
+	default
+}
diff --git a/dev-python/pylama/pylama-7.7.1-r1.ebuild b/dev-python/pylama/pylama-7.7.1-r1.ebuild
index 852f8a45e5d3..de5ed0365c4e 100644
--- a/dev-python/pylama/pylama-7.7.1-r1.ebuild
+++ b/dev-python/pylama/pylama-7.7.1-r1.ebuild
@@ -4,7 +4,6 @@
 EAPI="7"
 
 PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-DISTUTILS_USE_SETUPTOOLS="rdepend"
 
 inherit distutils-r1
 
@@ -41,8 +40,10 @@ python_prepare_all() {
 }
 
 python_test() {
-	# Disable eradicate until it is fixed:
-	# https://github.com/klen/pylama/issues/190
-	pytest -vv tests --deselect tests/test_linters.py::test_eradicate \
-		|| die "Tests failed with ${EPYTHON}"
+	local EPYTEST_DESELECT=(
+		# Disable eradicate until it is fixed:
+		# https://github.com/klen/pylama/issues/190
+		tests/test_linters.py::test_eradicate
+	)
+	epytest tests
 }
diff --git a/dev-python/svg-path/Manifest b/dev-python/svg-path/Manifest
index 6c8fd6386180..310b7e0e0d3e 100644
--- a/dev-python/svg-path/Manifest
+++ b/dev-python/svg-path/Manifest
@@ -1,2 +1 @@
-DIST svg.path-4.0.2.tar.gz 18161 BLAKE2B bd5adbf059808b8197fbff0f12e274d98cc72ef840cd29e504bab1dd5fbcb5240aa3d6beb2cc3f6b91bcbdd9251fa29285de0ecd163c22d6cb8454102b911597 SHA512 0659c3d012b81cca83306c2895480bcc770cf23f4fc98dc4f167b6799a9c5618a90aabd81e2c91e6b7c57998d42f04a47d8f0fa966546111cd165127df239510
 DIST svg.path-4.1.tar.gz 18228 BLAKE2B 3b70a37336078f0c4fb9ae1754cf92df7be957ac632931e4151ea158b05e54a29b68b74b9c69694d3e79986c13095e357fa52a8cecff3d1ad5ab3e2ef7c13015 SHA512 fb302c65f85bd61d98baab9e2a9707bc82f1bf02f3c9a34e5b864dcc7d2e03f85bd26a4fadd91a4249dbc37ae13f57eb5cdfc2805cbcb4f693d6f5c8863a3e92
diff --git a/dev-python/svg-path/metadata.xml b/dev-python/svg-path/metadata.xml
index bb9e706495e9..f54508daf59b 100644
--- a/dev-python/svg-path/metadata.xml
+++ b/dev-python/svg-path/metadata.xml
@@ -22,4 +22,5 @@
   <remote-id type="pypi">svg.path</remote-id>
  </upstream>
  <origin>gentoo-staging</origin>
+ <stabilize-allarches/>
 </pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/svg-path/svg-path-4.0.2.ebuild b/dev-python/svg-path/svg-path-4.0.2.ebuild
deleted file mode 100644
index b90661d1d941..000000000000
--- a/dev-python/svg-path/svg-path-4.0.2.ebuild
+++ /dev/null
@@ -1,28 +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
-
-MY_PN="svg.path"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="SVG path objects and parser"
-HOMEPAGE="https://github.com/regebro/svg.path"
-SRC_URI="https://github.com/regebro/svg.path/archive/${PV}.tar.gz -> ${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-S="${WORKDIR}/${MY_P}"
-
-distutils_enable_tests setup.py
-
-python_install() {
-	python_domodule src/svg
-}
diff --git a/dev-python/svg-path/svg-path-4.1.ebuild b/dev-python/svg-path/svg-path-4.1.ebuild
index f95dbd5f3efe..7a0d30b8176b 100644
--- a/dev-python/svg-path/svg-path-4.1.ebuild
+++ b/dev-python/svg-path/svg-path-4.1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 PYTHON_COMPAT=( python3_{6,7,8,9,10} )
 
@@ -10,7 +10,10 @@ inherit distutils-r1
 MY_P="svg.path-${PV}"
 DESCRIPTION="SVG path objects and parser"
 HOMEPAGE="https://github.com/regebro/svg.path"
-SRC_URI="https://github.com/regebro/svg.path/archive/${PV}.tar.gz -> ${MY_P}.tar.gz"
+SRC_URI="
+	https://github.com/regebro/svg.path/archive/${PV}.tar.gz
+		-> ${MY_P}.tar.gz
+"
 S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
diff --git a/dev-python/ubelt/Manifest b/dev-python/ubelt/Manifest
index c39afc9588aa..e837d0105fb5 100644
--- a/dev-python/ubelt/Manifest
+++ b/dev-python/ubelt/Manifest
@@ -1,2 +1,3 @@
 DIST ubelt-0.10.0.tar.gz 213813 BLAKE2B f44798dee470ebbdaedba4af6ef03c663f47e171258877c70c99b4dceabb991d2b142815965cdf873aceb9d34e248e341fd88e6b8d2c2554309f6d8d1302e2bd SHA512 dc6b1193838c7def5e3ab8f64b2708cb857bca52c2debe7b32f4fb80453904fe2dd6060383b73ae09b4ef6cc63bd45be1ff3d64bb4db72149046c89b39243a1e
+DIST ubelt-0.10.1.tar.gz 216033 BLAKE2B e481b2cf61788b50038ad69f0e2b637dfa0259d24ecca1a5587fe283d2270de205cb085112b9285cf57f664ce8a9d107f08b9b6735c8bea6fb97f6f48935dba9 SHA512 c15af249e6b94f69050703a4004307d91854e2ac7e25c5ac8d467b5b5f3363989f93bf2917eaf3c0f2485258b3530d7317f39449d5ac7ad5ed9b4615d916decb
 DIST ubelt-0.9.5.tar.gz 193739 BLAKE2B 90597750c9ae1c1a4aa9d3180119665a6d1bf9fddb57f220d8ab6d8d0daf521d4e2648247753446e0e285b9f24f57c35d10abdcdd06e566fdd3415c77f10e50d SHA512 fbe17001c03da513238ab2ae101a9ac8c334943e88bf3037243c8ad4998e42a38e2907a408866a8acf2f7e2061c86a186b7955429564a6245ffca2bed25b8e54
diff --git a/dev-python/ubelt/ubelt-0.10.1.ebuild b/dev-python/ubelt/ubelt-0.10.1.ebuild
new file mode 100644
index 000000000000..65ddc47d4b8c
--- /dev/null
+++ b/dev-python/ubelt/ubelt-0.10.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+inherit distutils-r1
+
+DESCRIPTION="A stdlib like feel, and extra batteries. Hashing, Caching, Timing, Progress"
+HOMEPAGE="https://github.com/Erotemic/ubelt"
+SRC_URI="https://github.com/Erotemic/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="Apache-2.0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]
+	dev-python/ordered-set[${PYTHON_USEDEP}]"
+
+DEPEND="test? ( dev-python/xdoctest[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local deselect=(
+		# relies on passwd being equal to ${HOME}
+		ubelt/util_path.py::userhome:0
+	)
+
+	epytest ${deselect[@]/#/--deselect } tests
+}