main/py-sphinx: fix for docutils 0.10

https://bitbucket.org/birkenfeld/sphinx/issue/998/docutils-010-will-break-sphinx-manpage

3 files changed, 59 insertions, 4 deletions

diff --git a/main/py-sphinx/APKBUILD b/main/py-sphinx/APKBUILD
index d3aa68805..f677c62d5 100644
--- a/main/py-sphinx/APKBUILD
+++ b/main/py-sphinx/APKBUILD
@@ -3,7 +3,7 @@
 pkgname=py-sphinx
 _pkgname=Sphinx
 pkgver=1.1.3
-pkgrel=0
+pkgrel=1
 pkgdesc="Python Documentation Generator"
 url="http://sphinx.pocoo.org/"
 arch="noarch"
@@ -12,12 +12,18 @@ depends="py-docutils py-jinja2 py-pygments"
 makedepends="python-dev py-setuptools"
 install=""
 subpackages="$pkgname-doc"
-source="http://pypi.python.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz"
+source="http://pypi.python.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz
+	Sphinx-1.1.3-fix_quoting_in_inheritance.patch
+	sphinx-docutils-0.10.patch"
 
 _builddir="$srcdir"/$_pkgname-$pkgver
 prepare() {
 	cd "$_builddir"
-	# apply patches here
+	for i in $source; do
+		case $i in
+		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
+		esac
+	done
 }
 
 build() {
@@ -52,4 +58,12 @@ doc() {
 		-exec chmod 755 '{}' \; || return 1
 }
 
-md5sums="8f55a6d4f87fc6d528120c5d1f983e98  Sphinx-1.1.3.tar.gz"
+md5sums="8f55a6d4f87fc6d528120c5d1f983e98  Sphinx-1.1.3.tar.gz
+db67051a9c85f9d35f96bcc722f83141  Sphinx-1.1.3-fix_quoting_in_inheritance.patch
+6864c4cb0c0ec40dd78d4c66abfa999a  sphinx-docutils-0.10.patch"
+sha256sums="34dc95b70a2b07a61b5d61034c34b05f82514aab54ad27adedb49cee911bb8e9  Sphinx-1.1.3.tar.gz
+64cb12e09e6c5719cf313b49a69496c14030d9e3d861249ac24ed4b7a6d5f6bb  Sphinx-1.1.3-fix_quoting_in_inheritance.patch
+f4c9d1876bc955504de12ca4f34181f187d49c1b1ac7639813cf88e1b149abde  sphinx-docutils-0.10.patch"
+sha512sums="b8312140d752bf557c8e41728513812aff3e5d0a89af88dea9da0df21bf09c8315f13305d7a724a5596d0192b167d613065ea564c6d92e4ffb23f1f246dbf052  Sphinx-1.1.3.tar.gz
+b8d7eef6441d0e0d80c112b1c91b0e6b3cc738a27e81177f8ae735cc2f37ee3c0f1e95e6cc9f882e4a6503bfda0c49c8e4f6429867f1de400714529339aa019b  Sphinx-1.1.3-fix_quoting_in_inheritance.patch
+88d09b8143639f7d110ab2b8d4e3f377ba2f12136bb207ecc36ad021563bd12d9120027c08c477cb9730ffd8cfa5fe1d9cbb41a97c89121d4d78b19c87c7314a  sphinx-docutils-0.10.patch"
diff --git a/main/py-sphinx/Sphinx-1.1.3-fix_quoting_in_inheritance.patch b/main/py-sphinx/Sphinx-1.1.3-fix_quoting_in_inheritance.patch
new file mode 100644
index 000000000..f9669f59e
--- /dev/null
+++ b/main/py-sphinx/Sphinx-1.1.3-fix_quoting_in_inheritance.patch
@@ -0,0 +1,13 @@
+--- Sphinx-1.1.3/sphinx/ext/inheritance_diagram.py.orig	2012-02-19 11:54:47.000000000 +0100
++++ Sphinx-1.1.3/sphinx/ext/inheritance_diagram.py	2013-03-02 18:44:29.303047600 +0100
+@@ -199,8 +199,8 @@ class InheritanceGraph(object):
+         'shape': 'box',
+         'fontsize': 10,
+         'height': 0.25,
+-        'fontname': 'Vera Sans, DejaVu Sans, Liberation Sans, '
+-                    'Arial, Helvetica, sans',
++        'fontname': '"Vera Sans, DejaVu Sans, Liberation Sans, '
++                    'Arial, Helvetica, sans"',
+         'style': '"setlinewidth(0.5)"',
+     }
+     default_edge_attrs = {
diff --git a/main/py-sphinx/sphinx-docutils-0.10.patch b/main/py-sphinx/sphinx-docutils-0.10.patch
new file mode 100644
index 000000000..7f4f33150
--- /dev/null
+++ b/main/py-sphinx/sphinx-docutils-0.10.patch
@@ -0,0 +1,28 @@
+diff -up Sphinx-1.1.3/sphinx/writers/manpage.py.bak Sphinx-1.1.3/sphinx/writers/manpage.py
+--- Sphinx-1.1.3/sphinx/writers/manpage.py.bak	2011-11-01 00:38:44.000000000 -0700
++++ Sphinx-1.1.3/sphinx/writers/manpage.py	2012-08-21 12:38:33.380808202 -0700
+@@ -72,6 +72,11 @@ class ManualPageTranslator(BaseTranslato
+         # since self.append_header() is never called, need to do this here
+         self.body.append(MACRO_DEF)
+ 
++        # Overwrite admonition label translations with our own
++        for label, translation in admonitionlabels.items():
++            self.language.labels[label] = self.deunicode(translation)
++
++
+     # overwritten -- added quotes around all .TH arguments
+     def header(self):
+         tmpl = (".TH \"%(title_upper)s\" \"%(manual_section)s\""
+@@ -193,12 +198,6 @@ class ManualPageTranslator(BaseTranslato
+     def depart_seealso(self, node):
+         self.depart_admonition(node)
+ 
+-    # overwritten -- use our own label translations
+-    def visit_admonition(self, node, name=None):
+-        if name:
+-            self.body.append('.IP %s\n' %
+-                             self.deunicode(admonitionlabels.get(name, name)))
+-
+     def visit_productionlist(self, node):
+         self.ensure_eol()
+         names = []