Adding metadata

42 files changed, 280 insertions, 1222 deletions

diff --git a/dev-python/backrefs/Manifest b/dev-python/backrefs/Manifest
index aae0beacb852..13990f84a82a 100644
--- a/dev-python/backrefs/Manifest
+++ b/dev-python/backrefs/Manifest
@@ -1,4 +1 @@
-DIST backrefs-4.5.0.tar.gz 5995247 BLAKE2B ce3d33b91ab307811e555689a2ece0ba47e53d8245fd4fa367156a76893c5ca342cb47d014a3c94c6f30ebb32487fb36975a2fa6c7acf0a626305d05e0d80048 SHA512 c1e30a78c2e7a86efce1670000612b6450b6cae78f8c799cec6832aa88e4145fee6ffc3e1b8c54b55091f7c21ea4b09c1ee36af852bb51973434b593273e04a8
-DIST backrefs-4.6.tar.gz 5995313 BLAKE2B 5bc6c6b496dc74f1a73a155b7825a134ef84458c0396bc2e678e93432c37b1355f782331fce978dee1c9968cc683c3821ae8975bbd20d4e19896277a6bf5b0c8 SHA512 96aeba6aab34ea14a48c430b00e242b3468054cfccfdab00a66071434e65df4378caffc32f47eded48b5054f7bfcd0caaa04bf103b9fa282ddb5c6119c46f88f
 DIST backrefs-5.0.1.tar.gz 4120179 BLAKE2B 2cd8fb84c7e416be330cb9afdb894f6f8574b66698acc1d63abae8ff5bfcccd4bf29b724dcf2a25a637ea0fde46865b18a5ff1bfbff955a01798037752dc3d97 SHA512 e2212bd7dce017308fa558ccfe7faf617ed6107523db8b2e4a3ad7b60aa1d7aabdaea2632abd6a3f1f022eac949d7036a7afe522b5f086ef1888a0e67e834894
-DIST backrefs-5.0.tar.gz 4120151 BLAKE2B 350b59c31d75b18df249f7bbd1625c2183182581dbf4b473c6fe58cbb7722b71a260769fd918d992e5aadfd8f4e848449609de2d307e1dd95aeb6125d5ac7a03 SHA512 c1b7f70f02171535609e3abfb4ad38174b63b935b4f904759069cc8cf9ea6c8fbeeefedc2a150c2d9eafc70ec29a4c5915809d7a8931e0a5af7e6df1ff5b136d
diff --git a/dev-python/backrefs/backrefs-4.5.0.ebuild b/dev-python/backrefs/backrefs-4.5.0.ebuild
deleted file mode 100644
index 233f3f489f06..000000000000
--- a/dev-python/backrefs/backrefs-4.5.0.ebuild
+++ /dev/null
@@ -1,49 +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} )
-
-DOCS_BUILDER="mkdocs"
-DOCS_DEPEND="
-	dev-python/mkdocs-git-revision-date-localized-plugin
-	~dev-python/mkdocs_pymdownx_material_extras-1.0.7
-	dev-python/mkdocs-minify-plugin
-	dev-python/mkdocs-material
-	dev-python/pyspelling
-"
-
-inherit distutils-r1 docs
-
-DESCRIPTION="Wrapper around re or regex that adds additional back references"
-HOMEPAGE="
-	https://github.com/facelessuser/backrefs
-	https://pypi.org/project/backrefs
-"
-SRC_URI="https://github.com/facelessuser/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-BDEPEND="test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/regex[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# mkdocs-git-revision-date-localized-plugin needs git repo
-	if use doc; then
-		git init || die
-		git config --global user.email "you@example.com" || die
-		git config --global user.name "Your Name" || die
-		git add . || die
-		git commit -m 'init' || die
-	fi
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/backrefs/backrefs-4.6.ebuild b/dev-python/backrefs/backrefs-4.6.ebuild
deleted file mode 100644
index ef7b8f86691a..000000000000
--- a/dev-python/backrefs/backrefs-4.6.ebuild
+++ /dev/null
@@ -1,50 +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} )
-
-DOCS_BUILDER="mkdocs"
-DOCS_DEPEND="
-	dev-python/mkdocs-git-revision-date-localized-plugin
-	~dev-python/mkdocs_pymdownx_material_extras-1.0.7
-	dev-python/mkdocs-minify-plugin
-	dev-python/mkdocs-material
-	dev-python/pyspelling
-"
-
-inherit distutils-r1 docs
-
-DESCRIPTION="Wrapper around re or regex that adds additional back references"
-HOMEPAGE="
-	https://github.com/facelessuser/backrefs/
-	https://pypi.org/project/backrefs/
-"
-SRC_URI="https://github.com/facelessuser/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/regex[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# mkdocs-git-revision-date-localized-plugin needs git repo
-	if use doc; then
-		git init || die
-		git config --global user.email "you@example.com" || die
-		git config --global user.name "Your Name" || die
-		git add . || die
-		git commit -m 'init' || die
-	fi
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/backrefs/backrefs-5.0.ebuild b/dev-python/backrefs/backrefs-5.0.ebuild
deleted file mode 100644
index ef7b8f86691a..000000000000
--- a/dev-python/backrefs/backrefs-5.0.ebuild
+++ /dev/null
@@ -1,50 +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} )
-
-DOCS_BUILDER="mkdocs"
-DOCS_DEPEND="
-	dev-python/mkdocs-git-revision-date-localized-plugin
-	~dev-python/mkdocs_pymdownx_material_extras-1.0.7
-	dev-python/mkdocs-minify-plugin
-	dev-python/mkdocs-material
-	dev-python/pyspelling
-"
-
-inherit distutils-r1 docs
-
-DESCRIPTION="Wrapper around re or regex that adds additional back references"
-HOMEPAGE="
-	https://github.com/facelessuser/backrefs/
-	https://pypi.org/project/backrefs/
-"
-SRC_URI="https://github.com/facelessuser/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/regex[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# mkdocs-git-revision-date-localized-plugin needs git repo
-	if use doc; then
-		git init || die
-		git config --global user.email "you@example.com" || die
-		git config --global user.name "Your Name" || die
-		git add . || die
-		git commit -m 'init' || die
-	fi
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index 74f147884ed5..3e66820654ca 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -16,4 +16,5 @@ DIST boto3-1.17.29.tar.gz 350960 BLAKE2B 8192d2ea8165b7d10ffdd56b30ba3fadf6f2373
 DIST boto3-1.17.30.tar.gz 351634 BLAKE2B e6ad4b4e09ae45684ccd799da45dcf7844149b3dd735a378e90949fd4d533df494b93ef1b97c09057336bae63103bc03f8ce1e9500a5293c617fc8267bc35e89 SHA512 d2b6ac1307ccfe71fba12ea5838726c52c4f45a9467a9b0cf01c4e6898fa0744f6c7ea4cca7294b025dcd21b9e1f15d8aabd15c56e2796035b33e8e3c52f1e45
 DIST boto3-1.17.31.tar.gz 352268 BLAKE2B eefb7bcc3c6809fc03de2f175d5c3cfa750bc8650d56d5ee18608077a88a1c09ea79c2de1ce67f7d48129d5c948a7e5e30ab261c55a381ccf5c030dc42ff0ee0 SHA512 2d603a307575ff04877105ac98068d96b676faaa89b73ef470d9341951d5fcc148a57c7e80867d93bf257854ec700f61e48575ceebe19591091bbf2a68701138
 DIST boto3-1.17.32.tar.gz 352337 BLAKE2B 0d453ecd51d17291f10d2ffa4ae7b1036dced70a5ca0eafdc5f3073829942ecde57fe20f4d0139bfb2f75bdc47a000624281258ff621b98683ea41eae1a4bc71 SHA512 1bf61e3fcd2d650a534de5e7ed471bbdfeb2be6771f1dbde057ea2e3f3b6a29d6022011b5df90bae5c7ff231aec63ec49501cc3bd42421ec510d73e712060aad
+DIST boto3-1.17.33.tar.gz 352659 BLAKE2B b78e3ce86b32d23ade26d93d0c3ba86020a94becb42a866be6ee02f268819eb78fde398b4bd3125c5be6b493b28434c448411b9bd83eb631a3687019aa384ae0 SHA512 452cb1d165afe03a7603999033348524212d62742a026bc51677f5b64e9de98be2920c89f7aaf5999dd676c0c9ff098af055edc01edd97bad239815263ffbd38
 DIST boto3-1.17.7.tar.gz 346682 BLAKE2B 08c06dda1d59b4f555cad075673917b38cbf9ad8d0037f66027b17076e60b4d5fd32a93e088635320ebc3226a9cd8809c9208ec84f8588c26a77766b21dbee98 SHA512 2ba1817575c4a64c232c84a75a9d3b0db1de8634ded9aa31844930a82ccf4611805c6dd31b2e4d36cc9a2cc1813d233b4d7366305eaf28efd46a3b843d3c2993
