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

Conflicts:
	community/bitcoin/PKGBUILD
	community/canorus/PKGBUILD
	community/celt-0.7/PKGBUILD
	community/djview4/PKGBUILD
	community/erlang-sdl/PKGBUILD
	community/erlang/PKGBUILD
	community/fcitx-mozc/PKGBUILD
	community/glitz/PKGBUILD
	community/gmerlin/PKGBUILD
	community/gmic/PKGBUILD
	community/goldendict/PKGBUILD
	community/google-gadgets/PKGBUILD
	community/highlight/PKGBUILD
	community/jack2/PKGBUILD
	community/kvirc/PKGBUILD
	community/launchy/PKGBUILD
	community/mplayer2/PKGBUILD
	community/mumble/PKGBUILD
	community/mupdf/PKGBUILD
	community/projectm/PKGBUILD
	community/psimedia/PKGBUILD
	community/pyqt3/PKGBUILD
	community/qps/PKGBUILD
	community/qstardict/PKGBUILD
	community/qsynergy/PKGBUILD
	community/synergy/PKGBUILD
	community/units/PKGBUILD
	community/yagf/PKGBUILD
	extra/automoc4/PKGBUILD
	extra/avahi/PKGBUILD
	extra/avidemux/PKGBUILD
	extra/bzflag/PKGBUILD
	extra/cagibi/PKGBUILD
	extra/cairo/PKGBUILD
	extra/calligra/PKGBUILD
	extra/cmake/PKGBUILD
	extra/dssi/PKGBUILD
	extra/ffmpeg/PKGBUILD
	extra/glu/PKGBUILD
	extra/graphviz/PKGBUILD
	extra/hylafax/PKGBUILD
	extra/kdesdk/PKGBUILD
	extra/libbluedevil/PKGBUILD
	extra/liblastfm/PKGBUILD
	extra/liborigin2/PKGBUILD
	extra/libpng/PKGBUILD
	extra/libqzeitgeist/PKGBUILD
	extra/libx11/PKGBUILD
	extra/mesa/PKGBUILD
	extra/mpg123/PKGBUILD
	extra/mtr/PKGBUILD
	extra/mysql/PKGBUILD
	extra/netpbm/PKGBUILD
	extra/nspr/PKGBUILD
	extra/polkit-qt/PKGBUILD
	extra/poppler/PKGBUILD
	extra/prison/PKGBUILD
	extra/pyqt/PKGBUILD
	extra/qimageblitz/PKGBUILD
	extra/qscintilla/PKGBUILD
	extra/qsynth/PKGBUILD
	extra/qt-assistant-compat/PKGBUILD
	extra/qt-gstreamer/PKGBUILD
	extra/qt/PKGBUILD
	extra/qtwebkit/PKGBUILD
	extra/qwt/PKGBUILD
	extra/samba/PKGBUILD
	extra/sane/PKGBUILD
	extra/smplayer/PKGBUILD
	extra/soprano/PKGBUILD
	extra/texmacs/PKGBUILD
	extra/tomcat-native/PKGBUILD
	extra/transmission/PKGBUILD
	extra/wpa_supplicant_gui/PKGBUILD
	libre/lame-libre/PKGBUILD
	libre/linux-libre/PKGBUILD
	libre/mesa-demos-libre/PKGBUILD

2 files changed, 7 insertions, 33 deletions

diff --git a/community/libvirt/PKGBUILD b/community/libvirt/PKGBUILD
index 1c271134f..b89ae0937 100644
--- a/community/libvirt/PKGBUILD
+++ b/community/libvirt/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 84161 2013-02-12 12:14:11Z thomas $
+# $Id: PKGBUILD 85292 2013-02-28 15:18:09Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Jonathan Wiersma <archaur at jonw dot org>
 
 pkgname=libvirt
-pkgver=1.0.2
-pkgrel=3
+pkgver=1.0.3
+pkgrel=1rc2
 pkgdesc="API for controlling virtualization engines (openvz,kvm,qemu,virtualbox,xen,etc)"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://libvirt.org/"
@@ -29,20 +29,18 @@ backup=('etc/conf.d/libvirtd'
 	'etc/libvirt/qemu.conf'
 	'etc/sasl2/libvirt.conf')
 install="libvirt.install"
-source=("http://libvirt.org/sources/$pkgname-$pkgver.tar.gz"
+source=("http://libvirt.org/sources/$pkgname-$pkgver-rc2.tar.gz"
 	libvirtd.rc.d
 	libvirtd.conf.d
 	libvirtd-guests.rc.d
 	libvirtd-guests.conf.d
-	libvirt.tmpfiles.d
-	python.patch)
-md5sums=('7e268ed702c4331d393e5b43449cae13'
+	libvirt.tmpfiles.d)
+md5sums=('d03a65be35c455bc09ee96df66ea2c4d'
          'c43244c40a0437038c82089618e7beaa'
          '3ed0e24f5b5e25bf553f5427d64915e6'
          '0ee5b6c58590ff392a266f20f7928d1f'
          '0a96ed876ffb1fcb9dff5a9b3a609c1e'
-         '020971887442ebbf1b6949e031c8dd3f'
-         '4280310abbdebbb7ad756840e4ff5671')
+         '020971887442ebbf1b6949e031c8dd3f')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
@@ -54,8 +52,6 @@ build() {
     sed -i 's_#!.*/usr/bin/env.*python_#!/usr/bin/env python2_' $file
   done
 
-  patch -p1 <$srcdir/python.patch
-
   export LDFLAGS=-lX11
   export RADVD=/usr/sbin/radvd
   [ -f Makefile ] || ./configure --prefix=/usr --libexec=/usr/lib/"$pkgname" \
diff --git a/community/libvirt/python.patch b/community/libvirt/python.patch
deleted file mode 100644
index c791a54e9..000000000
--- a/community/libvirt/python.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/python/generator.py b/python/generator.py
-index 5d27f66..71ca883 100755
---- a/python/generator.py
-+++ b/python/generator.py
-@@ -123,7 +123,7 @@ class docParser(xml.sax.handler.ContentHandler):
-                     self.function_return_field = attrs['field']
-         elif tag == 'enum':
-             if (attrs['file'] == "libvirt" or
--                attrs['file'] == "virterror"):
-+                attrs['file'] == "virerror"):
-                 enum(attrs['type'],attrs['name'],attrs['value'])
-             elif attrs['file'] == "libvirt-lxc":
-                 lxc_enum(attrs['type'],attrs['name'],attrs['value'])
-@@ -137,7 +137,7 @@ class docParser(xml.sax.handler.ContentHandler):
-             if self.function != None:
-                 if (self.function_module == "libvirt" or
-                     self.function_module == "virevent" or
--                    self.function_module == "virterror"):
-+                    self.function_module == "virerror"):
-                     function(self.function, self.function_descr,
-                              self.function_return, self.function_args,
-                              self.function_file, self.function_module,