Adding metadata

70 files changed, 623 insertions, 392 deletions

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 654228f65582..cc3bf99e6cc4 100644
--- a/dev-python/PyQt5-sip/PyQt5-sip-12.9.0.ebuild
+++ b/dev-python/PyQt5-sip/PyQt5-sip-12.9.0.ebuild
@@ -19,4 +19,4 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="|| ( GPL-2 GPL-3 SIP )"
 SLOT="0/$(ver_cut 1)"
-KEYWORDS="amd64 arm ~arm64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 arm ~arm64 ~ppc ~ppc64 ~riscv x86"
diff --git a/dev-python/PyQt5/PyQt5-5.15.4-r1.ebuild b/dev-python/PyQt5/PyQt5-5.15.4-r1.ebuild
index 965c565cb94a..13b516447226 100644
--- a/dev-python/PyQt5/PyQt5-5.15.4-r1.ebuild
+++ b/dev-python/PyQt5/PyQt5-5.15.4-r1.ebuild
@@ -19,7 +19,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 arm ~arm64 ~ppc ~ppc64 ~riscv x86"
 
 # TODO: QtNfc, QtQuick3D, QtRemoteObjects
 IUSE="bluetooth dbus debug declarative designer examples gles2-only gui help location
diff --git a/dev-python/babelfish/Manifest b/dev-python/babelfish/Manifest
index 66d55846d03e..dd718e64852e 100644
--- a/dev-python/babelfish/Manifest
+++ b/dev-python/babelfish/Manifest
@@ -1 +1,2 @@
 DIST babelfish-0.5.5.tar.gz 90398 BLAKE2B 3266a92ba5c68d7b801fa9cd13417d04b4a4526ba9fbee34116e356e42857bc36a68b085626a084047d7f9dc512d71d45cebfd06af65ed35bd2478b6957d00d9 SHA512 71504dd0203ad85a6a69107d67df3bd5ae4193515e74c05b346a8bd0aab425fc1534d54d1c74b14e48580ee5e76f04705e35c2d359fbe46254bee37e41cb4bfa
+DIST babelfish-0.6.0.gh.tar.gz 90886 BLAKE2B deee75aef23cbcb7c64f385c303310e5ce1ef0a3180729e47e59b8e85015ff36360a4be74ef32869421c6d90cf185ad427a7d55b9ef3cf20f551233dae3d425f SHA512 9d3309e67815c301578533fdaf8baae946ba87148b458f7b01315203d2d4356dd770c1a0b7a0ffbba14036b77f1463d67e3b5732efa6682cb6afdae1a8fd0a4b
diff --git a/dev-python/babelfish/babelfish-0.6.0.ebuild b/dev-python/babelfish/babelfish-0.6.0.ebuild
new file mode 100644
index 000000000000..d4e165a313d0
--- /dev/null
+++ b/dev-python/babelfish/babelfish-0.6.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_SETUPTOOLS=pyproject.toml
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+inherit distutils-r1
+
+DESCRIPTION="Python library to work with countries and languages"
+HOMEPAGE="
+	https://github.com/Diaoul/babelfish/
+	https://pypi.org/project/babelfish/"
+SRC_URI="
+	https://github.com/Diaoul/babelfish/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+distutils_enable_tests pytest
diff --git a/dev-python/blosc/blosc-1.10.4.ebuild b/dev-python/blosc/blosc-1.10.4.ebuild
index b9c9a702b6d1..aea6f80b84cd 100644
--- a/dev-python/blosc/blosc-1.10.4.ebuild
+++ b/dev-python/blosc/blosc-1.10.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index b9e6e8210a61..ad711e5ac6e5 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -9,6 +9,7 @@ DIST boto3-1.18.13.tar.gz 399893 BLAKE2B 3c3e79e2a8ea41a6bf88a2e73926d6e61c9844f
 DIST boto3-1.18.14.tar.gz 400263 BLAKE2B 827cf91c151ec03c6bca44967b8b94a5a4f93510ddae67b74dfe17fa800d02d2b139f3a0ecf6958ce24350345dd1f6da3c8dd69d7a5b504fbe79a9e8b587a3c2 SHA512 c3c338868ce50976deea02b308d8f9afecfbeac725319b4379391af1f85a6665de2cb59b2cb19a05520f1ff09d5c31bdc06525bd05e5bd2fa499641c4308b240
 DIST boto3-1.18.15.tar.gz 400374 BLAKE2B 2170319480578b9ac7b6c0da9e9a2f256ce907b8e53bc626bf26fd65f3336ec1974d6dd1917f601fe139e859f144fafd198b2578ffb9097508f09dd40cf82313 SHA512 f330d8249c9f5749770ba5809f3a4fb524f23fc0545b24182023a3b74f815608bdb9986b434d972a017aa7786b1319705e8702b041174275f84a0266bdb7b857
 DIST boto3-1.18.16.tar.gz 400837 BLAKE2B fd3f8118adb4bf83484d084e3d1d5fd3b593dce2a394e6bea35196823cb31e4ecb8649840a2c214aabf245db60cd9974cdb85ab2e79fd103a576d7a9e39f5a8b SHA512 3c967e0d2ccc47e83d47fa84c3ef88f9672d57f9a5d314ec8b7047887ca1bec17a8960ddf3e2ac4db38f947e7432449027cfc4dce3441617b4f18c92734d7b70
+DIST boto3-1.18.17.tar.gz 401136 BLAKE2B 5b14b44c525ac01be511c41ad3e4d49a0cf89229e5212789e2f6e3d8d61add7ae60df391a64c1ae69cda8e8065b80d405be586655b053d6e860a5ba28e951c0d SHA512 cd3659ec5484a7340c351838932786e2befab6f3be203db94fe3af195a50c757564aad966e37888f8bce14a58151c24fee114881cd9cad44567da95e9b574e8c
 DIST boto3-1.18.2.tar.gz 393528 BLAKE2B 20424f9a8ff013d1d9724f741ad6754747de504fb961688f433eba74ce1d6df7e95d68c45be1e87df1532f99b2fa4d7e8b00671a8ae9a378a4df74764924cdaa SHA512 287a1f24f62fa83fd944632799540257b2f8d6cf3b5d6add57be60e4f49dafd685bb4fcceef37fe907edba00a7f2285d92bd8d381b03e45ac794b22fdcfe8783
 DIST boto3-1.18.3.tar.gz 393645 BLAKE2B 4967ac751e9ff5a86f6f571961df31d82f6012ade28aa19a038399077bf5a1b968dfa1172995423890b79a2ede54e2c6f6c1937e8ccf21010f17a4d96928df62 SHA512 f9c42257f0925fffaeb1a36e4731dc54fee1836c249617444292991d043dbb9b58472f73a806981c9763b569cc7402b378f6e1e0102fe0f995a7754807f19b38
 DIST boto3-1.18.4.tar.gz 394442 BLAKE2B e82726143b353b843e915ea78ea2e033077ee495b1d416866f5c231f8bd864372496736d266b2b848ed8afd3134bd865c507291fd2fbdd5cae00a92ce3c5e76d SHA512 b3ba1328476a1c642c6b813afc3879e904bc14da69e062156df0405b3da6d2a15a4a40602f24d0a067a83cc441ce5a5e353dacb84869b0fe24e9984c0dec719f
diff --git a/dev-python/boto3/boto3-1.18.17.ebuild b/dev-python/boto3/boto3-1.18.17.ebuild
new file mode 100644
index 000000000000..bee358e1c595
--- /dev/null
+++ b/dev-python/boto3/boto3-1.18.17.ebuild
@@ -0,0 +1,57 @@
+# 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 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 919f6c9b2837..299bb673a23c 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -9,6 +9,7 @@ DIST botocore-1.21.13.tar.gz 8006167 BLAKE2B 7f876b608fa0d24717f010426a553f54aa3
 DIST botocore-1.21.14.tar.gz 8014362 BLAKE2B c201724fd1eae1a9f84e81ff9d23b27eaf7f38d2a2db1bbf3f1ad7aca37183b56ea752478e78825f5eb5762e649b533be49671acfbbc058cae96bc14121bb336 SHA512 eff147209d9526e2b90fae2dfdaf1536ab29714277d8e4ab2e0244cbf1ab3c98aca72e04c5c7659a98464d52a016bcd5601428f860c67737b080e562c36ebb6f
 DIST botocore-1.21.15.tar.gz 8012673 BLAKE2B cdd2b4128e67c85879e85f61265b10c1e5765eebf65333059af56a6a5b1d650a7612c4b569afde2396704015294e74b717c35d49c3e08396b2c603b7d47c632b SHA512 a5916ffa64568b2040d6f76571d9d716d50339fdaaed61f4ff7be92a5dac2c3f967280330fcbd3d6c2e1c1faf7bd6012ce75dd66ff26fde9d830d334a9d7c45a
 DIST botocore-1.21.16.tar.gz 8029528 BLAKE2B 2253072ebd31cf879fdd329bda82a6fe9698d7aeaf63be23f8c606f4082c09eeae091e7e2b4c62d8663a15bf8958140fcd9afdd4c40f7dece98d05ba8fe8a3c3 SHA512 a5f05204b7a3879689549d88ea964d0405516e285910d668451209cc81c72b850c7e65c1359f5df8bbddd094bed6ff22edcf1bb1927866cfa267114366f8bd69
