sagemath-7.5-2.parabola1: updating version

1 files changed, 12 insertions, 31 deletions

diff --git a/libre/sagemath/PKGBUILD b/libre/sagemath/PKGBUILD
index 56d36aaed..2afee391c 100644
--- a/libre/sagemath/PKGBUILD
+++ b/libre/sagemath/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 204126 2017-01-01 18:28:53Z arojas $
+# $Id: PKGBUILD 207027 2017-01-12 16:53:13Z 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.4
-pkgrel=15.parabola1
+pkgver=7.5
+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 ppl palp brial cliquer maxima-ecl gfan sympow tachyon python2-rpy2 python2-fpylll
+depends=(ipython2 ppl palp brial cliquer maxima-ecl gfan sympow tachyon python2-rpy2 python2-fpylll python2-psutil
   python2-matplotlib python2-scipy python2-sympy python2-networkx python2-pillow python2-future libgap flintqs lcalc lrcalc arb
   eclib gmp-ecm zn_poly gd python2-cvxopt pynac linbox 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)
@@ -37,24 +37,19 @@ replaces=(sage-mathematics)
 provides=(sage-mathematics)
 source=("$pkgname-$pkgver.tar.gz::https://github.com/sagemath/sage/archive/$pkgver.tar.gz"
         env.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 ecm-7.patch increase-rtol.patch sagemath-singular4.patch
-        sagemath-cython0.25.patch pynac-0.7.1.patch sagemath-python2-pkgconfig-1.2.patch)
-md5sums=('8311ee35a309dbc668b5148795211254'
-         '784ba3fca83f24ed0bbf62e01fa4e967'
+        jupyter-path.patch test-optional.patch ecm-7.patch increase-rtol.patch sagemath-gslcblas.patch)
+md5sums=('bff1fb8793ebc2934d14cf1efdcfbea3'
+         '70b7c1c5da6400e1ae48cf1e5a2d2879'
          '6cafcb381437d4751fd55b25d5090987'
-         'a1bcdd3fe620dbae60ed8b0e98b2ece7'
-         '5dca842e4440e4ef235ae18c1b1f20e3'
+         '0de8f29a99a48e2ca2a13045f122c386'
+         '409b0a2c520eb33281b5f262afcb6c76'
          'ccfd5b1bc4796f414f1531be52504dd7'
          '06a67e611d10aa2381efe1f08ea4ffd9'
          '0d88207416dfb98a17bf8886257d9a02'
          '921017fd2d9dadbb6b602ac0476bfd58'
-         'ef927896f2071b442b1d07d7e69f5f3a'
          '0c9a57d35de80c2cd418ebec912efbbb'
          '39d3fded716d2a7ae0ab03e0896b7497'
-         '4bd7305e8b69add8356f9751470cf587'
-         'e76faa070a490de97818762ba340d9dc'
-         '32da930dcb7c4718acf0188e090c07b9'
-         '329a483b16c0e1960b15b3ca3082f2d0')
+         'a3ca7c861c19eb1c605a43641cb6923f')
 
 prepare(){
   cd sage-$pkgver
@@ -62,20 +57,14 @@ prepare(){
 # Parabola-specific patches
 # assume all optional packages are installed
   patch -p0 -i ../package.patch
-# 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 ../env.patch
 # skip checking build status
   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 
 # don't list optional packages when running tests
   patch -p0 -i ../test-optional.patch
 # set jupyter path
   patch -p0 -i ../jupyter-path.patch
-# fix timeit with Python 2.7.11
-  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
@@ -90,22 +79,14 @@ prepare(){
   patch -p0 -i ../disable-fes.patch
 # replace is_package_installed usage http://trac.sagemath.org/ticket/20377
   patch -p1 -i ../is-package-installed.patch
-# port to Singular 4 https://trac.sagemath.org/ticket/17254
-  patch -p1 -i ../sagemath-singular4.patch
-# fix build with cython 0.25
-  patch -p1 -i ../sagemath-cython0.25.patch
-# port to pynac 0.7.1
-  patch -p1 -i ../pynac-0.7.1.patch
-
-# fix build with python2-pkgconfig 1.2
-  patch -p1 -i ../sagemath-python2-pkgconfig-1.2.patch
+# don't remove gslcblas from gsl libraries https://trac.sagemath.org/ticket/22085
+  patch -p1 -i ../sagemath-gslcblas.patch
 
 # use python2
   sed -e 's|#!/usr/bin/env python|#!/usr/bin/env python2|' -e 's|exec python|exec python2|' -i src/bin/*
   sed -e 's|cython {OPT}|cython2 {OPT}|' -e 's|python setup.py|python2 setup.py|' -i src/sage/misc/cython.py
   sed -e 's|exec ipython|exec ipython2|' -e 's|cygdb|cygdb2|g' -i src/bin/sage
   sed -e "s|'cython'|'cython2'|" -i src/bin/sage-cython
-  sed -e 's|python -c|python2 -c|' -i src/generate_py_source.mk
   sed -e 's|bin/python|bin/python2|g' -i src/bin/sage-env
 }