Wed May 2 00:01:22 UTC 2012

author: root <root@rshg054.dnsready.net> 2012-05-02 00:01:22 +0000
committer: root <root@rshg054.dnsready.net> 2012-05-02 00:01:22 +0000
commit: defe74c9cba07c321ad2869d8f6872e64a167324 (patch)
tree: 22377a98049a863983b9a28d9d79fc737f665cc3
parent: 752015395fc8b95cc4a86b68189cb747fe9a8499 (diff)
116 files changed, 1221 insertions, 550 deletions
diff --git a/community-testing/doublecmd/PKGBUILD b/community-testing/doublecmd/PKGBUILD
new file mode 100644
index 000000000..876006ea8
--- /dev/null
+++ b/community-testing/doublecmd/PKGBUILD
@@ -0,0 +1,56 @@
+# $Id: PKGBUILD 70139 2012-04-30 15:37:26Z idevolder $
+# Maintainer: BlackIkeEagle <ike DOT devolder AT gmail DOT com>
+# Contributor: (sirocco AT ngs.ru)
+
+pkgbase=doublecmd
+pkgname=('doublecmd-gtk2' 'doublecmd-qt')
+pkgver=0.5.4
+_helpver=0.5.1
+pkgrel=2
+url="http://doublecmd.sourceforge.net/"
+arch=('i686' 'x86_64')
+license=('GPL')
+install="$pkgbase.install"
+provides=("$pkgbase")
+makedepends=('lazarus' 'qt4pas' 'gtk2')
+optdepends=('lua: scripting' 'p7zip: support for 7zip archives' 'libunrar: support for rar archives')
+source=("http://downloads.sourceforge.net/project/$pkgbase/Double%20Commander%20Source/$pkgbase-$pkgver-src.tar.gz"
+	"http://downloads.sourceforge.net/project/$pkgbase/Double%20Commander%20Source/$pkgbase-help-$_helpver-src.tar.gz"
+)
+sha256sums=('480b83279adeba007ad5c54f455733fae3d9c9ee61762e6b5a63e2e67b1cd7b7'
+            'd9f518e05e089b71aaa31c7d4af8177e77594a02be2c316e85e061e63b4c03e5')
+
+build() {
+	cp -a $pkgbase-$pkgver $pkgbase-gtk
+	cp -a $pkgbase-$pkgver $pkgbase-qt
+
+	cd "$srcdir/$pkgbase-gtk"
+	./build.sh beta gtk2
+
+	cd "$srcdir/$pkgbase-qt"
+	./build.sh beta qt
+}
+
+package_doublecmd-gtk2() {
+	pkgdesc="twin-panel (commander-style) file manager (GTK)"
+	depends=('gtk2')
+	cd "$srcdir/$pkgbase-gtk"
+	sed -e 's/LIB_SUFFIX=.*/LIB_SUFFIX=/g' -i ./install/linux/install.sh
+	./install/linux/install.sh --install-prefix="$pkgdir"
+
+	# install doc
+	cd "$srcdir/$pkgbase-help-$_helpver"
+	cp -a * "$pkgdir/usr/share/$pkgbase/doc/"
+}
+
+package_doublecmd-qt() {
+	pkgdesc="twin-panel (commander-style) file manager (QT)"
+	depends=('qt4pas')
+	cd "$srcdir/$pkgbase-qt"
+	sed -e 's/LIB_SUFFIX=.*/LIB_SUFFIX=/g' -i ./install/linux/install.sh
+	./install/linux/install.sh --install-prefix="$pkgdir"
+
+	# install doc
+	cd "$srcdir/$pkgbase-help-$_helpver"
+	cp -a * "$pkgdir/usr/share/$pkgbase/doc/"
+}
diff --git a/community-testing/doublecmd/doublecmd.install b/community-testing/doublecmd/doublecmd.install
new file mode 100644
index 000000000..40d56528f
--- /dev/null
+++ b/community-testing/doublecmd/doublecmd.install
@@ -0,0 +1,34 @@
+update_icons() {
+
+	# Setup Menus
+	if which update-desktop-database
+	then
+		update-desktop-database -q /usr/share/applications
+	fi
+
+	# Setup MIME types
+	if which update-mime-database
+	then
+		update-mime-database /usr/share/mime >/dev/null
+	fi
+
+	# Setup Icons
+	touch -c /usr/share/icons/hicolor
+	if which gtk-update-icon-cache
+	then
+		gtk-update-icon-cache -tq /usr/share/icons/hicolor
+	fi
+
+}
+
+post_install() {
+	update_icons
+}
+
+post_upgrade() {
+	update_icons
+}
+
+post_remove() {
+	update_icons
+}
diff --git a/community-testing/i3lock/PKGBUILD b/community-testing/i3lock/PKGBUILD
new file mode 100644
index 000000000..8a422ad18
--- /dev/null
+++ b/community-testing/i3lock/PKGBUILD
@@ -0,0 +1,33 @@
+# $Id: PKGBUILD 70151 2012-04-30 19:56:29Z ttopper $
+# Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de>
+
+pkgname=i3lock
+pkgver=2.4
+pkgrel=2
+pkgdesc="An improved screenlocker based upon XCB and PAM"
+arch=('i686' 'x86_64')
+url="http://i3wm.org/i3lock/"
+license=('MIT')
+groups=("i3")
+depends=('xcb-util-image' 'xcb-util-keysyms' 'pam' 'libev' 'libx11' 'cairo')
+options=('docs')
+source=("http://i3wm.org/i3lock/$pkgname-$pkgver.tar.bz2")
+md5sums=('728e2654d886ef97449708f0135e9fa5')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make
+  gzip i3lock.1
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+  
+  install -Dm644 i3lock.1.gz ${pkgdir}/usr/share/man/man1/i3lock.1.gz
+  install -Dm644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+  make clean
+}
+
+# vim:set ts=2 sw=2 et:
+
diff --git a/community-testing/lazarus/ChangeLog b/community-testing/lazarus/ChangeLog
new file mode 100644
index 000000000..0a843b0ec
--- /dev/null
+++ b/community-testing/lazarus/ChangeLog
@@ -0,0 +1,9 @@
+2012-04-30  BlackIkeEagle
+	* split pkgbuild
+	* lazarus (can be used for compiling)
+	* lazarus-qt (qt ide)
+	* lazarus-gtk (gtk ide)
+
+2008-01-21  JJDaNiMoTh  <jjdanimoth.aur@gmail.com>
+
+    * PKGBUILD: moved man pages to /usr/share
diff --git a/community-testing/lazarus/PKGBUILD b/community-testing/lazarus/PKGBUILD
new file mode 100644
index 000000000..4695ff728
--- /dev/null
+++ b/community-testing/lazarus/PKGBUILD
@@ -0,0 +1,119 @@
+# $Id: PKGBUILD 70131 2012-04-30 09:46:32Z idevolder $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Contributor: Jens Adam (byte/jra) <j_adam@web.de>
+# Contributor: BlackIkeEagle <ike DOT devolder AT gmail DOT com>
+
+pkgbase=lazarus
+pkgname=('lazarus' 'lazarus-gtk2' 'lazarus-qt')
+pkgver=0.9.30.4
+pkgrel=2
+url='http://www.lazarus.freepascal.org/'
+license=('GPL2' 'MPL' 'custom:LGPL')
+arch=('i686' 'x86_64')
+makedepends=('fpc' 'fpc-src' 'gtk2' 'qt4pas' 'rsync')
+options=('!emptydirs' '!makeflags')
+source=(http://downloads.sourceforge.net/project/lazarus/Lazarus%20Zip%20_%20GZip/Lazarus%20$pkgver/lazarus-$pkgver-src.tar.bz2)
+md5sums=('ebd40cdfdfc4b66d1ced7a0d48d6da84')
+
+build() {
+  cd $srcdir/${pkgbase}
+
+  # build gtk2 ide
+  make FPC=/usr/bin/fpc LCL_PLATFORM=gtk2 clean bigide
+  # move gtk binaries
+  mv lazarus lazarus-gtk2
+  mv startlazarus startlazarus-gtk2
+
+  # build qt ide
+  make FPC=/usr/bin/fpc LCL_PLATFORM=qt bigide
+  # move qt binaries
+  mv lazarus lazarus-qt
+  mv startlazarus startlazarus-qt
+}
+
+package_lazarus() {
+  pkgdesc='Delphi-like IDE for FreePascal common files'
+  depends=('fpc' 'fpc-src')
+  optdepends=(
+    'perl: to run some scirpts in the tools directory'
+    'gtk2: to compile gtk2 apps'
+    'qt4pas: to compile qt apps'
+  )
+
+  cd $srcdir/${pkgbase}
+
+  # skip the 'make install' mess completely and do everything manually
+  mkdir -p $pkgdir/usr/lib/lazarus $pkgdir/usr/bin $pkgdir/usr/share/man/man1 $pkgdir/usr/share/doc
+  rsync -a \
+    --exclude="CVS"     --exclude=".cvsignore" \
+    --exclude="*.ppw"   --exclude="*.ppl" \
+    --exclude="*.ow"    --exclude="*.a"\
+    --exclude="*.rst"   --exclude=".#*" \
+    --exclude="*.~*"    --exclude="*.bak" \
+    --exclude="*.orig"  --exclude="*.rej" \
+    --exclude=".xvpics" --exclude="*.compiled" \
+    --exclude="killme*" --exclude=".gdb_hist*" \
+    --exclude="debian"  --exclude="COPYING*" \
+    --exclude="*.app"   --exclude="Makefile*" \
+    --exclude="tools/install" \
+    . "$pkgdir"/usr/lib/lazarus
+
+  #remove some stuff, not needed or for in other package
+  pushd $pkgdir/usr/lib/lazarus
+  rm lazarus-*
+  rm startlazarus-*
+  popd
+
+  ln -s /usr/lib/lazarus/lazbuild $pkgdir/usr/bin/lazbuild
+  cp -R install/man/man1/* $pkgdir/usr/share/man/man1/
+  mv $pkgdir/usr/lib/lazarus/docs $pkgdir/usr/share/doc/lazarus
+  rm -r $pkgdir/usr/lib/lazarus/install
+
+  # license files: /usr/lib/lazarus/COPYING*
+  install -D -m644 COPYING.modifiedLGPL.txt $pkgdir/usr/share/licenses/$pkgbase/COPYING.modifiedLGPL
+}
+
+package_lazarus-gtk2() {
+  pkgdesc='Delphi-like IDE for FreePascal gtk2 version'
+  depends=('lazarus' 'desktop-file-utils' 'gtk2')
+  conflicts=('lazarus-qt')
+  install='lazarus-ide.install'
+
+  cd $srcdir/${pkgbase}
+
+  # install gtk binaries
+  install -Dm755 lazarus-gtk2 $pkgdir/usr/lib/lazarus/lazarus
+  install -Dm755 startlazarus-gtk2 $pkgdir/usr/lib/lazarus/startlazarus
+  install -dm755 $pkgdir/usr/bin
+  ln -s /usr/lib/lazarus/lazarus $pkgdir/usr/bin/lazarus
+  ln -s /usr/lib/lazarus/startlazarus $pkgdir/usr/bin/startlazarus
+
+  # make 'desktop-file-validate' happy and fix missing .png icon
+  sed -e 's|\(Categories\).*|\1=IDE;Development;|' \
+    -e 's|\.png|\.xpm|' -i install/lazarus.desktop
+  install -Dm644 install/lazarus.desktop $pkgdir/usr/share/applications/lazarus.desktop
+  install -Dm644 images/ide_icon48x48.png $pkgdir/usr/share/pixmaps/lazarus.png
+}
+
+package_lazarus-qt() {
+  pkgdesc='Delphi-like IDE for FreePascal qt version'
+  depends=('lazarus' 'qt4pas')
+  conflicts=('lazarus-gtk2')
+  install='lazarus-ide.install'
+
+  cd $srcdir/${pkgbase}
+
+  # install qt binaries
+  install -Dm755 lazarus-qt $pkgdir/usr/lib/lazarus/lazarus
+  install -Dm755 startlazarus-qt $pkgdir/usr/lib/lazarus/startlazarus
+  install -dm755 $pkgdir/usr/bin
+  ln -s /usr/lib/lazarus/lazarus $pkgdir/usr/bin/lazarus
+  ln -s /usr/lib/lazarus/startlazarus $pkgdir/usr/bin/startlazarus
+
+  # make 'desktop-file-validate' happy and fix missing .png icon
+  sed -e 's|\(Categories\).*|\1=IDE;Development;|' \
+    -e 's|\.png|\.xpm|' -i install/lazarus.desktop
+  install -Dm644 install/lazarus.desktop $pkgdir/usr/share/applications/lazarus.desktop
+  install -Dm644 images/ide_icon48x48.png $pkgdir/usr/share/pixmaps/lazarus.png
+}
+# vim:set ts=2 sts=2 sw=2 et:
diff --git a/community-testing/lazarus/lazarus-ide.install b/community-testing/lazarus/lazarus-ide.install
new file mode 100644
index 000000000..40d56528f
--- /dev/null
+++ b/community-testing/lazarus/lazarus-ide.install
@@ -0,0 +1,34 @@
+update_icons() {
+
+	# Setup Menus
+	if which update-desktop-database
+	then
+		update-desktop-database -q /usr/share/applications
+	fi
+
+	# Setup MIME types
+	if which update-mime-database
+	then
+		update-mime-database /usr/share/mime >/dev/null
+	fi
+
+	# Setup Icons
+	touch -c /usr/share/icons/hicolor
+	if which gtk-update-icon-cache
+	then
+		gtk-update-icon-cache -tq /usr/share/icons/hicolor
+	fi
+
+}
+
+post_install() {
+	update_icons
+}
+
+post_upgrade() {
+	update_icons
+}
+
+post_remove() {
+	update_icons
+}
diff --git a/community-testing/open-vm-tools/PKGBUILD b/community-testing/open-vm-tools/PKGBUILD
index 7948a6b23..3aec1baa0 100644
--- a/community-testing/open-vm-tools/PKGBUILD
+++ b/community-testing/open-vm-tools/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 70004 2012-04-28 03:49:34Z ebelanger $
+# $Id: PKGBUILD 70159 2012-04-30 23:16:41Z ebelanger $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Krzysztof Raczkowski <raczkow@gmail.com>
 
 pkgname=open-vm-tools
 pkgver=2012.03.13
 _pkgsubver=651368
-pkgrel=3
+pkgrel=4
 pkgdesc="The Open Virtual Machine Tools (open-vm-tools) are the open source implementation of VMware Tools"
 arch=('i686' 'x86_64')
 url="http://open-vm-tools.sourceforge.net/"
@@ -31,7 +31,7 @@ md5sums=('a664206443d5de53f5f8ee8d5fe6c2d7'
          '79b0a14d86191fee70a4639da8bd7785'
          '67cb83a9e5a4dd016c1a1da2863ca36d'
          'b55d15e2c4be396aad709aeca91033d3'
-         '73cc1a2665b0dd62427733d62ead8b9a'
+         '1b9ae908fce4c623269f100ee9bdfdef'
          '75a25d83417e683957321f97a00f8465')
 
 build() {
diff --git a/community-testing/open-vm-tools/vmware-guestd b/community-testing/open-vm-tools/vmware-guestd
index ac80c0385..f8ea34fc0 100644
--- a/community-testing/open-vm-tools/vmware-guestd
+++ b/community-testing/open-vm-tools/vmware-guestd
@@ -1,6 +1,6 @@
 #%PAM-1.0
 
-auth    sufficient      /lib/security/pam_unix2.so      shadow  nullok
-auth    required        /lib/security/pam_unix_auth.so  shadow  nullok
-account sufficient      /lib/security/pam_unix2.so
-account required        /lib/security/pam_unix_acct.so
+auth    sufficient      pam_unix2.so      shadow  nullok
+auth    required        pam_unix_auth.so  shadow  nullok
+account sufficient      pam_unix2.so
+account required        pam_unix_acct.so
diff --git a/community-testing/qingy/PKGBUILD b/community-testing/qingy/PKGBUILD
new file mode 100644
index 000000000..eede5ca9d
--- /dev/null
+++ b/community-testing/qingy/PKGBUILD
@@ -0,0 +1,36 @@
+# $Id: PKGBUILD 70157 2012-04-30 23:01:40Z ebelanger $
+# Maintainer: Eric Bélanger <eric@archlinux.org>
+# Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+
+pkgname=qingy
+pkgver=1.0.0
+pkgrel=4
+pkgdesc="A DirectFB getty replacement"
+arch=('i686' 'x86_64')
+url="http://qingy.sourceforge.net/"
+license=('GPL')
+depends=('directfb' 'openssl' 'libxss')
+makedepends=('emacs')
+backup=('etc/qingy/settings' 'etc/qingy/welcomes')
+options=('!libtool')
+install=qingy.install
+source=(http://downloads.sourceforge.net/sourceforge/qingy/${pkgname}-${pkgver}.tar.bz2 \
+        qingy.logrotate)
+md5sums=('1e0912655e240adfd0ce5ced30bbc685'
+         'a9bdfd0ac9f29380eafa97a4a056789d')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  sed -i 's|/lib/security/||' media/pam/default/qingy
+  XFREE=/usr/bin/Xorg XINIT=/usr/bin/xinit \
+    ./configure --prefix=/usr --sbindir=/sbin --sysconfdir=/etc \
+    --disable-optimizations --enable-pam \
+    --disable-static-build --enable-gpm-lock --enable-emacs
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+  install -D -m644 "${srcdir}/qingy.logrotate" "${pkgdir}/etc/logrotate.d/qingy"
+}
diff --git a/community-testing/qingy/qingy.install b/community-testing/qingy/qingy.install
new file mode 100644
index 000000000..5cf234b72
--- /dev/null
+++ b/community-testing/qingy/qingy.install
@@ -0,0 +1,18 @@
+infodir=usr/share/info
+filelist=(qingy.info.gz)
+
+post_install() {
+  for file in ${filelist[@]}; do
+    install-info $infodir/$file $infodir/dir 2> /dev/null
+  done
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  for file in ${filelist[@]}; do
+    install-info --delete $infodir/$file $infodir/dir 2> /dev/null
+  done
+}
diff --git a/community-testing/qingy/qingy.logrotate b/community-testing/qingy/qingy.logrotate
new file mode 100644
index 000000000..e16fb8d2a
--- /dev/null
+++ b/community-testing/qingy/qingy.logrotate
@@ -0,0 +1,9 @@
+/var/log/qingy.log {
+    compress
+    rotate 1
+    size=+1024k
+    notifempty
+    missingok
+    copytruncate
+    noolddir
+}
diff --git a/community-testing/qt4pas/PKGBUILD b/community-testing/qt4pas/PKGBUILD
new file mode 100644
index 000000000..5cc5f9946
--- /dev/null
+++ b/community-testing/qt4pas/PKGBUILD
@@ -0,0 +1,35 @@
+# $Id: PKGBUILD 70124 2012-04-30 08:20:40Z idevolder $
+# Maintainer: BlackIkeEagle <ike DOT devolder AT gmail DOT com>
+# Contributor: Fabien Wang <fabien(dot)wang(at)gmail(dot)com>
+
+pkgname=qt4pas
+pkgver=2.5
+pkgrel=1
+pkgdesc="Free Pascal Qt4 Binding Library"
+arch=('i686' 'x86_64')
+url="http://users.telenet.be/Jan.Van.hijfte/qtforfpc/fpcqt4.html"
+license=('LGPL')
+depends=('qtwebkit')
+source=("http://users.telenet.be/Jan.Van.hijfte/qtforfpc/V2.5/qt4pas-V2.5_Qt4.5.3.tar.gz")
+md5sums=('8249bc17e4167e077d22c7f5fb118bb2')
+
+build() {
+	cd "$srcdir/qt4pas-V2.5_Qt4.5.3/"
+
+	sed -ie "s:target\.path = :target\.path = $pkgdir:g" Qt4Pas.pro
+
+	qmake -query
+	qmake
+	make
+}
+
+package() {
+	cd "$srcdir/qt4pas-V2.5_Qt4.5.3/"
+	make install
+
+	pushd "$pkgdir/usr/lib"
+	for intflink in 'libqt4intf.so' 'libqt4intf.so.5' 'libqt4intf.so.5.2' 'libqt4intf.so.5.2.1' 'libqt4intf.so.5.2.5'; do
+		ln -s libQt4Pas.so.5.2.5 $intflink
+	done
+	popd
+}
diff --git a/community/devil/PKGBUILD b/community/devil/PKGBUILD
index 06eed72cd..d14588959 100644
--- a/community/devil/PKGBUILD
+++ b/community/devil/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 63526 2012-02-05 11:53:30Z ibiru $
+# $Id: PKGBUILD 70147 2012-04-30 19:17:33Z lcarlier $
 # Maintainer: Laurent Carlier <lordheavym@gmail.org>
 # Contributor: damir <damir@archlinux.org>
 # Contributor: TheHoff <forums>
 
 pkgname=devil
 pkgver=1.7.8
-pkgrel=10
+pkgrel=11
 pkgdesc="Library for reading several different image formats"
 arch=('i686' 'x86_64')
 url="http://openil.sourceforge.net/"
@@ -18,16 +18,21 @@ md5sums=('7918f215524589435e5ec2e8736d5e1d'
          '0f839ccefd43b0ee8b4b3f99806147fc')
 
 build() {
-   cd ${srcdir}/devil-$pkgver
+  cd ${srcdir}/devil-$pkgver
 
-   patch -Np1 -i ${srcdir}/libpng14.patch
+  patch -Np1 -i ${srcdir}/libpng14.patch
 
-   ./configure --prefix=/usr --enable-ILU
-   make
+  if [[ $CARCH == x86_64 ]]; then
+    ./configure --prefix=/usr --enable-ILU
+  else
+    ./configure --prefix=/usr --enable-ILU --disable-sse3
+  fi
+
+  make
 }
 
 package() {
-   cd ${srcdir}/devil-$pkgver
+  cd ${srcdir}/devil-$pkgver
 
-   make prefix=${pkgdir}/usr install
+  make prefix=${pkgdir}/usr install
 }
diff --git a/community/dvdisaster/PKGBUILD b/community/dvdisaster/PKGBUILD
index 66ad45549..15dcb0a07 100644
--- a/community/dvdisaster/PKGBUILD
+++ b/community/dvdisaster/PKGBUILD
@@ -1,10 +1,8 @@
-# $Id: PKGBUILD 67594 2012-03-13 13:14:16Z lcarlier $
-# Contributor: Biru Ionut <ionut@archlinux.ro>
-# Contributor: Luke McCarthy <luke@iogopro.co.uk>
-# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
+# $Id: PKGBUILD 70165 2012-05-01 03:12:33Z ebelanger $
+# Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=dvdisaster
-pkgver=0.72.3
+pkgver=0.72.4
 pkgrel=1
 pkgdesc="Provides a margin of safety against data loss on CD and DVD media caused by aging or scratches"
 arch=('i686' 'x86_64')
@@ -13,17 +11,11 @@ license=('GPL')
 depends=('gtk2')
 options=('!makeflags')
 source=(http://dvdisaster.net/downloads/${pkgname}-${pkgver}.tar.bz2 dvdisaster.desktop)
-md5sums=('4eb09c1aa3cdbc1dafdb075148fb471d'
-         '3a0d6657c47b20a43b93c0e5d58d755a')
-sha1sums=('6ed08f8e52f4b90b39134b0caf9b5f0df221b0da'
-          'b1e6f372508157923bbb83da7b9af2a51137c589')
+sha1sums=('2b47fb5a5535d90641f24a599cd8ae8ffd86b972'
+          'a802dfcee3aa35bdc4b0b5ecabcf32760cd8b992')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-
-  # fix png tools building with libpng-1.5.x
-  sed -i '24i#include <zlib.h>' tools/pngio.h
-
   ./configure --prefix=/usr \
     --mandir=/usr/share/man --docdir=/usr/share/doc \
     --localedir=/usr/share/locale \
@@ -36,7 +28,7 @@ package() {
 
   make BUILDROOT="${pkgdir}" install
   rm -f "${pkgdir}/usr/bin/dvdisaster-uninstall.sh"
-  install -D -m 644 ${srcdir}/dvdisaster.desktop \
+  install -D -m 644 "${srcdir}/dvdisaster.desktop" \
     "${pkgdir}/usr/share/applications/dvdisaster.desktop"
   install -D -m 644 icons/create.png \
     "${pkgdir}/usr/share/pixmaps/dvdisaster.png"
diff --git a/community/dvdisaster/dvdisaster.desktop b/community/dvdisaster/dvdisaster.desktop
index 9c7296764..061a53846 100644
--- a/community/dvdisaster/dvdisaster.desktop
+++ b/community/dvdisaster/dvdisaster.desktop
@@ -1,14 +1,10 @@
 [Desktop Entry]
-Comment=
 Encoding=UTF-8
 Exec=dvdisaster
 GenericName=DVD Recovery Tool
 Icon=dvdisaster
-MimeType=
 Name=dvdisaster
-Path=
 StartupNotify=true
 Terminal=false
-TerminalOptions=
 Type=Application
 Categories=AudioVideo;GTK;
diff --git a/community/kadu/PKGBUILD b/community/kadu/PKGBUILD
index 01e488c1b..ee0c81f46 100644
--- a/community/kadu/PKGBUILD
+++ b/community/kadu/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 69022 2012-04-08 09:21:56Z bpiotrowski $
+# $Id: PKGBUILD 70153 2012-04-30 20:50:12Z bpiotrowski $
 # Maintainer:  Bartłomiej Piotrowski
 # Contributor: Mateusz Herych
 # Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org>
 
 pkgname=kadu
-pkgver=0.11.2
+pkgver=0.11.3
 pkgrel=1
 pkgdesc="A Qt-based Jabber/XMPP and Gadu-Gadu client"
 arch=('i686' 'x86_64')
@@ -14,7 +14,7 @@ depends=('libgadu' 'libxss' 'aspell' 'phonon' 'qca-ossl' 'libidn' 'libmpdclient'
 makedepends=('cmake' 'libao' 'libsndfile' 'libxtst' 'curl')
 install=kadu.install
 source=(http://download.kadu.im/stable/$pkgname-$pkgver.tar.bz2)
-md5sums=('ddfe05f1c947e9ff897f37804ecbd7d4')
+md5sums=('fc70882b86bdb04cb0835b2cf014b8aa')
 
 build() {
   cd "$srcdir"
diff --git a/community/nodejs/PKGBUILD b/community/nodejs/PKGBUILD
index 565b2a9b1..9d9c06e8c 100644
--- a/community/nodejs/PKGBUILD
+++ b/community/nodejs/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 69141 2012-04-09 18:43:26Z tdziedzic $
+# $Id: PKGBUILD 70146 2012-04-30 19:17:20Z tdziedzic $
 # Maintainer: Thomas Dziedzic < gostrc at gmail >
 # Contributor: James Campos <james.r.campos@gmail.com>
 # Contributor: BlackEagle < ike DOT devolder AT gmail DOT com >
@@ -7,7 +7,7 @@
 # Contributor: TIanyi Cui <tianyicui@gmail.com>
 
 pkgname=nodejs
-pkgver=0.6.15
+pkgver=0.6.16
 pkgrel=1
 pkgdesc='Evented I/O for V8 javascript'
 arch=('i686' 'x86_64')
@@ -18,7 +18,7 @@ checkdepends=('curl') # curl used for check()
 optdepends=('openssl: TLS support')
 options=('!emptydirs')
 source=("http://nodejs.org/dist/v${pkgver}/node-v${pkgver}.tar.gz")
-md5sums=('852cfb1ed8125a4cdba456446d869d19')
+md5sums=('e056d180d1ae50e615aab800b93a95bd')
 
 build() {
   cd node-v${pkgver}
diff --git a/community/parole/PKGBUILD b/community/parole/PKGBUILD
index 38338fa4f..e2215d8f2 100644
--- a/community/parole/PKGBUILD
+++ b/community/parole/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 56327 2011-10-05 16:30:16Z spupykin $
+# $Id: PKGBUILD 70116 2012-04-30 04:19:56Z foutrelis $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: TDY <tdy@gmx.com>
 
 pkgname=parole
 pkgver=0.2.0.6
-pkgrel=1
+pkgrel=2
 pkgdesc="A modern media player based on the GStreamer framework"
 arch=('i686' 'x86_64')
 url="http://goodies.xfce.org/projects/applications/parole/"
 license=('GPL')
 depends=('gstreamer0.10-base>=0.10.11' 'hicolor-icon-theme' 'libnotify>=0.4.1'
-         'libxfcegui4>=4.6.0' 'taglib>=1.4')
+         'libxfcegui4>=4.6.0' 'taglib>=1.4' 'desktop-file-utils')
 makedepends=('pkgconfig>=0.9.0' 'xfce4-dev-tools')
 optdepends=('xulrunner>=1.9.1: browser plugin')
 conflicts=('parole-media-player-git')
@@ -21,6 +21,10 @@ md5sums=('5d7e5ab7535bdf89508a8d7e551f9187')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
+
+  # Work around DSO linking issue
+  LDFLAGS+=' -lX11'
+
   ./configure --prefix=/usr --libexecdir=/usr/lib --enable-taglib --enable-libnotify
   make
 }
diff --git a/community/parole/parole.install b/community/parole/parole.install
index 17ca8f78a..dcc06de40 100644
--- a/community/parole/parole.install
+++ b/community/parole/parole.install
@@ -1,5 +1,6 @@
 post_install() {
   gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+  update-desktop-database -q
 }
 
 post_upgrade() {
diff --git a/community/ristretto/PKGBUILD b/community/ristretto/PKGBUILD
index 4dbc96b42..33237e893 100644
--- a/community/ristretto/PKGBUILD
+++ b/community/ristretto/PKGBUILD
@@ -1,21 +1,21 @@
-# $Id: PKGBUILD 68760 2012-04-01 18:23:28Z bpiotrowski $
+# $Id: PKGBUILD 70118 2012-04-30 04:20:02Z foutrelis $
 # Maintainer:  Bartłomiej Piotrowski
 # Contributor: AndyRTR <andyrtr@archlinux.org>
 # Contributor: Ronald van Haren <ronald.archlinux.org>
 
 pkgname=ristretto
-pkgver=0.3.6
+pkgver=0.6.0
 pkgrel=1
 pkgdesc="A fast and lightweight picture-viewer for Xfce"
 arch=('i686' 'x86_64')
 url="http://goodies.xfce.org/projects/applications/ristretto"
 license=('GPL')
-depends=('libxfce4ui' 'libexif' 'exo' 'desktop-file-utils')
+depends=('libxfce4ui' 'libexif' 'desktop-file-utils')
 makedepends=('intltool')
 groups=('xfce4-goodies')
 install=ristretto.install
 source=("http://archive.xfce.org/src/apps/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2")
-md5sums=('8196617feb84b73247242910b64935e8')
+md5sums=('a61ef43cd325d985ecf71fcabf0c7940')
 
 build() {
   cd "${srcdir}/$pkgname-$pkgver"
diff --git a/community/rygel/PKGBUILD b/community/rygel/PKGBUILD
index 841d80fe6..3ae85986e 100644
--- a/community/rygel/PKGBUILD
+++ b/community/rygel/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 68534 2012-03-26 23:21:25Z bgyorgy $
+# $Id: PKGBUILD 70135 2012-04-30 13:23:26Z bgyorgy $
 # Maintainer: Balló György <ballogyor+arch at gmail dot com>
 
 pkgname=rygel
-pkgver=0.14.0
+pkgver=0.14.1
 pkgrel=1
 pkgdesc="UPnP AV MediaServer and MediaRenderer that allows you to easily share audio, video and pictures, and control of media player on your home network"
 arch=('i686' 'x86_64')
@@ -19,7 +19,7 @@ backup=('etc/rygel.conf')
 options=('!libtool')
 install=$pkgname.install
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('828c080eba89abaea34b94b5ab53b2f89bf03937cb3838c787ee17846b6d7e02')
+sha256sums=('c4f79fb30bc1a062a2ffdadc7a55dd91fa58240302f152fb070d8c674bdddd67')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/xfmedia/PKGBUILD b/community/xfmedia/PKGBUILD
index 2d2176b93..aad13ec98 100644
--- a/community/xfmedia/PKGBUILD
+++ b/community/xfmedia/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 61923 2012-01-10 23:42:04Z ebelanger $
+# $Id: PKGBUILD 70120 2012-04-30 04:20:16Z foutrelis $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer : Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer : Tom Killian <tomk@runbox.com>
@@ -6,7 +6,7 @@
 
 pkgname=xfmedia
 pkgver=0.9.2
-pkgrel=10
+pkgrel=11
 pkgdesc="xfce media player"
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -31,7 +31,7 @@ build() {
   patch -Np1 -i ../xfmedia-empty-prev-next-fix.patch
   patch -Np1 -i ../xfmedia-exo-0.6.patch
   patch -Np1 -i ../xfmedia-xine-1.2.0.patch
-  LDFLAGS="$LDFLAGS -lXext -lm" ./configure --prefix=/usr
+  LDFLAGS="$LDFLAGS -lXext -lm -lgmodule-2.0" ./configure --prefix=/usr
   make
 }
 
diff --git a/community/zeromq/PKGBUILD b/community/zeromq/PKGBUILD
index 0fe77e583..cea3eba27 100644
--- a/community/zeromq/PKGBUILD
+++ b/community/zeromq/PKGBUILD
@@ -1,20 +1,21 @@
-# $Id: PKGBUILD 69288 2012-04-12 13:09:04Z kkeen $
+# $Id: PKGBUILD 70149 2012-04-30 19:48:46Z kkeen $
 # Maintainer: Kyle Keen <keenerd@gmail.com>
 pkgname=zeromq
 pkgver=2.2.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Fast messaging system built on sockets, C and C++ bindings.  aka 0MQ, ZMQ."
 arch=('i686' 'x86_64')
 url="http://www.zeromq.org"
 license=('LGPL')
 depends=('gcc-libs' 'util-linux')
-makedepends=()
+makedepends=('python2')
 source=(http://download.zeromq.org/$pkgname-$pkgver.tar.gz)
-md5sums=('4a4b1da5a554ad8650f000c69d018f20')
+md5sums=('1b11aae09b19d18276d0717b2ea288f6')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
-  ./configure prefix=/usr
+  ./configure prefix=/usr --with-pgm
+  sed -i 's/python$/&2/' foreign/openpgm/build-staging/openpgm/pgm/{Makefile,version_generator.py}
   make
 }
 
diff --git a/core/inetutils/PKGBUILD b/core/inetutils/PKGBUILD
index 55f74f01e..a4bf827ca 100644
--- a/core/inetutils/PKGBUILD
+++ b/core/inetutils/PKGBUILD
@@ -1,35 +1,30 @@
-# $Id: PKGBUILD 146753 2012-01-17 02:18:51Z eric $
+# $Id: PKGBUILD 157926 2012-04-30 06:14:42Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=inetutils
 pkgver=1.9.1
-pkgrel=1
+pkgrel=2
 pkgdesc="A collection of common network programs"
 arch=('i686' 'x86_64')
 url="http://www.gnu.org/software/inetutils/"
 license=('GPL3')
 groups=('base')
 depends=('readline' 'ncurses' 'pam')
-provides=('netkit-ftp' 'netkit-rsh' 'netkit-telnet' 'netkit-ntalk')
-conflicts=('netkit-ftp' 'netkit-rsh' 'netkit-telnet' 'netkit-ntalk')
-replaces=('netkit-ftp' 'netkit-rsh' 'netkit-telnet' 'netkit-ntalk')
 backup=('etc/conf.d/ftpd' 'etc/xinetd.d/telnet' 'etc/xinetd.d/talk' \
-        'etc/xinetd.d/rexec' 'etc/xinetd.d/rlogin' 'etc/xinetd.d/rsh')
+        'etc/xinetd.d/rlogin' 'etc/xinetd.d/rsh')
 options=('!emptydirs')
 install=inetutils.install
 source=(http://ftp.gnu.org/gnu/inetutils/${pkgname}-${pkgver}.tar.gz{,.sig} \
-        ftpd.rc ftpd.conf telnet.xinetd talk.xinetd rexec.xinetd rlogin.xinetd rsh.xinetd \
-        dnsdomainname domainname)
+        ftpd.rc ftpd.conf telnet.xinetd talk.xinetd rlogin.xinetd rsh.xinetd \
+        dnsdomainname)
 sha1sums=('86b7eb11cfdaefb1d4e9bfc10620beaf8f09bc90'
           'ff0aad9946a38915580b094dadf67e790e8a2f87'
           '84dc802b5e57b5e04c847572225a3b9612017155'
           '68a590083b45997dfdb80e666b2de762f494ba74'
           'bfad98a4a62f1fff8779f076c6019ed07f9111af'
           '27d99b910eec0fc26bd79ccc2c1de26608330298'
-          '87aa4f38ebee9dac5dcaa04cbc3f2f0906bec605'
           '81f10b3b688e3952f793b35bcef63b5bf257a92b'
           '81f4a8da823cf0bb14284fc71ee6108849691eda'
-          'ac69756d6cc50157d430d863db04a5aac4688380'
           'eb952b0b9c3e3d429d8e21b110249e495f0e0e63')
 
 build() {
@@ -42,8 +37,8 @@ build() {
     --enable-talk --enable-talkd \
     --enable-rlogin --enable-rlogind \
     --enable-rsh --enable-rshd \
-    --enable-rexec --enable-rexecd \
     --enable-rcp --enable-hostname \
+    --disable-rexec --disable-rexecd \
     --disable-tftp --disable-tftpd \
     --disable-ping --disable-ping6 \
     --disable-logger --disable-syslogd \
@@ -63,15 +58,12 @@ package() {
 
   install -d "${pkgdir}/bin"
   ln -s /usr/bin/hostname "${pkgdir}/bin/hostname"
-  install -D -m755 "${srcdir}/domainname" "${pkgdir}/bin/domainname"
   install -D -m755 "${srcdir}/dnsdomainname" "${pkgdir}/bin/dnsdomainname"
-  echo ".so man1/hostname.1" > "${pkgdir}/usr/share/man/man1/domainname.1"
   echo ".so man1/hostname.1" > "${pkgdir}/usr/share/man/man1/dnsdomainname.1"
   install -D -m755 "${srcdir}/ftpd.rc" "${pkgdir}/etc/rc.d/ftpd"
   install -D -m644 "${srcdir}/ftpd.conf" "${pkgdir}/etc/conf.d/ftpd"
   install -D -m644 "${srcdir}/telnet.xinetd" "${pkgdir}/etc/xinetd.d/telnet"
   install -D -m644 "${srcdir}/talk.xinetd" "${pkgdir}/etc/xinetd.d/talk"
-  install -D -m644 "${srcdir}/rexec.xinetd" "${pkgdir}/etc/xinetd.d/rexec"
   install -D -m644 "${srcdir}/rlogin.xinetd" "${pkgdir}/etc/xinetd.d/rlogin"
   install -D -m644 "${srcdir}/rsh.xinetd" "${pkgdir}/etc/xinetd.d/rsh"
 }
diff --git a/core/inetutils/dnsdomainname b/core/inetutils/dnsdomainname
index 4bba209fe..a1b8a8c31 100644
--- a/core/inetutils/dnsdomainname
+++ b/core/inetutils/dnsdomainname
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-exec /usr/bin/hostname -y "$@"
+exec /usr/bin/hostname -d "$@"
diff --git a/core/libusb/PKGBUILD b/core/libusb/PKGBUILD
index 31f148fc1..801cd583b 100644
--- a/core/libusb/PKGBUILD
+++ b/core/libusb/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 142115 2011-11-05 10:15:17Z tpowa $
+# $Id: PKGBUILD 157958 2012-04-30 07:20:00Z tpowa $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 pkgname=libusb
-pkgver=1.0.8
-pkgrel=2
+pkgver=1.0.9
+pkgrel=1
 depends=('glibc')
 pkgdesc="Library to enable user space application programs to communicate with USB devices."
 arch=(i686 x86_64)
@@ -11,7 +11,7 @@ license=('LGPL')
 source=(http://downloads.sourceforge.net/libusb/libusb-${pkgver}.tar.bz2)
 options=(!libtool)
 replaces=(libusb1)
-md5sums=('37d34e6eaa69a4b645a19ff4ca63ceef')
+md5sums=('7f5a02375ad960d4e33a6dae7d63cfcb')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/core/mdadm/PKGBUILD b/core/mdadm/PKGBUILD
index 5c7819708..061fd9f6d 100644
--- a/core/mdadm/PKGBUILD
+++ b/core/mdadm/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 147125 2012-01-22 11:01:03Z tpowa $
+# $Id: PKGBUILD 157942 2012-04-30 07:17:54Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: Judd Vinet <jvinet@zeroflux.org>
 pkgname=mdadm
 pkgver=3.2.3
-pkgrel=1
+pkgrel=2
 pkgdesc="A tool for managing/monitoring Linux md device arrays, also known as Software RAID"
 arch=(i686 x86_64)
 license=('GPL')
@@ -41,13 +41,13 @@ build() {
 
 package() {
   cd $srcdir/$pkgname-$pkgver
-  make INSTALL=/bin/install DESTDIR=$pkgdir install
+  make INSTALL=/usr/bin/install DESTDIR=$pkgdir install
   install -D -m755 mdassemble $pkgdir/sbin/mdassemble
   install -D -m644 ../mdadm.conf $pkgdir/etc/mdadm.conf
   install -D -m755 ../mdadm $pkgdir/etc/rc.d/mdadm
-  install -D -m644 ../mdadm_install $pkgdir/lib/initcpio/install/mdadm
-  install -D -m644 ../mdadm_hook $pkgdir/lib/initcpio/hooks/mdadm
-  install -D -m644 ../mdadm_udev_install $pkgdir/lib/initcpio/install/mdadm_udev
+  install -D -m644 ../mdadm_install $pkgdir/usr/lib/initcpio/install/mdadm
+  install -D -m644 ../mdadm_hook $pkgdir/usr/lib/initcpio/hooks/mdadm
+  install -D -m644 ../mdadm_udev_install $pkgdir/usr/lib/initcpio/install/mdadm_udev
   # symlink for backward compatibility
-  ln -sf /lib/initcpio/hooks/mdadm  $pkgdir/lib/initcpio/hooks/raid
+  ln -sf /usr/lib/initcpio/hooks/mdadm  $pkgdir/usr/lib/initcpio/hooks/raid
 }
diff --git a/core/openldap/PKGBUILD b/core/openldap/PKGBUILD
index 665a82a85..191b43974 100644
--- a/core/openldap/PKGBUILD
+++ b/core/openldap/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 154404 2012-03-27 21:06:23Z eric $
+# $Id: PKGBUILD 158014 2012-05-01 02:11:44Z eric $
 # Maintainer:
 
 pkgbase=openldap
 pkgname=('libldap' 'openldap')
-pkgver=2.4.30
+pkgver=2.4.31
 pkgrel=1
 arch=('i686' 'x86_64')
 url="http://www.openldap.org/"
@@ -13,7 +13,7 @@ source=(ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/${pkgbase}-${pkgver
         slapd slapd.default
         ntlm.patch
         mutex-end-of-struct-sigsegv.patch)
-sha1sums=('7447e89b9a5199f9bb2231bda42c308a1b6513d9'
+sha1sums=('8315a283fb3724abe6062e38d93bb69298d05765'
           'bd1ea19256d3d467f1f803e0f4046ef50f17628f'
           'd89b8a533045123f1ab46c9c430cf132d58a20a4'
           'e4afd9f1c810ef4c4cd8fe1101dfe5887f2b7eef'
diff --git a/core/openssh/PKGBUILD b/core/openssh/PKGBUILD
index e4e2520ac..66fb4603c 100644
--- a/core/openssh/PKGBUILD
+++ b/core/openssh/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 157127 2012-04-24 08:19:54Z bisson $
+# $Id: PKGBUILD 157930 2012-04-30 06:17:08Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Aaron Griffin <aaron@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 
 pkgname=openssh
 pkgver=6.0p1
-pkgrel=1
+pkgrel=2
 pkgdesc='Free version of the SSH connectivity tools'
 url='http://www.openssh.org/portable.html'
 license=('custom:BSD')
@@ -20,7 +20,7 @@ source=("ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname}-${pkgver}
 sha1sums=('f691e53ef83417031a2854b8b1b661c9c08e4422'
           '954bf1660aa32620c37034320877f4511b767ccb'
           'ec102deb69cad7d14f406289d2fc11fee6eddbdd'
-          '3413909fd45a28701c92e6e5b59c6b65346ddb0f'
+          '659e3ee95c269014783ff8b318c6f50bf7496fbd'
           '21fa88de6cc1c7912e71655f50896ba17991a1c2')
 
 backup=('etc/ssh/ssh_config' 'etc/ssh/sshd_config' 'etc/pam.d/sshd' 'etc/conf.d/sshd')
diff --git a/core/openssh/sshd.pam b/core/openssh/sshd.pam
index c7b91cdfb..aeef8be27 100644
--- a/core/openssh/sshd.pam
+++ b/core/openssh/sshd.pam
@@ -8,5 +8,6 @@ account		required	pam_time.so
 password	required	pam_unix.so
 session		required	pam_unix_session.so
 session		required	pam_limits.so
+session         optional        pam_loginuid.so
 -session	optional	pam_ck_connector.so nox11
 -session	optional	pam_systemd.so
diff --git a/extra/anjuta/PKGBUILD b/extra/anjuta/PKGBUILD
index fdc3ecb23..60c007667 100644
--- a/extra/anjuta/PKGBUILD
+++ b/extra/anjuta/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 156699 2012-04-23 09:03:23Z ibiru $
+# $Id: PKGBUILD 158006 2012-04-30 22:55:59Z ibiru $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Harley Laue <losinggeneration@yahoo.com>
 
 pkgname=anjuta
-pkgver=3.4.0
-pkgrel=3
+pkgver=3.4.1
+pkgrel=1
 pkgdesc="GNOME Integrated Development Environment (IDE)"
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -14,17 +14,17 @@ url="http://anjuta.sourceforge.net/"
 install=anjuta.install
 source=(ftp://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
 options=('!libtool' '!emptydirs')
-sha256sums=('c8175e04e797dc0e2aaede4ae73ee9cd7f37d3e59b158961703db546d4660abf')
+sha256sums=('92edd96d7b7df178405cd229ff72d284c5499ad4496702f4efac7178e2d84369')
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd "$pkgname-$pkgver"
   PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \
       --localstatedir=/var --disable-scrollkeeper
   make
 }
 
 package(){
-  cd "$srcdir/$pkgname-$pkgver"
+  cd "$pkgname-$pkgver"
 
   # j1: Race during linking
   make -j1 DESTDIR="$pkgdir" install
diff --git a/extra/anjuta/anjuta.install b/extra/anjuta/anjuta.install
index 59113c6f5..5608d35be 100644
--- a/extra/anjuta/anjuta.install
+++ b/extra/anjuta/anjuta.install
@@ -6,12 +6,6 @@ post_install() {
   update-mime-database /usr/share/mime > /dev/null
 }
 
-pre_upgrade() {
-  if (( $(vercmp $2 2.90.0) < 0 )); then
-    usr/sbin/gconfpkg --uninstall anjuta
-  fi
-}
-
 post_upgrade() {
   post_install
 }
diff --git a/extra/appmenu-qt/PKGBUILD b/extra/appmenu-qt/PKGBUILD
index b41471824..8a18170b7 100644
--- a/extra/appmenu-qt/PKGBUILD
+++ b/extra/appmenu-qt/PKGBUILD
@@ -1,17 +1,18 @@
-# $Id: PKGBUILD 149893 2012-02-11 12:05:06Z andrea $
+# $Id: PKGBUILD 157935 2012-04-30 07:11:57Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=appmenu-qt
-pkgver=0.2.4
-pkgrel=4
+pkgver=0.2.6
+pkgrel=1
 pkgdesc="Allows Qt applications to export menus over DBus to a menu applet"
 arch=('i686' 'x86_64')
 url='https://launchpad.net/appmenu-qt'
 license=('GPL')
 depends=('libdbusmenu-qt')
 makedepends=('cmake')
-source=("http://launchpad.net/${pkgname}/trunk/${pkgver}/+download/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('5266d3e77e424bce19f4bcd8f4ffd4bf')
+source=("http://launchpad.net/${pkgname}/trunk/${pkgver}/+download/${pkgname}-${pkgver}.tar.bz2"{,.asc})
+md5sums=('90cce750e5412d43ce075b0a9bdb6782'
+         'de499d01369fc85040f5bbfc53ae1700')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/autogen/PKGBUILD b/extra/autogen/PKGBUILD
index b98ddacc7..dda533b5b 100644
--- a/extra/autogen/PKGBUILD
+++ b/extra/autogen/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 137955 2011-09-13 05:19:48Z allan $
+# $Id: PKGBUILD 157991 2012-04-30 17:51:02Z dan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Arjan Timmerman <arjan@soufly.nl>
 # Contributor: Tor Krill
 
 pkgname=autogen
-pkgver=5.12
+pkgver=5.15
 pkgrel=1
 pkgdesc="A tool designed to simplify the creation and maintenance of programs that contain large amounts of repetitious text"
 arch=('i686' 'x86_64')
@@ -13,8 +13,9 @@ license=('GPL3')
 depends=('guile' 'libxml2')
 options=('!libtool')
 install=autogen.install
-source=(ftp://ftp.gnu.org/gnu/${pkgname}/rel${pkgver}/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('126e56be629cda747390e8ba9be71e4b')
+source=(http://ftp.gnu.org/gnu/${pkgname}/rel${pkgver}/${pkgname}-${pkgver}.tar.xz{,.sig})
+md5sums=('5fba3c0e1ec0965061f27e8e79bd6da2'
+         'ed74e586ade1a61f753d391f3849c25b')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/bluez-hcidump/PKGBUILD b/extra/bluez-hcidump/PKGBUILD
index 529b49642..21bcaa93b 100644
--- a/extra/bluez-hcidump/PKGBUILD
+++ b/extra/bluez-hcidump/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 146410 2012-01-10 21:40:52Z andrea $
+# $Id: PKGBUILD 157961 2012-04-30 07:30:22Z andrea $
 # Maintainer:
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Geoffroy carrier <geoffroy@archlinux.org>
 
 pkgname=bluez-hcidump
-pkgver=2.2
+pkgver=2.4
 pkgrel=1
 pkgdesc="Bluetooth HCI package analyzer"
 url="http://www.bluez.org/"
@@ -12,7 +12,7 @@ arch=('i686' 'x86_64')
 license=('GPL2')
 depends=('bluez')
 source=("http://www.kernel.org/pub/linux/bluetooth/${pkgname}-${pkgver}.tar.gz")
-md5sums=('3c298a8be67099fe227f3e4d9de539d5')
+md5sums=('d39833de0ed26bddf784e9580b6f33c4')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/cfitsio/PKGBUILD b/extra/cfitsio/PKGBUILD
index d84626440..fbf039583 100644
--- a/extra/cfitsio/PKGBUILD
+++ b/extra/cfitsio/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 148037 2012-01-30 10:37:49Z eric $
+# $Id: PKGBUILD 157946 2012-04-30 07:18:29Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=cfitsio
-pkgver=3.290
+pkgver=3.300
 pkgrel=1
 pkgdesc="A library of C and Fortran subroutines for reading and writing data files in FITS (Flexible Image Transport System) data format"
 arch=('i686' 'x86_64')
@@ -12,11 +12,10 @@ license=('custom')
 depends=('glibc')
 options=('!libtool')
 source=("ftp://heasarc.gsfc.nasa.gov/software/fitsio/c/${pkgname}${pkgver/./}.tar.gz")
-md5sums=('bba93808486cf5edac236a941283b3c3')
+md5sums=('5045e82a30495ce23fd4be2c67b987f8')
 
 build() {
   cd "${srcdir}"/${pkgname}
-  export CFLAGS="$CFLAGS -lm"
   ./configure --prefix=/usr
   make  shared 
 }
@@ -32,5 +31,6 @@ check() {
 package() {
   cd "${srcdir}"/${pkgname}
   make DESTDIR="${pkgdir}" install
-  install -D -m644 License.txt "${pkgdir}/usr/share/licenses/${pkgname}/License.txt"
+  install -D -m644 License.txt \
+    "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
 }
diff --git a/extra/exo/PKGBUILD b/extra/exo/PKGBUILD
index ebfbeed84..b1f5667b8 100644
--- a/extra/exo/PKGBUILD
+++ b/extra/exo/PKGBUILD
@@ -1,40 +1,44 @@
-# $Id: PKGBUILD 141087 2011-10-23 16:12:32Z andyrtr $
-# Maintainer: AndyRTR <andyrtr@archlinux.org>
+# $Id: PKGBUILD 157815 2012-04-30 04:19:24Z foutrelis $
+# Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: tobias <tobias funnychar archlinux.org>
 # Contributor: Aurelien Foret <orelien@chez.com>
 
 pkgname=exo
-pkgver=0.6.2
-pkgrel=3
+pkgver=0.8.0
+pkgrel=1
 pkgdesc="Extensions to Xfce by os-cillation"
 arch=('i686' 'x86_64')
-license=('GPL2' 'LGPL')
 url="http://www.xfce.org/projects/exo"
+license=('GPL2' 'LGPL')
 groups=('xfce4')
-depends=("libxfce4util>=4.8.1" 'gtk2' 'hicolor-icon-theme' )
-makedepends=('pygtk' 'perl-uri' 'intltool' 'gtk-doc' 'xorg-iceauth')
+depends=('libxfce4ui' 'gtk2' 'hicolor-icon-theme' )
+makedepends=('perl-uri' 'intltool' 'gtk-doc' 'xorg-iceauth')
 optdepends=('perl-uri: for mail-compose helper script')
 options=('!libtool')
-install=${pkgname}.install
-source=(http://archive.xfce.org/src/xfce/${pkgname}/0.6/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('e25333df350abc30999cd16fe96ab690')
+install=$pkgname.install
+source=(http://archive.xfce.org/src/xfce/$pkgname/0.8/$pkgname-$pkgver.tar.bz2)
+sha256sums=('6e21aa30692affcb45fc8283d034da4a02221d26e3e1facb968d04fed4ba05b0')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  # python2 fix
+  cd "$srcdir/$pkgname-$pkgver"
+
+  # Python 2 fix
   export PYTHON=python2
-  ./configure --prefix=/usr \
-	--sysconfdir=/etc \
-	--libexecdir=/usr/lib/xfce4 \
-	--localstatedir=/var  \
-	--disable-static \
-	--enable-python \
-	--enable-gtk-doc \
-	--disable-debug
+
+  ./configure \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    --libexecdir=/usr/lib/xfce4 \
+    --localstatedir=/var  \
+    --disable-static \
+    --enable-gtk-doc \
+    --disable-debug
   make
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
 }
+
+# vim:set ts=2 sw=2 et:
diff --git a/extra/exo/exo.install b/extra/exo/exo.install
index 17ca8f78a..e4f8fd06c 100644
--- a/extra/exo/exo.install
+++ b/extra/exo/exo.install
@@ -3,9 +3,11 @@ post_install() {
 }
 
 post_upgrade() {
-  post_install $1
+  post_install
 }
 
 post_remove() {
-  post_install $1
+  post_install
 }
+
+# vim:set ts=2 sw=2 et:
diff --git a/extra/garcon/PKGBUILD b/extra/garcon/PKGBUILD
index 50c28e3af..f0c3d1ccd 100644
--- a/extra/garcon/PKGBUILD
+++ b/extra/garcon/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 156139 2012-04-14 11:33:09Z foutrelis $
+# $Id: PKGBUILD 157817 2012-04-30 04:19:28Z foutrelis $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: Xavier Devlamynck <magicrhesus@ouranos.be>
 
 pkgname=garcon
-pkgver=0.1.12
+pkgver=0.2.0
 pkgrel=1
 pkgdesc="Implementation of the freedesktop.org menu specification"
 arch=('i686' 'x86_64')
@@ -14,11 +14,11 @@ depends=('glib2' 'libxfce4util')
 makedepends=('pkgconfig' 'intltool' 'xfce4-dev-tools')
 replaces=('libxfce4menu')
 options=('!libtool' '!makeflags')
-source=(http://archive.xfce.org/src/xfce/garcon/0.1/garcon-$pkgver.tar.bz2)
-sha256sums=('bb5145fff4f09fd20db114918d76212ce7b55bd8b0540e2bf26248e6af1902c8')
+source=(http://archive.xfce.org/src/xfce/garcon/0.2/garcon-$pkgver.tar.bz2)
+sha256sums=('02dea3edb9c0039eca4748e964c61b0e1cc10f2d7f9ce0c837287ac5fa9ef76c')
 
 build() {
-  cd "$srcdir/garcon-$pkgver"
+  cd "$srcdir/$pkgname-$pkgver"
 
   ./configure \
     --prefix=/usr \
@@ -31,7 +31,7 @@ build() {
 }
 
 package() {
-  cd "$srcdir/garcon-$pkgver"
+  cd "$srcdir/$pkgname-$pkgver"
   make DESTDIR="$pkgdir" install
 }
 
diff --git a/extra/gnome-contacts/PKGBUILD b/extra/gnome-contacts/PKGBUILD
index 065987150..acd46097a 100644
--- a/extra/gnome-contacts/PKGBUILD
+++ b/extra/gnome-contacts/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 156806 2012-04-23 09:06:13Z ibiru $
+# $Id: PKGBUILD 158004 2012-04-30 22:44:22Z ibiru $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=gnome-contacts
-pkgver=3.4.0
+pkgver=3.4.1
 pkgrel=1
 pkgdesc="Contacts Manager for GNOME"
 arch=(i686 x86_64)
 url="http://www.gnome.org"
 license=('GPL2')
 groups=(gnome-extra)
-depends=('gtk3' 'folks' 'libnotify' 'gnome-desktop')
+depends=('gtk3' 'folks' 'libnotify' 'gnome-desktop' 'dconf')
 makedepends=('intltool' 'vala')
 install=$pkgname.install
 source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('06d4d8fc22d72f67296ed98d35e3ee40f26d8344bcbd14affff4a720047ccd97')
+sha256sums=('673614fe6cd5f986132819eeb21d67c40af336ffd2c4ca4c3e99365114f13523')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/gnome-contacts/gnome-contacts.install b/extra/gnome-contacts/gnome-contacts.install
index 326aa98a2..c19349f72 100644
--- a/extra/gnome-contacts/gnome-contacts.install
+++ b/extra/gnome-contacts/gnome-contacts.install
@@ -1,5 +1,5 @@
 post_install() {
-  glib-compile-schemas usr/share/glib-2.0/schemas
+  glib-compile-schemas /usr/share/glib-2.0/schemas
 }
 
 post_upgrade() {
diff --git a/extra/gnome-python-desktop/PKGBUILD b/extra/gnome-python-desktop/PKGBUILD
index fac631109..86b3c66d9 100644
--- a/extra/gnome-python-desktop/PKGBUILD
+++ b/extra/gnome-python-desktop/PKGBUILD
@@ -1,44 +1,37 @@
-# $Id: PKGBUILD 144401 2011-12-05 14:48:25Z jgc $
+# $Id: PKGBUILD 157924 2012-04-30 06:08:46Z eric $
 # 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-evolution' 'python-gnomedesktop' 'python-gnomekeyring' 'python-gtop' 'python-metacity' 'python-rsvg' 'python-totem-plparser' 'python-wnck')
+pkgname=('gnome-python-desktop' 'python-gnomedesktop' 'python-gnomekeyring' 'python-gtop' 'python-metacity' 'python-rsvg' 'python-totem-plparser' 'python-wnck')
 pkgver=2.32.0
-pkgrel=9
+pkgrel=10
 arch=(i686 x86_64)
 license=('GPL' 'LGPL')
 options=('!libtool')
-makedepends=('intltool' 'pkg-config' 'gnome-python' 'evolution-data-server' 'libgtop' 'totem-plparser' 'gnome-desktop2' 'metacity' 'librsvg')
+makedepends=('intltool' 'pkg-config' 'gnome-python' 'libgtop' 'totem-plparser' 'gnome-desktop2' 'metacity' 'librsvg' 'libwnck')
 url="http://www.gnome.org"
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgbase}/2.32/${pkgbase}-${pkgver}.tar.bz2)
-sha256sums=('09dbd580bf3b0ef60f91b090eafe6d08ddcc50a609e2b425a7f8eca46d4e0ee9')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgbase}/2.32/${pkgbase}-${pkgver}.tar.bz2
+        gnome-python-desktop-2.32.0-metacity-build.patch)
+sha256sums=('09dbd580bf3b0ef60f91b090eafe6d08ddcc50a609e2b425a7f8eca46d4e0ee9'
+            'f012f9bd2f9baa527f07ad2f6e312c875bb6f2d3204270a1b053278a3a0c86b3')
 
 build() {
   cd "${srcdir}/${pkgbase}-${pkgver}"
+  patch -p1 -i ../gnome-python-desktop-2.32.0-metacity-build.patch
   PYTHON=/usr/bin/python2 ./configure --prefix=/usr --enable-metacity
   make
 }
 
 package_gnome-python-desktop() {
-  depends=('python-evolution' 'python-gnomedesktop' 'python-gnomekeyring' 'python-gtop' 'python-metacity' 'python-rsvg' 'python-totem-plparser' 'python-wnck' 'gnome-python')
+  depends=('python-gnomedesktop' 'python-gnomekeyring' 'python-gtop' 'python-metacity' 'python-rsvg' 'python-totem-plparser' 'python-wnck' 'gnome-python')
   pkgdesc="Python bindings for the GNOME desktop environment"
 
   cd "${srcdir}/${pkgbase}-${pkgver}"
   make install-pkgconfigDATA DESTDIR="${pkgdir}"
 }
 
-package_python-evolution() {
-  depends=('pygtk' 'evolution-data-server' 'python2-bonobo')
-  pkgdesc="Python bindings for evolution"
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  make -C evolution install DESTDIR="${pkgdir}"
-  PYTHON=/usr/bin/python2 ./py-compile --destdir "${pkgdir}" --basedir /usr/lib/python2.7/site-packages/gtk-2.0 evolution/__init__.py
-  install -m644 evolution/ecal.defs "${pkgdir}/usr/share/pygtk/2.0/defs/"
-}
-
 package_python-gnomedesktop() {
   depends=('pygtk' 'gnome-desktop2' 'python2-gnomevfs')
   pkgdesc="Python bindings for gnome-desktop 2.x"
diff --git a/extra/gnome-python-desktop/gnome-python-desktop-2.32.0-metacity-build.patch b/extra/gnome-python-desktop/gnome-python-desktop-2.32.0-metacity-build.patch
new file mode 100644
index 000000000..5054dd2bd
--- /dev/null
+++ b/extra/gnome-python-desktop/gnome-python-desktop-2.32.0-metacity-build.patch
@@ -0,0 +1,42 @@
+From: Daniel Drake <dsd@laptop.org>
+
+Fix build against metacity-2.34.2. The port to GSettings
+removed these constants from the codebase.
+
+Index: gnome-python-desktop-2.32.0/metacity/metacity.defs
+===================================================================
+--- gnome-python-desktop-2.32.0.orig/metacity/metacity.defs
++++ gnome-python-desktop-2.32.0/metacity/metacity.defs
+@@ -120,32 +120,6 @@
+   )
+ )
+ 
+-(define-enum FocusMode
+-  (in-module "Meta")
+-  (c-name "MetaFocusMode")
+-;   (gtype-id "META_TYPE_FOCUS_MODE")
+-  (values
+-    '("click" "META_FOCUS_MODE_CLICK")
+-    '("sloppy" "META_FOCUS_MODE_SLOPPY")
+-    '("mouse" "META_FOCUS_MODE_MOUSE")
+-  )
+-)
+-
+-(define-enum ActionTitlebar
+-  (in-module "Meta")
+-  (c-name "MetaActionTitlebar")
+-;   (gtype-id "META_TYPE_ACTION_TITLEBAR")
+-  (values
+-    '("toggle-shade" "META_ACTION_TITLEBAR_TOGGLE_SHADE")
+-    '("toggle-maximize" "META_ACTION_TITLEBAR_TOGGLE_MAXIMIZE")
+-    '("minimize" "META_ACTION_TITLEBAR_MINIMIZE")
+-    '("none" "META_ACTION_TITLEBAR_NONE")
+-    '("lower" "META_ACTION_TITLEBAR_LOWER")
+-    '("menu" "META_ACTION_TITLEBAR_MENU")
+-    '("last" "META_ACTION_TITLEBAR_LAST")
+-  )
+-)
+-
+ (define-enum FrameType
+   (in-module "Meta")
+   (c-name "MetaFrameType")
diff --git a/extra/imagemagick/PKGBUILD b/extra/imagemagick/PKGBUILD
index 67701a11a..b7ad89181 100644
--- a/extra/imagemagick/PKGBUILD
+++ b/extra/imagemagick/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 156324 2012-04-17 04:29:39Z eric $
+# $Id: PKGBUILD 158012 2012-05-01 01:56:10Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgbase=imagemagick
 pkgname=('imagemagick' 'imagemagick-doc')
-pkgver=6.7.6.5
+pkgver=6.7.6.8
 pkgrel=1
 arch=('i686' 'x86_64')
 url="http://www.imagemagick.org/"
@@ -12,14 +12,14 @@ makedepends=('libltdl' 'lcms2' 'libxt' 'fontconfig' 'libxext' 'ghostscript' \
              'openexr' 'libwmf' 'librsvg' 'libxml2' 'jasper')
 source=(ftp://ftp.imagemagick.org/pub/ImageMagick/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz \
         perlmagick.rpath.patch)
-sha1sums=('ecb6d2614ca8f44c1857ff28a88feb083403f7be'
+sha1sums=('eaf5a7f2316f8be3db9c2a37d2bb1056e9a0e03c'
           '23405f80904b1de94ebd7bd6fe2a332471b8c283')
 
 build() {
   cd "${srcdir}"/ImageMagick-${pkgver%.*}-${pkgver##*.}
 
   sed '/AC_PATH_XTRA/d' -i configure.ac
-  autoreconf
+  autoreconf --install
   patch -p0 -i ../perlmagick.rpath.patch
 
   ./configure --prefix=/usr --sysconfdir=/etc --with-modules --disable-static \
diff --git a/extra/libical/PKGBUILD b/extra/libical/PKGBUILD
index 15ecb60f4..dbd9bcae2 100644
--- a/extra/libical/PKGBUILD
+++ b/extra/libical/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 149595 2012-02-08 15:25:04Z andrea $
+# $Id: PKGBUILD 157971 2012-04-30 07:57:27Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=libical
-pkgver=0.46
-pkgrel=2
+pkgver=0.48
+pkgrel=1
 pkgdesc="An open source reference implementation of the icalendar data type and serialization format"
 arch=('i686' 'x86_64')
 url='http://sourceforge.net/projects/freeassociation/'
@@ -12,13 +12,11 @@ license=('LGPL' 'MPL')
 depends=('glibc')
 options=('!libtool')
 source=("http://downloads.sourceforge.net/freeassociation/${pkgname}-${pkgver}.tar.gz")
-md5sums=('9c08f88945bfd5d0791d102e4aa4125c')
+md5sums=('e549f434d5fbf9cd156c60ed4943618f')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd "${srcdir}"/${pkgname}-${pkgver}
 
-  ./autogen.sh
-  libtoolize --force
   ./configure --prefix=/usr \
     --enable-shared \
     --disable-static
@@ -26,6 +24,6 @@ build() {
 }
 
 package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
+  cd "${srcdir}"/${pkgname}-${pkgver}
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/libindi/PKGBUILD b/extra/libindi/PKGBUILD
index 5146f1aa2..056882f7e 100644
--- a/extra/libindi/PKGBUILD
+++ b/extra/libindi/PKGBUILD
@@ -3,20 +3,20 @@
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=libindi
-pkgver=0.8
-pkgrel=3
+pkgver=0.9.1
+pkgrel=1
 pkgdesc="A distributed control protocol designed to operate astronomical instrumentation"
 url="http://www.indilib.org/index.php?title=Main_Page"
 license=('GPL2')
 arch=('i686' 'x86_64')
-depends=('libnova' 'cfitsio' 'boost-libs')
+depends=('libnova' 'cfitsio' 'boost-libs' 'libusb-compat')
 makedepends=('pkgconfig' 'cmake' 'boost')
 provides=('indilib')
 replaces=('indilib')
 conflicts=('indilib')
 options=('!libtool')
 source=("http://downloads.sourceforge.net/indi/${pkgname}_${pkgver}.tar.gz")
-md5sums=('ca2b7c56431eb5e08218929e5eb72150')
+md5sums=('546ab197a4311d03f566747e425de0d2')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/libxfce4ui/PKGBUILD b/extra/libxfce4ui/PKGBUILD
index be1939c7b..bc35925b8 100644
--- a/extra/libxfce4ui/PKGBUILD
+++ b/extra/libxfce4ui/PKGBUILD
@@ -1,21 +1,22 @@
-# $Id: PKGBUILD 145607 2011-12-23 17:37:26Z foutrelis $
+# $Id: PKGBUILD 157819 2012-04-30 04:19:30Z foutrelis $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: Xavier Devlamynck <magicrhesus@ouranos.be>
 
 pkgname=libxfce4ui
-pkgver=4.8.1
+pkgver=4.10.0
 pkgrel=1
 pkgdesc="Commonly used Xfce widgets among Xfce applications"
 arch=('i686' 'x86_64')
 url="http://www.xfce.org/"
 license=('GPL2')
-depends=('libxfce4util' 'gtk2' 'xfconf' 'libsm' 'startup-notification')
-makedepends=('intltool' 'gtk-doc' 'glade')
-optdepends=('glade: for using the included glade module')
+depends=('libxfce4util' 'gtk2' 'xfconf' 'libsm' 'startup-notification'
+         'hicolor-icon-theme')
+makedepends=('intltool' 'gtk-doc')
 #replaces=('libxfcegui4') - later when all is ported
 options=('!libtool')
-source=(http://archive.xfce.org/src/xfce/$pkgname/4.8/$pkgname-$pkgver.tar.bz2)
-sha256sums=('39cbed29da06960074014b74abc2ba57db49dc81ab8995fb2160579c51669956')
+install=libxfce4ui.install
+source=(http://archive.xfce.org/src/xfce/$pkgname/4.10/$pkgname-$pkgver.tar.bz2)
+sha256sums=('a2b9fa288ccb5f16fa13264e507ba3f7b8da0176da259a11239f21538c0ea3e2')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
@@ -27,7 +28,8 @@ build() {
     --localstatedir=/var \
     --disable-static \
     --enable-gtk-doc \
-    --disable-debug
+    --disable-debug \
+    --with-vendor-info='Arch Linux'
   make
 }
 
diff --git a/extra/libxfce4ui/libxfce4ui.install b/extra/libxfce4ui/libxfce4ui.install
new file mode 100644
index 000000000..e4f8fd06c
--- /dev/null
+++ b/extra/libxfce4ui/libxfce4ui.install
@@ -0,0 +1,13 @@
+post_install() {
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/extra/libxfce4util/PKGBUILD b/extra/libxfce4util/PKGBUILD
index ccfd512e8..40e5b2c8b 100644
--- a/extra/libxfce4util/PKGBUILD
+++ b/extra/libxfce4util/PKGBUILD
@@ -1,33 +1,37 @@
-# $Id: PKGBUILD 138125 2011-09-17 02:23:22Z allan $
-# Maintainer: AndyRTR <andyrtr@archlinux.org>
+# $Id: PKGBUILD 157821 2012-04-30 04:19:32Z foutrelis $
+# Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: tobias <tobias funnychar archlinux.org>
 
 pkgname=libxfce4util
-pkgver=4.8.2
+pkgver=4.10.0
 pkgrel=1
 pkgdesc="Basic utility non-GUI functions for Xfce"
 arch=('i686' 'x86_64')
-license=('GPL2')
 url="http://www.xfce.org/"
+license=('GPL2')
 depends=('glib2')
 makedepends=('pkgconfig' 'intltool' 'gtk-doc')
 options=('!libtool')
-source=(http://archive.xfce.org/src/xfce/libxfce4util/4.8/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('3376a77637a4292a863027d595548ee2')
+source=(http://archive.xfce.org/src/xfce/$pkgname/4.10/$pkgname-$pkgver.tar.bz2)
+sha256sums=('0979fee12880bb5f011ab38d6c7cc9afe5fd68eb96ccda895cb56dbc16e7608e')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr \
-	--sysconfdir=/etc \
-	--libexecdir=/usr/lib \
-	--localstatedir=/var \
-	--disable-static \
-	--enable-gtk-doc \
-	--disable-debug
+  cd "$srcdir/$pkgname-$pkgver"
+
+  ./configure \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    --libexecdir=/usr/lib \
+    --localstatedir=/var \
+    --disable-static \
+    --enable-gtk-doc \
+    --disable-debug
   make
 }
 
 package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
 }
+
+# vim:set ts=2 sw=2 et:
diff --git a/extra/libxfcegui4/PKGBUILD b/extra/libxfcegui4/PKGBUILD
index cfed62154..392d91005 100644
--- a/extra/libxfcegui4/PKGBUILD
+++ b/extra/libxfcegui4/PKGBUILD
@@ -1,21 +1,21 @@
-# $Id: PKGBUILD 148848 2012-02-05 11:52:45Z ibiru $
+# $Id: PKGBUILD 157823 2012-04-30 04:19:35Z foutrelis $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: Tobias Kieslich <tobias funnychar archlinux.org>
 
 pkgname=libxfcegui4
-pkgver=4.8.1
-pkgrel=4
+pkgver=4.10.0
+pkgrel=1
 pkgdesc="Various Gtk widgets for Xfce"
 arch=('i686' 'x86_64')
 url="http://www.xfce.org/"
 license=('GPL2')
-depends=('startup-notification' "xfconf>=4.8.0" "libglade" 'libsm'
+depends=('startup-notification' 'xfconf' 'libglade' 'libsm'
          'hicolor-icon-theme')
 makedepends=('intltool')
 options=('!libtool')
 install=$pkgname.install
-source=(http://archive.xfce.org/src/xfce/$pkgname/4.8/$pkgname-$pkgver.tar.bz2)
-sha256sums=('309a81823cdfdb7301bc6a5199e14f0df29b58dae89a9302c7839b9b94812443')
+source=(http://archive.xfce.org/src/xfce/$pkgname/4.10/$pkgname-$pkgver.tar.bz2)
+sha256sums=('2b82f9979175d8856880c8f349e6eede491ca92fe6940c69c8958115418d4533')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/libxfcegui4/libxfcegui4.install b/extra/libxfcegui4/libxfcegui4.install
index abf924aa2..e4f8fd06c 100644
--- a/extra/libxfcegui4/libxfcegui4.install
+++ b/extra/libxfcegui4/libxfcegui4.install
@@ -10,5 +10,4 @@ post_remove() {
   post_install
 }
 
-
 # vim:set ts=2 sw=2 et:
diff --git a/extra/lirc/PKGBUILD b/extra/lirc/PKGBUILD
index 60f229171..db2ac75ab 100644
--- a/extra/lirc/PKGBUILD
+++ b/extra/lirc/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 155878 2012-04-08 11:00:49Z ibiru $
+# $Id: PKGBUILD 157952 2012-04-30 07:19:08Z tpowa $
 # Maintainer: Paul Mattal <paul@archlinux.org>
 
 pkgbase=lirc
 pkgname=('lirc' 'lirc-utils')
 pkgver=0.9.0
-pkgrel=15
+pkgrel=16
 epoch=1
 _extramodules=extramodules-3.3-ARCH
 arch=('i686' 'x86_64')
diff --git a/extra/obexd/PKGBUILD b/extra/obexd/PKGBUILD
index 79f2b3abd..8e14a56c1 100644
--- a/extra/obexd/PKGBUILD
+++ b/extra/obexd/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 146598 2012-01-13 22:25:53Z andrea $
+# $Id: PKGBUILD 157964 2012-04-30 07:31:43Z andrea $
 # Maintainer:
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Geoffroy Carrier <geoffroy@archlinux.org>
 
 pkgbase=obexd
 pkgname=('obexd-client' 'obexd-server')
-pkgver=0.44
+pkgver=0.45
 pkgrel=1
 url="http://www.bluez.org/"
 arch=('i686' 'x86_64')
 license=('GPL2')
 makedepends=('glib2' 'openobex' 'libical')
 source=("http://www.kernel.org/pub/linux/bluetooth/${pkgbase}-${pkgver}.tar.bz2")
-md5sums=('d7246fda87675843ce866dd64560e4fd')
+md5sums=('2aa178fe9b257fd637559608e72bb665')
 
 build() {
   cd "${srcdir}/${pkgbase}-${pkgver}"
diff --git a/extra/orage/PKGBUILD b/extra/orage/PKGBUILD
index 070e9d1a7..e1141092d 100644
--- a/extra/orage/PKGBUILD
+++ b/extra/orage/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 148476 2012-02-02 05:16:18Z eric $
+# $Id: PKGBUILD 157825 2012-04-30 04:19:42Z foutrelis $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Tobias Kieslich <tobias (at) archlinux.org>
 
 pkgname=orage
 pkgver=4.8.3
-pkgrel=1
+pkgrel=2
 pkgdesc="A simple calendar application with reminders for Xfce"
 arch=('i686' 'x86_64')
 license=('GPL2')
diff --git a/extra/swig/PKGBUILD b/extra/swig/PKGBUILD
index 6d6e83c23..b8a555720 100644
--- a/extra/swig/PKGBUILD
+++ b/extra/swig/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 157248 2012-04-26 14:30:56Z pierre $
+# $Id: PKGBUILD 157993 2012-04-30 18:25:04Z stephane $
 # Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=swig
-pkgver=2.0.5
+pkgver=2.0.6
 pkgrel=1
 pkgdesc="Generate scripting interfaces to C/C++ code"
 arch=('i686' 'x86_64')
@@ -11,7 +11,7 @@ url="http://www.swig.org/"
 license=('custom')
 depends=('zlib' 'pcre')
 source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-sha1sums=('dfe3c89da775a0f98a8d884df1c658073c8a9087')
+sha1sums=('8e27a735d1f53be2e3d8d8473a3847e89ba89da8')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/terminal/PKGBUILD b/extra/terminal/PKGBUILD
index 44383a3e1..91cceef58 100644
--- a/extra/terminal/PKGBUILD
+++ b/extra/terminal/PKGBUILD
@@ -1,36 +1,39 @@
-# $Id: PKGBUILD 128296 2011-06-22 15:43:57Z andyrtr $
-# Maintainer: AndyRTR <andyrtr@archlinux.org>
+# $Id: PKGBUILD 157827 2012-04-30 04:19:45Z foutrelis $
+# Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: tobias <tobias funnychar archlinux.org>
 # Contributor: Aurelien Foret <orelien@chez.com>
 
 pkgname=terminal
 pkgver=0.4.8
-pkgrel=1
+pkgrel=2
 pkgdesc="A modern terminal emulator primarly for the Xfce desktop environment"
-arch=(i686 x86_64)
-license=('GPL2')
+arch=('i686' 'x86_64')
 url="http://www.xfce.org/projects/terminal/"
+license=('GPL2')
 groups=('xfce4')
-depends=('exo>=0.5.4' "vte" 'dbus-glib'
-	 'startup-notification' 'hicolor-icon-theme')
+depends=('exo' 'vte' 'dbus-glib' 'startup-notification' 'hicolor-icon-theme')
 makedepends=('pkgconfig' 'intltool')
 options=('!libtool')
-install=terminal.install
-source=(http://archive.xfce.org/src/apps/${pkgname}/0.4/Terminal-${pkgver}.tar.bz2)
-md5sums=('8dff62234da14e1a5e542fb56560ebe2')
+install=$pkgname.install
+source=(http://archive.xfce.org/src/apps/$pkgname/0.4/Terminal-$pkgver.tar.bz2)
+sha256sums=('fe5db0b7127ce87efa1e10f44d8915be88005b6ce4f0bfea6b64533e25cc788d')
 
 build() {
-  cd ${srcdir}/Terminal-${pkgver}
-  ./configure --prefix=/usr \
-	--sysconfdir=/etc \
-	--libexecdir=/usr/lib/xfce4 \
-	--localstatedir=/var \
-	--disable-static \
-	--disable-debug
+  cd "$srcdir/Terminal-$pkgver"
+
+  ./configure \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    --libexecdir=/usr/lib/xfce4 \
+    --localstatedir=/var \
+    --disable-static \
+    --disable-debug
   make
 }
 
 package() {
-  cd ${srcdir}/Terminal-${pkgver}
-  make DESTDIR=${pkgdir} install
+  cd "$srcdir/Terminal-$pkgver"
+  make DESTDIR="$pkgdir" install
 }
+
+# vim:set ts=2 sw=2 et:
diff --git a/extra/terminal/terminal.install b/extra/terminal/terminal.install
index 21b79d2d4..e4f8fd06c 100644
--- a/extra/terminal/terminal.install
+++ b/extra/terminal/terminal.install
@@ -3,9 +3,11 @@ post_install() {
 }
 
 post_upgrade() {
-  post_install $1
+  post_install
 }
 
 post_remove() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+  post_install
 }
+
+# vim:set ts=2 sw=2 et:
diff --git a/extra/thunar-media-tags-plugin/PKGBUILD b/extra/thunar-media-tags-plugin/PKGBUILD
index 1c26c84b0..19b749553 100644
--- a/extra/thunar-media-tags-plugin/PKGBUILD
+++ b/extra/thunar-media-tags-plugin/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 146210 2012-01-06 03:43:06Z eric $
+# $Id: PKGBUILD 157831 2012-04-30 04:19:52Z foutrelis $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Andrew Simmons <andrew.simmons@gmail.com>
 
 pkgname=thunar-media-tags-plugin
 pkgver=0.2.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Adds special features for media files to the Thunar File Manager"
 arch=('i686' 'x86_64')
 license=('GPL')
diff --git a/extra/thunar-volman/PKGBUILD b/extra/thunar-volman/PKGBUILD
index 7d95b21f2..cefc46634 100644
--- a/extra/thunar-volman/PKGBUILD
+++ b/extra/thunar-volman/PKGBUILD
@@ -1,21 +1,21 @@
-# $Id: PKGBUILD 154456 2012-03-28 18:51:17Z foutrelis $
+# $Id: PKGBUILD 157833 2012-04-30 04:19:55Z foutrelis $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: Tobias Kieslich <tobias (at) archlinux.org>
 
 pkgname=thunar-volman
-pkgver=0.6.1
+pkgver=0.8.0
 pkgrel=1
 pkgdesc="Automatic management of removeable devices in Thunar"
 arch=('i686' 'x86_64')
 url="http://foo-projects.org/~benny/projects/thunar-volman"
 license=('GPL2')
-groups=('xfce4-goodies')
+groups=('xfce4')
 depends=('thunar' 'libxfce4ui' 'hicolor-icon-theme')
 makedepends=('intltool')
 options=('!libtool')
 install=$pkgname.install
-source=(http://archive.xfce.org/src/apps/$pkgname/0.6/$pkgname-$pkgver.tar.bz2)
-sha256sums=('04918a9ccd576e7b19dae37af50ffe6de6f79ed66bf305c26dfe81c1ff652b27')
+source=(http://archive.xfce.org/src/apps/$pkgname/0.8/$pkgname-$pkgver.tar.bz2)
+sha256sums=('ff0887c862b578580d05f4cd7db66081382ff143f9cc7ea3c9ba58cf5d02bceb')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/thunar/PKGBUILD b/extra/thunar/PKGBUILD
index 04f37604d..e0b8e003e 100644
--- a/extra/thunar/PKGBUILD
+++ b/extra/thunar/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 153248 2012-03-12 14:40:08Z tpowa $
+# $Id: PKGBUILD 157829 2012-04-30 04:19:49Z foutrelis $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: Andrew Simmons <andrew.simmons@gmail.com>
 
 pkgname=thunar
-pkgver=1.2.3
-pkgrel=5
+pkgver=1.4.0
+pkgrel=1
 pkgdesc="Modern file manager for Xfce"
 arch=('i686' 'x86_64')
 url="http://thunar.xfce.org"
@@ -22,25 +22,14 @@ optdepends=('gvfs: for trash support, mounting with udisk and remote filesystems
             'thunar-media-tags-plugin: view/edit id3/ogg tags')
 options=('!libtool')
 install=$pkgname.install
-source=(http://archive.xfce.org/src/xfce/${pkgname}/1.2/Thunar-$pkgver.tar.bz2
-        fix-segfault-on-rename.patch
-        fix-sorting-of-large-numbers-5356.patch
-        fix-launching-multiple-files-7456.patch
-        fix-crash-8168.patch)
-md5sums=('0a2c36cdd3cb3a2ab52cbf6055415b85'
-         '07e568a84f3a24e32d9d37803a250099'
-         '926dbefb639c429c8acf064922b4fbe0'
-         '7ef67fa9faa414ba03053dc69f4cdebc'
-         '54a88687621bcbd5ab7d951a952d3558')
+source=(http://archive.xfce.org/src/xfce/$pkgname/1.4/Thunar-$pkgver.tar.bz2)
+sha256sums=('2c11a19e64cef708a264fb4d5d933389899c3d132fe7b1e313dd6e37bfe4c8ba')
 
 build() {
   cd "$srcdir/Thunar-$pkgver"
-  # add fixes from git tree
-  patch -Np1 -i ../fix-sorting-of-large-numbers-5356.patch
-  patch -Np1 -i ../fix-launching-multiple-files-7456.patch
-  patch -Np1 -i ../fix-crash-8168.patch
-  patch -Np1 -i ../fix-segfault-on-rename.patch
-  ./configure --prefix=/usr \
+
+  ./configure \
+    --prefix=/usr \
     --sysconfdir=/etc \
     --libexecdir=/usr/lib \
     --localstatedir=/var \
diff --git a/extra/upower/PKGBUILD b/extra/upower/PKGBUILD
index 73ec9cdda..1d8c537f8 100644
--- a/extra/upower/PKGBUILD
+++ b/extra/upower/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 157763 2012-04-29 07:02:42Z allan $
+# $Id: PKGBUILD 158002 2012-04-30 22:34:00Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=upower
-pkgver=0.9.15
-pkgrel=3
+pkgver=0.9.16
+pkgrel=1
 pkgdesc="Abstraction for enumerating power devices, listening to device events and querying history and statistics"
 arch=('i686' 'x86_64')
 url="http://upower.freedesktop.org"
@@ -12,20 +12,23 @@ depends=('udev' 'libusb' 'polkit' 'pm-utils' 'dbus-glib' 'libimobiledevice')
 makedepends=('intltool' 'docbook-xsl' 'gobject-introspection')
 options=('!libtool')
 source=($url/releases/$pkgname-$pkgver.tar.xz)
-sha256sums=('d5941480f32dcee47401b3f650485c71f70e7eb0d92537bf4b62410248a6238c')
+sha256sums=('eb9a3d39a8cb62970fd612e333bc7a43437ab0e7890303578b0a7e3c67c8c212')
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd "$pkgname-$pkgver"
 
   # put udev files in /usr/lib
   sed -i "/slashlibdir=/s#/lib#/usr/lib#" configure
 
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-      --libexecdir=/usr/lib/upower --disable-static
+  ./configure --prefix=/usr --sysconfdir=/etc \
+      --localstatedir=/var \
+      --libexecdir=/usr/lib/upower \
+      --with-systemdsystemunitdir=/usr/lib/systemd/system \
+      --disable-static
   make
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd "$pkgname-$pkgver"
   make DESTDIR="$pkgdir" install
 }
diff --git a/extra/xfburn/PKGBUILD b/extra/xfburn/PKGBUILD
index 7ff0c7cf1..ec80b00ac 100755
--- a/extra/xfburn/PKGBUILD
+++ b/extra/xfburn/PKGBUILD
@@ -1,38 +1,46 @@
-# $Id: PKGBUILD 141077 2011-10-23 09:32:55Z andyrtr $
+# $Id: PKGBUILD 157835 2012-04-30 04:19:58Z foutrelis $
 # Maintainer: Tobias Kieslich <tobias funnychar archlinux.org>
 # Contributor: Alois Nespor alois.nespor@gmail.com
 
 pkgname=xfburn
 pkgver=0.4.3
-pkgrel=5
+pkgrel=6
 arch=('i686' 'x86_64')
-pkgdesc="a simple CD/DVD burning tool based on libburnia libraries"
+pkgdesc="A simple CD/DVD burning tool based on libburnia libraries"
 url="http://goodies.xfce.org/projects/applications/xfburn"
 license=('GPL2')
 groups=('xfce4-goodies')
 install=${pkgname}.install
-depends=('libburn>=1.0.6.pl00' 'libisofs>=1.0.6' 'libxfcegui4>=4.8.1' 'exo>=0.6.0' 'gstreamer0.10-base>=0.10.26'
+depends=('libburn' 'libisofs' 'libxfcegui4' 'exo' 'gstreamer0.10-base'
          'hicolor-icon-theme' 'desktop-file-utils' 'librsvg')
 makedepends=('intltool')
-source=(http://www.xfce.org/archive/src/apps/xfburn/0.4/$pkgname-$pkgver.tar.bz2
-	fix_empty_dir_segfault.diff)
-md5sums=('147cdc2d909e751125be16103b8dc81f'
-         '82a85be2442c42ab93de95e21c6c11b0')
+source=(http://archive.xfce.org/src/apps/xfburn/0.4/$pkgname-$pkgver.tar.bz2
+        fix_empty_dir_segfault.diff)
+sha1sums=('52d33e56b7ce9774fba680f50723eaf1a7215091'
+          'e374dd4942a49b52166fa9f2aa40e9aefb3aa3ec')
 
-build() { 
-  cd ${srcdir}/$pkgname-$pkgver
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
 
   # fix https://bugs.archlinux.org/task/26121
-  patch -Np0 -i ${srcdir}/fix_empty_dir_segfault.diff
-  
-  ./configure --prefix=/usr \
-	--enable-gstreamer \
-	--enable-dbus \
-	--disable-hal
+  patch -Np0 -i "$srcdir/fix_empty_dir_segfault.diff"
+
+  # fix build issue
+  sed -i '1 i\
+    #include <glib-object.h>' \
+    xfburn/xfburn-settings.h
+
+  ./configure \
+    --prefix=/usr \
+    --enable-gstreamer \
+    --enable-dbus \
+    --disable-hal
   make
 }
 
 package() {
-  cd ${srcdir}/$pkgname-$pkgver
-  make DESTDIR=${pkgdir} install
-} 
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/extra/xfburn/xfburn.install b/extra/xfburn/xfburn.install
index 28fdb48fb..9bbbab888 100644
--- a/extra/xfburn/xfburn.install
+++ b/extra/xfburn/xfburn.install
@@ -8,7 +8,7 @@ post_upgrade() {
 }
 
 post_remove() {
-  update-desktop-database -q
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+  post_install $1
 }
 
+# vim:set ts=2 sw=2 et:
diff --git a/extra/xfce4-appfinder/PKGBUILD b/extra/xfce4-appfinder/PKGBUILD
index cd5e0270f..eeba6d757 100644
--- a/extra/xfce4-appfinder/PKGBUILD
+++ b/extra/xfce4-appfinder/PKGBUILD
@@ -1,34 +1,39 @@
-# $Id: PKGBUILD 149234 2012-02-06 16:14:59Z foutrelis $
-# Maintainer:
+# $Id: PKGBUILD 157837 2012-04-30 04:20:00Z foutrelis $
+# Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: AndyRTR <andyrtr@archlinux.org>
 # Contributor: tobias <tobias funnychar archlinux.org>
 
 pkgname=xfce4-appfinder
-pkgver=4.8.0
-pkgrel=2
+pkgver=4.10.0
+pkgrel=1
 pkgdesc="An application finder for Xfce"
 arch=('i686' 'x86_64')
+url="http://www.xfce.org/projects/xfce4-appfinder"
 license=('GPL2')
-url='http://www.xfce.org/projects/xfce4-appfinder'
 groups=('xfce4')
 depends=('libxfce4ui' 'garcon' 'hicolor-icon-theme')
 makedepends=('intltool')
-install=${pkgname}.install
-source=("http://archive.xfce.org/src/xfce/${pkgname}/4.8/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('fb4797ef91b90d111b989e98c3e000e0')
+replaces=('xfce-utils')
+install=$pkgname.install
+source=(http://archive.xfce.org/src/xfce/$pkgname/4.10/$pkgname-$pkgver.tar.bz2)
+sha256sums=('042aae7e366428a6a92b6353b3f2727d64823076a7752b8e0a15f1f8f3645439')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr \
-	--sysconfdir=/etc \
-	--libexecdir=/usr/lib \
-	--localstatedir=/var \
-	--disable-static \
-	--disable-debug
+  cd "$srcdir/$pkgname-$pkgver"
+
+  ./configure \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    --libexecdir=/usr/lib \
+    --localstatedir=/var \
+    --disable-static \
+    --disable-debug
   make
 }
 
 package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
 }
+
+# vim:set ts=2 sw=2 et:
diff --git a/extra/xfce4-appfinder/xfce4-appfinder.install b/extra/xfce4-appfinder/xfce4-appfinder.install
index b7e9ea08e..e4f8fd06c 100644
--- a/extra/xfce4-appfinder/xfce4-appfinder.install
+++ b/extra/xfce4-appfinder/xfce4-appfinder.install
@@ -7,6 +7,7 @@ post_upgrade() {
 }
 
 post_remove() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+  post_install
 }
 
+# vim:set ts=2 sw=2 et:
diff --git a/extra/xfce4-battery-plugin/PKGBUILD b/extra/xfce4-battery-plugin/PKGBUILD
index cb2122cde..047ab8821 100644
--- a/extra/xfce4-battery-plugin/PKGBUILD
+++ b/extra/xfce4-battery-plugin/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 156575 2012-04-21 05:17:50Z eric $
+# $Id: PKGBUILD 158010 2012-04-30 23:47:39Z eric $
 # Maintainer: aurelien <aurelien@archlinux.org>
 # Contributor: Aurelien Foret <orelien@chez.com>
 
 pkgname=xfce4-battery-plugin
-pkgver=1.0.1
+pkgver=1.0.2
 pkgrel=1
 pkgdesc="A battery monitor plugin for the Xfce panel"
 arch=('i686' 'x86_64')
@@ -15,7 +15,7 @@ makedepends=('intltool')
 options=('!libtool')
 install=$pkgname.install
 source=(http://archive.xfce.org/src/panel-plugins/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2)
-sha256sums=('28c20a9cfa4461e5411b428aecad4a3c2f49eab69bb9a208b6ebb151c8bf212f')
+sha256sums=('333313ae07bac68e29d4c1543e425fd1f3b539d61f7bc471a189ddb475bbb978')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/xfce4-clipman-plugin/PKGBUILD b/extra/xfce4-clipman-plugin/PKGBUILD
index 1ac1ba71b..38ab3b72b 100644
--- a/extra/xfce4-clipman-plugin/PKGBUILD
+++ b/extra/xfce4-clipman-plugin/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 156566 2012-04-21 02:58:41Z eric $
+# $Id: PKGBUILD 157841 2012-04-30 04:20:05Z foutrelis $
 # Maintainer: tobias <tobias at archlinux.org>
 # Contributor: Aurelien Foret <orelien@chez.com>
 
 pkgname=xfce4-clipman-plugin
 pkgver=1.2.3
-pkgrel=1
+pkgrel=2
 pkgdesc="A clipboard plugin for the Xfce4 panel"
 arch=('i686' 'x86_64')
 license=('GPL')
diff --git a/extra/xfce4-cpufreq-plugin/PKGBUILD b/extra/xfce4-cpufreq-plugin/PKGBUILD
index 8b2989b16..f237d1675 100644
--- a/extra/xfce4-cpufreq-plugin/PKGBUILD
+++ b/extra/xfce4-cpufreq-plugin/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 149240 2012-02-06 16:20:19Z foutrelis $
+# $Id: PKGBUILD 157843 2012-04-30 04:20:08Z foutrelis $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Contributor: tobias <tobias funnychar archlinux.org>
 
 pkgname=xfce4-cpufreq-plugin
 pkgver=1.0.0
-pkgrel=2
+pkgrel=3
 pkgdesc="CPU frequency plugin for the Xfce4 panel"
 arch=('i686' 'x86_64')
 license=('GPL2')
diff --git a/extra/xfce4-cpugraph-plugin/PKGBUILD b/extra/xfce4-cpugraph-plugin/PKGBUILD
index e68b3dd7f..423c092a2 100644
--- a/extra/xfce4-cpugraph-plugin/PKGBUILD
+++ b/extra/xfce4-cpugraph-plugin/PKGBUILD
@@ -1,34 +1,39 @@
-# $Id: PKGBUILD 149242 2012-02-06 16:21:17Z foutrelis $
+# $Id: PKGBUILD 157918 2012-04-30 05:16:48Z foutrelis $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Contributor: Aurelien Foret <orelien@chez.com>
 
 pkgname=xfce4-cpugraph-plugin
-pkgver=1.0.1
-pkgrel=3
+pkgver=1.0.2
+pkgrel=1
 pkgdesc="CPU graph plugin for the Xfce4 panel"
 arch=('i686' 'x86_64')
 license=('GPL' 'custom')
 url="http://goodies.xfce.org/projects/panel-plugins/xfce4-cpugraph-plugin"
 groups=('xfce4-goodies')
-depends=('xfce4-panel' 'libxfcegui4' 'hicolor-icon-theme')
+depends=('xfce4-panel')
 makedepends=('intltool')
-install=${pkgname}.install
-source=(http://archive.xfce.org/src/panel-plugins/${pkgname}/1.0/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('ff551087b1f61c47b8746e8687c572aa')
+options=('!libtool')
+install=$pkgname.install
+source=(http://archive.xfce.org/src/panel-plugins/$pkgname/1.0/$pkgname-$pkgver.tar.bz2)
+sha256sums=('b535a9c3d105c0d1597fa4071fe140912bb483c4401c84ad178531fc85de0577')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr \
-	--sysconfdir=/etc \
-	--libexecdir=/usr/lib \
-	--localstatedir=/var \
-	--disable-static \
-	--disable-debug
+  cd "$srcdir/$pkgname-$pkgver"
+
+  ./configure \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    --libexecdir=/usr/lib \
+    --localstatedir=/var \
+    --disable-static \
+    --disable-debug
   make
 }
 
 package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
-  install -Dm644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
+  install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
 }
+
+# vim:set ts=2 sw=2 et:
diff --git a/extra/xfce4-cpugraph-plugin/xfce4-cpugraph-plugin.install b/extra/xfce4-cpugraph-plugin/xfce4-cpugraph-plugin.install
index b7e9ea08e..e4f8fd06c 100644
--- a/extra/xfce4-cpugraph-plugin/xfce4-cpugraph-plugin.install
+++ b/extra/xfce4-cpugraph-plugin/xfce4-cpugraph-plugin.install
@@ -7,6 +7,7 @@ post_upgrade() {
 }
 
 post_remove() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+  post_install
 }
 
+# vim:set ts=2 sw=2 et:
diff --git a/extra/xfce4-datetime-plugin/PKGBUILD b/extra/xfce4-datetime-plugin/PKGBUILD
index 3db483abe..228613781 100644
--- a/extra/xfce4-datetime-plugin/PKGBUILD
+++ b/extra/xfce4-datetime-plugin/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 148972 2012-02-05 11:58:26Z ibiru $
+# $Id: PKGBUILD 157847 2012-04-30 04:20:13Z foutrelis $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Aurelien Foret <orelien@chez.com>
 
 pkgname=xfce4-datetime-plugin
 pkgver=0.6.1
-pkgrel=2
+pkgrel=3
 pkgdesc="A date and time display plugin for the Xfce panel"
 arch=('i686' 'x86_64')
 license=('GPL2')
diff --git a/extra/xfce4-dev-tools/PKGBUILD b/extra/xfce4-dev-tools/PKGBUILD
index 7d7c1cfc6..36fb4823e 100644
--- a/extra/xfce4-dev-tools/PKGBUILD
+++ b/extra/xfce4-dev-tools/PKGBUILD
@@ -1,29 +1,34 @@
-# $Id: PKGBUILD 153687 2012-03-17 20:59:01Z eric $
-# Maintainer: Andreas Radke <andyrtr@archlinux.org>
+# $Id: PKGBUILD 157849 2012-04-30 04:20:15Z foutrelis $
+# Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
+# Contributor: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Tobias Kieslich <tobias funnychar archlinux.org>
 
 pkgname=xfce4-dev-tools
-pkgver=4.9.1
+pkgver=4.10.0
 pkgrel=1
 pkgdesc="Xfce developer tools"
 arch=('i686' 'x86_64')
-license=('GPL2')
 url="http://www.xfce.org/"
-depends=('gtk-doc' 'automake' 'automake' 'make' 'intltool' 'pkg-config')
+license=('GPL2')
+depends=('gtk-doc' 'automake' 'make' 'intltool' 'pkg-config')
 options=('!libtool')
-source=(http://archive.xfce.org/src/xfce/xfce4-dev-tools/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('ba309d1286a2be964613e3eb19b08e2aced97bcc')
+source=(http://archive.xfce.org/src/xfce/xfce4-dev-tools/${pkgver%.*}/$pkgname-$pkgver.tar.bz2)
+sha256sums=('f79649bbfbbf16881494ee9f67035063765aec12e23ab9bac31de2c8a4f32bf8')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr \
-	--sysconfdir=/etc \
-	--libexecdir=/usr/lib \
-	--localstatedir=/var
+  cd "$srcdir/$pkgname-$pkgver"
+
+  ./configure \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    --libexecdir=/usr/lib \
+    --localstatedir=/var
   make
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
 }
+
+# vim:set ts=2 sw=2 et:
diff --git a/extra/xfce4-dict/PKGBUILD b/extra/xfce4-dict/PKGBUILD
index bcbd2d467..89cdd0d67 100644
--- a/extra/xfce4-dict/PKGBUILD
+++ b/extra/xfce4-dict/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 149262 2012-02-06 16:57:54Z foutrelis $
+# $Id: PKGBUILD 157851 2012-04-30 04:20:17Z foutrelis $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Contributor: Aurelien Foret <orelien@chez.com>
 
 pkgname=xfce4-dict
 pkgver=0.6.0
-pkgrel=2
+pkgrel=3
 pkgdesc="A dictionary plugin for the Xfce panel"
 arch=('i686' 'x86_64')
 license=('GPL2')
diff --git a/extra/xfce4-diskperf-plugin/PKGBUILD b/extra/xfce4-diskperf-plugin/PKGBUILD
index 9fef72e6e..3c3031e75 100644
--- a/extra/xfce4-diskperf-plugin/PKGBUILD
+++ b/extra/xfce4-diskperf-plugin/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 156693 2012-04-23 00:17:10Z eric $
-# Maintainer: AndyRTR <andyrtr@archlinux.org>
+# $Id: PKGBUILD 157916 2012-04-30 05:16:21Z foutrelis $
+# Maintainer:
 # Contributor: Aurelien Foret <orelien@chez.com>
 
 pkgname=xfce4-diskperf-plugin
-pkgver=2.5.1
+pkgver=2.5.2
 pkgrel=1
 pkgdesc="Plugin for the Xfce4 panel displaying instant disk/partition performance"
 arch=('i686' 'x86_64')
@@ -13,22 +13,26 @@ groups=('xfce4-goodies')
 depends=('xfce4-panel')
 makedepends=('intltool')
 options=('!libtool')
-source=(http://archive.xfce.org/src/panel-plugins/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('b6053881f3ddff90a0a0baa655c84b27')
+source=(http://archive.xfce.org/src/panel-plugins/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2)
+sha256sums=('a67e1a692f5dad0a8403899d514f29cde2c9d50d692e15ccd367f925adaed36d')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr \
-	--sysconfdir=/etc \
-	--libexecdir=/usr/lib \
-	--localstatedir=/var \
-	--disable-static \
-	--disable-debug
+  cd "$srcdir/$pkgname-$pkgver"
+
+  ./configure \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    --libexecdir=/usr/lib \
+    --localstatedir=/var \
+    --disable-static \
+    --disable-debug
   make
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING"
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
+  install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
 }
+
+# vim:set ts=2 sw=2 et:
diff --git a/extra/xfce4-eyes-plugin/PKGBUILD b/extra/xfce4-eyes-plugin/PKGBUILD
index f2ffecff5..055380203 100644
--- a/extra/xfce4-eyes-plugin/PKGBUILD
+++ b/extra/xfce4-eyes-plugin/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 149244 2012-02-06 16:25:23Z foutrelis $
+# $Id: PKGBUILD 157855 2012-04-30 04:20:22Z foutrelis $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Contributor: Aurelien Foret <orelien@chez.com>
 
 pkgname=xfce4-eyes-plugin
 pkgver=4.4.1
-pkgrel=2
+pkgrel=3
 pkgdesc="A rolling eyes (following mouse pointer) plugin for the Xfce panel"
 arch=(i686 x86_64)
 license=('GPL2')
diff --git a/extra/xfce4-fsguard-plugin/PKGBUILD b/extra/xfce4-fsguard-plugin/PKGBUILD
index 7fde834e8..55d61454e 100644
--- a/extra/xfce4-fsguard-plugin/PKGBUILD
+++ b/extra/xfce4-fsguard-plugin/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 149246 2012-02-06 16:26:23Z foutrelis $
+# $Id: PKGBUILD 157857 2012-04-30 04:20:25Z foutrelis $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Contributor: Ben <ben@benmazer.net>
 
 pkgname=xfce4-fsguard-plugin
 pkgver=1.0.0
-pkgrel=2
+pkgrel=3
 pkgdesc="File system usage monitor plugin for the Xfce4 panel"
 arch=(i686 x86_64)
 license=('GPL2')
diff --git a/extra/xfce4-genmon-plugin/PKGBUILD b/extra/xfce4-genmon-plugin/PKGBUILD
index 074f82688..a019adb4a 100644
--- a/extra/xfce4-genmon-plugin/PKGBUILD
+++ b/extra/xfce4-genmon-plugin/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 146212 2012-01-06 03:56:23Z foutrelis $
+# $Id: PKGBUILD 157859 2012-04-30 04:20:27Z foutrelis $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Contributor: Tobias Kieslich <tobias (at) archlinux.org>
 
 pkgname=xfce4-genmon-plugin
 pkgver=3.3.1
-pkgrel=1
+pkgrel=2
 pkgdesc="plugin that monitors customizable programs stdout for the Xfce4 panel"
 arch=(i686 x86_64)
 license=('LGPL2.1')
diff --git a/extra/xfce4-mailwatch-plugin/PKGBUILD b/extra/xfce4-mailwatch-plugin/PKGBUILD
index ebc9be73a..c5a614ce0 100644
--- a/extra/xfce4-mailwatch-plugin/PKGBUILD
+++ b/extra/xfce4-mailwatch-plugin/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 135816 2011-08-18 15:04:58Z andyrtr $
+# $Id: PKGBUILD 157861 2012-04-30 04:20:30Z foutrelis $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Contributor: Suzy Williams <suzanne.williams3@verizon.net>
 
 pkgname=xfce4-mailwatch-plugin
 pkgver=1.1.0
-pkgrel=4
+pkgrel=5
 pkgdesc="A mailbox watch/check plugin for the Xfce4 panel"
 arch=(i686 x86_64)
 license=('GPL2')
@@ -15,12 +15,15 @@ makedepends=('intltool' 'xfce4-dev-tools')
 options=('!libtool')
 install=${pkgname}.install
 source=(http://spuriousinterrupt.org/files/mailwatch/${pkgname}-${pkgver}.tar.bz2
-	xfce4-mailwatch-plugin-1.1.0-underlink.patch)
+	xfce4-mailwatch-plugin-1.1.0-underlink.patch
+	only-call-gnutls-transport_set_lowat-with-gnutls-2.12.patch)
 md5sums=('f84dce86be1d7f25f169f262aaacee4e'
-         '47fe8588e3bb642e1b507a854927e6db')
+         '47fe8588e3bb642e1b507a854927e6db'
+         'd91ca2b9534e9e2d8dcbd94306b91ade')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
+  patch -Np0 -i ${srcdir}/only-call-gnutls-transport_set_lowat-with-gnutls-2.12.patch
   # fix for panel4.8 from Fedora
   patch -Np1 -i ${srcdir}/xfce4-mailwatch-plugin-1.1.0-underlink.patch
   xdt-autogen
diff --git a/extra/xfce4-mailwatch-plugin/only-call-gnutls-transport_set_lowat-with-gnutls-2.12.patch b/extra/xfce4-mailwatch-plugin/only-call-gnutls-transport_set_lowat-with-gnutls-2.12.patch
new file mode 100644
index 000000000..349e78555
--- /dev/null
+++ b/extra/xfce4-mailwatch-plugin/only-call-gnutls-transport_set_lowat-with-gnutls-2.12.patch
@@ -0,0 +1,13 @@
+--- libmailwatch-core/mailwatch-net-conn.c.orig	2012-04-29 05:38:20.015564589 +0300
++++ libmailwatch-core/mailwatch-net-conn.c	2012-04-29 05:39:01.943290639 +0300
+@@ -621,8 +621,10 @@ xfce_mailwatch_net_conn_make_secure(Xfce
+                            net_conn->gt_creds);
+     gnutls_transport_set_ptr(net_conn->gt_session,
+                              (gnutls_transport_ptr_t)net_conn->fd);
++#if GNUTLS_VERSION_NUMBER < 0x020c00
+     if(fcntl(net_conn->fd, F_GETFL) & O_NONBLOCK)
+         gnutls_transport_set_lowat(net_conn->gt_session, 0);
++#endif
+     
+     if(!xfce_mailwatch_net_conn_tls_handshake(net_conn, error)) {
+ #if 0
diff --git a/extra/xfce4-mixer/PKGBUILD b/extra/xfce4-mixer/PKGBUILD
index 7cc19647a..befd4f301 100644
--- a/extra/xfce4-mixer/PKGBUILD
+++ b/extra/xfce4-mixer/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 149248 2012-02-06 16:27:50Z foutrelis $
+# $Id: PKGBUILD 157863 2012-04-30 04:20:32Z foutrelis $
 # Maintainer: Tobias Kieslich <tobias funnychar archlinux.org>
 
 pkgname=xfce4-mixer
 pkgver=4.8.0
-pkgrel=2
+pkgrel=3
 pkgdesc="The volume control plugin for the Xfce panel"
 arch=(i686 x86_64)
 license=('GPL2')
diff --git a/extra/xfce4-mount-plugin/PKGBUILD b/extra/xfce4-mount-plugin/PKGBUILD
index 2a406f37f..04a381b4c 100644
--- a/extra/xfce4-mount-plugin/PKGBUILD
+++ b/extra/xfce4-mount-plugin/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 157457 2012-04-28 16:24:13Z eric $
+# $Id: PKGBUILD 157865 2012-04-30 04:20:35Z foutrelis $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Contributor: Tobias Kieslich <tobias (at) archlinux.org>
 
 pkgname=xfce4-mount-plugin
 pkgver=0.6.3
-pkgrel=1
+pkgrel=2
 pkgdesc="Plugin for the Xfce4 panel to mount and unmount volumes"
 arch=('i686' 'x86_64')
 license=('GPL')
diff --git a/extra/xfce4-mpc-plugin/PKGBUILD b/extra/xfce4-mpc-plugin/PKGBUILD
index ef3c4088b..56f3f4cc4 100644
--- a/extra/xfce4-mpc-plugin/PKGBUILD
+++ b/extra/xfce4-mpc-plugin/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 150133 2012-02-13 10:09:13Z eric $
+# $Id: PKGBUILD 157867 2012-04-30 04:20:37Z foutrelis $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: aurelien <aurelien@archlinux.org>
 # Contributor: Tobias Kieslich <tobias (at) archlinux.org>
 
 pkgname=xfce4-mpc-plugin
 pkgver=0.4.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A plugin to control the music player daemon from the xfce4-panel"
 arch=('i686' 'x86_64')
 license=('BSD')
diff --git a/extra/xfce4-netload-plugin/PKGBUILD b/extra/xfce4-netload-plugin/PKGBUILD
index 664a28a85..1952c9284 100644
--- a/extra/xfce4-netload-plugin/PKGBUILD
+++ b/extra/xfce4-netload-plugin/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 146671 2012-01-16 06:54:09Z eric $
+# $Id: PKGBUILD 157869 2012-04-30 04:20:41Z foutrelis $
 # Maintainer: aurelien <aurelien@archlinux.org>
 # Contributor: Aurelien Foret <orelien@chez.com>
 
 pkgname=xfce4-netload-plugin
 pkgver=1.1.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A netload plugin for the Xfce panel"
 arch=('i686' 'x86_64')
 license=('GPL')
diff --git a/extra/xfce4-notes-plugin/PKGBUILD b/extra/xfce4-notes-plugin/PKGBUILD
index ddb4568f4..66a2582c7 100644
--- a/extra/xfce4-notes-plugin/PKGBUILD
+++ b/extra/xfce4-notes-plugin/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 148974 2012-02-05 11:58:30Z ibiru $
+# $Id: PKGBUILD 157871 2012-04-30 04:20:45Z foutrelis $
 # Maintainer: Andreas Radke <andyrtr at archlinux.org>
 # Contributor: Ben Mazer <contrasutra@myrealbox.com>
 
 pkgname=xfce4-notes-plugin
 pkgver=1.7.7
-pkgrel=3
+pkgrel=4
 pkgdesc="A notes plugin for the Xfce4 panel"
 arch=('i686' 'x86_64')
 license=('GPL2')
@@ -18,7 +18,7 @@ source=(http://archive.xfce.org/src/panel-plugins/${pkgname}/1.7/${pkgname}-${pk
 md5sums=('42b924b23f2fec6a1099e9b7a87db4a3')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd "${srcdir}/${pkgname}-${pkgver}"
   ./configure --prefix=/usr \
 	--sysconfdir=/etc \
 	--libexecdir=/usr/lib \
@@ -29,6 +29,6 @@ build() {
 }
 
 package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/xfce4-notifyd/PKGBUILD b/extra/xfce4-notifyd/PKGBUILD
index 9ffefd291..1cf84b838 100644
--- a/extra/xfce4-notifyd/PKGBUILD
+++ b/extra/xfce4-notifyd/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 141355 2011-10-29 18:34:46Z foutrelis $
+# $Id: PKGBUILD 157873 2012-04-30 04:20:51Z foutrelis $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: tobias <tobias funnychar archlinux.org>
 
 pkgname=xfce4-notifyd
 pkgver=0.2.2
-pkgrel=2
+pkgrel=3
 pkgdesc="Notification daemon for the Xfce desktop"
 arch=('i686' 'x86_64')
 url="http://goodies.xfce.org/projects/applications/xfce4-notifyd"
@@ -16,12 +16,13 @@ provides=('notification-daemon')
 options=('!libtool')
 install=$pkgname.install
 source=(http://archive.xfce.org/src/apps/$pkgname/0.2/$pkgname-$pkgver.tar.bz2)
-sha1sums=('31888132d949cc7b47d12889b8aaf5dabc546d8b')
+sha256sums=('b66e68dfc2164bcf479acd3c7e8b6f83065d23aef988535e2db3506d06a39168')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
-  ./configure --prefix=/usr \
+  ./configure \
+    --prefix=/usr \
     --sysconfdir=/etc \
     --libexecdir=/usr/lib \
     --localstatedir=/var \
diff --git a/extra/xfce4-panel/PKGBUILD b/extra/xfce4-panel/PKGBUILD
index 041ebf6a5..11aff985e 100644
--- a/extra/xfce4-panel/PKGBUILD
+++ b/extra/xfce4-panel/PKGBUILD
@@ -1,37 +1,41 @@
-# $Id: PKGBUILD 138667 2011-09-27 14:43:08Z andyrtr $
-# Maintainer: AndyRTR <andyrtr@archlinux.org>
+# $Id: PKGBUILD 157875 2012-04-30 04:20:56Z foutrelis $
+# Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: tobias <tobias funnychar archlinux.org>
 
 pkgname=xfce4-panel
-pkgver=4.8.6
+pkgver=4.10.0
 pkgrel=1
 pkgdesc="Panel for the Xfce desktop environment"
 arch=('i686' 'x86_64')
-license=('GPL2')
 url="http://www.xfce.org/"
+license=('GPL2')
 groups=('xfce4')
-depends=('exo>=0.6.0' 'garcon>=0.1.5' 'libxfce4ui>=4.8.0' 'libwnck' 'libsm' 'hicolor-icon-theme' 'desktop-file-utils')
+depends=('exo' 'garcon' 'libxfce4ui' 'libwnck' 'libsm' 'hicolor-icon-theme'
+         'desktop-file-utils')
 makedepends=('intltool' 'gtk-doc')
 options=('!libtool')
-install=${pkgname}.install
-source=(http://archive.xfce.org/src/xfce/${pkgname}/4.8/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('9d7bf0503d5867c4044cef04bb5845b1')
-sha1sums=('332fc968332e6271e1bb65d6de8de2524b0440ec')
+install=$pkgname.install
+source=(http://archive.xfce.org/src/xfce/$pkgname/4.10/$pkgname-$pkgver.tar.bz2)
+sha256sums=('3321f998af2bbd14ba68654a8881774f6ea2ec4f1a3544598e7f47d3ed0009b9')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr \
-	--sysconfdir=/etc \
-	--libexecdir=/usr/lib \
-	--localstatedir=/var \
-	--disable-static \
-	--enable-gio-unix \
-	--enable-gtk-doc \
-	--disable-debug
+  cd "$srcdir/$pkgname-$pkgver"
+
+  ./configure \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    --libexecdir=/usr/lib \
+    --localstatedir=/var \
+    --disable-static \
+    --enable-gio-unix \
+    --enable-gtk-doc \
+    --disable-debug
   make
 }
 
 package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
 }
+
+# vim:set ts=2 sw=2 et:
diff --git a/extra/xfce4-panel/xfce4-panel.install b/extra/xfce4-panel/xfce4-panel.install
index bce670aff..c7a5da359 100644
--- a/extra/xfce4-panel/xfce4-panel.install
+++ b/extra/xfce4-panel/xfce4-panel.install
@@ -10,3 +10,5 @@ post_upgrade() {
 post_remove() {
   post_install
 }
+
+# vim:set ts=2 sw=2 et:
diff --git a/extra/xfce4-power-manager/PKGBUILD b/extra/xfce4-power-manager/PKGBUILD
index ed75076a0..f3f460a6a 100644
--- a/extra/xfce4-power-manager/PKGBUILD
+++ b/extra/xfce4-power-manager/PKGBUILD
@@ -1,32 +1,25 @@
-# $Id: PKGBUILD 156097 2012-04-13 12:06:18Z foutrelis $
+# $Id: PKGBUILD 157932 2012-04-30 06:20:21Z foutrelis $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: Tobias Kieslich <tobias funnychar archlinux.org>
 
 pkgname=xfce4-power-manager
-pkgver=1.0.11
+pkgver=1.2.0
 pkgrel=2
 pkgdesc="Power manager for Xfce desktop"
 arch=('i686' 'x86_64')
 url="http://xfce-goodies.berlios.de/"
 license=('GPL2')
-groups=('xfce4-goodies')
-depends=('xfce4-panel' 'upower' 'udisks' 'libnotify' 'hicolor-icon-theme'
-         'librsvg')
+groups=('xfce4')
+depends=('xfce4-panel' 'upower' 'udisks' 'libnotify' 'hicolor-icon-theme')
 makedepends=('pkgconfig' 'intltool')
 options=('!libtool')
 install=$pkgname.install
-source=(http://archive.xfce.org/src/apps/$pkgname/1.0/$pkgname-$pkgver.tar.bz2
-        fix-french-translation.patch)
-sha256sums=('cfa85d839458fa2e9c2ee874d7d64ab00a95d6d51e6acf0ac082ffc700fe4339'
-            'acae23105905f13d65eafac2a7a03b2f15a1b143e7606ef077ace30497f6c448')
+source=(http://archive.xfce.org/src/apps/$pkgname/1.2/$pkgname-$pkgver.tar.bz2)
+sha256sums=('d7fb98a540284b62f4201527de17d4b24123f9d26c9f49131dd497c8387184e9')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
-  # Fix crashes caused by the French .po file
-  # https://bugs.archlinux.org/task/29294
-  patch -Np1 -i "$srcdir/fix-french-translation.patch"
-
   ./configure \
     --prefix=/usr \
     --sysconfdir=/etc \
diff --git a/extra/xfce4-quicklauncher-plugin/PKGBUILD b/extra/xfce4-quicklauncher-plugin/PKGBUILD
index 29a0615e6..38198869e 100644
--- a/extra/xfce4-quicklauncher-plugin/PKGBUILD
+++ b/extra/xfce4-quicklauncher-plugin/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 148976 2012-02-05 11:58:38Z ibiru $
+# $Id: PKGBUILD 157879 2012-04-30 04:21:07Z foutrelis $
 # Maintainer: 
 # Contributor: Tobias Kieslich <tobias (at) archlinux.org>
 
 pkgname=xfce4-quicklauncher-plugin
 pkgver=1.9.4
-pkgrel=6
+pkgrel=7
 pkgdesc="plugin that creates 4 little application launcher in the Xfce4 panel"
 arch=('i686' 'x86_64')
 license=('GPL2')
@@ -27,13 +27,13 @@ md5sums=('299e17f196ecfa5fb018cf65abb19b56'
          '9e7f789129b08c787978c7a72a55fae7')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd "${srcdir}/${pkgname}-${pkgver}"
   # Fedora patches
-  patch -Np0 -i ${srcdir}/xfce4-quicklauncher-plugin-1.9.4-desktop-file.patch
-  patch -Np0 -i ${srcdir}/xfce4-quicklauncher-plugin-1.9.4-fix-multiscreen.patch
-  patch -Np1 -i ${srcdir}/xfce4-quicklauncher-plugin-1.9.4-save-settings.patch
-  patch -Np1 -i ${srcdir}/xfce4-quicklauncher-plugin-1.9.4-fix-missing-english-translation.patch
-  patch -Np0 -i ${srcdir}/xfce4-quicklauncher-plugin-1.9.4-xfce4-settings-manager.patch
+  patch -Np0 -i "${srcdir}/xfce4-quicklauncher-plugin-1.9.4-desktop-file.patch"
+  patch -Np0 -i "${srcdir}/xfce4-quicklauncher-plugin-1.9.4-fix-multiscreen.patch"
+  patch -Np1 -i "${srcdir}/xfce4-quicklauncher-plugin-1.9.4-save-settings.patch"
+  patch -Np1 -i "${srcdir}/xfce4-quicklauncher-plugin-1.9.4-fix-missing-english-translation.patch"
+  patch -Np0 -i "${srcdir}/xfce4-quicklauncher-plugin-1.9.4-xfce4-settings-manager.patch"
   
   ./configure --prefix=/usr \
 	--sysconfdir=/etc \
@@ -45,6 +45,6 @@ build() {
 }
 
 package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/xfce4-screenshooter/PKGBUILD b/extra/xfce4-screenshooter/PKGBUILD
index ab636abd7..947c7ddca 100644
--- a/extra/xfce4-screenshooter/PKGBUILD
+++ b/extra/xfce4-screenshooter/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 143213 2011-11-23 12:30:04Z foutrelis $
+# $Id: PKGBUILD 157881 2012-04-30 04:21:13Z foutrelis $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: Tobias Kieslich <tobias (at) archlinux.org>
 
 pkgname=xfce4-screenshooter
 pkgver=1.8.0
-pkgrel=2
+pkgrel=3
 pkgdesc="Plugin that makes screenshots for the Xfce panel"
 arch=('i686' 'x86_64')
 url="http://goodies.xfce.org/projects/applications/xfce4-screenshooter"
diff --git a/extra/xfce4-sensors-plugin/PKGBUILD b/extra/xfce4-sensors-plugin/PKGBUILD
index 736c67f15..3d11b36d9 100644
--- a/extra/xfce4-sensors-plugin/PKGBUILD
+++ b/extra/xfce4-sensors-plugin/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 151507 2012-02-26 21:47:29Z foutrelis $
+# $Id: PKGBUILD 157883 2012-04-30 04:21:17Z foutrelis $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Merk Matthias <macem@chello.at>
 
 pkgname=xfce4-sensors-plugin
 pkgver=1.2.3
-pkgrel=4
+pkgrel=5
 pkgdesc="A lm_sensors plugin for the Xfce panel"
 arch=('i686' 'x86_64')
 license=('GPL2')
diff --git a/extra/xfce4-session/PKGBUILD b/extra/xfce4-session/PKGBUILD
index 14a18a066..c25d81423 100644
--- a/extra/xfce4-session/PKGBUILD
+++ b/extra/xfce4-session/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 150131 2012-02-13 08:12:40Z foutrelis $
+# $Id: PKGBUILD 157922 2012-04-30 05:50:06Z foutrelis $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: tobias <tobias funnychar archlinux.org>
 
 pkgname=xfce4-session
-pkgver=4.8.3
-pkgrel=1
+pkgver=4.10.0
+pkgrel=3
 pkgdesc="A session manager for Xfce"
 arch=('i686' 'x86_64')
 url="http://www.xfce.org/"
@@ -12,15 +12,18 @@ license=('GPL2')
 groups=('xfce4')
 # keep xorg-server-utils for https://bugs.archlinux.org/task/21096
 # upower and consolekit for reboot/shutdown/hibernate/suspend
-depends=('xfce4-panel' 'gconf' 'libgnome-keyring' 'libwnck' 'libsm'
-         'xorg-iceauth' 'upower' 'consolekit' 'hicolor-icon-theme')
+depends=('libxfce4ui' 'libwnck' 'libsm' 'xorg-iceauth' 'upower' 'consolekit'
+         'xorg-xinit' 'hicolor-icon-theme')
 makedepends=('intltool')
-optdepends=('fortune-mod: for xfce4-tips')
-replaces=('xfce4-toys')
+optdepends=('gnome-keyring: for keyring support when GNOME compatibility is enabled'
+            'xscreensaver: for locking screen with xflock4'
+            'gnome-screensaver: for locking screen with xflock4'
+            'xlockmore: for locking screen with xflock4')
+replaces=('xfce-utils')
 options=('!libtool')
 install=$pkgname.install
-source=(http://archive.xfce.org/src/xfce/$pkgname/4.8/$pkgname-$pkgver.tar.bz2)
-sha256sums=('f0801b8c0ffa7e5d41b29b8df281ac127adf467bf50e8ded8aebe5a02bd99338')
+source=(http://archive.xfce.org/src/xfce/$pkgname/4.10/$pkgname-$pkgver.tar.bz2)
+sha256sums=('bb8aa9a74c3d382840596fb4875144d66c7f3f47c8e9ee81d31e3428a72c46ce')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
@@ -30,14 +33,7 @@ build() {
     --libexecdir=/usr/lib/xfce4 \
     --localstatedir=/var \
     --disable-static \
-    --disable-hal \
-    --enable-gnome \
     --enable-libgnome-keyring \
-    --enable-session-screenshots \
-    --enable-upower \
-    --enable-consolekit \
-    --enable-polkit \
-    --enable-panel-plugin \
     --disable-debug
   make
 }
diff --git a/extra/xfce4-settings/PKGBUILD b/extra/xfce4-settings/PKGBUILD
index f17fd5727..725f43548 100644
--- a/extra/xfce4-settings/PKGBUILD
+++ b/extra/xfce4-settings/PKGBUILD
@@ -1,31 +1,31 @@
-# $Id: PKGBUILD 143211 2011-11-23 12:04:45Z foutrelis $
+# $Id: PKGBUILD 157887 2012-04-30 04:21:22Z foutrelis $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: tobias <tobias funnychar archlinux.org>
 # Contributor: Corrado Primier <bardo@aur.archlinux.org>
 
 pkgname=xfce4-settings
-pkgver=4.8.3
-pkgrel=2
+pkgver=4.10.0
+pkgrel=1
 pkgdesc="Settings manager for xfce"
 arch=('i686' 'x86_64')
 url="http://www.xfce.org/"
 license=('GPL2')
 groups=('xfce4')
-depends=('exo' 'libxfce4ui' 'libnotify' 'libxklavier' 'gnome-icon-theme'
-         'gtk-engines' 'gtk-xfce-engine')
+depends=('exo' 'garcon' 'libxfce4ui' 'libnotify' 'libxklavier'
+         'gnome-icon-theme' 'gtk-engines' 'gtk2-xfce-engine')
 makedepends=('intltool')
 optdepends=('libcanberra: for sound control')
-source=(http://archive.xfce.org/src/xfce/${pkgname}/4.8/${pkgname}-${pkgver}.tar.bz2
-        xfce4-settings-4.6.0.patch)
-sha256sums=('d878cc474e1e677e9607279b9a1007cb90ed35ff078de180259a8b2b8d06bc2e'
-            'c91d246cc678014a7fa8af37f2a24640bcc8823e41e064361130da7ae3809ed5')
+source=(http://archive.xfce.org/src/xfce/$pkgname/4.10/$pkgname-$pkgver.tar.bz2
+        xfce4-settings-xml-4.10.0.patch)
+sha256sums=('0843f09ba9673f1d1b5df8dce4a17b63c183a9ba3be75fb6ef99a67fc8c1f77e'
+            '544d4409bac1cba1c0897317838cf2e24345f6ed4e3bf497a89b38d2643925c1')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
   # enable gnome icon theme, clearlooks theme and font hinting by default
   # (taken from Fedora)
-  patch -Np1 -i "$srcdir/xfce4-settings-4.6.0.patch"
+  patch -Np1 -i "$srcdir/xfce4-settings-xml-4.10.0.patch"
 
   ./configure --prefix=/usr \
     --sysconfdir=/etc \
diff --git a/extra/xfce4-settings/xfce4-settings-xml-4.10.0.patch b/extra/xfce4-settings/xfce4-settings-xml-4.10.0.patch
new file mode 100644
index 000000000..cb3a4a0d3
--- /dev/null
+++ b/extra/xfce4-settings/xfce4-settings-xml-4.10.0.patch
@@ -0,0 +1,26 @@
+diff -Nur xfce4-settings-4.9.4.orig/xfsettingsd/xsettings.xml xfce4-settings-4.9.4/xfsettingsd/xsettings.xml
+--- xfce4-settings-4.9.4.orig/xfsettingsd/xsettings.xml	2012-04-01 03:58:17.000000000 -0600
++++ xfce4-settings-4.9.4/xfsettingsd/xsettings.xml	2012-04-02 14:59:57.555572009 -0600
+@@ -6,8 +6,8 @@
+ <?xml version="1.0" encoding="UTF-8"?>
+ <channel name="xsettings" version="1.0">
+   <property name="Net" type="empty">
+-    <property name="ThemeName" type="empty"/>
+-    <property name="IconThemeName" type="empty"/>
++    <property name="ThemeName" type="Clearlooks"/>
++    <property name="IconThemeName" type="gnome"/>
+     <property name="DoubleClickTime" type="int" value="250"/>
+     <property name="DoubleClickDistance" type="int" value="5"/>
+     <property name="DndDragThreshold" type="int" value="8"/>
+@@ -19,9 +19,9 @@
+   </property>
+   <property name="Xft" type="empty">
+     <property name="DPI" type="empty"/>
+-    <property name="Antialias" type="int" value="-1"/>
++    <property name="Antialias" type="int" value="1"/>
+     <property name="Hinting" type="int" value="-1"/>
+-    <property name="HintStyle" type="string" value="hintnone"/>
++    <property name="HintStyle" type="string" value="hintfull"/>
+     <property name="RGBA" type="string" value="none"/>
+     <!-- <property name="Lcdfilter" type="string" value="none"/> -->
+   </property>
diff --git a/extra/xfce4-smartbookmark-plugin/PKGBUILD b/extra/xfce4-smartbookmark-plugin/PKGBUILD
index 1bfdd9253..3ae00d8bd 100644
--- a/extra/xfce4-smartbookmark-plugin/PKGBUILD
+++ b/extra/xfce4-smartbookmark-plugin/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 141671 2011-11-02 05:08:45Z eric $
+# $Id: PKGBUILD 157889 2012-04-30 04:21:24Z foutrelis $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Contributor: Tobias Kieslich <tobias (at) archlinux.org>
 
 pkgname=xfce4-smartbookmark-plugin
 pkgver=0.4.4
-pkgrel=1
+pkgrel=2
 pkgdesc="Plugin for the Xfce4 panel that let you quicksearch from selected websites"
 arch=('i686' 'x86_64')
 license=('GPL2')
diff --git a/extra/xfce4-systemload-plugin/PKGBUILD b/extra/xfce4-systemload-plugin/PKGBUILD
index 0703806ef..e05c5605a 100644
--- a/extra/xfce4-systemload-plugin/PKGBUILD
+++ b/extra/xfce4-systemload-plugin/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 156568 2012-04-21 03:24:10Z eric $
+# $Id: PKGBUILD 157891 2012-04-30 04:21:26Z foutrelis $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Contributor: Aurelien Foret <orelien@chez.com>
 
 pkgname=xfce4-systemload-plugin
 pkgver=1.1.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A system load plugin for the Xfce4 panel"
 arch=('i686' 'x86_64')
 license=('custom')
diff --git a/extra/xfce4-time-out-plugin/PKGBUILD b/extra/xfce4-time-out-plugin/PKGBUILD
index 5c1d07fd9..98a9109ec 100755
--- a/extra/xfce4-time-out-plugin/PKGBUILD
+++ b/extra/xfce4-time-out-plugin/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 156570 2012-04-21 03:56:43Z eric $
+# $Id: PKGBUILD 157893 2012-04-30 04:21:28Z foutrelis $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Contributor: Abhishek Dasgupta <abhidg@gmail.com>
 
 pkgname=xfce4-time-out-plugin
 pkgver=1.0.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Take a break from your computer with this plugin for XFCE4."
 arch=('i686' 'x86_64')
 url="http://xfce-goodies.berlios.de/"
diff --git a/extra/xfce4-timer-plugin/PKGBUILD b/extra/xfce4-timer-plugin/PKGBUILD
index 4aaa96ed7..9f5eb4b77 100644
--- a/extra/xfce4-timer-plugin/PKGBUILD
+++ b/extra/xfce4-timer-plugin/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 150121 2012-02-12 22:43:39Z eric $
+# $Id: PKGBUILD 157895 2012-04-30 04:21:31Z foutrelis $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Contributor: Tobias Kieslich <tobias (at) archlinux.org>
 
 pkgname=xfce4-timer-plugin
 pkgver=0.6.4
-pkgrel=1
+pkgrel=2
 pkgdesc="plugin to track time for the Xfce4 panel"
 arch=('i686' 'x86_64')
 license=('GPL2')
diff --git a/extra/xfce4-verve-plugin/PKGBUILD b/extra/xfce4-verve-plugin/PKGBUILD
index 145a22845..1087fa358 100644
--- a/extra/xfce4-verve-plugin/PKGBUILD
+++ b/extra/xfce4-verve-plugin/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 149978 2012-02-11 23:31:39Z allan $
+# $Id: PKGBUILD 157897 2012-04-30 04:21:33Z foutrelis $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Contributor: Tobias Kieslich <tobias (at) archlinux.org>
 
 pkgname=xfce4-verve-plugin
 pkgver=1.0.0
-pkgrel=2
+pkgrel=3
 pkgdesc="command line plugin Xfce4 panel"
 arch=('i686' 'x86_64')
 license=('GPL2')
@@ -17,7 +17,7 @@ source=(http://archive.xfce.org/src/panel-plugins/$pkgname/1.0/$pkgname-$pkgver.
 md5sums=('ed7039c40d6e560ed8bcf9a324d2ae86')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd "${srcdir}/${pkgname}-${pkgver}"
   ./configure --prefix=/usr \
 	--sysconfdir=/etc \
 	--libexecdir=/usr/lib \
@@ -28,6 +28,6 @@ build() {
 }
 
 package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/xfce4-wavelan-plugin/PKGBUILD b/extra/xfce4-wavelan-plugin/PKGBUILD
index 7be2b552f..8399b5898 100644
--- a/extra/xfce4-wavelan-plugin/PKGBUILD
+++ b/extra/xfce4-wavelan-plugin/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 157144 2012-04-24 23:57:43Z foutrelis $
+# $Id: PKGBUILD 157899 2012-04-30 04:21:35Z foutrelis $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Contributor: Tobias Kieslich <tobias (at) archlinux.org>
 
 pkgname=xfce4-wavelan-plugin
 pkgver=0.5.10
-pkgrel=2
+pkgrel=3
 pkgdesc="Plugin to monitor wifi connectivity for the Xfce4 panel"
 arch=('i686' 'x86_64')
 license=('custom')
diff --git a/extra/xfce4-weather-plugin/PKGBUILD b/extra/xfce4-weather-plugin/PKGBUILD
index b5ac7d8f1..f7242f803 100644
--- a/extra/xfce4-weather-plugin/PKGBUILD
+++ b/extra/xfce4-weather-plugin/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 142430 2011-11-09 18:10:30Z foutrelis $
+# $Id: PKGBUILD 157901 2012-04-30 04:21:38Z foutrelis $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: Suzy Williams <suzanne.williams3@verizon.net>
 
 pkgname=xfce4-weather-plugin
 pkgver=0.7.4
-pkgrel=2
+pkgrel=3
 pkgdesc="A weather plugin for the Xfce4 panel"
 arch=('i686' 'x86_64')
 url="http://goodies.xfce.org/projects/panel-plugins/xfce4-weather-plugin"
diff --git a/extra/xfce4-xkb-plugin/PKGBUILD b/extra/xfce4-xkb-plugin/PKGBUILD
index af2fc76ef..ee0f53873 100644
--- a/extra/xfce4-xkb-plugin/PKGBUILD
+++ b/extra/xfce4-xkb-plugin/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 148450 2012-02-01 04:56:04Z eric $
+# $Id: PKGBUILD 157903 2012-04-30 04:21:40Z foutrelis $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Contributor: Tobias Kieslich <tobias (at) archlinux.org>
 
 pkgname=xfce4-xkb-plugin
 pkgver=0.5.4.3
-pkgrel=1
+pkgrel=2
 pkgdesc="Plugin to switch keyboard layouts for the Xfce4 panel"
 arch=('i686' 'x86_64')
 license=('custom')
diff --git a/extra/xfconf/PKGBUILD b/extra/xfconf/PKGBUILD
index f677e21d8..7860c4901 100644
--- a/extra/xfconf/PKGBUILD
+++ b/extra/xfconf/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 145609 2011-12-23 17:39:17Z foutrelis $
+# $Id: PKGBUILD 157905 2012-04-30 04:21:42Z foutrelis $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: tobias <tobias funnychar archlinux.org>
 
 pkgname=xfconf
-pkgver=4.8.1
+pkgver=4.10.0
 pkgrel=1
 pkgdesc="A simple client-server configuration storage and query system"
 arch=('i686' 'x86_64')
@@ -16,8 +16,8 @@ depends=('libxfce4util' 'dbus-glib' 'dbus')
 makedepends=('pkgconfig' 'perl-extutils-depends' 'perl-extutils-pkgconfig'
              'glib-perl' 'intltool' 'gtk-doc' 'chrpath')
 options=('!libtool' '!emptydirs')
-source=(http://archive.xfce.org/src/xfce/$pkgname/4.8/$pkgname-$pkgver.tar.bz2)
-sha256sums=('9860737539fab2b852e8c07c50c205a5fbe894b08bcb4488a70e3fd6c75993cb')
+source=(http://archive.xfce.org/src/xfce/$pkgname/4.10/$pkgname-$pkgver.tar.bz2)
+sha256sums=('175219a441cc7d0f210bbd1a3b0abba41598627cd9db27235811400c3e100576')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/xfdesktop/PKGBUILD b/extra/xfdesktop/PKGBUILD
index a3d15bb41..8feb2e04c 100644
--- a/extra/xfdesktop/PKGBUILD
+++ b/extra/xfdesktop/PKGBUILD
@@ -1,42 +1,42 @@
-# $Id: PKGBUILD 150819 2012-02-23 06:32:41Z foutrelis $
+# $Id: PKGBUILD 157989 2012-04-30 17:36:28Z foutrelis $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: tobias <tobias funnychar archlinux.org>
 
 pkgname=xfdesktop
-pkgver=4.8.3
+pkgver=4.10.0
 pkgrel=2
 pkgdesc="A desktop manager for Xfce"
 arch=('i686' 'x86_64')
 url="http://www.xfce.org/"
 license=('GPL2')
 groups=('xfce4')
-depends=('libxfce4ui' 'thunar>=1.2.0' 'garcon' 'hicolor-icon-theme' 'libwnck')
+depends=('libxfce4ui' 'thunar' 'garcon' 'hicolor-icon-theme' 'libwnck')
 makedepends=('intltool' 'xfce4-panel')
 optdepends=('xfce4-panel: panel menu plugin')
 conflicts=('xfce4-menueditor')
 replaces=('xfce4-menueditor')
 options=('!libtool')
 install=xfdesktop.install
-source=(http://archive.xfce.org/src/xfce/$pkgname/4.8/$pkgname-$pkgver.tar.bz2
-        implement-paste-on-desktop.patch)
-sha256sums=('e58460f52ae96c389402f6db62c46db61cd51cdb550a42bd97c0ab2a5b62f424'
-            'f26a75fe27c198cd40fad139310e984f4eaac0dfa2cae0d7f32498a8f58322b2')
+source=(http://archive.xfce.org/src/xfce/$pkgname/4.10/$pkgname-$pkgver.tar.bz2
+        add-backgrounds-xfce-to-search-path.patch)
+sha256sums=('897ae6ee435dcc89809ad70c15c5d15347d1cf4fc8033238b17dcc47836c2d7b'
+            'fcb27e24abfd50c5555fe01ae946a2bc5a133d3f5cee076eef517ccc5f668dd5')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
-  # Fix FS#27866: Paste menu entry in context menu is deactivated
-  # Upstream report/patch: https://bugzilla.xfce.org/show_bug.cgi?id=3804
-  patch -Np1 -i "$srcdir/implement-paste-on-desktop.patch"
+  # Add backgrounds/xfce/ to the single image list in the settings app
+  # https://bugzilla.xfce.org/show_bug.cgi?id=8799
+  patch -Np1 -i "$srcdir/add-backgrounds-xfce-to-search-path.patch"
 
-  ./configure --prefix=/usr \
+  ./configure \
+    --prefix=/usr \
     --sysconfdir=/etc \
     --libexecdir=/usr/lib \
     --localstatedir=/var \
     --disable-static \
     --enable-gio-unix \
     --enable-thunarx \
-    --enable-exo \
     --enable-notifications \
     --disable-debug
   make
diff --git a/extra/xfdesktop/add-backgrounds-xfce-to-search-path.patch b/extra/xfdesktop/add-backgrounds-xfce-to-search-path.patch
new file mode 100644
index 000000000..c48aeac33
--- /dev/null
+++ b/extra/xfdesktop/add-backgrounds-xfce-to-search-path.patch
@@ -0,0 +1,36 @@
+@@ -, +, @@ 
+ settings app. (Bug #8799)
+---
+ settings/main.c |   14 ++++++++++++++
+ 1 file changed, 14 insertions(+)
+--- a/settings/main.c	
++++ a/settings/main.c	
+@@ -688,6 +688,7 @@ xfdesktop_settings_dialog_populate_image_list(AppearancePanel *panel)
+         xfconf_channel_set_string(panel->channel, prop_image, image_file);
+         xfconf_channel_set_string(panel->channel, prop_last, image_file);
+ 
++        /* Add all backdrops in xfce4/backdrops/ */
+         backdrop_dirs = xfce_resource_lookup_all(XFCE_RESOURCE_DATA,
+                                                  "xfce4/backdrops/");
+         for(i = 0; backdrop_dirs[i]; ++i) {
+@@ -696,6 +697,19 @@ xfdesktop_settings_dialog_populate_image_list(AppearancePanel *panel)
+             if(tmp)
+                 image_file_iter = tmp;
+         }
++        g_strfreev(backdrop_dirs);
++
++        /* Add all backdrops in backgrounds/xfce/ */
++        backdrop_dirs = xfce_resource_lookup_all(XFCE_RESOURCE_DATA,
++                                                 "backgrounds/xfce/");
++        for(i = 0; backdrop_dirs[i]; ++i) {
++            tmp = xfdesktop_image_list_add_dir(ls, backdrop_dirs[i],
++                                               image_file);
++            if(tmp)
++                image_file_iter = tmp;
++        }
++        g_strfreev(backdrop_dirs);
++
+ 
+         if(!image_file_iter)
+             image_file_iter = xfdesktop_settings_image_treeview_add(GTK_TREE_MODEL(ls), image_file);
+-- 
diff --git a/extra/xfwm4/PKGBUILD b/extra/xfwm4/PKGBUILD
index 2a907e9ce..d03daab07 100644
--- a/extra/xfwm4/PKGBUILD
+++ b/extra/xfwm4/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 145260 2011-12-20 17:23:04Z foutrelis $
+# $Id: PKGBUILD 157909 2012-04-30 04:21:48Z foutrelis $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: tobias <tobias funnychar archlinux.org>
 
 pkgname=xfwm4
-pkgver=4.8.3
+pkgver=4.10.0
 pkgrel=1
 pkgdesc="Xfce window manager"
 arch=('i686' 'x86_64')
@@ -11,16 +11,17 @@ url="http://www.xfce.org/"
 license=('GPL2')
 groups=('xfce4')
 depends=('libxfce4ui' 'libwnck' 'hicolor-icon-theme')
-makedepends=('pkgconfig' 'intltool')
+makedepends=('intltool')
 options=('!libtool')
 install=$pkgname.install
-source=(http://archive.xfce.org/src/xfce/$pkgname/4.8/$pkgname-$pkgver.tar.bz2)
-sha256sums=('0b0e8bea0b257958ad416ab5678cf0cdd7e909943d4d5ab32afc35295a78227e')
+source=(http://archive.xfce.org/src/xfce/$pkgname/4.10/$pkgname-$pkgver.tar.bz2)
+sha256sums=('492357bf48121ebffabf2bf0d3b84213d19bf81087321175d687c8a68efe1f9c')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
-  ./configure --prefix=/usr \
+  ./configure \
+    --prefix=/usr \
     --sysconfdir=/etc \
     --libexecdir=/usr/lib \
     --localstatedir=/var \
diff --git a/extra/zeitgeist/PKGBUILD b/extra/zeitgeist/PKGBUILD
new file mode 100644
index 000000000..bf4fee2e6
--- /dev/null
+++ b/extra/zeitgeist/PKGBUILD
@@ -0,0 +1,31 @@
+# $Id: PKGBUILD 157928 2012-04-30 06:14:53Z eric $
+# Maintainer:
+# Contributor: Andrea Scarpino <andrea@archlinux.org>
+# Contributor: György Balló <ballogy@freestart.hu>
+
+pkgname=zeitgeist
+pkgver=0.9.0
+pkgrel=1
+pkgdesc="A service which logs the users's activities and events and makes relevant information available to other applications"
+arch=('i686' 'x86_64')
+url="http://zeitgeist-project.com/"
+license=('GPL')
+depends=('dbus-python' 'python2-gobject2' 'pyxdg' 'xapian-core')
+makedepends=('intltool' 'raptor' 'python2-rdflib')
+source=(http://launchpad.net/$pkgname/${pkgver%.*}/$pkgver/+download/$pkgname-$pkgver.tar.bz2{,.asc})
+md5sums=('fc2706611f435a027cd520f0da0982d7'
+         '96e74a5050bf0daa961dd56b0f73fd5d')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+  sed -i 's/python -/$PYTHON -/' configure
+  PYTHON=/usr/bin/python2 LIBS+="-lgmodule-2.0" ./configure --prefix=/usr \
+    --sysconfdir=/etc --libexecdir=/usr/lib/zeitgeist --localstatedir=/var
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" zeitgeistdocdir=/usr/share/doc/zeitgeist install
+  install -D -m644 data/zeitgeist-daemon.bash_completion "$pkgdir/usr/share/bash-completion/completions/zeitgeist-daemon"
+}
diff --git a/extra/zsh/PKGBUILD b/extra/zsh/PKGBUILD
index 3ea9bf7a9..ba4797b07 100644
--- a/extra/zsh/PKGBUILD
+++ b/extra/zsh/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 150931 2012-02-23 23:42:48Z pierre $
+# $Id: PKGBUILD 157985 2012-04-30 15:21:56Z pierre $
 # Maintainer: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=zsh
 pkgver=4.3.17
-pkgrel=1
+pkgrel=2
 pkgdesc='A very advanced and programmable command interpreter (shell) for UNIX'
 arch=('i686' 'x86_64')
 url='http://www.zsh.org/'
@@ -23,6 +23,12 @@ build() {
 				 Doc/zsh.texi \
 				 Completion/Unix/Type/_services \
 				 Completion/Unix/Command/_init_d
+
+	# Remove unneeded and conflicting completion scripts
+	rm -rf Completion/{AIX,BSD,Cygwin,Darwin,Debian,Mandriva,openSUSE,Redhat,Solaris}
+	rm -f  Completion/Linux/Command/_{pkgtool,rpmbuild,yast}
+	rm -f  Completion/Unix/Command/_osc
+
 	./configure --prefix=/usr \
 		--bindir=/bin \
 		--enable-etcdir=/etc/zsh \
diff --git a/testing/cairo/PKGBUILD b/testing/cairo/PKGBUILD
index 15b7ee36f..b24c6bf25 100644
--- a/testing/cairo/PKGBUILD
+++ b/testing/cairo/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 157259 2012-04-26 17:36:30Z andyrtr $
+# $Id: PKGBUILD 157981 2012-04-30 14:18:17Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Brice Carpentier <brice@daknet.org>
 
 pkgname=cairo
-_gitdate=20120426
-_gitver=957a9cc619965178a8927d114fe852034fc2385c
-pkgver=1.12.0.20120426
+#_gitdate=20120426
+#_gitver=957a9cc619965178a8927d114fe852034fc2385c
+pkgver=1.12.2
 pkgrel=1
 pkgdesc="Cairo vector graphics library"
 arch=(i686 x86_64)
@@ -17,23 +17,23 @@ optdepends=('xcb-util: for XCB backend') # really needed?
 provides=('cairo-xcb')
 replaces=('cairo-xcb')
 options=('!libtool')
-source=(#http://cairographics.org/releases/$pkgname-$pkgver.tar.gz
-        $pkgname-$pkgver.tar.gz::http://cgit.freedesktop.org/cairo/snapshot/cairo-${_gitver}.tar.gz 
+source=(http://cairographics.org/releases/$pkgname-$pkgver.tar.xz
+        #$pkgname-$pkgver.tar.gz::http://cgit.freedesktop.org/cairo/snapshot/cairo-${_gitver}.tar.gz 
         cairo-1.10.0-buggy_gradients.patch
         #git_fixes.patch 
 )
-md5sums=('0495ca6aab85f4936112635baba1bf85'
+md5sums=('87649eb75789739d517c743e94879e51'
          '9b323790dab003e228c6955633cb888e')
 
 build() {
-  #cd "$srcdir/$pkgname-$pkgver"
-  cd ${srcdir}/${pkgname}-${_gitver}
+  cd "$srcdir/$pkgname-$pkgver"
+  #cd ${srcdir}/${pkgname}-${_gitver}
   patch -Np1 -i ${srcdir}/cairo-1.10.0-buggy_gradients.patch
   # status is 2012-04-26 last commit: image: Fix typo in _blit_spans()
   #patch -Np1 -i ${srcdir}/git_fixes.patch
-  #autoreconf -vfi
-  #./configure --prefix=/usr \
-  ./autogen.sh --prefix=/usr \
+  autoreconf -vfi
+  #./autogen.sh --prefix=/usr \
+  ./configure --prefix=/usr \
 	--sysconfdir=/etc \
 	--localstatedir=/var \
 	--disable-static \
@@ -51,7 +51,7 @@ build() {
 #}
 
 package() {
-  #cd "$srcdir/$pkgname-$pkgver"
-  cd $srcdir/$pkgname-${_gitver}
+  cd "$srcdir/$pkgname-$pkgver"
+  #cd $srcdir/$pkgname-${_gitver}
   make DESTDIR="$pkgdir" install
 }
diff --git a/testing/lvm2/PKGBUILD b/testing/lvm2/PKGBUILD
index 37ce623dc..cfca8de86 100644
--- a/testing/lvm2/PKGBUILD
+++ b/testing/lvm2/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 156515 2012-04-20 02:14:32Z eric $
+# $Id: PKGBUILD 157920 2012-04-30 05:18:44Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 # Maintainer: Thomas Bächler <thomas@archlinux.org>
 
 pkgbase=lvm2
 pkgname=('lvm2' 'device-mapper')
 pkgver=2.02.95
-pkgrel=2
+pkgrel=3
 arch=('i686' 'x86_64')
 url="http://sourceware.org/lvm2/"
 license=('GPL2' 'LGPL2.1')
@@ -23,7 +23,8 @@ sha1sums=('f61dfbd8e9219291d11de3d70f0b3d20a29fae85'
 build() {
   cd "${srcdir}/LVM2.${pkgver}"
   unset LDFLAGS
-  ./configure --prefix=/usr --sbindir=/sbin --sysconfdir=/etc --localstatedir=/var \
+  ./configure --exec_prefix=/ --prefix=/usr --sbindir=/sbin --sysconfdir=/etc \
+    --libdir=/usr/lib --localstatedir=/var --with-udev-prefix=/usr --with-dmeventd-path=/sbin \
     --enable-pkgconfig --enable-readline --enable-dmeventd --enable-cmdlib --enable-applib \
     --enable-udev_sync --enable-udev_rules
   make
diff --git a/testing/nss_ldap/PKGBUILD b/testing/nss_ldap/PKGBUILD
new file mode 100644
index 000000000..120501e13
--- /dev/null
+++ b/testing/nss_ldap/PKGBUILD
@@ -0,0 +1,37 @@
+# $Id: PKGBUILD 157987 2012-04-30 16:15:04Z tomegun $
+# Maintainer:
+# Contributor: Comete <la_comete@tiscali.fr>
+
+pkgname=nss_ldap
+pkgver=265
+pkgrel=4
+pkgdesc="The nss_ldap module provides the means for Linux and Solaris workstations to resolve the entities defined in RFC 2307 from LDAP directories."
+arch=('i686' 'x86_64')
+url="http://www.padl.com/OSS/nss_ldap.html"
+license=('LGPL')
+depends=('libldap' 'krb5')
+backup=("etc/nss_ldap.conf")
+source=("http://www.padl.com/download/${pkgname}-${pkgver}.tar.gz")
+md5sums=('c1cb02d1a85538cf16bca6f6a562abe4')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./configure \
+       --prefix=/usr \
+       --with-ldap-conf-file=/etc/nss_ldap.conf \
+       --with-ldap=openldap \
+       --sysconfdir=/etc \
+       --mandir=/usr/share/man \
+       --enable-schema-mapping \
+       --enable-rfc2307bis \
+       --enable-configurable-krb5-ccname-gssapi
+  env PATH=`pwd`:"$PATH" make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+
+  # buildsystem is trying to be clever and hardcodes symlinks in /usr$(libdir)
+  rm -rf "${pkgdir}/usr/usr"
+}
diff --git a/testing/openmpi/PKGBUILD b/testing/openmpi/PKGBUILD
index 4b462b7b7..78bf33ab0 100644
--- a/testing/openmpi/PKGBUILD
+++ b/testing/openmpi/PKGBUILD
@@ -1,13 +1,13 @@
-# $Id: PKGBUILD 154489 2012-03-29 09:52:47Z stephane $
+# $Id: PKGBUILD 157996 2012-04-30 21:40:03Z stephane $
 # Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
 pkgname=openmpi
 pkgver=1.5.5
-pkgrel=1
+pkgrel=3
 pkgdesc="High performance message passing library (MPI)"
 arch=('i686' 'x86_64')
 url="http://www.open-mpi.org"
 license=('custom')
-depends=('gcc' 'gcc-fortran' 'openssh' 'valgrind' 'libtool' 'hwloc')
+depends=('gcc-fortran' 'openssh' 'valgrind' 'libltdl' 'hwloc')
 makedepends=('inetutils')
 options=(!libtool)
 source=(http://www.open-mpi.org/software/ompi/v1.5/downloads/${pkgname}-${pkgver}.tar.bz2
@@ -20,6 +20,9 @@ build() {
 
    # Fix fakeroot problem (FS#28644)
    patch -Np1 -i ../openmpi-1.5.4-fix-fakeroot-execution.patch
+   
+   # Make sure we use the system ltdl librariry rather than the ones in the tarball
+   rm -r opal/libltdl
 
    ./configure --prefix=/usr \
                --sysconfdir=/etc/${pkgname} \
@@ -34,7 +37,7 @@ build() {
                --enable-pretty-print-stacktrace \
                --without-slurm \
                --with-hwloc=/usr \
-               --with-libltdl=/usr \
+               --with-libltdl=/usr  \
                FC=/usr/bin/gfortran \
                LDFLAGS="$LDFLAGS -Wl,-z,noexecstack"
 
@@ -48,7 +51,7 @@ package() {
    # FS#28583
    install -d -m 755 "${pkgdir}"/usr/lib/pkgconfig
    for i in ompi-c.pc ompi-cxx.pc ompi-f77.pc ompi-f90.pc ompi.pc; do
-      ln -sf /usr/lib/openmpi/pkgconfig/$i "${pkgdir}"/usr/lib/pkgconfig/
+      ln -sf /usr/lib/openmpi/pkgconfig/${i} "${pkgdir}"/usr/lib/pkgconfig/
    done
 
    # Openmpi's otfinfo conflicts with the one from texlive
diff --git a/testing/udev/PKGBUILD b/testing/udev/PKGBUILD
index 4a6ef06b3..ec1a68163 100644
--- a/testing/udev/PKGBUILD
+++ b/testing/udev/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 155920 2012-04-09 13:23:41Z tomegun $
+# $Id: PKGBUILD 157979 2012-04-30 12:31:14Z tomegun $
 # Maintainer: Tom Gundersen <teg@jklm.no>
 # Contributor: Aaron Griffin <aaron@archlinux.org>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
@@ -6,7 +6,7 @@
 
 pkgname=udev
 pkgver=182
-pkgrel=1
+pkgrel=2
 pkgdesc="The userspace dev tools (udev)"
 depends=('util-linux' 'glib2' 'kmod' 'pciutils' 'usbutils' 'bash' 'acl')
 install=udev.install
@@ -52,9 +52,6 @@ package() {
 
   # udevd moved, symlink to make life easy for restarting udevd manually
   ln -s ../lib/udev/udevd ${pkgdir}/usr/bin/udevd
-  # and for users of the old /lib location (to go away soon)
-  mkdir -p ${pkgdir}/lib/udev
-  ln -s ../../usr/lib/udev/udevd ${pkgdir}/lib/udev/udevd
 
   # the path to udevadm is hardcoded in some places
   install -d ${pkgdir}/sbin
diff --git a/testing/usbmuxd/PKGBUILD b/testing/usbmuxd/PKGBUILD
new file mode 100644
index 000000000..b0f74f8e2
--- /dev/null
+++ b/testing/usbmuxd/PKGBUILD
@@ -0,0 +1,36 @@
+# $Id: PKGBUILD 158000 2012-04-30 22:27:24Z tomegun $
+# Maintainer : Ionut Biru <ibiru@archlinux.org>
+# Contributor: Gabriel Martinez < reitaka at gmail dot com >
+
+pkgname=usbmuxd
+pkgver=1.0.7
+pkgrel=3
+pkgdesc="USB Multiplex Daemon"
+url="http://marcansoft.com/blog/iphonelinux/usbmuxd/"
+arch=('i686' 'x86_64')
+license=('GPL2' 'GPL3' 'LGPL2.1')
+depends=('libusb>=1.0.8')
+makedepends=('cmake')
+install=usbmuxd.install
+source=(http://marcansoft.com/uploads/${pkgname}/${pkgname}-${pkgver}.tar.bz2
+        usbmuxd-udevuser.patch)
+md5sums=('6f431541f3177fa06aa6df9ceecb2da0'
+         '8526f24f4ad16cd6b2a7321c0b59592c')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np1 -i "${srcdir}/usbmuxd-udevuser.patch"
+  mkdir build
+  cd build
+  cmake ../ -DCMAKE_INSTALL_PREFIX:PATH=/usr -DLIB_SUFFIX=""
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}/build"
+  make DESTDIR="${pkgdir}" install
+
+  # fix udev dir being hardcoded
+  mv "${pkgdir}/lib/udev" "${pkgdir}/usr/lib/"
+  rmdir "${pkgdir}/lib"
+}
diff --git a/testing/usbmuxd/usbmuxd-udevuser.patch b/testing/usbmuxd/usbmuxd-udevuser.patch
new file mode 100644
index 000000000..51c8f3d3a
--- /dev/null
+++ b/testing/usbmuxd/usbmuxd-udevuser.patch
@@ -0,0 +1,12 @@
+diff -Nur usbmuxd-1.0.7.orig/udev/85-usbmuxd.rules.in usbmuxd-1.0.7/udev/85-usbmuxd.rules.in
+--- usbmuxd-1.0.7.orig/udev/85-usbmuxd.rules.in	2011-08-04 15:28:32.751579507 +0000
++++ usbmuxd-1.0.7/udev/85-usbmuxd.rules.in	2011-08-04 15:36:20.139265124 +0000
+@@ -1,7 +1,7 @@
+ # usbmuxd (iPhone "Apple Mobile Device" MUXer listening on /var/run/usbmuxd)
+ 
+ # Forces iDevices to the last USB configuration and runs usbmuxd
+-ACTION=="add", SUBSYSTEM=="usb", ATTR{idVendor}=="05ac", ATTR{idProduct}=="12[9a][0-9a-f]", ENV{USBMUX_SUPPORTED}="1", ATTR{bConfigurationValue}!="$attr{bNumConfigurations}", ATTR{bConfigurationValue}="$attr{bNumConfigurations}", RUN+="@CMAKE_INSTALL_PREFIX@/sbin/usbmuxd -u -U usbmux"
++ACTION=="add", SUBSYSTEM=="usb", OWNER="usbmux", ATTR{idVendor}=="05ac", ATTR{idProduct}=="12[9a][0-9a-f]", ENV{USBMUX_SUPPORTED}="1", ATTR{bConfigurationValue}!="$attr{bNumConfigurations}", ATTR{bConfigurationValue}="$attr{bNumConfigurations}", RUN+="@CMAKE_INSTALL_PREFIX@/sbin/usbmuxd -u -U usbmux"
+ 
+ # Exit usbmuxd when the last device is removed
+ ACTION=="remove", SUBSYSTEM=="usb", ENV{PRODUCT}=="5ac/12[9a][0-9a-f]/*", ENV{INTERFACE}=="255/*", RUN+="@CMAKE_INSTALL_PREFIX@/sbin/usbmuxd -x"
diff --git a/testing/usbmuxd/usbmuxd.install b/testing/usbmuxd/usbmuxd.install
new file mode 100644
index 000000000..1a4859674
--- /dev/null
+++ b/testing/usbmuxd/usbmuxd.install
@@ -0,0 +1,19 @@
+post_install() {
+    groupadd -g 140 usbmux &>/dev/null
+    useradd -c 'usbmux user' -u 140 -g usbmux -d / -s /sbin/nologin usbmux &>/dev/null
+    passwd -l usbmux &>/dev/null
+}
+
+post_upgrade() {
+    getent group usbmux >/dev/null 2>&1 || groupadd -g 140 usbmux &>/dev/null
+    getent passwd usbmux >/dev/null 2>&1 || useradd -c 'usbmux user' -u 140 -g usbmux -d / -s /sbin/nologin usbmux &>/dev/null
+}
+
+post_remove() {
+    if getent passwd usbmux >/dev/null 2>&1; then
+        userdel usbmux
+    fi
+    if getent group usbmux >/dev/null 2>&1; then
+        groupdel usbmux
+    fi
+}
author	root <root@rshg054.dnsready.net>	2012-05-02 00:01:22 +0000
committer	root <root@rshg054.dnsready.net>	2012-05-02 00:01:22 +0000
commit	defe74c9cba07c321ad2869d8f6872e64a167324 (patch)
tree	22377a98049a863983b9a28d9d79fc737f665cc3
parent	752015395fc8b95cc4a86b68189cb747fe9a8499 (diff)