Fri May 27 22:47:26 UTC 2011

81 files changed, 2872 insertions, 515 deletions

diff --git a/community-staging/csfml/PKGBUILD b/community-staging/csfml/PKGBUILD
new file mode 100644
index 000000000..d0920b18d
--- /dev/null
+++ b/community-staging/csfml/PKGBUILD
@@ -0,0 +1,60 @@
+# $Id: PKGBUILD 47932 2011-05-26 06:40:32Z svenstaro $
+# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
+
+pkgname=csfml
+
+_git=true
+
+if [[ "${_git}" = "true" ]]; then
+    pkgver=1.99.git20110526
+fi
+
+pkgrel=1
+pkgdesc='C bindings for sfml'
+arch=('i686' 'x86_64')
+url='http://www.sfml-dev.org/'
+license=('zlib')
+depends=('sfml')
+makedepends=('git' 'cmake' 'doxygen')
+
+_gitroot='https://github.com/LaurentGomila/SFML.git'
+_gitname='SFML'
+
+build() {
+  cd "$srcdir"
+  msg "Connecting to GIT server...."
+
+  if [ -d $_gitname ] ; then
+    cd $_gitname && git pull origin
+    msg "The local files are updated."
+  else
+    git clone $_gitroot
+    cd $_gitname
+  fi
+
+  msg "GIT checkout done or server timeout"
+  msg "Starting make..."
+
+  rm -rf "$srcdir/$_gitname-build"
+  cp -r "$srcdir/$_gitname" "$srcdir/$_gitname-build"
+  cd "$srcdir/$_gitname-build"
+
+  cd bindings/c/
+  mkdir build && cd build
+  cmake -DCMAKE_INSTALL_PREFIX=/usr .. \
+        -DBUILD_DOC=true
+  make
+  make doc
+}
+
+package() {
+  cd "$srcdir/$_gitname-build/bindings/c/build/"
+
+  make DESTDIR="$pkgdir/" install
+
+  install -Dm644 ../license.txt \
+    ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+
+  make clean
+}
+
diff --git a/community-staging/gambas3/PKGBUILD b/community-staging/gambas3/PKGBUILD
new file mode 100644
index 000000000..45dee93f7
--- /dev/null
+++ b/community-staging/gambas3/PKGBUILD
@@ -0,0 +1,1080 @@
+# Maintainer: Laurent Carlier <lordheavym@gmail.com>
+
+pkgbase=gambas3
+pkgname=('gambas3-runtime' 'gambas3-devel' 'gambas3-ide' 'gambas3-script' 'gambas3-examples' 'gambas3-gb-cairo' 'gambas3-gb-chart'
+         'gambas3-gb-dbus' 'gambas3-gb-compress' 'gambas3-gb-crypt' 'gambas3-gb-db' 'gambas3-gb-db-form' 'gambas3-gb-db-mysql'
+         'gambas3-gb-db-odbc' 'gambas3-gb-db-postgresql' 'gambas3-gb-db-sqlite2' 'gambas3-gb-db-sqlite3'
+         'gambas3-gb-desktop' 'gambas3-gb-eval-highlight' 'gambas3-gb-form'
+         'gambas3-gb-form-dialog' 'gambas3-gb-form-mdi' 'gambas3-gb-form-stock' 'gambas3-gb-gtk' 'gambas3-gb-gui' 'gambas3-gb-image'
+         'gambas3-gb-image-effect' 'gambas3-gb-image-imlib' 'gambas3-gb-image-io' 'gambas3-gb-net' 'gambas3-gb-net-curl'
+         'gambas3-gb-net-smtp' 'gambas3-gb-opengl' 'gambas3-gb-opengl-glu' 'gambas3-gb-opengl-glsl' 'gambas3-gb-option' 'gambas3-gb-pcre'
+         'gambas3-gb-pdf' 'gambas3-gb-qt4' 'gambas3-gb-qt4-ext' 'gambas3-gb-qt4-opengl' 'gambas3-gb-qt4-webkit'
+         'gambas3-gb-report' 'gambas3-gb-sdl' 'gambas3-gb-sdl-sound' 'gambas3-gb-settings' 'gambas3-gb-signal'
+         'gambas3-gb-v4l' 'gambas3-gb-vb' 'gambas3-gb-xml' 'gambas3-gb-xml-rpc' 'gambas3-gb-xml-xslt' 'gambas3-gb-web') 
+pkgver=2.99.1
+pkgrel=3
+pkgdesc="A free development environment based on a Basic interpreter."
+arch=('i686' 'x86_64')
+url="http://gambas.sourceforge.net/"
+license=('GPL')
+groups=('gambas3')
+makedepends=('intltool' 'mysql' 'postgresql' 'libffi' 'bzip2' 'glib2' 'v4l-utils'
+         'zlib' 'mesa' 'libgl' 'glew' 'xdg-utils' 'qt' 'gtk2' 'imlib2' 'gdk-pixbuf2'
+         'postgresql-libs' 'libmysqlclient' 'unixodbc' 'sqlite2' 'sqlite3' 'librsvg'
+         'curl' 'poppler' 'sdl_mixer' 'sdl_ttf' 'libxtst' 'pcre'
+         'libxcursor' 'libsm' 'dbus-core' 'libxml2' 'libxslt' 'libgnome-keyring')
+options=('!emptydirs' '!makeflags')
+source=("http://downloads.sourceforge.net/gambas/${pkgbase}-${pkgver}.tar.bz2"
+        'gambas3-script.install' 'gambas3-runtime.install')
+md5sums=('ab4c182b9d7dfec06b3a42bb002a779a'
+         'b284be39d147ec799f1116a6abc068b4'
+         'a8ec8e5a6aba7a7e453ce7a35c1800a9')
+
+build() {
+  cd ${srcdir}/${pkgbase}-${pkgver}
+
+  ./reconf-all
+  ./configure --prefix=/usr -C
+
+  make bindir=${pkgdir}/usr/bin
+}
+
+package_gambas3-runtime() {
+  depends=('libffi' 'xdg-utils')
+  pkgdesc="Gambas3 runtime environment"
+  install=gambas3-runtime.install
+
+  cd ${srcdir}/${pkgbase}-${pkgver}/main/gbc
+  make DESTDIR="${pkgdir}" install
+
+  cd ../gbx
+  make DESTDIR="${pkgdir}" install
+  cd ../lib/debug
+  make DESTDIR="${pkgdir}" install
+  cd ../eval
+  make DESTDIR="${pkgdir}" install
+  cd ../draw
+  make DESTDIR="${pkgdir}" install
+  install -D -m644 ../gb.component \
+    ${pkgdir}/usr/lib/gambas3
+
+  cd ${srcdir}/${pkgbase}-${pkgver}/main
+  ln -s gbx3 ${pkgdir}/usr/bin/gbr3
+  gbc/gbi3 -r ${pkgdir}/usr gb
+  rm -f ${pkgdir}/usr/lib/gambas3/gb.{so*,la}
+
+  ## needed for postinst with xdg-utils
+  install -d -m755 ${pkgdir}/usr/share/gambas3/mime
+  install -D -m644 mime/* \
+    ${pkgdir}/usr/share/gambas3/mime/
+  install -d -m755 ${pkgdir}/usr/share/gambas3/icons
+  install -D -m644 mime/application-x-gambas.png \
+    ${pkgdir}/usr/share/gambas3/icons/application-x-gambas.png
+ 
+  cd gbc
+  make DESTDIR="${pkgdir}" uninstall
+}
+
+package_gambas3-devel() {
+  depends=('gambas3-runtime')
+  pkgdesc="Gambas3 development environment"
+
+  cd ${srcdir}/${pkgbase}-${pkgver}/main/gbc
+  make DESTDIR="${pkgdir}" install
+}
+
+package_gambas3-ide() {
+  depends=('gambas3-devel' 'gambas3-gb-db-form' 'gambas3-gb-desktop' 'gambas3-gb-eval-highlight'
+           'gambas3-gb-form-dialog' 'gambas3-gb-settings' 'gambas3-gb-form-mdi' 'gambas3-gb-image-effect'
+           'gambas3-gb-qt4-ext' 'gambas3-gb-qt4-webkit')
+  pkgdesc="Gambas3 Integrated Development Environment"
+
+  cd ${srcdir}/${pkgbase}-${pkgver}
+  make XDG_UTILS='' DESTDIR="${pkgdir}" install
+
+#!! with the ide !!
+  install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/app/desktop/gambas3.desktop \
+    ${pkgdir}/usr/share/applications/gambas3.desktop
+  install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/app/desktop/gambas3.png \
+    ${pkgdir}/usr/share/pixmaps/gambas3.png
+
+  rm -r ${pkgdir}/usr/bin/gb*
+  rm -r ${pkgdir}/usr/lib
+  rm -r ${pkgdir}/usr/share/gambas3
+}
+
+package_gambas3-script() {
+  depends=('gambas3-devel')
+  pkgdesc="Gambas3 scripter and server programs support"
+  install=gambas3-script.install
+
+  cd ${srcdir}/${pkgbase}-${pkgver}
+  make XDG_UTILS='' DESTDIR="${pkgdir}" install
+
+  ## needed for postinst with xdg-utils
+  cd ${srcdir}/${pkgbase}-${pkgver}/app/mime
+  install -d -m755 ${pkgdir}/usr/share/gambas3/mime
+  install -D -m644 *.xml ${pkgdir}/usr/share/gambas3/mime/
+  install -D -m644 *.png ${pkgdir}/usr/share/gambas3/mime/
+  ##
+
+  rm -r ${pkgdir}/usr/bin/{gambas*,gb{[a-r]*,x*}}
+  rm -r ${pkgdir}/usr/lib
+  rm -r ${pkgdir}/usr/share/gambas3/[c-i]*
+}
+
+package_gambas3-examples() {
+  depends=('gambas3-gb-cairo' 'gambas3-gb-chart' 'gambas3-gb-dbus' 'gambas3-gb-compress' 'gambas3-gb-crypt' 'gambas3-gb-db'
+           'gambas3-gb-db-form' 'gambas3-gb-db-mysql' 'gambas3-gb-db-odbc' 'gambas3-gb-db-postgresql' 'gambas3-gb-db-sqlite2'
+           'gambas3-gb-db-sqlite3' 'gambas3-gb-desktop' 'gambas3-gb-eval-highlight' 'gambas3-gb-form' 'gambas3-gb-form-dialog'
+           'gambas3-gb-form-mdi' 'gambas3-gb-gtk' 'gambas3-gb-gui' 'gambas3-gb-image' 'gambas3-gb-image-effect' 'gambas3-gb-image-imlib'
+           'gambas3-gb-image-io' 'gambas3-gb-net' 'gambas3-gb-net-curl' 'gambas3-gb-net-smtp' 'gambas3-gb-opengl' 'gambas3-gb-opengl-glsl'
+           'gambas3-gb-option' 'gambas3-gb-pcre' 'gambas3-gb-pdf' 'gambas3-gb-qt4' 'gambas3-gb-qt4-ext' 'gambas3-gb-qt4-opengl'
+           'gambas3-gb-qt4-webkit' 'gambas3-gb-report' 'gambas3-gb-sdl' 'gambas3-gb-sdl-sound' 'gambas3-gb-settings' 'gambas3-gb-signal'
+           'gambas3-gb-v4l' 'gambas3-gb-vb' 'gambas3-gb-xml' 'gambas3-gb-xml-rpc' 'gambas3-gb-xml-xslt' 'gambas3-gb-web')
+  pkgdesc="Gambas3 examples"
+
+  cd ${srcdir}/${pkgbase}-${pkgver}
+  make XDG_UTILS='' DESTDIR="${pkgdir}" install
+
+  rm -r ${pkgdir}/usr/{bin,lib}
+  rm -r ${pkgdir}/usr/share/gambas3/{info,control,gb.sdl}
+}
+
+package_gambas3-gb-cairo() {
+  depends=('gambas3-runtime' 'cairo')
+  pkgdesc="Gambas3 cairo component"
+
+  ## Workaround for splitting
+  cd ${srcdir}/${pkgbase}-${pkgver}/main
+  make XDG_UTILS='' DESTDIR="${pkgdir}" install
+  ##
+
+  cd ${srcdir}/${pkgbase}-${pkgver}/gb.cairo
+  make DESTDIR="${pkgdir}" install
+
+  ## Workaround for splitting
+  cd ${srcdir}/${pkgbase}-${pkgver}/main
+  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
+  ##
+}
+
+package_gambas3-gb-chart() {
+  depends=('gambas3-gb-form')
+  pkgdesc="Gambas3 chart component"
+
+  ## Workaround for splitting
+  cd ${srcdir}/${pkgbase}-${pkgver}/main
+  make XDG_UTILS='' DESTDIR="${pkgdir}" install
+  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
+  make XDG_UTILS='' DESTDIR="${pkgdir}" install
+  ##
+
+  cd ${srcdir}/${pkgbase}-${pkgver}/comp
+  make DESTDIR="${pkgdir}" install
+
+  ## Workaround for splitting
+  cd ${srcdir}/${pkgbase}-${pkgver}/main
+  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
+  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
+  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
+  rm -r ${pkgdir}/usr/share/gambas3/control
+  rm -r ${pkgdir}/usr/lib/gambas3/gb.[d-w]*
+  rm -r ${pkgdir}/usr/share/gambas3/info/gb.[d-w]*
+  ##
+}
+
+package_gambas3-gb-compress() {
+  depends=('gambas3-runtime' 'bzip2' 'zlib')
+  pkgdesc="Gambas3 compression support component"
+
+  ## Workaround for splitting
+  cd ${srcdir}/${pkgbase}-${pkgver}/main
+  make XDG_UTILS='' DESTDIR="${pkgdir}" install
+  ##
+
+  cd ${srcdir}/${pkgbase}-${pkgver}/gb.compress.bzlib2
+  make DESTDIR="${pkgdir}" install
+  cd ${srcdir}/${pkgbase}-${pkgver}/gb.compress.zlib
+  make DESTDIR="${pkgdir}" install
+
+  ## Workaround for splitting
+  rm -r ${pkgdir}/usr/bin
+  rm -r ${pkgdir}/usr/lib/gambas3/{gb.component,gb.[d-v]*}
+  rm -r ${pkgdir}/usr/share/gambas3/info/gb.[d-v]*
+  ##
+}
+
+package_gambas3-gb-crypt() {
+  depends=('gambas3-runtime')
+  pkgdesc="Gambas3 MD5/DES crypting component"
+
+  ## Workaround for splitting
+  cd ${srcdir}/${pkgbase}-${pkgver}/main
+  make XDG_UTILS='' DESTDIR="${pkgdir}" install
+  ##
+
+  cd ${srcdir}/${pkgbase}-${pkgver}/gb.crypt
+  make XDG_UTILS='' DESTDIR="${pkgdir}" install
+
+  ## Workaround for splitting
+  cd ${srcdir}/${pkgbase}-${pkgver}/main
+  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
+  ##
+}
+
+package_gambas3-gb-db() {
+  depends=('gambas3-runtime')
+  pkgdesc="Gambas3 database access component"
+
+  ## Workaround for splitting
+  cd ${srcdir}/${pkgbase}-${pkgver}/main
+  make XDG_UTILS='' DESTDIR="${pkgdir}" install
+  ##
+
+  ## Workaround for splitting
+  rm -r ${pkgdir}/usr/bin
+  rm -r ${pkgdir}/usr/lib/gambas3/{gb.comp*,gb.d{e,r}*,gb.[e-z]*}
+  rm -r ${pkgdir}/usr/share/gambas3/info/{gb.comp*,gb.de*,gb.[e-z]*}
+  ##
+}
+
+package_gambas3-gb-db-form() {
+  depends=('gambas3-gb-db' 'gambas3-gb-form')
+  pkgdesc="Gambas3 database form component"
+
+  ## Workaround for splitting
+  cd ${srcdir}/${pkgbase}-${pkgver}/main
+  make XDG_UTILS='' DESTDIR="${pkgdir}" install
+  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
+  make XDG_UTILS='' DESTDIR="${pkgdir}" install
+  ##
+
+  cd ${srcdir}/${pkgbase}-${pkgver}/comp
+  make DESTDIR="${pkgdir}" install
+
+  ## Workaround for splitting
+  cd ${srcdir}/${pkgbase}-${pkgver}/main
+  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
+  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
+  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
+  rm -r ${pkgdir}/usr/share/gambas3/control
+  rm -r ${pkgdir}/usr/lib/gambas3/gb.{chart*,[e-z]*}
+  rm -r ${pkgdir}/usr/share/gambas3/info/gb.{chart*,[e-z]*}
+  ##
+}
+
+package_gambas3-gb-db-mysql() {
+  depends=('gambas3-gb-db' 'libmysqlclient')
+  pkgdesc="Gambas3 MySQL database access component"
+
+  ## Workaround for splitting
+  cd ${srcdir}/${pkgbase}-${pkgver}/main
+  make XDG_UTILS='' DESTDIR="${pkgdir}" install
+  ##
+
+  cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.mysql
+  make XDG_UTILS='' DESTDIR="${pkgdir}" install
+
+  ## Workaround for splitting
+  cd ${srcdir}/${pkgbase}-${pkgver}/main
+  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
+  ##
+}
+
+package_gambas3-gb-db-odbc() {
+  depends=('gambas3-gb-db' 'unixodbc')
+  pkgdesc="Gambas3 ODBC database access component"
+
+  ## Workaround for splitting
+  cd ${srcdir}/${pkgbase}-${pkgver}/main
+  make XDG_UTILS='' DESTDIR="${pkgdir}" install
+  ##
+
+  cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.odbc
+  make XDG_UTILS='' DESTDIR="${pkgdir}" install
+
+  ## Workaround for splitting
+  cd ${srcdir}/${pkgbase}-${pkgver}/main
+  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
+  ##
+}
+
+package_gambas3-gb-db-postgresql() {
+  depends=('gambas3-gb-db' 'postgresql-libs')
+  pkgdesc="Gambas3 PostgreSQL database access component"
+
+  ## Workaround for splitting
+  cd ${srcdir}/${pkgbase}-${pkgver}/main
+  make XDG_UTILS='' DESTDIR="${pkgdir}" install
+  ##
+
+  cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.postgresql
+  make XDG_UTILS='' DESTDIR="${pkgdir}" install
+
+  ## Workaround for splitting
+  cd ${srcdir}/${pkgbase}-${pkgver}/main
+  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
+  ##
+}
+
+package_gambas3-gb-db-sqlite2() {
+  depends=('gambas3-gb-db' 'sqlite2')
+  pkgdesc="Gambas3 Sqlite2 database access component"
+
+  ## Workaround for splitting
+  cd ${srcdir}/${pkgbase}-${pkgver}/main
+  make XDG_UTILS='' DESTDIR="${pkgdir}" install
+  ##
+
+  cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.sqlite2
+  make XDG_UTILS='' DESTDIR="${pkgdir}" install
+
+  ## Workaround for splitting
+  cd ${srcdir}/${pkgbase}-${pkgver}/main
+  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
+  ##
+}
+
+package_gambas3-gb-db-sqlite3() {
+  depends=('gambas3-gb-db' 'sqlite3')
+  pkgdesc="Gambas3 Sqlite3 database access component"
+
+  ## Workaround for splitting
+  cd ${srcdir}/${pkgbase}-${pkgver}/main
+  make XDG_UTILS='' DESTDIR="${pkgdir}" install
+  ##
+
+  cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.sqlite3
+  make XDG_UTILS='' DESTDIR="${pkgdir}" install
+
+  ## Workaround for splitting
+  cd ${srcdir}/${pkgbase}-${pkgver}/main
+  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
+  ##
+}
+
+package_gambas3-gb-desktop() {
+  depends=('gambas3-gb-image' 'libsm' 'libxtst' 'libgnome-keyring')
+  pkgdesc="Gambas3 desktop component"
+
+  ## workaround for splitting
+  cd ${srcdir}/${pkgbase}-${pkgver}/main
+  make XDG_UTILS='' DESTDIR="${pkgdir}" install
+  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
+  make XDG_UTILS='' DESTDIR="${pkgdir}" install
+  ##
+
+  cd ${srcdir}/${pkgbase}-${pkgver}/gb.desktop
+  make DESTDIR="${pkgdir}" install
+
+  ## cleanup the workaround
+  cd ${srcdir}/${pkgbase}-${pkgver}/main
+  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
+  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
+  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
+  ##
+}
+
+package_gambas3-gb-dbus() {
+  depends=('gambas3-runtime' 'dbus-core')
+  pkgdesc="Gambas3 DBUS component"
+
+  ## Workaround for splitting
+  cd ${srcdir}/${pkgbase}-${pkgver}/main
+  make XDG_UTILS='' DESTDIR="${pkgdir}" install
+  ##
+
+  cd ${srcdir}/${pkgbase}-${pkgver}/gb.dbus
+  make DESTDIR="${pkgdir}" install
+
+  ## Workaround for splitting
+  cd ${srcdir}/${pkgbase}-${pkgver}/main
+  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
+  ##
+}
+
+package_gambas3-gb-eval-highlight() {
+  depends=('gambas3-runtime')
+  pkgdesc="Gambas3 expression evaluator highlight component"
+
+  ## Workaround for splitting
+  cd ${srcdir}/${pkgbase}-${pkgver}/main
+  make XDG_UTILS='' DESTDIR="${pkgdir}" install
+  ##
+
+  cd ${srcdir}/${pkgbase}-${pkgver}/comp
+  make DESTDIR="${pkgdir}" install
+
+  ## Workaround for splitting
+  cd ${srcdir}/${pkgbase}-${pkgver}/main
+  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
+  rm -r ${pkgdir}/usr/lib/gambas3/gb.[f-z]*
+  rm -r ${pkgdir}/usr/share/gambas3/info/gb.[f-z]*
+  ##
+}
+
+package_gambas3-gb-form() {
+  depends=('gambas3-gb-gui')
+  pkgdesc="Gambas3 form component"
+
+  ## Workaround for splitting
+  cd ${srcdir}/${pkgbase}-${pkgver}/main
+  make XDG_UTILS='' DESTDIR="${pkgdir}" install
+  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
+  make XDG_UTILS='' DESTDIR="${pkgdir}" install
+  ##
+
+  cd ${srcdir}/${pkgbase}-${pkgver}/comp
+  make DESTDIR="${pkgdir}" install
+
+  ## Workaround for splitting
+  cd ${srcdir}/${pkgbase}-${pkgver}/main
+  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
+  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
+  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
+  rm -r ${pkgdir}/usr/share/gambas3/control/{gb.db*,gb.form.*,gb.report}
+  rm -r ${pkgdir}/usr/lib/gambas3/gb.{[c-e]*,[m-w]*,form.{d*,m*,s*}}
+  rm -r ${pkgdir}/usr/share/gambas3/info/gb.{[c-e]*,[m-w]*,form.{d*,m*,s*}}
+  ##
+}
+
+package_gambas3-gb-form-dialog() {
+  depends=('gambas3-gb-form')
+  pkgdesc="Gambas3 form dialog component"
+
+  ## Workaround for splitting
+  cd ${srcdir}/${pkgbase}-${pkgver}/main
+  make XDG_UTILS='' DESTDIR="${pkgdir}" install
+  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
+  make XDG_UTILS='' DESTDIR="${pkgdir}" install
+  ##
+
+  cd ${srcdir}/${pkgbase}-${pkgver}/comp
+  make DESTDIR="${pkgdir}" install
+
+  ## Workaround for splitting
+  cd ${srcdir}/${pkgbase}-${pkgver}/main
+  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
+  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
+  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
+  rm -r ${pkgdir}/usr/share/gambas3/control
+  rm -r ${pkgdir}/usr/lib/gambas3/gb.{[c-e]*,[m-w]*,form.{c*,g*,m*,s*}}
+  rm -r ${pkgdir}/usr/share/gambas3/info/gb.{[c-e]*,[m-w]*,form.{i*,l*,m*,s*}}
+  ##
+}
+
+package_gambas3-gb-form-mdi() {
+  depends=('gambas3-gb-form')
+  pkgdesc="Gambas3 form MDI component"
+
+  ## Workaround for splitting
+  cd ${srcdir}/${pkgbase}-${pkgver}/main
+  make XDG_UTILS='' DESTDIR="${pkgdir}" install
+  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
+  make XDG_UTILS='' DESTDIR="${pkgdir}" install
+  ##
+
+  cd ${srcdir}/${pkgbase}-${pkgver}/comp
+  make DESTDIR="${pkgdir}" install
+
+  ## Workaround for splitting
+  cd ${srcdir}/${pkgbase}-${pkgver}/main
+  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
+  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
+  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
+  rm -r ${pkgdir}/usr/share/gambas3/control/{gb.db*,gb.form,gb.report}
+  rm -r ${pkgdir}/usr/lib/gambas3/gb.{[c-e]*,[m-w]*,form.{c*,d*,g*,s*}}
+  rm -r ${pkgdir}/usr/share/gambas3/info/gb.{[c-e]*,[m-w]*,form.{i*,l*,d*,s*}}
+  ##
+}
+
+package_gambas3-gb-form-stock() {
+  depends=('gambas3-runtime')
+  pkgdesc="Gambas3 default stock icons component"
+
+  ## Workaround for splitting
+  cd ${srcdir}/${pkgbase}-${pkgver}/main
+  make XDG_UTILS='' DESTDIR="${pkgdir}" install
+  ##
+
+  cd ${srcdir}/${pkgbase}-${pkgver}/comp
+  make DESTDIR="${pkgdir}" install
+
+  ## Workaround for splitting
+  cd ${srcdir}/${pkgbase}-${pkgver}/main
+  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
+  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
+  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
+  rm -r ${pkgdir}/usr/lib/gambas3/gb.{eval*,[m-w]*}
+  rm -r ${pkgdir}/usr/share/gambas3/info/gb.{eval*,[m-w]*}
+  ##
+}
+
+package_gambas3-gb-gtk() {
+  depends=('gambas3-gb-image' 'gtk2' 'librsvg')
+  pkgdesc="Gambas3 graphical GTK+ toolkit component"
+
+  ## workaround for splitting
+  cd ${srcdir}/${pkgbase}-${pkgver}/main
+  make XDG_UTILS='' DESTDIR="${pkgdir}" install
+  ##
+
+  cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk
+  make XDG_UTILS='' DESTDIR="${pkgdir}" install
+
+  ## cleanup the workaround
+  cd ${srcdir}/${pkgbase}-${pkgver}/main
+  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
+  ##
+}
+
+package_gambas3-gb-gui() {
+  depends=('gambas3-gb-qt4' 'gambas3-gb-gtk')
+  pkgdesc="Gambas3 automatic gui toolkit chooser"
+
+  ## workaround for splitting
+  cd ${srcdir}/${pkgbase}-${pkgver}/main
+  make XDG_UTILS='' DESTDIR="${pkgdir}" install
+  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
+  make XDG_UTILS='' DESTDIR="${pkgdir}" install
+  ##
+
+  cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/gui
+  make XDG_UTILS='' DESTDIR="${pkgdir}" install
+
+  ## cleanup the workaround
+  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
+  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
+  rm -r ${pkgdir}/usr/bin
+  rm -r ${pkgdir}/usr/lib/gambas3/{gb.[c-e]*,gb.[i-z]*}
+  rm -r ${pkgdir}/usr/share/gambas3/info/{gb.[c-e]*,gb.[i-z]*}
+  ##
+}
+
+package_gambas3-gb-image() {
+  depends=('gambas3-runtime')
+  pkgdesc="Gambas3 image component"
+
+  ## workaround for splitting
+  cd ${srcdir}/${pkgbase}-${pkgver}/main
+  make XDG_UTILS='' DESTDIR="${pkgdir}" install
+  ##
+
+  ## cleanup the workaround
+  rm -r ${pkgdir}/usr/bin
+  rm -r ${pkgdir}/usr/lib/gambas3/{gb.[c-g]*,gb.image.e*,gb.[j-z]*}
+  rm -r ${pkgdir}/usr/share/gambas3/info/{gb.[c-g]*,gb.info,gb.image.e*,gb.[j-z]*}
+  ##
+}
+
+package_gambas3-gb-image-effect() {
+  depends=('gambas3-gb-image')
+  pkgdesc="Gambas3 image effect component"
+
+  ## workaround for splitting
+  cd ${srcdir}/${pkgbase}-${pkgver}/main
+  make XDG_UTILS='' DESTDIR="${pkgdir}" install
+  ##
+
+  ## cleanup the workaround
+  rm -r ${pkgdir}/usr/bin
+  rm -r ${pkgdir}/usr/lib/gambas3/{gb.[c-g]*,gb.image.{c*,l*,s*},gb.[j-z]*}
+  rm -r ${pkgdir}/usr/share/gambas3/info/{gb.[c-g]*,gb.info,gb.image.{i*,l*},gb.[j-z]*}
+  ##
+}
+
+package_gambas3-gb-image-imlib() {
+  depends=('gambas3-gb-image' 'imlib2')
+  pkgdesc="Gambas3 imlib component"
+
+  ## workaround for splitting
+  cd ${srcdir}/${pkgbase}-${pkgver}/main
+  make XDG_UTILS='' DESTDIR="${pkgdir}" install
+  ##
+
+  cd ${srcdir}/${pkgbase}-${pkgver}/gb.image.imlib
+  make XDG_UTILS='' DESTDIR="${pkgdir}" install
+
+  ## cleanup the workaround
+  cd ${srcdir}/${pkgbase}-${pkgver}/main
+  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
+  ##
+}
+
+package_gambas3-gb-image-io() {
+  depends=('gambas3-gb-image' 'gdk-pixbuf2')
+  pkgdesc="Gambas3 input/output component"
+
+  ## workaround for splitting
+  cd ${srcdir}/${pkgbase}-${pkgver}/main
+  make XDG_UTILS='' DESTDIR="${pkgdir}" install
+  ##
+
+  cd ${srcdir}/${pkgbase}-${pkgver}/gb.image.io
+  make XDG_UTILS='' DESTDIR="${pkgdir}" install
+
+  ## cleanup the workaround
+  cd ${srcdir}/${pkgbase}-${pkgver}/main
+  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
+  ##
+}
+
+package_gambas3-gb-net() {
+  depends=('gambas3-runtime')
+  pkgdesc="Gambas3 network component"
+
+  ## workaround for splitting
+  cd ${srcdir}/${pkgbase}-${pkgver}/main
+  make XDG_UTILS='' DESTDIR="${pkgdir}" install
+  ##
+
+  cd ${srcdir}/${pkgbase}-${pkgver}/gb.net
+  make XDG_UTILS='' DESTDIR="${pkgdir}" install
+
+  ## cleanup the workaround
+  cd ${srcdir}/${pkgbase}-${pkgver}/main
+  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
+  ##
+}
+
+package_gambas3-gb-net-curl() {
+  depends=('gambas3-gb-net' 'curl')
+  pkgdesc="Gambas3 curl component"
+
+  ## workaround for splitting
+  cd ${srcdir}/${pkgbase}-${pkgver}/main
+  make XDG_UTILS='' DESTDIR="${pkgdir}" install
+  ##
+
+  cd ${srcdir}/${pkgbase}-${pkgver}/gb.net.curl
+  make XDG_UTILS='' DESTDIR="${pkgdir}" install
+
+  ## cleanup the workaround
+  cd ${srcdir}/${pkgbase}-${pkgver}/main
+  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
+  ##
+}
+
+package_gambas3-gb-net-smtp() {
+  depends=('gambas3-runtime' 'glib2')
+  pkgdesc="Gambas3 SMTP component"
+
+  ## workaround for splitting
+  cd ${srcdir}/${pkgbase}-${pkgver}/main
+  make XDG_UTILS='' DESTDIR="${pkgdir}" install
+  ##
+
+  cd ${srcdir}/${pkgbase}-${pkgver}/gb.net.smtp
+  make XDG_UTILS='' DESTDIR="${pkgdir}" install
+
+  ## cleanup the workaround
+  cd ${srcdir}/${pkgbase}-${pkgver}/main
+  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
+  ##
+}
+
+package_gambas3-gb-opengl() {
+  depends=('gambas3-runtime' 'libgl' 'glew')
+  pkgdesc="Gambas3 OpenGL component"
+
+  ## workaround for splitting
+  cd ${srcdir}/${pkgbase}-${pkgver}/main
+  make XDG_UTILS='' DESTDIR="${pkgdir}" install
+  ##
+
+  cd ${srcdir}/${pkgbase}-${pkgver}/gb.opengl
+  make XDG_UTILS='' DESTDIR="${pkgdir}" install
+
+  ## cleanup the workaround
+  cd ${srcdir}/${pkgbase}-${pkgver}/gb.opengl/src/glsl
+  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
+  cd ${srcdir}/${pkgbase}-${pkgver}/main
+  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
+  ##
+}
+
+package_gambas3-gb-opengl-glu() {
+  depends=('gambas3-gb-opengl')
+  pkgdesc="Gambas3 GL Utility component"
+
+  ## workaround for splitting
+  cd ${srcdir}/${pkgbase}-${pkgver}/main
+  make XDG_UTILS='' DESTDIR="${pkgdir}" install
+  ##
+
+  cd ${srcdir}/${pkgbase}-${pkgver}/gb.opengl/src/glu
+  make XDG_UTILS='' DESTDIR="${pkgdir}" install
+
+  ## cleanup the workaround
+  cd ${srcdir}/${pkgbase}-${pkgver}/main
+  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
+  ##
+}
+
+package_gambas3-gb-opengl-glsl() {
+  depends=('gambas3-gb-opengl')
+  pkgdesc="Gambas3 GLSL component"
+
+  ## workaround for splitting
+  cd ${srcdir}/${pkgbase}-${pkgver}/main
+  make XDG_UTILS='' DESTDIR="${pkgdir}" install
+  ##
+
+  cd ${srcdir}/${pkgbase}-${pkgver}/gb.opengl/src/glsl
+  make XDG_UTILS='' DESTDIR="${pkgdir}" install
+
+  ## cleanup the workaround
+  cd ${srcdir}/${pkgbase}-${pkgver}/main
+  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
+  ##
+}
+
+package_gambas3-gb-option() {
+  depends=('gambas3-runtime')
+  pkgdesc="Gambas3 getopt component"
+
+  ## workaround for splitting
+  cd ${srcdir}/${pkgbase}-${pkgver}/main
+  make XDG_UTILS='' DESTDIR="${pkgdir}" install
+  ##
+
+  ## cleanup the workaround
+  rm -r ${pkgdir}/usr/bin
+  rm -r ${pkgdir}/usr/lib/gambas3/{gb.[a-n]*,gb.[p-z]*}
+  rm -r ${pkgdir}/usr/share/gambas3/info/{gb.[a-n]*,gb.[p-z]*}
+  ##
+}
+
+package_gambas3-gb-pcre() {
+  depends=('gambas3-runtime' 'pcre')
+  pkgdesc="Gambas3 PCRE component"
+
+  ## workaround for splitting
+  cd ${srcdir}/${pkgbase}-${pkgver}/main
+  make XDG_UTILS='' DESTDIR="${pkgdir}" install
+  ##
+
+  cd ${srcdir}/${pkgbase}-${pkgver}/gb.pcre
+  make XDG_UTILS='' DESTDIR="${pkgdir}" install
+
+  ## cleanup the workaround
+  cd ${srcdir}/${pkgbase}-${pkgver}/main
+  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
+  ##
+}
+
+package_gambas3-gb-pdf() {
+  depends=('gambas3-runtime' 'poppler')
+  pkgdesc="Gambas3 PDF component"
+
+  ## workaround for splitting
+  cd ${srcdir}/${pkgbase}-${pkgver}/main
+  make XDG_UTILS='' DESTDIR="${pkgdir}" install
+  ##
+
+  cd ${srcdir}/${pkgbase}-${pkgver}/gb.pdf
+  make XDG_UTILS='' DESTDIR="${pkgdir}" install
+
+  ## cleanup the workaround
+  cd ${srcdir}/${pkgbase}-${pkgver}/main
+  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
+  ##
+}
+
+package_gambas3-gb-qt4() {
+  depends=('gambas3-gb-image' 'qt')
+  pkgdesc="Gambas3 Qt4 toolkit component"
+
+  ## workaround for splitting
+  cd ${srcdir}/${pkgbase}-${pkgver}/main
+  make XDG_UTILS='' DESTDIR="${pkgdir}" install
+  ##
+
+  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
+  make XDG_UTILS='' DESTDIR="${pkgdir}" install
+
+  ## cleanup the workaround
+  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4/src/ext
+  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
+  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4/src/opengl
+  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
+  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4/src/webkit
+  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
+  cd ${srcdir}/${pkgbase}-${pkgver}/main
+  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
+  ##
+}
+
+package_gambas3-gb-qt4-ext() {
+  depends=('gambas3-gb-qt4')
+  pkgdesc="Gambas3 Qt4 toolkit extended component"
+
+  ## workaround for splitting
+  cd ${srcdir}/${pkgbase}-${pkgver}/main
+  make XDG_UTILS='' DESTDIR="${pkgdir}" install
+  ##
+
+  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4/src/ext
+  make XDG_UTILS='' DESTDIR="${pkgdir}" install
+
+  ## cleanup the workaround
+  cd ${srcdir}/${pkgbase}-${pkgver}/main
+  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
+  ##
+}
+
+package_gambas3-gb-qt4-opengl() {
+  depends=('gambas3-gb-qt4' 'libgl')
+  pkgdesc="Gambas3 Qt4 toolkit OpenGL component"
+
+  ## workaround for splitting
+  cd ${srcdir}/${pkgbase}-${pkgver}/main
+  make XDG_UTILS='' DESTDIR="${pkgdir}" install
+  ##
+
+  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4/src/opengl
+  make XDG_UTILS='' DESTDIR="${pkgdir}" install
+
+  ## cleanup the workaround
+  cd ${srcdir}/${pkgbase}-${pkgver}/main
+  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
+  ##
+}
+
+package_gambas3-gb-qt4-webkit() {
+  depends=('gambas3-gb-qt4')
+  pkgdesc="Gambas3 Qt4 toolkit webkit component"
+
+  ## workaround for splitting
+  cd ${srcdir}/${pkgbase}-${pkgver}/main
+  make XDG_UTILS='' DESTDIR="${pkgdir}" install
+  ##
+
+  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4/src/webkit
+  make XDG_UTILS='' DESTDIR="${pkgdir}" install
+
+  ## cleanup the workaround
+  cd ${srcdir}/${pkgbase}-${pkgver}/main
+  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
+  ##
+}
+
+package_gambas3-gb-report() {
+  depends=('gambas3-gb-form' 'gambas3-gb-image-io')
+  pkgdesc="Gambas3 report component"
+
+  ## Workaround for splitting
+  cd ${srcdir}/${pkgbase}-${pkgver}/main
+  make XDG_UTILS='' DESTDIR="${pkgdir}" install
+  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
+  make XDG_UTILS='' DESTDIR="${pkgdir}" install
+  ##
+
+  cd ${srcdir}/${pkgbase}-${pkgver}/comp
+  make DESTDIR="${pkgdir}" install
+
+  ## Workaround for splitting
+  cd ${srcdir}/${pkgbase}-${pkgver}/main
+  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
+  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
+  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
+  rm -r ${pkgdir}/usr/share/gambas3/control/gb.[d-f]*
+  rm -r ${pkgdir}/usr/lib/gambas3/gb.{[c-m]*,[s-w]*}
+  rm -r ${pkgdir}/usr/share/gambas3/info/gb.{[c-m]*,[s-w]*}
+  ##
+}
+
+package_gambas3-gb-sdl() {
+  depends=('gambas3-gb-image-io' 'sdl_ttf' 'libxcursor' 'glew' 'libgl')
+  pkgdesc="Gambas3 SDL component"
+
+  ## workaround for splitting
+  cd ${srcdir}/${pkgbase}-${pkgver}/main
+  make XDG_UTILS='' DESTDIR="${pkgdir}" install
+  ##
+
+  cd ${srcdir}/${pkgbase}-${pkgver}/gb.sdl
+  make XDG_UTILS='' DESTDIR="${pkgdir}" install
+
+  ## cleanup the workaround
+  cd ${srcdir}/${pkgbase}-${pkgver}/main
+  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
+  ##
+}
+
+package_gambas3-gb-sdl-sound() {
+  depends=('gambas3-runtime' 'sdl_mixer')
+  pkgdesc="Gambas3 SDL sound component"
+
+  ## workaround for splitting
+  cd ${srcdir}/${pkgbase}-${pkgver}/main
+  make XDG_UTILS='' DESTDIR="${pkgdir}" install
+  ##
+
+  cd ${srcdir}/${pkgbase}-${pkgver}/gb.sdl.sound
+  make XDG_UTILS='' DESTDIR="${pkgdir}" install
+
+  ## cleanup the workaround
+  cd ${srcdir}/${pkgbase}-${pkgver}/main
+  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
+  ##
+}
+
+package_gambas3-gb-settings() {
+  depends=('gambas3-runtime')
+  pkgdesc="Gambas3 setting component"
+
+  ## Workaround for splitting
+  cd ${srcdir}/${pkgbase}-${pkgver}/main
+  make XDG_UTILS='' DESTDIR="${pkgdir}" install
+  ##
+
+  cd ${srcdir}/${pkgbase}-${pkgver}/comp
+  make DESTDIR="${pkgdir}" install
+
+  ## Workaround for splitting
+  cd ${srcdir}/${pkgbase}-${pkgver}/main
+  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
+  rm -r ${pkgdir}/usr/lib/gambas3/gb.{[c-r]*,[t-w]*}
+  rm -r ${pkgdir}/usr/share/gambas3/info/gb.{[c-r]*,[t-w]*}
+  ##
+}
+
+package_gambas3-gb-signal() {
+  depends=('gambas3-runtime')
+  pkgdesc="Gambas3 signal component"
+
+  ## workaround for splitting
+  cd ${srcdir}/${pkgbase}-${pkgver}/main
+  make XDG_UTILS='' DESTDIR="${pkgdir}" install
+  ##
+
+  ## cleanup the workaround
+  rm -r ${pkgdir}/usr/bin
+  rm -r ${pkgdir}/usr/lib/gambas3/{gb.[c-r]*,gb.[t-z]*,gb.so*}
+  rm -r ${pkgdir}/usr/share/gambas3/info/{gb.[c-r]*,gb.[t-z]*}
+  ##
+}
+
+package_gambas3-gb-v4l() {
+  depends=('gambas3-runtime' 'v4l-utils' 'libjpeg' 'libpng')
+  pkgdesc="Gambas3 video4linux component"
+
+  ## workaround for splitting
+  cd ${srcdir}/${pkgbase}-${pkgver}/main
+  make XDG_UTILS='' DESTDIR="${pkgdir}" install
+  ##
+
+  cd ${srcdir}/${pkgbase}-${pkgver}/gb.v4l
+  make XDG_UTILS='' DESTDIR="${pkgdir}" install
+
+  ## cleanup the workaround
+  cd ${srcdir}/${pkgbase}-${pkgver}/main
+  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
+  ##
+}
+
+package_gambas3-gb-vb() {
+  depends=('gambas3-runtime')
+  pkgdesc="Gambas3 VB transitional component"
+
+  ## Workaround for splitting
+  cd ${srcdir}/${pkgbase}-${pkgver}/main
+  make XDG_UTILS='' DESTDIR="${pkgdir}" install
+  ##
+
+  ## Workaround for splitting
+  rm -r ${pkgdir}/usr/bin
+  rm -r ${pkgdir}/usr/lib/gambas3/gb.[a-u]*
+  rm -r ${pkgdir}/usr/share/gambas3/info/gb.[a-u]*
+  ##
+}
+
+package_gambas3-gb-xml() {
+  depends=('gambas3-runtime' 'libxml2')
+  pkgdesc="Gambas3 XML component"
+
+  ## workaround for splitting
+  cd ${srcdir}/${pkgbase}-${pkgver}/main
+  make XDG_UTILS='' DESTDIR="${pkgdir}" install
+  ##
+
+  cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml
+  make XDG_UTILS='' DESTDIR="${pkgdir}" install
+
+  ## cleanup the workaround
+  cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml/src/xslt
+  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
+  cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml/src/rpc
+  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
+  cd ${srcdir}/${pkgbase}-${pkgver}/main
+  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
+  ##
+}
+
+package_gambas3-gb-xml-rpc() {
+  depends=('gambas3-gb-xml' 'gambas3-gb-net' 'gambas3-gb-net-curl')
+  pkgdesc="Gambas3 XML-RPC component"
+
+  ## workaround for splitting
+  cd ${srcdir}/${pkgbase}-${pkgver}/main
+  make XDG_UTILS='' DESTDIR="${pkgdir}" install
+  cd ${srcdir}/${pkgbase}-${pkgver}/gb.net
+  make XDG_UTILS='' DESTDIR="${pkgdir}" install
+  cd ${srcdir}/${pkgbase}-${pkgver}/gb.net.curl
+  make XDG_UTILS='' DESTDIR="${pkgdir}" install
+  ##
+
+  cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml
+  make XDG_UTILS='' DESTDIR="${pkgdir}" install
+
+  ## cleanup the workaround
+  cd ${srcdir}/${pkgbase}-${pkgver}/gb.net
+  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
+  cd ${srcdir}/${pkgbase}-${pkgver}/gb.net.curl
+  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
+  cd ${srcdir}/${pkgbase}-${pkgver}/main
+  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
+  rm -r ${pkgdir}/usr/lib/gambas3/gb.xml.{[c-l]*,xslt*,so*}
+  rm -r ${pkgdir}/usr/share/gambas3/info/gb.xml.{[i-l]*,x*}
+  ##
+}
+
+package_gambas3-gb-xml-xslt() {
+  depends=('gambas3-gb-xml' 'libxslt')
+  pkgdesc="Gambas3 XML-XSLT component"
+
+  ## workaround for splitting
+  cd ${srcdir}/${pkgbase}-${pkgver}/main
+  make XDG_UTILS='' DESTDIR="${pkgdir}" install
+  ##
+
+  cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml/src/xslt
+  make XDG_UTILS='' DESTDIR="${pkgdir}" install
+
+  ## cleanup the workaround
+  cd ${srcdir}/${pkgbase}-${pkgver}/main
+  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
+  ##
+}
+
+package_gambas3-gb-web() {
+  depends=('gambas3-runtime')
+  pkgdesc="Gambas3 CGI component"
+
+  ## Workaround for splitting
+  cd ${srcdir}/${pkgbase}-${pkgver}/main
+  make XDG_UTILS='' DESTDIR="${pkgdir}" install
+  ##
+
+  cd ${srcdir}/${pkgbase}-${pkgver}/comp
+  make DESTDIR="${pkgdir}" install
+
+  ## Workaround for splitting
+  cd ${srcdir}/${pkgbase}-${pkgver}/main
+  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
+  rm -r ${pkgdir}/usr/lib/gambas3/gb.[c-v]*
+  rm -r ${pkgdir}/usr/share/gambas3/info/gb.[c-v]*
+  ##
+}
diff --git a/community-staging/gambas3/gambas3-runtime.install b/community-staging/gambas3/gambas3-runtime.install
new file mode 100644
index 000000000..c6aad0d55
--- /dev/null
+++ b/community-staging/gambas3/gambas3-runtime.install
@@ -0,0 +1,12 @@
+post_install() {
+	xdg-icon-resource install --context mimetypes --size 64 \
+	/usr/share/gambas3/mime/application-x-gambas.png application-x-gambas
+	xdg-mime install /usr/share/gambas3/mime/application-x-gambas.xml
+}
+
+pre_remove() {
+	xdg-icon-resource uninstall --context mimetypes --size 64 application-x-gambas
+	xdg-mime uninstall /usr/share/gambas3/mime/application-x-gambas.xml
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/community-staging/gambas3/gambas3-script.install b/community-staging/gambas3/gambas3-script.install
new file mode 100644
index 000000000..77c1aa52f
--- /dev/null
+++ b/community-staging/gambas3/gambas3-script.install
@@ -0,0 +1,15 @@
+post_install() {
+	xdg-icon-resource install --context mimetypes --size 64 \
+	/usr/share/gambas3/mime/application-x-gambasscript.png application-x-gambasscript
+	xdg-icon-resource install --context mimetypes --size 64 \
+	/usr/share/gambas3/mime/application-x-gambasserverpage.png application-x-gambasserverpage
+	xdg-mime install /usr/share/gambas3/mime/application-x-gambasscript.xml
+	xdg-mime install /usr/share/gambas3/mime/application-x-gambasserverpage.xml
+}
+
+pre_remove() {
+	xdg-icon-resource uninstall --context mimetypes --size 64 application-x-gambasscript
+	xdg-icon-resource uninstall --context mimetypes --size 64 application-x-gambasserverpage
+	xdg-mime uninstall /usr/share/gambas3/mime/application-x-gambasscript.xml
+	xdg-mime uninstall /usr/share/gambas3/mime/application-x-gambasserverpage.xml
+}
diff --git a/community-staging/gambas3/gambas3.install b/community-staging/gambas3/gambas3.install
new file mode 100644
index 000000000..c6aad0d55
--- /dev/null
+++ b/community-staging/gambas3/gambas3.install
@@ -0,0 +1,12 @@
+post_install() {
+	xdg-icon-resource install --context mimetypes --size 64 \
+	/usr/share/gambas3/mime/application-x-gambas.png application-x-gambas
+	xdg-mime install /usr/share/gambas3/mime/application-x-gambas.xml
+}
+
+pre_remove() {
+	xdg-icon-resource uninstall --context mimetypes --size 64 application-x-gambas
+	xdg-mime uninstall /usr/share/gambas3/mime/application-x-gambas.xml
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/community-staging/performous/PKGBUILD b/community-staging/performous/PKGBUILD
index 16518d9c9..01aab85d1 100644
--- a/community-staging/performous/PKGBUILD
+++ b/community-staging/performous/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 47641 2011-05-24 14:35:06Z tdziedzic $
+# $Id: PKGBUILD 47952 2011-05-26 11:21:56Z lcarlier $
 # Maintainer : Laurent Carlier <lordheavym@gmail.com>
 # Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org>
 
 pkgname=performous
 pkgver=0.6.1
-pkgrel=5
+pkgrel=6
 pkgdesc='A free game like "Singstar", "Rockband" or "Stepmania"'
 arch=('i686' 'x86_64')
 url="http://performous.org/"
@@ -24,7 +24,7 @@ build() {
 
   # fix config loading with libxml++
   export LDFLAGS=${LDFLAGS/-Wl,--as-needed/}
-  # fix to built against boost 1.46
+  # fix to built against boost 1.46, upstream (git) now support v3
   export CXXFLAGS="${CXXFLAGS} -DBOOST_FILESYSTEM_VERSION=2"
 
   cmake -DCMAKE_BUILD_TYPE=Release \
diff --git a/community/calibre/PKGBUILD b/community/calibre/PKGBUILD
index c36f9fcac..9ec165ff9 100644
--- a/community/calibre/PKGBUILD
+++ b/community/calibre/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 47354 2011-05-21 22:44:04Z giovanni $
+# $Id: PKGBUILD 47955 2011-05-26 11:34:38Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Petrov Roman <nwhisper@gmail.com>
 # Contributor: Andrea Fagiani <andfagiani _at_ gmail dot com>
 
 pkgname=calibre
 pkgver=0.8.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Ebook management application"
 arch=('i686' 'x86_64') 
 url="http://calibre-ebook.com/"
 license=('GPL3')
-depends=('python-dateutil' 'python2-cssutils' 'python-pypdf' 'python2-cherrypy' 
+depends=('python-dateutil' 'python2-cssutils' 'python2-cherrypy' 
          'python-mechanize' 'podofo' 'libwmf' 'python-beautifulsoup' 
          'imagemagick' 'poppler-qt' 'chmlib' 'python-lxml' 'libusb' 
          'python-imaging' 'desktop-file-utils' 'shared-mime-info' 
@@ -26,7 +26,8 @@ md5sums=('e64c92ccf29ac17bfaf4a296e17a38ba'
 build() {
   cd "${srcdir}/${pkgname}"
 
-  rm -rf src/{cherrypy,pyPdf}
+  #rm -rf src/{cherrypy,pyPdf}
+  rm -rf src/cherrypy
   sed -i -e "s/ldflags = shlex.split(ldflags)/ldflags = shlex.split(ldflags) + ['-fPIC']/" setup/extensions.py
   sed -i -e 's:\(#!/usr/bin/env[ ]\+python$\|#!/usr/bin/python$\):\12:g' \
     $(find . -regex ".*.py\|.*.recipe")
diff --git a/community/gedit-plugins/PKGBUILD b/community/gedit-plugins/PKGBUILD
index d8ac7955a..02cc11ffd 100644
--- a/community/gedit-plugins/PKGBUILD
+++ b/community/gedit-plugins/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 45665 2011-04-26 21:32:06Z ibiru $
+# $Id: PKGBUILD 47971 2011-05-26 16:56:27Z ibiru $
 #Maintainer:  Ionut Biru <ibiru@archlinux.org>
 #Contributor: Hugo Doria <hugo@archlinux.org>
 #Contributor: Sergej Chodarev <sergejx@centrum.sk>
 #Contributor: zhuqin <zhuqin83@gmail.com>
 
 pkgname=gedit-plugins
-pkgver=3.0.2
+pkgver=3.0.3
 pkgrel=1
 pkgdesc="Set of plugins for gedit"
 arch=('i686' 'x86_64')
@@ -16,7 +16,7 @@ makedepends=('intltool' 'gnome-doc-utils')
 options=('!libtool' '!emptydirs')
 install=gedit-plugins.install
 source=(ftp://ftp.gnome.org/pub/gnome/sources/gedit-plugins/3.0/$pkgname-$pkgver.tar.bz2)
-sha256sums=('7152d3f5639258a0b5fb873521d36fc9919dee4c00ce9fb414045a2d8b0c06f6')
+sha256sums=('d574accc1238fb45759c7b088154f934cdd1ef8f7dcb42420db02ee73a46af4b')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
diff --git a/community/gnome-mplayer/PKGBUILD b/community/gnome-mplayer/PKGBUILD
index b206a462b..9c2686158 100644
--- a/community/gnome-mplayer/PKGBUILD
+++ b/community/gnome-mplayer/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 46877 2011-05-13 10:25:53Z lfleischer $
+# $Id: PKGBUILD 47944 2011-05-26 08:59:17Z lfleischer $
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: Allan McRae <mcrae_allan@hotmail.com>
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgname=gnome-mplayer
 pkgver=1.0.3
-pkgrel=2
+pkgrel=3
 pkgdesc='A simple MPlayer GUI.'
 arch=('i686' 'x86_64')
 url='http://gnome-mplayer.googlecode.com/'
 license=('GPL')
-depends=('mplayer' 'dbus-glib' 'libnotify' 'gtk2' 'hicolor-icon-theme')
+depends=('mplayer' 'dbus-glib' 'libnotify' 'gtk2' 'hicolor-icon-theme' 'dconf')
 makedepends=('gnome-power-manager' 'nautilus')
 install="${pkgname}.install"
 source=("http://gnome-mplayer.googlecode.com/files/${pkgname}-${pkgver}.tar.gz")
@@ -19,7 +19,7 @@ md5sums=('72a1c7d640a67eb2d60f2671108919c2')
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
-  ./configure --prefix=/usr --sysconfdir=/etc --disable-schemas-install --without-gconf
+  ./configure --prefix=/usr --sysconfdir=/etc --disable-schemas-install
   make
 }
 
diff --git a/community/gnome-packagekit/PKGBUILD b/community/gnome-packagekit/PKGBUILD
index cd517d218..20c933ec7 100644
--- a/community/gnome-packagekit/PKGBUILD
+++ b/community/gnome-packagekit/PKGBUILD
@@ -1,22 +1,22 @@
-# $Id: PKGBUILD 47009 2011-05-14 01:24:52Z jconder $
+# $Id: PKGBUILD 48001 2011-05-26 23:17:43Z jconder $
 # Maintainer: Jonathan Conder <jonno.conder@gmail.com>
 
 pkgname=gnome-packagekit
-pkgver=3.0.0
-pkgrel=2
+pkgver=3.0.2
+pkgrel=1
 pkgdesc='Collection of graphical tools for PackageKit to be used in the GNOME desktop'
 arch=('i686' 'x86_64')
 url='http://www.packagekit.org/'
 license=('GPL')
 depends=('dconf' 'desktop-file-utils' 'gnome-menus' 'gtk3'
          'hicolor-icon-theme' 'libnotify' 'packagekit')
-makedepends=('gconf' 'gtk-doc' 'intltool' 'libcanberra' 'upower')
+makedepends=('gconf' 'gtk-doc' 'gnome-common' 'intltool' 'libcanberra' 'upower')
 optdepends=('gnome-settings-daemon-updates: update and message notifications')
 options=('!emptydirs' '!libtool')
 install="$pkgname.install"
 source=("http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2"
         'arch.patch')
-sha256sums=('838ca07168dbf7f29fc83ff3c0ef570e7703082d44f5607b09af01972fc52a49'
+sha256sums=('faaae52d839a66d0bcb7d7cf97ef62d11bccf558e6aa9fdb0dbc8d61dbaf714f'
             '9c809ac3c8bbf870442e7bc4123c70b144930a287b28626be1b8bae95edf71ac')
 
 build() {
@@ -26,7 +26,8 @@ build() {
   sed -i 's@python@python2@' 'python/enum-convertor.py'
 
   export PYTHON=/usr/bin/python2
-  ./configure --prefix=/usr \
+  # TODO: remove gnome-common dependency and switch back to configure
+  gnome-autogen.sh --prefix=/usr \
 	      --sysconfdir=/etc \
 	      --disable-gtk-doc \
 	      --disable-schemas-compile \
diff --git a/community/gnome-settings-daemon-updates/PKGBUILD b/community/gnome-settings-daemon-updates/PKGBUILD
index 26279b4aa..e1c0348e9 100644
--- a/community/gnome-settings-daemon-updates/PKGBUILD
+++ b/community/gnome-settings-daemon-updates/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 46899 2011-05-13 15:02:09Z jconder $
+# $Id: PKGBUILD 48006 2011-05-26 23:21:11Z jconder $
 # Maintainer: Jonathan Conder <jonno.conder@gmail.com>
 
 _pkgname=gnome-settings-daemon
 pkgname=$_pkgname-updates
-pkgver=3.0.1
+pkgver=3.0.2
 pkgrel=1
 pkgdesc="Updates plugin for the GNOME Settings daemon"
 arch=('i686' 'x86_64')
@@ -15,7 +15,7 @@ options=('!emptydirs' '!libtool')
 install=$_pkgname.install
 source=("http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver%.*}/$_pkgname-$pkgver.tar.bz2"
         'arch.patch')
-sha256sums=('51cdd0842b907e95c79d4e2b26f554e26fc626f7c2e6c3a14e3fc7954ca91117'
+sha256sums=('f304aa54c59ab23f7ef55bfeefeecfd6f7a95cabbeed2ea802c94463d4234eec'
             '91700d5c7c52cb6e15ed46ec61a150af58e073de7332351a1f7863a41042d134')
 
 build() {
diff --git a/community/mysql-workbench/PKGBUILD b/community/mysql-workbench/PKGBUILD
index e38e78997..3c063eb1d 100644
--- a/community/mysql-workbench/PKGBUILD
+++ b/community/mysql-workbench/PKGBUILD
@@ -1,36 +1,36 @@
-# $Id: PKGBUILD 46305 2011-05-04 18:56:20Z andrea $
+# $Id: PKGBUILD 47963 2011-05-26 13:44:42Z ibiru $
 # Maintainer:
 # Contributor : Ionut Biru <ibiru@archlinux.org>
 # Contributor: totoloco <totoloco at gmail _dot_com>
 
 pkgname=mysql-workbench
 epoch=1
-pkgver=5.2.33b
+pkgver=5.2.34
 pkgrel=1
 pkgdesc="A cross-platform, visual database design tool developed by MySQL"
 arch=('i686' 'x86_64')
 url="http://wb.mysql.com/"
 license=('GPL2')
-depends=('libgnome' 'libzip' 'libmysqlclient' 'lua' 'gtkmm' 'libglade' 'libgl'
+depends=('libzip' 'libmysqlclient' 'lua' 'gtkmm' 'libgl'
          'libsigc++' 'python-paramiko' 'python-pexpect')
 makedepends=('boost' 'curl' 'mesa')
 options=('!libtool')
 source=(ftp://ftp.gwdg.de/pub/misc/mysql/Downloads/MySQLGUITools/${pkgname}-gpl-${pkgver}-src.tar.gz
         ArchLinux.xml arch.patch python27.patch gcc46.patch)
-md5sums=('850e081eeaea87a88c408483817e4b1f'
+md5sums=('781a4e9f6b5573b06a838d53ddb9136d'
          'c2f986cd5737413d020c55db32713c48'
          '23430d24400fd65c9fd872bd8e2411e5'
          '47bc4cdfaa035a0132392e94c462ebf7'
-         '8e7a6d5aa59b73727e862724f115d90a')
+         '43917ebc79794ba15a64f7ba820fa20b')
 
 build() {
-  cd "${srcdir}/${pkgname}-gpl-5.2.33-src"
+  cd "${srcdir}/${pkgname}-gpl-${pkgver}-src"
 
   cp "${srcdir}/ArchLinux.xml" res/mysql.profiles
   patch -Np1 -i ${srcdir}/arch.patch
 
   patch -Np0 -i ${srcdir}/python27.patch
-  patch -p1 -i ${srcdir}/gcc46.patch
+  patch -Np1 -i ${srcdir}/gcc46.patch
 
   #we use System provided libraries
   rm -rf ext/curl
@@ -46,8 +46,9 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-gpl-5.2.33-src"
+  cd "${srcdir}/${pkgname}-gpl-${pkgver}-src"
 
   make DESTDIR="${pkgdir}" install
   sed -i -e "s|#![ ]*/usr/bin/python$|#!/usr/bin/python2|" $pkgdir/usr/share/mysql-workbench/sshtunnel.py
+  sed -i -e "s|python|python2|" $pkgdir/usr/lib/mysql-workbench/modules/wb_utils_grt.py
 }
