[arch-commits] Commit in sage-mathematics/trunk (PKGBUILD env.patch)

[Antonio Rojas]

    Date: Monday, January 5, 2015 @ 00:01:47
  Author: arojas
Revision: 125366

- Add mcqd, nauty and coxeter3 support
- Install gprc.expect, prevents freezes when PARI throws errors

Modified:
  sage-mathematics/trunk/PKGBUILD
  sage-mathematics/trunk/env.patch

-----------+
 PKGBUILD  |   23 +++++++++++++++--------
 env.patch |    2 +-
 2 files changed, 16 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-01-04 22:10:57 UTC (rev 125365)
+++ PKGBUILD	2015-01-04 23:01:47 UTC (rev 125366)
@@ -10,12 +10,14 @@
 pkgbase=sage-mathematics
 pkgname=('sage-mathematics' 'sage-mathematics-src')
 pkgver=6.4.1
-pkgrel=4
+pkgrel=5
 pkgdesc="Open Source Mathematics Software, free alternative to Magma, Maple, Mathematica, and Matlab"
 arch=('i686' 'x86_64')
 url="http://www.sagemath.org"
 license=('GPL')
-makedepends=('ipython2' 'cython2' 'ppl' 'glpk' 'mpfi' 'polybori' 'singular' 'libcliquer' 'ecl' 'libgap' 'givaro' 'libmpc' 'lcalc' 'lrcalc' 'libfes' 'cryptominisat' 'eclib' 'gmp-ecm' 'zn_poly' 'pynac' 'linbox' 'gsl' 'boost' 'scons' 'ratpoints' 'symmetrica' 'fflas-ffpack' 'gd' 'python2-jinja' 'python2-numpy')
+makedepends=('ipython2' 'cython2' 'ppl' 'glpk' 'mpfi' 'polybori' 'singular' 'libcliquer' 'ecl' 'libgap' 'givaro' 'libmpc' 'lcalc' 'lrcalc'
+'libfes' 'cryptominisat' 'eclib' 'gmp-ecm' 'zn_poly' 'pynac' 'linbox' 'gsl' 'boost' 'scons' 'ratpoints' 'symmetrica' 'fflas-ffpack' 'gd'
+'coxeter3' 'mcqd' 'python2-jinja' 'python2-numpy')
 source=("https://github.com/sagemath/sage/archive/$pkgver.tar.gz" "http://www.sagemath.org/packages/upstream/pexpect/pexpect-2.0.tar.bz2" 
 'extensions.patch' 'c_lib.patch' 'env.patch' 'paths.patch' 'blas.patch' 'clean.patch' 'skip-check.patch' 'gap-hap.patch' 
 'pexpect-env.patch' 'fes02.patch')
@@ -23,7 +25,7 @@
          'd9a3e113ed147dcee8f89962a8dccd43'
          '5770766ae676491f79162d2062ce7c02'
          '5216dbb3d80cecc8ec4a36cc9706f8b5'
-         '0bb5d722e32359f9dc8516904316318f'
+         'b980378df4bff2cd1ca002bbfae995a2'
          'df2f56fb5845a83808b6724f6965ec6e'
          'eee444d32b8a818a67b1e0ce0850b8bb'
          '46c212a3a6713b0f78c370c7186d0982'
@@ -38,10 +40,11 @@
 
 # add optional packages manually (Fedora)  
   patch -p0 -i $srcdir/extensions.patch
-  for _ext in cryptominisat fes lrcalc
+  for _ext in cryptominisat fes lrcalc coxeter3 mcqd
   do
-   sed -i "s|is_package_installed('$_ext')|1|" src/module_list.py
+   sed -e "s|is_package_installed('$_ext')|True|" -i src/module_list.py
   done
+  sed -e 's|is_package_installed("nauty")|True|' -i src/sage/graphs/graph_generators.py
 # don't assume Sage is already available (Fedora)
   patch -p0 -i $srcdir/c_lib.patch
 # find L.h header
@@ -103,8 +106,9 @@
 package_sage-mathematics() {
   depends=('ipython2' 'cython2' 'ppl' 'glpk' 'mpfi' 'palp' 'polybori' 'singular' 'libcliquer' 'maxima-ecl' 'gfan' 'sympow' 'tachyon' 'python2-rpy2'
   'python2-matplotlib' 'python2-scipy' 'python2-sympy' 'python2-networkx' 'libgap' 'gap' 'genus2reduction' 'flintqs' 'lcalc' 'lrcalc' 'libfes'
-  'cryptominisat' 'eclib' 'gmp-ecm' 'zn_poly' 'python2-gd' 'pynac' 'linbox' 'gsl' 'rubiks' 'pari-galdata' 'pari-seadata-small'
-  'sage-data-combinatorial_designs' 'sage-data-elliptic_curves' 'sage-data-graphs' 'sage-data-polytopes_db' 'sage-data-conway_polynomials')
+  'cryptominisat' 'eclib' 'gmp-ecm' 'zn_poly' 'python2-gd' 'pynac' 'linbox' 'gsl' 'rubiks' 'coxeter3' 'nauty' 'mcqd' 'pari-galdata'
+  'pari-seadata-small' 'sage-data-combinatorial_designs' 'sage-data-elliptic_curves' 'sage-data-graphs' 'sage-data-polytopes_db'
+  'sage-data-conway_polynomials')
   optdepends=('jmol: 3D plots' 'sage-notebook: Web-based notebook interface' 'sage-mathematics-doc: Documentation and inline help'
   'sage-mathematics-src: source files needed to build cython code'
   'python2-pyzmq: ipython notebook' 'python2-tornado: ipython notebook' 'python2-jinja: ipython notebook')
@@ -127,8 +131,11 @@
 # Create SAGE_SRC, needed for the notebook
   mkdir "$pkgdir"/usr/share/sage/src
 
+# Install gprc.expect in SAGE_ETC
+  install -Dm644 ../build/pkgs/pari/gprc.expect "$pkgdir"/etc/sage/gprc.expect
+
 # Install Sage's own pexpect
-  cd $srcdir/pexpect-2.0
+  cd "$srcdir"/pexpect-2.0
   python2 setup.py install --root="$pkgdir" --optimize=1
   mkdir -p "$pkgdir"/usr/lib/sage/site-packages/
   mv "$pkgdir"/usr/lib/python2.7/site-packages/pexpect* "$pkgdir"/usr/lib/sage/site-packages/

Modified: env.patch
===================================================================
--- env.patch	2015-01-04 22:10:57 UTC (rev 125365)
+++ env.patch	2015-01-04 23:01:47 UTC (rev 125366)
@@ -57,7 +57,7 @@
 -export SAGE_DOC="$SAGE_SRC/doc"
 -export PATH="$SAGE_SRC/bin:$SAGE_LOCAL/bin:$PATH"
 +export SAGE_LOCAL="$SAGE_ROOT"
-+export SAGE_ETC="/etc"
++export SAGE_ETC="/etc/sage"
 +export SAGE_SHARE="$SAGE_LOCAL/share/sage"
 +export SAGE_EXTCODE="$SAGE_SHARE/ext"
 +export SAGE_SRC="$SAGE_SHARE/src"