v1.13.2

4 files changed, 66 insertions, 92 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7922aa925118..ed5226aaed36 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = python-numpy-mkl
 	pkgdesc = Scientific tools for Python compiled with intel mkl
-	pkgver = 1.13.1
+	pkgver = 1.13.2
 	pkgrel = 1
 	url = http://numpy.scipy.org/
 	arch = i686
@@ -13,30 +13,23 @@ pkgbase = python-numpy-mkl
 	makedepends = python-nose
 	makedepends = python2-nose
 	makedepends = cython
+	makedepends = glibc<2.26
 	depends = intel-mkl
 	depends = python
 	depends = python2
 	options = staticlibs
-	source = https://github.com/numpy/numpy/archive/v1.13.1.tar.gz
+	source = https://github.com/numpy/numpy/archive/v1.13.2.tar.gz
 	source = site64.cfg
 	source = site32.cfg
-	source = https://raw.githubusercontent.com/numpy/numpy/v1.13.1/numpy/distutils/fcompiler/intel.py
-	source = intelccompiler.py
-	source = __init__2.py.patch
-	source = __init__3.py.patch
-	sha256sums = cf8652b96582b282a5bb710aa4fe2300dca63bdd678a3cd7820314cb6c97ca89
+	sha256sums = 11add7a40a868e70b7de8e568e5f20504f4dbfc7fce18887472220c2f5167ae4
 	sha256sums = 86cd68a695a5e1d76f8e53cda70c888c4ed04349f15c8096d4492e346e7187e1
 	sha256sums = 882f2717deca0fd6a2e2384aac2dc7973c566f9cd2ba46777c3b5ffdffa814df
-	sha256sums = e289b6cbb552c547678818172b35cda58064bd39ec2b084c6390142ddf02c4f9
-	sha256sums = a3faf52563f265b8adbb912c6acf969787a9d423e960c877ea9abd128976f814
-	sha256sums = 867e27caa396490e594c269ee24cc8f887a759fccf1f7e507690188f3f84e6f7
-	sha256sums = 867e27caa396490e594c269ee24cc8f887a759fccf1f7e507690188f3f84e6f7
 
 pkgname = python-numpy-mkl
 	depends = intel-mkl
 	depends = python
-	provides = python3-numpy=1.13.1
-	provides = python-numpy=1.13.1
+	provides = python3-numpy=1.13.2
+	provides = python-numpy=1.13.2
 	conflicts = python3-numpy
 	conflicts = python-numpy
 	replaces = python3-numpy
@@ -45,7 +38,7 @@ pkgname = python2-numpy-mkl
 	depends = intel-mkl
 	depends = python2
 	optdepends = python-nose: testsuite
-	provides = python2-numpy=1.13.1
+	provides = python2-numpy=1.13.2
 	conflicts = python2-numpy
 	replaces = python2-numpy
 
diff --git a/PKGBUILD b/PKGBUILD
index da7e66568550..3e725fbb0042 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,107 +7,88 @@ pkgbase="python-numpy-mkl"
 pkgname="python-numpy-mkl"
 true && pkgname=('python-numpy-mkl' 'python2-numpy-mkl')
 #pkgname=('python-numpy')
-pkgver=1.13.1
+pkgver=1.13.2
 pkgrel=1
 pkgdesc="Scientific tools for Python compiled with intel mkl"
 arch=('i686' 'x86_64')
 license=('custom')
 options=('staticlibs')
 url="http://numpy.scipy.org/"
