Merge branch 'marbre-jupyter'

* marbre-jupyter: (26 commits)
  dev-python/testpath: Add missing indent
  dev-python/testpath: Move KEYWORDS variable
  dev-python/notebook: Move KEYWORDS variable
  dev-python/nbconvert: Move KEYWORDS variable
  dev-python/nbformat: Move KEYWORDS variable
  dev-python/jupyter_core: Move KEYWORDS variable; Remove pytest-cov from deps
  dev-python/jupyter_console: Move KEYWORDS variable
  dev-python/jupyter_client: Move KEYWORDS variable
  dev-python/ipython: Add missing dies, reduce indent
  dev-python/ipython: Version bump; Fix deps
  dev-python/ipython: Version bump; Import from science overlay
  dev-python/testpath: Import from science overlay
  dev-python/jupyter: Import from science overlay
  dev-python/notebook: Import from science overlay
  dev-python/pickleshare: Import from science overlay
  dev-python/jupyter_console: Import from science overlay
  dev-python/nbconvert: Import from science overlay
  dev-python/qtconsole: Import from science overlay
  dev-python/ipyparallel: Import from science overlay
  dev-python/jupyter_client: Import from science overlay
  ...

49 files changed, 1166 insertions, 3 deletions

diff --git a/dev-python/ipykernel/Manifest b/dev-python/ipykernel/Manifest
new file mode 100644
index 000000000000..2b027e560348
--- /dev/null
+++ b/dev-python/ipykernel/Manifest
@@ -0,0 +1 @@
+DIST ipykernel-4.2.0.tar.gz 80543 SHA256 723b3d4baac20f0c9cd91fc75c3e813636ecb6c6e303fb34d628c3df078985a7 SHA512 32d3d3e594031c16b3ae4736f72e168263d44be15e1a546b4f69614bef30d80ff44db00699be086897c1c384b71600f3cd7bd702b45136f51aab526c2c018f25 WHIRLPOOL e1f335dd68068e338998ac7198db43cee6d06ce19f6f6a40c7da5509beb16fed24b86eb89dcab468fc344d8d4fd090963f74f46aa119013591abf4d3463bccfa
diff --git a/dev-python/ipykernel/ipykernel-4.2.0.ebuild b/dev-python/ipykernel/ipykernel-4.2.0.ebuild
new file mode 100644
index 000000000000..e7a161fc597c
--- /dev/null
+++ b/dev-python/ipykernel/ipykernel-4.2.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="IPython Kernel for Jupyter"
+HOMEPAGE="https://github.com/ipython/ipykernel"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	dev-python/traitlets[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/coverage[${PYTHON_USEDEP}]
+		>=dev-python/ipython-4.0.0[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+	)
+	"
+
+python_test() {
+	nosetests --with-coverage --cover-package ipykernel ipykernel || die
+}
diff --git a/dev-python/ipykernel/metadata.xml b/dev-python/ipykernel/metadata.xml
new file mode 100644
index 000000000000..0e868ae83933
--- /dev/null
+++ b/dev-python/ipykernel/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>sci</herd>
+  <longdescription>
+    This package provides the IPython kernel for Jupyter.
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">ipykernel</remote-id>
+    <remote-id type="github">ipython/ipykernel</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/ipyparallel/Manifest b/dev-python/ipyparallel/Manifest
new file mode 100644
index 000000000000..4f66c2353644
--- /dev/null
+++ b/dev-python/ipyparallel/Manifest
@@ -0,0 +1 @@
+DIST ipyparallel-4.1.0.tar.gz 2271608 SHA256 c943f6b3bbabb9332336d15474969e2a7a73d5b583f9786f7b357c75e4b1709a SHA512 19fff1ea57d9fcaec6525ce6e0c72ab63ab1245e32e485174a0691d2b48d8d2512af4055b77df82c7b30a8c071e1b6c5900d37e992f82f1597492e220e83d36f WHIRLPOOL ead35bc2166af0b221e730550689b09b7bf04148abcd754039f1c511acaa182ba50b593372f3e8bc627ae40a6117f9209cac476c1905bdc780f53de10666ffe1
diff --git a/dev-python/ipyparallel/ipyparallel-4.1.0.ebuild b/dev-python/ipyparallel/ipyparallel-4.1.0.ebuild
new file mode 100644
index 000000000000..be83c50bd057
--- /dev/null
+++ b/dev-python/ipyparallel/ipyparallel-4.1.0.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Interactive Parallel Computing with IPython"
+HOMEPAGE="http://ipython.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+RDEPEND="
+	dev-python/ipython_genutils[${PYTHON_USEDEP}]
+	dev-python/decorator[${PYTHON_USEDEP}]
+	>=dev-python/pyzmq-14.4.0[${PYTHON_USEDEP}]
+	dev-python/ipykernel[${PYTHON_USEDEP}]
+	!<dev-python/ipython-4.0.0[smp]
+	>=dev-python/ipython-4.0.0[${PYTHON_USEDEP}]
+	dev-python/jupyter_client[${PYTHON_USEDEP}]
+	"
+DEPEND="${RDEPEND}
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}]
+	)
+	"
+
+python_prepare_all() {
+	# 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() {
+	iptest --coverage xml ipyparallel.tests || die
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( docs/build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/ipyparallel/metadata.xml b/dev-python/ipyparallel/metadata.xml
new file mode 100644
index 000000000000..3f46dd1bfc06
--- /dev/null
+++ b/dev-python/ipyparallel/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>sci</herd>
+  <longdescription>
+  	Interactive Parallel Computing with IPython.
+    ipyparallel is the new home of IPython.parallel.
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">ipyparallel</remote-id>
+    <remote-id type="github">ipython/ipyparallel</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/ipython/Manifest b/dev-python/ipython/Manifest
index 49d8b3fe82d9..f26b3cc1a192 100644
--- a/dev-python/ipython/Manifest
+++ b/dev-python/ipython/Manifest
@@ -1 +1,2 @@
 DIST ipython-3.2.1.tar.gz 10884249 SHA256 c913adee7ae5b338055274c51a7d2b3cea468b5b316046fa520cd8a434b09177 SHA512 de7723e3b859d21a58a24456c76c8d8ec98c019f290f61269f46270e7647d2b49a98671138fecd75cb6f46384fde7e09618eb5c85c175e0e442c7fae7328d8fe WHIRLPOOL 9f020c167559259931dcb177d0c3a5211939632e5775c2627795ba390cf57bd62c378c15b7ee9b9ed2079180f8df8e062eb9673ed9cfc025a56f1da82c9428d1
+DIST ipython-4.0.1.tar.gz 6207566 SHA256 3bd3b78abc4f43b9ea7fa5353a2a9ba01af8ac4aec5d11e78fa5cbcec105432e SHA512 88419feca21c762a8553b4c11661e28b3305742fc89309abfd46b1213da210249b4781b754996835a2cc539569ae7cb816ed26bbaddbf15529eeb6479660265e WHIRLPOOL 58c17378fbcbac94e1585cce0cdd00996f7df20f5781a88e1e7d56b9fe2db81fe3282211dba31e8f54d2e50db869d2cce2670cfebc5c868455f481064e0089c6
diff --git a/dev-python/ipython/ipython-3.2.1-r1.ebuild b/dev-python/ipython/ipython-3.2.1-r1.ebuild
index f482b55a62bd..7af0634a3e50 100644
--- a/dev-python/ipython/ipython-3.2.1-r1.ebuild
+++ b/dev-python/ipython/ipython-3.2.1-r1.ebuild
@@ -114,12 +114,12 @@ python_test() {
 	# Failure of some modules only in python3.4 
 	local fail
 	run_tests() {
-		pushd ${TEST_DIR} > /dev/null
+		pushd ${TEST_DIR} > /dev/null || die
 		"${PYTHON}" -m IPython.testing.iptestcontroller --all || fail=1
-		popd > /dev/null
+		popd > /dev/null || die
 	}
 	VIRTUALX_COMMAND=run_tests virtualmake
-		[[ ${fail} ]] && die "Tests fail with ${EPYTHON}"
+	[[ ${fail} ]] && die "Tests fail with ${EPYTHON}"
 }
 
 python_install() {
diff --git a/dev-python/ipython/ipython-4.0.1.ebuild b/dev-python/ipython/ipython-4.0.1.ebuild
new file mode 100644
index 000000000000..bca38adcc44e
--- /dev/null
+++ b/dev-python/ipython/ipython-4.0.1.ebuild
@@ -0,0 +1,137 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
+PYTHON_REQ_USE='readline,sqlite,threads(+)'
+
+inherit distutils-r1 eutils virtualx
+
+DESCRIPTION="Advanced interactive shell for Python"
+HOMEPAGE="http://ipython.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples matplotlib mongodb notebook nbconvert qt4 +smp test wxwidgets"
+
+REQUIRED_USE="
+	test? ( doc matplotlib mongodb notebook nbconvert qt4 wxwidgets )
+	doc? ( mongodb )"
+
+CDEPEND="
+	dev-python/decorator[${PYTHON_USEDEP}]
+	dev-python/pexpect[${PYTHON_USEDEP}]
+	dev-python/pickleshare[${PYTHON_USEDEP}]
+	dev-python/pyparsing[${PYTHON_USEDEP}]
+	dev-python/simplegeneric[${PYTHON_USEDEP}]
+	dev-python/traitlets[${PYTHON_USEDEP}]
+	matplotlib? ( dev-python/matplotlib[${PYTHON_USEDEP}] )
+	mongodb? ( <dev-python/pymongo-3[${PYTHON_USEDEP}] )
+	wxwidgets? ( $(python_gen_cond_dep 'dev-python/wxpython:*[${PYTHON_USEDEP}]' python2_7) )"
+
+RDEPEND="${CDEPEND}
+	notebook? (
+		dev-python/notebook[${PYTHON_USEDEP}]
+		dev-python/ipywidgets[${PYTHON_USEDEP}]
+	)
+	nbconvert? ( dev-python/nbconvert[${PYTHON_USEDEP}] )
+	qt4? ( dev-python/qtconsole )"
+DEPEND="${CDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		app-text/dvipng
+		dev-python/jinja[${PYTHON_USEDEP}]
+		$(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/sphinx[${PYTHON_USEDEP}]
+		>=www-servers/tornado-4.0[${PYTHON_USEDEP}]
+		dev-python/testpath[${PYTHON_USEDEP}]
+		x11-base/xorg-server[xvfb]
+	)
+	doc? (
+		dev-python/cython[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/fabric[${PYTHON_USEDEP}]' python2_7)
+		>=dev-python/jsonschema-2.0[${PYTHON_USEDEP}]
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+		>=dev-python/nose-0.10.1[${PYTHON_USEDEP}]
+		dev-python/numpydoc[${PYTHON_USEDEP}]
+		dev-python/rpy[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.1[${PYTHON_USEDEP}]
+		>=www-servers/tornado-4.0[${PYTHON_USEDEP}]
+	)"
+
+PDEPEND="
+	smp? ( dev-python/ipyparallel[${PYTHON_USEDEP}] )"
+
+PATCHES=(
+	"${FILESDIR}"/2.1.0-substitute-files.patch
+	)
+
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_prepare_all() {
+	# Remove out of date insource files
+	rm IPython/extensions/rmagic.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_noapi
+}
+
+python_test() {
+	distutils_install_for_testing
+	# https://github.com/ipython/ipython/issues/8639
+	# Failure of some modules only in python3.4 
+	local fail
+	run_tests() {
+		pushd ${TEST_DIR} > /dev/null || die
+		"${PYTHON}" -m IPython.testing.iptestcontroller --all || fail=1
+		popd > /dev/null || die
+	}
+	VIRTUALX_COMMAND=run_tests virtualmake
+	[[ ${fail} ]] && die "Tests fail with ${EPYTHON}"
+}
+
+python_install() {
+	distutils-r1_python_install
+
+	# Create ipythonX.Y symlinks.
+	# TODO:
+	# 1. do we want them for pypy? No.  pypy has no numpy
+	# 2. handle it in the eclass instead (use _python_ln_rel).
+	# With pypy not an option the dosym becomes unconditional
+	dosym ../lib/python-exec/${EPYTHON}/ipython \
+		/usr/bin/ipython${EPYTHON#python}
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/build/html/. )
+	use examples && local EXAMPLES=( examples/. )
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature "sympyprinting" dev-python/sympy
+	optfeature "cythonmagic" dev-python/cython
+	optfeature "%lprun magic command" dev-python/line_profiler
+	optfeature "%mprun magic command" dev-python/memory_profiler
+	if use nbconvert; then
+		if ! has_version app-text/pandoc ; then
+			einfo "Node.js will be used to convert notebooks to other formats"
+			einfo "like HTML. Support for that is still experimental. If you"
+			einfo "encounter any problems, please use app-text/pandoc instead."
+		fi
+	fi
+}
diff --git a/dev-python/ipython_genutils/Manifest b/dev-python/ipython_genutils/Manifest
new file mode 100644
index 000000000000..2fed2a29b5cc
--- /dev/null
+++ b/dev-python/ipython_genutils/Manifest
@@ -0,0 +1 @@
+DIST ipython_genutils-0.1.0.tar.gz 22255 SHA256 3a0624a251a26463c9dfa0ffa635ec51c4265380980d9a50d65611c3c2bd82a6 SHA512 714f850783d5e3c042da409217c0e213cbce249a42fd689c3559745861a991fecb5dbf98a012a4186053d9bb7ca4d52dad742b676eeb5163bc4dfbf256181081 WHIRLPOOL 2696d088cd1f1a8faeb8fa847da8b41205b7823eae02813f2fa8769c392918b0d990007f451bb77704d732b7e700ef02b39144dc0a42db14c6399c076e5db91c
diff --git a/dev-python/ipython_genutils/ipython_genutils-0.1.0.ebuild b/dev-python/ipython_genutils/ipython_genutils-0.1.0.ebuild
new file mode 100644
index 000000000000..07d3b68e2de1
--- /dev/null
+++ b/dev-python/ipython_genutils/ipython_genutils-0.1.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Vestigial utilities from IPython"
+HOMEPAGE="https://github.com/ipython/ipython_genutils"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+DEPEND="
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}]
+	)
+	"
+
+python_test() {
+	nosetests --with-coverage --cover-package=ipython_genutils ipython_genutils || die
+}
diff --git a/dev-python/ipython_genutils/metadata.xml b/dev-python/ipython_genutils/metadata.xml
new file mode 100644
index 000000000000..20b9b7572014
--- /dev/null
+++ b/dev-python/ipython_genutils/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>sci</herd>
+  <longdescription>
+    This package contains some common utilities shared by Jupyter and
+    IPython projects during The Big Split. As soon as possible, those
+    packages will remove their dependency on this, and this repo will
+    go away. No packages outside IPython/Jupyter should depend on it.
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">ipython_genutils</remote-id>
+    <remote-id type="github">ipython/ipython_genutils</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/ipywidgets/Manifest b/dev-python/ipywidgets/Manifest
new file mode 100644
index 000000000000..4905000a44c3
--- /dev/null
+++ b/dev-python/ipywidgets/Manifest
@@ -0,0 +1 @@
+DIST ipywidgets-4.1.1.tar.gz 321646 SHA256 ceeb325e45ade9537c2d115fed9d522e5c6e90bb161592e2f0807375dc661028 SHA512 53b18ae432f72d3305333e92f488f62bb36f83d37fab59e4d103fb77a7ee266d03b96e6de4ffcc2a0f67d6fd892ed1d984c0b188d6cbd527ff3e950e885a5fe4 WHIRLPOOL e1ccb54416bd48fa451cd84f818595dcbe907a3bda79935d884b6f1f226167559cc24f1390d35f8b9a1e3a9af07da5c755c05e93729e27573d030d7ba2def3c3
diff --git a/dev-python/ipywidgets/ipywidgets-4.1.1.ebuild b/dev-python/ipywidgets/ipywidgets-4.1.1.ebuild
new file mode 100644
index 000000000000..55e339439efb
--- /dev/null
+++ b/dev-python/ipywidgets/ipywidgets-4.1.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="IPython HTML widgets for Jupyter"
+HOMEPAGE="http://ipython.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	dev-python/traitlets[${PYTHON_USEDEP}]
+	dev-python/ipykernel[${PYTHON_USEDEP}]
+	"
+DEPEND="${RDEPEND}
+	test? (
+		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7)
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}]
+	)
+	"
+
+python_test() {
+	nosetests --with-coverage --cover-package=ipywidgets ipywidgets || die
+}
diff --git a/dev-python/ipywidgets/metadata.xml b/dev-python/ipywidgets/metadata.xml
new file mode 100644
index 000000000000..71e3dc194126
--- /dev/null
+++ b/dev-python/ipywidgets/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>sci</herd>
+  <longdescription>
+  	Interactive HTML widgets for Jupyter notebooks and the IPython
+  	kernel.
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">ipywidgets</remote-id>
+    <remote-id type="github">ipython/ipywidgets</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/jupyter/Manifest b/dev-python/jupyter/Manifest
new file mode 100644
index 000000000000..4ba519e9300d
--- /dev/null
+++ b/dev-python/jupyter/Manifest
@@ -0,0 +1 @@
+DIST jupyter-1.0.0.tar.gz 12916 SHA256 d9dc4b3318f310e34c82951ea5d6683f67bed7def4b259fafbfe4f1beb1d8e5f SHA512 1f0bc83f7a127c98ccf4b3868814116aa272ea5d0baac52d7a022305af7e2da28ca2b90fa3554ff085d8df3eb6d8b8cde80bf02b8e66064c59900b926d73c520 WHIRLPOOL c648e494556f6d5d3a42594bb4c2fd5701b2f993cf467d6011f67141de2e80d6cccf1adfcfcda6445d8325604e67d6af4465b6e2d79443de67512a2a29360855
diff --git a/dev-python/jupyter/jupyter-1.0.0.ebuild b/dev-python/jupyter/jupyter-1.0.0.ebuild
new file mode 100644
index 000000000000..7dfd0060b397
--- /dev/null
+++ b/dev-python/jupyter/jupyter-1.0.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Jupyter metapackage. Install all the Jupyter components in one go"
+HOMEPAGE="http://jupyter.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc"
+
+RDEPEND="
+	dev-python/notebook[${PYTHON_USEDEP}]
+	dev-python/qtconsole[${PYTHON_USEDEP}]
+	dev-python/jupyter_console[${PYTHON_USEDEP}]
+	dev-python/nbconvert[${PYTHON_USEDEP}]
+	dev-python/ipykernel[${PYTHON_USEDEP}]
+	dev-python/ipywidgets[${PYTHON_USEDEP}]"
+DEPEND="doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+
+python_prepare_all() {
+	# 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_install_all() {
+	use doc && HTML_DOCS=( "${S}"/docs/build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/jupyter/metadata.xml b/dev-python/jupyter/metadata.xml
new file mode 100644
index 000000000000..00118fe11137
--- /dev/null
+++ b/dev-python/jupyter/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>sci</herd>
+  <longdescription>
+Install the Jupyter system, including the notebook, qtconsole, and the IPython kernel.
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">jupyter</remote-id>
+    <remote-id type="github">jupyter/jupyter</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/jupyter_client/Manifest b/dev-python/jupyter_client/Manifest
new file mode 100644
index 000000000000..8f39d7e3bf58
--- /dev/null
+++ b/dev-python/jupyter_client/Manifest
@@ -0,0 +1 @@
+DIST jupyter_client-4.1.1.tar.gz 250227 SHA256 ff1ef5c6c3031a62db46ec6329867b4cb1595e6102a7819b3b5252b0c524bdb8 SHA512 08104fef5fd2522944ac5f1b2140a8267ffd97b0dba518f9fa792c08102ff8dbc4def592150433dfd893aed3596876ff254c9ea17b9b2e7a9622f773bd9d2606 WHIRLPOOL d7164a07a43c5d6cd78b30bedb6ec8e8bc367cca4ddf920fee27edc9337d6f1124ae840546d90d47ad1c0a84bd1677e452925c022cebfa5556c499f7fa8ee18d
diff --git a/dev-python/jupyter_client/jupyter_client-4.1.1.ebuild b/dev-python/jupyter_client/jupyter_client-4.1.1.ebuild
new file mode 100644
index 000000000000..4549973940c2
--- /dev/null
+++ b/dev-python/jupyter_client/jupyter_client-4.1.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Jupyter protocol implementation and client libraries"
+HOMEPAGE="http://jupyter.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	dev-python/traitlets[${PYTHON_USEDEP}]
+	dev-python/jupyter_core[${PYTHON_USEDEP}]
+	>=dev-python/pyzmq-14.4.0[${PYTHON_USEDEP}]
+	"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7)
+		dev-python/ipykernel[${PYTHON_USEDEP}]
+	)
+	"
+
+python_test() {
+	nosetests --with-coverage jupyter_client || die
+}
diff --git a/dev-python/jupyter_client/metadata.xml b/dev-python/jupyter_client/metadata.xml
new file mode 100644
index 000000000000..6c569595fd80
--- /dev/null
+++ b/dev-python/jupyter_client/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>sci</herd>
+  <longdescription>
+    Contains the reference implementation of the Jupyter protocol. It
+    also provides client and kernel management APIs for working with
+    kernels. It also provides the jupyter kernelspec entrypoint for
+    installing kernelspecs for use with Jupyter frontends.
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">jupyter_client</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/jupyter_console/Manifest b/dev-python/jupyter_console/Manifest
new file mode 100644
index 000000000000..bb6efd81b3df
--- /dev/null
+++ b/dev-python/jupyter_console/Manifest
@@ -0,0 +1 @@
+DIST jupyter_console-4.0.3.tar.gz 22090 SHA256 555be6963a8f6431fbe1d424c7ffefee90824758058e4c9a2ab3aa045948eb85 SHA512 da9c311d881bbf61fbcea3c79e4dbdbe00f0f713772d0da4d30e0dec36ff5a6c5cbff3b996770f532c1e9c61ade1b1bf7a6f1ed28188ffd6900f6cc2ce7c0665 WHIRLPOOL 37139a87b182b9100284766ffb6e0b4c4e44b9bc2261a2d466920b0a23cf62d55f6a68cfb77da67a2eb3c316582fa7afaddcce69074b7597122e1c858c9a6c26
diff --git a/dev-python/jupyter_console/jupyter_console-4.0.3.ebuild b/dev-python/jupyter_console/jupyter_console-4.0.3.ebuild
new file mode 100644
index 000000000000..a3fde6e24bdd
--- /dev/null
+++ b/dev-python/jupyter_console/jupyter_console-4.0.3.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
+
+inherit distutils-r1
+
+DESCRIPTION="A terminal-based console frontend for Jupyter kernels"
+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-python/ipython[${PYTHON_USEDEP}]
+	dev-python/ipykernel[${PYTHON_USEDEP}]
+	dev-python/jupyter_client[${PYTHON_USEDEP}]
+	"
+DEPEND="${RDEPEND}
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7)
+		dev-python/pexpect[${PYTHON_USEDEP}]
+		>=dev-python/nose-0.10.1[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}]
+	)
+	"
+
+python_prepare_all() {
+	# Prevent un-needed download during build
+	if use doc; then
+		sed -e "/^    'sphinx.ext.intersphinx',/d" -i docs/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=jupyter_console jupyter_console || die
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/jupyter_console/metadata.xml b/dev-python/jupyter_console/metadata.xml
new file mode 100644
index 000000000000..a069311d1416
--- /dev/null
+++ b/dev-python/jupyter_console/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>sci</herd>
+  <longdescription>
+    A terminal-based console frontend for Jupyter kernels.
+    This code is based on the single-process IPython terminal.
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">jupyter_console</remote-id>
+    <remote-id type="github">jupyter/jupyter_console</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/jupyter_core/Manifest b/dev-python/jupyter_core/Manifest
new file mode 100644
index 000000000000..e12c074e7c3b
--- /dev/null
+++ b/dev-python/jupyter_core/Manifest
@@ -0,0 +1 @@
+DIST jupyter_core-4.0.6.tar.gz 55060 SHA256 96a68a3b1d018ff7776270b26b7cb0cfd7a18a53ef2061421daff435707d198c SHA512 e6d7a0293ce6cdd3202b354aae62900683eb0474590980bf3d9c6f89b4b16182e7caee0e42c3feb3de5851535a01394b20725d9428eb105dbc2c34d90e0d398b WHIRLPOOL c1370d386c63665db1a47f1df0e3942c713b4f9e71ad5a2bd8c83bcf1b5dfe937fdadcd606335a989514499b9e6446d92a0bb250b9e972181b12d0d9423ee80a
diff --git a/dev-python/jupyter_core/jupyter_core-4.0.6.ebuild b/dev-python/jupyter_core/jupyter_core-4.0.6.ebuild
new file mode 100644
index 000000000000..4fd42c687bb7
--- /dev/null
+++ b/dev-python/jupyter_core/jupyter_core-4.0.6.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Core common functionality of Jupyter projects"
+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-python/traitlets[${PYTHON_USEDEP}]
+	"
+DEPEND="${RDEPEND}
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7)
+	)
+	"
+
+python_prepare_all() {
+	# Prevent un-needed download during build
+	if use doc; then
+		sed -e "/^    'sphinx.ext.intersphinx',/d" -i docs/conf.py || die
+	fi
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	distutils_install_for_testing
+	cd "${TEST_DIR}"/lib || die
+	py.test jupyter_core || die
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/jupyter_core/metadata.xml b/dev-python/jupyter_core/metadata.xml
new file mode 100644
index 000000000000..07c5e187e973
--- /dev/null
+++ b/dev-python/jupyter_core/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>sci</herd>
+  <longdescription>
+    Core common functionality of Jupyter projects.
+    This package contains base application classes and configuration
+    inhertited by other projects. It doesn't do much on its own.
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">jupyter_core</remote-id>
+    <remote-id type="github">jupyter/jupyter_core</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/nbconvert/Manifest b/dev-python/nbconvert/Manifest
new file mode 100644
index 000000000000..18314c5481ef
--- /dev/null
+++ b/dev-python/nbconvert/Manifest
@@ -0,0 +1 @@
+DIST nbconvert-4.1.0.tar.gz 263948 SHA256 e0296e45293dd127d028f678e3b6aba3f1db3283a134178bdb49eea402d4cf1c SHA512 9761cf8cdf206bd8f27c666d7b520cbd7d805353cf46b212b46ee6053b47ec6728a5926dfe59acef109c8770580c41d51aa5b943a27e72bccecc68a7d7b68bfb WHIRLPOOL 9cc27a45b00ee9914674cd14a279be1691eb8a8538803bdda127513f56dd0ce53b10745f305f8fb82abd2d19efe7c1b0284bf05f8088360d2def6c97db0c1c6e
diff --git a/dev-python/nbconvert/metadata.xml b/dev-python/nbconvert/metadata.xml
new file mode 100644
index 000000000000..19af6126203f
--- /dev/null
+++ b/dev-python/nbconvert/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>sci</herd>
+  <longdescription>
+    Jupyter NBConvert converts Jupyter notebooks to various other
+    formats via Jinja templates.
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">nbconvert</remote-id>
+    <remote-id type="github">jupyter/nbconvert</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/nbconvert/nbconvert-4.1.0.ebuild b/dev-python/nbconvert/nbconvert-4.1.0.ebuild
new file mode 100644
index 000000000000..c6973b8f0030
--- /dev/null
+++ b/dev-python/nbconvert/nbconvert-4.1.0.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
+
+inherit distutils-r1
+
+MY_PN="nbconvert"
+
+DESCRIPTION="Converting Jupyter Notebooks"
+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"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.0.0-docs-Makefile.patch
+)
+
+RDEPEND="
+	dev-python/jupyter_core[${PYTHON_USEDEP}]
+	dev-python/nbformat[${PYTHON_USEDEP}]
+	dev-python/mistune[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	dev-python/traitlets[${PYTHON_USEDEP}]
+	"
+DEPEND="${RDEPEND}
+	doc? (
+		dev-python/ipython[${PYTHON_USEDEP}]
+		dev-python/jupyter_client[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		app-text/pandoc
+	)
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/ipykernel[${PYTHON_USEDEP}]
+	)
+	"
+
+python_prepare_all() {
+	# 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() {
+	distutils_install_for_testing
+	cd "${TEST_DIR}"/lib || die
+	nosetests --with-coverage --cover-package=nbconvert nbconvert || die
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( docs/build/html/. )
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	if ! has_version app-text/pandoc ; then
+		einfo "Pandoc is required for converting to formats other than Python,"
+		einfo "HTML, and Markdown. If you need this functionality, install"
+		einfo "app-text/pandoc."
+	fi
+}
diff --git a/dev-python/nbformat/Manifest b/dev-python/nbformat/Manifest
new file mode 100644
index 000000000000..f866283e2153
--- /dev/null
+++ b/dev-python/nbformat/Manifest
@@ -0,0 +1 @@
+DIST nbformat-4.0.1.tar.gz 105767 SHA256 5261c957589b9dfcd387c338d59375162ba9ca82c69e378961a1f4e641285db5 SHA512 f73e8cffc61825aa8b7b0ef3b842cba51baf2cdf0c5d0035e2e7cb51f71c6c819f09201367a3b342c2736492dee1e78c519961aaea8f2cc4b5e69a1545085d2a WHIRLPOOL 9b08003c456e00c529b7bf8e786d57a583e53e5a1e7e9eb4c3cc492c5b1d60e76579c9102e6c56749d546a9a124d475687d4ec1d71e0f3634698d5e30499db93
diff --git a/dev-python/nbformat/metadata.xml b/dev-python/nbformat/metadata.xml
new file mode 100644
index 000000000000..cf2dd6b8fd9d
--- /dev/null
+++ b/dev-python/nbformat/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>sci</herd>
+  <longdescription>
+    Jupyther nbformat contains the reference implementation of the
+    Jupyter Notebook format, and Python APIs for working with
+    notebooks. There is also a JSON schema for notebook format
+    versions &gt;= 3.
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">nbformat</remote-id>
+    <remote-id type="github">jupyter/nbformat</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/nbformat/nbformat-4.0.1.ebuild b/dev-python/nbformat/nbformat-4.0.1.ebuild
new file mode 100644
index 000000000000..d85d2be0e9f4
--- /dev/null
+++ b/dev-python/nbformat/nbformat-4.0.1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
+PYTHON_REQ_USE='sqlite'
+
+inherit distutils-r1
+
+DESCRIPTION="Reference implementation of the Jupyter Notebook format"
+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-python/jsonschema[${PYTHON_USEDEP}]
+	dev-python/ipython_genutils[${PYTHON_USEDEP}]
+	dev-python/traitlets[${PYTHON_USEDEP}]
+	dev-python/jupyter_core[${PYTHON_USEDEP}]
+	"
+DEPEND="${RDEPEND}
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/numpydoc[${PYTHON_USEDEP}]
+	)
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}]
+	)
+	"
+
+python_prepare_all() {
+	# Prevent un-needed download during build
+	if use doc; then
+		sed -e "/^    'sphinx.ext.intersphinx',/d" -i docs/conf.py || die
+	fi
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	distutils_install_for_testing
+	cd "${TEST_DIR}"/lib || die
+	nosetests --with-coverage --cover-package=nbformat nbformat || die
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/notebook/Manifest b/dev-python/notebook/Manifest
new file mode 100644
index 000000000000..896c9f68e4e1
--- /dev/null
+++ b/dev-python/notebook/Manifest
@@ -0,0 +1 @@
+DIST notebook-4.0.6.tar.gz 6705277 SHA256 f62e7a6afbc00bab3615b927595d27b1874cff3218bddcbab62f97f6dae567c3 SHA512 9ce9ca21adcb967725aeb7a18543ace8aca4e88497d3d2fd708a603511e8ef4a932b39337d134d684df03b273bbc442958a37ced8cd499cb7b97a1c29758eeb0 WHIRLPOOL 764afabfa220d37e048a359952bd9cc4de0b791de782ed7cf2a22e8c0e9719b39630fd5c1c7acbf163715924662805f92b406bf6198600f2c4a35d239a12df11
diff --git a/dev-python/notebook/metadata.xml b/dev-python/notebook/metadata.xml
new file mode 100644
index 000000000000..d82c21c4251f
--- /dev/null
+++ b/dev-python/notebook/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>sci</herd>
+  <longdescription>
+    The Jupyter HTML notebook is a web-based notebook environment
+    for interactive computing.
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">notebook</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/notebook/notebook-4.0.6.ebuild b/dev-python/notebook/notebook-4.0.6.ebuild
new file mode 100644
index 000000000000..234d816a61d8
--- /dev/null
+++ b/dev-python/notebook/notebook-4.0.6.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,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/pickleshare/Manifest b/dev-python/pickleshare/Manifest
new file mode 100644
index 000000000000..79e862d1c6a4
--- /dev/null
+++ b/dev-python/pickleshare/Manifest
@@ -0,0 +1 @@
+DIST pickleshare-0.5.tar.gz 4441 SHA256 c0be5745035d437dbf55a96f60b7712345b12423f7d0951bd7d8dc2141ca9286 SHA512 1021b76591b5b1d6c777e03c9544fea63602f719b786a2a2e73590f8e8275156fa69b336adf81a6e8abcaad2263eacd76ce4abf2ceff04126ff6b1ffd96cb4e3 WHIRLPOOL 07907feb8dab2dfbfc74e43d17cc076027ab450091a8dd4af197019c6c46e268eda1d5761ab22fc774e37090ab7d51212d82ba284d89018fbc0f52c38f235c62
diff --git a/dev-python/pickleshare/metadata.xml b/dev-python/pickleshare/metadata.xml
new file mode 100644
index 000000000000..ea703f9fdaee
--- /dev/null
+++ b/dev-python/pickleshare/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>sci</herd>
+  <longdescription>
+    Like shelve, a PickleShareDB object acts like a normal dictionary.
+    Unlike shelve, many processes can access the database
+    simultaneously. Changing a value in database is immediately visible
+    to other processes accessing the same database.
+    Concurrency is possible because the values are stored in separate
+    files. Hence the "database" is a directory where all files are
+    governed by PickleShare.
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">pickleshare</remote-id>
+    <remote-id type="github">pickleshare/pickleshare</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/pickleshare/pickleshare-0.5.ebuild b/dev-python/pickleshare/pickleshare-0.5.ebuild
new file mode 100644
index 000000000000..7fd09f4e3d37
--- /dev/null
+++ b/dev-python/pickleshare/pickleshare-0.5.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
+
+inherit distutils-r1
+
+DESCRIPTION="A small 'shelve' like datastore with concurrency support"
+HOMEPAGE="https://github.com/pickleshare/pickleshare"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	dev-python/path-py[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+# test_pickleshare.py is not included in the pickleshare-0.5 source
+# we fetched from pipy
+RESTRICT="test"
+
+python_test() {
+	distutils_install_for_testing
+	cd "${TEST_DIR}"/lib || die
+	cp "${S}"/test_pickleshare.py "${TEST_DIR}"/lib/ || die
+	py.test || die
+}
diff --git a/dev-python/qtconsole/Manifest b/dev-python/qtconsole/Manifest
new file mode 100644
index 000000000000..cc3f3c2f67bd
--- /dev/null
+++ b/dev-python/qtconsole/Manifest
@@ -0,0 +1 @@
+DIST qtconsole-4.1.1.tar.gz 406257 SHA256 741906acae9e02c0df9138ac88b621ef22e438565aa96d783a9ef88faec3de46 SHA512 2848eb8d3a8816a47ca422b24837372899864e750336509f3d8444333d0783bae46b9917258cab14d4e09d91d5068a7772fb849a267e1a7d6e282c7c75e9f4e9 WHIRLPOOL 1a3a638be2bdea3f9ab6d625edd110ef698a84cfdf3b1f4101375faf8ed60a0e8e9ab6e297575dab8e2e6389107ba62a6bb338c78934780e19dd4c498aee9eb9
diff --git a/dev-python/qtconsole/metadata.xml b/dev-python/qtconsole/metadata.xml
new file mode 100644
index 000000000000..0f494057d03a
--- /dev/null
+++ b/dev-python/qtconsole/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>sci</herd>
+  <longdescription>
+    A rich Qt-based console for working with Jupyter kernels,
+    supporting rich media output, session export, and more.
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">qtconsole</remote-id>
+    <remote-id type="github">jupyter/qtconsole</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/qtconsole/qtconsole-4.1.1.ebuild b/dev-python/qtconsole/qtconsole-4.1.1.ebuild
new file mode 100644
index 000000000000..6c2304247892
--- /dev/null
+++ b/dev-python/qtconsole/qtconsole-4.1.1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Qt-based console for Jupyter with support for rich media output"
+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-python/ipykernel[${PYTHON_USEDEP}]
+	>=dev-python/jupyter_client-4.1.1[${PYTHON_USEDEP}]
+	"
+DEPEND="${RDEPEND}
+	doc? (
+		>=dev-python/ipython-4.0.0-r2[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.3.1-r1[${PYTHON_USEDEP}]
+	)
+	test? (
+		>=dev-python/nose-0.10.1[${PYTHON_USEDEP}]
+	)
+	|| (
+		dev-python/pyside[${PYTHON_USEDEP},svg]
+		dev-python/PyQt4[${PYTHON_USEDEP},svg]
+		dev-python/PyQt5[${PYTHON_USEDEP},svg]
+	)
+	dev-python/pygments[${PYTHON_USEDEP}]
+	>=dev-python/pyzmq-13[${PYTHON_USEDEP}]
+	"
+PDEPEND="dev-python/ipython[${PYTHON_USEDEP}]"
+
+python_prepare_all() {
+	# 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 qtconsole qtconsole || die
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( docs/build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/testpath/Manifest b/dev-python/testpath/Manifest
new file mode 100644
index 000000000000..665ec38706da
--- /dev/null
+++ b/dev-python/testpath/Manifest
@@ -0,0 +1 @@
+DIST testpath-0.2.tar.gz 13732 SHA256 a5388cc7c8370b1f11298c1d513b3d2b9e2f390607a7c39963e6e3ba9f1b7012 SHA512 cc211bdc8f31ff4c286324e37bbce7fd84e19447d9735f396ce67f7568dd1d133be732c1fd7a08928c94566279d0f293a0caeed6a58ae6cd3dc293035fe164ea WHIRLPOOL 6b87b1c5ba590e6b19968e823dee22d7bbe0411124c1290593eb5efd78b5af06c51853d3359f339c4ca60b2842c409a1fcd0ff45c59f2e7e07f557534d78fcaa
diff --git a/dev-python/testpath/files/testpath-0.2-setup.py.patch b/dev-python/testpath/files/testpath-0.2-setup.py.patch
new file mode 100644
index 000000000000..065e8e5e85ad
--- /dev/null
+++ b/dev-python/testpath/files/testpath-0.2-setup.py.patch
@@ -0,0 +1,28 @@
+Patch to bring back setup.py from
+https://github.com/jupyter/testpath/blob/086bd1bd1ec7da1b3dacfed1705c0c99fae231b3/setup.py
+--- /dev/null
++++ setup.py
+@@ -0,0 +1,22 @@
++from distutils.core import setup
++
++with open("README.rst", "r") as f:
++    readme = f.read()
++
++setup(name='testpath',
++      version='0.1',
++      description='Test utilities for code working with files and commands',
++      long_description = readme,
++      author='Thomas Kluyver',
++      author_email='thomas@kluyver.me.uk',
++      url='https://github.com/takluyver/testpath',
++      packages=['testpath'],
++      classifiers=[
++          'Intended Audience :: Developers',
++          'License :: OSI Approved :: MIT License',
++          'Programming Language :: Python',
++          'Programming Language :: Python :: 2',
++          'Programming Language :: Python :: 3',
++          'Topic :: Software Development :: Testing',
++      ]
++)
+\ No newline at end of file
diff --git a/dev-python/testpath/metadata.xml b/dev-python/testpath/metadata.xml
new file mode 100644
index 000000000000..4db1c842b5ba
--- /dev/null
+++ b/dev-python/testpath/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>sci</herd>
+  <longdescription>
+    Testpath is a collection of utilities for Python code working with
+    files and commands. It contains functions to check things on the
+    filesystem, and tools for mocking system commands and recording
+    calls to those.
+  </longdescription>
+  <upstream>
+    <remote-id type="github">jupyter/testpath</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/testpath/testpath-0.2.ebuild b/dev-python/testpath/testpath-0.2.ebuild
new file mode 100644
index 000000000000..e5140c0f72f4
--- /dev/null
+++ b/dev-python/testpath/testpath-0.2.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Test utilities for code working with files and commands"
+HOMEPAGE="http://jupyter.org"
+SRC_URI="https://github.com/jupyter/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+DEPEND="
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		virtual/python-pathlib[${PYTHON_USEDEP}]
+	)
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	"
+
+PATCHES=(
+	"${FILESDIR}/${P}"-setup.py.patch
+	)
+
+python_prepare_all() {
+	# Prevent un-needed download during build
+	if use doc; then
+		sed -e "/^    'sphinx.ext.intersphinx',/d" -i doc/conf.py || die
+	fi
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C doc html
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( doc/_build/html/. )
+	distutils-r1_python_install_all
+	}
+
+python_test() {
+	distutils_install_for_testing
+	cd "${TEST_DIR}"/lib || die
+	cp -r "${S}"/tests "${TEST_DIR}"/lib/ || die
+	py.test || die
+}
diff --git a/dev-python/traitlets/Manifest b/dev-python/traitlets/Manifest
new file mode 100644
index 000000000000..76dd32ce482a
--- /dev/null
+++ b/dev-python/traitlets/Manifest
@@ -0,0 +1 @@
+DIST traitlets-4.0.0.tar.gz 63701 SHA256 0b140b4a94a4f1951887d9bce4650da211f79600fc9fdb422acc90c5bbe0233b SHA512 559730dbe9f5f0e75c867cd514c91a3e862a23a9e019d3883b4be66b6208980a583f39cceca4f20e409bd44335a367e7fd5654db0128bb7a735311e6b2c32f24 WHIRLPOOL 492a7a561649ea1a43ce5f45abf13e74d8ace7937e2cf0956b00fe1f650a541af8da0df5d8327bb071c4f03650a44c7ca548e8c61ccf95cea557516fa6d5b862
diff --git a/dev-python/traitlets/metadata.xml b/dev-python/traitlets/metadata.xml
new file mode 100644
index 000000000000..ee1858d6af30
--- /dev/null
+++ b/dev-python/traitlets/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>sci</herd>
+  <longdescription>
+    A lightweight pure-Python derivative of Enthought Traits,
+    used for configuring Python objects. This package powers
+    the config system of IPython and Jupyter.
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">traitlets</remote-id>
+    <remote-id type="github">ipython/traitlets</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/traitlets/traitlets-4.0.0.ebuild b/dev-python/traitlets/traitlets-4.0.0.ebuild
new file mode 100644
index 000000000000..5a9720663b43
--- /dev/null
+++ b/dev-python/traitlets/traitlets-4.0.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
+
+inherit distutils-r1
+
+DESCRIPTION="A configuration system for Python applications"
+HOMEPAGE="https://github.com/ipython/traitlets"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+RDEPEND="
+	dev-python/decorator[${PYTHON_USEDEP}]
+	dev-python/ipython_genutils[${PYTHON_USEDEP}]
+	"
+DEPEND="
+	doc? (
+		dev-python/ipython_genutils[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+	)
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}]
+	)"
+
+python_prepare_all() {
+	# 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 traitlets traitlets || die
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( docs/build/html/. )
+	distutils-r1_python_install_all
+}