diff options
Diffstat (limited to 'dev-python/matplotlib')
12 files changed, 0 insertions, 832 deletions
diff --git a/dev-python/matplotlib/Manifest b/dev-python/matplotlib/Manifest deleted file mode 100644 index 0db642b..0000000 --- a/dev-python/matplotlib/Manifest +++ /dev/null @@ -1,12 +0,0 @@ -AUX matplotlib-1.3.1-unbundle-agg.patch 976 SHA256 1c22a991be0d0cecf9e5a0c3ab74aeb8951844dc480635c9da814a8c6e5ee6da SHA512 2e5a9045b69fd7f84fe0540aae6bde26b34db4dae29b725dc811b054f16e671f64345d28473f83861b0cfc0b14d2dd833ef188b3ba44c955db46475668c96786 WHIRLPOOL 5a26d99451fbdb1218e12ec9d5ebe6bf23f43eb4acf4019af9fde4ecb3eb67127d446112868836cc4165d65a403cf825a630c822e1e6466516b6549849849642 -AUX matplotlib-1.3.1-unbundle-pycxx.patch 734 SHA256 ab33e8ba4879cd11c3e41394ae53566b2496c695328d9f498dd629124127fabf SHA512 4accb71a4b608c31637de354c2f6331dd69e98c352db059d0f1d3c0ade90b6fe11cdd3bfe799eabf7c52fa26e1fb81499064b15c07c34751ee6059c110956576 WHIRLPOOL 7b8c8ba9f93f282664b716358e57f61e18a022a80cdeea86d86dc8a907f1354ad8ddf8c3463ed8cfea10d0b1e0aeeacd58681b079cf2a931c9d24dc5b9f01497 -AUX matplotlib-1.4.3-backport-GH5291-2462.patch 4810 SHA256 6ba9d2c886524fd892b87c0e5b74c41f4d16fde0a40f4c70b195194febdafeef SHA512 06fb07f42d5a0e8c54e7f259bc0b8787a8caf25fa52c1d5a37a660c6e6df0fe6d93dc91367699d40d19b523c903c4be6a284403dc3eb93a4e68acc2e80329120 WHIRLPOOL 8a28cb05eb3848c38829c7a0c4c020d1c94f2f7d8059be02d341f2c0a3f568e6600e16eb9b1de3d9ea98a24c45469f708642679ddee9569535479afa7d06e388 -AUX matplotlib-1.4.3-cross-compile-1.patch 1779 SHA256 1910a0e3a5dca036e4c30d5bccbba7e0722fc02d1d867a32699fff4f8db248fb SHA512 6d2b57ae37df42b1d6c87501037f0dfe1ebf40dad9ea2bb35ff4b58cc1a3e580ad12add99c779966e764244d0bacf6ad922848bca568fc3329ead07c0b57826d WHIRLPOOL 57fa9a889bd4adff780b6bbd478cfa94f6fdb231004f2b05f6288ffb243ed2b8a9e497b85a11a5a34170d0560895c1d56a1d679949ce29dc6aa403e672d44574 -AUX matplotlib-1.4.3-cross-compile-2.patch 2066 SHA256 88513fb38363ae65aa56991de81e4e1f1b51e2465ebfe0dd41f0dfb1ba16dc9b SHA512 d547b79d2a6f2dcca5105093faf9bc15208b1d28737d17a65d4ad716d74029d1a575d0c83b684e139d203f7b58a34a161a8e3968bfe1515f47c754b29117a824 WHIRLPOOL 0cb8e3e4dd08f0aed733297641e8e4b16b361107d545921008116f1618a427ed486a91d930420f44ac9a50facca3d70cb565c76d2ea0cb3537e5270fd3e6c0b2 -AUX matplotlib-1.4.3-cross-compile-3.patch 2202 SHA256 2285ba7aefb3b06eb5cb16651d3870944d5a3c0ed7b39046a8b05dd0c14ae44e SHA512 5c1a7579a2cd4e97f56485e0300d9dcc7c8871e99bd93e03113e68b95996960ece039a41203775afc2c627f0a2483f038e0e693c73efdacfbb85d47ae855b7b1 WHIRLPOOL f27e6495720ed9db16f61a3aa9fca275aa3bd3ebb867c2c79e381a053a8412bf7a17422b6675d9fd75af5dfefbe58418ec8ffe5e8e096be655a10943829709ee -AUX matplotlib-1.5.1-sphinx-1.4.3-backport.patch 2164 SHA256 d09217a603cd5126fdd1d6af7c7244617cd03013db6999642133f309cd4501c1 SHA512 60c6f8792fa9562d0390d905d3f99c46d3a20d4dd315c6a679c363ebb2445f2d5ae0e6c515de729b89ed1e3dfac63f3b20026b64069dd737406109250b00812a WHIRLPOOL fe5620ac15f1e67ad09995363ceba0f560bc290e1cdc635c94b492ded9ccd10721c1b183d064be03654b909344a0498ff6a17f7b02886252261d48f9573a321a -AUX matplotlib-1.5.1-test-fix-backport-2.patch 938 SHA256 de443a07e3358fc643af6ad9601140ed532034ec60505c054eab2f34bd6b9b28 SHA512 b238d6d2915293045d2bbda6737fcfb8c1206e0f404b2151495e6a5ba14caeffcbbf5f26b9a62145b29200b25afbe6dd47c4889649699c8c2eb4b0ab1d610014 WHIRLPOOL 6dcd91f8876f993b4ffcf71e2d084e0c14e99991a161c212a4f73f274f63bd94cf269bfad819828a48a59de7dab31f289acfe23af484890daa2f4ce480a8640c -AUX matplotlib-1.5.1-test-fix-backport.patch 4175 SHA256 5eb0d2b033a0d63921d73c3c3103cc55fe784642b2f440c93ae27c16f821e96b SHA512 fb1845da597fcedc268a037ff3ee2996d97d52c1f8c4ff75e3b035d977d8e02e427413f3bfd1e72e1a13e0e2044800237b0d160e1eb85779820f3c480dea472b WHIRLPOOL 43a501504e78c4d6e406975148003c9b8941641877e1a8ab7951087ddd52adfabaac8e4f9a8f78f577c9b0e491f73499dd4097943265888d349faa9e5ee212f1 -AUX matplotlib-1.5.3-freetype-spurious-failure.patch 1061 SHA256 fef22d55869d8a9cea9f49a6d57feb955929df2e58c9cb746947927dd2224e26 SHA512 3cae61f9f6fcad1f2c8f47d7489a4ab54406118deaa8993b2a82c65bac8d21dc733f8c46b7f59d4a1961c643035b0b95d0c906f9388865e5036b12ff5abbbc32 WHIRLPOOL 6f4c892264716888828acefc712a3d8f3fe1efad4aa2071c56a8a6b1c2ffaef430d0d76f70e15b4c74ab3c4b69a76f0642b1c455c05b91e8b42b4046c7ba6913 -DIST matplotlib-2.0.0.tar.gz 53161302 SHA256 36cf0985829c1ab2b8b1dae5e2272e53ae681bf33ab8bedceed4f0565af5f813 SHA512 516d4afff0929fd769ca3386b3ae2c1a242ad095d2f3fc5f291f5f37bb014452f01131657c701fc39964d268417c01875296ddb61d34befff0f1a586173850db WHIRLPOOL cb3ca1b7fdacf7e2248cd07269177420092dd2319202e3dda4f00480667a66047549b6cf8e9287e36141459a93af936a500eab1cce6538f50ba7b7d3fad1c5ed -EBUILD matplotlib-2.0.0.ebuild 6408 SHA256 26797a2e710020a17fedd4481e40cff96a1044ea6045d8764eceb9775d79ba76 SHA512 8df4906c677072a02e0736b83740620df1062966fb69f652dd2326f29c3e493f4d9b40c311fd4b93414fcf2d66c410433b522cf749171006fe40329e799347ce WHIRLPOOL ff131b44ae7f8897c0a8b912ec1ce2583efe1df47c33b04e9e7664bc1c0d43c5a6fbb31c404540d4d5600c080b87ceecc60e3d9f670ca23daf901da5c8262531 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 deleted file mode 100644 index d5a4ae3..0000000 --- a/dev-python/matplotlib/files/matplotlib-1.3.1-unbundle-agg.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- 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 deleted file mode 100644 index c27922e..0000000 --- a/dev-python/matplotlib/files/matplotlib-1.3.1-unbundle-pycxx.patch +++ /dev/null @@ -1,22 +0,0 @@ -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 deleted file mode 100644 index d6b2ae8..0000000 --- a/dev-python/matplotlib/files/matplotlib-1.4.3-backport-GH5291-2462.patch +++ /dev/null @@ -1,126 +0,0 @@ -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 deleted file mode 100644 index 0657314..0000000 --- a/dev-python/matplotlib/files/matplotlib-1.4.3-cross-compile-1.patch +++ /dev/null @@ -1,50 +0,0 @@ -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 deleted file mode 100644 index 9580c70..0000000 --- a/dev-python/matplotlib/files/matplotlib-1.4.3-cross-compile-2.patch +++ /dev/null @@ -1,54 +0,0 @@ -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 deleted file mode 100644 index 21fdf12..0000000 --- a/dev-python/matplotlib/files/matplotlib-1.4.3-cross-compile-3.patch +++ /dev/null @@ -1,58 +0,0 @@ -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 deleted file mode 100644 index 19c111d..0000000 --- a/dev-python/matplotlib/files/matplotlib-1.5.1-sphinx-1.4.3-backport.patch +++ /dev/null @@ -1,58 +0,0 @@ -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 deleted file mode 100644 index c850d09..0000000 --- a/dev-python/matplotlib/files/matplotlib-1.5.1-test-fix-backport-2.patch +++ /dev/null @@ -1,22 +0,0 @@ -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 deleted file mode 100644 index d031e5a..0000000 --- a/dev-python/matplotlib/files/matplotlib-1.5.1-test-fix-backport.patch +++ /dev/null @@ -1,115 +0,0 @@ -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 deleted file mode 100644 index bc6891a..0000000 --- a/dev-python/matplotlib/files/matplotlib-1.5.3-freetype-spurious-failure.patch +++ /dev/null @@ -1,26 +0,0 @@ -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() diff --git a/dev-python/matplotlib/matplotlib-2.0.0.ebuild b/dev-python/matplotlib/matplotlib-2.0.0.ebuild deleted file mode 100644 index 2645263..0000000 --- a/dev-python/matplotlib/matplotlib-2.0.0.ebuild +++ /dev/null @@ -1,263 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 python3_{4,5} ) -PYTHON_REQ_USE='tk?,threads(+)' - -inherit distutils-r1 eutils flag-o-matic multiprocessing virtualx toolchain-funcs - -DESCRIPTION="Pure python plotting library with matlab like syntax" -HOMEPAGE="http://matplotlib.org/" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -SLOT="0" -# Main license: matplotlib -# Some modules: BSD -# matplotlib/backends/qt4_editor: MIT -# Fonts: BitstreamVera, OFL-1.1 -LICENSE="BitstreamVera BSD matplotlib MIT OFL-1.1" -KEYWORDS="amd64 ~arm ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" -IUSE="cairo doc excel examples fltk gtk2 gtk3 latex pyside qt4 qt5 test tk wxwidgets" - -PY2_FLAGS="|| ( $(python_gen_useflags python2_7) )" -REQUIRED_USE=" - doc? ( ${PY2_FLAGS} ) - excel? ( ${PY2_FLAGS} ) - fltk? ( ${PY2_FLAGS} ) - gtk2? ( ${PY2_FLAGS} ) - wxwidgets? ( ${PY2_FLAGS} ) - test? ( - cairo fltk latex pyside qt5 qt4 tk wxwidgets - || ( gtk2 gtk3 ) - )" - -# #456704 -- a lot of py2-only deps -PY2_USEDEP=$(python_gen_usedep python2_7) -COMMON_DEPEND=" - dev-python/cycler[${PYTHON_USEDEP}] - >=dev-python/numpy-1.6[${PYTHON_USEDEP}] - dev-python/python-dateutil:0[${PYTHON_USEDEP}] - dev-python/pytz[${PYTHON_USEDEP}] - >=dev-python/six-1.4[${PYTHON_USEDEP}] - media-fonts/stix-fonts - media-libs/freetype:2 - media-libs/libpng:0 - media-libs/qhull - cairo? ( dev-python/cairocffi[${PYTHON_USEDEP}] ) - gtk2? ( - dev-libs/glib:2= - x11-libs/gdk-pixbuf - x11-libs/gtk+:2 - dev-python/pygtk[${PY2_USEDEP}] ) - wxwidgets? ( >=dev-python/wxpython-2.8:*[${PY2_USEDEP}] )" - -# internal copy of pycxx highly patched -# dev-python/pycxx - -DEPEND="${COMMON_DEPEND} - dev-python/versioneer[${PYTHON_USEDEP}] - dev-python/setuptools[${PYTHON_USEDEP}] - virtual/pkgconfig - doc? ( - app-text/dvipng - dev-python/pillow[${PYTHON_USEDEP}] - dev-python/ipython[${PYTHON_USEDEP}] - dev-python/mock[${PY2_USEDEP}] - dev-python/numpydoc[${PYTHON_USEDEP}] - dev-python/sphinx[${PYTHON_USEDEP}] - dev-python/xlwt[${PYTHON_USEDEP}] - dev-texlive/texlive-latexextra - dev-texlive/texlive-fontsrecommended - dev-texlive/texlive-latexrecommended - media-gfx/graphviz[cairo] - ) - test? ( - dev-python/mock[${PYTHON_USEDEP}] - >=dev-python/nose-0.11.1[${PYTHON_USEDEP}] - )" - -RDEPEND="${COMMON_DEPEND} - >=dev-python/pyparsing-1.5.6[${PYTHON_USEDEP}] - excel? ( dev-python/xlwt[${PYTHON_USEDEP}] ) - fltk? ( dev-python/pyfltk[${PYTHON_USEDEP}] ) - gtk3? ( - dev-python/pygobject:3[${PYTHON_USEDEP}] - x11-libs/gtk+:3[introspection] ) - latex? ( - virtual/latex-base - app-text/ghostscript-gpl - app-text/dvipng - app-text/poppler[utils] - dev-texlive/texlive-fontsrecommended - dev-texlive/texlive-latexextra - dev-texlive/texlive-xetex - ) - pyside? ( dev-python/pyside[X,${PYTHON_USEDEP}] ) - qt4? ( dev-python/PyQt4[X,${PYTHON_USEDEP}] ) - qt5? ( dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}] ) - " - -# A few C++ source files are written to srcdir. -# Other than that, the ebuild shall be fit for out-of-source build. -DISTUTILS_IN_SOURCE_BUILD=1 - -#PATCHES=( "${FILESDIR}/${PN}-1.5.3-freetype-spurious-failure.patch" ) - -pkg_setup() { - unset DISPLAY # bug #278524 - use doc && DISTUTILS_ALL_SUBPHASE_IMPLS=( python2.7 ) -} - -use_setup() { - local uword="${2:-${1}}" - if use ${1}; then - echo "${uword} = True" - echo "${uword}agg = True" - else - echo "${uword} = False" - echo "${uword}agg = False" - fi -} - -python_prepare_all() { -# Generates test failures, but fedora does it -# local PATCHES=( -# "${FILESDIR}"/${P}-unbundle-pycxx.patch -# "${FILESDIR}"/${P}-unbundle-agg.patch -# ) -# rm -r agg24 CXX || die -# rm -r agg24 || die - -# cat > lib/${PN}/externals/six.py <<-EOF -# from __future__ import absolute_import -# from six import * -# EOF - - sed \ - -e 's/matplotlib.pyparsing_py[23]/pyparsing/g' \ - -i lib/matplotlib/{mathtext,fontconfig_pattern}.py \ - || die "sed pyparsing failed" - - # suggested by upstream -# sed \ -# -e '/tol/s:32:35:g' \ -# -i lib/matplotlib/tests/test_mathtext.py || die - - sed \ - -e "s:/usr/:${EPREFIX}/usr/:g" \ - -i setupext.py || die - - export XDG_RUNTIME_DIR="${T}/runtime-dir" - mkdir "${XDG_RUNTIME_DIR}" || die - chmod 0700 "${XDG_RUNTIME_DIR}" || die - - distutils-r1_python_prepare_all -} - -python_configure_all() { - append-flags -fno-strict-aliasing - append-cppflags -DNDEBUG # or get old trying to do triangulation - tc-export PKG_CONFIG -} - -python_configure() { - mkdir -p "${BUILD_DIR}" || die - - # create setup.cfg (see setup.cfg.template for any changes). - - # common switches. - cat > "${BUILD_DIR}"/setup.cfg <<- EOF || die - [directories] - basedirlist = "${EPREFIX}/usr" - [provide_packages] - pytz = False - dateutil = False - [gui_support] - agg = True - $(use_setup cairo) - $(use_setup pyside) - $(use_setup qt4) - $(use_setup qt5) - $(use_setup tk) - EOF - - if use gtk3 && use cairo; then - echo "gtk3cairo = True" >> "${BUILD_DIR}"/setup.cfg || die - else - echo "gtk3cairo = False" >> "${BUILD_DIR}"/setup.cfg || die - fi - - if $(python_is_python3); then - cat >> "${BUILD_DIR}"/setup.cfg <<- EOF || die - six = True - fltk = False - fltkagg = False - gtk = False - gtkagg = False - wx = False - wxagg = False - EOF - else - cat >> "${BUILD_DIR}"/setup.cfg <<-EOF || die - six = False - $(use_setup fltk) - $(use_setup gtk2 gtk) - $(use_setup gtk3) - $(use_setup wxwidgets wx) - EOF - fi -} - -wrap_setup() { - local MPLSETUPCFG=${BUILD_DIR}/setup.cfg - export MPLSETUPCFG - unset DISPLAY - - # Note: remove build... if switching to out-of-source build - "${@}" build --build-lib="${BUILD_DIR}"/build/lib -} - -python_compile() { - wrap_setup distutils-r1_python_compile -} - -python_compile_all() { - if use doc; then - cd doc || die - - # necessary for in-source build - local -x PYTHONPATH="${BUILD_DIR}"/build/lib:${PYTHONPATH} - - VARTEXFONTS="${T}"/fonts \ - "${EPYTHON}" ./make.py --small html || die - fi -} - -python_test() { - wrap_setup distutils_install_for_testing - -# virtx ${EPYTHON} tests.py \ -# --no-pep8 \ -# --no-network \ -# --verbose \ -# --processes=$(makeopts_jobs) - - virtx "${EPYTHON}" -c "import sys, matplotlib as m; sys.exit(0 if m.test(verbosity=2) else 1)" -} - -python_install() { - wrap_setup distutils-r1_python_install -} - -python_install_all() { - use doc && local HTML_DOCS=( doc/build/html/. ) - - distutils-r1_python_install_all - - if use examples; then - dodoc -r examples - docompress -x /usr/share/doc/${PF}/examples - fi -} |