commit: 1e6eef41e5eebe54f36a64914f95d0e653b2b7cf
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 11 12:33:33 2015 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sun Oct 11 12:33:40 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e6eef41
dev-python/sphinx: Move dev-python/sphinx_rtd_theme to PDEPEND to break
circular deps
Package-Manager: portage-2.2.23
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>
dev-python/sphinx/sphinx-1.3.1-r1.ebuild | 2 +-
dev-python/sphinx/sphinx-1.3.1.ebuild | 11 +++++++----
2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/dev-python/sphinx/sphinx-1.3.1-r1.ebuild
b/dev-python/sphinx/sphinx-1.3.1-r1.ebuild
index 94c68d4..6a00156 100644
--- a/dev-python/sphinx/sphinx-1.3.1-r1.ebuild
+++ b/dev-python/sphinx/sphinx-1.3.1-r1.ebuild
@@ -28,7 +28,6 @@ RDEPEND="
>=dev-python/six-1.4[${PYTHON_USEDEP}]
>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
=dev-python/alabaster-0.7*[${PYTHON_USEDEP}]
- =dev-python/sphinx_rtd_theme-0.1*[${PYTHON_USEDEP}]
>=dev-python/snowballstemmer-1.1[${PYTHON_USEDEP}]
latex? (
dev-texlive/texlive-latexextra
@@ -39,6 +38,7 @@ DEPEND="${DEPEND}
dev-python/nose[${PYTHON_USEDEP}]
$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]'
python2_7 pypy)
)"
+PDEPEND="dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]"
S="${WORKDIR}/${MY_P}"
diff --git a/dev-python/sphinx/sphinx-1.3.1.ebuild
b/dev-python/sphinx/sphinx-1.3.1.ebuild
index 3c4d939..48c7976 100644
--- a/dev-python/sphinx/sphinx-1.3.1.ebuild
+++ b/dev-python/sphinx/sphinx-1.3.1.ebuild
@@ -20,22 +20,25 @@ SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc64 ~x86"
IUSE="doc latex test"
-RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+RDEPEND="
+ dev-python/setuptools[${PYTHON_USEDEP}]
>=dev-python/docutils-0.11[${PYTHON_USEDEP}]
>=dev-python/jinja-2.3[${PYTHON_USEDEP}]
>=dev-python/pygments-2.0.1-r1[${PYTHON_USEDEP}]
>=dev-python/six-1.4[${PYTHON_USEDEP}]
>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
=dev-python/alabaster-0.7*[${PYTHON_USEDEP}]
- =dev-python/sphinx_rtd_theme-0.1*[${PYTHON_USEDEP}]
>=dev-python/snowballstemmer-1.1[${PYTHON_USEDEP}]
latex? (
dev-texlive/texlive-latexextra
app-text/dvipng
)"
DEPEND="${DEPEND}
- test? ( dev-python/nose[${PYTHON_USEDEP}]
- $(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]'
python2_7 pypy) )"
+ test? (
+ dev-python/nose[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]'
python2_7 pypy)
+ )"
+PDEPEND="dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]"
S="${WORKDIR}/${MY_P}"