Adding metadata

59 files changed, 357 insertions, 766 deletions

diff --git a/dev-python/agate-dbf/Manifest b/dev-python/agate-dbf/Manifest
index e4b2d936f798..55efe872b2a3 100644
--- a/dev-python/agate-dbf/Manifest
+++ b/dev-python/agate-dbf/Manifest
@@ -1,4 +1 @@
-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
+DIST agate-dbf-0.2.2.gh.tar.gz 8727 BLAKE2B 1397e87ebecff43380d17628867317e9b66584f4281609717b86c30cfa286e6d9ab32d8250c99c698c887aceae28ad4af311e0f777525283b30b65c15582895d SHA512 a92c19db922cc3f896fbe21f33afacd757a7fa3d6a26545033a898665a87765ddf4af964e4cba315cee0c70da926c965aaf68b64af86cf2aabbb9a68a65a38fe
diff --git a/dev-python/agate-dbf/agate-dbf-0.2.2-r1.ebuild b/dev-python/agate-dbf/agate-dbf-0.2.2-r1.ebuild
new file mode 100644
index 000000000000..c0eedbe5ddb3
--- /dev/null
+++ b/dev-python/agate-dbf/agate-dbf-0.2.2-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Adds read support for DBF files to agate."
+HOMEPAGE="https://github.com/wireservice/agate-dbf https://pypi.org/project/agate-dbf/"
+SRC_URI="
+	https://github.com/wireservice/agate-dbf/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	>=dev-python/agate-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/dbfread-2.0.5[${PYTHON_USEDEP}]
+"
+BDEPEND="test? ( dev-python/lxml[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
diff --git a/dev-python/agate-dbf/agate-dbf-0.2.2.ebuild b/dev-python/agate-dbf/agate-dbf-0.2.2.ebuild
deleted file mode 100644
index 6472ae31ef92..000000000000
--- a/dev-python/agate-dbf/agate-dbf-0.2.2.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Adds read support for DBF files to agate."
-HOMEPAGE="https://github.com/wireservice/agate-dbf https://pypi.org/project/agate-dbf/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="+xml"
-
-# 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="
-	${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/Manifest b/dev-python/agate-excel/Manifest
index 5199a8bfff6b..f2adb319f02f 100644
--- a/dev-python/agate-excel/Manifest
+++ b/dev-python/agate-excel/Manifest
@@ -1,2 +1 @@
-DIST agate-excel-0.2.3.tar.gz 153880 BLAKE2B f090c8bbb75341623545781cbf116b547ebc16249eb0c6814e9fbd51d2688fd2bd0354d187d2f803bde69e563b57836e3d214e287ae62455c59075020588d235 SHA512 3a50bab182391bdadb2e0a82dc28a3cfa1eebbe67744835ab20581a67f7f08f4edb96eebc9a286ac4a6a302996571563ca9e487ea7defdcf07265e9c42436ddf
 DIST agate-excel-0.2.5.tar.gz 161131 BLAKE2B ed7306dabf8b5da722aec9005da9bdba74a9cc585ea72b429eecc4b1fcbdfed698af8e582c464081867c0d4a285b9bc892efc339f0a08c657d87e61fd1174496 SHA512 5686c3faf8b817589a62d9fac558bebe7f47124685be9f8146d74c206023530d0cec2ad88fa4ba7ac049516f5bec6783ce8f0ff47f8eb8b2ed8aad7316f1771b
diff --git a/dev-python/agate-excel/agate-excel-0.2.3.ebuild b/dev-python/agate-excel/agate-excel-0.2.3.ebuild
deleted file mode 100644
index c1e372617bea..000000000000
--- a/dev-python/agate-excel/agate-excel-0.2.3.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Adds read support for Excel files (xls and xlsx) to agate."
-HOMEPAGE="https://github.com/wireservice/agate-excel https://pypi.org/project/agate-excel/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="+xml"
-
-# 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="
-	${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 deselect=(
-		tests/test_table_xlsx.py::TestXLSX::test_ambiguous_date
-	)
-	epytest ${deselect[@]/#/--deselect }
-}
diff --git a/dev-python/agate-excel/agate-excel-0.2.5.ebuild b/dev-python/agate-excel/agate-excel-0.2.5-r1.ebuild
index 851a0c626ff7..c66deb09f2ee 100644
--- a/dev-python/agate-excel/agate-excel-0.2.5.ebuild
+++ b/dev-python/agate-excel/agate-excel-0.2.5-r1.ebuild
@@ -14,20 +14,14 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="+xml"
 
-# 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="
-	${AGATE_VERSION_DEP}[${PYTHON_USEDEP}]
+	>=dev-python/agate-1.5.0[${PYTHON_USEDEP}]
 	dev-python/olefile[${PYTHON_USEDEP}]
 	>=dev-python/openpyxl-2.3.0[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]
 	>=dev-python/xlrd-0.9.4[${PYTHON_USEDEP}]
-
-	${TEST_AGAINST_RDEPEND}
 "
-BDEPEND="test? ( ${AGATE_VERSION_DEP}[xml,${PYTHON_USEDEP}] )"
+BDEPEND="test? ( dev-python/lxml[${PYTHON_USEDEP}] )"
 
 distutils_enable_tests pytest
diff --git a/dev-python/agate-sql/Manifest b/dev-python/agate-sql/Manifest
index 550bbfd0fd4b..089df186cca0 100644
--- a/dev-python/agate-sql/Manifest
+++ b/dev-python/agate-sql/Manifest
@@ -1,2 +1 @@
-DIST agate-sql-0.5.7.tar.gz 14975 BLAKE2B 7890d5c21d89dd216a7a4c906189e1e44111bd96ef3476f0e6dc4c842dc3f25d537ee398f3c8e720d43e64001fa0ea93940d4a54ee31605eea9e8ae9aa4dec37 SHA512 df7e1d5975d9af0722f4bfa67f1e8679ed46759f8aaa5c76614ed5280c8347f727517568ba377c21dd8eb349f93b7a6d308959ae69bfedd125e6d99bd7bd9dcf
 DIST agate-sql-0.5.8.tar.gz 15182 BLAKE2B 4228c5cbb8fd35b9cd97ffb590fa603e290eb2e5ace9676156ff388f653419080691b29caa4a76c16ea585c91d8126bae3dd500e8438b450737ae55309cf77f7 SHA512 1a793a24561061f5100f24834af65dca943c964cf4aed1504336cafed3d52a95b4787f21ba804b0f2265d5670cabfaa40b7f3d02c120486186cf6e03e7a2938e
diff --git a/dev-python/agate-sql/agate-sql-0.5.7.ebuild b/dev-python/agate-sql/agate-sql-0.5.7.ebuild
deleted file mode 100644
index 0c7f9ccf3e2e..000000000000
--- a/dev-python/agate-sql/agate-sql-0.5.7.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-inherit distutils-r1
-
-DESCRIPTION="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="+xml"
-
-# 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 deselect=(
-		tests/test_agatesql.py::TestSQL::test_to_sql_create_statement_with_dialects
-		tests/test_agatesql.py::TestSQL::test_to_sql_create_statement_with_schema
-	)
-	epytest ${deselect[@]/#/--deselect }
-}
diff --git a/dev-python/agate-sql/agate-sql-0.5.8.ebuild b/dev-python/agate-sql/agate-sql-0.5.8-r1.ebuild
index 69354a51d247..8c40940bb0ac 100644
--- a/dev-python/agate-sql/agate-sql-0.5.8.ebuild
+++ b/dev-python/agate-sql/agate-sql-0.5.8-r1.ebuild
@@ -13,18 +13,12 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="+xml"
 
-# 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/agate-1.5.0[${PYTHON_USEDEP}]
 	>=dev-python/sqlalchemy-1.0.8[${PYTHON_USEDEP}]
-
-	${TEST_AGAINST_RDEPEND}
 "
-BDEPEND="test? ( ${AGATE_VERSION_DEP}[xml,${PYTHON_USEDEP}] )"
+BDEPEND="test? ( dev-python/lxml[${PYTHON_USEDEP}] )"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/agate/agate-1.6.3.ebuild b/dev-python/agate/agate-1.6.3-r1.ebuild
index 3b88760d8504..e72c1d8563ec 100644
--- a/dev-python/agate/agate-1.6.3.ebuild
+++ b/dev-python/agate/agate-1.6.3-r1.ebuild
@@ -13,11 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="+xml"
 
-# Other packages have BDEPEND="test? ( dev-python/agate[xml] )"
-LEATHER_VERSION_DEP=">=dev-python/leather-0.3.3-r2"
-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}]
@@ -26,21 +22,16 @@ 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}]
-	${LEATHER_VERSION_DEP}[${PYTHON_USEDEP}]
-
-	${TEST_AGAINST_RDEPEND}
+	>=dev-python/leather-0.3.3-r2[${PYTHON_USEDEP}]
 "
