Updating liguros repo

24 files changed, 368 insertions, 93 deletions

diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index 784c4f8fca20..b7052162543a 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -3,3 +3,4 @@ DIST boto3-1.16.43.tar.gz 342444 BLAKE2B 1a367fa252eab6738533c7bec2bc370dcc206f2
 DIST boto3-1.16.50.tar.gz 342744 BLAKE2B a6581acbdb07f2d8ce21ddf384b471d281d58910366dee0669f0f726118eabd52de8a4fe129915b9044bd484950155c32fa4f4941e1ef6ce55249213ba29f2f3 SHA512 de483be833917a2c478c0fe651ffe4143dc6c742e259711a955be41a8b76197353b295526695ca800bb860b95e0378dc461119bfa163c4be0faa3b6c2ccfc097
 DIST boto3-1.16.56.tar.gz 344547 BLAKE2B da32affd031a7efd7f55ec390f657d02caaf37d5c226ed811934e101dee1fcdc6df8b678ddaa181cdec140ad70525ff0a462885eee21f924040b1f2051d0f1f0 SHA512 2f35d4331db005ecb8dca5c780ebb2347242564f541e5b9585f0645e113255aeb8dff2210ecc42a2768f2b58c6731d59d6cb5eb7ac143e7aafd2bf21eae7d7ab
 DIST boto3-1.16.57.tar.gz 344712 BLAKE2B 572a70f9afad3502d9f2bbaa5950654e45d40269bbb995e96d94573b423d4e182d314e36de97435c93f9608c780b79e073da79fcd4dd699899a83b60d864907d SHA512 a588ebdd03d189b63999523a2f68c0f1021b82299bf9875f7aebc3120b8db61afd9d784fb65885c87efe9e8ebe416f3c601ddd9615965a61a5910bb1f8e89e9f
+DIST boto3-1.16.58.tar.gz 344789 BLAKE2B dfaac853e0e26b17612dbf20ffa83363c3bfcfcaca4f31b1c6e987c073c291eebe3c692a0f530b0491bc5042b3de627607694bd90df57f4df8503057233dfb14 SHA512 6d1fba2f614398b7b897e422a387553fcd796027f9929f6df5dc862ce06385d2b21e119246ad7e86b71ca050cd3f29a9801101d0cf3bdb8f5fd7772bb6ee9e66
diff --git a/dev-python/boto3/boto3-1.16.58.ebuild b/dev-python/boto3/boto3-1.16.58.ebuild
new file mode 100644
index 000000000000..2df16964cdb0
--- /dev/null
+++ b/dev-python/boto3/boto3-1.16.58.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+DISTUTILS_USE_SETUPTOOLS=bdepend
+inherit distutils-r1
+
+DESCRIPTION="The AWS SDK for Python"
+HOMEPAGE="https://github.com/boto/boto3"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/boto3"
+	inherit git-r3
+	BOTOCORE_PV=${PV}
+else
+	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+	# botocore is x.(y+3).z
+	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
+fi
+
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+python_prepare_all() {
+	# don't lock versions to narrow ranges
+	sed -e '/botocore/ d' \
+		-e '/jmespath/ d' \
+		-e '/s3transfer/ d' \
+		-i setup.py || die
+
+	# prevent an infinite loop
+	rm tests/functional/docs/test_smoke.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests -v tests/unit/ tests/functional/ || die "test failed under ${EPYTHON}"
+}
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index 3349a4139fbd..aecd0f15036a 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -3,3 +3,4 @@ DIST botocore-1.19.43.tar.gz 7374325 BLAKE2B 7def5221bee4774a6b8a33e6499e499588f
 DIST botocore-1.19.50.tar.gz 7382888 BLAKE2B 7de2ef7a7d051427191b13cdd47d3ebd9b4de505e3e17aa7dfb42de9a5eebffa2f06317a559631d219acc4380cc68c7dcfa1d6b0dc9cb123b2fa0315dd81df4e SHA512 7d1a8ff53e22fc265d8ac6492c0607f8948c9aa5862abaded93c605c3a3e4e98e535308e5ec1500a480636e03dbc3d849ec2b1dbf0efb22dffa841ce1cb551f9
 DIST botocore-1.19.56.tar.gz 7390812 BLAKE2B 3bec12ce19f39f12a72f7f59f226568cb5af59d6f9a40447a7a1fdc0f27eea06d0cfe5a5b12d2152189b700ddaa016592e95059fa42208c590cb698c568c2d63 SHA512 76988a7ddc588dba48f2444a99159247a0f178c67378fcb6eac51e3f5cfd0ab385960f0fb68bbc483f79e74c9b891070d34a39e9566eb8c24ce903b9ae24dfa5
 DIST botocore-1.19.57.tar.gz 7393040 BLAKE2B 1eb29dbf95a373fc516febfe2222129f42f2c82fc37a5a6c8e1519b3f5fe63e760c0b4440573c7eb86c94a1463ecddc3046c024cc0415fe53e1a76e9362edc71 SHA512 da4cc5009a755f3be975169ba5226586f4de425f3bed2ea6eda3235bd4fc4591155715a410f47073afa7f606b290f371e776643b0d8d43a00313599630f7390a
