| 1 |
commit: 0183d0bb80befc50c7d6bf44e59bceecb73cb1da |
| 2 |
Author: Hendrik v. Raven <hendrik <AT> consetetur <DOT> de> |
| 3 |
AuthorDate: Thu Aug 3 21:02:00 2017 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Sep 4 15:04:14 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0183d0bb |
| 7 |
|
| 8 |
dev-python/ipython: break circular deps with USE=notebook |
| 9 |
|
| 10 |
circular dependencies are still present with USE=test, but this appears |
| 11 |
to be unsolvable. |
| 12 |
|
| 13 |
Closes: https://bugs.gentoo.org/626110 |
| 14 |
Closes: https://github.com/gentoo/gentoo/pull/5287 |
| 15 |
Package-Manager: Portage-2.3.6, Repoman-2.3.3 |
| 16 |
|
| 17 |
dev-python/ipython/ipython-5.3.0.ebuild | 8 ++++---- |
| 18 |
dev-python/ipython/ipython-5.4.1.ebuild | 8 ++++---- |
| 19 |
dev-python/ipython/ipython-6.1.0.ebuild | 8 ++++---- |
| 20 |
3 files changed, 12 insertions(+), 12 deletions(-) |
| 21 |
|
| 22 |
diff --git a/dev-python/ipython/ipython-5.3.0.ebuild b/dev-python/ipython/ipython-5.3.0.ebuild |
| 23 |
index 15730b53437..6da17185aa7 100644 |
| 24 |
--- a/dev-python/ipython/ipython-5.3.0.ebuild |
| 25 |
+++ b/dev-python/ipython/ipython-5.3.0.ebuild |
| 26 |
@@ -36,10 +36,6 @@ CDEPEND=" |
| 27 |
|
| 28 |
RDEPEND="${CDEPEND} |
| 29 |
virtual/python-pathlib[${PYTHON_USEDEP}] |
| 30 |
- notebook? ( |
| 31 |
- dev-python/notebook[${PYTHON_USEDEP}] |
| 32 |
- dev-python/ipywidgets[${PYTHON_USEDEP}] |
| 33 |
- ) |
| 34 |
nbconvert? ( dev-python/nbconvert[${PYTHON_USEDEP}] )" |
| 35 |
DEPEND="${CDEPEND} |
| 36 |
>=dev-python/setuptools-18.5[${PYTHON_USEDEP}] |
| 37 |
@@ -72,6 +68,10 @@ DEPEND="${CDEPEND} |
| 38 |
)" |
| 39 |
|
| 40 |
PDEPEND=" |
| 41 |
+ notebook? ( |
| 42 |
+ dev-python/notebook[${PYTHON_USEDEP}] |
| 43 |
+ dev-python/ipywidgets[${PYTHON_USEDEP}] |
| 44 |
+ ) |
| 45 |
qt4? ( dev-python/qtconsole ) |
| 46 |
smp? ( dev-python/ipyparallel[${PYTHON_USEDEP}] )" |
| 47 |
|
| 48 |
|
| 49 |
diff --git a/dev-python/ipython/ipython-5.4.1.ebuild b/dev-python/ipython/ipython-5.4.1.ebuild |
| 50 |
index 656cfeab870..0abf3b2a028 100644 |
| 51 |
--- a/dev-python/ipython/ipython-5.4.1.ebuild |
| 52 |
+++ b/dev-python/ipython/ipython-5.4.1.ebuild |
| 53 |
@@ -32,10 +32,6 @@ CDEPEND=" |
| 54 |
|
| 55 |
RDEPEND="${CDEPEND} |
| 56 |
virtual/python-pathlib[${PYTHON_USEDEP}] |
| 57 |
- notebook? ( |
| 58 |
- dev-python/notebook[${PYTHON_USEDEP}] |
| 59 |
- dev-python/ipywidgets[${PYTHON_USEDEP}] |
| 60 |
- ) |
| 61 |
nbconvert? ( dev-python/nbconvert[${PYTHON_USEDEP}] )" |
| 62 |
DEPEND="${CDEPEND} |
| 63 |
dev-python/setuptools[${PYTHON_USEDEP}] |
| 64 |
@@ -57,6 +53,10 @@ DEPEND="${CDEPEND} |
| 65 |
)" |
| 66 |
|
| 67 |
PDEPEND=" |
| 68 |
+ notebook? ( |
| 69 |
+ dev-python/notebook[${PYTHON_USEDEP}] |
| 70 |
+ dev-python/ipywidgets[${PYTHON_USEDEP}] |
| 71 |
+ ) |
| 72 |
qt4? ( dev-python/qtconsole[${PYTHON_USEDEP}] ) |
| 73 |
qt5? ( dev-python/qtconsole[${PYTHON_USEDEP}] ) |
| 74 |
smp? ( dev-python/ipyparallel[${PYTHON_USEDEP}] )" |
| 75 |
|
| 76 |
diff --git a/dev-python/ipython/ipython-6.1.0.ebuild b/dev-python/ipython/ipython-6.1.0.ebuild |
| 77 |
index 92c5eab5d50..492ab29a655 100644 |
| 78 |
--- a/dev-python/ipython/ipython-6.1.0.ebuild |
| 79 |
+++ b/dev-python/ipython/ipython-6.1.0.ebuild |
| 80 |
@@ -31,10 +31,6 @@ CDEPEND=" |
| 81 |
" |
| 82 |
|
| 83 |
RDEPEND="${CDEPEND} |
| 84 |
- notebook? ( |
| 85 |
- dev-python/notebook[${PYTHON_USEDEP}] |
| 86 |
- dev-python/ipywidgets[${PYTHON_USEDEP}] |
| 87 |
- ) |
| 88 |
nbconvert? ( dev-python/nbconvert[${PYTHON_USEDEP}] ) |
| 89 |
" |
| 90 |
|
| 91 |
@@ -56,6 +52,10 @@ DEPEND="${CDEPEND} |
| 92 |
" |
| 93 |
|
| 94 |
PDEPEND=" |
| 95 |
+ notebook? ( |
| 96 |
+ dev-python/notebook[${PYTHON_USEDEP}] |
| 97 |
+ dev-python/ipywidgets[${PYTHON_USEDEP}] |
| 98 |
+ ) |
| 99 |
qt4? ( dev-python/qtconsole[${PYTHON_USEDEP}] ) |
| 100 |
qt5? ( dev-python/qtconsole[${PYTHON_USEDEP}] ) |
| 101 |
smp? ( dev-python/ipyparallel[${PYTHON_USEDEP}] ) |
Archives