Initial import

10 files changed, 557 insertions, 0 deletions

diff --git a/dev-python/matplotlib/files/matplotlib-1.3.1-unbundle-agg.patch b/dev-python/matplotlib/files/matplotlib-1.3.1-unbundle-agg.patch
new file mode 100644
index 0000000..d5a4ae3
--- /dev/null
+++ b/dev-python/matplotlib/files/matplotlib-1.3.1-unbundle-agg.patch
@@ -0,0 +1,26 @@
+--- setupext.py.orig	2013-08-02 09:39:43.914247832 +0200
++++ setupext.py	2013-08-02 09:40:14.785304342 +0200
+@@ -749,22 +749,7 @@
+             return str(e) + ' Using local copy.'
+ 
+     def add_flags(self, ext):
+-        if self.found_external:
+-            pkg_config.setup_extension(ext, 'libagg')
+-        else:
+-            ext.include_dirs.append('agg24/include')
+-            agg_sources = [
+-                'agg_bezier_arc.cpp',
+-                'agg_curves.cpp',
+-                'agg_image_filters.cpp',
+-                'agg_trans_affine.cpp',
+-                'agg_vcgen_contour.cpp',
+-                'agg_vcgen_dash.cpp',
+-                'agg_vcgen_stroke.cpp',
+-                'agg_vpgen_segmentator.cpp'
+-                ]
+-            ext.sources.extend(
+-                os.path.join('agg24', 'src', x) for x in agg_sources)
++        pkg_config.setup_extension(ext, 'libagg', default_include_dirs=["/usr/include/agg2"])
+ 
+ 
+ class FreeType(SetupPackage):
diff --git a/dev-python/matplotlib/files/matplotlib-1.3.1-unbundle-pycxx.patch b/dev-python/matplotlib/files/matplotlib-1.3.1-unbundle-pycxx.patch
new file mode 100644
index 0000000..c27922e
--- /dev/null
+++ b/dev-python/matplotlib/files/matplotlib-1.3.1-unbundle-pycxx.patch
@@ -0,0 +1,22 @@
+diff --git a/setupext.py b/setupext.py
+index 7b629b6..8131bb1 100644
+--- a/setupext.py
++++ b/setupext.py
+@@ -674,16 +674,9 @@ class CXX(SetupPackage):
+     name = 'pycxx'
+ 
+     def check(self):
+-        if sys.version_info[0] >= 3:
+-            # There is no version of PyCXX in the wild that will work
+-            # with Python 3.x
+-            self.__class__.found_external = False
+-            return ("Official versions of PyCXX are not compatible with "
+-                    "Python 3.x.  Using local copy")
+-
+         self.__class__.found_external = True
+         old_stdout = sys.stdout
+-        sys.stdout = io.BytesIO()
++        #sys.stdout = io.BytesIO()
+         try:
+             import CXX
+         except ImportError:
diff --git a/dev-python/matplotlib/files/matplotlib-1.4.3-backport-GH5291-2462.patch b/dev-python/matplotlib/files/matplotlib-1.4.3-backport-GH5291-2462.patch
new file mode 100644
index 0000000..d6b2ae8
--- /dev/null
+++ b/dev-python/matplotlib/files/matplotlib-1.4.3-backport-GH5291-2462.patch
@@ -0,0 +1,126 @@
+commit f98c4846dc3c15b3d24aafb973764cb9b860d935
+Author: Thomas A Caswell <tcaswell@gmail.com>
+Date:   Sat Jan 10 16:10:29 2015 -0500
+
+    MNT : removed deprecated method/kwargs from patheffects
+    
+    Deprecated in #2462 / 84e0063bd37c629f129d36c548e8ce3a30692cae
+    
+    attn @pelson had to known-fail a test which was using the
+    proxy renderer to verify that PathEffectRender was working
+    correctly.
+
+diff --git a/lib/matplotlib/patheffects.py b/lib/matplotlib/patheffects.py
+index 13f8ce0..19e1c4a 100644
+--- a/lib/matplotlib/patheffects.py
++++ b/lib/matplotlib/patheffects.py
+@@ -10,9 +10,7 @@ from __future__ import (absolute_import, division, print_function,
+ import six
+ 
+ from matplotlib.backend_bases import RendererBase
+-from matplotlib.backends.backend_mixed import MixedModeRenderer
+ import matplotlib.transforms as mtransforms
+-import matplotlib.cbook as cbook
+ from matplotlib.colors import colorConverter
+ import matplotlib.patches as mpatches
+ 
+@@ -42,12 +40,6 @@ class AbstractPathEffect(object):
+         return transform + self._offset_trans.clear().translate(offset_x,
+                                                                 offset_y)
+ 
+-    def get_proxy_renderer(self, renderer):
+-        """Return a PathEffectRenderer instance for this PathEffect."""
+-        cbook.deprecated('v1.4', name='get_proxy_renderer',
+-                         alternative='PathEffectRenderer')
+-        return PathEffectRenderer([self], renderer)
+-
+     def _update_gc(self, gc, new_gc_dict):
+         """
+         Update the given GraphicsCollection with the given
+@@ -219,9 +211,9 @@ class withStroke(Stroke):
+ 
+ class SimplePatchShadow(AbstractPathEffect):
+     """A simple shadow via a filled patch."""
+-    def __init__(self, offset=(2,-2),
+-                 shadow_rgbFace=None, alpha=None, patch_alpha=None,
+-                 rho=0.3, offset_xy=None, **kwargs):
++    def __init__(self, offset=(2, -2),
++                 shadow_rgbFace=None, alpha=None,
++                 rho=0.3, **kwargs):
+         """
+         Parameters
+         ----------
+@@ -241,24 +233,12 @@ class SimplePatchShadow(AbstractPathEffect):
+             :meth:`AbstractPathEffect._update_gc`.
+ 
+         """
+-        if offset_xy is not None:
+-            cbook.deprecated('v1.4', 'The offset_xy keyword is deprecated. '
+-                             'Use the offset keyword instead.')
+-            offset = offset_xy
+         super(SimplePatchShadow, self).__init__(offset)
+ 
+         if shadow_rgbFace is None:
+             self._shadow_rgbFace = shadow_rgbFace
+         else:
+             self._shadow_rgbFace = colorConverter.to_rgba(shadow_rgbFace)
+-        if patch_alpha is not None:
+-            cbook.deprecated('v1.4', 'The patch_alpha keyword is deprecated. '
+-                             'Use the alpha keyword instead. Transform your '
+-                             'patch_alpha by alpha = 1 - patch_alpha')
+-            if alpha is not None:
+-                raise ValueError("Both alpha and patch_alpha were set. "
+-                                 "Just use alpha.")
+-            alpha = 1 - patch_alpha
+ 
+         if alpha is None:
+             alpha = 0.3
+diff --git a/lib/matplotlib/tests/test_patheffects.py b/lib/matplotlib/tests/test_patheffects.py
+index 8298ceb..5af71e5 100644
+--- a/lib/matplotlib/tests/test_patheffects.py
++++ b/lib/matplotlib/tests/test_patheffects.py
+@@ -5,7 +5,8 @@ import six
+ 
+ import numpy as np
+ 
+-from matplotlib.testing.decorators import image_comparison, cleanup
++from matplotlib.testing.decorators import (image_comparison, cleanup,
++                                           knownfailureif)
+ import matplotlib.pyplot as plt
+ import matplotlib.patheffects as path_effects
+ 
+@@ -84,19 +85,7 @@ def test_patheffect3():
+ 
+ 
+ @cleanup
+-def test_PathEffect_get_proxy():
+-    pe = path_effects.AbstractPathEffect()
+-    fig = plt.gcf()
+-    renderer = fig.canvas.get_renderer()
+-
+-    with mock.patch('matplotlib.cbook.deprecated') as dep:
+-        proxy_renderer = pe.get_proxy_renderer(renderer)
+-    assert_equal(proxy_renderer._renderer, renderer)
+-    assert_equal(proxy_renderer._path_effects, [pe])
+-    dep.assert_called()
+-
+-
+-@cleanup
++@knownfailureif(True)
+ def test_PathEffect_points_to_pixels():
+     fig = plt.figure(dpi=150)
+     p1, = plt.plot(range(10))
+@@ -116,11 +105,9 @@ def test_PathEffect_points_to_pixels():
+                  pe_renderer.points_to_pixels(15))
+ 
+ 
+-def test_SimplePatchShadow_offset_xy():
+-    with mock.patch('matplotlib.cbook.deprecated') as dep:
+-        pe = path_effects.SimplePatchShadow(offset_xy=(4, 5))
++def test_SimplePatchShadow_offset():
++    pe = path_effects.SimplePatchShadow(offset=(4, 5))
+     assert_equal(pe._offset, (4, 5))
+-    dep.assert_called()
+ 
+ 
+ @image_comparison(baseline_images=['collection'])
diff --git a/dev-python/matplotlib/files/matplotlib-1.4.3-cross-compile-1.patch b/dev-python/matplotlib/files/matplotlib-1.4.3-cross-compile-1.patch
new file mode 100644
index 0000000..0657314
--- /dev/null
+++ b/dev-python/matplotlib/files/matplotlib-1.4.3-cross-compile-1.patch
@@ -0,0 +1,50 @@
+https://github.com/matplotlib/matplotlib/pull/4430
+
+From 08d26a80859023963bc2ffb41a0b6aed942685a9 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@chromium.org>
+Date: Fri, 15 May 2015 03:36:45 -0400
+Subject: [PATCH 1/3] setupext: respect $PKG_CONFIG
+
+When cross-compiling, it is common to set the PKG_CONFIG env var to a
+custom pkg-config that knows about the target.  Make sure we respect
+that just like the standard pkg-config tools suggest (pkg.m4).  If it
+isn't set, we use the same default as today -- "pkg-config".
+---
+ setupext.py | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/setupext.py b/setupext.py
+index 80b2a6c..29cddf9 100755
+--- a/setupext.py
++++ b/setupext.py
+@@ -253,7 +253,8 @@ class PkgConfig(object):
+             self.has_pkgconfig = False
+         else:
+             self.set_pkgconfig_path()
+-            status, output = getstatusoutput("pkg-config --help")
++            self.pkgconfig = os.environ.get('PKG_CONFIG', 'pkg-config')
++            status, output = getstatusoutput("%s --help" % self.pkgconfig)
+             self.has_pkgconfig = (status == 0)
+             if not self.has_pkgconfig:
+                 print("IMPORTANT WARNING:")
+@@ -286,7 +287,7 @@ class PkgConfig(object):
+ 
+         executable = alt_exec
+         if self.has_pkgconfig:
+-            executable = 'pkg-config {0}'.format(package)
++            executable = '%s %s' % (self.pkgconfig, package)
+ 
+         use_defaults = True
+ 
+@@ -330,7 +331,7 @@ class PkgConfig(object):
+             return None
+ 
+         status, output = getstatusoutput(
+-            "pkg-config %s --modversion" % (package))
++            '%s %s --modversion' % (self.pkgconfig, package))
+         if status == 0:
+             return output
+         return None
+-- 
+2.4.0
+
diff --git a/dev-python/matplotlib/files/matplotlib-1.4.3-cross-compile-2.patch b/dev-python/matplotlib/files/matplotlib-1.4.3-cross-compile-2.patch
new file mode 100644
index 0000000..9580c70
--- /dev/null
+++ b/dev-python/matplotlib/files/matplotlib-1.4.3-cross-compile-2.patch
@@ -0,0 +1,54 @@
+https://github.com/matplotlib/matplotlib/pull/4430
+
+From 3761303016cab0542891374032eca87e74d585bf Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@chromium.org>
+Date: Fri, 15 May 2015 03:43:17 -0400
+Subject: [PATCH 2/3] setupext: do not mess with PKG_CONFIG_PATH
+
+The current code always sets PKG_CONFIG_PATH to build paths in / which
+breaks cross-compiling -- things like /usr/lib are for the build system
+(e.g. x86) and not for the target (e.g. arm).  Since we're adding paths
+that are already the default for pkg-config, there's no point in trying
+to be smart here.  Just punt the code.
+
+This basically reverts commit 101beb975d3a1218350f02bf68dc2a43ac8ff148.
+---
+ setupext.py | 15 ---------------
+ 1 file changed, 15 deletions(-)
+
+diff --git a/setupext.py b/setupext.py
+index 29cddf9..57d80e7 100755
+--- a/setupext.py
++++ b/setupext.py
+@@ -252,7 +252,6 @@ class PkgConfig(object):
+         if sys.platform == 'win32':
+             self.has_pkgconfig = False
+         else:
+-            self.set_pkgconfig_path()
+             self.pkgconfig = os.environ.get('PKG_CONFIG', 'pkg-config')
+             status, output = getstatusoutput("%s --help" % self.pkgconfig)
+             self.has_pkgconfig = (status == 0)
+@@ -262,20 +261,6 @@ class PkgConfig(object):
+                     "    pkg-config is not installed.\n"
+                     "    matplotlib may not be able to find some of its dependencies")
+ 
+-    def set_pkgconfig_path(self):
+-        pkgconfig_path = sysconfig.get_config_var('LIBDIR')
+-        if pkgconfig_path is None:
+-            return
+-
+-        pkgconfig_path = os.path.join(pkgconfig_path, 'pkgconfig')
+-        if not os.path.isdir(pkgconfig_path):
+-            return
+-
+-        try:
+-            os.environ['PKG_CONFIG_PATH'] += ':' + pkgconfig_path
+-        except KeyError:
+-            os.environ['PKG_CONFIG_PATH'] = pkgconfig_path
+-
+     def setup_extension(self, ext, package, default_include_dirs=[],
+                         default_library_dirs=[], default_libraries=[],
+                         alt_exec=None):
+-- 
+2.4.0
+
diff --git a/dev-python/matplotlib/files/matplotlib-1.4.3-cross-compile-3.patch b/dev-python/matplotlib/files/matplotlib-1.4.3-cross-compile-3.patch
new file mode 100644
index 0000000..21fdf12
--- /dev/null
+++ b/dev-python/matplotlib/files/matplotlib-1.4.3-cross-compile-3.patch
@@ -0,0 +1,58 @@
+https://github.com/matplotlib/matplotlib/pull/4430
+
+From d077e49be318c851f6bbd64708efeed78a3ece3f Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@chromium.org>
+Date: Fri, 15 May 2015 03:49:02 -0400
+Subject: [PATCH 3/3] setupext: do not hardcode system -I/-L paths
+
+The native compiler should already know the right paths to look for
+includes and libraries.  Hardcoding a specific list of those paths
+breaks both cross-compiling and multilib.  In the former, paths like
+/usr/include and /usr/lib are for x86 but when you want to build for
+arm, mixing them leads to bad failures.  In the latter, paths like
+/usr/lib typically hold 32it libraries, but when you're building for
+64bit, you want the libs from /usr/lib64.  This goes even further as
+there are other mixed ABIs like /usr/libx32 and /usr/lib32, neither
+of which are handled here.
+
+Instead, delete the code entirely and rely on the compiler being
+properly configured.  If you want to use a misconfigured compiler,
+you can always set CFLAGS/CPPFLAGS/LDFLAGS to include the -I/-L
+that your system needs.
+---
+ setupext.py | 12 +-----------
+ 1 file changed, 1 insertion(+), 11 deletions(-)
+
+diff --git a/setupext.py b/setupext.py
+index 57d80e7..7473e3a 100755
+--- a/setupext.py
++++ b/setupext.py
+@@ -216,9 +216,7 @@ sysconfig.customize_compiler = my_customize_compiler
+ 
+ def make_extension(name, files, *args, **kwargs):
+     """
+-    Make a new extension.  Automatically sets include_dirs and
+-    library_dirs to the base directories appropriate for this
+-    platform.
++    Make a new extension.
+ 
+     `name` is the name of the extension.
+ 
+@@ -228,14 +226,6 @@ def make_extension(name, files, *args, **kwargs):
+     `distutils.core.Extension` constructor.
+     """
+     ext = DelayedExtension(name, files, *args, **kwargs)
+-    for dir in get_base_dirs():
+-        include_dir = os.path.join(dir, 'include')
+-        if os.path.exists(include_dir):
+-            ext.include_dirs.append(include_dir)
+-        for lib in ('lib', 'lib64'):
+-            lib_dir = os.path.join(dir, lib)
+-            if os.path.exists(lib_dir):
+-                ext.library_dirs.append(lib_dir)
+     ext.include_dirs.append('.')
+ 
+     return ext
+-- 
+2.4.0
+
diff --git a/dev-python/matplotlib/files/matplotlib-1.5.1-sphinx-1.4.3-backport.patch b/dev-python/matplotlib/files/matplotlib-1.5.1-sphinx-1.4.3-backport.patch
new file mode 100644
index 0000000..19c111d
--- /dev/null
+++ b/dev-python/matplotlib/files/matplotlib-1.5.1-sphinx-1.4.3-backport.patch
@@ -0,0 +1,58 @@
+From b7dfa4fa7a69d091dac0ead295d28422c4e33b45 Mon Sep 17 00:00:00 2001
+From: Thomas A Caswell <tcaswell@gmail.com>
+Date: Sun, 24 Jan 2016 13:05:18 -0500
+Subject: [PATCH] Merge pull request #5872 from jenshnielsen/sphinx134
+
+DOC: Fix issue with Sphinx 1.3.4
+
+Discarded changes to .travis.yml from #5872
+---
+ lib/matplotlib/dviread.py |  2 +-
+ lib/matplotlib/patches.py | 18 ++++++++++++------
+ 2 files changed, 13 insertions(+), 7 deletions(-)
+
+diff --git a/lib/matplotlib/dviread.py b/lib/matplotlib/dviread.py
+index db6e976..1141f6a 100644
+--- a/lib/matplotlib/dviread.py
++++ b/lib/matplotlib/dviread.py
+@@ -841,7 +841,7 @@ def find_tex_file(filename, format=None):
+     """
+     Call :program:`kpsewhich` to find a file in the texmf tree. If
+     *format* is not None, it is used as the value for the
+-    :option:`--format` option.
++    `--format` option.
+ 
+     Apparently most existing TeX distributions on Unix-like systems
+     use kpathsea. I hear MikTeX (a popular distribution on Windows)
+diff --git a/lib/matplotlib/patches.py b/lib/matplotlib/patches.py
+index b8b7363..917eca7 100644
+--- a/lib/matplotlib/patches.py
++++ b/lib/matplotlib/patches.py
+@@ -2992,15 +2992,21 @@ class Bar(_Base):
+ 
+         def __init__(self, armA=0., armB=0., fraction=0.3, angle=None):
+             """
+-            *armA* : minimum length of armA
++            Parameters
++            ----------
++            armA : float
++                minimum length of armA
+ 
+-            *armB* : minimum length of armB
++            armB : float
++                minimum length of armB
+ 
+-            *fraction* : a fraction of the distance between two points that
+-                         will be added to armA and armB.
++            fraction : float
++                a fraction of the distance between two points that
++                will be added to armA and armB.
+ 
+-            *angle* : angle of the connecting line (if None, parallel to A
+-                      and B)
++            angle : float or None
++                angle of the connecting line (if None, parallel
++                to A and B)
+             """
+             self.armA = armA
+             self.armB = armB
diff --git a/dev-python/matplotlib/files/matplotlib-1.5.1-test-fix-backport-2.patch b/dev-python/matplotlib/files/matplotlib-1.5.1-test-fix-backport-2.patch
new file mode 100644
index 0000000..c850d09
--- /dev/null
+++ b/dev-python/matplotlib/files/matplotlib-1.5.1-test-fix-backport-2.patch
@@ -0,0 +1,22 @@
+From c28e1b0aebe19b7db292eb7c1b6deba8af6754e0 Mon Sep 17 00:00:00 2001
+From: Jens Hedegaard Nielsen <jens.nielsen@ucl.ac.uk>
+Date: Wed, 13 Jan 2016 13:48:06 +0000
+Subject: [PATCH] Fix new pep8 issue in legend_demo5
+
+---
+ examples/pylab_examples/legend_demo5.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/examples/pylab_examples/legend_demo5.py b/examples/pylab_examples/legend_demo5.py
+index 699babe..5668966 100644
+--- a/examples/pylab_examples/legend_demo5.py
++++ b/examples/pylab_examples/legend_demo5.py
+@@ -41,7 +41,7 @@ def create_artists(self, legend, orig_handle,
+                 lw = orig_handle.get_linewidths()[i]
+             except IndexError:
+                 lw = orig_handle.get_linewidths()[0]
+-            if dashes[0] != None:
++            if dashes[0] is not None:
+                 legline.set_dashes(dashes[1])
+             legline.set_color(color)
+             legline.set_transform(trans)
diff --git a/dev-python/matplotlib/files/matplotlib-1.5.1-test-fix-backport.patch b/dev-python/matplotlib/files/matplotlib-1.5.1-test-fix-backport.patch
new file mode 100644
index 0000000..d031e5a
--- /dev/null
+++ b/dev-python/matplotlib/files/matplotlib-1.5.1-test-fix-backport.patch
@@ -0,0 +1,115 @@
+From 72cf5b80537157decc741d81db550e6cf82648f6 Mon Sep 17 00:00:00 2001
+From: Michael Droettboom <mdboom@gmail.com>
+Date: Mon, 11 Jan 2016 16:48:04 -0500
+Subject: [PATCH] Fix #5829.  Update the baseline image.
+
+---
+ .../baseline_images/test_image/rasterize_10dpi.svg | 56 ++++++++++------------
+ 1 file changed, 26 insertions(+), 30 deletions(-)
+
+diff --git a/lib/matplotlib/tests/baseline_images/test_image/rasterize_10dpi.svg b/lib/matplotlib/tests/baseline_images/test_image/rasterize_10dpi.svg
+index 47e354d..1f73c8f 100644
+--- a/lib/matplotlib/tests/baseline_images/test_image/rasterize_10dpi.svg
++++ b/lib/matplotlib/tests/baseline_images/test_image/rasterize_10dpi.svg
+@@ -5,31 +5,29 @@
+ <svg height="72pt" version="1.1" viewBox="0 0 216 72" width="216pt" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+  <defs>
+   <style type="text/css">
+-*{stroke-linecap:butt;stroke-linejoin:round;}
++*{stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:100000;}
+   </style>
+  </defs>
+  <g id="figure_1">
+   <g id="patch_1">
+-   <path d="
+-M0 72
+-L216 72
+-L216 0
+-L0 0
++   <path d="M 0 72 
++L 216 72 
++L 216 0 
++L 0 0 
+ z
+ " style="fill:#ffffff;"/>
+   </g>
+   <g id="axes_1">
+    <g id="patch_2">
+-    <path d="
+-M27 60.6176
+-L76.2353 60.6176
+-L76.2353 11.3824
+-L27 11.3824
++    <path d="M 27 60.617647 
++L 76.235294 60.617647 
++L 76.235294 11.382353 
++L 27 11.382353 
+ z
+ " style="fill:#ffffff;"/>
+    </g>
+-   <g clip-path="url(#pc31db6f15f)">
+-    <image height="50.4" id="image2c20c31ecf" width="57.6" x="27.0" xlink:href="data:image/png;base64,
++   <g clip-path="url(#p306f09a014)">
++    <image height="50.4" id="image207c5863ce" width="57.6" x="27.0" xlink:href="data:image/png;base64,
+ iVBORw0KGgoAAAANSUhEUgAAAAgAAAAHCAYAAAA1WQxeAAAABHNCSVQICAgIfAhkiAAAAIVJREFUCJmFzjkKwlAAhOEvKi5FMLU2HkEQwdbSU3knL+EBLMUFQayCUaMYF55FQEsH/mYYZiZiGkA3Ydj70UlAxR/Vhv09eLfPivipuOUe69QrjcvAZLwE99CShYPsnMgWiSI0QTSfdQNcjjWHTeNLnlXLhtGgnDju2KbEV+orTqX9/+QHCXAwPEkx7O0AAAAASUVORK5CYII=" y="10.2176470588"/>
+    </g>
+    <g id="matplotlib.axis_1"/>
+@@ -37,43 +35,41 @@ iVBORw0KGgoAAAANSUhEUgAAAAgAAAAHCAYAAAA1WQxeAAAABHNCSVQICAgIfAhkiAAAAIVJREFUCJmF
+   </g>
+   <g id="axes_2">
+    <g id="patch_3">
+-    <path d="
+-M86.0824 64.8
+-L135.318 64.8
+-L135.318 7.2
+-L86.0824 7.2
++    <path d="M 86.082353 64.8 
++L 135.317647 64.8 
++L 135.317647 7.2 
++L 86.082353 7.2 
+ z
+ " style="fill:#ffffff;"/>
+    </g>
+-   <image height="64.8" id="image1d9f73e233" width="136.8" x="79.2" xlink:href="data:image/png;base64,
+-iVBORw0KGgoAAAANSUhEUgAAABMAAAAJCAYAAADQHRcxAAAABHNCSVQICAgIfAhkiAAAAHNJREFUKJG10kENwlAQBuH5OVQBImoBAzVQA1hABxoQUAUYqIWaqIRepqdHmoaE9AGbzGU3+U4blV/N6d0yoUnoE56HNPUV2IJ3cAYF3d4/VZArOBZgWw22RxZwALtvsAm8gecjyB57gBcwNUgpf3+N2lkBB3gBDVzLDTYAAAAASUVORK5CYII=" y="7.2"/>
++   <image height="43.2" id="image2e9ed63e7b" width="50.4" x="86.39999999999999" xlink:href="data:image/png;base64,
++iVBORw0KGgoAAAANSUhEUgAAAAcAAAAGCAYAAAAPDoR2AAAABHNCSVQICAgIfAhkiAAAAFVJREFUCJllzjEVwlAAxdDbBQUVgQUMYAADWKgONCAABRjAQk0ggSUdGPoPDFnyhjyVETrQhZ6jPNKN3tQXXem1i5F/+aEHncdxpYXmPaU7nWj6PbcBc+lWnSEOzhQAAAAASUVORK5CYII=" y="14.4"/>
+    <g id="matplotlib.axis_3"/>
+    <g id="matplotlib.axis_4"/>
+   </g>
+   <g id="axes_3">
+    <g id="patch_4">
+-    <path d="
+-M145.165 64.8
+-L194.4 64.8
+-L194.4 7.2
+-L145.165 7.2
++    <path d="M 145.164706 64.8 
++L 194.4 64.8 
++L 194.4 7.2 
++L 145.164706 7.2 
+ z
+ " style="fill:#ffffff;"/>
+    </g>
+    <g id="line2d_1">
+-    <path clip-path="url(#p19b1e86336)" d="
+-M145.165 45.6
+-L194.4 26.4" style="fill:none;stroke:#0000ff;stroke-linecap:square;stroke-width:20.0;"/>
++    <path clip-path="url(#pef029be595)" d="M 145.164706 45.6 
++L 194.4 26.4 
++" style="fill:none;stroke:#0000ff;stroke-linecap:square;stroke-width:20.0;"/>
+    </g>
+    <g id="matplotlib.axis_5"/>
+    <g id="matplotlib.axis_6"/>
+   </g>
+  </g>
+  <defs>
+-  <clipPath id="p19b1e86336">
++  <clipPath id="pef029be595">
+    <rect height="57.6" width="49.2352941176" x="145.164705882" y="7.2"/>
+   </clipPath>
+-  <clipPath id="pc31db6f15f">
++  <clipPath id="p306f09a014">
+    <rect height="49.2352941176" width="49.2352941176" x="27.0" y="11.3823529412"/>
+   </clipPath>
+  </defs>
diff --git a/dev-python/matplotlib/files/matplotlib-1.5.3-freetype-spurious-failure.patch b/dev-python/matplotlib/files/matplotlib-1.5.3-freetype-spurious-failure.patch
new file mode 100644
index 0000000..bc6891a
--- /dev/null
+++ b/dev-python/matplotlib/files/matplotlib-1.5.3-freetype-spurious-failure.patch
@@ -0,0 +1,26 @@
+Increase the tolerance margin in order to pass tests caused by
+freetype producing unreproducible images across different versions.
+See also: https://github.com/matplotlib/matplotlib/issues/2667
+
+--- a/lib/matplotlib/tests/test_mathtext.py
++++ b/lib/matplotlib/tests/test_mathtext.py
+@@ -158,7 +158,7 @@
+ def make_set(basename, fontset, tests, extensions=None):
+     def make_test(filename, test):
+         @image_comparison(baseline_images=[filename], extensions=extensions,
+-                          tol=32)
++                          tol=40)
+         def single_test():
+             matplotlib.rcParams['mathtext.fontset'] = fontset
+             fig = plt.figure(figsize=(5.25, 0.75))
+--- a/lib/matplotlib/tests/test_text.py
++++ b/lib/matplotlib/tests/test_text.py
+@@ -18,7 +18,7 @@
+ from matplotlib.backends.backend_agg import RendererAgg
+ 
+ 
+-@image_comparison(baseline_images=['font_styles'])
++@image_comparison(baseline_images=['font_styles'], tol=20)
+ def test_font_styles():
+     from matplotlib import _get_data_path
+     data_path = _get_data_path()