matplotlib, qhull: upgraded packages to upstream
Upgraded dev-python/matplotlib to version 1.4.3 on amd64, arm, x86
Upgraded media-libs/qhull to version 2012.1-r4 on amd64, arm, x86
This is part of the effort to remove X dependency from Molab image.
BUG=chromium:679866
TEST=manually build for all platforms and tested Moblab image.
Change-Id: Ibe71dc1c58888433fac5088f24eb43da631dd754
Reviewed-on: https://chromium-review.googlesource.com/445808
Commit-Ready: Michael Tang <ntang@chromium.org>
Tested-by: Michael Tang <ntang@chromium.org>
Reviewed-by: Simran Basi <sbasi@chromium.org>
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/447912
Reviewed-by: Michael Tang <ntang@chromium.org>
Commit-Queue: Michael Tang <ntang@chromium.org>
Trybot-Ready: Michael Tang <ntang@chromium.org>
diff --git a/dev-python/matplotlib/Manifest b/dev-python/matplotlib/Manifest
index 65a1610..9170b55 100644
--- a/dev-python/matplotlib/Manifest
+++ b/dev-python/matplotlib/Manifest
@@ -1 +1 @@
-DIST matplotlib-1.3.1.tar.gz 42163182 SHA256 ea16679d9476ab2757102e80327f31eb8e6c2cb09e2be89715c02e4e8fbdaf6a SHA512 04877aa15b6d52a6f813e8377098d13c432f66ae2522c544575440180944c9b73a2164ae63edd3a0eff807883bf7b39cd55f28454ccee8c76146567ff4a6fd40 WHIRLPOOL 18ba178eeef46e38d2c904e1be30a37e99321331ed47a7e63f592acb10f2a6c855be5dd600afcfc7cefaf9952acbc0a993e1d39b74287316abcb57b97e353261
+DIST matplotlib-1.4.3.tar.gz 49933525 SHA256 5b9544472d9d6ab3d47423bdb5a0e64fdf913e505c1c083f25283dd0362bc0b6 SHA512 51b0f58b2618b47b653e17e4f6b6a1215d3a3b0f1331ce3555cc7435e365d9c75693f289ce12fe3bf8f69fd57b663e545f0f1c2c94e81eaa661cac0689e125f5 WHIRLPOOL 160ca48ecb44db58f1c56bd6e89592c5d1badd8e434fc25d32aa6d4d7a346ae7c7444d1c8e0c2ca2bf5c3246fd56cd93856ec7b1e3e51f5e471b9b55a0f2c1ad
diff --git a/dev-python/matplotlib/files/matplotlib-1.1.1-ft-refcount.patch b/dev-python/matplotlib/files/matplotlib-1.1.1-ft-refcount.patch
deleted file mode 100644
index df135c2..0000000
--- a/dev-python/matplotlib/files/matplotlib-1.1.1-ft-refcount.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-#Restoring a fix to an old reference counting bug which was re-included in a recent commit. It fails stix_fonts_demo.py
-# https://github.com/matplotlib/matplotlib/commit/85af0c02bf9a8ecdd0fd18eab8c9662c6b9f4302#src/ft2font.cpp (Keep just in case)
-
-Reinstate the manual reference counting as discovered in #1054
-commit ca678a49f37411b1b0e72d7d0dfa88c124b0e34b
-wrt Bug #442298 by Carl Michal, "the patch in the tree is missing the fifth insertion', i.e. the 2nd. hunk
-appending the 2nd hunk to bicatelli's prepared patch
-
-bicatali@gentoo.org 08/2012
---- src/ft2font.cpp.orig 2012-08-01 17:30:33.000000000 +0100
-+++ src/ft2font.cpp 2012-08-01 17:30:42.000000000 +0100
-@@ -870,24 +870,28 @@
- {
- std::ostringstream s;
- s << "Could not load facefile " << facefile << "; Unknown_File_Format" << std::endl;
-+ ob_refcnt--;
- throw Py::RuntimeError(s.str());
- }
- else if (error == FT_Err_Cannot_Open_Resource)
- {
- std::ostringstream s;
- s << "Could not open facefile " << facefile << "; Cannot_Open_Resource" << std::endl;
-+ ob_refcnt--;
- throw Py::RuntimeError(s.str());
- }
- else if (error == FT_Err_Invalid_File_Format)
- {
- std::ostringstream s;
- s << "Could not open facefile " << facefile << "; Invalid_File_Format" << std::endl;
-+ ob_refcnt--;
- throw Py::RuntimeError(s.str());
- }
- else if (error)
- {
- std::ostringstream s;
- s << "Could not open facefile " << facefile << "; freetype error code " << error << std::endl;
-+ ob_refcnt--;
- throw Py::RuntimeError(s.str());
- }
-
-@@ -904,6 +908,7 @@ inline double conv(int v)
- {
- std::ostringstream s;
- s << "Could not set the fontsize for facefile " << facefile << std::endl;
-+ ob_refcnt--;
- throw Py::RuntimeError(s.str());
- }
-
diff --git a/dev-python/matplotlib/files/matplotlib-1.2.0-ft-refcount.patch b/dev-python/matplotlib/files/matplotlib-1.2.0-ft-refcount.patch
deleted file mode 100644
index 822f349..0000000
--- a/dev-python/matplotlib/files/matplotlib-1.2.0-ft-refcount.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-Issue 532; https://github.com/mdboom/matplotlib/commit/81068e9967387ea69133277242a9804d646ea4ef
-diff -ur matplotlib-1.2.0.orig/src/ft2font.cpp matplotlib-1.2.0/src/ft2font.cpp
---- src/ft2font.cpp 2012-10-31 08:11:14.000000000 +0800
-+++ src/ft2font.cpp 2012-11-29 11:09:43.569808461 +0800
-@@ -852,28 +852,24 @@
- {
- std::ostringstream s;
- s << "Could not load facefile " << facefile << "; Unknown_File_Format" << std::endl;
-- ob_refcnt--;
- throw Py::RuntimeError(s.str());
- }
- else if (error == FT_Err_Cannot_Open_Resource)
- {
- std::ostringstream s;
- s << "Could not open facefile " << facefile << "; Cannot_Open_Resource" << std::endl;
-- ob_refcnt--;
- throw Py::RuntimeError(s.str());
- }
- else if (error == FT_Err_Invalid_File_Format)
- {
- std::ostringstream s;
- s << "Could not open facefile " << facefile << "; Invalid_File_Format" << std::endl;
-- ob_refcnt--;
- throw Py::RuntimeError(s.str());
- }
- else if (error)
- {
- std::ostringstream s;
- s << "Could not open facefile " << facefile << "; freetype error code " << error << std::endl;
-- ob_refcnt--;
- throw Py::RuntimeError(s.str());
- }
-
-@@ -891,7 +887,6 @@
- {
- std::ostringstream s;
- s << "Could not set the fontsize for facefile " << facefile << std::endl;
-- ob_refcnt--;
- throw Py::RuntimeError(s.str());
- }
-
diff --git a/dev-python/matplotlib/files/matplotlib-1.2.0-setup.patch b/dev-python/matplotlib/files/matplotlib-1.2.0-setup.patch
deleted file mode 100644
index ba03518..0000000
--- a/dev-python/matplotlib/files/matplotlib-1.2.0-setup.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -ur matplotlib-1.2.0.orig/setup.py matplotlib-1.2.0/setup.py
---- setup.py 2012-11-08 10:24:12.000000000 +0800
-+++ setup.py 2012-11-25 06:55:27.531042898 +0800
-@@ -171,20 +171,19 @@
- # regardless of the lack of dependencies. If auto, silently skip
- # when dependencies are missing.
- if options['build_tkagg']:
-- if check_for_tk() or (options['build_tkagg'] is True):
-- options['build_agg'] = 1
-- build_tkagg(ext_modules, packages)
-- rc['backend'] = 'TkAgg'
-+ options['build_agg'] = 1
-+ build_tkagg(ext_modules, packages)
-+ rc['backend'] = 'TkAgg'
-
--hasgtk = check_for_gtk()
--if options['build_gtk']:
-- if hasgtk or (options['build_gtk'] is True):
-- build_gdk(ext_modules, packages)
--if options['build_gtkagg']:
-- if hasgtk or (options['build_gtkagg'] is True):
-- options['build_agg'] = 1
-- build_gtkagg(ext_modules, packages)
-- rc['backend'] = 'GTKAgg'
-+if sys.version_info[0] >= 3:
-+ hasgtk = False
-+else:
-+ hasgtk = True
-+if hasgtk and (options['build_gtk'] is True):
-+ build_gdk(ext_modules, packages)
-+ options['build_agg'] = 1
-+ build_gtkagg(ext_modules, packages)
-+ rc['backend'] = 'GTKAgg'
-
- if options['build_macosx']:
- if check_for_macosx() or (options['build_macosx'] is True):
diff --git a/dev-python/matplotlib/files/matplotlib-1.3.0-setup_without_X11.patch b/dev-python/matplotlib/files/matplotlib-1.3.0-setup_without_X11.patch
deleted file mode 100644
index 2835ae5..0000000
--- a/dev-python/matplotlib/files/matplotlib-1.3.0-setup_without_X11.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-https://bugs.gentoo.org/show_bug.cgi?id=481564
-https://github.com/matplotlib/matplotlib/commit/1b3106c1bcd6017455232e8c974f1af8383a010c
-
---- a/setupext.py
-+++ b/setupext.py
-@@ -1463,7 +1463,7 @@ def backend_gtk3agg_internal_check(x):
-
- try:
- from gi.repository import Gtk, Gdk, GObject
-- except ImportError:
-+ except (ImportError, RuntimeError):
- return (False, "Requires pygobject to be installed.")
-
- return (True, "version %s.%s.%s" % (
-@@ -1489,9 +1489,14 @@ def check(self):
- p = multiprocessing.Pool()
- except:
- return "unknown (can not use multiprocessing to determine)"
-- success, msg = p.map(backend_gtk3agg_internal_check, [0])[0]
-- p.close()
-- p.join()
-+ try:
-+ success, msg = p.map(backend_gtk3agg_internal_check, [0])[0]
-+ except:
-+ success = False
-+ msg = "Could not determine"
-+ finally:
-+ p.close()
-+ p.join()
- if success:
- BackendAgg.force = True
-
-@@ -1521,7 +1526,7 @@ def backend_gtk3cairo_internal_check(x):
-
- try:
- from gi.repository import Gtk, Gdk, GObject
-- except ImportError:
-+ except (RuntimeError, ImportError):
- return (False, "Requires pygobject to be installed.")
-
- return (True, "version %s.%s.%s" % (
-
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()
diff --git a/dev-python/matplotlib/matplotlib-1.3.1.ebuild b/dev-python/matplotlib/matplotlib-1.4.3.ebuild
similarity index 68%
rename from dev-python/matplotlib/matplotlib-1.3.1.ebuild
rename to dev-python/matplotlib/matplotlib-1.4.3.ebuild
index 1bfc9cc..31616ed 100644
--- a/dev-python/matplotlib/matplotlib-1.3.1.ebuild
+++ b/dev-python/matplotlib/matplotlib-1.4.3.ebuild
@@ -1,16 +1,14 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/matplotlib/matplotlib-1.3.1.ebuild,v 1.2 2013/12/26 18:55:53 jlec Exp $
+# $Id$
EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3} )
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
-PYTHON_REQ_USE='tk?'
+PYTHON_REQ_USE='tk?,threads(+)'
-VIRTUALX_REQUIRED="always"
-
-inherit distutils-r1 eutils flag-o-matic virtualx
+inherit distutils-r1 eutils flag-o-matic virtualx toolchain-funcs
DESCRIPTION="Pure python plotting library with matlab like syntax"
HOMEPAGE="http://matplotlib.org/"
@@ -23,21 +21,37 @@
# Fonts: BitstreamVera, OFL-1.1
LICENSE="BitstreamVera BSD matplotlib MIT OFL-1.1"
KEYWORDS="*"
-IUSE="cairo doc excel examples fltk gtk gtk3 latex pyside qt4 test tk wxwidgets"
+IUSE="cairo doc excel examples fltk gtk 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} )
+ gtk? ( ${PY2_FLAGS} )
+ wxwidgets? ( ${PY2_FLAGS} )
+ test? (
+ cairo fltk latex pyside qt5 qt4 tk wxwidgets
+ || ( gtk gtk3 )
+ )"
# #456704 -- a lot of py2-only deps
-PY2_USEDEP=$(python_gen_usedep 'python2*')
-PY3_USEDEP=$(python_gen_usedep python3_3)
+PY2_USEDEP=$(python_gen_usedep python2_7)
COMMON_DEPEND="
- dev-python/numpy[${PYTHON_USEDEP}]
+ >=dev-python/numpy-1.6[${PYTHON_USEDEP}]
dev-python/python-dateutil:0[${PYTHON_USEDEP}]
dev-python/pytz[${PYTHON_USEDEP}]
- dev-python/six[${PYTHON_USEDEP}]
+ >=dev-python/six-1.4[${PYTHON_USEDEP}]
media-fonts/stix-fonts
media-libs/freetype:2
media-libs/libpng:0
- gtk? ( dev-python/pygtk[${PY2_USEDEP}] )
- wxwidgets? ( >=dev-python/wxpython-2.8[${PY2_USEDEP}] )"
+ media-libs/qhull
+ gtk? (
+ 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
@@ -46,23 +60,32 @@
virtual/pkgconfig
doc? (
app-text/dvipng
- virtual/python-imaging[${PYTHON_USEDEP}]
+ dev-python/pillow[${PYTHON_USEDEP}]
dev-python/ipython[${PYTHON_USEDEP}]
- dev-python/numpydoc[${PY2_USEDEP}]
- dev-python/xlwt[${PY2_USEDEP}]
+ dev-python/numpydoc[${PYTHON_USEDEP}]
+ dev-python/xlwt[${PYTHON_USEDEP}]
dev-python/sphinx[${PYTHON_USEDEP}]
+ !~dev-python/sphinx-1.3.4
dev-texlive/texlive-latexextra
dev-texlive/texlive-fontsrecommended
dev-texlive/texlive-latexrecommended
media-gfx/graphviz[cairo]
)
- test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+ test? (
+ dev-python/mock[${PYTHON_USEDEP}]
+ >=dev-python/nose-0.11.1[${PYTHON_USEDEP}]
+ )"
RDEPEND="${COMMON_DEPEND}
- dev-python/pyparsing[${PYTHON_USEDEP}]
- cairo? ( dev-python/pycairo[${PYTHON_USEDEP}] )
- excel? ( dev-python/xlwt[${PY2_USEDEP}] )
- fltk? ( dev-python/pyfltk[${PY2_USEDEP}] )
+ >=dev-python/pyparsing-1.5.6[${PYTHON_USEDEP}]
+ cairo? (
+ || (
+ dev-python/pycairo[${PYTHON_USEDEP}]
+ dev-python/cairocffi[${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] )
@@ -76,26 +99,18 @@
dev-texlive/texlive-xetex
)
pyside? ( dev-python/pyside[X,${PYTHON_USEDEP}] )
- qt4? ( dev-python/PyQt4[X,${PYTHON_USEDEP}] )"
-
-PY2_FLAGS="|| ( $(python_gen_useflags python2*) )"
-REQUIRED_USE="
- doc? ( ${PY2_FLAGS} )
- excel? ( ${PY2_FLAGS} )
- fltk? ( ${PY2_FLAGS} )
- gtk? ( ${PY2_FLAGS} )
- wxwidgets? ( ${PY2_FLAGS} )
- test? (
- cairo fltk latex pyside qt4 tk wxwidgets
- || ( gtk gtk3 )
- )"
-
-RESTRICT="mirror"
+ 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
+pkg_setup() {
+ unset DISPLAY # bug #278524
+}
+
use_setup() {
local uword="${2:-${1}}"
if use ${1}; then
@@ -107,6 +122,10 @@
fi
}
+PATCHES=(
+ "${FILESDIR}"/${P}-backport-GH5291-2462.patch
+)
+
python_prepare_all() {
# Generates test failures, but fedora does it
# local PATCHES=(
@@ -116,6 +135,8 @@
# rm -r agg24 CXX || die
# rm -r agg24 || die
+ epatch "${FILESDIR}"/${PN}-1.4.3-cross-compile-{1,2,3}.patch
+
sed \
-e 's/matplotlib.pyparsing_py[23]/pyparsing/g' \
-i lib/matplotlib/{mathtext,fontconfig_pattern}.py \
@@ -126,17 +147,21 @@
-e '/tol/s:32:35:g' \
-i lib/matplotlib/tests/test_mathtext.py || die
- if use gtk || use gtk3; then
- export XDG_RUNTIME_DIR="${T}/runtime-dir"
- mkdir "${XDG_RUNTIME_DIR}" || die
- chmod 0700 "${XDG_RUNTIME_DIR}" || die
- fi
+ 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() {
@@ -145,9 +170,9 @@
# create setup.cfg (see setup.cfg.template for any changes).
# common switches.
- cat > "${BUILD_DIR}"/setup.cfg <<-EOF
+ cat > "${BUILD_DIR}"/setup.cfg <<- EOF
[directories]
- basedirlist = ${EPREFIX}/usr
+ basedirlist = "${EPREFIX}/usr"
[provide_packages]
pytz = False
dateutil = False
@@ -156,6 +181,7 @@
$(use_setup cairo)
$(use_setup pyside)
$(use_setup qt4)
+ $(use_setup qt5)
$(use_setup tk)
EOF
@@ -166,7 +192,7 @@
fi
if $(python_is_python3); then
- cat >> "${BUILD_DIR}"/setup.cfg <<-EOF
+ cat >> "${BUILD_DIR}"/setup.cfg <<- EOF
six = True
fltk = False
fltkagg = False
@@ -189,14 +215,14 @@
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() {
- VIRTUALX_COMMAND="wrap_setup distutils-r1_python_compile"
- virtualmake
+ wrap_setup distutils-r1_python_compile
}
python_compile_all() {
@@ -206,7 +232,6 @@
# necessary for in-source build
local -x PYTHONPATH="${BUILD_DIR}"/build/lib:${PYTHONPATH}
- unset DISPLAY # bug #278524
VARTEXFONTS="${T}"/fonts \
"${PYTHON}" ./make.py --small html || die
fi
diff --git a/dev-python/matplotlib/metadata.xml b/dev-python/matplotlib/metadata.xml
index 99ad125..0a91d6a 100644
--- a/dev-python/matplotlib/metadata.xml
+++ b/dev-python/matplotlib/metadata.xml
@@ -1,19 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>python</herd>
+ <maintainer type="project">
+ <email>python@gentoo.org</email>
+ <name>Python</name>
+ </maintainer>
<longdescription lang="en">
matplotlib is an interactive library for plotting and doing basic
data analysis in python with a syntax similar to matlab. It provides a
variety of backends and hard copy formats for almost ready
publication plots.
-</longdescription>
+ </longdescription>
<use>
<flag name="excel">Pull <pkg>dev-python/xlwt</pkg> for the exceltools toolkit</flag>
- <flag name="gtk3">Use <pkg>x11-libs/gtk+:3</pkg> instead of <pkg>x11-libs/gtk+:2</pkg></flag>
+ <flag name="gtk2">Enable <pkg>x11-libs/gtk+</pkg>:2 support</flag>
+ <flag name="gtk3">Enable <pkg>x11-libs/gtk+</pkg>:3 support</flag>
<flag name="pyside">Qt support via <pkg>dev-python/pyside</pkg></flag>
</use>
<upstream>
<remote-id type="pypi">matplotlib</remote-id>
+ <remote-id type="sourceforge">matplotlib</remote-id>
</upstream>
</pkgmetadata>
diff --git a/media-libs/qhull/Manifest b/media-libs/qhull/Manifest
new file mode 100644
index 0000000..3fb67af
--- /dev/null
+++ b/media-libs/qhull/Manifest
@@ -0,0 +1 @@
+DIST qhull-2012.1-src.tgz 716665 SHA256 a35ecaa610550b7f05c3ce373d89c30cf74b059a69880f03080c556daebcff88 SHA512 e35ea2cb73ef32b23b64a6594a8b5ea22ed8e2ea7535cfd72dca44331602368dfcb681600a0d2b090e80e67e6be7b32272244b9083d4805f2fbcf5897eb73240 WHIRLPOOL 37704b3f94b6d20c02886598cc2e862f47feb910e0d3259d686b1356242206b77640871509818c56530161720954214d41c295dfe740faa4ed575379b05259f6
diff --git a/media-libs/qhull/files/qhull-2012.1-64bit.patch b/media-libs/qhull/files/qhull-2012.1-64bit.patch
new file mode 100644
index 0000000..4c909c2
--- /dev/null
+++ b/media-libs/qhull/files/qhull-2012.1-64bit.patch
@@ -0,0 +1,32 @@
+ src/libqhull/io.c | 4 ++--
+ src/libqhull/stat.c | 2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/libqhull/io.c b/src/libqhull/io.c
+index 09a0079..7ad4b35 100644
+--- a/src/libqhull/io.c
++++ b/src/libqhull/io.c
+@@ -68,8 +68,8 @@ void qh_produce_output2(void) {
+ qh_memstatistics(qh ferr);
+ d_1= sizeof(setT) + (qh hull_dim - 1) * SETelemsize;
+ qh_fprintf(qh ferr, 8040, "\
+- size in bytes: merge %d ridge %d vertex %d facet %d\n\
+- normal %d ridge vertices %d facet vertices or neighbors %d\n",
++ size in bytes: merge %zd ridge %zd vertex %zd facet %zd\n\
++ normal %d ridge vertices %d facet vertices or neighbors %zd\n",
+ (int)sizeof(mergeT), (int)sizeof(ridgeT),
+ (int)sizeof(vertexT), (int)sizeof(facetT),
+ qh normal_size, d_1, d_1 + SETelemsize);
+diff --git a/src/libqhull/stat.c b/src/libqhull/stat.c
+index 7dc60b9..5721130 100644
+--- a/src/libqhull/stat.c
++++ b/src/libqhull/stat.c
+@@ -472,7 +472,7 @@ void qh_initstatistics(void) {
+ qh_allstatI();
+ if (qhstat next > (int)sizeof(qhstat id)) {
+ qh_fprintf(qhmem.ferr, 6184, "qhull error (qh_initstatistics): increase size of qhstat.id[].\n\
+- qhstat.next %d should be <= sizeof(qhstat id) %d\n", qhstat next, (int)sizeof(qhstat id));
++ qhstat.next %d should be <= sizeof(qhstat id) %zd\n", qhstat next, (int)sizeof(qhstat id));
+ #if 0 /* for locating error, Znumridges should be duplicated */
+ for(i=0; i < ZEND; i++) {
+ int j;
diff --git a/media-libs/qhull/files/qhull-2012.1-format-security.patch b/media-libs/qhull/files/qhull-2012.1-format-security.patch
new file mode 100644
index 0000000..14bce2b
--- /dev/null
+++ b/media-libs/qhull/files/qhull-2012.1-format-security.patch
@@ -0,0 +1,16 @@
+ src/libqhull/io.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/libqhull/io.c b/src/libqhull/io.c
+index 09a0079..2bd066e 100644
+--- a/src/libqhull/io.c
++++ b/src/libqhull/io.c
+@@ -2238,7 +2238,7 @@ void qh_printfacet3math(FILE *fp, facetT *facet, qh_PRINT format, int notfirst)
+ qh_memfree(point, qh normal_size);
+ qh_settempfree(&points);
+ qh_settempfree(&vertices);
+- qh_fprintf(fp, 9110, endfmt);
++ fprintf(fp, "%s", endfmt);
+ } /* printfacet3math */
+
+
diff --git a/media-libs/qhull/metadata.xml b/media-libs/qhull/metadata.xml
new file mode 100644
index 0000000..c6a6929
--- /dev/null
+++ b/media-libs/qhull/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>sci-mathematics@gentoo.org</email>
+ <name>Gentoo Mathematics Project</name>
+ </maintainer>
+ <longdescription lang="en">
+ Qhull computes the convex hull, Delaunay triangulation, Voronoi
+ diagram, halfspace intersection about a point, furthest-site
+ Delaunay triangulation, and furthest-site Voronoi diagram. The
+ source code runs in 2-d, 3-d, 4-d, and higher dimensions. Qhull
+ implements the Quickhull algorithm for computing the convex hull. It
+ handles roundoff errors from floating point arithmetic. It computes
+ volumes, surface areas, and approximations to the convex hull.
+ Qhull does not support constrained Delaunay triangulations,
+ triangulation of non-convex surfaces, mesh generation of non-convex
+ objects, or medium-sized inputs in 9-D and higher.
+</longdescription>
+</pkgmetadata>
diff --git a/media-libs/qhull/qhull-2012.1-r4.ebuild b/media-libs/qhull/qhull-2012.1-r4.ebuild
new file mode 100644
index 0000000..247750b
--- /dev/null
+++ b/media-libs/qhull/qhull-2012.1-r4.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit cmake-utils flag-o-matic
+
+MY_P="${PN}${PV}"
+
+DESCRIPTION="Geometry library"
+HOMEPAGE="http://www.qhull.org/"
+SRC_URI="${HOMEPAGE}/download/${P}-src.tgz"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="*"
+IUSE="doc static-libs"
+
+DOCS=( Announce.txt File_id.diz README.txt REGISTER.txt )
+
+PATCHES=(
+ "${FILESDIR}"/${P}-64bit.patch
+ "${FILESDIR}"/${P}-format-security.patch
+ )
+
+src_configure() {
+ append-flags -fno-strict-aliasing
+ mycmakeargs+=(
+ -DLIB_INSTALL_DIR="${EPREFIX}"/usr/$(get_libdir)
+ -DDOC_INSTALL_DIR="${EPREFIX}"/usr/share/doc/${PF}/html
+ )
+ cmake-utils_src_configure
+}
+
+pkg_preinst() {
+ # See https://bugs.gentoo.org/show_bug.cgi?id=435006
+ # If qhull-2010 is installed we need to remove its include dir so
+ # that it can be replaced with a symlink in this version.
+ rm -rf "${EROOT}"usr/include/qhull || die
+}
+
+src_install() {
+ cmake-utils_src_install
+ # compatibility with previous installs
+ dosym libqhull /usr/include/qhull
+ if ! use doc; then
+ rm -rf "${ED}"/usr/share/doc/${PF}/html || die
+ fi
+ if ! use static-libs; then
+ rm -f "${ED}"/usr/$(get_libdir)/lib*.a || die
+ fi
+}
diff --git a/metadata/md5-cache/dev-python/matplotlib-1.3.1 b/metadata/md5-cache/dev-python/matplotlib-1.3.1
deleted file mode 100644
index 573a326..0000000
--- a/metadata/md5-cache/dev-python/matplotlib-1.3.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] dev-python/python-dateutil:0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] media-fonts/stix-fonts media-libs/freetype:2 media-libs/libpng:0 gtk? ( dev-python/pygtk[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) wxwidgets? ( >=dev-python/wxpython-2.8[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) virtual/pkgconfig doc? ( app-text/dvipng virtual/python-imaging[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] dev-python/ipython[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] dev-python/numpydoc[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/xlwt[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] dev-texlive/texlive-latexextra dev-texlive/texlive-fontsrecommended dev-texlive/texlive-latexrecommended media-gfx/graphviz[cairo] ) test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[tk?] ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[tk?] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] !prefix? ( x11-base/xorg-server ) x11-apps/xhost
-DESCRIPTION=Pure python plotting library with matlab like syntax
-EAPI=5
-HOMEPAGE=http://matplotlib.org/
-IUSE=cairo doc excel examples fltk gtk gtk3 latex pyside qt4 test tk wxwidgets python_targets_python2_7 python_targets_python3_3
-KEYWORDS=*
-LICENSE=BitstreamVera BSD matplotlib MIT OFL-1.1
-RDEPEND=dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] dev-python/python-dateutil:0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] media-fonts/stix-fonts media-libs/freetype:2 media-libs/libpng:0 gtk? ( dev-python/pygtk[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) wxwidgets? ( >=dev-python/wxpython-2.8[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/pyparsing[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] cairo? ( dev-python/pycairo[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] ) excel? ( dev-python/xlwt[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) fltk? ( dev-python/pyfltk[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) gtk3? ( dev-python/pygobject:3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] 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_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] ) qt4? ( dev-python/PyQt4[X,python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[tk?] ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[tk?] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)]
-REQUIRED_USE=doc? ( || ( python_targets_python2_7 ) ) excel? ( || ( python_targets_python2_7 ) ) fltk? ( || ( python_targets_python2_7 ) ) gtk? ( || ( python_targets_python2_7 ) ) wxwidgets? ( || ( python_targets_python2_7 ) ) test? ( cairo fltk latex pyside qt4 tk wxwidgets || ( gtk gtk3 ) ) || ( python_targets_python2_7 python_targets_python3_3 )
-RESTRICT=mirror
-SLOT=0
-SRC_URI=mirror://sourceforge/matplotlib/matplotlib-1.3.1.tar.gz
-_eclasses_=distutils-r1 4e8ac1ba76ddacd8f7c0289aa586a34c eutils 06133990e861be0fe60c2b428fd025d9 flag-o-matic 5d5921a298e95441da2f85be419894c0 multibuild 742139c87a9fa3766f0c2b155e5522bf multilib 3972ca401cf7dbb430df9995f5d8d580 multiprocessing e32940a7b2a9992ad217eccddb84d548 python-r1 9f6eda21d15d6a8f665d7996a4e0f4e3 python-utils-r1 2e6826f6a93ad2acf904eecf5b5fb6d2 toolchain-funcs 6198c04daba0e1307bd844df7d37f423 virtualx e9162f65645513120b4e12863a5fa972
-_md5_=a6d462b9e5b5dd68f632085e4faab08c
diff --git a/metadata/md5-cache/dev-python/matplotlib-1.4.3 b/metadata/md5-cache/dev-python/matplotlib-1.4.3
new file mode 100644
index 0000000..1146acc
--- /dev/null
+++ b/metadata/md5-cache/dev-python/matplotlib-1.4.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=>=dev-python/numpy-1.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/python-dateutil:0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/six-1.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] media-fonts/stix-fonts media-libs/freetype:2 media-libs/libpng:0 media-libs/qhull gtk? ( dev-libs/glib:2= x11-libs/gdk-pixbuf x11-libs/gtk+:2 dev-python/pygtk[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) wxwidgets? ( >=dev-python/wxpython-2.8:*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) virtual/pkgconfig doc? ( app-text/dvipng dev-python/pillow[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/ipython[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/numpydoc[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/xlwt[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sphinx-1.3.4 dev-texlive/texlive-latexextra dev-texlive/texlive-fontsrecommended dev-texlive/texlive-latexrecommended media-gfx/graphviz[cairo] ) test? ( dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/nose-0.11.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[tk?,threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[tk?,threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[tk?,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] test? ( !prefix? ( x11-base/xorg-server ) x11-apps/xhost )
+DESCRIPTION=Pure python plotting library with matlab like syntax
+EAPI=5
+HOMEPAGE=http://matplotlib.org/
+IUSE=cairo doc excel examples fltk gtk gtk3 latex pyside qt4 qt5 test tk wxwidgets python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 test
+KEYWORDS=*
+LICENSE=BitstreamVera BSD matplotlib MIT OFL-1.1
+RDEPEND=>=dev-python/numpy-1.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/python-dateutil:0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/six-1.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] media-fonts/stix-fonts media-libs/freetype:2 media-libs/libpng:0 media-libs/qhull gtk? ( dev-libs/glib:2= x11-libs/gdk-pixbuf x11-libs/gtk+:2 dev-python/pygtk[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) wxwidgets? ( >=dev-python/wxpython-2.8:*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/pyparsing-1.5.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] cairo? ( || ( dev-python/pycairo[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/cairocffi[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ) excel? ( dev-python/xlwt[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) fltk? ( dev-python/pyfltk[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) gtk3? ( dev-python/pygobject:3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] 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_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) qt4? ( dev-python/PyQt4[X,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) qt5? ( dev-python/PyQt5[gui,widgets,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[tk?,threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[tk?,threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[tk?,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+REQUIRED_USE=doc? ( || ( python_targets_python2_7 ) ) excel? ( || ( python_targets_python2_7 ) ) fltk? ( || ( python_targets_python2_7 ) ) gtk? ( || ( python_targets_python2_7 ) ) wxwidgets? ( || ( python_targets_python2_7 ) ) test? ( cairo fltk latex pyside qt5 qt4 tk wxwidgets || ( gtk gtk3 ) ) || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
+SLOT=0
+SRC_URI=mirror://sourceforge/matplotlib/matplotlib-1.4.3.tar.gz
+_eclasses_=distutils-r1 4e8ac1ba76ddacd8f7c0289aa586a34c eutils 06133990e861be0fe60c2b428fd025d9 flag-o-matic 5d5921a298e95441da2f85be419894c0 multibuild 742139c87a9fa3766f0c2b155e5522bf multilib 3972ca401cf7dbb430df9995f5d8d580 multiprocessing e32940a7b2a9992ad217eccddb84d548 python-r1 9f6eda21d15d6a8f665d7996a4e0f4e3 python-utils-r1 2e6826f6a93ad2acf904eecf5b5fb6d2 toolchain-funcs 6198c04daba0e1307bd844df7d37f423 virtualx e9162f65645513120b4e12863a5fa972
+_md5_=76be36730a116adec597920ccd7ea1cc
diff --git a/metadata/md5-cache/media-libs/qhull-2012.1-r4 b/metadata/md5-cache/media-libs/qhull-2012.1-r4
new file mode 100644
index 0000000..aef3b6b
--- /dev/null
+++ b/metadata/md5-cache/media-libs/qhull-2012.1-r4
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install preinst prepare test
+DEPEND=sys-devel/make >=dev-util/cmake-2.8.12
+DESCRIPTION=Geometry library
+EAPI=5
+HOMEPAGE=http://www.qhull.org/
+IUSE=doc static-libs
+KEYWORDS=*
+LICENSE=BSD
+SLOT=0
+SRC_URI=http://www.qhull.org//download/qhull-2012.1-src.tgz
+_eclasses_=cmake-utils 9e0d156beee613940cde06d0bc00791b eutils 06133990e861be0fe60c2b428fd025d9 flag-o-matic 5d5921a298e95441da2f85be419894c0 multilib 3972ca401cf7dbb430df9995f5d8d580 toolchain-funcs 6198c04daba0e1307bd844df7d37f423 versionator 865bc8b2fc9fcfb6d520bdf5a110f5ed
+_md5_=b0dd2625ef737e81ea3af0362975249a
