Wed Apr 27 22:24:53 UTC 2011

2 files changed, 118 insertions, 29 deletions

diff --git a/community/python-scipy/PKGBUILD b/community/python-scipy/PKGBUILD
index d0acce568..c0dbdcb4a 100755
--- a/community/python-scipy/PKGBUILD
+++ b/community/python-scipy/PKGBUILD
@@ -1,40 +1,85 @@
-#$Id: PKGBUILD 27301 2010-09-19 16:29:18Z schuay $
+# $Id: PKGBUILD 45545 2011-04-24 06:08:32Z schiv $
 # Maintainer: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve>
-# Maintainer: Douglas Soares de Andrade <dsa@aur.archlinux.org>
+# Maintainer: Ray Rashif <schiv@archlinux.org>
+# Contributor: Douglas Soares de Andrade <dsa@aur.archlinux.org>
+# Contributor: Bodor Dávid Gábor <david.gabor.bodor@gmail.com>
+# Contributor: Andrzej Giniewicz <gginiu@gmail.com>
 
-pkgname=python-scipy
-pkgver=0.8.0
-pkgrel=4
-pkgdesc="SciPy (pronounced 'Sigh Pie') is open-source software for mathematics, science, and engineering."
+pkgbase=python-scipy
+_app=scipy
+pkgname=('python-scipy' 'python2-scipy')
+pkgver=0.9.0
+_theapp=$_app-$pkgver
+pkgrel=1
+pkgdesc="SciPy is open-source software for mathematics, science, and engineering."
 arch=('i686' 'x86_64')
-url="http://www.scipy.org"
+url="http://www.scipy.org/"
 license=('BSD')
-depends=('lapack' 'blas' 'python2' 'python-numpy')
-makedepends=('gcc' 'gcc-fortran')
-conflicts=('scipy' 'scipy_core')
-source=("http://downloads.sourceforge.net/scipy/scipy-${pkgver}.tar.gz"
-        '0001-FIX-define-macro-to-access-C99-extensions-from-C.patch')
-md5sums=('f0bfc6141b90e6a31555b31486602251'
-         '609759549d0571fc04d52c89b16258ed')
+depends=('python3-numpy')
+makedepends=('gcc-fortran' 'python2-numpy')
+changelog=$pkgbase.changelog
+source=("http://downloads.sourceforge.net/$_app/$_theapp.tar.gz")
+md5sums=('ebfef6e8e82d15c875a4ee6a46d4e1cd')
 
 build() {
-    unset LDFLAGS
-    unset FFLAGS
+  cd "$srcdir"
 
-    cd ${srcdir}/scipy-${pkgver}
-    #Changing the arithmetic parameter (Thanks to Fabrizio Castellano)
-    sed -i "s/\#define\ UNK\ 1/\#define\ IBMPC\ 1/" $srcdir/scipy-$pkgver/scipy/special/cephes/mconf.h
+  unset LDFLAGS
+  unset FFLAGS
 
-    # fix build with python 2.7 (see http://projects.scipy.org/scipy/ticket/1180)
-    patch -p1 < ${srcdir}/0001-FIX-define-macro-to-access-C99-extensions-from-C.patch
+  # Compatibility symlinks for current stable numpy
+  #   - no need to patch numpy just for this
+  # see http://projects.scipy.org/numpy/ticket/1749
+  ln -sf /usr/lib/liblapack.so liblapack.cpython-32mu.so
+  ln -sf /usr/lib/libblas.so libblas.cpython-32mu.so
+  export LAPACK="$srcdir"
+  export BLAS="$srcdir"
 
-    # python2 fix
-    for file in $(find . -name '*.py' -print); do
-        sed -i 's_^#!.*/usr/bin/python_#!/usr/bin/python2_' $file
-        sed -i 's_^#!.*/usr/bin/env.*python_#!/usr/bin/env python2_' $file
-    done
+  # Changing the arithmetic parameter (Thanks to Fabrizio Castellano)
+  sed -i "s/\#define\ UNK\ 1/\#define\ IBMPC\ 1/" \
+    $_theapp/$_app/special/cephes/mconf.h
 
-    python2 setup.py config_fc --fcompiler=gnu95 build
-    python2 setup.py config_fc --fcompiler=gnu95 install --prefix=/usr --root=${pkgdir}
-    install -D -m644 LICENSE.txt ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.txt
+  # 2 builds
+  cp -r $_theapp $_theapp-py2
+
+  # build for python3
+  cd $_theapp
+  python setup.py config_fc --fcompiler=gnu95 build
+
+  # build for python2
+  cd ../$_theapp-py2
+
+  for file in $(find . -name '*.py' -print); do
+       sed -i 's_^#!.*/usr/bin/python_#!/usr/bin/python2_' $file
+       sed -i 's_^#!.*/usr/bin/env.*python_#!/usr/bin/env python2_' $file
+  done
+
+  python2 setup.py config_fc --fcompiler=gnu95 build
 }
+
+package_python-scipy() {
+  provides=('python3-scipy' 'scipy')
+
+  cd "$srcdir/$_theapp"
+
+  python setup.py config_fc --fcompiler=gnu95 install \
+    --prefix=/usr --root="$pkgdir" --optimize=1
+
+  install -Dm644 LICENSE.txt \
+    "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}
+
+package_python2-scipy() {
+  depends=('python2-numpy')
+  conflicts=('python-scipy<0.9.0')
+
+  cd "$srcdir/$_theapp-py2"
+
+  python2 setup.py config_fc --fcompiler=gnu95 install \
+    --prefix=/usr --root="$pkgdir" --optimize=1
+
+  install -Dm644 LICENSE.txt \
+    "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/python-scipy/python-scipy.changelog b/community/python-scipy/python-scipy.changelog
new file mode 100644
index 000000000..77c6d43a5
--- /dev/null
+++ b/community/python-scipy/python-scipy.changelog
@@ -0,0 +1,44 @@
+2011-04-24 Ray Rashif <schiv@archlinux.org>
+
+	* 0.9.0-1:
+	Couldn't release previous update due to lapack/blas issues
+	See http://mailman.archlinux.org/pipermail/arch-general/2011-April/019677.html
+	Hopefully symlink trick from AUR/python3-scipy fixes that
+
+2011-04-05 Ray Rashif <schiv@archlinux.org>
+
+	* 0.9.0-1:
+	Upstream release
+	SciPy now supports Python 3
+	Package split for python(3), python2
+	PKGBUILD cleanup
+
+2010-07-29  Angel 'angvp' Velasquez <angvp@archlinux.org>
+	* Updated to: 0.8.0
+2009-08-05  Douglas Soares de Andrade  <douglas@archlinux.org>
+
+	* Updated to: 0.7.1
+
+2009-02-11  Douglas Soares de Andrade  <douglas@archlinux.org>
+
+	* Updating for i686: 0.7
+
+2008-12-12  Douglas Soares de Andrade  <douglas@archlinux.org>
+
+	* Updating for i686: 0.7.0 beta 1
+
+2008-11-07  Douglas Soares de Andrade  <douglas@archlinux.org>
+
+	* Updated to svn as scipy 0.6 wont work with python 2.6
+
+2008-02-21  Eric Belanger  <eric@archlinux.org>
+
+	* Added x86_64 arch tag
+	* Added license
+
+2007-10-29  Douglas Soares de Andrade  <dsa@aur.archlinux.org>
+
+	* Changed email
+	* Fixed some problems in the PKGBUILD
+	* Updated to new release - 0.6.0
+