Adding metadata

50 files changed, 880 insertions, 50 deletions

diff --git a/dev-python/GridDataFormats/GridDataFormats-0.5.0.ebuild b/dev-python/GridDataFormats/GridDataFormats-0.5.0.ebuild
index 1b6ac494f96c..cf6a81a2be11 100644
--- a/dev-python/GridDataFormats/GridDataFormats-0.5.0.ebuild
+++ b/dev-python/GridDataFormats/GridDataFormats-0.5.0.ebuild
@@ -14,10 +14,19 @@ 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}]
+	dev-python/six[${PYTHON_USEDEP}]
 "
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# This test needs porting to newer numpy
+	sed -i -e 's/test_resample_factor/_&/' \
+		gridData/tests/test_grid.py || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/PyQt-builder/PyQt-builder-1.10.1-r1.ebuild b/dev-python/PyQt-builder/PyQt-builder-1.10.1-r1.ebuild
new file mode 100644
index 000000000000..e635ab6733bb
--- /dev/null
+++ b/dev-python/PyQt-builder/PyQt-builder-1.10.1-r1.ebuild
@@ -0,0 +1,37 @@
+# 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="The PEP 517 compliant PyQt build system"
+HOMEPAGE="https://www.riverbankcomputing.com/software/pyqt-builder/ https://pypi.org/project/PyQt-builder/"
+
+MY_P=${PN}-${PV/_pre/.dev}
+if [[ ${PV} == *_pre* ]]; then
+	SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz"
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+fi
+S=${WORKDIR}/${MY_P}
+
+LICENSE="|| ( GPL-2 GPL-3 SIP )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+
+RDEPEND="
+	dev-python/packaging[${PYTHON_USEDEP}]
+	>=dev-python/sip-5.5[${PYTHON_USEDEP}]
+"
+
+distutils_enable_sphinx doc --no-autodoc
+
+python_prepare_all() {
+	# don't install prebuilt Windows DLLs
+	sed -i -e "s:'dlls/\*/\*',::" setup.py || die
+	rm -r "${PN/-/_}.egg-info" || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/PyQt-builder/PyQt-builder-1.10.1.ebuild b/dev-python/PyQt-builder/PyQt-builder-1.10.1.ebuild
deleted file mode 100644
index 9588e8d8e35d..000000000000
--- a/dev-python/PyQt-builder/PyQt-builder-1.10.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 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
-
-DESCRIPTION="The PEP 517 compliant PyQt build system"
-HOMEPAGE="https://www.riverbankcomputing.com/software/pyqt-builder/ https://pypi.org/project/PyQt-builder/ https://www.riverbankcomputing.com/static/Docs/PyQt-builder/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="|| ( GPL-2 GPL-3 SIP )"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-SLOT="0"
-RDEPEND="dev-python/sip[${PYTHON_USEDEP}]"
-BDEPEND="${RDEPEND}"
-
-src_install() {
-	distutils-r1_src_install
-}
diff --git a/dev-python/PyQt5-sip/PyQt5-sip-12.9.0.ebuild b/dev-python/PyQt5-sip/PyQt5-sip-12.9.0.ebuild
index 93fbca834810..114c22ac0990 100644
--- a/dev-python/PyQt5-sip/PyQt5-sip-12.9.0.ebuild
+++ b/dev-python/PyQt5-sip/PyQt5-sip-12.9.0.ebuild
@@ -17,6 +17,6 @@ else
 fi
 S=${WORKDIR}/${MY_P}
 
-SLOT="0/$(ver_cut 1)"
 LICENSE="|| ( GPL-2 GPL-3 SIP )"
+SLOT="0/$(ver_cut 1)"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
diff --git a/dev-python/agate-dbf/Manifest b/dev-python/agate-dbf/Manifest
index 455e50e3c9da..e4b2d936f798 100644
--- a/dev-python/agate-dbf/Manifest
+++ b/dev-python/agate-dbf/Manifest
@@ -1 +1,4 @@
 DIST agate-dbf-0.2.2.tar.gz 2863 BLAKE2B 112b03e1a02b70e63f77195a999a60a59b4e02af55da2b9d94e9d535f557c4193129dcb8ce3f91d93cbc6e19196705009574e3b9e5073f9934d00636bb4b2abd SHA512 3e99404dfcd521010bc3eb5899871dfc63581e03604f80b0a42d4db48f486137fd48685024decd380d346ac5c2089a0d19dd9229893e8d5337b9bd9d7b4eb3b6
+DIST agate-dbf-0.2.2_examples%2Ftest.dbf 1314 BLAKE2B 81d5507b88fe7f7c3866d8666feff12bf3b14451affd653d76239f8785037c908509de248ac4bc8dbebeba4b1a84d69a48bf97b83716fe489ceb39f8ccf0e935 SHA512 460f9a624a6fed58d1fe0484ff6f7fa081d595d8f1a04f4f449ef6de037e334abb9da0403622e5af8c7914e02cda2fa38c4058ef1bb650e59e50584b9ae73b2e
+DIST agate-dbf-0.2.2_examples%2Ftestdbf_converted.csv 896 BLAKE2B fe535d9b784088118fcd61b5378d49d92bac801be61e7900200625f267c8f9c454729376b292d809d3e6a6ee2a093e2a813524ff9199223cbc89a9a461feed40 SHA512 ddba24038d4500b97ff8b11b03a5260927a299f1732aa0a6bcb4746c52e04825f2f3d5d211141576736008ff7f56d0970b21c06f4afad53a4e4e0a873815516b
+DIST agate-dbf-0.2.2_tests%2Ftest_table.py 574 BLAKE2B 22a744ae20491632795a0b654d8ab1e8adc090d43d0a18352b83cfc1687c57d33f1159d96cb379743d293203412dbbbaae8c33be195ae9d868584671ff0ea74d SHA512 131d8a553bc9c7538959e1ae29b62c47cea3e14365afca4e92e4f36cc8dab7e4b00efa462db5e9ca0f51b5e3eda892cf91881d65bd1302fa80bd5b0f66fa4076
diff --git a/dev-python/agate-dbf/agate-dbf-0.2.2.ebuild b/dev-python/agate-dbf/agate-dbf-0.2.2.ebuild
index 3518d3ef89f6..9293728e8045 100644
--- a/dev-python/agate-dbf/agate-dbf-0.2.2.ebuild
+++ b/dev-python/agate-dbf/agate-dbf-0.2.2.ebuild
@@ -13,10 +13,45 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE=""
-RDEPEND=""
+IUSE="test +xml"
+RESTRICT="!test? ( test )"
 
+# Other packages have BDEPEND="test? ( dev-python/agate-dbf[xml] )"
+AGATE_VERSION_DEP=">=dev-python/agate-1.5.0"
+TEST_AGAINST_RDEPEND="xml? ( ${AGATE_VERSION_DEP}[xml,${PYTHON_USEDEP}] )"
 RDEPEND="
-	>=dev-python/agate-1.5.0[${PYTHON_USEDEP}]
+	${AGATE_VERSION_DEP}[${PYTHON_USEDEP}]
 	>=dev-python/dbfread-2.0.5[${PYTHON_USEDEP}]
+
+	${TEST_AGAINST_RDEPEND}
 "
+BDEPEND="test? ( ${AGATE_VERSION_DEP}[xml,${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
+
+AGATE_DBF_TEST_FILES=(
+	examples/test.dbf
+	examples/testdbf_converted.csv
+	tests/test_table.py
+)
+SRC_URI+=" test? ( "
+for extra_file in "${AGATE_DBF_TEST_FILES[@]}"; do
+	SRC_URI+=" https://raw.githubusercontent.com/wireservice/agate-dbf/${PV}/${extra_file} -> ${P}_${extra_file//\//%2F}"
+done
+SRC_URI+=" )"
+
+agate-dbf_src_prepare() {
+	local extra_file
+	if use test; then
+		for extra_file in "${AGATE_DBF_TEST_FILES[@]}"; do
+			mkdir -p "${extra_file%/*}" || die
+			cp "${DISTDIR}/${P}_${extra_file//\//%2F}" "${extra_file}" || die
+			[[${extra_file} == *.py ]] && { true >> "${extra_file%/*}/__init__.py" || die; }
+		done
+	fi
+}
+
+src_prepare() {
+	agate-dbf_src_prepare
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/agate-excel/agate-excel-0.2.3.ebuild b/dev-python/agate-excel/agate-excel-0.2.3.ebuild
index b1649b3a8047..53db9947b8bf 100644
--- a/dev-python/agate-excel/agate-excel-0.2.3.ebuild
+++ b/dev-python/agate-excel/agate-excel-0.2.3.ebuild
@@ -15,10 +15,33 @@ SLOT="0"
 KEYWORDS="~amd64"
 IUSE=""
 RDEPEND=""
-RESTRICT="test"
+IUSE="test +xml"
+RESTRICT="!test? ( test )"
 
+# Other packages have BDEPEND="test? ( dev-python/agate-excel[xml] )"
+AGATE_VERSION_DEP=">=dev-python/agate-1.5.0"
+TEST_AGAINST_RDEPEND="xml? ( ${AGATE_VERSION_DEP}[xml,${PYTHON_USEDEP}] )"
 RDEPEND="
-	>=dev-python/agate-1.5.0[${PYTHON_USEDEP}]
+	${AGATE_VERSION_DEP}[${PYTHON_USEDEP}]
 	>=dev-python/openpyxl-2.3.0[${PYTHON_USEDEP}]
 	>=dev-python/xlrd-0.9.4[${PYTHON_USEDEP}]
+
+	${TEST_AGAINST_RDEPEND}
 "
+BDEPEND="test? ( ${AGATE_VERSION_DEP}[xml,${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local pytest_args test_name xfails
+
+	xfails=(
+		tests/test_table_xlsx.py::TestXLSX::test_ambiguous_date
+	)
+
+	for test_name in "${xfails[@]}"; do
+		pytest_args+=(--deselect "${test_name}")
+	done
+
+	epytest "${pytest_args[@]}" || die
+}
diff --git a/dev-python/agate-sql/Manifest b/dev-python/agate-sql/Manifest
new file mode 100644
index 000000000000..edde78265a30
--- /dev/null
+++ b/dev-python/agate-sql/Manifest
@@ -0,0 +1 @@
+DIST agate-sql-0.5.6.tar.gz 9091 BLAKE2B 9094a2bfb500422e7fe75d1c83182af698aa92942a305a69301d45d92f01960a7ffc7908f0eb2b66556a856be0f7388e222034428afd269d402488c6c05abd36 SHA512 b4234a86f8bcd5b22bcb1e18d0cec0ba21c8a3521e15f767886241e16285cbd296683f83bd366a82d1e549679b3712663adc080950dedb24a0e6db5b2541050a
diff --git a/dev-python/agate-sql/agate-sql-0.5.6.ebuild b/dev-python/agate-sql/agate-sql-0.5.6.ebuild
new file mode 100644
index 000000000000..095a168b4ad0
--- /dev/null
+++ b/dev-python/agate-sql/agate-sql-0.5.6.ebuild
@@ -0,0 +1,58 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+DISTUTILS_USE_SETUPTOOLS=bdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Adds SQL read/write support to agate."
+HOMEPAGE="https://github.com/wireservice/agate-sql https://pypi.org/project/agate-sql/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test +xml"
+RESTRICT="!test? ( test )"
+
+# Other packages have BDEPEND="test? ( dev-python/agate-sql[xml] )"
+AGATE_VERSION_DEP=">=dev-python/agate-1.5.0"
+TEST_AGAINST_RDEPEND="xml? ( ${AGATE_VERSION_DEP}[xml,${PYTHON_USEDEP}] )"
+RDEPEND="
+	${AGATE_VERSION_DEP}[${PYTHON_USEDEP}]
+	>=dev-python/sqlalchemy-1.0.8[${PYTHON_USEDEP}]
+
+	${TEST_AGAINST_RDEPEND}
+"
+BDEPEND="test? ( ${AGATE_VERSION_DEP}[xml,${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	local sed_args=(
+		-e "/crate/d"
+		-e "/nose/d"
+		-e "/geojson/d"
+		-e "/Sphinx/d"
+		-e "/sphinx_rtd_theme/d"
+	)
+
+	sed "${sed_args[@]}" -i setup.py agate_sql.egg-info/requires.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	local pytest_args test_name xfails
+
+	xfails=(
+		tests/test_agatesql.py::TestSQL::test_to_sql_create_statement_with_dialects
+		tests/test_agatesql.py::TestSQL::test_to_sql_create_statement_with_schema
+	)
+
+	for test_name in "${xfails[@]}"; do
+		pytest_args+=(--deselect "${test_name}")
+	done
+
+	epytest "${pytest_args[@]}" || die
+}
diff --git a/dev-python/agate-sql/metadata.xml b/dev-python/agate-sql/metadata.xml
new file mode 100644
index 000000000000..1aa8b64518a1
--- /dev/null
+++ b/dev-python/agate-sql/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+  <email>zmedico@gentoo.org</email>
+ </maintainer>
+ <upstream>
+  <remote-id type="pypi">agate-sql</remote-id>
+  <remote-id type="github">wireservice/agate-sql</remote-id>
+  <changelog>https://github.com/wireservice/agate-sql/blob/master/CHANGELOG.rst</changelog>
+  <bugs-to>https://github.com/wireservice/agate-sql/issues</bugs-to>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/agate/agate-1.6.2.ebuild b/dev-python/agate/agate-1.6.2.ebuild
index 9bb07707e488..4c490f790c3c 100644
--- a/dev-python/agate/agate-1.6.2.ebuild
+++ b/dev-python/agate/agate-1.6.2.ebuild
@@ -13,8 +13,12 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="test"
+IUSE="test +xml"
 RESTRICT="!test? ( test )"
