gentoo resync : 17.05.2018

8 files changed, 2 insertions, 508 deletions

diff --git a/dev-python/notebook/Manifest b/dev-python/notebook/Manifest
index 2f3c2a7be4e5..6d5a219afa6f 100644
--- a/dev-python/notebook/Manifest
+++ b/dev-python/notebook/Manifest
@@ -1,16 +1,5 @@
-AUX notebook-4.2.0-setupbase.py.patch 1357 BLAKE2B fb4106bc49e5b59ab449aea37c99a70e979c09e93e8ce609292b6956122504eb76d71858370d3d621e9c2b19f9a249bf644134175ea418627fac6bb23767806e SHA512 8e8aac8faf8f791c836e8ad00715006c0d19a9711add07b7fce53f59bcfb38ff23c72aecb006c2523b85b7b2f5fb6c04895a0644d9d574836984ee7145ed1e26
 AUX notebook-5.0.0-example-execution.patch 941 BLAKE2B 6df33095a99042a5345dc3b759121a43d269d1092288c1384d61844430d90e967868ad71fd7eddb6bba4b2493e489ac6b57b01f21d8a48297cd36438cd98861b SHA512 f9482d26fc098b9a3d525f5e299cf094cce192c6231d6bf6242e3e8081b7ab69f8f7955a746772aca7aef3d4c973b444f5f04004d1fe54e623bbd84d761f0512
 AUX notebook-5.0.0-setupbase.py.patch 1368 BLAKE2B 7c80334d515becf41d881a1d4b3820a263c8cac2913dd9ef4df149bcd85ee7a09df6ba91e607f15ac35dde1a504e89775dec93043bfcdc7700643b645c986929 SHA512 14274ae6e2bc664e6c92390d480da0f5615b7f51863c10f3d11a7ec1a788ff357ae8113bac0c3d15932e322137b9e251c31bdf34c36a2dbbc0771407fe614a96
-DIST notebook-4.0.6.tar.gz 6705277 BLAKE2B a2ea87ca39951bab1bfa5c6ca5952653dda5ce7a12abeaa0a80c4a334a649618f5832d950d8ceffedeaff260035b247e44fd1d10572140875131e7e55ffc39fd SHA512 9ce9ca21adcb967725aeb7a18543ace8aca4e88497d3d2fd708a603511e8ef4a932b39337d134d684df03b273bbc442958a37ced8cd499cb7b97a1c29758eeb0
-DIST notebook-4.1.0.tar.gz 9170981 BLAKE2B f0795388ac18f9702e12f2c9dcaae0eaa1372200a9e3d362f6afd5657491a86ccf37a6f3a775222c353a066194588a620c8fb3bbadc396d2328546cdd7063154 SHA512 745e412a737835956dc4238f70dbaf9c519fea55988941174febdc3ad24962031c3c66cb4ac355a9a639f9a383905e863e8eb0a3c6da62bf72026282154874cb
-DIST notebook-4.2.3.tar.gz 10092423 BLAKE2B a06f735220f13bee72b5e3309ef99ee7ac03450d80dd398c1ce5ace8957e73f19aa24266b00e4f1582c424597dced1eb563c06393fc854fec392d167b7167c62 SHA512 1b54e2a16fdb79b9344c0f73bd48fe438b18c529707b15816a3ab20353b2e320067082d51829c670117d77830a21c5a64a15d37d1970fd30aae31272d9650d97
-DIST notebook-4.3.2.tar.gz 10375345 BLAKE2B 346de30e5d78065fc514be874cb5538d3d19761e5d1f85b9c3a8ab99884cfbbccb150eac020ad6168557c417ffe00b52be7b1f4882ab35b0d30877502ea85c52 SHA512 8ff9a4852aafbc2761e82cd1cbacfc85dade97ec58386df55eea1e97f513b3d608106a2cc43305968fd990974daf6c8dac8aab4ab2184c56976289e646a62b7b
-DIST notebook-4.4.1.tar.gz 10377605 BLAKE2B 153fe02b30d661680782798e1d6041f3e08358b1200f1040c7f64efbc0a2e0717405b5d606fb5e41b8f03ab5a269aa8741bbc4ec2b6288024c780a0ae1541328 SHA512 416500355660e74e87edd1649821eb91154f2f0828dce0f2a6a8d3e6448f0ee4459ad661c9a030b5acb594659d37131c76d9edc30630f91700860dc6bfe4450b
 DIST notebook-5.0.0.tar.gz 11481080 BLAKE2B 3cc483d338ca22c6b4d7199100875e9425f90e1a7059c016cec07500f0558c437db5f7e367a5c4441520deb68fa891be31c07cd93e858c872a1f12d893530479 SHA512 fbee29cc554f36e94b1fe9804187a50581e840cfb5884bcdf2fef82ad9ae3ae0e2082ea0056f815bfa2a1c2f203679169155e61e53253aa2e9004a43ff7fbcae
