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

Conflicts:
	community/comix/PKGBUILD
	community/geany/PKGBUILD
	community/gnome-do-docklets/PKGBUILD
	community/gnome-do-plugins/PKGBUILD
	community/gnome-system-tools/PKGBUILD
	community/gnustep-make/PKGBUILD
	community/gtweakui/PKGBUILD
	community/hwinfo/PKGBUILD
	community/kungfu/PKGBUILD
	community/liboauth/PKGBUILD
	community/liboobs/PKGBUILD
	community/lua-lzlib/PKGBUILD
	community/mcdp/PKGBUILD
	community/mingw32-gcc-base/PKGBUILD
	community/mingw32-runtime/PKGBUILD
	community/mplayer2/PKGBUILD
	community/pdf2svg/PKGBUILD
	community/perl-data-dumper/PKGBUILD
	community/perl-digest-md5/PKGBUILD
	community/perl-perlio-eol/PKGBUILD
	community/perl-xml-libxslt/PKGBUILD
	community/python-cherrypy/PKGBUILD
	community/python-pexpect/PKGBUILD
	community/python-pyro/PKGBUILD
	community/python2-cherrypy/PKGBUILD
	community/rexima/PKGBUILD
	community/shp2svg/PKGBUILD
	community/system-tools-backends/PKGBUILD
	community/tracker/PKGBUILD
	community/virtualbox/PKGBUILD
	core/bridge-utils/PKGBUILD
	extra/avidemux/PKGBUILD
	extra/beagle/PKGBUILD
	extra/bug-buddy/PKGBUILD
	extra/dssi/PKGBUILD
	extra/evolution-sharp/PKGBUILD
	extra/evolution-webcal/PKGBUILD
	extra/feh/PKGBUILD
	extra/ffmpeg/PKGBUILD
	extra/gnome-mag/PKGBUILD
	extra/gnome-python-desktop/PKGBUILD
	extra/gnutls/PKGBUILD
	extra/gok/PKGBUILD
	extra/gpsd/PKGBUILD
	extra/gstreamer0.10-ugly/PKGBUILD
	extra/hyphen/PKGBUILD
	extra/kdelibs/PKGBUILD
	extra/keytouch-editor/PKGBUILD
	extra/keytouch/PKGBUILD
	extra/koffice/PKGBUILD
	extra/krusader/PKGBUILD
	extra/libbeagle/PKGBUILD
	extra/libffi/PKGBUILD
	extra/libgnomeuimm/PKGBUILD
	extra/libreoffice/PKGBUILD
	extra/m17n-lib/PKGBUILD
	extra/mtr/PKGBUILD
	extra/openbabel/PKGBUILD
	extra/poppler/PKGBUILD
	extra/pulseaudio/PKGBUILD
	extra/rox/PKGBUILD
	extra/transmission/PKGBUILD
	extra/xf86-input-synaptics/PKGBUILD
	extra/xorg-server/PKGBUILD
	extra/xorg-xinit/PKGBUILD
	kde-unstable/calligra/PKGBUILD
	libre/icecat/PKGBUILD
	libre/linux-libre/PKGBUILD
	multilib/lib32-ncurses/PKGBUILD
	multilib/lib32-openssl/PKGBUILD
	multilib/lib32-talloc/PKGBUILD
	multilib/wine/PKGBUILD

2 files changed, 14 insertions, 11 deletions

diff --git a/community/pingus/PKGBUILD b/community/pingus/PKGBUILD
index 36e16a77a..046cfcd1e 100644
--- a/community/pingus/PKGBUILD
+++ b/community/pingus/PKGBUILD
@@ -1,20 +1,20 @@
-# $Id: PKGBUILD 52474 2011-07-25 20:35:38Z jelle $
+# $Id: PKGBUILD 56752 2011-10-11 20:37:22Z lcarlier $
 # Maintainer: Eric Belanger <eric@archlinux.org>
 
 pkgname=pingus
-pkgver=0.7.3
-pkgrel=5
+pkgver=0.7.4
+pkgrel=2
 pkgdesc="A Lemmings clone, i.e. a level-based puzzle game."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://pingus.seul.org"
 license=('GPL')
-depends=('gcc-libs' 'sdl_image' 'sdl_mixer' 'boost-libs>=1.46')
-makedepends=('scons' 'boost>=1.46')
+depends=('gcc-libs' 'sdl_image' 'sdl_mixer' 'libgl' 'boost-libs>=1.47')
+makedepends=('scons' 'boost>=1.47' 'mesa')
 source=(http://pingus.seul.org/files/${pkgname}-${pkgver}.tar.bz2 pingus.desktop)
-md5sums=('7d1a0b0d658cc46dd09d6274f39acc7d'
-         'b94efaa6e2de959de7fdb50cfc7dbdea')
-sha1sums=('ca7fe5cea65fb3392d1e81056a879831925502f2'
-          'f35649f3b0b2bfcb01ce75085cf719dcaa609a54')
+md5sums=('82742bc9906cad98338cfd3ea700b396'
+         '9eec34047bdcff49e08f41e81764e20c')
+sha1sums=('e61e5ffefcecebed83286c25b3626f70ed75d2a5'
+          '579a1144f161ce89e6e024cea37210149b89c0c0')
 
 build() {
   cd ${pkgname}-${pkgver}
@@ -25,7 +25,10 @@ build() {
 package() {
   cd ${pkgname}-${pkgver}
 
-  ./install.sh "${pkgdir}/usr"
+  # fix launcher
+  sed -i 's/echo/echo -e/g' ./Makefile
+
+  make install DESTDIR="${pkgdir}" PREFIX="/usr"
 
   install -D -m644 "${srcdir}/pingus.desktop" "${pkgdir}/usr/share/applications/pingus.desktop"
 }
diff --git a/community/pingus/pingus.desktop b/community/pingus/pingus.desktop
index 158eaa820..276db36a4 100644
--- a/community/pingus/pingus.desktop
+++ b/community/pingus/pingus.desktop
@@ -6,4 +6,4 @@ Exec=pingus
 Terminal=false
 Type=Application
 Categories=Application;Game;LogicGame
-Icon=/usr/share/pingus/data/images/core/editor/actions.png
+Icon=/usr/share/pingus/images/core/editor/actions.png