+
+# Other packages have BDEPEND="test? ( dev-python/agate[xml] )"
+LEATHER_VERSION_DEP=">=dev-python/leather-0.3.2"
+TEST_AGAINST_RDEPEND="xml? ( ${LEATHER_VERSION_DEP}[xml,${PYTHON_USEDEP}] )"
 RDEPEND="
 	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
 	>=dev-python/pytimeparse-1.1.5[${PYTHON_USEDEP}]
@@ -23,9 +27,11 @@ RDEPEND="
 	>=dev-python/isodate-0.5.4[${PYTHON_USEDEP}]
 	>=dev-python/pyicu-2.4.2[${PYTHON_USEDEP}]
 	>=dev-python/python-slugify-1.2.1[${PYTHON_USEDEP}]
-	>=dev-python/leather-0.3.2[${PYTHON_USEDEP}]
+	${LEATHER_VERSION_DEP}[${PYTHON_USEDEP}]
+
+	${TEST_AGAINST_RDEPEND}
 "
-BDEPEND="test? ( >=dev-python/leather-0.3.2[xml,${PYTHON_USEDEP}] )"
+BDEPEND="test? ( ${LEATHER_VERSION_DEP}[xml,${PYTHON_USEDEP}] )"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/asteval/Manifest b/dev-python/asteval/Manifest
index edaafe12ddbc..e23598b11c45 100644
--- a/dev-python/asteval/Manifest
+++ b/dev-python/asteval/Manifest
@@ -1,3 +1,4 @@
 DIST asteval-0.9.21.tar.gz 54203 BLAKE2B c5232b41cc73184f4a9d21e257d4c517662e7a7e5c6beed0d0a1f46572310263b5370ea455f2d0640410cecd7e3b8a7686a56931fa61c3294a57a2e5ea984336 SHA512 b2930963641486f208c629300f70e41924aa59bd9c64f767ed5a4db0a39e79c02a02fed48eb0e113fb6e3fc594973c9d0afa56d768ac627758a096b1c4fe6030
 DIST asteval-0.9.22.tar.gz 55120 BLAKE2B 5712e72f69e3d48df6a6ac33e3bf87517525efb3907cb954d5a4427b4d41aac5bdfbf71376967633d36574a845c40bbeb391d2ef0a2deef280235c468732e80d SHA512 0c6e0d1273fd9794828e006c56d243e2afbf336314dad9ccc95f40b790851460beb42400defbf4ee09eb7d65532b499a762b4b19c3102bbe6d2553a3a6debb37
 DIST asteval-0.9.23.tar.gz 55239 BLAKE2B 447599078a877784c35b7bdb96f81382139f8a93d72e660658386867b0eb37e04a22ac7ba9d6afbef1a55d35ca38a63fef60e1e1382e9740694b1e94ddcc7e7b SHA512 b2755b4dbefff1e481558f886cc5724d9a6a953b145736afab237e16f7718d48d1f8f98a0b7355c5e871f8ed0862b60bd6a4d99554a5e0fd0875f9cfdfcbce55
