commit: 9f687d7c61af02f41df25384a8ce4faf35945c7a Author: François Bissey <francois.bissey <AT> canterbury <DOT> ac <DOT> nz> AuthorDate: Thu Sep 17 23:57:37 2015 +0000 Commit: Justin Lecher <jlec <AT> gentoo <DOT> org> CommitDate: Thu Sep 17 23:57:37 2015 +0000 URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=9f687d7c
dev-python/ipython: Solve circular dependency between ipython and ipyparallel when smp is enabled. Package-Manager: portage-2.2.20.1 dev-python/ipython/ChangeLog | 5 +++++ dev-python/ipython/ipython-4.0.0-r2.ebuild | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dev-python/ipython/ChangeLog b/dev-python/ipython/ChangeLog index 285fd7a..8503420 100644 --- a/dev-python/ipython/ChangeLog +++ b/dev-python/ipython/ChangeLog @@ -2,6 +2,11 @@ # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 # $Id$ + 17 Sep 2015; François Bissey <[email protected]> + ipython-4.0.0-r2.ebuild: + dev-python/ipython: Solve circular dependency between ipython and ipyparallel + when smp is enabled. + 16 Sep 2015; suhr <null@null> ipython-4.0.0-r2.ebuild: dev-python/ipython: separate wxwidgets dependency from ipywidgets diff --git a/dev-python/ipython/ipython-4.0.0-r2.ebuild b/dev-python/ipython/ipython-4.0.0-r2.ebuild index 2b8ea74..388fd0c 100644 --- a/dev-python/ipython/ipython-4.0.0-r2.ebuild +++ b/dev-python/ipython/ipython-4.0.0-r2.ebuild @@ -31,7 +31,6 @@ CDEPEND=" dev-python/traitlets[${PYTHON_USEDEP}] matplotlib? ( dev-python/matplotlib[${PYTHON_USEDEP}] ) mongodb? ( <dev-python/pymongo-3[${PYTHON_USEDEP}] ) - smp? ( dev-python/ipyparallel[${PYTHON_USEDEP}] ) wxwidgets? ( $(python_gen_cond_dep 'dev-python/wxpython:*[${PYTHON_USEDEP}]' python2_7) )" RDEPEND="${CDEPEND} @@ -65,6 +64,9 @@ DEPEND="${CDEPEND} >=www-servers/tornado-4.0[${PYTHON_USEDEP}] )" +PDEPEND=" + smp? ( dev-python/ipyparallel[${PYTHON_USEDEP}] )" + PATCHES=( "${FILESDIR}"/2.1.0-substitute-files.patch )
