Adding metadata

22 files changed, 427 insertions, 51 deletions

diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index 4ae879216072..743dd8b61076 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -7,6 +7,7 @@ DIST boto3-1.18.11.tar.gz 398542 BLAKE2B cecccf462510a6deb55308ea4156ae081d23574
 DIST boto3-1.18.12.tar.gz 398935 BLAKE2B 87f8627459908e4ff4bfde7ca7d325a355635c8e7c77cee515d30a443bfaba8474e3637e8facd8fd77778c2faab272e6526df92e96c59db4901bd3be44fce24d SHA512 bef678df9f073bb56152e8e56b4341e40aa98120ded26d1794d3e91382a994929150a06eee543d5397f065e66a9dad192b1a30e89f9d430f8a305a6d1e5a99b9
 DIST boto3-1.18.13.tar.gz 399893 BLAKE2B 3c3e79e2a8ea41a6bf88a2e73926d6e61c9844fe0d373126611e3023d98d9e6a64cf7b537726260ae70fd78fea32f19127d59ddac5d48489be231bfb2a51b693 SHA512 14987a472d5dd7eb254fa4fd4e931b43f36afc57b40676c0c2c2400bb24d7a31892d317b2da6d618311b5df91ee4a5c6cd4974ecf90971540c41b4d9632533ff
 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.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.15.ebuild b/dev-python/boto3/boto3-1.18.15.ebuild
new file mode 100644
index 000000000000..bee358e1c595
--- /dev/null
+++ b/dev-python/boto3/boto3-1.18.15.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 99d3eaf96cf1..6707c0b7aae2 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -7,6 +7,7 @@ DIST botocore-1.21.11.tar.gz 8003282 BLAKE2B a7ada604bef2d5130169b0905acfb1ed51f
 DIST botocore-1.21.12.tar.gz 8003489 BLAKE2B 39249b2ccbca9cc11b8acaef59064de3f6533a399949eac6c7168feab987f98914e213cfa4e39067c431e65ec04929b68787f971cd3847229668f12c723f8194 SHA512 7332026e1fab6bc36627f5d9de21367d99ec307e8ff4591671713e81ad44b0549ce7d4fc04f992fc120ba55c54ebc8b5095ef5e4888bca19e0d2aeea25dbbc0a
 DIST botocore-1.21.13.tar.gz 8006167 BLAKE2B 7f876b608fa0d24717f010426a553f54aa3c5a661d923b2a11b685f81d14cbf35fb6cef3518992eb00a520b79d79499af39f4fd03086f6caa6c20d256723fc10 SHA512 e2a2a51e74c5cc98ebc28a58a6865030ebc810f8fd56ae1e0baac23f815b65f9f1fdde6d9e0771a847d383796213d453463f89382286eb0c762c11e0c682ffc9
 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.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.15.ebuild b/dev-python/botocore/botocore-1.21.15.ebuild
new file mode 100644
index 000000000000..5684261bd4b3
--- /dev/null
+++ b/dev-python/botocore/botocore-1.21.15.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/gevent/gevent-21.1.2.ebuild b/dev-python/gevent/gevent-21.1.2.ebuild
index 4bb80a4f1d6c..bff2c9120db1 100644
--- a/dev-python/gevent/gevent-21.1.2.ebuild
+++ b/dev-python/gevent/gevent-21.1.2.ebuild
@@ -16,20 +16,24 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="doc examples test"
+IUSE="doc events examples test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=dev-libs/libev-4.31:=
 	dev-libs/libuv:=
 	>=net-dns/c-ares-1.12:=
-	dev-python/zope-event[${PYTHON_USEDEP}]
-	dev-python/zope-interface[${PYTHON_USEDEP}]
-	virtual/python-greenlet[${PYTHON_USEDEP}]"
+	virtual/python-greenlet[${PYTHON_USEDEP}]
+	events? (
+		dev-python/zope-event[${PYTHON_USEDEP}]
+		dev-python/zope-interface[${PYTHON_USEDEP}]
+	)"
 DEPEND="${RDEPEND}
 	test? (
 		dev-python/psutil[${PYTHON_USEDEP}]
 		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/zope-event[${PYTHON_USEDEP}]
+		dev-python/zope-interface[${PYTHON_USEDEP}]
 	)"
 
 distutils_enable_sphinx doc
