From 0183d0bb80befc50c7d6bf44e59bceecb73cb1da Mon Sep 17 00:00:00 2001 From: "Hendrik v. Raven" Date: Thu, 3 Aug 2017 23:02:00 +0200 Subject: 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 --- dev-python/ipython/ipython-5.3.0.ebuild | 8 ++++---- dev-python/ipython/ipython-5.4.1.ebuild | 8 ++++---- dev-python/ipython/ipython-6.1.0.ebuild | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) (limited to 'dev-python') diff --git a/dev-python/ipython/ipython-5.3.0.ebuild b/dev-python/ipython/ipython-5.3.0.ebuild index 15730b53437b..6da17185aa7d 100644 --- 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 656cfeab870f..0abf3b2a028e 100644 --- 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 92c5eab5d507..492ab29a655d 100644 --- 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}] ) -- cgit v1.2.3