From: Michał Górny <mgorny@gentoo.org>
Date: Mon, 1 Jan 2018 09:47:09 +0000 (+0100)
Subject: dev-python/sphinx: Move sphinxcontrib-websupport back to RDEP
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=eaf21e2ef095f3665a05767dd996447616ab21e4;p=gentoo.git

dev-python/sphinx: Move sphinxcontrib-websupport back to RDEP

Move the dependency on dev-python/sphinxcontrib-websupport back
to RDEPEND (from PDEPEND) to avoid dependency ordering issues that could
result in other packages failing to build. The circular dependency
is now resolved by moving the dependency from sphinxcontrib-websupport
to sphinx into PDEP.

Closes: https://bugs.gentoo.org/624672
---

diff --git a/dev-python/sphinx/sphinx-1.6.3-r2.ebuild b/dev-python/sphinx/sphinx-1.6.3-r3.ebuild
similarity index 96%
rename from dev-python/sphinx/sphinx-1.6.3-r2.ebuild
rename to dev-python/sphinx/sphinx-1.6.3-r3.ebuild
index 115fe201822d..551ff31244cf 100644
--- a/dev-python/sphinx/sphinx-1.6.3-r2.ebuild
+++ b/dev-python/sphinx/sphinx-1.6.3-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -30,6 +30,7 @@ RDEPEND="
 	>=dev-python/snowballstemmer-1.1[${PYTHON_USEDEP}]
 	>=dev-python/sphinx_rtd_theme-0.1[${PYTHON_USEDEP}]
 	<dev-python/sphinx_rtd_theme-2.0[${PYTHON_USEDEP}]
+	dev-python/sphinxcontrib-websupport[${PYTHON_USEDEP}]
 	dev-python/typing[${PYTHON_USEDEP}]
 	latex? (
 		dev-texlive/texlive-latexextra
@@ -40,7 +41,6 @@ RDEPEND="
 		>=dev-python/sqlalchemy-0.9[${PYTHON_USEDEP}]
 		>=dev-python/whoosh-2.0[${PYTHON_USEDEP}]
 	)"
-PDEPEND="dev-python/sphinxcontrib-websupport[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (