sagemath-6.10-2.parabola1: updating version

* fix timeit with python 2.7.11

3 files changed, 28 insertions, 25 deletions

diff --git a/libre/sagemath/PKGBUILD b/libre/sagemath/PKGBUILD
index cd53575a6..3a16be1b6 100644
--- a/libre/sagemath/PKGBUILD
+++ b/libre/sagemath/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 150202 2015-12-08 09:14:14Z foutrelis $
+# $Id: PKGBUILD 153716 2015-12-19 11:03:07Z 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=6.9
-pkgrel=5.parabola1
+pkgver=6.10
+pkgrel=2.parabola1
 pkgdesc="Free Mathematics Software, free software replacement of Magma, Maple, Mathematica, and Matlab, without nonfree nauty recommendation"
 arch=(i686 x86_64)
 url="http://www.sagemath.org"
 license=(GPL)
 depends=(ipython2 atlas-lapack ppl mpfi palp brial singular libcliquer maxima-ecl gfan sympow tachyon python2-rpy2
-  python2-matplotlib python2-scipy python2-sympy python2-networkx python2-igraph libgap gap flintqs lcalc lrcalc lrs
+  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)
 optdepends=('cython2: to compile cython code' 'jmol: 3D plots' 'sage-notebook: Browser-based (flask) notebook interface'
@@ -25,35 +25,30 @@ optdepends=('cython2: to compile cython code' 'jmol: 3D plots' 'sage-notebook: B
   'coin-or-cbc: COIN backend for numerical computations'
   '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' 'arb: floating-point ball arithmetic')
+  'coxeter3: Coxeter groups implementation' 'cryptominisat: SAT solver')
 makedepends=(cython2 boost ratpoints symmetrica fflas-ffpack python2-jinja coin-or-cbc
-  mcqd coxeter3 cryptominisat arb modular_decomposition bliss-graphs) # libfes
+  mcqd coxeter3 cryptominisat modular_decomposition bliss-graphs tdlib) # libfes
 conflicts=(sage-mathematics)
 replaces=(sage-mathematics)
 provides=(sage-mathematics)
 source=("$pkgname-$pkgver.tar.gz::https://github.com/sagemath/sage/archive/$pkgver.tar.gz" 
 	"http://mirrors.mit.edu/sage/spkg/upstream/pexpect/pexpect-2.0.tar.bz2"
 	anal.h package.patch env.patch paths.patch clean.patch skip-check.patch
-	pexpect-env.patch pexpect-del.patch disable-fes.patch jupyter-path.patch test-optional.patch
-	pari-sage-2.8.1813.patch::"http://git.sagemath.org/sage.git/patch/?id=c1f5aa26e"
-	jupyter-kernel.patch::"http://git.sagemath.org/sage.git/patch/?id=4f06d3df"
-	relative-links.patch::"http://git.sagemath.org/sage.git/patch/src/sage/repl/ipython_kernel/kernel.py?id=52a717a7")
-md5sums=('847ad447eaef17b2bc81bb4fae69c190'
+	pexpect-env.patch pexpect-del.patch disable-fes.patch jupyter-path.patch test-optional.patch python-2.7.11.patch)
+md5sums=('3c92d9cc67e2be5bc7802427e84b9b71'
          'd9a3e113ed147dcee8f89962a8dccd43'
          'a906a180d198186a39820b0a2f9a9c63'
          '9ba81f717ffd4e20b8b2f2a318307488'
          'e1b1d0d2e6b187309ae2b74489356b9a'
          'fd8e3e07f5b7318e6a7200a3c64f5bc2'
-         '23e972753be1e5d0f761a7f82a95cebf'
+         '6d9ae0978ce6a05a0da2cafdfb178a09'
          '5947a420a0b1483f0cbc74c76895789b'
          'a83a3b1bc7fcb7cbf752a83a8311fc42'
          'f333939ea6c41377b66407c81016cee4'
          '4eb23a3c7363258bc9ba764d6e5512ba'
          '16b529194c6105c3364127bd8f1efa83'
          'cdcabd475b80afe0534a5621e972736e'
-         '01229c3dabbb5fe13348d8c8c31da710'
-         'f91e760a251fe1042fa9f2aad68b6b02'
-         'fe3c5ef5b30a19c632d7fad0ee58c7c4')
+         'ef927896f2071b442b1d07d7e69f5f3a')
 
 prepare(){
   cd sage-$pkgver
@@ -82,23 +77,20 @@ prepare(){
   sed -e 's|graph.hh|bliss/graph.hh|' -i src/sage/graphs/bliss.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
 
 # 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 pari-sage 2.8.1813
-  patch -p1 -i ../pari-sage-2.8.1813.patch
-# install jupyter kernel
-  patch -p1 -i ../relative-links.patch
-  patch -p1 -i ../jupyter-kernel.patch
-# set jupyter path
-  patch -p0 -i ../jupyter-path.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 %s %s|cython2 %s %s|' -e 's|python setup.py|python2 setup.py|' -i src/sage/misc/cython.py
+  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|' -i src/bin/sage
   sed -e "s|'cython'|'cython2'|" -i src/bin/sage-cython
   sed -e 's|python -c|python2 -c|' -i src/Makefile
diff --git a/libre/sagemath/clean.patch b/libre/sagemath/clean.patch
index c4baf9bca..cfca01fcb 100644
--- a/libre/sagemath/clean.patch
+++ b/libre/sagemath/clean.patch
@@ -1,6 +1,6 @@
 --- src/setup.py.orig	2014-11-16 10:34:05.521441703 +0100
 +++ src/setup.py	2014-11-16 10:34:16.054812569 +0100
-@@ -581,21 +581,6 @@
+@@ -620,21 +620,6 @@
  
  
  #########################################################
@@ -19,6 +19,6 @@
 -
 -
 -#########################################################
- ### Distutils
+ ### Install also Jupyter kernel spec
  #########################################################
  
diff --git a/libre/sagemath/python-2.7.11.patch b/libre/sagemath/python-2.7.11.patch
new file mode 100644
index 000000000..3ff74c938
--- /dev/null
+++ b/libre/sagemath/python-2.7.11.patch
@@ -0,0 +1,11 @@
+--- src/sage/misc/sage_timeit.py.orig	2015-12-19 11:09:42.836938821 +0100
++++ src/sage/misc/sage_timeit.py	2015-12-19 11:10:27.090217304 +0100
+@@ -217,7 +217,7 @@
+     # but is there a better way to achieve that the code stmt has access
+     # to the shell namespace?
+ 
+-    src = timeit_.template % {'stmt': timeit_.reindent(stmt, 8),
++    src = timeit_.template % {'init': "", 'stmt': timeit_.reindent(stmt, 8),
+                              'setup': "pass"}
+     code = compile(src, "<magic-timeit>", "exec")
+     ns = {}