Sat Mar 2 00:04:03 PST 2013

author: root <root@rshg054.dnsready.net> 2013-03-02 00:04:05 -0800
committer: root <root@rshg054.dnsready.net> 2013-03-02 00:04:05 -0800
commit: 98aa0004e23472ee63753fded33cd55d8b942f36 (patch)
tree: 1299d9cfb8bcd6bd295a1a279b4ad322b4e9133a
parent: 5ae40a63ab4c6838234db5a9da1e99d8bc27875d (diff)
224 files changed, 2259 insertions, 4459 deletions
diff --git a/community/aegisub/PKGBUILD b/community/aegisub/PKGBUILD
index 1904ec6c6..3d4671472 100755
--- a/community/aegisub/PKGBUILD
+++ b/community/aegisub/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 85219 2013-02-27 18:33:34Z alucryd $
+# $Id: PKGBUILD 85317 2013-03-01 00:32:14Z alucryd $
 # Maintainer: Maxime Gauduin <alucryd@gmail.com>
 # Contributor: kozec <kozec@kozec.com>
 # Contributor: Limao Luo <luolimao+AUR@gmail.com>
 
 pkgname=aegisub
 pkgver=3.0.2
-pkgrel=5
+pkgrel=6
 pkgdesc="A general-purpose subtitle editor with ASS/SSA support"
 arch=('i686' 'x86_64')
 url="http://www.aegisub.org"
@@ -41,3 +41,5 @@ package() {
   install -dm 755 "${pkgdir}"/usr/share/licenses/aegisub
   install -m 644 LICENCE "${pkgdir}"/usr/share/licenses/aegisub/LICENSE
 }
+
+# vim: ts=2 sw=2 et:
diff --git a/community/aegisub/aegisub.install b/community/aegisub/aegisub.install
index 105ce6543..af7ea4171 100755
--- a/community/aegisub/aegisub.install
+++ b/community/aegisub/aegisub.install
@@ -1,5 +1,5 @@
 post_install() {
-    gtk-update-icon-cache -ftq /usr/share/icons/hicolor
+    gtk-update-icon-cache -ftq usr/share/icons/hicolor
     update-desktop-database -q
 }
 
diff --git a/community/bitcoin/PKGBUILD b/community/bitcoin/PKGBUILD
index 5faa9c9f6..c9ac8a87d 100644
--- a/community/bitcoin/PKGBUILD
+++ b/community/bitcoin/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 84601 2013-02-20 12:17:25Z tredaelli $
+# $Id: PKGBUILD 85453 2013-03-01 19:08:27Z andrea $
 # Maintainer: Timothy Redaelli <timothy.redaelli@gmail.com>
 # Contributor: shahid <helllamer@gmail.com>
 
 pkgbase=bitcoin
 pkgname=('bitcoin-daemon' 'bitcoin-qt')
 pkgver=0.8.0
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url="http://www.bitcoin.org/"
 makedepends=('boost' 'automoc4' 'qrencode' 'miniupnpc')
@@ -19,7 +19,7 @@ build() {
   cd "$srcdir/$pkgbase-$pkgver-linux/src"
 
   # and make qt gui
-  qmake USE_QRCODE=1
+  qmake-qt4 USE_QRCODE=1
   make
 
   # make bitcoind
@@ -29,7 +29,7 @@ build() {
 
 package_bitcoin-qt() {
   pkgdesc="Bitcoin is a peer-to-peer network based digital currency - QT"
-  depends=(boost-libs qt miniupnpc qrencode)
+  depends=(boost-libs qt4 miniupnpc qrencode)
   install=bitcoin-qt.install
 
   cd "$srcdir/$pkgbase-$pkgver-linux/src"
diff --git a/community/canorus/PKGBUILD b/community/canorus/PKGBUILD
index d1ff35fe2..9ea89a79a 100644
--- a/community/canorus/PKGBUILD
+++ b/community/canorus/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 59873 2011-12-01 13:49:19Z spupykin $
+# $Id: PKGBUILD 85336 2013-03-01 10:28:57Z andrea $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Arch Linux Pro Audio <dev@archaudio.org>
 # Contributor: Coenraad van der Westhuizen <chwesthuizen@gmail.com>
@@ -6,12 +6,12 @@
 
 pkgname=canorus
 pkgver=0.7.R1002
-pkgrel=4
+pkgrel=5
 pkgdesc="A free music score editor"
 arch=('i686' 'x86_64')
 url="http://www.canorus.org/"
 license=('GPL')
-depends=('qt' 'alsa-lib' 'python2' 'swig')
+depends=('qt4' 'alsa-lib' 'python2' 'swig' 'zlib')
 makedepends=('cmake')
 options=('strip')
 source=(http://download.berlios.de/$pkgname/$pkgname\_$pkgver\_source.tar.bz2)
@@ -19,12 +19,16 @@ md5sums=('5575b7c54633056a463177579a390318')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
-  export QTDIR=/usr
+  source /etc/profile.d/qt4.sh
+  export LDFLAGS="-lz -lpthread"
   cmake . -DCMAKE_INSTALL_PREFIX=$pkgdir/usr \
 	-DDEFAULT_DATA_DIR="/usr/share/canorus" \
 	-DNO_SWIG=ON
-  make install
+}
 
+package() {
+  cd $srcdir/$pkgname-$pkgver
+  make install
   install -d $pkgdir/usr/share/{applications,pixmaps}
   cp canorus.desktop $pkgdir/usr/share/applications
   cp $pkgdir/usr/share/{canorus/images/clogosm.png,pixmaps/canorus.png}
diff --git a/community/converseen/PKGBUILD b/community/converseen/PKGBUILD
index 1edce2927..157109b96 100644
--- a/community/converseen/PKGBUILD
+++ b/community/converseen/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 84204 2013-02-13 17:18:42Z giovanni $
+# $Id: PKGBUILD 85338 2013-03-01 10:29:17Z andrea $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: archtux <antonio.arias99999 at gmail.com>
 
 pkgname=converseen
 pkgver=0.5.3
-pkgrel=1
+pkgrel=2
 pkgdesc="The batch image converter and resizer"
 arch=('i686' 'x86_64')
 url="http://converseen.sourceforge.net/"
 license=('GPL3')
-depends=('imagemagick' 'qt' 'libwmf' 'openexr')
+depends=('imagemagick' 'qt4' 'libwmf' 'openexr')
 makedepends=('cmake')
 install=converseen.install
 source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
diff --git a/community/cppcheck/PKGBUILD b/community/cppcheck/PKGBUILD
index c6d4eb2f2..a1a35cb2e 100644
--- a/community/cppcheck/PKGBUILD
+++ b/community/cppcheck/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 82520 2013-01-20 01:50:26Z stephane $
+# $Id: PKGBUILD 85339 2013-03-01 10:29:27Z andrea $
 # Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
 
 pkgname=cppcheck
 pkgver=1.58
-pkgrel=1
+pkgrel=2
 pkgdesc="A tool for static C/C++ code analysis"
 arch=('i686' 'x86_64')
 url="http://cppcheck.wiki.sourceforge.net/"
 license=('GPL')
-depends=('pcre' 'qt')
+depends=('pcre' 'qt4')
 makedepends=('docbook-xsl')
 source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
 sha1sums=('c7f597c600c30b1a5e9c6b3228a11e9872d562e5')
@@ -16,7 +16,7 @@ sha1sums=('c7f597c600c30b1a5e9c6b3228a11e9872d562e5')
 build() {
    cd "${srcdir}/${pkgname}-${pkgver}"
    make
-   make DB2MAN=/usr/share/xml/docbook/xsl-stylesheets-1.77.1/manpages/docbook.xsl man
+   make DB2MAN=/usr/share/xml/docbook/xsl-stylesheets-1.78.0/manpages/docbook.xsl man
 
    cd gui
    export HAVE_RULES=yes 
diff --git a/community/djview4/PKGBUILD b/community/djview4/PKGBUILD
index 36e50c57c..0125231f5 100644
--- a/community/djview4/PKGBUILD
+++ b/community/djview4/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 84432 2013-02-19 00:14:18Z bisson $
+# $Id: PKGBUILD 85340 2013-03-01 10:29:36Z andrea $
 # Contributor: Paulo Matias <matias.archlinux-br.org>
 # Contributor: Leslie P. Polzer <polzer.gnu.org>
 # Contributor: erm67 <erm67.yahoo.it>
@@ -7,12 +7,12 @@
 
 pkgname=djview4
 pkgver=4.9
-pkgrel=1
+pkgrel=2
 pkgdesc='Portable DjVu viewer and browser plugin'
 url='http://djvu.sourceforge.net/djview4.html'
 license=('GPL')
 arch=('i686' 'x86_64')
-depends=('qt' 'djvulibre')
+depends=('qt4' 'djvulibre')
 source=("http://downloads.sourceforge.net/djvu/djview-${pkgver}.tar.gz")
 sha1sums=('07f97e32919bfb34ff2d59b928c47ffbc96dcfc5')
 
@@ -20,7 +20,8 @@ install=install
 
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
-	QTDIR=/usr ./configure --prefix=/usr
+	source /etc/profile.d/qt4.sh
+	./configure --prefix=/usr
 	sed 's/netscape/mozilla/g' -i nsdejavu/Makefile
 	make
 }
diff --git a/community/fatrat/PKGBUILD b/community/fatrat/PKGBUILD
index ac5c0dc97..ed6ea96d9 100644
--- a/community/fatrat/PKGBUILD
+++ b/community/fatrat/PKGBUILD
@@ -1,13 +1,13 @@
-# $Id: PKGBUILD 83247 2013-01-28 16:49:32Z stephane $
+# $Id: PKGBUILD 85341 2013-03-01 10:29:45Z andrea $
 # Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com>
 pkgname=fatrat
 pkgver=1.2.0_beta2
-pkgrel=4
+pkgrel=5
 pkgdesc="QT4 based download manager with support for HTTP, FTP, SFTP, BitTorrent, rapidshare and more"
 arch=('i686' 'x86_64')
 url="http://fatrat.dolezel.info/"
 license=('GPL')
-depends=('gloox' 'qt' 'libtorrent-rasterbar' 'pion' 'qtwebkit')
+depends=('gloox' 'libtorrent-rasterbar' 'pion' 'qtwebkit')
 optdepends=('geoip: GeoIP support')
 makedepends=('boost' 'cmake' 'java-environment')
 source=(http://www.dolezel.info/download/data/fatrat/fatrat-$pkgver.tar.xz)
@@ -16,9 +16,6 @@ md5sums=('ad823d2a81f0583316ece815b928c71b')
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
-  . /etc/profile.d/jre.sh
-  . /etc/profile.d/jdk.sh
-
   cmake \
     -DWITH_EVERYTHING=ON \
     -DCMAKE_INSTALL_PREFIX=/usr \
diff --git a/community/fbreader/PKGBUILD b/community/fbreader/PKGBUILD
index d5677b5fb..8e23f7412 100644
--- a/community/fbreader/PKGBUILD
+++ b/community/fbreader/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 80756 2012-12-03 10:06:37Z spupykin $
+# $Id: PKGBUILD 85342 2013-03-01 10:29:55Z andrea $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: William Rea <sillywilly@gmail.com>
 
 pkgname=fbreader
 pkgver=0.99.4
-pkgrel=1
+pkgrel=2
 pkgdesc="An e-book reader for Linux"
 arch=('i686' 'x86_64')
 url="http://www.fbreader.org/"
 license=('GPL')
-depends=('fribidi' 'bzip2' 'curl' 'qt' 'liblinebreak' 'sqlite')
+depends=('fribidi' 'bzip2' 'curl' 'qt4' 'liblinebreak' 'sqlite')
 makedepends=('ccache')
 source=(http://www.fbreader.org/files/desktop/fbreader-sources-$pkgver.tgz)
 md5sums=('ed13a9c3aeb68aaa98a1dd6f7947a31d')
@@ -19,8 +19,11 @@ build() {
   export UI_TYPE=qt4
   export TARGET_STATUS=release
   cd $srcdir/fbreader-$pkgver
-  sed -i 's|moc-qt4|moc|g' makefiles/arch/desktop.mk
   sed -i 's|-lunibreak|-llinebreak|g' makefiles/config.mk zlibrary/text/Makefile
-  make ZLSHARED=no
+  make ZLSHARED=no MOC=/usr/bin/moc-qt4
+}
+
+package() {
+  cd $srcdir/fbreader-$pkgver
   make ZLSHARED=no DESTDIR=$pkgdir install
 }
diff --git a/community/fcitx-mozc/PKGBUILD b/community/fcitx-mozc/PKGBUILD
index 5ae0b925d..2e80d2c6f 100644
--- a/community/fcitx-mozc/PKGBUILD
+++ b/community/fcitx-mozc/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 84175 2013-02-13 04:50:46Z fyan $
+# $Id: PKGBUILD 85344 2013-03-01 10:30:17Z andrea $
 # Maintainer: Felix Yan <felixonmars@gmail.com>
 # Contributor: ponsfoot <cabezon dot hashimoto at gmail dot com>
 
 ## Mozc compile option
 _bldtype=Release
 
-_zipcoderel=201211 #201212 is broken, for now
+_zipcoderel=201301
 _protobuf_ver=2.4.1
 
 _pkgbase=mozc
@@ -13,12 +13,12 @@ pkgname=fcitx-mozc
 pkgdesc="Fcitx Module of A Japanese Input Method for Chromium OS, Windows, Mac and Linux (the Open Source Edition of Google Japanese Input)"
 pkgver=1.6.1187.102
 _patchver=${pkgver}.3
-pkgrel=6
+pkgrel=7
 arch=('i686' 'x86_64')
 url="http://code.google.com/p/mozc/"
 license=('custom')
-depends=('qt' 'fcitx' 'zinnia')
-makedepends=('pkg-config' 'python2' 'gtest' 'qt' 'curl' 'fcitx' 'gtk2')
+depends=('qt4' 'fcitx' 'zinnia')
+makedepends=('pkg-config' 'python2' 'gtest' 'curl' 'gtk2' 'mesa')
 replaces=('mozc-fcitx')
 conflicts=('mozc' 'mozc-server' 'mozc-utils-gui' 'mozc-fcitx')
 source=(http://mozc.googlecode.com/files/mozc-${pkgver}.tar.bz2
@@ -33,17 +33,25 @@ build() {
   ln -sf `which python2` ./python
   PATH="${srcdir}:${PATH}"
 
+  #source /etc/profile.d/qt4.sh
+  
+  # Update: Fix qt4 include path too
   # Fix compatibility with google-glog 0.3.3 (symbol conflict)
   #CFLAGS="${CFLAGS} -DFLAGS_log_dir=FLAGS_mozc_log_dir"
   #CXXFLAGS="${CXXFLAGS} -DFLAGS_log_dir=FLAGS_mozc_log_dir"
-  CFLAGS="${CFLAGS} -fvisibility=hidden"
-  CXXFLAGS="${CXXFLAGS} -fvisibility=hidden"
+  CFLAGS="${CFLAGS} -I/usr/include/qt4 -fvisibility=hidden"
+  CXXFLAGS="${CXXFLAGS} -I/usr/include/qt4 -fvisibility=hidden"
 
   cd "${srcdir}/${_pkgbase}-${pkgver}"
-
+  
+  # Apply fcitx patch
   rm unix/fcitx -rf
   patch -Np2 -i ${srcdir}/fcitx-mozc-${_patchver}.patch
 
+  # Fix qt4 binary path
+  sed -i 's$<(qt_dir)/bin$/usr/lib/qt4/bin$' gui/*.gyp gui/*.gypi
+  sed -i 's$<(qt_dir_env)/bin$/usr/lib/qt4/bin$' gui/*.gyp gui/*.gypi
+
   # Generate zip code seed
   msg "Generating zip code seed..."
   python2 dictionary/gen_zip_code_seed.py --zip_code="${srcdir}/KEN_ALL.CSV" --jigyosyo="${srcdir}/JIGYOSYO.CSV" >> data/dictionary_oss/dictionary09.txt
@@ -55,7 +63,6 @@ build() {
   msg "Starting make..."
 
   _targets="server/server.gyp:mozc_server gui/gui.gyp:mozc_tool unix/fcitx/fcitx.gyp:fcitx-mozc"
-  _qmnames="qmake-qt4 qmake4 qmake"
 
   QTDIR=/usr python2 build_mozc.py gyp --channel_dev=0
   python2 build_mozc.py build_tools -c $_bldtype
@@ -98,9 +105,8 @@ package() {
   install -m 644 data/images/unix/ui-tool.png "${pkgdir}/usr/share/fcitx/mozc/icon/mozc-tool.png"
 }
 
-
 md5sums=('e5246d17a81d2e942e9e8de0c3240c95'
-         'e61df4b5754f3869ca504d269dc9641d'
-         '59c5f7e9c734b40197454318f228859f'
+         '06bae0169219637b497054fb335017db'
+         '8121af1e16aea2a3899314db15679e7f'
          'ed436802019c9e1f40cc750eaf78f318'
          '3c947ef02d9bf3341192ba22916f3605')
diff --git a/community/fcitx-unikey/PKGBUILD b/community/fcitx-unikey/PKGBUILD
index e24627d9a..df7604dc0 100644
--- a/community/fcitx-unikey/PKGBUILD
+++ b/community/fcitx-unikey/PKGBUILD
@@ -1,23 +1,22 @@
-# $Id: PKGBUILD 82956 2013-01-26 06:38:02Z fyan $
+# $Id: PKGBUILD 85345 2013-03-01 10:30:29Z andrea $
 # Maintainer: Felix Yan <felixonmars@gmail.com>
 
 pkgname=fcitx-unikey
 pkgver=0.2.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Fcitx Wrapper for unikey"
 arch=('i686' 'x86_64')
 url="http://code.google.com/p/fcitx"
 license=('GPL')
 depends=('fcitx>=4.2.7')
-optdepends=('qt: To run the fcitx unikey macro editor')
-makedepends=('cmake' 'intltool' 'qt')
+optdepends=('qt4: To run the fcitx unikey macro editor')
+makedepends=('cmake' 'qt4')
 source=("http://fcitx.googlecode.com/files/${pkgname}-${pkgver}.tar.xz")
 install=fcitx-unikey.install
 
 build(){
     cd "$srcdir/${pkgname}-${pkgver}"
-    rm -rf build
-    mkdir build
+    mkdir -p build
     cd build
     
     cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release ..
diff --git a/community/fcitx/PKGBUILD b/community/fcitx/PKGBUILD
index 226224b23..20f77977a 100644
--- a/community/fcitx/PKGBUILD
+++ b/community/fcitx/PKGBUILD
@@ -1,21 +1,23 @@
-# $Id: PKGBUILD 82948 2013-01-26 02:17:24Z fyan $
+# $Id: PKGBUILD 85343 2013-03-01 10:30:04Z andrea $
 # Maintainer: Felix Yan <felixonmars@gmail.com>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: csslayer <wengxt AT gmail com>
 
 pkgbase=fcitx
-pkgname=('fcitx' 'fcitx-gtk2' 'fcitx-gtk3' 'fcitx-qt')
+pkgname=('fcitx' 'fcitx-gtk2' 'fcitx-gtk3' 'fcitx-qt4')
 pkgver=4.2.7
-pkgrel=1
+pkgrel=3
 groups=('fcitx-im')
 arch=('i686' 'x86_64')
 url="http://code.google.com/p/fcitx/"
 license=('GPL')
-makedepends=('cmake' 'doxygen' 'gtk2' 'gtk3' 'qt' 'icu' \
+makedepends=('cmake' 'doxygen' 'gtk2' 'gtk3' 'qt4' 'icu' 'mesa' \
              'iso-codes' 'gobject-introspection' 'libxkbfile')
 source=(http://fcitx.googlecode.com/files/${pkgbase}-${pkgver}_dict.tar.xz)
 
 build() {
+  #source /etc/profile.d/qt4.sh
+
   cd "${srcdir}"
   mkdir -p build
   cd build
@@ -56,7 +58,7 @@ package_fcitx() {
 	      'fcitx-libpinyin: Fcitx Wrapper for libpinyin, Library to deal with pinyin'
 	      'fcitx-m17n: Multilingual text processing library'
 	      'fcitx-mozc: Fcitx Module of A Japanese Input Method for Chromium OS, Windows, Mac and Linux (the Open Source Edition of Google Japanese Input)'
-	      'fcitx-qt: QT IM Module for fcitx'
+	      'fcitx-qt4: QT4 IM Module for fcitx'
 	      'fcitx-rime: Rime input method engine (Traditional Chinese)'
   	      'fcitx-sunpinyin: Statistical Language Model based pinyin IME by Sun'
 	      'fcitx-table-extra: Extra tables for Fcitx, including Boshiamy, Zhengma, Cangjie3, Cangjie5'
@@ -70,7 +72,7 @@ package_fcitx() {
   cd "${srcdir}/build"
   make DESTDIR="${pkgdir}" install
 
-  rm -r "${pkgdir}/usr/lib/"{gtk-2.0,gtk-3.0,qt}
+  rm -r "${pkgdir}/usr/lib/"{gtk-2.0,gtk-3.0,qt4}
   rm -r "${pkgdir}/usr/lib/fcitx/qt"
   rm -r "${pkgdir}/usr/include/fcitx-qt"
   rm "${pkgdir}/usr/bin/fcitx-qt-gui-wrapper"
@@ -96,9 +98,12 @@ package_fcitx-gtk3() {
   make DESTDIR="${pkgdir}" install
 }
 
-package_fcitx-qt() {
-  pkgdesc='QT IM Module for fcitx'
-  depends=('qt' "fcitx>=$pkgver")
+package_fcitx-qt4() {
+  pkgdesc='QT4 IM Module for fcitx'
+  depends=('qt4' "fcitx>=$pkgver")
+  replaces=('fcitx-qt')
+  provides=('fcitx-qt')
+  conflicts=('fcitx-qt')
 
   cd "${srcdir}/build/src/frontend/qt"
   make DESTDIR="${pkgdir}" install
diff --git a/community/freemat/PKGBUILD b/community/freemat/PKGBUILD
index 02d57a273..67d4be403 100644
--- a/community/freemat/PKGBUILD
+++ b/community/freemat/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 77872 2012-10-15 10:33:45Z spupykin $
+# $Id: PKGBUILD 85346 2013-03-01 10:30:37Z andrea $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: William Rea <sillywilly@gmail.com>
 
 pkgname=freemat
 pkgver=4.1
-pkgrel=6
+pkgrel=7
 pkgdesc="A free environment for rapid engineering, scientific prototyping and data processing"
 arch=('i686' 'x86_64')
 url="http://freemat.sourceforge.net"
 license=('GPL')
-depends=('qt' 'ffcall' 'fftw' 'portaudio' 'libffi' 'glu')
+depends=('qt4' 'ffcall' 'fftw' 'portaudio' 'libffi' 'glu')
 makedepends=('arpack' 'lapack' 'umfpack' 'blas' 'libmatio' 'cmake' 'python2' 'mesa')
 install=freemat.install
 source=(http://downloads.sourceforge.net/project/freemat/FreeMat4/FreeMat-$pkgver-Source.tar.gz
diff --git a/community/fwbuilder/PKGBUILD b/community/fwbuilder/PKGBUILD
index 34e6edcb4..9192a79fa 100644
--- a/community/fwbuilder/PKGBUILD
+++ b/community/fwbuilder/PKGBUILD
@@ -5,12 +5,12 @@
 
 pkgname=fwbuilder
 pkgver=5.1.0.3599
-pkgrel=2
+pkgrel=3
 pkgdesc="Object-oriented GUI and set of compilers for various firewall platforms"
 url="http://www.fwbuilder.org/"
 arch=('i686' 'x86_64')
 license=('GPL')
-depends=('libxslt' 'net-snmp' 'qt')
+depends=('libxslt' 'net-snmp' 'qt4')
 conflicts=('libfwbuilder')
 install=fwbuilder.install
 source=("http://sourceforge.net/projects/fwbuilder/files/Current_Packages/${pkgver%.*}/fwbuilder-${pkgver}.tar.gz"
@@ -21,6 +21,7 @@ sha256sums=('452514a1ec0be1416bfca93603e6c89deb91d1a3a19671c64b5a8868a3743daf'
 build() {
   cd "${srcdir}/fwbuilder-${pkgver}"
   patch -p1 -i "$srcdir/fwbuilder-gcc47.patch"
+  export CXXFLAGS="$CXXFLAGS -fno-var-tracking-assignments"
   ./autogen.sh
   ./configure --prefix=/usr
   make
diff --git a/community/gambas3/PKGBUILD b/community/gambas3/PKGBUILD
index 3794a8361..319f1998f 100644
--- a/community/gambas3/PKGBUILD
+++ b/community/gambas3/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 84862 2013-02-25 14:37:51Z lcarlier $
+# $Id: PKGBUILD 85475 2013-03-01 23:01:35Z lcarlier $
 # Maintainer: Laurent Carlier <lordheavym@gmail.com>
 # Contributor : sebikul <sebikul@gmail.com>
 
@@ -15,7 +15,7 @@ pkgname=('gambas3-runtime' 'gambas3-devel' 'gambas3-ide' 'gambas3-script' 'gamba
          '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') 
 pkgver=3.4.0
-pkgrel=1
+pkgrel=3
 pkgdesc="A free development environment based on a Basic interpreter."
 arch=('i686' 'x86_64')
 url="http://gambas.sourceforge.net/"
@@ -105,8 +105,8 @@ package_gambas3-runtime() {
   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.*,form.*,[s-w]*}
-  rm -r ${pkgdir}/usr/share/gambas3/info/gb.{a*,chart.*,form.*,[s-w]*}
+  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
   ##  
 }
@@ -348,8 +348,8 @@ package_gambas3-gb-db-form() {
   cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
   make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
   rm -r ${pkgdir}/usr/share/gambas3/control
-  rm -r ${pkgdir}/usr/lib/gambas3/gb.{chart*,[e-z]*}
-  rm -r ${pkgdir}/usr/share/gambas3/info/gb.{chart*,[e-z]*}
+  rm -r ${pkgdir}/usr/lib/gambas3/gb.{[a-c]*,[e-z]*}
+  rm -r ${pkgdir}/usr/share/gambas3/info/gb.{[a-c]*,[e-z]*}
   ##
 }
 
@@ -805,7 +805,7 @@ package_gambas3-gb-libxml() {
 }
 
 package_gambas3-gb-map() {
-  depends=('gambas3-gb-imageio' 'gambas3-gb-form')
+  depends=('gambas3-gb-image-io' 'gambas3-gb-form')
   pkgdesc="Display maps component"
 
   ## Workaround for splitting
@@ -1125,7 +1125,7 @@ package_gambas3-gb-pdf() {
 }
 
 package_gambas3-gb-qt4() {
-  depends=('gambas3-gb-image' 'qt')
+  depends=('gambas3-gb-image' 'qt4')
   pkgdesc="Qt4 toolkit component"
 
   ## workaround for splitting
diff --git a/community/gebabbel/PKGBUILD b/community/gebabbel/PKGBUILD
index 82174dd00..960143f3e 100644
--- a/community/gebabbel/PKGBUILD
+++ b/community/gebabbel/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 67652 2012-03-13 15:27:16Z lcarlier $
+# $Id: PKGBUILD 85453 2013-03-01 19:08:27Z andrea $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: pfm <nl081130@yahoo.de>
 
 pkgname=gebabbel
 pkgver=0.4
-pkgrel=5
+pkgrel=6
 pkgdesc="GUI for gpsbabel"
 arch=('i686' 'x86_64')
 url="http://gebabbel.sourceforge.net/"
 license=('GPL2')
-depends=('qt' 'gpsbabel')
+depends=('qt4' 'gpsbabel')
 changelog=$pkgname.changelog
 source=(http://downloads.sourceforge.net/sourceforge/$pkgname/Gebabbel-$pkgver-Src.tar.gz \
         http://$pkgname.sourceforge.net/GebabbelLogo.png \
@@ -25,7 +25,7 @@ build() {
 
   patch -Np0 -i ${srcdir}/$pkgname-$pkgver.patch
 
-  qmake
+  qmake-qt4
   make
 }
 
diff --git a/community/gluon/PKGBUILD b/community/gluon/PKGBUILD
index 12d20a320..3401f6081 100644
--- a/community/gluon/PKGBUILD
+++ b/community/gluon/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 72719 2012-06-21 07:09:44Z andrea $
+# $Id: PKGBUILD 85350 2013-03-01 10:31:40Z andrea $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Ivan Sichmann Freitas <ivansichfreitas@gmail.com>
 
 pkgname=gluon
 pkgver=0.71.0
 _pkgver=0.71
-pkgrel=4
+pkgrel=5
 pkgdesc="A free and open source platform for creating and distributing games"
 arch=('i686' 'x86_64')
 url="http://gluon.gamingfreedom.org/"
@@ -27,11 +27,16 @@ build() {
   cd build
   cmake ../$pkgname-$pkgver \
     -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_BUILD_TYPE=Release
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_SKIP_RPATH=ON
   make
 }
 
 package() {
   cd "$srcdir"/build
   make DESTDIR="$pkgdir" install
+
+  if [[ "$CARCH" == "x86_64" ]]; then
+    mv "${pkgdir}"/usr/lib64 "${pkgdir}"/usr/lib
+  fi
 }
diff --git a/community/gmerlin/PKGBUILD b/community/gmerlin/PKGBUILD
index 6abb45988..584862d1e 100644
--- a/community/gmerlin/PKGBUILD
+++ b/community/gmerlin/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 82329 2013-01-15 11:35:00Z allan $
-# Maintainer: Mateusz Herych <heniekk@gmail.com>
+# $Id: PKGBUILD 85325 2013-03-01 02:43:05Z cinelli $
+# Maintainer: Federico Cinelli <cinelli@aur.archlinux.org>
 
 pkgname=gmerlin
 pkgver=1.2.0
 pkgrel=2
 pkgdesc="Multimedia architecture for Linux"
-arch=('i686' 'x86_64')
+arch=('any')
 url="http://openmovieeditor.sourceforge.net/HomePage"
 license=('GPL')
 depends=('gavl' 'libxml2' 'gtk2' 'libxv' 'libvisual' 'libcdio-paranoia'
@@ -19,14 +19,17 @@ optdepends=('alsa-lib: for ALSA support'
 options=('!libtool')
 install=gmerlin.install
 source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz
-        cdio-api-fixes.patch)
+        cdio-api-fixes.patch
+	gmerlin-texi.patch)
 md5sums=('2f2a0880e738e71486f04c929ba067f4'
-         'd0e407f01435394a0cfe04acb3c1a4cc')
+         'd0e407f01435394a0cfe04acb3c1a4cc'
+	 '33a4dce06b7560fc839055c5a872435f')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
   patch -Np1 -i "$srcdir/cdio-api-fixes.patch"
+  patch -Np1 -i "$srcdir/gmerlin-texi.patch"
 
   rm -rf cpuinfo.sh
 
diff --git a/community/gmic/PKGBUILD b/community/gmic/PKGBUILD
index b34dee1cd..55f0fca4b 100644
--- a/community/gmic/PKGBUILD
+++ b/community/gmic/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 84155 2013-02-12 09:34:15Z spupykin $
+# $Id: PKGBUILD 85351 2013-03-01 10:31:49Z andrea $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
 # Contributor: farid <farid at archlinuc-br.org>
@@ -7,11 +7,11 @@
 pkgbase=gmic
 pkgname=("gmic" "gimp-plugin-gmic" "zart")
 pkgver=1.5.4.0
-pkgrel=1
+pkgrel=2
 arch=("i686" "x86_64")
 url="http://gmic.sourceforge.net"
 license=("custom:CeCILL")
-makedepends=("gimp" "qt" "fftw" "openexr" "opencv")
+makedepends=('gimp' 'qt4' 'fftw' 'openexr' 'opencv' 'mesa' 'gtk2')
 #options=('!emptydirs')
 source=("http://downloads.sourceforge.net/sourceforge/gmic/gmic_${pkgver}.tar.gz"
         "opencv-buildfix.patch")
@@ -39,7 +39,7 @@ package_gmic() {
 
 package_zart() {
   pkgdesc="A GUI for G'MIC real-time manipulations on the output of a webcam"
-  depends=("opencv" "fftw" "qt")
+  depends=("opencv" "fftw" "qt4")
 
   cd "${srcdir}/gmic-${pkgver}"
   make -C src install DESTDIR="$pkgdir" USR="/usr"
diff --git a/community/golangide/PKGBUILD b/community/golangide/PKGBUILD
index 1d716610f..7b8128956 100644
--- a/community/golangide/PKGBUILD
+++ b/community/golangide/PKGBUILD
@@ -1,16 +1,16 @@
-#$Id: PKGBUILD 83985 2013-02-07 22:46:23Z arodseth $
+#$Id: PKGBUILD 85352 2013-03-01 10:31:59Z andrea $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: spambanane <happy.house@gmx.de>
 # Contributor: Matteo <matteo.dek@gmail.com>
 
 pkgname=golangide
 pkgver=17
-pkgrel=1
+pkgrel=2
 pkgdesc='IDE for editing and building projects written in the Go programming language (now LiteIDE X)'
 license=('LGPL')
 arch=('x86_64' 'i686')
 url='https://github.com/visualfc/liteide'
-depends=('go' 'libpng12' 'glib2' 'qt' 'qjson' 'qtwebkit')
+depends=('go' 'libpng12' 'glib2' 'qt4' 'qjson')
 makedepends=('gendesk')
 options=('!strip')
 _name=('Golang IDE')
@@ -19,7 +19,7 @@ _name=('Golang IDE')
 source=("$pkgname.tgz::https://nodeload.github.com/visualfc/liteide/tar.gz/master"
         'golangide.png'
         'golangide.sh')
-sha256sums=('abc30259bc5d87d23713479e2e464cadd152e588a95400415f6a1247004cfeff'
+sha256sums=('88fae4a43a82ecb12739bfe6612d736fa963d8beaf30dccfb305c335929c3871'
             '47c52b22326034bd3d6a7b11b05a53c8b3838c08e145171cf5cad2ca00260697'
             'aa5ea27f9c3626431a9cb45e5267771a1eeff48b2e3927c0574eaef9302cfd74')
 
diff --git a/community/goldendict/PKGBUILD b/community/goldendict/PKGBUILD
index 0d3796329..cdf2a4650 100644
--- a/community/goldendict/PKGBUILD
+++ b/community/goldendict/PKGBUILD
@@ -1,31 +1,33 @@
-# $Id: PKGBUILD 61073 2011-12-21 20:50:41Z andrea $
+# $Id: PKGBUILD 85453 2013-03-01 19:08:27Z andrea $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: m0rph <m0rph.mailbox@gmail.com>
 
 pkgname=goldendict
 pkgver=1.0.1
-pkgrel=5
+pkgrel=6
 pkgdesc="Feature-rich dictionary lookup program"
 arch=('i686' 'x86_64')
 url="http://goldendict.berlios.de/"
 license=('GPL3')
-depends=('hunspell' 'libvorbis' 'libxtst' 'libzip' 'qt' 'qtwebkit' 'phonon')
-makedepds=('patch')
+depends=('hunspell' 'libvorbis' 'libxtst' 'libzip' 'qtwebkit' 'phonon')
+makedepends=('patch')
 provides=('stardict')
 changelog=$pkgname.changelog
 source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver-src.tar.bz2
-        $pkgname-paths.diff)
+        $pkgname-paths.diff
+        gcc47.patch)
 sha256sums=('b3fb0405a5edb38f02ef881b48c36e46e2eacf641b0caf8d99403f595a4be9a6'
-            '1dacae7b7a7d7c20a22b4595c07dbd65fdad134a0d4cf283312ea3bdb5f42589')
+            '1dacae7b7a7d7c20a22b4595c07dbd65fdad134a0d4cf283312ea3bdb5f42589'
+            '2e13857d047186e781c3bd9de3cfdf794f4d44e8e28f9d18dda8df50cfe13c6e')
 
 build(){
   cd ${srcdir}
 
   patch -Np0 -i ${srcdir}/$pkgname-paths.diff
+  patch -p1 -i ${srcdir}/gcc47.patch
 
-  qmake
+  qmake-qt4
   make
-  qmake
 }
 
 package() {
diff --git a/community/goldendict/gcc47.patch b/community/goldendict/gcc47.patch
new file mode 100644
index 000000000..6496d4292
--- /dev/null
+++ b/community/goldendict/gcc47.patch
@@ -0,0 +1,23 @@
+diff -urN goldendict-1.0.1-src.orig/processwrapper.cc goldendict-1.0.1-src/processwrapper.cc
+--- goldendict-1.0.1-src.orig/processwrapper.cc	2010-12-04 02:42:46.000000000 +0530
++++ goldendict-1.0.1-src/processwrapper.cc	2012-08-04 20:51:45.835055609 +0530
+@@ -94,6 +94,8 @@
+ 
+ #else
+ 
++#include <unistd.h>
++
+ unsigned int ProcessWrapper::currentProcessId()
+ {
+     return getpid();
+diff -urN goldendict-1.0.1-src.orig/qtsingleapplication/src/qtlocalpeer.cpp goldendict-1.0.1-src/qtsingleapplication/src/qtlocalpeer.cpp
+--- goldendict-1.0.1-src.orig/qtsingleapplication/src/qtlocalpeer.cpp	2010-12-04 02:42:46.000000000 +0530
++++ goldendict-1.0.1-src/qtsingleapplication/src/qtlocalpeer.cpp	2012-08-04 20:48:47.761593825 +0530
+@@ -50,6 +50,7 @@
+ #endif
+ #if defined(Q_OS_UNIX)
+ #include <time.h>
++#include <unistd.h>
+ #endif
+ 
+ namespace QtLP_Private {
diff --git a/community/google-gadgets/PKGBUILD b/community/google-gadgets/PKGBUILD
index ad1ce8ab6..f410e4a44 100644
--- a/community/google-gadgets/PKGBUILD
+++ b/community/google-gadgets/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 61075 2011-12-21 20:50:53Z andrea $
+# $Id: PKGBUILD 85354 2013-03-01 10:32:21Z andrea $
 # Maintainer: Ray Rashif <schiv@archlinux.org>
 
 pkgbase=google-gadgets
@@ -8,21 +8,25 @@ _basedir="$startdir/pkg/base"
 pkgver=0.11.2
 _sover=1.0
 _sobump=0.0.0
-pkgrel=5
+pkgrel=6
 arch=('i686' 'x86_64')
 url="http://code.google.com/p/google-gadgets-for-linux/"
 license=('APACHE')
 makedepends=('gstreamer0.10-base-plugins' 'libwebkit'
              'desktop-file-utils' 'xdg-utils'
              'librsvg' 'curl' 'libsoup-gnome'
-             'qt' 'qtwebkit'
+             'qtwebkit'
              'networkmanager'
              'zip' 'flex')
 options=('!libtool')
 source=("http://google-gadgets-for-linux.googlecode.com/files/$_realname-$pkgver.tar.bz2"
-	"wifi-types.patch")
+	"wifi-types.patch"
+  'gcc47.patch'
+  'glibc231.patch')
 md5sums=('279305553bcbf74f3e3615f6abc36a5e'
-         'f0df71c60a174e9d629db87b8bd9e102')
+         'f0df71c60a174e9d629db87b8bd9e102'
+         'b62bc8592b5a44cb34cb7a7e4a6cf62e'
+         '4b96d1da79a375ef2fb58ff01a76f684')
 
 build() {
   cd "$srcdir/$_realname-$pkgver"
@@ -34,6 +38,8 @@ build() {
   #   we build without smjs-script/browser-element
 
   patch -p1 <$srcdir/wifi-types.patch
+  patch -p1 -i "${srcdir}"/gcc47.patch
+  patch -p0 -i "${srcdir}"/glibc231.patch
   ./configure --prefix=/usr \
               --disable-werror \
               --disable-update-desktop-database \
@@ -124,7 +130,7 @@ package_google-gadgets-qt() {
   pkgdesc="Desktop widgets from Google (partial Qt front-end)"
   groups=('google-gadgets')
   install=$pkgbase.install
-  depends=('google-gadgets-common' 'qt' 'qtwebkit'
+  depends=('google-gadgets-common' 'qtwebkit'
            'desktop-file-utils' 'xdg-utils'
            'gstreamer0.10-base-plugins' 'libwebkit')
   optdepends=('networkmanager: desktop integration')
diff --git a/community/google-gadgets/gcc47.patch b/community/google-gadgets/gcc47.patch
new file mode 100644
index 000000000..2e77e10fd
--- /dev/null
+++ b/community/google-gadgets/gcc47.patch
@@ -0,0 +1,325 @@
+Author: Pino Toscano <pino@debian.org>
+Description: Fix building with GCC 4.7
+ This patch fixes the two kinds of issues that arise with GCC 4.7:
+ - include <unistd.h> for functions like access(), fork(), readlink(), etc
+ - fix argument-dependent lookup issues by qualifying the lookup of functions
+Forwarded: no
+Last-Update: 2012-04-04
+
+--- a/ggadget/scriptable_enumerator.h
++++ b/ggadget/scriptable_enumerator.h
+@@ -68,22 +68,22 @@
+ 
+  protected:
+   virtual void DoClassRegister() {
+-    RegisterMethod("atEnd",
++    this->RegisterMethod("atEnd",
+                    NewSlot(&E::AtEnd,
+                            &ScriptableEnumerator<E, Wrapper, Param, ClassId>
+                                ::enumerator_));
+-    RegisterMethod("moveFirst",
++    this->RegisterMethod("moveFirst",
+                    NewSlot(&E::MoveFirst,
+                            &ScriptableEnumerator<E, Wrapper, Param, ClassId>
+                                ::enumerator_));
+-    RegisterMethod("moveNext",
++    this->RegisterMethod("moveNext",
+                    NewSlot(&E::MoveNext,
+                            &ScriptableEnumerator<E, Wrapper, Param, ClassId>
+                                ::enumerator_));
+-    RegisterMethod("item",
++    this->RegisterMethod("item",
+                    NewSlot(&ScriptableEnumerator<E, Wrapper, Param, ClassId>
+                                ::GetItem));
+-    RegisterProperty("count",
++    this->RegisterProperty("count",
+                      NewSlot(&E::GetCount,
+                              &ScriptableEnumerator<E, Wrapper, Param, ClassId>
+                                  ::enumerator_),
+--- a/ggadget/uuid.cc
++++ b/ggadget/uuid.cc
+@@ -24,6 +24,7 @@
+ #include <cstdlib>
+ #include <cstring>
+ #include <ctime>
++#include <unistd.h>
+ 
+ #include "string_utils.h"
+ 
+--- a/ggadget/xml_dom.cc
++++ b/ggadget/xml_dom.cc
+@@ -1327,15 +1327,15 @@
+ 
+   virtual void DoClassRegister() {
+     Super::DoClassRegister();
+-    RegisterProperty("data", NewSlot(&DOMCharacterData::GetData),
++    this->RegisterProperty("data", NewSlot(&DOMCharacterData::GetData),
+                      NewSlot(&DOMCharacterData::SetData));
+-    RegisterProperty("length", NewSlot(&DOMCharacterData::GetLength), NULL);
+-    RegisterMethod("substringData",
++    this->RegisterProperty("length", NewSlot(&DOMCharacterData::GetLength), NULL);
++    this->RegisterMethod("substringData",
+                    NewSlot(&DOMCharacterData::ScriptSubstringData));
+-    RegisterMethod("appendData", NewSlot(&DOMCharacterData::AppendData));
+-    RegisterMethod("insertData", NewSlot(&DOMCharacterData::ScriptInsertData));
+-    RegisterMethod("deleteData", NewSlot(&DOMCharacterData::ScriptDeleteData));
+-    RegisterMethod("replaceData",
++    this->RegisterMethod("appendData", NewSlot(&DOMCharacterData::AppendData));
++    this->RegisterMethod("insertData", NewSlot(&DOMCharacterData::ScriptInsertData));
++    this->RegisterMethod("deleteData", NewSlot(&DOMCharacterData::ScriptDeleteData));
++    this->RegisterMethod("replaceData",
+                    NewSlot(&DOMCharacterData::ScriptReplaceData));
+   }
+ 
+@@ -1377,20 +1377,20 @@
+  private:
+   UTF16String ScriptSubstringData(size_t offset, size_t count) {
+     UTF16String result;
+-    CheckException(SubstringData(offset, count, &result));
++    this->CheckException(SubstringData(offset, count, &result));
+     return result;
+   }
+ 
+   void ScriptInsertData(size_t offset, const UTF16String &arg) {
+-    CheckException(InsertData(offset, arg));
++    this->CheckException(InsertData(offset, arg));
+   }
+ 
+   void ScriptDeleteData(size_t offset, size_t count) {
+-    CheckException(DeleteData(offset, count));
++    this->CheckException(DeleteData(offset, count));
+   }
+ 
+   void ScriptReplaceData(size_t offset, size_t count, const UTF16String &arg) {
+-    CheckException(ReplaceData(offset, count, arg));
++    this->CheckException(ReplaceData(offset, count, arg));
+   }
+ 
+   DOMCharacterDataImpl impl_;
+@@ -1417,10 +1417,10 @@
+ 
+   virtual void DoClassRegister() {
+     Super::DoClassRegister();
+-    RegisterProperty("name", NewSlot(&DOMAttr::GetName), NULL);
++    this->RegisterProperty("name", NewSlot(&DOMAttr::GetName), NULL);
+     // Our DOMAttrs are always specified, because we don't support DTD for now.
+-    RegisterConstant("specified", true);
+-    RegisterProperty("value", NewSlot(&DOMAttr::GetValue),
++    this->RegisterConstant("specified", true);
++    this->RegisterProperty("value", NewSlot(&DOMAttr::GetValue),
+                      NewSlot(&DOMAttr::SetValue));
+     // ownerElement is a DOM2 property, so not registered for now.
+   }
+@@ -1516,19 +1516,19 @@
+ 
+   virtual void DoClassRegister() {
+     Super::DoClassRegister();
+-    RegisterProperty("tagName", NewSlot(&DOMElement::GetTagName), NULL);
+-    RegisterMethod("getAttribute", NewSlot(&DOMElement::GetAttribute));
+-    RegisterMethod("setAttribute",
++    this->RegisterProperty("tagName", NewSlot(&DOMElement::GetTagName), NULL);
++    this->RegisterMethod("getAttribute", NewSlot(&DOMElement::GetAttribute));
++    this->RegisterMethod("setAttribute",
+                    NewSlot(&DOMElement::ScriptSetAttribute));
+-    RegisterMethod("removeAttribute",
++    this->RegisterMethod("removeAttribute",
+                    NewSlot(&DOMElement::RemoveAttribute));
+-    RegisterMethod("getAttributeNode",
++    this->RegisterMethod("getAttributeNode",
+                    NewSlot(&DOMElement::GetAttributeNodeNotConst));
+-    RegisterMethod("setAttributeNode",
++    this->RegisterMethod("setAttributeNode",
+                    NewSlot(&DOMElement::ScriptSetAttributeNode));
+-    RegisterMethod("removeAttributeNode",
++    this->RegisterMethod("removeAttributeNode",
+                    NewSlot(&DOMElement::ScriptRemoveAttributeNode));
+-    RegisterMethod("getElementsByTagName",
++    this->RegisterMethod("getElementsByTagName",
+                    NewSlot(&Super::GetElementsByTagNameNotConst));
+   }
+ 
+@@ -1696,16 +1696,16 @@
+     }
+ 
+     virtual void DoClassRegister() {
+-      RegisterProperty("length", NewSlot(&AttrsNamedMap::GetLength), NULL);
+-      RegisterMethod("getNamedItem",
++      this->RegisterProperty("length", NewSlot(&AttrsNamedMap::GetLength), NULL);
++      this->RegisterMethod("getNamedItem",
+                      NewSlot(&AttrsNamedMap::GetNamedItemNotConst));
+-      RegisterMethod("setNamedItem",
++      this->RegisterMethod("setNamedItem",
+                      NewSlot(&AttrsNamedMap::ScriptSetNamedItem));
+-      RegisterMethod("removeNamedItem",
++      this->RegisterMethod("removeNamedItem",
+                      NewSlot(&AttrsNamedMap::ScriptRemoveNamedItem));
+-      RegisterMethod("item", NewSlot(&AttrsNamedMap::GetItemNotConst));
++      this->RegisterMethod("item", NewSlot(&AttrsNamedMap::GetItemNotConst));
+       // Microsoft compatibility.
+-      RegisterMethod("", NewSlot(&AttrsNamedMap::GetItemNotConst));
++      this->RegisterMethod("", NewSlot(&AttrsNamedMap::GetItemNotConst));
+     }
+ 
+     virtual DOMNodeInterface *GetNamedItem(const std::string &name) {
+@@ -1875,7 +1875,7 @@
+ 
+   virtual void DoClassRegister() {
+     Super::DoClassRegister();
+-    RegisterMethod("splitText", NewSlot(&DOMText::ScriptSplitText));
++    this->RegisterMethod("splitText", NewSlot(&DOMText::ScriptSplitText));
+   }
+ 
+   virtual NodeType GetNodeType() const { return TEXT_NODE; }
+@@ -2060,9 +2060,9 @@
+ 
+   virtual void DoClassRegister() {
+     Super::DoClassRegister();
+-    RegisterProperty("target",
++    this->RegisterProperty("target",
+                      NewSlot(&DOMProcessingInstruction::GetTarget), NULL);
+-    RegisterProperty("data", NewSlot(&DOMProcessingInstruction::GetData),
++    this->RegisterProperty("data", NewSlot(&DOMProcessingInstruction::GetData),
+                      NewSlot(&DOMProcessingInstruction::SetData));
+   }
+ 
+@@ -2109,7 +2109,7 @@
+   DEFINE_CLASS_ID(0xd23149a89cf24e12, DOMImplementationInterface);
+ 
+   virtual void DoClassRegister() {
+-    RegisterMethod("hasFeature", NewSlot(&DOMImplementation::HasFeature));
++    this->RegisterMethod("hasFeature", NewSlot(&DOMImplementation::HasFeature));
+   }
+ 
+   virtual bool HasFeature(const char *feature, const char *version) const {
+@@ -2129,13 +2129,13 @@
+   void SetCode(int code) { code_ = code; }
+ 
+   virtual void DoClassRegister() {
+-    RegisterProperty("errorCode", NewSlot(&ParseError::GetCode), NULL);
+-    RegisterConstant("filepos", 0);
+-    RegisterConstant("line", 0);
+-    RegisterConstant("linepos", 0);
+-    RegisterConstant("reason", "");
+-    RegisterConstant("srcText", "");
+-    RegisterConstant("url", "");
++    this->RegisterProperty("errorCode", NewSlot(&ParseError::GetCode), NULL);
++    this->RegisterConstant("filepos", 0);
++    this->RegisterConstant("line", 0);
++    this->RegisterConstant("linepos", 0);
++    this->RegisterConstant("reason", "");
++    this->RegisterConstant("srcText", "");
++    this->RegisterConstant("url", "");
+   }
+ 
+  private:
+@@ -2180,45 +2180,45 @@
+ 
+   virtual void DoClassRegister() {
+     Super::DoClassRegister();
+-    RegisterConstant("doctype", static_cast<ScriptableInterface *>(NULL));
+-    RegisterConstant("implementation", &dom_implementation_);
+-    RegisterProperty("documentElement",
++    this->RegisterConstant("doctype", static_cast<ScriptableInterface *>(NULL));
++    this->RegisterConstant("implementation", &dom_implementation_);
++    this->RegisterProperty("documentElement",
+                      NewSlot(&DOMDocument::GetDocumentElementNotConst), NULL);
+-    RegisterMethod("loadXML", NewSlot(&DOMDocument::LoadXML));
+-    RegisterMethod("createElement",
++    this->RegisterMethod("loadXML", NewSlot(&DOMDocument::LoadXML));
++    this->RegisterMethod("createElement",
+                    NewSlot(&DOMDocument::ScriptCreateElement));
+-    RegisterMethod("createDocumentFragment",
++    this->RegisterMethod("createDocumentFragment",
+                    NewSlot(&DOMDocument::CreateDocumentFragment));
+-    RegisterMethod("createTextNode",
++    this->RegisterMethod("createTextNode",
+                    NewSlot(&DOMDocument::CreateTextNode));
+-    RegisterMethod("createComment", NewSlot(&DOMDocument::CreateComment));
+-    RegisterMethod("createCDATASection",
++    this->RegisterMethod("createComment", NewSlot(&DOMDocument::CreateComment));
++    this->RegisterMethod("createCDATASection",
+                    NewSlot(&DOMDocument::CreateCDATASection));
+-    RegisterMethod("createProcessingInstruction",
++    this->RegisterMethod("createProcessingInstruction",
+                    NewSlot(&DOMDocument::ScriptCreateProcessingInstruction));
+-    RegisterMethod("createAttribute",
++    this->RegisterMethod("createAttribute",
+                    NewSlot(&DOMDocument::ScriptCreateAttribute));
+-    RegisterMethod("createEntityReference",
++    this->RegisterMethod("createEntityReference",
+                    NewSlot(&DOMDocument::ScriptCreateEntityReference));
+-    RegisterMethod("getElementsByTagName",
++    this->RegisterMethod("getElementsByTagName",
+                    NewSlot(&Super::GetElementsByTagNameNotConst));
+-    RegisterMethod("importNode", NewSlot(&DOMDocument::ScriptImportNode));
++    this->RegisterMethod("importNode", NewSlot(&DOMDocument::ScriptImportNode));
+     // Compatibility with Microsoft DOM.
+-    RegisterProperty("parsed", NewFixedGetterSlot(true), NULL);
+-    RegisterProperty("parseError", NewSlot(&DOMDocument::GetParseError), NULL);
+-    RegisterProperty("resolveExternals", NULL, NewSlot(&DummySetter));
+-    RegisterProperty("validateOnParse", NULL, NewSlot(&DummySetter));
+-    RegisterProperty("preserveWhiteSpace",
++    this->RegisterProperty("parsed", NewFixedGetterSlot(true), NULL);
++    this->RegisterProperty("parseError", NewSlot(&DOMDocument::GetParseError), NULL);
++    this->RegisterProperty("resolveExternals", NULL, NewSlot(&DummySetter));
++    this->RegisterProperty("validateOnParse", NULL, NewSlot(&DummySetter));
++    this->RegisterProperty("preserveWhiteSpace",
+                      NewSlot(&DOMDocument::PreservesWhiteSpace),
+                      NewSlot(&DOMDocument::SetPreserveWhiteSpace));
+-    RegisterMethod("getProperty", NewSlot(DummyGetProperty));
+-    RegisterMethod("setProperty", NewSlot(DummySetProperty));
++    this->RegisterMethod("getProperty", NewSlot(DummyGetProperty));
++    this->RegisterMethod("setProperty", NewSlot(DummySetProperty));
+     // Compatibility with Microsoft DOM: XMLHttpRequest functions.
+-    RegisterProperty("async", NewSlot(&DOMDocument::IsAsync),
++    this->RegisterProperty("async", NewSlot(&DOMDocument::IsAsync),
+                      NewSlot(&DOMDocument::SetAsync));
+-    RegisterProperty("readyState", NewSlot(&DOMDocument::GetReadyState), NULL);
+-    RegisterMethod("load", NewSlot(&DOMDocument::Load));
+-    RegisterClassSignal("onreadystatechange",
++    this->RegisterProperty("readyState", NewSlot(&DOMDocument::GetReadyState), NULL);
++    this->RegisterMethod("load", NewSlot(&DOMDocument::Load));
++    this->RegisterClassSignal("onreadystatechange",
+                         &DOMDocument::onreadystatechange_signal_);
+   }
+ 
+--- a/ggadget/xdg/icon_theme.cc
++++ b/ggadget/xdg/icon_theme.cc
+@@ -16,6 +16,7 @@
+ #include <sys/time.h>
+ #include <time.h>
+ #include <cstdlib>
++#include <unistd.h>
+ 
+ #include <map>
+ #include <vector>
+--- a/extensions/qt_system_framework/qt_system_framework.cc
++++ b/extensions/qt_system_framework/qt_system_framework.cc
+@@ -32,6 +32,7 @@
+ #include <ggadget/xdg/desktop_entry.h>
+ #include <ggadget/xdg/icon_theme.h>
+ #include <ggadget/xdg/utilities.h>
++#include <unistd.h>
+ 
+ #define Initialize qt_system_framework_LTX_Initialize
+ #define Finalize qt_system_framework_LTX_Finalize
+--- a/extensions/linux_system_framework/process.cc
++++ b/extensions/linux_system_framework/process.cc
+@@ -17,6 +17,7 @@
+ #include <sys/types.h>
+ #include <dirent.h>
+ #include <cstdlib>
++#include <unistd.h>
+ 
+ #ifdef HAVE_X11
+ #include <X11/Xlib.h>
+--- a/gadgets/designer/designer_script_utils.cc
++++ b/gadgets/designer/designer_script_utils.cc
+@@ -39,6 +39,7 @@
+ #include <ggadget/system_utils.h>
+ #include <ggadget/uuid.h>
+ #include <ggadget/view_interface.h>
++#include <unistd.h>
+ 
+ namespace ggadget {
+ namespace designer {
diff --git a/community/google-gadgets/glibc231.patch b/community/google-gadgets/glibc231.patch
new file mode 100644
index 000000000..61de05162
--- /dev/null
+++ b/community/google-gadgets/glibc231.patch
@@ -0,0 +1,25 @@
+--- ggadget/gtk/main_loop.cc
++++ ggadget/gtk/main_loop.cc
+@@ -16,9 +16,8 @@
+ 
+ #include <fcntl.h>
+ #include <stdint.h>
+-#include <glib/ghash.h>
++#include <glib.h>
+ #include <gtk/gtk.h>
+-#include <glib/gthread.h>
+ #include <ggadget/common.h>
+ #include "main_loop.h"
+ #include "utilities.h"
+--- hosts/gtk/main.cc
++++ hosts/gtk/main.cc
+@@ -14,8 +14,8 @@
+   limitations under the License.
+ */
+ 
++#include <glib.h>
+ #include <gtk/gtk.h>
+-#include <glib/gthread.h>
+ #include <locale.h>
+ #include <signal.h>
+ #include <unistd.h>
diff --git a/community/gpsbabel/PKGBUILD b/community/gpsbabel/PKGBUILD
index 9ffb08e33..58865408f 100644
--- a/community/gpsbabel/PKGBUILD
+++ b/community/gpsbabel/PKGBUILD
@@ -1,23 +1,21 @@
-# $Id: PKGBUILD 76414 2012-09-17 13:51:33Z spupykin $
+# $Id: PKGBUILD 85355 2013-03-01 10:32:31Z andrea $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org
 # Contributor: William Rea <sillywilly@gmail.com>
 
 pkgname=gpsbabel
 pkgver=1.4.4
-pkgrel=1
+pkgrel=2
 pkgdesc="Reads, writes, and manipulates GPS waypoints in a variety of formats"
 arch=('i686' 'x86_64')
 url="http://www.gpsbabel.org"
 license=('GPL')
 depends=('libusb-compat' 'expat')
-makedepends=('fop' 'qt' 'libxml2' 'libxslt' 'gtk2' 'lcms2' 'qtwebkit' 'java-environment=6' 'docbook-xsl')
-optdepends=('qt' 'qtwebkit')
+makedepends=('fop' 'qt4' 'libxml2' 'libxslt' 'gtk2' 'lcms2' 'qtwebkit' 'java-environment' 'docbook-xsl')
+optdepends=('qt4' 'qtwebkit')
 options=('docs')
-source=("gpsbabel-$pkgver.tar.gz::http://archlinux-stuff.googlecode.com/files/gpsbabel-$pkgver.tar.gz"
-	"gpsbabel.desktop::http://pkgs.fedoraproject.org/gitweb/?p=gpsbabel.git;a=blob_plain;f=gpsbabel.desktop;hb=HEAD")
-md5sums=('6c4c8f0cb9fcf9f8302585148878f174'
-         '7bdbd243e29a8831842d31c079f04c45')
+source=("gpsbabel-$pkgver.tar.gz::http://archlinux-stuff.googlecode.com/files/gpsbabel-$pkgver.tar.gz")
+md5sums=('6c4c8f0cb9fcf9f8302585148878f174')
 
 build() {
   cd $srcdir/gpsbabel-$pkgver
@@ -34,7 +32,7 @@ package() {
   # GUI
   install -Dm755 gui/objects/gpsbabelfe-bin ${pkgdir}/usr/bin/gpsbabelfe-bin
   install -Dm644 gui/images/appicon.png $pkgdir/usr/share/pixmaps/gpsbabel.png
-  install -Dm644 $srcdir/gpsbabel.desktop $pkgdir/usr/share/applications/gpsbabel.desktop
+  install -Dm644 gui/gpsbabel.desktop $pkgdir/usr/share/applications/gpsbabel.desktop
 
   # Header install
   mkdir -p $pkgdir/usr/include/gpsbabel
diff --git a/community/gwenhywfar/PKGBUILD b/community/gwenhywfar/PKGBUILD
index 925fe53ea..bac4f1e30 100644
--- a/community/gwenhywfar/PKGBUILD
+++ b/community/gwenhywfar/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 74856 2012-08-07 14:18:41Z spupykin $
+# $Id: PKGBUILD 85356 2013-03-01 10:32:40Z andrea $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: William Rea <sillywilly@gmail.com>
 
 pkgname=gwenhywfar
 pkgver=4.3.3
 _dnrel=67
-pkgrel=1
+pkgrel=2
 pkgdesc="OS abstraction functions for various projects"
 arch=(i686 x86_64)
 url="http://www.aquamaniac.de"
 options=('!libtool')
 license=("LGPL")
 depends=('openssl' 'gnutls' 'libgcrypt')
-makedepends=('gtk2' 'qt')
-optdepends=('gtk2' 'qt')
+makedepends=('gtk2' 'qt4')
+optdepends=('gtk2' 'qt4')
 source=("gwenhywfar-$pkgver.tar.gz::http://www2.aquamaniac.de/sites/download/download.php?package=01&release=${_dnrel}&file=01&dummy=gwenhywfar-$pkgver.tar.gz")
 md5sums=('c5b9d52a25960f84f9264a5a5dd484d1')
 
@@ -23,5 +23,9 @@ build() {
   ./configure --prefix=/usr --sysconfdir=/etc --enable-ssl
   sed -i 's|gnutls_transport_set_lowat||g' src/sio/syncio_tls.c
   make
+}
+
+package() {
+  cd $srcdir/gwenhywfar-$pkgver
   make DESTDIR=$pkgdir install
 }
diff --git a/community/hedgewars/PKGBUILD b/community/hedgewars/PKGBUILD
index 12a536b6b..295d2e7e4 100644
--- a/community/hedgewars/PKGBUILD
+++ b/community/hedgewars/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 84019 2013-02-08 04:15:49Z td123 $
+# $Id: PKGBUILD 85357 2013-03-01 10:32:49Z andrea $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=hedgewars
 pkgver=0.9.18
-pkgrel=5
+pkgrel=6
 pkgdesc="Free Worms-like turn based strategy game"
 arch=('i686' 'x86_64')
 url="http://hedgewars.org"
 license=('GPL' 'custom')
-depends=('qt' 'sdl' 'sdl_mixer' 'sdl_image' 'sdl_net' 'sdl_ttf' 'lua51')
+depends=('qt4' 'sdl' 'sdl_mixer' 'sdl_image' 'sdl_net' 'sdl_ttf' 'lua51')
 makedepends=('fpc' 'cmake'
 	     # haskell specific
 	     'ghc=7.6.2-1'
@@ -32,8 +32,8 @@ build() {
   cmake \
 	-DCMAKE_INSTALL_PREFIX=/usr \
 	-DDATA_INSTALL_DIR=/usr/share \
-	-DQT_QMAKE_EXECUTABLE=/usr/bin/qmake \
-	-DQT_MOC_EXECUTABLE=/usr/bin/moc \
+	-DQT_QMAKE_EXECUTABLE=/usr/lib/qt4/bin/qmake \
+	-DQT_MOC_EXECUTABLE=/usr/lib/qt4/bin/moc \
 	-DWITH_SERVER=1 .
   make
 }
diff --git a/community/herqq/PKGBUILD b/community/herqq/PKGBUILD
index e1492c5f2..9728f46c3 100644
--- a/community/herqq/PKGBUILD
+++ b/community/herqq/PKGBUILD
@@ -1,24 +1,27 @@
-# $Id: PKGBUILD 83154 2013-01-27 16:18:20Z pierre $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+# $Id: PKGBUILD 85358 2013-03-01 10:33:17Z andrea $
+# Maintainer: Alexander Rødseth <rodseth@gmail.com>
+# Contributor: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=herqq
 pkgver=1.0.0
-pkgrel=1
-pkgdesc="A software library for building UPnP devices (HUPnP)"
-arch=('i686' 'x86_64')
-url="http://www.herqq.org/"
+pkgrel=2
+pkgdesc='Software library for building UPnP devices (HUPnP)'
+arch=('x86_64' 'i686')
+url='http://www.herqq.org/'
 license=('GPL')
-depends=('qt')
-source=("http://downloads.sourceforge.net/hupnp/${pkgname}-${pkgver}.zip")
-md5sums=('45a0632f7c7b64bc0fdab852d36c1e61')
+depends=('qt4')
+source=("http://downloads.sourceforge.net/hupnp/$pkgname-$pkgver.zip")
+sha256sums=('cbcfc76f72d561d822a7ff5374b97e80d1731b610a5c257edbf5c013bfe6748e')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd "$srcdir/$pkgname-$pkgver"
   qmake PREFIX=/usr
   make
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make INSTALL_ROOT="${pkgdir}" install
+  cd "$srcdir/$pkgname-$pkgver"
+  make INSTALL_ROOT="$pkgdir" install
 }
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/higan-qt/PKGBUILD b/community/higan-qt/PKGBUILD
index 0ae875d6f..ecaea27c6 100755
--- a/community/higan-qt/PKGBUILD
+++ b/community/higan-qt/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 84668 2013-02-21 13:55:51Z alucryd $
+# $Id: PKGBUILD 85359 2013-03-01 10:33:25Z andrea $
 # Maintainer: Maxime Gauduin <alucryd@gmail.com>
 
 pkgname=higan-qt
 pkgver=092
-pkgrel=3
+pkgrel=5
 pkgdesc="Nintendo multi-system emulator - QT version"
 arch=('i686' 'x86_64')
 url="http://code.google.com/p/higan/"
 license=('GPL3')
-depends=('libao' 'libpulse' 'openal' 'qt>=4.7.0' 'sdl' 'xdialog')
+depends=('libao' 'libpulse' 'openal' 'qt4' 'sdl' 'xdialog')
 makedepends=('mesa')
 optdepends=('beat: Delta patcher')
 conflicts=('higan-gtk')
@@ -24,9 +24,9 @@ _profiles="accuracy balanced performance"
 build() {
 # QT 4.8.0 fix
   cd "${srcdir}"
-  moc -i -Ipurify_v03-source/ananke/phoenix/qt/ -o purify_v03-source/ananke/phoenix/qt/platform.moc purify_v03-source/ananke/phoenix/qt/platform.moc.hpp
-  moc -i -Ipurify_v03-source/purify/phoenix/qt/ -o purify_v03-source/purify/phoenix/qt/platform.moc purify_v03-source/purify/phoenix/qt/platform.moc.hpp
-  moc -i -Ihigan_v${pkgver}-source/higan/phoenix/qt/ -o higan_v${pkgver}-source/higan/phoenix/qt/platform.moc higan_v${pkgver}-source/higan/phoenix/qt/platform.moc.hpp
+  moc-qt4 -i -Ipurify_v03-source/ananke/phoenix/qt/ -o purify_v03-source/ananke/phoenix/qt/platform.moc purify_v03-source/ananke/phoenix/qt/platform.moc.hpp
+  moc-qt4 -i -Ipurify_v03-source/purify/phoenix/qt/ -o purify_v03-source/purify/phoenix/qt/platform.moc purify_v03-source/purify/phoenix/qt/platform.moc.hpp
+  moc-qt4 -i -Ihigan_v${pkgver}-source/higan/phoenix/qt/ -o higan_v${pkgver}-source/higan/phoenix/qt/platform.moc higan_v${pkgver}-source/higan/phoenix/qt/platform.moc.hpp
 
 # Compile libananke
   cd "${srcdir}"/purify_v03-source/ananke
diff --git a/community/highlight/PKGBUILD b/community/highlight/PKGBUILD
index cea8e9b78..7cf82ed54 100644
--- a/community/highlight/PKGBUILD
+++ b/community/highlight/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 83937 2013-02-07 08:11:31Z bluewind $
+# $Id: PKGBUILD 85360 2013-03-01 10:33:34Z andrea $
 # Maintainer: Florian Pritz <flo@xinu.at>
 # Contributor: Jan Fader <jan.fader@web.de>
 pkgbase=highlight
 pkgname=(highlight highlight-gui)
 pkgver=3.13
-pkgrel=1
+pkgrel=2
 url="http://www.andre-simon.de/doku/highlight/highlight.html"
 license=('GPL')
 arch=('i686' 'x86_64')
-makedepends=(qt lua51 boost)
+makedepends=(qt4 lua51 boost)
 source=(http://www.andre-simon.de/zip/$pkgname-$pkgver.tar.bz2{,.asc})
 md5sums=('2b5e217c80c441853360926dbb7777e9'
          'c68f6dd20af61ca1061d910879d910a8')
@@ -30,7 +30,7 @@ package_highlight() {
 
 package_highlight-gui() {
   pkgdesc="Fast and flexible source code highlighter (QT version)"
-  depends=('qt' 'highlight')
+  depends=('qt4' 'highlight')
   cd "$srcdir/$pkgbase-$pkgver"
 
   install -dm755 "$pkgdir/usr/bin"
diff --git a/community/i7z/PKGBUILD b/community/i7z/PKGBUILD
index bd3cda36c..b1242f3ab 100644
--- a/community/i7z/PKGBUILD
+++ b/community/i7z/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 76391 2012-09-17 08:17:57Z svenstaro $
+# $Id: PKGBUILD 85361 2013-03-01 10:33:44Z andrea $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Nathan O <ndowens.aur at gmail dot com>
 
 pkgname=i7z
 pkgver=0.27.2
-pkgrel=1
+pkgrel=2
 pkgdesc="A better i7 (and now i3, i5) reporting tool for Linux"
 arch=('i686' 'x86_64')
 license=('GPL2')
 depends=('ncurses')
-makedepends=('qt')
-optdepends=('qt: for i7z-gui')
+makedepends=('qt4')
+optdepends=('qt4: for i7z-gui')
 url="http://code.google.com/p/i7z/"
 source=("http://i7z.googlecode.com/files/${pkgname}-${pkgver}.tar.gz")
 md5sums=('7f2c4928146b722d67ecdd0d905a4353')
diff --git a/community/ibus-qt/PKGBUILD b/community/ibus-qt/PKGBUILD
index 9b320aed4..4f1f9c180 100644
--- a/community/ibus-qt/PKGBUILD
+++ b/community/ibus-qt/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 82685 2013-01-23 00:15:54Z eric $
+# $Id: PKGBUILD 85362 2013-03-01 10:33:52Z andrea $
 # Maintainer: Felix Yan <felixonmars@gmail.com>
 # Contributor: Thomas Dziedzic < gostrc at gmail >
 # Contributor: garion < garion @ mailoo.org >
@@ -6,12 +6,12 @@
 
 pkgname=ibus-qt
 pkgver=1.3.1
-pkgrel=7
+pkgrel=8
 pkgdesc='IBus qt library and IBus qt input method plugin'
 arch=('i686' 'x86_64')
 license=('LGPL')
 url='http://ibus.googlecode.com'
-depends=('qt' 'ibus' 'icu>=50')
+depends=('qt4' 'ibus' 'icu')
 makedepends=('cmake' 'automoc4' 'doxygen')
 source=("http://ibus.googlecode.com/files/${pkgname}-${pkgver}-Source.tar.gz"
 	0001-Do-not-crash-on-missing-invalid-DISPLAY-envvar.patch)
diff --git a/community/instead-launcher/PKGBUILD b/community/instead-launcher/PKGBUILD
index 1a118f518..bbb190068 100644
--- a/community/instead-launcher/PKGBUILD
+++ b/community/instead-launcher/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 76496 2012-09-19 14:12:35Z spupykin $
+# $Id: PKGBUILD 85363 2013-03-01 10:34:01Z andrea $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Peter Kosyh <p.kosyhgmail.com>
 
 pkgname=instead-launcher
 pkgver=0.6.1
-pkgrel=2
+pkgrel=3
 pkgdesc="launcher and games downloader for INSTEAD quest interpreter"
 arch=('i686' 'x86_64')
 url="http://instead-launcher.googlecode.com/"
 license=('GPL')
-makedepends=('sed' 'qt')
+makedepends=('sed' 'qt4')
 source=(http://instead-launcher.googlecode.com/files/instead-launcher_$pkgver.tar.gz)
 md5sums=('b2136e535dbb77eacb79e3357dc2a173')
 
@@ -21,7 +21,7 @@ build() {
 }
 
 package() {
-  depends=('qt' 'instead')
+  depends=('qt4' 'instead')
   cd $srcdir/instead-launcher-$pkgver
   make INSTALL_ROOT=$pkgdir install
 }
diff --git a/community/kcheckers/PKGBUILD b/community/kcheckers/PKGBUILD
index b99753db4..87f3a5ad8 100644
--- a/community/kcheckers/PKGBUILD
+++ b/community/kcheckers/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 55424 2011-09-12 07:36:46Z ebelanger $
+# $Id: PKGBUILD 85364 2013-03-01 10:34:09Z andrea $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=kcheckers
 pkgver=0.8.1
-pkgrel=7
+pkgrel=8
 pkgdesc="Qt4-based checkers boardgame"
 arch=('i686' 'x86_64')
 url="http://qcheckers.sourceforge.net/"
 license=('GPL')
-depends=('qt')
+depends=('qt4')
 source=(http://downloads.sourceforge.net/qcheckers/${pkgname}-${pkgver}.tar.gz kcheckers.desktop)
 md5sums=('793736a007cd92122dfd91bcfd14ab69'
-         '8b8682edd870c2692f9c7d538263e0f5')
+         '25b2605f4d605615e265150b722f1897')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/community/kcheckers/kcheckers.desktop b/community/kcheckers/kcheckers.desktop
index a1f4e1209..815cfb4a8 100644
--- a/community/kcheckers/kcheckers.desktop
+++ b/community/kcheckers/kcheckers.desktop
@@ -2,7 +2,7 @@
 Name=Kcheckers
 Comment=Checkers/Daughts game using Qt4 toolkit
 Exec=kcheckers
-Icon=/usr/share/kcheckers/icons/theme/kingwhite.png
+Icon=/usr/share/kcheckers/themes/simple_small/kingwhite.png
 Terminal=false
 Type=Application
 Encoding=UTF-8
diff --git a/community/kchmviewer/PKGBUILD b/community/kchmviewer/PKGBUILD
index 952d56834..3a41d670c 100644
--- a/community/kchmviewer/PKGBUILD
+++ b/community/kchmviewer/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 61052 2011-12-20 23:58:31Z jlichtblau $
+# $Id: PKGBUILD 85365 2013-03-01 10:34:18Z andrea $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Alexander Bogdanov <andorn@gmail.com>
 
 pkgname=kchmviewer
 pkgver=6.0
-pkgrel=2
+pkgrel=3
 pkgdesc="A .chm files (MS HTML help file format) viewer"
 arch=('i686' 'x86_64')
 url="http://kchmviewer.sourceforge.net/"
 license=('GPL')
-depends=('desktop-file-utils' 'chmlib' 'kdebase-runtime' 'qt' 'xdg-utils')
+depends=('desktop-file-utils' 'chmlib' 'kdebase-runtime' 'xdg-utils')
 makedepends=('automoc4' 'cmake')
 options=('libtool')
 install=$pkgname.install
@@ -33,8 +33,8 @@ package() {
   install -D -m644 ${srcdir}/$pkgname-$pkgver/packages/$pkgname.png \
     ${pkgdir}/usr/share/pixmaps/$pkgname.png
 
-#msits.protocol file provided by kdegraphics package
+#msits.protocol file provided by kdegraphics-okular package
   rm -rf ${pkgdir}/usr/share/kde4
-#kio_msits.so file provided by kdegraphics package - FS#14376
+#kio_msits.so file provided by kdegraphics-okular package - FS#14376
   rm -rf ${pkgdir}/usr/lib
 }
diff --git a/community/keepassx/PKGBUILD b/community/keepassx/PKGBUILD
index 4ccc62899..35f3edddd 100644
--- a/community/keepassx/PKGBUILD
+++ b/community/keepassx/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 80120 2012-11-16 16:43:09Z spupykin $
+# $Id: PKGBUILD 85366 2013-03-01 10:34:27Z andrea $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Greg Bouzakis <gregbouzakis@gmail.com>
 # Contributor: Alexander Fehr <pizzapunk gmail com>
@@ -6,12 +6,12 @@
 
 pkgname=keepassx
 pkgver=0.4.3
-pkgrel=3
+pkgrel=4
 pkgdesc='Password manager'
 arch=('i686' 'x86_64')
 url='http://www.keepassx.org'
 license=('GPL2')
-depends=('libxtst' 'qt' 'shared-mime-info')
+depends=('libxtst' 'qt4' 'shared-mime-info')
 install=keepassx.install
 source=(http://downloads.sourceforge.net/keepassx/$pkgname-$pkgver.tar.gz)
 md5sums=('1df67bb22b2e08df49f09e61d156f508')
diff --git a/community/kvirc/PKGBUILD b/community/kvirc/PKGBUILD
index 9d1246a33..b775d55d1 100644
--- a/community/kvirc/PKGBUILD
+++ b/community/kvirc/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 73246 2012-07-04 09:21:45Z spupykin $
+# $Id: PKGBUILD 85367 2013-03-01 10:34:38Z andrea $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=kvirc
 pkgver=4.2.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Qt-based IRC client"
 url="http://www.kvirc.net"
-depends=('python2' 'qt' 'libxss' 'qtwebkit')
+depends=('python2' 'libxss' 'qtwebkit')
 arch=(i686 x86_64)
 makedepends=('cmake')
 license=('GPL')
diff --git a/community/launchy/PKGBUILD b/community/launchy/PKGBUILD
index d73c2fbbf..33ae2d4f1 100644
--- a/community/launchy/PKGBUILD
+++ b/community/launchy/PKGBUILD
@@ -1,14 +1,15 @@
+# $Id: PKGBUILD 85453 2013-03-01 19:08:27Z andrea $
 # Contributor: Andrew Burkett <burkett.andrew@gmail.com>
 # Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgname=launchy
 pkgver=2.5
-pkgrel=2
-pkgdesc="Launchy indexes the programs in your start menu and can launch your documents, project files, folders, and bookmarks with just a few keystrokes!"
+pkgrel=3
+pkgdesc="Indexes the programs in your start menu and can launch your documents, project files, folders, and bookmarks with just a few keystrokes!"
 arch=('i686' 'x86_64')
 url="http://www.launchy.net/"
 license=('GPL')
-depends=('qt' 'xdg-utils')
+depends=('qt4' 'xdg-utils')
 makedepends=('gcc' 'boost')
 source=("http://downloads.sourceforge.net/launchy/launchy-${pkgver}.tar.gz"
 	fix-linking.patch)
@@ -21,7 +22,7 @@ build() {
   # fix linking against libX11
   patch -Np1 -i ../fix-linking.patch
 
-  qmake -r Launchy.pro
+  qmake-qt4 -r Launchy.pro
   make
 }
 
diff --git a/community/libaccounts-qt/PKGBUILD b/community/libaccounts-qt/PKGBUILD
index f3670a72c..a0d646997 100644
--- a/community/libaccounts-qt/PKGBUILD
+++ b/community/libaccounts-qt/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 84998 2013-02-26 17:05:05Z bgyorgy $
+# $Id: PKGBUILD 85369 2013-03-01 10:34:56Z andrea $
 # Maintainer: Balló György <ballogyor+arch at gmail dot com>
 
 pkgbase=libaccounts-qt
 _pkgbase=accounts-qt
 pkgname=('libaccounts-qt' 'libaccounts-qt-doc')
 pkgver=1.6
-pkgrel=1
+pkgrel=2
 pkgdesc="Qt-based client library for accessing the online accounts database"
 arch=('i686' 'x86_64')
 url="http://code.google.com/p/accounts-sso/"
 license=('LGPL')
-depends=('qt' 'libaccounts-glib')
+depends=('qt4' 'libaccounts-glib')
 makedepends=('doxygen' 'graphviz' 'ttf-dejavu')
 options=('!emptydirs')
 source=(http://accounts-sso.googlecode.com/files/$_pkgbase-$pkgver.tar.bz2)
diff --git a/community/libextractor/PKGBUILD b/community/libextractor/PKGBUILD
index 349f8578a..f90f535a8 100644
--- a/community/libextractor/PKGBUILD
+++ b/community/libextractor/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 78771 2012-10-24 12:21:52Z spupykin $
+# $Id: PKGBUILD 85370 2013-03-01 10:35:05Z andrea $
 # Maintainer: Sergej Pupykin <pupykin.s@gmail.com>
 # Contributor: damir <damir@archlinux.org>
 
 pkgname=libextractor
 pkgver=1.0.1
-pkgrel=2
+pkgrel=3
 pkgdesc="A library used to extract meta-data from files of arbitrary type"
 arch=("i686" "x86_64")
 license=('GPL')
 url="http://gnunet.org/libextractor/"
 depends=('libltdl')
-makedepends=('flac' 'poppler' 'exiv2' 'qt' 'libvorbis' 'gtk2' 'libgsf' 'libmpeg2')
+makedepends=('flac' 'poppler' 'exiv2' 'qt4' 'libvorbis' 'gtk2' 'libgsf' 'libmpeg2')
 optdepends=('flac: flac support'
 	    'poppler: pdf support'
 	    'exiv2: metadata support'
diff --git a/community/lmms/PKGBUILD b/community/lmms/PKGBUILD
index 4d514aa6c..e58603521 100644
--- a/community/lmms/PKGBUILD
+++ b/community/lmms/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 80173 2012-11-17 12:51:55Z lfleischer $
+# $Id: PKGBUILD 85371 2013-03-01 10:35:13Z andrea $
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: Shinlun Hsieh <yngwiexx@yahoo.com.tw>
 # Contributor: Mateusz Herych <heniekk@gmail.com>
@@ -6,18 +6,19 @@
 
 pkgname=lmms
 pkgver=0.4.13
-pkgrel=2
+pkgrel=3
 pkgdesc='The Linux MultiMedia Studio.'
 arch=('i686' 'x86_64')
 url='http://lmms.sourceforge.net/'
 license=('GPL')
-depends=('sdl' 'glib2' 'fluidsynth' 'libpng' 'libvorbis' 'libxft' 'libxinerama' 'qt' 'sdl_sound'
+depends=('sdl' 'glib2' 'fluidsynth' 'libpng' 'libvorbis' 'libxft' 'libxinerama' 'qt4' 'sdl_sound'
          'libsamplerate' 'shared-mime-info')
 optdepends=('wine: VST support (experimental)'
             'fftw: SpectrumAnalyzer plugin'
             'stk: STK instruments plugins'
             'pulseaudio: PulseAudio output')
-makedepends=('cmake' 'ladspa' 'libxft' 'freetype2' 'fftw' 'stk' 'wine')
+makedepends=('cmake' 'ladspa' 'libxft' 'freetype2' 'fftw' 'stk')
+[[ $CARCH = i686 ]] && makedepends+=('wine')
 provides=('lmms-extras')
 conflicts=('lmms-extras')
 options=('!libtool' '!makeflags')
diff --git a/community/luminancehdr/PKGBUILD b/community/luminancehdr/PKGBUILD
index bd8037b50..874b8a136 100644
--- a/community/luminancehdr/PKGBUILD
+++ b/community/luminancehdr/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 78933 2012-10-27 23:44:52Z ebelanger $
+# $Id: PKGBUILD 85372 2013-03-01 10:35:25Z andrea $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Lukas Jirkovsky <l.jirkovsky@gmail.com>
 # Contributor: Dmitry N. Shilov <stormblast@land.ru>
 
 pkgname=luminancehdr
 pkgver=2.3.0
-pkgrel=4
+pkgrel=5
 pkgdesc='Open source graphical user interface application that aims to provide a workflow for HDR imaging'
 arch=('i686' 'x86_64')
 url='http://qtpfsgui.sourceforge.net/'
 license=('GPL')
-depends=('exiv2' 'fftw' 'gsl' 'lcms2' 'libraw' 'openexr' 'qt' 'qtwebkit')
+depends=('exiv2' 'fftw' 'gsl' 'lcms2' 'libraw' 'openexr' 'qtwebkit')
 makedepends=('cmake')
 optdepends=('hugin: align image stack functionality')
 install=$pkgname.install
diff --git a/community/luxrays/PKGBUILD b/community/luxrays/PKGBUILD
index 684fe2a9c..b7821797a 100644
--- a/community/luxrays/PKGBUILD
+++ b/community/luxrays/PKGBUILD
@@ -1,17 +1,18 @@
-# $Id: PKGBUILD 83257 2013-01-28 16:49:44Z stephane $
+# $Id: PKGBUILD 85444 2013-03-01 18:09:53Z stativ $
 # Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com>
 pkgname=luxrays
-pkgver=1.1
-_pkgver=589aa5dac899
-pkgrel=4
+pkgver=1.2
+_pkgver=475fbf15f0ca
+pkgrel=1
 pkgdesc="Accelerate the ray intersection process by using GPUs"
 arch=('i686' 'x86_64')
 url="http://www.luxrender.net/"
 license=('GPL')
-depends=('freeimage' 'freeglut' 'glew' 'libcl')
-makedepends=('cmake' 'boost' 'mesa' 'opencl-headers')
+depends=('freeimage' 'libcl' 'libgl')
+optdepends=('glew: slg, slg2, smallppmgpu' 'freeglut: slg, slg2, smallppmgpu')
+makedepends=('cmake' 'boost' 'mesa' 'opencl-headers' 'glew' 'freeglut')
 source=(https://bitbucket.org/luxrender/luxrays/get/$_pkgver.tar.bz2)
-md5sums=('7513d71148fa14bc1779b816816580b9')
+md5sums=('e7c24e8407514f2f2211ded105756b2a')
 
 build() {
   cd "$srcdir/luxrender-$pkgname-$_pkgver"
diff --git a/community/luxrender/PKGBUILD b/community/luxrender/PKGBUILD
index e3c6f12e6..b63912f02 100644
--- a/community/luxrender/PKGBUILD
+++ b/community/luxrender/PKGBUILD
@@ -1,24 +1,24 @@
-# $Id: PKGBUILD 83258 2013-01-28 16:49:44Z stephane $
+# $Id: PKGBUILD 85456 2013-03-01 19:15:13Z stativ $
 # Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com>
-# Initial contributor: flixie <69one@gmx.net>
+# Contributor: flixie <69one@gmx.net>
 # Contributor: Imanol Celaya <ornitorrincos@archlinux-es.org>
 pkgname=luxrender
-pkgver=1.1
-_pkgver=4b4289cda943
-pkgrel=4
+pkgver=1.2
+_pkgver=ee0b9ff73d62
+pkgrel=1
 pkgdesc="Rendering system for physically correct, unbiased image synthesis"
 arch=('i686' 'x86_64')
 url="http://www.luxrender.net/"
 license=('GPL')
-depends=('boost-libs' 'freeimage' 'openexr' 'libcl')
-optdepends=('luxblend25: Blender exporter' 'qt: Qt GUI' \
+depends=('boost-libs' 'freeimage' 'openexr' 'libcl' 'libgl')
+optdepends=('luxblend25: Blender exporter' 'qt4: Qt GUI' \
             'python: Python interface (pylux)'
             'nvidia-utils: OpenCL support for nVidia GPUs' \
             'amdstream: OpenCL support for AMD GPUs' \
             'intel-opencl-sdk: OpenCL support for Intel CPUs')
-makedepends=('cmake' 'boost' 'mesa' 'qt' "luxrays=$pkgver" 'python' 'opencl-headers')
+makedepends=('cmake' 'boost' 'mesa' 'qt4' "luxrays=$pkgver" 'python' 'opencl-headers')
 source=(https://bitbucket.org/luxrender/lux/get/$_pkgver.tar.bz2)
-md5sums=('accca65afdc4cc38db49a6e54f20e0f2')
+md5sums=('eb1ed9ecfe540896863ad4ee4da5a2f9')
 
 build() {
   cd "$srcdir"/luxrender-lux-$_pkgver
diff --git a/community/mariadb/PKGBUILD b/community/mariadb/PKGBUILD
index d2a361d9d..ba946890c 100644
--- a/community/mariadb/PKGBUILD
+++ b/community/mariadb/PKGBUILD
@@ -1,37 +1,35 @@
-# $Id: PKGBUILD 83403 2013-01-31 12:12:11Z bpiotrowski $
+# $Id: PKGBUILD 85328 2013-03-01 06:31:46Z bpiotrowski $
 # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 
 pkgbase=mariadb
 pkgname=('libmariadbclient' 'mariadb-clients' 'mariadb')
 pkgver=5.5.29
-pkgrel=1
+pkgrel=4
 arch=('i686' 'x86_64')
 license=('GPL')
-url="http://mariadb.org/"
+url='http://mariadb.org/'
 makedepends=('cmake' 'openssl' 'zlib')
 options=('!libtool')
 source=(http://mirrors.supportex.net/$pkgbase/$pkgbase-$pkgver/kvm-tarbake-jaunty-x86/$pkgbase-$pkgver.tar.gz
-        service rc.d tmpfiles.conf)
+        mariadb.service
+        mariadb-post.sh
+        mariadb-tmpfile.conf)
 sha256sums=('b0e25b5451dbf8e8c8bf243bbd0aeb264db0da2caceafc7e2c9fad77b8d4be74'
-            'd9f3d0a897e2e8d5d07c19898ed4c1a4a1c08dfe09f6854f90e79e055e48c02e'
-            'a0bfe75c035fa32a10d04238932f5e7ad11829b7fbdb1b8f8997ee645ae1b924'
-            '08daa863ddd50aff0b608621ed26936919211e286440951dca5866141291004d')
+            'a6cf5446159fff16598d0d787dd3a3c30a53a656a5f876ddb608bc60e234d334'
+            '368f9fd2454d80eb32abb8f29f703d1cf9553353fb9e1ae4529c4b851cb8c5dd'
+            '2af318c52ae0fe5428e8a9245d1b0fc3bc5ce153842d1563329ceb1edfa83ddd')
 
 build() {
   cd $srcdir
   mkdir build
   cd build
 
-  # CFLAGS/CXXFLAGS as suggested upstream
-  CFLAGS="-fPIC ${CFLAGS} -fno-strict-aliasing -DBIG_JOINS=1 -fomit-frame-pointer" \
-  CXXFLAGS="-fPIC ${CXXFLAGS} -fno-strict-aliasing -DBIG_JOINS=1 -felide-constructors -fno-rtti" \
-
-  cmake ../${pkgbase}-${pkgver} \
+  cmake ../$pkgbase-$pkgver \
     -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DSYSCONFDIR=/etc/mysql \
     -DMYSQL_DATADIR=/var/lib/mysql \
-    -DMYSQL_UNIX_ADDR=/var/run/mysqld/mysqld.sock \
+    -DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock \
     -DDEFAULT_CHARSET=utf8 \
     -DDEFAULT_COLLATION=utf8_general_ci \
     -DENABLED_LOCAL_INFILE=ON \
@@ -49,36 +47,39 @@ build() {
     -DWITH_ZLIB=system \
     -DWITH_SSL=system \
     -DWITH_LIBWRAP=OFF \
-    -DWITH_MYSQLD_LDFLAGS="${LDFLAGS}" \
     -DWITH_EXTRA_CHARSETS=complex \
     -DWITH_EMBEDDED_SERVER=ON \
+    -DWITH_ARCHIVE_STORAGE_ENGINE=1 \
+    -DWITH_BLACKHOLE_STORAGE_ENGINE=1 \
     -DWITH_INNOBASE_STORAGE_ENGINE=1 \
     -DWITH_PARTITION_STORAGE_ENGINE=1 \
-    -DWITH_PBXT_STORAGE_ENGINE=1 \
     -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 \
-    -DWITHOUT_ARCHIVE_STORAGE_ENGINE=1 \
-    -DWITHOUT_BLACKHOLE_STORAGE_ENGINE=1 \
-    -DWITHOUT_FEDERATED_STORAGE_ENGINE=1
+    -DWITHOUT_FEDERATED_STORAGE_ENGINE=1 \
+    -DWITHOUT_PBXT_STORAGE_ENGINE=1 \
+    -DCMAKE_C_FLAGS="-fPIC ${CFLAGS} -fno-strict-aliasing -DBIG_JOINS=1 -fomit-frame-pointer" \
+    -DCMAKE_CXX_FLAGS="-fPIC ${CXXFLAGS} -fno-strict-aliasing -DBIG_JOINS=1 -felide-constructors -fno-rtti" \
+    -DWITH_MYSQLD_LDFLAGS="${LDFLAGS}"
+
 
   make
 }
 
-package_libmariadbclient(){
+package_libmariadbclient() {
   pkgdesc="MariaDB client libraries"
   depends=('openssl')
   conflicts=('libmysqlclient')
-  provides=("libmysqlclient=${pkgver}")
+  provides=("libmysqlclient=$pkgver")
   
-  cd "${srcdir}"/build
+  cd "$srcdir"/build
   for dir in include libmysql libmysqld libservices; do
-    make -C ${dir} DESTDIR="${pkgdir}" install
+    make -C $dir DESTDIR="$pkgdir" install
   done
 
-  install -d "${pkgdir}"/usr/bin
-  install -m755 scripts/mysql_config "${pkgdir}"/usr/bin/
-  install -d "${pkgdir}"/usr/share/man/man1
+  install -d "$pkgdir"/usr/bin
+  install -m755 scripts/mysql_config "$pkgdir"/usr/bin/
+  install -d "$pkgdir"/usr/share/man/man1
   for man in mysql_config mysql_client_test_embedded mysqltest_embedded; do
-    install -m644 "${srcdir}"/${pkgbase}-${pkgver}/man/$man.1 "${pkgdir}"/usr/share/man/man1/$man.1
+    install -m644 "$srcdir"/$pkgbase-$pkgver/man/$man.1 "$pkgdir"/usr/share/man/man1/$man.1
   done
 }
 
@@ -86,19 +87,19 @@ package_mariadb-clients() {
   pkgdesc="MariaDB client tools"
   depends=('libmariadbclient')
   conflicts=('mysql-clients')
-  provides=("mysql-clients=${pkgver}")
+  provides=("mysql-clients=$pkgver")
   
-  cd "${srcdir}"/build
-  make -C client DESTDIR="${pkgdir}" install
+  cd "$srcdir"/build
+  make -C client DESTDIR="$pkgdir" install
 
   # install man pages
-  install -d "${pkgdir}"/usr/share/man/man1
+  install -d "$pkgdir"/usr/share/man/man1
   for man in mysql mysqladmin mysqlcheck mysqldump mysqlimport mysqlshow mysqlslap; do
-    install -m644 "${srcdir}"/${pkgbase}-${pkgver}/man/$man.1 "${pkgdir}"/usr/share/man/man1/$man.1
+    install -m644 "$srcdir"/$pkgbase-$pkgver/man/$man.1 "$pkgdir"/usr/share/man/man1/$man.1
   done
 
   # provided by mariadb
-  rm "${pkgdir}"/usr/bin/{mysql_{plugin,upgrade},mysqlbinlog,mysqltest}
+  rm "$pkgdir"/usr/bin/{mysql_{plugin,upgrade},mysqlbinlog,mysqltest}
 }
 
 package_mariadb() {
@@ -107,34 +108,29 @@ package_mariadb() {
   install=mariadb.install
   depends=('mariadb-clients')
   conflicts=('mysql')
-  provides=("mysql=${pkgver}")
+  provides=("mysql=$pkgver")
   optdepends=('perl-dbi' 'perl-dbd-mysql')
   options=('emptydirs')
 
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-
-  install -Dm644 "${pkgdir}"/usr/share/mysql/my-medium.cnf "${pkgdir}"/etc/mysql/my.cnf
-  install -Dm755 "${srcdir}"/rc.d "${pkgdir}"/etc/rc.d/mysqld
+  cd "$srcdir"/build
+  make DESTDIR="$pkgdir" install
 
-  install -Dm644 "${srcdir}"/service "${pkgdir}"/usr/lib/systemd/system/mysqld.service
-  install -Dm644 "${srcdir}"/tmpfiles.conf "${pkgdir}"/usr/lib/tmpfiles.d/mysql.conf
+  install -Dm644 "$pkgdir"/usr/share/mysql/my-medium.cnf "$pkgdir"/etc/mysql/my.cnf
+  install -Dm755 "$srcdir"/mariadb-post.sh "$pkgdir"/usr/bin/mysqld-post
+  install -Dm644 "$srcdir"/mariadb.service "$pkgdir"/usr/lib/systemd/system/mysqld.service
+  install -Dm644 "$srcdir"/mariadb-tmpfile.conf "$pkgdir"/usr/lib/tmpfiles.d/mysql.conf
 
   # provided by libmariadbclient
-  rm "${pkgdir}"/usr/bin/{mysql_config,mysql_client_test_embedded,mysqltest_embedded}
-  rm "${pkgdir}"/usr/lib/libmysql*
-  rm -r "${pkgdir}"/usr/include/
-  rm "${pkgdir}"/usr/share/man/man1/{mysql_config,mysql_client_test_embedded,mysqltest_embedded}.1
+  rm "$pkgdir"/usr/bin/{mysql_config,mysql_client_test_embedded,mysqltest_embedded}
+  rm "$pkgdir"/usr/lib/libmysql*
+  rm -r "$pkgdir"/usr/include/
+  rm "$pkgdir"/usr/share/man/man1/{mysql_config,mysql_client_test_embedded,mysqltest_embedded}.1
   
   # provided by mariadb-clients
-  rm "${pkgdir}"/usr/bin/{mysql,mysqladmin,mysqlcheck,mysqldump,mysqlimport,mysqlshow,mysqlslap}
-  rm "${pkgdir}"/usr/share/man/man1/{mysql,mysqladmin,mysqlcheck,mysqldump,mysqlimport,mysqlshow,mysqlslap}.1
+  rm "$pkgdir"/usr/bin/{mysql,mysqladmin,mysqlcheck,mysqldump,mysqlimport,mysqlshow,mysqlslap}
+  rm "$pkgdir"/usr/share/man/man1/{mysql,mysqladmin,mysqlcheck,mysqldump,mysqlimport,mysqlshow,mysqlslap}.1
 
   # not needed
-  rm -r "${pkgdir}"/usr/{data,mysql-test,sql-bench}
-  rm "${pkgdir}"/usr/share/man/man1/mysql-test-run.pl.1
-
-  install -dm700 "${pkgdir}"/var/lib/mysql
+  rm -r "$pkgdir"/usr/{data,mysql-test,sql-bench}
+  rm "$pkgdir"/usr/share/man/man1/mysql-test-run.pl.1
 }
-
-# vim:set ts=2 sw=2 et:
diff --git a/community/mariadb/mariadb-post.sh b/community/mariadb/mariadb-post.sh
new file mode 100755
index 000000000..c4ac18171
--- /dev/null
+++ b/community/mariadb/mariadb-post.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+while true; do
+    response=$(/usr/bin/mysqladmin -uUNKNOWN_USER ping 2>&1) && break
+    echo "$response" | grep -q "mysqld is alive" && break
+    echo "$response" | grep -q "Access denied for user" && break 
+    sleep 1
+done
diff --git a/community/mariadb/mariadb-tmpfile.conf b/community/mariadb/mariadb-tmpfile.conf
new file mode 100644
index 000000000..6883dc798
--- /dev/null
+++ b/community/mariadb/mariadb-tmpfile.conf
@@ -0,0 +1 @@
+d /run/mysqld 0755 mysql mysql -
diff --git a/community/mariadb/mariadb.install b/community/mariadb/mariadb.install
index 4ac50ec94..de619b668 100644
--- a/community/mariadb/mariadb.install
+++ b/community/mariadb/mariadb.install
@@ -1,30 +1,28 @@
+if [[ $(command -v my_print_defaults >/dev/null 2>&1) ]]; then
+  datadir=$(my_print_defaults mysqld | sed -n "s/^--datadir=//p")
+fi
+[[ -z $datadir ]] && datadir=/var/lib/mysql
+
 post_install(){
   groupadd -g 89 mysql &>/dev/null
-  useradd -u 89 -g mysql -d /var/lib/mysql -s /bin/false mysql &>/dev/null
-  usr/bin/mysql_install_db --user=mysql --basedir=/usr --datadir=/var/lib/mysql
-  chown -R mysql:mysql var/lib/mysql &>/dev/null
+  useradd -u 89 -g mysql -d $datadir -s /bin/false mysql &>/dev/null
 
-  if [[ ! -d run/mysqld ]]; then
-    usr/bin/systemd-tmpfiles --create usr/lib/tmpfiles.d/mysql.conf
+  if [[ ! -e $datadir ]]; then
+    install -dm700 $datadir
+    usr/bin/mysql_install_db --user=mysql --basedir=/usr --datadir=$datadir
+    chown -R mysql:mysql var/lib/mysql &>/dev/null
   fi
+
+  usr/bin/systemd-tmpfiles --create mysqld.conf
 }
 
 post_upgrade(){
   getent group mysql >/dev/null 2>&1 || groupadd -g 89 mysql &>/dev/null
-  getent passwd mysql >/dev/null 2>&1 || useradd -u 89 -g mysql -d /var/lib/mysql -s /bin/false mysql &>/dev/null
-
-  if [[ ! -d run/mysqld ]]; then
-    usr/bin/systemd-tmpfiles --create usr/lib/tmpfiles.d/mysql.conf
-  fi
-
-  if [[ "$(vercmp $2 5.5)" -lt 0 ]]; then
-    echo ">>> Major version update. Consider restart the service, and"
-    echo "    then running mysql_upgrade after it."
-  fi
+  getent passwd mysql >/dev/null 2>&1 || useradd -u 89 -g mysql -d $datadir -s /bin/false mysql &>/dev/null
 
   if [[ "$(vercmp $2 5.5.25-4)" -lt 0 ]] && [[ -d /data ]]; then
     for x in data/*; do
-      cp -r $x var/lib/mysql/
+      cp -r $x $datadir/
     done
     rm -rf data
   fi
@@ -38,10 +36,9 @@ post_upgrade(){
 post_remove(){
   if getent passwd mysql >/dev/null 2>&1; then
     userdel mysql
+
   fi
   if getent group mysql >/dev/null 2>&1; then
     groupdel mysql
   fi
 }
-
-# vim:set ts=2 sw=2 et:
diff --git a/community/mariadb/mariadb.service b/community/mariadb/mariadb.service
new file mode 100644
index 000000000..dd65511d7
--- /dev/null
+++ b/community/mariadb/mariadb.service
@@ -0,0 +1,16 @@
+[Unit]
+Description=MariaDB database server
+After=syslog.target
+
+[Service]
+User=mysql
+Group=mysql
+
+ExecStart=/usr/bin/mysqld --pid-file=/run/mysqld/mysqld.pid 
+ExecStartPost=/usr/bin/mysqld-post
+
+Restart=always
+PrivateTmp=true
+
+[Install]
+WantedBy=multi-user.target
diff --git a/community/mariadb/rc.d b/community/mariadb/rc.d
deleted file mode 100755
index e9fe8f5a8..000000000
--- a/community/mariadb/rc.d
+++ /dev/null
@@ -1,77 +0,0 @@
-#!/bin/bash
-
-# general config
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-getPID() {
-   echo $(pgrep -u mysql mysqld 2>/dev/null);
-}
-
-case "$1" in
-  start)
-    stat_busy "Starting MariaDB Server"
-    [ ! -d /var/run/mysqld ] && install -d -g mysql -o mysql /var/run/mysqld &>/dev/null
-    if [ -z "$(getPID)" ]; then
-       /usr/bin/mysqld_safe --user=mysql &>/dev/null &
-      if [ $? -gt 0 ]; then
-        stat_fail
-        exit 1
-      else
-        timeo=30
-        while [ $timeo -gt 0 ]; do
-          response=`/usr/bin/mysqladmin -uUNKNOWN_USER ping 2>&1` && break
-          echo "$response" | grep -q "mysqld is alive" && break
-          sleep 1
-          let timeo=${timeo}-1
-        done
-        if [ $timeo -eq 0 ]; then
-          stat_fail
-          exit 1
-        else
-          echo $(getPID) > /var/run/mysqld/mysqld.pid
-          add_daemon mysqld
-          stat_done
-        fi
-      fi
-    else
-      stat_fail
-      exit 1
-    fi
-    ;;
-
-  stop)
-    stat_busy "Stopping MariaDB Server"
-    if [ ! -z "$(getPID)" ]; then
-      timeo=30
-      kill $(getPID) &> /dev/null
-      if [ $? -gt 0 ]; then
-        stat_fail
-        exit 1
-      fi
-      while [ ! -z "$(getPID)" -a $timeo -gt 0 ]; do
-        sleep 1
-        let timeo=${timeo}-1
-      done
-      if [ -z "$(getPID)" ]; then
-        rm -f /var/run/mysqld/mysqld.pid &>/dev/null
-        rm_daemon mysqld
-        stat_done
-      else
-        stat_fail
-        exit 1
-      fi
-    else
-      stat_fail
-      exit 1
-    fi
-    ;;
-
-  restart)
-    $0 stop
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/community/mariadb/service b/community/mariadb/service
deleted file mode 100644
index 1b3a50082..000000000
--- a/community/mariadb/service
+++ /dev/null
@@ -1,21 +0,0 @@
-[Unit]
-Description=MariaDB database server
-After=syslog.target network.target
-
-[Service]
-User=mysql
-Group=mysql
-
-ExecStart=/usr/bin/mysqld --pid-file=/var/run/mysqld/mysqld.pid
-ExecStop=/bin/kill -15 $MAINPID
-PIDFile=/var/run/mysqld/mysqld.pid
-WorkingDirectory=/usr
-
-# We rely on systemd, not mysqld_safe, to restart mysqld if it dies
-Restart=always
-
-# Place temp files in a secure directory, not /tmp
-PrivateTmp=true
-
-[Install]
-WantedBy=multi-user.target
diff --git a/community/mariadb/tmpfiles.conf b/community/mariadb/tmpfiles.conf
deleted file mode 100644
index 74cd5f836..000000000
--- a/community/mariadb/tmpfiles.conf
+++ /dev/null
@@ -1 +0,0 @@
-d /var/run/mysqld 0755 mysql mysql -
diff --git a/community/mixxx/PKGBUILD b/community/mixxx/PKGBUILD
index a24857462..a2905b788 100644
--- a/community/mixxx/PKGBUILD
+++ b/community/mixxx/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 73315 2012-07-06 08:33:12Z lfleischer $
+# $Id: PKGBUILD 85374 2013-03-01 10:35:42Z andrea $
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: Ali H. Caliskan <ali.h.caliskan AT gmail DOT com>
 # Contributor: Ryan Coyner <rcoyner@gmail.com>
@@ -6,23 +6,23 @@
 
 pkgname=mixxx
 pkgver=1.10.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Free, open source software for digital DJ'ing."
 arch=('i686' 'x86_64')
 url='http://www.mixxx.org'
 license=('GPL')
 depends=('fftw' 'libid3tag' 'libmad' 'libogg' 'libshout' 'libsndfile' 'portaudio' 'portmidi'
-         'qt>=4.5' 'taglib' 'qtwebkit')
-makedepends=('mesa' 'scons' 'libshout')
+         'taglib' 'qtwebkit')
+makedepends=('mesa' 'scons' 'libshout' 'glu')
 source=("http://downloads.mixxx.org/${pkgname}-${pkgver}/${pkgname}-${pkgver}-src.tar.gz")
 md5sums=('765bc5216ec8102c2186dd3ea80187a9')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  scons qtdir=/usr/lib/qt prefix=/usr install_root="${pkgdir}/usr"
+  scons qtdir=/usr/lib/qt4 prefix=/usr install_root="${pkgdir}/usr"
 }
 
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  scons qtdir=/usr/lib/qt prefix=/usr install_root="${pkgdir}/usr" install
+  scons qtdir=/usr/lib/qt4 prefix=/usr install_root="${pkgdir}/usr" install
 }
diff --git a/community/mlt/PKGBUILD b/community/mlt/PKGBUILD
index 29a7f0241..26d844ca8 100644
--- a/community/mlt/PKGBUILD
+++ b/community/mlt/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 84355 2013-02-16 22:50:33Z ioni $
+# $Id: PKGBUILD 85375 2013-03-01 10:35:52Z andrea $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Fabian Schoelzel <myfirstname.mylastname@googlemail.com>
 # Contributor: funkyou <spamopfer@nickname.berlin.de>
@@ -8,12 +8,12 @@
 pkgbase=mlt
 pkgname=('mlt' 'mlt-python-bindings')
 pkgver=0.8.8
-pkgrel=2
+pkgrel=3
 pkgdesc="An open source multimedia framework"
 arch=('i686' 'x86_64')
 url="http://www.mltframework.org"
 license=('GPL')
-makedepends=('sdl_image' 'libsamplerate' 'libdv' 'qt' 'sox' 'libxml2' 'gtk2' 'ffmpeg'
+makedepends=('sdl_image' 'libsamplerate' 'libdv' 'qt4' 'sox' 'libxml2' 'gtk2' 'ffmpeg'
 	     'frei0r-plugins' 'swig' 'python2' "jack" "ladspa")
 source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz
 	ffmpeg.patch)
@@ -31,7 +31,7 @@ build() {
 
   msg "SSE2=$SSE2"
   ./configure --prefix=/usr --enable-gpl --enable-gpl3 \
-	--qimage-libdir=/usr/lib/ --qimage-includedir=/usr/include/Qt \
+	--qimage-libdir=/usr/lib/ --qimage-includedir=/usr/include/qt4 \
 	--avformat-vdpau \
 	--avformat-swscale $SSE2
   make
@@ -46,7 +46,7 @@ build() {
 
 package_mlt() {
   depends=('sdl_image' 'libsamplerate' 'libdv' 'sox' 'libxml2' 'ffmpeg' 'frei0r-plugins')
-  optdepends=('jack' 'libexif' 'qt' 'gtk2' "ladspa")
+  optdepends=('jack' 'libexif' 'qt4' 'gtk2' "ladspa")
   conflicts=('mlt++<=0.3.8')
 
   cd "$srcdir/mlt-$pkgver"
diff --git a/community/mosh/PKGBUILD b/community/mosh/PKGBUILD
index 2eb5998c4..51e4d2781 100644
--- a/community/mosh/PKGBUILD
+++ b/community/mosh/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=mosh
 pkgver=1.2.3
-pkgrel=3
+pkgrel=4
 pkgdesc='Mobile shell, surviving disconnects with local echo and line editing'
 arch=('x86_64' 'i686')
 url='http://mosh.mit.edu/'
diff --git a/community/mumble/PKGBUILD b/community/mumble/PKGBUILD
index c14554706..9e909572d 100644
--- a/community/mumble/PKGBUILD
+++ b/community/mumble/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 64801 2012-02-18 06:36:47Z svenstaro $
+# $Id: PKGBUILD 85446 2013-03-01 18:21:21Z svenstaro $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Lauri Niskanen <ape@ape3000.com>
 # Contributor: Sebastian.Salich@gmx.de
@@ -9,26 +9,24 @@
 
 pkgname=mumble
 pkgver=1.2.3
-pkgrel=5
+pkgrel=7
 arch=('i686' 'x86_64')
 pkgdesc="A voice chat application similar to TeamSpeak"
-license=('GPL')
-depends=('qt' 'speex' 'lsb-release' 'libxi' 'avahi' 'libsndfile' 'protobuf' 'libpulse')
+license=('BSD')
+depends=('qt4' 'speex' 'lsb-release' 'libxi' 'avahi' 'libsndfile' 'protobuf' 'libpulse')
 makedepends=('boost' 'mesa' 'avahi')
 #optdepends=('portaudio: for portaudio back-end' 'g15daemon: G15 Keyboard support')
 options=('!libtool') 
 install=mumble.install
 url="http://mumble.sourceforge.net/"
-source=("http://downloads.sourceforge.net/mumble/$pkgname-$pkgver.tar.gz" \
-  mumble11x.desktop )
-md5sums=('55804e3dfe98b16eeb40abca6c254625'
-         '70dcaa8ad2ecf68c6ba52ea03d112bcd')
+source=("http://downloads.sourceforge.net/mumble/$pkgname-$pkgver.tar.gz")
+md5sums=('55804e3dfe98b16eeb40abca6c254625')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
 
   # Building mumble
-  /usr/bin/qmake main.pro \
+  qmake main.pro \
     CONFIG+="bundled-celt no-bundled-speex no-speechd no-g15 no-xevie no-server \
     no-embed-qt-translations no-update packaged" \
     DEFINES+="PLUGIN_PATH=/usr/lib/mumble"
@@ -40,7 +38,6 @@ package() {
 
   # bin stuff
   install -m755 -D ./release/mumble $pkgdir/usr/bin/mumble
-  install -m755 -D ./release/mumble11x $pkgdir/usr/bin/mumble11x
   install -m755 -D ./scripts/mumble-overlay $pkgdir/usr/bin/mumble-overlay
 
   # lib stuff
@@ -54,7 +51,6 @@ package() {
 
   # other stuff
   install -m644 -D ./scripts/mumble.desktop $pkgdir/usr/share/applications/mumble.desktop
-  install -m644 -D $srcdir/mumble11x.desktop $pkgdir/usr/share/applications/mumble11x.desktop
   install -m755 -d $pkgdir/usr/share/man/man1
   install -m644 -D ./man/mum* $pkgdir/usr/share/man/man1/
   install -m644 -D ./icons/mumble.svg $pkgdir/usr/share/icons/hicolor/scalable/apps/mumble.svg
diff --git a/community/murmur/PKGBUILD b/community/murmur/PKGBUILD
index cc4de1481..7c8a519ea 100644
--- a/community/murmur/PKGBUILD
+++ b/community/murmur/PKGBUILD
@@ -1,18 +1,17 @@
-# $Id: PKGBUILD 81777 2012-12-29 07:18:42Z svenstaro $
+# $Id: PKGBUILD 85450 2013-03-01 18:26:17Z svenstaro $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Otto Allmendinger <otto.allmendinger@googlemail.com>
 # Contributor: Malte Rabenseifner <malte@zearan.de> 
 
 pkgname=murmur
 pkgver=1.2.3
-pkgrel=9
+pkgrel=11
 pkgdesc="The voice chat application server for Mumble"
 arch=('i686' 'x86_64')
 url="http://mumble.sourceforge.net"
-license=('GPL')
-depends=('avahi' 'lsb-release' 'protobuf' 'qt' 'icu')
+license=('BSD')
+depends=('avahi' 'lsb-release' 'protobuf' 'qt4' 'icu')
 makedepends=('boost')
-conflicts=('murmur-ice' 'murmur-static' 'murmur-git')
 backup=("etc/murmur.ini"
         "etc/logrotate.d/murmur"
         "etc/conf.d/murmur" )
diff --git a/community/openimageio/PKGBUILD b/community/openimageio/PKGBUILD
index 79422ba20..c9a74bf78 100644
--- a/community/openimageio/PKGBUILD
+++ b/community/openimageio/PKGBUILD
@@ -1,34 +1,34 @@
-# $Id: PKGBUILD 83263 2013-01-28 16:49:50Z stephane $
+# $Id: PKGBUILD 85378 2013-03-01 10:36:19Z andrea $
 # Contributor: SpepS <dreamspepser at yahoo dot it>
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 
 pkgname=openimageio
-pkgver=1.1.2
+pkgver=1.1.7
 pkgrel=2
-pkgdesc="A library for reading and writing images, including classes, utilities, and applications."
+pkgdesc="A library for reading and writing images, including classes, utilities, and applications"
 arch=(i686 x86_64)
 url="http://www.openimageio.org/"
 license=('custom')
-depends=('openexr' 'boost-libs' 'jasper' 'glew')
-makedepends=('cmake' 'qt' 'python2' 'boost' 'mesa')
-optdepends=('qt: iv image viewer'
+depends=('openexr' 'boost-libs' 'jasper' 'glew' 'libtiff' 'opencolorio' 'intel-tbb')
+makedepends=('cmake' 'qt4' 'python2' 'boost' 'mesa')
+optdepends=('qt4: iv image viewer'
             'python2: bindings support')
-source=(https://github.com/OpenImageIO/oiio/tarball/Release-$pkgver
-        fix32bit-fail.patch)
-md5sums=('8a5fd88f87fbf1826a4782041cf9e7d0'
-         '64403604d0b74bd6c50fe8638207116a')
+source=(https://github.com/OpenImageIO/oiio/tarball/Release-$pkgver)
+md5sums=('5fafac9b5f9f7edc9bd0507477c12e0d')
 
 build() {
   cd "$srcdir"/$_pkgname*
 
-  patch -Np1 < $srcdir/fix32bit-fail.patch
-
   cd src
 
   [[ -d build ]] && rm -r build
   mkdir build && cd build
 
-  cmake -DCMAKE_INSTALL_PREFIX=/usr -DPYLIB_INSTALL_DIR=lib/python2.7/site-packages ..
+  cmake \
+      -DCMAKE_INSTALL_PREFIX=/usr \
+      -DPYLIB_INSTALL_DIR=lib/python2.7/site-packages \
+      -DUSE_EXTERNAL_TBB=ON \
+      ..
   make
 }
 
diff --git a/community/openscenegraph/PKGBUILD b/community/openscenegraph/PKGBUILD
index a4626f38c..8feb63055 100644
--- a/community/openscenegraph/PKGBUILD
+++ b/community/openscenegraph/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 84360 2013-02-16 22:50:38Z ioni $
+# $Id: PKGBUILD 85379 2013-03-01 10:36:28Z andrea $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Hans Janssen <janserv@gmail.com>
 # Contributor: my64 <packages@obordes.com>
@@ -6,14 +6,14 @@
 
 pkgname=openscenegraph
 pkgver=3.0.1
-pkgrel=8
+pkgrel=9
 pkgdesc="An Open Source, high performance real-time graphics toolkit"
 arch=('i686' 'x86_64')
 license=('custom:OSGPL')
 url="http://www.openscenegraph.org"
 depends=('giflib' 'jasper' 'librsvg' 'xine-lib' 'curl' 'pth')
-makedepends=('cmake' 'libvncserver' 'qt' 'ffmpeg-compat' 'mesa')
-optdepends=('libvncserver' 'gdal' 'openexr' 'poppler-glib' 'qt')
+makedepends=('cmake' 'libvncserver' 'qt4' 'ffmpeg-compat' 'mesa')
+optdepends=('libvncserver' 'gdal' 'openexr' 'poppler-glib' 'qt4')
 conflicts=('openthreads')
 provides=('openthreads')
 source=(http://www.openscenegraph.org/downloads/stable_releases/OpenSceneGraph-$pkgver/source/OpenSceneGraph-$pkgver.zip
diff --git a/community/openssh-askpass/PKGBUILD b/community/openssh-askpass/PKGBUILD
index 85bf47ff6..423f36f6b 100644
--- a/community/openssh-askpass/PKGBUILD
+++ b/community/openssh-askpass/PKGBUILD
@@ -4,12 +4,12 @@
 
 pkgname=openssh-askpass
 pkgver=1.3.6
-pkgrel=1
+pkgrel=2
 pkgdesc='A plasma-like passphrase dialog for ssh'
 arch=('i686' 'x86_64')
 url='http://www.phenix.bnl.gov/WWW/publish/hpereira/software/index.php?page=package&package_list=software_list_qt4&package=openssh-askpass&full=1'
 license=('GPL')
-depends=('openssh' 'qt')
+depends=('openssh' 'qt4')
 makedepends=('cmake')
 provides=('x11-ssh-askpass')
 conflicts=('x11-ssh-askpass')
@@ -25,6 +25,7 @@ build() {
   cmake -DCMAKE_INSTALL_PREFIX="/usr" ..
   make
 }
+
 package() {
   cd "$srcdir/$pkgname-$pkgver/build"
   make DESTDIR="$pkgdir" install
diff --git a/community/oprofile/PKGBUILD b/community/oprofile/PKGBUILD
index 941c438b1..3491127be 100644
--- a/community/oprofile/PKGBUILD
+++ b/community/oprofile/PKGBUILD
@@ -1,22 +1,24 @@
-# $Id: PKGBUILD 83066 2013-01-27 09:59:19Z andrea $
+# $Id: PKGBUILD 85381 2013-03-01 10:36:45Z andrea $
 # Maintainer : Aaron Griffin <aaron@archlinux.org>
 
 pkgname=oprofile
 pkgver=0.9.8
-pkgrel=1
-pkgdesc="A system-wide profiler for Linux systems, capable of profiling all running code at low overhead"
+pkgrel=2
+pkgdesc='System-wide profiler for Linux systems'
 arch=('i686' 'x86_64')
 url="http://oprofile.sourceforge.net"
 license=('GPL')
 depends=('popt' 'gcc-libs' 'zlib' 'sh')
-makedepends=('qt')
-optdepends=('qt: for oprof_start gui')
+makedepends=('qt4')
+optdepends=('qt4: for oprof_start gui')
 options=('!libtool')
 install=oprofile.install
 source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz)
 sha1sums=('28416b853641f913e5f90954f2e3837efd96f6cd')
 
 build() {
+  . /etc/profile.d/qt4.sh
+
   cd "$srcdir/$pkgname-$pkgver"
   ./configure --prefix=/usr --with-kernel-support --with-x --enable-gui=qt4
   make
diff --git a/community/packagekit/PKGBUILD b/community/packagekit/PKGBUILD
index f00c83929..be6935348 100644
--- a/community/packagekit/PKGBUILD
+++ b/community/packagekit/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 75406 2012-08-22 08:09:42Z jconder $
+# $Id: PKGBUILD 85382 2013-03-01 10:36:54Z andrea $
 # Maintainer: Jonathan Conder <jonno.conder@gmail.com>
 pkgbase='packagekit'
 pkgname=('packagekit' 'packagekit-qt2' 'packagekit-python')
 pkgver=0.7.6
-pkgrel=2
+pkgrel=3
 pkgdesc="A system designed to make installation and updates of packages easier."
 arch=('i686' 'x86_64')
 url="http://www.packagekit.org"
 license=('GPL')
 makedepends=('dbus-glib' 'gobject-introspection' 'gtk-doc' 'intltool'
-             'networkmanager' 'pacman'  'pm-utils' 'polkit' 'python2' 'qt'
+             'networkmanager' 'pacman'  'pm-utils' 'polkit' 'python2' 'qt4'
              'shared-mime-info' 'sqlite' 'udev')
 options=('!libtool')
 source=("http://www.packagekit.org/releases/PackageKit-$pkgver.tar.xz"
@@ -78,7 +78,7 @@ package_packagekit() {
 }
 
 package_packagekit-qt2() {
-  depends=('packagekit' 'qt')
+  depends=('packagekit' 'qt4')
   pkgdesc=('Qt bindings for PackageKit')
 
   cd "$srcdir/PackageKit-$pkgver/lib/packagekit-qt2"
diff --git a/community/pokerth/PKGBUILD b/community/pokerth/PKGBUILD
index 8486b81fb..d9b83a43a 100644
--- a/community/pokerth/PKGBUILD
+++ b/community/pokerth/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 83269 2013-01-28 16:49:59Z stephane $
+# $Id: PKGBUILD 85448 2013-03-01 18:25:07Z svenstaro $
 # Maintainer:  Mateusz Herych <heniekk@gmail.com>
 # Maintainer:  Bartłomiej Piotrowski <barthalion@gmail.com>
 # Contributor: Vasco Costa <vasco.costa@meiodigital.com>
@@ -6,13 +6,13 @@
 pkgname=pokerth
 _realname=PokerTH
 pkgver=1.0
-pkgrel=2
+pkgrel=4
 pkgdesc="Poker game written in C++/QT4"
 arch=('i686' 'x86_64')
 url="http://www.pokerth.net/"
 license=('GPL' 'custom')
 depends=('curl' 'boost-libs' 'gsasl' 'gnutls' 'protobuf'
-         'qt' 'sdl_mixer' 'libircclient' 'tinyxml')
+         'qt4' 'sdl_mixer' 'libircclient' 'tinyxml')
 makedepends=('boost')
 source=(http://downloads.sourceforge.net/sourceforge/pokerth/$_realname-$pkgver-src.tar.bz2)
 md5sums=('1d8686b8968475cfc76e873a17a53efc')
diff --git a/community/projectm/PKGBUILD b/community/projectm/PKGBUILD
index e11903364..45f08ddea 100644
--- a/community/projectm/PKGBUILD
+++ b/community/projectm/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 84566 2013-02-19 22:29:25Z arodseth $
+# $Id: PKGBUILD 85384 2013-03-01 10:37:13Z andrea $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: Alexander Baldeck <alexander@archlinux.org>
@@ -7,11 +7,11 @@
 pkgbase=projectm
 pkgname=('projectm' 'projectm-libvisual' 'projectm-pulseaudio' 'projectm-qt' 'projectm-test')
 pkgver=2.1.0
-pkgrel=3
+pkgrel=4
 arch=('x86_64' 'i686')
 url='http://projectm.sourceforge.net/'
 license=('LGPL')
-makedepends=('mesa' 'qt' 'cmake' 'ftgl' 'glew' 'gtkglext' 'libvisual' 'sdl' 'libxext' 'pulseaudio')
+makedepends=('mesa-libgl' 'qt4' 'cmake' 'ftgl' 'glew' 'gtkglext' 'libvisual' 'sdl' 'libxext' 'pulseaudio')
 source=("http://downloads.sourceforge.net/$pkgname/projectM-complete-$pkgver-Source.tar.gz"
         'projectm-test-opengl.patch'
         'projectm-install-vera-ttf.patch')
@@ -38,7 +38,7 @@ build() {
 
 package_projectm() {
   pkgdesc='Music visualizer which uses 3D accelerated iterative image based rendering'
-  depends=('ftgl' 'glew')
+  depends=('ftgl' 'glew' 'libgl')
 
   cd "$srcdir/build"
   
@@ -49,7 +49,7 @@ package_projectm() {
 
 package_projectm-libvisual() {
   pkgdesc='ProjectM plugin for XMMS'
-  depends=('projectm' 'libvisual')
+  depends=('projectm' 'libvisual' 'gcc-libs')
   
   cd "$srcdir/build/src/projectM-libvisual"
   make DESTDIR="$pkgdir" install
@@ -57,7 +57,7 @@ package_projectm-libvisual() {
 
 package_projectm-pulseaudio() {
   pkgdesc='ProjectM support for Pulseaudio'
-  depends=('projectm' 'projectm-qt' 'pulseaudio')
+  depends=('projectm-qt' 'pulseaudio')
   
   cd "$srcdir/build/src/projectM-pulseaudio"
   make DESTDIR="$pkgdir" install
@@ -65,7 +65,7 @@ package_projectm-pulseaudio() {
 
 package_projectm-qt() {
   pkgdesc='Qt bindings for ProjectM'
-  depends=('projectm' 'qt')
+  depends=('projectm' 'qt4' 'libgl')
   
   cd "$srcdir/build/src/projectM-qt"
   make DESTDIR="$pkgdir" install
@@ -73,7 +73,7 @@ package_projectm-qt() {
 
 package_projectm-test() {
   pkgdesc='ProjectM test applications'
-  depends=('projectm' 'sdl')
+  depends=('projectm' 'sdl' 'libgl')
   
   cd "$srcdir/build/src/projectM-test"
   make DESTDIR="$pkgdir" install
diff --git a/community/protobuf/PKGBUILD b/community/protobuf/PKGBUILD
index 860fe5a06..151c95412 100644
--- a/community/protobuf/PKGBUILD
+++ b/community/protobuf/PKGBUILD
@@ -1,11 +1,12 @@
-# Maintainer: Thomas S Hatch <thatch45@gmail.com>
+# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
+# Contributor: Thomas S Hatch <thatch45@gmail.com>
 # Contributor: Geoffroy Carrier <geoffroy@archlinux.org>
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgbase=protobuf
 pkgname=('protobuf' 'protobuf-python')
-pkgver=2.4.1
-pkgrel=2
+pkgver=2.5.0
+pkgrel=1
 pkgdesc="A way of encoding structured data in an efficient yet extensible format"
 arch=('i686' 'x86_64')
 url="http://code.google.com/p/protobuf/"
@@ -14,7 +15,7 @@ depends=('gcc-libs' 'zlib')
 makedepends=('python2' 'setuptools')
 options=(!libtool)
 source=(http://$pkgname.googlecode.com/files/$pkgname-$pkgver.tar.bz2)
-md5sums=('ed436802019c9e1f40cc750eaf78f318')
+md5sums=('a72001a9067a4c2c4e0e836d0f92ece4')
 
 build() {
 	cd $srcdir/$pkgname-$pkgver
diff --git a/community/psimedia/PKGBUILD b/community/psimedia/PKGBUILD
index 32989ea03..df2457f63 100644
--- a/community/psimedia/PKGBUILD
+++ b/community/psimedia/PKGBUILD
@@ -1,33 +1,36 @@
-# $Id: PKGBUILD 66171 2012-02-23 02:29:02Z spupykin $
+# $Id: PKGBUILD 85385 2013-03-01 10:37:22Z andrea $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Vladimir Kutyavin <vlkut-at-bk-dot-ru>
 
 pkgname=psimedia
 pkgver=1.0.3
-pkgrel=8
+pkgrel=9
 pkgdesc="Voice and video chat plugin for Psi-like IM clients.  The implementation is based on GStreamer."
 arch=('i686' 'x86_64')
 license=('GPL2')
 url="http://delta.affinix.com/psimedia/"
-depends=('psi' 'speex' 'gstreamer0.10-base' 'qt' 'gstreamer0.10-good-plugins'
+depends=('psi' 'speex' 'gstreamer0.10-base' 'qt4' 'gstreamer0.10-good-plugins'
 	 'liboil')
-makedepends=('pkgconfig')
-source=(http://delta.affinix.com/download/psimedia/$pkgname-$pkgver.tar.bz2
-	videodev.h
-	psimedia-svn20110621.diff.gz)
-md5sums=('1be71c37d71c655ffc2c53cf86c77a7a'
-         '427e5832466726a86e5b55b1329d2e9e'
-         'b571639d854c90c758f40a44054c6e06')
+makedepends=('pkgconfig' 'gdb')
+source=($pkgname-$pkgver.tar.gz::https://github.com/psi-im/psimedia/archive/master.tar.gz)
+md5sums=('d12fdf60fd71ffba597dd22f5c8481cf')
 
 build() {
-  cd $srcdir/$pkgname-$pkgver
-  patch -p1 <$srcdir/psimedia-svn20110621.diff
-  sed -i 's|# include <linux/videodev.h>|# include "../../../videodev.h"|' gstprovider/deviceenum/deviceenum_unix.cpp
-  ./configure
+  cd $srcdir/$pkgname-master
+
+  cat >>gstprovider/gstconf.pri <<EOF
+	INCLUDEPATH += \
+		/usr/include/gstreamer-0.10 \
+		/usr/include/glib-2.0 \
+		/usr/lib/glib-2.0/include \
+		/usr/include/libxml2
+EOF
+
+  qmake
   make
 }
 
 package() {
-  cd $srcdir/$pkgname-$pkgver
-  install -D -m644 ${srcdir}/$pkgname-$pkgver/gstprovider/libgstprovider.so ${pkgdir}/usr/lib/psi/plugins/libgstprovider.so
+  cd $srcdir/$pkgname-master
+  install -D -m644 ${srcdir}/$pkgname-master/gstprovider/libgstprovider.so ${pkgdir}/usr/lib/psi/plugins/libgstprovider.so
 }
diff --git a/community/psimedia/psimedia-svn20110621.diff.gz b/community/psimedia/psimedia-svn20110621.diff.gz
deleted file mode 100644
index aeb969794..000000000
--- a/community/psimedia/psimedia-svn20110621.diff.gz
+++ /dev/null
diff --git a/community/psimedia/videodev.h b/community/psimedia/videodev.h
deleted file mode 100644
index c51a5f9cb..000000000
--- a/community/psimedia/videodev.h
+++ /dev/null
@@ -1,320 +0,0 @@
-/*
- *	Video for Linux version 1 - OBSOLETE
- *
- *	Header file for v4l1 drivers and applications, for
- *	Linux kernels 2.2.x or 2.4.x.
- *
- *	Provides header for legacy drivers and applications
- *
- *	See http://linuxtv.org for more info
- *
- */
-#ifndef __LINUX_VIDEODEV_H
-#define __LINUX_VIDEODEV_H
-
-#include <linux/types.h>
-#include <linux/ioctl.h>
-#include <linux/videodev2.h>
-
-
-#define VID_TYPE_CAPTURE	1	/* Can capture */
-#define VID_TYPE_TUNER		2	/* Can tune */
-#define VID_TYPE_TELETEXT	4	/* Does teletext */
-#define VID_TYPE_OVERLAY	8	/* Overlay onto frame buffer */
-#define VID_TYPE_CHROMAKEY	16	/* Overlay by chromakey */
-#define VID_TYPE_CLIPPING	32	/* Can clip */
-#define VID_TYPE_FRAMERAM	64	/* Uses the frame buffer memory */
-#define VID_TYPE_SCALES		128	/* Scalable */
-#define VID_TYPE_MONOCHROME	256	/* Monochrome only */
-#define VID_TYPE_SUBCAPTURE	512	/* Can capture subareas of the image */
-#define VID_TYPE_MPEG_DECODER	1024	/* Can decode MPEG streams */
-#define VID_TYPE_MPEG_ENCODER	2048	/* Can encode MPEG streams */
-#define VID_TYPE_MJPEG_DECODER	4096	/* Can decode MJPEG streams */
-#define VID_TYPE_MJPEG_ENCODER	8192	/* Can encode MJPEG streams */
-
-struct video_capability
-{
-	char name[32];
-	int type;
-	int channels;	/* Num channels */
-	int audios;	/* Num audio devices */
-	int maxwidth;	/* Supported width */
-	int maxheight;	/* And height */
-	int minwidth;	/* Supported width */
-	int minheight;	/* And height */
-};
-
-
-struct video_channel
-{
-	int channel;
-	char name[32];
-	int tuners;
-	__u32  flags;
-#define VIDEO_VC_TUNER		1	/* Channel has a tuner */
-#define VIDEO_VC_AUDIO		2	/* Channel has audio */
-	__u16  type;
-#define VIDEO_TYPE_TV		1
-#define VIDEO_TYPE_CAMERA	2
-	__u16 norm;			/* Norm set by channel */
-};
-
-struct video_tuner
-{
-	int tuner;
-	char name[32];
-	unsigned long rangelow, rangehigh;	/* Tuner range */
-	__u32 flags;
-#define VIDEO_TUNER_PAL		1
-#define VIDEO_TUNER_NTSC	2
-#define VIDEO_TUNER_SECAM	4
-#define VIDEO_TUNER_LOW		8	/* Uses KHz not MHz */
-#define VIDEO_TUNER_NORM	16	/* Tuner can set norm */
-#define VIDEO_TUNER_STEREO_ON	128	/* Tuner is seeing stereo */
-#define VIDEO_TUNER_RDS_ON      256     /* Tuner is seeing an RDS datastream */
-#define VIDEO_TUNER_MBS_ON      512     /* Tuner is seeing an MBS datastream */
-	__u16 mode;			/* PAL/NTSC/SECAM/OTHER */
-#define VIDEO_MODE_PAL		0
-#define VIDEO_MODE_NTSC		1
-#define VIDEO_MODE_SECAM	2
-#define VIDEO_MODE_AUTO		3
-	__u16 signal;			/* Signal strength 16bit scale */
-};
-
-struct video_picture
-{
-	__u16	brightness;
-	__u16	hue;
-	__u16	colour;
-	__u16	contrast;
-	__u16	whiteness;	/* Black and white only */
-	__u16	depth;		/* Capture depth */
-	__u16   palette;	/* Palette in use */
-#define VIDEO_PALETTE_GREY	1	/* Linear greyscale */
-#define VIDEO_PALETTE_HI240	2	/* High 240 cube (BT848) */
-#define VIDEO_PALETTE_RGB565	3	/* 565 16 bit RGB */
-#define VIDEO_PALETTE_RGB24	4	/* 24bit RGB */
-#define VIDEO_PALETTE_RGB32	5	/* 32bit RGB */
-#define VIDEO_PALETTE_RGB555	6	/* 555 15bit RGB */
-#define VIDEO_PALETTE_YUV422	7	/* YUV422 capture */
-#define VIDEO_PALETTE_YUYV	8
-#define VIDEO_PALETTE_UYVY	9	/* The great thing about standards is ... */
-#define VIDEO_PALETTE_YUV420	10
-#define VIDEO_PALETTE_YUV411	11	/* YUV411 capture */
-#define VIDEO_PALETTE_RAW	12	/* RAW capture (BT848) */
-#define VIDEO_PALETTE_YUV422P	13	/* YUV 4:2:2 Planar */
-#define VIDEO_PALETTE_YUV411P	14	/* YUV 4:1:1 Planar */
-#define VIDEO_PALETTE_YUV420P	15	/* YUV 4:2:0 Planar */
-#define VIDEO_PALETTE_YUV410P	16	/* YUV 4:1:0 Planar */
-#define VIDEO_PALETTE_PLANAR	13	/* start of planar entries */
-#define VIDEO_PALETTE_COMPONENT 7	/* start of component entries */
-};
-
-struct video_audio
-{
-	int	audio;		/* Audio channel */
-	__u16	volume;		/* If settable */
-	__u16	bass, treble;
-	__u32	flags;
-#define VIDEO_AUDIO_MUTE	1
-#define VIDEO_AUDIO_MUTABLE	2
-#define VIDEO_AUDIO_VOLUME	4
-#define VIDEO_AUDIO_BASS	8
-#define VIDEO_AUDIO_TREBLE	16
-#define VIDEO_AUDIO_BALANCE	32
-	char    name[16];
-#define VIDEO_SOUND_MONO	1
-#define VIDEO_SOUND_STEREO	2
-#define VIDEO_SOUND_LANG1	4
-#define VIDEO_SOUND_LANG2	8
-	__u16   mode;
-	__u16	balance;	/* Stereo balance */
-	__u16	step;		/* Step actual volume uses */
-};
-
-struct video_clip
-{
-	__s32	x,y;
-	__s32	width, height;
-	struct	video_clip *next;	/* For user use/driver use only */
-};
-
-struct video_window
-{
-	__u32	x,y;			/* Position of window */
-	__u32	width,height;		/* Its size */
-	__u32	chromakey;
-	__u32	flags;
-	struct	video_clip *clips;	/* Set only */
-	int	clipcount;
-#define VIDEO_WINDOW_INTERLACE	1
-#define VIDEO_WINDOW_CHROMAKEY	16	/* Overlay by chromakey */
-#define VIDEO_CLIP_BITMAP	-1
-/* bitmap is 1024x625, a '1' bit represents a clipped pixel */
-#define VIDEO_CLIPMAP_SIZE	(128 * 625)
-};
-
-struct video_capture
-{
-	__u32 	x,y;			/* Offsets into image */
-	__u32	width, height;		/* Area to capture */
-	__u16	decimation;		/* Decimation divider */
-	__u16	flags;			/* Flags for capture */
-#define VIDEO_CAPTURE_ODD		0	/* Temporal */
-#define VIDEO_CAPTURE_EVEN		1
-};
-
-struct video_buffer
-{
-	void	*base;
-	int	height,width;
-	int	depth;
-	int	bytesperline;
-};
-
-struct video_mmap
-{
-	unsigned	int frame;		/* Frame (0 - n) for double buffer */
-	int		height,width;
-	unsigned	int format;		/* should be VIDEO_PALETTE_* */
-};
-
-struct video_key
-{
-	__u8	key[8];
-	__u32	flags;
-};
-
-struct video_mbuf
-{
-	int	size;		/* Total memory to map */
-	int	frames;		/* Frames */
-	int	offsets[VIDEO_MAX_FRAME];
-};
-
-#define 	VIDEO_NO_UNIT	(-1)
-
-struct video_unit
-{
-	int 	video;		/* Video minor */
-	int	vbi;		/* VBI minor */
-	int	radio;		/* Radio minor */
-	int	audio;		/* Audio minor */
-	int	teletext;	/* Teletext minor */
-};
-
-struct vbi_format {
-	__u32	sampling_rate;	/* in Hz */
-	__u32	samples_per_line;
-	__u32	sample_format;	/* VIDEO_PALETTE_RAW only (1 byte) */
-	__s32	start[2];	/* starting line for each frame */
-	__u32	count[2];	/* count of lines for each frame */
-	__u32	flags;
-#define	VBI_UNSYNC	1	/* can distingues between top/bottom field */
-#define	VBI_INTERLACED	2	/* lines are interlaced */
-};
-
-/* video_info is biased towards hardware mpeg encode/decode */
-/* but it could apply generically to any hardware compressor/decompressor */
-struct video_info
-{
-	__u32	frame_count;	/* frames output since decode/encode began */
-	__u32	h_size;		/* current unscaled horizontal size */
-	__u32	v_size;		/* current unscaled veritcal size */
-	__u32	smpte_timecode;	/* current SMPTE timecode (for current GOP) */
-	__u32	picture_type;	/* current picture type */
-	__u32	temporal_reference;	/* current temporal reference */
-	__u8	user_data[256];	/* user data last found in compressed stream */
-	/* user_data[0] contains user data flags, user_data[1] has count */
-};
-
-/* generic structure for setting playback modes */
-struct video_play_mode
-{
-	int	mode;
-	int	p1;
-	int	p2;
-};
-
-/* for loading microcode / fpga programming */
-struct video_code
-{
-	char	loadwhat[16];	/* name or tag of file being passed */
-	int	datasize;
-	__u8	*data;
-};
-
-#define VIDIOCGCAP		_IOR('v',1,struct video_capability)	/* Get capabilities */
-#define VIDIOCGCHAN		_IOWR('v',2,struct video_channel)	/* Get channel info (sources) */
-#define VIDIOCSCHAN		_IOW('v',3,struct video_channel)	/* Set channel 	*/
-#define VIDIOCGTUNER		_IOWR('v',4,struct video_tuner)		/* Get tuner abilities */
-#define VIDIOCSTUNER		_IOW('v',5,struct video_tuner)		/* Tune the tuner for the current channel */
-#define VIDIOCGPICT		_IOR('v',6,struct video_picture)	/* Get picture properties */
-#define VIDIOCSPICT		_IOW('v',7,struct video_picture)	/* Set picture properties */
-#define VIDIOCCAPTURE		_IOW('v',8,int)				/* Start, end capture */
-#define VIDIOCGWIN		_IOR('v',9, struct video_window)	/* Get the video overlay window */
-#define VIDIOCSWIN		_IOW('v',10, struct video_window)	/* Set the video overlay window - passes clip list for hardware smarts , chromakey etc */
-#define VIDIOCGFBUF		_IOR('v',11, struct video_buffer)	/* Get frame buffer */
-#define VIDIOCSFBUF		_IOW('v',12, struct video_buffer)	/* Set frame buffer - root only */
-#define VIDIOCKEY		_IOR('v',13, struct video_key)		/* Video key event - to dev 255 is to all - cuts capture on all DMA windows with this key (0xFFFFFFFF == all) */
-#define VIDIOCGFREQ		_IOR('v',14, unsigned long)		/* Set tuner */
-#define VIDIOCSFREQ		_IOW('v',15, unsigned long)		/* Set tuner */
-#define VIDIOCGAUDIO		_IOR('v',16, struct video_audio)	/* Get audio info */
-#define VIDIOCSAUDIO		_IOW('v',17, struct video_audio)	/* Audio source, mute etc */
-#define VIDIOCSYNC		_IOW('v',18, int)			/* Sync with mmap grabbing */
-#define VIDIOCMCAPTURE		_IOW('v',19, struct video_mmap)		/* Grab frames */
-#define VIDIOCGMBUF		_IOR('v',20, struct video_mbuf)		/* Memory map buffer info */
-#define VIDIOCGUNIT		_IOR('v',21, struct video_unit)		/* Get attached units */
-#define VIDIOCGCAPTURE		_IOR('v',22, struct video_capture)	/* Get subcapture */
-#define VIDIOCSCAPTURE		_IOW('v',23, struct video_capture)	/* Set subcapture */
-#define VIDIOCSPLAYMODE		_IOW('v',24, struct video_play_mode)	/* Set output video mode/feature */
-#define VIDIOCSWRITEMODE	_IOW('v',25, int)			/* Set write mode */
-#define VIDIOCGPLAYINFO		_IOR('v',26, struct video_info)		/* Get current playback info from hardware */
-#define VIDIOCSMICROCODE	_IOW('v',27, struct video_code)		/* Load microcode into hardware */
-#define	VIDIOCGVBIFMT		_IOR('v',28, struct vbi_format)		/* Get VBI information */
-#define	VIDIOCSVBIFMT		_IOW('v',29, struct vbi_format)		/* Set VBI information */
-
-
-#define BASE_VIDIOCPRIVATE	192		/* 192-255 are private */
-
-/* VIDIOCSWRITEMODE */
-#define VID_WRITE_MPEG_AUD		0
-#define VID_WRITE_MPEG_VID		1
-#define VID_WRITE_OSD			2
-#define VID_WRITE_TTX			3
-#define VID_WRITE_CC			4
-#define VID_WRITE_MJPEG			5
-
-/* VIDIOCSPLAYMODE */
-#define VID_PLAY_VID_OUT_MODE		0
-	/* p1: = VIDEO_MODE_PAL, VIDEO_MODE_NTSC, etc ... */
-#define VID_PLAY_GENLOCK		1
-	/* p1: 0 = OFF, 1 = ON */
-	/* p2: GENLOCK FINE DELAY value */
-#define VID_PLAY_NORMAL			2
-#define VID_PLAY_PAUSE			3
-#define VID_PLAY_SINGLE_FRAME		4
-#define VID_PLAY_FAST_FORWARD		5
-#define VID_PLAY_SLOW_MOTION		6
-#define VID_PLAY_IMMEDIATE_NORMAL	7
-#define VID_PLAY_SWITCH_CHANNELS	8
-#define VID_PLAY_FREEZE_FRAME		9
-#define VID_PLAY_STILL_MODE		10
-#define VID_PLAY_MASTER_MODE		11
-	/* p1: see below */
-#define		VID_PLAY_MASTER_NONE	1
-#define		VID_PLAY_MASTER_VIDEO	2
-#define		VID_PLAY_MASTER_AUDIO	3
-#define VID_PLAY_ACTIVE_SCANLINES	12
-	/* p1 = first active; p2 = last active */
-#define VID_PLAY_RESET			13
-#define VID_PLAY_END_MARK		14
-
-
-#endif /* __LINUX_VIDEODEV_H */
-
-/*
- * Local variables:
- * c-basic-offset: 8
- * End:
- */
diff --git a/community/qconf/PKGBUILD b/community/qconf/PKGBUILD
index 771a74430..2b21bc710 100644
--- a/community/qconf/PKGBUILD
+++ b/community/qconf/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 55030 2011-08-31 16:23:53Z spupykin $
+# $Id: PKGBUILD 85387 2013-03-01 10:37:35Z andrea $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: DsTr <kostindima@gmail.com>
 
 pkgname=qconf
 pkgver=1.4
-pkgrel=2
+pkgrel=3
 pkgdesc="QConf allows you to have a nice configure script for your qmake-based project."
 arch=(i686 x86_64)
 url="http://delta.affinix.com/qconf/"
 license=('GPL')
-depends=('qt')
+depends=('qt4')
 makedepends=()
 source=(http://delta.affinix.com/download/qconf-$pkgver.tar.bz2)
 md5sums=(e0080044f88c31e032008d5a5682a112)
@@ -18,5 +18,9 @@ build() {
   cd $srcdir/qconf-$pkgver
   ./configure --prefix=/usr
   make
+}
+
+package() {
+  cd $srcdir/qconf-$pkgver
   make INSTALL_ROOT="$pkgdir" install
 }
diff --git a/community/qgit/PKGBUILD b/community/qgit/PKGBUILD
index 696f3c03b..51376a723 100644
--- a/community/qgit/PKGBUILD
+++ b/community/qgit/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 49264 2011-06-13 14:58:16Z schuay $
+# $Id: PKGBUILD 85388 2013-03-01 10:37:43Z andrea $
 # Maintainer: schuay <jakob.gruber@gmail.com>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Allan McRae <allan@archlinux.org>
@@ -6,12 +6,12 @@
 
 pkgname=qgit
 pkgver=2.3
-pkgrel=3
+pkgrel=4
 pkgdesc="A GIT GUI viewer built on Qt/C++"
 url="http://digilander.libero.it/mcostalba/"
 arch=('i686' 'x86_64')
 license=('GPL')
-depends=('qt' 'git')
+depends=('qt4' 'git')
 source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
         'qgit.desktop' 'qgit.png'
 		'0001-Cause-qgit-to-use-git-config-everywhere.patch')
diff --git a/community/qlandkartegt/PKGBUILD b/community/qlandkartegt/PKGBUILD
index e46a34d6f..227da46c3 100644
--- a/community/qlandkartegt/PKGBUILD
+++ b/community/qlandkartegt/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 80871 2012-12-04 21:32:40Z jlichtblau $
+# $Id: PKGBUILD 85389 2013-03-01 10:37:51Z andrea $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Matthias Maennich <arch@maennich.net>
 # Contributor: <boenki@gmx.de>
 
 pkgname=qlandkartegt
 pkgver=1.6.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Use your GPS with Linux"
 arch=('i686' 'x86_64')
 url="http://www.qlandkarte.org/"
 license=('GPL')
 depends=('gdal' 'gpsd' 'libdmtx' 'libexif' 'libmysqlclient' 'glu' 'postgresql-libs'
-         'qt' 'shared-mime-info' 'qtwebkit')
+         'shared-mime-info' 'qtwebkit')
 makedepends=('cmake' 'garmindev' 'mesa')
 optdepends=('garmindev: to connect garmin devices')
 install=$pkgname.install
diff --git a/community/qmmp/PKGBUILD b/community/qmmp/PKGBUILD
index b56faa08c..808ad62dd 100644
--- a/community/qmmp/PKGBUILD
+++ b/community/qmmp/PKGBUILD
@@ -1,14 +1,14 @@
-#$Id: PKGBUILD 84362 2013-02-16 22:50:40Z ioni $
+#$Id: PKGBUILD 85390 2013-03-01 10:38:00Z andrea $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 
 pkgname=qmmp
 pkgver=0.6.6
-pkgrel=5
+pkgrel=6
 pkgdesc="Qt4 based audio-player"
 arch=('i686' 'x86_64')
 url="http://qmmp.ylsoftware.com/"
 license=('GPL')
-depends=('alsa-lib' 'curl' 'hicolor-icon-theme' 'libmad' 'libvorbis' 'libogg'  'qt' 'taglib' 'xdg-utils')
+depends=('alsa-lib' 'curl' 'hicolor-icon-theme' 'libmad' 'libvorbis' 'libogg'  'qt4' 'taglib' 'xdg-utils')
 makedepends=('cmake' 'flac' 'jack' 'libmpcdec' 'pulseaudio' 'ffmpeg' 'libcdio-paranoia' 'libcddb' 'libmms' 'libsamplerate' 'libmodplug' 'libsndfile' 'wavpack' 'projectm' 'mesa')
 optdepends=('flac: native FLAC support'
             'jack: JACK sound output'
diff --git a/community/qmpdclient/PKGBUILD b/community/qmpdclient/PKGBUILD
index 42a0bf0fc..f5b4eb9b7 100644
--- a/community/qmpdclient/PKGBUILD
+++ b/community/qmpdclient/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 58444 2011-11-12 18:54:25Z andrea $
+# $Id: PKGBUILD 85391 2013-03-01 10:38:10Z andrea $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Vinay S Shastry <vinayshastry@gmail.com>
 
 pkgname=qmpdclient
 pkgver=1.2.2
-pkgrel=2
+pkgrel=3
 pkgdesc="A Qt4 client for MPD"
 arch=('i686' 'x86_64')
 url="http://bitcheese.net/wiki/QMPDClient"
 license=('GPL')
-depends=('qt')
+depends=('qt4')
 makedepends=('cmake')
 install=$pkgname.install
 changelog=$pkgname.changelog
@@ -18,7 +18,7 @@ source=(http://dump.bitcheese.net/files/$pkgname-$pkgver.tar.bz2)
 sha256sums=('ed65705eaae8fb10fdce34ce20e010757a87423c2874479e1466e4368a866289')
 
 build() {
-  cd ${srcdir}
+  cd "${srcdir}"
   mkdir build
   cd build
   cmake ../${pkgname} \
@@ -28,6 +28,6 @@ build() {
 }
 
 package() {
-  cd ${srcdir}/build
-  make DESTDIR=${pkgdir} install
+  cd "${srcdir}/build"
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/community/qps/PKGBUILD b/community/qps/PKGBUILD
index a48057f65..7a634e977 100644
--- a/community/qps/PKGBUILD
+++ b/community/qps/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 60157 2011-12-06 09:22:03Z spupykin $
+# $Id: PKGBUILD 85392 2013-03-01 10:38:18Z andrea $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: David Rosenstrauch <darose@darose.net>
 
 pkgname=qps
 pkgver=1.10.16
 _dlpkgver=5963
-pkgrel=1
+pkgrel=2
 pkgdesc="a visual process manager, an X11 version of 'top' or 'ps'."
 url="http://qps.kldp.net/projects/qps"
-depends=('qt')
+depends=('qt4')
 arch=('i686' 'x86_64')
 license="GPL"
 source=(http://kldp.net/frs/download.php/${_dlpkgver}/qps-$pkgver.tar.bz2)
diff --git a/community/qpxtool/PKGBUILD b/community/qpxtool/PKGBUILD
index 52960f4c5..de838721e 100644
--- a/community/qpxtool/PKGBUILD
+++ b/community/qpxtool/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 81901 2013-01-03 10:05:25Z spupykin $
+# $Id: PKGBUILD 85393 2013-03-01 10:38:26Z andrea $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Krzysztof Stasiorowski <krzysiekst@gmail.com>
 
 pkgname=qpxtool
 pkgver=0.7.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Allows better controll over optical drives to include QChecks and optimization settings."
 arch=('i686' 'x86_64')
 url="http://qpxtool.sourceforge.net/"
 license=('GPL')
-depends=('qt')
+depends=('qt4')
 source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2
 	libpng15.patch)
 md5sums=('b1235e74b8ef4fe087a6b64f5cfca14a'
@@ -23,6 +23,10 @@ build() {
   patch -p1 <$srcdir/libpng15.patch
   ./configure --prefix=/usr
   make
+}
+
+package() {
+  cd $srcdir/$pkgname-$pkgver
   mkdir -p $pkgdir/usr/bin
   make DESTDIR=$pkgdir install
 }
diff --git a/community/qstardict/PKGBUILD b/community/qstardict/PKGBUILD
index 02378dbb3..c395cd17a 100644
--- a/community/qstardict/PKGBUILD
+++ b/community/qstardict/PKGBUILD
@@ -1,29 +1,30 @@
-# $Id: PKGBUILD 66440 2012-02-24 22:59:57Z jlichtblau $
+# $Id: PKGBUILD 85395 2013-03-01 10:38:40Z andrea $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Alois Nespor <alois.nespor@gmail.com>
 
 pkgname=qstardict
 pkgver=1.0.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Qt4 clone of StarDict with full support of StarDict dictionaries"
 arch=('i686' 'x86_64')
 url="http://qstardict.ylsoftware.com/index.php"
 license=('GPL2')
-depends=('qt')
+depends=('qt4')
 provides=('stardict')
 changelog=$pkgname.changelog
 source=(http://qstardict.ylsoftware.com/files/$pkgname-$pkgver.tar.bz2)
 sha256sums=('b778ace65a22e5b9724d687ad90c77ec98feb2671774f73cd51725ec7b59e62f')
 
 build() {
-  cd ${srcdir}/$pkgname-$pkgver
+  cd "${srcdir}/$pkgname-$pkgver"
+  sed -i -e 's|glib/gmem.h|glib.h|' -e 's|glib/gstrfuncs.h|glib.h|' plugins/stardict/stardict.cpp
 
   qmake ENABLED_PLUGINS="stardict web swac"
   make
 }
 
 package() {
-  cd ${srcdir}/$pkgname-$pkgver
+  cd "${srcdir}/$pkgname-$pkgver"
 
-  make INSTALL_ROOT=${pkgdir} install
+  make INSTALL_ROOT="${pkgdir}" install
 }
diff --git a/community/qsvn/PKGBUILD b/community/qsvn/PKGBUILD
index 5ade74953..54fb45af7 100644
--- a/community/qsvn/PKGBUILD
+++ b/community/qsvn/PKGBUILD
@@ -1,24 +1,24 @@
-# $Id: PKGBUILD 67770 2012-03-14 11:19:01Z giovanni $
+# $Id: PKGBUILD 85396 2013-03-01 10:38:47Z andrea $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Jakub Schmidtke <sjakub-at-gmail.com>
 
 pkgname=qsvn
 pkgver=0.8.3
-pkgrel=3
+pkgrel=4
 pkgdesc="Qt4 GUI for Subversion."
 arch=('i686' 'x86_64')
 url="http://www.anrichter.net/projects/qsvn/"
 license=('GPL')
-depends=('qt' 'subversion')
-makedepends=('cmake')
-#options=('!makeflags')
-source=("http://www.anrichter.net/projects/qsvn/chrome/site/$pkgname-$pkgver-src.tar.gz"
-        'lib64-fix.patch')
-md5sums=('cfdc9dab7c5f1cbf20b249901e10c04e'
-         'f2833303f01331538d1f6f2150b58e4f')
+depends=('qt4' 'subversion')
+makedepends=('cmake' 'patch')
+changelog=$pkgname.changelog
+source=(http://www.anrichter.net/projects/qsvn/chrome/site/$pkgname-$pkgver-src.tar.gz
+        lib64-fix.patch)
+sha256sums=('8396f667dc7f09de2eead056608e90febb089fc26529b7fcebe157797c320f73'
+            '6a2787b5852825aaccd50ad7b20983af859378d86b86aaf550bf4e1bfcc96c3e')
 
 build() {
-  cd ${srcdir}/$pkgname-$pkgver/src
+  cd "${srcdir}/$pkgname-$pkgver/src"
 
   patch -Np2 -i "${srcdir}/lib64-fix.patch"
 
@@ -27,11 +27,11 @@ build() {
 }
 
 package() {
-  cd ${srcdir}/$pkgname-$pkgver/src
+  cd "${srcdir}/$pkgname-$pkgver/src"
 
-  make DESTDIR=${pkgdir} install
+  make DESTDIR="${pkgdir}" install
 
   #desktop file
-  install -D -m644 ${srcdir}/$pkgname-$pkgver/src/$pkgname.desktop \
-    ${pkgdir}/usr/share/applications/$pkgname.desktop
+  install -D -m644 "${srcdir}/$pkgname-$pkgver/src/$pkgname.desktop" \
+    "${pkgdir}/usr/share/applications/$pkgname.desktop"
 }
diff --git a/community/qsvn/qsvn.changelog b/community/qsvn/qsvn.changelog
new file mode 100644
index 000000000..21fac1c11
--- /dev/null
+++ b/community/qsvn/qsvn.changelog
@@ -0,0 +1,32 @@
+2009-05-31 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+	* Update to major release 0.8.2
+	* Release info:
+	http://www.anrichter.net/projects/qsvn/wiki/Releases/ReleaseNotes-0.8.2
+
+2008-12-21 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+	* Update to major release 0.8.1
+	* Release info:
+	http://www.anrichter.net/projects/qsvn/wiki/ReleaseNotes-0.8.1
+
+2008-12-21 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+	* Update to major release 0.8.0
+	* Release info:
+	http://www.anrichter.net/projects/qsvn/wiki/ReleaseNotes-0.8.0
+
+2008-10-08 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+	* Update to major release 0.7.1
+
+2008-08-05 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+	* Update to major release 0.7.0
+	* Release info:
+	http://www.anrichter.net/projects/qsvn/wiki/ReleaseNotes-0.7.0
+
+2008-07-30 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+	* Fixed bug FS#10914
+
+2008-03-27 JJDaNiMoTh <jjdanimoth@gmail.com>
+	* Replaced qt4 with qt as depend
+
+2007-12-19 Georg Grabler (STiAT) <ggrabler@gmail.com>
+	* Updated to major release 0.6.0
+
diff --git a/community/qsynergy/PKGBUILD b/community/qsynergy/PKGBUILD
index ce7985113..0c187bdd6 100644
--- a/community/qsynergy/PKGBUILD
+++ b/community/qsynergy/PKGBUILD
@@ -1,21 +1,21 @@
-# $Id: PKGBUILD 60949 2011-12-19 19:01:11Z tredaelli $
+# $Id: PKGBUILD 85453 2013-03-01 19:08:27Z andrea $
 # Maintainer: Timothy Redaelli <timothy.redaelli@gmail.com>
 # Contributor: mutlu_inek <mutlu_inek@yahoo.de>
 
 pkgname=qsynergy
 pkgver=0.9.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Qt gui for Synergy which lets you remotely control other computers."
 url="http://www.volker-lanz.de/en/software/qsynergy/"
 license=(GPL)
 arch=('i686' 'x86_64')
-depends=('qt' 'synergy')
+depends=('qt4' 'synergy')
 source=("http://sourceforge.net/projects/$pkgname/files/$pkgver/$pkgname-$pkgver.tar.gz")
 md5sums=('17d8989668016185b859332aacf9e7df')
 
 build() {
    cd "$srcdir/$pkgname-$pkgver"
-   qmake
+   qmake-qt4
    make
 }
 
diff --git a/community/qtcreator/PKGBUILD b/community/qtcreator/PKGBUILD
index 72960ba22..c8bb65611 100644
--- a/community/qtcreator/PKGBUILD
+++ b/community/qtcreator/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 83450 2013-02-01 10:16:55Z svenstaro $
+# $Id: PKGBUILD 85401 2013-03-01 10:39:04Z andrea $
 # Maintainer: Imanol Celaya <ornitorrincos@archlinux-es.org>
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Lukas Jirkovsky <l.jirkovsky@gmail.com>
@@ -6,44 +6,48 @@
 # Contributor: thotypous <matiasΘarchlinux-br·org>
 # Contributor: delor <bartekpiech gmail com>
 
-pkgname="qtcreator"
+pkgname=qtcreator
 pkgver=2.6.2
 _pkgver=2.6.2
-pkgrel=1
+pkgrel=2
 pkgdesc='Lightweight, cross-platform integrated development environment'
 arch=('i686' 'x86_64')
 url='http://qt-project.org'
 license=('LGPL')
-depends=('qt')
-makedepends=('qt-private-headers' 'git')
+depends=('qt5-quick1' 'qt5-tools')
+makedepends=('git')
 options=('docs')
-optdepends=('qt-doc: for the integrated Qt documentation'
+optdepends=('qt5-doc: for the integrated Qt documentation'
             'gdb: for the debugger'
-            'cmake: for cmake project suppport'
+            'cmake: for cmake project support'
             'openssh-askpass: for ssh support'
             'git: for git support'
             'mercurial: for mercurial support'
             'bzr: for bazaar support'
             'valgrind: for analyze support')
 install=qtcreator.install
-source=("http://origin.releases.qt-project.org/qtcreator/${_pkgver}/qt-creator-${_pkgver}-src.tar.gz"
-        'qtcreator.desktop')
+source=("http://releases.qt-project.org/qtcreator/${_pkgver}/qt-creator-${_pkgver}-src.tar.gz"
+        'qtcreator.desktop'
+        'fix-build.patch')
 md5sums=('4700deb89e8cf92239015d7d70f0dcdd'
-         '82888d4be900e7833d768050a135cd37')
+         '82888d4be900e7833d768050a135cd37'
+         '4087c00d853addf97ca329d304e9a0a5')
 
 build() {
-  cd ${srcdir}
+  cd qt-creator-${_pkgver}-src
+  patch -p1 -i "${srcdir}"/fix-build.patch
+  cd ../
 
   [[ -d build ]] && rm -r build
   mkdir build && cd build
 
-  qmake ${srcdir}/qt-creator-${_pkgver}-src/qtcreator.pro
+  qmake ../qt-creator-${_pkgver}-src/qtcreator.pro
   make
   make docs -j1
 }
 
 package() {
-  cd ${srcdir}/build
+  cd build
 
   make INSTALL_ROOT="${pkgdir}/usr/" install
   make INSTALL_ROOT="${pkgdir}/usr/" install_docs
diff --git a/community/qtcreator/fix-build.patch b/community/qtcreator/fix-build.patch
new file mode 100644
index 000000000..5cf2a503b
--- /dev/null
+++ b/community/qtcreator/fix-build.patch
@@ -0,0 +1,10 @@
+--- qt-creator-2.6.2-src/qtcreator.pri~	2013-02-27 13:55:23.818990553 +0000
++++ qt-creator-2.6.2-src/qtcreator.pri	2013-02-27 13:55:52.335454428 +0000
+@@ -147,6 +147,7 @@
+ }
+ 
+ INCLUDEPATH += \
++    /usr/include \
+     $$IDE_BUILD_TREE/src \ # for <app/app_version.h>
+     $$IDE_SOURCE_TREE/src/libs \
+     $$IDE_SOURCE_TREE/tools \
diff --git a/community/qtcreator/fix-glsl-shit.patch b/community/qtcreator/fix-glsl-shit.patch
deleted file mode 100644
index 4b5e504e1..000000000
--- a/community/qtcreator/fix-glsl-shit.patch
+++ /dev/null
@@ -1,2376 +0,0 @@
-From e91045469d59c35607faa344bcfba2b2c566da51 Mon Sep 17 00:00:00 2001
-From: Christian Kamm <christian.d.kamm@nokia.com>
-Date: Mon, 6 Aug 2012 11:29:55 +0200
-Subject: [PATCH] GLSL: Fix recovery token order to avoid infinite loop.
-
-The case 'a = b ? ;' recovered with T_NUMBER, T_COMMA, T_NUMBER, ...
-
-Task-number: QTCREATORBUG-7517
-Change-Id: I3546266b21d11ce08e4af1331be94a78d3b24c19
-Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
----
- src/libs/glsl/glsl.g         |    4 +-
- src/libs/glsl/glslparser.cpp |  638 +++++++++++++++++++++---------------------
- src/libs/glsl/glslparser.h   |    2 +-
- 3 files changed, 322 insertions(+), 322 deletions(-)
-
-diff --git a/src/libs/glsl/glsl.g b/src/libs/glsl/glsl.g
-index 67f564c..3c6ae7c 100644
---- a/src/libs/glsl/glsl.g
-+++ b/src/libs/glsl/glsl.g
-@@ -456,7 +456,7 @@ private:
- #include <iostream>
- #include <cstdio>
- #include <cassert>
--#include <QtCore/QDebug>
-+#include <QDebug>
- 
- using namespace GLSL;
- 
-@@ -591,7 +591,7 @@ AST *Parser::parse(int startToken)
- 
-                 static int tks[] = {
-                     T_RIGHT_BRACE, T_RIGHT_PAREN, T_RIGHT_BRACKET,
--                    T_SEMICOLON, T_COMMA, T_COLON,
-+                    T_SEMICOLON, T_COLON, T_COMMA,
-                     T_NUMBER, T_TYPE_NAME, T_IDENTIFIER,
-                     T_LEFT_BRACE, T_LEFT_PAREN, T_LEFT_BRACKET,
-                     T_WHILE,
-diff --git a/src/libs/glsl/glslparser.cpp b/src/libs/glsl/glslparser.cpp
-index cf4bbe4..d82096b 100644
---- a/src/libs/glsl/glslparser.cpp
-+++ b/src/libs/glsl/glslparser.cpp
-@@ -1,5 +1,5 @@
- 
--#line 427 "./glsl.g"
-+#line 423 "./glsl.g"
- 
- /**************************************************************************
- **
-@@ -171,7 +171,7 @@ AST *Parser::parse(int startToken)
- 
-                 static int tks[] = {
-                     T_RIGHT_BRACE, T_RIGHT_PAREN, T_RIGHT_BRACKET,
--                    T_SEMICOLON, T_COMMA, T_COLON,
-+                    T_SEMICOLON, T_COLON, T_COMMA,
-                     T_NUMBER, T_TYPE_NAME, T_IDENTIFIER,
-                     T_LEFT_BRACE, T_LEFT_PAREN, T_LEFT_BRACKET,
-                     T_WHILE,
-@@ -215,137 +215,137 @@ AST *Parser::parse(int startToken)
-     return 0;
- }
- 
--#line 647 "./glsl.g"
-+#line 641 "./glsl.g"
- 
- void Parser::reduce(int ruleno)
- {
- switch(ruleno) {
- 
--#line 656 "./glsl.g"
-+#line 650 "./glsl.g"
- 
- case 0: {
-     ast(1) = makeAstNode<IdentifierExpressionAST>(string(1));
- }   break;
- 
--#line 663 "./glsl.g"
-+#line 657 "./glsl.g"
- 
- case 1: {
-     ast(1) = makeAstNode<LiteralExpressionAST>(string(1));
- }   break;
- 
--#line 670 "./glsl.g"
-+#line 664 "./glsl.g"
- 
- case 2: {
-     ast(1) = makeAstNode<LiteralExpressionAST>(_engine->identifier("true", 4));
- }   break;
- 
--#line 677 "./glsl.g"
-+#line 671 "./glsl.g"
- 
- case 3: {
-     ast(1) = makeAstNode<LiteralExpressionAST>(_engine->identifier("false", 5));
- }   break;
- 
--#line 684 "./glsl.g"
-+#line 678 "./glsl.g"
- 
- case 4: {
-     // nothing to do.
- }   break;
- 
--#line 691 "./glsl.g"
-+#line 685 "./glsl.g"
- 
- case 5: {
-     ast(1) = ast(2);
- }   break;
- 
--#line 698 "./glsl.g"
-+#line 692 "./glsl.g"
- 
- case 6: {
-     // nothing to do.
- }   break;
- 
--#line 705 "./glsl.g"
-+#line 699 "./glsl.g"
- 
- case 7: {
-     ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_ArrayAccess, expression(1), expression(3));
- }   break;
- 
--#line 712 "./glsl.g"
-+#line 706 "./glsl.g"
- 
- case 8: {
-     // nothing to do.
- }   break;
- 
--#line 719 "./glsl.g"
-+#line 713 "./glsl.g"
- 
- case 9: {
-     ast(1) = makeAstNode<MemberAccessExpressionAST>(expression(1), string(3));
- }   break;
- 
--#line 726 "./glsl.g"
-+#line 720 "./glsl.g"
- 
- case 10: {
-     ast(1) = makeAstNode<UnaryExpressionAST>(AST::Kind_PostIncrement, expression(1));
- }   break;
- 
--#line 733 "./glsl.g"
-+#line 727 "./glsl.g"
- 
- case 11: {
-     ast(1) = makeAstNode<UnaryExpressionAST>(AST::Kind_PostDecrement, expression(1));
- }   break;
- 
--#line 740 "./glsl.g"
-+#line 734 "./glsl.g"
- 
- case 12: {
-     // nothing to do.
- }   break;
- 
--#line 747 "./glsl.g"
-+#line 741 "./glsl.g"
- 
- case 13: {
-     // nothing to do.
- }   break;
- 
--#line 754 "./glsl.g"
-+#line 748 "./glsl.g"
- 
- case 14: {
-     ast(1) = makeAstNode<FunctionCallExpressionAST>
-         (sym(1).function.id, sym(1).function.arguments);
- }   break;
- 
--#line 762 "./glsl.g"
-+#line 756 "./glsl.g"
- 
- case 15: {
-     ast(1) = makeAstNode<FunctionCallExpressionAST>
-         (expression(1), sym(3).function.id, sym(3).function.arguments);
- }   break;
- 
--#line 770 "./glsl.g"
-+#line 764 "./glsl.g"
- 
- case 16: {
-     // nothing to do.
- }   break;
- 
--#line 777 "./glsl.g"
-+#line 771 "./glsl.g"
- 
- case 17: {
-     // nothing to do.
- }   break;
- 
--#line 784 "./glsl.g"
-+#line 778 "./glsl.g"
- 
- case 18: {
-     sym(1).function.id = sym(1).function_identifier;
-     sym(1).function.arguments = 0;
- }   break;
- 
--#line 792 "./glsl.g"
-+#line 786 "./glsl.g"
- 
- case 19: {
-     sym(1).function.id = sym(1).function_identifier;
-     sym(1).function.arguments = 0;
- }   break;
- 
--#line 800 "./glsl.g"
-+#line 794 "./glsl.g"
- 
- case 20: {
-     sym(1).function.id = sym(1).function_identifier;
-@@ -353,7 +353,7 @@ case 20: {
-         makeAstNode< List<ExpressionAST *> >(expression(2));
- }   break;
- 
--#line 809 "./glsl.g"
-+#line 803 "./glsl.g"
- 
- case 21: {
-     sym(1).function.arguments =
-@@ -361,379 +361,379 @@ case 21: {
-             (sym(1).function.arguments, expression(3));
- }   break;
- 
--#line 818 "./glsl.g"
-+#line 812 "./glsl.g"
- 
- case 22: {
-     // nothing to do.
- }   break;
- 
--#line 825 "./glsl.g"
-+#line 819 "./glsl.g"
- 
- case 23: {
-     ast(1) = makeAstNode<FunctionIdentifierAST>(type(1));
- }   break;
- 
--#line 832 "./glsl.g"
-+#line 826 "./glsl.g"
- 
- case 24: {
-     ast(1) = makeAstNode<FunctionIdentifierAST>(string(1));
- }   break;
- 
--#line 839 "./glsl.g"
-+#line 833 "./glsl.g"
- 
- case 25: {
-     // nothing to do.
- }   break;
- 
--#line 846 "./glsl.g"
-+#line 840 "./glsl.g"
- 
- case 26: {
-     ast(1) = makeAstNode<UnaryExpressionAST>(AST::Kind_PreIncrement, expression(2));
- }   break;
- 
--#line 853 "./glsl.g"
-+#line 847 "./glsl.g"
- 
- case 27: {
-     ast(1) = makeAstNode<UnaryExpressionAST>(AST::Kind_PreDecrement, expression(2));
- }   break;
- 
--#line 860 "./glsl.g"
-+#line 854 "./glsl.g"
- 
- case 28: {
-     ast(1) = makeAstNode<UnaryExpressionAST>(sym(1).kind, expression(2));
- }   break;
- 
--#line 867 "./glsl.g"
-+#line 861 "./glsl.g"
- 
- case 29: {
-     sym(1).kind = AST::Kind_UnaryPlus;
- }   break;
- 
--#line 874 "./glsl.g"
-+#line 868 "./glsl.g"
- 
- case 30: {
-     sym(1).kind = AST::Kind_UnaryMinus;
- }   break;
- 
--#line 881 "./glsl.g"
-+#line 875 "./glsl.g"
- 
- case 31: {
-     sym(1).kind = AST::Kind_LogicalNot;
- }   break;
- 
--#line 888 "./glsl.g"
-+#line 882 "./glsl.g"
- 
- case 32: {
-     sym(1).kind = AST::Kind_BitwiseNot;
- }   break;
- 
--#line 895 "./glsl.g"
-+#line 889 "./glsl.g"
- 
- case 33: {
-     // nothing to do.
- }   break;
- 
--#line 902 "./glsl.g"
-+#line 896 "./glsl.g"
- 
- case 34: {
-     ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_Multiply, expression(1), expression(3));
- }   break;
- 
--#line 909 "./glsl.g"
-+#line 903 "./glsl.g"
- 
- case 35: {
-     ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_Divide, expression(1), expression(3));
- }   break;
- 
--#line 916 "./glsl.g"
-+#line 910 "./glsl.g"
- 
- case 36: {
-     ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_Modulus, expression(1), expression(3));
- }   break;
- 
--#line 923 "./glsl.g"
-+#line 917 "./glsl.g"
- 
- case 37: {
-     // nothing to do.
- }   break;
- 
--#line 930 "./glsl.g"
-+#line 924 "./glsl.g"
- 
- case 38: {
-     ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_Plus, expression(1), expression(3));
- }   break;
- 
--#line 937 "./glsl.g"
-+#line 931 "./glsl.g"
- 
- case 39: {
-     ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_Minus, expression(1), expression(3));
- }   break;
- 
--#line 944 "./glsl.g"
-+#line 938 "./glsl.g"
- 
- case 40: {
-     // nothing to do.
- }   break;
- 
--#line 951 "./glsl.g"
-+#line 945 "./glsl.g"
- 
- case 41: {
-     ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_ShiftLeft, expression(1), expression(3));
- }   break;
- 
--#line 958 "./glsl.g"
-+#line 952 "./glsl.g"
- 
- case 42: {
-     ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_ShiftRight, expression(1), expression(3));
- }   break;
- 
--#line 965 "./glsl.g"
-+#line 959 "./glsl.g"
- 
- case 43: {
-     // nothing to do.
- }   break;
- 
--#line 972 "./glsl.g"
-+#line 966 "./glsl.g"
- 
- case 44: {
-     ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_LessThan, expression(1), expression(3));
- }   break;
- 
--#line 979 "./glsl.g"
-+#line 973 "./glsl.g"
- 
- case 45: {
-     ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_GreaterThan, expression(1), expression(3));
- }   break;
- 
--#line 986 "./glsl.g"
-+#line 980 "./glsl.g"
- 
- case 46: {
-     ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_LessEqual, expression(1), expression(3));
- }   break;
- 
--#line 993 "./glsl.g"
-+#line 987 "./glsl.g"
- 
- case 47: {
-     ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_GreaterEqual, expression(1), expression(3));
- }   break;
- 
--#line 1000 "./glsl.g"
-+#line 994 "./glsl.g"
- 
- case 48: {
-     // nothing to do.
- }   break;
- 
--#line 1007 "./glsl.g"
-+#line 1001 "./glsl.g"
- 
- case 49: {
-     ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_Equal, expression(1), expression(3));
- }   break;
- 
--#line 1014 "./glsl.g"
-+#line 1008 "./glsl.g"
- 
- case 50: {
-     ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_NotEqual, expression(1), expression(3));
- }   break;
- 
--#line 1021 "./glsl.g"
-+#line 1015 "./glsl.g"
- 
- case 51: {
-     // nothing to do.
- }   break;
- 
--#line 1028 "./glsl.g"
-+#line 1022 "./glsl.g"
- 
- case 52: {
-     ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_BitwiseAnd, expression(1), expression(3));
- }   break;
- 
--#line 1035 "./glsl.g"
-+#line 1029 "./glsl.g"
- 
- case 53: {
-     // nothing to do.
- }   break;
- 
--#line 1042 "./glsl.g"
-+#line 1036 "./glsl.g"
- 
- case 54: {
-     ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_BitwiseXor, expression(1), expression(3));
- }   break;
- 
--#line 1049 "./glsl.g"
-+#line 1043 "./glsl.g"
- 
- case 55: {
-     // nothing to do.
- }   break;
- 
--#line 1056 "./glsl.g"
-+#line 1050 "./glsl.g"
- 
- case 56: {
-     ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_BitwiseOr, expression(1), expression(3));
- }   break;
- 
--#line 1063 "./glsl.g"
-+#line 1057 "./glsl.g"
- 
- case 57: {
-     // nothing to do.
- }   break;
- 
--#line 1070 "./glsl.g"
-+#line 1064 "./glsl.g"
- 
- case 58: {
-     ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_LogicalAnd, expression(1), expression(3));
- }   break;
- 
--#line 1077 "./glsl.g"
-+#line 1071 "./glsl.g"
- 
- case 59: {
-     // nothing to do.
- }   break;
- 
--#line 1084 "./glsl.g"
-+#line 1078 "./glsl.g"
- 
- case 60: {
-     ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_LogicalXor, expression(1), expression(3));
- }   break;
- 
--#line 1091 "./glsl.g"
-+#line 1085 "./glsl.g"
- 
- case 61: {
-     // nothing to do.
- }   break;
- 
--#line 1098 "./glsl.g"
-+#line 1092 "./glsl.g"
- 
- case 62: {
-     ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_LogicalOr, expression(1), expression(3));
- }   break;
- 
--#line 1105 "./glsl.g"
-+#line 1099 "./glsl.g"
- 
- case 63: {
-     // nothing to do.
- }   break;
- 
--#line 1112 "./glsl.g"
-+#line 1106 "./glsl.g"
- 
- case 64: {
-     ast(1) = makeAstNode<TernaryExpressionAST>(AST::Kind_Conditional, expression(1), expression(3), expression(5));
- }   break;
- 
--#line 1119 "./glsl.g"
-+#line 1113 "./glsl.g"
- 
- case 65: {
-     // nothing to do.
- }   break;
- 
--#line 1126 "./glsl.g"
-+#line 1120 "./glsl.g"
- 
- case 66: {
-     ast(1) = makeAstNode<AssignmentExpressionAST>(sym(2).kind, expression(1), expression(3));
- }   break;
- 
--#line 1133 "./glsl.g"
-+#line 1127 "./glsl.g"
- 
- case 67: {
-     sym(1).kind = AST::Kind_Assign;
- }   break;
- 
--#line 1140 "./glsl.g"
-+#line 1134 "./glsl.g"
- 
- case 68: {
-     sym(1).kind = AST::Kind_AssignMultiply;
- }   break;
- 
--#line 1147 "./glsl.g"
-+#line 1141 "./glsl.g"
- 
- case 69: {
-     sym(1).kind = AST::Kind_AssignDivide;
- }   break;
- 
--#line 1154 "./glsl.g"
-+#line 1148 "./glsl.g"
- 
- case 70: {
-     sym(1).kind = AST::Kind_AssignModulus;
- }   break;
- 
--#line 1161 "./glsl.g"
-+#line 1155 "./glsl.g"
- 
- case 71: {
-     sym(1).kind = AST::Kind_AssignPlus;
- }   break;
- 
--#line 1168 "./glsl.g"
-+#line 1162 "./glsl.g"
- 
- case 72: {
-     sym(1).kind = AST::Kind_AssignMinus;
- }   break;
- 
--#line 1175 "./glsl.g"
-+#line 1169 "./glsl.g"
- 
- case 73: {
-     sym(1).kind = AST::Kind_AssignShiftLeft;
- }   break;
- 
--#line 1182 "./glsl.g"
-+#line 1176 "./glsl.g"
- 
- case 74: {
-     sym(1).kind = AST::Kind_AssignShiftRight;
- }   break;
- 
--#line 1189 "./glsl.g"
-+#line 1183 "./glsl.g"
- 
- case 75: {
-     sym(1).kind = AST::Kind_AssignAnd;
- }   break;
- 
--#line 1196 "./glsl.g"
-+#line 1190 "./glsl.g"
- 
- case 76: {
-     sym(1).kind = AST::Kind_AssignXor;
- }   break;
- 
--#line 1203 "./glsl.g"
-+#line 1197 "./glsl.g"
- 
- case 77: {
-     sym(1).kind = AST::Kind_AssignOr;
- }   break;
- 
--#line 1210 "./glsl.g"
-+#line 1204 "./glsl.g"
- 
- case 78: {
-     // nothing to do.
- }   break;
- 
--#line 1217 "./glsl.g"
-+#line 1211 "./glsl.g"
- 
- case 79: {
-     ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_Comma, expression(1), expression(3));
- }   break;
- 
--#line 1224 "./glsl.g"
-+#line 1218 "./glsl.g"
- 
- case 80: {
-     // nothing to do.
- }   break;
- 
--#line 1231 "./glsl.g"
-+#line 1225 "./glsl.g"
- 
- case 81: {
-     // nothing to do.
- }   break;
- 
--#line 1238 "./glsl.g"
-+#line 1232 "./glsl.g"
- 
- case 82: {
-     ast(1) = makeAstNode<InitDeclarationAST>(sym(1).declaration_list);
- }   break;
- 
--#line 1245 "./glsl.g"
-+#line 1239 "./glsl.g"
- 
- case 83: {
-     ast(1) = makeAstNode<PrecisionDeclarationAST>(sym(2).precision, type(3));
- }   break;
- 
--#line 1252 "./glsl.g"
-+#line 1246 "./glsl.g"
- 
- case 84: {
-     if (sym(1).type_qualifier.qualifier != QualifiedTypeAST::Struct) {
-@@ -743,7 +743,7 @@ case 84: {
-     ast(1) = makeAstNode<TypeDeclarationAST>(type);
- }   break;
- 
--#line 1263 "./glsl.g"
-+#line 1257 "./glsl.g"
- 
- case 85: {
-     if ((sym(1).type_qualifier.qualifier & QualifiedTypeAST::Struct) == 0) {
-@@ -761,7 +761,7 @@ case 85: {
-          makeAstNode<VariableDeclarationAST>(qualtype, string(6)));
- }   break;
- 
--#line 1282 "./glsl.g"
-+#line 1276 "./glsl.g"
- 
- case 86: {
-     if ((sym(1).type_qualifier.qualifier & QualifiedTypeAST::Struct) == 0) {
-@@ -780,7 +780,7 @@ case 86: {
-             (makeAstNode<ArrayTypeAST>(qualtype), string(6)));
- }   break;
- 
--#line 1302 "./glsl.g"
-+#line 1296 "./glsl.g"
- 
- case 87: {
-     if ((sym(1).type_qualifier.qualifier & QualifiedTypeAST::Struct) == 0) {
-@@ -799,7 +799,7 @@ case 87: {
-             (makeAstNode<ArrayTypeAST>(qualtype, expression(8)), string(6)));
- }   break;
- 
--#line 1322 "./glsl.g"
-+#line 1316 "./glsl.g"
- 
- case 88: {
-     TypeAST *type = makeAstNode<QualifiedTypeAST>
-@@ -808,59 +808,59 @@ case 88: {
-     ast(1) = makeAstNode<TypeDeclarationAST>(type);
- }   break;
- 
--#line 1332 "./glsl.g"
-+#line 1326 "./glsl.g"
- 
- case 89: {
-     function(1)->finishParams();
- }   break;
- 
--#line 1339 "./glsl.g"
-+#line 1333 "./glsl.g"
- 
- case 90: {
-     // nothing to do.
- }   break;
- 
--#line 1346 "./glsl.g"
-+#line 1340 "./glsl.g"
- 
- case 91: {
-     // nothing to do.
- }   break;
- 
--#line 1353 "./glsl.g"
-+#line 1347 "./glsl.g"
- 
- case 92: {
-     function(1)->params = makeAstNode< List<ParameterDeclarationAST *> >
-         (sym(2).param_declaration);
- }   break;
- 
--#line 1361 "./glsl.g"
-+#line 1355 "./glsl.g"
- 
- case 93: {
-     function(1)->params = makeAstNode< List<ParameterDeclarationAST *> >
-         (function(1)->params, sym(3).param_declaration);
- }   break;
- 
--#line 1369 "./glsl.g"
-+#line 1363 "./glsl.g"
- 
- case 94: {
-     function(1) = makeAstNode<FunctionDeclarationAST>(type(1), string(2));
- }   break;
- 
--#line 1376 "./glsl.g"
-+#line 1370 "./glsl.g"
- 
- case 95: {
-     sym(1).param_declarator.type = type(1);
-     sym(1).param_declarator.name = string(2);
- }   break;
- 
--#line 1384 "./glsl.g"
-+#line 1378 "./glsl.g"
- 
- case 96: {
-     sym(1).param_declarator.type = makeAstNode<ArrayTypeAST>(type(1), expression(4));
-     sym(1).param_declarator.name = string(2);
- }   break;
- 
--#line 1392 "./glsl.g"
-+#line 1386 "./glsl.g"
- 
- case 97: {
-     ast(1) = makeAstNode<ParameterDeclarationAST>
-@@ -871,7 +871,7 @@ case 97: {
-          sym(3).param_declarator.name);
- }   break;
- 
--#line 1404 "./glsl.g"
-+#line 1398 "./glsl.g"
- 
- case 98: {
-     ast(1) = makeAstNode<ParameterDeclarationAST>
-@@ -880,7 +880,7 @@ case 98: {
-          sym(2).param_declarator.name);
- }   break;
- 
--#line 1414 "./glsl.g"
-+#line 1408 "./glsl.g"
- 
- case 99: {
-     ast(1) = makeAstNode<ParameterDeclarationAST>
-@@ -890,7 +890,7 @@ case 99: {
-          (const QString *)0);
- }   break;
- 
--#line 1425 "./glsl.g"
-+#line 1419 "./glsl.g"
- 
- case 100: {
-     ast(1) = makeAstNode<ParameterDeclarationAST>
-@@ -898,44 +898,44 @@ case 100: {
-          (const QString *)0);
- }   break;
- 
--#line 1434 "./glsl.g"
-+#line 1428 "./glsl.g"
- 
- case 101: {
-     sym(1).qualifier = ParameterDeclarationAST::In;
- }   break;
- 
--#line 1441 "./glsl.g"
-+#line 1435 "./glsl.g"
- 
- case 102: {
-     sym(1).qualifier = ParameterDeclarationAST::In;
- }   break;
- 
--#line 1448 "./glsl.g"
-+#line 1442 "./glsl.g"
- 
- case 103: {
-     sym(1).qualifier = ParameterDeclarationAST::Out;
- }   break;
- 
--#line 1455 "./glsl.g"
-+#line 1449 "./glsl.g"
- 
- case 104: {
-     sym(1).qualifier = ParameterDeclarationAST::InOut;
- }   break;
- 
--#line 1462 "./glsl.g"
-+#line 1456 "./glsl.g"
- 
- case 105: {
-     // nothing to do.
- }   break;
- 
--#line 1469 "./glsl.g"
-+#line 1463 "./glsl.g"
- 
- case 106: {
-     sym(1).declaration_list = makeAstNode< List<DeclarationAST *> >
-         (sym(1).declaration);
- }   break;
- 
--#line 1477 "./glsl.g"
-+#line 1471 "./glsl.g"
- 
- case 107: {
-     TypeAST *type = VariableDeclarationAST::declarationType(sym(1).declaration_list);
-@@ -944,7 +944,7 @@ case 107: {
-             (sym(1).declaration_list, decl);
- }   break;
- 
--#line 1487 "./glsl.g"
-+#line 1481 "./glsl.g"
- 
- case 108: {
-     TypeAST *type = VariableDeclarationAST::declarationType(sym(1).declaration_list);
-@@ -954,7 +954,7 @@ case 108: {
-             (sym(1).declaration_list, decl);
- }   break;
- 
--#line 1498 "./glsl.g"
-+#line 1492 "./glsl.g"
- 
- case 109: {
-     TypeAST *type = VariableDeclarationAST::declarationType(sym(1).declaration_list);
-@@ -964,7 +964,7 @@ case 109: {
-             (sym(1).declaration_list, decl);
- }   break;
- 
--#line 1509 "./glsl.g"
-+#line 1503 "./glsl.g"
- 
- case 110: {
-     TypeAST *type = VariableDeclarationAST::declarationType(sym(1).declaration_list);
-@@ -975,7 +975,7 @@ case 110: {
-             (sym(1).declaration_list, decl);
- }   break;
- 
--#line 1521 "./glsl.g"
-+#line 1515 "./glsl.g"
- 
- case 111: {
-     TypeAST *type = VariableDeclarationAST::declarationType(sym(1).declaration_list);
-@@ -986,7 +986,7 @@ case 111: {
-             (sym(1).declaration_list, decl);
- }   break;
- 
--#line 1533 "./glsl.g"
-+#line 1527 "./glsl.g"
- 
- case 112: {
-     TypeAST *type = VariableDeclarationAST::declarationType(sym(1).declaration_list);
-@@ -996,40 +996,40 @@ case 112: {
-             (sym(1).declaration_list, decl);
- }   break;
- 
--#line 1544 "./glsl.g"
-+#line 1538 "./glsl.g"
- 
- case 113: {
-     ast(1) = makeAstNode<TypeDeclarationAST>(type(1));
- }   break;
- 
--#line 1551 "./glsl.g"
-+#line 1545 "./glsl.g"
- 
- case 114: {
-     ast(1) = makeAstNode<VariableDeclarationAST>(type(1), string(2));
- }   break;
- 
--#line 1558 "./glsl.g"
-+#line 1552 "./glsl.g"
- 
- case 115: {
-     ast(1) = makeAstNode<VariableDeclarationAST>
-         (makeAstNode<ArrayTypeAST>(type(1)), string(2));
- }   break;
- 
--#line 1566 "./glsl.g"
-+#line 1560 "./glsl.g"
- 
- case 116: {
-     ast(1) = makeAstNode<VariableDeclarationAST>
-         (makeAstNode<ArrayTypeAST>(type(1), expression(4)), string(2));
- }   break;
- 
--#line 1574 "./glsl.g"
-+#line 1568 "./glsl.g"
- 
- case 117: {
-     ast(1) = makeAstNode<VariableDeclarationAST>
-         (makeAstNode<ArrayTypeAST>(type(1)), string(2), expression(6));
- }   break;
- 
--#line 1582 "./glsl.g"
-+#line 1576 "./glsl.g"
- 
- case 118: {
-     ast(1) = makeAstNode<VariableDeclarationAST>
-@@ -1037,26 +1037,26 @@ case 118: {
-          string(2), expression(7));
- }   break;
- 
--#line 1591 "./glsl.g"
-+#line 1585 "./glsl.g"
- 
- case 119: {
-     ast(1) = makeAstNode<VariableDeclarationAST>
-         (type(1), string(2), expression(4));
- }   break;
- 
--#line 1599 "./glsl.g"
-+#line 1593 "./glsl.g"
- 
- case 120: {
-     ast(1) = makeAstNode<InvariantDeclarationAST>(string(2));
- }   break;
- 
--#line 1606 "./glsl.g"
-+#line 1600 "./glsl.g"
- 
- case 121: {
-     ast(1) = makeAstNode<QualifiedTypeAST>(0, type(1), (List<LayoutQualifierAST *> *)0);
- }   break;
- 
--#line 1613 "./glsl.g"
-+#line 1607 "./glsl.g"
- 
- case 122: {
-     ast(1) = makeAstNode<QualifiedTypeAST>
-@@ -1064,207 +1064,207 @@ case 122: {
-          sym(1).type_qualifier.layout_list);
- }   break;
- 
--#line 1622 "./glsl.g"
-+#line 1616 "./glsl.g"
- 
- case 123: {
-     sym(1).qualifier = QualifiedTypeAST::Invariant;
- }   break;
- 
--#line 1629 "./glsl.g"
-+#line 1623 "./glsl.g"
- 
- case 124: {
-     sym(1).qualifier = QualifiedTypeAST::Smooth;
- }   break;
- 
--#line 1636 "./glsl.g"
-+#line 1630 "./glsl.g"
- 
- case 125: {
-     sym(1).qualifier = QualifiedTypeAST::Flat;
- }   break;
- 
--#line 1643 "./glsl.g"
-+#line 1637 "./glsl.g"
- 
- case 126: {
-     sym(1).qualifier = QualifiedTypeAST::NoPerspective;
- }   break;
- 
--#line 1650 "./glsl.g"
-+#line 1644 "./glsl.g"
- 
- case 127: {
-     sym(1) = sym(3);
- }   break;
- 
--#line 1657 "./glsl.g"
-+#line 1651 "./glsl.g"
- 
- case 128: {
-     sym(1).layout_list = makeAstNode< List<LayoutQualifierAST *> >(sym(1).layout);
- }   break;
- 
--#line 1664 "./glsl.g"
-+#line 1658 "./glsl.g"
- 
- case 129: {
-     sym(1).layout_list = makeAstNode< List<LayoutQualifierAST *> >(sym(1).layout_list, sym(3).layout);
- }   break;
- 
--#line 1671 "./glsl.g"
-+#line 1665 "./glsl.g"
- 
- case 130: {
-     sym(1).layout = makeAstNode<LayoutQualifierAST>(string(1), (const QString *)0);
- }   break;
- 
--#line 1678 "./glsl.g"
-+#line 1672 "./glsl.g"
- 
- case 131: {
-     sym(1).layout = makeAstNode<LayoutQualifierAST>(string(1), string(3));
- }   break;
- 
--#line 1685 "./glsl.g"
-+#line 1679 "./glsl.g"
- 
- case 132: {
-     sym(1).qualifier = QualifiedTypeAST::Const;
- }   break;
- 
--#line 1692 "./glsl.g"
-+#line 1686 "./glsl.g"
- 
- case 133: {
-     sym(1).type_qualifier.qualifier = sym(1).qualifier;
-     sym(1).type_qualifier.layout_list = 0;
- }   break;
- 
--#line 1700 "./glsl.g"
-+#line 1694 "./glsl.g"
- 
- case 134: {
-     sym(1).type_qualifier.layout_list = sym(1).layout_list;
-     sym(1).type_qualifier.qualifier = 0;
- }   break;
- 
--#line 1708 "./glsl.g"
-+#line 1702 "./glsl.g"
- 
- case 135: {
-     sym(1).type_qualifier.layout_list = sym(1).layout_list;
-     sym(1).type_qualifier.qualifier = sym(2).qualifier;
- }   break;
- 
--#line 1716 "./glsl.g"
-+#line 1710 "./glsl.g"
- 
- case 136: {
-     sym(1).type_qualifier.qualifier = sym(1).qualifier | sym(2).qualifier;
-     sym(1).type_qualifier.layout_list = 0;
- }   break;
- 
--#line 1724 "./glsl.g"
-+#line 1718 "./glsl.g"
- 
- case 137: {
-     sym(1).type_qualifier.qualifier = sym(1).qualifier;
-     sym(1).type_qualifier.layout_list = 0;
- }   break;
- 
--#line 1732 "./glsl.g"
-+#line 1726 "./glsl.g"
- 
- case 138: {
-     sym(1).type_qualifier.qualifier = sym(1).qualifier | sym(2).qualifier;
-     sym(1).type_qualifier.layout_list = 0;
- }   break;
- 
--#line 1740 "./glsl.g"
-+#line 1734 "./glsl.g"
- 
- case 139: {
-     sym(1).type_qualifier.qualifier = sym(1).qualifier | sym(2).qualifier | sym(3).qualifier;
-     sym(1).type_qualifier.layout_list = 0;
- }   break;
- 
--#line 1748 "./glsl.g"
-+#line 1742 "./glsl.g"
- 
- case 140: {
-     sym(1).type_qualifier.qualifier = QualifiedTypeAST::Invariant;
-     sym(1).type_qualifier.layout_list = 0;
- }   break;
- 
--#line 1756 "./glsl.g"
-+#line 1750 "./glsl.g"
- 
- case 141: {
-     sym(1).qualifier = QualifiedTypeAST::Const;
- }   break;
- 
--#line 1763 "./glsl.g"
-+#line 1757 "./glsl.g"
- 
- case 142: {
-     sym(1).qualifier = QualifiedTypeAST::Attribute;
- }   break;
- 
--#line 1770 "./glsl.g"
-+#line 1764 "./glsl.g"
- 
- case 143: {
-     sym(1).qualifier = QualifiedTypeAST::Varying;
- }   break;
- 
--#line 1777 "./glsl.g"
-+#line 1771 "./glsl.g"
- 
- case 144: {
-     sym(1).qualifier = QualifiedTypeAST::CentroidVarying;
- }   break;
- 
--#line 1784 "./glsl.g"
-+#line 1778 "./glsl.g"
- 
- case 145: {
-     sym(1).qualifier = QualifiedTypeAST::In;
- }   break;
- 
--#line 1791 "./glsl.g"
-+#line 1785 "./glsl.g"
- 
- case 146: {
-     sym(1).qualifier = QualifiedTypeAST::Out;
- }   break;
- 
--#line 1798 "./glsl.g"
-+#line 1792 "./glsl.g"
- 
- case 147: {
-     sym(1).qualifier = QualifiedTypeAST::CentroidIn;
- }   break;
- 
--#line 1805 "./glsl.g"
-+#line 1799 "./glsl.g"
- 
- case 148: {
-     sym(1).qualifier = QualifiedTypeAST::CentroidOut;
- }   break;
- 
--#line 1812 "./glsl.g"
-+#line 1806 "./glsl.g"
- 
- case 149: {
-     sym(1).qualifier = QualifiedTypeAST::PatchIn;
- }   break;
- 
--#line 1819 "./glsl.g"
-+#line 1813 "./glsl.g"
- 
- case 150: {
-     sym(1).qualifier = QualifiedTypeAST::PatchOut;
- }   break;
- 
--#line 1826 "./glsl.g"
-+#line 1820 "./glsl.g"
- 
- case 151: {
-     sym(1).qualifier = QualifiedTypeAST::SampleIn;
- }   break;
- 
--#line 1833 "./glsl.g"
-+#line 1827 "./glsl.g"
- 
- case 152: {
-     sym(1).qualifier = QualifiedTypeAST::SampleOut;
- }   break;
- 
--#line 1840 "./glsl.g"
-+#line 1834 "./glsl.g"
- 
- case 153: {
-     sym(1).qualifier = QualifiedTypeAST::Uniform;
- }   break;
- 
--#line 1847 "./glsl.g"
-+#line 1841 "./glsl.g"
- 
- case 154: {
-     // nothing to do.
- }   break;
- 
--#line 1854 "./glsl.g"
-+#line 1848 "./glsl.g"
- 
- case 155: {
-     if (!type(2)->setPrecision(sym(1).precision)) {
-@@ -1273,595 +1273,595 @@ case 155: {
-     ast(1) = type(2);
- }   break;
- 
--#line 1864 "./glsl.g"
-+#line 1858 "./glsl.g"
- 
- case 156: {
-     // nothing to do.
- }   break;
- 
--#line 1871 "./glsl.g"
-+#line 1865 "./glsl.g"
- 
- case 157: {
-     ast(1) = makeAstNode<ArrayTypeAST>(type(1));
- }   break;
- 
--#line 1878 "./glsl.g"
-+#line 1872 "./glsl.g"
- 
- case 158: {
-     ast(1) = makeAstNode<ArrayTypeAST>(type(1), expression(3));
- }   break;
- 
--#line 1885 "./glsl.g"
-+#line 1879 "./glsl.g"
- 
- case 159: {
-     ast(1) = makeBasicType(T_VOID);
- }   break;
- 
--#line 1892 "./glsl.g"
-+#line 1886 "./glsl.g"
- 
- case 160: {
-     ast(1) = makeBasicType(T_FLOAT);
- }   break;
- 
--#line 1899 "./glsl.g"
-+#line 1893 "./glsl.g"
- 
- case 161: {
-     ast(1) = makeBasicType(T_DOUBLE);
- }   break;
- 
--#line 1906 "./glsl.g"
-+#line 1900 "./glsl.g"
- 
- case 162: {
-     ast(1) = makeBasicType(T_INT);
- }   break;
- 
--#line 1913 "./glsl.g"
-+#line 1907 "./glsl.g"
- 
- case 163: {
-     ast(1) = makeBasicType(T_UINT);
- }   break;
- 
--#line 1920 "./glsl.g"
-+#line 1914 "./glsl.g"
- 
- case 164: {
-     ast(1) = makeBasicType(T_BOOL);
- }   break;
- 
--#line 1927 "./glsl.g"
-+#line 1921 "./glsl.g"
- 
- case 165: {
-     ast(1) = makeBasicType(T_VEC2);
- }   break;
- 
--#line 1934 "./glsl.g"
-+#line 1928 "./glsl.g"
- 
- case 166: {
-     ast(1) = makeBasicType(T_VEC3);
- }   break;
- 
--#line 1941 "./glsl.g"
-+#line 1935 "./glsl.g"
- 
- case 167: {
-     ast(1) = makeBasicType(T_VEC4);
- }   break;
- 
--#line 1948 "./glsl.g"
-+#line 1942 "./glsl.g"
- 
- case 168: {
-     ast(1) = makeBasicType(T_DVEC2);
- }   break;
- 
--#line 1955 "./glsl.g"
-+#line 1949 "./glsl.g"
- 
- case 169: {
-     ast(1) = makeBasicType(T_DVEC3);
- }   break;
- 
--#line 1962 "./glsl.g"
-+#line 1956 "./glsl.g"
- 
- case 170: {
-     ast(1) = makeBasicType(T_DVEC4);
- }   break;
- 
--#line 1969 "./glsl.g"
-+#line 1963 "./glsl.g"
- 
- case 171: {
-     ast(1) = makeBasicType(T_BVEC2);
- }   break;
- 
--#line 1976 "./glsl.g"
-+#line 1970 "./glsl.g"
- 
- case 172: {
-     ast(1) = makeBasicType(T_BVEC3);
- }   break;
- 
--#line 1983 "./glsl.g"
-+#line 1977 "./glsl.g"
- 
- case 173: {
-     ast(1) = makeBasicType(T_BVEC4);
- }   break;
- 
--#line 1990 "./glsl.g"
-+#line 1984 "./glsl.g"
- 
- case 174: {
-     ast(1) = makeBasicType(T_IVEC2);
- }   break;
- 
--#line 1997 "./glsl.g"
-+#line 1991 "./glsl.g"
- 
- case 175: {
-     ast(1) = makeBasicType(T_IVEC3);
- }   break;
- 
--#line 2004 "./glsl.g"
-+#line 1998 "./glsl.g"
- 
- case 176: {
-     ast(1) = makeBasicType(T_IVEC4);
- }   break;
- 
--#line 2011 "./glsl.g"
-+#line 2005 "./glsl.g"
- 
- case 177: {
-     ast(1) = makeBasicType(T_UVEC2);
- }   break;
- 
--#line 2018 "./glsl.g"
-+#line 2012 "./glsl.g"
- 
- case 178: {
-     ast(1) = makeBasicType(T_UVEC3);
- }   break;
- 
--#line 2025 "./glsl.g"
-+#line 2019 "./glsl.g"
- 
- case 179: {
-     ast(1) = makeBasicType(T_UVEC4);
- }   break;
- 
--#line 2032 "./glsl.g"
-+#line 2026 "./glsl.g"
- 
- case 180: {
-     ast(1) = makeBasicType(T_MAT2);
- }   break;
- 
--#line 2039 "./glsl.g"
-+#line 2033 "./glsl.g"
- 
- case 181: {
-     ast(1) = makeBasicType(T_MAT3);
- }   break;
- 
--#line 2046 "./glsl.g"
-+#line 2040 "./glsl.g"
- 
- case 182: {
-     ast(1) = makeBasicType(T_MAT4);
- }   break;
- 
--#line 2053 "./glsl.g"
-+#line 2047 "./glsl.g"
- 
- case 183: {
-     ast(1) = makeBasicType(T_MAT2);
- }   break;
- 
--#line 2060 "./glsl.g"
-+#line 2054 "./glsl.g"
- 
- case 184: {
-     ast(1) = makeBasicType(T_MAT2X3);
- }   break;
- 
--#line 2067 "./glsl.g"
-+#line 2061 "./glsl.g"
- 
- case 185: {
-     ast(1) = makeBasicType(T_MAT2X4);
- }   break;
- 
--#line 2074 "./glsl.g"
-+#line 2068 "./glsl.g"
- 
- case 186: {
-     ast(1) = makeBasicType(T_MAT3X2);
- }   break;
- 
--#line 2081 "./glsl.g"
-+#line 2075 "./glsl.g"
- 
- case 187: {
-     ast(1) = makeBasicType(T_MAT3);
- }   break;
- 
--#line 2088 "./glsl.g"
-+#line 2082 "./glsl.g"
- 
- case 188: {
-     ast(1) = makeBasicType(T_MAT3X4);
- }   break;
- 
--#line 2095 "./glsl.g"
-+#line 2089 "./glsl.g"
- 
- case 189: {
-     ast(1) = makeBasicType(T_MAT4X2);
- }   break;
- 
--#line 2102 "./glsl.g"
-+#line 2096 "./glsl.g"
- 
- case 190: {
-     ast(1) = makeBasicType(T_MAT4X3);
- }   break;
- 
--#line 2109 "./glsl.g"
-+#line 2103 "./glsl.g"
- 
- case 191: {
-     ast(1) = makeBasicType(T_MAT4);
- }   break;
- 
--#line 2116 "./glsl.g"
-+#line 2110 "./glsl.g"
- 
- case 192: {
-     ast(1) = makeBasicType(T_DMAT2);
- }   break;
- 
--#line 2123 "./glsl.g"
-+#line 2117 "./glsl.g"
- 
- case 193: {
-     ast(1) = makeBasicType(T_DMAT3);
- }   break;
- 
--#line 2130 "./glsl.g"
-+#line 2124 "./glsl.g"
- 
- case 194: {
-     ast(1) = makeBasicType(T_DMAT4);
- }   break;
- 
--#line 2137 "./glsl.g"
-+#line 2131 "./glsl.g"
- 
- case 195: {
-     ast(1) = makeBasicType(T_DMAT2);
- }   break;
- 
--#line 2144 "./glsl.g"
-+#line 2138 "./glsl.g"
- 
- case 196: {
-     ast(1) = makeBasicType(T_DMAT2X3);
- }   break;
- 
--#line 2151 "./glsl.g"
-+#line 2145 "./glsl.g"
- 
- case 197: {
-     ast(1) = makeBasicType(T_DMAT2X4);
- }   break;
- 
--#line 2158 "./glsl.g"
-+#line 2152 "./glsl.g"
- 
- case 198: {
-     ast(1) = makeBasicType(T_DMAT3X2);
- }   break;
- 
--#line 2165 "./glsl.g"
-+#line 2159 "./glsl.g"
- 
- case 199: {
-     ast(1) = makeBasicType(T_DMAT3);
- }   break;
- 
--#line 2172 "./glsl.g"
-+#line 2166 "./glsl.g"
- 
- case 200: {
-     ast(1) = makeBasicType(T_DMAT3X4);
- }   break;
- 
--#line 2179 "./glsl.g"
-+#line 2173 "./glsl.g"
- 
- case 201: {
-     ast(1) = makeBasicType(T_DMAT4X2);
- }   break;
- 
--#line 2186 "./glsl.g"
-+#line 2180 "./glsl.g"
- 
- case 202: {
-     ast(1) = makeBasicType(T_DMAT4X3);
- }   break;
- 
--#line 2193 "./glsl.g"
-+#line 2187 "./glsl.g"
- 
- case 203: {
-     ast(1) = makeBasicType(T_DMAT4);
- }   break;
- 
--#line 2200 "./glsl.g"
-+#line 2194 "./glsl.g"
- 
- case 204: {
-     ast(1) = makeBasicType(T_SAMPLER1D);
- }   break;
- 
--#line 2207 "./glsl.g"
-+#line 2201 "./glsl.g"
- 
- case 205: {
-     ast(1) = makeBasicType(T_SAMPLER2D);
- }   break;
- 
--#line 2214 "./glsl.g"
-+#line 2208 "./glsl.g"
- 
- case 206: {
-     ast(1) = makeBasicType(T_SAMPLER3D);
- }   break;
- 
--#line 2221 "./glsl.g"
-+#line 2215 "./glsl.g"
- 
- case 207: {
-     ast(1) = makeBasicType(T_SAMPLERCUBE);
- }   break;
- 
--#line 2228 "./glsl.g"
-+#line 2222 "./glsl.g"
- 
- case 208: {
-     ast(1) = makeBasicType(T_SAMPLER1DSHADOW);
- }   break;
- 
--#line 2235 "./glsl.g"
-+#line 2229 "./glsl.g"
- 
- case 209: {
-     ast(1) = makeBasicType(T_SAMPLER2DSHADOW);
- }   break;
- 
--#line 2242 "./glsl.g"
-+#line 2236 "./glsl.g"
- 
- case 210: {
-     ast(1) = makeBasicType(T_SAMPLERCUBESHADOW);
- }   break;
- 
--#line 2249 "./glsl.g"
-+#line 2243 "./glsl.g"
- 
- case 211: {
-     ast(1) = makeBasicType(T_SAMPLER1DARRAY);
- }   break;
- 
--#line 2256 "./glsl.g"
-+#line 2250 "./glsl.g"
- 
- case 212: {
-     ast(1) = makeBasicType(T_SAMPLER2DARRAY);
- }   break;
- 
--#line 2263 "./glsl.g"
-+#line 2257 "./glsl.g"
- 
- case 213: {
-     ast(1) = makeBasicType(T_SAMPLER1DARRAYSHADOW);
- }   break;
- 
--#line 2270 "./glsl.g"
-+#line 2264 "./glsl.g"
- 
- case 214: {
-     ast(1) = makeBasicType(T_SAMPLER2DARRAYSHADOW);
- }   break;
- 
--#line 2277 "./glsl.g"
-+#line 2271 "./glsl.g"
- 
- case 215: {
-     ast(1) = makeBasicType(T_SAMPLERCUBEARRAY);
- }   break;
- 
--#line 2284 "./glsl.g"
-+#line 2278 "./glsl.g"
- 
- case 216: {
-     ast(1) = makeBasicType(T_SAMPLERCUBEARRAYSHADOW);
- }   break;
- 
--#line 2291 "./glsl.g"
-+#line 2285 "./glsl.g"
- 
- case 217: {
-     ast(1) = makeBasicType(T_ISAMPLER1D);
- }   break;
- 
--#line 2298 "./glsl.g"
-+#line 2292 "./glsl.g"
- 
- case 218: {
-     ast(1) = makeBasicType(T_ISAMPLER2D);
- }   break;
- 
--#line 2305 "./glsl.g"
-+#line 2299 "./glsl.g"
- 
- case 219: {
-     ast(1) = makeBasicType(T_ISAMPLER3D);
- }   break;
- 
--#line 2312 "./glsl.g"
-+#line 2306 "./glsl.g"
- 
- case 220: {
-     ast(1) = makeBasicType(T_ISAMPLERCUBE);
- }   break;
- 
--#line 2319 "./glsl.g"
-+#line 2313 "./glsl.g"
- 
- case 221: {
-     ast(1) = makeBasicType(T_ISAMPLER1DARRAY);
- }   break;
- 
--#line 2326 "./glsl.g"
-+#line 2320 "./glsl.g"
- 
- case 222: {
-     ast(1) = makeBasicType(T_ISAMPLER2DARRAY);
- }   break;
- 
--#line 2333 "./glsl.g"
-+#line 2327 "./glsl.g"
- 
- case 223: {
-     ast(1) = makeBasicType(T_ISAMPLERCUBEARRAY);
- }   break;
- 
--#line 2340 "./glsl.g"
-+#line 2334 "./glsl.g"
- 
- case 224: {
-     ast(1) = makeBasicType(T_USAMPLER1D);
- }   break;
- 
--#line 2347 "./glsl.g"
-+#line 2341 "./glsl.g"
- 
- case 225: {
-     ast(1) = makeBasicType(T_USAMPLER2D);
- }   break;
- 
--#line 2354 "./glsl.g"
-+#line 2348 "./glsl.g"
- 
- case 226: {
-     ast(1) = makeBasicType(T_USAMPLER3D);
- }   break;
- 
--#line 2361 "./glsl.g"
-+#line 2355 "./glsl.g"
- 
- case 227: {
-     ast(1) = makeBasicType(T_USAMPLERCUBE);
- }   break;
- 
--#line 2368 "./glsl.g"
-+#line 2362 "./glsl.g"
- 
- case 228: {
-     ast(1) = makeBasicType(T_USAMPLER1DARRAY);
- }   break;
- 
--#line 2375 "./glsl.g"
-+#line 2369 "./glsl.g"
- 
- case 229: {
-     ast(1) = makeBasicType(T_USAMPLER2DARRAY);
- }   break;
- 
--#line 2382 "./glsl.g"
-+#line 2376 "./glsl.g"
- 
- case 230: {
-     ast(1) = makeBasicType(T_USAMPLERCUBEARRAY);
- }   break;
- 
--#line 2389 "./glsl.g"
-+#line 2383 "./glsl.g"
- 
- case 231: {
-     ast(1) = makeBasicType(T_SAMPLER2DRECT);
- }   break;
- 
--#line 2396 "./glsl.g"
-+#line 2390 "./glsl.g"
- 
- case 232: {
-     ast(1) = makeBasicType(T_SAMPLER2DRECTSHADOW);
- }   break;
- 
--#line 2403 "./glsl.g"
-+#line 2397 "./glsl.g"
- 
- case 233: {
-     ast(1) = makeBasicType(T_ISAMPLER2DRECT);
- }   break;
- 
--#line 2410 "./glsl.g"
-+#line 2404 "./glsl.g"
- 
- case 234: {
-     ast(1) = makeBasicType(T_USAMPLER2DRECT);
- }   break;
- 
--#line 2417 "./glsl.g"
-+#line 2411 "./glsl.g"
- 
- case 235: {
-     ast(1) = makeBasicType(T_SAMPLERBUFFER);
- }   break;
- 
--#line 2424 "./glsl.g"
-+#line 2418 "./glsl.g"
- 
- case 236: {
-     ast(1) = makeBasicType(T_ISAMPLERBUFFER);
- }   break;
- 
--#line 2431 "./glsl.g"
-+#line 2425 "./glsl.g"
- 
- case 237: {
-     ast(1) = makeBasicType(T_USAMPLERBUFFER);
- }   break;
- 
--#line 2438 "./glsl.g"
-+#line 2432 "./glsl.g"
- 
- case 238: {
-     ast(1) = makeBasicType(T_SAMPLER2DMS);
- }   break;
- 
--#line 2445 "./glsl.g"
-+#line 2439 "./glsl.g"
- 
- case 239: {
-     ast(1) = makeBasicType(T_ISAMPLER2DMS);
- }   break;
- 
--#line 2452 "./glsl.g"
-+#line 2446 "./glsl.g"
- 
- case 240: {
-     ast(1) = makeBasicType(T_USAMPLER2DMS);
- }   break;
- 
--#line 2459 "./glsl.g"
-+#line 2453 "./glsl.g"
- 
- case 241: {
-     ast(1) = makeBasicType(T_SAMPLER2DMSARRAY);
- }   break;
- 
--#line 2466 "./glsl.g"
-+#line 2460 "./glsl.g"
- 
- case 242: {
-     ast(1) = makeBasicType(T_ISAMPLER2DMSARRAY);
- }   break;
- 
--#line 2473 "./glsl.g"
-+#line 2467 "./glsl.g"
- 
- case 243: {
-     ast(1) = makeBasicType(T_USAMPLER2DMSARRAY);
- }   break;
- 
--#line 2480 "./glsl.g"
-+#line 2474 "./glsl.g"
- 
- case 244: {
-     // nothing to do.
- }   break;
- 
--#line 2487 "./glsl.g"
-+#line 2481 "./glsl.g"
- 
- case 245: {
-     ast(1) = makeAstNode<NamedTypeAST>(string(1));
- }   break;
- 
--#line 2494 "./glsl.g"
-+#line 2488 "./glsl.g"
- 
- case 246: {
-     sym(1).precision = TypeAST::Highp;
- }   break;
- 
--#line 2501 "./glsl.g"
-+#line 2495 "./glsl.g"
- 
- case 247: {
-     sym(1).precision = TypeAST::Mediump;
- }   break;
- 
--#line 2508 "./glsl.g"
-+#line 2502 "./glsl.g"
- 
- case 248: {
-     sym(1).precision = TypeAST::Lowp;
- }   break;
- 
--#line 2515 "./glsl.g"
-+#line 2509 "./glsl.g"
- 
- case 249: {
-     ast(1) = makeAstNode<StructTypeAST>(string(2), sym(4).field_list);
- }   break;
- 
--#line 2522 "./glsl.g"
-+#line 2516 "./glsl.g"
- 
- case 250: {
-     ast(1) = makeAstNode<StructTypeAST>(sym(3).field_list);
- }   break;
- 
--#line 2529 "./glsl.g"
-+#line 2523 "./glsl.g"
- 
- case 251: {
-     // nothing to do.
- }   break;
- 
--#line 2536 "./glsl.g"
-+#line 2530 "./glsl.g"
- 
- case 252: {
-     sym(1).field_list = appendLists(sym(1).field_list, sym(2).field_list);
- }   break;
- 
--#line 2543 "./glsl.g"
-+#line 2537 "./glsl.g"
- 
- case 253: {
-     sym(1).field_list = StructTypeAST::fixInnerTypes(type(1), sym(2).field_list);
- }   break;
- 
--#line 2550 "./glsl.g"
-+#line 2544 "./glsl.g"
- 
- case 254: {
-     sym(1).field_list = StructTypeAST::fixInnerTypes
-@@ -1870,106 +1870,106 @@ case 254: {
-              sym(1).type_qualifier.layout_list), sym(3).field_list);
- }   break;
- 
--#line 2560 "./glsl.g"
-+#line 2554 "./glsl.g"
- 
- case 255: {
-     // nothing to do.
-     sym(1).field_list = makeAstNode< List<StructTypeAST::Field *> >(sym(1).field);
- }   break;
- 
--#line 2568 "./glsl.g"
-+#line 2562 "./glsl.g"
- 
- case 256: {
-     sym(1).field_list = makeAstNode< List<StructTypeAST::Field *> >(sym(1).field_list, sym(3).field);
- }   break;
- 
--#line 2575 "./glsl.g"
-+#line 2569 "./glsl.g"
- 
- case 257: {
-     sym(1).field = makeAstNode<StructTypeAST::Field>(string(1));
- }   break;
- 
--#line 2582 "./glsl.g"
-+#line 2576 "./glsl.g"
- 
- case 258: {
-     sym(1).field = makeAstNode<StructTypeAST::Field>
-         (string(1), makeAstNode<ArrayTypeAST>((TypeAST *)0));
- }   break;
- 
--#line 2590 "./glsl.g"
-+#line 2584 "./glsl.g"
- 
- case 259: {
-     sym(1).field = makeAstNode<StructTypeAST::Field>
-         (string(1), makeAstNode<ArrayTypeAST>((TypeAST *)0, expression(3)));
- }   break;
- 
--#line 2598 "./glsl.g"
-+#line 2592 "./glsl.g"
- 
- case 260: {
-     // nothing to do.
- }   break;
- 
--#line 2605 "./glsl.g"
-+#line 2599 "./glsl.g"
- 
- case 261: {
-     ast(1) = makeAstNode<DeclarationStatementAST>(sym(1).declaration);
- }   break;
- 
--#line 2612 "./glsl.g"
-+#line 2606 "./glsl.g"
- 
- case 262: {
-     // nothing to do.
- }   break;
- 
--#line 2619 "./glsl.g"
-+#line 2613 "./glsl.g"
- 
- case 263: {
-     // nothing to do.
- }   break;
- 
--#line 2626 "./glsl.g"
-+#line 2620 "./glsl.g"
- 
- case 264: {
-     // nothing to do.
- }   break;
- 
--#line 2633 "./glsl.g"
-+#line 2627 "./glsl.g"
- 
- case 265: {
-     // nothing to do.
- }   break;
- 
--#line 2640 "./glsl.g"
-+#line 2634 "./glsl.g"
- 
- case 266: {
-     // nothing to do.
- }   break;
- 
--#line 2647 "./glsl.g"
-+#line 2641 "./glsl.g"
- 
- case 267: {
-     // nothing to do.
- }   break;
- 
--#line 2654 "./glsl.g"
-+#line 2648 "./glsl.g"
- 
- case 268: {
-     // nothing to do.
- }   break;
- 
--#line 2661 "./glsl.g"
-+#line 2655 "./glsl.g"
- 
- case 269: {
-     // nothing to do.
- }   break;
- 
--#line 2668 "./glsl.g"
-+#line 2662 "./glsl.g"
- 
- case 270: {
-     // nothing to do.
- }   break;
- 
--#line 2675 "./glsl.g"
-+#line 2669 "./glsl.g"
- 
- case 271: {
-     CompoundStatementAST *stmt = makeAstNode<CompoundStatementAST>();
-@@ -1978,7 +1978,7 @@ case 271: {
-     ast(1) = stmt;
- }   break;
- 
--#line 2685 "./glsl.g"
-+#line 2679 "./glsl.g"
- 
- case 272: {
-     CompoundStatementAST *stmt = makeAstNode<CompoundStatementAST>(sym(2).statement_list);
-@@ -1987,19 +1987,19 @@ case 272: {
-     ast(1) = stmt;
- }   break;
- 
--#line 2695 "./glsl.g"
-+#line 2689 "./glsl.g"
- 
- case 273: {
-     // nothing to do.
- }   break;
- 
--#line 2702 "./glsl.g"
-+#line 2696 "./glsl.g"
- 
- case 274: {
-     // nothing to do.
- }   break;
- 
--#line 2709 "./glsl.g"
-+#line 2703 "./glsl.g"
- 
- case 275: {
-     CompoundStatementAST *stmt = makeAstNode<CompoundStatementAST>();
-@@ -2008,7 +2008,7 @@ case 275: {
-     ast(1) = stmt;
- }   break;
- 
--#line 2719 "./glsl.g"
-+#line 2713 "./glsl.g"
- 
- case 276: {
-     CompoundStatementAST *stmt = makeAstNode<CompoundStatementAST>(sym(2).statement_list);
-@@ -2017,186 +2017,186 @@ case 276: {
-     ast(1) = stmt;
- }   break;
- 
--#line 2729 "./glsl.g"
-+#line 2723 "./glsl.g"
- 
- case 277: {
-     sym(1).statement_list = makeAstNode< List<StatementAST *> >(sym(1).statement);
- }   break;
- 
--#line 2736 "./glsl.g"
-+#line 2730 "./glsl.g"
- 
- case 278: {
-     sym(1).statement_list = makeAstNode< List<StatementAST *> >(sym(1).statement_list, sym(2).statement);
- }   break;
- 
--#line 2743 "./glsl.g"
-+#line 2737 "./glsl.g"
- 
- case 279: {
-     ast(1) = makeAstNode<CompoundStatementAST>();  // Empty statement
- }   break;
- 
--#line 2750 "./glsl.g"
-+#line 2744 "./glsl.g"
- 
- case 280: {
-     ast(1) = makeAstNode<ExpressionStatementAST>(expression(1));
- }   break;
- 
--#line 2757 "./glsl.g"
-+#line 2751 "./glsl.g"
- 
- case 281: {
-     ast(1) = makeAstNode<IfStatementAST>(expression(3), sym(5).ifstmt.thenClause, sym(5).ifstmt.elseClause);
- }   break;
- 
--#line 2764 "./glsl.g"
-+#line 2758 "./glsl.g"
- 
- case 282: {
-     sym(1).ifstmt.thenClause = statement(1);
-     sym(1).ifstmt.elseClause = statement(3);
- }   break;
- 
--#line 2772 "./glsl.g"
-+#line 2766 "./glsl.g"
- 
- case 283: {
-     sym(1).ifstmt.thenClause = statement(1);
-     sym(1).ifstmt.elseClause = 0;
- }   break;
- 
--#line 2780 "./glsl.g"
-+#line 2774 "./glsl.g"
- 
- case 284: {
-     // nothing to do.
- }   break;
- 
--#line 2787 "./glsl.g"
-+#line 2781 "./glsl.g"
- 
- case 285: {
-     ast(1) = makeAstNode<DeclarationExpressionAST>
-         (type(1), string(2), expression(4));
- }   break;
- 
--#line 2795 "./glsl.g"
-+#line 2789 "./glsl.g"
- 
- case 286: {
-     ast(1) = makeAstNode<SwitchStatementAST>(expression(3), statement(6));
- }   break;
- 
--#line 2802 "./glsl.g"
-+#line 2796 "./glsl.g"
- 
- case 287: {
-     ast(1) = makeAstNode<CompoundStatementAST>();
- }   break;
- 
--#line 2809 "./glsl.g"
-+#line 2803 "./glsl.g"
- 
- case 288: {
-     ast(1) = makeAstNode<CompoundStatementAST>(sym(1).statement_list);
- }   break;
- 
--#line 2816 "./glsl.g"
-+#line 2810 "./glsl.g"
- 
- case 289: {
-     ast(1) = makeAstNode<CaseLabelStatementAST>(expression(2));
- }   break;
- 
--#line 2823 "./glsl.g"
-+#line 2817 "./glsl.g"
- 
- case 290: {
-     ast(1) = makeAstNode<CaseLabelStatementAST>();
- }   break;
- 
--#line 2830 "./glsl.g"
-+#line 2824 "./glsl.g"
- 
- case 291: {
-     ast(1) = makeAstNode<WhileStatementAST>(expression(3), statement(5));
- }   break;
- 
--#line 2837 "./glsl.g"
-+#line 2831 "./glsl.g"
- 
- case 292: {
-     ast(1) = makeAstNode<DoStatementAST>(statement(2), expression(5));
- }   break;
- 
--#line 2844 "./glsl.g"
-+#line 2838 "./glsl.g"
- 
- case 293: {
-     ast(1) = makeAstNode<ForStatementAST>(statement(3), sym(4).forstmt.condition, sym(4).forstmt.increment, statement(6));
- }   break;
- 
--#line 2851 "./glsl.g"
-+#line 2845 "./glsl.g"
- 
- case 294: {
-     // nothing to do.
- }   break;
- 
--#line 2858 "./glsl.g"
-+#line 2852 "./glsl.g"
- 
- case 295: {
-     // nothing to do.
- }   break;
- 
--#line 2865 "./glsl.g"
-+#line 2859 "./glsl.g"
- 
- case 296: {
-     // nothing to do.
- }   break;
- 
--#line 2872 "./glsl.g"
-+#line 2866 "./glsl.g"
- 
- case 297: {
-     // nothing to do.
- }   break;
- 
--#line 2879 "./glsl.g"
-+#line 2873 "./glsl.g"
- 
- case 298: {
-     sym(1).forstmt.condition = expression(1);
-     sym(1).forstmt.increment = 0;
- }   break;
- 
--#line 2887 "./glsl.g"
-+#line 2881 "./glsl.g"
- 
- case 299: {
-     sym(1).forstmt.condition = expression(1);
-     sym(1).forstmt.increment = expression(3);
- }   break;
- 
--#line 2895 "./glsl.g"
-+#line 2889 "./glsl.g"
- 
- case 300: {
-     ast(1) = makeAstNode<JumpStatementAST>(AST::Kind_Continue);
- }   break;
- 
--#line 2902 "./glsl.g"
-+#line 2896 "./glsl.g"
- 
- case 301: {
-     ast(1) = makeAstNode<JumpStatementAST>(AST::Kind_Break);
- }   break;
- 
--#line 2909 "./glsl.g"
-+#line 2903 "./glsl.g"
- 
- case 302: {
-     ast(1) = makeAstNode<ReturnStatementAST>();
- }   break;
- 
--#line 2916 "./glsl.g"
-+#line 2910 "./glsl.g"
- 
- case 303: {
-     ast(1) = makeAstNode<ReturnStatementAST>(expression(2));
- }   break;
- 
--#line 2923 "./glsl.g"
-+#line 2917 "./glsl.g"
- 
- case 304: {
-     ast(1) = makeAstNode<JumpStatementAST>(AST::Kind_Discard);
- }   break;
- 
--#line 2930 "./glsl.g"
-+#line 2924 "./glsl.g"
- 
- case 305: {
-     ast(1) = makeAstNode<TranslationUnitAST>(sym(1).declaration_list);
- }   break;
- 
--#line 2937 "./glsl.g"
-+#line 2931 "./glsl.g"
- 
- case 306: {
-     if (sym(1).declaration) {
-@@ -2207,7 +2207,7 @@ case 306: {
-     }
- }   break;
- 
--#line 2949 "./glsl.g"
-+#line 2943 "./glsl.g"
- 
- case 307: {
-     if (sym(1).declaration_list && sym(2).declaration) {
-@@ -2223,49 +2223,49 @@ case 307: {
-     }
- }   break;
- 
--#line 2966 "./glsl.g"
-+#line 2960 "./glsl.g"
- 
- case 308: {
-     // nothing to do.
- }   break;
- 
--#line 2973 "./glsl.g"
-+#line 2967 "./glsl.g"
- 
- case 309: {
-     // nothing to do.
- }   break;
- 
--#line 2980 "./glsl.g"
-+#line 2974 "./glsl.g"
- 
- case 310: {
-     ast(1) = 0;
- }   break;
- 
--#line 2987 "./glsl.g"
-+#line 2981 "./glsl.g"
- 
- case 311: {
-     function(1)->body = statement(2);
- }   break;
- 
--#line 2994 "./glsl.g"
-+#line 2988 "./glsl.g"
- 
- case 312: {
-     ast(1) = 0;
- }   break;
- 
--#line 3002 "./glsl.g"
-+#line 2996 "./glsl.g"
- 
- case 313: {
-     ast(1) = ast(2);
- }   break;
- 
--#line 3009 "./glsl.g"
-+#line 3003 "./glsl.g"
- 
- case 314: {
-     ast(1) = ast(2);
- }   break;
- 
--#line 3015 "./glsl.g"
-+#line 3009 "./glsl.g"
- 
- } // end switch
- } // end Parser::reduce()
-diff --git a/src/libs/glsl/glslparser.h b/src/libs/glsl/glslparser.h
-index 7bf70e2..bab2616 100644
---- a/src/libs/glsl/glslparser.h
-+++ b/src/libs/glsl/glslparser.h
-@@ -1,5 +1,5 @@
- 
--#line 217 "./glsl.g"
-+#line 215 "./glsl.g"
- 
- /**************************************************************************
- **
--- 
-1.7.10
-
diff --git a/community/qtemu/PKGBUILD b/community/qtemu/PKGBUILD
index 6504de035..75e6fd54e 100644
--- a/community/qtemu/PKGBUILD
+++ b/community/qtemu/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 83889 2013-02-06 11:40:15Z spupykin $
+# $Id: PKGBUILD 85402 2013-03-01 10:39:15Z andrea $
 # Maintainer: Geoffroy Carrier <geoffroy.carrier@koon.fr>
 # Previous Contributor: Urs Wolfer <uwolfer @ fwo.ch>
 
 pkgname=qtemu
 pkgver=1.0.5
-pkgrel=7
+pkgrel=8
 pkgdesc="Graphical user interface for QEMU written in Qt4"
 url="http://qtemu.org"
 license=("GPL")
 arch=('i686' 'x86_64')
 makedepends=('cmake')
-depends=('qemu' 'qt>=4.1')
+depends=('qemu' 'qt4')
 source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2
 	http://qtemu.svn.sourceforge.net/viewvc/qtemu/trunk/qtemu/misc/qtemu.desktop)
 md5sums=('3b93e209dc62e52a1d94c8eb24d0b149'
diff --git a/community/qtfm/PKGBUILD b/community/qtfm/PKGBUILD
index ed5112058..6dc872ed6 100644
--- a/community/qtfm/PKGBUILD
+++ b/community/qtfm/PKGBUILD
@@ -1,30 +1,30 @@
-# $Id: PKGBUILD 72625 2012-06-17 19:58:45Z jlichtblau $
+# $Id: PKGBUILD 85404 2013-03-01 10:39:23Z andrea $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Brad Fanella <bradfanella@archlinux.us>
 # Contributor: Wittfella <wittfella@wittfella.com>
 
 pkgname=qtfm
 pkgver=5.5
-pkgrel=1
+pkgrel=2
 pkgdesc="A lightweight file manager"
 arch=('i686' 'x86_64')
 url="http://www.qtfm.org/"
 license=('GPL')
-depends=('qt')
+depends=('file' 'qt4')
 install=$pkgname.install
 changelog=$pkgname.changelog
 source=(http://www.qtfm.org/$pkgname-$pkgver.tar.gz)
 sha256sums=('845fc43800d12483fa1993c56a8c965ff8dc917b97f03d9ce2e24318806fb211')
 
 build() {
-  cd ${srcdir}/$pkgname-$pkgver
+  cd "${srcdir}/$pkgname-$pkgver"
 
   qmake
   make
 }
 
 package() {
-  cd ${srcdir}/$pkgname-$pkgver
+  cd "${srcdir}/$pkgname-$pkgver"
 
-  make INSTALL_ROOT=${pkgdir} install
+  make INSTALL_ROOT="${pkgdir}" install
 }
diff --git a/community/qtractor/PKGBUILD b/community/qtractor/PKGBUILD
index aad70351f..3e7de010f 100644
--- a/community/qtractor/PKGBUILD
+++ b/community/qtractor/PKGBUILD
@@ -1,18 +1,19 @@
-# $Id: PKGBUILD 83551 2013-02-02 19:12:45Z schiv $
+# $Id: PKGBUILD 85406 2013-03-01 10:39:31Z andrea $
 # Maintainer: Ray Rashif <schiv@archlinux.org>
 # Contributor: Philipp Überbacher <hollunder at gmx dot at>
 
 pkgname=qtractor
 pkgver=0.5.7
-pkgrel=1
+pkgrel=2
 pkgdesc="Audio/MIDI multitrack sequencer"
 arch=('i686' 'x86_64')
 url="http://qtractor.sourceforge.net/"
 license=('GPL')
-depends=('qt' 'jack' 'suil' 'lilv' 'libmad'
-         'libsamplerate' 'rubberband' 'liblo')
+depends=('qt4' 'jack' 'suil' 'lilv' 'libmad'
+         'libsamplerate' 'rubberband' 'liblo' 'shared-mime-info')
 makedepends=('ladspa' 'dssi')
 [ "$CARCH" = "i686" ] && optdepends=('dssi-vst: win32 VST support')
+install=qtractor.install
 source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz")
 md5sums=('a3f42dc1125d6ec0bd88286fe7738f04')
 
diff --git a/community/qtractor/qtractor.install b/community/qtractor/qtractor.install
new file mode 100644
index 000000000..3b3aff7d9
--- /dev/null
+++ b/community/qtractor/qtractor.install
@@ -0,0 +1,13 @@
+post_install() {
+  xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+  update-mime-database usr/share/mime &> /dev/null
+  update-desktop-database -q
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}
diff --git a/community/qtspim/PKGBUILD b/community/qtspim/PKGBUILD
index 1769c6e41..1dc5e82a1 100644
--- a/community/qtspim/PKGBUILD
+++ b/community/qtspim/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 69610 2012-04-20 10:56:45Z lfleischer $
+# $Id: PKGBUILD 85407 2013-03-01 10:39:40Z andrea $
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: Lukas Jirkovsky <l.jirkovsky@gmail.com>
 
 pkgname=qtspim
 pkgver=9.1.7
-pkgrel=1
+pkgrel=2
 pkgdesc="New user interface for spim, a MIPS simulator."
 arch=('i686' 'x86_64')
 url="http://spimsimulator.sourceforge.net/"
 license=('BSD')
-depends=('qt')
+depends=('qt4')
 makedepends=('subversion')
 
 __svntrunk="https://spimsimulator.svn.sourceforge.net/svnroot/spimsimulator"
diff --git a/community/rbutil/PKGBUILD b/community/rbutil/PKGBUILD
index 228292f4c..8bccc4a23 100755
--- a/community/rbutil/PKGBUILD
+++ b/community/rbutil/PKGBUILD
@@ -1,16 +1,17 @@
-# $Id: PKGBUILD 85270 2013-02-28 11:01:50Z alucryd $
+# $Id: PKGBUILD 85455 2013-03-01 19:10:50Z andrea $
 # Maintainer: Maxime Gauduin <alucryd@gmail.com>
 # Contributor: said <atvordhosbn@gmail.com>
 # Contributor: clinx <clinx.hacker@googlemail.com>
 
 pkgname=rbutil
 pkgver=1.3.1
-pkgrel=2
+pkgrel=3
 pkgdesc="Rockbox Utility"
 arch=('i686' 'x86_64')
 url="http://www.rockbox.org/twiki/bin/view/Main/RockboxUtility"
 license=("GPL")
-depends=('qt' 'libusb')
+depends=('qt4' 'libusb')
+optdepends=('speex: voice files support')
 source=("http://download.rockbox.org/${pkgname}/source/RockboxUtility-v${pkgver}-src.tar.bz2" "${pkgname}.desktop")
 sha256sums=('6c04b5c7eaad1762577908dedb9e40f5b0cee675150ae5ba844ea2c9bea294ca'
             '539285237af16fbc60a7501963e8c2f584e58a31f2613481e6b42d21337b7a25')
@@ -19,8 +20,8 @@ build() {
   cd "${srcdir}"/RockboxUtility-v${pkgver}/${pkgname}/rbutilqt
 
 # Build
-  lrelease rbutilqt.pro
-  qmake
+  lrelease-qt4 rbutilqt.pro
+  qmake-qt4
   make
 }
 
diff --git a/community/recoll/PKGBUILD b/community/recoll/PKGBUILD
index 4f37d3d5f..d4cbb739f 100644
--- a/community/recoll/PKGBUILD
+++ b/community/recoll/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 79504 2012-11-06 11:20:41Z spupykin $
+# $Id: PKGBUILD 85408 2013-03-01 10:39:48Z andrea $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
@@ -7,12 +7,12 @@
 
 pkgname=recoll
 pkgver=1.18.1
-pkgrel=1
+pkgrel=3
 pkgdesc="Full text search tool based on Xapian backend"
 arch=('i686' 'x86_64')
 url="http://www.lesbonscomptes.com/recoll/"
 license=('GPL')
-depends=('xapian-core>=1.0.15-1' 'qt' 'openssl' 'hicolor-icon-theme' 'qtwebkit')
+depends=('xapian-core>=1.0.15-1' 'qt4' 'openssl' 'hicolor-icon-theme' 'qtwebkit')
 makedepends=('python2')
 optdepends=('libxslt: for XML based formats (fb2,etc)'
 	    'unzip: for the OpenOffice.org documents'
diff --git a/community/rxvt-unicode/01-fix-screen-sel.patch b/community/rxvt-unicode/01-fix-screen-sel.patch
deleted file mode 100644
index bee7dc262..000000000
--- a/community/rxvt-unicode/01-fix-screen-sel.patch
+++ /dev/null
@@ -1,66 +0,0 @@
---- a/src/rxvt.h	2012-11-30 07:52:10.000000000 +0100
-+++ b/src/rxvt.h	2013-01-19 18:14:07.477653413 +0100
-@@ -1488,6 +1488,7 @@
-   void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW;
-   void scr_kill_char (line_t &l, int col) const NOTHROW;
-   int scr_scroll_text (int row1, int row2, int count) NOTHROW;
-+  void copy_line (line_t &dst, line_t &src);
-   void scr_reset ();
-   void scr_release () NOTHROW;
-   void scr_clear (bool really = false) NOTHROW;
---- a/src/screen.C	2012-11-30 08:13:38.000000000 +0100
-+++ b/src/screen.C	2013-01-19 18:17:13.431014964 +0100
-@@ -190,6 +190,16 @@
-   row_buf   = swap_buf  + nrow;
- }
- 
-+void
-+rxvt_term::copy_line (line_t &dst, line_t &src)
-+{
-+  scr_blank_screen_mem (dst, DEFAULT_RSTYLE);
-+  dst.l = min (src.l, ncol);
-+  memcpy (dst.t, src.t, sizeof (text_t) * dst.l);
-+  memcpy (dst.r, src.r, sizeof (rend_t) * dst.l);
-+  dst.f = src.f;
-+}
-+
- void ecb_cold
- rxvt_term::scr_reset ()
- {
-@@ -232,8 +242,6 @@
-   line_t *prev_swap_buf  = swap_buf;
-   line_t *prev_row_buf   = row_buf;
- 
--  int common_col = min (prev_ncol, ncol);
--
-   scr_alloc ();
- 
-   if (!prev_row_buf)
-@@ -277,13 +285,8 @@
- 
-       for (int row = min (nrow, prev_nrow); row--; )
-         {
--          scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
--          scr_blank_screen_mem (swap_buf  [row], DEFAULT_RSTYLE);
--
--          memcpy (drawn_buf [row].t, prev_drawn_buf [row].t, sizeof (text_t) * common_col);
--          memcpy (drawn_buf [row].r, prev_drawn_buf [row].r, sizeof (rend_t) * common_col);
--          memcpy (swap_buf  [row].t, prev_swap_buf  [row].t, sizeof (text_t) * common_col);
--          memcpy (swap_buf  [row].r, prev_swap_buf  [row].r, sizeof (rend_t) * common_col);
-+          copy_line (drawn_buf [row], prev_drawn_buf [row]);
-+          copy_line (swap_buf [row], prev_swap_buf [row]);
-         }
- 
-       int p    = MOD (term_start + prev_nrow, prev_total_rows);  // previous row
-@@ -388,10 +391,7 @@
-               line_t &src = prev_row_buf [MOD (term_start + row, prev_total_rows)];
-               line_t &dst = row_buf [row];
- 
--              scr_blank_screen_mem (dst, DEFAULT_RSTYLE);
--
--              memcpy (dst.t, src.t, sizeof (text_t) * common_col);
--              memcpy (dst.r, src.r, sizeof (rend_t) * common_col);
-+              copy_line (dst, src);
-             }
- 
-           for (int row = prev_nrow; row < nrow; row++)
diff --git a/community/rxvt-unicode/PKGBUILD b/community/rxvt-unicode/PKGBUILD
index 7eb95367e..73db74527 100644
--- a/community/rxvt-unicode/PKGBUILD
+++ b/community/rxvt-unicode/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 85229 2013-02-27 20:00:33Z andrea $
-# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org>
+# $Id: PKGBUILD 85462 2013-03-01 21:26:53Z seblu $
+# Maintainer: Sébastien Luttringer
 # Contributor: Angel Velasquez <angvp@archlinux.org>
 # Contributor: tobias <tobias@archlinux.org>
 # Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org
 
 pkgname=rxvt-unicode
-pkgver=9.16
-pkgrel=2
+pkgver=9.17
+pkgrel=1
 pkgdesc='An unicode enabled rxvt-clone terminal emulator (urxvt)'
 arch=('i686' 'x86_64')
 url='http://software.schmorp.de/pkg/rxvt-unicode.html'
@@ -18,17 +18,14 @@ source=(
   'urxvt.desktop'
   'urxvtc.desktop'
   'urxvt-tabbed.desktop'
-  '01-fix-screen-sel.patch'
 )
-md5sums=('2e2942e8367624affebc0568e3671b66'
+md5sums=('1270432bdc7ce17dbb07d41a607081e0'
          'c2b828d37d06cbf4c32937a2959f2fc2'
          '10e80aebaef042fb63d2585440dc3637'
-         '830abe6f31fb926a1bcd2650731be15e'
-         '266e027bd4a998073f17d548d288d414')
+         '830abe6f31fb926a1bcd2650731be15e')
 
 build() {
   cd $pkgname-$pkgver
-  patch -p1 -i "$srcdir/01-fix-screen-sel.patch"
   ./configure \
     --prefix=/usr \
     --with-terminfo=/usr/share/terminfo \
diff --git a/community/scantailor/PKGBUILD b/community/scantailor/PKGBUILD
index 859b781e0..a68db7903 100644
--- a/community/scantailor/PKGBUILD
+++ b/community/scantailor/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 66775 2012-02-28 14:29:17Z spupykin $
+# $Id: PKGBUILD 85409 2013-03-01 10:39:57Z andrea $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Denis Terskov aka neurosurgeon <terskov.den@gmail.com>
 
 pkgname=scantailor
 pkgver=0.9.11.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Interactive post-processing tool for scanned pages"
 arch=(i686 x86_64)
 url="http://scantailor.sourceforge.net"
 license="GPL"
-depends=('qt')
+depends=('qt4')
 makedepends=('cmake' 'boost')
 options=('!makeflags')
 source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz)
@@ -17,7 +17,6 @@ md5sums=('6cdca1b6d1dafd022ea94b4800dad340')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
-  cmake  .
   cmake \
 	-DCMAKE_CXX_FLAGS="-DBOOST_NO_MEMBER_TEMPLATE_FRIENDS" \
 	-DCMAKE_CXX_FLAGS_DEBUG="-DBOOST_NO_MEMBER_TEMPLATE_FRIENDS" \
@@ -25,5 +24,9 @@ build() {
 	-DCMAKE_INSTALL_PREFIX=/usr \
 	-DCMAKE_BUILD_TYPE=Release .
   make
+}
+
+package() {
+  cd $srcdir/$pkgname-$pkgver
   make DESTDIR="$pkgdir" install
 }
diff --git a/community/sigil/PKGBUILD b/community/sigil/PKGBUILD
index 2e210be9c..b6d034bcc 100644
--- a/community/sigil/PKGBUILD
+++ b/community/sigil/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 83275 2013-01-28 16:50:10Z stephane $
+# $Id: PKGBUILD 85410 2013-03-01 10:40:05Z andrea $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Larry Hajali <larryhaja [at] gmail [dot] com>
 
 pkgname=sigil
-pkgver=0.6.2
+pkgver=0.7.0
 pkgrel=2
 pkgdesc="WYSIWYG ebook editor"
 arch=('i686' 'x86_64') 
 url="http://code.google.com/p/sigil/"
 license=('GPL3')
-depends=('qtwebkit' 'boost-libs')
-makedepends=('cmake' 'gendesk' 'boost')
+depends=('qt5-webkit' 'boost-libs')
+makedepends=('qt5-addons' 'qt5-declarative' 'qt5-tools' 'cmake' 'gendesk' 'boost')
 install=sigil.install
 source=("http://sigil.googlecode.com/files/Sigil-${pkgver}-Code.zip")
-md5sums=('78615dc007c12cc34271243d82783a36')
+md5sums=('06ba5ace506e01adf4a37534fa276cec')
 
 build() {
   cd "${srcdir}"
@@ -21,6 +21,7 @@ build() {
 
   mkdir build
   cd build
+
   cmake -G "Unix Makefiles" \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_C_FLAGS:STRING="${CFLAGS}" \
diff --git a/community/signon/PKGBUILD b/community/signon/PKGBUILD
index 3a1e705bd..ece3f5921 100644
--- a/community/signon/PKGBUILD
+++ b/community/signon/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 83013 2013-01-26 15:03:10Z bgyorgy $
+# $Id: PKGBUILD 85411 2013-03-01 10:40:16Z andrea $
 # Maintainer: Balló György <ballogyor+arch at gmail dot com>
 
 pkgbase=signon
 pkgname=('signon' 'signon-doc')
 pkgver=8.46
-pkgrel=1
+pkgrel=2
 pkgdesc="Framework to provide credential storage and authentication service"
 arch=('i686' 'x86_64')
 url="http://code.google.com/p/accounts-sso/"
 license=('LGPL')
-depends=('qt' 'libproxy')
+depends=('qt4' 'libproxy')
 makedepends=('doxygen' 'graphviz' 'ttf-dejavu')
 backup=(etc/signond.conf)
 install=$pkgname.install
diff --git a/community/signon/cryptsetup-optional.patch b/community/signon/cryptsetup-optional.patch
deleted file mode 100644
index d6293e598..000000000
--- a/community/signon/cryptsetup-optional.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur signon-8.43.orig/src/extensions/extensions.pro signon-8.43/src/extensions/extensions.pro
---- signon-8.43.orig/src/extensions/extensions.pro	2012-09-18 14:59:58.000000000 +0200
-+++ signon-8.43/src/extensions/extensions.pro	2012-10-17 20:02:52.846790974 +0200
-@@ -1,7 +1,7 @@
- TEMPLATE = subdirs
- SUBDIRS =
- 
--system(pkg-config --exists libcryptsetup) {
-+CONFIG(cryptsetup) {
-     SUBDIRS += cryptsetup
- }
- 
diff --git a/community/sqlitebrowser/PKGBUILD b/community/sqlitebrowser/PKGBUILD
index 8b3219014..51ab75cc5 100644
--- a/community/sqlitebrowser/PKGBUILD
+++ b/community/sqlitebrowser/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 65487 2012-02-21 06:06:09Z spupykin $
+# $Id: PKGBUILD 85413 2013-03-01 10:40:34Z andrea $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Douglas Soares de Andrade <dsandrade@gmail.com>
 # Contributor: Michael Fellinger <m.fellinger@gmail.com>
@@ -6,12 +6,12 @@
 pkgname=sqlitebrowser
 pkgver=2.0b1
 _pkgrealver=200_b1
-pkgrel=2
+pkgrel=3
 pkgdesc="SQLite Database browser is a light GUI editor for SQLite databases, built on top of QT"
 arch=('i686' 'x86_64')
 url="http://sqlitebrowser.sf.net"
 license=('GPL')
-depends=('qt')
+depends=('qt4')
 source=(http://downloads.sourceforge.net/sourceforge/$pkgname/${pkgname}_${_pkgrealver}_src.tar.gz)
 md5sums=('5ca3d41cca454235b93ce72cd585dfe3')
 
diff --git a/community/synergy/PKGBUILD b/community/synergy/PKGBUILD
index 83e351a94..660cfa102 100644
--- a/community/synergy/PKGBUILD
+++ b/community/synergy/PKGBUILD
@@ -1,48 +1,57 @@
-# Maintainer: Jelle van der Waa <jelle vdwaa nl>
+# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
+# Contributor: Jelle van der Waa <jelle vdwaa nl>
 # Contributor: Stéphane Gaudreault <stephane@archlinux.org>
 # Contributor: Dale Blount <dale@archlinux.org>
 
 pkgname=synergy
 pkgver=1.4.10
-pkgrel=1
+pkgrel=2
 pkgdesc="Share a single mouse and keyboard between multiple computers"
 url="http://synergy-foss.org"
 arch=('i686' 'x86_64')
-depends=('gcc-libs' 'libxtst' 'libxinerama' )
+depends=('gcc-libs' 'libxtst' 'libxinerama')
+makedepends=('libxt' 'cmake' 'qt4')
+optdepends=('qt4: gui support')
 license=('GPL2')
-makedepends=('libxt' 'cmake')       # used by configure to test for libx11...
-backup=('etc/synergy.conf')
-source=("http://synergy.googlecode.com/files/$pkgname-$pkgver-Source.tar.gz" "${pkgname}s.rc" "synergys.socket" "synergys.service")
-
+source=("http://synergy.googlecode.com/files/$pkgname-$pkgver-Source.tar.gz"
+        "synergys.socket"
+        "synergys.service"
+        "synergy.png"
+        "synergy.desktop")
+md5sums=('18aee04a7e232e4d821f46ff24da3364'
+         '58f48336836d6faf3d5eecbe4155b77e'
+         'b95e4b83d8a19c0bd81a15280078fcd5'
+         '11fdb13390908e02c6e2f19c4c09eded'
+         '1e8d574c19994d13e6f342ed08e531bb')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}-Source"
 
-  cmake  -D CMAKE_INSTALL_PREFIX=/usr . 
+  cmake -D CMAKE_INSTALL_PREFIX=/usr . 
+  make
+
+  cd src/gui
+  qmake-qt4
   make
 }
 
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}-Source/bin"
 
-  #make DESTDIR="$pkgdir" install # doesn't work atm
-
   # install binary
-  install -d "$pkgdir/usr/bin/"
-  install -Dm755 synergyc $pkgdir/usr/bin/
-  install -Dm755 synergys $pkgdir/usr/bin/
+  install -Dm755 synergy "$pkgdir/usr/bin/synergy"
+  install -Dm755 synergyc "$pkgdir/usr/bin/synergyc"
+  install -Dm755 synergys "$pkgdir/usr/bin/synergys"
 
-  # install rc.d script  and config
-  install -d "${pkgdir}/etc/rc.d"
-  install -Dm644 $srcdir/$pkgname-$pkgver-Source/doc/${pkgname}.conf.example "${pkgdir}/etc" 
-  install -Dm755 $srcdir/${pkgname}s.rc "${pkgdir}/etc/rc.d/${pkgname}s" 
+  # install config
+  install -Dm644 "$srcdir/$pkgname-$pkgver-Source/doc/${pkgname}.conf.example" "${pkgdir}/etc/${pkgname}.conf.example" 
 
-  # Install systemd service and socket
+  # install systemd service and socket
   install -d "$pkgdir/usr/lib/systemd/system"
   install -Dm644 "$srcdir/synergys.service" "$pkgdir/usr/lib/systemd/system/"
   install -Dm644 "$srcdir/synergys.socket" "$pkgdir/usr/lib/systemd/system/"
+
+  # install desktop/icon stuff
+  install -Dm644 "$srcdir/synergy.png" "$pkgdir/usr/share/pixmaps/synergy.png"
+  install -Dm644 "$srcdir/synergy.desktop" "$pkgdir/usr/share/applications/synergy.desktop"
 }
-md5sums=('18aee04a7e232e4d821f46ff24da3364'
-         '8f8c01add9bf6e3ae9f37a36ca6345b6'
-         '58f48336836d6faf3d5eecbe4155b77e'
-         'b95e4b83d8a19c0bd81a15280078fcd5')
diff --git a/community/synergy/synergy.desktop b/community/synergy/synergy.desktop
new file mode 100644
index 000000000..e7bf87b9e
--- /dev/null
+++ b/community/synergy/synergy.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=Synergy
+Comment=The Synergy GUI is based on QSynergy by Volker Lanz.
+Exec=synergy
+Icon=synergy
+Terminal=false
+Type=Application
+Categories=Utility;DesktopUtility;Qt
diff --git a/community/synergy/synergy.png b/community/synergy/synergy.png
new file mode 100644
index 000000000..5534f0fdf
--- /dev/null
+++ b/community/synergy/synergy.png
diff --git a/community/synergy/synergys.rc b/community/synergy/synergys.rc
deleted file mode 100644
index 8f19dc5f7..000000000
--- a/community/synergy/synergys.rc
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/bash
-
-daemon_name=synergys
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/bin/synergys`
-case "$1" in
-  start)
-    stat_busy "Starting Synergy Server"
-    [ -z "$PID" ] && /usr/bin/synergys --config /etc/synergy.conf &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon $daemon_name
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping Synergy Server"
-    [ ! -z "$PID" ] && kill -9 $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon $daemon_name
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/community/tea/PKGBUILD b/community/tea/PKGBUILD
index de4f150f1..370c7b115 100644
--- a/community/tea/PKGBUILD
+++ b/community/tea/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 83883 2013-02-06 10:40:30Z spupykin $
+# $Id: PKGBUILD 85415 2013-03-01 10:40:52Z andrea $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Roman Kyrylych <roman@archlinux.org>
@@ -7,12 +7,12 @@
 
 pkgname=tea
 pkgver=34.0.1
-pkgrel=1
+pkgrel=2
 pkgdesc="A QT-based text editor for Linux and *BSD. With an ultimate small size TEA provides you hundreds of functions."
 arch=('i686' 'x86_64')
 url="http://tea-editor.sourceforge.net/"
 license=('GPL')
-depends=('qt' 'aspell' 'hunspell')
+depends=('qt4' 'aspell' 'hunspell')
 install=tea.install
 source=(http://downloads.sourceforge.net/project/tea-editor/tea-editor/$pkgver/tea-$pkgver.tar.bz2
         tea.desktop)
diff --git a/community/teamspeak3/PKGBUILD b/community/teamspeak3/PKGBUILD
index f68136ffa..7b3038d0e 100644
--- a/community/teamspeak3/PKGBUILD
+++ b/community/teamspeak3/PKGBUILD
@@ -4,11 +4,11 @@
 
 pkgname=teamspeak3
 pkgver=3.0.9.2
-pkgrel=2
+pkgrel=3
 pkgdesc="TeamSpeak is software for quality voice communication via the Internet"
 url="http://www.teamspeak.com/"
 license=('custom')
-depends=('qt' 'libpulse')
+depends=('qt4' 'libpulse')
 arch=('i686' 'x86_64')
 source=("http://teamspeak.gameserver.gamed.de/ts3/releases/${pkgver}/TeamSpeak3-Client-linux_x86-${pkgver}.run"
         'teamspeak3.desktop' 'icon.xpm' 'teamspeak3.launcher')
diff --git a/community/tiled-qt/PKGBUILD b/community/tiled-qt/PKGBUILD
index 44ffe4486..53be80468 100644
--- a/community/tiled-qt/PKGBUILD
+++ b/community/tiled-qt/PKGBUILD
@@ -2,12 +2,12 @@
 # Collaborator: Jonathan Fine (were.Vire AT gmail DOT com)
 pkgname=tiled-qt
 pkgver=0.9.0
-pkgrel=1
+pkgrel=4
 pkgdesc='A general purpose tile map editor, built to be flexible and easy to use'
 arch=('i686' 'x86_64')
 url='http://mapeditor.org'
 license=('GPL')
-depends=('qt' 'libgl' 'gtk-update-icon-cache')
+depends=('qt5-base' 'qt5-tools' 'libgl' 'gtk-update-icon-cache')
 makedepends=('mesa')
 install=${pkgname}.install
 source=(http://sourceforge.net/projects/tiled/files/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz)
diff --git a/community/tipp10/PKGBUILD b/community/tipp10/PKGBUILD
index 96a77adbd..725ccb9e2 100644
--- a/community/tipp10/PKGBUILD
+++ b/community/tipp10/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 64679 2012-02-17 18:29:36Z bluewind $
+# $Id: PKGBUILD 85418 2013-03-01 10:41:22Z andrea $
 # Maintainer: Florian Pritz <flo@xinu.at>
 # Contributor: toliman <altergan@hs-albsig.de>
 
 pkgname=tipp10
 pkgver=2.1.0
-pkgrel=4
+pkgrel=5
 pkgdesc="intelligent typing tutor"
 arch=('i686' 'x86_64')
 url="http://www.tipp10.com/"
 license=('GPL2')
-depends=('qt>=4.2.2')
+depends=('qt4')
 source=(defines.h.patch gcc-4.5.patch \
   "http://www.tipp10.com/de/download/tipp10_source_v"${pkgver//./-}".zip")
 md5sums=('73a987123ca842026b7bde5e89370b86'
diff --git a/community/tuxcards/PKGBUILD b/community/tuxcards/PKGBUILD
index a1b216c8d..a1b93dd03 100644
--- a/community/tuxcards/PKGBUILD
+++ b/community/tuxcards/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 67712 2012-03-14 07:57:27Z ebelanger $
+# $Id: PKGBUILD 85419 2013-03-01 10:41:30Z andrea $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=tuxcards
 pkgver=2.2.1
-pkgrel=2
+pkgrel=3
 pkgdesc="A hierarchical notebook to enter and manage notes and ideas in a structured manner"
 arch=('i686' 'x86_64')
 url="http://www.tuxcards.de"
 license=('GPL')
-depends=('qt')
+depends=('qt4')
 source=(http://www.tuxcards.de/src/tuxcards-${pkgver}/${pkgname}-${pkgver}.tar.gz tuxcards.desktop)
 sha1sums=('c0410f28b51d58b4f372ffae0ce0d2a7329f2c45'
           '565419ac6b24d61fc038462a783cb80d44b4fe7e')
diff --git a/community/vidalia/PKGBUILD b/community/vidalia/PKGBUILD
index 3a2d72c19..cafab9059 100644
--- a/community/vidalia/PKGBUILD
+++ b/community/vidalia/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 80885 2012-12-05 14:14:00Z tredaelli $
+# $Id: PKGBUILD 85421 2013-03-01 10:41:47Z andrea $
 # Maintainer: Timothy Redaelli <timothy.redaelli@gmail.com>
 # Contributor: Rorschach <r0rschach@lavabit.com>
 
 pkgname=vidalia
 pkgver=0.2.21
-pkgrel=1
+pkgrel=2
 pkgdesc="Controller GUI for Tor"
 url="https://www.torproject.org/vidalia"
 arch=('i686' 'x86_64')
 license=('GPL')
-depends=('geoip' 'qt' 'tor')
+depends=('geoip' 'qt4' 'tor')
 makedepends=('cmake')
 install=vidalia.install
 source=(https://www.torproject.org/vidalia/dist/$pkgname-$pkgver.tar.gz{,.asc})
@@ -17,8 +17,6 @@ md5sums=('8d3079a66d79c79ccfefb929b820f9ac'
          'c735521ae9d231e974c753a5206c2c0f')
 
 build() {
-  [[ -f /etc/profile.d/qt4.sh ]] && source /etc/profile.d/qt4.sh
-
   cd "$srcdir"
   mkdir build
   cd build
diff --git a/community/vmpk/PKGBUILD b/community/vmpk/PKGBUILD
new file mode 100644
index 000000000..5ce3556ad
--- /dev/null
+++ b/community/vmpk/PKGBUILD
@@ -0,0 +1,28 @@
+# Maintainer : speps <speps at aur dot archlinux dot org>
+
+pkgname=vmpk
+pkgver=0.5.1
+pkgrel=1
+pkgdesc="Virtual MIDI Piano Keyboard"
+arch=('i686' 'x86_64')
+url="http://vmpk.sourceforge.net/"
+license=('GPL3')
+depends=('qt4' 'jack')
+makedepends=('cmake')
+install="$pkgname.install"
+source=("http://downloads.sourceforge.net/project/$pkgname/$pkgname/$pkgver/$pkgname-$pkgver.tar.bz2")
+md5sums=('07e376936c38c7c244374ff9ddca6a72')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  [ -d bld ] || mkdir bld && cd bld
+  cmake .. -DCMAKE_INSTALL_PREFIX=/usr \
+           -DCMAKE_BUILD_TYPE=release
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver/bld"
+  make DESTDIR="$pkgdir/" install
+}
diff --git a/community/vmpk/vmpk.install b/community/vmpk/vmpk.install
new file mode 100644
index 000000000..293ff852a
--- /dev/null
+++ b/community/vmpk/vmpk.install
@@ -0,0 +1,12 @@
+post_install() {
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+  update-desktop-database -q
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install 
+}
diff --git a/community/vtk/PKGBUILD b/community/vtk/PKGBUILD
index ae80d0613..bb3906c98 100644
--- a/community/vtk/PKGBUILD
+++ b/community/vtk/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 84363 2013-02-16 22:50:41Z ioni $
+# $Id: PKGBUILD 85423 2013-03-01 10:42:11Z andrea $
 # Maintainer: Andrzej Giniewicz <gginiu@gmail.com>
 # Contributor: Thomas Dziedzic < gostrc at gmail >
 # Contributor: Christofer Bertonha <christoferbertonha at gmail dot com>
@@ -8,15 +8,17 @@
 # Contributor: Fabian Moser
 # Contributor: djscholl
 
+# Qt5 support status: http://vtk.org/Bug/view.php?id=12945
+
 pkgname=vtk
 pkgver=5.10.1
-pkgrel=4
+pkgrel=5
 pkgdesc='A software system for 3D computer graphics, image processing, and visualization.'
 arch=('i686' 'x86_64')
 url='http://www.vtk.org/'
 license=('BSD')
-depends=('libjpeg-turbo' 'boost' 'ffmpeg' 'qt' 'qtwebkit' 'lesstif' 'mysql' 'hdf5')
-makedepends=('cmake' 'java-environment' 'doxygen' 'gnuplot' 'mesa' 'python2' 'tk')
+depends=('libjpeg-turbo' 'boost' 'ffmpeg' 'qt4' 'lesstif' 'mysql' 'hdf5' 'libgl')
+makedepends=('cmake' 'java-environment' 'doxygen' 'gnuplot' 'mesa-libgl' 'python2' 'tk')
 optdepends=('python2: python bindings'
             'java-runtime: java bindings'
             'tk: tcl bindings'
@@ -78,7 +80,7 @@ build() {
     -DVTK_WRAP_PYTHON:BOOL=ON \
     -DVTK_WRAP_TCL:BOOL=ON \
     -DVTK_USE_QT:BOOL=ON \
-    -DVTK_INSTALL_QT_PLUGIN_DIR:STRING="/usr/lib/qt/plugins" \
+    -DVTK_INSTALL_QT_PLUGIN_DIR:STRING="/usr/lib/qt4/plugins" \
     -DVTK_USE_GUISUPPORT:BOOL=ON \
     -DCMAKE_CXX_FLAGS="-D__STDC_CONSTANT_MACROS" \
     ${cmake_system_flags} \
diff --git a/community/vym/PKGBUILD b/community/vym/PKGBUILD
index 5be932d1c..c6f374423 100644
--- a/community/vym/PKGBUILD
+++ b/community/vym/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 75733 2012-08-29 20:40:57Z jlichtblau $
+# $Id: PKGBUILD 85424 2013-03-01 10:42:25Z andrea $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> 
 # Contributor: Stefan Husmann <stefan-husmann@t-online.de>
 # Contributor: S�ren Holm <sgh@sgh.dk> 
 
 pkgname=vym
 pkgver=2.2.4
-pkgrel=1
+pkgrel=2
 pkgdesc="A mindmapping tool"
 arch=('i686' 'x86_64')
 url="http://www.insilmaril.de/vym/"
 license=('GPL')
-depends=('qt' 'unzip' 'zip')
+depends=('qt4' 'unzip' 'zip')
 options=('!emptydirs')
 changelog=$pkgname.changelog
 install=$pkgname.install
@@ -20,26 +20,26 @@ sha256sums=('fa6d088327feae80c4c6760454fba64fe253a7de6e7e46f45a4c7f7db9b998f4'
             'e299c69c213e7aac3f5b5d0ab088132b4ec7cb63a391f272e75ed64f049d541b')
 
 build() {
-  cd ${srcdir}/$pkgname-$pkgver
+  cd "${srcdir}"/$pkgname-$pkgver
 
   qmake PREFIX=/usr
   make
 }
 
 package() {
-  cd ${srcdir}/$pkgname-$pkgver
+  cd "${srcdir}"/$pkgname-$pkgver
 
 # install files
-  make INSTALL_ROOT=${pkgdir} install
+  make INSTALL_ROOT="${pkgdir}" install
 
 # correct doc location
-  install -d ${pkgdir}/usr/share/doc/$pkgname
-  install -m644 doc/* ${pkgdir}/usr/share/doc/$pkgname
-  rm -rf ${pkgdir}/usr/share/doc/packages
+  install -d "${pkgdir}"/usr/share/doc/$pkgname
+  install -m644 doc/* "${pkgdir}"/usr/share/doc/$pkgname
+  rm -rf "${pkgdir}"/usr/share/doc/packages
 
 # .desktop and icon file
-  install -D -m644 ${srcdir}/$pkgname.desktop \
-    ${pkgdir}/usr/share/applications/$pkgname.desktop
-  install -D -m644 ${pkgdir}/usr/share/vym/icons/$pkgname.png \
-    ${pkgdir}/usr/share/pixmaps/$pkgname.png
+  install -D -m644 "${srcdir}"/$pkgname.desktop \
+    "${pkgdir}"/usr/share/applications/$pkgname.desktop
+  install -D -m644 "${pkgdir}"/usr/share/vym/icons/$pkgname.png \
+    "${pkgdir}"/usr/share/pixmaps/$pkgname.png
 }
diff --git a/community/warzone2100/PKGBUILD b/community/warzone2100/PKGBUILD
index 8f252301f..87f747d82 100644
--- a/community/warzone2100/PKGBUILD
+++ b/community/warzone2100/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 82377 2013-01-16 10:35:35Z lcarlier $
+# $Id: PKGBUILD 85425 2013-03-01 10:42:35Z andrea $
 # Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
 # Contributor: Angelo Theodorou <encelo@users.sourceforge.net>
 
 pkgname=warzone2100
 pkgver=3.1.0
-pkgrel=1
+pkgrel=2
 pkgdesc="3D realtime strategy game on a future Earth"
 url="http://wz2100.net/"
 arch=('i686' 'x86_64')
 license=('GPL')
-depends=('sdl' 'glew' 'fribidi' 'openal' 'libvorbis' 'libtheora' 'physfs' 'ttf-dejavu' 'qt')
+depends=('sdl' 'glew' 'fribidi' 'openal' 'libvorbis' 'libtheora' 'physfs' 'ttf-dejavu' 'qt4')
 makedepends=('gawk' 'flex' 'zip' 'unzip' 'asciidoc' 'mesa')
 source=("http://downloads.sourceforge.net/project/warzone2100/releases/${pkgver}/${pkgname}-${pkgver}.tar.xz")
 md5sums=('7f061f3e5a2a6a83c146508ccefabd86')
diff --git a/community/wt/PKGBUILD b/community/wt/PKGBUILD
index 345cce42c..45a8d1b9c 100644
--- a/community/wt/PKGBUILD
+++ b/community/wt/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 83329 2013-01-29 17:20:18Z spupykin $
+# $Id: PKGBUILD 85427 2013-03-01 10:42:53Z andrea $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Denis Martinez <deuns.martinez@gmail.com>
@@ -6,13 +6,13 @@
 pkgname=wt
 pkgver=3.2.3
 _pkgver=3.2.3
-pkgrel=4
+pkgrel=5
 pkgdesc="a C++ library and application server for developing and deploying web applications"
 arch=('i686' 'x86_64')
 url="http://www.webtoolkit.eu/"
 license=('GPL')
 depends=('boost-libs' 'libharu')
-makedepends=('boost' 'cmake>=2.8' 'postgresql-libs' 'zlib' 'fcgi' 'sqlite' 'graphicsmagick' 'pango' 'mysql++' 'qt')
+makedepends=('boost' 'cmake>=2.8' 'postgresql-libs' 'zlib' 'fcgi' 'sqlite' 'graphicsmagick' 'pango' 'mysql++' 'qtbase')
 optdepends=('openssl: for SSL support in built-in webserver'
 	    'zlib: for compression in HTTP protocol'
 	    'fcgi: for FastCGI support'
diff --git a/community/yagf/PKGBUILD b/community/yagf/PKGBUILD
index 19ba20943..a810ad8c5 100644
--- a/community/yagf/PKGBUILD
+++ b/community/yagf/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 76879 2012-10-01 15:20:01Z spupykin $
+# $Id: PKGBUILD 85428 2013-03-01 10:43:02Z andrea $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: das-ich <das-ich@yandex.ru>
 
 pkgname=yagf
 pkgver=0.9.2
-pkgrel=2
+pkgrel=3
 pkgdesc="QT4-based GUI for Cuneiform and Tesseract OCRs"
 arch=(i686 x86_64)
 url="http://symmetrica.net/cuneiform-linux/yagf-en.html"
 license=('GPL')
-depends=('qt>=4.3' 'aspell')
+depends=('qt4' 'aspell')
 optdepends=('cuneiform: recognition tool'
 	    'tesseract: recognition tool'
 	    'xsane: acquire images from a scanner into YAGF directly')
@@ -22,6 +22,10 @@ build() {
   cd "${srcdir}/${pkgname}-$pkgver"
   cmake -D CMAKE_INSTALL_PREFIX=/usr -D CMAKE_BUILD_TYPE=Release .
   make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-$pkgver"
   make DESTDIR=${pkgdir} install
   [ -d $pkgdir/usr/lib64 ] && mv $pkgdir/usr/lib64 $pkgdir/usr/lib || true
 }
diff --git a/core/pinentry/PKGBUILD b/core/pinentry/PKGBUILD
index b5c199b3c..df1ec1e64 100644
--- a/core/pinentry/PKGBUILD
+++ b/core/pinentry/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 166720 2012-09-17 05:06:14Z tpowa $
+# $Id: PKGBUILD 179010 2013-03-01 10:28:10Z andrea $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 pkgname=pinentry
 pkgver=0.8.2
-pkgrel=1
+pkgrel=2
 pkgdesc="a collection of simple PIN or passphrase entry dialogs which utilize the Assuan protocol"
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://www.gnupg.org/aegypten2"
 depends=('ncurses' 'libcap>=2.16')
-makedepends=('gtk2' 'qt')
+makedepends=('gtk2' 'qt4')
 optdepends=('gtk2: for gtk2 backend'
-            'qt: for qt4 backend')  
+            'qt4: for qt4 backend')  
 source=(ftp://ftp.gnupg.org/gcrypt/$pkgname/$pkgname-$pkgver.tar.bz2
         qt4-pinentry-window.patch)
 install=pinentry.install
@@ -20,7 +20,7 @@ build() {
   #fix: https://bugs.archlinux.org/task/29998
   patch -Np1 -i ../qt4-pinentry-window.patch
   for file in qt4/*.moc; do
-       /usr/bin/moc ${file/.moc/.h} > ${file}
+       moc-qt4 ${file/.moc/.h} > ${file}
    done
   ./configure --prefix=/usr \
 	--enable-pinentry-curses \
diff --git a/extra/akonadi/PKGBUILD b/extra/akonadi/PKGBUILD
index 53afbac64..0ba82ecb3 100644
--- a/extra/akonadi/PKGBUILD
+++ b/extra/akonadi/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 177767 2013-02-08 09:03:20Z andrea $
+# $Id: PKGBUILD 178946 2013-03-01 10:19:03Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=akonadi
 pkgver=1.9.0
-pkgrel=2
+pkgrel=3
 pkgdesc="PIM layer, which provides an asynchronous API to access all kind of PIM data"
 arch=('i686' 'x86_64')
 url='http://community.kde.org/KDE_PIM/Akonadi'
@@ -16,6 +16,8 @@ source=("http://download.kde.org/stable/${pkgname}/src/${pkgname}-${pkgver}.tar.
 md5sums=('51ef4c9455f97ce4346c5934174b9da8')
 
 build() {
+  . /etc/profile.d/qt4.sh
+
   mkdir build
   cd build
   cmake ../${pkgname}-${pkgver} \
diff --git a/extra/appmenu-qt/PKGBUILD b/extra/appmenu-qt/PKGBUILD
index 64deb879b..1b566bacd 100644
--- a/extra/appmenu-qt/PKGBUILD
+++ b/extra/appmenu-qt/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 175130 2013-01-14 17:12:42Z andrea $
+# $Id: PKGBUILD 178947 2013-03-01 10:19:09Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=appmenu-qt
 pkgver=0.2.6
-pkgrel=3
+pkgrel=4
 pkgdesc="Allows Qt applications to export menus over DBus to a menu applet"
 arch=('i686' 'x86_64')
 url='https://launchpad.net/appmenu-qt'
@@ -17,6 +17,8 @@ md5sums=('90cce750e5412d43ce075b0a9bdb6782'
          '5db00ca92274c8b1797c204321961189')
 
 build() {
+  . /etc/profile.d/qt4.sh
+
   # FS#33286
   cd ${pkgname}-${pkgver}
   patch -p0 -i "${srcdir}"/appmenu-async.diff
@@ -26,7 +28,7 @@ build() {
   cd build
   cmake ../${pkgname}-${pkgver} \
     -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_BUILD_TYPE="Release"
+    -DCMAKE_BUILD_TYPE=Release
   make
 }
 
diff --git a/extra/attica/PKGBUILD b/extra/attica/PKGBUILD
index 9716dc011..6fb142cef 100644
--- a/extra/attica/PKGBUILD
+++ b/extra/attica/PKGBUILD
@@ -1,20 +1,21 @@
-# $Id: PKGBUILD 165443 2012-08-19 15:34:57Z andrea $
+# $Id: PKGBUILD 178948 2013-03-01 10:19:16Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=attica
 pkgver=0.4.1
-pkgrel=1
+pkgrel=2
 pkgdesc='A Qt library that implements the Open Collaboration Services API'
 arch=('i686' 'x86_64')
 url='https://projects.kde.org/projects/kdesupport/attica'
 license=('LGPL')
-depends=('qt')
+depends=('qt4')
 makedepends=('cmake')
 source=("http://download.kde.org/stable/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
 md5sums=('b90983ec5d79e5ddcbc9146fa23cab72')
 
 build() {
-  cd "${srcdir}"
+  . /etc/profile.d/qt4.sh
+
   mkdir build
   cd build
   cmake ../${pkgname}-${pkgver} \
@@ -24,6 +25,6 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/build"
+  cd build
   make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/automoc4/PKGBUILD b/extra/automoc4/PKGBUILD
index 4e1309042..903090736 100644
--- a/extra/automoc4/PKGBUILD
+++ b/extra/automoc4/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 149006 2012-02-05 13:49:43Z andrea $
+# $Id: PKGBUILD 178949 2013-03-01 10:19:23Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=automoc4
 pkgver=0.9.88
-pkgrel=3
+pkgrel=4
 pkgdesc="Automatic moc for Qt4"
 arch=('i686' 'x86_64')
 url='http://www.kde.org/'
 license=('custom')
-depends=('qt')
+depends=('qt4')
 makedepends=('pkgconfig' 'cmake')
 source=("http://download.kde.org/stable/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2"
         'license.txt')
@@ -17,7 +17,8 @@ md5sums=('91bf517cb940109180ecd07bc90c69ec'
          '9014edbb7e2f02fe90b2db8707487bce')
 
 build() {
-	cd "${srcdir}"
+    . /etc/profile.d/qt4.sh
+
 	mkdir build
 	cd build
 	cmake ../${pkgname}-${pkgver} \
@@ -27,7 +28,9 @@ build() {
 }
 
 package() {
-    cd "${srcdir}/build"
+    cd build
 	make DESTDIR="${pkgdir}" install
-	install -Dm644 "${srcdir}/license.txt" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+
+    install -Dm644 "${srcdir}/license.txt" \
+      "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
diff --git a/extra/avahi/PKGBUILD b/extra/avahi/PKGBUILD
index 4e500bf48..a4ddb8e9e 100644
--- a/extra/avahi/PKGBUILD
+++ b/extra/avahi/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 172143 2012-11-30 03:01:06Z bisson $
+# $Id: PKGBUILD 178950 2013-03-01 10:19:30Z andrea $
 # Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 
 pkgname=avahi
 pkgver=0.6.31
-pkgrel=5
+pkgrel=6
 pkgdesc='Multicast/unicast DNS-SD framework'
 url='http://www.avahi.org/'
 license=('LGPL')
@@ -15,18 +15,20 @@ optdepends=('dbus: communicating with client applications'
             'gtk3: avahi-discover-standalone, bshell, bssh, bvnc'
             'gtk2: gtk2 bindings'
             'qt3: qt3 bindings'
-            'qt: qt bindings'
+            'qt4: qt4 bindings'
             'pygtk: avahi-bookmarks, avahi-discover'
             'twisted: avahi-bookmarks'
             'mono: mono bindings'
             'python2-dbus: avahi-discover'
             'nss-mdns: NSS support for mDNS')
-makedepends=('qt' 'qt3' 'pygtk' 'mono' 'intltool' 'python2-dbus'
+makedepends=('qt3' 'qt4' 'pygtk' 'mono' 'intltool' 'python2-dbus'
              'gtk-sharp-2' 'gobject-introspection' 'gtk3' 'xmltoman')
 backup=('etc/avahi/hosts'
         'etc/avahi/avahi-daemon.conf'
         'etc/avahi/services/ssh.service'
-        'etc/avahi/services/sftp-ssh.service')
+        'etc/avahi/services/sftp-ssh.service'
+        'usr/lib/avahi/service-types.db'
+        'usr/share/avahi/service-types')
 source=("http://www.avahi.org/download/avahi-${pkgver}.tar.gz"
         'rc.d.patch')
 sha1sums=('7e05bd78572c9088b03b1207a0ad5aba38490684'
@@ -43,9 +45,13 @@ build() {
 	sed -i 's/netdev/network/g' avahi-daemon/avahi-dbus.conf
 	patch -p1 -i ../rc.d.patch
 
+	export MOC_QT3=/opt/qt/bin/moc
+	export MOC_QT4=/usr/lib/qt4/bin/moc
+	source /etc/profile.d/qt3.sh
+	source /etc/profile.d/qt4.sh
+
 	# pygtk requires python2; make it explicit in case other python are installed: FS#21865
 	PYTHON=python2 \
-	PKG_CONFIG_PATH=/opt/qt/lib/pkgconfig \
 	./configure \
 		--prefix=/usr \
 		--sysconfdir=/etc \
@@ -69,6 +75,7 @@ package() {
 
 	cd "${pkgdir}"
 	sed -i '1c #!/usr/bin/python2' usr/bin/avahi-{bookmarks,discover}
+	sed -i 's:/sbin/resolvconf:/usr/sbin/resolvconf:g' etc/avahi/avahi-dnsconfd.action
 
 	# howl and mdnsresponder compatability
 	(cd usr/include; ln -s avahi-compat-libdns_sd/dns_sd.h dns_sd.h; ln -s avahi-compat-howl howl)
diff --git a/extra/avahi/install b/extra/avahi/install
index 7c75c3dd4..d333389ee 100644
--- a/extra/avahi/install
+++ b/extra/avahi/install
@@ -1,8 +1,8 @@
 post_install() {
-  getent group avahi &>/dev/null || groupadd -r -g 84 avahi >/dev/null
-  getent passwd avahi &>/dev/null || useradd -r -u 84 -g avahi -d / -s /bin/false -c avahi avahi >/dev/null
+	getent group avahi &>/dev/null || groupadd -r -g 84 avahi >/dev/null
+	getent passwd avahi &>/dev/null || useradd -r -u 84 -g avahi -d / -s /bin/false -c avahi avahi >/dev/null
 
-  cat <<EOF
+	cat <<EOF
 ==> The following daemons may be added to DAEMONS in /etc/rc.conf:
 ==> avahi-daemon: the mdns responder, you probably want this.
 ==>               dbus needs to be running when you start it.
@@ -16,6 +16,7 @@ EOF
 }
 
 post_remove() {
-  getent passwd avahi &>/dev/null && userdel avahi >/dev/null
-  getent group avahi &>/dev/null && groupdel avahi >/dev/null
+	getent passwd avahi &>/dev/null && userdel avahi >/dev/null
+	getent group avahi &>/dev/null && groupdel avahi >/dev/null
+	true
 }
diff --git a/extra/avidemux/PKGBUILD b/extra/avidemux/PKGBUILD
index 98c3606aa..88fb616e2 100644
--- a/extra/avidemux/PKGBUILD
+++ b/extra/avidemux/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 178126 2013-02-16 22:48:45Z ioni $
+# $Id: PKGBUILD 178951 2013-03-01 10:19:37Z andrea $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgbase=avidemux
 pkgname=('avidemux-cli' 'avidemux-gtk' 'avidemux-qt')
 pkgver=2.5.6
-pkgrel=5
+pkgrel=6
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://fixounet.free.fr/avidemux/"
-makedepends=('cmake' 'libxslt' 'gtk2' 'qt' 'jack' 'libvorbis' 'sdl' 'libxv' \
+makedepends=('cmake' 'libxslt' 'gtk2' 'qt4' 'jack' 'libvorbis' 'sdl' 'libxv' \
              'alsa-lib' 'lame' 'xvidcore' 'faad2' 'faac' 'x264' 'libsamplerate' \
              'opencore-amr' 'yasm' 'mesa' 'libvpx' 'libpulse' 'libva')
 options=('!makeflags')
@@ -94,7 +94,7 @@ package_avidemux-gtk() {
 
 package_avidemux-qt() {
   pkgdesc="A graphical tool to edit video (filter/re-encode/split) - QT GUI"
-  depends=("avidemux-cli=${pkgver}" 'qt')
+  depends=("avidemux-cli=${pkgver}" 'qt4')
   install=avidemux.install
 
   cd "${srcdir}/${pkgbase}_${pkgver}"
diff --git a/extra/cagibi/PKGBUILD b/extra/cagibi/PKGBUILD
index 949f42453..46d593234 100644
--- a/extra/cagibi/PKGBUILD
+++ b/extra/cagibi/PKGBUILD
@@ -1,20 +1,21 @@
-# $Id: PKGBUILD 149009 2012-02-05 13:59:12Z andrea $
+# $Id: PKGBUILD 178952 2013-03-01 10:19:46Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=cagibi
 pkgver=0.2.0
-pkgrel=2
+pkgrel=3
 pkgdesc='A cache/proxy daemon for SSDP (the discovery part of UPnP)'
 arch=('i686' 'x86_64')
-url='http://www.kde.org/'
+url='https://projects.kde.org/projects/kdesupport/cagibi/'
 license=('LGPL')
-depends=('qt')
+depends=('qt4')
 makedepends=('cmake' 'automoc4')
 source=("http://download.kde.org/stable/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
 md5sums=('af66d89337ef80e8a868d3bb9dd92328')
 
 build() {
-  cd ${srcdir}
+  . /etc/profile.d/qt4.sh
+
   mkdir build
   cd build
   cmake ../${pkgname}-${pkgver} \
@@ -24,6 +25,6 @@ build() {
 }
 
 package() {
-  cd ${srcdir}/build
-  make DESTDIR=${pkgdir} install
+  cd build
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/cmake/PKGBUILD b/extra/cmake/PKGBUILD
index 9d6adb8fb..5424c6049 100644
--- a/extra/cmake/PKGBUILD
+++ b/extra/cmake/PKGBUILD
@@ -1,24 +1,33 @@
-# $Id: PKGBUILD 172096 2012-11-28 07:27:35Z andrea $
+# $Id: PKGBUILD 178953 2013-03-01 10:19:53Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=cmake
 pkgver=2.8.10.2
-pkgrel=1
+pkgrel=3
 pkgdesc="A cross-platform open-source make system"
 arch=('i686' 'x86_64')
 url="http://www.cmake.org/"
 license=('custom')
 depends=('curl' 'libarchive' 'shared-mime-info')
-makedepends=('qt' 'emacs')
-optdepends=('qt: cmake-gui')
+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"
+        'use-qmake4-for-qt4.patch')
+md5sums=('097278785da7182ec0aea8769d06860c'
+         '3136ec7953f2e01cc099f38dbd2655e2')
 
 build() {
   cd ${pkgname}-${pkgver}
 
+  # Qt is built with reduce-relocations
+  export CFLAGS="${CFLAGS} -fPIC"
+  export CXXFLAGS="${CXXFLAGS} -fPIC"
+
+  # Do not look for 'qmake' as this could referer to the qt5 version
+  patch -p1 -i "${srcdir}"/use-qmake4-for-qt4.patch
+
   ./bootstrap --prefix=/usr \
     --mandir=/share/man \
     --docdir=/share/doc/cmake \
diff --git a/extra/cmake/use-qmake4-for-qt4.patch b/extra/cmake/use-qmake4-for-qt4.patch
new file mode 100644
index 000000000..6e1e6ead1
--- /dev/null
+++ b/extra/cmake/use-qmake4-for-qt4.patch
@@ -0,0 +1,11 @@
+--- cmake-2.8.10.2/Modules/FindQt4.cmake~	2013-02-24 12:13:41.172266220 +0000
++++ cmake-2.8.10.2/Modules/FindQt4.cmake	2013-02-24 12:20:11.229349625 +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/doxygen/PKGBUILD b/extra/doxygen/PKGBUILD
index b53f51f89..77a9c6614 100644
--- a/extra/doxygen/PKGBUILD
+++ b/extra/doxygen/PKGBUILD
@@ -1,20 +1,21 @@
-# $Id: PKGBUILD 175737 2013-01-20 22:18:44Z dan $
+# $Id: PKGBUILD 178954 2013-03-01 10:20:02Z andrea $
 # Maintainer: Dan McGee <dan@archlinux.org>
 
 pkgbase=doxygen
 pkgname=('doxygen' 'doxygen-docs')
 pkgver=1.8.3.1
-pkgrel=1
+pkgrel=2
 license=('GPL')
 arch=(i686 x86_64)
 url="http://www.doxygen.org/"
-makedepends=('gcc-libs' 'flex' 'qt' 'texlive-core' 'ghostscript'
+makedepends=('gcc-libs' 'flex' 'qt4' 'texlive-core' 'ghostscript'
              'texlive-latexextra' 'graphviz')
 source=(http://ftp.stack.nl/pub/users/dimitri/${pkgname}-${pkgver}.src.tar.gz)
 md5sums=('31b0aaab51c5cab7db9f0ebbe9f85530')
 sha1sums=('289fc809f44b8025d45279deefbaee7680efd88f')
 
 build() {
+  . /etc/profile.d/qt4.sh
   cd "${srcdir}/${pkgbase}-${pkgver}"
   QTDIR=/usr ./configure --prefix /usr --with-doxywizard
   make
@@ -24,7 +25,7 @@ package_doxygen() {
   pkgdesc="A documentation system for C++, C, Java, IDL and PHP"
   depends=('gcc-libs')
   optdepends=('graphviz: for caller/callee graph generation'
-              'qt: for doxywizard')
+              'qt4: for doxywizard')
 
   cd "${srcdir}/${pkgbase}-${pkgver}"
   make INSTALL="${pkgdir}"/usr MAN1DIR=share/man/man1 install
diff --git a/extra/dssi/PKGBUILD b/extra/dssi/PKGBUILD
index 2a39d83b0..9cb76d7cd 100644
--- a/extra/dssi/PKGBUILD
+++ b/extra/dssi/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 151210 2012-02-25 08:01:57Z pierre $
+# $Id: PKGBUILD 178955 2013-03-01 10:20:10Z andrea $
 # Maintainer: Ray Rashif <schiv@archlinux.org>
 # Contributor: damir <damir@archlinux.org>
 # Contributor: Pajaro
 
 pkgname=dssi
 pkgver=1.1.1
-pkgrel=2
+pkgrel=3
 pkgdesc="An API for audio processing plugins & softsynths with UIs"
 arch=('i686' 'x86_64')
 url="http://dssi.sourceforge.net/"
 license=('LGPL' 'BSD' 'custom')
 depends=('liblo' 'jack')
-makedepends=('ladspa' 'qt')
-optdepends=('qt: example plugins')
+makedepends=('ladspa' 'qt4')
+optdepends=('qt4: example plugins')
 options=('!libtool')
 source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz"
         'license.txt')
@@ -20,6 +20,7 @@ md5sums=('619ab73c883b02dc37ddb37001591f8b'
          '258ca4d0ca28c5c4d4675147621fac18')
 
 build() {
+  . /etc/profile.d/qt4.sh
   cd "$srcdir/$pkgname-$pkgver"
 
   ./configure --prefix=/usr
diff --git a/extra/gcin/PKGBUILD b/extra/gcin/PKGBUILD
index 5b8662a1b..db9e2ba91 100644
--- a/extra/gcin/PKGBUILD
+++ b/extra/gcin/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 178091 2013-02-16 00:28:11Z bisson $
+# $Id: PKGBUILD 178956 2013-03-01 10:20:17Z andrea $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: damir <damir@archlinux.org>
 
 pkgname=gcin
 pkgver=2.8.0
-pkgrel=1
+pkgrel=2
 pkgdesc='Input method server supporting various input methods'
 url='http://hyperrate.com/dir.php?eid=67'
 license=('LGPL')
 arch=('i686' 'x86_64')
 depends=('gtk2' 'libxtst')
-makedepends=('qt' 'gtk3' 'anthy' 'libchewing')
-optdepends=('qt: support for qt4 input method'
+makedepends=('qt4' 'gtk3' 'anthy' 'libchewing')
+optdepends=('qt4: support for qt4 input method'
             'gtk3: support for gtk3 input method'
             'anthy: support for anthy input method'
             'libchewing: support for chewing input method')
@@ -24,7 +24,7 @@ install=install
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
 
-	sed 's/QT=qt4/QT=qt/' -i qt4-im/Makefile
+	source /etc/profile.d/qt4.sh
 	sed 's/lib64/lib/g' -i configure
 	sed '/include suffixes-rule/a \
 		CFLAGS+='"${CFLAGS}"' \
diff --git a/extra/gcin/qt4.patch b/extra/gcin/qt4.patch
deleted file mode 100644
index 0f3e7876f..000000000
--- a/extra/gcin/qt4.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-diff -Naur old/qt4-im/Makefile new/qt4-im/Makefile
---- old/qt4-im/Makefile	2011-12-19 14:52:46.000000000 +1100
-+++ new/qt4-im/Makefile	2012-03-05 09:22:46.732614803 +1100
-@@ -1,5 +1,5 @@
- include ../config.mak
--QT=qt4
-+QT=qt
- QTIM=$(QT)/plugins/inputmethods
- IMMODULES=$(libdir)/$(QTIM)
- 
diff --git a/extra/git/PKGBUILD b/extra/git/PKGBUILD
index a76eec767..f140498d6 100644
--- a/extra/git/PKGBUILD
+++ b/extra/git/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 178348 2013-02-20 15:17:58Z dan $
+# $Id: PKGBUILD 179046 2013-03-01 22:51:09Z dan $
 # Maintainer: Dan McGee <dan@archlinux.org>
 
 pkgname=git
-pkgver=1.8.1.4
+pkgver=1.8.1.5
 pkgrel=1
 pkgdesc="the fast distributed version control system"
 arch=(i686 x86_64)
@@ -103,7 +103,7 @@ package() {
   install -D -m 644 "$srcdir"/git-daemon.socket "$pkgdir"/usr/lib/systemd/system/git-daemon.socket
 }
 
-md5sums=('60f32ef4a6b3fa2143b81a28704333ed'
-         '61d19a9d386c686ee06b493a9df6e61c'
+md5sums=('ce168861c23a700b40ffe94475bb1d9e'
+         '3ea0d73b2fa09558454279aad9039a3b'
          '042524f942785772d7bd52a1f02fe5ae'
          'f67869315c2cc112e076f0c73f248002')
diff --git a/extra/grantlee/PKGBUILD b/extra/grantlee/PKGBUILD
index 23721cd2e..625c16b7b 100644
--- a/extra/grantlee/PKGBUILD
+++ b/extra/grantlee/PKGBUILD
@@ -1,19 +1,21 @@
-# $Id: PKGBUILD 170108 2012-11-02 08:45:56Z andrea $
+# $Id: PKGBUILD 178957 2013-03-01 10:20:25Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=grantlee
 pkgver=0.3.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A string template engine based on the Django template system and written in Qt"
 arch=('i686' 'x86_64')
 url="http://www.gitorious.org/grantlee/pages/Home"
 license=('LGPL3')
-depends=('qt')
+depends=('qt4')
 makedepends=('cmake' 'doxygen')
 source=("http://downloads.grantlee.org/${pkgname}-${pkgver}.tar.gz")
 md5sums=('195763a3238f51f8885881fc8012cd83')
 
 build() {
+  . /etc/profile.d/qt4.sh
+
   mkdir build
   cd build
   cmake ../${pkgname}-${pkgver} \
diff --git a/extra/graphviz/PKGBUILD b/extra/graphviz/PKGBUILD
index 2388f17f5..2337a154c 100644
--- a/extra/graphviz/PKGBUILD
+++ b/extra/graphviz/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 178429 2013-02-22 00:30:19Z bisson $
+# $Id: PKGBUILD 178958 2013-03-01 10:20:33Z andrea $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: kevin <kevin@archlinux.org>
 # Contributor: John Proctor <jproctor@prium.net>
 
 pkgname=graphviz
 pkgver=2.30.0
-pkgrel=5
+pkgrel=6
 pkgdesc='Graph visualization software'
 url='http://www.graphviz.org/'
 license=('custom:EPL')
 arch=('i686' 'x86_64')
 depends=('libltdl' 'gd' 'librsvg' 'libxaw' 'ghostscript' 'pango' 'gts')
-makedepends=('swig' 'mono' 'guile' 'lua51' 'ocaml' 'perl' 'php' 'python2' 'r' 'ruby' 'tk' 'qt')
+makedepends=('swig' 'mono' 'guile' 'lua51' 'ocaml' 'perl' 'php' 'python2' 'r' 'ruby' 'tk' 'qt4')
 optdepends=('mono: sharp bindings'
             'guile: guile bindings'
             'lua51: lua bindings'
@@ -22,7 +22,7 @@ optdepends=('mono: sharp bindings'
             'r: r bindings'
             'ruby: ruby bindings'
             'tcl: tcl bindings'
-            'qt: gvedit')
+            'qt4: gvedit')
 source=("${url}/pub/${pkgname}/stable/SOURCES/${pkgname}-${pkgver}.tar.gz"
         'LICENSE')
 sha1sums=('596c1ddf60c5428c5c4700d10f3ea86534195311'
@@ -34,6 +34,8 @@ install=install
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
 
+    . /etc/profile.d/qt4.sh
+
 	sed \
 		-e '/"archdir"/s:$:+" '"$(echo -I/usr/include/ruby-1.9.1/{$CARCH-linux,ruby/backward,})"'":' \
 		-e '/CONFIG/s:site:vendor:' \
diff --git a/extra/hefur/PKGBUILD b/extra/hefur/PKGBUILD
index d043763e5..0dd07b1b0 100644
--- a/extra/hefur/PKGBUILD
+++ b/extra/hefur/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 172896 2012-12-06 11:02:02Z pierre $
+# $Id: PKGBUILD 179041 2013-03-01 20:41:07Z andrea $
 # Maintainer: Pierre Schmitz <pierre@archlinux.de>
 # Contributor: Alexandre Bique <bique.alexandre@gmail.com>
 
 pkgname=hefur
 pkgver=0.4
-pkgrel=1
+pkgrel=2
 pkgdesc='A standalone and lightweight BitTorrent tracker'
 arch=('i686' 'x86_64')
 url='http://github.com/abique/hefur'
diff --git a/extra/kdeedu-marble/PKGBUILD b/extra/kdeedu-marble/PKGBUILD
index 91891b3d7..e8b667988 100644
--- a/extra/kdeedu-marble/PKGBUILD
+++ b/extra/kdeedu-marble/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 177645 2013-02-08 08:56:05Z andrea $
+# $Id: PKGBUILD 178961 2013-03-01 10:20:55Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-marble
 pkgver=4.10.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Desktop Globe"
 url="http://kde.org/applications/education/marble/"
 arch=('i686' 'x86_64')
@@ -17,7 +17,8 @@ source=("http://download.kde.org/stable/${pkgver}/src/marble-${pkgver}.tar.xz")
 sha1sums=('c1db6b1785ca1ad230de6da0e67ee84bf7e3a2cd')
 
 build() {
-  cd "${srcdir}"
+  . /etc/profile.d/qt4.sh
+
   mkdir build
   cd build
   cmake ../marble-${pkgver} \
@@ -28,6 +29,6 @@ build() {
 }
 
 package() {
-  cd "${srcdir}"/build
+  cd build
   make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/kdesdk/PKGBUILD b/extra/kdesdk/PKGBUILD
index 6cc2efeea..262ba43ef 100644
--- a/extra/kdesdk/PKGBUILD
+++ b/extra/kdesdk/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 177748 2013-02-08 08:58:30Z andrea $
+# $Id: PKGBUILD 178963 2013-03-01 10:21:15Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
@@ -21,7 +21,7 @@ pkgname=('kdesdk-cervisia'
          'kdesdk-strigi-analyzer'
          'kdesdk-umbrello')
 pkgver=4.10.0
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
 license=('GPL' 'LGPL' 'FDL')
@@ -197,7 +197,7 @@ package_kdesdk-okteta() {
 
 package_kdesdk-poxml() {
 	pkgdesc='Translates DocBook XML files using gettext po files'
-	depends=('qt' 'antlr2')
+	depends=('qt4' 'antlr2')
 	cd $srcdir/build/poxml
 	make DESTDIR=$pkgdir install
 	cd $srcdir/build/doc/poxml
diff --git a/extra/libbluedevil/PKGBUILD b/extra/libbluedevil/PKGBUILD
index 93357f5db..92e19b608 100644
--- a/extra/libbluedevil/PKGBUILD
+++ b/extra/libbluedevil/PKGBUILD
@@ -1,20 +1,21 @@
-# $Id: PKGBUILD 157802 2012-04-29 17:04:04Z andrea $
+# $Id: PKGBUILD 178964 2013-03-01 10:21:29Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=libbluedevil
 pkgver=1.9.2
-pkgrel=1
-pkgdesc='A Qt wrapper for bluez used in the new KDE bluetooth stack'
+pkgrel=2
+pkgdesc='A Qt4 wrapper for bluez used in the new KDE bluetooth stack'
 arch=('i686' 'x86_64')
 url="https://projects.kde.org/projects/playground/libs/libbluedevil"
 license=('GPL')
-depends=('qt' 'bluez')
+depends=('qt4' 'bluez')
 makedepends=('cmake')
 source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
 md5sums=('b492db1825b239e5185c543badb21c26')
 
-build(){
-  cd "${srcdir}"
+build() {
+  . /etc/profile.d/qt4.sh
+
   mkdir build
   cd build
   cmake ../${pkgname}-${pkgver} \
@@ -24,6 +25,6 @@ build(){
 }
 
 package() {
-  cd "${srcdir}"/build
+  cd build
   make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/libdbusmenu-qt/PKGBUILD b/extra/libdbusmenu-qt/PKGBUILD
index 921e7b244..4f3c0fa15 100644
--- a/extra/libdbusmenu-qt/PKGBUILD
+++ b/extra/libdbusmenu-qt/PKGBUILD
@@ -1,20 +1,21 @@
-# $Id: PKGBUILD 156245 2012-04-16 13:16:43Z andrea $
+# $Id: PKGBUILD 178965 2013-03-01 10:21:35Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=libdbusmenu-qt
 pkgver=0.9.2
-pkgrel=1
+pkgrel=2
 pkgdesc="A library that provides a Qt implementation of the DBusMenu spec"
 arch=('i686' 'x86_64')
 url="https://launchpad.net/libdbusmenu-qt"
 license=('GPL')
-depends=('qt')
+depends=('qt4')
 makedepends=('cmake' 'doxygen' 'qjson')
 source=("http://launchpad.net/${pkgname}/trunk/${pkgver}/+download/${pkgname}-${pkgver}.tar.bz2")
 md5sums=('9a49484927669cd2ec91b3bf9ba8b79e')
 
 build() {
-  cd "${srcdir}"
+  . /etc/profile.d/qt4.sh
+
   mkdir build
   cd build
   cmake ../${pkgname}-${pkgver} \
@@ -24,6 +25,6 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/build"
+  cd build
   make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/liblastfm/PKGBUILD b/extra/liblastfm/PKGBUILD
index aa5785ce1..af6154dd3 100644
--- a/extra/liblastfm/PKGBUILD
+++ b/extra/liblastfm/PKGBUILD
@@ -1,21 +1,23 @@
-# $Id: PKGBUILD 175971 2013-01-25 14:23:37Z andrea $
+# $Id: PKGBUILD 178966 2013-03-01 10:21:42Z andrea $
 # Maintainer:
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: XazZ <xazz.xazz [AT] googlemail.com>
 
 pkgname=liblastfm
 pkgver=1.0.6
-pkgrel=1
-pkgdesc="A Qt C++ library for the Last.fm webservices"
+pkgrel=2
+pkgdesc="A Qt4 C++ library for the Last.fm webservices"
 arch=('i686' 'x86_64')
 url='https://github.com/lastfm/liblastfm/'
 license=('GPL')
-depends=('qt' 'fftw' 'libsamplerate')
+depends=('qt4' 'fftw' 'libsamplerate')
 makedepends=('cmake')
 source=(${pkgname}-${pkgver}.tar.gz::"https://github.com/lastfm/${pkgname}/tarball/${pkgver}")
 sha1sums=('cd84cf61d315c9739b3b65e31c2854a6b1a38630')
 
 build() {
+  . /etc/profile.d/qt4.sh
+
   mkdir build
   cd build
   cmake ../lastfm-${pkgname}-5826fe6 \
diff --git a/extra/liborigin2/PKGBUILD b/extra/liborigin2/PKGBUILD
index df2513423..3f18a355e 100644
--- a/extra/liborigin2/PKGBUILD
+++ b/extra/liborigin2/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 152212 2012-03-05 08:56:10Z ibiru $
+# $Id: PKGBUILD 178967 2013-03-01 10:21:49Z andrea $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: damir <damir@archlinux.org>
 
 pkgbase=liborigin2
 pkgname=('liborigin2' 'liborigin2-docs')
 pkgver=20110829
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url="http://soft.proindependent.com/liborigin2/"
 license=('GPL3')
-makedepends=('doxygen' 'qt' 'boost')
+makedepends=('doxygen' 'qt4' 'boost')
 replaces=('liborigin')
 provides=('liborigin')
 source=(http://download.berlios.de/qtiplot/${pkgbase}-20110829.zip
@@ -22,6 +22,8 @@ sha1sums=('13851b17b21ec49375e4f5dfbd3ab4b9bf72f5be'
 build() {
 	cd "${srcdir}/${pkgbase}"
 
+    . /etc/profile.d/qt4.sh
+
 	install -Dm644 "${srcdir}/liborigin.pro.archlinux" ./liborigin2.pro
         install -Dm644 "${srcdir}/tree.hh" ./tree.hh # get the header back like it was in previous releases
 	qmake liborigin2.pro QMAKESPEC=linux-g++
diff --git a/extra/libqzeitgeist/PKGBUILD b/extra/libqzeitgeist/PKGBUILD
index a360b7116..ee930d067 100644
--- a/extra/libqzeitgeist/PKGBUILD
+++ b/extra/libqzeitgeist/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 147936 2012-01-28 11:01:16Z andrea $
+# $Id: PKGBUILD 178968 2013-03-01 10:21:57Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=libqzeitgeist
 pkgver=0.8.0
-pkgrel=2
+pkgrel=3
 pkgdesc="A Qt interface to the Zeitgeist event tracking system"
-url="https://projects.kde.org/projects/kdesupport/libqzeitgeist"
+url='https://projects.kde.org/projects/kdesupport/libqzeitgeist'
 arch=('i686' 'x86_64')
 license=('GPL')
-depends=('qt')
+depends=('qt4')
 makedepends=('cmake' 'automoc4' 'python2' 'zeitgeist')
 source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2"
         'set-declarative-installation-dir.patch')
@@ -16,10 +16,12 @@ md5sums=('97bdea6a1865db7d5f29c93e3a492f24'
          '712013e582acb73296e41ad842d0da01')
 
 build() {
-  cd "${srcdir}"/${pkgname}-${pkgver}
+  . /etc/profile.d/qt4.sh
+
+  cd ${pkgname}-${pkgver}
   patch -p1 -i "${srcdir}"/set-declarative-installation-dir.patch
+  cd ../
 
-  cd "${srcdir}"
   # Fix python2 path
   sed -i 's|/usr/bin/env python|/usr/bin/env python2|' \
     ${pkgname}-${pkgver}/scripts/onto2cpp.py
@@ -29,11 +31,11 @@ build() {
   cmake ../${pkgname}-${pkgver} \
     -DCMAKE_BUILD_TYPE=Release \
 	-DCMAKE_INSTALL_PREFIX=/usr \
-    -DDECLARATIVE_IMPORT_PREFIX=/usr/lib/qt/imports/
+    -DDECLARATIVE_IMPORT_PREFIX=/usr/lib/qt4/imports/
   make
 }
 
 package() {
-  cd "${srcdir}"/build
+  cd build
   make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/licq/PKGBUILD b/extra/licq/PKGBUILD
index e5e8a4b9d..f1557447c 100644
--- a/extra/licq/PKGBUILD
+++ b/extra/licq/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 176292 2013-01-28 16:48:25Z stephane $
+# $Id: PKGBUILD 178969 2013-03-01 10:22:04Z andrea $
 # Maintainer: Juergen Hoetzel <juergen@archlinux.org>
 
 pkgname=licq
 pkgver=1.7.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Advanced graphical ICQ clone and more for Unix" 
 arch=('i686' 'x86_64')
 url="http://www.licq.org"
 license=('GPL')
-depends=('boost-libs' 'gpgme' 'libxss' 'qt')
+depends=('boost-libs' 'gpgme' 'libxss' 'qt4')
 makedepends=('cmake' 'boost')
 options=('!libtool')
 source=(http://downloads.sourceforge.net/sourceforge/licq/licq-${pkgver}.tar.bz2)
@@ -17,6 +17,8 @@ md5sums=('701e57efedc2b7ece64c3d2d2e9f9e16')
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
+  . /etc/profile.d/qt4.sh
+
   # licq
   mkdir build
   cd build
diff --git a/extra/lyx/PKGBUILD b/extra/lyx/PKGBUILD
index 069a8e373..e67dfe54f 100644
--- a/extra/lyx/PKGBUILD
+++ b/extra/lyx/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 176293 2013-01-28 16:48:26Z stephane $
+# $Id: PKGBUILD 178970 2013-03-01 10:22:14Z andrea $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Jason Chu <jason@archlinux.org>
 
 pkgname=lyx
 pkgver=2.0.5.1
-pkgrel=1
+pkgrel=2
 pkgdesc="An advanced WYSIWYM document processor & LaTeX front-end"
 arch=('i686' 'x86_64')
 url="http://www.lyx.org"
-depends=('qt' 'texlive-core' 'python2' 'imagemagick' 'enchant' 'boost-libs' 'libmythes')
+depends=('qt4' 'texlive-core' 'python2' 'imagemagick' 'enchant' 'boost-libs' 'libmythes')
 makedepends=('boost')
 optdepends=('rcs: built-in version control system'
             'texlive-latexextra: float wrap support')
@@ -23,6 +23,8 @@ sha1sums=('a822e99484c1652c4df5df717819dd7048fcff75'
           '56416642cc3da2a13b87b84e6b87c1a239f3d09a')
 
 build() {
+  . /etc/profile.d/qt4.sh
+
   cd "${srcdir}/${pkgname}-${pkgver}"
   find . -type f -exec sed -i 's|#!.*python|#!/usr/bin/env python2|' {} +
   sed -i 's|"python|"python2|' lib/configure.py src/support/os.cpp
diff --git a/extra/mysql/PKGBUILD b/extra/mysql/PKGBUILD
index ea07e72b2..6e6557d1c 100644
--- a/extra/mysql/PKGBUILD
+++ b/extra/mysql/PKGBUILD
@@ -1,30 +1,30 @@
-# $Id: PKGBUILD 176798 2013-01-31 15:46:51Z andrea $
+# $Id: PKGBUILD 178940 2013-03-01 05:59:24Z bpiotrowski $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
 
 pkgbase=mysql
 pkgname=('libmysqlclient' 'mysql-clients' 'mysql')
 pkgver=5.5.30
-pkgrel=1
+pkgrel=6
 arch=('i686' 'x86_64')
 license=('GPL')
 url="https://www.mysql.com/products/community/"
 makedepends=('cmake' 'openssl' 'zlib')
 options=('!libtool')
-source=("http://ftp.gwdg.de/pub/misc/mysql/Downloads/MySQL-5.5/${pkgbase}-${pkgver}.tar.gz"
-        'my.cnf' 'mysqld-post.sh' 'mysqld-tmpfile.conf' 'mysqld.service')
-md5sums=('f0cdd56f89e781e800cf223bd9edd00c'
-         '1351485633baf9894cfdf7c5bbffd7b5'
-         '6ea6ceb360d09a774e87335ee098ddd5'
-         '2fa6e456964d4ff5e6d4f9ff0126aed6'
-         'a0e1460c276a50a9666c331de83271f2')
+source=(http://ftp.gwdg.de/pub/misc/mysql/Downloads/MySQL-5.5/${pkgbase}-${pkgver}.tar.gz{,.asc}
+        mysqld-post.sh
+        mysqld-tmpfile.conf
+        mysqld.service)
+sha256sums=('909fe596e0044082a02d2757b742a33b8a3ff399b589603940494d3d3d975053'
+            '27d3bba7b7f54f9f77cddba81a3fe124aeef918cc09eb28860338e9a4359e6f7'
+            '368f9fd2454d80eb32abb8f29f703d1cf9553353fb9e1ae4529c4b851cb8c5dd'
+            '2af318c52ae0fe5428e8a9245d1b0fc3bc5ce153842d1563329ceb1edfa83ddd'
+            '50212165bdb09855b97b15a917464ba34f82edf30a0c43f9a0c93a27071df556')
 
 build() {
   mkdir build
   cd build
 
-  # CFLAGS/CXXFLAGS as suggested upstream
-
   cmake ../${pkgbase}-${pkgver} \
     -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_INSTALL_PREFIX=/usr \
@@ -53,9 +53,9 @@ build() {
     -DWITH_EMBEDDED_SERVER=ON \
     -DWITH_INNOBASE_STORAGE_ENGINE=1 \
     -DWITH_PARTITION_STORAGE_ENGINE=1 \
+    -DWITH_ARCHIVE_STORAGE_ENGINE=1 \
+    -DWITH_BLACKHOLE_STORAGE_ENGINE=1 \
     -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 \
-    -DWITHOUT_ARCHIVE_STORAGE_ENGINE=1 \
-    -DWITHOUT_BLACKHOLE_STORAGE_ENGINE=1 \
     -DWITHOUT_FEDERATED_STORAGE_ENGINE=1 \
     -DCMAKE_C_FLAGS="-fPIC ${CFLAGS} -fno-strict-aliasing -DBIG_JOINS=1 -fomit-frame-pointer" \
     -DCMAKE_CXX_FLAGS="-fPIC ${CXXFLAGS} -fno-strict-aliasing -DBIG_JOINS=1 -felide-constructors -fno-rtti"
@@ -107,7 +107,7 @@ package_mysql(){
   cd build
   make DESTDIR="${pkgdir}" install
 
-  install -Dm644 "${srcdir}"/my.cnf "${pkgdir}"/etc/mysql/my.cnf
+  install -Dm644 "${pkgdir}"/usr/share/mysql/my-medium.cnf "${pkgdir}"/etc/mysql/my.cnf
   install -Dm755 "${srcdir}"/mysqld-post.sh "${pkgdir}"/usr/bin/mysqld-post
   install -Dm644 "${srcdir}"/mysqld-tmpfile.conf "${pkgdir}"/usr/lib/tmpfiles.d/mysqld.conf
   install -d "${pkgdir}"/usr/lib/systemd/system
@@ -127,5 +127,5 @@ package_mysql(){
   rm -r "${pkgdir}"/usr/{data,mysql-test,sql-bench}
   rm "${pkgdir}"/usr/share/man/man1/mysql-test-run.pl.1
 
-  install -dm700 "${pkgdir}"/var/lib/mysql
+  #install -dm700 "${pkgdir}"/var/lib/mysql
 }
diff --git a/extra/mysql/my.cnf b/extra/mysql/my.cnf
deleted file mode 100644
index 387020858..000000000
--- a/extra/mysql/my.cnf
+++ /dev/null
@@ -1,145 +0,0 @@
-# MySQL config file for medium systems.
-#
-# This is for a system with little memory (32M - 64M) where MySQL plays
-# an important part, or systems up to 128M where MySQL is used together with
-# other programs (such as a web server)
-#
-# MySQL programs look for option files in a set of
-# locations which depend on the deployment platform.
-# You can copy this option file to one of those
-# locations. For information about these locations, see:
-# http://dev.mysql.com/doc/mysql/en/option-files.html
-#
-# In this file, you can use all long options that a program supports.
-# If you want to know which options a program supports, run the program
-# with the "--help" option.
-
-# The following options will be passed to all MySQL clients
-[client]
-#password	= your_password
-port		= 3306
-socket		= /run/mysqld/mysqld.sock
-
-# Here follows entries for some specific programs
-
-# The MySQL server
-[mysqld]
-port		= 3306
-socket		= /run/mysqld/mysqld.sock
-datadir		= /var/lib/mysql
-skip-external-locking
-key_buffer_size = 16M
-max_allowed_packet = 1M
-table_open_cache = 64
-sort_buffer_size = 512K
-net_buffer_length = 8K
-read_buffer_size = 256K
-read_rnd_buffer_size = 512K
-myisam_sort_buffer_size = 8M
-
-# Don't listen on a TCP/IP port at all. This can be a security enhancement,
-# if all processes that need to connect to mysqld run on the same host.
-# All interaction with mysqld must be made via Unix sockets or named pipes.
-# Note that using this option without enabling named pipes on Windows
-# (via the "enable-named-pipe" option) will render mysqld useless!
-# 
-skip-networking
-
-# Replication Master Server (default)
-# binary logging is required for replication
-log-bin=mysql-bin
-
-# binary logging format - mixed recommended
-binlog_format=mixed
-
-# required unique id between 1 and 2^32 - 1
-# defaults to 1 if master-host is not set
-# but will not function as a master if omitted
-server-id	= 1
-
-# Replication Slave (comment out master section to use this)
-#
-# To configure this host as a replication slave, you can choose between
-# two methods :
-#
-# 1) Use the CHANGE MASTER TO command (fully described in our manual) -
-#    the syntax is:
-#
-#    CHANGE MASTER TO MASTER_HOST=<host>, MASTER_PORT=<port>,
-#    MASTER_USER=<user>, MASTER_PASSWORD=<password> ;
-#
-#    where you replace <host>, <user>, <password> by quoted strings and
-#    <port> by the master's port number (3306 by default).
-#
-#    Example:
-#
-#    CHANGE MASTER TO MASTER_HOST='125.564.12.1', MASTER_PORT=3306,
-#    MASTER_USER='joe', MASTER_PASSWORD='secret';
-#
-# OR
-#
-# 2) Set the variables below. However, in case you choose this method, then
-#    start replication for the first time (even unsuccessfully, for example
-#    if you mistyped the password in master-password and the slave fails to
-#    connect), the slave will create a master.info file, and any later
-#    change in this file to the variables' values below will be ignored and
-#    overridden by the content of the master.info file, unless you shutdown
-#    the slave server, delete master.info and restart the slaver server.
-#    For that reason, you may want to leave the lines below untouched
-#    (commented) and instead use CHANGE MASTER TO (see above)
-#
-# required unique id between 2 and 2^32 - 1
-# (and different from the master)
-# defaults to 2 if master-host is set
-# but will not function as a slave if omitted
-#server-id       = 2
-#
-# The replication master for this slave - required
-#master-host     =   <hostname>
-#
-# The username the slave will use for authentication when connecting
-# to the master - required
-#master-user     =   <username>
-#
-# The password the slave will authenticate with when connecting to
-# the master - required
-#master-password =   <password>
-#
-# The port the master is listening on.
-# optional - defaults to 3306
-#master-port     =  <port>
-#
-# binary logging - not required for slaves, but recommended
-#log-bin=mysql-bin
-
-# Uncomment the following if you are using InnoDB tables
-#innodb_data_home_dir = /var/lib/mysql
-#innodb_data_file_path = ibdata1:10M:autoextend
-#innodb_log_group_home_dir = /var/lib/mysql
-# You can set .._buffer_pool_size up to 50 - 80 %
-# of RAM but beware of setting memory usage too high
-#innodb_buffer_pool_size = 16M
-#innodb_additional_mem_pool_size = 2M
-# Set .._log_file_size to 25 % of buffer pool size
-#innodb_log_file_size = 5M
-#innodb_log_buffer_size = 8M
-#innodb_flush_log_at_trx_commit = 1
-#innodb_lock_wait_timeout = 50
-
-[mysqldump]
-quick
-max_allowed_packet = 16M
-
-[mysql]
-no-auto-rehash
-# Remove the next comment character if you are not familiar with SQL
-#safe-updates
-
-[myisamchk]
-key_buffer_size = 20M
-sort_buffer_size = 20M
-read_buffer = 2M
-write_buffer = 2M
-
-[mysqlhotcopy]
-interactive-timeout
diff --git a/extra/mysql/mysql.install b/extra/mysql/mysql.install
index a98f1a877..907e98656 100644
--- a/extra/mysql/mysql.install
+++ b/extra/mysql/mysql.install
@@ -1,15 +1,24 @@
+if [[ $(command -v my_print_defaults >/dev/null 2>&1) ]]; then
+  datadir=$(my_print_defaults mysqld | sed -n "s/^--datadir=//p")
+fi
+[[ -z $datadir ]] && datadir=/var/lib/mysql 
+
 post_install(){
   groupadd -g 89 mysql &>/dev/null
-  useradd -u 89 -g mysql -d /var/lib/mysql -s /bin/false mysql &>/dev/null
-  usr/bin/mysql_install_db --user=mysql --basedir=/usr
-  chown -R mysql:mysql var/lib/mysql &>/dev/null
+  useradd -u 89 -g mysql -d $datadir -s /bin/false mysql &>/dev/null
+
+  if [[ ! -e $datadir ]]; then
+    install -dm700 $datadir
+    usr/bin/mysql_install_db --user=mysql --basedir=/usr --datadir=$datadir
+    chown -R mysql:mysql var/lib/mysql &>/dev/null
+  fi
 
   usr/bin/systemd-tmpfiles --create mysqld.conf
 }
 
 post_upgrade(){
   getent group mysql >/dev/null 2>&1 || groupadd -g 89 mysql &>/dev/null
-  getent passwd mysql >/dev/null 2>&1 || useradd -u 89 -g mysql -d /var/lib/mysql -s /bin/false mysql &>/dev/null
+  getent passwd mysql >/dev/null 2>&1 || useradd -u 89 -g mysql -d $datadir -s /bin/false mysql &>/dev/null
 
   if [ "$(vercmp $2 5.5)" -lt 0 ]; then
     echo " >> "
diff --git a/extra/mysql/mysqld-post.sh b/extra/mysql/mysqld-post.sh
index 8dc9c4eea..c4ac18171 100755
--- a/extra/mysql/mysqld-post.sh
+++ b/extra/mysql/mysqld-post.sh
@@ -1,7 +1,8 @@
 #!/bin/sh
 
 while true; do
-    response=`/usr/bin/mysqladmin -uUNKNOWN_USER ping 2>&1` && break
+    response=$(/usr/bin/mysqladmin -uUNKNOWN_USER ping 2>&1) && break
     echo "$response" | grep -q "mysqld is alive" && break
+    echo "$response" | grep -q "Access denied for user" && break 
     sleep 1
 done
diff --git a/extra/mysql/mysqld.service b/extra/mysql/mysqld.service
index 0175c685b..a6fc8cf88 100644
--- a/extra/mysql/mysqld.service
+++ b/extra/mysql/mysqld.service
@@ -1,11 +1,16 @@
 [Unit]
-Description=MySQL Server
+Description=MySQL database server
+After=syslog.target
 
 [Service]
 User=mysql
-ExecStart=/usr/bin/mysqld --user=mysql
+Group=mysql
+
+ExecStart=/usr/bin/mysqld --pid-file=/run/mysqld/mysqld.pid 
 ExecStartPost=/usr/bin/mysqld-post
+
 Restart=always
+PrivateTmp=true
 
 [Install]
 WantedBy=multi-user.target
diff --git a/extra/phonon/PKGBUILD b/extra/phonon/PKGBUILD
index 64418b965..9a1c07bfc 100644
--- a/extra/phonon/PKGBUILD
+++ b/extra/phonon/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 169725 2012-10-27 10:50:17Z andrea $
+# $Id: PKGBUILD 179044 2013-03-01 21:25:10Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=phonon
 pkgver=4.6.0
-pkgrel=3
+pkgrel=7
 epoch=1
 arch=('i686' 'x86_64')
 url='http://phonon.kde.org/'
 license=('LGPL')
 pkgdesc="The multimedia framework for KDE"
-depends=('qt' 'phonon-backend' 'libpulse' 'libqzeitgeist')
+depends=('phonon-backend' 'libpulse' 'libqzeitgeist')
 optdepends=('pulseaudio: PulseAudio support')
-makedepends=('cmake' 'automoc4' 'pulseaudio' 'qtwebkit')
+makedepends=('cmake' 'automoc4' 'pulseaudio')
 source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.xz"
         'fix-plugindir-for-qt-app.patch'
         'fix-qmake.patch')
@@ -21,6 +21,7 @@ md5sums=('bbe0c1c62ed14c31479c4c1a6cf1e173'
 
 build() {
   cd ${pkgname}-${pkgver}
+  # Upstream fixes
   patch -p1 -i "${srcdir}"/fix-plugindir-for-qt-app.patch
   patch -p1 -i "${srcdir}"/fix-qmake.patch
   cd ../
@@ -31,8 +32,8 @@ build() {
     -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_SKIP_RPATH=ON \
     -DCMAKE_INSTALL_PREFIX=/usr \
-    -DPHONON_QT_MKSPECS_INSTALL_DIR=/usr/share/qt/mkspecs/modules \
-    -DPHONON_QT_PLUGIN_INSTALL_DIR=/usr/lib/qt/plugins/designer
+    -DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=ON \
+    -DPHONON_BUILD_DESIGNER_PLUGIN=OFF
   make
 }
 
diff --git a/extra/polkit-qt/PKGBUILD b/extra/polkit-qt/PKGBUILD
index 82f5801b6..d77ee8182 100644
--- a/extra/polkit-qt/PKGBUILD
+++ b/extra/polkit-qt/PKGBUILD
@@ -4,18 +4,19 @@
 
 pkgname=polkit-qt
 pkgver=0.103.0
-pkgrel=1
+pkgrel=2
 pkgdesc='A library that allows developers to access PolicyKit API with a nice Qt-style API'
 arch=('i686' 'x86_64')
 url='https://projects.kde.org/projects/kdesupport/polkit-qt-1'
 license=('LGPL')
-depends=('polkit' 'qt')
+depends=('polkit' 'qt4')
 makedepends=('cmake' 'automoc4')
 source=("http://download.kde.org/stable/apps/KDE4.x/admin/${pkgname}-1-${pkgver}.tar.bz2")
 md5sums=('a105e233e6733fb072c9080cd7ae1af2')
 
 build() {
-  cd "${srcdir}"
+  . /etc/profile.d/qt4.sh
+
   mkdir build
   cd build
   cmake ../${pkgname}-1-${pkgver} \
@@ -25,6 +26,6 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/build"
+  cd build
   make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/poppler/PKGBUILD b/extra/poppler/PKGBUILD
index 06d41efed..5f328fd67 100644
--- a/extra/poppler/PKGBUILD
+++ b/extra/poppler/PKGBUILD
@@ -1,13 +1,13 @@
-# $Id: PKGBUILD 178227 2013-02-18 14:46:39Z jgc $
+# $Id: PKGBUILD 178974 2013-03-01 10:22:47Z andrea $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=poppler
 pkgname=('poppler' 'poppler-glib' 'poppler-qt')
 pkgver=0.22.1
-pkgrel=2
+pkgrel=3
 arch=(i686 x86_64)
 license=('GPL')
-makedepends=('libjpeg' 'gcc-libs' 'cairo' 'fontconfig' 'openjpeg' 'gtk2' 'qt' 'pkgconfig' 'lcms' 'gobject-introspection' 'icu')
+makedepends=('libjpeg' 'gcc-libs' 'cairo' 'fontconfig' 'openjpeg' 'gtk2' 'qt4' 'pkgconfig' 'lcms' 'gobject-introspection' 'icu')
 options=('!libtool' '!emptydirs')
 url="http://poppler.freedesktop.org/"
 _testtag=0d2bfd4af4c76a3bac27ccaff793d9129df7b57a
@@ -17,6 +17,8 @@ md5sums=('50c259fdda538c1ba94b62aa25f7ec87'
          '9dc64c254a31e570507bdd4ad4ba629a')
 
 build() {
+  . /etc/profile.d/qt4.sh
+
   cd "${srcdir}/${pkgbase}-${pkgver}"
   sed -i -e '/AC_PATH_XTRA/d' configure.ac
   sed -i "s:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:" configure.ac
@@ -70,7 +72,7 @@ package_poppler-glib() {
 
 package_poppler-qt() {
   pkgdesc="Poppler Qt bindings"
-  depends=("poppler=${pkgver}" 'qt')
+  depends=("poppler=${pkgver}" 'qt4')
 
   cd "${srcdir}/${pkgbase}-${pkgver}/poppler"
   make DESTDIR="${pkgdir}" install-libLTLIBRARIES
diff --git a/extra/prison/PKGBUILD b/extra/prison/PKGBUILD
index 793db4535..7552fa8dc 100644
--- a/extra/prison/PKGBUILD
+++ b/extra/prison/PKGBUILD
@@ -1,20 +1,21 @@
-# $Id: PKGBUILD 133482 2011-07-28 15:01:26Z andrea $
+# $Id: PKGBUILD 178975 2013-03-01 10:22:55Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=prison
 pkgver=1.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A barcode API to produce QRCode barcodes and DataMatrix barcodes"
 arch=('i686' 'x86_64')
-url="http://www.kde.org"
+url='https://projects.kde.org/projects/kdesupport/prison'
 license=('GPL')
-depends=('qt' 'libdmtx' 'qrencode')
+depends=('qt4' 'libdmtx' 'qrencode')
 makedepends=('cmake')
 source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.gz")
 md5sums=('8baac61506e37a31482a0df4a5d02cd2')
 
 build() {
-  cd "${srcdir}"
+  . /etc/profile.d/qt4.sh
+
   mkdir build
   cd build
   cmake ../${pkgname}-${pkgver} \
@@ -24,6 +25,6 @@ build() {
 }
 
 package() {
-  cd "${srcdir}"/build
+  cd build
   make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/pyqt/PKGBUILD b/extra/pyqt/PKGBUILD
index 72b1e3de7..7c55c3061 100644
--- a/extra/pyqt/PKGBUILD
+++ b/extra/pyqt/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 173040 2012-12-09 15:29:07Z andrea $
+# $Id: PKGBUILD 178976 2013-03-01 10:23:02Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
 # Contributor: riai <riai@bigfoot.com> Ben <ben@benmazer.net>
@@ -6,16 +6,18 @@
 pkgbase=pyqt
 pkgname=('pyqt-common' 'pyqt' 'python2-pyqt')
 pkgver=4.9.6
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url="http://riverbankcomputing.co.uk/software/pyqt/intro"
 license=('GPL')
-makedepends=('qt' 'python-sip' 'python-dbus' 'python2-sip' 'phonon' 'mesa'
+makedepends=('qt4' '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')
 
 build() {
+  . /etc/profile.d/qt4.sh
+
   cp -r PyQt-x11-gpl-${pkgver} Py2Qt-x11-gpl-${pkgver}
 
   cd PyQt-x11-gpl-${pkgver}
@@ -48,7 +50,7 @@ package_pyqt-common(){
   make -C pyrcc DESTDIR="${pkgdir}" install
   make -C pylupdate DESTDIR="${pkgdir}" install
   
-  install -Dm644 PyQt4.api "${pkgdir}"/usr/share/qt/qsci/api/python/PyQt4.api
+  install -Dm644 PyQt4.api "${pkgdir}"/usr/share/qt4/qsci/api/python/PyQt4.api
 }
 
 package_pyqt(){
@@ -64,7 +66,7 @@ package_pyqt(){
 
   # Provided by pyqt-common
   rm "${pkgdir}"/usr/bin/{pylupdate4,pyrcc4}
-  rm "${pkgdir}"/usr/share/qt/qsci/api/python/PyQt4.api
+  rm "${pkgdir}"/usr/share/qt4/qsci/api/python/PyQt4.api
 }
 
 package_python2-pyqt(){
@@ -85,6 +87,6 @@ package_python2-pyqt(){
   
   # Provided by pyqt
   rm "${pkgdir}"/usr/bin/{pylupdate4,pyrcc4}
-  rm "${pkgdir}"/usr/lib/qt/plugins/designer/libpythonplugin.so
-  rm "${pkgdir}"/usr/share/qt/qsci/api/python/PyQt4.api
+  rm "${pkgdir}"/usr/lib/qt4/plugins/designer/libpythonplugin.so
+  rm "${pkgdir}"/usr/share/qt4/qsci/api/python/PyQt4.api
 }
diff --git a/extra/qca-gnupg/PKGBUILD b/extra/qca-gnupg/PKGBUILD
index 0908a4514..99eeee362 100644
--- a/extra/qca-gnupg/PKGBUILD
+++ b/extra/qca-gnupg/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 178075 2013-02-15 12:03:06Z pierre $
+# $Id: PKGBUILD 178978 2013-03-01 10:23:20Z andrea $
 # Maintainer:
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=qca-gnupg
 pkgver=2.0.0
 _pkgver=2.0.0-beta3
-pkgrel=4
+pkgrel=5
 pkgdesc="Qt Cryptographic Architecture"
 arch=('i686' 'x86_64')
 url="http://delta.affinix.com/qca/"
diff --git a/extra/qca-ossl/PKGBUILD b/extra/qca-ossl/PKGBUILD
index 772cac844..266287574 100644
--- a/extra/qca-ossl/PKGBUILD
+++ b/extra/qca-ossl/PKGBUILD
@@ -4,7 +4,7 @@
 pkgname=qca-ossl
 pkgver=2.0.0
 _pkgver=2.0.0-beta3
-pkgrel=5
+pkgrel=6
 pkgdesc="Qt Cryptographic Architecture"
 arch=('i686' 'x86_64')
 url="http://delta.affinix.com/qca/"
diff --git a/extra/qca/PKGBUILD b/extra/qca/PKGBUILD
index 735683c39..e37bf7c4f 100644
--- a/extra/qca/PKGBUILD
+++ b/extra/qca/PKGBUILD
@@ -1,21 +1,23 @@
-# $Id: PKGBUILD 178073 2013-02-15 11:56:00Z pierre $
+# $Id: PKGBUILD 178977 2013-03-01 10:23:13Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=qca
 pkgver=2.0.3
-pkgrel=3
+pkgrel=4
 pkgdesc="Qt Cryptographic Architecture"
 arch=('i686' 'x86_64')
 url="http://delta.affinix.com/qca/"
 license=('LGPL')
-depends=('qt' 'ca-certificates')
+depends=('qt4' 'ca-certificates')
 source=("http://delta.affinix.com/download/qca/2.0/${pkgname}-${pkgver}.tar.bz2"
         'gcc47.patch')
 md5sums=('fc15bd4da22b8096c51fcfe52d2fa309'
          'dffc7367152d8888c1447253a0387a2a')
 
 build() {
+    . /etc/profile.d/qt4.sh
+
 	cd $srcdir/${pkgname}-${pkgver}
 	patch -p0 -i ${srcdir}/gcc47.patch
 	./configure \
diff --git a/extra/qimageblitz/PKGBUILD b/extra/qimageblitz/PKGBUILD
index abced8b9a..193a92be8 100644
--- a/extra/qimageblitz/PKGBUILD
+++ b/extra/qimageblitz/PKGBUILD
@@ -1,21 +1,22 @@
-# $Id: PKGBUILD 145862 2012-01-03 12:41:58Z andrea $
+# $Id: PKGBUILD 178980 2013-03-01 10:23:35Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=qimageblitz
 pkgver=0.0.6
-pkgrel=2
+pkgrel=3
 pkgdesc="A graphical effect and filter library for KDE"
 arch=('i686' 'x86_64')
 url="http://www.kde.org/"
 license=('GPL2')
-depends=('qt')
+depends=('qt4')
 makedepends=('cmake')
 source=("http://download.kde.org/stable/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
 md5sums=('0ae2f7d4e0876764a97ca73799f61df4')
 
 build() {
-  cd "${srcdir}"
+  . /etc/profile.d/qt4.sh
+
   mkdir build
   cd build
   cmake ../${pkgname}-${pkgver} \
@@ -25,6 +26,6 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/build"
+  cd build
   make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/qjackctl/PKGBUILD b/extra/qjackctl/PKGBUILD
index 22c26cef6..42bd55b74 100644
--- a/extra/qjackctl/PKGBUILD
+++ b/extra/qjackctl/PKGBUILD
@@ -1,20 +1,22 @@
-# $Id: PKGBUILD 164008 2012-07-23 18:45:37Z schiv $
+# $Id: PKGBUILD 178981 2013-03-01 10:23:43Z andrea $
 # Maintainer: Ray Rashif <schiv@archlinux.org>
 # Contributor: Tobias Kieslich <tobias@archlinux.org>
 
 pkgname=qjackctl
 pkgver=0.3.9
-pkgrel=2
+pkgrel=3
 pkgdesc="A Qt front-end for the JACK low-latency audio server"
 url="http://qjackctl.sourceforge.net/"
 arch=('i686' 'x86_64')
 license=('GPL')
-depends=('jack' 'qt')
+depends=('jack' 'qt4')
 options=('!makeflags')
 source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz")
 md5sums=('f932c916f43ba3251d3a9ed62a448e43')
 
 build() {
+  . /etc/profile.d/qt4.sh
+
   cd "$srcdir/$pkgname-$pkgver"
 
   ./configure --prefix=/usr
diff --git a/extra/qjson/PKGBUILD b/extra/qjson/PKGBUILD
index 318ffc64e..ab298d47f 100644
--- a/extra/qjson/PKGBUILD
+++ b/extra/qjson/PKGBUILD
@@ -1,19 +1,21 @@
-# $Id: PKGBUILD 172063 2012-11-27 13:49:24Z andrea $
+# $Id: PKGBUILD 178982 2013-03-01 10:23:51Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=qjson
 pkgver=0.8.1
-pkgrel=1
+pkgrel=2
 pkgdesc="A qt-based library that maps JSON data to QVariant objects"
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://qjson.sourceforge.net"
-depends=('qt')
+depends=('qt4')
 makedepends=('cmake')
 source=(${pkgname}-${pkgver}.tar.gz::"https://github.com/flavio/${pkgname}/archive/${pkgver}.tar.gz")
 md5sums=('4eef13da988edf8f91c260a3e1baeea9')
 
 build() {
+  . /etc/profile.d/qt4.sh
+
   mkdir build
   cd build
   cmake ../${pkgname}-${pkgver} \
diff --git a/extra/qrencode/PKGBUILD b/extra/qrencode/PKGBUILD
index 57315e1fa..58415ca6b 100644
--- a/extra/qrencode/PKGBUILD
+++ b/extra/qrencode/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 169087 2012-10-17 20:07:22Z bluewind $
+# $Id: PKGBUILD 178990 2013-03-01 10:24:41Z bluewind $
 # Maintainer: Florian Pritz< flo@xinu.at>
 # Contributor: Dany Martineau <dany.luc.martineau@gmail.com>
 
 pkgname=qrencode
-pkgver=3.4.1
+pkgver=3.4.2
 pkgrel=1
 pkgdesc="C library for encoding data in a QR Code symbol."
 arch=(i686 x86_64)
@@ -13,13 +13,13 @@ url="http://megaui.net/fukuchi/works/qrencode/index.en.html"
 license=('GPL')
 options=(!libtool)
 source=(http://megaui.net/fukuchi/works/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('219b146d3b365a56a0f4ef58a718f295')
+md5sums=('2c1693a29fe2f26089ccdff9051c0a3f')
 
 build() {
   cd "${srcdir}/$pkgname-$pkgver"
-#  autoreconf
-  ./autogen.sh
+
   ./configure --prefix=/usr
+
   make
 }
 
diff --git a/extra/qscintilla/PKGBUILD b/extra/qscintilla/PKGBUILD
index ffa43b9a9..44ce886c8 100644
--- a/extra/qscintilla/PKGBUILD
+++ b/extra/qscintilla/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 173042 2012-12-09 15:31:45Z andrea $
+# $Id: PKGBUILD 178983 2013-03-01 10:23:58Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Douglas Soares de Andrade <dsa@aur.archlinux.org>
 
@@ -6,7 +6,7 @@ pkgbase=qscintilla
 pkgname=('qscintilla' 'python-qscintilla' 'python2-qscintilla'
          'python-qscintilla-common')
 pkgver=2.7
-pkgrel=1
+pkgrel=2
 license=('GPL')
 arch=('i686' 'x86_64')
 url="http://www.riverbankcomputing.co.uk/software/qscintilla/intro"
@@ -17,7 +17,9 @@ md5sums=('a3857d75a2b332e0460131e0aa4cc4b5'
          '8cf9c06252e2f11ab00e62848e322fd3')
 
 build() {
-    cd "${srcdir}/QScintilla-gpl-${pkgver}" 
+    . /etc/profile.d/qt4.sh
+
+    cd "${srcdir}/QScintilla-gpl-${pkgver}"
     patch -Np1 -i "${srcdir}/configure.py-objdir-support.diff"
 
     cd Qt4Qt5
@@ -41,7 +43,7 @@ build() {
 
 package_qscintilla() {
     pkgdesc="A port to Qt4 of Neil Hodgson's Scintilla C++ editor class"
-    depends=('qt')
+    depends=('qt4')
 
     cd "${srcdir}/QScintilla-gpl-${pkgver}/Qt4Qt5"
     make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
diff --git a/extra/qsynth/PKGBUILD b/extra/qsynth/PKGBUILD
index 3f1c7c379..c4c3caaa8 100644
--- a/extra/qsynth/PKGBUILD
+++ b/extra/qsynth/PKGBUILD
@@ -1,20 +1,22 @@
-# $Id: PKGBUILD 151340 2012-02-25 14:47:42Z pierre $
+# $Id: PKGBUILD 178984 2013-03-01 10:24:07Z andrea $
 # Maintainer: Ray Rashif <schiv@archlinux.org>
 # Contributor: damir <damir@archlinux.org>
 
 pkgname=qsynth
 pkgver=0.3.6
-pkgrel=2
+pkgrel=3
 pkgdesc="Qt GUI for FluidSynth"
 arch=('i686' 'x86_64')
 url="http://qsynth.sourceforge.net/"
 license=('GPL')
-depends=('fluidsynth' 'qt')
+depends=('fluidsynth' 'qt4')
 options=('!makeflags')
 source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz")
 md5sums=('3cba3c87463be75ac188ebc3c3023d12')
 
 build() {
+  . /etc/profile.d/qt4.sh
+
   cd "$srcdir/$pkgname-$pkgver"
 
   ./configure --prefix=/usr
diff --git a/extra/qt-assistant-compat/PKGBUILD b/extra/qt-assistant-compat/PKGBUILD
index 74cd0ded2..8c8d6859a 100644
--- a/extra/qt-assistant-compat/PKGBUILD
+++ b/extra/qt-assistant-compat/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 149629 2012-02-08 20:53:42Z pierre $
+# $Id: PKGBUILD 178985 2013-03-01 10:24:14Z andrea $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 
 pkgname=qt-assistant-compat
 pkgver=4.6.3
-pkgrel=2
+pkgrel=3
 pkgdesc="compat version of Qt Assistant"
-url="http://qt.nokia.com/"
+url="http://qt-project.org/"
 arch=('i686' 'x86_64')
 license=('GPL3' 'LGPL')
-depends=('qt')
+depends=('qt4')
 source=('ftp://ftp.qt.nokia.com/qt/source/qt-assistant-qassistantclient-library-compat-src-4.6.3.tar.gz'
         'debian_patches_01_build_system.diff')
 md5sums=('a20148e0488d5c12ab35ccc107dcc64d'
@@ -16,6 +16,8 @@ md5sums=('a20148e0488d5c12ab35ccc107dcc64d'
 
 # separate package function does not really work here due to broken build files
 build() {
+    . /etc/profile.d/qt4.sh
+
 	cd ${srcdir}/qt-assistant-qassistantclient-library-compat-version-${pkgver}
 
 	patch -Np1 -i ${srcdir}/debian_patches_01_build_system.diff
diff --git a/extra/qt-gstreamer/PKGBUILD b/extra/qt-gstreamer/PKGBUILD
index c471ccada..a7ccc9d5c 100644
--- a/extra/qt-gstreamer/PKGBUILD
+++ b/extra/qt-gstreamer/PKGBUILD
@@ -1,21 +1,22 @@
-# $Id: PKGBUILD 163964 2012-07-23 03:00:17Z allan $
+# $Id: PKGBUILD 178986 2013-03-01 10:24:22Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: laloch <laloch@atlas.cz>
 
 pkgname=qt-gstreamer
 pkgver=0.10.2
-pkgrel=2
-pkgdesc="Qt bindings for GStreamer"
+pkgrel=3
+pkgdesc="Qt4 bindings for GStreamer"
 arch=('i686' 'x86_64')
 url='http://gstreamer.freedesktop.org/modules/qt-gstreamer.html'
 license=('LGPL2.1')
-depends=('qt' 'gstreamer0.10-base' 'libgles')
+depends=('qt4' 'gstreamer0.10-base' 'libgles')
 makedepends=('cmake' 'automoc4' 'boost' 'mesa' 'doxygen')
 source=("http://gstreamer.freedesktop.org/src/${pkgname}/${pkgname}-${pkgver}.tar.gz")
 md5sums=('0428aedf2874fd0884ad4c41db9da20e')
 
 build() {
-  cd "${srcdir}"
+  . /etc/profile.d/qt4.sh
+
   mkdir build
   cd build
   cmake ../${pkgname}-${pkgver} \
@@ -26,6 +27,6 @@ build() {
 }
 
 package() {
-  cd "$srcdir/build"
+  cd build
   make DESTDIR="$pkgdir" install
 }
diff --git a/extra/qt/Drop-read-write-perms-for-users.patch b/extra/qt/Drop-read-write-perms-for-users.patch
deleted file mode 100644
index c3f56e65e..000000000
--- a/extra/qt/Drop-read-write-perms-for-users.patch
+++ /dev/null
@@ -1,145 +0,0 @@
-From 20b26bdb3dd5e46b01b9a7e1ce8342074df3c89c Mon Sep 17 00:00:00 2001
-From: Thiago Macieira <thiago.macieira@intel.com>
-Date: Sat, 22 Dec 2012 08:32:12 -0800
-Subject: [PATCH] Change all shmget calls to user-only memory
-
-Drop the read and write permissions for group and other users in the
-system.
-
-Change-Id: I8fc753f09126651af3fb82df3049050f0b14e876
-(cherry-picked from Qt 5 commit 856f209fb63ae336bfb389a12d2a75fa886dc1c5)
-Reviewed-by: Richard J. Moore <rich@kde.org>
----
- src/corelib/kernel/qsharedmemory_unix.cpp          |    6 +++---
- src/corelib/kernel/qsystemsemaphore_unix.cpp       |    4 ++--
- src/gui/image/qnativeimage.cpp                     |    2 +-
- src/gui/image/qpixmap_x11.cpp                      |    2 +-
- src/plugins/platforms/xcb/qxcbwindowsurface.cpp    |    2 +-
- src/plugins/platforms/xlib/qxlibwindowsurface.cpp  |    2 +-
- .../auto/qtipc/qsharedmemory/tst_qsharedmemory.cpp |    2 +-
- tools/qvfb/qvfbshmem.cpp                           |    4 ++--
- 8 files changed, 12 insertions(+), 12 deletions(-)
-
-diff --git a/src/corelib/kernel/qsharedmemory_unix.cpp b/src/corelib/kernel/qsharedmemory_unix.cpp
-index 20d76e3..4cf3acf 100644
---- a/src/corelib/kernel/qsharedmemory_unix.cpp
-+++ b/src/corelib/kernel/qsharedmemory_unix.cpp
-@@ -238,7 +238,7 @@ bool QSharedMemoryPrivate::create(int size)
-     }
- 
-     // create
--    if (-1 == shmget(unix_key, size, 0666 | IPC_CREAT | IPC_EXCL)) {
-+    if (-1 == shmget(unix_key, size, 0600 | IPC_CREAT | IPC_EXCL)) {
-         QString function = QLatin1String("QSharedMemory::create");
-         switch (errno) {
-         case EINVAL:
-@@ -293,7 +293,7 @@ bool QSharedMemoryPrivate::attach(QSharedMemory::AccessMode mode)
- {
- #ifndef QT_POSIX_IPC
-     // grab the shared memory segment id
--    int id = shmget(unix_key, 0, (mode == QSharedMemory::ReadOnly ? 0444 : 0660));
-+    int id = shmget(unix_key, 0, (mode == QSharedMemory::ReadOnly ? 0400 : 0600));
-     if (-1 == id) {
-         setErrorString(QLatin1String("QSharedMemory::attach (shmget)"));
-         return false;
-@@ -381,7 +381,7 @@ bool QSharedMemoryPrivate::detach()
-     size = 0;
- 
-     // Get the number of current attachments
--    int id = shmget(unix_key, 0, 0444);
-+    int id = shmget(unix_key, 0, 0400);
-     cleanHandle();
- 
-     struct shmid_ds shmid_ds;
-diff --git a/src/corelib/kernel/qsystemsemaphore_unix.cpp b/src/corelib/kernel/qsystemsemaphore_unix.cpp
-index fad9acc..e77456b 100644
---- a/src/corelib/kernel/qsystemsemaphore_unix.cpp
-+++ b/src/corelib/kernel/qsystemsemaphore_unix.cpp
-@@ -153,10 +153,10 @@ key_t QSystemSemaphorePrivate::handle(QSystemSemaphore::AccessMode mode)
-     }
- 
-     // Get semaphore
--    semaphore = semget(unix_key, 1, 0666 | IPC_CREAT | IPC_EXCL);
-+    semaphore = semget(unix_key, 1, 0600 | IPC_CREAT | IPC_EXCL);
-     if (-1 == semaphore) {
-         if (errno == EEXIST)
--            semaphore = semget(unix_key, 1, 0666 | IPC_CREAT);
-+            semaphore = semget(unix_key, 1, 0600 | IPC_CREAT);
-         if (-1 == semaphore) {
-             setErrorString(QLatin1String("QSystemSemaphore::handle"));
-             cleanHandle();
-diff --git a/src/gui/image/qnativeimage.cpp b/src/gui/image/qnativeimage.cpp
-index 9654afe..fef38c5 100644
---- a/src/gui/image/qnativeimage.cpp
-+++ b/src/gui/image/qnativeimage.cpp
-@@ -176,7 +176,7 @@ QNativeImage::QNativeImage(int width, int height, QImage::Format format,bool /*
- 
-     bool ok;
-     xshminfo.shmid = shmget(IPC_PRIVATE, xshmimg->bytes_per_line * xshmimg->height,
--                            IPC_CREAT | 0777);
-+                            IPC_CREAT | 0700);
-     ok = xshminfo.shmid != -1;
-     if (ok) {
-         xshmimg->data = (char*)shmat(xshminfo.shmid, 0, 0);
-diff --git a/src/gui/image/qpixmap_x11.cpp b/src/gui/image/qpixmap_x11.cpp
-index 280d8bd..88c9b7b 100644
---- a/src/gui/image/qpixmap_x11.cpp
-+++ b/src/gui/image/qpixmap_x11.cpp
-@@ -193,7 +193,7 @@ static bool qt_create_mitshm_buffer(const QPaintDevice* dev, int w, int h)
-     bool ok;
-     xshminfo.shmid = shmget(IPC_PRIVATE,
-                              xshmimg->bytes_per_line * xshmimg->height,
--                             IPC_CREAT | 0777);
-+                             IPC_CREAT | 0700);
-     ok = xshminfo.shmid != -1;
-     if (ok) {
-         xshmimg->data = (char*)shmat(xshminfo.shmid, 0, 0);
-diff --git a/src/plugins/platforms/xcb/qxcbwindowsurface.cpp b/src/plugins/platforms/xcb/qxcbwindowsurface.cpp
-index b6a42d8..0d56821 100644
---- a/src/plugins/platforms/xcb/qxcbwindowsurface.cpp
-+++ b/src/plugins/platforms/xcb/qxcbwindowsurface.cpp
-@@ -98,7 +98,7 @@ QXcbShmImage::QXcbShmImage(QXcbScreen *screen, const QSize &size, uint depth, QI
-                                           0);
- 
-     m_shm_info.shmid = shmget (IPC_PRIVATE,
--          m_xcb_image->stride * m_xcb_image->height, IPC_CREAT|0777);
-+          m_xcb_image->stride * m_xcb_image->height, IPC_CREAT|0600);
- 
-     m_shm_info.shmaddr = m_xcb_image->data = (quint8 *)shmat (m_shm_info.shmid, 0, 0);
-     m_shm_info.shmseg = xcb_generate_id(xcb_connection());
-diff --git a/src/plugins/platforms/xlib/qxlibwindowsurface.cpp b/src/plugins/platforms/xlib/qxlibwindowsurface.cpp
-index bf003eb..46a2f97 100644
---- a/src/plugins/platforms/xlib/qxlibwindowsurface.cpp
-+++ b/src/plugins/platforms/xlib/qxlibwindowsurface.cpp
-@@ -99,7 +99,7 @@ void QXlibWindowSurface::resizeShmImage(int width, int height)
- 
- 
-     image_info->shminfo.shmid = shmget (IPC_PRIVATE,
--          image->bytes_per_line * image->height, IPC_CREAT|0777);
-+          image->bytes_per_line * image->height, IPC_CREAT|0700);
- 
-     image_info->shminfo.shmaddr = image->data = (char*)shmat (image_info->shminfo.shmid, 0, 0);
-     image_info->shminfo.readOnly = False;
-diff --git a/tools/qvfb/qvfbshmem.cpp b/tools/qvfb/qvfbshmem.cpp
-index 7f9671f..84b6ebe 100644
---- a/tools/qvfb/qvfbshmem.cpp
-+++ b/tools/qvfb/qvfbshmem.cpp
-@@ -176,13 +176,13 @@ QShMemViewProtocol::QShMemViewProtocol(int displayid, const QSize &s,
-     uint data_offset_value = sizeof(QVFbHeader);
- 
-     int dataSize = bpl * h + data_offset_value;
--    shmId = shmget(key, dataSize, IPC_CREAT | 0666);
-+    shmId = shmget(key, dataSize, IPC_CREAT | 0600);
-     if (shmId != -1)
- 	data = (unsigned char *)shmat(shmId, 0, 0);
-     else {
- 	struct shmid_ds shm;
- 	shmctl(shmId, IPC_RMID, &shm);
--	shmId = shmget(key, dataSize, IPC_CREAT | 0666);
-+    shmId = shmget(key, dataSize, IPC_CREAT | 0600);
- 	if (shmId == -1) {
-             perror("QShMemViewProtocol::QShMemViewProtocol");
-             qFatal("Cannot get shared memory 0x%08x", key);
--- 
-1.7.1
-
diff --git a/extra/qt/Fix-binary-incompatibility-between-openssl-versions.patch b/extra/qt/Fix-binary-incompatibility-between-openssl-versions.patch
deleted file mode 100644
index 5f56edd8d..000000000
--- a/extra/qt/Fix-binary-incompatibility-between-openssl-versions.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-From 691e78e5061d4cbc0de212d23b06c5dffddf2098 Mon Sep 17 00:00:00 2001
-From: Shane Kearns <dbgshane@gmail.com>
-Date: Thu, 6 Dec 2012 17:03:18 +0000
-Subject: [PATCH 54/79] Fix binary incompatibility between openssl versions
-
-OpenSSL changed the layout of X509_STORE_CTX between 0.9 and 1.0
-So we have to consider this struct as private implementation, and use
-the access functions instead.
-
-This bug would cause certificate verification problems if a different
-version of openssl is loaded at runtime to the headers Qt was compiled
-against.
-
-Task-number: QTBUG-28343
-Change-Id: I47fc24336f7d9c80f08f9c8ba6debc51a5591258
-Reviewed-by: Richard J. Moore <rich@kde.org>
-(cherry picked from commit eb2688c4c4f257d0a4d978ba4bf57d6347b15252)
----
- src/network/ssl/qsslsocket_openssl.cpp         | 2 +-
- src/network/ssl/qsslsocket_openssl_symbols.cpp | 8 ++++++++
- src/network/ssl/qsslsocket_openssl_symbols_p.h | 4 ++++
- 3 files changed, 13 insertions(+), 1 deletion(-)
-
-diff --git a/src/network/ssl/qsslsocket_openssl.cpp b/src/network/ssl/qsslsocket_openssl.cpp
-index b7ca290..e912abac 100644
---- a/src/network/ssl/qsslsocket_openssl.cpp
-+++ b/src/network/ssl/qsslsocket_openssl.cpp
-@@ -236,7 +236,7 @@ static int q_X509Callback(int ok, X509_STORE_CTX *ctx)
- {
-     if (!ok) {
-         // Store the error and at which depth the error was detected.
--        _q_sslErrorList()->errors << qMakePair<int, int>(ctx->error, ctx->error_depth);
-+        _q_sslErrorList()->errors << qMakePair<int, int>(q_X509_STORE_CTX_get_error(ctx), q_X509_STORE_CTX_get_error_depth(ctx));
-     }
-     // Always return OK to allow verification to continue. We're handle the
-     // errors gracefully after collecting all errors, after verification has
-diff --git a/src/network/ssl/qsslsocket_openssl_symbols.cpp b/src/network/ssl/qsslsocket_openssl_symbols.cpp
-index 2d6a25b..2e6ccd0 100644
---- a/src/network/ssl/qsslsocket_openssl_symbols.cpp
-+++ b/src/network/ssl/qsslsocket_openssl_symbols.cpp
-@@ -267,6 +267,10 @@ DEFINEFUNC2(int, X509_STORE_add_cert, X509_STORE *a, a, X509 *b, b, return 0, re
- DEFINEFUNC(void, X509_STORE_CTX_free, X509_STORE_CTX *a, a, return, DUMMYARG)
- DEFINEFUNC4(int, X509_STORE_CTX_init, X509_STORE_CTX *a, a, X509_STORE *b, b, X509 *c, c, STACK_OF(X509) *d, d, return -1, return)
- DEFINEFUNC2(int, X509_STORE_CTX_set_purpose, X509_STORE_CTX *a, a, int b, b, return -1, return)
-+DEFINEFUNC(int, X509_STORE_CTX_get_error, X509_STORE_CTX *a, a, return -1, return)
-+DEFINEFUNC(int, X509_STORE_CTX_get_error_depth, X509_STORE_CTX *a, a, return -1, return)
-+DEFINEFUNC(X509 *, X509_STORE_CTX_get_current_cert, X509_STORE_CTX *a, a, return 0, return)
-+DEFINEFUNC(STACK_OF(X509) *, X509_STORE_CTX_get_chain, X509_STORE_CTX *a, a, return 0, return)
- DEFINEFUNC(X509_STORE_CTX *, X509_STORE_CTX_new, DUMMYARG, DUMMYARG, return 0, return)
- #ifdef SSLEAY_MACROS
- DEFINEFUNC2(int, i2d_DSAPrivateKey, const DSA *a, a, unsigned char **b, b, return -1, return)
-@@ -832,6 +836,10 @@ bool q_resolveOpenSslSymbols()
-     RESOLVEFUNC(X509_STORE_CTX_init)
-     RESOLVEFUNC(X509_STORE_CTX_new)
-     RESOLVEFUNC(X509_STORE_CTX_set_purpose)
-+    RESOLVEFUNC(X509_STORE_CTX_get_error)
-+    RESOLVEFUNC(X509_STORE_CTX_get_error_depth)
-+    RESOLVEFUNC(X509_STORE_CTX_get_current_cert)
-+    RESOLVEFUNC(X509_STORE_CTX_get_chain)
-     RESOLVEFUNC(X509_cmp)
- #ifndef SSLEAY_MACROS
-     RESOLVEFUNC(X509_dup)
-diff --git a/src/network/ssl/qsslsocket_openssl_symbols_p.h b/src/network/ssl/qsslsocket_openssl_symbols_p.h
-index fa9a157..87f3697 100644
---- a/src/network/ssl/qsslsocket_openssl_symbols_p.h
-+++ b/src/network/ssl/qsslsocket_openssl_symbols_p.h
-@@ -374,6 +374,10 @@ int q_X509_STORE_CTX_init(X509_STORE_CTX *ctx, X509_STORE *store,
-                           X509 *x509, STACK_OF(X509) *chain);
- X509_STORE_CTX *q_X509_STORE_CTX_new();
- int q_X509_STORE_CTX_set_purpose(X509_STORE_CTX *ctx, int purpose);
-+int q_X509_STORE_CTX_get_error(X509_STORE_CTX *ctx);
-+int q_X509_STORE_CTX_get_error_depth(X509_STORE_CTX *ctx);
-+X509 *q_X509_STORE_CTX_get_current_cert(X509_STORE_CTX *ctx);
-+STACK_OF(X509) *q_X509_STORE_CTX_get_chain(X509_STORE_CTX *ctx);
- 
- #define q_BIO_get_mem_data(b, pp) (int)q_BIO_ctrl(b,BIO_CTRL_INFO,0,(char *)pp)
- #define q_BIO_pending(b) (int)q_BIO_ctrl(b,BIO_CTRL_PENDING,0,NULL)
--- 
-1.8.0.2
-
diff --git a/extra/qt/PKGBUILD b/extra/qt/PKGBUILD
deleted file mode 100644
index 5df32a2ae..000000000
--- a/extra/qt/PKGBUILD
+++ /dev/null
@@ -1,148 +0,0 @@
-# $Id: PKGBUILD 177062 2013-02-05 13:17:20Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgbase=qt
-pkgname=('qt' 'qt-private-headers')
-pkgver=4.8.4
-pkgrel=3
-arch=('i686' 'x86_64')
-url='http://qt-project.org/'
-license=('GPL3' 'LGPL')
-makedepends=('libtiff' 'libpng' 'libmng' 'sqlite' 'ca-certificates' 'glib2' 'dbus'
-    'fontconfig' 'libgl' 'libsm' 'libxrandr' 'libxv' 'libxi' 'alsa-lib'
-    'xdg-utils' 'hicolor-icon-theme' 'desktop-file-utils' 'mesa' 'postgresql-libs'
-    'mysql' 'unixodbc' 'cups' 'gtk2' 'libfbclient')
-options=('!libtool')
-_pkgfqn="${pkgbase}-everywhere-opensource-src-${pkgver}"
-source=("http://releases.qt-project.org/qt4/source/${_pkgfqn}.tar.gz"
-        'assistant.desktop' 'designer.desktop' 'linguist.desktop'
-        'qtconfig.desktop'
-        'improve-cups-support.patch'
-        'fix-crash-in-assistant.patch'
-        'Fix-binary-incompatibility-between-openssl-versions.patch'
-        'Drop-read-write-perms-for-users.patch')
-md5sums=('89c5ecba180cae74c66260ac732dc5cb'
-         'f1837a03fd0ebbd2da58975845f278e3'
-         '480fea1ed076992b688373c8db274be0'
-         '5595c24d5bb942c21e3a4d299e6d0bf1'
-         '824a3b77a25e98567f640e0441ccdebc'
-         'c439c7731c25387352d8453ca7574971'
-         '57590084078b6379f0501f7728b02ae2'
-         'abd18c8a71e08167270b8ec6de61254a'
-         'db29b7dd44c56f6026b53b57bbfd9ea3')
-
-build() {
-  cd ${_pkgfqn}
-
-  # (FS#28381) (KDEBUG#180051)
-  patch -p1 -i "${srcdir}"/improve-cups-support.patch
-
-  # (FS#29469)
-  patch -p1 -i "${srcdir}"/fix-crash-in-assistant.patch
-
-  # Security fixes
-  patch -p1 -i "${srcdir}"/Fix-binary-incompatibility-between-openssl-versions.patch
-  patch -p1 -i "${srcdir}"/Drop-read-write-perms-for-users.patch
-
-  export QT4DIR="${srcdir}"/${_pkgfqn}
-  export LD_LIBRARY_PATH=${QT4DIR}/lib:${LD_LIBRARY_PATH}
-
-  sed -i "s|-O2|${CXXFLAGS}|" mkspecs/common/{g++,gcc}-base.conf
-  sed -i "/^QMAKE_LFLAGS_RPATH/s| -Wl,-rpath,||g" mkspecs/common/gcc-base-unix.conf
-  sed -i "/^QMAKE_LFLAGS\s/s|+=|+= ${LDFLAGS}|g" mkspecs/common/gcc-base.conf
-
-  ./configure -confirm-license -opensource \
-    -prefix /usr \
-    -docdir /usr/share/doc/qt \
-    -plugindir /usr/lib/qt/plugins \
-    -importdir /usr/lib/qt/imports \
-    -datadir /usr/share/qt \
-    -translationdir /usr/share/qt/translations \
-    -sysconfdir /etc/xdg \
-    -examplesdir /usr/share/doc/qt/examples \
-    -demosdir /usr/share/doc/qt/demos \
-    -plugin-sql-{psql,mysql,sqlite,odbc,ibase} \
-    -system-sqlite \
-    -no-phonon \
-    -no-phonon-backend \
-    -no-webkit \
-    -graphicssystem raster \
-    -openssl-linked \
-    -nomake demos \
-    -nomake examples \
-    -nomake docs \
-    -silent \
-    -no-rpath \
-    -optimized-qmake \
-    -reduce-relocations \
-    -dbus-linked \
-    -no-openvg
-  make
-}
-
-package_qt() {
-    pkgdesc='A cross-platform application and UI framework'
-    depends=('libtiff' 'libpng' 'libmng' 'sqlite' 'ca-certificates' 'glib2' 'dbus'
-      'fontconfig' 'libgl' 'libsm' 'libxrandr' 'libxv' 'libxi' 'alsa-lib'
-      'xdg-utils' 'hicolor-icon-theme' 'desktop-file-utils')
-    optdepends=('postgresql-libs: PostgreSQL driver'
-                'libmysqlclient: MySQL driver'
-                'unixodbc: ODBC driver'
-                'libfbclient: Firebird/iBase driver'
-                'libxinerama: Xinerama support'
-                'libxcursor: Xcursor support'
-                'libxfixes: Xfixes support'
-                'icu: Unicode support')
-    install='qt.install'
-
-    cd ${_pkgfqn}
-    make INSTALL_ROOT="${pkgdir}" install
-
-    # install missing icons and desktop files
-    for icon in tools/linguist/linguist/images/icons/linguist-*-32.png ; do
-      size=$(echo $(basename ${icon}) | cut -d- -f2)
-      install -D -m644 ${icon} \
-        "${pkgdir}/usr/share/icons/hicolor/${size}x${size}/apps/linguist.png"
-    done
-    install -D -m644 src/gui/dialogs/images/qtlogo-64.png \
-      "${pkgdir}/usr/share/icons/hicolor/64x64/apps/qtlogo.png"
-    install -D -m644 tools/assistant/tools/assistant/images/assistant.png \
-      "${pkgdir}/usr/share/icons/hicolor/32x32/apps/assistant.png"
-    install -D -m644 tools/assistant/tools/assistant/images/assistant-128.png \
-      "${pkgdir}/usr/share/icons/hicolor/128x128/apps/assistant.png"
-    install -D -m644 tools/designer/src/designer/images/designer.png \
-      "${pkgdir}/usr/share/icons/hicolor/128x128/apps/designer.png"
-    install -d "${pkgdir}/usr/share/applications"
-    install -m644 "${srcdir}"/{linguist,designer,assistant,qtconfig}.desktop \
-      "${pkgdir}/usr/share/applications/"
-
-    # install license addition
-    install -D -m644 LGPL_EXCEPTION.txt \
-      ${pkgdir}/usr/share/licenses/qt/LGPL_EXCEPTION.txt
-
-    # Fix wrong path in pkgconfig files
-    find "${pkgdir}/usr/lib/pkgconfig" -type f -name '*.pc' \
-      -exec perl -pi -e "s, -L${srcdir}/?\S+,,g" {} \;
-
-    # Fix wrong path in prl files
-    find "${pkgdir}/usr/lib" -type f -name '*.prl' \
-      -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {} \;
-}
-
-package_qt-private-headers(){
-    pkgdesc="Qt private headers for development"
-    depends=("qt=${pkgver}")
-
-    install -d "${pkgdir}"/usr/include/{QtCore,QtDeclarative,QtGui,QtScript}
-    install -d "${pkgdir}"/usr/src/{corelib,declarative,gui,script}
-    
-    for i in QtCore QtDeclarative QtGui QtScript; do
-      cp -r ${_pkgfqn}/include/${i}/private/ \
-        "${pkgdir}"/usr/include/${i}/
-    done
-
-    for i in corelib declarative gui script; do
-      cp -r ${_pkgfqn}/src/${i} "${pkgdir}"/usr/src/
-    done
-}
diff --git a/extra/qt/fix-crash-in-assistant.patch b/extra/qt/fix-crash-in-assistant.patch
deleted file mode 100644
index 4246e0532..000000000
--- a/extra/qt/fix-crash-in-assistant.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- qt-everywhere-opensource-src-4.8.2/tools/assistant/tools/assistant/mainwindow.cpp	2012-06-26 17:37:47.334536023 +0000
-+++ qt-everywhere-opensource-src-4.8.2/tools/assistant/tools/assistant/mainwindow.cpp~	2012-06-26 17:37:08.531487286 +0000
-@@ -944,8 +944,7 @@
-     if (helpEngine.usesAppFont())
-         font = helpEngine.appFont();
-
--    const QWidgetList &widgets = qApp->allWidgets();
--    foreach (QWidget* widget, widgets)
-+    foreach (QWidget* widget, QApplication::allWidgets())
-         widget->setFont(font);
- }
diff --git a/extra/qt/qtconfig.desktop b/extra/qt/qtconfig.desktop
deleted file mode 100644
index 95770ff6a..000000000
--- a/extra/qt/qtconfig.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=Qt Config 
-Comment=Configure Qt behavior, styles, fonts
-Exec=/usr/bin/qtconfig
-Icon=qtlogo
-Terminal=false
-Type=Application
-Categories=Qt;Settings;
-NoDisplay=true
diff --git a/extra/qt4/PKGBUILD b/extra/qt4/PKGBUILD
new file mode 100644
index 000000000..c101f1f2b
--- /dev/null
+++ b/extra/qt4/PKGBUILD
@@ -0,0 +1,121 @@
+# $Id: PKGBUILD 179026 2013-03-01 17:55:20Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+# Contributor: Pierre Schmitz <pierre@archlinux.de>
+
+pkgname=qt4
+pkgver=4.8.4
+pkgrel=12
+arch=('i686' 'x86_64')
+url='http://qt-project.org/'
+license=('GPL3' 'LGPL')
+pkgdesc='A cross-platform application and UI framework'
+depends=('libtiff' 'libpng' 'libmng' 'sqlite' 'ca-certificates' 'dbus'
+        'fontconfig' 'libgl' 'libxrandr' 'libxv' 'libxi' 'alsa-lib'
+        'xdg-utils' 'hicolor-icon-theme' 'desktop-file-utils')
+makedepends=('postgresql-libs' 'mysql' 'unixodbc' 'cups' 'gtk2' 'libfbclient'
+             'mesa-libgl')
+optdepends=('postgresql-libs: PostgreSQL driver'
+            'libmysqlclient: MySQL driver'
+            'unixodbc: ODBC driver'
+            'libfbclient: Firebird/iBase driver'
+            'libxinerama: Xinerama support'
+            'libxcursor: Xcursor support'
+            'libxfixes: Xfixes support'
+            'icu: Unicode support')
+install="${pkgname}.install"
+options=('!libtool')
+replaces=('qt<=4.8.4')
+conflicts=('qt')
+_pkgfqn="qt-everywhere-opensource-src-${pkgver}"
+source=("http://releases.qt-project.org/${pkgname}/source/${_pkgfqn}.tar.gz"
+        'qtconfig.desktop' 'qt4.profile'
+        'improve-cups-support.patch')
+md5sums=('89c5ecba180cae74c66260ac732dc5cb'
+         '20ca06ef59775d749b9451ce7437fa9a'
+         '4ed0bd79a310e2b5d34fc71760b99139'
+         'c439c7731c25387352d8453ca7574971')
+
+build() {
+  cd ${_pkgfqn}
+
+  # (FS#28381) (KDEBUG#180051)
+  patch -p1 -i "${srcdir}"/improve-cups-support.patch
+
+  export QT4DIR="${srcdir}"/${_pkgfqn}
+  export LD_LIBRARY_PATH=${QT4DIR}/lib:${LD_LIBRARY_PATH}
+
+  sed -i "s|-O2|${CXXFLAGS}|" mkspecs/common/{g++,gcc}-base.conf
+  sed -i "/^QMAKE_LFLAGS_RPATH/s| -Wl,-rpath,||g" mkspecs/common/gcc-base-unix.conf
+  sed -i "/^QMAKE_LFLAGS\s/s|+=|+= ${LDFLAGS}|g" mkspecs/common/gcc-base.conf
+
+  ./configure -confirm-license -opensource \
+    -prefix /usr \
+    -bindir /usr/lib/qt4/bin \
+    -headerdir /usr/include/qt4 \
+    -docdir /usr/share/doc/qt4 \
+    -plugindir /usr/lib/qt4/plugins \
+    -importdir /usr/lib/qt4/imports \
+    -datadir /usr/share/qt4 \
+    -translationdir /usr/share/qt4/translations \
+    -sysconfdir /etc/xdg \
+    -examplesdir /usr/share/doc/qt4/examples \
+    -demosdir /usr/share/doc/qt4/demos \
+    -plugin-sql-{psql,mysql,sqlite,odbc,ibase} \
+    -system-sqlite \
+    -no-phonon \
+    -no-phonon-backend \
+    -no-webkit \
+    -graphicssystem raster \
+    -openssl-linked \
+    -nomake demos \
+    -nomake examples \
+    -nomake docs \
+    -silent \
+    -no-rpath \
+    -optimized-qmake \
+    -reduce-relocations \
+    -dbus-linked \
+    -no-openvg
+  make
+}
+
+package() {
+    cd ${_pkgfqn}
+    make INSTALL_ROOT="${pkgdir}" install
+
+    # install missing icons and desktop files
+    install -D -m644 src/gui/dialogs/images/qtlogo-64.png \
+      "${pkgdir}/usr/share/icons/hicolor/64x64/apps/qt4logo.png"
+    install -Dm644 "${srcdir}"/qtconfig.desktop \
+      "${pkgdir}/usr/share/applications/qtconfig4.desktop"
+
+    # install the profile
+    install -D -m755 "${srcdir}"/qt4.profile "${pkgdir}"/etc/profile.d/qt4.sh
+
+    # Useful symlinks for cmake and configure scripts
+    install -d "${pkgdir}"/usr/bin
+    for b in "${pkgdir}"/usr/lib/qt4/bin/*; do
+      ln -s /usr/lib/qt4/bin/$(basename $b) "${pkgdir}"/usr/bin/$(basename $b)-qt4
+    done
+
+    # install license addition
+    install -D -m644 LGPL_EXCEPTION.txt \
+      ${pkgdir}/usr/share/licenses/${pkgname}/LGPL_EXCEPTION.txt
+
+    # Fix wrong libs path in pkgconfig files
+    find "${pkgdir}/usr/lib/pkgconfig" -type f -name '*.pc' \
+      -exec perl -pi -e "s, -L${srcdir}/?\S+,,g" {} \;
+
+    # Fix wrong bins path in pkgconfig files
+    find "${pkgdir}/usr/lib/pkgconfig" -type f -name '*.pc' \
+      -exec sed -i 's|/usr/bin/|/usr/lib/qt4/bin/|g' {} \;
+
+    # Fix wrong path in prl files
+    find "${pkgdir}/usr/lib" -type f -name '*.prl' \
+      -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {} \;
+
+    # Do not install the qttools
+    rm "${pkgdir}"/usr/lib/qt4/bin/{assistant,designer,linguist}
+    rm -r "${pkgdir}"/usr/lib/qt4/plugins/designer
+    rm "${pkgdir}"/usr/share/qt4/translations/{assistant,designer,linguist}_*.qm
+}
diff --git a/extra/qt/improve-cups-support.patch b/extra/qt4/improve-cups-support.patch
index e0305e11b..e0305e11b 100644
--- a/extra/qt/improve-cups-support.patch
+++ b/extra/qt4/improve-cups-support.patch
diff --git a/extra/qt/qt.install b/extra/qt4/qt4.install
index 5495fb1b5..5495fb1b5 100644
--- a/extra/qt/qt.install
+++ b/extra/qt4/qt4.install
diff --git a/extra/qt4/qt4.profile b/extra/qt4/qt4.profile
new file mode 100644
index 000000000..3129ddce5
--- /dev/null
+++ b/extra/qt4/qt4.profile
@@ -0,0 +1 @@
+export PATH=$PATH:/usr/lib/qt4/bin
diff --git a/extra/qt4/qtconfig.desktop b/extra/qt4/qtconfig.desktop
new file mode 100644
index 000000000..1573ef461
--- /dev/null
+++ b/extra/qt4/qtconfig.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=Qt4 Config 
+Comment=Configure Qt4 behavior, styles, fonts
+Exec=/usr/lib/qt4/bin/qtconfig
+Icon=qt4logo
+Terminal=false
+Type=Application
+Categories=Qt;Settings;
+NoDisplay=true
diff --git a/extra/qt5/PKGBUILD b/extra/qt5/PKGBUILD
new file mode 100644
index 000000000..fc04378db
--- /dev/null
+++ b/extra/qt5/PKGBUILD
@@ -0,0 +1,285 @@
+# $Id: PKGBUILD 179039 2013-03-01 20:22:01Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+
+pkgbase=qt5
+pkgname=('qt5-base'
+         'qt5-declarative'
+         'qt5-doc'
+         'qt5-graphicaleffects'
+         'qt5-imageformats'
+         'qt5-jsbackend'
+         'qt5-multimedia'
+         'qt5-quick1'
+         'qt5-script'
+         'qt5-svg'
+         'qt5-tools'
+         'qt5-translations'
+         'qt5-webkit'
+         'qt5-xmlpatterns')
+pkgver=5.0.1
+pkgrel=5
+arch=('i686' 'x86_64')
+url='http://qt-project.org/'
+license=('GPL3' 'LGPL')
+makedepends=('libxcb' 'xcb-proto' 'xcb-util' 'xcb-util-image' 'xcb-util-wm' 'xcb-util-keysyms'
+            'mesa-libgl' 'at-spi2-core' 'alsa-lib' 'gstreamer0.10-base-plugins'
+            'libjpeg-turbo' 'cups' 'libpulse' 'hicolor-icon-theme' 'desktop-file-utils'
+            'postgresql-libs' 'libmysqlclient' 'sqlite' 'unixodbc' 'libfbclient'
+            'python2' 'ruby' 'gperf')
+groups=('qt' 'qt5')
+options=('!libtool')
+_pkgfqn="qt-everywhere-opensource-src-${pkgver}"
+source=("http://releases.qt-project.org/${pkgbase}/${pkgver}/single/${_pkgfqn}.tar.xz"
+        'assistant.desktop' 'designer.desktop' 'linguist.desktop'
+        'use-python2.patch')
+md5sums=('00a577bd88e682d1b4d01d41d1d699cf'
+         'f1837a03fd0ebbd2da58975845f278e3'
+         '480fea1ed076992b688373c8db274be0'
+         '5595c24d5bb942c21e3a4d299e6d0bf1'
+         'ec3133b093550f16a21bb91e5f0f2943')
+
+build() {
+  cd ${_pkgfqn}
+
+  export QTDIR="${srcdir}"/${_pkgfqn}
+  export LD_LIBRARY_PATH=${QTDIR}/lib:${LD_LIBRARY_PATH}
+
+  sed -i "s|-O2|${CXXFLAGS}|" qtbase/mkspecs/common/{g++,gcc}-base.conf
+  sed -i "/^QMAKE_LFLAGS_RPATH/s| -Wl,-rpath,||g" qtbase/mkspecs/common/gcc-base-unix.conf
+  sed -i "/^QMAKE_LFLAGS\s/s|+=|+= ${LDFLAGS}|g" qtbase/mkspecs/common/gcc-base.conf
+
+  # Use python2 for Python 2.x
+  patch -p1 -i "${srcdir}"/use-python2.patch
+  sed -i -e "s|#![ ]*/usr/bin/python$|#!/usr/bin/python2|" \
+    -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \
+    $(find . -name '*.py')
+
+  ./configure -confirm-license -opensource \
+    -prefix /usr \
+    -docdir /usr/share/doc/qt \
+    -headerdir /usr/include/qt5 \
+    -archdatadir /usr/lib/qt \
+    -datadir /usr/share/qt \
+    -sysconfdir /etc/xdg \
+    -examplesdir /usr/share/doc/qt/examples \
+    -plugin-sql-{psql,mysql,sqlite,odbc,ibase} \
+    -system-sqlite \
+    -openssl-linked \
+    -nomake docs \
+    -nomake examples \
+    -nomake tests \
+    -no-rpath \
+    -optimized-qmake \
+    -dbus-linked \
+    -reduce-relocations
+
+  make
+
+  # Build docs
+  make qmake_all
+  make docs
+}
+
+package_qt5-base() {
+  pkgdesc=('A cross-platform application and UI framework')
+  depends=('libjpeg-turbo' 'xcb-util-keysyms' 'libgl' 'dbus' 'fontconfig' 'systemd'
+           'xcb-util-wm' 'libxrender' 'libxi' 'sqlite' 'libpng' 'xcb-util-image'
+           'hicolor-icon-theme' 'xdg-utils')
+  optdepends=('postgresql-libs: PostgreSQL driver'
+              'libmysqlclient: MySQL driver'
+              'unixodbc: ODBC driver'
+              'libfbclient: Firebird/iBase driver')
+  install='qt5-base.install'
+  conflicts=('qt')
+
+  cd ${_pkgfqn}/qtbase
+  make INSTALL_ROOT="${pkgdir}" install
+  
+  cd "${srcdir}"
+  install -D -m644 ${_pkgfqn}/qtbase/LGPL_EXCEPTION.txt \
+    ${pkgdir}/usr/share/licenses/${pkgbase}/LGPL_EXCEPTION.txt
+
+  # Fix wrong path in prl files
+  find "${pkgdir}/usr/lib" -type f -name '*.prl' \
+    -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {} \;
+
+  # Fix wrong qmake path in pri file
+  sed -i "s|${srcdir}/${_pkgfqn}/qtbase|/usr|" \
+    "${pkgdir}"/usr/lib/qt/mkspecs/modules/qt_lib_bootstrap.pri
+}
+
+package_qt5-declarative() {
+  pkgdesc=('A cross-platform application and UI framework (QtQml, QtQuick)')
+  depends=('qt5-jsbackend' 'qt5-xmlpatterns')
+  conflicts=('qt')
+
+  cd ${_pkgfqn}/qtdeclarative
+  make INSTALL_ROOT="${pkgdir}" install
+  
+  # Fix wrong path in prl files
+  find "${pkgdir}/usr/lib" -type f -name '*.prl' \
+    -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {} \;
+}
+
+package_qt5-doc() {
+  pkgdesc=('A cross-platform application and UI framework (Documentation)')
+  depends=('qt5-base')
+  conflicts=('qt-doc')
+  replaces=('qt-doc')
+  provides=('qt-doc')
+  options=('docs')
+  groups=()
+
+  cd ${_pkgfqn}
+  make INSTALL_ROOT="${pkgdir}" install_docs
+}
+
+package_qt5-jsbackend() {
+  pkgdesc=('A cross-platform application and UI framework (QtV8)')
+  depends=('qt5-base')
+
+  cd ${_pkgfqn}/qtjsbackend
+  make INSTALL_ROOT="${pkgdir}" install
+
+  # Fix wrong path in prl files
+  find "${pkgdir}/usr/lib" -type f -name '*.prl' \
+    -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {} \;
+}
+
+package_qt5-xmlpatterns() {
+  pkgdesc=('A cross-platform application and UI framework (QtXmlPatterns)')
+  depends=('qt5-base')
+  conflicts=('qt')
+
+  cd ${_pkgfqn}/qtxmlpatterns
+  make INSTALL_ROOT="${pkgdir}" install
+
+  # Fix wrong path in prl files
+  find "${pkgdir}/usr/lib" -type f -name '*.prl' \
+    -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {} \;
+}
+
+package_qt5-translations() {
+  pkgdesc=('A cross-platform application and UI framework (Translations)')
+  depends=('qt5-base')
+  conflicts=('qt')
+
+  cd ${_pkgfqn}/qttranslations
+  make INSTALL_ROOT="${pkgdir}" install
+}
+
+package_qt5-multimedia() {
+  pkgdesc=('A cross-platform application and UI framework (QtMultimedia)')
+  depends=('qt5-declarative' 'libpulse' 'gstreamer0.10-base')
+  conflicts=('qt')
+
+  cd ${_pkgfqn}/qtmultimedia
+  make INSTALL_ROOT="${pkgdir}" install
+
+  # Fix wrong path in prl files
+  find "${pkgdir}/usr/lib" -type f -name '*.prl' \
+    -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {} \;
+}
+
+package_qt5-graphicaleffects() {
+  pkgdesc=('A cross-platform application and UI framework (QtGraphicalEffects)')
+  depends=('qt5-declarative')
+
+  cd ${_pkgfqn}/qtgraphicaleffects
+  make INSTALL_ROOT="${pkgdir}" install
+}
+
+package_qt5-imageformats() {
+  pkgdesc=('A cross-platform application and UI framework (Images plugins)')
+  depends=('qt5-base' 'libtiff')
+  conflicts=('qt')
+
+  cd ${_pkgfqn}/qtimageformats
+  make INSTALL_ROOT="${pkgdir}" install
+}
+
+package_qt5-quick1() {
+  pkgdesc=('A cross-platform application and UI framework (QtDeclarative)')
+  depends=('qt5-webkit' 'qt5-script')
+  conflicts=('qt')
+
+  cd ${_pkgfqn}/qtquick1
+  make INSTALL_ROOT="${pkgdir}" install
+  
+  # Fix wrong path in prl files
+  find "${pkgdir}/usr/lib" -type f -name '*.prl' \
+    -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {} \;
+}
+
+package_qt5-script() {
+  pkgdesc=('A cross-platform application and UI framework (QtScript)')
+  depends=('qt5-base')
+  conflicts=('qt')
+
+  cd ${_pkgfqn}/qtscript
+  make INSTALL_ROOT="${pkgdir}" install
+  
+  # Fix wrong path in prl files
+  find "${pkgdir}/usr/lib" -type f -name '*.prl' \
+    -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {} \;
+}
+
+package_qt5-svg() {
+  pkgdesc=('A cross-platform application and UI framework (QtSvg)')
+  depends=('qt5-base')
+  conflicts=('qt')
+
+  cd ${_pkgfqn}/qtsvg
+  make INSTALL_ROOT="${pkgdir}" install
+  
+  # Fix wrong path in prl files
+  find "${pkgdir}/usr/lib" -type f -name '*.prl' \
+    -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {} \;
+}
+  
+package_qt5-tools() {
+  pkgdesc=('A cross-platform application and UI framework (Development Tools, QtHelp)')
+  depends=('qt5-webkit' 'desktop-file-utils' 'qt5-translations')
+  optdepends=('qt5-doc: documentation')
+  install='qt5-tools.install'
+  conflicts=('qt')
+
+  cd ${_pkgfqn}/qttools
+  make INSTALL_ROOT="${pkgdir}" install
+  
+  # install missing icons and desktop files
+  for icon in src/linguist/linguist/images/icons/linguist-*-32.png ; do
+    size=$(echo $(basename ${icon}) | cut -d- -f2)
+    install -p -D -m644 ${icon} \
+      "${pkgdir}/usr/share/icons/hicolor/${size}x${size}/apps/linguist.png"
+  done
+
+  install -p -D -m644 src/assistant/assistant/images/assistant.png \
+    "${pkgdir}/usr/share/icons/hicolor/32x32/apps/assistant.png"
+  install -p -D -m644 src/assistant/assistant/images/assistant-128.png \
+    "${pkgdir}/usr/share/icons/hicolor/128x128/apps/assistant.png"
+  install -p -D -m644 src/designer/src/designer/images/designer.png \
+    "${pkgdir}/usr/share/icons/hicolor/128x128/apps/designer.png"
+  install -d "${pkgdir}/usr/share/applications"
+  install -m644 "${srcdir}"/{linguist,designer,assistant}.desktop \
+    "${pkgdir}/usr/share/applications/"
+
+  # Fix wrong path in prl files
+  find "${pkgdir}/usr/lib" -type f -name '*.prl' \
+    -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {} \;
+}
+
+package_qt5-webkit() {
+  pkgdesc=('A cross-platform application and UI framework (QtWebKit)')
+  depends=('qt5-declarative' 'gstreamer0.10-base' 'icu')
+
+  cd ${_pkgfqn}/qtwebkit
+  make INSTALL_ROOT="${pkgdir}" install
+  
+  # Fix wrong path in prl files
+  find "${pkgdir}/usr/lib" -type f -name '*.prl' \
+    -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {} \;
+
+  # Fix wrong path in pc file
+  perl -pi -e "s, -L${srcdir}/?\S+,,g" "${pkgdir}"/usr/lib/pkgconfig/Qt5WebKit.pc
+}
diff --git a/extra/qt/assistant.desktop b/extra/qt5/assistant.desktop
index 37ff84b44..37ff84b44 100644
--- a/extra/qt/assistant.desktop
+++ b/extra/qt5/assistant.desktop
diff --git a/extra/qt/designer.desktop b/extra/qt5/designer.desktop
index f0b381d02..f0b381d02 100644
--- a/extra/qt/designer.desktop
+++ b/extra/qt5/designer.desktop
diff --git a/extra/qt/linguist.desktop b/extra/qt5/linguist.desktop
index 3b203e0bd..3b203e0bd 100644
--- a/extra/qt/linguist.desktop
+++ b/extra/qt5/linguist.desktop
diff --git a/extra/qt5/qt5-base.install b/extra/qt5/qt5-base.install
new file mode 100644
index 000000000..c0797237a
--- /dev/null
+++ b/extra/qt5/qt5-base.install
@@ -0,0 +1,11 @@
+post_install() {
+    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+}
+
+post_upgrade() {
+    post_install
+}
+
+post_remove() {
+    post_install
+}
diff --git a/extra/qt5/qt5-tools.install b/extra/qt5/qt5-tools.install
new file mode 100644
index 000000000..5495fb1b5
--- /dev/null
+++ b/extra/qt5/qt5-tools.install
@@ -0,0 +1,12 @@
+post_install() {
+    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+    update-desktop-database -q
+}
+
+post_upgrade() {
+    post_install
+}
+
+post_remove() {
+    post_install
+}
diff --git a/extra/qt5/use-python2.patch b/extra/qt5/use-python2.patch
new file mode 100644
index 000000000..8a7075a97
--- /dev/null
+++ b/extra/qt5/use-python2.patch
@@ -0,0 +1,96 @@
+--- qt-everywhere-opensource-src-5.0.0/qtjsbackend/src/v8/v8.pri~	2013-01-11 06:50:55.241495644 +0000
++++ qt-everywhere-opensource-src-5.0.0/qtjsbackend/src/v8/v8.pri	2013-01-11 06:51:29.987894356 +0000
+@@ -303,7 +303,7 @@
+ V8_EXPERIMENTAL_LIBRARY_FILES = \
+     $$V8SRC/proxy.js \
+ 
+-v8_js2c.commands = python $$V8DIR/tools/js2c.py $$V8_GENERATED_SOURCES_DIR/libraries.cpp CORE off
++v8_js2c.commands = python2 $$V8DIR/tools/js2c.py $$V8_GENERATED_SOURCES_DIR/libraries.cpp CORE off
+ v8_js2c.commands += $$V8SRC/macros.py ${QMAKE_FILE_IN}
+ v8_js2c.output = $$V8_GENERATED_SOURCES_DIR/libraries.cpp
+ v8_js2c.input = V8_LIBRARY_FILES
+@@ -314,7 +314,7 @@
+ v8_js2c.name = generating[v8] ${QMAKE_FILE_IN}
+ silent:v8_js2c.commands = @echo generating[v8] ${QMAKE_FILE_IN} && $$v8_js2c.commands
+ 
+-v8_js2c_experimental.commands = python $$V8DIR/tools/js2c.py $$V8_GENERATED_SOURCES_DIR/experimental-libraries.cpp EXPERIMENTAL off
++v8_js2c_experimental.commands = python2 $$V8DIR/tools/js2c.py $$V8_GENERATED_SOURCES_DIR/experimental-libraries.cpp EXPERIMENTAL off
+ v8_js2c_experimental.commands += $$V8SRC/macros.py ${QMAKE_FILE_IN}
+ v8_js2c_experimental.output = $$V8_GENERATED_SOURCES_DIR/experimental-libraries.cpp
+ v8_js2c_experimental.input = V8_EXPERIMENTAL_LIBRARY_FILES
+--- qt-everywhere-opensource-src-5.0.0/qtwebkit/Source/JavaScriptCore/DerivedSources.pri~        2013-01-09 11:29:16.452266719 +0000
++++ qt-everywhere-opensource-src-5.0.0/qtwebkit/Source/JavaScriptCore/DerivedSources.pri 2013-01-09 11:30:18.188538725 +0000
+@@ -85,14 +85,14 @@
+ retgen.output = RegExpJitTables.h
+ retgen.script = $$PWD/create_regex_tables
+ retgen.input = retgen.script
+-retgen.commands = python $$retgen.script > ${QMAKE_FILE_OUT}
++retgen.commands = python2 $$retgen.script > ${QMAKE_FILE_OUT}
+ GENERATORS += retgen
+ 
+ #GENERATOR: "KeywordLookup.h": decision tree used by the lexer
+ klgen.output = KeywordLookup.h
+ klgen.script = $$PWD/KeywordLookupGenerator.py
+ klgen.input = KEYWORDLUT_FILES
+-klgen.commands = python $$klgen.script ${QMAKE_FILE_NAME} > ${QMAKE_FILE_OUT}
++klgen.commands = python2 $$klgen.script ${QMAKE_FILE_NAME} > ${QMAKE_FILE_OUT}
+ GENERATORS += klgen
+ 
+ EXTRACTOR_BINARY = LLIntOffsetsExtractor$$BIN_EXTENSION
+@@ -117,7 +117,7 @@
+     disassembler.input = DISASSEMBLER_FILES
+     disassembler.script = $$PWD/disassembler/udis86/itab.py
+     disassembler.depends = $$DISASSEMBLER_DEPENDENCY
+-    disassembler.commands = python $$disassembler.script ${QMAKE_FILE_NAME} --outputDir ${QMAKE_FUNC_FILE_OUT_PATH}
++    disassembler.commands = python2 $$disassembler.script ${QMAKE_FILE_NAME} --outputDir ${QMAKE_FUNC_FILE_OUT_PATH}
+     disassembler.CONFIG += no_link
+     GENERATORS += disassembler
+ }
+--- qt-everywhere-opensource-src-5.0.0/qtwebkit/Source/WebCore/DerivedSources.pri~       2013-01-09 11:46:01.165612894 +0000
++++ qt-everywhere-opensource-src-5.0.0/qtwebkit/Source/WebCore/DerivedSources.pri        2013-01-09 11:46:27.465404725 +0000
+@@ -779,7 +779,7 @@
+ inspectorValidate.output = InspectorProtocolVersion.h
+ inspectorValidate.input = INSPECTOR_JSON
+ inspectorValidate.script = $$PWD/inspector/generate-inspector-protocol-version
+-inspectorValidate.commands = python $$inspectorValidate.script -o ${QMAKE_FILE_OUT} ${QMAKE_FILE_IN}
++inspectorValidate.commands = python2 $$inspectorValidate.script -o ${QMAKE_FILE_OUT} ${QMAKE_FILE_IN}
+ inspectorValidate.depends = $$PWD/inspector/generate-inspector-protocol-version
+ inspectorValidate.add_output_to_sources = false
+ GENERATORS += inspectorValidate
+@@ -787,7 +787,7 @@
+ inspectorJSON.output = InspectorFrontend.cpp InspectorBackendDispatcher.cpp InspectorTypeBuilder.cpp
+ inspectorJSON.input = INSPECTOR_JSON
+ inspectorJSON.script = $$PWD/inspector/CodeGeneratorInspector.py
+-inspectorJSON.commands = python $$inspectorJSON.script $$PWD/inspector/Inspector.json --output_h_dir ${QMAKE_FUNC_FILE_OUT_PATH} --output_cpp_dir ${QMAKE_FUNC_FILE_OUT_PATH}
++inspectorJSON.commands = python2 $$inspectorJSON.script $$PWD/inspector/Inspector.json --output_h_dir ${QMAKE_FUNC_FILE_OUT_PATH} --output_cpp_dir ${QMAKE_FUNC_FILE_OUT_PATH}
+ inspectorJSON.depends = $$inspectorJSON.script
+ GENERATORS += inspectorJSON
+ 
+@@ -908,7 +908,7 @@
+ entities.output = HTMLEntityTable.cpp
+ entities.input = HTML_ENTITIES
+ entities.script = $$PWD/html/parser/create-html-entity-table
+-entities.commands = python $$entities.script -o ${QMAKE_FILE_OUT} $$HTML_ENTITIES
++entities.commands = python2 $$entities.script -o ${QMAKE_FILE_OUT} $$HTML_ENTITIES
+ entities.clean = ${QMAKE_FILE_OUT}
+ entities.depends = $$PWD/html/parser/create-html-entity-table
+ GENERATORS += entities
+--- qt-everywhere-opensource-src-5.0.1/qtwebkit/Source/WebKit2/DerivedSources.pri~	2013-02-10 13:48:49.800319915 +0000
++++ qt-everywhere-opensource-src-5.0.1/qtwebkit/Source/WebKit2/DerivedSources.pri	2013-02-10 13:49:09.966867900 +0000
+@@ -120,14 +120,14 @@
+     $$PWD/Scripts/webkit2/model.py \
+     $$PWD/Scripts/webkit2/parser.py
+ 
+-message_header_generator.commands = $${PYTHON} $${SOURCE_DIR}/WebKit2/Scripts/generate-messages-header.py ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT}
++message_header_generator.commands = python2 $${SOURCE_DIR}/WebKit2/Scripts/generate-messages-header.py ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT}
+ message_header_generator.input = MESSAGE_RECEIVERS
+ message_header_generator.depends = $$SCRIPTS
+ message_header_generator.output_function = message_header_generator_output
+ message_header_generator.add_output_to_sources = false
+ GENERATORS += message_header_generator
+ 
+-message_receiver_generator.commands = $${PYTHON} $${SOURCE_DIR}/WebKit2/Scripts/generate-message-receiver.py  ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT}
++message_receiver_generator.commands = python2 $${SOURCE_DIR}/WebKit2/Scripts/generate-message-receiver.py  ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT}
+ message_receiver_generator.input = MESSAGE_RECEIVERS
+ message_receiver_generator.depends = $$SCRIPTS
+ message_receiver_generator.output_function = message_receiver_generator_output
diff --git a/extra/qtscriptgenerator/PKGBUILD b/extra/qtscriptgenerator/PKGBUILD
index 9ca941734..e7c66350a 100644
--- a/extra/qtscriptgenerator/PKGBUILD
+++ b/extra/qtscriptgenerator/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 158023 2012-05-01 07:24:53Z andrea $
+# $Id: PKGBUILD 179036 2013-03-01 19:03:29Z andrea $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=qtscriptgenerator
 pkgver=0.2.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A tool that generates Qt bindings for Qt Script"
 arch=("i686" "x86_64")
 url="https://code.google.com/p/qtscriptgenerator/"
@@ -18,27 +18,27 @@ sha1sums=('4c1078f26b196156e857c17c9d11a66cfea66f00'
           'c50b26e6504f5c981a916860d9c3929e436e1067')
 
 build() {
-  cd "${srcdir}"/$pkgname-src-$pkgver
+  cd $pkgname-src-$pkgver
 
   patch -p1 -i "${srcdir}"/phonon.patch
   patch -p1 -i "${srcdir}"/no-phonon.patch
 
   # prepare plugins
   cd generator
-  qmake
+  qmake-qt4
   make
-  ./generator --include-paths=/usr/include
+  QTDIR=/usr ./generator --include-paths=/usr/include/qt4
 
   # build plugins
-  cd "${srcdir}"/$pkgname-src-$pkgver/qtbindings
-  qmake
+  cd ../qtbindings
+  qmake-qt4
   make
 }
 
 package() {
-  cd "${srcdir}"/$pkgname-src-$pkgver/qtbindings
+  cd $pkgname-src-$pkgver/qtbindings
   # move plugins to correct directory
-  install -d "${pkgdir}"/usr/lib/qt/plugins/script
+  install -d "${pkgdir}"/usr/lib/qt4/plugins/script
   cp -a "${srcdir}"/$pkgname-src-$pkgver/plugins/script/* \
-    "${pkgdir}"/usr/lib/qt/plugins/script/
+    "${pkgdir}"/usr/lib/qt4/plugins/script/
 }
diff --git a/extra/qtwebkit/PKGBUILD b/extra/qtwebkit/PKGBUILD
index f465c739f..90ef10954 100644
--- a/extra/qtwebkit/PKGBUILD
+++ b/extra/qtwebkit/PKGBUILD
@@ -1,26 +1,21 @@
-# $Id: PKGBUILD 178044 2013-02-14 09:17:43Z andrea $
+# $Id: PKGBUILD 178989 2013-03-01 10:24:37Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=qtwebkit
 pkgver=2.3.beta2
 _pkgver=2.3-beta2
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url='http://trac.webkit.org/wiki/QtWebKit'
 pkgdesc='An open source web browser engine (Qt port)'
 license=('LGPL2.1' 'GPL3')
-depends=('qt' 'systemd' 'gstreamer0.10-base')
+depends=('qt4' 'systemd' 'gstreamer0.10-base')
 makedepends=('gperf' 'python2' 'ruby' 'git' 'mesa')
 conflicts=('qt<4.8')
-_qtver=4.8.4
 source=("${pkgname}-${pkgver}.tar.gz"::"http://gitorious.org/webkit/qtwebkit-23/archive-tarball/${pkgname}-${_pkgver}"
-        "http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-${_qtver}.tar.gz"
-        'use-python2.patch'
-        'qwebview.patch')
+        'use-python2.patch')
 sha1sums=('b1bfa9e3303ce9c95eec0a1e66b2b812b844bf08'
-          'f5880f11c139d7d8d01ecb8d874535f7d9553198'
-          '315b6ff603f35e5492a036f7082f6aa075dfb607'
-          'fed0c1a90e3997b5575dbc83d6ea23bc46097a6f')
+          '315b6ff603f35e5492a036f7082f6aa075dfb607')
 
 build() {
   cd webkit-qtwebkit-23
@@ -38,23 +33,9 @@ build() {
     --makeargs="${MAKEFLAGS}" \
     --prefix=/usr \
     ${OPTS}
-
-  cd ../
-
-  # Build the QWebView plugin (FS#27914)
-  cd qt-everywhere-opensource-src-${_qtver}
-  patch -p1 -i "${srcdir}"/qwebview.patch
-  cd tools/designer/src/plugins/qwebview
-  qmake
-  make
 }
 
 package() {
   cd webkit-qtwebkit-23
   make INSTALL_ROOT="${pkgdir}" -C WebKitBuild/Release install
-
-  cd ../
-
-  cd qt-everywhere-opensource-src-${_qtver}/tools/designer/src/plugins/qwebview
-  make INSTALL_ROOT="${pkgdir}" install
 }
diff --git a/extra/qtwebkit/qwebview.patch b/extra/qtwebkit/qwebview.patch
deleted file mode 100644
index 73d5d5032..000000000
--- a/extra/qtwebkit/qwebview.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- qt-everywhere-opensource-src-4.8.4/tools/designer/src/plugins/plugins.pri~	2013-01-09 12:56:08.915412090 +0000
-+++ qt-everywhere-opensource-src-4.8.4/tools/designer/src/plugins/plugins.pri	2013-01-09 12:58:06.911391299 +0000
-@@ -1,3 +1,6 @@
-+INCLUDEPATH += ../../../../../../webkit-qtwebkit-23/WebKitBuild/Release/include
-+LIBS += -L../../../../../../webkit-qtwebkit-23/WebKitBuild/Release/lib
-+
- CONFIG += designer
- win32|mac: CONFIG+= debug_and_release
- QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/designer
---- qt-everywhere-opensource-src-4.8.4/tools/designer/src/plugins/plugins.pro~	2013-01-09 12:55:43.598892405 +0000
-+++ qt-everywhere-opensource-src-4.8.4/tools/designer/src/plugins/plugins.pro	2013-01-09 12:55:53.352169136 +0000
-@@ -2,9 +2,4 @@
- CONFIG += ordered
- 
- REQUIRES = !CONFIG(static,shared|static)
--contains(QT_CONFIG, qt3support): SUBDIRS += widgets
--win32: SUBDIRS += activeqt
--# contains(QT_CONFIG, opengl): SUBDIRS += tools/view3d
- contains(QT_CONFIG, webkit): SUBDIRS += qwebview
--contains(QT_CONFIG, phonon): SUBDIRS += phononwidgets
--contains(QT_CONFIG, declarative): SUBDIRS += qdeclarativeview
diff --git a/extra/qwt/PKGBUILD b/extra/qwt/PKGBUILD
index 1b53233e4..2d653e600 100644
--- a/extra/qwt/PKGBUILD
+++ b/extra/qwt/PKGBUILD
@@ -1,13 +1,13 @@
-# $Id: PKGBUILD 171291 2012-11-17 00:59:56Z allan $
+# $Id: PKGBUILD 178991 2013-03-01 10:24:47Z andrea $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 
 pkgname=qwt
 pkgver=6.0.1
-pkgrel=3
+pkgrel=4
 pkgdesc="Qt Widgets for Technical Applications"
 arch=('i686' 'x86_64')
 url="http://qwt.sourceforge.net/"
-depends=('qt')
+depends=('qt4')
 options=('!makeflags')
 license=("custom:$pkgname")
 source=("http://downloads.sourceforge.net/sourceforge/qwt/$pkgname-$pkgver.tar.bz2" \
@@ -16,6 +16,8 @@ sha1sums=('301cca0c49c7efc14363b42e082b09056178973e'
           'aba0fc75f6d450237028b7b143bdcf05a79cabb3')
 
 build() {
+  . /etc/profile.d/qt4.sh
+
   cd ${srcdir}/${pkgname}-${pkgver}
 
   # copy our config file to the right place
@@ -33,9 +35,9 @@ package() {
   make INSTALL_ROOT=${pkgdir} QTDIR=/usr install
 
   # install web designer plugin
-  install -d ${pkgdir}/usr/lib/qt/plugins/designer/
+  install -d ${pkgdir}/usr/lib/qt4/plugins/designer/
   install -Dm755 designer/plugins/designer/libqwt_designer_plugin.so \
-    ${pkgdir}/usr/lib/qt/plugins/designer/
+    ${pkgdir}/usr/lib/qt4/plugins/designer/
 
   # Move man files to proper directory.
 #  install -d ${pkgdir}/usr/share/man/man3
diff --git a/extra/qwtplot3d/PKGBUILD b/extra/qwtplot3d/PKGBUILD
index bee6db047..6cf4ca5c3 100644
--- a/extra/qwtplot3d/PKGBUILD
+++ b/extra/qwtplot3d/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 171261 2012-11-16 23:35:36Z allan $
+# $Id: PKGBUILD 178992 2013-03-01 10:24:54Z andrea $
 # Maintainer: Ronald van Haren <ronald@archlinux.org>
 # Contributor: damir <damir@archlinux.org>
 
 pkgname=qwtplot3d
 pkgver=0.2.7
-pkgrel=5
+pkgrel=6
 pkgdesc="Qt/OpenGL-based C++ programming library containing 3d-widgets"
 arch=("i686" "x86_64")
 license=('custom:zlib')
 url="http://qwtplot3d.sourceforge.net/"
-depends=('qt' 'qwt')
+depends=('qt4' 'qwt')
 makedepends=('mesa' 'glu')
 source=("http://downloads.sourceforge.net/sourceforge/qwtplot3d/qwtplot3d-$pkgver.tgz"
         qwtplot3d-gcc44.patch qwtplot3d-qt-4.8.0.patch)
@@ -18,6 +18,8 @@ sha1sums=('4463fafb8420a91825e165da7a296aaabd70abea'
           '8dcafdc9753b0f2eeea2f1e96efa6e8d3d956005')
 
 build() {
+    . /etc/profile.d/qt4.sh
+
     cd ${srcdir}/${pkgname}
     patch -p1 < ../qwtplot3d-gcc44.patch
     patch -p1 < ../qwtplot3d-qt-4.8.0.patch
diff --git a/extra/rosegarden/PKGBUILD b/extra/rosegarden/PKGBUILD
index 27932052d..bf89afacc 100644
--- a/extra/rosegarden/PKGBUILD
+++ b/extra/rosegarden/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 173870 2012-12-26 20:57:07Z schiv $
+# $Id: PKGBUILD 178993 2013-03-01 10:25:02Z andrea $
 # Maintainer: Ray Rashif <schiv@archlinux.org>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: damir <damir@archlinux.org>
 # Contributor: Robert Emil Berge <robert@rebi.no>
 
 pkgname=rosegarden
-pkgver=12.12.25
+pkgver=13.02
 pkgrel=1
 pkgdesc="MIDI/audio sequencer and notation editor"
 arch=('i686' 'x86_64')
 url="http://www.rosegardenmusic.com/"
 license=('GPL')
 depends=('liblrdf' 'dssi' 'fftw' 'lirc-utils'
-         'perl' 'qt' 'shared-mime-info')
+         'perl' 'qt4' 'shared-mime-info')
 makedepends=('imake')
 optdepends=('lilypond: notation display'
             'cups: printing support'
@@ -23,14 +23,14 @@ optdepends=('lilypond: notation display'
 [ "$CARCH" = "i686" ] && optdepends+=('dssi-vst: win32 VST support')
 install=$pkgname.install
 source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2")
-md5sums=('8c98e7d3d448b07d9dc079b28bd37eba')
+md5sums=('c1e2f80b599a942896e9ebd63896032f')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
   # lrdf + raptor2 compatibility
   export lrdf_CFLAGS="$(pkg-config --cflags raptor2)"
-  ./configure --prefix=/usr
+  LRELEASE=/usr/lib/qt4/bin/lrelease LUPDATE=/usr/lib/qt4/bin/lupdate ./configure --prefix=/usr
   make
 }
 
diff --git a/extra/rosegarden/rosegarden.install b/extra/rosegarden/rosegarden.install
index 5119faec2..3f22aadfb 100644
--- a/extra/rosegarden/rosegarden.install
+++ b/extra/rosegarden/rosegarden.install
@@ -1,6 +1,7 @@
 post_install() {
   xdg-icon-resource forceupdate --theme hicolor &> /dev/null
   update-mime-database usr/share/mime &> /dev/null
+  update-desktop-database -q
 }
 
 post_upgrade() {
diff --git a/extra/scribus/PKGBUILD b/extra/scribus/PKGBUILD
index 88934d3a1..9cf031abd 100644
--- a/extra/scribus/PKGBUILD
+++ b/extra/scribus/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 175912 2013-01-24 08:14:06Z remy $
+# $Id: PKGBUILD 178994 2013-03-01 10:25:10Z andrea $
 # Contributor: Ronald van Haren <ronald.archlinux.org>
 # Contributor: tobias <tobias@archlinux.org>
 # Contributor: Ben <ben@benmazer.net>
@@ -6,20 +6,19 @@
 
 pkgname=scribus
 pkgver=1.4.2
-pkgrel=1
+pkgrel=2
 pkgdesc="A desktop publishing program"
 arch=('i686' 'x86_64')
 url="http://www.scribus.net"
 license=('GPL')
 install=scribus.install
-depends=('libcups>=1.3.11' 'lcms>=1.18' 'qt' 'ghostscript>=8.70' \
+depends=('libcups>=1.3.11' 'lcms2' 'qt4' 'ghostscript>=8.70' \
          'libart-lgpl>=2.3.20' 'python2' 'libxml2>=2.7.3' 'cairo' \
          'desktop-file-utils' 'shared-mime-info' \
          'hyphen' 'aspell' 'boost-libs')
-makedepends=('cmake' 'boost')
+makedepends=('cmake' 'boost' 'mesa')
 options=(!libtool)
 source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.xz)
-md5sums=('5c2a6bb7107e67a0083e32275bdb1a13')
 sha1sums=('6e67e98fa315a2890d9cbb12eed49ecebb7f11cb')
 
 build() {
diff --git a/extra/scribus/scribus.install b/extra/scribus/scribus.install
index 0598e46ed..52a6286ac 100644
--- a/extra/scribus/scribus.install
+++ b/extra/scribus/scribus.install
@@ -1,8 +1,6 @@
-
 post_install() {
-  echo "update desktop mime database..."
-  update-mime-database usr/share/mime > /dev/null 2>&1
-  update-desktop-database -q > /dev/null 2>&1
+  update-mime-database usr/share/mime &> /dev/null
+  update-desktop-database -q
 }
 post_upgrade() {
   post_install $1
diff --git a/extra/smplayer/PKGBUILD b/extra/smplayer/PKGBUILD
index 8cba996cd..8b52caf4f 100644
--- a/extra/smplayer/PKGBUILD
+++ b/extra/smplayer/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 173913 2012-12-28 02:38:34Z foutrelis $
+# $Id: PKGBUILD 178995 2013-03-01 10:25:28Z andrea $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: Allan McRae <allan@archlinux.org>
 # Contributor: Alessio 'mOLOk' Bolognino <themolok@gmail.com>
@@ -6,12 +6,12 @@
 
 pkgname=smplayer
 pkgver=0.8.3
-pkgrel=1
+pkgrel=2
 pkgdesc="A complete front-end for MPlayer"
 arch=('i686' 'x86_64')
 url="http://smplayer.sourceforge.net/"
 license=('GPL')
-depends=('qt' 'mplayer')
+depends=('qt4' 'mplayer')
 install=smplayer.install
 source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2)
 md5sums=('48755bffdff3878df32d8c047d7a3d52')
diff --git a/extra/soprano/PKGBUILD b/extra/soprano/PKGBUILD
index 709d1e5c6..b0bc51cbe 100644
--- a/extra/soprano/PKGBUILD
+++ b/extra/soprano/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 178591 2013-02-25 17:12:36Z andrea $
+# $Id: PKGBUILD 178996 2013-03-01 10:25:36Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=soprano
 pkgver=2.9.0
-pkgrel=1
+pkgrel=2
 pkgdesc='A library which provides a highly usable object-oriented C++/Qt4 framework for RDF data'
 arch=('i686' 'x86_64')
 url='http://soprano.sourceforge.net/'
 license=('GPL' 'LGPL')
-depends=('qt' 'redland-storage-virtuoso' 'libiodbc' 'virtuoso-base')
+depends=('qt4' 'redland-storage-virtuoso' 'libiodbc' 'virtuoso-base')
 makedepends=('cmake' 'java-environment' 'doxygen')
 source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
 md5sums=('90134eaaf40b6663dd01cfaefdaba7fb')
@@ -18,6 +18,7 @@ build() {
   mkdir build
   cd build
   . /etc/profile.d/jdk.sh
+  . /etc/profile.d/qt4.sh
   # we need the rpath
   cmake ../${pkgname}-${pkgver} \
     -DCMAKE_BUILD_TYPE=Release \
diff --git a/extra/stellarium/PKGBUILD b/extra/stellarium/PKGBUILD
index 50cb5cc60..f41d62a7d 100644
--- a/extra/stellarium/PKGBUILD
+++ b/extra/stellarium/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 178102 2013-02-16 09:07:23Z ronald $
+# $Id: PKGBUILD 178997 2013-03-01 10:25:43Z andrea $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Damir Perisa <damir.perisa@bluewin.ch>
 
 pkgname=stellarium
 pkgver=0.12.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A stellarium with great graphics and a nice database of sky-objects"
 arch=("i686" "x86_64")
 url="http://stellarium.free.fr/"
 license=('GPL2')
-depends=('libpng' 'glu' 'libgl' 'freetype2' 'qt' 'openssl' 'desktop-file-utils' 
+depends=('libpng' 'glu' 'libgl' 'freetype2' 'qt4' 'openssl' 'desktop-file-utils' 
 'xdg-utils')
 install=stellarium.install
-makedepends=('cmake' 'boost' 'mesa')
+makedepends=('cmake' 'boost' 'mesa' 'mesa-libgl')
 source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz
 	stellarium.desktop
         stellarium.png)
diff --git a/extra/strigi/PKGBUILD b/extra/strigi/PKGBUILD
index 86ff21d01..a31369dd9 100644
--- a/extra/strigi/PKGBUILD
+++ b/extra/strigi/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 177081 2013-02-05 23:18:31Z andrea $
+# $Id: PKGBUILD 178998 2013-03-01 10:25:57Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=strigi
 pkgver=0.7.8
-pkgrel=1
+pkgrel=2
 pkgdesc="Fast crawling desktop search engine with Qt GUI"
 arch=('i686' 'x86_64')
 url='http://strigi.sourceforge.net/'
 license=('GPL2')
-depends=('exiv2' 'libxml2' 'boost-libs' 'qt')
+depends=('exiv2' 'libxml2' 'boost-libs' 'qt4')
 makedepends=('cmake' 'pkg-config' 'boost')
 optdepends=('kdegraphics-strigi-analyzer: strigi analyzers for various graphics file'
             'kdesdk-strigi-analyzer: strigi analyzer for KDE SDK')
@@ -17,6 +17,8 @@ source=("http://www.vandenoever.info/software/${pkgname}/${pkgname}-${pkgver}.ta
 md5sums=('d69443234f4286d71997db9de543331a')
 
 build() {
+  . /etc/profile.d/qt4.sh
+
   mkdir build
   cd build
   cmake ../${pkgname}-${pkgver} \
diff --git a/extra/suil/PKGBUILD b/extra/suil/PKGBUILD
index d6aa46e7a..6be96e5dd 100644
--- a/extra/suil/PKGBUILD
+++ b/extra/suil/PKGBUILD
@@ -4,14 +4,14 @@
 
 pkgname=suil
 pkgver=0.6.10
-pkgrel=1
+pkgrel=2
 pkgdesc="A lightweight C library for loading and wrapping LV2 plugin UIs"
 arch=(i686 x86_64)
 url="http://drobilla.net/software/$pkgname/"
 license=('custom:ISC')
 depends=('lv2')
-makedepends=('python2' 'qt' 'gtk2')
-optdepends=('qt: Qt UIs wrapping support'
+makedepends=('python2' 'qt4' 'gtk2')
+optdepends=('qt4: Qt UIs wrapping support'
             'gtk2: Gtk2 UIs wrapping support')
 source=("http://download.drobilla.net/$pkgname-$pkgver.tar.bz2")
 md5sums=('735e3cc4d539059cf3948d3dba75807e')
diff --git a/extra/telepathy-qt/PKGBUILD b/extra/telepathy-qt/PKGBUILD
index d48c5b9f8..848d58aac 100644
--- a/extra/telepathy-qt/PKGBUILD
+++ b/extra/telepathy-qt/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 178069 2013-02-15 10:07:33Z andrea $
+# $Id: PKGBUILD 179000 2013-03-01 10:26:12Z andrea $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=telepathy-qt
 pkgver=0.9.3
-pkgrel=4
+pkgrel=5
 pkgdesc="A library for Qt-based Telepathy clients"
 arch=('i686' 'x86_64')
 url="http://telepathy.freedesktop.org/wiki/"
 license=('LGPL')
 options=('!libtool')
-depends=('qt' 'telepathy-farstream' 'gstreamer0.10-base')
+depends=('qt4' 'telepathy-farstream' 'gstreamer0.10-base')
 makedepends=('libxslt' 'python2' 'cmake' 'doxygen')
 conflicts=('telepathy-qt4')
 replaces=('telepathy-qt4')
@@ -20,6 +20,8 @@ md5sums=('94ac93aedf5f6fff49837bc8368e5a37'
          'e1b851b08b159fca39596ff8395ca53a')
 
 build() {
+    . /etc/profile.d/qt4.sh
+
     mkdir build
     cd build
     cmake ../${pkgname}-${pkgver} \
diff --git a/extra/texmacs/PKGBUILD b/extra/texmacs/PKGBUILD
index 23c7b170b..a882cbfb3 100644
--- a/extra/texmacs/PKGBUILD
+++ b/extra/texmacs/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 171430 2012-11-17 14:28:35Z ronald $
+# $Id: PKGBUILD 179001 2013-03-01 10:26:20Z andrea $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Damir Perisa <damir.perisa@bluewin.ch>
 # Contributor: Christopher Reimer <c.reimer1993@gmail.com>
 
 pkgname=texmacs
 pkgver=1.0.7.16
-pkgrel=1
+pkgrel=2
 pkgdesc="Free scientific text editor, inspired by TeX and GNU Emacs. WYSIWYG editor TeX-fonts and CAS-interface (Giac, GTybalt, Macaulay 2, Maxima, Octave, Pari, Qcl, R and Yacas) in one."
 arch=('i686' 'x86_64')
 url="http://www.texmacs.org/"
 license=('GPL')
 depends=('perl' 'guile' 'texlive-core' 'python2' 'libxext' 'freetype2' 'shared-mime-info'
-         'desktop-file-utils' 'qt')
+         'desktop-file-utils' 'qt4')
 # do not remove texlive-core dependency, as it is needed!
 optdepends=('transfig: convert images using fig2ps'
             'gawk: conversion of some files')
diff --git a/extra/transmission/PKGBUILD b/extra/transmission/PKGBUILD
index 1c8017608..017f68452 100644
--- a/extra/transmission/PKGBUILD
+++ b/extra/transmission/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 178335 2013-02-20 10:00:55Z ioni $
+# $Id: PKGBUILD 179032 2013-03-01 18:56:31Z andrea $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 
 pkgbase=transmission
 pkgname=('transmission-cli' 'transmission-gtk' 'transmission-qt')
 pkgver=2.77
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url="http://www.transmissionbt.com/"
 license=('MIT')
-makedepends=('gtk3' 'intltool' 'curl' 'qt' 'libevent')
+makedepends=('gtk3' 'intltool' 'curl' 'qt4' 'libevent')
 source=(http://mirrors.m0k.org/transmission/files/$pkgbase-$pkgver.tar.xz
         transmissiond transmissiond.conf transmission.systemd
         transmission.tmpfiles)
@@ -24,7 +24,7 @@ build() {
   ./configure --prefix=/usr
   make
   pushd qt
-  qmake qtr.pro
+  qmake-qt4 qtr.pro
   make
 }
 package_transmission-cli() {
@@ -63,7 +63,7 @@ package_transmission-gtk() {
 
 package_transmission-qt() {
   pkgdesc="Fast, easy, and free BitTorrent client (Qt GUI)"
-  depends=('curl' 'qt' 'libevent')
+  depends=('curl' 'qt4' 'libevent')
   optdepends=('transmission-cli: daemon and web support')
   install=transmission-qt.install
 
diff --git a/extra/uim/PKGBUILD b/extra/uim/PKGBUILD
index 9679333b3..f5b19e1ad 100644
--- a/extra/uim/PKGBUILD
+++ b/extra/uim/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 176237 2013-01-27 23:33:03Z bisson $
+# $Id: PKGBUILD 179003 2013-03-01 10:26:38Z andrea $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: damir <damir@archlinux.org>
 
 pkgname=uim
 pkgver=1.8.4
-pkgrel=2
+pkgrel=3
 pkgdesc='Multilingual input method library'
 url='http://code.google.com/p/uim/'
 license=('custom:BSD')
 arch=('i686' 'x86_64')
 depends=('libxft' 'libedit' 'anthy' 'm17n-lib')
-makedepends=('intltool' 'gettext' 'qt' 'gtk2' 'gtk3' 'gnome-panel')
-optdepends=('qt: immodule and helper applications'
+makedepends=('intltool' 'gettext' 'qt4' 'gtk2' 'gtk3' 'gnome-panel')
+optdepends=('qt4: immodule and helper applications'
             'gtk2: immodule and helper applications'
             'gtk3: immodules and helper applications'
             'gnome-panel: gnome applet indicator')
@@ -24,6 +24,8 @@ install=install
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
 
+	source /etc/profile.d/qt4.sh
+
 	./configure \
 		--prefix=/usr \
 		--libexecdir=/usr/lib/uim \
diff --git a/extra/uim/install b/extra/uim/install
index 83a9cf391..1dffeec76 100644
--- a/extra/uim/install
+++ b/extra/uim/install
@@ -1,6 +1,7 @@
 post_install() {
 	[[ -x usr/bin/gtk-query-immodules-2.0 ]] && usr/bin/gtk-query-immodules-2.0 > etc/gtk-2.0/gtk.immodules
 	[[ -x usr/bin/gtk-query-immodules-3.0 ]] && usr/bin/gtk-query-immodules-3.0 > usr/lib/gtk-3.0/3.0.0/immodules.cache
+	true
 }
 
 post_upgrade() {
diff --git a/extra/v4l-utils/PKGBUILD b/extra/v4l-utils/PKGBUILD
index 74a9cea03..28530bc73 100644
--- a/extra/v4l-utils/PKGBUILD
+++ b/extra/v4l-utils/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 177815 2013-02-09 14:53:43Z thomas $
+# $Id: PKGBUILD 179004 2013-03-01 10:26:47Z andrea $
 # Maintainer: Thomas Bächler <thomas@archlinux.org>
 pkgname=v4l-utils
 pkgver=0.9.3
-pkgrel=1
+pkgrel=2
 pkgdesc="Userspace tools and conversion library for Video 4 Linux"
 arch=('i686' 'x86_64')
 url="http://freshmeat.net/projects/libv4l"
@@ -11,8 +11,8 @@ replaces=('libv4l')
 conflicts=('libv4l')
 backup=(etc/rc_maps.cfg)
 license=('LGPL')
-makedepends=('qt')
-optdepends=('qt')
+makedepends=('qt4')
+optdepends=('qt4')
 depends=('glibc' 'gcc-libs' 'sysfsutils' 'libjpeg-turbo')
 source=(http://linuxtv.org/downloads/v4l-utils/${pkgname}-${pkgver}.tar.bz2
         http://linuxtv.org/downloads/v4l-utils/${pkgname}-${pkgver}.tar.bz2.asc)
@@ -21,6 +21,8 @@ sha256sums=('502db0d865a392d87bff22c4f3bcfb3d0755937b1c18496edd941fd2d1784a3d'
 options=(!libtool)
 
 build() {
+  . /etc/profile.d/qt4.sh
+
   cd "${srcdir}/${pkgname}-${pkgver}"
 
   ./configure --prefix=/usr --sysconfdir=/etc
diff --git a/extra/vlc/PKGBUILD b/extra/vlc/PKGBUILD
index eca77d125..670a8db19 100644
--- a/extra/vlc/PKGBUILD
+++ b/extra/vlc/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 178142 2013-02-16 22:48:59Z ioni $
+# $Id: PKGBUILD 179005 2013-03-01 10:26:55Z andrea $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
 # Contributor: Martin Sandsmark <martin.sandsmark@kde.org>
 
 pkgname=vlc
 pkgver=2.0.5
-pkgrel=3
+pkgrel=4
 pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player"
 arch=('i686' 'x86_64')
 url="http://www.videolan.org/vlc/"
 license=('LGPL2.1' 'GPL2')
-depends=('a52dec' 'libdvbpsi' 'libxpm' 'libdca' 'qt' 'libproxy' 
+depends=('a52dec' 'libdvbpsi' 'libxpm' 'libdca' 'qt4' 'libproxy' 
          'sdl_image' 'libdvdnav' 'libtiger' 'lua51' 'libmatroska' 
          'zvbi' 'taglib' 'libmpcdec' 'ffmpeg' 'faad2' 'libupnp' 
          'libshout' 'libmad' 'libmpeg2' 'libmodplug' 'libass' 
diff --git a/extra/wpa_supplicant_gui/PKGBUILD b/extra/wpa_supplicant_gui/PKGBUILD
index d0c51226e..7beeec21f 100644
--- a/extra/wpa_supplicant_gui/PKGBUILD
+++ b/extra/wpa_supplicant_gui/PKGBUILD
@@ -1,18 +1,19 @@
-# $Id: PKGBUILD 177075 2013-02-05 19:47:31Z eric $
+# $Id: PKGBUILD 179006 2013-03-01 10:27:04Z andrea $
 # Maintainer: Thomas Bächler <thomas@archlinux.org>
 
 pkgname=wpa_supplicant_gui
 pkgver=2.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A Qt frontend to wpa_supplicant"
 url="http://hostap.epitest.fi/wpa_supplicant"
 arch=('i686' 'x86_64')
-depends=('qt' "wpa_supplicant")
+depends=('qt4' "wpa_supplicant")
 license=('GPL')
 source=("http://hostap.epitest.fi/releases/wpa_supplicant-$pkgver.tar.gz")
 sha256sums=('2c115609fbb5223d51381084a5c944455a8afcda81d584173ff55ba233379e09')
 
 build() {
+  . /etc/profile.d/qt4.sh
   cd wpa_supplicant-${pkgver}
   cd wpa_supplicant/wpa_gui-qt4
   qmake QMAKE_CFLAGS_RELEASE="$CFLAGS" QMAKE_CXXFLAGS_RELEASE="$CXXFLAGS" 
diff --git a/extra/x2goclient/PKGBUILD b/extra/x2goclient/PKGBUILD
index 4485537ad..75e038641 100644
--- a/extra/x2goclient/PKGBUILD
+++ b/extra/x2goclient/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 178166 2013-02-17 17:17:51Z andyrtr $
+# $Id: PKGBUILD 179029 2013-03-01 18:54:32Z andrea $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Contributor: Gerhard Brauer <gerbra@archlinux.de>
 # Contributor: Richard Murri <admin@richardmurri.com>
 
 pkgname=x2goclient
 pkgver=4.0.0.3
-pkgrel=1
+pkgrel=2
 pkgdesc="x2go qt4 client"
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://www.x2go.org"
-depends=('qt' 'libldap' 'libcups' 'nxproxy' 'libssh' 'libxpm' 'hicolor-icon-theme' 'xdg-utils')
+depends=('qt4' 'libldap' 'libcups' 'nxproxy' 'libssh' 'libxpm' 'hicolor-icon-theme' 'xdg-utils')
 makedepends=('man2html')
 install=x2goclient.install
 source=(http://code.x2go.org/releases/source/${pkgname}/${pkgname}-${pkgver}.tar.gz)
@@ -18,7 +18,6 @@ md5sums=('e08fa2248f0882ee7ed6c5310d47fcfc')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  sed -i "s:qmake-qt4:qmake:g" Makefile
   sed -i "s:-o root -g root ::" Makefile
   make PREFIX=/usr
 }
diff --git a/extra/x2goserver/PKGBUILD b/extra/x2goserver/PKGBUILD
index 3f483146d..48b2fe134 100644
--- a/extra/x2goserver/PKGBUILD
+++ b/extra/x2goserver/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 175694 2013-01-19 17:56:40Z andyrtr $
+# $Id: PKGBUILD 179012 2013-03-01 14:04:57Z andyrtr $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 
 # Contributor: Gerhard Brauer <gerbra@archlinux.de>
@@ -8,12 +8,12 @@
 
 pkgname=x2goserver
 pkgver=4.0.0.0
-pkgrel=4
+pkgrel=5
 pkgdesc="Open source terminal server"
 arch=('i686' 'x86_64')
 url="http://www.x2go.org/"
 license=('GPL')
-depends=('openssh' 'perl-config-simple' 'perl-dbd-sqlite' 'python' 'x2go-agent' 'xorg-xauth')
+depends=('openssh' 'perl-config-simple' 'perl-dbd-sqlite' 'perl-file-basedir' 'python' 'x2go-agent' 'xorg-xauth')
 makedepends=('man2html')
 #optdepends=('cups-x2go: printing support')
 options=('emptydirs')
diff --git a/kernels/linux-libre-pae/CVE-2013-1763.patch b/kernels/linux-libre-pae/CVE-2013-1763.patch
deleted file mode 100644
index 82b59a6dc..000000000
--- a/kernels/linux-libre-pae/CVE-2013-1763.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 6e601a53566d84e1ffd25e7b6fe0b6894ffd79c0 Mon Sep 17 00:00:00 2001
-From: Mathias Krause <minipli@googlemail.com>
-Date: Sat, 23 Feb 2013 01:13:47 +0000
-Subject: [PATCH] sock_diag: Fix out-of-bounds access to sock_diag_handlers[]
-
-Userland can send a netlink message requesting SOCK_DIAG_BY_FAMILY
-with a family greater or equal then AF_MAX -- the array size of
-sock_diag_handlers[]. The current code does not test for this
-condition therefore is vulnerable to an out-of-bound access opening
-doors for a privilege escalation.
-
-Signed-off-by: Mathias Krause <minipli@googlemail.com>
-Acked-by: Eric Dumazet <edumazet@google.com>
-Signed-off-by: David S. Miller <davem@davemloft.net>
----
- net/core/sock_diag.c |    3 +++
- 1 files changed, 3 insertions(+), 0 deletions(-)
-
-diff --git a/net/core/sock_diag.c b/net/core/sock_diag.c
-index 602cd63..750f44f 100644
---- a/net/core/sock_diag.c
-+++ b/net/core/sock_diag.c
-@@ -121,6 +121,9 @@ static int __sock_diag_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
- 	if (nlmsg_len(nlh) < sizeof(*req))
- 		return -EINVAL;
- 
-+	if (req->sdiag_family >= AF_MAX)
-+		return -EINVAL;
-+
- 	hndl = sock_diag_lock_handler(req->sdiag_family);
- 	if (hndl == NULL)
- 		err = -ENOENT;
--- 
-1.7.6.5
-
diff --git a/kernels/linux-libre-pae/PKGBUILD b/kernels/linux-libre-pae/PKGBUILD
index 6f0c91586..c67e29310 100644
--- a/kernels/linux-libre-pae/PKGBUILD
+++ b/kernels/linux-libre-pae/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 178533 2013-02-25 11:02:32Z tpowa $
+# $Id: PKGBUILD 178913 2013-02-28 18:41:03Z tpowa $
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: Thomas Baechler <thomas@archlinux.org>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
@@ -6,29 +6,26 @@
 pkgbase=linux-libre-pae     # Build stock -LIBRE-PAE kernel
 #pkgbase=linux-libre-custom # Build kernel with a different name
 _basekernel=3.8
-#pkgver=${_basekernel}.9
-pkgver=${_basekernel}
-pkgrel=2
+pkgver=${_basekernel}.1
+pkgrel=1
 arch=('i686')
 url="http://linux-libre.fsfla.org/"
 license=('GPL2')
 makedepends=('xmlto' 'docbook-xsl')
 options=('!strip')
 source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gnu/linux-libre-${_basekernel}-gnu.tar.xz"
-        #"http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-gnu/patch-${_basekernel}-gnu-${pkgver}-gnu.xz"
+        "http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-gnu/patch-${_basekernel}-gnu-${pkgver}-gnu.xz"
         # the main kernel config files
         'config'
         # standard config files for mkinitcpio ramdisk
         "${pkgbase}.preset"
         'boot-logo.patch'
-        'change-default-console-loglevel.patch'
-        'CVE-2013-1763.patch')
+        'change-default-console-loglevel.patch')
 md5sums=('84c2a77910932ffc7d958744ac9cf2f5'
-         '01e97ae92b25fa9d004ff589c7f56703'
+         '208b90a9f3ccbaf2064f05163985bd46'
          'f302c931bd85309da9d9792b4cc96467'
          '04b21c79df0a952c22d681dd4f4562df'
-         '9d3c56a4b999c8bfbd4018089a62f662'
-         '420991808fe4cba143013427c0737aa9')
+         '9d3c56a4b999c8bfbd4018089a62f662')
 
 _kernelname=${pkgbase#linux-libre}
 _localversionname=-LIBRE-PAE
@@ -43,10 +40,6 @@ build() {
   # Add freedo as boot logo
   patch -Np1 -i "${srcdir}/boot-logo.patch"
 
-  # Fix security vulnetability CVE-2013-1763.patch
-  # https://bugs.archlinux.org/task/34005
-  patch -Np1 -i "${srcdir}/CVE-2013-1763.patch"
-
   # set DEFAULT_CONSOLE_LOGLEVEL to 4 (same value as the 'quiet' kernel param)
   # remove this when a Kconfig knob is made available by upstream
   # (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227)
diff --git a/kernels/linux-libre-pae/config b/kernels/linux-libre-pae/config
index 42744b5bf..5c13c2571 100644
--- a/kernels/linux-libre-pae/config
+++ b/kernels/linux-libre-pae/config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/i386 3.8.0 Kernel Configuration
+# Linux/i386 3.8.0-2 Kernel Configuration
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -1494,6 +1494,9 @@ CONFIG_MTD_PLATRAM=m
 CONFIG_MTD_PMC551=m
 # CONFIG_MTD_PMC551_BUGFIX is not set
 # CONFIG_MTD_PMC551_DEBUG is not set
+# CONFIG_MTD_DATAFLASH is not set
+# CONFIG_MTD_M25P80 is not set
+# CONFIG_MTD_SST25L is not set
 # CONFIG_MTD_SLRAM is not set
 CONFIG_MTD_PHRAM=m
 CONFIG_MTD_MTDRAM=m
@@ -1615,6 +1618,7 @@ CONFIG_BLK_DEV_RBD=m
 CONFIG_SENSORS_LIS3LV02D=m
 CONFIG_AD525X_DPOT=m
 CONFIG_AD525X_DPOT_I2C=m
+# CONFIG_AD525X_DPOT_SPI is not set
 # CONFIG_IBM_ASM is not set
 CONFIG_PHANTOM=m
 CONFIG_INTEL_MID_PTI=m
@@ -1636,9 +1640,11 @@ CONFIG_SENSORS_BH1770=m
 CONFIG_SENSORS_APDS990X=m
 CONFIG_HMC6352=m
 CONFIG_DS1682=m
+# CONFIG_TI_DAC7512 is not set
 CONFIG_VMWARE_BALLOON=m
 CONFIG_BMP085=y
 CONFIG_BMP085_I2C=m
+# CONFIG_BMP085_SPI is not set
 # CONFIG_PCH_PHUB is not set
 CONFIG_USB_SWITCH_FSA9480=m
 CONFIG_C2PORT=m
@@ -1648,9 +1654,11 @@ CONFIG_C2PORT_DURAMAR_2150=m
 # EEPROM support
 #
 CONFIG_EEPROM_AT24=m
+# CONFIG_EEPROM_AT25 is not set
 CONFIG_EEPROM_LEGACY=m
 CONFIG_EEPROM_MAX6875=m
 CONFIG_EEPROM_93CX6=m
+# CONFIG_EEPROM_93XX46 is not set
 CONFIG_CB710_CORE=m
 # CONFIG_CB710_DEBUG is not set
 CONFIG_CB710_DEBUG_ASSUMPTIONS=y
@@ -2205,8 +2213,11 @@ CONFIG_MLX4_CORE=m
 CONFIG_MLX4_DEBUG=y
 CONFIG_NET_VENDOR_MICREL=y
 CONFIG_KS8842=m
+# CONFIG_KS8851 is not set
 CONFIG_KS8851_MLL=m
 CONFIG_KSZ884X_PCI=m
+CONFIG_NET_VENDOR_MICROCHIP=y
+# CONFIG_ENC28J60 is not set
 CONFIG_NET_VENDOR_MYRI=y
 CONFIG_MYRI10GE=m
 CONFIG_MYRI10GE_DCA=y
@@ -2325,6 +2336,7 @@ CONFIG_MICREL_PHY=m
 CONFIG_MDIO_BUS_MUX=m
 CONFIG_MDIO_BUS_MUX_GPIO=m
 CONFIG_MDIO_BUS_MUX_MMIOREG=m
+# CONFIG_MICREL_KS8995MA is not set
 CONFIG_PLIP=m
 CONFIG_PPP=m
 CONFIG_PPP_BSDCOMP=m
@@ -2504,6 +2516,7 @@ CONFIG_LIBERTAS=m
 CONFIG_LIBERTAS_USB=m
 CONFIG_LIBERTAS_CS=m
 CONFIG_LIBERTAS_SDIO=m
+# CONFIG_LIBERTAS_SPI is not set
 # CONFIG_LIBERTAS_DEBUG is not set
 CONFIG_LIBERTAS_MESH=y
 CONFIG_HERMES=m
@@ -2519,6 +2532,7 @@ CONFIG_ORINOCO_USB=m
 CONFIG_P54_COMMON=m
 CONFIG_P54_USB=m
 CONFIG_P54_PCI=m
+# CONFIG_P54_SPI is not set
 CONFIG_P54_LEDS=y
 CONFIG_RT2X00=m
 CONFIG_RT2400PCI=m
@@ -2554,10 +2568,12 @@ CONFIG_RTLWIFI=m
 CONFIG_RTL8192C_COMMON=m
 CONFIG_WL_TI=y
 CONFIG_WL1251=m
+# CONFIG_WL1251_SPI is not set
 CONFIG_WL1251_SDIO=m
 CONFIG_WL12XX=m
 CONFIG_WL18XX=m
 CONFIG_WLCORE=m
+# CONFIG_WLCORE_SPI is not set
 CONFIG_WLCORE_SDIO=m
 CONFIG_WL12XX_PLATFORM_DATA=y
 CONFIG_ZD1211RW=m
@@ -2577,6 +2593,8 @@ CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8
 CONFIG_IEEE802154_DRIVERS=m
 CONFIG_IEEE802154_FAKEHARD=m
 CONFIG_IEEE802154_FAKELB=m
+CONFIG_IEEE802154_AT86RF230=m
+# CONFIG_IEEE802154_MRF24J40 is not set
 CONFIG_VMXNET3=m
 CONFIG_HYPERV_NET=m
 CONFIG_ISDN=y
@@ -2832,14 +2850,18 @@ CONFIG_TABLET_USB_HANWANG=m
 CONFIG_TABLET_USB_KBTAB=m
 CONFIG_TABLET_USB_WACOM=m
 CONFIG_INPUT_TOUCHSCREEN=y
+# CONFIG_TOUCHSCREEN_ADS7846 is not set
+# CONFIG_TOUCHSCREEN_AD7877 is not set
 CONFIG_TOUCHSCREEN_AD7879=m
 CONFIG_TOUCHSCREEN_AD7879_I2C=m
+# CONFIG_TOUCHSCREEN_AD7879_SPI is not set
 CONFIG_TOUCHSCREEN_ATMEL_MXT=m
 CONFIG_TOUCHSCREEN_AUO_PIXCIR=m
 CONFIG_TOUCHSCREEN_BU21013=m
 CONFIG_TOUCHSCREEN_CY8CTMG110=m
 CONFIG_TOUCHSCREEN_CYTTSP_CORE=m
 CONFIG_TOUCHSCREEN_CYTTSP_I2C=m
+# CONFIG_TOUCHSCREEN_CYTTSP_SPI is not set
 CONFIG_TOUCHSCREEN_DYNAPRO=m
 CONFIG_TOUCHSCREEN_HAMPSHIRE=m
 CONFIG_TOUCHSCREEN_EETI=m
@@ -2890,12 +2912,14 @@ CONFIG_TOUCHSCREEN_USB_NEXIO=y
 CONFIG_TOUCHSCREEN_USB_EASYTOUCH=y
 CONFIG_TOUCHSCREEN_TOUCHIT213=m
 CONFIG_TOUCHSCREEN_TSC_SERIO=m
+# CONFIG_TOUCHSCREEN_TSC2005 is not set
 CONFIG_TOUCHSCREEN_TSC2007=m
 CONFIG_TOUCHSCREEN_ST1232=m
 CONFIG_TOUCHSCREEN_TPS6507X=m
 CONFIG_INPUT_MISC=y
 CONFIG_INPUT_AD714X=m
 CONFIG_INPUT_AD714X_I2C=m
+CONFIG_INPUT_AD714X_SPI=m
 CONFIG_INPUT_BMA150=m
 CONFIG_INPUT_PCSPKR=m
 CONFIG_INPUT_MC13783_PWRBUTTON=m
@@ -2921,6 +2945,7 @@ CONFIG_INPUT_PWM_BEEPER=m
 CONFIG_INPUT_GPIO_ROTARY_ENCODER=m
 CONFIG_INPUT_ADXL34X=m
 CONFIG_INPUT_ADXL34X_I2C=m
+CONFIG_INPUT_ADXL34X_SPI=m
 CONFIG_INPUT_CMA3000=m
 CONFIG_INPUT_CMA3000_I2C=m
 
@@ -2991,6 +3016,8 @@ CONFIG_SERIAL_8250_DW=m
 #
 # Non-8250 serial port support
 #
+# CONFIG_SERIAL_MAX3100 is not set
+# CONFIG_SERIAL_MAX310X is not set
 CONFIG_SERIAL_MFD_HSU=m
 CONFIG_SERIAL_CORE=y
 CONFIG_SERIAL_CORE_CONSOLE=y
@@ -3002,6 +3029,7 @@ CONFIG_SERIAL_ALTERA_JTAGUART=m
 CONFIG_SERIAL_ALTERA_UART=m
 CONFIG_SERIAL_ALTERA_UART_MAXPORTS=4
 CONFIG_SERIAL_ALTERA_UART_BAUDRATE=115200
+# CONFIG_SERIAL_IFX6X60 is not set
 CONFIG_SERIAL_PCH_UART=m
 CONFIG_SERIAL_XILINX_PS_UART=m
 CONFIG_SERIAL_ARC=m
@@ -3127,7 +3155,32 @@ CONFIG_SCx200_ACB=m
 # CONFIG_I2C_DEBUG_CORE is not set
 # CONFIG_I2C_DEBUG_ALGO is not set
 # CONFIG_I2C_DEBUG_BUS is not set
-# CONFIG_SPI is not set
+CONFIG_SPI=y
+# CONFIG_SPI_DEBUG is not set
+CONFIG_SPI_MASTER=y
+
+#
+# SPI Master Controller Drivers
+#
+# CONFIG_SPI_ALTERA is not set
+# CONFIG_SPI_BITBANG is not set
+# CONFIG_SPI_BUTTERFLY is not set
+# CONFIG_SPI_GPIO is not set
+# CONFIG_SPI_LM70_LLP is not set
+# CONFIG_SPI_OC_TINY is not set
+# CONFIG_SPI_PXA2XX is not set
+# CONFIG_SPI_PXA2XX_PCI is not set
+# CONFIG_SPI_SC18IS602 is not set
+# CONFIG_SPI_TOPCLIFF_PCH is not set
+# CONFIG_SPI_XCOMM is not set
+# CONFIG_SPI_XILINX is not set
+# CONFIG_SPI_DESIGNWARE is not set
+
+#
+# SPI Protocol Masters
+#
+# CONFIG_SPI_SPIDEV is not set
+# CONFIG_SPI_TLE62X0 is not set
 # CONFIG_HSI is not set
 
 #
@@ -3196,7 +3249,10 @@ CONFIG_GPIO_AMD8111=m
 #
 # SPI GPIO expanders:
 #
+# CONFIG_GPIO_MAX7301 is not set
 # CONFIG_GPIO_MCP23S08 is not set
+# CONFIG_GPIO_MC33880 is not set
+# CONFIG_GPIO_74X164 is not set
 
 #
 # AC97 GPIO expanders:
@@ -3243,8 +3299,10 @@ CONFIG_HWMON_VID=m
 #
 CONFIG_SENSORS_ABITUGURU=m
 CONFIG_SENSORS_ABITUGURU3=m
+# CONFIG_SENSORS_AD7314 is not set
 CONFIG_SENSORS_AD7414=m
 CONFIG_SENSORS_AD7418=m
+# CONFIG_SENSORS_ADCXX is not set
 CONFIG_SENSORS_ADM1021=m
 CONFIG_SENSORS_ADM1025=m
 CONFIG_SENSORS_ADM1026=m
@@ -3281,6 +3339,7 @@ CONFIG_SENSORS_IT87=m
 CONFIG_SENSORS_JC42=m
 CONFIG_SENSORS_LINEAGE=m
 CONFIG_SENSORS_LM63=m
+# CONFIG_SENSORS_LM70 is not set
 CONFIG_SENSORS_LM73=m
 CONFIG_SENSORS_LM75=m
 CONFIG_SENSORS_LM77=m
@@ -3298,6 +3357,7 @@ CONFIG_SENSORS_LTC4245=m
 CONFIG_SENSORS_LTC4261=m
 CONFIG_SENSORS_LM95241=m
 CONFIG_SENSORS_LM95245=m
+# CONFIG_SENSORS_MAX1111 is not set
 CONFIG_SENSORS_MAX16065=m
 CONFIG_SENSORS_MAX1619=m
 CONFIG_SENSORS_MAX1668=m
@@ -3337,6 +3397,7 @@ CONFIG_SENSORS_SCH5627=m
 CONFIG_SENSORS_SCH5636=m
 CONFIG_SENSORS_ADS1015=m
 CONFIG_SENSORS_ADS7828=m
+# CONFIG_SENSORS_ADS7871 is not set
 CONFIG_SENSORS_AMC6821=m
 CONFIG_SENSORS_INA2XX=m
 CONFIG_SENSORS_THMC50=m
@@ -3485,18 +3546,25 @@ CONFIG_MFD_LM3533=m
 CONFIG_TPS65010=m
 CONFIG_TPS6507X=m
 CONFIG_MFD_TPS65217=m
+# CONFIG_MFD_TPS65912_SPI is not set
+# CONFIG_MFD_STMPE is not set
 # CONFIG_MFD_TMIO is not set
+# CONFIG_MFD_DA9052_SPI is not set
 CONFIG_MFD_ARIZONA=y
 CONFIG_MFD_ARIZONA_I2C=m
+# CONFIG_MFD_ARIZONA_SPI is not set
 CONFIG_MFD_WM5102=y
 CONFIG_MFD_WM5110=y
+# CONFIG_MFD_WM831X_SPI is not set
 CONFIG_MFD_PCF50633=m
 CONFIG_PCF50633_ADC=m
 CONFIG_PCF50633_GPIO=m
 CONFIG_MFD_MC13783=m
 CONFIG_MFD_MC13XXX=m
+# CONFIG_MFD_MC13XXX_SPI is not set
 CONFIG_MFD_MC13XXX_I2C=m
 CONFIG_ABX500_CORE=y
+# CONFIG_EZX_PCAP is not set
 CONFIG_MFD_CS5535=m
 # CONFIG_MFD_TIMBERDALE is not set
 CONFIG_LPC_SCH=m
@@ -4208,7 +4276,16 @@ CONFIG_FB_VIRTUAL=m
 # CONFIG_EXYNOS_VIDEO is not set
 CONFIG_BACKLIGHT_LCD_SUPPORT=y
 CONFIG_LCD_CLASS_DEVICE=m
+# CONFIG_LCD_L4F00242T03 is not set
+# CONFIG_LCD_LMS283GF05 is not set
+# CONFIG_LCD_LTV350QV is not set
+# CONFIG_LCD_ILI9320 is not set
+# CONFIG_LCD_TDO24M is not set
+# CONFIG_LCD_VGG2432A4 is not set
 CONFIG_LCD_PLATFORM=m
+# CONFIG_LCD_S6E63M0 is not set
+# CONFIG_LCD_LD9040 is not set
+# CONFIG_LCD_AMS369FG06 is not set
 CONFIG_BACKLIGHT_CLASS_DEVICE=y
 # CONFIG_BACKLIGHT_GENERIC is not set
 CONFIG_BACKLIGHT_LM3533=m
@@ -4431,6 +4508,7 @@ CONFIG_SND_VIA82XX_MODEM=m
 CONFIG_SND_VIRTUOSO=m
 CONFIG_SND_VX222=m
 CONFIG_SND_YMFPCI=m
+CONFIG_SND_SPI=y
 CONFIG_SND_USB=y
 CONFIG_SND_USB_AUDIO=m
 CONFIG_SND_USB_UA101=m
@@ -4882,6 +4960,7 @@ CONFIG_LEDS_LP5523=m
 CONFIG_LEDS_CLEVO_MAIL=m
 CONFIG_LEDS_PCA955X=m
 CONFIG_LEDS_PCA9633=m
+# CONFIG_LEDS_DAC124S085 is not set
 CONFIG_LEDS_BD2802=m
 CONFIG_LEDS_INTEL_SS4200=m
 CONFIG_LEDS_LT3593=m
@@ -4975,6 +5054,15 @@ CONFIG_RTC_DRV_RV3029C2=m
 #
 # SPI RTC drivers
 #
+# CONFIG_RTC_DRV_M41T93 is not set
+# CONFIG_RTC_DRV_M41T94 is not set
+# CONFIG_RTC_DRV_DS1305 is not set
+# CONFIG_RTC_DRV_DS1390 is not set
+# CONFIG_RTC_DRV_MAX6902 is not set
+# CONFIG_RTC_DRV_R9701 is not set
+# CONFIG_RTC_DRV_RS5C348 is not set
+# CONFIG_RTC_DRV_DS3234 is not set
+# CONFIG_RTC_DRV_PCF2123 is not set
 
 #
 # Platform RTC drivers
diff --git a/kernels/linux-libre-pae/linux-libre-pae.install b/kernels/linux-libre-pae/linux-libre-pae.install
index 4a41ea6bb..946736248 100644
--- a/kernels/linux-libre-pae/linux-libre-pae.install
+++ b/kernels/linux-libre-pae/linux-libre-pae.install
@@ -2,7 +2,7 @@
 # arg 2:  the old package version
 
 KERNEL_NAME=-pae
-KERNEL_VERSION=3.8.0-2-LIBRE-PAE
+KERNEL_VERSION=3.8.1-1-LIBRE-PAE
 
 # set a sane PATH to ensure that critical utils like depmod will be found
 export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'
diff --git a/kernels/linux-libre-xen/CVE-2013-1763.patch b/kernels/linux-libre-xen/CVE-2013-1763.patch
deleted file mode 100644
index 82b59a6dc..000000000
--- a/kernels/linux-libre-xen/CVE-2013-1763.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 6e601a53566d84e1ffd25e7b6fe0b6894ffd79c0 Mon Sep 17 00:00:00 2001
-From: Mathias Krause <minipli@googlemail.com>
-Date: Sat, 23 Feb 2013 01:13:47 +0000
-Subject: [PATCH] sock_diag: Fix out-of-bounds access to sock_diag_handlers[]
-
-Userland can send a netlink message requesting SOCK_DIAG_BY_FAMILY
-with a family greater or equal then AF_MAX -- the array size of
-sock_diag_handlers[]. The current code does not test for this
-condition therefore is vulnerable to an out-of-bound access opening
-doors for a privilege escalation.
-
-Signed-off-by: Mathias Krause <minipli@googlemail.com>
-Acked-by: Eric Dumazet <edumazet@google.com>
-Signed-off-by: David S. Miller <davem@davemloft.net>
----
- net/core/sock_diag.c |    3 +++
- 1 files changed, 3 insertions(+), 0 deletions(-)
-
-diff --git a/net/core/sock_diag.c b/net/core/sock_diag.c
-index 602cd63..750f44f 100644
---- a/net/core/sock_diag.c
-+++ b/net/core/sock_diag.c
-@@ -121,6 +121,9 @@ static int __sock_diag_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
- 	if (nlmsg_len(nlh) < sizeof(*req))
- 		return -EINVAL;
- 
-+	if (req->sdiag_family >= AF_MAX)
-+		return -EINVAL;
-+
- 	hndl = sock_diag_lock_handler(req->sdiag_family);
- 	if (hndl == NULL)
- 		err = -ENOENT;
--- 
-1.7.6.5
-
diff --git a/kernels/linux-libre-xen/PKGBUILD b/kernels/linux-libre-xen/PKGBUILD
index 4d398b5f2..64608f70a 100644
--- a/kernels/linux-libre-xen/PKGBUILD
+++ b/kernels/linux-libre-xen/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 178533 2013-02-25 11:02:32Z tpowa $
+# $Id: PKGBUILD 178913 2013-02-28 18:41:03Z tpowa $
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: Thomas Baechler <thomas@archlinux.org>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
@@ -6,29 +6,26 @@
 pkgbase=linux-libre-xen     # Build stock -LIBRE-XEN kernel
 #pkgbase=linux-libre-custom # Build kernel with a different name
 _basekernel=3.8
-#pkgver=${_basekernel}.9
-pkgver=${_basekernel}
-pkgrel=2
+pkgver=${_basekernel}.1
+pkgrel=1
 arch=('i686')
 url="http://linux-libre.fsfla.org/"
 license=('GPL2')
 makedepends=('xmlto' 'docbook-xsl')
 options=('!strip')
 source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gnu/linux-libre-${_basekernel}-gnu.tar.xz"
-        #"http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-gnu/patch-${_basekernel}-gnu-${pkgver}-gnu.xz"
+        "http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-gnu/patch-${_basekernel}-gnu-${pkgver}-gnu.xz"
         # the main kernel config files
         'config'
         # standard config files for mkinitcpio ramdisk
         "${pkgbase}.preset"
         'boot-logo.patch'
-        'change-default-console-loglevel.patch'
-        'CVE-2013-1763.patch')
+        'change-default-console-loglevel.patch')
 md5sums=('84c2a77910932ffc7d958744ac9cf2f5'
          '208b90a9f3ccbaf2064f05163985bd46'
-         'b7c2805bb287a644c0a303bf7721e534'
+         'c13961a22d8c742fb31b59a1e27a0e7b'
          '04b21c79df0a952c22d681dd4f4562df'
-         '9d3c56a4b999c8bfbd4018089a62f662'
-         '420991808fe4cba143013427c0737aa9')
+         '9d3c56a4b999c8bfbd4018089a62f662')
 
 _kernelname=${pkgbase#linux-libre}
 _localversionname=-LIBRE-XEN
@@ -43,10 +40,6 @@ build() {
   # Add freedo as boot logo
   patch -Np1 -i "${srcdir}/boot-logo.patch"
 
-  # Fix security vulnetability CVE-2013-1763.patch
-  # https://bugs.archlinux.org/task/34005
-  patch -Np1 -i "${srcdir}/CVE-2013-1763.patch"
-
   # set DEFAULT_CONSOLE_LOGLEVEL to 4 (same value as the 'quiet' kernel param)
   # remove this when a Kconfig knob is made available by upstream
   # (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227)
diff --git a/kernels/linux-libre-xen/config b/kernels/linux-libre-xen/config
index 817119ef9..1b83ef084 100644
--- a/kernels/linux-libre-xen/config
+++ b/kernels/linux-libre-xen/config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/i386 3.8.0 Kernel Configuration
+# Linux/i386 3.8.0-2 Kernel Configuration
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -1501,6 +1501,9 @@ CONFIG_MTD_PLATRAM=m
 CONFIG_MTD_PMC551=m
 # CONFIG_MTD_PMC551_BUGFIX is not set
 # CONFIG_MTD_PMC551_DEBUG is not set
+# CONFIG_MTD_DATAFLASH is not set
+# CONFIG_MTD_M25P80 is not set
+# CONFIG_MTD_SST25L is not set
 # CONFIG_MTD_SLRAM is not set
 CONFIG_MTD_PHRAM=m
 CONFIG_MTD_MTDRAM=m
@@ -1624,6 +1627,7 @@ CONFIG_BLK_DEV_RBD=m
 CONFIG_SENSORS_LIS3LV02D=m
 CONFIG_AD525X_DPOT=m
 CONFIG_AD525X_DPOT_I2C=m
+# CONFIG_AD525X_DPOT_SPI is not set
 # CONFIG_IBM_ASM is not set
 CONFIG_PHANTOM=m
 CONFIG_INTEL_MID_PTI=m
@@ -1645,9 +1649,11 @@ CONFIG_SENSORS_BH1770=m
 CONFIG_SENSORS_APDS990X=m
 CONFIG_HMC6352=m
 CONFIG_DS1682=m
+# CONFIG_TI_DAC7512 is not set
 CONFIG_VMWARE_BALLOON=m
 CONFIG_BMP085=y
 CONFIG_BMP085_I2C=m
+# CONFIG_BMP085_SPI is not set
 # CONFIG_PCH_PHUB is not set
 CONFIG_USB_SWITCH_FSA9480=m
 CONFIG_C2PORT=m
@@ -1657,9 +1663,11 @@ CONFIG_C2PORT_DURAMAR_2150=m
 # EEPROM support
 #
 CONFIG_EEPROM_AT24=m
+# CONFIG_EEPROM_AT25 is not set
 CONFIG_EEPROM_LEGACY=m
 CONFIG_EEPROM_MAX6875=m
 CONFIG_EEPROM_93CX6=m
+# CONFIG_EEPROM_93XX46 is not set
 CONFIG_CB710_CORE=m
 # CONFIG_CB710_DEBUG is not set
 CONFIG_CB710_DEBUG_ASSUMPTIONS=y
@@ -2213,8 +2221,11 @@ CONFIG_MLX4_CORE=m
 CONFIG_MLX4_DEBUG=y
 CONFIG_NET_VENDOR_MICREL=y
 CONFIG_KS8842=m
+# CONFIG_KS8851 is not set
 CONFIG_KS8851_MLL=m
 CONFIG_KSZ884X_PCI=m
+CONFIG_NET_VENDOR_MICROCHIP=y
+# CONFIG_ENC28J60 is not set
 CONFIG_NET_VENDOR_MYRI=y
 CONFIG_MYRI10GE=m
 CONFIG_MYRI10GE_DCA=y
@@ -2333,6 +2344,7 @@ CONFIG_MICREL_PHY=m
 CONFIG_MDIO_BUS_MUX=m
 CONFIG_MDIO_BUS_MUX_GPIO=m
 CONFIG_MDIO_BUS_MUX_MMIOREG=m
+# CONFIG_MICREL_KS8995MA is not set
 CONFIG_PLIP=m
 CONFIG_PPP=m
 CONFIG_PPP_BSDCOMP=m
@@ -2512,6 +2524,7 @@ CONFIG_LIBERTAS=m
 CONFIG_LIBERTAS_USB=m
 CONFIG_LIBERTAS_CS=m
 CONFIG_LIBERTAS_SDIO=m
+# CONFIG_LIBERTAS_SPI is not set
 # CONFIG_LIBERTAS_DEBUG is not set
 CONFIG_LIBERTAS_MESH=y
 CONFIG_HERMES=m
@@ -2527,6 +2540,7 @@ CONFIG_ORINOCO_USB=m
 CONFIG_P54_COMMON=m
 CONFIG_P54_USB=m
 CONFIG_P54_PCI=m
+# CONFIG_P54_SPI is not set
 CONFIG_P54_LEDS=y
 CONFIG_RT2X00=m
 CONFIG_RT2400PCI=m
@@ -2562,10 +2576,12 @@ CONFIG_RTLWIFI=m
 CONFIG_RTL8192C_COMMON=m
 CONFIG_WL_TI=y
 CONFIG_WL1251=m
+# CONFIG_WL1251_SPI is not set
 CONFIG_WL1251_SDIO=m
 CONFIG_WL12XX=m
 CONFIG_WL18XX=m
 CONFIG_WLCORE=m
+# CONFIG_WLCORE_SPI is not set
 CONFIG_WLCORE_SDIO=m
 CONFIG_WL12XX_PLATFORM_DATA=y
 CONFIG_ZD1211RW=m
@@ -2585,6 +2601,8 @@ CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8
 CONFIG_IEEE802154_DRIVERS=m
 CONFIG_IEEE802154_FAKEHARD=m
 CONFIG_IEEE802154_FAKELB=m
+CONFIG_IEEE802154_AT86RF230=m
+# CONFIG_IEEE802154_MRF24J40 is not set
 CONFIG_XEN_NETDEV_FRONTEND=m
 CONFIG_XEN_NETDEV_BACKEND=m
 CONFIG_VMXNET3=m
@@ -2842,14 +2860,18 @@ CONFIG_TABLET_USB_HANWANG=m
 CONFIG_TABLET_USB_KBTAB=m
 CONFIG_TABLET_USB_WACOM=m
 CONFIG_INPUT_TOUCHSCREEN=y
+# CONFIG_TOUCHSCREEN_ADS7846 is not set
+# CONFIG_TOUCHSCREEN_AD7877 is not set
 CONFIG_TOUCHSCREEN_AD7879=m
 CONFIG_TOUCHSCREEN_AD7879_I2C=m
+# CONFIG_TOUCHSCREEN_AD7879_SPI is not set
 CONFIG_TOUCHSCREEN_ATMEL_MXT=m
 CONFIG_TOUCHSCREEN_AUO_PIXCIR=m
 CONFIG_TOUCHSCREEN_BU21013=m
 CONFIG_TOUCHSCREEN_CY8CTMG110=m
 CONFIG_TOUCHSCREEN_CYTTSP_CORE=m
 CONFIG_TOUCHSCREEN_CYTTSP_I2C=m
+# CONFIG_TOUCHSCREEN_CYTTSP_SPI is not set
 CONFIG_TOUCHSCREEN_DYNAPRO=m
 CONFIG_TOUCHSCREEN_HAMPSHIRE=m
 CONFIG_TOUCHSCREEN_EETI=m
@@ -2900,12 +2922,14 @@ CONFIG_TOUCHSCREEN_USB_NEXIO=y
 CONFIG_TOUCHSCREEN_USB_EASYTOUCH=y
 CONFIG_TOUCHSCREEN_TOUCHIT213=m
 CONFIG_TOUCHSCREEN_TSC_SERIO=m
+# CONFIG_TOUCHSCREEN_TSC2005 is not set
 CONFIG_TOUCHSCREEN_TSC2007=m
 CONFIG_TOUCHSCREEN_ST1232=m
 CONFIG_TOUCHSCREEN_TPS6507X=m
 CONFIG_INPUT_MISC=y
 CONFIG_INPUT_AD714X=m
 CONFIG_INPUT_AD714X_I2C=m
+CONFIG_INPUT_AD714X_SPI=m
 CONFIG_INPUT_BMA150=m
 CONFIG_INPUT_PCSPKR=m
 CONFIG_INPUT_MC13783_PWRBUTTON=m
@@ -2931,6 +2955,7 @@ CONFIG_INPUT_PWM_BEEPER=m
 CONFIG_INPUT_GPIO_ROTARY_ENCODER=m
 CONFIG_INPUT_ADXL34X=m
 CONFIG_INPUT_ADXL34X_I2C=m
+CONFIG_INPUT_ADXL34X_SPI=m
 CONFIG_INPUT_CMA3000=m
 CONFIG_INPUT_CMA3000_I2C=m
 CONFIG_INPUT_XEN_KBDDEV_FRONTEND=m
@@ -3002,6 +3027,8 @@ CONFIG_SERIAL_8250_DW=m
 #
 # Non-8250 serial port support
 #
+# CONFIG_SERIAL_MAX3100 is not set
+# CONFIG_SERIAL_MAX310X is not set
 CONFIG_SERIAL_MFD_HSU=m
 CONFIG_SERIAL_CORE=y
 CONFIG_SERIAL_CORE_CONSOLE=y
@@ -3013,6 +3040,7 @@ CONFIG_SERIAL_ALTERA_JTAGUART=m
 CONFIG_SERIAL_ALTERA_UART=m
 CONFIG_SERIAL_ALTERA_UART_MAXPORTS=4
 CONFIG_SERIAL_ALTERA_UART_BAUDRATE=115200
+# CONFIG_SERIAL_IFX6X60 is not set
 CONFIG_SERIAL_PCH_UART=m
 CONFIG_SERIAL_XILINX_PS_UART=m
 CONFIG_SERIAL_ARC=m
@@ -3140,7 +3168,32 @@ CONFIG_SCx200_ACB=m
 # CONFIG_I2C_DEBUG_CORE is not set
 # CONFIG_I2C_DEBUG_ALGO is not set
 # CONFIG_I2C_DEBUG_BUS is not set
-# CONFIG_SPI is not set
+CONFIG_SPI=y
+# CONFIG_SPI_DEBUG is not set
+CONFIG_SPI_MASTER=y
+
+#
+# SPI Master Controller Drivers
+#
+# CONFIG_SPI_ALTERA is not set
+# CONFIG_SPI_BITBANG is not set
+# CONFIG_SPI_BUTTERFLY is not set
+# CONFIG_SPI_GPIO is not set
+# CONFIG_SPI_LM70_LLP is not set
+# CONFIG_SPI_OC_TINY is not set
+# CONFIG_SPI_PXA2XX is not set
+# CONFIG_SPI_PXA2XX_PCI is not set
+# CONFIG_SPI_SC18IS602 is not set
+# CONFIG_SPI_TOPCLIFF_PCH is not set
+# CONFIG_SPI_XCOMM is not set
+# CONFIG_SPI_XILINX is not set
+# CONFIG_SPI_DESIGNWARE is not set
+
+#
+# SPI Protocol Masters
+#
+# CONFIG_SPI_SPIDEV is not set
+# CONFIG_SPI_TLE62X0 is not set
 # CONFIG_HSI is not set
 
 #
@@ -3209,7 +3262,10 @@ CONFIG_GPIO_AMD8111=m
 #
 # SPI GPIO expanders:
 #
+# CONFIG_GPIO_MAX7301 is not set
 # CONFIG_GPIO_MCP23S08 is not set
+# CONFIG_GPIO_MC33880 is not set
+# CONFIG_GPIO_74X164 is not set
 
 #
 # AC97 GPIO expanders:
@@ -3256,8 +3312,10 @@ CONFIG_HWMON_VID=m
 #
 CONFIG_SENSORS_ABITUGURU=m
 CONFIG_SENSORS_ABITUGURU3=m
+# CONFIG_SENSORS_AD7314 is not set
 CONFIG_SENSORS_AD7414=m
 CONFIG_SENSORS_AD7418=m
+# CONFIG_SENSORS_ADCXX is not set
 CONFIG_SENSORS_ADM1021=m
 CONFIG_SENSORS_ADM1025=m
 CONFIG_SENSORS_ADM1026=m
@@ -3294,6 +3352,7 @@ CONFIG_SENSORS_IT87=m
 CONFIG_SENSORS_JC42=m
 CONFIG_SENSORS_LINEAGE=m
 CONFIG_SENSORS_LM63=m
+# CONFIG_SENSORS_LM70 is not set
 CONFIG_SENSORS_LM73=m
 CONFIG_SENSORS_LM75=m
 CONFIG_SENSORS_LM77=m
@@ -3311,6 +3370,7 @@ CONFIG_SENSORS_LTC4245=m
 CONFIG_SENSORS_LTC4261=m
 CONFIG_SENSORS_LM95241=m
 CONFIG_SENSORS_LM95245=m
+# CONFIG_SENSORS_MAX1111 is not set
 CONFIG_SENSORS_MAX16065=m
 CONFIG_SENSORS_MAX1619=m
 CONFIG_SENSORS_MAX1668=m
@@ -3350,6 +3410,7 @@ CONFIG_SENSORS_SCH5627=m
 CONFIG_SENSORS_SCH5636=m
 CONFIG_SENSORS_ADS1015=m
 CONFIG_SENSORS_ADS7828=m
+# CONFIG_SENSORS_ADS7871 is not set
 CONFIG_SENSORS_AMC6821=m
 CONFIG_SENSORS_INA2XX=m
 CONFIG_SENSORS_THMC50=m
@@ -3499,18 +3560,25 @@ CONFIG_MFD_LM3533=m
 CONFIG_TPS65010=m
 CONFIG_TPS6507X=m
 CONFIG_MFD_TPS65217=m
+# CONFIG_MFD_TPS65912_SPI is not set
+# CONFIG_MFD_STMPE is not set
 # CONFIG_MFD_TMIO is not set
+# CONFIG_MFD_DA9052_SPI is not set
 CONFIG_MFD_ARIZONA=y
 CONFIG_MFD_ARIZONA_I2C=m
+# CONFIG_MFD_ARIZONA_SPI is not set
 CONFIG_MFD_WM5102=y
 CONFIG_MFD_WM5110=y
+# CONFIG_MFD_WM831X_SPI is not set
 CONFIG_MFD_PCF50633=m
 CONFIG_PCF50633_ADC=m
 CONFIG_PCF50633_GPIO=m
 CONFIG_MFD_MC13783=m
 CONFIG_MFD_MC13XXX=m
+# CONFIG_MFD_MC13XXX_SPI is not set
 CONFIG_MFD_MC13XXX_I2C=m
 CONFIG_ABX500_CORE=y
+# CONFIG_EZX_PCAP is not set
 CONFIG_MFD_CS5535=m
 # CONFIG_MFD_TIMBERDALE is not set
 CONFIG_LPC_SCH=m
@@ -4223,7 +4291,16 @@ CONFIG_XEN_FBDEV_FRONTEND=m
 # CONFIG_EXYNOS_VIDEO is not set
 CONFIG_BACKLIGHT_LCD_SUPPORT=y
 CONFIG_LCD_CLASS_DEVICE=m
+# CONFIG_LCD_L4F00242T03 is not set
+# CONFIG_LCD_LMS283GF05 is not set
+# CONFIG_LCD_LTV350QV is not set
+# CONFIG_LCD_ILI9320 is not set
+# CONFIG_LCD_TDO24M is not set
+# CONFIG_LCD_VGG2432A4 is not set
 CONFIG_LCD_PLATFORM=m
+# CONFIG_LCD_S6E63M0 is not set
+# CONFIG_LCD_LD9040 is not set
+# CONFIG_LCD_AMS369FG06 is not set
 CONFIG_BACKLIGHT_CLASS_DEVICE=y
 # CONFIG_BACKLIGHT_GENERIC is not set
 CONFIG_BACKLIGHT_LM3533=m
@@ -4446,6 +4523,7 @@ CONFIG_SND_VIA82XX_MODEM=m
 CONFIG_SND_VIRTUOSO=m
 CONFIG_SND_VX222=m
 CONFIG_SND_YMFPCI=m
+CONFIG_SND_SPI=y
 CONFIG_SND_USB=y
 CONFIG_SND_USB_AUDIO=m
 CONFIG_SND_USB_UA101=m
@@ -4897,6 +4975,7 @@ CONFIG_LEDS_LP5523=m
 CONFIG_LEDS_CLEVO_MAIL=m
 CONFIG_LEDS_PCA955X=m
 CONFIG_LEDS_PCA9633=m
+# CONFIG_LEDS_DAC124S085 is not set
 CONFIG_LEDS_BD2802=m
 CONFIG_LEDS_INTEL_SS4200=m
 CONFIG_LEDS_LT3593=m
@@ -4990,6 +5069,15 @@ CONFIG_RTC_DRV_RV3029C2=m
 #
 # SPI RTC drivers
 #
+# CONFIG_RTC_DRV_M41T93 is not set
+# CONFIG_RTC_DRV_M41T94 is not set
+# CONFIG_RTC_DRV_DS1305 is not set
+# CONFIG_RTC_DRV_DS1390 is not set
+# CONFIG_RTC_DRV_MAX6902 is not set
+# CONFIG_RTC_DRV_R9701 is not set
+# CONFIG_RTC_DRV_RS5C348 is not set
+# CONFIG_RTC_DRV_DS3234 is not set
+# CONFIG_RTC_DRV_PCF2123 is not set
 
 #
 # Platform RTC drivers
diff --git a/kernels/linux-libre-xen/linux-libre-xen.install b/kernels/linux-libre-xen/linux-libre-xen.install
index 8ea666d23..32673ba50 100644
--- a/kernels/linux-libre-xen/linux-libre-xen.install
+++ b/kernels/linux-libre-xen/linux-libre-xen.install
@@ -2,7 +2,7 @@
 # arg 2:  the old package version
 
 KERNEL_NAME=-xen
-KERNEL_VERSION=3.8.0-2-LIBRE-XEN
+KERNEL_VERSION=3.8.1-1-LIBRE-XEN
 
 # set a sane PATH to ensure that critical utils like depmod will be found
 export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'
diff --git a/libre/clementine-libre/PKGBUILD b/libre/clementine-libre/PKGBUILD
index 85f2b3414..1885f4743 100644
--- a/libre/clementine-libre/PKGBUILD
+++ b/libre/clementine-libre/PKGBUILD
@@ -9,13 +9,13 @@
 _pkgname=clementine
 pkgname=clementine-libre
 pkgver=1.1.1
-pkgrel=4
+pkgrel=6
 pkgdesc="A music player and library organizer, without spotify support"
 url="http://www.clementine-player.org/"
 license=('GPL')
 arch=('i686' 'x86_64')
 depends=('gstreamer0.10-base' 'taglib' 'glew' 'liblastfm' 'libgpod'
-         'libmtp' 'libplist' 'hicolor-icon-theme' 'qt' 'libimobiledevice'
+         'libmtp' 'libplist' 'hicolor-icon-theme' 'qt4' 'libimobiledevice'
          'sparsehash' 'qjson' 'libcdio-paranoia' 'protobuf' 'qca' 'qca-ossl' 'gvfs')
 makedepends=('cmake' 'boost' 'mesa')
 optdepends=('gstreamer0.10-base-plugins: for more open formats'
diff --git a/libre/file-roller-libre/PKGBUILD b/libre/file-roller-libre/PKGBUILD
index eae98446f..066adb07f 100644
--- a/libre/file-roller-libre/PKGBUILD
+++ b/libre/file-roller-libre/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 172924 2012-12-06 20:47:37Z heftig $
+# $Id: PKGBUILD 178905 2013-02-28 18:13:09Z ioni $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 _pkgname=file-roller
 pkgname=file-roller-libre
 pkgver=3.6.3
-pkgrel=1
+pkgrel=2
 pkgdesc="Archive manipulator for GNOME"
 arch=('i686' 'x86_64')
 license=('GPL')
diff --git a/libre/hydrogen-libre/PKGBUILD b/libre/hydrogen-libre/PKGBUILD
index 5f4eef1b9..562d4f3fd 100644
--- a/libre/hydrogen-libre/PKGBUILD
+++ b/libre/hydrogen-libre/PKGBUILD
@@ -7,12 +7,12 @@
 _pkgname=hydrogen
 pkgname=hydrogen-libre
 pkgver=0.9.5.1
-pkgrel=1
+pkgrel=3.1
 pkgdesc="Advanced Drum Machine (without nonfree drumkits recommendation)"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://www.hydrogen-music.org/"
-depends=('libarchive' 'liblrdf' 'qt' 'jack')
+depends=('libarchive' 'liblrdf' 'qt4' 'jack')
 makedepends=('scons')
 #options=('!makeflags')
 replaces=("${_pkgname}")
diff --git a/libre/kdelibs-libre/PKGBUILD b/libre/kdelibs-libre/PKGBUILD
index 77e5f3883..5db404e8a 100644
--- a/libre/kdelibs-libre/PKGBUILD
+++ b/libre/kdelibs-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 177595 2013-02-07 20:38:16Z eric $
+# $Id: PKGBUILD 178874 2013-02-27 23:08:32Z 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.0
-pkgrel=2
+pkgrel=4
 pkgdesc="KDE Core Libraries"
 arch=('i686' 'x86_64' 'mips64el')
 url='https://projects.kde.org/projects/kde/kdelibs'
@@ -14,8 +14,8 @@ license=('GPL' 'LGPL' 'FDL')
 depends=('strigi' 'attica' 'libxss' 'soprano' 'krb5' 'grantlee'
         'shared-desktop-ontologies' 'qca' 'libdbusmenu-qt' 'polkit-qt'
         'shared-mime-info' 'enchant' 'giflib' 'jasper' 'openexr'
-        'docbook-xsl' 'upower' 'udisks2' 'libxcursor' 'phonon' 'qtwebkit'
-        'media-player-info' 'libxtst' 'libutempter')
+        'docbook-xsl' 'upower' 'udisks2' 'libxcursor' 'phonon'
+        'media-player-info' 'libxtst' 'libutempter' 'qtwebkit')
 makedepends=('cmake' 'automoc4' 'avahi' 'libgl' 'hspell' 'mesa')
 provides=("kdelibs=$pkgver")
 replaces=('kdelibs')
diff --git a/libre/linux-libre-kmod-alx/PKGBUILD b/libre/linux-libre-kmod-alx/PKGBUILD
index 33220b55a..898a24f12 100644
--- a/libre/linux-libre-kmod-alx/PKGBUILD
+++ b/libre/linux-libre-kmod-alx/PKGBUILD
@@ -1,12 +1,12 @@
 # Maintainer: André Silva <emulatorman@lavabit.com>
 
-_kernver=3.8
-_kernrel=2
+_kernver=3.8.1
+_kernrel=1
 pkgname=('linux-libre-kmod-alx')
 _version=v3.8-rc7
 _pkgver=3.8-rc7-1-u
 pkgver=3.8rc7.1
-pkgrel=5
+pkgrel=6
 pkgdesc='Atheros alx ethernet device driver for linux-libre kernel'
 arch=('i686' 'x86_64')
 url='http://www.linuxfoundation.org/collaborate/workgroups/networking/alx'
diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD
index 3717e9627..ddd854a03 100644
--- a/libre/linux-libre-lts/PKGBUILD
+++ b/libre/linux-libre-lts/PKGBUILD
@@ -10,7 +10,7 @@ _basekernel=3.0
 _sublevel=66
 pkgver=${_basekernel}.${_sublevel}
 pkgrel=1
-_lxopkgver=${_basekernel}.65 # nearly always the same as pkgver
+_lxopkgver=${_basekernel}.66 # nearly always the same as pkgver
 arch=('i686' 'x86_64' 'mips64el')
 url="http://linux-libre.fsfla.org/"
 license=('GPL2')
@@ -44,7 +44,7 @@ md5sums=('5f64180fe7df4e574dac5911b78f5067'
          'f36222e7ce20c8e4dc27376f9be60f6c'
          '670931649c60fcb3ef2e0119ed532bd4'
          '8a71abc4224f575008f974a099b5cf6f'
-         '7a7c3165d735a73cada5851d1b5d04ca')
+         '7870185804a1795293698f9a0b770720')
 if [ "$CARCH" != "mips64el" ]; then
     # Don't use the Loongson-specific patches on non-mips64el arches.
     unset source[${#source[@]}-1]
diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD
index 2ca4e803c..b2a459f37 100644
--- a/libre/linux-libre/PKGBUILD
+++ b/libre/linux-libre/PKGBUILD
@@ -13,7 +13,7 @@ _basekernel=3.8
 _sublevel=1
 pkgver=${_basekernel}.${_sublevel}
 pkgrel=1
-_lxopkgver=${_basekernel}.0 # nearly always the same as pkgver
+_lxopkgver=${_basekernel}.1 # nearly always the same as pkgver
 arch=('i686' 'x86_64' 'mips64el')
 url="http://linux-libre.fsfla.org/"
 license=('GPL2')
@@ -39,7 +39,7 @@ md5sums=('84c2a77910932ffc7d958744ac9cf2f5'
          '8267264d9a8966e57fdacd1fa1fc65c4'
          '04b21c79df0a952c22d681dd4f4562df'
          '9d3c56a4b999c8bfbd4018089a62f662'
-         'c48f693ef89e848335edefbf84494ea1')
+         'e46425096ddbfb9566ef276ac4b3e623')
 if [ "$CARCH" != "mips64el" ]; then
     # Don't use the Loongson-specific patches on non-mips64el arches.
     unset source[${#source[@]}-1]
diff --git a/libre/luxblend25/PKGBUILD b/libre/luxblend25/PKGBUILD
index 44ef6a542..82dd36a40 100644
--- a/libre/luxblend25/PKGBUILD
+++ b/libre/luxblend25/PKGBUILD
@@ -3,8 +3,8 @@
 
 pkgbase=luxrender
 pkgname=luxblend25
-srcver=3a928b723b29
-pkgver=1.1.v2.66
+srcver=3b84c4d3f009
+pkgver=1.2.v2.66
 _pkgver=${pkgver::3}
 reqname=blender
 reqver=${pkgver:5}
@@ -35,7 +35,7 @@ source=(
   "http://src.$pkgbase.net/$pkgname/archive/$srcver.tar.bz2"
 )
 sha512sums=(
-  f5aadc77e699f6b7259ece271b0c50ca7be5858bb628b99aedbb23b64e5587ac59cc3d1c52e063ba89c9d340f915727046e4d3017b26238425d43d3bba14f017
+  15025d192088266d781a6e80ecb4982b188d73bb7c6b12c93689a4265e967f92bcf93fc724939447c5ee7ea3f63ce52ad6bf3d20a795dcebf86e6940a3aa33b3
 )
 
 package() {
diff --git a/libre/virtualbox-libre/PKGBUILD b/libre/virtualbox-libre/PKGBUILD
index dc9e21490..8f16e1ab9 100644
--- a/libre/virtualbox-libre/PKGBUILD
+++ b/libre/virtualbox-libre/PKGBUILD
@@ -13,7 +13,7 @@ pkgname=('virtualbox-libre'
          'virtualbox-libre-sdk'
          'virtualbox-libre-guest-utils')
 pkgver=4.2.6
-pkgrel=3
+pkgrel=4
 arch=('i686' 'x86_64')
 url='http://virtualbox.org'
 license=('GPL' 'custom')
@@ -39,7 +39,7 @@ makedepends=('alsa-lib'
              'mesa'
              'glu'
              'python2'
-             'qt'
+             'qt4'
              'sdl'
              'sdl_ttf'
              'vde2'
@@ -170,7 +170,7 @@ package_virtualbox-libre() {
              'sdl'
              'shared-mime-info'
              'virtualbox-libre-host-modules')
-    optdepends=('qt: VirtualBox GUI support'
+    optdepends=('qt4: VirtualBox GUI support'
                 'vde2: Virtual Distributed Ethernet support'
                 'virtualbox-libre-sdk: Developer kit'
                 'virtualbox-libre-host-dkms: Host kernel source modules for non-stock kernels'
diff --git a/pcr/yabause-git/PKGBUILD b/pcr/yabause-git/PKGBUILD
index d2b351b36..6de78f4eb 100644
--- a/pcr/yabause-git/PKGBUILD
+++ b/pcr/yabause-git/PKGBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Gustavo Alvarez <sl1pkn07@gmail.com>
 pkgname=yabause-git
-pkgver=20130213
+pkgver=20130301
 pkgrel=1
 pkgdesc="A Sega Saturn emulator (GIT version)"
 arch=('x86_64' 'i686')
@@ -15,7 +15,7 @@ makedepends=('git' 'cmake' 'mesa' 'glu')
 #_port=gtk
 _port=qt
 
-[ "${_port}" = "qt" ] && depends+=('qt')
+[ "${_port}" = "qt" ] && depends+=('qt4')
 [ "${_port}" = "gtk" ] && depends+=('gtkglext')
 
 _gitroot="git://github.com/Guillaumito/yabause.git"
diff --git a/pcr/yabause/PKGBUILD b/pcr/yabause/PKGBUILD
index 0b80f72f9..bf5aca5f3 100644
--- a/pcr/yabause/PKGBUILD
+++ b/pcr/yabause/PKGBUILD
@@ -5,13 +5,13 @@
 # Contributor: robb_force <robb_force@holybuffalo.net>
 pkgname=yabause
 pkgver=0.9.12
-pkgrel=1
+pkgrel=2
 pkgdesc='A Sega Saturn emulator.'
 url='http://yabause.org/'
 license=('GPL')
 arch=('i686' 'x86_64')
 makedepends=('cmake' 'mesa' 'glu')
-depends=('sdl' 'qt' 'openal' 'freeglut')
+depends=('sdl' 'qt4' 'openal' 'freeglut')
 source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz")
 md5sums=('c7876c04489f8a1b59b3166598084cb8')
author	root <root@rshg054.dnsready.net>	2013-03-02 00:04:05 -0800
committer	root <root@rshg054.dnsready.net>	2013-03-02 00:04:05 -0800
commit	98aa0004e23472ee63753fded33cd55d8b942f36 (patch)
tree	1299d9cfb8bcd6bd295a1a279b4ad322b4e9133a
parent	5ae40a63ab4c6838234db5a9da1e99d8bc27875d (diff)