dev-python/ipython: Version BUmp, tests fail with py3.3 https://github.com/ipython/ipython/issues/5182

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

4 files changed, 259 insertions, 27 deletions

diff --git a/dev-python/ipython/ChangeLog b/dev-python/ipython/ChangeLog
index 01dc86cd987c..ef0c875c0595 100644
--- a/dev-python/ipython/ChangeLog
+++ b/dev-python/ipython/ChangeLog
@@ -1,6 +1,13 @@
 # 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.133 2014/02/16 20:40:06 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/ipython/ChangeLog,v 1.134 2014/02/21 12:07:48 jlec Exp $
+
+*ipython-1.2.0 (21 Feb 2014)
+
+  21 Feb 2014; Justin Lecher <jlec@gentoo.org> +ipython-1.2.0.ebuild,
+  metadata.xml:
+  Version BUmp, tests fail with py3.3
+  https://github.com/ipython/ipython/issues/5182
 
   16 Feb 2014; Mike Frysinger <vapier@gentoo.org> ipython-1.0.0.ebuild:
   Mark arm stable.
diff --git a/dev-python/ipython/Manifest b/dev-python/ipython/Manifest
index bde2e664acd8..546dde10e05e 100644
--- a/dev-python/ipython/Manifest
+++ b/dev-python/ipython/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX 62ipython-gentoo.el 127 SHA256 b5900b95df4f197aedea20432f3c71de5bc7149fa1022f8417be7a606647b449 SHA512 83b8c1da29f954856f0c74521b2a58c3476eedce4ba8c2294c94bb8be63e2e87cf768a4769a6441509337f843b0c69d4e41e6e2041aa161fa8a3ffae11a5edf3 WHIRLPOOL 8c283ad947a4a6fee2976ff0da2075ae7f1c6a75bb4ed03895392e20053580205978457c24c24f6cc9d4f8a6f3031924e365a83c035603b739f734353386df45
 AUX ipython-0.12-globalpath.patch 430 SHA256 f0b2dbc53aa20dc1350af956a40ab748e092d0a471e0ac49e5ede75619658713 SHA512 1872dd568520e66ef88ac01050ceb4272cd7e666b27decc5d9fd2557d53f392c72385c6ccc9a2e34c1425d50e3608b34e3246e50344948f401b234499ad9f7f2 WHIRLPOOL 48d8a981f555dfb3c32eaccf24fc9f8f806bf22b5a8356dba3921acfde6c6f8a9d64212285bd5c6a1707d36b6dce4bc477a895bd50de6e5f64b7cdd17dfbc0a2
@@ -11,6 +11,7 @@ DIST ipython-0.12.tar.gz 9316219 SHA256 261fb1ad6e8e60b19efbcde76636b71dd83cf894
 DIST ipython-0.13.2.tar.gz 5982733 SHA256 17fbeea1dff2318d617d90fdf7af4eb35dc48c61389a2dffaab8ff100fb100ea SHA512 9ce36c77b8796fb6b990e32fe63ba1f3f2d78eb0440ff5b62597a1c033fd7c6d04ba9d3d4a4171c38c5623b6deeee87b48297f816a9d053f2c3096fc075e28a9 WHIRLPOOL feea5758e2478c1f582f0f56b1d0b106e01a3a3c902dcf7ea3199c1cacd3059f313839fe6d27ad532d1748525b12e4eaba5ff2af7b85f39e204150c38fe26a03
 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
 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
@@ -18,22 +19,25 @@ EBUILD ipython-1.0.0.ebuild 5714 SHA256 c7c5235637653dfd8df0b85923a4bf86bcce294b
 EBUILD ipython-1.1.0-r1.ebuild 5722 SHA256 5537d1837290b6eb326e5bcbd80d56197a28b5ec484157aa6dc791b5f1780edd SHA512 0c2d5938c6958b88f224106c7bce6261d7c45f478c434d85cca6aa82569dad8d0f270b7e48be5db23a8781e4782866ada9364a4995c3280b9313c31636914785 WHIRLPOOL 3cccd6052b794870a25cde1bb39f088388c19772e5be4105dd70d5828250f681ef01aa97365a3d3d1f0ce05edf69280800435db6c5c4506e064c3c2be5611548
 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
