sagemath-7.4-2.parabola1: updating version

1 files changed, 25 insertions, 50 deletions

diff --git a/libre/sagemath/env.patch b/libre/sagemath/env.patch
index 5cb93b75f..d7550e5db 100644
--- a/libre/sagemath/env.patch
+++ b/libre/sagemath/env.patch
@@ -41,72 +41,47 @@
 -fi
 +NEW_SAGE_ROOT="/usr"
  
- # Don't execute the commands more than once for the same version of
- # sage-env.  Check this after checking the validity of SAGE_ROOT, but
-@@ -245,21 +211,13 @@
+ # Display the Sage startup banner, used in src/bin/sage
+ sage_banner() {
+@@ -187,7 +187,7 @@
+ 
+ # SAGE_LOCAL is the installation prefix and can be customized
+ if [ -z "$SAGE_LOCAL" ]; then
+-    export SAGE_LOCAL="$SAGE_ROOT/local"
++    export SAGE_LOCAL="/usr"
  fi
  
- # Setting Sage-related location environment variables.
--export SAGE_LOCAL="$SAGE_ROOT/local"
--export SAGE_ETC="$SAGE_LOCAL/etc"
--export SAGE_SHARE="$SAGE_LOCAL/share"
--export SAGE_EXTCODE="$SAGE_SHARE/sage/ext"
--export SAGE_SPKG_INST="$SAGE_LOCAL/var/lib/sage/installed"
--export SAGE_LOGS="$SAGE_ROOT/logs/pkgs"
+ # sage-env must know where the Sage's script files are
+@@ -233,8 +233,8 @@
+ export SAGE_EXTCODE="$SAGE_SHARE/sage/ext"
+ export SAGE_SPKG_INST="$SAGE_LOCAL/var/lib/sage/installed"
+ export SAGE_LOGS="$SAGE_ROOT/logs/pkgs"
 -export SAGE_SRC="$SAGE_ROOT/src"
 -export SAGE_DOC_SRC="$SAGE_SRC/doc"
--export SAGE_DOC="$SAGE_SHARE/doc/sage"
--
--if [ -z "${SAGE_ORIG_PATH_SET}" ]; then 
--    SAGE_ORIG_PATH=$PATH && export SAGE_ORIG_PATH 
--    SAGE_ORIG_PATH_SET=True && export SAGE_ORIG_PATH_SET 
--fi 
--export PATH="$SAGE_ROOT/build/bin:$SAGE_SRC/bin:$SAGE_LOCAL/bin:$PATH"
-+export SAGE_LOCAL="$SAGE_ROOT"
-+export SAGE_ETC="/etc/sage"
-+export SAGE_SHARE="$SAGE_LOCAL/share/sage"
-+export SAGE_EXTCODE="$SAGE_SHARE/ext"
-+export SAGE_SRC="$SAGE_SHARE/source"
-+export SAGE_DOC_SRC="/usr/share/doc/sage"
-+export SAGE_DOC="/usr/share/doc/sage"
++export SAGE_SRC="$SAGE_SHARE/sage/source"
++export SAGE_DOC_SRC="$SAGE_SHARE/doc/sage"
+ export SAGE_DOC="$SAGE_SHARE/doc/sage"
  
- if [ "$SAGE_BANNER" = "bare" ]; then
-     export SAGE_BANNER_TEXT=$(cat "$SAGE_ROOT/VERSION.txt")
-@@ -319,9 +277,6 @@
- GPHELP="$SAGE_LOCAL/bin/gphelp" && export GPHELP
- GPDOCDIR="$SAGE_LOCAL/share/pari/doc" && export GPDOCDIR
- 
--SINGULARPATH="$SAGE_LOCAL/share/singular" && export SINGULARPATH
--SINGULAR_EXECUTABLE="$SAGE_LOCAL/bin/Singular" && export SINGULAR_EXECUTABLE
--
- if [ -z "$SAGE_REPO_ANONYMOUS" ]; then
-     SAGE_REPO_ANONYMOUS="git://trac.sagemath.org/sage.git"
-     export SAGE_REPO_ANONYMOUS
-@@ -364,10 +319,10 @@
+ if [ -z "${SAGE_ORIG_PATH_SET}" ]; then
+@@ -374,6 +337,9 @@
      export SAGE_STARTUP_FILE
  fi
  
 +export LIBMTX="$DOT_SAGE/meataxe"
 +[[ -d $LIBMTX ]] || mkdir $LIBMTX # Create meataxe data dir
 +
--IPYTHONDIR=`find "$SAGE_SPKG_INST" -name "ipython*"`
--if [ -n "$IPYTHONDIR" ]; then
--    export IPYTHONDIR="$DOT_SAGE/${IPYTHONDIR##*/}"
--fi
-+export IPYTHONDIR="$DOT_SAGE/ipython"
- 
- if [ "$PYTHON_EGG_CACHE" = "" ]; then
-     PYTHON_EGG_CACHE="$DOT_SAGE/.python-eggs"
-@@ -453,8 +400,6 @@
+ if [ -z "$IPYTHONDIR" ]; then
+     # We hardcode a version number in the directory name. The idea is
+     # that we keep using the same version number as long as that is
+@@ -468,7 +400,6 @@
          fi
      fi
  fi
--MAXIMA_PREFIX="$SAGE_ROOT/local" && export MAXIMA_PREFIX
--
+-export MAXIMA_PREFIX="$SAGE_LOCAL"
+ 
  PERL5LIB="$SAGE_LOCAL/lib/perl5:$PERL5LIB" && export PERL5LIB
  
- ############ architecture flags
-@@ -622,9 +567,6 @@
+@@ -629,9 +608,6 @@
      LD_LIBRARY_PATH="$SAGE_LOCAL/bin:$LD_LIBRARY_PATH" && export LD_LIBRARY_PATH
  fi