[83552] trunk/dports/python/py-matplotlib

[ram at macports.org]

Revision: 83552
          http://trac.macports.org/changeset/83552
Author:   ram at macports.org
Date:     2011-09-05 12:24:54 -0700 (Mon, 05 Sep 2011)
Log Message:
-----------
python/py-matplotlib: apply upstream 8955, closes #30846

Modified Paths:
--------------
    trunk/dports/python/py-matplotlib/Portfile

Added Paths:
-----------
    trunk/dports/python/py-matplotlib/files/patch-dviread.diff

Modified: trunk/dports/python/py-matplotlib/Portfile
===================================================================
--- trunk/dports/python/py-matplotlib/Portfile	2011-09-05 19:01:17 UTC (rev 83551)
+++ trunk/dports/python/py-matplotlib/Portfile	2011-09-05 19:24:54 UTC (rev 83552)
@@ -6,7 +6,7 @@
 categories-append  graphics math
 name               py-matplotlib
 version            1.0.1
-revision           4
+revision           5
 maintainers        ram openmaintainer
 platforms          darwin
 
@@ -51,7 +51,8 @@
 patchfiles         patch-setupext.py.diff \
                    patch-setup.cfg.diff \
                    patch-disable_optional_deps.diff \
-                   patch-04b4e50919.diff
+                   patch-04b4e50919.diff \
+                   patch-dviread.diff
 
 build.env          MPLIB_BASE="${prefix}" PKG_CONFIG_PATH="${python.prefix}/lib/pkgconfig/"
 

Added: trunk/dports/python/py-matplotlib/files/patch-dviread.diff
===================================================================
--- trunk/dports/python/py-matplotlib/files/patch-dviread.diff	                        (rev 0)
+++ trunk/dports/python/py-matplotlib/files/patch-dviread.diff	2011-09-05 19:24:54 UTC (rev 83552)
@@ -0,0 +1,38 @@
+--- lib/matplotlib/dviread.py	2010/07/06 14:37:14	8512
++++ lib/matplotlib/dviread.py	2011/02/07 16:42:17	8955
+@@ -714,22 +714,30 @@
+         subsetting, but I have no example of << in my TeX installation.
+         """
+         texname, psname = words[:2]
+-        effects, encoding, filename = '', None, None
++        effects, encodings, filename = '', [], None
+         for word in words[2:]:
+             if not word.startswith('<'):
+                 effects = word
+             else:
+                 word = word.lstrip('<')
+                 if word.startswith('['):
+-                    assert encoding is None
+-                    encoding = word[1:]
++                    encodings.append(word[1:])
+                 elif word.endswith('.enc'):
+-                    assert encoding is None
+-                    encoding = word
++                    encodings.append(word)
+                 else:
+                     assert filename is None
+                     filename = word
+ 
++        if len(encodings) > 1:
++            # TODO this is a stopgap workaround, need to handle this correctly
++            matplotlib.verbose.report('Multiple encodings for %s = %s, skipping'
++                                      % (texname, psname), 'debug')
++            return
++        elif len(encodings) == 1:
++            encoding, = encodings
++        else:
++            encoding = None
++
+         eff = effects.split()
+         effects = {}
+         try:
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110905/c7d5c60b/attachment.html>