+DIST botocore-1.21.17.tar.gz 8036012 BLAKE2B 9670d59ba0a9f73d031d31abd90c7c9d1e723a83f2016e59b028576fc9a5679bfb65aa7ef4c7d19cff3b5e21202597b146bfdcb6e51f822dac8c94518e330121 SHA512 e88ba8ef38ec781f402c7ff58ffa3b7348b8072d74a1c11ee777139233b0637e07923becf5e8790c38056983ea095b4214dcb4254c53944bea13079ada319504
 DIST botocore-1.21.2.tar.gz 7960118 BLAKE2B 11d2845e1846c03591625a95b21ff6fe1acb1448414a5f09de1d427614e927d974fafe5dd5d4f195aeb2f3b86d60822a8c73f1bc532bb45c85be8421f92eedc3 SHA512 501f059518026bef10fe933d20a3348b4140cff9ef1af38e17552aea8698179135f5271604e988f53c215e3a13158d7784a49a6b56c0d4db591f99dac9c57ca8
 DIST botocore-1.21.3.tar.gz 7959023 BLAKE2B aab15319b9f36c25ee88f2bf0b2efcb6bbffeac1b4e38dcbdfde3a947f702016e77b66c4b125ca2b63614223109fd793da68f9ce1b1d14476cdd6a3fcb10dfce SHA512 5a8ce8f612fd0e1c68a75223dda95673f72159b02a040d1a71920b7e75b3aa9d14589c33a52970182970a353308954e8cd6d5f97d374e0e2ee2cd40e0dce786e
 DIST botocore-1.21.4.tar.gz 7964960 BLAKE2B 71d55b47633aa658a9dc921375c77230a6ebb89460d9de5a9982d730e03247972476400dbcf292da0a885789860117c1abc9bf803c79547049b242feb8755d15 SHA512 4a36e5870d9996973e2258f2e6afeb7381ac94d14075eaa9885f6f89afb87fa5b4461b02ab234b4ecc8e24630434dbb839e8ad30f622de6ffa5402f872f84a97
diff --git a/dev-python/botocore/botocore-1.21.17.ebuild b/dev-python/botocore/botocore-1.21.17.ebuild
new file mode 100644
index 000000000000..5684261bd4b3
--- /dev/null
+++ b/dev-python/botocore/botocore-1.21.17.ebuild
@@ -0,0 +1,59 @@
+# 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/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/contextlib2/Manifest b/dev-python/contextlib2/Manifest
deleted file mode 100644
index 4e2999596f23..000000000000
--- a/dev-python/contextlib2/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST contextlib2-0.6.0.post1.tar.gz 29670 BLAKE2B 927cbc674c2cb568e71bd110773bea6f848233928bb910e0db7114812b3359b9395e43c01be1645d44f3202f94c62bc21c4db883a155c64feb636a61865dd7d8 SHA512 bd3b458b365bc1d556476f6368bc523fde07e85afdad74037aa98d7a498008103a789f6b481b606700da92606ee6477fc5a817f1596e93a6e3c548ed0d4a5bf8
-DIST contextlib2-21.6.0.tar.gz 43795 BLAKE2B 52e62cf56bc11c0a0502d1d43ba361bea579af98a1c820afb73a6c2ab87bdf57317541cb7051b5aca05311ee2df24010e6e96c7ef4ee7192ec792cf2937aae68 SHA512 a85cafaaf66c7c6a59a4e9ac757941b1a98c17e5a49e41573dc759fafbbf17928a21f582e8aaa0fdc60636413ec702e198bde19a78ac304237b6da1c3d47b730
diff --git a/dev-python/contextlib2/contextlib2-0.6.0_p1-r1.ebuild b/dev-python/contextlib2/contextlib2-0.6.0_p1-r1.ebuild
deleted file mode 100644
index 40eac5aecd39..000000000000
--- a/dev-python/contextlib2/contextlib2-0.6.0_p1-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
-
-inherit distutils-r1
-
-MY_P="${PN}-${PV/_p/.post}"
-DESCRIPTION="Backports and enhancements for the contextlib module"
-HOMEPAGE="https://pypi.org/project/contextlib2/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="PSF-2.4"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x64-macos"
-IUSE="test"
-
-DEPEND="
-	test? ( $(python_gen_cond_dep '
-			dev-python/unittest2[${PYTHON_USEDEP}]
-			' python2_7 pypy3
-		)
-	)
-"
-
-S="${WORKDIR}"/${MY_P}
-
-RESTRICT="!test? ( test )"
-
-DOCS=( NEWS.rst README.rst )
-
-python_prepare_all() {
-	sed -i -e 's:unittest.main():unittest.main(verbosity=2):' \
-		test_contextlib2.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	"${PYTHON}" test_contextlib2.py || die "Tests fail for ${EPYTHON}"
-}
diff --git a/dev-python/contextlib2/contextlib2-21.6.0.ebuild b/dev-python/contextlib2/contextlib2-21.6.0.ebuild
deleted file mode 100644
index 5352f26fd89d..000000000000
--- a/dev-python/contextlib2/contextlib2-21.6.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
-
-inherit distutils-r1
-
-MY_P="${PN}-${PV/_p/.post}"
-DESCRIPTION="Backports and enhancements for the contextlib module"
-HOMEPAGE="https://pypi.org/project/contextlib2/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="PSF-2.4 Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DOCS=( NEWS.rst README.rst )
-
-distutils_enable_tests unittest
diff --git a/dev-python/contextlib2/metadata.xml b/dev-python/contextlib2/metadata.xml
deleted file mode 100644
index 4d67838a02c3..000000000000
--- a/dev-python/contextlib2/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">contextlib2</remote-id>
- </upstream>
- <origin>gentoo-staging</origin>
- <stabilize-allarches/>
-</pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/distro/distro-1.6.0.ebuild b/dev-python/distro/distro-1.6.0.ebuild
index 00723389fbef..17fca680e72d 100644
--- a/dev-python/distro/distro-1.6.0.ebuild
+++ b/dev-python/distro/distro-1.6.0.ebuild
@@ -12,6 +12,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="Apache-2.0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 
 distutils_enable_tests pytest
