Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el

Conflicts: community/arpack/PKGBUILD community/ruby-cairo/PKGBUILD community/smem/PKGBUILD extra/pyqt/PKGBUILD extra/xerces-c/PKGBUILD
author: Michał Masłowski <mtjm@mtjm.eu> 2013-03-08 10:04:45 +0100
committer: Michał Masłowski <mtjm@mtjm.eu> 2013-03-08 10:04:45 +0100
commit: c4e52ac02d1d223901ab48f78d9835fda60acd0c (patch)
tree: 0d9401c37c51deb92a3b16c0eeaeb45404334f1b
parent: 0e48701e4ef754a7d5aab1e8fa1ef6ba8ff3c441 (diff)
parent: 129db5c42a9c8f32d88c57ac3b81182acf844068 (diff)
64 files changed, 1487 insertions, 2867 deletions
diff --git a/community/apitrace/PKGBUILD b/community/apitrace/PKGBUILD
new file mode 100644
index 000000000..ba20fd302
--- /dev/null
+++ b/community/apitrace/PKGBUILD
@@ -0,0 +1,38 @@
+# $Id: PKGBUILD 85781 2013-03-07 07:29:48Z lcarlier $
+# Maintainer: Laurent Carlier <lordheavym@gmail.com>
+# Contributor: Luca Bennati <lucak3 AT gmail DOT com>
+# Contributor: Glaucous <glakke1 at gmail dot com>
+
+pkgname=apitrace
+pkgver=3.0
+pkgrel=1
+pkgdesc="Graphics API Tracing"
+arch=('i686' 'x86_64')
+url="https://github.com/apitrace/apitrace"
+license=('custom')
+makedepends=('cmake' 'mesa' 'libgl>=9.1' 'python2' 'qtwebkit' 'qjson')
+optdepends=('qtwebkit: GUI support' 'qjson: GUI support')
+source=("https://github.com/apitrace/$pkgname/zipball/$pkgver"
+	gcc-4.7-fix.patch)
+md5sums=('9ef70fa990f165e30a4408762fdb4a76'
+         '27a9a7aa14355b56fb48e2e17ff9911e')
+
+build() {
+  cd ${srcdir}/apitrace-*
+
+  # Merged upstream
+  patch -Np1 -i ${srcdir}/gcc-4.7-fix.patch
+
+  cmake . -Bbuild -DCMAKE_INSTALL_PREFIX=/usr -DPYTHON_EXECUTABLE='/usr/bin/python2'
+  make -C build
+}
+
+package() {
+depends=('python2' 'libgl')
+  cd ${srcdir}/apitrace-*
+
+  make -C build DESTDIR="${pkgdir}/" install
+
+  install -m755 -d "${pkgdir}/usr/share/licenses/apitrace"
+  install -m644 LICENSE "${pkgdir}/usr/share/licenses/apitrace/"
+}
diff --git a/community/apitrace/gcc-4.7-fix.patch b/community/apitrace/gcc-4.7-fix.patch
new file mode 100644
index 000000000..20cc71a3a
--- /dev/null
+++ b/community/apitrace/gcc-4.7-fix.patch
@@ -0,0 +1,39 @@
+From 8159d6c1295da8c1b342bc77686e7ecfed1e5c01 Mon Sep 17 00:00:00 2001
+From: Martin Olsson <martin@minimum.se>
+Date: Mon, 26 Mar 2012 10:40:45 +0200
+Subject: [PATCH] Fix compile error "isatty was not declared"; missing
+ unistd.h include
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+When I built apitrace on Fedora 16, using the usual:
+
+	cmake -H. -Bbuild
+	make -C build
+
+...then I got this compile error:
+
+	apitrace/cli/cli_dump.cpp: In function ‘int command(int, char**)’:
+	apitrace/cli/cli_dump.cpp:176:25: error: ‘isatty’ was not declared in this scope
+---
+ cli/cli_dump.cpp |    3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/cli/cli_dump.cpp b/cli/cli_dump.cpp
+index 28c91af..f52b83c 100644
+--- a/cli/cli_dump.cpp
++++ b/cli/cli_dump.cpp
+@@ -28,6 +28,9 @@
+ #include <string.h>
+ #include <limits.h> // for CHAR_MAX
+ #include <getopt.h>
++#ifndef _WIN32
++#include <unistd.h> // for isatty()
++#endif
+ 
+ #include "cli.hpp"
+ #include "cli_pager.hpp"
+-- 
+1.7.10
+
diff --git a/community/arpack/PKGBUILD b/community/arpack/PKGBUILD
index 70bff7b10..48bef3af5 100644
--- a/community/arpack/PKGBUILD
+++ b/community/arpack/PKGBUILD
@@ -1,26 +1,29 @@
-# $Id: PKGBUILD 66078 2012-02-22 22:46:10Z arodseth $
+# $Id: PKGBUILD 85849 2013-03-07 18:31:38Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: William Rea <sillywilly@gmail.com>
 # Contributor: Stefan Husmann <stefan-husmann@t-online.de>
 
 pkgname=arpack
-pkgver=3.1.0
-pkgrel=2.1
+pkgver=3.1.2
+pkgrel=1
 arch=('x86_64' 'i686' 'mips64el')
-pkgdesc="Fortran77 subroutines designed to solve large scale eigenvalue problems"
-url="http://forge.scilab.org/index.php/p/arpack-ng/"
+pkgdesc='Fortran77 subroutines designed to solve large scale eigenvalue problems'
+url='http://forge.scilab.org/index.php/p/arpack-ng/'
 license=('BSD')
-depends=('glibc' 'gcc-fortran' 'lapack' 'openmpi>=1.5.4-4')
+depends=('lapack' 'openmpi')
 provides=('arpack-ng')
 options=('!libtool')
 source=("http://forge.scilab.org/upload/$pkgname-ng/files/$pkgname-ng_$pkgver.tar.gz")
-sha256sums=('65b7856126f06ecbf9ec450d50df92ca9260d4b0d21baf02497554ac230d6feb')
+sha256sums=('9338bda5bef5a4bafd99c18f327acb54f8be4ffc5c53d0a186e4aa27db3260f2')
 
 build() {
   cd "$srcdir/$pkgname-ng_$pkgver"
 
   ./configure --prefix=/usr --enable-mpi
-  make F77="gfortran" LIBS+=" `pkg-config --libs ompi` "
+  make \
+    F77="mpif77" \
+    CFLAGS+=" `pkg-config --cflags ompi` " \
+    LIBS+=" `pkg-config --libs ompi` "
 }
 
 package() {
diff --git a/community/cgminer/PKGBUILD b/community/cgminer/PKGBUILD
index 44ed3480b..d16f01b3c 100644
--- a/community/cgminer/PKGBUILD
+++ b/community/cgminer/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 85507 2013-03-02 07:06:14Z fyan $
+# $Id: PKGBUILD 85801 2013-03-07 12:43:51Z fyan $
 # Maintainer: Felix Yan <felixonmars@gmail.com>
 # Contributor: monson <holymonson@gmail.com>
 # Contributor: Thomas Dziedzic < gostrc at gmail >
 # Contributor: David Manouchehri <david@davidmanouchehri.com>
 
 pkgname=cgminer
-pkgver=2.11.0
+pkgver=2.11.1
 _build=
 pkgrel=1
 pkgdesc="Multi-threaded multi-pool CPU and GPU miner for bitcoin, forked from cpuminer."
@@ -49,6 +49,6 @@ package() {
   install -Dm644 $pkgname.conf "$pkgdir"/etc/$pkgname.conf
 }
 
-md5sums=('e0f597a373203acc346d7a07a694d03e'
+md5sums=('aa2199a9756cbca5582c03e8c1a98dd1'
          'fe4a243fabe24608f5c05e40f0f118f6'
          'bd76fc92fedce18c59ccea2aa79cc664')
diff --git a/community/gambas3/PKGBUILD b/community/gambas3/PKGBUILD
index f0b37e7ff..78104d2e7 100644
--- a/community/gambas3/PKGBUILD
+++ b/community/gambas3/PKGBUILD
@@ -1,21 +1,22 @@
-# $Id: PKGBUILD 85475 2013-03-01 23:01:35Z lcarlier $
+# $Id: PKGBUILD 85767 2013-03-06 23:21:50Z lcarlier $
 # Maintainer: Laurent Carlier <lordheavym@gmail.com>
 # Contributor : sebikul <sebikul@gmail.com>
 
 pkgbase=gambas3
-pkgname=('gambas3-runtime' 'gambas3-devel' 'gambas3-ide' 'gambas3-script' 'gambas3-examples' 'gambas3-gb-args' 'gambas3-gb-cairo' 'gambas3-gb-chart'
-         'gambas3-gb-dbus' 'gambas3-gb-complex' 'gambas3-gb-compress' 'gambas3-gb-crypt' 'gambas3-gb-data' '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-desktop-gnome' '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-gtk-opengl' 'gambas3-gb-image'
-         'gambas3-gb-image-effect' 'gambas3-gb-image-imlib' 'gambas3-gb-image-io' 'gambas3-gb-jit' 'gambas3-gb-libxml' 'gambas3-gb-map'
-         'gambas3-gb-media' 'gambas3-gb-memcached' 'gambas3-gb-mime' 'gambas3-gb-ncurses' 'gambas3-gb-net' 'gambas3-gb-net-curl'
-         'gambas3-gb-net-pop3' '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-html' 'gambas3-gb-xml-rpc' 'gambas3-gb-xml-xslt' 'gambas3-gb-web') 
+_components=('gambas3-gb-args' 'gambas3-gb-cairo' 'gambas3-gb-chart' 'gambas3-gb-dbus' 'gambas3-gb-complex'
+         'gambas3-gb-compress' 'gambas3-gb-crypt' 'gambas3-gb-data' '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-db' 
+         'gambas3-gb-desktop-gnome' 'gambas3-gb-desktop' 'gambas3-gb-eval-highlight' 'gambas3-gb-httpd' 'gambas3-gb-form-dialog' 'gambas3-gb-form-mdi' 
+         'gambas3-gb-form-stock' 'gambas3-gb-form' 'gambas3-gb-gsl' 'gambas3-gb-gtk-opengl' 'gambas3-gb-gtk' 'gambas3-gb-image-effect'
+         'gambas3-gb-image-imlib' 'gambas3-gb-image-io' 'gambas3-gb-image' 'gambas3-gb-jit' 'gambas3-gb-libxml' 'gambas3-gb-map'
+         'gambas3-gb-media' 'gambas3-gb-memcached' 'gambas3-gb-mime' 'gambas3-gb-mysql' 'gambas3-gb-ncurses' 'gambas3-gb-net-curl' 'gambas3-gb-net-pop3'
+         'gambas3-gb-net-smtp' 'gambas3-gb-net' 'gambas3-gb-opengl-glu' 'gambas3-gb-opengl-glsl' 'gambas3-gb-opengl' 'gambas3-gb-option'
+         'gambas3-gb-pcre' 'gambas3-gb-pdf' 'gambas3-gb-qt4-ext' 'gambas3-gb-qt4-opengl' 'gambas3-gb-qt4-webkit' 'gambas3-gb-qt4'
+         'gambas3-gb-report' 'gambas3-gb-sdl-sound' 'gambas3-gb-sdl' 'gambas3-gb-settings' 'gambas3-gb-signal' 'gambas3-gb-v4l' 'gambas3-gb-vb'
+         'gambas3-gb-xml-html' 'gambas3-gb-xml-rpc' 'gambas3-gb-xml-xslt' 'gambas3-gb-xml' 'gambas3-gb-web')
+pkgname=(${_components[@]} 'gambas3-runtime' 'gambas3-devel' 'gambas3-ide' 'gambas3-script' 'gambas3-examples')
 pkgver=3.4.0
-pkgrel=3
+pkgrel=4
 pkgdesc="A free development environment based on a Basic interpreter."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://gambas.sourceforge.net/"
@@ -28,1422 +29,876 @@ makedepends=('intltool' 'mysql' 'postgresql' 'libffi' 'bzip2' 'glib2' 'v4l-utils
          'libxcursor' 'libsm' 'dbus-core' 'libxml2' 'libxslt' 'libgnome-keyring'
 	 'gsl' 'gstreamer0.10' 'gstreamer0.10-base' 'gtkglext' 'ncurses' 'llvm'
 	 'gmime' 'glu')
-options=('!emptydirs')
+options=(!emptydirs)
 source=("http://downloads.sourceforge.net/gambas/${pkgbase}-${pkgver}.tar.bz2"
-        fix-xfce4-terminal.patch
-        uninstall-with-XDG_UTILS.patch)
+        fix-xfce4-terminal.patch)
 md5sums=('e9d63bfaf351fc7e1705d1b80785b6af'
-         '543ffb3402485e0bcfc67ecf15b7b682'
-         'abf7d298d301aef65ecc4d9a775ebd00')
+         '543ffb3402485e0bcfc67ecf15b7b682')
+
+create_dirs() {
+  install -dm755 ${pkgdir}/usr/lib/gambas3
+  install -dm755 ${pkgdir}/usr/share/gambas3/info/control
+}
 
 build() {
   cd ${srcdir}/${pkgbase}-${pkgver}
 
   # merged upstream
-  patch -Np1 -i ../uninstall-with-XDG_UTILS.patch
   patch -Np0 -i ../fix-xfce4-terminal.patch
 
   ./reconf-all
   ./configure --prefix=/usr -C
 
   make bindir=${pkgdir}/usr/bin
-}
-
-package_gambas3-runtime() {
-  depends=('libffi' 'xdg-utils')
-  pkgdesc="Runtime environment"
-  conflicts=('gambas3-gb-gui')
-  replaces=('gambas3-gb-gui')
-  provides=("gambas3-gb-gui=${pkgver}")
-  install=gambas3-runtime.install
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/gbc
-  make -j1 DESTDIR="${pkgdir}" install
-
-  cd ../gbx
-  make -j1 DESTDIR="${pkgdir}" install
-  cd ../lib/debug
-  make -j1 DESTDIR="${pkgdir}" install
-  cd ../eval
-  make -j1 DESTDIR="${pkgdir}" install
-  cd ../draw
-  make -j1 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
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/gui
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/gui.opengl
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/image
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/comp
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## cleanup the workaround
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/image
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/gbc
-  make DESTDIR="${pkgdir}" uninstall
-  rm -r ${pkgdir}/usr/lib/gambas3/gb.{a*,chart.*,eval.highlight.*,form.*,[s-w]*}
-  rm -r ${pkgdir}/usr/share/gambas3/info/gb.{a*,chart.*,eval.highlight.*,form.*,[s-w]*}
-  rm -r ${pkgdir}/usr/share/gambas3/control
-  ##  
-}
-
-package_gambas3-devel() {
-  depends=('gambas3-runtime')
-  pkgdesc="Development environment"
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/gbc
-  make -j1 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 -j1 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 -j1 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-args' 'gambas3-gb-cairo' 'gambas3-gb-chart' 'gambas3-gb-dbus' 'gambas3-gb-complex' 'gambas3-gb-compress'
-           'gambas3-gb-crypt' 'gambas3-gb-data' '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-image' 'gambas3-gb-image-effect' 'gambas3-gb-image-imlib'
-           'gambas3-gb-image-io' 'gambas3-gb-map' 'gambas3-gb-media' 'gambas3-gb-memcached' 'gambas3-gb-mime' 'gambas3-gb-ncurses' 'gambas3-gb-net' 
-           'gambas3-gb-net-smtp' 'gambas3-gb-opengl' 'gambas3-gb-opengl-glsl' 'gambas3-gb-option' 'gambas3-gb-pcre' 'gambas3-gb-pdf'
-           'gambas3-gb-net-curl' 'gambas3-gb-net-pop3' 'gambas3-gb-qt4' 'gambas3-gb-qt4-ext' 'gambas3-gb-qt4-opengl' 'gambas3-gb-qt4-webkit' 
-           'gambas3-gb-sdl-sound' 'gambas3-gb-settings' 'gambas3-gb-signal' 'gambas3-gb-v4l' 'gambas3-gb-vb' 'gambas3-gb-xml'
-           'gambas3-gb-report' 'gambas3-gb-sdl' 'gambas3-gb-xml-rpc' 'gambas3-gb-xml-xslt' 'gambas3-gb-web')
-  pkgdesc="Applications examples"
-
-  cd ${srcdir}/${pkgbase}-${pkgver}
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  rm -r ${pkgdir}/usr/{bin,lib}
-  rm -r ${pkgdir}/usr/share/gambas3/{info,control,gb.sdl}
+  
+  mkdir -p ${srcdir}/fakeinstall
+  make -j1 XDG_UTILS='' DESTDIR=${srcdir}/fakeinstall install
 }
 
 package_gambas3-gb-args() {
   depends=('gambas3-runtime')
   pkgdesc="Command-line options analyzer component"
 
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/comp
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  rm -r ${pkgdir}/usr/lib/gambas3/gb.[f-w]*
-  rm -r ${pkgdir}/usr/share/gambas3/info/gb.[f-w]*
-  ##
+  cd ${srcdir}/fakeinstall
+  
+  create_dirs
+  
+  mv -v usr/lib/gambas3/gb.args.* ${pkgdir}/usr/lib/gambas3/
+  mv -v usr/share/gambas3/info/gb.args.* ${pkgdir}/usr/share/gambas3/info/
 }
 
 package_gambas3-gb-cairo() {
   depends=('gambas3-runtime' 'cairo')
   pkgdesc="Cairo component"
 
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.cairo
-  make -j1 DESTDIR="${pkgdir}" install
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
+  cd ${srcdir}/fakeinstall
+  
+  create_dirs
+  
+  mv -v usr/lib/gambas3/gb.cairo.* ${pkgdir}/usr/lib/gambas3/
+  mv -v usr/share/gambas3/info/gb.cairo.* ${pkgdir}/usr/share/gambas3/info/
 }
 
 package_gambas3-gb-chart() {
   depends=('gambas3-gb-form')
   pkgdesc="Chart component"
 
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/comp
-  make -j1 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/share/gambas3/control
-  rm -r ${pkgdir}/usr/lib/gambas3/gb.[a*,d-w]*
-  rm -r ${pkgdir}/usr/share/gambas3/info/gb.[a*,d-w]*
-  ##
+  cd ${srcdir}/fakeinstall
+  
+  create_dirs
+  
+  mv -v usr/lib/gambas3/gb.chart.* ${pkgdir}/usr/lib/gambas3/
+  mv -v usr/share/gambas3/info/gb.chart.* ${pkgdir}/usr/share/gambas3/info/
 }
 
 package_gambas3-gb-complex() {
   depends=('gambas3-runtime')
   pkgdesc="Complex numbers component"
 
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  ## Workaround for splitting
-  rm -r ${pkgdir}/usr/bin
-  rm -r ${pkgdir}/usr/lib/gambas3/gb.{comp{r,o}*,[d-v]*}
-  rm -r ${pkgdir}/usr/share/gambas3/info/gb.{compr*,[d-v]*}
-  ##
+  cd ${srcdir}/fakeinstall
+  
+  create_dirs
+  
+  mv -v usr/lib/gambas3/gb.complex.* ${pkgdir}/usr/lib/gambas3/
+  mv -v usr/share/gambas3/info/gb.complex.* ${pkgdir}/usr/share/gambas3/info/
 }
 
 package_gambas3-gb-compress() {
   depends=('gambas3-runtime' 'bzip2' 'zlib')
   pkgdesc="Compression support component"
 
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.compress.bzlib2
-  make -j1 DESTDIR="${pkgdir}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.compress.zlib
-  make -j1 DESTDIR="${pkgdir}" install
-
-  ## Workaround for splitting
-  rm -r ${pkgdir}/usr/bin
-  rm -r ${pkgdir}/usr/lib/gambas3/{gb.comp{o,l}*,gb.[d-v]*}
-  rm -r ${pkgdir}/usr/share/gambas3/info/gb.{compl*,[d-v]*}
-  ##
+  cd ${srcdir}/fakeinstall
+  
+  create_dirs
+  
+  mv -v usr/lib/gambas3/gb.compress.* ${pkgdir}/usr/lib/gambas3/
+  mv -v usr/share/gambas3/info/gb.compress.* ${pkgdir}/usr/share/gambas3/info/
 }
 
 package_gambas3-gb-crypt() {
   depends=('gambas3-runtime')
   pkgdesc="MD5/DES crypting component"
 
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.crypt
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
+  cd ${srcdir}/fakeinstall
+  
+  create_dirs
+  
+  mv -v usr/lib/gambas3/gb.crypt.* ${pkgdir}/usr/lib/gambas3/
+  mv -v usr/share/gambas3/info/gb.crypt.* ${pkgdir}/usr/share/gambas3/info/
 }
 
 package_gambas3-gb-data() {
   depends=('gambas3-runtime')
   pkgdesc="Data containers component"
 
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  ## Workaround for splitting
-  rm -r ${pkgdir}/usr/bin
-  rm -r ${pkgdir}/usr/lib/gambas3/gb.{c*,d{b,e,r}*,[e-v]*}
-  rm -r ${pkgdir}/usr/share/gambas3/info/gb.{c*,d{b,e}*,[e-v]*}
-  ##
-}
-
-package_gambas3-gb-db() {
-  depends=('gambas3-runtime')
-  pkgdesc="Database access component"
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  ## Workaround for splitting
-  rm -r ${pkgdir}/usr/bin
-  rm -r ${pkgdir}/usr/lib/gambas3/{gb.[a-c]*,gb.d{a,e,r}*,gb.[e-z]*}
-  rm -r ${pkgdir}/usr/share/gambas3/info/{gb.[a-c]*,gb.d{a,e}*,gb.[e-z]*}
-  ##
+  cd ${srcdir}/fakeinstall
+  
+  create_dirs
+  
+  mv -v usr/lib/gambas3/gb.data.* ${pkgdir}/usr/lib/gambas3/
+  mv -v usr/share/gambas3/info/gb.data.* ${pkgdir}/usr/share/gambas3/info/
 }
 
 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 -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/comp
-  make -j1 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.{[a-c]*,[e-z]*}
-  rm -r ${pkgdir}/usr/share/gambas3/info/gb.{[a-c]*,[e-z]*}
-  ##
+  cd ${srcdir}/fakeinstall
+  
+  create_dirs
+  
+  mv -v usr/lib/gambas3/gb.db.form.* ${pkgdir}/usr/lib/gambas3/
+  mv -v usr/share/gambas3/info/gb.db.form.* ${pkgdir}/usr/share/gambas3/info/
+  mv -v usr/share/gambas3/control/gb.db.form ${pkgdir}/usr/share/gambas3/control/
 }
 
 package_gambas3-gb-db-mysql() {
   depends=('gambas3-gb-db' 'libmysqlclient')
   pkgdesc="MySQL database access component"
 
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.mysql
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
+  cd ${srcdir}/fakeinstall
+  
+  create_dirs
+  
+  mv -v usr/lib/gambas3/gb.db.mysql.* ${pkgdir}/usr/lib/gambas3/
+  mv -v usr/share/gambas3/info/gb.db.mysql.* ${pkgdir}/usr/share/gambas3/info/
 }
 
 package_gambas3-gb-db-odbc() {
   depends=('gambas3-gb-db' 'unixodbc')
   pkgdesc="ODBC database access component"
 
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.odbc
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
+  cd ${srcdir}/fakeinstall
+  
+  create_dirs
+  
+  mv -v usr/lib/gambas3/gb.db.odbc.* ${pkgdir}/usr/lib/gambas3/
+  mv -v usr/share/gambas3/info/gb.db.odbc.* ${pkgdir}/usr/share/gambas3/info/
 }
 
 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 -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.postgresql
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
+  cd ${srcdir}/fakeinstall
+  
+  create_dirs
+  
+  mv -v usr/lib/gambas3/gb.db.postgresql.* ${pkgdir}/usr/lib/gambas3/
+  mv -v usr/share/gambas3/info/gb.db.postgresql.* ${pkgdir}/usr/share/gambas3/info/
 }
 
 package_gambas3-gb-db-sqlite2() {
   depends=('gambas3-gb-db' 'sqlite2' 'gcc-libs')
   pkgdesc="Sqlite2 database access component"
 
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.sqlite2
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
+  cd ${srcdir}/fakeinstall
+  
+  create_dirs
+  
+  mv -v usr/lib/gambas3/gb.db.sqlite2.* ${pkgdir}/usr/lib/gambas3/
+  mv -v usr/share/gambas3/info/gb.db.sqlite2.* ${pkgdir}/usr/share/gambas3/info/
 }
 
 package_gambas3-gb-db-sqlite3() {
   depends=('gambas3-gb-db' 'sqlite' 'gcc-libs')
   pkgdesc="Sqlite3 database access component"
 
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
+  cd ${srcdir}/fakeinstall
+  
+  create_dirs
+  
+  mv -v usr/lib/gambas3/gb.db.sqlite3.* ${pkgdir}/usr/lib/gambas3/
+  mv -v usr/share/gambas3/info/gb.db.sqlite3.* ${pkgdir}/usr/share/gambas3/info/
+}
 
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.sqlite3
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
+package_gambas3-gb-db() {
+  depends=('gambas3-runtime')
+  pkgdesc="Database access component"
 
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
+  cd ${srcdir}/fakeinstall
+  
+  create_dirs
+  
+  mv -v usr/lib/gambas3/gb.db.* ${pkgdir}/usr/lib/gambas3/
+  mv -v usr/share/gambas3/info/gb.db.* ${pkgdir}/usr/share/gambas3/info/
 }
 
 package_gambas3-gb-dbus() {
   depends=('gambas3-runtime' 'dbus-core')
   pkgdesc="DBUS component"
 
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.dbus
-  make -j1 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')
-  pkgdesc="Desktop component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.desktop
-  make -j1 DESTDIR="${pkgdir}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.desktop/src/gnome
-  make DESTDIR="${pkgdir}" uninstall
-
-  ## 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
-  ##
+  cd ${srcdir}/fakeinstall
+  
+  create_dirs
+  
+  mv -v usr/lib/gambas3/gb.dbus.* ${pkgdir}/usr/lib/gambas3/
+  mv -v usr/share/gambas3/info/gb.dbus.* ${pkgdir}/usr/share/gambas3/info/
 }
 
 package_gambas3-gb-desktop-gnome() {
   depends=('gambas3-gb-desktop' 'libgnome-keyring')
   pkgdesc="Desktop component for Gnome"
 
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
+  cd ${srcdir}/fakeinstall
+  
+  create_dirs
+  
+  mv -v usr/lib/gambas3/gb.desktop.gnome.* ${pkgdir}/usr/lib/gambas3/
+}
 
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.desktop/src/gnome
-  make -j1 DESTDIR="${pkgdir}" install
+package_gambas3-gb-desktop() {
+  depends=('gambas3-gb-image' 'libsm' 'libxtst')
+  pkgdesc="Desktop component"
 
-  ## 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
-  ##
+  cd ${srcdir}/fakeinstall
+  
+  create_dirs
+  
+  mv -v usr/lib/gambas3/gb.desktop.* ${pkgdir}/usr/lib/gambas3/
+  mv -v usr/share/gambas3/info/gb.desktop.* ${pkgdir}/usr/share/gambas3/info/
+  mv -v usr/share/gambas3/control/gb.desktop ${pkgdir}/usr/share/gambas3/control/
 }
 
 package_gambas3-gb-eval-highlight() {
   depends=('gambas3-runtime')
   pkgdesc="Expression evaluator highlight component"
 
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/comp
-  make -j1 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.{[a-d]*,[f-z]*}
-  rm -r ${pkgdir}/usr/share/gambas3/info/gb.{[a-d]*,[f-z]*}
-  rm -r ${pkgdir}/usr/share/gambas3/control
-  ##
-}
-
-package_gambas3-gb-form() {
-  depends=('gambas3-runtime')
-  pkgdesc="Form component"
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/comp
-  make -j1 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.{[a-e]*,[g-w]*,form.{d*,m*,s*}}
-  rm -r ${pkgdir}/usr/share/gambas3/info/gb.{[a-e]*,[g-w]*,form.{d*,m*,s*}}
-  ##
+  cd ${srcdir}/fakeinstall
+  
+  create_dirs
+  
+  mv -v usr/lib/gambas3/gb.eval.highlight.* ${pkgdir}/usr/lib/gambas3/
+  mv -v usr/share/gambas3/info/gb.eval.highlight.* ${pkgdir}/usr/share/gambas3/info/
 }
 
 package_gambas3-gb-form-dialog() {
   depends=('gambas3-gb-form')
   pkgdesc="Form dialog component"
 
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/comp
-  make -j1 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.{[a-e]*,[g-w]*,form.{c*,g*,m*,s*}}
-  rm -r ${pkgdir}/usr/share/gambas3/info/gb.{[a-e]*,[g-w]*,form.{i*,l*,m*,s*}}
-  ##
+  cd ${srcdir}/fakeinstall
+  
+  create_dirs
+  
+  mv -v usr/lib/gambas3/gb.form.dialog.* ${pkgdir}/usr/lib/gambas3/
+  mv -v usr/share/gambas3/info/gb.form.dialog.* ${pkgdir}/usr/share/gambas3/info/
 }
 
 package_gambas3-gb-form-mdi() {
   depends=('gambas3-gb-form')
   pkgdesc="Form MDI component"
 
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/comp
-  make -j1 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.{[a-e]*,[g-w]*,form.{c*,d*,g*,s*}}
-  rm -r ${pkgdir}/usr/share/gambas3/info/gb.{[a-e]*,[g-w]*,form.{i*,l*,d*,s*}}
-  ##
+  cd ${srcdir}/fakeinstall
+  
+  create_dirs
+  
+  mv -v usr/lib/gambas3/gb.form.mdi.* ${pkgdir}/usr/lib/gambas3/
+  mv -v usr/share/gambas3/info/gb.form.mdi.* ${pkgdir}/usr/share/gambas3/info/
+  mv -v usr/share/gambas3/control/gb.form.mdi ${pkgdir}/usr/share/gambas3/control/
 }
 
 package_gambas3-gb-form-stock() {
   depends=('gambas3-runtime')
   pkgdesc="Default stock icons component"
 
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
+  cd ${srcdir}/fakeinstall
+  
+  create_dirs
+  
+  mv -v usr/lib/gambas3/gb.form.stock.* ${pkgdir}/usr/lib/gambas3/
+  mv -v usr/share/gambas3/info/gb.form.stock.* ${pkgdir}/usr/share/gambas3/info/
+}
 
