Sat May 28 22:47:00 UTC 2011

3 files changed, 26 insertions, 12 deletions

diff --git a/community/sage-mathematics/PKGBUILD b/community/sage-mathematics/PKGBUILD
index 2a321f237..7b50171ae 100644
--- a/community/sage-mathematics/PKGBUILD
+++ b/community/sage-mathematics/PKGBUILD
@@ -4,13 +4,14 @@
 # Special thanks to Nareto for moving the compile from the .install to the PKGBUILD
 
 pkgname=sage-mathematics
-pkgver=4.6.2
-pkgrel=2
+pkgver=4.7
+pkgrel=1
 pkgdesc='SAGE: Open Source Mathematics Software, a viable free alternative to Magma, Maple, Mathematica, and Matlab.'
 url='http://www.sagemath.org'
 arch=('i686' 'x86_64')
 license=('GPL')
-depends=('readline')
+#depends=('readline')
+depends=('ppl')
 makedepends=('gcc-fortran' 'gcc-libs' 'desktop-file-utils' 'imagemagick' 'texlive-core')
 optdepends=('imagemagick: some plotting functionality benefits from it'
             'texlive-core: some plotting functionality benefits from it, also to use SageTeX'
@@ -19,8 +20,8 @@ options=('!makeflags')
 install="${pkgname}.install"
 source=("http://sage.math.washington.edu/home/release/sage-${pkgver}/sage-${pkgver}.tar"
         'SAGE-notebook.desktop')
-md5sums=('0dc2c9e9cc593685bb039085900ddfeb'
-         'bcd01b7863794431f8f208ed96fd108d')
+md5sums=('db4d891feed487e1696b8d01ae3b6469'
+         'dc391f12b7d17dd37326343ec0e99bbd')
 
 build() {
   cd sage-${pkgver}
@@ -30,8 +31,10 @@ build() {
   # bash: symbol lookup error: bash: undefined symbol: rl_filename_rewrite_hook
   # remove this hack when sage uses a readline 6.1 or greater, or when sage uses its own internal bash
   # this is for people who have custom kernels (sage works this around by checking uname -r)
+  #mkdir -p spkg/installed
+  #touch spkg/installed/readline-6.1
   mkdir -p spkg/installed
-  touch spkg/installed/readline-6.1
+  touch spkg/installed/ppl-0.11.2
 
   # fix "missing sage.all error" during build
   unset CFLAGS
@@ -61,6 +64,9 @@ build() {
   # only build sage, no documents
   #make build
   make
+
+  # uncomment if we want to run all the tests (warning: very long)
+  #make ptestlong
 }
 
 package() {
diff --git a/community/sage-mathematics/SAGE-notebook.desktop b/community/sage-mathematics/SAGE-notebook.desktop
index 87496030b..26a35d3ac 100644
--- a/community/sage-mathematics/SAGE-notebook.desktop
+++ b/community/sage-mathematics/SAGE-notebook.desktop
@@ -9,7 +9,6 @@ GenericName[de]=
 Icon=/opt/sage/data/extcode/notebook/images/sageicon.png
 MimeType=
 Name[de]=SAGE
-Path=/opt/sage/notebook
 StartupNotify=true
 Terminal=true
 Type=Application
diff --git a/community/sage-mathematics/sage-mathematics.install b/community/sage-mathematics/sage-mathematics.install
index f5c16308e..6caa5299e 100644
--- a/community/sage-mathematics/sage-mathematics.install
+++ b/community/sage-mathematics/sage-mathematics.install
@@ -5,6 +5,9 @@ post_install() {
   # the files it writes to ~/.sage can be safely ignored
   HOME=/tmp ./sage -c
 
+  # add sagemath user for the daemon
+  useradd -r -c 'Sage daemon' -d /opt/sage -s /bin/false sagemath
+
   # Update LaTeX db to point to SageTeX
   if [ -f /usr/bin/texhash ]; then
     /usr/bin/texhash /usr/share/texmf
@@ -23,11 +26,14 @@ echo '
 \___/  |  |_/|/\__/  \_/|/o
             /|         /|  
             \|         \|  
- ___  __ _  __ _  ___ 
-/ __|/ _` |/ _` |/ _ \
-\__ \ (_| | (_| |  __/
-|___/\__,_|\__, |\___|
-           |___/      
+ ________________________________ 
+< sage-mathematics, I mean, MOO! >
+ -------------------------------- 
+        \   ^__^
+         \  (oo)\_______
+            (__)\       )\/\
+                ||----w |
+                ||     ||
 '
 
 }
@@ -42,6 +48,9 @@ post_remove() {
     /usr/bin/texhash /usr/share/texmf
   fi
 
+  # remove the sagemath daemon user
+  userdel sagemath
+
   # clean up left overs
   rm -rf /opt/sage
 }