Backport vulnerability fix, bug #552816; drop vulnerable versions; create mathjax symlink USE dependent, bug #481726

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0xE9402A79B03529A2!

6 files changed, 75 insertions, 185 deletions

diff --git a/dev-python/ipython/ChangeLog b/dev-python/ipython/ChangeLog
index 7933f75d4b62..24eab59e10f1 100644
--- a/dev-python/ipython/ChangeLog
+++ b/dev-python/ipython/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for dev-python/ipython
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/ipython/ChangeLog,v 1.173 2015/06/21 10:42:13 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/ipython/ChangeLog,v 1.174 2015/06/22 09:45:52 jlec Exp $
+
+*ipython-3.2.0 (22 Jun 2015)
+*ipython-2.2.0-r1 (22 Jun 2015)
+
+  22 Jun 2015; Justin Lecher <jlec@gentoo.org>
+  +files/ipython-2.2.0-login-backport.patch, +ipython-2.2.0-r1.ebuild,
+  +ipython-3.2.0.ebuild, -ipython-2.4.1.ebuild, -ipython-3.0.0.ebuild,
+  -ipython-3.1.0.ebuild:
+  Backport vulnerability fix, bug #552816; drop vulnerable versions; create
+  mathjax symlink USE dependent, bug #481726
 
   21 Jun 2015; Markus Meier <maekke@gentoo.org> ipython-3.1.0.ebuild:
   add ~arm, bug #541628
diff --git a/dev-python/ipython/Manifest b/dev-python/ipython/Manifest
index 2c52f69ad469..828f24612e09 100644
--- a/dev-python/ipython/Manifest
+++ b/dev-python/ipython/Manifest
@@ -1,22 +1,32 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX 2.1.0-disable-tests.patch 1219 SHA256 e57afec15a63758a53bc8243cdcbeb0f5bdc3809fd3a47bd3328e5eb3246a996 SHA512 e049c8ba0b20ee57d9290e4a92378cd0cf4d323d90d199bca7bbf442ab158bbb31e1e2258c154bc26ff3fac08b7b0d19d56eb66e404d179d04178cd5aeeb9105 WHIRLPOOL 1b77f98bc754af7e7b0c510c618e61e546d306b0c3f14bd0e1410eb03239fd2dcb294c60a76c26da0dd39ab7899251180d6536c97400f63bd243fdc909009c71
 AUX 2.1.0-substitute-files.patch 1017 SHA256 5547660171b6a92145aed499bc0ccfafd079a1f86db86eac05baf60b39f6a15e SHA512 fc4c9e12267ac5f04a2e16ad27334a093638538b8149ff380099fcbeb674a276ab9eb624a508010e37f82c05d5f7ab527a80e386b3e7b61c123ecb8effd9d542 WHIRLPOOL 581a456407b325d554689c9ad99ce6ee969468a41351e80f81b846267a97dca6cdf1052ab87088b42cd7d8445d73c17d5a99093f385e5e5e3640b5a10547ffe9
+AUX ipython-2.2.0-login-backport.patch 1630 SHA256 88c1780822a38ead284b9a5f2c164921c9c2bc80156985d0f045005e5638dafe SHA512 da20803d65fd0adbc722360df812898c5899fcc18414b261d774eb745c0fa11c870251b5b7abd748a6da7c11d84896d544be1affb0ae49639a3891421fae4401 WHIRLPOOL 8cdd4257cff58d56b1683a328a9a05208e242af17425acb07b93d5be563afd49cdebc57e643d8710254895c917cc0b0aaf470509ecd45e10ebc305160ecb19ae
 DIST ipython-2.2.0.tar.gz 11912007 SHA256 b7ca77ba54a02f032055b73f5f62b01431f818ae00f63716b78f881c2b2564e2 SHA512 4953bf5e9d6d5c6ad538d07d62b5b100fd86a37f6b861238501581c0059bd4655345ca05cf395e79709c38ce4cb9c6293f5d11ac0252a618ad8272b161140d13 WHIRLPOOL a5e433a3a840b65fd0644f023cc9e93862e48a906e4e9d1596ebbd24290d486be580dca017ef1586da980b6792dcd7ed9aab4af81421bbf083d885927db6fcc8
