1 |
commit: 66a94e6570eab0c2d88a3100a1cec5ca382ab84e |
2 |
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Jan 27 12:23:07 2019 +0000 |
4 |
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Jan 27 12:36:03 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66a94e65 |
7 |
|
8 |
dev-python/enable: Drop old |
9 |
|
10 |
Package-Manager: Portage-2.3.58, Repoman-2.3.12 |
11 |
Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org> |
12 |
|
13 |
dev-python/enable/Manifest | 2 - |
14 |
dev-python/enable/enable-4.4.1.ebuild | 70 ---------------- |
15 |
dev-python/enable/enable-4.5.1.ebuild | 78 ------------------ |
16 |
dev-python/enable/files/enable-4.4.1-swig.patch | 93 ---------------------- |
17 |
dev-python/enable/files/enable-4.5.1-doc.patch | 24 ------ |
18 |
dev-python/enable/files/enable-4.5.1-gcc-5.patch | 22 ----- |
19 |
dev-python/enable/files/enable-4.5.1-version.patch | 31 -------- |
20 |
7 files changed, 320 deletions(-) |
21 |
|
22 |
diff --git a/dev-python/enable/Manifest b/dev-python/enable/Manifest |
23 |
index 4f4928116dc..0c40428cccd 100644 |
24 |
--- a/dev-python/enable/Manifest |
25 |
+++ b/dev-python/enable/Manifest |
26 |
@@ -1,3 +1 @@ |
27 |
-DIST enable-4.4.1.tar.gz 2507048 BLAKE2B e3414a0505acafece3242a40400aab9ea00062bb605baa500f604df875b1caacd446c30189a23bac856c6cb39067f120be6e89ac9c95a05e92dc882d839a7e4b SHA512 72c879f19e26a4311b900cb4665969b9f806ce47b23c214a25e3ec308cc5300b6d71084a793215b05302fbeba09e13a4561e661c3bddb700d529bd31cfeb4dff |
28 |
-DIST enable-4.5.1.tar.gz 2571975 BLAKE2B dfd294f80e22fa89243057f405fe83ecadeb3768cae5a103e62219cfc62ecb5bd3acf1bd2d575da3276e8111c5c5330fa88e1ed06c6eb67a04974a57dd0cbd98 SHA512 1095a4490f4918756dd33864aaba2636c294c3b177d3f500d98a355ec86ef86ab211d33cdec95c2d37e7e1df41622acf2c8ecf524a1d93cc39797804c49e6971 |
29 |
DIST enable-4.7.1.tar.gz 2728889 BLAKE2B 2952c1772ea902b2a040a5dbc1ade4fcb41f38da41cb9cfd3a574d16397fcceedb5d2216e19bd14ca9881ff27efa93ec0fe4b94db8f3baedf174fe062c825f1e SHA512 49ca414d1273fb5ddcb1732e621f91a5ac49ff02d63b5b36b8d9e28dd737eb4a312f35345fc29db555db1c6e0e8c9bf2204f8662b43a2761db6c2d656c6b2140 |
30 |
|
31 |
diff --git a/dev-python/enable/enable-4.4.1.ebuild b/dev-python/enable/enable-4.4.1.ebuild |
32 |
deleted file mode 100644 |
33 |
index ad35ba85b45..00000000000 |
34 |
--- a/dev-python/enable/enable-4.4.1.ebuild |
35 |
+++ /dev/null |
36 |
@@ -1,70 +0,0 @@ |
37 |
-# Copyright 1999-2018 Gentoo Foundation |
38 |
-# Distributed under the terms of the GNU General Public License v2 |
39 |
- |
40 |
-EAPI=5 |
41 |
- |
42 |
-PYTHON_COMPAT=( python2_7 ) |
43 |
- |
44 |
-inherit distutils-r1 virtualx flag-o-matic |
45 |
- |
46 |
-DESCRIPTION="Enthought Tool Suite: Drawing and interaction packages" |
47 |
-HOMEPAGE="http://docs.enthought.com/enable/ |
48 |
- https://pypi.org/project/enable/ |
49 |
- https://github.com/enthought/enable" |
50 |
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" |
51 |
- |
52 |
-LICENSE="BSD" |
53 |
-SLOT="0" |
54 |
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux" |
55 |
-IUSE="doc examples test" |
56 |
- |
57 |
-RDEPEND=" |
58 |
- dev-python/numpy[${PYTHON_USEDEP}] |
59 |
- dev-python/reportlab[${PYTHON_USEDEP}] |
60 |
- >=dev-python/traitsui-4[${PYTHON_USEDEP}] |
61 |
- >=media-libs/freetype-2 |
62 |
- virtual/opengl |
63 |
- virtual/glu |
64 |
- x11-libs/libX11" |
65 |
-DEPEND="${RDEPEND} |
66 |
- dev-python/setuptools[${PYTHON_USEDEP}] |
67 |
- dev-lang/swig:0 |
68 |
- dev-python/cython[${PYTHON_USEDEP}] |
69 |
- doc? ( dev-python/sphinx[${PYTHON_USEDEP}] ) |
70 |
- test? ( |
71 |
- dev-python/nose[${PYTHON_USEDEP}] |
72 |
- media-fonts/font-cursor-misc |
73 |
- media-fonts/font-misc-misc |
74 |
- )" |
75 |
- |
76 |
-DISTUTILS_IN_SOURCE_BUILD=1 |
77 |
- |
78 |
-PATCHES=( "${FILESDIR}"/${P}-swig.patch ) |
79 |
- |
80 |
-python_prepare_all() { |
81 |
- append-cflags -fno-strict-aliasing |
82 |
- |
83 |
- sed -e 's:html_favicon = "et.ico":html_favicon = "_static/et.ico":' \ |
84 |
- -i docs/source/conf.py || die |
85 |
- |
86 |
- distutils-r1_python_prepare_all |
87 |
-} |
88 |
- |
89 |
-python_compile_all() { |
90 |
- use doc && emake -C docs html |
91 |
-} |
92 |
- |
93 |
-python_test() { |
94 |
- pushd "${BUILD_DIR}"/lib > /dev/null |
95 |
- # https://github.com/enthought/enable/issues/158 |
96 |
- PYTHONPATH=.:kiva \ |
97 |
- VIRTUALX_COMMAND="nosetests" virtualmake |
98 |
- popd > /dev/null |
99 |
-} |
100 |
- |
101 |
-python_install_all() { |
102 |
- use doc && local HTML_DOCS=( docs/build/html/. ) |
103 |
- |
104 |
- use examples && local EXAMPLES=( examples/. ) |
105 |
- distutils-r1_python_install_all |
106 |
-} |
107 |
|
108 |
diff --git a/dev-python/enable/enable-4.5.1.ebuild b/dev-python/enable/enable-4.5.1.ebuild |
109 |
deleted file mode 100644 |
110 |
index ef3d56907cc..00000000000 |
111 |
--- a/dev-python/enable/enable-4.5.1.ebuild |
112 |
+++ /dev/null |
113 |
@@ -1,78 +0,0 @@ |
114 |
-# Copyright 1999-2018 Gentoo Foundation |
115 |
-# Distributed under the terms of the GNU General Public License v2 |
116 |
- |
117 |
-EAPI=5 |
118 |
- |
119 |
-PYTHON_COMPAT=( python2_7 ) |
120 |
- |
121 |
-inherit distutils-r1 virtualx flag-o-matic |
122 |
- |
123 |
-DESCRIPTION="Enthought Tool Suite: Drawing and interaction packages" |
124 |
-HOMEPAGE="http://docs.enthought.com/enable/ |
125 |
- https://pypi.org/project/enable/ |
126 |
- https://github.com/enthought/enable" |
127 |
-#SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" |
128 |
-SRC_URI="https://github.com/enthought/enable/archive/${PV}.tar.gz -> ${P}.tar.gz" |
129 |
- |
130 |
-LICENSE="BSD" |
131 |
-SLOT="0" |
132 |
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux" |
133 |
-IUSE="doc examples test" |
134 |
- |
135 |
-RDEPEND=" |
136 |
- dev-python/apptools[${PYTHON_USEDEP}] |
137 |
- dev-python/kiwisolver[${PYTHON_USEDEP}] |
138 |
- dev-python/numpy[${PYTHON_USEDEP}] |
139 |
- dev-python/reportlab[${PYTHON_USEDEP}] |
140 |
- >=dev-python/traitsui-4[${PYTHON_USEDEP}] |
141 |
- >=media-libs/freetype-2 |
142 |
- virtual/opengl |
143 |
- virtual/glu |
144 |
- x11-libs/libX11" |
145 |
-DEPEND="${RDEPEND} |
146 |
- dev-python/setuptools[${PYTHON_USEDEP}] |
147 |
- dev-lang/swig:0 |
148 |
- dev-python/cython[${PYTHON_USEDEP}] |
149 |
- doc? ( dev-python/sphinx[${PYTHON_USEDEP}] ) |
150 |
- test? ( |
151 |
- dev-python/nose[${PYTHON_USEDEP}] |
152 |
- media-fonts/font-cursor-misc |
153 |
- media-fonts/font-misc-misc |
154 |
- )" |
155 |
- |
156 |
-DISTUTILS_IN_SOURCE_BUILD=1 |
157 |
- |
158 |
-PATCHES=( |
159 |
- "${FILESDIR}"/${PN}-4.4.1-swig.patch |
160 |
- "${FILESDIR}"/${P}-gcc-5.patch |
161 |
- "${FILESDIR}"/${P}-doc.patch |
162 |
- "${FILESDIR}"/${P}-version.patch |
163 |
- ) |
164 |
- |
165 |
-python_prepare_all() { |
166 |
- append-cflags -fno-strict-aliasing |
167 |
- |
168 |
- sed -e 's:html_favicon = "et.ico":html_favicon = "_static/et.ico":' \ |
169 |
- -i docs/source/conf.py || die |
170 |
- |
171 |
- distutils-r1_python_prepare_all |
172 |
-} |
173 |
- |
174 |
-python_compile_all() { |
175 |
- use doc && emake -C docs html |
176 |
-} |
177 |
- |
178 |
-python_test() { |
179 |
- pushd "${BUILD_DIR}"/lib > /dev/null |
180 |
- # https://github.com/enthought/enable/issues/158 |
181 |
- PYTHONPATH=.:kiva \ |
182 |
- VIRTUALX_COMMAND="nosetests" virtualmake --verbose |
183 |
- popd > /dev/null |
184 |
-} |
185 |
- |
186 |
-python_install_all() { |
187 |
- use doc && local HTML_DOCS=( docs/build/html/. ) |
188 |
- |
189 |
- use examples && local EXAMPLES=( examples/. ) |
190 |
- distutils-r1_python_install_all |
191 |
-} |
192 |
|
193 |
diff --git a/dev-python/enable/files/enable-4.4.1-swig.patch b/dev-python/enable/files/enable-4.4.1-swig.patch |
194 |
deleted file mode 100644 |
195 |
index a82f3af1c7e..00000000000 |
196 |
--- a/dev-python/enable/files/enable-4.4.1-swig.patch |
197 |
+++ /dev/null |
198 |
@@ -1,93 +0,0 @@ |
199 |
-From f0e399174c5f55eb3a72860c620fdd5193ad57da Mon Sep 17 00:00:00 2001 |
200 |
-From: Jonathan Stickel <jjstickel@×××××.com> |
201 |
-Date: Wed, 25 Mar 2015 14:05:01 -0600 |
202 |
-Subject: [PATCH] fixes for recent swig |
203 |
- |
204 |
---- |
205 |
- kiva/agg/src/affine_matrix.i | 4 ++-- |
206 |
- kiva/agg/src/constants.i | 4 ++-- |
207 |
- kiva/agg/src/hit_test.i | 4 ++-- |
208 |
- kiva/agg/src/rgba.i | 4 ++-- |
209 |
- 4 files changed, 8 insertions(+), 8 deletions(-) |
210 |
- |
211 |
-diff --git a/kiva/agg/src/affine_matrix.i b/kiva/agg/src/affine_matrix.i |
212 |
-index 2f30e51..7c05a6a 100644 |
213 |
---- a/kiva/agg/src/affine_matrix.i |
214 |
-+++ b/kiva/agg/src/affine_matrix.i |
215 |
-@@ -157,7 +157,7 @@ namespace agg24 |
216 |
- }; |
217 |
- }; |
218 |
- |
219 |
--%pythoncode { |
220 |
-+%pythoncode %{ |
221 |
- def is_sequence(arg): |
222 |
- try: |
223 |
- len(arg) |
224 |
-@@ -184,7 +184,7 @@ class AffineMatrix(_AffineMatrix): |
225 |
- """ |
226 |
- self.multiply(other) |
227 |
- return self |
228 |
--} |
229 |
-+%} |
230 |
- |
231 |
- %extend agg24::trans_affine |
232 |
- { |
233 |
-diff --git a/kiva/agg/src/constants.i b/kiva/agg/src/constants.i |
234 |
-index b680cae..78f9d0c 100644 |
235 |
---- a/kiva/agg/src/constants.i |
236 |
-+++ b/kiva/agg/src/constants.i |
237 |
-@@ -44,7 +44,7 @@ |
238 |
- unsigned path_cmd(unsigned c); |
239 |
- unsigned path_flags(unsigned c); |
240 |
- |
241 |
--%pythoncode { |
242 |
-+%pythoncode %{ |
243 |
- |
244 |
- #---------------------------------------------------------------------------- |
245 |
- # |
246 |
-@@ -141,4 +141,4 @@ interp_enum_map = {} |
247 |
- for key,value in interp_string_map.items(): |
248 |
- interp_enum_map[value] = key |
249 |
- |
250 |
--} |
251 |
-+%} |
252 |
-diff --git a/kiva/agg/src/hit_test.i b/kiva/agg/src/hit_test.i |
253 |
-index 76de0c9..2cfb1cf 100644 |
254 |
---- a/kiva/agg/src/hit_test.i |
255 |
-+++ b/kiva/agg/src/hit_test.i |
256 |
-@@ -22,7 +22,7 @@ namespace kiva |
257 |
- } |
258 |
- |
259 |
- %pythoncode |
260 |
--{ |
261 |
-+%{ |
262 |
- from numpy import shape, transpose, zeros, rank, reshape, int32 |
263 |
- |
264 |
- def points_in_polygon(pts, poly_pts, use_winding=False): |
265 |
-@@ -92,4 +92,4 @@ def points_in_polygon(pts, poly_pts, use_winding=False): |
266 |
- else: |
267 |
- _agg.points_in_polygon(pts, poly_pts, results) |
268 |
- return results |
269 |
--} |
270 |
-+%} |
271 |
-diff --git a/kiva/agg/src/rgba.i b/kiva/agg/src/rgba.i |
272 |
-index f7624b8..183014f 100644 |
273 |
---- a/kiva/agg/src/rgba.i |
274 |
-+++ b/kiva/agg/src/rgba.i |
275 |
-@@ -74,7 +74,7 @@ namespace agg24 |
276 |
- } |
277 |
- |
278 |
- |
279 |
--%pythoncode { |
280 |
-+%pythoncode %{ |
281 |
- def is_sequence(arg): |
282 |
- try: |
283 |
- len(arg) |
284 |
-@@ -90,6 +90,6 @@ class Rgba(_Rgba): |
285 |
- if len(args) not in [3,4]: |
286 |
- raise ValueError, "array argument must be 1x3 or 1x4" |
287 |
- _Rgba.__init__(self,*args) |
288 |
--} |
289 |
-+%} |
290 |
- |
291 |
- %clear double r, double g, double b, double a; |
292 |
|
293 |
diff --git a/dev-python/enable/files/enable-4.5.1-doc.patch b/dev-python/enable/files/enable-4.5.1-doc.patch |
294 |
deleted file mode 100644 |
295 |
index c9cc1ff2e3c..00000000000 |
296 |
--- a/dev-python/enable/files/enable-4.5.1-doc.patch |
297 |
+++ /dev/null |
298 |
@@ -1,24 +0,0 @@ |
299 |
-From 41134b03b96b741d95554846841c189313052265 Mon Sep 17 00:00:00 2001 |
300 |
-From: John Wiggins <jwiggins@×××××××××.com> |
301 |
-Date: Thu, 1 Oct 2015 20:40:07 +0200 |
302 |
-Subject: [PATCH] Read the docs version directly from enable._version |
303 |
- |
304 |
---- |
305 |
- docs/source/conf.py | 4 ++-- |
306 |
- 1 file changed, 2 insertions(+), 2 deletions(-) |
307 |
- |
308 |
-diff --git a/docs/source/conf.py b/docs/source/conf.py |
309 |
-index 10b7552..995e315 100644 |
310 |
---- a/docs/source/conf.py |
311 |
-+++ b/docs/source/conf.py |
312 |
-@@ -41,8 +41,8 @@ |
313 |
- # The default replacements for |version| and |release|, also used in various |
314 |
- # other places throughout the built documents. |
315 |
- d = {} |
316 |
--execfile(os.path.join('..', '..', 'enable', '__init__.py'), d) |
317 |
--version = release = d['__version__'] |
318 |
-+execfile(os.path.join('..', '..', 'enable', '_version.py'), d) |
319 |
-+version = release = d['full_version'] |
320 |
- |
321 |
- # There are two options for replacing |today|: either, you set today to some |
322 |
- # non-false value, then it is used: |
323 |
|
324 |
diff --git a/dev-python/enable/files/enable-4.5.1-gcc-5.patch b/dev-python/enable/files/enable-4.5.1-gcc-5.patch |
325 |
deleted file mode 100644 |
326 |
index 700b0b3774f..00000000000 |
327 |
--- a/dev-python/enable/files/enable-4.5.1-gcc-5.patch |
328 |
+++ /dev/null |
329 |
@@ -1,22 +0,0 @@ |
330 |
-From 55a74ccfc33764499497022dd3649be4bb1091ed Mon Sep 17 00:00:00 2001 |
331 |
-From: Nathan Ringo <tikiking1@××××××××××××××××××××.com> |
332 |
-Date: Wed, 10 Jun 2015 22:06:57 -0500 |
333 |
-Subject: [PATCH] Fixes #200 |
334 |
- |
335 |
---- |
336 |
- kiva/agg/setup.py | 2 +- |
337 |
- 1 file changed, 1 insertion(+), 1 deletion(-) |
338 |
- |
339 |
-diff --git a/kiva/agg/setup.py b/kiva/agg/setup.py |
340 |
-index 5b4d458..c6e290a 100644 |
341 |
---- a/kiva/agg/setup.py |
342 |
-+++ b/kiva/agg/setup.py |
343 |
-@@ -170,7 +170,7 @@ def get_ft2_sources((lib_name, build_info), build_dir): |
344 |
- f = os.popen("g++ --version") |
345 |
- line0 = f.readline() |
346 |
- f.close() |
347 |
-- m = re.match(r'.+?\s(3|4)\.\d+', line0) |
348 |
-+ m = re.match(r'.+?\s([3-8])\.\d+', line0) |
349 |
- if int(m.group(1)) < 4: |
350 |
- use_32bit_workaround = True |
351 |
- |
352 |
|
353 |
diff --git a/dev-python/enable/files/enable-4.5.1-version.patch b/dev-python/enable/files/enable-4.5.1-version.patch |
354 |
deleted file mode 100644 |
355 |
index 1dd3fe42775..00000000000 |
356 |
--- a/dev-python/enable/files/enable-4.5.1-version.patch |
357 |
+++ /dev/null |
358 |
@@ -1,31 +0,0 @@ |
359 |
-From f91c824ebad74e8c23e62fe3390842c5fe322aee Mon Sep 17 00:00:00 2001 |
360 |
-From: itziakos <ioannist@×××××××××.com> |
361 |
-Date: Wed, 20 May 2015 22:52:42 +0100 |
362 |
-Subject: [PATCH] check the enable._version.py when installing from source |
363 |
- |
364 |
---- |
365 |
- setup.py | 7 ++++--- |
366 |
- 1 file changed, 4 insertions(+), 3 deletions(-) |
367 |
- |
368 |
-diff --git a/setup.py b/setup.py |
369 |
-index f765f51..3328b93 100644 |
370 |
---- a/setup.py |
371 |
-+++ b/setup.py |
372 |
-@@ -92,13 +92,14 @@ def write_version_py(filename): |
373 |
- fullversion = VERSION |
374 |
- if os.path.exists('.git'): |
375 |
- git_revision, dev_num = git_version() |
376 |
-- elif os.path.exists('kiva/_version.py'): |
377 |
-+ # All packages are synced with the enable version |
378 |
-+ elif os.path.exists('enable/_version.py'): |
379 |
- # must be a source distribution, use existing version file |
380 |
- try: |
381 |
-- from kiva._version import git_revision, full_version |
382 |
-+ from enable._version import git_revision, full_version |
383 |
- except ImportError: |
384 |
- raise ImportError("Unable to import git_revision. Try removing " |
385 |
-- "kiva/_version.py and the build directory " |
386 |
-+ "enable/_version.py and the build directory " |
387 |
- "before building.") |
388 |
- |
389 |
- match = re.match(r'.*?\.dev(?P<dev_num>\d+)', full_version) |