diff options
| author |   Virgil Dupras <vdupras@gentoo.org> | 2018-08-24 22:14:17 -0400 |
|---|---|---|
| committer | Virgil Dupras <vdupras@gentoo.org> | 2018-08-24 22:14:17 -0400 |
| commit | 7b439d22d83d50fcc648ab02b60c3c65236d6b57 (patch) | |
| tree | e15b7099a3cd7fbf7af8739ad2d36d5be842cadb | |
| parent | flag-o-matic.eclass: allow -fuse-ld=* in filter flags (diff) | |
| download | gentoo-7b439d22.tar.gz gentoo-7b439d22.tar.bz2 gentoo-7b439d22.zip | |
dev-python/click: fix doc building with sphinx 1.7
Closes: https://bugs.gentoo.org/663244
Package-Manager: Portage-2.3.47, Repoman-2.3.10
| -rw-r--r-- | dev-python/click/click-6.7-r1.ebuild | 2 | ||||
| -rw-r--r-- | dev-python/click/files/click-6.7-support-sphinx-1.7.patch | 44 |
2 files changed, 46 insertions, 0 deletions
diff --git a/dev-python/click/click-6.7-r1.ebuild b/dev-python/click/click-6.7-r1.ebuild index ebdcd6be3d0e..9a963c756129 100644 --- a/dev-python/click/click-6.7-r1.ebuild +++ b/dev-python/click/click-6.7-r1.ebuild @@ -26,6 +26,8 @@ DEPEND=" PATCHES=( # From upstream, can be removed in next release. "${FILESDIR}/${PN}-6.7-fix-tests.patch" + # From upstream, can be removed in next release. + "${FILESDIR}/${PN}-6.7-support-sphinx-1.7.patch" ) pkg_setup() { 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 new file mode 100644 index 000000000000..1076c2decad1 --- /dev/null +++ b/dev-python/click/files/click-6.7-support-sphinx-1.7.patch @@ -0,0 +1,44 @@ +From 2c7929511114494350e26d7b0c790fb8ca82f605 Mon Sep 17 00:00:00 2001 +From: Daw-Ran Liou <dawran6@gmail.com> +Date: Mon, 14 May 2018 13:34:23 -0400 +Subject: [PATCH] Support Sphinx 1.7+ + +Move: from sphinx.util.compat import Directive +To: from docutils.parsers.rst import Directive +--- + docs/clickdoctools.py | 2 +- + setup.py | 5 +++++ + 2 files changed, 6 insertions(+), 1 deletion(-) + +diff --git a/docs/clickdoctools.py b/docs/clickdoctools.py +index c3db195..1dd47d3 100644 +--- a/docs/clickdoctools.py ++++ b/docs/clickdoctools.py +@@ -15,7 +15,7 @@ from docutils import nodes + from docutils.statemachine import ViewList + + from sphinx.domains import Domain +-from sphinx.util.compat import Directive ++from docutils.parsers.rst import Directive + + PY2 = sys.version_info[0] == 2 + +diff --git a/setup.py b/setup.py +index b78403e..f1bcdcf 100644 +--- a/setup.py ++++ b/setup.py +@@ -24,6 +24,11 @@ setup( + maintainer_email='contact@palletsprojects.com', + long_description=readme, + packages=['click'], ++ extras_require={ ++ 'docs': [ ++ 'sphinx', ++ ], ++ }, + description='A simple wrapper around optparse for ' + 'powerful command line utilities.', + license='BSD', +-- +2.16.4 + |