-BDEPEND="test? ( ${LEATHER_VERSION_DEP}[xml,${PYTHON_USEDEP}] )"
+BDEPEND="test? ( dev-python/lxml[${PYTHON_USEDEP}] )"
 
 distutils_enable_tests pytest
 distutils_enable_sphinx docs \
 	dev-python/sphinx_rtd_theme
 
-python_test() {
-	local deselect=(
-		# require specific locales
-		tests/test_data_types.py::TestDate::test_cast_format_locale
-		tests/test_data_types.py::TestDateTime::test_cast_format_locale
-	)
-	epytest ${deselect[@]/#/--deselect }
-}
+EPYTEST_DESELECT=(
+	# require specific locales
+	tests/test_data_types.py::TestDate::test_cast_format_locale
+	tests/test_data_types.py::TestDateTime::test_cast_format_locale
+)
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index 65bde51ba5e8..5193db06b013 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -6,3 +6,4 @@ DIST boto3-1.18.54.tar.gz 422231 BLAKE2B a010a19a801a939421fab0b8b28ca36bfaceb30
 DIST boto3-1.18.55.tar.gz 422930 BLAKE2B 2e30f585f2a99d30b9683893c706a9d00bcabc15bba7f033753cf8c0463c40227a5c668f29deff78da0cca02321e79a99329fa5acb8a4e6430970c08f1fe851a SHA512 1b885d423f17edcd441c48a3a456c70f823fd65b94ac89011d1dcfee1ba1d67fbe7e9470869d73733876abdaa4d8e13593ceaffd446ff46e4dc2dbd85cb2bc30
 DIST boto3-1.18.56.tar.gz 423262 BLAKE2B 97caee83b3bd074157096383d069427f1a2fae7917927983d5e9f3c1f11cf5d710050a505bdfa047259434b9b8f358f276de54a9e879b31c0eafb3c14f5c172a SHA512 cda79fc07e1f4c37b3aa0644bd1e81e157de19b1b47f4cebd5d7a66e5ca9653649ba9bf84c7d88dce383b592d673b0ee85fa823247517aa24f869af13755ed2d
 DIST boto3-1.18.57.tar.gz 423704 BLAKE2B 8b778a6e5549ed81ae411521e3d1e4792a18a539a3f7896022739ca25a9ee1f266b555f4baee507ac71c5129c6a8e919e6d95255f5c0dd64136d89d6fbe5605a SHA512 cad772acd9c93e61fd3f77c935986e0d50235591c63bcb27bc925292012a66c7d0a4a62e6c5129b8f26978eb9e5802eb80533e24566d8b369951c6c5ea42e28c
+DIST boto3-1.18.58.tar.gz 424336 BLAKE2B 3f1d74885b0668e4926c90395da4cdb1fd5a59ae24364d6c3f409ad29e3f8d0bbe733a7166ec6d33aa4ffeef97f42838af9c304ccf3e82815fe6018bfb8c4f25 SHA512 f44f93d2ea5a86f394c5f5875c02fcfd2056071fe0ff4cb482b8c861f01485001a5cd036a4c34435818e55a8bdae6d58c96761ff843dc9326c1cfe22be3129a7
diff --git a/dev-python/boto3/boto3-1.18.58.ebuild b/dev-python/boto3/boto3-1.18.58.ebuild
new file mode 100644
index 000000000000..30a0b44d3f8c
--- /dev/null
+++ b/dev-python/boto3/boto3-1.18.58.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+inherit distutils-r1
+
+DESCRIPTION="The AWS SDK for Python"
+HOMEPAGE="https://github.com/boto/boto3"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/boto3"
+	inherit git-r3
+	BOTOCORE_PV=${PV}
+else
+	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+	# botocore is x.(y+3).z
+	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
+fi
+
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# don't lock versions to narrow ranges
+	sed -e '/botocore/ d' \
+		-e '/jmespath/ d' \
+		-e '/s3transfer/ d' \
+		-i setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	epytest tests/{functional,unit}
+}
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index 5a0b1c01308f..cd9c64dcdeeb 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -6,3 +6,4 @@ DIST botocore-1.21.54.tar.gz 8221388 BLAKE2B ea72e84b9ba5cb4d97a3a353f3fdd2fe808
 DIST botocore-1.21.55.tar.gz 8225756 BLAKE2B 8a0d333802cc196552d905c61716f601e2725c1b19a296a3e07b6f6e4b2deded5dadb68ab9de1aa5c2a07b34ec4c9eb333c2131e6a479998e150810a4b31e75e SHA512 2bd2bae733d2846c41415ddd07431abcd553f8220e87e228b1f91dd7b7af5b8f8918a43bd79a9b8d2b0196098c37b05eed6433859beb74f806bb20717ac41d8e
 DIST botocore-1.21.56.tar.gz 8227172 BLAKE2B 0a783e76c0a4a3ea577661a5995fdb2e53658aa462a6e59a950979c3c35864e94df1848aa5af40270e03833797bcd48c45f633dd8fbb198b2913df975f59069a SHA512 cb4f3e72f8d0bb9451b6b748e3763f6456937938047a2d9a6c5f47c498329b6930bc324e7d6f296952816c96aeb74047f7c2e33044abb551d289d24659a406e5
 DIST botocore-1.21.57.tar.gz 8239528 BLAKE2B d2b98f37468e0faf593d5fd42341dcab32d7ade253c80929722adbe7523ed6efb2b491a12b4335faf779703acc6eabbd3e1c6e0a02994d24dd13cea7d376bf6e SHA512 6bfcd57c7ac77c1098004e5e8a77c14a3718099eda5af00fbcaa0f54fabd93caf0ce66212c5807ae58d565cadfee25dfdcff9dcef8a68e66ba74f03ee28acfb9
+DIST botocore-1.21.58.tar.gz 8243903 BLAKE2B a8666451aa7e39114afce45d1eb82fed8f1747b6f994dc5ec76f8c675c363fd196c2c23d26738ca2a1c67e451d2eff1024d01ef97ff0dfb425d8fa85a9c0eef6 SHA512 424f13d7f3c5c2b3b2546cf42f22588a53c407867c8e2672c01f6c3791d101ff42f5d7a300cffbcccafdfc78f28a4386ef9acc4562de3c124198d1c898e5701d
diff --git a/dev-python/botocore/botocore-1.21.58.ebuild b/dev-python/botocore/botocore-1.21.58.ebuild
new file mode 100644
index 000000000000..9cd77a5ad4d0
--- /dev/null
+++ b/dev-python/botocore/botocore-1.21.58.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+inherit distutils-r1
+
+DESCRIPTION="Low-level, data-driven core of boto 3"
+HOMEPAGE="https://github.com/boto/botocore"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/botocore"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/jmespath[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/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 pytest
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	epytest tests/{functional,unit}
+}
diff --git a/dev-python/click/Manifest b/dev-python/click/Manifest
index 2b8c6583eb94..ed852ba59a50 100644
--- a/dev-python/click/Manifest
+++ b/dev-python/click/Manifest
@@ -1,2 +1,3 @@
 DIST click-7.1.2.tar.gz 295757 BLAKE2B aea76d5378cfa49fe58a83132737d609d48b3d3a71ec65c0a8a144c7a0e244b5bdf0196ffe2150889b82edda20c3f1faa3c84a227fc9ef459a5a9646cff86129 SHA512 d0caf2fb0a258774a18a7b8f83bdfa73abeb70196a70b45a6cc35befaeb862d068d2f2cce4e27201ab2e3adcd02e7e2f099d6c37c497a507010eefa10ad16eba
 DIST click-8.0.1.tar.gz 330890 BLAKE2B ae0a29bf1848e92c21ade72fb8ce08991c9edf6d5afb6d70a0dd85cdbfacffeac69a675dc0842566ae23ed8c666deac97879ad4611e8294ee1c6896ea2ddca8a SHA512 d93ec1d070dfa306733ee79893c64de9afcb0c7bf03d3f543dd697ef195f3a750828f77842a22886960a938740b92f0122962076ea52b911b87f7f75941a9032