-EBUILD notebook-4.0.6.ebuild 2194 BLAKE2B b0ae8bd3ddd2061483e05443dfdbd1f6310d531a5b6a1af4186cd5a7c7ea540d4543392e793f9d1a340a8ab9f5621be092fc5565f168ceda21b0770ad4a59b1e SHA512 52649f5c79dfd3e20096dd2e7d744f161d2999812b141a35c4c1099d2d8e47d877212bb9ee05feb65391b0b820653fbac391e637f5d43cde4265262a206d2bc1
-EBUILD notebook-4.1.0.ebuild 2193 BLAKE2B b84131608cbc2a06497468c454113b236ac63b07e2863d54b11acd3e71275e761a5d16d36535f5f629dfc6d494159302a55b595a270f37fe3540ed3000d6acad SHA512 9f95d9a5f21233ace6112f46c4ab090b8029ac8a57d8e0e54373d26ed2f93a8625d2511b366f83b75f686280e89b862aa9b7623bbeea94d3bd1bd95389e3f829
-EBUILD notebook-4.2.3.ebuild 2232 BLAKE2B 79509b3564624124226d7bfe094cc63f57f8134a9ef3f65b88119b283c30f7b7856caea31bf510bbd616a6914c010ae49fbc0eb96ec11c865abc7ccee412634b SHA512 4aaee6548f0a57a50d34882f0cc474aad8d25a05d01cbe024cb951280e6b8444d581f2b003c975d4159deb053cd264d182ba330099dabda1b61368bf31e0a92d
-EBUILD notebook-4.3.2.ebuild 2178 BLAKE2B f8e8eff9abd732cd4126714a06dd3defc6586daff9cea121abe1a97018bf4ced6123670912f50534b43ee6020e2f385082e72f7a178c3b461c37e014ff03a7d8 SHA512 74fea68d8da80a0ff479fbd202e9e48f7340a48f6966882449291a7c93d770ae3f45ce0272eb68f91b8529bf27aee594f4fb482003aa95d5c50f36c8c0a66595
-EBUILD notebook-4.4.1.ebuild 2187 BLAKE2B 42faceea3e3a52f8437d74a15837fb888d48caf7abf2ef3aaf52c3180fbd8f5762f97d52cfea6fcb00ceaf0d939683da7202313192aa5c202b6a00401b48becb SHA512 73cd8451313befd7b00e747250f15f498ca668a7592f5d8480795c0ab50a9dc66f8827d1a6cd0a32eb05f1c2a52347eca4e9cdc63b8dd09ed0e58b77c817f6a6
-EBUILD notebook-5.0.0.ebuild 2272 BLAKE2B a7c3fb8f3d06dcc704ca43f8f555c1663e94a923b3371a172458664ba25876b8ca1892b42c71c3d74215f38132622e7388db93ec4fc35bc7a6b72f1a9f8e3a24 SHA512 a42ef856c393fd50e0c77b3aaca53334c7e60fe99c2b4349645006929d3d3ad66622b1ddcc7a751b4d07a4f2c3f4593ccc23eabccad75f50777fa92630b4d1e0
+EBUILD notebook-5.0.0.ebuild 2271 BLAKE2B 3454254a51dd97b18559593c8c8c6da2c9132d8a9d3189c9b69a1cde5d376106ec43b434baecd79dec98c39fb9eab4b49bdd78fdc777cc08510e65ccac34f182 SHA512 7151e9322267c0514b0795da224d57fb4689a3beba5c3073b4a0968aaafe0b83935122d6c154933c5cb3e6ad045eda702d2ef1345346a6a07b3aa59bbeb9d504
 MISC metadata.xml 472 BLAKE2B c68faaf3f609c2fc884c61f1fd1e0296460316ddd6da67aae1492a850a9128654d6f903f9337d92f9f0bfb78b00b94191c99a26dffec92279e79ddfc9ab39fd1 SHA512 23588835d3a40661f3a59b92a9ccfb9e40777f14ff03b6f9c403eb9eee5560e0a805c6a76cd8ae2fb11eeba39b264fa0fedf44cc4fd2231318fe1cefe2c27846
