From 96ed940db8028ce80a3a80629921807337ad74e1 Mon Sep 17 00:00:00 2001 From: Marius Brehler Date: Wed, 2 Sep 2015 10:01:31 +0200 Subject: dev-python/ipython: Re-Fix #474; notebook use flag requires use wxwidgets Package-Manager: portage-2.2.20.1 --- dev-python/ipython/ChangeLog | 4 ++++ dev-python/ipython/ipython-4.0.0-r1.ebuild | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dev-python/ipython/ChangeLog b/dev-python/ipython/ChangeLog index 66d2f0a92..fa0379bd5 100644 --- a/dev-python/ipython/ChangeLog +++ b/dev-python/ipython/ChangeLog @@ -2,6 +2,10 @@ # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 # $Id$ + 02 Sep 2015; Marius Brehler + ipython-4.0.0-r1.ebuild: + dev-python/ipython: Re-Fix #474; notebook use flag requires use wxwidgets + 01 Sep 2015; Sean Vig dev-python/ipython: remove mathjax references diff --git a/dev-python/ipython/ipython-4.0.0-r1.ebuild b/dev-python/ipython/ipython-4.0.0-r1.ebuild index 8b905053b..535df00d3 100644 --- a/dev-python/ipython/ipython-4.0.0-r1.ebuild +++ b/dev-python/ipython/ipython-4.0.0-r1.ebuild @@ -20,7 +20,8 @@ IUSE="doc examples matplotlib mongodb notebook nbconvert qt4 +smp test wxwidgets REQUIRED_USE=" test? ( doc matplotlib mongodb notebook nbconvert qt4 wxwidgets ) - doc? ( mongodb )" + doc? ( mongodb ) + notebook? ( wxwidgets )" CDEPEND=" dev-python/decorator[${PYTHON_USEDEP}] @@ -38,7 +39,6 @@ CDEPEND=" RDEPEND="${CDEPEND} notebook? ( dev-python/notebook[${PYTHON_USEDEP}] - dev-python/ipywidgets[${PYTHON_USEDEP}] ) nbconvert? ( dev-python/nbconvert[${PYTHON_USEDEP}] ) qt4? ( dev-python/qtconsole )" -- cgit v1.2.3-18-g5258 From 371f621d34edc45074d9c1d36c444649c3e07381 Mon Sep 17 00:00:00 2001 From: Marius Brehler Date: Wed, 2 Sep 2015 10:12:37 +0200 Subject: dev-python/ipython: Move setuptools from CDEPEND to DEPEND Package-Manager: portage-2.2.20.1 --- dev-python/ipython/ChangeLog | 4 ++++ dev-python/ipython/ipython-4.0.0-r1.ebuild | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/dev-python/ipython/ChangeLog b/dev-python/ipython/ChangeLog index fa0379bd5..706e50c70 100644 --- a/dev-python/ipython/ChangeLog +++ b/dev-python/ipython/ChangeLog @@ -2,6 +2,10 @@ # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 # $Id$ + 02 Sep 2015; Marius Brehler + ipython-4.0.0-r1.ebuild: + dev-python/ipython: Move setuptools from CDEPEND to DEPEND + 02 Sep 2015; Marius Brehler ipython-4.0.0-r1.ebuild: dev-python/ipython: Re-Fix #474; notebook use flag requires use wxwidgets diff --git a/dev-python/ipython/ipython-4.0.0-r1.ebuild b/dev-python/ipython/ipython-4.0.0-r1.ebuild index 535df00d3..1845023a1 100644 --- a/dev-python/ipython/ipython-4.0.0-r1.ebuild +++ b/dev-python/ipython/ipython-4.0.0-r1.ebuild @@ -28,7 +28,6 @@ CDEPEND=" dev-python/pexpect[${PYTHON_USEDEP}] dev-python/pickleshare[${PYTHON_USEDEP}] dev-python/pyparsing[${PYTHON_USEDEP}] - dev-python/setuptools[${PYTHON_USEDEP}] dev-python/simplegeneric[${PYTHON_USEDEP}] dev-python/traitlets[${PYTHON_USEDEP}] matplotlib? ( dev-python/matplotlib[${PYTHON_USEDEP}] ) @@ -43,6 +42,7 @@ RDEPEND="${CDEPEND} nbconvert? ( dev-python/nbconvert[${PYTHON_USEDEP}] ) qt4? ( dev-python/qtconsole )" DEPEND="${CDEPEND} + dev-python/setuptools[${PYTHON_USEDEP}] test? ( app-text/dvipng dev-python/jinja[${PYTHON_USEDEP}] -- cgit v1.2.3-18-g5258 From 9c29cac457f1074a794232745b089df73d1362a0 Mon Sep 17 00:00:00 2001 From: Marius Brehler Date: Wed, 2 Sep 2015 10:13:17 +0200 Subject: dev-python/notebook: Move setuptools from CDEPEND to DEPEND Package-Manager: portage-2.2.20.1 --- dev-python/notebook/ChangeLog | 3 +++ dev-python/notebook/notebook-9999.ebuild | 5 ++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dev-python/notebook/ChangeLog b/dev-python/notebook/ChangeLog index a3cad1057..90e175da6 100644 --- a/dev-python/notebook/ChangeLog +++ b/dev-python/notebook/ChangeLog @@ -2,6 +2,9 @@ # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 # $Id$ + 02 Sep 2015; Marius Brehler notebook-9999.ebuild: + dev-python/notebook: Move setuptools from CDEPEND to DEPEND + *notebook-4.0.1 (01 Sep 2015) 01 Sep 2015; Marius Brehler +notebook-4.0.1.ebuild: diff --git a/dev-python/notebook/notebook-9999.ebuild b/dev-python/notebook/notebook-9999.ebuild index 248392d73..eef13b5c8 100644 --- a/dev-python/notebook/notebook-9999.ebuild +++ b/dev-python/notebook/notebook-9999.ebuild @@ -21,9 +21,7 @@ fi LICENSE="BSD" SLOT="0" IUSE="doc test" -CDEPEND=" - dev-python/setuptools[${PYTHON_USEDEP}]" -RDEPEND="${CDEPEND} +RDEPEND=" dev-libs/mathjax dev-python/jinja[${PYTHON_USEDEP}] >=dev-python/terminado-0.3.3[${PYTHON_USEDEP}] @@ -37,6 +35,7 @@ RDEPEND="${CDEPEND} dev-python/ipykernel[${PYTHON_USEDEP}] " DEPEND="${RDEPEND} + dev-python/setuptools[${PYTHON_USEDEP}] test? ( $(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7) >=dev-python/nose-0.10.1[${PYTHON_USEDEP}] -- cgit v1.2.3-18-g5258