diff --git a/community/mysql-workbench/gcc46.patch b/community/mysql-workbench/gcc46.patch
index 9daa162c8..6a0d2cd97 100644
--- a/community/mysql-workbench/gcc46.patch
+++ b/community/mysql-workbench/gcc46.patch
@@ -1,108 +1,6 @@
-diff -up mysql-workbench-gpl-5.2.33-src/backend/wbprivate/workbench/metaclasses.cpp.gcc46 mysql-workbench-gpl-5.2.33-src/backend/wbprivate/workbench/metaclasses.cpp
---- mysql-workbench-gpl-5.2.33-src/backend/wbprivate/workbench/metaclasses.cpp.gcc46	2011-03-23 17:05:33.000000000 +0100
-+++ mysql-workbench-gpl-5.2.33-src/backend/wbprivate/workbench/metaclasses.cpp	2011-03-23 17:06:02.000000000 +0100
-@@ -23,7 +23,7 @@
- #include "grts/structs.workbench.model.reporting.h"

- #include "grts/structs.workbench.physical.h"

- 

--

-+namespace wb {

- void register_all_metaclasses()

- {

-   register_structs_app_xml();

-@@ -46,3 +46,6 @@ void register_all_metaclasses()

-   register_structs_workbench_model_reporting_xml();

-   register_structs_workbench_physical_xml();  

- }

-+// end of namespace wb

-+}

