Version bump, allow to use node.js for nbconvert instead of app-text/pandoc

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0x5D21B852895192F9

3 files changed, 162 insertions, 15 deletions

diff --git a/dev-python/ipython/ChangeLog b/dev-python/ipython/ChangeLog
index 41a280c6b682..ad30911d7a1a 100644
--- a/dev-python/ipython/ChangeLog
+++ b/dev-python/ipython/ChangeLog
@@ -1,6 +1,11 @@
 # 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.157 2015/01/31 07:05:41 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/ipython/ChangeLog,v 1.158 2015/02/08 19:05:16 xarthisius Exp $
+
+*ipython-2.4.0 (08 Feb 2015)
+
+  08 Feb 2015; Kacper Kowalik <xarthisius@gentoo.org> +ipython-2.4.0.ebuild:
+  Version bump, allow to use node.js for nbconvert instead of app-text/pandoc
 
   31 Jan 2015; Mike Frysinger <vapier@gentoo.org> ipython-2.3.1.ebuild:
   Add mips love.
diff --git a/dev-python/ipython/Manifest b/dev-python/ipython/Manifest
index b7137c4bec9c..97dfb3f541ae 100644
--- a/dev-python/ipython/Manifest
+++ b/dev-python/ipython/Manifest
@@ -19,6 +19,7 @@ DIST ipython-2.1.0.tar.gz 11886492 SHA256 ca86a6308c4b53ea8a040ba776066dc9a7af4a
 DIST ipython-2.2.0.tar.gz 11912007 SHA256 b7ca77ba54a02f032055b73f5f62b01431f818ae00f63716b78f881c2b2564e2 SHA512 4953bf5e9d6d5c6ad538d07d62b5b100fd86a37f6b861238501581c0059bd4655345ca05cf395e79709c38ce4cb9c6293f5d11ac0252a618ad8272b161140d13 WHIRLPOOL a5e433a3a840b65fd0644f023cc9e93862e48a906e4e9d1596ebbd24290d486be580dca017ef1586da980b6792dcd7ed9aab4af81421bbf083d885927db6fcc8
 DIST ipython-2.3.0.tar.gz 11913980 SHA256 a2f81afe3eca5c8b2e8cf4ec35518fd007a39231770e67e6c2c4f9bd2b857aae SHA512 4639a97c7cd1fda8421e69ea346e64a5975eb8bddadef8b6e5cf19e0b7eb4a1ed7fb9e3bbbb8402406ac258be05403b79ad1fdd79876ae22339f7ae3eb985d72 WHIRLPOOL 4216a22917aade320a6a12a893014c482ac068a3ca026a62aa0bdba5fad10dfb9fe08cdedf9759b128d092187c3f9093fd9fc1a12f3b09da7e22ad2c334813b5
 DIST ipython-2.3.1.tar.gz 11884781 SHA256 3e98466aa2fe54540bcba9aa6e01a39f40110d67668c297340c4b9514b7cc49c SHA512 41e642b5de9e39ebdb3e02b527e80bb305c2e9372689b7744ec80c261f7c886d09c9df6dc8c6f53955ba047f986a07d2155c3e6f032bcac8a2f895c76ffe273e WHIRLPOOL 525cfab35304d2751ca2f806f592e6c69717fa859dc091239dc3ee657bf04816af4c37c09286cbf1a4c40f5f7153249438f777d60482fd351dbd88dee3c6fdda
