Incorporate patch from Progress overlay by Arfrever. Should resolve bug 394777.

(Portage version: 2.2.0_alpha81/cvs/Linux x86_64)

4 files changed, 96 insertions, 4 deletions

diff --git a/dev-python/django/ChangeLog b/dev-python/django/ChangeLog
index 4d9d6261ae40..cabbe0a28760 100644
--- a/dev-python/django/ChangeLog
+++ b/dev-python/django/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/django
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/django/ChangeLog,v 1.76 2011/12/14 23:44:08 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django/ChangeLog,v 1.77 2011/12/21 07:06:46 floppym Exp $
+
+  21 Dec 2011; Mike Gilbert <floppym@gentoo.org>
+  +files/django-1.3.1-djangodocs_extension.patch, django-1.3.1-r1.ebuild,
+  django-9999.ebuild:
+  Incorporate patch from Progress overlay by Arfrever. Should resolve bug
+  394777.
 
   14 Dec 2011; Mike Gilbert <floppym@gentoo.org> django-1.3.1-r1.ebuild,
   django-9999.ebuild:
diff --git a/dev-python/django/django-1.3.1-r1.ebuild b/dev-python/django/django-1.3.1-r1.ebuild
index e6e5a34c6cbe..78db8fcb5778 100644
--- a/dev-python/django/django-1.3.1-r1.ebuild
+++ b/dev-python/django/django-1.3.1-r1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/django/django-1.3.1-r1.ebuild,v 1.2 2011/12/14 23:44:08 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django/django-1.3.1-r1.ebuild,v 1.3 2011/12/21 07:06:46 floppym Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2"
 SUPPORT_PYTHON_ABIS="1"
 RESTRICT_PYTHON_ABIS="3.*"
 
-inherit bash-completion-r1 distutils versionator webapp
+inherit bash-completion-r1 distutils eutils versionator webapp
 
 MY_P="Django-${PV}"
 
@@ -38,6 +38,22 @@ pkg_setup() {
 	webapp_pkg_setup
 }
 
+src_prepare() {
+	distutils_src_prepare
+	epatch "${FILESDIR}/${P}-djangodocs_extension.patch"
+
+	# Disable tests requiring network connection.
+	sed \
+		-e "s/test_correct_url_value_passes/_&/" \
+		-e "s/test_correct_url_with_redirect/_&/" \
+		-i tests/modeltests/validation/tests.py
+	sed \
+		-e "s/test_urlfield_3/_&/" \
+		-e "s/test_urlfield_4/_&/" \
+		-e "s/test_urlfield_10/_&/" \
+		-i tests/regressiontests/forms/tests/fields.py
+}
+
 src_compile() {
 	distutils_src_compile
 
diff --git a/dev-python/django/django-9999.ebuild b/dev-python/django/django-9999.ebuild
index a2acd0e74b57..93d8db8a131e 100644
--- a/dev-python/django/django-9999.ebuild
+++ b/dev-python/django/django-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/django/django-9999.ebuild,v 1.12 2011/12/14 23:44:08 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django/django-9999.ebuild,v 1.13 2011/12/21 07:06:46 floppym Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2"
@@ -38,6 +38,21 @@ pkg_setup() {
 	webapp_pkg_setup
 }
 
+src_prepare() {
+	distutils_src_prepare
+
+	# Disable tests requiring network connection.
+	sed \
+		-e "s/test_correct_url_value_passes/_&/" \
+		-e "s/test_correct_url_with_redirect/_&/" \
+		-i tests/modeltests/validation/tests.py
+	sed \
+		-e "s/test_urlfield_3/_&/" \
+		-e "s/test_urlfield_4/_&/" \
+		-e "s/test_urlfield_10/_&/" \
+		-i tests/regressiontests/forms/tests/fields.py
+}
+
 src_compile() {
 	distutils_src_compile
 
diff --git a/dev-python/django/files/django-1.3.1-djangodocs_extension.patch b/dev-python/django/files/django-1.3.1-djangodocs_extension.patch
new file mode 100644
index 000000000000..fa75c73fd2e8
--- /dev/null
+++ b/dev-python/django/files/django-1.3.1-djangodocs_extension.patch
@@ -0,0 +1,55 @@
+https://code.djangoproject.com/changeset/16223
+https://code.djangoproject.com/changeset/16231
+https://code.djangoproject.com/changeset/16952
+
+--- docs/_ext/djangodocs.py
++++ docs/_ext/djangodocs.py
+@@ -16,7 +16,7 @@
+         except ImportError:
+             json = None
+ 
+-from sphinx import addnodes, roles
++from sphinx import addnodes, roles, __version__ as sphinx_ver
+ from sphinx.builders.html import StandaloneHTMLBuilder
+ from sphinx.writers.html import SmartyPantsHTMLTranslator
+ from sphinx.util.console import bold
+@@ -127,26 +127,29 @@
+ 
+     # Don't use border=1, which docutils does by default.
+     def visit_table(self, node):
++        self._table_row_index = 0 # Needed by Sphinx
+         self.body.append(self.starttag(node, 'table', CLASS='docutils'))
+ 
+     # <big>? Really?
+     def visit_desc_parameterlist(self, node):
+         self.body.append('(')
+         self.first_param = 1
++        self.param_separator = node.child_text_separator
+ 
+     def depart_desc_parameterlist(self, node):
+         self.body.append(')')
+ 
+-    #
+-    # Don't apply smartypants to literal blocks
+-    #
+-    def visit_literal_block(self, node):
+-        self.no_smarty += 1
+-        SmartyPantsHTMLTranslator.visit_literal_block(self, node)
+-
+-    def depart_literal_block(self, node):
+-        SmartyPantsHTMLTranslator.depart_literal_block(self, node)
+-        self.no_smarty -= 1
++    if sphinx_ver < '1.0.8':
++        #
++        # Don't apply smartypants to literal blocks
++        #
++        def visit_literal_block(self, node):
++            self.no_smarty += 1
++            SmartyPantsHTMLTranslator.visit_literal_block(self, node)
++
++        def depart_literal_block(self, node):
++            SmartyPantsHTMLTranslator.depart_literal_block(self, node)
++            self.no_smarty -= 1
+ 
+     #
+     # Turn the "new in version" stuff (versionadded/versionchanged) into a