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

Conflicts:
	community/bird/PKGBUILD
	community/ecryptfs-utils/PKGBUILD
	community/linux-tools/PKGBUILD
	community/qtcurve-kde4/PKGBUILD
	extra/audacity/PKGBUILD
	extra/cups/PKGBUILD
	extra/imagemagick/PKGBUILD
	extra/kdeadmin/PKGBUILD
	extra/kdepim/PKGBUILD
	extra/kradio/PKGBUILD
	extra/libimobiledevice/PKGBUILD
	extra/libmowgli/PKGBUILD
	extra/llvm/PKGBUILD
	extra/phonon-vlc/PKGBUILD
	extra/pycrypto/PKGBUILD
	extra/xorg-server/PKGBUILD
	libre/linux-libre/PKGBUILD
	libre/syslinux/PKGBUILD
	multilib-staging/gcc-multilib/PKGBUILD
	multilib/lib32-libldap/PKGBUILD
	staging/binutils/PKGBUILD
	staging/gcc/PKGBUILD
	staging/glibc/PKGBUILD
	testing/cronie/PKGBUILD
	testing/cryptsetup/PKGBUILD
	testing/krb5/PKGBUILD
	testing/lvm2/PKGBUILD
	testing/net-tools/PKGBUILD
	testing/systemd/PKGBUILD

51 files changed, 706 insertions, 223 deletions

diff --git a/extra/audacity/PKGBUILD b/extra/audacity/PKGBUILD
index 8bb25db14..914a7be95 100644
--- a/extra/audacity/PKGBUILD
+++ b/extra/audacity/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 162721 2012-06-29 02:41:45Z eric $
+# $Id: PKGBUILD 164991 2012-08-08 01:06:53Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=audacity
 pkgver=2.0.1
-pkgrel=1
+pkgrel=2
 pkgdesc="A program that lets you manipulate digital audio waveforms"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://audacity.sourceforge.net/"
 license=('GPL')
 depends=('libmad' 'libid3tag' 'wxgtk' 'lame' 'hicolor-icon-theme'
-	 'desktop-file-utils' 'jack' 'soundtouch' 'ffmpeg')
+	 'desktop-file-utils' 'jack' 'soundtouch' 'ffmpeg-compat')
 options=('!makeflags')
 install=audacity.install
 source=(http://audacity.googlecode.com/files/${pkgname}-minsrc-${pkgver}.tar.bz2)
@@ -17,8 +17,11 @@ sha1sums=('366a10f3bd71c4d84c29437fff1e27a8560f691b')
 
 build() {
   cd "${srcdir}/${pkgname}-src-${pkgver}"
+
   [ "$CARCH" = "mips64el" ] && extra="--disable-sse"
-  WX_CONFIG=/usr/bin/wx-config ./configure --prefix=/usr \
+
+  WX_CONFIG=/usr/bin/wx-config PKG_CONFIG_PATH+="/usr/lib/ffmpeg-compat/pkgconfig" \
+    ./configure --prefix=/usr \
     --with-portaudio --with-libsamplerate \
     --without-libresample --with-libmad \
     --with-ffmpeg --with-id3tag --with-libflac \
diff --git a/extra/cmake/PKGBUILD b/extra/cmake/PKGBUILD
index 4b8a39a66..3c39c107e 100644
--- a/extra/cmake/PKGBUILD
+++ b/extra/cmake/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 157165 2012-04-25 06:58:42Z andrea $
+# $Id: PKGBUILD 165140 2012-08-11 16:15:35Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=cmake
-pkgver=2.8.8
-pkgrel=2
+pkgver=2.8.9
+pkgrel=1
 pkgdesc="A cross-platform open-source make system"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.cmake.org/"
@@ -13,17 +13,12 @@ depends=('curl' 'libarchive' 'shared-mime-info')
 makedepends=('qt')
 optdepends=('qt: cmake-gui')
 install="${pkgname}.install"
-source=("http://www.cmake.org/files/v2.8/${pkgname}-${pkgver}.tar.gz"
-        'fix-pkg-config.patch')
-md5sums=('ba74b22c788a0c8547976b880cd02b17'
-         '32c6a4360a2ba12dc77b6a840fa7672b')
+source=("http://www.cmake.org/files/v2.8/${pkgname}-${pkgver}.tar.gz")
+md5sums=('801f4c87f8b604f727df5bf1f05a59e7')
 
 build() {
   cd "${srcdir}"/${pkgname}-${pkgver}
 
-  # FS#29545
-  patch -p1 -i "${srcdir}"/fix-pkg-config.patch
-
   ./bootstrap --prefix=/usr \
     --mandir=/share/man \
     --docdir=/share/doc/cmake \
diff --git a/extra/cscope/PKGBUILD b/extra/cscope/PKGBUILD
index 1dc2d8d63..12f4c236b 100644
--- a/extra/cscope/PKGBUILD
+++ b/extra/cscope/PKGBUILD
@@ -3,18 +3,19 @@
 # Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgname=cscope
-pkgver=15.8
+pkgver=15.8.a
+_realver=15.8a
 pkgrel=1
 pkgdesc="A developers tool for browsing program code"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://cscope.sourceforge.net/"
 license=('BSD')
 depends=('ncurses' 'sh')
-source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('7114b5838b3edcb3f5821efd444fff06')
+source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${_realver}.tar.gz)
+md5sums=('b5c898ccedcfe2d4aa69537dad73b610')
 
 build() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
+	cd "${srcdir}/${pkgname}-${_realver}"
 	sed -i 's|/usr/local/lib/cs|/usr/lib/cs|' contrib/ocs
 
 	./configure --prefix=/usr
@@ -22,7 +23,7 @@ build() {
 }
 
 package() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
+	cd "${srcdir}/${pkgname}-${_realver}"
 	make DESTDIR="${pkgdir}" install
   
 	install -d ${pkgdir}/usr/lib/cs
@@ -32,3 +33,4 @@ package() {
 	install -Dm644 xcscope.el "${pkgdir}"/usr/share/emacs/site-lisp/xcscope.el
 	install -m755 cscope-indexer "${pkgdir}"/usr/bin
 }
+
diff --git a/extra/cups/PKGBUILD b/extra/cups/PKGBUILD
index 5c9612235..877673b1b 100644
--- a/extra/cups/PKGBUILD
+++ b/extra/cups/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 164782 2012-08-05 08:32:04Z andyrtr $
+# $Id: PKGBUILD 165095 2012-08-10 13:32:19Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgbase="cups"
 pkgname=('libcups' 'cups')
 pkgver=1.6.1
-pkgrel=2
+pkgrel=3
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://www.cups.org/"
@@ -18,7 +18,8 @@ source=(ftp://ftp.easysw.com/pub/cups/${pkgver}/cups-${pkgver}-source.tar.bz2
         cups cups.logrotate cups.pam
         cupsd-conf-remove-obsolete-browse-directives.patch
         avahi-missing-in-conditionals.patch
-        recognize-remote-cups-queue-via-dnssd-uri.patch)
+        recognize-remote-cups-queue-via-dnssd-uri.patch
+        usb-backend-reset-after-job-only-for-specific-devices.patch)
 #options=('!emptydirs')
 md5sums=('87ade07e3d1efd03c9c3add949cf9c00'
          '9b8467a1e51d360096b70e2c3c081e6c'
@@ -30,7 +31,8 @@ md5sums=('87ade07e3d1efd03c9c3add949cf9c00'
          '96f82c38f3f540b53f3e5144900acf17'
          '6bef262b5081051e88cd2ae94fed1867'
          '9c91b1319f4b20dc323986cb4abbe806'
-         'dcef8dd5614461166cada8a706eebb49')
+         'dcef8dd5614461166cada8a706eebb49'
+         '0779ef8ba1d724ebb3b9bf360deba52b')
 
 build() {
   cd ${srcdir}/${pkgbase}-${pkgver}
@@ -54,6 +56,8 @@ build() {
   patch -Np1 -i ${srcdir}/avahi-missing-in-conditionals.patch
   # http://www.cups.org/str.php?L4158 - DNS-SD-based print queues pointing to CUPS server are not considered remote printers with driver on server
   patch -Np1 -i ${srcdir}/recognize-remote-cups-queue-via-dnssd-uri.patch
+  # http://cups.org/str.php?L4155 / https://bugs.archlinux.org/task/30965
+  patch -Np0 -i ${srcdir}/usb-backend-reset-after-job-only-for-specific-devices.patch
   
   # Rebuild configure script for not zipping man-pages.
   aclocal -I config-scripts
diff --git a/extra/cups/cups.install b/extra/cups/cups.install
index cea52282e..fc015f951 100644
--- a/extra/cups/cups.install
+++ b/extra/cups/cups.install
@@ -24,6 +24,11 @@ post_upgrade() {
     echo "* check your config with cupsd -t"
     echo "  and fix all Browsing related settings"
   fi
+    if [ "`vercmp $2 1.6.1-3`" -lt 0 ]; then
+    # important upgrade notice
+    echo "> It's now safe to load usblp kernel module."
+    echo "> There's no more need to blacklist it."
+  fi
 }
 
 post_remove() {
diff --git a/extra/cups/usb-backend-reset-after-job-only-for-specific-devices.patch b/extra/cups/usb-backend-reset-after-job-only-for-specific-devices.patch
new file mode 100644
index 000000000..dcf91c833
--- /dev/null
+++ b/extra/cups/usb-backend-reset-after-job-only-for-specific-devices.patch
@@ -0,0 +1,74 @@
+--- backend/usb-libusb.c.orig	2012-07-16 19:10:55.000000000 +0200
++++ backend/usb-libusb.c	2012-08-06 11:01:58.034150159 +0200
+@@ -70,7 +70,7 @@
+ 			read_endp,	/* Read endpoint */
+ 			protocol,	/* Protocol: 1 = Uni-di, 2 = Bi-di. */
+ 			usblp_attached,	/* "usblp" kernel module attached? */
+-			opened_for_job;	/* Set to 1 by print_device() */
++			reset_after_job; /* Set to 1 by print_device() */
+   unsigned int		quirks;		/* Quirks flags */
+   struct libusb_device_handle *handle;	/* Open handle to device */
+ } usb_printer_t;
+@@ -122,6 +122,8 @@
+ #define USBLP_QUIRK_USB_INIT	0x2	/* needs vendor USB init string */
+ #define USBLP_QUIRK_BAD_CLASS	0x4	/* descriptor uses vendor-specific
+ 					   Class or SubClass */
++#define USBLP_QUIRK_RESET	0x4000	/* After printing do a reset
++					   for clean-up */
+ #define USBLP_QUIRK_NO_REATTACH	0x8000	/* After printing we cannot re-attach
+ 					   the usblp kernel module */
+ 
+@@ -147,9 +149,11 @@
+ 	{ 0x04b8, 0x0202, USBLP_QUIRK_BAD_CLASS }, /* Seiko Epson Receipt
+ 						      Printer M129C */
+ 	{ 0x067b, 0x2305, USBLP_QUIRK_BIDIR |
+-			  USBLP_QUIRK_NO_REATTACH },
++			  USBLP_QUIRK_NO_REATTACH |
++	                  USBLP_QUIRK_RESET },
+ 	/* Prolific Technology, Inc. PL2305 Parallel Port
+ 	   (USB -> Parallel adapter) */
++	{ 0x04e8, 0x0000, USBLP_QUIRK_RESET }, /* All Samsung devices */
+ 	{ 0, 0 }
+ };
+ 
+@@ -256,7 +260,12 @@
+   }
+ 
+   g.print_fd = print_fd;
+-  g.printer->opened_for_job = 1;
++
++ /*
++  * Some devices need a reset after finishing a job, these devices are
++  * marked with the USBLP_QUIRK_RESET quirk.
++  */
++  g.printer->reset_after_job = (g.printer->quirks & USBLP_QUIRK_RESET ? 1 : 0);
+ 
+  /*
+   * If we are printing data from a print driver on stdin, ignore SIGTERM
+@@ -772,7 +781,7 @@
+     * Reset the device to clean up after the job
+     */
+ 
+-    if (printer->opened_for_job == 1)
++    if (printer->reset_after_job == 1)
+     {
+       if ((errcode = libusb_reset_device(printer->handle)) < 0)
+ 	fprintf(stderr,
+@@ -1288,7 +1297,7 @@
+   }
+ 
+   printer->usblp_attached = 0;
+-  printer->opened_for_job = 0;
++  printer->reset_after_job = 0;
+ 
+   if (verbose)
+     fputs("STATE: +connecting-to-device\n", stderr);
+@@ -1586,7 +1595,7 @@
+   for (i = 0; quirk_printers[i].vendorId; i++)
+   {
+     if (vendor == quirk_printers[i].vendorId &&
+-	product == quirk_printers[i].productId)
++	(product == 0x0000 || product == quirk_printers[i].productId))
+       return quirk_printers[i].quirks;
+   }
+   return 0;
diff --git a/extra/digikam/PKGBUILD b/extra/digikam/PKGBUILD
index ae18211dd..300f2c081 100644
--- a/extra/digikam/PKGBUILD
+++ b/extra/digikam/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 164839 2012-08-06 23:09:37Z andrea $
+# $Id: PKGBUILD 165014 2012-08-08 19:37:59Z ronald $
 # Maintainer: Ronald van Haren <ronald@archlinux.org>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgbase=digikam
 pkgname=('digikam' 'kipi-plugins' 'libkface' 'libkgeomap' 'libkvkontakte' 'libmediawiki')
