Tue Jun 26 00:01:48 UTC 2012

108 files changed, 6885 insertions, 216 deletions

diff --git a/community-testing/evas_generic_loaders-svn/PKGBUILD b/community-testing/evas_generic_loaders-svn/PKGBUILD
new file mode 100644
index 000000000..73305f49d
--- /dev/null
+++ b/community-testing/evas_generic_loaders-svn/PKGBUILD
@@ -0,0 +1,53 @@
+# $Id: PKGBUILD 72911 2012-06-24 19:23:41Z foutrelis $
+# Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com>
+# Contributor: Ronald van Haren <ronald.archlinux.org>
+
+pkgname=evas_generic_loaders-svn
+pkgver=72171
+pkgrel=2
+pkgdesc="Additional generic loaders for Evas"
+arch=('i686' 'x86_64')
+groups=('e17-libs-svn' 'e17-svn')
+url="http://www.enlightenment.org"
+license=('BSD')
+depends=('librsvg' 'gstreamer0.10' 'poppler' 'libraw' 'libspectre' 'eina-svn')
+makedepends=('subversion')
+conflicts=('evas_generic_loaders')
+provides=('evas_generic_loaders')
+options=('!libtool' '!emptydirs')
+md5sums=()
+         
+_svntrunk="http://svn.enlightenment.org/svn/e/trunk/evas_generic_loaders"
+_svnmod="evas_generic_loaders"
+
+build() {
+   cd "$srcdir"
+
+msg "Connecting to $_svntrunk SVN server...."
+  if [ -d $_svnmod/.svn ]; then
+    (cd $_svnmod && svn up -r $pkgver)
+  else
+    svn co $_svntrunk --config-dir ./ -r $pkgver $_svnmod
+  fi
+
+  msg "SVN checkout done or server timeout"
+  msg "Starting make..."
+
+  cp -r $_svnmod $_svnmod-build
+  cd $_svnmod-build
+
+  ./autogen.sh --prefix=/usr
+  make
+}
+
+package() {
+  cd "$srcdir/$_svnmod-build"
+  make DESTDIR="$pkgdir" install
+
+# install license files
+  install -Dm644 "$srcdir/$_svnmod-build/COPYING" \
+        "$pkgdir/usr/share/licenses/$pkgname/COPYING"
+
+  rm -r "$srcdir/$_svnmod-build"
+
+}
diff --git a/community-testing/gambas2/PKGBUILD b/community-testing/gambas2/PKGBUILD
new file mode 100644
index 000000000..4fa7a1821
--- /dev/null
+++ b/community-testing/gambas2/PKGBUILD
@@ -0,0 +1,954 @@
+# $Id: PKGBUILD 72912 2012-06-24 19:23:54Z foutrelis $
+# Maintainer : Laurent Carlier <lordheavym@gmail.com>
+# Contributor: Biru Ionut <ionut@archlinux.ro>
+# Contributor: Andrea Scarpino <andrea@archlinux.org>
+# Contributor: Giovanni Scafora <giovanni@archlinux.org>
+# Contributor: Douglas Soares de Andrade <dsa@aur.archlinux.org>
+# Contributor: Toni Foerster <stonerl@skeps.de>
+
+pkgbase="gambas2"
+pkgname=('gambas2-meta' 'gambas2-runtime' 'gambas2-devel' 'gambas2-ide' 'gambas2-examples' 'gambas2-help'
+         'gambas2-script' 'gambas2-gb-chart' 'gambas2-gb-compress' 'gambas2-gb-corba' 'gambas2-gb-crypt'
+         'gambas2-gb-db' 'gambas2-gb-db-firebird' 'gambas2-gb-db-form' 'gambas2-gb-db-mysql'
+         'gambas2-gb-db-odbc' 'gambas2-gb-db-postgresql' 'gambas2-gb-db-sqlite2' 'gambas2-gb-db-sqlite3' 
+         'gambas2-gb-desktop' 'gambas2-gb-form' 'gambas2-gb-form-dialog' 'gambas2-gb-form-mdi'
+         'gambas2-gb-gtk' 'gambas2-gb-gtk-ext' 'gambas2-gb-gtk-svg' 'gambas2-gb-gui'
+         'gambas2-gb-image' 'gambas2-gb-info' 'gambas2-gb-net' 'gambas2-gb-net-curl'
+         'gambas2-gb-net-smtp' 'gambas2-gb-opengl' 'gambas2-gb-option' 'gambas2-gb-pcre'
+         'gambas2-gb-pdf' 'gambas2-gb-qt' 'gambas2-gb-qt-ext' 'gambas2-gb-qt-opengl'
+         'gambas2-gb-qt-kde' 'gambas2-gb-qt-kde-html' 'gambas2-gb-report' 'gambas2-gb-sdl'
+         'gambas2-gb-sdl-sound' 'gambas2-gb-settings' 'gambas2-gb-v4l' 'gambas2-gb-vb'
+         'gambas2-gb-web' 'gambas2-gb-xml' 'gambas2-gb-xml-rpc' 'gambas2-gb-xml-xslt')
+pkgver=2.24.0
+pkgrel=2
+pkgdesc="A free development environment based on a Basic interpreter."
+arch=('i686' 'x86_64')
+url="http://gambas.sourceforge.net"
+makedepends=('libffi' 'bzip2' 'libfbclient' 'zlib' 'kdelibs3' 'libgl' 'gtk2' 'librsvg' 'xdg-utils'
+         'postgresql-libs' 'libmysqlclient' 'unixodbc' 'sqlite2' 'sqlite'
+         'curl' 'poppler-glib' 'sdl_mixer' 'sdl_image' 'libxtst' 'pcre' 'omniorb' 'libxft'
+         'libxcursor' 'libsm' 'intltool' 'mysql' 'postgresql')
+license=('GPL2')
+options=('!emptydirs' '!makeflags')
+groups=('gambas2')
+replaces=('gambas2')
+conflicts=('gambas2')
+source=(http://downloads.sourceforge.net/gambas/$pkgbase-$pkgver.tar.bz2
+        'fix-gbi-gba-path.patch'
+	'gambas2-script.install' 'gambas2-runtime.install'
+	'poppler-0.20.patch')
+md5sums=('b59072b6f57b681d586cc84c02333690'
+         '9dda03a1bbfb7e7ba8b6a4ae91b6752b'
+         '870ff5b4b33cd75aa9c290539e6fdd5d'
+         'ab5667175c4945282d2f40a35d0e9e5b')
+_gbfiles="${srcdir}/$pkgbase-$pkgver/main/gbc"
+
+_buildgbcomp() {
+  cd ${srcdir}/${pkgbase}-${pkgver}/comp/src/$1
+  ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbc2 -ag -r ${pkgdir}/usr
+  ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gba2
+  install $1.gambas ${pkgdir}/usr/lib/gambas2/
+  install .component ${pkgdir}/usr/lib/gambas2/$1.component
+  chmod a-x ${pkgdir}/usr/lib/gambas2/$1.component
+  install .info ${pkgdir}/usr/share/gambas2/info/$1.info
+  chmod a-x ${pkgdir}/usr/share/gambas2/info/$1.info
+  install .list ${pkgdir}/usr/share/gambas2/info/$1.list
+  chmod a-x ${pkgdir}/usr/share/gambas2/info/$1.list
+  if test -d control; then
+    install -d ${pkgdir}/usr/share/gambas2/control/$1
+    install control/*.png ${pkgdir}/usr/share/gambas2/control/$1
+    chmod a-x ${pkgdir}/usr/share/gambas2/control/$1/*.png
+  fi
+}
+
+build() {
+  cd "${srcdir}/$pkgbase-$pkgver"
+
+  msg "Applying patches ..."
+  # workaround to allow package splitting
+  patch -Np1 -i ../fix-gbi-gba-path.patch
+  # fix building with poppler-0.20.x (merged upstream)
+  cd gb.pdf
+  patch -Np0 -i ../../poppler-0.20.patch
+  cd ..
+
+  ./reconf-all
+  ##
+  
+  . /etc/profile.d/kde3.sh
+  . /etc/profile.d/qt3.sh
+
+  ./configure -C --disable-qte --prefix=/usr
+  make bindir=${pkgdir}/usr/bin
+}
+
+package_gambas2-meta() {
+  depends=('gambas2-runtime' 'gambas2-devel' 'gambas2-ide' 'gambas2-examples' 'gambas2-help'
+           'gambas2-script' 'gambas2-gb-chart' 'gambas2-gb-compress' 'gambas2-gb-corba' 'gambas2-gb-crypt'
+           'gambas2-gb-db' 'gambas2-gb-db-firebird' 'gambas2-gb-db-form' 'gambas2-gb-db-mysql'
+           'gambas2-gb-db-odbc' 'gambas2-gb-db-postgresql' 'gambas2-gb-db-sqlite2' 'gambas2-gb-db-sqlite3' 
+           'gambas2-gb-desktop' 'gambas2-gb-form' 'gambas2-gb-form-dialog' 'gambas2-gb-form-mdi'
+           'gambas2-gb-gtk' 'gambas2-gb-gtk-ext' 'gambas2-gb-gtk-svg' 'gambas2-gb-gui'
+           'gambas2-gb-image' 'gambas2-gb-info' 'gambas2-gb-net' 'gambas2-gb-net-curl'
+           'gambas2-gb-net-smtp' 'gambas2-gb-opengl' 'gambas2-gb-option' 'gambas2-gb-pcre'
+           'gambas2-gb-pdf' 'gambas2-gb-qt' 'gambas2-gb-qt-ext' 'gambas2-gb-qt-opengl'
+           'gambas2-gb-qt-kde' 'gambas2-gb-qt-kde-html' 'gambas2-gb-report' 'gambas2-gb-sdl'
+           'gambas2-gb-sdl-sound' 'gambas2-gb-settings' 'gambas2-gb-v4l' 'gambas2-gb-vb'
+           'gambas2-gb-web' 'gambas2-gb-xml' 'gambas2-gb-xml-rpc' 'gambas2-gb-xml-xslt')
+  pkgdesc="Gambas2 meta package"
+}
+
+package_gambas2-runtime() {
+  depends=('libffi' 'xdg-utils')
+  pkgdesc="Gambas2 runtime environment"
+  install=gambas2-runtime.install
+
+  cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx
+  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
+  cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/debug
+  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
+  cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/eval
+  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
+  cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/draw
+  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
+
+  install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/main/lib/gb.component \
+    ${pkgdir}/usr/lib/gambas2
+  ln -s gbx2 ${pkgdir}/usr/bin/gbr2
+  ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb
+  rm -f ${pkgdir}/usr/lib/gambas2/gb.{so*,la}
+
+  ## needed for postinst with xdg-utils
+  install -d -m755 ${pkgdir}/usr/share/gambas2/mime
+  install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/main/mime/* \
+    ${pkgdir}/usr/share/gambas2/mime/
+  install -d -m755 ${pkgdir}/usr/share/gambas2/icons
+  install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/main/mime/application-x-gambas.png \
+    ${pkgdir}/usr/share/gambas2/icons/application-x-gambas.png
+}
+
+package_gambas2-devel() {
+  depends=('gambas2-runtime')
+  pkgdesc="Gambas2 development environment"
+
+  cd ${srcdir}/${pkgbase}-${pkgver}/main/gbc
+  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
+}
+
+package_gambas2-ide() {
+  depends=('gambas2-gb-qt-ext' 'gambas2-gb-form-dialog' 'gambas2-gb-form-mdi' 'gambas2-gb-settings'
+           'gambas2-gb-db' 'gambas2-gb-desktop' 'gambas2-devel')
+  pkgdesc="Gambas2 Integrated Development Environment"
+#  arch=('any')
+
+  ## workaround for splitting
+  cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx
+  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
+  cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/eval
+  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
+  cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/debug
+  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
+  ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb
+  cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/draw
+  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
+  ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb
+  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt
+  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
+  cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/db
+  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
+  cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/gui
+  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
+  ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr
+  _buildgbcomp gb.form
+  _buildgbcomp gb.form.dialog
+  _buildgbcomp gb.form.mdi
+  _buildgbcomp gb.settings
+  ##
+
+  cd ${srcdir}/${pkgbase}-${pkgver}/app/src/gambas2
+  ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbc2 -ag -r ${pkgdir}/usr
+  ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gba2
+  cd ${srcdir}/${pkgbase}-${pkgver}/app/src/gambas2-database-manager
+  ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbc2 -ag -r ${pkgdir}/usr
+  ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gba2
+  cd ${srcdir}/${pkgbase}-${pkgver}/app/src/
+
+  ## cleanup the workaround
+  rm -r ${pkgdir}/usr/share ${pkgdir}/usr/lib
+  rm ${pkgdir}/usr/bin/gbx2
+  ##
+
+  install -m755 gambas2/gambas2.gambas ${pkgdir}/usr/bin
+  install -m755 gambas2-database-manager/gambas2-database-manager.gambas ${pkgdir}/usr/bin
+  ln -s gambas2.gambas ${pkgdir}/usr/bin/gambas2
+  install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/app/desktop/gambas2.desktop \
+    ${pkgdir}/usr/share/applications/gambas2.desktop
+  install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/app/desktop/gambas2.png \
+    ${pkgdir}/usr/share/pixmaps/gambas2.png
+}
+
+package_gambas2-examples() {
+  depends=('gambas2-gb-compress' 'gambas2-gb-corba' 'gambas2-gb-crypt'
+           'gambas2-gb-db-firebird' 'gambas2-gb-db-form' 'gambas2-gb-db-mysql'
+           'gambas2-gb-db-odbc' 'gambas2-gb-db-postgresql' 'gambas2-gb-db-sqlite2' 'gambas2-gb-db-sqlite3' 
+           'gambas2-gb-desktop' 'gambas2-gb-form-dialog' 'gambas2-gb-form-mdi'
+           'gambas2-gb-gtk-ext' 'gambas2-gb-gtk-svg' 'gambas2-gb-gui'
+           'gambas2-gb-image' 'gambas2-gb-info' 'gambas2-gb-net' 'gambas2-gb-net-curl'
+           'gambas2-gb-net-smtp' 'gambas2-gb-opengl' 'gambas2-gb-option' 'gambas2-gb-pcre'
+           'gambas2-gb-pdf' 'gambas2-gb-qt-ext' 'gambas2-gb-qt-opengl'
+           'gambas2-gb-qt-kde-html' 'gambas2-gb-report' 'gambas2-gb-sdl'
+           'gambas2-gb-sdl-sound' 'gambas2-gb-settings' 'gambas2-gb-v4l' 'gambas2-gb-vb'
+           'gambas2-gb-web' 'gambas2-gb-xml-rpc' 'gambas2-gb-xml-xslt')
+  pkgdesc="Gambas2 examples"
+#  arch=('any')
+
+  cd ${srcdir}/${pkgbase}-${pkgver}
+  make XDG_UTILS='' DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
+
+  rm -r ${pkgdir}/usr/bin ${pkgdir}/usr/lib
+  rm -r ${pkgdir}/usr/share/gambas2/{help,info}
+}
+
+package_gambas2-help() {
+  depends=()
+  pkgdesc="Gambas2 help files"
+#  arch=('any')
+
+  cd ${srcdir}/${pkgbase}-${pkgver}/help
+  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
+
+  #fix help
+  chown root:root -R ${pkgdir}/usr/share/gambas2/help/help
+}
+
+package_gambas2-script() {
+  depends=('gambas2-devel')
+  pkgdesc="Gambas2 scripter and server programs support"
+  install=gambas2-script.install
+#  arch=('any')
+
+  ## workaround for splitting
+  cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx
+  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
+  cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/eval
+  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
+  ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb
+  ##
+
+  cd ${srcdir}/${pkgbase}-${pkgver}/app/src/gbs2
+  ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbc2 -ag -r ${pkgdir}/usr
+  ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gba2
+  install -m755 gbs2.gambas ${pkgdir}/usr/bin
+
+  ln -s gbs2.gambas ${pkgdir}/usr/bin/gbs2
+  ln -s gbs2.gambas ${pkgdir}/usr/bin/gbw2  
+
+  ## cleanup the workaround
+  rm -r ${pkgdir}/usr/share ${pkgdir}/usr/lib
+  rm ${pkgdir}/usr/bin/gbx2
+  ##
+
+  ## needed for postinst with xdg-utils
+  cd ${srcdir}/${pkgbase}-${pkgver}/app/mime
+  install -d -m755 ${pkgdir}/usr/share/gambas2/mime
+  install -D -m644 *.xml ${pkgdir}/usr/share/gambas2/mime/
+  install -D -m644 *.png ${pkgdir}/usr/share/gambas2/mime/
+  ##
+}
+
+package_gambas2-gb-chart() {
+  depends=('gambas2-gb-form')
+  pkgdesc="Gambas2 chart component"
+#  arch=('any')
+
+  ## workaround for splitting
+  cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx
+  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
+  mkdir -p ${pkgdir}/usr/share/gambas2/info
+  cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/draw
+  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
+  ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb
+  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt
+  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
+  cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/gui
+  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
+  ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr
+  ##
+
+  _buildgbcomp gb.form
+  _buildgbcomp gb.chart
+
+  ## cleanup the workaround
+  rm ${pkgdir}/usr/share/gambas2/info/{gb.{info,list},gb.qt*,gb.gui*,gb.form*}
+  rm ${pkgdir}/usr/lib/gambas2/{gb.draw*,gb.qt*,gb.{so*,la},gb.gui*,gb.form*}
+  rm -rf ${pkgdir}/usr/bin
+  ##
+}
+
+package_gambas2-gb-compress() {
+  depends=('gambas2-runtime' 'bzip2' 'zlib')
+  pkgdesc="Gambas2 compression support component"
+
+  cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/compress
+  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
+  cd ${srcdir}/${pkgbase}-${pkgver}/gb.compress.bzlib2
+  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
+  cd ${srcdir}/${pkgbase}-${pkgver}/gb.compress.zlib
+  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
+}
+
+package_gambas2-gb-corba() {
+  depends=('gambas2-runtime' 'omniorb')
+  pkgdesc="Gambas2 corba component"
+
+  cd ${srcdir}/${pkgbase}-${pkgver}/gb.corba
+  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
+}
+
+package_gambas2-gb-crypt() {
+  depends=('gambas2-runtime')
+  pkgdesc="Gambas2 MD5/DES crypting component"
+
+  cd ${srcdir}/${pkgbase}-${pkgver}/gb.crypt
+  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
+}
+
+package_gambas2-gb-db() {
+  depends=('gambas2-runtime')
+  pkgdesc="Gambas2 database access component"
+
+  cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/db
+  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
+}
+
+package_gambas2-gb-db-firebird() {
+  depends=('gambas2-gb-db' 'libfbclient')
+  pkgdesc="Gambas2 Firebird database access component"
+
+  cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.firebird
+  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
+}
+
+package_gambas2-gb-db-form() {
+  depends=('gambas2-gb-db' 'gambas2-gb-form')
+  pkgdesc="Gambas2 database form component"
+#  arch=('any')
+
+  ## workaround for splitting
+  cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx
+  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
+  mkdir -p ${pkgdir}/usr/share/gambas2/info
+  cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/draw
+  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
+  ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb
+  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt
+  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
+  cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/gui
+  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
+  cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/db
+  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
+  ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr
+  ##
+
+  _buildgbcomp gb.db.form
+
+  ## cleanup the workaround
+  rm ${pkgdir}/usr/share/gambas2/info/{gb.{info,list},gb.qt*,gb.gui*,gb.db.{info,list}}
+  rm ${pkgdir}/usr/lib/gambas2/{gb.draw*,gb.qt*,gb.{so*,la},gb.gui*,gb.db.{so*,la,component}}
+  rm -rf ${pkgdir}/usr/bin
+  ##
+}
+
+package_gambas2-gb-db-mysql() {
+  depends=('gambas2-gb-db' 'libmysqlclient')
+  pkgdesc="Gambas2 MySQL database access component"
+
+  cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.mysql
+  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
+}
+
+package_gambas2-gb-db-odbc() {
+  depends=('gambas2-gb-db' 'unixodbc')
+  pkgdesc="Gambas2 ODBC database access component"
+
+  cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.odbc
+  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
+}
+
+package_gambas2-gb-db-postgresql() {
+  depends=('gambas2-gb-db' 'postgresql-libs>=8.4.1')
+  pkgdesc="Gambas2 PostgreSQL database access component"
+
+  cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.postgresql
+  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
+}
+
+package_gambas2-gb-db-sqlite2() {
+  depends=('gambas2-gb-db' 'sqlite2')
+  pkgdesc="Gambas2 Sqlite2 database access component"
+
+  cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.sqlite2
+  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
+}
+
+package_gambas2-gb-db-sqlite3() {
+  depends=('gambas2-gb-db' 'sqlite')
+  pkgdesc="Gambas2 Sqlite3 database access component"
+
+  cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.sqlite3
+  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
+}
+
+package_gambas2-gb-desktop() {
+  depends=('gambas2-runtime' 'libsm' 'libxtst')
+  pkgdesc="Gambas2 desktop component"
+
+  ## workaround for splitting
+  cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx
+  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
+  mkdir -p ${pkgdir}/usr/share/gambas2/info
+  ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb
+  cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/draw
+  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
+  ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb
+  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt
+  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
+  ##
+
+  cd ${srcdir}/${pkgbase}-${pkgver}/gb.desktop
+  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
+
+  ## cleanup the workaround
+  rm ${pkgdir}/usr/share/gambas2/info/{gb.{info,list},gb.qt*}
+  rm ${pkgdir}/usr/lib/gambas2/{gb.{so*,la},gb.qt*,gb.draw*}
+  rm -rf ${pkgdir}/usr/bin
+  ##
+}
+
+package_gambas2-gb-form() {
+  depends=('gambas2-gb-gui')
+  pkgdesc="Gambas2 form component"
+#  arch=('any')
+
+  ## workaround for splitting
+  cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx
+  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
+  mkdir -p ${pkgdir}/usr/share/gambas2/info
+  cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/draw
+  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
+  ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb
+  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt
+  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
+  cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/gui
+  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
+  ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr
+  ##
+
+  _buildgbcomp gb.form
+
+  ## cleanup the workaround
+  rm ${pkgdir}/usr/share/gambas2/info/{gb.{info,list},gb.qt*,gb.gui*}
+  rm ${pkgdir}/usr/lib/gambas2/{gb.draw*,gb.qt*,gb.{so*,la},gb.gui*}
+  rm -rf ${pkgdir}/usr/bin
+  ##
+}
+
+package_gambas2-gb-form-dialog() {
+  depends=('gambas2-gb-form')
+  pkgdesc="Gambas2 form dialog component"
+#  arch=('any')
+
+  ## workaround for splitting
+  cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx
+  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
+  mkdir -p ${pkgdir}/usr/share/gambas2/info
+  cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/draw
+  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
+  ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb
+  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt
+  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
+  cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/gui
+  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
+  ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr
+  ##
+
+  _buildgbcomp gb.form
+  _buildgbcomp gb.form.dialog
+
+  ## cleanup the workaround
+  rm ${pkgdir}/usr/share/gambas2/info/{gb.{info,list},gb.form.{info,list},gb.qt*,gb.gui*}
+  rm ${pkgdir}/usr/lib/gambas2/{gb.draw*,gb.qt*,gb.{so*,la},gb.form.{component,gambas},gb.gui*}
+  rm -rf ${pkgdir}/usr/bin
+  ##
+}
+
+package_gambas2-gb-form-mdi() {
+  depends=('gambas2-gb-form')
+  pkgdesc="Gambas2 form MDI component"
+#  arch=('any')
+
+  ## workaround for splitting
+  cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx
+  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
+  mkdir -p ${pkgdir}/usr/share/gambas2/info
+  cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/draw
+  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
+  ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb
+  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt
+  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
+  cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/gui
+  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
+  ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr
+  ##
+
+  _buildgbcomp gb.form
+  _buildgbcomp gb.form.mdi
+
+  ## cleanup the workaround
+  rm ${pkgdir}/usr/share/gambas2/info/{gb.{info,list},gb.form.{info,list},gb.qt*,gb.gui*}
+  rm ${pkgdir}/usr/lib/gambas2/{gb.draw*,gb.qt*,gb.{so*,la},gb.form.{component,gambas},gb.gui*}
+  rm -rf ${pkgdir}/usr/bin
+  ##
+}
+
+package_gambas2-gb-gtk() {
+  depends=('gambas2-runtime' 'gtk2')
+  pkgdesc="Gambas2 graphical GTK+ toolkit component"
+
+  ## workaround for splitting
+  cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx
+  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
+  mkdir -p ${pkgdir}/usr/share/gambas2/info
+  cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/draw
+  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
+  ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb
+  ##
+
+  cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk
+  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
+
+  ## cleanup the workaround
+  rm ${pkgdir}/usr/share/gambas2/info/{gb.{info,list},gb.gtk.ext*}
+  rm ${pkgdir}/usr/lib/gambas2/{gb.draw*,gb.gtk.ext*,gb.{so*,la}}
+  rm -rf ${pkgdir}/usr/bin
+  ##
+}
+
+package_gambas2-gb-gtk-ext() {
+  depends=('gambas2-gb-gtk')
+  pkgdesc="Gambas2 graphical GTK+ toolkit extension component"
+
+  ## workaround for splitting
+  cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx
+  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
+  mkdir -p ${pkgdir}/usr/share/gambas2/info
+  ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb
+  ##
+
+  cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk/src/ext
+  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
+
+  ## cleanup the workaround
+  rm ${pkgdir}/usr/share/gambas2/info/gb.{info,list}
+  rm ${pkgdir}/usr/lib/gambas2/gb.{so*,la}
+  rm -rf ${pkgdir}/usr/bin
+  ##
+}
+
+package_gambas2-gb-gtk-svg() {
+  depends=('gambas2-gb-gtk' 'librsvg')
+  pkgdesc="Gambas2 graphical GTK+ toolkit svg component"
+
+  ## workaround for splitting
+  cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx
+  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
+  mkdir -p ${pkgdir}/usr/share/gambas2/info
+  ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb
+  ##
+
+  cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk.svg
+  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
+
+  ## cleanup the workaround
+  rm ${pkgdir}/usr/share/gambas2/info/gb.{info,list}
+  rm ${pkgdir}/usr/lib/gambas2/gb.{so*,la}
+  rm -rf ${pkgdir}/usr/bin
+  ##
+}
+
+package_gambas2-gb-gui() {
+  depends=('gambas2-gb-qt' 'gambas2-gb-gtk')
+  pkgdesc="Gambas2 automatic gui toolkit chooser"
+
+  ## workaround for splitting
+  cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx
+  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
+  mkdir -p ${pkgdir}/usr/share/gambas2/info
+  cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/draw
+  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
+  ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb
+  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt
+  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
+  ##
+
+  cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/gui
+  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
+
+  ## cleanup the workaround
+  rm ${pkgdir}/usr/share/gambas2/info/{gb.{info,list},gb.qt*}
+  rm ${pkgdir}/usr/lib/gambas2/{gb.draw*,gb.qt*,gb.{so*,la}}
+  rm -rf ${pkgdir}/usr/bin
+  ##
+}
+
+package_gambas2-gb-image() {
+  depends=('gambas2-runtime')
+  pkgdesc="Gambas2 image processing component"
+
+  cd ${srcdir}/${pkgbase}-${pkgver}/gb.image
+  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
+}
+
+package_gambas2-gb-info() {
+  depends=('gambas2-runtime')
+  pkgdesc="Gambas2 info component"
+#  arch=('any')
+
+  ## workaround for splitting
+  cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx
+  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
+  mkdir -p ${pkgdir}/usr/share/gambas2/info
+  ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb
+  ##
+
+  _buildgbcomp gb.info
+
+  ## cleanup the workaround
+  rm ${pkgdir}/usr/share/gambas2/info/gb.{info,list}
+  rm ${pkgdir}/usr/lib/gambas2/gb.{so*,la}
+  rm -rf ${pkgdir}/usr/bin
+  ##
+}
+
+package_gambas2-gb-net() {
+  depends=('gambas2-runtime')
+  pkgdesc="Gambas2 networking component"
+
+  cd ${srcdir}/${pkgbase}-${pkgver}/gb.net
+  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
+}
+
+package_gambas2-gb-net-curl() {
+  depends=('gambas2-runtime' 'curl')
+  pkgdesc="Gambas2 advanced networking component"
+
+  cd ${srcdir}/${pkgbase}-${pkgver}/gb.net.curl
+  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
+}
+
+package_gambas2-gb-net-smtp() {
+  depends=('gambas2-runtime' 'glib2')
+  pkgdesc="Gambas2 SMTP component"
+
+  cd ${srcdir}/${pkgbase}-${pkgver}/gb.net.smtp
+  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
+}
+
+package_gambas2-gb-opengl() {
+  depends=('gambas2-runtime' 'libgl' 'mesa')
+  pkgdesc="Gambas2 OpenGL component"
+
+  cd ${srcdir}/${pkgbase}-${pkgver}/gb.opengl
+  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
+}
+
+package_gambas2-gb-option() {
+  depends=('gambas2-runtime')
+  pkgdesc="Gambas2 command-line options component"
+
+  cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/option
+  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
+}
+
+package_gambas2-gb-pcre() {
+  depends=('gambas2-runtime' 'pcre')
+  pkgdesc="Gambas2 PCRE component"
+
+  cd ${srcdir}/${pkgbase}-${pkgver}/gb.pcre
+  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
+}
+
+package_gambas2-gb-pdf() {
+  depends=('gambas2-runtime' 'poppler-glib')
+  pkgdesc="Gambas2 PDF component"
+
+  cd ${srcdir}/${pkgbase}-${pkgver}/gb.pdf
+  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
+}
+
+package_gambas2-gb-qt() {
+  depends=('gambas2-runtime' 'qt3')
+  pkgdesc="Gambas2 graphical QT toolkit component"
+
+  ## workaround for splitting
+  cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx
+  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
+  mkdir -p ${pkgdir}/usr/share/gambas2/info
+  cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/draw
+  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
+  ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb
+  ##
+
+  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt
+  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
+
+  ## cleanup the workaround
+  rm ${pkgdir}/usr/share/gambas2/info/{gb.{info,list},gb.qt.ext*,gb.qt.opengl*}
+  rm ${pkgdir}/usr/lib/gambas2/{gb.draw*,gb.qt.ext*,gb.qt.opengl*,gb.{so*,la}}
+  rm -rf ${pkgdir}/usr/bin
+  ##
+}
+
+package_gambas2-gb-qt-ext() {
+  depends=('gambas2-gb-qt')
+  pkgdesc="Gambas2 graphical QT toolkit extension component"
+
+  ## workaround for splitting
+  cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx
+  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
+  mkdir -p ${pkgdir}/usr/share/gambas2/info
+  ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb
+  ##
+
+  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt/src/ext
+  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
+
+  ## cleanup the workaround
+  rm ${pkgdir}/usr/share/gambas2/info/gb.{info,list}
+  rm ${pkgdir}/usr/lib/gambas2/gb.{so*,la}
+  rm -rf ${pkgdir}/usr/bin
+  ##
+}
+
+package_gambas2-gb-qt-opengl() {
+  depends=('gambas2-gb-qt' 'libgl')
+  pkgdesc="Gambas2 graphical QT toolkit OpenGL component"
+
+  ## workaround for splitting
+  cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx
+  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
+  mkdir -p ${pkgdir}/usr/share/gambas2/info
+  ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb
+  ##
+
+  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt/src/opengl
+  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
+
+  ## cleanup the workaround
+  rm ${pkgdir}/usr/share/gambas2/info/gb.{info,list}
+  rm ${pkgdir}/usr/lib/gambas2/gb.{so*,la}
+  rm -rf ${pkgdir}/usr/bin
+  ##
+}
+
+package_gambas2-gb-qt-kde() {
+  depends=('gambas2-gb-qt' 'kdelibs3')
+  pkgdesc="Gambas2 KDE component"
+
+  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt.kde
+  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
+
+  rm ${pkgdir}/usr/share/gambas2/info/gb.qt.kde.html*
+  rm ${pkgdir}/usr/lib/gambas2/gb.qt.kde.html*
+}
+
+package_gambas2-gb-qt-kde-html() {
+  depends=('gambas2-gb-qt-kde')
+  pkgdesc="Gambas2 KHTML component"
+
+  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt.kde/src/html
+  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
+}
+
+package_gambas2-gb-report() {
+  depends=('gambas2-runtime' 'gambas2-gb-form')
+  pkgdesc="Gambas2 report component"
+#  arch=('any')
+
+  ## workaround for splitting
+  cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx
+  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
+  mkdir -p ${pkgdir}/usr/share/gambas2/info
+  cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/draw
+  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
+  ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb
+  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt
+  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
+  cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/gui
+  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
+  cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/db
+  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
+  ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr
+  ##
+
+  _buildgbcomp gb.form
+  _buildgbcomp gb.report
+
+  ## cleanup the workaround
+  rm ${pkgdir}/usr/share/gambas2/info/{gb.{info,list},gb.form.{info,list},gb.qt*,gb.gui*,gb.db*}
+  rm ${pkgdir}/usr/lib/gambas2/{gb.draw*,gb.qt*,gb.{so*,la},gb.form.{component,gambas},gb.gui*,gb.db*}
+  rm -rf ${pkgdir}/usr/bin
+  ##
+}
+
+package_gambas2-gb-sdl() {
+  depends=('gambas2-runtime' 'sdl_image' 'libxft' 'libxcursor' 'libgl')
+  pkgdesc="Gambas2 SDL component"
+
+  cd ${srcdir}/${pkgbase}-${pkgver}/gb.sdl
+  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
+}
+
+package_gambas2-gb-sdl-sound() {
+  depends=('gambas2-runtime' 'sdl_mixer')
+  pkgdesc="Gambas2 SDL sound component"
+
+  cd ${srcdir}/${pkgbase}-${pkgver}/gb.sdl.sound
+  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
+}
+
+package_gambas2-gb-settings() {
+  depends=('gambas2-runtime')
+  pkgdesc="Gambas2 settings management component"
+#  arch=('any')
+
+  ## workaround for splitting
+  cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx
+  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
+  mkdir -p ${pkgdir}/usr/share/gambas2/info
+  ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb
+  ##
+
+  _buildgbcomp gb.settings
+
+  ## cleanup the workaround
+  rm ${pkgdir}/usr/share/gambas2/info/gb.{info,list}
+  rm ${pkgdir}/usr/lib/gambas2/gb.{so*,la}
+  rm -rf ${pkgdir}/usr/bin
+  ##
+}
+
+package_gambas2-gb-v4l() {
+  depends=('gambas2-runtime' 'libjpeg' 'libpng')
+  pkgdesc="Gambas2 V4L component"
+
+  cd ${srcdir}/${pkgbase}-${pkgver}/gb.v4l
+  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
+}
+
+package_gambas2-gb-vb() {
+  depends=('gambas2-runtime')
+  pkgdesc="Gambas2 VB transitional component"
+
+  cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/vb
+  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
+}
+
+package_gambas2-gb-web() {
+  depends=('gambas2-runtime')
+  pkgdesc="Gambas2 CGI component"
+#  arch=('any')
+
+  ## workaround for splitting
+  cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx
+  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
+  mkdir -p ${pkgdir}/usr/share/gambas2/info
+  ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb
+  ##
+
+  _buildgbcomp gb.web
+
+  ## cleanup the workaround
+  rm ${pkgdir}/usr/share/gambas2/info/gb.{info,list}
+  rm ${pkgdir}/usr/lib/gambas2/gb.{so*,la}
+  rm -rf ${pkgdir}/usr/bin
+  ##
+}
+
+package_gambas2-gb-xml() {
+  depends=('gambas2-runtime' 'libxml2')
+  pkgdesc="Gambas2 xml component"
+
+  ## workaround for splitting
+  cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx
+  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
+  mkdir -p ${pkgdir}/usr/share/gambas2/info
+  ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb
+  cd ${srcdir}/${pkgbase}-${pkgver}/gb.net
+  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
+  cd ${srcdir}/${pkgbase}-${pkgver}/gb.net.curl
+  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
+  ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr
+  ##
+
+  cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml
+  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
+
+  ## cleanup the workaround
+  rm ${pkgdir}/usr/share/gambas2/info/{gb.xml.{xslt*,rpc*},gb.{info,list},gb.net*}
+  rm ${pkgdir}/usr/lib/gambas2/{gb.xml.{xslt*,rpc*},gb.{so*,la},gb.net*}
+  rm -rf ${pkgdir}/usr/bin
+  ##
+}
+
+package_gambas2-gb-xml-rpc() {
+  depends=('gambas2-gb-xml' 'gambas2-gb-net' 'gambas2-gb-net-curl')
+  pkgdesc="Gambas2 xml-rpc component"
+
+  ## workaround for splitting
+  cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx
+  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
+  mkdir -p ${pkgdir}/usr/share/gambas2/info
+  ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb
+  cd ${srcdir}/${pkgbase}-${pkgver}/gb.net
+  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
+  cd ${srcdir}/${pkgbase}-${pkgver}/gb.net.curl
+  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
+  ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr
+  ##
+
+  cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml
+  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
+
+  ## cleanup the workaround
+  rm ${pkgdir}/usr/share/gambas2/info/gb.{{info,list},xml.{info,list},xml.xslt.{info,list},net.*}
+  rm ${pkgdir}/usr/lib/gambas2/gb.{{so*,la},xml.{so*,la,component},xml.xslt.*,net.*}
+  rm -rf ${pkgdir}/usr/bin
+  ##
+}
+
+package_gambas2-gb-xml-xslt() {
+  depends=('gambas2-gb-xml' 'libxslt')
+  pkgdesc="Gambas2 xml-xslt component"
+
+  ## workaround for splitting
+  cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx
+  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
+  mkdir -p ${pkgdir}/usr/share/gambas2/info
+  ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb
+  ##
+
+  cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml/src/xslt
+  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
+
+  ## cleanup the workaround
+  rm ${pkgdir}/usr/share/gambas2/info/gb.{info,list}
+  rm ${pkgdir}/usr/lib/gambas2/gb.{so*,la}
+  rm -rf ${pkgdir}/usr/bin
+  ##
+}
+md5sums=('b59072b6f57b681d586cc84c02333690'
+         '9dda03a1bbfb7e7ba8b6a4ae91b6752b'
+         '870ff5b4b33cd75aa9c290539e6fdd5d'
+         'ab5667175c4945282d2f40a35d0e9e5b'
+         '5eb70afe712c0f8667a700df4d9a6735')
diff --git a/community-testing/gambas2/fix-gbi-gba-path.patch b/community-testing/gambas2/fix-gbi-gba-path.patch
new file mode 100644
index 000000000..9be8e921e
--- /dev/null
+++ b/community-testing/gambas2/fix-gbi-gba-path.patch
@@ -0,0 +1,24 @@
+--- component.am	2010-03-15 20:54:43.000000000 +0100
++++ ../component.am	2010-04-30 15:00:47.218700833 +0200
+@@ -6,17 +6,17 @@
+ 	@if test -d $(COMPONENT); then \
+ 		echo "Compiling the $(COMPONENT) project..."; \
+ 		( \
+-			$(DESTDIR)$(bindir)/gbi$(GAMBAS_VERSION) -r $(DESTDIR)$(prefix) $(COMPONENT); \
++			$(GBFILES)/gbi$(GAMBAS_VERSION) -r $(DESTDIR)$(prefix) $(COMPONENT); \
+ 			cd $(COMPONENT); \
+-			$(DESTDIR)$(bindir)/gbc$(GAMBAS_VERSION) -ag -r $(DESTDIR)$(prefix); \
+-			$(DESTDIR)$(bindir)/gba$(GAMBAS_VERSION); \
++			$(GBFILES)/gbc$(GAMBAS_VERSION) -ag -r $(DESTDIR)$(prefix); \
++			$(GBFILES)/gba$(GAMBAS_VERSION); \
+ 			rm -rf .gambas; \
+ 			$(INSTALL) $(COMPONENT).gambas $(DESTDIR)$(gblibdir); \
+ 		) \
+ 	fi
+ 	@echo
+ 	@echo "Creating the information files for $(COMPONENT) component..."
+-	@$(DESTDIR)$(bindir)/gbi$(GAMBAS_VERSION) -r $(DESTDIR)$(prefix) $(COMPONENT)
++	@$(GBFILES)/gbi$(GAMBAS_VERSION) -r $(DESTDIR)$(prefix) $(COMPONENT)
+ 	@echo
+ 
+ uninstall-hook:
diff --git a/community-testing/gambas2/gambas2-runtime.install b/community-testing/gambas2/gambas2-runtime.install
new file mode 100644
index 000000000..4729f7ef6
--- /dev/null
+++ b/community-testing/gambas2/gambas2-runtime.install
@@ -0,0 +1,12 @@
+post_install() {
+	xdg-icon-resource install --context mimetypes --size 64 \
+	/usr/share/gambas2/mime/application-x-gambas.png application-x-gambas
+	xdg-mime install /usr/share/gambas2/mime/application-x-gambas.xml
+}
+
+pre_remove() {
+	xdg-icon-resource uninstall --context mimetypes --size 64 application-x-gambas
+	xdg-mime uninstall /usr/share/gambas2/mime/application-x-gambas.xml
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/community-testing/gambas2/gambas2-script.install b/community-testing/gambas2/gambas2-script.install
new file mode 100644
index 000000000..86558e434
--- /dev/null
+++ b/community-testing/gambas2/gambas2-script.install
@@ -0,0 +1,15 @@
+post_install() {
+	xdg-icon-resource install --context mimetypes --size 64 \
+	/usr/share/gambas2/mime/application-x-gambasscript.png application-x-gambasscript
+	xdg-icon-resource install --context mimetypes --size 64 \
+	/usr/share/gambas2/mime/application-x-gambasserverpage.png application-x-gambasserverpage
+	xdg-mime install /usr/share/gambas2/mime/application-x-gambasscript.xml
+	xdg-mime install /usr/share/gambas2/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/gambas2/mime/application-x-gambasscript.xml
+	xdg-mime uninstall /usr/share/gambas2/mime/application-x-gambasserverpage.xml
+}
diff --git a/community-testing/gambas2/gambas2.install b/community-testing/gambas2/gambas2.install
new file mode 100644
index 000000000..4729f7ef6
--- /dev/null
+++ b/community-testing/gambas2/gambas2.install
@@ -0,0 +1,12 @@
+post_install() {
+	xdg-icon-resource install --context mimetypes --size 64 \
+	/usr/share/gambas2/mime/application-x-gambas.png application-x-gambas
+	xdg-mime install /usr/share/gambas2/mime/application-x-gambas.xml
+}
+
+pre_remove() {
+	xdg-icon-resource uninstall --context mimetypes --size 64 application-x-gambas
+	xdg-mime uninstall /usr/share/gambas2/mime/application-x-gambas.xml
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/community-testing/gambas2/poppler-0.20.patch b/community-testing/gambas2/poppler-0.20.patch
new file mode 100644
index 000000000..a73d42a7f
--- /dev/null
+++ b/community-testing/gambas2/poppler-0.20.patch
@@ -0,0 +1,100 @@
+Index: src/CPdfDocument.cpp
+===================================================================
+--- src/CPdfDocument.cpp	(révision 4732)
++++ src/CPdfDocument.cpp	(copie de travail)
+@@ -407,7 +407,11 @@
+ 	white[0] = 0xFF; white[1] = 0xFF; white[2] = 0xFF;
+ 	THIS->dev=new SplashOutputDev(splashModeRGB8, 3, gFalse, white);
+ 		
++	#if POPPLER_VERSION_0_20
++	THIS->dev->startDoc(THIS->doc);
++	#else
+ 	THIS->dev->startDoc(THIS->doc->getXRef ());
++	#endif
+ 
+ 	outline=THIS->doc->getOutline();
+ 	if (outline) THIS->index=outline->getItems();
+@@ -833,13 +837,22 @@
+ 
+ 	if ( (w<0) || (h<0) ) return NULL;
+ 
++	#if POPPLER_VERSION_0_20
+ 	THIS->page->displaySlice(THIS->dev,72.0*scale,72.0*scale,
+ 			   rotation,
+ 			   gFalse,
+ 			   gTrue,
+ 			   x,y,w,h,
++			   gFalse);
++	#else
++	THIS->page->displaySlice(THIS->dev,72.0*scale,72.0*scale,
++			   rotation,
+ 			   gFalse,
++			   gTrue,
++			   x,y,w,h,
++			   gFalse,
+ 			   THIS->doc->getCatalog ());
++	#endif
+ 
+ 	map=THIS->dev->getBitmap();
+ 	
+@@ -929,9 +942,14 @@
+ 	w = VARGOPT(W, (int32_t)THIS->page->getMediaWidth());
+ 	h = VARGOPT(H, (int32_t)THIS->page->getMediaHeight());
+ 
++	#if POPPLER_VERSION_0_20
++	dev = new TextOutputDev (NULL, gTrue, 0, gFalse, gFalse);
++	gfx = THIS->page->createGfx(dev,72.0,72.0,0,gFalse,gTrue,-1, -1, -1, -1, gFalse, NULL, NULL);
++	#else
+ 	dev = new TextOutputDev (NULL, gTrue, gFalse, gFalse);
+ 	gfx = THIS->page->createGfx(dev,72.0,72.0,0,gFalse,gTrue,-1, -1, -1, -1, \
+                                 gFalse,THIS->doc->getCatalog (),NULL, NULL, NULL, NULL);
++	#endif
+ 	
+ 	THIS->page->display(gfx);
+ 	dev->endPage();
+@@ -960,7 +978,9 @@
+ 
+ void aux_fill_links(void *_object)
+ {
+-	#if POPPLER_VERSION_0_17
++	#if POPPLER_VERSION_0_20
++	THIS->links = new Links (THIS->page->getAnnots ());
++	#elif POPPLER_VERSION_0_17
+ 	THIS->links = new Links (THIS->page->getAnnots (THIS->doc->getCatalog()));
+ 	#else
+ 	Object obj;
+@@ -1200,12 +1220,21 @@
+ 
+ 	if (!MISSING(Sensitive)) sensitive=VARG(Sensitive);
+ 
++	#if POPPLER_VERSION_0_20
++	textdev = new TextOutputDev (NULL, true, 0, false, false);
++	THIS->page->display (textdev, 72, 72, 0, false, false, false);
++	#else
+ 	textdev = new TextOutputDev (NULL, true, false, false);
+ 	THIS->page->display (textdev, 72, 72, 0, false, false, false, THIS->doc->getCatalog());
++	#endif
+ 
+ 	if (THIS->Found) { GB.FreeArray(POINTER(&THIS->Found)); THIS->Found=NULL; }
+ 
++	#if POPPLER_VERSION_0_20
++	while (textdev->findText (block,nlen,gFalse,gTrue,gTrue,gFalse,sensitive,gFalse,gFalse,&x0,&y0,&x1,&y1))
++	#else
+ 	while (textdev->findText (block,nlen,gFalse,gTrue,gTrue,gFalse,sensitive,gFalse,&x0,&y0,&x1,&y1))
++	#endif
+ 	{
+ 		if (!THIS->Found) {
+ 			GB.NewArray(POINTER(&THIS->Found),sizeof(FoundRect),1);
+Index: configure.ac
+===================================================================
+--- configure.ac	(révision 4732)
++++ configure.ac	(copie de travail)
+@@ -25,6 +25,8 @@
+   AC_DEFINE_UNQUOTED(POPPLER_VERSION_0_11_3, $((1-$?)), Poppler version >= 0.11.3)
+   pkg-config --atleast-version=0.17.0 poppler
+   AC_DEFINE_UNQUOTED(POPPLER_VERSION_0_17, $((1-$?)), Poppler version >= 0.17)
++  pkg-config --atleast-version=0.20.0 poppler
++  AC_DEFINE_UNQUOTED(POPPLER_VERSION_0_20, $((1-$?)), Poppler version >= 0.20)
+ fi
+ 
+ AC_OUTPUT( \
diff --git a/community-testing/gambas3/PKGBUILD b/community-testing/gambas3/PKGBUILD
new file mode 100644
index 000000000..cff855dc6
--- /dev/null
+++ b/community-testing/gambas3/PKGBUILD
@@ -0,0 +1,1130 @@
+# $Id: PKGBUILD 72913 2012-06-24 19:24:03Z foutrelis $
+# 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-gsl' '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=3.1.1
+pkgrel=4
+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' 'gtk2' 'imlib2' 'gdk-pixbuf2'
+         'postgresql-libs' 'libmysqlclient' 'unixodbc' 'sqlite2' 'sqlite' 'librsvg'
+         'curl' 'poppler-glib' 'sdl_mixer' 'sdl_ttf' 'libxtst' 'pcre' 'qtwebkit'
+         'libxcursor' 'libsm' 'dbus-core' 'libxml2' 'libxslt' 'libgnome-keyring'
+	 'gsl')
+options=('!emptydirs' '!makeflags')
+source=("http://downloads.sourceforge.net/gambas/${pkgbase}-${pkgver}.tar.bz2"
+        'gambas3-script.install' 'gambas3-runtime.install'
+	'poppler-0-20.patch')
+md5sums=('bdf387f435d7aeedb7efa488ea1a5d62'
+         'b284be39d147ec799f1116a6abc068b4'
+         'b5cc403990f31b8ea1c5cf37366d3d29'
+         '39d2ae1e2096a29df7857fce083eafaf')
+
+build() {
+  cd ${srcdir}/${pkgbase}-${pkgver}
+
+  # fix building with poppler-0.20.x (merged upstream)
+  cd gb.pdf
+  patch -Np1 -i ../../poppler-0-20.patch
+  cd ..
+
+  ./reconf-all
+  ./configure --prefix=/usr -C
+
+  make bindir=${pkgdir}/usr/bin
+}
+
+package_gambas3-runtime() {
+  depends=('libffi' 'xdg-utils')
+  pkgdesc="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-gambas3.png \
+    ${pkgdir}/usr/share/gambas3/icons/application-x-gambas3.png
+ 
+  cd gbc
+  make DESTDIR="${pkgdir}" uninstall
+}
+
+package_gambas3-devel() {
+  depends=('gambas3-runtime')
+  pkgdesc="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="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="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="Applications 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="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="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="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="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="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="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="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="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="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="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' 'sqlite')
+  pkgdesc="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="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="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="Expression evaluator highlight 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}/gb.qt4
+  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
+  cd ${srcdir}/${pkgbase}-${pkgver}/main
+  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
+  rm -r ${pkgdir}/usr/lib/gambas3/gb.{[c-d]*,[f-z]*}
+  rm -r ${pkgdir}/usr/share/gambas3/info/gb.{[c-d]*,[f-z]*}
+  rm -r ${pkgdir}/usr/share/gambas3/control
+  ##
+}
+
+package_gambas3-gb-form() {
+  depends=('gambas3-gb-gui')
+  pkgdesc="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}/gb.gtk
+  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
+  cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk
+  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="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}/gb.gtk
+  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
+  cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk
+  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="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}/gb.gtk
+  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
+  cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk
+  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="Default stock icons 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
+  ##
+
+  cd ${srcdir}/${pkgbase}-${pkgver}/comp
+  make DESTDIR="${pkgdir}" install
+
+  ## Workaround for splitting
+  cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk
+  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
+  cd ${srcdir}/${pkgbase}-${pkgver}/main
+  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]*}
+  rm -r ${pkgdir}/usr/lib/gambas3/gb.[m-w]*
+  rm -r ${pkgdir}/usr/share/gambas3/info/gb.[m-w]*
+  ##
+}
+
+package_gambas3-gb-gtk() {
+  depends=('gambas3-gb-image' 'gtk2' 'librsvg')
+  pkgdesc="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-gsl() {
+  depends=('gambas3-runtime' 'gsl')
+  pkgdesc="The GNU Scientific Library component"
+
+  ## workaround for splitting
+  cd ${srcdir}/${pkgbase}-${pkgver}/main
+  make XDG_UTILS='' DESTDIR="${pkgdir}" install
+  ##
+
+  cd ${srcdir}/${pkgbase}-${pkgver}/gb.gsl
+  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="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="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="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="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="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="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="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="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="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}/gb.opengl/src/glu
+  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="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="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="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="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="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="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="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="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' 'qtwebkit')
+  pkgdesc="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="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="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="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="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="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="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="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="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="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="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="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-testing/gambas3/gambas3-runtime.install b/community-testing/gambas3/gambas3-runtime.install
new file mode 100644
index 000000000..6c8201a6a
--- /dev/null
+++ b/community-testing/gambas3/gambas3-runtime.install
@@ -0,0 +1,10 @@
+post_install() {
+	xdg-icon-resource install --context mimetypes --size 64 \
+	/usr/share/gambas3/mime/application-x-gambas.png application-x-gambas3
+	xdg-mime install /usr/share/gambas3/mime/application-x-gambas3.xml
+}
+
+pre_remove() {
+	xdg-icon-resource uninstall --context mimetypes --size 64 application-x-gambas3
+	xdg-mime uninstall /usr/share/gambas3/mime/application-x-gambas3.xml
+}
diff --git a/community-testing/gambas3/gambas3-script.install b/community-testing/gambas3/gambas3-script.install
new file mode 100644
index 000000000..77c1aa52f
--- /dev/null
+++ b/community-testing/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-testing/gambas3/poppler-0-20.patch b/community-testing/gambas3/poppler-0-20.patch
new file mode 100644
index 000000000..3b0e4612a
--- /dev/null
+++ b/community-testing/gambas3/poppler-0-20.patch
@@ -0,0 +1,106 @@
+diff -ur gb.pdf/configure.ac gb.pdf.fixed/configure.ac
+--- gb.pdf/configure.ac	2012-05-14 08:55:02.448921378 +0200
++++ gb.pdf.fixed/configure.ac	2012-05-14 08:52:19.098596499 +0200
+@@ -24,6 +24,8 @@
+   AC_DEFINE_UNQUOTED(POPPLER_VERSION_0_11_3, $((1-$?)), Poppler version >= 0.11.3)
+   pkg-config --atleast-version=0.17.0 poppler
+   AC_DEFINE_UNQUOTED(POPPLER_VERSION_0_17, $((1-$?)), Poppler version >= 0.17)
++  pkg-config --atleast-version=0.20.0 poppler
++  AC_DEFINE_UNQUOTED(POPPLER_VERSION_0_20, $((1-$?)), Poppler version >= 0.20)
+ fi
+ 
+ AC_OUTPUT( \
+diff -ur gb.pdf/src/CPdfDocument.cpp gb.pdf.fixed/src/CPdfDocument.cpp
+--- gb.pdf/src/CPdfDocument.cpp	2012-05-14 08:55:02.388922483 +0200
++++ gb.pdf.fixed/src/CPdfDocument.cpp	2012-05-15 09:25:45.168457227 +0200
+@@ -449,9 +449,13 @@
+ 
+ 	white[0] = 0xFF; white[1] = 0xFF; white[2] = 0xFF;
+ 	THIS->dev=new SplashOutputDev(splashModeRGB8, 3, gFalse, white);
+-		
+-	THIS->dev->startDoc(THIS->doc->getXRef ());
+ 
++	#if POPPLER_VERSION_0_20
++	THIS->dev->startDoc(THIS->doc);
++	#else
++	THIS->dev->startDoc(THIS->doc->getXRef ());
++	#endif
++	
+ 	outline=THIS->doc->getOutline();
+ 	if (outline) THIS->index=outline->getItems();
+ 	
+@@ -875,6 +879,14 @@
+ 
+ 	if ( (w<0) || (h<0) ) return NULL;
+ 
++	#if POPPLER_VERSION_0_20
++	THIS->page->displaySlice(THIS->dev,72.0*scale,72.0*scale,
++			   rotation,
++			   gFalse,
++			   gTrue,
++			   x,y,w,h,
++			   gFalse);
++	#else
+ 	THIS->page->displaySlice(THIS->dev,72.0*scale,72.0*scale,
+ 			   rotation,
+ 			   gFalse,
+@@ -882,7 +894,8 @@
+ 			   x,y,w,h,
+ 			   gFalse,
+ 			   THIS->doc->getCatalog ());
+-
++	#endif
++	
+ 	map=THIS->dev->getBitmap();
+ 	
+ 	data=(uint32_t*)map->getDataPtr();
+@@ -940,9 +953,14 @@
+ 	w = VARGOPT(W, (int32_t)THIS->page->getMediaWidth());
+ 	h = VARGOPT(H, (int32_t)THIS->page->getMediaHeight());
+ 
++	#if POPPLER_VERSION_0_20
++	dev = new TextOutputDev (NULL, gTrue, 0, gFalse, gFalse);
++	gfx = THIS->page->createGfx(dev,72.0,72.0,0,gFalse,gTrue,-1, -1, -1, -1, gFalse, NULL, NULL);
++	#else
+ 	dev = new TextOutputDev (NULL, gTrue, gFalse, gFalse);
+ 	gfx = THIS->page->createGfx(dev,72.0,72.0,0,gFalse,gTrue,-1, -1, -1, -1, gFalse,THIS->doc->getCatalog (),NULL, NULL, NULL, NULL);
+-	
++	#endif
++
+ 	THIS->page->display(gfx);
+ 	dev->endPage();
+ 
+@@ -970,7 +988,9 @@
+ 
+ void aux_fill_links(void *_object)
+ {
+-	#if POPPLER_VERSION_0_17
++	#if POPPLER_VERSION_0_20
++	THIS->links = new Links (THIS->page->getAnnots ());
++	#elif POPPLER_VERSION_0_17
+ 	THIS->links = new Links (THIS->page->getAnnots (THIS->doc->getCatalog()));
+ 	#else
+ 	Object obj;
+@@ -1152,13 +1172,22 @@
+ 
+ 	if (!MISSING(Sensitive)) sensitive=VARG(Sensitive);
+ 
++	#if POPPLER_VERSION_0_20
++	textdev = new TextOutputDev (NULL, true, 0, false, false);
++	THIS->page->display (textdev, 72, 72, 0, false, false, false);
++	#else
+ 	textdev = new TextOutputDev (NULL, true, false, false);
+ 	THIS->page->display (textdev, 72, 72, 0, false, false, false, THIS->doc->getCatalog());
++	#endif
+ 
+ 	if (THIS->Found) { GB.FreeArray(POINTER(&THIS->Found)); THIS->Found=NULL; }
+ 
+ 	count = 0;
++	#if POPPLER_VERSION_0_20
++	while (textdev->findText (block,nlen,gFalse,gTrue,gTrue,gFalse,sensitive,gFalse,gFalse,&x0,&y0,&x1,&y1))
++	#else
+ 	while (textdev->findText (block,nlen,gFalse,gTrue,gTrue,gFalse,sensitive,gFalse,&x0,&y0,&x1,&y1))
++	#endif
+ 	{
+ 		if (!THIS->Found)
+ 			GB.NewArray(POINTER(&THIS->Found),sizeof(CPDFFIND),1);
diff --git a/community-testing/libextractor/PKGBUILD b/community-testing/libextractor/PKGBUILD
new file mode 100644
index 000000000..06ff89934
--- /dev/null
+++ b/community-testing/libextractor/PKGBUILD
@@ -0,0 +1,38 @@
+# $Id: PKGBUILD 72914 2012-06-24 19:24:08Z foutrelis $
+# Maintainer: Sergej Pupykin <pupykin.s@gmail.com>
+# Contributor: damir <damir@archlinux.org>
+
+pkgname=libextractor
+pkgver=0.6.3
+pkgrel=5
+pkgdesc="A library used to extract meta-data from files of arbitrary type"
+arch=("i686" "x86_64")
+license=('GPL')
+url="http://gnunet.org/libextractor/"
+depends=('libltdl')
+makedepends=('flac' 'poppler' 'exiv2' 'qt' 'libvorbis' 'gtk2' 'libgsf' 'libmpeg2')
+optdepends=('flac: flac support'
+	    'poppler: pdf support'
+	    'exiv2: metadata support'
+	    'qt: the Qt GUI interface/thumbnails'
+	    'gtk2: gtk2 GUI interface/thumbnails'
+	    'libgsf: (optional) for ODF support'
+	    'libmpeg2: mpeg support'
+	    'libvorbis: ogg/vorbis support')
+options=('!libtool' '!makeflags')
+install=libextractor.install
+source=("http://ftpmirror.gnu.org/${pkgname}/${pkgname}-${pkgver}.tar.gz"{,.sig})
+md5sums=('7004ff6be06e400050f0ad7016140981'
+         '81f95c31831dde62428a98ae32464c51')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  ./configure --prefix=/usr --enable-shared --disable-static
+  make
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make DESTDIR=${pkgdir} install
+  rm ${pkgdir}/usr/share/info/dir
+}
diff --git a/community-testing/libextractor/libextractor.install b/community-testing/libextractor/libextractor.install
new file mode 100644
index 000000000..1cf51e095
--- /dev/null
+++ b/community-testing/libextractor/libextractor.install
@@ -0,0 +1,20 @@
+infodir=usr/share/info
+filelist=(extractor.info.gz)
+
+post_install() {
+  [ -x usr/bin/install-info ] || return 0
+  for file in ${filelist[@]}; do
+    install-info $infodir/$file $infodir/dir 2> /dev/null
+  done
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+  [ -x usr/bin/install-info ] || return 0
+  for file in ${filelist[@]}; do
+    install-info --delete $infodir/$file $infodir/dir 2> /dev/null
+  done
+}
diff --git a/community-testing/pdf2djvu/PKGBUILD b/community-testing/pdf2djvu/PKGBUILD
new file mode 100644
index 000000000..e3f409a75
--- /dev/null
+++ b/community-testing/pdf2djvu/PKGBUILD
@@ -0,0 +1,33 @@
+# $Id: PKGBUILD 72915 2012-06-24 19:24:11Z foutrelis $
+# Contributor: Paulo Matias <matiasΘarchlinux-br·org>
+# Maintainer: Jelle van der Waa <jelle@vdwaa.nl>
+
+pkgname=pdf2djvu
+pkgver=0.7.13
+pkgrel=2
+pkgdesc="Creates DjVu files from PDF files"
+arch=('i686' 'x86_64')
+url="http://pdf2djvu.googlecode.com"
+license=('GPL')
+depends=('poppler' 'djvulibre' 'libxslt' 'gcc-libs' 'graphicsmagick')
+makedepends=('pstreams' 'python2-nose' 'ttf-liberation')
+source=("http://pdf2djvu.googlecode.com/files/${pkgname}_${pkgver}.tar.gz")
+
+build() {
+    cd ${srcdir}/${pkgname}-${pkgver}
+    ./configure --prefix=/usr
+    make
+}
+
+package() {
+    cd ${srcdir}/${pkgname}-${pkgver}
+    make install DESTDIR=${pkgdir}
+    install -Dm644 doc/${pkgname}.1 ${pkgdir}/usr/share/man/man1/${pkgname}.1
+}
+check() {
+
+    cd ${srcdir}/${pkgname}-${pkgver}
+    sed -i 's/nosetests/nosetests2/' tests/Makefile
+    make test
+}
+md5sums=('b5327c5949057711a8250dffb6ccfd2d')
diff --git a/community/avr-gcc/PKGBUILD b/community/avr-gcc/PKGBUILD
index e09943802..0e48adec9 100644
--- a/community/avr-gcc/PKGBUILD
+++ b/community/avr-gcc/PKGBUILD
@@ -1,14 +1,16 @@
-# $Id: PKGBUILD 69308 2012-04-13 08:26:08Z schuay $
+# $Id: PKGBUILD 72864 2012-06-24 08:07:58Z schuay $
 # Maintainer: schuay <jakob.gruber@gmail.com>
 # Contributor: Brad Fanella <bradfanella@archlinux.us>
 # Contributor: Corrado Primier <bardo@aur.archlinux.org>
 # Contributor: danst0 <danst0@west.de>
 
+# Build order: avr-binutils -> avr-gcc -> avr-libc
+
 pkgname=avr-gcc
 _pkgname=gcc
-pkgver=4.7.0
+pkgver=4.7.1
 pkgrel=1
-pkgdesc="The GNU avr Compiler Collection"
+pkgdesc="The GNU AVR Compiler Collection"
 arch=('i686' 'x86_64')
 license=('GPL' 'LGPL' 'custom')
 url="http://gcc.gnu.org/"
@@ -67,4 +69,4 @@ package() {
     rm -rf ${pkgdir}/usr/share/info
 }
 
-md5sums=('2a0f1d99fda235c29d40b561f81d9a77')
+md5sums=('933e6f15f51c031060af64a9e14149ff')
diff --git a/community/ccid/PKGBUILD b/community/ccid/PKGBUILD
index 45eca6a6f..d4897a6a3 100644
--- a/community/ccid/PKGBUILD
+++ b/community/ccid/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 72183 2012-06-10 05:12:50Z giovanni $
+# $Id: PKGBUILD 72861 2012-06-24 07:28:13Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Daniel Plaza <daniel.plaza.espi@gmail.com>
 
 pkgname=ccid
-pkgver=1.4.6
-pkgrel=2
+pkgver=1.4.7
+pkgrel=1
 pkgdesc="A generic USB Chip/Smart Card Interface Devices driver"
 arch=('i686' 'x86_64')
 url="http://pcsclite.alioth.debian.org/ccid.html"
@@ -12,8 +12,8 @@ license=('LGPL' 'GPL')
 depends=('pcsclite' 'libusbx')
 makedepends=('pkg-config')
 backup=(etc/reader.conf.d/libccidtwin)
-source=("https://alioth.debian.org/frs/download.php/3711/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('3600dfbc74efb321c37de15a64efbbe6')
+source=("https://alioth.debian.org/frs/download.php/3730/${pkgname}-${pkgver}.tar.bz2")
+md5sums=('907037484e000504dad1ccfe6c36e1f1')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/community/clipit/PKGBUILD b/community/clipit/PKGBUILD
new file mode 100644
index 000000000..ed3a18654
--- /dev/null
+++ b/community/clipit/PKGBUILD
@@ -0,0 +1,28 @@
+# $Id: PKGBUILD 72903 2012-06-24 18:15:32Z bpiotrowski $
+# Maintainer:  Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
+# Contributor: Mihai Militaru <mihai dot militaru at xmpp dot ro>
+
+pkgname=clipit
+pkgver=1.4.2
+pkgrel=3
+pkgdesc="Lightweight GTK+ clipboard manager (fork of Parcellite)"
+arch=('i686' 'x86_64')
+url="http://gtkclipit.sourceforge.net/"
+license=('GPL3')
+depends=('gtk2' 'gtk-update-icon-cache' 'hicolor-icon-theme')
+makedepends=('intltool')
+optdepends=('xdotool: for automatic paste')
+install=$pkgname.install
+source=(https://github.com/downloads/shantzu/ClipIt/${pkgname}-${pkgver}.tar.gz)
+md5sums=('118175f26869adcf04909fdbb5021eff')
+
+build() {
+    cd ${srcdir}/${pkgname}-${pkgver}
+    ./configure --prefix=/usr --sysconfdir=/etc
+    make
+}
+
+package() {
+    cd ${srcdir}/${pkgname}-${pkgver}
+    make DESTDIR=${pkgdir} install
+}
diff --git a/community/clipit/clipit.install b/community/clipit/clipit.install
new file mode 100644
index 000000000..ea395d140
--- /dev/null
+++ b/community/clipit/clipit.install
@@ -0,0 +1,7 @@
+post_install() {
+    gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+post_uninstall() {
+    gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
diff --git a/community/ekg2/PKGBUILD b/community/ekg2/PKGBUILD
index 2711324dc..6fa98320d 100644
--- a/community/ekg2/PKGBUILD
+++ b/community/ekg2/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 71739 2012-06-02 10:28:38Z bluewind $
+# $Id: PKGBUILD 72899 2012-06-24 16:20:06Z bpiotrowski $
 # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 # Contributor: Mateusz Herych <heniekk@gmail.com>
 
 pkgname=ekg2
 pkgver=0.3.1
-pkgrel=4
+pkgrel=5
 pkgdesc="ncurses based Jabber, Gadu-Gadu, Tlen and IRC client"
 arch=('i686' 'x86_64')
 url="http://ekg2.org/"
@@ -17,26 +17,28 @@ source=(ftp://ftp.archlinux.org/other/community/$pkgname/$pkgname-$pkgver.tar.gz
 md5sums=('68fc05b432c34622df6561eaabef5a40')
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
+    cd "$srcdir/$pkgname-$pkgver"
 
-  sed -i 's|ncursesw/ncurses.h|ncurses.h|g' configure plugins/ncurses/ecurses.h
+    sed -i 's|ncursesw/ncurses.h|ncurses.h|g' configure plugins/ncurses/ecurses.h
+    export PYTHON=/usr/bin/python2 #EKG2 isn't python3 friendly
 
-  ./configure --prefix=/usr     \
-              --sysconfdir=/etc \
-              --with-libgadu    \
-              --with-xosd       \
-              --enable-unicode  \
-              --enable-shared   \
-              --without-gpg
-  make
+    ./configure --prefix=/usr     \
+                --sysconfdir=/etc \
+                --libexecdir=/usr/lib/ekg2 \
+                --with-libgadu    \
+                --with-xosd       \
+                --enable-unicode  \
+                --enable-shared   \
+                --without-gpg
+    make
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
+    cd "$srcdir/$pkgname-$pkgver"
+    make DESTDIR="$pkgdir" install
 
-  rm -rf "$pkgdir"/usr/lib/perl5/core_perl/perllocal.pod
-  mv "$pkgdir"/usr/libexec/ioctld "$pkgdir"/usr/lib/ekg2/ioctld
-  rm -rf "$pkgdir"/usr/libexec
-  chmod -R 755 "$pkgdir"/usr/lib/perl5
+    rm -rf "$pkgdir"/usr/lib/perl5/core_perl/perllocal.pod
+    rm -rf "$pkgdir"/usr/libexec
+    chmod -R 755 "$pkgdir"/usr/lib/perl5
+    chmod +s "$pkgdir"/usr/lib/ekg2/ioctld
 }
diff --git a/community/gnome-do/PKGBUILD b/community/gnome-do/PKGBUILD
new file mode 100644
index 000000000..b201a9a73
--- /dev/null
+++ b/community/gnome-do/PKGBUILD
@@ -0,0 +1,39 @@
+# $Id: PKGBUILD 72904 2012-06-24 18:16:23Z bgyorgy $
+# Maintainer: Balló György <ballogyor+arch at gmail dot com>
+# Contributor: Allan McRae <allan@archlinux.org>
+# Contributor: Doehni <dohny@gmx.de>
+
+pkgname=gnome-do
+pkgver=0.9
+pkgrel=2
+pkgdesc="Quickly search for many items present on your desktop or the web, and perform useful actions on those items"
+arch=('i686' 'x86_64')
+url="http://do.davebsd.com/"
+license=('GPL3')
+depends=('gconf-sharp' 'libgnome-desktop-sharp' 'gnome-keyring-sharp' 'mono-addins' 'notify-sharp' 'hicolor-icon-theme' 'xdg-utils')
+makedepends=('intltool' 'libgnome-sharp' 'gio-sharp')
+options=('!libtool')
+install=$pkgname.install
+source=(http://launchpad.net/do/trunk/$pkgver/+download/$pkgname-$pkgver.tar.gz
+        gio-gnomedesktop.patch)
+md5sums=('d360e56953915d9585c0ee71f433129c'
+         'e9ac5e4510c1475d61a20c5d94594d98')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  # https://code.launchpad.net/~ballogy/do/gio-gnomedesktop-port/+merge/95842
+  patch -Np1 -i "$srcdir/gio-gnomedesktop.patch"
+
+  autoreconf -fi
+  ./configure --prefix=/usr --sysconfdir=/etc \
+              --disable-schemas-install \
+              --with-gconf-schema-file-dir=/usr/share/gconf/schemas
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  make DESTDIR="$pkgdir" install
+}
diff --git a/community/gnome-do/gio-gnomedesktop.patch b/community/gnome-do/gio-gnomedesktop.patch
new file mode 100644
index 000000000..358b0b731
--- /dev/null
+++ b/community/gnome-do/gio-gnomedesktop.patch
@@ -0,0 +1,252 @@
+diff -Naur gnome-do-0.9.orig/configure.ac gnome-do-0.9/configure.ac
+--- gnome-do-0.9.orig/configure.ac	2012-03-04 08:46:12.000000000 +0100
++++ gnome-do-0.9/configure.ac	2012-06-24 19:31:49.150955445 +0200
+@@ -60,17 +60,29 @@
+ PKG_CHECK_MODULES([GCONF_SHARP_20], [gconf-sharp-2.0])
+ PKG_CHECK_MODULES([GLADE_SHARP_20], [glade-sharp-2.0])
+ PKG_CHECK_MODULES([GLIB_SHARP_20], [glib-sharp-2.0])
++
++dnl gio-sharp is an unstable api library
++PKG_CHECK_MODULES([GIO_SHARP], [gio-sharp-2.0])
++files="`$PKG_CONFIG --variable=Libraries gio-sharp-2.0`"
++for file in $files; do
++	GIO_SHARP_SOURCE_ASSEMBLIES="$GIO_SHARP_SOURCE_ASSEMBLIES $file"
++	GIO_SHARP_ASSEMBLIES="$GIO_SHARP_ASSEMBLIES $top_srcdir/build/$(basename $file)"
++	[[ -r "$file.config" ]] && GIO_SHARP_SOURCE_ASSEMBLIES="$GIO_SHARP_SOURCE_ASSEMBLIES $file.config"
++	[[ -r "$file.config" ]] && GIO_SHARP_ASSEMBLIES="$GIO_SHARP_ASSEMBLIES $top_srcdir/build/$(basename $file).config"
++
++	GIO_SHARP_LIBS="$GIO_SHARP_LIBS -r:$top_srcdir/build/$(basename $file)"
++done
++AC_SUBST([GIO_SHARP_SOURCE_ASSEMBLIES])
++AC_SUBST([GIO_SHARP_ASSEMBLIES])
++AC_SUBST([GIO_SHARP_LIBS])
++
+ PKG_CHECK_MODULES([GNOME_DESKTOP_SHARP_20], [gnome-desktop-sharp-2.0])
+ PKG_CHECK_MODULES([GNOME_KEYRING_SHARP], [gnome-keyring-sharp-1.0])
+-PKG_CHECK_MODULES([GNOME_SHARP_20], [gnome-sharp-2.0])
+-PKG_CHECK_MODULES([GNOME_VFS_SHARP_20], [gnome-vfs-sharp-2.0])
+ PKG_CHECK_MODULES([GTK_SHARP_20], [gtk-sharp-2.0])
+-PKG_CHECK_MODULES([LIBRSVG_SHARP], [rsvg2-sharp-2.0])
+ PKG_CHECK_MODULES([MONO_ADDINS], [mono-addins])
+ PKG_CHECK_MODULES([MONO_ADDINS_GUI], [mono-addins-gui])
+ PKG_CHECK_MODULES([MONO_ADDINS_SETUP], [mono-addins-setup])
+ PKG_CHECK_MODULES([NOTIFY_SHARP], [notify-sharp])
+-PKG_CHECK_MODULES([WNCK_SHARP_10], [wnck-sharp-1.0])
+ 
+ 
+ AC_SUBST([GCONF_SHARP_20_LIBS])
+@@ -78,10 +90,7 @@
+ AC_SUBST([GLIB_SHARP_20_LIBS])
+ AC_SUBST([GNOME_DESKTOP_SHARP_20_LIBS])
+ AC_SUBST([GNOME_KEYRING_SHARP_LIBS])
+-AC_SUBST([GNOME_SHARP_20_LIBS])
+-AC_SUBST([GNOME_VFS_SHARP_20_LIBS])
+ AC_SUBST([GTK_SHARP_20_LIBS])
+-AC_SUBST([LIBRSVG_SHARP_LIBS])
+ AC_SUBST([MONO_ADDINS_LIBS])
+ AC_SUBST([MONO_ADDINS_GUI_LIBS])
+ AC_SUBST([MONO_ADDINS_SETUP_LIBS])
+diff -Naur gnome-do-0.9.orig/Do.Platform.Linux/Do.Platform.Linux.dll.config.in gnome-do-0.9/Do.Platform.Linux/Do.Platform.Linux.dll.config.in
+--- gnome-do-0.9.orig/Do.Platform.Linux/Do.Platform.Linux.dll.config.in	2012-01-14 14:49:58.000000000 +0100
++++ gnome-do-0.9/Do.Platform.Linux/Do.Platform.Linux.dll.config.in	2012-06-24 19:31:49.124289904 +0200
+@@ -1,3 +1,4 @@
+ <configuration>
+ 	<dllmap dll="libdo" target="@expanded_libdir@/@PACKAGE@/libdo.so"/>
++	<dllmap dll="gnome-desktop-2" target="libgnome-desktop-2.so.17"/>
+ </configuration>
+diff -Naur gnome-do-0.9.orig/Do.Platform.Linux/Makefile.am gnome-do-0.9/Do.Platform.Linux/Makefile.am
+--- gnome-do-0.9.orig/Do.Platform.Linux/Makefile.am	2012-01-14 14:49:58.000000000 +0100
++++ gnome-do-0.9/Do.Platform.Linux/Makefile.am	2012-06-24 19:31:49.127623096 +0200
+@@ -27,6 +27,8 @@
+ 	src/Do.Platform/Do.Platform.Linux/KeyBindingService.cs \
+ 	src/Do.Universe/ApplicationItem.cs \
+ 	src/Do.Universe/CategoryItem.cs \
++	src/Do.Universe/Desktop.cs \
++	src/Do.Universe/DesktopThumbnailSize.cs \
+ 	src/Do.Universe/NullApplicationItem.cs \
+ 	src/Do.Universe/FileItem.cs \
+ 	src/Do.Universe/ApplicationItemSource.cs \
+@@ -54,7 +56,7 @@
+ 	Mono.Posix \
+ 	$(GTK_SHARP_20_LIBS) \
+ 	$(GNOME_KEYRING_SHARP_LIBS) \
+-	$(GNOME_SHARP_20_LIBS) \
++	$(GIO_SHARP_LIBS) \
+ 	$(GNOME_DESKTOP_SHARP_20_LIBS) \
+ 	$(GCONF_SHARP_20_LIBS) \
+ 	$(MONO_ADDINS_LIBS) \
+diff -Naur gnome-do-0.9.orig/Do.Platform.Linux/src/Do.Platform/Do.Platform.Linux/SystemService.cs gnome-do-0.9/Do.Platform.Linux/src/Do.Platform/Do.Platform.Linux/SystemService.cs
+--- gnome-do-0.9.orig/Do.Platform.Linux/src/Do.Platform/Do.Platform.Linux/SystemService.cs	2012-01-14 14:49:58.000000000 +0100
++++ gnome-do-0.9/Do.Platform.Linux/src/Do.Platform/Do.Platform.Linux/SystemService.cs	2012-06-24 19:31:49.130956287 +0200
+@@ -166,7 +166,8 @@
+ 		
+ 		string AutoStartUri {
+ 			get {
+-				return Gnome.Vfs.Uri.GetUriFromLocalPath (AutoStartFileName);
++				var uri = new Uri(AutoStartFileName).ToString();
++				return uri;
+ 			}
+ 		}
+ 		
+diff -Naur gnome-do-0.9.orig/Do.Platform.Linux/src/Do.Universe/Desktop.cs gnome-do-0.9/Do.Platform.Linux/src/Do.Universe/Desktop.cs
+--- gnome-do-0.9.orig/Do.Platform.Linux/src/Do.Universe/Desktop.cs	1970-01-01 01:00:00.000000000 +0100
++++ gnome-do-0.9/Do.Platform.Linux/src/Do.Universe/Desktop.cs	2012-06-24 19:31:49.134289478 +0200
+@@ -0,0 +1,76 @@
++// This file was generated by the Gtk# code generator.
++// Any changes made will be lost if regenerated.
++
++namespace Gnome {
++
++	using System;
++	using System.Runtime.InteropServices;
++
++#region Autogenerated code
++	public class Desktop {
++
++		[DllImport("gnome-desktop-2")]
++		static extern void gnome_desktop_prepend_terminal_to_vector(out int argc, IntPtr argv);
++
++		public static int PrependTerminalToVector(string argv) {
++			int argc;
++			gnome_desktop_prepend_terminal_to_vector(out argc, GLib.Marshaller.StringToPtrGStrdup(argv));
++			return argc;
++		}
++
++		[DllImport("gnome-desktop-2")]
++		static extern bool gnome_desktop_thumbnail_has_uri(IntPtr pixbuf, IntPtr uri);
++
++		public static bool ThumbnailHasUri(Gdk.Pixbuf pixbuf, string uri) {
++			IntPtr native_uri = GLib.Marshaller.StringToPtrGStrdup (uri);
++			bool raw_ret = gnome_desktop_thumbnail_has_uri(pixbuf == null ? IntPtr.Zero : pixbuf.Handle, native_uri);
++			bool ret = raw_ret;
++			GLib.Marshaller.Free (native_uri);
++			return ret;
++		}
++
++		[DllImport("gnome-desktop-2")]
++		static extern IntPtr gnome_desktop_thumbnail_scale_down_pixbuf(IntPtr pixbuf, int dest_width, int dest_height);
++
++		public static Gdk.Pixbuf ThumbnailScaleDownPixbuf(Gdk.Pixbuf pixbuf, int dest_width, int dest_height) {
++			IntPtr raw_ret = gnome_desktop_thumbnail_scale_down_pixbuf(pixbuf == null ? IntPtr.Zero : pixbuf.Handle, dest_width, dest_height);
++			Gdk.Pixbuf ret = GLib.Object.GetObject(raw_ret) as Gdk.Pixbuf;
++			return ret;
++		}
++
++		[DllImport("gnome-desktop-2")]
++		static extern IntPtr gnome_desktop_thumbnail_path_for_uri(IntPtr uri, int size);
++
++		public static string ThumbnailPathForUri(string uri, Gnome.DesktopThumbnailSize size) {
++			IntPtr native_uri = GLib.Marshaller.StringToPtrGStrdup (uri);
++			IntPtr raw_ret = gnome_desktop_thumbnail_path_for_uri(native_uri, (int) size);
++			string ret = GLib.Marshaller.PtrToStringGFree(raw_ret);
++			GLib.Marshaller.Free (native_uri);
++			return ret;
++		}
++
++		[DllImport("gnome-desktop-2")]
++		static extern bool gnome_desktop_thumbnail_is_valid(IntPtr pixbuf, IntPtr uri, IntPtr mtime);
++
++		public static bool ThumbnailIsValid(Gdk.Pixbuf pixbuf, string uri, System.DateTime mtime) {
++			IntPtr native_uri = GLib.Marshaller.StringToPtrGStrdup (uri);
++			bool raw_ret = gnome_desktop_thumbnail_is_valid(pixbuf == null ? IntPtr.Zero : pixbuf.Handle, native_uri, GLib.Marshaller.DateTimeTotime_t (mtime));
++			bool ret = raw_ret;
++			GLib.Marshaller.Free (native_uri);
++			return ret;
++		}
++
++		[DllImport("gnome-desktop-2")]
++		static extern IntPtr gnome_desktop_thumbnail_md5(IntPtr uri);
++
++		public static string ThumbnailMd5(string uri) {
++			IntPtr native_uri = GLib.Marshaller.StringToPtrGStrdup (uri);
++			IntPtr raw_ret = gnome_desktop_thumbnail_md5(native_uri);
++			string ret = GLib.Marshaller.PtrToStringGFree(raw_ret);
++			GLib.Marshaller.Free (native_uri);
++			return ret;
++		}
++
++#endregion
++	}
++}
+diff -Naur gnome-do-0.9.orig/Do.Platform.Linux/src/Do.Universe/DesktopThumbnailSize.cs gnome-do-0.9/Do.Platform.Linux/src/Do.Universe/DesktopThumbnailSize.cs
+--- gnome-do-0.9.orig/Do.Platform.Linux/src/Do.Universe/DesktopThumbnailSize.cs	1970-01-01 01:00:00.000000000 +0100
++++ gnome-do-0.9/Do.Platform.Linux/src/Do.Universe/DesktopThumbnailSize.cs	2012-06-24 19:31:49.137622670 +0200
+@@ -0,0 +1,16 @@
++// This file was generated by the Gtk# code generator.
++// Any changes made will be lost if regenerated.
++
++namespace Gnome {
++
++	using System;
++	using System.Runtime.InteropServices;
++
++#region Autogenerated code
++	public enum DesktopThumbnailSize {
++
++		Normal,
++		Large,
++	}
++#endregion
++}
+diff -Naur gnome-do-0.9.orig/Do.Platform.Linux/src/Do.Universe/FileItem.cs gnome-do-0.9/Do.Platform.Linux/src/Do.Universe/FileItem.cs
+--- gnome-do-0.9.orig/Do.Platform.Linux/src/Do.Universe/FileItem.cs	2012-01-14 14:49:58.000000000 +0100
++++ gnome-do-0.9/Do.Platform.Linux/src/Do.Universe/FileItem.cs	2012-06-24 19:31:49.140955864 +0200
+@@ -63,8 +63,6 @@
+ 
+ 		static FileItem ()
+ 		{
+-			Gnome.Vfs.Vfs.Initialize ();
+-
+ 			// Initialize SpecialFolderIcons by expanding paths in
+ 			// SpecialFolderIconsXDG.
+ 			//
+@@ -130,7 +128,11 @@
+ 		}
+ 
+ 		public string MimeType {
+-			get { return Gnome.Vfs.Global.GetMimeType (Path); }
++			get {
++				GLib.File file = GLib.FileFactory.NewFromCommandlineArg(Path);
++				var info = file.QueryInfo ("standard::content-type", GLib.FileQueryInfoFlags.None, null);
++				return info.ContentType;
++			}
+ 		}
+ 
+ 		public override string Icon {
+@@ -142,8 +144,8 @@
+ 				icon = MaybeGetSpecialFolderIconForPath (Path);
+ 				if (icon != null) return icon;
+ 
+-				string large_thumb = Thumbnail.PathForUri (Uri, ThumbnailSize.Large);
+-				string normal_thumb = Thumbnail.PathForUri (Uri, ThumbnailSize.Normal);
++				string large_thumb = Desktop.ThumbnailPathForUri (Uri, DesktopThumbnailSize.Large);
++				string normal_thumb = Desktop.ThumbnailPathForUri (Uri, DesktopThumbnailSize.Normal);
+ 
+ 				// Generating the thumbnail ourself is too slow for large files.
+ 				// Suggestion: generate thumbnails asynchronously. Banshee's
+diff -Naur gnome-do-0.9.orig/Makefile.am gnome-do-0.9/Makefile.am
+--- gnome-do-0.9.orig/Makefile.am	2012-01-14 14:49:58.000000000 +0100
++++ gnome-do-0.9/Makefile.am	2012-06-24 19:31:56.837297364 +0200
+@@ -2,6 +2,22 @@
+ 
+ ACLOCAL_AMFLAGS = -I m4 -I m4/shamrock
+ 
++# Install copied assemblies to our libdir
++copiedlibsdir = $(pkglibdir)
++copiedlibs_DATA = \
++	$(GIO_SHARP_ASSEMBLIES)
++
++$(GIO_SHARP_ASSEMBLIES): $(GIO_SHARP_SOURCE_ASSEMBLIES) 
++	@mkdir -p $(top_builddir)/build
++	@for file in $@ ; do \
++		for source in $? ; do \
++			if [ $$(basename $$source) == $$(basename $$file) ] ; then \
++				echo " CP " $$(basename $$file) ; \
++				cp $$source $$file ; \
++			fi ;\
++		done ; \
++	done
++
+ SUBDIRS = \
+ 	. \
+ 	data \
diff --git a/community/gnome-do/gnome-do.install b/community/gnome-do/gnome-do.install
new file mode 100644
index 000000000..11768f0ed
--- /dev/null
+++ b/community/gnome-do/gnome-do.install
@@ -0,0 +1,22 @@
+pkgname=gnome-do
+
+post_install() {
+  gconfpkg --install $pkgname
+  xdg-icon-resource forceupdate
+}
+
+pre_upgrade() {
+  pre_remove $1
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+  gconfpkg --uninstall $pkgname
+}
+
+post_remove() {
+  xdg-icon-resource forceupdate
+}
diff --git a/community/go/PKGBUILD b/community/go/PKGBUILD
index bad366f9f..7b9c24ce0 100644
--- a/community/go/PKGBUILD
+++ b/community/go/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 72457 2012-06-14 22:33:08Z arodseth $
+# $Id: PKGBUILD 72888 2012-06-24 13:42:51Z arodseth $
 # Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Rémy Oudompheng  <remy@archlinux.org>
@@ -10,7 +10,7 @@
 
 pkgname=go
 pkgver=1.0.2
-pkgrel=1
+pkgrel=2
 epoch=2
 pkgdesc='Google Go compiler and tools'
 arch=('x86_64' 'i686')
@@ -31,8 +31,10 @@ build() {
 
   export GOROOT_FINAL="/usr/lib/go"
   export GOOS=linux
+  export GOARCH=arm
 
-  cd src && bash make.bash
+  cd src
+  bash make.bash
 }
 
 check() {
diff --git a/community/hatari/PKGBUILD b/community/hatari/PKGBUILD
index 6c6152e49..50acbc0da 100644
--- a/community/hatari/PKGBUILD
+++ b/community/hatari/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 68675 2012-03-31 12:26:15Z lcarlier $
+# $Id: PKGBUILD 72892 2012-06-24 13:57:15Z lcarlier $
 # Maintainer: Shinlun Hsieh <yngwiexx@yahoo.com.tw>
 
 pkgname=hatari
-pkgver=1.6.1
+pkgver=1.6.2
 pkgrel=1
 pkgdesc='An Atari ST and STE emulator'
 arch=('i686' 'x86_64')
@@ -11,7 +11,7 @@ license=('GPL')
 depends=('sdl' 'libpng')
 makedepends=('cmake')
 source=("http://download.tuxfamily.org/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('14f6af33734c971cb4f349a38c6981a1')
+md5sums=('3957d0c5f8093313c798e565af9a92e1')
 
 build() {
   cd ${pkgname}-${pkgver}
diff --git a/community/iasl/PKGBUILD b/community/iasl/PKGBUILD
index 5e8d89a49..d33d2efa4 100644
--- a/community/iasl/PKGBUILD
+++ b/community/iasl/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 59496 2011-11-26 21:04:57Z lcarlier $
+# $Id: PKGBUILD 72890 2012-06-24 13:48:22Z lcarlier $
 # Maintainer : Laurent Carlier <lordheavym@gmail.com>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Alessio 'mOlOk' Bolognino <themolok@gmail.com>
 
 pkgname=iasl
-pkgver=20111123
+pkgver=20120620
 pkgrel=1
 pkgdesc="Intel ACPI Source Language compiler"
 arch=('i686' 'x86_64')
@@ -16,11 +16,11 @@ options=('!makeflags')
 install=iasl.install
 source=(http://acpica.org/download/acpica-unix-${pkgver}.tar.gz
 	LICENSE)
-md5sums=('433470ddbdf8eab5e9c22e8f0e8836ff'
+md5sums=('7061691ed7c828bc640aaf4274bbca78'
          '8615526144f69ea4e870d9bc37df9b29')
 
 build() {
-  cd "${srcdir}/acpica-unix-${pkgver}"
+  cd "${srcdir}/acpica-unix-${pkgver}"/source
 
   # fix building with gcc-4.6
   sed -i -e 's/-Werror//g' compiler/Makefile tools/acpisrc/Makefile
@@ -41,7 +41,7 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/acpica-unix-${pkgver}"
+  cd "${srcdir}/acpica-unix-${pkgver}"/source
 
   install -D -m755 compiler/iasl "${pkgdir}/usr/bin/iasl"
   install -m755 tools/acpisrc/acpisrc "${pkgdir}/usr/bin"
diff --git a/community/kadu/PKGBUILD b/community/kadu/PKGBUILD
index ee0c81f46..94b8135dd 100644
--- a/community/kadu/PKGBUILD
+++ b/community/kadu/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 70153 2012-04-30 20:50:12Z bpiotrowski $
-# Maintainer:  Bartłomiej Piotrowski
+# $Id: PKGBUILD 72896 2012-06-24 16:12:42Z bpiotrowski $
+# Maintainer:  Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 # Contributor: Mateusz Herych
 # Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org>
 
 pkgname=kadu
-pkgver=0.11.3
+pkgver=0.12.0
 pkgrel=1
 pkgdesc="A Qt-based Jabber/XMPP and Gadu-Gadu client"
 arch=('i686' 'x86_64')
@@ -14,7 +14,7 @@ depends=('libgadu' 'libxss' 'aspell' 'phonon' 'qca-ossl' 'libidn' 'libmpdclient'
 makedepends=('cmake' 'libao' 'libsndfile' 'libxtst' 'curl')
 install=kadu.install
 source=(http://download.kadu.im/stable/$pkgname-$pkgver.tar.bz2)
-md5sums=('fc70882b86bdb04cb0835b2cf014b8aa')
+md5sums=('9e89dfa84561e408b26dae207e176198')
 
 build() {
   cd "$srcdir"
@@ -28,6 +28,7 @@ build() {
 package() {
   cd "$srcdir/build"
   make DESTDIR="$pkgdir" install
+  mv "$pkgdir"/usr/sdk "$pkgdir"/usr/share/kadu/sdk
   rm -rf "$pkgdir/usr/{lib,include}/{libgadu*,pkgconfig}"
   rm -rf "$pkgdir/usr/share/kadu/{HISTORY,README}"
 }
diff --git a/community/ldc/PKGBUILD b/community/ldc/PKGBUILD
index f293c971b..50d0a1589 100644
--- a/community/ldc/PKGBUILD
+++ b/community/ldc/PKGBUILD
@@ -1,7 +1,7 @@
-# $Id: PKGBUILD 72264 2012-06-11 13:28:25Z svenstaro $
+# $Id: PKGBUILD 72875 2012-06-24 11:09:33Z svenstaro $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 pkgname=ldc
-pkgver=20120611
+pkgver=20120624
 pkgrel=1
 pkgdesc="A D Compiler based on the LLVM Compiler Infrastructure including D runtime and libphobos2"
 arch=('i686' 'x86_64')
diff --git a/community/nautilus-actions/PKGBUILD b/community/nautilus-actions/PKGBUILD
index 28b0d8f71..c8e5e37b0 100644
--- a/community/nautilus-actions/PKGBUILD
+++ b/community/nautilus-actions/PKGBUILD
@@ -1,11 +1,12 @@
-# $Id: PKGBUILD 72506 2012-06-16 07:11:54Z ebelanger $
-# Maintainer : Ionut Biru <ibiru@archlinux.org>
+# $Id: PKGBUILD 72886 2012-06-24 13:16:21Z bgyorgy $
+# Maintainer: Balló György <ballogyor+arch at gmail dot com>
+# Contributor: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Roman Kyrylych <roman@archlinux.org>
 # Contributor: Tor Krill <tor@krill.nu>
 
 pkgname=nautilus-actions
 pkgver=3.2.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Configures programs to be launched when files are selected in Nautilus"
 arch=('i686' 'x86_64')
 url="http://www.nautilus-actions.org/"
@@ -18,17 +19,25 @@ source=(http://ftp.gnome.org/pub/GNOME/sources/nautilus-actions/${pkgver%.*}/$pk
 sha256sums=('214af9fd2a7f561366bf88446f9b79182e696a303da8e15c7a8a1ffaeaca11c4')
 
 build() {
-    cd "$srcdir/$pkgname-$pkgver"
-    ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-        --libexecdir=/usr/lib/nautilus-actions
-    make
+  cd "$srcdir/$pkgname-$pkgver"
+
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib \
+              --disable-schemas-install \
+              --with-gconf-schema-file-dir=/usr/share/gconf/schemas
+  make
 }
 
 package(){
-    cd "$srcdir/$pkgname-$pkgver"
-    make  GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="$pkgdir" install
-    mkdir -p "$pkgdir/usr/share/gconf/schemas"
-    gconf-merge-schema "$pkgdir/usr/share/gconf/schemas/$pkgname.schemas" --domain nautilus-actions \
-        "$pkgdir"/etc/gconf/schemas/*.schemas
-    rm -rf "$pkgdir/etc/gconf/schemas/"
+  cd "$srcdir/$pkgname-$pkgver"
+
+  make DESTDIR="$pkgdir" install
+
+  # Install GConf schemas
+  mkdir -p "$pkgdir/usr/share/gconf/schemas"
+  gconf-merge-schema "$pkgdir/usr/share/gconf/schemas/$pkgname.schemas" --domain nautilus-actions \
+                     "$pkgdir"/usr/share/nautilus-actions/gconf-schemas/*.schemas
+  rm -r "$pkgdir/usr/share/nautilus-actions/gconf-schemas/"
+
+  # Remove redundant documentation
+  rm -r "$pkgdir/usr/share/doc/"
 }
diff --git a/community/pokerth/PKGBUILD b/community/pokerth/PKGBUILD
index f73213945..9776d3921 100644
--- a/community/pokerth/PKGBUILD
+++ b/community/pokerth/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 69993 2012-04-28 00:04:33Z svenstaro $
+# $Id: PKGBUILD 72879 2012-06-24 11:31:45Z svenstaro $
 # Maintainer:  Mateusz Herych <heniekk@gmail.com>
 # Maintainer:  Bartłomiej Piotrowski <barthalion@gmail.com>
 # Contributor: Vasco Costa <vasco.costa@meiodigital.com>
 
 pkgname=pokerth
 _realname=PokerTH
-pkgver=0.9.4
+pkgver=0.9.5
 pkgrel=1
 pkgdesc="Poker game written in C++/QT4"
 arch=('i686' 'x86_64')
@@ -15,7 +15,7 @@ depends=('curl' 'boost-libs' 'gsasl' 'gnutls'
          'qt' 'sdl_mixer' 'libircclient' 'tinyxml')
 makedepends=('boost')
 source=(http://downloads.sourceforge.net/sourceforge/pokerth/$_realname-$pkgver-src.tar.bz2)
-md5sums=('afdc63e9a4e499fd70fc0eee4d8dc1a9')
+md5sums=('4bdea98bfc142a825c64b77feb4667d0')
 
 build() {
   cd "$srcdir/$_realname-$pkgver-src"
diff --git a/community/polipo/PKGBUILD b/community/polipo/PKGBUILD
index e8749a5a4..9493308a1 100644
--- a/community/polipo/PKGBUILD
+++ b/community/polipo/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 72794 2012-06-22 12:51:45Z dreisner $
+# $Id: PKGBUILD 72884 2012-06-24 12:10:09Z ttopper $
 # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de>
 # Contributor: Jelle van der Waa <jelle vdwaa nl>
 # Contributor: Thomas Holmquist <thomas@vorget.com>
@@ -7,7 +7,7 @@
 
 pkgname=polipo
 pkgver=1.0.4.1
-pkgrel=3
+pkgrel=4
 pkgdesc="A small and fast caching web proxy."
 arch=('i686' 'x86_64')
 url="http://www.pps.jussieu.fr/~jch/software/polipo/"
diff --git a/community/polipo/polipo.install b/community/polipo/polipo.install
index bacc46377..9c1117321 100644
--- a/community/polipo/polipo.install
+++ b/community/polipo/polipo.install
@@ -7,8 +7,8 @@ post_install() {
     install-info $infodir/$file $infodir/dir 2> /dev/null
   done
   install -d /var/cache/polipo 2> /dev/null
-  touch /var/log/polipo.log 2> /dev/null
-  chown -R nobody:nobody /var/cache/polipo /var/log/polipo.log 2> /dev/null
+  touch /var/log/polipo 2> /dev/null
+  chown -R nobody:nobody /var/cache/polipo /var/log/polipo 2> /dev/null
 }
 
 post_upgrade() {
diff --git a/community/stone-soup/PKGBUILD b/community/stone-soup/PKGBUILD
index 3dc942861..7d0afc772 100644
--- a/community/stone-soup/PKGBUILD
+++ b/community/stone-soup/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Jakob Gruber <jakob.gruber@gmail.com>
 
 pkgname=stone-soup
-pkgver=0.10.2
+pkgver=0.10.3
 pkgrel=1
 pkgdesc='Open-source, single-player, role-playing roguelike game of exploration and treasure-hunting'
 arch=('i686' 'x86_64')
@@ -12,7 +12,6 @@ conflicts=('crawl' 'stone-soup-tile' 'stone-soup-git')
 license=('custom')
 install=stone-soup.install
 source=("http://downloads.sourceforge.net/sourceforge/crawl-ref/stone_soup-${pkgver}-nodeps.tar.xz")
-md5sums=('60f46bc6936db6fe5de81220ab8513bd')
 
 # used by gendesk to create .desktop file
 _exec=('crawl-tiles')
@@ -66,4 +65,4 @@ build() {
 
 }
 
-# vim: ts=4:sw=4:expandtab
+md5sums=('ec617185bd3d5562904a401a45c65afd')
diff --git a/core/dbus-core/PKGBUILD b/core/dbus-core/PKGBUILD
index 4d65c80d0..c2ca50617 100644
--- a/core/dbus-core/PKGBUILD
+++ b/core/dbus-core/PKGBUILD
@@ -1,33 +1,36 @@
-# $Id: PKGBUILD 156105 2012-04-14 07:39:59Z andyrtr $
+# $Id: PKGBUILD 162315 2012-06-24 22:30:38Z dreisner $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Link Dupont <link@subpop.net>
 #
 pkgname=dbus-core
-pkgver=1.4.20
-pkgrel=2
+pkgver=1.6.0
+pkgrel=4
 pkgdesc="Freedesktop.org message bus system"
 url="http://www.freedesktop.org/Software/dbus"
 arch=(i686 x86_64)
 license=('GPL' 'custom')
-depends=('expat>=2.0.1' 'coreutils' 'filesystem' 'shadow') # shadow for install scriptlet FS#29341
+depends=('expat>=2.0.1' 'coreutils' 'filesystem' 'libsystemd' 'shadow') # shadow for install scriptlet FS#29341
 makedepends=('libx11')
 conflicts=('dbus<1.2.3-2')
 options=(!libtool)
 install=dbus.install
-source=(http://dbus.freedesktop.org/releases/dbus/dbus-${pkgver}.tar.gz
+source=(http://dbus.freedesktop.org/releases/dbus/dbus-${pkgver}.tar.gz{,.asc}
         dbus)
-md5sums=('79eca2f2c1894ac347acce128314428b'
-         '08f93dd19cffd1b45ab05c1fd4efb560')
+md5sums=('16dcae2dd0c76e398381601ac9acdec4'
+         '0ebde9920bde83fe26ce32351a7d8954'
+         'f0364f3f5dc5f653bb05d39aa36e3264')
 
 build() {
   cd "${srcdir}/dbus-${pkgver}"
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
       --libexecdir=/usr/lib/dbus-1.0 --with-dbus-user=81 \
-      --with-system-pid-file=/var/run/dbus.pid \
+      --with-system-pid-file=/run/dbus/pid \
+      --with-system-socket=/run/dbus/system_bus_socket \
       --enable-inotify --disable-dnotify \
       --disable-verbose-mode --disable-static \
       --disable-tests --disable-asserts \
-      --with-systemdsystemunitdir=/usr/lib/systemd/system
+      --with-systemdsystemunitdir=/usr/lib/systemd/system \
+      --enable-systemd
   make
 }
 
@@ -45,6 +48,6 @@ package(){
   #Fix configuration file
   sed -i -e 's|<user>81</user>|<user>dbus</user>|' "${pkgdir}/etc/dbus-1/system.conf"
 
-  install -d -m755 "${pkgdir}/usr/share/licenses/dbus-core"
+  install -dm755 "${pkgdir}/usr/share/licenses/dbus-core"
   install -m644 COPYING "${pkgdir}/usr/share/licenses/dbus-core/"
 }
diff --git a/core/dbus-core/dbus b/core/dbus-core/dbus
index 66b84cae0..bf532a274 100644
--- a/core/dbus-core/dbus
+++ b/core/dbus-core/dbus
@@ -4,18 +4,14 @@
 . /etc/rc.conf
 . /etc/rc.d/functions
 
-case "$1" in
+case $1 in
     start)
         stat_busy "Starting D-BUS system messagebus"
-	if [ ! -x /var/run/dbus ] ; then
-	    install -m755 -g 81 -o 81 -d /var/run/dbus
-	fi
-        if [ -x /usr/bin/dbus-uuidgen ] ; then
-            /usr/bin/dbus-uuidgen --ensure
+        if [[ ! -d /run/dbus ]] ; then
+            install -m755 -g 81 -o 81 -d /run/dbus
         fi
 
-        /usr/bin/dbus-daemon --system
-        if [ $? -gt 0 ]; then
+        if ! dbus-daemon --system; then
             stat_fail
         else
             add_daemon dbus
@@ -24,27 +20,25 @@ case "$1" in
         ;;
     stop)
         stat_busy "Stopping D-BUS system messagebus"
-	[ -f /var/run/dbus.pid ] && kill `cat /var/run/dbus.pid` >/dev/null 2>&1
-        if [ $? -gt 0 ]; then
+        if ! { [[ -f /run/dbus/pid ]] && kill $(</run/dbus/pid); }; then
             stat_fail
         else
-	    rm -f /var/run/dbus.pid
+            rm -f /run/dbus/pid
             rm_daemon dbus
             stat_done
         fi
         ;;
     restart)
         $0 stop
-	sleep 1
+        sleep 1
         $0 start
         ;;
     reload)
         stat_busy "Reloading D-BUS configuration"
-        [ -f /var/run/dbus.pid ] && /usr/bin/dbus-send \
+        if ! { [[ -f /run/dbus/pid ]] && dbus-send \
                 --system --type=method_call \
                 --dest=org.freedesktop.DBus \
-                / org.freedesktop.DBus.ReloadConfig
-        if [ $? -gt 0 ]; then
+                / org.freedesktop.DBus.ReloadConfig; }; then
             stat_fail
         else
             stat_done
@@ -52,6 +46,6 @@ case "$1" in
         ;;
     *)
         echo "usage: $0 {start|stop|restart|reload}"
-	;;
+        ;;
 esac
 exit 0
diff --git a/core/dbus-core/dbus.install b/core/dbus-core/dbus.install
index 44f4475ee..88a568429 100644
--- a/core/dbus-core/dbus.install
+++ b/core/dbus-core/dbus.install
@@ -1,24 +1,29 @@
 post_install() {
-  getent group dbus >/dev/null || usr/sbin/groupadd -g 81 dbus
-  getent passwd dbus >/dev/null || usr/sbin/useradd -c 'System message bus' -u 81 -g dbus -d '/' -s /bin/false dbus
-  usr/bin/passwd -l dbus &>/dev/null
-  dbus-uuidgen --ensure
+  getent group dbus >/dev/null || groupadd -g 81 dbus
+  getent passwd dbus >/dev/null || useradd -c 'System message bus' -u 81 -g dbus -d '/' -s /bin/false dbus
+  passwd -l dbus &>/dev/null
+
+  if [[ ! -L var/lib/dbus/machine-id ]]; then
+    [[ -e var/lib/dbus/machine-id && ! -e etc/machine-id ]] && mv var/lib/dbus/machine-id etc/
+    ln -sf ../../../etc/machine-id var/lib/dbus/
+  fi
+  dbus-uuidgen --ensure=etc/machine-id
 }
 
 post_upgrade() {
   post_install
 
-  #Make sure new rc script can shutdown running dbus
-  if [ -f var/run/dbus/pid ]; then
-    mv var/run/dbus/pid var/run/dbus.pid
+  # Make sure new rc script can shutdown running dbus
+  if [ -f run/dbus.pid -a -d run/dbus ]; then
+    mv run/dbus.pid run/dbus/pid
   fi
 }
 
 post_remove() {
   if getent passwd dbus >/dev/null; then
-    usr/sbin/userdel dbus
+    userdel dbus
   fi
   if getent group dbus >/dev/null; then
-    usr/sbin/groupdel dbus
+    groupdel dbus
   fi
 }
diff --git a/core/xinetd/PKGBUILD b/core/xinetd/PKGBUILD
index bf2ec3550..3ed7dee87 100644
--- a/core/xinetd/PKGBUILD
+++ b/core/xinetd/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 159242 2012-05-18 16:47:27Z tpowa $
-# Maintainer:
+# $Id: PKGBUILD 162234 2012-06-24 05:44:41Z tpowa $
+# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: Judd <jvinet@zeroflux.org>
 
 pkgname=xinetd
 pkgver=2.3.15
-pkgrel=1
+pkgrel=2
 pkgdesc="A secure replacement for inetd"
 arch=('i686' 'x86_64')
 url="http://www.xinetd.org/"
@@ -22,7 +22,7 @@ md5sums=('77358478fd58efa6366accae99b8b04c'
          'ea37a2794f202e6b953d9b6956dad16a'
          '21f47b4aa20921cfaddddd9f9a407f81'
          '9fa2061dc7dd738c8424251deb86f81e'
-         '4473d8b2b6c984626d9f73a0b89711ee')
+         '08466ed714ea8ba42ad81f6fb3aa62e7')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
diff --git a/core/xinetd/xinetd.service b/core/xinetd/xinetd.service
index ac80139e2..c6f6271fd 100644
--- a/core/xinetd/xinetd.service
+++ b/core/xinetd/xinetd.service
@@ -1,6 +1,6 @@
 [Unit]
 Description=A secure replacement for inetd
-After=network.service
+After=network.target
 
 [Service]
 ExecStart=/usr/sbin/xinetd -dontfork
diff --git a/extra/bluez/PKGBUILD b/extra/bluez/PKGBUILD
index 3e167e710..f6270a7ad 100644
--- a/extra/bluez/PKGBUILD
+++ b/extra/bluez/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 162066 2012-06-19 12:10:02Z tomegun $
+# $Id: PKGBUILD 162308 2012-06-24 20:46:50Z tomegun $
 # Maintainer: Tom Gundersen <teg@jklm.no>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Geoffroy Carrier <geoffroy@archlinux.org>
 
 pkgname=bluez
-pkgver=4.100
+pkgver=4.101
 pkgrel=1
 pkgdesc="Libraries and tools for the Bluetooth protocol stack"
 url="http://www.bluez.org/"
@@ -26,14 +26,11 @@ backup=(etc/bluetooth/{main,rfcomm,audio,network,input,serial}.conf
         'etc/conf.d/bluetooth' 'etc/dbus-1/system.d/bluetooth.conf')
 source=("http://www.kernel.org/pub/linux/bluetooth/${pkgname}-${pkgver}.tar.bz2"
         'bluetooth.conf.d'
-	'rc.bluetooth'
-	'org.bluez.service')
+	'rc.bluetooth')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
-  cp ../org.bluez.service src/
-
   ./configure --prefix=/usr \
     --sysconfdir=/etc \
     --localstatedir=/var \
@@ -81,7 +78,6 @@ package() {
     "${pkgdir}"/usr/bin/bluez-test-device \
     "${pkgdir}"/usr/bin/bluez-test-input
 }
-md5sums=('54809d476c52665ff64594b6828016b5'
+md5sums=('902b390af95c6c5d6d1a17d94c8344ab'
          '7412982b440f29fa7f76a41a87fef985'
-         '8f9498707f809506928b2e480d3b6789'
-         '54c7de598327bf11d56592235d0702f4')
+         '864cbd24e6efc3592e9284b0b5fb2cfd')
diff --git a/extra/bluez/rc.bluetooth b/extra/bluez/rc.bluetooth
index a46ee2abb..0feeaeab6 100644
--- a/extra/bluez/rc.bluetooth
+++ b/extra/bluez/rc.bluetooth
@@ -21,14 +21,14 @@ DUND_EXEC="/usr/bin/dund"
 DAEMON_ENABLE="true"
 HIDD_ENABLE="false"
 RFCOMM_ENABLE="false"
-DUND_ENABLE="false"
 PAND_ENABLE="false"
+DUND_ENABLE="false"
 
 RFCOMM_CONFIG="/etc/bluetooth/rfcomm.conf"
 
 HIDD_OPTIONS=""
-DUND_OPTIONS=""
 PAND_OPTIONS=""
+DUND_OPTIONS=""
 
 [ -f /etc/conf.d/bluetooth ] && . /etc/conf.d/bluetooth
 
@@ -40,10 +40,6 @@ case "$1" in
       $DAEMON_EXEC
       sleep 1
     fi
-    if [ "$SDPD_ENABLE" = "true" -a -x "$SDPD_EXEC" ] ; then
-      stat_append " $SDPD_NAME"
-      $SDPD_EXEC
-    fi
     if [ "$HIDD_ENABLE" = "true" -a -x "$HIDD_EXEC" ]; then
       stat_append " $HIDD_NAME"
       $HIDD_EXEC $HIDD_OPTIONS
@@ -52,26 +48,26 @@ case "$1" in
       stat_append " $RFCOMM_NAME"
       $RFCOMM_EXEC -f $RFCOMM_CONFIG bind all
     fi
-    if [ "$DUND_ENABLE" = "true" -a -x "$DUND_EXEC" -a -n "$DUND_OPTIONS" ]; then
-      stat_append " $DUND_NAME"
-      $DUND_EXEC $DUND_OPTIONS
-    fi
     if [ "$PAND_ENABLE" = "true" -a -x "$PAND_EXEC" -a -n "$PAND_OPTIONS" ]; then
       stat_append " $PAND_NAME"
       $PAND_EXEC $PAND_OPTIONS
     fi
+    if [ "$DUND_ENABLE" = "true" -a -x "$DUND_EXEC" -a -n "$DUND_OPTIONS" ]; then
+      stat_append " $DUND_NAME"
+      $DUND_EXEC $DUND_OPTIONS
+    fi
     add_daemon bluetooth
     stat_done
     ;;
   stop)
     stat_busy "Stopping bluetooth subsystem:"
 
-    stat_append " $PAND_NAME"
-    killall $PAND_NAME >/dev/null 2>&1
-
     stat_append " $DUND_NAME"
     killall $DUND_NAME >/dev/null 2>&1
 
+    stat_append " $PAND_NAME"
+    killall $PAND_NAME >/dev/null 2>&1
+
     if [ -x "$RFCOMM_EXEC" ]; then
       stat_append " $RFCOMM_NAME"
       $RFCOMM_EXEC release all >/dev/null 2>&1
@@ -80,9 +76,6 @@ case "$1" in
     stat_append " $HIDD_NAME"
     killall $HIDD_NAME >/dev/null 2>&1
 
-    stat_append " $SDPD_NAME"
-    killall $SDPD_NAME >/dev/null 2>&1
-
     stat_append " $DAEMON_NAME"
     killall $DAEMON_NAME >/dev/null 2>&1
 
diff --git a/extra/burp/PKGBUILD b/extra/burp/PKGBUILD
index 4851bf32c..e119d3e6e 100644
--- a/extra/burp/PKGBUILD
+++ b/extra/burp/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 156101 2012-04-14 03:07:41Z dreisner $
+# $Id: PKGBUILD 162259 2012-06-24 15:44:41Z dreisner $
 # Maintainer: Dave Reisner <d@falconindy.com>
 
 pkgname=burp
-pkgver=1.6.8
+pkgver=1.6.9
 pkgrel=1
 pkgdesc="A simple AUR uploader"
 arch=('i686' 'x86_64')
@@ -11,7 +11,7 @@ license=('GPL')
 depends=('glibc' 'curl')
 makedepends=('perl')
 source=("https://github.com/downloads/falconindy/$pkgname/$pkgname-$pkgver.tar.gz")
-md5sums=('57b0043994e8a9a3f8f5a27d7fef5bb4')
+md5sums=('3ae883cf6283e860f613668619b8d3ce')
 
 build() {
   make -C "$pkgname-$pkgver"
diff --git a/extra/clucene/PKGBUILD b/extra/clucene/PKGBUILD
new file mode 100644
index 000000000..dbeb16810
--- /dev/null
+++ b/extra/clucene/PKGBUILD
@@ -0,0 +1,78 @@
+# $Id: PKGBUILD 162256 2012-06-24 14:30:07Z andyrtr $
+# Maintainer: AndyRTR <andyrtr@archlinux.org>
+# Contributor: Alexander Rødseth
+# Contributor: Alois Nespor <alois.nespor@gmail.com>
+# Contributor: Tobias Powalowski <tpowa@archlinux.org>
+pkgname=clucene
+pkgver=2.3.3.4
+pkgrel=5
+pkgdesc="C++ port of the high-performance text search engine Lucene"
+arch=('x86_64' 'i686')
+url="http://clucene.sourceforge.net/"
+license=('APACHE' 'LGPL')
+depends=('gcc-libs' 'zlib' 'boost-libs')
+makedepends=('cmake' 'boost')
+source=(http://downloads.sourceforge.net/$pkgname/$pkgname-core-$pkgver.tar.gz
+		# Fedora patches
+		clucene-core-2.3.3.4-pkgconfig.patch
+        clucene-core-2.3.3.4-install_contribs_lib.patch
+        # upstream patch
+        fix_zlib_detections.diff
+        # LibreOffice patches
+        clucene-warnings.patch
+        clucene-gcc-atomics.patch
+        clucene-debug.patch
+        clucene-narrowing-conversions.patch
+        clucene-multimap-put.patch)
+sha256sums=('ddfdc433dd8ad31b5c5819cc4404a8d2127472a3b720d3e744e8c51d79732eab'
+            '10c808ce483d997d7ff349cc3ec97b8785c365f956d6eef45458e9caf4e5e88d'
+            '3d3f73685f75b4ceacf1941e50b6108941bded3ca558ac1343c35b1b7d0e78dc'
+            'e1a6a58dc344d8d5e3218137a5e7a689900eb6ea4cce1dc426e861706ab78889'
+            'a66922411eca00c1cd171dd15ac462eec7a832cf067dbb0231773553554242ef'
+            'b11dca0d6b889f6ddfa4fd2566373717f54fed9590bf0daee054dea5e39a9f46'
+            'c944b9de6b18e49bb065d10c5d045446eeb15f680d6af4b5ac7e4f5fbda8f2a0'
+            'cfc88dae46efb2a17ffdc088fd78ca28655e653c9d183b83bdae18c0192a8ddd'
+            '917c8bfc1dd3313a716ecacf398dbcaf0aa02ce61b41ca2d3d7eb84fa160fce3')
+
+build() {
+  cd $srcdir/$pkgname-core-$pkgver
+
+  # add missing contrib-libs needed by LibO 3.6, patch by FC
+  patch -Np1 -i ${srcdir}/clucene-core-2.3.3.4-install_contribs_lib.patch
+  # pkgconfig file is missing clucene-shared (upstream ID: 3461512), patch by FC
+  patch -Np1 -i ${srcdir}/clucene-core-2.3.3.4-pkgconfig.patch
+  # one upstream postrelease commit for proper zlib detection
+  patch -Np1 -i ${srcdir}/fix_zlib_detections.diff
+  # LibreOffice patches http://cgit.freedesktop.org/libreoffice/core/tree/clucene/patches
+  patch -Np0 -i ${srcdir}/clucene-warnings.patch
+  patch -Np0 -i ${srcdir}/clucene-gcc-atomics.patch
+  patch -Np0 -i ${srcdir}/clucene-debug.patch
+  patch -Np0 -i ${srcdir}/clucene-narrowing-conversions.patch
+  patch -Np0 -i ${srcdir}/clucene-multimap-put.patch
+
+  mkdir build
+  pushd build
+  cmake .. \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DENABLE_ASCII_MODE=OFF \
+    -DENABLE_PACKAGING=OFF \
+    -DBUILD_CONTRIBS_LIB:BOOL=ON \
+    -DLIB_DESTINATION:PATH=/usr/lib \
+    -DLUCENE_SYS_INCLUDES:PATH=/usr/lib \
+    -DDISABLE_MULTITHREADING=OFF
+  popd
+  make -C build
+}
+
+#check() {
+#  cd $srcdir/$pkgname-core-$pkgver
+#  make cl_test -C build
+#  make test -C build || /bin/true # currently fails the tests as expected (see FC comment)
+#}
+
+package() {
+  cd $srcdir/$pkgname-core-$pkgver
+  make DESTDIR="$pkgdir" install -C build
+  rm -rf $pkgdir/usr/lib/CLuceneConfig.cmake
+}
diff --git a/extra/clucene/clucene-core-2.3.3.4-install_contribs_lib.patch b/extra/clucene/clucene-core-2.3.3.4-install_contribs_lib.patch
new file mode 100644
index 000000000..8fbb3c716
--- /dev/null
+++ b/extra/clucene/clucene-core-2.3.3.4-install_contribs_lib.patch
@@ -0,0 +1,42 @@
+diff -NaurpBb clucene-core-2.3.3.4/CMakeLists.txt clucene-core-2.3.3.4-mod/CMakeLists.txt
+--- clucene-core-2.3.3.4/CMakeLists.txt	2011-03-17 03:21:07.000000000 +0300
++++ clucene-core-2.3.3.4-mod/CMakeLists.txt	2011-08-16 16:56:55.968268152 +0400
+@@ -163,7 +163,7 @@ IF ( BUILD_CONTRIBS )
+   SET(BUILD_CONTRIBS_LIB 1)
+ ENDIF ( BUILD_CONTRIBS )
+ IF ( BUILD_CONTRIBS_LIB )
+-  ADD_SUBDIRECTORY (src/contribs-lib EXCLUDE_FROM_ALL)
++  ADD_SUBDIRECTORY (src/contribs-lib)
+ ENDIF ( BUILD_CONTRIBS_LIB )
+ 
+ 
+diff -NaurpBb clucene-core-2.3.3.4/src/contribs-lib/CMakeLists.txt clucene-core-2.3.3.4-mod/src/contribs-lib/CMakeLists.txt
+--- clucene-core-2.3.3.4/src/contribs-lib/CMakeLists.txt	2011-03-17 03:21:07.000000000 +0300
++++ clucene-core-2.3.3.4-mod/src/contribs-lib/CMakeLists.txt	2011-08-16 17:14:13.499275499 +0400
+@@ -106,9 +106,26 @@ add_library(clucene-contribs-lib SHARED
+ )
+ TARGET_LINK_LIBRARIES(clucene-contribs-lib ${clucene_contrib_extra_libs})
+ 
++#install public headers.
++FOREACH(file ${HEADERS})
++	get_filename_component(apath ${file} PATH)
++	get_filename_component(aname ${file} NAME)
++	file(RELATIVE_PATH relpath ${CMAKE_SOURCE_DIR}/src/contribs-lib ${apath})
++	IF ( NOT aname MATCHES "^_.*" )
++		install(FILES ${file} 
++		        DESTINATION include/${relpath}
++		        COMPONENT development)
++	ENDIF ( NOT aname MATCHES "^_.*" )
++ENDFOREACH(file)
++
+ #set properties on the libraries
+ SET_TARGET_PROPERTIES(clucene-contribs-lib PROPERTIES
+     VERSION ${CLUCENE_VERSION}
+     SOVERSION ${CLUCENE_SOVERSION}
+     COMPILE_DEFINITIONS_DEBUG _DEBUG
+ )
++
++#and install library
++install(TARGETS clucene-contribs-lib 
++        DESTINATION ${LIB_DESTINATION}  
++        COMPONENT runtime )
diff --git a/extra/clucene/clucene-core-2.3.3.4-pkgconfig.patch b/extra/clucene/clucene-core-2.3.3.4-pkgconfig.patch
new file mode 100644
index 000000000..aff20d7b4
--- /dev/null
+++ b/extra/clucene/clucene-core-2.3.3.4-pkgconfig.patch
@@ -0,0 +1,12 @@
+diff -up clucene-core-2.3.3.4/src/core/libclucene-core.pc.cmake.pkgconfig_sys_includes clucene-core-2.3.3.4/src/core/libclucene-core.pc.cmake
+--- clucene-core-2.3.3.4/src/core/libclucene-core.pc.cmake.pkgconfig_sys_includes	2011-03-16 19:21:07.000000000 -0500
++++ clucene-core-2.3.3.4/src/core/libclucene-core.pc.cmake	2012-03-19 09:01:00.689263954 -0500
+@@ -6,6 +6,6 @@ includedir=${prefix}/include:${prefix}/i
+ Name: libclucene
+ Description: CLucene - a C++ search engine, ported from the popular Apache Lucene
+ Version: @CLUCENE_VERSION_MAJOR@.@CLUCENE_VERSION_MINOR@.@CLUCENE_VERSION_REVISION@.@CLUCENE_VERSION_PATCH@
+-Libs: -L${prefix}/@LIB_DESTINATION@/ -lclucene-core
+-Cflags: -I${prefix}/include -I${prefix}/include/CLucene/ext
++Libs: -L${prefix}/@LIB_DESTINATION@/ -lclucene-core -lclucene-shared
++Cflags: -I${prefix}/include -I${prefix}/include/CLucene/ext -I@LUCENE_SYS_INCLUDES@
+ ~
diff --git a/extra/clucene/clucene-debug.patch b/extra/clucene/clucene-debug.patch
new file mode 100644
index 000000000..640454e2f
--- /dev/null
+++ b/extra/clucene/clucene-debug.patch
@@ -0,0 +1,11 @@
+--- src/core/CLucene/index/TermInfosReader.cpp
++++ src/core/CLucene/index/TermInfosReader.cpp
+@@ -111,7 +111,7 @@
+ 	      //destroy their elements
+ #ifdef _DEBUG
+          for ( int32_t i=0; i<indexTermsLength;++i ){
+-            indexTerms[i].__cl_refcount--;
++            indexTerms[i].__cl_decref();
+          }
+ #endif
+          //Delete the arrays
diff --git a/extra/clucene/clucene-gcc-atomics.patch b/extra/clucene/clucene-gcc-atomics.patch
new file mode 100644
index 000000000..819e9a7d7
--- /dev/null
+++ b/extra/clucene/clucene-gcc-atomics.patch
@@ -0,0 +1,31 @@
+--- src/shared/CLucene/config/threads.cpp	2012-02-23 12:06:55.355506304 +0000
++++ src/shared/CLucene/config/threads.cpp	2012-02-23 12:07:17.131766381 +0000
+@@ -185,7 +185,7 @@
+     }
+       
+     int32_t atomic_threads::atomic_increment(_LUCENE_ATOMIC_INT *theInteger){
+-      #ifdef _CL_HAVE_GCC_ATOMIC_FUNCTIONS
++      #if ( __GNUC__ > 4 ) || (( __GNUC__ == 4)  && ( __GNUC_MINOR__ >= 4 ))
+         return __sync_add_and_fetch(theInteger, 1);
+       #else
+         SCOPED_LOCK_MUTEX(theInteger->THIS_LOCK)
+@@ -193,7 +193,7 @@
+       #endif
+     }
+     int32_t atomic_threads::atomic_decrement(_LUCENE_ATOMIC_INT *theInteger){
+-      #ifdef _CL_HAVE_GCC_ATOMIC_FUNCTIONS
++      #if ( __GNUC__ > 4 ) || (( __GNUC__ == 4)  && ( __GNUC_MINOR__ >= 4 ))
+         return __sync_sub_and_fetch(theInteger, 1);
+       #else
+         SCOPED_LOCK_MUTEX(theInteger->THIS_LOCK)
+--- src/shared/CLucene/LuceneThreads.h	2012-02-23 12:36:28.388299322 +0000
++++ src/shared/CLucene/LuceneThreads.h	2012-02-23 12:37:23.131885433 +0000
+@@ -70,7 +70,7 @@
+         		void NotifyAll();
+ 					};
+ 
+-          #ifdef _CL_HAVE_GCC_ATOMIC_FUNCTIONS
++          #if ( __GNUC__ > 4 ) || (( __GNUC__ == 4)  && ( __GNUC_MINOR__ >= 4 ))
+             #define _LUCENE_ATOMIC_INT uint32_t
+             #define _LUCENE_ATOMIC_INT_SET(x,v) x=v
+             #define _LUCENE_ATOMIC_INT_GET(x) x
diff --git a/extra/clucene/clucene-multimap-put.patch b/extra/clucene/clucene-multimap-put.patch
new file mode 100644
index 000000000..36ed1fe22
--- /dev/null
+++ b/extra/clucene/clucene-multimap-put.patch
@@ -0,0 +1,10 @@
+--- src/core/CLucene/util/VoidMap.h
++++ src/core/CLucene/util/VoidMap.h
+@@ -316,6 +316,7 @@ public:
+ 		if ( _this::dk || _this::dv )
+ 			_this::remove(k);
+ 
++		(*this)[k] = v;
+ 	}
+ };
+ 
diff --git a/extra/clucene/clucene-narrowing-conversions.patch b/extra/clucene/clucene-narrowing-conversions.patch
new file mode 100644
index 000000000..f0e971c55
--- /dev/null
+++ b/extra/clucene/clucene-narrowing-conversions.patch
@@ -0,0 +1,25 @@
+--- src/core/CLucene/queryParser/QueryParser.cpp.sav	2011-03-17 01:21:07.000000000 +0100
++++ src/core/CLucene/queryParser/QueryParser.cpp	2012-03-09 18:20:58.000000000 +0100
+@@ -79,7 +79,7 @@
+     _T("<RANGEEX_GOOP>")
+ };
+ 
+-const int32_t QueryParser::jj_la1_0[] = {0x180,0x180,0xe00,0xe00,0x1f69f80,0x48000,0x10000,0x1f69000,0x1348000,0x80000,0x80000,0x10000,0x18000000,0x2000000,0x18000000,0x10000,0x80000000,0x20000000,0x80000000,0x10000,0x80000,0x10000,0x1f68000};
++const int32_t QueryParser::jj_la1_0[] = {0x180,0x180,0xe00,0xe00,0x1f69f80,0x48000,0x10000,0x1f69000,0x1348000,0x80000,0x80000,0x10000,0x18000000,0x2000000,0x18000000,0x10000,int32_t(0x80000000),0x20000000,int32_t(0x80000000),0x10000,0x80000,0x10000,0x1f68000};
+ const int32_t QueryParser::jj_la1_1[] = {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x1,0x0,0x0,0x0,0x0};
+ 
+ struct QueryParser::JJCalls {
+--- src/core/CLucene/queryParser/QueryParserTokenManager.cpp.sav	2011-03-17 01:21:07.000000000 +0100
++++ src/core/CLucene/queryParser/QueryParserTokenManager.cpp	2012-03-09 18:20:24.000000000 +0100
+@@ -15,9 +15,9 @@
+ 
+ CL_NS_DEF(queryParser)
+ 
+-const int64_t QueryParserTokenManager::jjbitVec2[]={0x0L, 0x0L, _ILONGLONG(0xffffffffffffffff), _ILONGLONG(0xffffffffffffffff)};
++const int64_t QueryParserTokenManager::jjbitVec2[]={0x0L, 0x0L, int64_t(_ILONGLONG(0xffffffffffffffff)), int64_t(_ILONGLONG(0xffffffffffffffff))};
+ const int64_t QueryParserTokenManager::jjbitVec0[] = {
+-	_ILONGLONG(0xfffffffffffffffe), _ILONGLONG(0xffffffffffffffff), _ILONGLONG(0xffffffffffffffff), _ILONGLONG(0xffffffffffffffff)
++	int64_t(_ILONGLONG(0xfffffffffffffffe)), int64_t(_ILONGLONG(0xffffffffffffffff)), int64_t(_ILONGLONG(0xffffffffffffffff)), int64_t(_ILONGLONG(0xffffffffffffffff))
+ };
+ const int32_t QueryParserTokenManager::jjnextStates[]={
+ 		15, 17, 18, 29, 32, 23, 33, 30, 20, 21, 32, 23, 33, 31, 34, 27,
diff --git a/extra/clucene/clucene-warnings.patch b/extra/clucene/clucene-warnings.patch
new file mode 100644
index 000000000..b9676d902
--- /dev/null
+++ b/extra/clucene/clucene-warnings.patch
@@ -0,0 +1,54 @@
+--- src/core/CLucene/analysis/AnalysisHeader.h	2012-02-22 12:37:22.531637934 +0000
++++ src/core/CLucene/analysis/AnalysisHeader.h	2012-02-22 12:39:15.369916728 +0000
+@@ -7,6 +7,8 @@
+ #ifndef _lucene_analysis_AnalysisHeader_
+ #define _lucene_analysis_AnalysisHeader_
+ 
++#pragma GCC system_header
++
+ #include "CLucene/index/Payload.h"
+ #include "CLucene/util/VoidList.h"
+ #include "CLucene/LuceneThreads.h"
+--- src/core/CLucene/search/Searchable.h	2012-02-22 12:37:22.513637729 +0000
++++ src/core/CLucene/search/Searchable.h	2012-02-22 12:38:51.073641550 +0000
+@@ -7,6 +7,7 @@
+ #ifndef _lucene_search_Searcher_
+ #define _lucene_search_Searcher_
+ 
++#pragma GCC system_header
+ 
+ //#include "CLucene/index/IndexReader.h"
+ CL_CLASS_DEF(index,Term)
+--- src/core/CLucene/store/IndexInput.h	2012-02-22 12:37:22.508637673 +0000
++++ src/core/CLucene/store/IndexInput.h	2012-02-22 12:39:00.465747935 +0000
+@@ -7,6 +7,8 @@
+ #ifndef _lucene_store_IndexInput_
+ #define _lucene_store_IndexInput_
+ 
++#pragma GCC system_header
++
+ #include "CLucene/LuceneThreads.h"
+ #include "CLucene/util/Equators.h"
+ 
+--- src/core/CLucene/util/Array.h	2012-02-22 12:37:22.510637696 +0000
++++ src/core/CLucene/util/Array.h	2012-02-22 12:38:33.714444884 +0000
+@@ -7,6 +7,8 @@
+ #ifndef _lucene_util_Array_
+ #define _lucene_util_Array_
+ 
++#pragma GCC system_header
++
+ #include <stdlib.h>
+ #include <string.h>
+ 
+--- src/core/CLucene/util/PriorityQueue.h	2012-02-22 12:37:22.510637696 +0000
++++ src/core/CLucene/util/PriorityQueue.h	2012-02-22 12:38:40.316519685 +0000
+@@ -7,6 +7,8 @@
+ #ifndef _lucene_util_PriorityQueue_
+ #define _lucene_util_PriorityQueue_
+ 
++#pragma GCC system_header
++
+ #include <stdlib.h>
+ 
+ CL_NS_DEF(util)
diff --git a/extra/clucene/fix_zlib_detections.diff b/extra/clucene/fix_zlib_detections.diff
new file mode 100644
index 000000000..2b08883f5
--- /dev/null
+++ b/extra/clucene/fix_zlib_detections.diff
@@ -0,0 +1,21 @@
+From: Veit Jahns <idolum@users.sourceforge.net>
+Date: Thu, 26 May 2011 11:35:28 +0000 (+0200)
+Subject: Fixing ZLIB configuration in shared's CMakeLists
+X-Git-Url: http://clucene.git.sourceforge.net/git/gitweb.cgi?p=clucene%2Fclucene;a=commitdiff_plain;h=772481ca94071ddfe65102a451926e4f9aeb4d2c;hp=a834f87bad3543b2a0331cef7202c15ded4245be
+
+Fixing ZLIB configuration in shared's CMakeLists
+---
+
+diff --git a/src/shared/CMakeLists.txt b/src/shared/CMakeLists.txt
+index 68314a7..3d1975e 100644
+--- a/src/shared/CMakeLists.txt
++++ b/src/shared/CMakeLists.txt
+@@ -42,7 +42,7 @@ INCLUDE (CheckAtomicFunctions)
+ find_package(ZLIB)
+ IF ( ZLIB_FOUND )
+   SET ( EXTRA_LIBS ${EXTRA_LIBS} ${ZLIB_LIBRARY} )
+-ELSEIF ( ZLIB_FOUND )
++ELSE ( ZLIB_FOUND )
+   MESSAGE( "ZLIB not found, using local: ${clucene-ext_SOURCE_DIR}/zlib" )
+   SET(ZLIB_INCLUDE_DIR ${clucene-ext_SOURCE_DIR}/zlib )
+   SET(ZLIB_LIBRARY ${clucene-ext_BINARY_DIR})
diff --git a/extra/dbus/PKGBUILD b/extra/dbus/PKGBUILD
index 0941c2f9e..d3cc74e8a 100644
--- a/extra/dbus/PKGBUILD
+++ b/extra/dbus/PKGBUILD
@@ -1,23 +1,24 @@
-# $Id: PKGBUILD 156107 2012-04-14 07:40:10Z andyrtr $
+# $Id: PKGBUILD 162316 2012-06-24 22:30:50Z dreisner $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Link Dupont <link@subpop.net>
 #
 pkgname=dbus
-pkgver=1.4.20
+pkgver=1.6.0
 pkgrel=1
 pkgdesc="Freedesktop.org message bus system"
 url="http://www.freedesktop.org/Software/dbus"
 arch=(i686 x86_64)
 license=('GPL' 'custom')
 depends=("dbus-core>=${pkgver}" 'libx11')
-source=(http://dbus.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz
+source=(http://dbus.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.asc}
         30-dbus)
-md5sums=('79eca2f2c1894ac347acce128314428b'
+md5sums=('16dcae2dd0c76e398381601ac9acdec4'
+         '0ebde9920bde83fe26ce32351a7d8954'
          '9fafe8b28460aeaa6054309ef4c5ed92')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  ECHO="echo" ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
       --libexecdir=/usr/lib/dbus-1.0 --with-dbus-user=81 \
       --with-system-pid-file=/var/run/dbus.pid \
       --disable-verbose-mode --disable-static \
diff --git a/extra/ddrescue/PKGBUILD b/extra/ddrescue/PKGBUILD
index 2e8575fb5..53165693c 100644
--- a/extra/ddrescue/PKGBUILD
+++ b/extra/ddrescue/PKGBUILD
@@ -1,8 +1,10 @@
-# $Id: PKGBUILD 149619 2012-02-08 20:30:46Z pierre $
-# Maintainer: Paul Mattal <paul@archlinux.org>
+# $Id: PKGBUILD 162261 2012-06-24 16:23:55Z schiv $
+# Maintainer: Ray Rashif <schiv@archlinux.org>
+# Contributor: Pierre Schmitz <pierre@archlinux.de>
+# Contributor: Paul Mattal <paul@archlinux.org>
 
 pkgname=ddrescue
-pkgver=1.15
+pkgver=1.16
 pkgrel=1
 pkgdesc="GNU data recovery tool"
 arch=('i686' 'x86_64')
@@ -12,8 +14,8 @@ depends=('gcc-libs')
 install=$pkgname.install
 source=("http://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz"
         "http://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz.sig")
-md5sums=('6b445f6246074a7fa02f3b2599031096'
-         '53bc7e1f5b2a260def5207eb358b7dca')
+md5sums=('57b67407e882c6418531d48a2f20d16b'
+         'bf072280587665d82829be15eb6fc9ad')
 
 build() {
   cd "$srcdir"/$pkgname-$pkgver
diff --git a/extra/graphicsmagick/PKGBUILD b/extra/graphicsmagick/PKGBUILD
index 31ab66def..a650c965a 100644
--- a/extra/graphicsmagick/PKGBUILD
+++ b/extra/graphicsmagick/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 160481 2012-06-02 10:26:14Z bluewind $
+# $Id: PKGBUILD 162322 2012-06-25 01:51:33Z bisson $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Anton Leontiev <bunder@t-25.ru>
 
 pkgname=graphicsmagick
-pkgver=1.3.15
-pkgrel=2
+pkgver=1.3.16
+pkgrel=1
 pkgdesc='Image processing system'
 url='http://www.graphicsmagick.org/'
 arch=('i686' 'x86_64')
@@ -16,16 +16,11 @@ depends=('bzip2' 'freetype2' 'ghostscript' 'jasper' 'lcms2' 'xz'
          'libtiff' 'libwmf' 'libsm' 'libxml2' 'libltdl')
 options=('!libtool')
 source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/GraphicsMagick-${pkgver}.tar.xz")
-sha1sums=('d5df4000d5531fad3ede9e008f9c8dc2d085d546')
+sha1sums=('3949030b101d66811242a0d30abc9965481ed035')
 
 build() {
 	cd "${srcdir}/GraphicsMagick-${pkgver}"
 
-	# fix typemap bug
-	# https://rt.cpan.org/Public/Bug/Display.html?id=70150
-	# http://trac.imagemagick.org/browser/ImageMagick/branches/ImageMagick-6.7.7/PerlMagick/typemap
-	echo 'Graphics::Magick T_PTROBJ' > typemap
-
 	./configure \
 		--prefix=/usr \
 		--with-perl \
diff --git a/extra/libtiff/PKGBUILD b/extra/libtiff/PKGBUILD
index b22c91572..2606aa16c 100644
--- a/extra/libtiff/PKGBUILD
+++ b/extra/libtiff/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 153433 2012-03-13 21:01:28Z eric $
+# $Id: PKGBUILD 162307 2012-06-24 20:44:52Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=libtiff
-pkgver=4.0.1
+pkgver=4.0.2
 pkgrel=1
 pkgdesc="Library for manipulation of TIFF images"
 arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ makedepends=('freeglut')
 optdepends=('freeglut: for using tiffgt')
 options=('!libtool')
 source=(ftp://ftp.remotesensing.org/pub/libtiff/tiff-${pkgver}.tar.gz)
-sha1sums=('8baf382231c9051a1b3eb294581289aa21447171')
+sha1sums=('d84b7b33a6cfb3d15ca386c8c16b05047f8b5352')
 
 build() {
   cd "${srcdir}/tiff-${pkgver}"
diff --git a/extra/live-media/PKGBUILD b/extra/live-media/PKGBUILD
index c6e28b53e..6542721cb 100644
--- a/extra/live-media/PKGBUILD
+++ b/extra/live-media/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 161806 2012-06-14 18:07:58Z giovanni $
+# $Id: PKGBUILD 162236 2012-06-24 06:52:55Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Gilles CHAUVIN <gcnweb@gmail.com>
 
 pkgname=live-media
-pkgver=2012.06.12
+pkgver=2012.06.23
 pkgrel=1
 pkgdesc="A set of C++ libraries for multimedia streaming"
 arch=('i686' 'x86_64')
@@ -11,7 +11,7 @@ license=('LGPL')
 url="http://live555.com/liveMedia"
 depends=('gcc-libs')
 source=("http://live555.com/liveMedia/public/live.${pkgver}.tar.gz")
-md5sums=('0c952d4debc674ac896fe3d231b21a0a')
+md5sums=('c1e6a597c8259a1c9d86a15605277a02')
 
 build() {
   cd ${srcdir}/live
diff --git a/extra/opennx/PKGBUILD b/extra/opennx/PKGBUILD
new file mode 100644
index 000000000..9ee9d9e0b
--- /dev/null
+++ b/extra/opennx/PKGBUILD
@@ -0,0 +1,37 @@
+# $Id: PKGBUILD 162243 2012-06-24 08:25:53Z andyrtr $
+# Maintainer: AndyRTR <andyrtr@archlinux.org>
+# Contributor: Armin Luntzer
+# Original opennx PKGBUILD: Tomas Groth tomasgroth.at.yahoo.dk
+
+pkgname=opennx
+pkgver=0.16.0.712
+pkgrel=1
+pkgdesc="A GPL replacement for the NoMachine client, patched to always show the session chooser"
+url="http://opennx.sf.net/"
+arch=('i686' 'x86_64')
+license=('GPL')
+depends=('wxgtk' 'libcups' 'libxext' 'libxft' 'xorg-xauth' 'curl')
+makedepends=('zip' 'opensc' 'libpulse' 'smbclient' 'libusb-compat')
+#optdepends=('cups: for full local printing support')
+source=(http://downloads.sourceforge.net/project/opennx/opennx/CI-source/opennx-$pkgver.tar.gz)
+md5sums=('f9cf99a9dc13de9ef6d219db83dec344')
+
+build() {
+  cd $srcdir/opennx*
+  ./configure --prefix=/usr \
+    --enable-usbip
+  make
+}
+
+package() {
+  cd $srcdir/opennx*
+  make DESTDIR=${pkgdir} install
+  make DESTDIR=${pkgdir} install-man
+  
+  # fix some file locations
+  install -dm755 ${pkgdir}/usr/share/applications
+  cp -aR ${pkgdir}/usr/share/applnk/xdg/* ${pkgdir}/usr/share/applications
+  rm -rf ${pkgdir}/usr/share/applnk
+  
+  sed -i -e "s:Exec=/usr/NX/bin/opennx:Exec=/usr/bin/opennx:" ${pkgdir}/usr/share/applications/*.desktop
+}
diff --git a/extra/smb4k/PKGBUILD b/extra/smb4k/PKGBUILD
index 5f6736583..03645c208 100644
--- a/extra/smb4k/PKGBUILD
+++ b/extra/smb4k/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 160665 2012-06-03 10:41:33Z giovanni $
+# $Id: PKGBUILD 162238 2012-06-24 07:45:21Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Emanuele Rampichini <emanuele.rampichini@gmail.com>
 
 pkgname=smb4k
-pkgver=1.0.2
+pkgver=1.0.3
 pkgrel=1
 pkgdesc="A KDE program that browses samba shares"
 arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 install=smb4k.install
 source=("http://downloads.sourceforge.net/project/${pkgname}/Smb4K%20%28stable%20releases%29/${pkgver}/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('e1c895044faaf18d90ea4b564412455e')
+md5sums=('943b4ccf1a481600784538148d86d3e4')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/wireshark/PKGBUILD b/extra/wireshark/PKGBUILD
index 4a0c77d07..6da9facd8 100644
--- a/extra/wireshark/PKGBUILD
+++ b/extra/wireshark/PKGBUILD
@@ -1,21 +1,23 @@
-# $Id: PKGBUILD 159382 2012-05-22 20:52:55Z guillaume $
+# $Id: PKGBUILD 162251 2012-06-24 12:43:16Z guillaume $
 # Maintainer: Guillaume ALAUX <guillaume@archlinux.org>
 # Contributor: Florian Pritz <bluewind at jabber dot ccc dot de>
 pkgname=('wireshark-cli' 'wireshark-gtk')
 pkgbase=wireshark
-pkgver=1.6.8
+pkgver=1.8.0
 pkgrel=1
 arch=('i686' 'x86_64')
 license=('GPL2')
-makedepends=('bison' 'flex' 'gtk2' 'krb5' 'libcap' 'libpcap' 'bash' 'gnutls' 'libgcrypt' 'lua')
+makedepends=('bison' 'flex' 'gtk2' 'krb5' 'libcap' 'libpcap' 'bash' 'gnutls'
+             'libgcrypt' 'lua' 'python')
 url="http://www.wireshark.org/"
 options=(!libtool)
 source=(http://www.wireshark.org/download/src/${pkgbase}-${pkgver}.tar.bz2)
-md5sums=('dcdc5f4904af5804b622c955a30974e2')
+md5sums=('3eca81253800a0089d0f957e75853b05')
 
 build() {
   cd "${srcdir}/${pkgbase}-${pkgver}"
 
+  ./autogen.sh
   ./configure \
       --prefix=/usr \
       --with-ssl \
diff --git a/libre/grub2/PKGBUILD b/libre/grub2/PKGBUILD
index 1ef7c3934..936a5d41f 100644
--- a/libre/grub2/PKGBUILD
+++ b/libre/grub2/PKGBUILD
@@ -2,17 +2,15 @@
 # Contributor: Keshav P R <(the.ridikulus.rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 
-_grub_bzr_rev="4232"
-_pkgver="2.00~beta6"
+_pkgver="2.00~rc1"
 
 _grub_lua_ver=24
-_grub_gpxe_ver=12
 _grub_ntldr_ver=21
 _grub_915_ver=9
 
 pkgname=('grub2-common' 'grub2-bios' 'grub2-efi-i386')
 pkgbase=grub2
-pkgver=2.00beta6
+pkgver=2.00rc1
 pkgrel=1
 url="http://www.gnu.org/software/grub/"
 arch=('i686' 'x86_64')
@@ -24,7 +22,6 @@ makedepends=('rsync' 'xz' 'bdf-unifont' 'python' 'autogen' 'texinfo'
 # source=("ftp://ftp.archlinux.org/other/grub2/grub_r${_grub_bzr_rev}.tar.xz"
 source=("http://alpha.gnu.org/gnu/grub/grub-${_pkgver}".tar.xz
         "ftp://ftp.archlinux.org/other/grub2/grub2_extras_lua_r${_grub_lua_ver}.tar.xz"
-        "ftp://ftp.archlinux.org/other/grub2/grub2_extras_gpxe_r${_grub_gpxe_ver}.tar.xz"
         "ftp://ftp.archlinux.org/other/grub2/grub2_extras_ntldr-img_r${_grub_ntldr_ver}.tar.xz"
         "ftp://ftp.archlinux.org/other/grub2/grub2_extras_915resolution_r${_grub_915_ver}.tar.xz"
         'parabola_grub_mkconfig_fixes.patch'
@@ -33,13 +30,11 @@ source=("http://alpha.gnu.org/gnu/grub/grub-${_pkgver}".tar.xz
         '20_memtest86+')
 
 noextract=("grub2_extras_lua_r${_grub_lua_ver}.tar.xz"
-           "grub2_extras_gpxe_r${_grub_gpxe_ver}.tar.xz"
            "grub2_extras_ntldr-img_r${_grub_ntldr_ver}.tar.xz"
            "grub2_extras_915resolution_r${_grub_915_ver}.tar.xz")
 
-sha1sums=('0ba5ccf6e6761911f9bf236e21f8f77a2d29ebdb'
+sha1sums=('2f5ca951c3cb9ca364d38e4b4a2ca2a232fc4c13'
           '89290031b974780c6df76893836d2477d4add895'
-          'b04994c005910b4bf123f034b30109d5c8d6fd86'
           'eb4b35b4c36b64f9405cbcbc538cb205171c1c0a'
           'd5ae2efec25616028a9d89e98b6e454f1c4c415f'
           '31aa740fc225b3f3ed4917843038f9e8658a71be'
@@ -64,9 +59,6 @@ _build_grub2-common_and_bios() {
 	bsdtar xf "${srcdir}/grub2_extras_lua_r${_grub_lua_ver}.tar.xz" \
 		-C "${srcdir}/grub_bios-${_pkgver}/grub-extras"
 
-	bsdtar xf "${srcdir}/grub2_extras_gpxe_r${_grub_gpxe_ver}.tar.xz" \
-		-C "${srcdir}/grub_bios-${_pkgver}/grub-extras"
-
 	bsdtar xf "${srcdir}/grub2_extras_ntldr-img_r${_grub_ntldr_ver}.tar.xz" \
 		-C "${srcdir}/grub_bios-${_pkgver}/grub-extras"
 
@@ -125,9 +117,6 @@ _build_grub2-efi-i386() {
 	bsdtar xf "${srcdir}/grub2_extras_lua_r${_grub_lua_ver}.tar.xz" \
 		-C "${srcdir}/grub_efi-${_pkgver}/grub-extras"
 
-	bsdtar xf "${srcdir}/grub2_extras_gpxe_r${_grub_gpxe_ver}.tar.xz" \
-		-C "${srcdir}/grub_efi-${_pkgver}/grub-extras"
-
 	## Requires python2
 	# sed 's|python |python2 |g' -i "${srcdir}/grub_efi-${_pkgver}/autogen.sh"
 
diff --git a/libre/linux-libre/3.4.4-fix-backlight-regression.patch b/libre/linux-libre/3.4.4-fix-backlight-regression.patch
new file mode 100644
index 000000000..a0cf0b1db
--- /dev/null
+++ b/libre/linux-libre/3.4.4-fix-backlight-regression.patch
@@ -0,0 +1,38 @@
+Subject: Still use ACPI backlight control if _DOS doesn't exist
+
+This is a regression introduced by commit
+ea9f8856bd6d4ed45885b06a338f7362cd6c60e5
+
+https://bugzilla.kernel.org/show_bug.cgi?id=43168
+
+Some platforms don't have _DOS control method, but the ACPI
+backlight still works.
+We do not want to lose the backlight control ability on these platforms.
+
+CC : Igor Murzov <intergalactic.anonymous@gmail.com>
+Signed-off-by: Zhang Rui <rui.zhang@intel.com>
+---
+ drivers/acpi/video.c |   10 ++++++++--
+ 1 file changed, 8 insertions(+), 2 deletions(-)
+
+Index: rtd3/drivers/acpi/video.c
+===================================================================
+--- rtd3.orig/drivers/acpi/video.c
++++ rtd3/drivers/acpi/video.c
+@@ -565,8 +565,14 @@ acpi_video_bus_DOS(struct acpi_video_bus
+ 	video->dos_setting = arg0.integer.value;
+ 	status = acpi_evaluate_object(video->device->handle, "_DOS",
+ 		&args, NULL);
+-	if (ACPI_FAILURE(status))
+-		return -EIO;
++	if (ACPI_FAILURE(status)) {
++		/*
++		 * some platforms don't have _DOS, but the ACPI
++		 * backlight control still works
++		 */
++		ACPI_DEBUG_PRINT((ACPI_DB_INFO, "No _DOS\n"));
++		return 0;
++	}
+ 
+ 	return 0;
+ }
diff --git a/libre/linux-libre/3.4.4-fix-gtx560ti-nouveau-regression.patch b/libre/linux-libre/3.4.4-fix-gtx560ti-nouveau-regression.patch
new file mode 100644
index 000000000..1b70e918c
--- /dev/null
+++ b/libre/linux-libre/3.4.4-fix-gtx560ti-nouveau-regression.patch
@@ -0,0 +1,20 @@
+Revert change to include/drm/drm_fb_helper.h made in commit 4f988d132d2668b4f3b42bfc70daa531115ccca1
+
+ include/drm/drm_fb_helper.h     |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/include/drm/drm_fb_helper.h b/include/drm/drm_fb_helper.h
+index 55e10d6..5120b01 100644
+--- a/include/drm/drm_fb_helper.h
++++ b/include/drm/drm_fb_helper.h
+@@ -35,6 +35,7 @@ struct drm_fb_helper;
+ #include <linux/kgdb.h>
+ 
+ struct drm_fb_helper_crtc {
++	uint32_t crtc_id;
+ 	struct drm_mode_set mode_set;
+ 	struct drm_display_mode *desired_mode;
+ };
+-- 
+1.7.6.5
+
diff --git a/libre/linux-libre/ChangeLog b/libre/linux-libre/ChangeLog
index a6f62e2cd..b41198fe5 100644
--- a/libre/linux-libre/ChangeLog
+++ b/libre/linux-libre/ChangeLog
@@ -1,19 +1,24 @@
-2012-05-26  André Silva  <andre.paulista@adinet.com.uy>
+2012-06-23  André Silva  <emulatorman@lavabit.com>
+
+	* linux-libre-3.4.4-1
+	* Replaced email account andre.paulista@adinet.com.uy to emulatorman@lavabit.com.
+
+2012-05-26  André Silva  <emulatorman@lavabit.com>
 
 	* linux-libre-3.4-1.2
 	* Disabled CONFIG_MICROCODE_INTEL and CONFIG_MICROCODE_AMD modules https://labs.parabola.nu/issues/116
 
-2012-04-24  André Silva  <andre.paulista@adinet.com.uy>
+2012-04-24  André Silva  <emulatorman@lavabit.com>
 
 	* linux-libre-3.3.3-1
 	* Disabled CONFIG_STUB_POULSBO module https://labs.parabola.nu/issues/90 
 
-2012-04-08  André Silva  <andre.paulista@adinet.com.uy>
+2012-04-08  André Silva  <emulatorman@lavabit.com>
 
 	* linux-libre-3.3.1-1.1
 	* Disabled CONFIG_IPW2100 and CONFIG_IPW2200 modules https://labs.parabola.nu/issues/47
 
-2012-03-03  André Silva  <andre.paulista@adinet.com.uy>
+2012-03-03  André Silva  <emulatorman@lavabit.com>
 
 	* linux-libre-2.3.9-2
 	* Enabled CONFIG_FB_VT8623 module https://labs.parabola.nu/issues/14
diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD
index 71a548e0a..f4fa860e8 100644
--- a/libre/linux-libre/PKGBUILD
+++ b/libre/linux-libre/PKGBUILD
@@ -5,7 +5,7 @@
 # Maintainer (Parabola): Sorin-Mihai Vârgolici <smv@yobicore.org>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 # Maintainer (Parabola): Michał Masłowski <mtjm@mtjm.eu>
-# Contributor (Parabola): Márcio Silva <coadde@adinet.com.uy>
+# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
 
 pkgbase=linux-libre
 pkgname=('linux-libre' 'linux-libre-headers' 'linux-libre-docs') # Build stock -LIBRE kernel
@@ -15,7 +15,7 @@ _basekernel=3.4
 _sublevel=4
 pkgver=${_basekernel}.${_sublevel}
 _lxopkgver=${_basekernel}.4 # nearly always the same as pkgver
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64' 'mips64el')
 url="http://linux-libre.fsfla.org/"
 license=('GPL2')
@@ -32,6 +32,8 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
         'boot-logo.patch'
         'change-default-console-loglevel.patch'
         'i915-fix-ghost-tv-output.patch'
+        '3.4.4-fix-backlight-regression.patch'
+        '3.4.4-fix-gtx560ti-nouveau-regression.patch'
         "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2")
 md5sums=('a5e128ca059cceb8b69148b41ff4ac6f'
          'e9bb311ab329555a61696b1a18df2d34'
@@ -43,6 +45,8 @@ md5sums=('a5e128ca059cceb8b69148b41ff4ac6f'
          '04b21c79df0a952c22d681dd4f4562df'
          '9d3c56a4b999c8bfbd4018089a62f662'
          '263725f20c0b9eb9c353040792d644e5'
+         '80a46681386bb87813989faeb92bdd9a'
+         '827ffd855dc8b0c91577545c5804c19f'
          '86910efeadb5d1e5d5416ff1a9dacb33')
 if [ "$CARCH" != "mips64el" ]; then
     # Don't use the Loongson-specific patches on non-mips64el arches.
@@ -72,7 +76,14 @@ build() {
   # needed.
   patch -Np1 -i "${srcdir}/i915-fix-ghost-tv-output.patch"
 
-  # Patch submitted upstream, waiting for inclusion:
+  # Fix backlight control on some laptops:
+  # https://bugzilla.kernel.org/show_bug.cgi?id=43168
+  patch -Np1 -i "${srcdir}/3.4.4-fix-backlight-regression.patch"
+
+  # fix nouveau regression
+  # Arch Linux bug report: FS#30417
+  patch -Np1 -i "${srcdir}/3.4.4-fix-gtx560ti-nouveau-regression.patch"
+
   # set DEFAULT_CONSOLE_LOGLEVEL to 4 (same value as the 'quiet' kernel param)
   # remove this when a Kconfig knob is made available by upstream
   # (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227)
diff --git a/libre/linux-libre/linux-libre.install b/libre/linux-libre/linux-libre.install
index ba766d0c7..5e87c939e 100644
--- a/libre/linux-libre/linux-libre.install
+++ b/libre/linux-libre/linux-libre.install
@@ -2,7 +2,7 @@
 # arg 2:  the old package version
 
 KERNEL_NAME=
-KERNEL_VERSION=3.4.4-1-LIBRE
+KERNEL_VERSION=3.4.4-2-LIBRE
 
 # set a sane PATH to ensure that critical utils like depmod will be found
 export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'
diff --git a/multilib/lib32-libphobos-ldc/PKGBUILD b/multilib/lib32-libphobos-ldc/PKGBUILD
index f161fd084..7405a48ae 100644
--- a/multilib/lib32-libphobos-ldc/PKGBUILD
+++ b/multilib/lib32-libphobos-ldc/PKGBUILD
@@ -1,7 +1,7 @@
 # $Id: PKGBUILD 72029 2012-06-06 11:58:40Z svenstaro $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 pkgname=lib32-libphobos-ldc
-pkgver=20120611
+pkgver=20120624
 pkgrel=1
 pkgdesc="libphobos for ldc (32-bit)"
 arch=('x86_64')
diff --git a/multilib/wine_gecko/PKGBUILD b/multilib/wine_gecko/PKGBUILD
index 8d742ef0f..8c8f563a4 100644
--- a/multilib/wine_gecko/PKGBUILD
+++ b/multilib/wine_gecko/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 68053 2012-03-17 14:50:10Z heftig $
+# $Id: PKGBUILD 72870 2012-06-24 08:37:05Z bluewind $
 # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
 # Contributor: Nicky726 (Nicky726 <at> gmail <dot> com)
 # Contributor: Allan McRae (allan <at> archlinux <dot> org)
 # Contributor: Alexander 'bas' Brovikov (bas <at> it-core <dot> org)
 
 pkgname=wine_gecko
-pkgver=1.5
+pkgver=1.6
 pkgrel=1
 pkgdesc="Wine's built-in replacement for Microsoft's Internet Explorer"
 arch=(i686 x86_64)
@@ -13,8 +13,8 @@ url="http://wiki.winehq.org/Gecko"
 license=(MPL)
 depends=('wine>=1.5')
 source=(http://downloads.sourceforge.net/project/wine/Wine%20Gecko/$pkgver/$pkgname-$pkgver-x86{,_64}.msi)
-md5sums=('ffb862e3e5f66555e058b7a29a1c62ff'
-         'd244f8a4b7a5d5a6b0698306091eb7e7')
+md5sums=('8542fe0e03af053534bca65a74f58f91'
+         'ee638810f38d33d28c1de023637118ab')
 
 if [[ $CARCH == i686 ]]; then
   # Strip x86_64 msi
diff --git a/testing/calligra/PKGBUILD b/testing/calligra/PKGBUILD
new file mode 100644
index 000000000..4d285c763
--- /dev/null
+++ b/testing/calligra/PKGBUILD
@@ -0,0 +1,264 @@
+# $Id: PKGBUILD 162291 2012-06-24 19:24:34Z foutrelis $
+# Maintainer: Ronald van Haren <ronald.archlinux.org>
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+
+pkgbase=calligra
+pkgname=('calligra-filters'
+         'calligra-interfaces'
+         'calligra-libs'
+         'calligra-plugins'
+         'calligra-pics'
+         'calligra-servicetypes'
+         'calligra-templates'
+         'calligra-tools'
+         'calligra-karbon'
+         'calligra-kexi'
+         'calligra-kounavail'
+         'calligra-plan'
+         'calligra-stage'
+         'calligra-krita'
+         'calligra-sheets'
+         'calligra-words'
+         'calligra-handbook'
+         'calligra-braindump'
+         'calligra-flow')
+pkgver=2.4.2
+pkgrel=2
+arch=('i686' 'x86_64')
+url='http://www.calligra-suite.org/'
+license=('FDL1.2' 'GPL2' 'LGPL')
+makedepends=('cmake' 'automoc4' 'boost ' 'eigen2'
+             'kdepimlibs' 'libpqxx' 'freetds' 'xbase'
+             'kdegraphics-okular' 'gsl' 'kdeedu-marble'
+             'libwpd' 'libwpg' 'pstoedit' 'glew'
+             'fftw' 'opengtl' 'lcms2' 'libkdcraw' 'wv2')
+groups=('calligra')
+source=("http://download.kde.org/stable/${pkgbase}-${pkgver}/${pkgbase}-${pkgver}.tar.bz2")
+md5sums=('31b0c44ad4ee27017580c7c2fc8e87a9')
+
+build() {
+  cd "${srcdir}"
+  mkdir build
+  cd build
+  cmake ../${pkgbase}-${pkgver} \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DBUILD_active=OFF \
+    -DBUILD_mobile=OFF \
+    -DIHAVEPATCHEDQT=1
+  make
+}
+
+package_calligra-filters() {
+  pkgdesc="Filters for the Calligra office suite"
+  optdepends=('libwpg: Corel WordPerfect Graphics image importer')
+  conflicts=('koffice-filters')
+  replaces=('koffice-filters')
+  install=calligra-filters.install
+
+  cd "${srcdir}"/build/filters
+  make DESTDIR="${pkgdir}" install
+}
+
+package_calligra-interfaces() {
+  pkgdesc="Interfaces for the Calligra office suite"
+  depends=('calligra-libs')
+  conflicts=('koffice-interfaces')
+  replaces=('koffice-interfaces')
+
+  cd "${srcdir}"/build/interfaces
+  make DESTDIR="${pkgdir}" install
+}
+
+package_calligra-libs() {
+  pkgdesc="Libraries for the Calligra office suite"
+  depends=('kdepimlibs' 'lcms2' 'calligra-servicetypes')
+  conflicts=('koffice-libs')
+  replaces=('koffice-libs')
+
+  cd "${srcdir}"/build/libs
+  make DESTDIR="${pkgdir}" install
+}
+
+package_calligra-plugins() {
+  pkgdesc="Plugins for the Calligra office suite"
+  depends=('calligra-libs' 'calligra-filters')
+  optdepends=('kdeedu-marble: map shape for Calligra')
+  conflicts=('koffice-plugins' 'koffice-kchart')
+  replaces=('koffice-plugins' 'koffice-kchart' 'koffice-kformula')
+
+  cd "${srcdir}"/build/plugins
+  make DESTDIR="${pkgdir}" install
+}
+
+package_calligra-pics() {
+  pkgdesc="Icons for the Calligra office suite"
+  conflicts=('koffice-pics')
+  replaces=('koffice-pics')
+  install=calligra.install
+
+  cd "${srcdir}"/build/pics
+  make DESTDIR="${pkgdir}" install
+}
+
+package_calligra-servicetypes() {
+  pkgdesc="Servicetypes for the Calligra office suite"
+  conflicts=('koffice-servicetypes')
+  replaces=('koffice-servicetypes')
+  install=calligra.install
+
+  cd "${srcdir}"/build/servicetypes
+  make DESTDIR="${pkgdir}" install
+}
+
+package_calligra-templates() {
+  pkgdesc="Templates for the Calligra office suite"
+  conflicts=('koffice-templates')
+  replaces=('koffice-templates')
+
+  cd "${srcdir}"/build/templates
+  make DESTDIR="${pkgdir}" install
+}
+
+package_calligra-tools() {
+  pkgdesc="Tools for the Calligra office suite"
+  depends=('calligra-libs')
+  conflicts=('koffice-tools')
+  replaces=('koffice-tools')
+  install=calligra-tools.install
+
+  cd "${srcdir}"/build/tools
+  make DESTDIR="${pkgdir}" install
+}
+
+package_calligra-karbon() {
+  pkgdesc="Create scalable vector drawings"
+  depends=('calligra-libs' 'calligra-templates' 'kdebase-runtime')
+  optdepends=('calligra-filters: import/export filters'
+              'calligra-tools: extra calligra tools')
+  conflicts=('koffice-karbon' 'koffice-karbon-doc' 'calligra-karbon-doc')
+  replaces=('koffice-karbon' 'koffice-karbon-doc' 'calligra-karbon-doc')
+  install=calligra-karbon.install
+
+  cd "${srcdir}"/build/karbon
+  make DESTDIR="${pkgdir}" install
+}
+
+package_calligra-kexi() {
+  pkgdesc="Develop desktop database applications"
+  depends=('calligra-libs' 'calligra-templates')
+  optdepends=('libmysqlclient: MySQL driver'
+              'libpqxx: PostgreSQL driver'
+              'freetds: Sybase & MS SQL driver'
+              'xbase: XBase driver'
+              'calligra-sheets: Spreadsheet-to-Kexi-table import plugin'
+              'kdeedu-marble: map form widget'
+              'calligra-plugins: extra calligra plugins')
+  conflicts=('koffice-kexi' 'koffice-kexi-doc' 'calligra-kexi-doc')
+  replaces=('koffice-kexi' 'koffice-kexi-doc' 'calligra-kexi-doc')
+  install=calligra-kexi.install
+
+  cd "${srcdir}"/build/kexi
+  make DESTDIR="${pkgdir}" install
+}
+
+package_calligra-kounavail() {
+  pkgdesc="Unavailable Calligra Document"
+  depends=('calligra-libs')
+  conflicts=('koffice-kounavail')
+  replaces=('koffice-kounavail')
+
+  cd "${srcdir}"/build/kounavail
+  make DESTDIR="${pkgdir}" install
+}
+
+package_calligra-plan() {
+  pkgdesc="Calligra Project Management Component"
+  depends=('calligra-words')
+  conflicts=('koffice-kplato' 'calligra-kplato')
+  replaces=('koffice-kplato' 'calligra-kplato')
+  install=calligra-plan.install
+
+  cd "${srcdir}"/build/plan
+  make DESTDIR="${pkgdir}" install
+}
+
+package_calligra-stage() {
+  pkgdesc="Write presentation documents"
+  depends=('calligra-libs' 'calligra-templates' 'kdebase-runtime')
+  optdepends=('calligra-plugins: extra calligra plugins')
+  conflicts=('koffice-kpresenter' 'koffice-kpresenter-doc' 'calligra-stage-doc')
+  replaces=('koffice-kpresenter' 'koffice-kpresenter-doc' 'calligra-stage-doc')
+  install=calligra-stage.install
+
+  cd "${srcdir}"/build/stage
+  make DESTDIR="${pkgdir}" install
+}
+
+package_calligra-krita() {
+  pkgdesc="Edit and paint images"
+  depends=('calligra-templates' 'calligra-plugins' 'kdebase-runtime'
+           'qimageblitz' 'poppler-qt' 'opengtl' 'glew' 'libkdcraw' 'fftw')
+  conflicts=('koffice-krita' 'calligra-krita-doc')
+  replaces=('koffice-krita' 'calligra-krita-doc')
+  install=calligra-krita.install
+
+  cd "${srcdir}"/build/krita
+  make DESTDIR="${pkgdir}" install
+}
+
+package_calligra-sheets() {
+  pkgdesc="Write spreadsheet documents"
+  depends=('calligra-templates' 'calligra-libs' 'gsl' 'kdebase-runtime')
+  optdepends=('calligra-filters: import/export filters'
+              'calligra-plugins: extra calligra plugins'
+              'calligra-tools: extra calligra tools')
+  conflicts=('koffice-kspread' 'koffice-kspread-doc' 'calligra-tables-doc' 'calligra-tables')
+  replaces=('koffice-kspread' 'koffice-kspread-doc' 'calligra-tables-doc' 'calligra-tables')
+  install=calligra-sheets.install
+
+  cd "${srcdir}"/build/sheets
+  make DESTDIR="${pkgdir}" install
+}
+
+package_calligra-words() {
+  pkgdesc="Word Processor"
+  depends=('calligra-templates' 'calligra-pics' 'calligra-kounavail'
+           'calligra-plugins' 'kdegraphics-okular')
+  optdepends=('calligra-tools: extra calligra tools')
+  conflicts=('koffice-kword')
+  replaces=('koffice-kword')
+  install=calligra-words.install
+
+  cd "${srcdir}"/build/words
+  make DESTDIR="${pkgdir}" install
+}
+
+package_calligra-handbook() {
+  pkgdesc="Documentation for Calligra"
+  conflicts=('koffice-handbook')
+  replaces=('koffice-handbook')
+
+  cd "${srcdir}"/build/doc/calligra
+  make DESTDIR="${pkgdir}" install
+}
+
+package_calligra-braindump() {
+  pkgdesc="Notes and idea gathering"
+  depends=('calligra-libs' 'kdebase-runtime')
+  install=calligra-braindump.install
+
+  cd "${srcdir}"/build/braindump
+  make DESTDIR="${pkgdir}" install
+}
+
+package_calligra-flow() {
+  pkgdesc="Flowchart & Diagram Editing"
+  depends=('calligra-libs' 'kdebase-runtime')
+  conflicts=('calligra-flow-doc')
+  replaces=('calligra-flow-doc')
+  install=calligra-flow.install
+
+  cd "${srcdir}"/build/flow
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/testing/calligra/calligra-braindump.install b/testing/calligra/calligra-braindump.install
new file mode 100644
index 000000000..c2179f6e2
--- /dev/null
+++ b/testing/calligra/calligra-braindump.install
@@ -0,0 +1,12 @@
+post_install() {
+	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+	update-desktop-database -q
+}
+
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+	post_install
+}
\ No newline at end of file
diff --git a/testing/calligra/calligra-filters.install b/testing/calligra/calligra-filters.install
new file mode 100644
index 000000000..7c8a8bd2b
--- /dev/null
+++ b/testing/calligra/calligra-filters.install
@@ -0,0 +1,11 @@
+post_install() {
+	update-mime-database usr/share/mime &> /dev/null
+}
+
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+	post_install
+}
diff --git a/testing/calligra/calligra-flow.install b/testing/calligra/calligra-flow.install
new file mode 100644
index 000000000..6c87527e2
--- /dev/null
+++ b/testing/calligra/calligra-flow.install
@@ -0,0 +1,12 @@
+post_install() {
+	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+	update-desktop-database -q
+}
+
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+	post_install
+}
diff --git a/testing/calligra/calligra-karbon.install b/testing/calligra/calligra-karbon.install
new file mode 100644
index 000000000..c2179f6e2
--- /dev/null
+++ b/testing/calligra/calligra-karbon.install
@@ -0,0 +1,12 @@
+post_install() {
+	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+	update-desktop-database -q
+}
+
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+	post_install
+}
\ No newline at end of file
diff --git a/testing/calligra/calligra-kexi.install b/testing/calligra/calligra-kexi.install
new file mode 100644
index 000000000..b8c7ebf27
--- /dev/null
+++ b/testing/calligra/calligra-kexi.install
@@ -0,0 +1,11 @@
+post_install() {
+	update-desktop-database -q
+}
+
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+	post_install
+}
diff --git a/testing/calligra/calligra-krita.install b/testing/calligra/calligra-krita.install
new file mode 100644
index 000000000..33d234a02
--- /dev/null
+++ b/testing/calligra/calligra-krita.install
@@ -0,0 +1,13 @@
+post_install() {
+	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+	update-mime-database usr/share/mime &> /dev/null
+	update-desktop-database -q
+}
+
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+	post_install
+}
\ No newline at end of file
diff --git a/testing/calligra/calligra-plan.install b/testing/calligra/calligra-plan.install
new file mode 100644
index 000000000..c2179f6e2
--- /dev/null
+++ b/testing/calligra/calligra-plan.install
@@ -0,0 +1,12 @@
+post_install() {
+	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+	update-desktop-database -q
+}
+
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+	post_install
+}
\ No newline at end of file
diff --git a/testing/calligra/calligra-sheets.install b/testing/calligra/calligra-sheets.install
new file mode 100644
index 000000000..6c87527e2
--- /dev/null
+++ b/testing/calligra/calligra-sheets.install
@@ -0,0 +1,12 @@
+post_install() {
+	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+	update-desktop-database -q
+}
+
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+	post_install
+}
diff --git a/testing/calligra/calligra-stage.install b/testing/calligra/calligra-stage.install
new file mode 100644
index 000000000..6c87527e2
--- /dev/null
+++ b/testing/calligra/calligra-stage.install
@@ -0,0 +1,12 @@
+post_install() {
+	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+	update-desktop-database -q
+}
+
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+	post_install
+}
diff --git a/testing/calligra/calligra-tools.install b/testing/calligra/calligra-tools.install
new file mode 100644
index 000000000..6c87527e2
--- /dev/null
+++ b/testing/calligra/calligra-tools.install
@@ -0,0 +1,12 @@
+post_install() {
+	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+	update-desktop-database -q
+}
+
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+	post_install
+}
diff --git a/testing/calligra/calligra-words.install b/testing/calligra/calligra-words.install
new file mode 100644
index 000000000..6c87527e2
--- /dev/null
+++ b/testing/calligra/calligra-words.install
@@ -0,0 +1,12 @@
+post_install() {
+	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+	update-desktop-database -q
+}
+
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+	post_install
+}
diff --git a/testing/calligra/calligra.install b/testing/calligra/calligra.install
new file mode 100644
index 000000000..e70c054ec
--- /dev/null
+++ b/testing/calligra/calligra.install
@@ -0,0 +1,11 @@
+post_install() {
+	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+}
+
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+	post_install
+}
diff --git a/testing/dbus-core/PKGBUILD b/testing/dbus-core/PKGBUILD
index 0fb547d74..40f46a48b 100644
--- a/testing/dbus-core/PKGBUILD
+++ b/testing/dbus-core/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 161781 2012-06-13 23:17:07Z dreisner $
+# $Id: PKGBUILD 162320 2012-06-25 01:19:03Z dreisner $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Link Dupont <link@subpop.net>
 #
 pkgname=dbus-core
 pkgver=1.6.0
-pkgrel=3
+pkgrel=5
 pkgdesc="Freedesktop.org message bus system"
 url="http://www.freedesktop.org/Software/dbus"
 arch=(i686 x86_64)
 license=('GPL' 'custom')
-depends=('expat>=2.0.1' 'coreutils' 'filesystem' 'libsystemd' 'shadow') # shadow for install scriptlet FS#29341
+depends=('expat>=2.0.1' 'coreutils' 'filesystem' 'libsystemd' 'shadow' 'systemd-tools') # shadow for install scriptlet FS#29341
 makedepends=('libx11')
 conflicts=('dbus<1.2.3-2')
 options=(!libtool)
@@ -18,7 +18,7 @@ source=(http://dbus.freedesktop.org/releases/dbus/dbus-${pkgver}.tar.gz{,.asc}
         dbus)
 md5sums=('16dcae2dd0c76e398381601ac9acdec4'
          '0ebde9920bde83fe26ce32351a7d8954'
-         '3675334f5b4442d1c3e9a008f176e85f')
+         'f0364f3f5dc5f653bb05d39aa36e3264')
 
 build() {
   cd "${srcdir}/dbus-${pkgver}"
diff --git a/testing/dbus-core/dbus b/testing/dbus-core/dbus
index 2c4ca87ec..bf532a274 100644
--- a/testing/dbus-core/dbus
+++ b/testing/dbus-core/dbus
@@ -10,9 +10,6 @@ case $1 in
         if [[ ! -d /run/dbus ]] ; then
             install -m755 -g 81 -o 81 -d /run/dbus
         fi
-        if [[ -x /usr/bin/dbus-uuidgen ]] ; then
-            /usr/bin/dbus-uuidgen --ensure
-        fi
 
         if ! dbus-daemon --system; then
             stat_fail
diff --git a/testing/dbus-core/dbus.install b/testing/dbus-core/dbus.install
index 218a930e7..f1ffd61a8 100644
--- a/testing/dbus-core/dbus.install
+++ b/testing/dbus-core/dbus.install
@@ -2,7 +2,6 @@ post_install() {
   getent group dbus >/dev/null || groupadd -g 81 dbus
   getent passwd dbus >/dev/null || useradd -c 'System message bus' -u 81 -g dbus -d '/' -s /bin/false dbus
   passwd -l dbus &>/dev/null
-  dbus-uuidgen --ensure
 }
 
 post_upgrade() {
diff --git a/testing/inkscape/PKGBUILD b/testing/inkscape/PKGBUILD
new file mode 100644
index 000000000..25fbcbc71
--- /dev/null
+++ b/testing/inkscape/PKGBUILD
@@ -0,0 +1,59 @@
+# $Id: PKGBUILD 162293 2012-06-24 19:24:47Z foutrelis $
+# Contributor: tobias <tobias@archlinux.org>
+# Contributor: Tobias Kieslich <tobias@justdreams.de>
+# Maintainer: Gaetan Bisson <bisson@archlinux.org>
+
+pkgname=inkscape
+pkgver=0.48.3.1
+pkgrel=4
+pkgdesc='Vector graphics editor using the SVG file format'
+url='http://inkscape.sourceforge.net/'
+license=('GPL' 'LGPL')
+arch=('i686' 'x86_64')
+makedepends=('boost' 'intltool')
+depends=('gc' 'gsl' 'gtkmm' 'gtkspell' 'imagemagick' 'libxslt' 'poppler-glib' 'popt'
+         'python2' 'desktop-file-utils' 'hicolor-icon-theme')
+optdepends=('pstoedit: latex formulas'
+            'texlive-core: latex formulas'
+            'python2-numpy: some extensions'
+            'python2-lxml: some extensions and filters'
+            'pyxml: some extensions'
+            'uniconvertor: reading/writing to some proprietary formats')
+options=('!libtool')
+source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz"
+        'poppler20.patch'
+        'libpng15.patch')
+sha1sums=('9a09a97d184e09c2ee7f9956bfe073b7313e919e'
+          '7316c2903c157781838cce289a709d100dc40fec'
+          'd6512f3cb38ca8e2436dc485aa652490d17b3a52')
+
+install=install
+
+build() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+
+	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
+
+	patch -p1 -i ../poppler20.patch
+	patch -p1 -i ../libpng15.patch
+
+	./configure \
+		--prefix=/usr \
+		--with-python \
+		--with-perl \
+		--enable-lcms \
+		--enable-poppler-cairo \
+		--disable-dependency-tracking \
+
+	make
+}
+
+package() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+
+	make DESTDIR="${pkgdir}" install
+}
diff --git a/testing/inkscape/install b/testing/inkscape/install
new file mode 100644
index 000000000..6e803bf1d
--- /dev/null
+++ b/testing/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/testing/inkscape/libpng15.patch b/testing/inkscape/libpng15.patch
new file mode 100644
index 000000000..e24913ed6
--- /dev/null
+++ b/testing/inkscape/libpng15.patch
@@ -0,0 +1,40 @@
+--- inkscape-0.48.1/src/extension/internal/pdfinput/svg-builder.cpp
++++ inkscape-0.48.1-mod//src/extension/internal/pdfinput/svg-builder.cpp
+@@ -1443,7 +1443,7 @@
+         return NULL;
+     }
+     // Set error handler
+-    if (setjmp(png_ptr->jmpbuf)) {
++    if (setjmp(png_jmpbuf(png_ptr))) {
+         png_destroy_write_struct(&png_ptr, &info_ptr);
+         return NULL;
+     }
+--- inkscape-0.48.1/src/helper/png-write.cpp
++++ inkscape-0.48.1-mod//src/helper/png-write.cpp
+@@ -165,7 +165,7 @@
+     /* Set error handling.  REQUIRED if you aren't supplying your own
+      * error hadnling functions in the png_create_write_struct() call.
+      */
+-    if (setjmp(png_ptr->jmpbuf)) {
++    if (setjmp(png_jmpbuf(png_ptr))) {
+         /* If we get here, we had a problem reading the file */
+         fclose(fp);
+         png_destroy_write_struct(&png_ptr, &info_ptr);
+--- inkscape-0.48.1/src/sp-image.cpp
++++ inkscape-0.48.1-mod//src/sp-image.cpp
+@@ -386,9 +386,13 @@
+ 
+ #if defined(PNG_iCCP_SUPPORTED)
+                 {
+-                    char* name = 0;
++                    png_charp name = 0;
+                     int compression_type = 0;
+-                    char* profile = 0;
++#if (PNG_LIBPNG_VER < 10500)
++                    png_charp profile = 0;
++#else
++                    png_bytep profile = 0;
++#endif
+                     png_uint_32 proflen = 0;
+                     if ( png_get_iCCP(pngPtr, infoPtr, &name, &compression_type, &profile, &proflen) ) {
+ //                                         g_message("Found an iCCP chunk named [%s] with %d bytes and comp %d", name, proflen, compression_type);
diff --git a/testing/inkscape/poppler20.patch b/testing/inkscape/poppler20.patch
new file mode 100644
index 000000000..ecb74603f
--- /dev/null
+++ b/testing/inkscape/poppler20.patch
@@ -0,0 +1,642 @@
+diff -Naur old/src/extension/internal/pdfinput/pdf-parser.cpp new/src/extension/internal/pdfinput/pdf-parser.cpp
+--- old/src/extension/internal/pdfinput/pdf-parser.cpp	2011-07-08 20:25:09.468790000 +0200
++++ new/src/extension/internal/pdfinput/pdf-parser.cpp	2012-05-13 21:07:11.334781215 +0200
+@@ -367,14 +367,14 @@
+     for (i = 0; i < obj->arrayGetLength(); ++i) {
+       obj->arrayGet(i, &obj2);
+       if (!obj2.isStream()) {
+-	error(-1, const_cast<char*>("Weird page contents"));
++	error(errInternal, -1, const_cast<char*>("Weird page contents"));
+ 	obj2.free();
+ 	return;
+       }
+       obj2.free();
+     }
+   } else if (!obj->isStream()) {
+-    error(-1, const_cast<char*>("Weird page contents"));
++    error(errInternal, -1, const_cast<char*>("Weird page contents"));
+     return;
+   }
+   parser = new Parser(xref, new Lexer(xref, obj), gFalse);
+@@ -419,7 +419,7 @@
+ 
+     // too many arguments - something is wrong
+     } else {
+-      error(getPos(), const_cast<char*>("Too many args in content stream"));
++      error(errInternal, getPos(), const_cast<char*>("Too many args in content stream"));
+       if (printCommands) {
+ 	printf("throwing away arg: ");
+ 	obj.print(stdout);
+@@ -436,7 +436,7 @@
+ 
+   // args at end with no command
+   if (numArgs > 0) {
+-    error(getPos(), const_cast<char*>("Leftover args in content stream"));
++    error(errInternal, getPos(), const_cast<char*>("Leftover args in content stream"));
+     if (printCommands) {
+       printf("%d leftovers:", numArgs);
+       for (i = 0; i < numArgs; ++i) {
+@@ -502,7 +502,7 @@
+   name = cmd->getCmd();
+   if (!(op = findOp(name))) {
+     if (ignoreUndef == 0)
+-      error(getPos(), const_cast<char*>("Unknown operator '%s'"), name);
++      error(errInternal, getPos(), const_cast<char*>("Unknown operator '%s'"), name);
+     return;
+   }
+ 
+@@ -510,26 +510,26 @@
+   argPtr = args;
+   if (op->numArgs >= 0) {
+     if (numArgs < op->numArgs) {
+-      error(getPos(), const_cast<char*>("Too few (%d) args to '%s' operator"), numArgs, name);
++      error(errInternal, getPos(), const_cast<char*>("Too few (%d) args to '%s' operator"), numArgs, name);
+       return;
+     }
+     if (numArgs > op->numArgs) {
+ #if 0
+-      error(getPos(), "Too many (%d) args to '%s' operator", numArgs, name);
++      error(errInternal, getPos(), "Too many (%d) args to '%s' operator", numArgs, name);
+ #endif
+       argPtr += numArgs - op->numArgs;
+       numArgs = op->numArgs;
+     }
+   } else {
+     if (numArgs > -op->numArgs) {
+-      error(getPos(), const_cast<char*>("Too many (%d) args to '%s' operator"),
++      error(errInternal, getPos(), const_cast<char*>("Too many (%d) args to '%s' operator"),
+ 	    numArgs, name);
+       return;
+     }
+   }
+   for (i = 0; i < numArgs; ++i) {
+     if (!checkArg(&argPtr[i], op->tchk[i])) {
+-      error(getPos(), const_cast<char*>("Arg #%d to '%s' operator is wrong type (%s)"),
++      error(errInternal, getPos(), const_cast<char*>("Arg #%d to '%s' operator is wrong type (%s)"),
+ 	    i, name, argPtr[i].getTypeName());
+       return;
+     }
+@@ -690,7 +690,7 @@
+     return;
+   }
+   if (!obj1.isDict()) {
+-    error(getPos(), const_cast<char*>("ExtGState '%s' is wrong type"), args[0].getName());
++    error(errInternal, getPos(), const_cast<char*>("ExtGState '%s' is wrong type"), args[0].getName());
+     obj1.free();
+     return;
+   }
+@@ -705,7 +705,7 @@
+     if (state->parseBlendMode(&obj2, &mode)) {
+       state->setBlendMode(mode);
+     } else {
+-      error(getPos(), const_cast<char*>("Invalid blend mode in ExtGState"));
++      error(errInternal, getPos(), const_cast<char*>("Invalid blend mode in ExtGState"));
+     }
+   }
+   obj2.free();
+@@ -764,7 +764,7 @@
+       state->setTransfer(funcs);
+     }
+   } else if (!obj2.isNull()) {
+-    error(getPos(), const_cast<char*>("Invalid transfer function in ExtGState"));
++    error(errInternal, getPos(), const_cast<char*>("Invalid transfer function in ExtGState"));
+   }
+   obj2.free();
+ 
+@@ -784,7 +784,7 @@
+ 	funcs[0] = Function::parse(&obj3);
+ 	if (funcs[0]->getInputSize() != 1 ||
+ 	    funcs[0]->getOutputSize() != 1) {
+-	  error(getPos(),
++	  error(errInternal, getPos(),
+ 		const_cast<char*>("Invalid transfer function in soft mask in ExtGState"));
+ 	  delete funcs[0];
+ 	  funcs[0] = NULL;
+@@ -809,11 +809,7 @@
+ 	  blendingColorSpace = NULL;
+ 	  isolated = knockout = gFalse;
+ 	  if (!obj4.dictLookup(const_cast<char*>("CS"), &obj5)->isNull()) {
+-#ifdef POPPLER_NEW_COLOR_SPACE_API
+ 	    blendingColorSpace = GfxColorSpace::parse(&obj5, NULL);
+-#else
+-	    blendingColorSpace = GfxColorSpace::parse(&obj5);
+-#endif
+ 	  }
+ 	  obj5.free();
+ 	  if (obj4.dictLookup(const_cast<char*>("I"), &obj5)->isBool()) {
+@@ -840,15 +836,15 @@
+ 	    delete funcs[0];
+ 	  }
+ 	} else {
+-	  error(getPos(), const_cast<char*>("Invalid soft mask in ExtGState - missing group"));
++	  error(errInternal, getPos(), const_cast<char*>("Invalid soft mask in ExtGState - missing group"));
+ 	}
+ 	obj4.free();
+       } else {
+-	error(getPos(), const_cast<char*>("Invalid soft mask in ExtGState - missing group"));
++	error(errInternal, getPos(), const_cast<char*>("Invalid soft mask in ExtGState - missing group"));
+       }
+       obj3.free();
+     } else if (!obj2.isNull()) {
+-      error(getPos(), const_cast<char*>("Invalid soft mask in ExtGState"));
++      error(errInternal, getPos(), const_cast<char*>("Invalid soft mask in ExtGState"));
+     }
+   }
+   obj2.free();
+@@ -876,7 +872,7 @@
+   // check form type
+   dict->lookup(const_cast<char*>("FormType"), &obj1);
+   if (!(obj1.isNull() || (obj1.isInt() && obj1.getInt() == 1))) {
+-    error(getPos(), const_cast<char*>("Unknown form type"));
++    error(errInternal, getPos(), const_cast<char*>("Unknown form type"));
+   }
+   obj1.free();
+ 
+@@ -884,7 +880,7 @@
+   dict->lookup(const_cast<char*>("BBox"), &obj1);
+   if (!obj1.isArray()) {
+     obj1.free();
+-    error(getPos(), const_cast<char*>("Bad form bounding box"));
++    error(errInternal, getPos(), const_cast<char*>("Bad form bounding box"));
+     return;
+   }
+   for (i = 0; i < 4; ++i) {
+@@ -1012,19 +1008,11 @@
+ 
+   state->setFillPattern(NULL);
+   res->lookupColorSpace(args[0].getName(), &obj);
+-#ifdef POPPLER_NEW_COLOR_SPACE_API
+   if (obj.isNull()) {
+     colorSpace = GfxColorSpace::parse(&args[0], NULL);
+   } else {
+     colorSpace = GfxColorSpace::parse(&obj, NULL);
+   }
+-#else
+-  if (obj.isNull()) {
+-    colorSpace = GfxColorSpace::parse(&args[0]);
+-  } else {
+-    colorSpace = GfxColorSpace::parse(&obj);
+-  }
+-#endif
+   obj.free();
+   if (colorSpace) {
+     state->setFillColorSpace(colorSpace);
+@@ -1032,7 +1020,7 @@
+     state->setFillColor(&color);
+     builder->updateStyle(state);
+   } else {
+-    error(getPos(), const_cast<char*>("Bad color space (fill)"));
++    error(errInternal, getPos(), const_cast<char*>("Bad color space (fill)"));
+   }
+ }
+ 
+@@ -1043,19 +1031,11 @@
+ 
+   state->setStrokePattern(NULL);
+   res->lookupColorSpace(args[0].getName(), &obj);
+-#ifdef POPPLER_NEW_COLOR_SPACE_API
+   if (obj.isNull()) {
+     colorSpace = GfxColorSpace::parse(&args[0], NULL);
+   } else {
+     colorSpace = GfxColorSpace::parse(&obj, NULL);
+   }
+-#else
+-  if (obj.isNull()) {
+-    colorSpace = GfxColorSpace::parse(&args[0]);
+-  } else {
+-    colorSpace = GfxColorSpace::parse(&obj);
+-  }
+-#endif
+   obj.free();
+   if (colorSpace) {
+     state->setStrokeColorSpace(colorSpace);
+@@ -1063,7 +1043,7 @@
+     state->setStrokeColor(&color);
+     builder->updateStyle(state);
+   } else {
+-    error(getPos(), const_cast<char*>("Bad color space (stroke)"));
++    error(errInternal, getPos(), const_cast<char*>("Bad color space (stroke)"));
+   }
+ }
+ 
+@@ -1072,7 +1052,7 @@
+   int i;
+ 
+   if (numArgs != state->getFillColorSpace()->getNComps()) {
+-    error(getPos(), const_cast<char*>("Incorrect number of arguments in 'sc' command"));
++    error(errInternal, getPos(), const_cast<char*>("Incorrect number of arguments in 'sc' command"));
+     return;
+   }
+   state->setFillPattern(NULL);
+@@ -1088,7 +1068,7 @@
+   int i;
+ 
+   if (numArgs != state->getStrokeColorSpace()->getNComps()) {
+-    error(getPos(), const_cast<char*>("Incorrect number of arguments in 'SC' command"));
++    error(errInternal, getPos(), const_cast<char*>("Incorrect number of arguments in 'SC' command"));
+     return;
+   }
+   state->setStrokePattern(NULL);
+@@ -1109,7 +1089,7 @@
+       if (!((GfxPatternColorSpace *)state->getFillColorSpace())->getUnder() ||
+ 	  numArgs - 1 != ((GfxPatternColorSpace *)state->getFillColorSpace())
+ 	                     ->getUnder()->getNComps()) {
+-	error(getPos(), const_cast<char*>("Incorrect number of arguments in 'scn' command"));
++	error(errInternal, getPos(), const_cast<char*>("Incorrect number of arguments in 'scn' command"));
+ 	return;
+       }
+       for (i = 0; i < numArgs - 1 && i < gfxColorMaxComps; ++i) {
+@@ -1120,23 +1100,15 @@
+       state->setFillColor(&color);
+       builder->updateStyle(state);
+     }
+-#ifdef POPPLER_NEW_COLOR_SPACE_API
+     if (args[numArgs-1].isName() &&
+ 	(pattern = res->lookupPattern(args[numArgs-1].getName(), NULL))) {
+       state->setFillPattern(pattern);
+       builder->updateStyle(state);
+     }
+-#else
+-    if (args[numArgs-1].isName() &&
+-	(pattern = res->lookupPattern(args[numArgs-1].getName()))) {
+-      state->setFillPattern(pattern);
+-      builder->updateStyle(state);
+-    }
+-#endif
+ 
+   } else {
+     if (numArgs != state->getFillColorSpace()->getNComps()) {
+-      error(getPos(), const_cast<char*>("Incorrect number of arguments in 'scn' command"));
++      error(errInternal, getPos(), const_cast<char*>("Incorrect number of arguments in 'scn' command"));
+       return;
+     }
+     state->setFillPattern(NULL);
+@@ -1161,7 +1133,7 @@
+ 	       ->getUnder() ||
+ 	  numArgs - 1 != ((GfxPatternColorSpace *)state->getStrokeColorSpace())
+ 	                     ->getUnder()->getNComps()) {
+-	error(getPos(), const_cast<char*>("Incorrect number of arguments in 'SCN' command"));
++	error(errInternal, getPos(), const_cast<char*>("Incorrect number of arguments in 'SCN' command"));
+ 	return;
+       }
+       for (i = 0; i < numArgs - 1 && i < gfxColorMaxComps; ++i) {
+@@ -1172,23 +1144,15 @@
+       state->setStrokeColor(&color);
+       builder->updateStyle(state);
+     }
+-#ifdef POPPLER_NEW_COLOR_SPACE_API
+     if (args[numArgs-1].isName() &&
+ 	(pattern = res->lookupPattern(args[numArgs-1].getName(), NULL))) {
+       state->setStrokePattern(pattern);
+       builder->updateStyle(state);
+     }
+-#else
+-    if (args[numArgs-1].isName() &&
+-	(pattern = res->lookupPattern(args[numArgs-1].getName()))) {
+-      state->setStrokePattern(pattern);
+-      builder->updateStyle(state);
+-    }
+-#endif
+ 
+   } else {
+     if (numArgs != state->getStrokeColorSpace()->getNComps()) {
+-      error(getPos(), const_cast<char*>("Incorrect number of arguments in 'SCN' command"));
++      error(errInternal, getPos(), const_cast<char*>("Incorrect number of arguments in 'SCN' command"));
+       return;
+     }
+     state->setStrokePattern(NULL);
+@@ -1212,7 +1176,7 @@
+ 
+ void PdfParser::opLineTo(Object args[], int numArgs) {
+   if (!state->isCurPt()) {
+-    error(getPos(), const_cast<char*>("No current point in lineto"));
++    error(errInternal, getPos(), const_cast<char*>("No current point in lineto"));
+     return;
+   }
+   state->lineTo(args[0].getNum(), args[1].getNum());
+@@ -1222,7 +1186,7 @@
+   double x1, y1, x2, y2, x3, y3;
+ 
+   if (!state->isCurPt()) {
+-    error(getPos(), const_cast<char*>("No current point in curveto"));
++    error(errInternal, getPos(), const_cast<char*>("No current point in curveto"));
+     return;
+   }
+   x1 = args[0].getNum();
+@@ -1238,7 +1202,7 @@
+   double x1, y1, x2, y2, x3, y3;
+ 
+   if (!state->isCurPt()) {
+-    error(getPos(), const_cast<char*>("No current point in curveto1"));
++    error(errInternal, getPos(), const_cast<char*>("No current point in curveto1"));
+     return;
+   }
+   x1 = state->getCurX();
+@@ -1254,7 +1218,7 @@
+   double x1, y1, x2, y2, x3, y3;
+ 
+   if (!state->isCurPt()) {
+-    error(getPos(), const_cast<char*>("No current point in curveto2"));
++    error(errInternal, getPos(), const_cast<char*>("No current point in curveto2"));
+     return;
+   }
+   x1 = args[0].getNum();
+@@ -1282,7 +1246,7 @@
+ 
+ void PdfParser::opClosePath(Object args[], int numArgs) {
+   if (!state->isCurPt()) {
+-    error(getPos(), const_cast<char*>("No current point in closepath"));
++    error(errInternal, getPos(), const_cast<char*>("No current point in closepath"));
+     return;
+   }
+   state->closePath();
+@@ -1298,7 +1262,7 @@
+ 
+ void PdfParser::opStroke(Object args[], int numArgs) {
+   if (!state->isCurPt()) {
+-    //error(getPos(), const_cast<char*>("No path in stroke"));
++    //error(errInternal, getPos(), const_cast<char*>("No path in stroke"));
+     return;
+   }
+   if (state->isPath()) {
+@@ -1314,7 +1278,7 @@
+ 
+ void PdfParser::opCloseStroke(Object * /*args[]*/, int /*numArgs*/) {
+   if (!state->isCurPt()) {
+-    //error(getPos(), const_cast<char*>("No path in closepath/stroke"));
++    //error(errInternal, getPos(), const_cast<char*>("No path in closepath/stroke"));
+     return;
+   }
+   state->closePath();
+@@ -1331,7 +1295,7 @@
+ 
+ void PdfParser::opFill(Object args[], int numArgs) {
+   if (!state->isCurPt()) {
+-    //error(getPos(), const_cast<char*>("No path in fill"));
++    //error(errInternal, getPos(), const_cast<char*>("No path in fill"));
+     return;
+   }
+   if (state->isPath()) {
+@@ -1347,7 +1311,7 @@
+ 
+ void PdfParser::opEOFill(Object args[], int numArgs) {
+   if (!state->isCurPt()) {
+-    //error(getPos(), const_cast<char*>("No path in eofill"));
++    //error(errInternal, getPos(), const_cast<char*>("No path in eofill"));
+     return;
+   }
+   if (state->isPath()) {
+@@ -1363,7 +1327,7 @@
+ 
+ void PdfParser::opFillStroke(Object args[], int numArgs) {
+   if (!state->isCurPt()) {
+-    //error(getPos(), const_cast<char*>("No path in fill/stroke"));
++    //error(errInternal, getPos(), const_cast<char*>("No path in fill/stroke"));
+     return;
+   }
+   if (state->isPath()) {
+@@ -1376,7 +1340,7 @@
+ 
+ void PdfParser::opCloseFillStroke(Object args[], int numArgs) {
+   if (!state->isCurPt()) {
+-    //error(getPos(), const_cast<char*>("No path in closepath/fill/stroke"));
++    //error(errInternal, getPos(), const_cast<char*>("No path in closepath/fill/stroke"));
+     return;
+   }
+   if (state->isPath()) {
+@@ -1388,7 +1352,7 @@
+ 
+ void PdfParser::opEOFillStroke(Object args[], int numArgs) {
+   if (!state->isCurPt()) {
+-    //error(getPos(), const_cast<char*>("No path in eofill/stroke"));
++    //error(errInternal, getPos(), const_cast<char*>("No path in eofill/stroke"));
+     return;
+   }
+   if (state->isPath()) {
+@@ -1399,7 +1363,7 @@
+ 
+ void PdfParser::opCloseEOFillStroke(Object args[], int numArgs) {
+   if (!state->isCurPt()) {
+-    //error(getPos(), const_cast<char*>("No path in closepath/eofill/stroke"));
++    //error(errInternal, getPos(), const_cast<char*>("No path in closepath/eofill/stroke"));
+     return;
+   }
+   if (state->isPath()) {
+@@ -1440,7 +1404,7 @@
+     doShadingPatternFillFallback((GfxShadingPattern *)pattern, gFalse, eoFill);
+     break;
+   default:
+-    error(getPos(), const_cast<char*>("Unimplemented pattern type (%d) in fill"),
++    error(errInternal, getPos(), const_cast<char*>("Unimplemented pattern type (%d) in fill"),
+ 	  pattern->getType());
+     break;
+   }
+@@ -1459,7 +1423,7 @@
+     doShadingPatternFillFallback((GfxShadingPattern *)pattern, gTrue, gFalse);
+     break;
+   default:
+-    error(getPos(), const_cast<char*>("Unimplemented pattern type (%d) in stroke"),
++    error(errInternal, getPos(), const_cast<char*>("Unimplemented pattern type (%d) in stroke"),
+ 	  pattern->getType());
+     break;
+   }
+@@ -1579,15 +1543,9 @@
+   double *matrix = NULL;
+   GBool savedState = gFalse;
+ 
+-#ifdef POPPLER_NEW_COLOR_SPACE_API
+   if (!(shading = res->lookupShading(args[0].getName(), NULL))) {
+     return;
+   }
+-#else
+-  if (!(shading = res->lookupShading(args[0].getName()))) {
+-    return;
+-  }
+-#endif
+ 
+   // save current graphics state
+   if (shading->getType() != 2 && shading->getType() != 3) {
+@@ -2156,7 +2114,7 @@
+ 
+ void PdfParser::opShowText(Object args[], int numArgs) {
+   if (!state->getFont()) {
+-    error(getPos(), const_cast<char*>("No font in show"));
++    error(errInternal, getPos(), const_cast<char*>("No font in show"));
+     return;
+   }
+   if (fontChanged) {
+@@ -2170,7 +2128,7 @@
+   double tx, ty;
+ 
+   if (!state->getFont()) {
+-    error(getPos(), const_cast<char*>("No font in move/show"));
++    error(errInternal, getPos(), const_cast<char*>("No font in move/show"));
+     return;
+   }
+   if (fontChanged) {
+@@ -2188,7 +2146,7 @@
+   double tx, ty;
+ 
+   if (!state->getFont()) {
+-    error(getPos(), const_cast<char*>("No font in move/set/show"));
++    error(errInternal, getPos(), const_cast<char*>("No font in move/set/show"));
+     return;
+   }
+   if (fontChanged) {
+@@ -2211,7 +2169,7 @@
+   int i;
+ 
+   if (!state->getFont()) {
+-    error(getPos(), const_cast<char*>("No font in show/space"));
++    error(errInternal, getPos(), const_cast<char*>("No font in show/space"));
+     return;
+   }
+   if (fontChanged) {
+@@ -2236,7 +2194,7 @@
+     } else if (obj.isString()) {
+       doShowText(obj.getString());
+     } else {
+-      error(getPos(), const_cast<char*>("Element of show/space array must be number or string"));
++      error(errInternal, getPos(), const_cast<char*>("Element of show/space array must be number or string"));
+     }
+     obj.free();
+   }
+@@ -2334,7 +2292,7 @@
+ 	if (charProc.isStream()) {
+ 	  //parse(&charProc, gFalse); // TODO: parse into SVG font
+ 	} else {
+-	  error(getPos(), const_cast<char*>("Missing or bad Type3 CharProc entry"));
++	  error(errInternal, getPos(), const_cast<char*>("Missing or bad Type3 CharProc entry"));
+ 	}
+ 	//out->endType3Char(state);
+ 	if (resDict) {
+@@ -2410,7 +2368,7 @@
+     return;
+   }
+   if (!obj1.isStream()) {
+-    error(getPos(), const_cast<char*>("XObject '%s' is wrong type"), name);
++    error(errInternal, getPos(), const_cast<char*>("XObject '%s' is wrong type"), name);
+     obj1.free();
+     return;
+   }
+@@ -2426,9 +2384,9 @@
+ /*    out->psXObject(obj1.getStream(),
+     		   obj3.isStream() ? obj3.getStream() : (Stream *)NULL);*/
+   } else if (obj2.isName()) {
+-    error(getPos(), const_cast<char*>("Unknown XObject subtype '%s'"), obj2.getName());
++    error(errInternal, getPos(), const_cast<char*>("Unknown XObject subtype '%s'"), obj2.getName());
+   } else {
+-    error(getPos(), const_cast<char*>("XObject subtype is missing or wrong type"));
++    error(errInternal, getPos(), const_cast<char*>("XObject subtype is missing or wrong type"));
+   }
+   obj2.free();
+   obj1.free();
+@@ -2559,11 +2517,7 @@
+       }
+     }
+     if (!obj1.isNull()) {
+-#ifdef POPPLER_NEW_COLOR_SPACE_API
+       colorSpace = GfxColorSpace::parse(&obj1, NULL);
+-#else
+-      colorSpace = GfxColorSpace::parse(&obj1);
+-#endif
+     } else if (csMode == streamCSDeviceGray) {
+       colorSpace = new GfxDeviceGrayColorSpace();
+     } else if (csMode == streamCSDeviceRGB) {
+@@ -2648,11 +2602,7 @@
+ 	  obj2.free();
+ 	}
+       }
+-#ifdef POPPLER_NEW_COLOR_SPACE_API
+       maskColorSpace = GfxColorSpace::parse(&obj1, NULL);
+-#else
+-      maskColorSpace = GfxColorSpace::parse(&obj1);
+-#endif
+       obj1.free();
+       if (!maskColorSpace || maskColorSpace->getMode() != csDeviceGray) {
+ 	goto err1;
+@@ -2758,7 +2708,7 @@
+  err2:
+   obj1.free();
+  err1:
+-  error(getPos(), const_cast<char*>("Bad image parameters"));
++  error(errInternal, getPos(), const_cast<char*>("Bad image parameters"));
+ }
+ 
+ void PdfParser::doForm(Object *str) {
+@@ -2783,7 +2733,7 @@
+   // check form type
+   dict->lookup(const_cast<char*>("FormType"), &obj1);
+   if (!(obj1.isNull() || (obj1.isInt() && obj1.getInt() == 1))) {
+-    error(getPos(), const_cast<char*>("Unknown form type"));
++    error(errInternal, getPos(), const_cast<char*>("Unknown form type"));
+   }
+   obj1.free();
+ 
+@@ -2791,7 +2741,7 @@
+   dict->lookup(const_cast<char*>("BBox"), &bboxObj);
+   if (!bboxObj.isArray()) {
+     bboxObj.free();
+-    error(getPos(), const_cast<char*>("Bad form bounding box"));
++    error(errInternal, getPos(), const_cast<char*>("Bad form bounding box"));
+     return;
+   }
+   for (i = 0; i < 4; ++i) {
+@@ -2827,11 +2777,7 @@
+     if (obj1.dictLookup(const_cast<char*>("S"), &obj2)->isName(const_cast<char*>("Transparency"))) {
+       transpGroup = gTrue;
+       if (!obj1.dictLookup(const_cast<char*>("CS"), &obj3)->isNull()) {
+-#ifdef POPPLER_NEW_COLOR_SPACE_API
+ 	blendingColorSpace = GfxColorSpace::parse(&obj3, NULL);
+-#else
+-	blendingColorSpace = GfxColorSpace::parse(&obj3);
+-#endif
+       }
+       obj3.free();
+       if (obj1.dictLookup(const_cast<char*>("I"), &obj3)->isBool()) {
+@@ -2990,7 +2936,7 @@
+   parser->getObj(&obj);
+   while (!obj.isCmd(const_cast<char*>("ID")) && !obj.isEOF()) {
+     if (!obj.isName()) {
+-      error(getPos(), const_cast<char*>("Inline image dictionary key must be a name object"));
++      error(errInternal, getPos(), const_cast<char*>("Inline image dictionary key must be a name object"));
+       obj.free();
+     } else {
+       key = copyString(obj.getName());
+@@ -3005,7 +2951,7 @@
+     parser->getObj(&obj);
+   }
+   if (obj.isEOF()) {
+-    error(getPos(), const_cast<char*>("End of file in inline image"));
++    error(errInternal, getPos(), const_cast<char*>("End of file in inline image"));
+     obj.free();
+     dict.free();
+     return NULL;
+@@ -3020,11 +2966,11 @@
+ }
+ 
+ void PdfParser::opImageData(Object args[], int numArgs) {
+-  error(getPos(), const_cast<char*>("Internal: got 'ID' operator"));
++  error(errInternal, getPos(), const_cast<char*>("Internal: got 'ID' operator"));
+ }
+ 
+ void PdfParser::opEndImage(Object args[], int numArgs) {
+-  error(getPos(), const_cast<char*>("Internal: got 'EI' operator"));
++  error(errInternal, getPos(), const_cast<char*>("Internal: got 'EI' operator"));
+ }
+ 
+ //------------------------------------------------------------------------
+diff -Naur old/src/extension/internal/pdfinput/svg-builder.cpp new/src/extension/internal/pdfinput/svg-builder.cpp
+--- old/src/extension/internal/pdfinput/svg-builder.cpp	2011-07-08 20:25:09.468790000 +0200
++++ new/src/extension/internal/pdfinput/svg-builder.cpp	2012-05-13 20:45:22.303804308 +0200
+@@ -961,9 +961,7 @@
+     _font_style = sp_repr_css_attr_new();
+     GfxFont *font = state->getFont();
+     // Store original name
+-    if (font->getOrigName()) {
+-        _font_specification = font->getOrigName()->getCString();
+-    } else if (font->getName()) {
++    if (font->getName()) {
+         _font_specification = font->getName()->getCString();
+     } else {
+         _font_specification = (char*) "Arial";
diff --git a/testing/libreoffice/PKGBUILD b/testing/libreoffice/PKGBUILD
new file mode 100644
index 000000000..721433d35
--- /dev/null
+++ b/testing/libreoffice/PKGBUILD
@@ -0,0 +1,703 @@
+# $Id: PKGBUILD 162294 2012-06-24 19:25:15Z foutrelis $
+# Maintainer: AndyRTR <andyrtr@archlinux.org>
+
+pkgbase="libreoffice"
+pkgname=('libreoffice-common'
+	'libreoffice-base'
+	'libreoffice-calc'
+	'libreoffice-draw'
+	'libreoffice-gnome'
+	'libreoffice-impress'
+	'libreoffice-kde4'
+	'libreoffice-math'
+	'libreoffice-sdk'
+	'libreoffice-sdk-doc'
+	'libreoffice-writer'
+	'libreoffice-en-US'
+	'libreoffice-postgresql-connector'
+	'libreoffice-extension-pdfimport'
+	'libreoffice-extension-presenter-screen'
+	'libreoffice-extension-presentation-minimizer'
+	'libreoffice-extension-report-builder'
+	'libreoffice-scripting-beanshell'
+	'libreoffice-scripting-javascript'
+	'libreoffice-extension-scripting-python') # svn up -r 142692 (last one with all extensions built
+_LOver=3.5.4.2
+pkgver=3.5.4
+pkgrel=2
+arch=('i686' 'x86_64')
+license=('LGPL3')
+url="http://www.libreoffice.org/"
+makedepends=( # makedepends
+             'sane' 'perl-archive-zip' 'zip' 'unzip' 'unixodbc' 'hsqldb-java' 'boost'
+             'apache-ant' 'gperf' 'poppler>=0.20.1' 'kdelibs' 'gconf' 'cppunit'
+             'beanshell'  'vigra' 'lucene' 'junit' 'libmythes' 'libwpg' 'imagemagick'
+             'mesa' 'gstreamer0.10-base' 'java-environment' 'postgresql-libs'
+              #'saxon' - currently broken 
+             # the runtime dependencies
+             "curl>=7.20.0" "hunspell>=1.2.8" "python2>=2.7" 'libwpd>=0.9.2' 'libwps' 'libxaw' "neon>=0.28.6"
+             'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'dbus-glib' 'libxslt' 'librsvg' "icu>=49.1" 
+             'redland' 'hyphen' 'lpsolve' 'gcc-libs' 'sh'  'libtextcat' 'graphite' 
+             'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'gtk2' 'orbit2' 'translate-toolkit' 'xdg-utils'
+	         'ttf-dejavu') # to satisfy regression tests
+
+# http://download.documentfoundation.org/mirrors/all.html
+# http://wiki.documentfoundation.org/Mirrors
+
+_mirror="http://download.documentfoundation.org/libreoffice/src/${pkgver}"
+#_mirror="http://dev-builds.libreoffice.org/pre-releases/src"
+_additional_source_url="http://dev-www.libreoffice.org/src"
+source=(${_mirror}/${pkgbase}-{core,help,translations}-${_LOver}.tar.xz
+	${_additional_source_url}/18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz
+	${_additional_source_url}/2fa6028324347860e684e75310818d43-libvisio-0.0.16.tar.bz2
+#	${_additional_source_url}/90010e213dd25648e70f0cc12f8fed55-libvisio-0.0.17.tar.bz2
+	${_additional_source_url}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
+	${_additional_source_url}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
+	${_additional_source_url}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
+	${_additional_source_url}/fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz
+	${_additional_source_url}/ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip
+	${_additional_source_url}/2a177023f9ea8ec8bd00837605c5df1b-jakarta-tomcat-5.0.30-src.tar.gz
+	${_additional_source_url}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
+	${_additional_source_url}/3c219630e4302863a9a83d0efde889db-commons-logging-1.1.1-src.tar.gz
+	${_additional_source_url}/2ae988b339daec234019a7066f96733e-commons-lang-2.3-src.tar.gz
+	${_additional_source_url}/2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz
+	${_additional_source_url}/af3c3acf618de6108d65fcdc92b492e1-commons-codec-1.3-src.tar.gz
+	${_additional_source_url}/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
+	${_additional_source_url}/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
+	${_additional_source_url}/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip
+	${_additional_source_url}/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip
+	${_additional_source_url}/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip
+	${_additional_source_url}/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip
+	${_additional_source_url}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
+	${_additional_source_url}/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip
+	${_additional_source_url}/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
+	${_additional_source_url}/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
+	${_additional_source_url}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
+	${_additional_source_url}/0ff7d225d087793c8c2c680d77aac3e7-mdds_0.5.3.tar.bz2
+	${_additional_source_url}/e1c178b18f130b40494561f02bc1a948-libexttextcat-3.2.0.tar.bz2
+	${_additional_source_url}/7c2549f6b0a8bb604e6c4c729ffdcfe6-libcmis-0.1.0.tar.gz
+	http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll
+	gmake_install.diff::http://cgit.freedesktop.org/libreoffice/core/patch/?id=1048d8fa4abd3e55a45dfb6884db808da1d72c9e
+	smp_buildfix.diff::http://cgit.freedesktop.org/libreoffice/core/patch/?id=cf23f57ae6bb7af689a45e0a850c3c2f67a8f810
+	fix_broken_hebrew_wordwrapping.diff
+	libreoffice-common.sh libreoffice-common.csh)
+noextract=(2fa6028324347860e684e75310818d43-libvisio-0.0.16.tar.bz2
+#	90010e213dd25648e70f0cc12f8fed55-libvisio-0.0.17.tar.bz2
+	18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz
+	185d60944ea767075d27247c3162b3bc-unowinreg.dll
+	0ff7d225d087793c8c2c680d77aac3e7-mdds_0.5.3.tar.bz2
+	ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip
+	798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
+	1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
+	fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz
+	e1c178b18f130b40494561f02bc1a948-libexttextcat-3.2.0.tar.bz2
+	7c2549f6b0a8bb604e6c4c729ffdcfe6-libcmis-0.1.0.tar.gz
+	35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
+	2a177023f9ea8ec8bd00837605c5df1b-jakarta-tomcat-5.0.30-src.tar.gz
+	a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
+	3c219630e4302863a9a83d0efde889db-commons-logging-1.1.1-src.tar.gz
+	2ae988b339daec234019a7066f96733e-commons-lang-2.3-src.tar.gz
+	2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz
+	af3c3acf618de6108d65fcdc92b492e1-commons-codec-1.3-src.tar.gz
+	eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
+	39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
+	3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip
+	97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip
+	f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip
+	8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip
+	d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
+	3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip
+	ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
+	db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
+	ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip)
+md5sums=('61afc900785dd7d071b96d9ab0af46f3'
+         'd2e7414a60eacafef45fbc4bc1a8ccb3'
+         '545d1608da2cc736be5c8bf941adbbfb'
+         '18f577b374d60b3c760a3a3350407632'
+         '2fa6028324347860e684e75310818d43'
+         '1f24ab1d39f4a51faf22244c94a6203f'
+         '35c94d2df8893241173de1d16b6034c0'
+         '798b2ffdc8bcfe7bca2cf92b62caf685'
+         'fdb27bfe2dbe2e7b57ae194d9bf36bab'
+         'ada24d37d8d638b3d8a9985e80bc2978'
+         '2a177023f9ea8ec8bd00837605c5df1b'
+         'a7983f859eafb2677d7ff386a023bc40'
+         '3c219630e4302863a9a83d0efde889db'
+         '2ae988b339daec234019a7066f96733e'
+         '2c9b0f83ed5890af02c0df1c1776f39b'
+         'af3c3acf618de6108d65fcdc92b492e1'
+         'eeb2c7ddf0d302fba4bfc6e97eac9624'
+         '39bb3fcea1514f1369fcfc87542390fd'
+         '3404ab6b1792ae5f16bbd603bd1e1d03'
+         '97b2d4dba862397f446b217e2b623e71'
+         'f94d9870737518e3b597f9265f4e9803'
+         '8ce2fcd72becf06c41f7201d15373ed9'
+         'd8bd5eed178db6e2b18eeed243f85aa8'
+         '3bdf40c0d199af31923e900d082ca2dd'
+         'ace6ab49184e329db254e454a010f56d'
+         'db60e4fde8dd6d6807523deb71ee34dc'
+         'ba2930200c9f019c2d93a8c88c651a0f'
+         '0ff7d225d087793c8c2c680d77aac3e7'
+         'e1c178b18f130b40494561f02bc1a948'
+         '7c2549f6b0a8bb604e6c4c729ffdcfe6'
+         '185d60944ea767075d27247c3162b3bc'
+         '60ce5dc9bd098f95c2e621a930c98dd9'
+         '661a52a02a31b3afbe4b3b3146061afd'
+         '025d9b17d9eb90dc282c5c1289a666aa'
+         'f0e72d0e1bc93a50a3aa9d31350b156c'
+         '867c682b45f477f916786e00c45d7ab7')
+
+build() {
+
+	unset J2REDIR; unset J2SDKDIR; unset JAVA_HOME; unset CLASSPATH; unset EXTRAOPTS
+	[ -z "${JAVA_HOME}" ] && . /etc/profile.d/jdk.sh || . /etc/profile.d/openjdk6.sh
+	[ -z "${ANT_HOME}" ] && . /etc/profile.d/apache-ant.sh
+
+        cd ${srcdir}/libreoffice-core-$_LOver
+
+	# move external sources into place
+	mkdir ${srcdir}/ext_sources &&	pushd ${srcdir}/ext_sources
+	for source in "${noextract[@]}"; do
+	  ln -s ${srcdir}/$source .
+	done
+	popd
+	
+	ln -s ../libreoffice-help-$_LOver/helpcontent2 .
+	ln -s ../libreoffice-translations-$_LOver/translations .
+
+	# buildfixes & bugfixes
+	# one late fix to solve make distro-pack-install issue
+	patch -Np1 -i ${srcdir}/gmake_install.diff
+	patch -Np1 -i ${srcdir}/smp_buildfix.diff
+	# https://bugs.archlinux.org/task/29854 based on 3.6/master patch http://cgit.freedesktop.org/libreoffice/core/patch/?id=20c24114143d6d38774b56a142fd4ae05094308e
+	patch -Np1 -i ${srcdir}/fix_broken_hebrew_wordwrapping.diff
+	
+	# unset C(XX)FLAGS
+	# http://www.openoffice.org/issues/show_bug.cgi?id=103205
+#	unset CFLAGS
+#	unset CXXFLAGS
+
+	#use the CFLAGS but remove the LibO overridden ones
+	for i in $CFLAGS; do
+		case "$i" in
+			-O?|-pipe|-Wall|-g|-fexceptions) continue;;
+		esac
+        ARCH_FLAGS="$ARCH_FLAGS $i"
+	done
+	
+	# python2 fix
+	export PYTHON=python2
+
+#	autoconf -f
+
+	# non-SMP test build
+#	export MAKEFLAGS="-j1"
+	#./configure --with-build-version="${_LOver} ArchLinux build-${pkgrel}" --with-vendor="ArchLinux" \
+#	touch autogen.lastrun
+	./autogen.sh --with-build-version="${_LOver} ArchLinux build-${pkgrel}" --with-vendor="ArchLinux" \
+		--with-unix-wrapper="libreoffice" \
+		--enable-split-app-modules \
+		--with-max-jobs=${MAKEFLAGS/-j/} --with-num-cpus=${MAKEFLAGS/-j/} \
+		--with-external-tar="${srcdir}/ext_sources" \
+		--disable-fetch-external \
+		--prefix=/usr --exec-prefix=/usr --sysconfdir=/etc \
+		--libdir=/usr/lib --mandir=/usr/share/man \
+		--disable-verbose \
+		--with-lang="" \
+		--enable-crashdump \
+		--enable-dbus \
+		--enable-evolution2\
+		--enable-gio\
+		--disable-gnome-vfs\
+		--disable-kde\
+		--enable-kde4\
+		--enable-gtk3 \
+		--enable-lockdown\
+		--enable-mergelibs \
+		--enable-opengl \
+		--enable-odk\
+		--enable-ext-scripting-beanshell \
+		--enable-ext-scripting-javascript \
+		--disable-ext-mysql-connector \
+		--with-system-mysql \
+		--enable-librsvg=system \
+		--without-fonts\
+		--without-afms\
+		--without-ppds\
+		--without-system-libwps\
+		--without-system-mdds\
+		--without-myspell-dicts \
+		--without-system-libvisio \
+		--without-system-libcmis \
+		--without-system-sampleicc \
+		--without-system-libexttextcat \
+		--with-system-dicts \
+		--with-external-dict-dir=/usr/share/hunspell \
+		--with-external-hyph-dir=/usr/share/hyphen \
+		--with-external-thes-dir=/usr/share/mythes \
+		--with-system-beanshell \
+		--with-system-cppunit\
+		--with-system-graphite\
+		--with-system-libwpg \
+		--with-system-libwps \
+		--with-system-redland\
+		--without-system-saxon\
+		--disable-mozilla \
+		--without-system-mozilla \
+		--without-system-mozilla-headers \
+		--with-ant-home="/usr/share/java/apache-ant"\
+		--with-system-boost\
+		--with-system-cairo\
+		--with-system-libs\
+		--with-system-mythes\
+		--with-system-headers\
+		--with-system-hsqldb \
+		--with-alloc=system\
+		--with-system-lucene\
+		--with-lucene-core-jar=/usr/share/java/lucene-core.jar\
+		--with-lucene-analyzers-jar=/usr/share/java/lucene-analyzers.jar\
+		--with-java-target-version=1.5 \
+		$EXTRAOPTS
+
+#		--disable-ext-lightproof \
+
+
+#--with-install-dirname="${pkgbase}" 
+#		--enable-cairo\
+#		--with-system-libtextcat \
+#		--with-external-libtextcat-data \
+#--enable-split-opt-features Split file lists for some optional features, .e.g. pyuno, testtool
+
+#--with-servlet-api-jar=JARFILE 
+# see http://qa.openoffice.org/issues/show_bug.cgi?id=110136
+#		--with-system-saxon\
+#		--with-saxon-jar=/usr/share/java/saxon/saxon9he.jar\
+
+	touch src.downloaded
+	#./download
+	make
+	# fake installation to create split file lists
+	mkdir $srcdir/fakeinstall
+	make DESTDIR=${srcdir}/fakeinstall distro-pack-install
+}
+
+#check() {
+#	cd ${srcdir}/build
+#	make check
+#}
+
+package_libreoffice-common() {
+
+ pkgdesc="common files for LibreOffice - a productivity suite that is compatible with other major office suites"
+ install=libreoffice-common.install
+ depends=('libreoffice-langpack' "hunspell>=1.2.8" "python2>=2.7" "neon>=0.28.6"
+          'nspr' 'libsm' 'redland' 'hyphen' 'graphite' "icu>=49.1" 
+          'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'xdg-utils' 'orbit2')
+          #'saxon'
+ optdepends=('libreoffice-langpack: additional language support'
+             'java-runtime:     adds java support'
+             'libcups:          adds printing support'
+             'gconf:            adds additional gnome support'
+             'nss:              adds support for signed files/macros'
+             'pstoedit:         translates PostScript and PDF graphics into other vector formats'
+             'poppler:          for shipped pdfimport extension'
+             'libmythes:        for use in thesaurus'
+             'beanshell:        interactive java -- good for prototyping /macros'
+             'vigra:            C++ computer vision library, usable in Basebmp'
+             'libmspack:        library for Microsoft compression formats for use in FontOOo'
+             'libwpg:           library for importing and converting Corel WordPerfect(tm) Graphics images'
+             'lucene:           full-text search engine library for Java needed in the help section'
+             'sane:             for scanner access'
+             'unixodbc:         adds ODBC database support'
+             'gstreamer0.10-base: + some gstr-plugins to support multimedia content, e.g. in impress')
+ backup=(etc/libreoffice/sofficerc
+         etc/libreoffice/bootstraprc
+         etc/libreoffice/psprint.conf)
+ groups=('libreoffice')
+ provides=('go-openoffice')
+ conflicts=('go-openoffice')
+ replaces=('go-openoffice' 'openoffice-base' 'libreoffice')
+
+ # create directories from *list.txt file
+ for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/common_list.txt`; do
+   install -dm755 ${pkgdir}/${directory/\%dir/}
+ done
+ # install files into the pkg from fakeinstall dir
+ for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/common_list.txt`; do
+   dirname=`dirname $file`
+   # check if directory has been already been created - some are missing like manpages
+   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
+   # mv file from fakeinstall to pkgdir
+   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
+ done
+ 
+ # put configuration files into place
+ install -dm755 ${pkgdir}/etc/libreoffice
+ install -m644 ${pkgdir}/usr/lib/libreoffice/program/{bootstraprc,sofficerc} ${pkgdir}/etc/libreoffice/
+ install -m644 ${pkgdir}/usr/lib/libreoffice/share/psprint/psprint.conf ${pkgdir}/etc/libreoffice/
+ # install dummy links to make them found by LibO
+ cd ${pkgdir}/usr/lib/libreoffice/program/
+ ln -vsf /etc/libreoffice/{bootstraprc,sofficerc} .
+ cd ${pkgdir}/usr/lib/libreoffice/share/psprint/
+ ln -vsf /etc/libreoffice/psprint.conf .
+ 
+ # set python-uno PYTHON path
+ install -dm755 ${pkgdir}/etc/profile.d
+ install -m755 ${srcdir}/libreoffice-common.{sh,csh} ${pkgdir}/etc/profile.d/
+ 
+ # move bash-completion files to its new place
+ install -dm755 ${pkgdir}/usr/share/bash-completion/completions
+ mv ${pkgdir}/etc/bash_completion.d/libreoffice.sh ${pkgdir}/usr/share/bash-completion/completions/libreoffice.sh
+ rm -rf ${pkgdir}/etc/bash_completion.d
+}
+
+package_libreoffice-base() {
+ pkgdesc="GUI Spreadsheet Applicationdatabase front-end for LibreOffice. Allows creation and management of databases through a GUI."
+ install=libreoffice-base.install
+ depends=('libreoffice-common' 'hsqldb-java')
+ optdepends=('libreoffice-postgresql-connector')
+ backup=()
+ groups=('libreoffice')
+ replaces=('libreoffice')
+
+ # create directories from *list.txt file
+ for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/base_list.txt`; do
+   install -dm755 ${pkgdir}/${directory/\%dir/}
+ done
+ # install files into the pkg from fakeinstall dir
+ for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/base_list.txt`; do
+   dirname=`dirname $file`
+   # check if directory has been already been created - some are missing like manpages
+   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
+   # mv file from fakeinstall to pkgdir
+   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
+ done
+}
+
+package_libreoffice-postgresql-connector() {
+ pkgdesc="A PostgreSQL connector for the database front-end for LibreOffice"
+ depends=('libreoffice-base' 'postgresql-libs')
+ groups=('libreoffice')
+ replaces=('libreoffice')
+
+ # no file-list so far
+ install -dm755 ${pkgdir}/usr/lib/libreoffice/program/services
+ install -m644 ${srcdir}/fakeinstall/usr/lib/libreoffice/program/postgresql-sdbc.uno.so ${pkgdir}/usr/lib/libreoffice/program
+ install -m644 ${srcdir}/fakeinstall/usr/lib/libreoffice/program/postgresql-sdbc-impl.uno.so ${pkgdir}/usr/lib/libreoffice/program
+ install -m644 ${srcdir}/fakeinstall/usr/lib/libreoffice/program/postgresql-sdbc.ini ${pkgdir}/usr/lib/libreoffice/program
+ install -m644 ${srcdir}/fakeinstall/usr/lib/libreoffice/program/services/postgresql-sdbc.rdb ${pkgdir}/usr/lib/libreoffice/program/services
+ install -dm755 ${pkgdir}/usr/lib/libreoffice/share/registry
+ install -m644 ${srcdir}/fakeinstall/usr/lib/libreoffice/share/registry/postgresqlsdbc.xcd ${pkgdir}/usr/lib/libreoffice/share/registry
+ 
+# # create directories from *list.txt file
+# for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/postgresql_list.txt`; do
+#   install -dm755 ${pkgdir}/${directory/\%dir/}
+# done
+# # install files into the pkg from fakeinstall dir
+# for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/postgresql_list.txt`; do
+#   dirname=`dirname $file`
+#   # check if directory has been already been created - some are missing like manpages
+#   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
+#   # mv file from fakeinstall to pkgdir
+#   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
+# done
+}
+
+package_libreoffice-calc() {
+ pkgdesc="Spreadsheet application for LibreOffice."
+ install=libreoffice-calc.install
+ depends=('libreoffice-common' 'lpsolve' )
+ optdepends=()
+ backup=()
+ groups=('libreoffice')
+ replaces=('libreoffice')
+ 
+ # create directories from *list.txt file
+ for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/calc_list.txt`; do
+   install -dm755 ${pkgdir}/${directory/\%dir/}
+ done
+ # install files into the pkg from fakeinstall dir
+ for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/calc_list.txt`; do
+   dirname=`dirname $file`
+   # check if directory has been already been created - some are missing like manpages
+   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
+   # mv file from fakeinstall to pkgdir
+   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
+ done
+}
+
+package_libreoffice-draw() {
+ pkgdesc="Drawing Application for LibreOffice."
+ install=libreoffice-draw.install
+ depends=('libreoffice-common')
+ optdepends=()
+ backup=()
+ groups=('libreoffice')
+ replaces=('libreoffice')
+ 
+ # create directories from *list.txt file
+ for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/draw_list.txt`; do
+   install -dm755 ${pkgdir}/${directory/\%dir/}
+ done
+ # install files into the pkg from fakeinstall dir
+ for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/draw_list.txt`; do
+   dirname=`dirname $file`
+   # check if directory has been already been created - some are missing like manpages
+   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
+   # mv file from fakeinstall to pkgdir
+   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
+ done
+}
+
+package_libreoffice-gnome() {
+ pkgdesc="Plug-in for LibreOffice that enables integration into the Gnome and other gtk desktop environment."
+ depends=('libreoffice-common' 'gtk2' 'gtk3') #'dbus-glib'
+ optdepends=()
+ backup=()
+ groups=('libreoffice')
+ 
+ # create directories from *list.txt file
+ for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/gnome_list.txt`; do
+   install -dm755 ${pkgdir}/${directory/\%dir/}
+ done
+ # install files into the pkg from fakeinstall dir
+ for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/gnome_list.txt`; do
+   dirname=`dirname $file`
+   # check if directory has been already been created - some are missing like manpages
+   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
+   # mv file from fakeinstall to pkgdir
+   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
+ done
+}
+
+package_libreoffice-impress() {
+ pkgdesc="Presentation Application for LibreOffice."
+ install=libreoffice-impress.install
+ depends=('libreoffice-common')
+ optdepends=('mesa:             for the OGLTrans extension')
+ backup=()
+ groups=('libreoffice')
+ replaces=('libreoffice')
+ 
+ # create directories from *list.txt file
+ for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/impress_list.txt`; do
+   install -dm755 ${pkgdir}/${directory/\%dir/}
+ done
+ # install files into the pkg from fakeinstall dir
+ for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/impress_list.txt`; do
+   dirname=`dirname $file`
+   # check if directory has been already been created - some are missing like manpages
+   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
+   # mv file from fakeinstall to pkgdir
+   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
+ done
+}
+
+package_libreoffice-kde4() {
+ pkgdesc="Plug-in for LibreOffice that enables integration into the KDE4 desktop environment."
+ depends=('libreoffice-common' 'kdelibs')
+ optdepends=()
+ backup=()
+ groups=('libreoffice')
+ 
+ # create directories from *list.txt file
+ for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/kde4_list.txt`; do
+   install -dm755 ${pkgdir}/${directory/\%dir/}
+ done
+ # install files into the pkg from fakeinstall dir
+ for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/kde4_list.txt`; do
+   dirname=`dirname $file`
+   # check if directory has been already been created - some are missing like manpages
+   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
+   # mv file from fakeinstall to pkgdir
+   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
+ done
+}
+
+package_libreoffice-math() {
+ pkgdesc="Equation Editor Applicationfor LibreOffice."
+ depends=('libreoffice-common')
+ optdepends=()
+ backup=()
+ groups=('libreoffice')
+ replaces=('libreoffice')
+ 
+ # create directories from *list.txt file
+ for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/math_list.txt`; do
+   install -dm755 ${pkgdir}/${directory/\%dir/}
+ done
+ # install files into the pkg from fakeinstall dir
+ for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/math_list.txt`; do
+   dirname=`dirname $file`
+   # check if directory has been already been created - some are missing like manpages
+   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
+   # mv file from fakeinstall to pkgdir
+   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
+ done
+}
+
+package_libreoffice-sdk() {
+ pkgdesc="Software Development Kit for LibreOffice."
+ depends=('libreoffice-common' 'gcc-libs' 'sh' 'make' 'zip' 'gcc' 'java-environment')
+ optdepends=()
+ backup=()
+ groups=('libreoffice')
+ 
+ # create directories from *list.txt file
+ for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/sdk_list.txt`; do
+   install -dm755 ${pkgdir}/${directory/\%dir/}
+ done
+ # install files into the pkg from fakeinstall dir
+ for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/sdk_list.txt`; do
+   dirname=`dirname $file`
+   # check if directory has been already been created - some are missing like manpages
+   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
+   # mv file from fakeinstall to pkgdir
+   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
+ done
+ 
+  # fix environment path to keep compatibility with openjdk6 and openjdk7
+  #sed -i -e "s:\/usr\/lib\/jvm\/java-7-openjdk:\$J2SDKDIR:"          /usr/lib/libreoffice/sdk/setsdkenv_unix.{sh,csh}
+  sed -i -e "s:\/usr\/lib\/jvm\/java-7-openjdk:\$J2SDKDIR:" ${pkgdir}/usr/lib/libreoffice/sdk/setsdkenv_unix.{sh,csh}
+}
+
+package_libreoffice-sdk-doc() {
+ pkgdesc="Software Development Kit documentation for LibreOffice"
+ depends=('libreoffice-common' 'libreoffice-sdk')
+ optdepends=()
+ backup=()
+ groups=('libreoffice')
+ 
+ # create directories from *list.txt file
+ for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/sdk_doc_list.txt`; do
+   install -dm755 ${pkgdir}/${directory/\%dir/}
+ done
+ # install files into the pkg from fakeinstall dir
+ for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/sdk_doc_list.txt`; do
+   dirname=`dirname $file`
+   # check if directory has been already been created - some are missing like manpages
+   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
+   # mv file from fakeinstall to pkgdir
+   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
+ done
+
+ #fix permissions
+ find ${pkgdir}/usr/lib/libreoffice/sdk/examples -type f -exec chmod -x {} \;
+}
+
+package_libreoffice-writer() {
+ pkgdesc="Word Processor Applicationfor LibreOffice."
+ install=libreoffice-writer.install
+ depends=('libreoffice-common' 'libwpd>=0.9.2' 'libwps' 'libxml2')
+ optdepends=('libwpg:           library for importing and converting Corel WordPerfect(tm) Graphics images')
+ backup=()
+ groups=('libreoffice')
+ replaces=('libreoffice')
+
+ # create directories from *list.txt file
+ for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/writer_list.txt`; do
+   install -dm755 ${pkgdir}/${directory/\%dir/}
+ done
+ # install files into the pkg from fakeinstall dir
+ for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/writer_list.txt`; do
+   dirname=`dirname $file`
+   # check if directory has been already been created - some are missing like manpages
+   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
+   # mv file from fakeinstall to pkgdir
+   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
+ done
+}
+
+package_libreoffice-en-US() {
+  pkgdesc="English (US) language pack for LibreOffice"
+  #arch=('any')
+  provides=('openoffice-en-US' 'libreoffice-langpack')
+  replaces=(openoffice-en-US)
+  conflicts=(openoffice-en-US)
+
+ # create directories from *list.txt file
+ for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/lang_en_US_list.txt`; do
+   install -dm755 ${pkgdir}/${directory/\%dir/}
+ done
+ # install files into the pkg from fakeinstall dir
+ for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/lang_en_US_list.txt`; do
+   dirname=`dirname $file`
+   # check if directory has been already been created - some are missing like manpages
+   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
+   # mv file from fakeinstall to pkgdir
+   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
+ done
+}
+
+package_libreoffice-extension-pdfimport() {
+
+ pkgdesc="This extension allows you to import and modify PDF documents"
+ depends=('libreoffice-common' 'poppler')
+ groups=('libreoffice-extensions')
+
+	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
+	unzip -q ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/pdfimport/pdfimport.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/pdfimport
+}
+
+package_libreoffice-extension-presenter-screen() {
+
+ pkgdesc="This extension provides more control over your slide show presentation, such as the ability to see the upcoming slide, the slide notes, and a presentation timer whereas the audience see only the current slide"
+ depends=('libreoffice-common' 'java-environment')
+ groups=('libreoffice-extensions')
+
+	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
+	unzip -q ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/presenter-screen.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/presenter-screen
+}
+
+package_libreoffice-extension-presentation-minimizer() {
+
+ pkgdesc="This extension reduce the file size of the current presentation"
+ depends=('libreoffice-common' 'gcc-libs')
+ groups=('libreoffice-extensions')
+
+	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
+	unzip -q ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/presentation-minimizer.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/presentation-minimizer
+}
+
+package_libreoffice-extension-report-builder() {
+
+ pkgdesc="This extension creates smart-looking database reports"
+ #arch=('any')
+ depends=('libreoffice-common' 'java-environment')
+ groups=('libreoffice-extensions')
+
+	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
+	unzip -q ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/report-builder.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/report-builder
+}
+
+package_libreoffice-scripting-beanshell() {
+
+ pkgdesc="LibreOffice extension - Enables support for scripts in BeanShell"
+ depends=('libreoffice-common' 'java-environment')
+ groups=('libreoffice-extensions')
+
+	install -dm755 ${pkgdir}/usr/lib/libreoffice/program/{classes,services}
+	mv ${srcdir}/fakeinstall/usr/lib/libreoffice/program/classes/ScriptProviderForBeanShell.jar ${pkgdir}/usr/lib/libreoffice/program/classes/
+	mv ${srcdir}/fakeinstall/usr/lib/libreoffice/program/services/scriptproviderforbeanshell.rdb ${pkgdir}/usr/lib/libreoffice/program/services/
+}
+
+package_libreoffice-scripting-javascript() {
+
+ pkgdesc="LibreOffice extension - Enables support for scripts in JavaScript"
+ depends=('libreoffice-common' 'java-environment')
+ groups=('libreoffice-extensions')
+
+	install -dm755 ${pkgdir}/usr/lib/libreoffice/program/{classes,services}
+	mv ${srcdir}/fakeinstall/usr/lib/libreoffice/program/classes/{js.jar,ScriptProviderForJavaScript.jar} ${pkgdir}/usr/lib/libreoffice/program/classes/
+	mv ${srcdir}/fakeinstall/usr/lib/libreoffice/program/services/scriptproviderforjavascript.rdb ${pkgdir}/usr/lib/libreoffice/program/services/
+}
+
+package_libreoffice-extension-scripting-python() {
+
+ pkgdesc="LibreOffice extension - Enables support for scripts in Python"
+ depends=('libreoffice-common' 'python2')
+ groups=('libreoffice-extensions')
+
+	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
+	unzip -q ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/script-provider-for-python.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/script-provider-for-python
+}
diff --git a/testing/libreoffice/PKGBUILD.36 b/testing/libreoffice/PKGBUILD.36
new file mode 100644
index 000000000..6a3d0fe0d
--- /dev/null
+++ b/testing/libreoffice/PKGBUILD.36
@@ -0,0 +1,700 @@
+# $Id: PKGBUILD 160067 2012-05-29 19:20:54Z andyrtr $
+# Maintainer: AndyRTR <andyrtr@archlinux.org>
+
+pkgbase="libreoffice"
+pkgname=('libreoffice-common'
+	'libreoffice-base'
+	'libreoffice-calc'
+	'libreoffice-draw'
+	'libreoffice-gnome'
+	'libreoffice-impress'
+	'libreoffice-kde4'
+	'libreoffice-math'
+	'libreoffice-sdk'
+	'libreoffice-sdk-doc'
+	'libreoffice-writer'
+	'libreoffice-en-US'
+	'libreoffice-postgresql-connector'
+	'libreoffice-extension-pdfimport'
+	'libreoffice-extension-presenter-screen'
+	'libreoffice-extension-presentation-minimizer'
+	'libreoffice-extension-report-builder'
+	'libreoffice-scripting-beanshell'
+	'libreoffice-scripting-javascript'
+	'libreoffice-extension-scripting-python') # svn up -r 142692 (last one with all extensions built
+_LOver=3.6.0.0.beta2
+pkgver=3.6.0beta2
+pkgrel=1
+arch=('i686' 'x86_64')
+license=('LGPL3')
+url="http://www.libreoffice.org/"
+makedepends=( # makedepends
+             'sane' 'perl-archive-zip' 'zip' 'unzip' 'unixodbc' 'hsqldb-java' 'boost'
+             'apache-ant' 'gperf' 'poppler>=0.18.0' 'kdelibs' 'gconf' 'cppunit'
+             'beanshell'  'vigra' 'clucene' 'junit' 'libmythes' 'libwpg' 'imagemagick'
+             'mesa' 'gstreamer0.10-base' 'java-environment' 'postgresql-libs' 'doxygen'
+              #'saxon' - currently broken 
+             # the runtime dependencies
+             "curl>=7.20.0" "hunspell>=1.2.8" "python2>=2.7" 'libwpd>=0.9.2' 'libwps' 'libxaw' "neon>=0.28.6"
+             'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'dbus-glib' 'libxslt' 'librsvg' "icu>=49.1" 
+             'redland' 'hyphen' 'lpsolve' 'gcc-libs' 'sh'  'libtextcat' 'graphite' 
+             'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'gtk2' 'orbit2' 'translate-toolkit' 'xdg-utils'
+	         'ttf-dejavu') # to satisfy regression tests
+
+# http://download.documentfoundation.org/mirrors/all.html
+# http://wiki.documentfoundation.org/Mirrors
+
+#_mirror="http://download.documentfoundation.org/libreoffice/src/${pkgver}"
+_mirror="http://dev-builds.libreoffice.org/pre-releases/src"
+_additional_source_url="http://dev-www.libreoffice.org/src"
+_additional_source_url2="http://dev-www.libreoffice.org/extern"
+source=(${_mirror}/${pkgbase}-{core,help,translations}-${_LOver}.tar.xz
+	${_additional_source_url}/18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz
+	${_additional_source_url}/48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz
+	${_additional_source_url}/90010e213dd25648e70f0cc12f8fed55-libvisio-0.0.17.tar.bz2
+	${_additional_source_url}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
+	${_additional_source_url}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
+	${_additional_source_url}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
+	${_additional_source_url}/fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz
+	${_additional_source_url}/ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip
+	${_additional_source_url}/2a177023f9ea8ec8bd00837605c5df1b-jakarta-tomcat-5.0.30-src.tar.gz
+	${_additional_source_url}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
+	${_additional_source_url}/3c219630e4302863a9a83d0efde889db-commons-logging-1.1.1-src.tar.gz
+	${_additional_source_url}/2ae988b339daec234019a7066f96733e-commons-lang-2.3-src.tar.gz
+	${_additional_source_url}/2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz
+	${_additional_source_url}/af3c3acf618de6108d65fcdc92b492e1-commons-codec-1.3-src.tar.gz
+	${_additional_source_url}/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
+	${_additional_source_url}/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
+	${_additional_source_url}/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip
+	${_additional_source_url}/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip
+	${_additional_source_url}/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip
+	${_additional_source_url}/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip
+	${_additional_source_url}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
+	${_additional_source_url}/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip
+	${_additional_source_url}/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
+	${_additional_source_url}/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
+	${_additional_source_url}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
+	${_additional_source_url}/0ff7d225d087793c8c2c680d77aac3e7-mdds_0.5.3.tar.bz2
+	${_additional_source_url}/6097739c841f671cb21332b9cc593ae7-libexttextcat-3.3.1.tar.bz2
+	${_additional_source_url}/ce31ac7b92cb5e66459f67213bbb6168-libcmis-0.2.2.tar.gz
+	${_additional_source_url}/ce5a1def34578b75959ac31210f031f6-libcdr-0.0.8.tar.bz2
+	${_additional_source_url2}/185d60944ea767075d27247c3162b3bc-unowinreg.dll
+	buildfix.diff
+	libreoffice-common.sh libreoffice-common.csh)
+noextract=(90010e213dd25648e70f0cc12f8fed55-libvisio-0.0.17.tar.bz2
+	18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz
+	48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz
+	185d60944ea767075d27247c3162b3bc-unowinreg.dll
+	0ff7d225d087793c8c2c680d77aac3e7-mdds_0.5.3.tar.bz2
+	ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip
+	798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
+	1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
+	fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz
+	6097739c841f671cb21332b9cc593ae7-libexttextcat-3.3.1.tar.bz2
+	ce31ac7b92cb5e66459f67213bbb6168-libcmis-0.2.2.tar.gz
+	35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
+	2a177023f9ea8ec8bd00837605c5df1b-jakarta-tomcat-5.0.30-src.tar.gz
+	a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
+	3c219630e4302863a9a83d0efde889db-commons-logging-1.1.1-src.tar.gz
+	2ae988b339daec234019a7066f96733e-commons-lang-2.3-src.tar.gz
+	2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz
+	af3c3acf618de6108d65fcdc92b492e1-commons-codec-1.3-src.tar.gz
+	eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
+	39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
+	3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip
+	97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip
+	f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip
+	8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip
+	d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
+	3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip
+	ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
+	db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
+	ce5a1def34578b75959ac31210f031f6-libcdr-0.0.8.tar.bz2
+	ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip)
+md5sums=('97183afb02576d5542a1eda3f29f9517'
+         '3368bc1adfa9e7d6d6f3ce2cee9e164e'
+         '7191e46a3f48ad7a7d5a21e985790e6a'
+         '18f577b374d60b3c760a3a3350407632'
+         '48d647fbd8ef8889e5a7f422c1bfda94'
+         '90010e213dd25648e70f0cc12f8fed55'
+         '1f24ab1d39f4a51faf22244c94a6203f'
+         '35c94d2df8893241173de1d16b6034c0'
+         '798b2ffdc8bcfe7bca2cf92b62caf685'
+         'fdb27bfe2dbe2e7b57ae194d9bf36bab'
+         'ada24d37d8d638b3d8a9985e80bc2978'
+         '2a177023f9ea8ec8bd00837605c5df1b'
+         'a7983f859eafb2677d7ff386a023bc40'
+         '3c219630e4302863a9a83d0efde889db'
+         '2ae988b339daec234019a7066f96733e'
+         '2c9b0f83ed5890af02c0df1c1776f39b'
+         'af3c3acf618de6108d65fcdc92b492e1'
+         'eeb2c7ddf0d302fba4bfc6e97eac9624'
+         '39bb3fcea1514f1369fcfc87542390fd'
+         '3404ab6b1792ae5f16bbd603bd1e1d03'
+         '97b2d4dba862397f446b217e2b623e71'
+         'f94d9870737518e3b597f9265f4e9803'
+         '8ce2fcd72becf06c41f7201d15373ed9'
+         'd8bd5eed178db6e2b18eeed243f85aa8'
+         '3bdf40c0d199af31923e900d082ca2dd'
+         'ace6ab49184e329db254e454a010f56d'
+         'db60e4fde8dd6d6807523deb71ee34dc'
+         'ba2930200c9f019c2d93a8c88c651a0f'
+         '0ff7d225d087793c8c2c680d77aac3e7'
+         '6097739c841f671cb21332b9cc593ae7'
+         'ce31ac7b92cb5e66459f67213bbb6168'
+         'ce5a1def34578b75959ac31210f031f6'
+         '185d60944ea767075d27247c3162b3bc'
+         '234e91ac65945ce1ab1e3839780e90f7'
+         'f0e72d0e1bc93a50a3aa9d31350b156c'
+         '867c682b45f477f916786e00c45d7ab7')
+
+build() {
+
+	unset J2REDIR; unset J2SDKDIR; unset JAVA_HOME; unset CLASSPATH; unset EXTRAOPTS
+	[ -z "${JAVA_HOME}" ] && . /etc/profile.d/jdk.sh || . /etc/profile.d/openjdk6.sh
+	[ -z "${ANT_HOME}" ] && . /etc/profile.d/apache-ant.sh
+
+        cd ${srcdir}/libreoffice-core-$_LOver
+
+	# move external sources into place
+	mkdir ${srcdir}/ext_sources &&	pushd ${srcdir}/ext_sources
+	for source in "${noextract[@]}"; do
+	  ln -s ${srcdir}/$source .
+	done
+	popd
+	
+	ln -s ../libreoffice-help-$_LOver/helpcontent2 .
+	ln -s ../libreoffice-translations-$_LOver/translations .
+
+	# buildfixes & bugfixes
+    patch -Np1 -i ${srcdir}/buildfix.diff
+    
+	#use the CFLAGS but remove the LibO overridden ones
+	for i in $CFLAGS; do
+		case "$i" in
+			-O?|-pipe|-Wall|-g|-fexceptions) continue;;
+		esac
+        ARCH_FLAGS="$ARCH_FLAGS $i"
+	done
+	
+	# python2 fix
+	export PYTHON=python2
+
+	autoconf -f
+
+	# non-SMP test build
+	export MAKEFLAGS="-j1"
+	#./configure --with-build-version="${_LOver} ArchLinux build-${pkgrel}" --with-vendor="ArchLinux" \
+#	touch autogen.lastrun
+	./autogen.sh --with-build-version="${_LOver} ArchLinux build-${pkgrel}" --with-vendor="ArchLinux" \
+		--with-unix-wrapper="libreoffice" \
+		--enable-split-app-modules \
+		--with-max-jobs=${MAKEFLAGS/-j/} --with-num-cpus=${MAKEFLAGS/-j/} \
+		--with-external-tar="${srcdir}/ext_sources" \
+		--disable-fetch-external \
+		--prefix=/usr --exec-prefix=/usr --sysconfdir=/etc \
+		--libdir=/usr/lib --mandir=/usr/share/man \
+		--disable-verbose \
+		--with-lang="" \
+		--enable-crashdump \
+		--enable-dbus \
+		--enable-evolution2\
+		--enable-gio\
+		--disable-gnome-vfs\
+		--disable-kde\
+		--enable-kde4\
+		--enable-gtk3 \
+		--enable-lockdown\
+		--enable-mergelibs \
+		--enable-opengl \
+		--enable-odk\
+		--enable-ext-scripting-beanshell \
+		--enable-ext-scripting-javascript \
+		--disable-ext-mysql-connector \
+		--with-system-mysql \
+		--enable-librsvg=system \
+		--without-fonts\
+		--without-afms\
+		--without-ppds\
+		--without-system-libwps\
+		--without-system-libcdr \
+		--without-system-mdds\
+		--without-myspell-dicts \
+		--without-system-libvisio \
+		--without-system-libcmis \
+		--without-system-libexttextcat \
+		--without-system-jfreereport \
+		--without-system-apache-commons \
+		--with-system-dicts \
+		--with-external-dict-dir=/usr/share/hunspell \
+		--with-external-hyph-dir=/usr/share/hyphen \
+		--with-external-thes-dir=/usr/share/mythes \
+		--with-system-beanshell \
+		--with-system-cppunit\
+		--with-system-graphite\
+		--with-system-libwpg \
+		--with-system-libwps \
+		--with-system-redland\
+		--without-system-saxon\
+		--disable-mozilla \
+		--without-system-mozilla \
+		--without-system-mozilla-headers \
+		--with-ant-home="/usr/share/apache-ant"\
+		--with-system-boost\
+		--with-system-cairo\
+		--with-system-libs\
+		--with-system-mythes\
+		--with-system-headers\
+		--with-system-hsqldb \
+		--with-alloc=system\
+		--without-system-clucene\
+		--with-java-target-version=1.5 \
+		$EXTRAOPTS
+
+#		--disable-ext-lightproof \
+
+
+#--with-install-dirname="${pkgbase}" 
+#		--enable-cairo\
+#		--with-system-libtextcat \
+#		--with-external-libtextcat-data \
+#--enable-split-opt-features Split file lists for some optional features, .e.g. pyuno, testtool
+
+#--with-servlet-api-jar=JARFILE 
+# see http://qa.openoffice.org/issues/show_bug.cgi?id=110136
+#		--with-system-saxon\
+#		--with-saxon-jar=/usr/share/java/saxon/saxon9he.jar\
+
+	touch src.downloaded
+	#./download
+	make
+	# fake installation to create split file lists
+	mkdir $srcdir/fakeinstall
+	make DESTDIR=${srcdir}/fakeinstall distro-pack-install
+}
+
+#check() {
+#	cd ${srcdir}/build
+#	make check
+#}
+
+package_libreoffice-common() {
+
+ pkgdesc="common files for LibreOffice - a productivity suite that is compatible with other major office suites"
+ install=libreoffice-common.install
+ depends=('libreoffice-langpack' "hunspell>=1.2.8" "python2>=2.7" "neon>=0.28.6"
+          'nspr' 'libsm' 'redland' 'hyphen' 'graphite' "icu>=49.1" 
+          'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'xdg-utils' 'orbit2')
+          #'saxon'
+ optdepends=('libreoffice-langpack: additional language support'
+             'java-runtime:     adds java support'
+             'libcups:          adds printing support'
+             'gconf:            adds additional gnome support'
+             'nss:              adds support for signed files/macros'
+             'pstoedit:         translates PostScript and PDF graphics into other vector formats'
+             'poppler:          for shipped pdfimport extension'
+             'libmythes:        for use in thesaurus'
+             'beanshell:        interactive java -- good for prototyping /macros'
+             'vigra:            C++ computer vision library, usable in Basebmp'
+             'libmspack:        library for Microsoft compression formats for use in FontOOo'
+             'libwpg:           library for importing and converting Corel WordPerfect(tm) Graphics images'
+             'clucene:          full-text search engine library needed in the help section'
+             'sane:             for scanner access'
+             'unixodbc:         adds ODBC database support'
+             'gstreamer0.10-base: + some gstr-plugins to support multimedia content, e.g. in impress')
+ backup=(etc/libreoffice/sofficerc
+         etc/libreoffice/bootstraprc
+         etc/libreoffice/psprint.conf)
+ groups=('libreoffice')
+ provides=('go-openoffice')
+ conflicts=('go-openoffice')
+ replaces=('go-openoffice' 'openoffice-base' 'libreoffice')
+
+ # create directories from *list.txt file
+ for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/common_list.txt`; do
+   install -dm755 ${pkgdir}/${directory/\%dir/}
+ done
+ # install files into the pkg from fakeinstall dir
+ for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/common_list.txt`; do
+   dirname=`dirname $file`
+   # check if directory has been already been created - some are missing like manpages
+   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
+   # mv file from fakeinstall to pkgdir
+   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
+ done
+ 
+ # put configuration files into place
+ install -dm755 ${pkgdir}/etc/libreoffice
+ install -m644 ${pkgdir}/usr/lib/libreoffice/program/{bootstraprc,sofficerc} ${pkgdir}/etc/libreoffice/
+ install -m644 ${pkgdir}/usr/lib/libreoffice/share/psprint/psprint.conf ${pkgdir}/etc/libreoffice/
+ # install dummy links to make them found by LibO
+ cd ${pkgdir}/usr/lib/libreoffice/program/
+ ln -vsf /etc/libreoffice/{bootstraprc,sofficerc} .
+ cd ${pkgdir}/usr/lib/libreoffice/share/psprint/
+ ln -vsf /etc/libreoffice/psprint.conf .
+ 
+ # set python-uno PYTHON path
+ install -dm755 ${pkgdir}/etc/profile.d
+ install -m755 ${srcdir}/libreoffice-common.{sh,csh} ${pkgdir}/etc/profile.d/
+ 
+ # move bash-completion files to its new place
+ install -dm755 ${pkgdir}/usr/share/bash-completion/completions
+ mv ${pkgdir}/etc/bash_completion.d/libreoffice.sh ${pkgdir}/usr/share/bash-completion/completions/libreoffice.sh
+ rm -rf ${pkgdir}/etc/bash_completion.d
+ 
+ # some files would conflict
+ rm -f ${pkgdir}/usr/lib/libreoffice/program/classes/ScriptProviderForJavaScript.jar
+ rm -f ${pkgdir}/usr/lib/libreoffice/program/classes/js.jar
+ rm -f ${pkgdir}/usr/lib/libreoffice/program/services/scriptproviderforjavascript.rdb
+}
+
+package_libreoffice-base() {
+ pkgdesc="GUI Spreadsheet Applicationdatabase front-end for LibreOffice. Allows creation and management of databases through a GUI."
+ install=libreoffice-base.install
+ depends=('libreoffice-common' 'hsqldb-java')
+ optdepends=('libreoffice-postgresql-connector')
+ backup=()
+ groups=('libreoffice')
+ replaces=('libreoffice')
+
+ # create directories from *list.txt file
+ for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/base_list.txt`; do
+   install -dm755 ${pkgdir}/${directory/\%dir/}
+ done
+ # install files into the pkg from fakeinstall dir
+ for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/base_list.txt`; do
+   dirname=`dirname $file`
+   # check if directory has been already been created - some are missing like manpages
+   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
+   # mv file from fakeinstall to pkgdir
+   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
+ done
+}
+
+package_libreoffice-postgresql-connector() {
+ pkgdesc="A PostgreSQL connector for the database front-end for LibreOffice"
+ depends=('libreoffice-base' 'postgresql-libs')
+ groups=('libreoffice')
+ replaces=('libreoffice')
+
+ # no file-list so far
+ install -dm755 ${pkgdir}/usr/lib/libreoffice/program/services
+ install -m644 ${srcdir}/fakeinstall/usr/lib/libreoffice/program/postgresql-sdbc.uno.so ${pkgdir}/usr/lib/libreoffice/program
+ install -m644 ${srcdir}/fakeinstall/usr/lib/libreoffice/program/postgresql-sdbc-impl.uno.so ${pkgdir}/usr/lib/libreoffice/program
+ install -m644 ${srcdir}/fakeinstall/usr/lib/libreoffice/program/postgresql-sdbc.ini ${pkgdir}/usr/lib/libreoffice/program
+ install -m644 ${srcdir}/fakeinstall/usr/lib/libreoffice/program/services/postgresql-sdbc.rdb ${pkgdir}/usr/lib/libreoffice/program/services
+ install -dm755 ${pkgdir}/usr/lib/libreoffice/share/registry
+ install -m644 ${srcdir}/fakeinstall/usr/lib/libreoffice/share/registry/postgresqlsdbc.xcd ${pkgdir}/usr/lib/libreoffice/share/registry
+ 
+ # create directories from *list.txt file
+# for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/postgresql_list.txt`; do
+#   install -dm755 ${pkgdir}/${directory/\%dir/}
+# done
+# # install files into the pkg from fakeinstall dir
+# for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/postgresql_list.txt`; do
+#   dirname=`dirname $file`
+#   # check if directory has been already been created - some are missing like manpages
+#   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
+#   # mv file from fakeinstall to pkgdir
+#   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
+# done
+}
+
+package_libreoffice-calc() {
+ pkgdesc="Spreadsheet application for LibreOffice."
+ install=libreoffice-calc.install
+ depends=('libreoffice-common' 'lpsolve' )
+ optdepends=()
+ backup=()
+ groups=('libreoffice')
+ replaces=('libreoffice')
+ 
+ # create directories from *list.txt file
+ for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/calc_list.txt`; do
+   install -dm755 ${pkgdir}/${directory/\%dir/}
+ done
+ # install files into the pkg from fakeinstall dir
+ for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/calc_list.txt`; do
+   dirname=`dirname $file`
+   # check if directory has been already been created - some are missing like manpages
+   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
+   # mv file from fakeinstall to pkgdir
+   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
+ done
+}
+
+package_libreoffice-draw() {
+ pkgdesc="Drawing Application for LibreOffice."
+ install=libreoffice-draw.install
+ depends=('libreoffice-common')
+ optdepends=()
+ backup=()
+ groups=('libreoffice')
+ replaces=('libreoffice')
+ 
+ # create directories from *list.txt file
+ for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/draw_list.txt`; do
+   install -dm755 ${pkgdir}/${directory/\%dir/}
+ done
+ # install files into the pkg from fakeinstall dir
+ for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/draw_list.txt`; do
+   dirname=`dirname $file`
+   # check if directory has been already been created - some are missing like manpages
+   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
+   # mv file from fakeinstall to pkgdir
+   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
+ done
+}
+
+package_libreoffice-gnome() {
+ pkgdesc="Plug-in for LibreOffice that enables integration into the Gnome and other gtk desktop environment."
+ depends=('libreoffice-common' 'gtk2' 'gtk3') #'dbus-glib'
+ optdepends=()
+ backup=()
+ groups=('libreoffice')
+ 
+ # create directories from *list.txt file
+ for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/gnome_list.txt`; do
+   install -dm755 ${pkgdir}/${directory/\%dir/}
+ done
+ # install files into the pkg from fakeinstall dir
+ for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/gnome_list.txt`; do
+   dirname=`dirname $file`
+   # check if directory has been already been created - some are missing like manpages
+   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
+   # mv file from fakeinstall to pkgdir
+   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
+ done
+}
+
+package_libreoffice-impress() {
+ pkgdesc="Presentation Application for LibreOffice."
+ install=libreoffice-impress.install
+ depends=('libreoffice-common')
+ optdepends=('mesa:             for the OGLTrans extension')
+ backup=()
+ groups=('libreoffice')
+ replaces=('libreoffice')
+ 
+ # create directories from *list.txt file
+ for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/impress_list.txt`; do
+   install -dm755 ${pkgdir}/${directory/\%dir/}
+ done
+ # install files into the pkg from fakeinstall dir
+ for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/impress_list.txt`; do
+   dirname=`dirname $file`
+   # check if directory has been already been created - some are missing like manpages
+   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
+   # mv file from fakeinstall to pkgdir
+   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
+ done
+}
+
+package_libreoffice-kde4() {
+ pkgdesc="Plug-in for LibreOffice that enables integration into the KDE4 desktop environment."
+ depends=('libreoffice-common' 'kdelibs')
+ optdepends=()
+ backup=()
+ groups=('libreoffice')
+ 
+ # create directories from *list.txt file
+ for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/kde4_list.txt`; do
+   install -dm755 ${pkgdir}/${directory/\%dir/}
+ done
+ # install files into the pkg from fakeinstall dir
+ for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/kde4_list.txt`; do
+   dirname=`dirname $file`
+   # check if directory has been already been created - some are missing like manpages
+   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
+   # mv file from fakeinstall to pkgdir
+   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
+ done
+}
+
+package_libreoffice-math() {
+ pkgdesc="Equation Editor Applicationfor LibreOffice."
+ depends=('libreoffice-common')
+ optdepends=()
+ backup=()
+ groups=('libreoffice')
+ replaces=('libreoffice')
+ 
+ # create directories from *list.txt file
+ for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/math_list.txt`; do
+   install -dm755 ${pkgdir}/${directory/\%dir/}
+ done
+ # install files into the pkg from fakeinstall dir
+ for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/math_list.txt`; do
+   dirname=`dirname $file`
+   # check if directory has been already been created - some are missing like manpages
+   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
+   # mv file from fakeinstall to pkgdir
+   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
+ done
+}
+
+package_libreoffice-sdk() {
+ pkgdesc="Software Development Kit for LibreOffice."
+ depends=('libreoffice-common' 'gcc-libs' 'sh' 'make' 'zip' 'gcc' 'java-environment')
+ optdepends=()
+ backup=()
+ groups=('libreoffice')
+ 
+ # create directories from *list.txt file
+ for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/sdk_list.txt`; do
+   install -dm755 ${pkgdir}/${directory/\%dir/}
+ done
+ # install files into the pkg from fakeinstall dir
+ for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/sdk_list.txt`; do
+   dirname=`dirname $file`
+   # check if directory has been already been created - some are missing like manpages
+   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
+   # mv file from fakeinstall to pkgdir
+   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
+ done
+ 
+  # fix environment path to keep compatibility with openjdk6 and openjdk7
+  #sed -i -e "s:\/usr\/lib\/jvm\/java-7-openjdk:\$J2SDKDIR:"          /usr/lib/libreoffice/sdk/setsdkenv_unix.{sh,csh}
+  sed -i -e "s:\/usr\/lib\/jvm\/java-7-openjdk:\$J2SDKDIR:" ${pkgdir}/usr/lib/libreoffice/sdk/setsdkenv_unix.{sh,csh}
+}
+
+package_libreoffice-sdk-doc() {
+ pkgdesc="Software Development Kit documentation for LibreOffice"
+ depends=('libreoffice-common' 'libreoffice-sdk')
+ optdepends=()
+ backup=()
+ groups=('libreoffice')
+ 
+ # create directories from *list.txt file
+ for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/sdk_doc_list.txt`; do
+   install -dm755 ${pkgdir}/${directory/\%dir/}
+ done
+ # install files into the pkg from fakeinstall dir
+ for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/sdk_doc_list.txt`; do
+   dirname=`dirname $file`
+   # check if directory has been already been created - some are missing like manpages
+   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
+   # mv file from fakeinstall to pkgdir
+   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
+ done
+
+ #fix permissions
+ find ${pkgdir}/usr/lib/libreoffice/sdk/examples -type f -exec chmod -x {} \;
+}
+
+package_libreoffice-writer() {
+ pkgdesc="Word Processor Applicationfor LibreOffice."
+ install=libreoffice-writer.install
+ depends=('libreoffice-common' 'libwpd>=0.9.2' 'libwps' 'libxml2')
+ optdepends=('libwpg:           library for importing and converting Corel WordPerfect(tm) Graphics images')
+ backup=()
+ groups=('libreoffice')
+ replaces=('libreoffice')
+
+ # create directories from *list.txt file
+ for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/writer_list.txt`; do
+   install -dm755 ${pkgdir}/${directory/\%dir/}
+ done
+ # install files into the pkg from fakeinstall dir
+ for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/writer_list.txt`; do
+   dirname=`dirname $file`
+   # check if directory has been already been created - some are missing like manpages
+   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
+   # mv file from fakeinstall to pkgdir
+   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
+ done
+}
+
+package_libreoffice-en-US() {
+  pkgdesc="English (US) language pack for LibreOffice"
+  #arch=('any')
+  provides=('openoffice-en-US' 'libreoffice-langpack')
+  replaces=(openoffice-en-US)
+  conflicts=(openoffice-en-US)
+
+ # create directories from *list.txt file
+ for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/lang_en_US_list.txt`; do
+   install -dm755 ${pkgdir}/${directory/\%dir/}
+ done
+ # install files into the pkg from fakeinstall dir
+ for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/lang_en_US_list.txt`; do
+   dirname=`dirname $file`
+   # check if directory has been already been created - some are missing like manpages
+   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
+   # mv file from fakeinstall to pkgdir
+   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
+ done
+}
+
+package_libreoffice-extension-pdfimport() {
+
+ pkgdesc="This extension allows you to import and modify PDF documents"
+ depends=('libreoffice-common' 'poppler')
+ groups=('libreoffice-extensions')
+
+	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
+	unzip -q ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/pdfimport.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/pdfimport
+}
+
+package_libreoffice-extension-presenter-screen() {
+
+ pkgdesc="This extension provides more control over your slide show presentation, such as the ability to see the upcoming slide, the slide notes, and a presentation timer whereas the audience see only the current slide"
+ depends=('libreoffice-common' 'java-environment')
+ groups=('libreoffice-extensions')
+
+	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
+	unzip -q ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/presenter-screen.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/presenter-screen
+}
+
+package_libreoffice-extension-presentation-minimizer() {
+
+ pkgdesc="This extension reduce the file size of the current presentation"
+ depends=('libreoffice-common' 'gcc-libs')
+ groups=('libreoffice-extensions')
+
+	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
+	unzip -q ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/presentation-minimizer.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/presentation-minimizer
+}
+
+package_libreoffice-extension-report-builder() {
+
+ pkgdesc="This extension creates smart-looking database reports"
+ #arch=('any')
+ depends=('libreoffice-common' 'java-environment')
+ groups=('libreoffice-extensions')
+
+	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
+	unzip -q ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/report-builder.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/report-builder
+}
+
+package_libreoffice-scripting-beanshell() {
+
+ pkgdesc="LibreOffice extension - Enables support for scripts in BeanShell"
+ depends=('libreoffice-common' 'java-environment')
+ groups=('libreoffice-extensions')
+
+	install -dm755 ${pkgdir}/usr/lib/libreoffice/program/{classes,services}
+	mv ${srcdir}/fakeinstall/usr/lib/libreoffice/program/classes/ScriptProviderForBeanShell.jar ${pkgdir}/usr/lib/libreoffice/program/classes/
+	mv ${srcdir}/fakeinstall/usr/lib/libreoffice/program/services/scriptproviderforbeanshell.rdb ${pkgdir}/usr/lib/libreoffice/program/services/
+}
+
+package_libreoffice-scripting-javascript() {
+
+ pkgdesc="LibreOffice extension - Enables support for scripts in JavaScript"
+ depends=('libreoffice-common' 'java-environment')
+ groups=('libreoffice-extensions')
+
+	install -dm755 ${pkgdir}/usr/lib/libreoffice/program/{classes,services}
+	mv ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/{js.jar,ScriptProviderForJavaScript.jar} ${pkgdir}/usr/lib/libreoffice/program/classes/
+	mv ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/xml/scriptproviderforjavascript.rdb ${pkgdir}/usr/lib/libreoffice/program/services/
+}
+
+package_libreoffice-extension-scripting-python() {
+
+ pkgdesc="LibreOffice extension - Enables support for scripts in Python"
+ depends=('libreoffice-common' 'python2')
+ groups=('libreoffice-extensions')
+
+	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
+	unzip -q ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/script-provider-for-python.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/script-provider-for-python
+}
diff --git a/testing/libreoffice/buildfix.diff b/testing/libreoffice/buildfix.diff
new file mode 100644
index 000000000..327b10bb1
--- /dev/null
+++ b/testing/libreoffice/buildfix.diff
@@ -0,0 +1,12 @@
+--- libreoffice-core-3.5.99.1/sdext/Module_sdext.mk	2012-06-07 13:57:10.000000000 +0200
++++ libreoffice-core-3.5.99.1/sdext/Module_sdext.mk.new	2012-06-09 18:21:03.376024873 +0200
+@@ -49,9 +49,6 @@
+     StaticLibrary_pdfimport_s \
+ ))
+ 
+-$(eval $(call gb_Module_add_check_targets,sdext,\
+-    CppunitTest_pdfimport \
+-))
+ endif
+ 
+ ifeq ($(ENABLE_PRESENTER_SCREEN),YES)
diff --git a/testing/libreoffice/buildfix_icu49.diff b/testing/libreoffice/buildfix_icu49.diff
new file mode 100644
index 000000000..7a774dee0
--- /dev/null
+++ b/testing/libreoffice/buildfix_icu49.diff
@@ -0,0 +1,42 @@
+https://bugs.gentoo.org/show_bug.cgi?id=410307
+
+--- i18npool/source/breakiterator/data/char_in.txt
++++ i18npool/source/breakiterator/data/char_in.txt
+@@ -15,7 +15,7 @@
+ $CR          = [\p{Grapheme_Cluster_Break = CR}];
+ $LF          = [\p{Grapheme_Cluster_Break = LF}];
+ $Control     = [\p{Grapheme_Cluster_Break = Control}];
+-$Prepend     = [\p{Grapheme_Cluster_Break = Prepend}];
++# $Prepend     = [\p{Grapheme_Cluster_Break = Prepend}];
+ $Extend      = [\p{Grapheme_Cluster_Break = Extend}];
+ $SpacingMark = [\p{Grapheme_Cluster_Break = SpacingMark}];
+ $BengaliLetter = [\u0985-\u09B9 \u09CE \u09DC-\u09E1 \u09F0-\u09F1];
+@@ -72,7 +72,7 @@
+ [^$Control $CR $LF] $Extend;
+ 
+ [^$Control $CR $LF] $SpacingMark;
+-$Prepend [^$Control $CR $LF];
++# $Prepend [^$Control $CR $LF];
+ 
+ 
+ ## -------------------------------------------------
+@@ -94,7 +94,7 @@
+ 
+ $Extend      [^$Control $CR $LF];
+ $SpacingMark [^$Control $CR $LF];
+-[^$Control $CR $LF] $Prepend;
++# [^$Control $CR $LF] $Prepend;
+ 
+ 
+ ## -------------------------------------------------
+--- i18npool/source/breakiterator/data/char.txt
++++ i18npool/source/breakiterator/data/char.txt
+@@ -16,7 +16,7 @@
+ $CR          = [\p{Grapheme_Cluster_Break = CR}];
+ $LF          = [\p{Grapheme_Cluster_Break = LF}];
+ $Control     = [\p{Grapheme_Cluster_Break = Control}];
+-$Prepend     = [\p{Grapheme_Cluster_Break = Prepend}];
++# $Prepend     = [\p{Grapheme_Cluster_Break = Prepend}];
+ $Extend      = [\p{Grapheme_Cluster_Break = Extend}];
+ $SpacingMark = [\p{Grapheme_Cluster_Break = SpacingMark}];
+ # True Indic wants to move by syllables. Break up SpacingMark. This based on Unicode 6.0 data
diff --git a/testing/libreoffice/fix_broken_hebrew_wordwrapping.diff b/testing/libreoffice/fix_broken_hebrew_wordwrapping.diff
new file mode 100644
index 000000000..ba4850c77
--- /dev/null
+++ b/testing/libreoffice/fix_broken_hebrew_wordwrapping.diff
@@ -0,0 +1,360 @@
+From 20c24114143d6d38774b56a142fd4ae05094308e Mon Sep 17 00:00:00 2001
+From: Caolán McNamara <caolanm@redhat.com>
+Date: Sun, 13 May 2012 21:41:30 +0000
+Subject: Resolves: fdo#49849 implement Unicode 6.1 hebrew line breaking rules
+
+i.e.  sync with svn diff -c 31071
+http://source.icu-project.org/repos/icu/icu/trunk/source/data/brkitr/line.txt
+
+Change-Id: I I I41b3d02f1a0da3b83a9684f29d466660d96254c6
+---
+diff --git a/i18npool/qa/cppunit/test_breakiterator.cxx b/i18npool/qa/cppunit/test_breakiterator.cxx
+index 14051d4..ffd590c 100644
+--- a/i18npool/qa/cppunit/test_breakiterator.cxx
++++ b/i18npool/qa/cppunit/test_breakiterator.cxx
+@@ -42,6 +42,7 @@
+ #include <unotest/bootstrapfixturebase.hxx>
+ 
+ #include <rtl/strbuf.hxx>
++#include <rtl/ustrbuf.hxx>
+ 
+ #include <string.h>
+ 
+@@ -58,6 +59,9 @@ public:
+     void testWeak();
+     void testAsian();
+     void testThai();
++#if TODO
++    void testNorthernThai();
++#endif
+ 
+     CPPUNIT_TEST_SUITE(TestBreakIterator);
+     CPPUNIT_TEST(testLineBreaking);
+@@ -71,6 +71,9 @@
+     CPPUNIT_TEST(testWeak);
+     CPPUNIT_TEST(testAsian);
+     CPPUNIT_TEST(testThai);
++#if TODO
++    CPPUNIT_TEST(testNorthernThai);
++#endif
+     CPPUNIT_TEST_SUITE_END();
+ 
+ private:
+@@ -80,28 +83,46 @@
+     uno::Reference<i18n::XBreakIterator> m_xBreak;
+ };
+ 
+-//See https://bugs.freedesktop.org/show_bug.cgi?id=31271 for motivation
+ void TestBreakIterator::testLineBreaking()
+ {
+-    ::rtl::OUString aTest1(RTL_CONSTASCII_USTRINGPARAM("(some text here)"));
+-
+     i18n::LineBreakHyphenationOptions aHyphOptions;
+     i18n::LineBreakUserOptions aUserOptions;
+     lang::Locale aLocale;
+ 
+-    aLocale.Language = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("en"));
+-    aLocale.Country = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("US"));
+-
++    //See https://bugs.freedesktop.org/show_bug.cgi?id=31271
+     {
+-        //Here we want the line break to leave text here) on the next line
+-        i18n::LineBreakResults aResult = m_xBreak->getLineBreak(aTest1, strlen("(some tex"), aLocale, 0, aHyphOptions, aUserOptions);
+-        CPPUNIT_ASSERT_MESSAGE("Expected a break at the the start of the word", aResult.breakIndex == 6);
++         ::rtl::OUString aTest(RTL_CONSTASCII_USTRINGPARAM("(some text here)"));
++
++        aLocale.Language = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("en"));
++        aLocale.Country = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("US"));
++
++        {
++            //Here we want the line break to leave text here) on the next line
++            i18n::LineBreakResults aResult = m_xBreak->getLineBreak(aTest, strlen("(some tex"), aLocale, 0, aHyphOptions, aUserOptions);
++            CPPUNIT_ASSERT_MESSAGE("Expected a break at the the start of the word", aResult.breakIndex == 6);
++        }
++
++        {
++            //Here we want the line break to leave "here)" on the next line
++            i18n::LineBreakResults aResult = m_xBreak->getLineBreak(aTest, strlen("(some text here"), aLocale, 0, aHyphOptions, aUserOptions);
++            CPPUNIT_ASSERT_MESSAGE("Expected a break at the the start of the word", aResult.breakIndex == 11);
++        }
+     }
+ 
++    //See https://bugs.freedesktop.org/show_bug.cgi?id=49849
+     {
+-        //Here we want the line break to leave "here)" on the next line
+-        i18n::LineBreakResults aResult = m_xBreak->getLineBreak(aTest1, strlen("(some text here"), aLocale, 0, aHyphOptions, aUserOptions);
+-        CPPUNIT_ASSERT_MESSAGE("Expected a break at the the start of the word", aResult.breakIndex == 11);
++        const sal_Unicode HEBREW1[] = { 0x05DE, 0x05D9, 0x05DC, 0x05D9, 0x5DD };
++        ::rtl::OUString aWord(HEBREW1, SAL_N_ELEMENTS(HEBREW1));
++        ::rtl::OUString aTest(rtl::OUStringBuffer(aWord).append(' ').append(aWord).makeStringAndClear());
++
++        aLocale.Language = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("he"));
++        aLocale.Country = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IL"));
++
++        {
++            //Here we want the line break to happen at the whitespace
++            i18n::LineBreakResults aResult = m_xBreak->getLineBreak(aTest, aTest.getLength()-1, aLocale, 0, aHyphOptions, aUserOptions);
++            CPPUNIT_ASSERT_MESSAGE("Expected a break at the the start of the word", aResult.breakIndex == aWord.getLength()+1);
++        }
+     }
+ }
+ 
+@@ -295,27 +320,29 @@ void TestBreakIterator::testThai()
+     aLocale.Language = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("th"));
+     aLocale.Country = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TH"));
+ 
+-    i18n::Boundary aBounds;
+-    {
+-        const sal_Unicode THAI1[] = { 0x0E01, 0x0E38, 0x0E2B, 0x0E25, 0x0E32, 0x0E1A };
+-        ::rtl::OUString aTest(THAI1, SAL_N_ELEMENTS(THAI1));
+-        aBounds = m_xBreak->getWordBoundary(aTest, 0, aLocale,
+-            i18n::WordType::DICTIONARY_WORD, true);
+-        CPPUNIT_ASSERT_MESSAGE("Should skip full word",
+-            aBounds.startPos == 0 && aBounds.endPos == aTest.getLength());
+-    }
++    const sal_Unicode THAI1[] = { 0x0E01, 0x0E38, 0x0E2B, 0x0E25, 0x0E32, 0x0E1A };
++    ::rtl::OUString aTest(THAI1, SAL_N_ELEMENTS(THAI1));
++    i18n::Boundary aBounds = m_xBreak->getWordBoundary(aTest, 0, aLocale,
++        i18n::WordType::DICTIONARY_WORD, true);
++    CPPUNIT_ASSERT_MESSAGE("Should skip full word",
++        aBounds.startPos == 0 && aBounds.endPos == aTest.getLength());
++}
+ 
+-#ifdef TODO
+-    {
+-        const sal_Unicode NORTHERN_THAI1[] = { 0x0E01, 0x0E38, 0x0E4A, 0x0E2B, 0x0E25, 0x0E32, 0x0E1A };
+-        ::rtl::OUString aTest(NORTHERN_THAI1, SAL_N_ELEMENTS(NORTHERN_THAI1));
+-        aBounds = m_xBreak->getWordBoundary(aTest, 0, aLocale,
+-            i18n::WordType::DICTIONARY_WORD, true);
+-        CPPUNIT_ASSERT_MESSAGE("Should skip full word",
+-            aBounds.startPos == 0 && aBounds.endPos == aTest.getLength());
+-    }
+-#endif
++#if TODO
++void TestBreakIterator::testNorthernThai()
++{
++    lang::Locale aLocale;
++    aLocale.Language = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("nod"));
++    aLocale.Country = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TH"));
++
++    const sal_Unicode NORTHERN_THAI1[] = { 0x0E01, 0x0E38, 0x0E4A, 0x0E2B, 0x0E25, 0x0E32, 0x0E1A };
++    ::rtl::OUString aTest(NORTHERN_THAI1, SAL_N_ELEMENTS(NORTHERN_THAI1));
++    i18n::Boundary aBounds = m_xBreak->getWordBoundary(aTest, 0, aLocale,
++        i18n::WordType::DICTIONARY_WORD, true);
++    CPPUNIT_ASSERT_MESSAGE("Should skip full word",
++        aBounds.startPos == 0 && aBounds.endPos == aTest.getLength());
+ }
++#endif
+ 
+ void TestBreakIterator::setUp()
+ {
+diff --git a/i18npool/source/breakiterator/data/README b/i18npool/source/breakiterator/data/README
+new file mode 100644
+index 0000000..8d7598d
+--- a/dev/null
++++ b/i18npool/source/breakiterator/data/README
+@@ -0,0 +1,12 @@
++The originals of these come from svn checkout
++http://source.icu-project.org/repos/icu/icu/trunk/source/data/brkitr they no
++longer appear in the icu tarballs, but are in icu's svn
++
++At various stages these copies have been customized and are not horribly out of
++sync. It unclear which diffs from the base versions are deliberate and which
++are now accidental :-(
++
++We need to review the various issues referenced in the commits that caused
++custimizations and see if they're still relevant or not, write regression tests
++for them, if any are still relavant then apply the changes back on top of the
++latest versions.
+diff --git a/i18npool/source/breakiterator/data/line.txt b/i18npool/source/breakiterator/data/line.txt
+index cbabee6..91c8f3d 100644
+--- a/i18npool/source/breakiterator/data/line.txt
++++ b/i18npool/source/breakiterator/data/line.txt
+@@ -61,11 +61,13 @@ $BB = [:LineBreak =  Break_Before:];
+ $BK = [:LineBreak =  Mandatory_Break:];
+ $B2 = [:LineBreak =  Break_Both:];
+ $CB = [:LineBreak =  Contingent_Break:];
++$CJ = [:LineBreak =  Conditional_Japanese_Starter:];
+ $CL = [:LineBreak =  Close_Punctuation:] ;
+ $CM = [:LineBreak =  Combining_Mark:];
+ $CR = [:LineBreak =  Carriage_Return:];
+ $EX = [:LineBreak =  Exclamation:];
+ $GL = [:LineBreak =  Glue:];
++$HL = [:LineBreak =  Hebrew_Letter:];
+ $HY = [:LineBreak =  Hyphen:];
+ $H2 = [:LineBreak =  H2:];
+ $H3 = [:LineBreak =  H3:];
+@@ -77,7 +79,7 @@ $JV = [:LineBreak =  JV:];
+ $JT = [:LineBreak =  JT:];
+ $LF = [:LineBreak =  Line_Feed:];
+ $NL = [:LineBreak =  Next_Line:];
+-$NS = [:LineBreak =  Nonstarter:];
++$NS = [[:LineBreak =  Nonstarter:] $CJ];
+ $NU = [:LineBreak =  Numeric:];
+ $OP = [[:LineBreak =  Open_Punctuation:] - $DG];
+ $PO = [:LineBreak =  Postfix_Numeric:];
+@@ -118,6 +120,7 @@ $B2cm = $B2 $CM*;
+ $CLcm = $CL $CM*;
+ $EXcm = $EX $CM*;
+ $GLcm = $GL $CM*;
++$HLcm = $HL $CM*;
+ $HYcm = $HY $CM*;
+ $H2cm = $H2 $CM*;
+ $H3cm = $H3 $CM*;
+@@ -150,6 +153,7 @@ $B2 $CM+;
+ $CL $CM+;
+ $EX $CM+;
+ $GL $CM+;
++$HL $CM+;
+ $HY $CM+;
+ $H2 $CM+;
+ $H3 $CM+;
+@@ -186,7 +190,7 @@ $CANT_CM = [ $SP $BK $CR $LF $NL $ZW $CM];       # Bases that can't take CMs
+ #            so for this one case we need to manually list out longer sequences.
+ #
+ $AL_FOLLOW_NOCM = [$BK $CR $LF $NL $ZW $SP];
+-$AL_FOLLOW_CM   = [$CL $EX $IS $SY $WJ $GL $QU $BA $HY $NS $IN $NU $ALPlus $OP];
++$AL_FOLLOW_CM   = [$CL $EX $HL $IS $SY $WJ $GL $QU $BA $HY $NS $IN $NU $ALPlus $OP];
+ $AL_FOLLOW      = [$AL_FOLLOW_NOCM $AL_FOLLOW_CM];
+ 
+ 
+@@ -320,8 +324,13 @@ $LB20NonBreaks $CM* ($BAcm | $HYcm | $NScm);
+ $BBcm [^$CB];                                  #  $BB  x
+ $BBcm $LB20NonBreaks $CM*;
+ 
++# LB 21a Don't break after Hebrew + Hyphen
++#   HL (HY | BA) x
++#  
++$HLcm ($HYcm | $BAcm) [^$CB]?;
++
+ # LB 22
+-$ALcm    $INcm;
++($ALcm | $HLcm) $INcm;
+ $CM+     $INcm;     #  by rule 10, any otherwise unattached CM behaves as AL
+ $IDcm    $INcm;
+ $INcm    $INcm;
+@@ -331,16 +340,18 @@ $NUcm    $INcm;
+ # $LB 23
+ $IDcm  $POcm;
+ $ALcm  $NUcm;       # includes $LB19
++$HLcm  $NUcm;
+ $CM+   $NUcm;       # Rule 10, any otherwise unattached CM behaves as AL
+ $NUcm  $ALcm;
++$NUcm  $HLcm;
+ 
+ #
+ # LB 24
+ #
+ $PRcm $IDcm;
+ $ALcm $PRcm;
+-$PRcm $ALcm;
+-$POcm $ALcm;
++$PRcm ($ALcm | $HLcm);
++$POcm ($ALcm | $HLcm);
+ 
+ #
+ # LB 25   Numbers.
+@@ -361,8 +372,8 @@ $PRcm ($JLcm | $JVcm | $JTcm | $H2cm | $H3cm);
+ 
+ # LB 28   Do not break between alphabetics
+ #
+-$ALcm $ALcm;
+-$CM+ $ALcm;      # The $CM+ is from rule 10, and unattached CM is treated as AL
++($ALcm | $HLcm) ($ALcm | $HLcm);
++$CM+ ($ALcm | $HLcm);      # The $CM+ is from rule 10, an unattached CM is treated as AL
+ 
+ # LB 29
+ $IScm ($ALcm | $NUcm);
+@@ -371,11 +382,9 @@ $IScm ($ALcm | $NUcm);
+ # Rule 30   Do not break between letters, numbers or ordinary symbols
+ #           and opening or closing punctuation
+ #
+-($ALcm | $NUcm) $OPcm;
++($ALcm | $HLcm | $NUcm) $OPcm;
+ $CM+ $OPcm;
+-$CLcm ($ALcm | $NUcm);
+-
+-
++$CLcm ($ALcm | $HLcm | $NUcm);
+ 
+ #
+ #  Reverse Rules.
+@@ -391,6 +400,7 @@ $CM+ $B2;
+ $CM+ $CL;
+ $CM+ $EX;
+ $CM+ $GL;
++$CM+ $HL;
+ $CM+ $HY;
+ $CM+ $H2;
+ $CM+ $H3;
+@@ -544,24 +554,25 @@ $CM* ($BA | $HY | $NS) $CM* [$LB20NonBreaks-$CM];     #  . x (BA | HY | NS)
+ $CM* [$LB20NonBreaks-$CM] $CM* $BB;                   #  BB x .
+ [^$CB] $CM* $BB;                                      # 
+ 
+-
++# LB21a
++[^$CB] $CM* ($HY | $BA) $CM* $HL;
+ 
+ # LB 22
+-$CM* $IN $CM* $ALPlus;
++$CM* $IN $CM* ($ALPlus | $HL);
+ $CM* $IN $CM* $ID;
+ $CM* $IN $CM* $IN;
+ $CM* $IN $CM* $NU;
+ 
+ # LB 23
+ $CM* $PO $CM* $ID;
+-$CM* $NU $CM* $ALPlus;
+-$CM* $ALPlus $CM* $NU;
++$CM* $NU $CM* ($ALPlus | $HL);
++$CM* ($ALPlus | $HL) $CM* $NU;
+ 
+ # LB 24
+ $CM* $ID $CM* $PR;
+ $CM* $PR $CM* $ALPlus;
+-$CM* $ALPlus $CM* $PR;
+-$CM* $ALPlus $CM* $PO;
++$CM* ($ALPlus | $HL) $CM* $PR;
++$CM* ($ALPlus | $HL) $CM* $PO;
+ 
+ $CM* $ALPlus $CM* ($IS | $SY | $HY)+ / $SP;
+ $CM* $NU+ $CM* $HY+ / $SP;
+@@ -580,15 +591,14 @@ $CM* $PO $CM* ($H3 | $H2 | $JT | $JV | $JL);
+ $CM* ($H3 | $H2 | $JT | $JV | $JL) $CM* $PR;
+ 
+ # LB 28
+-$CM* $ALPlus $CM* $ALPlus;
+-
++$CM* ($ALPlus | $HL) $CM* ($ALPlus | $HL);
+ 
+ # LB 29
+ $CM* ($NU | $ALPlus) $CM* $IS+ [^$SP];
+ 
+ # LB 30
+-$CM* $OP $CM* ($NU | $ALPlus);
+-$CM* ($NU | $ALPlus) $CM* ($CL | $SY)+ [^$SP];
++$CM* $OP $CM* ($ALPlus | $HL | $NU);
++$CM* ($ALPlus | $HL | $NU) $CM* ($CL | $SY)+ [^$SP];
+ 
+ 
+ ## -------------------------------------------------
+@@ -609,6 +619,9 @@ $SP+ $CM* $QU;
+ $SP+ $CM* $CL;
+ $SP+ $CM* $B2;
+ 
++# LB 21
++$CM* ($HY | $BA) $CM* $HL;
++
+ # LB 18
+ ($CM* ($IS | $SY))+ $CM* $NU;
+ $CL $CM* ($NU | $IS | $SY);
+@@ -629,6 +642,6 @@ $dictionary $dictionary;
+ #  turn off rule chaining.  We don't want to move more
+ #  than necessary.
+ #
+-[$CM $OP $QU $CL $B2 $PR $HY $SP $dictionary]+ [^$CM $OP $QU $CL $B2 $PR $HY $dictionary];
++[$CM $OP $QU $CL $B2 $PR $HY $BA $SP $dictionary]+ [^$CM $OP $QU $CL $B2 $PR $HY $BA $dictionary];
+ $dictionary $dictionary;
+ 
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/testing/libreoffice/libreoffice-base.install b/testing/libreoffice/libreoffice-base.install
new file mode 100644
index 000000000..80312d4a6
--- /dev/null
+++ b/testing/libreoffice/libreoffice-base.install
@@ -0,0 +1,11 @@
+post_install() {
+  update-desktop-database -q
+}
+
+post_upgrade() {
+  update-desktop-database -q
+}
+
+post_remove() {
+  update-desktop-database -q
+}
diff --git a/testing/libreoffice/libreoffice-calc.install b/testing/libreoffice/libreoffice-calc.install
new file mode 100644
index 000000000..80312d4a6
--- /dev/null
+++ b/testing/libreoffice/libreoffice-calc.install
@@ -0,0 +1,11 @@
+post_install() {
+  update-desktop-database -q
+}
+
+post_upgrade() {
+  update-desktop-database -q
+}
+
+post_remove() {
+  update-desktop-database -q
+}
diff --git a/testing/libreoffice/libreoffice-common.csh b/testing/libreoffice/libreoffice-common.csh
new file mode 100644
index 000000000..af31d4432
--- /dev/null
+++ b/testing/libreoffice/libreoffice-common.csh
@@ -0,0 +1 @@
+#setenv PYTHONPATH ${PYTHONPATH}:/usr/lib/libreoffice/program
diff --git a/testing/libreoffice/libreoffice-common.install b/testing/libreoffice/libreoffice-common.install
new file mode 100644
index 000000000..e66b66f3d
--- /dev/null
+++ b/testing/libreoffice/libreoffice-common.install
@@ -0,0 +1,47 @@
+post_install() {
+
+xdg-icon-resource forceupdate --theme hicolor
+update-desktop-database -q
+update-mime-database usr/share/mime > /dev/null 2>&1
+
+echo " * see https://wiki.archlinux.org/index.php/LibreOffice"
+echo "-------------------------------------------------------------------"
+echo "LibreOffice has been split into several packages:"
+echo "- libreoffice-common"
+echo "- libreoffice-{base,calc,draw,impress,math,writer} - frontend applications"
+echo "- libreoffice-{gnome,kde4} - desktop integration plugins"
+echo "- libreoffice-{sdk,sdk-doc} - add-on and doc for programming using"
+echo "                              the LibreOffice APIs and for creating"
+echo "                              extensions (UNO components)."
+echo "-------------------------------------------------------------------"
+echo " * you need to install at least one libreoffice-langpack"
+echo " * you may want to pacman -Ss libreoffice-extensions"
+echo "   to see what additional extensions are prepared to install"
+echo " * it's recommended to install {hunspell,mythes,hyphen}-xx pkg
+         for spell checking"
+echo " * make sure you have installed some ttf font (ttf-dejavu recommended)"
+}
+
+post_upgrade() {
+#  post_install $1
+xdg-icon-resource forceupdate --theme hicolor
+update-desktop-database -q
+update-mime-database usr/share/mime > /dev/null 2>&1
+  if [ "`vercmp $2 3.4.2rc1`" -lt 0 ]; then
+    # important upgrade notice
+    echo "LibreOffice has been split into several packages:"
+    echo "- libreoffice-common"
+    echo "- libreoffice-{base,calc,draw,impress,math,writer} - frontend applications"
+    echo "- libreoffice-{gnome,kde4} - desktop integration plugins"
+    echo "- libreoffice-{sdk,sdk-doc} - add-on and doc for programming using"
+    echo "                              the LibreOffice APIs and for creating"
+    echo "                              extensions (UNO components)."
+    echo "Now you need to install at least one libreoffice-langpack!"
+  fi
+}
+
+post_remove() {
+update-desktop-database -q
+xdg-icon-resource forceupdate --theme hicolor
+update-mime-database usr/share/mime > /dev/null 2>&1
+}
diff --git a/testing/libreoffice/libreoffice-common.sh b/testing/libreoffice/libreoffice-common.sh
new file mode 100644
index 000000000..ee405b1aa
--- /dev/null
+++ b/testing/libreoffice/libreoffice-common.sh
@@ -0,0 +1 @@
+#export PYTHONPATH="$PYTHONPATH:/usr/lib/libreoffice/program"
diff --git a/testing/libreoffice/libreoffice-draw.install b/testing/libreoffice/libreoffice-draw.install
new file mode 100644
index 000000000..80312d4a6
--- /dev/null
+++ b/testing/libreoffice/libreoffice-draw.install
@@ -0,0 +1,11 @@
+post_install() {
+  update-desktop-database -q
+}
+
+post_upgrade() {
+  update-desktop-database -q
+}
+
+post_remove() {
+  update-desktop-database -q
+}
diff --git a/testing/libreoffice/libreoffice-impress.install b/testing/libreoffice/libreoffice-impress.install
new file mode 100644
index 000000000..80312d4a6
--- /dev/null
+++ b/testing/libreoffice/libreoffice-impress.install
@@ -0,0 +1,11 @@
+post_install() {
+  update-desktop-database -q
+}
+
+post_upgrade() {
+  update-desktop-database -q
+}
+
+post_remove() {
+  update-desktop-database -q
+}
diff --git a/testing/libreoffice/libreoffice-writer.install b/testing/libreoffice/libreoffice-writer.install
new file mode 100644
index 000000000..80312d4a6
--- /dev/null
+++ b/testing/libreoffice/libreoffice-writer.install
@@ -0,0 +1,11 @@
+post_install() {
+  update-desktop-database -q
+}
+
+post_upgrade() {
+  update-desktop-database -q
+}
+
+post_remove() {
+  update-desktop-database -q
+}
diff --git a/testing/poppler/PKGBUILD b/testing/poppler/PKGBUILD
new file mode 100644
index 000000000..77d2c39e8
--- /dev/null
+++ b/testing/poppler/PKGBUILD
@@ -0,0 +1,80 @@
+# $Id: PKGBUILD 162295 2012-06-24 19:25:19Z foutrelis $
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+
+pkgbase=poppler
+pkgname=('poppler' 'poppler-glib' 'poppler-qt')
+pkgver=0.20.1
+pkgrel=1
+arch=(i686 x86_64)
+license=('GPL')
+makedepends=('libjpeg' 'gcc-libs' 'cairo' 'fontconfig' 'openjpeg' 'gtk2' 'qt' 'pkgconfig' 'lcms' 'gobject-introspection')
+options=('!libtool' '!emptydirs')
+url="http://poppler.freedesktop.org/"
+_testtag=0d2bfd4af4c76a3bac27ccaff793d9129df7b57a
+source=(http://poppler.freedesktop.org/${pkgbase}-${pkgver}.tar.gz
+        http://cgit.freedesktop.org/poppler/test/snapshot/test-${_testtag}.tar.bz2)
+md5sums=('a61e3b844061f5324512a16d6d16984c'
+         '9dc64c254a31e570507bdd4ad4ba629a')
+
+build() {
+  cd "${srcdir}/${pkgbase}-${pkgver}"
+  sed -i -e '/AC_PATH_XTRA/d' configure.ac
+
+  autoreconf -fi
+
+  ./configure --prefix=/usr --sysconfdir=/etc \
+      --localstatedir=/var --disable-static \
+      --enable-cairo-output \
+      --enable-xpdf-headers \
+      --enable-libjpeg --enable-zlib \
+      --enable-poppler-qt4 \
+      --enable-poppler-glib
+  make
+}
+
+check() {
+  cd "${srcdir}"
+  ln -sf test-${_testtag} test
+  cd ${pkgbase}-${pkgver}
+  LANG=en_US.UTF8 make check
+}
+
+package_poppler() {
+  pkgdesc="PDF rendering library based on xpdf 3.0"
+  depends=('libjpeg' 'gcc-libs' 'cairo' 'fontconfig' 'openjpeg' 'lcms' 'poppler-data')
+  conflicts=("poppler-qt3<${pkgver}")
+
+  cd "${srcdir}/${pkgbase}-${pkgver}"
+  sed -e 's/^glib_subdir =.*/glib_subdir =/' \
+      -e 's/^qt4_subdir =.*/qt4_subdir =/' -i Makefile
+  make DESTDIR="${pkgdir}" install
+
+  rm -f "${pkgdir}"/usr/lib/pkgconfig/poppler-{glib,qt4}.pc
+}
+
+package_poppler-glib() {
+  pkgdesc="Poppler glib bindings"
+  depends=("poppler=${pkgver}" 'glib2')
+
+  cd "${srcdir}/${pkgbase}-${pkgver}/poppler"
+  make DESTDIR="${pkgdir}" install-libLTLIBRARIES
+  cd "${srcdir}/${pkgbase}-${pkgver}/glib"
+  make DESTDIR="${pkgdir}" install
+  install -m755 -d "${pkgdir}/usr/lib/pkgconfig"
+  install -m644 ../poppler-glib.pc "${pkgdir}/usr/lib/pkgconfig/"
+  rm -f "${pkgdir}"/usr/lib/libpoppler.*
+  rm -f "${pkgdir}/usr/bin/poppler-glib-demo"
+}
+
+package_poppler-qt() {
+  pkgdesc="Poppler Qt bindings"
+  depends=("poppler=${pkgver}" 'qt')
+
+  cd "${srcdir}/${pkgbase}-${pkgver}/poppler"
+  make DESTDIR="${pkgdir}" install-libLTLIBRARIES
+  cd "${srcdir}/${pkgbase}-${pkgver}/qt4"
+  make DESTDIR="${pkgdir}" install
+  install -m755 -d "${pkgdir}/usr/lib/pkgconfig"
+  install -m644 ../poppler-qt4.pc "${pkgdir}/usr/lib/pkgconfig/"
+  rm -f "${pkgdir}"/usr/lib/libpoppler.*
+}
diff --git a/testing/psmisc/PKGBUILD b/testing/psmisc/PKGBUILD
index 95529b6a4..d08830b1d 100644
--- a/testing/psmisc/PKGBUILD
+++ b/testing/psmisc/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 162032 2012-06-19 01:20:04Z eric $
+# $Id: PKGBUILD 162304 2012-06-24 20:02:02Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=psmisc
-pkgver=22.18
+pkgver=22.19
 pkgrel=1
 pkgdesc="Miscellaneous procfs tools"
 arch=('i686' 'x86_64')
@@ -11,7 +11,7 @@ license=('GPL')
 groups=('base')
 depends=('ncurses')
 source=(http://downloads.sourceforge.net/psmisc/${pkgname}-${pkgver}.tar.gz)
-sha1sums=('964f6daa0950b128a0840d9df4dc0b671730a83c')
+sha1sums=('4c8fb774449f966f78c4c6e1d77d1a24b4187410')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/testing/systemd/PKGBUILD b/testing/systemd/PKGBUILD
index 367b26834..2d9323250 100644
--- a/testing/systemd/PKGBUILD
+++ b/testing/systemd/PKGBUILD
@@ -4,7 +4,7 @@
 pkgbase=systemd
 pkgname=('systemd' 'libsystemd' 'systemd-tools' 'systemd-sysvcompat')
 pkgver=185
-pkgrel=2
+pkgrel=3
 arch=('i686' 'x86_64')
 url="http://www.freedesktop.org/wiki/Software/systemd"
 license=('GPL2' 'LGPL2.1' 'MIT')
@@ -132,6 +132,7 @@ package_systemd() {
   mv "$pkgdir"/etc/udev etc
   mv "$pkgdir"/etc/{binfmt,modules-load,sysctl,tmpfiles}.d etc
   mv "$pkgdir"/usr/bin/udevadm usr/bin
+  mv "$pkgdir"/usr/bin/systemd-machine-id-setup usr/bin
   mv "$pkgdir"/usr/lib/pkgconfig usr/lib
   mv "$pkgdir"/usr/lib/systemd/systemd-udevd usr/lib/systemd
   mv "$pkgdir"/usr/lib/systemd/system/systemd-udev* usr/lib/systemd/system
@@ -147,7 +148,7 @@ package_systemd() {
   mv "$pkgdir"/usr/share/gtk-doc/html/{g,lib}udev usr/share/gtk-doc/html
   mv "$pkgdir"/usr/share/man/man7/udev.7 usr/share/man/man7
   mv "$pkgdir"/usr/share/man/man8/{systemd-{tmpfiles,udevd},udevadm}.8 usr/share/man/man8
-  mv "$pkgdir"/usr/share/man/man1/systemd-{ask-password,delta,detect-virt}.1 usr/share/man/man1
+  mv "$pkgdir"/usr/share/man/man1/systemd-{ask-password,delta,detect-virt,machine-id-setup}.1 usr/share/man/man1
   mv "$pkgdir"/usr/share/man/man5/{binfmt,modules-load,sysctl,tmpfiles}.d.5 usr/share/man/man5
   mv "$pkgdir"/usr/share/man/man5/{hostname,{vconsole,locale}.conf}.5 usr/share/man/man5
   mv "$pkgdir"/usr/bin/systemd-{ask-password,delta,detect-virt,tmpfiles,tty-ask-password-agent} usr/bin
diff --git a/testing/systemd/systemd-tools.install b/testing/systemd/systemd-tools.install
index c1c19d15d..7d0bd8790 100644
--- a/testing/systemd/systemd-tools.install
+++ b/testing/systemd/systemd-tools.install
@@ -1,7 +1,13 @@
 # arg 1:  the new package version
 # arg 2:  the old package version
 
+post_install() {
+  systemd-machine-id-setup
+}
+
 post_upgrade() {
+  systemd-machine-id-setup
+
   if [ "$(vercmp $2 174)" -lt 0 ]; then
     echo " * We now use upstream rules for assigning devices to the 'disk', 'optical',"
     echo "   'scanner' and 'video' groups. Beware of any changes."
diff --git a/testing/systemd/systemd.install b/testing/systemd/systemd.install
index cb82b6c8c..e369f094d 100644
--- a/testing/systemd/systemd.install
+++ b/testing/systemd/systemd.install
@@ -5,8 +5,6 @@ sd_booted() {
 }
 
 post_install() {
-  systemd-machine-id-setup
-
   # enable getty@tty1 by default, but don't track the file
   systemctl enable getty@.service
 
@@ -15,8 +13,6 @@ post_install() {
 }
 
 post_upgrade() {
-  systemd-machine-id-setup
-
   if sd_booted; then
     # we moved the binary in 44-2 to /usr, so a reexec leads to a
     # coredump. refuse this reexec and warn the user that they should
diff --git a/testing/sysvinit/0001-simplify-writelog.patch b/testing/sysvinit/0001-simplify-writelog.patch
new file mode 100644
index 000000000..cc28f14bc
--- /dev/null
+++ b/testing/sysvinit/0001-simplify-writelog.patch
@@ -0,0 +1,126 @@
+From 5577552eb1344ddd661893564b1e628f8edcf13d Mon Sep 17 00:00:00 2001
+From: Florian Pritz <bluewind@xinu.at>
+Date: Fri, 15 Jun 2012 16:41:52 +0200
+Subject: [PATCH 1/2] simplify writelog()
+
+All we do is prepend the date and remove \r. We don't handle color
+codes, but the user can just cat the log file in a terminal and it will
+interpret the codes correctly.
+
+Signed-off-by: Florian Pritz <bluewind@xinu.at>
+---
+ bootlogd.c |   76 +++++++++++++++++-------------------------------------------
+ 1 file changed, 21 insertions(+), 55 deletions(-)
+
+diff --git a/bootlogd.c b/bootlogd.c
+index 570d382..e36e261 100644
+--- a/bootlogd.c
++++ b/bootlogd.c
+@@ -68,11 +68,6 @@ int didnl = 1;
+ int createlogfile = 0;
+ int syncalot = 0;
+ 
+-struct line {
+-	char buf[256];
+-	int pos;
+-} line;
+-
+ /*
+  *	Console devices as listed on the kernel command line and
+  *	the mapping to actual devices in /dev
+@@ -351,63 +346,34 @@ int consolename(char *res, int rlen)
+  */
+ void writelog(FILE *fp, unsigned char *ptr, int len)
+ {
+-	time_t		t;
+-	char		*s;
+-	char		tmp[8];
+-	int		olen = len;
+-	int		dosync = 0;
+-	int		tlen;
+-
+-	while (len > 0) {
+-		tmp[0] = 0;
+-		if (didnl) {
++	int dosync = 0;
++	int i;
++	static int first_run = 1;
++
++	for (i = 0; i < len; i++) {
++		int ignore = 0;
++
++		/* prepend date to every line */
++		if (*(ptr-1) == '\n' || first_run) {
++			time_t t;
++			char *s;
+ 			time(&t);
+ 			s = ctime(&t);
+ 			fprintf(fp, "%.24s: ", s);
+-			didnl = 0;
++			dosync = 1;
++			first_run = 0;
+ 		}
+-		switch (*ptr) {
+-			case 27: /* ESC */
+-				strcpy(tmp, "^[");
+-				break;
+-			case '\r':
+-				line.pos = 0;
+-				break;
+-			case 8: /* ^H */
+-				if (line.pos > 0) line.pos--;
+-				break;
+-			case '\n':
+-				didnl = 1;
+-				dosync = 1;
+-				break;
+-			case '\t':
+-				line.pos += (line.pos / 8 + 1) * 8;
+-				if (line.pos >= (int)sizeof(line.buf))
+-					line.pos = sizeof(line.buf) - 1;
+-				break;
+-			case  32 ... 127:
+-			case 161 ... 255:
+-				tmp[0] = *ptr;
+-				tmp[1] = 0;
+-				break;
+-			default:
+-				sprintf(tmp, "\\%03o", *ptr);
+-				break;
+-		}
+-		ptr++;
+-		len--;
+ 
+-		tlen = strlen(tmp);
+-		if (tlen && (line.pos + tlen < (int)sizeof(line.buf))) {
+-			memcpy(line.buf + line.pos, tmp, tlen);
+-			line.pos += tlen;
++		if (*ptr == '\r') {
++			ignore = 1;
+ 		}
+-		if (didnl) {
+-			fprintf(fp, "%s\n", line.buf);
+-			memset(&line, 0, sizeof(line));
++
++		if (!ignore) {
++			fwrite(ptr, sizeof(char), 1, fp);
+ 		}
+-	}
+ 
++		ptr++;
++	}
+ 	if (dosync) {
+ 		fflush(fp);
+ 		if (syncalot) {
+@@ -415,7 +381,7 @@ void writelog(FILE *fp, unsigned char *ptr, int len)
+ 		}
+ 	}
+ 
+-	outptr += olen;
++	outptr += len;
+ 	if (outptr >= endptr)
+ 		outptr = ringbuf;
+ 
+-- 
+1.7.10.4
+
diff --git a/testing/sysvinit/0002-remove-ansi-escape-codes-from-log-file.patch b/testing/sysvinit/0002-remove-ansi-escape-codes-from-log-file.patch
new file mode 100644
index 000000000..89b3280df
--- /dev/null
+++ b/testing/sysvinit/0002-remove-ansi-escape-codes-from-log-file.patch
@@ -0,0 +1,80 @@
+From 8d0022d9540112a92ce8d88c91c4ac10bad8c9ef Mon Sep 17 00:00:00 2001
+From: Florian Pritz <bluewind@xinu.at>
+Date: Sun, 24 Jun 2012 15:49:51 +0200
+Subject: [PATCH 2/2] remove ansi escape codes from log file
+
+References: https://en.wikipedia.org/wiki/ANSI_escape_code
+
+Signed-off-by: Florian Pritz <bluewind@xinu.at>
+---
+ bootlogd.c |   45 +++++++++++++++++++++++++++++++++++++++++++--
+ 1 file changed, 43 insertions(+), 2 deletions(-)
+
+diff --git a/bootlogd.c b/bootlogd.c
+index e36e261..88e610d 100644
+--- a/bootlogd.c
++++ b/bootlogd.c
+@@ -349,6 +349,7 @@ void writelog(FILE *fp, unsigned char *ptr, int len)
+ 	int dosync = 0;
+ 	int i;
+ 	static int first_run = 1;
++	static int inside_esc = 0;
+ 
+ 	for (i = 0; i < len; i++) {
+ 		int ignore = 0;
+@@ -364,10 +365,50 @@ void writelog(FILE *fp, unsigned char *ptr, int len)
+ 			first_run = 0;
+ 		}
+ 
+-		if (*ptr == '\r') {
+-			ignore = 1;
++		/* remove escape sequences, but do it in a way that allows us to stop
++		 * in the middle in case the string was cut off */
++		if (inside_esc == 1) {
++			/* first '[' is special because if we encounter it again, it should be considered the final byte */
++			if (*ptr == '[') {
++				/* multi char sequence */
++				ignore = 1;
++				inside_esc = 2;
++			} else {
++				/* single char sequence */
++				if (*ptr >= 64 && *ptr <= 95) {
++					ignore = 1;
++				}
++				inside_esc = 0;
++			}
++		} else if (inside_esc == 2) {
++			switch (*ptr) {
++				case '0' ... '9': /* intermediate chars of escape sequence */
++				case ';':
++				case 32 ... 47:
++					if (inside_esc) {
++						ignore = 1;
++					}
++					break;
++				case 64 ... 126: /* final char of escape sequence */
++					if (inside_esc) {
++						ignore = 1;
++						inside_esc = 0;
++					}
++					break;
++			}
++		} else {
++			switch (*ptr) {
++				case '\r':
++					ignore = 1;
++					break;
++				case 27: /* ESC */
++					ignore = 1;
++					inside_esc = 1;
++					break;
++			}
+ 		}
+ 
++
+ 		if (!ignore) {
+ 			fwrite(ptr, sizeof(char), 1, fp);
+ 		}
+-- 
+1.7.10.4
+
diff --git a/testing/sysvinit/PKGBUILD b/testing/sysvinit/PKGBUILD
index 1355d31b4..5c5abe74d 100644
--- a/testing/sysvinit/PKGBUILD
+++ b/testing/sysvinit/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 161862 2012-06-15 23:09:01Z bluewind $
+# $Id: PKGBUILD 162300 2012-06-24 19:35:10Z bluewind $
 # Maintainer: Eric Belanger <eric@archlinux.org>
 
 pkgname=sysvinit
 pkgver=2.88
-pkgrel=5
+pkgrel=6
 pkgdesc="Linux System V Init"
 arch=('i686' 'x86_64')
 url="http://savannah.nongnu.org/projects/sysvinit"
@@ -12,15 +12,18 @@ groups=('base')
 depends=('util-linux' 'coreutils' 'glibc' 'awk')
 install=sysvinit.install
 source=(http://download.savannah.gnu.org/releases/sysvinit/${pkgname}-${pkgver}dsf.tar.bz2
-        "simplify-writelog.patch")
+        "0001-simplify-writelog.patch"
+        "0002-remove-ansi-escape-codes-from-log-file.patch")
 sha1sums=('f2ca149df1314a91f3007cccd7a0aa47d990de26'
-          'd970e44e8b5574b3b6be709c7682845a974ed1ed')
+          '326112c8a9bd24cb45bd4bb2f958a25f0ac4773d'
+          'bbecfa7dfa45ac7c37ed8ac59fb53f6a85064b32')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}dsf"
 
   # FS#30005
-  patch -p1 -d "src" -i "${srcdir}/simplify-writelog.patch"
+  patch -p1 -d "src" -i "${srcdir}/0001-simplify-writelog.patch"
+  patch -p1 -d "src" -i "${srcdir}/0002-remove-ansi-escape-codes-from-log-file.patch"
 
   make 
 }
diff --git a/testing/xournal/PKGBUILD b/testing/xournal/PKGBUILD
new file mode 100644
index 000000000..4ef0d66a8
--- /dev/null
+++ b/testing/xournal/PKGBUILD
@@ -0,0 +1,27 @@
+# $Id: PKGBUILD 162297 2012-06-24 19:25:38Z foutrelis $
+# Maintainer: Gaetan Bisson <bisson@archlinux.org>
+
+pkgname=xournal
+pkgver=0.4.6
+pkgrel=2
+pkgdesc='Notetaking and sketching application'
+url='http://xournal.sourceforge.net/'
+license=('GPL')
+arch=('i686' 'x86_64')
+depends=('libgnomecanvas' 'poppler-glib' 'shared-mime-info' 'desktop-file-utils' 'hicolor-icon-theme')
+optdepends=('ghostscript: import PS/PDF files as bitmap backgrounds')
+source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz")
+sha1sums=('4ebe79e3df7155d2a09c341537a639ac2332d4c8')
+
+install=install
+
+build() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	./configure --prefix=/usr LIBS='-lm -lz'
+	make
+}
+
+package() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	make DESTDIR="${pkgdir}" install desktop-install
+}
diff --git a/testing/xournal/install b/testing/xournal/install
new file mode 100644
index 000000000..dfcb68374
--- /dev/null
+++ b/testing/xournal/install
@@ -0,0 +1,13 @@
+post_install() {
+	update-desktop-database -q
+	gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+	update-mime-database usr/share/mime &>/dev/null
+}
+
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+	post_install
+}