diff --git a/dev-python/boto3/boto3-1.17.33.ebuild b/dev-python/boto3/boto3-1.17.33.ebuild
new file mode 100644
index 000000000000..2df16964cdb0
--- /dev/null
+++ b/dev-python/boto3/boto3-1.17.33.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 448257679f64..0048fc650615 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -16,4 +16,5 @@ DIST botocore-1.20.29.tar.gz 7533728 BLAKE2B 75ca3262805177118d0f1a6060d98badf54
 DIST botocore-1.20.30.tar.gz 7534280 BLAKE2B bfa6066e8e2c28475807b8a469257cc8fc6dfb17de231e25db411223a55bc897534e90aa2d7f2a89a21378f8dbbbae52e553333292c1726d11c60cfeea4f4f7a SHA512 3d0d2cc120a1aaa225ebbd2a9393e0d413653c44e55f99094f36d62993737a2f2b5d63a64225e207c4a21b60971fb40eb8c30059efe77cdad6681ce00d4da5ac
 DIST botocore-1.20.31.tar.gz 7544090 BLAKE2B c8c158f69463e2eaf3c817d7577bd449724bf0a409e65bd83734cb7af3c0211999e4f7d240da97f017829ee04cbd4f69af0e7ea589adcfb413498dfd831630c9 SHA512 a7f8c02b4518a25e1eb0299b3cec5791810e81b7b6b1d8c9ef2e94cd9fcba21bdcdfc3fe96955e134fc0acb78e27aff850ee352a718d2bf518c8480287a1eb26
 DIST botocore-1.20.32.tar.gz 7543258 BLAKE2B 464b1b32d32f25874cf73a57c281436a6c6095d69dbd90ac6566fbfacb58fea4162e61d58092708c243917398fb9c1898feb3ed7903515a0a2f24c6cf16278d3 SHA512 e7a7a1fac7fab4e6ec49e38909c306ed7f54b544ebe85cefb0a743aa44882707b51877d4872926be282117ecfeeef564f1345b2be8daed9cd54dcd970d5d6811
+DIST botocore-1.20.33.tar.gz 7543656 BLAKE2B eefd7b06c5a43780982616cfd640c6a1c5d9e919b403c0f78be06833e8e618b142cabacf2dd3b3e13cf351bbd5d0d42ef23b314355f68f7d9dc6aa9cae6e377f SHA512 6354ed7ebbe467ea96c0ea0e059acd2be0a40973d55998c0e006e73a67f2a69bd8009099f761af83e47022ad27698d3a21ffc2824ad4b74a687bc490239420e0
 DIST botocore-1.20.7.tar.gz 7458254 BLAKE2B 8b9a1edda73e2564d3a3d67c6b3542d1ec9372403cb4d88396e58dfbcb5987821f278f2757e079e1ab32e03243ed3a6d1023ecc591b965512b3af5e2d43ea7b0 SHA512 9b023a31be866a50b94017a28aca40b5fe2e720959c928a3fd93db96041f3886049717f50461222a09572c0c56c5961a4614b80e400e4fa6d8b3ff4b4ab681df
diff --git a/dev-python/botocore/botocore-1.20.33.ebuild b/dev-python/botocore/botocore-1.20.33.ebuild
new file mode 100644
index 000000000000..9d681f87244c
--- /dev/null
+++ b/dev-python/botocore/botocore-1.20.33.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/bracex/Manifest b/dev-python/bracex/Manifest
index 6a3a6bbc81c6..a683ec5bcf1b 100644
--- a/dev-python/bracex/Manifest
+++ b/dev-python/bracex/Manifest
@@ -1,3 +1 @@
-DIST bracex-2.0.1.tar.gz 24356 BLAKE2B dc4df37c569e26a4319d4240694a397926075ba8cc3d6f44cb35ae42dd20c36f690f904d6a6895aa4e02d7108b3bc173d4a6f672ac9bf5ee426f280dab5fc0e1 SHA512 28758ce4796ad64cceeab0e93edf4c9bb71c6a968db3b917db3e22619278a4639e587da7070c15c5a3c8c1121871541e7764904769859c3c590ac8611f224a13
-DIST bracex-2.1.0.tar.gz 25148 BLAKE2B bf0c2b60713bc17dd40b9617bc8066e44b5654bd1a12948109a496588050efdf6a31d5e1d31a587cd08da9033520c2f4e0db89a806acd628f7455b6a34a03c2d SHA512 ec1deeb466cf456ca3ab93ecd429b23f59fbac74215cd0de6c447f67be2bc40552dc7ba71331771d765804a190cdbf17eb7c255e976c1fef2f7e47d3351dfdce
 DIST bracex-2.1.1.tar.gz 26078 BLAKE2B 7313aac70d2bdb8473396a651a5d62a399084a0277e8c4665ef79fbe00347b86fc9793066584275f2a77c6c4cc217e6235f2f06ef4977f733039984c562ec529 SHA512 922f627a001c239cf5ace47fb2f295e04200116add01ff969f8de49067098dea43286c3c739d51286b283d354cb6e411b7e2e6cb1c4863ba78edccc7bd461c86
diff --git a/dev-python/bracex/bracex-2.0.1.ebuild b/dev-python/bracex/bracex-2.0.1.ebuild
deleted file mode 100644
index 3df1e719577e..000000000000
--- a/dev-python/bracex/bracex-2.0.1.ebuild
+++ /dev/null
@@ -1,45 +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} )
-
-DOCS_BUILDER="mkdocs"
-DOCS_DEPEND="
-	dev-python/mkdocs-git-revision-date-localized-plugin
-	dev-python/mkdocs-material
-	dev-python/mkdocs-minify-plugin
-	dev-python/mkdocs_pymdownx_material_extras
-	dev-python/pyspelling
-"
-
-inherit distutils-r1 docs
-
-DESCRIPTION="Bash style brace expansion for Python"
-HOMEPAGE="
-	https://github.com/facelessuser/bracex
-	https://pypi.org/project/bracex
-"
-SRC_URI="https://github.com/facelessuser/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-BDEPEND="test? ( dev-vcs/git )"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# mkdocs-git-revision-date-localized-plugin needs git repo
-	if use doc; then
-		git init || die
-		git config --global user.email "you@example.com" || die
-		git config --global user.name "Your Name" || die
-		git add . || die
-		git commit -m 'init' || die
-	fi
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/bracex/bracex-2.1.0.ebuild b/dev-python/bracex/bracex-2.1.0.ebuild
deleted file mode 100644
index 6d861d78d0ce..000000000000
--- a/dev-python/bracex/bracex-2.1.0.ebuild
+++ /dev/null
@@ -1,45 +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} )
-
-DOCS_BUILDER="mkdocs"
-DOCS_DEPEND="
-	dev-python/mkdocs-git-revision-date-localized-plugin
-	dev-python/mkdocs-material
-	dev-python/mkdocs-minify-plugin
-	dev-python/mkdocs_pymdownx_material_extras
-	dev-python/pyspelling
-"
-
-inherit distutils-r1 docs
-
-DESCRIPTION="Bash style brace expansion for Python"
-HOMEPAGE="
-	https://github.com/facelessuser/bracex
-	https://pypi.org/project/bracex
-"
-SRC_URI="https://github.com/facelessuser/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-BDEPEND="test? ( dev-vcs/git )"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# mkdocs-git-revision-date-localized-plugin needs git repo
-	if use doc; then
-		git init || die
-		git config --global user.email "you@example.com" || die
-		git config --global user.name "Your Name" || die
-		git add . || die
-		git commit -m 'init' || die
-	fi
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/exdown/Manifest b/dev-python/exdown/Manifest
index 0aa461348d21..92b9f5747a03 100644
--- a/dev-python/exdown/Manifest
+++ b/dev-python/exdown/Manifest
@@ -1,5 +1 @@
-DIST exdown-0.7.1.tar.gz 4863 BLAKE2B 819e66bed1028a98293a4f30ec6dc70a8360bd018821e332719793b4c72e60f0ec09391825ee0c6eb5f4e1132f1c22d48fe0dc19fe8c42253e92a833b7821340 SHA512 4cd0abc734850b5bf8b4531f4c690400d0f5fa6a9e6efbd3e20f75f646f0373f47a04a1655ac86d95a0d6d55019a174e0361d3bdda91bdb9197e8d64ffadcab6
-DIST exdown-0.8.0.tar.gz 4864 BLAKE2B 084e359b5797484486d9554f85e07bc671da5260bcfebc5cdf20583b91f13e52f9a4332afd8b69ab3c80313d18e1f1bd0d36415a2297589c5bc65c04fde18046 SHA512 cb80d355666b57f4c35fd5776d01deb36b35547d87d152d5b5a26d5c46ecfda28af10c54a3d4ac9bd6b69f99ff3e62b07cfcade07b4cd1f51969562931aee687
-DIST exdown-0.8.2.tar.gz 5255 BLAKE2B ee33e23afc86befdb421c8ac82742977a35f5cf2931aad5cdb5fdd4096682160810bbe09661ec59c10c86f7214bf67b8dc705b9e0ebae3e818c3b112fab91831 SHA512 919b6f8d57546c308b488cc47bd8d51700ffbf758477f3d0cc9de92936a2a70828475edcea011488d653f1d53309fcb2d951ac945e76bdc9a5d015f7ac34e291
-DIST exdown-0.8.5.tar.gz 5522 BLAKE2B 30e3d6e2f12aaa5783605b8a65c391e59b563a86defcefc8f5e322f93cdd4ccc561f6514254c41109047509b77e38202365b798c2b1e7838bec9275a607d0539 SHA512 709c0f2fb6d0944357c656f3beab7f151a48000a430f863cf56c529a49ee462c1c168f9708d77fd6fd5ef3fe29b11084303da1831726bb01943e1b817ba733a4
 DIST exdown-0.8.6.tar.gz 5480 BLAKE2B fe383a2092691afdb2a3fd8cfeffb78f62b23bd4dc8f8d5365102084acc8670c9f2bc3e4a0ade95a50ceffc5cc142c39dbd3e505678a238d6f39b82f6553071a SHA512 28cd68ed99d24c79a7764f7603242f2b1426f119864d39424b1326cecc5bc922ed610133099e7d03d384c485f4f67d1fefcaadee4e1f69ac8ece08136eb858e9
