dev-python/ipython: break circular deps with USE=notebook

circular dependencies are still present with USE=test, but this appears
to be unsolvable.

Closes: https://bugs.gentoo.org/626110
Closes: https://github.com/gentoo/gentoo/pull/5287
Package-Manager: Portage-2.3.6, Repoman-2.3.3

diff --git a/dev-python/ipython/ipython-5.3.0.ebuild b/dev-python/ipython/ipython-5.3.0.ebuild
index 15730b53437b9eb4a175d353c07fe836d565ee1b..6da17185aa7d46c324c9016862e7f67c7e57278f 100644 (file)
--- a/dev-python/ipython/ipython-5.3.0.ebuild
+++ b/dev-python/ipython/ipython-5.3.0.ebuild
@@ -36,10 +36,6 @@ CDEPEND="
 
 RDEPEND="${CDEPEND}
        virtual/python-pathlib[${PYTHON_USEDEP}]
-       notebook? (
-               dev-python/notebook[${PYTHON_USEDEP}]
-               dev-python/ipywidgets[${PYTHON_USEDEP}]
-       )
        nbconvert? ( dev-python/nbconvert[${PYTHON_USEDEP}] )"
 DEPEND="${CDEPEND}
        >=dev-python/setuptools-18.5[${PYTHON_USEDEP}]
@@ -72,6 +68,10 @@ DEPEND="${CDEPEND}
        )"
 
 PDEPEND="
+       notebook? (
+               dev-python/notebook[${PYTHON_USEDEP}]
+               dev-python/ipywidgets[${PYTHON_USEDEP}]
+       )
        qt4? ( dev-python/qtconsole )
        smp? ( dev-python/ipyparallel[${PYTHON_USEDEP}] )"
 

diff --git a/dev-python/ipython/ipython-5.4.1.ebuild b/dev-python/ipython/ipython-5.4.1.ebuild
index 656cfeab870f7e9841462fca81376e71b99d97ef..0abf3b2a028edc319de904eecd59f654c24d57d7 100644 (file)
--- a/dev-python/ipython/ipython-5.4.1.ebuild
+++ b/dev-python/ipython/ipython-5.4.1.ebuild
@@ -32,10 +32,6 @@ CDEPEND="
 
 RDEPEND="${CDEPEND}
        virtual/python-pathlib[${PYTHON_USEDEP}]
-       notebook? (
-               dev-python/notebook[${PYTHON_USEDEP}]
-               dev-python/ipywidgets[${PYTHON_USEDEP}]
-       )
        nbconvert? ( dev-python/nbconvert[${PYTHON_USEDEP}] )"
 DEPEND="${CDEPEND}
        dev-python/setuptools[${PYTHON_USEDEP}]
@@ -57,6 +53,10 @@ DEPEND="${CDEPEND}
        )"
 
 PDEPEND="
+       notebook? (
+               dev-python/notebook[${PYTHON_USEDEP}]
+               dev-python/ipywidgets[${PYTHON_USEDEP}]
+       )
        qt4? ( dev-python/qtconsole[${PYTHON_USEDEP}] )
        qt5? ( dev-python/qtconsole[${PYTHON_USEDEP}] )
        smp? ( dev-python/ipyparallel[${PYTHON_USEDEP}] )"

diff --git a/dev-python/ipython/ipython-6.1.0.ebuild b/dev-python/ipython/ipython-6.1.0.ebuild
index 92c5eab5d507cefa32b03d325a91243f3afad164..492ab29a655d5c5ebdd03422acfb12920c038536 100644 (file)
--- a/dev-python/ipython/ipython-6.1.0.ebuild
+++ b/dev-python/ipython/ipython-6.1.0.ebuild
@@ -31,10 +31,6 @@ CDEPEND="
 "
 
 RDEPEND="${CDEPEND}
-       notebook? (
-               dev-python/notebook[${PYTHON_USEDEP}]
-               dev-python/ipywidgets[${PYTHON_USEDEP}]
-       )
        nbconvert? ( dev-python/nbconvert[${PYTHON_USEDEP}] )
 "
 
@@ -56,6 +52,10 @@ DEPEND="${CDEPEND}
 "
 
 PDEPEND="
+       notebook? (
+               dev-python/notebook[${PYTHON_USEDEP}]
+               dev-python/ipywidgets[${PYTHON_USEDEP}]
+       )
        qt4? ( dev-python/qtconsole[${PYTHON_USEDEP}] )
        qt5? ( dev-python/qtconsole[${PYTHON_USEDEP}] )
        smp? ( dev-python/ipyparallel[${PYTHON_USEDEP}] )