Adding metadata

26 files changed, 876 insertions, 57 deletions

diff --git a/dev-python/alembic/Manifest b/dev-python/alembic/Manifest
index 06e780569e88..fb966d7ac454 100644
--- a/dev-python/alembic/Manifest
+++ b/dev-python/alembic/Manifest
@@ -1,3 +1,4 @@
 DIST alembic-1.6.5.tar.gz 1174376 BLAKE2B a1bfdf611b30831363bd29a63f2a50d7c31e348ab6f450f709d1e8dbd891441263d8e0067de38c09351c26c26d07178e3079b30b5c976dfa90cd24d5973038d8 SHA512 8e5ce4bb41a47fb2c263d3542d7fd2dad04bd76b81a6a565fa93cef80a38a016944924b9eb57895ae71d7f8eef428bf440388444ef750bf281616e514a61c79b
 DIST alembic-1.7.0.tar.gz 1223858 BLAKE2B 1e0528030b153eddb2d5105d309cb611934939606cc91721e560a3fd74af76bff69ba00b0179a6d580a914634bf75f257aab094ed920298b43bbf98beec10ba6 SHA512 a2d2a6c0a6cab17bab4e66a7f8c2eff6481c0ababb836fae14d702301b1a186bf5eee84a95fcfa8501a1efaa262d61293e1dbba13b40270535068bff0449f4b5
 DIST alembic-1.7.1.tar.gz 1225157 BLAKE2B f107c1d787bf9025dc7c092a650449cb911e327fb501f6e4717285f627c455ad43765ca229522a605ac8345f754bbd6808485d77b99576b691ac04185263db51 SHA512 222a643363f89077b7d30068e0abeb8d8dc373778dd6e4364b559d8a63428f0fe3617505207f431c30a1bd43745dd95fd679dfb1401222f20068327805c2309c
+DIST alembic-1.7.3.tar.gz 1226799 BLAKE2B 209ccb03b5745eda2dd54a9a6376ab62dfd5902b497a86cde460c258c87917a534bbe5a028be58444fcbf3acb9c7d84ce5f26798a636089b5d869a238bc2f23b SHA512 cf6d6dd0913d1552ed82ceefc6254af3ef9aea46c08a2d0879a941e7807e5ed41195f5d0b98d108f77a2db5a3c502115af1ce4c9c76618f8c720255dbe58bcad
diff --git a/dev-python/alembic/alembic-1.7.3.ebuild b/dev-python/alembic/alembic-1.7.3.ebuild
new file mode 100644
index 000000000000..a0b08d15370f
--- /dev/null
+++ b/dev-python/alembic/alembic-1.7.3.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="database migrations tool, written by the author of SQLAlchemy"
+HOMEPAGE="https://github.com/sqlalchemy/alembic"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="doc"
+
+RDEPEND="
+	>=dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
+	dev-python/mako[${PYTHON_USEDEP}]
+	>=dev-python/python-editor-0.3[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/importlib_metadata[${PYTHON_USEDEP}]
+	' pypy3)
+	$(python_gen_cond_dep '
+		dev-python/importlib_resources[${PYTHON_USEDEP}]
+	' pypy3 python3_8)
+"
+
+distutils_enable_tests pytest
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index e549180188d7..78678de8fa13 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -3,3 +3,4 @@ DIST boto3-1.18.40.tar.gz 412065 BLAKE2B c548c6a1f5cfac3d304384b56882943201c45f3
 DIST boto3-1.18.41.tar.gz 412328 BLAKE2B 134ec70addcb9748d255b86d9e12dd380094a6a82c1d79ea9772dcc59e6eaac95a4337a1980d4791f856bd9a4d84b2f0a79b00b8b7f5a2e57384eca95a4090f5 SHA512 a7d0093083a6dae9a9ee8ad183027adc5d1f4cde05f244f126af022c77df457c0810626fe9ce5baf6fbc9e8d9ec2f8086bf95587d4f80b63c47bf4ef210bf61a
 DIST boto3-1.18.42.tar.gz 412699 BLAKE2B d03c4afe357def827e9169ced8b17f92caf79b8291edd5045629e1b8ee697014764caf3135910d9a0862380a94fbaabd1863535c0aad21fd1eca2b0d3e306ac2 SHA512 aae080862a3b30e23407cde6ced8a48522421be40f9eb192647f6ed2693ce6655576dd0705a998469274ba9ef74d24d51c31003798fc4f0856c417491aeab30b
 DIST boto3-1.18.43.tar.gz 413685 BLAKE2B 1733a75e17fabdd9941874fd7dfec735cde8702e4df07e5f3c293a9cd83207ae26f7adfc7caeb4913d2fc0d114c4738870b93053ce3e2485f9b4bc3286dabad1 SHA512 5191276feff196503cbd21a44bfd205737ed2c150071037d76198b164c56549b34f36266768f3e5346add393d6c25ad13daf6f6daf74217841d27e305c20c3f1
+DIST boto3-1.18.44.tar.gz 413928 BLAKE2B 4cfa75b2dd99f70af521b4da6537cc527f2ab80352b6fb29460ef8759761536023ddb567ef5050d9fa43327542112494b48264bae73bbb95e701ae997e37787c SHA512 cbf142259bf84d0d8a1ba7f2e00d4dff2f66d3adf8fc838d7f3228ce5cc837337907e5351cdafa68fdf6497ce3c7db4543b1254cd6471a81a1ece47f713b1cfe
diff --git a/dev-python/boto3/boto3-1.18.44.ebuild b/dev-python/boto3/boto3-1.18.44.ebuild
new file mode 100644
index 000000000000..bee358e1c595
--- /dev/null
+++ b/dev-python/boto3/boto3-1.18.44.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 7889f12c5053..7a7160249721 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -3,3 +3,4 @@ DIST botocore-1.21.40.tar.gz 8149052 BLAKE2B 0554e2b9caa08b7518f1b51b5a980d98926
 DIST botocore-1.21.41.tar.gz 8152451 BLAKE2B e236a8f0f64bd18c138dc168c74cefe7af598ad72def9e1faeba222b07f01a65fb7f74627afe470f2894794fd3a617aaa1d789a983606de9329db58c5db2d975 SHA512 540848ccb054340f22c20930a3f867754accd15c6f084dd20ca97184d1c5e390d68f21272d68087b99ae6676d05cbc187e61c88dd0df09cc033e01f1ac1af0ac
 DIST botocore-1.21.42.tar.gz 8156403 BLAKE2B 199d1eeae7b51fc59b8ca6ed3ea331178e94354841144f0055f02a9cd3d67e2bf52c358a7902090bc555c96e6876dcda1b4fe9b9c5c090ce07901af60b4ed116 SHA512 5be1b82f99ea310077bef3abbca6542a1787db38d5f2004107ff2c4b51a57e39e859116daf9451b23368347e05cded84a401476ca6e3fcd13683e4fc8ceb8554
 DIST botocore-1.21.43.tar.gz 8167256 BLAKE2B 525f0d1e7cacd34d81800abf5a120cdaff2a5ba91dfe7e7405d54d8b1768b45df4b1d36b287ab1db42ad68f17f1f2bfcd5c71c64a270824c69128fafea8ec113 SHA512 709f1792f855bb4178dd2d1e79f7b476e5b695a84684d9a5e6e57a36bd8f881f28cc4322a2e296c3935fad544d6adb4ede15a7cd532c7e5671350f0d96bee105
+DIST botocore-1.21.44.tar.gz 8168012 BLAKE2B c1fc1a2cb71c88365b18f578cde18633a7969b7d12c8162762fdc1ad9395ebf859a9d144870a751a1760f93bffd255bb8969b1fde812f9bf1d95e9973b61b202 SHA512 66b4c3ede4b23260a61309de7afcef2c5436516b3399c52438bae50b8714e3d8b0c86b271e0ac8f1214738ecee3e1677fa6ca7315a1bfaae5a49f2aa650a6806
diff --git a/dev-python/botocore/botocore-1.21.44.ebuild b/dev-python/botocore/botocore-1.21.44.ebuild
new file mode 100644
index 000000000000..5684261bd4b3
--- /dev/null
+++ b/dev-python/botocore/botocore-1.21.44.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/bsddb3/bsddb3-6.2.9.ebuild b/dev-python/bsddb3/bsddb3-6.2.9.ebuild
index 77686b68b97a..a59ba62327e1 100644
--- a/dev-python/bsddb3/bsddb3-6.2.9.ebuild
+++ b/dev-python/bsddb3/bsddb3-6.2.9.ebuild
@@ -5,7 +5,6 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{6,7,8,9,10} )
 PYTHON_REQ_USE="threads(+)"
-DISTUTILS_USE_SETUPTOOLS=no
 DISTUTILS_IN_SOURCE_BUILD=1
 inherit db-use distutils-r1
 
@@ -29,6 +28,10 @@ RDEPEND="
 	)"
 DEPEND="${RDEPEND}"
 
