Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/sphinx/
Date: Mon, 01 Jan 2018 10:08:58
Message-Id: 1514801321.eaf21e2ef095f3665a05767dd996447616ab21e4.mgorny@gentoo
1 commit: eaf21e2ef095f3665a05767dd996447616ab21e4
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Mon Jan 1 09:47:09 2018 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Mon Jan 1 10:08:41 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eaf21e2e
7
8 dev-python/sphinx: Move sphinxcontrib-websupport back to RDEP
9
10 Move the dependency on dev-python/sphinxcontrib-websupport back
11 to RDEPEND (from PDEPEND) to avoid dependency ordering issues that could
12 result in other packages failing to build. The circular dependency
13 is now resolved by moving the dependency from sphinxcontrib-websupport
14 to sphinx into PDEP.
15
16 Closes: https://bugs.gentoo.org/624672
17
18 dev-python/sphinx/{sphinx-1.6.3-r2.ebuild => sphinx-1.6.3-r3.ebuild} | 4 ++--
19 1 file changed, 2 insertions(+), 2 deletions(-)
20
21 diff --git a/dev-python/sphinx/sphinx-1.6.3-r2.ebuild b/dev-python/sphinx/sphinx-1.6.3-r3.ebuild
22 similarity index 96%
23 rename from dev-python/sphinx/sphinx-1.6.3-r2.ebuild
24 rename to dev-python/sphinx/sphinx-1.6.3-r3.ebuild
25 index 115fe201822..551ff31244c 100644
26 --- a/dev-python/sphinx/sphinx-1.6.3-r2.ebuild
27 +++ b/dev-python/sphinx/sphinx-1.6.3-r3.ebuild
28 @@ -1,4 +1,4 @@
29 -# Copyright 1999-2017 Gentoo Foundation
30 +# Copyright 1999-2018 Gentoo Foundation
31 # Distributed under the terms of the GNU General Public License v2
32
33 EAPI=6
34 @@ -30,6 +30,7 @@ RDEPEND="
35 >=dev-python/snowballstemmer-1.1[${PYTHON_USEDEP}]
36 >=dev-python/sphinx_rtd_theme-0.1[${PYTHON_USEDEP}]
37 <dev-python/sphinx_rtd_theme-2.0[${PYTHON_USEDEP}]
38 + dev-python/sphinxcontrib-websupport[${PYTHON_USEDEP}]
39 dev-python/typing[${PYTHON_USEDEP}]
40 latex? (
41 dev-texlive/texlive-latexextra
42 @@ -40,7 +41,6 @@ RDEPEND="
43 >=dev-python/sqlalchemy-0.9[${PYTHON_USEDEP}]
44 >=dev-python/whoosh-2.0[${PYTHON_USEDEP}]
45 )"
46 -PDEPEND="dev-python/sphinxcontrib-websupport[${PYTHON_USEDEP}]"
47 DEPEND="${RDEPEND}
48 dev-python/setuptools[${PYTHON_USEDEP}]
49 test? (