gentoo resync : 16.09.2021

5 files changed, 7 insertions, 109 deletions

diff --git a/dev-python/notebook/Manifest b/dev-python/notebook/Manifest
index 116da82b178c..0fe72cd73914 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
-DIST notebook-6.4.0.tar.gz 13937270 BLAKE2B 41ba6e3dd22c92b6044199737fe93563aad07117e8c64817566765d643867b582218a1b34099acf2a84df9ac9f8eb2773f6f3e6779b14255867fd97ec443df85 SHA512 8bb57b3efaaddb781ee963a569996e45c563b50b2cb918fb7722805710dd5852d895ff5b5f5575686032a037d7395aa581140b471b529d68dfcb371841607481
-DIST notebook-6.4.1.tar.gz 14139457 BLAKE2B 4be00ba6cd2f66873657f8ad5f79b444bbfbb978eaac7ddb57ef5da39a81c2746e7658004179e44aa98fa5fc5954b022b2e3c0c15dac0cc6da21b95a16225bfd SHA512 aa73e90f8ad1888f469e4cb412b6f17742e3b68ce429b2feaafeaeebbbb9e0cc437f3f73f26204b8de8367620ecb492033786c00b04d641ce0bfb4df75460419
 DIST notebook-6.4.2.tar.gz 14133763 BLAKE2B 2c4f9677b014f484f7c975344f6e3aa29476b3b3bf2dd329ee527be653573f199c6d66078bc1f0787227414fb818df8df3d38e5f1bea9d3f2605f796a391cb37 SHA512 d9914c2924b7a0837295a7cfe2bdf551e1d71f35bab43bd6d12e798562c7e103f28cfdff6692e6ac5de394867071b8e1eae7a26bfd0a76b4a9304b7bea29f119
 DIST notebook-6.4.3.tar.gz 14344061 BLAKE2B a6d12df889015801a47061b40c320f659adda19cdf37832de1fd2b0257e7b1e22439aa4fd7663595c798b4b04c8c8e720a3799bcb20b93a0229ccf26622eee04 SHA512 14bb5c1a858c2d48f19f6a9907c4e3a053e77586a9ce78f3116752a02c39056bfa02fac5ef37404b742861a66751ca765b1d329a530b09752cf54fa464ab565b
-EBUILD notebook-6.4.0.ebuild 3235 BLAKE2B a83eca348e5db25252af465ca499e16512ca91175b4b051f18196e3e3f60a1a657125b9fd7d1ec2119c096afa9d71f2a42b5edd9710bf248609f8298e75c89bb SHA512 78b4c658232dcf15124860d5fc6d3f394f9c2c9bde8de3cf8a9e05badb73cce17b4f4373fa64f079b12c4dc6a8169b66b89c50a13c992c96cf5a3c275d786bdb
-EBUILD notebook-6.4.1.ebuild 3237 BLAKE2B 840150c7f2f86c75b492df97c4dbd325a1693ba7279847d16aedadd1a79cd80947de345d3ed5fe95d5b5b399d886afbaddc2c61824ea718af56c3e1fa05a35ec SHA512 74033b899159821856d305629dc72c8f430f3c11608937f73ef8d5d08e4d6731150c519e1d07e16f17752420697277da8f281cfbfb114b8d4a2a10249c10ce4d
-EBUILD notebook-6.4.2.ebuild 3237 BLAKE2B 840150c7f2f86c75b492df97c4dbd325a1693ba7279847d16aedadd1a79cd80947de345d3ed5fe95d5b5b399d886afbaddc2c61824ea718af56c3e1fa05a35ec SHA512 74033b899159821856d305629dc72c8f430f3c11608937f73ef8d5d08e4d6731150c519e1d07e16f17752420697277da8f281cfbfb114b8d4a2a10249c10ce4d
+DIST notebook-6.4.4.tar.gz 14349204 BLAKE2B 3ea06a6433933e0de34be33bc681776a17fec05da643268a262f65146bd707f08ea6acbfe1154ba9158ac76211de78552daec22293a54ba5e0edb848790ccbbd SHA512 c78869b7d75244409cb890d43d05eb5391c27e0de29874f48aef1c22379cdcb5dc7f69969eccd6c0f1ed057ed17f85d39e43cd482866dfe6277b6a981eee39f6
+EBUILD notebook-6.4.2.ebuild 3235 BLAKE2B 99f3820a192f74b44b0f6e128621d00920a03072f0e433a77002b412bc05f21c4866ba74c20743918a9bcc6d42c7524de601e96525d47c26747ac5781aa9e7ba SHA512 9e09082e03757b0c0e519c2b1166d89e8cea981f91bf8a157ec3e0ee796e94dbe213ffdf71f448b01a16b1c26485816f807b918c3d41b0c369a67f6089de1665
 EBUILD notebook-6.4.3.ebuild 3250 BLAKE2B 114ac2b6b6b5cb9ab34389d9b2485932437652f35776a38fca62e875e1df2994b38048f5278107b407683549b827fa76db9a969c4db5b2fd6d47c5a5f38a283b SHA512 65bf6380532020026259c2674c0f764727f60be7e4fd5b4c3a2f4f8abeb52c2f86b02bd55c6318fc1d7d7136c9f0e3327fb21a3fde5164685c3da7c3feac8b82
