| 1 |
commit: 09d5faa6448a900f5a840727cdca7a7ddc8ad690 |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Apr 27 10:32:04 2022 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Apr 27 12:27:05 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09d5faa6 |
| 7 |
|
| 8 |
dev-python/sphinx: Add a blocker to unmerge namespace-sphinxcontrib |
| 9 |
|
| 10 |
Add a blocker on dev-python/namespace-sphinxcontrib to force unmerging |
| 11 |
it. dev-python/sphinx is a common dependency of various |
| 12 |
dev-python/sphinxcontrib-* packages, so it should be the best place |
| 13 |
to put the blocker. |
| 14 |
|
| 15 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
| 16 |
|
| 17 |
dev-python/sphinx/{sphinx-4.4.0.ebuild => sphinx-4.4.0-r1.ebuild} | 7 +++++-- |
| 18 |
dev-python/sphinx/{sphinx-4.5.0.ebuild => sphinx-4.5.0-r1.ebuild} | 7 +++++-- |
| 19 |
2 files changed, 10 insertions(+), 4 deletions(-) |
| 20 |
|
| 21 |
diff --git a/dev-python/sphinx/sphinx-4.4.0.ebuild b/dev-python/sphinx/sphinx-4.4.0-r1.ebuild |
| 22 |
similarity index 98% |
| 23 |
rename from dev-python/sphinx/sphinx-4.4.0.ebuild |
| 24 |
rename to dev-python/sphinx/sphinx-4.4.0-r1.ebuild |
| 25 |
index 0bc1915d9cac..43a0b572068c 100644 |
| 26 |
--- a/dev-python/sphinx/sphinx-4.4.0.ebuild |
| 27 |
+++ b/dev-python/sphinx/sphinx-4.4.0-r1.ebuild |
| 28 |
@@ -43,7 +43,9 @@ RDEPEND=" |
| 29 |
dev-texlive/texlive-latexextra |
| 30 |
dev-texlive/texlive-luatex |
| 31 |
app-text/dvipng |
| 32 |
- )" |
| 33 |
+ ) |
| 34 |
+ !dev-python/namespace-sphinxcontrib |
| 35 |
+" |
| 36 |
BDEPEND=" |
| 37 |
doc? ( |
| 38 |
dev-python/sphinxcontrib-websupport[${PYTHON_USEDEP}] |
| 39 |
@@ -56,7 +58,8 @@ BDEPEND=" |
| 40 |
dev-texlive/texlive-latexextra |
| 41 |
dev-texlive/texlive-luatex |
| 42 |
app-text/dvipng |
| 43 |
- )" |
| 44 |
+ ) |
| 45 |
+" |
| 46 |
|
| 47 |
PATCHES=( |
| 48 |
"${FILESDIR}/${PN}-3.2.1-doc-link.patch" |
| 49 |
|
| 50 |
diff --git a/dev-python/sphinx/sphinx-4.5.0.ebuild b/dev-python/sphinx/sphinx-4.5.0-r1.ebuild |
| 51 |
similarity index 98% |
| 52 |
rename from dev-python/sphinx/sphinx-4.5.0.ebuild |
| 53 |
rename to dev-python/sphinx/sphinx-4.5.0-r1.ebuild |
| 54 |
index 2229e8a7a853..727d541b4499 100644 |
| 55 |
--- a/dev-python/sphinx/sphinx-4.5.0.ebuild |
| 56 |
+++ b/dev-python/sphinx/sphinx-4.5.0-r1.ebuild |
| 57 |
@@ -43,7 +43,9 @@ RDEPEND=" |
| 58 |
dev-texlive/texlive-latexextra |
| 59 |
dev-texlive/texlive-luatex |
| 60 |
app-text/dvipng |
| 61 |
- )" |
| 62 |
+ ) |
| 63 |
+ !dev-python/namespace-sphinxcontrib |
| 64 |
+" |
| 65 |
BDEPEND=" |
| 66 |
doc? ( |
| 67 |
dev-python/sphinxcontrib-websupport[${PYTHON_USEDEP}] |
| 68 |
@@ -56,7 +58,8 @@ BDEPEND=" |
| 69 |
dev-texlive/texlive-latexextra |
| 70 |
dev-texlive/texlive-luatex |
| 71 |
app-text/dvipng |
| 72 |
- )" |
| 73 |
+ ) |
| 74 |
+" |
| 75 |
|
| 76 |
PATCHES=( |
| 77 |
"${FILESDIR}/${PN}-3.2.1-doc-link.patch" |
Archives