diff options
| author |   Justin Lecher <jlec@gentoo.org> | 2015-09-02 11:27:54 +0200 |
|---|---|---|
| committer | Justin Lecher <jlec@gentoo.org> | 2015-09-02 11:27:54 +0200 |
| commit | ddb358648e304fc7199b979faf1d6124ac647b94 (patch) | |
| tree | 7548ad3e40aaabd9b2da155cf0d378b5f87bc3b3 | |
| parent | dev-python/ipykernel: Add missing test dep (diff) | |
| parent | dev-python/notebook: Move setuptools from CDEPEND to DEPEND (diff) | |
| download | sci-ddb358648e304fc7199b979faf1d6124ac647b94.tar.gz sci-ddb358648e304fc7199b979faf1d6124ac647b94.tar.bz2 sci-ddb358648e304fc7199b979faf1d6124ac647b94.zip | |
Merge remote-tracking branch 'github/master'
* github/master:
dev-python/notebook: Move setuptools from CDEPEND to DEPEND
dev-python/ipython: Move setuptools from CDEPEND to DEPEND
dev-python/ipython: Re-Fix #474; notebook use flag requires use wxwidgets
| -rw-r--r-- | dev-python/ipython/ChangeLog | 8 | ||||
| -rw-r--r-- | dev-python/ipython/ipython-4.0.0-r1.ebuild | 6 | ||||
| -rw-r--r-- | dev-python/notebook/ChangeLog | 3 | ||||
| -rw-r--r-- | dev-python/notebook/notebook-9999.ebuild | 5 |
4 files changed, 16 insertions, 6 deletions
diff --git a/dev-python/ipython/ChangeLog b/dev-python/ipython/ChangeLog index 66d2f0a92..706e50c70 100644 --- a/dev-python/ipython/ChangeLog +++ b/dev-python/ipython/ChangeLog @@ -2,6 +2,14 @@ # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 # $Id$ + 02 Sep 2015; Marius Brehler <marbre@linux.sungazer.de> + ipython-4.0.0-r1.ebuild: + dev-python/ipython: Move setuptools from CDEPEND to DEPEND + + 02 Sep 2015; Marius Brehler <marbre@linux.sungazer.de> + ipython-4.0.0-r1.ebuild: + dev-python/ipython: Re-Fix #474; notebook use flag requires use wxwidgets + 01 Sep 2015; Sean Vig <sean.v.775@gmail.com> 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..1845023a1 100644 --- a/dev-python/ipython/ipython-4.0.0-r1.ebuild +++ b/dev-python/ipython/ipython-4.0.0-r1.ebuild @@ -20,14 +20,14 @@ 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}] 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}] ) @@ -38,11 +38,11 @@ CDEPEND=" RDEPEND="${CDEPEND} notebook? ( dev-python/notebook[${PYTHON_USEDEP}] - dev-python/ipywidgets[${PYTHON_USEDEP}] ) 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}] 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 <marbre@linux.sungazer.de> notebook-9999.ebuild: + dev-python/notebook: Move setuptools from CDEPEND to DEPEND + *notebook-4.0.1 (01 Sep 2015) 01 Sep 2015; Marius Brehler <marbre@linux.sungazer.de> +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}] |