| 1 |
commit: 052af06fde103f99aa77499bd5b76dc3ae95b933 |
| 2 |
Author: Benda Xu <heroxbd <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Jun 24 04:30:36 2019 +0000 |
| 4 |
Commit: Benda XU <heroxbd <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Jun 24 04:31:11 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=052af06f |
| 7 |
|
| 8 |
dev-python/numpy: add back numpy-1.8.2. |
| 9 |
|
| 10 |
It is a reverse dependency of dev-python/scientificpython and |
| 11 |
sci-libs/mmtk. |
| 12 |
|
| 13 |
Package-Manager: Portage-2.3.52, Repoman-2.3.12 |
| 14 |
Signed-off-by: Benda Xu <heroxbd <AT> gentoo.org> |
| 15 |
|
| 16 |
dev-python/numpy/Manifest | 4 + |
| 17 |
.../numpy/files/numpy-1.8.0-no-hardcode-blas.patch | 25 ++++ |
| 18 |
dev-python/numpy/numpy-1.8.2.ebuild | 146 +++++++++++++++++++++ |
| 19 |
3 files changed, 175 insertions(+) |
| 20 |
|
| 21 |
diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest |
| 22 |
index f080e969086..7df64371849 100644 |
| 23 |
--- a/dev-python/numpy/Manifest |
| 24 |
+++ b/dev-python/numpy/Manifest |
| 25 |
@@ -1,12 +1,16 @@ |
| 26 |
DIST numpy-1.14.5.zip 4904624 BLAKE2B 14d266bf1139b9539e39d08a6537e2b772e80bf46a0769cbb06b63ba54858c9284f6d0e8a19627a4d99f2c2638e9a4031bf4d4aaf773eaf34b7203d131636dc0 SHA512 e131f9fa815084e334b59c5d9abd8de0088ad1dfefecf8615ad7deca0b54b0dfa0446c8de99c90670ea9fcabea9980bd171618a5b9032c1937b597a5ce363c5b |
| 27 |
DIST numpy-1.15.4.zip 4473522 BLAKE2B c030ef4a06c84091eec11b6602422468bd0674489a2c7fea1230132cd3a3ca1b10ec87eeb6788f2f263943f9ac43026dc1e7f0f5f1d52e9d1cc6934a5d361090 SHA512 9e0516da04368f0353fb7e3cc2c72e1ec936042908309732a298405bd7111e712899627b82f3674295b611e0ebfd74ef91d693f065fe9cb03dc7de23d1e72676 |
| 28 |
DIST numpy-1.16.1.zip 5070040 BLAKE2B 0429d27d88ec97e207822c9c7fa759453bbef97d1d5fdf3e68dab21ca098a6321e2e57d85561dd99084d190b8ed6fce20f00b421c8d14a249fc45dc1ea09569e SHA512 e4adce4f40a3cb6ac482f82db9fcd079179b03b0e878920cfc7d98b9f622adab997c68af892b209f417d5f31b4123a1c5ff5c07cf5b0aaa496d8be6c8354bde8 |
| 29 |
+DIST numpy-1.8.2.tar.gz 3792998 BLAKE2B 00d22c72ab6f919626d3fba0edc477fb9c19f9c299f78cff6102e1860e3d1baec8f3b17aa23be797e9a34630428174de3f3b630c3f05c5340024dc6314fad8cd SHA512 996e6b8e2d42f223e44660f56bf73eb8ab124f400d89218f8f5e4d7c9860ada44a4d7c54526137b0695c7a10f36e8834fbf0d42b7cb20bcdb5d5c245d673385c |
| 30 |
DIST numpy-html-1.14.5.zip 11197881 BLAKE2B 00cac3c5be07f644328acd9ed155a6fc07ed7d7380584732bb3ac03562c8705cd152612f461d5dc251dabe0be4ba45593165a961496e351110e1aa7598c37370 SHA512 578d31660de4e1f57310b3a2137cefea17228f40046eef1689fb6d9302f0fe0fda5aaf473c3b8c69ae781049950022321593ec891a5640e3c36c886ab3bf4383 |
| 31 |
DIST numpy-html-1.15.4.zip 11158615 BLAKE2B eb264cd51fd61b389e858300d96be63f8e2eeaa0b7346beac571b62d96867d6820c19d5043a6f81088dc52b1e4d7f3f295e02ff5ff90351b0feccf657ce90001 SHA512 1cad60013f374f456bbb1fb6161545a94e252205c28054f9b33cde65330772ab243339289517a8825957a21e210455d33bcc0b9c588052c49c88257b1b04facb |
| 32 |
DIST numpy-html-1.16.1.zip 12132467 BLAKE2B 050a8cba160e36a4c547f1b67b8ab2b9220c9841a9f8343dce6f3221313505530a1687efa2116384a03d3bc9172a0298b4ea5ece2f423841d595e45f565ccbc2 SHA512 5af356313363e00f05db560902cc7578162c7d2ab9c1ef0f3713854682b63d76297d55eb9aac0dfc7f4b687ccea93a53462e2082ef1270e29e19680e1222b34d |
| 33 |
+DIST numpy-html-1.8.1.zip 9703711 BLAKE2B 1f9d9cb4e65fc2f03d07da9bc34de9c8c4f93f5267689abccb0e2383b23babfed52ae6c3969738e78eeca7b32f49c90f9f7bb92dd432a6b87e082b67c1f214a5 SHA512 1d52c657931f4eebb5325159444aedd969b201f5098855058f1ef632dc8677372d632291154ebc3db9869cdb8abf7eb820eade1a9edba2d6be1ae918cb38c071 |
| 34 |
DIST numpy-ref-1.14.5.pdf 4855150 BLAKE2B aa924542346bd06b1aa8b11ceb8eb5de936cfdccc10a8339720a297e27b5b34961044eb8db8dd7b9a19ba93b3cbf76ec278a9a50724653aafd2b9d57a00007f2 SHA512 717f58fcb1aa66ecc5f5d4c11c9923d2beb21a1b1a0ca1e46f3622c69f1122fd0547b7f7abaf6de008e2aa988b2453af3c2590877f5596fb6642479ece651746 |
| 35 |
DIST numpy-ref-1.15.4.pdf 4843444 BLAKE2B 26154930a8c881f49e7eb7d9540d1deba27baed1acb15dbacd42a659c05f50605cd44b63b2474e66d1d22851145cc65b3e3f26302f8966e141cbd2afc666c654 SHA512 aebff74389e785bd588ccc287329aea4dbc3ef51b46fbffdf088853342fea724f79f712733e453877949e756a52e89de3b257e5feba86e830df84ed8f9bb0e30 |
| 36 |
DIST numpy-ref-1.16.1.pdf 5175448 BLAKE2B 5cd692a0fc825216560dbbf48738a49b794973d4539bd778f0f9a2f7f72b32d3061675f9a76db4cbfbb38eec0793c70046180fcb07e23ffc6177dee76b16bb92 SHA512 6cad03e30d7c2204fb899f4e4d1167fefade60d20dedf0ea87ac15c70139fbcca8789cdf17af5a2d221ba06eb78e9376b4b542621f9d78772041c83ab2405d1a |
| 37 |
+DIST numpy-ref-1.8.1.pdf 5348248 BLAKE2B f087fbbd3c789adebd2902db0a2acc8a8748ccbb5a1e7e064effdc91e92c7dcf087ae36436fc52d7afa12a12ca2fc0f5f5617177bcd8b9745a7155acd10d71fc SHA512 340dd8f47430f24fea81bb3a8674e1a58f4290a9d1c5d64bac96d50b31a94a770e78381e42daf8b0a6a90cefe5cafe86b0c89f7cc7635a042a7e85eb74bdbdf5 |
| 38 |
DIST numpy-user-1.14.5.pdf 574418 BLAKE2B 80738f1760932fa74b07334d1a355ba3ce319e0b03fe1428d0b3497466fa1164ccbad84969cb7bc8daebb5525094f0d0c7710e1d661b1c6bbaca0669bfcbf875 SHA512 fb00305408c56ee203ed71ac042474592e7e933f14a639f6dce0f6dc80206c13b844c2425a919f9072a114c7af2c2f9f85b78a07ba3874259e5d173290e51a13 |
| 39 |
DIST numpy-user-1.15.4.pdf 596191 BLAKE2B 1387b7aac9cccba4b7ce259391f56372959db35c4ddce111afb9949347ebcf3290e7d3fb5b1b2d2e7850911259cddb07edfe104c1396ae8e31a58a81e9293f16 SHA512 2089753b48412f094b279c378be1d221ec9b171957171a4e26b4589d594e00b4f66b6f8a88a7eb665e8c3fa3e6ed505d63da80d4d01ced041544b97ea56fe212 |
| 40 |
DIST numpy-user-1.16.1.pdf 592508 BLAKE2B 88ef7aac2998fd8eeebc3ab92df9ad9ba139b67ab0442cd4ed91cdc7b1cd72acf7905468118df25634640b709106758455c7d316539b941d7760010b8135fafa SHA512 d089b4c663f92c38aa075c37974df757bdc457f75980737477a4477f67311d28149bc4c20f5d1cd0877221a78e5a9ff10702b1ebcc8ab062d328cdda4087d0f7 |
| 41 |
+DIST numpy-user-1.8.1.pdf 408305 BLAKE2B 2956e42ebad45b021f72c7e71d357d953ea8a26639b4c6e81dbe1718052304ac5ce1a7f96646d94ad48bf737ddc6962fcbc304e31dfce32b85cb8165b0ada6e0 SHA512 9e646e89e7e67834fa596e43082b43842d1c59287d22fd8d20c9f0a1d3d56a518a08cc2c036de4972ad0d6d9d3c2f56e2210f76e7244d3f7547b5204d84d3c7c |
| 42 |
|
| 43 |
diff --git a/dev-python/numpy/files/numpy-1.8.0-no-hardcode-blas.patch b/dev-python/numpy/files/numpy-1.8.0-no-hardcode-blas.patch |
| 44 |
new file mode 100644 |
| 45 |
index 00000000000..eaf30dd8e13 |
| 46 |
--- /dev/null |
| 47 |
+++ b/dev-python/numpy/files/numpy-1.8.0-no-hardcode-blas.patch |
| 48 |
@@ -0,0 +1,25 @@ |
| 49 |
+patch to allow any blas (c or f77) to simulate the |
| 50 |
+special treatment atlas libs have in numpy. |
| 51 |
+2013: numpy.distutils still horrendous code |
| 52 |
+ |
| 53 |
+--- numpy/distutils/system_info.py.orig 2013-11-25 19:54:45.760217851 -0800 |
| 54 |
++++ numpy/distutils/system_info.py 2013-11-25 20:00:26.575310888 -0800 |
| 55 |
+@@ -293,17 +293,7 @@ |
| 56 |
+ 1 - display warning message |
| 57 |
+ 2 - raise error |
| 58 |
+ """ |
| 59 |
+- cl = {'atlas': atlas_info, # use lapack_opt or blas_opt instead |
| 60 |
+- 'atlas_threads': atlas_threads_info, # ditto |
| 61 |
+- 'atlas_blas': atlas_blas_info, |
| 62 |
+- 'atlas_blas_threads': atlas_blas_threads_info, |
| 63 |
+- 'lapack_atlas': lapack_atlas_info, # use lapack_opt instead |
| 64 |
+- 'lapack_atlas_threads': lapack_atlas_threads_info, # ditto |
| 65 |
+- 'mkl': mkl_info, |
| 66 |
+- 'openblas': openblas_info, # use blas_opt instead |
| 67 |
+- 'lapack_mkl': lapack_mkl_info, # use lapack_opt instead |
| 68 |
+- 'blas_mkl': blas_mkl_info, # use blas_opt instead |
| 69 |
+- 'x11': x11_info, |
| 70 |
++ cl = {'x11': x11_info, |
| 71 |
+ 'fft_opt': fft_opt_info, |
| 72 |
+ 'fftw': fftw_info, |
| 73 |
+ 'fftw2': fftw2_info, |
| 74 |
|
| 75 |
diff --git a/dev-python/numpy/numpy-1.8.2.ebuild b/dev-python/numpy/numpy-1.8.2.ebuild |
| 76 |
new file mode 100644 |
| 77 |
index 00000000000..e9e6e79381b |
| 78 |
--- /dev/null |
| 79 |
+++ b/dev-python/numpy/numpy-1.8.2.ebuild |
| 80 |
@@ -0,0 +1,146 @@ |
| 81 |
+# Copyright 1999-2019 Gentoo Authors |
| 82 |
+# Distributed under the terms of the GNU General Public License v2 |
| 83 |
+ |
| 84 |
+EAPI=5 |
| 85 |
+ |
| 86 |
+PYTHON_COMPAT=( python2_7 ) |
| 87 |
+PYTHON_REQ_USE="threads(+)" |
| 88 |
+ |
| 89 |
+FORTRAN_NEEDED=lapack |
| 90 |
+ |
| 91 |
+inherit distutils-r1 eutils flag-o-matic fortran-2 multilib toolchain-funcs versionator |
| 92 |
+ |
| 93 |
+DOC_PV="1.8.1" |
| 94 |
+DOC_P="${PN}-${DOC_PV}" |
| 95 |
+ |
| 96 |
+DESCRIPTION="Fast array and numerical python library" |
| 97 |
+HOMEPAGE="https://www.numpy.org" |
| 98 |
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz |
| 99 |
+ doc? ( |
| 100 |
+ http://docs.scipy.org/doc/${DOC_P}/${PN}-html-${DOC_PV}.zip |
| 101 |
+ http://docs.scipy.org/doc/${DOC_P}/${PN}-ref-${DOC_PV}.pdf |
| 102 |
+ http://docs.scipy.org/doc/${DOC_P}/${PN}-user-${DOC_PV}.pdf |
| 103 |
+ )" |
| 104 |
+# It appears the docs haven't been upgraded, still @ 1.8.1 |
| 105 |
+LICENSE="BSD" |
| 106 |
+SLOT="0" |
| 107 |
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" |
| 108 |
+IUSE="doc lapack test" |
| 109 |
+ |
| 110 |
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}] |
| 111 |
+ lapack? ( virtual/cblas virtual/lapack )" |
| 112 |
+DEPEND="${RDEPEND} |
| 113 |
+ doc? ( app-arch/unzip ) |
| 114 |
+ lapack? ( virtual/pkgconfig ) |
| 115 |
+ test? ( dev-python/nose[${PYTHON_USEDEP}] )" |
| 116 |
+ |
| 117 |
+# Uses distutils.command.config. |
| 118 |
+DISTUTILS_IN_SOURCE_BUILD=1 |
| 119 |
+ |
| 120 |
+PATCHES=( |
| 121 |
+ "${FILESDIR}"/${PN}-1.8.0-no-hardcode-blas.patch |
| 122 |
+) |
| 123 |
+ |
| 124 |
+src_unpack() { |
| 125 |
+ default |
| 126 |
+ if use doc; then |
| 127 |
+ unzip -qo "${DISTDIR}"/${PN}-html-${DOC_PV}.zip -d html || die |
| 128 |
+ fi |
| 129 |
+} |
| 130 |
+ |
| 131 |
+pc_incdir() { |
| 132 |
+ $(tc-getPKG_CONFIG) --cflags-only-I $@ | \ |
| 133 |
+ sed -e 's/^-I//' -e 's/[ ]*-I/:/g' -e 's/[ ]*$//' -e 's|^:||' |
| 134 |
+} |
| 135 |
+ |
| 136 |
+pc_libdir() { |
| 137 |
+ $(tc-getPKG_CONFIG) --libs-only-L $@ | \ |
| 138 |
+ sed -e 's/^-L//' -e 's/[ ]*-L/:/g' -e 's/[ ]*$//' -e 's|^:||' |
| 139 |
+} |
| 140 |
+ |
| 141 |
+pc_libs() { |
| 142 |
+ $(tc-getPKG_CONFIG) --libs-only-l $@ | \ |
| 143 |
+ sed -e 's/[ ]-l*\(pthread\|m\)\([ ]\|$\)//g' \ |
| 144 |
+ -e 's/^-l//' -e 's/[ ]*-l/,/g' -e 's/[ ]*$//' \ |
| 145 |
+ | tr ',' '\n' | sort -u | tr '\n' ',' | sed -e 's|,$||' |
| 146 |
+} |
| 147 |
+ |
| 148 |
+python_prepare_all() { |
| 149 |
+ if use lapack; then |
| 150 |
+ append-ldflags "$($(tc-getPKG_CONFIG) --libs-only-other cblas lapack)" |
| 151 |
+ local incdir="${EPREFIX}"/usr/include |
| 152 |
+ local libdir="${EPREFIX}"/usr/$(get_libdir) |
| 153 |
+ # make sure _dotblas.so gets built |
| 154 |
+ sed -i -e '/NO_ATLAS_INFO/,+1d' numpy/core/setup.py || die |
| 155 |
+ cat >> site.cfg <<-EOF |
| 156 |
+ [blas] |
| 157 |
+ include_dirs = $(pc_incdir cblas):${incdir} |
| 158 |
+ library_dirs = $(pc_libdir cblas blas):${libdir} |
| 159 |
+ blas_libs = $(pc_libs cblas blas) |
| 160 |
+ [lapack] |
| 161 |
+ library_dirs = $(pc_libdir lapack):${libdir} |
| 162 |
+ lapack_libs = $(pc_libs lapack) |
| 163 |
+ EOF |
| 164 |
+ else |
| 165 |
+ export {ATLAS,PTATLAS,BLAS,LAPACK,MKL}=None |
| 166 |
+ fi |
| 167 |
+ |
| 168 |
+ export CC="$(tc-getCC) ${CFLAGS}" |
| 169 |
+ |
| 170 |
+ append-flags -fno-strict-aliasing |
| 171 |
+ |
| 172 |
+ # See progress in http://projects.scipy.org/scipy/numpy/ticket/573 |
| 173 |
+ # with the subtle difference that we don't want to break Darwin where |
| 174 |
+ # -shared is not a valid linker argument |
| 175 |
+ if [[ ${CHOST} != *-darwin* ]]; then |
| 176 |
+ append-ldflags -shared |
| 177 |
+ fi |
| 178 |
+ |
| 179 |
+ # only one fortran to link with: |
| 180 |
+ # linking with cblas and lapack library will force |
| 181 |
+ # autodetecting and linking to all available fortran compilers |
| 182 |
+ append-fflags -fPIC |
| 183 |
+ if use lapack; then |
| 184 |
+ NUMPY_FCONFIG="config_fc --noopt --noarch" |
| 185 |
+ # workaround bug 335908 |
| 186 |
+ [[ $(tc-getFC) == *gfortran* ]] && NUMPY_FCONFIG+=" --fcompiler=gnu95" |
| 187 |
+ fi |
| 188 |
+ |
| 189 |
+ # don't version f2py, we will handle it. |
| 190 |
+ sed -i -e '/f2py_exe/s:+os\.path.*$::' numpy/f2py/setup.py || die |
| 191 |
+ |
| 192 |
+ distutils-r1_python_prepare_all |
| 193 |
+} |
| 194 |
+ |
| 195 |
+python_compile() { |
| 196 |
+ distutils-r1_python_compile ${NUMPY_FCONFIG} |
| 197 |
+} |
| 198 |
+ |
| 199 |
+python_test() { |
| 200 |
+ distutils_install_for_testing ${NUMPY_FCONFIG} |
| 201 |
+ |
| 202 |
+ cd "${TMPDIR}" || die |
| 203 |
+ ${EPYTHON} -c " |
| 204 |
+import numpy, sys |
| 205 |
+r = numpy.test(label='full', verbose=3) |
| 206 |
+sys.exit(0 if r.wasSuccessful() else 1)" || die "Tests fail with ${EPYTHON}" |
| 207 |
+} |
| 208 |
+ |
| 209 |
+python_install() { |
| 210 |
+ distutils-r1_python_install ${NUMPY_FCONFIG} |
| 211 |
+} |
| 212 |
+ |
| 213 |
+python_install_all() { |
| 214 |
+ distutils-r1_python_install_all |
| 215 |
+ |
| 216 |
+ dodoc COMPATIBILITY DEV_README.txt THANKS.txt |
| 217 |
+ |
| 218 |
+ if use doc; then |
| 219 |
+ dohtml -r "${WORKDIR}"/html/* |
| 220 |
+ dodoc "${DISTDIR}"/${PN}-{user,ref}-${DOC_PV}.pdf |
| 221 |
+ fi |
| 222 |
+ |
| 223 |
+ docinto f2py |
| 224 |
+ dodoc numpy/f2py/docs/*.txt |
| 225 |
+ doman numpy/f2py/f2py.1 |
| 226 |
+} |
Archives