major version bump: extensive re-write; add py3.4 support, drop keywords arm ia64 ppc ppc64 (which will be requested for re-addition), re-write of doc build, test phase, patch by cel1, thanks to cel1 for cross testing, fixes Bug 507410

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

4 files changed, 201 insertions, 18 deletions

diff --git a/dev-python/ipython/ChangeLog b/dev-python/ipython/ChangeLog
index 66e9bb04620f..4455cfa00576 100644
--- a/dev-python/ipython/ChangeLog
+++ b/dev-python/ipython/ChangeLog
@@ -1,6 +1,15 @@
 # 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.138 2014/07/06 12:44:54 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/ipython/ChangeLog,v 1.139 2014/08/01 03:25:26 idella4 Exp $
+
+*ipython-2.1.0 (01 Aug 2014)
+
+  01 Aug 2014; Ian Delaney <idella4@gentoo.org>
+  +files/2.1.0-disable-tests.patch, +ipython-2.1.0.ebuild:
+  major version bump: extensive re-write; add py3.4 support, drop keywords arm
+  ia64 ppc ppc64 (which will be requested for re-addition), re-write of doc
+  build, test phase, patch by cel1, thanks to cel1 for cross testing, fixes Bug
+  507410
 
   06 Jul 2014; Michał Górny <mgorny@gentoo.org> ipython-0.12-r1.ebuild,
   ipython-0.13.2.ebuild, ipython-1.0.0.ebuild, ipython-1.1.0-r1.ebuild,
diff --git a/dev-python/ipython/Manifest b/dev-python/ipython/Manifest
index cf5acb58329f..74e38f84ff2f 100644
--- a/dev-python/ipython/Manifest
+++ b/dev-python/ipython/Manifest
@@ -1,6 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX 2.1.0-disable-tests.patch 1219 SHA256 e57afec15a63758a53bc8243cdcbeb0f5bdc3809fd3a47bd3328e5eb3246a996 SHA512 e049c8ba0b20ee57d9290e4a92378cd0cf4d323d90d199bca7bbf442ab158bbb31e1e2258c154bc26ff3fac08b7b0d19d56eb66e404d179d04178cd5aeeb9105 WHIRLPOOL 1b77f98bc754af7e7b0c510c618e61e546d306b0c3f14bd0e1410eb03239fd2dcb294c60a76c26da0dd39ab7899251180d6536c97400f63bd243fdc909009c71
 AUX 62ipython-gentoo.el 127 SHA256 b5900b95df4f197aedea20432f3c71de5bc7149fa1022f8417be7a606647b449 SHA512 83b8c1da29f954856f0c74521b2a58c3476eedce4ba8c2294c94bb8be63e2e87cf768a4769a6441509337f843b0c69d4e41e6e2041aa161fa8a3ffae11a5edf3 WHIRLPOOL 8c283ad947a4a6fee2976ff0da2075ae7f1c6a75bb4ed03895392e20053580205978457c24c24f6cc9d4f8a6f3031924e365a83c035603b739f734353386df45
 AUX ipython-0.12-globalpath.patch 430 SHA256 f0b2dbc53aa20dc1350af956a40ab748e092d0a471e0ac49e5ede75619658713 SHA512 1872dd568520e66ef88ac01050ceb4272cd7e666b27decc5d9fd2557d53f392c72385c6ccc9a2e34c1425d50e3608b34e3246e50344948f401b234499ad9f7f2 WHIRLPOOL 48d8a981f555dfb3c32eaccf24fc9f8f806bf22b5a8356dba3921acfde6c6f8a9d64212285bd5c6a1707d36b6dce4bc477a895bd50de6e5f64b7cdd17dfbc0a2
 AUX ipython-0.13-umlaut.patch 754 SHA256 d14ec97d769397d1f915dcc766e1696c254796bb0a03492171d8936b40c3cf37 SHA512 680f744dc603086928f8f8838d16b51633f29e7f96b75e37875816ae3248b21255f8f55420a6129b0f728202a7e601cda68641bdf5b067dbdfae81fb18b6a89c WHIRLPOOL 3e69fd4750905cd78391f51973a6dedab6536c80aeadfa8d8934768f791d6a60fd029fbea0bc6be0e690f5a6bebbe2979e0818169551fe07dcce0bc854542dc6
@@ -13,6 +14,7 @@ DIST ipython-1.0.0.tar.gz 8658118 SHA256 0d07521b4784e1b1f676b4b32c1f708a026cf39
 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