+DIST botocore-1.19.58.tar.gz 7395107 BLAKE2B 8ec21595faef30401cc84802cd1863cf9557240e733d2bd4c9ce2418f8fa3ab93d5e7f7fb4a3e35f0a5f4bc3c79bdc87be1fed3d5a66943a545d263d674cf54e SHA512 8fc7348df4a755097ba6c68db67f4685c137ccd2a82257d035588cab6dc72a4765aaf8c9748962a4e5ee5b19f8aa0c5f25feac051592464a04acad27e8fd1e09
diff --git a/dev-python/botocore/botocore-1.19.58.ebuild b/dev-python/botocore/botocore-1.19.58.ebuild
new file mode 100644
index 000000000000..9d681f87244c
--- /dev/null
+++ b/dev-python/botocore/botocore-1.19.58.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Low-level, data-driven core of boto 3"
+HOMEPAGE="https://github.com/boto/botocore"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/botocore"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/jmespath[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
+)
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || die
+	# very unstable
+	sed -i -e 's:test_stress_test_token_bucket:_&:' \
+		tests/functional/retries/test_bucket.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# note: suites need to be run separately as one of the unit tests
+	# seems to be leaking mocks and breaking a few functional tests
+	nosetests -v tests/unit ||
+		die "unit tests failed under ${EPYTHON}"
+	nosetests -v tests/functional ||
+		die "functional tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/httplib2/httplib2-0.18.1-r1.ebuild b/dev-python/httplib2/httplib2-0.18.1-r1.ebuild
index 20c858f45083..cfeec6f04ca9 100644
--- a/dev-python/httplib2/httplib2-0.18.1-r1.ebuild
+++ b/dev-python/httplib2/httplib2-0.18.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="A comprehensive HTTP client library"
-HOMEPAGE="https://pypi.org/project/httplib2/ https://github.com/jcgregorio/httplib2"
+HOMEPAGE="https://pypi.org/project/httplib2/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/httplib2/metadata.xml b/dev-python/httplib2/metadata.xml
index 13643975c260..b0177c4f7e0b 100644
--- a/dev-python/httplib2/metadata.xml
+++ b/dev-python/httplib2/metadata.xml
@@ -7,9 +7,8 @@
   </maintainer>
   <stabilize-allarches/>
   <upstream>
-    <remote-id type="google-code">httplib2</remote-id>
     <remote-id type="pypi">httplib2</remote-id>
-    <remote-id type="github">jcgregorio/httplib2</remote-id>
+    <remote-id type="github">httplib2/httplib2</remote-id>
   </upstream>
 	<origin>gentoo-staging</origin>
 </pkgmetadata>
diff --git a/dev-python/nbformat/Manifest b/dev-python/nbformat/Manifest
index 759103f83a54..85647484cc59 100644
--- a/dev-python/nbformat/Manifest
+++ b/dev-python/nbformat/Manifest
@@ -1,4 +1,2 @@
 DIST nbformat-5.0.8.gh.tar.gz 127329 BLAKE2B 6252d35f72fd0af5a89d83e9e48f61baf2656eb6530d4a7b05a5241e7272098992d70d68705da4fb9921ab1939378658b2e6e5f765a453f932e94e9232006a66 SHA512 956add98517f1128d8efacae1f3cf9fe27b4d7acae4a56e14dd6c2942aab39b063170759bc6de67bcedd2e0fd6c7ab1a36aef268f2088644ba31caa936b9359d