diff --git a/dev-python/gevent/metadata.xml b/dev-python/gevent/metadata.xml
index 8d8fea59a0f3..3a2881280f5c 100644
--- a/dev-python/gevent/metadata.xml
+++ b/dev-python/gevent/metadata.xml
@@ -8,5 +8,8 @@
  <upstream>
   <remote-id type="pypi">gevent</remote-id>
  </upstream>
+ <use>
+  <flag name="events">Enables the gevent events system which is required by libraries that use gevent monkey patching. This adds <pkg>dev-python/zope-event</pkg> and <pkg>dev-python/zope-interface</pkg> as runtime dependencies.</flag>
+ </use>
  <origin>gentoo-staging</origin>
 </pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/httpx/httpx-0.18.2.ebuild b/dev-python/httpx/httpx-0.18.2.ebuild
index e66de7c7fad9..7883e0f99d5d 100644
--- a/dev-python/httpx/httpx-0.18.2.ebuild
+++ b/dev-python/httpx/httpx-0.18.2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/encode/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 arm arm64 ppc ~ppc64 sparc x86"
 
 RDEPEND="
 	dev-python/certifi[${PYTHON_USEDEP}]
diff --git a/dev-python/notebook/Manifest b/dev-python/notebook/Manifest
index 1350d911afb6..8b72a630c21e 100644
--- a/dev-python/notebook/Manifest
+++ b/dev-python/notebook/Manifest
@@ -1 +1,2 @@
 DIST notebook-6.4.0.tar.gz 13937270 BLAKE2B 41ba6e3dd22c92b6044199737fe93563aad07117e8c64817566765d643867b582218a1b34099acf2a84df9ac9f8eb2773f6f3e6779b14255867fd97ec443df85 SHA512 8bb57b3efaaddb781ee963a569996e45c563b50b2cb918fb7722805710dd5852d895ff5b5f5575686032a037d7395aa581140b471b529d68dfcb371841607481
