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

[Antonio Rojas]

    Date: Tuesday, February 20, 2018 @ 07:40:08
  Author: arojas
Revision: 296447

Fix SAGE_SRC for new source location

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

--------------------+
 PKGBUILD           |    4 ++--
 sagemath-env.patch |   18 ++++++++++++++++--
 2 files changed, 18 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-02-20 07:21:36 UTC (rev 296446)
+++ PKGBUILD	2018-02-20 07:40:08 UTC (rev 296447)
@@ -9,7 +9,7 @@
 pkgbase=sagemath
 pkgname=(sagemath sagemath-jupyter)
 pkgver=8.1
-pkgrel=10
+pkgrel=11
 pkgdesc="Open Source Mathematics Software, free alternative to Magma, Maple, Mathematica, and Matlab"
 arch=(x86_64)
 url="http://www.sagemath.org"
@@ -42,7 +42,7 @@
         sagemath-singular-4.1.1.patch
         sagemath-cython-source.patch::"https://github.com/sagemath/sage/commit/fccaf230.patch")
 sha256sums=('a42b55c2c8ac244535dc9b87171b7d4dd7e1d498099518ab253354fbe2eaaa7b'
-            '39b76a189365464998cab9355d177581bc2b15dff10858f316faa85f2efa0426'
+            '9593f49ac3f73bc7106f661bdaa484d22c12b889964986f5a99b75a605a2359b'
             'c41ae665499c6cd775d40bbe178f8786830b0931ee26bf11ee02f7d83bcc8107'
             '0b680e674c11c47afa86162d8b49645620b8912722e08133d23357c29ca9310a'
             '2cad308f8adbb6c54e6603fa22b2f0eb60f6f09248d5d015000c3932ac14f646'

Modified: sagemath-env.patch
===================================================================
--- sagemath-env.patch	2018-02-20 07:21:36 UTC (rev 296446)
+++ sagemath-env.patch	2018-02-20 07:40:08 UTC (rev 296447)
@@ -58,7 +58,7 @@
 -export SAGE_SRC="$SAGE_ROOT/src"
 -export SAGE_DOC_SRC="$SAGE_SRC/doc"
 +export GAP_ROOT_DIR="/usr/lib/gap"
-+export SAGE_SRC="$SAGE_SHARE/sage/source"
++export SAGE_SRC="$SAGE_LOCAL/lib/python2.7/site-packages"
 +export SAGE_DOC_SRC="$SAGE_SHARE/doc/sage"
  export SAGE_DOC="$SAGE_SHARE/doc/sage"
  
@@ -104,4 +104,18 @@
  _add_variable_or_fallback('SAGE_ETC',        opj('$SAGE_LOCAL', 'etc'))
  _add_variable_or_fallback('SAGE_INC',        opj('$SAGE_LOCAL', 'include'))
  _add_variable_or_fallback('SAGE_SHARE',      opj('$SAGE_LOCAL', 'share'))
-
+ 
+-_add_variable_or_fallback('SAGE_SRC',        opj('$SAGE_ROOT', 'src'))
++_add_variable_or_fallback('SAGE_SRC',        opj('$SAGE_LOCAL', 'lib', 'python2.7', 'site-packages'))
+ 
+ try:
+     sitepackages_dirs = site.getsitepackages()
+@@ -163,7 +163,7 @@
+ _add_variable_or_fallback('GRAPHS_DATA_DIR',  opj('$SAGE_SHARE','graphs'))
+ _add_variable_or_fallback('ELLCURVE_DATA_DIR',opj('$SAGE_SHARE','ellcurves'))
+ _add_variable_or_fallback('POLYTOPE_DATA_DIR',opj('$SAGE_SHARE','reflexive_polytopes'))
+-_add_variable_or_fallback('GAP_ROOT_DIR',     opj('$SAGE_LOCAL','gap','latest'))
++_add_variable_or_fallback('GAP_ROOT_DIR',     opj('$SAGE_LOCAL','lib','gap'))
+ _add_variable_or_fallback('THEBE_DIR',        opj('$SAGE_SHARE','thebe'))
+ 
+ # locate singular shared object