Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/obconf/PKGBUILD
	community/obconf/obconf.install
	community/qstardict/PKGBUILD
	core/binutils/PKGBUILD
	core/gcc/PKGBUILD.mips64el
	extra/cups/PKGBUILD
	extra/eject/PKGBUILD
	extra/emacs/PKGBUILD
	extra/evilwm/PKGBUILD
	extra/fbset/PKGBUILD
	extra/gmpc/PKGBUILD
	extra/gnome-alsamixer/PKGBUILD
	extra/gtkpod/PKGBUILD
	extra/kdepim/PKGBUILD
	extra/kile/PKGBUILD
	extra/libvpx/PKGBUILD
	extra/php-apc/PKGBUILD
	extra/php-suhosin/PKGBUILD
	extra/php/PKGBUILD
	extra/pidgin/PKGBUILD
	extra/potrace/PKGBUILD
	extra/racket/PKGBUILD
	extra/soundtouch/PKGBUILD
	extra/wireshark/PKGBUILD
	extra/xpdf/PKGBUILD
	multilib/binutils-multilib/PKGBUILD
	multilib/lib32-acl/PKGBUILD
	multilib/lib32-attr/PKGBUILD
	multilib/lib32-glibc/PKGBUILD
	multilib/lib32-udev/PKGBUILD
	~xihh/abiword/PKGBUILD

1 files changed, 9 insertions, 4 deletions

diff --git a/community/sage-mathematics/PKGBUILD b/community/sage-mathematics/PKGBUILD
index a0e10fec0..c71dbff1b 100644
--- a/community/sage-mathematics/PKGBUILD
+++ b/community/sage-mathematics/PKGBUILD
@@ -4,7 +4,7 @@
 # Special thanks to Nareto for moving the compile from the .install to the PKGBUILD
 
 pkgname=sage-mathematics
-pkgver=4.7
+pkgver=4.7.1
 pkgrel=1
 pkgdesc='SAGE: Open Source Mathematics Software, a viable free alternative to Magma, Maple, Mathematica, and Matlab.'
 url='http://www.sagemath.org'
@@ -15,12 +15,12 @@ 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'
-            'sage-mathematics-spkgs: original packages used to build additional packages, in the AUR')
+            'sage-mathematics-spkgs: original packages used to build additional packages')
 options=('!makeflags')
 install="${pkgname}.install"
 source=("http://sage.math.washington.edu/home/release/sage-${pkgver}/sage-${pkgver}.tar"
         'SAGE-notebook.desktop')
-md5sums=('db4d891feed487e1696b8d01ae3b6469'
+md5sums=('4d82c6719d14a1c2d403024d989faac7'
          'dc391f12b7d17dd37326343ec0e99bbd')
 
 build() {
@@ -64,6 +64,10 @@ build() {
   # only build sage, no documents
   #make build
   make
+}
+
+check() {
+  cd sage-${pkgver}
 
   # uncomment if we want to run all the tests (warning: very long)
   #make ptestlong
@@ -92,7 +96,8 @@ package() {
   rm -f ${pkgdir}/opt/sage/install.log
   rm -rf ${pkgdir}/opt/sage/spkg/logs
 
-  # remove source packages, since they are rarely needed, they are 300mb in size (compressed), and no need to compile them, put them into aur/sage-mathematics-spkgs
+  # remove source packages, since they are rarely needed, they are 300mb in size (compressed)
+  # no need to package them together, put into sage-mathematics-spkgs
   rm -f ${pkgdir}/opt/sage/spkg/base/*spkg
   rm -f ${pkgdir}/opt/sage/spkg/standard/*spkg
 }