Version Bump; drop old

(Portage version: 2.2.17/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)

10 files changed, 50 insertions, 1492 deletions

diff --git a/dev-python/ipython/ChangeLog b/dev-python/ipython/ChangeLog
index 02863c6b4a36..fda828505bdc 100644
--- a/dev-python/ipython/ChangeLog
+++ b/dev-python/ipython/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-python/ipython
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/ipython/ChangeLog,v 1.159 2015/02/08 23:24:05 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/ipython/ChangeLog,v 1.160 2015/02/28 12:53:04 jlec Exp $
+
+*ipython-3.0.0 (28 Feb 2015)
+
+  28 Feb 2015; Justin Lecher <jlec@gentoo.org> +ipython-3.0.0.ebuild,
+  -ipython-0.12-r1.ebuild, -ipython-0.13.2.ebuild, -ipython-1.1.0-r1.ebuild,
+  -ipython-1.1.0-r2.ebuild, -ipython-1.1.0.ebuild, -ipython-1.2.0.ebuild,
+  -ipython-2.1.0.ebuild, -ipython-2.3.0.ebuild, -ipython-2.3.1.ebuild:
+  Version Bump; drop old
 
   08 Feb 2015; Kacper Kowalik <xarthisius@gentoo.org> ipython-2.4.0.ebuild:
   Simplify check if pandoc is installed. Thanks to Arfrever for a suggestion
