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

Package-Manager: portage-2.2.0_alpha81/cvs/Linux x86_64

diff --git a/dev-python/django/ChangeLog b/dev-python/django/ChangeLog
index 4d9d6261ae405592e2547e27a296a6affa35030f..cabbe0a287608833e34d872daba3972bf9f4610f 100644 (file)
--- 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/Manifest b/dev-python/django/Manifest
index 946ddbd6414393814645f7edf609af64845aec06..d6b32a2480996aa1593e60a24b973727e53bcc29 100644 (file)
--- a/dev-python/django/Manifest
+++ b/dev-python/django/Manifest
@@ -1,22 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX django-1.3.1-djangodocs_extension.patch 1879 RMD160 90c422607da766af1d0a8bb0f3bf95fe931a9b1e SHA1 ab0fc5d204f578722fde96bfa24dfa4ed54653fc SHA256 fbf7b2383f18f03755f30fe9a25e05d994aa22d7a6832b92073f5a3dcf7a0a87
 DIST Django-1.1.4.tar.gz 5750441 RMD160 2aac00043088fa705de428ca44240253fbd79af6 SHA1 a636ea12c5d8b5d5befec60bb356016f092b1943 SHA256 1f9d48a741f98951e65818e167c84c407d1c322efcfd4cb419384773ea793dee
 DIST Django-1.2.5.tar.gz 6379313 RMD160 e57f48331377047763875876e51c754f91f58f80 SHA1 9593e6745650d06c0af82a79d6e304d958419f94 SHA256 649387248296386b589c4a8bf91d34590b43f93b6ebfe6cefbea0ddf4641ccd6
 DIST Django-1.3.1.tar.gz 6514564 RMD160 baf14da8d25eb9852a7989e1a1be7d9fd0e21d3a SHA1 fd968134c8ded38d2d9ccd2cafe865a0585aefc4 SHA256 af9118c4e8a063deb0b8cda901fcff2b805e7cf496c93fd43507163f3cde156b
 DIST Django-1.3.tar.gz 6504003 RMD160 57a3bdb3eb326634647d2eea9df1b5484316c7bc SHA1 f8814d5e1412bb932318db5130260da5bf053ff7 SHA256 7aeee5c80002ab81d4ebf5416292949ff46e1448d183a183fe05ff6344771c83
 EBUILD django-1.1.4.ebuild 2553 RMD160 5d5e9593a0b847c2ab62c98d2f32b26e8fb17d28 SHA1 98b185b4850bcc8b91375ddc2d701d96cbfe088b SHA256 2deb22d66256a1870d6e5e136b89a63e7b2e43c65cc892e391696aea32ea7adf
 EBUILD django-1.2.5.ebuild 2692 RMD160 2f1ac2e3409aabadb3fa1eb12dc589fcc9d5882c SHA1 76049400cc3511901a56bed4c7fffa8a63a44c1b SHA256 3872f7dbe4cbd100665b916d13cc339d39006a60518e44401f9b856e6ae7a460
-EBUILD django-1.3.1-r1.ebuild 2678 RMD160 b8614db4fabfef30b2415fffbf5ceef38e60ece0 SHA1 78989d4d5ecaabcca27f247029dbf35b054e63cc SHA256 74b43c44dc8dd0d9400867a7a247e646b9405ea699344df114cdedfcbf663107
+EBUILD django-1.3.1-r1.ebuild 3119 RMD160 e9c2db6ef31d441007b5557f116f7a34c989a576 SHA1 c5dba6e4693e22652391cfe1860cc5087b20cda3 SHA256 86c402c8a3fc2f33946fa04a018e3bcd83e4004a07538effd93cfd2c77e7a155
 EBUILD django-1.3.1.ebuild 2692 RMD160 32d33c03154dbda27cd693dc96c9bab872cf32bf SHA1 868214ae0cb9816436c1d031651002a9dab6a2e4 SHA256 8890c99f1cda800a12aff474c49b7598cb3ed9cf0382f6515b7f1f37da33e57b
 EBUILD django-1.3.ebuild 2688 RMD160 5aa33bea4cd9c4b2f5897f597a0c190c18084426 SHA1 0012312329a017bf0c46d26f7c99d6d5c4f544a3 SHA256 7c844b0b71656520df4d30bb75eeffa93e9b4a9a7d9c81ef1623ec07827e98e4
-EBUILD django-9999.ebuild 2529 RMD160 4e9e6f792777ab7b4736ef9be8726e4f6f161332 SHA1 823219cf43a9c910f0ae85562c9af21b58e59891 SHA256 212dd4d3156ab3918ce7adc6e28103a80063090f59efb02bea3420bdf668b318
-MISC ChangeLog 11660 RMD160 417ad708e3243a08942c05c9f841abc64755adcd SHA1 01213e6886947c024f05d4af1446b1883976994d SHA256 55351cdb50662f54e4feb575135aa639d28c2cb6901c41319668e1d421de1fea
+EBUILD django-9999.ebuild 2909 RMD160 0773e04c23bb859a7a105da9466c31693b66e880 SHA1 ec25a2a20d2cfa9cec156d2b4459355618873c86 SHA256 7f095467fba20fee47d6d4b66bdc53c446ad3205672dc73bec3df4a646d21f0d
+MISC ChangeLog 11890 RMD160 c18ec06ff931d8814a3a2858837d0d7242039ec6 SHA1 a06a7e331242bc3fc5e4e786521e3ed382b46f22 SHA256 46a4d0cdc45890eb5df58bc24584501740c7f19d8569da18ec73513c6eac0991
 MISC metadata.xml 160 RMD160 e730f96ab97c5be577a6d6d05f04990374a0dffb SHA1 2aa5e6be9c265c0e7bceb78ee9fd20df5f818e36 SHA256 6cd954a9de2307c57d32b25fa3599dee2908a4ddc6a98594f593d53577307a3a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk7pNNIACgkQC77qH+pIQ6RvBwEAgYvdXypOu6cQaClLNJPSfHVi
-YC19r6klx0tYok3ccPUA/0/u3K8gbhQu5T3njtFdtx/FPS8hSqMMJYpnw9erxQnZ
-=1xLC
+iF4EAREIAAYFAk7xhY8ACgkQC77qH+pIQ6TgyQEAn4lblmH0AITlS+eNpj0fYVn0
+UIJPkmHqpHj/IC7iTLABAMRyyUaV7O7Dv1HAsHlFlCL1jFB0+ldzyHHm9HzLuk6+
+=F/qR
 -----END PGP SIGNATURE-----

diff --git a/dev-python/django/django-1.3.1-r1.ebuild b/dev-python/django/django-1.3.1-r1.ebuild
index e6e5a34c6cbedc4dd15dbd24dd993bb10420c8a8..78db8fcb5778c57815ed1d802ee5f25deee404b2 100644 (file)
--- 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 a2acd0e74b57d93aa27ef5319d4cd4e2d5484be8..93d8db8a131e083efe359699347581dd32cf8b59 100644 (file)
--- 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 (file)
index 0000000..fa75c73
--- /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