diff --git a/dev-python/exdown/exdown-0.7.1.ebuild b/dev-python/exdown/exdown-0.7.1.ebuild
deleted file mode 100644
index 7a5e5dfaa1d8..000000000000
--- a/dev-python/exdown/exdown-0.7.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 2019-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 virtualx
-
-DESCRIPTION="Extract code blocks from markdown"
-HOMEPAGE="https://github.com/nschloe/exdown"
-SRC_URI="https://github.com/nschloe/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	$( python_gen_cond_dep \
-		'dev-python/importlib_metadata[${PYTHON_USEDEP}]' python3_7 )
-"
-
-BDEPEND="
-	dev-python/wheel[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# setup.py was removed in commit ddb8a613bbc8ba7d079c1b7abbca5ce2d53ef9d0
-	# for some reason, DISTUTULS_USE_SETUPTOOLS="pyproject.toml" is not working
-	# it complains about file not found, setup.cfg does exist
-	cat > setup.py <<EOF || die
-from setuptools import setup
-
-if __name__ == "__main__":
-	setup()
-EOF
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/exdown/exdown-0.8.0.ebuild b/dev-python/exdown/exdown-0.8.0.ebuild
deleted file mode 100644
index b7655334a99c..000000000000
--- a/dev-python/exdown/exdown-0.8.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=pyproject.toml
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="Extract code blocks from markdown"
-HOMEPAGE="https://github.com/nschloe/exdown"
-SRC_URI="https://github.com/nschloe/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/importlib_metadata[${PYTHON_USEDEP}]
-	' python3_7)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/exdown/exdown-0.8.2.ebuild b/dev-python/exdown/exdown-0.8.2.ebuild
deleted file mode 100644
index b7655334a99c..000000000000
--- a/dev-python/exdown/exdown-0.8.2.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=pyproject.toml
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="Extract code blocks from markdown"
-HOMEPAGE="https://github.com/nschloe/exdown"
-SRC_URI="https://github.com/nschloe/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/importlib_metadata[${PYTHON_USEDEP}]
-	' python3_7)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/exdown/exdown-0.8.5.ebuild b/dev-python/exdown/exdown-0.8.5.ebuild
deleted file mode 100644
index b7655334a99c..000000000000
--- a/dev-python/exdown/exdown-0.8.5.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=pyproject.toml
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="Extract code blocks from markdown"
-HOMEPAGE="https://github.com/nschloe/exdown"
-SRC_URI="https://github.com/nschloe/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/importlib_metadata[${PYTHON_USEDEP}]
-	' python3_7)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/flask-paginate/Manifest b/dev-python/flask-paginate/Manifest
index 9857adce9b85..04a470937e9d 100644
--- a/dev-python/flask-paginate/Manifest
+++ b/dev-python/flask-paginate/Manifest
@@ -1,3 +1 @@
-DIST flask-paginate-0.7.0.tar.gz 119358 BLAKE2B 24c1f3bc77853c9c96bb72d3364e73845f8fd0870606dd96b4261861430bef864a6830dd793f4f6e8a9371c89342dda88c5f976d79ff4a1bec7d687614b2014a SHA512 11c335c08c6a9c32999e5b8ba7a76c1fb04769e5ab679b550efc87497446edbaa1e3ccb62a4c238a0b5585f7ba4067e43f158ae123c3b118db84b90cb5d4f219
-DIST flask-paginate-0.8.0.tar.gz 119687 BLAKE2B 0c73f1d72938fe2cb322ec53e1ce3df083c81f1b2bc58f150af1e602c7e435aaa844534283f83337cd9840f8ece69620de9e63e3f8017f848b5dc2fb54f19848 SHA512 1958dbf5675b24ae175098c740e08cc3aa9d2088f6f10768083a740fba3a87cf4b5255ddbc5fe72d286fb04817f527fba9fca5b09af2929851c5ac1eefe3b4d7
 DIST flask-paginate-0.8.1.tar.gz 119751 BLAKE2B 954d39e13619784b1a79abc9f26fc2b3827309f9a3b77cacdd40c8f8d9dfec4c2967894e2d571e26841245da6d264dad71a412e425c87aa0c07b3520274de7c4 SHA512 ca226c79bd944a19760048c1289b554ee048f4f8d1f231f5545423843b7c0616d52ee8024cc68628e11c5f528972897d7fdb1630f87063bbd0e40c4dacf91224
diff --git a/dev-python/flask-paginate/flask-paginate-0.7.0.ebuild b/dev-python/flask-paginate/flask-paginate-0.7.0.ebuild
deleted file mode 100644
index d6231ef8ace5..000000000000
--- a/dev-python/flask-paginate/flask-paginate-0.7.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-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} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="Pagination support for flask"
-HOMEPAGE="https://flask-paginate.readthedocs.io"
-SRC_URI="https://github.com/lixxu/flask-paginate/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="dev-python/flask[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-python_test() {
-	pytest -vv tests/tests.py || die "tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/flask-paginate/flask-paginate-0.8.0.ebuild b/dev-python/flask-paginate/flask-paginate-0.8.0.ebuild
deleted file mode 100644
index 8bc43d1dbc48..000000000000
--- a/dev-python/flask-paginate/flask-paginate-0.8.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="Pagination support for flask"
-HOMEPAGE="https://flask-paginate.readthedocs.io"
-SRC_URI="https://github.com/lixxu/flask-paginate/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="dev-python/flask[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-python_test() {
-	pytest -vv tests/tests.py || die "tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/peewee/Manifest b/dev-python/peewee/Manifest
index 2e737c83599a..37c5a95aa626 100644
--- a/dev-python/peewee/Manifest
+++ b/dev-python/peewee/Manifest
@@ -1,3 +1,4 @@
 DIST peewee-3.14.1.tar.gz 879443 BLAKE2B f7a1967006e517c56a4a2b10bd9c097e87dca4135038676b096431e6927fa6f0a7e2ad13c036a1a7499a9b3a140a4d4796399f9c1e727e7e8a0770ef3483a3ce SHA512 f8b8bddd1e32e05d75a2f1cc5fcc8b9d98397107e4e4d3b19b444f20f4b8243d740643c858d20fd0ceb8b30de859fe17079fc611ac21cf289c417e1f857f1f0f
 DIST peewee-3.14.2.tar.gz 881173 BLAKE2B d784f133b9119e8c769d4259360f73c801129f1eb498591f716427d54ee518e74d851cec951ebb65605f50e18eccd1cdd9e6b5fbb527679345bb681d2248b30e SHA512 8473cbe8df69c4aeb6d8fe7e13fa5f7e462ad8827d67698e244b44944532289ba7941f4294c21f12ee51378037bc9ba2ed28a9682e61ba1c67a7c04eb72ff6b5
 DIST peewee-3.14.3.tar.gz 881613 BLAKE2B f64a73c9e8fd94b67023cbb360ce4dabfd373319403a7c942a1f845d962200ff432b4b8d84482c9e42bc5251fbafb05855f308b3aed818c14dc0191ef4e84661 SHA512 e8b3698e5c48e917b7eb4f9572590a66d792abe8ac15157935fbcc9478580f4ca41a0704cdd7412f853e63a8750ac2d5d5075c9a67d0d67d5d32bd5c8048b6b1
+DIST peewee-3.14.4.tar.gz 882123 BLAKE2B e20848eaa7cd93ea5fcea152ffbfdbab694d9fea7ee8b945c029fee8d6c4a263317fbb0506df31d490611a2b2ac0718b0fdbea875f0013eb1f3f71941f12a26b SHA512 261856f4b691b8f5610d041a049148f213c22348a7e50514f7792932c1f4e8735b4dddb8a29c42e583c38e89551df2f05951d81bda0c47a80dc1eeeb0345f30f
diff --git a/dev-python/peewee/peewee-3.14.4.ebuild b/dev-python/peewee/peewee-3.14.4.ebuild
new file mode 100644
index 000000000000..b9df662c6b71
--- /dev/null
+++ b/dev-python/peewee/peewee-3.14.4.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+PYTHON_REQ_USE="sqlite"
+
+inherit distutils-r1
+
+DESCRIPTION="Small Python ORM"
+HOMEPAGE="https://github.com/coleifer/peewee/"
+SRC_URI="https://github.com/coleifer/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+	test? ( dev-python/psycopg[${PYTHON_USEDEP}] )
+"
+
+distutils_enable_sphinx docs
+
+python_test() {
+	"${EPYTHON}" ./runtests.py -v 2 || die "tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use examples && DOCS=( examples/ )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pyxDamerauLevenshtein/Manifest b/dev-python/pyxDamerauLevenshtein/Manifest
index ab8d5e53f1dd..61ec1a0905cb 100644
--- a/dev-python/pyxDamerauLevenshtein/Manifest
+++ b/dev-python/pyxDamerauLevenshtein/Manifest
@@ -1,3 +1 @@
-DIST pyxDamerauLevenshtein-1.6.1.tar.gz 60737 BLAKE2B b03e80dadd7d748b2788a85b84bc0fe088905ace412b71302176a2cf5a23b1f109af50f7e5393b4dce42bfa99bebb2793376bf40e24b5ac4d3cc5e9076c1e899 SHA512 941c621035719e42402c59d7baa602b3147caf7564a4771e4e301c70e04534f72c21f13eb0e15f4382f5eae1aa149ba09e3223c6292588facce43d6cf4af91c8
-DIST pyxDamerauLevenshtein-1.6.2.tar.gz 55354 BLAKE2B 6a7e754fb1290be0f47b1593c6e5606985a64a4d1e2a00d3065daa0e2dd826de53eaf6d6718b32ac0286f6516a8b6f8e431a3773a60a618906197a921363c4b2 SHA512 7bada4cf879c1115114667ae2531634995ade5f1696f55482c1ea99235a6041831f9ff43b3b0ee0d464b46e94283645764e90b4270953000adee937ac656fb36
 DIST pyxDamerauLevenshtein-1.7.0.tar.gz 41867 BLAKE2B a8fe379a10bfd37e1675dab83d83d1b53308b5539c86e31f507a0243da898d57c4d320661642e23be439c4aabf88b1aaa559bc620e193e58586568cdfd8040df SHA512 11704d3968261cd844ce248c913f1b9baf813d0f8c712971ac4ec05466f8aa5719932e282b49e378d6799ae88483804055765a881d3cef8e7adff486b450e98e
diff --git a/dev-python/pyxDamerauLevenshtein/pyxDamerauLevenshtein-1.6.1.ebuild b/dev-python/pyxDamerauLevenshtein/pyxDamerauLevenshtein-1.6.1.ebuild
deleted file mode 100644
index bf68122dff66..000000000000
--- a/dev-python/pyxDamerauLevenshtein/pyxDamerauLevenshtein-1.6.1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Implements the Damerau-Levenshtein edit distance algorithm for Python in Cython"
-HOMEPAGE="https://github.com/gfairchild/pyxDamerauLevenshtein"
-SRC_URI="https://github.com/gfairchild/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/cython[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/pyxDamerauLevenshtein/pyxDamerauLevenshtein-1.6.2.ebuild b/dev-python/pyxDamerauLevenshtein/pyxDamerauLevenshtein-1.6.2.ebuild
deleted file mode 100644
index 5647584bc404..000000000000
--- a/dev-python/pyxDamerauLevenshtein/pyxDamerauLevenshtein-1.6.2.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Implements the Damerau-Levenshtein edit distance algorithm for Python in Cython"
-HOMEPAGE="https://github.com/gfairchild/pyxDamerauLevenshtein"
-SRC_URI="https://github.com/gfairchild/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/cython[${PYTHON_USEDEP}]
-	>=dev-python/numpy-1.19.5[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/reportlab/Manifest b/dev-python/reportlab/Manifest
index 7bc4be79de14..1cfe133aefeb 100644
--- a/dev-python/reportlab/Manifest
+++ b/dev-python/reportlab/Manifest
@@ -3,3 +3,4 @@ DIST reportlab-3.5.60.tar.gz 2905122 BLAKE2B 8863e910dac03d5fd1d53880bb9fe83d218
 DIST reportlab-3.5.63.tar.gz 2908785 BLAKE2B 0af6f72063e4a1f4464bf8d847575e23b5d96ced3bdbafa518e56503194e98aed5e07c17fbf6cf07d3d95ef91b3d0d450233024b40368889dc1ef5d8792050fe SHA512 39c940a585695752095b868fa631396193083d9d270512e0e89e766e02d749745b6d0438f2d9f5ec2ea58c7da6aa538a0315fbd7483571ebc2c460035e12a1bf
 DIST reportlab-3.5.64.tar.gz 2909252 BLAKE2B 5922ec3083238c2884d7ebede5593a15fa537a8bd72f5cf9b6a84bf1673fe43be2df9f2125f033400c766fdf78a07f4c919b331bbd2215acb950dbbcb971bced SHA512 ac4eb9a7c337ebdde81dcfa9e6b9609aec7fca8451d383c28b9d58e0ea73bd71c328fb2362ba5805b96e10c95dc166d5806eb763c5c325a6d72a9474dce3c422
 DIST reportlab-3.5.65.tar.gz 2909468 BLAKE2B cec88aa00299d329a44379798824a8694f7547a9bb35685b202873387d0b40cdb2bfc864257ee2749c8cc24ed1d26e1ef22c1059fe2e27df38cedae71d55ceda SHA512 a143ff277ab4e9bf667d8334aca9d5b0c959b64eebbd5eda8d6fed95b09cd28544a33bbe5f630753f167b54e63a1a5e04f841c8892712e93d2f8739e9651269a
+DIST reportlab-3.5.66.tar.gz 2911372 BLAKE2B 58bc718157066a82eece18141e08547b8360dd653d2365fdbe1708fee2f1f8dffeced60500b4e866c31947fae00b78ab9853983563fb89e5b34827173c71a534 SHA512 81fac9fd751a451bd5bf6c91efcf9e250ec1c028587c9ed76129d7fd20c4efa17ea0ae45f08dd43a33adf6f4a2c5338a557e869b85d0b6405626720b0e9221a8
diff --git a/dev-python/reportlab/reportlab-3.5.66.ebuild b/dev-python/reportlab/reportlab-3.5.66.ebuild
new file mode 100644
index 000000000000..cb4d7e39c441
--- /dev/null
+++ b/dev-python/reportlab/reportlab-3.5.66.ebuild
@@ -0,0 +1,66 @@
+# 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="Tools for generating printable PDF documents from any data source"
+HOMEPAGE="
+	https://www.reportlab.com/
+	https://pypi.org/project/reportlab/"
+SRC_URI="
+	mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz
+	https://www.reportlab.com/ftp/fonts/pfbfer-20070710.zip"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+DEPEND="
+	media-libs/freetype
+	media-libs/libart_lgpl
+	sys-libs/zlib:="
+RDEPEND="
+	${DEPEND}
+	dev-python/pillow[tiff,truetype,jpeg(+),${PYTHON_USEDEP}]"
+BDEPEND="
+	app-arch/unzip"
+
+distutils_enable_sphinx docs/source
+distutils_enable_tests unittest
+
+PATCHES=(
+	# bug 738312, remove -L/usr/lib from link line
+	"${FILESDIR}"/${PN}-3.5.48-usr-lib-LLD.patch
+)
+
+src_unpack() {
+	unpack ${P}.tar.gz
+	cd ${P}/src/reportlab/fonts || die
+	unpack pfbfer-20070710.zip
+}
+
+python_prepare_all() {
+	# tests requiring Internet access
+	sed -i -e 's:test0:_&:' \
+		tests/test_platypus_general.py \
+		tests/test_platypus_images.py || die
+	sed -i -e 's:test9:_&:' tests/test_lib_utils.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+src_configure() {
+	mydistutilsargs=(
+		--no-download-t1-files
+		--use-system-libart
+	)
+}
+
+python_test() {
+	pushd tests >/dev/null || die
+	"${EPYTHON}" runAll.py -v || die "Testing failed with ${EPYTHON}"
+	popd >/dev/null || die
+}
diff --git a/dev-python/spyder-kernels/Manifest b/dev-python/spyder-kernels/Manifest
index 472dac1de128..b3ecbf912a30 100644
--- a/dev-python/spyder-kernels/Manifest
+++ b/dev-python/spyder-kernels/Manifest
@@ -1,3 +1,2 @@
 DIST spyder-kernels-1.10.0-gh.tar.gz 77416 BLAKE2B 0d3e3f8228d2a76174e8d7c64a55c9fda384961065673b1b6b64591f476e8932c5dc3fe253b67d94135688b8d346828f88800bdc3bb0b83450d51669218f98b3 SHA512 59a66d9f6c9b53a2cb058e1c493535ee18c3965a62d6ff728cc0f9544c35fbdf56f18024c778c242802f961259231e153cdcd98c867bec84a80ca3541dbcf455
-DIST spyder-kernels-1.10.1-gh.tar.gz 78055 BLAKE2B 51b087d44ef91bc79b10edb12054a2dd6d950b43f39f783f91be4a7681d40c1aa777514517d3b8e9de6fa8c03dbd23ec7a0c46dd9901102bcd06107af51f960d SHA512 f7504691143aff043e39bcab479d1aa76e5814670e081472dde719936f840b3f5e7812575fd829b34301ccdf7f1cd32afb705d37ee452f3e3a691e12bb57965a
 DIST spyder-kernels-1.10.2-gh.tar.gz 78924 BLAKE2B 47f0ec284f54590ee9c5a43caeeea61b644fccc6d6222dfbf85187beb9cc141504082dbf50d1d85f5315c8e8e46b9f810253d904b594bb4c52677271b0f7f12d SHA512 4bcbc2646493f384a3f5fad1cc2a42bbe1d06c5225362beb995a73e3c1abe482f3855d844c449b07631b4ffda99492ccbd3cbe69c515ed38d6a98913bea90e2d
diff --git a/dev-python/spyder-kernels/spyder-kernels-1.10.1.ebuild b/dev-python/spyder-kernels/spyder-kernels-1.10.1.ebuild
deleted file mode 100644
index 9894ffa10087..000000000000
--- a/dev-python/spyder-kernels/spyder-kernels-1.10.1.ebuild
+++ /dev/null
@@ -1,47 +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="Kernels used by spyder on its ipython console"
-HOMEPAGE="https://github.com/spyder-ide/spyder-kernels/
-	https://pypi.org/project/spyder-kernels/"
-SRC_URI="https://github.com/spyder-ide/${PN}/archive/v${PV}.tar.gz -> ${P}-gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="dev-python/cloudpickle[${PYTHON_USEDEP}]
-	>=dev-python/ipykernel-5.1.3[${PYTHON_USEDEP}]
-	>=dev-python/ipython-7.6.0[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_client-5.3.4[${PYTHON_USEDEP}]
-	>=dev-python/pyzmq-17[${PYTHON_USEDEP}]
-	>=dev-python/wurlitzer-1.0.3[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	test? (
-		dev-python/cython[${PYTHON_USEDEP}]
-		dev-python/flaky[${PYTHON_USEDEP}]
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pandas[${PYTHON_USEDEP}]
-		dev-python/scipy[${PYTHON_USEDEP}]
-		dev-python/xarray[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# requires dask[distributed] while we last-rited distributed
-	sed -i -e 's:test_dask_multiprocessing:_&:' \
-				spyder_kernels/console/tests/test_console_kernel.py || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/spyder/Manifest b/dev-python/spyder/Manifest
index 9b69956c3712..698714fe150c 100644
--- a/dev-python/spyder/Manifest
+++ b/dev-python/spyder/Manifest
@@ -1,5 +1,4 @@
 DIST spyder-4.2.0.tar.gz 11840358 BLAKE2B 26e4cd9865196fb39fa5b49a17f172b3000fe27c5ab6fb1b31ed56d41f118e4016b6ed97ce8cb1b39c65031fc11413f8e426876d3dc8d5af25f12428d0e0c481 SHA512 c1460e2fe9a37c0e6107657de71205682018d87737b3eac16ec92c32d979bf727a6c8955bd2700872b6e91159d1a1efc57cdea52ffc44604fe34b78094de6e7f
-DIST spyder-4.2.1.tar.gz 12156626 BLAKE2B 4a009c8b2ebe1b71bb60c568d5e6a3d7616fba7f9988669e97a2454b6369421a8603495271ad4c275cae9ad7207f2666b28ecccb121b4cc5554a3d1a863a1579 SHA512 56975e851a05dd023d851adaff8e9a747f9b1aa626db8ce65f805e41c5c47dba017332e81bf9efaae65671e06bc7632a519def286568a8ed2f48b41aa285de62
 DIST spyder-4.2.3.tar.gz 11539371 BLAKE2B aecd2e9772c52e644e9c0503195e380fffecdfaa5aea3f00a64e98a969faf3de4e0d8eb0515cc59893f28deb7733403826e90e36006ad7f8f4d67e8ef5e64543 SHA512 9e56efab8862c21e7496d45e813d28c4e9be583275352b0a6e0a58e99f6c0234fa9862da66705839beacb971dde9b6edc253405d9d62853a3c4c9c9991844846
 DIST spyder-docs-5c9c8a3317045c2d301e05b751943be9b521d129.tar.gz 66692311 BLAKE2B ec741a9cd830bc8a5776be1d52dcac9649c8abf33faec0ac8741d95625d8aeda2b8c0d2bdbef02c068a22ec62a4d5281a48e996530e1bd2e6de43b86e0a14ffe SHA512 73bd05ef31f69ebd80bb488017998536c4ed0e63a331efe743d9d858b936df287253f333d09beac6d2b249a96e8f82538d321850a64b0941db3d0141122995eb
 DIST spyder-docs-7fbdabcbc37fe696e4ad5604cdbf4023dfbe8b6c.tar.gz 58822544 BLAKE2B 9ddd662eb0e3b2845a15bc38a0ab994fcf43824a560cf635a29e16b5eb66407706a412ea50a2f8e5c0212675df3422ece649bd1e50e3ecd1c34ee5727f8a2df9 SHA512 ab30f287733681da0b1d15656a44cd320401330309efbff8f0a89f59a15d5c57532a2eab3e8353d8c3856eac0a393385a852663d6698d0a0d309def21d13933d
diff --git a/dev-python/spyder/spyder-4.2.1.ebuild b/dev-python/spyder/spyder-4.2.1.ebuild
deleted file mode 100644
index 180246ee9663..000000000000
--- a/dev-python/spyder/spyder-4.2.1.ebuild
+++ /dev/null
@@ -1,241 +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 optfeature xdg distutils-r1
-
-# Commit of documentation to fetch
-DOCS_PV="5c9c8a3317045c2d301e05b751943be9b521d129"
-
-DESCRIPTION="The Scientific Python Development Environment"
-HOMEPAGE="
-	https://www.spyder-ide.org/
-	https://github.com/spyder-ide/spyder/
-	https://pypi.org/project/spyder/
-"
-SRC_URI="https://github.com/spyder-ide/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	https://github.com/spyder-ide/${PN}-docs/archive/${DOCS_PV}.tar.gz -> ${PN}-docs-${DOCS_PV}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-# The test suite often hangs or does not work.
-# Technically spyder requires pyqt5<13, which
-# we do not have in ::gentoo any more. Likely
-# this is the reason many of the tests fail
-# or hang. RESTRICTing because IMO it is
-# not worth the several hours I spend every
-# single version bump checking which tests
-# do and do not work. Spyder itself works
-# fine with pyqt5>13.
-RESTRICT="test"
-
-# White space separated deps are expansion of python-language-server[all] dep
-# As the pyls ebuild does not add flags for optional runtime dependencies
-# we have to manually specify these desp instead of just depending on the [all]
-# flag. The indentation allows us to distinguish them from spyders direct deps.
-RDEPEND="
-	>=dev-python/atomicwrites-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/chardet-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/cloudpickle-0.5.0[${PYTHON_USEDEP}]
-	dev-util/cookiecutter[${PYTHON_USEDEP}]
-	>=dev-python/diff-match-patch-20181111[${PYTHON_USEDEP}]
-	>=dev-python/intervaltree-3.0.2[${PYTHON_USEDEP}]
-	>=dev-python/ipython-7.6.0[${PYTHON_USEDEP}]
-	~dev-python/jedi-0.17.2[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}]
-	>=dev-python/keyring-17.0.0[${PYTHON_USEDEP}]
-	>=dev-python/nbconvert-4.0[${PYTHON_USEDEP}]
-	>=dev-python/numpydoc-0.6.0[${PYTHON_USEDEP}]
-	~dev-python/parso-0.7.0[${PYTHON_USEDEP}]
-	>=dev-python/pexpect-4.4.0[${PYTHON_USEDEP}]
-	>=dev-python/pickleshare-0.4[${PYTHON_USEDEP}]
-	>=dev-python/psutil-5.3[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.0[${PYTHON_USEDEP}]
-	>=dev-python/pylint-1.0[${PYTHON_USEDEP}]
-	>=dev-python/python-language-server-0.36.2[${PYTHON_USEDEP}]
-
-	dev-python/autopep8[${PYTHON_USEDEP}]
-	>=dev-python/flake8-3.8.0[${PYTHON_USEDEP}]
-	>=dev-python/mccabe-0.6.0[${PYTHON_USEDEP}]
-	<dev-python/mccabe-0.7.0[${PYTHON_USEDEP}]
-	>=dev-python/pycodestyle-2.6.0[${PYTHON_USEDEP}]
-	<dev-python/pycodestyle-2.7.0[${PYTHON_USEDEP}]
-	>=dev-python/pydocstyle-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/pyflakes-2.2.0[${PYTHON_USEDEP}]
-	<dev-python/pyflakes-2.3.0[${PYTHON_USEDEP}]
-	dev-python/pylint[${PYTHON_USEDEP}]
-	>=dev-python/rope-0.10.5[${PYTHON_USEDEP}]
-	dev-python/yapf[${PYTHON_USEDEP}]
-
-	<dev-python/python-language-server-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/pyls-black-0.4.6[${PYTHON_USEDEP}]
-	>=dev-python/pyls-spyder-0.3.0[${PYTHON_USEDEP}]
-	>=dev-python/pyxdg-0.26[${PYTHON_USEDEP}]
-	>=dev-python/pyzmq-17.0.0[${PYTHON_USEDEP}]
-	>=dev-python/qdarkstyle-2.8[${PYTHON_USEDEP}]
-	>=dev-python/qtawesome-0.5.7[${PYTHON_USEDEP}]
-	>=dev-python/qtconsole-5.0.1[${PYTHON_USEDEP}]
-	>=dev-python/QtPy-1.5.0[${PYTHON_USEDEP},svg,webengine]
-	>=dev-python/sphinx-0.6.6[${PYTHON_USEDEP}]
-	>=dev-python/spyder-kernels-1.10.1[${PYTHON_USEDEP}]
-	<dev-python/spyder-kernels-1.11.0[${PYTHON_USEDEP}]
-	>=dev-python/textdistance-4.2.0[${PYTHON_USEDEP}]
-	>=dev-python/three-merge-0.1.1[${PYTHON_USEDEP}]
-	>=dev-python/watchdog-0.10.3[${PYTHON_USEDEP}]
-"
-
-BDEPEND="test? (
-	dev-python/cython[${PYTHON_USEDEP}]
-	dev-python/flaky[${PYTHON_USEDEP}]
-	dev-python/matplotlib[tk,${PYTHON_USEDEP}]
-	dev-python/mock[${PYTHON_USEDEP}]
-	dev-python/pandas[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	<dev-python/pytest-6.0[${PYTHON_USEDEP}]
-	dev-python/pytest-lazy-fixture[${PYTHON_USEDEP}]
-	dev-python/pytest-mock[${PYTHON_USEDEP}]
-	dev-python/pytest-ordering[${PYTHON_USEDEP}]
-	dev-python/pytest-qt[${PYTHON_USEDEP}]
-	dev-python/pytest-xvfb[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/scipy[${PYTHON_USEDEP}]
-	dev-python/sympy[${PYTHON_USEDEP}]
-)"
-
-# Based on the courtesy of Arfrever
-# This patch removes a call to update-desktop-database during build
-# This fails because access is denied to this command during build
-PATCHES=(
-	"${FILESDIR}/${PN}-4.2.1-build.patch"
-	"${FILESDIR}/${PN}-4.1.5-doc-theme-renamed.patch"
-)
-
-DOCS=(
-	"AUTHORS.txt"
-	"Announcements.md"
-	"CHANGELOG.md"
-	"CODE_OF_CONDUCT.md"
-	"CONTRIBUTING.md"
-	"NOTICE.txt"
-	"README.md"
-	"RELEASE.md"
-)
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs/doc dev-python/sphinx-panels dev-python/pydata-sphinx-theme dev-python/sphinx-multiversion
-
-python_prepare_all() {
-	# move docs into workdir
-	mv ../spyder-docs-${DOCS_PV}* docs || die
-
-	# these deps are packaged separately: dev-python/spyder-kernels, dev-python/python-language-server
-	rm external-deps/* -r || die
-	# runs against things packaged in external-deps dir
-	rm conftest.py || die
-
-	# do not depend on pyqt5<13
-	sed -i -e '/pyqt5/d' \
-		-e '/pyqtwebengine/d' \
-			setup.py || die
-
-	# do not check deps, fails because we removed pyqt5 dependency above
-	sed -i -e 's:test_dependencies_for_spyder_setup_install_requires_in_sync:_&:' \
-		spyder/tests/test_dependencies_in_sync.py || die
-
-	# can't check for update, need network
-	rm spyder/workers/tests/test_update.py || die
-
-	# skip online test
-	rm spyder/widgets/github/tests/test_github_backend.py || die
-
-	# KeyError: 'conda: base', need conda??
-	sed -i -e 's:test_status_bar_conda_interpreter_status:_&:' \
-		spyder/widgets/tests/test_status.py || die
-
-	# assert 2 == 1
-	sed -i -e 's:test_pylint_max_history_conf:_&:' \
-		spyder/plugins/pylint/tests/test_pylint.py || die
-
-	# https://bugs.gentoo.org/747211
-	sed -i -e 's:test_loaded_and_closed_signals:_&:' \
-		spyder/plugins/projects/tests/test_plugin.py || die
-
-	# AssertionError: assert '' == 'This is some test text!'
-	sed -i -e 's:test_tab_copies_find_to_replace:_&:' \
-		spyder/plugins/editor/widgets/tests/test_editor.py || die
-
-	# hangs till forever
-	sed -i -e 's:test_help_opens_when_show_tutorial_full:_&:' \
-		spyder/app/tests/test_mainwindow.py || die
-
-	# Assertion error, can't connect/remember inside ebuild environment
-	rm spyder/plugins/ipythonconsole/widgets/tests/test_kernelconnect.py || die
-
-	# AssertionError: waitUntil timed out in 20000 miliseconds
-	sed -i -e 's:test_pdb_multiline:_&:' \
-		spyder/plugins/ipythonconsole/tests/test_ipythonconsole.py || die
-
-	# AssertionError: assert 'if True:\n    0\n    ' == 'if True:\n    0'
-	sed -i -e 's:test_undo_return:_&:' \
-		spyder/plugins/editor/widgets/tests/test_codeeditor.py || die
-
-	# assert False is True
-	sed -i -e 's:test_range_indicator_visible_on_hover_only:_&:' \
-		spyder/plugins/editor/panels/tests/test_scrollflag.py || die
-
-	# AssertionError: waitUntil timed out in 10000 miliseconds
-	sed -i -e 's:test_get_hints:_&:' \
-		spyder/plugins/editor/widgets/tests/test_hints_and_calltips.py || die
-
-	# Fatal Python error: Aborted
-	sed -i -e 's:test_module_completion:_&:' \
-		spyder/utils/introspection/tests/test_modulecompletion.py || die
-
-	# assert 0 > 0
-	sed -i -e 's:test_maininterpreter_page:_&:' \
-		spyder/preferences/tests/test_config_dialog.py || die
-
-	# This hangs forever
-	sed -i -e 's:test_load_kernel_file:_&:' \
-		-e 's:test_load_kernel_file_from_location:_&:' \
-		-e 's:test_load_kernel_file_from_id:_&:' \
-		spyder/plugins/ipythonconsole/tests/test_ipythonconsole.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-# Calling pytest directly makes the tests freeze after completing even if successful
-# Exit code is nonzero even upon success, so can't add || die here
-# test results should be checked for success manually
-python_test() {
-	${EPYTHON} runtests.py
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	elog "To get additional features, optional runtime dependencies may be installed:"
-		optfeature "2D/3D plotting in the Python and IPython consoles" dev-python/matplotlib
-		optfeature "View and edit DataFrames and Series in the Variable Explorer" dev-python/pandas
-		optfeature "View and edit two or three dimensional arrays in the Variable Explorer" dev-python/numpy
-		optfeature "Symbolic mathematics in the IPython console" dev-python/sympy
-		optfeature "Import Matlab workspace files in the Variable Explorer" dev-python/scipy
-		optfeature "Run Cython files in the IPython console" dev-python/cython
-		optfeature "The hdf5/h5py plugin" dev-python/h5py
-		optfeature "The line profiler plugin" dev-python/spyder-line-profiler
-		optfeature "The memory profiler plugin" dev-python/spyder-memory-profiler
-		# spyder-autopep8 does not have a release (yet)
-		# and are not compatible with >=spyder-4.0.0 at the moment
-		# optfeature "The autopep8 plugin" dev-python/spyder-autopep8
-		optfeature "Vim key bindings" dev-python/spyder-vim
-		optfeature "Unittest support" dev-python/spyder-unittest
-		optfeature "Jupyter notebook support" dev-python/spyder-notebook
-		optfeature "System terminal inside spyder" dev-python/spyder-terminal
-		# spyder-reports not yet updated to >=spyder-4.0.0
-		# optfeature "Markdown reports using Pweave" dev-python/spyder-reports
-}
diff --git a/dev-python/sqlalchemy/Manifest b/dev-python/sqlalchemy/Manifest
index 3e9376233740..1853bfa609d8 100644
--- a/dev-python/sqlalchemy/Manifest
+++ b/dev-python/sqlalchemy/Manifest
@@ -5,3 +5,4 @@ DIST SQLAlchemy-1.3.22.tar.gz 6300186 BLAKE2B 5b788ddadef0b68f440c5c7584320dd0a7
 DIST SQLAlchemy-1.3.23.tar.gz 6313652 BLAKE2B e87f67ee7ee70036b94e1708c1a59f58b1f8abad23aa26c74e2a9a2172bee5a6411b2be95bff0f1c6e39d3a0de0839adc6b43f4cde597a18d4cf930e4c37b11e SHA512 dcd1a0878fd58ee49691bb7e8a2571cb40cc942380a4fe0e66d3abb1723830f178e7b3944c5c2d69bd3aaff04cd2ca171bbabbe34f59f54bcf4b9ee2782f9570
 DIST SQLAlchemy-1.4.0.tar.gz 7440276 BLAKE2B dce64f2a5fe2b67be2a6d79680a774603005773ce93d0a03e6180b9bf7f3105a8b3bca88a2b4a3bcf15305a8271fc45a2bf22d9776ffa49c2d03c586095e7174 SHA512 03d66e96f3a1358b5e68e49ec47c3cfbd6daff86505d4dd7e9f65967f8566f1a55fa4b896dd95109e0c4dbd2684579e12c35bdeb7076d6c06af683b55736cd9e
 DIST SQLAlchemy-1.4.1.tar.gz 7450731 BLAKE2B 9868347a3ccc3519fe31cfca41f318d0b0832aa301c7c91a073fd877f5c29289aa91008feb31096a62a939e70eded88ee21bfc586d09f68ebff4f48ef4e50c8e SHA512 8d2f84aa7edfec65a1f2286210c8728c39f1411da1b0cb6f60cf6345fc692646ae4f2a062b2e4b2f04fe9000678d682c939645f7affbe518821299ae129e8ea8
+DIST SQLAlchemy-1.4.2.tar.gz 7464092 BLAKE2B dd4cf617a66ed4eba54e41ebaead189409e09e434bdfe8e6f71e2fd4bd9ea574acef8feb42290a3fe80f602d2de2160b075633449b0b543e44b44f0fc7c867bc SHA512 b436576d6c72d0ec285b926f5741b6bdba14fa959248be1c4bdcc8b87dfc512653e48fb2d356ab85d0e90a374c48de5311f43f4f3ce6cb64876e1316c6169423
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.4.2.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.4.2.ebuild
new file mode 100644
index 000000000000..0fbc06cc3427
--- /dev/null
+++ b/dev-python/sqlalchemy/sqlalchemy-1.4.2.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} pypy3 )
+PYTHON_REQ_USE="sqlite?"
+
+inherit distutils-r1 multiprocessing optfeature
+
+MY_PN="SQLAlchemy"
+MY_P="${MY_PN}-${PV/_beta/b}"
+
+DESCRIPTION="Python SQL toolkit and Object Relational Mapper"
+HOMEPAGE="https://www.sqlalchemy.org/ https://pypi.org/project/SQLAlchemy/"
+SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="examples +sqlite test"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/importlib_metadata[${PYTHON_USEDEP}]
+	' python3_7 pypy3)
+"
+# Use pytest-xdist to speed up tests
+BDEPEND="
+	test? (
+		$(python_gen_impl_dep sqlite)
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	# Disable tests hardcoding function call counts specific to Python versions.
+	epytest --ignore test/aaa_profiling \
+		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
+}
+
+python_install_all() {
+	if use examples; then
+		docompress -x "/usr/share/doc/${PF}/examples"
+		dodoc -r examples
+	fi
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature "MySQL support" dev-python/mysqlclient dev-python/pymysql \
+		dev-python/mysql-connector-python
+	optfeature "mssql support" dev-python/pymssql
+	optfeature "postgresql support" dev-python/psycopg:2
+}
diff --git a/dev-python/tikzplotlib/Manifest b/dev-python/tikzplotlib/Manifest
index c1a7e0846ef9..9579a28104af 100644
--- a/dev-python/tikzplotlib/Manifest
+++ b/dev-python/tikzplotlib/Manifest
@@ -1,3 +1 @@
-DIST tikzplotlib-0.9.6.tar.gz 589081 BLAKE2B aacd1374caed3dc86e6a93479b7ed0d0a79a2f96acc3817e630860794dc2f77c0d908d5765ebd500160d8c459b51131645f3633a084627b55aa2f26f5de87add SHA512 447dcd9da8d5cebf68b9f1a1f06d82370d5adf731524ea17c4f570bfd76dfce06e65f92df0ead732a02b42d9bdf6d0fde9e004bff50204cc5e33cca6c014a257
-DIST tikzplotlib-0.9.7.tar.gz 589052 BLAKE2B 2960ca341364c003e6c708fa967209c4ab13847f2b7524b926985d73ab146777b314e3df2066c8dcab2ff4c1eb8a46dc4a89f1b85578650cde8c9fb5de5743e9 SHA512 0903f774e3f95612b9b68b4e2254f2c0403e5c603dd41445e359587c4e917c373a12485bc0b8ba30b354eb7b93bb754531489c898dbc4479466c071a2f9b0f3d
 DIST tikzplotlib-0.9.8.tar.gz 589858 BLAKE2B 81bb2ece7d3f5976d928095caa3d8d51b619c97a4b36eea14f4b4477d31e78a978c2eeab81e9829bb9113e70f0035a572a82a229fea61ee08530d57334fda986 SHA512 a2b25d9820fd8185d4e7a03fb0669fa4c9b35aac9b371b0a873174d615bd40615f1fafa4208d2019af0b7ffe80a8eec6b56ad6075104f6c3a4f8f237ad5b4466
diff --git a/dev-python/tikzplotlib/tikzplotlib-0.9.6.ebuild b/dev-python/tikzplotlib/tikzplotlib-0.9.6.ebuild
deleted file mode 100644
index f99c56463f50..000000000000
--- a/dev-python/tikzplotlib/tikzplotlib-0.9.6.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 2019-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 virtualx
-
-DESCRIPTION="Convert matplotlib figures into TikZ/PGFPlots"
-HOMEPAGE="https://github.com/nschloe/tikzplotlib"
-SRC_URI="https://github.com/nschloe/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	app-text/texlive[extra]
-	$( python_gen_cond_dep \
-		'dev-python/importlib_metadata[${PYTHON_USEDEP}]' python3_7 )
-	dev-python/matplotlib[latex,${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	dev-python/wheel[${PYTHON_USEDEP}]
-	test? (
-		dev-python/exdown[${PYTHON_USEDEP}]
-		dev-python/pandas[${PYTHON_USEDEP}]
-		dev-python/scipy[${PYTHON_USEDEP}]
-)"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx doc dev-python/mock
-
-python_prepare_all() {
-	# setup.py was removed in commit f04323cfa575caf8a25a9236f55fe6baf1a33b20
-	# for some reason, DISTUTULS_USE_SETUPTOOLS="pyproject.toml" is not working
-	# it complains about file not found, setup.cfg does exist
-
-	cat > setup.py <<EOF || die
-from setuptools import setup
-
-if __name__ == "__main__":
-	setup()
-EOF
-
-	# Lots of TeX errors
-	rm test/test_patches.py || die
-	rm test/test_context.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	local -x MPLBACKEND=Agg
-	virtx pytest -vv
-}
diff --git a/dev-python/tikzplotlib/tikzplotlib-0.9.7.ebuild b/dev-python/tikzplotlib/tikzplotlib-0.9.7.ebuild
deleted file mode 100644
index 1c9c50e34e33..000000000000
--- a/dev-python/tikzplotlib/tikzplotlib-0.9.7.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=pyproject.toml
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="Convert matplotlib figures into TikZ/PGFPlots"
-HOMEPAGE="https://github.com/nschloe/tikzplotlib"
-SRC_URI="https://github.com/nschloe/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	app-text/texlive[extra]
-	$( python_gen_cond_dep \
-		'dev-python/importlib_metadata[${PYTHON_USEDEP}]' python3_7 )
-	dev-python/matplotlib[latex,${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	dev-python/wheel[${PYTHON_USEDEP}]
-	test? (
-		dev-python/exdown[${PYTHON_USEDEP}]
-		dev-python/pandas[${PYTHON_USEDEP}]
-		dev-python/scipy[${PYTHON_USEDEP}]
-)"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx doc dev-python/mock
-
-python_test() {
-	local -x MPLBACKEND=Agg
-	virtx pytest -vv
-}
diff --git a/dev-python/wcmatch/Manifest b/dev-python/wcmatch/Manifest
index 6b6eb91b6794..bbf3b1638603 100644
--- a/dev-python/wcmatch/Manifest
+++ b/dev-python/wcmatch/Manifest
@@ -1,7 +1 @@
-DIST wcmatch-7.1.tar.gz 105744 BLAKE2B 0add1c68025c92ac57d6ea64d82bddb20bace60de5d319fb16e16802f208d788d876695bfcd186b80630039f544565c631d36e1c7327dee5d8c799eff8c80ce2 SHA512 79d62d85f13d245e38d0fe92a275e24058b86af8aaf9a926bfd950dad4ec47e40e763c18b08d3eb4ddd925832ae9910f13407094070442b41dbe2fe4ad11fb39
-DIST wcmatch-7.2.tar.gz 105087 BLAKE2B a28bd9d02468f3ca83d606ee7f7d5c9b6b8883cf6e0c04b711765aefafce189f7f524a490c6831a739b579be66af5f4b1c7b6373da22e170211e611677c5788f SHA512 6fdc0a3cb6d66b323c509a5ee34c1e8df9a46a93fd1fc0921dfdbc17ac604934fdad3df5e8f253aa6a880bea2e81bb26ec097b9503c920433c5827ea91b327d8
-DIST wcmatch-8.0.1.tar.gz 105948 BLAKE2B efa23d89f01b91dfb06885a9dcce94622c76e889fa7a0d8ed839cba1eafac4bd3bd1f9a8ccd95d0c7f3a6d990346de2df2bed05a1ac092b07076c548e61b77f0 SHA512 ae99df5ea8f2d1c9e0e120ba23c36dd7b0b13832e5ee599cf08dee2c93f624bab550d937743a3063fac8cce6ce18f56582380521aa3860f220abdcbfe9461dec
-DIST wcmatch-8.0.tar.gz 105910 BLAKE2B 228295a28511ac8c534feed31459dc3e75316febc377473de6d30075886cf33262d6f97931c134b5aaef9109216a4b50383e884e9f3f370849e8a1ac5af5999a SHA512 94bd02e02d544746b678704bd77c1252bd569f1030316e2617f340ee81266dcba398a1a6a15d9460203e681a4825a853cbebee3681d8d338a17ef9ae8d9a03ce
-DIST wcmatch-8.1.1.tar.gz 111931 BLAKE2B 0ec1bac5b26d3f45dac1b24eb3994b803e2297d064277965f6f46e23db3841f008dd6d9ebe7914c68e9c4733c5455cdcdb9652be0f6a1dc3674eaaa28666a91b SHA512 1e31a2a9edf25a7d7e64f8e64a6d8b5e00595ce4c9ac4780f073a2c8d0c123d33860f0843c8313de51478e927746f5b56902afda7b1dee0784dfb3231eb807b7
 DIST wcmatch-8.1.2.tar.gz 112726 BLAKE2B 4d91425f30e81f1ff3449b364b74f242b7393b7a4a162538e57406f9d5cc05d24277d6c0119c40266d4474c9c99919ade8d0450b1999abb39077ffc64f495719 SHA512 f96fc646db334407229ee9885b308eb2b27967d9b4e4245df33641605af678f3edfb54f53c5c8722b946029d39779fcd775299963530036c723cfa860dcfff38
-DIST wcmatch-8.1.tar.gz 111866 BLAKE2B c896c67437e28faa0accc47f2faacedfcd9baf8f3c795f4c4429eb91bc22c0e71668db58979ee81356d5ead73e244ac2d13053ef421b8e212efd3a3feadc4eae SHA512 fdb06c46d6ea83f02f2a4ac8743431d1b7821188a6ad9f845c583707091cbfd1231d1970ba3cea92e993583ed91ee314f04240dcb9285f6bb5624bd4dbae8743
diff --git a/dev-python/wcmatch/wcmatch-7.1.ebuild b/dev-python/wcmatch/wcmatch-7.1.ebuild
deleted file mode 100644
index 93df4e72467d..000000000000
--- a/dev-python/wcmatch/wcmatch-7.1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-
-DOCS_BUILDER="mkdocs"
-DOCS_DEPEND="
-	~dev-python/mkdocs_pymdownx_material_extras-1.0.7
-	dev-python/mkdocs-material
-	dev-python/mkdocs-git-revision-date-localized-plugin
-	dev-python/mkdocs-minify-plugin
-	dev-python/pyspelling
-"
-
-inherit distutils-r1 docs
-
-DESCRIPTION="Wildcard/glob file name matcher"
-HOMEPAGE="
-	https://github.com/facelessuser/wcmatch
-	https://pypi.org/project/wcmatch"
-SRC_URI="https://github.com/facelessuser/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-python/backrefs-4.1[${PYTHON_USEDEP}]
-	>=dev-python/bracex-2.0[${PYTHON_USEDEP}]
-"
-
-BDEPEND="test? (
-	dev-python/mock[${PYTHON_USEDEP}]
-	dev-vcs/git
-)"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# no such file or dir ~homedir
-	sed -i -e 's:test_tilde_user:_&:' \
-		tests/test_glob.py || die
-
-	# mkdocs-git-revision-date-localized-plugin needs git repo
-	if use doc; then
-		git init || die
-		git config --global user.email "you@example.com" || die
-		git config --global user.name "Your Name" || die
-		git add . || die
-		git commit -m 'init' || die
-	fi
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/wcmatch/wcmatch-7.2.ebuild b/dev-python/wcmatch/wcmatch-7.2.ebuild
deleted file mode 100644
index d1d3030699ea..000000000000
--- a/dev-python/wcmatch/wcmatch-7.2.ebuild
+++ /dev/null
@@ -1,61 +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} )
-
-DOCS_BUILDER="mkdocs"
-DOCS_DEPEND="
-	~dev-python/mkdocs_pymdownx_material_extras-1.0.7
-	dev-python/mkdocs-material
-	dev-python/mkdocs-git-revision-date-localized-plugin
-	dev-python/mkdocs-minify-plugin
-	dev-python/pyspelling
-"
-
-inherit distutils-r1 docs
-
-DESCRIPTION="Wildcard/glob file name matcher"
-HOMEPAGE="
-	https://github.com/facelessuser/wcmatch/
-	https://pypi.org/project/wcmatch/"
-SRC_URI="https://github.com/facelessuser/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-python/backrefs-4.1[${PYTHON_USEDEP}]
-	>=dev-python/bracex-2.0[${PYTHON_USEDEP}]
-"
-
-BDEPEND="test? (
-	dev-python/mock[${PYTHON_USEDEP}]
-	dev-vcs/git
-)"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# this test makes a really wrong assumption that basename of $HOME
-	# will be a username
-	sed -i -e 's:test_tilde_user:_&:' \
-		tests/test_glob.py || die
-
-	# tests require some files in homedir
-	> "${HOME}"/test1.txt || die
-	> "${HOME}"/test2.txt || die
-
-	# mkdocs-git-revision-date-localized-plugin needs git repo
-	if use doc; then
-		git init || die
-		git config --global user.email "you@example.com" || die
-		git config --global user.name "Your Name" || die
-		git add . || die
-		git commit -m 'init' || die
-	fi
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/wcmatch/wcmatch-8.0.1.ebuild b/dev-python/wcmatch/wcmatch-8.0.1.ebuild
deleted file mode 100644
index d1d3030699ea..000000000000
--- a/dev-python/wcmatch/wcmatch-8.0.1.ebuild
+++ /dev/null
@@ -1,61 +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} )
-
-DOCS_BUILDER="mkdocs"
-DOCS_DEPEND="
-	~dev-python/mkdocs_pymdownx_material_extras-1.0.7
-	dev-python/mkdocs-material
-	dev-python/mkdocs-git-revision-date-localized-plugin
-	dev-python/mkdocs-minify-plugin
-	dev-python/pyspelling
-"
-
-inherit distutils-r1 docs
-
-DESCRIPTION="Wildcard/glob file name matcher"
-HOMEPAGE="
-	https://github.com/facelessuser/wcmatch/
-	https://pypi.org/project/wcmatch/"
-SRC_URI="https://github.com/facelessuser/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-python/backrefs-4.1[${PYTHON_USEDEP}]
-	>=dev-python/bracex-2.0[${PYTHON_USEDEP}]
-"
-
-BDEPEND="test? (
-	dev-python/mock[${PYTHON_USEDEP}]
-	dev-vcs/git
-)"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# this test makes a really wrong assumption that basename of $HOME
-	# will be a username
-	sed -i -e 's:test_tilde_user:_&:' \
-		tests/test_glob.py || die
-
-	# tests require some files in homedir
-	> "${HOME}"/test1.txt || die
-	> "${HOME}"/test2.txt || die
-
-	# mkdocs-git-revision-date-localized-plugin needs git repo
-	if use doc; then
-		git init || die
-		git config --global user.email "you@example.com" || die
-		git config --global user.name "Your Name" || die
-		git add . || die
-		git commit -m 'init' || die
-	fi
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/wcmatch/wcmatch-8.0.ebuild b/dev-python/wcmatch/wcmatch-8.0.ebuild
deleted file mode 100644
index d1d3030699ea..000000000000
--- a/dev-python/wcmatch/wcmatch-8.0.ebuild
+++ /dev/null
@@ -1,61 +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} )
-
-DOCS_BUILDER="mkdocs"
-DOCS_DEPEND="
-	~dev-python/mkdocs_pymdownx_material_extras-1.0.7
-	dev-python/mkdocs-material
-	dev-python/mkdocs-git-revision-date-localized-plugin
-	dev-python/mkdocs-minify-plugin
-	dev-python/pyspelling
-"
-
-inherit distutils-r1 docs
-
-DESCRIPTION="Wildcard/glob file name matcher"
-HOMEPAGE="
-	https://github.com/facelessuser/wcmatch/
-	https://pypi.org/project/wcmatch/"
-SRC_URI="https://github.com/facelessuser/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-python/backrefs-4.1[${PYTHON_USEDEP}]
-	>=dev-python/bracex-2.0[${PYTHON_USEDEP}]
-"
-
-BDEPEND="test? (
-	dev-python/mock[${PYTHON_USEDEP}]
-	dev-vcs/git
-)"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# this test makes a really wrong assumption that basename of $HOME
-	# will be a username
-	sed -i -e 's:test_tilde_user:_&:' \
-		tests/test_glob.py || die
-
-	# tests require some files in homedir
-	> "${HOME}"/test1.txt || die
-	> "${HOME}"/test2.txt || die
-
-	# mkdocs-git-revision-date-localized-plugin needs git repo
-	if use doc; then
-		git init || die
-		git config --global user.email "you@example.com" || die
-		git config --global user.name "Your Name" || die
-		git add . || die
-		git commit -m 'init' || die
-	fi
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/wcmatch/wcmatch-8.1.1.ebuild b/dev-python/wcmatch/wcmatch-8.1.1.ebuild
deleted file mode 100644
index d1d3030699ea..000000000000
--- a/dev-python/wcmatch/wcmatch-8.1.1.ebuild
+++ /dev/null
@@ -1,61 +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} )
-
-DOCS_BUILDER="mkdocs"
-DOCS_DEPEND="
-	~dev-python/mkdocs_pymdownx_material_extras-1.0.7
-	dev-python/mkdocs-material
-	dev-python/mkdocs-git-revision-date-localized-plugin
-	dev-python/mkdocs-minify-plugin
-	dev-python/pyspelling
-"
-
-inherit distutils-r1 docs
-
-DESCRIPTION="Wildcard/glob file name matcher"
-HOMEPAGE="
-	https://github.com/facelessuser/wcmatch/
-	https://pypi.org/project/wcmatch/"
-SRC_URI="https://github.com/facelessuser/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-python/backrefs-4.1[${PYTHON_USEDEP}]
-	>=dev-python/bracex-2.0[${PYTHON_USEDEP}]
-"
-
-BDEPEND="test? (
-	dev-python/mock[${PYTHON_USEDEP}]
-	dev-vcs/git
-)"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# this test makes a really wrong assumption that basename of $HOME
-	# will be a username
-	sed -i -e 's:test_tilde_user:_&:' \
-		tests/test_glob.py || die
-
-	# tests require some files in homedir
-	> "${HOME}"/test1.txt || die
-	> "${HOME}"/test2.txt || die
-
-	# mkdocs-git-revision-date-localized-plugin needs git repo
-	if use doc; then
-		git init || die
-		git config --global user.email "you@example.com" || die
-		git config --global user.name "Your Name" || die
-		git add . || die
-		git commit -m 'init' || die
-	fi
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/wcmatch/wcmatch-8.1.ebuild b/dev-python/wcmatch/wcmatch-8.1.ebuild
deleted file mode 100644
index d1d3030699ea..000000000000
--- a/dev-python/wcmatch/wcmatch-8.1.ebuild
+++ /dev/null
@@ -1,61 +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} )
-
-DOCS_BUILDER="mkdocs"
-DOCS_DEPEND="
-	~dev-python/mkdocs_pymdownx_material_extras-1.0.7
-	dev-python/mkdocs-material
-	dev-python/mkdocs-git-revision-date-localized-plugin
-	dev-python/mkdocs-minify-plugin
-	dev-python/pyspelling
-"
-
-inherit distutils-r1 docs
-
-DESCRIPTION="Wildcard/glob file name matcher"
-HOMEPAGE="
-	https://github.com/facelessuser/wcmatch/
-	https://pypi.org/project/wcmatch/"
-SRC_URI="https://github.com/facelessuser/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-python/backrefs-4.1[${PYTHON_USEDEP}]
-	>=dev-python/bracex-2.0[${PYTHON_USEDEP}]
-"
-
-BDEPEND="test? (
-	dev-python/mock[${PYTHON_USEDEP}]
-	dev-vcs/git
-)"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# this test makes a really wrong assumption that basename of $HOME
-	# will be a username
-	sed -i -e 's:test_tilde_user:_&:' \
-		tests/test_glob.py || die
-
-	# tests require some files in homedir
-	> "${HOME}"/test1.txt || die
-	> "${HOME}"/test2.txt || die
-
-	# mkdocs-git-revision-date-localized-plugin needs git repo
-	if use doc; then
-		git init || die
-		git config --global user.email "you@example.com" || die
-		git config --global user.name "Your Name" || die
-		git add . || die
-		git commit -m 'init' || die
-	fi
-
-	distutils-r1_python_prepare_all
-}