Adding metadata

16 files changed, 174 insertions, 555 deletions

diff --git a/dev-python/GitPython/GitPython-3.1.23.ebuild b/dev-python/GitPython/GitPython-3.1.24.ebuild
index c2110d7a3845..c2110d7a3845 100644
--- a/dev-python/GitPython/GitPython-3.1.23.ebuild
+++ b/dev-python/GitPython/GitPython-3.1.24.ebuild
diff --git a/dev-python/GitPython/Manifest b/dev-python/GitPython/Manifest
index 24a41ab35af0..c77b82288384 100644
--- a/dev-python/GitPython/Manifest
+++ b/dev-python/GitPython/Manifest
@@ -1,6 +1,6 @@
 DIST GitPython-3.1.20.gitbundle 9511740 BLAKE2B 17d1aeec50a85ff5b8688a984ff41933bc8a3d91ec2e706053fcaae9298d9d469b7c816ac61f82934d454f6ebacdbce4d56ac8936ba89a7a694b59cca8b9e821 SHA512 d49e429b45f9edbee9419b94136762a75cf33b1693f9f8fb809b0bf63f0a763d501d9ca42f332d156ba7d79d07eed310763af51797adec4dac30f7c073c415b2
 DIST GitPython-3.1.20.tar.gz 188094 BLAKE2B 3741b6b2e6c77ea8464eb83abfc744e9c646d18368648f805a2aa2f6fdb1875ec61b7e4aa4e224a67bff49686268c86b2cd2b3faf19e9eaa4c9587aacb7fa3f4 SHA512 10dc9f154067eb79a98fbf3204e370e814ab00661ffd7c2e1a1dc8ba46475ed48ec8c355820deba609486c865301e13bd54797ab7da8fccf8cff9cc9efebb153
-DIST GitPython-3.1.23.gitbundle 9661389 BLAKE2B 2b70484d695fa723b436d51e843fe4d03b2754be5b079d9a13b34c129c9559fd728ed3cf4873c534fdb404a802a3d6984f032b797cc490eafa12b89979a97e27 SHA512 6f9b29c6ece3d497b262d9cb9c561bdd9be8d60a01df0a81acaf7a9ef71297968a90ccc712f45a898ec1d5a28c84121ccf427b9805dee37412d172efd0407be4
-DIST GitPython-3.1.23.tar.gz 189889 BLAKE2B 063ecfbb3820cc05f631b6dcaeabaec79e15041d47c5e39fa2364beba1a6db07cf74a6442517136cfe29d14d85efb1b08ac609c1468f9e7d86527037c57d67ac SHA512 06037303c4ce6fc1f9cc0ba7839196ece3721fd45840a10bbc31701d54a46591323b4fe7e2c459a2b3811d0d859170ec9b5b2cb4b52bb50a09897f6b8cb82676
+DIST GitPython-3.1.24.gitbundle 9658020 BLAKE2B 4ac2c1a238de1d6e5be9f2d65ec486a1a48b38695946889f8ba1c7f0474216e251d6385737d0576be9ece09d3751a305d756b58a21dc20a279609a35553de0f0 SHA512 9f05b4c92b85fa80e9b774380758c1a6e0d4ada81c170ddd6c542a31fae1a047844a481e8478afc3472e3a226f8eca1a37a3ef7a6b9c06787fd84543cd073b1e
+DIST GitPython-3.1.24.tar.gz 191249 BLAKE2B b60f5186aea33434d77b63997e5e9dc277b49a97934bfe250795af9c0ed92d00c478dd4475a00faa2f5867882f81161dcd21ed46c86883a48b8397266b5318de SHA512 af2aa85574287827e5d2b78f7a19776be57518aa0b8af7a3fb92bef0d97c6a27b3272ed39adf2080b39cd5a9eb114164de7a2a9bbf73cfe1fe2647e0b053b092
 DIST gitdb-4.0.7.gitbundle 1498536 BLAKE2B 1e0aff67259c04d2932dbdefb0ae07bd9fb51c5dcb99ee8431e78bf428095250ed45f5e12e2484b407bb4257050b0864e67096b3501d4829491cb7714a7b5ddf SHA512 f8b1b3de00f0597d65f528dd30495fd3dd9e1e4d494987899ef2064d23947ede799db391a59688dfa27e4fcdc9379b5352a378b39e6fb2421e6c850f81157bec
 DIST smmap-4.0.0.gitbundle 322820 BLAKE2B 20ac688cafa9ad036f3e21ac1bb9323ae55e618eb0806634fe4c885d2b12fe802779adcffb0fea3da9707e94109a168738d63abe990d1ce9b141c779aa6798d6 SHA512 03296099303eb38ac9ca46733255024355aed2e64a2f9409552ae34af76beb9685a6dd2458df986593fe426e428bc184617abe22c8b92ee01c8c7e1d98de8592
