gentoo resync (3) : 24.07.2021

3 files changed, 2 insertions, 103 deletions

diff --git a/dev-python/notebook/Manifest b/dev-python/notebook/Manifest
index cb6049240b5c..46412f2a1604 100644
--- a/dev-python/notebook/Manifest
+++ b/dev-python/notebook/Manifest
@@ -1,6 +1,4 @@
 AUX notebook-5.7.0-no-mathjax.patch 1438 BLAKE2B 66719f5342c08fce7576a70780b38a97ac3e768f3385218da15e7e2b7073ec0e1bbe943f320e4ebd0618401760de96295fc1b0ea0f2e919487b41f90acabfef0 SHA512 ef2754a0e7f552de34411532e7cbddffeab66364075a5514290b09f956b3486791f757b9a159a6c3f975507b8a5626612efeee754933927e2b505aea5f5df2db
-DIST notebook-6.3.0.tar.gz 13922153 BLAKE2B f24b03d4887b1e786da215a4ab10d83e4ae8391d1b88559f4bb35fcf7813d98e487447bf21a1772d502d6b3594c53e6e7b743b681cdb07b5118cc4808bcd02a4 SHA512 112bb0b176f7e6584ca0f09d74cb34fe756d0491320dcc23932f84236fd55b9f56f13a7057c89be073486637fc8c0cf2c44dfce18f27fa16ad0f9d15d2bcd5be
 DIST notebook-6.4.0.tar.gz 13937270 BLAKE2B 41ba6e3dd22c92b6044199737fe93563aad07117e8c64817566765d643867b582218a1b34099acf2a84df9ac9f8eb2773f6f3e6779b14255867fd97ec443df85 SHA512 8bb57b3efaaddb781ee963a569996e45c563b50b2cb918fb7722805710dd5852d895ff5b5f5575686032a037d7395aa581140b471b529d68dfcb371841607481
-EBUILD notebook-6.3.0.ebuild 3070 BLAKE2B 93ecfcfe269fd845b0d11a606c1fd0cd26ad890c809b038267790c1d1e3ed65e4992d68293d5edc77c22c0f35b969c803a8daabcbaf0af7328217c7af4676a78 SHA512 2b960b7aaf61855c1ff6dac7f51051958093d0b3022b133397688ba1089bd4524a4eb34adffb6f1a94fea67603c3f1610ede263ce0df39e2006ebc09d7518e97
-EBUILD notebook-6.4.0.ebuild 3237 BLAKE2B 7d39995566db07dedc099207e72555d1c56876f100728ac161a963e192af11f759aa16d75cea96f3563fa87654f667c46746aabb9c6a6ca14caac9f4b6a3a7b7 SHA512 59c76c86cb2fe893da3b1fd1145121d19ff971d5c5002f7013a5ac1d78993359f8800e2c251a7659b927439de4dc82064a1e53321ffe35fbc7a7004f73cc5da0
+EBUILD notebook-6.4.0.ebuild 3235 BLAKE2B a83eca348e5db25252af465ca499e16512ca91175b4b051f18196e3e3f60a1a657125b9fd7d1ec2119c096afa9d71f2a42b5edd9710bf248609f8298e75c89bb SHA512 78b4c658232dcf15124860d5fc6d3f394f9c2c9bde8de3cf8a9e05badb73cce17b4f4373fa64f079b12c4dc6a8169b66b89c50a13c992c96cf5a3c275d786bdb
 MISC metadata.xml 524 BLAKE2B dfca744ea63418ee961bc5f106be6a01acf80af2e4179e0f3446c370a416bdae998887a55e866cd2fe5ede334653b46205f32b5db275e2ec54efefbd10455541 SHA512 a3511781a2086a80a0cc7a02842e1c71490ae1b200ac5263ace00610d37df7cf9ad866f4bfb89441514dbf26a5dfeb6559cbef9e1e6e2fba534c14feb5fcd616
diff --git a/dev-python/notebook/notebook-6.3.0.ebuild b/dev-python/notebook/notebook-6.3.0.ebuild
deleted file mode 100644
index e54cfb2c99b3..000000000000
--- a/dev-python/notebook/notebook-6.3.0.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7..9} )
-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 ~arm64 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::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/notebook/notebook-6.4.0.ebuild b/dev-python/notebook/notebook-6.4.0.ebuild
index 4b4ee6821c95..411165084fd2 100644
--- a/dev-python/notebook/notebook-6.4.0.ebuild
+++ b/dev-python/notebook/notebook-6.4.0.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 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86"
 
 RDEPEND="
 	>=dev-libs/mathjax-2.4