| 1 |
commit: 80b2e1b4def977bee9743d7bc52c01acf19fbb9a |
| 2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Aug 30 17:24:34 2016 +0000 |
| 4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Aug 30 17:26:33 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80b2e1b4 |
| 7 |
|
| 8 |
dev-python/numpy: Version bump |
| 9 |
|
| 10 |
Gentoo-bug: 590464, 591936 |
| 11 |
* Re-add py3.3 support to prevent depgraph breakage |
| 12 |
* Fix QA bug installing non-compiled files #590464 |
| 13 |
* Fix linking due to adding unnecessary -lblas to |
| 14 |
build system #591936 |
| 15 |
* Move dev-python/setuptools to DEPEND instead of |
| 16 |
RDEPEND |
| 17 |
|
| 18 |
Package-Manager: portage-2.3.0 |
| 19 |
|
| 20 |
dev-python/numpy/Manifest | 2 +- |
| 21 |
.../files/numpy-1.11.1-no-hardcode-blas.patch | 71 ++++++++++++++++++++++ |
| 22 |
.../{numpy-1.11.0.ebuild => numpy-1.11.1.ebuild} | 25 ++++++-- |
| 23 |
3 files changed, 91 insertions(+), 7 deletions(-) |
| 24 |
|
| 25 |
diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest |
| 26 |
index 3f571f7..23b6502 100644 |
| 27 |
--- a/dev-python/numpy/Manifest |
| 28 |
+++ b/dev-python/numpy/Manifest |
| 29 |
@@ -1,7 +1,7 @@ |
| 30 |
DIST numpy-1.10.1.tar.gz 4048478 SHA256 8b9f453f29ce96a14e625100d3dcf8926301d36c5f622623bf8820e748510858 SHA512 ea717bac913a8e63bf93822bddbfe7701a3de00051bf3c7020f5e22756987becb5a2f96a6a52a36fc7c2b856815a782e450099688ce86b21fa94b0076b9ef376 WHIRLPOOL 7671368bec55c7f53ffa78a509946acc998e6f4223da4f3429b82a5a38b5e0277a0f89773ec2335f8e46b5c695620a4119af5ab59734184054c31b11841de44b |
| 31 |
DIST numpy-1.10.2.tar.gz 4055005 SHA256 23a3befdf955db4d616f8bb77b324680a80a323e0c42a7e8d7388ef578d8ffa9 SHA512 040db49593f3c53c9b43301eacffc3b5817310f1dbb91fd650efcf5ba65ce7e217549dc5268bc56846f19f1a03dd19470989005aa176531af44d602b3546b007 WHIRLPOOL 30c4b365aac6623241afd72fc30d3a543183205eb23db1366937e39fc50dee862923dd249775fee67cce0199940a57ec1423f1cb0e65ff7c65764c7969d7a76f |
| 32 |
DIST numpy-1.10.4.tar.gz 4069996 SHA256 7356e98fbcc529e8d540666f5a919912752e569150e9a4f8d869c686f14c720b SHA512 57ace46e357d49be0efd904e5ceb9862c626c916987c8798a12de7ae1e06816ad8483439ac4619792a04889631b5998f2397dc601c78dea33a784b4831c19c79 WHIRLPOOL 76946c2543b1cade06d71f83fd507bd818c1090baa9c3ddda7d1f48d48ed23672c5d9de76db890df990c6d8b7b26b71d3ce733c448943ad4177374a957360d1c |
| 33 |
-DIST numpy-1.11.0.tar.gz 4169494 SHA256 a1d1268d200816bfb9727a7a27b78d8e37ecec2e4d5ebd33eb64e2789e0db43e SHA512 92c1889397ad013e25da3a0657fc01e787d528fc19c29cc2acd286c3f07d41b984252583457b1b9259fc303afbe9694565cdcf5752eb4ecb950cc7a99ec1ad8b WHIRLPOOL 192c998f10e1642582f152392999436495cc153af9fe529cc67fe6f6f05b574db6659cb540341be25c5ff404afb79bf5c1a0b3f219943c8d366d927568016b9e |
| 34 |
+DIST numpy-1.11.1.tar.gz 4171162 SHA256 dc4082c43979cc856a2bf352a8297ea109ccb3244d783ae067eb2ee5b0d577cd SHA512 4df9247c651b4fdeb51e94910d97cfceaa81e5acb81cb761dae6ccf8e78891ebe0ca67ed095b11d66fe52d64e6ea5328e72c124e5dcd8d6a7a98007ef60c55b2 WHIRLPOOL 18d9f63f228b18ea20a5aed77248af2055e13b9229d34cc1c22862e4c369c4b45a9a9d9271af623f0b6bd861a4544c9ad812070254e0d21ca5d523eb05c3aabb |
| 35 |
DIST numpy-1.8.2.tar.gz 3792998 SHA256 6d487fc724780d66746bde264ea71f5cd77d3a39e52ee2b073dcaed63bc669db SHA512 996e6b8e2d42f223e44660f56bf73eb8ab124f400d89218f8f5e4d7c9860ada44a4d7c54526137b0695c7a10f36e8834fbf0d42b7cb20bcdb5d5c245d673385c WHIRLPOOL 0d3a05b1e3c0a1ceb0a7b4818406dbb45506e5f25bc2727d4ff44cc0a0520e6556b3c68ae24dbca37ba9d67ae2defbb3ff9c906d4c2635b29ed44452d70e8311 |
| 36 |
DIST numpy-1.9.2.tar.gz 3986067 SHA256 325e5f2b0b434ecb6e6882c7e1034cc6cdde3eeeea87dbc482575199a6aeef2a SHA512 70470ebb9afef5dfd0c83ceb7a9d5f1b7a072b1a9b54b04f04f5ed50fbaedd5b4906bd500472268d478f94df9e749a88698b1ff30f2d80258e7f3fec040617d9 WHIRLPOOL 59f5dc52cb95c7ce80fec3a7feac6cfda1d149596bf6d95c18bd8314e31a8df494b2b470c4cc3d8c296c9fc11c718d70d5b9b5344337175ca75496504c0fd201 |
| 37 |
DIST numpy-1.9.3.tar.gz 3984430 SHA256 c3b74d3b9da4ceb11f66abd21e117da8cf584b63a0efbd01a9b7e91b693fbbd6 SHA512 32531cd8d1480a50812454ef8e3b68c0f84b2a4bc5de0df1457070db7f6fd94cdb50e6479a85fa4d1dc569a10d28f6864d5069fcf2a32fa20fa8803476a3df8c WHIRLPOOL a0235594e793625d5e3cef57956f4710587158885f39d7d1267c9845b12fb1d39fb9987ec095720c2d285c7c726383a15471f3629b739b77186470e2c40ba093 |
| 38 |
|
| 39 |
diff --git a/dev-python/numpy/files/numpy-1.11.1-no-hardcode-blas.patch b/dev-python/numpy/files/numpy-1.11.1-no-hardcode-blas.patch |
| 40 |
new file mode 100644 |
| 41 |
index 00000000..1f6f9c4 |
| 42 |
--- /dev/null |
| 43 |
+++ b/dev-python/numpy/files/numpy-1.11.1-no-hardcode-blas.patch |
| 44 |
@@ -0,0 +1,71 @@ |
| 45 |
+--- numpy-1.11.1/numpy/distutils/system_info.py |
| 46 |
++++ numpy-1.11.1/numpy/distutils/system_info.py |
| 47 |
+@@ -312,26 +312,7 @@ |
| 48 |
+ 1 - display warning message |
| 49 |
+ 2 - raise error |
| 50 |
+ """ |
| 51 |
+- cl = {'atlas': atlas_info, # use lapack_opt or blas_opt instead |
| 52 |
+- 'atlas_threads': atlas_threads_info, # ditto |
| 53 |
+- 'atlas_blas': atlas_blas_info, |
| 54 |
+- 'atlas_blas_threads': atlas_blas_threads_info, |
| 55 |
+- 'lapack_atlas': lapack_atlas_info, # use lapack_opt instead |
| 56 |
+- 'lapack_atlas_threads': lapack_atlas_threads_info, # ditto |
| 57 |
+- 'atlas_3_10': atlas_3_10_info, # use lapack_opt or blas_opt instead |
| 58 |
+- 'atlas_3_10_threads': atlas_3_10_threads_info, # ditto |
| 59 |
+- 'atlas_3_10_blas': atlas_3_10_blas_info, |
| 60 |
+- 'atlas_3_10_blas_threads': atlas_3_10_blas_threads_info, |
| 61 |
+- 'lapack_atlas_3_10': lapack_atlas_3_10_info, # use lapack_opt instead |
| 62 |
+- 'lapack_atlas_3_10_threads': lapack_atlas_3_10_threads_info, # ditto |
| 63 |
+- 'mkl': mkl_info, |
| 64 |
+- # openblas which may or may not have embedded lapack |
| 65 |
+- 'openblas': openblas_info, # use blas_opt instead |
| 66 |
+- # openblas with embedded lapack |
| 67 |
+- 'openblas_lapack': openblas_lapack_info, # use blas_opt instead |
| 68 |
+- 'lapack_mkl': lapack_mkl_info, # use lapack_opt instead |
| 69 |
+- 'blas_mkl': blas_mkl_info, # use blas_opt instead |
| 70 |
+- 'x11': x11_info, |
| 71 |
++ cl = {'x11': x11_info, |
| 72 |
+ 'fft_opt': fft_opt_info, |
| 73 |
+ 'fftw': fftw_info, |
| 74 |
+ 'fftw2': fftw2_info, |
| 75 |
+@@ -669,10 +650,7 @@ |
| 76 |
+ return [b for b in [a.strip() for a in libs.split(',')] if b] |
| 77 |
+ |
| 78 |
+ def get_libraries(self, key='libraries'): |
| 79 |
+- if hasattr(self, '_lib_names'): |
| 80 |
+- return self.get_libs(key, default=self._lib_names) |
| 81 |
+- else: |
| 82 |
+- return self.get_libs(key, '') |
| 83 |
++ return self.get_libs(key, '') |
| 84 |
+ |
| 85 |
+ def library_extensions(self): |
| 86 |
+ static_exts = ['.a'] |
| 87 |
+@@ -1685,7 +1663,7 @@ |
| 88 |
+ lib = self.has_cblas(info) |
| 89 |
+ if lib is not None: |
| 90 |
+ info['language'] = 'c' |
| 91 |
+- info['libraries'] = [lib] |
| 92 |
++ info['libraries'] = lib |
| 93 |
+ info['define_macros'] = [('HAVE_CBLAS', None)] |
| 94 |
+ self.set_info(**info) |
| 95 |
+ |
| 96 |
+@@ -1718,16 +1696,16 @@ |
| 97 |
+ # check for cblas lib, and if not present check for blas lib. |
| 98 |
+ try: |
| 99 |
+ c.link_executable(obj, os.path.join(tmpdir, "a.out"), |
| 100 |
+- libraries=["cblas"], |
| 101 |
++ libraries=info["libraries"], |
| 102 |
+ library_dirs=info['library_dirs'], |
| 103 |
+ extra_postargs=info.get('extra_link_args', [])) |
| 104 |
+- res = "cblas" |
| 105 |
++ res = info["libraries"] |
| 106 |
+ except distutils.ccompiler.LinkError: |
| 107 |
+ c.link_executable(obj, os.path.join(tmpdir, "a.out"), |
| 108 |
+ libraries=["blas"], |
| 109 |
+ library_dirs=info['library_dirs'], |
| 110 |
+ extra_postargs=info.get('extra_link_args', [])) |
| 111 |
+- res = "blas" |
| 112 |
++ res = ["blas"] |
| 113 |
+ except distutils.ccompiler.CompileError: |
| 114 |
+ res = None |
| 115 |
+ finally: |
| 116 |
|
| 117 |
diff --git a/dev-python/numpy/numpy-1.11.0.ebuild b/dev-python/numpy/numpy-1.11.1.ebuild |
| 118 |
similarity index 83% |
| 119 |
rename from dev-python/numpy/numpy-1.11.0.ebuild |
| 120 |
rename to dev-python/numpy/numpy-1.11.1.ebuild |
| 121 |
index 09d81ec..6ac6c96 100644 |
| 122 |
--- a/dev-python/numpy/numpy-1.11.0.ebuild |
| 123 |
+++ b/dev-python/numpy/numpy-1.11.1.ebuild |
| 124 |
@@ -4,7 +4,7 @@ |
| 125 |
|
| 126 |
EAPI=6 |
| 127 |
|
| 128 |
-PYTHON_COMPAT=( python2_7 python3_{4,5} ) |
| 129 |
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} ) |
| 130 |
PYTHON_REQ_USE="threads(+)" |
| 131 |
|
| 132 |
FORTRAN_NEEDED=lapack |
| 133 |
@@ -22,22 +22,21 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz |
| 134 |
http://docs.scipy.org/doc/${DOC_P}/${PN}-ref-${DOC_PV}.pdf |
| 135 |
http://docs.scipy.org/doc/${DOC_P}/${PN}-user-${DOC_PV}.pdf |
| 136 |
)" |
| 137 |
-# It appears the docs haven't been upgraded, still @ 1.8.1 |
| 138 |
+# It appears the docs haven't been upgraded, still @ 1.11.0 |
| 139 |
LICENSE="BSD" |
| 140 |
SLOT="0" |
| 141 |
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" |
| 142 |
IUSE="doc lapack test" |
| 143 |
|
| 144 |
-RDEPEND=" |
| 145 |
- dev-python/setuptools[${PYTHON_USEDEP}] |
| 146 |
- lapack? ( virtual/cblas virtual/lapack )" |
| 147 |
+RDEPEND="lapack? ( virtual/cblas virtual/lapack )" |
| 148 |
DEPEND="${RDEPEND} |
| 149 |
+ dev-python/setuptools[${PYTHON_USEDEP}] |
| 150 |
doc? ( app-arch/unzip ) |
| 151 |
lapack? ( virtual/pkgconfig ) |
| 152 |
test? ( >=dev-python/nose-1.0[${PYTHON_USEDEP}] )" |
| 153 |
|
| 154 |
PATCHES=( |
| 155 |
- "${FILESDIR}"/${PN}-1.10.2-no-hardcode-blas.patch |
| 156 |
+ "${FILESDIR}"/${PN}-1.11.1-no-hardcode-blas.patch |
| 157 |
) |
| 158 |
|
| 159 |
src_unpack() { |
| 160 |
@@ -110,6 +109,20 @@ python_prepare_all() { |
| 161 |
-e 's:test_f2py:_&:g' \ |
| 162 |
-i numpy/tests/test_scripts.py || die |
| 163 |
|
| 164 |
+ # QA bug 590464 |
| 165 |
+ # The .py files from numpy/core/tests are just added, instead |
| 166 |
+ # of being bytecode compiled as a proper subdir package. |
| 167 |
+ # We trick the buildsystem into accepting it as a bytecode |
| 168 |
+ # package by adding a setup.py and an empty __init__.py |
| 169 |
+ cp numpy/{compat/setup.py,core/tests} || die |
| 170 |
+ touch numpy/core/tests/__init__.py || die |
| 171 |
+ sed \ |
| 172 |
+ -e 's:compat:tests:' \ |
| 173 |
+ -i numpy/core/tests/setup.py || die |
| 174 |
+ sed \ |
| 175 |
+ -e "s:config\.add_data_dir('tests'):config\.add_subpackage('tests'):" \ |
| 176 |
+ -i numpy/core/setup.py || die |
| 177 |
+ |
| 178 |
distutils-r1_python_prepare_all |
| 179 |
} |
Archives