-MISC metadata.xml 524 BLAKE2B dfca744ea63418ee961bc5f106be6a01acf80af2e4179e0f3446c370a416bdae998887a55e866cd2fe5ede334653b46205f32b5db275e2ec54efefbd10455541 SHA512 a3511781a2086a80a0cc7a02842e1c71490ae1b200ac5263ace00610d37df7cf9ad866f4bfb89441514dbf26a5dfeb6559cbef9e1e6e2fba534c14feb5fcd616
+EBUILD notebook-6.4.4.ebuild 3250 BLAKE2B 114ac2b6b6b5cb9ab34389d9b2485932437652f35776a38fca62e875e1df2994b38048f5278107b407683549b827fa76db9a969c4db5b2fd6d47c5a5f38a283b SHA512 65bf6380532020026259c2674c0f764727f60be7e4fd5b4c3a2f4f8abeb52c2f86b02bd55c6318fc1d7d7136c9f0e3327fb21a3fde5164685c3da7c3feac8b82
+MISC metadata.xml 525 BLAKE2B 03602bbd7c6b55aaa4c4d6011a91127090359079ed2d7e6b9e3cefe63b2b249b36cd172a40d1ce69234de2440d9248e933dd94a636b95c07f06a658ecb929227 SHA512 18f6bd5cb4b1c90cc228a5ee506cea17c4aa9d60174e00c7cb4df654d5d7158aa20ea6346bf9a0734877402a0e0916aa7f9e82f0bdce0cca78c877c5e87550e3
diff --git a/dev-python/notebook/metadata.xml b/dev-python/notebook/metadata.xml
index 863c6761df8c..eccad810b922 100644
--- a/dev-python/notebook/metadata.xml
+++ b/dev-python/notebook/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
     <email>sci@gentoo.org</email>
diff --git a/dev-python/notebook/notebook-6.4.0.ebuild b/dev-python/notebook/notebook-6.4.0.ebuild
deleted file mode 100644
index 411165084fd2..000000000000
--- a/dev-python/notebook/notebook-6.4.0.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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 ~ppc ~ppc64 ~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/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::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
-}
diff --git a/dev-python/notebook/notebook-6.4.2.ebuild b/dev-python/notebook/notebook-6.4.2.ebuild
index 892d3ca7cd84..4bec7083e14c 100644
--- a/dev-python/notebook/notebook-6.4.2.ebuild
+++ b/dev-python/notebook/notebook-6.4.2.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
diff --git a/dev-python/notebook/notebook-6.4.1.ebuild b/dev-python/notebook/notebook-6.4.4.ebuild
index 892d3ca7cd84..cacbe7d854e3 100644
--- a/dev-python/notebook/notebook-6.4.1.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 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 RDEPEND="
 	>=dev-libs/mathjax-2.4