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

Conflicts:
	community-testing/addresses/PKGBUILD
	community-testing/gcc-avr/PKGBUILD
	community-testing/gnumail/PKGBUILD
	community-testing/gnustep-back/PKGBUILD
	community-testing/gnustep-base/PKGBUILD
	community-testing/gnustep-gui/PKGBUILD
	community-testing/llvm/PKGBUILD
	community-testing/systemd/PKGBUILD
	community/llvm/PKGBUILD
	community/lua-yajl-git/PKGBUILD
	community/mingw32-gcc/PKGBUILD
	community/python-scipy/PKGBUILD
	community/virtualbox/PKGBUILD
	core/bin86/PKGBUILD
	core/cloog-ppl/PKGBUILD
	core/gcc/PKGBUILD
	core/mpfr/PKGBUILD
	extra/ilmbase/PKGBUILD
	extra/kdeedu/PKGBUILD
	extra/kdepim/PKGBUILD
	extra/latex2html/PKGBUILD
	extra/libmad/PKGBUILD
	extra/postgresql/PKGBUILD
	multilib-testing/binutils-multilib/PKGBUILD
	multilib-testing/gcc-multilib/PKGBUILD
	multilib-testing/lib32-glibc/PKGBUILD
	multilib/gcc-multilib/PKGBUILD
	multilib/gcc-multilib/gcc-go.install
	testing/bin86/PKGBUILD
	testing/binutils/PKGBUILD
	testing/coreutils/PKGBUILD
	testing/glibc/PKGBUILD
	testing/gnome-control-center/PKGBUILD
	testing/less/PKGBUILD
	testing/linux-api-headers/PKGBUILD
	testing/mdadm/PKGBUILD
	testing/mpfr/PKGBUILD
	testing/udev/PKGBUILD

3 files changed, 10 insertions, 22 deletions

diff --git a/community/megaglest/PKGBUILD b/community/megaglest/PKGBUILD
index f0210c3ae..204d82fac 100644
--- a/community/megaglest/PKGBUILD
+++ b/community/megaglest/PKGBUILD
@@ -1,32 +1,24 @@
-# $Id: PKGBUILD 45343 2011-04-20 13:49:48Z svenstaro $
+# $Id: PKGBUILD 45457 2011-04-22 00:47:15Z svenstaro $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Larry Hajali <larryhaja [at] gmail [dot] com>
  
 pkgname=megaglest
 pkgver=3.5.0
-pkgrel=1
+pkgrel=3
 pkgdesc="Fork of Glest, a 3D real-time strategy game in a fantastic world."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://sourceforge.net/projects/megaglest/"
-license=('GPL2')
+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.bz2"
-        "http://downloads.sourceforge.net/project/${pkgname}/current_release/megaglest-data-${pkgver}.7z"
-        "megaglest.png"
-        "megaglest.desktop"
         "megaglest.sh")
-md5sums=('5c84966ee6657274eeb5a28ce8b702c0'
-         '4405134d91d8303e9485de42ffc53e09'
-         '5622ce716033d9afb62a3291b47844ed'
-         '97dc7ea865efbea5daaf300207dad518'
+md5sums=('03cb7e67be3e72ac0147b23c6b91eb2a'
          'e3d6abbe79263d2fa5edb0bcbcf8755a')
 
 build() {
   cd ${srcdir}/${pkgname}-source-${pkgver}/
 
-  7z x -y ${srcdir}/megaglest-data-${pkgver}.7z
-
   [[ -d build ]] && rm -r build
   mkdir build && cd build
   cmake .. \
@@ -48,8 +40,12 @@ package() {
   install -m 0755 mk/linux/megaglest_editor "${pkgdir}"/usr/bin/megaglest_editor
   install -m 0644 glest.ini glestkeys.ini servers.ini "${pkgdir}"/usr/share/$pkgname
 
-  install -D -m 0644 "${srcdir}"/${pkgname}.desktop "${pkgdir}"/usr/share/applications/${pkgname}.desktop
-  install -D -m 0644 "${srcdir}"/${pkgname}.png "${pkgdir}"/usr/share/pixmaps/${pkgname}.png
+  sed -i s/Exec=.*/Exec=${pkgname}/g ${pkgname}.desktop
+  sed -i s/Icon=.*/Icon=${pkgname}/g ${pkgname}.desktop
+  install -D -m 0644 "${pkgname}.desktop" "${pkgdir}"/usr/share/applications/${pkgname}.desktop
+  install -D -m 0644 "${pkgname}.png" "${pkgdir}"/usr/share/pixmaps/${pkgname}.png
+
+  install -Dm755 code_license.txt "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
 }
 
 # vim: sw=2:ts=2 et:
diff --git a/community/megaglest/megaglest.desktop b/community/megaglest/megaglest.desktop
deleted file mode 100644
index 267dbf358..000000000
--- a/community/megaglest/megaglest.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Categories=Application;Game;
-Name=Megaglest
-Icon=megaglest
-Exec=megaglest
-Terminal=false
-Type=Application
diff --git a/community/megaglest/megaglest.png b/community/megaglest/megaglest.png
deleted file mode 100644
index 65e5d9862..000000000
--- a/community/megaglest/megaglest.png
+++ /dev/null