+PATCHES=(
+	"${FILESDIR}/${P}-fix-py3.10.patch"
+)
+
 python_prepare_all() {
 	# This list should be kept in sync with setup.py.
 	if [[ -z ${DB_VER} ]]; then
@@ -58,5 +61,5 @@ python_configure_all() {
 }
 
 python_test() {
-	PYTHONPATH=Lib3 "${EPYTHON}" test3.py -v || die "Testing failed with ${EPYTHON}"
+	PYTHONPATH=Lib3 "${EPYTHON}" test3.py -vv || die "Testing failed with ${EPYTHON}"
 }
diff --git a/dev-python/bsddb3/files/bsddb3-6.2.9-fix-py3.10.patch b/dev-python/bsddb3/files/bsddb3-6.2.9-fix-py3.10.patch
new file mode 100644
index 000000000000..9e3ab6ba3a91
--- /dev/null
+++ b/dev-python/bsddb3/files/bsddb3-6.2.9-fix-py3.10.patch
@@ -0,0 +1,546 @@
+Based on upstream commit 43fc626bff3e by Jesus Cea <jcea@jcea.es>
+https://hg.jcea.es/pybsddb/rev/43fc626bff3e
+
+Ported to v6.2.9 by Arthur Zamarin <arthurzam@gentoo.org>
+
+--- a/Lib3/bsddb/test/test_all.py
++++ b/Lib3/bsddb/test/test_all.py
+@@ -473,11 +473,15 @@ if sys.version_info[0] >= 3 :
+ from bsddb3 import db, dbtables, dbutils, dbshelve, \
+         hashopen, btopen, rnopen, dbobj
+ 
+-if sys.version_info[0] < 3 :
+-    from test import test_support
+-else :
+-    from test import support as test_support
++if sys.version_info >= (3, 9):
++    from test.support.socket_helper import find_unused_port
++else:
++    from test.support import find_unused_port
+ 
++if sys.version_info >= (3, 10):
++    from test.support.os_helper import rmtree, unlink
++else:
++    from test.support import rmtree, unlink
+ 
+ try:
+     if sys.version_info[0] < 3 :
+@@ -540,7 +544,7 @@ def get_new_environment_path() :
+     try:
+         os.makedirs(path,mode=0o700)
+     except os.error:
+-        test_support.rmtree(path)
++        rmtree(path)
+         os.makedirs(path)
+     return path
+ 
+@@ -565,7 +569,7 @@ def set_test_path_prefix(path) :
+     get_new_path.prefix=path
+ 
+ def remove_test_path_directory() :
+-    test_support.rmtree(get_new_path.prefix)
++    rmtree(get_new_path.prefix)
+ 
+ if have_threads :
+     import threading
+--- a/Lib3/bsddb/test/test_associate.py
++++ b/Lib3/bsddb/test/test_associate.py
+@@ -42,7 +42,7 @@ import time
+ from pprint import pprint
+ 
+ import unittest
+-from .test_all import db, dbshelve, test_support, verbose, have_threads, \
++from .test_all import db, dbshelve, rmtree, verbose, have_threads, \
+         get_new_environment_path
+ 
+ 
+@@ -120,7 +120,7 @@ class AssociateErrorTestCase(unittest.TestCase):
+     def tearDown(self):
+         self.env.close()
+         self.env = None
+-        test_support.rmtree(self.homeDir)
++        rmtree(self.homeDir)
+ 
+     def test00_associateDBError(self):
+         if verbose:
+@@ -170,7 +170,7 @@ class AssociateTestCase(unittest.TestCase):
+         self.closeDB()
+         self.env.close()
+         self.env = None
+-        test_support.rmtree(self.homeDir)
++        rmtree(self.homeDir)
+ 
+     def addDataToDB(self, d, txn=None):
+         for key, value in list(musicdata.items()):
+--- a/Lib3/bsddb/test/test_basics.py
++++ b/Lib3/bsddb/test/test_basics.py
+@@ -46,7 +46,7 @@ import unittest
+ import time
+ import sys
+ 
+-from .test_all import db, test_support, verbose, get_new_environment_path, \
++from .test_all import db, rmtree, verbose, get_new_environment_path, \
+         get_new_database_path
+ 
+ DASH = '-'
+@@ -94,7 +94,7 @@ class BasicTestCase(unittest.TestCase):
+                 self.filename = "test"
+             # Yes, a bare except is intended, since we're re-raising the exc.
+             except:
+-                test_support.rmtree(self.homeDir)
++                rmtree(self.homeDir)
+                 raise
+         else:
+             self.env = None
+@@ -131,7 +131,7 @@ class BasicTestCase(unittest.TestCase):
+         self.d.close()
+         if self.env is not None:
+             self.env.close()
+-            test_support.rmtree(self.homeDir)
++            rmtree(self.homeDir)
+         else:
+             os.remove(self.filename)
+ 
+--- a/Lib3/bsddb/test/test_compare.py
++++ b/Lib3/bsddb/test/test_compare.py
+@@ -43,7 +43,7 @@ from io import StringIO
+ 
+ import unittest
+ 
+-from .test_all import db, dbshelve, test_support, \
++from .test_all import db, dbshelve, rmtree, \
+         get_new_environment_path, get_new_database_path
+ 
+ 
+@@ -119,7 +119,7 @@ class AbstractBtreeKeyCompareTestCase(unittest.TestCase) :
+         if self.env is not None:
+             self.env.close()
+             self.env = None
+-        test_support.rmtree(self.homeDir)
++        rmtree(self.homeDir)
+ 
+     def addDataToDB(self, data) :
+         i = 0
+@@ -304,7 +304,7 @@ class AbstractDuplicateCompareTestCase(unittest.TestCase) :
+         if self.env is not None:
+             self.env.close()
+             self.env = None
+-        test_support.rmtree(self.homeDir)
++        rmtree(self.homeDir)
+ 
+     def addDataToDB(self, data) :
+         for item in data:
+--- a/Lib3/bsddb/test/test_cursor_pget_bug.py
++++ b/Lib3/bsddb/test/test_cursor_pget_bug.py
+@@ -36,7 +36,7 @@ are met:
+ import unittest
+ import os, glob
+ 
+-from .test_all import db, test_support, get_new_environment_path, \
++from .test_all import db, rmtree, get_new_environment_path, \
+         get_new_database_path
+ 
+ #----------------------------------------------------------------------
+@@ -67,7 +67,7 @@ class pget_bugTestCase(unittest.TestCase):
+         del self.secondary_db
+         del self.primary_db
+         del self.env
+-        test_support.rmtree(self.homeDir)
++        rmtree(self.homeDir)
+ 
+     def test_pget(self):
+         cursor = self.secondary_db.cursor()
+--- a/Lib3/bsddb/test/test_db.py
++++ b/Lib3/bsddb/test/test_db.py
+@@ -36,7 +36,7 @@ are met:
+ import unittest
+ import os, glob
+ 
+-from .test_all import db, test_support, get_new_environment_path, \
++from .test_all import db, rmtree, unlink, get_new_environment_path, \
+         get_new_database_path
+ 
+ #----------------------------------------------------------------------
+@@ -49,7 +49,7 @@ class DB(unittest.TestCase):
+     def tearDown(self):
+         self.db.close()
+         del self.db
+-        test_support.unlink(self.path)
++        unlink(self.path)
+ 
+ class DB_general(DB) :
+     def test_get_open_flags(self) :
+@@ -133,7 +133,7 @@ class DB_txn(DB) :
+         del self.db
+         self.env.close()
+         del self.env
+-        test_support.rmtree(self.homeDir)
++        rmtree(self.homeDir)
+ 
+     def test_flags(self) :
+         self.db.set_flags(db.DB_CHKSUM)
+--- a/Lib3/bsddb/test/test_dbenv.py
++++ b/Lib3/bsddb/test/test_dbenv.py
+@@ -36,7 +36,7 @@ are met:
+ import unittest
+ import os, glob
+ 
+-from .test_all import db, test_support, get_new_environment_path, \
++from .test_all import db, rmtree, get_new_environment_path, \
+         get_new_database_path
+ 
+ #----------------------------------------------------------------------
+@@ -49,7 +49,7 @@ class DBEnv(unittest.TestCase):
+     def tearDown(self):
+         self.env.close()
+         del self.env
+-        test_support.rmtree(self.homeDir)
++        rmtree(self.homeDir)
+ 
+ class DBEnv_general(DBEnv) :
+     def test_get_open_flags(self) :
+--- a/Lib3/bsddb/test/test_dbobj.py
++++ b/Lib3/bsddb/test/test_dbobj.py
+@@ -37,7 +37,7 @@ are met:
+ import os, string
+ import unittest
+ 
+-from .test_all import db, dbobj, test_support, get_new_environment_path, \
++from .test_all import db, dbobj, rmtree, get_new_environment_path, \
+         get_new_database_path
+ 
+ #----------------------------------------------------------------------
+@@ -54,7 +54,7 @@ class dbobjTestCase(unittest.TestCase):
+             del self.db
+         if hasattr(self, 'env'):
+             del self.env
+-        test_support.rmtree(self.homeDir)
++        rmtree(self.homeDir)
+ 
+     def test01_both(self):
+         class TestDBEnv(dbobj.DBEnv): pass
+--- a/Lib3/bsddb/test/test_dbshelve.py
++++ b/Lib3/bsddb/test/test_dbshelve.py
+@@ -42,7 +42,7 @@ import random
+ import unittest
+ 
+ 
+-from .test_all import db, dbshelve, test_support, verbose, \
++from .test_all import db, dbshelve, rmtree, unlink, verbose, \
+         get_new_environment_path, get_new_database_path
+ 
+ 
+@@ -82,7 +82,7 @@ class DBShelveTestCase(unittest.TestCase):
+             from .test_all import do_proxy_db_py3k
+             do_proxy_db_py3k(self._flag_proxy_db_py3k)
+         self.do_close()
+-        test_support.unlink(self.filename)
++        unlink(self.filename)
+ 
+     def mk(self, key):
+         """Turn key into an appropriate key type for this db"""
+@@ -338,7 +338,7 @@ class BasicEnvShelveTestCase(DBShelveTestCase):
+             from .test_all import do_proxy_db_py3k
+             do_proxy_db_py3k(self._flag_proxy_db_py3k)
+         self.do_close()
+-        test_support.rmtree(self.homeDir)
++        rmtree(self.homeDir)
+ 
+ 
+ class EnvBTreeShelveTestCase(BasicEnvShelveTestCase):
+--- a/Lib3/bsddb/test/test_dbtables.py
++++ b/Lib3/bsddb/test/test_dbtables.py
+@@ -31,7 +31,7 @@ else :
+     import pickle
+ 
+ import unittest
+-from .test_all import db, dbtables, test_support, verbose, \
++from .test_all import db, dbtables, rmtree, verbose, \
+         get_new_environment_path, get_new_database_path
+ 
+ #----------------------------------------------------------------------
+@@ -55,7 +55,7 @@ class TableDBTestCase(unittest.TestCase):
+         if sys.version_info[0] >= 3 :
+             from .test_all import do_proxy_db_py3k
+             do_proxy_db_py3k(self._flag_proxy_db_py3k)
+-        test_support.rmtree(self.testHomeDir)
++        rmtree(self.testHomeDir)
+ 
+     def test01(self):
+         tabname = "test01"
+--- a/Lib3/bsddb/test/test_distributed_transactions.py
++++ b/Lib3/bsddb/test/test_distributed_transactions.py
+@@ -39,7 +39,7 @@ are met:
+ import os
+ import unittest
+ 
+-from .test_all import db, test_support, get_new_environment_path, \
++from .test_all import db, rmtree, get_new_environment_path, \
+         get_new_database_path
+ 
+ from .test_all import verbose
+@@ -84,7 +84,7 @@ class DBTxn_distributed(unittest.TestCase):
+ 
+     def tearDown(self):
+         self._destroy_env()
+-        test_support.rmtree(self.homeDir)
++        rmtree(self.homeDir)
+ 
+     def _recreate_env(self,must_open_db) :
+         self._destroy_env()
+--- a/Lib3/bsddb/test/test_early_close.py
++++ b/Lib3/bsddb/test/test_early_close.py
+@@ -40,7 +40,7 @@ is closed before its DB objects.
+ import os, sys
+ import unittest
+ 
+-from .test_all import db, test_support, verbose, get_new_environment_path, get_new_database_path
++from .test_all import db, rmtree, verbose, get_new_environment_path, get_new_database_path
+ 
+ # We're going to get warnings in this module about trying to close the db when
+ # its env is already closed.  Let's just ignore those.
+@@ -62,7 +62,7 @@ class DBEnvClosedEarlyCrash(unittest.TestCase):
+         self.filename = "test"
+ 
+     def tearDown(self):
+-        test_support.rmtree(self.homeDir)
++        rmtree(self.homeDir)
+ 
+     def test01_close_dbenv_before_db(self):
+         dbenv = db.DBEnv()
+--- a/Lib3/bsddb/test/test_fileid.py
++++ b/Lib3/bsddb/test/test_fileid.py
+@@ -40,7 +40,7 @@ import os
+ import shutil
+ import unittest
+ 
+-from .test_all import db, test_support, get_new_environment_path, get_new_database_path
++from .test_all import db, rmtree, unlink, get_new_environment_path, get_new_database_path
+ 
+ class FileidResetTestCase(unittest.TestCase):
+     def setUp(self):
+@@ -82,9 +82,9 @@ class FileidResetTestCase(unittest.TestCase):
+         self.db_env.close()
+ 
+     def tearDown(self):
+-        test_support.unlink(self.db_path_1)
+-        test_support.unlink(self.db_path_2)
+-        test_support.rmtree(self.db_env_path)
++        unlink(self.db_path_1)
++        unlink(self.db_path_2)
++        rmtree(self.db_env_path)
+ 
+ def test_suite():
+     suite = unittest.TestSuite()
+--- a/Lib3/bsddb/test/test_join.py
++++ b/Lib3/bsddb/test/test_join.py
+@@ -40,7 +40,7 @@ import os
+ 
+ import unittest
+ 
+-from .test_all import db, dbshelve, test_support, verbose, \
++from .test_all import db, dbshelve, rmtree, verbose, \
+         get_new_environment_path, get_new_database_path
+ 
+ #----------------------------------------------------------------------
+@@ -75,7 +75,7 @@ class JoinTestCase(unittest.TestCase):
+ 
+     def tearDown(self):
+         self.env.close()
+-        test_support.rmtree(self.homeDir)
++        rmtree(self.homeDir)
+ 
+     def test01_join(self):
+         if verbose:
+--- a/Lib3/bsddb/test/test_lock.py
++++ b/Lib3/bsddb/test/test_lock.py
+@@ -40,7 +40,7 @@ TestCases for testing the locking sub-system.
+ import time
+ 
+ import unittest
+-from .test_all import db, test_support, verbose, have_threads, \
++from .test_all import db, rmtree, verbose, have_threads, \
+         get_new_environment_path, get_new_database_path
+ 
+ if have_threads :
+@@ -63,7 +63,7 @@ class LockingTestCase(unittest.TestCase):
+ 
+     def tearDown(self):
+         self.env.close()
+-        test_support.rmtree(self.homeDir)
++        rmtree(self.homeDir)
+ 
+ 
+     def test01_simple(self):
+--- a/Lib3/bsddb/test/test_misc.py
++++ b/Lib3/bsddb/test/test_misc.py
+@@ -39,7 +39,7 @@ are met:
+ import os, sys
+ import unittest
+ 
+-from .test_all import db, dbshelve, hashopen, test_support, get_new_environment_path, get_new_database_path
++from .test_all import db, dbshelve, hashopen, rmtree, unlink, get_new_environment_path, get_new_database_path
+ 
+ #----------------------------------------------------------------------
+ 
+@@ -49,8 +49,8 @@ class MiscTestCase(unittest.TestCase):
+         self.homeDir = get_new_environment_path()
+ 
+     def tearDown(self):
+-        test_support.unlink(self.filename)
+-        test_support.rmtree(self.homeDir)
++        unlink(self.filename)
++        rmtree(self.homeDir)
+ 
+     def test01_badpointer(self):
+         dbs = dbshelve.open(self.filename)
+@@ -104,7 +104,7 @@ class MiscTestCase(unittest.TestCase):
+             # double free happened during exit from DBC_get
+         finally:
+             db1.close()
+-            test_support.unlink(self.filename)
++            unlink(self.filename)
+ 
+     def test06_key_with_null_bytes(self):
+         try:
+@@ -123,7 +123,7 @@ class MiscTestCase(unittest.TestCase):
+             self.assertEqual(db1['aaa'], 'eh eh eh!')
+         finally:
+             db1.close()
+-            test_support.unlink(self.filename)
++            unlink(self.filename)
+ 
+     def test07_DB_set_flags_persists(self):
+         try:
+@@ -147,7 +147,7 @@ class MiscTestCase(unittest.TestCase):
+             self.assertEqual([('a', 'new A')], list(db1.items()))
+         finally:
+             db1.close()
+-            test_support.unlink(self.filename)
++            unlink(self.filename)
+ 
+ 
+     def test08_ExceptionTypes(self) :
+--- a/Lib3/bsddb/test/test_pickle.py
++++ b/Lib3/bsddb/test/test_pickle.py
+@@ -47,7 +47,7 @@ else :
+ 
+ import unittest
+ 
+-from .test_all import db, test_support, get_new_environment_path, get_new_database_path
++from .test_all import db, rmtree, get_new_environment_path, get_new_database_path
+ 
+ #----------------------------------------------------------------------
+ 
+@@ -63,7 +63,7 @@ class pickleTestCase(unittest.TestCase):
+             del self.db
+         if hasattr(self, 'env'):
+             del self.env
+-        test_support.rmtree(self.homeDir)
++        rmtree(self.homeDir)
+ 
+     def _base_test_pickle_DBError(self, pickle):
+         self.env = db.DBEnv()
+--- a/Lib3/bsddb/test/test_recno.py
++++ b/Lib3/bsddb/test/test_recno.py
+@@ -42,7 +42,7 @@ from pprint import pprint
+ import string
+ import unittest
+ 
+-from .test_all import db, test_support, verbose, get_new_environment_path, get_new_database_path
++from .test_all import db, rmtree, unlink, verbose, get_new_environment_path, get_new_database_path
+ 
+ 
+ #----------------------------------------------------------------------
+@@ -60,9 +60,9 @@ class SimpleRecnoTestCase(unittest.TestCase):
+         self.homeDir = None
+ 
+     def tearDown(self):
+-        test_support.unlink(self.filename)
++        unlink(self.filename)
+         if self.homeDir:
+-            test_support.rmtree(self.homeDir)
++            rmtree(self.homeDir)
+ 
+     def test01_basic(self):
+         d = db.DB()
+--- a/Lib3/bsddb/test/test_replication.py
++++ b/Lib3/bsddb/test/test_replication.py
+@@ -41,7 +41,7 @@ import time
+ import unittest
+ import sys
+ 
+-from .test_all import db, test_support, have_threads, verbose, \
++from .test_all import db, rmtree, find_unused_port, have_threads, verbose, \
+         get_new_environment_path, get_new_database_path
+ 
+ 
+@@ -101,15 +101,11 @@ class DBReplication(unittest.TestCase) :
+ 
+         self.dbenvClient.close()
+         self.dbenvMaster.close()
+-        test_support.rmtree(self.homeDirClient)
+-        test_support.rmtree(self.homeDirMaster)
++        rmtree(self.homeDirClient)
++        rmtree(self.homeDirMaster)
+ 
+ class DBReplicationManager(DBReplication) :
+     def test01_basic_replication(self) :
+-        if sys.version_info < (3, 9):
+-            find_unused_port = test_support.find_unused_port
+-        else:
+-            from test.support.socket_helper import find_unused_port
+         master_port = find_unused_port()
+         client_port = find_unused_port()
+ 
+@@ -373,8 +369,8 @@ class DBBaseReplication(DBReplication) :
+ 
+         self.dbenvClient.close()
+         self.dbenvMaster.close()
+-        test_support.rmtree(self.homeDirClient)
+-        test_support.rmtree(self.homeDirMaster)
++        rmtree(self.homeDirClient)
++        rmtree(self.homeDirMaster)
+ 
+     def basic_rep_threading(self) :
+         self.dbenvMaster.rep_start(flags=db.DB_REP_MASTER)
+--- a/Lib3/bsddb/test/test_sequence.py
++++ b/Lib3/bsddb/test/test_sequence.py
+@@ -36,7 +36,7 @@ are met:
+ import unittest
+ import os
+ 
+-from .test_all import db, test_support, get_new_environment_path, get_new_database_path
++from .test_all import db, rmtree, get_new_environment_path, get_new_database_path
+ 
+ 
+ class DBSequenceTest(unittest.TestCase):
+@@ -61,7 +61,7 @@ class DBSequenceTest(unittest.TestCase):
+             self.dbenv.close()
+             del self.dbenv
+ 
+-        test_support.rmtree(self.homeDir)
++        rmtree(self.homeDir)
+ 
+     def test_get(self):
+         self.seq = db.DBSequence(self.d, flags=0)
+--- a/Lib3/bsddb/test/test_thread.py
++++ b/Lib3/bsddb/test/test_thread.py
+@@ -51,7 +51,7 @@ except NameError:
+         pass
+ 
+ import unittest
+-from .test_all import db, dbutils, test_support, verbose, have_threads, \
++from .test_all import db, dbutils, rmtree, verbose, have_threads, \
+         get_new_environment_path, get_new_database_path
+ 
+ if have_threads :
+@@ -88,7 +88,7 @@ class BaseThreadedTestCase(unittest.TestCase):
+     def tearDown(self):
+         self.d.close()
+         self.env.close()
+-        test_support.rmtree(self.homeDir)
++        rmtree(self.homeDir)
+ 
+     def setEnvOpts(self):
+         pass
diff --git a/dev-python/feedparser/feedparser-6.0.8.ebuild b/dev-python/feedparser/feedparser-6.0.8.ebuild
index d84d39b44cbc..2eab8c885b0c 100644
--- a/dev-python/feedparser/feedparser-6.0.8.ebuild
+++ b/dev-python/feedparser/feedparser-6.0.8.ebuild
@@ -23,6 +23,10 @@ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-li
 
 RDEPEND="dev-python/sgmllib3k[${PYTHON_USEDEP}]"
 
+PATCHES=(
+	"${FILESDIR}/${P}-fix-py3.10.patch"
+)
+
 distutils_enable_tests unittest
 
 src_prepare() {
@@ -34,5 +38,5 @@ src_prepare() {
 }
 
 python_test() {
-	"${EPYTHON}" tests/runtests.py || die
+	"${EPYTHON}" tests/runtests.py || die "Tests failed with ${EPYTHON}"
 }
diff --git a/dev-python/feedparser/files/feedparser-6.0.8-fix-py3.10.patch b/dev-python/feedparser/files/feedparser-6.0.8-fix-py3.10.patch
new file mode 100644
index 000000000000..8f835f37207e
--- /dev/null
+++ b/dev-python/feedparser/files/feedparser-6.0.8-fix-py3.10.patch
@@ -0,0 +1,15 @@
+From: Kurt McKee <contactme@kurtmckee.org>
+Date: Sat, 12 Jun 2021 15:32:05 -0500
+Subject: [PATCH] Fix a crash that occurs with Python 3.10.0b2
+
+--- a/feedparser/html.py
++++ b/feedparser/html.py
+@@ -337,7 +337,7 @@ def parse_declaration(self, i):
+
+         try:
+             return sgmllib.SGMLParser.parse_declaration(self, i)
+-        except sgmllib.SGMLParseError:
++        except (AssertionError, sgmllib.SGMLParseError):
+             # Escape the doctype declaration and continue parsing.
+             self.handle_data('&lt;')
+             return i+1
diff --git a/dev-python/humanfriendly/Manifest b/dev-python/humanfriendly/Manifest
index 239b104a0b72..a9e51d1a0f2e 100644
--- a/dev-python/humanfriendly/Manifest
+++ b/dev-python/humanfriendly/Manifest
@@ -1,3 +1,4 @@
+DIST humanfriendly-10.0.tar.gz 360702 BLAKE2B 6db7f2f11bafcdc087c078eae6123046610594b17899678e445baa18c25b2210cc1d84363d858ab7c57fce6d6b7a189be69dea08c1891d3f5b11ff9900c9bef9 SHA512 496700bcea1dabf003c938558bf807fabb41b71192f69622979dd9e243dda9b4b06c5ac8f65cef217df85ebadf99099dc22b50d63216791a569be11081d267d6
 DIST humanfriendly-8.2.tar.gz 358747 BLAKE2B bc5824e94ea94df6ee93ea44d273ccb856f50b69e52ae6293afaedf06c9f00c67e064f0c85edd88be9954bb258334b1b9af4ab88efc5b352f3efe8d322fc55c1 SHA512 123d8592e6613a70421740648bb8998733b118927a0bd6182af848612e46eec8e35cae95168219c9b7672bed8e18e1c4a493a80248eabe47f8a4cb1813c8b591
 DIST humanfriendly-9.1.tar.gz 359616 BLAKE2B c67ca9498ff4a0dac237c8f1c81ae88882a7ab162e2cfd663cd50a066dbcfe045424bdf4dcc1df473f5fc41f0c1b8c0f2aca9883aa21915281618ba332c579a3 SHA512 859a9ff01abe0671a23a63e73c9c09c0f92151e96ec38dd5695c75f99fa436e186835cb8a16f59b82d5216b9c427ea0abd419b470b067f8032fe984776f02a8f
 DIST humanfriendly-9.2.tar.gz 360080 BLAKE2B 39aa17315a87938468f2d6e94b0287f07864476c4179c40504126c65f7042c96113a9d60f481a6a03913ae5c8cfde2c87476e0d403c964aa65abceb0f55633f1 SHA512 2abb8d7d4dfb84d625e82f3475bea5045c32f548a45999dca97d39e5bc0cd704a9ab45e0b6b87c0d419b447680a3e71e2d9c8cb14ba19117c7ac9b2f56297f00
diff --git a/dev-python/humanfriendly/humanfriendly-10.0.ebuild b/dev-python/humanfriendly/humanfriendly-10.0.ebuild
new file mode 100644
index 000000000000..97cf7390ca66
--- /dev/null
+++ b/dev-python/humanfriendly/humanfriendly-10.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Human friendly output for text interfaces using Python"
+HOMEPAGE="https://pypi.org/project/humanfriendly/
+	https://github.com/xolox/python-humanfriendly/
+	https://humanfriendly.readthedocs.io/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+
+BDEPEND="
+	test? (
+		dev-python/capturer[${PYTHON_USEDEP}]
+		>=dev-python/coloredlogs-15.0.1[${PYTHON_USEDEP}]
+		dev-python/docutils[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs
+
+python_test() {
+	epytest humanfriendly/tests.py
+}
diff --git a/dev-python/keystoneauth/Manifest b/dev-python/keystoneauth/Manifest
index d5650595b552..bc44361be757 100644
--- a/dev-python/keystoneauth/Manifest
+++ b/dev-python/keystoneauth/Manifest
@@ -1 +1,2 @@
 DIST keystoneauth1-4.2.1.tar.gz 258328 BLAKE2B 62f8b065a77d4150c9491f4352a3a2d37d42cc54df8db6a1eabdbe93f18714838ebed2dec0d6188e91f2dc3708b0c3cfbcf17a96411df05dd96c409a1b6c8beb SHA512 cb137d259dba7cab31fa39293d40d6654c6b36157f088948995d55755fb4dc8c29df1f978a58fbc0881516f11db840f0a25c7621bb092ab95d901dde6bd210ca
+DIST keystoneauth1-4.4.0.tar.gz 266308 BLAKE2B 471b6662c27b5cc36dfde76e17f6855d5e840280a05c5c23bbda97b2e75b8fbc44e815994de514a475424476ed4d627930f993ed5fc7109fa3a2a99acf42dde2 SHA512 208b02c8df8a5cbdad1ca66c665d547b375eac2fa0d3aeb6dea3f9ed7ba0e799568e4407b8771df5a362d4275fb6a9b2fe2e3a9287b3817da43463356bc593a3
diff --git a/dev-python/keystoneauth/keystoneauth-4.4.0.ebuild b/dev-python/keystoneauth/keystoneauth-4.4.0.ebuild
new file mode 100644
index 000000000000..c85a4248e666
--- /dev/null
+++ b/dev-python/keystoneauth/keystoneauth-4.4.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+inherit distutils-r1
+
+DESCRIPTION="This package contains tools for authenticating to an OpenStack-based cloud."
+HOMEPAGE="https://github.com/openstack/keystoneauth"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}1/${PN}1-${PV}.tar.gz"
+S="${WORKDIR}/${PN}1-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0"
+RDEPEND="${CDEPEND}
+	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
+	>=dev-python/os-service-types-1.2.0[${PYTHON_USEDEP}]"
+BDEPEND="${CDEPEND}
+	test? (
+		>=dev-python/betamax-0.7.0[${PYTHON_USEDEP}]
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+		dev-python/hacking[${PYTHON_USEDEP}]
+		>=dev-python/lxml-4.2.0[${PYTHON_USEDEP}]
+		>=dev-python/oauthlib-0.6.2[${PYTHON_USEDEP}]
+		>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
+		>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
+		>=dev-python/pyyaml-3.12[${PYTHON_USEDEP}]
+		>=dev-python/requests-kerberos-0.8.0[${PYTHON_USEDEP}]
+		>=dev-python/requests-mock-1.2.0[${PYTHON_USEDEP}]
+		>=dev-python/testresources-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests unittest
+
+src_prepare() {
+	# relies on specific test runner name
+	sed -i -e 's:run\.py:unittest_or_fail.py:' \
+		keystoneauth1/tests/unit/test_session.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	eunittest -b
+}
diff --git a/dev-python/more-itertools/Manifest b/dev-python/more-itertools/Manifest
index 1934eada2856..81dbd909390d 100644
--- a/dev-python/more-itertools/Manifest
+++ b/dev-python/more-itertools/Manifest
@@ -1,2 +1,3 @@
+DIST more-itertools-8.10.0.tar.gz 102929 BLAKE2B ab98e0f94ea50bd4bd1d147bc81947259e77cdcadbbf365d1b3b0a02e97fbcff8712637721b82bdbf8d1f8ced7bea57c2c8b6249b07ecdcd179fd1316dee055e SHA512 a666710426a825e5aca10b52439a973e08ac6ec09fb5375426194d1342af055a8b6aee48b4e3fa17c4606d6d9cc3673afdd789dbbaf373258be6a71bd63178f7
 DIST more-itertools-8.8.0.tar.gz 93660 BLAKE2B 7d26b847c856064b6edfbda661b9e9288ba2069604e687d90713040ec469abab9853f3bff1b4e25b9ded764822a9ba58eccd5be5e9a13094ab4fc0871626289b SHA512 c6efec614a10a2fc72a4bbb7c62ac586e5dd28e04582768e0b3749cbd8307df0b4a609637d427d9c4940874e2aed1432094c09ac249e16a20dc6a09723172f06
 DIST more-itertools-8.9.0.tar.gz 98238 BLAKE2B 16b89c6d1ea4f43afdd69f2c2f0912aa828f5af63ff391efb0c6e05cec190970244800a207804fe03dce0cf87ec4835ab21f05e7fdde4ea826d172399f21fb01 SHA512 7e6480ec594703cb13282a0e81cdcc9513e972433442b9c7fa68fa4e17ea25e523cf8f4b1d16242f2a77b55eeaaae1d428b48c6297a25bb9f36b4f70b96ed7fb
diff --git a/dev-python/more-itertools/more-itertools-8.10.0.ebuild b/dev-python/more-itertools/more-itertools-8.10.0.ebuild
new file mode 100644
index 000000000000..c3ef58756582
--- /dev/null
+++ b/dev-python/more-itertools/more-itertools-8.10.0.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} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="More routines for operating on iterables, beyond itertools"
+HOMEPAGE="https://pypi.org/project/more-itertools/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+distutils_enable_sphinx docs \
+	dev-python/sphinx_rtd_theme
+distutils_enable_tests unittest
diff --git a/dev-python/notify2/notify2-0.3.1-r2.ebuild b/dev-python/notify2/notify2-0.3.1-r2.ebuild
index 8d1c08a593fc..e90ca865b198 100644
--- a/dev-python/notify2/notify2-0.3.1-r2.ebuild
+++ b/dev-python/notify2/notify2-0.3.1-r2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 DISTUTILS_USE_SETUPTOOLS=no
 PYTHON_COMPAT=( python3_{6,7,8,9,10} )
@@ -18,10 +18,17 @@ KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="examples"
 
 RDEPEND="dev-python/dbus-python[${PYTHON_USEDEP}]"
-DEPEND="test? ( sys-apps/dbus[X] )"
+BDEPEND="test? (
+	dev-python/pygobject[${PYTHON_USEDEP}]
+	sys-apps/dbus[X]
+	x11-libs/gdk-pixbuf[introspection]
+	virtual/notification-daemon
+)"
 
-python_test() {
-	virtx ${EPYTHON} test_notify2.py
+distutils_enable_tests unittest
+
+src_test() {
+	virtx distutils-r1_src_test
 }
 
 python_install_all() {
diff --git a/dev-python/pypy-exe-bin/Manifest b/dev-python/pypy-exe-bin/Manifest
index 24bf47a66082..a7361b447246 100644
--- a/dev-python/pypy-exe-bin/Manifest
+++ b/dev-python/pypy-exe-bin/Manifest
@@ -1,4 +1,4 @@
-DIST pypy-exe-7.3.4-1.amd64.xpak 13659131 BLAKE2B f8dc0875bec1027fd86499d13e435f97bd015882260b449de279ef41f8b8e9b89fc6e9f197539314ada54e2435a2cb7e7baf3da6e47b872d6717c847c3b7ddcf SHA512 e14312457c1fed4d815c7dee0487b5d77e781b3139381a142156e6fc524df7e7f4f613799a570716d89c95fd704ecad3c095f839296d7c1e63bd675aaac2c92e
-DIST pypy-exe-7.3.4-1.x86.xpak 10291603 BLAKE2B 62e83aa57b176a02a64a1826515763c24d008a02733ef32040ba2c908dffaca371cda3f55eddecfe93f45c1ba52aa7d0ccb898d84f0dbf8ab004f8a79a3814bb SHA512 73c6481530f4c4305a16d12995b11860023f7516737f892df7911d1effd01142c22f2318fb3b392e2483b976fa2609dbff37b61ad8847e395cbaaccbac0301dd
 DIST pypy-exe-7.3.5-1.amd64.xpak 13646862 BLAKE2B ac2aecdb15d5b73cbd27b8a295ef5f11895ed7f897cda93cdff96c72ad727ab7998332231a1166100126ec2252b7c5b69e6b5bbfcb3e7fcb7738f5967809f5d8 SHA512 346f7b47d0e48799edd0e00b6bf683053ccaf20e6663ddd01e5753703082035cb4079a3539981813fc54abd7f83456353c38bd733dacf782e59a6548f861d1a7
 DIST pypy-exe-7.3.5-1.x86.xpak 10297092 BLAKE2B 149672f5714959deeb790b575e7980c1281b1cf37c0853e3ddf8c150104b2da0b8d32736eacc31f67d4d522902599e64bec7427727e560d8d54bbe7c5bd9a06e SHA512 48e4858489e928d44dd8570b783623eb33ce7a1fb62b2a054cd2841ca2be8ab7dd3bbd00c3aff770c1f8dc42ef52f52da3d18c5c27ebd08d19e78bdf56081e96
+DIST pypy-exe-7.3.6_rc1-1.amd64.xpak 13661837 BLAKE2B ff1b886fd963691acd063c6a1f0336b48af15cf2f59dd5236be9985f6d5c417e935ea59aca3f7d30cb1ec11f18912dcb5c43b40fb05c6a1ff71f51a8e0d05f35 SHA512 1273b355d6a76504f156f6602f12ce01a9f02aa5bb8e18dc85c7690a4aebb683942bde05347e0f1cd735a35ffef5b69268abcf17209dfb2c70fe6da7ab76370f
+DIST pypy-exe-7.3.6_rc1-1.x86.xpak 10314897 BLAKE2B 70343d0ebddf72784435c164e99a8ea484eb6302f2522e84770055b1e12e50db92fb1e65af1642f473e47edf71b1739b4bd07e5d1437611411ef878fd8dbff8f SHA512 7c387be4687fad42b6e3d8bf86a551c323011a894b3d7d3e6d70e52e92e02902425dc5b4c84fbf283fb305751d8277c9fce009489bcbc3abfa71a71bc3c3114a
diff --git a/dev-python/pypy-exe-bin/pypy-exe-bin-7.3.4-r1.ebuild b/dev-python/pypy-exe-bin/pypy-exe-bin-7.3.6_rc1.ebuild
index fbee1716b1b9..f6b770e8f85a 100644
--- a/dev-python/pypy-exe-bin/pypy-exe-bin-7.3.4-r1.ebuild
+++ b/dev-python/pypy-exe-bin/pypy-exe-bin-7.3.6_rc1.ebuild
@@ -1,6 +1,5 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 2021 Liguros Authors
 # Distributed under the terms of the GNU General Public License v2
-
 EAPI=7
 
 inherit pax-utils
@@ -21,7 +20,7 @@ S="${WORKDIR}"
 
 LICENSE="MIT"
 SLOT="${PV%_p*}"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
 
 RDEPEND=">=sys-libs/zlib-1.1.3:0/1
 	|| (
diff --git a/dev-python/pypy/Manifest b/dev-python/pypy/Manifest
index a587787494d4..42d3b0aa0a8d 100644
--- a/dev-python/pypy/Manifest
+++ b/dev-python/pypy/Manifest
@@ -1,4 +1,4 @@
-DIST pypy2.7-gentoo-patches-7.3.4.tar.xz 7844 BLAKE2B d06694fa085667e40ef8805c29f7ccf95b49f9de4e99e3ebfa3d69c4202a0ddcebb54c524d7d9f9ec67573a8d2ebe38fb7023d4d3ecef67afc907ecef5c16c02 SHA512 aa8ffefb5d30070ae86c1c14c55c277e39d3da66aea3a0951319158fb65e716e7fa7864e8bf5d26314d4b2a8030c766b63cad6a3663822d2875cd8cc1f3f2de5
 DIST pypy2.7-gentoo-patches-7.3.5.tar.xz 6928 BLAKE2B 41aff14411882e60102866a41de6a2c13983d5489c9ed928e2823714883b5cca289c093426fdec35b6df8d17de7a96528d799e10412a0f2f02563e152acf24ea SHA512 f12c1a414cf40e86e9d2a7d1cdfaaacc1045f8043da479b5270ef983ffcf01418a70bbd21ae740abf544091cdc5026bffe467d631242d5e9e0863a64fa8d026b
-DIST pypy2.7-v7.3.4-src.tar.bz2 21571561 BLAKE2B d0ac56fadec63fe7e65728c36c2aaf96fc5f54919dddbca9571a24c42a9e3e21f672f84555a18a384c4715f0489bd7aef009c0a47b635de88c472a93e2ae8d71 SHA512 4c18c2dbfbf0cc1034bea773828204df77aec7ef82119fb94e5cb762ce1783e00ad70e99d1432b4948dc132e726bdc6015f4a5bf10a5b10415bcfe99da2ecd17
+DIST pypy2.7-gentoo-patches-7.3.6rc1.tar.xz 7904 BLAKE2B 3a5b8efaa67d5a1b4f65a56c6256a3b1efa765079e0fb2c2d380b325175f2e8f3a7d7c4886f734374b6069b3ebf3ac63483f90ada0ece72ff5d8e5c82940c875 SHA512 820d6155e3451b22076719eb3ffc29fab74965761faeade52013d3928fd63cd00b8c5d045f0da0bc1f303a9d2998cd210cd6bec05b2ca01c8b281a61c9a4a73c
 DIST pypy2.7-v7.3.5-src.tar.bz2 21572184 BLAKE2B 388b8623c2c5de839dea0e60acc5e11a6a774b4a6cdc051691053a97fe13ec12c6735a4be64015653ef420c0d8af2c79d8faa90a7dfc3042e29f35f4e1ded6c3 SHA512 a30c666c29eec7cca7e2e52f26480958b5885cd59c6b2e3d3c0d8c1cc55c298e878fc95f88e38a4297bb3d7d1cc1f77470de958e5acfd317e1fc8bdd5d013dcb
+DIST pypy2.7-v7.3.6rc1-src.tar.bz2 21617621 BLAKE2B 659dd16920b157dae94c5d1f7a9346c7b933ec8c6a3019e36aaa6911bd01d5c9d064a75baa3d8f3df423db4d5a1de5d4f3c8fb63c8d5188d23401b07cc7611be SHA512 f8b949488c3af8acc5533d92238b7bca9ce59c24e93413e0db88094eaf58af5f92a9c9a941f3b7184d2761af2c2c4775891353df053a0762519606a4ce7ca544
diff --git a/dev-python/pypy/pypy-7.3.4.ebuild b/dev-python/pypy/pypy-7.3.6_rc1.ebuild
index 94fa2f5ad800..a2451e50d240 100644
--- a/dev-python/pypy/pypy-7.3.4.ebuild
+++ b/dev-python/pypy/pypy-7.3.6_rc1.ebuild
@@ -1,13 +1,12 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 2021 Liguros Authors
 # Distributed under the terms of the GNU General Public License v2
-
 EAPI=7
 
 inherit pax-utils python-utils-r1
 
 PYPY_PV=${PV%_p*}
-MY_P=pypy2.7-v${PYPY_PV}
-PATCHSET="pypy2.7-gentoo-patches-${PV}"
+MY_P=pypy2.7-v${PYPY_PV/_}
+PATCHSET="pypy2.7-gentoo-patches-${PV/_rc/rc}"
 
 DESCRIPTION="A fast, compliant alternative implementation of the Python language"
 HOMEPAGE="https://www.pypy.org/"
@@ -23,11 +22,11 @@ IUSE="bzip2 gdbm +jit libressl ncurses sqlite tk"
 
 RDEPEND="
 	|| (
-		>=dev-python/pypy-exe-${PV}:${PYPY_PV}[bzip2?,ncurses?]
-		>=dev-python/pypy-exe-bin-${PV}:${PYPY_PV}
+		>=dev-python/pypy-exe-${PYPY_PV}:${PYPY_PV}[bzip2?,ncurses?]
+		>=dev-python/pypy-exe-bin-${PYPY_PV}:${PYPY_PV}
 	)
 	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
+	libressl? ( <=dev-libs/libressl-3.2.6 )
 	gdbm? ( sys-libs/gdbm:0= )
 	sqlite? ( dev-db/sqlite:3= )
 	tk? (
@@ -57,6 +56,10 @@ src_compile() {
 	mv pypy/module/cpyext/parse/*.h include/ || die
 	pax-mark m pypy-c
 
+	# verify the subslot
+	local soabi=$(./pypy-c -c 'import sysconfig; print sysconfig.get_config_var("SOABI")')
+	[[ ${soabi#pypy-} == ${SLOT#*/} ]] || die "update subslot to ${soabi}"
+
 	einfo "Generating caches and CFFI modules ..."
 
 	# Generate Grammar and PatternGrammar pickles.
diff --git a/dev-python/rencode/rencode-1.0.6-r1.ebuild b/dev-python/rencode/rencode-1.0.6-r1.ebuild
deleted file mode 100644
index 45fe914736c5..000000000000
--- a/dev-python/rencode/rencode-1.0.6-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="similar to bencode from the BitTorrent project"
-HOMEPAGE="https://github.com/aresch/rencode"
-SRC_URI="https://github.com/aresch/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~sparc x86 ~amd64-linux ~x86-linux"
-
-BDEPEND="dev-python/cython[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	# https://github.com/aresch/rencode/commit/16e61e1ff4294bddb7c881536d3d454355c78969
-	"${FILESDIR}/${P}-drop-wheel-dependency.patch"
-)
-
-python_test() {
-	# The C extension ("_rencode") can't be imported from "${S}/rencode"
-	# so we need to cd somewhere else to make sure "rencode" is imported
-	# from ${BUILD_DIR}/lib (thanks to PYTHONPATH).
-	cd "${T}" || die
-	epytest "${S}"
-}
diff --git a/dev-python/rencode/rencode-1.0.6-r2.ebuild b/dev-python/rencode/rencode-1.0.6-r2.ebuild
index 4fbeacb36ec5..706d75be166d 100644
--- a/dev-python/rencode/rencode-1.0.6-r2.ebuild
+++ b/dev-python/rencode/rencode-1.0.6-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/aresch/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~sparc x86 ~amd64-linux ~x86-linux"
 
 BDEPEND="dev-python/cython[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/sgmllib3k/Manifest b/dev-python/sgmllib3k/Manifest
index 5f5d490e190d..2ace818dd118 100644
--- a/dev-python/sgmllib3k/Manifest
+++ b/dev-python/sgmllib3k/Manifest
@@ -1 +1,2 @@
 DIST sgmllib3k-1.0.0.tar.gz 5750 BLAKE2B 188ac3c55245ff431e1ad7981f706f1a8fce3e9f3aaf844252c02da1189e5b9c7d29b76d803cbbcfc157fbb1ec7f36245186693472b95ed1634a2989185308ae SHA512 f9238afb831356f66b1c3e55975e0ea88007ffe1469b8b4e325e704d1915eb0ab120f5f9e98f36eeb4bf6204a1938d8a4d5a424f0cc054b141ac94adc8ef8ca9
+DIST test_sgmllib.py.gz 3769 BLAKE2B 026a843eaeb698d87e0137453b7f82763dee9a1ca446fc2c2fa9af8324297176749b041dfc2fc4c1954d743d9cfb7e773a189d99f22f7dc55ea1de486da80dd4 SHA512 722b79aa8b38626540bc331f9edb36919a8fb2561c5526be19509a58901aa1e2582e312fc2ace09cae54cb62577f266fcb10a1d98ab10685e2c79a17fea2f124
diff --git a/dev-python/sgmllib3k/sgmllib3k-1.0.0.ebuild b/dev-python/sgmllib3k/sgmllib3k-1.0.0.ebuild
index 697b575b173f..dd9347d30964 100644
--- a/dev-python/sgmllib3k/sgmllib3k-1.0.0.ebuild
+++ b/dev-python/sgmllib3k/sgmllib3k-1.0.0.ebuild
@@ -8,8 +8,15 @@ inherit distutils-r1
 
 DESCRIPTION="Py3k port of sgmllib"
 HOMEPAGE="https://pypi.org/project/sgmllib3k/"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz
+	test? ( https://dev.gentoo.org/~arthurzam/distfiles/dev-python/${PN}/test_sgmllib.py.gz )"
 
 LICENSE="PSF-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+python_test() {
+	"${EPYTHON}" "${WORKDIR}/test_sgmllib.py" -v || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/websockets/websockets-9.1-r1.ebuild b/dev-python/websockets/websockets-9.1-r1.ebuild
index 684289fe634f..ad612a567b9d 100644
--- a/dev-python/websockets/websockets-9.1-r1.ebuild
+++ b/dev-python/websockets/websockets-9.1-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 arm arm64 ~ppc ~ppc64 ~riscv sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv sparc ~x86"
 
 distutils_enable_tests unittest