gentoo resync : 05.12.2021

4 files changed, 107 insertions, 4 deletions

diff --git a/dev-python/notebook/Manifest b/dev-python/notebook/Manifest
index d9ad7bbc1cf9..103e66411538 100644
--- a/dev-python/notebook/Manifest
+++ b/dev-python/notebook/Manifest
@@ -1,6 +1,8 @@
 AUX notebook-5.7.0-no-mathjax.patch 1438 BLAKE2B 66719f5342c08fce7576a70780b38a97ac3e768f3385218da15e7e2b7073ec0e1bbe943f320e4ebd0618401760de96295fc1b0ea0f2e919487b41f90acabfef0 SHA512 ef2754a0e7f552de34411532e7cbddffeab66364075a5514290b09f956b3486791f757b9a159a6c3f975507b8a5626612efeee754933927e2b505aea5f5df2db
 DIST notebook-6.4.4.tar.gz 14349204 BLAKE2B 3ea06a6433933e0de34be33bc681776a17fec05da643268a262f65146bd707f08ea6acbfe1154ba9158ac76211de78552daec22293a54ba5e0edb848790ccbbd SHA512 c78869b7d75244409cb890d43d05eb5391c27e0de29874f48aef1c22379cdcb5dc7f69969eccd6c0f1ed057ed17f85d39e43cd482866dfe6277b6a981eee39f6
 DIST notebook-6.4.5.tar.gz 14339237 BLAKE2B 932e9c90804e6f759a9cd03c45e5093b26d1477908570726ae4782fec6c1127559f129ba8b9d1b4b4ff8e5bcb7fb32fea4cfafbc4c64b55859dbf6ed08960828 SHA512 8e0f6db6f232b7234e65ac41105cbc81b4d2d38d9f8cbd629ca3722b2fc876d8bd64beb7417e0bd99e3ae0c047be8328f4a0a433c2282defa5f026b20953608f
-EBUILD notebook-6.4.4.ebuild 3248 BLAKE2B c1878c7836fbd3d54591293b30f7c898341cb16cd76ef98bb8a0bbb9652085452e47438f75d3924f84d8c9fc89a326d5fa24b02bc3303ee29cfdc9b230345e4f SHA512 2de294ff6a18aff1ee3a7541708eb0bba2fbdb3beb3c9604cef1718dcd67b07e3c18697ce85a91392e76320793a9c0f1eb2468cd6f7983e252537ec56a52cb20
-EBUILD notebook-6.4.5.ebuild 3250 BLAKE2B 114ac2b6b6b5cb9ab34389d9b2485932437652f35776a38fca62e875e1df2994b38048f5278107b407683549b827fa76db9a969c4db5b2fd6d47c5a5f38a283b SHA512 65bf6380532020026259c2674c0f764727f60be7e4fd5b4c3a2f4f8abeb52c2f86b02bd55c6318fc1d7d7136c9f0e3327fb21a3fde5164685c3da7c3feac8b82
+DIST notebook-6.4.6.tar.gz 14342345 BLAKE2B cc9d5968d05d9f75f60f02adfb5ef35f39e4a5de027356af73c6dfb1f3aebc271e5b3bc639eb8605748abd30d43bfaab662d41b3b764c91cc545c2d1848881f4 SHA512 92b10bdc041bc0f3af1b42ad219abda37402e0fa4ea16ddcfd2ffc450cc7f49ce1d770cb477160c3fa58c387f85d22ca3f4e4c6507a5cbf7a92bc5268baf661e
+EBUILD notebook-6.4.4.ebuild 3252 BLAKE2B 97dc4abf032baf17d4f94964c63b608a10bb46bf7482c5d8f93268854a49d6ab257a3257c8613396cf82d816a27cd44ad8dc2a81f2644c8dbcb23f1a719336a0 SHA512 c87e51ebb7fdf896e8153d6519fbeb941113f4c39dc50557ce523f6951180fc7f10e6d50eb7c5c34a9673cf598eb48f683a2b518e4285de6e393c722fd4317df
+EBUILD notebook-6.4.5.ebuild 3262 BLAKE2B 90395f798211244f6e982cba76bbd8c3ca0de28453255cec6a56af491421a3bb81f9d25ba9a1503ee4decc5314293ac6c71569eaf3c5c33a756b0beeca6cf6ec SHA512 f7509ef94b45177afc4fb902a233a387f7626531c099dcc3d6f0cb3a40738bb6d5b6e8ef49f52392ed0258e05eed172e5e08538f9bceef56e8f50309c1a17de0
+EBUILD notebook-6.4.6.ebuild 3319 BLAKE2B 2e3c1b7cd532c8b1af20207ae40b6341a721144c8c5b68759baa7951a3d44ac62e508087604575b256eef6f52db2a0a3efab95391d46fc361ad4aef21895e10b SHA512 1f99e6fe8ed25aeb1d273b757eaadb668ca18f8a785078061e81f0ae480a28959ea1e1f5193ed5c0d21b68db737897d1132d8fcd9c6a1ebb5efc0a533c184155
 MISC metadata.xml 525 BLAKE2B 03602bbd7c6b55aaa4c4d6011a91127090359079ed2d7e6b9e3cefe63b2b249b36cd172a40d1ce69234de2440d9248e933dd94a636b95c07f06a658ecb929227 SHA512 18f6bd5cb4b1c90cc228a5ee506cea17c4aa9d60174e00c7cb4df654d5d7158aa20ea6346bf9a0734877402a0e0916aa7f9e82f0bdce0cca78c877c5e87550e3
diff --git a/dev-python/notebook/notebook-6.4.4.ebuild b/dev-python/notebook/notebook-6.4.4.ebuild
index 9a4c0befb9cd..c7d5b664b5b0 100644
--- a/dev-python/notebook/notebook-6.4.4.ebuild
+++ b/dev-python/notebook/notebook-6.4.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="amd64 ~arm ~arm64 hppa ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="
 	>=dev-libs/mathjax-2.4
diff --git a/dev-python/notebook/notebook-6.4.5.ebuild b/dev-python/notebook/notebook-6.4.5.ebuild
index cacbe7d854e3..f2164c71418e 100644
--- a/dev-python/notebook/notebook-6.4.5.ebuild
+++ b/dev-python/notebook/notebook-6.4.5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 RDEPEND="
 	>=dev-libs/mathjax-2.4
diff --git a/dev-python/notebook/notebook-6.4.6.ebuild b/dev-python/notebook/notebook-6.4.6.ebuild
new file mode 100644
index 000000000000..ad390a6a34e0
--- /dev/null
+++ b/dev-python/notebook/notebook-6.4.6.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..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 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~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/nest_asyncio-1.5[${PYTHON_USEDEP}]
+	dev-python/ipykernel[${PYTHON_USEDEP}]
+	>=dev-python/send2trash-1.8.0[${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
+}