diff --git a/dev-python/ipython/ipython-0.12-r1.ebuild b/dev-python/ipython/ipython-0.12-r1.ebuild
deleted file mode 100644
index 5940ae64e948..000000000000
--- a/dev-python/ipython/ipython-0.12-r1.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# 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-0.12-r1.ebuild,v 1.10 2014/07/06 12:44:54 mgorny Exp $
-
-EAPI=4
-
-# python eclass cruft
-PYTHON_DEPEND="*:2.6"
-PYTHON_USE_WITH="readline sqlite"
-PYTHON_MODNAME="IPython"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.5 *-pypy-*"
-
-inherit distutils elisp-common eutils virtualx
-
-DESCRIPTION="Advanced interactive shell for Python"
-HOMEPAGE="http://ipython.org/"
-SRC_URI="http://archive.ipython.org/release/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc emacs examples matplotlib mongodb notebook +smp qt4 test wxwidgets"
-
-CDEPEND="dev-python/decorator
-	dev-python/pexpect
-	dev-python/pyparsing
-	dev-python/simplegeneric
-	emacs? ( app-emacs/python-mode virtual/emacs )
-	matplotlib? ( dev-python/matplotlib )
-	mongodb? ( dev-python/pymongo )
-	smp? ( dev-python/pyzmq )
-	wxwidgets? ( dev-python/wxpython )"
-RDEPEND="${CDEPEND}
-	notebook? ( >=www-servers/tornado-2.1
-			dev-python/pygments
-			dev-python/pyzmq )
-	qt4? ( || ( dev-python/PyQt4 dev-python/pyside )
-			dev-python/pygments
-			dev-python/pyzmq )"
-DEPEND="${CDEPEND}
-	test? ( dev-python/nose )"
-
-src_prepare() {
-	distutils_src_prepare
-	epatch "${FILESDIR}"/${P}-globalpath.patch
-
-	# fix for gentoo python scripts
-	sed -i \
-		-e "/ipython_cmd/s/ipython3/ipython/g" \
-		IPython/frontend/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)/" \
-		setup3.py || die
-
-	# failing tests
-	sed -i \
-		-e 's/test_smoketest_aimport/_&/' \
-		-e 's/test_smoketest_autoreload/_&/' \
-		 IPython/extensions/tests/test_autoreload.py || die
-	sed -i \
-		-e 's/test_pylab_import_all_disabled/_&/' \
-		-e 's/test_pylab_import_all_enabled/_&/' \
-		IPython/lib/tests/test_irunner_pylab_magic.py || die
-	sed -i \
-		-e '/test_startup_py/i\\@dec.known_failure_py3' \
-		-e '/test_startup_ipy/i\\@dec.known_failure_py3' \
-		IPython/core/tests/test_profile.py || die
-	sed -i \
-		-e '/test_tclass/i\\    @dec.known_failure_py3' \
-		IPython/core/tests/test_run.py || die
-
-	# installation directory for documentation
-	sed -i \
-		-e "/docdirbase  = pjoin/s/ipython/${PF}/" \
-		-e "/pjoin(docdirbase,'manual')/s/manual/html/" \
-		setupbase.py || die "sed failed"
-
-	rm -rf docs/html/{.buildinfo,_sources,objects.inv} || die
-
-	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
-}
-
-src_compile() {
-	distutils_src_compile
-	use emacs && elisp-compile docs/emacs/ipython.el
-}
-
-src_test() {
-	if use mongodb; then
-		mkdir -p "${T}/mongo.db"
-		mongod --dbpath "${T}/mongo.db" --fork --logpath "${T}/mongo.log"
-	fi
-
-	testing() {
-		"$(PYTHON)" setup.py \
-			build -b "build-${PYTHON_ABI}" \
-			install --root="${T}/tests-${PYTHON_ABI}" > /dev/null || die
-		# Initialize ~/.ipython directory.
-		PATH="${T}/tests-${PYTHON_ABI}${EPREFIX}/usr/bin:${PATH}" \
-			PYTHONPATH="${T}/tests-${PYTHON_ABI}${EPREFIX}$(python_get_sitedir)" \
-			ipython <<< "" > /dev/null || return 1
-		# Run tests (-v for more verbosity).
-		PATH="${T}/tests-${PYTHON_ABI}${EPREFIX}/usr/bin:${PATH}" \
-			PYTHONPATH="${T}/tests-${PYTHON_ABI}${EPREFIX}$(python_get_sitedir)" \
-			iptest -v || return 1
-	}
-	VIRTUALX_COMMAND="python_execute_function" virtualmake testing
-
-	use mongodb && killall -u "$(id -nu)" mongod
-}
-
-src_install() {
-	distutils_src_install
-	if use emacs; then
-		pushd docs/emacs > /dev/null
-		elisp-install ${PN} ${PN}.el*
-		elisp-site-file-install "${FILESDIR}"/62ipython-gentoo.el
-		popd > /dev/null
-	fi
-}
-
-pkg_postinst() {
-	distutils_pkg_postinst
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	distutils_pkg_postrm
-	use emacs && elisp-site-regen
-}
diff --git a/dev-python/ipython/ipython-0.13.2.ebuild b/dev-python/ipython/ipython-0.13.2.ebuild
deleted file mode 100644
index 2655c13b490c..000000000000
--- a/dev-python/ipython/ipython-0.13.2.ebuild
+++ /dev/null
@@ -1,196 +0,0 @@
-# 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-0.13.2.ebuild,v 1.11 2014/07/06 12:44:54 mgorny 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
-
-DESCRIPTION="Advanced interactive shell for Python"
-HOMEPAGE="http://ipython.org/"
-SRC_URI="http://archive.ipython.org/release/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc emacs examples matplotlib mongodb notebook octave
-	qt4 +smp test wxwidgets"
-
-PY2_USEDEP=$(python_gen_usedep 'python2*')
-
-CDEPEND="dev-python/decorator[${PYTHON_USEDEP}]
-	dev-python/pexpect[${PY2_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/simplegeneric[${PYTHON_USEDEP}]
-	dev-python/pyparsing[${PYTHON_USEDEP}]
-	emacs? ( app-emacs/python-mode virtual/emacs )
-	matplotlib? ( dev-python/matplotlib[${PYTHON_USEDEP}] )
-	mongodb? ( dev-python/pymongo[${PY2_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}] )
-	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} )"
-DISTUTILS_IN_SOURCE_BUILD=1
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.12-globalpath.patch"
-	"${FILESDIR}/ipython-1.0.0-setuptools.patch"
-)
-
-python_prepare_all() {
-	# fix for gentoo python scripts
-	sed -i \
-		-e "/ipython_cmd/s/ipython3/ipython/g" \
-		IPython/frontend/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
-
-	# disable failing tests
-	sed -i \
-		-e 's/test_pylab_import_all_disabled/_&/' \
-		-e 's/test_pylab_import_all_enabled/_&/' \
-		IPython/lib/tests/test_irunner_pylab_magic.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
-
-	# testsuite runs fine with in source
-
-	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.
-		"${PYTHON}" ipython </dev/null >/dev/null || fail=1
-		# Run tests (-v for more verbosity).
-		PYTHONPATH=${PYTHONPATH}:. "${PYTHON}" iptest -v || fail=1
-	}
-
-	VIRTUALX_COMMAND=run_tests virtualmake
-
-	[[ ${DB_PORT} != -1 ]] && mongod --dbpath "${dbpath}" --shutdown
-	[[ ${fail} ]] && die "Tests fail with ${EPYTHON}"
-}
-
-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
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-python/ipython/ipython-1.1.0-r1.ebuild b/dev-python/ipython/ipython-1.1.0-r1.ebuild
deleted file mode 100644
index 1d988b152b3a..000000000000
--- a/dev-python/ipython/ipython-1.1.0-r1.ebuild
+++ /dev/null
@@ -1,211 +0,0 @@
-# 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.1.0-r1.ebuild,v 1.3 2014/08/27 12:19:41 blueness 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 ~ppc ~ppc64 ~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}]
-	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}/ipython-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
-}
-
-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/ipython-1.1.0-r2.ebuild b/dev-python/ipython/ipython-1.1.0-r2.ebuild
deleted file mode 100644
index e9e6cb9891ac..000000000000
--- a/dev-python/ipython/ipython-1.1.0-r2.ebuild
+++ /dev/null
@@ -1,220 +0,0 @@
-# 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.1.0-r2.ebuild,v 1.3 2014/08/27 12:19:41 blueness 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 ~ppc ~ppc64 ~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}]
-	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}/ipython-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/ipython-1.1.0.ebuild b/dev-python/ipython/ipython-1.1.0.ebuild
deleted file mode 100644
index fb3b51e4f1cf..000000000000
--- a/dev-python/ipython/ipython-1.1.0.ebuild
+++ /dev/null
@@ -1,211 +0,0 @@
-# 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.1.0.ebuild,v 1.5 2014/08/27 12:19:41 blueness 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 ~ppc ~ppc64 ~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[${PY2_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/simplegeneric[${PYTHON_USEDEP}]
-	dev-python/pyparsing[${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}/ipython-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
-}
-
-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/ipython-1.2.0.ebuild b/dev-python/ipython/ipython-1.2.0.ebuild
deleted file mode 100644
index 32571a60c21e..000000000000
--- a/dev-python/ipython/ipython-1.2.0.ebuild
+++ /dev/null
@@ -1,220 +0,0 @@
-# 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.3 2014/08/27 12:19:41 blueness 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 ~ppc ~ppc64 ~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}]
-	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/ipython-2.1.0.ebuild b/dev-python/ipython/ipython-2.1.0.ebuild
deleted file mode 100644
index d85ed743db2f..000000000000
--- a/dev-python/ipython/ipython-2.1.0.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# 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.6 2014/11/29 20:04:31 maekke 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 ~arm ~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}]
-	)
-	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"
-}
diff --git a/dev-python/ipython/ipython-2.3.0.ebuild b/dev-python/ipython/ipython-2.3.0.ebuild
deleted file mode 100644
index 9f271fd23e70..000000000000
--- a/dev-python/ipython/ipython-2.3.0.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# 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.0.ebuild,v 1.3 2014/12/03 01:59:27 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 ~arm ~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"
-}
diff --git a/dev-python/ipython/ipython-2.3.1.ebuild b/dev-python/ipython/ipython-3.0.0.ebuild
index 848e36139f60..91aaf86221cb 100644
--- a/dev-python/ipython/ipython-2.3.1.ebuild
+++ b/dev-python/ipython/ipython-3.0.0.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2015 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.4 2015/01/31 07:05:41 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/ipython/ipython-3.0.0.ebuild,v 1.1 2015/02/28 12:53:04 jlec Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_COMPAT=( python2_7 python3_{3,4} )
 PYTHON_REQ_USE='readline,sqlite'
 
