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

[Antonio Rojas]

    Date: Saturday, February 28, 2015 @ 22:13:28
  Author: arojas
Revision: 128431

NTL 8 rebuild

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

-------------+
 PKGBUILD    |   11 ++++-------
 paths.patch |    2 +-
 2 files changed, 5 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-02-28 19:44:17 UTC (rev 128430)
+++ PKGBUILD	2015-02-28 21:13:28 UTC (rev 128431)
@@ -9,7 +9,7 @@
 
 pkgname=sage-mathematics
 pkgver=6.5
-pkgrel=1
+pkgrel=2
 pkgdesc="Open Source Mathematics Software, free alternative to Magma, Maple, Mathematica, and Matlab"
 arch=('i686' 'x86_64')
 url="http://www.sagemath.org"
@@ -36,7 +36,7 @@
          '0eb5ac1537aac93bd67a2925c0cfd84d'
          '5216dbb3d80cecc8ec4a36cc9706f8b5'
          '563bc42699116d71ca6b06b9f149304e'
-         '9a39301dedeb560f7bfddb81b6853f28'
+         'acc25f13728517badafa70d220ab7b8e'
          'eee444d32b8a818a67b1e0ce0850b8bb'
          '46c212a3a6713b0f78c370c7186d0982'
          '5947a420a0b1483f0cbc74c76895789b'
@@ -78,10 +78,8 @@
   patch -p0 -i $srcdir/tests_parallel.patch
 
 # use python2
-  sed -e 's|#!/usr/bin/env python|#!/usr/bin/env python2|' -i src/bin/*
-  sed -e 's|exec python|exec python2|' -i src/bin/*
-  sed -e 's|cython %s %s|cython2 %s %s|' -i src/sage/misc/cython.py
-  sed -e 's|python setup.py|python2 setup.py|' -i src/sage/misc/cython.py
+  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|exec ipython|exec ipython2|' -e 's|cygdb|cygdb2|' -i src/bin/sage
   sed -e "s|'cython'|'cython2'|" -i src/bin/sage-cython
 
@@ -150,4 +148,3 @@
   mkdir -p "$pkgdir"/usr/lib/sage/site-packages/
   mv "$pkgdir"/usr/lib/python2.7/site-packages/pexpect* "$pkgdir"/usr/lib/sage/site-packages/
 }
-

Modified: paths.patch
===================================================================
--- paths.patch	2015-02-28 19:44:17 UTC (rev 128430)
+++ paths.patch	2015-02-28 21:13:28 UTC (rev 128431)
@@ -15,7 +15,7 @@
  
  _add_variable_or_fallback('SAGE_SRC',        opj('$SAGE_ROOT', 'src'))
 -_add_variable_or_fallback('SITE_PACKAGES',   site.getsitepackages())
-+_add_variable_or_fallback('SITE_PACKAGES',   '/usr/lib/sage/site-packages')
++_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_EXTCODE',    opj('$SAGE_SHARE', 'sage', 'ext'))