[arch-commits] Commit in sagemath/trunk (PKGBUILD env.patch paths.patch)

[Antonio Rojas]

    Date: Saturday, January 30, 2016 @ 20:54:42
  Author: arojas
Revision: 159626

Bundle a pexpect git snapshot

Modified:
  sagemath/trunk/PKGBUILD
  sagemath/trunk/env.patch
  sagemath/trunk/paths.patch

-------------+
 PKGBUILD    |   21 ++++++++++++++++-----
 env.patch   |   10 +++++++---
 paths.patch |    3 ++-
 3 files changed, 25 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-01-30 16:43:38 UTC (rev 159625)
+++ PKGBUILD	2016-01-30 19:54:42 UTC (rev 159626)
@@ -9,12 +9,12 @@
 
 pkgname=sagemath
 pkgver=7.0
-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)
-depends=(ipython2 atlas-lapack ppl mpfi palp brial singular libcliquer maxima-ecl gfan sympow tachyon python2-rpy2
+depends=(ipython2 atlas-lapack ppl mpfi palp brial singular cliquer maxima-ecl gfan sympow tachyon python2-rpy2
   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)
@@ -29,14 +29,16 @@
 conflicts=(sage-mathematics)
 replaces=(sage-mathematics)
 provides=(sage-mathematics)
-source=("$pkgname-$pkgver.tar.gz::https://github.com/sagemath/sage/archive/$pkgver.tar.gz" 
+source=("$pkgname-$pkgver.tar.gz::https://github.com/sagemath/sage/archive/$pkgver.tar.gz"
+	pexpect.zip::"https://github.com/pexpect/pexpect/archive/524495960dd8898ddd30f7ba37298de51beee773.zip" 
 	anal.h package.patch env.patch paths.patch clean.patch skip-check.patch
 	disable-fes.patch jupyter-path.patch test-optional.patch python-2.7.11.patch contour.patch)
 md5sums=('34807a7cf5dd79c008abd377ba1427fa'
+         'a346bb2c0350c1cb17d5325235c5e38a'
          'a906a180d198186a39820b0a2f9a9c63'
          '9ba81f717ffd4e20b8b2f2a318307488'
-         '93a9716afa561a928f4fd311582de064'
-         '10b9fd56538e0141b9cd476ca690aed6'
+         'e1b1d0d2e6b187309ae2b74489356b9a'
+         'fd8e3e07f5b7318e6a7200a3c64f5bc2'
          '6d9ae0978ce6a05a0da2cafdfb178a09'
          '5947a420a0b1483f0cbc74c76895789b'
          '4eb23a3c7363258bc9ba764d6e5512ba'
@@ -112,6 +114,9 @@
   make sage/ext/interpreters/__init__.py
 
   python2 setup.py build
+
+  cd "$srcdir"/pexpect-*
+  python2 setup.py build
 }
 
 package() {
@@ -140,4 +145,10 @@
   
 # Create SAGE_SRC, needed for the notebook
   mkdir "$pkgdir"/usr/share/sage/source
+
+# install pexpect
+  cd "$srcdir"/pexpect-*
+  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	2016-01-30 16:43:38 UTC (rev 159625)
+++ env.patch	2016-01-30 19:54:42 UTC (rev 159626)
@@ -80,7 +80,7 @@
  if [ -z "$SAGE_REPO_ANONYMOUS" ]; then
      SAGE_REPO_ANONYMOUS="git://trac.sagemath.org/sage.git"
      export SAGE_REPO_ANONYMOUS
-@@ -363,30 +318,13 @@
+@@ -363,30 +318,17 @@
      export SAGE_STARTUP_FILE
  fi
  
@@ -109,10 +109,14 @@
 -    export PYTHONHOME
 -    export PYTHONNOUSERSITE
 -fi
++PYTHONPATH="/usr/lib/sage/site-packages:$PYTHONPATH"
++PYTHONHOME="$SAGE_ROOT"
++export PYTHONPATH
++export PYTHONHOME
  
  if [ -z "${SAGE_ORIG_LD_LIBRARY_PATH_SET}" ]; then
      SAGE_ORIG_LD_LIBRARY_PATH=$LD_LIBRARY_PATH && export SAGE_ORIG_LD_LIBRARY_PATH
-@@ -427,8 +374,6 @@
+@@ -431,8 +378,6 @@
          fi
      fi
  fi
@@ -121,7 +125,7 @@
  ############ architecture flags
  
  # Support flags to change the build architecture.  Currently, this is
-@@ -598,9 +543,6 @@
+@@ -602,9 +547,6 @@
      LD_LIBRARY_PATH="$SAGE_LOCAL/bin:$LD_LIBRARY_PATH" && export LD_LIBRARY_PATH
  fi
  

Modified: paths.patch
===================================================================
--- paths.patch	2016-01-30 16:43:38 UTC (rev 159625)
+++ paths.patch	2016-01-30 19:54:42 UTC (rev 159626)
@@ -16,7 +16,8 @@
 +_add_variable_or_fallback('SAGE_SHARE',      opj('$SAGE_LOCAL', 'share', 'sage'))
  
  _add_variable_or_fallback('SAGE_SRC',        opj('$SAGE_ROOT', 'src'))
- _add_variable_or_fallback('SITE_PACKAGES',   site.getsitepackages())
+-_add_variable_or_fallback('SITE_PACKAGES',   site.getsitepackages())
++_add_variable_or_fallback('SITE_PACKAGES',   site.getsitepackages()+['/usr/lib/sage/site-packages'])
  _add_variable_or_fallback('SAGE_LIB',        SITE_PACKAGES[0])
  
  _add_variable_or_fallback('SAGE_CYTHONIZED', opj('$SAGE_SRC', 'build', 'cythonized'))