+DIST click-8.0.2.tar.gz 332870 BLAKE2B b1c623dfa14239b6eda24aa20eb24936954cce7dec4add75cbf1a236a128fcaa2fbb21ce0da181e7d3fe6e13d808ba9ef39166152eebea06ae1a68b08c238e74 SHA512 473184751fde7a09b0730e84db2204fa3bc72d583e0edf5a2897a4bae8f1d2ffdf01c69ae971d9158cc59d22eb852eb83f28428a2635a95c43596abbc9257891
diff --git a/dev-python/click/click-8.0.2.ebuild b/dev-python/click/click-8.0.2.ebuild
new file mode 100644
index 000000000000..df774ccd9da0
--- /dev/null
+++ b/dev-python/click/click-8.0.2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="A Python package for creating beautiful command line interfaces"
+SRC_URI="https://github.com/pallets/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://palletsprojects.com/p/click/ https://pypi.org/project/click/"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+IUSE="examples"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/importlib_metadata[${PYTHON_USEDEP}]
+	' pypy3)"
+
+distutils_enable_sphinx docs \
+	'>=dev-python/docutils-0.14' \
+	dev-python/pallets-sphinx-themes \
+	dev-python/sphinxcontrib-log_cabinet \
+	dev-python/sphinx-issues
+distutils_enable_tests pytest
+
+python_install_all() {
+	use examples && dodoc -r examples
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/csvkit/csvkit-1.0.6.ebuild b/dev-python/csvkit/csvkit-1.0.6-r1.ebuild
index 95739f230473..eb989105e682 100644
--- a/dev-python/csvkit/csvkit-1.0.6.ebuild
+++ b/dev-python/csvkit/csvkit-1.0.6-r1.ebuild
@@ -15,27 +15,18 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="+xml"
 
-# 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-1.6.1[${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}] )"
+BDEPEND="test? ( dev-python/lxml[${PYTHON_USEDEP}] )"
 
 distutils_enable_tests pytest
 
-python_test() {
-	local deselect=(
-		tests/test_utilities/test_in2csv.py::TestIn2CSV::test_convert_dbf
-	)
-	epytest ${deselect[@]/#/--deselect }
-}
+EPYTEST_DESELECT=(
+	tests/test_utilities/test_in2csv.py::TestIn2CSV::test_convert_dbf
+)
diff --git a/dev-python/curtsies/Manifest b/dev-python/curtsies/Manifest
index 6d04c7c237c5..2bb9543c1610 100644
--- a/dev-python/curtsies/Manifest
+++ b/dev-python/curtsies/Manifest
@@ -1,3 +1,4 @@
+DIST curtsies-0.3.10.tar.gz 53340 BLAKE2B 376258a71c1e89b241c2fb9439b7f094b72cdc19f50c075debfba019effed5b3b5286603b44f11e37420d4e0be0dce0cb69fc6e11dab332c6f1c109c1b7a098a SHA512 59dfae36a43f7cdb272f94900da81bc7a1033a6482df5ac5babb329659e16d740f98b9538146f2fe7c79aa2723ec3db10c8ec658539db7d462b02953a33cb4ca
 DIST curtsies-0.3.5.tar.gz 53472 BLAKE2B 7ff50b8cf4b1b5016f15eee00333a1de38a31d97444f6462c7ec0429a1656bad442126880f770bff575dde8456660169cfadf63fed804b2c7890d700d792cc87 SHA512 e46ab3f79e2385055e4f3f9bc1d2c341605b93c21a0e6c42f4807b1801d37f70cfbdd1006db1ec12257e95d91aedddd95aa31a7de99bbfc09a6f0ee473497747
 DIST curtsies-0.3.6.tar.gz 53259 BLAKE2B 358e4d7a3ad8e5f705041cf8fdab9a26f0829d57dac93d23d1a524cb5bf2ca784aff9ea17d0e1c73ef4112f2b5b826f80d4c8d300ecd4ed53b031b3e81c78052 SHA512 3ba7050a614c992c6117e61758e378c82467f413f507277ddb78e42c03dbefe34c4fc4a60b29a8f8b24e8141b0521c87df81421fce5c7c64c28f6156b5af8207
 DIST curtsies-0.3.7.tar.gz 52487 BLAKE2B b5fdae3a2bc3900aa4221a39244fe3c781e004d378952af82c6275cb23fa53830f7f54ce5430287c8a5131ca220fb4aa7cddf33a4b913b27de35f1e275578b23 SHA512 a3c197a49c85f644fce3507380f6c77b857e2e97141634178b5d7c6b7673e90407fce68550c329dd4267e69e10fda3133522baadd765269b61e3f9fb800b7193
diff --git a/dev-python/curtsies/curtsies-0.3.10.ebuild b/dev-python/curtsies/curtsies-0.3.10.ebuild
new file mode 100644
index 000000000000..047b7c049ce1
--- /dev/null
+++ b/dev-python/curtsies/curtsies-0.3.10.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+inherit distutils-r1
+
+DESCRIPTION="Curses-like terminal wrapper, with colored strings"
+HOMEPAGE="https://github.com/bpython/curtsies"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-python/blessings-1.5[${PYTHON_USEDEP}]
+	dev-python/cwcwidth[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pyte[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/feedparser/feedparser-5.2.1-r1.ebuild b/dev-python/feedparser/feedparser-5.2.1-r2.ebuild
index 76618a39a912..5f57dda6802a 100644
--- a/dev-python/feedparser/feedparser-5.2.1-r1.ebuild
+++ b/dev-python/feedparser/feedparser-5.2.1-r2.ebuild
@@ -15,11 +15,12 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="BSD-2 PSF-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE=""
 
 # Tests have issues with chardet installed, and are just kind of buggy.
 RESTRICT="test"
 
+BDEPEND="<dev-python/setuptools-58[${PYTHON_USEDEP}]"
+
 PATCHES=(
 	"${FILESDIR}/${P}-sgmllib.patch"
 )
diff --git a/dev-python/fudge/Manifest b/dev-python/fudge/Manifest
deleted file mode 100644
index c2b5d75ffbcd..000000000000
--- a/dev-python/fudge/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST fudge-1.1.1.tar.gz 87604 BLAKE2B 2660022089ab50139fd4a63aa212c0f53d04557571fa444cc2fd74dd556475c04d3563359c49f0252d811b93a3d4215dddca32c7db91b81682adae2a7fb7f772 SHA512 4a5043048aef1bc4c7806b7a13e138810295f882739f728115a60f2b0157716d85a7bed8a3641b76213b788c74fe586f57854f96bf7a745d6006ad6e67dca136
diff --git a/dev-python/fudge/fudge-1.1.1.ebuild b/dev-python/fudge/fudge-1.1.1.ebuild
deleted file mode 100644
index 2cf5e5fe6f75..000000000000
--- a/dev-python/fudge/fudge-1.1.1.ebuild
+++ /dev/null
@@ -1,22 +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="Replace real objects with fakes (mocks, stubs, etc) while testing"
-HOMEPAGE="http://farmdev.com/projects/fudge/ https://pypi.org/project/fudge/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-
-distutils_enable_sphinx docs
-distutils_enable_tests nose
-
-python_test() {
-	nosetests -w "${BUILD_DIR}"/lib || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/fudge/metadata.xml b/dev-python/fudge/metadata.xml
deleted file mode 100644
index 11d931f56414..000000000000
--- a/dev-python/fudge/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
-  <email>python@gentoo.org</email>
-  <name>Python</name>
- </maintainer>
- <upstream>
-  <remote-id type="pypi">fudge</remote-id>
- </upstream>
- <origin>gentoo-staging</origin>
-</pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/funcparserlib/funcparserlib-0.3.6-r1.ebuild b/dev-python/funcparserlib/funcparserlib-0.3.6-r1.ebuild
index bf396c06a4a9..805b9109ecc6 100644
--- a/dev-python/funcparserlib/funcparserlib-0.3.6-r1.ebuild
+++ b/dev-python/funcparserlib/funcparserlib-0.3.6-r1.ebuild
@@ -14,6 +14,8 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
 
+BDEPEND="<dev-python/setuptools-58[${PYTHON_USEDEP}]"
+
 python_test() {
 	cd "${BUILD_DIR}"/lib || die
 	"${EPYTHON}" -m unittest discover -v || die "Tests fail with ${EPYTHON}"
diff --git a/dev-python/google-auth/google-auth-2.3.0.ebuild b/dev-python/google-auth/google-auth-2.3.0.ebuild
index 5dbfea8e2d83..582338edca0f 100644
--- a/dev-python/google-auth/google-auth-2.3.0.ebuild
+++ b/dev-python/google-auth/google-auth-2.3.0.ebuild
@@ -33,7 +33,6 @@ BDEPEND="
 		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}]
@@ -44,6 +43,12 @@ BDEPEND="
 
 distutils_enable_tests pytest
 
+EPYTEST_IGNORE=(
+	# these are compatibility tests with oauth2client
+	# disable them to unblock removal of that package
+	tests/test__oauth2client.py
+)
+
 python_install_all() {
 	distutils-r1_python_install_all
 	find "${ED}" -name '*.pth' -delete || die
diff --git a/dev-python/hypothesis/Manifest b/dev-python/hypothesis/Manifest
index 7db5d774a62c..7041b0bd4f78 100644
--- a/dev-python/hypothesis/Manifest
+++ b/dev-python/hypothesis/Manifest
@@ -3,3 +3,4 @@ DIST hypothesis-python-6.21.6.tar.gz 9166313 BLAKE2B 19ac66c1674be30e14d54faa612
 DIST hypothesis-python-6.22.0.tar.gz 9166539 BLAKE2B 386c7fd4f9ff0d4d199f686f25743793de4de9f2676cf7c36c16519f5fef007f6b677bd5ef84fa975389c5fea9989dffffc8a18923699c05fecc23ef2e4dc5e6 SHA512 92352a7ba13d8a06532c6fcdb965f156c43369f18ba7c46808d9b6dde1ccdd5b4f938c1ce575d5651835bfe981d22e7a68189c93a368420c915f5d1ce9b8a205
 DIST hypothesis-python-6.23.0.tar.gz 9166945 BLAKE2B 89d8a642262dfcbd36d83343c5e632653808711e186f5afae360e870eaacf050b415fd1abeb589b375136f273a53a236da8e4ab6227d94e16c58c8e9d0d3d8a9 SHA512 43d5f1a21d555e2a7942414cfb185e9201d9c5198c12551db7a50f3f118fed4dddc934767a0e7d880dfd044ac1a062b64afc92c5c3f391cedf71b829e177f21d
 DIST hypothesis-python-6.23.1.tar.gz 9167114 BLAKE2B 324df90b9fc09dbaf599905b503119eed22ad32898d118d08cb5a84cbb3a514d0bfea51eca0c9878f3a330702d4822c5c311e9c6e091a6baed51285d8d326c5e SHA512 2d6a10ef6b47e0bc08c90aee62a9f009c5bfe7d64bc6f87fed72232c40a43b86e0ecc744527a611f3cfec571051c4bef3986c4e1970f92526e70bf7f5e523519
+DIST hypothesis-python-6.23.2.tar.gz 9167318 BLAKE2B 0a1ccf0235c64dd69705e48f67c132021898a024e8ae035d2ffc8a416c45443931ffff4a67a13f1c1ee7bbc2201e6f4ca5363568f0ed2ea4743ae46569e45ef1 SHA512 704b8d8c15e1fd510206c8d07f6a0f0bc81249bbc036978e4864e8ce234e35bab89069b0d5a0e958c57fe31fdb63fcc454502ac633d6fd986aaea9841383f36b
diff --git a/dev-python/hypothesis/hypothesis-6.23.2.ebuild b/dev-python/hypothesis/hypothesis-6.23.2.ebuild
new file mode 100644
index 000000000000..8b48444a4699
--- /dev/null
+++ b/dev-python/hypothesis/hypothesis-6.23.2.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+PYTHON_REQ_USE="threads(+),sqlite"
+
+inherit distutils-r1 multiprocessing optfeature
+
+DESCRIPTION="A library for property based testing"
+HOMEPAGE="https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/"
+SRC_URI="https://github.com/HypothesisWorks/${PN}/archive/${PN}-python-${PV}.tar.gz"
+S="${WORKDIR}/${PN}-${PN}-python-${PV}/${PN}-python"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+IUSE="cli"
+
+RDEPEND="
+	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
+	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
+	cli? (
+		$(python_gen_cond_dep '
+			dev-python/black[${PYTHON_USEDEP}]
+			dev-python/click[${PYTHON_USEDEP}]
+		' python3_{7..9})
+	)
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pexpect[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		!!<dev-python/typing-3.7.4.1
+	)
+"
+
+distutils_enable_tests --install pytest
+
+python_prepare() {
+	if ! use cli || ! has "${EPYTHON}" python3.{7..9}; then
+		sed -i -e '/console_scripts/d' setup.py || die
+	fi
+}
+
+python_test() {
+	distutils_install_for_testing
+	epytest tests/cover tests/pytest tests/quality \
+		-p no:pytest-describe \
+		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
+}
+
+pkg_postinst() {
+	optfeature "datetime support" dev-python/pytz
+	optfeature "dateutil support" dev-python/python-dateutil
+	optfeature "numpy support" dev-python/numpy
+	optfeature "django support" dev-python/django dev-python/pytz
+	optfeature "pandas support" dev-python/pandas
+	optfeature "pytest support" dev-python/pytest
+}
diff --git a/dev-python/jsmin/jsmin-2.2.2.ebuild b/dev-python/jsmin/jsmin-2.2.2.ebuild
index d85416109b2c..a180bbd26724 100644
--- a/dev-python/jsmin/jsmin-2.2.2.ebuild
+++ b/dev-python/jsmin/jsmin-2.2.2.ebuild
@@ -15,6 +15,8 @@ KEYWORDS="amd64 x86"
 LICENSE="MIT"
 SLOT="0"
 
+BDEPEND="<dev-python/setuptools-58[${PYTHON_USEDEP}]"
+
 python_test() {
 	"${EPYTHON}" -m jsmin.test -v || die "Tests failed with ${EPYTHON}"
 }
diff --git a/dev-python/jupyter_client/Manifest b/dev-python/jupyter_client/Manifest
index df6bbedcc9b4..eebfe0039ef6 100644
--- a/dev-python/jupyter_client/Manifest
+++ b/dev-python/jupyter_client/Manifest
@@ -1,7 +1,2 @@
 DIST jupyter_client-6.1.12.tar.gz 301499 BLAKE2B 8041b84ad2e89413ee60d1aee2e49a67a89b5aad1c3118c8fa7d7d719c8ec2acbc72278c9aaea095cdcb89235800d09b1792b2138c09a4aad59ceaaf695af431 SHA512 f31ff1a24b264c32d35d07491785e1d77935cdb463243e90e4aadcb0a093a074cdce75f01662591766588f39b146077639ca697f71157309dc92f12ae04d5cdd
-DIST jupyter_client-7.0.1.tar.gz 317467 BLAKE2B bcaa4f58071e0c90e81afb010a10ad221793a186aba0e7ae233538c810b787e3a0bc734735cd20750500c9d74d6c5f548f7deaf3daa3e989d75b5f9cbb5344ee SHA512 5665018294e87b0ae0fe58a7281e205e1668c3676f7092128f4c6ce8eb13e53983fc888508e913085beb29b13b1aa46307c4bf1c8c25bfe1f9efcfb7254bdf3a
-DIST jupyter_client-7.0.2.tar.gz 317686 BLAKE2B f837d60c1013d6f7db7185112820bc40fe55707403dd179c72c93d7f5a9c752436b8454e0ffb0a133c77a4a11e87ea310d86706145d0501a0ed83d36652cc278 SHA512 24684df13947077add0931fe9e8a2c2b629db120c1554123f36b7c9e736f502f9553c63813de93ff84733eb4a47eb0f5dd48961e3c18527fbd8fece23fbe6440
-DIST jupyter_client-7.0.3.tar.gz 318420 BLAKE2B 151cac17dd965f5a151e0de90cffda35d06943ef7548518f6bac9e977fa3efd02cceb30fc23b252c440541ac74a84396dc7a8787fffbbade8d91dcbc2d51781a SHA512 eae57dd9c2fdd0301cdb53204dfc043a228fa606236ee1eca9e37f4d9d213efd080ec1292567431e24d73899db0833984ed4db933998817d03aff1f674217362
-DIST jupyter_client-7.0.4.tar.gz 319415 BLAKE2B 795e10680b0183e6628978cfe2633eaac9d1acf62ca8f72c17cd9d808e9971ec63a251adb7e2f5faaf98f51b06508b55a27686d5a77020cebd858daf61954de1 SHA512 47d17b1369edfe7cac7f2450299558122d88e341515b46992bee716c4bc23f870c131ca1fe86ec8f48f558c2c3ab5c26b05d473b37fd2dcd19c24bc44ba60c03
-DIST jupyter_client-7.0.5.tar.gz 319487 BLAKE2B d8c4e518fb165fbbe6b2de8bd8623d37c9fda6c002753b8a115d615b0c338a6411c4713b974210af45fc40a021bf687b3bc1e7e4f0717c510f569cb7eaf6d793 SHA512 37eba11585d40f52ca5c7a3bf275ee7cd86b2222049abee4b92b32eb6e667e6e5234b8c1dfeb1f67e8bd0d80ee1be1ccf87ffea9f5b5a5e60f217b07063a085c
 DIST jupyter_client-7.0.6.tar.gz 320572 BLAKE2B 5c853fbdad3bc044ffaba27534d9bc4682797660cdb5d45121ae8f6cbf0fc5511c6a9fad14d26bd82daef17b32be14e51bf86c2ae672ed9b310141b29307ff9c SHA512 c836ba061da0461d6d27eb0405ba295ff67bf2c99011a21c9695da139c0a14513de292cdfff3ee00c2e1029c2a51f95094ad875a5f9cdec2fd99c3c079526e3b
diff --git a/dev-python/jupyter_client/jupyter_client-7.0.1.ebuild b/dev-python/jupyter_client/jupyter_client-7.0.1.ebuild
deleted file mode 100644
index 093ec97da16c..000000000000
--- a/dev-python/jupyter_client/jupyter_client-7.0.1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-PYTHON_REQ_USE="threads(+)"
-inherit distutils-r1
-
-DESCRIPTION="Jupyter protocol implementation and client libraries"
-HOMEPAGE="https://jupyter.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-RDEPEND="
-	dev-python/entrypoints[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_core-4.6.0[${PYTHON_USEDEP}]
-	>=dev-python/nest_asyncio-1.5[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
-	>=dev-python/pyzmq-14.4.0[${PYTHON_USEDEP}]
-	>=www-servers/tornado-4.1[${PYTHON_USEDEP}]
-	dev-python/traitlets[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		dev-python/ipykernel[${PYTHON_USEDEP}]
-		dev-python/ipython[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local deselect=(
-		jupyter_client/tests/test_kernelmanager.py::TestKernelManagerShutDownGracefully::test_signal_kernel_subprocesses
-		jupyter_client/tests/test_kernelmanager.py::TestKernelManagerShutDownGracefully::test_async_signal_kernel_subprocesses
-	)
-	epytest ${deselect[@]/#/--deselect }
-}
diff --git a/dev-python/jupyter_client/jupyter_client-7.0.2.ebuild b/dev-python/jupyter_client/jupyter_client-7.0.2.ebuild
deleted file mode 100644
index d1ef5ad0234e..000000000000
--- a/dev-python/jupyter_client/jupyter_client-7.0.2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-PYTHON_REQ_USE="threads(+)"
-inherit distutils-r1
-
-DESCRIPTION="Jupyter protocol implementation and client libraries"
-HOMEPAGE="https://jupyter.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	dev-python/entrypoints[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_core-4.6.0[${PYTHON_USEDEP}]
-	>=dev-python/nest_asyncio-1.5[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
-	>=dev-python/pyzmq-14.4.0[${PYTHON_USEDEP}]
-	>=www-servers/tornado-4.1[${PYTHON_USEDEP}]
-	dev-python/traitlets[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		dev-python/ipykernel[${PYTHON_USEDEP}]
-		dev-python/ipython[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local deselect=(
-		jupyter_client/tests/test_kernelmanager.py::TestKernelManagerShutDownGracefully::test_signal_kernel_subprocesses
-		jupyter_client/tests/test_kernelmanager.py::TestKernelManagerShutDownGracefully::test_async_signal_kernel_subprocesses
-	)
-	epytest ${deselect[@]/#/--deselect }
-}
diff --git a/dev-python/jupyter_client/jupyter_client-7.0.3.ebuild b/dev-python/jupyter_client/jupyter_client-7.0.3.ebuild
deleted file mode 100644
index 1361446647a8..000000000000
--- a/dev-python/jupyter_client/jupyter_client-7.0.3.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-PYTHON_REQ_USE="threads(+)"
-inherit distutils-r1
-
-DESCRIPTION="Jupyter protocol implementation and client libraries"
-HOMEPAGE="https://jupyter.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	dev-python/entrypoints[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_core-4.6.0[${PYTHON_USEDEP}]
-	>=dev-python/nest_asyncio-1.5[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
-	>=dev-python/pyzmq-14.4.0[${PYTHON_USEDEP}]
-	>=www-servers/tornado-4.1[${PYTHON_USEDEP}]
-	dev-python/traitlets[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		dev-python/ipykernel[${PYTHON_USEDEP}]
-		dev-python/ipython[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	jupyter_client/tests/test_kernelmanager.py::TestKernelManagerShutDownGracefully::test_signal_kernel_subprocesses
-	jupyter_client/tests/test_kernelmanager.py::TestKernelManagerShutDownGracefully::test_async_signal_kernel_subprocesses
-)
diff --git a/dev-python/jupyter_client/jupyter_client-7.0.4.ebuild b/dev-python/jupyter_client/jupyter_client-7.0.4.ebuild
deleted file mode 100644
index 1361446647a8..000000000000
--- a/dev-python/jupyter_client/jupyter_client-7.0.4.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-PYTHON_REQ_USE="threads(+)"
-inherit distutils-r1
-
-DESCRIPTION="Jupyter protocol implementation and client libraries"
-HOMEPAGE="https://jupyter.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	dev-python/entrypoints[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_core-4.6.0[${PYTHON_USEDEP}]
-	>=dev-python/nest_asyncio-1.5[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
-	>=dev-python/pyzmq-14.4.0[${PYTHON_USEDEP}]
-	>=www-servers/tornado-4.1[${PYTHON_USEDEP}]
-	dev-python/traitlets[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		dev-python/ipykernel[${PYTHON_USEDEP}]
-		dev-python/ipython[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	jupyter_client/tests/test_kernelmanager.py::TestKernelManagerShutDownGracefully::test_signal_kernel_subprocesses
-	jupyter_client/tests/test_kernelmanager.py::TestKernelManagerShutDownGracefully::test_async_signal_kernel_subprocesses
-)
diff --git a/dev-python/jupyter_client/jupyter_client-7.0.5.ebuild b/dev-python/jupyter_client/jupyter_client-7.0.5.ebuild
deleted file mode 100644
index 1361446647a8..000000000000
--- a/dev-python/jupyter_client/jupyter_client-7.0.5.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-PYTHON_REQ_USE="threads(+)"
-inherit distutils-r1
-
-DESCRIPTION="Jupyter protocol implementation and client libraries"
-HOMEPAGE="https://jupyter.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	dev-python/entrypoints[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_core-4.6.0[${PYTHON_USEDEP}]
-	>=dev-python/nest_asyncio-1.5[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
-	>=dev-python/pyzmq-14.4.0[${PYTHON_USEDEP}]
-	>=www-servers/tornado-4.1[${PYTHON_USEDEP}]
-	dev-python/traitlets[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		dev-python/ipykernel[${PYTHON_USEDEP}]
-		dev-python/ipython[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	jupyter_client/tests/test_kernelmanager.py::TestKernelManagerShutDownGracefully::test_signal_kernel_subprocesses
-	jupyter_client/tests/test_kernelmanager.py::TestKernelManagerShutDownGracefully::test_async_signal_kernel_subprocesses
-)
diff --git a/dev-python/lcdproc/Manifest b/dev-python/lcdproc/Manifest
deleted file mode 100644
index 15271bd24433..000000000000
--- a/dev-python/lcdproc/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST lcdproc-0.03_p20150508.tar.gz 337211 BLAKE2B 426ddb2e951d096dc8ec149e47dcaa4c31501c9993e27c6a7fd686baa7e0799c92f40bba4eb3250c846625e6f82d6a202dc9f55a7044e6d4edb08437edb9d2e9 SHA512 344a15566587a1f7e3a50314138fb320ee341a41484061cc143498c86e058badefd38589b74a6668e3c082b1cd4ceb3aaa8a9369eb9d8f900af5da0aa7823430
diff --git a/dev-python/lcdproc/lcdproc-0.03_p20150508.ebuild b/dev-python/lcdproc/lcdproc-0.03_p20150508.ebuild
deleted file mode 100644
index b5f1d76ddefc..000000000000
--- a/dev-python/lcdproc/lcdproc-0.03_p20150508.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-EGIT_COMMIT="973628fc326177c9deaf3f2e1a435159eb565ae0"
-MY_PV="$(ver_cut 1-2)"
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python OOP wrapper library for LCDproc Telnet API"
-HOMEPAGE="https://github.com/jinglemansweep/lcdproc"
-SRC_URI="https://github.com/jinglemansweep/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-${EGIT_COMMIT}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="app-misc/lcdproc"
-
-DOCS=( "README.textile" "examples.py" )
-
-src_prepare() {
-	default
-
-	# Fix setuptools version warning
-	sed -e "s/${MY_PV}/${MY_PV:0:(-3)}.${MY_PV:3}/" -i setup.py || die
-}
diff --git a/dev-python/lcdproc/metadata.xml b/dev-python/lcdproc/metadata.xml
deleted file mode 100644
index 94db0525cf48..000000000000
--- a/dev-python/lcdproc/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
-  <email>conikost@gentoo.org</email>
-  <name>Conrad Kostecki</name>
- </maintainer>
- <longdescription>
-		This is a python OOP wrapper library for LCDproc Telnet API,
-		which makes it possible to submit own data to the LCDproc server.
-	</longdescription>
- <upstream>
-  <remote-id type="pypi">lcdproc</remote-id>
-  <bugs-to>https://github.com/jinglemansweep/lcdproc/issues</bugs-to>
- </upstream>
- <origin>gentoo-staging</origin>
-</pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/leather/Manifest b/dev-python/leather/Manifest
index 1499dbaab746..e5864e33e632 100644
--- a/dev-python/leather/Manifest
+++ b/dev-python/leather/Manifest
@@ -1 +1 @@
-DIST leather-0.3.3-src.tar.gz 40522 BLAKE2B 3c7e6a48615751b310b7f066f2a78a2494e00256cae2ebfb4633c9389cca2477c2265fcf8c68f37733568ef729db1a5daf02ddc640bf2a60f2b39127c9a38d91 SHA512 30ea50ac6f97c55ee695b0e175a27e1e64fd17da7b0686ca8595fe0e5067932e19e59368fe6441f8f291ec52be3e597a80f8e04a3fcc0eeae33b3a5b3030e1d6
+DIST leather-0.3.4.gh.tar.gz 41368 BLAKE2B a1181da5904234677290134726da33a71e0f37e6f0161beb0ec7a73efca1b2b26e973221f2f42b72fd2640ef503a8adc905273885deef212ee9d1aae6d91f804 SHA512 0547adf5d455afe9397cf9c597cc7edbcdbe25bb56e32d764c67119bfe1329d959834f2a41720adb51ec926065e044feb27f7a5e3f800c8636a22d4f96752212
diff --git a/dev-python/leather/files/leather-0.3.3-fix-py3.10.patch b/dev-python/leather/files/leather-0.3.3-fix-py3.10.patch
deleted file mode 100644
index 8ec9e1767a4f..000000000000
--- a/dev-python/leather/files/leather-0.3.3-fix-py3.10.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 5dd1d3cc82d426388c66db8e3761ca2bf99a3991 Mon Sep 17 00:00:00 2001
-From: Brian <brian@quantrocket.com>
-Date: Fri, 27 Mar 2020 17:08:50 -0400
-Subject: [PATCH] import from collections.abc to suppress python 3.7 warning
-
----
- leather/series/base.py     | 5 ++++-
- leather/series/category.py | 5 ++++-
- 2 files changed, 8 insertions(+), 2 deletions(-)
-
-diff --git a/leather/series/base.py b/leather/series/base.py
-index c5790e5..959e827 100644
---- a/leather/series/base.py
-+++ b/leather/series/base.py
-@@ -1,6 +1,9 @@
- #!/usr/bin/env python
- 
--from collections import Iterable, Sequence, Mapping
-+try:
-+    from collections.abc import Iterable, Sequence, Mapping
-+except ImportError:
-+    from collections import Iterable, Sequence, Mapping
- from functools import partial
- 
- import six
-diff --git a/leather/series/category.py b/leather/series/category.py
-index c575308..3678377 100644
---- a/leather/series/category.py
-+++ b/leather/series/category.py
-@@ -1,6 +1,9 @@
- #!/usr/bin/env python
- 
--from collections import Iterable, Sequence, Mapping
-+try:
-+    from collections.abc import Iterable, Sequence, Mapping
-+except ImportError:
-+    from collections import Iterable, Sequence, Mapping
- from functools import partial
- 
- import six
diff --git a/dev-python/leather/leather-0.3.3-r2.ebuild b/dev-python/leather/leather-0.3.3-r2.ebuild
deleted file mode 100644
index 1d491af78638..000000000000
--- a/dev-python/leather/leather-0.3.3-r2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python charting for 80% of humans."
-HOMEPAGE="https://github.com/wireservice/leather https://pypi.org/project/leather/"
-SRC_URI="https://github.com/wireservice/leather/archive/refs/tags/${PV}.tar.gz -> ${P}-src.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="+xml"
-
-# Other packages have BDEPEND="test? ( dev-python/leather[xml] )"
-TEST_AGAINST_RDEPEND="xml? ( dev-python/lxml[${PYTHON_USEDEP}] )"
-RDEPEND="
-	${TEST_AGAINST_RDEPEND}
-	dev-python/cssselect[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-fix-py3.10.patch"
-)
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs \
-	dev-python/sphinx_rtd_theme
-
-python_prepare_all() {
-	local requirements_files sed_args
-
-	sed_args=(
-		-e '/coverage/d'
-		-e '/lxml/d' # lxml is required only when leather is used as a test dependency
-		-e '/nose/d'
-		-e '/tox/d'
-		-e '/Sphinx/d'
-		-e '/sphinx_rtd_theme/d'
-		-e '/unittest2/d'
-	)
-
-	requirements_files+=(requirements*.txt)
-	sed "${sed_args[@]}" -i "${requirements_files[@]}" || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/leather/leather-0.3.4.ebuild b/dev-python/leather/leather-0.3.4.ebuild
new file mode 100644
index 000000000000..53973236c457
--- /dev/null
+++ b/dev-python/leather/leather-0.3.4.ebuild
@@ -0,0 +1,26 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python charting for 80% of humans"
+HOMEPAGE="https://github.com/wireservice/leather https://pypi.org/project/leather/"
+SRC_URI="https://github.com/wireservice/leather/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	dev-python/cssselect[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+BDEPEND="test? ( dev-python/lxml[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs \
+	dev-python/sphinx_rtd_theme
diff --git a/dev-python/nose/nose-1.3.7-r8.ebuild b/dev-python/nose/nose-1.3.7-r9.ebuild
index 58ae5f7327d8..e533add8cc4e 100644
--- a/dev-python/nose/nose-1.3.7-r8.ebuild
+++ b/dev-python/nose/nose-1.3.7-r9.ebuild
@@ -21,6 +21,7 @@ IUSE="examples test"
 RESTRICT="!test? ( test )"
 
 BDEPEND="
+	<dev-python/setuptools-58[${PYTHON_USEDEP}]
 	test? (
 		$(python_gen_cond_dep '
 			!hppa? ( dev-python/coverage[${PYTHON_USEDEP}] )
diff --git a/dev-python/oauth2/Manifest b/dev-python/oauth2/Manifest
deleted file mode 100644
index a7c88e0fa86a..000000000000
--- a/dev-python/oauth2/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST oauth2-1.9.0.post1.tar.gz 21306 BLAKE2B 3e61ba6d46b98c594fa31e828885930490f99390f14e0173bdf719cfc1d5e8ad385e56c9654e139279cd95611a7e35b1fe0276679a2a4849b67125f5e6919788 SHA512 a3b64eef331d4c4f59c275f14efb2dfb48ad60de47a59a88106f60d64428a09b76d8bedf08c98c113493968d83708b1478b4b61b2b5528b5b01fa22777daff4c
diff --git a/dev-python/oauth2/files/1.9.0_p1-exclude-tests.patch b/dev-python/oauth2/files/1.9.0_p1-exclude-tests.patch
deleted file mode 100644
index 0d3a0fa962af..000000000000
--- a/dev-python/oauth2/files/1.9.0_p1-exclude-tests.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/setup.py
-+++ b/setup.py
-@@ -45,7 +45,7 @@
-         "Natural Language :: English",
-         "License :: OSI Approved :: MIT License"
-       ],
--      packages = find_packages(),
-+      packages = find_packages(exclude=['tests']),
-       install_requires = ['httplib2'],
-       license = "MIT License",
-       keywords="oauth",
diff --git a/dev-python/oauth2/metadata.xml b/dev-python/oauth2/metadata.xml
deleted file mode 100644
index 7a6f695a8168..000000000000
--- a/dev-python/oauth2/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
-  <email>python@gentoo.org</email>
-  <name>Python</name>
- </maintainer>
- <upstream>
-  <remote-id type="pypi">oauth2</remote-id>
- </upstream>
- <origin>gentoo-staging</origin>
- <stabilize-allarches/>
-</pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/oauth2/oauth2-1.9.0_p1-r1.ebuild b/dev-python/oauth2/oauth2-1.9.0_p1-r1.ebuild
deleted file mode 100644
index dd27c0303e54..000000000000
--- a/dev-python/oauth2/oauth2-1.9.0_p1-r1.ebuild
+++ /dev/null
@@ -1,40 +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
-
-MY_P="${P/_p/.post}"
-
-DESCRIPTION="Library for OAuth version 1.0"
-HOMEPAGE="https://pypi.org/project/oauth2/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86 ~x64-macos"
-
-RDEPEND="dev-python/httplib2[${PYTHON_USEDEP}]"
-DEPEND="
-	test? ( ${RDEPEND}
-		dev-python/mock[${PYTHON_USEDEP}]
-	)"
-
-# https://github.com/joestump/python-oauth2/pull/212
-PATCHES=(
-	"${FILESDIR}/${PV}-exclude-tests.patch"
-)
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# These tests require network access
-	tests/test_oauth.py::TestClient::test_access_token_get
-	tests/test_oauth.py::TestClient::test_access_token_post
-	tests/test_oauth.py::TestClient::test_two_legged_get
-	tests/test_oauth.py::TestClient::test_two_legged_post
-)
diff --git a/dev-python/owslib/owslib-0.20.0.ebuild b/dev-python/owslib/owslib-0.20.0.ebuild
index abba50d73852..e6183f0896a2 100644
--- a/dev-python/owslib/owslib-0.20.0.ebuild
+++ b/dev-python/owslib/owslib-0.20.0.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/OWSLib-${PV}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/pybluez/Manifest b/dev-python/pybluez/Manifest
deleted file mode 100644
index 5a383e05a63c..000000000000
--- a/dev-python/pybluez/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST PyBluez-0.23.tar.gz 97562 BLAKE2B 6a234d5c41dc0bb9f08559431eafcf1d1fb1c881d2cb912cc048e2717bfe8a06f09aae045d2961c9ba5e087422cfc8249a1907368eb6dc45942175bcf97b1841 SHA512 78ce2c014d0055d0220163e7df94de5b6e891aa528ecf4f106f9dd0bdeb94244d18c752f93e62a133f3cec7053cb4646599e7588cf7ce5994ae7abe74ed05d47
diff --git a/dev-python/pybluez/metadata.xml b/dev-python/pybluez/metadata.xml
deleted file mode 100644
index d028723f0873..000000000000
--- a/dev-python/pybluez/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
-<pkgmetadata>
- <longdescription>PyBluez is an effort to create Python wrappers around bluez to allow Python
-developers to use system bluetooth resources. It works on machines running the
-GNU/Linux operating system and the bluez bluetooth stack.</longdescription>
- <upstream>
-  <remote-id type="pypi">PyBluez</remote-id>
- </upstream>
- <origin>gentoo-staging</origin>
-</pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/pybluez/pybluez-0.23.ebuild b/dev-python/pybluez/pybluez-0.23.ebuild
deleted file mode 100644
index 1d35ace4d250..000000000000
--- a/dev-python/pybluez/pybluez-0.23.ebuild
+++ /dev/null
@@ -1,32 +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
-
-MY_P="PyBluez-${PV}"
-
-DESCRIPTION="Python bindings for Bluez Bluetooth Stack"
-HOMEPAGE="https://github.com/pybluez/pybluez"
-SRC_URI="mirror://pypi/P/PyBluez/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="examples"
-
-RDEPEND="net-wireless/bluez"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-S=${WORKDIR}/${MY_P}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	if use examples; then
-		dodoc -r examples
-		docompress -x usr/share/doc/${PF}/examples
-	fi
-}
diff --git a/dev-python/pyproj/pyproj-3.0.1.ebuild b/dev-python/pyproj/pyproj-3.0.1.ebuild
index 16f66cb7bcbb..518c30b551b5 100644
--- a/dev-python/pyproj/pyproj-3.0.1.ebuild
+++ b/dev-python/pyproj/pyproj-3.0.1.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${P/_p/.post}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux"
 
 RDEPEND=">=sci-libs/proj-7.2.0:="
 BDEPEND="
diff --git a/dev-python/regex/Manifest b/dev-python/regex/Manifest
index 3431154a275f..a92be1d37ff8 100644
--- a/dev-python/regex/Manifest
+++ b/dev-python/regex/Manifest
@@ -1,3 +1,4 @@
+DIST regex-2021.10.8.tar.gz 703541 BLAKE2B da2a35c0f95c208fe2a9951d4c8cf756cd9eecb3ff27c5d729e9b5702256cc12bdde896019abf2aa12d206cbaace0fa693be332ff8d8baa5e6e628866eb64dea SHA512 395fbef61d54fad539bbd1e51c9100cba02bcd3a147e95a32ff8c32cb7fca66df98bade638e24f9a5c6e5d6c7becca033f925c4fa675b4e6689cba8316a8b46d
 DIST regex-2021.8.28.tar.gz 694689 BLAKE2B 1aeceeb77df3c67e3ac14811000dc0f0cccf2a4994fd349f01f3a4e793f265dc9a73ea685202c6a7af8f507f0db94d6b74b1ae448ce58dd985ca4122c3454cba SHA512 da95f8ce03200f45b6be8730b65d01170847d074202e9b5f311688e22e3d59c32a8ff93768e2ac0105bac02936cbcde49eb114b762e89e6ebf895d8b799b4bf9
 DIST regex-2021.8.3.tar.gz 693937 BLAKE2B 886dfe1a312bb34d83a3fe9442231215be7e263cbd123da24c454cdceac1055cb4dacfe4a3104699b6b97f86b14e2b723ea1267a13c2395ce2baad4ca367d77e SHA512 3ac33421ca15e47a1d8beeb3841b6e698d492e96965955afe69529dc71cc7d522e5e8236e4f577c934a3fd27036340a8084c84055bcfff0a9572e8fb56ba272b
 DIST regex-2021.9.30.tar.gz 703504 BLAKE2B d958fa97aabb4c25c424591cfc9b6006c72e72d33029902a00e705c0db6786dcca92b006c4d77f98b0dd183405f63e282f33af75361d20d2b61f65d70da40da6 SHA512 3ce87e01a6e90a2519046595548f9ce38fb177db0d5c2359c57df857a2a9f14be1c6d228b7bd724d5bd66f723e33fd6056180fb45c50931bb0ec5e723df2f16a
diff --git a/dev-python/regex/regex-2021.10.8.ebuild b/dev-python/regex/regex-2021.10.8.ebuild
new file mode 100644
index 000000000000..92ae2cbca7dc
--- /dev/null
+++ b/dev-python/regex/regex-2021.10.8.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="Alternative regular expression module to replace re"
+HOMEPAGE="https://bitbucket.org/mrabarnett/mrab-regex"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+IUSE="doc"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2021.4.4-pypy3-fix-test_empty_array.patch"
+	"${FILESDIR}/${PN}-2021.4.4-pypy3-fix-test_issue_18468.patch"
+)
+
+distutils_enable_tests unittest
+
+python_test() {
+	eunittest -s "${BUILD_DIR}"/lib
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/Features.html )
+	local DOCS=( README.rst docs/*.rst )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/sparql-wrapper/Manifest b/dev-python/sparql-wrapper/Manifest
deleted file mode 100644
index cc6f0e930069..000000000000
--- a/dev-python/sparql-wrapper/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST SPARQLWrapper-1.8.5.tar.gz 89117 BLAKE2B e36f90b0bc8adc789750e7db588ada22e369d10e1ae94777b627680070f4ac8da3e7575c7858121386287034061b6fcfbfbb529f9d8de020ae65a7c6bdb2ef80 SHA512 b0cbe9f7f13a8a0a1c88a17b5966b46e7811acada2712ee03be97808dcb17ba4a71990c07df5d213d21815d7deaf3526381a2cc864d839e561e242be797b6bb2
diff --git a/dev-python/sparql-wrapper/metadata.xml b/dev-python/sparql-wrapper/metadata.xml
deleted file mode 100644
index ec5e8923f0e7..000000000000
--- a/dev-python/sparql-wrapper/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
-  <email>python@gentoo.org</email>
-  <name>Python</name>
- </maintainer>
- <upstream>
-  <remote-id type="pypi">SPARQLWrapper</remote-id>
- </upstream>
- <origin>gentoo-staging</origin>
- <stabilize-allarches/>
-</pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/sparql-wrapper/sparql-wrapper-1.8.5.ebuild b/dev-python/sparql-wrapper/sparql-wrapper-1.8.5.ebuild
deleted file mode 100644
index 20c777cc5d1b..000000000000
--- a/dev-python/sparql-wrapper/sparql-wrapper-1.8.5.ebuild
+++ /dev/null
@@ -1,54 +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
-
-MY_PN=SPARQLWrapper
-DESCRIPTION="Wrapper around a SPARQL service"
-HOMEPAGE="https://pypi.org/project/SPARQLWrapper/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="W3C"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-# the vast majority of tests access random Internet sites
-RESTRICT="test"
-
-RDEPEND=">=dev-python/rdflib-4[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# disable sys.path hack
-	sed -i -e '/^# prefer local/,/^# end of hack/d' test/*.py || die
-
-	# urllib2
-	rm test/wrapper_test.py || die
-	# connection timeout
-	rm test/fuseki2__v3_6_0__agrovoc__test.py || die
-	# HTTP 401
-	rm test/graphdbEnterprise__v8_9_0__rs__test.py || die
-	# returns some HTML page
-	rm test/stardog__lindas__test.py || die
-
-	# require rdflib-jsonld, apparently
-	sed -i -e 's:test.*JSONLD:_&:' \
-		test/*.py || die
-	# some plugin error, probably the same
-	sed -e 's:testConstruct.*JSON:_&:' \
-		-e 's:testDescribe.*JSON:_&:' \
-		-i test/fuseki2__v3_8_0__stw__test.py || die
-
-	distutils-r1_src_prepare
-}
-
-src_test() {
-	cd test || die
-	2to3 -n -w --no-diffs *.py || die
-	distutils-r1_src_test
-}
diff --git a/dev-python/sphinx-bootstrap-theme/sphinx-bootstrap-theme-0.8.0.ebuild b/dev-python/sphinx-bootstrap-theme/sphinx-bootstrap-theme-0.8.0.ebuild
index 7523b9509925..f0da27efefe5 100644
--- a/dev-python/sphinx-bootstrap-theme/sphinx-bootstrap-theme-0.8.0.ebuild
+++ b/dev-python/sphinx-bootstrap-theme/sphinx-bootstrap-theme-0.8.0.ebuild
@@ -24,3 +24,5 @@ S="${WORKDIR}/${PN}-${MY_COMMIT}"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
+
+BDEPEND="<dev-python/setuptools-58[${PYTHON_USEDEP}]"
diff --git a/dev-python/sphinxcontrib-programoutput/sphinxcontrib-programoutput-0.17.ebuild b/dev-python/sphinxcontrib-programoutput/sphinxcontrib-programoutput-0.17.ebuild
index b2f6bc8612c4..7f824453e5ef 100644
--- a/dev-python/sphinxcontrib-programoutput/sphinxcontrib-programoutput-0.17.ebuild
+++ b/dev-python/sphinxcontrib-programoutput/sphinxcontrib-programoutput-0.17.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI=8
 
 PYTHON_COMPAT=( python3_{6,7,8,9,10} )
 
diff --git a/dev-python/suds/suds-0.8.4.ebuild b/dev-python/suds/suds-0.8.4-r1.ebuild
index c4a3489dcd15..d530861e15b0 100644
--- a/dev-python/suds/suds-0.8.4.ebuild
+++ b/dev-python/suds/suds-0.8.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -19,6 +19,8 @@ LICENSE="LGPL-3"
 SLOT="0"
 KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 
+BDEPEND="<dev-python/setuptools-58[${PYTHON_USEDEP}]"
+
 # https://github.com/suds-community/suds/pull/40
 PATCHES=( "${FILESDIR}/${P}-fix-optimization.patch" )