-pkgver=2.7.0
-pkgrel=2
+pkgver=2.8.0
+pkgrel=1
 pkgdesc="Digital photo management application for KDE"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
@@ -15,7 +15,7 @@ makedepends=('kdepimlibs' 'libkexiv2' 'libkdcraw' 'libkipi' 'libksane' 'liblqr'
              'kdeedu-marble' 'opencv' 'boost' 'libgpod' 'qjson' 'hugin'
              'cmake' 'automoc4' 'doxygen')
 source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('43f51c389984538025f185acf8902a923eb0268b')
+sha1sums=('43672f7f46e53f9a71516f79aa700d77143cecf5')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/gnucash/PKGBUILD b/extra/gnucash/PKGBUILD
index d37be36ab..93502f0a3 100644
--- a/extra/gnucash/PKGBUILD
+++ b/extra/gnucash/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 150910 2012-02-23 13:59:07Z juergen $
+# $Id: PKGBUILD 165143 2012-08-11 18:49:18Z eric $
 # Maintainer: Aaron Griffin <aaron@archlinux.org>
 # Contributor: Mark Schneider <queueRAM@gmail.com>
 
 pkgname=gnucash
-pkgver=2.4.10
+pkgver=2.4.11
 pkgrel=1
 pkgdesc="A personal and small-business financial-accounting application"
 arch=('i686' 'x86_64' 'mips64el')
@@ -17,7 +17,7 @@ optdepends=('evince: for print preview'
 options=('!libtool' '!makeflags' '!emptydirs')
 install=gnucash.install
 source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('b1906f8143406fdf8cb5217233143cc08e708b99')
+sha1sums=('c157ad7ea0960c71966f5071acd9018580ece538')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/gparted/PKGBUILD b/extra/gparted/PKGBUILD
index afa6e4e8b..c210e7909 100644
--- a/extra/gparted/PKGBUILD
+++ b/extra/gparted/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 163532 2012-07-14 18:17:58Z giovanni $
+# $Id: PKGBUILD 165018 2012-08-08 23:33:07Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Andrew Simmons <andrew.simmons@gmail.com>
 # Contributor: György Balló <ballogy@freestart.hu>
 
 pkgname=gparted
-pkgver=0.13.0
+pkgver=0.13.1
 pkgrel=1
 pkgdesc="A Partition Magic clone, frontend to GNU Parted"
 arch=('i686' 'x86_64' 'mips64el')
@@ -24,7 +24,7 @@ optdepends=('dosfstools: for FAT16 and FAT32 partitions'
 install=gparted.install
 source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgname}-${pkgver}/${pkgname}-${pkgver}.tar.bz2"
         'org.archlinux.pkexec.gparted.policy')
