1 |
commit: 3d7869bdc01bda59df44003c3db54b69d2bc9317 |
2 |
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Dec 29 19:02:49 2018 +0000 |
4 |
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Dec 29 19:02:49 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=3d7869bd |
7 |
|
8 |
dev-python/numpy: in tree version works |
9 |
|
10 |
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org> |
11 |
|
12 |
dev-python/numpy/Manifest | 4 - |
13 |
dev-python/numpy/files/numpy-1.10.1-musl-fix.patch | 20 --- |
14 |
.../files/numpy-1.10.2-no-hardcode-blas.patch | 64 --------- |
15 |
dev-python/numpy/metadata.xml | 23 ---- |
16 |
dev-python/numpy/numpy-1.10.4.ebuild | 153 --------------------- |
17 |
5 files changed, 264 deletions(-) |
18 |
|
19 |
diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest |
20 |
deleted file mode 100644 |
21 |
index 2150cf4..0000000 |
22 |
--- a/dev-python/numpy/Manifest |
23 |
+++ /dev/null |
24 |
@@ -1,4 +0,0 @@ |
25 |
-DIST numpy-1.10.4.tar.gz 4069996 SHA256 7356e98fbcc529e8d540666f5a919912752e569150e9a4f8d869c686f14c720b SHA512 57ace46e357d49be0efd904e5ceb9862c626c916987c8798a12de7ae1e06816ad8483439ac4619792a04889631b5998f2397dc601c78dea33a784b4831c19c79 WHIRLPOOL 76946c2543b1cade06d71f83fd507bd818c1090baa9c3ddda7d1f48d48ed23672c5d9de76db890df990c6d8b7b26b71d3ce733c448943ad4177374a957360d1c |
26 |
-DIST numpy-html-1.10.1.zip 9663942 SHA256 4af48eb5abf2551f01d85aea7e9a99a30096777f02937dc185b16bb72a110366 SHA512 9d1f3619b801c88604a0495290da4ae8cfb4800257d549214363c554c1dc09a736425d594ed88f492afee6ae7c68fe5c166b9b3a8f24637ea41d67fd23b9d9f9 WHIRLPOOL d6c93e31e31c832fb21f117d03719e0375ee3d27fb6f7975bfcd12469df4a2ed0a25a16bd09a0e2113407446efc220e5bff534f7cd76a715c3d7df26c02f07a1 |
27 |
-DIST numpy-ref-1.10.1.pdf 5382006 SHA256 72ae03348d0375ff2f18056efd04e815cc1d27b738d0685c80f5204a496bc279 SHA512 25085eb7cb80343abffe04ee01ea93603427913ba4443fbfdaa1ef1ad07a8642c47259d0bb1cb91a9059f786c03395bba76f608c6f0a2fd26d1afec4847d885c WHIRLPOOL d904d9b2824bfb08a0eeffeb37f7d646d003c39230d950d387e2ddc8e475a117b8305a0ce3dc479be72f010b1a868f22ddfde17e6c4cd7c56630bbdf09afb90e |
28 |
-DIST numpy-user-1.10.1.pdf 406114 SHA256 5180a5a1333365e474aabba9d6edd25276e79179fd708bb3989d95dc4e76215f SHA512 998bce3777944e7b366c619e968ac4b6cc4351cd2819d6ecba7f422e20b6cd4d7332a8dede4036cd12e85b24c4c3d973bd9ef2d407610369c2591fce990fa8f4 WHIRLPOOL 4b53256663840738d288d38c4151e01ecfb515ebd4f69bb4330f4c5589642b3392a0a300f3def53df6bee8746f127a3af0d284601f288f4c4292df8b6de39f71 |
29 |
|
30 |
diff --git a/dev-python/numpy/files/numpy-1.10.1-musl-fix.patch b/dev-python/numpy/files/numpy-1.10.1-musl-fix.patch |
31 |
deleted file mode 100644 |
32 |
index b5b891c..0000000 |
33 |
--- a/dev-python/numpy/files/numpy-1.10.1-musl-fix.patch |
34 |
+++ /dev/null |
35 |
@@ -1,20 +0,0 @@ |
36 |
---- a/numpy/core/src/private/npy_config.h.orig 2015-08-11 19:03:43.000000000 +0200 |
37 |
-+++ b/numpy/core/src/private/npy_config.h 2015-10-08 08:20:25.489203036 +0200 |
38 |
-@@ -71,7 +71,7 @@ |
39 |
- |
40 |
- |
41 |
- /* Disable broken gnu trig functions on linux */ |
42 |
--#if defined(__linux__) && defined(__GNUC__) |
43 |
-+#if defined(__linux__) && defined(__GLIBC__) |
44 |
- |
45 |
- #if defined(HAVE_FEATURES_H) |
46 |
- #include <features.h> |
47 |
-@@ -96,6 +96,6 @@ |
48 |
- #endif |
49 |
- #undef TRIG_OK |
50 |
- |
51 |
--#endif /* defined(__linux__) && defined(__GNUC__) */ |
52 |
-+#endif /* defined(__linux__) && defined(__GLIBC__) */ |
53 |
- |
54 |
- #endif |
55 |
- |
56 |
|
57 |
diff --git a/dev-python/numpy/files/numpy-1.10.2-no-hardcode-blas.patch b/dev-python/numpy/files/numpy-1.10.2-no-hardcode-blas.patch |
58 |
deleted file mode 100644 |
59 |
index db4a47d..0000000 |
60 |
--- a/dev-python/numpy/files/numpy-1.10.2-no-hardcode-blas.patch |
61 |
+++ /dev/null |
62 |
@@ -1,64 +0,0 @@ |
63 |
- numpy/distutils/system_info.py | 29 +++++------------------------ |
64 |
- 1 file changed, 5 insertions(+), 24 deletions(-) |
65 |
- |
66 |
-diff --git a/numpy/distutils/system_info.py b/numpy/distutils/system_info.py |
67 |
-index d7eb49e..aa62b09 100644 |
68 |
---- a/numpy/distutils/system_info.py |
69 |
-+++ b/numpy/distutils/system_info.py |
70 |
-@@ -306,26 +306,7 @@ def get_info(name, notfound_action=0): |
71 |
- 1 - display warning message |
72 |
- 2 - raise error |
73 |
- """ |
74 |
-- cl = {'atlas': atlas_info, # use lapack_opt or blas_opt instead |
75 |
-- 'atlas_threads': atlas_threads_info, # ditto |
76 |
-- 'atlas_blas': atlas_blas_info, |
77 |
-- 'atlas_blas_threads': atlas_blas_threads_info, |
78 |
-- 'lapack_atlas': lapack_atlas_info, # use lapack_opt instead |
79 |
-- 'lapack_atlas_threads': lapack_atlas_threads_info, # ditto |
80 |
-- 'atlas_3_10': atlas_3_10_info, # use lapack_opt or blas_opt instead |
81 |
-- 'atlas_3_10_threads': atlas_3_10_threads_info, # ditto |
82 |
-- 'atlas_3_10_blas': atlas_3_10_blas_info, |
83 |
-- 'atlas_3_10_blas_threads': atlas_3_10_blas_threads_info, |
84 |
-- 'lapack_atlas_3_10': lapack_atlas_3_10_info, # use lapack_opt instead |
85 |
-- 'lapack_atlas_3_10_threads': lapack_atlas_3_10_threads_info, # ditto |
86 |
-- 'mkl': mkl_info, |
87 |
-- # openblas which may or may not have embedded lapack |
88 |
-- 'openblas': openblas_info, # use blas_opt instead |
89 |
-- # openblas with embedded lapack |
90 |
-- 'openblas_lapack': openblas_lapack_info, # use blas_opt instead |
91 |
-- 'lapack_mkl': lapack_mkl_info, # use lapack_opt instead |
92 |
-- 'blas_mkl': blas_mkl_info, # use blas_opt instead |
93 |
-- 'x11': x11_info, |
94 |
-+ cl = {'x11': x11_info, |
95 |
- 'fft_opt': fft_opt_info, |
96 |
- 'fftw': fftw_info, |
97 |
- 'fftw2': fftw2_info, |
98 |
-@@ -1690,7 +1671,7 @@ class blas_info(system_info): |
99 |
- lib = self.has_cblas(info) |
100 |
- if lib is not None: |
101 |
- info['language'] = 'c' |
102 |
-- info['libraries'] = [lib] |
103 |
-+ info['libraries'] = lib |
104 |
- info['define_macros'] = [('HAVE_CBLAS', None)] |
105 |
- self.set_info(**info) |
106 |
- |
107 |
-@@ -1722,16 +1703,16 @@ class blas_info(system_info): |
108 |
- # check for cblas lib, and if not present check for blas lib. |
109 |
- try: |
110 |
- c.link_executable(obj, os.path.join(tmpdir, "a.out"), |
111 |
-- libraries=["cblas"], |
112 |
-+ libraries=info["libraries"], |
113 |
- library_dirs=info['library_dirs'], |
114 |
- extra_postargs=info.get('extra_link_args', [])) |
115 |
-- res = "cblas" |
116 |
-+ res = info["libraries"] |
117 |
- except distutils.ccompiler.LinkError: |
118 |
- c.link_executable(obj, os.path.join(tmpdir, "a.out"), |
119 |
- libraries=["blas"], |
120 |
- library_dirs=info['library_dirs'], |
121 |
- extra_postargs=info.get('extra_link_args', [])) |
122 |
-- res = "blas" |
123 |
-+ res = ["blas"] |
124 |
- except distutils.ccompiler.CompileError: |
125 |
- res = None |
126 |
- finally: |
127 |
|
128 |
diff --git a/dev-python/numpy/metadata.xml b/dev-python/numpy/metadata.xml |
129 |
deleted file mode 100644 |
130 |
index 2890261..0000000 |
131 |
--- a/dev-python/numpy/metadata.xml |
132 |
+++ /dev/null |
133 |
@@ -1,23 +0,0 @@ |
134 |
-<?xml version="1.0" encoding="UTF-8"?> |
135 |
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
136 |
-<pkgmetadata> |
137 |
- <maintainer type="project"> |
138 |
- <email>sci@g.o</email> |
139 |
- <name>Gentoo Science Project</name> |
140 |
- </maintainer> |
141 |
- <maintainer type="project"> |
142 |
- <email>python@g.o</email> |
143 |
- <name>Python</name> |
144 |
- </maintainer> |
145 |
- <longdescription lang="en"> |
146 |
- NumPy is a general-purpose array-processing Python package designed to |
147 |
- efficiently manipulate large multi-dimensional arrays of arbitrary |
148 |
- records without sacrificing too much speed for small multi-dimensional |
149 |
- arrays. There are also basic facilities for discrete fourier transform, |
150 |
- basic linear algebra and random number generation. |
151 |
- It is the successor of Numeric and numarray. |
152 |
-</longdescription> |
153 |
- <upstream> |
154 |
- <remote-id type="pypi">numpy</remote-id> |
155 |
- </upstream> |
156 |
-</pkgmetadata> |
157 |
|
158 |
diff --git a/dev-python/numpy/numpy-1.10.4.ebuild b/dev-python/numpy/numpy-1.10.4.ebuild |
159 |
deleted file mode 100644 |
160 |
index 97be327..0000000 |
161 |
--- a/dev-python/numpy/numpy-1.10.4.ebuild |
162 |
+++ /dev/null |
163 |
@@ -1,153 +0,0 @@ |
164 |
-# Copyright 1999-2018 Gentoo Foundation |
165 |
-# Distributed under the terms of the GNU General Public License v2 |
166 |
- |
167 |
-EAPI=5 |
168 |
- |
169 |
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} ) |
170 |
-PYTHON_REQ_USE="threads(+)" |
171 |
- |
172 |
-FORTRAN_NEEDED=lapack |
173 |
- |
174 |
-inherit distutils-r1 eutils flag-o-matic fortran-2 multilib multiprocessing toolchain-funcs versionator |
175 |
- |
176 |
-DOC_PV="1.10.1" |
177 |
-DOC_P="${PN}-${DOC_PV}" |
178 |
- |
179 |
-DESCRIPTION="Fast array and numerical python library" |
180 |
-HOMEPAGE="http://www.numpy.org/" |
181 |
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz |
182 |
- doc? ( |
183 |
- http://docs.scipy.org/doc/${DOC_P}/${PN}-html-${DOC_PV}.zip |
184 |
- http://docs.scipy.org/doc/${DOC_P}/${PN}-ref-${DOC_PV}.pdf |
185 |
- http://docs.scipy.org/doc/${DOC_P}/${PN}-user-${DOC_PV}.pdf |
186 |
- )" |
187 |
-# It appears the docs haven't been upgraded, still @ 1.8.1 |
188 |
-LICENSE="BSD" |
189 |
-SLOT="0" |
190 |
-KEYWORDS="amd64 arm arm64 ~mips ppc x86" |
191 |
-IUSE="doc lapack test" |
192 |
- |
193 |
-RDEPEND=" |
194 |
- dev-python/setuptools[${PYTHON_USEDEP}] |
195 |
- lapack? ( virtual/cblas virtual/lapack )" |
196 |
-DEPEND="${RDEPEND} |
197 |
- doc? ( app-arch/unzip ) |
198 |
- lapack? ( virtual/pkgconfig ) |
199 |
- test? ( >=dev-python/nose-1.0[${PYTHON_USEDEP}] )" |
200 |
- |
201 |
-# Uses distutils.command.config. |
202 |
-DISTUTILS_IN_SOURCE_BUILD=1 |
203 |
- |
204 |
-PATCHES=( |
205 |
- "${FILESDIR}"/${PN}-1.10.2-no-hardcode-blas.patch |
206 |
- "${FILESDIR}"/${PN}-1.10.1-musl-fix.patch |
207 |
-) |
208 |
- |
209 |
-src_unpack() { |
210 |
- default |
211 |
- if use doc; then |
212 |
- unzip -qo "${DISTDIR}"/${PN}-html-${DOC_PV}.zip -d html || die |
213 |
- fi |
214 |
-} |
215 |
- |
216 |
-pc_incdir() { |
217 |
- $(tc-getPKG_CONFIG) --cflags-only-I $@ | \ |
218 |
- sed -e 's/^-I//' -e 's/[ ]*-I/:/g' -e 's/[ ]*$//' -e 's|^:||' |
219 |
-} |
220 |
- |
221 |
-pc_libdir() { |
222 |
- $(tc-getPKG_CONFIG) --libs-only-L $@ | \ |
223 |
- sed -e 's/^-L//' -e 's/[ ]*-L/:/g' -e 's/[ ]*$//' -e 's|^:||' |
224 |
-} |
225 |
- |
226 |
-pc_libs() { |
227 |
- $(tc-getPKG_CONFIG) --libs-only-l $@ | \ |
228 |
- sed -e 's/[ ]-l*\(pthread\|m\)\([ ]\|$\)//g' \ |
229 |
- -e 's/^-l//' -e 's/[ ]*-l/,/g' -e 's/[ ]*$//' \ |
230 |
- | tr ',' '\n' | sort -u | tr '\n' ',' | sed -e 's|,$||' |
231 |
-} |
232 |
- |
233 |
-python_prepare_all() { |
234 |
- if use lapack; then |
235 |
- append-ldflags "$($(tc-getPKG_CONFIG) --libs-only-other cblas lapack)" |
236 |
- local libdir="${EPREFIX}"/usr/$(get_libdir) |
237 |
- cat >> site.cfg <<-EOF |
238 |
- [blas] |
239 |
- include_dirs = $(pc_incdir cblas) |
240 |
- library_dirs = $(pc_libdir cblas blas):${libdir} |
241 |
- blas_libs = $(pc_libs cblas blas) |
242 |
- [lapack] |
243 |
- library_dirs = $(pc_libdir lapack):${libdir} |
244 |
- lapack_libs = $(pc_libs lapack) |
245 |
- EOF |
246 |
- else |
247 |
- export {ATLAS,PTATLAS,BLAS,LAPACK,MKL}=None |
248 |
- fi |
249 |
- |
250 |
- export CC="$(tc-getCC) ${CFLAGS}" |
251 |
- |
252 |
- append-flags -fno-strict-aliasing |
253 |
- |
254 |
- # See progress in http://projects.scipy.org/scipy/numpy/ticket/573 |
255 |
- # with the subtle difference that we don't want to break Darwin where |
256 |
- # -shared is not a valid linker argument |
257 |
- if [[ ${CHOST} != *-darwin* ]]; then |
258 |
- append-ldflags -shared |
259 |
- fi |
260 |
- |
261 |
- # only one fortran to link with: |
262 |
- # linking with cblas and lapack library will force |
263 |
- # autodetecting and linking to all available fortran compilers |
264 |
- append-fflags -fPIC |
265 |
- if use lapack; then |
266 |
- NUMPY_FCONFIG="config_fc --noopt --noarch" |
267 |
- # workaround bug 335908 |
268 |
- [[ $(tc-getFC) == *gfortran* ]] && NUMPY_FCONFIG+=" --fcompiler=gnu95" |
269 |
- fi |
270 |
- |
271 |
- # don't version f2py, we will handle it. |
272 |
- sed -i -e '/f2py_exe/s: + os\.path.*$::' numpy/f2py/setup.py || die |
273 |
- |
274 |
- # we don't have f2py-3.3 |
275 |
- sed \ |
276 |
- -e 's:test_f2py:_&:g' \ |
277 |
- -i numpy/tests/test_scripts.py || die |
278 |
- |
279 |
- distutils-r1_python_prepare_all |
280 |
- epatch_user |
281 |
-} |
282 |
- |
283 |
-python_compile() { |
284 |
- distutils-r1_python_compile \ |
285 |
- $(usex python_targets_python3_5 "" "-j $(makeopts_jobs)") \ |
286 |
- ${NUMPY_FCONFIG} |
287 |
-} |
288 |
- |
289 |
-python_test() { |
290 |
- distutils_install_for_testing ${NUMPY_FCONFIG} |
291 |
- |
292 |
- cd "${TMPDIR}" || die |
293 |
- ${EPYTHON} -c " |
294 |
-import numpy, sys |
295 |
-r = numpy.test(label='full', verbose=3) |
296 |
-sys.exit(0 if r.wasSuccessful() else 1)" || die "Tests fail with ${EPYTHON}" |
297 |
-} |
298 |
- |
299 |
-python_install() { |
300 |
- distutils-r1_python_install ${NUMPY_FCONFIG} |
301 |
-} |
302 |
- |
303 |
-python_install_all() { |
304 |
- DOCS+=( COMPATIBILITY DEV_README.txt THANKS.txt ) |
305 |
- |
306 |
- if use doc; then |
307 |
- HTML_DOCS=( "${WORKDIR}"/html/. ) |
308 |
- DOCS+=( "${DISTDIR}"/${PN}-{user,ref}-${DOC_PV}.pdf ) |
309 |
- fi |
310 |
- |
311 |
- distutils-r1_python_install_all |
312 |
- |
313 |
- docinto f2py |
314 |
- dodoc doc/f2py/*.txt |
315 |
- doman doc/f2py/f2py.1 |
316 |
-} |