| 1 |
commit: 7b439d22d83d50fcc648ab02b60c3c65236d6b57 |
| 2 |
Author: Virgil Dupras <vdupras <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Aug 25 02:14:17 2018 +0000 |
| 4 |
Commit: Virgil Dupras <vdupras <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Aug 25 02:14:17 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b439d22 |
| 7 |
|
| 8 |
dev-python/click: fix doc building with sphinx 1.7 |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/663244 |
| 11 |
Package-Manager: Portage-2.3.47, Repoman-2.3.10 |
| 12 |
|
| 13 |
dev-python/click/click-6.7-r1.ebuild | 2 + |
| 14 |
.../click/files/click-6.7-support-sphinx-1.7.patch | 44 ++++++++++++++++++++++ |
| 15 |
2 files changed, 46 insertions(+) |
| 16 |
|
| 17 |
diff --git a/dev-python/click/click-6.7-r1.ebuild b/dev-python/click/click-6.7-r1.ebuild |
| 18 |
index ebdcd6be3d0..9a963c75612 100644 |
| 19 |
--- a/dev-python/click/click-6.7-r1.ebuild |
| 20 |
+++ b/dev-python/click/click-6.7-r1.ebuild |
| 21 |
@@ -26,6 +26,8 @@ DEPEND=" |
| 22 |
PATCHES=( |
| 23 |
# From upstream, can be removed in next release. |
| 24 |
"${FILESDIR}/${PN}-6.7-fix-tests.patch" |
| 25 |
+ # From upstream, can be removed in next release. |
| 26 |
+ "${FILESDIR}/${PN}-6.7-support-sphinx-1.7.patch" |
| 27 |
) |
| 28 |
|
| 29 |
pkg_setup() { |
| 30 |
|
| 31 |
diff --git a/dev-python/click/files/click-6.7-support-sphinx-1.7.patch b/dev-python/click/files/click-6.7-support-sphinx-1.7.patch |
| 32 |
new file mode 100644 |
| 33 |
index 00000000000..1076c2decad |
| 34 |
--- /dev/null |
| 35 |
+++ b/dev-python/click/files/click-6.7-support-sphinx-1.7.patch |
| 36 |
@@ -0,0 +1,44 @@ |
| 37 |
+From 2c7929511114494350e26d7b0c790fb8ca82f605 Mon Sep 17 00:00:00 2001 |
| 38 |
+From: Daw-Ran Liou <dawran6@×××××.com> |
| 39 |
+Date: Mon, 14 May 2018 13:34:23 -0400 |
| 40 |
+Subject: [PATCH] Support Sphinx 1.7+ |
| 41 |
+ |
| 42 |
+Move: from sphinx.util.compat import Directive |
| 43 |
+To: from docutils.parsers.rst import Directive |
| 44 |
+--- |
| 45 |
+ docs/clickdoctools.py | 2 +- |
| 46 |
+ setup.py | 5 +++++ |
| 47 |
+ 2 files changed, 6 insertions(+), 1 deletion(-) |
| 48 |
+ |
| 49 |
+diff --git a/docs/clickdoctools.py b/docs/clickdoctools.py |
| 50 |
+index c3db195..1dd47d3 100644 |
| 51 |
+--- a/docs/clickdoctools.py |
| 52 |
++++ b/docs/clickdoctools.py |
| 53 |
+@@ -15,7 +15,7 @@ from docutils import nodes |
| 54 |
+ from docutils.statemachine import ViewList |
| 55 |
+ |
| 56 |
+ from sphinx.domains import Domain |
| 57 |
+-from sphinx.util.compat import Directive |
| 58 |
++from docutils.parsers.rst import Directive |
| 59 |
+ |
| 60 |
+ PY2 = sys.version_info[0] == 2 |
| 61 |
+ |
| 62 |
+diff --git a/setup.py b/setup.py |
| 63 |
+index b78403e..f1bcdcf 100644 |
| 64 |
+--- a/setup.py |
| 65 |
++++ b/setup.py |
| 66 |
+@@ -24,6 +24,11 @@ setup( |
| 67 |
+ maintainer_email='contact@×××××××××××××××.com', |
| 68 |
+ long_description=readme, |
| 69 |
+ packages=['click'], |
| 70 |
++ extras_require={ |
| 71 |
++ 'docs': [ |
| 72 |
++ 'sphinx', |
| 73 |
++ ], |
| 74 |
++ }, |
| 75 |
+ description='A simple wrapper around optparse for ' |
| 76 |
+ 'powerful command line utilities.', |
| 77 |
+ license='BSD', |
| 78 |
+-- |
| 79 |
+2.16.4 |
| 80 |
+ |
Archives