dev-python/ipython: Version Bump

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

3 files changed, 244 insertions, 16 deletions

diff --git a/dev-python/ipython/ChangeLog b/dev-python/ipython/ChangeLog
index ef0c875c0595..257593602d61 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.134 2014/02/21 12:07:48 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/ipython/ChangeLog,v 1.135 2014/03/07 11:34:51 jlec Exp $
+
+*ipython-1.2.1 (07 Mar 2014)
+
+  07 Mar 2014; Justin Lecher <jlec@gentoo.org> +ipython-1.2.1.ebuild:
+  Version Bump
 
 *ipython-1.2.0 (21 Feb 2014)
 
diff --git a/dev-python/ipython/Manifest b/dev-python/ipython/Manifest
index 546dde10e05e..eb62ebf89ee1 100644
--- a/dev-python/ipython/Manifest
+++ b/dev-python/ipython/Manifest
@@ -12,6 +12,7 @@ DIST ipython-0.13.2.tar.gz 5982733 SHA256 17fbeea1dff2318d617d90fdf7af4eb35dc48c
 DIST ipython-1.0.0.tar.gz 8658118 SHA256 0d07521b4784e1b1f676b4b32c1f708a026cf398a0e6c3f095fce41f1402911c SHA512 1b309c08009583e66d1725a2d2051e6de934db246129568fa6d5ba33ad6babd3b443e7c2782d817128d2b112e21bcdd71e66be34fbd528badd900f1d0ed3db56 WHIRLPOOL a330c1838f6ab0f288cec8ab994fb1daf6511388e1e9e208c5875968cee2c62da258a7f6497a1acca59eaf0a917a9d0fb0fb19914475b2f434cebc1cc2b189e1
 DIST ipython-1.1.0.tar.gz 8658909 SHA256 6c4e4a65225ab45be923f6bd0b71b604ddf8acd769c4e2818fac89793cdf91be SHA512 46b8ae25df2ced674b3b3629070aafac955ba3aa2a5e749f8e63ef1f459126e1c4a9a03661406151622590a90c73b527716ad71bc626f57f52b51abfae0f43ca WHIRLPOOL 3952b2588f798bcd24cc54cba1eea2b3c1f7e3550311672f445ef530f176fe198c983e0fb01e84e0351f694c53783009a616bd554eef0f3b66bf7cf2e0d0cc1d
 DIST ipython-1.2.0.tar.gz 8665978 SHA256 c4b4e250d2a68ded2ef267d8deae2a972f5f94481d2e4015bd5c1922b5f318d7 SHA512 4f27c43bc756c4a802d690e84964a897a225eef96a11cb49ea1a5f6148ff7f46dd11691920f8b6acfb41723dd889b4af4a5592616c3487557745a665e3869be3 WHIRLPOOL 5ae405e82b3fe7722d4b6136ade36edda49624bf8bd7597aeca28a94b299470e2d1b812921334edc208506da6ad4716ce7891dd522c621d0b3a8fe47caaa71c8
