Fri May 11 00:03:00 UTC 2012

35 files changed, 356 insertions, 143 deletions

diff --git a/community/bitcoin/PKGBUILD b/community/bitcoin/PKGBUILD
index 260082f54..fc1930db8 100644
--- a/community/bitcoin/PKGBUILD
+++ b/community/bitcoin/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 70450 2012-05-07 11:38:52Z tredaelli $
+# $Id: PKGBUILD 70477 2012-05-09 10:21:50Z tredaelli $
 # Maintainer: Timothy Redaelli <timothy.redaelli@gmail.com>
 # Contributor: shahid <helllamer@gmail.com>
 
 pkgbase=bitcoin
 pkgname=('bitcoin-daemon' 'bitcoin-qt')
-pkgver=0.6.1
-_commit=dbb656f
+pkgver=0.6.2
+_commit=06d764e
 pkgrel=1
 arch=('i686' 'x86_64')
 url="http://www.bitcoin.org/"
@@ -14,7 +14,7 @@ conflicts=('bitcoin' 'bitcoin-bin' 'bitcoin-git')
 replaces=('bitcoin' 'bitcoin-bin' 'bitcoin-git')
 license=('MIT')
 source=("$pkgbase-$pkgver.tar.gz::https://github.com/bitcoin/$pkgbase/tarball/v$pkgver")