+DIST ipython-2.1.0.tar.gz 11886492 SHA256 ca86a6308c4b53ea8a040ba776066dc9a7af4ac738ad43ab2059a016c09b0c2d SHA512 68c15f6402cacfd623f8e2b70c22d06541de3616fdb2d502ce93cd2fdb4e7507bb5b841a414a4123264221ee5ffb0ebefbb8541f79e647fcb9f73310b4c2d460 WHIRLPOOL 099f387e00739c641c20e05bb3f23f46ef7ff82c6e273a0307163f0660cb1a92c2f78e1e0737f8be8173226eebeedf499e863538a77bf25f0c58e84f7447a123
 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
@@ -22,24 +24,13 @@ 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
-MISC ChangeLog 20976 SHA256 55dbc91ba8ebc01a772500621c49b701705fee922120741ea540fd309fb8f2ac SHA512 fea2fad01d5e97191398f59f65acbddb97b74bc8c13b0d1ca38f4b5490f3bd543a193fd5a6cd08e6161af6d539db8a8cd1fc057b6284b4b01fbd5ad36d755310 WHIRLPOOL cfc2cafa0d32ad6e7d9cca351ffe34ee682017ca61eee2588b744bfaacb19115e873213d60a0aea8c71442f996007697b3ed6a7d9308f4fda59a5c6964a0610c
+EBUILD ipython-2.1.0.ebuild 4127 SHA256 055fd0c0b612ce9a0cb24289caaa2470bdfdd4cd879fe1ae4b0f01c8c2f0d21e SHA512 cba64dff3c8defd112aa6568dc7e515371fdcf7402f4342fec9b9263a4166d65ab8530abfe2628a6f3b9b7897e6a4c9a0a96613e6410b6a6d82f3a1bf013f839 WHIRLPOOL db8bf237a10116d1d35f90886952d6e2a9b5710ddbb38f59125ee4fd9beef531fd9adb15941ca0a74f7a2e72dab14b7b85e74b29444c7490a38c1c6de010c625
+MISC ChangeLog 21359 SHA256 c7bd7cd492c47f3ec55aebcd9deb5609dd65af6dff28e88aa3230ba28b4dd3da SHA512 71d2e332064071aa19c0db6868be941954075e016df00ba2411e5679c297ee6fde74a0fd9f1d2c8beb6a3355952ee9b47af9979c1d4146f06be6a034f9766891 WHIRLPOOL 89f461735f27fb44b949cf5fd307b543d2877a0b30279f14de4b0d3e1e9f5c41c0303d2298555c98747bbabfa6803fe520d96030116b53483f239da145251fe1
 MISC metadata.xml 2823 SHA256 d36a8dd35788175aa1adc69e76b5705d9642f1446e8ae684d425d9118fcca485 SHA512 39fb6224fd57a66e3b80e401e093274b8b372efadda5abe34a26f566f0acb3fe11a3294441e5ae56b52918a3a3663faca442f26b534d26ddb963b8d39b7d7e5b WHIRLPOOL 0ff53e9848c6c2d000e4c15570dbea8f87029c2f6a38c4d3072ab1d9b735f3fad05876c5c87f4a3e8b3a5770f64523406a1f329bb5308188286c6e620b2c7f34
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQJ8BAEBCABmBQJTuUTVXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOq04P/R4Z2j0vFmgykEbQQWkKB3im
-uDWWPACO8GLG2LE0mSmDHyKSgMD8nZIQhU31IpsXSjW+MveI/i/i1GsMkDxNIekJ
-BGntn4ZovjgfOQm7xA6v6LqXVWCtUPB2HUocdVEb5zA55qWB/ulqLBGDkV8frt/5
-EN/sEuW9MLV82jpGc+FvlbXO+vhZDDeANZfa0A0kYNloDtug5fyq4+2QTMxMv67f
-POGWJXbRLTeR8MNw9NDmEFuLz2IZmu+rG6MOe8GqHrj+KdZ376BZuQrETBEuiuik
-bUMuBaFKtLwgtY2uU4US6blgK4VyyvZCHvUgbt8pBJCgv8+uo9pFNeGjEK31TZ8B
-MOrKiwV+pO+RhNStDrUobtJrERRsftNR3ZzunTIGus4GqsVCGGLGoymMtuDdBjoS
-UFYJG/TctvPr9g1OVK30r1OkJ1V9RrxupfsDLqYjM0MyZQZe6EHqSzcYM+J70fqZ
-tieKc4/ipVyC+WmOsq6+78MhMRjjmOekcFVWhinBTjK7e52rZkm0NWEgCMNpHwUG
-sSwGpwoxqPt2RbR9NRlaIBMK1gDY/CiR7pESON0gP/vRhk6exhNIqiCEpjO03LmQ
-ip6VnTDtadmEwWpOCrRv9qhvieGv7pUJfjjW25dQMGYtQMr86S+jKRPTtT4D/kgM
-P4Fuh73VHif8ni6TasE3
-=B1qb
+iEYEAREIAAYFAlPbBp0ACgkQso7CE7gHKw39NACgn5yIiLmqEqBS67L0TS/wE5LZ
+HhYAoJPeu565EUpU+veWo8CSQ72H83bi
+=0Yf7
 -----END PGP SIGNATURE-----
