1 |
commit: 1e6eef41e5eebe54f36a64914f95d0e653b2b7cf |
2 |
Author: Justin Lecher <jlec <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Oct 11 12:33:33 2015 +0000 |
4 |
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Oct 11 12:33:40 2015 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e6eef41 |
7 |
|
8 |
dev-python/sphinx: Move dev-python/sphinx_rtd_theme to PDEPEND to break circular deps |
9 |
|
10 |
Package-Manager: portage-2.2.23 |
11 |
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org> |
12 |
|
13 |
dev-python/sphinx/sphinx-1.3.1-r1.ebuild | 2 +- |
14 |
dev-python/sphinx/sphinx-1.3.1.ebuild | 11 +++++++---- |
15 |
2 files changed, 8 insertions(+), 5 deletions(-) |
16 |
|
17 |
diff --git a/dev-python/sphinx/sphinx-1.3.1-r1.ebuild b/dev-python/sphinx/sphinx-1.3.1-r1.ebuild |
18 |
index 94c68d4..6a00156 100644 |
19 |
--- a/dev-python/sphinx/sphinx-1.3.1-r1.ebuild |
20 |
+++ b/dev-python/sphinx/sphinx-1.3.1-r1.ebuild |
21 |
@@ -28,7 +28,6 @@ RDEPEND=" |
22 |
>=dev-python/six-1.4[${PYTHON_USEDEP}] |
23 |
>=dev-python/Babel-1.3[${PYTHON_USEDEP}] |
24 |
=dev-python/alabaster-0.7*[${PYTHON_USEDEP}] |
25 |
- =dev-python/sphinx_rtd_theme-0.1*[${PYTHON_USEDEP}] |
26 |
>=dev-python/snowballstemmer-1.1[${PYTHON_USEDEP}] |
27 |
latex? ( |
28 |
dev-texlive/texlive-latexextra |
29 |
@@ -39,6 +38,7 @@ DEPEND="${DEPEND} |
30 |
dev-python/nose[${PYTHON_USEDEP}] |
31 |
$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7 pypy) |
32 |
)" |
33 |
+PDEPEND="dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]" |
34 |
|
35 |
S="${WORKDIR}/${MY_P}" |
36 |
|
37 |
|
38 |
diff --git a/dev-python/sphinx/sphinx-1.3.1.ebuild b/dev-python/sphinx/sphinx-1.3.1.ebuild |
39 |
index 3c4d939..48c7976 100644 |
40 |
--- a/dev-python/sphinx/sphinx-1.3.1.ebuild |
41 |
+++ b/dev-python/sphinx/sphinx-1.3.1.ebuild |
42 |
@@ -20,22 +20,25 @@ SLOT="0" |
43 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc64 ~x86" |
44 |
IUSE="doc latex test" |
45 |
|
46 |
-RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}] |
47 |
+RDEPEND=" |
48 |
+ dev-python/setuptools[${PYTHON_USEDEP}] |
49 |
>=dev-python/docutils-0.11[${PYTHON_USEDEP}] |
50 |
>=dev-python/jinja-2.3[${PYTHON_USEDEP}] |
51 |
>=dev-python/pygments-2.0.1-r1[${PYTHON_USEDEP}] |
52 |
>=dev-python/six-1.4[${PYTHON_USEDEP}] |
53 |
>=dev-python/Babel-1.3[${PYTHON_USEDEP}] |
54 |
=dev-python/alabaster-0.7*[${PYTHON_USEDEP}] |
55 |
- =dev-python/sphinx_rtd_theme-0.1*[${PYTHON_USEDEP}] |
56 |
>=dev-python/snowballstemmer-1.1[${PYTHON_USEDEP}] |
57 |
latex? ( |
58 |
dev-texlive/texlive-latexextra |
59 |
app-text/dvipng |
60 |
)" |
61 |
DEPEND="${DEPEND} |
62 |
- test? ( dev-python/nose[${PYTHON_USEDEP}] |
63 |
- $(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7 pypy) )" |
64 |
+ test? ( |
65 |
+ dev-python/nose[${PYTHON_USEDEP}] |
66 |
+ $(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7 pypy) |
67 |
+ )" |
68 |
+PDEPEND="dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]" |
69 |
|
70 |
S="${WORKDIR}/${MY_P}" |