Wed May 4 12:58:31 UTC 2011

author: root <root@rshg047.dnsready.net> 2011-05-04 12:58:32 +0000
committer: root <root@rshg047.dnsready.net> 2011-05-04 12:58:32 +0000
commit: 9780d07c31b22125ad7ecba4e281ff41194f95be (patch)
tree: 2336cb3e1bd98fe4b7631eb175c25f90a243815a
parent: ddb2605f6bccbdb398f3937ff21e4688915a450d (diff)
87 files changed, 1367 insertions, 429 deletions
diff --git a/community/cross-arm-elf-gcc-base/PKGBUILD b/community/cross-arm-elf-gcc-base/PKGBUILD
index 884d697c8..a46c4185f 100644
--- a/community/cross-arm-elf-gcc-base/PKGBUILD
+++ b/community/cross-arm-elf-gcc-base/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 36540 2011-01-04 13:58:12Z spupykin $
+# $Id: PKGBUILD 46060 2011-05-03 09:42:29Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=cross-arm-elf-gcc-base
-pkgver=4.5.2
+pkgver=4.6.0
 pkgrel=1
 pkgdesc="The GNU Compiler Collection"
 arch=(i686 x86_64)
 license=('GPL' 'LGPL')
 url="http://gcc.gnu.org"
-depends=('cross-arm-elf-binutils' 'libmpc' 'libelf' 'cloog-ppl')
+depends=('cross-arm-elf-binutils' 'libmpc' 'libelf')
 options=(!libtool !emptydirs zipman docs !strip)
 source=(ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-core-${pkgver}.tar.bz2)
