Adding metadata

31 files changed, 224 insertions, 618 deletions

diff --git a/dev-python/GridDataFormats/GridDataFormats-0.4.0-r1.ebuild b/dev-python/GridDataFormats/GridDataFormats-0.4.0-r1.ebuild
deleted file mode 100644
index 6154f1ea02c7..000000000000
--- a/dev-python/GridDataFormats/GridDataFormats-0.4.0-r1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Reading and writing of data on regular grids in Python"
-HOMEPAGE="https://pypi.org/project/GridDataFormats/ https://github.com/MDAnalysis/GridDataFormats"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="LGPL-3"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="
-	>=dev-python/numpy-1.0.3[${PYTHON_USEDEP}]
-	dev-python/scipy[${PYTHON_USEDEP}]"
diff --git a/dev-python/GridDataFormats/Manifest b/dev-python/GridDataFormats/Manifest
index f6520d47367d..07d189b3c879 100644
--- a/dev-python/GridDataFormats/Manifest
+++ b/dev-python/GridDataFormats/Manifest
@@ -1,2 +1 @@
-DIST GridDataFormats-0.4.0.tar.gz 63643 BLAKE2B cbc0bc259c30c9eccf61b11a7ed6e8004979fe2adb2b049f137caddbb71190291011664462c2c1aa4fe2baf822102d59d3079e9e48620b76d37a4812ca150328 SHA512 b480293e2dd17cb484336aa1469a8f0e739fbe7d925190f6a6502e96d0ab26a36271b0a0676c711716abd3e025e86fbec961cf965e950f89be167e0a83ef904c
 DIST GridDataFormats-0.5.0.tar.gz 1982315 BLAKE2B b230fd2843ab6a5826ee425fb3fad9a0d5d75a292aa3b6b150e76fa515b68000efb8e1b4140619c0c489f34ac7e3ce6d979e97526c212caf3e808be07b33afcd SHA512 9cae1fe0f4f27bd966c1563831f8a9257ecbe14a7a6f011753355070449515b9b0ad1f31867c2c199c9703aebd5a3b40a03c1276f3bb6ff51447f7a870fdefe8
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index a16ddf895f1b..91535222551c 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -12,3 +12,4 @@ DIST boto3-1.17.3.tar.gz 346250 BLAKE2B 7edf59a88ec32a08056112c088de9aae903daba9
 DIST boto3-1.17.4.tar.gz 346342 BLAKE2B 3fba8f8b68edb268f20919bb65c5f8715d6c89c54884395f8080384c2d07ada15894d605a943e2c167ddf7fd3550657367e4b195caf28fd73609763cf23da687 SHA512 45ecf4fe0eb61d09aea5cc5e741544c6b23d6b98de24ab9f646f28d463104ec11116d0afd4b5fbd09f55e1a7ad65a653770efb67d4b023590c218bef4f326af1
 DIST boto3-1.17.5.tar.gz 346437 BLAKE2B 43cec95e82c2f4b78132966aebb3fb1b8e8e01929731e0a9aace2a281a86fb789ec940a62b13c2c8f82e03d7c2a7c89b3b919aa39be85e6d14e1459782b90ef8 SHA512 bd3dde9acd33371eaee9715c4d5dfa095f6571f728213992455864da15a8f49053991babe4cc57bb808bc7733101b50baeab6ed6a6e58fc04f25a4eee00b774a
 DIST boto3-1.17.6.tar.gz 346445 BLAKE2B 778dd820ab134a0c9bc0e67e692e8e1200f84335895a5ed3150eda53ac90dadef09f44c18c2a80858e2c37617c315ff411efec8f1008b8c21179ff519fc4bf9f SHA512 0cca89bd4bfbda7039262ce570c4235bd2ae33e46972026e5f6f66ae42cee9562d23854c3ea23e0fb9b472fc2a28cdabfbb740ae1f0db306c6342cea3c077e82
+DIST boto3-1.17.7.tar.gz 346682 BLAKE2B 08c06dda1d59b4f555cad075673917b38cbf9ad8d0037f66027b17076e60b4d5fd32a93e088635320ebc3226a9cd8809c9208ec84f8588c26a77766b21dbee98 SHA512 2ba1817575c4a64c232c84a75a9d3b0db1de8634ded9aa31844930a82ccf4611805c6dd31b2e4d36cc9a2cc1813d233b4d7366305eaf28efd46a3b843d3c2993
diff --git a/dev-python/boto3/boto3-1.17.7.ebuild b/dev-python/boto3/boto3-1.17.7.ebuild
new file mode 100644
index 000000000000..2df16964cdb0
--- /dev/null
+++ b/dev-python/boto3/boto3-1.17.7.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+DISTUTILS_USE_SETUPTOOLS=bdepend
+inherit distutils-r1
+
+DESCRIPTION="The AWS SDK for Python"
+HOMEPAGE="https://github.com/boto/boto3"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/boto3"
+	inherit git-r3
+	BOTOCORE_PV=${PV}
+else
+	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+	# botocore is x.(y+3).z
+	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
+fi
+
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+python_prepare_all() {
+	# don't lock versions to narrow ranges
+	sed -e '/botocore/ d' \
+		-e '/jmespath/ d' \
+		-e '/s3transfer/ d' \
+		-i setup.py || die
+
+	# prevent an infinite loop
+	rm tests/functional/docs/test_smoke.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests -v tests/unit/ tests/functional/ || die "test failed under ${EPYTHON}"
+}
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index 70da480a3ec5..0fc2094b7852 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -12,3 +12,4 @@ DIST botocore-1.20.3.tar.gz 7446281 BLAKE2B 536cbe8f6b6c150f3c66468f3e0c51ae0e60
 DIST botocore-1.20.4.tar.gz 7447611 BLAKE2B 05cb501cf40748ac1053c4687bd6de7a17d9ac31fe688de8d6aaf8047260f230ea14cc947c4c208a11d26477508b38428fdca116b9fa8212c5ee6ac020a6367f SHA512 b3ec1597b1cf4e9d18e21216f9ba703e4ae0a924653d21cfd93eeffbb13041ad96c3cd099ff1c8631bdcd5c7d6a70e6d36848fdbc44de9f7cebf7ee223918743
 DIST botocore-1.20.5.tar.gz 7447859 BLAKE2B 56b6ecbec1834c414983679e4f3cd01f295c48c87bc972ccec77fe972b88a1785ef82c403576f6aa96ebe9041a29535566280228f8b5a5e35d2e4fdb14cac472 SHA512 488584be3ea9b8a7467384a3947349704d0bf0e6817936a70fda69bc8d682d88601188446d50eeae29b4f0680e8f20d717519011d6beecd3f35cb322fb526853
 DIST botocore-1.20.6.tar.gz 7450975 BLAKE2B 56ad69b958233a94f6bacff28bffb644bde8cc87dcb8d842f542059548d2aaf5762666077f9b429bc0487808282b806725a05dcd3def6c975f4418f209fc2ec8 SHA512 558c3c3b123aeeeb5aff420e7ff3edbba9165e1cf434f8136ead21e9d94dd85d857732902b10e09386ddc80754d7be37970573ce039296e532b593a101a97950