-depends=( 'intel-mkl' 'python' 'python2'  )
-makedepends=( 'python-setuptools' 'python2-setuptools' 'intel-compiler-base' 'intel-fortran-compiler'  'python-nose' 'python2-nose' 'cython' )
+depends=( 'intel-mkl' 'python' 'python2' )
+makedepends=( 'python-setuptools' 'python2-setuptools' 'intel-compiler-base' 'intel-fortran-compiler' 'python-nose' 'python2-nose' 'cython' 'glibc<2.26' )
 
 source=( https://github.com/numpy/numpy/archive/v${pkgver}.tar.gz 
-	  'site64.cfg' 
-	  'site32.cfg' 
-	  https://raw.githubusercontent.com/numpy/numpy/v${pkgver}/numpy/distutils/fcompiler/intel.py 
-	  'intelccompiler.py' 
-	  '__init__2.py.patch' 
-	  '__init__3.py.patch' )
-
-sha256sums=( 'cf8652b96582b282a5bb710aa4fe2300dca63bdd678a3cd7820314cb6c97ca89' # main pkg§
+         'site64.cfg' 
+         'site32.cfg') 
+
+sha256sums=( '11add7a40a868e70b7de8e568e5f20504f4dbfc7fce18887472220c2f5167ae4' # main pkg§
              '86cd68a695a5e1d76f8e53cda70c888c4ed04349f15c8096d4492e346e7187e1' # site64
              '882f2717deca0fd6a2e2384aac2dc7973c566f9cd2ba46777c3b5ffdffa814df' # site32
-             'e289b6cbb552c547678818172b35cda58064bd39ec2b084c6390142ddf02c4f9' # intel.py
-             'a3faf52563f265b8adbb912c6acf969787a9d423e960c877ea9abd128976f814' # intelccompiler.py
-             '867e27caa396490e594c269ee24cc8f887a759fccf1f7e507690188f3f84e6f7' # __init__2.py.patch
-             '867e27caa396490e594c269ee24cc8f887a759fccf1f7e507690188f3f84e6f7' # __init__3.py.patch
 )
 
 build() {
 
-  cd "${srcdir}"
-  
-  if [ "$CARCH" = "i686" ]; then
-      cp ${srcdir}/site32.cfg ${srcdir}/site.cfg
-      _compiler=intel
-  else
-      cp ${srcdir}/site64.cfg ${srcdir}/site.cfg
-      _compiler=intelem
-  fi
-
-  
-  cp -a numpy-${pkgver} numpy-py2-${pkgver}
-
-  export Atlas=None
-  export LDFLAGS="$LDFLAGS -shared"
-
-  echo "Building Python2"
-  cd "${srcdir}"
-  cp ${srcdir}/site.cfg "${srcdir}/numpy-py2-${pkgver}"
-  cp ${srcdir}/intelccompiler.py "${srcdir}/numpy-py2-${pkgver}/numpy/distutils"
-  cp ${srcdir}/intel.py "${srcdir}/numpy-py2-${pkgver}/numpy/distutils/fcompiler/"
-  cd "${srcdir}/numpy-py2-${pkgver}"
-
-  #patch ${srcdir}/numpy-${pkgver}/numpy/numpy/core/src/multiarray/scalarapi.c ${srcdir}/numpy-1.6.2-python-3.3-build-fix.patch
-  python2 setup.py config --compiler=intel build_clib --compiler=${_compiler} build_ext --compiler=${_compiler}
-
-  echo "Building Python3"
-  cd "${srcdir}"
-  cp ${srcdir}/site.cfg "${srcdir}/numpy-${pkgver}"
-  cp ${srcdir}/intelccompiler.py "${srcdir}/numpy-${pkgver}/numpy/distutils"
-  cp ${srcdir}/intel.py "${srcdir}/numpy-${pkgver}/numpy/distutils/fcompiler/"
-  cd "${srcdir}/numpy-${pkgver}"
-
-  #patch -p1 -i ${srcdir}/numpy-1.6.2-python-3.3-build-fix.patch
-  
-  python setup.py config --compiler=intel build_clib --compiler=${_compiler} build_ext --compiler=${_compiler}
+cd "${srcdir}"
+
+if [ "$CARCH" = "i686" ]; then
+    cp ${srcdir}/site32.cfg ${srcdir}/site.cfg
+    _compiler=intel
+else
+    cp ${srcdir}/site64.cfg ${srcdir}/site.cfg
+    _compiler=intelem
+fi
+
+
+cp -a numpy-${pkgver} numpy-py2-${pkgver}
+
+export Atlas=None
+export LDFLAGS="$LDFLAGS -shared"
+
+echo "Building Python2"
+cd "${srcdir}"
+cp ${srcdir}/site.cfg "${srcdir}/numpy-py2-${pkgver}"
+cd "${srcdir}/numpy-py2-${pkgver}"
+
+python2 setup.py config --compiler=${_compiler} build_clib --compiler=${_compiler} build_ext --compiler=${_compiler}
+
+echo "Building Python3"
+cd "${srcdir}"
+cp ${srcdir}/site.cfg "${srcdir}/numpy-${pkgver}"
+cd "${srcdir}/numpy-${pkgver}"
+
+python setup.py config --compiler=${_compiler} build_clib --compiler=${_compiler} build_ext --compiler=${_compiler}
 }
 
 package_python2-numpy-mkl() {
-  
-  depends=('intel-mkl' 'python2')
-  provides=( "python2-numpy=${pkgver}" )
-  replaces=( "python2-numpy" )
-  conflicts=( "python2-numpy" )
-  optdepends=('python-nose: testsuite')
 
-  cd "${srcdir}/numpy-py2-${pkgver}"
-  python2 setup.py config_fc install --prefix=/usr --root="${pkgdir}" --optimize=1
+depends=('intel-mkl' 'python2')
+provides=( "python2-numpy=${pkgver}" )
+replaces=( "python2-numpy" )
+conflicts=( "python2-numpy" )
+optdepends=('python-nose: testsuite')
 
-  install -m755 -d "${pkgdir}/usr/share/licenses/python2-numpy"
-  install -m644 LICENSE.txt "${pkgdir}/usr/share/licenses/python2-numpy/"
+cd "${srcdir}/numpy-py2-${pkgver}"
+python2 setup.py config_fc install --prefix=/usr --root="${pkgdir}" --optimize=1
 
-  sed -i -e "s|#![ ]*/usr/bin/python$|#!/usr/bin/python2|" \
-         -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \
-         -e "s|#![ ]*/bin/env python$|#!/usr/bin/env python2|" \
-             $(find ${pkgdir} -name '*.py')
+install -m755 -d "${pkgdir}/usr/share/licenses/python2-numpy"
+install -m644 LICENSE.txt "${pkgdir}/usr/share/licenses/python2-numpy/"
 
-  patch ${pkgdir}/usr/lib/python2.7/site-packages/numpy/distutils/fcompiler/__init__.py ${srcdir}/__init__2.py.patch
+sed -i -e "s|#![ ]*/usr/bin/python$|#!/usr/bin/python2|" \
+-e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \
+-e "s|#![ ]*/bin/env python$|#!/usr/bin/env python2|" \
+$(find ${pkgdir} -name '*.py')
 }
 
 package_python-numpy-mkl() {
 
-  depends=('intel-mkl' 'python')
-  provides=("python3-numpy=${pkgver}" "python-numpy=${pkgver}")
-  replaces=('python3-numpy')
-  conflicts=('python3-numpy' 'python-numpy')
-
-  cd "${srcdir}/numpy-${pkgver}"
-  python setup.py config_fc install --prefix=/usr --root="${pkgdir}" --optimize=1
+depends=('intel-mkl' 'python')
+provides=("python3-numpy=${pkgver}" "python-numpy=${pkgver}")
+replaces=('python3-numpy')
+conflicts=('python3-numpy' 'python-numpy')
 
-  install -m755 -d "${pkgdir}/usr/share/licenses/python3-numpy"
-  install -m644 LICENSE.txt "${pkgdir}/usr/share/licenses/python3-numpy/"
+cd "${srcdir}/numpy-${pkgver}"
+python setup.py config_fc install --prefix=/usr --root="${pkgdir}" --optimize=1
 
-  patch ${pkgdir}/usr/lib/python3.6/site-packages/numpy/distutils/fcompiler/__init__.py ${srcdir}/__init__3.py.patch
+install -m755 -d "${pkgdir}/usr/share/licenses/python3-numpy"
+install -m644 LICENSE.txt "${pkgdir}/usr/share/licenses/python3-numpy/"
 }
diff --git a/__init__2.py.patch b/__init__2.py.patch
index f3c60077a9d8..9e7171f03993 100644
--- a/__init__2.py.patch
+++ b/__init__2.py.patch
@@ -4,4 +4,4 @@
 ---
 >             pass
 >             #raise CompilerNotFound()
->         return '17.0'
+>         return '18.0'
diff --git a/__init__3.py.patch b/__init__3.py.patch
index f3c60077a9d8..9e7171f03993 100644
--- a/__init__3.py.patch
+++ b/__init__3.py.patch
@@ -4,4 +4,4 @@
 ---
 >             pass
 >             #raise CompilerNotFound()
->         return '17.0'
+>         return '18.0'