Bump

Package-Manager: portage-2.2.14/cvs/Linux x86_64

3 files changed, 140 insertions, 2 deletions

diff --git a/dev-python/ipython/ChangeLog b/dev-python/ipython/ChangeLog
index f85622e01f84..af15f63c7288 100644
--- a/dev-python/ipython/ChangeLog
+++ b/dev-python/ipython/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-python/ipython
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/ipython/ChangeLog,v 1.151 2014/12/01 06:05:58 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/ipython/ChangeLog,v 1.152 2014/12/01 08:36:28 patrick Exp $
+
+*ipython-2.3.1 (01 Dec 2014)
+
+  01 Dec 2014; Patrick Lauer <patrick@gentoo.org> +ipython-2.3.1.ebuild:
+  Bump
 
   01 Dec 2014; Patrick Lauer <patrick@gentoo.org> ipython-2.3.0.ebuild:
   Fix dependencies for test phase
diff --git a/dev-python/ipython/Manifest b/dev-python/ipython/Manifest
index f7fd0228102e..031a3a1c14d3 100644
--- a/dev-python/ipython/Manifest
+++ b/dev-python/ipython/Manifest
@@ -15,6 +15,7 @@ DIST ipython-1.2.1.tar.gz 8666632 SHA256 c27aeae9b8e5c4a2d28ba0f04b879216d6f96f3
 DIST ipython-2.1.0.tar.gz 11886492 SHA256 ca86a6308c4b53ea8a040ba776066dc9a7af4ac738ad43ab2059a016c09b0c2d SHA512 68c15f6402cacfd623f8e2b70c22d06541de3616fdb2d502ce93cd2fdb4e7507bb5b841a414a4123264221ee5ffb0ebefbb8541f79e647fcb9f73310b4c2d460 WHIRLPOOL 099f387e00739c641c20e05bb3f23f46ef7ff82c6e273a0307163f0660cb1a92c2f78e1e0737f8be8173226eebeedf499e863538a77bf25f0c58e84f7447a123
 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
 EBUILD ipython-0.10.2.ebuild 3252 SHA256 297a5c6573ecfaada05fc527101d82925680db9224e99a0e239e17743fd57e22 SHA512 43e29db6ab0342d8293a6fe6ae6fedb6db7da9d894f2f2b9f6da7ec45dfb63355d612838a58e4dc4f524103d213e3e31a7a60f64d3667c7e7cf643199de607c7 WHIRLPOOL 910ebd8d9ef97272e96f68cd24182b3ac7a8c8d4a5e601b3869ae41669ec201d5b87a4ccd450f69e86dc9e3a36206bfe72470b7d55f8506b6630c07fdcddf47e
 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
@@ -27,5 +28,6 @@ EBUILD ipython-1.2.1.ebuild 6114 SHA256 4e5cced309c855ab6d75aff5631e09dacd37c320
 EBUILD ipython-2.1.0.ebuild 3929 SHA256 f852ccdca52d339c803ee782ef375227cf35629aefd3647a886b6a150f4dd5d8 SHA512 7e569d14ebbda7e28e3a5698603823f605cabf392c4901aaf7c47c5759f63cdc9ca34988630894b5fb6783099db204ea9a8038d6b376a1a01c3746908df5e8bb WHIRLPOOL 0e40b1fad05834e323d0ac1234961ce8f7169616ab9f1cfb94f8906510ccf12d9ebd576a44e7c9bb769a022366549c5875d7dc2f9fa719bb79db33682e736a91
 EBUILD ipython-2.2.0.ebuild 3929 SHA256 501d7b1ab80f9901c86f338e2d88a5de1cd241092e395644e022d742a6af1c56 SHA512 fcfd60286811b213edc1dc508ad29e9bb1acede8275b9560ceaf44c16ed5c3fee2f81f4bf9897caa7cc16983a3a14d82b9af3e195cf253038d604c4ec56277ed WHIRLPOOL f53b02943151927b4f1c9f4191f5603b3f59a331c8ea1b06b89638b2756dc008c7f7b01b19a75aab3c403f0178e589144b91e1521c05094235180e1ba072001b
 EBUILD ipython-2.3.0.ebuild 3971 SHA256 421262d01ffab3fc00635051f619da9a04bbb7adaab16510f84e48e4894398c9 SHA512 d415ac3949d28810717132b5f9af4c1367a64c963b7e60b2381b699eaf560fe8f3f5d60251026cd26711632f19d35ce348a3d0d59717beef1b3e31482d11dd19 WHIRLPOOL 4dc57202278247ef4ecc8dc7fce65007d1a268c169731cd19a46e532e2026f945852db34efd7272417ff6e173043348366e2a3ef0ac168bf7e31d41d88113634
-MISC ChangeLog 23032 SHA256 f9cd108aef2508bbda73f9dcc14a55c885df8e42c52df19260c924efa854430a SHA512 95400235c0780036890906f11c7b948eb5f6c2f248d0b0cfd279017ad776e89777c780f34e3e89b8ffb128467e3ea64dff73b906e321473469f9cd5f5ff9cd50 WHIRLPOOL 35780b5b1094eb457cdfe65bbb37184df12d96b704de96d6f6fbbb4c5b0474f86651f63d6a7830ccf5c676237d65ca36794a0d01f635d8d116b723c2652ede14
+EBUILD ipython-2.3.1.ebuild 3971 SHA256 f352f1bf98d235bbf119dc40c489048fad2ffbfa49d7c722d1a9a93184ffc61c SHA512 70375f6c2fce9322d0c7e0718aaa8a36a5dc9a083329cee0077fbd13063ba0ad3296a12c5fcee20d0ab84cdbc1b40c6864f190961cd693e5976c917ee5eff4e7 WHIRLPOOL 71fac6695ca6998dae1929274fa09babc6dec26a192159b30268d35f9f5fe9d4189d3f7890a3ec9081afbe72c65cf76a91c4e7865901634840b31d7941a7bca4
+MISC ChangeLog 23143 SHA256 eb76996592b7c67093c50c8f87a1c7997c2b8dbf8142c2d66f8a673b705bd778 SHA512 8ab96f37fd31fd892ecf7233af44b94fce846b35dc0a9015ba798b8945f347897baf840f6a02e2b58eb8c37a7bf27fc1fd3fab30f35abedfb8c9199889e53041 WHIRLPOOL c304b073cdf6c4380a558184e688cbb95fa5365fcc5e0067cf541a8f4649a7653c68275fd5005f819e558e9fc73d63384fbe688f05c286577babdedbcd1c3020
 MISC metadata.xml 2954 SHA256 457f227688ed9110571933da9e2f0774257805e65a2b1b9f1db649cef9ec66ef SHA512 552276198c31917583e30767f72be5f5d4614440f32ddb364c30a71f214329707d5034476961d85514dad0fd2ea42d3b1325fc131f50f2f620205e5a471a5a8c WHIRLPOOL 65056671f494f2a2614bb12463e7e50255d482bb454178bf43f06baf8cc2ba0478fc1baae20dd2fb241ba5f3047f7f2cdd4e96099db754d9d34b6ea0c78cb0a3
diff --git a/dev-python/ipython/ipython-2.3.1.ebuild b/dev-python/ipython/ipython-2.3.1.ebuild
new file mode 100644
index 000000000000..d4ebf6763c9b
--- /dev/null
+++ b/dev-python/ipython/ipython-2.3.1.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/ipython/ipython-2.3.1.ebuild,v 1.1 2014/12/01 08:36:28 patrick 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 ~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? (
+		>=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}]
+	)
+	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"
+}