Tue Feb 4 03:33:07 UTC 2014

2 files changed, 15 insertions, 28 deletions

diff --git a/community/sage-mathematics/PKGBUILD b/community/sage-mathematics/PKGBUILD
index 573840fd4..9cc885944 100644
--- a/community/sage-mathematics/PKGBUILD
+++ b/community/sage-mathematics/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 105155 2014-02-01 21:30:09Z arcanis $
+# $Id: PKGBUILD 105276 2014-02-03 20:58:05Z arcanis $
 # Maintainer: Evgeniy Alekseev <arcanis.arch at gmail dot com>
 # Contributor: Daniel Wallace <danielwallace at gtmanfred dot com>
 # Contributor: Antonio Rojas <nqn1976 at gmail dot com>
@@ -9,8 +9,8 @@
 
 pkgname=sage-mathematics
 pkgver=6.1
-pkgrel=1
-pkgdesc="SAGE: Open Source Mathematics Software, a viable free alternative to Magma, Maple, Mathematica, and Matlab"
+pkgrel=2
+pkgdesc="Open Source Mathematics Software, free alternative to Magma, Maple, Mathematica, and Matlab"
 arch=('i686' 'x86_64')
 url="http://www.sagemath.org"
 license=('GPL')
@@ -23,24 +23,21 @@ optdepends=('imagemagick: some plotting functionality benefits from it'
             'ffmpeg: to show animations'
             'cairo: R plots')
 source=("http://sage.math.washington.edu/home/release/sage-${pkgver}/sage-${pkgver}.tar"
-        "fix-pil.patch"
         "sage.service")
 install="${pkgname}.install"
 md5sums=('75130374fcdb9395955db81f1ed28422'
-         'de54cb818d74c070a524fc3fd5208b2c'
          '985da1c1d1dcdc3ea9aa73035cb7996b')
 
 prepare() {
   # create *.desktop file
-  gendesk -n \
+  gendesk -f -n \
           --pkgname="sage-notebook" \
-          --pkgdesc="sage notebook" \
-          --name="sage" \
+          --pkgdesc="Sage notebook" \
+          --name="Sage" \
           --exec="/opt/sage/sage -notebook" \
           --terminal=true \
           --categories="Science;Math" \
-          --custom="StartupNotify=true
-X-DCOP-ServiceType=
+          --custom="X-DCOP-ServiceType=
 X-KDE-SubstituteUID=false
 X-KDE-Username="
   
@@ -102,33 +99,35 @@ package() {
   cd "${srcdir}/sage-${pkgver}/"
   # remove build logs
   rm -f *.log
-  rm -rf spkg/{base,build,logs,standarts}
+  rm -rf "${srcdir}/sage-${pkgver}/"{logs,upstream}
   
   # cp because make install is experimental and will corrupt the install
-  install -d "${pkgdir}/opt/sage"
+  install -dm755 "${pkgdir}/opt/sage"
   cp -r * "${pkgdir}/opt/sage/"
   
   # move SageTeX files to more appropriate directory
-  install -d "${pkgdir}/usr/share"
+  install -dm755 "${pkgdir}/usr/share"
   mv "${pkgdir}/opt/sage/local/share/texmf" "${pkgdir}/usr/share"
   
   # according to FS#37090
   # install scripts
-  install -d "${pkgdir}/usr/bin"
+  install -dm755 "${pkgdir}/usr/bin"
   ./sage -c "install_scripts('${pkgdir}/usr/bin', ignore_existing=True)"
   # rename scripts to avoid conflicts
   for ITEM in $(ls "${pkgdir}/usr/bin"); do
     mv "${pkgdir}/usr/bin/${ITEM}" "${pkgdir}/usr/bin/sage-${ITEM}"
   done
   ln -s "/opt/sage/sage" "${pkgdir}/usr/bin/sage"
+  # remove DOT_SAGE directory
+  rm -rf "${pkgdir}/opt/sage/build"
   
   # install a systemd user unit
   install -Dm644 "${srcdir}/sage.service" "${pkgdir}/usr/lib/systemd/user/sage.service"
   # install *.desktop and icon files
   install -Dm644 "${srcdir}/sage-notebook.desktop" \
-                 "${pkgdir}/usr/share/applications/SAGE-notebook.desktop"
+                 "${pkgdir}/usr/share/applications/sage-notebook.desktop"
   install -Dm644 "${pkgdir}/opt/sage/local/lib/python2.7/site-packages/sagenb-0.10.7.2-py2.7.egg/sagenb/data/sage/images/icon128x128.png" \
-                 "${pkgdir}/usr/share/pixmaps/SAGE-notebook.png"
+                 "${pkgdir}/usr/share/pixmaps/sage-notebook.png"
 }
 
 # vim :set ts=2 sw=2 et:
diff --git a/community/sage-mathematics/fix-pil.patch b/community/sage-mathematics/fix-pil.patch
deleted file mode 100644
index a17f26833..000000000
--- a/community/sage-mathematics/fix-pil.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ruN pil-1.1.6.orig/_imagingft.c pil-1.1.6/_imagingft.c
---- pil-1.1.6.orig/_imagingft.c	2013-12-23 17:45:39.991183855 +0400
-+++ pil-1.1.6/_imagingft.c	2013-12-23 17:49:06.297861197 +0400
-@@ -65,7 +65,7 @@
-     const char* message;
- } ft_errors[] =
- 
--#include <freetype/fterrors.h>
-+#include <freetype2/fterrors.h>
- 
- /* -------------------------------------------------------------------- */
- /* font objects */