gentoo resync : 25.11.2020

6 files changed, 7 insertions, 166 deletions

diff --git a/dev-python/notebook/Manifest b/dev-python/notebook/Manifest
index b5b4066f988c..fbf90edbd5d9 100644
--- a/dev-python/notebook/Manifest
+++ b/dev-python/notebook/Manifest
@@ -1,10 +1,8 @@
 AUX notebook-5.7.0-no-mathjax.patch 1438 BLAKE2B 66719f5342c08fce7576a70780b38a97ac3e768f3385218da15e7e2b7073ec0e1bbe943f320e4ebd0618401760de96295fc1b0ea0f2e919487b41f90acabfef0 SHA512 ef2754a0e7f552de34411532e7cbddffeab66364075a5514290b09f956b3486791f757b9a159a6c3f975507b8a5626612efeee754933927e2b505aea5f5df2db
-AUX notebook-6.0.3-py39.patch 4042 BLAKE2B c15f7e4779cc6ccc20f837bf7867eb4ced353b0848b783e786b02549975a56e122ba85dec7ad9dae3963a80c34e8c22c1d8c95b054077cd397607db0c9c15329 SHA512 8e0d0851156935fab5b47fcf13fe0a92f6675914b9c3fac1a36c28e282b4003501572dcddac4d729ba798609c7c49b8241ac72277491907adbeb52b2dd14041f
-DIST notebook-6.0.3.tar.gz 14048151 BLAKE2B ad4e433accc90acc13efc8005146dd8bcf2e645c104473f0e71d8d9fab80d7e128eb4e070b8aa04aee77e0d6115499e61beb841d94cf66b0e098dc50d3916cbd SHA512 fb56d0e10da3f8673e9578cdf04759dc3247547af6be4f479e9b183f3c5bd0a891fbfede187e0f5aca5c6ffdb9cae6ada23fe6dd159aca2d9cdf967f1f150922
 DIST notebook-6.1.3.tar.gz 13806042 BLAKE2B da63fdabd1a71e4247a9e340539e688410a84c58d94049dfb7e8e3fcdc53686a55eb855687df34ff48f599a0c5aececbd9a8e1aa1d2ff7baa2a6da1b4e1bcf24 SHA512 67a8feb01dfb665bb24f3ce1b28212e9bad5a188e8cef1d168c4edaf207cbc16d516f6024ca905f75f1c27ba4890da858c5278a3ee84a4c4ac1bdbf225afa351
 DIST notebook-6.1.4.tar.gz 13933373 BLAKE2B 9e58a9913a3c24bb1cb364863a18993d44496e995dc43dc9a4b428c54a0dddcc8b7c4b444073029d97705f0b3eee37d63bb50eec066b9b5fe4cd0ee48f8df558 SHA512 55637ec76b283429ac8bc1de260529983cf0e4cb0f25b268330fcc1d07c6e75329d2806eaa5f10d149bf80bd11df26592fa71548fa03bdb05a57265221466b57