-DIST ipython-2.4.1.tar.gz 11896092 SHA256 6d350b5c2d3e925b0ff6167658812d720b891e476238d924504e2f7f483e9217 SHA512 a9cffc08ba10c47b0371b05664e55eee0562a30ef0d4bbafae79e52e5b9727906c45840c0918122c06c5672ac65e6eb381399f103e1a836aca003eda81b2acde WHIRLPOOL 08fa111b1f3c2a1ba055cd8e84c3a0eaa2efccd7509e1c752506bebe255d139f54182bd7ab194cce71091b85cc9492afbfd6337dcd5eb5a44353a6d9cf301472
-DIST ipython-3.0.0.tar.gz 10867678 SHA256 86070141110101b6b55e6dc31a40461c437d391a5337a6e5e349357dc18bfbb4 SHA512 47d515416e49590a8a5099d542a1f89a62b4eb6cf481bd29e702d37f87f974b480ea0b808135cae97f7d56bb429399ce190aa7bd03df8bac374dc13f6ec6ef49 WHIRLPOOL 305e766dcc31a0a76035d1532003d21f4d7b659299d0e6bbb896ae56d17fa6050c82e8fdfd7717748fb7ebb0691462f10211c13e419388abe060d407a4e5ced2
-DIST ipython-3.1.0.tar.gz 10915828 SHA256 532092d3f06f82b1d8d1e5c37097eae19fcf025f8f6a4b670dd49c3c338d5624 SHA512 9b67d41c8bfaf855b9c8df29334f8bebd124d94ae6eb56cae8d90c31010825a99ad3136f7fd60f5adef77f88017daadd706f6bf9e7b7875aba2321b25670aa96 WHIRLPOOL 5857b8173990a7e3e62990a9c0b57c5c8bdbc0d3269692eddb4e8592d49a30f97ebc078d57dd9e78e439fdbbd592d64d806208b8cfc525145e29bd861c720802
+DIST ipython-3.2.0.tar.gz 10883925 SHA256 8e64b441e16298c08025b826126b2d7bc5c1776d2d2f071672166f615f327887 SHA512 d298f8ce09f7bd98bf11156c0f34816ce846dc3e6a511d354f0905300af99e15f5be46547766207f1121bd11850456a20262626a8a22be1ffc756eb84f5a982c WHIRLPOOL 482d1c22199aff6bbb9ea23f12fd50e0c8f221bbf43f1779e1739e6d637e7a6f9edd8d4b60263cc3292746f2833a28d72e6282755b046668c96882002dd73134
+EBUILD ipython-2.2.0-r1.ebuild 4010 SHA256 26ff9618e96862507ac050d98586d6815f92938f21ecbb2c929392e787c2d64a SHA512 002f7a791d4b7b0ad745ff9ff3efcc3760764ab18972a2543c229eba64d957dea215fac709b1e153fbbd831985c9078a46870983567e89b9df5d74752d483b2b WHIRLPOOL 0f34dac87892ba70ebe1e4869a6623db391bca032687f989ebfe09ffa10dce0ec65bdc68f7ca046d9e3d6c1086c8d9598eba169d696dabd83bac65b984bce9fa
 EBUILD ipython-2.2.0.ebuild 3977 SHA256 df3bfd28c877aee2c2d43c99f30e7ef5619d8cc31310c46aa8cf6156d84b8bb3 SHA512 8c7ebb76c982b8329e7d9c6614c960c854b4c83d1465ebc49310ee0e4da78bdb36f0a871f4e0a560b59753277142a6fe97be8b3e36eeaf6e67c5a1ae5694b4b4 WHIRLPOOL b8b222b964c431c22e6f4c4b843149b73514e1ea0672528a98f9b32fc8eb2e7fb6ef175a84335427878cfad7f356679118313e1217bf3862769d786124c0f328
