bump; add install of examples

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xB8072B0D

4 files changed, 145 insertions, 7 deletions

diff --git a/dev-python/ipython/ChangeLog b/dev-python/ipython/ChangeLog
index 185eaae5caa6..5c4f51a3f704 100644
--- a/dev-python/ipython/ChangeLog
+++ b/dev-python/ipython/ChangeLog
@@ -1,6 +1,12 @@
 # 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.141 2014/08/07 14:56:54 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/ipython/ChangeLog,v 1.142 2014/08/12 08:34:03 idella4 Exp $
+
+*ipython-2.2.0 (12 Aug 2014)
+
+  12 Aug 2014; Ian Delaney <idella4@gentoo.org> +ipython-2.2.0.ebuild,
+  ipython-2.1.0.ebuild:
+  bump; add install of examples
 
   07 Aug 2014; Ian Delaney <idella4@gentoo.org>
   +files/2.1.0-substitute-files.patch, ipython-2.1.0.ebuild:
diff --git a/dev-python/ipython/Manifest b/dev-python/ipython/Manifest
index 49a542141fac..d5b6a823faad 100644
--- a/dev-python/ipython/Manifest
+++ b/dev-python/ipython/Manifest
@@ -16,6 +16,7 @@ DIST ipython-1.1.0.tar.gz 8658909 SHA256 6c4e4a65225ab45be923f6bd0b71b604ddf8acd
 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
 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
 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
@@ -25,13 +26,14 @@ EBUILD ipython-1.1.0-r2.ebuild 5939 SHA256 0b6f52512f5f86fa840ca908ae5e52207376c
 EBUILD ipython-1.1.0.ebuild 5673 SHA256 4f94786a76ca8afd71e5ae950396a0666017c3be48c2c4137dbb8e416f3e7fdc SHA512 bf4f64f2db21674bb43c55ab0dc4abaee0704ec5ce761f4772b67b247ed60a0027032e6cde4b4a52528fb776fe0c71483e0836735f496a07d700c40e7c90f392 WHIRLPOOL 3f1e2cf81ff5d694b8875b87efb78e667a7bbc13b08571f065e095284be0787cc8481b5cad49783bb04ecdb8cf4b7c3ba2867810dc4bf6dfe7f196988427b1cb
 EBUILD ipython-1.2.0.ebuild 5934 SHA256 dacf3d6b21ab7d4af4d52207ddda6fc14383ec2d9380395093b0b44d269b7341 SHA512 8d24325e6631d7ec01d6bffe887954f0a0da032a09a53efd8e0311a5e66f045631b550878b1592b36be32f74e8a138b9576912851e26fbe768657d8d131c2e87 WHIRLPOOL 615f43500973c1132f72c7517c7195abc20296962b6b7b7da466bc23e3e7b548ee6149450073a93bec69af0be482a1f93a88f1121f73532aa61578ace1024428
 EBUILD ipython-1.2.1.ebuild 6100 SHA256 15eb7c14355423c939f8f934367007fd841b031faa0e286eb7f330c0543b8ecd SHA512 6d8bc71b397007b56e06d2d33790e4faa4a1726fd171589c756b0b7729dcb59a334e76e70c35b1bf7b3d917d35e1846835b8b55566264d6d0dc757b2624bd62e WHIRLPOOL 90f17053d96457f5724adec7e644e79061caab1d2a21a8b512a150d300d8d3c23709d77cd5a43e74142e46dad8867217f3e5a2d638db10553d0f0da235da1e3e
