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

Conflicts:
	core/logrotate/PKGBUILD
	extra/hwloc/PKGBUILD
	extra/kdeutils/PKGBUILD
	extra/lapack/PKGBUILD
	extra/openmpi/PKGBUILD
	multilib/lib32-llvm/PKGBUILD
	testing/mesa/PKGBUILD
	testing/xorg-server/PKGBUILD

5 files changed, 17 insertions, 20 deletions

diff --git a/community/calibre/PKGBUILD b/community/calibre/PKGBUILD
index 501d17bba..1b70cc96d 100644
--- a/community/calibre/PKGBUILD
+++ b/community/calibre/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 50866 2011-07-02 09:42:55Z giovanni $
+# $Id: PKGBUILD 51442 2011-07-09 05:30:27Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Petrov Roman <nwhisper@gmail.com>
 # Contributor: Andrea Fagiani <andfagiani _at_ gmail dot com>
 
 pkgname=calibre
-pkgver=0.8.8
+pkgver=0.8.9
 pkgrel=1
 pkgdesc="Ebook management application"
 arch=('i686' 'x86_64') 
@@ -20,7 +20,7 @@ optdepends=('ipython: to use calibre-debug')
 install=calibre.install
 source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz
         desktop_integration.patch)
-md5sums=('dab191175d370920b366bcd8c0dad917'
+md5sums=('0f962987c33eb65c65d4fd8dad21d121'
          '253ce4fe5d01f8ff76b63cd3825755ea')
 
 build() {
diff --git a/community/gdal/PKGBUILD b/community/gdal/PKGBUILD
index f7a7ab9c6..ca383e756 100644
--- a/community/gdal/PKGBUILD
+++ b/community/gdal/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 50951 2011-07-03 10:32:28Z jelle $
+# $Id: PKGBUILD 51471 2011-07-09 22:30:40Z rvanharen $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org
 # Contributor: William Rea <sillywilly@gmail.com>
 
 pkgname=gdal
 pkgver=1.8.0
-pkgrel=5
+pkgrel=6
 pkgdesc="A translator library for raster geospatial data formats"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gdal.org/"
diff --git a/community/megaglest/PKGBUILD b/community/megaglest/PKGBUILD
index 707c3a003..e53dab258 100644
--- a/community/megaglest/PKGBUILD
+++ b/community/megaglest/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 48032 2011-05-27 16:13:36Z svenstaro $
+# $Id: PKGBUILD 51432 2011-07-09 04:39:59Z svenstaro $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Larry Hajali <larryhaja [at] gmail [dot] com>
  
 pkgname=megaglest
-pkgver=3.5.2
+pkgver=3.5.2.4
 pkgrel=1
 pkgdesc="Fork of Glest, a 3D real-time strategy game in a fantastic world."
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,10 +12,10 @@ license=('GPL3')
 depends=('curl' 'megaglest-data' 'xerces-c' 'sdl' 'libvorbis' 'openal' 'mesa' 'lua' 'icu')
 makedepends=('ftjam' 'p7zip' 'wxgtk' 'cmake')
 source=("http://downloads.sourceforge.net/project/${pkgname}/current_release/${pkgname}-source-${pkgver}.tar.xz")
-md5sums=('90e0bdcbdfa95cb0322c04082418a56c')
+md5sums=('0f8a3857d41fce8a726eebcc4826ad60')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}/
+  cd "${srcdir}"/"${pkgname}"-"${pkgver}"/
 
   [[ -d build ]] && rm -r build
   mkdir build && cd build
@@ -27,10 +27,10 @@ build() {
 }
 
 package() {
-  cd ${srcdir}/${pkgname}-${pkgver}/
+  cd "${srcdir}"/"${pkgname}"-"${pkgver}"/
 
   cd build
-  make DESTDIR=$pkgdir install
+  make DESTDIR="$pkgdir" install
 }
 
 # vim: sw=2:ts=2 et:
diff --git a/community/sfml/PKGBUILD b/community/sfml/PKGBUILD
index b9b2fe785..ac2deca2f 100644
--- a/community/sfml/PKGBUILD
+++ b/community/sfml/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 49427 2011-06-16 03:45:54Z svenstaro $
+# $Id: PKGBUILD 51437 2011-07-09 04:42:03Z svenstaro $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Ondrej Martinak <omartinak@gmail.com>
 
@@ -7,7 +7,7 @@ pkgname=sfml
 _git=true
 
 if [[ "${_git}" = "true" ]]; then
-    pkgver=1.99.git20110616
+    pkgver=1.99.git20110709
 fi
 
 pkgrel=1
diff --git a/community/xmoto/PKGBUILD b/community/xmoto/PKGBUILD
index 0e1e43fbd..8eec6369d 100644
--- a/community/xmoto/PKGBUILD
+++ b/community/xmoto/PKGBUILD
@@ -4,7 +4,7 @@
 # Contributor: Denis (dtonator@gmail.com)
 
 pkgname=xmoto
-pkgver=0.5.5
+pkgver=0.5.7
 pkgrel=1
 pkgdesc="A challenging 2D motocross platform game, where physics play an important role."
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,15 +13,12 @@ license=('GPL')
 depends=('bzip2' 'libjpeg' 'libpng' 'lua' 'sdl_mixer' 'ode=0.11.1' 'curl' 
 	 'mesa' 'sqlite3' 'sdl_ttf' 'desktop-file-utils' 'sdl_net' 'libxdg-basedir')
 install=xmoto.install
-source=("http://download.tuxfamily.org/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}-src.tar.gz"
-	"libpng-14.patch")
-sha1sums=('4deb6f27fc8100cd66e1d655da7ca0e94dacf198'
-          '005015ecbd2dcedcc865dd085e1d8c49d96270fd')
+source=("http://download.tuxfamily.org/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}-src.tar.gz")
+sha1sums=('e781b42480a96187b5aca4126d17ecf0610ca5ac')
+
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
 
-  patch -Np1 -i ${srcdir}/libpng-14.patch
-  
   # build and install 
   ./configure LDFLAGS="-L/usr/lib" --prefix=/usr --disable-sdltest