+DIST ipython-2.4.0.tar.gz 11895397 SHA256 013698a61229c8beaf7182fb3c7132ab70de1ba9b66366e690237cc86e5f7a84 SHA512 aa1d393b66ddca91f9bccd4aebd694bd0db8a0252a913b6834d83df4b1fd55b4291dd63c4e64eee41efca328595fdc45368e813dd6ea7a51f4f81d0ef829867d WHIRLPOOL b1c96f38908218c25bccb1c719ff2f593743f96cf9c0265a37e9cbf9c1bfef316ce4fa3ba9109cc4aa38bb0665c1f26776e557f3255082092f8f7d8ef05782b4
 EBUILD ipython-0.10.2.ebuild 3253 SHA256 3c68ff72c40f281c7b83e0205a3a847ba4b61c5ae2647bcc8e45ed5454e0f298 SHA512 b974bb0b5e6e245e93da53a086fe74a67ae94c650febeb5fb24aabc08f02ba69e54cb6fdb6278d4b76eb97c1ea57a29219a3fdd9fee4fc3efbecac0b38d07b3e WHIRLPOOL 2bc7d6309cf8a8d6baa71694c50c2c33999fbf6bed13959decee37f7d8210b650a2b0505e489a0d8392507e772c52a16493a6ad2f55d22ec44993f06cffb9867
 EBUILD ipython-0.12-r1.ebuild 3957 SHA256 be079a770254887faf9ac1d36a1bef2353384433effc5f5796d5ba3620157b1d SHA512 fe6d6d9f86e98170acc1633b3168a277fff2dbf9b1df359fdbb40ddd6f998a601cedcad7dcc68dcdd48e7ff08868b22e4bef3b15d717492dec346c13ed04f6f9 WHIRLPOOL 1ffbfa1708695e1f052d25421c51c44b6e8d38062aa7d544c978185d5da442341163e955768d6cfeaaa23b1bfdfac8d949ea87533360f20e2cfe13150452fe1d
 EBUILD ipython-0.13.2.ebuild 5388 SHA256 6c341a85fca7622aee9f79374286accf700a46922ee11d80e507a1cc6fb61a7d SHA512 91a1be5286c0d8cc6434e98d66b7f33bccd6e96e7cd4208bc83aecfec663c8310c239287de3663409d08b83df6156889bba8cc40c429b197b223b7f459206ded WHIRLPOOL 5c85ea8def79c0c71eb86e1d61054d9cf66090e9e37c6e0d654aa9e50dfb60ca08c15ca66ec38d121b6e452e62453b9a3e90d8677372caed3ac096b1d73f8d1d
@@ -32,22 +33,23 @@ EBUILD ipython-2.1.0.ebuild 3929 SHA256 f852ccdca52d339c803ee782ef375227cf35629a
 EBUILD ipython-2.2.0.ebuild 3928 SHA256 06659d8c8884ccf4b3f9084667ef018304cd51789402e9b26b8ce237aff7b770 SHA512 b7b69dc0dd0e96dca2d8b21842cb9696f457cfce44732dcd88165fed58fb0baa45a1186a05e50aa454df32e17aecf048cf6a7a54b6dea228dfb3a0f28db5e748 WHIRLPOOL 1ed665e125b201e9b06d2738677f2287578074414d10dfcbe731cac1d164d4ccd013000cf5cf7bcf5a7359da8ca8a2161d4af44daeca15db1b385700bb6ec5a9
 EBUILD ipython-2.3.0.ebuild 3976 SHA256 38b82127245f9124edac6c73363e6a74ab2f6e930fcf80ee52aa6819e53c0954 SHA512 f69306ad7a28fff501c09300e2a9827a92fe2929ab32c8251316f4ae17049c0fcb76e829dd04a4228c3b48b8c3afb40b214bfb4a487d477d41576def1bdfa457 WHIRLPOOL 09dea517426ac107a962b1086b825baca3ffdeef083bd4f24fbbf256eef539f2cf02a3982497632af7c1806cc97328913a28224ff61390568b003f277262ce87
 EBUILD ipython-2.3.1.ebuild 4060 SHA256 cfc77108d62d137adca3603f52a9689d5eba389b96f862ee687cf6408bb29ebc SHA512 ae8cef0d955e7cac019ec635c725ed8561797f30563de385b2cb7d922c39113cb27e3b5cd4ec107547e8cc9df2e9ff1604c2dc9ee5fcc54dccf86d56dfc10816 WHIRLPOOL 1510ad5b0ec8f262342e657ea38f5fa65e4e0e8b1659bb82bc27bfe52a3e0ccf67c1b57ec8f9ebc90563ba885f8f35a14e6715634afb9b718e6bef3bb1171498
