| 1 |
commit: 3c018e22d3beb9d5075d868edbcd9712f5b13f76 |
| 2 |
Author: Aric Belsito <lluixhi <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Thu Mar 29 19:51:14 2018 +0000 |
| 4 |
Commit: Aric Belsito <lluixhi <AT> gmail <DOT> com> |
| 5 |
CommitDate: Thu Mar 29 19:51:14 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=3c018e22 |
| 7 |
|
| 8 |
dev-python/numpy: remove 1.12.1 |
| 9 |
|
| 10 |
1.13.3 in the tree works |
| 11 |
|
| 12 |
dev-python/numpy/Manifest | 4 - |
| 13 |
.../numpy/files/numpy-1.11.1-no-xlocale.patch | 11 -- |
| 14 |
.../files/numpy-1.11.2-blas_rec_inc_dir.patch | 24 --- |
| 15 |
.../files/numpy-1.12.1-no-hardcode-blas.patch | 72 --------- |
| 16 |
dev-python/numpy/numpy-1.12.1.ebuild | 165 --------------------- |
| 17 |
5 files changed, 276 deletions(-) |
| 18 |
|
| 19 |
diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest |
| 20 |
index 9805205..2150cf4 100644 |
| 21 |
--- a/dev-python/numpy/Manifest |
| 22 |
+++ b/dev-python/numpy/Manifest |
| 23 |
@@ -1,8 +1,4 @@ |
| 24 |
DIST numpy-1.10.4.tar.gz 4069996 SHA256 7356e98fbcc529e8d540666f5a919912752e569150e9a4f8d869c686f14c720b SHA512 57ace46e357d49be0efd904e5ceb9862c626c916987c8798a12de7ae1e06816ad8483439ac4619792a04889631b5998f2397dc601c78dea33a784b4831c19c79 WHIRLPOOL 76946c2543b1cade06d71f83fd507bd818c1090baa9c3ddda7d1f48d48ed23672c5d9de76db890df990c6d8b7b26b71d3ce733c448943ad4177374a957360d1c |
| 25 |
-DIST numpy-1.12.1.zip 4824784 SHA256 a65266a4ad6ec8936a1bc85ce51f8600634a31a258b722c9274a80ff189d9542 SHA512 156319821e4f0cf8d820e977da704aab274b7a4a4b792f6e40d7c0f2827700c990f55f1ca9650523c62c9e937f0e75f336d091d46ca47aaa9875c68fe32bac2a WHIRLPOOL 1ecd1df77d2a64bc6db1910446f60b477ebf5a1cf33ec2e1fced56dbbf1a7df5fef004c7f84f0dccb0ca20ea7ab73c384e4d247eb9700159a18c9a4a51e4db6d |
| 26 |
DIST numpy-html-1.10.1.zip 9663942 SHA256 4af48eb5abf2551f01d85aea7e9a99a30096777f02937dc185b16bb72a110366 SHA512 9d1f3619b801c88604a0495290da4ae8cfb4800257d549214363c554c1dc09a736425d594ed88f492afee6ae7c68fe5c166b9b3a8f24637ea41d67fd23b9d9f9 WHIRLPOOL d6c93e31e31c832fb21f117d03719e0375ee3d27fb6f7975bfcd12469df4a2ed0a25a16bd09a0e2113407446efc220e5bff534f7cd76a715c3d7df26c02f07a1 |
| 27 |
-DIST numpy-html-1.11.0.zip 9879611 SHA256 0244bff4b585ab417be963f492e69129e54bb83d630b463591f9e89c62807d85 SHA512 7bf416030c273c767a98d0f23adef0e5fd05f96f6bb911e32ec88821a5bc7c47a2799d33fb0706cb2d391ea6e47b3e0eef0d789eb1c0d81c982cfaa991a09822 WHIRLPOOL d7e81340aa1ec46c2b0d36b76e7a1e11ba7d1b39177a8168efe734936e1622808c8997a8cc22f773b9c3e17b51f5861e11eaf7fa89e9b0c61cae937ee7b5fdba |
| 28 |
DIST numpy-ref-1.10.1.pdf 5382006 SHA256 72ae03348d0375ff2f18056efd04e815cc1d27b738d0685c80f5204a496bc279 SHA512 25085eb7cb80343abffe04ee01ea93603427913ba4443fbfdaa1ef1ad07a8642c47259d0bb1cb91a9059f786c03395bba76f608c6f0a2fd26d1afec4847d885c WHIRLPOOL d904d9b2824bfb08a0eeffeb37f7d646d003c39230d950d387e2ddc8e475a117b8305a0ce3dc479be72f010b1a868f22ddfde17e6c4cd7c56630bbdf09afb90e |
| 29 |
-DIST numpy-ref-1.11.0.pdf 5310792 SHA256 a975923b98f4dbd5a4736ab1c74a1c6393f422e3d1f9184bae2f12f041e3ac3e SHA512 a6bed225428645382846fcd60bc7961a44b0dc24cbfab3b4d0a1cee53092860f9db6226faf6597241ad6b9d6034837aace11214e0fc0c338702a574a9acf28df WHIRLPOOL c8757da7b11e4c47813112870dc96868d7bc6886d9454c0d18c6f8cad12c00a2185288233ffc41b580e9e232a1eaa4a19776055cff017ae56ff483fff0da1af1 |
| 30 |
DIST numpy-user-1.10.1.pdf 406114 SHA256 5180a5a1333365e474aabba9d6edd25276e79179fd708bb3989d95dc4e76215f SHA512 998bce3777944e7b366c619e968ac4b6cc4351cd2819d6ecba7f422e20b6cd4d7332a8dede4036cd12e85b24c4c3d973bd9ef2d407610369c2591fce990fa8f4 WHIRLPOOL 4b53256663840738d288d38c4151e01ecfb515ebd4f69bb4330f4c5589642b3392a0a300f3def53df6bee8746f127a3af0d284601f288f4c4292df8b6de39f71 |
| 31 |
-DIST numpy-user-1.11.0.pdf 555403 SHA256 7ea6d24169d9e19d20ff131378d2bb5cd8b41658f242c87a1ffc53c3ac2e4b59 SHA512 8287acea5f6981119dfe223ff9cd2fd14f504b9a70418426ab716b80aea670b30249fbd727664ebf72d6d0660a84a57ff027a42cfe67946a7737a4308eebd786 WHIRLPOOL c72ad351a7f5cbd9c123c9d28c8178c7e463ee74e547a415d65dd6a5854fed090d86f9daa088eb79b48ca40e71d0ced5bc7cf938f631aece1846ae7eea9879b4 |
| 32 |
|
| 33 |
diff --git a/dev-python/numpy/files/numpy-1.11.1-no-xlocale.patch b/dev-python/numpy/files/numpy-1.11.1-no-xlocale.patch |
| 34 |
deleted file mode 100644 |
| 35 |
index 59b4378..0000000 |
| 36 |
--- a/dev-python/numpy/files/numpy-1.11.1-no-xlocale.patch |
| 37 |
+++ /dev/null |
| 38 |
@@ -1,11 +0,0 @@ |
| 39 |
-diff -Naur numpy-1.11.1.orig/numpy/core/src/multiarray/numpyos.c numpy-1.11.1/numpy/core/src/multiarray/numpyos.c |
| 40 |
---- numpy-1.11.1.orig/numpy/core/src/multiarray/numpyos.c 2016-06-25 16:59:40.000000000 -0700 |
| 41 |
-+++ numpy-1.11.1/numpy/core/src/multiarray/numpyos.c 2016-08-30 13:51:30.607025309 -0700 |
| 42 |
-@@ -15,7 +15,6 @@ |
| 43 |
- |
| 44 |
- #ifdef HAVE_STRTOLD_L |
| 45 |
- #include <stdlib.h> |
| 46 |
--#include <xlocale.h> |
| 47 |
- #endif |
| 48 |
- |
| 49 |
- |
| 50 |
|
| 51 |
diff --git a/dev-python/numpy/files/numpy-1.11.2-blas_rec_inc_dir.patch b/dev-python/numpy/files/numpy-1.11.2-blas_rec_inc_dir.patch |
| 52 |
deleted file mode 100644 |
| 53 |
index 9a934cc..0000000 |
| 54 |
--- a/dev-python/numpy/files/numpy-1.11.2-blas_rec_inc_dir.patch |
| 55 |
+++ /dev/null |
| 56 |
@@ -1,24 +0,0 @@ |
| 57 |
-commit 61e9159569a601315b67c30b6e26bbb2149c0bfa |
| 58 |
-Author: Benda Xu <heroxbd@g.o> |
| 59 |
-Date: Wed Feb 15 11:17:05 2017 +0900 |
| 60 |
- |
| 61 |
- BUG: blas_info should record include_dirs |
| 62 |
- |
| 63 |
- blas specified in site.cfg could have non-standard include dirs. |
| 64 |
- It should be read and saved in distutils/__config__.py |
| 65 |
- |
| 66 |
-PR: https://github.com/numpy/numpy/pull/8619 |
| 67 |
- |
| 68 |
-diff --git a/numpy/distutils/system_info.py b/numpy/distutils/system_info.py |
| 69 |
-index b8520ac..0fba865 100644 |
| 70 |
---- a/numpy/distutils/system_info.py |
| 71 |
-+++ b/numpy/distutils/system_info.py |
| 72 |
-@@ -1667,6 +1667,8 @@ class blas_info(system_info): |
| 73 |
- info = self.check_libs(lib_dirs, blas_libs, []) |
| 74 |
- if info is None: |
| 75 |
- return |
| 76 |
-+ else: |
| 77 |
-+ info['include_dirs'] = self.get_include_dirs() |
| 78 |
- if platform.system() == 'Windows': |
| 79 |
- # The check for windows is needed because has_cblas uses the |
| 80 |
- # same compiler that was used to compile Python and msvc is |
| 81 |
|
| 82 |
diff --git a/dev-python/numpy/files/numpy-1.12.1-no-hardcode-blas.patch b/dev-python/numpy/files/numpy-1.12.1-no-hardcode-blas.patch |
| 83 |
deleted file mode 100644 |
| 84 |
index 81d6084..0000000 |
| 85 |
--- a/dev-python/numpy/files/numpy-1.12.1-no-hardcode-blas.patch |
| 86 |
+++ /dev/null |
| 87 |
@@ -1,72 +0,0 @@ |
| 88 |
---- numpy-1.11.1/numpy/distutils/system_info.py |
| 89 |
-+++ numpy-1.11.1/numpy/distutils/system_info.py |
| 90 |
-@@ -312,27 +312,7 @@ |
| 91 |
- 1 - display warning message |
| 92 |
- 2 - raise error |
| 93 |
- """ |
| 94 |
-- cl = {'atlas': atlas_info, # use lapack_opt or blas_opt instead |
| 95 |
-- 'atlas_threads': atlas_threads_info, # ditto |
| 96 |
-- 'atlas_blas': atlas_blas_info, |
| 97 |
-- 'atlas_blas_threads': atlas_blas_threads_info, |
| 98 |
-- 'lapack_atlas': lapack_atlas_info, # use lapack_opt instead |
| 99 |
-- 'lapack_atlas_threads': lapack_atlas_threads_info, # ditto |
| 100 |
-- 'atlas_3_10': atlas_3_10_info, # use lapack_opt or blas_opt instead |
| 101 |
-- 'atlas_3_10_threads': atlas_3_10_threads_info, # ditto |
| 102 |
-- 'atlas_3_10_blas': atlas_3_10_blas_info, |
| 103 |
-- 'atlas_3_10_blas_threads': atlas_3_10_blas_threads_info, |
| 104 |
-- 'lapack_atlas_3_10': lapack_atlas_3_10_info, # use lapack_opt instead |
| 105 |
-- 'lapack_atlas_3_10_threads': lapack_atlas_3_10_threads_info, # ditto |
| 106 |
-- 'mkl': mkl_info, |
| 107 |
-- # openblas which may or may not have embedded lapack |
| 108 |
-- 'openblas': openblas_info, # use blas_opt instead |
| 109 |
-- # openblas with embedded lapack |
| 110 |
-- 'openblas_lapack': openblas_lapack_info, # use blas_opt instead |
| 111 |
-- 'blis': blis_info, # use blas_opt instead |
| 112 |
-- 'lapack_mkl': lapack_mkl_info, # use lapack_opt instead |
| 113 |
-- 'blas_mkl': blas_mkl_info, # use blas_opt instead |
| 114 |
-- 'x11': x11_info, |
| 115 |
-+ cl = {'x11': x11_info, |
| 116 |
- 'fft_opt': fft_opt_info, |
| 117 |
- 'fftw': fftw_info, |
| 118 |
- 'fftw2': fftw2_info, |
| 119 |
-@@ -669,10 +650,7 @@ |
| 120 |
- return [b for b in [a.strip() for a in libs.split(',')] if b] |
| 121 |
- |
| 122 |
- def get_libraries(self, key='libraries'): |
| 123 |
-- if hasattr(self, '_lib_names'): |
| 124 |
-- return self.get_libs(key, default=self._lib_names) |
| 125 |
-- else: |
| 126 |
-- return self.get_libs(key, '') |
| 127 |
-+ return self.get_libs(key, '') |
| 128 |
- |
| 129 |
- def library_extensions(self): |
| 130 |
- static_exts = ['.a'] |
| 131 |
-@@ -1685,7 +1663,7 @@ |
| 132 |
- lib = self.has_cblas(info) |
| 133 |
- if lib is not None: |
| 134 |
- info['language'] = 'c' |
| 135 |
-- info['libraries'] = [lib] |
| 136 |
-+ info['libraries'] = lib |
| 137 |
- info['define_macros'] = [('HAVE_CBLAS', None)] |
| 138 |
- self.set_info(**info) |
| 139 |
- |
| 140 |
-@@ -1718,16 +1696,16 @@ |
| 141 |
- # check for cblas lib, and if not present check for blas lib. |
| 142 |
- try: |
| 143 |
- c.link_executable(obj, os.path.join(tmpdir, "a.out"), |
| 144 |
-- libraries=["cblas"], |
| 145 |
-+ libraries=info["libraries"], |
| 146 |
- library_dirs=info['library_dirs'], |
| 147 |
- extra_postargs=info.get('extra_link_args', [])) |
| 148 |
-- res = "cblas" |
| 149 |
-+ res = info["libraries"] |
| 150 |
- except distutils.ccompiler.LinkError: |
| 151 |
- c.link_executable(obj, os.path.join(tmpdir, "a.out"), |
| 152 |
- libraries=["blas"], |
| 153 |
- library_dirs=info['library_dirs'], |
| 154 |
- extra_postargs=info.get('extra_link_args', [])) |
| 155 |
-- res = "blas" |
| 156 |
-+ res = ["blas"] |
| 157 |
- except distutils.ccompiler.CompileError: |
| 158 |
- res = None |
| 159 |
- finally: |
| 160 |
|
| 161 |
diff --git a/dev-python/numpy/numpy-1.12.1.ebuild b/dev-python/numpy/numpy-1.12.1.ebuild |
| 162 |
deleted file mode 100644 |
| 163 |
index 1f23adb..0000000 |
| 164 |
--- a/dev-python/numpy/numpy-1.12.1.ebuild |
| 165 |
+++ /dev/null |
| 166 |
@@ -1,165 +0,0 @@ |
| 167 |
-# Copyright 1999-2017 Gentoo Foundation |
| 168 |
-# Distributed under the terms of the GNU General Public License v2 |
| 169 |
- |
| 170 |
-EAPI=6 |
| 171 |
- |
| 172 |
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} ) |
| 173 |
-PYTHON_REQ_USE="threads(+)" |
| 174 |
- |
| 175 |
-FORTRAN_NEEDED=lapack |
| 176 |
- |
| 177 |
-inherit distutils-r1 flag-o-matic fortran-2 multiprocessing toolchain-funcs versionator |
| 178 |
- |
| 179 |
-DOC_PV="1.11.0" |
| 180 |
-DOC_P="${PN}-${DOC_PV}" |
| 181 |
- |
| 182 |
-DESCRIPTION="Fast array and numerical python library" |
| 183 |
-HOMEPAGE="http://www.numpy.org/" |
| 184 |
-SRC_URI=" |
| 185 |
- mirror://pypi/${PN:0:1}/${PN}/${P}.zip |
| 186 |
- doc? ( |
| 187 |
- http://docs.scipy.org/doc/${DOC_P}/${PN}-html-${DOC_PV}.zip |
| 188 |
- http://docs.scipy.org/doc/${DOC_P}/${PN}-ref-${DOC_PV}.pdf |
| 189 |
- http://docs.scipy.org/doc/${DOC_P}/${PN}-user-${DOC_PV}.pdf |
| 190 |
- )" |
| 191 |
-# It appears the docs haven't been upgraded, still @ 1.11.0 |
| 192 |
-LICENSE="BSD" |
| 193 |
-SLOT="0" |
| 194 |
-KEYWORDS="~amd64 ~arm ~ia64 ~mips ~ppc ~sh ~sparc ~x86" |
| 195 |
-IUSE="doc lapack test" |
| 196 |
- |
| 197 |
-RDEPEND="lapack? ( virtual/cblas virtual/lapack )" |
| 198 |
-DEPEND="${RDEPEND} |
| 199 |
- dev-python/setuptools[${PYTHON_USEDEP}] |
| 200 |
- doc? ( app-arch/unzip ) |
| 201 |
- lapack? ( virtual/pkgconfig ) |
| 202 |
- test? ( >=dev-python/nose-1.0[${PYTHON_USEDEP}] )" |
| 203 |
- |
| 204 |
-PATCHES=( |
| 205 |
- "${FILESDIR}"/${P}-no-hardcode-blas.patch |
| 206 |
- "${FILESDIR}"/${PN}-1.11.2-blas_rec_inc_dir.patch |
| 207 |
- "${FILESDIR}"/${PN}-1.11.1-no-xlocale.patch |
| 208 |
-) |
| 209 |
- |
| 210 |
-src_unpack() { |
| 211 |
- default |
| 212 |
- if use doc; then |
| 213 |
- unzip -qo "${DISTDIR}"/${PN}-html-${DOC_PV}.zip -d html || die |
| 214 |
- fi |
| 215 |
-} |
| 216 |
- |
| 217 |
-pc_incdir() { |
| 218 |
- $(tc-getPKG_CONFIG) --cflags-only-I $@ | \ |
| 219 |
- sed -e 's/^-I//' -e 's/[ ]*-I/:/g' -e 's/[ ]*$//' -e 's|^:||' |
| 220 |
-} |
| 221 |
- |
| 222 |
-pc_libdir() { |
| 223 |
- $(tc-getPKG_CONFIG) --libs-only-L $@ | \ |
| 224 |
- sed -e 's/^-L//' -e 's/[ ]*-L/:/g' -e 's/[ ]*$//' -e 's|^:||' |
| 225 |
-} |
| 226 |
- |
| 227 |
-pc_libs() { |
| 228 |
- $(tc-getPKG_CONFIG) --libs-only-l $@ | \ |
| 229 |
- sed -e 's/[ ]-l*\(pthread\|m\)\([ ]\|$\)//g' \ |
| 230 |
- -e 's/^-l//' -e 's/[ ]*-l/,/g' -e 's/[ ]*$//' \ |
| 231 |
- | tr ',' '\n' | sort -u | tr '\n' ',' | sed -e 's|,$||' |
| 232 |
-} |
| 233 |
- |
| 234 |
-python_prepare_all() { |
| 235 |
- if use lapack; then |
| 236 |
- append-ldflags "$($(tc-getPKG_CONFIG) --libs-only-other cblas lapack)" |
| 237 |
- local libdir="${EPREFIX}"/usr/$(get_libdir) |
| 238 |
- cat >> site.cfg <<-EOF || die |
| 239 |
- [blas] |
| 240 |
- include_dirs = $(pc_incdir cblas) |
| 241 |
- library_dirs = $(pc_libdir cblas blas):${libdir} |
| 242 |
- blas_libs = $(pc_libs cblas blas) |
| 243 |
- [lapack] |
| 244 |
- library_dirs = $(pc_libdir lapack):${libdir} |
| 245 |
- lapack_libs = $(pc_libs lapack) |
| 246 |
- EOF |
| 247 |
- else |
| 248 |
- export {ATLAS,PTATLAS,BLAS,LAPACK,MKL}=None |
| 249 |
- fi |
| 250 |
- |
| 251 |
- export CC="$(tc-getCC) ${CFLAGS}" |
| 252 |
- |
| 253 |
- append-flags -fno-strict-aliasing |
| 254 |
- |
| 255 |
- # See progress in http://projects.scipy.org/scipy/numpy/ticket/573 |
| 256 |
- # with the subtle difference that we don't want to break Darwin where |
| 257 |
- # -shared is not a valid linker argument |
| 258 |
- if [[ ${CHOST} != *-darwin* ]]; then |
| 259 |
- append-ldflags -shared |
| 260 |
- fi |
| 261 |
- |
| 262 |
- # only one fortran to link with: |
| 263 |
- # linking with cblas and lapack library will force |
| 264 |
- # autodetecting and linking to all available fortran compilers |
| 265 |
- append-fflags -fPIC |
| 266 |
- if use lapack; then |
| 267 |
- NUMPY_FCONFIG="config_fc --noopt --noarch" |
| 268 |
- # workaround bug 335908 |
| 269 |
- [[ $(tc-getFC) == *gfortran* ]] && NUMPY_FCONFIG+=" --fcompiler=gnu95" |
| 270 |
- fi |
| 271 |
- |
| 272 |
- # don't version f2py, we will handle it. |
| 273 |
- sed -i -e '/f2py_exe/s: + os\.path.*$::' numpy/f2py/setup.py || die |
| 274 |
- |
| 275 |
- # we don't have f2py-3.3 |
| 276 |
- sed \ |
| 277 |
- -e 's:test_f2py:_&:g' \ |
| 278 |
- -i numpy/tests/test_scripts.py || die |
| 279 |
- |
| 280 |
- # QA bug 590464 |
| 281 |
- # The .py files from numpy/core/tests are just added, instead |
| 282 |
- # of being bytecode compiled as a proper subdir package. |
| 283 |
- # We trick the buildsystem into accepting it as a bytecode |
| 284 |
- # package by adding a setup.py and an empty __init__.py |
| 285 |
- #cp numpy/{compat/setup.py,core/tests} || die |
| 286 |
- #touch numpy/core/tests/__init__.py || die |
| 287 |
- #sed \ |
| 288 |
- # -e 's:compat:tests:' \ |
| 289 |
- # -i numpy/core/tests/setup.py || die |
| 290 |
- #sed \ |
| 291 |
- # -e "s:config\.add_data_dir('tests'):config\.add_subpackage('tests'):" \ |
| 292 |
- # -i numpy/core/setup.py || die |
| 293 |
- |
| 294 |
- distutils-r1_python_prepare_all |
| 295 |
-} |
| 296 |
- |
| 297 |
-python_compile() { |
| 298 |
- distutils-r1_python_compile \ |
| 299 |
- $(usex python_targets_python3_5 "" "-j $(makeopts_jobs)") \ |
| 300 |
- ${NUMPY_FCONFIG} |
| 301 |
-} |
| 302 |
- |
| 303 |
-python_test() { |
| 304 |
- distutils_install_for_testing --single-version-externally-managed --record "${TMPDIR}/record.txt" ${NUMPY_FCONFIG} |
| 305 |
- |
| 306 |
- cd "${TMPDIR}" || die |
| 307 |
- |
| 308 |
- ${EPYTHON} -c " |
| 309 |
-import numpy, sys |
| 310 |
-r = numpy.test(label='full', verbose=3) |
| 311 |
-sys.exit(0 if r.wasSuccessful() else 1)" || die "Tests fail with ${EPYTHON}" |
| 312 |
-} |
| 313 |
- |
| 314 |
-python_install() { |
| 315 |
- distutils-r1_python_install ${NUMPY_FCONFIG} |
| 316 |
-} |
| 317 |
- |
| 318 |
-python_install_all() { |
| 319 |
- DOCS+=( THANKS.txt ) |
| 320 |
- |
| 321 |
- if use doc; then |
| 322 |
- HTML_DOCS=( "${WORKDIR}"/html/. ) |
| 323 |
- DOCS+=( "${DISTDIR}"/${PN}-{user,ref}-${DOC_PV}.pdf ) |
| 324 |
- fi |
| 325 |
- |
| 326 |
- distutils-r1_python_install_all |
| 327 |
- |
| 328 |
- docinto f2py |
| 329 |
- dodoc doc/f2py/*.txt |
| 330 |
- doman doc/f2py/f2py.1 |
| 331 |
-} |
Archives