[arch-commits] Commit in sagemath/trunk (PKGBUILD)

[Antonio Rojas]

    Date: Wednesday, April 15, 2015 @ 10:34:57
  Author: arojas
Revision: 131395

Restore proper source tarball name, add imagemagick optdepend

Modified:
  sagemath/trunk/PKGBUILD

----------+
 PKGBUILD |   25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-04-15 06:42:38 UTC (rev 131394)
+++ PKGBUILD	2015-04-15 08:34:57 UTC (rev 131395)
@@ -24,7 +24,7 @@
   'coin-or-cbc: COIN backend for numerical computations' 'nauty: for generating some classes of graphs'
   'buckygen: for generating fullerene graphs' 'plantri: for generating some classes of graphs' 'benzene: for generating fusenes and benzenoids'
   'libfes: exhaustive search of solutions for boolean polynomial systems' 'modular_decomposition: modular decomposition of graphs'
-  'lrs: Algorithms for linear reverse search used in game theory and for computing volume of polytopes'
+  'lrs: Algorithms for linear reverse search used in game theory and for computing volume of polytopes' 'imagemagick: to show animations'
   'coxeter3: Coxeter groups implementation' 'cryptominisat: SAT solver' 'arb: floating-point ball arithmetic')
 makedepends=('cython2' 'boost' 'scons' 'ratpoints' 'symmetrica' 'fflas-ffpack' 'python2-jinja' 'coin-or-cbc' 'mcqd' 'libfes' 'coxeter3'
   'cryptominisat' 'arb' 'modular_decomposition')
@@ -31,7 +31,8 @@
 conflicts=('sage-mathematics')
 replaces=('sage-mathematics')
 provides=('sage-mathematics')
-source=("https://github.com/sagemath/sage/archive/$pkgver.tar.gz" "http://www.sagemath.org/packages/upstream/pexpect/pexpect-2.0.tar.bz2" 
+source=("$pkgname-$pkgver.tar.gz::https://github.com/sagemath/sage/archive/$pkgver.tar.gz" 
+"http://www.sagemath.org/packages/upstream/pexpect/pexpect-2.0.tar.bz2" 
 'anal.h' 'package.patch' 'c_lib.patch' 'env.patch' 'paths.patch' 'clean.patch' 'skip-check.patch' 
 'pexpect-env.patch' 'pexpect-del.patch' 'fes02.patch')
 md5sums=('91eefd257f535ed2af337eeffab4c9bd'
@@ -52,23 +53,23 @@
 
 # Arch-specific patches
 # assume all optional packages are installed
-  patch -p0 -i $srcdir/package.patch
+  patch -p0 -i "$srcdir"/package.patch
 # don't assume Sage is already available (Fedora)
-  patch -p0 -i $srcdir/c_lib.patch
+  patch -p0 -i "$srcdir"/c_lib.patch
 # find L.h header
   sed -e 's|libLfunction|Lfunction|' -i src/module_list.py
 # don't try to link against libpng 1.2
   sed -e 's|png12|png|' -i src/module_list.py
 # set env variables
-  patch -p0 -i $srcdir/env.patch
+  patch -p0 -i "$srcdir"/env.patch
 # fix paths in python imports
-  patch -p0 -i $srcdir/paths.patch
+  patch -p0 -i "$srcdir"/paths.patch
 # fix cython linking
   sed -e "s| atlas(),||" -i src/sage/misc/cython.py
 # don't try to remove installed files
-  patch -p0 -i $srcdir/clean.patch
+  patch -p0 -i "$srcdir"/clean.patch
 # skip checking build status
-  patch -p0 -i $srcdir/skip-check.patch
+  patch -p0 -i "$srcdir"/skip-check.patch
 # supress warning about GAP install dir
   sed -e "s|gapdir = os.path.join(SAGE_LOCAL, 'gap', 'latest')|gapdir = '/usr/lib/gap'|" -i src/sage/libs/gap/util.pyx 
 # fix Cremona database detection
@@ -79,7 +80,7 @@
 
 # Upstream patches  
 # fix build against libfes 0.2 http://trac.sagemath.org/ticket/15209
-  patch -p0 -i $srcdir/fes02.patch
+  patch -p0 -i "$srcdir"/fes02.patch
 
 # use python2
   sed -e 's|#!/usr/bin/env python|#!/usr/bin/env python2|' -e 's|exec python|exec python2|' -i src/bin/*
@@ -93,9 +94,9 @@
 
   cd $srcdir/pexpect-2.0
 # fix env in pexpect
-  patch -p1 -i $srcdir/pexpect-env.patch
+  patch -p1 -i "$srcdir"/pexpect-env.patch
 # hide exceptions in pexpect
-  patch -p1 -i $srcdir/pexpect-del.patch
+  patch -p1 -i "$srcdir"/pexpect-del.patch
 }
 
 
@@ -112,7 +113,7 @@
   python2 setup.py build
 
 # build pexpect
-  pushd $srcdir/pexpect-2.0
+  pushd "$srcdir"/pexpect-2.0
     python2 setup.py build
   popd
 }