diff --git a/dev-python/bsddb3/Manifest b/dev-python/bsddb3/Manifest
index 89e5bbf12b38..a291722f5c6b 100644
--- a/dev-python/bsddb3/Manifest
+++ b/dev-python/bsddb3/Manifest
@@ -1 +1,2 @@
+DIST bsddb3-6.2.9-fix-py3.10.patch.gz 3153 BLAKE2B dfdd00e90c683557bafe7d5f0d5c9a6f944fb8495bf1baef8857f6e771cef58c8e5feac9b3d345ebf6403ba73ceaa7f9077f221ad6bad9916b756e6605b30d3d SHA512 3c6157110c94b842811301f4e48c0f1690d9c75379abe7a04bf76f7136d25decbf79673ca2940c5dbb97802acc8c7a9312a24a79e7dfcc3971f9dc250353d732
 DIST bsddb3-6.2.9.tar.gz 230475 BLAKE2B 68c7c498d581dd5ca860060a3152f7ae135bbc75d00714764446d071e8ea88d303a73d1aa411db1ff8fc922aa6d486632fe38bef3596550150ed511a97fc9c9c SHA512 9e878ef865cba608fafe4274b660234927b9106323c3e4ddd728682b0f11b3c7edb9a3dd56cdfe8665eba890df4121695c9710b95bb2f43b8a0be3ec4050f61e
diff --git a/dev-python/bsddb3/bsddb3-6.2.9.ebuild b/dev-python/bsddb3/bsddb3-6.2.9.ebuild
index a59ba62327e1..49c2d2a7d196 100644
--- a/dev-python/bsddb3/bsddb3-6.2.9.ebuild
+++ b/dev-python/bsddb3/bsddb3-6.2.9.ebuild
@@ -10,7 +10,8 @@ inherit db-use distutils-r1
 
 DESCRIPTION="Python bindings for Berkeley DB"
 HOMEPAGE="https://www.jcea.es/programacion/pybsddb.htm https://pypi.org/project/bsddb3/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
+	https://dev.gentoo.org/~arthurzam/patches/dev-python/${P}-fix-py3.10.patch.gz"
 
 LICENSE="BSD"
 SLOT="0"
