[gentoo-commits] repo/gentoo:master commit in: dev-python/sphinx/

[Michał Górny]

commit:     09d5faa6448a900f5a840727cdca7a7ddc8ad690
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 27 10:32:04 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Apr 27 12:27:05 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09d5faa6

dev-python/sphinx: Add a blocker to unmerge namespace-sphinxcontrib

Add a blocker on dev-python/namespace-sphinxcontrib to force unmerging
it.  dev-python/sphinx is a common dependency of various
dev-python/sphinxcontrib-* packages, so it should be the best place
to put the blocker.

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 dev-python/sphinx/{sphinx-4.4.0.ebuild => sphinx-4.4.0-r1.ebuild} | 7 +++++--
 dev-python/sphinx/{sphinx-4.5.0.ebuild => sphinx-4.5.0-r1.ebuild} | 7 +++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/dev-python/sphinx/sphinx-4.4.0.ebuild 
b/dev-python/sphinx/sphinx-4.4.0-r1.ebuild
similarity index 98%
rename from dev-python/sphinx/sphinx-4.4.0.ebuild
rename to dev-python/sphinx/sphinx-4.4.0-r1.ebuild
index 0bc1915d9cac..43a0b572068c 100644
--- a/dev-python/sphinx/sphinx-4.4.0.ebuild
+++ b/dev-python/sphinx/sphinx-4.4.0-r1.ebuild
@@ -43,7 +43,9 @@ RDEPEND="
                dev-texlive/texlive-latexextra
                dev-texlive/texlive-luatex
                app-text/dvipng
-       )"
+       )
+       !dev-python/namespace-sphinxcontrib
+"
 BDEPEND="
        doc? (
                dev-python/sphinxcontrib-websupport[${PYTHON_USEDEP}]
@@ -56,7 +58,8 @@ BDEPEND="
                dev-texlive/texlive-latexextra
                dev-texlive/texlive-luatex
                app-text/dvipng
-       )"
+       )
+"
 
 PATCHES=(
        "${FILESDIR}/${PN}-3.2.1-doc-link.patch"

diff --git a/dev-python/sphinx/sphinx-4.5.0.ebuild 
b/dev-python/sphinx/sphinx-4.5.0-r1.ebuild
similarity index 98%
rename from dev-python/sphinx/sphinx-4.5.0.ebuild
rename to dev-python/sphinx/sphinx-4.5.0-r1.ebuild
index 2229e8a7a853..727d541b4499 100644
--- a/dev-python/sphinx/sphinx-4.5.0.ebuild
+++ b/dev-python/sphinx/sphinx-4.5.0-r1.ebuild
@@ -43,7 +43,9 @@ RDEPEND="
                dev-texlive/texlive-latexextra
                dev-texlive/texlive-luatex
                app-text/dvipng
-       )"
+       )
+       !dev-python/namespace-sphinxcontrib
+"
 BDEPEND="
        doc? (
                dev-python/sphinxcontrib-websupport[${PYTHON_USEDEP}]
@@ -56,7 +58,8 @@ BDEPEND="
                dev-texlive/texlive-latexextra
                dev-texlive/texlive-luatex
                app-text/dvipng
-       )"
+       )
+"
 
 PATCHES=(
        "${FILESDIR}/${PN}-3.2.1-doc-link.patch"