-+

-diff -up mysql-workbench-gpl-5.2.33-src/frontend/linux/linux_utilities/toolbar_manager.cpp.gcc46 mysql-workbench-gpl-5.2.33-src/frontend/linux/linux_utilities/toolbar_manager.cpp
---- mysql-workbench-gpl-5.2.33-src/frontend/linux/linux_utilities/toolbar_manager.cpp.gcc46	2011-03-23 16:56:16.000000000 +0100
-+++ mysql-workbench-gpl-5.2.33-src/frontend/linux/linux_utilities/toolbar_manager.cpp	2011-03-23 17:07:36.000000000 +0100
-@@ -31,7 +31,7 @@ static Gtk::ComboBox *create_color_combo
-   }
- 
-   Glib::RefPtr<Gtk::ListStore> model= Gtk::ListStore::create(*color_combo_columns);
--  Gtk::ComboBox *combo= new Gtk::ComboBox(model);
-+  Gtk::ComboBox *combo= new Gtk::ComboBox((Glib::RefPtr<Gtk::TreeModel> &)model);
- 
-   combo->pack_start(color_combo_columns->image);
- 
-diff -up mysql-workbench-gpl-5.2.33-src/library/forms/utilities.cpp.gcc46 mysql-workbench-gpl-5.2.33-src/library/forms/utilities.cpp
---- mysql-workbench-gpl-5.2.33-src/library/forms/utilities.cpp.gcc46	2011-03-23 17:04:17.000000000 +0100
-+++ mysql-workbench-gpl-5.2.33-src/library/forms/utilities.cpp	2011-03-23 17:04:40.000000000 +0100
-@@ -32,10 +32,11 @@
- #include <math.h>
- #include "base/log.h"
- ENABLE_LOG("mforms.utils")
--
- using namespace mforms;
- 
-+namespace mforms {
- GThread *_mforms_main_thread=0;
-+}
- 
- static std::map<std::string, int> remembered_message_answers;
- static std::string remembered_message_answer_file;
-diff -up mysql-workbench-gpl-5.2.33-src/library/grt/src/grtpp_shell_lua_help.cpp.gcc46 mysql-workbench-gpl-5.2.33-src/library/grt/src/grtpp_shell_lua_help.cpp
---- mysql-workbench-gpl-5.2.33-src/library/grt/src/grtpp_shell_lua_help.cpp.gcc46	2011-03-17 13:48:45.000000000 +0100
-+++ mysql-workbench-gpl-5.2.33-src/library/grt/src/grtpp_shell_lua_help.cpp	2011-03-23 16:44:22.000000000 +0100
-@@ -1909,6 +1909,8 @@ static MYX_GRT_SHELL_COMMAND_HELP_GROUP 
- 
- //============================================================================
- 
-+namespace grt {
-+
- static void myx_grt_shell_show_command_help_print(grt::GRT *grt, const char *group_name, const char *cmd)
- {
-   MYX_GRT_SHELL_COMMAND_HELP_GROUP help_group;
-@@ -2097,3 +2099,6 @@ void myx_grt_shell_show_help(grt::GRT *g
-   }
- }
- 
-+// End of namspace grt
-+}
-+
-diff -up mysql-workbench-gpl-5.2.33-src/library/grt/src/grtpp_shell_python_help.cpp.gcc46 mysql-workbench-gpl-5.2.33-src/library/grt/src/grtpp_shell_python_help.cpp
---- mysql-workbench-gpl-5.2.33-src/library/grt/src/grtpp_shell_python_help.cpp.gcc46	2011-03-17 13:48:41.000000000 +0100
-+++ mysql-workbench-gpl-5.2.33-src/library/grt/src/grtpp_shell_python_help.cpp	2011-03-23 16:44:22.000000000 +0100
-@@ -187,7 +187,7 @@ NL
- };
- 
- 
--void grt_shell_show_python_help(grt::GRT *grt, const char *command)
-+void grt::grt_shell_show_python_help(grt::GRT *grt, const char *command)
- {
-   if (!command || !*command)
-     grt->send_output(
-diff -up mysql-workbench-gpl-5.2.33-src/library/grt/src/grtpp_shell_python_help.h.gcc46 mysql-workbench-gpl-5.2.33-src/library/grt/src/grtpp_shell_python_help.h
---- mysql-workbench-gpl-5.2.33-src/library/grt/src/grtpp_shell_python_help.h.gcc46	2011-03-17 13:48:39.000000000 +0100
-+++ mysql-workbench-gpl-5.2.33-src/library/grt/src/grtpp_shell_python_help.h	2011-03-23 16:44:22.000000000 +0100
-@@ -21,6 +21,8 @@
- #ifndef __grtpp_shell_python_help_h__
- #define __grtpp_shell_python_help_h__
- 
-+namespace grt {
- void grt_shell_show_python_help(grt::GRT *grt, const char *command);
-+}
- 
--#endif /* __grtpp_shell_python_help_h__ */
-\ Pas de fin de ligne à la fin du fichier.
-+#endif /* __grtpp_shell_python_help_h__ */
-diff -up mysql-workbench-gpl-5.2.33-src/modules/db.mysql/src/db_mysql_catalog_report.h.gcc46 mysql-workbench-gpl-5.2.33-src/modules/db.mysql/src/db_mysql_catalog_report.h
---- mysql-workbench-gpl-5.2.33-src/modules/db.mysql/src/db_mysql_catalog_report.h.gcc46	2011-03-23 16:51:30.000000000 +0100
-+++ mysql-workbench-gpl-5.2.33-src/modules/db.mysql/src/db_mysql_catalog_report.h	2011-03-23 16:52:33.000000000 +0100
-@@ -10,6 +10,7 @@
- #include "config.h"
- #endif
- 
-+#include <cstddef>
- #include "ctemplate/template.h"
- 
- #include "grt/common.h"
---- mysql-workbench-gpl-5.2.33-src/ext/ctemplate/ctemplate-src/src/ctemplate/template_dictionary.h.in~	2011-05-04 00:57:31.029029610 -0700
-+++ mysql-workbench-gpl-5.2.33-src/ext/ctemplate/ctemplate-src/src/ctemplate/template_dictionary.h.in	2011-05-04 00:57:45.162361700 -0700
+diff -Nur mysql-workbench-gpl-5.2.34-src.orig/ext/ctemplate/ctemplate-src/src/ctemplate/template_dictionary.h.in mysql-workbench-gpl-5.2.34-src/ext/ctemplate/ctemplate-src/src/ctemplate/template_dictionary.h.in
+--- mysql-workbench-gpl-5.2.34-src.orig/ext/ctemplate/ctemplate-src/src/ctemplate/template_dictionary.h.in	2011-05-26 09:33:54.128803186 +0000
++++ mysql-workbench-gpl-5.2.34-src/ext/ctemplate/ctemplate-src/src/ctemplate/template_dictionary.h.in	2011-05-26 09:34:45.312611839 +0000
 @@ -54,6 +54,7 @@
  #include <map>
  #include <string>
diff --git a/community/mythplugins/PKGBUILD b/community/mythplugins/PKGBUILD
index 32327b71d..e3ec00716 100644
--- a/community/mythplugins/PKGBUILD
+++ b/community/mythplugins/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 47433 2011-05-23 03:25:22Z jconder $
+# $Id: PKGBUILD 47935 2011-05-26 08:19:27Z jconder $
 # Maintainer: Jonathan Conder <jonno.conder@gmail.com>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 
@@ -15,17 +15,17 @@ pkgname=('mythplugins-mytharchive'
          'mythplugins-mythweb'
          'mythplugins-mythzoneminder')
 pkgver=0.24.1
-pkgrel=2
+pkgrel=3
 epoch=1
 arch=('i686' 'x86_64')
 url="http://www.mythtv.org"
 license=('GPL')
-makedepends=("mythtv>=$epoch-$pkgver" 'cdparanoia' 'cdrkit' 'dvdauthor'
-             'dvd+rw-tools' 'ffmpeg' 'flac' 'libcdaudio' 'libexif' 'libvisual'
-	     'libvorbis' 'mplayer' 'perl-datetime-format-iso8601'
-	     'perl-date-manip' 'perl-image-size' 'perl-libwww' 'perl-soap-lite'
-	     'perl-xml-sax' 'perl-xml-simple' 'perl-xml-xpath' 'python2-oauth'
-	     'python-imaging' 'python-pycurl' 'sdl' 'taglib' 'zlib')
+makedepends=('cdparanoia' 'cdrkit' 'dvdauthor' 'dvd+rw-tools' 'ffmpeg' 'flac'
+             'libcdaudio' 'libexif' 'libvisual' 'libvorbis' 'mplayer' 'mythtv'
+	     'perl-datetime-format-iso8601' 'perl-date-manip' 'perl-image-size'
+	     'perl-libwww' 'perl-soap-lite' 'perl-xml-sax' 'perl-xml-simple'
+	     'perl-xml-xpath' 'python2-oauth' 'python-imaging' 'python-pycurl'
+	     'sdl' 'taglib' 'zlib')
 source=("ftp://ftp.osuosl.org/pub/mythtv/$pkgbase-$pkgver.tar.bz2"
         'mtd.rc')
 md5sums=('76aeefeff70b550b2d35c2d9d751df18'
@@ -44,7 +44,7 @@ build() {
 
 package_mythplugins-mytharchive() {
   pkgdesc="Create DVDs or archive recorded shows in MythTV"
-  depends=("mythtv>=$epoch-$pkgver" 'cdrkit' 'dvdauthor' 'dvd+rw-tools' 'ffmpeg'
+  depends=('cdrkit' 'dvdauthor' 'dvd+rw-tools' 'ffmpeg' 'mythtv'
            'python-imaging')
 
   cd "$srcdir/$pkgbase-$pkgver/mytharchive"
@@ -53,7 +53,7 @@ package_mythplugins-mytharchive() {
 
 package_mythplugins-mythbrowser() {
   pkgdesc="Mini web browser for MythTV"
-  depends=("mythtv>=$epoch-$pkgver")
+  depends=('mythtv')
 
   cd "$srcdir/$pkgbase-$pkgver/mythbrowser"
   make INSTALL_ROOT="$pkgdir" install
@@ -61,7 +61,7 @@ package_mythplugins-mythbrowser() {
 
 package_mythplugins-mythgallery() {
   pkgdesc="Image gallery plugin for MythTV"
-  depends=("mythtv>=$epoch-$pkgver" 'libexif')
+  depends=('libexif' 'mythtv')
 
   cd "$srcdir/$pkgbase-$pkgver/mythgallery"
   make INSTALL_ROOT="$pkgdir" install
@@ -69,7 +69,7 @@ package_mythplugins-mythgallery() {
 
 package_mythplugins-mythgame() {
   pkgdesc="Game emulator plugin for MythTV"
-  depends=("mythtv>=$epoch-$pkgver")
+  depends=('mythtv')
 
   cd "$srcdir/$pkgbase-$pkgver/mythgame"
   make INSTALL_ROOT="$pkgdir" install
@@ -77,8 +77,8 @@ package_mythplugins-mythgame() {
 
 package_mythplugins-mythmusic() {
   pkgdesc="Music playing plugin for MythTV"
-  depends=("mythtv>=$epoch-$pkgver" 'cdparanoia' 'flac' 'libcdaudio' 'libvisual'
-           'libvorbis' 'sdl' 'taglib')
+  depends=('cdparanoia' 'flac' 'libcdaudio' 'libvisual' 'libvorbis' 'mythtv'
+           'sdl' 'taglib')
 
   cd "$srcdir/$pkgbase-$pkgver/mythmusic"
   make INSTALL_ROOT="$pkgdir" install
@@ -86,7 +86,7 @@ package_mythplugins-mythmusic() {
 
 package_mythplugins-mythnetvision() {
   pkgdesc="MythNetvision plugin for MythTV"
-  depends=("mythtv>=$epoch-$pkgver" 'python2-oauth' 'python-pycurl')
+  depends=('mythtv' 'python2-oauth' 'python-pycurl')
 
   cd "$srcdir/$pkgbase-$pkgver/mythnetvision"
   make INSTALL_ROOT="$pkgdir" install
@@ -94,7 +94,7 @@ package_mythplugins-mythnetvision() {
 
 package_mythplugins-mythnews() {
   pkgdesc="News checking plugin for MythTV"
-  depends=("mythtv>=$epoch-$pkgver")
+  depends=('mythtv')
 
   cd "$srcdir/$pkgbase-$pkgver/mythnews"
   make INSTALL_ROOT="$pkgdir" install
@@ -102,7 +102,7 @@ package_mythplugins-mythnews() {
 
 package_mythplugins-mythvideo() {
   pkgdesc="Video playback and browsing plugin for MythTV"
-  depends=("mythtv>=$epoch-$pkgver" 'mplayer')
+  depends=('mplayer' 'mythtv')
 
   cd "$srcdir/$pkgbase-$pkgver/mythvideo"
   make INSTALL_ROOT="$pkgdir" install
@@ -112,7 +112,7 @@ package_mythplugins-mythvideo() {
 
 package_mythplugins-mythweather() {
   pkgdesc="Weather checking plugin for MythTV"
-  depends=("mythtv>=$epoch-$pkgver" 'perl-date-manip' 'perl-libwww'
+  depends=('mythtv' 'perl-date-manip' 'perl-libwww'
            'perl-soap-lite' 'perl-xml-sax' 'perl-xml-simple' 'perl-xml-xpath'
 	   'perl-image-size' 'perl-datetime-format-iso8601')
 
@@ -122,9 +122,9 @@ package_mythplugins-mythweather() {
 
 package_mythplugins-mythweb() {
   pkgdesc="Web interface for the MythTV scheduler"
-  depends=("mythtv>=$epoch-$pkgver")
-  optdepends=('php-apache'
-              'lighttpd')
+  depends=('mythtv')
+  optdepends=('lighttpd'
+              'php-apache')
 
   mkdir -p "$pkgdir/srv/http/mythweb"/{image_cache,php_sessions}
   cp -R "$srcdir/$pkgbase-$pkgver/mythweb"/* "$pkgdir/srv/http/mythweb"
@@ -134,7 +134,7 @@ package_mythplugins-mythweb() {
 
 package_mythplugins-mythzoneminder() {
   pkgdesc="View CCTV footage from zoneminder in MythTV"
-  depends=("mythtv>=$epoch-$pkgver")
+  depends=('mythtv')
 
   install='mythplugins-mythzoneminder.install'
   cd "$srcdir/$pkgbase-$pkgver/mythzoneminder"
diff --git a/community/nginx/PKGBUILD b/community/nginx/PKGBUILD
index 0139b8242..873f69556 100644
--- a/community/nginx/PKGBUILD
+++ b/community/nginx/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 46704 2011-05-10 20:38:51Z spupykin $
+# $Id: PKGBUILD 47990 2011-05-26 22:02:37Z tdziedzic $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Miroslaw Szot <mss@czlug.icis.pcz.pl>
 
@@ -11,7 +11,7 @@ _user=http
 _group=http
 
 pkgname=nginx
-pkgver=1.0.2
+pkgver=1.0.3
 pkgrel=1
 pkgdesc="lightweight HTTP server and IMAP/POP3 proxy server"
 arch=('i686' 'x86_64')
@@ -27,7 +27,7 @@ backup=("etc/nginx/conf/nginx.conf"
 	"etc/logrotate.d/nginx")
 source=(http://sysoev.ru/nginx/nginx-${pkgver}.tar.gz
 	nginx)
-md5sums=('8a528ccaab3ddba84e72443fa40b19e7'
+md5sums=('eebf1e9c7e86f923923b828ae0156103'
          '837b010afcbdfe82d8e65ef00c4e14ba')
 
 build() {
diff --git a/community/spring/gcc46.patch b/community/spring/gcc46.patch
new file mode 100644
index 000000000..4f6865cac
--- /dev/null
+++ b/community/spring/gcc46.patch
@@ -0,0 +1,67 @@
+From: Jan Dittberner <jandd@debian.org>
+Subject: Patch for FTBFS with g++ 4.6.0
+Bug-Debian: http://bugs.debian.org/625097
+Bug: http://springrts.com/mantis/view.php?id=2415
+--- a/AI/Skirmish/E323AI/AAStar.h
++++ b/AI/Skirmish/E323AI/AAStar.h
+@@ -4,6 +4,7 @@
+ #include <queue>
+ #include <vector>
+ #include <list>
++#include <cstddef> // for NULL
+ 
+ class AAStar {
+ 	public:
+--- a/rts/Rendering/ShadowHandler.cpp
++++ b/rts/Rendering/ShadowHandler.cpp
+@@ -318,6 +318,11 @@
+ 	xmid = 1.0f - (sqrt(fabs(x2)) / (sqrt(fabs(x2)) + sqrt(fabs(x1))));
+ 	ymid = 1.0f - (sqrt(fabs(y2)) / (sqrt(fabs(y2)) + sqrt(fabs(y1))));
+ 
++	shadowParams.x = xmid;
++	shadowParams.y = ymid;
++	shadowParams.z = p17;
++	shadowParams.w = p18;
++
+ 	shadowMatrix[ 0] =   cross1.x / maxLengthX;
+ 	shadowMatrix[ 4] =   cross1.y / maxLengthX;
+ 	shadowMatrix[ 8] =   cross1.z / maxLengthX;
+--- a/rts/Rendering/ShadowHandler.h
++++ b/rts/Rendering/ShadowHandler.h
+@@ -38,7 +38,7 @@
+ 	CMatrix44f shadowMatrix;
+ 	void CalcMinMaxView(void);
+ 
+-	const float4 GetShadowParams() const { return float4(xmid, ymid, p17, p18); }
++	const float4& GetShadowParams() const { return shadowParams; }
+ 
+ 	enum ShadowGenProgram {
+ 		SHADOWGEN_PROGRAM_MODEL      = 0,
+@@ -76,6 +76,7 @@
+ 	//! to write the (FBO) depth-buffer texture
+ 	std::vector<Shader::IProgramObject*> shadowGenProgs;
+ 
++	float4 shadowParams;
+ 	float x1, x2, y1, y2;
+ 	float xmid, ymid;
+ 	float p17, p18;
+--- a/rts/Rendering/GLContext.cpp
++++ b/rts/Rendering/GLContext.cpp
+@@ -9,6 +9,7 @@
+ #include "GLContext.h"
+ 
+ #include <list>
++#include <cstddef>  // for NULL
+ 
+ 
+ using namespace std;
+--- a/rts/System/MemPool.h
++++ b/rts/System/MemPool.h
+@@ -4,6 +4,7 @@
+ #define _MEM_POOL_H_
+ 
+ #include <new>
++#include <cstddef> // for NULL
+ 
+ const size_t MAX_MEM_SIZE=200;
+ 
diff --git a/community/systemd/PKGBUILD b/community/systemd/PKGBUILD
index ca47c7723..0016127b2 100644
--- a/community/systemd/PKGBUILD
+++ b/community/systemd/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 47349 2011-05-21 21:23:44Z dreisner $
+# $Id: PKGBUILD 47976 2011-05-26 18:14:34Z dreisner $
 # Maintainer: Dave Reisner <d@falconindy.com>
 
 pkgname=systemd
-pkgver=27
-pkgrel=2
+pkgver=28
+pkgrel=1
 pkgdesc="Session and Startup manager"
 arch=('i686' 'x86_64')
 url="http://www.freedesktop.org/wiki/Software/systemd"
@@ -26,18 +26,13 @@ backup=(etc/systemd/system.conf
         usr/lib/tmpfiles.d/x11.conf)
 install=systemd.install
 source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.bz2"
-        "mqueue-signed-int.patch"
         "os-release")
-md5sums=('6d6319e1817960459f13b300c4881f18'
-         '2ba01b4fc5c70eb51c223005fa5b9ecc'
+md5sums=('be37500f576a0494f82fed7fa47cc306'
          '752636def0db3c03f121f8b4f44a63cd')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
-  # fix ABRT on systemctl status
-  patch -Np1 <"$srcdir/mqueue-signed-int.patch"
-
   ./configure --prefix=/usr \
               --with-rootdir= \
               --sysconfdir=/etc \
diff --git a/community/unbound/PKGBUILD b/community/unbound/PKGBUILD
index b68c81348..7453cb70b 100644
--- a/community/unbound/PKGBUILD
+++ b/community/unbound/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributor: Massimiliano Torromeo <massimiliano DOT torromeo AT google mail service>
 
 pkgname=unbound
-pkgver=1.4.9
+pkgver=1.4.10
 pkgrel=1
 pkgdesc='Validating, recursive, and caching DNS resolver'
 arch=('i686' 'x86_64')
@@ -17,7 +17,7 @@ backup=('etc/unbound/unbound.conf')
 source=("http://unbound.net/downloads/$pkgname-$pkgver.tar.gz"
         'unbound.conf'
         'rc.d')
-sha1sums=('f2ac7b4ef1d1b330e2dd5e2eedeb6fd2bbad8478'
+sha1sums=('ac9ab61a51e147ade69ca8b043fee2ed76336a62'
           '5d473ec2943fd85367cdb653fcd58e186f07383f'
           'a0c8c496d71d43ed9e09b170d3df836dfb096480')
 
diff --git a/extra/accountsservice/PKGBUILD b/extra/accountsservice/PKGBUILD
index 1541ff19c..5f0c6e93a 100644
--- a/extra/accountsservice/PKGBUILD
+++ b/extra/accountsservice/PKGBUILD
@@ -1,7 +1,7 @@
-# $Id: PKGBUILD 121312 2011-04-30 14:57:48Z ibiru $
+# $Id: PKGBUILD 124664 2011-05-23 20:15:43Z ibiru $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 pkgname=accountsservice
-pkgver=0.6.10
+pkgver=0.6.12
 pkgrel=1
 pkgdesc="D-Bus interface for user account query and manipulation"
 arch=(i686 x86_64)
@@ -11,7 +11,7 @@ depends=('dbus-glib' 'polkit')
 makedepends=('intltool' 'gobject-introspection')
 options=('!libtool')
 source=(http://cgit.freedesktop.org/accountsservice/snapshot/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('e43d0ea4c0cb9291e60f800d9c2d0ba4')
+md5sums=('2fcf38a65d574dd2fe6ba182ff4de053')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/anjuta/PKGBUILD b/extra/anjuta/PKGBUILD
index 98a1c6730..eea7f3e07 100644
--- a/extra/anjuta/PKGBUILD
+++ b/extra/anjuta/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 122589 2011-05-04 18:41:26Z ibiru $
+# $Id: PKGBUILD 124683 2011-05-23 21:00:48Z ibiru $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Harley Laue <losinggeneration@yahoo.com>
 
 pkgname=anjuta
-pkgver=3.0.1.0
-pkgrel=2
+pkgver=3.0.2.0
+pkgrel=1
 pkgdesc="GNOME Integrated Development Environment (IDE)"
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -16,7 +16,7 @@ url="http://anjuta.sourceforge.net/"
 install=anjuta.install
 source=(ftp://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*.*}/${pkgname}-${pkgver}.tar.bz2)
 options=('!libtool' '!emptydirs')
-sha256sums=('dbda189f453e0f9baecb35e85d59df92613668f7f4be08207d635cff3abb7261')
+sha256sums=('5dce2cf455f9feeea31aea6bce5bae1dbd35793ba8c8009675608dae4d67bac0')
 
 build() {
   cd "${srcdir}/anjuta-${pkgver}"
diff --git a/extra/empathy/PKGBUILD b/extra/empathy/PKGBUILD
index 6f7271d19..8b758fd16 100644
--- a/extra/empathy/PKGBUILD
+++ b/extra/empathy/PKGBUILD
@@ -1,7 +1,7 @@
-# $Id: PKGBUILD 120614 2011-04-25 18:12:59Z ibiru $
+# $Id: PKGBUILD 124631 2011-05-23 15:09:42Z ibiru $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 pkgname=empathy
-pkgver=3.0.1
+pkgver=3.0.2
 pkgrel=1
 pkgdesc="A GNOME instant messaging client using the Telepathy framework."
 arch=('i686' 'x86_64')
@@ -20,7 +20,7 @@ options=('!libtool')
 groups=('gnome-extra')
 install=empathy.install
 source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/3.0/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('4e29feb9f1100db2b4183b6f3aeccca85b0c89e7806c28adff0cb365b55c3809')
+sha256sums=('8074f6ce951fb95b1e13c546497e22d487bca9a87d88f1ebb903cdd2fd48bdc2')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/eog/PKGBUILD b/extra/eog/PKGBUILD
index f1a7abfae..872b9228a 100644
--- a/extra/eog/PKGBUILD
+++ b/extra/eog/PKGBUILD
@@ -1,21 +1,21 @@
-# $Id: PKGBUILD 120830 2011-04-26 16:59:37Z ibiru $
+# $Id: PKGBUILD 124886 2011-05-24 21:41:31Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=eog
-pkgver=3.0.1
+pkgver=3.0.2
 pkgrel=1
 pkgdesc="Eye of Gnome: An image viewing and cataloging program"
 arch=('i686' 'x86_64')
 license=('GPL')
 depends=('gnome-desktop' 'libexif' 'lcms' 'desktop-file-utils' 'exempi'
-         'dbus-glib' 'libpeas' 'librsvg' 'gnome-icon-theme')
+         'dbus-glib' 'libpeas' 'librsvg' 'gnome-icon-theme' 'dconf')
 makedepends=('gtk-doc' 'intltool')
 install=eog.install
 groups=('gnome-extra')
 options=('!emptydirs' '!libtool')
 url="http://www.gnome.org"
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('97e40b0e0b618a53dffa83e30ff9add1563d54356e6ab1d588d510cedbc148d2')
+sha256sums=('96fa5af97baba0bce8dec376d7cd49512768505f473b11b2cf61881f6be8cb60')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/evince/PKGBUILD b/extra/evince/PKGBUILD
index 25e577816..ae1141789 100644
--- a/extra/evince/PKGBUILD
+++ b/extra/evince/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 123362 2011-05-10 16:22:31Z ibiru $
+# $Id: PKGBUILD 124739 2011-05-24 07:25:52Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=evince
-pkgver=3.0.0
-pkgrel=4
+pkgver=3.0.2
+pkgrel=1
 pkgdesc="Simply a document viewer"
 url="http://projects.gnome.org/evince/"
 arch=('i686' 'x86_64')
@@ -17,7 +17,7 @@ install=evince.install
 options=('!libtool' '!emptydirs')
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2
         introspection-fix.patch)
-sha256sums=('7c994a94200114ea7077d3348a03cbbad01c819ece2ec24b436b16e04386291b'
+sha256sums=('03abb74620caaa255f2d1369b684bbf8f62e15a4bf2d9f2a45f58e1789295a97'
             '897b8c77c5cda31f4f8d860cd6a7ad8ad986dbf3cf26b56acf054cc650e94be1')
 
 build() {
diff --git a/extra/evolution-data-server/PKGBUILD b/extra/evolution-data-server/PKGBUILD
index 195be21c6..040385490 100644
--- a/extra/evolution-data-server/PKGBUILD
+++ b/extra/evolution-data-server/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 122571 2011-05-04 16:49:38Z ibiru $
+# $Id: PKGBUILD 124640 2011-05-23 17:24:46Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=evolution-data-server
-pkgver=3.0.1
-pkgrel=2
+pkgver=3.0.2.1
+pkgrel=1
 pkgdesc="Central location for addressbook and calendar storage in the GNOME Desktop"
 arch=('i686' 'x86_64')
 depends=('libsoup' 'nss' 'libgnome-keyring' 'krb5' 'libgweather' 'libical' 'db' 'libgdata')
@@ -12,7 +12,7 @@ options=('!libtool')
 url="http://www.gnome.org"
 license=('GPL')
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/3.0/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('8592be94027a9848ac18670a0e86e48e857539cd2813eb345eda0ace19688dd0')
+sha256sums=('1b14c57a835745ee2c0141a76a07d44688dfb2d758bf3b818fe1860b59451f9b')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/evolution-exchange/PKGBUILD b/extra/evolution-exchange/PKGBUILD
index 963b54508..c494c1fba 100644
--- a/extra/evolution-exchange/PKGBUILD
+++ b/extra/evolution-exchange/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 122586 2011-05-04 18:25:32Z ibiru $
+# $Id: PKGBUILD 124646 2011-05-23 18:11:32Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=evolution-exchange
-pkgver=3.0.1
-pkgrel=2
+pkgver=3.0.2
+pkgrel=1
 pkgdesc="Ximian Connector Exchange plugin for Evolution"
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -13,7 +13,7 @@ makedepends=('intltool' 'evolution')
 options=('!libtool' '!emptydirs')
 install=evolution-exchange.install
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('4c020f7946f534e3245806f29f48dbc9ccb98afdbc92d7bb5b14a5410668ad02')
+sha256sums=('84f5c638aee1f6ed49de0d0f331d3b29907f7b211bd6c70f37698dedcd3e5f5a')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/evolution/PKGBUILD b/extra/evolution/PKGBUILD
index 3b5e8544c..0c91802b7 100644
--- a/extra/evolution/PKGBUILD
+++ b/extra/evolution/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 120599 2011-04-25 17:55:43Z ibiru $
+# $Id: PKGBUILD 124643 2011-05-23 17:54:16Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=evolution
-pkgver=3.0.1
+pkgver=3.0.2
 pkgrel=1
 pkgdesc="Integrated Workgroup and Personal Information Management for Gnome"
 arch=('i686' 'x86_64')
@@ -17,7 +17,7 @@ options=('!libtool' '!emptydirs')
 install=evolution.install
 url=http://www.gnome.org/projects/evolution/
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('d322241c38ece00e2ee7adf0c4d0583dc811c52d5a176ef93427b9b35c04487b')
+sha256sums=('6fdf6a39a89bb04c406225984e5b730e86a370024f30ef9cf019840be9fbe59a')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/file-roller/PKGBUILD b/extra/file-roller/PKGBUILD
index 6e1179620..5d7d1c2ec 100644
--- a/extra/file-roller/PKGBUILD
+++ b/extra/file-roller/PKGBUILD
@@ -1,16 +1,15 @@
-# $Id: PKGBUILD 122038 2011-05-01 20:05:25Z ibiru $
+# $Id: PKGBUILD 124730 2011-05-24 07:10:29Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=file-roller
-pkgver=3.0.1
-pkgrel=2
+pkgver=3.0.2
+pkgrel=1
 pkgdesc="Archive manipulator for GNOME"
 arch=('i686' 'x86_64')
 license=('GPL')
 depends=('desktop-file-utils' 'gtk3' 'hicolor-icon-theme' 'dconf' 'nautilus')
 makedepends=('intltool' 'gnome-doc-utils' 'pkg-config' 'nautilus' 'libsm')
-optdepends=('nautilus: nautilus shell extension'
-            'unrar: the RAR uncompression program'
+optdepends=('unrar: the RAR uncompression program'
             'zip: creates PKZIP-compatible .zip files'
             'unzip: unpacks .zip archives'
             'p7zip: 7zip compression utility'
@@ -22,7 +21,7 @@ options=('!libtool' '!emptydirs')
 install=file-roller.install
 url="http://www.gnome.org"
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('805f5fb77fa8c2f982a2cee0db1b56fbc335f63a1eed34e0bac228ce8349d3ce')
+sha256sums=('a612f05c44f82328175ddca1b4a1da214d9c305797370b78435f490b250af3d1')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/gdl/PKGBUILD b/extra/gdl/PKGBUILD
index b486d3c7f..a20a92c9b 100644
--- a/extra/gdl/PKGBUILD
+++ b/extra/gdl/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 120644 2011-04-25 20:32:25Z ibiru $
+# $Id: PKGBUILD 124671 2011-05-23 20:42:08Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gdl
-pkgver=3.0.1
+pkgver=3.0.2
 pkgrel=1
 pkgdesc="GNOME Docking Library"
 arch=(i686 x86_64)
@@ -12,7 +12,7 @@ depends=('gtk3')
 makedepends=('pkgconfig' 'intltool' 'gobject-introspection')
 options=('!libtool')
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('e0c3d855c7f8b115ec10f34db1291cb09db48a24281c3f9242d8348b189d5b09')
+sha256sums=('b4a0e7539a1133afca1b370818373fb8dcf29b50f12edbfaf6c1d5560977a308')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/gdm/PKGBUILD b/extra/gdm/PKGBUILD
index 2248f184d..a5768c9ec 100644
--- a/extra/gdm/PKGBUILD
+++ b/extra/gdm/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 119944 2011-04-17 09:10:01Z ibiru $
+# $Id: PKGBUILD 124668 2011-05-23 20:39:21Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 pkgname=gdm
-pkgver=3.0.0
-pkgrel=3
+pkgver=3.0.2
+pkgrel=1
 pkgdesc="Gnome Display Manager (a reimplementation of xdm)"
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -10,7 +10,7 @@ url="http://www.gnome.org"
 backup=('etc/pam.d/gdm' 'etc/pam.d/gdm-autologin' 'etc/gdm/custom.conf')
 groups=('gnome-extra')
 options=('!libtool')
-depends=('libcanberra' 'libxklavier' 'tcp_wrappers' 'gnome-session' 'upower' 'accountsservice' 'consolekit')
+depends=('libcanberra' 'libxklavier' 'tcp_wrappers' 'gnome-session' 'upower' 'accountsservice' 'consolekit' 'xorg-xrdb')
 makedepends=('intltool' 'gnome-doc-utils' 'xorg-server')
 conflicts=('fast-user-switch-applet')
 replaces=('fast-user-switch-applet')
@@ -20,24 +20,19 @@ source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname
         gdm-vt-allocation-hack.patch
         gdm.pam
         gdm-autologin.pam
-        gdm
-        fix_crasher_with_gtk307.patch)
-sha256sums=('2d6443912272c0aa339a06b58d797cc11ce6b0854dadfcc027408f546da7aeff'
+        gdm)
+sha256sums=('3e0d44d551230c02a00ce27e4d98a5ebd54aac81520949076ad3111658eb2a05'
             '92c5eb913b9556cffe9b5bb89e5c3435703e929addfb98145442f58af5d532c1'
             '3c8b588d4af08d94dc93bcd5e4c2a983c3f4fbbbe40833bceac2a1df4f1e8215'
             'f1dfa4d88288d4b0a631a68a51b46c2da537bee8fe5a99f9f288c8ff75a50b19'
             '3daff680ff6b7ea56f84f40843e46e72477c81e9e405028203c942af04d07ae5'
-            '272c08d8e8b50bf424d0705ac864d4c18c47ec4f6893b1af732c2efbc86c9550'
-            '6d08951919dcb1f928dd67c0b5a5c209b32464c2374ee7d2369ed8e914d541c9')
+            '272c08d8e8b50bf424d0705ac864d4c18c47ec4f6893b1af732c2efbc86c9550')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   patch -Np1 -i "${srcdir}/2.91_fix_external_program_directories.patch"
   patch -Np1 -i "${srcdir}/gdm-vt-allocation-hack.patch"
 
-  #https://bugzilla.gnome.org/show_bug.cgi?id=646498
-  patch -Np1 -i "${srcdir}/fix_crasher_with_gtk307.patch"
-
   ./configure --prefix=/usr --sysconfdir=/etc \
       --libexecdir=/usr/lib/gdm --localstatedir=/var --disable-static \
       --with-at-spi-registryd-directory=/usr/lib/at-spi \
diff --git a/extra/gedit/PKGBUILD b/extra/gedit/PKGBUILD
index de4b341b8..abd545ac3 100644
--- a/extra/gedit/PKGBUILD
+++ b/extra/gedit/PKGBUILD
@@ -1,21 +1,20 @@
-# $Id: PKGBUILD 120727 2011-04-26 07:34:29Z ibiru $
+# $Id: PKGBUILD 125557 2011-05-26 17:02:09Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gedit
-pkgver=3.0.2
-pkgrel=1
+pkgver=3.0.3
+pkgrel=2
 pkgdesc="A text editor for GNOME"
 arch=('i686' 'x86_64')
 license=('GPL')
-depends=('gtksourceview3' 'gsettings-desktop-schemas' 'libpeas' 'enchant'
-         'iso-codes' 'libsm' 'desktop-file-utils' 'pygobject')
+depends=('gtksourceview3' 'gsettings-desktop-schemas' 'libpeas' 'enchant' 'iso-codes' 'libsm' 'desktop-file-utils' 'pygobject' 'dconf')
 makedepends=('gnome-doc-utils' 'intltool')
 groups=('gnome-extra')
 options=('!libtool' '!emptydirs')
 url="http://www.gnome.org"
 install=gedit.install
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('a91fcfe321d8d5d8fe5c6c11f3b05389febe396efa2172b5ea6cb79d2f16b2db')
+sha256sums=('16764f0cf17fcd85f9c3f031bb151aa87ef1e727e8d19814a4746d376adca578')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/glib-networking/PKGBUILD b/extra/glib-networking/PKGBUILD
index 356a98037..ca799b5ba 100644
--- a/extra/glib-networking/PKGBUILD
+++ b/extra/glib-networking/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 121199 2011-04-29 10:51:43Z ibiru $
+# $Id: PKGBUILD 124675 2011-05-23 20:43:54Z ibiru $
 # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
 pkgname=glib-networking
-pkgver=2.28.6.1
-pkgrel=2
+pkgver=2.28.7
+pkgrel=1
 pkgdesc="Network-related giomodules for glib"
 arch=('i686' 'x86_64')
 url="http://www.gtk.org/"
@@ -11,8 +11,8 @@ depends=('glib2' 'libproxy' 'gnutls' 'ca-certificates' 'gsettings-desktop-schema
 makedepends=('intltool')
 options=('!libtool')
 install=glib-networking.install
-source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*.*}/$pkgname-${pkgver}.tar.bz2)
-sha256sums=('50f9aac36ce49b0e16f84a9f516cf59d0a1f9b3199634787fd9db7470ab6c65b')
+source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-${pkgver}.tar.bz2)
+sha256sums=('98bedfbd530c4b1b53c91025fe82290bafd289d249e4eb549c3b90d23a76021c')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/gnome-control-center/PKGBUILD b/extra/gnome-control-center/PKGBUILD
index 1031b6b1d..c75fc2c4a 100644
--- a/extra/gnome-control-center/PKGBUILD
+++ b/extra/gnome-control-center/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 122550 2011-05-04 14:36:21Z stephane $
+# $Id: PKGBUILD 124765 2011-05-24 09:14:06Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gnome-control-center
-pkgver=3.0.1.1
-pkgrel=2
+pkgver=3.0.2
+pkgrel=1
 pkgdesc="The Control Center for GNOME"
 arch=('i686' 'x86_64')
 depends=('gtk3' 'gsettings-desktop-schemas' 'gnome-menus' 'gnome-desktop' 'gnome-settings-daemon' 'upower' 'libgtop' 'cups-pk-helper' 'accountsservice' 'sound-theme-freedesktop' 'krb5')
@@ -15,8 +15,8 @@ groups=('gnome')
 install=gnome-control-center.install
 license=('GPL')
 options=('!libtool' '!emptydirs')
-source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/3.0/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('b191991d3932b363154e6cf2b5055bc711272065397daee2163b6fb04402ad79')
+source=(http://download.gnome.org/sources/${pkgname}/3.0/${pkgname}-${pkgver}.tar.bz2)
+sha256sums=('477b09a060a75e3664bd9cc9aac6b780067e50198217e3e11dc64980e3414896')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/gnome-desktop/PKGBUILD b/extra/gnome-desktop/PKGBUILD
index 78ff8869b..65002fb58 100644
--- a/extra/gnome-desktop/PKGBUILD
+++ b/extra/gnome-desktop/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 123357 2011-05-10 15:51:14Z ibiru $
+# $Id: PKGBUILD 124748 2011-05-24 07:38:40Z ibiru $
 # Maintainer:  Jan de Groot <jan@archlinux.org>
 
 pkgname=gnome-desktop
-pkgver=3.0.1
-pkgrel=2
+pkgver=3.0.2
+pkgrel=1
 pkgdesc="Library with common API for various GNOME modules"
 arch=('i686' 'x86_64')
 license=('GPL' 'LGPL')
@@ -12,16 +12,12 @@ makedepends=('gnome-doc-utils' 'intltool' 'gobject-introspection')
 url="http://www.gnome.org"
 groups=('gnome')
 options=('!libtool')
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2
-        randr-fix.patch)
-sha256sums=('6d5e140a0d5f9bc131caff505bc4a2afa11e1839437f7fc3da73238b37a3f0a3'
-            '815a36c39d07eea48cb836bf25389c7057605239cb30b425d6c98763aeee4b89')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
+sha256sums=('0ac9b4a358c6d92d20283cf56a9817262ff3ce038013cbb5d98e4ab97aa2c9a3')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
-  patch -Np1 -i "${srcdir}/randr-fix.patch"
-
   ./configure --prefix=/usr --sysconfdir=/etc \
       --localstatedir=/var --disable-static \
       --with-gnome-distributor="Arch Linux" \
diff --git a/extra/gnome-games/PKGBUILD b/extra/gnome-games/PKGBUILD
index 0864fb792..853bcfe8a 100644
--- a/extra/gnome-games/PKGBUILD
+++ b/extra/gnome-games/PKGBUILD
@@ -1,13 +1,13 @@
-# $Id: PKGBUILD 120383 2011-04-23 09:47:40Z ibiru $
+# $Id: PKGBUILD 124637 2011-05-23 17:10:50Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gnome-games
-pkgver=3.0.1.1
-pkgrel=2
+pkgver=3.0.2
+pkgrel=1
 pkgdesc="Some Games for GNOME"
 arch=('i686' 'x86_64')
 license=('GPL')
-depends=('libsm' 'gconf' 'guile' 'desktop-file-utils' 'libcanberra' 'clutter-gtk' 'hicolor-icon-theme' 'librsvg' 'seed')
+depends=('libsm' 'gconf' 'guile' 'desktop-file-utils' 'libcanberra' 'clutter-gtk' 'hicolor-icon-theme' 'librsvg' 'seed' 'pygobject')
 makedepends=('gnome-doc-utils' 'intltool' 'gobject-introspection')
 provides=('glchess')
 conflicts=('glchess')
@@ -15,8 +15,8 @@ options=('!emptydirs' '!libtool')
 install=gnome-games.install
 url="http://www.gnome.org"
 groups=('gnome-extra')
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*.*}/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('dbbda8aa6960e36acff7537e49e033fc8037e6b3b3aa52d5f066cb67b34b4319')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
+sha256sums=('1b731d691806d89d411a6bfaaca05a441555adee2760b97bb80fb5ded8326cb1')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -38,4 +38,6 @@ package() {
   install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
   gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain gnome-games ${pkgdir}/etc/gconf/schemas/*.schemas
   rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
+
+  sed -i 's_#! /usr/bin/env python_#!/usr/bin/env python2_' ${pkgdir}/usr/bin/gnome-sudoku
 }
diff --git a/extra/gnome-keyring/PKGBUILD b/extra/gnome-keyring/PKGBUILD
index f627a10f2..c8f1a1157 100644
--- a/extra/gnome-keyring/PKGBUILD
+++ b/extra/gnome-keyring/PKGBUILD
@@ -1,8 +1,8 @@
-#$Id: PKGBUILD 124399 2011-05-20 14:09:17Z heftig $
+#$Id: PKGBUILD 125542 2011-05-26 16:38:57Z ibiru $
 # Maintainer: Jan De Groot <jgc@archlinux.org>
 
 pkgname=gnome-keyring
-pkgver=3.0.2
+pkgver=3.0.3
 pkgrel=1
 pkgdesc="GNOME Password Management daemon"
 arch=(i686 x86_64)
@@ -10,11 +10,11 @@ license=('GPL' 'LGPL')
 depends=('gtk3' 'dconf')
 makedepends=('intltool' 'pkgconfig' 'python2')
 groups=('gnome')
-options=('!libtool' '!emptydirs' '!makeflags')
+options=('!libtool' '!emptydirs')
 url="http://www.gnome.org"
 install=gnome-keyring.install
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('ed834e5a6d87fe8a90c7c79153af3d8979740d5f8eacad6a8991ef147c924af7')
+sha256sums=('a06c34e474d93da62bf96a816e58cb5730e181d6523730f041f34c58a0d5e94e')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/gnome-panel/PKGBUILD b/extra/gnome-panel/PKGBUILD
index 43867ad01..2ecec8404 100644
--- a/extra/gnome-panel/PKGBUILD
+++ b/extra/gnome-panel/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 119512 2011-04-11 20:09:24Z ibiru $
+# $Id: PKGBUILD 124734 2011-05-24 07:14:49Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gnome-panel
-pkgver=3.0.0.1
-pkgrel=3
+pkgver=3.0.2
+pkgrel=1
 arch=('i686' 'x86_64')
 license=('GPL')
 pkgdesc="The GNOME Panel"
@@ -15,14 +15,11 @@ groups=('gnome')
 replaces=('gnome-panel-bonobo')
 provides=("gnome-panel-bonobo=${pkgver}")
 options=('!libtool' '!emptydirs')
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*.*}/${pkgname}-${pkgver}.tar.bz2
-        fix-crasher-launchers.patch)
-sha256sums=('2014225215afc8a8a4363481c26f9a9443d3dfc944aa7bcb0c5224f723c0b98b'
-            '6724690bb2943f50ab296af6f1e1a7c10a91415ba150586b5623f20cc214ace0')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
+sha256sums=('25db8ec026c4bf47f0ef5cc7e2712f2aad175bd7fb8e4952ef5f8b200f17f196')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i "${srcdir}/fix-crasher-launchers.patch"
   PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \
       --localstatedir=/var --disable-static \
       --libexecdir=/usr/lib/gnome-panel \
diff --git a/extra/gnome-power-manager/PKGBUILD b/extra/gnome-power-manager/PKGBUILD
index 69d61bd5f..e731c944b 100644
--- a/extra/gnome-power-manager/PKGBUILD
+++ b/extra/gnome-power-manager/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 117756 2011-04-04 17:41:50Z heftig $
+# $Id: PKGBUILD 124602 2011-05-23 10:33:56Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gnome-power-manager
-pkgver=3.0.0
+pkgver=3.0.2
 pkgrel=1
 pkgdesc="Session daemon that makes it easy to manage your laptop or desktop system."
 arch=(i686 x86_64)
@@ -13,9 +13,9 @@ depends=('libnotify' 'gconf' 'libcanberra' 'gnome-icon-theme' 'upower'
 makedepends=('intltool' 'gnome-doc-utils' 'gnome-control-center')
 options=(!emptydirs)
 install=gnome-power-manager.install
-groups=(gnome-extra)
+groups=(gnome)
 source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('20d8c147a50eef534e81edb033648e5e9cf7a3f733e80c5d6c946b571f7ae4e1')
+sha256sums=('d0e00fdcfbc3bfb709f9ed82a14de325c51cf0bb86eeacefcda2dd7fcf6cbc2b')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/gnome-session/PKGBUILD b/extra/gnome-session/PKGBUILD
index 035aaac79..aefd90ecd 100644
--- a/extra/gnome-session/PKGBUILD
+++ b/extra/gnome-session/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 120864 2011-04-26 21:44:03Z ibiru $
+# $Id: PKGBUILD 124745 2011-05-24 07:33:54Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gnome-session
-pkgver=3.0.1
+pkgver=3.0.2
 pkgrel=1
 pkgdesc="The GNOME Session Handler"
 arch=(i686 x86_64)
@@ -15,7 +15,7 @@ install=gnome-session.install
 url="http://www.gnome.org"
 groups=('gnome')
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('8a553569d500e84e5815e5b0b2eb1ac1bf4064ef9afb0e16f28d948978efbd25')
+sha256sums=('4801a0cfdf351a1184780cc1c2bdd5cea6cd1ad31505d5fa8de4e56aa766ab96')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/gnome-settings-daemon/PKGBUILD b/extra/gnome-settings-daemon/PKGBUILD
index 06f71588b..25433294c 100644
--- a/extra/gnome-settings-daemon/PKGBUILD
+++ b/extra/gnome-settings-daemon/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 122583 2011-05-04 18:20:31Z ibiru $
+# $Id: PKGBUILD 124605 2011-05-23 10:48:57Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gnome-settings-daemon
-pkgver=3.0.1
-pkgrel=2
+pkgver=3.0.2
+pkgrel=1
 pkgdesc="The GNOME Settings daemon"
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -18,7 +18,7 @@ groups=('gnome')
 replaces=(gnome-settings-daemon-pulse)
 conflicts=(gnome-settings-daemon-pulse)
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('51cdd0842b907e95c79d4e2b26f554e26fc626f7c2e6c3a14e3fc7954ca91117')
+sha256sums=('f304aa54c59ab23f7ef55bfeefeecfd6f7a95cabbeed2ea802c94463d4234eec')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/gnome-shell/PKGBUILD b/extra/gnome-shell/PKGBUILD
index 34974115f..0c005f56e 100644
--- a/extra/gnome-shell/PKGBUILD
+++ b/extra/gnome-shell/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 123600 2011-05-11 18:16:09Z ibiru $
+# $Id: PKGBUILD 125332 2011-05-25 22:41:23Z ibiru $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Flamelab <panosfilip@gmail.com
 
 pkgname=gnome-shell
-pkgver=3.0.1
-pkgrel=5
+pkgver=3.0.2
+pkgrel=1
 pkgdesc="The next generation GNOME Shell"
 arch=('i686' 'x86_64')
 url="http://live.gnome.org/GnomeShell"
@@ -19,28 +19,19 @@ install=gnome-shell.install
 groups=(gnome)
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2
         arch.patch
-        network_fixes_up_to_5090a4ccce.patch
-        shell-xfixes-cursor_missing_free.patch
-        st-private_fix_memory_leak.patch
-        st-private_correct_fix_memory_leak.patch
-        0001-Don-t-crash-when-removing-nameless-user.patch)
-sha256sums=('01f7ae942ba9687a5e67d62423843ed404d77b35f74acc212a5f391beed8e079'
+        bluetoothstatus-always-update-devices.patch
+        shell-recorder-missing-XFree.patch)
+sha256sums=('a44963877da895d9b9f1ea98617067c5e88a5c4b414c6ccf0fcbfacdeac7db95'
             'a35d5e5f9f781728070aecae3bfe329f49dadcd50ca2984e0fbdd2219825a0db'
-            '01bf41483d5d8935ed2dd6294ee04024f2d9bcb2ef13276b07331e485965c822'
-            'c8b92768c869d0d77595da3466cc0dba3b6f067ea5fac048f32a918bbe98bbf6'
-            '8b80a0cec39c38a47521183a3030a782ab84bb6ea5e9cc58213589245288e718'
-            'c676067fff399a87625187381db5331d82c44f6c14f51d409392851dbbeb5074'
-            '291d1fa51344325e3dabc0c1287750cde98605c30f079ffad9b3523a3aba860d')
+            'f592752875085fceebdb27e65802e09c07edd7be57eec0da3edfcad5052be2ae'
+            '070edd5e720c063be41c158f39b7ef62a0d4a7f547ca0d23216104d5428ff971')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
   patch -Np1 -i "${srcdir}/arch.patch"
-  patch -Np1 -i "${srcdir}/network_fixes_up_to_5090a4ccce.patch"
-  patch -Np1 -i "${srcdir}/shell-xfixes-cursor_missing_free.patch"
-  patch -Np1 -i "${srcdir}/st-private_fix_memory_leak.patch"
-  patch -Np1 -i "${srcdir}/st-private_correct_fix_memory_leak.patch"
-  patch -Np1 -i "${srcdir}/0001-Don-t-crash-when-removing-nameless-user.patch"
+  patch -Np1 -i "${srcdir}/bluetoothstatus-always-update-devices.patch"
+  patch -Np1 -i "${srcdir}/shell-recorder-missing-XFree.patch"
 
   ./configure --prefix=/usr --sysconfdir=/etc \
       --libexecdir=/usr/lib/gnome-shell \
diff --git a/extra/gnome-shell/bluetoothstatus-always-update-devices.patch b/extra/gnome-shell/bluetoothstatus-always-update-devices.patch
new file mode 100644
index 000000000..0272169f5
--- /dev/null
+++ b/extra/gnome-shell/bluetoothstatus-always-update-devices.patch
@@ -0,0 +1,132 @@
+From 76fce94b66be7bdebbedcc3bce62898da51da15a Mon Sep 17 00:00:00 2001
+From: Giovanni Campagna <gcampagna@src.gnome.org>
+Date: Wed, 13 Apr 2011 17:08:45 +0000
+Subject: BluetoothStatus: always update devices
+
+Previously, we skipped rebuilding device items in case the device
+had already been seen, but this caused the connected switch not to
+be updated. Now it has been refactored to update in case the device
+changes, and to create only when the device is completely new.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=647565
+---
+diff --git a/js/ui/status/bluetooth.js b/js/ui/status/bluetooth.js
+index 070016a..cee2f90 100644
+--- a/js/ui/status/bluetooth.js
++++ b/js/ui/status/bluetooth.js
+@@ -127,13 +127,6 @@ Indicator.prototype = {
+         }
+     },
+ 
+-    _deviceCompare: function(d1, d2) {
+-        return d1.device_path == d2.device_path &&
+-            d1.bdaddr == d2.bdaddr &&
+-            d1.can_connect == d2.can_connect &&
+-            d1.capabilities == d2.capabilities;
+-    },
+-
+     _updateDevices: function() {
+         let devices = this._applet.get_devices();
+ 
+@@ -142,12 +135,8 @@ Indicator.prototype = {
+             let item = this._deviceItems[i];
+             let destroy = true;
+             for (let j = 0; j < devices.length; j++) {
+-                // we need to deep compare because BluetoothSimpleDevice is a boxed type
+-                // (but we take advantage of that, because _skip will disappear the next
+-                // time get_devices() is called)
+-                if (this._deviceCompare(item._device, devices[j])) {
+-                    item.label.text = devices[j].alias;
+-                    devices[j]._skip = true;
++                if (item._device.device_path == devices[j].device_path) {
++                    this._updateDeviceItem(item, devices[j]);
+                     destroy = false;
+                     break;
+                 }
+@@ -162,7 +151,7 @@ Indicator.prototype = {
+         this._hasDevices = newlist.length > 0;
+         for (let i = 0; i < devices.length; i++) {
+             let d = devices[i];
+-            if (d._skip)
++            if (d._item)
+                 continue;
+             let item = this._createDeviceItem(d);
+             if (item) {
+@@ -177,17 +166,55 @@ Indicator.prototype = {
+             this._deviceSep.actor.hide();
+     },
+ 
++    _updateDeviceItem: function(item, device) {
++        if (!device.can_connect && device.capabilities == GnomeBluetoothApplet.Capabilities.NONE) {
++            item.destroy();
++            return;
++        }
++
++        let prevDevice = item._device;
++        let prevCapabilities = prevDevice.capabilities;
++        let prevCanConnect = prevDevice.can_connect;
++
++        // adopt the new device object
++        item._device = device;
++        device._item = item;
++
++        // update properties
++        item.label.text = device.alias;
++
++        if (prevCapabilities != device.capabilities ||
++            prevCanConnect != device.can_connect) {
++            // need to rebuild the submenu
++            item.menu.removeAll();
++            this._buildDeviceSubMenu(item, device);
++        }
++
++        // update connected property
++        if (device.can_connect)
++            item._connectedMenuitem.setToggleState(device.connected);
++    },
++
+     _createDeviceItem: function(device) {
+         if (!device.can_connect && device.capabilities == GnomeBluetoothApplet.Capabilities.NONE)
+             return null;
+         let item = new PopupMenu.PopupSubMenuMenuItem(device.alias);
++
++        // adopt the device object, and add a back link
+         item._device = device;
++        device._item = item;
+ 
++        this._buildDeviceSubMenu(item, device);
++
++        return item;
++    },
++
++    _buildDeviceSubMenu: function(item, device) {
+         if (device.can_connect) {
+             item._connected = device.connected;
+-            let menuitem = new PopupMenu.PopupSwitchMenuItem(_("Connection"), device.connected);
++            item._connectedMenuitem = new PopupMenu.PopupSwitchMenuItem(_("Connection"), device.connected);
+ 
+-            menuitem.connect('toggled', Lang.bind(this, function() {
++            item._connectedMenuitem.connect('toggled', Lang.bind(this, function() {
+                 if (item._connected > ConnectionState.CONNECTED) {
+                     // operation already in progress, revert
+                     menuitem.setToggleState(menuitem.state);
+@@ -217,7 +244,7 @@ Indicator.prototype = {
+                 }
+             }));
+ 
+-            item.menu.addMenuItem(menuitem);
++            item.menu.addMenuItem(item._connectedMenuitem);
+         }
+ 
+         if (device.capabilities & GnomeBluetoothApplet.Capabilities.OBEX_PUSH) {
+@@ -263,8 +290,6 @@ Indicator.prototype = {
+         default:
+             break;
+         }
+-
+-        return item;
+     },
+ 
+     _updateFullMenu: function() {
+--
+cgit v0.9
diff --git a/extra/gnome-shell/shell-recorder-missing-XFree.patch b/extra/gnome-shell/shell-recorder-missing-XFree.patch
new file mode 100644
index 000000000..a7329166f
--- /dev/null
+++ b/extra/gnome-shell/shell-recorder-missing-XFree.patch
@@ -0,0 +1,22 @@
+From 88df18345069c295e68d319606a11b7727b2bd4b Mon Sep 17 00:00:00 2001
+From: Maxim Ermilov <zaspire@rambler.ru>
+Date: Tue, 24 May 2011 22:46:47 +0000
+Subject: shell-recorder: missing XFree
+
+https://bugzilla.gnome.org/show_bug.cgi?id=650934
+---
+diff --git a/src/shell-recorder.c b/src/shell-recorder.c
+index 6555187..d297923 100644
+--- a/src/shell-recorder.c
++++ b/src/shell-recorder.c
+@@ -412,6 +412,8 @@ recorder_fetch_cursor_image (ShellRecorder *recorder)
+       *(guint32 *)(data + i * stride + 4 * j) = cursor_image->pixels[i * cursor_image->width + j];
+ 
+   cairo_surface_mark_dirty (recorder->cursor_image);
++
++  XFree (cursor_image);
+ }
+ 
+ /* Overlay the cursor image on the frame. We draw the cursor image
+--
+cgit v0.9
diff --git a/extra/gnome-system-monitor/PKGBUILD b/extra/gnome-system-monitor/PKGBUILD
index 937761272..c25d0b22b 100644
--- a/extra/gnome-system-monitor/PKGBUILD
+++ b/extra/gnome-system-monitor/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 117833 2011-04-04 18:12:02Z heftig $
+# $Id: PKGBUILD 124753 2011-05-24 07:53:49Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gnome-system-monitor
-pkgver=3.0.0
+pkgver=3.0.1
 pkgrel=1
 pkgdesc="A system monitor for GNOME"
 arch=(i686 x86_64)
@@ -14,7 +14,7 @@ url="http://www.gnome.org"
 groups=('gnome-extra')
 install=gnome-system-monitor.install
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('8d4b695ec165645c3d070f3296dc25cea4e3f1f4da7b4afa10ff1c166cc62d24')
+sha256sums=('0fe6a263875b23a35fd17d8952e666e17801cb68bb664d6ce8cabcfd9ac0f972')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/gnome-themes-standard/PKGBUILD b/extra/gnome-themes-standard/PKGBUILD
index 0bc006cf1..12b8c7d90 100644
--- a/extra/gnome-themes-standard/PKGBUILD
+++ b/extra/gnome-themes-standard/PKGBUILD
@@ -1,7 +1,7 @@
-# $Id: PKGBUILD 120589 2011-04-25 17:43:37Z ibiru $
+# $Id: PKGBUILD 124628 2011-05-23 14:48:53Z ibiru $
 # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
 pkgname=gnome-themes-standard
-pkgver=3.0.1
+pkgver=3.0.2
 pkgrel=1
 pkgdesc="Default themes for the GNOME desktop"
 arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ groups=('gnome')
 replaces=('gnome-themes')
 conflicts=('gnome-themes')
 source=(http://download.gnome.org/sources/$pkgname/3.0/$pkgname-${pkgver}.tar.bz2)
-sha256sums=('9630b12c02d8a05a328cb0bef111bb776b86639c9c582475943f71666ab82677')
+sha256sums=('1def884063aa441860e20dd9925bb7c3b6f917bae44f77b1ada999940c463809')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/gtk3/PKGBUILD b/extra/gtk3/PKGBUILD
index 5550647fc..4cff80b52 100644
--- a/extra/gtk3/PKGBUILD
+++ b/extra/gtk3/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 122547 2011-05-04 14:30:27Z stephane $
+# $Id: PKGBUILD 125375 2011-05-26 12:54:23Z ibiru $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=gtk3
-pkgver=3.0.9
+pkgver=3.0.10
 pkgrel=2
 pkgdesc="The GTK+ Toolkit (v3)"
 arch=('i686' 'x86_64')
@@ -14,12 +14,15 @@ options=('!libtool' '!docs')
 backup=(etc/gtk-3.0/settings.ini)
 license=('LGPL')
 source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/3.0/gtk+-${pkgver}.tar.bz2
-        settings.ini)
-sha256sums=('88a9dda6f2a23155ac3d7aca6b414ca3b55e2817b46bcc87733f1a407e16678c'
-            'c214d3dcdcadda3d642112287524ab3e526ad592b70895c9f3e3733c23701621')
+        settings.ini
+        only_draw_resize_grip_if_its_window_exists.patch)
+sha256sums=('a217ed31aed9843810eabb241239e0f2c5ca0e14bd91687cf4180b3e346abc30'
+            'c214d3dcdcadda3d642112287524ab3e526ad592b70895c9f3e3733c23701621'
+            'fa2bd8085cae6cdb4f3b8baae11d3c0b38afec2eb4503f5bacabf87aee15313a')
 
 build() {
     cd "${srcdir}/gtk+-${pkgver}"
+    patch -Np1 -i "${srcdir}/only_draw_resize_grip_if_its_window_exists.patch"
     CXX=/bin/false ./configure --prefix=/usr \
         --sysconfdir=/etc \
         --localstatedir=/var \
diff --git a/extra/gtk3/only_draw_resize_grip_if_its_window_exists.patch b/extra/gtk3/only_draw_resize_grip_if_its_window_exists.patch
new file mode 100644
index 000000000..a6514b550
--- /dev/null
+++ b/extra/gtk3/only_draw_resize_grip_if_its_window_exists.patch
@@ -0,0 +1,28 @@
+From 847df205ede7f624c2bc4c4498495352cc865423 Mon Sep 17 00:00:00 2001
+From: Benjamin Otte <otte@redhat.com>
+Date: Mon, 23 May 2011 13:46:59 +0000
+Subject: window: Only draw resize grip if its window exists
+
+Don't rely on priv->resize_grip_visible as the code comment in the
+variable declaration indicates.
+This fixes warnings with GtkPlug, which can cause resize_grip_visible to
+be TRUE but grid_window to be NULL - running tests/teststatusicon
+reproduces this.
+
+This broke with 0cf31b35eb10cb5bc08048ecdc141c949efec4cc
+---
+diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
+index b97418a..b1caa9b 100644
+--- a/gtk/gtkwindow.c
++++ b/gtk/gtkwindow.c
+@@ -7304,7 +7304,7 @@ gtk_window_draw (GtkWidget *widget,
+   if (GTK_WIDGET_CLASS (gtk_window_parent_class)->draw)
+     ret = GTK_WIDGET_CLASS (gtk_window_parent_class)->draw (widget, cr);
+ 
+-  if (priv->resize_grip_visible &&
++  if (priv->grip_window &&
+       gtk_cairo_should_draw_window (cr, priv->grip_window))
+     {
+       GdkRectangle rect;
+--
+cgit v0.9
diff --git a/extra/gtksourceview3/PKGBUILD b/extra/gtksourceview3/PKGBUILD
index fb98d197d..eec9417b7 100644
--- a/extra/gtksourceview3/PKGBUILD
+++ b/extra/gtksourceview3/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 120698 2011-04-25 23:34:40Z ibiru $
+# $Id: PKGBUILD 125532 2011-05-26 16:26:30Z ibiru $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=gtksourceview3
 _pkgbasename=gtksourceview
-pkgver=3.0.1
+pkgver=3.0.3
 pkgrel=1
 pkgdesc="A text widget adding syntax highlighting and more to GNOME"
 arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ makedepends=('intltool' 'pkgconfig' 'gobject-introspection')
 options=('!libtool')
 url="http://www.gnome.org"
 source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgbasename/${pkgver%.*}/$_pkgbasename-${pkgver}.tar.bz2)
-sha256sums=('4e76f037184d56767e09df909490f10ee417a5265febae8a4d23255a902ae20a')
+sha256sums=('582765d4ff9ec2141eaaa96d52596bee71af798bf5bc1e5fed686c60331b6de7')
 
 build() {
   cd "${srcdir}/$_pkgbasename-${pkgver}"
diff --git a/extra/gvfs/PKGBUILD b/extra/gvfs/PKGBUILD
index 2d2f0d321..7169a5364 100644
--- a/extra/gvfs/PKGBUILD
+++ b/extra/gvfs/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 120775 2011-04-26 14:51:23Z ibiru $
+# $Id: PKGBUILD 124634 2011-05-23 15:36:42Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=gvfs
 pkgname=('gvfs' 'gvfs-smb' 'gvfs-afc' 'gvfs-gphoto2' 'gvfs-obexftp')
-pkgver=1.8.1
+pkgver=1.8.2
 pkgrel=1
 arch=('i686' 'x86_64')
 license=('LGPL')
@@ -13,7 +13,7 @@ makedepends=('libsoup-gnome' 'libcdio' 'fuse' 'bluez' 'smbclient' 'libgphoto2'
 url="http://www.gnome.org"
 options=(!libtool)
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgbase}/${pkgver%.*}/${pkgbase}-${pkgver}.tar.bz2)
-sha256sums=('7d305320d881d914d88286a72a311587ea33fbe5075101729cb5766f01832ff7')
+sha256sums=('0895ac8f6d416e1b15433b6b6b68eb119c6e8b04fdb66db665d684355ef89345')
 
 build() {
   cd "${srcdir}/${pkgbase}-${pkgver}"
diff --git a/extra/inkscape/PKGBUILD b/extra/inkscape/PKGBUILD
index 888adcdfc..6a5ad62fd 100644
--- a/extra/inkscape/PKGBUILD
+++ b/extra/inkscape/PKGBUILD
@@ -1,10 +1,11 @@
-# $Id: PKGBUILD 114609 2011-03-14 15:02:27Z jgc $
-# Maintainer: tobias <tobias@archlinux.org>
+# $Id: PKGBUILD 125606 2011-05-26 21:06:33Z bisson $
+# Contributor: tobias <tobias@archlinux.org>
 # Contributor: Tobias Kieslich <tobias@justdreams.de>
+# Maintainer: Gaetan Bisson <bisson@archlinux.org>
 
 pkgname=inkscape
 pkgver=0.48.1
-pkgrel=2
+pkgrel=3
 pkgdesc='Vector graphics editor using the SVG file format'
 url='http://inkscape.sourceforge.net/'
 arch=('i686' 'x86_64')
@@ -13,33 +14,40 @@ makedepends=('boost' 'pkg-config' 'intltool')
 depends=('gc' 'gtkmm' 'poppler-glib' 'pyxml' 'libxslt' 'gsl' 'popt' 'python2'
          'gtkspell' 'imagemagick' 'desktop-file-utils' 'hicolor-icon-theme')
 optdepends=('python2-numpy: some extensions'
-            'python-lxml: some extensions and filters')
+            'python-lxml: some extensions and filters'
+            'uniconvertor: reading/writing to some proprietary formats')
 options=('!libtool')
-install=inkscape.install
-source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz")
-sha1sums=('a43467119925aee70d1d63d746f9846abb4dea91')
+source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz"
+        'gcc46.patch')
+sha1sums=('a43467119925aee70d1d63d746f9846abb4dea91'
+          '7163f35978538a6e223005737e8707b6f847fab3')
+
+install=install
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr \
-    --with-python \
-    --with-perl \
-    --without-gnome-vfs \
-    --with-xft \
-    --enable-lcms \
-    --enable-poppler-cairo \
-    --disable-dependency-tracking
-
-  sed -i 's|/usr/bin/python\>|/usr/bin/python2|g' cxxtest/*.py
-  sed -i 's|/usr/bin/env python\>|/usr/bin/env python2|g' share/*/{test/,}*.py
-  sed -i 's|"python" },|"python2" },|g' src/extension/implementation/script.cpp
-  sed -i 's|\<python -c |python2 -c|g' share/extensions/uniconv*.py
-  sed -i 's|"python"|"python2"|g' src/main.cpp
-
-  make
+	cd "${srcdir}/${pkgname}-${pkgver}"
+
+	patch -p1 -i ../gcc46.patch
+	sed -i 's|/usr/bin/python\>|/usr/bin/python2|g' cxxtest/*.py
+	sed -i 's|/usr/bin/env python\>|/usr/bin/env python2|g' share/*/{test/,}*.py
+	sed -i 's|"python" },|"python2" },|g' src/extension/implementation/script.cpp
+	sed -i 's|python -c|python2 -c|g' configure share/extensions/uniconv*.py
+	sed -i 's|"python"|"python2"|g' src/main.cpp
+
+	./configure --prefix=/usr \
+		--with-python \
+		--with-perl \
+		--without-gnome-vfs \
+		--with-xft \
+		--enable-lcms \
+		--enable-poppler-cairo \
+		--disable-dependency-tracking \
+
+	make
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
+	cd "${srcdir}/${pkgname}-${pkgver}"
+
+	make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/inkscape/gcc46.patch b/extra/inkscape/gcc46.patch
new file mode 100644
index 000000000..d04914c87
--- /dev/null
+++ b/extra/inkscape/gcc46.patch
@@ -0,0 +1,849 @@
+diff -aur old/src/2geom/utils.h new/src/2geom/utils.h
+--- old/src/2geom/utils.h	2010-07-13 03:48:40.691600000 +0000
++++ new/src/2geom/utils.h	2011-05-26 14:38:55.912288964 +0000
+@@ -35,6 +35,7 @@
+ 
+ #include <cmath>
+ #include <vector>
++#include <cstddef>
+ 
+ namespace Geom {
+ 
+diff -aur old/src/arc-context.h new/src/arc-context.h
+--- old/src/arc-context.h	2010-07-13 03:48:40.691600000 +0000
++++ new/src/arc-context.h	2011-05-26 14:37:30.814792031 +0000
+@@ -15,6 +15,7 @@
+  * Released under GNU GPL, read the file 'COPYING' for more information
+  */
+ 
++#include <stddef.h>
+ #include <sigc++/connection.h>
+ 
+ #include <2geom/point.h>
+diff -aur old/src/box3d-context.h new/src/box3d-context.h
+--- old/src/box3d-context.h	2010-07-13 03:48:40.691600000 +0000
++++ new/src/box3d-context.h	2011-05-26 14:37:30.814792031 +0000
+@@ -15,6 +15,7 @@
+  * Released under GNU GPL
+  */
+ 
++#include <stddef.h>
+ #include <sigc++/sigc++.h>
+ #include "event-context.h"
+ #include "proj_pt.h"
+diff -aur old/src/conn-avoid-ref.h new/src/conn-avoid-ref.h
+--- old/src/conn-avoid-ref.h	2010-07-13 03:48:40.691600000 +0000
++++ new/src/conn-avoid-ref.h	2011-05-26 14:37:30.814792031 +0000
+@@ -14,6 +14,7 @@
+  */
+ 
+ #include <glib/gslist.h>
++#include <stddef.h>
+ #include <sigc++/connection.h>
+ 
+ struct SPDesktop;
+diff -aur old/src/connection-pool.h new/src/connection-pool.h
+--- old/src/connection-pool.h	2010-07-13 03:48:40.691600000 +0000
++++ new/src/connection-pool.h	2011-05-26 14:37:30.814792031 +0000
+@@ -3,6 +3,7 @@
+ 
+ #include <glib-object.h>
+ #include <gtkmm.h>
++#include <stddef.h>
+ #include <sigc++/sigc++.h>
+ 
+ namespace Inkscape
+diff -aur old/src/connector-context.h new/src/connector-context.h
+--- old/src/connector-context.h	2010-07-13 03:48:40.691600000 +0000
++++ new/src/connector-context.h	2011-05-26 14:37:30.814792120 +0000
+@@ -12,6 +12,7 @@
+  * Released under GNU GPL, read the file 'COPYING' for more information
+  */
+ 
++#include <stddef.h>
+ #include <sigc++/sigc++.h>
+ #include <sigc++/connection.h>
+ #include "event-context.h"
+diff -aur old/src/desktop.h new/src/desktop.h
+--- old/src/desktop.h	2010-07-13 03:48:40.691600000 +0000
++++ new/src/desktop.h	2011-05-26 14:37:30.814792120 +0000
+@@ -27,6 +27,7 @@
+ 
+ #include <gdk/gdkevents.h>
+ #include <gtk/gtktypeutils.h>
++#include <stddef.h>
+ #include <sigc++/sigc++.h>
+ 
+ #include <2geom/matrix.h>
+diff -aur old/src/dialogs/object-attributes.cpp new/src/dialogs/object-attributes.cpp
+--- old/src/dialogs/object-attributes.cpp	2010-07-13 03:48:40.691600000 +0000
++++ new/src/dialogs/object-attributes.cpp	2011-05-26 14:37:30.814792120 +0000
+@@ -13,6 +13,7 @@
+ #include <glibmm/i18n.h>
+ #include <string>
+ #include <cstring>
++#include <stddef.h>
+ #include <sigc++/connection.h>
+ #include <sigc++/functors/ptr_fun.h>
+ #include <sigc++/adaptors/bind.h>
+diff -aur old/src/display/canvas-temporary-item.h new/src/display/canvas-temporary-item.h
+--- old/src/display/canvas-temporary-item.h	2010-07-13 03:48:40.691600000 +0000
++++ new/src/display/canvas-temporary-item.h	2011-05-26 14:37:30.814792120 +0000
+@@ -14,6 +14,7 @@
+ 
+ #include "display/display-forward.h"
+ 
++#include <stddef.h>
+ #include <sigc++/sigc++.h>
+ 
+ namespace Inkscape {
+diff -aur old/src/document.h new/src/document.h
+--- old/src/document.h	2010-08-04 16:45:00.868588000 +0000
++++ new/src/document.h	2011-05-26 14:37:30.814792120 +0000
+@@ -17,6 +17,7 @@
+ 
+ #include <glib-object.h>
+ #include <gtk/gtksignal.h>
++#include <stddef.h>
+ #include <sigc++/sigc++.h>
+ #include <sigc++/class_slot.h>
+ 
+diff -aur old/src/document-private.h new/src/document-private.h
+--- old/src/document-private.h	2010-07-13 03:48:40.691600000 +0000
++++ new/src/document-private.h	2011-05-26 14:37:30.814792120 +0000
+@@ -14,6 +14,7 @@
+  */
+ 
+ #include <map>
++#include <stddef.h>
+ #include <sigc++/sigc++.h>
+ #include "xml/event-fns.h"
+ #include "sp-defs.h"
+diff -aur old/src/document-subset.h new/src/document-subset.h
+--- old/src/document-subset.h	2010-07-13 03:48:40.691600000 +0000
++++ new/src/document-subset.h	2011-05-26 14:37:30.814792120 +0000
+@@ -10,6 +10,7 @@
+ #ifndef SEEN_INKSCAPE_DOCUMENT_SUBSET_H
+ #define SEEN_INKSCAPE_DOCUMENT_SUBSET_H
+ 
++#include <stddef.h>
+ #include <sigc++/connection.h>
+ #include <sigc++/functors/slot.h>
+ 
+diff -aur old/src/draw-context.h new/src/draw-context.h
+--- old/src/draw-context.h	2010-07-13 03:48:40.691600000 +0000
++++ new/src/draw-context.h	2011-05-26 14:37:30.814792120 +0000
+@@ -14,6 +14,7 @@
+  * Released under GNU GPL
+  */
+ 
++#include <stddef.h>
+ #include <sigc++/sigc++.h>
+ #include "event-context.h"
+ #include <forward.h>
+diff -aur old/src/extension/timer.h new/src/extension/timer.h
+--- old/src/extension/timer.h	2010-07-13 03:48:40.691600000 +0000
++++ new/src/extension/timer.h	2011-05-26 14:37:30.814792120 +0000
+@@ -13,6 +13,7 @@
+ #ifndef INKSCAPE_EXTENSION_TIMER_H__
+ #define INKSCAPE_EXTENSION_TIMER_H__
+ 
++#include <stddef.h>
+ #include <sigc++/sigc++.h>
+ #include <glibmm/timeval.h>
+ #include "extension-forward.h"
+diff -aur old/src/flood-context.h new/src/flood-context.h
+--- old/src/flood-context.h	2010-07-13 03:48:40.691600000 +0000
++++ new/src/flood-context.h	2011-05-26 14:37:30.814792120 +0000
+@@ -11,6 +11,7 @@
+  * Released under GNU GPL
+  */
+ 
++#include <stddef.h>
+ #include <sigc++/sigc++.h>
+ #include <gtk/gtk.h>
+ #include "event-context.h"
+diff -aur old/src/gc-alloc.h new/src/gc-alloc.h
+--- old/src/gc-alloc.h	2010-07-13 03:48:40.691600000 +0000
++++ new/src/gc-alloc.h	2011-05-26 14:37:30.814792120 +0000
+@@ -16,6 +16,7 @@
+ #define SEEN_INKSCAPE_GC_ALLOC_H
+ 
+ #include <limits>
++#include <cstddef>
+ #include "gc-core.h"
+ 
+ namespace Inkscape {
+diff -aur old/src/gc.cpp new/src/gc.cpp
+--- old/src/gc.cpp	2010-07-13 03:48:40.691600000 +0000
++++ new/src/gc.cpp	2011-05-26 14:37:30.814792120 +0000
+@@ -16,6 +16,7 @@
+ #include <glib/gmessages.h>
+ #include <sigc++/functors/ptr_fun.h>
+ #include <glibmm/main.h>
++#include <cstddef>
+ 
+ namespace Inkscape {
+ namespace GC {
+diff -aur old/src/gc-finalized.h new/src/gc-finalized.h
+--- old/src/gc-finalized.h	2010-07-13 03:48:40.691600000 +0000
++++ new/src/gc-finalized.h	2011-05-26 14:37:30.814792120 +0000
+@@ -17,6 +17,7 @@
+ #define SEEN_INKSCAPE_GC_FINALIZED_H
+ 
+ #include <new>
++#include <cstddef>
+ #include "gc-core.h"
+ 
+ namespace Inkscape {
+diff -aur old/src/gradient-context.h new/src/gradient-context.h
+--- old/src/gradient-context.h	2010-07-13 03:48:40.691600000 +0000
++++ new/src/gradient-context.h	2011-05-26 14:37:30.814792120 +0000
+@@ -15,6 +15,7 @@
+  * Released under GNU GPL
+  */
+ 
++#include <stddef.h>
+ #include <sigc++/sigc++.h>
+ #include "event-context.h"
+ 
+diff -aur old/src/gradient-drag.h new/src/gradient-drag.h
+--- old/src/gradient-drag.h	2010-08-04 16:45:00.868588000 +0000
++++ new/src/gradient-drag.h	2011-05-26 14:37:30.814792120 +0000
+@@ -15,6 +15,7 @@
+  */
+ 
+ #include <glib/gslist.h>
++#include <stddef.h>
+ #include <sigc++/sigc++.h>
+ #include <vector>
+ 
+diff -aur old/src/knot.h new/src/knot.h
+--- old/src/knot.h	2010-07-13 03:48:40.691600000 +0000
++++ new/src/knot.h	2011-05-26 14:37:30.814792120 +0000
+@@ -20,6 +20,7 @@
+ #include "forward.h"
+ #include <2geom/point.h>
+ #include "knot-enums.h"
++#include <stddef.h>
+ #include <sigc++/sigc++.h>
+ 
+ class SPKnot;
+diff -aur old/src/libavoid/geomtypes.h new/src/libavoid/geomtypes.h
+--- old/src/libavoid/geomtypes.h	2010-07-13 03:48:40.691600000 +0000
++++ new/src/libavoid/geomtypes.h	2011-05-26 14:37:30.814792120 +0000
+@@ -29,6 +29,7 @@
+ #ifndef AVOID_GEOMTYPES_H
+ #define AVOID_GEOMTYPES_H
+ 
++#include <cstddef>
+ #include <vector>
+ #include <utility>
+ 
+diff -aur old/src/live_effects/lpeobject-reference.h new/src/live_effects/lpeobject-reference.h
+--- old/src/live_effects/lpeobject-reference.h	2010-07-13 03:48:40.691600000 +0000
++++ new/src/live_effects/lpeobject-reference.h	2011-05-26 14:37:30.818124452 +0000
+@@ -11,6 +11,7 @@
+ 
+ #include <forward.h>
+ #include <uri-references.h>
++#include <stddef.h>
+ #include <sigc++/sigc++.h>
+ 
+ namespace Inkscape {
+diff -aur old/src/live_effects/parameter/path.h new/src/live_effects/parameter/path.h
+--- old/src/live_effects/parameter/path.h	2010-07-13 03:48:40.691600000 +0000
++++ new/src/live_effects/parameter/path.h	2011-05-26 14:37:30.818124452 +0000
+@@ -16,6 +16,7 @@
+ 
+ #include "live_effects/parameter/parameter.h"
+ #include "live_effects/parameter/path-reference.h"
++#include <stddef.h>
+ #include <sigc++/sigc++.h>
+ 
+ namespace Inkscape {
+diff -aur old/src/live_effects/parameter/path-reference.h new/src/live_effects/parameter/path-reference.h
+--- old/src/live_effects/parameter/path-reference.h	2010-07-13 03:48:40.691600000 +0000
++++ new/src/live_effects/parameter/path-reference.h	2011-05-26 14:37:30.818124452 +0000
+@@ -11,6 +11,7 @@
+ 
+ #include <forward.h>
+ #include <uri-references.h>
++#include <stddef.h>
+ #include <sigc++/sigc++.h>
+ 
+ class Path;
+diff -aur old/src/Makefile.am new/src/Makefile.am
+--- old/src/Makefile.am	2010-07-13 03:48:40.691600000 +0000
++++ new/src/Makefile.am	2011-05-26 14:37:30.814792031 +0000
+@@ -205,7 +205,7 @@
+ 
+ inkscape_SOURCES += main.cpp $(win32_sources)
+ inkscape_LDADD = $(all_libs)
+-inkscape_LDFLAGS = --export-dynamic $(kdeldflags) $(mwindows)
++inkscape_LDFLAGS = -Wl,--export-dynamic $(kdeldflags) $(mwindows)
+ 
+ inkview_SOURCES += inkview.cpp $(win32_sources)
+ inkview_LDADD = $(all_libs)
+diff -aur old/src/message-stack.h new/src/message-stack.h
+--- old/src/message-stack.h	2010-07-13 03:48:40.691600000 +0000
++++ new/src/message-stack.h	2011-05-26 14:37:30.818124452 +0000
+@@ -14,6 +14,7 @@
+ #ifndef SEEN_INKSCAPE_MESSAGE_STACK_H
+ #define SEEN_INKSCAPE_MESSAGE_STACK_H
+ 
++#include <stddef.h>
+ #include <sigc++/sigc++.h>
+ #include <glib.h>
+ #include <stdarg.h>
+diff -aur old/src/object-hierarchy.h new/src/object-hierarchy.h
+--- old/src/object-hierarchy.h	2010-07-13 03:48:40.691600000 +0000
++++ new/src/object-hierarchy.h	2011-05-26 14:37:30.818124452 +0000
+@@ -14,6 +14,7 @@
+ 
+ #include <exception>
+ #include <list>
++#include <stddef.h>
+ #include <sigc++/connection.h>
+ #include <sigc++/signal.h>
+ #include <glib/gmessages.h>
+diff -aur old/src/persp3d-reference.h new/src/persp3d-reference.h
+--- old/src/persp3d-reference.h	2010-07-13 03:48:40.691600000 +0000
++++ new/src/persp3d-reference.h	2011-05-26 14:37:30.818124452 +0000
+@@ -11,6 +11,7 @@
+  */
+ 
+ #include "uri-references.h"
++#include <stddef.h>
+ #include <sigc++/sigc++.h>
+ #include "persp3d.h"
+ 
+diff -aur old/src/rect-context.h new/src/rect-context.h
+--- old/src/rect-context.h	2010-07-13 03:48:40.691600000 +0000
++++ new/src/rect-context.h	2011-05-26 14:37:30.818124452 +0000
+@@ -14,6 +14,7 @@
+  * Released under GNU GPL
+  */
+ 
++#include <stddef.h>
+ #include <sigc++/sigc++.h>
+ #include "event-context.h"
+ #include "libnr/nr-point.h"
+diff -aur old/src/selcue.h new/src/selcue.h
+--- old/src/selcue.h	2010-07-13 03:48:40.691600000 +0000
++++ new/src/selcue.h	2011-05-26 14:37:30.818124452 +0000
+@@ -14,6 +14,7 @@
+  */
+ 
+ #include <list>
++#include <stddef.h>
+ #include <sigc++/sigc++.h>
+ 
+ class SPDesktop;
+diff -aur old/src/selection-describer.h new/src/selection-describer.h
+--- old/src/selection-describer.h	2010-07-13 03:48:40.691600000 +0000
++++ new/src/selection-describer.h	2011-05-26 14:37:30.818124452 +0000
+@@ -12,6 +12,7 @@
+ #ifndef SEEN_INKSCAPE_SELECTION_DESCRIPTION_HANDLER_H
+ #define SEEN_INKSCAPE_SELECTION_DESCRIPTION_HANDLER_H
+ 
++#include <stddef.h>
+ #include <sigc++/sigc++.h>
+ #include "message-context.h"
+ 
+diff -aur old/src/selection.h new/src/selection.h
+--- old/src/selection.h	2010-07-13 03:48:40.691600000 +0000
++++ new/src/selection.h	2011-05-26 14:37:30.818124452 +0000
+@@ -19,6 +19,7 @@
+ #include <vector>
+ #include <map>
+ #include <list>
++#include <stddef.h>
+ #include <sigc++/sigc++.h>
+ 
+ //#include "libnr/nr-rect.h"
+diff -aur old/src/seltrans.h new/src/seltrans.h
+--- old/src/seltrans.h	2010-07-13 03:48:40.691600000 +0000
++++ new/src/seltrans.h	2011-05-26 14:37:30.818124452 +0000
+@@ -15,6 +15,7 @@
+  * Released under GNU GPL, read the file 'COPYING' for more information
+  */
+ 
++#include <stddef.h>
+ #include <sigc++/sigc++.h>
+ #include <2geom/point.h>
+ #include <2geom/matrix.h>
+diff -aur old/src/sp-conn-end.h new/src/sp-conn-end.h
+--- old/src/sp-conn-end.h	2010-07-13 03:48:40.691600000 +0000
++++ new/src/sp-conn-end.h	2011-05-26 14:37:30.818124452 +0000
+@@ -2,6 +2,7 @@
+ #define SEEN_SP_CONN_END
+ 
+ #include <glib/gtypes.h>
++#include <stddef.h>
+ #include <sigc++/connection.h>
+ 
+ #include "sp-use-reference.h"
+diff -aur old/src/sp-conn-end-pair.h new/src/sp-conn-end-pair.h
+--- old/src/sp-conn-end-pair.h	2010-07-13 03:48:40.691600000 +0000
++++ new/src/sp-conn-end-pair.h	2011-05-26 14:37:30.818124452 +0000
+@@ -15,6 +15,7 @@
+ 
+ #include "forward.h"
+ #include "libnr/nr-point.h"
++#include <stddef.h>
+ #include <sigc++/connection.h>
+ #include <sigc++/functors/slot.h>
+ #include <sigc++/signal.h>
+diff -aur old/src/sp-gradient.h new/src/sp-gradient.h
+--- old/src/sp-gradient.h	2010-08-04 16:45:00.868588000 +0000
++++ new/src/sp-gradient.h	2011-05-26 14:37:30.818124452 +0000
+@@ -25,6 +25,7 @@
+ #include "sp-gradient-units.h"
+ #include "sp-gradient-vector.h"
+ 
++#include <stddef.h>
+ #include <sigc++/connection.h>
+ 
+ struct SPGradientReference;
+diff -aur old/src/spiral-context.h new/src/spiral-context.h
+--- old/src/spiral-context.h	2010-07-13 03:48:40.691600000 +0000
++++ new/src/spiral-context.h	2011-05-26 14:37:30.821456796 +0000
+@@ -16,6 +16,7 @@
+  */
+ 
+ #include <gtk/gtktypeutils.h>
++#include <stddef.h>
+ #include <sigc++/sigc++.h>
+ #include "event-context.h"
+ #include "libnr/nr-point.h"
+diff -aur old/src/sp-object.h new/src/sp-object.h
+--- old/src/sp-object.h	2010-07-13 03:48:40.691600000 +0000
++++ new/src/sp-object.h	2011-05-26 14:37:30.818124452 +0000
+@@ -56,6 +56,7 @@
+ 
+ 
+ #include <glib-object.h>
++#include <stddef.h>
+ #include <sigc++/connection.h>
+ #include <sigc++/functors/slot.h>
+ #include <sigc++/signal.h>
+diff -aur old/src/sp-offset.h new/src/sp-offset.h
+--- old/src/sp-offset.h	2010-07-13 03:48:40.691600000 +0000
++++ new/src/sp-offset.h	2011-05-26 14:37:30.818124452 +0000
+@@ -16,6 +16,7 @@
+ 
+ #include "sp-shape.h"
+ 
++#include <stddef.h>
+ #include <sigc++/sigc++.h>
+ 
+ #define SP_TYPE_OFFSET            (sp_offset_get_type ())
+diff -aur old/src/sp-pattern.h new/src/sp-pattern.h
+--- old/src/sp-pattern.h	2010-07-13 03:48:40.691600000 +0000
++++ new/src/sp-pattern.h	2011-05-26 14:37:30.818124452 +0000
+@@ -32,6 +32,7 @@
+ #include "sp-paint-server.h"
+ #include "uri-references.h"
+ 
++#include <stddef.h>
+ #include <sigc++/connection.h>
+ 
+ class SPPatternReference : public Inkscape::URIReference {
+diff -aur old/src/sp-shape.h new/src/sp-shape.h
+--- old/src/sp-shape.h	2010-07-13 03:48:40.691600000 +0000
++++ new/src/sp-shape.h	2011-05-26 14:37:30.818124452 +0000
+@@ -19,6 +19,7 @@
+ #include "sp-marker-loc.h"
+ #include <2geom/forward.h>
+ 
++#include <stddef.h>
+ #include <sigc++/connection.h>
+ 
+ #define SP_TYPE_SHAPE (sp_shape_get_type ())
+diff -aur old/src/sp-switch.h new/src/sp-switch.h
+--- old/src/sp-switch.h	2010-07-13 03:48:40.691600000 +0000
++++ new/src/sp-switch.h	2011-05-26 14:37:30.821456796 +0000
+@@ -14,6 +14,7 @@
+ 
+ #include "sp-item-group.h"
+ 
++#include <stddef.h>
+ #include <sigc++/connection.h>
+ 
+ #define SP_TYPE_SWITCH            (CSwitch::getType())
+diff -aur old/src/sp-text.h new/src/sp-text.h
+--- old/src/sp-text.h	2010-07-13 03:48:40.691600000 +0000
++++ new/src/sp-text.h	2011-05-26 14:37:30.821456796 +0000
+@@ -14,6 +14,7 @@
+  */
+ 
+ #include <glib/gtypes.h>
++#include <stddef.h>
+ #include <sigc++/sigc++.h>
+ #include "sp-item.h"
+ #include "sp-string.h"
+diff -aur old/src/sp-tref-reference.h new/src/sp-tref-reference.h
+--- old/src/sp-tref-reference.h	2010-07-13 03:48:40.691600000 +0000
++++ new/src/sp-tref-reference.h	2011-05-26 14:37:30.821456796 +0000
+@@ -13,6 +13,7 @@
+ 
+ #include <forward.h>
+ #include <uri-references.h>
++#include <stddef.h>
+ #include <sigc++/sigc++.h>
+ 
+ #include "util/share.h"
+diff -aur old/src/sp-use.h new/src/sp-use.h
+--- old/src/sp-use.h	2010-07-13 03:48:40.691600000 +0000
++++ new/src/sp-use.h	2011-05-26 14:37:30.821456796 +0000
+@@ -13,6 +13,7 @@
+  * Released under GNU GPL, read the file 'COPYING' for more information
+  */
+ 
++#include <stddef.h>
+ #include <sigc++/sigc++.h>
+ #include "svg/svg-length.h"
+ #include "sp-item.h"
+diff -aur old/src/sp-use-reference.h new/src/sp-use-reference.h
+--- old/src/sp-use-reference.h	2010-07-13 03:48:40.691600000 +0000
++++ new/src/sp-use-reference.h	2011-05-26 14:37:30.821456796 +0000
+@@ -11,6 +11,7 @@
+ 
+ #include <forward.h>
+ #include <uri-references.h>
++#include <stddef.h>
+ #include <sigc++/sigc++.h>
+ 
+ class Path;
+diff -aur old/src/star-context.h new/src/star-context.h
+--- old/src/star-context.h	2010-07-13 03:48:40.691600000 +0000
++++ new/src/star-context.h	2011-05-26 14:37:30.821456796 +0000
+@@ -14,6 +14,7 @@
+  * Released under GNU GPL, read the file 'COPYING' for more information
+  */
+ 
++#include <stddef.h>
+ #include <sigc++/sigc++.h>
+ #include "event-context.h"
+ #include "libnr/nr-point.h"
+diff -aur old/src/style.h new/src/style.h
+--- old/src/style.h	2010-08-04 16:45:00.868588000 +0000
++++ new/src/style.h	2011-05-26 14:37:30.821456796 +0000
+@@ -24,6 +24,7 @@
+ #include "uri.h"
+ #include "sp-paint-server.h"
+ 
++#include <stddef.h>
+ #include <sigc++/connection.h>
+ 
+ namespace Inkscape {
+diff -aur old/src/text-context.h new/src/text-context.h
+--- old/src/text-context.h	2010-07-13 03:48:40.691600000 +0000
++++ new/src/text-context.h	2011-05-26 14:37:30.821456796 +0000
+@@ -15,6 +15,7 @@
+  */
+ 
+ /*  #include <gdk/gdkic.h> */
++#include <stddef.h>
+ #include <sigc++/sigc++.h>
+ #include <gtk/gtkimcontext.h>
+ 
+diff -aur old/src/ui/dialog/desktop-tracker.h new/src/ui/dialog/desktop-tracker.h
+--- old/src/ui/dialog/desktop-tracker.h	2010-07-13 03:48:40.691600000 +0000
++++ new/src/ui/dialog/desktop-tracker.h	2011-05-26 14:37:30.821456796 +0000
+@@ -11,6 +11,7 @@
+ #ifndef SEEN_DIALOG_DESKTOP_TRACKER
+ #define SEEN_DIALOG_DESKTOP_TRACKER
+ 
++#include <stddef.h>
+ #include <sigc++/connection.h>
+ #include <glib/gtypes.h>
+ 
+diff -aur old/src/ui/dialog/document-metadata.h new/src/ui/dialog/document-metadata.h
+--- old/src/ui/dialog/document-metadata.h	2010-07-13 03:48:40.691600000 +0000
++++ new/src/ui/dialog/document-metadata.h	2011-05-26 14:37:30.821456796 +0000
+@@ -14,6 +14,7 @@
+ #define INKSCAPE_UI_DIALOG_DOCUMENT_METADATA_H
+ 
+ #include <list>
++#include <stddef.h>
+ #include <sigc++/sigc++.h>
+ #include <gtkmm/notebook.h>
+ #include <glibmm/i18n.h>
+diff -aur old/src/ui/dialog/document-properties.h new/src/ui/dialog/document-properties.h
+--- old/src/ui/dialog/document-properties.h	2010-07-13 03:48:40.691600000 +0000
++++ new/src/ui/dialog/document-properties.h	2011-05-26 14:37:30.821456796 +0000
+@@ -15,6 +15,7 @@
+ #define INKSCAPE_UI_DIALOG_DOCUMENT_PREFERENCES_H
+ 
+ #include <list>
++#include <stddef.h>
+ #include <sigc++/sigc++.h>//
+ #include <gtkmm/notebook.h>
+ #include <glibmm/i18n.h>
+diff -aur old/src/ui/dialog/inkscape-preferences.h new/src/ui/dialog/inkscape-preferences.h
+--- old/src/ui/dialog/inkscape-preferences.h	2010-11-06 18:47:19.806162000 +0000
++++ new/src/ui/dialog/inkscape-preferences.h	2011-05-26 14:37:30.821456796 +0000
+@@ -28,6 +28,7 @@
+ #include <gtkmm/frame.h>
+ #include <gtkmm/notebook.h>
+ #include "ui/widget/preferences-widget.h"
++#include <stddef.h>
+ #include <sigc++/sigc++.h>
+ #include <glibmm/i18n.h>
+ #include <gtkmm/textview.h>
+diff -aur old/src/ui/dialog/undo-history.cpp new/src/ui/dialog/undo-history.cpp
+--- old/src/ui/dialog/undo-history.cpp	2010-07-13 03:48:40.691600000 +0000
++++ new/src/ui/dialog/undo-history.cpp	2011-05-26 14:37:30.821456796 +0000
+@@ -14,6 +14,7 @@
+ 
+ #include <glibmm/i18n.h>
+ #include <gtk/gtkimage.h>
++#include <stddef.h>
+ #include <sigc++/sigc++.h>
+ 
+ 
+diff -aur old/src/ui/tool/control-point.h new/src/ui/tool/control-point.h
+--- old/src/ui/tool/control-point.h	2010-07-13 03:48:40.691600000 +0000
++++ new/src/ui/tool/control-point.h	2011-05-26 14:37:30.821456796 +0000
+@@ -12,6 +12,7 @@
+ #define SEEN_UI_TOOL_CONTROL_POINT_H
+ 
+ #include <boost/utility.hpp>
++#include <stddef.h>
+ #include <sigc++/sigc++.h>
+ #include <gdkmm.h>
+ #include <gtkmm.h>
+diff -aur old/src/ui/tool/control-point-selection.h new/src/ui/tool/control-point-selection.h
+--- old/src/ui/tool/control-point-selection.h	2010-08-04 16:45:00.868588000 +0000
++++ new/src/ui/tool/control-point-selection.h	2011-05-26 14:37:30.821456796 +0000
+@@ -14,6 +14,7 @@
+ 
+ #include <memory>
+ #include <boost/optional.hpp>
++#include <stddef.h>
+ #include <sigc++/sigc++.h>
+ #include <2geom/forward.h>
+ #include <2geom/point.h>
+diff -aur old/src/ui/tool/manipulator.h new/src/ui/tool/manipulator.h
+--- old/src/ui/tool/manipulator.h	2010-07-13 03:48:40.691600000 +0000
++++ new/src/ui/tool/manipulator.h	2011-05-26 14:37:30.821456796 +0000
+@@ -13,6 +13,7 @@
+ 
+ #include <set>
+ #include <map>
++#include <stddef.h>
+ #include <sigc++/sigc++.h>
+ #include <glib.h>
+ #include <gdk/gdk.h>
+diff -aur old/src/ui/tool/multi-path-manipulator.h new/src/ui/tool/multi-path-manipulator.h
+--- old/src/ui/tool/multi-path-manipulator.h	2010-11-06 18:47:19.806162000 +0000
++++ new/src/ui/tool/multi-path-manipulator.h	2011-05-26 14:37:30.821456796 +0000
+@@ -11,6 +11,7 @@
+ #ifndef SEEN_UI_TOOL_MULTI_PATH_MANIPULATOR_H
+ #define SEEN_UI_TOOL_MULTI_PATH_MANIPULATOR_H
+ 
++#include <stddef.h>
+ #include <sigc++/connection.h>
+ #include "display/display-forward.h"
+ #include "forward.h"
+diff -aur old/src/ui/tool/node.h new/src/ui/tool/node.h
+--- old/src/ui/tool/node.h	2011-01-02 04:34:09.814902000 +0000
++++ new/src/ui/tool/node.h	2011-05-26 14:37:30.821456796 +0000
+@@ -15,6 +15,7 @@
+ #include <iterator>
+ #include <iosfwd>
+ #include <stdexcept>
++#include <cstddef>
+ #include <tr1/functional>
+ #include <boost/utility.hpp>
+ #include <boost/shared_ptr.hpp>
+diff -aur old/src/ui/tool/node-tool.h new/src/ui/tool/node-tool.h
+--- old/src/ui/tool/node-tool.h	2010-11-06 18:47:19.806162000 +0000
++++ new/src/ui/tool/node-tool.h	2011-05-26 14:37:30.821456796 +0000
+@@ -14,6 +14,7 @@
+ #include <memory>
+ #include <boost/ptr_container/ptr_map.hpp>
+ #include <glib.h>
++#include <stddef.h>
+ #include <sigc++/sigc++.h>
+ #include "event-context.h"
+ #include "forward.h"
+diff -aur old/src/ui/view/view.h new/src/ui/view/view.h
+--- old/src/ui/view/view.h	2010-07-13 03:48:40.691600000 +0000
++++ new/src/ui/view/view.h	2011-05-26 14:37:30.821456796 +0000
+@@ -15,6 +15,7 @@
+  */
+ 
+ #include <gdk/gdktypes.h>
++#include <stddef.h>
+ #include <sigc++/connection.h>
+ #include "message.h"
+ #include "gc-managed.h"
+diff -aur old/src/ui/widget/color-picker.h new/src/ui/widget/color-picker.h
+--- old/src/ui/widget/color-picker.h	2010-07-13 03:48:40.691600000 +0000
++++ new/src/ui/widget/color-picker.h	2011-05-26 14:37:30.824789230 +0000
+@@ -13,6 +13,7 @@
+ #ifndef __COLOR_PICKER_H__
+ #define __COLOR_PICKER_H__
+ 
++#include <stddef.h>
+ #include <sigc++/sigc++.h>
+ #include <gtkmm/button.h>
+ #include <gtkmm/dialog.h>
+diff -aur old/src/ui/widget/page-sizer.h new/src/ui/widget/page-sizer.h
+--- old/src/ui/widget/page-sizer.h	2010-07-13 03:48:40.691600000 +0000
++++ new/src/ui/widget/page-sizer.h	2011-05-26 14:37:30.824789230 +0000
+@@ -13,6 +13,7 @@
+ #define INKSCAPE_UI_WIDGET_PAGE_SIZER__H
+ 
+ #include <gtkmm.h>
++#include <stddef.h>
+ #include <sigc++/sigc++.h>
+ 
+ #include "helper/units.h"
+diff -aur old/src/ui/widget/preferences-widget.h new/src/ui/widget/preferences-widget.h
+--- old/src/ui/widget/preferences-widget.h	2010-07-13 03:48:40.691600000 +0000
++++ new/src/ui/widget/preferences-widget.h	2011-05-26 14:37:30.824789230 +0000
+@@ -26,6 +26,7 @@
+ #include <gtkmm/drawingarea.h>
+ #include <gtkmm/frame.h>
+ #include <gtkmm/filechooserbutton.h>
++#include <stddef.h>
+ #include <sigc++/sigc++.h>
+ #include <glibmm/i18n.h>
+ 
+diff -aur old/src/ui/widget/selected-style.h new/src/ui/widget/selected-style.h
+--- old/src/ui/widget/selected-style.h	2010-07-13 03:48:40.691600000 +0000
++++ new/src/ui/widget/selected-style.h	2011-05-26 14:37:30.824789230 +0000
+@@ -23,6 +23,7 @@
+ #include <gtkmm/adjustment.h>
+ #include <gtkmm/spinbutton.h>
+ 
++#include <stddef.h>
+ #include <sigc++/sigc++.h>
+ 
+ #include <glibmm/i18n.h>
+diff -aur old/src/ui/widget/style-subject.h new/src/ui/widget/style-subject.h
+--- old/src/ui/widget/style-subject.h	2010-07-13 03:48:40.691600000 +0000
++++ new/src/ui/widget/style-subject.h	2011-05-26 14:37:30.824789230 +0000
+@@ -14,6 +14,7 @@
+ #include "libnr/nr-rect.h"
+ #include <2geom/rect.h>
+ #include "sp-item.h"
++#include <stddef.h>
+ #include <sigc++/sigc++.h>
+ 
+ class SPDesktop;
+diff -aur old/src/uri-references.h new/src/uri-references.h
+--- old/src/uri-references.h	2010-07-13 03:48:40.691600000 +0000
++++ new/src/uri-references.h	2011-05-26 14:37:30.824789230 +0000
+@@ -13,6 +13,7 @@
+  * Released under GNU GPL, read the file 'COPYING' for more information
+  */
+ 
++#include <stddef.h>
+ #include <sigc++/connection.h>
+ #include <sigc++/trackable.h>
+ 
+diff -aur old/src/util/forward-pointer-iterator.h new/src/util/forward-pointer-iterator.h
+--- old/src/util/forward-pointer-iterator.h	2010-07-13 03:48:40.691600000 +0000
++++ new/src/util/forward-pointer-iterator.h	2011-05-26 14:37:30.824789230 +0000
+@@ -15,6 +15,7 @@
+ #define SEEN_INKSCAPE_UTIL_FORWARD_POINTER_ITERATOR_H
+ 
+ #include <iterator>
++#include <cstddef>
+ #include "util/reference.h"
+ 
+ namespace Inkscape {
+diff -aur old/src/util/share.h new/src/util/share.h
+--- old/src/util/share.h	2010-07-13 03:48:40.691600000 +0000
++++ new/src/util/share.h	2011-05-26 14:37:30.824789230 +0000
+@@ -14,6 +14,7 @@
+ 
+ #include "gc-core.h"
+ #include <cstring>
++#include <cstddef>
+ 
+ namespace Inkscape {
+ namespace Util {
+diff -aur old/src/util/unordered-containers.h new/src/util/unordered-containers.h
+--- old/src/util/unordered-containers.h	2010-07-13 03:48:40.691600000 +0000
++++ new/src/util/unordered-containers.h	2011-05-26 14:37:30.824789230 +0000
+@@ -41,6 +41,8 @@
+ # define INK_UNORDERED_MAP __gnu_cxx::hash_map
+ # define INK_HASH __gnu_cxx::hash
+ 
++#include <cstddef>
++
+ namespace __gnu_cxx {
+ // hash function for pointers
+ // TR1 and Boost have this defined by default, __gnu_cxx doesn't
+diff -aur old/src/widgets/desktop-widget.h new/src/widgets/desktop-widget.h
+--- old/src/widgets/desktop-widget.h	2010-07-13 03:48:40.691600000 +0000
++++ new/src/widgets/desktop-widget.h	2011-05-26 14:37:30.824789230 +0000
+@@ -21,6 +21,7 @@
+ #include "ui/view/view-widget.h"
+ #include "ui/view/edit-widget-interface.h"
+ 
++#include <stddef.h>
+ #include <sigc++/connection.h>
+ 
+ // forward declaration
+diff -aur old/src/widgets/gradient-image.h new/src/widgets/gradient-image.h
+--- old/src/widgets/gradient-image.h	2010-07-13 03:48:40.691600000 +0000
++++ new/src/widgets/gradient-image.h	2011-05-26 14:37:30.824789230 +0000
+@@ -19,6 +19,7 @@
+ 
+ #include <glib.h>
+ 
++#include <stddef.h>
+ #include <sigc++/connection.h>
+ 
+ #define SP_TYPE_GRADIENT_IMAGE (sp_gradient_image_get_type ())
+diff -aur old/src/widgets/gradient-vector.h new/src/widgets/gradient-vector.h
+--- old/src/widgets/gradient-vector.h	2010-07-13 03:48:40.691600000 +0000
++++ new/src/widgets/gradient-vector.h	2011-05-26 14:37:30.824789230 +0000
+@@ -17,6 +17,7 @@
+ 
+ #include <glib.h>
+ 
++#include <stddef.h>
+ #include <sigc++/connection.h>
+ 
+ #include <gtk/gtkvbox.h>
+diff -aur old/src/widgets/sp-attribute-widget.h new/src/widgets/sp-attribute-widget.h
+--- old/src/widgets/sp-attribute-widget.h	2010-07-13 03:48:40.691600000 +0000
++++ new/src/widgets/sp-attribute-widget.h	2011-05-26 14:37:30.824789230 +0000
+@@ -14,6 +14,7 @@
+ #define SEEN_DIALOGS_SP_ATTRIBUTE_WIDGET_H
+ 
+ #include <glib.h>
++#include <stddef.h>
+ #include <sigc++/connection.h>
+ 
+ #define SP_TYPE_ATTRIBUTE_WIDGET (sp_attribute_widget_get_type ())
+diff -aur old/src/widgets/sp-color-notebook.cpp new/src/widgets/sp-color-notebook.cpp
+--- old/src/widgets/sp-color-notebook.cpp	2010-07-13 03:48:40.691600000 +0000
++++ new/src/widgets/sp-color-notebook.cpp	2011-05-26 14:37:30.824789230 +0000
+@@ -22,6 +22,7 @@
+ #include <cstring>
+ #include <string>
+ #include <cstdlib>
++#include <cstddef>
+ #include <gtk/gtk.h>
+ #include <glibmm/i18n.h>
+ 
+diff -aur old/src/xml/helper-observer.h new/src/xml/helper-observer.h
+--- old/src/xml/helper-observer.h	2010-07-13 03:48:40.691600000 +0000
++++ new/src/xml/helper-observer.h	2011-05-26 14:37:30.824789230 +0000
+@@ -5,6 +5,7 @@
+ #include "node.h"
+ #include "../sp-object.h"
+ //#include "../sp-object-repr.h"
++#include <stddef.h>
+ #include <sigc++/sigc++.h>
+ 
+ namespace Inkscape {
diff --git a/extra/inkscape/install b/extra/inkscape/install
new file mode 100644
index 000000000..6e803bf1d
--- /dev/null
+++ b/extra/inkscape/install
@@ -0,0 +1,13 @@
+post_install() {
+	update-desktop-database -q
+	gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+post_upgrade() {
+	post_install
+}
+
+
+post_remove() {
+	post_install
+}
diff --git a/extra/libgnome-keyring/PKGBUILD b/extra/libgnome-keyring/PKGBUILD
index 7517d586b..c44409f75 100644
--- a/extra/libgnome-keyring/PKGBUILD
+++ b/extra/libgnome-keyring/PKGBUILD
@@ -1,9 +1,9 @@
-#$Id: PKGBUILD 124609 2011-05-23 13:28:25Z ibiru $
+#$Id: PKGBUILD 125537 2011-05-26 16:32:57Z ibiru $
 #Maintainer: Jan De Groot <jgc@archlinux.org>
 
 pkgname=libgnome-keyring
-pkgver=3.0.2
-pkgrel=2
+pkgver=3.0.3
+pkgrel=1
 pkgdesc="GNOME keyring client library"
 arch=(i686 x86_64)
 license=('GPL' 'LGPL')
@@ -11,14 +11,11 @@ depends=('dbus-core' 'libgcrypt' 'glib2')
 makedepends=('intltool' 'pkgconfig')
 options=('!libtool' '!emptydirs')
 url="http://www.gnome.org"
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2
-        fix_crash.patch)
-sha256sums=('7914ac5edae5e602ba8f7c505ecd18faa84e8482a3f4e6ee0a20aee3a24d6f5d'
-            '4b8c3d9cbc72d171b274e9ad38b01ff9f7ce92beaf1d1e89c54db70d6c4e8a6a')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
+sha256sums=('a0cc08bcd431070d3f01c2741903c2bd8b0231ee73de709d28e722e28575fdf8')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i "${srcdir}/fix_crash.patch"
   ./configure --prefix=/usr --sysconfdir=/etc \
       --localstatedir=/var --disable-static \
       --libexecdir=/usr/lib/gnome-keyring
diff --git a/extra/libgweather/PKGBUILD b/extra/libgweather/PKGBUILD
index a10e5b9d7..f8c1e71c4 100644
--- a/extra/libgweather/PKGBUILD
+++ b/extra/libgweather/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 117926 2011-04-04 21:33:29Z heftig $
+# $Id: PKGBUILD 124751 2011-05-24 07:48:30Z ibiru $
 # Maintainer: Jan de Groot  <jgc@archlinux.org>
 
 pkgname=libgweather
-pkgver=3.0.0
+pkgver=3.0.2
 pkgrel=1
 pkgdesc="Provides access to weather information from the net"
 arch=('i686' 'x86_64')
@@ -14,7 +14,7 @@ url="http://www.gnome.org/"
 install=libgweather.install
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2
         gettext-not-xml.patch)
-sha256sums=('f13eb69c6ec8c4db08a78ffe980a5dd0e194894d411691a6821a068c650d1545'
+sha256sums=('9041526fa0466b99dae5cf06c2cc70376f25531eec5d58b1e1378acfb302410c'
             'f21d55ab7916a50cad10d1c0bb3785a262e8ad8f35b9fb4c02ae23f1b0783727')
 
 build() {
diff --git a/extra/libqzeitgeist/PKGBUILD b/extra/libqzeitgeist/PKGBUILD
new file mode 100644
index 000000000..6e2d4766f
--- /dev/null
+++ b/extra/libqzeitgeist/PKGBUILD
@@ -0,0 +1,29 @@
+# $Id: PKGBUILD 125364 2011-05-26 10:10:50Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+
+pkgname=libqzeitgeist
+pkgver=0.7.0
+pkgrel=1
+pkgdesc="A Qt interface to the Zeitgeist event tracking system"
+url="https://projects.kde.org/projects/kdesupport/libqzeitgeist"
+arch=('i686' 'x86_64')
+license=('GPL')
+depends=('qt')
+makedepends=('cmake')
+source=("http://releases.zeitgeist-project.com/qzeitgeist/QtZeitgeist-${pkgver}.tar.bz2")
+md5sums=('e58d4b988bbab812f8bd6878d87c0956')
+
+build() {
+  cd "${srcdir}"
+  mkdir build
+  cd build
+  cmake ../QtZeitgeist-${pkgver}-Source \
+    -DCMAKE_BUILD_TYPE=Release \
+	-DCMAKE_INSTALL_PREFIX=/usr
+  make
+}
+
+package() {
+  cd "${srcdir}"/build
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/extra/libsoup/PKGBUILD b/extra/libsoup/PKGBUILD
index 8b8970795..7c2aa02ae 100644
--- a/extra/libsoup/PKGBUILD
+++ b/extra/libsoup/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 120683 2011-04-25 23:06:22Z ibiru $
+# $Id: PKGBUILD 124678 2011-05-23 20:49:40Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=libsoup
 pkgname=('libsoup' 'libsoup-gnome')
-pkgver=2.34.1
+pkgver=2.34.2
 pkgrel=1
 arch=('i686' 'x86_64')
 license=('LGPL')
@@ -11,7 +11,7 @@ makedepends=('glib2' 'libxml2' 'sqlite3' 'libgnome-keyring' 'intltool' 'gobject-
 url="http://www.gnome.org"
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgbase}/${pkgver%.*}/${pkgbase}-${pkgver}.tar.bz2)
 options=('!libtool' '!emptydirs')
-sha256sums=('a2f846af2c4c08e15eacc9879c8c9be4d85f8105f960f96a9ba3dbabd9ee517b')
+sha256sums=('1d70edc48c309528635012269733739f9cd22548913125864318a65d1b6f1261')
 
 build() {
   cd "${srcdir}/${pkgbase}-${pkgver}"
diff --git a/extra/libwnck3/PKGBUILD b/extra/libwnck3/PKGBUILD
index c9395bec3..d37c740ec 100644
--- a/extra/libwnck3/PKGBUILD
+++ b/extra/libwnck3/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 117893 2011-04-04 21:09:31Z heftig $
+# $Id: PKGBUILD 124742 2011-05-24 07:31:15Z ibiru $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 pkgname=libwnck3
 _pkgbasename=libwnck
-pkgver=3.0.0
+pkgver=3.0.2
 pkgrel=1
 pkgdesc="Window Navigator Construction Kit (GTK+3)"
 arch=('i686' 'x86_64')
@@ -12,7 +12,7 @@ makedepends=('intltool' 'gobject-introspection')
 options=('!libtool')
 url="http://www.gnome.org/"
 source=(http://ftp.gnome.org/pub/gnome/sources/${_pkgbasename}/${pkgver%.*}/${_pkgbasename}-${pkgver}.tar.bz2)
-sha256sums=('bc34093ad185bb5086e97226f36157a6dd205623d32bdef71261a8b248a41f15')
+sha256sums=('4946b612c22d53238810d431f1b05c21f073f201edfd247ff74e2fa228618083')
 
 build() {
     cd "${srcdir}/${_pkgbasename}-${pkgver}"
diff --git a/extra/multitail/PKGBUILD b/extra/multitail/PKGBUILD
index 625474e1e..aa356da64 100644
--- a/extra/multitail/PKGBUILD
+++ b/extra/multitail/PKGBUILD
@@ -1,24 +1,28 @@
-# $Id: PKGBUILD 79574 2010-05-04 15:01:54Z kevin $
+# $Id: PKGBUILD 125613 2011-05-27 00:13:31Z kevin $
 # Maintainer: Kevin Piche <kevin@archlinux.org>
 # Contributor: Roberto Carvajal <roberto@archlinux.org>
 
 pkgname=multitail
-pkgver=5.2.6
+pkgver=5.2.8
 pkgrel=1
-pkgdesc="MultiTail lets you view one or multiple files like the original tail program"
+pkgdesc="Lets you view one or multiple files like the original tail program"
 arch=(i686 x86_64)
 license=('GPL')
 url="http://www.vanheusden.com/multitail"
 depends=('ncurses')
 backup=(etc/multitail.conf)
 source=(${url}/${pkgname}-${pkgver}.tgz)
-md5sums=('6496b3d78660ff8d11c743a0d03cca34')
+md5sums=('aaa3691b0ea66ef02ffefd628c7dee8b')
 
 build() {
-  cd ${startdir}/src/${pkgname}-${pkgver}
-  /usr/bin/make || return 1
-  /bin/install -D -m 755 multitail ${startdir}/pkg/usr/bin/multitail
-  /bin/install -D -m 644 multitail.1 ${startdir}/pkg/usr/share/man/man1/multitail.1
-  /bin/install -D -m 644 multitail.conf ${startdir}/pkg/etc/multitail.conf
+  cd ${srcdir}/${pkgname}-${pkgver}
+  /usr/bin/make
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  /bin/install -D -m 755 multitail ${pkgdir}/usr/bin/multitail
+  /bin/install -D -m 644 multitail.1 ${pkgdir}/usr/share/man/man1/multitail.1
+  /bin/install -D -m 644 multitail.conf ${pkgdir}/etc/multitail.conf
 }
 # vim: ts=2 sw=2 et ft=sh
diff --git a/extra/mutter/PKGBUILD b/extra/mutter/PKGBUILD
index 0f40309d1..7f1a0f89a 100644
--- a/extra/mutter/PKGBUILD
+++ b/extra/mutter/PKGBUILD
@@ -1,28 +1,25 @@
-# $Id: PKGBUILD 123610 2011-05-11 18:27:48Z ibiru $
+# $Id: PKGBUILD 125321 2011-05-25 21:21:29Z ibiru $
 # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Michael Kanis <mkanis_at_gmx_dot_de>
 
 pkgname=mutter
-pkgver=3.0.1
-pkgrel=2
+pkgver=3.0.2.1
+pkgrel=1
 pkgdesc="A window manager for GNOME3"
 arch=(i686 x86_64)
 license=('GPL')
 depends=('startup-notification' 'gconf' 'zenity' 'libcanberra' 'clutter' 'gobject-introspection')
-makedepends=('intltool' 'gtk-doc')
+makedepends=('intltool' 'gnome-doc-utils')
 url="http://www.gnome.org"
 groups=('gnome')
 options=('!libtool' '!emptydirs')
 install=mutter.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2
-        squash_some_leaks.patch)
-sha256sums=('6c3190789f935a2c982e78447726e87cf1d4b7af2f0b407cb6d6aca636e3d708'
-            'dda962cfd884ffbe2c3c4a86641964228d7b04ef30e19bb2894c4398fa4c296a')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*.*}/${pkgname}-${pkgver}.tar.bz2)
+sha256sums=('b122ffe170078af3edb9d4aa076c89eefd7a12a8aa57a1025227c1ab92912b3c')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i "${srcdir}/squash_some_leaks.patch"
   ./configure --prefix=/usr --sysconfdir=/etc \
       --libexecdir=/usr/lib/mutter \
       --localstatedir=/var --disable-static
diff --git a/extra/nautilus/PKGBUILD b/extra/nautilus/PKGBUILD
index d3e7cfdbc..3f1c44be4 100644
--- a/extra/nautilus/PKGBUILD
+++ b/extra/nautilus/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 122706 2011-05-06 06:57:16Z ibiru $
+# $Id: PKGBUILD 124892 2011-05-24 21:49:03Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=nautilus
-pkgver=3.0.1.1
-pkgrel=3
+pkgver=3.0.2
+pkgrel=1
 pkgdesc="The GNOME shell and file manager"
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -14,8 +14,8 @@ url="http://www.gnome.org"
 groups=('gnome')
 options=('!libtool' '!emptydirs')
 install=nautilus.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*.*}/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('ba53b2b8a38bcd4d6a1860421de222dc5b6b9904cceed49b2d0d90e972ee7dd6')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
+sha256sums=('6a4c6b75593f0e815763d0040878cd908da72318f18b05f33d24040e0d602b22')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/scim/PKGBUILD b/extra/scim/PKGBUILD
index 7e7fb2457..e9755aada 100644
--- a/extra/scim/PKGBUILD
+++ b/extra/scim/PKGBUILD
@@ -1,29 +1,40 @@
-# $Id: PKGBUILD 84723 2010-07-03 19:29:41Z ibiru $
-# Maintainer: damir <damir@archlinux.org>
+# $Id: PKGBUILD 125359 2011-05-26 09:22:50Z bisson $
+# Maintainer: Gaetan Bisson <bisson@archlinux.org>
+# Contributor: damir <damir@archlinux.org>
 # Contributor: Gan Lu <rhythm.gan@gmail.com>
 
 pkgname=scim
-pkgver=1.4.9
-pkgrel=2
-pkgdesc="A Input Method development platform"
-arch=("i686" "x86_64")
-url="http://www.scim-im.org/projects/scim"
+pkgver=1.4.10
+pkgrel=1
+pkgdesc='Input method user interface and development platform'
+url='http://www.scim-im.org/projects/scim'
 license=('GPL')
+arch=('i686' 'x86_64')
 depends=('gtk2' 'gcc-libs')
 makedepends=('intltool')
 backup=('etc/scim/config' 'etc/scim/global')
 options=('!libtool')
-install=scim.install
-source=(http://downloads.sourceforge.net/sourceforge/scim/$pkgname-$pkgver.tar.gz
-        gcc45.patch)
-md5sums=('975ba34b01304ea8166ac8ea27aa9e88'
-         '9d7b41421424cedcbc5740098afa4921')
+source=("http://downloads.sourceforge.net/project/$pkgname/$pkgname/$pkgver/${pkgname}_$pkgver.tar.gz")
+sha1sums=('bf33a6ceb199453fed909a61f54e971653fe5abf')
+
+install=install
 
 build() {
-  cd $srcdir/$pkgname-$pkgver
-  patch -Np1 -i $srcdir/gcc45.patch
-  ./configure --prefix=/usr --sysconfdir=/etc \
-    --with-gnu-ld --with-x --disable-static
-  make
-  make DESTDIR=$pkgdir install
+	cd "$srcdir/$pkgname-$pkgver"
+
+	./bootstrap
+	./configure \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--disable-static \
+		--with-gnu-ld \
+		--with-x \
+
+	make
+}
+
+package() {
+	cd "$srcdir/$pkgname-$pkgver"
+
+	make DESTDIR="$pkgdir" install
 }
diff --git a/extra/scim/install b/extra/scim/install
new file mode 100644
index 000000000..405061cb4
--- /dev/null
+++ b/extra/scim/install
@@ -0,0 +1,13 @@
+post_install() {
+	echo -n 'updating gtk.immodules... '
+	/usr/bin/gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules
+	echo 'done.'
+}
+
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+	post_install
+}
diff --git a/extra/socat/PKGBUILD b/extra/socat/PKGBUILD
index 1ed30bf7f..1d1af26d0 100644
--- a/extra/socat/PKGBUILD
+++ b/extra/socat/PKGBUILD
@@ -1,29 +1,31 @@
-# $Id: PKGBUILD 87629 2010-08-17 13:33:30Z bisson $
-# Maintainer:
+# $Id: PKGBUILD 125383 2011-05-26 13:02:11Z bisson $
+# Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Juergen Hoetzel <juergen@archlinux.org>
 # Contributor: John Proctor <jproctor@prium.net>
 
 pkgname=socat
 pkgver=1.7.1.3
-pkgrel=1
-pkgdesc='Relay for bidirectional data transfer via socket, pty, pipe, file and more'
-arch=('i686' 'x86_64')
-license=('GPL2')
+pkgrel=2
+pkgdesc='Multipurpose relay'
 url='http://www.dest-unreach.org/socat/'
+license=('GPL2')
+arch=('i686' 'x86_64')
 depends=('readline' 'openssl' 'tcp_wrappers')
-makedepends=('imake')
 source=("http://www.dest-unreach.org/socat/download/$pkgname-$pkgver.tar.gz")
 sha1sums=('5a42275da0d8a5182452b36535a74c3cdf21793b')
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  ./configure --prefix=/usr \
-    --mandir=/usr/share/man
-  make depend || return 1
-  make || return 1
+	cd "$srcdir/$pkgname-$pkgver"
+
+	./configure \
+		--prefix=/usr \
+		--mandir=/usr/share/man \
+
+	make
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install || return 1
+	cd "$srcdir/$pkgname-$pkgver"
+
+	make DESTDIR="$pkgdir" install
 }
diff --git a/extra/totem-plparser/PKGBUILD b/extra/totem-plparser/PKGBUILD
index 33c8d79b5..520ccd1ea 100644
--- a/extra/totem-plparser/PKGBUILD
+++ b/extra/totem-plparser/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 116067 2011-03-22 18:11:16Z heftig $
+# $Id: PKGBUILD 125552 2011-05-26 16:51:47Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=totem-plparser
-pkgver=2.32.4
+pkgver=2.32.5
 pkgrel=1
 url="http://www.hadess.net/totem.php3"
 pkgdesc="Totem playlist parser library"
@@ -12,7 +12,7 @@ depends=('gmime' 'libsoup-gnome')
 makedepends=('intltool' 'pkgconfig' 'gobject-introspection')
 options=('!libtool')
 source=(http://ftp.gnome.org/pub/gnome/sources/totem-pl-parser/2.32/totem-pl-parser-${pkgver}.tar.bz2)
-sha256sums=('349006c8c26a7bee6775c2f48cb158be15c92608f444598c67ca820c205213d6')
+sha256sums=('f7233972602321db5e46819a5b47b52c10b63c4344725a5179ac956284e1991d')
 
 build() {
   cd "${srcdir}/totem-pl-parser-${pkgver}"
diff --git a/extra/totem/PKGBUILD b/extra/totem/PKGBUILD
index ed89d82b6..2a14af3df 100644
--- a/extra/totem/PKGBUILD
+++ b/extra/totem/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 120757 2011-04-26 11:04:01Z heftig $
+# $Id: PKGBUILD 125547 2011-05-26 16:47:44Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=totem
 pkgname=('totem' 'totem-plugin')
 pkgver=3.0.1
-pkgrel=1
+pkgrel=2
 url="http://www.hadess.net/totem.php3"
 arch=('i686' 'x86_64')
 license=('GPL2' 'custom')
@@ -27,7 +27,7 @@ build() {
 
 package_totem() {
   pkgdesc="A GNOME3 integrated movie player based on Gstreamer."
-  depends=('gstreamer0.10-base-plugins' 'gstreamer0.10-good-plugins' 'totem-plparser' 'libxxf86vm' 'libxtst' 'desktop-file-utils' 'iso-codes' 'python2' 'libpeas' 'hicolor-icon-theme' 'gnome-icon-theme-symbolic' 'gsettings-desktop-schemas')
+  depends=('gstreamer0.10-base-plugins' 'gstreamer0.10-good-plugins' 'totem-plparser' 'libxxf86vm' 'libxtst' 'desktop-file-utils' 'iso-codes' 'python2' 'libpeas' 'hicolor-icon-theme' 'gnome-icon-theme-symbolic' 'gsettings-desktop-schemas' 'dconf')
   groups=('gnome-extra')
   install=totem.install
   optdepends=('gstreamer0.10-ugly-plugins: Extra media codecs'
diff --git a/extra/upower/PKGBUILD b/extra/upower/PKGBUILD
index c050ee4b0..4f45a4e78 100644
--- a/extra/upower/PKGBUILD
+++ b/extra/upower/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 122280 2011-05-03 18:02:14Z ibiru $
+# $Id: PKGBUILD 124973 2011-05-25 14:17:57Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=upower
-pkgver=0.9.10
+pkgver=0.9.11
 pkgrel=1
 pkgdesc="Abstraction for enumerating power devices, listening to device events and querying history and statistics"
 arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ makedepends=('pkg-config' 'intltool' 'docbook-xsl' 'gobject-introspection')
 replaces=('devicekit-power')
 options=('!libtool')
 source=($url/releases/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('fa567509c4ce8d1975259665b907929cac692a59dbe0e217e7494b1cdc949288')
+sha256sums=('567358cc1b4887485d29e309897dd091c2c2ae95e48dfbb3279ffdc44a4b2956')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/vlc/PKGBUILD b/extra/vlc/PKGBUILD
index 6536aa6d9..1a636f80e 100644
--- a/extra/vlc/PKGBUILD
+++ b/extra/vlc/PKGBUILD
@@ -1,30 +1,43 @@
-# $Id: PKGBUILD 119562 2011-04-12 10:29:49Z giovanni $
+# $Id: PKGBUILD 125527 2011-05-26 14:21:55Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
 # Contributor: Martin Sandsmark <martin.sandsmark@kde.org>
 
-pkgbase=vlc
-pkgname=('vlc' 'vlc-plugin')
+pkgname=vlc
 pkgver=1.1.9
-pkgrel=1
+pkgrel=2
+pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player"
 arch=('i686' 'x86_64')
 url="http://www.videolan.org/vlc/"
 license=('GPL')
-makedepends=('a52dec' 'fluidsynth' 'libmtp' 'libdvbpsi' 'lirc-utils'
-             'libdca' 'qt' 'libproxy' 'sdl_image' 'libdvdnav' 'mesa'
-             'lua' 'v4l-utils' 'libcddb' 'smbclient' 'libmatroska' 'zvbi'
-             'taglib' 'sysfsutils' 'libmpcdec' 'ffmpeg' 'faad2'
-             'libshout' 'libmad' 'fribidi' 'libmpeg2' 'libmodplug'
-             'avahi' 'ttf-freefont' 'libxv' 'libass' 'xdg-utils' 'libxpm'
-             'xulrunner' 'pkgconfig' 'live-media' 'libnotify' 'libcdio'
+depends=('a52dec' 'fluidsynth' 'libmtp' 'libdvbpsi' 'libcdio'
+           'libdca' 'qt' 'libproxy' 'sdl_image' 'libdvdnav' 'mesa'
+           'lua' 'v4l-utils' 'libcddb' 'smbclient' 'libmatroska' 'zvbi'
+           'taglib' 'sysfsutils' 'libmpcdec' 'ffmpeg' 'faad2'
+           'libshout' 'libmad' 'fribidi' 'libmpeg2' 'libmodplug'
+           'ttf-freefont' 'libxv' 'libass' 'xdg-utils' 'desktop-file-utils')
+makedepends=('avahi' 'pkgconfig' 'libxpm' 'live-media' 'libnotify'
              'flac' 'libtheora' 'alsa-lib' 'jack' 'kdelibs' 'udev'
              'libraw1394' 'libdc1394' 'libavc1394' 'libva' 'libpulse')
+optdepends=('avahi: for service discovery using bonjour protocol'
+            'libnotify: for notification plugin'
+            'ncurses: for ncurses interface support'
+            'libdvdcss: for decoding encrypted DVDs'
+            'lirc-utils: for lirc plugin'
+            'libavc1394: for devices using the 1394ta AV/C'
+            'libdc1394: for IEEE 1394 plugin'
+            'kdelibs: KDE Solid hardware integration'
+            'vdpau-video: VDPAU backend for VA API (for GPU acceleration on Nvidia cards)'
+            'libpulse: PulseAudio support')
+conflicts=('vlc-plugin')
+replaces=('vlc-plugin')
 options=('!libtool')
-source=("http://download.videolan.org/pub/videolan/${pkgbase}/${pkgver}/${pkgbase}-${pkgver}.tar.bz2")
+install=vlc.install
+source=("http://download.videolan.org/pub/videolan/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2")
 md5sums=('06adb1848e6b87fbe1ced77ec0f91e4c')
 
 build() {
-  cd "${srcdir}/${pkgbase}-${pkgver}"
+  cd "${srcdir}/${pkgname}-${pkgver}"
 
   sed -i -e 's:truetype/freefont:TTF:g' modules/misc/freetype.c
   ./configure --prefix=/usr \
@@ -37,35 +50,12 @@ build() {
               --enable-lirc \
               --enable-pvr \
               --enable-ncurses \
-              --enable-mozilla \
               --with-live555-tree=/usr/lib/live \
               --enable-realrtsp
   make
 }
-
-package_vlc() {
-  pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player"
-  depends=('a52dec' 'fluidsynth' 'libmtp' 'libdvbpsi' 'libcdio'
-           'libdca' 'qt' 'libproxy' 'sdl_image' 'libdvdnav' 'mesa'
-           'lua' 'v4l-utils' 'libcddb' 'smbclient' 'libmatroska' 'zvbi'
-           'taglib' 'sysfsutils' 'libmpcdec' 'ffmpeg' 'faad2'
-           'libshout' 'libmad' 'fribidi' 'libmpeg2' 'libmodplug'
-           'ttf-freefont' 'libxv' 'libass' 'xdg-utils' 'desktop-file-utils')
-  optdepends=('avahi: for service discovery using bonjour protocol'
-              'libnotify: for notification plugin'
-              'ncurses: for ncurses interface support'
-              'libdvdcss: for decoding encrypted DVDs'
-              'lirc-utils: for lirc plugin'
-              'libavc1394: for devices using the 1394ta AV/C'
-              'libdc1394: for IEEE 1394 plugin'
-              'kdelibs: KDE Solid hardware integration'
-              'vdpau-video: VDPAU backend for VA API (for GPU acceleration on Nvidia cards)'
-              'libpulse: PulseAudio support')
-  options=('!libtool')
-  conflicts=('vlc-pulse-plugin')
-  replaces=('vlc-pulse-plugin')
-  install=vlc.install
-  cd "${srcdir}/${pkgbase}-${pkgver}"
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
 
   make DESTDIR="${pkgdir}/" install
 
@@ -73,20 +63,4 @@ package_vlc() {
     install -D -m644 "${srcdir}/vlc-${pkgver}/share/icons/${res}x${res}/vlc.png" \
         "${pkgdir}/usr/share/icons/hicolor/${res}x${res}/apps/vlc.png"
   done
-
-  rm -rf "${pkgdir}/usr/lib/mozilla"
-}
-
-package_vlc-plugin() {
-  pkgdesc="VLC mozilla browser plugin"
-  depends=("${pkgbase}=${pkgver}" 'nspr' 'xulrunner' 'libxpm')
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-
-  #for linking against libvlc
-  make -C src DESTDIR="${pkgdir}" install-libLTLIBRARIES
-
-  make -C projects/mozilla DESTDIR="${pkgdir}/" install
-
-  #clean up libvlc
-  make -C src DESTDIR="${pkgdir}" uninstall-libLTLIBRARIES
 }
diff --git a/extra/xorg-iceauth/PKGBUILD b/extra/xorg-iceauth/PKGBUILD
index 47d56dc44..9063e3a4d 100644
--- a/extra/xorg-iceauth/PKGBUILD
+++ b/extra/xorg-iceauth/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 113660 2011-03-10 14:29:50Z jgc $
+# $Id: PKGBUILD 125572 2011-05-26 20:17:22Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xorg-iceauth
-pkgver=1.0.4
-pkgrel=2
+pkgver=1.0.5
+pkgrel=1
 pkgdesc="ICE authority file utility"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
@@ -12,12 +12,16 @@ depends=('libice')
 makedepends=('xorg-util-macros' 'xproto')
 groups=('xorg-apps' 'xorg')
 source=(http://xorg.freedesktop.org/archive/individual/app/iceauth-${pkgver}.tar.bz2)
-sha1sums=('9b446c0d1815dce48bdea32db7dea7e429f6a310')
+sha1sums=('d996c6ecaa93dcaccee4a11991eeacd40bddc13e')
 
 build() {
   cd "${srcdir}/iceauth-${pkgver}"
   ./configure --prefix=/usr
   make
+}
+
+package() {
+  cd "${srcdir}/iceauth-${pkgver}"
   make DESTDIR="${pkgdir}" install
   install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
   install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
diff --git a/extra/xorg-xauth/PKGBUILD b/extra/xorg-xauth/PKGBUILD
index 85a358954..192dcce39 100644
--- a/extra/xorg-xauth/PKGBUILD
+++ b/extra/xorg-xauth/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 113711 2011-03-10 14:51:46Z jgc $
+# $Id: PKGBUILD 125581 2011-05-26 20:38:49Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xorg-xauth
-pkgver=1.0.5
-pkgrel=2
+pkgver=1.0.6
+pkgrel=1
 pkgdesc="X.Org authorization settings program"
 arch=(i686 x86_64)
 license=('custom')
@@ -12,12 +12,16 @@ depends=('libxmu')
 makedepends=('xorg-util-macros')
 groups=('xorg-apps' 'xorg')
 source=(${url}/releases/individual/app/xauth-${pkgver}.tar.bz2)
-sha1sums=('6d94b5822e8ce08630a8ff510230246d5ed45290')
+sha1sums=('10a68367ecc60a641b9aa89e6f24f7ca71f23874')
 
 build() {
   cd "${srcdir}/xauth-${pkgver}"
   ./configure --prefix=/usr
   make
+}
+
+package() {
+  cd "${srcdir}/xauth-${pkgver}"
   make DESTDIR="${pkgdir}" install
   install -d -m755 "${pkgdir}/usr/share/licenses/${pkgname}"
   install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
diff --git a/extra/zile/PKGBUILD b/extra/zile/PKGBUILD
index 842e1261c..8ada94ea7 100644
--- a/extra/zile/PKGBUILD
+++ b/extra/zile/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 104088 2010-12-28 17:55:43Z kevin $
+# $Id: PKGBUILD 125598 2011-05-26 20:47:05Z kevin $
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 # Maintainer: Kevin Piche <kevin@archlinux.org>
 
 pkgname=zile
-pkgver=2.3.21
+pkgver=2.3.24
 pkgrel=1
 pkgdesc="A small, fast, and powerful Emacs clone"
 arch=(i686 x86_64)
@@ -13,12 +13,16 @@ makedepends=('help2man')
 depends=('ncurses')
 license=('GPL')
 source=(http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-md5sums=('4bac1dc5d7e6fb5c13bd6677bca34b11')
+md5sums=('fe77d801ba69e0fb9b4914a04b9ff506')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
   ./configure --prefix=/usr
-  make || return 1
+  make
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
   make DESTDIR=${pkgdir} install
 }
-md5sums=('ec2834a42789477c55e7d44bc9438de1')
+
diff --git a/kde-unstable/kdeaccessibility/PKGBUILD b/kde-unstable/kdeaccessibility/PKGBUILD
index 37fe2397e..9fe34bcd9 100644
--- a/kde-unstable/kdeaccessibility/PKGBUILD
+++ b/kde-unstable/kdeaccessibility/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 124844 2011-05-24 18:14:06Z andrea $
+# $Id: PKGBUILD 125373 2011-05-26 10:37:17Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
@@ -15,7 +15,7 @@ url='http://accessibility.kde.org'
 license=('GPL' 'FDL')
 groups=('kde' 'kdeaccessibility')
 makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdelibs' 'speech-dispatcher')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
+source=("http://download.kde.org/unstable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
 sha1sums=('a8d4ca99dadc9439b6a1ee91645527f954665cb1')
 
 build() {
diff --git a/kde-unstable/kdebase-runtime/PKGBUILD b/kde-unstable/kdebase-runtime/PKGBUILD
index 41d9de7c2..70105c4ec 100644
--- a/kde-unstable/kdebase-runtime/PKGBUILD
+++ b/kde-unstable/kdebase-runtime/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 124658 2011-05-23 19:42:48Z andrea $
+# $Id: PKGBUILD 125373 2011-05-26 10:37:17Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
@@ -11,13 +11,13 @@ arch=('i686' 'x86_64')
 url='http://www.kde.org'
 license=('GPL' 'LGPL')
 depends=('kdelibs' 'ntrack' 'smbclient' 'libssh' 'libcanberra' 'oxygen-icons'
-        'xorg-xauth' 'hicolor-icon-theme' 'libqzeitgeist')
+        'xorg-xauth' 'hicolor-icon-theme')
 makedepends=('pkg-config' 'cmake' 'automoc4' 'kdepimlibs' 'openslp' 'xine-lib')
 optdepends=('htdig: to build the search index in khelpcenter'
             'rarian: needed by khelpcenter'
             'gdb: drkonq crash handler')
 install="${pkgname}.install"
-source=("http://download.kde.org/stable/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2")
+source=("http://download.kde.org/unstable/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2")
 sha1sums=('5d06c11f43beb21ebf6c47d2a7addcbe710e019e')
 
 build() {
diff --git a/kde-unstable/kdebase-workspace/PKGBUILD b/kde-unstable/kdebase-workspace/PKGBUILD
index e1763778b..fae8c192f 100644
--- a/kde-unstable/kdebase-workspace/PKGBUILD
+++ b/kde-unstable/kdebase-workspace/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 124944 2011-05-25 10:38:26Z andrea $
+# $Id: PKGBUILD 125374 2011-05-26 12:53:42Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=kdebase-workspace
 _pkgname=kde-workspace
 pkgver=4.6.80
-pkgrel=1
+pkgrel=2
 pkgdesc="KDE Base Workspace"
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
@@ -16,7 +16,7 @@ groups=('kde')
 #	but nvidia providing libgl does not depend on libxdamage
 depends=('kdepim-runtime' 'lm_sensors' 'libraw1394'  'libqalculate' 'qimageblitz'
          'polkit-kde' 'consolekit' 'xorg-xprop' 'libxdamage' 'libxklavier' 'libdmtx'
-         'xorg-xsetroot' 'libxcomposite' 'libxinerama' 'libgles' 'kde-wallpapers')
+         'xorg-xsetroot' 'libxcomposite' 'libxinerama' 'kde-wallpapers')
 makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' 'kdebindings-python')
 replaces=('kdmtheme' 'kde-common' 'guidance-power-manager' 'policykit-kde' 'kdebase-kinfocenter')
 conflicts=('kde-common' 'guidance-power-manager' 'policykit-kde' 'kdebase-kinfocenter')
@@ -26,7 +26,7 @@ backup=('usr/share/config/kdm/kdmrc'
         'etc/pam.d/kde-np'
         'etc/pam.d/kscreensaver')
 options=('emptydirs')
-source=("http://download.kde.org/stable/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2"
+source=("http://download.kde.org/unstable/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2"
         'kdm-zsh-profile.patch' 'kdm' 'kde.pam' 'kde-np.pam' 'kscreensaver.pam'
         'fixpath.patch' 'terminate-server.patch')
 sha1sums=('99bf68ee90c4cfa3568527a55c7c68d4247d9b13'
@@ -48,15 +48,17 @@ build() {
 	mkdir build
 	cd build
 	cmake ../${_pkgname}-${pkgver} \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_SKIP_RPATH=ON \
-		-DCMAKE_INSTALL_PREFIX=/usr \
-		-DWITH_Xmms=OFF \
-		-DWITH_Googlegadgets=OFF \
-		-DWITH_libgps=OFF \
-		-DWITH_Prison=OFF \
+        -DCMAKE_BUILD_TYPE=Release \
+        -DCMAKE_SKIP_RPATH=ON \
+        -DCMAKE_INSTALL_PREFIX=/usr \
+        -DWITH_Xmms=OFF \
+        -DWITH_Googlegadgets=OFF \
+        -DWITH_libgps=OFF \
+        -DWITH_Prison=OFF \
         -DWITH_NetworkManager=OFF \
-		-DKWIN_MOBILE_EFFECTS=OFF
+        -DKWIN_MOBILE_EFFECTS=OFF \
+        -DWITH_OpenGLES=OFF \
+        -DKWIN_BUILD_WITH_OPENGLES=OFF
 	make
 }
 
diff --git a/kde-unstable/kdegraphics/PKGBUILD b/kde-unstable/kdegraphics/PKGBUILD
index 9aaa3cacf..4780a97e7 100644
--- a/kde-unstable/kdegraphics/PKGBUILD
+++ b/kde-unstable/kdegraphics/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 124827 2011-05-24 16:19:00Z andrea $
+# $Id: PKGBUILD 125373 2011-05-26 10:37:17Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
@@ -12,7 +12,7 @@ license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdegraphics')
 makedepends=('kdelibs' 'pkgconfig' 'cmake' 'automoc4' 'qimageblitz' 'ebook-tools'
              'poppler-qt' 'libspectre' 'chmlib' 'djvulibre')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
+source=("http://download.kde.org/unstable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
 sha1sums=('69f191663db147cf481edd9f528fcae50c1dc2c3')
 
 build() {
diff --git a/kde-unstable/kdemultimedia/PKGBUILD b/kde-unstable/kdemultimedia/PKGBUILD
index 363b255ed..44d684966 100644
--- a/kde-unstable/kdemultimedia/PKGBUILD
+++ b/kde-unstable/kdemultimedia/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 124769 2011-05-24 09:53:01Z andrea $
+# $Id: PKGBUILD 125373 2011-05-26 10:37:17Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
@@ -18,7 +18,7 @@ license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdemultimedia')
 makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdelibs' 'tunepimp'
             'ffmpeg' 'mplayer' 'pulseaudio' 'libmusicbrainz3')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2"
+source=("http://download.kde.org/unstable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2"
         'mplayerthumbs.config')
 sha1sums=('60fa25d125aa77b66fd1c1e9e043df48abf35bd4'
           'ba016fa2563c14ffcba852c62506b66bfc6ee683')
diff --git a/kde-unstable/phonon/PKGBUILD b/kde-unstable/phonon/PKGBUILD
new file mode 100644
index 000000000..ad7852355
--- /dev/null
+++ b/kde-unstable/phonon/PKGBUILD
@@ -0,0 +1,32 @@
+# $Id: PKGBUILD 125369 2011-05-26 10:11:37Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+
+pkgname=phonon
+pkgver=4.5.55
+pkgrel=1
+arch=('i686' 'x86_64')
+url="http://phonon.kde.org"
+license=('LGPL')
+pkgdesc="The multimedia framework for KDE4"
+depends=('qt' 'phonon-backend' 'libpulse' 'libqzeitgeist')
+optdepends=('pulseaudio: PulseAudio support')
+makedepends=('cmake' 'automoc4' 'pulseaudio')
+source=("${pkgname}-${pkgver}.tar.bz2"::"http://quickgit.kde.org/?p=phonon.git&a=snapshot&h=37ec84753af68c4f30041d080b37f1a49a89197c&fmt=tbz2")
+#source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
+md5sums=('ce1316c88df988320e75a2b4c3cb8804')
+
+build() {
+  cd "${srcdir}"
+  mkdir build
+  cd build
+  cmake ../${pkgname} \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_SKIP_RPATH=ON
+  make
+}
+
+package(){
+  cd "${srcdir}"/build
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/multilib/lib32-libcap/PKGBUILD b/multilib/lib32-libcap/PKGBUILD
index 465de6153..5846329f3 100644
--- a/multilib/lib32-libcap/PKGBUILD
+++ b/multilib/lib32-libcap/PKGBUILD
@@ -3,8 +3,8 @@
 
 _pkgbasename=libcap
 pkgname=lib32-$_pkgbasename
-pkgver=2.19
-pkgrel=4
+pkgver=2.21
+pkgrel=1
 pkgdesc="POSIX 1003.1e capabilities (32-bit)"
 arch=(x86_64)
 url="http://www.kernel.org/pub/linux/libs/security/linux-privs/"
@@ -12,7 +12,7 @@ license=('GPL')
 depends=('lib32-attr' $_pkgbasename)
 makedepends=('gcc-multilib')
 source=(http://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/${_pkgbasename}-${pkgver}.tar.gz)
-md5sums=('9caa6dafc9e3db4cbaecdb8e48f23fa2')
+md5sums=('61966ef40f2dee8731b69db895e4548d')
 
 build() {
   cd ${srcdir}/${_pkgbasename}-${pkgver}
diff --git a/testing/less/PKGBUILD b/testing/less/PKGBUILD
new file mode 100644
index 000000000..c26ddfb00
--- /dev/null
+++ b/testing/less/PKGBUILD
@@ -0,0 +1,30 @@
+# $Id: PKGBUILD 125524 2011-05-26 14:15:10Z stephane $
+# Maintainer: Allan McRae <allan@archlinux.org>
+# Contributor: judd <jvinet@zeroflux.org>
+
+pkgname=less
+pkgver=443
+pkgrel=2
+pkgdesc="A terminal based program for viewing text files"
+license=('GPL3')
+arch=('i686' 'x86_64')
+url="http://www.greenwoodsoftware.com/less"
+groups=('base')
+depends=('ncurses' 'pcre')
+source=(http://www.greenwoodsoftware.com/$pkgname/$pkgname-$pkgver.tar.gz)
+md5sums=('47db098fb3cdaf847b3c4be05ee954fc')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  ./configure --prefix=/usr --sysconfdir=/etc --with-regex=pcre
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  make prefix="${pkgdir}"/usr install
+  install -dm755 "${pkgdir}"/bin
+  mv "${pkgdir}"/usr/bin/${pkgname} "${pkgdir}"/bin
+}
diff --git a/testing/less/zless b/testing/less/zless
new file mode 100644
index 000000000..93d560bc5
--- /dev/null
+++ b/testing/less/zless
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+: ${PAGER=less}
+export PAGER
+
+PATH="/usr/bin:$PATH"
+export PATH
+
+exec zmore ${1+"$@"}
diff --git a/testing/mesa/PKGBUILD b/testing/mesa/PKGBUILD
index 93e6e6e42..d478f1f56 100644
--- a/testing/mesa/PKGBUILD
+++ b/testing/mesa/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 121126 2011-04-29 05:00:59Z andyrtr $
+# $Id: PKGBUILD 125601 2011-05-26 20:48:20Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
@@ -9,7 +9,7 @@ _git=true
 #_git=false
 
 if [ "${_git}" = "true" ]; then
-    pkgver=7.10.99.git20110429
+    pkgver=7.10.99.git20110526
   else
     pkgver=7.10.2
 fi
@@ -21,8 +21,8 @@ url="http://mesa3d.sourceforge.net"
 license=('custom')
 source=(LICENSE gnome-shell-shader-fix.patch nouveau-fix-header.patch)
 if [ "${_git}" = "true" ]; then
-	# mesa git shot from 7.11 branch - see for state: http://cgit.freedesktop.org/mesa/mesa/commit/?id=608a4a17feea9fba2812d4e5c01dd6dbadc5d6e0
-	source=(${source[@]} 'ftp://ftp.archlinux.org/other/mesa/mesa-608a4a17feea9fba2812d4e5c01dd6dbadc5d6e0.tar.bz2')
+	# mesa git shot from mastee (will become 7.11) branch - see for state: http://cgit.freedesktop.org/mesa/mesa/commit/?id=f7b3f40b70dc7dd602897d364011089047583c5d
+	source=(${source[@]} 'ftp://ftp.archlinux.org/other/mesa/mesa-f7b3f40b70dc7dd602897d364011089047583c5d.tar.bz2')
   else
 	source=(${source[@]} "ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2"
 )
@@ -30,7 +30,7 @@ fi
 md5sums=('5c65a0fe315dd347e09b1f2826a1df5a'
          '3ec78f340f9387abd7a37b195e764cbf'
          '67c87b77cc2236b52a3b47dad3fbb5d4'
-         '8d1a895110a6d3b7c51b3521f794bae2')
+         'ca2b343a0b8077fda38077c547b80fc3')
 
 build() {
 if [ "${_git}" = "true" ]; then
diff --git a/testing/xf86-video-ati/PKGBUILD b/testing/xf86-video-ati/PKGBUILD
new file mode 100644
index 000000000..c10416455
--- /dev/null
+++ b/testing/xf86-video-ati/PKGBUILD
@@ -0,0 +1,31 @@
+# $Id: PKGBUILD 125569 2011-05-26 19:49:03Z andyrtr $
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+# Contributor: Alexander Baldeck <alexander@archlinux.org>
+
+pkgname=xf86-video-ati
+pkgver=6.14.2
+pkgrel=1
+pkgdesc="X.org ati video driver"
+arch=(i686 x86_64)
+url="http://xorg.freedesktop.org/"
+license=('custom')
+depends=(libpciaccess libdrm udev pixman ati-dri)
+makedepends=('xorg-server-devel' 'libdrm' 'xf86driproto' 'mesa')
+conflicts=('xorg-server<1.10.0')
+groups=('xorg-drivers' 'xorg')
+options=('!libtool')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('111ec4aef32a4298df7e38afa8bef373')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./configure --prefix=/usr --enable-dri
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make "DESTDIR=${pkgdir}" install
+  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
+  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
+}
diff --git a/testing/xf86-video-ati/ati-fix-build-1.10.patch b/testing/xf86-video-ati/ati-fix-build-1.10.patch
new file mode 100644
index 000000000..75980cbf3
--- /dev/null
+++ b/testing/xf86-video-ati/ati-fix-build-1.10.patch
@@ -0,0 +1,38 @@
+From ecfdb209afe2aafc378baab8c511f5df7b000270 Mon Sep 17 00:00:00 2001
+From: Sedat Dilek <sedat.dilek@googlemail.com>
+Date: Fri, 25 Feb 2011 21:48:14 +0100
+Subject: [PATCH] UMS: Fix build against xserver 1.10-rc3
+
+This issue was introduced due to last minute backout of RandR-1.4
+in xserver 1.10-rc3.
+
+Switch to "#ifdef RANDR_14_INTERFACE" as suggested by Keith Packard.
+See also <http://lists.x.org/archives/xorg-devel/2011-February/019643.html>.
+
+Note:
+The ddx needs a rebuild as the X video driver ABI changed to version 10.0.
+
+Reported-by: Alex Deucher <alexdeucher@gmail.com>
+CC: Keith Packard <keithp@keithp.com>
+Signed-off-by: Sedat Dilek <sedat.dilek@gmail.com>
+---
+ src/radeon_output.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/radeon_output.c b/src/radeon_output.c
+index 15cef06..ccde346 100644
+--- a/src/radeon_output.c
++++ b/src/radeon_output.c
+@@ -1622,7 +1622,7 @@ radeon_set_mode_for_property(xf86OutputPtr output)
+ 	xf86CrtcPtr crtc = output->crtc;
+ 
+ 	if (crtc->enabled) {
+-#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(1,9,99,901,0)
++#ifdef RANDR_14_INTERFACE
+ 	    xf86CrtcSetRec crtc_set_rec;
+ 
+ 	    crtc_set_rec.flags = (XF86CrtcSetMode |
+-- 
+1.7.1
+
+