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

Conflicts:
	community/bitcoin/PKGBUILD
	community/ecryptfs-utils/PKGBUILD
	community/erlang/PKGBUILD
	community/esmtp/PKGBUILD
	community/gmic/PKGBUILD
	community/ibus-sunpinyin/PKGBUILD
	community/libev/PKGBUILD
	community/libmirage/PKGBUILD
	community/libraw/PKGBUILD
	community/lilypond/PKGBUILD
	community/luajit/PKGBUILD
	community/matchbox-window-manager/PKGBUILD
	community/miniupnpc/PKGBUILD
	community/mplayer2/PKGBUILD
	community/mumble/PKGBUILD
	community/oss/PKGBUILD
	community/pidgin-lwqq/PKGBUILD
	community/postgis/PKGBUILD
	community/python2-pytables/PKGBUILD
	community/qmc2/PKGBUILD
	community/qtfm/PKGBUILD
	community/ruby-gtk3/PKGBUILD
	community/tea/PKGBUILD
	community/yacpi/PKGBUILD
	core/bridge-utils/PKGBUILD
	core/gcc/PKGBUILD
	core/libsasl/PKGBUILD
	core/lvm2/PKGBUILD
	core/net-tools/PKGBUILD
	core/ppp/PKGBUILD
	core/pptpclient/PKGBUILD
	core/sdparm/PKGBUILD
	core/systemd/PKGBUILD
	core/sysvinit-tools/PKGBUILD
	extra/aisleriot/PKGBUILD
	extra/arora/PKGBUILD
	extra/bluez-hcidump/PKGBUILD
	extra/bluez/PKGBUILD
	extra/cups/PKGBUILD
	extra/cyrus-sasl/PKGBUILD
	extra/dhcp/PKGBUILD
	extra/gnome-bluetooth/PKGBUILD
	extra/gnome-desktop/PKGBUILD
	extra/gnutls/PKGBUILD
	extra/gts/PKGBUILD
	extra/guile/PKGBUILD
	extra/harfbuzz/PKGBUILD
	extra/iptraf-ng/PKGBUILD
	extra/json-c/PKGBUILD
	extra/kdenetwork/PKGBUILD
	extra/kdepim/PKGBUILD
	extra/kdesdk-kate/PKGBUILD
	extra/libatasmart/PKGBUILD
	extra/libbsd/PKGBUILD
	extra/libdmtx/PKGBUILD
	extra/libhangul/PKGBUILD
	extra/libindi/PKGBUILD
	extra/libpeas/PKGBUILD
	extra/libsmbios/PKGBUILD
	extra/libspiro/PKGBUILD
	extra/libsrtp/PKGBUILD
	extra/libxml2/PKGBUILD
	extra/libxrender/PKGBUILD
	extra/libxvmc/PKGBUILD
	extra/llvm/PKGBUILD
	extra/maxima/PKGBUILD
	extra/msmtp/PKGBUILD
	extra/ortp/PKGBUILD
	extra/perl-dbd-sqlite/PKGBUILD
	extra/perl-yaml-syck/PKGBUILD
	extra/php/PKGBUILD
	extra/pm-utils/PKGBUILD
	extra/pulseaudio/PKGBUILD
	extra/pyqt4/PKGBUILD
	extra/scim-anthy/PKGBUILD
	extra/scim-chewing/PKGBUILD
	extra/scim-m17n/PKGBUILD
	extra/scim/PKGBUILD
	extra/ssmtp/PKGBUILD
	extra/texmacs/PKGBUILD
	extra/v86d/PKGBUILD
	extra/vlc/PKGBUILD
	extra/webkitgtk/PKGBUILD
	extra/webkitgtk2/PKGBUILD
	extra/wireshark/PKGBUILD
	extra/zsh/PKGBUILD
	libre/bogofilter-libre/PKGBUILD
	libre/ecasound-libre/PKGBUILD
	libre/libretools/libretools.install
	libre/mc-libre/PKGBUILD

1 files changed, 6 insertions, 11 deletions

diff --git a/extra/qemu/PKGBUILD b/extra/qemu/PKGBUILD
index 2c9cdb73d..d97731c19 100644
--- a/extra/qemu/PKGBUILD
+++ b/extra/qemu/PKGBUILD
@@ -1,35 +1,31 @@
 # $Id: PKGBUILD 185570 2013-05-15 08:05:29Z bpiotrowski $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 pkgname=qemu
-pkgver=1.4.1
-pkgrel=3
+pkgver=1.4.2
+pkgrel=2
 pkgdesc="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')
 url="http://wiki.qemu.org/Index.html"
 makedepends=('texi2html' 'perl' 'python2')
-depends=('pixman' 'libjpeg' 'libpng' 'sdl' 'alsa-lib' 'nss' 'glib2' 'gnutls>=2.4.1' 'bluez' 'vde2' 'util-linux' 'curl' 'libsasl' 'libgl' 'libpulse' 'seabios' 'libcap-ng')
+depends=('pixman' 'libjpeg' 'libpng' 'sdl' 'alsa-lib' 'nss' 'glib2' 'gnutls>=2.4.1' 'bluez-libs' 'vde2' 'util-linux' 'curl' 'libsasl' 'libgl' 'libpulse' 'seabios' 'libcap-ng' 'libaio' 'libseccomp' 'libiscsi')
 backup=('etc/qemu/target-x86_64.conf')
 install=qemu.install
 source=(http://wiki.qemu.org/download/${pkgname}-${pkgver}.tar.bz2
-        doc-fix-sheepdog-invalid-texi-table-list-syntax.patch
         65-kvm.rules)
 replaces=('qemu-kvm')
-options=(!strip)
+options=(!strip !libtool)
 
 prepare()
 {
   cd "${srcdir}/${pkgname}-${pkgver}"
   sed -i -e 's/lib64/lib/g' ldscripts/x86_64.ld
-  # fix building with tex version 5.0
-  # https://bugs.launchpad.net/qemu/+bug/1130533
-  patch -Np1 -i ${srcdir}/doc-fix-sheepdog-invalid-texi-table-list-syntax.patch
 }
 
 build ()
 {
   cd "${srcdir}/${pkgname}-${pkgver}"  
-  ./configure --prefix=/usr --sysconfdir=/etc --audio-drv-list=oss,alsa,sdl,pa \
+  ./configure --prefix=/usr --sysconfdir=/etc --audio-drv-list=alsa,sdl,pa \
               --python=/usr/bin/python2 \
               --audio-card-list=ac97,sb16,es1370,hda \
               --enable-docs --enable-mixemu --libexecdir=/usr/lib/qemu
@@ -57,6 +53,5 @@ package() {
     done
 
 }
-md5sums=('eb2d696956324722b5ecfa46e41f9a75'
-         'b431782f310bfc6af4ef21a8068f866b'
+md5sums=('b3eafa033ae4b8faba584f9f141b888f'
          'b316a066d2f1bb57d8f5b7ea1d0d1caf')