-md5sums=('6977d89ade1c81ccb8310dae0a0d3509'
+md5sums=('2c3f88fbdd0b43bfe4d843f6dc8063f2'
          '27c264cfad8fa413d75954dda7a2dd50')
 
 build() {
diff --git a/extra/imagemagick/PKGBUILD b/extra/imagemagick/PKGBUILD
index bd7a46067..b55b56812 100644
--- a/extra/imagemagick/PKGBUILD
+++ b/extra/imagemagick/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 164013 2012-07-23 22:32:35Z eric $
+# $Id: PKGBUILD 165104 2012-08-11 06:10:43Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgbase=imagemagick
 pkgname=('imagemagick' 'imagemagick-doc')
-pkgver=6.7.8.7
+pkgver=6.7.8.9
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.imagemagick.org/"
@@ -12,6 +12,8 @@ makedepends=('libltdl' 'lcms2' 'libxt' 'fontconfig' 'libxext' 'ghostscript' \
              'openexr' 'libwmf' 'librsvg' 'libxml2' 'jasper' 'liblqr')
 source=(ftp://ftp.imagemagick.org/pub/ImageMagick/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz \
         perlmagick.rpath.patch)
+sha1sums=('531a150014119573a04eed28df6192137f4799bc'
+          '23405f80904b1de94ebd7bd6fe2a332471b8c283')
 
 build() {
   cd "${srcdir}"/ImageMagick-${pkgver%.*}-${pkgver##*.}
@@ -78,5 +80,3 @@ package_imagemagick-doc() {
   install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/imagemagick-doc/LICENSE"
   install -Dm644 NOTICE "${pkgdir}/usr/share/licenses/imagemagick-doc/NOTICE"
 }
-md5sums=('c12aa1fafac9ebdca42464ba872fac86'
-         'ff9974decbfe9846f8e347239d87e4eb')
diff --git a/extra/kdeadmin/PKGBUILD b/extra/kdeadmin/PKGBUILD
index 48a88ebb9..2e1e4ffe9 100644
--- a/extra/kdeadmin/PKGBUILD
+++ b/extra/kdeadmin/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 164873 2012-08-06 23:16:11Z andrea $
+# $Id: PKGBUILD 164959 2012-08-07 15:57:09Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
@@ -8,9 +8,8 @@ pkgname=('kdeadmin-kcron'
          'kdeadmin-kuser'
          'kdeadmin-system-config-printer-kde')
 pkgver=4.9.0
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64' 'mips64el')
-url='http://www.kde.org'
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdeadmin')
 makedepends=('cmake' 'automoc4' 'kdebindings-python2' 'system-config-printer-common')
@@ -37,6 +36,7 @@ build() {
 
 package_kdeadmin-kcron() {
 	pkgdesc='Configure and schedule tasks'
+    url='http://userbase.kde.org/KCron'
 	depends=('kdelibs')
 	cd $srcdir/build/kcron
 	make DESTDIR=$pkgdir install
@@ -71,6 +71,8 @@ package_kdeadmin-system-config-printer-kde() {
 	url="http://kde.org/applications/system/printerapplet/"
 	cd $srcdir/build/system-config-printer-kde
 	make DESTDIR=$pkgdir install
+	cd $srcdir/build/doc/system-config-printer-kde
+	make DESTDIR=$pkgdir install
 
     # Use the python2 executable
     sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \
diff --git a/extra/kdepim/PKGBUILD b/extra/kdepim/PKGBUILD
index 5555bbf7a..2d1c1703d 100644
--- a/extra/kdepim/PKGBUILD
+++ b/extra/kdepim/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 164921 2012-08-06 23:20:54Z andrea $
+# $Id: PKGBUILD 164965 2012-08-07 16:32:21Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
@@ -18,9 +18,10 @@ pkgname=('kdepim-akonadiconsole'
          'kdepim-korganizer'
          'kdepim-kresources'
          'kdepim-ktimetracker'
+         'kdepim-ktnef'
          'kdepim-libkdepim')
 pkgver=4.9.0
-pkgrel=2
+pkgrel=3
 arch=('i686' 'x86_64' 'mips64el')
 url='http://pim.kde.org'
 license=('GPL' 'LGPL' 'FDL')
@@ -89,6 +90,10 @@ package_kdepim-console() {
 	install='kdepim.install'
 	cd "${srcdir}"/build/console
 	make DESTDIR="${pkgdir}" install
+	cd "${srcdir}"/build/doc/kabcclient
+	make DESTDIR="${pkgdir}" install
+	cd "${srcdir}"/build/doc/konsolekalendar
+	make DESTDIR="${pkgdir}" install
 }
 
 package_kdepim-kaddressbook() {
@@ -137,6 +142,8 @@ package_kdepim-kleopatra() {
 	make DESTDIR="${pkgdir}" install
 	cd "${srcdir}"/build/doc/kleopatra
 	make DESTDIR="${pkgdir}" install
+	cd "${srcdir}"/build/doc/kwatchgnupg
+	make DESTDIR="${pkgdir}" install
 }
 
 package_kdepim-kmail() {
@@ -148,8 +155,9 @@ package_kdepim-kmail() {
 	           'kdepim-mimelib' 'kdepim-plugins')
 	replaces=('kdepim-kmailcvt' 'kdepim-ksendemail' 'kdepim-libksieve'
 	          'kdepim-mimelib' 'kdepim-plugins')
-	for i in kmail doc/kmail kmailcvt importwizard ksendemail libksieve \
-        messagelist mailfilteragent mailimporter ontologies kontact/plugins/kmail; do
+	for i in kmail doc/kmail kmailcvt archivemailagent backupmail \
+	importwizard ksendemail libksieve messagelist mailfilteragent \
+	mailimporter ontologies kontact/plugins/kmail; do
 		cd "${srcdir}"/build/${i}
 		make DESTDIR="${pkgdir}" install
 	done
@@ -164,6 +172,8 @@ package_kdepim-knode() {
 	make DESTDIR="${pkgdir}" install
 	cd "${srcdir}"/build/doc/knode
 	make DESTDIR="${pkgdir}" install
+	cd "${srcdir}"/build/doc/kioslave/news
+	make DESTDIR="${pkgdir}" install
 	cd "${srcdir}"/build/kontact/plugins/knode
 	make DESTDIR="${pkgdir}" install
 }
@@ -189,7 +199,7 @@ package_kdepim-kontact() {
 	conflcits=('kdepim-kontactinterfaces')
 	replaces=('kdepim-kontactinterfaces')
 	for i in kontact/src doc/kontact kontact/plugins/summary \
-		kontact/plugins/specialdates; do
+		kontact/plugins/specialdates doc/kontact-admin; do
 		cd "${srcdir}"/build/${i}
 		make DESTDIR="${pkgdir}" install
 	done
@@ -228,6 +238,16 @@ package_kdepim-ktimetracker() {
 	make DESTDIR="${pkgdir}" install
 }
 
+package_kdepim-ktnef() {
+	pkgdesc='A viewer/extractor for TNEF files'
+	depends=('kdepim-libkdepim')
+	url="https://projects.kde.org/projects/kde/kdepim/ktnef"
+	cd "${srcdir}"/build/ktnef
+	make DESTDIR="${pkgdir}" install
+	cd "${srcdir}"/build/doc/ktnef
+	make DESTDIR="${pkgdir}" install	
+}
+
 package_kdepim-libkdepim() {
 	pkgdesc='Library for KDE PIM'
 	groups=()
@@ -238,10 +258,10 @@ package_kdepim-libkdepim() {
 	replaces=('kdepim-icons' 'kdepim-libkleo' 'kdepim-libkpgp'
 	          'kdepim-strigi-analyzer' 'kdepim-akonadi')
 	for i in akonadi_next calendarsupport incidenceeditor-ng \
-		kdgantt2 libkdepim libkdepimdbusinterfaces libkleo libkpgp \
-		mailcommon messagecomposer messagecore messageviewer icons \
-		strigi-analyzer templateparser plugins/messageviewer \
-		plugins/ktexteditor; do
+	kdgantt2 libkdepim libkdepimdbusinterfaces libkleo libkpgp \
+	mailcommon messagecomposer messagecore messageviewer icons \
+	strigi-analyzer templateparser plugins/messageviewer \
+	plugins/ktexteditor; do
 		cd "${srcdir}"/build/${i}
 		make DESTDIR="${pkgdir}" install
 	done
diff --git a/extra/kradio/PKGBUILD b/extra/kradio/PKGBUILD
index 75e8b759d..5c268a48b 100644
--- a/extra/kradio/PKGBUILD
+++ b/extra/kradio/PKGBUILD
@@ -1,21 +1,21 @@
-# $Id: PKGBUILD 163153 2012-07-08 09:31:40Z ibiru $
+# $Id: PKGBUILD 164981 2012-08-07 18:56:07Z eric $
 # Maintainer:
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=kradio
-pkgver=4.0.4
-pkgrel=2
+pkgver=4.0.5
+pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
 pkgdesc="A comfortable KDE internet and AM/FM radio application"
 url="http://kradio.sourceforge.net/"
 depends=('kdebase-runtime' 'libmms' 'ffmpeg')
 [ "$CARCH" != "mips64el" ] && depends+=('lirc-utils')
-makedepends=('automoc4' 'cmake')
+makedepends=('automoc4' 'cmake' 'boost')
 install=$pkgname.install
 source=("http://downloads.sourceforge.net/$pkgname/kradio4-$pkgver.tar.bz2"{,.asc})
-md5sums=('4b5495a4f1dda21f7201bc8db0d4f95e'
-         '51c6d4ec0047d2df595b458bde285012')
+md5sums=('d2ce6b9c12e66c8cdb300013aa0cb26a'
+         '3faef5c46547b14804839f367fd09d29')
 
 build() {
   cd "$srcdir"
diff --git a/extra/libexif/PKGBUILD b/extra/libexif/PKGBUILD
index 03a2ea626..5526df989 100644
--- a/extra/libexif/PKGBUILD
+++ b/extra/libexif/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 151067 2012-02-24 17:47:48Z ibiru $
+# $Id: PKGBUILD 165030 2012-08-09 08:16:11Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Tobias Kieslich <tobias@justdreams.de>
 
 pkgname=libexif
-pkgver=0.6.20
-pkgrel=2
+pkgver=0.6.21
+pkgrel=1
 pkgdesc="A library to parse an EXIF file and read the data from those tags"
 arch=(i686 x86_64 'mips64el')
 license=('LGPL')
@@ -12,7 +12,7 @@ url="http://sourceforge.net/projects/libexif"
 depends=('glibc')
 options=('!libtool')
 source=(http://downloads.sf.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('19844ce6b5d075af16f0d45de1e8a6a3')
+md5sums=('27339b89850f28c8f1c237f233e05b27')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/libguess/PKGBUILD b/extra/libguess/PKGBUILD
index 4cd4ec315..ac0e00aa2 100644
--- a/extra/libguess/PKGBUILD
+++ b/extra/libguess/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 144020 2011-12-02 00:37:26Z bisson $
+# $Id: PKGBUILD 165081 2012-08-10 03:55:30Z bisson $
 
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Kemka Andrey <dr.andru@gmail.com>
 
 pkgname=libguess
 pkgver=1.1
-pkgrel=1
+pkgrel=2
 pkgdesc='High-speed character set detection library'
 url='http://atheme.org/project/libguess'
-license=('BSD')
+license=('custom')
 depends=('libmowgli')
 arch=('i686' 'x86_64' 'mips64el')
 source=("http://distfiles.atheme.org/libguess-${pkgver}.tar.gz")
@@ -16,6 +16,7 @@ sha1sums=('2760e63b71497506208f9d6269ec52f83bfc6f0b')
 
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
+	sed 's/libmowgli >= 0.9.50/libmowgli-2/g' -i configure
 	./configure --prefix=/usr
 	make
 }
diff --git a/extra/libimobiledevice/HOME-segfault.patch b/extra/libimobiledevice/HOME-segfault.patch
new file mode 100644
index 000000000..e48e6cb42
--- /dev/null
+++ b/extra/libimobiledevice/HOME-segfault.patch
@@ -0,0 +1,14 @@
+The patch fixes segfault when both $XDG_CONFIG_HOME and $HOME are unset
+Signed-off-by: Maxim Mikityanskiy <maxtram95@gmail.com>
+--- src/userpref.c.orig	2012-06-04 17:04:57.387303630 +0300
++++ src/userpref.c	2012-06-04 17:06:05.741301627 +0300
+@@ -125,6 +125,9 @@
+ 	const char *cdir = getenv("XDG_CONFIG_HOME");
+ 	if (!cdir) {
+ 		cdir = getenv("HOME");
++		if (!cdir) {
++			cdir="/root";
++		}
+ 		strcpy(__config_dir, cdir);
+ 		strcat(__config_dir, DIR_SEP_S);
+ 		strcat(__config_dir, ".config");
diff --git a/extra/libmowgli/PKGBUILD b/extra/libmowgli/PKGBUILD
index 7d4ca777a..aa8778f3e 100644
--- a/extra/libmowgli/PKGBUILD
+++ b/extra/libmowgli/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 144018 2011-12-02 00:36:56Z bisson $
+# $Id: PKGBUILD 165079 2012-08-10 03:54:41Z bisson $
 
 # Contributor: Alexander Fehr <pizzapunk gmail com>
 # Contributor: Brad Gordon <brad@rpgcyco.net>
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 
 pkgname=libmowgli
-pkgver=1.0.0
+pkgver=2.0.0
 pkgrel=1
 pkgdesc='Performance and usability-oriented extensions to C'
 url='http://www.atheme.org/project/mowgli'
 license=('custom')
 depends=('glibc')
 arch=('i686' 'x86_64' 'mips64el')
-source=("http://distfiles.atheme.org/${pkgname}-${pkgver}.tar.gz")
-sha1sums=('403473582e3086c1acaafed59b9915f29a5d0ce0')
+source=("http://atheme.org/downloads/${pkgname}-${pkgver}.tar.gz")
+sha1sums=('5a697380f253f0456a5d8a38006a9d12847fb538')
 
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/libofx/PKGBUILD b/extra/libofx/PKGBUILD
index 2d8983d95..b82443e8b 100644
--- a/extra/libofx/PKGBUILD
+++ b/extra/libofx/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 127929 2011-06-20 00:18:32Z eric $
+# $Id: PKGBUILD 165144 2012-08-11 18:49:23Z eric $
 # Maintainer: Aaron Griffin <aaron@archlinux.org>
 
 pkgbase=libofx
 pkgname=('libofx' 'libofx-doc')
-pkgver=0.9.4
+pkgver=0.9.5
 pkgrel=1
 pkgdesc="API for the OFX banking standard"
 arch=('i686' 'x86_64' 'mips64el')
@@ -11,12 +11,13 @@ url="http://libofx.sourceforge.net"
 license=('GPL')
 depends=('opensp' 'curl' 'libxml++')
 checkdepends=('gnupg')
-source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz)
-md5sums=('f2419bf8d01c0cff74efe7084e0a26c5')
-sha1sums=('7370245c011ac4ea9313ba24a88c70e0eb9c317b')
+source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz libofx-gcc47.patch)
+sha1sums=('7e5245d68a0f3f7efad2fd809b2afbbff6ba0e73'
+          '6c327e24543cb8ba901bfb204343a85c68264654')
 
 build() {
   cd "$srcdir/$pkgbase-$pkgver"
+  patch -p1 -i "$srcdir/libofx-gcc47.patch"
   ./configure --prefix=/usr
   make
 }
diff --git a/extra/libofx/libofx-gcc47.patch b/extra/libofx/libofx-gcc47.patch
new file mode 100644
index 000000000..899fe09e0
--- /dev/null
+++ b/extra/libofx/libofx-gcc47.patch
@@ -0,0 +1,11 @@
+diff -Nru libofx-0.9.4/debian/patches/fix-ftbfs-gcc4.7.diff libofx-0.9.4/debian/patches/fix-ftbfs-gcc4.7.diff
+--- libofx-0.9.4.orig/ofxconnect/ofxpartner.cpp	2011-03-30 22:30:50.000000000 +0000
++++ libofx-0.9.4/ofxconnect/ofxpartner.cpp	2012-04-17 06:08:38.711940892 +0000
+@@ -37,6 +37,7 @@
+ #include <vector>
+ #include <algorithm>
+ #include <string.h>
++#include <unistd.h>
+ 
+ using std::string;
+ using std::vector;
diff --git a/extra/libspectre/PKGBUILD b/extra/libspectre/PKGBUILD
index dc0eb14fb..f645f8d0f 100644
--- a/extra/libspectre/PKGBUILD
+++ b/extra/libspectre/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 151274 2012-02-25 10:45:30Z allan $
+# $Id: PKGBUILD 165038 2012-08-09 11:32:27Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libspectre
-pkgver=0.2.6
-pkgrel=3
+pkgver=0.2.7
+pkgrel=1
 pkgdesc="Small library for rendering Postscript documents"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
-url="http://libspectre.freedesktop.org/wiki/"
+url="http://www.freedesktop.org/wiki/Software/libspectre"
 depends=('ghostscript>=9.00')
 options=('!libtool')
 source=(http://libspectre.freedesktop.org/releases/${pkgname}-${pkgver}.tar.gz)
-sha1sums=('819475c7e34a1e9bc2e876110fee530b42aecabd')
+sha1sums=('a7efd97b82b84ff1bb7a0d88c7e35ad10cc84ea8')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/libxrandr/PKGBUILD b/extra/libxrandr/PKGBUILD
index 21f4de688..babd12df0 100644
--- a/extra/libxrandr/PKGBUILD
+++ b/extra/libxrandr/PKGBUILD
@@ -1,20 +1,20 @@
-# $Id: PKGBUILD 143893 2011-11-30 19:05:26Z andrea $
+# $Id: PKGBUILD 165113 2012-08-11 08:21:35Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Alexander Baldeck <alexander@archlinux.org>
 
 pkgname=libxrandr
-pkgver=1.3.2
-pkgrel=2
+pkgver=1.4.0
+pkgrel=1
 pkgdesc="X11 RandR extension library"
 arch=('i686' 'x86_64' 'mips64el')
 license=('custom')
 url="http://xorg.freedesktop.org/"
-depends=('libxext' 'libxrender' 'randrproto')
+depends=('libxext' 'libxrender' 'randrproto>=1.4.0')
 makedepends=('xorg-util-macros')
 options=('!libtool')
 source=(${url}/releases/individual/lib/libXrandr-${pkgver}.tar.bz2)
-sha1sums=('0c844a4c5237f96794f0c18a5af16dc5ab7a36ec')
+sha256sums=('033ad0ac2f012afb05268660f6d78705c85f84689f92fa7b47ce12959b15f5c3')
 
 build() {
   cd "${srcdir}/libXrandr-${pkgver}"
diff --git a/extra/lilv/PKGBUILD b/extra/lilv/PKGBUILD
new file mode 100644
index 000000000..d9db5de53
--- /dev/null
+++ b/extra/lilv/PKGBUILD
@@ -0,0 +1,42 @@
+# $Id: PKGBUILD 72422 2012-06-14 07:51:14Z speps $
+# Maintainer: speps <speps at aur dot archlinux dot org>
+
+pkgname=lilv
+pkgver=0.14.2
+pkgrel=1
+pkgdesc="A library to make the use of LV2 plugins as simple as possible for applications."
+arch=(i686 x86_64)
+url="http://drobilla.net/software/$pkgname/"
+license=('custom:ISC')
+depends=('python2' 'sratom' 'jack')
+makedepends=('swig')
+optdepends=('bash-completion: auto-complete words')
+source=("http://download.drobilla.net/$pkgname-$pkgver.tar.bz2")
+md5sums=('1aea6761f3e44007c0fb4eb20630655d')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  export PYTHON="/usr/bin/python2"
+
+  # remove ldconfig
+  sed -i "/ldconfig/d" wscript
+
+  python2 ./waf configure --prefix=/usr \
+                          --mandir=/usr/share/man \
+                          --configdir=/etc \
+                          --dyn-manifest \
+                          --bindings
+  python2 ./waf
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  DESTDIR="$pkgdir" python2 ./waf install
+
+  # license
+  install -Dm644 COPYING \
+    "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/extra/live-media/PKGBUILD b/extra/live-media/PKGBUILD
index ba7a8357d..20b4da0ae 100644
--- a/extra/live-media/PKGBUILD
+++ b/extra/live-media/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 164191 2012-07-27 09:30:54Z giovanni $
+# $Id: PKGBUILD 165022 2012-08-09 00:07:34Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Gilles CHAUVIN <gcnweb@gmail.com>
 
 pkgname=live-media
-pkgver=2012.07.26
+pkgver=2012.08.08
 pkgrel=1
 pkgdesc="A set of C++ libraries for multimedia streaming"
 arch=('i686' 'x86_64' 'mips64el')
@@ -11,7 +11,7 @@ license=('LGPL')
 url="http://live555.com/liveMedia"
 depends=('gcc-libs')
 source=("http://live555.com/liveMedia/public/live.${pkgver}.tar.gz")
-md5sums=('18374e9f6681f62ab7c987ca0029d494')
+md5sums=('4736e19a3d38c7f9a8b81d78685d8aee')
 
 build() {
   cd ${srcdir}/live
diff --git a/extra/llvm/PKGBUILD b/extra/llvm/PKGBUILD
index cae3d2931..5f5306e5e 100644
--- a/extra/llvm/PKGBUILD
+++ b/extra/llvm/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 163974 2012-07-23 03:57:55Z foutrelis $
+# $Id: PKGBUILD 165098 2012-08-10 21:21:52Z foutrelis $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com>
 # Contributor: Sebastian Nowicki <sebnow@gmail.com>
@@ -11,7 +11,7 @@
 
 pkgname=('llvm' 'llvm-ocaml' 'clang' 'clang-analyzer')
 pkgver=3.1
-pkgrel=3
+pkgrel=4
 arch=('i686' 'x86_64' 'mips64el')
 url="http://llvm.org/"
 license=('custom:University of Illinois/NCSA Open Source License')
@@ -24,6 +24,7 @@ source=(http://llvm.org/releases/$pkgver/$pkgname-$pkgver.src.tar.gz
         cindexer-clang-path.patch
         clang-pure64.patch
         enable-lto.patch
+        llvm-3.1-fix-debug-line-info.patch
         clang-3.1-fix-libprofile_rt.a-location.patch)
 sha256sums=('1ea05135197b5400c1f88d00ff280d775ce778f8f9ea042e25a1e1e734a4b9ab'
             'ff63e215dcd3e2838ffdea38502f8d35bab17e487f3c3799579961e452d5a786'
@@ -33,6 +34,7 @@ sha256sums=('1ea05135197b5400c1f88d00ff280d775ce778f8f9ea042e25a1e1e734a4b9ab'
             '3074df5322900e087377a8e03a02115463ccc0011c25917c2f06df11facd9b92'
             '288a82fbff17bc554f5863734246500e637882af33ee8511019d5e0d6cd20524'
             'f7145e203ffb4ce2c01976027f7840a9520e5341a9945f2459b6b11e5422d5b7'
+            'db1f1aadebbc4c4232bdad49fb9b7dc61eac727085c63154b870fa9ce64fd18d'
             '0d32ad283566357ca1bfbeb4cbe6b0b961943b79d3d718ed0435101c05629137')
 
 build() {
@@ -79,6 +81,10 @@ build() {
   patch -d tools/clang -Np1 -i \
     "$srcdir/clang-3.1-fix-libprofile_rt.a-location.patch"
 
+  # Fix FS#31098: LLVM 3.1 produces invalid debug information
+  # http://llvm.org/bugs/show_bug.cgi?id=13211
+  patch -Np1 -i "$srcdir/llvm-3.1-fix-debug-line-info.patch"
+
   # Apply strip option to configure
   _optimized_switch="enable"
   [[ $(check_option strip) == n ]] && _optimized_switch="disable"
diff --git a/extra/llvm/llvm-3.1-fix-debug-line-info.patch b/extra/llvm/llvm-3.1-fix-debug-line-info.patch
new file mode 100644
index 000000000..de2d46b61
--- /dev/null
+++ b/extra/llvm/llvm-3.1-fix-debug-line-info.patch
@@ -0,0 +1,65 @@
+From 737fdba46f2b2b7d39bc728d15ea2334c44779e0 Mon Sep 17 00:00:00 2001
+From: Ben Longbons <b.r.longbons@gmail.com>
+Date: Fri, 29 Jun 2012 12:58:34 -0700
+Subject: [PATCH] Revert "Patch to set is_stmt a little better for prologue
+ lines in a function."
+
+This meants that the debugger could find meaningful line information.
+
+This reverts commit 60b35f408bc3194e7ea4e96367c0b42dc5e7f850.
+---
+ lib/CodeGen/AsmPrinter/DwarfDebug.cpp |    7 ++-----
+ test/DebugInfo/X86/ending-run.ll      |    6 ++----
+ 2 files changed, 4 insertions(+), 9 deletions(-)
+
+diff --git a/lib/CodeGen/AsmPrinter/DwarfDebug.cpp b/lib/CodeGen/AsmPrinter/DwarfDebug.cpp
+index 3e79a6d..24aedfb 100644
+--- a/lib/CodeGen/AsmPrinter/DwarfDebug.cpp
++++ b/lib/CodeGen/AsmPrinter/DwarfDebug.cpp
+@@ -1093,15 +1093,12 @@ void DwarfDebug::beginInstruction(const MachineInstr *MI) {
+   if (!MI->isDebugValue()) {
+     DebugLoc DL = MI->getDebugLoc();
+     if (DL != PrevInstLoc && (!DL.isUnknown() || UnknownLocations)) {
+-      unsigned Flags = 0;
++      unsigned Flags = DWARF2_FLAG_IS_STMT;
+       PrevInstLoc = DL;
+       if (DL == PrologEndLoc) {
+         Flags |= DWARF2_FLAG_PROLOGUE_END;
+         PrologEndLoc = DebugLoc();
+       }
+-      if (PrologEndLoc.isUnknown())
+-        Flags |= DWARF2_FLAG_IS_STMT;
+-
+       if (!DL.isUnknown()) {
+         const MDNode *Scope = DL.getScope(Asm->MF->getFunction()->getContext());
+         recordSourceLine(DL.getLine(), DL.getCol(), Scope, Flags);
+@@ -1382,7 +1379,7 @@ void DwarfDebug::beginFunction(const MachineFunction *MF) {
+                                        MF->getFunction()->getContext());
+     recordSourceLine(FnStartDL.getLine(), FnStartDL.getCol(),
+                      FnStartDL.getScope(MF->getFunction()->getContext()),
+-                     0);
++                     DWARF2_FLAG_IS_STMT);
+   }
+ }
+ 
+diff --git a/test/DebugInfo/X86/ending-run.ll b/test/DebugInfo/X86/ending-run.ll
+index 6935c47..0cd3de1 100644
+--- a/test/DebugInfo/X86/ending-run.ll
++++ b/test/DebugInfo/X86/ending-run.ll
+@@ -1,11 +1,9 @@
+ ; RUN: llc -mtriple=x86_64-apple-darwin %s -o %t -filetype=obj
+ ; RUN: llvm-dwarfdump %t | FileCheck %s
+ 
+-; Check that the line table starts at 7, not 4, but that the first
+-; statement isn't until line 8.
++; Check that the line table starts at 7, not 4.
+ 
+-; CHECK-NOT: 0x0000000000000000      7      0      1   0  is_stmt
+-; CHECK: 0x0000000000000000      7      0      1   0
++; CHECK: 0x0000000000000000      7      0      1   0  is_stmt
+ ; CHECK: 0x0000000000000004      8     18      1   0  is_stmt prologue_end
+ 
+ define i32 @callee(i32 %x) nounwind uwtable ssp {
+-- 
+1.7.10
+
diff --git a/extra/metacity/PKGBUILD b/extra/metacity/PKGBUILD
index 1df8330b8..8ff77f984 100644
--- a/extra/metacity/PKGBUILD
+++ b/extra/metacity/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 156930 2012-04-23 09:09:17Z ibiru $
+# $Id: PKGBUILD 165026 2012-08-09 07:46:44Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=metacity
-pkgver=2.34.3
+pkgver=2.34.5
 pkgrel=1
 pkgdesc="A window manager for GNOME"
 arch=(i686 x86_64 'mips64el')
@@ -14,7 +14,7 @@ groups=('gnome')
 options=('!libtool' '!emptydirs')
 install=metacity.install
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('aeac2548b62a98375fb5c832ee26ab4cb6d59f0dd96edcefb5f7bef2416576e7')
+sha256sums=('8e0712d4e3a4402b6b818348019dd864999585dda624a6ac0d44bf6a37ed2534')
 
 build() {
   cd "$pkgname-$pkgver"
diff --git a/extra/monodevelop-debugger-gdb/PKGBUILD b/extra/monodevelop-debugger-gdb/PKGBUILD
index ada06e80e..6170cb7b6 100644
--- a/extra/monodevelop-debugger-gdb/PKGBUILD
+++ b/extra/monodevelop-debugger-gdb/PKGBUILD
@@ -1,16 +1,18 @@
+# $Id: PKGBUILD 165115 2012-08-11 08:21:45Z andyrtr $
 # Maintainer: Daniel Isenmann <daniel@archlinux.org>
 
 pkgname=monodevelop-debugger-gdb
-pkgver=2.8.8.4
+pkgver=3.0.3.5
 pkgrel=1
 pkgdesc="Mono Debugger support"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64') # also "any" pkg?
 url="http://monodevelop.com"
 license=('GPL')
-depends=('monodevelop>=2.8.8.4' 'gdb')
+depends=('monodevelop>=3.0.3.5-2' 'gdb')
 makedepends=('mono')
+options=('!makeflags')
 source=(http://download.mono-project.com/sources/$pkgname/$pkgname-$pkgver.tar.bz2)
-md5sums=('c198ea4970d3fc307ce0fa457ed52e61')
+md5sums=('c16da5cdbda46fb32e0dc730bb433203')
 
 build() {
   export MONO_SHARED_DIR="${srcdir}/.wabi"
@@ -19,7 +21,7 @@ build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
   ./configure --prefix=/usr
-  make || return 1
+  make
 }
 
 package() {
diff --git a/extra/monodevelop/PKGBUILD b/extra/monodevelop/PKGBUILD
index 5ee06b122..2ba30d678 100644
--- a/extra/monodevelop/PKGBUILD
+++ b/extra/monodevelop/PKGBUILD
@@ -1,32 +1,41 @@
+# $Id: PKGBUILD 165114 2012-08-11 08:21:42Z andyrtr $
 # Maintainer: Daniel Isenmann <daniel@archlinux.org>
 # Contributor: Timm Preetz <timm@preetz.us>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 
 pkgname=monodevelop
-pkgver=2.8.8.4
-pkgrel=1
+pkgver=3.0.3.5
+pkgrel=2
 pkgdesc="An IDE primarily designed for C# and other .NET languages"
+
+# should probably changed to "any" - no ELF files - OpenSUSE builds it as NOARCH 
 arch=('i686' 'x86_64')
+
 url="http://www.monodevelop.com"
 license=('GPL')
-depends=('mono>=2.10.5' 'mono-addins>=0.6.2' 'gnome-sharp')
+depends=('mono>=2.10.8' 'mono-addins>=0.6.2' 'gnome-sharp' 'desktop-file-utils' 'hicolor-icon-theme')
 options=(!makeflags)
 install=monodevelop.install
-source=(http://download.mono-project.com/sources/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('106a1eed3f8ad6ff5caa71b34cde95cf')
+source=(http://download.mono-project.com/sources/${pkgname}/${pkgname}-${pkgver}.tar.bz2
+        monodevelop-core-addins.pc.in.patch)
+md5sums=('ca46b77b49266112b63a8f5c451c5565'
+         '8466d032735130e37d4091a793a7966c')
 
 build() {
   export MONO_SHARED_DIR=$srcdir/src/.wabi
   mkdir -p $MONO_SHARED_DIR
 
   cd $srcdir/$pkgname-$pkgver
+  # fix location for MonoDevelop.Gettext.dll - breaks gdb build
+  patch -Np0 -i ${srcdir}/monodevelop-core-addins.pc.in.patch
+  
   ./configure --prefix=/usr --disable-update-mimedb --disable-update-desktopdb
-  make || return 1
+  LD_PRELOAD="" make
 }
 
 package() {
   cd $srcdir/$pkgname-$pkgver
-  make DESTDIR=$pkgdir install
+  LD_PRELOAD="" make DESTDIR=$pkgdir install
   rm -r $MONO_SHARED_DIR
 }
 
diff --git a/extra/monodevelop/monodevelop-core-addins.pc.in.patch b/extra/monodevelop/monodevelop-core-addins.pc.in.patch
new file mode 100644
index 000000000..c1da3bf1f
--- /dev/null
+++ b/extra/monodevelop/monodevelop-core-addins.pc.in.patch
@@ -0,0 +1,8 @@
+--- monodevelop-core-addins.pc.in	2012-07-27 21:33:41.000000000 +0200
++++ monodevelop-core-addins.pc.in.new	2012-08-04 12:42:36.086516667 +0200
+@@ -6,4 +6,4 @@
+ Name: MonoDevelop Core Add-ins
+ Description: MonoDevelop Core Add-ins
+ Version: @VERSION@
+-Libs: -r:${libdir}/AddIns/VersionControl/MonoDevelop.VersionControl.dll -r:${libdir}/AddIns/NUnit/MonoDevelop.NUnit.dll -r:${libdir}/AddIns/MonoDevelop.XmlEditor/MonoDevelop.XmlEditor.dll -r:${libdir}/AddIns/MonoDevelop.AspNet/MonoDevelop.AspNet.dll -r:${libdir}/AddIns/DisplayBindings/Gettext/MonoDevelop.Gettext.dll -r:${libdir}/AddIns/MonoDevelop.Deployment/MonoDevelop.Deployment.dll -r:${libdir}/AddIns/MonoDevelop.Deployment/MonoDevelop.Deployment.Linux.dll -r:${libdir}/AddIns/MonoDevelop.GtkCore/MonoDevelop.GtkCore.dll -r:${libdir}/AddIns/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.dll -r:${libdir}/AddIns/BackendBindings/MonoDevelop.VBNetBinding.dll -r:${libdir}/AddIns/BackendBindings/MonoDevelop.CBinding.dll -r:${libdir}/AddIns/BackendBindings/MonoDevelop.CSharpBinding.dll -r:${libdir}/AddIns/MonoDevelop.Autotools/MonoDevelop.Autotools.dll -r:${libdir}/AddIns/DisplayBindings/SourceEditor/MonoDevelop.SourceEditor2.dll -r:${libdir}/AddIns/MonoDevelop.Debugger/MonoDevelop.Debugger.dll -r:${libdir}/AddIns/MonoDevelop.Refactoring/MonoDevelop.Refactoring.dll  -r:${libdir}/AddIns/MonoDevelop.Debugger.Soft/Mono.Debugging.Soft.dll -r:${libdir}/AddIns/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft.dll -r:${libdir}/AddIns/MonoDevelop.Debugger.Soft/Mono.Debugger.Soft.dll
++Libs: -r:${libdir}/AddIns/VersionControl/MonoDevelop.VersionControl.dll -r:${libdir}/AddIns/NUnit/MonoDevelop.NUnit.dll -r:${libdir}/AddIns/MonoDevelop.XmlEditor/MonoDevelop.XmlEditor.dll -r:${libdir}/AddIns/MonoDevelop.AspNet/MonoDevelop.AspNet.dll -r:${libdir}/AddIns/DisplayBindings/MonoDevelop.Gettext/MonoDevelop.Gettext.dll -r:${libdir}/AddIns/MonoDevelop.Deployment/MonoDevelop.Deployment.dll -r:${libdir}/AddIns/MonoDevelop.Deployment/MonoDevelop.Deployment.Linux.dll -r:${libdir}/AddIns/MonoDevelop.GtkCore/MonoDevelop.GtkCore.dll -r:${libdir}/AddIns/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.dll -r:${libdir}/AddIns/BackendBindings/MonoDevelop.VBNetBinding.dll -r:${libdir}/AddIns/BackendBindings/MonoDevelop.CBinding.dll -r:${libdir}/AddIns/BackendBindings/MonoDevelop.CSharpBinding.dll -r:${libdir}/AddIns/MonoDevelop.Autotools/MonoDevelop.Autotools.dll -r:${libdir}/AddIns/DisplayBindings/SourceEditor/MonoDevelop.SourceEditor2.dll -r:${libdir}/AddIns/MonoDevelop.Debugger/MonoDevelop.Debugger.dll -r:${libdir}/AddIns/MonoDevelop.Refactoring/MonoDevelop.Refactoring.dll  -r:${libdir}/AddIns/MonoDevelop.Debugger.Soft/Mono.Debugging.Soft.dll -r:${libdir}/AddIns/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft.dll -r:${libdir}/AddIns/MonoDevelop.Debugger.Soft/Mono.Debugger.Soft.dll
diff --git a/extra/monodevelop/monodevelop.install b/extra/monodevelop/monodevelop.install
index 765dfb9bd..070e6202c 100644
--- a/extra/monodevelop/monodevelop.install
+++ b/extra/monodevelop/monodevelop.install
@@ -2,6 +2,7 @@ post_install() {
   update-mime-database /usr/share/mime 1> /dev/null
   echo "update desktop mime database..."
   update-desktop-database -q
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
 }
 
 post_upgrade() {
diff --git a/extra/opennx/PKGBUILD b/extra/opennx/PKGBUILD
index 6ee27c93e..d98915bcd 100644
--- a/extra/opennx/PKGBUILD
+++ b/extra/opennx/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 164356 2012-07-31 16:14:21Z andyrtr $
+# $Id: PKGBUILD 165108 2012-08-11 08:07:32Z andyrtr $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Contributor: Armin Luntzer
 # Original opennx PKGBUILD: Tomas Groth tomasgroth.at.yahoo.dk
 
 pkgname=opennx
-pkgver=0.16.0.719
+pkgver=0.16.0.724
 pkgrel=1
 pkgdesc="A GPL replacement for the NoMachine client, patched to always show the session chooser"
 url="http://opennx.sf.net/"
@@ -14,7 +14,7 @@ depends=('wxgtk' 'libcups' 'libxext' 'libxft' 'xorg-xauth' 'curl')
 makedepends=('zip' 'opensc' 'libpulse' 'smbclient' 'libusb-compat')
 #optdepends=('cups: for full local printing support')
 source=(http://downloads.sourceforge.net/project/opennx/opennx/CI-source/opennx-$pkgver.tar.gz)
-md5sums=('bb0ca1df36f4d9246c6f88d734be937b')
+md5sums=('ad3962cda69e38857b244a1b7eb41f2c')
 
 build() {
   cd $srcdir/opennx*
diff --git a/extra/pekwm/PKGBUILD b/extra/pekwm/PKGBUILD
index 6132269d2..3dce361ff 100644
--- a/extra/pekwm/PKGBUILD
+++ b/extra/pekwm/PKGBUILD
@@ -1,26 +1,31 @@
-# $Id: PKGBUILD 151921 2012-03-04 10:39:20Z andrea $
+# $Id: PKGBUILD 164983 2012-08-07 19:26:08Z eric $
 # Maintainer:
 # Contributor: Kevin Piche <kevin@archlinux.org>
 # Contributor: Eddie Lozon <almostlucky@attbi.com>
 
 pkgname=pekwm
-pkgver=0.1.14
+pkgver=0.1.15
 pkgrel=1
 pkgdesc="A small, fast, functional, and flexible window manager"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url='https://www.pekwm.org/projects/pekwm'
 depends=('gcc-libs' 'libjpeg' 'libpng' 'libxft' 'libxinerama' 'libxpm' 'libxrandr')
-backup=(etc/pekwm/config
-  etc/pekwm/vars
-  etc/pekwm/autoproperties
-  etc/pekwm/start
-  etc/pekwm/keys
-  etc/pekwm/mouse
-  etc/pekwm/menu)
+backup=(etc/pekwm/autoproperties
+        etc/pekwm/autoproperties_typerules
+	etc/pekwm/config
+	etc/pekwm/config_system
+	etc/pekwm/keys
+	etc/pekwm/menu
+	etc/pekwm/mouse
+	etc/pekwm/mouse_click
+        etc/pekwm/mouse_sloppy
+        etc/pekwm/mouse_system
+	etc/pekwm/start
+        etc/pekwm/vars)
 source=("http://www.pekwm.org/projects/pekwm/files/${pkgname}-${pkgver}.tar.bz2"
         'pekwm.desktop')
-md5sums=('bb9c01c81fe47620bcd9be0e2e4a10e6'
+md5sums=('4db10ad191b77120429abd5a65c73cec'
          '5a78fc6653fbb0b7282ecf7f1f81e2c5')
 
 build() {
diff --git a/extra/perl-alien-sdl/PKGBUILD b/extra/perl-alien-sdl/PKGBUILD
index 971a38206..f55c87e80 100644
--- a/extra/perl-alien-sdl/PKGBUILD
+++ b/extra/perl-alien-sdl/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 147156 2012-01-23 14:30:07Z heftig $
+# $Id: PKGBUILD 165067 2012-08-09 23:13:02Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Allan McRae <allan@archlinux.org>
 # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
@@ -8,7 +8,7 @@
 
 pkgname=perl-alien-sdl
 _realname=Alien-SDL
-pkgver=1.430
+pkgver=1.436
 pkgrel=1
 pkgdesc="Building, finding and using SDL binaries"
 arch=(i686 x86_64 'mips64el')
@@ -18,7 +18,7 @@ depends=(sdl=1.2.15 perl-file-sharedir perl-capture-tiny)
 makedepends=(perl-file-which perl-text-patch)
 options=(!emptydirs)
 source=(http://search.cpan.org/CPAN/authors/id/F/FR/FROGGS/$_realname-$pkgver.tar.gz)
-md5sums=('9d7774212fb4e1c46325746c953a808b')
+md5sums=('eedfebaf00dca8a8e4806e8dc47bf1ed')
 
 package() {
   cd "$srcdir/$_realname-$pkgver"
diff --git a/extra/perl-sdl/PKGBUILD b/extra/perl-sdl/PKGBUILD
index 7ba058034..d8c85a055 100644
--- a/extra/perl-sdl/PKGBUILD
+++ b/extra/perl-sdl/PKGBUILD
@@ -1,29 +1,29 @@
-# $Id: PKGBUILD 160549 2012-06-02 10:28:09Z bluewind $
+# $Id: PKGBUILD 165069 2012-08-09 23:15:16Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Allan McRae <allan@archlinux.org>
 # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
 
 pkgname=perl-sdl
-pkgver=2.536
+pkgver=2.540
 pkgrel=1
 pkgdesc="Simple DirectMedia Layer for Perl"
 arch=(i686 x86_64 'mips64el')
 license=(LGPL)
 url="http://sdl.perl.org"
 depends=(perl-alien-sdl perl-tie-simple
-         sdl_{net,ttf,image,mixer,gfx,pango} mesa smpeg)
-#makedepends=(perl-yaml)
+         sdl_net sdl_ttf sdl_image sdl_mixer sdl_gfx sdl_pango mesa smpeg)
+makedepends=('perl-module-build>=0.40')
 options=('!emptydirs')
 replaces=(sdl_perl)
 conflicts=(sdl_perl)
 provides=("sdl_perl=$pkgver")
 # http://search.cpan.org/dist/SDL/
-_author=FROGGS
-source=(http://search.cpan.org/CPAN/authors/id/${_author:0:1}/${_author:0:2}/$_author/SDL-$pkgver.tar.gz)
-md5sums=('5c682e8a96cd655e959497b034b978ce')
+_author=JTPALMER
+source=(http://search.cpan.org/CPAN/authors/id/${_author::1}/${_author::2}/$_author/SDL-$pkgver.tar.gz)
+md5sums=('1a5d7849cbdfde4982b28458e38ab172')
 
 build() {
-  cd "$srcdir/SDL-$pkgver"
+  cd SDL-$pkgver
   # Perl selects the proper CFLAGS set for binary modules
   unset CFLAGS
   # install module in vendor directories
@@ -32,11 +32,11 @@ build() {
 }
 
 check() {
-  cd "$srcdir/SDL-$pkgver"
+  cd SDL-$pkgver
   perl Build test || true
 }
 
 package() {
-  cd "$srcdir/SDL-$pkgver"
+  cd SDL-$pkgver
   perl Build install destdir="$pkgdir"
 }
diff --git a/extra/perl-template-toolkit/PKGBUILD b/extra/perl-template-toolkit/PKGBUILD
index c02a64158..072f8604c 100644
--- a/extra/perl-template-toolkit/PKGBUILD
+++ b/extra/perl-template-toolkit/PKGBUILD
@@ -1,32 +1,34 @@
+# $Id: PKGBUILD 165152 2012-08-11 20:28:19Z eric $
 # Maintainer: Firmicus <francois.archlinux.org>
 # Contributor: Tom Killian <tomk@runbox.com>
 # Contributor: FJ <joostef@gmail.com>
 
 pkgname=perl-template-toolkit
 _realname=Template-Toolkit
-pkgver=2.22
-pkgrel=5
+pkgver=2.24
+pkgrel=1
 pkgdesc="Perl template processing system"
 arch=(i686 x86_64 'mips64el')
 license=('PerlArtistic')
 url="http://search.cpan.org/dist/${_realname}/"
 depends=('perl-appconfig' 'perl>=5.10.0')
 options=(!emptydirs)
-source=(http://search.cpan.org/CPAN/authors/id/A/AB/ABW/${_realname}-$pkgver.tar.gz) 
-md5sums=('d98277f6420e5da6b93d99a8db2b3934')
+source=(http://search.cpan.org/CPAN/authors/id/A/AB/ABW/${_realname}-$pkgver.tar.gz)
+md5sums=('c25fdab1beebf8818c2e624bc9f9d212')
 
 build() {
-  cd ${srcdir}/${_realname}-$pkgver
+  cd "${srcdir}/${_realname}-$pkgver"
   # install module in vendor directories.
   PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
   make
 }
 
-package() {
-  cd ${srcdir}/${_realname}-$pkgver
-  make install DESTDIR=${startdir}/pkg
+check() {
+  cd "${srcdir}/${_realname}-${pkgver}"
+  make test
+}
 
-  # remove perllocal.pod and .packlist
-  find ${startdir}/pkg -name perllocal.pod -delete
-  find ${startdir}/pkg -name .packlist -delete
+package() {
+  cd "${srcdir}/${_realname}-$pkgver"
+  make install DESTDIR="${pkgdir}"
 }
diff --git a/extra/phonon-vlc/PKGBUILD b/extra/phonon-vlc/PKGBUILD
index 4267a8111..d7bf91f92 100644
--- a/extra/phonon-vlc/PKGBUILD
+++ b/extra/phonon-vlc/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 160656 2012-06-03 09:29:44Z andrea $
+# $Id: PKGBUILD 165106 2012-08-11 07:25:00Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=phonon-vlc
-pkgver=0.5.0
-pkgrel=2
+pkgver=0.6.0
+pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url='http://phonon.kde.org/'
 pkgdesc="Phonon VLC backend"
@@ -12,7 +12,7 @@ depends=('vlc')
 makedepends=('cmake' 'automoc4' 'phonon')
 provides=('phonon-backend')
 source=("http://download.kde.org/stable/phonon/phonon-backend-vlc/${pkgver}/src/phonon-backend-vlc-${pkgver}.tar.xz")
-md5sums=('fc5dc2b353fa0d9e428ecfc3c485eb66')
+md5sums=('13c7adb90f62cb568d17bc9ced9406e9')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/proftpd/PKGBUILD b/extra/proftpd/PKGBUILD
index e157d47d4..30d2b469f 100644
--- a/extra/proftpd/PKGBUILD
+++ b/extra/proftpd/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 161293 2012-06-08 23:31:04Z tomegun $
+# $Id: PKGBUILD 164987 2012-08-07 20:14:43Z eric $
 # Maintainer:
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgname=proftpd
-pkgver=1.3.4a
-pkgrel=5
+pkgver=1.3.4b
+pkgrel=1
 epoch=1
 pkgdesc="A high-performance, scalable FTP server"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,8 +12,13 @@ url="http://www.proftpd.org"
 license=('GPL')
 depends=('libldap' 'libmysqlclient' 'postgresql-libs')
 backup=('etc/proftpd.conf' 'etc/conf.d/proftpd')
-source=(ftp://ftp.proftpd.org/distrib/source/${pkgname}-${pkgver}.tar.bz2{,.asc}
+source=(ftp://ftp.proftpd.org/distrib/source/${pkgname}-${pkgver}.tar.gz{,.asc}
         'proftpd' 'proftpd.logrotate' 'proftpd.conf.d')
+md5sums=('0871e0b93c9c3c88ca950b6d9a04aed2'
+         'e5b9bd78029a15f82994efcb7ed2e9fb'
+         '8177292919acb2f087ded0bb7b2dcc32'
+         'ddb09eb13131becdf0e081eef413116b'
+         '71d5932b0461c318ed68c2c0c2660736')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -47,8 +52,3 @@ package() {
   # /var/run is a symlink to /run now
   rm -rf "${pkgdir}/var"
 }
-md5sums=('4e3235dc1ef95d36e59721d70c5c489c'
-         '3b0f44496adb36640b7a6cc165556bcf'
-         '8177292919acb2f087ded0bb7b2dcc32'
-         'ddb09eb13131becdf0e081eef413116b'
-         '71d5932b0461c318ed68c2c0c2660736')
diff --git a/extra/pycrypto/PKGBUILD b/extra/pycrypto/PKGBUILD
index 408e9fd04..b011e10d1 100644
--- a/extra/pycrypto/PKGBUILD
+++ b/extra/pycrypto/PKGBUILD
@@ -1,27 +1,52 @@
-# $Id: PKGBUILD 151452 2012-02-26 11:26:30Z pierre $
+# $Id: PKGBUILD 165053 2012-08-09 19:15:19Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Kritoke <kritoke@gamebox.net>
 
-pkgname=pycrypto
-pkgver=2.5
-pkgrel=1
-pkgdesc="Collection of cryptographic algorithms and protocols, implemented for use from Python."
+pkgbase=pycrypto
+pkgname=('python2-crypto' 'python-crypto')
+pkgver=2.6
+pkgrel=2
 arch=('i686' 'x86_64' 'mips64el')
-depends=('python2')
+makedepends=('python2' 'python')
 url="http://www.dlitz.net/software/pycrypto/"
 license=('custom')
-source=("http://ftp.dlitz.net/pub/dlitz/crypto/${pkgname}/${pkgname}-${pkgver}.tar.gz")
-sha256sums=('e950a78184e2a7defccf5d45e0c29c1e9edeb29984433f0d110a21e9631e38de')
+source=("http://ftp.dlitz.net/pub/dlitz/crypto/${pkgbase}/${pkgbase}-${pkgver}.tar.gz")
+sha256sums=('7293c9d7e8af2e44a82f86eb9c3b058880f4bcc884bf3ad6c8a34b64986edde8')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd "${srcdir}"
+  find ${pkgbase}-${pkgver}/LEGAL -type f -exec chmod 644 {} \;
+  find ${pkgbase}-${pkgver}/LEGAL -type d -exec chmod 755 {} \;
+ 
+  cp -r ${pkgbase}-${pkgver} ${pkgbase}-${pkgver}-py3
+  cd "${srcdir}/${pkgbase}-${pkgver}"
   python2 setup.py build
+
+  cd "${srcdir}/${pkgbase}-${pkgver}-py3"
+  python setup.py build
 }
 
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+package_python2-crypto() {
+  pkgdesc="Collection of cryptographic algorithms and protocols, implemented for use from Python 2."
+  depends=('python2')
+  replaces=('pycrypto')
+  conflicts=('pycrypto')
+  provides=("pycrypto=${pkgver}")
+
+  cd "${srcdir}/${pkgbase}-${pkgver}"
   python2 setup.py install --root="${pkgdir}" --optimize=1
   install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
   install -m644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/"
   cp -r LEGAL "${pkgdir}/usr/share/licenses/${pkgname}/"
 }
+
+package_python-crypto() {
+  pkgdesc="Collection of cryptographic algorithms and protocols, implemented for use from Pythoni 3."
+  depends=('python')
+
+  cd "${srcdir}/${pkgbase}-${pkgver}-py3"
+  python setup.py install --root="${pkgdir}" --optimize=1
+  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
+  install -m644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/"
+  cp -r LEGAL "${pkgdir}/usr/share/licenses/${pkgname}/"
+}
diff --git a/extra/racket/PKGBUILD b/extra/racket/PKGBUILD
index a5db6e3cb..45f67c278 100644
--- a/extra/racket/PKGBUILD
+++ b/extra/racket/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 161957 2012-06-17 01:21:57Z eric $
+# $Id: PKGBUILD 164993 2012-08-08 04:47:49Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=racket
-pkgver=5.2.1
-pkgrel=3
+pkgver=5.3
+pkgrel=1
 pkgdesc="A programming language environment (formerly known as PLT Scheme) suitable for tasks ranging from scripting to application development"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://racket-lang.org/"
@@ -13,14 +13,14 @@ makedepends=('gsfonts')
 options=('!libtool' '!strip')
 install=racket.install
 source=(http://download.racket-lang.org/installers/${pkgver}/racket/${pkgname}-${pkgver}-src-unix.tgz \
-        drracket.desktop drracket-normal.rkt)
-sha1sums=('b51cdd8b9825edb60e5c2c80472cec8220918cd1'
-          'a20808f6b250225704856f82a544681a962a299d'
-          '6699e80e424479d45f427ba341003235e0d475cf')
+        drracket.desktop)
+sha1sums=('16883898c0cc418ba44732e3f62a54cf043a1de8'
+          'a20808f6b250225704856f82a544681a962a299d')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}/src"
   [ "$CARCH" == "x86_64" ] && export CFLAGS+="-fPIC"
+  sed -i 's/struct siginfo/siginfo_t/' racket/gc2/sighand.c
   ./configure --prefix=/usr --enable-shared
   make
 }
@@ -29,9 +29,6 @@ package() {
   cd "${srcdir}/${pkgname}-${pkgver}/src"
   make DESTDIR="${pkgdir}" install
 
-  # FS#30245
-  install -D -m644 "${srcdir}/drracket-normal.rkt" "${pkgdir}/usr/lib/racket/collects/drracket/private/drracket-normal.rkt"
-
   install -D -m644 ../collects/icons/plt.xpm "${pkgdir}/usr/share/pixmaps/drracket.xpm"
   install -D -m644 "${srcdir}/drracket.desktop" "${pkgdir}/usr/share/applications/drracket.desktop"
 }
diff --git a/extra/rtkit/PKGBUILD b/extra/rtkit/PKGBUILD
index ab17a8a55..debe6ffc0 100644
--- a/extra/rtkit/PKGBUILD
+++ b/extra/rtkit/PKGBUILD
@@ -1,33 +1,33 @@
-# $Id: PKGBUILD 157777 2012-04-29 10:12:33Z allan $
+# $Id: PKGBUILD 165071 2012-08-09 23:24:40Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Corrado Primier <bardo@aur.archlinux.org>
 
 pkgname=rtkit
-pkgver=0.10
-pkgrel=4
+pkgver=0.11
+pkgrel=1
 pkgdesc="Realtime Policy and Watchdog Daemon"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://git.0pointer.de/?p=rtkit.git"
 license=(GPL 'custom:BSD')
 depends=(dbus polkit)
 install=rtkit.install
-source=(http://0pointer.de/public/$pkgname-$pkgver.tar.gz)
-md5sums=('9ab7f2a25ddf05584ea2216dfe4cefd4')
+source=(http://0pointer.de/public/$pkgname-$pkgver.tar.xz)
+md5sums=('a96c33b9827de66033d2311f82d79a5d')
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd $pkgname-$pkgver
 
   ./configure \
     --prefix=/usr \
     --sysconfdir=/etc \
-    --libexecdir=/usr/lib \
+    --libexecdir=/usr/lib/$pkgname \
     --with-systemdsystemunitdir=/usr/lib/systemd/system
 
   make
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd $pkgname-$pkgver
   make DESTDIR="$pkgdir" install
 
   # DBus configuration
@@ -36,6 +36,6 @@ package() {
     > "$pkgdir/usr/share/dbus-1/interfaces/org.freedesktop.RealtimeKit1.xml"
 
   # Client license
-  mkdir -p "$pkgdir/usr/share/licenses/rtkit"
-  sed -ne '4,25p' rtkit.c >"$pkgdir/usr/share/licenses/rtkit/COPYING"
+  install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+  sed -ne '4,25p' rtkit.c >"$pkgdir/usr/share/licenses/$pkgname/COPYING"
 }
diff --git a/extra/samba/PKGBUILD b/extra/samba/PKGBUILD
index 977ed421f..2da1b26db 100644
--- a/extra/samba/PKGBUILD
+++ b/extra/samba/PKGBUILD
@@ -1,13 +1,13 @@
-# $Id: PKGBUILD 162373 2012-06-26 05:39:58Z tpowa $
+# $Id: PKGBUILD 164956 2012-08-07 10:42:12Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 pkgbase=samba
 pkgname=('libwbclient' 'smbclient' 'samba')
-pkgver=3.6.6
+pkgver=3.6.7
 # We use the 'A' to fake out pacman's version comparators.  Samba chooses
 # to append 'a','b',etc to their subsequent releases, which pamcan
 # misconstrues as alpha, beta, etc.  Bad samba!
-_realver=3.6.6
+_realver=3.6.7
 pkgrel=1
 arch=(i686 x86_64 mips64el)
 url="http://www.samba.org"
@@ -157,7 +157,7 @@ install='samba.install'
   install -D -m644 ${srcdir}/samba.conf ${pkgdir}/usr/lib/tmpfiles.d/samba.conf
   rm -rf ${pkgdir}/var/run
 }
-md5sums=('0bea52842d172231c0c0e23ee570d7af'
+md5sums=('b23be56c15dd52f64eb7ba54c0ea1ed5'
          'a45a4283723be2b0ae32439dc4496a09'
          '5697da77590ec092cc8a883bae06093c'
          'a4bbfa39fee95bba2e7ad6b535fae7e6'
diff --git a/extra/serd/PKGBUILD b/extra/serd/PKGBUILD
new file mode 100644
index 000000000..70d658de4
--- /dev/null
+++ b/extra/serd/PKGBUILD
@@ -0,0 +1,36 @@
+# $Id: PKGBUILD 72422 2012-06-14 07:51:14Z speps $
+# Maintainer: speps <speps at aur dot archlinux dot org>
+
+pkgname=serd
+pkgver=0.14.0
+pkgrel=1
+pkgdesc="A lightweight C library for RDF syntax which supports reading and writing Turtle and NTriples."
+arch=(i686 x86_64)
+url="http://drobilla.net/software/$pkgname/"
+license=('custom:ISC')
+depends=('glibc')
+makedepends=('python2')
+source=("http://download.drobilla.net/$pkgname-$pkgver.tar.bz2")
+md5sums=('405b11ee92f3f19ce4a757ba34953886')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  # remove ldconfig
+  sed -i "/ldconfig/d" wscript
+
+  python2 ./waf configure --prefix=/usr \
+                          --mandir=/usr/share/man
+  python2 ./waf
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  DESTDIR="$pkgdir" python2 ./waf install
+
+  # license
+  install -Dm644 COPYING \
+    "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/extra/sord/PKGBUILD b/extra/sord/PKGBUILD
new file mode 100644
index 000000000..ec9cdcad0
--- /dev/null
+++ b/extra/sord/PKGBUILD
@@ -0,0 +1,36 @@
+# $Id: PKGBUILD 72422 2012-06-14 07:51:14Z speps $
+# Maintainer: speps <speps at aur dot archlinux dot org>
+
+pkgname=sord
+pkgver=0.8.0
+pkgrel=1
+pkgdesc="A lightweight C library for storing RDF data in memory."
+arch=(i686 x86_64)
+url="http://drobilla.net/software/$pkgname/"
+license=('custom:ISC')
+depends=('serd' 'pcre')
+makedepends=('python2')
+source=("http://download.drobilla.net/$pkgname-$pkgver.tar.bz2")
+md5sums=('62be6a2cd6e9bc2933d1297afeacda30')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  # remove ldconfig
+  sed -i "/ldconfig/d" wscript
+
+  python2 ./waf configure --prefix=/usr \
+                          --mandir=/usr/share/man
+  python2 ./waf
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  DESTDIR="$pkgdir" python2 ./waf install
+
+  # license
+  install -Dm644 COPYING \
+    "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/extra/sratom/PKGBUILD b/extra/sratom/PKGBUILD
new file mode 100644
index 000000000..e384bdf1c
--- /dev/null
+++ b/extra/sratom/PKGBUILD
@@ -0,0 +1,33 @@
+# $Id: PKGBUILD 72422 2012-06-14 07:51:14Z speps $
+# Maintainer: speps <speps at aur dot archlinux dot org>
+
+pkgname=sratom
+pkgver=0.2.0
+pkgrel=1
+pkgdesc="An LV2 Atom RDF serialisation library"
+arch=(i686 x86_64)
+url="http://drobilla.net/software/$pkgname/"
+license=('custom:ISC')
+depends=('lv2' 'sord')
+makedepends=('python2')
+source=("http://download.drobilla.net/$pkgname-$pkgver.tar.bz2")
+md5sums=('c03cf2849186818610ffe889be4f5b55')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  # remove ldconfig
+  sed -i '/ldconfig/d' wscript
+
+  python2 waf configure --prefix=/usr
+  python2 waf
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  DESTDIR="$pkgdir/" python2 waf install
+
+  # license
+  install -Dm644 COPYING \
+    "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}
diff --git a/extra/suil/PKGBUILD b/extra/suil/PKGBUILD
new file mode 100644
index 000000000..a963f543a
--- /dev/null
+++ b/extra/suil/PKGBUILD
@@ -0,0 +1,38 @@
+# $Id: PKGBUILD 73980 2012-07-18 00:34:26Z speps $
+# Maintainer: speps <speps at aur dot archlinux dot org>
+
+pkgname=suil
+pkgver=0.6.4
+pkgrel=1
+pkgdesc="A lightweight C library for loading and wrapping LV2 plugin UIs"
+arch=(i686 x86_64)
+url="http://drobilla.net/software/$pkgname/"
+license=('custom:ISC')
+depends=('lv2')
+makedepends=('python2' 'qt' 'gtk2')
+optdepends=('qt: Qt UIs wrapping support'
+            'gtk2: Gtk2 UIs wrapping support')
+source=("http://download.drobilla.net/$pkgname-$pkgver.tar.bz2")
+md5sums=('9f34d3f15b4266e7cce59e3ac8f1fb3a')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  # remove ldconfig
+  sed -i "/ldconfig/d" wscript
+
+  python2 ./waf configure --prefix=/usr \
+                          --mandir=/usr/share/man
+  python2 ./waf
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  DESTDIR="$pkgdir" python2 ./waf install
+
+  # license
+  install -Dm644 COPYING \
+    "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/extra/valgrind/PKGBUILD b/extra/valgrind/PKGBUILD
index ad9b7dc46..0d702e470 100644
--- a/extra/valgrind/PKGBUILD
+++ b/extra/valgrind/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 164063 2012-07-26 04:17:07Z allan $
+# $Id: PKGBUILD 165089 2012-08-10 08:30:57Z allan $
 # Maintainer: Dan McGee <dan@archlinux.org>
 # Maintainer: Allan McRae <allan@archlinux.org>
 
 pkgname=valgrind
-pkgver=3.7.0
-pkgrel=4
+pkgver=3.8.0
+pkgrel=1
 pkgdesc="A tool to help find memory-management problems in programs"
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -12,24 +12,18 @@ url="http://valgrind.org/"
 depends=('glibc>=2.16' 'glibc<2.17' 'perl')
 makedepends=('gdb')
 options=('!emptydirs')
-source=(http://valgrind.org/downloads/${pkgname}-${pkgver}.tar.bz2
-        valgrind-3.7.0-glibc-2.16.patch
-        valgrind-3.7.0-supp.patch)
-md5sums=('a855fda56edf05614f099dca316d1775'
-         '8362c9c10b8d7d08d1be628a717cfba7'
-         '6cf8d3ace0cdc4c7fd69d61ca0692577')
+source=(http://valgrind.org/downloads/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('ec04dfd1256307432b2a7b520398c526')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
-  
-  patch -Np1 -i ${srcdir}/valgrind-3.7.0-glibc-2.16.patch
-  patch -Np1 -i ${srcdir}/valgrind-3.7.0-supp.patch
 
   if [ "${CARCH}" = "x86_64" ]; then
     ./configure --prefix=/usr --mandir=/usr/share/man --enable-only64bit
   else
     ./configure --prefix=/usr --mandir=/usr/share/man
   fi
+
   make
 }
 
diff --git a/extra/webmin/PKGBUILD b/extra/webmin/PKGBUILD
index cafaabb48..f667d8d4a 100644
--- a/extra/webmin/PKGBUILD
+++ b/extra/webmin/PKGBUILD
@@ -1,13 +1,13 @@
-# $Id: PKGBUILD 163000 2012-07-05 07:23:19Z tpowa $
+# $Id: PKGBUILD 164995 2012-08-08 06:41:05Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 pkgname=webmin
 pkgver=1.590
-pkgrel=1
+pkgrel=2
 pkgdesc="a web-based interface for system administration"
 arch=(i686 x86_64 'mips64el')
 license=('custom:webmin')
 url="http://www.webmin.com/"
-depends=('perl')
+depends=('perl' 'perl-perl4-corelibs')
 makedepends=('perl-net-ssleay')
 backup=('etc/webmin/miniserv.conf' 'etc/webmin/miniserv.users' 'etc/webmin/config' 'etc/webmin/webmin.cats' \
 'etc/webmin/pacman/config' \
diff --git a/extra/wget/PKGBUILD b/extra/wget/PKGBUILD
new file mode 100644
index 000000000..87f617417
--- /dev/null
+++ b/extra/wget/PKGBUILD
@@ -0,0 +1,45 @@
+# $Id: PKGBUILD 165091 2012-08-10 09:03:30Z allan $
+# Maintainer: Allan McRae <allan@archlinux.org>
+# Contributor: Judd Vinet <jvinet@zeroflux.org>
+
+pkgname=wget
+pkgver=1.14
+pkgrel=1
+pkgdesc="A network utility to retrieve files from the Web"
+arch=('i686' 'x86_64')
+url="http://www.gnu.org/software/wget/wget.html"
+license=('GPL3')
+depends=('glibc' 'openssl')
+optdepends=('ca-certificates: HTTPS downloads')
+backup=('etc/wgetrc')
+install=wget.install
+source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz{,.sig})
+md5sums=('316f6f59292c9098ad81fd54f658c579'
+         '3e121933d69f32fa58776bff76bcebd0')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  # Note : We do not build with --enable-nls, because there is a bug in wget causing
+  # international domain names to be not properly converted to punycode if
+  # the current locale is a UTF-8 one
+  # See : http://lists.gnu.org/archive/html/bug-wget/2011-02/msg00026.html
+
+  ./configure -with-ssl=openssl --prefix=/usr --sysconfdir=/etc
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+
+  cat >> "$pkgdir/etc/wgetrc" <<EOF
+
+# default root certs location
+ca_certificate=/etc/ssl/certs/ca-certificates.crt
+EOF
+
+  # remove IRI option from wgetrc as it does not work (see above)
+  sed -i '118,120d' $pkgdir/etc/wgetrc
+
+}
diff --git a/extra/wget/wget.install b/extra/wget/wget.install
new file mode 100644
index 000000000..8eb6a2c3f
--- /dev/null
+++ b/extra/wget/wget.install
@@ -0,0 +1,20 @@
+infodir=usr/share/info
+filelist=(wget.info)
+
+post_install() {
+  [ -x usr/bin/install-info ] || return 0
+  for file in ${filelist[@]}; do
+    install-info $infodir/$file $infodir/dir 2> /dev/null
+  done
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+  [ -x usr/bin/install-info ] || return 0
+  for file in ${filelist[@]}; do
+    install-info --delete $infodir/$file $infodir/dir 2> /dev/null
+  done
+}
diff --git a/extra/xf86-video-intel/PKGBUILD b/extra/xf86-video-intel/PKGBUILD
index caade620d..7bfb6ed50 100644
--- a/extra/xf86-video-intel/PKGBUILD
+++ b/extra/xf86-video-intel/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 164223 2012-07-27 19:15:17Z andyrtr $
+# $Id: PKGBUILD 165096 2012-08-10 18:33:15Z andyrtr $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-video-intel
-pkgver=2.20.2
-pkgrel=2
+pkgver=2.20.3
+pkgrel=1
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
@@ -17,14 +17,11 @@ provides=('xf86-video-intel-uxa' 'xf86-video-intel-sna')
 conflicts=('xf86-video-intel-sna' 'xf86-video-intel-uxa' 'xorg-server<1.12.0' 'xf86-video-i810' 'xf86-video-intel-legacy')
 options=('!libtool')
 groups=('xorg-drivers' 'xorg')
-source=(${url}/archive/individual/driver/${pkgname}-${pkgver}.tar.bz2
-        fix_gen4.diff)
-sha256sums=('4c30cce0b5f7b427d76898c439f2c9fd31a8b45babd8ef82ec4c0004ae0a26a9'
-            '0c5b98e4980c8108aee12b1e46a78c23029034439dcd277f8ae1264ca3fff8a4')
+source=(${url}/archive/individual/driver/${pkgname}-${pkgver}.tar.bz2)
+sha256sums=('effca1382e595cc071b109818150db229ffb54f92769e4758398abbe69acb92c')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i ${srcdir}/fix_gen4.diff
   ./configure --prefix=/usr \
     --enable-dri
   make
diff --git a/extra/xorg-server/PKGBUILD b/extra/xorg-server/PKGBUILD
index b480c74ca..3861a4c49 100644
--- a/extra/xorg-server/PKGBUILD
+++ b/extra/xorg-server/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 163203 2012-07-09 16:05:50Z andyrtr $
+# $Id: PKGBUILD 165118 2012-08-11 08:22:01Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=xorg-server
 pkgname=('xorg-server' 'xorg-server-xephyr' 'xorg-server-xdmx' 'xorg-server-xvfb' 'xorg-server-xnest' 'xorg-server-common' 'xorg-server-devel')
-pkgver=1.12.3
+pkgver=1.12.3.901
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 license=('custom')
@@ -17,13 +17,11 @@ options=('!libtool')
 source=(${url}/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2
         autoconfig-nvidia.patch
         autoconfig-sis.patch
-        #EXA_Fall_back_earlier_and_more_thoroughly_from_exaGlyphsV2.diff
-        #git-fixes.patch
         xvfb-run
         xvfb-run.1
         10-quirks.conf
-	loongson.patch)
-sha256sums=('3654b613393734ce0c7c23e81ca4ceb6e8afefb5f0649233ffd105c1220544fe'
+        loongson.patch)
+sha256sums=('5265cfe935e2ad54a287dd3026917c6bfe6191a4f943ca893d1477fdfbe94b2b'
             '66e25f76a7496c429e0aff4b0670f168719bb0ceaeb88c6f2272f2bf3ed21162'
             'd027776fac1f7675b0a9ee817502290b1c45f9c09b0f0a6bb058c35f92361e84'
             'ff0156309470fc1d378fd2e104338020a884295e285972cc88e250e031cc35b9'
@@ -40,14 +38,6 @@ build() {
   # Use unofficial imedia SiS driver for supported SiS devices
   patch -Np0 -i "${srcdir}/autoconfig-sis.patch"
 
-  # fix glitches and crashes with EXA and cairo 1.12
-  # taken from https://bugs.freedesktop.org/show_bug.cgi?id=47266
-  # and reworked for 1.12.1 changes
-#  patch -Np1 -i ${srcdir}/EXA_Fall_back_earlier_and_more_thoroughly_from_exaGlyphsV2.diff
-
-  # Add post-release patches from 1.12 branch
-#  patch -Np1 -i ${srcdir}/git-fixes.patch
-
   # Based on http://lists.freedesktop.org/archives/xorg-devel/2011-October/026249.html
   patch -Np1 -i "${srcdir}/loongson.patch"