diff --git a/dev-python/ipython/files/2.1.0-disable-tests.patch b/dev-python/ipython/files/2.1.0-disable-tests.patch
new file mode 100644
index 000000000000..bdbb1be4246e
--- /dev/null
+++ b/dev-python/ipython/files/2.1.0-disable-tests.patch
@@ -0,0 +1,32 @@
+The extension magics for oct2py and rpy live now in the oct2py and rpy2 package. The tests shipped with ipython are broken. We should disable 
+those tests and remove the magics files:
+
+IPython/extensions/rmagic.py -> rpy/ipython/rmagic.py
+IPython/extension/octavemagic.py -> oct2py/ipython/octavemagic.py
+
+deleted:    IPython/extensions/octavemagic.py
+deleted:    IPython/extensions/rmagic.py
+modified:   IPython/testing/iptest.py
+
+diff --git a/IPython/testing/iptest.py b/IPython/testing/iptest.py
+index 45d2c78..db0bdfe 100644
+--- a/IPython/testing/iptest.py
++++ b/IPython/testing/iptest.py
+@@ -250,12 +250,10 @@ sec = test_sections['extensions']
+ if not have['cython']:
+     sec.exclude('cythonmagic')
+     sec.exclude('tests.test_cythonmagic')
+-if not have['oct2py']:
+-    sec.exclude('octavemagic')
+-    sec.exclude('tests.test_octavemagic')
+-if not have['rpy2'] or not have['numpy']:
+-    sec.exclude('rmagic')
+-    sec.exclude('tests.test_rmagic')
++sec.exclude('octavemagic')
++sec.exclude('tests.test_octavemagic')
++sec.exclude('rmagic')
++sec.exclude('tests.test_rmagic')
+ # autoreload does some strange stuff, so move it to its own test section
+ sec.exclude('autoreload')
+ sec.exclude('tests.test_autoreload')
+
diff --git a/dev-python/ipython/ipython-2.1.0.ebuild b/dev-python/ipython/ipython-2.1.0.ebuild
new file mode 100644
index 000000000000..9b70e1ea89d0
--- /dev/null
+++ b/dev-python/ipython/ipython-2.1.0.ebuild
@@ -0,0 +1,151 @@
+# 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.1 2014/08/01 03:25:26 idella4 Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_REQ_USE='readline,sqlite'
+
+inherit distutils-r1 elisp-common virtualx
+
+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 ~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)
+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}]
+	matplotlib? ( dev-python/matplotlib[${PYTHON_USEDEP}] )
+	mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] )
+	octave? ( dev-python/oct2py[${PYTHON_USEDEP}] )
+	smp? ( dev-python/pyzmq[${PYTHON_USEDEP}] )
+	wxwidgets? ( dev-python/wxpython[${PY2_USEDEP}] )"
+RDEPEND="${CDEPEND}
+	notebook? (
+		>=www-servers/tornado-2.1[${PYTHON_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}]
+		dev-python/oct2py[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		net-libs/nodejs )"
+
+PY2_REQUSE="$(python_gen_useflags python2_7)"
+REQUIRED_USE="
+	wxwidgets? ( ${PY2_REQUSE} )"
+
+DISTUTILS_IN_SOURCE_BUILD=1
+
+PATCHES=( "${FILESDIR}"/2.1.0-disable-tests.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/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
+
+	if use doc; then
+		# Prevent un-needed download during build
+		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() {
+		# Run tests (-v for more verbosity).
+		PYTHONPATH="${PYTHONPATH}:$(pwd)"
+		pushd ${TEST_DIR} > /dev/null
+		"${PYTHON}" -c "import IPython; IPython.test()" || fail=1
+		popd > /dev/null
+	}
+
+	VIRTUALX_COMMAND=run_tests virtualmake
+}
+
+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() {
+	use doc && local HTML_DOCS=( docs/build/html/. )
+	distutils-r1_python_install_all
+}