sagemath-7.2-2.parabola1: updating version

1 files changed, 19 insertions, 15 deletions

diff --git a/libre/sagemath/PKGBUILD b/libre/sagemath/PKGBUILD
index 292176d53..e074b7bc0 100644
--- a/libre/sagemath/PKGBUILD
+++ b/libre/sagemath/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 171916 2016-04-26 17:25:19Z arojas $
+# $Id: PKGBUILD 175566 2016-05-17 19:19:04Z 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,14 +10,14 @@
 # Maintainer: André Silva <emulatorman@parabola.nu>
 
 pkgname=sagemath
-pkgver=7.1
-pkgrel=9.parabola1
+pkgver=7.2
+pkgrel=2.parabola1
 pkgdesc="Free Mathematics Software, free software replacement of Magma, Maple, Mathematica, and Matlab, without nonfree nauty support"
 arch=(i686 x86_64 armv7h)
 url="http://www.sagemath.org"
 license=(GPL)
 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 python2-pillow libgap flintqs lcalc lrcalc lrs arb
+  python2-matplotlib python2-scipy python2-sympy python2-networkx python2-igraph python2-pillow libgap flintqs lcalc lrcalc 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)
 optdepends=('cython2: to compile cython code' 'jmol: 3D plots' 'sage-notebook: Browser-based (flask) notebook interface'
@@ -26,6 +26,7 @@ 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'
+  'lrs: Algorithms for linear reverse search used in game theory and for computing volume of polytopes'
   'jupyter-notebook: Jupyter notebook interface' 'atlas-lapack: improved performance for some linear algebra operations')
 makedepends=(cython2 boost ratpoints symmetrica fflas-ffpack python2-jinja coin-or-cbc
   mcqd coxeter3 cryptominisat modular_decomposition bliss-graphs tdlib python2-pkgconfig meataxe) # libfes
@@ -34,22 +35,24 @@ 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"
-        anal.h package.patch env.patch paths.patch clean.patch skip-check.patch cython-sys-path.patch
-        disable-fes.patch jupyter-path.patch test-optional.patch python-2.7.11.patch gap-4.8.patch)
-md5sums=('c68e846444b9370fe79f43395cdc2725'
+        anal.h env.patch paths.patch clean.patch skip-check.patch cython-sys-path.patch is-package-installed.patch package.patch
+        disable-fes.patch jupyter-path.patch test-optional.patch python-2.7.11.patch linbox-1.4.patch ecm-7.patch)
+md5sums=('2afeb8f75a33107fef5d509698c0eabc'
          'a346bb2c0350c1cb17d5325235c5e38a'
          'a906a180d198186a39820b0a2f9a9c63'
-         '9ba81f717ffd4e20b8b2f2a318307488'
          'f6c62f0ccc168c5e6e3dd9d6f73f6389'
-         '0f746ed394fd7eb7a6b3963014976098'
+         '52d30e91110183489f66d7bf73c36c64'
          '6d9ae0978ce6a05a0da2cafdfb178a09'
          '5947a420a0b1483f0cbc74c76895789b'
          'a1bcdd3fe620dbae60ed8b0e98b2ece7'
+         '541988696465f204235d595a349017f3'
+         '9ba81f717ffd4e20b8b2f2a318307488'
          '4eb23a3c7363258bc9ba764d6e5512ba'
          '16b529194c6105c3364127bd8f1efa83'
          'cdcabd475b80afe0534a5621e972736e'
          'ef927896f2071b442b1d07d7e69f5f3a'
-         '8f631f4132d3a97dade07e4c60044aed')
+         '9f1cef3e477bafebe2ad301db56db8a2'
+         '0c9a57d35de80c2cd418ebec912efbbb')
 
 prepare(){
   cd sage-$pkgver
@@ -71,9 +74,6 @@ prepare(){
   patch -p0 -i ../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
-  sed -e "s|is_package_installed('database_cremona_ellcurve')|os.path.exists('/usr/share/sage/cremona/cremona.db')|" \
-   -i src/sage/databases/cremona.py
 # find bliss headers
   sed -e 's|graph.hh|bliss/graph.hh|' -i src/sage/graphs/bliss.pyx
 # don't list optional packages when running tests
@@ -84,14 +84,18 @@ prepare(){
   patch -p0 -i ../python-2.7.11.patch
 # search system paths for cython includes
   patch -p1 -i ../cython-sys-path.patch
+# fix regressions with ECM 7
+  patch -p1 -i ../ecm-7.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 to GAP 4.8 http://trac.sagemath.org/ticket/19911
-  patch -p1 -i ../gap-4.8.patch
+# port to new givaro/fflas-ffpack/linbox http://trac.sagemath.org/ticket/17635
+  patch -p1 -i ../linbox-1.4.patch
+# replace is_package_installed usage http://trac.sagemath.org/ticket/20377
+  patch -p1 -i ../is-package-installed.patch
 
 # use python2
   sed -e 's|#!/usr/bin/env python|#!/usr/bin/env python2|' -e 's|exec python|exec python2|' -i src/bin/*