sagemath-7.1-4.parabola1: updating version

1 files changed, 19 insertions, 20 deletions

diff --git a/libre/sagemath/PKGBUILD b/libre/sagemath/PKGBUILD
index f1b948ccb..cb4e7432b 100644
--- a/libre/sagemath/PKGBUILD
+++ b/libre/sagemath/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 165384 2016-03-06 15:37:18Z arojas $
+# $Id: PKGBUILD 169479 2016-04-04 18:15:22Z arojas $
 # Maintainer (Arch): Evgeniy Alekseev <arcanis.arch at gmail dot com>
 # Maintainer (Arch): Antonio Rojas <arojas@archlinux.org>
 # Contributor (Arch): Daniel Wallace <danielwallace at gtmanfred dot com>
@@ -10,13 +10,13 @@
 # Maintainer: André Silva <emulatorman@parabola.nu>
 
 pkgname=sagemath
-pkgver=7.0
-pkgrel=6.parabola1
-pkgdesc="Free Mathematics Software, free software replacement of Magma, Maple, Mathematica, and Matlab, without nonfree nauty recommendation"
+pkgver=7.1
+pkgrel=4.parabola1
+pkgdesc="Free Mathematics Software, free software replacement of Magma, Maple, Mathematica, and Matlab, without nonfree nauty support"
 arch=(i686 x86_64)
 url="http://www.sagemath.org"
 license=(GPL)
-depends=(ipython2 atlas-lapack ppl mpfi palp brial singular cliquer maxima-ecl gfan sympow tachyon python2-rpy2
+depends=(ipython2 cysignals ppl mpfi palp brial singular cliquer maxima-ecl gfan sympow tachyon python2-rpy2
   python2-matplotlib python2-scipy python2-sympy python2-networkx python2-igraph libgap flintqs lcalc lrcalc lrs arb
   eclib gmp-ecm zn_poly gd python2-cvxopt pynac linbox gsl rubiks pari-galdata pari-seadata-small planarity rankwidth
   sage-data-combinatorial_designs sage-data-elliptic_curves sage-data-graphs sage-data-polytopes_db sage-data-conway_polynomials)
@@ -26,31 +26,29 @@ optdepends=('cython2: to compile cython code' 'jmol: 3D plots' 'sage-notebook: B
   'buckygen: for generating fullerene graphs' 'plantri: for generating some classes of graphs' 'benzene: for generating fusenes and benzenoids'
   'modular_decomposition: modular decomposition of graphs' 'ffmpeg: to export animations to video' 'imagemagick: to show animations'
   'coxeter3: Coxeter groups implementation' 'cryptominisat: SAT solver' 'gap-data: for computing Galois groups'
-  'jupyter-notebook: Jupyter notebook interface')
-makedepends=(cython2 boost ratpoints symmetrica fflas-ffpack python2-jinja coin-or-cbc
-  mcqd coxeter3 cryptominisat modular_decomposition bliss-graphs tdlib) # libfes
+  'jupyter-notebook: Jupyter notebook interface' 'atlas-lapack: improved performance for some linear algebra operations')
+makedepends=(cython2-devel boost ratpoints symmetrica fflas-ffpack python2-jinja coin-or-cbc
+  mcqd coxeter3 cryptominisat modular_decomposition bliss-graphs tdlib python2-pkgconfig meataxe) # libfes
 conflicts=(sage-mathematics)
 replaces=(sage-mathematics)
 provides=(sage-mathematics)
 source=("$pkgname-$pkgver.tar.gz::https://github.com/sagemath/sage/archive/$pkgver.tar.gz"
 	pexpect.zip::"https://github.com/pexpect/pexpect/archive/524495960dd8898ddd30f7ba37298de51beee773.zip"
-	ntl-no-legacy-mulmod.patch::"http://git.sagemath.org/sage.git/patch/?id=0d8435cdf"
 	anal.h package.patch env.patch paths.patch clean.patch skip-check.patch
-	disable-fes.patch jupyter-path.patch test-optional.patch python-2.7.11.patch contour.patch)
-md5sums=('34807a7cf5dd79c008abd377ba1427fa'
+	disable-fes.patch jupyter-path.patch test-optional.patch python-2.7.11.patch gap-4.8.patch)
+md5sums=('c68e846444b9370fe79f43395cdc2725'
          'a346bb2c0350c1cb17d5325235c5e38a'
-         '8cd491caa5a574fb6348a02715151855'
          'a906a180d198186a39820b0a2f9a9c63'
          '9ba81f717ffd4e20b8b2f2a318307488'
-         'e1b1d0d2e6b187309ae2b74489356b9a'
-         'fd8e3e07f5b7318e6a7200a3c64f5bc2'
+         '21010618e80fc28582a84695a1fed0e5'
+         '0f746ed394fd7eb7a6b3963014976098'
          '6d9ae0978ce6a05a0da2cafdfb178a09'
          '5947a420a0b1483f0cbc74c76895789b'
          '4eb23a3c7363258bc9ba764d6e5512ba'
          '16b529194c6105c3364127bd8f1efa83'
          'cdcabd475b80afe0534a5621e972736e'
          'ef927896f2071b442b1d07d7e69f5f3a'
-         '930cb987f63fd465a3a7123b0f5c2b85')
+         '8f631f4132d3a97dade07e4c60044aed')
 
 prepare(){
   cd sage-$pkgver
@@ -83,16 +81,14 @@ prepare(){
   patch -p0 -i ../jupyter-path.patch
 # fix timeit with Python 2.7.11
   patch -p0 -i ../python-2.7.11.patch
-# fix contour plots with matplotlib 1.5.1
-  patch -p0 -i ../contour.patch
 
 # Upstream patches  
 # fix build against libfes 0.2 http://trac.sagemath.org/ticket/15209
 #  patch -p0 -i ../fes02.patch
 # disable fes module, fails to compile
   patch -p0 -i ../disable-fes.patch
-# port away from deprecated NTL API http://trac.sagemath.org/19874
-  patch -p1 -i ../ntl-no-legacy-mulmod.patch
+# port to GAP 4.8 http://trac.sagemath.org/ticket/19911
+  patch -p1 -i ../gap-4.8.patch
 
 # use python2
   sed -e 's|#!/usr/bin/env python|#!/usr/bin/env python2|' -e 's|exec python|exec python2|' -i src/bin/*
@@ -139,7 +135,7 @@ package() {
 
   mkdir -p "$pkgdir"/usr/bin
   cp bin/sage "$pkgdir"/usr/bin
-  for _i in arch-env banner cachegrind callgrind cleaner coverage coverageall CSI CSI-helper.py cython env eval grep grepdoc inline-fortran ipython \
+  for _i in arch-env banner cachegrind callgrind cleaner coverage coverageall cython env eval grep grepdoc inline-fortran ipython \
     massif maxima.lisp native-execute notebook num-threads.py omega open preparse python rst2sws rst2txt run run-cython runtests startuptime.py \
     sws2rst valgrind version.sh
   do
@@ -153,6 +149,9 @@ package() {
 # Create SAGE_SRC, needed for the notebook
   mkdir "$pkgdir"/usr/share/sage/source
 
+# Remove sage_setup
+  rm -r "$pkgdir"/usr/lib/python2.7/site-packages/sage_setup
+
 # install pexpect
   cd "$srcdir"/pexpect-*
   python2 setup.py install --root="$pkgdir" --optimize=1