+DIST ipython-1.2.1.tar.gz 8666632 SHA256 c27aeae9b8e5c4a2d28ba0f04b879216d6f96f36380cd465a823b1efb0595874 SHA512 ef0afb15aa211e1ffde8375e1f75dbadb6018d626756952c164f6d2aecd7cd0b663c28cbaea487ff0b02ec0b3406eb0f515efc7de73f94d7a7857430c2529bed WHIRLPOOL 9eaa29b0556380722bc0ecbbdc63f0b958bc440c120fafec5d0ec30d15f153acf68524667b7bf917185c632d4beb04682cfea7cbdaa757cc479eacd264569747
 EBUILD ipython-0.10.2.ebuild 3252 SHA256 297a5c6573ecfaada05fc527101d82925680db9224e99a0e239e17743fd57e22 SHA512 43e29db6ab0342d8293a6fe6ae6fedb6db7da9d894f2f2b9f6da7ec45dfb63355d612838a58e4dc4f524103d213e3e31a7a60f64d3667c7e7cf643199de607c7 WHIRLPOOL 910ebd8d9ef97272e96f68cd24182b3ac7a8c8d4a5e601b3869ae41669ec201d5b87a4ccd450f69e86dc9e3a36206bfe72470b7d55f8506b6630c07fdcddf47e
 EBUILD ipython-0.12-r1.ebuild 3981 SHA256 2cda10555e8f6e5521c1de8922a4354cbb94704fecb984effae4bf2d9a5268d9 SHA512 0d37ed4d67f8b04fa3bfab923e40eb3afeb825f05ff2b082e55e2f58c6c1be48adc75a5d0035939cfbe9d03c3ed4c83f5ce8c32defa9148e568490b49b494021 WHIRLPOOL 65d6b77201e209ba1a02906f977fe42b9ae9bcab2dd7208237a56c112e8b6503a219a43bc95930a161a0c369dac7e9a1c6c93025c3c226e84d064780236dc61c
 EBUILD ipython-0.13.2.ebuild 5432 SHA256 f822dcab3ca1d5bb5862ad6109396f6280ccc7a43e22649b9c6e969c4e08b082 SHA512 427961107e31b3a9f1a24867acbd2f46f84588fedb315556ddcf0500a0f02443f321ed5c03f4c582f7bc533e07c95768e0189b3e5c7de496ce6cb9c4e876b6ff WHIRLPOOL 642e1bf2b361d4c4d0e80e7d35e8228950989687bd641a37b121e7340ce08fc1adc25a14e54011c5c72b3ee14a632397f788e309db7d6dfc4cba9e169e86ed6d
@@ -20,24 +21,25 @@ EBUILD ipython-1.1.0-r1.ebuild 5722 SHA256 5537d1837290b6eb326e5bcbd80d56197a28b
 EBUILD ipython-1.1.0-r2.ebuild 5982 SHA256 6e9a4b816ec22bd1ca97bfb14641b80f92b81d2fc6903933e8e90c5a7da75177 SHA512 da9e4f508c75423cab43a38777863da0afc1935115ea012bfcf376d602625ada60bd175a7dcc75e27c069511cde2d5138423fd0a64156954783f4861aa87d90d WHIRLPOOL 642a26705d4447169f4454e8b4c6b05ccf4d0d82f36197690acbe3a687910994c11bda21c2ef0c37f1341ede049a4a892b50968f5c818786c4e9f3bb17e1851e
 EBUILD ipython-1.1.0.ebuild 5717 SHA256 f755ee639243fe96eb728fbb4f530bd3fd05cc0e011153463e18e5b49ff99b63 SHA512 6be04744fa3b1bd4ddfcde97e370c28e3b3945377c9c96d3f9261e8836cf5996aeefdfba76e90dbf0272ea7e825dc2b92b0af18635f964e846d2f45e9a2667f6 WHIRLPOOL 87edc3f7f98229b69ee1f2ea562ef0028c6e4a76f6f7faabae4028d077d354147485b6109e59d607305fb60836df2a3287feb8ff420b91d57585a7ebbcacace1
 EBUILD ipython-1.2.0.ebuild 5975 SHA256 aea1cb9005fafe97ec62365f366a38243dc5f50f729773b27dca1c62676e5440 SHA512 d6aa31ee8cbdef8de98fab3958f317c7304702f465bcebfa434d75daa80c05c5961dce9e5fe48a6bd0c84967c0ec015c2dcbe3ef86e8f49c65b372b06e6b65a7 WHIRLPOOL 9aa070a9aa6d42b50e69ce830f568f5e5bacac1bc9270e3044a3adc3ee063249c85bdd8a5142b0c06f2be59705f7c2212f6c40d26698457c2ef896bc10a7dad3