-DIST nbformat-5.1.0.gh.tar.gz 152052 BLAKE2B 571d48af8c92b1cff9110935e00f53543d7bbae5ed9a08b516e9ff23366d9db7e4b1fb50dc786f2cd70d7f871baa05b6be86a6f22940724d90d05fdf58449bba SHA512 17c234e7777c170d629c0d3a4d8d7ddf01a754977a5e21357550ff702c5b4e26cd31164b32ced0fb20f3c0953390efd9a7509ed92f6c159fcef8634bd3f6af53
-DIST nbformat-5.1.1.gh.tar.gz 152242 BLAKE2B df5e293ab235156f78e2bf85f1a22e597d8e0a60a6e448c69d4e04b62eed834b078238ad03a67e58ee0f705d1495b2f6c4b42124b8d439adbcb52be7ee91ae36 SHA512 5058c009b5148e6764de942cc43cb4774abad758250f065f9103c94f820de841b72d0f69ad24c38ade0c9fca3df61b7ea51b6097c6c191a2f606d57ef358083f
 DIST nbformat-5.1.2.gh.tar.gz 152275 BLAKE2B 2a0758f33952547e5ef91f0ac0a8b98b97b882a8797c38feff6710a3a0824637f41396b152403e155e1af9805b7a85c189ba2a609076c591562e5f4bb783da29 SHA512 4fd574373c2f325b6d078a062878d139d741d30f9101f3344e0c7fc19bdf714f8ef71994134e76c90e1301102aac55cc490df8344f3ceb407002437f35d03944
