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

[Antonio Rojas]

    Date: Friday, January 2, 2015 @ 01:49:36
  Author: arojas
Revision: 125148

- Add libfes and cryptominisat support
- Create SAGE_SRC dir in main package (FS#43271)

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

------------------+
 PKGBUILD         |   18 +++++++++++-------
 extensions.patch |   13 ++-----------
 2 files changed, 13 insertions(+), 18 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-01-02 00:21:24 UTC (rev 125147)
+++ PKGBUILD	2015-01-02 00:49:36 UTC (rev 125148)
@@ -10,18 +10,17 @@
 pkgbase=sage-mathematics
 pkgname=('sage-mathematics' 'sage-mathematics-src')
 pkgver=6.4.1
-pkgrel=2
+pkgrel=3
 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'
-  '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' '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')
 md5sums=('e40736461992e62af3a84cf9a212c9d1'
          'd9a3e113ed147dcee8f89962a8dccd43'
-         '43784811932f077c3c07b75825abda1b'
+         '5770766ae676491f79162d2062ce7c02'
          '5216dbb3d80cecc8ec4a36cc9706f8b5'
          '0bb5d722e32359f9dc8516904316318f'
          'df2f56fb5845a83808b6724f6965ec6e'
@@ -37,6 +36,10 @@
 
 # add optional packages manually (Fedora)  
   patch -p0 -i $srcdir/extensions.patch
+  for _ext in cryptominisat fes lrcalc
+  do
+   sed -i "s|is_package_installed('$_ext')|1|" src/module_list.py
+  done
 # don't assume Sage is already available (Fedora)
   patch -p0 -i $srcdir/c_lib.patch
 # find L.h header
@@ -89,9 +92,7 @@
 
 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-mpmath' 'python2-sympy' 'libgap' 'gap' 'genus2reduction' 'flintqs' 'givaro' 'libmpc' 'lcalc' 'lrcalc'
-  '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') # python2-pexpect
+  'python2-matplotlib' 'python2-scipy' 'python2-sympy' 'libgap' 'gap' 'genus2reduction' 'flintqs' 'givaro' 'libmpc' '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') # python2-pexpect
   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')
@@ -110,6 +111,9 @@
 
   mkdir -p "$pkgdir"/usr/share/sage
   cp -r ext "$pkgdir"/usr/share/sage
+  
+# Create SAGE_SRC, needed for the notebook
+  mkdir "$pkgdir"/usr/share/sage/src
 
 # Install Sage's own pexpect
   cd $srcdir/pexpect-2.0

Modified: extensions.patch
===================================================================
--- extensions.patch	2015-01-02 00:21:24 UTC (rev 125147)
+++ extensions.patch	2015-01-02 00:49:36 UTC (rev 125148)
@@ -1,5 +1,5 @@
---- src/module_list.py.orig	2014-11-23 15:58:13.000000000 +0100
-+++ src/module_list.py	2014-12-23 10:43:44.412576412 +0100
+--- src/module_list.py.orig	2015-01-02 01:37:15.614093528 +0100
++++ src/module_list.py	2015-01-02 01:37:26.140827483 +0100
 @@ -2126,7 +2126,8 @@
  # These extensions are to be compiled only if the
  # corresponding packages have been installed
@@ -10,12 +10,3 @@
  
  if is_package_installed('fes'):
      ext_modules.extend([
-@@ -2208,7 +2209,7 @@
-         )
- 
- 
--if is_package_installed('lrcalc'):
-+if 1:
-     ext_modules.append(
-         Extension('sage.libs.lrcalc.lrcalc',
-                   sources = ["sage/libs/lrcalc/lrcalc.pyx"],