-MISC ChangeLog 20267 SHA256 2ded048f9e64e011c42602427cc9637611b50675dde333440815d079fe657af3 SHA512 19698ddec5ed1d34fdb2e8ced972f862ac39ec7770c80e3bd1e14a034b52abcdf347aeea29d4aa839753daf0a21277a8ad366958dc1c9749323c9fbe8511c951 WHIRLPOOL 404e15d7a66eb44e475bce89479d00d3a0033b692e71cf87d92cd095fd9beefcf5fcb9fae96b4a6cf006bbe0fb9f9eb4c7478e042c96f0c5ec67df065ba41458
+EBUILD ipython-1.2.1.ebuild 5975 SHA256 4af8b5bead2218ff2d3dc50ec2243f5042473aaff0deada415ae9dc359d51909 SHA512 f5837dd499e0b60485486a3d4afa9d66e268b4334121424c5d2ac31bd5f080c68b3b50431b158b5cf55c02c87254456f8095c3fa4c065668bf3e813cd3fd2f41 WHIRLPOOL 425565a8b7ca9844e5f334cfa04e1a239c2c8dcd5fcd5dc15bc5fcf2e5ac005c461edd8d75bd9354b6b4ef4710acc0871ae2ab202fd62668aaa9f377cc074a9b
+MISC ChangeLog 20383 SHA256 7762ca601d249caced7053c03d494fe8bc3add85bd5878a101f044f2d2160d5e SHA512 b892f497cb659504cf6600422087f0c52f8ca2fdab819cb4aedc120fbe73c88d2fe5f81f75e8c2e32344fb2fbbf3382864a06fc20979bef4f89196aab7379d79 WHIRLPOOL 2ef754c0f1c44601b9729b20855fe3055c662586274bfd2e7a3c295a2f283d7ead2b72fa27c0fd52df0ff240b19eac6de882a95d42605ca23092c7fe1a23af64
 MISC metadata.xml 2823 SHA256 d36a8dd35788175aa1adc69e76b5705d9642f1446e8ae684d425d9118fcca485 SHA512 39fb6224fd57a66e3b80e401e093274b8b372efadda5abe34a26f566f0acb3fe11a3294441e5ae56b52918a3a3663faca442f26b534d26ddb963b8d39b7d7e5b WHIRLPOOL 0ff53e9848c6c2d000e4c15570dbea8f87029c2f6a38c4d3072ab1d9b735f3fad05876c5c87f4a3e8b3a5770f64523406a1f329bb5308188286c6e620b2c7f34
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQJ8BAEBCgBmBQJTB0GVXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCgBmBQJTGa7cXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
-OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirIUwP/iAhe/Ckga2bMtYj7AwC2p5D
-TUJ4/Eqa0553ZF9N98i2+bctTU57X+7KE8sAyxagfn13yzL6XawccCoLIJ3MJtUz
-SojKtTL60lNakEkkcqYkHwZo+hnzx6hf0PzW+WI2XqxTEbJMVOQuvqRX4cJUyOLD
-Zdn4pDIdqKjxvzE6zxIakzmESfy50iRbkJ/Hlyuf/2KA+5e5BYN08/33FNcwcfbX
-BszphSM571SgU9oWsTj3RuQhd4N2NwIe4U+GBZDUPgh0AMujrpaB3Pyo6z7bAt1C
-yZ0BNY8vkRwKtES01+umSWSWoXl//4WamYAjnfksUiXhrWpbphZHbGw3aaant9Ic
-Q+BEsZd9GSAeJzHl0w9JolPfbSL4IK4reGZVHDBOM4D/e+LNrEu8wg7H5UVF5OGS
-tBAr8Uw42dDZo+eTQGTcmy+kcyf8lIElqVOpXh0w+qYglduPXEd4qMSiUYNXYRhe
-mn/+5yQtVwvtE4IC+pJNno5CJHhL589fzctBAFLCCLCftX8fiYp9MTX4m/FgcsVf
-kTjkejYiunQx8MSZBaNFZMapa5p16cdTrsulN3fgezx+bRBKp5CLv9vwJiGyu8Jr
-/qZ462Mz5jhPqOva+SAfFzADDpqiIlIKqz6K74c1rPR+/M9o7izrHCNwoPJkIPN1
-UKjVry2J0vncY8TlqCKr
-=I4QB
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirJHYP/2Q/ecI7p9FyMJe4TRdOXIOn
+tJ0smS85eCzmBkIJsSH8HtYr3aom7yGWv8WDZ7xWvExOJxUFO9TmWKd4vvEL+meA
++IwU1ksPjqDTSZYwbx56ZbA3orC628EC7lK6WeQeEcR5jkoMnqMZXPoQ+RejtCbO
+dy9K49Kw/HyGZjQ2EWBszSnJYnFYZqMYxdgQFicnGpnpP7EpOGu6h7yQ+SGIBFEd
+RUjEDuZUkZKRn/TBaltqVZfQbqGH9Q8QQ8/H7RdrFJL7nxQ9rl8Kk2jHL65EpmMT
+qQYno1yyYXuIMGlYZGxvoKOgq75u0QV3jQ/6cJv4nv7bBKSVBWLGLbbDBvAYCcvs
+ZwUE7LrA9mBJi6BEHuNfODLpLj5l7jrg0JlapXOOETOJomA/RymUitzwSkX7JrHH
+VNkC4Po0/BqjrgpKe99VV2cDfpC5ajC8ZphioGWMaTP0vntSWy1NpOdhuuQC+4Y3
+lyN+1rw/SOFSGPzWulKNmQ+JHJ0Ye5D0E+wvtXzu/2toA1Fw/iLKiKeXZ9IbSUnl
+xXO1xqMMhz6UFgCHqxw6vWA83kufyISnYcpyl5VFOELvrg5FY8MkmSYORxMwNOPd
+3vmWoviomdMw3PY4I8s3p97h70CRm15b6j/1cCDB5QpKrKWD5PeM7qlPV0ZrFwr7
+z8OKLmC63jsJHU0GpxOr
+=/I6k
 -----END PGP SIGNATURE-----