+DIST botocore-1.20.7.tar.gz 7458254 BLAKE2B 8b9a1edda73e2564d3a3d67c6b3542d1ec9372403cb4d88396e58dfbcb5987821f278f2757e079e1ab32e03243ed3a6d1023ecc591b965512b3af5e2d43ea7b0 SHA512 9b023a31be866a50b94017a28aca40b5fe2e720959c928a3fd93db96041f3886049717f50461222a09572c0c56c5961a4614b80e400e4fa6d8b3ff4b4ab681df
diff --git a/dev-python/botocore/botocore-1.20.7.ebuild b/dev-python/botocore/botocore-1.20.7.ebuild
new file mode 100644
index 000000000000..9d681f87244c
--- /dev/null
+++ b/dev-python/botocore/botocore-1.20.7.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Low-level, data-driven core of boto 3"
+HOMEPAGE="https://github.com/boto/botocore"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/botocore"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/jmespath[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
+)
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || die
+	# very unstable
+	sed -i -e 's:test_stress_test_token_bucket:_&:' \
+		tests/functional/retries/test_bucket.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# note: suites need to be run separately as one of the unit tests
+	# seems to be leaking mocks and breaking a few functional tests
+	nosetests -v tests/unit ||
+		die "unit tests failed under ${EPYTHON}"
+	nosetests -v tests/functional ||
+		die "functional tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/cftime/Manifest b/dev-python/cftime/Manifest
index f8c0e0b9fe5a..f91546f042dd 100644
--- a/dev-python/cftime/Manifest
+++ b/dev-python/cftime/Manifest
@@ -1,3 +1 @@
-DIST cftime-1.3.0.tar.gz 55668 BLAKE2B c233a3d45305476f422ca93f89348b7b3c018b10c0fa42d6649001b7bcdb4d26d230322108def41818449ec78dc531261b52d09252306fb5889ac4011af33828 SHA512 07f79e902142e8a314c9d09af08ea752454e490c3027ee44853f78c725305bf11cad90bd331edd204defded11e7f29173df9bef70ab805a28b745cc0afdd4685
-DIST cftime-1.4.0.tar.gz 46098 BLAKE2B b1ca1eaec2b0b5015d6d8d512ae831bfb36c59061c094f5eaf5931f85ecabdb1b562d1ab56cb1b0b0fcea36fce15d073411fd9afd955ec864a4ca9a71f0a6a82 SHA512 72862d35cbe32eefb1149b345e63fabf1a58bdb145138ea82fb21aa8b4862abae53a2c7719b8cf56670acdcfa9c7bb090cb35f8c2ea711e23bfb031f72ccdc2f
 DIST cftime-1.4.1.tar.gz 46721 BLAKE2B 903f8c042b6f4738893ee54c9d1b862f6f29b42c67b45800d21e1215979c95d985d56eb234dd52493da331c30b2b55c5c1590b51822bb87eaada7dd2879c57b1 SHA512 2d07b8f423e9945b1ced2e89f03965df5c3b25f932b0e7ce893a6cbd4568c93f0abb1d8e6efebe2cafca2ee19259f3c0878fec4fb91f68bf5dde1ccb67bcdef9