-inherit distutils-r1 virtualx
+inherit distutils-r1 eutils virtualx
 
 DESCRIPTION="Advanced interactive shell for Python"
 HOMEPAGE="http://ipython.org/"
@@ -15,67 +15,74 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-
+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/pyparsing[${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}] )
+	smp? ( >=dev-python/pyzmq-13[${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-libs/mathjax
+		dev-python/jinja[${PYTHON_USEDEP}]
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+		>=dev-python/mistune-0.5[${PYTHON_USEDEP}]
 		dev-python/pygments[${PYTHON_USEDEP}]
 		>=dev-python/pyzmq-2.1.11[${PYTHON_USEDEP}]
-		dev-python/jinja[${PYTHON_USEDEP}]
-		dev-libs/mathjax
+		>=dev-python/terminado-0.3.3[${PYTHON_USEDEP}]
+		>=www-servers/tornado-3.1[${PYTHON_USEDEP}]
 	)
 	nbconvert? (
-		>=app-text/pandoc-1.12.1
+		|| ( >=net-libs/nodejs-0.9.12 >=app-text/pandoc-1.12.1 )
+		dev-python/jinja[${PYTHON_USEDEP}]
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+		>=dev-python/mistune-0.5[${PYTHON_USEDEP}]
 		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}] )