-EBUILD ipython-2.4.1.ebuild 4425 SHA256 2fd959f6462291529555396a9c2b27767fca22e2505b8be28fa62488af6be08c SHA512 d254ccb8a94dcd6fe4544df4298a3663e044e8a8f3b5e33079f52436be4ed9f804d5154b339ee81d99448122025f001cf54172df2197850af097ef16eb3f34f3 WHIRLPOOL 177647e84b0c9739fba332b961538a8220f768464fa1d1520f083998012f4637cdffb13ed4e3585dfa69b2cf8117d71f0a19c4ca4df5a2b0815cc0e4b315813d
-EBUILD ipython-3.0.0.ebuild 4726 SHA256 76ca40bcd66138f0508d03dbec6157aee4ad098b0bde2edf4bc82df982385799 SHA512 2747f62a1ccaaa79788fbea01290a1fc5453a8967fb2d2693f646a257ff646fbef44b02f57ac96292a0f01e5c47bfe3e07a4ff7da5bc5d66ddf6ba5b83def0be WHIRLPOOL 467944ec673368fc5e23e9e63e83283b958c7f1181d895384bc8cc98a34e63d43cab454cfefab14da30778c9e20509a332ea308d5cf444450365af8e152bff9e
-EBUILD ipython-3.1.0.ebuild 4780 SHA256 7137d71c62ea09c57281a010dadc652bdd8fdd99f8bd984339b0ec2d0314d295 SHA512 a6d3f89a7bc7a91554fe0600ff7346642263bb44d89e516a9f55709d336181213ddccedeb9b7de80ab838fec66d1f663047a3ec47e5b663c85654e28c4ff73b7 WHIRLPOOL b3f508a198f64c3b2d865391a72458ea19e52928c6f141d86663544838c40d95ac65bacbe6604e6c707298e73c01c01b0578b03381282d3be375baabb21728b4
-MISC ChangeLog 26519 SHA256 116b10a9c6d4832e6494678a03627cd396511bb87eecfa99a71a69706112fdef SHA512 22f5e67c849e651cbfb8f336795340ce1c53fef0dbd4add685369e595b908fb429680654ea9e9457561a0e3a90389b1343c522ff40f338df712a69ea9e209bbf WHIRLPOOL 6767a5d48f992e0fc2cea0322839b7812f8e2b9f131e686ffb15f52e9f39d9498ad26fc6a819f30985983693ac7a710edc84fe2291e0cdd060c79be728db3e3b
+EBUILD ipython-3.2.0.ebuild 4763 SHA256 e82a00e1f2bb4507344b490364454df1351b77d8e368836e45da543cda8dd0ff SHA512 3c3113f39f5c3436d76156e78c2974322d0c736d877268619878ccf19c214b054fdf2dc3229dbc7cb7c95ddd842aa65125dfb0fa4eb337db43ed4a55a8367f1a WHIRLPOOL bfe2770205031e7dddc246f379595c29eb1cebc68d0c53e86b04b3fe3e95abbf657672c1f1bfa3c892feff351cf8f18383ace8e9beb802aec074ab3c9a50f179
+MISC ChangeLog 26915 SHA256 88cf43be3ba2e1c15751373daa002f9714e23e6580e00abc36541360c874ea63 SHA512 95a5d8aba9e9e2edfc9d1c81e5ac1f63c1cfdc73481dd4b63cb995eff61cb487697afc49caee1fc2dd2b748d0a8ed6b1ada0fbc2facb22155e07b0fd78203e2a WHIRLPOOL c18e04e563453836aa8c30d845784861352c660d7e6014f8ca82bb48c161b3657b97fc730d958fb95919bb94f08974219f3149a3cc3955a72a3d580e779472c6
 MISC metadata.xml 2954 SHA256 457f227688ed9110571933da9e2f0774257805e65a2b1b9f1db649cef9ec66ef SHA512 552276198c31917583e30767f72be5f5d4614440f32ddb364c30a71f214329707d5034476961d85514dad0fd2ea42d3b1325fc131f50f2f620205e5a471a5a8c WHIRLPOOL 65056671f494f2a2614bb12463e7e50255d482bb454178bf43f06baf8cc2ba0478fc1baae20dd2fb241ba5f3047f7f2cdd4e96099db754d9d34b6ea0c78cb0a3
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.1
 
