main/py-sphinx: upgrade to 1.3.1

3 files changed, 16 insertions, 80 deletions

diff --git a/main/py-sphinx/APKBUILD b/main/py-sphinx/APKBUILD
index dedee306cb..3f765220e5 100644
--- a/main/py-sphinx/APKBUILD
+++ b/main/py-sphinx/APKBUILD
@@ -1,23 +1,22 @@
-# Contributor: Matt Smith <mcs@darkregion.net>
+# Contributor: Carlo Landmeter <clandmeter@gmail.com>
 # Maintainer: Matt Smith <mcs@darkregion.net>
 pkgname=py-sphinx
-_pkgname=Sphinx
-pkgver=1.2.3
+pkgver=1.3.1
 pkgrel=0
 pkgdesc="Python Documentation Generator"
 url="http://sphinx.pocoo.org/"
 arch="noarch"
 license="BSD"
-depends="py-docutils py-jinja2 py-pygments py-setuptools"
-makedepends="python-dev py-setuptools"
+depends="py-docutils py-jinja2 py-pygments py-setuptools make py-six"
+depends_dev=""
+makedepends="$depends_dev"
 install=""
-subpackages="$pkgname-doc"
-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"
+subpackages=""
+source="sphinx-$pkgver.tar.gz::https://github.com/sphinx-doc/sphinx/archive/$pkgver.tar.gz"
 
-_builddir="$srcdir"/$_pkgname-$pkgver
+_builddir="$srcdir"/sphinx-$pkgver
 prepare() {
+	local i
 	cd "$_builddir"
 	for i in $source; do
 		case $i in
@@ -27,37 +26,15 @@ prepare() {
 }
 
 build() {
-	cd "$_builddir"
-	python setup.py build || return 1
+        cd "$_builddir"
+        python setup.py build || return 1
 }
 
 package() {
-	cd "$_builddir"
-	python setup.py install --prefix=/usr --root="$pkgdir" || return 1
-}
-
-doc() {
-	cd "$_builddir"
-
-	mkdir -p "$subpkgdir"/usr/share/doc/$pkgname || return 1
-	for _doc in AUTHORS CHANGES EXAMPLES LICENSE README.rst TODO; do
-		install -Dm644 $_doc "$subpkgdir"/usr/share/doc/$pkgname/ \
-			|| return 1
-	done
-
-	# Note: Documentation in the 'doc' directory (below), needs to be built
-	# with sphinx-build once sphinx is installed (see README for details).
-	#
-	# Leaving as-is; will be up to the individual user that's interested.
-	mkdir -p "$subpkgdir"/usr/share/doc/$pkgname/doc/ || return 1
-	cp -R ./doc/* "$subpkgdir"/usr/share/doc/$pkgname/doc/ || return 1
-	chmod -R 644 "$subpkgdir"/usr/share/doc/$pkgname/doc/ || return 1
-
-	# Fix subdir perms
-	find "$subpkgdir"/usr/share/doc/$pkgname/ -type d \
-		-exec chmod 755 '{}' \; || return 1
+        cd "$_builddir"
+        python setup.py install --prefix=/usr --root="$pkgdir" || return 1
 }
 
-md5sums="a98c93124035b4cd7183604aec656cb3  Sphinx-1.2.3.tar.gz"
-sha256sums="94933b64e2fe0807da0612c574a021c0dac28c7bd3c4a23723ae5a39ea8f3d04  Sphinx-1.2.3.tar.gz"
-sha512sums="00346516e826a65145a3a7fd25ef7cee569ae7fdcc0c1bec3a7301fc08d5d8730d02eee792c3efedfcac17e712ea7e2ad70ea1fcdedc11720ad54f6bcb51ad05  Sphinx-1.2.3.tar.gz"
+md5sums="e3710992529e43160c6a24bc3caea50d  sphinx-1.3.1.tar.gz"
+sha256sums="c334277227317aeb6f9516a74a5086565ac3743a018b63d3acf0645b437a3a2d  sphinx-1.3.1.tar.gz"
+sha512sums="369e92fbdf2db2510167ae11eb1a1556a2ea5df1df984e85d52ff6e3fff616fbbe1706cec26ac0fc405240bfa4eedd4c9ae8f7b76316dfafb6d5f836ef9ea773  sphinx-1.3.1.tar.gz"
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
deleted file mode 100644
index f9669f59e4..0000000000
--- a/main/py-sphinx/Sphinx-1.1.3-fix_quoting_in_inheritance.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- 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
deleted file mode 100644
index 7f4f331502..0000000000
--- a/main/py-sphinx/sphinx-docutils-0.10.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-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 = []