+DIST asteval-0.9.24.tar.gz 39523 BLAKE2B c0bfecf7b74e07d32e2117bb68d0480bff4037f7ce9891352d10b29f765e3922d0f60eae66e0091e35d55a32bc6199b5949292477cd2a8b73fd3ea80ff8babaf SHA512 1bedd09aef521cf63d98a55861b983233bca297fbf4a38a1522b68808593447156748698b653a3b82451d953ada2694c3dc1520efc4ff8c6f26607645b539af6
diff --git a/dev-python/asteval/asteval-0.9.24.ebuild b/dev-python/asteval/asteval-0.9.24.ebuild
new file mode 100644
index 000000000000..39c7f2058aab
--- /dev/null
+++ b/dev-python/asteval/asteval-0.9.24.ebuild
@@ -0,0 +1,17 @@
+# 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="Evaluator of Python expression using ast module"
+HOMEPAGE="https://newville.github.io/asteval/ https://github.com/newville/asteval"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+distutils_enable_tests pytest
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index c141057f8f9b..7ee3d879fee0 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -19,3 +19,4 @@ DIST boto3-1.17.94.tar.gz 382448 BLAKE2B 84ea4989b47ff4b1adbcb1118bf1a18996d98d9
 DIST boto3-1.17.95.tar.gz 383063 BLAKE2B 9d715ce7cf51daa806c0ed6044eca32c51dddc9114899e890e9745db51d574fea02515364cbab3fd82b9960dcc658c02bab89564c98ede13487ead75280c01a5 SHA512 63c78ea41bf79af23159aa8a97bf82ecd6c5b5075c1d077777679cc7ca17de4e91eb9abd19c152e5eeee2d5af47739ba0df3dbca6012c3836b577bc52e52eff4
 DIST boto3-1.17.96.tar.gz 383485 BLAKE2B d962177eb5a693aad1900fbe6c44e20853deee74a31f188d1d12a34352d1376a5edcb84e854d8eddb8ce9dfe0aa46d8ec8c5998010a0f3a635d7b4b2ac46a1ea SHA512 c77a682b6895ddaceec21f9ad28eb08bda9eafa102cdb1024270247f9bfe849249c80bc586e18de4c1bd1410dabd165154b6c17655e8d56a16d38e009d695141
 DIST boto3-1.17.97.tar.gz 383223 BLAKE2B 1a1b4e9f2c51d830762f27cf3e30038efb88322e300ac304d1cb88d5b7efc6af35ad9810cea7292c9807dcdfedb11ba039ee6d5dbb9162f2a1c6d6936ef75bcc SHA512 e74a59763cc9b8a51fd09121a790d29a7291d9380d4451c2e6af90902f18415a3780eeea7f7d63e052b295792b92c3cdd3b8597f7013241ebbbdb7e418cf73ce
+DIST boto3-1.17.98.tar.gz 383306 BLAKE2B f9fed22e11d2561a5a665105bdddffce2cea357f588200285ba4758809e6f64ded3ef4ad4eb10a52a1852df86d1098f752f432f5bd90a70669d569866262d638 SHA512 223de2234b235773138ffca02eed8187eaa2b74fa3c0822700bfcebe12da69078ab592ca77158448cb998d47dc63a20c79a3ce9dab2398c41faaf94a329c7cc3
diff --git a/dev-python/boto3/boto3-1.17.98.ebuild b/dev-python/boto3/boto3-1.17.98.ebuild
new file mode 100644
index 000000000000..76a508785b03
--- /dev/null
+++ b/dev-python/boto3/boto3-1.17.98.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} )
+inherit distutils-r1
+
+DESCRIPTION="The AWS SDK for Python"
+HOMEPAGE="https://github.com/boto/boto3"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/boto3"
+	inherit git-r3
+	BOTOCORE_PV=${PV}
+else
+	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+	# botocore is x.(y+3).z
+	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
+fi
+
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+python_prepare_all() {
+	# don't lock versions to narrow ranges
+	sed -e '/botocore/ d' \
+		-e '/jmespath/ d' \
+		-e '/s3transfer/ d' \
+		-i setup.py || die
+
+	# prevent an infinite loop
+	rm tests/functional/docs/test_smoke.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests -v tests/unit/ tests/functional/ || die "test failed under ${EPYTHON}"
+}
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index c66fc190791d..b8e4168e9c84 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -19,3 +19,4 @@ DIST botocore-1.20.94.tar.gz 7830564 BLAKE2B 4c52bb0f782a4560c1c966ede26a5741428
 DIST botocore-1.20.95.tar.gz 7833074 BLAKE2B f7c6f01cf28f609a2a6c2cdcb41240d3d653a12ca28e29011ee2ab909b988b187378989eaa19f73734b3a64ece5041520af9a9e9de801bb1802001b22d56387c SHA512 a3c532e26054f793ac71756ebf69c0f17bf60e4510297abffadf02c17188ae74ea374b534bfd9db8cd179c53287734b797142e7e08536a9e3199e269cb014c28
 DIST botocore-1.20.96.tar.gz 7842597 BLAKE2B 1a30d4d29c1200f51284a30ee1f512debfbf5542836e32e4971b593a041c4e0793e609b11528a1ecf080e2a01dd4b0ab06bfc44905beee202c23fca983238111 SHA512 9a4973b7484fa5586473dbedd402d6b8adfca18a17373752078f35fc24fda7477a37e2c9fee4779e52c3a60b352ab02943ebf49eb77dd607b79e88d25ae9b6c3
 DIST botocore-1.20.97.tar.gz 7846552 BLAKE2B da0355cc229ba8a0632f67866bf06b27d7b257184b53670e5dc183c6b5a1f4d3a34145de0a3f04abd2adc08de3f0775e3c7e0dbecae729acb5bc05c7ce9acaf2 SHA512 7411d5de8ecf0c42c0142ded036189dcf378cd16f761071beb5bc2a2c240eabb0c4a8c669ce89a5b4e798a0aae92f0e67755627c2a84df77fc2e9557265a4e3b
+DIST botocore-1.20.98.tar.gz 7854150 BLAKE2B 3f63f0057555b33fbb69d4f8720b393dc6f866721df0a90be354ae3485e0053bcf2216f180d4f795cd271a5ea77e7d390ff453c5d2655e60b51623be1fe5df8e SHA512 98d931ad9efbcb899bc3f6e1fd55028fdbc88cebb9d2ffe93db08610b8515de8bd784338b2320136319314783fbb65d251526efbf3df76de80be4561bc97f40b
diff --git a/dev-python/botocore/botocore-1.20.98.ebuild b/dev-python/botocore/botocore-1.20.98.ebuild
new file mode 100644
index 000000000000..ca62b7dad65f
--- /dev/null
+++ b/dev-python/botocore/botocore-1.20.98.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 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/jmespath[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
+)
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || die
+	# very unstable
+	sed -i -e 's:test_stress_test_token_bucket:_&:' \
+		tests/functional/retries/test_bucket.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# note: suites need to be run separately as one of the unit tests
+	# seems to be leaking mocks and breaking a few functional tests
+	nosetests -v tests/unit ||
+		die "unit tests failed under ${EPYTHON}"
+	nosetests -v tests/functional ||
+		die "functional tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/configargparse/Manifest b/dev-python/configargparse/Manifest
index 46195da88001..034348fd353a 100644
--- a/dev-python/configargparse/Manifest
+++ b/dev-python/configargparse/Manifest
@@ -1 +1,2 @@
 DIST ConfigArgParse-1.4.1.gh.tar.gz 30343 BLAKE2B 8aaed3b0e85b4006c04e7910c6f7ae2c2a07d586ade777eedf078afeea4561a4504614484316afd9d234b2871c0cc45ef47f30254797f9df260373309cf67927 SHA512 304d5981c5685188edb22a63966d25a8943e4c443f2aefc323492f141885f50657e9f9200514df65683f1e13e64173d4def80cdbebcff941c3ee66ff4af0cbd4