+	qt4? (
+		|| ( dev-python/PyQt4[${PYTHON_USEDEP}] dev-python/pyside[${PYTHON_USEDEP}] )
 		dev-python/pygments[${PYTHON_USEDEP}]
-		>=dev-python/pyzmq-2.1.11[${PYTHON_USEDEP}] )"
+		>=dev-python/pyzmq-13[${PYTHON_USEDEP}] )"
 DEPEND="${CDEPEND}
 	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/jinja[${PYTHON_USEDEP}]
 		dev-python/mock[${PY2_USEDEP}]
-		>=www-servers/tornado-3.1[${PYTHON_USEDEP}]
+		>=dev-python/nose-0.10.1[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
 		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/jinja[${PYTHON_USEDEP}]
+		>=www-servers/tornado-4.0[${PYTHON_USEDEP}]
 	)
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/numpydoc[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
+	doc? (
 		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}]
+		>=dev-python/nose-0.10.1[${PYTHON_USEDEP}]
+		dev-python/numpydoc[${PYTHON_USEDEP}]
+		dev-python/rpy[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.1[${PYTHON_USEDEP}]
+		>=www-servers/tornado-4.0[${PYTHON_USEDEP}]
 	)"
 
 REQUIRED_USE="doc? ( matplotlib mongodb octave )"
 
-PATCHES=( "${FILESDIR}/2.1.0-substitute-files.patch"
-	"${FILESDIR}/2.1.0-disable-tests.patch" )
+PATCHES=(
+	"${FILESDIR}"/2.1.0-substitute-files.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
@@ -128,6 +135,13 @@ 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"
+	optfeature "sympyprinting" dev-python/sympy
+	optfeature "cythonmagic" dev-python/cython
+	if use nbconvert; then
+		if ! has_version app-text/pandoc ; then
+			einfo "Node.js will be used to convert notebooks to other formats"
+			einfo "like HTML. Support for that is still experimental. If you"
+			einfo "encounter any problems, please use app-text/pandoc instead."
+		fi
+	fi
 }