-  cd ${srcdir}/${pkgbase}-${pkgver}/comp
-  make -j1 DESTDIR="${pkgdir}" install
+package_gambas3-gb-form() {
+  depends=('gambas3-runtime')
+  pkgdesc="Form component"
 
-  ## 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.{a*,[m-w]*}
-  rm -r ${pkgdir}/usr/share/gambas3/info/gb.{a*,[m-w]*}
-  ##
+  cd ${srcdir}/fakeinstall
+  
+  create_dirs
+  
+  mv -v usr/lib/gambas3/gb.form.* ${pkgdir}/usr/lib/gambas3/
+  mv -v usr/share/gambas3/info/gb.form.* ${pkgdir}/usr/share/gambas3/info/
+  mv -v usr/share/gambas3/control/gb.form ${pkgdir}/usr/share/gambas3/control/
 }
 
 package_gambas3-gb-gsl() {
   depends=('gambas3-runtime' 'gsl')
   pkgdesc="The GNU Scientific Library component"
 
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.gsl
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## cleanup the workaround
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
-}
-
-package_gambas3-gb-gtk() {
-  depends=('gambas3-gb-image' 'gtk2' 'librsvg')
-  pkgdesc="GTK+ toolkit component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
+  cd ${srcdir}/fakeinstall
   
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk/src/opengl
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-
-  ## cleanup the workaround
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
+  create_dirs
+  
+  mv -v usr/lib/gambas3/gb.gsl.* ${pkgdir}/usr/lib/gambas3/
+  mv -v usr/share/gambas3/info/gb.gsl.* ${pkgdir}/usr/share/gambas3/info/
 }
 
 package_gambas3-gb-gtk-opengl() {
   depends=('gambas3-gb-gtk' 'gambas3-gb-opengl' 'gtkglext' 'glu')
   pkgdesc="GTK+ toolkit OpenGL component"
 
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
+  cd ${srcdir}/fakeinstall
+  
+  create_dirs
+  
+  mv -v usr/lib/gambas3/gb.gtk.opengl.* ${pkgdir}/usr/lib/gambas3/
+  mv -v usr/share/gambas3/info/gb.gtk.opengl.* ${pkgdir}/usr/share/gambas3/info/
+}
 
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk/src/opengl
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
+package_gambas3-gb-gtk() {
+  depends=('gambas3-gb-image' 'gtk2' 'librsvg')
+  pkgdesc="GTK+ toolkit component"
 
-  ## cleanup the workaround
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
+  cd ${srcdir}/fakeinstall
+  
+  create_dirs
+  
+  mv -v usr/lib/gambas3/gb.gtk.* ${pkgdir}/usr/lib/gambas3/
+  mv -v usr/share/gambas3/info/gb.gtk.* ${pkgdir}/usr/share/gambas3/info/
 }
 
-package_gambas3-gb-image() {
+package_gambas3-gb-httpd() {
   depends=('gambas3-runtime')
-  pkgdesc="Image component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
+  pkgdesc="Embedded HTTP server for the interpreter"
 
-  ## 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]*}
-  ##
+  cd ${srcdir}/fakeinstall
+  
+  create_dirs
+  
+  mv -v usr/lib/gambas3/gb.httpd.* ${pkgdir}/usr/lib/gambas3/
+  mv -v usr/share/gambas3/info/gb.httpd.* ${pkgdir}/usr/share/gambas3/info/
 }
 
 package_gambas3-gb-image-effect() {
   depends=('gambas3-gb-image' 'gcc-libs')
   pkgdesc="Image effect component"
 
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make -j1 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]*}
-  ##
+  cd ${srcdir}/fakeinstall
+  
+  create_dirs
+  
+  mv -v usr/lib/gambas3/gb.image.effect.* ${pkgdir}/usr/lib/gambas3/
+  mv -v usr/share/gambas3/info/gb.image.effect.* ${pkgdir}/usr/share/gambas3/info/
 }
 
 package_gambas3-gb-image-imlib() {
   depends=('gambas3-gb-image' 'imlib2')
   pkgdesc="Imlib component"
 
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.image.imlib
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## cleanup the workaround
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
+  cd ${srcdir}/fakeinstall
+  
+  create_dirs
+  
+  mv -v usr/lib/gambas3/gb.image.imlib.* ${pkgdir}/usr/lib/gambas3/
+  mv -v usr/share/gambas3/info/gb.image.imlib.* ${pkgdir}/usr/share/gambas3/info/
 }
 
 package_gambas3-gb-image-io() {
   depends=('gambas3-gb-image' 'gdk-pixbuf2')
   pkgdesc="Input/Output image component"
 
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
+  cd ${srcdir}/fakeinstall
+  
+  create_dirs
+  
+  mv -v usr/lib/gambas3/gb.image.io.* ${pkgdir}/usr/lib/gambas3/
+  mv -v usr/share/gambas3/info/gb.image.io.* ${pkgdir}/usr/share/gambas3/info/
+}
 
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.image.io
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
+package_gambas3-gb-image() {
+  depends=('gambas3-runtime')
+  pkgdesc="Image component"
 
-  ## cleanup the workaround
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
+  cd ${srcdir}/fakeinstall
+  
+  create_dirs
+  
+  mv -v usr/lib/gambas3/gb.image.* ${pkgdir}/usr/lib/gambas3/
+  mv -v usr/share/gambas3/info/gb.image.* ${pkgdir}/usr/share/gambas3/info/
 }
 
 package_gambas3-gb-jit() {
   depends=('gambas3-runtime' 'llvm')
   pkgdesc="Just-in-time compiler component"
 
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.jit
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## cleanup the workaround
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
+  cd ${srcdir}/fakeinstall
+  
+  create_dirs
+  
+  mv -v usr/lib/gambas3/gb.jit.* ${pkgdir}/usr/lib/gambas3/
+  mv -v usr/share/gambas3/info/gb.jit.* ${pkgdir}/usr/share/gambas3/info/
 }
 
 package_gambas3-gb-libxml() {
   depends=('gambas3-runtime' 'libxml2')
   pkgdesc="libxml2 component"
 
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.libxml
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## cleanup the workaround
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
+  cd ${srcdir}/fakeinstall
+  
+  create_dirs
+  
+  mv -v usr/lib/gambas3/gb.libxml.* ${pkgdir}/usr/lib/gambas3/
+  mv -v usr/share/gambas3/info/gb.libxml.* ${pkgdir}/usr/share/gambas3/info/
 }
 
 package_gambas3-gb-map() {
   depends=('gambas3-gb-image-io' 'gambas3-gb-form')
   pkgdesc="Display maps component"
 
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.net
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.net.curl
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/comp
-  make -j1 DESTDIR="${pkgdir}" install
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.net.curl
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.net
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  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/lib/gambas3/{gb.[a-g]*,gb.mysql.*,gb.memcached.*,gb.[r-w]*}
-  rm -r ${pkgdir}/usr/share/gambas3/control/gb.{[d-f]*,[q-r]*}
-  rm -r ${pkgdir}/usr/share/gambas3/info/{gb.[a-g]*,gb.mysql.*,gb.memcached.*,gb.[r-w]*}
-  ##
+  cd ${srcdir}/fakeinstall
+  
+  create_dirs
+  
+  mv -v usr/lib/gambas3/gb.map.* ${pkgdir}/usr/lib/gambas3/
+  mv -v usr/share/gambas3/info/gb.map.* ${pkgdir}/usr/share/gambas3/info/
+  mv -v usr/share/gambas3/control/gb.map ${pkgdir}/usr/share/gambas3/control/
 }
 
 package_gambas3-gb-media() {
   depends=('gambas3-runtime' 'gstreamer0.10' 'gstreamer0.10-base')
   pkgdesc="Simplified interface to the GStreamer library component"
 
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.media
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## cleanup the workaround
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
+  cd ${srcdir}/fakeinstall
+  
+  create_dirs
+  
+  mv -v usr/lib/gambas3/gb.media.* ${pkgdir}/usr/lib/gambas3/
+  mv -v usr/share/gambas3/info/gb.media.* ${pkgdir}/usr/share/gambas3/info/
 }
 
 package_gambas3-gb-memcached() {
   depends=('gambas3-gb-net')
   pkgdesc="Memcached client component"
 
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.net
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/comp
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## cleanup the workaround
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.net
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  rm -r ${pkgdir}/usr/lib/gambas3/{gb.[a-g]*,gb.mysql.*,gb.[r-w]*}
-  rm -r ${pkgdir}/usr/share/gambas3/control
-  rm -r ${pkgdir}/usr/share/gambas3/info/{gb.[a-g]*,gb.mysql.*,gb.[r-w]*}
-  ##
+  cd ${srcdir}/fakeinstall
+  
+  create_dirs
+  
+  mv -v usr/lib/gambas3/gb.memcached.* ${pkgdir}/usr/lib/gambas3/
+  mv -v usr/share/gambas3/info/gb.memcached.* ${pkgdir}/usr/share/gambas3/info/
 }
 
 package_gambas3-gb-mime() {
   depends=('gambas3-runtime' 'gmime')
   pkgdesc="MIME message component"
 
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
+  cd ${srcdir}/fakeinstall
+  
+  create_dirs
+  
+  mv -v usr/lib/gambas3/gb.mime.* ${pkgdir}/usr/lib/gambas3/
+  mv -v usr/share/gambas3/info/gb.mime.* ${pkgdir}/usr/share/gambas3/info/
+}
 
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.mime
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
+package_gambas3-gb-mysql() {
+  depends=('gambas3-runtime' 'gambas3-gb-db-mysql')
+  pkgdesc="Mysql extra component"
 
-  ## cleanup the workaround
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
+  cd ${srcdir}/fakeinstall
+  
+  create_dirs
+  
+  mv -v usr/lib/gambas3/gb.mysql.* ${pkgdir}/usr/lib/gambas3/
+  mv -v usr/share/gambas3/info/gb.mysql.* ${pkgdir}/usr/share/gambas3/info/
 }
 
 package_gambas3-gb-ncurses() {
   depends=('gambas3-runtime' 'ncurses')
   pkgdesc="Ncurses component"
 
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.ncurses
-  make -j1 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 -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.net
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## cleanup the workaround
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
+  cd ${srcdir}/fakeinstall
+  
+  create_dirs
+  
+  mv -v usr/lib/gambas3/gb.ncurses.* ${pkgdir}/usr/lib/gambas3/
+  mv -v usr/share/gambas3/info/gb.ncurses.* ${pkgdir}/usr/share/gambas3/info/
 }
 
 package_gambas3-gb-net-curl() {
   depends=('gambas3-gb-net' 'curl')
   pkgdesc="Curl component"
 
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.net.curl
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## cleanup the workaround
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
+  cd ${srcdir}/fakeinstall
+  
+  create_dirs
+  
+  mv -v usr/lib/gambas3/gb.net.curl.* ${pkgdir}/usr/lib/gambas3/
+  mv -v usr/share/gambas3/info/gb.net.curl.* ${pkgdir}/usr/share/gambas3/info/
 }
 
 package_gambas3-gb-net-pop3() {
   depends=('gambas3-gb-net' 'gambas3-gb-mime')
   pkgdesc="POP3 component"
 
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.net
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.mime
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/comp
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## cleanup the workaround
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.mime
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.net
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  rm -r ${pkgdir}/usr/lib/gambas3/gb.{[a-m]*,[s-w]*}
-  rm -r ${pkgdir}/usr/share/gambas3/info/gb.{[a-m]*,[s-w]*}
-  ##
+  cd ${srcdir}/fakeinstall
+  
+  create_dirs
+  
+  mv -v usr/lib/gambas3/gb.net.pop3.* ${pkgdir}/usr/lib/gambas3/
+  mv -v usr/share/gambas3/info/gb.net.pop3.* ${pkgdir}/usr/share/gambas3/info/
 }
 
 package_gambas3-gb-net-smtp() {
   depends=('gambas3-runtime' 'glib2')
   pkgdesc="SMTP component"
 
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.net.smtp
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## cleanup the workaround
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
+  cd ${srcdir}/fakeinstall
+  
+  create_dirs
+  
+  mv -v usr/lib/gambas3/gb.net.smtp.* ${pkgdir}/usr/lib/gambas3/
+  mv -v usr/share/gambas3/info/gb.net.smtp.* ${pkgdir}/usr/share/gambas3/info/
 }
 
-package_gambas3-gb-opengl() {
-  depends=('gambas3-runtime' 'glew')
-  pkgdesc="OpenGL component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.opengl
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
+package_gambas3-gb-net() {
+  depends=('gambas3-runtime')
+  pkgdesc="Network component"
 
-  ## 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
-  ##
+  cd ${srcdir}/fakeinstall
+  
+  create_dirs
+  
+  mv -v usr/lib/gambas3/gb.net.* ${pkgdir}/usr/lib/gambas3/
+  mv -v usr/share/gambas3/info/gb.net.* ${pkgdir}/usr/share/gambas3/info/
 }
 
 package_gambas3-gb-opengl-glu() {
   depends=('gambas3-gb-opengl')
   pkgdesc="GL Utility component"
 
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.opengl/src/glu
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## cleanup the workaround
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
+  cd ${srcdir}/fakeinstall
+  
+  create_dirs
+  
+  mv -v usr/lib/gambas3/gb.opengl.glu.* ${pkgdir}/usr/lib/gambas3/
+  mv -v usr/share/gambas3/info/gb.opengl.glu.* ${pkgdir}/usr/share/gambas3/info/
 }
 
 package_gambas3-gb-opengl-glsl() {
   depends=('gambas3-gb-opengl')
   pkgdesc="GLSL component"
 
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
+  cd ${srcdir}/fakeinstall
+  
+  create_dirs
+  
+  mv -v usr/lib/gambas3/gb.opengl.glsl.* ${pkgdir}/usr/lib/gambas3/
+  mv -v usr/share/gambas3/info/gb.opengl.glsl.* ${pkgdir}/usr/share/gambas3/info/
+}
 
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.opengl/src/glsl
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
+package_gambas3-gb-opengl() {
+  depends=('gambas3-runtime' 'glew')
+  pkgdesc="OpenGL component"
 
-  ## cleanup the workaround
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
+  cd ${srcdir}/fakeinstall
+  
+  create_dirs
+  
+  mv -v usr/lib/gambas3/gb.opengl.* ${pkgdir}/usr/lib/gambas3/
+  mv -v usr/share/gambas3/info/gb.opengl.* ${pkgdir}/usr/share/gambas3/info/
 }
 
 package_gambas3-gb-option() {
   depends=('gambas3-runtime')
   pkgdesc="Getopt component"
 
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make -j1 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]*}
-  ##
+  cd ${srcdir}/fakeinstall
+  
+  create_dirs
+  
+  mv -v usr/lib/gambas3/gb.option.* ${pkgdir}/usr/lib/gambas3/
+  mv -v usr/share/gambas3/info/gb.option.* ${pkgdir}/usr/share/gambas3/info/
 }
 
 package_gambas3-gb-pcre() {
   depends=('gambas3-runtime' 'pcre')
   pkgdesc="PCRE component"
 
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.pcre
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## cleanup the workaround
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
+  cd ${srcdir}/fakeinstall
+  
+  create_dirs
+  
+  mv -v usr/lib/gambas3/gb.pcre.* ${pkgdir}/usr/lib/gambas3/
+  mv -v usr/share/gambas3/info/gb.pcre.* ${pkgdir}/usr/share/gambas3/info/
 }
 
 package_gambas3-gb-pdf() {
   depends=('gambas3-runtime' 'poppler')
   pkgdesc="PDF component"
 
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.pdf
-  make -j1 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' 'qt4')
-  pkgdesc="Qt4 toolkit component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
-  make -j1 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
-  ##
+  cd ${srcdir}/fakeinstall
+  
+  create_dirs
+  
+  mv -v usr/lib/gambas3/gb.pdf.* ${pkgdir}/usr/lib/gambas3/
+  mv -v usr/share/gambas3/info/gb.pdf.* ${pkgdir}/usr/share/gambas3/info/
 }
 
 package_gambas3-gb-qt4-ext() {
   depends=('gambas3-gb-qt4')
   pkgdesc="Qt4 toolkit extended component"
 
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4/src/ext
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## cleanup the workaround
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
+  cd ${srcdir}/fakeinstall
+  
+  create_dirs
+  
+  mv -v usr/lib/gambas3/gb.qt4.ext.* ${pkgdir}/usr/lib/gambas3/
+  mv -v usr/share/gambas3/info/gb.qt4.ext.* ${pkgdir}/usr/share/gambas3/info/
 }
 
 package_gambas3-gb-qt4-opengl() {
   depends=('gambas3-gb-qt4' 'gambas3-gb-opengl')
   pkgdesc="Qt4 toolkit OpenGL component"
 
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4/src/opengl
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## cleanup the workaround
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
+  cd ${srcdir}/fakeinstall
+  
+  create_dirs
+  
+  mv -v usr/lib/gambas3/gb.qt4.opengl.* ${pkgdir}/usr/lib/gambas3/
+  mv -v usr/share/gambas3/info/gb.qt4.opengl.* ${pkgdir}/usr/share/gambas3/info/
 }
 
 package_gambas3-gb-qt4-webkit() {
   depends=('gambas3-gb-qt4' 'qtwebkit')
   pkgdesc="Qt4 toolkit webkit component"
 
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
+  cd ${srcdir}/fakeinstall
+  
+  create_dirs
+  
+  mv -v usr/lib/gambas3/gb.qt4.webkit.* ${pkgdir}/usr/lib/gambas3/
+  mv -v usr/share/gambas3/info/gb.qt4.webkit.* ${pkgdir}/usr/share/gambas3/info/
+}
 
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4/src/webkit
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
+package_gambas3-gb-qt4() {
+  depends=('gambas3-gb-image' 'qt4')
+  pkgdesc="Qt4 toolkit component"
 
-  ## cleanup the workaround
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
+  cd ${srcdir}/fakeinstall
+  
+  create_dirs
+  
+  mv -v usr/lib/gambas3/gb.qt4.* ${pkgdir}/usr/lib/gambas3/
+  mv -v usr/share/gambas3/info/gb.qt4.* ${pkgdir}/usr/share/gambas3/info/
 }
 
 package_gambas3-gb-report() {
   depends=('gambas3-gb-form' 'gambas3-gb-image-io')
   pkgdesc="Report component"
 
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/comp
-  make -j1 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.{[a-m]*,[s-w]*}
-  rm -r ${pkgdir}/usr/share/gambas3/info/gb.{[a-m]*,[s-w]*}
-  ##
-}
-
-package_gambas3-gb-sdl() {
-  depends=('gambas3-gb-image-io' 'sdl_ttf' 'libxcursor' 'glew')
-  pkgdesc="SDL component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.sdl
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## cleanup the workaround
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
+  cd ${srcdir}/fakeinstall
+  
+  create_dirs
+  
+  mv -v usr/lib/gambas3/gb.report.* ${pkgdir}/usr/lib/gambas3/
+  mv -v usr/share/gambas3/info/gb.report.* ${pkgdir}/usr/share/gambas3/info/
+  mv -v usr/share/gambas3/control/gb.report ${pkgdir}/usr/share/gambas3/control/
 }
 
 package_gambas3-gb-sdl-sound() {
   depends=('gambas3-runtime' 'sdl_mixer')
   pkgdesc="SDL sound component"
 
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
+  cd ${srcdir}/fakeinstall
+  
+  create_dirs
+  
+  mv -v usr/lib/gambas3/gb.sdl.sound.* ${pkgdir}/usr/lib/gambas3/
+  mv -v usr/share/gambas3/info/gb.sdl.sound.* ${pkgdir}/usr/share/gambas3/info/
+}
 
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.sdl.sound
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
+package_gambas3-gb-sdl() {
+  depends=('gambas3-gb-image-io' 'sdl_ttf' 'libxcursor' 'glew')
+  pkgdesc="SDL component"
 
-  ## cleanup the workaround
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
+  cd ${srcdir}/fakeinstall
+  
+  create_dirs
+  
+  mv -v usr/lib/gambas3/gb.sdl.* ${pkgdir}/usr/lib/gambas3/
+  mv -v usr/share/gambas3/info/gb.sdl.* ${pkgdir}/usr/share/gambas3/info/
+  mv -v usr/share/gambas3/gb.sdl ${pkgdir}/usr/share/gambas3
 }
 
 package_gambas3-gb-settings() {
   depends=('gambas3-runtime')
   pkgdesc="Setting component"
 
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/comp
-  make -j1 DESTDIR="${pkgdir}" install
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  rm -r ${pkgdir}/usr/lib/gambas3/gb.{[a-r]*,[t-w]*}
-  rm -r ${pkgdir}/usr/share/gambas3/info/gb.{[a-r]*,[t-w]*}
-  ##
+  cd ${srcdir}/fakeinstall
+  
+  create_dirs
+  
+  mv -v usr/lib/gambas3/gb.settings.* ${pkgdir}/usr/lib/gambas3/
+  mv -v usr/share/gambas3/info/gb.settings.* ${pkgdir}/usr/share/gambas3/info/
 }
 
 package_gambas3-gb-signal() {
   depends=('gambas3-runtime')
   pkgdesc="POSIX Signals component"
 
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make -j1 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]*}
-  ##
+  cd ${srcdir}/fakeinstall
+  
+  create_dirs
+  
+  mv -v usr/lib/gambas3/gb.signal.* ${pkgdir}/usr/lib/gambas3/
+  mv -v usr/share/gambas3/info/gb.signal.* ${pkgdir}/usr/share/gambas3/info/
 }
 
 package_gambas3-gb-v4l() {
   depends=('gambas3-runtime' 'v4l-utils' 'libjpeg' 'libpng')
   pkgdesc="Video4linux component"
 
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.v4l
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## cleanup the workaround
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
+  cd ${srcdir}/fakeinstall
+  
+  create_dirs
+  
+  mv -v usr/lib/gambas3/gb.v4l.* ${pkgdir}/usr/lib/gambas3/
+  mv -v usr/share/gambas3/info/gb.v4l.* ${pkgdir}/usr/share/gambas3/info/
 }
 
 package_gambas3-gb-vb() {
   depends=('gambas3-runtime')
   pkgdesc="Visual Basic transitional component"
 
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make -j1 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]*
-  ##
+  cd ${srcdir}/fakeinstall
+  
+  create_dirs
+  
+  mv -v usr/lib/gambas3/gb.vb.* ${pkgdir}/usr/lib/gambas3/
+  mv -v usr/share/gambas3/info/gb.vb.* ${pkgdir}/usr/share/gambas3/info/
 }
 
 package_gambas3-gb-web() {
   depends=('gambas3-runtime')
   pkgdesc="CGI component"
 
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
+  cd ${srcdir}/fakeinstall
+  
+  create_dirs
+  
+  mv -v usr/lib/gambas3/gb.web.* ${pkgdir}/usr/lib/gambas3/
+  mv -v usr/share/gambas3/info/gb.web.* ${pkgdir}/usr/share/gambas3/info/
+}
+
+package_gambas3-gb-xml-html() {
+  depends=('gambas3-gb-xml')
+  pkgdesc="HTML generator component"
+
+  cd ${srcdir}/fakeinstall
+  
+  create_dirs
+  
+  mv -v usr/lib/gambas3/gb.xml.html.* ${pkgdir}/usr/lib/gambas3/
+  mv -v usr/share/gambas3/info/gb.xml.html.* ${pkgdir}/usr/share/gambas3/info/
+}
 
-  cd ${srcdir}/${pkgbase}-${pkgver}/comp
-  make -j1 DESTDIR="${pkgdir}" install
+package_gambas3-gb-xml-rpc() {
+  depends=('gambas3-gb-xml' 'gambas3-gb-net-curl')
+  pkgdesc="XML-RPC component"
 
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  rm -r ${pkgdir}/usr/lib/gambas3/gb.[a-v]*
-  rm -r ${pkgdir}/usr/share/gambas3/info/gb.[a-v]*
-  ##
+  cd ${srcdir}/fakeinstall
+  
+  create_dirs
+  
+  mv -v usr/lib/gambas3/gb.xml.rpc.* ${pkgdir}/usr/lib/gambas3/
+  mv -v usr/share/gambas3/info/gb.xml.rpc.* ${pkgdir}/usr/share/gambas3/info/
+}
+
+package_gambas3-gb-xml-xslt() {
+  depends=('gambas3-gb-xml' 'libxslt')
+  pkgdesc="XML-XSLT component"
+
+  cd ${srcdir}/fakeinstall
+  
+  create_dirs
+  
+  mv -v usr/lib/gambas3/gb.xml.xslt.* ${pkgdir}/usr/lib/gambas3/
+  mv -v usr/share/gambas3/info/gb.xml.xslt.* ${pkgdir}/usr/share/gambas3/info/
 }
 
 package_gambas3-gb-xml() {
   depends=('gambas3-runtime' 'gcc-libs')
   pkgdesc="XML component"
 
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
+  cd ${srcdir}/fakeinstall
+  
+  create_dirs
+  
+  mv -v usr/lib/gambas3/gb.xml.* ${pkgdir}/usr/lib/gambas3/
+  mv -v usr/share/gambas3/info/gb.xml.* ${pkgdir}/usr/share/gambas3/info/
+}
 