diff --git a/dev-python/notebook/files/notebook-4.2.0-setupbase.py.patch b/dev-python/notebook/files/notebook-4.2.0-setupbase.py.patch
deleted file mode 100644
index a4c29048b925..000000000000
--- a/dev-python/notebook/files/notebook-4.2.0-setupbase.py.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-Disable bundled mathjax.
-
-Patch by Marius Brehler
---- a/setupbase.py
-+++ b/setupbase.py
-@@ -152,36 +152,6 @@ def find_package_data():
-             if f.endswith(('.js', '.css')):
-                 static_data.append(pjoin(parent, f))
- 
--    # Trim mathjax
--    mj = lambda *path: pjoin(components, 'MathJax', *path)
--    static_data.extend([
--        mj('MathJax.js'),
--        mj('config', 'TeX-AMS_HTML-full.js'),
--        mj('config', 'Safe.js'),
--    ])
--    
--    trees = []
--    mj_out = mj('jax', 'output')
--    
--    if os.path.exists(mj_out):
--        for output in os.listdir(mj_out):
--            path = pjoin(mj_out, output)
--            static_data.append(pjoin(path, '*.js'))
--            autoload = pjoin(path, 'autoload')
--            if os.path.isdir(autoload):
--                trees.append(autoload)
--
--    for tree in trees + [
--        mj('localization'), # limit to en?
--        mj('fonts', 'HTML-CSS', 'STIX-Web', 'woff'),
--        mj('extensions'),
--        mj('jax', 'input', 'TeX'),
--        mj('jax', 'output', 'HTML-CSS', 'fonts', 'STIX-Web'),
--        mj('jax', 'output', 'SVG', 'fonts', 'STIX-Web'),
--    ]:
--        for parent, dirs, files in os.walk(tree):
--            for f in files:
--                static_data.append(pjoin(parent, f))
- 
-     os.chdir(os.path.join('tests',))
-     js_tests = glob('*.js') + glob('*/*.js')
diff --git a/dev-python/notebook/notebook-4.0.6.ebuild b/dev-python/notebook/notebook-4.0.6.ebuild
deleted file mode 100644
index b20216c53d55..000000000000
--- a/dev-python/notebook/notebook-4.0.6.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{4,5} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Jupyter Interactive Notebook"
-HOMEPAGE="http://jupyter.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-RDEPEND="
-	>=dev-libs/mathjax-2.4
-	dev-python/jinja[${PYTHON_USEDEP}]
-	>=dev-python/terminado-0.3.3[${PYTHON_USEDEP}]
-	>=www-servers/tornado-4.0[${PYTHON_USEDEP}]
-	dev-python/ipython_genutils[${PYTHON_USEDEP}]
-	dev-python/traitlets[${PYTHON_USEDEP}]
-	dev-python/jupyter_core[${PYTHON_USEDEP}]
-	dev-python/jupyter_client[${PYTHON_USEDEP}]
-	dev-python/nbformat[${PYTHON_USEDEP}]
-	dev-python/nbconvert[${PYTHON_USEDEP}]
-	dev-python/ipykernel[${PYTHON_USEDEP}]
-	"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7)
-		>=dev-python/nose-0.10.1[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/coverage[${PYTHON_USEDEP}]
-	)
-	doc? (
-		app-text/pandoc
-		>=dev-python/ipython-4.0.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1[${PYTHON_USEDEP}]
-	)
-	"
-
-python_prepare_all() {
-	sed \
-		-e "/import setup/s:$:\nimport setuptools:g" \
-		-i setup.py || die
-
-	# disable bundled mathjax
-	sed -i 's/^.*MathJax.*$//' bower.json || die
-	sed -i 's/mj(/#mj(/' setupbase.py || die
-
-	# Prevent un-needed download during build
-	if use doc; then
-		sed -e "/^    'sphinx.ext.intersphinx',/d" -i docs/source/conf.py || die
-	fi
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	nosetests --with-coverage --cover-package=notebook notebook || die
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	ln -sf "${EPREFIX}/usr/share/mathjax" "${D}$(python_get_sitedir)/notebook/static/components/MathJax" || die
-}
-
-python_install_all() {
-	use doc && HTML_DOCS=( docs/build/html/. )
-	distutils-r1_python_install_all
-}
-
-pkg_preinst() {
-	# remove old mathjax folder if present
-	rm -rf "${EROOT}"/usr/lib*/python*/site-packages/notebook/static/components/MathJax
-}
diff --git a/dev-python/notebook/notebook-4.1.0.ebuild b/dev-python/notebook/notebook-4.1.0.ebuild
deleted file mode 100644
index eb0868e303e7..000000000000
--- a/dev-python/notebook/notebook-4.1.0.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{4,5} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Jupyter Interactive Notebook"
-HOMEPAGE="http://jupyter.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-RDEPEND="
-	>=dev-libs/mathjax-2.4
-	dev-python/jinja[${PYTHON_USEDEP}]
-	>=dev-python/terminado-0.3.3[${PYTHON_USEDEP}]
-	>=www-servers/tornado-4.0[${PYTHON_USEDEP}]
-	dev-python/ipython_genutils[${PYTHON_USEDEP}]
-	dev-python/traitlets[${PYTHON_USEDEP}]
-	dev-python/jupyter_core[${PYTHON_USEDEP}]
-	dev-python/jupyter_client[${PYTHON_USEDEP}]
-	dev-python/nbformat[${PYTHON_USEDEP}]
-	dev-python/nbconvert[${PYTHON_USEDEP}]
-	dev-python/ipykernel[${PYTHON_USEDEP}]
-	"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7)
-		>=dev-python/nose-0.10.1[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/coverage[${PYTHON_USEDEP}]
-	)
-	doc? (
-		app-text/pandoc
-		>=dev-python/ipython-4.0.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1[${PYTHON_USEDEP}]
-	)
-	"
-
-python_prepare_all() {
-	sed \
-		-e "/import setup/s:$:\nimport setuptools:g" \
-		-i setup.py || die
-
-	# disable bundled mathjax
-	sed -i 's/^.*MathJax.*$//' bower.json || die
-	sed -i 's/mj(/#mj(/' setupbase.py || die
-
-	# Prevent un-needed download during build
-	if use doc; then
-		sed \
-			-e "/^    'sphinx.ext.intersphinx',/d" \
-			-i docs/source/conf.py || die
-	fi
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	nosetests \
-		--verbosity=3 \
-		notebook || die
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	ln -sf \
-		"${EPREFIX}/usr/share/mathjax" \
-		"${D}$(python_get_sitedir)/notebook/static/components/MathJax" || die
-}
-
-python_install_all() {
-	use doc && HTML_DOCS=( docs/build/html/. )
-	distutils-r1_python_install_all
-}
-
-pkg_preinst() {
-	# remove old mathjax folder if present
-	rm -rf "${EROOT}"/usr/lib*/python*/site-packages/notebook/static/components/MathJax
-}
diff --git a/dev-python/notebook/notebook-4.2.3.ebuild b/dev-python/notebook/notebook-4.2.3.ebuild
deleted file mode 100644
index 973ad6e7b439..000000000000
--- a/dev-python/notebook/notebook-4.2.3.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Jupyter Interactive Notebook"
-HOMEPAGE="http://jupyter.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-RDEPEND="
-	>=dev-libs/mathjax-2.4
-	dev-python/jinja[${PYTHON_USEDEP}]
-	>=dev-python/terminado-0.3.3[${PYTHON_USEDEP}]
-	>=www-servers/tornado-4.0[${PYTHON_USEDEP}]
-	dev-python/ipython_genutils[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-4.2.1[${PYTHON_USEDEP}]
-	dev-python/jupyter_core[${PYTHON_USEDEP}]
-	dev-python/jupyter_client[${PYTHON_USEDEP}]
-	dev-python/nbformat[${PYTHON_USEDEP}]
-	>=dev-python/nbconvert-4.2.0[${PYTHON_USEDEP}]
-	dev-python/ipykernel[${PYTHON_USEDEP}]
-	"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7)
-		>=dev-python/nose-0.10.1[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/coverage[${PYTHON_USEDEP}]
-	)
-	doc? (
-		app-text/pandoc
-		>=dev-python/ipython-4.0.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1[${PYTHON_USEDEP}]
-	)
-	"
-
-PATCHES=( "${FILESDIR}/${PN}"-4.2.0-setupbase.py.patch )
-
-python_prepare_all() {
-	sed \
-		-e "/import setup/s:$:\nimport setuptools:g" \
-		-i setup.py || die
-
-	# disable bundled mathjax
-	sed -i 's/^.*MathJax.*$//' bower.json || die
-
-	# Prevent un-needed download during build
-	if use doc; then
-		sed \
-			-e "/^    'sphinx.ext.intersphinx',/d" \
-			-i docs/source/conf.py || die
-	fi
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	nosetests \
-		--verbosity=3 \
-		notebook || die
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	ln -sf \
-		"${EPREFIX}/usr/share/mathjax" \
-		"${D}$(python_get_sitedir)/notebook/static/components/MathJax" || die
-}
-
-python_install_all() {
-	use doc && HTML_DOCS=( docs/build/html/. )
-	distutils-r1_python_install_all
-}
-
-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-4.3.2.ebuild b/dev-python/notebook/notebook-4.3.2.ebuild
deleted file mode 100644
index ab0e469467da..000000000000
--- a/dev-python/notebook/notebook-4.3.2.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Jupyter Interactive Notebook"
-HOMEPAGE="http://jupyter.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-RDEPEND="
-	>=dev-libs/mathjax-2.4
-	dev-python/jinja[${PYTHON_USEDEP}]
-	>=dev-python/terminado-0.3.3[${PYTHON_USEDEP}]
-	>=www-servers/tornado-4.0[${PYTHON_USEDEP}]
-	dev-python/ipython_genutils[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-4.2.1[${PYTHON_USEDEP}]
-	dev-python/jupyter_core[${PYTHON_USEDEP}]
-	dev-python/jupyter_client[${PYTHON_USEDEP}]
-	dev-python/nbformat[${PYTHON_USEDEP}]
-	>=dev-python/nbconvert-4.2.0[${PYTHON_USEDEP}]
-	dev-python/ipykernel[${PYTHON_USEDEP}]
-	"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' 'python2*')
-		>=dev-python/nose-0.10.1[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/coverage[${PYTHON_USEDEP}]
-	)
-	doc? (
-		app-text/pandoc
-		>=dev-python/ipython-4.0.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1[${PYTHON_USEDEP}]
-	)
-	"
-
-PATCHES=( "${FILESDIR}/${PN}"-4.2.0-setupbase.py.patch )
-
-python_prepare_all() {
-	sed \
-		-e "/import setup/s:$:\nimport setuptools:g" \
-		-i setup.py || die
-
-	# disable bundled mathjax
-	sed -i 's/^.*MathJax.*$//' bower.json || die
-
-	# Prevent un-needed download during build
-	if use doc; then
-		sed \
-			-e "/^    'sphinx.ext.intersphinx',/d" \
-			-i docs/source/conf.py || die
-	fi
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	if use doc; then
-		emake -C docs html
-		HTML_DOCS=( docs/build/html/. )
-	fi
-}
-
-python_test() {
-	nosetests \
-		--verbosity=3 \
-		notebook || die
-}
-
-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-4.4.1.ebuild b/dev-python/notebook/notebook-4.4.1.ebuild
deleted file mode 100644
index ca67bd63999e..000000000000
--- a/dev-python/notebook/notebook-4.4.1.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Jupyter Interactive Notebook"
-HOMEPAGE="http://jupyter.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="doc test"
-RDEPEND="
-	>=dev-libs/mathjax-2.4
-	dev-python/jinja[${PYTHON_USEDEP}]
-	>=dev-python/terminado-0.3.3[${PYTHON_USEDEP}]
-	>=www-servers/tornado-4.0[${PYTHON_USEDEP}]
-	dev-python/ipython_genutils[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-4.2.1[${PYTHON_USEDEP}]
-	dev-python/jupyter_core[${PYTHON_USEDEP}]
-	dev-python/jupyter_client[${PYTHON_USEDEP}]
-	dev-python/nbformat[${PYTHON_USEDEP}]
-	>=dev-python/nbconvert-4.2.0[${PYTHON_USEDEP}]
-	dev-python/ipykernel[${PYTHON_USEDEP}]
-	"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' 'python2*')
-		>=dev-python/nose-0.10.1[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/coverage[${PYTHON_USEDEP}]
-	)
-	doc? (
-		app-text/pandoc
-		>=dev-python/ipython-4.0.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1[${PYTHON_USEDEP}]
-	)
-	"
-
-PATCHES=( "${FILESDIR}/${PN}"-4.2.0-setupbase.py.patch )
-
-python_prepare_all() {
-	sed \
-		-e "/import setup/s:$:\nimport setuptools:g" \
-		-i setup.py || die
-
-	# disable bundled mathjax
-	sed -i 's/^.*MathJax.*$//' bower.json || die
-
-	# Prevent un-needed download during build
-	if use doc; then
-		sed \
-			-e "/^    'sphinx.ext.intersphinx',/d" \
-			-i docs/source/conf.py || die
-	fi
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	if use doc; then
-		emake -C docs html
-		HTML_DOCS=( docs/build/html/. )
-	fi
-}
-
-python_test() {
-	nosetests \
-		--verbosity=3 \
-		notebook || die
-}
-
-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-5.0.0.ebuild b/dev-python/notebook/notebook-5.0.0.ebuild
index 8f86516c8fe1..fed4d7e6dc92 100644
--- a/dev-python/notebook/notebook-5.0.0.ebuild
+++ b/dev-python/notebook/notebook-5.0.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="doc test"
 RDEPEND="
 	>=dev-libs/mathjax-2.4