gentoo resync : 13.06.2020

6 files changed, 166 insertions, 12 deletions

diff --git a/dev-python/notebook/Manifest b/dev-python/notebook/Manifest
index 5222e1e7ba62..e649199ecddd 100644
--- a/dev-python/notebook/Manifest
+++ b/dev-python/notebook/Manifest
@@ -2,10 +2,13 @@ AUX notebook-5.0.0-example-execution.patch 941 BLAKE2B 6df33095a99042a5345dc3b75
 AUX notebook-5.0.0-setupbase.py.patch 1368 BLAKE2B 7c80334d515becf41d881a1d4b3820a263c8cac2913dd9ef4df149bcd85ee7a09df6ba91e607f15ac35dde1a504e89775dec93043bfcdc7700643b645c986929 SHA512 14274ae6e2bc664e6c92390d480da0f5615b7f51863c10f3d11a7ec1a788ff357ae8113bac0c3d15932e322137b9e251c31bdf34c36a2dbbc0771407fe614a96
 AUX notebook-5.2.1-setupbase.py.patch 1407 BLAKE2B 0c7a0872f62df6c3e77aacdcb3736c09441479de127eb228fc8d65828a16656f37c4742c6101de841326a24c62bd4a4c76cf8d31f9dbfe61bc4249ecdaf55582 SHA512 6a01feb531b4594bbc0520c80dce53da66fbad3cfb3fce22c2b20e5d6652b8691581fe6a321ac5771b47ee1530bd27b0fac3fda55ab15573037379b84362bf67
 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-5.0.0.tar.gz 11481080 BLAKE2B 3cc483d338ca22c6b4d7199100875e9425f90e1a7059c016cec07500f0558c437db5f7e367a5c4441520deb68fa891be31c07cd93e858c872a1f12d893530479 SHA512 fbee29cc554f36e94b1fe9804187a50581e840cfb5884bcdf2fef82ad9ae3ae0e2082ea0056f815bfa2a1c2f203679169155e61e53253aa2e9004a43ff7fbcae
 DIST notebook-5.2.1.tar.gz 12458130 BLAKE2B f10a91fd79064fb09889c4ee30a84a0b34321d3a89f950609df9a90106ed4af75268cc1b087d0229882575d548b7b2b78632aa97452f89fc67910586911fc467 SHA512 defdb08e37dcec9fe799d0b03dc8dc2339f37c9417e4b138ba83b98433dd77f0dea3d83e07368e67f18155af1a67bbabea21ccd061d8a926b6b084fd25960576
 DIST notebook-5.7.8.tar.gz 13371684 BLAKE2B 077a94ec7085ae7325a972efb58f8d7eee5a541186522402084dfa55e335163fee30e68476265e9825c3623408989b1a0782ff6a5af71af4d8ea5e6e308c3a45 SHA512 1cccb23ce6810df85b3b600c0e2e5d6599be5551ea5243c7b1a9c73ed45c34dea8b16b0fbb3624aefb9eda848bce2fdcea1f3add8df3f00a90c13a9b01ea3f07
-EBUILD notebook-5.0.0.ebuild 2211 BLAKE2B dec5d31a5630cf4656ebfcaa842995c5b13ca57de3da9984653675283b2d3989ff5bca3aae39718ded005b1af60c080e6478a238bd3f69b670565585d7773f46 SHA512 8549fab9903c51a58b0f35b9cc32bfcfe03404a940cf9da7bae50dcf7f0e40559b3a522882a538a8ef4e8705bb407af75eef17992f3e0ff9c21efe17a3e165bf
-EBUILD notebook-5.2.1.ebuild 2516 BLAKE2B b429e5ee472f5295796c4f84cae8c20de9979ab26d362cd2cff2fdc1564742f8ef227e4a2cdb0db920799230aba9f3154950e50d2cdc1293f480b1d4f89115e6 SHA512 f14bf9da66ba0c8ad00ed722d3c74bc1c6420fc7af2e83e356289259c9990f7fd3794eadfab621a6c701c2d283585b78f1b6e823c96aac68bfb54922150aa352
-EBUILD notebook-5.7.8.ebuild 3000 BLAKE2B 05a81e32db189363b7d3e4ef35c61abb90a9ce8c0515987777503076e9528c78f5f32dc6cef5fc27b55a331ae6e72d577453c9f484742bcdf498d6da57c8e05a SHA512 b40b4be6710f29b82dd8968040f5d2932494e426af903e8418500e8e3bb844601c32727a750ad518ea7f52cc2fd211900fb58b7a5d42378c585002381f839b52
+DIST notebook-6.0.3.tar.gz 14048151 BLAKE2B ad4e433accc90acc13efc8005146dd8bcf2e645c104473f0e71d8d9fab80d7e128eb4e070b8aa04aee77e0d6115499e61beb841d94cf66b0e098dc50d3916cbd SHA512 fb56d0e10da3f8673e9578cdf04759dc3247547af6be4f479e9b183f3c5bd0a891fbfede187e0f5aca5c6ffdb9cae6ada23fe6dd159aca2d9cdf967f1f150922
+EBUILD notebook-5.0.0.ebuild 2212 BLAKE2B 084e83dc0e77c008455afba813e376996fec0b22225c7a0b1e444f90e47922c0401fdfd16829e662d15e066f023239ba768a5c5f74284cbf5d21f7b06ca225a6 SHA512 3c8fcd5f09eea10d10e8726e7c60fb2dc69b6d1da393ea972318202f991e47fd92a4bf2f5e0e0312225670b494e219b269919cb9ec9aa173caa6df4632097cef
+EBUILD notebook-5.2.1.ebuild 2481 BLAKE2B 82733e9825422222c2ea37146741ec5d510d7bddba8f331a074eb5ff8893be9e2b25cae279e519a43205997b1f2ea4a549baaac42b36d74060602241795c9fe4 SHA512 7ae45ff9d12cac19894432e8dbd0ec1fbdfc818bb76bbdf67cf91c8b19d1c79acf0bfebfce550b634529974201ce214db52018851838b47e8ba650cb48c157bc
+EBUILD notebook-5.7.8.ebuild 2965 BLAKE2B b2cec1042caa14371ffb788d8380410131b11d4d6d62a2f248011227edeb741444db7c2fee142c2800f858e15e75cd035e4072fda9f67ca3e03d337bdc1d164f SHA512 514a170ce702ae495a6f0aff2b0c1d8aa467d00f7af69d27a54c891139d9ee258ab106ba99c4b3a6ae4afcd7dde677ef7e8f6289cfd576dc0c0ec94284cca1eb
+EBUILD notebook-6.0.3.ebuild 2371 BLAKE2B 72a81edb848bc1623ba651aae700e751c439abb3c079ef33e843972817e86af2e897adcbf0dc221726b86a1166c31d79fc8dd6925eb14b268e62fac5b879aa62 SHA512 856dfb48af215bbd61ed8aa757de218639d327e87a3147649a3d374f6fd4363c6ff07d54f7480111aa154a556ea08cbc0fc97dc0d044cd1ad5c58b0da3b53c7c
 MISC metadata.xml 441 BLAKE2B f744bd6821b3c38aaaff373d5e44b8b84d35bb50a58e1fb6515cc580727a29240a2394c0d6a0c846dd76062905a8de7d75faf96ddb0b23a0bc05b24875918013 SHA512 4f59ae02210d5df4c6416cdec8d85931577e931e885fe7807967ff708a7c5436fe246e152f060e99b0ada2665e8a0321bd4382640680a892ad514b16926351f7