diff --git a/dev-python/et_xmlfile/et_xmlfile-1.1.0.ebuild b/dev-python/et_xmlfile/et_xmlfile-1.1.0.ebuild
index 501544f85975..a70470cbbaee 100644
--- a/dev-python/et_xmlfile/et_xmlfile-1.1.0.ebuild
+++ b/dev-python/et_xmlfile/et_xmlfile-1.1.0.ebuild
@@ -20,7 +20,7 @@ S=${WORKDIR}/${MY_P}
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="amd64 ~arm ~arm64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="dev-python/lxml[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/fastjsonschema/fastjsonschema-2.15.1.ebuild b/dev-python/fastjsonschema/fastjsonschema-2.15.1.ebuild
index 41c91023c784..643b6c99ede7 100644
--- a/dev-python/fastjsonschema/fastjsonschema-2.15.1.ebuild
+++ b/dev-python/fastjsonschema/fastjsonschema-2.15.1.ebuild
@@ -16,7 +16,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~riscv ~sparc x86"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/fido2/metadata.xml b/dev-python/fido2/metadata.xml
index d4b1cfe0c136..4310152ec55a 100644
--- a/dev-python/fido2/metadata.xml
+++ b/dev-python/fido2/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
- <maintainer type="person">
-  <email>gokturk@gentoo.org</email>
-  <name>Göktürk Yüksek</name>
- </maintainer>
  <longdescription>
 		fido2 provides library functionality for communicating with a FIDO
 		device over USB as well as verifying attestation and assertion
diff --git a/dev-python/fonttools/Manifest b/dev-python/fonttools/Manifest
index d5b5afa2ea10..d91ea8ce5b56 100644
--- a/dev-python/fonttools/Manifest
+++ b/dev-python/fonttools/Manifest
@@ -1,2 +1,3 @@
 DIST fonttools-4.24.4.tar.gz 2556059 BLAKE2B c415ae5214b6df7171a5f8a7ea179b1a4adbc6646598d773f0d3d6a8cd777e8fd3c74c14f00e6c4735a73e712e3fd42ddfc96f3f101d34b122fb9c471d4d94a3 SHA512 aa4ee8f0a7f9cb6d8a84497e6f33f891491cd06cc477a785715f8fde8e5b33cf781ef8b848bfab8cf9a97fc15c018d493c6baf0fb8fd314b8a348c36ff627f41
 DIST fonttools-4.26.1.tar.gz 2579211 BLAKE2B 886a803f6214658423c98bd347db6e2cc0baea5e2619ce18ba2a96589785a1b93228f5b35dd7f6c819b81ca471d6ea1a09d12ad6de04c75388ab6cb5003f5bf5 SHA512 226338cd1c3f71662080c69b0786a6a945b5a75d3a4b7ee6fcf6d7e2e089407d11b4a43950c7aebdaeccad1819e5c6e0b947938fbfbaa3caa9747b7b4a1bd5f6
+DIST fonttools-4.26.2.tar.gz 2579391 BLAKE2B 35a2533a336498aa1d5b9c2a61c1de6af03e6a7a1932a1ad71522f7f73e52590c347fe3e7d60b93b013389023792e6e6b91d6b4bfb92e007062dc2ac494adbb6 SHA512 2caa52a48574e6bdf418fe57fb4ca69686eeae65cb1f44c0cb16c64400ea666530dfcca9e8a619859cf553435f93b38f63e422c315206ecec467eed6339a5987
diff --git a/dev-python/fonttools/fonttools-4.26.2.ebuild b/dev-python/fonttools/fonttools-4.26.2.ebuild
new file mode 100644
index 000000000000..f795eecba533
--- /dev/null
+++ b/dev-python/fonttools/fonttools-4.26.2.ebuild
@@ -0,0 +1,54 @@
+# 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="xml(+)"
+
+inherit distutils-r1 virtualx
+
+DESCRIPTION="Library for manipulating TrueType, OpenType, AFM and Type1 fonts"
+HOMEPAGE="https://github.com/fonttools/fonttools/"
+SRC_URI="https://github.com/fonttools/fonttools/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+
+RDEPEND=">=dev-python/fs-2.4.9[${PYTHON_USEDEP}]"
+BDEPEND="
+	${RDEPEND}
+	dev-python/cython[${PYTHON_USEDEP}]
+	test? (
+		app-arch/brotli[python,${PYTHON_USEDEP}]
+		app-arch/zopfli
+	)"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# When dev-python/pytest-shutil is installed, we get weird import errors.
+	# This is due to incomplete nesting in the Tests/ tree:
+	#
+	#   Tests/feaLib/__init__.py
+	#   Tests/ufoLib/__init__.py
+	#   Tests/svgLib/path/__init__.py
+	#   Tests/otlLib/__init__.py
+	#   Tests/varLib/__init__.py
+	#
+	# This tree requires an __init__.py in Tests/svgLib/ too, bug #701148.
+	touch Tests/svgLib/__init__.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+src_configure() {
+	DISTUTILS_ARGS=( --with-cython )
+}
+
+python_test() {
+	distutils_install_for_testing
+	# virtualx used when matplotlib is installed causing plot module tests to run
+	virtx epytest Tests fontTools
+}
diff --git a/dev-python/ipykernel/ipykernel-5.5.4-r1.ebuild b/dev-python/ipykernel/ipykernel-5.5.4-r1.ebuild
index 88473fae466f..4fa95c9e0a2d 100644
--- a/dev-python/ipykernel/ipykernel-5.5.4-r1.ebuild
+++ b/dev-python/ipykernel/ipykernel-5.5.4-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~riscv ~sparc x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/ipython/ipython-7.25.0.ebuild b/dev-python/ipython/ipython-7.25.0.ebuild
index 6f34643bf361..3e7fbafe917b 100644
--- a/dev-python/ipython/ipython-7.25.0.ebuild
+++ b/dev-python/ipython/ipython-7.25.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~riscv ~sparc x86"
 IUSE="doc examples matplotlib notebook nbconvert qt5 +smp test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/jupyter_client/jupyter_client-6.1.12.ebuild b/dev-python/jupyter_client/jupyter_client-6.1.12.ebuild
index 2eeecdcd1471..c6dd19921871 100644
--- a/dev-python/jupyter_client/jupyter_client-6.1.12.ebuild
+++ b/dev-python/jupyter_client/jupyter_client-6.1.12.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~riscv ~sparc x86"
 
 RDEPEND="
 	dev-python/async_generator[${PYTHON_USEDEP}]
diff --git a/dev-python/jupyter_core/jupyter_core-4.7.1.ebuild b/dev-python/jupyter_core/jupyter_core-4.7.1.ebuild
index aa5cb212f151..096187eca46a 100644
--- a/dev-python/jupyter_core/jupyter_core-4.7.1.ebuild
+++ b/dev-python/jupyter_core/jupyter_core-4.7.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~riscv ~sparc x86"
 
 RDEPEND="dev-python/traitlets[${PYTHON_USEDEP}]"
 BDEPEND="
diff --git a/dev-python/linecache2/Manifest b/dev-python/linecache2/Manifest
deleted file mode 100644
index 9b19afc7f799..000000000000
--- a/dev-python/linecache2/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST linecache2-1.0.0.tar.gz 11013 BLAKE2B 5f9b125819d9c812d37f1c14ef9ab52f2d5787c83a3d0d891a4def65f17aea26d903b269a610b7247927f72c1594b434ce9274c5358b29799e4ca5b426b37836 SHA512 e585a6e4c054c1965bc4241a1e36b57cb04f32b2d778df0ae4381975700497975251f509354d3622e36c82973c726a207b815f8b12060d9d583b6669a9eb279e
diff --git a/dev-python/linecache2/linecache2-1.0.0-r1.ebuild b/dev-python/linecache2/linecache2-1.0.0-r1.ebuild
deleted file mode 100644
index 0ad3c607d702..000000000000
--- a/dev-python/linecache2/linecache2-1.0.0-r1.ebuild
+++ /dev/null
@@ -1,29 +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} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="Backports of the linecache module"
-HOMEPAGE="https://github.com/testing-cabal/linecache2"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="PSF-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-BDEPEND="
-	dev-python/pbr[${PYTHON_USEDEP}]
-	test? (
-		dev-python/fixtures[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests unittest
-
-src_prepare() {
-	# eliminate unittest2 dep
-	sed -i -e '/unittest/s:2 as.*::' linecache2/tests/test_linecache.py || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/linecache2/metadata.xml b/dev-python/linecache2/metadata.xml
deleted file mode 100644
index ff47e3aa0fe1..000000000000
--- a/dev-python/linecache2/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">linecache2</remote-id>
- </upstream>
- <origin>gentoo-staging</origin>
-</pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/moto/Manifest b/dev-python/moto/Manifest
index 58a12b16e5e0..8aef62d6f041 100644
--- a/dev-python/moto/Manifest
+++ b/dev-python/moto/Manifest
@@ -1,3 +1,4 @@
 DIST moto-2.0.10.tar.gz 1629239 BLAKE2B 3b1e2272f0a78b90dcf4263fa9e1e7cee17621215d742387bddb518da973fb4d0bf383b78bccec2e312aaa65b41428a78731e458e4f6a04bedf31306430a76a4 SHA512 77db3ec43d9777f469cae18f891ad277b2ae89fe0e69474dd904876ebb275503bb3beefe130d1ede05c7f1370107fcc6db76ef5c8e446a2132ad5dd85fea9ac5
 DIST moto-2.0.5.tar.gz 1551415 BLAKE2B 452cb94443188e1715145bee574f04924d894a3d647673443a8a335bb907f8601098540b032d6c9a8ced3e1fc490c49ad70c877547d905cece05bbb742d05976 SHA512 70e64ab98873d480e776a2139a4d351665c6c2f98faf90e2871c6b9998571d1bd239757bc90bbc6ab6e1ed510598bfce77157ad522953efe40c884068885c57d
 DIST moto-2.2.0.tar.gz 1650655 BLAKE2B 9969de2fb323b2deb272eb47727884054a35827a5db382f83a4177cf6cac5339f89164d05c288a977bc1895a204d13d02069e8b37880ea3d04374f6ed4d6be47 SHA512 7eabb515f94920af9b8f028afaaa51e27983f7bfd73f66c29fc191e2f3dd3e8939ddac67de0127c67c35cbc17c3500a7390103b26c85056780c865aadeb5e1d9
+DIST moto-2.2.2.tar.gz 1684678 BLAKE2B ebe1eb08c67ccdb8c484fa8fc75d7ce58750d94620f46b53268d6b6b0732d90160bf7b6837efa492f621e1c001d933f5d59d39c266d65bbb1852f315b3bc03d0 SHA512 a8b192637b701eda0e4a7b11e84f5251386de98590f1d7c33732d8bf12642b39b61f1d360ad39c3e1b0a645268139d9e330d48fbe7029b943094ad317cb45ff6
diff --git a/dev-python/moto/moto-2.2.2.ebuild b/dev-python/moto/moto-2.2.2.ebuild
new file mode 100644
index 000000000000..fb596d412f1b
--- /dev/null
+++ b/dev-python/moto/moto-2.2.2.ebuild
@@ -0,0 +1,75 @@
+# 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="Mock library for boto"
+HOMEPAGE="https://github.com/spulec/moto"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	>=dev-python/aws-xray-sdk-python-0.93[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/backports-tempfile[${PYTHON_USEDEP}]' python3_{6,7})
+	dev-python/boto[${PYTHON_USEDEP}]
+	dev-python/cfn-python-lint[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-3.3.1[${PYTHON_USEDEP}]
+	dev-python/cookies[${PYTHON_USEDEP}]
+	dev-python/dicttoxml[${PYTHON_USEDEP}]
+	>=dev-python/docker-py-2.5.1[${PYTHON_USEDEP}]
+	>=dev-python/idna-2.5[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.10.1[${PYTHON_USEDEP}]
+	>=dev-python/jsondiff-1.1.2[${PYTHON_USEDEP}]
+	>=dev-python/boto3-1.9.201[${PYTHON_USEDEP}]
+	>=dev-python/botocore-1.12.201[${PYTHON_USEDEP}]
+	dev-python/flask[${PYTHON_USEDEP}]
+	dev-python/flask-cors[${PYTHON_USEDEP}]
+	dev-python/importlib_metadata[${PYTHON_USEDEP}]
+	dev-python/more-itertools[${PYTHON_USEDEP}]
+	dev-python/pretty-yaml[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/python-jose[${PYTHON_USEDEP}]
+	dev-python/python-sshpubkeys[${PYTHON_USEDEP}]
+	>=dev-python/responses-0.9.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.5[${PYTHON_USEDEP}]
+	dev-python/xmltodict[${PYTHON_USEDEP}]
+	dev-python/werkzeug[${PYTHON_USEDEP}]
+	dev-python/zipp[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		dev-python/responses[${PYTHON_USEDEP}]
+		>=dev-python/sure-1.4.11[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# unpin indirect dep on ecdsa that's supposed to workaround pip bugs
+	sed -i -e '/ecdsa/s:<0.15::' setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	local ignore=(
+		# incompatible versions?
+		tests/test_core/test_decorator_calls.py
+		tests/test_s3/test_s3_classdecorator.py
+	)
+
+	# pytest-django causes freezegun try to mangle stuff inside django
+	# which fails when django is not really used
+	epytest -p no:django -m 'not network' ${ignore[@]/#/--ignore }
+}
diff --git a/dev-python/mypy_extensions/metadata.xml b/dev-python/mypy_extensions/metadata.xml
index 79c7d58e1af7..5b3fc59214fc 100644
--- a/dev-python/mypy_extensions/metadata.xml
+++ b/dev-python/mypy_extensions/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
- <maintainer type="person">
-  <email>ikelos@gentoo.org</email>
-  <name>Mike Auty</name>
+ <maintainer type="project">
+  <email>python@gentoo.org</email>
+  <name>Python</name>
  </maintainer>
  <upstream>
   <remote-id type="pypi">mypy-extensions</remote-id>
diff --git a/dev-python/mypy_extensions/mypy_extensions-0.4.3-r1.ebuild b/dev-python/mypy_extensions/mypy_extensions-0.4.3-r1.ebuild
index d6d73b62d1c1..40ad8a422d9c 100644
--- a/dev-python/mypy_extensions/mypy_extensions-0.4.3-r1.ebuild
+++ b/dev-python/mypy_extensions/mypy_extensions-0.4.3-r1.ebuild
@@ -1,31 +1,25 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+EAPI=8
 
+PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Optional static typing for Python"
-HOMEPAGE="http://www.mypy-lang.org/"
-SRC_URI="https://github.com/python/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-if [[ "${PV}" =~ [9]{4,} ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/python/${PN}"
-	EGIT_COMMIT="master"
-else
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos"
-fi
+HOMEPAGE="
+	http://www.mypy-lang.org/
+	https://github.com/python/mypy_extensions/"
+SRC_URI="
+	https://github.com/python/mypy_extensions/archive/${PV}.tar.gz
+		-> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-
-IUSE="test"
-RESTRICT="!test? ( test )"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos"
 
 distutils_enable_tests unittest
 
 python_test() {
-	"${PYTHON}" -m unittest discover tests -v || die "tests fail with ${EPYTHON}"
+	eunittest tests
 }
diff --git a/dev-python/nbformat/nbformat-5.1.3.ebuild b/dev-python/nbformat/nbformat-5.1.3.ebuild
index 8f4c6268c057..8a01010defaa 100644
--- a/dev-python/nbformat/nbformat-5.1.3.ebuild
+++ b/dev-python/nbformat/nbformat-5.1.3.ebuild
@@ -18,7 +18,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~riscv ~sparc x86"
 
 RDEPEND="
 	>=dev-python/jsonschema-2.4.0[${PYTHON_USEDEP}]
diff --git a/dev-python/nose_warnings_filters/nose_warnings_filters-0.1.5-r3.ebuild b/dev-python/nose_warnings_filters/nose_warnings_filters-0.1.5-r3.ebuild
index 84fa70cb11b9..b0ab9b91b67d 100644
--- a/dev-python/nose_warnings_filters/nose_warnings_filters-0.1.5-r3.ebuild
+++ b/dev-python/nose_warnings_filters/nose_warnings_filters-0.1.5-r3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~riscv ~sparc x86"
 
 RDEPEND="dev-python/nose[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/nuitka/Manifest b/dev-python/nuitka/Manifest
index c70cdf42c45e..1692fb6eaa09 100644
--- a/dev-python/nuitka/Manifest
+++ b/dev-python/nuitka/Manifest
@@ -3,4 +3,5 @@ DIST Nuitka-0.6.15.1.tar.gz 2712603 BLAKE2B 8e639b19975410143d1b91b4fb4f71c65bd1
 DIST Nuitka-0.6.15.3.tar.gz 2713332 BLAKE2B e8d61221839bb961cda14575aa1de5979510113a09b7e8df47aefbf8985b09f554b32210db9b91ca5f02593a11d7537adcdf0fd67d397b022623534bb25368c3 SHA512 960f2ef33aa2c4dcb6a86ed15b8d8fc8ca1c5f26a0dc98a925e8c0669599912f25d10e20f547d51d57c0a63a18e2f07fa45141666b740b3d8804014db5b89bb6
 DIST Nuitka-0.6.15.tar.gz 2712097 BLAKE2B 78c43be4a2ef5678d7a0d6164d7cba2b3a67a738215915b001cdb3774e209fcecc167c52db4c3b22d87dde9169e48077875d09f8601df7c8b079e3d57b21aea6 SHA512 9a41e9b8fb3f51ec16dccd5415b3b7d7d201230fea6aff902931be1764ba65e1d5e4885cd772b4c1cb9f36b1b14a02a73351bc5c1b8e7f7bbb87e5d74aad16b4
 DIST Nuitka-0.6.16.2.tar.gz 2964589 BLAKE2B b8dd49b889ab0921b6bcf25528286c72591d12e470074482be2f2919394d7c7281d15f83fe1283731a45731a6164a72fb19afc5f55c7c7ef913487cadc6af105 SHA512 58fbd015cf14f947900ccb39a82a24ba8b2da6b65f41caa6bdaff89fe8b5b00977b2f0f3e2b9c2809db97539ecb59f2835ebc30eccd726d42b3fbb49cd90ca8c
+DIST Nuitka-0.6.16.3.tar.gz 2965278 BLAKE2B fc015f78912688e3d3b0833e7c126833352aeda7ac2599685a007445c43a7099407c4797eba47d5254fb5befde9482c210b920f4c7e38a2d82dbb5331125abee SHA512 a46af040774fd3523b64c1a113f6d0251c8d45108686017dae07429107f5057025bbcfefc7ed2b86da32c69516285d3af55fe234d25d6949562a96b0eb3f5293
 DIST Nuitka-0.6.16.tar.gz 2891639 BLAKE2B 4d8b9c29115e333b7a876eed664c0ec7b2a9b25b00d35bfb163834579b28d6b1250b015eacced01e2c27cd9841fcc5d2a3b10c626a5c7fc098914e675e3732a6 SHA512 908ddbab62a085a478f09c18215fd9b457aa7fe926e5809cd25870665366660f59141b431346e4af6593e4bb0281d39103919c46435c158af6f2ba7c354c3834
diff --git a/dev-python/nuitka/nuitka-0.6.16.3.ebuild b/dev-python/nuitka/nuitka-0.6.16.3.ebuild
new file mode 100644
index 000000000000..20c8f712b514
--- /dev/null
+++ b/dev-python/nuitka/nuitka-0.6.16.3.ebuild
@@ -0,0 +1,48 @@
+# 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 flag-o-matic optfeature
+
+DESCRIPTION="Python to native compiler"
+HOMEPAGE="https://www.nuitka.net"
+SRC_URI="https://nuitka.net/releases/${P^}.tar.gz"
+S="${WORKDIR}/${P^}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-util/scons[${PYTHON_USEDEP}]"
+BDEPEND="
+	${RDEPEND}
+	test? ( dev-util/ccache )
+"
+
+DOCS=( Changelog.pdf Developer_Manual.pdf README.pdf )
+
+distutils-r1_src_prepare() {
+	# remove vendored version of SCons that is Python2 only
+	# this should be removed when upstream removes support for Python2
+	rm -vR "${S}/${PN}/build/inline_copy/lib/scons-2.3.2/SCons"  || die
+	eapply_user
+}
+
+python_install() {
+	distutils-r1_python_install
+	python_optimize
+	doman doc/nuitka.1 doc/nuitka3.1 doc/nuitka3-run.1 doc/nuitka-run.1
+}
+
+python_test() {
+	append-ldflags -Wl,--no-warn-search-mismatch
+	./tests/basics/run_all.py search || die
+}
+
+pkg_postinst() {
+	optfeature "support for stand-alone executables" app-admin/chrpath
+}
diff --git a/dev-python/numexpr/numexpr-2.7.3.ebuild b/dev-python/numexpr/numexpr-2.7.3.ebuild
index e2e2605f7fe7..a4d13f6f9131 100644
--- a/dev-python/numexpr/numexpr-2.7.3.ebuild
+++ b/dev-python/numexpr/numexpr-2.7.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/pydata/numexpr/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="mkl"
 
 RDEPEND="
diff --git a/dev-python/openpyxl/openpyxl-3.0.7-r1.ebuild b/dev-python/openpyxl/openpyxl-3.0.7-r1.ebuild
index bd5b24b8d78e..32bbad5c41b1 100644
--- a/dev-python/openpyxl/openpyxl-3.0.7-r1.ebuild
+++ b/dev-python/openpyxl/openpyxl-3.0.7-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://foss.heptapod.net/openpyxl/openpyxl/-/archive/${PV}/${P}.tar.bz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa x86"
 
 RDEPEND="
 	dev-python/et_xmlfile[${PYTHON_USEDEP}]
diff --git a/dev-python/pathlib2/Manifest b/dev-python/pathlib2/Manifest
deleted file mode 100644
index bf6172f630c0..000000000000
--- a/dev-python/pathlib2/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST pathlib2-2.3.5.tar.gz 34393 BLAKE2B 7e03214a53f1ebf7718d04f653e24ffa4b06070b0ae21583d98ea0ce956c5aced5ea63bf6062d8e8d979bef4c82137cd2d2d5d6121dc3dda0ae1f713c1868d36 SHA512 3f0f212bf5208d0965ac02a590bef6ac0ec5e3b702828c06c3c9d37119b3db422cc7873de614fdc37ebfb3f52239a6517008d9672a176ca15d03fe13baeeddc8
-DIST pathlib2-2.3.6.tar.gz 38435 BLAKE2B 07a6db61feb56c439e0c4c97d96f87714090628d3971341b64ed253cf9b363b7a3695a665a3def5c2b950cd3dc2ba316ef3dcfaf48f25726fce34afedccdafac SHA512 ed41792338d5808cdd068f6c04021b2918e5376fc6297f163712dec6b00a1f96f7905eeea0a601c333d253e0f1663a0472d842b0d920d680992045bbc36db970
diff --git a/dev-python/pathlib2/metadata.xml b/dev-python/pathlib2/metadata.xml
deleted file mode 100644
index 05796cd70807..000000000000
--- a/dev-python/pathlib2/metadata.xml
+++ /dev/null
@@ -1,14 +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">pathlib2</remote-id>
-  <bugs-to>https://github.com/mcmtroffaes/pathlib2/issues</bugs-to>
- </upstream>
- <origin>gentoo-staging</origin>
- <stabilize-allarches/>
-</pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/pathlib2/pathlib2-2.3.5-r1.ebuild b/dev-python/pathlib2/pathlib2-2.3.5-r1.ebuild
deleted file mode 100644
index 39ca404ae77e..000000000000
--- a/dev-python/pathlib2/pathlib2-2.3.5-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Fork of pathlib aiming to support the full stdlib Python API"
-HOMEPAGE="https://github.com/mcmtroffaes/pathlib2"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	$(python_gen_cond_dep 'dev-python/scandir[${PYTHON_USEDEP}]' -2)
-	dev-python/six[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		${RDEPEND}
-		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' -2)
-	)
-"
-
-python_test() {
-	"${EPYTHON}" tests/test_pathlib2.py -v || \
-		die "tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/pathlib2/pathlib2-2.3.6.ebuild b/dev-python/pathlib2/pathlib2-2.3.6.ebuild
deleted file mode 100644
index 19d51e42d2c1..000000000000
--- a/dev-python/pathlib2/pathlib2-2.3.6.ebuild
+++ /dev/null
@@ -1,31 +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} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="Fork of pathlib aiming to support the full stdlib Python API"
-HOMEPAGE="https://github.com/mcmtroffaes/pathlib2"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		${RDEPEND}
-	)
-"
-
-python_test() {
-	"${EPYTHON}" tests/test_pathlib2.py -v ||
-		die "tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/phonenumbers/Manifest b/dev-python/phonenumbers/Manifest
index 2a55ef32f1b9..0a9cdc67570e 100644
--- a/dev-python/phonenumbers/Manifest
+++ b/dev-python/phonenumbers/Manifest
@@ -1,2 +1,3 @@
 DIST phonenumbers-8.12.27.tar.gz 2258133 BLAKE2B 73a295a464a0e4e7d32f3633a0a149504aed376a255453d3edb49137e979144645780777d988b1fbf5d7380b468ba9dd905f34e42f658f6ff8d0e0047d45ee35 SHA512 d177606bed9ca6f4e7f91ab695d9ae6ddfb2401f36c458907b2b6fe14e85a2ed188967da14971c15ec745b87fe794fc8ecca86679f01d3c8fb649224c2f75139
 DIST phonenumbers-8.12.28.tar.gz 2258298 BLAKE2B 02713540accf8c77c37acd7f69ffe3d1fe972124e4c8e82aa56f390d9906b10771c5a1a845c9b1adab602b041c38f4eeac6ee76d0e3382d542d64bcff5788fcc SHA512 49678b2b44038938733413d9bdd56904bb1a55bff9e1fa9a2636ceca18233c2ecdcc0fba8da5d1eb09e28c3c5d0eed61dcfcec1da729b7e599fcbc895ee47ead
+DIST phonenumbers-8.12.29.tar.gz 2258737 BLAKE2B 6a885e4ba28d7093746cd754a5fb60cb62b002a42d4331bb1cdfc2291b39b6da6d3c6673364e4715c09186bebf05b11988cf3beb8ed1690826ef800d07b17e7c SHA512 23e88f9a8bb801bb7a95cd5ef74527572d315e69b2db1c9c38c84d83293d99a015492f010321c9dc0596a5f40dc63453a42e2fd5a7d9dabae7ac0b78967876d7
diff --git a/dev-python/phonenumbers/phonenumbers-8.12.29.ebuild b/dev-python/phonenumbers/phonenumbers-8.12.29.ebuild
new file mode 100644
index 000000000000..717843f08927
--- /dev/null
+++ b/dev-python/phonenumbers/phonenumbers-8.12.29.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+inherit distutils-r1
+
+DESCRIPTION="Python port of Google's libphonenumber"
+HOMEPAGE="https://github.com/daviddrysdale/python-phonenumbers"
+SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DOCS=(README.md)
+
+distutils_enable_tests setup.py
diff --git a/dev-python/pymysql/pymysql-1.0.2.ebuild b/dev-python/pymysql/pymysql-1.0.2.ebuild
index 75e67065b9df..649483d462c8 100644
--- a/dev-python/pymysql/pymysql-1.0.2.ebuild
+++ b/dev-python/pymysql/pymysql-1.0.2.ebuild
@@ -17,7 +17,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~sparc x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~sparc x86"
 
 # TODO: support other mysql variants
 BDEPEND="
diff --git a/dev-python/pyotherside/metadata.xml b/dev-python/pyotherside/metadata.xml
index daed393af07e..83d00b14c8d4 100644
--- a/dev-python/pyotherside/metadata.xml
+++ b/dev-python/pyotherside/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
- <maintainer type="person">
-  <email>gokturk@gentoo.org</email>
-  <name>Göktürk Yüksek</name>
- </maintainer>
  
  <origin>gentoo-staging</origin>
 </pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/responses/Manifest b/dev-python/responses/Manifest
index ef73f3f473ec..0d881b232dd3 100644
--- a/dev-python/responses/Manifest
+++ b/dev-python/responses/Manifest
@@ -1,2 +1,3 @@
 DIST responses-0.13.2.tar.gz 30302 BLAKE2B d90059e12518841af0276777a77c28aa96ffa5fcdea9ff1ce2d7a5b0c7e225b1b6253bc38bce534b8447de43365e7315b3ee667e6d845206a9a7a3c3c0d27227 SHA512 cac338cd2c2b3c0193de779ef47830471ed17f2df7d94c30acea0117dfe508550a1dec471fbf249320637125322a5a40273be568b330989a272870afaea0bd04
 DIST responses-0.13.3.tar.gz 30327 BLAKE2B 299d4ce81b5ff1703cf72fdb42d39126b5bc8cd95837467cbcfb35c1688e75ec8c95edaafca4100c1b6cb51fe8e9f4c22db1a3e2f46714539bff7a861b16451c SHA512 c523755e44e158c3b37d084b9105ba36f515eb883928d51f296ffd911d72206461cd864355d991ff6f6f05abb447a3eb558ac9958379b0a8a49d29b8afcadef4
+DIST responses-0.13.4.tar.gz 30608 BLAKE2B 1ae4fec958aa165e5cc76ec0bd87b7f872e97f3ddd952f6a79024eae3e2638c08681020244c86d05f6fe5467408cef30f6c8c311538aca28a618dc746db42974 SHA512 645bb967d2ff601a49c22e603ac1ab0c1f070dc6d62ad3b87ec58fe97cae7e4882c0068b565a24ba05ec1a3cccb8e9d90fb1b398bf79935c7a8b208f3ead1920
diff --git a/dev-python/responses/responses-0.13.4.ebuild b/dev-python/responses/responses-0.13.4.ebuild
new file mode 100644
index 000000000000..d70241304eb8
--- /dev/null
+++ b/dev-python/responses/responses-0.13.4.ebuild
@@ -0,0 +1,30 @@
+# 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="Utility for mocking out the Python Requests library"
+HOMEPAGE="https://github.com/getsentry/responses"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-python/requests-2.0[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.10[${PYTHON_USEDEP}]
+	dev-python/cookies[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	test? (
+		dev-python/pytest-localserver[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/scikit-build/scikit-build-0.11.1.ebuild b/dev-python/scikit-build/scikit-build-0.11.1.ebuild
index 933dc3e69847..be5f99f42f6e 100644
--- a/dev-python/scikit-build/scikit-build-0.11.1.ebuild
+++ b/dev-python/scikit-build/scikit-build-0.11.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86"
 
 RDEPEND="
 	dev-python/distro[${PYTHON_USEDEP}]
diff --git a/dev-python/send2trash/Manifest b/dev-python/send2trash/Manifest
index faf1d749682d..44347439dd09 100644
--- a/dev-python/send2trash/Manifest
+++ b/dev-python/send2trash/Manifest
@@ -1 +1,2 @@
 DIST Send2Trash-1.5.0.tar.gz 10892 BLAKE2B 36b51f1859a3b40aa5d9b619491a13da8453ff6615e71423724131a2a88207665d3fbaeef49ecc0ff02b77738d02023c08543d8a759cc0807d74740a8af9b9de SHA512 3c08ef513e5707cd4ac82290b326bb19161222c7a84b8ffd494789ba9858929241f55ea55482947af464c14e32fea27bd92cd762a32a1d55e2daf2e21fd63172
+DIST send2trash-1.8.0.gh.tar.gz 15040 BLAKE2B 06f6b0b9e4e9316bc60332ea76426922db6d35fa5d4e0602e91a58996bb55a2344d7d56547bdf21151641c5ec710b78b2b11c8fda158eb911155994c86d10078 SHA512 9dc15fbd262eb5a05a355b436c0e582e5ef9b484f859b53faafe6af5bd08ef88b9aa5121485c2fffb7dbe5aeeef29f6719035e08c61da273fd4fa51383b062fe
diff --git a/dev-python/send2trash/send2trash-1.8.0.ebuild b/dev-python/send2trash/send2trash-1.8.0.ebuild
new file mode 100644
index 000000000000..73985a7b6be5
--- /dev/null
+++ b/dev-python/send2trash/send2trash-1.8.0.ebuild
@@ -0,0 +1,21 @@
+# 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="Sends files to the Trash (or Recycle Bin)"
+HOMEPAGE="
+	https://pypi.org/project/Send2Trash/
+	https://github.com/arsenetar/send2trash/"
+SRC_URI="
+	https://github.com/arsenetar/send2trash/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+
+distutils_enable_tests pytest
diff --git a/dev-python/sip/sip-4.19.25-r1.ebuild b/dev-python/sip/sip-4.19.25-r1.ebuild
index d10b377651f2..7698d60a22b4 100644
--- a/dev-python/sip/sip-4.19.25-r1.ebuild
+++ b/dev-python/sip/sip-4.19.25-r1.ebuild
@@ -20,7 +20,7 @@ S=${WORKDIR}/${MY_P}
 # Sub-slot based on SIP_API_MAJOR_NR from siplib/sip.h
 SLOT="0/12"
 LICENSE="|| ( GPL-2 GPL-3 SIP )"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86"
 IUSE="doc"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-python/sphinxcontrib-github-alt/sphinxcontrib-github-alt-1.2.ebuild b/dev-python/sphinxcontrib-github-alt/sphinxcontrib-github-alt-1.2.ebuild
index 9b4c7d0e318a..e0af3f843e86 100644
--- a/dev-python/sphinxcontrib-github-alt/sphinxcontrib-github-alt-1.2.ebuild
+++ b/dev-python/sphinxcontrib-github-alt/sphinxcontrib-github-alt-1.2.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="dev-python/sphinx[${PYTHON_USEDEP}]"
 BDEPEND="${RDEPEND}"
diff --git a/dev-python/toolz/toolz-0.11.1.ebuild b/dev-python/toolz/toolz-0.11.1.ebuild
index 2ad96c481a42..d1ce1429fc3b 100644
--- a/dev-python/toolz/toolz-0.11.1.ebuild
+++ b/dev-python/toolz/toolz-0.11.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~sparc x86 ~amd64-linux ~x86-linux"
 
 BDEPEND="
 	dev-python/versioneer[${PYTHON_USEDEP}]"
diff --git a/dev-python/traceback2/Manifest b/dev-python/traceback2/Manifest
deleted file mode 100644
index 21597fa0d421..000000000000
--- a/dev-python/traceback2/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST traceback2-1.4.0.tar.gz 15872 BLAKE2B cd2e1fe91e1e71a6dd764675e083857f359cfa5aaa3d2fee7f1709e24c545bb9e337f0af1d87f9e286fa2c36dfa12dca84589a936dc9f9805a1c4891739f337b SHA512 84c7fc291c8f2d4cee10441cdef1820aa453e631dfa91ed58e40fc205e97a9dd2101388d5689e4fdf10edfbf06bdb5b895d1635ae7218ba0c9b697d3f95f9342
diff --git a/dev-python/traceback2/metadata.xml b/dev-python/traceback2/metadata.xml
deleted file mode 100644
index 5ad17fd5927b..000000000000
--- a/dev-python/traceback2/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">traceback2</remote-id>
- </upstream>
- <origin>gentoo-staging</origin>
-</pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/traceback2/traceback2-1.4.0-r1.ebuild b/dev-python/traceback2/traceback2-1.4.0-r1.ebuild
deleted file mode 100644
index 8f96a13f5ca4..000000000000
--- a/dev-python/traceback2/traceback2-1.4.0-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Backports of the traceback module"
-HOMEPAGE="https://github.com/testing-cabal/traceback2"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="PSF-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	dev-python/linecache2[${PYTHON_USEDEP}]"
-BDEPEND="
-	dev-python/pbr[${PYTHON_USEDEP}]
-	test? (
-		dev-python/contextlib2[${PYTHON_USEDEP}]
-		dev-python/fixtures[${PYTHON_USEDEP}]
-		dev-python/unittest2[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests unittest
-
-src_prepare() {
-	# fails by line numbers on various py3 versions
-	sed -i -e 's:test_context_suppression:_&:' \
-		-e 's:test_format_locals:_&:' \
-		-e 's:test_bad_indentation:_&:' \
-		-e 's:test_encoded_file:_&:' \
-		traceback2/tests/test_traceback.py || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/unittest2/Manifest b/dev-python/unittest2/Manifest
deleted file mode 100644
index d0ed1201801f..000000000000
--- a/dev-python/unittest2/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST unittest2-1.1.0.tar.gz 81432 BLAKE2B 02bf191baaa895689078e8f484bb368cd178ea2d1e275a5adcd3413eb25d18b9109c353046f60819c7ec26cd233867b7397e6e38004389aa928b4c53cfeb637c SHA512 3fba15728905f437767416ab4fd3573d3fb2319486ef84c52a9fa930ea84aa1f2ae29d6f58993e3509083625790e17b1ef8d9ac5de0e166c254897a3e7a202fa
diff --git a/dev-python/unittest2/files/remove-argparse-dependence.patch b/dev-python/unittest2/files/remove-argparse-dependence.patch
deleted file mode 100644
index 36f89fc5f8f6..000000000000
--- a/dev-python/unittest2/files/remove-argparse-dependence.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -r 8928fb47c3a9 setup.py
---- a/setup.py	Thu Mar 12 15:55:36 2015 +1300
-+++ b/setup.py	Sun Apr 05 09:06:44 2015 -0500
-@@ -57,7 +57,7 @@
- # Both install and setup requires - because we read VERSION from within the
- # package, and the package also exports all the APIs.
- # six for compat helpers
--REQUIRES = ['argparse', 'six>=1.4', 'traceback2'],
-+REQUIRES = ['six>=1.4', 'traceback2'],
- 
- params = dict(
-     name=NAME,
diff --git a/dev-python/unittest2/files/unittest2-1.1.0-python3.5-test.patch b/dev-python/unittest2/files/unittest2-1.1.0-python3.5-test.patch
deleted file mode 100644
index 4aae9d04b2f8..000000000000
--- a/dev-python/unittest2/files/unittest2-1.1.0-python3.5-test.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff --git a/unittest2/test/test_loader.py b/unittest2/test/test_loader.py
-index 683f662..347eea5 100644
---- a/unittest2/test/test_loader.py
-+++ b/unittest2/test/test_loader.py
-@@ -509,6 +509,7 @@ class Test_TestLoader(unittest2.TestCase):
-     #
-     # What happens when an impossible name is given, relative to the provided
-     # `module`?
-+    @unittest.skipIf(sys.version_info[:2] >= (3, 5), "python 3.5 has problems here")
-     def test_loadTestsFromName__relative_malformed_name(self):
-         loader = unittest.TestLoader()
- 
-@@ -811,6 +812,7 @@ class Test_TestLoader(unittest2.TestCase):
-     # TestCase or TestSuite instance."
-     #
-     # What happens when presented with an impossible module name?
-+    @unittest.skipIf(sys.version_info[:2] >= (3, 5), "python 3.5 has problems here")
-     def test_loadTestsFromNames__malformed_name(self):
-         loader = unittest2.TestLoader()
- 
-@@ -918,6 +920,7 @@ class Test_TestLoader(unittest2.TestCase):
-     # "The method optionally resolves name relative to the given module"
-     #
-     # What happens when presented with an impossible attribute name?
-+    @unittest.skipIf(sys.version_info[:2] >= (3, 5), "python 3.5 has problems here")
-     def test_loadTestsFromNames__relative_malformed_name(self):
-         loader = unittest.TestLoader()
- 
diff --git a/dev-python/unittest2/metadata.xml b/dev-python/unittest2/metadata.xml
deleted file mode 100644
index a5d874621461..000000000000
--- a/dev-python/unittest2/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">unittest2</remote-id>
- </upstream>
- <origin>gentoo-staging</origin>
-</pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/unittest2/unittest2-1.1.0-r1.ebuild b/dev-python/unittest2/unittest2-1.1.0-r1.ebuild
deleted file mode 100644
index 3deba9553303..000000000000
--- a/dev-python/unittest2/unittest2-1.1.0-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="The new features in unittest backported to Python 2.4+"
-HOMEPAGE="https://pypi.org/project/unittest2/ https://github.com/testing-cabal/unittest-ext"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-
-RDEPEND="
-	dev-python/linecache2[${PYTHON_USEDEP}]
-	>=dev-python/six-1.4[${PYTHON_USEDEP}]
-	dev-python/traceback2[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests unittest
-
-PATCHES=(
-	"${FILESDIR}"/remove-argparse-dependence.patch
-	"${FILESDIR}"/${P}-python3.5-test.patch
-)
-
-python_test() {
-	"${PYTHON}" -m unittest2 discover --verbose ||
-		die "tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/virtualenv/Manifest b/dev-python/virtualenv/Manifest
index db0e37a80ddb..90d7c98cd9e5 100644
--- a/dev-python/virtualenv/Manifest
+++ b/dev-python/virtualenv/Manifest
@@ -1,3 +1,4 @@
 DIST virtualenv-20.4.7.tar.gz 10625204 BLAKE2B 1233ea45f771fb425b99c966904e2c5444e5fcb617b1d7cd34cdac097ee15566b7f4c841d444393723ed369193f33bef90ea7caa5b3c20aaf65fbde2f865abf7 SHA512 a554fb32cc46cb1cef2a2655bdae598efb52a4e71223eb10d9a36b124390546250aa11cf7da991a41ef4697523ec4562a31e35b5ab7ee8aba748ea4ff28e088b
 DIST virtualenv-20.6.0.tar.gz 8700762 BLAKE2B 718bbfda175ab4ef0820ba66b480060c0371c54a3e6c622c816d8c30141951c85b4f461fa03f71912a767b8d6a40733ab253062466e38a4a2e18b3169812e6a1 SHA512 7eff570f407a4986336d5a34bdcab1621d953aa6900d41962a85a5a44d7b68d378cda4a1bc1ddbfbc468580e051a98c37be17b0a52babbb00166718a987a591c
 DIST virtualenv-20.7.0.tar.gz 8714219 BLAKE2B 81b5ee144614a7c854e03599270d03454f991520e8381b98ef01b64e91bb7520a3949e5af9710ceb6292be6b7b7e3738ed7a08324b5ada37f8f4941b408fb425 SHA512 af0f993045013814d9397419fc9d789a1ad64dc53818cbeceb5146e418a8535f76b74ed36b4b164d6974660be77de91cda244eb70b810c8c9fb522ba1088813a
+DIST virtualenv-20.7.1.tar.gz 8714303 BLAKE2B 9ba0714fa842a4d4dc07f8a47536ad95f049c7d4149be7d859af55e6f26aef5d61c80399a8e03de183b7e170ac47eab6bee263c5d3df79eac6a00c63cb368873 SHA512 4d0127ef38655c6370c874a99dc3a92f2d1e50428496878e64aaf52a944f54fb6fc8397c1b4943c40c7cd5c19ee93cccfab735f38d3dcc202372e1081f0ea23f
diff --git a/dev-python/virtualenv/virtualenv-20.7.1.ebuild b/dev-python/virtualenv/virtualenv-20.7.1.ebuild
new file mode 100644
index 000000000000..648aaafbea48
--- /dev/null
+++ b/dev-python/virtualenv/virtualenv-20.7.1.ebuild
@@ -0,0 +1,97 @@
+# 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 )
+DISTUTILS_USE_SETUPTOOLS=manual
+
+inherit distutils-r1
+
+DESCRIPTION="Virtual Python Environment builder"
+HOMEPAGE="
+	https://virtualenv.pypa.io/en/stable/
+	https://pypi.org/project/virtualenv/
+	https://github.com/pypa/virtualenv/
+"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+SLOT="0"
+
+RDEPEND="
+	>=dev-python/backports-entry_points_selectable-1.0.4[${PYTHON_USEDEP}]
+	>=dev-python/distlib-0.3.1[${PYTHON_USEDEP}]
+	>=dev-python/filelock-3[${PYTHON_USEDEP}]
+	>=dev-python/platformdirs-2[${PYTHON_USEDEP}]
+	>=dev-python/setuptools-41[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/importlib_metadata-0.12[${PYTHON_USEDEP}]
+	' pypy3)"
+# coverage is used somehow magically in virtualenv, maybe it actually
+# tests something useful
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/flaky[${PYTHON_USEDEP}]
+		>=dev-python/pip-20.0.2[${PYTHON_USEDEP}]
+		>=dev-python/pytest-freezegun-0.4.1[${PYTHON_USEDEP}]
+		>=dev-python/pytest-mock-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/pytest-timeout-1.3.4[${PYTHON_USEDEP}]
+		dev-python/wheel[${PYTHON_USEDEP}]
+		>=dev-python/packaging-20.0[${PYTHON_USEDEP}]
+	)"
+
+# (unpackaged deps)
+#distutils_enable_sphinx docs \
+#	dev-python/sphinx-argparse \
+#	dev-python/sphinx_rtd_theme \
+#	dev-python/towncrier
+distutils_enable_tests pytest
+
+src_configure() {
+	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+}
+
+python_test() {
+	local deselect=(
+		tests/unit/activation/test_xonsh.py
+		tests/unit/seed/embed/test_bootstrap_link_via_app_data.py::test_seed_link_via_app_data
+		tests/unit/create/test_creator.py::test_cross_major
+	)
+	[[ ${EPYTHON} == pypy3 ]] && deselect+=(
+		'tests/unit/create/test_creator.py::test_create_no_seed[root-pypy3-posix-copies-isolated]'
+		'tests/unit/create/test_creator.py::test_create_no_seed[root-pypy3-posix-copies-global]'
+		'tests/unit/create/test_creator.py::test_create_no_seed[venv-pypy3-posix-copies-isolated]'
+		'tests/unit/create/test_creator.py::test_create_no_seed[venv-pypy3-posix-copies-global]'
+		'tests/unit/create/test_creator.py::test_zip_importer_can_import_setuptools'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.9-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.9--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.10-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.10--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.9-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.9--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.10-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.10--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3--bin-]'
+	)
+
+	distutils_install_for_testing
+	epytest ${deselect[@]/#/--deselect }
+}
+
+pkg_postinst() {
+	elog "Please note that while virtualenv package no longer supports"
+	elog "Python 2.7, you can still create py2.7 virtualenvs via:"
+	elog "  $ virtualenv -p 2.7 ..."
+}
diff --git a/dev-python/wheel/Manifest b/dev-python/wheel/Manifest
index fa55c58f41f2..c955bbec517b 100644
--- a/dev-python/wheel/Manifest
+++ b/dev-python/wheel/Manifest
@@ -1 +1,2 @@
 DIST wheel-0.36.2.gh.tar.gz 67999 BLAKE2B 0bb6742ddb25a5b94f94fd071dfe63ae5fa555731625b4b8ca2c7abb1a255e24590ae9ea250ada0473fcd74f19bdca7e529f8eda1a79d8e394d8b339bd2a257a SHA512 23f3dd0540ecc8e762f37a4bb69713abe99125a605c03b1a3412cec910fb7a6cea3eee3910d7c98122b276170a17414c9132b57b57a30a4ba1283cea8f9e20fa
+DIST wheel-0.37.0.gh.tar.gz 68270 BLAKE2B a91714a57e0f1ef32e17b405668c765cbb586518b370e005c52fb4898c5a2e95a9781d7b71e22db12e613feb4d81dda14a8e462d73b4329c19db46653cce57dc SHA512 2e0eb1c5560a0229be9de450da8b2bc62153744abb6d8ab9a0625c150dc00d3fc3e24dbe37cc26f4ca6b6876b5c63298427b2076ee42b8f772c75010bfc135a8
diff --git a/dev-python/wheel/wheel-0.37.0.ebuild b/dev-python/wheel/wheel-0.37.0.ebuild
new file mode 100644
index 000000000000..bcdf62297fd6
--- /dev/null
+++ b/dev-python/wheel/wheel-0.37.0.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 built-package format for Python"
+HOMEPAGE="https://pypi.org/project/wheel/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+SRC_URI="https://github.com/pypa/wheel/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+RDEPEND="
+	dev-python/packaging[${PYTHON_USEDEP}]"
+
+distutils_enable_tests --install pytest
+
+src_prepare() {
+	sed \
+		-e 's:--cov=wheel::g' \
+		-i setup.cfg || die
+
+	# unbundle packaging
+	rm -r src/wheel/vendored || die
+	sed -i -e 's:\.vendored\.::' src/wheel/*.py || die
+
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/xlrd/xlrd-2.0.1.ebuild b/dev-python/xlrd/xlrd-2.0.1.ebuild
index b8c3e0f2a726..45bd8bcd29c7 100644
--- a/dev-python/xlrd/xlrd-2.0.1.ebuild
+++ b/dev-python/xlrd/xlrd-2.0.1.ebuild
@@ -17,6 +17,6 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 
 distutils_enable_tests pytest
diff --git a/dev-python/xlsxwriter/Manifest b/dev-python/xlsxwriter/Manifest
index 21777f8970f2..773ca1335ba8 100644
--- a/dev-python/xlsxwriter/Manifest
+++ b/dev-python/xlsxwriter/Manifest
@@ -1,2 +1,3 @@
 DIST XlsxWriter-RELEASE_1.4.4.tar.gz 34138048 BLAKE2B 159c305171eba27c66d3d9b9b1fd0e664f4acc572079c4daa6ac50c72e1e1e6016a93815b7de27af10b6e6653b02efb0291073284dabf9a6f15495c1f61ef059 SHA512 2a459e7eb924ef7475b7fed8f5689d4c2b2669a65d5f3e251a51c5e55cc8c4a545eb1d83534168b19c802740366fe2c4ef14c6c5850213fd690f01e42bbe4ca3
 DIST XlsxWriter-RELEASE_1.4.5.tar.gz 34383001 BLAKE2B 9a00ef80aec818e3b1c80000bdf0fe9dbb5b99ac04a5508ca23c6d76c56e31c94db0b5a38ef6d8345c6a5dc83175e4c79381877415f982fc7ec66d42efe8c80e SHA512 e3b969ef27ef24ce371c0a789a8cac6da4e8245ec349ca23ba9e04d5c2adf0a141f51596bd15117fc400efb9354a6730c4668f51218f0a08b312d25519a492e8
+DIST XlsxWriter-RELEASE_2.0.0.tar.gz 34246203 BLAKE2B 46f649851c2fe849d65d9a9b86954c92771aa6e7334bf97b7313f45a00d35b3a879d2a2dc715e1d2d68be90e54aa63f9e73755134242e079ef57c14ff7681f10 SHA512 e857118fd996d81b6d6d4e3eb26e353aa81230f728ed684fa025a3d4401988b3bc34714fddcaac804605fd1405fc98870e7260e1b81843a0ad2d18271ccfecc9
diff --git a/dev-python/xlsxwriter/xlsxwriter-1.4.5.ebuild b/dev-python/xlsxwriter/xlsxwriter-1.4.5.ebuild
index d03b6fc58078..b3e9f43ee04b 100644
--- a/dev-python/xlsxwriter/xlsxwriter-1.4.5.ebuild
+++ b/dev-python/xlsxwriter/xlsxwriter-1.4.5.ebuild
@@ -17,6 +17,6 @@ S=${WORKDIR}/${MY_P}
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~amd64 ~arm ~arm64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~sparc ~x86 ~amd64-linux ~x86-linux"
 
 distutils_enable_tests pytest
diff --git a/dev-python/xlsxwriter/xlsxwriter-2.0.0.ebuild b/dev-python/xlsxwriter/xlsxwriter-2.0.0.ebuild
new file mode 100644
index 000000000000..b3e9f43ee04b
--- /dev/null
+++ b/dev-python/xlsxwriter/xlsxwriter-2.0.0.ebuild
@@ -0,0 +1,22 @@
+# 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
+
+TAG=RELEASE_${PV}
+MY_P=XlsxWriter-${TAG}
+DESCRIPTION="Python module for creating Excel XLSX files"
+HOMEPAGE="https://github.com/jmcnamara/XlsxWriter"
+SRC_URI="
+	https://github.com/jmcnamara/XlsxWriter/archive/${TAG}.tar.gz
+		-> ${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+distutils_enable_tests pytest
diff --git a/dev-python/zeroconf/Manifest b/dev-python/zeroconf/Manifest
index dc5d36d1f817..18676cee6bfa 100644
--- a/dev-python/zeroconf/Manifest
+++ b/dev-python/zeroconf/Manifest
@@ -3,3 +3,4 @@ DIST python-zeroconf-0.33.2.gh.tar.gz 118266 BLAKE2B e239443c778d24895a830ac8d4f
 DIST python-zeroconf-0.33.3.gh.tar.gz 121202 BLAKE2B f457a65d26b58e4dac6c83b66be48e57ff0c34dd59dc3bfa008e2fd204f2f290088e6c784580114b91ddefce1cd2a3cea9310cfd4848c983c04749a1dbf3ebb8 SHA512 4e232fb9ad1e447333880d9737c3af3e9c652db2e0d7187d485cb6cdf8fe58076b78da4e1db3d2467b147c71343aeb18878f259bbfde6acd0faa3c4b9196222f
 DIST python-zeroconf-0.33.4.gh.tar.gz 121380 BLAKE2B a1a8ac266aaded65337aa9d5c26d8a52b6329500a1a18354148590fdb47988f200b0658a41e18b78694cd9f95f1322cce0ff289a795bf9459ab6d383d5ee13f9 SHA512 fa6dd453ea22beb113c53941ce750e214da3211b6fc14d8b0cb575b927cff14759c49fec4e9ada4a2fd4ebc0bb3b0b355a2454ca0e128a3213fc8be41f096af7
 DIST python-zeroconf-0.34.2.gh.tar.gz 125452 BLAKE2B 704ab1400a01eae93b1f706c2ccd4554b7ffbbcfcaebfc28bacf6e28354894185a7ed5cffddb3b96ff05dc3521d2507160a5f43c11a600c5b5043882d15c39e6 SHA512 958d01316ef307d08d68abe975f45d77e84cede8334f8ad023080b7d46f965f890b1c74de640807681d3aaa647e01902de01309e3520fba8ba18cb4b6af1f4ba
+DIST python-zeroconf-0.34.3.gh.tar.gz 125454 BLAKE2B d80c25fa8bb79b6c5a3d491efc0e891b08e808d9c2619d917a19d9d76ebdf13d32ddb684a3f68abd7ae6dce3597de30027557033a5ccacfe8dcc5bf624b45f25 SHA512 d9f1ab126dd68fdef2e2983a11efe7d3703bbacd7b74b9a82a781361b0282bf20d8c16bcf96beda7112958eab54e0b819f709d840a9e5f0f2da8c9003e9943fe
diff --git a/dev-python/zeroconf/zeroconf-0.34.3.ebuild b/dev-python/zeroconf/zeroconf-0.34.3.ebuild
new file mode 100644
index 000000000000..c406eead3ace
--- /dev/null
+++ b/dev-python/zeroconf/zeroconf-0.34.3.ebuild
@@ -0,0 +1,39 @@
+# 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
+
+MY_P=python-zeroconf-${PV}
+DESCRIPTION="Pure Python Multicast DNS Service Discovery Library (Bonjour/Avahi compatible)"
+HOMEPAGE="
+	https://github.com/jstasiak/python-zeroconf/
+	https://pypi.org/project/zeroconf/"
+SRC_URI="
+	https://github.com/jstasiak/python-zeroconf/archive/${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND=">=dev-python/ifaddr-0.1.7[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local excludes=(
+		# network
+		tests/test_core.py::Framework::test_close_multiple_times
+		tests/test_core.py::Framework::test_launch_and_close
+		tests/test_core.py::Framework::test_launch_and_close_context_manager
+		tests/test_core.py::Framework::test_launch_and_close_v4_v6
+		tests/test_core.py::Framework::test_launch_and_close_v6_only
+		tests/services/test_types.py::ServiceTypesQuery::test_integration_with_listener_ipv6
+	)
+
+	epytest ${excludes[@]/#/--deselect }
+}