-iEYEAREIAAYFAlWGlQcACgkQkKaRLQcq0GJTswCeJ9Sn7wcI40VwY5Ukq8odIM3I
-8aQAn3QUloUQdltyHas33LnqT0Q4m/nt
-=U4Ff
+iQJ8BAEBCgBmBQJVh9lSXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiM2MP/iRFP/ul+ibP+PMEBcD4wBT1
+UcZVC9c/2vYtHnDwGTJOdILYfy45OKDwKoLTT6q8eKKbUey4jFUmskMAh8wY38d1
+1E0Y7AXb5TghuVh4n6tl+bOYpc/SkEuyHkqvyEg/XwEeTY0Sx9XCAT8GclpBFeYf
+wexBU8+0F60hjGA+JByWWhuB3T+HYCYcitn5gbP0xrjMH9CMdho/8wXs/CpB0pKx
+jtTwoarfeBv0QXkfJhPCAZUMcQZB7mpKXcLxaQUjQ22xr+KwsPYTGE77Fa8DbJ+U
+DHINifqPoGJAxajEi2TMHoV8tTOkegBG3MzVR8c1Pw+lyIdlKNxMCOBdAtKdw+j+
+RYyxrZTKRgRC2KjoT5lCi/RdIBhxjM+jJk2ONlf2p5g6HuHr1u/kcCQaJ38tHRXG
+asdeEJS+RHmtVLdL5kOHB95UwxvJsUrslEOdPLT6rA1a7/tJ9YcL3U5JRanH9JvL
+OuvcAaL70BW/PslxrfSdsUzGW9gNq7MsXKr3c4KRh2bVGJ+DlI89YFNDZFPZGLOn
+1yRv+5iSUpZXs/ir6nztnLuEpJ2r7IQpeVlr3caMEDD3V5gl8VM8Q6WiE93DAu2X
+S3oAfLsr/yv4/LiK6B3+hcW2YmaBYq0KFj/jmrDwlRvEksVMaEnQZz/9zranNHLu
+K1l9SqNFDaP+f1l5qChI
+=4uSS
 -----END PGP SIGNATURE-----
diff --git a/dev-python/ipython/files/ipython-2.2.0-login-backport.patch b/dev-python/ipython/files/ipython-2.2.0-login-backport.patch
new file mode 100644
index 000000000000..cf6a99db21e8
--- /dev/null
+++ b/dev-python/ipython/files/ipython-2.2.0-login-backport.patch
@@ -0,0 +1,35 @@
+From 5d6ce3671318c8d32bab770ece841590bbec358d Mon Sep 17 00:00:00 2001
+From: Matthias Bussonnier <bussonniermatthias@gmail.com>
+Date: Fri, 17 Apr 2015 13:08:32 -0700
+Subject: [PATCH] Set secure cookie by default if login handler is hit.
+
+    backport of https://github.com/jupyter/jupyter_notebook/pull/22 b8e99bc
+
+>   There is few chances that logged-in people do not use https connexion,
+>   but I guess it can happened if the server is ran in front of a proxy
+>   that does the https termination, so leave it configurable.
+>
+>   closes ipython/ipython#8325
+---
+ IPython/html/auth/login.py | 8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/IPython/html/auth/login.py b/IPython/html/auth/login.py
+index 1ad4673..1a340c8 100644
+--- a/IPython/html/auth/login.py
++++ b/IPython/html/auth/login.py
+@@ -46,7 +46,13 @@ class LoginHandler(IPythonHandler):
+         pwd = self.get_argument('password', default=u'')
+         if self.login_available:
+             if passwd_check(self.password, pwd):
+-                self.set_secure_cookie(self.cookie_name, str(uuid.uuid4()))
++                # tornado <4.2 have a bug that consider secure==True as soon as
++                # 'secure' kwarg is passed to set_secure_cookie
++                if self.settings.get('secure_cookie', self.request.protocol == 'https'):
++                    kwargs = {'secure':True}
++                else:
++                    kwargs = {}
++                self.set_secure_cookie(self.cookie_name, str(uuid.uuid4()), **kwargs)
+             else:
+                 self._render(message={'error': 'Invalid password'})
+                 return
diff --git a/dev-python/ipython/ipython-2.4.1.ebuild b/dev-python/ipython/ipython-2.2.0-r1.ebuild
index c95d0e490e55..5bc95d9980cd 100644
--- a/dev-python/ipython/ipython-2.4.1.ebuild
+++ b/dev-python/ipython/ipython-2.2.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/ipython/ipython-2.4.1.ebuild,v 1.1 2015/03/13 15:10:24 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/ipython/ipython-2.2.0-r1.ebuild,v 1.1 2015/06/22 09:45:52 jlec Exp $
 
 EAPI=5
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 IUSE="doc examples matplotlib mongodb notebook nbconvert octave qt4 +smp test wxwidgets"
 
