[arch-commits] Commit in sage-mathematics/trunk (3 files)

[Daniel Wallace]

    Date: Thursday, May 23, 2013 @ 23:46:32
  Author: dwallace
Revision: 91565

upgpkg: sage-mathematics 5.9-1

upgpkg: sage-mathematics 5.9-1

Added:
  sage-mathematics/trunk/sage.service
Modified:
  sage-mathematics/trunk/PKGBUILD
  sage-mathematics/trunk/sage-mathematics.install

--------------------------+
 PKGBUILD                 |   30 ++++++++++++++++++------------
 sage-mathematics.install |    2 ++
 sage.service             |    8 ++++++++
 3 files changed, 28 insertions(+), 12 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-05-23 20:10:59 UTC (rev 91564)
+++ PKGBUILD	2013-05-23 21:46:32 UTC (rev 91565)
@@ -7,7 +7,7 @@
 # Special thanks to Nareto for moving the compile from the .install to the PKGBUILD
 
 pkgname=sage-mathematics
-pkgver=5.8
+pkgver=5.9
 pkgrel=1
 pkgdesc='SAGE: Open Source Mathematics Software, a viable free alternative to Magma, Maple, Mathematica, and Matlab.'
 url='http://www.sagemath.org'
@@ -15,17 +15,16 @@
 license=('GPL')
 #depends=('xz' 'java-environment=7' 'desktop-file-utils' 'libxmu' 'libtiff' 'sqlite' 'libjpeg-turbo')
 depends=('desktop-file-utils')
-makedepends=('gcc-fortran' )
+makedepends=('gcc-fortran' 'freetype2')
 optdepends=('imagemagick: some plotting functionality benefits from it'
             'texlive-core: some plotting functionality benefits from it, also to use SageTeX'
             'openssh: to use the notebook in secure mode'
-            'ffmpeg: to show animations')
-options=('!makeflags')
+            'ffmpeg: to show animations'
+            'cairo: R plots')
 install="${pkgname}.install"
 source=("http://sage.math.washington.edu/home/release/sage-${pkgver}/sage-${pkgver}.tar"
-        'SAGE-notebook.desktop')
-md5sums=('fc5b401174ee1efa7aea163e804c2b42'
-         'b82f94383829eee26648feb977e2d89b')
+        'SAGE-notebook.desktop'
+        'sage.service')
 
 build() {
   cd sage-${pkgver}
@@ -38,8 +37,7 @@
   unset LDFLAGS
 
   # enable multiple threads while building, is this really needed? check if uses MAKEFLAGS
-  export SAGE_BUILD_THREADS=$(lscpu | awk '/^CPU\(s\):/ { print $2 }')
-  export MAKE="make -j${SAGE_BUILD_THREADS}"
+  export MAKE="make -j$(nproc)"
 
   # use archlinux's fortran rather then the one that ships with sage to compile sage's fortran
   export FC=/usr/bin/gfortran
@@ -52,8 +50,12 @@
   export SAGE_FAT_BINARY='yes'
 
   # can't write to root in a clean chroot
-  export DOT_SAGE='/build/src/'
+  mkdir "$srcdir/buiild"
+  export DOT_SAGE="$srcdir/build"
 
+  # Singular is broken
+  export CPP='/usr/bin/cpp'
+
   # only build sage, no documents
   #make build
   make
@@ -95,8 +97,12 @@
   # remove source packages, since they are rarely needed, they are 300mb in size (compressed)
   rm -f ${pkgdir}/opt/sage/spkg/base/*spkg
   rm -f ${pkgdir}/opt/sage/spkg/standard/*spkg
+
+  # install a systemd user unit
+  install -Dm755 $srcdir/sage.service $pkgdir/usr/lib/systemd/user/sage.service
 }
 
 # vim :set ts=2 sw=2 et:
-md5sums=('b91d6c20798f396a9c875527c78b3587'
-         'b82f94383829eee26648feb977e2d89b')
+md5sums=('708520904f2d42039c714ac72a631948'
+         'b82f94383829eee26648feb977e2d89b'
+         '985da1c1d1dcdc3ea9aa73035cb7996b')

Modified: sage-mathematics.install
===================================================================
--- sage-mathematics.install	2013-05-23 20:10:59 UTC (rev 91564)
+++ sage-mathematics.install	2013-05-23 21:46:32 UTC (rev 91565)
@@ -41,6 +41,8 @@
 
 post_upgrade() {
   post_install $1
+  echo "There is now a user session unit included to run a sage notebook as your user."
+  echo "The wiki includes a guide on starting systemd user sessions"
 }
 
 post_remove() {

Added: sage.service
===================================================================
--- sage.service	                        (rev 0)
+++ sage.service	2013-05-23 21:46:32 UTC (rev 91565)
@@ -0,0 +1,8 @@
+[Unit]
+Description=A free open-source mathematics software system
+
+[Service]
+ExecStart=/opt/sage/sage -n
+
+[Install]
+WantedBy=default.target