-  ## cleanup the workaround
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml/src/html
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
+package_gambas3-runtime() {
+  depends=('libffi' 'xdg-utils')
+  pkgdesc="Runtime environment"
+  conflicts=('gambas3-gb-gui')
+  replaces=('gambas3-gb-gui')
+  provides=("gambas3-gb-gui=${pkgver}")
+  install=gambas3-runtime.install
   
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml/src/xslt
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
+  cd ${srcdir}/fakeinstall
   
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml/src/rpc
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
+  create_dirs
   
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
+  install -dm755 ${pkgdir}/usr/bin
+  install -dm755 ${pkgdir}/usr/share/gambas3/{icons,mime}
+   
+  mv -v usr/bin/gb{r,x}3 ${pkgdir}/usr/bin
+  mv -v usr/lib/gambas3/* ${pkgdir}/usr/lib/gambas3/
+  mv -v usr/share/gambas3/info/* ${pkgdir}/usr/share/gambas3/info/
+  install -m644 ${srcdir}/${pkgbase}-${pkgver}/main/mime/* ${pkgdir}/usr/share/gambas3/mime/
+  install -m644 ${pkgdir}/usr/share/gambas3/mime/application-x-gambas3.png ${pkgdir}/usr/share/gambas3/icons/
 }
 
-package_gambas3-gb-xml-html() {
-  depends=('gambas3-gb-xml')
-  pkgdesc="HTML generator component"
+package_gambas3-devel() {
+  depends=('gambas3-runtime')
+  pkgdesc="Development environment"
 
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
+  cd ${srcdir}/fakeinstall
 
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml/src/html
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
+  install -dm755 ${pkgdir}/usr/bin
 
-  ## cleanup the workaround
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
+  mv -v usr/bin/gb{a,c,i}3 ${pkgdir}/usr/bin
 }
 
-package_gambas3-gb-xml-rpc() {
-  depends=('gambas3-gb-xml' 'gambas3-gb-net-curl')
-  pkgdesc="XML-RPC component"
+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}/fakeinstall
 
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.net
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.net.curl
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml
-  make -j1 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 ${pkgdir}/usr/lib/gambas3/gb.xml.[c-l]*
-  rm ${pkgdir}/usr/lib/gambas3/gb.xml.[s-x]*
-  rm ${pkgdir}/usr/share/gambas3/info/gb.xml.[h-l]*
-  rm ${pkgdir}/usr/share/gambas3/info/gb.xml.xslt.*
-  ##
+  install -dm755 ${pkgdir}/usr/{bin,share/{applications,pixmaps}}
+
+  mv -v usr/bin/gambas3* ${pkgdir}/usr/bin/
+  
+  install -m644 ${srcdir}/${pkgbase}-${pkgver}/app/desktop/gambas3.desktop ${pkgdir}/usr/share/applications/
+  install -m644 ${srcdir}/${pkgbase}-${pkgver}/app/desktop/gambas3.png ${pkgdir}/usr/share/pixmaps/
 }
 
-package_gambas3-gb-xml-xslt() {
-  depends=('gambas3-gb-xml' 'libxslt')
-  pkgdesc="XML-XSLT component"
+package_gambas3-script() {
+  depends=('gambas3-devel')
+  pkgdesc="Scripter and server programs support"
+  install=gambas3-script.install
 
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
+  cd ${srcdir}/fakeinstall
 
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml/src/xslt
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
+  install -dm755 ${pkgdir}/usr/bin
+  install -dm755 ${pkgdir}/usr/share/gambas3/mime
 
-  ## cleanup the workaround
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
+  mv -v usr/bin/gb{s,w}3* ${pkgdir}/usr/bin/
+  install -m644 ${srcdir}/${pkgbase}-${pkgver}/app/mime/* ${pkgdir}/usr/share/gambas3/mime/
 }
 
+package_gambas3-examples() {
+  depends=(${_components[@]} 'gambas3-runtime' 'gambas3-ide')
+  pkgdesc="Applications examples"
+
+  cd ${srcdir}/fakeinstall
+
+  install -dm755 ${pkgdir}/usr/share/gambas3
+  
+  mv -v usr/share/gambas3/examples ${pkgdir}/usr/share/gambas3/
+}
diff --git a/community/llvm-amdgpu-snapshot/PKGBUILD b/community/llvm-amdgpu-snapshot/PKGBUILD
index b36b421f0..229057db1 100644
--- a/community/llvm-amdgpu-snapshot/PKGBUILD
+++ b/community/llvm-amdgpu-snapshot/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 82677 2013-01-22 22:38:25Z lcarlier $
+# $Id: PKGBUILD 85846 2013-03-07 17:52:47Z lcarlier $
 # Maintainer: Laurent Carlier <lordheavym@gmail.com>
 # Contributor: Thomas Dziedzic < gostrc at gmail >
 # Contributor: Roberto Alsina <ralsina@kde.org>
@@ -7,7 +7,7 @@
 # Contributor: Tomas Wilhelmsson <tomas.wilhelmsson@gmail.com>
 
 pkgname=llvm-amdgpu-snapshot
-pkgver=20121230
+pkgver=20130307
 pkgrel=1
 pkgdesc='Low Level Virtual Machine with AMDGPU enabled to build r600g shader llvm support'
 arch=('i686' 'x86_64')
@@ -15,11 +15,11 @@ url="http://llvm.org"
 license=('custom:University of Illinois/NCSA Open Source License')
 depends=('libffi' 'python2' 'ocaml')
 conflicts=('llvm')
-source=(ftp://ftp.archlinux.org/other/community/llvm-amdgpu/llvm-amdgpu-master.20121230.tar.gz)
-md5sums=('dbf9ad608a68fc758192c3d4716600d9')
+source=(ftp://ftp.archlinux.org/other/community/llvm-amdgpu/llvm-amdgpu-master.${pkgver}.tar.gz)
+md5sums=('6aa900855eea11b6dce86fb04d813d75')
 
 build() {
-  cd "$srcdir"/llvm-master
+  cd "$srcdir"/llvm-*
 
   sed -i 's/python$/python2/' utils/llvm-build/llvm-build
 
@@ -39,7 +39,7 @@ build() {
     --enable-shared \
     --enable-libffi \
     --enable-targets=all \
-    --enable-experimental-targets=AMDGPU \
+    --enable-experimental-targets=R600 \
     --disable-expensive-checks \
     --with-binutils-include=/usr/include \
     --$_optimized_switch-optimized
@@ -48,7 +48,7 @@ build() {
 }
 
 package() {
-  cd "$srcdir"/llvm-master
+  cd "$srcdir"/llvm-*
 
   make DESTDIR="$pkgdir" install
 
@@ -59,3 +59,4 @@ package() {
 
   install -Dm644 LICENSE.TXT "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }
+
diff --git a/community/midori/PKGBUILD b/community/midori/PKGBUILD
index 6c3e654e2..ef74002e1 100644
--- a/community/midori/PKGBUILD
+++ b/community/midori/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 83885 2013-02-06 11:36:28Z arodseth $
+# $Id: PKGBUILD 85855 2013-03-07 19:55:29Z bpiotrowski $
 # Maintainer:  Alexander Rødseth <rodseth@gmail.com>
 # Maintainer:  Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 # Contributor: Andreas Radke <andyrtr@archlinux.org>
@@ -7,21 +7,21 @@
 # Contributor: Bartłomiej Piotrowski <barthalion@gmail.com>
 
 pkgname=midori
-pkgver=0.4.8
+pkgver=0.4.9
 pkgrel=1
 pkgdesc='Lightweight web browser based on Gtk WebKit'
 arch=('x86_64' 'i686' 'mips64el')
 url='http://www.twotoasts.de/index.php?/pages/midori_summary.html'
 license=('LGPL2.1')
 install=midori.install
-depends=('libzeitgeist' 'libwebkit' 'libnotify' 'libxss' 'libunique' 'hicolor-icon-theme' 'desktop-file-utils' 'gcr')
-makedepends=('libxml2' 'intltool' 'gtk-doc' 'librsvg' 'python2' 'vala')
+depends=('libzeitgeist' 'libwebkit' 'libnotify' 'libxss' 'libunique' 'hicolor-icon-theme' 'desktop-file-utils')
+makedepends=('libxml2' 'intltool' 'gtk-doc' 'librsvg' 'python2' 'vala' 'gcr')
 optdepends=('gstreamer0.10-ugly-plugins: HTML5 videos support'
             'aria2: download utility')
 options=('!emptydirs')
 source=("http://archive.xfce.org/src/apps/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2"
         'fix-copying.patch')
-sha256sums=('40bf23f84a3537f54d7eb45df1da40ebef54c321b1b34d0d0c8e45bb0cce5e9f'
+sha256sums=('f01e5dc45e94f909e48f0dd62cc4afedd80710769fdf98bc4e0b38d4ef0abc11'
             'd4395ac994d8d614f93ae4863bbf6289b1980e0ed84aef52ca95a678b464b959')
 
 build() {
diff --git a/community/nodejs/PKGBUILD b/community/nodejs/PKGBUILD
index 26f43133b..01b9f6cd2 100644
--- a/community/nodejs/PKGBUILD
+++ b/community/nodejs/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 84970 2013-02-26 15:56:33Z bpiotrowski $
+# $Id: PKGBUILD 85853 2013-03-07 19:25:26Z bpiotrowski $
 # Maintainer:  Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 # Contributor: Thomas Dziedzic < gostrc at gmail >
 # Contributor: James Campos <james.r.campos@gmail.com>
@@ -8,7 +8,7 @@
 # Contributor: TIanyi Cui <tianyicui@gmail.com>
 
 pkgname=nodejs
-pkgver=0.8.21
+pkgver=0.8.22
 pkgrel=1
 pkgdesc='Evented I/O for V8 javascript'
 arch=('i686' 'x86_64' 'mips64el')
@@ -18,7 +18,7 @@ depends=('openssl' 'python2')
 checkdepends=('curl') # curl used for check()
 options=('!emptydirs')
 source=(http://nodejs.org/dist/v${pkgver}/node-v${pkgver}.tar.gz)
-sha256sums=('e526f56d22bb2ebee5a607bd1e7a16dcc8530b916e3a372192e6cd5fa97d08e6')
+sha256sums=('3f61152cf5cd8fc1ab5c6c18101819841b947da79e1e44b51418c0ad2e6db8e8')
 
 build() {
   cd node-v${pkgver}
diff --git a/community/parole/PKGBUILD b/community/parole/PKGBUILD
index 31e5c98d8..03c6c4f9f 100644
--- a/community/parole/PKGBUILD
+++ b/community/parole/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 82109 2013-01-08 18:48:48Z spupykin $
+# $Id: PKGBUILD 85793 2013-03-07 10:58:27Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: TDY <tdy@gmx.com>
 
 pkgname=parole
-pkgver=0.4.0
+pkgver=0.5.0
 pkgrel=1
 pkgdesc="A modern media player based on the GStreamer framework"
 arch=('i686' 'x86_64' 'mips64el')
@@ -18,7 +18,7 @@ options=('!libtool')
 install=parole.install
 #source=(http://archive.xfce.org/src/apps/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2)
 source=(http://git.xfce.org/apps/parole/snapshot/parole-$pkgver.tar.bz2)
-md5sums=('df05ff037c6063c905e5bb40a50b6e0f')
+md5sums=('03eb2df373adaae56959a548553ef72e')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/proftpd/PKGBUILD b/community/proftpd/PKGBUILD
index a37843c18..9c2e1fcf8 100644
--- a/community/proftpd/PKGBUILD
+++ b/community/proftpd/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 83174 2013-01-27 16:24:33Z pierre $
+# $Id: PKGBUILD 85857 2013-03-07 20:00:38Z bpiotrowski $
 # Maintainer:
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgname=proftpd
-pkgver=1.3.4b
-pkgrel=3
+pkgver=1.3.4c
+pkgrel=1
 epoch=1
 pkgdesc="A high-performance, scalable FTP server"
 arch=('i686' 'x86_64')
@@ -16,8 +16,8 @@ install=${pkgname}.install
 source=(ftp://ftp.proftpd.org/distrib/source/${pkgname}-${pkgver}.tar.gz{,.asc}
         'proftpd' 'proftpd.logrotate' 'proftpd.conf.d' 'proftpd.service'
         'proftpd.tmpfiles')
-md5sums=('0871e0b93c9c3c88ca950b6d9a04aed2'
-         'e5b9bd78029a15f82994efcb7ed2e9fb'
+md5sums=('65f61e953bea249f8377e681594143a5'
+         '7f00fb7bf757b4bd795afdf0a3f5e556'
          'c439a0a1dbc21b604d8382da87aa021b'
          'ddb09eb13131becdf0e081eef413116b'
          '71d5932b0461c318ed68c2c0c2660736'
diff --git a/community/rekonq/PKGBUILD b/community/rekonq/PKGBUILD
index 5b5e4069b..54f3f8f59 100644
--- a/community/rekonq/PKGBUILD
+++ b/community/rekonq/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 85307 2013-02-28 20:20:52Z andrea $
+# $Id: PKGBUILD 85861 2013-03-07 20:16:32Z andrea $
 # Maintainer: Peter Lewis <plewis@aur.archlinux.org>
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Panagiotis Papadopoulos <pano_90 AT gmx DOT net>
 
 pkgname=rekonq
-pkgver=2.2
+pkgver=2.2.1
 pkgrel=1
 pkgdesc='A WebKit based web browser for KDE'
 arch=('i686' 'x86_64' 'mips64el')
@@ -15,7 +15,7 @@ makedepends=('cmake' 'automoc4')
 optdepends=('qca-ossl: to use the sync handler')
 install=${pkgname}.install
 source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
-sha256sums=('f5050bc7386807f1b91f0f90209397be08f67a95824e77ce78d1c1779015aeda')
+sha256sums=('aa3939af5038491c612bb113647e8a1110720d6fc1038c8c71e6cf1308efa47b')
 
 build(){
   mkdir build
diff --git a/community/ruby-cairo/PKGBUILD b/community/ruby-cairo/PKGBUILD
index 583df259d..afff0a151 100644
--- a/community/ruby-cairo/PKGBUILD
+++ b/community/ruby-cairo/PKGBUILD
@@ -1,15 +1,16 @@
-# $Id: PKGBUILD 72819 2012-06-22 21:24:20Z arodseth $
+# $Id: PKGBUILD 85839 2013-03-07 17:16:18Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Brad Fanella <bradfanella@archlinux.us>
 
 pkgname=ruby-cairo
 pkgver=1.12.2
-pkgrel=1
-pkgdesc="Ruby bindings for cairo"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://cairographics.org/rcairo/"
+pkgrel=3
+pkgdesc='Ruby bindings for cairo'
+arch=('x86_64' 'i686' 'mips64el')
+# http://cairographics.org/releases/
+url='http://cairographics.org/rcairo/'
 license=('GPL')
-depends=('ruby' 'cairo>=1.2.0')
+depends=('ruby' 'cairo')
 makedepends=('ruby-pkgconfig')
 source=("http://cairographics.org/releases/rcairo-$pkgver.tar.gz")
 sha256sums=('f071d6ccb12cb6dc1fc91eb086d6150ce779930fe5af38a6987e378c809362c5')
diff --git a/community/smem/PKGBUILD b/community/smem/PKGBUILD
index eebe70656..609433f98 100644
--- a/community/smem/PKGBUILD
+++ b/community/smem/PKGBUILD
@@ -1,5 +1,6 @@
-# $Id: PKGBUILD 81012 2012-12-10 02:49:14Z dreisner $
-# Maintainer: Dave Reisner <d@falconindy.com>
+# $Id: PKGBUILD 85778 2013-03-07 06:30:34Z cinelli $
+# Maintainer:  Federico Cinelli <cinelli@aur.archlinux.org>
+# Contributor: Dave Reisner <d@falconindy.com>
 # Contributor: Isaac Dupree <id@isaac.cedarswampstudios.org>
 # Contributor: Sebastien Duquette <ekse.0x@gmail.com>
 
@@ -12,21 +13,21 @@ license=("GPL")
 depends=('python2')
 optdepends=('python2-matplotlib: for chart generation')
 arch=('i686' 'x86_64' 'mips64el')
-source=("http://www.selenic.com/smem/download/${pkgname}-${pkgver}.tar.gz")
+source=("http://www.selenic.com/smem/download/$pkgname-$pkgver.tar.gz")
 md5sums=('b8975840a08172ba8a1abbe7cb202dfe')
 
 build() {
-  cd $srcdir/$pkgname-$pkgver
+  cd "$srcdir/$pkgname-$pkgver"
 
   sed -i '1s/python$/python2/' smem
   make smemcap
 }
 
 package() {
-  cd $srcdir/$pkgname-$pkgver
+  cd "$srcdir/$pkgname-$pkgver"
 
-  install -Dm755 smem $pkgdir/usr/bin/smem
-  install -Dm755 smemcap $pkgdir/usr/bin/smemcap
-  install -Dm644 smem.8 "$pkgdir"/usr/share/man/man8/smem.8
+  install -Dm755 smem "$pkgdir/usr/bin/smem"
+  install -Dm755 smemcap "$pkgdir/usr/bin/smemcap"
+  install -Dm644 smem.8 "$pkgdir/usr/share/man/man8/smem.8"
 }
 
diff --git a/community/winegame/PKGBUILD b/community/winegame/PKGBUILD
deleted file mode 100644
index 6df4bc45a..000000000
--- a/community/winegame/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# $Id: PKGBUILD 85556 2013-03-03 05:22:22Z cinelli $
-# Maintainer:  Federico Cinelli <cinelli@aur.archlinux.com>
-# Contributor: Laurent Carlier <lordheavym@gmail.com>
-
-pkgname=winegame
-pkgver=0.2.0
-pkgrel=2
-pkgdesc="An interface to install windows programs in Wine"
-arch=('i686' 'x86_64')
-install=winegame.install
-url="http://code.google.com/p/winegame/"
-license=('GPL3')
-depends=('winestuff')
-optdepends=('libnotify: Desktop notifaction support')
-makedepends=('cmake')
-source=("http://winegame.googlecode.com/files/$pkgname-$pkgver.tar.gz")
-md5sums=('631dd218707c6efb2901ef1206092538')
-
-if [[ $CARCH == "x86_64" ]]; then
-  depends+=('lib32-mesa-libgl')
-fi
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  mkdir -p build
-  cd build
-
-  cmake -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr ..
-
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver/build"
-
-  make DESTDIR="$pkgdir/" install
-}
-
diff --git a/community/winegame/winegame.install b/community/winegame/winegame.install
deleted file mode 100644
index e85c7ac73..000000000
--- a/community/winegame/winegame.install
+++ /dev/null
@@ -1,9 +0,0 @@
-post_install () {
-  update-desktop-database -q
-}
-post_upgrade () {
-  post_install
-}
-post_removal () {
-  post_install
-}
diff --git a/community/winestuff/PKGBUILD b/community/winestuff/PKGBUILD
deleted file mode 100644
index d08334eb8..000000000
--- a/community/winestuff/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 85554 2013-03-03 05:17:35Z cinelli $
-# Maintainer: Federico Cinelli <cinelli@aur.archlinux.org>
-# Contributor: Laurent Carlier <lordheavym@gmail.com>
-
-pkgname=winestuff
-pkgver=0.2.0
-pkgrel=3
-pkgdesc="Library utility for winegame"
-arch=('i686' 'x86_64')
-url="http://code.google.com/p/winegame/"
-license=('LGPL2.1')
-makedepends=('qt4' 'cmake')
-source=("http://winegame.googlecode.com/files/$pkgname-$pkgver.tar.gz")
-md5sums=('a01f55d30bd0e1dcee3a44aa0fa5369d')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  mkdir -p build
-  cd build
-
-  cmake -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr ..
-
-  make translations
-  make
-}
-
-package() {
-  depends=('qt4' 'fuseiso' 'winetricks')
-
-  cd "$srcdir/$pkgname-$pkgver/build"
-
-  make DESTDIR="$pkgdir" install
-}
-
diff --git a/extra/cmake/PKGBUILD b/extra/cmake/PKGBUILD
index 1347d3cf6..f6ae39a5c 100644
--- a/extra/cmake/PKGBUILD
+++ b/extra/cmake/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 179103 2013-03-03 17:28:31Z dreisner $
+# $Id: PKGBUILD 179599 2013-03-07 17:46:37Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=cmake
 pkgver=2.8.10.2
-pkgrel=4
+pkgrel=5
 pkgdesc="A cross-platform open-source make system"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.cmake.org/"
@@ -13,12 +13,17 @@ depends=('curl' 'libarchive' 'shared-mime-info')
 makedepends=('qt5-base' 'emacs')
 optdepends=('qt5-base: cmake-gui')
 install="${pkgname}.install"
-source=("http://www.cmake.org/files/v2.8/${pkgname}-${pkgver}.tar.gz")
-md5sums=('097278785da7182ec0aea8769d06860c')
+source=("http://www.cmake.org/files/v2.8/${pkgname}-${pkgver}.tar.gz"
+        'qt4.patch')
+md5sums=('097278785da7182ec0aea8769d06860c'
+         '4933fbe934d3989923f0a60a78dac44e')
 
 build() {
   cd ${pkgname}-${pkgver}
 
+  # qmake refers to Qt5
+  patch -p1 -i "${srcdir}"/qt4.patch
+
   # Qt is built with reduce-relocations
   export CFLAGS="${CFLAGS} -fPIC"
   export CXXFLAGS="${CXXFLAGS} -fPIC"
diff --git a/extra/cmake/qt4.patch b/extra/cmake/qt4.patch
new file mode 100644
index 000000000..0518681f0
--- /dev/null
+++ b/extra/cmake/qt4.patch
@@ -0,0 +1,11 @@
+--- cmake-2.8.10.2/Modules/FindQt4.cmake~	2013-03-07 16:50:35.388399689 +0000
++++ cmake-2.8.10.2/Modules/FindQt4.cmake	2013-03-07 16:51:35.017991029 +0000
+@@ -497,7 +497,7 @@
+ # check for qmake
+ # Debian uses qmake-qt4
+ # macports' Qt uses qmake-mac
+-find_program(QT_QMAKE_EXECUTABLE NAMES qmake qmake4 qmake-qt4 qmake-mac
++find_program(QT_QMAKE_EXECUTABLE NAMES qmake4 qmake-qt4 qmake-mac
+   PATHS
+     ENV QTDIR
+     "[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\${qt_install_version};InstallDir]"
diff --git a/extra/network-manager-applet/PKGBUILD b/extra/network-manager-applet/PKGBUILD
index f9560b02c..e5a8359ac 100644
--- a/extra/network-manager-applet/PKGBUILD
+++ b/extra/network-manager-applet/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 169995 2012-10-30 23:01:10Z heftig $
+# $Id: PKGBUILD 179567 2013-03-07 11:54:25Z foutrelis $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Arjan Timmerman <arjan@archlinux.org>
 # Contributor: Wael Nasreddine <gandalf@siemens-mobiles.org>
@@ -6,7 +6,7 @@
 # Contributor: Will Rea <sillywilly@gmail.com>
 
 pkgname=network-manager-applet
-pkgver=0.9.6.4
+pkgver=0.9.8.0
 pkgrel=1
 pkgdesc="GNOME frontends to NetWorkmanager"
 arch=('i686' 'x86_64' 'mips64el')
@@ -19,7 +19,7 @@ optdepends=('gnome-bluetooth: for PAN/DUN support')
 options=('!libtool' '!emptydirs')
 install=network-manager-applet.install
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/0.9/$pkgname-$pkgver.tar.xz)
-sha256sums=('ae5667b165f0f83244ec76c42f17553ec2169f5250e144904994497137374141')
+sha256sums=('1afb6e736870ba95132bf0d211c46849e02a820ba3902a059a616be888053590')
 
 build() {
   cd ${pkgname}-${pkgver}
diff --git a/extra/networkmanager-openconnect/PKGBUILD b/extra/networkmanager-openconnect/PKGBUILD
index 3ecac5e28..b406ae5d5 100644
--- a/extra/networkmanager-openconnect/PKGBUILD
+++ b/extra/networkmanager-openconnect/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 166519 2012-09-09 15:40:55Z heftig $
+# $Id: PKGBUILD 179569 2013-03-07 11:54:27Z foutrelis $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=networkmanager-openconnect
-pkgver=0.9.6.2
+pkgver=0.9.8.0
 pkgrel=1
 pkgdesc="NetworkManager VPN integration for openconnect"
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,7 +14,7 @@ optdepends=('network-manager-applet: GNOME frontends to NetWorkmanager')
 options=('!libtool')
 install=$pkgname.install
 source=(http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-openconnect/0.9/NetworkManager-openconnect-${pkgver}.tar.xz)
-sha256sums=('3f53d87dbeb00fc841ef5981e6f1a1a192c65d273386246d48245cca84fa41b0')
+sha256sums=('c12487f57ad2f2386db4b103397e3cb66bf34ba589c5f48c3c5ec0b5547e4d9b')
 
 build() {
   cd NetworkManager-openconnect-${pkgver}
diff --git a/extra/networkmanager-openvpn/PKGBUILD b/extra/networkmanager-openvpn/PKGBUILD
index 09a4db99c..5a963c814 100644
--- a/extra/networkmanager-openvpn/PKGBUILD
+++ b/extra/networkmanager-openvpn/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 166520 2012-09-09 15:41:00Z heftig $
+# $Id: PKGBUILD 179570 2013-03-07 11:54:28Z foutrelis $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=networkmanager-openvpn
-pkgver=0.9.6.0
+pkgver=0.9.8.0
 pkgrel=1
 pkgdesc="NetworkManager VPN plugin for OpenVPN"
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,7 +14,7 @@ optdepends=('network-manager-applet: GNOME frontends to NetWorkmanager')
 install=networkmanager-openvpn.install
 options=('!libtool')
 source=(http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-openvpn/0.9/NetworkManager-openvpn-${pkgver}.tar.xz)
-sha256sums=('8fb88705793399574b3de2af93f87b63c0eae342d549a1c79bc59f6a1fad87a3')
+sha256sums=('4196f4c124426884657c8d0e2578f4d35205b8981a46bf645fd599fb238395ce')
 
 build() {
   cd NetworkManager-openvpn-${pkgver}
diff --git a/extra/networkmanager-pptp/PKGBUILD b/extra/networkmanager-pptp/PKGBUILD
index 475d9920a..ed14fbc72 100644
--- a/extra/networkmanager-pptp/PKGBUILD
+++ b/extra/networkmanager-pptp/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 171364 2012-11-17 11:09:07Z ibiru $
+# $Id: PKGBUILD 179571 2013-03-07 11:54:28Z foutrelis $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=networkmanager-pptp
-pkgver=0.9.6.0
-pkgrel=2
+pkgver=0.9.8.0
+pkgrel=1
 pkgdesc="NetworkManager VPN plugin for pptp "
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
@@ -14,20 +14,17 @@ optdepends=('network-manager-applet: GNOME frontends to NetWorkmanager')
 options=('!libtool')
 install=networkmanager-pptp.install
 source=(http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-pptp/0.9/NetworkManager-pptp-${pkgver}.tar.xz
-        fix-path-to-auth-dialog.patch
         gtk_table_to_gtk_grid.patch)
-sha256sums=('a84cbbf24827229e3dd3611bbde191398275c3b7ecd03913047197644f27a2b4'
-            '35f9c2cb4d046c8f215617e1a0bfd8551965bd0655af0cd25f89c17ea5e9081a'
+sha256sums=('34d0981462d8948ace0dd4f49478c86017b53516afbbf62e2a4c6c0adc679cc8'
             '17c194c605bca780bf657711e9cff910c63ab27eae70c11cb6c53e9c75ad3215')
 
 build() {
   cd NetworkManager-pptp-${pkgver}
-  patch -Np1 -i ../fix-path-to-auth-dialog.patch
   patch -Np1 -i ../gtk_table_to_gtk_grid.patch
   ./configure --prefix=/usr \
-  	--sysconfdir=/etc \
-	--libexecdir=/usr/lib/networkmanager \
-	--disable-static
+        --sysconfdir=/etc \
+        --libexecdir=/usr/lib/networkmanager \
+        --disable-static
   make
 }
 
diff --git a/extra/networkmanager-pptp/fix-path-to-auth-dialog.patch b/extra/networkmanager-pptp/fix-path-to-auth-dialog.patch
deleted file mode 100644
index 28a4a5a44..000000000
--- a/extra/networkmanager-pptp/fix-path-to-auth-dialog.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From a2f52d4455bd81732b6b3c16bdab206c56818c07 Mon Sep 17 00:00:00 2001
-From: Clemens Buchacher <drizzd@aon.at>
-Date: Sun, 1 Jul 2012 18:35:50 +0200
-Subject: [PATCH] fix path to auth-dialog
-
-
-Signed-off-by: Clemens Buchacher <drizzd@aon.at>
----
- nm-pptp-service.name.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/nm-pptp-service.name.in b/nm-pptp-service.name.in
-index 9ee79b8..ea5f0e5 100644
---- a/nm-pptp-service.name.in
-+++ b/nm-pptp-service.name.in
-@@ -4,6 +4,6 @@ service=org.freedesktop.NetworkManager.pptp
- program=@LIBEXECDIR@/nm-pptp-service
- 
- [GNOME]
--auth-dialog=nm-pptp-auth-dialog
-+auth-dialog=@LIBEXECDIR@/nm-pptp-auth-dialog
- properties=libnm-pptp-properties
- supports-external-ui-mode=true
--- 
-1.7.11.1
-
diff --git a/extra/networkmanager-vpnc/PKGBUILD b/extra/networkmanager-vpnc/PKGBUILD
index de1ce6fee..e6745b3d3 100644
--- a/extra/networkmanager-vpnc/PKGBUILD
+++ b/extra/networkmanager-vpnc/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 166522 2012-09-09 15:41:10Z heftig $
+# $Id: PKGBUILD 179572 2013-03-07 11:54:29Z foutrelis $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=networkmanager-vpnc
-pkgver=0.9.6.0
+pkgver=0.9.8.0
 pkgrel=1
 pkgdesc="NetworkManager VPN plugin for vpnc"
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,7 +14,7 @@ optdepends=('network-manager-applet: GNOME frontends to NetWorkmanager')
 options=('!libtool')
 install=networkmanager-vpnc.install
 source=(http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-vpnc/0.9/NetworkManager-vpnc-${pkgver}.tar.xz)
-sha256sums=('6c8e35862330e17ee8f4dc44b1ac47470da703e436d339c7b3e2dac7d1b148a2')
+sha256sums=('e4504c569315c20f2468995f073123a787cdb66695d321f20f994abd1d7eb1c1')
 
 build() {
   cd NetworkManager-vpnc-${pkgver}
diff --git a/extra/networkmanager/PKGBUILD b/extra/networkmanager/PKGBUILD
index 6d99f897d..07894d957 100644
--- a/extra/networkmanager/PKGBUILD
+++ b/extra/networkmanager/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 177957 2013-02-12 12:13:58Z thomas $
+# $Id: PKGBUILD 179568 2013-03-07 11:54:26Z foutrelis $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Maintainer: Jan de Groot <jgc@archlinxu.org>
 # Contributor: Wael Nasreddine <gandalf@siemens-mobiles.org>
@@ -8,15 +8,15 @@
 
 pkgname=networkmanager
 _pkgname=NetworkManager
-pkgver=0.9.6.4
-pkgrel=2
+pkgver=0.9.8.0
+pkgrel=1
 pkgdesc="Network Management daemon"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://www.gnome.org/projects/$_pkgname/"
 depends=(dbus-glib iproute2 libnl nss polkit udev wpa_supplicant ppp dhclient
          libsoup systemd)
-makedepends=(intltool dhcpcd iptables gobject-introspection)
+makedepends=(intltool dhcpcd iptables gobject-introspection gtk-doc)
 optdepends=('modemmanager: for modem management service'
             'dhcpcd: alternative DHCP client; does not support DHCPv6'
             'iptables: Connection sharing'
@@ -27,25 +27,18 @@ options=('!libtool')
 backup=('etc/NetworkManager/NetworkManager.conf')
 install=networkmanager.install
 source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver:0:3}/$_pkgname-$pkgver.tar.xz
-        NetworkManager.conf disable_set_hostname.patch dnsmasq-path.patch
-        nm-polkit-permissive.patch repair-signals.patch systemd-sleep.patch)
-sha256sums=('511b411e055d187bc8f26c519fdb3e55e07fc40d4adecbbec623c0249380a7eb'
+        NetworkManager.conf disable_set_hostname.patch dnsmasq-path.patch)
+sha256sums=('c366bcded6354d8186ad93c05d26d6a20bc550aa0391f974704e7a60e9f6096b'
             '44b048804c7c0b8b3b0c29b8632b6ad613c397d0a1635ec918e10c0fbcdadf21'
             '25056837ea92e559f09563ed817e3e0cd9333be861b8914e45f62ceaae2e0460'
-            '65124505048cc8396daf0242c9f5d532fa669b4bbca305998c248ab2329490cb'
-            'e23b651a90ef62d515921953b4c6779538d35a737fb74c266b7fce94d62fdb06'
-            'a1c65a09e5e8ecb1004ab7922517aa7fbc9700dc61e3b2fd348d3d7c23808ce6'
-            '24c181ab69e769e703e45f64a552add5df5de22fbcd8899d588add053674420a')
+            '65124505048cc8396daf0242c9f5d532fa669b4bbca305998c248ab2329490cb')
 
 build() {
   cd $_pkgname-$pkgver
 
   patch -Np1 -i ../disable_set_hostname.patch
   patch -Np1 -i ../dnsmasq-path.patch
-  patch -Np1 -i ../nm-polkit-permissive.patch
-  patch -Np1 -i ../repair-signals.patch # FS#31115
-  patch -Np1 -i ../systemd-sleep.patch
-  AUTOPOINT="intltoolize -f -c --automake" autoreconf -fi
+  #AUTOPOINT="intltoolize -f -c --automake" autoreconf -fi
 
   ./configure \
     --prefix=/usr \
@@ -53,7 +46,6 @@ build() {
     --localstatedir=/var \
     --libexecdir=/usr/lib/networkmanager \
     --with-crypto=nss \
-    --with-distro=arch \
     --with-dhclient=/usr/sbin/dhclient \
     --with-dhcpcd=/usr/sbin/dhcpcd \
     --with-iptables=/usr/sbin/iptables \
@@ -63,7 +55,9 @@ build() {
     --with-session-tracking=systemd \
     --disable-static \
     --enable-more-warnings=no \
-    --disable-wimax
+    --disable-wimax \
+    --enable-modify-system \
+    --enable-doc
 
   make
 }
diff --git a/extra/networkmanager/nm-polkit-permissive.patch b/extra/networkmanager/nm-polkit-permissive.patch
deleted file mode 100644
index 1ac406224..000000000
--- a/extra/networkmanager/nm-polkit-permissive.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up NetworkManager-0.8.997/policy/org.freedesktop.NetworkManager.policy.in.permissive NetworkManager-0.8.997/policy/org.freedesktop.NetworkManager.policy.in
---- NetworkManager-0.8.997/policy/org.freedesktop.NetworkManager.policy.in.permissive	2011-03-24 14:21:35.100912222 -0500
-+++ NetworkManager-0.8.997/policy/org.freedesktop.NetworkManager.policy.in	2011-03-24 14:21:49.916726997 -0500
-@@ -95,7 +95,7 @@
-     <_message>System policy prevents modification of network settings for all users</_message>
-     <defaults>
-       <allow_inactive>no</allow_inactive>
--      <allow_active>auth_admin_keep</allow_active>
-+      <allow_active>yes</allow_active>
-     </defaults>
-   </action>
- 
diff --git a/extra/networkmanager/repair-signals.patch b/extra/networkmanager/repair-signals.patch
deleted file mode 100644
index cf1319dc5..000000000
--- a/extra/networkmanager/repair-signals.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 64342a313ef497fca8a4fb7567900d4a1460065f Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Thu, 13 Sep 2012 09:32:53 +0000
-Subject: core: wait until we daemonized before setting up signals (bgo #683932)
-
-If we mask signals before daemonizing, the daemon process will not be
-able to handle them, and thus would be unkillable with anything other
-than SIGKILL.
----
-diff --git a/src/main.c b/src/main.c
-index 8bc6d3f..5b82cfa 100644
---- a/src/main.c
-+++ b/src/main.c
-@@ -401,10 +401,6 @@ main (int argc, char *argv[])
- 		exit (1);
- 	}
- 
--	/* Set up unix signal handling */
--	if (!setup_signals ())
--		exit (1);
--
- 	/* Set locale to be able to use environment variables */
- 	setlocale (LC_ALL, "");
- 
-@@ -501,6 +497,10 @@ main (int argc, char *argv[])
- 			wrote_pidfile = TRUE;
- 	}
- 
-+	/* Set up unix signal handling - before creating threads, but after daemonizing! */
-+	if (!setup_signals ())
-+		exit (1);
-+
- 	if (g_fatal_warnings) {
- 		GLogLevelFlags fatal_mask;
- 
---
-cgit v0.9.0.2-2-gbebe
diff --git a/extra/networkmanager/systemd-sleep.patch b/extra/networkmanager/systemd-sleep.patch
deleted file mode 100644
index 3470d4654..000000000
--- a/extra/networkmanager/systemd-sleep.patch
+++ /dev/null
@@ -1,616 +0,0 @@
-From b444d31cba5b8ac0c9771cc5a246dfd3af9dfd00 Mon Sep 17 00:00:00 2001
-From: Matthias Clasen <mclasen@redhat.com>
-Date: Tue, 9 Oct 2012 00:36:35 -0400
-Subject: [PATCH] core: factor out the upower suspend/resume code (bgo
- #677694)
-
-Factor the code that listens for upower sleeping and resuming
-signals out into a class code NMSleepMonitor.
-
-core: add a systemd suspend/resume monitor (bgo #677694)
-
-This implementation uses a delay inhibitor to get systemd to
-emit PrepareForSleep, and then emits ::Sleeping and ::Resuming
-when receiving the before/after PrepareForSleep emissions.
-
-core: DBusGConnections are not GObjects
-
-Introduced in 64fd8eea7706038e5d38c8463a1c765ed9331db2.
-
-core: fix suspend/resume signal names which the manager listens for
-
-Introduced in 64fd8eea7706038e5d38c8463a1c765ed9331db2; but honestly
-I also thought GObject lower-cased signal names since it munges them
-for - and _ too.  Apparently not.
----
- configure.ac                   |   2 +-
- src/Makefile.am                |   9 +-
- src/nm-manager.c               |  40 +++-----
- src/nm-sleep-monitor-systemd.c | 217 +++++++++++++++++++++++++++++++++++++++++
- src/nm-sleep-monitor-upower.c  | 151 ++++++++++++++++++++++++++++
- src/nm-sleep-monitor.h         |  46 +++++++++
- 6 files changed, 437 insertions(+), 28 deletions(-)
- create mode 100644 src/nm-sleep-monitor-systemd.c
- create mode 100644 src/nm-sleep-monitor-upower.c
- create mode 100644 src/nm-sleep-monitor.h
-
-diff --git a/configure.ac b/configure.ac
-index e76e193..9152c23 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -327,7 +327,7 @@ PKG_CHECK_MODULES(GUDEV, gudev-1.0 >= 147)
- AC_SUBST(GUDEV_CFLAGS)
- AC_SUBST(GUDEV_LIBS)
- 
--PKG_CHECK_MODULES(GIO, gio-2.0)
-+PKG_CHECK_MODULES(GIO, gio-unix-2.0)
- AC_SUBST(GIO_CFLAGS)
- AC_SUBST(GIO_LIBS)
- 
-diff --git a/src/Makefile.am b/src/Makefile.am
-index b155209..ba7d2d6 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -191,6 +191,7 @@ NetworkManager_SOURCES = \
- 		nm-session-monitor.h \
- 		nm-session-utils.c \
- 		nm-session-utils.h \
-+		nm-sleep-monitor.h \
- 		nm-connection-provider.h \
- 		nm-connection-provider.c \
- 		nm-dispatcher.c \
-@@ -201,13 +202,18 @@ NetworkManager_SOURCES += nm-connectivity.c nm-connectivity.h
- endif
- 
- if SESSION_TRACKING_SYSTEMD
--NetworkManager_SOURCES += nm-session-monitor-systemd.c
-+NetworkManager_SOURCES += \
-+		nm-session-monitor-systemd.c \
-+		nm-sleep-monitor-systemd.c
- else
- if SESSION_TRACKING_CK
- NetworkManager_SOURCES += nm-session-monitor-ck.c
- else
- NetworkManager_SOURCES += nm-session-monitor-null.c
- endif
-+
-+# UPower suspend/resume used whenever systemd is not enabled
-+NetworkManager_SOURCES += nm-sleep-monitor-upower.c
- endif
- 
- nm-access-point-glue.h: $(top_srcdir)/introspection/nm-access-point.xml
-@@ -283,6 +289,7 @@ BUILT_SOURCES = \
- NetworkManager_CPPFLAGS = \
- 	$(DBUS_CFLAGS) \
- 	$(GLIB_CFLAGS) \
-+	$(GIO_CFLAGS) \
- 	$(GUDEV_CFLAGS) \
- 	$(LIBNL_CFLAGS) \
- 	$(GMODULE_CFLAGS) \
-diff --git a/src/nm-manager.c b/src/nm-manager.c
-index 618c4ed..c8ce115 100644
---- a/src/nm-manager.c
-+++ b/src/nm-manager.c
-@@ -69,6 +69,7 @@
- #include "nm-device-factory.h"
- #include "wifi-utils.h"
- #include "nm-enum-types.h"
-+#include "nm-sleep-monitor.h"
- 
- #if WITH_CONCHECK
- #include "nm-connectivity.h"
-@@ -78,8 +79,6 @@
- #define NM_AUTOIP_DBUS_SERVICE "org.freedesktop.nm_avahi_autoipd"
- #define NM_AUTOIP_DBUS_IFACE   "org.freedesktop.nm_avahi_autoipd"
- 
--#define UPOWER_DBUS_SERVICE "org.freedesktop.UPower"
--
- static gboolean impl_manager_get_devices (NMManager *manager,
-                                           GPtrArray **devices,
-                                           GError **err);
-@@ -228,7 +227,7 @@ typedef struct {
- 	guint modem_removed_id;
- 
- 	DBusGProxy *aipd_proxy;
--	DBusGProxy *upower_proxy;
-+	NMSleepMonitor *sleep_monitor;
- 
- 	GSList *auth_chains;
- 
-@@ -3288,16 +3287,16 @@ impl_manager_sleep (NMManager *self,
- }
- 
- static void
--upower_sleeping_cb (DBusGProxy *proxy, gpointer user_data)
-+sleeping_cb (DBusGProxy *proxy, gpointer user_data)
- {
--	nm_log_dbg (LOGD_SUSPEND, "Received UPower sleeping signal");
-+	nm_log_dbg (LOGD_SUSPEND, "Received sleeping signal");
- 	_internal_sleep (NM_MANAGER (user_data), TRUE);
- }
- 
- static void
--upower_resuming_cb (DBusGProxy *proxy, gpointer user_data)
-+resuming_cb (DBusGProxy *proxy, gpointer user_data)
- {
--	nm_log_dbg (LOGD_SUSPEND, "Received UPower resuming signal");
-+	nm_log_dbg (LOGD_SUSPEND, "Received resuming signal");
- 	_internal_sleep (NM_MANAGER (user_data), FALSE);
- }
- 
-@@ -4049,8 +4048,8 @@ dispose (GObject *object)
- 	if (priv->aipd_proxy)
- 		g_object_unref (priv->aipd_proxy);
- 
--	if (priv->upower_proxy)
--		g_object_unref (priv->upower_proxy);
-+	if (priv->sleep_monitor)
-+		g_object_unref (priv->sleep_monitor);
- 
- 	if (priv->fw_monitor) {
- 		if (priv->fw_monitor_id)
-@@ -4372,23 +4371,12 @@ nm_manager_init (NMManager *manager)
- 	} else
- 		nm_log_warn (LOGD_AUTOIP4, "could not initialize avahi-autoipd D-Bus proxy");
- 
--	/* upower sleep/wake handling */
--	priv->upower_proxy = dbus_g_proxy_new_for_name (g_connection,
--	                                                UPOWER_DBUS_SERVICE,
--	                                                "/org/freedesktop/UPower",
--	                                                "org.freedesktop.UPower");
--	if (priv->upower_proxy) {
--		dbus_g_proxy_add_signal (priv->upower_proxy, "Sleeping", G_TYPE_INVALID);
--		dbus_g_proxy_connect_signal (priv->upower_proxy, "Sleeping",
--		                             G_CALLBACK (upower_sleeping_cb),
--		                             manager, NULL);
--
--		dbus_g_proxy_add_signal (priv->upower_proxy, "Resuming", G_TYPE_INVALID);
--		dbus_g_proxy_connect_signal (priv->upower_proxy, "Resuming",
--		                             G_CALLBACK (upower_resuming_cb),
--		                             manager, NULL);
--	} else
--		nm_log_warn (LOGD_SUSPEND, "could not initialize UPower D-Bus proxy");
-+	/* sleep/wake handling */
-+	priv->sleep_monitor = nm_sleep_monitor_get ();
-+	g_signal_connect (priv->sleep_monitor, "sleeping",
-+	                  G_CALLBACK (sleeping_cb), manager);
-+	g_signal_connect (priv->sleep_monitor, "resuming",
-+	                  G_CALLBACK (resuming_cb), manager);
- 
- 	/* Listen for authorization changes */
- 	nm_auth_changed_func_register (authority_changed_cb, manager);
-diff --git a/src/nm-sleep-monitor-systemd.c b/src/nm-sleep-monitor-systemd.c
-new file mode 100644
-index 0000000..70adc89
---- /dev/null
-+++ b/src/nm-sleep-monitor-systemd.c
-@@ -0,0 +1,217 @@
-+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-+/* This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License along
-+ * with this program; if not, write to the Free Software Foundation, Inc.,
-+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-+ *
-+ * (C) Copyright 2012 Red Hat, Inc.
-+ * Author: Matthias Clasen <mclasen@redhat.com>
-+ */
-+
-+#include "config.h"
-+#include <errno.h>
-+#include <string.h>
-+#include <sys/stat.h>
-+#include <dbus/dbus-glib-lowlevel.h>
-+#include <dbus/dbus-glib.h>
-+#include <gio/gio.h>
-+#include <gio/gunixfdlist.h>
-+
-+#include "nm-logging.h"
-+#include "nm-dbus-manager.h"
-+
-+#include "nm-sleep-monitor.h"
-+
-+#define SD_NAME              "org.freedesktop.login1"
-+#define SD_PATH              "/org/freedesktop/login1"
-+#define SD_INTERFACE         "org.freedesktop.login1.Manager"
-+
-+
-+struct _NMSleepMonitor {
-+	GObject parent_instance;
-+
-+	GDBusProxy *sd_proxy;
-+	gint inhibit_fd;
-+};
-+
-+struct _NMSleepMonitorClass {
-+	GObjectClass parent_class;
-+
-+	void (*sleeping) (NMSleepMonitor *monitor);
-+	void (*resuming) (NMSleepMonitor *monitor);
-+};
-+
-+
-+enum {
-+	SLEEPING,
-+	RESUMING,
-+	LAST_SIGNAL,
-+};
-+static guint signals[LAST_SIGNAL] = {0};
-+
-+G_DEFINE_TYPE (NMSleepMonitor, nm_sleep_monitor, G_TYPE_OBJECT);
-+
-+/********************************************************************/
-+
-+static void
-+inhibit_done (GObject      *source,
-+              GAsyncResult *result,
-+              gpointer      user_data)
-+{
-+	GDBusProxy *sd_proxy = G_DBUS_PROXY (source);
-+	NMSleepMonitor *self = user_data;
-+	GError *error = NULL;
-+	GVariant *res;
-+	GUnixFDList *fd_list;
-+
-+	res = g_dbus_proxy_call_with_unix_fd_list_finish (sd_proxy, &fd_list, result, &error);
-+	if (!res) {
-+		nm_log_warn (LOGD_SUSPEND, "Inhibit failed: %s", error->message);
-+		g_error_free (error);
-+	} else {
-+		if (!fd_list || g_unix_fd_list_get_length (fd_list) != 1)
-+			nm_log_warn (LOGD_SUSPEND, "Didn't get a single fd back");
-+
-+		self->inhibit_fd = g_unix_fd_list_get (fd_list, 0, NULL);
-+
-+		nm_log_dbg (LOGD_SUSPEND, "Inhibitor fd is %d", self->inhibit_fd);
-+		g_object_unref (fd_list);
-+		g_variant_unref (res);
-+	}
-+}
-+
-+static void
-+take_inhibitor (NMSleepMonitor *self)
-+{
-+	g_assert (self->inhibit_fd == -1);
-+
-+	nm_log_dbg (LOGD_SUSPEND, "Taking systemd sleep inhibitor");
-+	g_dbus_proxy_call_with_unix_fd_list (self->sd_proxy,
-+	                                     "Inhibit",
-+	                                     g_variant_new ("(ssss)",
-+	                                                    "sleep",
-+	                                                    g_get_user_name (),
-+	                                                    "inhibited",
-+	                                                    "delay"),
-+	                                     0,
-+	                                     G_MAXINT,
-+	                                     NULL,
-+	                                     NULL,
-+	                                     inhibit_done,
-+	                                     self);
-+}
-+
-+static gboolean
-+drop_inhibitor (NMSleepMonitor *self)
-+{
-+	if (self->inhibit_fd >= 0) {
-+		nm_log_dbg (LOGD_SUSPEND, "Dropping systemd sleep inhibitor");
-+		close (self->inhibit_fd);
-+		self->inhibit_fd = -1;
-+		return TRUE;
-+	}
-+	return FALSE;
-+}
-+
-+static void
-+signal_cb (GDBusProxy  *proxy,
-+           const gchar *sendername,
-+           const gchar *signalname,
-+           GVariant    *args,
-+           gpointer     data)
-+{
-+	NMSleepMonitor *self = data;
-+	gboolean is_about_to_suspend;
-+
-+	if (strcmp (signalname, "PrepareForSleep") != 0)
-+		return;
-+
-+	g_variant_get (args, "(b)", &is_about_to_suspend);
-+	nm_log_dbg (LOGD_SUSPEND, "Received PrepareForSleep signal: %d", is_about_to_suspend);
-+
-+	if (is_about_to_suspend) {
-+		g_signal_emit (self, signals[SLEEPING], 0);
-+		drop_inhibitor (self);
-+	} else {
-+		take_inhibitor (self);
-+		g_signal_emit (self, signals[RESUMING], 0);
-+	}
-+}
-+
-+static void
-+nm_sleep_monitor_init (NMSleepMonitor *self)
-+{
-+	GDBusConnection *bus;
-+
-+	self->inhibit_fd = -1;
-+	bus = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, NULL);
-+	self->sd_proxy = g_dbus_proxy_new_sync (bus, 0, NULL,
-+	                                        SD_NAME, SD_PATH, SD_INTERFACE,
-+	                                        NULL, NULL);
-+	g_object_unref (bus);
-+	g_signal_connect (self->sd_proxy, "g-signal", G_CALLBACK (signal_cb), self);
-+	take_inhibitor (self);
-+}
-+
-+static void
-+finalize (GObject *object)
-+{
-+	NMSleepMonitor *self = NM_SLEEP_MONITOR (object);
-+
-+	drop_inhibitor (self);
-+	if (self->sd_proxy)
-+		g_object_unref (self->sd_proxy);
-+
-+	if (G_OBJECT_CLASS (nm_sleep_monitor_parent_class)->finalize != NULL)
-+		G_OBJECT_CLASS (nm_sleep_monitor_parent_class)->finalize (object);
-+}
-+
-+static void
-+nm_sleep_monitor_class_init (NMSleepMonitorClass *klass)
-+{
-+	GObjectClass *gobject_class;
-+
-+	gobject_class = G_OBJECT_CLASS (klass);
-+
-+	gobject_class->finalize = finalize;
-+
-+	signals[SLEEPING] = g_signal_new (NM_SLEEP_MONITOR_SLEEPING,
-+	                                  NM_TYPE_SLEEP_MONITOR,
-+	                                  G_SIGNAL_RUN_LAST,
-+	                                  G_STRUCT_OFFSET (NMSleepMonitorClass, sleeping),
-+	                                  NULL,                   /* accumulator      */
-+	                                  NULL,                   /* accumulator data */
-+	                                  g_cclosure_marshal_VOID__VOID,
-+	                                  G_TYPE_NONE, 0);
-+	signals[RESUMING] = g_signal_new (NM_SLEEP_MONITOR_RESUMING,
-+	                                  NM_TYPE_SLEEP_MONITOR,
-+	                                  G_SIGNAL_RUN_LAST,
-+	                                  G_STRUCT_OFFSET (NMSleepMonitorClass, resuming),
-+	                                  NULL,                   /* accumulator      */
-+	                                  NULL,                   /* accumulator data */
-+	                                  g_cclosure_marshal_VOID__VOID,
-+	                                  G_TYPE_NONE, 0);
-+}
-+
-+NMSleepMonitor *
-+nm_sleep_monitor_get (void)
-+{
-+	static NMSleepMonitor *singleton = NULL;
-+
-+	if (singleton)
-+		return g_object_ref (singleton);
-+
-+	singleton = NM_SLEEP_MONITOR (g_object_new (NM_TYPE_SLEEP_MONITOR, NULL));
-+	return singleton;
-+}
-+
-+/* ---------------------------------------------------------------------------------------------------- */
-diff --git a/src/nm-sleep-monitor-upower.c b/src/nm-sleep-monitor-upower.c
-new file mode 100644
-index 0000000..3c93f66
---- /dev/null
-+++ b/src/nm-sleep-monitor-upower.c
-@@ -0,0 +1,151 @@
-+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-+/* This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License along
-+ * with this program; if not, write to the Free Software Foundation, Inc.,
-+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-+ *
-+ * (C) Copyright 2012 Red Hat, Inc.
-+ * Author: Matthias Clasen <mclasen@redhat.com>
-+ */
-+
-+#include "config.h"
-+#include <errno.h>
-+#include <string.h>
-+#include <sys/stat.h>
-+#include <dbus/dbus-glib-lowlevel.h>
-+#include <dbus/dbus-glib.h>
-+#include <gio/gio.h>
-+#include "nm-logging.h"
-+#include "nm-dbus-manager.h"
-+
-+#include "nm-sleep-monitor.h"
-+
-+#define UPOWER_DBUS_SERVICE "org.freedesktop.UPower"
-+
-+struct _NMSleepMonitor {
-+        GObject parent_instance;
-+
-+        DBusGProxy *upower_proxy;
-+};
-+
-+struct _NMSleepMonitorClass {
-+        GObjectClass parent_class;
-+
-+        void (*sleeping) (NMSleepMonitor *monitor);
-+        void (*resuming) (NMSleepMonitor *monitor);
-+};
-+
-+
-+enum {
-+        SLEEPING,
-+        RESUMING,
-+        LAST_SIGNAL,
-+};
-+static guint signals[LAST_SIGNAL] = {0};
-+
-+G_DEFINE_TYPE (NMSleepMonitor, nm_sleep_monitor, G_TYPE_OBJECT);
-+
-+/********************************************************************/
-+
-+static void
-+upower_sleeping_cb (DBusGProxy *proxy, gpointer user_data)
-+{
-+        nm_log_dbg (LOGD_SUSPEND, "Received UPower sleeping signal");
-+        g_signal_emit (user_data, signals[SLEEPING], 0);
-+}
-+
-+static void
-+upower_resuming_cb (DBusGProxy *proxy, gpointer user_data)
-+{
-+        nm_log_dbg (LOGD_SUSPEND, "Received UPower resuming signal");
-+        g_signal_emit (user_data, signals[RESUMING], 0);
-+}
-+
-+static void
-+nm_sleep_monitor_init (NMSleepMonitor *self)
-+{
-+        NMDBusManager *dbus_mgr;
-+        DBusGConnection *bus;
-+
-+        dbus_mgr = nm_dbus_manager_get ();
-+        bus = nm_dbus_manager_get_connection (dbus_mgr);
-+        self->upower_proxy = dbus_g_proxy_new_for_name (bus,
-+                                                        UPOWER_DBUS_SERVICE,
-+                                                        "/org/freedesktop/UPower",
-+                                                        "org.freedesktop.UPower");
-+        if (self->upower_proxy) {
-+                dbus_g_proxy_add_signal (self->upower_proxy, "Sleeping", G_TYPE_INVALID);
-+                dbus_g_proxy_connect_signal (self->upower_proxy, "Sleeping",
-+                                             G_CALLBACK (upower_sleeping_cb),
-+                                             self, NULL);
-+
-+                dbus_g_proxy_add_signal (self->upower_proxy, "Resuming", G_TYPE_INVALID);
-+                dbus_g_proxy_connect_signal (self->upower_proxy, "Resuming",
-+                                             G_CALLBACK (upower_resuming_cb),
-+                                             self, NULL);
-+        } else
-+                nm_log_warn (LOGD_SUSPEND, "could not initialize UPower D-Bus proxy");
-+        g_object_unref (dbus_mgr);
-+}
-+
-+static void
-+finalize (GObject *object)
-+{
-+        NMSleepMonitor *self = NM_SLEEP_MONITOR (object);
-+
-+        if (self->upower_proxy)
-+                g_object_unref (self->upower_proxy);
-+
-+        if (G_OBJECT_CLASS (nm_sleep_monitor_parent_class)->finalize != NULL)
-+                G_OBJECT_CLASS (nm_sleep_monitor_parent_class)->finalize (object);
-+}
-+
-+static void
-+nm_sleep_monitor_class_init (NMSleepMonitorClass *klass)
-+{
-+        GObjectClass *gobject_class;
-+
-+        gobject_class = G_OBJECT_CLASS (klass);
-+
-+        gobject_class->finalize = finalize;
-+
-+        signals[SLEEPING] = g_signal_new (NM_SLEEP_MONITOR_SLEEPING,
-+                                          NM_TYPE_SLEEP_MONITOR,
-+                                          G_SIGNAL_RUN_LAST,
-+                                          G_STRUCT_OFFSET (NMSleepMonitorClass, sleeping),
-+                                          NULL,                   /* accumulator      */
-+                                          NULL,                   /* accumulator data */
-+                                          g_cclosure_marshal_VOID__VOID,
-+                                          G_TYPE_NONE, 0);
-+        signals[RESUMING] = g_signal_new (NM_SLEEP_MONITOR_RESUMING,
-+                                          NM_TYPE_SLEEP_MONITOR,
-+                                          G_SIGNAL_RUN_LAST,
-+                                          G_STRUCT_OFFSET (NMSleepMonitorClass, resuming),
-+                                          NULL,                   /* accumulator      */
-+                                          NULL,                   /* accumulator data */
-+                                          g_cclosure_marshal_VOID__VOID,
-+                                          G_TYPE_NONE, 0);
-+}
-+
-+NMSleepMonitor *
-+nm_sleep_monitor_get (void)
-+{
-+        static NMSleepMonitor *singleton = NULL;
-+
-+        if (singleton)
-+                return g_object_ref (singleton);
-+
-+        singleton = NM_SLEEP_MONITOR (g_object_new (NM_TYPE_SLEEP_MONITOR, NULL));
-+        return singleton;
-+}
-+
-+/* ---------------------------------------------------------------------------------------------------- */
-diff --git a/src/nm-sleep-monitor.h b/src/nm-sleep-monitor.h
-new file mode 100644
-index 0000000..173e6a1
---- /dev/null
-+++ b/src/nm-sleep-monitor.h
-@@ -0,0 +1,46 @@
-+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-+/* This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License along
-+ * with this program; if not, write to the Free Software Foundation, Inc.,
-+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-+ *
-+ * (C) Copyright 2012 Red Hat, Inc.
-+ * Author: Matthias Clasen <mclasen@redhat.com>
-+ */
-+
-+#ifndef NM_SLEEP_MONITOR_H
-+#define NM_SLEEP_MONITOR_H
-+
-+#include <glib-object.h>
-+
-+G_BEGIN_DECLS
-+
-+#define NM_TYPE_SLEEP_MONITOR         (nm_sleep_monitor_get_type ())
-+#define NM_SLEEP_MONITOR(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), NM_TYPE_SLEEP_MONITOR, NMSleepMonitor))
-+#define NM_SLEEP_MONITOR_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST ((k), NM_TYPE_SLEEP_MONITOR, NMSleepMonitorClass))
-+#define NM_SLEEP_MONITOR_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), NM_TYPE_SLEEP_MONITOR, NMSleepMonitorClass))
-+#define NM_IS_SLEEP_MONITOR(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), NM_TYPE_SLEEP_MONITOR))
-+#define NM_IS_SLEEP_MONITOR_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), NM_TYPE_SLEEP_MONITOR))
-+
-+#define NM_SLEEP_MONITOR_SLEEPING "sleeping"
-+#define NM_SLEEP_MONITOR_RESUMING "resuming"
-+
-+typedef struct _NMSleepMonitor         NMSleepMonitor;
-+typedef struct _NMSleepMonitorClass    NMSleepMonitorClass;
-+
-+GType           nm_sleep_monitor_get_type     (void) G_GNUC_CONST;
-+NMSleepMonitor *nm_sleep_monitor_get          (void);
-+
-+G_END_DECLS
-+
-+#endif /* NM_SLEEP_MONITOR_H */
-+
--- 
-1.7.12.2
-
diff --git a/extra/pyqt/PKGBUILD b/extra/pyqt/PKGBUILD
index 90ef1e5be..6bdb3304d 100644
--- a/extra/pyqt/PKGBUILD
+++ b/extra/pyqt/PKGBUILD
@@ -1,33 +1,35 @@
-# $Id: PKGBUILD 178976 2013-03-01 10:23:02Z andrea $
+# $Id: PKGBUILD 179560 2013-03-07 08:19:05Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
 # Contributor: riai <riai@bigfoot.com> Ben <ben@benmazer.net>
 
 pkgbase=pyqt
 pkgname=('pyqt-common' 'pyqt' 'python2-pyqt')
-pkgver=4.9.6
-pkgrel=2
+pkgver=4.10
+pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url="http://riverbankcomputing.co.uk/software/pyqt/intro"
 license=('GPL')
-makedepends=('qt4' 'python-sip' 'python-dbus' 'python2-sip' 'phonon' 'mesa'
+makedepends=('python-sip' 'python-dbus' 'python2-sip' 'phonon' 'mesa'
              'python2-opengl' 'qt-assistant-compat' 'qtwebkit' 'python2-dbus')
 source=("http://downloads.sourceforge.net/${pkgbase}/PyQt-x11-gpl-${pkgver}.tar.gz")
-md5sums=('514e1f9597771dc732ba75ba9fa5c6b6')
+md5sums=('b5953e96d0f82d322d0cba008163321e')
 
 build() {
-  . /etc/profile.d/qt4.sh
-
   cp -r PyQt-x11-gpl-${pkgver} Py2Qt-x11-gpl-${pkgver}
 
   cd PyQt-x11-gpl-${pkgver}
   python configure.py \
     --confirm-license \
-    --qsci-api
+    --qsci-api \
+    -q /usr/bin/qmake-qt4
 
   # Thanks Gerardo for the rpath fix
   find -name 'Makefile' | xargs sed -i 's|-Wl,-rpath,/usr/lib||g;s|-Wl,-rpath,.* ||g'
 
+  # Ugly workaround to fix build
+  sed -i 's|/usr/include/qt4/phonon|/usr/include/phonon|' phonon/Makefile
+
   make
 
   ### Python2 version ###
@@ -35,16 +37,21 @@ build() {
   python2 configure.py \
     --confirm-license \
     -v /usr/share/sip \
-    --qsci-api
+    --qsci-api \
+    -q /usr/bin/qmake-qt4
 
   # Thanks Gerardo for the rpath fix
   find -name 'Makefile' | xargs sed -i 's|-Wl,-rpath,/usr/lib||g;s|-Wl,-rpath,.* ||g'
+  
+  # Ugly workaround to fix build
+  sed -i 's|/usr/include/qt4/phonon|/usr/include/phonon|' phonon/Makefile
 
   make
 }
 
 package_pyqt-common(){
   pkgdesc="Common PyQt files shared between pyqt and python2-pyqt"
+  depends=('qt4')
   
   cd PyQt-x11-gpl-${pkgver}
   make -C pyrcc DESTDIR="${pkgdir}" install
diff --git a/extra/qscintilla/PKGBUILD b/extra/qscintilla/PKGBUILD
index ae6938469..6583f720d 100644
--- a/extra/qscintilla/PKGBUILD
+++ b/extra/qscintilla/PKGBUILD
@@ -1,24 +1,22 @@
-# $Id: PKGBUILD 178983 2013-03-01 10:23:58Z andrea $
+# $Id: PKGBUILD 179562 2013-03-07 08:19:46Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Douglas Soares de Andrade <dsa@aur.archlinux.org>
 
 pkgbase=qscintilla
 pkgname=('qscintilla' 'python-qscintilla' 'python2-qscintilla'
          'python-qscintilla-common')
-pkgver=2.7
-pkgrel=2
+pkgver=2.7.1
+pkgrel=1
 license=('GPL')
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.riverbankcomputing.co.uk/software/qscintilla/intro"
 makedepends=('python2-pyqt' 'pyqt' 'chrpath')
 source=("http://downloads.sourceforge.net/pyqt/QScintilla-gpl-${pkgver}.tar.gz"
         'configure.py-objdir-support.diff')
-md5sums=('a3857d75a2b332e0460131e0aa4cc4b5'
-         '8cf9c06252e2f11ab00e62848e322fd3')
+md5sums=('da8939b5679a075e30c6632e54dc5abf'
+         'eae1bd23117c5f1f7f172a1c1e11f600')
 
 build() {
-    . /etc/profile.d/qt4.sh
-
     cd "${srcdir}/QScintilla-gpl-${pkgver}"
     patch -Np1 -i "${srcdir}/configure.py-objdir-support.diff"
 
@@ -26,18 +24,18 @@ build() {
     qmake qscintilla.pro
     make
     
-    cd ../designer-Qt4
+    cd ../designer-Qt4Qt5
     qmake designer.pro INCLUDEPATH+=../Qt4Qt5 QMAKE_LIBDIR+=../Qt4Qt5
     make
 
     cd ../
     cp -rf Python Python2
     cd Python
-    python3 configure.py -n ../Qt4Qt5/ -o ../Qt4Qt5/ -c -p 4
+    python3 configure.py -n ../Qt4Qt5/ -o ../Qt4Qt5/ -c
     make
 
     cd ../Python2
-    python2 configure.py -n ../Qt4Qt5/ -o ../Qt4Qt5/ -c -p 4
+    python2 configure.py -n ../Qt4Qt5/ -o ../Qt4Qt5/ -c
     make    
 }
 
@@ -48,7 +46,7 @@ package_qscintilla() {
     cd "${srcdir}/QScintilla-gpl-${pkgver}/Qt4Qt5"
     make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
 
-    cd "${srcdir}/QScintilla-gpl-${pkgver}/designer-Qt4"
+    cd "${srcdir}/QScintilla-gpl-${pkgver}/designer-Qt4Qt5"
     make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
 }
 
diff --git a/extra/qscintilla/configure.py-objdir-support.diff b/extra/qscintilla/configure.py-objdir-support.diff
index b595de18c..8d4a7c99d 100644
--- a/extra/qscintilla/configure.py-objdir-support.diff
+++ b/extra/qscintilla/configure.py-objdir-support.diff
@@ -1,39 +1,21 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02_configure.dpatch by Torsten Marek <shlomme@debian.org>
-##
-## DP: patch the configure script for the Python bindings to support object dir builds
-
-@DPATCH@
-Index: qscintilla2-2.4.2/Python/configure.py
-===================================================================
---- qscintilla2-2.4.2.orig/Python/configure.py	2010-01-20 20:56:09.000000000 +0100
-+++ qscintilla2-2.4.2/Python/configure.py	2010-01-27 22:54:35.603870417 +0100
-@@ -33,6 +33,7 @@
+--- QScintilla-gpl-2.7.1/Python/configure.py~	2013-03-07 08:09:00.678704222 +0000
++++ QScintilla-gpl-2.7.1/Python/configure.py	2013-03-07 08:11:48.860880852 +0000
+@@ -29,6 +29,8 @@
  import glob
  import optparse
  
 +src_dir = os.path.dirname(os.path.abspath(__file__))
++
+ try:
+     import sysconfig
+ except ImportError:
+@@ -455,6 +457,9 @@
  
- # Import SIP's configuration module so that we have access to the error
- # reporting.  Then try and import the configuration modules for both PyQt3 and
-@@ -162,7 +163,7 @@
-     if os.access(sciglobal, os.F_OK):
-         # Get the QScintilla version string.
-         _, sciversstr = sipconfig.read_version(sciglobal, "QScintilla", "QSCINTILLA_VERSION", "QSCINTILLA_VERSION_STR")
--
-+        return # Debian: do not check for the installed version, we're good this way.
-         if glob.glob(os.path.join(opts.qscilibdir, "*qscintilla2*")):
-             # Because we include the Python bindings with the C++ code we can
-             # reasonably force the same version to be used and not bother about
-@@ -232,9 +233,9 @@
-     argv.append(buildfile)
- 
-     if pyqt.pyqt_version >= 0x040000:
--        argv.append("sip/qscimod4.sip")
-+        argv.append(os.path.join(src_dir, "sip/qscimod4.sip"))
-     else:
--        argv.append("sip/qscimod3.sip")
-+        argv.append(os.path.join(src_dir, "sip/qscimod3.sip"))
- 
-     os.system(" ".join(argv))
- 
+     # Get the QScintilla version string.
+     sciversstr = read_define(sciglobal, 'QSCINTILLA_VERSION_STR')
++
++    return # Debian: do not check for the installed version, we're good this way.
++
+     if sciversstr is None:
+         error(
+                 "The QScintilla version number could not be determined by "
diff --git a/extra/sip/PKGBUILD b/extra/sip/PKGBUILD
index 3cd0bd5e0..1e6c90882 100644
--- a/extra/sip/PKGBUILD
+++ b/extra/sip/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 178483 2013-02-24 11:42:18Z andrea $
+# $Id: PKGBUILD 179558 2013-03-07 08:18:46Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
 # Contributor: riai <riai@bigfoot.com>, Ben <ben@benmazer.net>
 
 pkgbase=sip
 pkgname=('sip' 'python-sip' 'python2-sip')
-pkgver=4.14.3
+pkgver=4.14.4
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.riverbankcomputing.com/software/sip/"
 license=('custom:"sip"')
 makedepends=('python' 'python2')
 source=("http://downloads.sourceforge.net/pyqt/${pkgbase}-${pkgver}.tar.gz")
-md5sums=('d5f037800bfd727e40ed818260943772')
+md5sums=('ae2d73ef43b8b0f7a9913561e9651706')
 
 build() {
   cp -r ${pkgbase}-${pkgver} python2-${pkgbase}-${pkgver}
diff --git a/extra/xerces-c/PKGBUILD b/extra/xerces-c/PKGBUILD
index 0def61317..85a3e1222 100644
--- a/extra/xerces-c/PKGBUILD
+++ b/extra/xerces-c/PKGBUILD
@@ -1,24 +1,29 @@
-# $Id: PKGBUILD 173034 2012-12-09 09:01:09Z andrea $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer: Geoffroy Carrier <geoffroy@archlinux.org>
+# $Id: PKGBUILD 179593 2013-03-07 13:22:22Z andrea $
+# Maintainer:
+# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Contributor: Geoffroy Carrier <geoffroy@archlinux.org>
 # Contributor: Roman Kyrylych <Roman.Kyrylych@gmail.com>
-# Contributor: pukyxd
 
 pkgname=xerces-c
 pkgver=3.1.1
 pkgrel=3
-pkgdesc="A validating XML parser written in a portable subset of C++."
+pkgdesc="A validating XML parser written in a portable subset of C++"
 arch=('i686' 'x86_64' 'mips64el')
-url="http://xerces.apache.org/xerces-c"
-license=("APACHE")
+url="http://xerces.apache.org/xerces-c/"
+license=('APACHE')
 depends=('gcc-libs' 'curl')
 options=('!libtool')
-source=("http://apache.osuosl.org/xerces/c/3/sources/xerces-c-${pkgver}.tar.gz")
+source=("http://apache.osuosl.org/xerces/c/3/sources/${pkgname}-${pkgver}.tar.gz")
 md5sums=('6a8ec45d83c8cfb1584c5a5345cb51ae')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc
+  cd ${pkgname}-${pkgver}
+  ./configure --prefix=/usr \
+    --sysconfdir=/etc
   make
-  make DESTDIR=${pkgdir}/ install
+}
+
+package() {
+  cd ${pkgname}-${pkgver}
+  make DESTDIR="${pkgdir}/" install
 }
diff --git a/libre/blender-libre/PKGBUILD b/libre/blender-libre/PKGBUILD
index 94e5b00cb..a721f66f9 100644
--- a/libre/blender-libre/PKGBUILD
+++ b/libre/blender-libre/PKGBUILD
@@ -1,33 +1,28 @@
 # $Id$
-# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
+# Maintainer: Márcio Silva <coadde@lavabit.com>
 
-spacenav=false
-pkgbase=blender-libre
-pkgflag=-libre
-if [ $spacenav == true ]; then
-  pkgname=(
-    blender-spacenav-libre
-  )
-  spndesc=' (with spacenav support)'
+_spacenav=false
+_pkgname=blender-libre
+_pkgflag=libre
+if [ $_spacenav == true ]; then
+  pkgname=blender-spacenav-libre
+  _spndesc=' (with spacenav support)'
 else
-  pkgname=(
-    blender-libre
-  )
-  spndesc=''
+  pkgname=blender-libre
+  _spndesc=''
 fi
-pkgdesc="Fully integrated 3D graphics creation suite, without nonfree cuda-toolkit and redcode image format support$spndesc"
-pkgver=2.66
+epoch=7
+pkgver=2.66a
+_pyver=3.3
 pkgrel=2
-pkgaev=6
+pkgdesc="Fully integrated 3D graphics creation suite, without nonfree povray, cuda and redcode support$_spndesc"
 arch=(
   i686
   x86_64
   mips64el
 )
-license=(
-  GPL
-)
-url="http://www.${pkgbase%$pkgflag}.org"
+license=GPL
+url="http://www.${_pkgname%-$_pkgflag}.org"
 depends=(
   desktop-file-utils
   ffmpeg
@@ -45,41 +40,29 @@ depends=(
   shared-mime-info
   xdg-utils
 )
-if [ $spacenav == true ]; then
+if [ $_spacenav == true ]; then
   depends+=(
-    # dependencies tree of binaries software (root) #
     libspnav
   )
 fi
-optdepends=(
-  'bullet: for Physics Simulation in BGE'
-)
+optdepends='bullet: for Rigid Bodies and Physics Simulation'
 makedepends=(
-  # make dependencies tree (root) #
   boost
   cmake
   mesa
   subversion
 )
 provides=(
-  ${pkgbase%$pkgflag}=$pkgaev:$pkgver
-)
-conflicts=(
-  ${pkgbase%$pkgflag}
-)
-replaces=(
-  ${pkgbase%$pkgflag}
-)
-install=$pkgbase.install
-source=(
-  "http://download.${pkgbase%$pkgflag}.org/source/${pkgbase%$pkgflag}-$pkgver.tar.gz"
-)
-sha512sums=(
-  f76499edc5f8179a42ec6d6334c6fa03f830570d054061ae40c2e8e1ec0a0090efcbb642f4f7f3b99d3941d4c4b791a0e357a275acf1b3ac251d58906f23b2b4
+  ${_pkgname%-$_pkgflag}=$epoch:$pkgver
 )
+conflicts=${_pkgname%-$_pkgflag}
+replaces=${_pkgname%-$_pkgflag}
+install=$_pkgname.install
+source="http://download.${_pkgname%-$_pkgflag}.org/source/${_pkgname%-$_pkgflag}-$pkgver.tar.gz"
+sha512sums=ea5def031daa220991f6165950234b311e8ae3baa6785d6226efefa90b64e1b83e8635f71f9a7fc7ae23923ce313d5ae48ffa0c54cf7ff794a4fb2dacbe8714f
 
 build() {
-  cd $srcdir/${pkgbase%$pkgflag}-$pkgver
+  cd $srcdir/${_pkgname%-$_pkgflag}-$pkgver
 
   mkdir build
   cd build
@@ -90,10 +73,10 @@ build() {
     -DCMAKE_BUILD_TYPE=Release\
     -DCMAKE_INSTALL_PREFIX=/usr\
     -DOPENIMAGEIO_ROOT_DIR=/usr\
-    -DPYTHON_INCLUDE_DIRS=/usr/include/python3.3m\
+    -DPYTHON_INCLUDE_DIRS=/usr/include/python${_pyver}m\
     -DPYTHON_LIBPATH=/usr/lib\
-    -DPYTHON_LIBRARY=python3.3m\
-    -DPYTHON_VERSION=3.3\
+    -DPYTHON_LIBRARY=python${_pyver}m\
+    -DPYTHON_VERSION=${_pyver}\
     $DSUPPORT_SSE2_BUILD\
     -DWITH_CODEC_FFMPEG=ON\
     -DWITH_CODEC_SNDFILE=ON\
@@ -110,12 +93,17 @@ build() {
     -DWITH_PLAYER=ON\
     -DWITH_PYTHON_INSTALL=OFF\
     -DWITH_SYSTEM_GLEW=ON
+
   setarch $CARCH make $MAKEFLAGS
   setarch $CARCH make
 }
 
 package() {
-  cd $srcdir/${pkgbase%$pkgflag}-$pkgver/build
+  cd $srcdir/${_pkgname%-$_pkgflag}-$pkgver/build
   setarch $CARCH make DESTDIR=$pkgdir install
-  setarch $CARCH python -m compileall $pkgdir/usr/share/${pkgbase%$pkgflag}
+  setarch $CARCH python -m compileall $pkgdir/usr/share/${_pkgname%-$_pkgflag}
+  # drop nonfree povray render support
+  rm -vrf $pkgdir/usr/share/${_pkgname%-$_pkgflag}/${pkgver::4}/scripts/addons/render_povray
 }
+
+# vim:set ts=2 sw=2 et:
diff --git a/libre/blender-libre/blender.install b/libre/blender-libre/blender.install
deleted file mode 100644
index 724bfce00..000000000
--- a/libre/blender-libre/blender.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-  update-desktop-database -q
-  update-mime-database usr/share/mime &> /dev/null
-  xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/libre/blender-libre/boost-1.50.patch b/libre/blender-libre/boost-1.50.patch
deleted file mode 100644
index fa698a3a6..000000000
--- a/libre/blender-libre/boost-1.50.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff -Naur a/intern/cycles/util/util_cache.cpp b/intern/cycles/util/util_cache.cpp
---- a/intern/cycles/util/util_cache.cpp	2012-05-10 11:44:09.000000000 -0300
-+++ b/intern/cycles/util/util_cache.cpp	2012-07-15 14:19:34.893238929 -0300
-@@ -26,8 +26,6 @@
- #include "util_path.h"
- #include "util_types.h"
- 
--#define BOOST_FILESYSTEM_VERSION 2
--
- #include <boost/filesystem.hpp> 
- #include <boost/algorithm/string.hpp>
- 
-@@ -117,7 +115,7 @@
- 		boost::filesystem::directory_iterator it(dir), it_end;
- 
- 		for(; it != it_end; it++) {
--			string filename = it->path().filename();
-+			string filename = it->path().filename().string();
- 
- 			if(boost::starts_with(filename, name))
- 				if(except.find(filename) == except.end())
-diff -Naur blender-2.63a/intern/cycles/util/util_path.cpp blender-2.63a-new/intern/cycles/util/util_path.cpp
---- a/intern/cycles/util/util_path.cpp	2012-05-10 11:44:09.000000000 -0300
-+++ b/intern/cycles/util/util_path.cpp	2012-07-15 14:19:14.126293394 -0300
-@@ -26,8 +26,6 @@
- 
- #include <stdio.h>
- 
--#define BOOST_FILESYSTEM_VERSION 2
--
- #include <boost/filesystem.hpp> 
- #include <boost/algorithm/string.hpp>
- 
-@@ -60,7 +58,7 @@
- 
- string path_filename(const string& path)
- {
--	return boost::filesystem::path(path).filename();
-+	return boost::filesystem::path(path).filename().string();
- }
- 
- string path_dirname(const string& path)
diff --git a/libre/blender-libre/ffmpeg-0.11.patch b/libre/blender-libre/ffmpeg-0.11.patch
deleted file mode 100644
index 45144140c..000000000
--- a/libre/blender-libre/ffmpeg-0.11.patch
+++ /dev/null
@@ -1,434 +0,0 @@
-diff -Naur blender-2.63a.orig/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp blender-2.63a/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp
---- blender-2.63a.orig/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp	2012-05-10 11:45:40.000000000 -0300
-+++ blender-2.63a/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp	2012-07-10 18:12:55.727129720 -0300
-@@ -143,23 +143,23 @@
- 
- 	switch(m_codecCtx->sample_fmt)
- 	{
--	case SAMPLE_FMT_U8:
-+	case AV_SAMPLE_FMT_U8:
- 		m_convert = AUD_convert_u8_float;
- 		m_specs.format = AUD_FORMAT_U8;
- 		break;
--	case SAMPLE_FMT_S16:
-+	case AV_SAMPLE_FMT_S16:
- 		m_convert = AUD_convert_s16_float;
- 		m_specs.format = AUD_FORMAT_S16;
- 		break;
--	case SAMPLE_FMT_S32:
-+	case AV_SAMPLE_FMT_S32:
- 		m_convert = AUD_convert_s32_float;
- 		m_specs.format = AUD_FORMAT_S32;
- 		break;
--	case SAMPLE_FMT_FLT:
-+	case AV_SAMPLE_FMT_FLT:
- 		m_convert = AUD_convert_copy<float>;
- 		m_specs.format = AUD_FORMAT_FLOAT32;
- 		break;
--	case SAMPLE_FMT_DBL:
-+	case AV_SAMPLE_FMT_DBL:
- 		m_convert = AUD_convert_double_float;
- 		m_specs.format = AUD_FORMAT_FLOAT64;
- 		break;
-@@ -189,7 +189,7 @@
- 	}
- 	catch(AUD_Exception&)
- 	{
--		av_close_input_file(m_formatCtx);
-+		avformat_close_input(&m_formatCtx);
- 		throw;
- 	}
- }
-@@ -227,7 +227,7 @@
- 	}
- 	catch(AUD_Exception&)
- 	{
--		av_close_input_stream(m_formatCtx);
-+		avformat_close_input(&m_formatCtx);
- 		av_free(m_aviocontext);
- 		throw;
- 	}
-@@ -239,7 +239,7 @@
- 
- 	if(m_aviocontext)
- 	{
--		av_close_input_stream(m_formatCtx);
-+		avformat_close_input(&m_formatCtx);
- 		av_free(m_aviocontext);
- 	}
- 	else
-diff -Naur blender-2.63a.orig/intern/audaspace/ffmpeg/AUD_FFMPEGWriter.cpp blender-2.63a/intern/audaspace/ffmpeg/AUD_FFMPEGWriter.cpp
---- blender-2.63a.orig/intern/audaspace/ffmpeg/AUD_FFMPEGWriter.cpp	2012-05-10 11:45:40.000000000 -0300
-+++ blender-2.63a/intern/audaspace/ffmpeg/AUD_FFMPEGWriter.cpp	2012-07-10 18:14:55.893790273 -0300
-@@ -133,23 +133,23 @@
- 		{
- 		case AUD_FORMAT_U8:
- 			m_convert = AUD_convert_float_u8;
--			m_codecCtx->sample_fmt = SAMPLE_FMT_U8;
-+			m_codecCtx->sample_fmt = AV_SAMPLE_FMT_U8;
- 			break;
- 		case AUD_FORMAT_S16:
- 			m_convert = AUD_convert_float_s16;
--			m_codecCtx->sample_fmt = SAMPLE_FMT_S16;
-+			m_codecCtx->sample_fmt = AV_SAMPLE_FMT_S16;
- 			break;
- 		case AUD_FORMAT_S32:
- 			m_convert = AUD_convert_float_s32;
--			m_codecCtx->sample_fmt = SAMPLE_FMT_S32;
-+			m_codecCtx->sample_fmt = AV_SAMPLE_FMT_S32;
- 			break;
- 		case AUD_FORMAT_FLOAT32:
- 			m_convert = AUD_convert_copy<float>;
--			m_codecCtx->sample_fmt = SAMPLE_FMT_FLT;
-+			m_codecCtx->sample_fmt = AV_SAMPLE_FMT_FLT;
- 			break;
- 		case AUD_FORMAT_FLOAT64:
- 			m_convert = AUD_convert_float_double;
--			m_codecCtx->sample_fmt = SAMPLE_FMT_DBL;
-+			m_codecCtx->sample_fmt = AV_SAMPLE_FMT_DBL;
- 			break;
- 		default:
- 			AUD_THROW(AUD_ERROR_FFMPEG, format_error);
-diff -Naur blender-2.63a.orig/intern/ffmpeg/ffmpeg_compat.h blender-2.63a/intern/ffmpeg/ffmpeg_compat.h
---- blender-2.63a.orig/intern/ffmpeg/ffmpeg_compat.h	2012-05-10 11:46:17.000000000 -0300
-+++ blender-2.63a/intern/ffmpeg/ffmpeg_compat.h	2012-07-10 18:17:04.823783714 -0300
-@@ -76,6 +76,10 @@
- #define FFMPEG_FFV1_ALPHA_SUPPORTED
- #endif
- 
-+#if ((LIBAVFORMAT_VERSION_MAJOR < 53) || ((LIBAVFORMAT_VERSION_MAJOR == 53) && (LIBAVFORMAT_VERSION_MINOR < 24)) || ((LIBAVFORMAT_VERSION_MAJOR == 53) && (LIBAVFORMAT_VERSION_MINOR < 24) && (LIBAVFORMAT_VERSION_MICRO < 2)))
-+#define avformat_close_input(x) av_close_input_file(*(x))
-+#endif
-+
- #ifndef FFMPEG_HAVE_AVIO
- #define AVIO_FLAG_WRITE URL_WRONLY
- #define avio_open url_fopen
-diff -Naur blender-2.63a.orig/source/blender/blenkernel/intern/writeffmpeg.c blender-2.63a/source/blender/blenkernel/intern/writeffmpeg.c
---- blender-2.63a.orig/source/blender/blenkernel/intern/writeffmpeg.c	2012-05-10 11:50:20.000000000 -0300
-+++ blender-2.63a/source/blender/blenkernel/intern/writeffmpeg.c	2012-07-10 18:27:00.213753426 -0300
-@@ -36,6 +36,7 @@
- #include <libavformat/avformat.h>
- #include <libavcodec/avcodec.h>
- #include <libavutil/rational.h>
-+#include <libavutil/samplefmt.h>
- #include <libswscale/swscale.h>
- #include <libavcodec/opt.h>
- 
-@@ -612,7 +613,7 @@
- 
- 	c->sample_rate = rd->ffcodecdata.audio_mixrate;
- 	c->bit_rate = ffmpeg_audio_bitrate*1000;
--	c->sample_fmt = SAMPLE_FMT_S16;
-+	c->sample_fmt = AV_SAMPLE_FMT_S16;
- 	c->channels = rd->ffcodecdata.audio_channels;
- 	codec = avcodec_find_encoder(c->codec_id);
- 	if (!codec) {
-@@ -654,11 +655,21 @@
- }
- /* essential functions -- start, append, end */
- 
-+static void ffmpeg_dict_set_int(AVDictionary **dict, const char *key, int value)
-+{
-+	char buffer[32];
-+
-+	BLI_snprintf(buffer, sizeof(buffer), "%d", value);
-+
-+	av_dict_set(dict, key, buffer, 0);
-+}
-+
- static int start_ffmpeg_impl(struct RenderData *rd, int rectx, int recty, ReportList *reports)
- {
- 	/* Handle to the output file */
- 	AVFormatContext* of;
- 	AVOutputFormat* fmt;
-+	AVDictionary *opts = NULL;
- 	char name[256];
- 	const char ** exts;
- 
-@@ -704,13 +715,14 @@
- 	of->oformat = fmt;
- 	of->packet_size= rd->ffcodecdata.mux_packet_size;
- 	if (ffmpeg_audio_codec != CODEC_ID_NONE) {
--		of->mux_rate = rd->ffcodecdata.mux_rate;
-+		ffmpeg_dict_set_int(&opts, "muxrate", rd->ffcodecdata.mux_rate);
- 	}
- 	else {
--		of->mux_rate = 0;
-+		av_dict_set(&opts, "muxrate", "0", 0);
- 	}
- 
--	of->preload = (int)(0.5*AV_TIME_BASE);
-+	ffmpeg_dict_set_int(&opts, "preload", (int)(0.5*AV_TIME_BASE));
-+
- 	of->max_delay = (int)(0.7*AV_TIME_BASE);
- 
- 	fmt->audio_codec = ffmpeg_audio_codec;
-@@ -773,6 +785,7 @@
- 		fmt->audio_codec = CODEC_ID_PCM_S16LE;
- 		if (ffmpeg_audio_codec != CODEC_ID_NONE && rd->ffcodecdata.audio_mixrate != 48000 && rd->ffcodecdata.audio_channels != 2) {
- 			BKE_report(reports, RPT_ERROR, "FFMPEG only supports 48khz / stereo audio for DV!");
-+			av_dict_free(&opts);
- 			return 0;
- 		}
- 	}
-@@ -782,6 +795,7 @@
- 		printf("alloc video stream %p\n", video_stream);
- 		if (!video_stream) {
- 			BKE_report(reports, RPT_ERROR, "Error initializing video stream.");
-+			av_dict_free(&opts);
- 			return 0;
- 		}
- 	}
-@@ -790,27 +804,27 @@
- 		audio_stream = alloc_audio_stream(rd, fmt->audio_codec, of);
- 		if (!audio_stream) {
- 			BKE_report(reports, RPT_ERROR, "Error initializing audio stream.");
-+			av_dict_free(&opts);
- 			return 0;
- 		}
- 	}
--	if (av_set_parameters(of, NULL) < 0) {
--		BKE_report(reports, RPT_ERROR, "Error setting output parameters.");
--		return 0;
--	}
- 	if (!(fmt->flags & AVFMT_NOFILE)) {
- 		if (avio_open(&of->pb, name, AVIO_FLAG_WRITE) < 0) {
- 			BKE_report(reports, RPT_ERROR, "Could not open file for writing.");
-+			av_dict_free(&opts);
- 			return 0;
- 		}
- 	}
- 
--	if (av_write_header(of) < 0) {
-+	if (avformat_write_header(of, NULL) < 0) {
- 		BKE_report(reports, RPT_ERROR, "Could not initialize streams. Probably unsupported codec combination.");
-+		av_dict_free(&opts);
- 		return 0;
- 	}
- 
- 	outfile = of;
- 	av_dump_format(of, 0, name, 1);
-+	av_dict_free(&opts);
- 
- 	return 1;
- }
-diff -Naur blender-2.63a.orig/source/blender/imbuf/intern/anim_movie.c blender-2.63a/source/blender/imbuf/intern/anim_movie.c
---- blender-2.63a.orig/source/blender/imbuf/intern/anim_movie.c	2012-05-10 11:50:59.000000000 -0300
-+++ blender-2.63a/source/blender/imbuf/intern/anim_movie.c	2012-07-10 18:30:19.413743294 -0300
-@@ -436,7 +436,7 @@
- 	int            i, videoStream;
- 
- 	AVCodec *pCodec;
--	AVFormatContext *pFormatCtx;
-+	AVFormatContext *pFormatCtx = NULL;
- 	AVCodecContext *pCodecCtx;
- 	int frs_num;
- 	double frs_den;
-@@ -455,7 +455,7 @@
- 
- 	do_init_ffmpeg();
- 
--	if (av_open_input_file(&pFormatCtx, anim->name, NULL, 0, NULL)!=0) {
-+	if (avformat_open_input(&pFormatCtx, anim->name, NULL, NULL)!=0) {
- 		return -1;
- 	}
- 
-@@ -990,7 +990,8 @@
- 				ret = av_seek_frame(anim->pFormatCtx, 
- 						    -1,
- 						    pos, AVSEEK_FLAG_BYTE);
--				av_update_cur_dts(anim->pFormatCtx, v_st, dts);
-+				// XXX: need double verification
-+				// av_update_cur_dts(anim->pFormatCtx, v_st, dts);
- 			}
- 			else {
- 				av_log(anim->pFormatCtx, AV_LOG_DEBUG, 
-diff -Naur blender-2.63a.orig/source/blender/imbuf/intern/indexer.c blender-2.63a/source/blender/imbuf/intern/indexer.c
---- blender-2.63a.orig/source/blender/imbuf/intern/indexer.c	2012-05-10 11:50:59.000000000 -0300
-+++ blender-2.63a/source/blender/imbuf/intern/indexer.c	2012-07-10 18:38:25.737051891 -0300
-@@ -533,13 +533,6 @@
- 		rv->c->flags |= CODEC_FLAG_GLOBAL_HEADER;
- 	}
- 
--	if (av_set_parameters(rv->of, NULL) < 0) {
--		fprintf(stderr, "Couldn't set output parameters? "
--			"Proxy not built!\n");
--		av_free(rv->of);
--		return 0;
--	}
--
- 	if (avio_open(&rv->of->pb, fname, AVIO_FLAG_WRITE) < 0) {
- 		fprintf(stderr, "Couldn't open outputfile! "
- 			"Proxy not built!\n");
-@@ -576,7 +569,12 @@
- 			NULL, NULL, NULL);
- 	}
- 
--	av_write_header(rv->of);
-+	if (avformat_write_header(rv->of, NULL) < 0) {
-+		fprintf(stderr, "Couldn't set output parameters? "
-+		        "Proxy not built!\n");
-+		av_free(rv->of);
-+		return 0;
-+	}
- 
- 	return rv;
- }
-@@ -739,7 +737,7 @@
- 	memset(context->proxy_ctx, 0, sizeof(context->proxy_ctx));
- 	memset(context->indexer, 0, sizeof(context->indexer));
- 
--	if (av_open_input_file(&context->iFormatCtx, anim->name, NULL, 0, NULL) != 0) {
-+	if (avformat_open_input(&context->iFormatCtx, anim->name, NULL, NULL) != 0) {
- 		MEM_freeN(context);
- 		return NULL;
- 	}
-diff -Naur blender-2.63a.orig/source/blender/imbuf/intern/util.c blender-2.63a/source/blender/imbuf/intern/util.c
---- blender-2.63a.orig/source/blender/imbuf/intern/util.c	2012-05-10 11:50:59.000000000 -0300
-+++ blender-2.63a/source/blender/imbuf/intern/util.c	2012-07-10 18:40:49.950377886 -0300
-@@ -243,7 +243,7 @@
- 
- static int isffmpeg (const char *filename)
- {
--	AVFormatContext *pFormatCtx;
-+	AVFormatContext *pFormatCtx = NULL;
- 	unsigned int i;
- 	int videoStream;
- 	AVCodec *pCodec;
-@@ -261,7 +261,7 @@
- 		BLI_testextensie(filename, ".cin") ||
- 		BLI_testextensie(filename, ".wav")) return 0;
- 
--	if (av_open_input_file(&pFormatCtx, filename, NULL, 0, NULL)!=0) {
-+	if (avformat_open_input(&pFormatCtx, filename, NULL, NULL)!=0) {
- 		if (UTIL_DEBUG) fprintf(stderr, "isffmpeg: av_open_input_file failed\n");
- 		return 0;
- 	}
-diff -Naur blender-2.63a.orig/source/gameengine/VideoTexture/VideoFFmpeg.cpp blender-2.63a/source/gameengine/VideoTexture/VideoFFmpeg.cpp
---- blender-2.63a.orig/source/gameengine/VideoTexture/VideoFFmpeg.cpp	2012-05-10 11:48:50.000000000 -0300
-+++ blender-2.63a/source/gameengine/VideoTexture/VideoFFmpeg.cpp	2012-07-10 18:56:03.696998071 -0300
-@@ -162,14 +162,14 @@
- }
- 
- 
--int VideoFFmpeg::openStream(const char *filename, AVInputFormat *inputFormat, AVFormatParameters *formatParams)
-+int VideoFFmpeg::openStream(const char *filename, AVInputFormat *inputFormat, AVDictionary **formatParams)
- {
--	AVFormatContext *formatCtx;
-+	AVFormatContext *formatCtx = NULL;
- 	int				i, videoStream;
- 	AVCodec			*codec;
- 	AVCodecContext	*codecCtx;
- 
--	if (av_open_input_file(&formatCtx, filename, inputFormat, 0, formatParams)!=0)
-+	if (avformat_open_input(&formatCtx, filename, inputFormat, formatParams)!=0)
- 		return -1;
- 
- 	if (av_find_stream_info(formatCtx)<0) 
-@@ -545,11 +545,7 @@
- 		// but it is really not desirable to seek on http file, so force streaming.
- 		// It would be good to find this information from the context but there are no simple indication
- 		!strncmp(filename, "http://", 7) ||
--#ifdef FFMPEG_PB_IS_POINTER
--		(m_formatCtx->pb && m_formatCtx->pb->is_streamed)
--#else
--		m_formatCtx->pb.is_streamed
--#endif
-+		(m_formatCtx->pb && !m_formatCtx->pb->seekable)
- 		)
- 	{
- 		// the file is in fact a streaming source, treat as cam to prevent seeking
-@@ -586,13 +582,11 @@
- {
- 	// open camera source
- 	AVInputFormat		*inputFormat;
--	AVFormatParameters	formatParams;
--	AVRational			frameRate;
-+	AVDictionary		*formatParams = NULL;
- 	char				*p, filename[28], rateStr[20];
- 
- 	do_init_ffmpeg();
- 
--	memset(&formatParams, 0, sizeof(formatParams));
- #ifdef WIN32
- 	// video capture on windows only through Video For Windows driver
- 	inputFormat = av_find_input_format("vfwcap");
-@@ -622,7 +616,13 @@
- 		sprintf(filename, "/dev/dv1394/%d", camIdx);
- 	} else 
- 	{
--		inputFormat = av_find_input_format("video4linux");
-+		const char *formats[] = {"video4linux2,v4l2", "video4linux2", "video4linux"};
-+		int i, formatsCount = sizeof(formats) / sizeof(char*);
-+		for (i = 0; i < formatsCount; i++) {
-+			inputFormat = av_find_input_format(formats[i]);
-+			if (inputFormat)
-+				break;
-+		}
- 		sprintf(filename, "/dev/video%d", camIdx);
- 	}
- 	if (!inputFormat)
-@@ -636,20 +636,22 @@
- 		if ((p = strchr(filename, ':')) != 0)
- 			*p = 0;
- 	}
--	if (file && (p = strchr(file, ':')) != NULL)
--		formatParams.standard = p+1;
-+	if (file && (p = strchr(file, ':')) != NULL) {
-+		av_dict_set(&formatParams, "standard", p+1, 0);
-+	}
- #endif
- 	//frame rate
- 	if (m_captRate <= 0.f)
- 		m_captRate = defFrameRate;
- 	sprintf(rateStr, "%f", m_captRate);
--	av_parse_video_rate(&frameRate, rateStr);
--	// populate format parameters
--	// need to specify the time base = inverse of rate
--	formatParams.time_base.num = frameRate.den;
--	formatParams.time_base.den = frameRate.num;
--	formatParams.width = m_captWidth;
--	formatParams.height = m_captHeight;
-+
-+	av_dict_set(&formatParams, "framerate", rateStr, 0);
-+
-+	if (m_captWidth > 0 && m_captHeight > 0) {
-+		char video_size[64];
-+		BLI_snprintf(video_size, sizeof(video_size), "%dx%d", m_captWidth, m_captHeight);
-+		av_dict_set(&formatParams, "video_size", video_size, 0);
-+	}
- 
- 	if (openStream(filename, inputFormat, &formatParams) != 0)
- 		return;
-@@ -664,6 +666,8 @@
- 		// no need to thread if the system has a single core
- 		m_isThreaded =  true;
- 	}
-+
-+	av_dict_free(&formatParams);
- }
- 
- // play video
-diff -Naur blender-2.63a.orig/source/gameengine/VideoTexture/VideoFFmpeg.h blender-2.63a/source/gameengine/VideoTexture/VideoFFmpeg.h
---- blender-2.63a.orig/source/gameengine/VideoTexture/VideoFFmpeg.h	2012-05-10 11:48:50.000000000 -0300
-+++ blender-2.63a/source/gameengine/VideoTexture/VideoFFmpeg.h	2012-07-10 18:57:21.710327435 -0300
-@@ -46,10 +46,6 @@
- #  define FFMPEG_CODEC_IS_POINTER 1
- #endif
- 
--#if LIBAVFORMAT_VERSION_INT >= (52 << 16)
--#  define FFMPEG_PB_IS_POINTER 1
--#endif
--
- #ifdef FFMPEG_CODEC_IS_POINTER
- static inline AVCodecContext* get_codec_from_stream(AVStream* stream)
- {
-@@ -172,7 +168,7 @@
- 	double actFrameRate (void) { return m_frameRate * m_baseFrameRate; }
- 
- 	/// common function to video file and capture
--	int openStream(const char *filename, AVInputFormat *inputFormat, AVFormatParameters *formatParams);
-+	int openStream(const char *filename, AVInputFormat *inputFormat, AVDictionary **formatParams);
- 
- 	/// check if a frame is available and load it in pFrame, return true if a frame could be retrieved
- 	AVFrame* grabFrame(long frame);
diff --git a/libre/cgminer-libre/PKGBUILD b/libre/cgminer-libre/PKGBUILD
new file mode 100644
index 000000000..e62331a98
--- /dev/null
+++ b/libre/cgminer-libre/PKGBUILD
@@ -0,0 +1,54 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars@gmail.com>
+# Contributor: monson <holymonson@gmail.com>
+# Contributor: Thomas Dziedzic < gostrc at gmail >
+# Contributor: David Manouchehri <david@davidmanouchehri.com>
+# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
+
+pkgname=cgminer-libre
+_pkgflag=libre
+pkgver=2.11.1
+_build=
+pkgrel=1
+pkgdesc="Multi-threaded multi-pool CPU and GPU miner for bitcoin, forked from cpuminer, without nonfree OpenCL recommendations."
+url='http://forum.bitcoin.org/index.php?topic=28402.0'
+license=('GPL3')
+arch=('i686' 'x86_64' 'mips64el')
+depends=('curl' 'libcl-libre')
+makedepends=('opencl-headers')
+source=("http://ck.kolivas.org/apps/${pkgname%-$_pkgflag}/${pkgname%-$_pkgflag}-$pkgver.tar.bz2"
+        "${pkgname%-$_pkgflag}.conf.d"
+        "${pkgname%-$_pkgflag}.service")
+backup=("etc/conf.d/${pkgname%-$_pkgflag}" "etc/${pkgname%-$_pkgflag}.conf")
+
+[ "$CARCH" == "x86_64" ] && makedepends+=('yasm')
+
+build() {
+  cd "$srcdir"
+  cd ${pkgname%-$_pkgflag}-$pkgver${_build}
+
+  # Use in-tree jansson since it is not compatible with jansson 2.0
+  #sed -e 's/^AC_CHECK_LIB(jansson, json_loads, request_jansson=false, request_jansson=true)$/request_jansson=true/' -i configure.ac
+
+  # Here you may want to use custom CFLAGS
+  #export CFLAGS="-O2 -march=native -mtune=native -msse2"
+
+  ./configure --prefix=/usr --enable-cpumining --disable-adl
+  
+  make
+}
+
+package() {
+  cd "$srcdir"/${pkgname%-$_pkgflag}-$pkgver${_build}
+
+  make DESTDIR="$pkgdir" install
+
+  install -Dm644 "$srcdir"/${pkgname%-$_pkgflag}.service "$pkgdir"/usr/lib/systemd/system/${pkgname%-$_pkgflag}.service
+  install -Dm644 "$srcdir"/${pkgname%-$_pkgflag}.conf.d "$pkgdir"/etc/conf.d/${pkgname%-$_pkgflag}
+  sed 's#/usr/local/bin#/usr/bin#g' example.conf > ${pkgname%-$_pkgflag}.conf
+  install -Dm644 ${pkgname%-$_pkgflag}.conf "$pkgdir"/etc/${pkgname%-$_pkgflag}.conf
+}
+
+md5sums=('aa2199a9756cbca5582c03e8c1a98dd1'
+         'fe4a243fabe24608f5c05e40f0f118f6'
+         'bd76fc92fedce18c59ccea2aa79cc664')
diff --git a/libre/cgminer-libre/cgminer.conf.d b/libre/cgminer-libre/cgminer.conf.d
new file mode 100644
index 000000000..88ec535d6
--- /dev/null
+++ b/libre/cgminer-libre/cgminer.conf.d
@@ -0,0 +1,11 @@
+# Use JSON-format configuration. (recommended)
+CGMINER_CONF="/etc/cgminer.conf"
+
+# Uncommend this if you prefer simple command-line arguments.
+#CGMINER_CONF=""
+#CGMINER_PROTOCOL="http"
+#CGMINER_IP="127.0.0.1"
+#CGMINER_PORT="8332"
+#CGMINER_USER="username"
+#CGMINER_PASS="password"
+CGMINER_ARGS="--syslog"
diff --git a/libre/cgminer-libre/cgminer.service b/libre/cgminer-libre/cgminer.service
new file mode 100644
index 000000000..84461879f
--- /dev/null
+++ b/libre/cgminer-libre/cgminer.service
@@ -0,0 +1,8 @@
+[Unit]
+Description=Multi-threaded multi-pool CPU and GPU miner for bitcoin
+
+[Service]
+ExecStart=/usr/bin/cgminer -T --config /etc/cgminer.conf --syslog
+
+[Install]
+WantedBy=multi-user.target
diff --git a/libre/kdelibs-libre/0001-Revert-Also-check-parent-mimetypes-in-protocolForArc.patch b/libre/kdelibs-libre/0001-Revert-Also-check-parent-mimetypes-in-protocolForArc.patch
deleted file mode 100644
index 5aadeb883..000000000
--- a/libre/kdelibs-libre/0001-Revert-Also-check-parent-mimetypes-in-protocolForArc.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 73283f1332e90fbb6fe0caa39a038cb16b83a54c Mon Sep 17 00:00:00 2001
-From: David Faure <faure@kde.org>
-Date: Wed, 5 Dec 2012 22:42:25 +0100
-Subject: [PATCH] Revert "Also check parent mimetypes in
- protocolForArchiveMimetype()."
-
-This reverts commit 4f296cfbced2c4ad54beec8f500ed2d3fc04ee05.
-It breaks opening odt and other zip-based files in external apps.
-That's what I get for delegating the testing :-)
-BUG: 311214
----
- kio/kio/kprotocolmanager.cpp |   19 +------------------
- 1 files changed, 1 insertions(+), 18 deletions(-)
-
-diff --git a/kio/kio/kprotocolmanager.cpp b/kio/kio/kprotocolmanager.cpp
-index 3f1cadd..502a3e6 100644
---- a/kio/kio/kprotocolmanager.cpp
-+++ b/kio/kio/kprotocolmanager.cpp
-@@ -47,7 +47,6 @@
- #include <ksharedconfig.h>
- #include <kstandarddirs.h>
- #include <kurl.h>
--#include <kmimetype.h>
- #include <kmimetypetrader.h>
- #include <kprotocolinfofactory.h>
- 
-@@ -1190,23 +1189,7 @@ QString KProtocolManager::protocolForArchiveMimetype( const QString& mimeType )
-             }
-         }
-     }
--    const QString prot = d->protocolForArchiveMimetypes.value(mimeType);
--    if (!prot.isEmpty())
--        return prot;
--
--    // Check parent mimetypes
--    KMimeType::Ptr mime = KMimeType::mimeType(mimeType);
--    if (mime) {
--        const QStringList parentMimeTypes = mime->allParentMimeTypes();
--        Q_FOREACH(const QString& parentMimeType, parentMimeTypes) {
--            const QString res = d->protocolForArchiveMimetypes.value(parentMimeType);
--            if (!res.isEmpty()) {
--                return res;
--            }
--        }
--    }
--
--    return QString();
-+    return d->protocolForArchiveMimetypes.value(mimeType);
- }
- 
- #undef PRIVATE_DATA
--- 
-1.7.7
diff --git a/libre/kdelibs-libre/PKGBUILD b/libre/kdelibs-libre/PKGBUILD
index 18947854a..76d09f737 100644
--- a/libre/kdelibs-libre/PKGBUILD
+++ b/libre/kdelibs-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 179135 2013-03-04 11:09:00Z andrea $
+# $Id: PKGBUILD 179600 2013-03-07 17:47:07Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
@@ -6,7 +6,7 @@
 _pkgname=kdelibs
 pkgname=kdelibs-libre
 pkgver=4.10.1
-pkgrel=1
+pkgrel=2
 pkgdesc="KDE Core Libraries"
 arch=('i686' 'x86_64' 'mips64el')
 url='https://projects.kde.org/projects/kde/kdelibs'
@@ -22,21 +22,23 @@ replaces=('kdelibs')
 conflicts=('kdelibs')
 install=${_pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/${_pkgname}-${pkgver}.tar.xz"
-        'kde-applications-menu.patch'
-        'khtml-fsdg.diff')
+        'kde-applications-menu.patch' 'qt4.patch' 'khtml-fsdg.diff')
 sha1sums=('91d1ab65a561decf7506df45bda7a7fec9a524bb'
           '86ee8c8660f19de8141ac99cd6943964d97a1ed7'
+          'ed1f57ee661e5c7440efcaba7e51d2554709701c'
           'a1502a964081ad583a00cf90c56e74bf60121830')
 
 build() {
-       cd "${srcdir}"/${_pkgname}-${pkgver}
-
+       cd ${_pkgname}-${pkgver}
        # avoid file conflict with gnome-menus
        patch -p1 -i "${srcdir}"/kde-applications-menu.patch
+       # qmake refers to Qt5
+       patch -p1 -i "${srcdir}"/qt4.patch
        # Don't ask the user to download a plugin, it's probably nonfree.
        patch -p1 -i "${srcdir}"/khtml-fsdg.diff
 
-       cd "${srcdir}"
+       cd ../
+
        mkdir build
        cd build
        cmake ../${_pkgname}-${pkgver} \
diff --git a/libre/kdelibs-libre/fix-crash-on-open-with.patch b/libre/kdelibs-libre/fix-crash-on-open-with.patch
deleted file mode 100644
index 60556386d..000000000
--- a/libre/kdelibs-libre/fix-crash-on-open-with.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-commit 0820b3173aff4f0f3c803a9e75e726024da38ee5
-Author: David Faure <faure@kde.org>
-Date:   Thu Dec 6 11:55:05 2012 +0100
-
-    Fix crash when no service was selected (user clicked on "Open With...")
-
-diff --git a/kparts/browserrun.cpp b/kparts/browserrun.cpp
-index 6d84800..6de0380 100644
---- a/kparts/browserrun.cpp
-+++ b/kparts/browserrun.cpp
-@@ -304,7 +304,7 @@ BrowserRun::NonEmbeddableResult BrowserRun::handleNonEmbeddable(const QString& _
-                          this, SLOT(slotCopyToTempFileResult(KJob*)) );
-                 return Delayed; // We'll continue after the job has finished
-             }
--            if (selectedService) {
-+            if (selectedService && question.selectedService()) {
-                 *selectedService = question.selectedService();
-                 // KRun will use this when starting an app
-                 KRun::setPreferredService(question.selectedService()->desktopEntryName());
diff --git a/libre/kdelibs-libre/fix-kmail-crash.patch b/libre/kdelibs-libre/fix-kmail-crash.patch
deleted file mode 100644
index 27caa25f0..000000000
--- a/libre/kdelibs-libre/fix-kmail-crash.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-commit 979b0436510e7807c054e79c40c3753834ac2863
-Author: Sebastian Trueg <trueg@kde.org>
-Date:   Thu Mar 15 09:14:35 2012 +0100
-
-    Thread-safe ResourceWatcher handling.
-    
-    We simply perform all RW operations in the manager thread.
-    
-    BUG: 295474
-    FIXED-IN: 4.8.2
-
-diff --git a/nepomuk/core/resourcedata.cpp b/nepomuk/core/resourcedata.cpp
-index abe55ea..9d45228 100644
---- a/nepomuk/core/resourcedata.cpp
-+++ b/nepomuk/core/resourcedata.cpp
-@@ -175,7 +175,8 @@ void Nepomuk::ResourceData::resetAll( bool isDelete )
-     if( !m_uri.isEmpty() ) {
-         m_rm->m_initializedData.remove( m_uri );
-         if( m_rm->m_watcher && m_addedToWatcher ) {
--            m_rm->m_watcher->removeResource(Resource::fromResourceUri(m_uri));
-+            // See load() for an explanation of the QMetaObject call
-+            QMetaObject::invokeMethod(m_rm->m_watcher, "removeResource", Qt::AutoConnection, Q_ARG(Nepomuk::Resource, Resource::fromResourceUri(m_uri)));
-             m_addedToWatcher = false;
-         }
-     }
-@@ -393,16 +394,23 @@ bool Nepomuk::ResourceData::load()
-         m_cache.clear();
- 
-         if(!m_rm->m_watcher) {
-+            //
-+            // The ResourceWatcher is not thread-safe. Thus, we need to ensure the safety ourselves.
-+            // We do that by simply handling all RW related operations in the manager thread.
-+            // This also means to invoke methods on the watcher through QMetaObject to make sure they
-+            // get queued in case of calls between different threads.
-+            //
-             m_rm->m_watcher = new ResourceWatcher(m_rm->m_manager);
-+            m_rm->m_watcher->moveToThread(m_rm->m_manager->thread());
-             QObject::connect( m_rm->m_watcher, SIGNAL(propertyAdded(Nepomuk::Resource, Nepomuk::Types::Property, QVariant)),
-                               m_rm->m_manager, SLOT(slotPropertyAdded(Nepomuk::Resource, Nepomuk::Types::Property, QVariant)) );
-             QObject::connect( m_rm->m_watcher, SIGNAL(propertyRemoved(Nepomuk::Resource, Nepomuk::Types::Property, QVariant)),
-                               m_rm->m_manager, SLOT(slotPropertyRemoved(Nepomuk::Resource, Nepomuk::Types::Property, QVariant)) );
-             m_rm->m_watcher->addResource( Nepomuk::Resource::fromResourceUri(m_uri) );
--            m_rm->m_watcher->start();
-+            QMetaObject::invokeMethod(m_rm->m_watcher, "start", Qt::AutoConnection);
-         }
-         else {
--            m_rm->m_watcher->addResource( Nepomuk::Resource::fromResourceUri(m_uri) );
-+            QMetaObject::invokeMethod(m_rm->m_watcher, "addResource", Qt::AutoConnection, Q_ARG(Nepomuk::Resource, Nepomuk::Resource::fromResourceUri(m_uri)) );
-         }
-         m_addedToWatcher = true;
- 
-diff --git a/nepomuk/core/resourcewatcher.h b/nepomuk/core/resourcewatcher.h
-index 06b9622..92b12f5 100644
---- a/nepomuk/core/resourcewatcher.h
-+++ b/nepomuk/core/resourcewatcher.h
-@@ -93,6 +93,7 @@ namespace Nepomuk {
-          */
-         virtual ~ResourceWatcher();
- 
-+    public Q_SLOTS:
-         /**
-          * \brief Add a type to be watched.
-          *
-@@ -204,7 +205,6 @@ namespace Nepomuk {
-          */
-         QList<Types::Property> properties() const;
- 
--    public Q_SLOTS:
-         /**
-          * \brief Start the signalling of changes.
-          *
diff --git a/libre/kdelibs-libre/fix-save-path.patch b/libre/kdelibs-libre/fix-save-path.patch
deleted file mode 100644
index 1a00221a7..000000000
--- a/libre/kdelibs-libre/fix-save-path.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-commit 793e2a69f8aa193b60494b03d51c5fd44373c0e7
-Author: Jonathan Marten <jjm@keelhaul.me.uk>
-Date:   Wed Nov 7 12:45:03 2012 +0000
-
-    Fix regression: specified or remembered save path is not used
-    
-    As requested on review https://git.reviewboard.kde.org/r/106475/
-
-diff --git a/kfile/kfilewidget.cpp b/kfile/kfilewidget.cpp
-index 65deca2..e755aae 100644
---- a/kfile/kfilewidget.cpp
-+++ b/kfile/kfilewidget.cpp
-@@ -2593,8 +2593,12 @@ KUrl KFileWidget::getStartUrl( const KUrl& startDir,
-         }
-         else						// not special "kfiledialog" URL
-         {
--            if (!startDir.isRelative())	// has directory, maybe with filename
--            {
-+            // We can use startDir as the starting directory if either:
-+            // (a) it has a directory part, or
-+            // (b) there is a scheme (protocol), and it is not just "file".
-+            if (!startDir.directory().isEmpty() ||
-+                (!startDir.scheme().isEmpty() && !startDir.isLocalFile()))
-+            {						// can use start directory
-                 ret = startDir;				// will be checked by stat later
-                 // If we won't be able to list it (e.g. http), then use default
-                 if ( !KProtocolManager::supportsListing( ret ) ) {
diff --git a/libre/kdelibs-libre/qt4.patch b/libre/kdelibs-libre/qt4.patch
new file mode 100644
index 000000000..bb4312d40
--- /dev/null
+++ b/libre/kdelibs-libre/qt4.patch
@@ -0,0 +1,11 @@
+--- kdelibs-4.10.1/cmake/modules/FindQt4.cmake~	2013-03-07 16:57:29.735552097 +0000
++++ kdelibs-4.10.1/cmake/modules/FindQt4.cmake	2013-03-07 16:57:52.038725421 +0000
+@@ -446,7 +446,7 @@
+ # check for qmake
+ # Debian uses qmake-qt4
+ # macports' Qt uses qmake-mac
+-FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake qmake4 qmake-qt4 qmake-mac PATHS
++FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake4 qmake-qt4 qmake-mac PATHS
+   "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\4.0.0;InstallDir]/bin"
+   "[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\4.0.0;InstallDir]/bin"
+   "[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\${qt_install_version};InstallDir]/bin"
diff --git a/libre/kdelibs-libre/use-pythondontwritebytecode.patch b/libre/kdelibs-libre/use-pythondontwritebytecode.patch
deleted file mode 100644
index 9b5d92042..000000000
--- a/libre/kdelibs-libre/use-pythondontwritebytecode.patch
+++ /dev/null
@@ -1,113 +0,0 @@
-From: Arfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org>
-Date: Wed, 07 Nov 2012 19:08:01 +0000
-Subject: Respect PYTHONDONTWRITEBYTECODE environmental variable.
-X-Git-Url: http://quickgit.kde.org/?p=kdelibs.git&amp;a=commitdiff&amp;h=5a3cedacdb6485f7551090467cffb2cdf150b05a
----
-Respect PYTHONDONTWRITEBYTECODE environmental variable.
-
-BUG: 276151
-REVIEW: 107228
----
-
-
---- a/cmake/modules/PythonMacros.cmake
-+++ b/cmake/modules/PythonMacros.cmake
-@@ -23,54 +23,56 @@
-   # Install the source file.
-   INSTALL(FILES ${SOURCE_FILE} DESTINATION ${DESTINATION_DIR})
- 
--  # Byte compile and install the .pyc file.        
--  GET_FILENAME_COMPONENT(_absfilename ${SOURCE_FILE} ABSOLUTE)
--  GET_FILENAME_COMPONENT(_filename ${SOURCE_FILE} NAME)
--  GET_FILENAME_COMPONENT(_filenamebase ${SOURCE_FILE} NAME_WE)
--  GET_FILENAME_COMPONENT(_basepath ${SOURCE_FILE} PATH)
-+  # Byte compile and install the .pyc file.
-+  IF("$ENV{PYTHONDONTWRITEBYTECODE}" STREQUAL "")
-+    GET_FILENAME_COMPONENT(_absfilename ${SOURCE_FILE} ABSOLUTE)
-+    GET_FILENAME_COMPONENT(_filename ${SOURCE_FILE} NAME)
-+    GET_FILENAME_COMPONENT(_filenamebase ${SOURCE_FILE} NAME_WE)
-+    GET_FILENAME_COMPONENT(_basepath ${SOURCE_FILE} PATH)
- 
--  if(WIN32)
--    string(REGEX REPLACE ".:/" "/" _basepath "${_basepath}")
--  endif(WIN32)
-+    if(WIN32)
-+        string(REGEX REPLACE ".:/" "/" _basepath "${_basepath}")
-+    endif(WIN32)
- 
--  SET(_bin_py ${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/${_filename})
-+    SET(_bin_py ${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/${_filename})
- 
--  # Python 3.2 changed the pyc file location
--  IF(PYTHON_SHORT_VERSION GREATER 3.1)
--    # To get the right version for suffix
--    STRING(REPLACE "." "" _suffix ${PYTHON_SHORT_VERSION})
--    SET(_bin_pyc ${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/__pycache__/${_filenamebase}.cpython-${_suffix}.pyc)
--  ELSE(PYTHON_SHORT_VERSION GREATER 3.1)
--    SET(_bin_pyc ${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/${_filenamebase}.pyc)
--  ENDIF(PYTHON_SHORT_VERSION GREATER 3.1)
-+    # Python 3.2 changed the pyc file location
-+    IF(PYTHON_SHORT_VERSION GREATER 3.1)
-+        # To get the right version for suffix
-+        STRING(REPLACE "." "" _suffix ${PYTHON_SHORT_VERSION})
-+        SET(_bin_pyc ${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/__pycache__/${_filenamebase}.cpython-${_suffix}.pyc)
-+    ELSE(PYTHON_SHORT_VERSION GREATER 3.1)
-+        SET(_bin_pyc ${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/${_filenamebase}.pyc)
-+    ENDIF(PYTHON_SHORT_VERSION GREATER 3.1)
- 
--  FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${_basepath})
-+    FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${_basepath})
- 
--  SET(_message "Byte-compiling ${_bin_py}")
-+    SET(_message "Byte-compiling ${_bin_py}")
- 
--  GET_FILENAME_COMPONENT(_abs_bin_py ${_bin_py} ABSOLUTE)
--  IF(_abs_bin_py STREQUAL ${_absfilename})    # Don't copy the file onto itself.
--    ADD_CUSTOM_COMMAND(
--      TARGET compile_python_files
--      COMMAND ${CMAKE_COMMAND} -E echo ${_message}
--      COMMAND ${PYTHON_EXECUTABLE} ${_python_compile_py} ${_bin_py}
--      DEPENDS ${_absfilename}
--    )
--  ELSE(_abs_bin_py STREQUAL ${_absfilename})
--    ADD_CUSTOM_COMMAND(
--      TARGET compile_python_files
--      COMMAND ${CMAKE_COMMAND} -E echo ${_message} 
--      COMMAND ${CMAKE_COMMAND} -E copy ${_absfilename} ${_bin_py}
--      COMMAND ${PYTHON_EXECUTABLE} ${_python_compile_py} ${_bin_py}
--      DEPENDS ${_absfilename}
--    )
--  ENDIF(_abs_bin_py STREQUAL ${_absfilename})
-+    GET_FILENAME_COMPONENT(_abs_bin_py ${_bin_py} ABSOLUTE)
-+    IF(_abs_bin_py STREQUAL ${_absfilename})    # Don't copy the file onto itself.
-+        ADD_CUSTOM_COMMAND(
-+        TARGET compile_python_files
-+        COMMAND ${CMAKE_COMMAND} -E echo ${_message}
-+        COMMAND ${PYTHON_EXECUTABLE} ${_python_compile_py} ${_bin_py}
-+        DEPENDS ${_absfilename}
-+        )
-+    ELSE(_abs_bin_py STREQUAL ${_absfilename})
-+        ADD_CUSTOM_COMMAND(
-+        TARGET compile_python_files
-+        COMMAND ${CMAKE_COMMAND} -E echo ${_message} 
-+        COMMAND ${CMAKE_COMMAND} -E copy ${_absfilename} ${_bin_py}
-+        COMMAND ${PYTHON_EXECUTABLE} ${_python_compile_py} ${_bin_py}
-+        DEPENDS ${_absfilename}
-+        )
-+    ENDIF(_abs_bin_py STREQUAL ${_absfilename})
- 
--  IF(PYTHON_SHORT_VERSION GREATER 3.1)
--    INSTALL(FILES ${_bin_pyc} DESTINATION ${DESTINATION_DIR}/__pycache__/)
--  ELSE (PYTHON_SHORT_VERSION GREATER 3.1)
--      INSTALL(FILES ${_bin_pyc} DESTINATION ${DESTINATION_DIR})
--  ENDIF (PYTHON_SHORT_VERSION GREATER 3.1)
-+    IF(PYTHON_SHORT_VERSION GREATER 3.1)
-+        INSTALL(FILES ${_bin_pyc} DESTINATION ${DESTINATION_DIR}/__pycache__/)
-+    ELSE (PYTHON_SHORT_VERSION GREATER 3.1)
-+        INSTALL(FILES ${_bin_pyc} DESTINATION ${DESTINATION_DIR})
-+    ENDIF (PYTHON_SHORT_VERSION GREATER 3.1)
-+  ENDIF("$ENV{PYTHONDONTWRITEBYTECODE}" STREQUAL "")
- 
- ENDMACRO(PYTHON_INSTALL)
- 
-
diff --git a/libre/luxblend25/PKGBUILD b/libre/luxblend25/PKGBUILD
index 82dd36a40..26640795f 100644
--- a/libre/luxblend25/PKGBUILD
+++ b/libre/luxblend25/PKGBUILD
@@ -3,8 +3,8 @@
 
 pkgbase=luxrender
 pkgname=luxblend25
-srcver=3b84c4d3f009
-pkgver=1.2.v2.66
+srcver=3a928b723b29
+pkgver=1.1.v2.65
 _pkgver=${pkgver::3}
 reqname=blender
 reqver=${pkgver:5}
@@ -32,10 +32,10 @@ replaces=(
   $pkgname
 )
 source=(
-  "http://src.$pkgbase.net/$pkgname/archive/$srcver.tar.bz2"
+  "https://src.$pkgbase.net/$pkgname/archive/$srcver.tar.bz2"
 )
 sha512sums=(
-  15025d192088266d781a6e80ecb4982b188d73bb7c6b12c93689a4265e967f92bcf93fc724939447c5ee7ea3f63ce52ad6bf3d20a795dcebf86e6940a3aa33b3
+  f5aadc77e699f6b7259ece271b0c50ca7be5858bb628b99aedbb23b64e5587ac59cc3d1c52e063ba89c9d340f915727046e4d3017b26238425d43d3bba14f017
 )
 
 package() {
diff --git a/libre/luxrender-libre/PKGBUILD b/libre/luxrender-libre/PKGBUILD
new file mode 100644
index 000000000..0dcfb0a5b
--- /dev/null
+++ b/libre/luxrender-libre/PKGBUILD
@@ -0,0 +1,48 @@
+# $Id$
+# Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com>
+# Contributor: flixie <69one@gmx.net>
+# Contributor: Imanol Celaya <ornitorrincos@archlinux-es.org>
+# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
+pkgname=luxrender-libre
+pkgver=1.2
+_pkgver=ee0b9ff73d62
+pkgrel=1
+pkgdesc="Rendering system for physically correct, unbiased image synthesis"
+arch=('i686' 'x86_64' 'mips64el')
+url="http://www.${pkgname%-$_pkgflag}.net/"
+license=('GPL')
+depends=('boost-libs' 'freeimage' 'openexr' 'libcl' 'libgl')
+optdepends=('luxblend25: Blender exporter' 'qt4: Qt GUI' \
+            'python: Python interface (pylux)')
+makedepends=('cmake' 'boost' 'mesa' 'qt4' "luxrays=$pkgver" 'python' 'opencl-headers')
+source=(https://bitbucket.org/${pkgname%-$_pkgflag}/lux/get/$_pkgver.tar.bz2)
+md5sums=('eb1ed9ecfe540896863ad4ee4da5a2f9')
+
+build() {
+  cd "$srcdir"/${pkgname%-$_pkgflag}-lux-$_pkgver
+
+  # fix the installation
+  sed -i '/.*wxgui.*/ d' CMakeLists.txt
+
+  export CXXFLAGS="$CXXFLAGS -lpthread"
+  cmake -DCMAKE_INSTALL_PREFIX=/usr \
+    -DLUXRAYS_DISABLE_OPENCL=OFF \
+    -DPYTHON_CUSTOM=ON \
+    -DPYTHON_LIBRARIES=/usr/lib/libpython3.3m.so \
+    -DPYTHON_INCLUDE_PATH=/usr/include/python3.3m/ \
+    .
+  make
+}
+
+package() {
+  cd "$srcdir"/${pkgname%-$_pkgflag}-lux-$_pkgver
+  make DESTDIR="$pkgdir" install
+
+  # fix library path on x86_64
+  [ "$CARCH" = "x86_64" ] && mv "$pkgdir"/usr/lib64 "$pkgdir"/usr/lib
+
+  #install pylux
+  install -D -m644 pylux.so "$pkgdir"/usr/lib/python3.3/pylux.so
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/libre/pacman/PKGBUILD b/libre/pacman/PKGBUILD
index 4e92336c2..6f82bded2 100644
--- a/libre/pacman/PKGBUILD
+++ b/libre/pacman/PKGBUILD
@@ -29,11 +29,11 @@ source=(ftp://ftp.archlinux.org/other/pacman/$pkgname-$pkgver.tar.gz{,.sig}
 md5sums=('387965c7125e60e5f0b9ff3b427fe0f9'
          '1a70392526c8768470da678b31905a6e'
          '1a9b79788640907a2b34e8671cacc94a'
-         'a9ddd43891bed364e1e97d27b2887bf1' 
+         'a9ddd43891bed364e1e97d27b2887bf1'
          '2e8cbf55a94b1954b167c5dee6b62317'
-         '6f284de1facaead73de918b4f380fa7f'
-         'f2213945821548c05d654a299ce077f7'
-         'a45ce4bd0bafb2d60181da5cfa7ceede'
+         '4ce9e714919e632f48129985ea6b671f'
+         '43628d586f93d64354654ae3f51aab85'
+         'f117e2e13f7d70629ce6923117c73881'
          'debc512689a1aa8c124fe0ccf27f5758')
 
 build() {
diff --git a/libre/pacman/pacman.conf b/libre/pacman/pacman.conf
index 59e55cf0b..fa8839c3d 100644
--- a/libre/pacman/pacman.conf
+++ b/libre/pacman/pacman.conf
@@ -16,7 +16,7 @@
 #GPGDir      = /etc/pacman.d/gnupg/
 HoldPkg     = pacman glibc
 # If upgrades are available for these packages they will be asked for first
-SyncFirst   = pacman
+SyncFirst   = archlinux-keyring parabola-keyring
 #XferCommand = /usr/bin/curl -C - -f %u > %o
 #XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
 #CleanMethod = KeepInstalled
diff --git a/libre/pacman/pacman.conf.mips64el b/libre/pacman/pacman.conf.mips64el
index 3c32ddb78..e6cff6811 100644
--- a/libre/pacman/pacman.conf.mips64el
+++ b/libre/pacman/pacman.conf.mips64el
@@ -16,7 +16,7 @@
 #GPGDir      = /etc/pacman.d/gnupg/
 HoldPkg     = pacman glibc
 # If upgrades are available for these packages they will be asked for first
-SyncFirst   = pacman
+SyncFirst   = archlinux-keyring parabola-keyring
 #XferCommand = /usr/bin/curl -C - -f %u > %o
 #XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
 #CleanMethod = KeepInstalled
diff --git a/libre/pacman/pacman.conf.x86_64 b/libre/pacman/pacman.conf.x86_64
index 6a28406eb..aa17bc498 100644
--- a/libre/pacman/pacman.conf.x86_64
+++ b/libre/pacman/pacman.conf.x86_64
@@ -16,7 +16,7 @@
 #GPGDir      = /etc/pacman.d/gnupg/
 HoldPkg     = pacman glibc
 # If upgrades are available for these packages they will be asked for first
-SyncFirst   = pacman
+SyncFirst   = archlinux-keyring parabola-keyring
 #XferCommand = /usr/bin/curl -C - -f %u > %o
 #XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
 #CleanMethod = KeepInstalled
diff --git a/pcr/aqsis/PKGBUILD b/pcr/aqsis/PKGBUILD
index 5a772503f..706a0c042 100644
--- a/pcr/aqsis/PKGBUILD
+++ b/pcr/aqsis/PKGBUILD
@@ -1,33 +1,58 @@
 # Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com>
 # Former contributor: Gino Pezzin <pezzin@gmail.com>
 # Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
+
 pkgname=aqsis
 pkgver=1.8.2
-pkgrel=1
-pkgdesc="A high quality, photorealistic, 3D rendering solution"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.aqsis.org"
-license=('GPL2')
-optdepends=('qt: graphical interface' 'libgl: ptview')
-depends=('boost-libs' 'openexr' 'hicolor-icon-theme' 'shared-mime-info' 'desktop-file-utils')
-makedepends=('cmake' 'boost' 'openexr' 'libpng' 'qt' 'mesa')
-options=('!libtool')
-install=aqsis.install
-source=(http://downloads.sourceforge.net/project/$pkgname/$pkgname-source/$pkgver/$pkgname-$pkgver.tar.gz)
-md5sums=('399967e99f12cfbd1a7385c4e1d39c3b')
+pkgrel=2
+pkgdesc='A high quality, photorealistic, 3D rendering solution'
+arch=(
+  i686
+  x86_64
+  mips64el
+)
+url="http://www.$pkgname.org"
+license=GPL2
+optdepends=(
+  'qt4: graphical interface'
+  'mesa-libgl: ptview'
+)
+depends=(
+  boost-libs
+  desktop-file-utils
+  hicolor-icon-theme
+  openexr
+  shared-mime-info
+)
+makedepends=(
+  boost
+  cmake
+  libpng
+  mesa
+  qt4
+)
+options=(
+  '!libtool'
+)
+install=$pkgname.install
+source="http://downloads.sourceforge.net/project/$pkgname/$pkgname-source/$pkgver/$pkgname-$pkgver.tar.gz"
+md5sums='399967e99f12cfbd1a7385c4e1d39c3b'
 
 build() {
-  cd "$srcdir"/$pkgname-$pkgver
+  cd $srcdir/$pkgname-$pkgver
 
-  mkdir -p "$srcdir"/$pkgname-build
-  cd "$srcdir"/$pkgname-build
+  mkdir -p $srcdir/$pkgname-build
+  cd $srcdir/$pkgname-build
 
-  cmake "$srcdir"/$pkgname-$pkgver \
-    -DCMAKE_INSTALL_PREFIX=/usr -DSYSCONFDIR=/etc/aqsis
-  make
+  setarch $CARCH cmake "$srcdir"/$pkgname-$pkgver\
+    -DCMAKE_INSTALL_PREFIX=/usr -DSYSCONFDIR=/etc/$pkgname
+  setarch $CARCH make
 }
 
 package() {
-  cd "$srcdir"/$pkgname-build
-  make DESTDIR="$pkgdir" install
+  cd $srcdir/$pkgname-build
+  setarch $CARCH make DESTDIR=$pkgdir install
 }
+
+# vim:set ts=2 sw=2 et:
+
diff --git a/pcr/openjdk6/PKGBUILD b/pcr/openjdk6/PKGBUILD
new file mode 100644
index 000000000..b552f272c
--- /dev/null
+++ b/pcr/openjdk6/PKGBUILD
@@ -0,0 +1,184 @@
+# $Id: PKGBUILD 178352 2013-02-20 17:00:42Z andyrtr $
+# Maintainer: Andreas Radke <andyrtr@archlinux.org>
+# Contributor: Jan de Groot <jgc@archlinux.org>
+
+pkgname=('openjdk6' 'openjdk6-src')
+pkgbase="openjdk6"
+_javaver=6
+_icedteaver=1.12.3
+_openjdk_version=b27
+_openjdk_date=26_oct_2012
+pkgver=${_javaver}.${_openjdk_version}_${_icedteaver}
+pkgrel=1
+url='http://icedtea.classpath.org'
+arch=('i686' 'x86_64')
+license=('custom')
+makedepends=('gcc-libs' 'xdg-utils' 'hicolor-icon-theme' 'ca-certificates-java' 'libxtst' 'alsa-lib' 'giflib' 'libxp' 'gtk2'
+	     'nspr' 'zlib' 'freetype2' 'libjpeg>=8' 'libx11' 'libcups' 'patch' 'libxt' 'nss' 'libxslt'
+	     'apache-ant' 'autoconf' 'unzip' 'rhino' 'mercurial' 'zip' 'cpio' 'openjdk6' 'inetutils' 'wget')
+options=('!emptydirs')
+source=(http://icedtea.classpath.org/download/source/icedtea6-${_icedteaver}.tar.gz{,.sig}
+	http://download.java.net/openjdk/jdk6/promoted/${_openjdk_version}/openjdk-6-src-${_openjdk_version}-${_openjdk_date}.tar.gz
+	http://icedtea.classpath.org/download/drops/jaxp144_04.zip
+	http://icedtea.classpath.org/download/drops/jdk6-jaxws2_1_6-2011_06_13.zip
+	http://icedtea.classpath.org/download/drops/jdk6-jaf-b20.zip
+	fix_jdk_cmds_path.diff
+	fix_corba_cmds_path.diff
+	fontconfig-paths.diff
+	nonreparenting-wm.diff
+	disable_Werror.diff
+	openjdk6.profile
+	openjdk6.profile.csh)
+noextract=(openjdk-6-src-${_openjdk_version}-${_openjdk_date}.tar.gz
+	jaxp144_04.zip
+	jdk6-jaxws2_1_6-2011_06_13.zip
+	jdk6-jaf-b20.zip)
+sha256sums=('db9dc14fa537fb22616fcd9e5b80758aa7baa66e0b6f8adfe3d5e80414574b4c'
+            'a6cbeccc4f25f72a940b9ac0c3e05ece50edc16c1c13f7a1a82ee895563930e3'
+            '044c3877b15940ff04f8aa817337f2878a00cc89674854557f1a02f15b1802a0'
+            '490f696218c1fed9cb180680af883fe309b414fec232e9cec19645e12ad0b43c'
+            '229040544e791f44906e8e7b6f6faf503c730a5d854275135f3925490d5c3be3'
+            '78c7b5c9d6271e88ee46abadd018a61f1e9645f8936cc8df1617e5f4f5074012'
+            'f5f59e121f7645ebc449bb13569fd924cbab3194e41db901f4fbe9dbd45720c5'
+            '7b2db65bfb9d5014e1522178d65cabf05dfa85e0926cde5648b5a338db376479'
+            '9ad943ceb3dbcdf45d72974fc3667886a7ed65c69ab9abc17be5412827551a7f'
+            '9c3c55c30729ec44fab14c3f3f841c273730c7467d8908a72f018bc9e9f65bd9'
+            'eb4c7f4cf50f5f74b683857f707bd21ec3847267e2e5e3173f42a6910a024f97'
+            '26e2cd5a6034f08a685129c9412f487b9931fb0d556f1ccceab17bdb75a372cd'
+            '0c2d9116d6e550021994d6713a93621a9df685d2182996be3249ad812712b007')
+
+build() {
+
+  unset JAVA_HOME
+  unset CLASSPATH
+  
+    [ -z "${ANT_HOME}" ] && . /etc/profile.d/apache-ant.sh
+
+  _javaver=6
+  _jvmdir=/usr/lib/jvm/java-${_javaver}-openjdk
+
+  cd ${srcdir}/icedtea6-${_icedteaver}
+
+  ln -s ${srcdir}/openjdk-6-src-${_openjdk_version}-${_openjdk_date}.tar.gz .
+
+  cp ${srcdir}/*.diff ${srcdir}/icedtea6-${_icedteaver}/patches/
+
+  autoreconf -i
+
+  export DISTRIBUTION_PATCHES="patches/fix_jdk_cmds_path.diff patches/fontconfig-paths.diff patches/fix_corba_cmds_path.diff patches/nonreparenting-wm.diff patches/disable_Werror.diff"
+
+  export ALT_PARALLEL_COMPILE_JOBS="${MAKEFLAGS/-j}"
+  export HOTSPOT_BUILD_JOBS="${ALT_PARALLEL_COMPILE_JOBS}"
+  unset MAKEFLAGS
+
+  ./configure --with-parallel-jobs=${HOTSPOT_BUILD_JOBS} \
+	--with-ant-home=/usr/share/java/apache-ant \
+	--with-pkgversion=ArchLinux-${pkgver}-${pkgrel}-$CARCH \
+	--with-jaxp-drop-zip=${srcdir}/jaxp144_04.zip \
+  	--with-jaxws-drop-zip=${srcdir}/jdk6-jaxws2_1_6-2011_06_13.zip \
+	--with-jaf-drop-zip=${srcdir}/jdk6-jaf-b20.zip \
+	--disable-bootstrap \
+	--with-abs-install-dir=${_jvmdir}
+  LD_PRELOAD="" make 
+}
+
+package_openjdk6() {
+ pkgdesc='Free Java environment based on OpenJDK 6.0 with IcedTea6 replacing binary plugs.'
+ backup=(etc/profile.d/openjdk6.sh)
+ depends=('gcc-libs' 'xdg-utils' 'hicolor-icon-theme' 'ca-certificates-java' 'libxtst' 'libxt' 'nss' 'libjpeg' 'freetype2' 'libxrender' 'libpng>=1.5.7')
+ optdepends=('icedtea-web: web browser plugin + Java Web Start'
+            'alsa-lib: for sound'
+            'giflib: for gif format support')
+ conflicts=('java-environment' 'java-runtime')
+ provides=('java-environment=6' 'java-runtime=6' 'java-runtime-headless=6')
+ install=openjdk6.install
+
+  if [ "${CARCH}" = "x86_64" ]; then
+    _arch=amd64
+  else
+    _arch=i586
+  fi
+
+  _javaver=6
+  _jvmdir=/usr/lib/jvm/java-${_javaver}-openjdk
+
+  cd ${srcdir}/icedtea6-${_icedteaver}
+  install -m755 -d ${pkgdir}/${_jvmdir}/jre
+
+  pushd ${srcdir}/icedtea6-${_icedteaver}/openjdk.build/j2sdk-image
+
+   # Install main files.
+  cp -a bin include lib ${pkgdir}/${_jvmdir}/ 
+  cp -a jre/bin jre/lib ${pkgdir}/${_jvmdir}/jre/ 
+
+  mv ${pkgdir}/${_jvmdir}/jre/lib/fontconfig.Ubuntu.properties.src \
+     ${pkgdir}/${_jvmdir}/jre/lib/fontconfig.properties.src 
+  mv ${pkgdir}/${_jvmdir}/jre/lib/fontconfig.Ubuntu.bfc \
+     ${pkgdir}/${_jvmdir}/jre/lib/fontconfig.bfc 
+  rm -f ${pkgdir}/${_jvmdir}/jre/lib/fontconfig.*.bfc
+  rm -f ${pkgdir}/${_jvmdir}/jre/lib/fontconfig.*.properties.src
+
+   # Install man pages.
+  install -m755 -d ${pkgdir}/usr/share/man/man1
+  install -m644 man/man1/*.1 ${pkgdir}/usr/share/man/man1/ 
+  
+   # Install demos and samples.
+  cp -a demo ${pkgdir}/${_jvmdir}/ 
+  install -m755 -d sample/rmi
+  mv bin/java-rmi.cgi sample/rmi 
+  cp -a sample ${pkgdir}/${_jvmdir}/ 
+  popd
+
+  # Install icons and menu entries.
+  for s in 16 24 32 48 ; do
+    install -m755 -d ${pkgdir}/usr/share/icons/hicolor/${s}x${s}/apps
+    install -m644 openjdk/jdk/src/solaris/classes/sun/awt/X11/java-icon${s}.png \
+      ${pkgdir}/usr/share/icons/hicolor/${s}x${s}/apps/java.png 
+  done
+
+  # Install desktop files.
+  install -m755 -d ${pkgdir}/usr/share/applications
+  install -m644 {jconsole,policytool}.desktop ${pkgdir}/usr/share/applications
+
+  # link binaries into /usr/bin
+  install -m755 -d ${pkgdir}/usr/bin
+  pushd ${pkgdir}/${_jvmdir}/bin
+  for file in *; do
+    ln -sf ${_jvmdir}/bin/${file} \
+      ${pkgdir}/usr/bin 
+  done
+  popd
+
+  # link JKS keystore from ca-certificates-java
+  rm -f ${pkgdir}/${_jvmdir}/jre/lib/security/cacerts
+  ln -sf /etc/ssl/certs/java/cacerts "${pkgdir}/${_jvmdir}/jre/lib/security/cacerts"
+ 
+  # set some variables
+  install -m755 -d ${pkgdir}/etc/profile.d
+  install -m755 ${srcdir}/openjdk6.profile ${pkgdir}/etc/profile.d/openjdk6.sh 
+  install -m755 ${srcdir}/openjdk6.profile.csh ${pkgdir}/etc/profile.d/openjdk6.csh 
+  
+  # install license
+  install -Dm644 ${srcdir}//icedtea6-${_icedteaver}/openjdk/LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+}
+
+package_openjdk6-src() {
+ pkgdesc='Free Java environment based on OpenJDK 6.0 Source Bundle'
+ depends=('openjdk6')
+ 
+  if [ "${CARCH}" = "x86_64" ]; then
+    _arch=amd64
+  else
+    _arch=i586
+  fi
+
+  _javaver=6
+  _jvmdir=/usr/lib/jvm/java-${_javaver}-openjdk
+
+  cd ${srcdir}/icedtea6-${_icedteaver}
+  install -m755 -d ${pkgdir}/${_jvmdir}/jre
+  
+  pushd ${srcdir}/icedtea6-${_icedteaver}/openjdk.build/j2sdk-image
+   # Install src.zip file
+  cp -a src.zip ${pkgdir}/${_jvmdir}/ 
+}
diff --git a/pcr/openjdk6/disable_Werror.diff b/pcr/openjdk6/disable_Werror.diff
new file mode 100644
index 000000000..fa8887a10
--- /dev/null
+++ b/pcr/openjdk6/disable_Werror.diff
@@ -0,0 +1,11 @@
+--- openjdk/hotspot/make/linux/makefiles/gcc.make	2012-06-07 16:30:51.000000000 +0200
++++ openjdk/hotspot/make/linux/makefiles/gcc.make.new	2012-06-14 15:32:44.967695139 +0200
+@@ -150,7 +150,7 @@
+ endif
+ 
+ # Compiler warnings are treated as errors
+-WARNINGS_ARE_ERRORS = -Werror
++#WARNINGS_ARE_ERRORS = -Werror
+ 
+ # Except for a few acceptable ones
+ # Since GCC 4.3, -Wconversion has changed its meanings to warn these implicit
diff --git a/pcr/openjdk6/fix_corba_cmds_path.diff b/pcr/openjdk6/fix_corba_cmds_path.diff
new file mode 100644
index 000000000..7a3db9567
--- /dev/null
+++ b/pcr/openjdk6/fix_corba_cmds_path.diff
@@ -0,0 +1,29 @@
+--- openjdk/corba/make/common/shared/Defs-utils.gmk.old	2008-04-13 13:26:12.000000000 +0300
++++ openjdk/corba/make/common/shared/Defs-utils.gmk	2008-04-14 15:35:13.000000000 +0300
+@@ -76,7 +76,7 @@
+ CHMOD          = $(UTILS_COMMAND_PATH)chmod
+ CMP            = $(UTILS_USR_BIN_PATH)cmp
+ COMM           = $(UTILS_USR_BIN_PATH)comm
+-COMPRESS       = $(UTILS_USR_BIN_PATH)compress
++COMPRESS       = $(UTILS_COMMAND_PATH)compress
+ CP             = $(UTILS_COMMAND_PATH)cp
+ CPIO           = $(UTILS_COMMAND_PATH)cpio
+ CUT            = $(UTILS_USR_BIN_PATH)cut
+@@ -125,7 +125,7 @@
+ TAIL           = $(UTILS_USR_BIN_PATH)tail
+ TAR            = $(UTILS_COMMAND_PATH)tar
+ TEST           = $(UTILS_USR_BIN_PATH)test
+-TOUCH          = $(UTILS_COMMAND_PATH)touch
++TOUCH          = $(UTILS_USR_BIN_PATH)touch
+ TR             = $(UTILS_USR_BIN_PATH)tr
+ TRUE           = $(UTILS_COMMAND_PATH)true
+ UNAME          = $(UTILS_COMMAND_PATH)uname
+@@ -176,7 +176,7 @@
+   # others have it in /usr/bin.
+   SORT=$(firstword $(wildcard $(UTILS_COMMAND_PATH)sort) \
+ 		   $(wildcard $(UTILS_USR_BIN_PATH)sort))
+-  NAWK           = $(USRBIN_PATH)gawk
++  NAWK           = $(UTILS_COMMAND_PATH)gawk
+   # Intrinsic unix command, with backslash-escaped character interpretation
+   ECHO           = /bin/echo -e
+   # These are really in UTILS_USR_BIN_PATH on Linux (only sccs is not)
diff --git a/pcr/openjdk6/fix_jdk_cmds_path.diff b/pcr/openjdk6/fix_jdk_cmds_path.diff
new file mode 100644
index 000000000..bd37dd4ba
--- /dev/null
+++ b/pcr/openjdk6/fix_jdk_cmds_path.diff
@@ -0,0 +1,29 @@
+--- openjdk/jdk/make/common/shared/Defs-utils.gmk.old	2008-04-13 13:33:23.000000000 +0300
++++ openjdk/jdk/make/common/shared/Defs-utils.gmk	2008-04-14 15:37:34.000000000 +0300
+@@ -89,7 +89,7 @@
+ CHMOD          = $(UTILS_COMMAND_PATH)chmod
+ CMP            = $(UTILS_USR_BIN_PATH)cmp
+ COMM           = $(UTILS_USR_BIN_PATH)comm
+-COMPRESS       = $(UTILS_USR_BIN_PATH)compress
++COMPRESS       = $(UTILS_COMMAND_PATH)compress
+ CP             = $(UTILS_COMMAND_PATH)cp
+ CPIO           = $(UTILS_COMMAND_PATH)cpio
+ CUT            = $(UTILS_USR_BIN_PATH)cut
+@@ -137,7 +137,7 @@
+ TAIL           = $(UTILS_USR_BIN_PATH)tail
+ TAR            = $(UTILS_COMMAND_PATH)tar
+ TEST           = $(UTILS_USR_BIN_PATH)test
+-TOUCH          = $(UTILS_COMMAND_PATH)touch
++TOUCH          = $(UTILS_USR_BIN_PATH)touch
+ TR             = $(UTILS_USR_BIN_PATH)tr
+ TRUE           = $(UTILS_COMMAND_PATH)true
+ UNAME          = $(UTILS_COMMAND_PATH)uname
+@@ -178,7 +178,7 @@
+   BASENAME=$(firstword $(wildcard $(UTILS_COMMAND_PATH)basename) \
+                        $(wildcard $(UTILS_USR_BIN_PATH)basename))
+ 
+-  NAWK           = $(USRBIN_PATH)gawk
++  NAWK           = $(UTILS_COMMAND_PATH)gawk
+   # Intrinsic unix command, with backslash-escaped character interpretation
+   ECHO           = /bin/echo -e
+   # These are really in UTILS_USR_BIN_PATH on Linux (only sccs is not)
diff --git a/pcr/openjdk6/fontconfig-paths.diff b/pcr/openjdk6/fontconfig-paths.diff
new file mode 100644
index 000000000..fa08db629
--- /dev/null
+++ b/pcr/openjdk6/fontconfig-paths.diff
@@ -0,0 +1,134 @@
+--- openjdk/jdk/src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.Ubuntu.properties	2009-05-29 22:45:23.024341869 +0000
++++ openjdk/jdk/src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.Ubuntu.properties.new	2009-05-29 22:55:13.681366890 +0000
+@@ -275,73 +275,61 @@
+ 
+ # Font File Names
+ 
+-filename.DejaVu_Sans=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf
+-filename.DejaVu_Sans_Bold=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-Bold.ttf
+-filename.DejaVu_Sans_Oblique=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-Oblique.ttf
+-filename.DejaVu_Sans_Bold_Oblique=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-BoldOblique.ttf
+-
+-filename.DejaVu_Sans_Mono=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSansMono.ttf
+-filename.DejaVu_Sans_Mono_Bold=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSansMono-Bold.ttf
+-filename.DejaVu_Sans_Mono_Oblique=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSansMono-Oblique.ttf
+-filename.DejaVu_Sans_Mono_Bold_Oblique=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSansMono-BoldOblique.ttf
+-
+-filename.DejaVu_Serif=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSerif.ttf
+-filename.DejaVu_Serif_Bold=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSerif-Bold.ttf
+-filename.DejaVu_Serif_Oblique=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSerif-Oblique.ttf
+-filename.DejaVu_Serif_Bold_Oblique=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSerif-BoldOblique.ttf
+-
+-filename.AR_PL_UMing_CN=/usr/share/fonts/truetype/arphic/uming.ttc
+-filename.AR_PL_UMing_HK=/usr/share/fonts/truetype/arphic/uming.ttc
+-filename.AR_PL_UMing_TW=/usr/share/fonts/truetype/arphic/uming.ttc
+-filename.AR_PL_ShanHeiSun_Uni=/usr/share/fonts/truetype/arphic/uming.ttf
+-
+-filename.WenQuanYi_Zen_Hei=/usr/share/fonts/truetype/wqy/wqy-zenhei.ttf
+-filename.Baekmuk_Batang=/usr/share/fonts/truetype/baekmuk/batang.ttf
+-filename.UnBatang=/usr/share/fonts/truetype/unfonts/UnBatang.ttf
+-filename.UnBatang_Bold=/usr/share/fonts/truetype/unfonts/UnBatangBold.ttf
+-filename.Baekmuk_Gulim=/usr/share/fonts/truetype/baekmuk/gulim.ttf
+-filename.UnDotum=/usr/share/fonts/truetype/unfonts/UnDotum.ttf
+-filename.UnDotum_Bold=/usr/share/fonts/truetype/unfonts/UnDotumBold.ttf
+-filename.Kochi_Gothic=/usr/share/fonts/truetype/kochi/kochi-gothic.ttf
+-filename.Sazanami_Gothic=/usr/share/fonts/truetype/sazanami/sazanami-gothic.ttf
+-filename.Kochi_Mincho=/usr/share/fonts/truetype/kochi/kochi-mincho.ttf
+-filename.Sazanami_Mincho=/usr/share/fonts/truetype/sazanami/sazanami-mincho.ttf
+-filename.VL_Gothic=/usr/share/fonts/truetype/vlgothic/VL-Gothic-Regular.ttf
+-filename.VL_PGothic=/usr/share/fonts/truetype/vlgothic/VL-PGothic-Regular.ttf
+-
+-filename.Lohit_Bengali=/usr/share/fonts/truetype/ttf-bengali-fonts/lohit_bn.ttf
+-filename.Lohit_Gujarati=/usr/share/fonts/truetype/ttf-indic-fonts-core/lohit_gu.ttf
+-filename.Lohit_Hindi=/usr/share/fonts/truetype/ttf-indic-fonts-core/lohit_hi.ttf
+-filename.Lohit_Kannda=/usr/share/fonts/truetype/ttf-kannada-fonts/lohit_kn.ttf
+-#filename.Lohit_Malayalam=/usr/share/fonts/lohit-malayalam/lohit_ml.ttf
+-filename.Lohit_Oriya=/usr/share/fonts/truetype/ttf-oriya-fonts/lohit_or.ttf
+-filename.Lohit_Punjabi=/usr/share/fonts/truetype/ttf-indic-fonts-core/lohit_pa.ttf
+-filename.Lohit_Tamil=/usr/share/fonts/truetype/ttf-indic-fonts-core/lohit_ta.ttf
+-filename.Lohit_Telugu=/usr/share/fonts/truetype/ttf-telugu-fonts/lohit_te.ttf
+-filename.LKLUG=/usr/share/fonts/truetype/ttf-sinhala-lklug/lklug.ttf
+-
+-filename.LuxiSans-Regular=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxisr.ttf
+-filename.LuxiSans-Bold=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxisb.ttf
+-filename.LuxiSans-Oblique=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxisri.ttf
+-filename.LuxiSans-BoldOblique=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxisbi.ttf
+-filename.LuxiMono-Regular=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luximr.ttf
+-filename.LuxiMono-Bold=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luximb.ttf
+-filename.LuxiMono-Oblique=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luximri.ttf
+-filename.LuxiMono-BoldOblique=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luximbi.ttf
+-filename.LuxiSerif-Regular=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxirr.ttf
+-filename.LuxiSerif-Bold=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxirb.ttf
+-filename.LuxiSerif-Oblique=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxirri.ttf
+-filename.LuxiSerif-BoldOblique=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxirbi.ttf
+-
+-# AWT X11 font paths
+-awtfontpath.latin-1=/usr/share/fonts/X11/Type1
+-awtfontpath.umingcn=/usr/share/fonts/truetype/arphic
+-awtfontpath.uminghk=/usr/share/fonts/truetype/arphic
+-awtfontpath.umingtw=/usr/share/fonts/truetype/arphic
+-awtfontpath.shanheisun=/usr/share/fonts/truetype/arphic
+-awtfontpath.wqy-zenhei=/usr/share/fonts/truetype/wqy
+-awtfontpath.japanese-kochi=/usr/share/fonts/truetype/kochi
+-awtfontpath.japanese-sazanami=/usr/share/fonts/truetype/sazanami
+-awtfontpath.japanese-vlgothic=/usr/share/fonts/truetype/vlgothic
+-awtfontpath.korean-baekmuk=/usr/share/fonts/truetype/baekmuk
+-awtfontpath.korean-un=/usr/share/fonts/truetype/unfonts
++filename.DejaVu_Sans=/usr/share/fonts/TTF/DejaVuSans.ttf
++filename.DejaVu_Sans_Bold=/usr/share/fonts/TTF/DejaVuSans-Bold.ttf
++filename.DejaVu_Sans_Oblique=/usr/share/fonts/TTF/DejaVuSans-Oblique.ttf
++filename.DejaVu_Sans_Bold_Oblique=/usr/share/fonts/TTF/DejaVuSans-BoldOblique.ttf
++
++filename.DejaVu_Sans_Mono=/usr/share/fonts/TTF/DejaVuSansMono.ttf
++filename.DejaVu_Sans_Mono_Bold=/usr/share/fonts/TTF/DejaVuSansMono-Bold.ttf
++filename.DejaVu_Sans_Mono_Oblique=/usr/share/fonts/TTF/DejaVuSansMono-Oblique.ttf
++filename.DejaVu_Sans_Mono_Bold_Oblique=/usr/share/fonts/TTF/DejaVuSansMono-BoldOblique.ttf
++
++filename.DejaVu_Serif=/usr/share/fonts/TTF/DejaVuSerif.ttf
++filename.DejaVu_Serif_Bold=/usr/share/fonts/TTF/DejaVuSerif-Bold.ttf
++filename.DejaVu_Serif_Oblique=/usr/share/fonts/TTF/DejaVuSerif-Oblique.ttf
++filename.DejaVu_Serif_Bold_Oblique=/usr/share/fonts/TTF/DejaVuSerif-BoldOblique.ttf
++
++filename.AR_PL_UMing_CN=/usr/share/fonts/TTF/uming.ttc
++filename.AR_PL_UMing_HK=/usr/share/fonts/TTF/uming.ttc
++filename.AR_PL_UMing_TW=/usr/share/fonts/TTF/uming.ttc
++filename.AR_PL_ShanHeiSun_Uni=/usr/share/TTF/uming.ttf
++
++filename.WenQuanYi_Zen_Hei=/usr/share/fonts/TTF/wqy-zenhei.ttf
++filename.Baekmuk_Batang=/usr/share/fonts/TTF/batang.ttf
++filename.UnBatang=/usr/share/fonts/TTF/UnBatang.ttf
++filename.UnBatang_Bold=/usr/share/fonts/TTF/UnBatangBold.ttf
++filename.Baekmuk_Gulim=/usr/share/fonts/TTF/gulim.ttf
++filename.UnDotum=/usr/share/fonts/TTF/UnDotum.ttf
++filename.UnDotum_Bold=/usr/share/fonts/TTF/UnDotumBold.ttf
++filename.Kochi_Gothic=/usr/share/fonts/TTF/kochi-gothic.ttf
++filename.Sazanami_Gothic=/usr/share/fonts/TTF/sazanami-gothic.ttf
++filename.Kochi_Mincho=/usr/share/fonts/TTF/kochi-mincho.ttf
++filename.Sazanami_Mincho=/usr/share/fonts/TTF/sazanami-mincho.ttf
++filename.VL_Gothic=/usr/share/fonts/TTF/VL-Gothic-Regular.ttf
++filename.VL_PGothic=/usr/share/fonts/TTF/VL-PGothic-Regular.ttf
++
++filename.Lohit_Bengali=/usr/share/fonts/TTF/lohit_bn.ttf
++filename.Lohit_Gujarati=/usr/share/fonts/TTF/lohit_gu.ttf
++filename.Lohit_Hindi=/usr/share/fonts/TTF/lohit_hi.ttf
++filename.Lohit_Kannda=/usr/share/fonts/TTF/lohit_kn.ttf
++#filename.Lohit_Malayalam=/usr/share/fonts/TTF/lohit_ml.ttf
++filename.Lohit_Oriya=/usr/share/fonts/TTF/lohit_or.ttf
++filename.Lohit_Punjabi=/usr/share/fonts/TTF/lohit_pa.ttf
++filename.Lohit_Tamil=/usr/share/fonts/TTF/lohit_ta.ttf
++filename.Lohit_Telugu=/usr/share/fonts/TTF/lohit_te.ttf
++filename.LKLUG=/usr/share/fonts/TTF/lklug.ttf
++
++filename.LuxiSans-Regular=/usr/share/fonts/TTF/luxisr.ttf
++filename.LuxiSans-Bold=/usr/share/fonts/TTF/luxisb.ttf
++filename.LuxiSans-Oblique=/usr/share/fonts/TTF/luxisri.ttf
++filename.LuxiSans-BoldOblique=/usr/share/fonts/TTF/luxisbi.ttf
++filename.LuxiMono-Regular=/usr/share/fonts/TTF/luximr.ttf
++filename.LuxiMono-Bold=/usr/share/fonts/TTF/luximb.ttf
++filename.LuxiMono-Oblique=/usr/share/fonts/TTF/luximri.ttf
++filename.LuxiMono-BoldOblique=/usr/share/fonts/TTF/luximbi.ttf
++filename.LuxiSerif-Regular=/usr/share/fonts/TTF/luxirr.ttf
++filename.LuxiSerif-Bold=/usr/share/fonts/TTF/luxirb.ttf
++filename.LuxiSerif-Oblique=/usr/share/fonts/TTF/luxirri.ttf
++filename.LuxiSerif-BoldOblique=/usr/share/fonts/TTF/luxirbi.ttf
++
diff --git a/pcr/openjdk6/nonreparenting-wm.diff b/pcr/openjdk6/nonreparenting-wm.diff
new file mode 100644
index 000000000..65fa66e89
--- /dev/null
+++ b/pcr/openjdk6/nonreparenting-wm.diff
@@ -0,0 +1,60 @@
+diff --git a/jdk/src/solaris/classes/sun/awt/X11/XWM.java b/jdk/src/solaris/classes/sun/awt/X11/XWM.java
+index 68d1ff7..878327e 100644
+--- openjdk/jdk/src/solaris/classes/sun/awt/X11/XWM.java
++++ openjdk/jdk/src/solaris/classes/sun/awt/X11/XWM.java
+@@ -99,7 +99,8 @@
+         METACITY_WM = 11,
+         COMPIZ_WM = 12,
+         LG3D_WM = 13,
+-        MUTTER_WM = 14;
++        MUTTER_WM = 14,
++        OTHER_NONREPARENTING_WM = 15;
+     public String toString() {
+         switch  (WMID) {
+           case NO_WM:
+@@ -564,7 +567,7 @@ class XWM implements MWMConstants, XUtilConstants {
+     }
+ 
+     static boolean isNonReparentingWM() {
+-        return (XWM.getWMID() == XWM.COMPIZ_WM || XWM.getWMID() == XWM.LG3D_WM);
++        return (XWM.getWMID() == XWM.COMPIZ_WM || XWM.getWMID() == XWM.LG3D_WM || XWM.getWMID() == XWM.OTHER_NONREPARENTING_WM);
+     }
+ 
+     /*
+@@ -764,9 +767,17 @@ class XWM implements MWMConstants, XUtilConstants {
+              * supports WIN or _NET wm spec.
+              */
+             else if (l_net_protocol.active()) {
+-                awt_wmgr = XWM.OTHER_WM;
++                if (XToolkit.getEnv("_JAVA_AWT_WM_NONREPARENTING") != null) {
++                    awt_wmgr = XWM.OTHER_NONREPARENTING_WM;
++                } else {
++                    awt_wmgr = XWM.OTHER_WM;
++		}
+             } else if (win.active()) {
+-                awt_wmgr = XWM.OTHER_WM;
++                if (XToolkit.getEnv("_JAVA_AWT_WM_NONREPARENTING") != null) {
++                    awt_wmgr = XWM.OTHER_NONREPARENTING_WM;
++                } else {
++                    awt_wmgr = XWM.OTHER_WM;
++		}
+             }
+             /*
+              * Check for legacy WMs.
+@@ -777,6 +788,8 @@ class XWM implements MWMConstants, XUtilConstants {
+                 awt_wmgr = XWM.MOTIF_WM;
+             } else if (isOpenLook()) {
+                 awt_wmgr = XWM.OPENLOOK_WM;
++            } else if (XToolkit.getEnv("_JAVA_AWT_WM_NONREPARENTING") != null) {
++                awt_wmgr = XWM.OTHER_NONREPARENTING_WM;
+             } else {
+                 awt_wmgr = XWM.OTHER_WM;
+             }
+@@ -1298,6 +1311,7 @@ class XWM implements MWMConstants, XUtilConstants {
+                   res = new Insets(28, 6, 6, 6);
+                   break;
+               case NO_WM:
++              case OTHER_NONREPARENTING_WM:
+               case LG3D_WM:
+                   res = zeroInsets;
+                   break;
diff --git a/pcr/openjdk6/openjdk6.install b/pcr/openjdk6/openjdk6.install
new file mode 100644
index 000000000..653c8fe2f
--- /dev/null
+++ b/pcr/openjdk6/openjdk6.install
@@ -0,0 +1,24 @@
+post_install() {
+  xdg-icon-resource forceupdate --theme hicolor 2> /dev/null
+  if [ ! -f /etc/ssl/certs/java/cacerts ]; then
+    /usr/sbin/init-jks-keystore
+  fi
+  echo "when you use a non-reparenting window manager"
+  echo "set _JAVA_AWT_WM_NONREPARENTING=1 in"
+  echo "/etc/profile.d/openjdk6.sh"
+#  update-desktop-database -q
+}
+
+post_upgrade() {
+  xdg-icon-resource forceupdate --theme hicolor 2> /dev/null
+  if [ ! -f /etc/ssl/certs/java/cacerts ]; then
+    /usr/sbin/init-jks-keystore
+  fi
+#  update-desktop-database -q
+}
+
+
+post_remove() {
+  xdg-icon-resource forceupdate --theme hicolor 2> /dev/null
+#  update-desktop-database -q
+}
diff --git a/pcr/openjdk6/openjdk6.profile b/pcr/openjdk6/openjdk6.profile
new file mode 100644
index 000000000..9da4421ef
--- /dev/null
+++ b/pcr/openjdk6/openjdk6.profile
@@ -0,0 +1,6 @@
+export J2SDKDIR=/usr/lib/jvm/java-6-openjdk
+export J2REDIR=$J2SDKDIR/jre
+export JAVA_HOME=/usr/lib/jvm/java-6-openjdk
+
+# enable this for non-reparenting window managers
+#export _JAVA_AWT_WM_NONREPARENTING=1
diff --git a/pcr/openjdk6/openjdk6.profile.csh b/pcr/openjdk6/openjdk6.profile.csh
new file mode 100644
index 000000000..3cb15fd49
--- /dev/null
+++ b/pcr/openjdk6/openjdk6.profile.csh
@@ -0,0 +1,6 @@
+setenv J2SDKDIR "/usr/lib/jvm/java-6-openjdk"
+setenv J2REDIR "$J2SDKDIR/jre"
+setenv JAVA_HOME "/usr/lib/jvm/java-6-openjdk"
+
+# enable this for non-reparenting window managers
+#setenv _JAVA_AWT_WM_NONREPARENTING 1
diff --git a/pcr/yabause/PKGBUILD b/pcr/yabause/PKGBUILD
index bf5aca5f3..c65bcbe2f 100644
--- a/pcr/yabause/PKGBUILD
+++ b/pcr/yabause/PKGBUILD
@@ -5,7 +5,7 @@
 # Contributor: robb_force <robb_force@holybuffalo.net>
 pkgname=yabause
 pkgver=0.9.12
-pkgrel=2
+pkgrel=3
 pkgdesc='A Sega Saturn emulator.'
 url='http://yabause.org/'
 license=('GPL')
@@ -24,6 +24,7 @@ build() {
   cmake \
     -DCMAKE_BUILD_TYPE=RelWithDebInfo \
     -DCMAKE_INSTALL_PREFIX=/usr \
+    -DQT_QMAKE_EXECUTABLE=/usr/bin/qmake-qt4 \
     -DYAB_PORTS=qt \
     -DYAB_MULTIBUILD=OFF \
     -DYAB_NETWORK=ON \
author	Michał Masłowski <mtjm@mtjm.eu>	2013-03-08 10:04:45 +0100
committer	Michał Masłowski <mtjm@mtjm.eu>	2013-03-08 10:04:45 +0100
commit	c4e52ac02d1d223901ab48f78d9835fda60acd0c (patch)
tree	0d9401c37c51deb92a3b16c0eeaeb45404334f1b
parent	0e48701e4ef754a7d5aab1e8fa1ef6ba8ff3c441 (diff)
parent	129db5c42a9c8f32d88c57ac3b81182acf844068 (diff)