-EBUILD notebook-6.0.3.ebuild 2369 BLAKE2B 89ebccda62bf6c1597dd015ed76fc9cf407bc3749a013c5762a530844528288bb8193c9454f604be02791b3d349227661dac899fee2030a250bcc558867e39c2 SHA512 7c17a5b0124fb1dc6af18cb9736793ea3a9b3e5b9179e64c7cd60311b1762e5339d4ac5c023d433bc57c2abd6bec5cbf65b91e167300ce139583e0ad7a33beb4
-EBUILD notebook-6.1.3-r1.ebuild 2587 BLAKE2B f1fa42de905aa9732ae0a80893e680eec6de96c96fe39f793538736cc37bc30c1638ac6e0008a99dd70215f53f979e5c977c714abb3f9c54723ede6add29d781 SHA512 214e9bb13da3d0f320f9e88e2d6f8463747e586dff2927e9153fadd9c72ab511c829bc7da0ed8e4077ce13e01b60bdb354297a880aff232a8f62e64b42ee8d56
-EBUILD notebook-6.1.3.ebuild 2589 BLAKE2B 111e1f31138241640409c8e08aabe188bed91c14d73c4962f021cc55e2cb015eb0638d10426bf63df30dfe935d6a84a9e04f1d3d416694abead8af75d616f1d9 SHA512 a26da170b99ab62deac489455a4139d04086bb525eb62c70f529f5063d4fb30a3d860a28bc3ce01015c16f5eb874bf542a850062bda1039df517331ee9933628
-EBUILD notebook-6.1.4.ebuild 2589 BLAKE2B ba41ae96b619b3d1348c24604dfcd215cc25f89bd8c88b2fd76c9760295f09d7ccc88910726df55d614e30a7828c02f199dbfd268277bd1decbda8b581db5a1d SHA512 293d8e2ab1e28729414f9b7acb9af2198cc74ae18317722eaaf54338123e0bb8ade5e4ea38c1e02467db77c757a80e35ae2ec1b94b896f02603f0346c069fba2
+DIST notebook-6.1.5.tar.gz 13925632 BLAKE2B ce9d0ee110a158ba0ee3f3199a7cc1c8d53ecb72e8f77f43d2b1e5552b4a0378edca9a987634e12d8429c70595ec4cc226784248d196501b3a04c67e4ba88c85 SHA512 4b0893c805a0494c369b363b7d1c606a1b124869e601eafce1eb4c93ad1436b757c6149bc76c489aa26171412280d69e894b44d7d19141341fb1194a8e2f447b
+EBUILD notebook-6.1.3.ebuild 2587 BLAKE2B 5d30ae02f109446293762966e48958433920d8111b34ccee173a44e6fe8548cf4053f16b91dffe13851a50ee495f5040f1623628a1f8500fa659f2ab26b1c830 SHA512 c1804bd5bdbfa742993ce62e0295bff4419dfc08c86f58fb55c0f585683a55de84b373a15b9726a268736af6f3b373437a9d013f2b1d3678d26b573466bbad10
+EBUILD notebook-6.1.4.ebuild 2587 BLAKE2B f1fa42de905aa9732ae0a80893e680eec6de96c96fe39f793538736cc37bc30c1638ac6e0008a99dd70215f53f979e5c977c714abb3f9c54723ede6add29d781 SHA512 214e9bb13da3d0f320f9e88e2d6f8463747e586dff2927e9153fadd9c72ab511c829bc7da0ed8e4077ce13e01b60bdb354297a880aff232a8f62e64b42ee8d56
+EBUILD notebook-6.1.5.ebuild 2589 BLAKE2B ba41ae96b619b3d1348c24604dfcd215cc25f89bd8c88b2fd76c9760295f09d7ccc88910726df55d614e30a7828c02f199dbfd268277bd1decbda8b581db5a1d SHA512 293d8e2ab1e28729414f9b7acb9af2198cc74ae18317722eaaf54338123e0bb8ade5e4ea38c1e02467db77c757a80e35ae2ec1b94b896f02603f0346c069fba2
 MISC metadata.xml 466 BLAKE2B a907de2cb309e201f79881fbc1084337fc9d5bb88af8ba4b65db62123703c5193df08d7a1ed7255417fe619bb197290ed76fa70bc5e04133a616c13f69cc7d3f SHA512 cffa01ae84a4242117574bb9dfc26f7152307f263d12270a9ee8bc978b780c8a19ae26db0b9e7bc98ab1ba82a44f222849a6a33a8a0c50a2887a01f3f94dc6c2