@@ -40,7 +40,7 @@ RDEPEND="${CDEPEND}
 		dev-libs/mathjax
 	)
 	nbconvert? (
-		|| ( >=net-libs/nodejs-0.9.12 >=app-text/pandoc-1.12.1 )
+		>=app-text/pandoc-1.12.1
 		dev-python/pygments[${PYTHON_USEDEP}]
 		dev-python/sphinx[${PYTHON_USEDEP}]
 		dev-python/jinja[${PYTHON_USEDEP}]
@@ -56,9 +56,6 @@ DEPEND="${CDEPEND}
 	test? (
 		dev-python/nose[${PYTHON_USEDEP}]
 		dev-python/mock[${PY2_USEDEP}]
-		>=www-servers/tornado-3.1[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/jinja[${PYTHON_USEDEP}]
 	)
 	doc? (
 		dev-python/cython[${PYTHON_USEDEP}]
@@ -75,6 +72,7 @@ DEPEND="${CDEPEND}
 PATCHES=(
 	"${FILESDIR}"/2.1.0-substitute-files.patch
 	"${FILESDIR}"/2.1.0-disable-tests.patch
+	"${FILESDIR}"/${P}-login-backport.patch
 	)
 
 DISTUTILS_IN_SOURCE_BUILD=1
@@ -116,8 +114,7 @@ python_test() {
 
 python_install() {
 	distutils-r1_python_install
-	ln -snf "${EPREFIX}"/usr/share/mathjax \
-		"${D}$(python_get_sitedir)"/IPython/html/static/mathjax || die
+	use notebook && dosym /usr/share/mathjax $(python_get_sitedir)/IPython/html/static/mathjax
 
 	# Create ipythonX.Y symlinks.
 	# TODO:
@@ -137,11 +134,4 @@ python_install_all() {
 pkg_postinst() {
 	elog "To enable sympyprinting, it's required to emerge sympy"
 	elog "To enable cythonmagic, it's required to emerge cython"
-	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/ipython-3.0.0.ebuild b/dev-python/ipython/ipython-3.0.0.ebuild
deleted file mode 100644
index 175390b5271f..000000000000
--- a/dev-python/ipython/ipython-3.0.0.ebuild
+++ /dev/null
@@ -1,154 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/ipython/ipython-3.0.0.ebuild,v 1.5 2015/05/20 04:03:28 jer Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{3,4} )
-PYTHON_REQ_USE='readline,sqlite'
-
-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 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc examples matplotlib mongodb notebook nbconvert octave qt4 +smp test wxwidgets"
-
-REQUIRED_USE="test? ( doc matplotlib mongodb notebook nbconvert octave qt4 wxwidgets )"
-
-PY2_USEDEP=$(python_gen_usedep python2_7)
-CDEPEND="
-	dev-python/decorator[${PYTHON_USEDEP}]
-	dev-python/pexpect[${PYTHON_USEDEP}]
-	dev-python/pyparsing[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/simplegeneric[${PYTHON_USEDEP}]
-	matplotlib? ( dev-python/matplotlib[${PYTHON_USEDEP}] )
-	mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] )
-	octave? ( dev-python/oct2py[${PYTHON_USEDEP}] )
-	smp? ( >=dev-python/pyzmq-13[${PYTHON_USEDEP}] )
-	wxwidgets? ( $(python_gen_cond_dep 'dev-python/wxpython:*[${PYTHON_USEDEP}]' python2_7) )"
-RDEPEND="${CDEPEND}
-	notebook? (
-		dev-libs/mathjax
-		dev-python/jinja[${PYTHON_USEDEP}]
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-		>=dev-python/mistune-0.5[${PYTHON_USEDEP}]
-		dev-python/pygments[${PYTHON_USEDEP}]
-		>=dev-python/pyzmq-2.1.11[${PYTHON_USEDEP}]
-		>=dev-python/terminado-0.3.3[${PYTHON_USEDEP}]
-		>=www-servers/tornado-3.1[${PYTHON_USEDEP}]
-	)
-	nbconvert? (
-		|| ( >=net-libs/nodejs-0.9.12 >=app-text/pandoc-1.12.1 )
-		dev-python/jinja[${PYTHON_USEDEP}]
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-		>=dev-python/mistune-0.5[${PYTHON_USEDEP}]
-		dev-python/pygments[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	)
-	qt4? (
-		|| (
-			dev-python/PyQt4[${PYTHON_USEDEP}]
-			dev-python/pyside[${PYTHON_USEDEP}]
-		)
-		dev-python/pygments[${PYTHON_USEDEP}]
-		>=dev-python/pyzmq-13[${PYTHON_USEDEP}] )"
-DEPEND="${CDEPEND}
-	test? (
-		app-text/dvipng
-		dev-python/jinja[${PYTHON_USEDEP}]
-		dev-python/mock[${PY2_USEDEP}]
-		>=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}]
-	)
-	doc? (
-		dev-python/cython[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/fabric[${PYTHON_USEDEP}]' python2_7)
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-		>=dev-python/nose-0.10.1[${PYTHON_USEDEP}]
-		dev-python/numpydoc[${PYTHON_USEDEP}]
-		dev-python/pymongo[${PYTHON_USEDEP}]
-		dev-python/rpy[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1[${PYTHON_USEDEP}]
-		>=www-servers/tornado-4.0[${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
-}
-
-src_test() {
-	# virtualx has trouble with parallel runs.
-	local DISTUTILS_NO_PARALLEL_BUILD=1
-	distutils-r1_src_test
-}
-
-python_test() {
-	distutils_install_for_testing
-	local fail
-	run_tests() {
-		pushd ${TEST_DIR} > /dev/null
-		"${PYTHON}" -m IPython.testing.iptestcontroller --all || fail=1
-		popd > /dev/null
-	}
-	VIRTUALX_COMMAND=run_tests virtualmake
-		[[ ${fail} ]] && die "Tests fail with ${EPYTHON}"
-}
-
-python_install() {
-	distutils-r1_python_install
-	ln -snf "${EPREFIX}"/usr/share/mathjax \
-		"${D}$(python_get_sitedir)"/IPython/html/static/mathjax || die
-
-	# 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
-	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/ipython-3.1.0.ebuild b/dev-python/ipython/ipython-3.2.0.ebuild
index 139423582fdd..e1268c6f3d89 100644
--- a/dev-python/ipython/ipython-3.1.0.ebuild
+++ b/dev-python/ipython/ipython-3.2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/ipython/ipython-3.1.0.ebuild,v 1.5 2015/06/21 10:42:13 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/ipython/ipython-3.2.0.ebuild,v 1.1 2015/06/22 09:45:52 jlec Exp $
 
 EAPI=5
 
@@ -124,8 +124,7 @@ python_test() {
 
 python_install() {
 	distutils-r1_python_install
-	ln -snf "${EPREFIX}"/usr/share/mathjax \
-		"${D}$(python_get_sitedir)"/IPython/html/static/mathjax || die
+	use notebook && dosym /usr/share/mathjax $(python_get_sitedir)/IPython/html/static/mathjax
 
 	# Create ipythonX.Y symlinks.
 	# TODO: