diff options
| author |   Сухарик <suhr@i2pmail.org> | 2015-09-14 22:51:40 +0300 |
|---|---|---|
| committer | Сухарик <suhr@i2pmail.org> | 2015-09-16 15:32:37 +0300 |
| commit | c063b86d273051915a78cc00e659d7380be6425b (patch) | |
| tree | ccb310dd86d6ae5f7a670fa25d7d888aa984be19 | |
| parent | Update local USE descriptions (diff) | |
| download | sci-c063b86d273051915a78cc00e659d7380be6425b.tar.gz sci-c063b86d273051915a78cc00e659d7380be6425b.tar.bz2 sci-c063b86d273051915a78cc00e659d7380be6425b.zip | |
Remove wrong dependency on wxwidgets from ipython
dev-python/ipython: fix confusion between ipywidgets and wxwidgets
dev-python/ipywidgets: remove wxwidgets dependency
| -rw-r--r-- | dev-python/ipython/ChangeLog | 4 | ||||
| -rw-r--r-- | dev-python/ipython/ipython-4.0.0-r2.ebuild (renamed from dev-python/ipython/ipython-4.0.0-r1.ebuild) | 6 | ||||
| -rw-r--r-- | dev-python/ipywidgets/ChangeLog | 3 | ||||
| l--------- | dev-python/ipywidgets/ipywidgets-4.0.2-r1.ebuild (renamed from dev-python/ipywidgets/ipywidgets-4.0.2.ebuild) | 0 | ||||
| -rw-r--r-- | dev-python/ipywidgets/ipywidgets-9999.ebuild | 1 |
5 files changed, 10 insertions, 4 deletions
diff --git a/dev-python/ipython/ChangeLog b/dev-python/ipython/ChangeLog index d17bf75b2..285fd7a39 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$ + 16 Sep 2015; suhr <null@null> + ipython-4.0.0-r2.ebuild: + dev-python/ipython: separate wxwidgets dependency from ipywidgets + 02 Sep 2015; Marius Brehler <marbre@linux.sungazer.de> ipython-4.0.0-r1.ebuild: dev-python/ipython: Fix #480; add testpath to dependencies diff --git a/dev-python/ipython/ipython-4.0.0-r1.ebuild b/dev-python/ipython/ipython-4.0.0-r2.ebuild index 3eaa82c4d..2b8ea741b 100644 --- a/dev-python/ipython/ipython-4.0.0-r1.ebuild +++ b/dev-python/ipython/ipython-4.0.0-r2.ebuild @@ -20,8 +20,7 @@ IUSE="doc examples matplotlib mongodb notebook nbconvert qt4 +smp test wxwidgets REQUIRED_USE=" test? ( doc matplotlib mongodb notebook nbconvert qt4 wxwidgets ) - doc? ( mongodb ) - notebook? ( wxwidgets )" + doc? ( mongodb )" CDEPEND=" dev-python/decorator[${PYTHON_USEDEP}] @@ -33,11 +32,12 @@ CDEPEND=" matplotlib? ( dev-python/matplotlib[${PYTHON_USEDEP}] ) mongodb? ( <dev-python/pymongo-3[${PYTHON_USEDEP}] ) smp? ( dev-python/ipyparallel[${PYTHON_USEDEP}] ) - wxwidgets? ( dev-python/ipywidgets[${PYTHON_USEDEP}] )" + wxwidgets? ( $(python_gen_cond_dep 'dev-python/wxpython:*[${PYTHON_USEDEP}]' python2_7) )" RDEPEND="${CDEPEND} notebook? ( dev-python/notebook[${PYTHON_USEDEP}] + dev-python/ipywidgets[${PYTHON_USEDEP}] ) nbconvert? ( dev-python/nbconvert[${PYTHON_USEDEP}] ) qt4? ( dev-python/qtconsole )" diff --git a/dev-python/ipywidgets/ChangeLog b/dev-python/ipywidgets/ChangeLog index 013320609..45e43778d 100644 --- a/dev-python/ipywidgets/ChangeLog +++ b/dev-python/ipywidgets/ChangeLog @@ -2,6 +2,9 @@ # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 # $Id$ + 15 Sep 2015; suhr <null@null> ipywidgets-9999.ebuild: + dev-python/ipywidgets: Remove wxwidgets dependency + 02 Sep 2015; Sean Vig <sean.v.775@gmail.com> ipywidgets-9999.ebuild: dev-python/ipywidgets: Fix testing deps diff --git a/dev-python/ipywidgets/ipywidgets-4.0.2.ebuild b/dev-python/ipywidgets/ipywidgets-4.0.2-r1.ebuild index e3cd5c19f..e3cd5c19f 120000 --- a/dev-python/ipywidgets/ipywidgets-4.0.2.ebuild +++ b/dev-python/ipywidgets/ipywidgets-4.0.2-r1.ebuild diff --git a/dev-python/ipywidgets/ipywidgets-9999.ebuild b/dev-python/ipywidgets/ipywidgets-9999.ebuild index cb9130e2a..1c796dc19 100644 --- a/dev-python/ipywidgets/ipywidgets-9999.ebuild +++ b/dev-python/ipywidgets/ipywidgets-9999.ebuild @@ -25,7 +25,6 @@ IUSE="test" RDEPEND=" dev-python/traitlets[${PYTHON_USEDEP}] dev-python/ipykernel[${PYTHON_USEDEP}] - $(python_gen_cond_dep 'dev-python/wxpython:*[${PYTHON_USEDEP}]' python2_7) " DEPEND="${RDEPEND} test? ( |