aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAric Belsito <lluixhi@gmail.com>2018-03-29 12:51:14 -0700
committerAric Belsito <lluixhi@gmail.com>2018-03-29 12:51:14 -0700
commit3c018e22d3beb9d5075d868edbcd9712f5b13f76 (patch)
tree9253cfe574f73640196e06d6de70ce3778972f46 /dev-python
parentdev-lang/ruby: version bump to 2.4.4/2.5.1 (diff)
downloadmusl-3c018e22d3beb9d5075d868edbcd9712f5b13f76.tar.gz
musl-3c018e22d3beb9d5075d868edbcd9712f5b13f76.tar.bz2
musl-3c018e22d3beb9d5075d868edbcd9712f5b13f76.zip
dev-python/numpy: remove 1.12.1
1.13.3 in the tree works
Diffstat (limited to 'dev-python')
-rw-r--r--dev-python/numpy/Manifest4
-rw-r--r--dev-python/numpy/files/numpy-1.11.1-no-xlocale.patch11
-rw-r--r--dev-python/numpy/files/numpy-1.11.2-blas_rec_inc_dir.patch24
-rw-r--r--dev-python/numpy/files/numpy-1.12.1-no-hardcode-blas.patch72
-rw-r--r--dev-python/numpy/numpy-1.12.1.ebuild165
5 files changed, 0 insertions, 276 deletions
diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest
index 9805205..2150cf4 100644
--- a/dev-python/numpy/Manifest
+++ b/dev-python/numpy/Manifest
@@ -1,8 +1,4 @@
DIST numpy-1.10.4.tar.gz 4069996 SHA256 7356e98fbcc529e8d540666f5a919912752e569150e9a4f8d869c686f14c720b SHA512 57ace46e357d49be0efd904e5ceb9862c626c916987c8798a12de7ae1e06816ad8483439ac4619792a04889631b5998f2397dc601c78dea33a784b4831c19c79 WHIRLPOOL 76946c2543b1cade06d71f83fd507bd818c1090baa9c3ddda7d1f48d48ed23672c5d9de76db890df990c6d8b7b26b71d3ce733c448943ad4177374a957360d1c
-DIST numpy-1.12.1.zip 4824784 SHA256 a65266a4ad6ec8936a1bc85ce51f8600634a31a258b722c9274a80ff189d9542 SHA512 156319821e4f0cf8d820e977da704aab274b7a4a4b792f6e40d7c0f2827700c990f55f1ca9650523c62c9e937f0e75f336d091d46ca47aaa9875c68fe32bac2a WHIRLPOOL 1ecd1df77d2a64bc6db1910446f60b477ebf5a1cf33ec2e1fced56dbbf1a7df5fef004c7f84f0dccb0ca20ea7ab73c384e4d247eb9700159a18c9a4a51e4db6d
DIST numpy-html-1.10.1.zip 9663942 SHA256 4af48eb5abf2551f01d85aea7e9a99a30096777f02937dc185b16bb72a110366 SHA512 9d1f3619b801c88604a0495290da4ae8cfb4800257d549214363c554c1dc09a736425d594ed88f492afee6ae7c68fe5c166b9b3a8f24637ea41d67fd23b9d9f9 WHIRLPOOL d6c93e31e31c832fb21f117d03719e0375ee3d27fb6f7975bfcd12469df4a2ed0a25a16bd09a0e2113407446efc220e5bff534f7cd76a715c3d7df26c02f07a1
-DIST numpy-html-1.11.0.zip 9879611 SHA256 0244bff4b585ab417be963f492e69129e54bb83d630b463591f9e89c62807d85 SHA512 7bf416030c273c767a98d0f23adef0e5fd05f96f6bb911e32ec88821a5bc7c47a2799d33fb0706cb2d391ea6e47b3e0eef0d789eb1c0d81c982cfaa991a09822 WHIRLPOOL d7e81340aa1ec46c2b0d36b76e7a1e11ba7d1b39177a8168efe734936e1622808c8997a8cc22f773b9c3e17b51f5861e11eaf7fa89e9b0c61cae937ee7b5fdba
DIST numpy-ref-1.10.1.pdf 5382006 SHA256 72ae03348d0375ff2f18056efd04e815cc1d27b738d0685c80f5204a496bc279 SHA512 25085eb7cb80343abffe04ee01ea93603427913ba4443fbfdaa1ef1ad07a8642c47259d0bb1cb91a9059f786c03395bba76f608c6f0a2fd26d1afec4847d885c WHIRLPOOL d904d9b2824bfb08a0eeffeb37f7d646d003c39230d950d387e2ddc8e475a117b8305a0ce3dc479be72f010b1a868f22ddfde17e6c4cd7c56630bbdf09afb90e
-DIST numpy-ref-1.11.0.pdf 5310792 SHA256 a975923b98f4dbd5a4736ab1c74a1c6393f422e3d1f9184bae2f12f041e3ac3e SHA512 a6bed225428645382846fcd60bc7961a44b0dc24cbfab3b4d0a1cee53092860f9db6226faf6597241ad6b9d6034837aace11214e0fc0c338702a574a9acf28df WHIRLPOOL c8757da7b11e4c47813112870dc96868d7bc6886d9454c0d18c6f8cad12c00a2185288233ffc41b580e9e232a1eaa4a19776055cff017ae56ff483fff0da1af1
DIST numpy-user-1.10.1.pdf 406114 SHA256 5180a5a1333365e474aabba9d6edd25276e79179fd708bb3989d95dc4e76215f SHA512 998bce3777944e7b366c619e968ac4b6cc4351cd2819d6ecba7f422e20b6cd4d7332a8dede4036cd12e85b24c4c3d973bd9ef2d407610369c2591fce990fa8f4 WHIRLPOOL 4b53256663840738d288d38c4151e01ecfb515ebd4f69bb4330f4c5589642b3392a0a300f3def53df6bee8746f127a3af0d284601f288f4c4292df8b6de39f71
-DIST numpy-user-1.11.0.pdf 555403 SHA256 7ea6d24169d9e19d20ff131378d2bb5cd8b41658f242c87a1ffc53c3ac2e4b59 SHA512 8287acea5f6981119dfe223ff9cd2fd14f504b9a70418426ab716b80aea670b30249fbd727664ebf72d6d0660a84a57ff027a42cfe67946a7737a4308eebd786 WHIRLPOOL c72ad351a7f5cbd9c123c9d28c8178c7e463ee74e547a415d65dd6a5854fed090d86f9daa088eb79b48ca40e71d0ced5bc7cf938f631aece1846ae7eea9879b4
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
deleted file mode 100644
index 59b4378..0000000
--- a/dev-python/numpy/files/numpy-1.11.1-no-xlocale.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur numpy-1.11.1.orig/numpy/core/src/multiarray/numpyos.c numpy-1.11.1/numpy/core/src/multiarray/numpyos.c
---- numpy-1.11.1.orig/numpy/core/src/multiarray/numpyos.c 2016-06-25 16:59:40.000000000 -0700
-+++ numpy-1.11.1/numpy/core/src/multiarray/numpyos.c 2016-08-30 13:51:30.607025309 -0700
-@@ -15,7 +15,6 @@
-
- #ifdef HAVE_STRTOLD_L
- #include <stdlib.h>
--#include <xlocale.h>
- #endif
-
-
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
deleted file mode 100644
index 9a934cc..0000000
--- a/dev-python/numpy/files/numpy-1.11.2-blas_rec_inc_dir.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-commit 61e9159569a601315b67c30b6e26bbb2149c0bfa
-Author: Benda Xu <heroxbd@gentoo.org>
-Date: Wed Feb 15 11:17:05 2017 +0900
-
- BUG: blas_info should record include_dirs
-
- blas specified in site.cfg could have non-standard include dirs.
- It should be read and saved in distutils/__config__.py
-
-PR: https://github.com/numpy/numpy/pull/8619
-
-diff --git a/numpy/distutils/system_info.py b/numpy/distutils/system_info.py
-index b8520ac..0fba865 100644
---- a/numpy/distutils/system_info.py
-+++ b/numpy/distutils/system_info.py
-@@ -1667,6 +1667,8 @@ class blas_info(system_info):
- info = self.check_libs(lib_dirs, blas_libs, [])
- if info is None:
- return
-+ else:
-+ info['include_dirs'] = self.get_include_dirs()
- if platform.system() == 'Windows':
- # The check for windows is needed because has_cblas uses the
- # same compiler that was used to compile Python and msvc is
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
deleted file mode 100644
index 81d6084..0000000
--- a/dev-python/numpy/files/numpy-1.12.1-no-hardcode-blas.patch
+++ /dev/null
@@ -1,72 +0,0 @@
---- numpy-1.11.1/numpy/distutils/system_info.py
-+++ numpy-1.11.1/numpy/distutils/system_info.py
-@@ -312,27 +312,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
-- '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
-- '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
-- '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
-- 'x11': x11_info,
-+ cl = {'x11': x11_info,
- 'fft_opt': fft_opt_info,
- 'fftw': fftw_info,
- 'fftw2': fftw2_info,
-@@ -669,10 +650,7 @@
- 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):
- static_exts = ['.a']
-@@ -1685,7 +1663,7 @@
- lib = self.has_cblas(info)
- if lib is not None:
- info['language'] = 'c'
-- info['libraries'] = [lib]
-+ info['libraries'] = lib
- info['define_macros'] = [('HAVE_CBLAS', None)]
- self.set_info(**info)
-
-@@ -1718,16 +1696,16 @@
- # check for cblas lib, and if not present check for blas lib.
- try:
- c.link_executable(obj, os.path.join(tmpdir, "a.out"),
-- libraries=["cblas"],
-+ libraries=info["libraries"],
- library_dirs=info['library_dirs'],
- extra_postargs=info.get('extra_link_args', []))
-- res = "cblas"
-+ res = info["libraries"]
- except distutils.ccompiler.LinkError:
- c.link_executable(obj, os.path.join(tmpdir, "a.out"),
- libraries=["blas"],
- library_dirs=info['library_dirs'],
- extra_postargs=info.get('extra_link_args', []))
-- res = "blas"
-+ res = ["blas"]
- except distutils.ccompiler.CompileError:
- res = None
- finally:
diff --git a/dev-python/numpy/numpy-1.12.1.ebuild b/dev-python/numpy/numpy-1.12.1.ebuild
deleted file mode 100644
index 1f23adb..0000000
--- a/dev-python/numpy/numpy-1.12.1.ebuild
+++ /dev/null
@@ -1,165 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-PYTHON_REQ_USE="threads(+)"
-
-FORTRAN_NEEDED=lapack
-
-inherit distutils-r1 flag-o-matic fortran-2 multiprocessing toolchain-funcs versionator
-
-DOC_PV="1.11.0"
-DOC_P="${PN}-${DOC_PV}"
-
-DESCRIPTION="Fast array and numerical python library"
-HOMEPAGE="http://www.numpy.org/"
-SRC_URI="
- mirror://pypi/${PN:0:1}/${PN}/${P}.zip
- doc? (
- http://docs.scipy.org/doc/${DOC_P}/${PN}-html-${DOC_PV}.zip
- http://docs.scipy.org/doc/${DOC_P}/${PN}-ref-${DOC_PV}.pdf
- http://docs.scipy.org/doc/${DOC_P}/${PN}-user-${DOC_PV}.pdf
- )"
-# It appears the docs haven't been upgraded, still @ 1.11.0
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~mips ~ppc ~sh ~sparc ~x86"
-IUSE="doc lapack test"
-
-RDEPEND="lapack? ( virtual/cblas virtual/lapack )"
-DEPEND="${RDEPEND}
- dev-python/setuptools[${PYTHON_USEDEP}]
- doc? ( app-arch/unzip )
- lapack? ( virtual/pkgconfig )
- test? ( >=dev-python/nose-1.0[${PYTHON_USEDEP}] )"
-
-PATCHES=(
- "${FILESDIR}"/${P}-no-hardcode-blas.patch
- "${FILESDIR}"/${PN}-1.11.2-blas_rec_inc_dir.patch
- "${FILESDIR}"/${PN}-1.11.1-no-xlocale.patch
-)
-
-src_unpack() {
- default
- if use doc; then
- unzip -qo "${DISTDIR}"/${PN}-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 libdir="${EPREFIX}"/usr/$(get_libdir)
- cat >> site.cfg <<-EOF || die
- [blas]
- include_dirs = $(pc_incdir cblas)
- library_dirs = $(pc_libdir cblas blas):${libdir}
- blas_libs = $(pc_libs cblas blas)
- [lapack]
- library_dirs = $(pc_libdir lapack):${libdir}
- 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
-
- # we don't have f2py-3.3
- sed \
- -e 's:test_f2py:_&:g' \
- -i numpy/tests/test_scripts.py || die
-
- # QA bug 590464
- # The .py files from numpy/core/tests are just added, instead
- # of being bytecode compiled as a proper subdir package.
- # We trick the buildsystem into accepting it as a bytecode
- # package by adding a setup.py and an empty __init__.py
- #cp numpy/{compat/setup.py,core/tests} || die
- #touch numpy/core/tests/__init__.py || die
- #sed \
- # -e 's:compat:tests:' \
- # -i numpy/core/tests/setup.py || die
- #sed \
- # -e "s:config\.add_data_dir('tests'):config\.add_subpackage('tests'):" \
- # -i numpy/core/setup.py || die
-
- distutils-r1_python_prepare_all
-}
-
-python_compile() {
- distutils-r1_python_compile \
- $(usex python_targets_python3_5 "" "-j $(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.wasSuccessful() else 1)" || die "Tests fail with ${EPYTHON}"
-}
-
-python_install() {
- distutils-r1_python_install ${NUMPY_FCONFIG}
-}
-
-python_install_all() {
- DOCS+=( THANKS.txt )
-
- if use doc; then
- HTML_DOCS=( "${WORKDIR}"/html/. )
- DOCS+=( "${DISTDIR}"/${PN}-{user,ref}-${DOC_PV}.pdf )
- fi
-
- distutils-r1_python_install_all
-
- docinto f2py
- dodoc doc/f2py/*.txt
- doman doc/f2py/f2py.1
-}