gentoo resync : 18.12.2020

3 files changed, 2 insertions, 97 deletions

diff --git a/dev-python/notebook/Manifest b/dev-python/notebook/Manifest
index fbf90edbd5d9..264479db5b17 100644
--- a/dev-python/notebook/Manifest
+++ b/dev-python/notebook/Manifest
@@ -1,8 +1,6 @@
 AUX notebook-5.7.0-no-mathjax.patch 1438 BLAKE2B 66719f5342c08fce7576a70780b38a97ac3e768f3385218da15e7e2b7073ec0e1bbe943f320e4ebd0618401760de96295fc1b0ea0f2e919487b41f90acabfef0 SHA512 ef2754a0e7f552de34411532e7cbddffeab66364075a5514290b09f956b3486791f757b9a159a6c3f975507b8a5626612efeee754933927e2b505aea5f5df2db
 DIST notebook-6.1.3.tar.gz 13806042 BLAKE2B da63fdabd1a71e4247a9e340539e688410a84c58d94049dfb7e8e3fcdc53686a55eb855687df34ff48f599a0c5aececbd9a8e1aa1d2ff7baa2a6da1b4e1bcf24 SHA512 67a8feb01dfb665bb24f3ce1b28212e9bad5a188e8cef1d168c4edaf207cbc16d516f6024ca905f75f1c27ba4890da858c5278a3ee84a4c4ac1bdbf225afa351
-DIST notebook-6.1.4.tar.gz 13933373 BLAKE2B 9e58a9913a3c24bb1cb364863a18993d44496e995dc43dc9a4b428c54a0dddcc8b7c4b444073029d97705f0b3eee37d63bb50eec066b9b5fe4cd0ee48f8df558 SHA512 55637ec76b283429ac8bc1de260529983cf0e4cb0f25b268330fcc1d07c6e75329d2806eaa5f10d149bf80bd11df26592fa71548fa03bdb05a57265221466b57
 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
+EBUILD notebook-6.1.5.ebuild 2587 BLAKE2B f1fa42de905aa9732ae0a80893e680eec6de96c96fe39f793538736cc37bc30c1638ac6e0008a99dd70215f53f979e5c977c714abb3f9c54723ede6add29d781 SHA512 214e9bb13da3d0f320f9e88e2d6f8463747e586dff2927e9153fadd9c72ab511c829bc7da0ed8e4077ce13e01b60bdb354297a880aff232a8f62e64b42ee8d56
 MISC metadata.xml 466 BLAKE2B a907de2cb309e201f79881fbc1084337fc9d5bb88af8ba4b65db62123703c5193df08d7a1ed7255417fe619bb197290ed76fa70bc5e04133a616c13f69cc7d3f SHA512 cffa01ae84a4242117574bb9dfc26f7152307f263d12270a9ee8bc978b780c8a19ae26db0b9e7bc98ab1ba82a44f222849a6a33a8a0c50a2887a01f3f94dc6c2
diff --git a/dev-python/notebook/notebook-6.1.4.ebuild b/dev-python/notebook/notebook-6.1.4.ebuild
deleted file mode 100644
index a484e7f04afd..000000000000
--- a/dev-python/notebook/notebook-6.1.4.ebuild
+++ /dev/null
@@ -1,93 +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_{7..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/argon2-cffi[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	>=dev-python/terminado-0.8.3[${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}]
-		dev-python/requests-unixsocket[${PYTHON_USEDEP}]
-	)
-	"
-
-PATCHES=(
-	"${FILESDIR}/${PN}"-5.7.0-no-mathjax.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
-	# network-sandbox?
-	sed -e 's:test_connections:_&:' \
-		-e 's:test_culling:_&:' \
-		-i notebook/services/kernels/tests/test_kernels_api.py || die
-
-	sed -i -e "/'bdist_egg':/d" setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	distutils_install_for_testing
-	local -x PATH=${TEST_DIR}/scripts:${PATH}
-	pytest -vv || die "Tests failed with ${EPYTHON}"
-}
-
-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.5.ebuild b/dev-python/notebook/notebook-6.1.5.ebuild
index 2f974c926f26..a484e7f04afd 100644
--- a/dev-python/notebook/notebook-6.1.5.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