From da160fb91b16f172e554746ad13ff56a3b1c1f1f Mon Sep 17 00:00:00 2001
From: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
Date: Sat, 19 Dec 2015 16:32:22 +0700
Subject: academic/sage: Updated for version 6.10.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
---
 academic/sage/sage-build-root.patch | 33 ++++++++++++---------------------
 academic/sage/sage.SlackBuild       | 16 +---------------
 academic/sage/sage.info             |  6 +++---
 3 files changed, 16 insertions(+), 39 deletions(-)

(limited to 'academic')

diff --git a/academic/sage/sage-build-root.patch b/academic/sage/sage-build-root.patch
index 40e1572605..0daaca9c33 100644
--- a/academic/sage/sage-build-root.patch
+++ b/academic/sage/sage-build-root.patch
@@ -1,33 +1,24 @@
---- sage-6.5/configure.old	2015-02-19 08:11:31.873711070 +0700
-+++ sage-6.5/configure	2015-02-19 08:12:00.982710447 +0700
-@@ -2942,19 +2942,19 @@
- 
+--- sage-6.10/configure.old	2015-12-19 08:15:37.404497471 +0700
++++ sage-6.10/configure	2015-12-19 08:15:55.691461292 +0700
+@@ -2965,21 +2965,6 @@
  
+ #---------------------------------------------------------
  
 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for root user" >&5
 -$as_echo_n "checking for root user... " >&6; }
-+#{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for root user" >&5
-+#$as_echo_n "checking for root user... " >&6; }
- 
+-
 -uid=`id -u`
 -if test "x$uid" == "x0"; then
 -    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 -$as_echo "yes" >&6; }
--    as_fn_error $? "You cannot build Sage as root, switch to a unpriviledged user" "$LINENO" 5
+-    as_fn_error $? "You cannot build Sage as root, switch to an unpriviledged user" "$LINENO" 5
 -else
 -    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 -$as_echo "no" >&6; }
-+#uid=`id -u`
-+#if test "x$uid" == "x0"; then
-+#    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+#$as_echo "yes" >&6; }
-+#    as_fn_error $? "You cannot build Sage as root, switch to a unpriviledged user" "$LINENO" 5
-+#else
-+#    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+#$as_echo "no" >&6; }
- 
+-
 -fi;
-+#fi;
- 
- 
- #---------------------------------------------------------
+-
+-
+ # Check whether we are on a supported platform
+ # Make sure we can run config.sub.
+ $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
diff --git a/academic/sage/sage.SlackBuild b/academic/sage/sage.SlackBuild
index 2e597de8c5..3baf26f058 100644
--- a/academic/sage/sage.SlackBuild
+++ b/academic/sage/sage.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=sage
-VERSION=${VERSION:-6.8}
+VERSION=${VERSION:-6.10}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -92,20 +92,6 @@ rm -rf $PKG/$SAGEROOT/{upstream,logs}
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
-# Sage installs specific versions of a number of software components which
-# may be different from the system-wide versions of those components. For
-# this reason, the man and info pages are not moved to /usr/man and
-# /usr/info.  To avoid possible conflicts, they are compressed in place.
-find $PKG/$SAGEROOT/local/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/$SAGEROOT/local/man -type l ) ; do
-  ln -s $( readlink $i ).gz $i.gz ; rm $i
-done
-find $PKG/$SAGEROOT/local/share/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/$SAGEROOT/local/share/man -type l ) ; do
-  ln -s $( readlink $i ).gz $i.gz ; rm $i
-done
-gzip -9 $PKG/$SAGEROOT/local/share/info/*.info*
-
 # Add profile scripts
 sed "s%SAGEROOT%${SAGEROOT}%" $CWD/profile.d/sage.sh > $PKG/etc/profile.d/sage.sh
 sed "s%SAGEROOT%${SAGEROOT}%" $CWD/profile.d/sage.csh > $PKG/etc/profile.d/sage.csh
diff --git a/academic/sage/sage.info b/academic/sage/sage.info
index 0869a12e7b..8adeae05ec 100644
--- a/academic/sage/sage.info
+++ b/academic/sage/sage.info
@@ -1,8 +1,8 @@
 PRGNAM="sage"
-VERSION="6.8"
+VERSION="6.10"
 HOMEPAGE="http://www.sagemath.org"
-DOWNLOAD="http://ftp.riken.jp/sagemath/src/sage-6.8.tar.gz"
-MD5SUM="661f2b2b13669c72d16ea8e6831125e4"
+DOWNLOAD="http://ftp.riken.jp/sagemath/src/sage-6.10.tar.gz"
+MD5SUM="ff28cec72f7569bba6c7e00b5a98c45b"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-- 
cgit v1.2.3