diff --git a/dev-python/notebook/files/notebook-6.0.3-py39.patch b/dev-python/notebook/files/notebook-6.0.3-py39.patch
new file mode 100644
index 000000000000..2b0fc134b58a
--- /dev/null
+++ b/dev-python/notebook/files/notebook-6.0.3-py39.patch
@@ -0,0 +1,73 @@
+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-5.0.0.ebuild b/dev-python/notebook/notebook-5.0.0.ebuild
index d58a631f686d..d4c0e2123f49 100644
--- a/dev-python/notebook/notebook-5.0.0.ebuild
+++ b/dev-python/notebook/notebook-5.0.0.ebuild
@@ -9,7 +9,7 @@ PYTHON_REQ_USE="threads(+)"
 inherit distutils-r1
 
 DESCRIPTION="Jupyter Interactive Notebook"
-HOMEPAGE="http://jupyter.org"
+HOMEPAGE="https://jupyter.org"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/notebook/notebook-5.2.1.ebuild b/dev-python/notebook/notebook-5.2.1.ebuild
index 33f68859535e..3faa47b3b2ee 100644
--- a/dev-python/notebook/notebook-5.2.1.ebuild
+++ b/dev-python/notebook/notebook-5.2.1.ebuild
@@ -9,7 +9,7 @@ PYTHON_REQ_USE="threads(+)"
 inherit distutils-r1
 
 DESCRIPTION="Jupyter Interactive Notebook"
-HOMEPAGE="http://jupyter.org"
+HOMEPAGE="https://jupyter.org"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
@@ -53,9 +53,6 @@ DEPEND="${RDEPEND}
 
 PATCHES=( "${FILESDIR}/${P}"-setupbase.py.patch )
 
-# Opens a qtconsole
-restrict="doc"
-
 python_prepare_all() {
 	sed \
 		-e "/import setup/s:$:\nimport setuptools:g" \
diff --git a/dev-python/notebook/notebook-5.7.8.ebuild b/dev-python/notebook/notebook-5.7.8.ebuild
index ed340b66e0a0..4c9dc036bc2d 100644
--- a/dev-python/notebook/notebook-5.7.8.ebuild
+++ b/dev-python/notebook/notebook-5.7.8.ebuild
@@ -9,7 +9,7 @@ PYTHON_REQ_USE="threads(+)"
 inherit distutils-r1
 
 DESCRIPTION="Jupyter Interactive Notebook"
-HOMEPAGE="http://jupyter.org"
+HOMEPAGE="https://jupyter.org"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
@@ -60,9 +60,6 @@ DEPEND="${RDEPEND}
 
 PATCHES=( "${FILESDIR}/${PN}"-5.7.0-no-mathjax.patch )
 
-# Opens a qtconsole
-restrict="doc"
-
 python_prepare_all() {
 	sed \
 		-e "/import setup/s:$:\nimport setuptools:g" \
diff --git a/dev-python/notebook/notebook-6.0.3.ebuild b/dev-python/notebook/notebook-6.0.3.ebuild
new file mode 100644
index 000000000000..a92fb17d8b10
--- /dev/null
+++ b/dev-python/notebook/notebook-6.0.3.ebuild
@@ -0,0 +1,84 @@
+# 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
+}