@@ -29,7 +30,7 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 
 PATCHES=(
-	"${FILESDIR}/${P}-fix-py3.10.patch"
+	"${WORKDIR}/${P}-fix-py3.10.patch"
 )
 
 python_prepare_all() {
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
deleted file mode 100644
index 9e3ab6ba3a91..000000000000
--- a/dev-python/bsddb3/files/bsddb3-6.2.9-fix-py3.10.patch
+++ /dev/null
@@ -1,546 +0,0 @@
-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/charset_normalizer/Manifest b/dev-python/charset_normalizer/Manifest
index a60d8e20772c..aaf01e794f86 100644
--- a/dev-python/charset_normalizer/Manifest
+++ b/dev-python/charset_normalizer/Manifest
@@ -1,3 +1,4 @@
 DIST charset_normalizer-2.0.3.gh.tar.gz 363159 BLAKE2B f09cd3c9da04123fc7104cfac6829ea23a82173c04469c4d98acf9311f1006f4ecb152992a397a97838f9312ad0fc8bfeea03960650873a9aaa753315245dcc3 SHA512 4fa5507c4c0c61b3722d7423f4b597514a30ad0fea176a77a1e926328003ba6c0f49c95b4f4a64b8dbb32985373706d895bae1c6e3fe1fe224851b8383576923
 DIST charset_normalizer-2.0.4.gh.tar.gz 363800 BLAKE2B 81a0474238fc2fad6792201629286c261af73ed5dc3c7c4da525b356507f53bfb3e53d1ed325647295986a16fdd2a1e4bec00ee0648cb6e44f201196ef778556 SHA512 64fdddf2b6574828cc37dcb310e5e023d994e9cd4f8a7f6fb5796e997542cb1b14d9444994ab2594267361712a125fa476205462f9c7fea95505eef3c9770d5e
 DIST charset_normalizer-2.0.5.gh.tar.gz 368109 BLAKE2B 42e4cdeaf9a4e57c87e9813a6d1f31492aee29e37eb8c42721748b658064b16f0926dc6ffd794bf165718c4caf9484e139ca4024b89651d7ccdcbc6d907cf7f0 SHA512 5be0a72e51b9454e8a1ab670815526d54e03e42a0fd6de6ff5705000b3cb9af1ab2ad7f3457a898274d39c091603cdc8e2a925dd3c8e39a63910a5e480155b0d
+DIST charset_normalizer-2.0.6.gh.tar.gz 368270 BLAKE2B c80304b0e0f949d933fe210184d3892b7cbf52aeaf266834c4c358ee40abe14f660e2ad465aeecb76aebc8d3a12fe897b9cd7bd8ffa9e92fe0cbad07fe1526b2 SHA512 04ea17fb1d61b88b4036f33a4b03df824e246e57590a5b64ded8e44298bb1d07ebf276ed6a2dc189580d7563e267ccadb3280728f1e5ac5f29cedd5b84bd6dc7
diff --git a/dev-python/charset_normalizer/charset_normalizer-2.0.6.ebuild b/dev-python/charset_normalizer/charset_normalizer-2.0.6.ebuild
new file mode 100644
index 000000000000..58556810e6b3
--- /dev/null
+++ b/dev-python/charset_normalizer/charset_normalizer-2.0.6.ebuild
@@ -0,0 +1,27 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# please keep this ebuild at EAPI 7 -- sys-apps/portage dep
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="The Real First Universal Charset Detector"
+HOMEPAGE="
+	https://pypi.org/project/charset-normalizer/
+	https://github.com/ousret/charset_normalizer/"
+SRC_URI="
+	https://github.com/Ousret/charset_normalizer/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e '/addopts/d' setup.cfg || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/jaraco-itertools/Manifest b/dev-python/jaraco-itertools/Manifest
index 974ffb74d597..cc052019c455 100644
--- a/dev-python/jaraco-itertools/Manifest
+++ b/dev-python/jaraco-itertools/Manifest
@@ -1 +1,2 @@
 DIST jaraco.itertools-6.0.1.tar.gz 20096 BLAKE2B 19240d015cc2cb628193c1da6f8ac8eca2c79c9b7ddf1eac909a27bcd80c6b06ea8f7f2fcc435071ff7e9c602d9d8131c258deb910eea0d5ae0f8de69f4901b1 SHA512 60a4bf4335bd159b1b2ed532f4b72c47984a8e2afc03bafb7ccb53095da787cecbcb6207bb2c521266285bd5bf0550f1a78dd5323266bde6e00937481599a506
+DIST jaraco.itertools-6.0.3.tar.gz 16383 BLAKE2B aaa70b40baae4fdba617ecded0376c557a7f227cb52d79e982c06ec125c70056a6773b0c974eca16f12eb1d358bbc190d4f43819374e353836ea2a0dac373367 SHA512 5ceb11c6a5f1c88fa6191f1153b5450614d9fc87ae08acbe4a417d8bf6089f5dae747b1cee95a29763ffc595c291ab02198cf94b48eca34ce766735c6dc44e30
diff --git a/dev-python/jaraco-itertools/jaraco-itertools-6.0.3.ebuild b/dev-python/jaraco-itertools/jaraco-itertools-6.0.3.ebuild
new file mode 100644
index 000000000000..1ebb98f68fc3
--- /dev/null
+++ b/dev-python/jaraco-itertools/jaraco-itertools-6.0.3.ebuild
@@ -0,0 +1,38 @@
+# 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
+
+MY_P=${P/-/.}
+DESCRIPTION="Tools for working with iterables. Complements itertools and more_itertools"
+HOMEPAGE="https://github.com/jaraco/jaraco.itertools"
+SRC_URI="mirror://pypi/${MY_P::1}/${PN/-/.}/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+RDEPEND="
+	dev-python/inflect[${PYTHON_USEDEP}]
+	>=dev-python/more-itertools-4.0.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
+	dev-python/toml[${PYTHON_USEDEP}]
+"
+
+distutils_enable_sphinx docs '>=dev-python/jaraco-packaging-3.2' \
+	'>=dev-python/rst-linker-1.9'
+distutils_enable_tests pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+
+python_test() {
+	# needed for doctests to work
+	> jaraco/__init__.py || die
+	epytest --doctest-modules
+}
diff --git a/dev-python/pyproj/Manifest b/dev-python/pyproj/Manifest
index 37dc0209afb0..7dbbc6ffc5be 100644
--- a/dev-python/pyproj/Manifest
+++ b/dev-python/pyproj/Manifest
@@ -1,3 +1,4 @@
 DIST pyproj-3.0.1.tar.gz 168962 BLAKE2B 3271d604148c122f4dfdd68c4237e1911f30da7cc858128d644b6b6807c3e49450e0b42c385d37bbe1cfa5ab80d635e7f620d41bf5089af6b49a542eb9b3fcd0 SHA512 f5ae0ede1deaa93757cb98cc680d6e47a19b9f5c0ce5e357c2ecfe96f764ff59ec7285c606162da38573123d21f12f1df82354f1d2205149970af2d7d63c2689
 DIST pyproj-3.1.0.tar.gz 182603 BLAKE2B d4e95f62b10b282e7bbfcb7a2059a11a489e53402cbb1760b7da73248dfc05de6be8ca820e55d34c9270eea38178f1fb934bd5ffc389833b3734b87b79991187 SHA512 21a5d08207676d8d9722cb5e3b13ed68f03b1a2aa034c20c61bb8dab5d204dd968ba9a3df1b0c43ed174e082725c7624efb75a0c9c3df920808cbcb44f4d170a
 DIST pyproj-3.2.0.tar.gz 212708 BLAKE2B f880b8aade716e6137bcd4cc4c2d96946e2c7c735077f8707e37b3f174b2613f0281a48140a0154a21615423cd2e1ed70cea79916a04f4b9d84e958b6fe31795 SHA512 67eedd839d625f57accbabadee719030184a79f74185765da2b5610d73b8341435edc56d70d42d5a5d0ece0e22421742a327fe746761ec4f782a72d977306a74
+DIST pyproj-3.2.1.tar.gz 213342 BLAKE2B 141f64f33f399e1089009f8047b2541516dc84f2b2133f5e0de5cbaf5d5bef30197f556f630076725a4d78c4244011bf1a7c9a54114d6e166cbb9c10c468da05 SHA512 4ba5bd2d2356c06b711e53581665bdcad3faeb420258c7d4bbb5639784948842a3a6ee0f1f0f50363878c183c38a27063071f25594576eccca146ceb33107761
diff --git a/dev-python/pyproj/pyproj-3.2.1.ebuild b/dev-python/pyproj/pyproj-3.2.1.ebuild
new file mode 100644
index 000000000000..6e380d460897
--- /dev/null
+++ b/dev-python/pyproj/pyproj-3.2.1.ebuild
@@ -0,0 +1,47 @@
+# 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 interface to the PROJ library"
+HOMEPAGE="https://github.com/pyproj4/pyproj"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
+
+RDEPEND=">=sci-libs/proj-7.2.0:="
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pandas[${PYTHON_USEDEP}]
+		dev-python/xarray[${PYTHON_USEDEP}]
+		sci-libs/shapely[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_sphinx docs dev-python/sphinx_rtd_theme
+distutils_enable_tests --install pytest
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# TODO
+		test/test_datum.py
+		test/test_transformer.py::test_transform_wgs84_to_alaska
+		test/test_transformer.py::test_repr__conditional
+		test/test_transformer.py::test_transformer_group__unavailable
+		test/test_transformer.py::test_transformer_group__network_disabled
+		test/test_transformer.py::test_transformer_group__download_grids__directory
+		test/crs/test_crs.py::test_coordinate_operation_grids__alternative_grid_name
+	)
+
+	distutils_install_for_testing
+	cp -r test "${BUILD_DIR}" || die
+	cd "${BUILD_DIR}" || die
+	epytest --import-mode=append -m "not network" test
+}
diff --git a/dev-python/rope/Manifest b/dev-python/rope/Manifest
index cb27bf182134..0398fbd3bcde 100644
--- a/dev-python/rope/Manifest
+++ b/dev-python/rope/Manifest
@@ -1 +1,2 @@
 DIST rope-0.19.0.tar.gz 252902 BLAKE2B 41760dc29d26558bdf5f296238b7d59ca949530826953fe5592b763b8d24fb49a90a56b9c7d0e3475daf145185987116a7dd0cbfba74829abfa4bf6a57c79937 SHA512 fd41777d76861837479bf0777ea42cc052eed7ba396bc4531a0c7f101b05b1c5a57c300950b7a3c8a2902e28ff049d146646f83f8a8a447ab9ccd7cd8aa48110