diff --git a/dev-python/nbformat/files/nbformat-5.1.2-package-data.patch b/dev-python/nbformat/files/nbformat-5.1.2-package-data.patch
new file mode 100644
index 000000000000..4fd1de2a942b
--- /dev/null
+++ b/dev-python/nbformat/files/nbformat-5.1.2-package-data.patch
@@ -0,0 +1,50 @@
+From 6dc17e79be58c3cce66256eec2a565692cf95809 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Fri, 22 Jan 2021 10:16:24 +0100
+Subject: [PATCH] Fix installing package_data when --build-base is set
+
+Fix package_data declarations in setup.py to associate every set
+of files with its bottommost package.  This is necessary for the 'build'
+command to install files correctly when --build-base is passed
+explicitly.  The all-files-for-top-package approach seems to work only
+incidentally.
+
+To reproduce the problem, try:
+
+    setup.py build --build-base=build2
+
+and note that none of the data files were installed.
+---
+ setup.py | 16 +++++++++++-----
+ 1 file changed, 11 insertions(+), 5 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index 22305d3..0a6aa45 100644
+--- a/setup.py
++++ b/setup.py
+@@ -34,11 +34,17 @@ for d, _, _ in os.walk(pjoin(here, name)):
+         packages.append(d[len(here)+1:].replace(os.path.sep, '.'))
+ 
+ package_data = {
+-    'nbformat' : [
+-        'corpus/*.txt'
+-        'tests/*.ipynb',
+-        'v3/nbformat.v3*.schema.json',
+-        'v4/nbformat.v4*.schema.json',
++    'nbformat.corpus' : [
++        '*.txt',
++    ],
++    'nbformat.tests' : [
++        '*.ipynb',
++    ],
++    'nbformat.v3' : [
++        'nbformat.v3*.schema.json',
++    ],
++    'nbformat.v4' : [
++        'nbformat.v4*.schema.json',
+     ],
+ }
+ 
+-- 
+2.30.0
+
diff --git a/dev-python/nbformat/nbformat-5.1.1.ebuild b/dev-python/nbformat/nbformat-5.1.1.ebuild
deleted file mode 100644
index 50772f88b140..000000000000
--- a/dev-python/nbformat/nbformat-5.1.1.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
-
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-PYTHON_REQ_USE='sqlite'
-
-inherit distutils-r1
-
-DESCRIPTION="Reference implementation of the Jupyter Notebook format"
-HOMEPAGE="https://jupyter.org"
-# missing on pypi
-SRC_URI="
-	https://github.com/jupyter/nbformat/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-RDEPEND="
-	>=dev-python/jsonschema-2.4.0[${PYTHON_USEDEP}]
-	dev-python/ipython_genutils[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-4.1[${PYTHON_USEDEP}]
-	dev-python/jupyter_core[${PYTHON_USEDEP}]
-	"
-DEPEND="
-	test? (
-		dev-python/fastjsonschema[${PYTHON_USEDEP}]
-		dev-python/testpath[${PYTHON_USEDEP}]
-	)
-	"
-
-distutils_enable_sphinx docs \
-	dev-python/numpydoc
-distutils_enable_tests pytest
diff --git a/dev-python/nbformat/nbformat-5.1.0.ebuild b/dev-python/nbformat/nbformat-5.1.2-r1.ebuild
index 50772f88b140..6a5b80d5140c 100644
--- a/dev-python/nbformat/nbformat-5.1.0.ebuild
+++ b/dev-python/nbformat/nbformat-5.1.2-r1.ebuild
@@ -26,13 +26,17 @@ RDEPEND="
 	>=dev-python/traitlets-4.1[${PYTHON_USEDEP}]
 	dev-python/jupyter_core[${PYTHON_USEDEP}]
 	"
-DEPEND="
+BDEPEND="
 	test? (
 		dev-python/fastjsonschema[${PYTHON_USEDEP}]
 		dev-python/testpath[${PYTHON_USEDEP}]
 	)
 	"
 
+PATCHES=(
+	"${FILESDIR}"/nbformat-5.1.2-package-data.patch
+)
+
 distutils_enable_sphinx docs \
 	dev-python/numpydoc
 distutils_enable_tests pytest
diff --git a/dev-python/nbformat/nbformat-5.1.2.ebuild b/dev-python/nbformat/nbformat-5.1.2.ebuild
deleted file mode 100644
index 50772f88b140..000000000000
--- a/dev-python/nbformat/nbformat-5.1.2.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
-
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-PYTHON_REQ_USE='sqlite'
-
-inherit distutils-r1
-
-DESCRIPTION="Reference implementation of the Jupyter Notebook format"
-HOMEPAGE="https://jupyter.org"
-# missing on pypi
-SRC_URI="
-	https://github.com/jupyter/nbformat/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-RDEPEND="
-	>=dev-python/jsonschema-2.4.0[${PYTHON_USEDEP}]
-	dev-python/ipython_genutils[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-4.1[${PYTHON_USEDEP}]
-	dev-python/jupyter_core[${PYTHON_USEDEP}]
-	"
-DEPEND="
-	test? (
-		dev-python/fastjsonschema[${PYTHON_USEDEP}]
-		dev-python/testpath[${PYTHON_USEDEP}]
-	)
-	"
-
-distutils_enable_sphinx docs \
-	dev-python/numpydoc
-distutils_enable_tests pytest
diff --git a/dev-python/plotly/Manifest b/dev-python/plotly/Manifest
index 5f28c863a26b..48da13deccbe 100644
--- a/dev-python/plotly/Manifest
+++ b/dev-python/plotly/Manifest
@@ -1,3 +1,4 @@
 DIST plotly-1.9.6.tar.gz 546722 BLAKE2B 5905af517ef40bc077492f01b49c367c0aa03a96accb86ec072e188a43e463c187a0b9dee3d0df33669aa6d600ed9127b067c7099947e5235331d14ce10bf33c SHA512 7564036ed3745fc06ee7428942e45ca6bfaefa1e47b08a5868a918924268ee632515f1de4bf3e90911234f18a4d85b092ecb6ef9f213b939093dcb433a12dec4
 DIST plotly-4.10.0.tar.gz 6263967 BLAKE2B a78ddf286993621a555cc7f34a5ad0f44e93dcceb9bdac2a20f0cd80257e90485f20b4c89a350a3718b104401d7677a762231c6a774e5c2757a2de1454822875 SHA512 bc32dac7e5621b254c3868e85ed18133ad8341bed5784f707a89242c5e1ef9959afc603a91ccb068aca24032d3ff5b44678811c405d579284334f051f59f93aa
 DIST plotly-4.14.1.tar.gz 6373585 BLAKE2B 8e8d15a7f68bbef835fcbc0048c2457916aad1b10e06c903222030b2b2e1b902e2d42080f8ac2c19928dabd7e1623210930b9f33dededa71dbbb28b2f41f848c SHA512 e052680d0e7344b9f53f1b917dd0b9bc87b0c34300d93b8958ccb35b38f9dc5e7fb4db016d1113df4bae78c419f3d378112c59c3470723ce1349eaadbc5011f8
+DIST plotly-4.14.3.tar.gz 6374650 BLAKE2B 91d950b6365876b03b2b0393c642275c37fc352fda90ce010310f5dae046c3cdd835de438036c5d92fd35d3afcd2c7b8548a87b1354d4a33cd2cfe10838ae94d SHA512 7d8db7a0f6c1abeda1b222f9bd25e4395dd8d14d246ad986960868a8083e4f1d1f600d84f44416eb1d089640d190192e931b5a5f6ae24e01cf8146c4cf8e80eb
diff --git a/dev-python/plotly/plotly-4.14.3.ebuild b/dev-python/plotly/plotly-4.14.3.ebuild
new file mode 100644
index 000000000000..89caa425b442
--- /dev/null
+++ b/dev-python/plotly/plotly-4.14.3.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Browser-based graphing library for Python"
+HOMEPAGE="https://plot.ly/python/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/retrying[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	mkdir -p "${ED}"/etc/ || die
+	mv "${ED}"/usr/etc/jupyter "${ED}"/etc/ || die
+	rmdir "${ED}"/usr/etc || die
+}
diff --git a/dev-python/qtconsole/Manifest b/dev-python/qtconsole/Manifest
index 2cf66dd3157b..32bb8babb4c6 100644
--- a/dev-python/qtconsole/Manifest
+++ b/dev-python/qtconsole/Manifest
@@ -1,2 +1,3 @@
 DIST qtconsole-4.7.6.tar.gz 424919 BLAKE2B d973b3b94dfad1b38603695e22927bcdcb8a4f2db9f4a638d5fe6a83c24061153dbaa36c26e632708953af32a015af1d40ecbf175dd5314a3b954b15a6625cc0 SHA512 e4e12eb90533e922786b5b6517fba5d9c4dfedf00547f1403c8cd65fb464f5c1a13517df69924e4428e9a8a811dfc359a7768fbaa90adbe02d79cba9a5aa852e
 DIST qtconsole-5.0.1.tar.gz 424682 BLAKE2B 46f2cdea799786d7b2e9385a5b73ac397925eef9c2403f4d9ebd4ce89241cc1ca6ec494450759db4e017c16abc525505dacaa7452018379da5343c2b1cf24f86 SHA512 4fa7629c68ab7554c20bd8ef885bf4073d64d4c211a0d9035faaa7e4122bd5d182fb97773c8a41f215f9e299309ace591081a0673370b55c796b241211bb4ccc
+DIST qtconsole-5.0.2.tar.gz 428499 BLAKE2B 42d71e1a1909f8e07705fd5e7e64194d865b70cc67377ba631bb75fb8678faea4d8dddce90a2e84c0898fa074a88b655290bcf9ee1f9aebb39f91d2370908dbf SHA512 b74711c0444b74efc2fc31c631e6a87cfc05045d8ae9eb8253a9fcd1c82a1ecb688cbe50dc2f3dd4dc5d47c6e2b4fa027ac22e77b7ac37e1ed3fa0a9d2b677bb
diff --git a/dev-python/qtconsole/qtconsole-5.0.2.ebuild b/dev-python/qtconsole/qtconsole-5.0.2.ebuild
new file mode 100644
index 000000000000..8962c1c192b3
--- /dev/null
+++ b/dev-python/qtconsole/qtconsole-5.0.2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Qt-based console for Jupyter with support for rich media output"
+HOMEPAGE="https://jupyter.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+	dev-python/ipykernel[${PYTHON_USEDEP}]
+	dev-python/ipython_genutils[${PYTHON_USEDEP}]
+	dev-python/jupyter_core[${PYTHON_USEDEP}]
+	>=dev-python/jupyter_client-4.1.1[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	dev-python/traitlets[${PYTHON_USEDEP}]
+	dev-python/QtPy[${PYTHON_USEDEP},gui,printsupport,svg]
+"
+BDEPEND="
+	test? (
+		dev-python/QtPy[${PYTHON_USEDEP},svg,testlib]
+	)
+"
+# required by the tests that are removed:
+#		dev-python/flaky[${PYTHON_USEDEP}]
+#		dev-python/pytest-qt[${PYTHON_USEDEP}]
+
+PDEPEND="dev-python/ipython[${PYTHON_USEDEP}]"
+
+distutils_enable_sphinx docs/source
+distutils_enable_tests pytest
+
+src_prepare() {
+	# TODO: these tests require virtx; however, running under virtx
+	# causes pytest to segv on exit (even though tests pass)
+	rm qtconsole/tests/test_00_console_widget.py || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/sudsds/metadata.xml b/dev-python/sudsds/metadata.xml
index c4e7a7e3d49d..a56745df0223 100644
--- a/dev-python/sudsds/metadata.xml
+++ b/dev-python/sudsds/metadata.xml
@@ -8,5 +8,5 @@
 	<longdescription lang="en">
 		A lightweight SOAP python client for consuming Web Services. Czech NIC labs fork.
 	</longdescription>
-	<origin>calculatelinux-overlay</origin>
+	<origin>kit-fixups</origin>
 </pkgmetadata>
diff --git a/dev-python/sudsds/sudsds-1.0.1-r2.ebuild b/dev-python/sudsds/sudsds-1.0.1-r1.ebuild
index 3f8cc35cdc97..054a9f5306c4 100644
--- a/dev-python/sudsds/sudsds-1.0.1-r2.ebuild
+++ b/dev-python/sudsds/sudsds-1.0.1-r1.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2020 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=5
 
 PYTHON_COMPAT=( python2_7 python3_{6,7,8,9,10} )
 
-DISTUTILS_USE_SETUPTOOLS=manual
 inherit distutils-r1
 
 DESCRIPTION="Lightweight SOAP client - Czech NIC labs fork"
@@ -17,5 +16,5 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="doc"
 
-DEPEND="dev-python/setuptools-python2[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=""
diff --git a/dev-python/wcmatch/Manifest b/dev-python/wcmatch/Manifest
index 03c63f1fe025..cc7b8279a3ac 100644
--- a/dev-python/wcmatch/Manifest
+++ b/dev-python/wcmatch/Manifest
@@ -1,3 +1,4 @@
 DIST wcmatch-7.1.tar.gz 105744 BLAKE2B 0add1c68025c92ac57d6ea64d82bddb20bace60de5d319fb16e16802f208d788d876695bfcd186b80630039f544565c631d36e1c7327dee5d8c799eff8c80ce2 SHA512 79d62d85f13d245e38d0fe92a275e24058b86af8aaf9a926bfd950dad4ec47e40e763c18b08d3eb4ddd925832ae9910f13407094070442b41dbe2fe4ad11fb39
 DIST wcmatch-7.2.tar.gz 105087 BLAKE2B a28bd9d02468f3ca83d606ee7f7d5c9b6b8883cf6e0c04b711765aefafce189f7f524a490c6831a739b579be66af5f4b1c7b6373da22e170211e611677c5788f SHA512 6fdc0a3cb6d66b323c509a5ee34c1e8df9a46a93fd1fc0921dfdbc17ac604934fdad3df5e8f253aa6a880bea2e81bb26ec097b9503c920433c5827ea91b327d8
+DIST wcmatch-8.0.1.tar.gz 105948 BLAKE2B efa23d89f01b91dfb06885a9dcce94622c76e889fa7a0d8ed839cba1eafac4bd3bd1f9a8ccd95d0c7f3a6d990346de2df2bed05a1ac092b07076c548e61b77f0 SHA512 ae99df5ea8f2d1c9e0e120ba23c36dd7b0b13832e5ee599cf08dee2c93f624bab550d937743a3063fac8cce6ce18f56582380521aa3860f220abdcbfe9461dec
 DIST wcmatch-8.0.tar.gz 105910 BLAKE2B 228295a28511ac8c534feed31459dc3e75316febc377473de6d30075886cf33262d6f97931c134b5aaef9109216a4b50383e884e9f3f370849e8a1ac5af5999a SHA512 94bd02e02d544746b678704bd77c1252bd569f1030316e2617f340ee81266dcba398a1a6a15d9460203e681a4825a853cbebee3681d8d338a17ef9ae8d9a03ce
diff --git a/dev-python/wcmatch/wcmatch-8.0.1.ebuild b/dev-python/wcmatch/wcmatch-8.0.1.ebuild
new file mode 100644
index 000000000000..d1d3030699ea
--- /dev/null
+++ b/dev-python/wcmatch/wcmatch-8.0.1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+
+DOCS_BUILDER="mkdocs"
+DOCS_DEPEND="
+	~dev-python/mkdocs_pymdownx_material_extras-1.0.7
+	dev-python/mkdocs-material
+	dev-python/mkdocs-git-revision-date-localized-plugin
+	dev-python/mkdocs-minify-plugin
+	dev-python/pyspelling
+"
+
+inherit distutils-r1 docs
+
+DESCRIPTION="Wildcard/glob file name matcher"
+HOMEPAGE="
+	https://github.com/facelessuser/wcmatch/
+	https://pypi.org/project/wcmatch/"
+SRC_URI="https://github.com/facelessuser/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/backrefs-4.1[${PYTHON_USEDEP}]
+	>=dev-python/bracex-2.0[${PYTHON_USEDEP}]
+"
+
+BDEPEND="test? (
+	dev-python/mock[${PYTHON_USEDEP}]
+	dev-vcs/git
+)"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# this test makes a really wrong assumption that basename of $HOME
+	# will be a username
+	sed -i -e 's:test_tilde_user:_&:' \
+		tests/test_glob.py || die
+
+	# tests require some files in homedir
+	> "${HOME}"/test1.txt || die
+	> "${HOME}"/test2.txt || die
+
+	# mkdocs-git-revision-date-localized-plugin needs git repo
+	if use doc; then
+		git init || die
+		git config --global user.email "you@example.com" || die
+		git config --global user.name "Your Name" || die
+		git add . || die
+		git commit -m 'init' || die
+	fi
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/xapp/Manifest b/dev-python/xapp/Manifest
index 0afcbc7b87a6..b7a32a1d3f4d 100644
--- a/dev-python/xapp/Manifest
+++ b/dev-python/xapp/Manifest
@@ -1,3 +1,3 @@
 DIST xapp-2.0.2.tar.gz 19946 BLAKE2B fde2f4f30fa1dbb5d4778d82bcfb347a5b8f89635df6c298d0dc509a194c528b653a1cbe4537c878bde4a8b987852ca51e37a70b6c35f96c9882c5b1b277dd36 SHA512 2b5d2a259e55384426940e6284ec9f964f4f0220b8cb364606c938ef6e1717d40ddbc3730732dddc86d460f624ac6161fe5ab55c276aedba9187a79d9d53a60e
-EBUILD xapp-2.0.2.ebuild 559 BLAKE2B 015725f6be4217227fead11a012d4a3a62363546989f6397356f710b1a5b690d2ab3a5c080be00fefe0d4a5b7592bdf062478d51856ec7abd4f61bfda15fddb0 SHA512 92c825c4203d4c183947d40aad2f3f325bbb490c9254600c9acbefd93e51b8894dd038729067d3fb3799aff216831c15a3f3f496504d0a6a863bf88f29435874
+EBUILD xapp-2.0.2.ebuild 565 BLAKE2B c10d062f23475ba3a265dc22f7777597a0e2579b0169a9cc49d63b47d7790524ed3efad063033beee725cdca08bb458ad7ad9dffad9b291fb607e66593e85e6e SHA512 3fedafbe64e801ab06ca164f83af5b9b96864cc2f9000017395487710678f98568a8e9ed330166991c3dd1d5a4f39f5fad50a11d8e7ac2903c791cf47ded3689
 MISC metadata.xml 584 BLAKE2B 7b0110a8ad67b0faa3125ddd088a8d019129d239cc541a08b4443f8bddd3c1efc1891ccbd935309fd13c940b1cf95bf6f1e769c078e895393f7bccf3a366a0ea SHA512 3273919c56af741c5cfde4b69180c20a2defdb16a59f34c0a57147f955c8454eb73cd20f5d02fe827432b7f7310e9a313b324832df96c724300cf3b05cb30141
diff --git a/dev-python/xapp/xapp-2.0.2.ebuild b/dev-python/xapp/xapp-2.0.2.ebuild
index 178671b54df4..4d091cb210d9 100644
--- a/dev-python/xapp/xapp-2.0.2.ebuild
+++ b/dev-python/xapp/xapp-2.0.2.ebuild
@@ -16,8 +16,12 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE=""
 
-DEPEND="x11-libs/xapps[introspection]"
-RDEPEND="${DEPEND}
-	dev-python/psutil[${PYTHON_USEDEP}]"
+DEPEND="
+	x11-libs/xapps[introspection]
+"
+RDEPEND="
+	${DEPEND}
+	dev-python/psutil[${PYTHON_USEDEP}]
+"
 
 S="${WORKDIR}/python3-xapp-${PV}"
diff --git a/dev-python/xdoctest/Manifest b/dev-python/xdoctest/Manifest
index 1cab8e346565..d822b7408af5 100644
--- a/dev-python/xdoctest/Manifest
+++ b/dev-python/xdoctest/Manifest
@@ -1 +1,2 @@
 DIST xdoctest-0.15.0.tar.gz 629125 BLAKE2B f5144365c4d1d58c107ac0603a1d99cd5bc622d3772fc7f2c907193ea863d9ff99bd183cc7fac12e2f85b7647ba25d5ae6878c06d3df9a5cdda9a1f143b43110 SHA512 114add93a75807d787c674b0649f92ff011987705f640912f876c4a4c3103cef90b0fae1959d5a85ef399b80695e9cbfcae6e809950ff5651fa211f54326682d
+DIST xdoctest-0.15.2.tar.gz 883332 BLAKE2B e90364d6096357ff1b5006b289a56a1afd0f3d0e952202d17a1b99c16f867e23ce0214a4f646154d9f6aada9f94ddda47a9c1f669a833bffaa63d99c10837766 SHA512 ca3bfc241e2d137988ee6dda2e9229f74add662fc2fe295c4c006a3d63ac6284f3f623451006acc4a8273729ccc589e1c5bab9d7fc65135582d7fc9fcffea464
diff --git a/dev-python/xdoctest/metadata.xml b/dev-python/xdoctest/metadata.xml
index b96d6314a370..2b267c828eb6 100644
--- a/dev-python/xdoctest/metadata.xml
+++ b/dev-python/xdoctest/metadata.xml
@@ -5,6 +5,10 @@
 		<email>sci@gentoo.org</email>
 		<name>Gentoo Science Project</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">xdoctest</remote-id>
 	</upstream>
diff --git a/dev-python/xdoctest/xdoctest-0.15.2.ebuild b/dev-python/xdoctest/xdoctest-0.15.2.ebuild
new file mode 100644
index 000000000000..0917119b0880
--- /dev/null
+++ b/dev-python/xdoctest/xdoctest-0.15.2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="A rewrite of Python's builtin doctest module but without all the weirdness"
+HOMEPAGE="https://github.com/Erotemic/xdoctest"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="Apache-2.0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
+# dev-python/nbformat-5.1.{0..2} did not install package data
+BDEPEND="
+	test? (
+		|| (
+			>=dev-python/nbformat-5.1.2-r1[${PYTHON_USEDEP}]
+			<dev-python/nbformat-5.1[${PYTHON_USEDEP}]
+		)
+	)"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs/source dev-python/sphinx_rtd_theme
+
+python_test() {
+	local -x PYTHONPATH=.
+	pytest -vv || die "Test fail with ${EPYTHON}"
+}