sagemath-6.9-4.parabola1: NTL 9.6 rebuild

2 files changed, 20 insertions, 5 deletions

diff --git a/libre/sagemath/PKGBUILD b/libre/sagemath/PKGBUILD
index ec9b1d19c..513996394 100644
--- a/libre/sagemath/PKGBUILD
+++ b/libre/sagemath/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 144931 2015-10-24 18:28:03Z arojas $
+# $Id: PKGBUILD 147497 2015-11-23 23:34:30Z 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>
@@ -11,7 +11,7 @@
 
 pkgname=sagemath
 pkgver=6.9
-pkgrel=3.parabola1
+pkgrel=4.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"
@@ -33,8 +33,8 @@ 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'
+	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")
@@ -50,6 +50,7 @@ md5sums=('847ad447eaef17b2bc81bb4fae69c190'
          'f333939ea6c41377b66407c81016cee4'
          '4eb23a3c7363258bc9ba764d6e5512ba'
          '16b529194c6105c3364127bd8f1efa83'
+         'cdcabd475b80afe0534a5621e972736e'
          '01229c3dabbb5fe13348d8c8c31da710'
          'f91e760a251fe1042fa9f2aad68b6b02'
          'fe3c5ef5b30a19c632d7fad0ee58c7c4')
@@ -79,10 +80,12 @@ prepare(){
    -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
+  patch -p0 -i ../test-optional.patch
 
 # Upstream patches  
 # fix build against libfes 0.2 http://trac.sagemath.org/ticket/15209
-#  patch -p0 -i "$srcdir"/fes02.patch
+#  patch -p0 -i ../fes02.patch
 # disable fes module, fails to compile
   patch -p0 -i ../disable-fes.patch
 # port to pari-sage 2.8.1813
@@ -139,6 +142,7 @@ package() {
   export SAGE_ROOT="/usr"
   export SAGE_LOCAL="$SAGE_ROOT"
   export SAGE_SRC="$PWD"
+  export CC=gcc
   export JUPYTER_PATH="$pkgdir"/usr/share/jupyter
 
   python2 setup.py install --root="$pkgdir" --optimize=1 --skip-build
diff --git a/libre/sagemath/test-optional.patch b/libre/sagemath/test-optional.patch
new file mode 100644
index 000000000..385f0bbe9
--- /dev/null
+++ b/libre/sagemath/test-optional.patch
@@ -0,0 +1,11 @@
+--- src/sage/doctest/control.py.orig	2015-10-31 09:40:55.173671531 +0100
++++ src/sage/doctest/control.py	2015-10-31 09:40:05.370125436 +0100
+@@ -253,7 +253,7 @@
+                 if 'optional' in options.optional:
+                     options.optional.discard('optional')
+                     from sage.misc.package import package_versions
+-                    optional_pkgs = package_versions("optional", local=True)
++                    optional_pkgs = {}
+                     for pkg, versions in optional_pkgs.items():
+                         if versions[0] == versions[1]:
+                             options.optional.add(pkg)