-MISC ChangeLog 23753 SHA256 cae7857a3870d3a66a9eecffae8b2e7c5b8ff995e7ddc57957152517f20896c1 SHA512 2e8bd717390672b46a36fe04b1c4ef3650032cd11a468fac7e8b487d1f6d02fd3f2a0873e4044311fea5fcab7aed25cf4793b3f9b7c91aadd9333d959bc63353 WHIRLPOOL 75ad411c9d087c2bad626e018f96886e6f3ccc25f7d3497a067ecba3d05ece948c7a924136d93a3c30e4d9b9161bc90b895d09fb4fbfa72582096989df53cc83
+EBUILD ipython-2.4.0.ebuild 4392 SHA256 c617da87123ec9cfe373667b4cbfe90267f29dc3be7db5f6d98e3d4bab16518c SHA512 666eba53e858cd5f2b3b8a81368a41d0767547ffc481d6638a5679a20d680fb02822db93c9e8fe54452cbcbcff69fcfdc20b468b99f9c1e5070a2f9d410e3f42 WHIRLPOOL 0cbe84745e23c26fef3b91639ec6dc9872c3f11768f32ffaa80024d1bdb14438bd9ca58c21313203547cd0f9ecd0246b6e3e7b20e1bb8463f45824c9ceffd23f
+MISC ChangeLog 23943 SHA256 c27d8adebd3d145630c4de6f43983539f84935a8259a3acb035490cefa6fcdfa SHA512 39cbed52586c01fb044d55c9762f8115cadde22cc3bfaddfaae62a866ca70ff5168e72cb24baf1647f06186d40bc36b65ea8367ecdaec436b0e948a25b47fa95 WHIRLPOOL e9edb0507d6739c3a1960d9bfb148669e28242016c169586da3a7748f7bf651f5f6b27927ac9e5978981f4f45cdb4bb0d2d093f67c50481468c692269d9ff00a
 MISC metadata.xml 2954 SHA256 457f227688ed9110571933da9e2f0774257805e65a2b1b9f1db649cef9ec66ef SHA512 552276198c31917583e30767f72be5f5d4614440f32ddb364c30a71f214329707d5034476961d85514dad0fd2ea42d3b1325fc131f50f2f620205e5a471a5a8c WHIRLPOOL 65056671f494f2a2614bb12463e7e50255d482bb454178bf43f06baf8cc2ba0478fc1baae20dd2fb241ba5f3047f7f2cdd4e96099db754d9d34b6ea0c78cb0a3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUzH7HAAoJEPGu1DbS6WIAiFUP/j0L6gxo2awlBHcCZ0B0/vrS
-RyxmdsoK8y/c0DlJFyh8DHyZ0+gW+CHDZ794P+SCY+nT8sewzrBYBuoLk59y6bbu
-dhGds1AacfhxEnULPXJ1oBfzBOX3mR0pX97TUd9VpFo+jMSgdmDGLArR/VVGW7e2
-cQp88Zo/ROPWx4HWR2B3RvbJRHWQhgz5zAu2IrBu0G3gQYZxJFRdJUbXULJceoW5
-Ua0MxtjeAsJ49zAXzmWss+VtlG291w6ZT4/FVNNFySd1XbNdYcFZHxwLBw7RvUin
-zMFH7C6LBNuhN8f/XHE1QkB42AotRnEr3a/LJCch8yUtJcyie8wkoQuTGY8hUNZw
-wrPIV+jscfOGQNLyntTiqKuGMIzGysXE2UiP2J96q/Hutrb/NSnF/NYWxzFSwkNS
-8w/RO7MEu0lrr4o/GQlDYXcT3usZbFtmdOeXB2Mbjsv0AlU2AiieFgtqSqC9OpWt
-9KszKju94y34ZkiA2ewSCmPkxfTr6bhHzFhxcvwc/ZqLnFseFHxAAA53mpnqtTsi
-9aB8nuEZLrnzzXTlojnQZ1SRDuVJ29mLac7AvotUhhDS1uRu5GxdLg7iOxPFWnyM
-jTqRkAJ/co5wAeud2MGRuz8tZNFlIY3Ewx2VB3bJmyfc3VSDW7FjgMZiwsZ/iGHR
-GH/FwzxocjVUgp5WYoPJ
-=z7Th
+iQIcBAEBCAAGBQJU17NyAAoJEF0huFKJUZL5dRQP/019xsvberpNjZOATwfyAjiY
+kohNxjJb0AhKmOZSuyRkiaKAe5IKT8mG+TsQ5qglEcy0L4Mdb7m/6nk3vvviPmTk
+arL076MwAMiC74eKa3yU2FO0I0tmlme5jQb5V8uEbCbOh3j2JsxkRPxkTEBpkTly
+2KjqBWFbANK303viPvZeBQzhUkB4E+Mr8zGK8WzsfdtKEIRWxOLJ/2acejriLz3e
+TiLazf6mW/m8BlcLoYSLbE9shEtLtCBirfon0CAN0XOlt+OZRPZ0WrIOVl8dbmYf
+Ooy0UoNssxNieflqVuXGHspIcUfPe1qLAQ9yRgY/5aCSlvwW3tjbl1M1s5U74BSQ
+hUdLhCcHTTAYCbeubA7MGrpP0hoHgWzgtRUHLD+v1q0tsFB98mkguT1E/rwNM9Pj
+rz6BQv8Gd83vk+VWXNIurWwsZGRkxkehBiGp/ocvodh9qfYXN/ok9ULVp5VwLdFA
+Q7oPzFBNLALECza4OD3757wmf+/3xUUEY11SCSfxWuuscCAF8FUBqg6gPSOqjKre
+HIEmioCE70lPhN+4rtld9zYItoXf4Rzli5rmqU6rKuLbNqxsM+xifo7VlwVZ9esv
+Yi7Wy72YkFNbTky65tZ4z/2lH+uSbhk88HWuOT9puHJwntdBfamAznv3OISbDJzY
+UmH6zO4lZewytk8ug5JG
+=tYKi
 -----END PGP SIGNATURE-----