diff --git a/dev-python/notebook/files/notebook-6.0.3-py39.patch b/dev-python/notebook/files/notebook-6.0.3-py39.patch
deleted file mode 100644
index 2b0fc134b58a..000000000000
--- a/dev-python/notebook/files/notebook-6.0.3-py39.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From c01b2cc014af5c3f8c1e00907a985edc19cad8d7 Mon Sep 17 00:00:00 2001
-From: Karthikeyan Singaravelan <tir.karthi@gmail.com>
-Date: Wed, 22 Jan 2020 00:41:58 +0530
-Subject: [PATCH] Remove deprecated encoding parameter for Python 3.9
- compatibility.
-
----
- notebook/tests/test_gateway.py | 13 ++++++-------
- 1 file changed, 6 insertions(+), 7 deletions(-)
-
-diff --git a/notebook/tests/test_gateway.py b/notebook/tests/test_gateway.py
-index d0cc84b09d..116b3db673 100644
---- a/notebook/tests/test_gateway.py
-+++ b/notebook/tests/test_gateway.py
-@@ -176,7 +176,7 @@ def test_gateway_get_kernelspecs(self):
-         with mocked_gateway:
-             response = self.request('GET', '/api/kernelspecs')
-             self.assertEqual(response.status_code, 200)
--            content = json.loads(response.content.decode('utf-8'), encoding='utf-8')
-+            content = json.loads(response.content.decode('utf-8'))
-             kspecs = content.get('kernelspecs')
-             self.assertEqual(len(kspecs), 2)
-             self.assertEqual(kspecs.get('kspec_bar').get('name'), 'kspec_bar')
-@@ -186,7 +186,7 @@ def test_gateway_get_named_kernelspec(self):
-         with mocked_gateway:
-             response = self.request('GET', '/api/kernelspecs/kspec_foo')
-             self.assertEqual(response.status_code, 200)
--            kspec_foo = json.loads(response.content.decode('utf-8'), encoding='utf-8')
-+            kspec_foo = json.loads(response.content.decode('utf-8'))
-             self.assertEqual(kspec_foo.get('name'), 'kspec_foo')
- 
-             response = self.request('GET', '/api/kernelspecs/no_such_spec')
-@@ -257,7 +257,7 @@ def create_session(self, kernel_name):
-             # Create the kernel... (also tests get_kernel)
-             response = self.request('POST', '/api/sessions', **kwargs)
-             self.assertEqual(response.status_code, 201)
--            model = json.loads(response.content.decode('utf-8'), encoding='utf-8')
-+            model = json.loads(response.content.decode('utf-8'))
-             self.assertEqual(model.get('path'), nb_path)
-             kernel_id = model.get('kernel').get('id')
-             # ensure its in the running_kernels and name matches.
-@@ -286,7 +286,7 @@ def is_kernel_running(self, kernel_id):
-             # Get list of running kernels
-             response = self.request('GET', '/api/kernels')
-             self.assertEqual(response.status_code, 200)
--            kernels = json.loads(response.content.decode('utf-8'), encoding='utf-8')
-+            kernels = json.loads(response.content.decode('utf-8'))
-             self.assertEqual(len(kernels), len(running_kernels))
-             for model in kernels:
-                 if model.get('id') == kernel_id:
-@@ -305,7 +305,7 @@ def create_kernel(self, kernel_name):
- 
-             response = self.request('POST', '/api/kernels', **kwargs)
-             self.assertEqual(response.status_code, 201)
--            model = json.loads(response.content.decode('utf-8'), encoding='utf-8')
-+            model = json.loads(response.content.decode('utf-8'))
-             kernel_id = model.get('id')
-             # ensure its in the running_kernels and name matches.
-             running_kernel = running_kernels.get(kernel_id)
-@@ -330,7 +330,7 @@ def restart_kernel(self, kernel_id):
-         with mocked_gateway:
-             response = self.request('POST', '/api/kernels/' + kernel_id + '/restart')
-             self.assertEqual(response.status_code, 200)
--            model = json.loads(response.content.decode('utf-8'), encoding='utf-8')
-+            model = json.loads(response.content.decode('utf-8'))
-             restarted_kernel_id = model.get('id')
-             # ensure its in the running_kernels and name matches.
-             running_kernel = running_kernels.get(restarted_kernel_id)
-@@ -345,4 +345,3 @@ def delete_kernel(self, kernel_id):
-             response = self.request('DELETE', '/api/kernels/' + kernel_id)
-             self.assertEqual(response.status_code, 204)
-             self.assertEqual(response.reason, 'No Content')
--
diff --git a/dev-python/notebook/notebook-6.0.3.ebuild b/dev-python/notebook/notebook-6.0.3.ebuild
deleted file mode 100644
index cbdc69fba953..000000000000
--- a/dev-python/notebook/notebook-6.0.3.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{6..9} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-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 ~arm64 x86"
-
-RDEPEND="
-	>=dev-libs/mathjax-2.4
-	dev-python/jinja[${PYTHON_USEDEP}]
-	>=dev-python/terminado-0.8.1[${PYTHON_USEDEP}]
-	>=www-servers/tornado-5.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/nose[${PYTHON_USEDEP}]
-		dev-python/nose_warnings_filters[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-	)
-	"
-
-PATCHES=(
-	"${FILESDIR}/${PN}"-5.7.0-no-mathjax.patch
-	"${FILESDIR}"/${P}-py39.patch
-)
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# disable bundled mathjax
-	sed -i 's/^.*MathJax.*$//' bower.json || die
-
-	# require geckodriver
-	rm -r notebook/tests/selenium || die
-	# trash doesn't seem to work for us
-	sed -e 's:test_delete:_&:' \
-		-i notebook/services/contents/tests/test_manager.py || die
-	sed -e 's:test_checkpoints_follow_file:_&:' \
-		-e 's:test_delete:_&:' \
-		-i notebook/services/contents/tests/test_contents_api.py || die
-	# TODO: high magic, SRE module mismatch
-	sed -e 's:test_connections:_&:' \
-		-e 's:test_main_kernel_handler:_&:' \
-		-i notebook/services/kernels/tests/test_kernels_api.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-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
-}
diff --git a/dev-python/notebook/notebook-6.1.3.ebuild b/dev-python/notebook/notebook-6.1.3.ebuild
index aea8ab5d0aa9..96f3d6899212 100644
--- a/dev-python/notebook/notebook-6.1.3.ebuild
+++ b/dev-python/notebook/notebook-6.1.3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 RDEPEND="
 	>=dev-libs/mathjax-2.4
diff --git a/dev-python/notebook/notebook-6.1.4.ebuild b/dev-python/notebook/notebook-6.1.4.ebuild
index 2f974c926f26..a484e7f04afd 100644
--- a/dev-python/notebook/notebook-6.1.4.ebuild
+++ b/dev-python/notebook/notebook-6.1.4.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 RDEPEND="
 	>=dev-libs/mathjax-2.4
diff --git a/dev-python/notebook/notebook-6.1.3-r1.ebuild b/dev-python/notebook/notebook-6.1.5.ebuild
index a484e7f04afd..2f974c926f26 100644
--- a/dev-python/notebook/notebook-6.1.3-r1.ebuild
+++ b/dev-python/notebook/notebook-6.1.5.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 
 RDEPEND="
 	>=dev-libs/mathjax-2.4