Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/ginac/PKGBUILD
	community/gnash/PKGBUILD
	community/haskell-tar/PKGBUILD
	community/libdlna/PKGBUILD
	community/mplayer2/PKGBUILD
	community/musescore/PKGBUILD
	community/open-vm-tools-modules/PKGBUILD
	community/paraview/PKGBUILD
	community/picard/PKGBUILD
	core/idnkit/PKGBUILD
	core/ifenslave/PKGBUILD
	extra/audacious/PKGBUILD
	extra/avidemux/PKGBUILD
	extra/ffmpeg/PKGBUILD
	extra/graphite/PKGBUILD
	extra/gstreamer0.10-ugly/PKGBUILD
	extra/k3b/PKGBUILD
	extra/kdemultimedia/PKGBUILD
	extra/koffice/PKGBUILD
	extra/kradio/PKGBUILD
	extra/libreoffice/PKGBUILD
	extra/mediastreamer/PKGBUILD
	extra/poppler/PKGBUILD
	extra/vlc/PKGBUILD
	libre/texlive-bin-libre/PKGBUILD

1 files changed, 19 insertions, 30 deletions

diff --git a/community/python-scipy/PKGBUILD b/community/python-scipy/PKGBUILD
index 243f47de6..d9ac969d6 100755
--- a/community/python-scipy/PKGBUILD
+++ b/community/python-scipy/PKGBUILD
@@ -1,50 +1,38 @@
-# $Id: PKGBUILD 57764 2011-11-02 14:37:24Z tdziedzic $
-# Maintainer: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve>
-# Maintainer: Ray Rashif <schiv@archlinux.org>
+# Maintainer: Thomas Dziedzic < gostrc at gmail >
+# Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve>
+# Contributor: 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>
 
-pkgbase=python-scipy
-_app=scipy
 pkgname=('python-scipy' 'python2-scipy')
-pkgver=0.9.0
-_theapp=$_app-$pkgver
-pkgrel=3
+pkgver=0.10.0
+pkgrel=1
 pkgdesc="SciPy is open-source software for mathematics, science, and engineering."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.scipy.org/"
 license=('BSD')
-depends=('python-numpy')
-makedepends=('gcc-fortran' 'python2-numpy')
-source=("http://downloads.sourceforge.net/$_app/$_theapp.tar.gz")
-md5sums=('ebfef6e8e82d15c875a4ee6a46d4e1cd')
+makedepends=('gcc-fortran' 'python-numpy' 'python2-numpy')
+source=("http://downloads.sourceforge.net/scipy/scipy-${pkgver}.tar.gz")
+md5sums=('e357c08425fd031dce63bc4905789088')
 
 build() {
   unset LDFLAGS
   unset FFLAGS
 
-  # 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"
-
   # Changing the arithmetic parameter (Thanks to Fabrizio Castellano)
   sed -i "s/\#define\ UNK\ 1/\#define\ IBMPC\ 1/" \
-    $_theapp/$_app/special/cephes/mconf.h
+    scipy-${pkgver}/scipy/special/cephes/mconf.h
 
   # 2 builds
-  cp -r $_theapp $_theapp-py2
+  cp -r scipy-${pkgver} scipy-${pkgver}-py2
 
   # build for python3
-  cd $_theapp
+  cd scipy-${pkgver}
   python setup.py config_fc --fcompiler=gnu95 build
 
   # build for python2
-  cd ../$_theapp-py2
+  cd ../scipy-${pkgver}-py2
 
   for file in $(find . -name '*.py' -print); do
        sed -i 's_^#!.*/usr/bin/python_#!/usr/bin/python2_' $file
@@ -55,28 +43,29 @@ build() {
 }
 
 package_python-scipy() {
+  depends=('python-numpy')
   provides=('python3-scipy' 'scipy')
 
-  cd "$srcdir/$_theapp"
+  cd scipy-${pkgver}
 
   python setup.py config_fc --fcompiler=gnu95 install \
-    --prefix=/usr --root="$pkgdir" --optimize=1
+    --prefix=/usr --root=${pkgdir} --optimize=1
 
   install -Dm644 LICENSE.txt \
-    "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+    "${pkgdir}/usr/share/licenses/python-scipy/LICENSE"
 }
 
 package_python2-scipy() {
   depends=('python2-numpy')
   conflicts=('python-scipy<0.9.0')
 
-  cd "$srcdir/$_theapp-py2"
+  cd scipy-${pkgver}-py2
 
   python2 setup.py config_fc --fcompiler=gnu95 install \
-    --prefix=/usr --root="$pkgdir" --optimize=1
+    --prefix=/usr --root=${pkgdir} --optimize=1
 
   install -Dm644 LICENSE.txt \
-    "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+    "${pkgdir}/usr/share/licenses/python2-scipy/LICENSE"
 }
 
 # vim:set ts=2 sw=2 et: