Mon Jun 27 23:06:14 UTC 2011

16 files changed, 242 insertions, 105 deletions

diff --git a/extra/dbus-glib/PKGBUILD b/extra/dbus-glib/PKGBUILD
index bfecd8af8..79c6a270e 100644
--- a/extra/dbus-glib/PKGBUILD
+++ b/extra/dbus-glib/PKGBUILD
@@ -1,23 +1,30 @@
-# $Id: PKGBUILD 98493 2010-11-10 13:05:31Z ibiru $
+# $Id: PKGBUILD 129344 2011-06-26 21:48:20Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=dbus-glib
-pkgver=0.92
-pkgrel=1
+pkgver=0.94
+pkgrel=2
 pkgdesc="GLib bindings for DBUS"
 arch=(i686 x86_64)
 license=('GPL')
 url="http://www.freedesktop.org/wiki/Software/DBusBindings"
-depends=('dbus-core>=1.4.0' 'glib2>=2.26.0')
+depends=('dbus-core' 'glib2')
 makedepends=('pkgconfig')
 options=('!libtool' '!emptydirs')
-source=(http://dbus.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-md5sums=('b595b36890c4f9f8f5d5dec131c495f8')
+source=(http://dbus.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz
+        fix_network_manager.patch)
+md5sums=('e1f1506a6f4941e67bffd614b1ad5af6'
+         '2a3598342dd25722d452e7beaf21b5f3')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np1 -i "${srcdir}/fix_network_manager.patch"
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
       --enable-static=no --enable-bash-completion=no
   make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/dbus-glib/fix_network_manager.patch b/extra/dbus-glib/fix_network_manager.patch
new file mode 100644
index 000000000..246b85550
--- /dev/null
+++ b/extra/dbus-glib/fix_network_manager.patch
@@ -0,0 +1,40 @@
+From 3e0828f57c3925ea9b63d22ab82d991a0fea0536 Mon Sep 17 00:00:00 2001
+From: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: Thu, 02 Jun 2011 12:49:51 +0000
+Subject: Fix regression in marshalling objects as object paths
+
+This regressed while fixing fd.o #36811. NetworkManager apparently uses
+this idiom.
+
+Bug: https://bugs.freedesktop.org/show_bug.cgi?id=37852
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=628890
+Tested-by: Michael Biebl <biebl@debian.org>
+Reviewed-by: Colin Walters <walters@verbum.org>
+---
+diff --git a/dbus/dbus-gobject.c b/dbus/dbus-gobject.c
+index 3b0bd17..7ee0b4f 100644
+--- a/dbus/dbus-gobject.c
++++ b/dbus/dbus-gobject.c
+@@ -3049,16 +3049,16 @@ out:
+ const char *
+ _dbus_gobject_get_path (GObject *obj)
+ {
+-  GSList *registrations;
++  ObjectExport *oe;
+   ObjectRegistration *o;
+ 
+-  registrations = g_object_get_data (obj, "dbus_glib_object_registrations");
++  oe = g_object_get_data (obj, "dbus_glib_object_registrations");
+ 
+-  if (registrations == NULL)
++  if (oe == NULL || oe->registrations == NULL)
+     return NULL;
+ 
+   /* First one to have been registered wins */
+-  o = registrations->data;
++  o = oe->registrations->data;
+ 
+   return o->object_path;
+ }
+--
+cgit v0.8.3-6-g21f6
diff --git a/extra/dbus-python/PKGBUILD b/extra/dbus-python/PKGBUILD
index df66c9b8e..8cfacff43 100644
--- a/extra/dbus-python/PKGBUILD
+++ b/extra/dbus-python/PKGBUILD
@@ -1,22 +1,26 @@
-# $Id: PKGBUILD 101132 2010-11-28 12:58:39Z ibiru $
+# $Id: PKGBUILD 128602 2011-06-24 13:59:34Z ibiru $
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=dbus-python
-pkgver=0.83.1
-pkgrel=2
+pkgver=0.84.0
+pkgrel=1
 pkgdesc="Python bindings for DBUS"
 arch=('i686' 'x86_64')
 license=('GPL' 'LGPL')
 url="http://www.freedesktop.org/wiki/Software/DBusBindings"
-depends=('dbus-glib>=0.82' 'python2>=2.7')
+depends=('dbus-glib' 'python2')
 makedepends=('pkg-config' 'docutils')
 options=('!libtool')
 source=(http://dbus.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-md5sums=('5fdf3970aa0c00020289de7ba8f3be18')
+md5sums=('fe69a2613e824463e74f10913708c88a')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   PYTHON=python2 ./configure --prefix=/usr
   make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/dbus/PKGBUILD b/extra/dbus/PKGBUILD
index 633b0b3d3..bcac66a7a 100644
--- a/extra/dbus/PKGBUILD
+++ b/extra/dbus/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 123271 2011-05-09 14:50:22Z jgc $
+# $Id: PKGBUILD 128609 2011-06-24 14:05:28Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Link Dupont <link@subpop.net>
 #
 pkgname=dbus
-pkgver=1.4.8
+pkgver=1.4.12
 pkgrel=1
 pkgdesc="Freedesktop.org message bus system"
 url="http://www.freedesktop.org/Software/dbus"
@@ -12,7 +12,7 @@ license=('GPL' 'custom')
 depends=("dbus-core>=${pkgver}" 'libx11')
 source=(http://dbus.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz
         30-dbus)
-md5sums=('e30253e15f0f4e6c5ee9e6f0eba5046c'
+md5sums=('104f2ea94c10a896dfb1edecb5714cb1'
          'd14e59575f04e55d21a04907b6fd9f3c')
 
 build() {
@@ -24,6 +24,10 @@ build() {
       --enable-inotify --disable-dnotify \
       --disable-tests --disable-asserts
   make -C tools dbus-launch
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
   install -m755 -d "${pkgdir}/usr/bin"
   install -m755 -d "${pkgdir}/usr/share/man/man1"
   install -m755 tools/dbus-launch "${pkgdir}/usr/bin/"
diff --git a/extra/eclipse/PKGBUILD b/extra/eclipse/PKGBUILD
index 12cf9da92..7b01a70e4 100644
--- a/extra/eclipse/PKGBUILD
+++ b/extra/eclipse/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 128950 2011-06-25 15:38:08Z paul $
+# $Id: PKGBUILD 129286 2011-06-26 10:19:01Z paul $
 # Maintainer: Paul Mattal <paul@archlinux.org>
 # Contributor: Andrew Wright <andreww@photism.org>
 # Contributor: Andreas W. Hauser <andy-aur@splashground.de>
@@ -18,7 +18,7 @@ license=("EPL/1.1")
 source=("ftp://ftp.osuosl.org/pub/eclipse/eclipse/downloads/drops/R-${pkgver}-${_date}/${pkgname}-SDK-${pkgver}-linux-gtk.tar.gz"
 	'eclipse.svg' 'eclipse.sh' 'eclipse.desktop'
 	'eclipse.ini.patch')
-md5sums=('7777a21debf1e05591731ac5c93b6bb6'
+md5sums=('084a33505b2d5b933447692ec3025659'
 	'77cff7543ccf7e177cb6667f5a20ce19'
 	'7ea99a30fbaf06ec29261541b8eb1e23'
 	'ba8a37e30a7ebd69774cec87c69e8c44'
diff --git a/extra/ghc/PKGBUILD b/extra/ghc/PKGBUILD
index 19887fef4..9fddba6ca 100644
--- a/extra/ghc/PKGBUILD
+++ b/extra/ghc/PKGBUILD
@@ -1,14 +1,20 @@
-# $Id: PKGBUILD 112131 2011-03-04 07:57:42Z vesa $
+# $Id: PKGBUILD 128106 2011-06-22 10:54:11Z vesa $
 # Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
+# Special note for devs looking to upgrade this package:
+#   ghc places a unique hash for each library when it is built.
+#   Libraries depend on versions specified by those hashes.
+#   This implies that all libraries need to be rebuilt when ghc is rebuilt.
+#   Also, due to dependency loop problems, haskell-ghc-paths and haddock
+#   do not carry version dependencies. You will have to remember to build them too.
 pkgname=ghc
-pkgver=7.0.2
-pkgrel=1
+pkgver=7.0.3
+pkgrel=2
 pkgdesc="The Glasgow Haskell Compiler"
 arch=(i686 x86_64)
 url="http://www.haskell.org/ghc/"
 license=("custom")
 depends=('perl' 'gmp>=5.0' gcc)
-makedepends=(ghc happy perl)
+makedepends=(ghc happy perl libxslt docbook-xsl)
 provides=("haskell-array=0.3.0.2"
           "haskell-bytestring=0.9.1.10"
           "haskell-cabal=1.10.1.0"
@@ -26,7 +32,6 @@ provides=("haskell-array=0.3.0.2"
           "haskell-template-haskell=2.5.0.0"
           "haskell-time=1.2.0.3"
           "haskell-unix=2.4.2.0"
-          "haddock=2.9.2"
          )
 replaces=("haskell-array<0.3.0.2" 
           "haskell-bytestring<0.9.1.10"
@@ -45,11 +50,10 @@ replaces=("haskell-array<0.3.0.2"
           "haskell-template-haskell<2.5.0.0"
           "haskell-time<1.2.0.3"
           "haskell-unix<2.4.2.0"
-          "haddock<2.9.2"
          )
 
 install=ghc.install
-
+options=(!strip)
 source=("http://www.haskell.org/ghc/dist/$pkgver/ghc-$pkgver-src.tar.bz2"
         build.mk)
 
@@ -60,10 +64,16 @@ build() {
 
   ./configure --prefix=/usr 
   make -j1 || return 1
+}
+
+package() {
+  cd $srcdir/$pkgname-$pkgver
+  
   make DESTDIR=$pkgdir install
 
   install -Dm644 LICENSE ${pkgdir}/usr/share/licenses/ghc/license
+  install -d $pkgdir/usr/share/haskell
 }
 
-md5sums=('946a18a0dc30437db72c0d3fdf26ca42'
+md5sums=('10bc5e9ae1b581404376efb85f260ff3'
          '5a3e0880c80b1dcecf779ff2e63a9c0d')
diff --git a/extra/graphviz/PKGBUILD b/extra/graphviz/PKGBUILD
index 120a3402d..9aa39b089 100644
--- a/extra/graphviz/PKGBUILD
+++ b/extra/graphviz/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 123442 2011-05-11 13:08:33Z bisson $
-# Maintainer: kevin <kevin@archlinux.org>
+# $Id: PKGBUILD 129240 2011-06-26 08:51:17Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
+# Contributor: kevin <kevin@archlinux.org>
 # Contributor: John Proctor <jproctor@prium.net>
 
 pkgname=graphviz
 pkgver=2.28.0
-pkgrel=1
+pkgrel=3
 pkgdesc='Graph visualization software'
 url='http://www.graphviz.org/'
 license=('custom:EPL')
 arch=('i686' 'x86_64')
 depends=('gd' 'librsvg' 'libxaw' 'ghostscript' 'pango')
-makedepends=('swig' 'mono' 'guile' 'lua' 'ocaml' 'perl' 'php' 'python2' 'r' 'ruby' 'tk')
+makedepends=('swig' 'mono' 'guile' 'lua' 'ocaml' 'perl' 'php' 'python2' 'r' 'ruby' 'tk' 'qt')
 optdepends=('mono: sharp bindings'
             'guile: guile bindings'
             'lua: lua bindings'
@@ -21,7 +21,8 @@ optdepends=('mono: sharp bindings'
             'python2: python bindings'
             'r: r bindings'
             'ruby: ruby bindings'
-            'tcl: tcl bindings')
+            'tcl: tcl bindings'
+            'qt: gvedit')
 source=("${url}/pub/${pkgname}/stable/SOURCES/${pkgname}-${pkgver}.tar.gz"
         'LICENSE')
 sha1sums=('4725d88a13e071ee22e632de551d4a55ca08ee7d'
diff --git a/extra/graphviz/install b/extra/graphviz/install
index 00510e3f6..65fba522b 100644
--- a/extra/graphviz/install
+++ b/extra/graphviz/install
@@ -1,17 +1,12 @@
-# arg 1:  the new package version
 post_install() {
-  # Create plugin config /usr/lib/graphviz/config6
-  rm -f usr/lib/graphviz/config{,6}
-  usr/bin/dot -c
+	rm -f usr/lib/graphviz/config{,6}
+	usr/bin/dot -c
 }
 
-# arg 1:  the new package version
-# arg 2:  the old package version
 post_upgrade() {
-  post_install $1
+	post_install
 }
 
-# arg 1:  the old package version
 pre_remove() {
-  rm -f usr/lib/graphviz/config{,6}
+	rm -f usr/lib/graphviz/config{,6}
 }
diff --git a/extra/krusader/PKGBUILD b/extra/krusader/PKGBUILD
index 67e8615ea..58e113545 100644
--- a/extra/krusader/PKGBUILD
+++ b/extra/krusader/PKGBUILD
@@ -1,31 +1,26 @@
-# $Id: PKGBUILD 111906 2011-03-01 18:29:55Z andrea $
+# $Id: PKGBUILD 129354 2011-06-26 23:28:57Z eric $
 # Maintainer:
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Alexander Baldeck <alexander@archlinux.org>
 # Contributor: Lucien Immink <l.immink@student.fnt.hvu.nl>
 
 pkgname=krusader
-pkgver=2.3.0beta1
-_pkgver=2.3.0-beta1
-pkgrel=3
+pkgver=2.4.0beta1
+_pkgver=2.4.0-beta1
+pkgrel=1
 pkgdesc="An alternative file manager for KDE resembling Midnight Commander"
-url="http://krusader.sourceforge.net/"
 arch=('i686' 'x86_64')
+url="http://krusader.sourceforge.net/"
 license=('GPL')
 depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4' 'docbook-xsl')
 optdepends=("kdebase-keditbookmarks: to edit bookmarks")
-install=${pkgname}.install
-source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${_pkgver}.tar.bz2"
-        'add-xz-support.patch')
-md5sums=('3ef55648a2589a9a919d463acec3b830'
-        'a350bc90646bd16cc4219aa30a4d1fc6')
+install=krusader.install
+source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${_pkgver}.tar.bz2)
+md5sums=('d2340718d05d69e7f2a7f0846471ee12')
 
 build() {
-  cd ${srcdir}/${pkgname}-${_pkgver}
-  patch -Np1 -i ${srcdir}/add-xz-support.patch
-
-  cd ${srcdir}
+  cd "${srcdir}"
   mkdir build
   cd build
   cmake ../${pkgname}-${_pkgver} \
@@ -35,6 +30,6 @@ build() {
 }
 
 package() {
-  cd ${srcdir}/build
-  make DESTDIR=${pkgdir} install
+  cd "${srcdir}/build"
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/openal/PKGBUILD b/extra/openal/PKGBUILD
index 86dbcc263..0a3c8f1a2 100644
--- a/extra/openal/PKGBUILD
+++ b/extra/openal/PKGBUILD
@@ -1,27 +1,29 @@
-# $Id: PKGBUILD 115848 2011-03-22 06:51:29Z heftig $
-# Maintainer: Allan McRae <allan@archlinux.org>
+# $Id: PKGBUILD 129235 2011-06-26 06:15:14Z heftig $
+# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
+# Contributor: Allan McRae <allan@archlinux.org>
 # Contributer: Jason Chu <jchu@xentac.net>
 
 pkgname=openal
 pkgver=1.13
-pkgrel=1
-pkgdesc="OpenAL audio library for use with opengl"
-arch=('i686' 'x86_64')
+pkgrel=2
+pkgdesc="A cross-platform 3D audio library"
+arch=(i686 x86_64)
 url="http://www.openal.org/"
-license=('LGPL')
-depends=('glibc')
-makedepends=('alsa-lib' 'sdl' 'pkgconfig' 'cmake' 'libpulse')
+license=(LGPL)
+depends=(glibc)
+makedepends=(alsa-lib sdl pkgconfig cmake libpulse)
 options=('!libtool')
-source=(http://kcat.strangesoft.net/openal-releases/openal-soft-${pkgver}.tar.bz2)
+source=(http://kcat.strangesoft.net/openal-releases/openal-soft-$pkgver.tar.bz2)
 md5sums=('58b7d2809790c70681b825644c5f3614')
 
 build() {
-  cd ${srcdir}/${pkgname}-soft-${pkgver}/build
+  cd "$srcdir/$pkgname-soft-$pkgver/build"
   cmake -D CMAKE_INSTALL_PREFIX=/usr -D CMAKE_BUILD_TYPE=Release ..
   make
 }
 
 package() {
-  cd ${srcdir}/${pkgname}-soft-${pkgver}/build
-  make DESTDIR=${pkgdir}/ install
+  cd "$srcdir/$pkgname-soft-$pkgver"
+  make -C build DESTDIR="$pkgdir/" install
+  install -Dm644 alsoftrc.sample "$pkgdir/etc/openal/alsoft.conf.sample"
 }
diff --git a/extra/proftpd/PKGBUILD b/extra/proftpd/PKGBUILD
index 075e30b6c..9acc9206a 100644
--- a/extra/proftpd/PKGBUILD
+++ b/extra/proftpd/PKGBUILD
@@ -1,49 +1,53 @@
-# $Id: PKGBUILD 117431 2011-04-02 01:06:40Z eric $
+# $Id: PKGBUILD 129323 2011-06-26 18:29:37Z andrea $
+# Maintainer:
 # Contributor: Eric Belanger <eric@archlinux.org>
-# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
+# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgname=proftpd
 pkgver=1.3.3e
-pkgrel=1
+pkgrel=2
 pkgdesc="A high-performance, scalable FTP server"
 arch=('i686' 'x86_64')
 url="http://www.proftpd.org"
 license=('GPL')
-depends=('glibc' 'pam' 'ncurses' 'libcap' 'libldap' 
-	 'libmysqlclient' 'postgresql-libs')
+depends=('glibc' 'pam' 'ncurses' 'libcap' 'libldap' 'libmysqlclient'
+         'postgresql-libs')
 backup=('etc/proftpd.conf' 'etc/conf.d/proftpd')
-source=(ftp://ftp.proftpd.org/distrib/source/${pkgname}-${pkgver}.tar.bz2
-	'proftpd' 'proftpd.logrotate' 'proftpd.conf.d')
+source=("ftp://ftp.proftpd.org/distrib/source/${pkgname}-${pkgver}.tar.bz2"
+        'proftpd' 'proftpd.logrotate' 'proftpd.conf.d')
 md5sums=('acc49b6589bc8c9fdf1dce9000bebdbd'
          '99f6f9a989e70e3fa50809fc2bbbbb0a'
          'ddb09eb13131becdf0e081eef413116b'
          '71d5932b0461c318ed68c2c0c2660736')
-sha1sums=('b347aa72d12e41fe8f43e8d91a7a4eeaac6f472f'
-          'b7819d725817e55b69c73e2572c21a05db48cc86'
-          '83c38ec40efb7cc09d9824b98e65cd948a195cc6'
-          'f34f60cb4fb1f4af7be7aca427cbad3cad22bbb9')
 
 build() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
+  cd "${srcdir}/${pkgname}-${pkgver}"
 
-	./configure --prefix=/usr --mandir=/usr/share/man --disable-pam \
-	    --with-modules=mod_quotatab:mod_quotatab_file:mod_tls:mod_ldap:mod_sql:mod_sql_mysql:mod_sql_postgres \
-	    --sysconfdir=/etc --localstatedir=/var/run --enable-ctrls --enable-ipv6 \
-	    --with-includes=/usr/include/mysql:/usr/include/postgresql \
-	    --with-libraries=/usr/lib/mysql:/usr/lib/postgresql --enable-nls
-	make
+  ./configure --prefix=/usr \
+    --mandir=/usr/share/man \
+    --disable-pam \
+    --with-modules=mod_quotatab:mod_quotatab_sql:mod_quotatab_file:mod_tls:mod_ldap:mod_sql:mod_sql_mysql:mod_sql_postgres \
+    --sysconfdir=/etc \
+    --localstatedir=/var/run \
+    --enable-ctrls \
+    --enable-ipv6 \
+    --with-includes=/usr/include/mysql:/usr/include/postgresql \
+    --with-libraries=/usr/lib/mysql:/usr/lib/postgresql \
+    --enable-nls
+
+  make
 }
 
 package() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  make DESTDIR="${pkgdir}" install
+  install -Dm644 ../proftpd.logrotate "${pkgdir}/etc/logrotate.d/proftpd"
+  install -Dm644 ../proftpd.conf.d "${pkgdir}/etc/conf.d/proftpd"
+  install -Dm755 ../proftpd "${pkgdir}/etc/rc.d/proftpd"
+  install -Dm755 contrib/xferstats.holger-preiss "${pkgdir}/usr/bin/ftpstats"
 
-	make DESTDIR="${pkgdir}" install
-	install -Dm644 ../proftpd.logrotate "${pkgdir}/etc/logrotate.d/proftpd"
-	install -Dm644 ../proftpd.conf.d "${pkgdir}/etc/conf.d/proftpd"
-	install -Dm755 ../proftpd "${pkgdir}/etc/rc.d/proftpd"
-	install -Dm755 contrib/xferstats.holger-preiss \
-	   "${pkgdir}/usr/bin/ftpstats"
-	cd "${pkgdir}/etc"
-	sed -i 's|nogroup|nobody|g' proftpd.conf
-	rmdir "${pkgdir}/usr/libexec"
+  cd "${pkgdir}/etc"
+  sed -i 's|nogroup|nobody|g' proftpd.conf
+  rmdir "${pkgdir}/usr/libexec"
 }
diff --git a/extra/pyalpm/PKGBUILD b/extra/pyalpm/PKGBUILD
index 0db22e4d7..40488fac2 100644
--- a/extra/pyalpm/PKGBUILD
+++ b/extra/pyalpm/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer : Rémy Oudompheng <remy@archlinux.org>
 
 pkgname=pyalpm
-pkgver=0.4.2
+pkgver=0.4.3
 pkgrel=1
 pkgdesc="Libalpm bindings for Python 3"
 arch=('i686' 'x86_64')
@@ -9,7 +9,7 @@ url="http://projects.archlinux.org/users/remy/pyalpm.git/"
 license=('GPL')
 depends=('python>=3.2' 'pacman<3.6')
 source=("ftp://ftp.archlinux.org/other/pyalpm/$pkgname-$pkgver.tar.gz")
-md5sums=('d5d45cafa98050a4d3c77e4a8f597ff3')
+md5sums=('396f9820eae9a40bd33d8bb366272c82')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
diff --git a/extra/strigi/PKGBUILD b/extra/strigi/PKGBUILD
index c11870fa1..2292ed9cc 100644
--- a/extra/strigi/PKGBUILD
+++ b/extra/strigi/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 128044 2011-06-21 07:08:33Z andrea $
+# $Id: PKGBUILD 129328 2011-06-26 19:20:34Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=strigi
 pkgver=0.7.5
-pkgrel=3
+pkgrel=4
 pkgdesc="Fast crawling desktop search engine with Qt4 GUI"
 arch=('i686' 'x86_64')
 url="http://www.vandenoever.info/software/strigi/"
@@ -37,6 +37,9 @@ package() {
 
   cd "${srcdir}/build/libstreamanalyzer"
   make DESTDIR="${pkgdir}" install
+
+  cd "${srcdir}/build/strigiclient/lib/searchclient/qtdbus"
+  make DESTDIR="${pkgdir}" install
   
   cd "${srcdir}/build/strigiutils"
   make DESTDIR="${pkgdir}" install
diff --git a/extra/valgrind/PKGBUILD b/extra/valgrind/PKGBUILD
index 0772fc3e4..a181f374c 100644
--- a/extra/valgrind/PKGBUILD
+++ b/extra/valgrind/PKGBUILD
@@ -1,20 +1,22 @@
-# $Id: PKGBUILD 110184 2011-02-17 12:26:47Z allan $
+# $Id: PKGBUILD 126782 2011-06-07 10:02:00Z allan $
 # Maintainer: Dan McGee <dan@archlinux.org>
 # Maintainer: Allan McRae <allan@archlinux.org>
 
 pkgname=valgrind
 pkgver=3.6.1
-pkgrel=1
+pkgrel=2
 pkgdesc="A tool to help find memory-management problems in programs"
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://valgrind.org/"
-depends=('glibc>=2.13' 'glibc<2.14' 'perl')
+depends=('glibc>=2.14' 'glibc<2.15' 'perl')
 makedepends=('gdb')
 options=('!emptydirs')
 source=(http://valgrind.org/downloads/${pkgname}-${pkgver}.tar.bz2
+        valgrind-3.6.1-glibc-2.14.patch
         glibc-patch-version.patch)    
 md5sums=('2c3aa122498baecc9d69194057ca88f5'
+         '560032ce5d27ef0c7c1af32c3fd45833'
          'b657f0ebdde3d9aefc9fd16f9e653702')
 
 build() {
@@ -23,6 +25,9 @@ build() {
   # make sure our CFLAGS are respected
   sed -i -e 's:^CFLAGS="-Wno-long-long":CFLAGS="$CFLAGS -Wno-long-long":' configure.in
 
+  # glibc-2.14 compatibility
+  patch -Np1 -i ${srcdir}/valgrind-3.6.1-glibc-2.14.patch
+
   # prevent need to rebuild with glibc patch level version bumps
   patch -Np1 -i ${srcdir}/glibc-patch-version.patch
 
diff --git a/extra/valgrind/valgrind-3.6.1-glibc-2.14.patch b/extra/valgrind/valgrind-3.6.1-glibc-2.14.patch
new file mode 100644
index 000000000..7fd217016
--- /dev/null
+++ b/extra/valgrind/valgrind-3.6.1-glibc-2.14.patch
@@ -0,0 +1,67 @@
+--- valgrind/configure.in.jj	2010-10-21 03:14:02.000000000 +0200
++++ valgrind/configure.in	2010-11-05 17:09:18.674455299 +0100
+@@ -749,6 +759,13 @@ case "${GLIBC_VERSION}" in
+ 	DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
+ 	DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
+ 	;;
++     2.14)
++	AC_MSG_RESULT(2.14 family)
++	AC_DEFINE([GLIBC_2_14], 1, [Define to 1 if you're using glibc 2.14.x])
++	DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}"
++	DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
++	DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
++	;;
+      aix5)
+ 	AC_MSG_RESULT(AIX 5.1 or 5.2 or 5.3)
+ 	AC_DEFINE([AIX5_LIBC], 1, [Define to 1 if you're using AIX 5.1 or 5.2 or 5.3])
+@@ -762,7 +779,7 @@ case "${GLIBC_VERSION}" in
+ 
+      *)
+ 	AC_MSG_RESULT([unsupported version ${GLIBC_VERSION}])
+-	AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.13])
++	AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.14])
+ 	AC_MSG_ERROR([or AIX 5.1 or 5.2 or 5.3 GLIBC_VERSION])
+ 	AC_MSG_ERROR([or Darwin libc])
+ 	;;
+--- valgrind/config.h.in.jj	2010-10-20 22:20:49.000000000 +0200
++++ valgrind/config.h.in	2010-11-05 17:08:33.863454886 +0100
+@@ -33,6 +33,9 @@
+ /* Define to 1 if you're using glibc 2.13.x */
+ #undef GLIBC_2_13
+ 
++/* Define to 1 if you're using glibc 2.14.x */
++#undef GLIBC_2_14
++
+ /* Define to 1 if you're using glibc 2.2.x */
+ #undef GLIBC_2_2
+ 
+--- valgrind/configure.jj	2010-10-21 03:16:18.000000000 +0200
++++ valgrind/configure	2010-11-05 17:09:39.163455396 +0100
+@@ -6367,6 +6389,18 @@ $as_echo "#define GLIBC_2_13 1" >>confde
+ 	DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
+ 	DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
+ 	;;
++     2.14)
++	echo "$as_me:$LINENO: result: 2.14 family" >&5
++echo "${ECHO_T}2.14 family" >&6
++
++cat >>confdefs.h <<\_ACEOF
++#define GLIBC_2_14 1
++_ACEOF
++
++	DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}"
++	DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
++	DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
++	;;
+      aix5)
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: AIX 5.1 or 5.2 or 5.3" >&5
+ $as_echo "AIX 5.1 or 5.2 or 5.3" >&6; }
+@@ -6387,7 +6421,7 @@ $as_echo "#define DARWIN_LIBC 1" >>confd
+      *)
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported version ${GLIBC_VERSION}" >&5
+ $as_echo "unsupported version ${GLIBC_VERSION}" >&6; }
+-	as_fn_error "Valgrind requires glibc version 2.2 - 2.13" "$LINENO" 5
++	as_fn_error "Valgrind requires glibc version 2.2 - 2.14" "$LINENO" 5
+ 	as_fn_error "or AIX 5.1 or 5.2 or 5.3 GLIBC_VERSION" "$LINENO" 5
+ 	as_fn_error "or Darwin libc" "$LINENO" 5
+ 	;;
diff --git a/extra/yelp/PKGBUILD b/extra/yelp/PKGBUILD
index ebffe3b7f..5acc58459 100644
--- a/extra/yelp/PKGBUILD
+++ b/extra/yelp/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 124709 2011-05-24 06:57:26Z heftig $
+# $Id: PKGBUILD 129307 2011-06-26 11:11:05Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=yelp
-pkgver=3.0.3
+pkgver=3.0.4
 pkgrel=1
 pkgdesc="A help browser for GNOME"
 arch=('i686' 'x86_64')
@@ -14,8 +14,8 @@ license=('GPL')
 options=('!emptydirs' '!libtool')
 url="http://www.gnome.org"
 install=yelp.install
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2)
-sha256sums=('938b50b63f2783d8f87ce2e6ebb622dcfc7cb2d81b39278d1298c5f3bdf236b9')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
+sha256sums=('f80c0482691124f2b852deebc7380506b06c50a0bdcb0dd8301258fe676a924b')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"