+DIST rope-0.20.0.tar.gz 257356 BLAKE2B 054ab1fd1b8ede2576c83eada588fb04827cfef570b2cd30461e1b12b3a42d601aa1e60bf1428a54b4d74127a561fce3f34f064b8018943fd1e6fe5c03764a5a SHA512 d84e2da66712da927b6dcf0ea40c50627002baebfd93585dbecda32e6ce0682fdf13577769b12890d31c4f1022795ab98c2dba25aa23a8b434762dbbcab974b8
diff --git a/dev-python/rope/rope-0.20.0.ebuild b/dev-python/rope/rope-0.20.0.ebuild
new file mode 100644
index 000000000000..a85054180d87
--- /dev/null
+++ b/dev-python/rope/rope-0.20.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+inherit distutils-r1
+
+DESCRIPTION="Python refactoring library"
+HOMEPAGE="https://github.com/python-rope/rope"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc"
+
+# Dependency for docbuild documentation which is not noted in
+# setup.py, using standard docutils builds docs successfully.
+BDEPEND="
+	doc? ( dev-python/docutils[${PYTHON_USEDEP}] )
+	test? ( dev-python/pytest-timeout[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
+
+python_compile_all() {
+	if use doc; then
+		pushd docs > /dev/null || die
+		mkdir build || die
+		local i
+		for i in ./*.rst; do
+			rst2html.py $i > ./build/${i/rst/html} || die
+		done
+		popd > /dev/null || die
+	fi
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/build/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/txrequests/metadata.xml b/dev-python/txrequests/metadata.xml
index c6f2cc5ac2dc..455447977a36 100644
--- a/dev-python/txrequests/metadata.xml
+++ b/dev-python/txrequests/metadata.xml
@@ -14,4 +14,5 @@
   <remote-id type="pypi">txrequests</remote-id>
  </upstream>
  <origin>gentoo-staging</origin>
+ <stabilize-allarches/>
 </pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/txrequests/txrequests-0.9.6.ebuild b/dev-python/txrequests/txrequests-0.9.6.ebuild
index d0f59664f834..e9f707fb5bda 100644
--- a/dev-python/txrequests/txrequests-0.9.6.ebuild
+++ b/dev-python/txrequests/txrequests-0.9.6.ebuild
@@ -1,10 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+EAPI=8
 
-DISTUTILS_USE_SETUPTOOLS="bdepend"
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
 
 inherit distutils-r1
 
@@ -15,9 +14,15 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=dev-python/requests-1.2.0[${PYTHON_USEDEP}]
 	dev-python/twisted[${PYTHON_USEDEP}]
 "
-DEPEND="${RDEPEND}"
+BDEPEND="test? ( ${RDEPEND} )"
+
+python_test() {
+	"${EPYTHON}" -m twisted.trial txrequests || 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 ad612a567b9d..3c9266fb02bb 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