commit:     aacf1c95aced54e84cf6243b494a429efad319d6
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed May  3 06:42:33 2017 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed May  3 07:37:35 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aacf1c95

dev-python/matplotlib: Clean old versions up

 dev-python/matplotlib/Manifest                     |   2 -
 .../files/matplotlib-1.3.1-unbundle-agg.patch      |  26 --
 .../files/matplotlib-1.3.1-unbundle-pycxx.patch    |  22 --
 .../matplotlib-1.5.1-sphinx-1.4.3-backport.patch   |  58 -----
 .../matplotlib-1.5.1-test-fix-backport-2.patch     |  22 --
 .../files/matplotlib-1.5.1-test-fix-backport.patch | 115 ---------
 dev-python/matplotlib/matplotlib-1.5.0.ebuild      | 266 --------------------
 dev-python/matplotlib/matplotlib-1.5.1.ebuild      | 273 ---------------------
 8 files changed, 784 deletions(-)

diff --git a/dev-python/matplotlib/Manifest b/dev-python/matplotlib/Manifest
index ac1be133fae..fde7fcea976 100644
--- a/dev-python/matplotlib/Manifest
+++ b/dev-python/matplotlib/Manifest
@@ -1,4 +1,2 @@
 DIST matplotlib-1.4.3.tar.gz 49933525 SHA256 
5b9544472d9d6ab3d47423bdb5a0e64fdf913e505c1c083f25283dd0362bc0b6 SHA512 
51b0f58b2618b47b653e17e4f6b6a1215d3a3b0f1331ce3555cc7435e365d9c75693f289ce12fe3bf8f69fd57b663e545f0f1c2c94e81eaa661cac0689e125f5
 WHIRLPOOL 
160ca48ecb44db58f1c56bd6e89592c5d1badd8e434fc25d32aa6d4d7a346ae7c7444d1c8e0c2ca2bf5c3246fd56cd93856ec7b1e3e51f5e471b9b55a0f2c1ad
-DIST matplotlib-1.5.0.tar.gz 53962448 SHA256 
67b08b1650a00a6317d94b76a30a47320087e5244920604c5462188cba0c2646 SHA512 
559a3ef031ca65b431157f0dd50f7d81f2d854f92150ee2b9de5e44b31d49615bfdc049a682667bc2e1399b8cd724dfcefec8f4de7e92848fe5756f93ddef5fa
 WHIRLPOOL 
b30a7299dd0690cd0355883cbe7d335d76314bab85f5b67b326b0e600b479db3cd5e7f48e9e68d3604832e9605f5025c70ff0006b1980b945aeaf22f78e3469f
-DIST matplotlib-1.5.1.tar.gz 54031672 SHA256 
3ab8d968eac602145642d0db63dd8d67c85e9a5444ce0e2ecb2a8fedc7224d40 SHA512 
a0e78b5027a3a49cf8e77dc0d26f5f380dcd80f7b309b6121199acd5e1d94f48482864a9eee3bd397f7ac6f07fe1d3c21bf517217df3c72e8e3d105b7c2ae58e
 WHIRLPOOL 
5d56b1e17542d01ea58cbe6a085fae930dd71dac793260fd418633d1364ab7822d5a0ef16041260637f2472b1d9276c002f84603ab655573b7d8058d959475cd
 DIST matplotlib-1.5.3.tar.gz 51606089 SHA256 
a0a5dc39f785014f2088fed2c6d2d129f0444f71afbb9c44f7bdf1b14d86ebbc SHA512 
553be9f661a1923d8ec7504a11dd3317e5ffb429c19339c58047715f4c28358d6d2ac38d46bd27ecd1dcf7159f157aab80d90713fbc4071e2e395bbf11ee6385
 WHIRLPOOL 
7e2b0472bb7d913e78260da95c93c3243562e76352790318286e5d194f88ac05a9f51fa029a7b0ad17bbbbd0dc9658769fe6301b544ec03f1ab5c205835ea894

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 d5a4ae39bad..00000000000
--- 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 c27922eb11d..00000000000
--- 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.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 19c111d8796..00000000000
--- 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 <[email protected]>
-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 c850d090f79..00000000000
--- 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 <[email protected]>
-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 d031e5aeee6..00000000000
--- 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 <[email protected]>
-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/matplotlib-1.5.0.ebuild 
b/dev-python/matplotlib/matplotlib-1.5.0.ebuild
deleted file mode 100644
index 53b90641e0d..00000000000
--- a/dev-python/matplotlib/matplotlib-1.5.0.ebuild
+++ /dev/null
@@ -1,266 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-PYTHON_REQ_USE='tk?,threads(+)'
-
-inherit distutils-r1 eutils flag-o-matic virtualx toolchain-funcs
-
-DESCRIPTION="Pure python plotting library with matlab like syntax"
-HOMEPAGE="http://matplotlib.org/";
-SRC_URI="mirror://sourceforge/${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/pycairo[${PYTHON_USEDEP}]
-                       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}]
-       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/sphinx-1.3.4
-               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
-
-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
-               [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
-                       six = True
-                       fltk = False
-                       fltkagg = False
-                       gtk = False
-                       gtkagg = False
-                       wx = False
-                       wxagg = False
-               EOF
-       else
-               cat >> "${BUILD_DIR}"/setup.cfg <<-EOF
-                       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 \
-               "${PYTHON}" ./make.py --small html || die
-       fi
-}
-
-python_test() {
-       wrap_setup distutils_install_for_testing
-
-       #cd "${TMPDIR}" || die
-       VIRTUALX_COMMAND="${PYTHON}"
-       virtualmake -c "import sys, matplotlib as m; sys.exit(0 if 
m.test(verbosity=2) else 1)" || \
-               die "Tests fail with ${EPYTHON}"
-#      VIRTUALX_COMMAND=esetup.py
-#      virtualmake test
-}
-
-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
-}

diff --git a/dev-python/matplotlib/matplotlib-1.5.1.ebuild 
b/dev-python/matplotlib/matplotlib-1.5.1.ebuild
deleted file mode 100644
index 4be84aed2a4..00000000000
--- a/dev-python/matplotlib/matplotlib-1.5.1.ebuild
+++ /dev/null
@@ -1,273 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-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://sourceforge/${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/pycairo[${PYTHON_USEDEP}]
-                       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}"/${P}-sphinx-1.4.3-backport.patch
-       "${FILESDIR}"/${P}-test-fix-backport.patch
-       "${FILESDIR}"/${P}-test-fix-backport-2.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
-               [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
-                       six = True
-                       fltk = False
-                       fltkagg = False
-                       gtk = False
-                       gtkagg = False
-                       wx = False
-                       wxagg = False
-               EOF
-       else
-               cat >> "${BUILD_DIR}"/setup.cfg <<-EOF
-                       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 \
-               "${PYTHON}" ./make.py --small html || die
-       fi
-}
-
-python_test() {
-       wrap_setup distutils_install_for_testing
-
-#      virtx ${PYTHON} tests.py \
-#              --no-pep8 \
-#              --no-network \
-#              --verbose \
-#              --processes=$(makeopts_jobs)
-
-       virtx "${PYTHON}" -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
-}

Reply via email to