From 21435953e16cda318a82334ddbadb3b5c36d9ea7 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 15 Jan 2020 15:51:32 +0000 Subject: gentoo resync : 15.01.2020 --- dev-python/numpy/Manifest | 13 +- .../files/numpy-1.17.4-no-hardcode-blasv2.patch | 47 +++++++ .../numpy/files/numpy-1.8.0-no-hardcode-blas.patch | 25 ---- dev-python/numpy/numpy-1.14.5.ebuild | 4 +- dev-python/numpy/numpy-1.15.4.ebuild | 4 +- dev-python/numpy/numpy-1.16.1.ebuild | 4 +- dev-python/numpy/numpy-1.16.5.ebuild | 4 +- dev-python/numpy/numpy-1.17.4-r1.ebuild | 154 +++++++++++++++++++++ dev-python/numpy/numpy-1.17.4.ebuild | 4 +- 9 files changed, 218 insertions(+), 41 deletions(-) create mode 100644 dev-python/numpy/files/numpy-1.17.4-no-hardcode-blasv2.patch delete mode 100644 dev-python/numpy/files/numpy-1.8.0-no-hardcode-blas.patch create mode 100644 dev-python/numpy/numpy-1.17.4-r1.ebuild (limited to 'dev-python/numpy') diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest index 888578ee8d95..5809afb3890a 100644 --- a/dev-python/numpy/Manifest +++ b/dev-python/numpy/Manifest @@ -2,7 +2,7 @@ AUX numpy-1.14.5-no-hardcode-blas.patch 3767 BLAKE2B f580a067b9c91a53f99daffd33f AUX numpy-1.14.5-py37.patch 5417 BLAKE2B a6660b06a6f5ebc436b8bef4f53934892384889304f3b48ed1e9e84298deb78528e431e2102856fe1bc44b5e9a472b3a0b51401ad824b7072465d8c54f6aa939 SHA512 78b6a1640cf51e9b58478fd9ad5044bec2efc1319cc050f0a1345fc367b57b9170954ce25b88b2851007b438a00ac380eab48f6b699fed1115d109972ec553ad AUX numpy-1.15.4-no-hardcode-blas.patch 3841 BLAKE2B 19ddde096b5b0b1d3c0a98e16c14b96cf9c16ec5d96736ec561f14535fe240eaa8fbe71f396d432ce557b78b18a98ad8684724614f201b1d6151c8edfd07f483 SHA512 8f870f8a52c096f6f0f614dc64ff6d5ed8d8805e14723c60c6e85b69cf915fc698e808f3fcafce75a6ea9e7eb728949dc56ef823d70963d25658e50aa8becaae AUX numpy-1.17.4-no-hardcode-blas.patch 2769 BLAKE2B 800bd23df8f23f335a8298041403f7caca92128e759db85c354c0328447c2b0cada571694bb96d4e9231b12ab91c7f9533526a06427723a3db4a75f502aec443 SHA512 8f31fdcb5acec9f5a346b35625e526d120577fba95d9039d53c3ad2441a5fc6950251d6ef58ecc53110873d76ec9f9a12c65f60f909413f26f3734f8e0bcfb09 -AUX numpy-1.8.0-no-hardcode-blas.patch 1153 BLAKE2B d812ddc3069d23f211026c14ca36aa907c254b5e5305e720bc87bb5fbd51dd032f93eecd245c222ae8fa81dbe1541a2ffb1524e685a05f238758b4487e3532b9 SHA512 baa29a0c981ede608d890e776026961fb71156eb7804f702623bce775e3b6ce3bb28ced252d9c6fe991429b690b3eef8468d703f79247820527648d6484d23f3 +AUX numpy-1.17.4-no-hardcode-blasv2.patch 2420 BLAKE2B e4c0058b1226fced2c38caf67b2843021c6f42773781668a556eb48d7038acd0b1c7cbf30a432fdc3f4d2abf8eef28df7102be1bc9669a4ddc4ee4fc5e239d68 SHA512 9c6dc7e4f5b28b24ac5e1c686066c973b218b0e4e07b500a52c8b3e247acb150714072d17dd1a8579f47c48e9776bddebf9f049616aca52e0325c8f09ef09dad DIST numpy-1.14.5.zip 4904624 BLAKE2B 14d266bf1139b9539e39d08a6537e2b772e80bf46a0769cbb06b63ba54858c9284f6d0e8a19627a4d99f2c2638e9a4031bf4d4aaf773eaf34b7203d131636dc0 SHA512 e131f9fa815084e334b59c5d9abd8de0088ad1dfefecf8615ad7deca0b54b0dfa0446c8de99c90670ea9fcabea9980bd171618a5b9032c1937b597a5ce363c5b DIST numpy-1.15.4.zip 4473522 BLAKE2B c030ef4a06c84091eec11b6602422468bd0674489a2c7fea1230132cd3a3ca1b10ec87eeb6788f2f263943f9ac43026dc1e7f0f5f1d52e9d1cc6934a5d361090 SHA512 9e0516da04368f0353fb7e3cc2c72e1ec936042908309732a298405bd7111e712899627b82f3674295b611e0ebfd74ef91d693f065fe9cb03dc7de23d1e72676 DIST numpy-1.16.1.zip 5070040 BLAKE2B 0429d27d88ec97e207822c9c7fa759453bbef97d1d5fdf3e68dab21ca098a6321e2e57d85561dd99084d190b8ed6fce20f00b421c8d14a249fc45dc1ea09569e SHA512 e4adce4f40a3cb6ac482f82db9fcd079179b03b0e878920cfc7d98b9f622adab997c68af892b209f417d5f31b4123a1c5ff5c07cf5b0aaa496d8be6c8354bde8 @@ -20,9 +20,10 @@ DIST numpy-user-1.14.5.pdf 574418 BLAKE2B 80738f1760932fa74b07334d1a355ba3ce319e DIST numpy-user-1.15.4.pdf 596191 BLAKE2B 1387b7aac9cccba4b7ce259391f56372959db35c4ddce111afb9949347ebcf3290e7d3fb5b1b2d2e7850911259cddb07edfe104c1396ae8e31a58a81e9293f16 SHA512 2089753b48412f094b279c378be1d221ec9b171957171a4e26b4589d594e00b4f66b6f8a88a7eb665e8c3fa3e6ed505d63da80d4d01ced041544b97ea56fe212 DIST numpy-user-1.16.1.pdf 592508 BLAKE2B 88ef7aac2998fd8eeebc3ab92df9ad9ba139b67ab0442cd4ed91cdc7b1cd72acf7905468118df25634640b709106758455c7d316539b941d7760010b8135fafa SHA512 d089b4c663f92c38aa075c37974df757bdc457f75980737477a4477f67311d28149bc4c20f5d1cd0877221a78e5a9ff10702b1ebcc8ab062d328cdda4087d0f7 DIST numpy-user-1.16.4.pdf 596203 BLAKE2B da3ad1f0ec1c965d20656f73a970911cbb58efa73a5df89e2e6485e0dd763f483e35eea1395ac919bf35d496fb216cee954fc5d31edebc1796a24a2a7a2d12b9 SHA512 3083008547213bfa98ffa5cd8e2cea13f6947f42d83aef61502a2a852b0d5f27d727c76b42d281d7a2f4f76c78e88b12ee3d9b164b39fe1f0213ace7097357d6 -EBUILD numpy-1.14.5.ebuild 4105 BLAKE2B efeb5636a8b6c86e4cfad8c681e83face73864836af07558e5538f0eeef134331889d464150f4978018c721da48d49e79a104fced2da935bb8d3e9e0930f6e92 SHA512 3b89faf902d55d333bc9d4487fa5e753fb837a10dbc414bbe3157a007936fc0dc9f70843ef4c169845aef00cb48f7c8cd9fa7a5f5155c3e36b45c771247e5db1 -EBUILD numpy-1.15.4.ebuild 3916 BLAKE2B 659ccf8a6bc7acd4899aad0303abaf3e42db17a28e36636e4eb0da9dda607f4574c576fc622655d3afa83fed641e6c331deaf3e12c1a60bababaacc2873ec22c SHA512 5874312dffe34ad0c77f0c808fb90e50a85880046ab4e866f31d26cb3f369c10324af2e8124e8a49d6c047cce1e460d6ea55a446ff9bd226f8f17b0192663c72 -EBUILD numpy-1.16.1.ebuild 3936 BLAKE2B 0d3dc2c4895e2c28ff7174e6152332c6db1eef1b51e77072e319f74fc6a16b340d8555894672350a1de71e34d55143dc05b32ae1aa44898d84f1da1814d78a5d SHA512 90d4594f0a1cfe312e78302fa27c17bc057ed3bd718de9f43053a6b5419fb5212d93ed96600ebabe37a20dbc9c4901457dd42b52b6583f5e453d076191bc5ad4 -EBUILD numpy-1.16.5.ebuild 4225 BLAKE2B 4f08f746030c6c21b6f53253b4eca417e7e6e827d6179c219f1c40a20883be428da70d8c827246d2cef195ddb4144ea7b3a74f0031e0b3caed78284b570ef8ff SHA512 5a1ecdb57965b09910551ff03c56c07b784d7705c67361a1d52155f59f7567d699c35ea987826c34256322900d95f61cb1dfeb5e248b647fbee3afed1574af61 -EBUILD numpy-1.17.4.ebuild 4232 BLAKE2B f26e8430e5fc08584a67066024516bd59debaf4e58fb758edfb9f57d4738836e251c7d57cc8fadd67f40015e17c30102f7de874b91376a805e07bbc9894b2874 SHA512 aa9c2122a075faa4f4cbc905331f1d9ffda0843e17a762aab754e16857a94e280612053d295a51f67daa1f49076cedb3e45a9833a0fc13759402d39386a8f6f8 +EBUILD numpy-1.14.5.ebuild 4103 BLAKE2B eeaf60f0d6dcf9adb805ebbd4185061dc21c81d2c5064d1f0c3ee838d68d0bed5f52adeeb138f8ac84fc9ad0e8cddd926142c9d2ca1867b05f1342993db54403 SHA512 c3f585498951aa39e160cc65391fa2d91a08e41981f82daf11562a80e1c1beb4100d06ee619034f0b5dbc211cf06e86e5e26518538d1bebdb18e6c267a8a46ce +EBUILD numpy-1.15.4.ebuild 3914 BLAKE2B b1e4541facef34dc973bd1de3d7c9fc556116fa936c7c4ea6f4aa4cac2d727f56743743f5e04f7f0355d8c085457d44c2f2f478bf5bf52310be23d2ec1451b80 SHA512 23ecdb6df8cd632f661aa8518f90e90d1d0fd5fb566e4d97149f92cf19995f067ce5e405b3b0035e740de53383d358eca00f503b63a4227b4d7592909d26b90b +EBUILD numpy-1.16.1.ebuild 3934 BLAKE2B 35063ed7529f4cb757b7dc3aaf8c0009bc4e72aafb6723267ac582ccccffa2e2f079d3cd067a88c32f935de3622abb1875d7bdcf8417d125ad1750f2568b5b2a SHA512 db1c4337360dddbcba2a34eb1f282dabeb652f36a3f216332b2e6d6ea8058e16dea642ea5e6f583871436e7ffa75eae59cb1daec797a41a3097678b8554ca5be +EBUILD numpy-1.16.5.ebuild 4223 BLAKE2B e8de035eab95a811936542fc223d71fce1c3a98c01b6c4f6f064d0fecf231acf4e3d28dfe368c09a06a84f6e95eafc7bd30eedd4fab5d58afc1f97bc792996da SHA512 2d47d1a95f0e2a7677a4ac29ce44ba519fd620c732bce8a2df15cbbfc6d198a56187e837e19ee27bdd8ed6bf7bd4d04d3c67a78e09ec0b2d4da8e0d74df04d41 +EBUILD numpy-1.17.4-r1.ebuild 4085 BLAKE2B 97f33b37330e8ef2672d1967f9b5ad33f6647dde276dc464ccf1d774d3865af02d2d4b571f286b595e03905bcf8707500ce10edadead113cadb467c683ea00d9 SHA512 61c18fa1c261f62b9a964a80edc416f2b1ebb6e7579b054b05e343f0208e8f8a452f07651fc653575014beefb3f86e790bd4f65f69b0e48679f5724b5c186250 +EBUILD numpy-1.17.4.ebuild 4230 BLAKE2B 8ef305e01f0217df28459560322e08c13fb14f9447b094f65627f129f40cde81dd4ab9932226f2d9f1f1b610d0baa785028ed36487dc7e3e500eb8e666a00ffa SHA512 95dc8135ec99d8427e71f4722d7afdcbff4a6dd85f06b038ba1e6da488121d0c1d738a13b20dee3a0815ba9c749c4f90d641aca83d1f9bbe54190931837ce244 MISC metadata.xml 876 BLAKE2B 5e257d6ea3c59c5819d854db7b7db3ebff53b5c87b5ce9348786085f09db12aa6fc8fa86393b9e6c06760ac0d9f36a52fdfb1865c9d1d9ad5526d74d3d53e8b1 SHA512 d35d0954ff8f21e370edeab3ce3e5ab501bf216c93399e807ede6f1910ba0ea41359425bf894d813a39442fb92a724fe83ec8a5c64e6bd97de9422f67700d549 diff --git a/dev-python/numpy/files/numpy-1.17.4-no-hardcode-blasv2.patch b/dev-python/numpy/files/numpy-1.17.4-no-hardcode-blasv2.patch new file mode 100644 index 000000000000..850f70f4551a --- /dev/null +++ b/dev-python/numpy/files/numpy-1.17.4-no-hardcode-blasv2.patch @@ -0,0 +1,47 @@ +diff --git a/numpy/distutils/system_info.py b/numpy/distutils/system_info.py +index ba2b1f46c..09db18e69 100644 +--- a/numpy/distutils/system_info.py ++++ b/numpy/distutils/system_info.py +@@ -374,28 +374,7 @@ def get_info(name, notfound_action=0): + 1 - display warning message + 2 - raise error + """ +- cl = {'atlas': atlas_info, # use lapack_opt or blas_opt instead +- 'atlas_threads': atlas_threads_info, # ditto +- 'atlas_blas': atlas_blas_info, +- 'atlas_blas_threads': atlas_blas_threads_info, +- 'lapack_atlas': lapack_atlas_info, # use lapack_opt instead +- 'lapack_atlas_threads': lapack_atlas_threads_info, # ditto +- 'atlas_3_10': atlas_3_10_info, # use lapack_opt or blas_opt instead +- 'atlas_3_10_threads': atlas_3_10_threads_info, # ditto +- 'atlas_3_10_blas': atlas_3_10_blas_info, +- 'atlas_3_10_blas_threads': atlas_3_10_blas_threads_info, +- 'lapack_atlas_3_10': lapack_atlas_3_10_info, # use lapack_opt instead +- 'lapack_atlas_3_10_threads': lapack_atlas_3_10_threads_info, # ditto +- 'flame': flame_info, # use lapack_opt instead +- 'mkl': mkl_info, +- # openblas which may or may not have embedded lapack +- 'openblas': openblas_info, # use blas_opt instead +- # openblas with embedded lapack +- 'openblas_lapack': openblas_lapack_info, # use blas_opt instead +- 'openblas_clapack': openblas_clapack_info, # use blas_opt instead +- 'blis': blis_info, # use blas_opt instead +- 'lapack_mkl': lapack_mkl_info, # use lapack_opt instead +- 'blas_mkl': blas_mkl_info, # use blas_opt instead ++ cl = {'flame': flame_info, # use lapack_opt instead + 'accelerate': accelerate_info, # use blas_opt instead + 'x11': x11_info, + 'fft_opt': fft_opt_info, +@@ -796,10 +775,7 @@ class system_info(object): + return [b for b in [a.strip() for a in libs.split(',')] if b] + + def get_libraries(self, key='libraries'): +- if hasattr(self, '_lib_names'): +- return self.get_libs(key, default=self._lib_names) +- else: +- return self.get_libs(key, '') ++ return self.get_libs(key, '') + + def library_extensions(self): + c = customized_ccompiler() + 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 deleted file mode 100644 index eaf30dd8e130..000000000000 --- a/dev-python/numpy/files/numpy-1.8.0-no-hardcode-blas.patch +++ /dev/null @@ -1,25 +0,0 @@ -patch to allow any blas (c or f77) to simulate the -special treatment atlas libs have in numpy. -2013: numpy.distutils still horrendous code - ---- numpy/distutils/system_info.py.orig 2013-11-25 19:54:45.760217851 -0800 -+++ numpy/distutils/system_info.py 2013-11-25 20:00:26.575310888 -0800 -@@ -293,17 +293,7 @@ - 1 - display warning message - 2 - raise error - """ -- cl = {'atlas': atlas_info, # use lapack_opt or blas_opt instead -- 'atlas_threads': atlas_threads_info, # ditto -- 'atlas_blas': atlas_blas_info, -- 'atlas_blas_threads': atlas_blas_threads_info, -- 'lapack_atlas': lapack_atlas_info, # use lapack_opt instead -- 'lapack_atlas_threads': lapack_atlas_threads_info, # ditto -- 'mkl': mkl_info, -- 'openblas': openblas_info, # use blas_opt instead -- 'lapack_mkl': lapack_mkl_info, # use lapack_opt instead -- 'blas_mkl': blas_mkl_info, # use blas_opt instead -- 'x11': x11_info, -+ cl = {'x11': x11_info, - 'fft_opt': fft_opt_info, - 'fftw': fftw_info, - 'fftw2': fftw2_info, diff --git a/dev-python/numpy/numpy-1.14.5.ebuild b/dev-python/numpy/numpy-1.14.5.ebuild index 55a472e0bc84..facc76fe7b19 100644 --- a/dev-python/numpy/numpy-1.14.5.ebuild +++ b/dev-python/numpy/numpy-1.14.5.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 -PYTHON_COMPAT=( python2_7 python3_{5,6,7} ) +PYTHON_COMPAT=( python2_7 python3_{6,7} ) PYTHON_REQ_USE="threads(+)" FORTRAN_NEEDED=lapack diff --git a/dev-python/numpy/numpy-1.15.4.ebuild b/dev-python/numpy/numpy-1.15.4.ebuild index 8a97cad7ac9c..7c4e514f4986 100644 --- a/dev-python/numpy/numpy-1.15.4.ebuild +++ b/dev-python/numpy/numpy-1.15.4.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 -PYTHON_COMPAT=( python2_7 python3_{5,6,7} ) +PYTHON_COMPAT=( python2_7 python3_{6,7} ) PYTHON_REQ_USE="threads(+)" FORTRAN_NEEDED=lapack diff --git a/dev-python/numpy/numpy-1.16.1.ebuild b/dev-python/numpy/numpy-1.16.1.ebuild index b923d3d6d813..3cbc081a140a 100644 --- a/dev-python/numpy/numpy-1.16.1.ebuild +++ b/dev-python/numpy/numpy-1.16.1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" -PYTHON_COMPAT=( python2_7 python3_{5,6,7} ) +PYTHON_COMPAT=( python2_7 python3_{6,7} ) PYTHON_REQ_USE="threads(+)" FORTRAN_NEEDED=lapack diff --git a/dev-python/numpy/numpy-1.16.5.ebuild b/dev-python/numpy/numpy-1.16.5.ebuild index 68c575ddf570..8f51b01deeff 100644 --- a/dev-python/numpy/numpy-1.16.5.ebuild +++ b/dev-python/numpy/numpy-1.16.5.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" -PYTHON_COMPAT=( python2_7 python3_{5,6,7} ) +PYTHON_COMPAT=( python2_7 python3_{6,7} ) PYTHON_REQ_USE="threads(+)" FORTRAN_NEEDED=lapack diff --git a/dev-python/numpy/numpy-1.17.4-r1.ebuild b/dev-python/numpy/numpy-1.17.4-r1.ebuild new file mode 100644 index 000000000000..c7836c89affb --- /dev/null +++ b/dev-python/numpy/numpy-1.17.4-r1.ebuild @@ -0,0 +1,154 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{6,7,8} ) +PYTHON_REQ_USE="threads(+)" + +FORTRAN_NEEDED=lapack + +inherit distutils-r1 flag-o-matic fortran-2 multiprocessing toolchain-funcs + +DOC_PV="1.16.4" +DESCRIPTION="Fast array and numerical python library" +HOMEPAGE="https://www.numpy.org" +SRC_URI=" + mirror://pypi/${PN:0:1}/${PN}/${P}.zip + doc? ( + https://numpy.org/doc/$(ver_cut 1-2 ${DOC_PV})/numpy-html.zip -> numpy-html-${DOC_PV}.zip + https://numpy.org/doc/$(ver_cut 1-2 ${DOC_PV})/numpy-ref.pdf -> numpy-ref-${DOC_PV}.pdf + https://numpy.org/doc/$(ver_cut 1-2 ${DOC_PV})/numpy-user.pdf -> numpy-user-${DOC_PV}.pdf + )" +LICENSE="BSD" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +IUSE="doc lapack test" +RESTRICT="!test? ( test )" + +RDEPEND=" + lapack? ( + virtual/cblas + virtual/lapack + )" +DEPEND="${RDEPEND}" +BDEPEND="app-arch/unzip + dev-python/setuptools[${PYTHON_USEDEP}] + lapack? ( virtual/pkgconfig ) + test? ( + dev-python/pytest[${PYTHON_USEDEP}] + )" + +PATCHES=( + "${FILESDIR}"/${PN}-1.17.4-no-hardcode-blasv2.patch +) + +src_unpack() { + default + if use doc; then + unzip -qo "${DISTDIR}"/numpy-html-${DOC_PV}.zip -d html || die + fi +} + +pc_incdir() { + $(tc-getPKG_CONFIG) --cflags-only-I $@ | \ + sed -e 's/^-I//' -e 's/[ ]*-I/:/g' -e 's/[ ]*$//' -e 's|^:||' +} + +pc_libdir() { + $(tc-getPKG_CONFIG) --libs-only-L $@ | \ + sed -e 's/^-L//' -e 's/[ ]*-L/:/g' -e 's/[ ]*$//' -e 's|^:||' +} + +pc_libs() { + $(tc-getPKG_CONFIG) --libs-only-l $@ | \ + sed -e 's/[ ]-l*\(pthread\|m\)\([ ]\|$\)//g' \ + -e 's/^-l//' -e 's/[ ]*-l/,/g' -e 's/[ ]*$//' \ + | tr ',' '\n' | sort -u | tr '\n' ',' | sed -e 's|,$||' +} + +python_prepare_all() { + if use lapack; then + append-ldflags "$($(tc-getPKG_CONFIG) --libs-only-other cblas lapack)" + local incdir="${EPREFIX}"/usr/include + local libdir="${EPREFIX}"/usr/$(get_libdir) + cat >> site.cfg <<-EOF || die + [blas] + blas_libs = $(pc_libs cblas blas) + [lapack] + lapack_libs = $(pc_libs lapack) + EOF + else + export {ATLAS,PTATLAS,BLAS,LAPACK,MKL}=None + fi + + export CC="$(tc-getCC) ${CFLAGS}" + + append-flags -fno-strict-aliasing + + # See progress in http://projects.scipy.org/scipy/numpy/ticket/573 + # with the subtle difference that we don't want to break Darwin where + # -shared is not a valid linker argument + if [[ ${CHOST} != *-darwin* ]]; then + append-ldflags -shared + fi + + # only one fortran to link with: + # linking with cblas and lapack library will force + # autodetecting and linking to all available fortran compilers + append-fflags -fPIC + if use lapack; then + NUMPY_FCONFIG="config_fc --noopt --noarch" + # workaround bug 335908 + [[ $(tc-getFC) == *gfortran* ]] && NUMPY_FCONFIG+=" --fcompiler=gnu95" + fi + + # don't version f2py, we will handle it. + sed -i -e '/f2py_exe/s: + os\.path.*$::' numpy/f2py/setup.py || die + + # disable fuzzed tests + find numpy/*/tests -name '*.py' -exec sed -i \ + -e 's:def \(.*_fuzz\):def _\1:' {} + || die + # very memory- and disk-hungry + sed -i -e 's:test_large_zip:_&:' numpy/lib/tests/test_io.py || die + + distutils-r1_python_prepare_all +} + +python_compile() { + export MAKEOPTS=-j1 #660754 + + local python_makeopts_jobs="" + python_is_python3 || python_makeopts_jobs="-j $(makeopts_jobs)" + distutils-r1_python_compile \ + ${python_makeopts_jobs} \ + ${NUMPY_FCONFIG} +} + +python_test() { + distutils_install_for_testing --single-version-externally-managed \ + --record "${TMPDIR}/record.txt" ${NUMPY_FCONFIG} + + cd "${TMPDIR}" || die + + "${EPYTHON}" -c " +import numpy, sys +r = numpy.test(label='full', verbose=3) +sys.exit(0 if r else 1)" || die "Tests fail with ${EPYTHON}" +} + +python_install() { + distutils-r1_python_install ${NUMPY_FCONFIG} + python_optimize +} + +python_install_all() { + local DOCS=( THANKS.txt ) + + if use doc; then + local HTML_DOCS=( "${WORKDIR}"/html/. ) + DOCS+=( "${DISTDIR}"/${PN}-{user,ref}-${DOC_PV}.pdf ) + fi + + distutils-r1_python_install_all +} diff --git a/dev-python/numpy/numpy-1.17.4.ebuild b/dev-python/numpy/numpy-1.17.4.ebuild index 607f5f55d31f..3db67281f36f 100644 --- a/dev-python/numpy/numpy-1.17.4.ebuild +++ b/dev-python/numpy/numpy-1.17.4.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{5,6,7,8} ) +PYTHON_COMPAT=( python3_{6,7,8} ) PYTHON_REQ_USE="threads(+)" FORTRAN_NEEDED=lapack -- cgit v1.2.3