[gentoo-commits] proj/sci:master commit in: dev-python/ipywidgets/, dev-python/ipython/

[Jauhien Piatlicki]

commit:     c063b86d273051915a78cc00e659d7380be6425b
Author:     Сухарик <suhr <AT> i2pmail <DOT> org>
AuthorDate: Mon Sep 14 19:51:40 2015 +0000
Commit:     Jauhien Piatlicki <jauhien <AT> gentoo <DOT> org>
CommitDate: Wed Sep 16 12:32:37 2015 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=c063b86d

Remove wrong dependency on wxwidgets from ipython

dev-python/ipython: fix confusion between ipywidgets and wxwidgets
dev-python/ipywidgets: remove wxwidgets dependency

 dev-python/ipython/ChangeLog                                        | 4 ++++
 .../ipython/{ipython-4.0.0-r1.ebuild => ipython-4.0.0-r2.ebuild}    | 6 +++---
 dev-python/ipywidgets/ChangeLog                                     | 3 +++
 .../{ipywidgets-4.0.2.ebuild => ipywidgets-4.0.2-r1.ebuild}         | 0
 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 d17bf75..285fd7a 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 <mar...@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
similarity index 96%
rename from dev-python/ipython/ipython-4.0.0-r1.ebuild
rename to dev-python/ipython/ipython-4.0.0-r2.ebuild
index 3eaa82c..2b8ea74 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 0133206..45e4377 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....@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
similarity index 100%
rename from dev-python/ipywidgets/ipywidgets-4.0.2.ebuild
rename to 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 cb9130e..1c796dc 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? (