+DIST notebook-6.4.1.tar.gz 14139457 BLAKE2B 4be00ba6cd2f66873657f8ad5f79b444bbfbb978eaac7ddb57ef5da39a81c2746e7658004179e44aa98fa5fc5954b022b2e3c0c15dac0cc6da21b95a16225bfd SHA512 aa73e90f8ad1888f469e4cb412b6f17742e3b68ce429b2feaafeaeebbbb9e0cc437f3f73f26204b8de8367620ecb492033786c00b04d641ce0bfb4df75460419
diff --git a/dev-python/notebook/notebook-6.4.1.ebuild b/dev-python/notebook/notebook-6.4.1.ebuild
new file mode 100644
index 000000000000..edb51ed82c94
--- /dev/null
+++ b/dev-python/notebook/notebook-6.4.1.ebuild
@@ -0,0 +1,100 @@
+# 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 xdg-utils
+
+DESCRIPTION="Jupyter Interactive Notebook"
+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 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-libs/mathjax-2.4
+	dev-python/argon2-cffi[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	>=dev-python/terminado-0.8.3[${PYTHON_USEDEP}]
+	>=www-servers/tornado-6.0[${PYTHON_USEDEP}]
+	dev-python/ipython_genutils[${PYTHON_USEDEP}]
+	>=dev-python/traitlets-4.2.1[${PYTHON_USEDEP}]
+	>=dev-python/jupyter_core-4.6.1[${PYTHON_USEDEP}]
+	>=dev-python/pyzmq-17[${PYTHON_USEDEP}]
+	>=dev-python/jupyter_client-5.3.4[${PYTHON_USEDEP}]
+	dev-python/nbformat[${PYTHON_USEDEP}]
+	>=dev-python/nbconvert-4.2.0[${PYTHON_USEDEP}]
+	dev-python/ipykernel[${PYTHON_USEDEP}]
+	dev-python/send2trash[${PYTHON_USEDEP}]
+	dev-python/prometheus_client[${PYTHON_USEDEP}]"
+
+# sphinx 2+ seems to have a problem with its github plugin. temporarily adding
+# a version constraint.
+BDEPEND="
+	test? (
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/requests-unixsocket[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}"-5.7.0-no-mathjax.patch
+)
+
+distutils_enable_tests --install pytest
+
+python_prepare_all() {
+	# disable bundled mathjax
+	sed -i 's/^.*MathJax.*$//' bower.json || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	local deselect=(
+		# trash doesn't seem to work for us
+		notebook/services/contents/tests/test_contents_api.py::APITest::test_checkpoints_follow_file
+		notebook/services/contents/tests/test_contents_api.py::APITest::test_delete
+		notebook/services/contents/tests/test_contents_api.py::GenericFileCheckpointsAPITest::test_checkpoints_follow_file
+		notebook/services/contents/tests/test_contents_api.py::GenericFileCheckpointsAPITest::test_delete
+		notebook/services/contents/tests/test_contents_api.py::GenericFileCheckpointsAPITest::test_delete_dirs
+		notebook/services/contents/tests/test_contents_api.py::GenericFileCheckpointsAPITest::test_delete_non_empty_dir
+		notebook/services/contents/tests/test_manager.py::TestContentsManager::test_delete
+		notebook/services/contents/tests/test_manager.py::TestContentsManagerNoAtomic::test_delete
+		# TODO
+		notebook/services/kernels/tests/test_kernels_api.py::KernelAPITest::test_connections
+		notebook/services/kernels/tests/test_kernels_api.py::AsyncKernelAPITest::test_connections
+		notebook/services/kernels/tests/test_kernels_api.py::KernelCullingTest::test_culling
+	)
+
+	# selenium tests require geckodriver
+	epytest --ignore notebook/tests/selenium ${deselect[@]/#/--deselect }
+}
+
+python_install() {
+	distutils-r1_python_install
+
+	ln -sf \
+		"${EPREFIX}/usr/share/mathjax" \
+		"${D}$(python_get_sitedir)/notebook/static/components/MathJax" || die
+}
+
+pkg_preinst() {
+	# remove old mathjax folder if present
+	rm -rf "${EROOT}"/usr/lib*/python*/site-packages/notebook/static/components/MathJax || die
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
diff --git a/dev-python/python-xmlsec/Manifest b/dev-python/python-xmlsec/Manifest
index 5f4becee1589..8b21cbd08819 100644
--- a/dev-python/python-xmlsec/Manifest
+++ b/dev-python/python-xmlsec/Manifest
@@ -1,2 +1 @@
 DIST python-xmlsec-1.3.11.tar.gz 75023 BLAKE2B 87fe4b47a9df6bc2fb2f1a459fa20240d9d5c92e0f7fa9bfc466e1fbfc0e3f12d90d01f5c7a6eac1389ea3252b8267a545203edf34c30117573bada9a7f5481a SHA512 fe0144d67edcad366b1d0f4615983f5630afd8f22aa056f46d1e6564f1c3114c0a469675e64a06591540515b0d12b5bf9304845f5138b24e15acaf4e5b861961
-DIST python-xmlsec-1.3.9.tar.gz 75465 BLAKE2B 32aa8bcc2a17e1164fab6ebf37b47ad64bf8164a5d5cc5929571c32715e37d22143f996afc75c8a73a08e0a0a07d74ce1f8e405731260c1bcdb26c7ccb5faf25 SHA512 3c212c409430297a85316e0c4f7f704be112dfda323fd0300b7d70de812d90dd4681c6a5a3cc0314d1937ebc4f8e012fac7f787bccdfb2dc699d5d6f17316b38
diff --git a/dev-python/python-xmlsec/files/python-xmlsec-1.3.11-fix-xml-testfail.patch b/dev-python/python-xmlsec/files/python-xmlsec-1.3.11-fix-xml-testfail.patch
new file mode 100644
index 000000000000..3e7ab8829c2f
--- /dev/null
+++ b/dev-python/python-xmlsec/files/python-xmlsec-1.3.11-fix-xml-testfail.patch
@@ -0,0 +1,23 @@
+Taken from: https://github.com/mehcode/python-xmlsec/issues/84#issuecomment-632930116
+diff --git a/tests/base.py b/tests/base.py
+index b05de1d..5ec356f 100644
+--- a/tests/base.py
++++ b/tests/base.py
+@@ -94,6 +94,7 @@ class TestMemoryLeaks(unittest.TestCase):
+ 
+     def load_xml(self, name, xpath=None):
+         """returns xml.etree"""
++        etree.set_default_parser(parser=etree.XMLParser())
+         root = etree.parse(self.path(name)).getroot()
+         if xpath is None:
+             return root
+diff --git a/tests/test_doc_examples.py b/tests/test_doc_examples.py
+index 2fc490f..53d2377 100644
+--- a/tests/test_doc_examples.py
++++ b/tests/test_doc_examples.py
+@@ -42,3 +42,5 @@ def test_doc_example(example):
+     """
+     with cd(example.parent):
+         runpy.run_path(str(example))
++    from lxml import etree
++    etree.set_default_parser(parser=etree.XMLParser())
diff --git a/dev-python/python-xmlsec/metadata.xml b/dev-python/python-xmlsec/metadata.xml
index afdeb2a2bb2a..3ec1a68e95cc 100644
--- a/dev-python/python-xmlsec/metadata.xml
+++ b/dev-python/python-xmlsec/metadata.xml
@@ -5,6 +5,10 @@
   <email>chutzpah@gentoo.org</email>
   <name>Patrick McLean</name>
  </maintainer>
+ <maintainer type="project">
+  <email>python@gentoo.org</email>
+  <name>Python</name>
+ </maintainer>
  <upstream>
   <remote-id type="pypi">xmlsec</remote-id>
  </upstream>
diff --git a/dev-python/python-xmlsec/python-xmlsec-1.3.11.ebuild b/dev-python/python-xmlsec/python-xmlsec-1.3.11.ebuild
index 1623bd9b634d..1c7ef1c87776 100644
--- a/dev-python/python-xmlsec/python-xmlsec-1.3.11.ebuild
+++ b/dev-python/python-xmlsec/python-xmlsec-1.3.11.ebuild
@@ -1,7 +1,7 @@
 # Copyright 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} )
 inherit distutils-r1
@@ -23,11 +23,13 @@ RDEPEND="${DEPEND}
 BDEPEND="${RDEPEND}
 	dev-python/pkgconfig[${PYTHON_USEDEP}]
 	dev-python/wheel[${PYTHON_USEDEP}]
-"
+	test? (
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+	)"
 
-# tests fail, has been reported upstream
-# https://github.com/mehcode/python-xmlsec/issues/84
-RESTRICT=test
+PATCHES=(
+	"${FILESDIR}/${P}-fix-xml-testfail.patch"
+)
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/python-xmlsec/python-xmlsec-1.3.9.ebuild b/dev-python/python-xmlsec/python-xmlsec-1.3.9.ebuild
deleted file mode 100644
index 030a2c5224f7..000000000000
--- a/dev-python/python-xmlsec/python-xmlsec-1.3.9.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-inherit distutils-r1
-
-DESCRIPTION="Python bindings for the XML Security Library"
-HOMEPAGE="https://github.com/mehcode/python-xmlsec"
-SRC_URI="https://github.com/mehcode/python-xmlsec/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-
-DEPEND="
-	dev-libs/xmlsec:=
-"
-RDEPEND="${DEPEND}
-	dev-python/lxml[${PYTHON_USEDEP}]
-"
-BDEPEND="${RDEPEND}
-	dev-python/pkgconfig[${PYTHON_USEDEP}]
-	dev-python/wheel[${PYTHON_USEDEP}]
-"
-
-# tests fail, has been reported upstream
-# https://github.com/mehcode/python-xmlsec/issues/84
-RESTRICT=test
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	sed -e "s:use_scm_version=.*:version='${PV}',:" \
-		-e "/setup_requires/ d" \
-		-i setup.py || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/reportlab/Manifest b/dev-python/reportlab/Manifest
index edb07e6b9114..895684a9d9d8 100644
--- a/dev-python/reportlab/Manifest
+++ b/dev-python/reportlab/Manifest
@@ -1,3 +1,4 @@
 DIST pfbfer-20070710.zip 677333 BLAKE2B 100214476a361a5e5d1f3da0999591345f6e3a3f8c6bc3f6a3e9eca734190c6259758a43302c6e41254d33491fe535eb7d5dd07aa9727c912424bebc31fc18df SHA512 6fd4a5d955464b10d13a7b748703450c1fe120d5ed09e8cfa1b4dfa9c183c59fe001df29433af551796b0df62544b7ddc364f9bb1bdcc2cd300434340ffcc4f2
 DIST reportlab-3.5.67.tar.gz 2911726 BLAKE2B 8dbd3bb54c2c651616c3b6be905ac7b43b3a8f30f630d2f9b91882416cb4513751affa507870fdd801b5aa53480498ecc9a5fe3902ab38d72288b6f48ce892e9 SHA512 5a0ec58f0ee925079f3756bac309bd5aaf159118a4ed7ec6467721ead23e5db37839014bb49f1804a0dee4532ce21f9c78adec99ec61a4aeffd957184d489a6c
 DIST reportlab-3.5.68.tar.gz 4512985 BLAKE2B b38fea7704fcf08ff25d314286830473b90e75a80bcc65fc7b2cfc4c270347aa7c68f31716e635048428c24bb0ca0afc3d0e22bebedb1d1bc50901c13d278fc4 SHA512 4d41f9d9708d2bd172928985e1e2d22ffcc61d2d6fb21bdf1f3275f9ff576f06e712cd9c9d1707ff364608ad8bed6c30754893a7b142dc3accd6eef8aa19c975
+DIST reportlab-3.6.0.tar.gz 4499377 BLAKE2B d72f1fb8c05f192ca7e9a13cbf3142e1b14b4bdd6c6eee7da6bb3e48a08500f2c1aebc671d06c020e1dab6107b0b52490c0c72faa82cba1ac66c03014a6130c1 SHA512 64ca4cf868d6d68432e933176087323c2bba58afe2bf444593831afad2471e07b4f33dbeff02fbef009ae7211ef781b1499d3881f27d583dc36ce1eb8f004c4f
diff --git a/dev-python/reportlab/reportlab-3.6.0.ebuild b/dev-python/reportlab/reportlab-3.6.0.ebuild
new file mode 100644
index 000000000000..5bc2c064b51c
--- /dev/null
+++ b/dev-python/reportlab/reportlab-3.6.0.ebuild
@@ -0,0 +1,66 @@
+# 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="Tools for generating printable PDF documents from any data source"
+HOMEPAGE="
+	https://www.reportlab.com/
+	https://pypi.org/project/reportlab/"
+SRC_URI="
+	mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz
+	https://www.reportlab.com/ftp/fonts/pfbfer-20070710.zip"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+DEPEND="
+	media-libs/freetype
+	media-libs/libart_lgpl
+	sys-libs/zlib:="
+RDEPEND="
+	${DEPEND}
+	dev-python/pillow[tiff,truetype,jpeg(+),${PYTHON_USEDEP}]"
+BDEPEND="
+	app-arch/unzip"
+
+distutils_enable_sphinx docs/source
+distutils_enable_tests unittest
+
+PATCHES=(
+	# bug 738312, remove -L/usr/lib from link line
+	"${FILESDIR}"/${PN}-3.5.48-usr-lib-LLD.patch
+)
+
+src_unpack() {
+	unpack ${P}.tar.gz
+	cd ${P}/src/reportlab/fonts || die
+	unpack pfbfer-20070710.zip
+}
+
+python_prepare_all() {
+	# tests requiring Internet access
+	sed -i -e 's:test0:_&:' \
+		tests/test_platypus_general.py \
+		tests/test_platypus_images.py || die
+	sed -i -e 's:test9:_&:' tests/test_lib_utils.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+src_configure() {
+	DISTUTILS_ARGS=(
+		--no-download-t1-files
+		--use-system-libart
+	)
+}
+
+python_test() {
+	pushd tests >/dev/null || die
+	"${EPYTHON}" runAll.py -v || die "Testing failed with ${EPYTHON}"
+	popd >/dev/null || die
+}
diff --git a/dev-python/rich/Manifest b/dev-python/rich/Manifest
index 3b08a62b6bc9..fbab4941b133 100644
--- a/dev-python/rich/Manifest
+++ b/dev-python/rich/Manifest
@@ -2,3 +2,4 @@ DIST rich-10.3.0.tar.gz 16237609 BLAKE2B ddac8f2ed7b3b39e647179cd03cf59994729d7d
 DIST rich-10.4.0.tar.gz 16240850 BLAKE2B 76874e3efd9a8d696ba96579e1c658b1c76e71d353574cf3f9fb5d8a15810879f649d0ebfcbd1d72d9d496ce438cc08099b5d0416b932875704be2d0b4b28d0a SHA512 ecf6234ac862c1e04ab71c39763857d770c20200f5e1903a7d8e90fc1a67b5702a9eb0c67454ca48fb786a7631f60401f0a3299e82d864eca8c7afefedf21e26
 DIST rich-10.5.0.tar.gz 16242786 BLAKE2B d4d612555f9dca24b5150f5502d95bede784d7e6481e15948614de15a914d0cb3c83b64148a02db4ce8693feb1604c3729006fc0ca347eb10313aedcb795feca SHA512 c0471c0f35d3d9e5b5baf5798911073de02820a5bb5dcf42324bef2153a49a3019db44bc96b95247defe3be65f18097fc266a30bdeab153d9dda0ae38d34a79b
 DIST rich-10.6.0.tar.gz 16244447 BLAKE2B 79012a211e8f5510fd4cf0f2580971c51fee17a1e38905abc8227ba07eed1f2d25b7c356ecc907043a9e1898245cb6927cf226218c0ba20344865c1cd0a4a160 SHA512 59b777ef0fe3efe67138a7dbfc0c4e813b0a8c3d46adc6526b07241483919e0f71b478c0a66f3e0c207fcebdc0d639b7acf989ebf914c0e0fb6953029f0c9a16
+DIST rich-10.7.0.tar.gz 16261862 BLAKE2B 41f49bcda95f64b6deb30b32c7b8809ec1fa008d08de08dbb2ed8e718f04de1f446291468d714030db951877eb8a5e95360504c6a396758cb1e8d37fff4fe6be SHA512 23607389370cc2b8203f4505cee1536a57e7c3379d97ebbe3a751e11d578e1f652c0522d151048bc7ee018800d44ac762b7272cd3084f4ee94263e019bc42964
diff --git a/dev-python/rich/rich-10.7.0.ebuild b/dev-python/rich/rich-10.7.0.ebuild
new file mode 100644
index 000000000000..901679288d88
--- /dev/null
+++ b/dev-python/rich/rich-10.7.0.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} )
+DISTUTILS_USE_SETUPTOOLS=pyproject.toml
+inherit distutils-r1 optfeature
+
+DESCRIPTION="Python library for renrering rich text, tables, etc. to the terminal"
+HOMEPAGE="https://github.com/willmcgugan/rich"
+SRC_URI="https://github.com/willmcgugan/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/colorama[${PYTHON_USEDEP}]
+	dev-python/commonmark[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+
+pkg_postinst() {
+	optfeature "integration with HTML widgets for Jupyter" dev-python/ipywidgets
+}
diff --git a/dev-python/websocket-client/Manifest b/dev-python/websocket-client/Manifest
index 80029ef7c754..fec59476fc42 100644
--- a/dev-python/websocket-client/Manifest
+++ b/dev-python/websocket-client/Manifest
@@ -1 +1,2 @@
 DIST websocket-client-1.1.0.tar.gz 58890 BLAKE2B b7557f0847ee4ec31279d98661f2370f32eff35de5ea6207abe4afa6ef7314258da275d823487773722ac717888ca629284ef92870b5880fb385f7fb677506d6 SHA512 6f4b963455bdb6a0e0defff92a6b898ee4bdf605c18fef7e25e18e2c72a2ae360d760c2069a0ed330e5dc0f3347f16a9129c405d5c98cd2d56014f8636e7d5b5
+DIST websocket-client-1.1.1.tar.gz 59092 BLAKE2B c71e16e427584434781fe407f3185ccfc9fed3e638ef7374752584e35623f56c082ab7a4e7ae01038025e0435b24b567bb9a2abe4da50800f421930c982e4b39 SHA512 f4ed98180910068415ed3b66b70091491d6b11098c32abd9bfc0f8e0d4cb5a25df096c9437fb59c66bacff66440f9422b3f67bf43af746019d74b17d7bcba474
diff --git a/dev-python/websocket-client/websocket-client-1.1.1.ebuild b/dev-python/websocket-client/websocket-client-1.1.1.ebuild
new file mode 100644
index 000000000000..b6b0671710e3
--- /dev/null
+++ b/dev-python/websocket-client/websocket-client-1.1.1.ebuild
@@ -0,0 +1,26 @@
+# 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="WebSocket client for python with hybi13 support"
+HOMEPAGE="https://github.com/websocket-client/websocket-client"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos"
+IUSE="examples"
+
+distutils_enable_tests unittest
+
+python_install_all() {
+	if use examples; then
+		docompress -x "/usr/share/doc/${PF}/examples"
+		dodoc -r examples
+	fi
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/zeroconf/Manifest b/dev-python/zeroconf/Manifest
index 3e313d382b83..281b674bbf4e 100644
--- a/dev-python/zeroconf/Manifest
+++ b/dev-python/zeroconf/Manifest
@@ -1,2 +1,3 @@
 DIST python-zeroconf-0.32.1.gh.tar.gz 116507 BLAKE2B 03de415620745b75cd43be74b724faf909aad9628175f18cf4b2c04245d02adbca984eaa861e807729f36caa3feecab913f2e4aafcdd9aac1af02de6eeefbb3d SHA512 cefcd1abdc3ca2b5ed796aee09e6826c0d0f54343bdefbf45c425d6e033542dc061c84fb4438ba53774d87c6516801c6e2196c1e6cfdd9dbf9187f5d8d4b1b11
 DIST python-zeroconf-0.33.2.gh.tar.gz 118266 BLAKE2B e239443c778d24895a830ac8d4f23be5eeac701b92ddf945efc955a731cbce62bea10243f57a0929ad21c4444d32c37b0a9e23b53e734362b9c6b9ce85e2eb59 SHA512 9631dc348baf028794934d826a1fd2e874cf9039e6fb1c93a1b9a8e2a95ae436ab2fc1a955e2d89656c37a56b71075b578857f6de041a7e61ff55c7a62a2a7a3
+DIST python-zeroconf-0.33.3.gh.tar.gz 121202 BLAKE2B f457a65d26b58e4dac6c83b66be48e57ff0c34dd59dc3bfa008e2fd204f2f290088e6c784580114b91ddefce1cd2a3cea9310cfd4848c983c04749a1dbf3ebb8 SHA512 4e232fb9ad1e447333880d9737c3af3e9c652db2e0d7187d485cb6cdf8fe58076b78da4e1db3d2467b147c71343aeb18878f259bbfde6acd0faa3c4b9196222f
diff --git a/dev-python/zeroconf/zeroconf-0.33.3.ebuild b/dev-python/zeroconf/zeroconf-0.33.3.ebuild
new file mode 100644
index 000000000000..c406eead3ace
--- /dev/null
+++ b/dev-python/zeroconf/zeroconf-0.33.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 }
+}