diff --git a/dev-python/cftime/cftime-1.3.0.ebuild b/dev-python/cftime/cftime-1.3.0.ebuild
deleted file mode 100644
index 62d7c828fe0e..000000000000
--- a/dev-python/cftime/cftime-1.3.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=bdepend
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-inherit distutils-r1
-
-DESCRIPTION="Time-handling functionality from netcdf4-python"
-HOMEPAGE="https://pypi.org/project/cftime"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="dev-python/numpy[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
-BDEPEND="dev-python/cython[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# remove pytest-cov dep
-	sed -i -e "/--cov/d" setup.cfg || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/cftime/cftime-1.4.0.ebuild b/dev-python/cftime/cftime-1.4.0.ebuild
deleted file mode 100644
index 5240371abd71..000000000000
--- a/dev-python/cftime/cftime-1.4.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-inherit distutils-r1
-
-DESCRIPTION="Time-handling functionality from netcdf4-python"
-HOMEPAGE="https://pypi.org/project/cftime"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="dev-python/numpy[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
-BDEPEND="dev-python/cython[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# remove pytest-cov dep
-	sed -i -e "/--cov/d" setup.cfg || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/construct/Manifest b/dev-python/construct/Manifest
index 9c30ad8519e0..6865c7ba1926 100644
--- a/dev-python/construct/Manifest
+++ b/dev-python/construct/Manifest
@@ -2,3 +2,4 @@ DIST construct-2.10.56.tar.gz 1184110 BLAKE2B 01ce1800970826ae3584a9733de171e04d
 DIST construct-2.10.57.tar.gz 1184585 BLAKE2B abaeebf5872cc97cc67d47cf79370fecdb1abafb62fa80b6acfa63de9087f70fa67fd69e90ab4e78e7ac179c1bb1011529e34201c3c2270e1a2651c97cc678b2 SHA512 ef2f0bbcf4cbcf4862033b16ccb428f84d63ca5c867157b47e38b441cb439c953b543cf69f352c0542525fd07b37d1b3b68910ae5331c482e75b4af937e116a1
 DIST construct-2.10.58.tar.gz 1184881 BLAKE2B d1dfa005542505b0a154f3c0ae74a1708747b1e7b9f5dc650b924169fa54620719bdf5bb868e616ae58e8890f547eaf3bad5b02ef1f7f7ffeeadffaa87413041 SHA512 8547847e3fa15c020ab7d178b229c5b93744b48497c4cf809a93527be5776eacd52783a0fa38583d694c262c119835c989fcbe0936eb247ca844d252c4bdebb5
 DIST construct-2.10.59.tar.gz 1185999 BLAKE2B 35c861d5d4f5d68a158f25cffccda76621e0fe901e5f8bdf9c0aea61e3ddd2174c71767601be3533092a6a28748597cd1a044e4721436748b9a2dac81b81b41b SHA512 bf5867efdb9e1a27ddede6844f5f3466714e38dd97aae09c6990582989801605eebf90099fb3a0ab78deaed4f3b6be38421b635f6332461efd033d5fb8c2c1af