-sha256sums=('bc37bc3c91ff39754cee511047d9ff7e8f76e06ac35bb345bcb1c0935e2b2eee')
+sha256sums=('03c72d7bcdec70cb88033abb785b50686880b95d4768e8586891a9728d498c5a')
 
 build() {
   cd "$srcdir/bitcoin-$pkgbase-$_commit"
diff --git a/community/cuda-sdk/PKGBUILD b/community/cuda-sdk/PKGBUILD
new file mode 100644
index 000000000..152b3add9
--- /dev/null
+++ b/community/cuda-sdk/PKGBUILD
@@ -0,0 +1,37 @@
+# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
+# Contributor: Thomas Jost <schnouki@schnouki.net>
+# Contributor: Carson Reynolds <carson@k2.t.u-tokyo.ac.jp>
+
+pkgname=cuda-sdk
+pkgver=4.2.9
+pkgrel=1
+pkgdesc="NVIDIA's GPU programming sdk"
+arch=('i686' 'x86_64')
+url="http://www.nvidia.com/object/cuda_home.html"
+license=('custom')
+depends=('cuda-toolkit' 'nvidia' 'opencl-nvidia' 'freeglut' 'libxmu')
+makedepends=('perl')
+source=(http://developer.download.nvidia.com/compute/cuda/4_2/rel/sdk/gpucomputingsdk_${pkgver}_linux.run)
+md5sums=('693d969aca8bb06a5a1d51ef5c3ca04b')
+
+build() {
+  cd "$srcdir"
+
+  sh gpucomputingsdk_${pkgver}_linux.run --noexec --keep --nox11 --nochown --target sdk >/dev/null
+  cd sdk
+  
+  find . -name *.cu | xargs sed -i "1 i #undef _GLIBCXX_ATOMIC_BUILTINS"
+  find . -name *.cu | xargs sed -i "1 i #undef _GLIBCXX_USE_INT128"
+
+  #find . -name 'Makefile*' -exec sed -i 's/^\tmake /\t$(MAKE) /g; s/^\t@make /\t@$(MAKE) /g' "{}" +
+
+  # Sadly we need to install this first and compile afterwards, this is why we only have build()
+  install -dm755 "$pkgdir/opt/cuda-sdk"
+  ./install-sdk-linux.pl --prefix="$pkgdir/opt/cuda-sdk" --cudaprefix="/opt/cuda-toolkit" >/dev/null
+
+  cd "$pkgdir/opt/cuda-sdk"
+  make CUDA_INSTALL_PATH=/opt/cuda-toolkit NO_MPI=1
+  # simpleMPI sometimes causes segfaults when building...
+
+  install -Dm755 "$pkgdir/opt/cuda-sdk/License.txt" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}
diff --git a/community/dos2unix/PKGBUILD b/community/dos2unix/PKGBUILD
index e85d40e06..0a8bbf17f 100644
--- a/community/dos2unix/PKGBUILD
+++ b/community/dos2unix/PKGBUILD
@@ -1,9 +1,10 @@
+# $Id: PKGBUILD 70487 2012-05-09 15:02:28Z bpiotrowski $
 # Maintainer:  Bartłomiej Piotrowski
 # Contributor: Renato Garcia <fgar.renatoATgmailDOTcom>
 # Contributor: Gerson E. Ruotolo <gersonruotolo@globo.com>
 
 pkgname=dos2unix
-pkgver=5.3.3
+pkgver=6.0
 pkgrel=1
 pkgdesc='Text file format converter'
 arch=('i686' 'x86_64')
@@ -13,7 +14,7 @@ depends=('glibc')
 makedepends=('perl')
 conflicts=('hd2u')
 source=("http://waterlan.home.xs4all.nl/${pkgname}/${pkgname}-${pkgver}.tar.gz")
-md5sums=('f352d648b97197c8a786eccc832764d8')
+md5sums=('2fc8d6ebe9f1a519b15ebe0850e9aabd')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/community/luajit/PKGBUILD b/community/luajit/PKGBUILD
index 8e1f0b122..7a9480d86 100644
--- a/community/luajit/PKGBUILD
+++ b/community/luajit/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 67115 2012-03-04 14:30:22Z bpiotrowski $
+# $Id: PKGBUILD 70509 2012-05-09 20:30:54Z bpiotrowski $
 # Maintainer:  Chris Brannon <chris@the-brannons.com>
 # Maintainer:  Bartłomiej Piotrowski 
 # Contributor: Paulo Matias <matiasΘarchlinux-br·org>
 # Contributor: Anders Bergh <anders1@gmail.com>
 
 pkgname=luajit 
-pkgver=2.0.0b9
+pkgver=2.0.0b10
 pkgrel=1
 pkgdesc="A Just-In-Time Compiler for Lua"
 arch=('i686' 'x86_64')
@@ -13,18 +13,15 @@ url="http://luajit.org/"
 license=('MIT')
 depends=('gcc-libs') 
 source=("http://luajit.org/download/LuaJIT-${pkgver/b/-beta}.tar.gz"
-        "http://luajit.org/download/beta${pkgver: -1}_hotfix1.patch"
         'luaconf.patch'
         'Makefile.patch')
-md5sums=('e7e03e67e2550817358bc28b44270c6d'
-         '4920f04fcef1ce486891509faf26b4f1'
+md5sums=('ed66689b96f7ad7bfeffe0b4ff2d63d4'
          'c8da9c6790e20a12a0e2496f438d9dc3'
          '8997c5e5fa4f6e8e0b86cc6b888de631')
 
 build() { 
   cd "$srcdir/LuaJIT-${pkgver/b/-beta}"
 
-  patch -Np1 -i "$srcdir/beta${pkgver: -1}_hotfix1.patch"
   patch -Np0 -i "$srcdir/luaconf.patch"
   patch -Np0 -i "$srcdir/Makefile.patch"
 
diff --git a/community/lxdm/PKGBUILD b/community/lxdm/PKGBUILD
index 9613a4eb0..0b729267c 100644
--- a/community/lxdm/PKGBUILD
+++ b/community/lxdm/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 68758 2012-04-01 15:10:08Z bpiotrowski $
+# $Id: PKGBUILD 70485 2012-05-09 14:58:36Z bpiotrowski $
 # Maintainer: Bartłomiej Piotrowski
 # Contributor: AndyRTR <andyrtr@archlinux.org>
 # Contributor: kiefer <jorgelmadrid@gmail.com>
 
 pkgname=lxdm
 pkgver=0.4.1
-pkgrel=9
+pkgrel=10
 pkgdesc="Lightweight Display Manager (part of LXDE)"
 arch=('i686' 'x86_64')
 url="http://sourceforge.net/projects/lxdm/"
@@ -19,18 +19,22 @@ backup=('etc/lxdm/lxdm.conf' 'etc/pam.d/lxdm' 'etc/lxdm/Xsession'
         'etc/lxdm/PostLogout' 'etc/lxdm/PreReboot' 'etc/lxdm/PreShutdown')
 source=(http://downloads.sourceforge.net/lxde/$pkgname-$pkgver.tar.gz
         glib2-2.32.0.patch lxdm.patch lxdm.conf.patch Xsession.patch
-        lxdm-daemon lxdm-pam)
+        greeter-session.patch lxdm-daemon lxdm-pam)
 md5sums=('8da1cfc2be6dc9217c85a7cf51e1e821'
          'a1e3c46a8bef691bc544028f5b6cfe22'
          'baed9055e8825a5511712bc095197519'
          'c50dd01b715b0a236407d48066191601'
          'd2e4a4a22ee2aa1a986be154c647b6c6'
+         '28475239d0c8b4fd778ec49f5ec72962'
          '705f394052fdd0dec22e95321d170de0'
          'b20fe3c8487a039050986d60e45233a9')
 
 build() {
   	cd $srcdir/$pkgname-$pkgver
+
   	patch -Np1 -i $srcdir/glib2-2.32.0.patch
+    patch -Np1 -i $srcdir/greeter-session.patch
+
     ./configure --sysconfdir=/etc --prefix=/usr --libexecdir=/usr/lib/lxdm
 	make
   	
diff --git a/community/lxdm/greeter-session.patch b/community/lxdm/greeter-session.patch
new file mode 100644
index 000000000..f3b94a57a
--- /dev/null
+++ b/community/lxdm/greeter-session.patch
@@ -0,0 +1,13 @@
+diff --git a/src/greeter.c b/src/greeter.c
+index c0c150d..1f6b88e 100644
+--- a/src/greeter.c
++++ b/src/greeter.c
+@@ -114,7 +114,7 @@ static char *get_session_exec(void)
+ 	GtkTreeModel* model;
+ 	GtkTreeIter it;
+ 	gchar *res;
+-	if(!lang)
++	if(!sessions)
+ 		return g_strdup("");
+ 	
+ 	if(!gtk_combo_box_get_active_iter(GTK_COMBO_BOX(sessions), &it))
diff --git a/community/minidlna/PKGBUILD b/community/minidlna/PKGBUILD
index 23441c568..d2a3c9ee6 100644
--- a/community/minidlna/PKGBUILD
+++ b/community/minidlna/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 70262 2012-05-03 10:11:50Z spupykin $
+# $Id: PKGBUILD 70495 2012-05-09 17:17:28Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer:Biginoz < biginoz AT free point fr>
 # Contributor: Ignacio Galmarino <igalmarino@gmail.com>
@@ -7,7 +7,7 @@
 
 pkgname=minidlna
 pkgver=1.0.24
-pkgrel=3
+pkgrel=4
 pkgdesc="A DLNA/UPnP-AV Media server (aka ReadyDLNA)"
 arch=('i686' 'x86_64')
 url="http://sourceforge.net/projects/minidlna/"
@@ -28,6 +28,7 @@ md5sums=('be9b4c91e3fcde592dc3f9828098ca0f'
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
+  sed -i 's|DB_PATH=.*|DB_PATH=/var/cache/minidlna|' genconfig.sh
   make
 }
 
diff --git a/community/mythplugins/PKGBUILD b/community/mythplugins/PKGBUILD
index 05e3c04f0..4b2f94a44 100644
--- a/community/mythplugins/PKGBUILD
+++ b/community/mythplugins/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 69346 2012-04-14 12:26:30Z jconder $
+# $Id: PKGBUILD 70479 2012-05-09 10:48:34Z jconder $
 # Maintainer: Jonathan Conder <jonno.conder@gmail.com>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 
@@ -14,7 +14,7 @@ pkgname=('mythplugins-mytharchive'
          'mythplugins-mythweb'
          'mythplugins-mythzoneminder')
 pkgver=0.25
-pkgrel=2
+pkgrel=3
 epoch=1
 arch=('i686' 'x86_64')
 url="http://www.mythtv.org"
@@ -25,14 +25,17 @@ makedepends=('cdrkit' 'dvdauthor' 'dvd+rw-tools' 'ffmpeg' 'flac' 'libexif'
 	     'perl-soap-lite' 'perl-xml-sax' 'perl-xml-simple' 'perl-xml-xpath'
 	     'python2-oauth' 'python-imaging' 'python-pycurl' 'taglib' 'zlib')
 source=("ftp://ftp.osuosl.org/pub/mythtv/$pkgbase-$pkgver.tar.bz2"
+        'php54.patch'
         'mtd.rc')
 md5sums=('b3f2768372a38e92ca94841519daa05e'
+         '7a114c1b5a84ab5ee190e63cc9514086'
          '476c12ba074794ad7f4ae092bdf949d6')
 
 build() {
   cd "$srcdir/$pkgbase-$pkgver"
   find . -name '*.py' -type f | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@'
 
+  patch -d 'mythweb' -Np0 -i "$srcdir/php54.patch"
   sed -re 's@/usr/local.*/usr/share@/usr/share@' -i 'mythweb/mythweb.php'
   sed -re 's@cstdio@cstdio>\n#include <unistd.h@' -i 'mythzoneminder/mythzmserver/zmserver.cpp'
 
@@ -115,18 +118,19 @@ package_mythplugins-mythweb() {
   depends=('mythtv')
   optdepends=('lighttpd'
               'php-apache')
+  install='mythplugins-mythweb.install'
 
-  mkdir -p "$pkgdir/srv/http/mythweb"/{image_cache,php_sessions}
-  cp -R "$srcdir/$pkgbase-$pkgver/mythweb"/* "$pkgdir/srv/http/mythweb"
-  chown -R http:http "$pkgdir/srv/http/mythweb"
-  chmod g+rw "$pkgdir/srv/http/mythweb"/{image_cache,php_sessions}
+  mkdir -p "$pkgdir/var/lib/mythtv/mythweb"/{image_cache,php_sessions}
+  cp -R "$srcdir/$pkgbase-$pkgver/mythweb"/* "$pkgdir/var/lib/mythtv/mythweb"
+  chown -R http:http "$pkgdir/var/lib/mythtv/mythweb"
+  chmod g+rw "$pkgdir/var/lib/mythtv/mythweb"/{image_cache,php_sessions}
 }
 
 package_mythplugins-mythzoneminder() {
   pkgdesc="View CCTV footage from zoneminder in MythTV"
   depends=('mythtv')
-
   install='mythplugins-mythzoneminder.install'
+
   cd "$srcdir/$pkgbase-$pkgver/mythzoneminder"
   make INSTALL_ROOT="$pkgdir" install
 }
diff --git a/community/mythplugins/mythplugins-mythweb.install b/community/mythplugins/mythplugins-mythweb.install
new file mode 100644
index 000000000..2c626c538
--- /dev/null
+++ b/community/mythplugins/mythplugins-mythweb.install
@@ -0,0 +1,4 @@
+post_upgrade() {
+  echo "MythWeb files are now in /var/lib/mythtv/mythweb"
+  echo "Please update your server configuration accordingly"
+}
diff --git a/community/mythplugins/php54.patch b/community/mythplugins/php54.patch
new file mode 100644
index 000000000..afbe8f953
--- /dev/null
+++ b/community/mythplugins/php54.patch
@@ -0,0 +1,35 @@
+*** includes/sorting.php.old	2011-04-03 06:05:31.000000000 -0500
+--- includes/sorting.php	2012-03-27 05:05:51.000000000 -0500
+***************
+*** 123,129 ****
+      function by_user_choice(&$a, &$b) {
+          foreach ($GLOBALS['user_sort_choice'] as $sort) {
+              $function = 'by_'.$sort['field'];
+!             $response = $function(&$a, &$b);
+          // Identical response, go on to the next sort choice
+              if (!$response)
+                  continue;
+--- 123,129 ----
+      function by_user_choice(&$a, &$b) {
+          foreach ($GLOBALS['user_sort_choice'] as $sort) {
+              $function = 'by_'.$sort['field'];
+!             $response = $function($a, $b);
+          // Identical response, go on to the next sort choice
+              if (!$response)
+                  continue;
+*** modules/tv/tmpl/default/schedules.php.old	2011-04-03 06:05:31.000000000 -0500
+--- modules/tv/tmpl/default/schedules.php	2012-03-27 05:37:40.000000000 -0500
+***************
+*** 90,95 ****
+--- 90,100 ----
+  </tr>
+  </thead>
+  <?php
++         // Hack:  Disable warnings about "Creating default
++         // object from empty value" from below line
++         // "$schedule->channel->name = '[ '.t('Any').' ]';"
++         ini_set('error_reporting', E_ERROR);
++ 
+          $prev_group = '';
+          $cur_group  = '';
+          foreach ($the_schedules as $schedule) {
diff --git a/community/php-geoip/PKGBUILD b/community/php-geoip/PKGBUILD
index 5291e1d37..febea43d7 100644
--- a/community/php-geoip/PKGBUILD
+++ b/community/php-geoip/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 57315 2011-10-25 17:20:28Z foutrelis $
+# $Id: PKGBUILD 70501 2012-05-09 18:48:05Z pschmitz $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 
 pkgname=php-geoip
 pkgver=1.0.8
-pkgrel=1
+pkgrel=2
 pkgdesc="GeoIP module for PHP"
 arch=('i686' 'x86_64')
 url="http://pecl.php.net/package/geoip"
@@ -11,7 +11,7 @@ license=('PHP')
 depends=('php' 'geoip')
 backup=('etc/php/conf.d/geoip.ini')
 source=(http://pecl.php.net/get/geoip-$pkgver.tgz)
-sha1sums=('f8d17da3e192002332ab54b9b4ab0f5deeaf9f15')
+sha256sums=('08beeb2cbe9ab729d06b026795f5b9084aead6a1762493b0be53c4393d68d08a')
 
 build() {
   cd "$srcdir/geoip-$pkgver"
diff --git a/community/php-memcache/PKGBUILD b/community/php-memcache/PKGBUILD
index b553f283e..88f4cd109 100644
--- a/community/php-memcache/PKGBUILD
+++ b/community/php-memcache/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 64649 2012-02-17 13:33:44Z foutrelis $
+# $Id: PKGBUILD 70503 2012-05-09 18:48:11Z pschmitz $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 
 pkgname=php-memcache
 pkgver=3.0.6
-pkgrel=2
+pkgrel=3
 pkgdesc="Memcache module for PHP"
 arch=('i686' 'x86_64')
 url="http://pecl.php.net/package/memcache"
diff --git a/community/php-memcached/PKGBUILD b/community/php-memcached/PKGBUILD
index 791027d20..b1cfddffb 100644
--- a/community/php-memcached/PKGBUILD
+++ b/community/php-memcached/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 69284 2012-04-12 09:18:59Z foutrelis $
+# $Id: PKGBUILD 70505 2012-05-09 18:48:15Z pschmitz $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 
 pkgname=php-memcached
 pkgver=2.0.1
-pkgrel=3
+pkgrel=4
 pkgdesc="PHP extension for interfacing with memcached via libmemcached library"
 arch=('i686' 'x86_64')
 url="http://pecl.php.net/package/memcached"
diff --git a/community/pptpd/PKGBUILD b/community/pptpd/PKGBUILD
index 59faabd19..66203ba7b 100644
--- a/community/pptpd/PKGBUILD
+++ b/community/pptpd/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 70218 2012-05-02 13:03:21Z spupykin $
+# $Id: PKGBUILD 70497 2012-05-09 17:18:35Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=pptpd
 pkgver=1.3.4
-pkgrel=6
+pkgrel=7
 pkgdesc="Poptop server"
 arch=(i686 x86_64)
 url="http://poptop.sourceforge.net/"
@@ -11,12 +11,15 @@ license=('GPL')
 depends=(ppp glibc)
 backup=(etc/pptpd.conf)
 source=(http://downloads.sourceforge.net/sourceforge/poptop/pptpd-$pkgver.tar.gz
-	pptpd)
+	pptpd
+	unrecognized-opt.patch)
 md5sums=('b38df9c431041922c997c1148bedf591'
-         'e09f81beb5d59a0fdfba94e3a60d992b')
+         'e09f81beb5d59a0fdfba94e3a60d992b'
+         'cfa02c86d0413eb94fac15599986f54c')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
+  patch -p1 <$srcdir/unrecognized-opt.patch
   autoreconf -i
   ./configure --prefix=/usr --libdir=/usr/lib --exec-prefix=/usr --mandir=/usr/share
   make
diff --git a/community/pptpd/unrecognized-opt.patch b/community/pptpd/unrecognized-opt.patch
new file mode 100644
index 000000000..17ec49e52
--- /dev/null
+++ b/community/pptpd/unrecognized-opt.patch
@@ -0,0 +1,13 @@
+diff -wbBur pptpd-1.3.4/pptpctrl.c pptpd-1.3.4.my/pptpctrl.c
+--- pptpd-1.3.4/pptpctrl.c	2006-12-08 03:01:40.000000000 +0300
++++ pptpd-1.3.4.my/pptpctrl.c	2012-05-09 21:13:30.000000000 +0400
+@@ -759,8 +759,8 @@
+ 			syslog(LOG_DEBUG, "CTRL (PPPD Launcher): remote address = %s", pppaddrs[1]);
+ 	}
+ 	
+-	if (*pppaddrs[0] || *pppaddrs[1]) {
+ 		char pppInterfaceIPs[33];
++	if (*pppaddrs[0] || *pppaddrs[1]) {
+ 		sprintf(pppInterfaceIPs, "%s:%s", pppaddrs[0], pppaddrs[1]);
+ 		pppd_argv[an++] = pppInterfaceIPs;
+ 	}
diff --git a/community/qtcreator/PKGBUILD b/community/qtcreator/PKGBUILD
index ffe67ea13..8f72aa041 100644
--- a/community/qtcreator/PKGBUILD
+++ b/community/qtcreator/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 63396 2012-02-01 14:18:50Z svenstaro $
+# $Id: PKGBUILD 70483 2012-05-09 14:56:54Z svenstaro $
 # Maintainer: Imanol Celaya <ornitorrincos@archlinux-es.org>
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Lukas Jirkovsky <l.jirkovsky@gmail.com>
@@ -7,8 +7,8 @@
 # Contributor: delor <bartekpiech gmail com>
 
 pkgname="qtcreator"
-pkgver=2.4.1
-_pkgver=2.4.1
+pkgver=2.5.0
+_pkgver=2.5.0
 pkgrel=1
 pkgdesc='Lightweight, cross-platform integrated development environment'
 arch=('i686' 'x86_64')
@@ -23,11 +23,12 @@ optdepends=('qt-doc: for the integrated Qt documentation'
             'openssh-askpass: for ssh support'
             'git: for git support'
             'mercurial: for mercurial support'
-            'bzr: for bazaar support')
+            'bzr: for bazaar support'
+            'valgrind: for analyze support')
 install=qtcreator.install
 source=("http://get.qt.nokia.com/qtcreator/qt-creator-${_pkgver}-src.tar.gz"
         'qtcreator.desktop')
-md5sums=('e3a95b86df5ce9151b40cfbb2b8bbf3b'
+md5sums=('31e26cdd1e3eeb8c406382ebe886dcc5'
          'f1f4680b9838ff0b8f4cf11eb850d662')
 
 build() {
diff --git a/community/xdebug/PKGBUILD b/community/xdebug/PKGBUILD
index 1eab91ed8..1318e46f8 100644
--- a/community/xdebug/PKGBUILD
+++ b/community/xdebug/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 68086 2012-03-17 18:57:19Z spupykin $
+# $Id: PKGBUILD 70507 2012-05-09 18:48:25Z pschmitz $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Jonathan Wiersma <arch aur at jonw dot org>
 # Contributor: Jonathan Wiersma <arch aur at jonw dot org>
 # Contributor: sracker <smb.sac@gmail.com>
 
 pkgname=xdebug
-pkgver=2.1.4
+pkgver=2.2.0
 pkgrel=1
 pkgdesc="PHP debugging extension"
 arch=('i686' 'x86_64')
@@ -17,7 +17,7 @@ backup=('etc/php/conf.d/xdebug.ini')
 source=(http://www.xdebug.org/files/$pkgname-$pkgver.tgz
 	xdebug-5.2.ini
 	xdebug.ini)
-md5sums=('0a1339ad8053eface15ed6420a295939'
+md5sums=('27d8ad8224ffab04d12eecb5997a4f5d'
          '6b7fdbbe0bf381bda40e77e29981f439'
          '68de800943369d4c76bdf7eb35c8463b')
 
diff --git a/core/glib2/PKGBUILD b/core/glib2/PKGBUILD
index 210621610..7fbbe5623 100644
--- a/core/glib2/PKGBUILD
+++ b/core/glib2/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 157381 2012-04-28 09:25:44Z allan $
+# $Id: PKGBUILD 158759 2012-05-09 08:41:45Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=glib2
-pkgver=2.32.1
-pkgrel=3
+pkgver=2.32.2
+pkgrel=2
 pkgdesc="Common C routines used by GTK+ and other libs"
 url="http://www.gtk.org/"
 arch=(i686 x86_64)
@@ -16,7 +16,7 @@ source=(http://ftp.gnome.org/pub/GNOME/sources/glib/${pkgver%.*}/glib-$pkgver.ta
         glib2.sh
         glib2.csh
         revert-warn-glib-compile-schemas.patch)
-sha256sums=('484d5b7fc09f3fa398355adaf74b369768f5859866c299f229c99721990f8398'
+sha256sums=('b1764abf00bac96e0e93e29fb9715ce75f3583579acac40648e18771d43d6136'
             '9456872cdedcc639fb679448d74b85b0facf81033e27157d2861b991823b5a2a'
             '8d5626ffa361304ad3696493c0ef041d0ab10c857f6ef32116b3e2878ecf89e3'
             '049240975cd2f1c88fbe7deb28af14d4ec7d2640495f7ca8980d873bb710cc97')
@@ -24,7 +24,7 @@ sha256sums=('484d5b7fc09f3fa398355adaf74b369768f5859866c299f229c99721990f8398'
 build() {
   cd glib-$pkgver
   patch -Rp1 -i "$srcdir/revert-warn-glib-compile-schemas.patch"
-  PYTHON=/usr/bin/python2 ./configure --prefix=/usr \
+  PYTHON=/usr/bin/python2 ./configure --prefix=/usr --libdir=/usr/lib \
       --sysconfdir=/etc \
       --with-pcre=system \
       --disable-fam
diff --git a/extra/ffmpeg/PKGBUILD b/extra/ffmpeg/PKGBUILD
index b3a701783..458bfa5e4 100644
--- a/extra/ffmpeg/PKGBUILD
+++ b/extra/ffmpeg/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 153659 2012-03-17 13:50:07Z ibiru $
+# $Id: PKGBUILD 158782 2012-05-09 17:58:43Z ibiru $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 # Contributor: Paul Mattal <paul@archlinux.org>
 
 pkgname=ffmpeg
-pkgver=20120317
+pkgver=20120509
 pkgrel=1
 pkgdesc="Complete and free Internet live audio and video broadcasting solution for Linux/Unix"
 arch=('i686' 'x86_64')
@@ -14,7 +14,7 @@ depends=(alsa-lib bzip2 gsm lame libpulse libtheora libva libvorbis libvpx openc
 makedepends=('yasm' 'git' 'libvdpau')
 #git clone git://git.videolan.org/ffmpeg.git
 source=(ftp://ftp.archlinux.org/other/ffmpeg/$pkgname-$pkgver.tar.xz)
-md5sums=('2a2ef83ae73713fcef6bba8c430665ce')
+md5sums=('a35359e424608f369d380f03e4dc9966')
 
 build() {
   cd "$pkgname"
diff --git a/extra/graphviz/PKGBUILD b/extra/graphviz/PKGBUILD
index 3dfefeadc..f0640f068 100644
--- a/extra/graphviz/PKGBUILD
+++ b/extra/graphviz/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 150341 2012-02-17 03:33:20Z bisson $
+# $Id: PKGBUILD 158786 2012-05-09 18:48:24Z pierre $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: kevin <kevin@archlinux.org>
 # Contributor: John Proctor <jproctor@prium.net>
 
 pkgname=graphviz
 pkgver=2.28.0
-pkgrel=8
+pkgrel=9
 pkgdesc='Graph visualization software'
 url='http://www.graphviz.org/'
 license=('custom:EPL')
diff --git a/extra/gtkhtml4/PKGBUILD b/extra/gtkhtml4/PKGBUILD
index 12c5d4e62..f917c0682 100644
--- a/extra/gtkhtml4/PKGBUILD
+++ b/extra/gtkhtml4/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 156876 2012-04-23 09:08:07Z ibiru $
+# $Id: PKGBUILD 158752 2012-05-09 07:43:11Z jgc $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=gtkhtml4
 _pkgbasename=gtkhtml
 pkgver=4.4.1
-pkgrel=1
+pkgrel=2
 pkgdesc="A lightweight HTML renderer/editor widget for GTK3"
 arch=(i686 x86_64)
 license=('GPL')
@@ -12,11 +12,14 @@ depends=('gtk3' 'enchant' 'iso-codes' 'gnome-icon-theme' 'libsoup')
 makedepends=('intltool')
 url="http://www.gnome.org"
 options=('!libtool')
-source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgbasename/${pkgver%.*}/$_pkgbasename-$pkgver.tar.xz)
-sha256sums=('2fb3286c5ab8b6349a694156f803e1162c5a234d30548eb0afdf82e139923236')
+source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgbasename/${pkgver%.*}/$_pkgbasename-$pkgver.tar.xz
+        fix-selection-behaviour-in-iframe.patch)
+sha256sums=('2fb3286c5ab8b6349a694156f803e1162c5a234d30548eb0afdf82e139923236'
+            'ed1d9a4515f9137aaa94511f421b610af04091c56573ff9b74ba104a2ca1b207')
 
 build() {
     cd "$_pkgbasename-$pkgver"
+    patch -Np1 -i "${srcdir}/fix-selection-behaviour-in-iframe.patch"
     ./configure --prefix=/usr --sysconfdir=/etc \
         --libexecdir=/usr/lib/gtkhtml4 \
         --localstatedir=/var --disable-static
diff --git a/extra/gtkhtml4/fix-selection-behaviour-in-iframe.patch b/extra/gtkhtml4/fix-selection-behaviour-in-iframe.patch
new file mode 100644
index 000000000..06bce4a0f
--- /dev/null
+++ b/extra/gtkhtml4/fix-selection-behaviour-in-iframe.patch
@@ -0,0 +1,35 @@
+From 9ec36544203d4c1b98aa843c2c3ff0a4f725da68 Mon Sep 17 00:00:00 2001
+From: Sam Thursfield <sam.thursfield@codethink.co.uk>
+Date: Thu, 03 May 2012 19:04:20 +0000
+Subject: Bug 672582 - Fix selection behavior inside <iframe>
+
+Since kinetic scrolling was introduced in Gtk+, GtkScrolledWindow
+has had its own GdkWindow. This means we need to use the allocation
+of the GtkScrolledWindow rather than its child GtkHTML widget when we
+want to translate pointer coordinates relative to the iframe, because
+a widget's GtkAllocation is relative to the parent GdkWindow.
+
+(cherry picked from commit 7b7b37745d2f46914be314e4d7aef7a575529345)
+---
+diff --git a/gtkhtml/gtkhtml.c b/gtkhtml/gtkhtml.c
+index 697b16e..6284855 100644
+--- a/gtkhtml/gtkhtml.c
++++ b/gtkhtml/gtkhtml.c
+@@ -1823,9 +1823,14 @@ shift_to_iframe_parent (GtkWidget *widget,
+                         gint *y)
+ {
+ 	while (GTK_HTML (widget)->iframe_parent) {
++		GtkWidget *scrolled_window;
+ 		GtkAllocation allocation;
+ 
+-		gtk_widget_get_allocation (widget, &allocation);
++		scrolled_window = gtk_widget_get_parent (widget);
++
++		g_return_val_if_fail (GTK_IS_SCROLLED_WINDOW (scrolled_window), widget);
++
++		gtk_widget_get_allocation (scrolled_window, &allocation);
+ 
+ 		if (x)
+ 			*x += allocation.x - GTK_HTML (widget)->engine->x_offset;
+--
+cgit v0.9.0.2
diff --git a/extra/kdebase-workspace/PKGBUILD b/extra/kdebase-workspace/PKGBUILD
index 54cc5e066..96d585512 100644
--- a/extra/kdebase-workspace/PKGBUILD
+++ b/extra/kdebase-workspace/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 158377 2012-05-03 22:30:58Z andrea $
+# $Id: PKGBUILD 158761 2012-05-09 08:46:41Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=kdebase-workspace
 _pkgname=kde-workspace
 pkgver=4.8.3
-pkgrel=1
+pkgrel=2
 pkgdesc="KDE Base Workspace"
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
@@ -29,7 +29,8 @@ backup=('usr/share/config/kdm/kdmrc'
 options=('emptydirs')
 source=("http://download.kde.org/stable/${pkgver}/src/${_pkgname}-${pkgver}.tar.xz"
         'kdm' 'kde.pam' 'kde-np.pam' 'kscreensaver.pam'
-        'fixpath.patch' 'terminate-server.patch' 'kdm-xinitrd.patch')
+        'fixpath.patch' 'terminate-server.patch' 'kdm-xinitrd.patch'
+        'fix-krunner-crash.patch')
 sha1sums=('23dbd023f76769ba6ea77dbc11314eca504ad3d2'
           '5db3a245201bd4a50e65aa2ef583cf5490e4f646'
           '712a90999bd429883dcef5dcaf288aace332ced8'
@@ -37,13 +38,16 @@ sha1sums=('23dbd023f76769ba6ea77dbc11314eca504ad3d2'
           '106635aa1aae51d6f0668b1853f6c49a4fe9d3d8'
           'd7b5883f7e65c6839b1f65f94d58026673dd0226'
           'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3eeee'
-          'd509dac592bd8b310df27991b208c95b6d907514')
+          'd509dac592bd8b310df27991b208c95b6d907514'
+          'f898561d2b32dead8195f0610141edf7d423d46c')
 
 build() {
 	cd "${srcdir}"/${_pkgname}-${pkgver}
 	patch -p1 -i "${srcdir}"/kdm-xinitrd.patch
 	patch -p0 -i "${srcdir}"/fixpath.patch
 	patch -p0 -i "${srcdir}"/terminate-server.patch
+	
+    patch -p1 -i "${srcdir}"/fix-krunner-crash.patch
 
 	cd "${srcdir}"
 	mkdir build
diff --git a/extra/kdebase-workspace/fix-krunner-crash.patch b/extra/kdebase-workspace/fix-krunner-crash.patch
new file mode 100644
index 000000000..2bdf0b512
--- /dev/null
+++ b/extra/kdebase-workspace/fix-krunner-crash.patch
@@ -0,0 +1,13 @@
+diff --git a/libs/plasmagenericshell/panelshadows.cpp b/libs/plasmagenericshell/panelshadows.cpp
+index ee55571..2f45153 100644
+--- a/libs/plasmagenericshell/panelshadows.cpp
++++ b/libs/plasmagenericshell/panelshadows.cpp
+@@ -122,7 +122,7 @@ void PanelShadows::Private::initPixmap(const QString &element)
+ {
+ #ifdef Q_WS_X11
+     QPixmap pix = q->pixmap(element);
+-    if (pix.handle() == 0) {
++    if (!pix.isNull() && pix.handle() == 0) {
+         Pixmap xPix = XCreatePixmap(QX11Info::display(), QX11Info::appRootWindow(), pix.width(), pix.height(), 32);
+         QPixmap tempPix = QPixmap::fromX11Pixmap(xPix, QPixmap::ExplicitlyShared);
+         tempPix.fill(Qt::transparent);
diff --git a/extra/openconnect/PKGBUILD b/extra/openconnect/PKGBUILD
index f794241d6..b696ee786 100644
--- a/extra/openconnect/PKGBUILD
+++ b/extra/openconnect/PKGBUILD
@@ -1,28 +1,28 @@
-# $Id: PKGBUILD 145723 2011-12-28 18:31:54Z ibiru $
+# $Id: PKGBUILD 158780 2012-05-09 17:43:27Z ibiru $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=openconnect
-pkgver=3.15
+pkgver=3.18
 pkgrel=1
 epoch=1
 pkgdesc="Open client for Cisco AnyConnect VPN"
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://www.infradead.org/openconnect.html"
-depends=('libxml2' 'openssl' 'libproxy')
+depends=('libxml2' 'openssl' 'libproxy' 'vpnc')
 makedepends=('intltool')
 options=('!libtool' '!emptydirs')
 source=(ftp://ftp.infradead.org/pub/$pkgname/$pkgname-$pkgver.tar.gz)
-md5sums=('94245f4bac42a288100becab0b4ca29a')
+md5sums=('5a440ad946cfec0f1ee7ee5519081cf1')
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd "$pkgname-$pkgver"
   ./configure --prefix=/usr \
       --disable-static
   make
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd "$pkgname-$pkgver"
   make DESTDIR="$pkgdir" install
 }
diff --git a/extra/php-apc/PKGBUILD b/extra/php-apc/PKGBUILD
index 61f57f82e..337e14ec0 100644
--- a/extra/php-apc/PKGBUILD
+++ b/extra/php-apc/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 156069 2012-04-12 18:41:47Z pierre $
+# $Id: PKGBUILD 158790 2012-05-09 18:48:32Z pierre $
 # Maintainer: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=php-apc
 pkgver=3.1.10
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 pkgdesc='A free, open, and robust framework for caching and optimizing PHP intermediate code'
 url='http://pecl.php.net/package/APC'
diff --git a/extra/php-xcache/PKGBUILD b/extra/php-xcache/PKGBUILD
new file mode 100644
index 000000000..12c602b92
--- /dev/null
+++ b/extra/php-xcache/PKGBUILD
@@ -0,0 +1,40 @@
+# $Id: $
+# Maintainer: Pierre Schmitz <pierre@archlinux.de>
+
+pkgname=php-xcache
+pkgver=2.0.0
+pkgrel=3
+arch=('i686' 'x86_64')
+pkgdesc='A PHP opcode cacher'
+url='http://xcache.lighttpd.net/'
+depends=('php')
+license=('custom')
+source=("http://xcache.lighttpd.net/pub/Releases/${pkgver}/xcache-${pkgver}.tar.bz2"
+        'xcache.ini')
+backup=('etc/php/conf.d/xcache.ini')
+md5sums=('0e30cdff075c635e475d70a5c37d0252'
+         'bba7ead3e592a7980aa91a8600973587')
+
+build() {
+	cd $srcdir/xcache-$pkgver
+	phpize
+	./configure --prefix=/usr
+	make
+}
+
+# check() {
+# 	cd $srcdir/xcache-$pkgver
+# 	make test
+# }
+
+package() {
+	cd $srcdir/xcache-$pkgver
+	make INSTALL_ROOT=$pkgdir install
+
+	install -Dm644 $srcdir/xcache.ini $pkgdir/etc/php/conf.d/xcache.ini
+
+	install -dm755 $pkgdir/usr/share/php-xcache/admin
+	install -m644 admin/* $pkgdir/usr/share/php-xcache/admin/
+
+	install -Dm644 COPYING $pkgdir/usr/share/licenses/php-xcache/COPYING
+}
diff --git a/extra/php-xcache/xcache.ini b/extra/php-xcache/xcache.ini
new file mode 100644
index 000000000..c2677a5ca
--- /dev/null
+++ b/extra/php-xcache/xcache.ini
@@ -0,0 +1,3 @@
+;zend_extension=/usr/lib/php/modules/xcache.so
+xcache.size=64M
+xcache.var_size=64M
diff --git a/extra/php/PKGBUILD b/extra/php/PKGBUILD
index 8fa916144..35039e75b 100644
--- a/extra/php/PKGBUILD
+++ b/extra/php/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 158740 2012-05-08 17:02:36Z pierre $
+# $Id: PKGBUILD 158788 2012-05-09 18:48:29Z pierre $
 # Maintainer: Pierre Schmitz <pierre@archlinux.de>
 
 pkgbase=php
@@ -21,44 +21,35 @@ pkgname=('php'
          'php-sqlite'
          'php-tidy'
          'php-xsl')
-pkgver=5.3.13
-_suhosinver=5.3.9-0.9.10
+pkgver=5.4.3
 pkgrel=1
 arch=('i686' 'x86_64')
 license=('PHP')
 url='http://www.php.net'
-makedepends=('apache' 'imap' 'postgresql-libs' 'libldap' 'postfix'
+makedepends=('apache' 'imap' 'postgresql-libs' 'libldap' 'postfix' 'libvpx'
              'sqlite' 'unixodbc' 'net-snmp' 'libzip' 'enchant' 'file' 'freetds'
              'libmcrypt' 'tidyhtml' 'aspell' 'libltdl' 'libpng' 'libjpeg' 'icu'
              'curl' 'libxslt' 'openssl' 'bzip2' 'db' 'gmp' 'freetype2')
 source=("http://www.php.net/distributions/${pkgbase}-${pkgver}.tar.bz2"
-        "http://download.suhosin.org/suhosin-patch-${_suhosinver}.patch.gz"
-        "http://download.suhosin.org/suhosin-patch-${_suhosinver}.patch.gz.sig"
         'php.ini.patch' 'apache.conf' 'rc.d.php-fpm' 'php-fpm.conf.in.patch'
-        'logrotate.d.php-fpm' 'suhosin.patch')
-md5sums=('370be99c5cdc2e756c82c44d774933c8'
-         'c099b3d7eac95018ababd41ded7f3066'
-         'c15d18f846be1d69144a5d0056ee6506'
-         'ffc338e8ce2a990f6f2a486355bbab65'
+        'logrotate.d.php-fpm')
+md5sums=('51f9488bf8682399b802c48656315cac'
+         '0b0bc7a917fc592bdf11dcd3c5c255e9'
          'dec2cbaad64e3abf4f0ec70e1de4e8e9'
          'b01be5f816988fcee7e78225836e5e27'
-         '740ec5fe2ecfd9d7febd4081c90ec65b'
-         '07c4e412909ac65a44ec90e7a2c4bade'
-         '07ca7da608553b4cb92797e655eb94f1')
+         '59b3a25f9eb3afc02f1adf9ee699808c'
+         '07c4e412909ac65a44ec90e7a2c4bade')
 
 build() {
 	phpconfig="--srcdir=../${pkgbase}-${pkgver} \
+		--config-cache \
 		--prefix=/usr \
 		--sysconfdir=/etc/php \
 		--localstatedir=/var \
 		--with-layout=GNU \
 		--with-config-file-path=/etc/php \
 		--with-config-file-scan-dir=/etc/php/conf.d \
-		--enable-inline-optimization \
-		--disable-debug \
 		--disable-rpath \
-		--disable-static \
-		--enable-shared \
 		--mandir=/usr/share/man \
 		--without-pear \
 		"
@@ -70,36 +61,31 @@ build() {
 		--enable-ftp=shared \
 		--enable-gd-native-ttf \
 		--enable-intl=shared \
-		--enable-json=shared \
-		--enable-mbregex \
 		--enable-mbstring \
-		--enable-pdo \
 		--enable-phar=shared \
 		--enable-posix=shared \
-		--enable-session \
 		--enable-shmop=shared \
 		--enable-soap=shared \
 		--enable-sockets=shared \
-		--enable-sqlite-utf8 \
 		--enable-sysvmsg=shared \
 		--enable-sysvsem=shared \
 		--enable-sysvshm=shared \
-		--enable-xml \
 		--enable-zip=shared \
 		--with-bz2=shared \
 		--with-curl=shared \
 		--with-db4=/usr \
 		--with-enchant=shared,/usr \
-		--with-freetype-dir=shared,/usr \
+		--with-freetype-dir=/usr \
 		--with-gd=shared \
-		--with-gdbm=shared \
+		--with-gdbm \
 		--with-gettext=shared \
 		--with-gmp=shared \
 		--with-iconv=shared \
 		--with-icu-dir=/usr \
-		--with-imap-ssl=shared \
+		--with-imap-ssl \
 		--with-imap=shared \
-		--with-jpeg-dir=shared,/usr \
+		--with-jpeg-dir=/usr \
+		--with-vpx-dir=/usr \
 		--with-ldap=shared \
 		--with-ldap-sasl \
 		--with-mcrypt=shared \
@@ -115,19 +101,15 @@ build() {
 		--with-pdo-pgsql=shared \
 		--with-pdo-sqlite=shared,/usr \
 		--with-pgsql=shared \
-		--with-png-dir=shared,/usr \
+		--with-png-dir=/usr \
 		--with-pspell=shared \
-		--with-regex=php \
 		--with-snmp=shared \
 		--with-sqlite3=shared,/usr \
-		--with-sqlite=shared \
 		--with-tidy=shared \
 		--with-unixODBC=shared,/usr \
 		--with-xmlrpc=shared \
 		--with-xsl=shared \
 		--with-zlib \
-		--without-db2 \
-		--without-db3 \
 		"
 
 	EXTENSION_DIR=/usr/lib/php/modules
@@ -135,14 +117,8 @@ build() {
 	PEAR_INSTALLDIR=/usr/share/pear
 	export PEAR_INSTALLDIR
 
-	# fix the suhosin patch
-	patch -i ${srcdir}/suhosin.patch
-
 	cd ${srcdir}/${pkgbase}-${pkgver}
 
-	# apply suhosin patch
-	patch -F3 -p1 -i ${srcdir}/suhosin-patch-${_suhosinver}.patch
-
 	# adjust paths
 	patch -p0 -i ${srcdir}/php.ini.patch
 	patch -p0 -i ${srcdir}/php-fpm.conf.in.patch
@@ -280,11 +256,8 @@ package_php-pear() {
 	backup=('etc/php/pear.conf')
 
 	cd ${srcdir}/build-pear
-	make -j1 install-pear INSTALL_ROOT=${pkgdir}
-	local i
-	while read i; do
-		[ ! -e "$i" ] || rm -rf "$i"
-	done < <(find ${pkgdir} -name '.*')
+	make install-pear INSTALL_ROOT=${pkgdir}
+	rm -rf ${pkgdir}/usr/share/pear/.{channels,depdb,depdblock,filemap,lock,registry}
 }
 
 package_php-enchant() {
@@ -294,7 +267,7 @@ package_php-enchant() {
 }
 
 package_php-gd() {
-	depends=('php' 'libpng' 'libjpeg' 'freetype2')
+	depends=('php' 'libpng' 'libjpeg' 'freetype2' 'libvpx')
 	pkgdesc='gd module for PHP'
 	install -D -m755 ${srcdir}/build-php/modules/gd.so ${pkgdir}/usr/lib/php/modules/gd.so
 }
diff --git a/extra/php/php-fpm.conf.in.patch b/extra/php/php-fpm.conf.in.patch
index b923edb38..4e0f4a888 100644
--- a/extra/php/php-fpm.conf.in.patch
+++ b/extra/php/php-fpm.conf.in.patch
@@ -1,5 +1,5 @@
 --- sapi/fpm/php-fpm.conf.in	2011-10-08 23:04:10.000000000 +0200
-+++ sapi/fpm/php-fpm.conf.in	2012-01-11 10:50:14.905161442 +0100
++++ sapi/fpm/php-fpm.conf.in	2012-03-01 19:50:48.549947258 +0100
 @@ -12,7 +12,7 @@
  ; Relative path can also be used. They will be prefixed by:
  ;  - the global prefix if it's been set (-p arguement)
@@ -26,7 +26,7 @@
 +;listen = 127.0.0.1:9000
 +listen = /var/run/php-fpm/php-fpm.sock
  
- ; Set listen(2) backlog. A value of '-1' means unlimited.
+ ; Set listen(2) backlog.
  ; Default Value: 128 (-1 on FreeBSD and OpenBSD)
 @@ -151,9 +152,9 @@
  ; BSD-derived systems allow connections regardless of permissions. 
diff --git a/extra/php/php.ini.patch b/extra/php/php.ini.patch
index 3dc5b6560..bbaae2152 100644
--- a/extra/php/php.ini.patch
+++ b/extra/php/php.ini.patch
@@ -1,6 +1,6 @@
---- php.ini-production	2011-12-15 11:31:02.000000000 +0100
-+++ php.ini-production	2012-01-11 10:43:02.069936043 +0100
-@@ -376,7 +376,7 @@
+--- php.ini-production	2012-03-29 06:17:59.000000000 +0200
++++ php.ini-production	2012-03-30 10:46:21.181340861 +0200
+@@ -305,7 +305,7 @@
  ; or per-virtualhost web server configuration file. This directive is
  ; *NOT* affected by whether Safe Mode is turned On or Off.
  ; http://php.net/open-basedir
@@ -9,7 +9,7 @@
  
  ; This directive allows you to disable certain functions for security reasons.
  ; It receives a comma-delimited list of function names. This directive is
-@@ -793,7 +793,7 @@
+@@ -702,7 +702,7 @@
  ;;;;;;;;;;;;;;;;;;;;;;;;;
  
  ; UNIX: "/path1:/path2"
@@ -18,7 +18,7 @@
  ;
  ; Windows: "\path1;\path2"
  ;include_path = ".;c:\php\includes"
-@@ -816,7 +816,7 @@
+@@ -725,7 +725,7 @@
  
  ; Directory in which the loadable extensions (modules) reside.
  ; http://php.net/extension-dir
@@ -27,7 +27,7 @@
  ; On windows:
  ; extension_dir = "ext"
  
-@@ -950,53 +950,49 @@
+@@ -859,51 +859,47 @@
  ; If you only provide the name of the extension, PHP will look for it in its
  ; default extension directory.
  ;
@@ -55,7 +55,6 @@
 -;extension=php_oci8_11g.dll  ; Use with Oracle 11gR2 Instant Client
 -;extension=php_openssl.dll
 -;extension=php_pdo_firebird.dll
--;extension=php_pdo_mssql.dll
 -;extension=php_pdo_mysql.dll
 -;extension=php_pdo_oci.dll
 -;extension=php_pdo_odbc.dll
@@ -71,7 +70,6 @@
 -
 -;extension=php_soap.dll
 -;extension=php_sockets.dll
--;extension=php_sqlite.dll
 -;extension=php_sqlite3.dll
 -;extension=php_sybase_ct.dll
 -;extension=php_tidy.dll
@@ -92,7 +90,6 @@
 +;extension=iconv.so
 +;extension=imap.so
 +;extension=intl.so
-+extension=json.so
 +;extension=ldap.so
 +;extension=mcrypt.so
 +;extension=mssql.so
@@ -113,7 +110,6 @@
 +;extension=soap.so
 +;extension=sockets.so
 +;extension=sqlite3.so
-+;extension=sqlite.so
 +;extension=sysvmsg.so
 +;extension=sysvsem.so
 +;extension=sysvshm.so
diff --git a/extra/telepathy-rakia/0001-Check-for-gio-to-avoid-linking-issue.patch b/extra/telepathy-rakia/0001-Check-for-gio-to-avoid-linking-issue.patch
new file mode 100644
index 000000000..7f3b033bd
--- /dev/null
+++ b/extra/telepathy-rakia/0001-Check-for-gio-to-avoid-linking-issue.patch
@@ -0,0 +1,29 @@
+From 797d2b3792a0d4c4260075c2b05a1aba63715363 Mon Sep 17 00:00:00 2001
+From: Ionut Biru <ibiru@archlinux.org>
+Date: Wed, 9 May 2012 17:34:10 +0000
+Subject: [PATCH] Check for gio to avoid linking issue
+
+/usr/bin/ld: note: 'g_inet_address_new_from_string' is defined in DSO
+/usr/lib/libgio-2.0.so.0 so try adding it to the linker command line
+
+Signed-off-by: Ionut Biru <ibiru@archlinux.org>
+---
+ configure.ac |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 2a6cb2a..461d464 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -62,7 +62,7 @@ dnl GTK docs
+ GTK_DOC_CHECK
+ 
+ dnl Check for Glib 
+-PKG_CHECK_MODULES(GLIB, gobject-2.0 >= 2.30, have_glib=yes, have_glib=no)
++PKG_CHECK_MODULES(GLIB, [gobject-2.0 >= 2.30, gio-2.0 >= 2.30], have_glib=yes, have_glib=no)
+ 
+ if test x$have_glib = xno ; then
+     AC_MSG_ERROR([GLib development libraries not found])
+-- 
+1.7.10.1
+
diff --git a/extra/telepathy-rakia/PKGBUILD b/extra/telepathy-rakia/PKGBUILD
index 991422eeb..300aaa381 100644
--- a/extra/telepathy-rakia/PKGBUILD
+++ b/extra/telepathy-rakia/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 151254 2012-02-25 10:06:13Z ibiru $
+# $Id: PKGBUILD 158778 2012-05-09 17:40:49Z ibiru $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 
 pkgname=telepathy-rakia
-pkgver=0.7.3
+pkgver=0.7.4
 pkgrel=1
 pkgdesc="SIP connection manager for Telepathy"
 arch=('i686' 'x86_64')
@@ -13,16 +13,20 @@ makedepends=('libxslt' 'python2')
 install=telepathy-rakia.install
 groups=('telepathy')
 replaces=('telepathy-sofiasip')
-source=(http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz)
-md5sums=('dea76f93fe6234d18c6c7746c9ce0d6e')
+source=(http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz
+        0001-Check-for-gio-to-avoid-linking-issue.patch)
+md5sums=('f9f47f18db033afe29fd6963c7748e37'
+         '6d0372c4c8a22bf9682e4b45ee614d5c')
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd "$pkgname-$pkgver"
+  patch -Np1 -i $srcdir/0001-Check-for-gio-to-avoid-linking-issue.patch
+  autoreconf -fi
   ./configure --prefix=/usr --libexecdir=/usr/lib/telepathy
   make
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="${pkgdir}" install
+  cd "$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
 }
diff --git a/multilib/gcc-multilib/PKGBUILD b/multilib/gcc-multilib/PKGBUILD
index 412f2ccce..d3522eb43 100644
--- a/multilib/gcc-multilib/PKGBUILD
+++ b/multilib/gcc-multilib/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 69647 2012-04-21 10:27:12Z allan $
+# $Id: PKGBUILD 70473 2012-05-09 08:18:45Z bluewind $
 # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
 # Contributor: Allan McRae <allan@archlinux.org>
 
@@ -8,8 +8,8 @@
 pkgbase='gcc-multilib'
 pkgname=('gcc-multilib' 'gcc-libs-multilib' 'lib32-gcc-libs' 'gcc-fortran-multilib' 'gcc-objc-multilib' 'gcc-ada-multilib' 'gcc-go-multilib')
 pkgver=4.7.0
-pkgrel=5
-_snapshot=4.7-20120414
+pkgrel=6
+_snapshot=4.7-20120505
 _libstdcppmanver=20120307		# Note: check source directory name when updating this
 pkgdesc="The GNU Compiler Collection for multilib"
 arch=('x86_64')
@@ -24,7 +24,7 @@ source=(#ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2
 	ftp://gcc.gnu.org/pub/gcc/libstdc++/doxygen/libstdc++-api.${_libstdcppmanver}.man.tar.bz2
 	gcc_pure64-multilib.patch
 	gcc-4.7.0-cloog-0.17.patch)
-md5sums=('9f9d082b64753d5908690500251fc52e'
+md5sums=('8e2df3b9a755c9262db0df019cc3542e'
          '489d2f5311535800a120efd8d18db719'
          'ec24c32d3d1030c2bc8cb2ad2d1dc629'
          '575f7d17b022e609447a590e481b18b5')
@@ -164,8 +164,8 @@ package_gcc-multilib()
   
   make -j1 DESTDIR=${pkgdir} install
 
-  install -d $pkgdir/usr/share/gdb/auto-load
-  mv $pkgdir/usr/{lib/libstdc++.so.6.0.17-gdb.py,share/gdb/auto-load}
+  install -d $pkgdir/usr/share/gdb/auto-load/usr/lib
+  mv $pkgdir{,/usr/share/gdb/auto-load}/usr/lib/libstdc++.so.6.0.17-gdb.py
 
   # unfortunately it is much, much easier to install the lot and clean-up the mess...
   rm $pkgdir/usr/bin/{{$CHOST-,}gfortran,{$CHOST-,}gccgo,gnat*}
diff --git a/multilib/lib32-glib2/PKGBUILD b/multilib/lib32-glib2/PKGBUILD
index 8aed3aad6..c80a18db6 100644
--- a/multilib/lib32-glib2/PKGBUILD
+++ b/multilib/lib32-glib2/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 69807 2012-04-23 09:59:24Z ibiru $
+# $Id: PKGBUILD 70512 2012-05-09 21:57:13Z bluewind $
 # Maintainer:  Ionut Biru <ibiru@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 # Contributor: Mikko Seppälä <t-r-a-y@mbnet.fi>
 
 _pkgbasename=glib2
 pkgname=lib32-$_pkgbasename
-pkgver=2.32.1
-pkgrel=2
+pkgver=2.32.2
+pkgrel=1
 pkgdesc="Common C routines used by GTK+ 2.4 and other libs (32-bit)"
 url="http://www.gtk.org/"
 arch=('x86_64')
@@ -15,7 +15,7 @@ depends=('lib32-pcre' 'lib32-zlib' 'lib32-dbus-core' lib32-libffi $_pkgbasename)
 makedepends=('gcc-multilib' python2)
 options=('!libtool' '!docs')
 source=(http://ftp.gnome.org/pub/GNOME/sources/glib/2.32/glib-${pkgver}.tar.xz)
-sha256sums=('484d5b7fc09f3fa398355adaf74b369768f5859866c299f229c99721990f8398')
+sha256sums=('b1764abf00bac96e0e93e29fb9715ce75f3583579acac40648e18771d43d6136')
 
 build() {
   export CC="gcc -m32"