-MISC ChangeLog 20065 SHA256 dec4f2656ea0ffe259ff19b57d087f157db1caf1f17d159c529feb218e8c8439 SHA512 80ab809509bce03c7923ffb59f2ed35d57a5107be9a9c7ebe70df8ec543c32faf39c10ff880dd77e35c6cd0f5444e05389c3d92276c5a1d17bd080d5950665c5 WHIRLPOOL 24298d4bfdb2874b2d0c4416ce978fe8c497734c9f8d8d5067de2471ab93fa5b0578a5130820f606f9115ebe00d6851f5dafafe187da6e2209fe629e9605b3da
-MISC metadata.xml 2803 SHA256 6cec3ab4d81eaf8b6019d93d68e53efcbfdc88ccf52588e8dcc447f2d00d999f SHA512 3f4a6296f4d08d149af0dd85b6198134b8b68bd2972c01a148cd091414c1818a01a498d30ade1a3a56d98f4f8fd64f7898f3992500713fe33e59f2527353ac87 WHIRLPOOL 84b96e09a6d40bf77079b12c1c3e8a7e1f56cd52b8e9795cb748c60e295444ed9d9e0e909e9da961c02e76975d0f0f8125bddf90ebe0e0e2f8d8233239749364
+EBUILD ipython-1.2.0.ebuild 5975 SHA256 aea1cb9005fafe97ec62365f366a38243dc5f50f729773b27dca1c62676e5440 SHA512 d6aa31ee8cbdef8de98fab3958f317c7304702f465bcebfa434d75daa80c05c5961dce9e5fe48a6bd0c84967c0ec015c2dcbe3ef86e8f49c65b372b06e6b65a7 WHIRLPOOL 9aa070a9aa6d42b50e69ce830f568f5e5bacac1bc9270e3044a3adc3ee063249c85bdd8a5142b0c06f2be59705f7c2212f6c40d26698457c2ef896bc10a7dad3
+MISC ChangeLog 20267 SHA256 2ded048f9e64e011c42602427cc9637611b50675dde333440815d079fe657af3 SHA512 19698ddec5ed1d34fdb2e8ced972f862ac39ec7770c80e3bd1e14a034b52abcdf347aeea29d4aa839753daf0a21277a8ad366958dc1c9749323c9fbe8511c951 WHIRLPOOL 404e15d7a66eb44e475bce89479d00d3a0033b692e71cf87d92cd095fd9beefcf5fcb9fae96b4a6cf006bbe0fb9f9eb4c7478e042c96f0c5ec67df065ba41458
+MISC metadata.xml 2823 SHA256 d36a8dd35788175aa1adc69e76b5705d9642f1446e8ae684d425d9118fcca485 SHA512 39fb6224fd57a66e3b80e401e093274b8b372efadda5abe34a26f566f0acb3fe11a3294441e5ae56b52918a3a3663faca442f26b534d26ddb963b8d39b7d7e5b WHIRLPOOL 0ff53e9848c6c2d000e4c15570dbea8f87029c2f6a38c4d3072ab1d9b735f3fad05876c5c87f4a3e8b3a5770f64523406a1f329bb5308188286c6e620b2c7f34
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTASIrAAoJEPGu1DbS6WIATe8P/35Px2bdW9v4HaSmHnjIkEUJ
-e/f5xbx8jGGGCbnhRUCLpCA6ffGhjCU1q5Vy2wkygna3zByUhS6jrofhhPKWzjwt
-vWqcCn+XaReO6CElMmdzO9Ey8D+3IJEdO1hF/p27c4nR5gjNOyh1VIyd75sOGNg3
-qEVgXD9/gOSrFVc/JVNyA1/fOo5BS08X2aLAV/5wFuLe0Dc7u2T/EfsYBBXVemtJ
-Zhr5VGuFP8wgOX+z2okqVhhA4Awblb0uacvSePwG7rQaewAd1wiO6HcMfnUtGuv1
-ypr4ZR7wF408NXgroiSxabFIwq6NvzzVFc0tF0BCBITVvxj8zSe0/6V567iqgFvI
-KeGGtoOYxSfY/W7nb1lmIiX7g8O4f69J0rPCtZiFk88BTUmnT3BEEQRNAIqdM/Hg
-URNNscTxEuTGAwfPsGk+neJ9U5WRxGXVXDEEF/y1qUk26SMZPyA2OQ0uiblWEJLv
-dgnioRjkKVpPsvnqMh1vhvxe9eF8DaUvjJ1fGS7fkyQOrSwf+Xwxv8J2hrBhaZTi
-TC4qDew6iVaJ6wx/mHDxvo3DHyTC/ERuWoNnmYXkwDKtZRXcU1p3cDbAl5WEkBg7
-+hvm7G9nSI/mGYjKyPQKZrdlmvfNxvuQjgD9MOJy/tl/61UpLBwLYiVJZHDwOs35
-dNlres4FLM3D6MoBmh2E
-=PalZ
+iQJ8BAEBCgBmBQJTB0GVXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+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
 -----END PGP SIGNATURE-----