+DIST construct-2.10.60.tar.gz 1185983 BLAKE2B e263c15db9d8055db854508f767906e51fb260c47e2df17e2786277a3ed66e9a8599f21299b21d0629997c6ce2afd7651e18aee4c7f22d3e38bdc5db5bd53bd4 SHA512 597e4fd9f0264450fe221e100041a897d25794bea4dd5cbf5f58df8a0829a34490daff10764e6329ade165df631ddce661dceae4417d8f55472b2fad2a53e53d
diff --git a/dev-python/construct/construct-2.10.60.ebuild b/dev-python/construct/construct-2.10.60.ebuild
new file mode 100644
index 000000000000..6412b720ac1f
--- /dev/null
+++ b/dev-python/construct/construct-2.10.60.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+
+inherit distutils-r1
+
+DESCRIPTION="A powerful declarative parser for binary data"
+HOMEPAGE="https://construct.readthedocs.io/en/latest/ https://pypi.org/project/construct/"
+SRC_URI="https://github.com/construct/construct/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="
+	test? (
+		dev-python/arrow[${PYTHON_USEDEP}]
+		dev-python/cloudpickle[${PYTHON_USEDEP}]
+		dev-python/lz4[${PYTHON_USEDEP}]
+		>=dev-python/numpy-1.15.4[${PYTHON_USEDEP}]
+		dev-python/ruamel-yaml[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	distutils-r1_src_prepare
+	rm tests/test_benchmarks.py || die
+}
+
+pkg_postinst() {
+	ewarn "Version 2.10.x has significant API and implementation changes from"
+	ewarn "previous 2.9.x releases. Please read the documentation at"
+	ewarn "https://construct.readthedocs.io/en/latest/transition210.html"
+	ewarn "for more info."
+}
diff --git a/dev-python/manuel/files/manuel-1.8.0-rm_zope_test.patch b/dev-python/manuel/files/manuel-1.8.0-rm_zope_test.patch
deleted file mode 100644
index d1b61cc678ab..000000000000
--- a/dev-python/manuel/files/manuel-1.8.0-rm_zope_test.patch
+++ /dev/null
@@ -1,120 +0,0 @@
- setup.py             |  6 ------
- src/manuel/index.txt | 26 ++++++++------------------
- src/manuel/tests.py  | 13 +++++++++----
- 3 files changed, 17 insertions(+), 28 deletions(-)
-
-diff --git a/setup.py b/setup.py
-index 4561779..b6730c8 100644
---- a/setup.py
-+++ b/setup.py
-@@ -20,8 +20,6 @@ with open('README.rst') as readme:
-     with open('CHANGES.rst') as changes:
-         long_description = readme.read() + '\n\n' + changes.read()
- 
--tests_require = ['zope.testing']
--
- setup(
-     name='manuel',
-     version='1.8.0',
-@@ -44,10 +42,6 @@ setup(
-         'License :: OSI Approved :: Apache Software License',
-         ],
-     license='Apache Software License, Version 2.0',
--    extras_require={
--        'tests': tests_require,
--        },
--    tests_require=tests_require,
-     test_suite='manuel.tests.test_suite',
-     install_requires=[
-         'setuptools',
-diff --git a/src/manuel/index.txt b/src/manuel/index.txt
-index c1d85f3..a315317 100644
---- a/src/manuel/index.txt
-+++ b/src/manuel/index.txt
-@@ -166,16 +166,16 @@ can pass in your own class to `TestSuite`.
- 
- .. code-block:: python
- 
--     import os.path
--     import manuel.testing
-+    import os.path
-+    import manuel.testing
- 
--     class StripDirsTestCase(manuel.testing.TestCase):
--         def shortDescription(self):
--             return os.path.basename(str(self))
--     suite = manuel.testing.TestSuite(
--         m, path_to_test, TestCase=StripDirsTestCase)
-+    class StripDirsTestCase(manuel.testing.TestCase):
-+        def shortDescription(self):
-+            return os.path.basename(str(self))
-+    suite = manuel.testing.TestSuite(
-+        m, path_to_test, TestCase=StripDirsTestCase)
- 
--    >>> list(suite)[0].shortDescription()
-+    list(suite)[0].shortDescription()
-     'bugs.txt'
- 
- 
-@@ -236,16 +236,6 @@ checkers <http://docs.python.org/library/doctest.html#outputchecker-objects>`_
-    smoothes over the differences between CPython's and PyPy's NameError
-    messages:
- 
--.. code-block:: python
--
--    import re
--    import zope.testing.renormalizing
--    checker = zope.testing.renormalizing.RENormalizing([
--        (re.compile(r"NameError: global name '([a-zA-Z0-9_]+)' is not defined"),
--         r"NameError: name '\1' is not defined"),
--    ])
--
--
- .. reset-globs
- .. _capture:
- 
-diff --git a/src/manuel/tests.py b/src/manuel/tests.py
-index 07723a6..b1a3a76 100644
---- a/src/manuel/tests.py
-+++ b/src/manuel/tests.py
-@@ -11,11 +11,12 @@ import manuel.testing
- import os.path
- import re
- import unittest
--import zope.testing.renormalizing
- 
- here = os.path.dirname(os.path.abspath(__file__))
- 
--checker = zope.testing.renormalizing.RENormalizing([
-+try:
-+	import zope.testing.renormalizing
-+	checker = zope.testing.renormalizing.RENormalizing([
-     (re.compile(r"<unittest\.result\.TestResult"), '<unittest.TestResult'),
-     # PyPy spells some error messages differently
-     (re.compile(r"NameError: global name '([a-zA-Z0-9_]+)' is not defined"),
-@@ -25,7 +26,9 @@ checker = zope.testing.renormalizing.RENormalizing([
-      r"<\1 object"),
-     (re.compile(r"<SRE_Match object"),
-      r"<_sre.SRE_Match object"),
--])
-+	])
-+except ImportError:
-+	pass
- 
- 
- def turtle_on_the_bottom_test():
-@@ -59,7 +62,6 @@ def test_suite():
-     optionflags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS
- 
-     m = manuel.ignore.Manuel()
--    m += manuel.doctest.Manuel(optionflags=optionflags, checker=checker)
-     m += manuel.codeblock.Manuel()
-     m += manuel.capture.Manuel()
-     m += manuel.testcase.SectionManuel()
-@@ -73,3 +75,6 @@ def test_suite():
-         suite,
-         doctest.DocTestSuite(),
-         ))
-+
-+if __name__ == '__main__':
-+    unittest.TextTestRunner().run(test_suite())
diff --git a/dev-python/pgspecial/Manifest b/dev-python/pgspecial/Manifest
index 456cc942229c..d3991fe7daa1 100644
--- a/dev-python/pgspecial/Manifest
+++ b/dev-python/pgspecial/Manifest
@@ -1 +1,2 @@
 DIST pgspecial-1.11.10.tar.gz 45560 BLAKE2B f4554eb812fadad984f746e8035a7a91f22480321df920bd15b96239c571c13cdf397ea38ea122f0a73167924a902955a1eb50dc865ba1e4445324358c3e3cef SHA512 452f217055873d3d1acff6b9b5016a3e721bffd4349aaa975aefe3ae1e25ca576f90eab13e7f913ebbfb796ac7b81dd8ed63c8e6d055c2ad7f8fd9d72ca8c21a
+DIST pgspecial-1.12.1.tar.gz 47945 BLAKE2B e189695a3689f76f6fd3afc3b5f7c412dfc0a79fcd2465f8bca29b81de1609e045f0237fcc6b63a75c7df1d9a31d4c04cd8fa227493d6cce4cd6863a4c36cd2a SHA512 d1ef6462ab3d1cf5fe35f0dabc61698d7c2cf7e35b292c3cb540cce4bd613485d7dca53fd549a134209461c31c8144d72d1af1ee8aad5569766d9387b7e10e0b
diff --git a/dev-python/pgspecial/pgspecial-1.12.1.ebuild b/dev-python/pgspecial/pgspecial-1.12.1.ebuild
new file mode 100644
index 000000000000..29c99c77086e
--- /dev/null
+++ b/dev-python/pgspecial/pgspecial-1.12.1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+inherit distutils-r1
+
+DESCRIPTION="Python implementation of PostgreSQL meta commands"
+HOMEPAGE="https://github.com/dbcli/pgspecial"
+SRC_URI="https://github.com/dbcli/pgspecial/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/click-4.1[${PYTHON_USEDEP}]
+	>=dev-python/configobj-5.0.6[${PYTHON_USEDEP}]
+	>=dev-python/psycopg-2.7.4[${PYTHON_USEDEP}]
+	>=dev-python/sqlparse-0.1.19[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+DOCS=( License.txt README.rst changelog.rst  )
diff --git a/dev-python/plotly/Manifest b/dev-python/plotly/Manifest
index 48da13deccbe..ba21cf695ea4 100644
--- a/dev-python/plotly/Manifest
+++ b/dev-python/plotly/Manifest
@@ -1,4 +1,2 @@
-DIST plotly-1.9.6.tar.gz 546722 BLAKE2B 5905af517ef40bc077492f01b49c367c0aa03a96accb86ec072e188a43e463c187a0b9dee3d0df33669aa6d600ed9127b067c7099947e5235331d14ce10bf33c SHA512 7564036ed3745fc06ee7428942e45ca6bfaefa1e47b08a5868a918924268ee632515f1de4bf3e90911234f18a4d85b092ecb6ef9f213b939093dcb433a12dec4
-DIST plotly-4.10.0.tar.gz 6263967 BLAKE2B a78ddf286993621a555cc7f34a5ad0f44e93dcceb9bdac2a20f0cd80257e90485f20b4c89a350a3718b104401d7677a762231c6a774e5c2757a2de1454822875 SHA512 bc32dac7e5621b254c3868e85ed18133ad8341bed5784f707a89242c5e1ef9959afc603a91ccb068aca24032d3ff5b44678811c405d579284334f051f59f93aa
 DIST plotly-4.14.1.tar.gz 6373585 BLAKE2B 8e8d15a7f68bbef835fcbc0048c2457916aad1b10e06c903222030b2b2e1b902e2d42080f8ac2c19928dabd7e1623210930b9f33dededa71dbbb28b2f41f848c SHA512 e052680d0e7344b9f53f1b917dd0b9bc87b0c34300d93b8958ccb35b38f9dc5e7fb4db016d1113df4bae78c419f3d378112c59c3470723ce1349eaadbc5011f8
 DIST plotly-4.14.3.tar.gz 6374650 BLAKE2B 91d950b6365876b03b2b0393c642275c37fc352fda90ce010310f5dae046c3cdd835de438036c5d92fd35d3afcd2c7b8548a87b1354d4a33cd2cfe10838ae94d SHA512 7d8db7a0f6c1abeda1b222f9bd25e4395dd8d14d246ad986960868a8083e4f1d1f600d84f44416eb1d089640d190192e931b5a5f6ae24e01cf8146c4cf8e80eb
diff --git a/dev-python/plotly/plotly-1.9.6.ebuild b/dev-python/plotly/plotly-1.9.6.ebuild
deleted file mode 100644
index 04582232235e..000000000000
--- a/dev-python/plotly/plotly-1.9.6.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="Browser-based graphing library for Python"
-HOMEPAGE="https://plot.ly/python/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]"
-
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/plotly/plotly-4.10.0.ebuild b/dev-python/plotly/plotly-4.10.0.ebuild
deleted file mode 100644
index 6cc1980956ed..000000000000
--- a/dev-python/plotly/plotly-4.10.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Browser-based graphing library for Python"
-HOMEPAGE="https://plot.ly/python/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/retrying[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	mkdir -p "${ED}"/etc/ || die
-	mv "${ED}"/usr/etc/jupyter "${ED}"/etc/ || die
-	rmdir "${ED}"/usr/etc || die
-}
diff --git a/dev-python/psycopg/files/psycopg-2.8.3-avoid-mxdatetime.patch b/dev-python/psycopg/files/psycopg-2.8.3-avoid-mxdatetime.patch
deleted file mode 100644
index 3475bf31795e..000000000000
--- a/dev-python/psycopg/files/psycopg-2.8.3-avoid-mxdatetime.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/setup.py b/setup.py
-index c1f319a..c44fc69 100644
---- a/setup.py
-+++ b/setup.py
-@@ -525,19 +525,6 @@ parser.read('setup.cfg')
- 
- # check for mx package
- have_mxdatetime = False
--mxincludedir = ''
--if parser.has_option('build_ext', 'mx_include_dir'):
--    mxincludedir = parser.get('build_ext', 'mx_include_dir')
--if not mxincludedir:
--    mxincludedir = os.path.join(get_python_inc(plat_specific=1), "mx")
--if mxincludedir.strip() and os.path.exists(mxincludedir):
--    # Build the support for mx: we will check at runtime if it can be imported
--    include_dirs.append(mxincludedir)
--    define_macros.append(('HAVE_MXDATETIME', '1'))
--    sources.append('adapter_mxdatetime.c')
--    depends.extend(['adapter_mxdatetime.h', 'typecast_mxdatetime.c'])
--    have_mxdatetime = True
--    version_flags.append('mx')
- 
- # generate a nice version string to avoid confusion when users report bugs
- version_flags.append('pq3')     # no more a choice
diff --git a/dev-python/theano-pymc/Manifest b/dev-python/theano-pymc/Manifest
index 91e9037fb28a..9e50fafdac67 100644
--- a/dev-python/theano-pymc/Manifest
+++ b/dev-python/theano-pymc/Manifest
@@ -1,6 +1,3 @@
-DIST Theano-PyMC-rel-1.0.15.tar.gz 12978600 BLAKE2B 9038baa6d7c275a20a2e4f4f9e382f651deee958b2f044ad4360ea7d5a0408ab237af03857d5a598464c770ab1935d051d0f84657efd2915f5c80b393b972e04 SHA512 ad544b2749320ac2c3cd27e84e7700ce469e7d840491675378aabc3a75b03b26065c1022760fd1dae06f6cd694b4ec6de95e78280c478884ffdb224e4f0760ad
 DIST Theano-PyMC-rel-1.1.0.tar.gz 12482951 BLAKE2B 3c3cf6bcd396ce01d68575d8272a9b110077ef8c2b4a6c8f0e795dafcf75f862e145d4e9d83289950e8d463098fe0ebbcee8f4d5f0867d9e6c673c77d6fe8b90 SHA512 667c0b3662ee41254d1776060d64d46b58980ac4ae4e7b271d29d7e09321089946e4aa864626b6e8ea1bd2eae330688b675d507e18dce2d92a4a8df5a0116bb6
-DIST Theano-PyMC-rel-1.1.1.tar.gz 12481810 BLAKE2B d0c40c9bcb25c65b38ed21092a1824c137f9942c8c2d1ab38b6ce9885a4e7be2bd096ed28fb7dc9397eae1477a47d9284b3e5536b563e033fd86af49d6479644 SHA512 d0462bdf6d7174b9c31a6e63b19ac7556f35787b962a7ec7a74cd53c12b8eb990730a5e155e55dc59f0bca20da26d4270ea50e8e32fe23118bb1c78912f69688
 DIST Theano-PyMC-rel-1.1.2.tar.gz 12482962 BLAKE2B 427afab5b831f625b0825746d24d68d7c7a2ea853f83d0b543f9c16baf7f120bb26446a438fa69279cd55e7788b3f1aaa6c6ac787231415f49a53e34e6b92584 SHA512 f582e23803d392fc469ed4aa13ee8615b7ce367de0a95d57fb71217f578112bd1611df1fa580f19970e1e3681fc5dc7d80d9bb9c2c40e5956d1eb937a9271431
 DIST theano-pymc-1.0.13.tar.gz 12975871 BLAKE2B 71528868885084d7c37f1f5cc5156aca5e764d09f0dc57aa46e21240ee2959aafb5882aef8977d9f215b051265d0d9bc3a7097ac0bb6d427cfc076ea6f591905 SHA512 da25e386965695a5630c54a671a7a573d0f0fae2eeeacf4f65130e4e4caf416373852ac14b1eb07ae39c194febe854d71fffe2adc24c348f64a4b73b43564229
-DIST theano-pymc-1.0.14.tar.gz 12979426 BLAKE2B e6db87a348d6e7003f8b1ff4e0634335d53d734ea922951edeaab06ec54d51f1d7930a03f6dca14979930abb6212f873d606a9adada46d5b606854c5d8a6c6a5 SHA512 4ddfe5978f33cea96b20763cb01eecf1ec6c0c6b97ac892d647e28b607e61b11862739e5836356ab87e2002e992febe35ce9e1e72d37732074be2dbed64b50b9
diff --git a/dev-python/theano-pymc/theano-pymc-1.0.14.ebuild b/dev-python/theano-pymc/theano-pymc-1.0.14.ebuild
deleted file mode 100644
index 627cad9f55ed..000000000000
--- a/dev-python/theano-pymc/theano-pymc-1.0.14.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-inherit distutils-r1 optfeature
-
-DESCRIPTION="Library for operating on mathematical expressions with multi-dimensional arrays"
-HOMEPAGE="https://github.com/pymc-devs/Theano-PyMC"
-SRC_URI="https://github.com/pymc-devs/Theano-PyMC/archive/rel-${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}"/Theano-PyMC-rel-${PV}
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/scipy[${PYTHON_USEDEP}]"
-
-distutils_enable_sphinx doc 'dev-python/sphinx_rtd_theme'
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	sed -i -e "s/, 'flake8'//" setup.py || die
-	sed -i -e "s/tests.\*/tests\*/" setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	distutils_install_for_testing
-	pytest -vv || die "Tests failed with ${EPYTHON}"
-}
-
-pkg_postinst() {
-	optfeature "GPU code generation/execution on NVIDIA gpus" dev-util/nvidia-cuda-toolkit dev-util/nvidia-cuda-sdk
-	optfeature "GPU/CPU code generation on CUDA and OpenCL devices" dev-libs/libgpuarray dev-python/pycuda
-}
diff --git a/dev-python/theano-pymc/theano-pymc-1.0.15.ebuild b/dev-python/theano-pymc/theano-pymc-1.0.15.ebuild
deleted file mode 100644
index b5addc2bb1d5..000000000000
--- a/dev-python/theano-pymc/theano-pymc-1.0.15.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-inherit distutils-r1 optfeature
-
-MY_P=Theano-PyMC-rel-${PV}
-DESCRIPTION="Library for operating on mathematical expressions with multi-dimensional arrays"
-HOMEPAGE="https://github.com/pymc-devs/Theano-PyMC"
-SRC_URI="
-	https://github.com/pymc-devs/Theano-PyMC/archive/rel-${PV}.tar.gz
-		-> ${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/filelock[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/scipy[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_sphinx doc 'dev-python/sphinx_rtd_theme'
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	sed -i -e "s/tests.\*/tests\*/" setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	local exclude=(
-		# speed tests are unreliable
-		tests/scan/test_basic.py::test_speed
-		tests/scan/test_basic.py::test_speed_rnn
-		tests/scan/test_basic.py::test_speed_batchrnn
-		tests/link/test_vm.py::test_speed
-		tests/link/test_vm.py::test_speed_lazy
-	)
-
-	distutils_install_for_testing --via-root
-	pytest -vv ${exclude[@]/#/--deselect } \
-		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" ||
-		die "Tests fail with ${EPYTHON}"
-}
-
-pkg_postinst() {
-	optfeature "GPU code generation/execution on NVIDIA gpus" dev-util/nvidia-cuda-toolkit dev-util/nvidia-cuda-sdk
-	optfeature "GPU/CPU code generation on CUDA and OpenCL devices" dev-libs/libgpuarray dev-python/pycuda
-}
diff --git a/dev-python/theano-pymc/theano-pymc-1.1.1.ebuild b/dev-python/theano-pymc/theano-pymc-1.1.1.ebuild
deleted file mode 100644
index 820118d4f297..000000000000
--- a/dev-python/theano-pymc/theano-pymc-1.1.1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-inherit distutils-r1 optfeature
-
-MY_P=Theano-PyMC-rel-${PV}
-DESCRIPTION="Library for operating on mathematical expressions with multi-dimensional arrays"
-HOMEPAGE="https://github.com/pymc-devs/Theano-PyMC"
-SRC_URI="
-	https://github.com/pymc-devs/Theano-PyMC/archive/rel-${PV}.tar.gz
-		-> ${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/filelock[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/scipy[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_sphinx doc 'dev-python/sphinx_rtd_theme'
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	sed -i -e "s/tests.\*/tests\*/" setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	local exclude=(
-		# speed tests are unreliable
-		tests/scan/test_basic.py::test_speed
-		tests/scan/test_basic.py::test_speed_rnn
-		tests/scan/test_basic.py::test_speed_batchrnn
-		tests/link/test_vm.py::test_speed
-		tests/link/test_vm.py::test_speed_lazy
-		tests/tensor/test_gc.py::test_merge_opt_runtime
-	)
-
-	distutils_install_for_testing --via-root
-	pytest -vv ${exclude[@]/#/--deselect } \
-		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" ||
-		die "Tests fail with ${EPYTHON}"
-}
-
-pkg_postinst() {
-	optfeature "GPU code generation/execution on NVIDIA gpus" dev-util/nvidia-cuda-toolkit dev-util/nvidia-cuda-sdk
-	optfeature "GPU/CPU code generation on CUDA and OpenCL devices" dev-libs/libgpuarray dev-python/pycuda
-}
diff --git a/dev-python/transitions/Manifest b/dev-python/transitions/Manifest
index 0d6050d32012..d69e03bd6d39 100644
--- a/dev-python/transitions/Manifest
+++ b/dev-python/transitions/Manifest
@@ -1 +1,2 @@
 DIST transitions-0.8.6.tar.gz 1092437 BLAKE2B 14a8f50bb3ab34e5a6589c1ccc14482373fcbe670d64cd822ef483da10d5e19771bea28ce26690907862422a7687cacccb8c82f5f623ba34888e88dbf2601945 SHA512 9ada9075074a1201c0858786ea446e5dd36576e154238dccbebc2523da0bd46cb676e7eb4abf1102207b2e674d3214dd4869b3c51a6b9e9799c38bd6be8aedac
+DIST transitions-0.8.7.tar.gz 1094059 BLAKE2B f8a524751567e450818e8e1219af661661985ead8014a060fcde2af5b7c16b3d2d87140804a85cb92d003682aa237de81865336f011f0b46805ba3d2839cf415 SHA512 0a7300a38facf46fe999f53114dc42040ee6aa423f08e378727d0e083a543d1246cb83ca08a861d4e598560e55124905808649e25e57a6002bd12992ba91dc8d
diff --git a/dev-python/transitions/transitions-0.8.7.ebuild b/dev-python/transitions/transitions-0.8.7.ebuild
new file mode 100644
index 000000000000..efe11d4b0353
--- /dev/null
+++ b/dev-python/transitions/transitions-0.8.7.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+
+inherit distutils-r1
+
+DESCRIPTION="A lightweight, object-oriented state machine implementation in Python"
+HOMEPAGE="https://github.com/pytransitions/transitions"
+SRC_URI="https://github.com/pytransitions/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples"
+
+RDEPEND="
+	|| (
+		dev-python/pygraphviz[${PYTHON_USEDEP}]
+		dev-python/graphviz[${PYTHON_USEDEP}]
+	)
+	dev-python/six[${PYTHON_USEDEP}]
+"
+
+DEPEND="
+	test? (
+		dev-python/dill[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pycodestyle[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_install() {
+	distutils-r1_src_install
+
+	use examples && dodoc examples/*.ipynb
+}
diff --git a/dev-python/ubelt/Manifest b/dev-python/ubelt/Manifest
index d960d74d7bd6..4ce2bf9870f9 100644
--- a/dev-python/ubelt/Manifest
+++ b/dev-python/ubelt/Manifest
@@ -1,2 +1 @@
-DIST ubelt-0.9.4.tar.gz 185601 BLAKE2B 09c236b6ecd0d434f8bec104afc89082fbdff9954d64b5063ba29f1ca456a6ab68937fd6e0db4cc672589135b99ea1a6448720dbea00acdbc2a3b441b1357682 SHA512 e562949fe27a19f6708dbc1f9e92a1d5a14857159f03840b525c1b77e660ce64f1ea2e2198c7068f9835343230ddee7fa66672c2e81126f9e4afddf729f19cb7
 DIST ubelt-0.9.5.tar.gz 193739 BLAKE2B 90597750c9ae1c1a4aa9d3180119665a6d1bf9fddb57f220d8ab6d8d0daf521d4e2648247753446e0e285b9f24f57c35d10abdcdd06e566fdd3415c77f10e50d SHA512 fbe17001c03da513238ab2ae101a9ac8c334943e88bf3037243c8ad4998e42a38e2907a408866a8acf2f7e2061c86a186b7955429564a6245ffca2bed25b8e54
diff --git a/dev-python/ubelt/ubelt-0.9.4.ebuild b/dev-python/ubelt/ubelt-0.9.4.ebuild
deleted file mode 100644
index 0458566cddd1..000000000000
--- a/dev-python/ubelt/ubelt-0.9.4.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="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
-	)
-
-	pytest -vv ${deselect[@]/#/--deselect } tests ||
-		die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/widgetsnbextension/widgetsnbextension-3.5.1.ebuild b/dev-python/widgetsnbextension/widgetsnbextension-3.5.1.ebuild
deleted file mode 100644
index d4599d992652..000000000000
--- a/dev-python/widgetsnbextension/widgetsnbextension-3.5.1.ebuild
+++ /dev/null
@@ -1,21 +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} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="IPython HTML widgets for Jupyter"
-HOMEPAGE="https://ipython.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="dev-python/notebook[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
diff --git a/dev-python/xdoctest/Manifest b/dev-python/xdoctest/Manifest
index c0d0eb64237e..df51feee3b3f 100644
--- a/dev-python/xdoctest/Manifest
+++ b/dev-python/xdoctest/Manifest
@@ -1,4 +1 @@
-DIST xdoctest-0.15.0.tar.gz 629125 BLAKE2B f5144365c4d1d58c107ac0603a1d99cd5bc622d3772fc7f2c907193ea863d9ff99bd183cc7fac12e2f85b7647ba25d5ae6878c06d3df9a5cdda9a1f143b43110 SHA512 114add93a75807d787c674b0649f92ff011987705f640912f876c4a4c3103cef90b0fae1959d5a85ef399b80695e9cbfcae6e809950ff5651fa211f54326682d
-DIST xdoctest-0.15.2.tar.gz 883332 BLAKE2B e90364d6096357ff1b5006b289a56a1afd0f3d0e952202d17a1b99c16f867e23ce0214a4f646154d9f6aada9f94ddda47a9c1f669a833bffaa63d99c10837766 SHA512 ca3bfc241e2d137988ee6dda2e9229f74add662fc2fe295c4c006a3d63ac6284f3f623451006acc4a8273729ccc589e1c5bab9d7fc65135582d7fc9fcffea464
-DIST xdoctest-0.15.3.gh.tar.gz 179880 BLAKE2B d35ccfaf4662c91d7b9a7191dc090721b963728312283af44c29614fe8af3d77434b192521bd29f760c7b53dd4e3dc708ccc7dc7c9ba294990a08441cbbda989 SHA512 b5e393246ef3c52481d48bbc9f91ddb0ffce24fd06c914d188f82ba9b7267727d9415fdd9a90f215c82e8bd76a4db2ab23aa99f473fe4901cc443d2196c9d3c9
 DIST xdoctest-0.15.4.gh.tar.gz 179295 BLAKE2B 0b44276a219119196543671d8ac24469ecd73b040bbd03ca416320d407f0dd34361dbb2778121621f6efb65835ea421107883277b6e712f03e4c06ea2b03dd6a SHA512 a0a35d5c73a8696266d9be44d11e9dbf05c9ac1165a05e681f7b70ef07ae7d56f4bd179e863b6675e2366f1627015e92092e8250ca592f004680db5ad886ad49
diff --git a/dev-python/xdoctest/xdoctest-0.15.0.ebuild b/dev-python/xdoctest/xdoctest-0.15.0.ebuild
deleted file mode 100644
index 91b20d1bedb0..000000000000
--- a/dev-python/xdoctest/xdoctest-0.15.0.ebuild
+++ /dev/null
@@ -1,40 +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} )
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="A rewrite of Python's builtin doctest module but without all the weirdness"
-HOMEPAGE="https://github.com/Erotemic/xdoctest"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="Apache-2.0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs/source dev-python/sphinx_rtd_theme
-
-python_prepare_all() {
-	# fails because the ebuild environment location is not the expected location
-	sed -i -e 's:test_xdoc_console_script_location:_&:' \
-		testing/test_entry_point.py || die
-
-	# xdoctest has to be in PATH for this to work
-	sed -i -e 's:test_xdoc_console_script_exec:_&:' \
-		testing/test_entry_point.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	PYTHONPATH="${WORKDIR}/${P}"
-	pytest -vv || die "Test fail with ${EPYTHON}"
-}
diff --git a/dev-python/xdoctest/xdoctest-0.15.2.ebuild b/dev-python/xdoctest/xdoctest-0.15.2.ebuild
deleted file mode 100644
index 0917119b0880..000000000000
--- a/dev-python/xdoctest/xdoctest-0.15.2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="A rewrite of Python's builtin doctest module but without all the weirdness"
-HOMEPAGE="https://github.com/Erotemic/xdoctest"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="Apache-2.0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
-# dev-python/nbformat-5.1.{0..2} did not install package data
-BDEPEND="
-	test? (
-		|| (
-			>=dev-python/nbformat-5.1.2-r1[${PYTHON_USEDEP}]
-			<dev-python/nbformat-5.1[${PYTHON_USEDEP}]
-		)
-	)"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs/source dev-python/sphinx_rtd_theme
-
-python_test() {
-	local -x PYTHONPATH=.
-	pytest -vv || die "Test fail with ${EPYTHON}"
-}
diff --git a/dev-python/xdoctest/xdoctest-0.15.3.ebuild b/dev-python/xdoctest/xdoctest-0.15.3.ebuild
deleted file mode 100644
index a2a5e088657f..000000000000
--- a/dev-python/xdoctest/xdoctest-0.15.3.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="A rewrite of Python's builtin doctest module but without all the weirdness"
-HOMEPAGE="https://github.com/Erotemic/xdoctest/"
-SRC_URI="
-	https://github.com/Erotemic/xdoctest/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-SLOT="0"
-LICENSE="Apache-2.0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
-# dev-python/nbformat-5.1.{0..2} did not install package data
-BDEPEND="
-	test? (
-		|| (
-			>=dev-python/nbformat-5.1.2-r1[${PYTHON_USEDEP}]
-			<dev-python/nbformat-5.1[${PYTHON_USEDEP}]
-		)
-	)"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs/source dev-python/sphinx_rtd_theme
-
-python_test() {
-	local -x PYTHONPATH=.
-	pytest -vv || die "Test fail with ${EPYTHON}"
-}