diff --git a/dev-python/ipython/ipython-1.2.1.ebuild b/dev-python/ipython/ipython-1.2.1.ebuild
new file mode 100644
index 000000000000..c77038785a40
--- /dev/null
+++ b/dev-python/ipython/ipython-1.2.1.ebuild
@@ -0,0 +1,221 @@
+# 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-1.2.1.ebuild,v 1.1 2014/03/07 11:34:51 jlec Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
+PYTHON_REQ_USE='readline,sqlite'
+
+inherit distutils-r1 elisp-common eutils virtualx
+
+DISTUTILS_IN_SOURCE_BUILD=1
+
+DESCRIPTION="Advanced interactive shell for Python"
+HOMEPAGE="http://ipython.org/"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/rel-${PV}/${P}.tar.gz"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc emacs examples matplotlib mongodb notebook nbconvert octave
+	qt4 +smp test wxwidgets"
+
+PY2_USEDEP=$(python_gen_usedep 'python2*')
+
+gen_python_deps() {
+	local flag
+	for flag in $(python_gen_useflags '*'); do
+		echo "${flag}? ( ${1}[${flag}(-)] )"
+	done
+}
+
+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}]
+	virtual/python-argparse[${PYTHON_USEDEP}]
+	emacs? ( app-emacs/python-mode virtual/emacs )
+	matplotlib? ( dev-python/matplotlib[${PYTHON_USEDEP}] )
+	mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] )
+	octave? ( dev-python/oct2py[${PY2_USEDEP}] )
+	smp? ( dev-python/pyzmq[${PYTHON_USEDEP}] )
+	wxwidgets? ( dev-python/wxpython[${PY2_USEDEP}] )"
+RDEPEND="${CDEPEND}
+	notebook? (
+		>=www-servers/tornado-2.1[${PY2_USEDEP}]
+		dev-python/pygments[${PYTHON_USEDEP}]
+		dev-python/pyzmq[${PYTHON_USEDEP}]
+		dev-libs/mathjax
+		$(gen_python_deps dev-python/jinja)
+	)
+	nbconvert? (
+		app-text/pandoc
+		dev-python/pygments[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		$(gen_python_deps dev-python/jinja)
+	)
+	qt4? ( || ( dev-python/PyQt4[${PYTHON_USEDEP}] dev-python/pyside[${PYTHON_USEDEP}] )
+			dev-python/pygments[${PYTHON_USEDEP}]
+			dev-python/pyzmq[${PYTHON_USEDEP}] )"
+DEPEND="${CDEPEND}
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+PY2_REQUSE="|| ( $(python_gen_useflags python2* ) )"
+REQUIRED_USE="
+	mongodb? ( ${PY2_REQUSE} )
+	notebook? ( ${PY2_REQUSE} )
+	octave? ( ${PY2_REQUSE} )
+	wxwidgets? ( ${PY2_REQUSE} )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.0.0-setuptools.patch
+)
+
+python_prepare_all() {
+	# fix for gentoo python scripts
+	sed -i \
+		-e "/ipython_cmd/s/ipython3/ipython/g" \
+		IPython/terminal/console/tests/test_console.py \
+		IPython/lib/irunner.py \
+		IPython/testing/tools.py || die
+
+	sed -i \
+		-e "s/find_scripts(True, suffix='3')/find_scripts(True)/" \
+		setup.py || die
+
+	# fix gentoo installation directory for documentation
+	sed -i \
+		-e "/docdirbase  = pjoin/s/ipython/${PF}/" \
+		-e "/pjoin(docdirbase,'manual')/s/manual/html/" \
+		setupbase.py || die "sed failed"
+
+	if ! use doc; then
+		sed -i \
+			-e "/(pjoin(docdirbase, 'extensions'), igridhelpfiles),/d" \
+			-e 's/ + manual_files//' \
+			setupbase.py || die
+	fi
+
+	if ! use examples; then
+		sed -i \
+			-e 's/+ example_files//' \
+			setupbase.py || die
+	fi
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use emacs && elisp-compile docs/emacs/ipython.el
+}
+
+src_test() {
+	# virtualx has trouble with parallel runs.
+	local DISTUTILS_NO_PARALLEL_BUILD=1
+	distutils-r1_src_test
+}
+
+python_test() {
+	# https://github.com/ipython/ipython/issues/2083
+	unset PYTHONWARNINGS
+
+	# ipython skips mongodb tests only if it's not running.
+	# since we want the widest test range, and don't want it to fiddle
+	# with user-running mongodb, we always run it if it's available.
+
+	local DB_IP=127.0.0.1
+	local DB_PORT=-1 # disable
+
+	pushd "${BUILD_DIR}"/../IPython/scripts/ > /dev/null
+
+	if has_version dev-db/mongodb; then
+		# please keep in sync with dev-python/pymongo
+
+		local dbpath=${TMPDIR}/mongo.db
+		local logpath=${TMPDIR}/mongod.log
+
+		# prefer starting with non-default one
+		DB_PORT=27018
+
+		mkdir -p "${dbpath}" || die
+		while true; do
+			ebegin "Trying to start mongod on port ${DB_PORT}"
+
+			LC_ALL=C \
+			mongod --dbpath "${dbpath}" --smallfiles --nojournal \
+				--bind_ip ${DB_IP} --port ${DB_PORT} \
+				--unixSocketPrefix "${TMPDIR}" \
+				--logpath "${logpath}" --fork \
+			&& sleep 2
+
+			# Now we need to check if the server actually started...
+			if [[ ${?} -eq 0 && -S "${TMPDIR}"/mongodb-${DB_PORT}.sock ]]; then
+				# yay!
+				eend 0
+				break
+			elif grep -q 'Address already in use' "${logpath}"; then
+				# ay, someone took our port!
+				eend 1
+				: $(( DB_PORT += 1 ))
+				continue
+			else
+				eend 1
+				ewarn "Unable to start mongod for tests."
+				break
+			fi
+		done
+	fi
+
+	# No support for DB_IP and DB_PORT.
+	# https://github.com/ipython/ipython/pull/2910
+	sed -i -e "s:Connection(:&host='${DB_IP}', port=${DB_PORT}:" \
+		"${BUILD_DIR}"/lib/IPython/parallel/tests/test_mongodb.py \
+		|| die "Unable to sed mongod port into tests"
+
+	local fail
+	run_tests() {
+		# Initialize ~/.ipython directory.
+		"${EPYTHON}" ipython </dev/null >/dev/null || fail=1
+		# Run tests (-v for more verbosity).
+		PYTHONPATH=${PYTHONPATH}:. "${EPYTHON}" iptest -v || fail=1
+	}
+
+	VIRTUALX_COMMAND=run_tests virtualmake
+
+	[[ ${DB_PORT} != -1 ]] && mongod --dbpath "${dbpath}" --shutdown
+	[[ ${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?
+	# 2. handle it in the eclass instead (use _python_ln_rel).
+	if [[ ${EPYTHON} == python* ]]; then
+		dosym ../lib/python-exec/${EPYTHON}/ipython \
+			/usr/bin/ipython${EPYTHON#python}
+	fi
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	if use emacs; then
+		cd docs/emacs || die
+		elisp-install ${PN} ${PN}.el*
+		elisp-site-file-install "${FILESDIR}"/62ipython-gentoo.el
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}