1 |
commit: aacf1c95aced54e84cf6243b494a429efad319d6 |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed May 3 06:42:33 2017 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed May 3 07:37:35 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aacf1c95 |
7 |
|
8 |
dev-python/matplotlib: Clean old versions up |
9 |
|
10 |
dev-python/matplotlib/Manifest | 2 - |
11 |
.../files/matplotlib-1.3.1-unbundle-agg.patch | 26 -- |
12 |
.../files/matplotlib-1.3.1-unbundle-pycxx.patch | 22 -- |
13 |
.../matplotlib-1.5.1-sphinx-1.4.3-backport.patch | 58 ----- |
14 |
.../matplotlib-1.5.1-test-fix-backport-2.patch | 22 -- |
15 |
.../files/matplotlib-1.5.1-test-fix-backport.patch | 115 --------- |
16 |
dev-python/matplotlib/matplotlib-1.5.0.ebuild | 266 -------------------- |
17 |
dev-python/matplotlib/matplotlib-1.5.1.ebuild | 273 --------------------- |
18 |
8 files changed, 784 deletions(-) |
19 |
|
20 |
diff --git a/dev-python/matplotlib/Manifest b/dev-python/matplotlib/Manifest |
21 |
index ac1be133fae..fde7fcea976 100644 |
22 |
--- a/dev-python/matplotlib/Manifest |
23 |
+++ b/dev-python/matplotlib/Manifest |
24 |
@@ -1,4 +1,2 @@ |
25 |
DIST matplotlib-1.4.3.tar.gz 49933525 SHA256 5b9544472d9d6ab3d47423bdb5a0e64fdf913e505c1c083f25283dd0362bc0b6 SHA512 51b0f58b2618b47b653e17e4f6b6a1215d3a3b0f1331ce3555cc7435e365d9c75693f289ce12fe3bf8f69fd57b663e545f0f1c2c94e81eaa661cac0689e125f5 WHIRLPOOL 160ca48ecb44db58f1c56bd6e89592c5d1badd8e434fc25d32aa6d4d7a346ae7c7444d1c8e0c2ca2bf5c3246fd56cd93856ec7b1e3e51f5e471b9b55a0f2c1ad |
26 |
-DIST matplotlib-1.5.0.tar.gz 53962448 SHA256 67b08b1650a00a6317d94b76a30a47320087e5244920604c5462188cba0c2646 SHA512 559a3ef031ca65b431157f0dd50f7d81f2d854f92150ee2b9de5e44b31d49615bfdc049a682667bc2e1399b8cd724dfcefec8f4de7e92848fe5756f93ddef5fa WHIRLPOOL b30a7299dd0690cd0355883cbe7d335d76314bab85f5b67b326b0e600b479db3cd5e7f48e9e68d3604832e9605f5025c70ff0006b1980b945aeaf22f78e3469f |
27 |
-DIST matplotlib-1.5.1.tar.gz 54031672 SHA256 3ab8d968eac602145642d0db63dd8d67c85e9a5444ce0e2ecb2a8fedc7224d40 SHA512 a0e78b5027a3a49cf8e77dc0d26f5f380dcd80f7b309b6121199acd5e1d94f48482864a9eee3bd397f7ac6f07fe1d3c21bf517217df3c72e8e3d105b7c2ae58e WHIRLPOOL 5d56b1e17542d01ea58cbe6a085fae930dd71dac793260fd418633d1364ab7822d5a0ef16041260637f2472b1d9276c002f84603ab655573b7d8058d959475cd |
28 |
DIST matplotlib-1.5.3.tar.gz 51606089 SHA256 a0a5dc39f785014f2088fed2c6d2d129f0444f71afbb9c44f7bdf1b14d86ebbc SHA512 553be9f661a1923d8ec7504a11dd3317e5ffb429c19339c58047715f4c28358d6d2ac38d46bd27ecd1dcf7159f157aab80d90713fbc4071e2e395bbf11ee6385 WHIRLPOOL 7e2b0472bb7d913e78260da95c93c3243562e76352790318286e5d194f88ac05a9f51fa029a7b0ad17bbbbd0dc9658769fe6301b544ec03f1ab5c205835ea894 |
29 |
|
30 |
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 |
31 |
deleted file mode 100644 |
32 |
index d5a4ae39bad..00000000000 |
33 |
--- a/dev-python/matplotlib/files/matplotlib-1.3.1-unbundle-agg.patch |
34 |
+++ /dev/null |
35 |
@@ -1,26 +0,0 @@ |
36 |
---- setupext.py.orig 2013-08-02 09:39:43.914247832 +0200 |
37 |
-+++ setupext.py 2013-08-02 09:40:14.785304342 +0200 |
38 |
-@@ -749,22 +749,7 @@ |
39 |
- return str(e) + ' Using local copy.' |
40 |
- |
41 |
- def add_flags(self, ext): |
42 |
-- if self.found_external: |
43 |
-- pkg_config.setup_extension(ext, 'libagg') |
44 |
-- else: |
45 |
-- ext.include_dirs.append('agg24/include') |
46 |
-- agg_sources = [ |
47 |
-- 'agg_bezier_arc.cpp', |
48 |
-- 'agg_curves.cpp', |
49 |
-- 'agg_image_filters.cpp', |
50 |
-- 'agg_trans_affine.cpp', |
51 |
-- 'agg_vcgen_contour.cpp', |
52 |
-- 'agg_vcgen_dash.cpp', |
53 |
-- 'agg_vcgen_stroke.cpp', |
54 |
-- 'agg_vpgen_segmentator.cpp' |
55 |
-- ] |
56 |
-- ext.sources.extend( |
57 |
-- os.path.join('agg24', 'src', x) for x in agg_sources) |
58 |
-+ pkg_config.setup_extension(ext, 'libagg', default_include_dirs=["/usr/include/agg2"]) |
59 |
- |
60 |
- |
61 |
- class FreeType(SetupPackage): |
62 |
|
63 |
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 |
64 |
deleted file mode 100644 |
65 |
index c27922eb11d..00000000000 |
66 |
--- a/dev-python/matplotlib/files/matplotlib-1.3.1-unbundle-pycxx.patch |
67 |
+++ /dev/null |
68 |
@@ -1,22 +0,0 @@ |
69 |
-diff --git a/setupext.py b/setupext.py |
70 |
-index 7b629b6..8131bb1 100644 |
71 |
---- a/setupext.py |
72 |
-+++ b/setupext.py |
73 |
-@@ -674,16 +674,9 @@ class CXX(SetupPackage): |
74 |
- name = 'pycxx' |
75 |
- |
76 |
- def check(self): |
77 |
-- if sys.version_info[0] >= 3: |
78 |
-- # There is no version of PyCXX in the wild that will work |
79 |
-- # with Python 3.x |
80 |
-- self.__class__.found_external = False |
81 |
-- return ("Official versions of PyCXX are not compatible with " |
82 |
-- "Python 3.x. Using local copy") |
83 |
-- |
84 |
- self.__class__.found_external = True |
85 |
- old_stdout = sys.stdout |
86 |
-- sys.stdout = io.BytesIO() |
87 |
-+ #sys.stdout = io.BytesIO() |
88 |
- try: |
89 |
- import CXX |
90 |
- except ImportError: |
91 |
|
92 |
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 |
93 |
deleted file mode 100644 |
94 |
index 19c111d8796..00000000000 |
95 |
--- a/dev-python/matplotlib/files/matplotlib-1.5.1-sphinx-1.4.3-backport.patch |
96 |
+++ /dev/null |
97 |
@@ -1,58 +0,0 @@ |
98 |
-From b7dfa4fa7a69d091dac0ead295d28422c4e33b45 Mon Sep 17 00:00:00 2001 |
99 |
-From: Thomas A Caswell <tcaswell@×××××.com> |
100 |
-Date: Sun, 24 Jan 2016 13:05:18 -0500 |
101 |
-Subject: [PATCH] Merge pull request #5872 from jenshnielsen/sphinx134 |
102 |
- |
103 |
-DOC: Fix issue with Sphinx 1.3.4 |
104 |
- |
105 |
-Discarded changes to .travis.yml from #5872 |
106 |
---- |
107 |
- lib/matplotlib/dviread.py | 2 +- |
108 |
- lib/matplotlib/patches.py | 18 ++++++++++++------ |
109 |
- 2 files changed, 13 insertions(+), 7 deletions(-) |
110 |
- |
111 |
-diff --git a/lib/matplotlib/dviread.py b/lib/matplotlib/dviread.py |
112 |
-index db6e976..1141f6a 100644 |
113 |
---- a/lib/matplotlib/dviread.py |
114 |
-+++ b/lib/matplotlib/dviread.py |
115 |
-@@ -841,7 +841,7 @@ def find_tex_file(filename, format=None): |
116 |
- """ |
117 |
- Call :program:`kpsewhich` to find a file in the texmf tree. If |
118 |
- *format* is not None, it is used as the value for the |
119 |
-- :option:`--format` option. |
120 |
-+ `--format` option. |
121 |
- |
122 |
- Apparently most existing TeX distributions on Unix-like systems |
123 |
- use kpathsea. I hear MikTeX (a popular distribution on Windows) |
124 |
-diff --git a/lib/matplotlib/patches.py b/lib/matplotlib/patches.py |
125 |
-index b8b7363..917eca7 100644 |
126 |
---- a/lib/matplotlib/patches.py |
127 |
-+++ b/lib/matplotlib/patches.py |
128 |
-@@ -2992,15 +2992,21 @@ class Bar(_Base): |
129 |
- |
130 |
- def __init__(self, armA=0., armB=0., fraction=0.3, angle=None): |
131 |
- """ |
132 |
-- *armA* : minimum length of armA |
133 |
-+ Parameters |
134 |
-+ ---------- |
135 |
-+ armA : float |
136 |
-+ minimum length of armA |
137 |
- |
138 |
-- *armB* : minimum length of armB |
139 |
-+ armB : float |
140 |
-+ minimum length of armB |
141 |
- |
142 |
-- *fraction* : a fraction of the distance between two points that |
143 |
-- will be added to armA and armB. |
144 |
-+ fraction : float |
145 |
-+ a fraction of the distance between two points that |
146 |
-+ will be added to armA and armB. |
147 |
- |
148 |
-- *angle* : angle of the connecting line (if None, parallel to A |
149 |
-- and B) |
150 |
-+ angle : float or None |
151 |
-+ angle of the connecting line (if None, parallel |
152 |
-+ to A and B) |
153 |
- """ |
154 |
- self.armA = armA |
155 |
- self.armB = armB |
156 |
|
157 |
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 |
158 |
deleted file mode 100644 |
159 |
index c850d090f79..00000000000 |
160 |
--- a/dev-python/matplotlib/files/matplotlib-1.5.1-test-fix-backport-2.patch |
161 |
+++ /dev/null |
162 |
@@ -1,22 +0,0 @@ |
163 |
-From c28e1b0aebe19b7db292eb7c1b6deba8af6754e0 Mon Sep 17 00:00:00 2001 |
164 |
-From: Jens Hedegaard Nielsen <jens.nielsen@××××××.uk> |
165 |
-Date: Wed, 13 Jan 2016 13:48:06 +0000 |
166 |
-Subject: [PATCH] Fix new pep8 issue in legend_demo5 |
167 |
- |
168 |
---- |
169 |
- examples/pylab_examples/legend_demo5.py | 2 +- |
170 |
- 1 file changed, 1 insertion(+), 1 deletion(-) |
171 |
- |
172 |
-diff --git a/examples/pylab_examples/legend_demo5.py b/examples/pylab_examples/legend_demo5.py |
173 |
-index 699babe..5668966 100644 |
174 |
---- a/examples/pylab_examples/legend_demo5.py |
175 |
-+++ b/examples/pylab_examples/legend_demo5.py |
176 |
-@@ -41,7 +41,7 @@ def create_artists(self, legend, orig_handle, |
177 |
- lw = orig_handle.get_linewidths()[i] |
178 |
- except IndexError: |
179 |
- lw = orig_handle.get_linewidths()[0] |
180 |
-- if dashes[0] != None: |
181 |
-+ if dashes[0] is not None: |
182 |
- legline.set_dashes(dashes[1]) |
183 |
- legline.set_color(color) |
184 |
- legline.set_transform(trans) |
185 |
|
186 |
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 |
187 |
deleted file mode 100644 |
188 |
index d031e5aeee6..00000000000 |
189 |
--- a/dev-python/matplotlib/files/matplotlib-1.5.1-test-fix-backport.patch |
190 |
+++ /dev/null |
191 |
@@ -1,115 +0,0 @@ |
192 |
-From 72cf5b80537157decc741d81db550e6cf82648f6 Mon Sep 17 00:00:00 2001 |
193 |
-From: Michael Droettboom <mdboom@×××××.com> |
194 |
-Date: Mon, 11 Jan 2016 16:48:04 -0500 |
195 |
-Subject: [PATCH] Fix #5829. Update the baseline image. |
196 |
- |
197 |
---- |
198 |
- .../baseline_images/test_image/rasterize_10dpi.svg | 56 ++++++++++------------ |
199 |
- 1 file changed, 26 insertions(+), 30 deletions(-) |
200 |
- |
201 |
-diff --git a/lib/matplotlib/tests/baseline_images/test_image/rasterize_10dpi.svg b/lib/matplotlib/tests/baseline_images/test_image/rasterize_10dpi.svg |
202 |
-index 47e354d..1f73c8f 100644 |
203 |
---- a/lib/matplotlib/tests/baseline_images/test_image/rasterize_10dpi.svg |
204 |
-+++ b/lib/matplotlib/tests/baseline_images/test_image/rasterize_10dpi.svg |
205 |
-@@ -5,31 +5,29 @@ |
206 |
- <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"> |
207 |
- <defs> |
208 |
- <style type="text/css"> |
209 |
--*{stroke-linecap:butt;stroke-linejoin:round;} |
210 |
-+*{stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:100000;} |
211 |
- </style> |
212 |
- </defs> |
213 |
- <g id="figure_1"> |
214 |
- <g id="patch_1"> |
215 |
-- <path d=" |
216 |
--M0 72 |
217 |
--L216 72 |
218 |
--L216 0 |
219 |
--L0 0 |
220 |
-+ <path d="M 0 72 |
221 |
-+L 216 72 |
222 |
-+L 216 0 |
223 |
-+L 0 0 |
224 |
- z |
225 |
- " style="fill:#ffffff;"/> |
226 |
- </g> |
227 |
- <g id="axes_1"> |
228 |
- <g id="patch_2"> |
229 |
-- <path d=" |
230 |
--M27 60.6176 |
231 |
--L76.2353 60.6176 |
232 |
--L76.2353 11.3824 |
233 |
--L27 11.3824 |
234 |
-+ <path d="M 27 60.617647 |
235 |
-+L 76.235294 60.617647 |
236 |
-+L 76.235294 11.382353 |
237 |
-+L 27 11.382353 |
238 |
- z |
239 |
- " style="fill:#ffffff;"/> |
240 |
- </g> |
241 |
-- <g clip-path="url(#pc31db6f15f)"> |
242 |
-- <image height="50.4" id="image2c20c31ecf" width="57.6" x="27.0" xlink:href="data:image/png;base64, |
243 |
-+ <g clip-path="url(#p306f09a014)"> |
244 |
-+ <image height="50.4" id="image207c5863ce" width="57.6" x="27.0" xlink:href="data:image/png;base64, |
245 |
- iVBORw0KGgoAAAANSUhEUgAAAAgAAAAHCAYAAAA1WQxeAAAABHNCSVQICAgIfAhkiAAAAIVJREFUCJmFzjkKwlAAhOEvKi5FMLU2HkEQwdbSU3knL+EBLMUFQayCUaMYF55FQEsH/mYYZiZiGkA3Ydj70UlAxR/Vhv09eLfPivipuOUe69QrjcvAZLwE99CShYPsnMgWiSI0QTSfdQNcjjWHTeNLnlXLhtGgnDju2KbEV+orTqX9/+QHCXAwPEkx7O0AAAAASUVORK5CYII=" y="10.2176470588"/> |
246 |
- </g> |
247 |
- <g id="matplotlib.axis_1"/> |
248 |
-@@ -37,43 +35,41 @@ iVBORw0KGgoAAAANSUhEUgAAAAgAAAAHCAYAAAA1WQxeAAAABHNCSVQICAgIfAhkiAAAAIVJREFUCJmF |
249 |
- </g> |
250 |
- <g id="axes_2"> |
251 |
- <g id="patch_3"> |
252 |
-- <path d=" |
253 |
--M86.0824 64.8 |
254 |
--L135.318 64.8 |
255 |
--L135.318 7.2 |
256 |
--L86.0824 7.2 |
257 |
-+ <path d="M 86.082353 64.8 |
258 |
-+L 135.317647 64.8 |
259 |
-+L 135.317647 7.2 |
260 |
-+L 86.082353 7.2 |
261 |
- z |
262 |
- " style="fill:#ffffff;"/> |
263 |
- </g> |
264 |
-- <image height="64.8" id="image1d9f73e233" width="136.8" x="79.2" xlink:href="data:image/png;base64, |
265 |
--iVBORw0KGgoAAAANSUhEUgAAABMAAAAJCAYAAADQHRcxAAAABHNCSVQICAgIfAhkiAAAAHNJREFUKJG10kENwlAQBuH5OVQBImoBAzVQA1hABxoQUAUYqIWaqIRepqdHmoaE9AGbzGU3+U4blV/N6d0yoUnoE56HNPUV2IJ3cAYF3d4/VZArOBZgWw22RxZwALtvsAm8gecjyB57gBcwNUgpf3+N2lkBB3gBDVzLDTYAAAAASUVORK5CYII=" y="7.2"/> |
266 |
-+ <image height="43.2" id="image2e9ed63e7b" width="50.4" x="86.39999999999999" xlink:href="data:image/png;base64, |
267 |
-+iVBORw0KGgoAAAANSUhEUgAAAAcAAAAGCAYAAAAPDoR2AAAABHNCSVQICAgIfAhkiAAAAFVJREFUCJllzjEVwlAAxdDbBQUVgQUMYAADWKgONCAABRjAQk0ggSUdGPoPDFnyhjyVETrQhZ6jPNKN3tQXXem1i5F/+aEHncdxpYXmPaU7nWj6PbcBc+lWnSEOzhQAAAAASUVORK5CYII=" y="14.4"/> |
268 |
- <g id="matplotlib.axis_3"/> |
269 |
- <g id="matplotlib.axis_4"/> |
270 |
- </g> |
271 |
- <g id="axes_3"> |
272 |
- <g id="patch_4"> |
273 |
-- <path d=" |
274 |
--M145.165 64.8 |
275 |
--L194.4 64.8 |
276 |
--L194.4 7.2 |
277 |
--L145.165 7.2 |
278 |
-+ <path d="M 145.164706 64.8 |
279 |
-+L 194.4 64.8 |
280 |
-+L 194.4 7.2 |
281 |
-+L 145.164706 7.2 |
282 |
- z |
283 |
- " style="fill:#ffffff;"/> |
284 |
- </g> |
285 |
- <g id="line2d_1"> |
286 |
-- <path clip-path="url(#p19b1e86336)" d=" |
287 |
--M145.165 45.6 |
288 |
--L194.4 26.4" style="fill:none;stroke:#0000ff;stroke-linecap:square;stroke-width:20.0;"/> |
289 |
-+ <path clip-path="url(#pef029be595)" d="M 145.164706 45.6 |
290 |
-+L 194.4 26.4 |
291 |
-+" style="fill:none;stroke:#0000ff;stroke-linecap:square;stroke-width:20.0;"/> |
292 |
- </g> |
293 |
- <g id="matplotlib.axis_5"/> |
294 |
- <g id="matplotlib.axis_6"/> |
295 |
- </g> |
296 |
- </g> |
297 |
- <defs> |
298 |
-- <clipPath id="p19b1e86336"> |
299 |
-+ <clipPath id="pef029be595"> |
300 |
- <rect height="57.6" width="49.2352941176" x="145.164705882" y="7.2"/> |
301 |
- </clipPath> |
302 |
-- <clipPath id="pc31db6f15f"> |
303 |
-+ <clipPath id="p306f09a014"> |
304 |
- <rect height="49.2352941176" width="49.2352941176" x="27.0" y="11.3823529412"/> |
305 |
- </clipPath> |
306 |
- </defs> |
307 |
|
308 |
diff --git a/dev-python/matplotlib/matplotlib-1.5.0.ebuild b/dev-python/matplotlib/matplotlib-1.5.0.ebuild |
309 |
deleted file mode 100644 |
310 |
index 53b90641e0d..00000000000 |
311 |
--- a/dev-python/matplotlib/matplotlib-1.5.0.ebuild |
312 |
+++ /dev/null |
313 |
@@ -1,266 +0,0 @@ |
314 |
-# Copyright 1999-2017 Gentoo Foundation |
315 |
-# Distributed under the terms of the GNU General Public License v2 |
316 |
- |
317 |
-EAPI=5 |
318 |
- |
319 |
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} ) |
320 |
- |
321 |
-PYTHON_REQ_USE='tk?,threads(+)' |
322 |
- |
323 |
-inherit distutils-r1 eutils flag-o-matic virtualx toolchain-funcs |
324 |
- |
325 |
-DESCRIPTION="Pure python plotting library with matlab like syntax" |
326 |
-HOMEPAGE="http://matplotlib.org/" |
327 |
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" |
328 |
- |
329 |
-SLOT="0" |
330 |
-# Main license: matplotlib |
331 |
-# Some modules: BSD |
332 |
-# matplotlib/backends/qt4_editor: MIT |
333 |
-# Fonts: BitstreamVera, OFL-1.1 |
334 |
-LICENSE="BitstreamVera BSD matplotlib MIT OFL-1.1" |
335 |
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" |
336 |
-IUSE="cairo doc excel examples fltk gtk2 gtk3 latex pyside qt4 qt5 test tk wxwidgets" |
337 |
- |
338 |
-PY2_FLAGS="|| ( $(python_gen_useflags python2_7) )" |
339 |
-REQUIRED_USE=" |
340 |
- doc? ( ${PY2_FLAGS} ) |
341 |
- excel? ( ${PY2_FLAGS} ) |
342 |
- fltk? ( ${PY2_FLAGS} ) |
343 |
- gtk2? ( ${PY2_FLAGS} ) |
344 |
- wxwidgets? ( ${PY2_FLAGS} ) |
345 |
- test? ( |
346 |
- cairo fltk latex pyside qt5 qt4 tk wxwidgets |
347 |
- || ( gtk2 gtk3 ) |
348 |
- )" |
349 |
- |
350 |
-# #456704 -- a lot of py2-only deps |
351 |
-PY2_USEDEP=$(python_gen_usedep python2_7) |
352 |
-COMMON_DEPEND=" |
353 |
- dev-python/cycler[${PYTHON_USEDEP}] |
354 |
- >=dev-python/numpy-1.6[${PYTHON_USEDEP}] |
355 |
- dev-python/python-dateutil:0[${PYTHON_USEDEP}] |
356 |
- dev-python/pytz[${PYTHON_USEDEP}] |
357 |
- >=dev-python/six-1.4[${PYTHON_USEDEP}] |
358 |
- media-fonts/stix-fonts |
359 |
- media-libs/freetype:2 |
360 |
- media-libs/libpng:0 |
361 |
- media-libs/qhull |
362 |
- cairo? ( |
363 |
- || ( |
364 |
- dev-python/pycairo[${PYTHON_USEDEP}] |
365 |
- dev-python/cairocffi[${PYTHON_USEDEP}] |
366 |
- ) |
367 |
- ) |
368 |
- gtk2? ( |
369 |
- dev-libs/glib:2= |
370 |
- x11-libs/gdk-pixbuf |
371 |
- x11-libs/gtk+:2 |
372 |
- dev-python/pygtk[${PY2_USEDEP}] ) |
373 |
- wxwidgets? ( >=dev-python/wxpython-2.8:*[${PY2_USEDEP}] )" |
374 |
- |
375 |
-# internal copy of pycxx highly patched |
376 |
-# dev-python/pycxx |
377 |
- |
378 |
-DEPEND="${COMMON_DEPEND} |
379 |
- dev-python/versioneer[${PYTHON_USEDEP}] |
380 |
- virtual/pkgconfig |
381 |
- doc? ( |
382 |
- app-text/dvipng |
383 |
- dev-python/pillow[${PYTHON_USEDEP}] |
384 |
- dev-python/ipython[${PYTHON_USEDEP}] |
385 |
- dev-python/mock[${PY2_USEDEP}] |
386 |
- dev-python/numpydoc[${PYTHON_USEDEP}] |
387 |
- dev-python/sphinx[${PYTHON_USEDEP}] |
388 |
- !~dev-python/sphinx-1.3.4 |
389 |
- dev-python/xlwt[${PYTHON_USEDEP}] |
390 |
- dev-texlive/texlive-latexextra |
391 |
- dev-texlive/texlive-fontsrecommended |
392 |
- dev-texlive/texlive-latexrecommended |
393 |
- media-gfx/graphviz[cairo] |
394 |
- ) |
395 |
- test? ( |
396 |
- dev-python/mock[${PYTHON_USEDEP}] |
397 |
- >=dev-python/nose-0.11.1[${PYTHON_USEDEP}] |
398 |
- )" |
399 |
- |
400 |
-RDEPEND="${COMMON_DEPEND} |
401 |
- >=dev-python/pyparsing-1.5.6[${PYTHON_USEDEP}] |
402 |
- excel? ( dev-python/xlwt[${PYTHON_USEDEP}] ) |
403 |
- fltk? ( dev-python/pyfltk[${PYTHON_USEDEP}] ) |
404 |
- gtk3? ( |
405 |
- dev-python/pygobject:3[${PYTHON_USEDEP}] |
406 |
- x11-libs/gtk+:3[introspection] ) |
407 |
- latex? ( |
408 |
- virtual/latex-base |
409 |
- app-text/ghostscript-gpl |
410 |
- app-text/dvipng |
411 |
- app-text/poppler[utils] |
412 |
- dev-texlive/texlive-fontsrecommended |
413 |
- dev-texlive/texlive-latexextra |
414 |
- dev-texlive/texlive-xetex |
415 |
- ) |
416 |
- pyside? ( dev-python/pyside[X,${PYTHON_USEDEP}] ) |
417 |
- qt4? ( dev-python/PyQt4[X,${PYTHON_USEDEP}] ) |
418 |
- qt5? ( dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}] ) |
419 |
- " |
420 |
- |
421 |
-# A few C++ source files are written to srcdir. |
422 |
-# Other than that, the ebuild shall be fit for out-of-source build. |
423 |
-DISTUTILS_IN_SOURCE_BUILD=1 |
424 |
- |
425 |
-pkg_setup() { |
426 |
- unset DISPLAY # bug #278524 |
427 |
- use doc && DISTUTILS_ALL_SUBPHASE_IMPLS=( python2.7 ) |
428 |
-} |
429 |
- |
430 |
-use_setup() { |
431 |
- local uword="${2:-${1}}" |
432 |
- if use ${1}; then |
433 |
- echo "${uword} = True" |
434 |
- echo "${uword}agg = True" |
435 |
- else |
436 |
- echo "${uword} = False" |
437 |
- echo "${uword}agg = False" |
438 |
- fi |
439 |
-} |
440 |
- |
441 |
-python_prepare_all() { |
442 |
-# Generates test failures, but fedora does it |
443 |
-# local PATCHES=( |
444 |
-# "${FILESDIR}"/${P}-unbundle-pycxx.patch |
445 |
-# "${FILESDIR}"/${P}-unbundle-agg.patch |
446 |
-# ) |
447 |
-# rm -r agg24 CXX || die |
448 |
-# rm -r agg24 || die |
449 |
- |
450 |
-# cat > lib/${PN}/externals/six.py <<-EOF |
451 |
-# from __future__ import absolute_import |
452 |
-# from six import * |
453 |
-# EOF |
454 |
- |
455 |
- sed \ |
456 |
- -e 's/matplotlib.pyparsing_py[23]/pyparsing/g' \ |
457 |
- -i lib/matplotlib/{mathtext,fontconfig_pattern}.py \ |
458 |
- || die "sed pyparsing failed" |
459 |
- |
460 |
- # suggested by upstream |
461 |
-# sed \ |
462 |
-# -e '/tol/s:32:35:g' \ |
463 |
-# -i lib/matplotlib/tests/test_mathtext.py || die |
464 |
- |
465 |
- sed \ |
466 |
- -e "s:/usr/:${EPREFIX}/usr/:g" \ |
467 |
- -i setupext.py || die |
468 |
- |
469 |
- export XDG_RUNTIME_DIR="${T}/runtime-dir" |
470 |
- mkdir "${XDG_RUNTIME_DIR}" || die |
471 |
- chmod 0700 "${XDG_RUNTIME_DIR}" || die |
472 |
- |
473 |
- distutils-r1_python_prepare_all |
474 |
-} |
475 |
- |
476 |
-python_configure_all() { |
477 |
- append-flags -fno-strict-aliasing |
478 |
- append-cppflags -DNDEBUG # or get old trying to do triangulation |
479 |
- tc-export PKG_CONFIG |
480 |
-} |
481 |
- |
482 |
-python_configure() { |
483 |
- mkdir -p "${BUILD_DIR}" || die |
484 |
- |
485 |
- # create setup.cfg (see setup.cfg.template for any changes). |
486 |
- |
487 |
- # common switches. |
488 |
- cat > "${BUILD_DIR}"/setup.cfg <<- EOF |
489 |
- [directories] |
490 |
- basedirlist = "${EPREFIX}/usr" |
491 |
- [provide_packages] |
492 |
- pytz = False |
493 |
- dateutil = False |
494 |
- [gui_support] |
495 |
- agg = True |
496 |
- $(use_setup cairo) |
497 |
- $(use_setup pyside) |
498 |
- $(use_setup qt4) |
499 |
- $(use_setup qt5) |
500 |
- $(use_setup tk) |
501 |
- EOF |
502 |
- |
503 |
- if use gtk3 && use cairo; then |
504 |
- echo "gtk3cairo = True" >> "${BUILD_DIR}"/setup.cfg || die |
505 |
- else |
506 |
- echo "gtk3cairo = False" >> "${BUILD_DIR}"/setup.cfg || die |
507 |
- fi |
508 |
- |
509 |
- if $(python_is_python3); then |
510 |
- cat >> "${BUILD_DIR}"/setup.cfg <<- EOF |
511 |
- six = True |
512 |
- fltk = False |
513 |
- fltkagg = False |
514 |
- gtk = False |
515 |
- gtkagg = False |
516 |
- wx = False |
517 |
- wxagg = False |
518 |
- EOF |
519 |
- else |
520 |
- cat >> "${BUILD_DIR}"/setup.cfg <<-EOF |
521 |
- six = False |
522 |
- $(use_setup fltk) |
523 |
- $(use_setup gtk2 gtk) |
524 |
- $(use_setup gtk3) |
525 |
- $(use_setup wxwidgets wx) |
526 |
- EOF |
527 |
- fi |
528 |
-} |
529 |
- |
530 |
-wrap_setup() { |
531 |
- local MPLSETUPCFG=${BUILD_DIR}/setup.cfg |
532 |
- export MPLSETUPCFG |
533 |
- unset DISPLAY |
534 |
- |
535 |
- # Note: remove build... if switching to out-of-source build |
536 |
- "${@}" build --build-lib="${BUILD_DIR}"/build/lib |
537 |
-} |
538 |
- |
539 |
-python_compile() { |
540 |
- wrap_setup distutils-r1_python_compile |
541 |
-} |
542 |
- |
543 |
-python_compile_all() { |
544 |
- if use doc; then |
545 |
- cd doc || die |
546 |
- |
547 |
- # necessary for in-source build |
548 |
- local -x PYTHONPATH="${BUILD_DIR}"/build/lib:${PYTHONPATH} |
549 |
- |
550 |
- VARTEXFONTS="${T}"/fonts \ |
551 |
- "${PYTHON}" ./make.py --small html || die |
552 |
- fi |
553 |
-} |
554 |
- |
555 |
-python_test() { |
556 |
- wrap_setup distutils_install_for_testing |
557 |
- |
558 |
- #cd "${TMPDIR}" || die |
559 |
- VIRTUALX_COMMAND="${PYTHON}" |
560 |
- virtualmake -c "import sys, matplotlib as m; sys.exit(0 if m.test(verbosity=2) else 1)" || \ |
561 |
- die "Tests fail with ${EPYTHON}" |
562 |
-# VIRTUALX_COMMAND=esetup.py |
563 |
-# virtualmake test |
564 |
-} |
565 |
- |
566 |
-python_install() { |
567 |
- wrap_setup distutils-r1_python_install |
568 |
-} |
569 |
- |
570 |
-python_install_all() { |
571 |
- use doc && local HTML_DOCS=( doc/build/html/. ) |
572 |
- |
573 |
- distutils-r1_python_install_all |
574 |
- |
575 |
- if use examples; then |
576 |
- dodoc -r examples |
577 |
- docompress -x /usr/share/doc/${PF}/examples |
578 |
- fi |
579 |
-} |
580 |
|
581 |
diff --git a/dev-python/matplotlib/matplotlib-1.5.1.ebuild b/dev-python/matplotlib/matplotlib-1.5.1.ebuild |
582 |
deleted file mode 100644 |
583 |
index 4be84aed2a4..00000000000 |
584 |
--- a/dev-python/matplotlib/matplotlib-1.5.1.ebuild |
585 |
+++ /dev/null |
586 |
@@ -1,273 +0,0 @@ |
587 |
-# Copyright 1999-2017 Gentoo Foundation |
588 |
-# Distributed under the terms of the GNU General Public License v2 |
589 |
- |
590 |
-EAPI=5 |
591 |
- |
592 |
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} ) |
593 |
- |
594 |
-PYTHON_REQ_USE='tk?,threads(+)' |
595 |
- |
596 |
-inherit distutils-r1 eutils flag-o-matic multiprocessing virtualx toolchain-funcs |
597 |
- |
598 |
-DESCRIPTION="Pure python plotting library with matlab like syntax" |
599 |
-HOMEPAGE="http://matplotlib.org/" |
600 |
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" |
601 |
- |
602 |
-SLOT="0" |
603 |
-# Main license: matplotlib |
604 |
-# Some modules: BSD |
605 |
-# matplotlib/backends/qt4_editor: MIT |
606 |
-# Fonts: BitstreamVera, OFL-1.1 |
607 |
-LICENSE="BitstreamVera BSD matplotlib MIT OFL-1.1" |
608 |
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" |
609 |
-IUSE="cairo doc excel examples fltk gtk2 gtk3 latex pyside qt4 qt5 test tk wxwidgets" |
610 |
- |
611 |
-PY2_FLAGS="|| ( $(python_gen_useflags python2_7) )" |
612 |
-REQUIRED_USE=" |
613 |
- doc? ( ${PY2_FLAGS} ) |
614 |
- excel? ( ${PY2_FLAGS} ) |
615 |
- fltk? ( ${PY2_FLAGS} ) |
616 |
- gtk2? ( ${PY2_FLAGS} ) |
617 |
- wxwidgets? ( ${PY2_FLAGS} ) |
618 |
- test? ( |
619 |
- cairo fltk latex pyside qt5 qt4 tk wxwidgets |
620 |
- || ( gtk2 gtk3 ) |
621 |
- )" |
622 |
- |
623 |
-# #456704 -- a lot of py2-only deps |
624 |
-PY2_USEDEP=$(python_gen_usedep python2_7) |
625 |
-COMMON_DEPEND=" |
626 |
- dev-python/cycler[${PYTHON_USEDEP}] |
627 |
- >=dev-python/numpy-1.6[${PYTHON_USEDEP}] |
628 |
- dev-python/python-dateutil:0[${PYTHON_USEDEP}] |
629 |
- dev-python/pytz[${PYTHON_USEDEP}] |
630 |
- >=dev-python/six-1.4[${PYTHON_USEDEP}] |
631 |
- media-fonts/stix-fonts |
632 |
- media-libs/freetype:2 |
633 |
- media-libs/libpng:0 |
634 |
- media-libs/qhull |
635 |
- cairo? ( |
636 |
- || ( |
637 |
- dev-python/pycairo[${PYTHON_USEDEP}] |
638 |
- dev-python/cairocffi[${PYTHON_USEDEP}] |
639 |
- ) |
640 |
- ) |
641 |
- gtk2? ( |
642 |
- dev-libs/glib:2= |
643 |
- x11-libs/gdk-pixbuf |
644 |
- x11-libs/gtk+:2 |
645 |
- dev-python/pygtk[${PY2_USEDEP}] ) |
646 |
- wxwidgets? ( >=dev-python/wxpython-2.8:*[${PY2_USEDEP}] )" |
647 |
- |
648 |
-# internal copy of pycxx highly patched |
649 |
-# dev-python/pycxx |
650 |
- |
651 |
-DEPEND="${COMMON_DEPEND} |
652 |
- dev-python/versioneer[${PYTHON_USEDEP}] |
653 |
- dev-python/setuptools[${PYTHON_USEDEP}] |
654 |
- virtual/pkgconfig |
655 |
- doc? ( |
656 |
- app-text/dvipng |
657 |
- dev-python/pillow[${PYTHON_USEDEP}] |
658 |
- dev-python/ipython[${PYTHON_USEDEP}] |
659 |
- dev-python/mock[${PY2_USEDEP}] |
660 |
- dev-python/numpydoc[${PYTHON_USEDEP}] |
661 |
- dev-python/sphinx[${PYTHON_USEDEP}] |
662 |
- dev-python/xlwt[${PYTHON_USEDEP}] |
663 |
- dev-texlive/texlive-latexextra |
664 |
- dev-texlive/texlive-fontsrecommended |
665 |
- dev-texlive/texlive-latexrecommended |
666 |
- media-gfx/graphviz[cairo] |
667 |
- ) |
668 |
- test? ( |
669 |
- dev-python/mock[${PYTHON_USEDEP}] |
670 |
- >=dev-python/nose-0.11.1[${PYTHON_USEDEP}] |
671 |
- )" |
672 |
- |
673 |
-RDEPEND="${COMMON_DEPEND} |
674 |
- >=dev-python/pyparsing-1.5.6[${PYTHON_USEDEP}] |
675 |
- excel? ( dev-python/xlwt[${PYTHON_USEDEP}] ) |
676 |
- fltk? ( dev-python/pyfltk[${PYTHON_USEDEP}] ) |
677 |
- gtk3? ( |
678 |
- dev-python/pygobject:3[${PYTHON_USEDEP}] |
679 |
- x11-libs/gtk+:3[introspection] ) |
680 |
- latex? ( |
681 |
- virtual/latex-base |
682 |
- app-text/ghostscript-gpl |
683 |
- app-text/dvipng |
684 |
- app-text/poppler[utils] |
685 |
- dev-texlive/texlive-fontsrecommended |
686 |
- dev-texlive/texlive-latexextra |
687 |
- dev-texlive/texlive-xetex |
688 |
- ) |
689 |
- pyside? ( dev-python/pyside[X,${PYTHON_USEDEP}] ) |
690 |
- qt4? ( dev-python/PyQt4[X,${PYTHON_USEDEP}] ) |
691 |
- qt5? ( dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}] ) |
692 |
- " |
693 |
- |
694 |
-# A few C++ source files are written to srcdir. |
695 |
-# Other than that, the ebuild shall be fit for out-of-source build. |
696 |
-DISTUTILS_IN_SOURCE_BUILD=1 |
697 |
- |
698 |
-PATCHES=( |
699 |
- "${FILESDIR}"/${P}-sphinx-1.4.3-backport.patch |
700 |
- "${FILESDIR}"/${P}-test-fix-backport.patch |
701 |
- "${FILESDIR}"/${P}-test-fix-backport-2.patch |
702 |
- ) |
703 |
- |
704 |
-pkg_setup() { |
705 |
- unset DISPLAY # bug #278524 |
706 |
- use doc && DISTUTILS_ALL_SUBPHASE_IMPLS=( python2.7 ) |
707 |
-} |
708 |
- |
709 |
-use_setup() { |
710 |
- local uword="${2:-${1}}" |
711 |
- if use ${1}; then |
712 |
- echo "${uword} = True" |
713 |
- echo "${uword}agg = True" |
714 |
- else |
715 |
- echo "${uword} = False" |
716 |
- echo "${uword}agg = False" |
717 |
- fi |
718 |
-} |
719 |
- |
720 |
-python_prepare_all() { |
721 |
-# Generates test failures, but fedora does it |
722 |
-# local PATCHES=( |
723 |
-# "${FILESDIR}"/${P}-unbundle-pycxx.patch |
724 |
-# "${FILESDIR}"/${P}-unbundle-agg.patch |
725 |
-# ) |
726 |
-# rm -r agg24 CXX || die |
727 |
-# rm -r agg24 || die |
728 |
- |
729 |
-# cat > lib/${PN}/externals/six.py <<-EOF |
730 |
-# from __future__ import absolute_import |
731 |
-# from six import * |
732 |
-# EOF |
733 |
- |
734 |
- sed \ |
735 |
- -e 's/matplotlib.pyparsing_py[23]/pyparsing/g' \ |
736 |
- -i lib/matplotlib/{mathtext,fontconfig_pattern}.py \ |
737 |
- || die "sed pyparsing failed" |
738 |
- |
739 |
- # suggested by upstream |
740 |
-# sed \ |
741 |
-# -e '/tol/s:32:35:g' \ |
742 |
-# -i lib/matplotlib/tests/test_mathtext.py || die |
743 |
- |
744 |
- sed \ |
745 |
- -e "s:/usr/:${EPREFIX}/usr/:g" \ |
746 |
- -i setupext.py || die |
747 |
- |
748 |
- export XDG_RUNTIME_DIR="${T}/runtime-dir" |
749 |
- mkdir "${XDG_RUNTIME_DIR}" || die |
750 |
- chmod 0700 "${XDG_RUNTIME_DIR}" || die |
751 |
- |
752 |
- distutils-r1_python_prepare_all |
753 |
-} |
754 |
- |
755 |
-python_configure_all() { |
756 |
- append-flags -fno-strict-aliasing |
757 |
- append-cppflags -DNDEBUG # or get old trying to do triangulation |
758 |
- tc-export PKG_CONFIG |
759 |
-} |
760 |
- |
761 |
-python_configure() { |
762 |
- mkdir -p "${BUILD_DIR}" || die |
763 |
- |
764 |
- # create setup.cfg (see setup.cfg.template for any changes). |
765 |
- |
766 |
- # common switches. |
767 |
- cat > "${BUILD_DIR}"/setup.cfg <<- EOF |
768 |
- [directories] |
769 |
- basedirlist = "${EPREFIX}/usr" |
770 |
- [provide_packages] |
771 |
- pytz = False |
772 |
- dateutil = False |
773 |
- [gui_support] |
774 |
- agg = True |
775 |
- $(use_setup cairo) |
776 |
- $(use_setup pyside) |
777 |
- $(use_setup qt4) |
778 |
- $(use_setup qt5) |
779 |
- $(use_setup tk) |
780 |
- EOF |
781 |
- |
782 |
- if use gtk3 && use cairo; then |
783 |
- echo "gtk3cairo = True" >> "${BUILD_DIR}"/setup.cfg || die |
784 |
- else |
785 |
- echo "gtk3cairo = False" >> "${BUILD_DIR}"/setup.cfg || die |
786 |
- fi |
787 |
- |
788 |
- if $(python_is_python3); then |
789 |
- cat >> "${BUILD_DIR}"/setup.cfg <<- EOF |
790 |
- six = True |
791 |
- fltk = False |
792 |
- fltkagg = False |
793 |
- gtk = False |
794 |
- gtkagg = False |
795 |
- wx = False |
796 |
- wxagg = False |
797 |
- EOF |
798 |
- else |
799 |
- cat >> "${BUILD_DIR}"/setup.cfg <<-EOF |
800 |
- six = False |
801 |
- $(use_setup fltk) |
802 |
- $(use_setup gtk2 gtk) |
803 |
- $(use_setup gtk3) |
804 |
- $(use_setup wxwidgets wx) |
805 |
- EOF |
806 |
- fi |
807 |
-} |
808 |
- |
809 |
-wrap_setup() { |
810 |
- local MPLSETUPCFG=${BUILD_DIR}/setup.cfg |
811 |
- export MPLSETUPCFG |
812 |
- unset DISPLAY |
813 |
- |
814 |
- # Note: remove build... if switching to out-of-source build |
815 |
- "${@}" build --build-lib="${BUILD_DIR}"/build/lib |
816 |
-} |
817 |
- |
818 |
-python_compile() { |
819 |
- wrap_setup distutils-r1_python_compile |
820 |
-} |
821 |
- |
822 |
-python_compile_all() { |
823 |
- if use doc; then |
824 |
- cd doc || die |
825 |
- |
826 |
- # necessary for in-source build |
827 |
- local -x PYTHONPATH="${BUILD_DIR}"/build/lib:${PYTHONPATH} |
828 |
- |
829 |
- VARTEXFONTS="${T}"/fonts \ |
830 |
- "${PYTHON}" ./make.py --small html || die |
831 |
- fi |
832 |
-} |
833 |
- |
834 |
-python_test() { |
835 |
- wrap_setup distutils_install_for_testing |
836 |
- |
837 |
-# virtx ${PYTHON} tests.py \ |
838 |
-# --no-pep8 \ |
839 |
-# --no-network \ |
840 |
-# --verbose \ |
841 |
-# --processes=$(makeopts_jobs) |
842 |
- |
843 |
- virtx "${PYTHON}" -c "import sys, matplotlib as m; sys.exit(0 if m.test(verbosity=2) else 1)" |
844 |
-} |
845 |
- |
846 |
-python_install() { |
847 |
- wrap_setup distutils-r1_python_install |
848 |
-} |
849 |
- |
850 |
-python_install_all() { |
851 |
- use doc && local HTML_DOCS=( doc/build/html/. ) |
852 |
- |
853 |
- distutils-r1_python_install_all |
854 |
- |
855 |
- if use examples; then |
856 |
- dodoc -r examples |
857 |
- docompress -x /usr/share/doc/${PF}/examples |
858 |
- fi |
859 |
-} |