1 |
commit: 44b83e623bb10696ec30b395774dd327e5e87925 |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Jan 30 23:19:52 2021 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Jan 30 23:19:52 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44b83e62 |
7 |
|
8 |
dev-python/numpy-python2: Remove last-rited pkg |
9 |
|
10 |
Closes: https://bugs.gentoo.org/735358 |
11 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
12 |
|
13 |
dev-python/numpy-python2/Manifest | 4 - |
14 |
.../files/numpy-1.15.4-no-hardcode-blas.patch | 76 ---------- |
15 |
...-1.16.5-setup.py-install-skip-build-fails.patch | 23 --- |
16 |
dev-python/numpy-python2/metadata.xml | 12 -- |
17 |
.../numpy-python2/numpy-python2-1.16.6.ebuild | 157 --------------------- |
18 |
profiles/package.mask | 7 - |
19 |
6 files changed, 279 deletions(-) |
20 |
|
21 |
diff --git a/dev-python/numpy-python2/Manifest b/dev-python/numpy-python2/Manifest |
22 |
deleted file mode 100644 |
23 |
index f76bbff74c9..00000000000 |
24 |
--- a/dev-python/numpy-python2/Manifest |
25 |
+++ /dev/null |
26 |
@@ -1,4 +0,0 @@ |
27 |
-DIST numpy-1.16.6.zip 5143340 BLAKE2B 2c31473551aaf00e7d3175ce37463ce0f14ff3e77bdeb71c9f85ede634880e014d4a941b1f1c1bb107f1b01217d6a68cc71d188b7ae3edf833a6fd6a9a746acb SHA512 c219841cc804c194a38b8e046b83265b8b7a35be8f33d68561ef17b085465dd11bd1e84fe1baea809af0efb09a9b13283f13728d125fcdd2221c30ec23fd0a50 |
28 |
-DIST numpy-html-1.16.6.zip 12190671 BLAKE2B c24586a40bb05fdb2f2f092778e01f7c60b17d2c695d0fb8577e988778ad80b711edf7e067a20c699946344a50febc152ab586f4653b80bcbeb489650dafbd1b SHA512 ad25e7b91b992af78a6748f12d6fcbe153d96cb8667d5dc4a6b6b2a6105e24a11c32cbf63dd3314ed4aa9b65a55ec5b3a51cd7763af5dfdd133510ddd6e4ed16 |
29 |
-DIST numpy-ref-1.16.6.pdf 5183393 BLAKE2B e92a8a7a32ab45d2fdfd6760e62d8d9b5b3f89e202a29e18ef1b6ce49ec56bbfea0e48e0c47b4c35cad02783fa1db33726a0f4fed4a50b0d8ed84babced8b79e SHA512 66dbb684f4140874d19826b479c781e16e7992a7cec46137f785f9a8fa071911966fbb3932cbcdcd040bbb5fbefac8c96d511ef623a57fc268aac9331aae8d22 |
30 |
-DIST numpy-user-1.16.6.pdf 621980 BLAKE2B ec735ff7057935d3a7f33f291792b74618f5dc10ee091c434f49c77e58f683821af9cce46286564ac9b8cb0111498f9d1b657d0c343e0a4313c3f895982dca8b SHA512 ff03719c91707a39b4bc388558838f72d4412f34dd0b07f2a0b2cf8fedac6811e8789985013cf1f23c7a650f115655f71e9cadc51ef4e7ae6e49d7552752409a |
31 |
|
32 |
diff --git a/dev-python/numpy-python2/files/numpy-1.15.4-no-hardcode-blas.patch b/dev-python/numpy-python2/files/numpy-1.15.4-no-hardcode-blas.patch |
33 |
deleted file mode 100644 |
34 |
index 979b56bd6dc..00000000000 |
35 |
--- a/dev-python/numpy-python2/files/numpy-1.15.4-no-hardcode-blas.patch |
36 |
+++ /dev/null |
37 |
@@ -1,76 +0,0 @@ |
38 |
-diff --git a/numpy/distutils/system_info.py b/numpy/distutils/system_info.py |
39 |
-index 65d7de316..a85640d30 100644 |
40 |
---- a/numpy/distutils/system_info.py |
41 |
-+++ b/numpy/distutils/system_info.py |
42 |
-@@ -364,29 +364,7 @@ def get_info(name, notfound_action=0): |
43 |
- 1 - display warning message |
44 |
- 2 - raise error |
45 |
- """ |
46 |
-- cl = {'atlas': atlas_info, # use lapack_opt or blas_opt instead |
47 |
-- 'atlas_threads': atlas_threads_info, # ditto |
48 |
-- 'atlas_blas': atlas_blas_info, |
49 |
-- 'atlas_blas_threads': atlas_blas_threads_info, |
50 |
-- 'lapack_atlas': lapack_atlas_info, # use lapack_opt instead |
51 |
-- 'lapack_atlas_threads': lapack_atlas_threads_info, # ditto |
52 |
-- 'atlas_3_10': atlas_3_10_info, # use lapack_opt or blas_opt instead |
53 |
-- 'atlas_3_10_threads': atlas_3_10_threads_info, # ditto |
54 |
-- 'atlas_3_10_blas': atlas_3_10_blas_info, |
55 |
-- 'atlas_3_10_blas_threads': atlas_3_10_blas_threads_info, |
56 |
-- 'lapack_atlas_3_10': lapack_atlas_3_10_info, # use lapack_opt instead |
57 |
-- 'lapack_atlas_3_10_threads': lapack_atlas_3_10_threads_info, # ditto |
58 |
-- 'mkl': mkl_info, |
59 |
-- # openblas which may or may not have embedded lapack |
60 |
-- 'openblas': openblas_info, # use blas_opt instead |
61 |
-- # openblas with embedded lapack |
62 |
-- 'openblas_lapack': openblas_lapack_info, # use blas_opt instead |
63 |
-- 'openblas_clapack': openblas_clapack_info, # use blas_opt instead |
64 |
-- 'blis': blis_info, # use blas_opt instead |
65 |
-- 'lapack_mkl': lapack_mkl_info, # use lapack_opt instead |
66 |
-- 'blas_mkl': blas_mkl_info, # use blas_opt instead |
67 |
-- 'accelerate': accelerate_info, # use blas_opt instead |
68 |
-- 'x11': x11_info, |
69 |
-+ cl = {'x11': x11_info, |
70 |
- 'fft_opt': fft_opt_info, |
71 |
- 'fftw': fftw_info, |
72 |
- 'fftw2': fftw2_info, |
73 |
-@@ -731,10 +709,7 @@ class system_info(object): |
74 |
- return [b for b in [a.strip() for a in libs.split(',')] if b] |
75 |
- |
76 |
- def get_libraries(self, key='libraries'): |
77 |
-- if hasattr(self, '_lib_names'): |
78 |
-- return self.get_libs(key, default=self._lib_names) |
79 |
-- else: |
80 |
-- return self.get_libs(key, '') |
81 |
-+ return self.get_libs(key, '') |
82 |
- |
83 |
- def library_extensions(self): |
84 |
- c = customized_ccompiler() |
85 |
-@@ -1685,7 +1660,7 @@ class blas_info(system_info): |
86 |
- lib = self.has_cblas(info) |
87 |
- if lib is not None: |
88 |
- info['language'] = 'c' |
89 |
-- info['libraries'] = [lib] |
90 |
-+ info['libraries'] = lib |
91 |
- info['define_macros'] = [('HAVE_CBLAS', None)] |
92 |
- self.set_info(**info) |
93 |
- |
94 |
-@@ -1717,16 +1692,16 @@ class blas_info(system_info): |
95 |
- # check for cblas lib, and if not present check for blas lib. |
96 |
- try: |
97 |
- c.link_executable(obj, os.path.join(tmpdir, "a.out"), |
98 |
-- libraries=["cblas"], |
99 |
-+ libraries=info["libraries"], |
100 |
- library_dirs=info['library_dirs'], |
101 |
- extra_postargs=info.get('extra_link_args', [])) |
102 |
-- res = "cblas" |
103 |
-+ res = info["libraries"] |
104 |
- except distutils.ccompiler.LinkError: |
105 |
- c.link_executable(obj, os.path.join(tmpdir, "a.out"), |
106 |
- libraries=["blas"], |
107 |
- library_dirs=info['library_dirs'], |
108 |
- extra_postargs=info.get('extra_link_args', [])) |
109 |
-- res = "blas" |
110 |
-+ res = ["blas"] |
111 |
- except distutils.ccompiler.CompileError: |
112 |
- res = None |
113 |
- finally: |
114 |
|
115 |
diff --git a/dev-python/numpy-python2/files/numpy-1.16.5-setup.py-install-skip-build-fails.patch b/dev-python/numpy-python2/files/numpy-1.16.5-setup.py-install-skip-build-fails.patch |
116 |
deleted file mode 100644 |
117 |
index aa141de27f4..00000000000 |
118 |
--- a/dev-python/numpy-python2/files/numpy-1.16.5-setup.py-install-skip-build-fails.patch |
119 |
+++ /dev/null |
120 |
@@ -1,23 +0,0 @@ |
121 |
-From b8e741c66f71071c3406e592e1537570731bcb35 Mon Sep 17 00:00:00 2001 |
122 |
-From: mattip <matti.picus@×××××.com> |
123 |
-Date: Sun, 26 May 2019 08:55:53 +0300 |
124 |
-Subject: [PATCH] BUG: setup.py install --skip-build fails |
125 |
- |
126 |
---- |
127 |
- numpy/distutils/command/install_clib.py | 3 +++ |
128 |
- 1 file changed, 3 insertions(+) |
129 |
- |
130 |
-diff --git a/numpy/distutils/command/install_clib.py b/numpy/distutils/command/install_clib.py |
131 |
-index 662aa00bda9..6a73f7e3308 100644 |
132 |
---- a/numpy/distutils/command/install_clib.py |
133 |
-+++ b/numpy/distutils/command/install_clib.py |
134 |
-@@ -19,6 +19,9 @@ def finalize_options(self): |
135 |
- |
136 |
- def run (self): |
137 |
- build_clib_cmd = get_cmd("build_clib") |
138 |
-+ if not build_clib_cmd.build_clib: |
139 |
-+ # can happen if the user specified `--skip-build` |
140 |
-+ build_clib_cmd.finalize_options() |
141 |
- build_dir = build_clib_cmd.build_clib |
142 |
- |
143 |
- # We need the compiler to get the library name -> filename association |
144 |
|
145 |
diff --git a/dev-python/numpy-python2/metadata.xml b/dev-python/numpy-python2/metadata.xml |
146 |
deleted file mode 100644 |
147 |
index 02598282f7e..00000000000 |
148 |
--- a/dev-python/numpy-python2/metadata.xml |
149 |
+++ /dev/null |
150 |
@@ -1,12 +0,0 @@ |
151 |
-<?xml version="1.0" encoding="UTF-8"?> |
152 |
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
153 |
-<pkgmetadata> |
154 |
- <maintainer type="project"> |
155 |
- <email>sci@g.o</email> |
156 |
- <name>Gentoo Science Project</name> |
157 |
- </maintainer> |
158 |
- <maintainer type="project"> |
159 |
- <email>python@g.o</email> |
160 |
- <name>Python</name> |
161 |
- </maintainer> |
162 |
-</pkgmetadata> |
163 |
|
164 |
diff --git a/dev-python/numpy-python2/numpy-python2-1.16.6.ebuild b/dev-python/numpy-python2/numpy-python2-1.16.6.ebuild |
165 |
deleted file mode 100644 |
166 |
index 653528daf82..00000000000 |
167 |
--- a/dev-python/numpy-python2/numpy-python2-1.16.6.ebuild |
168 |
+++ /dev/null |
169 |
@@ -1,157 +0,0 @@ |
170 |
-# Copyright 1999-2021 Gentoo Authors |
171 |
-# Distributed under the terms of the GNU General Public License v2 |
172 |
- |
173 |
-EAPI="7" |
174 |
- |
175 |
-PYTHON_COMPAT=( python2_7 ) |
176 |
-PYTHON_REQ_USE="threads(+)" |
177 |
- |
178 |
-FORTRAN_NEEDED=lapack |
179 |
- |
180 |
-inherit distutils-r1 flag-o-matic fortran-2 multiprocessing toolchain-funcs |
181 |
- |
182 |
-MY_PN="numpy" |
183 |
-DOC_PV="1.16.6" |
184 |
- |
185 |
-DESCRIPTION="Fast array and numerical python library" |
186 |
-HOMEPAGE="https://www.numpy.org" |
187 |
-SRC_URI=" |
188 |
- mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.zip |
189 |
- doc? ( |
190 |
- https://numpy.org/doc/$(ver_cut 1-2 ${DOC_PV})/numpy-html.zip -> numpy-html-${DOC_PV}.zip |
191 |
- https://numpy.org/doc/$(ver_cut 1-2 ${DOC_PV})/numpy-ref.pdf -> numpy-ref-${DOC_PV}.pdf |
192 |
- https://numpy.org/doc/$(ver_cut 1-2 ${DOC_PV})/numpy-user.pdf -> numpy-user-${DOC_PV}.pdf |
193 |
- )" |
194 |
-LICENSE="BSD" |
195 |
-SLOT="0" |
196 |
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris" |
197 |
-IUSE="doc lapack" |
198 |
-RESTRICT="test" |
199 |
- |
200 |
-RDEPEND=" |
201 |
- !<dev-python/numpy-1.17 |
202 |
- lapack? ( |
203 |
- virtual/cblas |
204 |
- virtual/lapack |
205 |
- ) |
206 |
-" |
207 |
-DEPEND="${RDEPEND}" |
208 |
- |
209 |
-BDEPEND=" |
210 |
- app-arch/unzip |
211 |
- dev-python/setuptools[${PYTHON_USEDEP}] |
212 |
- lapack? ( virtual/pkgconfig ) |
213 |
-" |
214 |
- |
215 |
-S="${WORKDIR}/${MY_PN}-${PV}" |
216 |
- |
217 |
-PATCHES=( |
218 |
- "${FILESDIR}"/${MY_PN}-1.15.4-no-hardcode-blas.patch |
219 |
- "${FILESDIR}"/numpy-1.16.5-setup.py-install-skip-build-fails.patch |
220 |
-) |
221 |
- |
222 |
-src_unpack() { |
223 |
- default |
224 |
- if use doc; then |
225 |
- unzip -qo "${DISTDIR}"/numpy-html-${DOC_PV}.zip -d html || die |
226 |
- fi |
227 |
-} |
228 |
- |
229 |
-pc_incdir() { |
230 |
- $(tc-getPKG_CONFIG) --cflags-only-I $@ | \ |
231 |
- sed -e 's/^-I//' -e 's/[ ]*-I/:/g' -e 's/[ ]*$//' -e 's|^:||' |
232 |
-} |
233 |
- |
234 |
-pc_libdir() { |
235 |
- $(tc-getPKG_CONFIG) --libs-only-L $@ | \ |
236 |
- sed -e 's/^-L//' -e 's/[ ]*-L/:/g' -e 's/[ ]*$//' -e 's|^:||' |
237 |
-} |
238 |
- |
239 |
-pc_libs() { |
240 |
- $(tc-getPKG_CONFIG) --libs-only-l $@ | \ |
241 |
- sed -e 's/[ ]-l*\(pthread\|m\)\([ ]\|$\)//g' \ |
242 |
- -e 's/^-l//' -e 's/[ ]*-l/,/g' -e 's/[ ]*$//' \ |
243 |
- | tr ',' '\n' | sort -u | tr '\n' ',' | sed -e 's|,$||' |
244 |
-} |
245 |
- |
246 |
-python_prepare_all() { |
247 |
- if use lapack; then |
248 |
- append-ldflags "$($(tc-getPKG_CONFIG) --libs-only-other cblas lapack)" |
249 |
- local incdir="${EPREFIX}"/usr/include |
250 |
- local libdir="${EPREFIX}"/usr/$(get_libdir) |
251 |
- cat >> site.cfg <<-EOF || die |
252 |
- [blas] |
253 |
- include_dirs = $(pc_incdir cblas):${incdir} |
254 |
- library_dirs = $(pc_libdir cblas blas):${libdir} |
255 |
- blas_libs = $(pc_libs cblas blas) |
256 |
- [lapack] |
257 |
- library_dirs = $(pc_libdir lapack):${libdir} |
258 |
- lapack_libs = $(pc_libs lapack) |
259 |
- EOF |
260 |
- else |
261 |
- export {ATLAS,PTATLAS,BLAS,LAPACK,MKL}=None |
262 |
- fi |
263 |
- |
264 |
- export CC="$(tc-getCC) ${CFLAGS}" |
265 |
- |
266 |
- append-flags -fno-strict-aliasing |
267 |
- |
268 |
- # See progress in http://projects.scipy.org/scipy/numpy/ticket/573 |
269 |
- # with the subtle difference that we don't want to break Darwin where |
270 |
- # -shared is not a valid linker argument |
271 |
- if [[ ${CHOST} != *-darwin* ]]; then |
272 |
- append-ldflags -shared |
273 |
- fi |
274 |
- |
275 |
- # only one fortran to link with: |
276 |
- # linking with cblas and lapack library will force |
277 |
- # autodetecting and linking to all available fortran compilers |
278 |
- append-fflags -fPIC |
279 |
- if use lapack; then |
280 |
- NUMPY_FCONFIG="config_fc --noopt --noarch" |
281 |
- # workaround bug 335908 |
282 |
- [[ $(tc-getFC) == *gfortran* ]] && NUMPY_FCONFIG+=" --fcompiler=gnu95" |
283 |
- fi |
284 |
- |
285 |
- # don't version f2py, we will handle it. |
286 |
- sed -i -e '/f2py_exe/s: + os\.path.*$::' numpy/f2py/setup.py || die |
287 |
- |
288 |
- # disable fuzzed tests |
289 |
- find numpy/*/tests -name '*.py' -exec sed -i \ |
290 |
- -e 's:def \(.*_fuzz\):def _\1:' {} + || die |
291 |
- # very memory- and disk-hungry |
292 |
- sed -i -e 's:test_large_zip:_&:' numpy/lib/tests/test_io.py || die |
293 |
- |
294 |
- distutils-r1_python_prepare_all |
295 |
-} |
296 |
- |
297 |
-python_compile() { |
298 |
- export MAKEOPTS=-j1 #660754 |
299 |
- |
300 |
- local python_makeopts_jobs="" |
301 |
- python_is_python3 || python_makeopts_jobs="-j $(makeopts_jobs)" |
302 |
- distutils-r1_python_compile \ |
303 |
- ${python_makeopts_jobs} \ |
304 |
- ${NUMPY_FCONFIG} |
305 |
-} |
306 |
- |
307 |
-python_install() { |
308 |
- # https://github.com/numpy/numpy/issues/16005 |
309 |
- local mydistutilsargs=( build_src ) |
310 |
- distutils-r1_python_install ${NUMPY_FCONFIG} |
311 |
- python_optimize |
312 |
-} |
313 |
- |
314 |
-python_install_all() { |
315 |
- local DOCS=( THANKS.txt ) |
316 |
- |
317 |
- if use doc; then |
318 |
- local HTML_DOCS=( "${WORKDIR}"/html/. ) |
319 |
- DOCS+=( "${DISTDIR}"/${MY_PN}-{user,ref}-${DOC_PV}.pdf ) |
320 |
- fi |
321 |
- |
322 |
- distutils-r1_python_install_all |
323 |
- |
324 |
- # Let latest version to provide f2py link |
325 |
- rm "${ED}"/usr/bin/f2py || die |
326 |
-} |
327 |
|
328 |
diff --git a/profiles/package.mask b/profiles/package.mask |
329 |
index 49836a57dca..b7fab6032d2 100644 |
330 |
--- a/profiles/package.mask |
331 |
+++ b/profiles/package.mask |
332 |
@@ -242,13 +242,6 @@ dev-haskell/hgettext |
333 |
# bug 762715 |
334 |
<net-irc/unrealircd-5.0.0 |
335 |
|
336 |
-# Michał Górny <mgorny@g.o> (2021-01-01) |
337 |
-# RenPy requires Python 2.7 at runtime, and py3 port has not been |
338 |
-# released yet. Even if it were, the games would probably need porting |
339 |
-# anyway. |
340 |
-# Removal in 30 days. Bug #735358. |
341 |
-dev-python/numpy-python2 |
342 |
- |
343 |
# Jonas Stein <jstein@g.o> (2020-12-29) |
344 |
# Unusable without alsa. |
345 |
# Masked for removal after 2021-02-01 |