Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/bwbar/PKGBUILD
	community/directfb/PKGBUILD
	community/extremetuxracer/PKGBUILD
	community/freedroidrpg/PKGBUILD
	community/gnash/PKGBUILD
	community/guake/PKGBUILD
	community/pidgin-libnotify/PKGBUILD
	community/png2ico/PKGBUILD
	community/ruby-gtk2/PKGBUILD
	community/torcs/PKGBUILD
	community/virtualbox/PKGBUILD
	extra/abiword/PKGBUILD
	extra/alsaplayer/PKGBUILD
	extra/automoc4/PKGBUILD
	extra/cagibi/PKGBUILD
	extra/fltk/PKGBUILD
	extra/gnome-desktop2/PKGBUILD
	extra/gnome-python/PKGBUILD
	extra/gnome-sharp/PKGBUILD
	extra/gnugo/PKGBUILD
	extra/gstreamer0.10-good/PKGBUILD
	extra/gtk2/PKGBUILD
	extra/gtkmm/PKGBUILD
	extra/imlib2/PKGBUILD
	extra/koffice/PKGBUILD
	extra/lcms/PKGBUILD
	extra/libao/PKGBUILD
	extra/libcue/PKGBUILD
	extra/libdaemon/PKGBUILD
	extra/libgnome-media-profiles/PKGBUILD
	extra/libotf/PKGBUILD
	extra/libotr/PKGBUILD
	extra/libots/PKGBUILD
	extra/libreoffice/PKGBUILD
	extra/libtiff/PKGBUILD
	extra/libwebkit/PKGBUILD
	extra/libwmf/PKGBUILD
	extra/libxfcegui4/PKGBUILD
	extra/mjpegtools/PKGBUILD
	extra/netpbm/PKGBUILD
	extra/php/PKGBUILD
	extra/plotutils/PKGBUILD
	extra/poppler/PKGBUILD
	extra/qrencode/PKGBUILD
	extra/qt/PKGBUILD
	extra/qtiplot/PKGBUILD
	extra/rssh/PKGBUILD
	extra/scim-chewing/PKGBUILD
	extra/scim-m17n/PKGBUILD
	extra/scim-pinyin/PKGBUILD
	extra/scim-tables/PKGBUILD
	extra/scim-uim/PKGBUILD
	extra/tsocks/PKGBUILD
	extra/vigra/PKGBUILD
	extra/w3m/PKGBUILD
	extra/wv/PKGBUILD
	extra/xclip/PKGBUILD
	extra/xfce4-datetime-plugin/PKGBUILD
	extra/xfce4-notes-plugin/PKGBUILD
	extra/xfce4-quicklauncher-plugin/PKGBUILD
	extra/xfce4-sensors-plugin/PKGBUILD
	extra/xorg-font-util/PKGBUILD
	extra/xorg-setxkbmap/PKGBUILD
	extra/xorg-xev/PKGBUILD
	extra/xsane/PKGBUILD
	extra/yakuake/PKGBUILD
	extra/zvbi/PKGBUILD
	multilib/lib32-cairo/PKGBUILD
	multilib/lib32-gdk-pixbuf2/PKGBUILD
	multilib/lib32-libcanberra/PKGBUILD
	multilib/lib32-libcups/PKGBUILD
	multilib/lib32-libglade/PKGBUILD
	multilib/lib32-libpng/PKGBUILD
	multilib/lib32-libtiff/PKGBUILD
	multilib/lib32-pango/PKGBUILD
	multilib/lib32-qt/PKGBUILD
	multilib/lib32-sdl_image/PKGBUILD
	multilib/wine/PKGBUILD
	testing/vlc/PKGBUILD
	testing/xulrunner/PKGBUILD

1 files changed, 15 insertions, 15 deletions

diff --git a/extra/qemu-kvm/PKGBUILD b/extra/qemu-kvm/PKGBUILD
index 338395870..ac97b50e3 100644
--- a/extra/qemu-kvm/PKGBUILD
+++ b/extra/qemu-kvm/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 146639 2012-01-15 08:31:08Z tpowa $
+# $Id: PKGBUILD 148898 2012-02-05 11:54:47Z ibiru $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 pkgname=qemu-kvm
 pkgver=1.0
-pkgrel=2
+pkgrel=3
 pkgdesc="Latest KVM QEMU is a generic and open source processor emulator which achieves a good emulation speed by using dynamic translation."
 arch=(i686 x86_64 'mips64el')
 license=('GPL2' 'LGPL2.1')
@@ -20,7 +20,7 @@ options=(!strip)
 
 build()
 {
-    cd ${srcdir}/${pkgname}-${pkgver}
+    cd "${srcdir}/${pkgname}-${pkgver}"
     # fix esound building
     ./configure --prefix=/usr \
                 --python=/usr/bin/python2 \
@@ -32,7 +32,7 @@ build()
 
     # Use latest seabios version
     # https://bugs.archlinux.org/task/27616
-    cd ${srcdir}/
+    cd "${srcdir}/"
     git clone git://git.seabios.org/seabios.git
     cd seabios
     find 'tools/' 'contrib' -type f | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@'
@@ -42,27 +42,27 @@ build()
 
 package()
 {
-    cd ${srcdir}/${pkgname}-${pkgver}
-    make DESTDIR=${pkgdir} install
+    cd "${srcdir}/${pkgname}-${pkgver}"
+    make DESTDIR="${pkgdir}" install
     
     # Use latest seabios version
     # https://bugs.archlinux.org/task/27616
-    cp ${srcdir}/seabios/out/bios.bin ${pkgdir}/usr/share/qemu/bios.bin
+    cp "${srcdir}/seabios/out/bios.bin" "${pkgdir}/usr/share/qemu/bios.bin"
 
     # symbolic link for backwards compatibility
-    ln -s qemu-system-x86_64 ${pkgdir}/usr/bin/qemu-kvm
+    ln -s qemu-system-x86_64 "${pkgdir}/usr/bin/qemu-kvm"
     # symbolic link for to qemu binary for emulator apps
-    ln -s qemu-system-x86_64 ${pkgdir}/usr/bin/qemu
+    ln -s qemu-system-x86_64 "${pkgdir}/usr/bin/qemu"
     # symbolic link for to qemu binary for emulator apps
-    ln -s qemu-system-x86_64 ${pkgdir}/usr/bin/kvm
+    ln -s qemu-system-x86_64 "${pkgdir}/usr/bin/kvm"
     # fix man page
-    mv ${pkgdir}/usr/share/man/man1/qemu.1 \
-                     ${pkgdir}/usr/share/man/man1/qemu-kvm.1
+    mv "${pkgdir}/usr/share/man/man1/qemu.1" \
+                     "${pkgdir}/usr/share/man/man1/qemu-kvm.1"
     # install udev rules
-    install -D -m644 ${srcdir}/65-kvm.rules \
-                     ${pkgdir}/lib/udev/rules.d/65-kvm.rules
+    install -D -m644 "${srcdir}/65-kvm.rules" \
+                     "${pkgdir}/lib/udev/rules.d/65-kvm.rules"
     # strip scripts directory
-    find ${pkgdir}/usr/bin  -type f -perm -u+w 2>/dev/null | while read binary ; do
+    find "${pkgdir}/usr/bin"  -type f -perm -u+w 2>/dev/null | while read binary ; do
       case "$(file -bi "$binary")" in
         *application/x-executable*) # Binaries
         /usr/bin/strip $STRIP_BINARIES "$binary";;