diff --git a/dev-python/ipython/ipython-1.2.0.ebuild b/dev-python/ipython/ipython-1.2.0.ebuild
new file mode 100644
index 000000000000..b44bdc05aba8
--- /dev/null
+++ b/dev-python/ipython/ipython-1.2.0.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.0.ebuild,v 1.1 2014/02/21 12:07:48 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
+}
diff --git a/dev-python/ipython/metadata.xml b/dev-python/ipython/metadata.xml
index f35524b99372..94239d2f7c7d 100644
--- a/dev-python/ipython/metadata.xml
+++ b/dev-python/ipython/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>python</herd>
-<longdescription lang="en">
+  <herd>python</herd>
+  <longdescription lang="en">
   IPython provides a replacement for the interactive Python interpreter with
   extra functionality. Main features:
   * Comprehensive object introspection.
@@ -20,7 +20,7 @@
   * Easily embeddable in other Python programs.
   * Integrated access to the pdb debugger and the Python profiler.
 </longdescription>
-<longdescription lang="ja">
+  <longdescription lang="ja">
 対話的に利用する場合にPythonインタープリタから、より機能が豊富なIPythonへ置き換&gt;える事ができます。
 
 主機能：
@@ -38,11 +38,11 @@
 * 他のPython言語プログラムを組み込むのが簡単。
 * pdbデバッガとprofilerへの統合アクセス。
 </longdescription>
-<use>
-  <flag name="matplotlib">Add support for <pkg>dev-python/matplotlib</pkg></flag>
-  <flag name="mongodb">Enable support for MongoDB via <pkg>dev-python/pymongo</pkg></flag>
-  <flag name="notebook">Install requirements for the web notebook based on <pkg>www-servers/tornado</pkg></flag>
-  <flag name="nbconvert">Enable support for converting notebooks to various formats using <pkg>app-text/pandoc</pkg></flag>
-  <flag name="octave">Enable octave bridge via <pkg>dev-python/oct2py</pkg></flag>
-</use>
+  <use>
+    <flag name="matplotlib">Add support for <pkg>dev-python/matplotlib</pkg></flag>
+    <flag name="mongodb">Enable support for MongoDB via <pkg>dev-python/pymongo</pkg></flag>
+    <flag name="notebook">Install requirements for the web notebook based on <pkg>www-servers/tornado</pkg></flag>
+    <flag name="nbconvert">Enable support for converting notebooks to various formats using <pkg>app-text/pandoc</pkg></flag>
+    <flag name="octave">Enable octave bridge via <pkg>dev-python/oct2py</pkg></flag>
+  </use>
 </pkgmetadata>