+DIST ConfigArgParse-1.5.gh.tar.gz 30375 BLAKE2B 8a3c0091dc4049e9f84eb6209f7a62cafab0c0357d4d17304520b2855d60cdb68e63607068612bc99b07709f1fde4b0a3f11dbf4e45087968eab901d2b20b79f SHA512 82121fa6e8f734898674220b888dd3670368389a5cbd40e87d9188fa55d4378fdf480cc7dc003a4b9eadc1951fa8fc6141e9c0b079321cfe70c64bebacfb8944
diff --git a/dev-python/configargparse/configargparse-1.5.ebuild b/dev-python/configargparse/configargparse-1.5.ebuild
new file mode 100644
index 000000000000..4159f5c80f9b
--- /dev/null
+++ b/dev-python/configargparse/configargparse-1.5.ebuild
@@ -0,0 +1,32 @@
+# 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
+
+MY_PN="ConfigArgParse"
+MY_P="${MY_PN}-${PV}"
+DESCRIPTION="Drop-in replacement for argparse supporting config files and env variables"
+HOMEPAGE="
+	https://github.com/bw2/ConfigArgParse/
+	https://pypi.org/project/ConfigArgParse/"
+SRC_URI="
+	https://github.com/bw2/ConfigArgParse/archive/v${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+BDEPEND="
+	test? ( dev-python/pyyaml[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests unittest
+
+src_test() {
+	local -x COLUMNS=80
+	distutils-r1_src_test
+}
diff --git a/dev-python/csvkit/Manifest b/dev-python/csvkit/Manifest
new file mode 100644
index 000000000000..f3248abe68c8
--- /dev/null
+++ b/dev-python/csvkit/Manifest
@@ -0,0 +1 @@
+DIST csvkit-1.0.5.tar.gz 3783495 BLAKE2B 19210c23480cb3068af74c922a3495612f40bbf5c4985f7018c9c185564dd0c101292f165ddd03440220f582bfdc1590e2f75e8e5c92edd71e76e46a73b26547 SHA512 62dc7a5eefeda9c8824b24f8844b6c1ead5449797d9d004111885b03a1989ad89d1f48b3b7d4a69130885b85cc3c1352910737e416fc19f2038525632b1569f6
diff --git a/dev-python/csvkit/csvkit-1.0.5.ebuild b/dev-python/csvkit/csvkit-1.0.5.ebuild
new file mode 100644
index 000000000000..0be7b30d33b7
--- /dev/null
+++ b/dev-python/csvkit/csvkit-1.0.5.ebuild
@@ -0,0 +1,47 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+DISTUTILS_USE_SETUPTOOLS=bdepend
+
+inherit distutils-r1
+
+DESCRIPTION="A suite of utilities for converting to and working with CSV."
+HOMEPAGE="https://github.com/wireservice/csvkit https://pypi.org/project/csvkit/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test +xml"
+RESTRICT="!test? ( test )"
+
+# Other packages have BDEPEND="test? ( dev-python/csvkit[xml] )"
+AGATE_VERSION_DEP=">=dev-python/agate-1.6.1"
+TEST_AGAINST_RDEPEND="xml? ( ${AGATE_VERSION_DEP}[xml,${PYTHON_USEDEP}] )"
+RDEPEND="
+	${AGATE_VERSION_DEP}[${PYTHON_USEDEP}]
+	>=dev-python/agate-excel-0.2.2[${PYTHON_USEDEP}]
+	>=dev-python/agate-dbf-0.2.0[${PYTHON_USEDEP}]
+	>=dev-python/agate-sql-0.5.3[${PYTHON_USEDEP}]
+	>=dev-python/six-1.6.1[${PYTHON_USEDEP}]
+
+	${TEST_AGAINST_RDEPEND}
+"
+BDEPEND="test? ( ${AGATE_VERSION_DEP}[xml,${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local pytest_args test_name xfails
+
+	xfails=(
+		tests/test_utilities/test_in2csv.py::TestIn2CSV::test_convert_dbf
+	)
+
+	for test_name in "${xfails[@]}"; do
+		pytest_args+=(--deselect "${test_name}")
+	done
+
+	epytest "${pytest_args[@]}" || die
+}
diff --git a/dev-python/csvkit/metadata.xml b/dev-python/csvkit/metadata.xml
new file mode 100644
index 000000000000..acbef662a438
--- /dev/null
+++ b/dev-python/csvkit/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+  <email>zmedico@gentoo.org</email>
+ </maintainer>
+ <upstream>
+  <remote-id type="pypi">csvkit</remote-id>
+  <remote-id type="github">wireservice/csvkit</remote-id>
+  <changelog>https://github.com/wireservice/csvkit/blob/master/CHANGELOG.rst</changelog>
+  <bugs-to>https://github.com/wireservice/csvkit/issues</bugs-to>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/dbfread/Manifest b/dev-python/dbfread/Manifest
index f6f5ebe70b1f..0d551756ca38 100644
--- a/dev-python/dbfread/Manifest
+++ b/dev-python/dbfread/Manifest
@@ -1 +1,2 @@
+DIST dbfread-2.0.7-src.tar.gz 33045 BLAKE2B 96798f00aba4c30e7e83b468f368ca6730a7e095c9fec5bf5515ac6a152022adbf5339cd9e68e85f4eccac211ed4e307b9abf22249ef6420d722fa213210d7d7 SHA512 cf591fa5800e5471025175a4bbbb54cb26dc2a83bf328776e4386860370d9421edd9edd62cb9e3d463794d526c561a0f4744bb67b5e376edd471dc95100bc2c7
 DIST dbfread-2.0.7.tar.gz 33212 BLAKE2B 03c9a0d93b13c7573b5bcec6c5af1ac43bd00ead2b3e83638f45344b2344062e86d764b095e699afdaea2405176ee15122c975a2f72b25bd167f5faaaf33043b SHA512 86c3a29e351b985984be67401a6dfe3e39cd92451a122788ade83d65313dde37a3706ce36c4365bd36ba1df62ee057b625f1e0f077aa4a248c7456258189f548
diff --git a/dev-python/dbfread/dbfread-2.0.7.ebuild b/dev-python/dbfread/dbfread-2.0.7.ebuild
index 2b561ed11eec..66f35e21cae1 100644
--- a/dev-python/dbfread/dbfread-2.0.7.ebuild
+++ b/dev-python/dbfread/dbfread-2.0.7.ebuild
@@ -9,9 +9,32 @@ inherit distutils-r1
 
 DESCRIPTION="Read DBF Files with Python"
 HOMEPAGE="https://github.com/olemb/dbfread https://pypi.org/project/dbfread/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
+	test? ( https://github.com/olemb/dbfread/archive/refs/tags/${PV}.tar.gz ->  ${P}-src.tar.gz )"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE=""
 RDEPEND=""
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	sed -e 's|\[pytest\]|[tool:pytest]|' -i setup.cfg || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	local pytest_args test_name xfails
+
+	xfails=(
+		dbfread/test_read_and_length.py::test_len
+		dbfread/test_read_and_length.py::test_list
+	)
+
+	for test_name in "${xfails[@]}"; do
+		pytest_args+=(--deselect "${test_name}")
+	done
+
+	epytest "${pytest_args[@]}" || die
+}
diff --git a/dev-python/feedparser/Manifest b/dev-python/feedparser/Manifest
index 4de8914d7c68..2deb7b0cedbc 100644
--- a/dev-python/feedparser/Manifest
+++ b/dev-python/feedparser/Manifest
@@ -4,3 +4,4 @@ DIST feedparser-6.0.3.tar.gz 251556 BLAKE2B e0aec37a3bf70be26791c6717dd015e128a8
 DIST feedparser-6.0.4.tar.gz 251880 BLAKE2B 22a94bce43b4ff8ad9aa95d07c71568d7d6e1d8732ce84880f1565d48673706a3eea1c9bbf2dbe42e6384a737170c409cddccfcbfb46f92140d9262b16573071 SHA512 33b6e2cda5a6fe5bc1b51f26ec256e86e81c7cab050027592cc47173389554a7ebf9ed82454690dad534256bac5f907ca0f32871b2741d1d5318ff94e8e66558
 DIST feedparser-6.0.5.tar.gz 252003 BLAKE2B 91f1a5cd8f1d7124ebfc4c6ce31be81d2251a3769a2ec491325236ecc6506d73658fa7f4825a82e41d4c190017a66a41b6a93f19b37f0062d2abcca76d6791bf SHA512 6b91c8cd84ac7de9a632ae23c3bcd543ecc4dbbeeefac370c62af0fc83057a108b26a84e2199ae900300a09e89a117c475776276231d7cd27d20a10b16814958
 DIST feedparser-6.0.6.tar.gz 252114 BLAKE2B 47a22799c76832d8c21959a43514f4e81b427a1d54d4cfd6e95bcb3cd23a8b50611f640107d9078b3bf8f4d3b254b8c8863fafe56b6a53d02cffb6d7cd7c1a3f SHA512 e94b0f8e1be2b70db897297fb456df3d5e86a1e952fd4278f9370fc94e3a13930ddbeb866a525b9344e9cd2e4d768a7bda7b1368354e68d16eff133319a8bca9
+DIST feedparser-6.0.7.tar.gz 252432 BLAKE2B 7eba914b073a241d79c73a1a3a0308d035fae9eaa26a3eb54714272d534b5c965db97676e32ce59bf748dfb3ccbf31d1044b75006b87df0e0b6fc2f7a6f5fc6d SHA512 ae0f871dac2f7096e265f6931fe275ecc22eae091a6855fb5d1b78c9a5de9a16cff05742ddf05277068d6b4e4908b2350bb8784855be4c136c9b37835c19efa2
diff --git a/dev-python/feedparser/feedparser-6.0.7.ebuild b/dev-python/feedparser/feedparser-6.0.7.ebuild
new file mode 100644
index 000000000000..ab2b0b4c63d7
--- /dev/null
+++ b/dev-python/feedparser/feedparser-6.0.7.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} pypy3 )
+
+inherit distutils-r1
+
+MY_PV=${PV/_beta/b}
+MY_P=${PN}-${MY_PV}
+DESCRIPTION="Parse RSS and Atom feeds in Python"
+HOMEPAGE="https://github.com/kurtmckee/feedparser
+	https://pypi.org/project/feedparser/"
+SRC_URI="
+	https://github.com/kurtmckee/feedparser/archive/${MY_PV}.tar.gz
+		-> ${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+
+RDEPEND="dev-python/sgmllib3k[${PYTHON_USEDEP}]"
+
+distutils_enable_tests unittest
+
+src_prepare() {
+	# broken
+	rm \
+		tests/illformed/chardet/big5.xml \
+		tests/illformed/undeclared_namespace.xml || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	"${EPYTHON}" tests/runtests.py || die
+}
diff --git a/dev-python/google-auth/Manifest b/dev-python/google-auth/Manifest
index e41093ef1674..a7c16e8f2b83 100644
--- a/dev-python/google-auth/Manifest
+++ b/dev-python/google-auth/Manifest
@@ -2,3 +2,4 @@ DIST google-auth-1.30.0.tar.gz 169598 BLAKE2B 4b0a0e66255abc11c697ca2c3d77ea0b7c
 DIST google-auth-1.30.1.tar.gz 169244 BLAKE2B e496239807ab9ca64e1b5dc39726fa22b56d55f14883c983673064b8ea33f80dee013654d4808fead0d06e8b6ddc53554d094f42aede6e06224dc3a3c04e88d1 SHA512 7e35f5be9be160ddef4b579c2e5bc966f1d64f8f0bb75220e22fd3edb9c6f6140bdcf68055fdb13dd370e3d543206900cc9403237eb328d69418a384a4d0fe26
 DIST google-auth-1.30.2.tar.gz 169368 BLAKE2B c01191313b4bd7ffdc62fbca20aeadcb01fcb1f26e4c11504f88c2582b9a3dca10046edd5d2fe88c98980fb09e4d68da99bf0b8b5692abcf5271994515f91765 SHA512 f133ef403f8a3c92437055f2fd0e5f607199a0bfd9a76a44075a9be8ec16c4d4822d58d85fa52ade4c448e11cb6822f7e8da03ab72f3dddfb811c8d7a846f841
 DIST google-auth-1.31.0.tar.gz 170970 BLAKE2B ee6c9e72657d0902e53c0c56ef5eb802815979f272e9ee8e038dbb05af64eabcf3d6b005f2eedaa0d2b2c4da815bdbd89e1246fc37f9b7e7760252a040ae2a27 SHA512 c594ef070983a1b0d5dccbc42ecd8020866911463b672d52b6f32b22dbcd4fccdc038d1a56f6af556553f086b161f37eba93dee3bfb8726329249c3d73efdd9f
+DIST google-auth-1.32.0.tar.gz 171423 BLAKE2B 8888a9193b356f2d0d846a36c436cfc1cc60a973a162983c583bb1d5eacb183381424bebbaad7c4c7a9b777c8d5a3b61c490ad0cece4b9d6e0bd1e03fb71f49f SHA512 0f11de110828eca0514b032e422d72ab3979c99ed20bba3d79583cc33707a6cbfcb69b50f27f1702e803620c852eb6fe4bfc431d2e9db6774d26ca6f783042ba
diff --git a/dev-python/google-auth/google-auth-1.32.0.ebuild b/dev-python/google-auth/google-auth-1.32.0.ebuild
new file mode 100644
index 000000000000..490439987838
--- /dev/null
+++ b/dev-python/google-auth/google-auth-1.32.0.ebuild
@@ -0,0 +1,51 @@
+# 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="Google Authentication Library"
+HOMEPAGE="
+	https://github.com/googleapis/google-auth-library-python/
+	https://pypi.org/project/google-auth/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	dev-python/namespace-google[${PYTHON_USEDEP}]
+	>=dev-python/pyasn1-0.1.7[${PYTHON_USEDEP}]
+	>=dev-python/pyasn1-modules-0.2.1[${PYTHON_USEDEP}]
+	>=dev-python/rsa-3.1.4[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/cachetools-2.0.0[${PYTHON_USEDEP}]
+	"
+BDEPEND="
+	test? (
+		dev-python/cryptography[${PYTHON_USEDEP}]
+		dev-python/flask[${PYTHON_USEDEP}]
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		dev-python/grpcio[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/moto[${PYTHON_USEDEP}]
+		dev-python/oauth2client[${PYTHON_USEDEP}]
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+		dev-python/pytest-localserver[${PYTHON_USEDEP}]
+		dev-python/pyu2f[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/responses[${PYTHON_USEDEP}]
+		dev-python/urllib3[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+python_install_all() {
+	distutils-r1_python_install_all
+	find "${ED}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/isort/Manifest b/dev-python/isort/Manifest
index 4ecc0049f124..3a2d0fd4ff31 100644
--- a/dev-python/isort/Manifest
+++ b/dev-python/isort/Manifest
@@ -1 +1,2 @@
 DIST isort-5.8.0.tar.gz 167927 BLAKE2B 59b9ee4e63e231026e25833ef8bc4a782ad7b30622d1f6b61fe177fbf0f8663ca953f68cf168abb407d3cb90fe98e29540ec3a8933a5df2ca7ba3e938ba4282f SHA512 ffeee045b5328fa410673464b2ca22d9cd1ba8dd34eff9a430b93e9ce72033100e32e3373308438bcb82b8eb7deea1f2087091e111b1204e35791958ca6944c4
+DIST isort-5.9.1.gh.tar.gz 727733 BLAKE2B dc207ac24b586eb5c4c2bd546c0f2ab336c901563e3f2c92d917cf81bc94634c23a20dfe787e65c41fd3aec835d3fdc96721ed579c282b4cb0719afa7f50f9a3 SHA512 e48e08835a71271ab01e52e2c44ecef475aa270ab7242aff4f9ce82bcd5bc8354e2d8a717ccf995172102809198f6dfc9786d8c64e33afc9ae9a4e981ac51feb
diff --git a/dev-python/isort/isort-5.9.1.ebuild b/dev-python/isort/isort-5.9.1.ebuild
new file mode 100644
index 000000000000..e99c24d4a55b
--- /dev/null
+++ b/dev-python/isort/isort-5.9.1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-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
+
+DESCRIPTION="A python utility/library to sort imports"
+HOMEPAGE="https://pypi.org/project/isort/"
+SRC_URI="
+	https://github.com/PyCQA/isort/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ia64 ~x86"
+
+RDEPEND="
+	dev-python/toml[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		dev-python/black[${PYTHON_USEDEP}]
+		dev-python/colorama[${PYTHON_USEDEP}]
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+		dev-python/natsort[${PYTHON_USEDEP}]
+		dev-python/pylama[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-vcs/git
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# unbundle toml
+	sed -i -e 's:from ._vendored ::' isort/settings.py || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# Some tests run the "isort" command
+	distutils_install_for_testing
+	# Install necessary plugins
+	local p
+	for p in example*/; do
+		pushd "${p}" >/dev/null || die
+		distutils_install_for_testing
+		popd >/dev/null || die
+	done
+
+	local deselect=(
+		# Excluded from upstream's test script
+		tests/unit/test_deprecated_finders.py
+	)
+	epytest tests/unit ${deselect[@]/#/--deselect }
+}
diff --git a/dev-python/js2py/Manifest b/dev-python/js2py/Manifest
index d36aba4b7bb7..744b05d851d7 100644
--- a/dev-python/js2py/Manifest
+++ b/dev-python/js2py/Manifest
@@ -1 +1,2 @@
 DIST Js2Py-0.70_p20210218.tar.gz 1969615 BLAKE2B 4702b2e771bfd2a5158a3539c33932335816c74f9dbd132679036aa2b7e53796764dd852e92d72a35ecc31efa34b849776c45d8c81e80f85f59308edf0996f00 SHA512 757c895bc0ba933020336a70473ec4455cb93c17040a39f17d645782011ea72273291448f3448ffd34658b48ada45b77facf3d326133f1c0d63e2e26e2cd7f30
+DIST Js2Py-0.71.tar.gz 1969618 BLAKE2B 293a830f4188e66927b23900e8c376bf1a4bfdfa8726e33aa5aa75dcdf735cde89ce463741c142fc7e487ae89c7c11421e459d2fdd09ba88edfe953e4e087e42 SHA512 75bae61619d4766117f3c163d36427f3019825ecb08b745aee7c3b6f2d33a4ea8507ca180b63c0a8e575a5f9491eb64d6963acbb912edc7b934a676b38814597
diff --git a/dev-python/js2py/js2py-0.71.ebuild b/dev-python/js2py/js2py-0.71.ebuild
new file mode 100644
index 000000000000..d43d44889d73
--- /dev/null
+++ b/dev-python/js2py/js2py-0.71.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_COMMIT="5f665f60083a9796ec33861240ce31d6d2b844b6"
+
+MY_PN="Js2Py"
+MY_P="${MY_PN}-${PV}"
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+
+inherit distutils-r1
+
+DESCRIPTION="JavaScript to Python Translator & JavaScript interpreter in Python"
+HOMEPAGE="
+	http://piter.io/projects/js2py/
+	https://github.com/PiotrDabkowski/Js2Py/
+	https://pypi.org/project/Js2Py/
+"
+SRC_URI="https://github.com/PiotrDabkowski/${MY_PN}/archive/${MY_COMMIT}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/pyjsparser-2.5.1[${PYTHON_USEDEP}]
+	>=dev-python/tzlocal-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+"
+
+S="${WORKDIR}/${MY_PN}-${MY_COMMIT}"
+
+python_test() {
+	pushd ./tests >/dev/null || die
+
+	# Tests require "node_failed.txt" file where the logs are kept
+	if [[ -f ./node_failed.txt ]]; then
+		rm ./node_failed.txt || die
+	fi
+
+	touch ./node_failed.txt || die
+	"${EPYTHON}" ./run.py || die "tests failed with ${EPYTHON}"
+
+	popd >/dev/null || die
+}
diff --git a/dev-python/leather/Manifest b/dev-python/leather/Manifest
index 0d3da570b053..5df59075e1e9 100644
--- a/dev-python/leather/Manifest
+++ b/dev-python/leather/Manifest
@@ -1 +1,2 @@
+DIST leather-0.3.3-src.tar.gz 40522 BLAKE2B 3c7e6a48615751b310b7f066f2a78a2494e00256cae2ebfb4633c9389cca2477c2265fcf8c68f37733568ef729db1a5daf02ddc640bf2a60f2b39127c9a38d91 SHA512 30ea50ac6f97c55ee695b0e175a27e1e64fd17da7b0686ca8595fe0e5067932e19e59368fe6441f8f291ec52be3e597a80f8e04a3fcc0eeae33b3a5b3030e1d6
 DIST leather-0.3.3.tar.gz 18391 BLAKE2B 0a81343251fcdea85873fea023e1d709a385b268c2900642764c1a0ae6abfa84d9dece0ef67ae152b716c93c1bdaf9671f8c5df8cf5605694af48e8f3552437a SHA512 3387353d4da129fa3601799efe8742aea08f94579caab7a5a05175ff7ad50a815fc7ca4aee5d1c390027bda3a9bf1ecd1ed5167575386a7a58f56625f5165350
diff --git a/dev-python/leather/leather-0.3.3-r1.ebuild b/dev-python/leather/leather-0.3.3-r1.ebuild
index dd2abe0fb8f5..39371366b2bd 100644
--- a/dev-python/leather/leather-0.3.3-r1.ebuild
+++ b/dev-python/leather/leather-0.3.3-r1.ebuild
@@ -9,11 +9,13 @@ inherit distutils-r1
 
 DESCRIPTION="Python charting for 80% of humans."
 HOMEPAGE="https://github.com/wireservice/leather https://pypi.org/project/leather/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
+	test? ( https://github.com/wireservice/leather/archive/refs/tags/${PV}.tar.gz -> ${P}-src.tar.gz ) "
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="+xml"
+IUSE="test +xml"
+RESTRICT="!test? ( test )"
 
 # Other packages have BDEPEND="test? ( dev-python/leather[xml] )"
 TEST_AGAINST_RDEPEND="xml? ( dev-python/lxml[${PYTHON_USEDEP}] )"
@@ -21,3 +23,5 @@ RDEPEND="
 	${TEST_AGAINST_RDEPEND}
 	>=dev-python/six-1.6.1[${PYTHON_USEDEP}]
 "
+
+distutils_enable_tests pytest
diff --git a/dev-python/netcdf4-python/Manifest b/dev-python/netcdf4-python/Manifest
index 0d2318dbcad9..8ce8b514659b 100644
--- a/dev-python/netcdf4-python/Manifest
+++ b/dev-python/netcdf4-python/Manifest
@@ -1 +1,2 @@
 DIST netCDF4-1.5.6.tar.gz 763732 BLAKE2B 0bb08ed81206c7d14817dad0f93683b5c44678869c760467071e2a0a76be76c9d78c0f714a043d77dba9b4535a83d59d8197340c105070a4f0204900b1e50410 SHA512 cc5bdb476fa034576f8e1a19e709dba53ad2db68cd10221df2de46a47fc7e5bacfc90fe8c4458ef45b20bf24a1cf52f275b1891af5574e2a139e95cb0d793a8b
+DIST netCDF4-1.5.7.tar.gz 763928 BLAKE2B e8e1c689747aa2697beeadf1c5164f1530fe76e0fb0d7affb94b506d1632c5242a406cdee72a2a683b75beda649f516ca06f5fd8fcddf5c567327d2420443721 SHA512 dfcc900e4d72f7b0c5c6a7fdaaab221735977306e86856e6d712e8a3c36ff22bd6210cbfb9819b9a26fde647c00aed5fcffe430459f9f2d5208a2cf8865ca853
diff --git a/dev-python/netcdf4-python/netcdf4-python-1.5.7.ebuild b/dev-python/netcdf4-python/netcdf4-python-1.5.7.ebuild
new file mode 100644
index 000000000000..86fb0b7e1af1
--- /dev/null
+++ b/dev-python/netcdf4-python/netcdf4-python-1.5.7.ebuild
@@ -0,0 +1,47 @@
+# 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 optfeature
+
+MY_PN="netCDF4"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Python/numpy interface to the netCDF C library"
+HOMEPAGE="https://unidata.github.io/netcdf4-python/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+S="${WORKDIR}"/${MY_P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	sci-libs/hdf5
+	sci-libs/netcdf:=[hdf5]"
+RDEPEND="${DEPEND}
+	dev-python/cftime[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		sci-libs/hdf5
+		sci-libs/netcdf[hdf5,tools]
+		dev-python/cftime[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+	)"
+
+python_test() {
+	local -x NO_NET=1
+	cd test || die
+	"${EPYTHON}" run_all.py || die
+}
+
+pkg_postinst() {
+	optfeature "HDF4 support" sci-libs/hdf "sci-libs/netcdf[hdf]"
+	optfeature "MPI parallel IO support" "sci-libs/hdf5[mpi]" "sci-libs/netcdf[mpi]"
+	optfeature "OPeNDAP support" net-misc/curl "sci-libs/netcdf[dap]"
+}
diff --git a/dev-python/oslo-config/oslo-config-8.3.3-r1.ebuild b/dev-python/oslo-config/oslo-config-8.3.3-r1.ebuild
new file mode 100644
index 000000000000..1e0736fc5f19
--- /dev/null
+++ b/dev-python/oslo-config/oslo-config-8.3.3-r1.ebuild
@@ -0,0 +1,45 @@
+# 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
+
+MY_PN=${PN/-/.}
+
+DESCRIPTION="Oslo Configuration API"
+HOMEPAGE="https://launchpad.net/oslo"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
+
+RDEPEND=">=dev-python/pbr-1.3[${PYTHON_USEDEP}]
+	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+	>=dev-python/rfc3986-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-3.12.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.18.0[${PYTHON_USEDEP}]
+	dev-python/importlib_metadata[${PYTHON_USEDEP}]
+"
+BDEPEND=">=dev-python/pbr-1.3[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
+		>=dev-python/requests-mock-1.5.0[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests unittest
+
+python_test() {
+	local -x COLUMNS=80
+	eunittest -b
+}
diff --git a/dev-python/oslo-context/oslo-context-3.1.1.ebuild b/dev-python/oslo-context/oslo-context-3.1.1.ebuild
index 7e93d105028a..25dbbf4a060e 100644
--- a/dev-python/oslo-context/oslo-context-3.1.1.ebuild
+++ b/dev-python/oslo-context/oslo-context-3.1.1.ebuild
@@ -2,9 +2,8 @@
 # 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
 
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
 inherit distutils-r1
 
 DESCRIPTION="Helpers to maintain useful information about a request context"
@@ -18,6 +17,12 @@ KEYWORDS="amd64 ~arm arm64 x86"
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
 	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
-DEPEND="${CDEPEND}"
 RDEPEND="${CDEPEND}
 	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]"
+BDEPEND="${CDEPEND}
+	test? (
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests unittest
diff --git a/dev-python/oslo-i18n/Manifest b/dev-python/oslo-i18n/Manifest
index 218743fbaa7d..fe6bee888c34 100644
--- a/dev-python/oslo-i18n/Manifest
+++ b/dev-python/oslo-i18n/Manifest
@@ -1 +1 @@
-DIST oslo-i18n-5.0.1.tar.gz 44636 BLAKE2B 69df723bff7a279ace2a8bb2ea795e6beaa626ffc4bb364c513d16d2ce3cb07f6e9957a98d1b633f95154672d118de6fbb71ef5c1a3a53520f4d1f4b8f72748f SHA512 d55238616dc90f85ff458fc6680b3a3b2493d2a640bf5849c19cd7271e7127b535a301ed3085b5e0131b46a635b5a09423f6cba60f9f1b9b0352a0e7115a8057
+DIST oslo.i18n-5.0.1.tar.gz 44636 BLAKE2B 69df723bff7a279ace2a8bb2ea795e6beaa626ffc4bb364c513d16d2ce3cb07f6e9957a98d1b633f95154672d118de6fbb71ef5c1a3a53520f4d1f4b8f72748f SHA512 d55238616dc90f85ff458fc6680b3a3b2493d2a640bf5849c19cd7271e7127b535a301ed3085b5e0131b46a635b5a09423f6cba60f9f1b9b0352a0e7115a8057
diff --git a/dev-python/oslo-i18n/metadata.xml b/dev-python/oslo-i18n/metadata.xml
index 17066a1642db..a3fcd45d02ce 100644
--- a/dev-python/oslo-i18n/metadata.xml
+++ b/dev-python/oslo-i18n/metadata.xml
@@ -9,6 +9,10 @@
   <email>openstack@gentoo.org</email>
   <name>Openstack</name>
  </maintainer>
+ <maintainer type="project">
+  <email>python@gentoo.org</email>
+  <name>Python</name>
+ </maintainer>
  <upstream>
   <remote-id type="pypi">oslo.i18n</remote-id>
   <remote-id type="launchpad">oslo</remote-id>
diff --git a/dev-python/oslo-i18n/oslo-i18n-5.0.1.ebuild b/dev-python/oslo-i18n/oslo-i18n-5.0.1.ebuild
index cbecb87e2e33..9e4f9789cefc 100644
--- a/dev-python/oslo-i18n/oslo-i18n-5.0.1.ebuild
+++ b/dev-python/oslo-i18n/oslo-i18n-5.0.1.ebuild
@@ -2,16 +2,17 @@
 # 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 vcs-snapshot
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+inherit distutils-r1
 
 MY_PN=${PN/-/.}
+MY_P=${MY_PN}-${PV}
 
 DESCRIPTION="Oslo i18n library"
 HOMEPAGE="https://launchpad.net/oslo"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
 
 LICENSE="Apache-2.0"
 SLOT="0"
@@ -19,8 +20,14 @@ KEYWORDS="amd64 ~arm arm64 x86"
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
 	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
-DEPEND="${CDEPEND}"
 RDEPEND="
 	${CDEPEND}
 	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
 "
+BDEPEND="
+	${CDEPEND}
+	>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
+	>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests unittest
diff --git a/dev-python/oslo-log/oslo-log-4.4.0.ebuild b/dev-python/oslo-log/oslo-log-4.4.0.ebuild
index af3141af2564..839839e5d503 100644
--- a/dev-python/oslo-log/oslo-log-4.4.0.ebuild
+++ b/dev-python/oslo-log/oslo-log-4.4.0.ebuild
@@ -2,9 +2,8 @@
 # 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
 
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
 inherit distutils-r1
 
 DESCRIPTION="OpenStack logging config library, configuration for all openstack projects."
@@ -25,4 +24,15 @@ RDEPEND=">=dev-python/pbr-3.1.1[${PYTHON_USEDEP}]
 	>=dev-python/debtcollector-1.19.0[${PYTHON_USEDEP}]
 	>=dev-python/pyinotify-0.9.6[${PYTHON_USEDEP}]
 	>=dev-python/python-dateutil-2.7.0[${PYTHON_USEDEP}]"
-DEPEND=">=dev-python/pbr-3.1.1[${PYTHON_USEDEP}]"
+BDEPEND=">=dev-python/pbr-3.1.1[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/testtools-2.3.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-3.3.0[${PYTHON_USEDEP}]
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests unittest
+
+python_test() {
+	eunittest -b
+}
diff --git a/dev-python/pysimdjson/Manifest b/dev-python/pysimdjson/Manifest
index d28264699a9f..4b2bb95a2bd7 100644
--- a/dev-python/pysimdjson/Manifest
+++ b/dev-python/pysimdjson/Manifest
@@ -1,3 +1,4 @@
 DIST pysimdjson-3.1.1.tar.gz 3286141 BLAKE2B f1fc63ffcaf524f23112438a8669caf4b4ffa0190bb20e2b851f61dfae386fe02bff1746dd4e68499bdaff3420d41401424fde1332222fe49211d32e09fdcab8 SHA512 9b1080d70f06e5a6d6467769a8146f642adee2c08391a87dd86eca9b0eb7666d9fed47a83d991843b07c2b96906dbf0ccacf2425bfc3ce4cb22731e03b12122e
 DIST pysimdjson-3.2.0.tar.gz 3357720 BLAKE2B 596738da76d008563e31c6231d348fefb8f37dd4dee2490339a6233ba0a39ab24dc3facf1d02a4621f1d6e01dfb4af8673651d79095919ee7f4532a25dd1c63f SHA512 4c72d71ead5675c2d9b1551b5dacadee013fbaa74f93b2345920f0bac8eb65d79dd84ee817d07fea0bdf477c1c97ca4746048fbdd06a4bfa516e063d89724226
 DIST pysimdjson-4.0.0.tar.gz 3738787 BLAKE2B 744d6bc53511e03e8e716d6c65771432c7bf8f7876bbf8c78d09459a8b170d3d396f9cc8996894f67110f4b7389526d454dffd687b1fda22df7f76f027af44db SHA512 8b3040ce44bb5042b70a14d9f67c312a375d1a12ba7a66466935a48ad0f8def9c21e200c8c93aa755110a674e95920fa7d0567c4f584be5392b70719994a2213
+DIST pysimdjson-4.0.2.tar.gz 3740054 BLAKE2B 379c8637096074615f2045171e0950af0190e8485db6a1734f4fcd19d9eeeebd91cb79c18abd2fe6256287f15aa6a3c12c1283e4affa131db14f9948ab2f0d63 SHA512 537b7958dd3429831ee201b6a4fc5fa8fca50ad14def016b472d3f234f81175441152c1823eed0bcad06f59e274e2b6b036f26a3af8f6977ceea5807471de4a5
diff --git a/dev-python/pysimdjson/pysimdjson-4.0.2.ebuild b/dev-python/pysimdjson/pysimdjson-4.0.2.ebuild
new file mode 100644
index 000000000000..9ca7cd330d0d
--- /dev/null
+++ b/dev-python/pysimdjson/pysimdjson-4.0.2.ebuild
@@ -0,0 +1,42 @@
+# 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="Python bindings for simdjson"
+HOMEPAGE="https://github.com/TkTech/pysimdjson"
+SRC_URI="https://github.com/TkTech/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-libs/simdjson:=
+"
+DEPEND=${RDEPEND}
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+"
+distutils_enable_tests pytest
+
+PATCHES=(
+	"${FILESDIR}"/pysimdjson-4.0.0-unbundle.patch
+)
+
+src_prepare() {
+	# benchmarks aren't run
+	sed -i -e 's:pytest-benchmark::' setup.cfg || die
+	# force regen
+	rm simdjson/csimdjson.cpp || die
+	# bundled lib :-(
+	rm simdjson/simdjson.{cpp,h} || die
+
+	distutils-r1_src_prepare
+
+	export BUILD_WITH_CYTHON=1
+	export BUILD_WITH_SYSTEM_LIB=1
+}
diff --git a/dev-python/pythran/pythran-0.9.11.ebuild b/dev-python/pythran/pythran-0.9.11.ebuild
index c2bd50221584..6fdc774cc79c 100644
--- a/dev-python/pythran/pythran-0.9.11.ebuild
+++ b/dev-python/pythran/pythran-0.9.11.ebuild
@@ -28,7 +28,11 @@ RDEPEND="
 	dev-python/six[${PYTHON_USEDEP}]"
 BDEPEND="
 	test? (
+		dev-python/ipython[${PYTHON_USEDEP}]
 		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		dev-python/scipy[${PYTHON_USEDEP}]
+		dev-python/wheel[${PYTHON_USEDEP}]
+		virtual/cblas
 	)"
 
 distutils_enable_tests pytest
diff --git a/dev-python/pytimeparse/pytimeparse-1.1.8.ebuild b/dev-python/pytimeparse/pytimeparse-1.1.8.ebuild
index 9b4f1689b499..f4d78bc27271 100644
--- a/dev-python/pytimeparse/pytimeparse-1.1.8.ebuild
+++ b/dev-python/pytimeparse/pytimeparse-1.1.8.ebuild
@@ -13,3 +13,13 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64"
+
+python_test() {
+	local unittest_args=(
+		--verbose
+		--locals
+		pytimeparse.tests.testtimeparse
+	)
+
+	"${PYTHON}" -m unittest "${unittest_args[@]}" || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/sip/sip-5.5.0-r2.ebuild b/dev-python/sip/sip-5.5.0-r2.ebuild
index ac42d9d2c411..2890e70f621a 100644
--- a/dev-python/sip/sip-5.5.0-r2.ebuild
+++ b/dev-python/sip/sip-5.5.0-r2.ebuild
@@ -17,8 +17,8 @@ else
 fi
 S=${WORKDIR}/${MY_P}
 
-SLOT="5"
 LICENSE="|| ( GPL-2 GPL-3 SIP )"
+SLOT="5"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 RDEPEND="
diff --git a/dev-python/sip/sip-6.1.1.ebuild b/dev-python/sip/sip-6.1.1.ebuild
index ac42d9d2c411..2890e70f621a 100644
--- a/dev-python/sip/sip-6.1.1.ebuild
+++ b/dev-python/sip/sip-6.1.1.ebuild
@@ -17,8 +17,8 @@ else
 fi
 S=${WORKDIR}/${MY_P}
 
-SLOT="5"
 LICENSE="|| ( GPL-2 GPL-3 SIP )"
+SLOT="5"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 RDEPEND="
diff --git a/dev-python/sure/Manifest b/dev-python/sure/Manifest
index a90597c5a9d6..1c6c8c5edd8d 100644
--- a/dev-python/sure/Manifest
+++ b/dev-python/sure/Manifest
@@ -1 +1,2 @@
 DIST sure-1.4.11.tar.gz 45933 BLAKE2B b2146ee56237f4575cab5122279023066a1b9ba20493ced7d729b1afa456f71a38071b721c39594c3ef2fcc912ba934e85e5cb5da576c3b2d20fa7d4926b56b7 SHA512 ed067385bf9cf317a5d55f6c5fc6ee54ee3d592825be398e47c37d31fc9c010cb9316d4e2bcf1d72d53d7e53fd470792d64348aa2bfa5dc43510daaff97742da
+DIST sure-2.0.0.tar.gz 46747 BLAKE2B 631923bf2fc0a972e276fbfd1918abbafec28e662669993b40ff8ca72944952d092ac662728f98a286fc9b5c8e3765d10a4d6ef1f17b17655802b971b97410af SHA512 8286846374c2bfc773444e90bf4f9c0b0d66d0229afa53af63025bfec690bf8bcc959f86c238ca5244c6a29099e955691771b0eb954af479bde2f17e51f6f1de
diff --git a/dev-python/sure/sure-2.0.0.ebuild b/dev-python/sure/sure-2.0.0.ebuild
new file mode 100644
index 000000000000..a55beb8a8af4
--- /dev/null
+++ b/dev-python/sure/sure-2.0.0.ebuild
@@ -0,0 +1,30 @@
+# 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="idiomatic assertion toolkit with human-friendly failure messages"
+HOMEPAGE="https://github.com/gabrielfalcao/sure"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="
+	dev-python/mock[${PYTHON_USEDEP}]
+	>=dev-python/nose-1.3.0[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests nose
+
+src_prepare() {
+	# remove unnecessary dep
+	sed -i -e '/rednose/d' setup.cfg || die
+	distutils-r1_src_prepare
+}