-EBUILD ipython-2.1.0.ebuild 3820 SHA256 789f84388134f07e23b385a6f0971fe33b22c63398dd7792f1bb0b7e3b32b7bc SHA512 cbd0d8a555234a6511552fffa7aff859b03cf63bc0b1af8ad8c0dde1509433adf1b0d74a4539240d083673fd3eba1fbd75fd94e9bf5cc9a41f53e0e164ee615f WHIRLPOOL a3170025f0c46b6cc9c2c40a6be80d1266f77473d3340a6f5f01f6adb8d4c2981c00c7019badd8caefb6faf48ab5f95f422c2211c9e6d74d5819bb110f1f4e51
-MISC ChangeLog 21736 SHA256 887ea800564d41b7ede74bee4da0f999962953369fedb049cdee5cd58283afd2 SHA512 f88b5279d91c39677df31f6636b27bc2c5b6f88edaada6f473c641e8bbb1b9c00df44cc67efdb33f55bea0ed75e1a3589283611864d79c51e7c9203a9c188fa2 WHIRLPOOL a1e08e7292a2acfecc29a912e75922d4440d840ea44e79b15806df0857f9fab00efa75f336fb6a9522e31b523d8ab09d58990395b747df9871f4c8f32e529c95
+EBUILD ipython-2.1.0.ebuild 3867 SHA256 43780bc09a84584b7799d86c8e11f71ba4520da692aa8bf115b2d350d19f2e0a SHA512 6b2b7f796cd77d635280199e2ef2147104b8571b826ce81a4873f5f4457ecab3c5c6d6d3fc6338a47b1d29261c8f554b34f5a7401135f84b195377f5b3fb9f9f WHIRLPOOL 5950f0fd9df0cbf6f1db4d3dafc8b682f786d8ebf1b350dd81740c1a382f87ef72911af4bf0d90030188aeb06fe8d34e52faca8a590d686c951dbf114ba852eb
+EBUILD ipython-2.2.0.ebuild 3867 SHA256 2af16d9581b5abe851a0c78f7613cb8a4a6fd930ea4235882dfd6c5dca40f7a2 SHA512 46b7aa96cb41b0b3cbb8533d2efff8102ab3fe90e02afb8e0fd73098d6bfcfc8e96eba7301ccf2fee14897b6cd1e03f2f34e371a93ee7b1539c45271450ece89 WHIRLPOOL b16f19df11ab32da9e747fe3d45de938a6205dbda55187cb39cac9500a408b72c1708e49cf9fc31d6e75744e300b8a65de0ef2e415c91459f912193a659f3527
+MISC ChangeLog 21894 SHA256 d3cad56b786a85fa466ff346101c7b814062a2c00bcb5abffc54a57507f52c22 SHA512 9053d6ba478749ba778aac986ed2b0274bf0776bdc895f977937532bad90986498cffd2d2db15d6572f0e561b3ca0ad3c2d109338a894ce320e8c6da747dcebe WHIRLPOOL 1f19bf2f82e72e3c87f97ab8a41b16b76f3ade5bdb93ab1ae950874a69586f05e92e69d0570c1174a7dbe0f32634f5b15c83b03e968a38404d63b496a8630b42
 MISC metadata.xml 2823 SHA256 d36a8dd35788175aa1adc69e76b5705d9642f1446e8ae684d425d9118fcca485 SHA512 39fb6224fd57a66e3b80e401e093274b8b372efadda5abe34a26f566f0acb3fe11a3294441e5ae56b52918a3a3663faca442f26b534d26ddb963b8d39b7d7e5b WHIRLPOOL 0ff53e9848c6c2d000e4c15570dbea8f87029c2f6a38c4d3072ab1d9b735f3fad05876c5c87f4a3e8b3a5770f64523406a1f329bb5308188286c6e620b2c7f34
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlPjkbEACgkQso7CE7gHKw1KyACggyk5AioSsUHr5tYDMW5+psAg
-AaoAoJL8fpcxLMSbjytPFbcL12Akteje
-=IVAV
+iEYEAREIAAYFAlPpz2cACgkQso7CE7gHKw3qNwCff6HNqyKkMmVGmmo9H7bNX5je
+fUIAn0hs0g85wGz8EmttIsMO6cOlTZHR
+=OxJp
 -----END PGP SIGNATURE-----
diff --git a/dev-python/ipython/ipython-2.1.0.ebuild b/dev-python/ipython/ipython-2.1.0.ebuild
index fe8fed0f6312..32a4a5da2a43 100644
--- a/dev-python/ipython/ipython-2.1.0.ebuild
+++ b/dev-python/ipython/ipython-2.1.0.ebuild
@@ -1,6 +1,6 @@
 # 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.1.0.ebuild,v 1.2 2014/08/07 14:54:50 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/ipython/ipython-2.1.0.ebuild,v 1.3 2014/08/12 08:34:03 idella4 Exp $
 
 EAPI=5
 
@@ -119,6 +119,7 @@ python_install() {
 
 python_install_all() {
 	use doc && local HTML_DOCS=( docs/build/html/. )
+	use examples && local EXAMPLES=( examples/. )
 	distutils-r1_python_install_all
 }
 
diff --git a/dev-python/ipython/ipython-2.2.0.ebuild b/dev-python/ipython/ipython-2.2.0.ebuild
new file mode 100644
index 000000000000..b06380ab0e69
--- /dev/null
+++ b/dev-python/ipython/ipython-2.2.0.ebuild
@@ -0,0 +1,129 @@
+# 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.2.0.ebuild,v 1.1 2014/08/12 08:34:03 idella4 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 ~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}]
+	)
+	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)
+	)"
+
+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"
+}