From 166ace4e82de71a5a8a1a5037c8a59b2d81a61de Mon Sep 17 00:00:00 2001
From: bra1nwave <brainwave@openmailbox.org>
Date: Sun, 11 Aug 2019 17:55:18 +0200
Subject: [PATCH] python-numpy: update to 1.16.4.

---
 .../patches/numpy_f2py_setup.patch            | 11 ------
 srcpkgs/python-numpy/template                 | 35 +++++--------------
 srcpkgs/python3-numpy                         |  1 -
 3 files changed, 9 insertions(+), 38 deletions(-)
 delete mode 100644 srcpkgs/python-numpy/patches/numpy_f2py_setup.patch
 delete mode 120000 srcpkgs/python3-numpy

diff --git a/srcpkgs/python-numpy/patches/numpy_f2py_setup.patch b/srcpkgs/python-numpy/patches/numpy_f2py_setup.patch
deleted file mode 100644
index f743caad748..00000000000
--- a/srcpkgs/python-numpy/patches/numpy_f2py_setup.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- numpy/f2py/setup.py.orig
-+++ numpy/f2py/setup.py
-@@ -55,7 +55,7 @@ def configuration(parent_package='', top
-     config.make_svn_version_py()
- 
-     def generate_f2py_py(build_dir):
--        f2py_exe = 'f2py' + os.path.basename(sys.executable)[6:]
-+        f2py_exe = 'f2py'
-         if f2py_exe[-4:] == '.exe':
-             f2py_exe = f2py_exe[:-4] + '.py'
-         if 'bdist_wininst' in sys.argv and f2py_exe[-3:] != '.py':
diff --git a/srcpkgs/python-numpy/template b/srcpkgs/python-numpy/template
index c8ec63efa7a..05c348ba915 100644
--- a/srcpkgs/python-numpy/template
+++ b/srcpkgs/python-numpy/template
@@ -1,47 +1,30 @@
 # Template file for 'python-numpy'
 pkgname=python-numpy
-version=1.15.4
-revision=2
+version=1.16.4
+revision=1
 wrksrc="numpy-${version}"
-build_style=python-module
+build_style=python2-module
 pycompile_module="numpy"
-hostmakedepends="python-setuptools python3-setuptools
- python-Cython python3-Cython gcc-fortran"
-makedepends="python-devel python3-devel lapack-devel cblas-devel"
+hostmakedepends="python-setuptools python-Cython gcc-fortran"
+makedepends="python-devel lapack-devel cblas-devel"
 short_desc="Fast and sophisticated array facility to Python2"
 maintainer="Alessio Sergi <al3hex@gmail.com>"
-homepage="https://www.numpy.org/"
 license="BSD-3-Clause"
+homepage="https://www.numpy.org/"
 distfiles="https://github.com/numpy/numpy/archive/v${version}.tar.gz"
-checksum=3b1744b96ce41fff1c7e19144ca85cbbfb11e4b4e0e13080ca374df212801dbb
+checksum=3bdabda4a2ac4f1986b4bc55f865cd0b68b71edc9420b03e911e0ee52743e9c4
 alternatives="numpy:f2py:/usr/bin/f2py2"
 
 nocross="https://build.voidlinux.org/builders/armv7l_builder/builds/1408/steps/shell_3/logs/stdio"
 
-export ATLAS=None
-LDFLAGS="-shared"
-
 post_install() {
 	# create compat symlinks for .h files
 	vmkdir ${py2_inc}
 	ln -sfr ${DESTDIR}/${py2_sitelib}/numpy/core/include/numpy \
 		${DESTDIR}/${py2_inc}
-	vmkdir ${py3_inc}
-	ln -sfr ${DESTDIR}/${py3_sitelib}/numpy/core/include/numpy \
-		${DESTDIR}/${py3_inc}
+
+	rm -f ${DESTDIR}/usr/bin/f2py
 
 	rm -f ${DESTDIR}/usr/lib/python*/site-packages/numpy/LICENSE.txt
 	vlicense LICENSE.txt LICENSE
 }
-
-python3-numpy_package() {
-	alternatives="numpy:f2py:/usr/bin/f2py3"
-	pycompile_module="numpy"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/bin/f2py3
-		vmove ${py3_sitelib}
-		vmove ${py3_inc}
-		vlicense LICENSE.txt LICENSE
-	}
-}
diff --git a/srcpkgs/python3-numpy b/srcpkgs/python3-numpy
deleted file mode 120000
index 69b83ae14d8..00000000000
--- a/srcpkgs/python3-numpy
+++ /dev/null
@@ -1 +0,0 @@
-python-numpy
\ No newline at end of file