diff --git a/dev-python/ipython/ipython-2.4.0.ebuild b/dev-python/ipython/ipython-2.4.0.ebuild
new file mode 100644
index 000000000000..247fc900820a
--- /dev/null
+++ b/dev-python/ipython/ipython-2.4.0.ebuild
@@ -0,0 +1,140 @@
+# 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.0.ebuild,v 1.1 2015/02/08 19:05:16 xarthisius Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_REQ_USE='readline,sqlite'
+
+inherit distutils-r1 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 ~arm ~mips ~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"
+
+PY2_USEDEP=$(python_gen_usedep python2_7)
+CDEPEND="
+	dev-python/decorator[${PYTHON_USEDEP}]
+	dev-python/pexpect[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/simplegeneric[${PYTHON_USEDEP}]
+	dev-python/pyparsing[${PYTHON_USEDEP}]
+	matplotlib? ( dev-python/matplotlib[${PYTHON_USEDEP}] )
+	mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] )
+	octave? ( dev-python/oct2py[${PYTHON_USEDEP}] )
+	smp? ( >=dev-python/pyzmq-2.1.11[${PYTHON_USEDEP}] )
+	wxwidgets? ( $(python_gen_cond_dep 'dev-python/wxpython[${PYTHON_USEDEP}]' python2_7) )"
+RDEPEND="${CDEPEND}
+	notebook? (
+		>=www-servers/tornado-3.1[${PYTHON_USEDEP}]
+		dev-python/pygments[${PYTHON_USEDEP}]
+		>=dev-python/pyzmq-2.1.11[${PYTHON_USEDEP}]
+		dev-python/jinja[${PYTHON_USEDEP}]
+		dev-libs/mathjax
+	)
+	nbconvert? (
+		|| ( >=net-libs/nodejs-0.9.12 >=app-text/pandoc-1.12.1 )
+		dev-python/pygments[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/jinja[${PYTHON_USEDEP}]
+	)
+	qt4? ( || ( dev-python/PyQt4[${PYTHON_USEDEP}] dev-python/pyside[${PYTHON_USEDEP}] )
+		dev-python/pygments[${PYTHON_USEDEP}]
+		>=dev-python/pyzmq-2.1.11[${PYTHON_USEDEP}] )"
+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/sphinx[${PYTHON_USEDEP}]
+		dev-python/numpydoc[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/cython[${PYTHON_USEDEP}]
+		dev-python/rpy[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/fabric[${PYTHON_USEDEP}]' python2_7)
+		>=www-servers/tornado-3.1[${PYTHON_USEDEP}]
+	)"
+
+REQUIRED_USE="doc? ( matplotlib mongodb octave )"
+
+PATCHES=( "${FILESDIR}/2.1.0-substitute-files.patch"
+	"${FILESDIR}/2.1.0-disable-tests.patch" )
+
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_prepare_all() {
+	# Remove out of date insource files
+	rm IPython/extensions/rmagic.py || die
+	rm IPython/extensions/octavemagic.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
+}
+
+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() {
+	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 [[ -z $(best_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
+}