-md5sums=('aa9e36bec080452372bfba793428ee82')
+md5sums=('b1957f3209080b2f55bc3756d3a62b7c')
 
 build() {
   cd $srcdir/gcc-$pkgver
@@ -36,6 +36,14 @@ build() {
 	--with-sysroot=/usr/$CHOST/arm-elf
 
   make all-gcc all-target-libgcc
+}
+
+package() {
+  cd $srcdir/gcc-$pkgver/build
+
+  export CFLAGS="-O2 -pipe"
+  export CXXFLAGS="-O2 -pipe"
+
   make DESTDIR=$pkgdir install-gcc install-target-libgcc
 
   rm -f $pkgdir/usr/share/man/man7/fsf-funding.7*
diff --git a/community/gnome-commander/PKGBUILD b/community/gnome-commander/PKGBUILD
index 43f234067..ef13e4179 100644
--- a/community/gnome-commander/PKGBUILD
+++ b/community/gnome-commander/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 37675 2011-01-16 12:03:36Z ibiru $
+# $Id: PKGBUILD 46124 2011-05-03 20:51:46Z ibiru $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: Roman Kyrylych <roman@archlinux.org>
 # Contributor: Johannes Sjolund <j.sjolund@gmail.com>
 
 pkgname=gnome-commander
-pkgver=1.2.8.10
+pkgver=1.2.8.11
 pkgrel=1
 pkgdesc="A graphical two-pane filemanager for Gnome"
 arch=('i686' 'x86_64')
@@ -15,7 +15,7 @@ makedepends=('perlxml' 'gnome-doc-utils>=0.20.1' 'intltool')
 options=(!libtool)
 install=gnome-commander.install
 source=(ftp://ftp.gnome.org/pub/GNOME/sources/gnome-commander/1.2/$pkgname-$pkgver.tar.bz2)
-sha256sums=('148035ae09c32a383d30512e0a7129350a32b71d181bbd15b915cb67bc9232e0')
+sha256sums=('ef0c466b0858542cf8aa2c63eee701a257ce189655d6a5e5f5bc64690ac26cd9')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -29,6 +29,10 @@ build() {
     --localstatedir=/var --disable-scrollkeeper --enable-python
 
   make
+}
+
+package() {
+   cd "${srcdir}/${pkgname}-${pkgver}"
   make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
 
   mkdir -p "${pkgdir}"/usr/share/gconf/schemas
diff --git a/community/gnumail/PKGBUILD b/community/gnumail/PKGBUILD
index b2b82e258..79044c6cd 100644
--- a/community/gnumail/PKGBUILD
+++ b/community/gnumail/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 44415 2011-04-07 13:04:56Z spupykin $
+# $Id: PKGBUILD 46065 2011-05-03 10:03:55Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
 # Contributor: Sebastian Sareyko <public@nooms.de>
 
 pkgname=gnumail
 pkgver=1.2.0pre3
-pkgrel=4
+pkgrel=5
 pkgdesc="A complete and fast mail application for GNUstep"
 arch=('i686' 'x86_64')
 url="http://www.collaboration-world.com/gnumail"
@@ -18,6 +18,12 @@ md5sums=('0f91fe0c32ef369ea843a2ab3909fb2b')
 build() {
   cd $srcdir/GNUMail
   . /etc/profile.d/GNUstep.sh
-  make
+  make \
+	ADDITIONAL_OBJCFLAGS=-I/opt/GNUstep/System/Library/Headers \
+	ADDITIONAL_GUI_LIBS="-L/opt/GNUstep/System/Library/Libraries -lGNUMail -lPantomime -lAddresses -lAddressView"
+}
+
+package() {
+  cd $srcdir/GNUMail
   make GNUSTEP_INSTALLATION_DIR=$pkgdir/opt/GNUstep/System install
 }
diff --git a/community/gnunet-setup/PKGBUILD b/community/gnunet-setup/PKGBUILD
new file mode 100644
index 000000000..6e3585ef8
--- /dev/null
+++ b/community/gnunet-setup/PKGBUILD
@@ -0,0 +1,25 @@
+# $Id: PKGBUILD 46057 2011-05-03 09:18:56Z spupykin $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+
+pkgname=gnunet-setup
+pkgver=0.9.0pre2
+pkgrel=1
+pkgdesc="setup tool for gnunet"
+arch=(i686 x86_64)
+url="http://gnunet.org/"
+license=('GPL')
+depends=('gnunet')
+source=(ftp://ftp.gnu.org/gnu/gnunet/gnunet-setup-$pkgver.tar.gz)
+md5sums=('b9c768fb2278b19561654c261f98062f')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+  sed -i 's#gladeui-1#gladeui-2#' configure
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir/" install
+}
diff --git a/community/kde4-kio-rapip/PKGBUILD b/community/kde4-kio-rapip/PKGBUILD
new file mode 100644
index 000000000..92377772a
--- /dev/null
+++ b/community/kde4-kio-rapip/PKGBUILD
@@ -0,0 +1,28 @@
+# $Id: PKGBUILD 46077 2011-05-03 10:19:53Z spupykin $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Contributor: ReNoM <renom@list.ru>
+
+pkgname=kde4-kio-rapip
+pkgver=0.2
+pkgrel=1
+pkgdesc="KIOSlave to browse through the PDA file system via the SynCE infrastructure"
+arch=(i686 x86_64)
+url="http://synce.sourceforge.net/"
+license="MIT"
+depends=('kdelibs' 'synce-libsynce' 'synce-librapi')
+makedepends=('gcc' 'cmake' 'automoc4')
+install=kde4-kio-rapip.install
+source=(http://downloads.sourceforge.net/synce/$pkgname-$pkgver.tar.gz)
+md5sums=('94473e10e1b4dd6040c646a8c7421d0c')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+  cmake -DCMAKE_INSTALL_PREFIX=`kde4-config --prefix` .
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR=$pkgdir install
+  install -Dm0644 LICENSE $pkgdir/usr/share/licenses/kde4-kio-rapip/LICENSE
+}
diff --git a/community/kde4-kio-rapip/kde4-kio-rapip.install b/community/kde4-kio-rapip/kde4-kio-rapip.install
new file mode 100644
index 000000000..b3ddbc43f
--- /dev/null
+++ b/community/kde4-kio-rapip/kde4-kio-rapip.install
@@ -0,0 +1,14 @@
+post_install() {
+  which xdg-icon-resource 1>/dev/null 2>/dev/null && xdg-icon-resource forceupdate || true
+  update-mime-database usr/share/mime 1>/dev/null 2>/dev/null || true
+}
+
+post_upgrade() {
+  which xdg-icon-resource 1>/dev/null 2>/dev/null && xdg-icon-resource forceupdate || true
+  update-mime-database usr/share/mime 1>/dev/null 2>/dev/null || true
+}
+
+post_remove() {
+  which xdg-icon-resource 1>/dev/null 2>/dev/null && xdg-icon-resource forceupdate || true
+  update-mime-database usr/share/mime 1>/dev/null 2>/dev/null || true
+}
diff --git a/community/nginx/PKGBUILD b/community/nginx/PKGBUILD
index 8c1becc67..a92c5cc21 100644
--- a/community/nginx/PKGBUILD
+++ b/community/nginx/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 44862 2011-04-12 10:26:44Z spupykin $
+# $Id: PKGBUILD 46097 2011-05-03 14:39:45Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Miroslaw Szot <mss@czlug.icis.pcz.pl>
 
@@ -11,12 +11,12 @@ _user=http
 _group=http
 
 pkgname=nginx
-pkgver=1.0.0
+pkgver=1.0.1
 pkgrel=1
 pkgdesc="lightweight HTTP server and IMAP/POP3 proxy server"
 arch=('i686' 'x86_64')
 depends=('pcre' 'zlib' 'openssl')
-url="http://nginx.net/"
+url="http://nginx.org"
 license=('custom')
 backup=("etc/nginx/conf/nginx.conf"
 	"etc/nginx/conf/koi-win"
@@ -27,7 +27,7 @@ backup=("etc/nginx/conf/nginx.conf"
 	"etc/logrotate.d/nginx")
 source=(http://sysoev.ru/nginx/nginx-${pkgver}.tar.gz
 	nginx)
-md5sums=('5751c920c266ea5bb5fc38af77e9c71c'
+md5sums=('4d4e70e3c6c907cb101c97e9cf9399c8'
          '837b010afcbdfe82d8e65ef00c4e14ba')
 
 build() {
diff --git a/community/pantomime/PKGBUILD b/community/pantomime/PKGBUILD
index 2d0156179..1d3654d74 100644
--- a/community/pantomime/PKGBUILD
+++ b/community/pantomime/PKGBUILD
@@ -1,10 +1,11 @@
-# $Id: PKGBUILD 14370 2010-04-03 00:07:53Z foutrelis $
+# $Id: PKGBUILD 46068 2011-05-03 10:04:36Z spupykin $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
 # Contributor: Sebastian Sareyko <public@nooms.de>
 
 pkgname=pantomime
 pkgver=1.2.0pre3
-pkgrel=2
+pkgrel=3
 pkgdesc="A set of Objective-C classes that model a mail system"
 arch=('i686' 'x86_64')
 url="http://www.collaboration-world.com/pantomime"
@@ -12,17 +13,20 @@ license=("LGPL" "custom")
 depends=('gnustep-back' 'openssl')
 makedepends=('gnustep-make' 'gnustep-base' 'gcc-objc')
 options=('!makeflags')
-source=(http://www.collaboration-world.com/cgi-bin/project/download.cgi/Pantomime-$pkgver.tar.gz?rid=104)
-md5sums=('b88f4634ec1f3a1ea1d5551ee10d9db7')
+source=("Pantomime-$pkgver.tar.gz::http://www.collaboration-world.com/cgi-bin/project/download.cgi/Pantomime-$pkgver.tar.gz?rid=104"
+	build-fix.patch)
+md5sums=('b88f4634ec1f3a1ea1d5551ee10d9db7'
+         '53dc4960f4c2b50274ca01b2f29567d0')
 
 build() {
+  cd $srcdir/Pantomime
   source /etc/profile.d/GNUstep.sh
-  cd $startdir/src
-  mv Pantomime-$pkgver.tar.gz?rid=104 Pantomime-$pkgver.tar.gz
-  tar xfz Pantomime-$pkgver.tar.gz
-  cd $startdir/src/Pantomime
+  patch -p1 <$srcdir/build-fix.patch
+  make
+}
 
-  make || return 1
-  make GNUSTEP_INSTALLATION_DIR=$startdir/pkg/opt/GNUstep/System install || return 1
-  install -D -m644 Documentation/LICENSE.elm $startdir/pkg/usr/share/licenses/$pkgname/LICENSE.elm
-} 
+package() {
+  cd $srcdir/Pantomime
+  make GNUSTEP_INSTALLATION_DIR=$pkgdir/opt/GNUstep/System install
+  install -D -m644 Documentation/LICENSE.elm $pkgdir/usr/share/licenses/$pkgname/LICENSE.elm
+}
diff --git a/community/pantomime/build-fix.patch b/community/pantomime/build-fix.patch
new file mode 100644
index 000000000..5696024b4
--- /dev/null
+++ b/community/pantomime/build-fix.patch
@@ -0,0 +1,12 @@
+diff -wbBur Pantomime/Framework/Pantomime/NSString+Extensions.m Pantomime.my/Framework/Pantomime/NSString+Extensions.m
+--- Pantomime/Framework/Pantomime/NSString+Extensions.m	2006-09-04 20:04:02.000000000 +0000
++++ Pantomime.my/Framework/Pantomime/NSString+Extensions.m	2011-05-03 09:49:54.000000000 +0000
+@@ -41,7 +41,7 @@
+ #include <CoreFoundation/CFString.h>
+ #include <CoreFoundation/CFStringEncodingExt.h>
+ #else
+-#include <GNUstepBase/GSCategories.h>
++//#include <GNUstepBase/GSCategories.h>
+ #endif
+ 
+ #include <ctype.h>
diff --git a/community/rawstudio/PKGBUILD b/community/rawstudio/PKGBUILD
index 7164c77d2..665c93bc7 100644
--- a/community/rawstudio/PKGBUILD
+++ b/community/rawstudio/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 44889 2011-04-12 12:28:53Z spupykin $
+# $Id: PKGBUILD 46083 2011-05-03 10:24:47Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
 # Contributor: Roman Kyrylych <roman@archlinux.org>
@@ -6,13 +6,13 @@
 
 pkgname=rawstudio
 pkgver=2.0
-pkgrel=1
+pkgrel=2
 pkgdesc="An open source raw-image converter written in GTK+"
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://rawstudio.org/"
 depends=('exiv2' 'libgphoto2' 'flickcurl' 'libjpeg' 'fftw' 'gconf' 'lensfun'
-	 'raptor' 'lcms')
+	 'raptor1' 'lcms' 'gtk2')
 install=${pkgname}.install
 options=('!libtool')
 source=(http://rawstudio.org/files/release/${pkgname}-${pkgver}.tar.gz)
diff --git a/community/springlobby/PKGBUILD b/community/springlobby/PKGBUILD
index ef391ad45..a3c160b88 100644
--- a/community/springlobby/PKGBUILD
+++ b/community/springlobby/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 45554 2011-04-24 08:25:45Z svenstaro $
+# $Id: PKGBUILD 46111 2011-05-03 18:11:02Z svenstaro $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: DuGi <dugi@irc.pl>
 
 pkgname=springlobby
-pkgver=0.129
+pkgver=0.130
 pkgrel=1
 pkgdesc="A free cross-platform lobby client for the Spring RTS project."
 arch=('i686' 'x86_64')
@@ -15,7 +15,7 @@ makedepends=('boost' 'asio' 'cmake')
 source=(http://www.springlobby.info/tarballs/${pkgname}-${pkgver}.tar.bz2 
         springlobby.desktop
         springlobby.png)
-md5sums=('ff6573d21f6720f693312dca7fd31d5a'
+md5sums=('b876b3fd98c73db816ed0d677117d39a'
          '45f8b59d033931d02e734fe3bd7777dd'
          '1f388187539aeb0358b51995e26ed890')
 
diff --git a/community/synce-hal/PKGBUILD b/community/synce-hal/PKGBUILD
new file mode 100644
index 000000000..4b1e4849f
--- /dev/null
+++ b/community/synce-hal/PKGBUILD
@@ -0,0 +1,26 @@
+# $Id: PKGBUILD 46079 2011-05-03 10:20:22Z spupykin $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Contributor: ansgras <ataflinski@uni-koblenz.de>
+
+pkgname=synce-hal
+pkgver=0.15
+pkgrel=1
+pkgdesc="hal based alternative for SynCE dccm"
+arch=('i686' 'x86_64')
+url="http://synce.sourceforge.net/"
+license=('GPL')
+depends=('synce-libsynce' 'gnet' 'dhclient' 'hal' 'dbus')
+source=(http://switch.dl.sf.net/sourceforge/synce/synce-hal-$pkgver.tar.gz)
+md5sums=('796eca27a2ce561247e7a71375c242b6')
+
+build() {
+  cd $srcdir/$pkgname-$pkgver
+  ./configure --prefix=/usr --libexecdir=/usr/lib/$pkgname \
+	 --with-hal-addon-dir=/usr/lib/hal/scripts
+  make
+}
+
+package() {
+  cd $srcdir/$pkgname-$pkgver
+  make DESTDIR="$pkgdir/" install
+}
diff --git a/community/synce-libsynce/PKGBUILD b/community/synce-libsynce/PKGBUILD
index 7e9aba5de..d0fb0be38 100644
--- a/community/synce-libsynce/PKGBUILD
+++ b/community/synce-libsynce/PKGBUILD
@@ -1,21 +1,26 @@
-# $Id: PKGBUILD 43060 2011-03-23 21:47:47Z spupykin $
+# $Id: PKGBUILD 46029 2011-05-02 10:37:25Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Zhukov Pavel <gelios@gmail.com>
 
 pkgname=synce-libsynce
 pkgver=0.15.1
-pkgrel=1
+pkgrel=2
 pkgdesc="provide a means of communication with a Windows CE device - libraries"
 arch=('i686' 'x86_64')
 url="http://synce.sourceforge.net/"
 license=('GPL')
-depends=('glibc' 'hal')
+depends=('dbus-glib')
+options=('!libtool')
 source=(http://downloads.sourceforge.net/sourceforge/synce/libsynce-$pkgver.tar.gz)
 md5sums=('eaddc88c5f0027e89c6f0fffec34def2')
 
 build() {
   cd $srcdir/libsynce-$pkgver
-  ./configure --prefix=/usr
+  ./configure --prefix=/usr --enable-odccm-support --enable-udev-support --disable-hal-support
   make
+}
+
+package() {
+  cd $srcdir/libsynce-$pkgver
   make DESTDIR=$pkgdir install
 }
diff --git a/community/xulrunner-oss/PKGBUILD b/community/xulrunner-oss/PKGBUILD
index b36ba73e9..924c875c9 100644
--- a/community/xulrunner-oss/PKGBUILD
+++ b/community/xulrunner-oss/PKGBUILD
@@ -2,9 +2,9 @@
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Alexander Baldeck <alexander@archlinux.org>
 pkgname=xulrunner-oss
-pkgver=2.0
-_ffoxver=4.0
-pkgrel=2
+pkgver=2.0.1
+_ffoxver=4.0.1
+pkgrel=1
 pkgdesc="Mozilla Runtime Environment compiled with OSS support"
 arch=('i686' 'x86_64')
 license=('MPL' 'GPL' 'LGPL')
@@ -21,13 +21,14 @@ source=(http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${_ffoxver}
 options=('!emptydirs')
 conflicts=('xulrunner')
 provides=("xulrunner=${pkgver}")
-md5sums=('3468a2c463b4fc2788ba621e4b511c30'
+md5sums=('9abda7d23151e97913c8555a64c13f34'
          '2358a2ddd35bcdd62ff42442dfe548d9'
          '639ea80e823543dd415b90c0ee804186'
          'a0236f6c3e55f60b7888d8cf137ff209'
-         'dea8c2a57a588bf5f6198ce7b4155655'
+         '0bf82bc6677e3ce57fd20a147fe8d7b1'
          '42f83468b296452fb754a81a4317ca64'
-	 '81032ce49c2a5ac15d62155bcc42d3ed')
+         '81032ce49c2a5ac15d62155bcc42d3ed')
+
 build() {
   cd "${srcdir}/mozilla-2.0"
   cp "${srcdir}/mozconfig" .mozconfig
@@ -39,7 +40,7 @@ build() {
   patch -Np1 -i "${srcdir}/xulrunner-version.patch"
 
   patch -Np1 -i "${srcdir}/xulrunner-omnijar.patch"
-  
+
   patch -Np1 -i "${srcdir}/port_gnomevfs_to_gio.patch"
 
   patch -Np0 -i "${srcdir}/oss.patch"
@@ -49,6 +50,7 @@ build() {
 
   unset CFLAGS
   unset CXXFLAGS
+  export CXXFLAGS="-fpermissive"
 
   make -j1 -f client.mk build MOZ_MAKE_FLAGS="$MAKEFLAGS"
 }
diff --git a/community/xulrunner-oss/xulrunner-omnijar.patch b/community/xulrunner-oss/xulrunner-omnijar.patch
index 05b665afd..66ec5206c 100644
--- a/community/xulrunner-oss/xulrunner-omnijar.patch
+++ b/community/xulrunner-oss/xulrunner-omnijar.patch
@@ -468,11 +468,11 @@ diff --git a/js/src/xpconnect/loader/mozJSComponentLoader.cpp b/js/src/xpconnect
 diff --git a/modules/libjar/nsJAR.cpp b/modules/libjar/nsJAR.cpp
 --- a/modules/libjar/nsJAR.cpp
 +++ b/modules/libjar/nsJAR.cpp
-@@ -170,26 +170,23 @@ nsJAR::Open(nsIFile* zipFile)
-   NS_ENSURE_ARG_POINTER(zipFile);
+@@ -171,26 +171,23 @@ nsJAR::Open(nsIFile* zipFile)
    if (mLock) return NS_ERROR_FAILURE; // Already open!
  
    mZipFile = zipFile;
+   mOuterZipEntry.Truncate();
  
    mLock = PR_NewLock();
    NS_ENSURE_TRUE(mLock, NS_ERROR_OUT_OF_MEMORY);
@@ -499,13 +499,13 @@ diff --git a/modules/libjar/nsJAR.cpp b/modules/libjar/nsJAR.cpp
    NS_ENSURE_ARG_POINTER(aZipReader);
    NS_ENSURE_ARG_POINTER(aZipEntry);
 @@ -234,23 +231,22 @@ nsJAR::Close()
+     mLock = nsnull;
    }
  
    mParsedManifest = PR_FALSE;
    mManifestData.Reset();
    mGlobalStatus = JAR_MANIFEST_NOT_PARSED;
    mTotalItemsInManifest = 0;
-   mOuterZipEntry.Truncate(0);
  
 -#ifdef MOZ_OMNIJAR
 -  if (mZip == mozilla::OmnijarReader()) {
diff --git a/core/binutils/PKGBUILD b/core/binutils/PKGBUILD
index fa5a47b64..40416653c 100644
--- a/core/binutils/PKGBUILD
+++ b/core/binutils/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 116976 2011-03-27 06:07:38Z allan $
+# $Id: PKGBUILD 121290 2011-04-30 08:22:29Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 
 # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc
 
 pkgname=binutils
 pkgver=2.21
-pkgrel=6
-_date=20110326
+pkgrel=7
+_date=20110430
 pkgdesc="A set of programs to assemble and manipulate binary and object files"
 arch=('i686' 'x86_64')
 url="http://www.gnu.org/software/binutils/"
@@ -17,7 +17,7 @@ makedepends=('dejagnu')
 options=('!libtool' '!distcc' '!ccache')
 install=binutils.install
 source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}_${_date}.tar.bz2)
-md5sums=('884dcbc87d4722b152aea72312356da1')
+md5sums=('7b3e28fb35cb8bb371cc47291e1c6dec')
 
 mksource() {
   mkdir ${pkgname}-${_date}
diff --git a/core/coreutils/PKGBUILD b/core/coreutils/PKGBUILD
index 78b74c33f..e63b4f02f 100644
--- a/core/coreutils/PKGBUILD
+++ b/core/coreutils/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 119714 2011-04-14 01:48:09Z allan $
+# $Id: PKGBUILD 120920 2011-04-27 11:05:23Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 
 pkgname=coreutils
-pkgver=8.11
+pkgver=8.12
 pkgrel=1
 pkgdesc="The basic file, shell and text manipulation utilities of the GNU operating system"
 arch=('i686' 'x86_64')
@@ -19,7 +19,7 @@ source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz
 	coreutils-uname.patch
 	coreutils-pam.patch
 	su.pam)
-md5sums=('b623ee9b1b768a14e40dfd35ff446f4c'
+md5sums=('0f7d43c2d2e24314b43a6c6267e25b90'
          'c4fcca138b6abf6d443d48a6f0cd8833'
          'aad79a2aa6d566c375d7bdd1b0767278'
          'fa85e5cce5d723275b14365ba71a8aad')
diff --git a/core/gcc/PKGBUILD b/core/gcc/PKGBUILD
index 61f6fbcb5..939c84053 100644
--- a/core/gcc/PKGBUILD
+++ b/core/gcc/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 119862 2011-04-16 05:35:51Z allan $
+# $Id: PKGBUILD 121304 2011-04-30 13:23:58Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 
 # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc
@@ -6,8 +6,8 @@
 
 pkgname=('gcc' 'gcc-libs' 'gcc-fortran' 'gcc-objc' 'gcc-ada' 'gcc-go')
 pkgver=4.6.0
-pkgrel=3
-_snapshot=4.6-20110415
+pkgrel=4
+_snapshot=4.6-20110429
 _libstdcppmanver=20110201		# Note: check source directory name when updating this
 pkgdesc="The GNU Compiler Collection"
 arch=('i686' 'x86_64')
@@ -20,13 +20,13 @@ source=(#ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-{core,g++,fortran,
 	ftp://gcc.gnu.org/pub/gcc/libstdc++/doxygen/libstdc++-api.${_libstdcppmanver}.man.tar.bz2
 	gcc_pure64.patch
 	gcc-hash-style-both.patch)
-md5sums=('aed037654091d1f478dfcb6e13444325'
-         '8d4b78c03c1d477c6cb562d42f461958'
-         'c346e76014569b25e2869ff986d2ac2d'
-         '8376485de1c7aa90bb32f52f2372d451'
-         '0c2d89f9e2e614ad84c6e2aa239c5c1c'
-         '50bab6a0c9e5403ea77f57361dec5436'
-         '6e0032461f87ce60db6302ca652ae9d8'
+md5sums=('fa586a5634ae3b462c5fb2d55160b14f'
+         '2591b1fad977f7bd6136c9ac1298ef04'
+         '366f93c1867f35c8860b42965efde955'
+         '21779792ef7e0ed7abef611160b0099c'
+         'cf518c56b968925a2eca3aa2b4cdbd7b'
+         'f66ef8597b99961eda7573df505ea354'
+         '3d89dd233ceb6a837d14ee6b940a43ed'
          '1e9fd2eaf0ee47ea64e82c48998f1999'
          '4030ee1c08dd1e843c0225b772360e76'
          '4df25b623799b148a0703eaeec8fdf3f')
diff --git a/core/libgcrypt/PKGBUILD b/core/libgcrypt/PKGBUILD
index c55847667..2ccdf36fd 100644
--- a/core/libgcrypt/PKGBUILD
+++ b/core/libgcrypt/PKGBUILD
@@ -1,15 +1,16 @@
-# $Id: PKGBUILD 117849 2011-04-04 18:49:54Z andyrtr $
+# $Id: PKGBUILD 121250 2011-04-29 21:23:37Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgname=libgcrypt
 pkgver=1.4.6
-pkgrel=2
+pkgrel=3
 pkgdesc="a general purpose crypto library based on the code used"
 arch=(i686 x86_64)
 url="http://www.gnupg.org"
 license=('LGPL')
 depends=('libgpg-error>=1.9')
-options=(!libtool)
+options=('!libtool' '!emptydirs')
+install=$pkgname.install
 source=(ftp://ftp.gnupg.org/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2
 	#ftp://ftp.franken.de/pub/crypt/mirror/ftp.gnupg.org/gcrypt/libgcrypt/${pkgname}-${pkgver}.tar.bz2
 )
diff --git a/core/libtool/PKGBUILD b/core/libtool/PKGBUILD
index 1ce394098..44e629e1e 100644
--- a/core/libtool/PKGBUILD
+++ b/core/libtool/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 103285 2010-12-17 05:56:05Z allan $
+# $Id: PKGBUILD 116987 2011-03-27 06:40:02Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 
@@ -6,7 +6,7 @@
 
 pkgname=libtool
 pkgver=2.4
-pkgrel=2
+pkgrel=3
 pkgdesc="A generic library support script"
 arch=('i686' 'x86_64')
 url="http://www.gnu.org/software/libtool"
diff --git a/core/tzdata/PKGBUILD b/core/tzdata/PKGBUILD
index 631c3f3b5..b09c6c637 100644
--- a/core/tzdata/PKGBUILD
+++ b/core/tzdata/PKGBUILD
@@ -1,24 +1,24 @@
-# $Id: PKGBUILD 117841 2011-04-04 18:27:28Z andyrtr $
+# $Id: PKGBUILD 121182 2011-04-29 06:58:28Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgname=tzdata
-pkgver=2011e
+pkgver=2011g
 pkgrel=1
-_tzcode=2011e
-_tzdata=2011e
+_tzcode=2011g
+_tzdata=2011g
 pkgdesc="Sources for time zone and daylight saving time data"
 arch=('i686' 'x86_64')
 url="http://www.twinsun.com/tz/tz-link.htm"
 license=('GPL')
 depends=()
 makedepends=()
-optdepends=('sh: required by tzselect')
+optdepends=('bash: required by tzselect')
 options=('!emptydirs')
 source=(ftp://elsie.nci.nih.gov/pub/tzcode${_tzcode}.tar.gz \
         ftp://elsie.nci.nih.gov/pub/${pkgname}${_tzdata}.tar.gz \
         Makefile.patch)
-md5sums=('fbfc05dbf9ebcfe7c4bba18549870173'
-         '044a07072300a0ee72b046e5a9a4ec90'
+md5sums=('ecb564279b28c5b184421c525d997d6c'
+         'a068c27e7e426fdb12ab0c88506df20d'
          'a64ed97d1fc03c66ee8612c0d9f40507')
 
 build() {
@@ -32,6 +32,11 @@ build() {
   make
 }
 
+check() {
+  cd ${srcdir}
+  make check
+}
+
 package() {
   cd ${srcdir}
   make DESTDIR="${pkgdir}" install
diff --git a/core/xfsprogs/PKGBUILD b/core/xfsprogs/PKGBUILD
index 6f6cf6e16..962f08b0f 100644
--- a/core/xfsprogs/PKGBUILD
+++ b/core/xfsprogs/PKGBUILD
@@ -1,7 +1,7 @@
-# $Id: PKGBUILD 100477 2010-11-23 17:28:22Z tpowa $
+# $Id: PKGBUILD 118982 2011-04-09 21:14:21Z tpowa $
 # Maintainer: Paul Mattal <paul@archlinux.org>
 pkgname=xfsprogs
-pkgver=3.1.4
+pkgver=3.1.5
 pkgrel=1
 pkgdesc="XFS filesystem utilities"
 arch=('i686' 'x86_64')
@@ -12,6 +12,7 @@ depends=('util-linux-ng>=2.16')
 options=('!makeflags' '!libtool')
 # We mirror the sources as upstream tends to move them once a new release is out
 source=("ftp://ftp.archlinux.org/other/xfsprogs/${pkgname}-${pkgver}.tar.gz")
+md5sums=('b1db37749e2b4149a0dd178abff956be')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -26,4 +27,3 @@ package() {
   chown -R root $pkgdir
   chgrp -R root $pkgdir
 }
-md5sums=('74081975f148bcabcab26c4c3496ede9')
diff --git a/extra/a52dec/PKGBUILD b/extra/a52dec/PKGBUILD
index 8ab0cfeb4..a5743a79e 100644
--- a/extra/a52dec/PKGBUILD
+++ b/extra/a52dec/PKGBUILD
@@ -1,26 +1,32 @@
-# $Id: PKGBUILD 5600 2008-07-18 22:05:50Z jgc $
-# Maintainer: Thomas Baechler <thomas@archlinux.org>
-# contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
+# $Id: PKGBUILD 122062 2011-05-02 05:42:16Z andrea $
+# Maintainer:
+# Contributor: Thomas Baechler <thomas@archlinux.org>
+# Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
 
 pkgname=a52dec
 pkgver=0.7.4
-pkgrel=4
-pkgdesc="liba52 is a free library for decoding ATSC A/52 streams."
+pkgrel=5
+pkgdesc="A free library for decoding ATSC A/52 streams"
+url="http://liba52.sourceforge.net/"
 arch=('i686' 'x86_64')
 license=('GPL2')
 depends=('glibc')
 options=(!libtool)
-source=(http://liba52.sourceforge.net/files/${pkgname}-${pkgver}.tar.gz
-	a52dec-0.7.4-build.patch)
-url="http://liba52.sourceforge.net/"
-md5sums=('caa9f5bc44232dc8aeea773fea56be80' 'fa16f224a7dceb7613824380abef0052')
+source=("http://liba52.sourceforge.net/files/${pkgname}-${pkgver}.tar.gz"
+        'a52dec-0.7.4-build.patch')
+md5sums=('caa9f5bc44232dc8aeea773fea56be80'
+         'fa16f224a7dceb7613824380abef0052')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  patch -Np1 -i ${srcdir}/a52dec-0.7.4-build.patch || return 1
-  ./bootstrap || return 1
-  ./configure --prefix=/usr --enable-shared || return 1
-  make || return 1
-  make DESTDIR=${pkgdir} install || return 1
-  install -m644 liba52/a52_internal.h $startdir/pkg/usr/include/a52dec/ || return 1
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np1 -i "${srcdir}/a52dec-0.7.4-build.patch"
+  ./bootstrap
+  ./configure --prefix=/usr --enable-shared
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+  install -m644 liba52/a52_internal.h "${pkgdir}/usr/include/a52dec/"
 }
diff --git a/extra/aubio/PKGBUILD b/extra/aubio/PKGBUILD
index 4d9498afb..e172e1fe1 100644
--- a/extra/aubio/PKGBUILD
+++ b/extra/aubio/PKGBUILD
@@ -1,24 +1,27 @@
-# $Id: PKGBUILD 12257 2008-09-12 03:03:42Z eric $
+# $Id: PKGBUILD 122072 2011-05-02 05:51:30Z andrea $
 # Maintainer: Tobias Kieslich tobias [funnychar] archlinux org
-# AUR-Maintainer: Andrea Scarpino <bash.lnx@gmail.com>
 # Contributor: Peter Baldwin <bald_pete@hotmail.com>
 # Contributor: Shinlun Hsieh <yngwiexx@yahoo.com.tw>
 
 pkgname=aubio
 pkgver=0.3.2
-pkgrel=3
+pkgrel=4
 pkgdesc="A library for audio labelling"
 arch=('i686' 'x86_64')
-url="http://aubio.piem.org/"
+url="http://aubio.org/"
 license=('GPL')
-depends=('libsamplerate' 'fftw' 'jack-audio-connection-kit')
+depends=('libsamplerate' 'fftw' 'jack')
 options=('!libtool')
-source=(http://aubio.piem.org/pub/${pkgname}-${pkgver}.tar.gz)
+source=("http://aubio.org/pub/${pkgname}-${pkgver}.tar.gz")
 md5sums=('ffc3e5e4880fec67064f043252263a44')
 
 build() {
-  cd ${startdir}/src/${pkgname}-${pkgver}
+  cd "${srcdir}/${pkgname}-${pkgver}"
   ./configure --prefix=/usr
-  make || return 1
-  make DESTDIR=${startdir}/pkg install
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/automoc4/PKGBUILD b/extra/automoc4/PKGBUILD
index f62279efd..a6f7bc58d 100644
--- a/extra/automoc4/PKGBUILD
+++ b/extra/automoc4/PKGBUILD
@@ -1,28 +1,33 @@
-# $ Id: $
-# Maintainer: Pierre Schmitz <pierre@archlinux.de>
+# $Id: PKGBUILD 122082 2011-05-02 06:05:33Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+# Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=automoc4
 pkgver=0.9.88
-pkgrel=1
-pkgdesc="KDE automoc4"
+pkgrel=2
+pkgdesc="Automatic moc for Qt4"
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
 license=('custom')
-depends=('qt>=4.4')
+depends=('qt')
 makedepends=('pkgconfig' 'cmake')
-source=("ftp://ftp.archlinux.org/other/automoc4/automoc4-${pkgver}.tar.bz2")
-md5sums=('adffb45ea2b550f284b1e3455f525176')
+source=("http://download.kde.org/stable/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2"
+        'license.txt')
+md5sums=('91bf517cb940109180ecd07bc90c69ec'
+         '9014edbb7e2f02fe90b2db8707487bce')
 
 build() {
-	cd ${srcdir}
+	cd "${srcdir}"
 	mkdir build
 	cd build
 	cmake ../${pkgname}-${pkgver} \
 		-DCMAKE_BUILD_TYPE=Release \
 		-DCMAKE_INSTALL_PREFIX=/usr
 	make
-	make DESTDIR=$pkgdir install
+}
 
-	grep -A 21 '^    Copyright' ${srcdir}/${pkgname}-${pkgver}/kde4automoc.cpp > license.txt
-	install -D license.txt ${pkgdir}/usr/share/licenses/automoc4/license.txt
+package() {
+    cd "${srcdir}/build"
+	make DESTDIR="${pkgdir}" install
+	install -Dm644 "${srcdir}/license.txt" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
diff --git a/extra/automoc4/license.txt b/extra/automoc4/license.txt
new file mode 100644
index 000000000..f9db60340
--- /dev/null
+++ b/extra/automoc4/license.txt
@@ -0,0 +1,31 @@
+Upstream Authors: 
+
+	Mathias Kretz <kretz@kde.org>
+	Alexander Neundorff <neundorff@kde.org>
+
+Copyright: 
+
+	Copyright (c) 2007 Mathias Kretz <kretz@kde.org>
+
+License:
+
+    Redistribution and use in source and binary forms, with or without
+    modification, are permitted provided that the following conditions
+    are met:
+
+    1. Redistributions of source code must retain the above copyright
+       notice, this list of conditions and the following disclaimer.
+    2. Redistributions in binary form must reproduce the above copyright
+       notice, this list of conditions and the following disclaimer in the
+       documentation and/or other materials provided with the distribution.
+
+    THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+    IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+    OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+    IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+    INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+    NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+    DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+    THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+    (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+    THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/extra/banshee/PKGBUILD b/extra/banshee/PKGBUILD
index 77f7f6e86..84b0edcf2 100644
--- a/extra/banshee/PKGBUILD
+++ b/extra/banshee/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 119748 2011-04-14 13:27:14Z jgc $
+# $Id: PKGBUILD 122335 2011-05-03 22:31:33Z ibiru $
 # Contributor: György Balló <ballogy@freestart.hu>
 
 pkgname=banshee
-pkgver=2.0.0
-pkgrel=3
+pkgver=2.0.1
+pkgrel=1
 pkgdesc="Music management and playback for GNOME"
 arch=('i686' 'x86_64')
 url="http://banshee.fm/"
 license=('MIT')
-depends=('libxxf86vm' 'mono-addins' 'notify-sharp-svn' 'boo' 'libwebkit' 'gdata-sharp' 'gtk-sharp-beans' 'gudev-sharp' 'gkeyfile-sharp' 'taglib-sharp' 'libmtp' 'libgpod' 'mono-zeroconf' 'gstreamer0.10-base-plugins' 'desktop-file-utils' 'shared-mime-info' 'hicolor-icon-theme' 'xdg-utils' 'gconf-sharp')
+depends=('libxxf86vm' 'mono-addins' 'notify-sharp-svn' 'boo' 'libwebkit' 'gdata-sharp' 'gtk-sharp-beans' 'gudev-sharp' 'ipod-sharp' 'gkeyfile-sharp' 'taglib-sharp' 'libmtp' 'libgpod' 'mono-zeroconf' 'gstreamer0.10-base-plugins' 'desktop-file-utils' 'shared-mime-info' 'hicolor-icon-theme' 'xdg-utils' 'gconf-sharp')
 makedepends=('intltool' 'gnome-doc-utils')
 optdepends=('gstreamer0.10-good-plugins: Extra media codecs'
             'gstreamer0.10-ugly-plugins: Extra media codecs'
@@ -18,7 +18,7 @@ optdepends=('gstreamer0.10-good-plugins: Extra media codecs'
 options=('!libtool')
 install=$pkgname.install
 source=(http://download.banshee.fm/$pkgname/stable/$pkgver/$pkgname-$pkgver.tar.bz2)
-md5sums=('ecd129a3232bda507b98c90e6f9272cf')
+md5sums=('83d77447936eed84eba2123b341b62ea')
 
 build() {
   export MONO_SHARED_DIR="$srcdir/.wabi"
diff --git a/extra/cdparanoia/PKGBUILD b/extra/cdparanoia/PKGBUILD
index 870136f91..c51bd4ce0 100644
--- a/extra/cdparanoia/PKGBUILD
+++ b/extra/cdparanoia/PKGBUILD
@@ -1,23 +1,29 @@
-# $Id: PKGBUILD 53529 2009-10-02 03:47:22Z eric $
-# Maintainer: Alexander Fehr <pizzapunk gmail com>
+# $Id: PKGBUILD 122077 2011-05-02 05:53:24Z andrea $
+# Maintainer:
+# Contributor: Alexander Fehr <pizzapunk gmail com>
 
 pkgname=cdparanoia
 pkgver=10.2
-pkgrel=2
+pkgrel=3
 pkgdesc="Compact Disc Digital Audio extraction tool"
 arch=('i686' 'x86_64')
 url="http://www.xiph.org/paranoia/"
 license=('GPL')
 depends=('glibc')
 options=('!makeflags')
-source=(http://downloads.xiph.org/releases/cdparanoia/cdparanoia-III-$pkgver.src.tgz gcc.patch)
-md5sums=('b304bbe8ab63373924a744eac9ebc652' '12da14958d2b84c6719fe69890436445')
-sha1sums=('1901e20d3a370ca6afa4c76a9ef30d3f03044320' '67faaf0e3eed2e3de6f66d8168604bc6c7295921')
+source=("http://downloads.xiph.org/releases/cdparanoia/cdparanoia-III-$pkgver.src.tgz"
+        'gcc.patch')
+md5sums=('b304bbe8ab63373924a744eac9ebc652'
+         '12da14958d2b84c6719fe69890436445')
 
 build() {
-  cd "$srcdir/cdparanoia-III-$pkgver"
-  patch -p0 -i ${srcdir}/gcc.patch || return 1
-  ./configure --prefix=/usr --mandir=/usr/share/man || return 1
-  make || return 1
-  make prefix="$pkgdir/usr" MANDIR="$pkgdir/usr/share/man" install || return 1
+  cd "${srcdir}/${pkgname}-III-${pkgver}"
+  patch -p0 -i ${srcdir}/gcc.patch
+  ./configure --prefix=/usr --mandir=/usr/share/man
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-III-${pkgver}"
+  make prefix="${pkgdir}/usr" MANDIR="${pkgdir}/usr/share/man" install
 }
diff --git a/extra/eject/PKGBUILD b/extra/eject/PKGBUILD
index a10bdcab4..b03fd577d 100644
--- a/extra/eject/PKGBUILD
+++ b/extra/eject/PKGBUILD
@@ -1,24 +1,29 @@
-# $Id: PKGBUILD 84697 2010-07-03 16:22:38Z ibiru $
-# Maintainer: dorphell <dorphell@archlinux.org>
+# $Id: PKGBUILD 122087 2011-05-02 06:23:02Z andrea $
+# Maintainer:
+# Contributor: dorphell <dorphell@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=eject
 pkgver=2.1.5
-pkgrel=4
-pkgdesc="Eject is a program for ejecting removable media under software control"
+pkgrel=5
+pkgdesc="A program for ejecting removable media under software control"
 arch=('i686' 'x86_64')
-url="http://ca.geocities.com/jefftranter@rogers.com/eject.html"
+url="http://eject.sourceforge.net/"
 license=('GPL')
 depends=('glibc')
-source=(ftp://mirrors.kernel.org/slackware/slackware-13.1/source/a/$pkgname/$pkgname-$pkgver.tar.bz2 
-        eject-2.1.5-handle-spaces.patch)
+source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
+        'eject-2.1.5-handle-spaces.patch')
 md5sums=('5a6cab2184ae4ed21128054d931d558f'
          '595b97c3bd56fd41e3b01b07885f81dc')
 
 build() {
-  cd $srcdir/$pkgname
-  patch -Np0 -i ../eject-2.1.5-handle-spaces.patch || return 1
-  ./configure --prefix=/usr --mandir=/usr/share/man || return 1
-  make || return 1
-  make DESTDIR=$pkgdir install || return 1
+  cd "${srcdir}/${pkgname}"
+  patch -Np0 -i "${srcdir}/eject-2.1.5-handle-spaces.patch"
+  ./configure --prefix=/usr --mandir=/usr/share/man
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}"
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/ekiga/PKGBUILD b/extra/ekiga/PKGBUILD
index 5bc0f6c4e..1b9b69283 100644
--- a/extra/ekiga/PKGBUILD
+++ b/extra/ekiga/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 112176 2011-03-04 10:45:51Z heftig $
+# $Id: PKGBUILD 122127 2011-05-02 09:20:52Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Tom K <tomk@runbox.com>
 
 pkgname=ekiga
 pkgver=3.3.0
-pkgrel=2
+pkgrel=3
 pkgdesc="VOIP/Videoconferencing app with full SIP and H.323 support (GnomeMeeting expanded and renamed)"
 url="http://www.ekiga.org"
 license=(GPL)
 arch=(i686 x86_64)
-depends=('opal' 'boost-libs' 'libxv' 'libnotify' 'hicolor-icon-theme' 'avahi' 'gtk2')
+depends=('opal' 'boost-libs' 'libxv' 'libnotify' 'hicolor-icon-theme' 'avahi' 'gtk2' 'gconf')
 makedepends=('intltool' 'gnome-doc-utils' 'evolution-data-server' 'boost')
 optdepends=('evolution-data-server: Evolution integration')
 provides=('gnomemeeting')
diff --git a/extra/epiphany/PKGBUILD b/extra/epiphany/PKGBUILD
index 1ad8e9631..2e32d5ea8 100644
--- a/extra/epiphany/PKGBUILD
+++ b/extra/epiphany/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 117992 2011-04-05 06:37:18Z heftig $
+# $Id: PKGBUILD 122054 2011-05-02 05:12:37Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=epiphany
-pkgver=3.0.0
+pkgver=3.0.2
 pkgrel=1
 install=epiphany.install
 pkgdesc="A GNOME3 web browser based on the WebKit rendering engine."
@@ -16,7 +16,7 @@ options=('!libtool' '!emptydirs')
 groups=('gnome')
 url="http://www.gnome.org/projects/epiphany/"
 source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('9407220e21e95008b0c5b0a0383d1bdc56a932c40a4486ea4f996ba47eeae7bb')
+sha256sums=('befcc9b6061b2e5e9c78399423b09e27dc301dec55d96bf63590d543ce9bb805')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/gcin/PKGBUILD b/extra/gcin/PKGBUILD
index ad1a393fd..79f3bae6f 100644
--- a/extra/gcin/PKGBUILD
+++ b/extra/gcin/PKGBUILD
@@ -1,19 +1,21 @@
-# $Id: PKGBUILD 121293 2011-04-30 12:04:42Z bisson $
+# $Id: PKGBUILD 122190 2011-05-02 18:01:07Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: damir <damir@archlinux.org>
 
 pkgname=gcin
 pkgver=1.6.1
-pkgrel=1
+pkgrel=2
 pkgdesc='Input method server supporting various input methods'
 arch=('i686' 'x86_64')
 license=('LGPL')
-url='http://www.csie.nctu.edu.tw/~cp76/gcin/'
+url='http://cle.linux.org.tw/gcin/download/'
 depends=('gtk2' 'libxtst')
-makedepends=('anthy' 'qt')
-optdepends=('qt: support for qt4 input method')
-source=("${url}download/${pkgname}-${pkgver}.tar.bz2"
+makedepends=('qt' 'gtk3' 'anthy')
+optdepends=('qt: support for qt4 input method'
+            'gtk3: support for gtk3 input method'
+            'anthy: support for anthy input method')
+source=("${url}${pkgname}-${pkgver}.tar.bz2"
         'fix_x86_64_libdir.patch'
         'fix_qt4_paths.patch')
 sha1sums=('acbfffbaf7eccd32ef251493e8c03dd126023b51'
@@ -26,6 +28,8 @@ build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
 	patch -p1 -i ../fix_x86_64_libdir.patch
 	patch -p1 -i ../fix_qt4_paths.patch
+	sed '/^GTK2IM=/c GTK2IM=gtk-2.0/2.10.0/immodules' -i gtk-im/Makefile
+	sed '/^GTK3IM=/c GTK3IM=gtk-3.0/3.0.0/immodules' -i gtk-im/Makefile # FS#24051
 	./configure --prefix=/usr --use_i18n=Y
 	make
 }
diff --git a/extra/gcin/install b/extra/gcin/install
index 1097ea400..c16d11b5e 100644
--- a/extra/gcin/install
+++ b/extra/gcin/install
@@ -1,13 +1,14 @@
 post_install() {
-  echo -n "updating gtk.immodules... "
-  /usr/bin/gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules
-  echo "done."
+	echo -n "updating gtk immodules... "
+	[ -x /usr/bin/gtk-query-immodules-2.0 ] && /usr/bin/gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules
+	[ -x /usr/bin/gtk-query-immodules-3.0 ] && /usr/bin/gtk-query-immodules-3.0 > /usr/lib/gtk-3.0/3.0.0/immodules.cache
+	echo "done."
 }
 
 post_upgrade() {
-  post_install
+	post_install
 }
 
 post_remove() {
-  post_install
+	post_install
 }
diff --git a/extra/gnome-python-desktop/PKGBUILD b/extra/gnome-python-desktop/PKGBUILD
index 8173d0d40..af4e15736 100644
--- a/extra/gnome-python-desktop/PKGBUILD
+++ b/extra/gnome-python-desktop/PKGBUILD
@@ -1,45 +1,34 @@
-# $Id: PKGBUILD 108483 2011-01-31 14:39:43Z jgc $
+# $Id: PKGBUILD 122148 2011-05-02 13:38:16Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Arjan Timmerman <arjan@soulfly.nl>
 # Contributor: Wael Nasreddine <gandalf@siemens-mobiles.org>
 
 pkgbase=gnome-python-desktop
-pkgname=('gnome-python-desktop' 'python-brasero' 'python-bugbuddy' 'python-evince' 'python-evolution' 'python-gnomeapplet' 'python-gnomedesktop' 'python-gnomekeyring' 'python-gtop' 'python-mediaprofiles' 'python-metacity' 'python-rsvg' 'python-totem-plparser' 'python-wnck' 'python-gtksourceview' 'python-gnomeprint')
+pkgname=('gnome-python-desktop' 'python-bugbuddy' 'python-evolution' 'python-gnomedesktop' 'python-gnomekeyring' 'python-gtop' 'python-metacity' 'python-rsvg' 'python-totem-plparser' 'python-wnck' 'python-gtksourceview' 'python-gnomeprint')
 pkgver=2.32.0
-pkgrel=4
+pkgrel=5
 arch=(i686 x86_64)
 license=('GPL' 'LGPL')
 options=('!libtool')
-makedepends=('intltool' 'pkg-config' 'gnome-media' 'gnome-panel-bonobo' 'gnome-python' 'gtksourceview' 'libgnomeprintui' 'libgtop' 'totem-plparser' 'evince' 'bug-buddy' 'brasero' 'gnome-desktop' 'metacity')
+makedepends=('intltool' 'pkg-config' 'gnome-python' 'gtksourceview' 'libgnomeprintui' 'libgtop' 'totem-plparser' 'bug-buddy' 'gnome-desktop2' 'metacity' 'librsvg')
 url="http://www.gnome.org"
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgbase}/2.32/${pkgbase}-${pkgver}.tar.bz2)
 sha256sums=('09dbd580bf3b0ef60f91b090eafe6d08ddcc50a609e2b425a7f8eca46d4e0ee9')
 
 build() {
   cd "${srcdir}/${pkgbase}-${pkgver}"
-  sed -i 's|evince-document-2.30|evince-document-2.32|g' configure
-  sed -i 's|evince-view-2.30|evince-view-2.32|g' configure
   PYTHON=/usr/bin/python2 ./configure --prefix=/usr --enable-metacity
   make
 }
 
 package_gnome-python-desktop() {
-  depends=('python-brasero' 'python-bugbuddy' 'python-evince' 'python-evolution' 'python-gnomeapplet' 'python-gnomedesktop' 'python-gnomekeyring' 'python-gtop' 'python-mediaprofiles' 'python-metacity' 'python-rsvg' 'python-totem-plparser' 'python-wnck' 'python-gtksourceview' 'python-gnomeprint' 'gnome-python')
+  depends=('python-bugbuddy' 'python-evolution' 'python-gnomedesktop' 'python-gnomekeyring' 'python-gtop' 'python-metacity' 'python-rsvg' 'python-totem-plparser' 'python-wnck' 'python-gtksourceview' 'python-gnomeprint' 'gnome-python')
   pkgdesc="Python bindings for the GNOME desktop environment"
 
   cd "${srcdir}/${pkgbase}-${pkgver}"
   make install-pkgconfigDATA DESTDIR="${pkgdir}"
 }
 
-package_python-brasero() {
-  depends=('pygtk' 'brasero')
-  pkgdesc="Python bindings for brasero"
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  make -C braseroburn install DESTDIR="${pkgdir}"
-  make -C braseromedia install DESTDIR="${pkgdir}"
-}
-
 package_python-bugbuddy() {
   depends=('pygtk' 'bug-buddy')
   pkgdesc="Python module for bug-buddy"
@@ -48,14 +37,6 @@ package_python-bugbuddy() {
   make install-pkgpyexecPYTHON DESTDIR="${pkgdir}"
 }
 
-package_python-evince() {
-  depends=('pygtk' 'evince')
-  pkgdesc="Python bindings for evince"
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  make -C evince install DESTDIR="${pkgdir}"
-}
-
 package_python-evolution() {
   depends=('pygtk' 'evolution-data-server' 'python2-bonobo')
   pkgdesc="Python bindings for evolution"
@@ -66,17 +47,9 @@ package_python-evolution() {
   install -m644 evolution/ecal.defs "${pkgdir}/usr/share/pygtk/2.0/defs/"
 }
 
-package_python-gnomeapplet() {
-  depends=('pygtk' 'libgnomeui' 'gnome-panel-bonobo' 'python2-bonobo')
-  pkgdesc="Python bindings for gnome-panel"
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  make -C gnomeapplet install DESTDIR="${pkgdir}"
-}
-
 package_python-gnomedesktop() {
-  depends=('pygtk' 'gnome-desktop' 'python2-gnomevfs')
-  pkgdesc="Python bindings for gnome-desktop"
+  depends=('pygtk' 'gnome-desktop2' 'python2-gnomevfs')
+  pkgdesc="Python bindings for gnome-desktop 2.x"
 
   cd "${srcdir}/${pkgbase}-${pkgver}"
   make -C gnomedesktop install DESTDIR="${pkgdir}"
@@ -98,14 +71,6 @@ package_python-gtop() {
   make -C gtop install DESTDIR="${pkgdir}"
 }
 
-package_python-mediaprofiles() {
-  depends=('pygtk' 'gnome-media')
-  pkgdesc="Python bindings for gnome-media"
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  make -C mediaprofiles install DESTDIR="${pkgdir}"
-}
-
 package_python-metacity() {
   depends=('pygtk' 'metacity')
   pkgdesc="Python bindings for metacity"
diff --git a/extra/gnuchess/PKGBUILD b/extra/gnuchess/PKGBUILD
index d24bc17cf..dedeaddb7 100644
--- a/extra/gnuchess/PKGBUILD
+++ b/extra/gnuchess/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 108753 2011-02-02 19:55:44Z jgc $
+# $Id: PKGBUILD 122210 2011-05-03 05:16:02Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=gnuchess
-pkgver=5.08
+pkgver=6.0.0
 pkgrel=1
 pkgdesc="Lets most modern computers play a full game of chess"
 url="http://www.gnu.org/software/chess/chess.html"
@@ -11,7 +11,7 @@ arch=('i686' 'x86_64')
 license=('GPL')
 depends=('glibc' 'ncurses' 'readline')
 source=(ftp://ftp.gnu.org/pub/gnu/chess/$pkgname-$pkgver.tar.gz)
-md5sums=('9db91dbac6b5b86de0c57a420a9fea57')
+md5sums=('1a7a46188dab76f4339d22ff47c31515')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
diff --git a/extra/gv/PKGBUILD b/extra/gv/PKGBUILD
index edf76955e..028bacf99 100644
--- a/extra/gv/PKGBUILD
+++ b/extra/gv/PKGBUILD
@@ -1,24 +1,25 @@
-# $Id: PKGBUILD 103001 2010-12-13 22:11:14Z eric $
-# Maintainer: Eric Belanger <eric@archlinux.org>
+# $Id: PKGBUILD 122132 2011-05-02 09:38:25Z eric $
+# Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=gv
-pkgver=3.7.1
-pkgrel=2
+pkgver=3.7.2
+pkgrel=1
 pkgdesc="A program to view PostScript and PDF documents"
 arch=('i686' 'x86_64')
 url="http://www.gnu.org/software/gv/"
 license=('GPL')
-depends=('xaw3d' 'ghostscript')
+depends=('xaw3d' 'ghostscript' 'desktop-file-utils')
 install=gv.install
-source=(http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz gv.desktop gv.png aplinedel.patch)
-md5sums=('bf4823d00d8e431f97dbcb7dd87c46ac' 'cf04652952f2d0903bc7578b4826f50c'\
-         'ab0e3879dbe39e59ad1c923020c28a86' '8a57a5d50a0d68dc1d98108e9665bd2d')
-sha1sums=('05fcf76f29de77e67379bae7e9ca1c8a26bbf6e1' 'c8230fe08ee6d22525678a97832f44941237d174'\
-         '35b9168e526527001b1b5b8ee34a5b69d9369590' 'e6358e74ec2641730b44443a49df36322df2bdd8')
+source=(http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz gv.desktop gv.png)
+md5sums=('eb47d465755b7291870af66431c6f2e1'
+         'cf04652952f2d0903bc7578b4826f50c'
+         'ab0e3879dbe39e59ad1c923020c28a86')
+sha1sums=('d9573e17f5d88d150fccb257ce205dbceab83e8a'
+          'c8230fe08ee6d22525678a97832f44941237d174'
+          '35b9168e526527001b1b5b8ee34a5b69d9369590')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -p1 < ../aplinedel.patch
   sed -i -e "s:-dGraphicsAlphaBits=2:\0 -dAlignToPixels=0:" src/Makefile.{am,in}
   ./configure --prefix=/usr
   make
diff --git a/extra/gv/gv.install b/extra/gv/gv.install
index dd0e8c9c6..0c048cd5b 100644
--- a/extra/gv/gv.install
+++ b/extra/gv/gv.install
@@ -1,7 +1,8 @@
-infodir=/usr/share/info
+infodir=usr/share/info
 file=gv.info.gz
 
 post_install() {
+  update-desktop-database -q
   [ -x usr/bin/install-info ] || return 0
     install-info $infodir/$file $infodir/dir 2> /dev/null
 }
@@ -11,6 +12,7 @@ post_upgrade() {
 }
 
 pre_remove() {
+  update-desktop-database -q
   [ -x usr/bin/install-info ] || return 0
     install-info --delete $infodir/$file $infodir/dir 2> /dev/null
 }
diff --git a/extra/htdig/CVE-2007-6110.patch b/extra/htdig/CVE-2007-6110.patch
new file mode 100644
index 000000000..57b0e3b78
--- /dev/null
+++ b/extra/htdig/CVE-2007-6110.patch
@@ -0,0 +1,26 @@
+Index: htdig-3.2.0b6/htsearch/Display.cc
+===================================================================
+--- htdig-3.2.0b6.orig/htsearch/Display.cc
++++ htdig-3.2.0b6/htsearch/Display.cc
+@@ -137,7 +137,7 @@ Display::display(int pageNumber)
+       // Must temporarily stash the message in a String, since
+       // displaySyntaxError will overwrite the static temp used in form.
+ 
+-      String s(form("No such sort method: `%s'", (const char*)config->Find("sort")));
++      String s("invalid sort method");
+ 
+       displaySyntaxError(s);
+       return;
+Index: htdig-3.2.0b6/libhtdig/ResultFetch.cc
+===================================================================
+--- htdig-3.2.0b6.orig/libhtdig/ResultFetch.cc
++++ htdig-3.2.0b6/libhtdig/ResultFetch.cc
+@@ -142,7 +142,7 @@ ResultFetch::fetch()
+         // Must temporarily stash the message in a String, since
+         // displaySyntaxError will overwrite the static temp used in form.
+ 
+-        String s(form("No such sort method: `%s'", (const char *) config->Find("sort")));
++        String s("invalid sort method");
+ 
+         displaySyntaxError(s);
+         //return;
diff --git a/extra/htdig/PKGBUILD b/extra/htdig/PKGBUILD
index 6e6f12ab2..38418ee68 100644
--- a/extra/htdig/PKGBUILD
+++ b/extra/htdig/PKGBUILD
@@ -1,39 +1,45 @@
-# $Id: $
+# $Id: PKGBUILD 122102 2011-05-02 07:10:01Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 
 pkgname=htdig
 pkgver=3.2.0b6
-pkgrel=6
-pkgdesc="A complete world wide web indexing and searching system for a domain or intranet."
-url="http://www.htdig.org"
+pkgrel=7
+pkgdesc="Scripts and HTML code needed for using ht://Dig as a web search engine"
+url="http://www.htdig.org/"
 arch=('i686' 'x86_64')
 license=('GPL')
-depends=('gcc-libs' 'zlib' 'bash')
-options=('!libtool' '!emptydirs')
-source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2
-        gcc4.3.patch
-	quoting.patch)
+depends=('openssl')
+options=('!libtool' 'emptydirs')
+source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
+        'gcc4.3.patch'
+	    'CVE-2007-6110.patch')
 md5sums=('8b9b9587a411ac7dd278fa5413428960'
          '2aeda683f95b58efc0978d7fe951de59'
          '0d9099d3b5a32d322a8e0240f85a3578')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd "${srcdir}/${pkgname}-${pkgver}"
 
-  patch -p1 -i ${srcdir}/gcc4.3.patch
-  patch -p1 -i ${srcdir}/quoting.patch || return 1
+  patch -p1 -i "${srcdir}/gcc4.3.patch"
+  patch -p1 -i "${srcdir}/CVE-2007-6110.patch"
 
   ./configure --prefix=/usr \
-              --mandir=/usr/share/man \
-              --with-config-dir=/etc/htdig \
-              --with-default-config-file=/etc/htdig/htdig.conf \
-              --with-database-dir=/var/lib/htdig/db \
-              --with-cgi-bin-dir=/usr/bin \
-	      --with-common-dir=/usr/share/doc/htdig \
-	      --with-search-dir=/usr/share/doc/htdig \
-	      --with-image-dir=/usr/share/doc/htdig
-  make || return 1
-  make DESTDIR=${pkgdir} install
+    --mandir=/usr/share/man \
+    --with-config-dir=/etc/htdig \
+    --with-default-config-file=/etc/htdig/htdig.conf \
+    --with-database-dir=/var/lib/htdig/db \
+    --with-cgi-bin-dir=/usr/bin \
+	--with-common-dir=/usr/share/doc/htdig \
+	--with-search-dir=/usr/share/doc/htdig \
+	--with-image-dir=/usr/share/doc/htdig \
+    --localstatedir=/var/lib/htdig \
+    --with-ssl
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
 }
 
diff --git a/extra/kaffeine/PKGBUILD b/extra/kaffeine/PKGBUILD
index ff62d9b6e..84a710827 100644
--- a/extra/kaffeine/PKGBUILD
+++ b/extra/kaffeine/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 118974 2011-04-09 21:02:09Z tpowa $
+# $Id: PKGBUILD 122312 2011-05-03 18:56:11Z tpowa $
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=kaffeine
-pkgver=1.2.1
+pkgver=1.2.2
 pkgrel=1
 pkgdesc='KDE media player'
 license=('GPL')
@@ -21,6 +21,10 @@ build() {
 		-DCMAKE_SKIP_RPATH=ON \
 		-DCMAKE_INSTALL_PREFIX=/usr
 	make
+}
+
+package() {
+        cd $srcdir/build
 	make DESTDIR=$pkgdir install
 }
-md5sums=('e65a8558836f0aa0d173d76e51ad065f')
+md5sums=('690e48d2e5fe123887109aa9b1bc1c31')
diff --git a/extra/kdeplasma-applets-networkmanagement/PKGBUILD b/extra/kdeplasma-applets-networkmanagement/PKGBUILD
index fafc5730a..5fafa9e93 100644
--- a/extra/kdeplasma-applets-networkmanagement/PKGBUILD
+++ b/extra/kdeplasma-applets-networkmanagement/PKGBUILD
@@ -3,9 +3,9 @@
 # Contributor: Jakub Schmidtke <sjakub-at-gmail.com>
 
 pkgname=kdeplasma-applets-networkmanagement
-pkgver=git20110418
-_commit=545967db075ed65b0452def93e1c1588190cdc9a
-pkgrel=2
+pkgver=git20110502
+_commit=fdb4edbc91f60d358d202a694c4ab229c66f9f61
+pkgrel=1
 pkgdesc="KDE control panel and widget network connections"
 arch=('i686' 'x86_64')
 url="http://www.kde.org/"
@@ -15,7 +15,7 @@ makedepends=('cmake' 'python2' 'automoc4' 'mobile-broadband-provider-info')
 optdepends=('mobile-broadband-provider-info: allow to add new mobile connection')
 install=${pkgname}.install
 source=("${pkgname}-${pkgver}.tar.gz"::"http://quickgit.kde.org/?p=networkmanagement.git&a=snapshot&h=${_commit}")
-md5sums=('d7f50b4b6917d39c79332b868ad2d0cf')
+md5sums=('6ac9e04cb917a8ac875b2bffde4b5420')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kshutdown/PKGBUILD b/extra/kshutdown/PKGBUILD
index 0bd65cffc..f9d9a6322 100644
--- a/extra/kshutdown/PKGBUILD
+++ b/extra/kshutdown/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 110106 2011-02-16 13:52:25Z andrea $
+# $Id: PKGBUILD 122317 2011-05-03 18:58:40Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=kshutdown
-pkgver=2.0beta12
+pkgver=2.0
 pkgrel=1
 pkgdesc="Shutdown Utility for KDE"
 arch=(i686 x86_64)
@@ -27,4 +27,4 @@ package() {
     cd "${srcdir}/build"
 	make DESTDIR="${pkgdir}" install
 }
-md5sums=('392a345dab6fc4f6125007171bc8cb9c')
+md5sums=('af9d2bfda919e7712319e14e6ca89610')
diff --git a/extra/ktorrent/PKGBUILD b/extra/ktorrent/PKGBUILD
index b29506657..8acb3c064 100644
--- a/extra/ktorrent/PKGBUILD
+++ b/extra/ktorrent/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 115087 2011-03-16 19:19:11Z andrea $
+# $Id: PKGBUILD 122112 2011-05-02 07:25:24Z andrea $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Travis Willard <travisw@wmpub.ca>
 # Contributor: Georg Grabler <ggrabler@gmail.com>
 
 pkgname=ktorrent
-pkgver=4.1.0
+pkgver=4.1.1
 pkgrel=1
-pkgdesc="A BitTorrent program for KDE"
+pkgdesc="A powerful BitTorrent client for KDE"
 arch=('i686' 'x86_64')
 url="http://ktorrent.org"
 license=('GPL2')
@@ -16,16 +16,16 @@ source=("http://ktorrent.org/downloads/${pkgver}/${pkgname}-${pkgver}.tar.bz2"
         'httpserver.patch')
 install=${pkgname}.install
 options=('libtool')
-md5sums=('3981c00810217e88b9772438df31df08'
+md5sums=('affadf7c7198e5aa430e91ab75800296'
          '1f25b94615b0bbfa0457c99fb20de3e6')
 
 build() {
-	cd ${srcdir}/${pkgname}-${pkgver}
+	cd "${srcdir}/${pkgname}-${pkgver}"
 
 	# build time patch
-	patch -Np0 -i ${srcdir}/httpserver.patch
+	patch -p0 -i "${srcdir}/httpserver.patch"
 
-	cd ${srcdir}
+	cd "${srcdir}"
 	mkdir build
 	cd build
 	cmake ../${pkgname}-${pkgver} \
@@ -36,6 +36,6 @@ build() {
 }
 
 package() {
-	cd ${srcdir}/build
-	make DESTDIR=${pkgdir} install
+	cd "${srcdir}/build"
+	make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/libcanberra/PKGBUILD b/extra/libcanberra/PKGBUILD
index 95fc05a5d..93145cbcd 100644
--- a/extra/libcanberra/PKGBUILD
+++ b/extra/libcanberra/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 109949 2011-02-14 08:47:45Z ibiru $
+# $Id: PKGBUILD 122251 2011-05-03 10:40:20Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=libcanberra
 pkgname=(libcanberra libcanberra-pulse libcanberra-gstreamer)
-pkgver=0.26
-pkgrel=5
+pkgver=0.28
+pkgrel=1
 pkgdesc="A small and lightweight implementation of the XDG Sound Theme Specification"
 arch=(i686 x86_64)
 license=('LGPL')
@@ -13,17 +13,16 @@ makedepends=('gtk-doc' 'libpulse' 'gstreamer0.10' 'gtk2' 'gtk3')
 options=(!emptydirs)
 url=http://0pointer.de/lennart/projects/libcanberra
 source=(http://0pointer.de/lennart/projects/${pkgbase}/${pkgbase}-${pkgver}.tar.gz
-        libcanberra-gtk-module.sh libcanberra-quit-add.patch)
-md5sums=('ee2c66ada7c851a4e7b6eb1682285a24'
-         'a54799e624aac814b9343ab05f25c38b'
-         'a147bce8a7addcd40b21faaaf028819b')
+        libcanberra-gtk-module.sh)
+md5sums=('c198b4811598c4c161ff505e4531b02c'
+         '21141257a1be80f3bc329829ff13b314')
 
 build() {
   cd "${srcdir}/${pkgbase}-${pkgver}"
-  patch -Np1 -i "${srcdir}/libcanberra-quit-add.patch"
   ./configure --sysconfdir=/etc --prefix=/usr --localstatedir=/var \
       --disable-static --with-builtin=dso --enable-null --disable-oss \
-      --enable-alsa --enable-gstreamer --enable-pulse
+      --enable-alsa --enable-gstreamer --enable-pulse \
+      --with-systemdsystemunitdir=/lib/systemd/system
   make
 }
 
@@ -37,11 +36,11 @@ package_libcanberra() {
   rm -f "${pkgdir}"/usr/lib/libcanberra-gtk*.la
   rm -f "${pkgdir}"/usr/lib/gtk-{2,3}.0/modules/*.la
   
-  install -m755 -d "${pkgdir}/usr/share/gconf" 
+  install -d "${pkgdir}/usr/share/gconf" 
   mv "${pkgdir}/etc/gconf/schemas" "${pkgdir}/usr/share/gconf/"
 
-  install -m755 -d "${pkgdir}/etc/X11/xinit/xinitrc.d"
-  install -m755 "${srcdir}/libcanberra-gtk-module.sh" "${pkgdir}/etc/X11/xinit/xinitrc.d/40-libcanberra-gtk-module"
+  install -D "${srcdir}/libcanberra-gtk-module.sh" \
+    "${pkgdir}/etc/X11/xinit/xinitrc.d/40-libcanberra-gtk-module"
 
   # Split plugins
   for _p in pulse gstreamer; do
@@ -53,7 +52,6 @@ package_libcanberra() {
 package_libcanberra-pulse() {
   pkgdesc="PulseAudio plugin for libcanberra"
   depends=("$pkgbase=$pkgver-$pkgrel" 'libpulse')
-  groups=('pulseaudio-gnome')
 
   cd "${srcdir}/${pkgbase}-${pkgver}"
 
diff --git a/extra/libcanberra/libcanberra-gtk-module.sh b/extra/libcanberra/libcanberra-gtk-module.sh
index fbb7ff783..2ae6b7e17 100644
--- a/extra/libcanberra/libcanberra-gtk-module.sh
+++ b/extra/libcanberra/libcanberra-gtk-module.sh
@@ -1,10 +1,15 @@
 #!/bin/sh
 
-if [ -z "$GTK_MODULES" ] ; then
-	GTK_MODULES="canberra-gtk-module"
-else
-	GTK_MODULES="$GTK_MODULES:canberra-gtk-module"
-fi
-
-export GTK_MODULES
-
+case "$SESSION" in
+  GNOME)
+    # Done by gnome-settings-daemon
+    ;;
+  *)
+    if [ -z "$GTK_MODULES" ]; then
+      GTK_MODULES="canberra-gtk-module"
+    else
+      GTK_MODULES="$GTK_MODULES:canberra-gtk-module"
+    fi
+    export GTK_MODULES
+    ;;
+esac
diff --git a/extra/libdbusmenu-qt/PKGBUILD b/extra/libdbusmenu-qt/PKGBUILD
index 98dda1288..9f1126262 100644
--- a/extra/libdbusmenu-qt/PKGBUILD
+++ b/extra/libdbusmenu-qt/PKGBUILD
@@ -1,29 +1,30 @@
-# $Id: PKGBUILD 117011 2011-03-27 14:11:17Z andrea $
+# $Id: PKGBUILD 122259 2011-05-03 14:55:26Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=libdbusmenu-qt
-pkgver=0.8.1
+pkgver=0.8.2
 pkgrel=1
 pkgdesc="A library that provides a Qt implementation of the DBusMenu spec"
 arch=('i686' 'x86_64')
 url="https://launchpad.net/libdbusmenu-qt"
 license=('GPL')
 depends=('qt')
-makedepends=('cmake' 'doxygen')
+makedepends=('cmake')
 source=("http://launchpad.net/${pkgname}/trunk/${pkgver}/+download/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('495bf59b9fcc00e4260fd5acbb21b78b')
+md5sums=('88be2548e00acf988c66ed3a35844f64')
 
 build() {
-  cd ${srcdir}
+  cd "${srcdir}"
   mkdir build
   cd build
   cmake ../${pkgname}-${pkgver} \
     -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_BUILD_TYPE=Release
+    -DCMAKE_BUILD_TYPE=Release \
+    -DWITH_DOC=OFF
   make
 }
 
 package() {
-  cd ${srcdir}/build
-  make DESTDIR=${pkgdir} install
-} 
+  cd "${srcdir}/build"
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/extra/libktorrent/PKGBUILD b/extra/libktorrent/PKGBUILD
index b2da7c65e..c4c779b47 100644
--- a/extra/libktorrent/PKGBUILD
+++ b/extra/libktorrent/PKGBUILD
@@ -1,22 +1,22 @@
-# $Id: PKGBUILD 115082 2011-03-16 19:16:25Z andrea $
+# $Id: PKGBUILD 122107 2011-05-02 07:24:22Z andrea $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=libktorrent
-pkgver=1.1.0
+pkgver=1.1.1
 pkgrel=1
-pkgdesc="A BitTorrent library based on KDE Platform"
+pkgdesc="A BitTorrent protocol implementation"
 arch=('i686' 'x86_64')
 url="http://ktorrent.org"
 license=('GPL2')
 depends=('kdelibs')
 makedepends=('automoc4' 'cmake' 'boost')
-source=("http://ktorrent.org/downloads/4.1.0/${pkgname}-${pkgver}.tar.bz2")
+source=("http://ktorrent.org/downloads/4.1.1/${pkgname}-${pkgver}.tar.bz2")
 options=('libtool')
-md5sums=('76d3e58bbf2e4df7e97421e06ebf8fb8')
+md5sums=('96de8dd6d6cea4255ce946bb4cd69836')
 
 build() {
-  cd ${srcdir}
+  cd "${srcdir}"
   mkdir build
   cd build
   cmake ../${pkgname}-${pkgver} \
@@ -26,6 +26,6 @@ build() {
 }
 
 package() {
-  cd ${srcdir}/build
-  make DESTDIR=${pkgdir} install
+  cd "${srcdir}/build"
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/libofa/PKGBUILD b/extra/libofa/PKGBUILD
index c58f98794..97905a1ea 100644
--- a/extra/libofa/PKGBUILD
+++ b/extra/libofa/PKGBUILD
@@ -1,38 +1,38 @@
-# $Id: PKGBUILD 80563 2010-05-19 16:11:07Z andrea $
+# $Id: PKGBUILD 122092 2011-05-02 06:40:37Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=libofa
 pkgver=0.9.3
-pkgrel=2
-pkgdesc="Open Fingerprint Architecture"
-arch=(i686 x86_64)
+pkgrel=3
+pkgdesc="An open-source audio fingerprint by MusicIP"
+arch=('i686' 'x86_64')
 url="http://code.google.com/p/musicip-libofa/"
 license=('GPL2' 'custom')
 depends=('expat' 'curl' 'fftw' 'gcc-libs')
 makedepends=('pkgconfig')
 options=('!libtool')
 source=("http://musicip-libofa.googlecode.com/files/$pkgname-$pkgver.tar.gz"
-	'gcc-4.patch'
-	'gcc4.3.patch'
-	'gcc4.5.patch')
+	    'gcc-4.patch'
+	    'gcc4.3.patch'
+	    'gcc4.5.patch')
 sha1sums=('3dec8e1dcea937f74b4165e9ffd4d4f355e4594a'
           'cb19377d0634c03d2a49cfc61915cec918c341f7'
           'cae08bdc12de923d5e032696702a0530ae6eafc1'
-	  '754d69d66ab46219035ccafeeb3ff62433cca4f2')
+          '754d69d66ab46219035ccafeeb3ff62433cca4f2')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  patch -Np0 -i ${srcdir}/gcc-4.patch || return 1
-  patch -Np1 -i ${srcdir}/gcc4.3.patch || return 1
-  patch -Np1 -i ${srcdir}/gcc4.5.patch || return 1
-  ./configure --prefix=/usr || return 1
-  make || return 1
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -p0 -i ${srcdir}/gcc-4.patch
+  patch -p1 -i ${srcdir}/gcc4.3.patch
+  patch -p1 -i ${srcdir}/gcc4.5.patch
+  ./configure --prefix=/usr
+  make
 }
 
 package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install || return 1
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR=${pkgdir} install
 
-  install -D -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+  install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
diff --git a/extra/mercurial/PKGBUILD b/extra/mercurial/PKGBUILD
index e3e47f67b..e8f8f6e25 100644
--- a/extra/mercurial/PKGBUILD
+++ b/extra/mercurial/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 117449 2011-04-02 08:46:57Z giovanni $
+# $Id: PKGBUILD 122137 2011-05-02 10:27:04Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
 
 pkgname=mercurial
-pkgver=1.8.2
+pkgver=1.8.3
 pkgrel=1
 pkgdesc="A scalable distributed SCM tool"
 arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ depends=('python2')
 optdepends=('tk: for the hgk GUI')
 source=(http://www.selenic.com/mercurial/release/${pkgname}-${pkgver}.tar.gz
         mercurial.profile)
-md5sums=('a1634b9b709ecc70662f3257abece2c7'
+md5sums=('7afea936dfdb21220064cac6402f8743'
          '43e1d36564d4c7fbe9a091d3ea370a44')
 
 build() {
diff --git a/extra/mousetweaks/PKGBUILD b/extra/mousetweaks/PKGBUILD
index 7cf2301af..c8406a438 100644
--- a/extra/mousetweaks/PKGBUILD
+++ b/extra/mousetweaks/PKGBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=mousetweaks
-pkgver=3.0.0
+pkgver=3.0.1
 pkgrel=1
 pkgdesc="Mouse accessibility enhancements for the GNOME desktop"
 arch=(i686 x86_64)
@@ -14,7 +14,7 @@ options=('!libtool' '!emptydirs')
 url="http://www.gnome.org"
 install=mousetweaks.install
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('780c6349aa331635d15abc1f119d4f35de1534f1250e1921ec5f05efa098d242')
+sha256sums=('9e9d2d5b183857b75504cc48e017e5419cd754aed08aa5cf39c310583277d722')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/nautilus/PKGBUILD b/extra/nautilus/PKGBUILD
index 9ef12ad8e..086ad1392 100644
--- a/extra/nautilus/PKGBUILD
+++ b/extra/nautilus/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 121317 2011-04-30 15:08:05Z ibiru $
+# $Id: PKGBUILD 122052 2011-05-02 05:12:25Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=nautilus
-pkgver=3.0.1
-pkgrel=2
+pkgver=3.0.1.1
+pkgrel=1
 pkgdesc="The GNOME shell and file manager"
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -14,17 +14,11 @@ url="http://www.gnome.org"
 groups=('gnome')
 options=('!libtool' '!emptydirs')
 install=nautilus.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2
-        places-sidebar.patch  progress-ui-handler.patch)
-sha256sums=('f759d615c880caebf84290bc00c354488266bd7292479d88b8811a9c4f3106e8'
-            'ddf020bf8c5ede07fb737b37561d0e557b105c2b96dfa56d9a9f5110ecfbc041'
-            '5b6f911b1d3e0317c370c674bc52f6521bdd785647087863d33d3b60ddf00433')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*.*}/${pkgname}-${pkgver}.tar.bz2)
+sha256sums=('ba53b2b8a38bcd4d6a1860421de222dc5b6b9904cceed49b2d0d90e972ee7dd6')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  #fixed for 3.0.2
-  patch -Np1 -i "${srcdir}/places-sidebar.patch"
-  patch -Np1 -i "${srcdir}/progress-ui-handler.patch"
   ./configure --prefix=/usr --sysconfdir=/etc \
       --localstatedir=/var --disable-static \
       --libexecdir=/usr/lib/nautilus \
diff --git a/extra/openexr/PKGBUILD b/extra/openexr/PKGBUILD
index ada112251..3f4afa72e 100644
--- a/extra/openexr/PKGBUILD
+++ b/extra/openexr/PKGBUILD
@@ -1,23 +1,29 @@
-# $Id: PKGBUILD 17474 2008-10-30 16:25:54Z pierre $
+# $Id: PKGBUILD 122097 2011-05-02 06:42:28Z andrea $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=openexr
-pkgver=1.6.1
+pkgver=1.7.0
 pkgrel=1
+pkgdesc="An high dynamic-range image file format library"
+url="http://www.openexr.com/"
+arch=('i686' 'x86_64')
+license=('BSD')
 depends=('zlib' 'ilmbase')
-pkgdesc="openexr library for EXR images"
-arch=(i686 x86_64)
 options=('!libtool')
-license=('custom')
-source=("http://savannah.nongnu.org/download/$pkgname/$pkgname-$pkgver.tar.gz" 'gcc43.patch')
-url="http://www.openexr.org"
-md5sums=('11951f164f9c872b183df75e66de145a' '7c83ee3d69ad688142e7de63cb68e70a')
+source=("http://download.savannah.nongnu.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz"
+        'gcc43.patch')
+md5sums=('27113284f7d26a58f853c346e0851d7a'
+         'd91fae759053a70bcedcf02eb33ca4a2')
 
 build() {
-  cd $startdir/src/$pkgname-$pkgver
-  patch -p1 -i $srcdir/gcc43.patch || return 1
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -p0 -i ${srcdir}/gcc43.patch
   ./configure --prefix=/usr
-  make || return 1
-  make DESTDIR=$startdir/pkg install
-  install -D -m644 COPYING $pkgdir/usr/share/licenses/$pkgname/COPYING
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+  install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
diff --git a/extra/openexr/gcc43.patch b/extra/openexr/gcc43.patch
index 362487276..ab99eb9a1 100644
--- a/extra/openexr/gcc43.patch
+++ b/extra/openexr/gcc43.patch
@@ -1,22 +1,11 @@
-diff -Nura openexr-1.6.1/exrenvmap/main.cpp openexr-1.6.1.new/exrenvmap/main.cpp
---- openexr-1.6.1/exrenvmap/main.cpp	2007-04-25 03:07:51.000000000 +0200
-+++ openexr-1.6.1.new/exrenvmap/main.cpp	2008-10-30 17:18:13.000000000 +0100
-@@ -45,6 +45,7 @@
- #include <iostream>
- #include <exception>
- #include <stdlib.h>
-+#include <string.h>
+--- exrenvmap/blurImage.cpp
++++ exrenvmap/blurImage.cpp
+@@ -39,6 +39,8 @@
+ //
+ //-----------------------------------------------------------------------------
  
- using namespace Imf;
- using namespace std;
-diff -Nura openexr-1.6.1/exrmaketiled/main.cpp openexr-1.6.1.new/exrmaketiled/main.cpp
---- openexr-1.6.1/exrmaketiled/main.cpp	2007-04-25 03:08:45.000000000 +0200
-+++ openexr-1.6.1.new/exrmaketiled/main.cpp	2008-10-30 17:18:40.000000000 +0100
-@@ -46,6 +46,7 @@
- #include <exception>
- #include <string>
- #include <stdlib.h>
-+#include <string.h>
++#include <cstring>
++
+ #include <blurImage.h>
  
- using namespace Imf;
- using namespace std;
+ #include <resizeImage.h>
diff --git a/extra/postgresql/PKGBUILD b/extra/postgresql/PKGBUILD
index 5c5ffd2db..a0d0e3cc5 100644
--- a/extra/postgresql/PKGBUILD
+++ b/extra/postgresql/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 120393 2011-04-23 18:29:42Z dan $
+# $Id: PKGBUILD 122182 2011-05-02 17:54:57Z dan $
 # Maintainer: Dan McGee <dan@archlinux.org>
 
 pkgbase=postgresql
 pkgname=('postgresql-libs' 'postgresql-docs' 'postgresql')
 pkgver=9.0.4
-pkgrel=2
+pkgrel=3
 arch=('i686' 'x86_64')
 url="http://www.postgresql.org"
 license=('custom:PostgreSQL')
diff --git a/extra/postgresql/postgresql.install b/extra/postgresql/postgresql.install
index c3fa4fc3e..d65bb6a7f 100644
--- a/extra/postgresql/postgresql.install
+++ b/extra/postgresql/postgresql.install
@@ -1,4 +1,7 @@
 post_install() {
+  if [ ! -d '/var/lib/postgres' ]; then
+    mkdir -p '/var/lib/postgres'
+  fi
   getent group postgres >/dev/null || groupadd -g 88 postgres
   getent passwd postgres >/dev/null || useradd -c 'PostgreSQL user' -u 88 -g postgres -d '/var/lib/postgres' -s /bin/bash postgres
   passwd -l postgres >/dev/null
diff --git a/extra/telepathy-qt4/PKGBUILD b/extra/telepathy-qt4/PKGBUILD
index 6d3b6e5d1..72c54c85e 100644
--- a/extra/telepathy-qt4/PKGBUILD
+++ b/extra/telepathy-qt4/PKGBUILD
@@ -1,21 +1,22 @@
-# $Id: PKGBUILD 120824 2011-04-26 16:25:58Z ibiru $
+# $Id: PKGBUILD 122345 2011-05-03 23:56:05Z andrea $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
+# Contributor: Andrea Scarpino <andrea@archlinux.org>
+
 pkgname=telepathy-qt4
-pkgver=0.5.15
+pkgver=0.5.16
 pkgrel=1
-pkgdesc="A library for Qt-based Telepathy clients."
+pkgdesc="A library for Qt-based Telepathy clients"
 arch=('i686' 'x86_64')
-url="http://telepathy.freedesktop.org"
+url="http://telepathy.freedesktop.org/wiki/"
 license=('LGPL')
 options=('!libtool')
 depends=('qt' 'telepathy-farsight')
 makedepends=('libxslt' 'python2' 'cmake')
-source=(http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz)
-md5sums=('2066d447a46ca3d767ff82ca562244a0')
+source=("http://telepathy.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz")
+md5sums=('82e36c051c74d323b329f69ac2c5427f')
 
 build() {
     cd "${srcdir}"
-
     mkdir build
     cd build
     cmake ../${pkgname}-${pkgver} \
@@ -26,5 +27,5 @@ build() {
 
 package() {
     cd "${srcdir}"/build
-    make DESTDIR="$pkgdir" install
+    make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/udisks/PKGBUILD b/extra/udisks/PKGBUILD
index e431b7500..d5b172adb 100644
--- a/extra/udisks/PKGBUILD
+++ b/extra/udisks/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 119537 2011-04-11 22:26:25Z ibiru $
+# $Id: PKGBUILD 122326 2011-05-03 20:32:37Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=udisks
 pkgver=1.0.3
-pkgrel=1
+pkgrel=2
 pkgdesc="Disk Management Service"
 arch=('i686' 'x86_64')
 url="http://www.freedesktop.org/wiki/Software/udisks"
@@ -13,13 +13,16 @@ makedepends=('intltool' 'docbook-xsl' 'gtk-doc')
 options=(!libtool)
 #source=(http://hal.freedesktop.org/releases/${pkgname}-${pkgver}.tar.gz)
 source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.xz
-        01-mkfs-tempdir.patch)
+        01-mkfs-tempdir.patch
+        fix_well_known_filesystems.patch)
 sha256sums=('a4d18b2de59c1567df5342f26960c6c3e70a0320f7bafe42893f2708c9b57dd5'
-            '786c0adb1a37e16b351c906527e3cbd17193bb51d8c1dd0889f216556c419c6c')
+            '786c0adb1a37e16b351c906527e3cbd17193bb51d8c1dd0889f216556c419c6c'
+            '00d92030de44c5856c7408339c4849bf9b88b66d6cfa6617364b4e8d9ed2bc5e')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   patch -Np1 -i "${srcdir}/01-mkfs-tempdir.patch"
+  patch -Np1 -i "${srcdir}/fix_well_known_filesystems.patch"
   ./autogen.sh
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
       --libexecdir=/usr/lib/udisks --disable-static
diff --git a/extra/udisks/fix_well_known_filesystems.patch b/extra/udisks/fix_well_known_filesystems.patch
new file mode 100644
index 000000000..77eee26ba
--- /dev/null
+++ b/extra/udisks/fix_well_known_filesystems.patch
@@ -0,0 +1,12 @@
+diff -Nur udisks-1.0.3.orig/src/device.c udisks-1.0.3/src/device.c
+--- udisks-1.0.3.orig/src/device.c	2011-04-05 13:16:00.000000000 -0700
++++ udisks-1.0.3/src/device.c	2011-05-03 13:27:39.064679418 -0700
+@@ -5902,7 +5902,7 @@
+   "msdos",
+   "umsdos",
+   "vfat",
+-  "exfat"
++  "exfat",
+   "ntfs",
+   NULL,
+ };
diff --git a/extra/upower/PKGBUILD b/extra/upower/PKGBUILD
index 53e71553a..c050ee4b0 100644
--- a/extra/upower/PKGBUILD
+++ b/extra/upower/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 116154 2011-03-22 19:35:44Z ibiru $
+# $Id: PKGBUILD 122280 2011-05-03 18:02:14Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=upower
-pkgver=0.9.9
+pkgver=0.9.10
 pkgrel=1
 pkgdesc="Abstraction for enumerating power devices, listening to device events and querying history and statistics"
 arch=('i686' 'x86_64')
@@ -13,12 +13,16 @@ makedepends=('pkg-config' 'intltool' 'docbook-xsl' 'gobject-introspection')
 replaces=('devicekit-power')
 options=('!libtool')
 source=($url/releases/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('39e19bab2c776000477d6d0ddb4bc508808954f63867a2da2be40eaf341214e2')
+sha256sums=('fa567509c4ce8d1975259665b907929cac692a59dbe0e217e7494b1cdc949288')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
       --libexecdir=/usr/lib/upower --disable-static
   make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/vino/PKGBUILD b/extra/vino/PKGBUILD
index b3a5a76fb..50f7af45a 100644
--- a/extra/vino/PKGBUILD
+++ b/extra/vino/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 120634 2011-04-25 18:44:11Z ibiru $
+# $Id: PKGBUILD 122171 2011-05-02 16:51:49Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=vino
-pkgver=3.0.1
+pkgver=3.0.2
 pkgrel=1
 pkgdesc="a VNC server for the GNOME desktop"
 arch=('i686' 'x86_64')
@@ -14,7 +14,7 @@ url="http://www.gnome.org"
 options=(!emptydirs)
 install=vino.install
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('d2111f1f8dbcb78005cce3d28ea42b5deabe5ced83eb11030e4a74874fdfdfca')
+sha256sums=('ca2d72f70d2a94e31e63d0267ec41820aab168c6545954c355a609f3c6c31923')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/webmin/PKGBUILD b/extra/webmin/PKGBUILD
index 6e8cf2d01..d1a55f636 100644
--- a/extra/webmin/PKGBUILD
+++ b/extra/webmin/PKGBUILD
@@ -1,7 +1,7 @@
-# $Id: PKGBUILD 118950 2011-04-09 15:28:29Z tpowa $
+# $Id: PKGBUILD 122336 2011-05-03 22:31:36Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 pkgname=webmin
-pkgver=1.540
+pkgver=1.550
 pkgrel=1
 pkgdesc="a web-based interface for system administration"
 arch=(i686 x86_64)
@@ -210,7 +210,9 @@ build() {
   # install license
   install -m 644 -D $startdir/src/$pkgname-$pkgver/LICENCE $startdir/pkg/usr/share/licenses/webmin/LICENCE
 }
-md5sums=('8086fc60419937c4b2844796cfd2aea1'
+
+
+md5sums=('d892599a6e3e6f102a8261d2804fb1b5'
          'da6bea412a5be8cf82a813078fec5847'
          'bfebb75bb94029b48c46b7f1ba1aa811'
          '0673e51af0e81418b4a6c1e205f7e5cd')
diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD
index cc408f55f..b2af0eaf1 100644
--- a/libre/icecat/PKGBUILD
+++ b/libre/icecat/PKGBUILD
@@ -19,22 +19,20 @@
 # * Disabled ContentHandlers and other Google/Yahoo! related services
 
 pkgname=icecat
-pkgver=4.0
-_pkgver=4.0
+pkgver=4.0.1
 pkgrel=1
-_xulver=2.0
+_xulver=2.0.1
 pkgdesc="GNU version of the Firefox browser. SafeBrowsing and other Google services disabled!"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnu.org/software/gnuzilla/"
 license=('GPL2' 'MPL' 'LGPL')
 depends=("xulrunner=${_xulver}" 'desktop-file-utils')
 makedepends=('zip' 'pkg-config' 'diffutils' 'python2' 'wireless_tools' 'yasm' 'mesa')
 provides=('firefox')
 conflicts=('firefox')
-replaces=("firefox=${_pkgver}")
+replaces=("firefox=${pkgver}")
 install=icecat.install
-#source=(http://ftp.gnu.org/gnu/gnuzilla/${pkgver}/${pkgname}-${pkgver}.tar.xz
-source=(ftp://ftp.gnu.org/gnu/gnuzilla/${_pkgver}/${pkgname}-${_pkgver}.tar.bz2
+source=(http://ftp.gnu.org/gnu/gnuzilla/${pkgver}/${pkgname}-${pkgver}.tar.xz
         mozconfig
         icecat.desktop
         icecat-safe.desktop
@@ -50,15 +48,15 @@ source=(ftp://ftp.gnu.org/gnu/gnuzilla/${_pkgver}/${pkgname}-${_pkgver}.tar.bz2
         duck-duck-go-ssl.xml
         duck-duck-go-lite.xml
 # Default options
-	firefox.js
+        firefox.js
         region.properties)
 
 build() {
 
-  ICECATDIR="/usr/lib/${pkgname}-4.0" && export ICECATDIR
+  ICECATDIR="/usr/lib/${pkgname}-${pkgver}" && export ICECATDIR
 
   msg2 "Patching some files..."
-  cd "${srcdir}/${pkgname}-${_pkgver}/"
+  cd "${srcdir}/${pkgname}-${pkgver}/"
   patch -Np1 -i "${srcdir}/mozilla-firefox-1.0-lang.patch"
   patch -Np0 -i "${srcdir}/xulrunner-copy-stub.patch"
   
@@ -72,37 +70,35 @@ build() {
 
   export LDFLAGS="-Wl,-rpath,${ICECATDIR}"
 
-  #make -j1 -f client.mk build MOZ_MAKE_FLAGS="${MAKEFLAGS}"
   ./configure
-
-  touch config*
-
   make MOZ_MAKE_FLAGS="${MAKEFLAGS}"
   msg2 "Build complete"
+
 }
 
 package() {
-  ICECATDIR="/usr/lib/${pkgname}-4.0" && export ICECATDIR
+  ICECATDIR="/usr/lib/${pkgname}-${pkgver}" && export ICECATDIR
 
-  cd "${srcdir}/${pkgname}-${_pkgver}/"
-  #make -j1 -f client.mk DESTDIR="${pkgdir}" install
+  cd "${srcdir}/${pkgname}-${pkgver}/"
   make install DESTDIR="${pkgdir}"
 
   msg2 "Finishing..."
-
   install -m755 -d ${pkgdir}/usr/share/applications
   install -m755 -d ${pkgdir}/usr/share/pixmaps
-  install -m644 ${srcdir}/${pkgname}-${_pkgver}/browser/branding/unofficial/default48.png ${pkgdir}/usr/share/pixmaps/icecat.png
+  install -m644 ${srcdir}/${pkgname}-${pkgver}/browser/branding/unofficial/default48.png ${pkgdir}/usr/share/pixmaps/icecat.png
   install -m644 ${srcdir}/icecat.desktop ${pkgdir}/usr/share/applications/
   install -m644 ${srcdir}/icecat-safe.desktop ${pkgdir}/usr/share/applications/
 
+  cd ${pkgdir}/usr/lib
+  ln -s ${ICECATDIR} icecat
+
   msg2 "Removing proprietary and anti-privacy search engines"
   rm -f ${pkgdir}${ICECATDIR}/searchplugins/{google,answers,amazondotcom,eBay,yahoo,bing}.xml
   msg2 "And provide better ones..."
   install -m755 -d ${pkgdir}${ICECATDIR}/searchplugins/
   install -m644 ${srcdir}/*.xml ${pkgdir}${ICECATDIR}/searchplugins/
 }
-md5sums=('6d7031ecdcf8edb214aaa3fbb1d3fe33'
+md5sums=('1b4d44ee5badc28fd332cba564ecde0a'
          '436db1f6167ffe82fcd71a53ffd80d0e'
          'e81ad01dbc16ba28bf92ba4b7c309ca7'
          'd93fe402b87cd000a869e1fd6badc6c9'
diff --git a/libre/kernel26-libre/PKGBUILD b/libre/kernel26-libre/PKGBUILD
index 89af2e32b..d891a2c46 100644
--- a/libre/kernel26-libre/PKGBUILD
+++ b/libre/kernel26-libre/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=('kernel26-libre' 'kernel26-libre-headers' 'kernel26-libre-docs') # Buil
 
 _kernelname=${pkgname#kernel26-libre}
 _basekernel=2.6.38
-pkgver=${_basekernel}.4
+pkgver=${_basekernel}.5
 pkgrel=1
 makedepends=('xmlto' 'docbook-xsl')
 _patchname="patch-${pkgver}-${pkgrel}-LIBRE"
@@ -241,8 +241,8 @@ find $pkgdir -type d -exec chmod 755 {} \;
 # remove a file already in kernel26 package
 rm -f $pkgdir/usr/src/linux-$_kernver/Documentation/DocBook/Makefile
 }
-md5sums=('0f1a5d184d4029c9d9b38a4b9407c392'
-         '8395aac2f31718b45afe57794c21ab81'
+md5sums=('53f12d40086282b858531e583fa02107'
+         '3753b5f0b812bd548aca6abafb0e6520'
          'a6b673aead69b12f50b8ca53d1f14b14'
          'fa7d6abea1e2163b1ab2b1acfe117f51'
          '25584700a0a679542929c4bed31433b6'
diff --git a/multilib/nspluginwrapper/PKGBUILD b/multilib/nspluginwrapper/PKGBUILD
index 250d70829..d35da9633 100644
--- a/multilib/nspluginwrapper/PKGBUILD
+++ b/multilib/nspluginwrapper/PKGBUILD
@@ -1,34 +1,26 @@
-# $Id: PKGBUILD 26767 2010-09-15 23:06:22Z bluewind $
+# $Id: PKGBUILD 46102 2011-05-03 15:47:24Z bluewind $
 # Maintainer: Thomas Bächler <thomas@archlinux.org>
 pkgname=nspluginwrapper
-pkgver=1.3.0
-pkgrel=4
+pkgver=1.3.2
+pkgrel=1
 pkgdesc="Cross-platform NPAPI compatible plugin viewer"
 arch=('x86_64')
 url="http://freshmeat.net/projects/nspluginwrapper/"
 license=('GPL')
 depends=('curl' 'lib32-libxt' 'lib32-gcc-libs' 'gtk2' 'lib32-gtk2')
 makedepends=('gcc-multilib')
-source=(ftp://ftp.archlinux.org/other/nspluginwrapper/$pkgname-$pkgver.tar.gz
-        npw-viewer.c.patch
-        nspluginwrapper-20090625-fix-npident-array-sending.patch
+source=(http://web.mit.edu/davidben/Public/$pkgname/$pkgname-$pkgver.tar.gz
         nspluginwrapper-native-windows.patch)
-sha256sums=('0af7e2ae4c6258d5c17addbcc4658b84c979860da843873f0d15d90ee9a8259d'
-            '4b216cca327ae76e6e2ab6dc6bbaf3efe1123c63a09b0e7e45c964531fcbdeb0'
-            '8bb55b845017b60912c62c4abadc50a3f0397ddf470599b8453b97d9e69f8cd5'
+sha256sums=('f3a40d160601520d36b6f5c342e1e9751b2bdc70dff5e2e880e1d18ed8830201'
             '3796b66f53448f4668e70aec97a3d74db2b2fcd308b36f87373405547cae38b1')
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
-  # Fix build
-  patch -p1 -i "$srcdir/npw-viewer.c.patch"
-  # See http://web.archiveorange.com/archive/v/tptsHOJYbGKIfNFz9xHz
-  patch -p0 -i "$srcdir/nspluginwrapper-20090625-fix-npident-array-sending.patch"
   # Patch taken from the openSuSE src.rpm
   patch -p0 -i "$srcdir/nspluginwrapper-native-windows.patch"
 
   ./configure --with-lib32=lib32 --with-lib64=lib
-  make
+  make -j1
 }
 
 package() {
diff --git a/multilib/wine/PKGBUILD b/multilib/wine/PKGBUILD
index 9c733328b..12546df28 100644
--- a/multilib/wine/PKGBUILD
+++ b/multilib/wine/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 45826 2011-04-29 19:49:25Z svenstaro $
+# $Id: PKGBUILD 46051 2011-05-02 23:40:05Z svenstaro $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com>
 # Contributor: Eduardo Romero <eduardo@archlinux.org>
@@ -6,7 +6,7 @@
 
 pkgname=wine
 pkgver=1.3.19
-pkgrel=1
+pkgrel=2
 
 _pkgbasever=${pkgver/rc/-rc}
 
@@ -49,6 +49,7 @@ makedepends=(autoconf ncurses bison perl fontforge flex prelink
   libcups         lib32-libcups
   gnutls          lib32-gnutls
   v4l-utils       lib32-v4l-utils
+  oss
 )
   
 optdepends=(
@@ -63,6 +64,7 @@ optdepends=(
   libcups         lib32-libcups
   gnutls          lib32-gnutls
   v4l-utils       lib32-v4l-utils
+  oss
 )
 
 if [[ $CARCH == i686 ]]; then
@@ -87,6 +89,10 @@ build() {
   rm -rf $pkgname-{32,64}-build
   mkdir $pkgname-32-build
 
+  # hacky hax for ossv4 being "too old"
+  sed -i "s|<sys/soundcard.h>|</usr/lib/oss/include/sys/soundcard.h>|g" $pkgname/configure
+  sed -i "s|<sys/soundcard.h>|</usr/lib/oss/include/sys/soundcard.h>|g" $pkgname/dlls/wineoss.drv/*.c
+
   if [[ $CARCH == x86_64 ]]; then
     msg2 "Building Wine-64..."
 
diff --git a/staging/cyrus-sasl-plugins/PKGBUILD b/staging/cyrus-sasl-plugins/PKGBUILD
new file mode 100644
index 000000000..5817bb657
--- /dev/null
+++ b/staging/cyrus-sasl-plugins/PKGBUILD
@@ -0,0 +1,52 @@
+# $Id: PKGBUILD 122144 2011-05-02 13:27:49Z stephane $
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+
+pkgname=cyrus-sasl-plugins
+pkgver=2.1.23
+pkgrel=5
+pkgdesc="Cyrus Simple Authentication Service Layer (SASL) library"
+arch=('i686' 'x86_64')
+url="http://cyrusimap.web.cmu.edu/"
+license=('custom')
+depends=('postgresql-libs>=9.0.3' 'krb5' 'libldap>2.4'
+        'libmysqlclient>=5.5.10')
+source=(ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-sasl-${pkgver}.tar.gz
+        cyrus-sasl-2.1.22-gcc44.patch
+    	cyrus-sasl-2.1.23-db5-fix.patch)
+md5sums=('2eb0e48106f0e9cd8001e654f267ecbc'
+         '5deb4d67b53ecba20c7887fc8fdebee1'
+         '3ae4347705141145f31cf786c38ea9ef')
+options=('!libtool')
+
+build() {
+  cd ${srcdir}/cyrus-sasl-${pkgver}
+  patch -Np1 -i $srcdir/cyrus-sasl-2.1.22-gcc44.patch
+  # from http://bugs.gentoo.org/show_bug.cgi?id=319935
+  patch -Np0 -i ${srcdir}/cyrus-sasl-2.1.23-db5-fix.patch
+  ./configure --prefix=/usr \
+    --sysconfdir=/etc \
+    --localstatedir=/var \
+    --disable-login \
+    --disable-plain \
+    --enable-sql \
+    --disable-sqlite \
+    --enable-gssapi=/usr/include/gssapi \
+    --with-mysql=/usr \
+    --with-pgsql=/usr \
+    --enable-postgresql \
+    --enable-ldapdb \
+    --with-ldap=/usr
+  cd sasldb
+  make
+  cd ../plugins
+  make
+}
+
+package () {
+  cd ${srcdir}/cyrus-sasl-${pkgver}/plugins
+  make DESTDIR=${pkgdir} install
+  
+  install -Dm644 ../COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING
+
+  rm -f ${pkgdir}/usr/lib/sasl2/libsasldb.*
+}
diff --git a/staging/cyrus-sasl-plugins/cyrus-sasl-2.1.22-gcc44.patch b/staging/cyrus-sasl-plugins/cyrus-sasl-2.1.22-gcc44.patch
new file mode 100644
index 000000000..e2621278b
--- /dev/null
+++ b/staging/cyrus-sasl-plugins/cyrus-sasl-2.1.22-gcc44.patch
@@ -0,0 +1,24 @@
+fix warnings with gcc-4.4
+
+http://bugs.gentoo.org/248738
+
+--- cyrus-sasl-2.1.22/plugins/digestmd5.c
++++ cyrus-sasl-2.1.22/plugins/digestmd5.c
+@@ -2715,7 +2715,7 @@ static sasl_server_plug_t digestmd5_serv
+ 	"DIGEST-MD5",			/* mech_name */
+ #ifdef WITH_RC4
+ 	128,				/* max_ssf */
+-#elif WITH_DES
++#elif defined(WITH_DES)
+ 	112,
+ #else 
+ 	1,
+@@ -4034,7 +4034,7 @@ static sasl_client_plug_t digestmd5_clie
+ 	"DIGEST-MD5",
+ #ifdef WITH_RC4				/* mech_name */
+ 	128,				/* max ssf */
+-#elif WITH_DES
++#elif defined(WITH_DES)
+ 	112,
+ #else
+ 	1,
diff --git a/staging/cyrus-sasl-plugins/cyrus-sasl-2.1.23-db5-fix.patch b/staging/cyrus-sasl-plugins/cyrus-sasl-2.1.23-db5-fix.patch
new file mode 100644
index 000000000..2ccd6cdb3
--- /dev/null
+++ b/staging/cyrus-sasl-plugins/cyrus-sasl-2.1.23-db5-fix.patch
@@ -0,0 +1,23 @@
+--- sasldb/db_berkeley.c.orig	2010-10-04 21:11:15.044010468 -0400
++++ sasldb/db_berkeley.c	2010-10-04 21:12:18.921998718 -0400
+@@ -100,7 +100,7 @@
+     ret = db_create(mbdb, NULL, 0);
+     if (ret == 0 && *mbdb != NULL)
+     {
+-#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1
++#if (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1) || DB_VERSION_MAJOR == 5
+ 	ret = (*mbdb)->open(*mbdb, NULL, path, NULL, DB_HASH, flags, 0660);
+ #else
+ 	ret = (*mbdb)->open(*mbdb, path, NULL, DB_HASH, flags, 0660);
+
+--- utils/dbconverter-2.c.orig	2010-10-04 21:23:39.778000256 -0400
++++ utils/dbconverter-2.c	2010-10-04 21:24:50.384999893 -0400
+@@ -214,7 +214,7 @@
+     ret = db_create(mbdb, NULL, 0);
+     if (ret == 0 && *mbdb != NULL)
+     {
+-#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1
++#if (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1) || DB_VERSION_MAJOR == 5
+ 	ret = (*mbdb)->open(*mbdb, NULL, path, NULL, DB_HASH, DB_CREATE, 0664);
+ #else
+ 	ret = (*mbdb)->open(*mbdb, path, NULL, DB_HASH, DB_CREATE, 0664);
diff --git a/staging/cyrus-sasl/PKGBUILD b/staging/cyrus-sasl/PKGBUILD
new file mode 100644
index 000000000..6d42f9f75
--- /dev/null
+++ b/staging/cyrus-sasl/PKGBUILD
@@ -0,0 +1,53 @@
+# $Id: PKGBUILD 122168 2011-05-02 15:13:37Z stephane $
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+
+pkgname=cyrus-sasl
+pkgver=2.1.23
+pkgrel=5
+pkgdesc="SASL authentication daemon"
+arch=('i686' 'x86_64')
+license=('custom')
+url="http://asg.web.cmu.edu/cyrus/download/"
+depends=('pam>=1.0.1-2' 'krb5' 'libldap' 'cyrus-sasl-plugins' 'db>=5.0')
+replaces=(cyrus-sasl-mysql cyrus-sasl-pgsql)
+conflicts=(cyrus-sasl-mysql cyrus-sasl-pgsql)
+backup=(etc/conf.d/saslauthd)
+source=(ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/${pkgname}-${pkgver}.tar.gz
+        saslauthd
+        saslauthd.conf.d
+        cyrus-sasl-2.1.23-gcc4.patch
+        cyrus-sasl-2.1.23+db-5.0.patch)
+md5sums=('2eb0e48106f0e9cd8001e654f267ecbc'
+         '697dfb51206c398bc976ce9f4cffe72d'
+         '96d8a2f6189501f8044838e04d5cae7f'
+         '3a71688df7d5724cd55a8de17d74f34e'
+         '35c189c8e93ad37e3ae3c49386fdeb2c')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  # Fix building with db v5.x
+  patch -Np1 -i ../cyrus-sasl-2.1.23+db-5.0.patch
+
+  # Fix error: #elif with no expression
+  patch -Np1 -i ../cyrus-sasl-2.1.23-gcc4.patch
+
+  ./configure --prefix=/usr --mandir=/usr/share/man \
+    --with-ldap=/usr --with-saslauthd=/var/run/saslauthd \
+    --disable-krb4 --with-gss_impl=mit --disable-otp
+  cd saslauthd
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}/saslauthd"
+  make DESTDIR="${pkgdir}" install
+  make testsaslauthd
+  install -m755 testsaslauthd "${pkgdir}/usr/sbin"
+
+  install -dm766 "${pkgdir}/var/run/saslauthd"
+  install -Dm755 "${srcdir}/saslauthd" "${pkgdir}/etc/rc.d/saslauthd"
+  install -Dm644 "${srcdir}/saslauthd.conf.d" "${pkgdir}/etc/conf.d/saslauthd"
+
+  install -Dm644 ../COPYING "${pkgdir}/usr/share/licenses/cyrus-sasl/COPYING"
+}
diff --git a/staging/cyrus-sasl/cyrus-sasl-2.1.23+db-5.0.patch b/staging/cyrus-sasl/cyrus-sasl-2.1.23+db-5.0.patch
new file mode 100644
index 000000000..62df3e67e
--- /dev/null
+++ b/staging/cyrus-sasl/cyrus-sasl-2.1.23+db-5.0.patch
@@ -0,0 +1,24 @@
+diff -Naur cyrus-sasl-2.1.23.ori/sasldb/db_berkeley.c cyrus-sasl-2.1.23/sasldb/db_berkeley.c
+--- cyrus-sasl-2.1.23.ori/sasldb/db_berkeley.c	2009-04-28 08:09:18.000000000 -0700
++++ cyrus-sasl-2.1.23/sasldb/db_berkeley.c	2011-05-02 07:16:42.748675977 -0700
+@@ -100,7 +100,7 @@
+     ret = db_create(mbdb, NULL, 0);
+     if (ret == 0 && *mbdb != NULL)
+     {
+-#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1
++#if (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1) || DB_VERSION_MAJOR >= 5
+ 	ret = (*mbdb)->open(*mbdb, NULL, path, NULL, DB_HASH, flags, 0660);
+ #else
+ 	ret = (*mbdb)->open(*mbdb, path, NULL, DB_HASH, flags, 0660);
+diff -Naur cyrus-sasl-2.1.23.ori/utils/dbconverter-2.c cyrus-sasl-2.1.23/utils/dbconverter-2.c
+--- cyrus-sasl-2.1.23.ori/utils/dbconverter-2.c	2003-02-13 11:56:17.000000000 -0800
++++ cyrus-sasl-2.1.23/utils/dbconverter-2.c	2011-05-02 07:16:42.748675977 -0700
+@@ -214,7 +214,7 @@
+     ret = db_create(mbdb, NULL, 0);
+     if (ret == 0 && *mbdb != NULL)
+     {
+-#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1
++#if (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1) || DB_VERSION_MAJOR >= 5
+ 	ret = (*mbdb)->open(*mbdb, NULL, path, NULL, DB_HASH, DB_CREATE, 0664);
+ #else
+ 	ret = (*mbdb)->open(*mbdb, path, NULL, DB_HASH, DB_CREATE, 0664);
diff --git a/staging/cyrus-sasl/cyrus-sasl-2.1.23-gcc4.patch b/staging/cyrus-sasl/cyrus-sasl-2.1.23-gcc4.patch
new file mode 100644
index 000000000..0d8627b1f
--- /dev/null
+++ b/staging/cyrus-sasl/cyrus-sasl-2.1.23-gcc4.patch
@@ -0,0 +1,21 @@
+diff -Naur cyrus-sasl-2.1.23.ori/plugins/digestmd5.c cyrus-sasl-2.1.23/plugins/digestmd5.c
+--- cyrus-sasl-2.1.23.ori/plugins/digestmd5.c	2009-04-28 08:09:17.000000000 -0700
++++ cyrus-sasl-2.1.23/plugins/digestmd5.c	2011-05-02 07:56:55.375403814 -0700
+@@ -2715,7 +2715,7 @@
+ 	"DIGEST-MD5",			/* mech_name */
+ #ifdef WITH_RC4
+ 	128,				/* max_ssf */
+-#elif WITH_DES
++#elif defined(WITH_DES)
+ 	112,
+ #else 
+ 	1,
+@@ -4034,7 +4034,7 @@
+ 	"DIGEST-MD5",
+ #ifdef WITH_RC4				/* mech_name */
+ 	128,				/* max ssf */
+-#elif WITH_DES
++#elif defined(WITH_DES)
+ 	112,
+ #else
+ 	1,
diff --git a/staging/cyrus-sasl/saslauthd b/staging/cyrus-sasl/saslauthd
new file mode 100644
index 000000000..c470c801c
--- /dev/null
+++ b/staging/cyrus-sasl/saslauthd
@@ -0,0 +1,50 @@
+#!/bin/bash
+
+# source application-specific settings
+[ -f /etc/conf.d/saslauthd ] && . /etc/conf.d/saslauthd
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+DAEMON_NAME="saslauthd"
+SASLAUTHD_BIN=/usr/sbin/saslauthd
+SASLAUTHD_PID=`pidof -o %PPID $SASLAUTHD_BIN`
+
+case "$1" in
+  start)
+    stat_busy "Starting $DAEMON_NAME"
+    [ -z "$SASLAUTHD_PID" ] && $SASLAUTHD_BIN $SASLAUTHD_OPTS
+    if [ $? -gt 0 ]; then
+      stat_fail
+      exit 1
+    else
+      echo `pidof -o %PPID $SASLAUTHD_BIN` > /var/run/$DAEMON_NAME.pid
+    fi
+    add_daemon $DAEMON_NAME
+    stat_done
+    ;;
+
+  stop)
+    stat_busy "Stopping $DAEMON_NAME"
+    [ ! -z "$SASLAUTHD_PID" ]  && kill $SASLAUTHD_PID &> /dev/null
+    if [ $? -gt 0 ]; then
+      stat_fail
+      exit 1
+    else
+      rm /var/run/$DAEMON_NAME.pid &> /dev/null
+    fi
+    rm_daemon $DAEMON_NAME
+    stat_done
+    ;;
+
+  restart)
+    $0 stop
+    sleep 1
+    $0 start
+    ;;
+
+  *)
+    echo "usage: $0 {start|stop|restart}"  
+esac
+exit 0
+# vim: ts=2 sw=2 et ft=sh
diff --git a/staging/cyrus-sasl/saslauthd.conf.d b/staging/cyrus-sasl/saslauthd.conf.d
new file mode 100644
index 000000000..b42b5d0b0
--- /dev/null
+++ b/staging/cyrus-sasl/saslauthd.conf.d
@@ -0,0 +1 @@
+SASLAUTHD_OPTS="-m /var/run/saslauthd -a pam"
diff --git a/staging/gtk2/PKGBUILD b/staging/gtk2/PKGBUILD
new file mode 100644
index 000000000..e67d63520
--- /dev/null
+++ b/staging/gtk2/PKGBUILD
@@ -0,0 +1,50 @@
+# $Id: PKGBUILD 122323 2011-05-03 20:18:27Z stephane $
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+
+pkgbase=gtk2
+pkgname=('gtk2' 'gtk-update-icon-cache')
+pkgver=2.24.4
+pkgrel=2
+arch=('i686' 'x86_64')
+url="http://www.gtk.org/"
+makedepends=('atk' 'pango' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxcomposite' 'libxdamage' 'krb5' 'gnutls'
+             'shared-mime-info' 'cairo' 'libcups' 'gdk-pixbuf2' 'gobject-introspection')
+options=('!libtool' '!docs')
+license=('LGPL')
+source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-${pkgver}.tar.bz2
+        xid-collision-debug.patch)
+sha256sums=('7d3033ad83647079977466d3e8f1a7533f47abd5cc693f01b8797ff43dd407a5'
+            'd758bb93e59df15a4ea7732cf984d1c3c19dff67c94b957575efea132b8fe558')
+
+build() {
+    cd "${srcdir}/gtk+-${pkgver}"
+    patch -Np1 -i "${srcdir}/xid-collision-debug.patch"
+
+    CXX=/bin/false ./configure --prefix=/usr \
+        --sysconfdir=/etc \
+        --localstatedir=/var \
+        --with-xinput=yes
+    make
+}
+package_gtk2() {
+    pkgdesc="The GTK+ Toolkit (v2)"
+    install=gtk2.install
+    depends=('atk' 'pango' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxcomposite' 'libxdamage' 'krb5' 'gnutls' 'shared-mime-info' 'cairo' 'libcups' 'gtk-update-icon-cache')
+    backup=(etc/gtk-2.0/gtkrc)
+
+    cd "${srcdir}/gtk+-${pkgver}"
+
+    make DESTDIR="${pkgdir}" install
+    sed -i "s#env python#env python2#" $pkgdir/usr/bin/gtk-builder-convert
+    echo 'gtk-fallback-icon-theme = "gnome"' > "${pkgdir}/etc/gtk-2.0/gtkrc"
+    #split this out to use with gtk3 too
+    rm ${pkgdir}/usr/bin/gtk-update-icon-cache
+}
+package_gtk-update-icon-cache() {
+    pkgdesc="The GTK+ update icon cache tool"
+    depends=('gdk-pixbuf2')
+
+    cd "${srcdir}/gtk+-${pkgver}/gtk"
+
+    install -D -m755 gtk-update-icon-cache ${pkgdir}/usr/bin/gtk-update-icon-cache
+}
diff --git a/staging/gtk2/gtk2.install b/staging/gtk2/gtk2.install
new file mode 100644
index 000000000..4e2b72f1b
--- /dev/null
+++ b/staging/gtk2/gtk2.install
@@ -0,0 +1,16 @@
+post_install() {
+  usr/bin/gtk-query-immodules-2.0 > etc/gtk-2.0/gtk.immodules
+}
+
+pre_upgrade() {
+  pre_remove
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  rm -f etc/gtk-2.0/gtk.immodules &>/dev/null
+  rm -f etc/gtk-2.0/gdk-pixbuf.loaders &>/dev/null
+}
diff --git a/staging/gtk2/xid-collision-debug.patch b/staging/gtk2/xid-collision-debug.patch
new file mode 100644
index 000000000..d61238c3b
--- /dev/null
+++ b/staging/gtk2/xid-collision-debug.patch
@@ -0,0 +1,15 @@
+--- gtk+-2.18.3/gdk/x11/gdkxid.c	2009-06-19 04:59:18.000000000 +0200
++++ gtk+-2.18.3/gdk/x11/gdkxid.c.new	2009-07-22 11:30:12.000000000 +0200
+@@ -56,10 +56,10 @@
+   if (!display_x11->xid_ht)
+     display_x11->xid_ht = g_hash_table_new ((GHashFunc) gdk_xid_hash,
+ 					    (GEqualFunc) gdk_xid_equal);
+-
++/*
+   if (g_hash_table_lookup (display_x11->xid_ht, xid))
+     g_warning ("XID collision, trouble ahead");
+-
++*/
+   g_hash_table_insert (display_x11->xid_ht, xid, data);
+ }
+ 
diff --git a/staging/openssh/PKGBUILD b/staging/openssh/PKGBUILD
index 42443afc2..d00f114f3 100644
--- a/staging/openssh/PKGBUILD
+++ b/staging/openssh/PKGBUILD
@@ -1,9 +1,10 @@
-# $Id: PKGBUILD 121075 2011-04-28 23:41:59Z stephane $
-# Maintainer: Aaron Griffin <aaron@archlinux.org>
+# $Id: PKGBUILD 122205 2011-05-03 02:22:30Z bisson $
+# Maintainer: Gaetan Bisson <bisson@archlinux.org>
+# Contributor: Aaron Griffin <aaron@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 
 pkgname=openssh
-pkgver=5.8p1
+pkgver=5.8p2
 pkgrel=2
 pkgdesc='Free version of the SSH connectivity tools'
 arch=('i686' 'x86_64')
@@ -15,7 +16,7 @@ source=("ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname}-${pkgver}
         'sshd.confd'
         'sshd.pam'
         'sshd')
-sha1sums=('adebb2faa9aba2a3a3c8b401b2b19677ab53f0de'
+sha1sums=('e610270e0c5484fb291cd81bbcbefbeb5e391a62'
           'ec102deb69cad7d14f406289d2fc11fee6eddbdd'
           '660092c57bde28bed82078f74011f95fc51c2293'
           '6b7f8ebf0c1cc37137a7d9a53447ac8a0ee6a2b5')
diff --git a/testing/bluez/PKGBUILD b/testing/bluez/PKGBUILD
new file mode 100644
index 000000000..f59dd51d8
--- /dev/null
+++ b/testing/bluez/PKGBUILD
@@ -0,0 +1,75 @@
+# $Id: PKGBUILD 122198 2011-05-02 21:32:44Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+# Contributor: Geoffroy Carrier <geoffroy@archlinux.org>
+
+pkgname=bluez
+pkgver=4.92
+pkgrel=2
+pkgdesc="Libraries and tools for the Bluetooth protocol stack"
+url="http://www.bluez.org/"
+arch=('i686' 'x86_64')
+license=('GPL2')
+depends=('dbus-core')
+makedepends=('gstreamer0.10-base' 'libusb-compat' 'libnl' 'libsndfile')
+optdepends=("gstreamer0.10-base: bluetooth GStreamer support"
+	"alsa-lib: Audio bluetooth devices support"
+	"dbus-python: to run bluez-simple-agent"
+	"pygobject: to run bluez-simple-agent"
+	"libusb-compat: USB adapters support"
+	"cups: CUPS backend"
+	"libnl: netlink plugin")
+conflicts=('bluez-libs' 'bluez-utils')
+provides=('bluez-libs' 'bluez-utils')
+replaces=('bluez-libs' 'bluez-utils')
+options=('!libtool')
+backup=(etc/bluetooth/{main,rfcomm,audio,network,input,serial}.conf
+        'etc/conf.d/bluetooth' 'etc/dbus-1/system.d/bluetooth.conf')
+source=("http://www.kernel.org/pub/linux/bluetooth/${pkgname}-${pkgver}.tar.bz2"
+        'bluetooth.conf.d'
+        'rc.bluetooth')
+md5sums=('33bb9a75239889c5ee5fbc666ad41c5c'
+         '8f60a5eb9d84b9c64c478d63e1c24b10'
+         'ca4c39eb4bb201bd2eacad01492cd735')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  ./configure --prefix=/usr \
+    --sysconfdir=/etc \
+    --localstatedir=/var \
+    --libexecdir=/lib \
+    --enable-gstreamer \
+    --enable-alsa \
+    --enable-usb \
+    --enable-tools \
+    --enable-bccmd \
+    --enable-dfutool \
+    --enable-hidd \
+    --enable-pand \
+    --enable-dund \
+    --enable-cups \
+    --disable-udevrules \
+    --enable-configfiles
+  make
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make DESTDIR=${pkgdir} install
+
+  install -Dm755 ${srcdir}/rc.bluetooth ${pkgdir}/etc/rc.d/bluetooth
+  
+  install -d ${pkgdir}/etc/bluetooth
+  install -m644 network/network.conf \
+                input/input.conf \
+                audio/audio.conf \
+                serial/serial.conf \
+    ${pkgdir}/etc/bluetooth/
+  
+  install -Dm644 ${srcdir}/bluetooth.conf.d \
+    ${pkgdir}/etc/conf.d/bluetooth
+
+  install -Dm755 test/simple-agent ${pkgdir}/usr/bin/bluez-simple-agent
+  sed -i 's#/usr/bin/python#/usr/bin/python2#' \
+    ${pkgdir}/usr/bin/bluez-simple-agent
+}
diff --git a/testing/bluez/bluetooth.conf.d b/testing/bluez/bluetooth.conf.d
new file mode 100644
index 000000000..6648740eb
--- /dev/null
+++ b/testing/bluez/bluetooth.conf.d
@@ -0,0 +1,30 @@
+# Bluetooth configuraton file
+
+# Bluetooth services (allowed values are "true" and "false")
+
+# Run the bluetoothd daemon (default: true)
+#DAEMON_ENABLE="false"
+
+# Run the sdp daemon (default: false)
+# If this is disabled, hcid's internal sdp daemon will be used
+#SDPD_ENABLE="true"
+
+# Run the bluetooth HID daemon (default: false)
+#HIDD_ENABLE="true"
+
+# Activate rfcomm ports (default: false)
+#RFCOMM_ENABLE="true"
+
+# Run bluetooth dial-up networking daemon (default: false)
+#DUND_ENABLE="true"
+
+# Run bluetooth PAN daemon (default: false)
+#PAND_ENABLE="true"
+
+# rfcomm configuration file (default: /etc/bluetooth/rfcomm.conf)
+#RFCOMM_CONFIG="/etc/bluetooth/rfcomm.conf"
+
+# Options for hidd, dund and pand (default: none)
+#HIDD_OPTIONS=""
+#DUND_OPTIONS=""
+#PAND_OPTIONS=""
diff --git a/testing/bluez/rc.bluetooth b/testing/bluez/rc.bluetooth
new file mode 100644
index 000000000..096242011
--- /dev/null
+++ b/testing/bluez/rc.bluetooth
@@ -0,0 +1,100 @@
+#!/bin/bash
+#
+# Start/stop the Bluetooth daemons
+#
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+DAEMON_NAME="bluetoothd"
+HIDD_NAME="hidd"
+RFCOMM_NAME="rfcomm"
+PAND_NAME="pand"
+DUND_NAME="dund"
+
+DAEMON_EXEC="/usr/sbin/bluetoothd"
+HIDD_EXEC="/usr/bin/hidd"
+RFCOMM_EXEC="/usr/bin/rfcomm"
+PAND_EXEC="/usr/bin/pand"
+DUND_EXEC="/usr/bin/dund"
+
+DAEMON_ENABLE="true"
+HIDD_ENABLE="false"
+RFCOMM_ENABLE="false"
+DUND_ENABLE="false"
+PAND_ENABLE="false"
+
+RFCOMM_CONFIG="/etc/bluetooth/rfcomm.conf"
+
+HIDD_OPTIONS=""
+DUND_OPTIONS=""
+PAND_OPTIONS=""
+
+[ -f /etc/conf.d/bluetooth ] && . /etc/conf.d/bluetooth
+
+case "$1" in
+  start)
+    stat_busy "Starting bluetooth subsystem:"
+    if [ "$DAEMON_ENABLE" = "true" -a -x "$DAEMON_EXEC" ] ; then
+      stat_append " $DAEMON_NAME"
+      $DAEMON_EXEC
+      sleep 1
+    fi
+    if [ "$SDPD_ENABLE" = "true" -a -x "$SDPD_EXEC" ] ; then
+      stat_append " $SDPD_NAME"
+      $SDPD_EXEC
+    fi
+    if [ "$HIDD_ENABLE" = "true" -a -x "$HIDD_EXEC" ]; then
+      stat_append " $HIDD_NAME"
+      $HIDD_EXEC $HIDD_OPTIONS --server
+    fi
+    if [ "$RFCOMM_ENABLE" = "true" -a -x "$RFCOMM_EXEC" -a -f "$RFCOMM_CONFIG" ]; then
+      stat_append " $RFCOMM_NAME"
+      $RFCOMM_EXEC -f $RFCOMM_CONFIG bind all
+    fi
+    if [ "$DUND_ENABLE" = "true" -a -x "$DUND_EXEC" -a -n "$DUND_OPTIONS" ]; then
+      stat_append " $DUND_NAME"
+      $DUND_EXEC $DUND_OPTIONS
+    fi
+    if [ "$PAND_ENABLE" = "true" -a -x "$PAND_EXEC" -a -n "$PAND_OPTIONS" ]; then
+      stat_append " $PAND_NAME"
+      $PAND_EXEC $PAND_OPTIONS
+    fi
+    add_daemon bluetooth
+    stat_done
+    ;;
+  stop)
+    stat_busy "Stopping bluetooth subsystem:"
+
+    stat_append " $PAND_NAME"
+    killall $PAND_NAME >/dev/null 2>&1
+
+    stat_append " $DUND_NAME"
+    killall $DUND_NAME >/dev/null 2>&1
+
+    if [ -x "$RFCOMM_EXEC" ]; then
+      stat_append " $RFCOMM_NAME"
+      $RFCOMM_EXEC release all >/dev/null 2>&1
+    fi
+
+    stat_append " $HIDD_NAME"
+    killall $HIDD_NAME >/dev/null 2>&1
+
+    stat_append " $SDPD_NAME"
+    killall $SDPD_NAME >/dev/null 2>&1
+
+    stat_append " $DAEMON_NAME"
+    killall $DAEMON_NAME >/dev/null 2>&1
+
+    rm_daemon bluetooth
+    stat_done
+    ;;
+  restart)
+    $0 stop
+    sleep 1
+    $0 start
+    ;;
+  *)
+    echo "usage: $0 {start|stop|restart}"  
+esac
+exit 0
diff --git a/testing/dcron/PKGBUILD b/testing/dcron/PKGBUILD
index 76af827e8..5583d9267 100644
--- a/testing/dcron/PKGBUILD
+++ b/testing/dcron/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=dcron
 pkgver=4.5
-pkgrel=1
+pkgrel=2
 pkgdesc="dillon's lightweight cron daemon"
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -38,5 +38,7 @@ package() {
 	install -D -m0600 extra/root.crontab "$pkgdir/var/spool/cron/root" 
 	install -D -m755 extra/crond.rc "$pkgdir/etc/rc.d/crond"
 	install -D -m0644 extra/crond.conf "$pkgdir/etc/conf.d/crond"
-	install -D -m644 extra/crond.logrotate "$pkgdir/etc/logrotate.d/crond"
+	install -D -m644 extra/crontab.vim "$pkgdir/usr/share/vim/vimfiles/ftplugin/crontab.vim"
+	sed -i -e 's=/var/spool/cron/cronstamps=/var/spool/cronstamps=' extra/prune-cronstamps
+	install -D -m755 extra/prune-cronstamps "$pkgdir/etc/cron.d/prune-cronstamps"
 }
diff --git a/testing/lzo2/PKGBUILD b/testing/lzo2/PKGBUILD
new file mode 100644
index 000000000..b9aa75ad5
--- /dev/null
+++ b/testing/lzo2/PKGBUILD
@@ -0,0 +1,36 @@
+# $Id: PKGBUILD 122309 2011-05-03 18:52:51Z tpowa $
+# Contributor: Low Kian Seong <fastmail_low@speedymail.org>
+# Maintainer: dorphell <dorphell@archlinux.org>
+pkgname=lzo2
+pkgver=2.05
+pkgrel=1
+pkgdesc="Portable lossless data compression library"
+arch=('i686' 'x86_64')
+url="http://www.oberhumer.com/opensource/lzo"
+license=('GPL')
+depends=('glibc')
+source=(http://www.oberhumer.com/opensource/lzo/download/lzo-${pkgver}.tar.gz)
+options=(!libtool)
+md5sums=('c67cda5fa191bab761c7cb06fe091e36')
+
+build() {
+  cd "${srcdir}/lzo-${pkgver}"
+
+  ./configure --prefix=/usr --enable-shared
+  make
+
+  # build minilzo
+  gcc $CFLAGS -fpic -Iinclude/lzo -o minilzo/minilzo.o -c minilzo/minilzo.c
+  gcc -g -shared -o libminilzo.so.0 -Wl,-soname,libminilzo.so.0 minilzo/minilzo.o
+}
+
+package() {
+  cd "${srcdir}/lzo-${pkgver}"
+  make DESTDIR=${pkgdir} install
+
+  # install minilzo
+  install -m 755 libminilzo.so.0 ${pkgdir}/usr/lib
+  install -p -m 644 minilzo/minilzo.h ${pkgdir}/usr/include/lzo
+  cd ${pkgdir}/usr/lib
+  ln -s libminilzo.so.0 libminilzo.so
+}
diff --git a/testing/openssh/PKGBUILD b/testing/openssh/PKGBUILD
new file mode 100644
index 000000000..68fb3d417
--- /dev/null
+++ b/testing/openssh/PKGBUILD
@@ -0,0 +1,56 @@
+# $Id: PKGBUILD 122202 2011-05-03 02:17:44Z bisson $
+# Maintainer: Gaetan Bisson <bisson@archlinux.org>
+# Contributor: Aaron Griffin <aaron@archlinux.org>
+# Contributor: judd <jvinet@zeroflux.org>
+
+pkgname=openssh
+pkgver=5.8p2
+pkgrel=1
+pkgdesc='Free version of the SSH connectivity tools'
+arch=('i686' 'x86_64')
+license=('custom:BSD')
+url='http://www.openssh.org/portable.html'
+backup=('etc/ssh/ssh_config' 'etc/ssh/sshd_config' 'etc/pam.d/sshd' 'etc/conf.d/sshd')
+depends=('tcp_wrappers' 'heimdal' 'libedit')
+source=("ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname}-${pkgver}.tar.gz"
+        'sshd.confd'
+        'sshd.pam'
+        'sshd')
+sha1sums=('e610270e0c5484fb291cd81bbcbefbeb5e391a62'
+          'ec102deb69cad7d14f406289d2fc11fee6eddbdd'
+          '660092c57bde28bed82078f74011f95fc51c2293'
+          '6b7f8ebf0c1cc37137a7d9a53447ac8a0ee6a2b5')
+
+build() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+
+	./configure --prefix=/usr --libexecdir=/usr/lib/ssh \
+		--sysconfdir=/etc/ssh --with-tcp-wrappers --with-privsep-user=nobody \
+		--with-md5-passwords --with-pam --with-mantype=man --mandir=/usr/share/man \
+		--with-xauth=/usr/bin/xauth --with-kerberos5=/usr --with-ssl-engine \
+		--with-libedit=/usr/lib --disable-strip # stripping is done by makepkg
+	make
+}
+
+package() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	make DESTDIR="${pkgdir}" install
+
+	install -Dm755 ../sshd "${pkgdir}"/etc/rc.d/sshd
+	install -Dm644 ../sshd.pam "${pkgdir}"/etc/pam.d/sshd
+	install -Dm644 ../sshd.confd "${pkgdir}"/etc/conf.d/sshd
+	install -Dm644 LICENCE "${pkgdir}/usr/share/licenses/${pkgname}/LICENCE"
+
+	rm "${pkgdir}"/usr/share/man/man1/slogin.1
+	ln -sf ssh.1.gz "${pkgdir}"/usr/share/man/man1/slogin.1.gz
+
+	# additional contrib scripts that we like
+	install -Dm755 contrib/findssl.sh "${pkgdir}"/usr/bin/findssl.sh
+	install -Dm755 contrib/ssh-copy-id "${pkgdir}"/usr/bin/ssh-copy-id
+	install -Dm644 contrib/ssh-copy-id.1 "${pkgdir}"/usr/share/man/man1/ssh-copy-id.1
+
+	# PAM is a common, standard feature to have
+	sed -i	-e '/^#ChallengeResponseAuthentication yes$/c ChallengeResponseAuthentication no' \
+		-e '/^#UsePAM no$/c UsePAM yes' \
+		"$pkgdir"/etc/ssh/sshd_config
+}
diff --git a/testing/openssh/sshd b/testing/openssh/sshd
new file mode 100755
index 000000000..2ee1091f0
--- /dev/null
+++ b/testing/openssh/sshd
@@ -0,0 +1,48 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+. /etc/conf.d/sshd
+
+PIDFILE=/var/run/sshd.pid
+PID=$(cat $PIDFILE 2>/dev/null)
+if ! readlink -q /proc/$PID/exe | grep -q '^/usr/sbin/sshd'; then
+  PID=
+  rm $PIDFILE 2>/dev/null
+fi
+
+case "$1" in
+  start)
+    stat_busy "Starting Secure Shell Daemon"
+    [ -f /etc/ssh/ssh_host_key ] || { /usr/bin/ssh-keygen -t rsa1 -N "" -f /etc/ssh/ssh_host_key >/dev/null; }
+    [ -f /etc/ssh/ssh_host_rsa_key ] || { /usr/bin/ssh-keygen -t rsa -N "" -f /etc/ssh/ssh_host_rsa_key >/dev/null; }
+    [ -f /etc/ssh/ssh_host_dsa_key ] || { /usr/bin/ssh-keygen -t dsa -N "" -f /etc/ssh/ssh_host_dsa_key >/dev/null; }
+    [ -f /etc/ssh/ssh_host_ecdsa_key ] || { /usr/bin/ssh-keygen -t ecdsa -N "" -f /etc/ssh/ssh_host_ecdsa_key >/dev/null; }
+    [ -d /var/empty ] || mkdir -p /var/empty
+    [ -z "$PID" ] && /usr/sbin/sshd $SSHD_ARGS
+    if [ $? -gt 0 ]; then
+      stat_fail
+    else
+      add_daemon sshd
+      stat_done
+    fi
+    ;;
+  stop)
+    stat_busy "Stopping Secure Shell Daemon"
+    [ ! -z "$PID" ]  && kill $PID &> /dev/null
+    if [ $? -gt 0 ]; then
+      stat_fail
+    else
+      rm_daemon sshd
+      stat_done
+    fi
+    ;;
+  restart)
+    $0 stop
+    sleep 1
+    $0 start
+    ;;
+  *)
+    echo "usage: $0 {start|stop|restart}"  
+esac
+exit 0
diff --git a/testing/openssh/sshd.confd b/testing/openssh/sshd.confd
new file mode 100644
index 000000000..5ce7c0079
--- /dev/null
+++ b/testing/openssh/sshd.confd
@@ -0,0 +1,4 @@
+#
+# Parameters to be passed to sshd
+#
+SSHD_ARGS=""
diff --git a/testing/openssh/sshd.pam b/testing/openssh/sshd.pam
new file mode 100644
index 000000000..ae028ceb5
--- /dev/null
+++ b/testing/openssh/sshd.pam
@@ -0,0 +1,10 @@
+#%PAM-1.0
+#auth		required	pam_securetty.so	#Disable remote root
+auth		required	pam_unix.so
+auth		required	pam_env.so
+account		required	pam_nologin.so
+account		required	pam_unix.so
+account		required	pam_time.so
+password	required	pam_unix.so
+session		required	pam_unix_session.so
+session		required	pam_limits.so
diff --git a/testing/php-apc/PKGBUILD b/testing/php-apc/PKGBUILD
new file mode 100644
index 000000000..b13f84bc4
--- /dev/null
+++ b/testing/php-apc/PKGBUILD
@@ -0,0 +1,30 @@
+# $Id: PKGBUILD 122195 2011-05-02 19:06:00Z pierre $
+# Maintainer: Pierre Schmitz <pierre@archlinux.de>
+
+pkgname=php-apc
+pkgver=3.1.8
+pkgrel=1
+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'
+depends=('php')
+license="PHP"
+source=("http://pecl.php.net/get/APC-${pkgver}.tgz")
+backup=('etc/php/conf.d/apc.ini')
+md5sums=('bb1147933a61aa70ceffe53cc6f2920f')
+
+build() {
+	cd $srcdir/APC-$pkgver
+	phpize
+	./configure --prefix=/usr
+	make
+}
+
+package() {
+	cd $srcdir/APC-$pkgver
+	make INSTALL_ROOT=$pkgdir install
+	echo ';extension=apc.so' > apc.ini
+	install -D -m644 apc.ini $pkgdir/etc/php/conf.d/apc.ini
+	install -D -m644 apc.php $pkgdir/usr/share/php-apc/apc.php
+	install -D -m644 INSTALL $pkgdir/usr/share/doc/php-apc/install.txt
+}
author	root <root@rshg047.dnsready.net>	2011-05-04 12:58:32 +0000
committer	root <root@rshg047.dnsready.net>	2011-05-04 12:58:32 +0000
commit	9780d07c31b22125ad7ecba4e281ff41194f95be (patch)
tree	2336cb3e1bd98fe4b7631eb175c25f90a243815a
parent	ddb2605f6bccbdb398f3937ff21e4688915a450d (diff)