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 /extra
parent: 5ae40a63ab4c6838234db5a9da1e99d8bc27875d (diff)
89 files changed, 922 insertions, 871 deletions
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')
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 /extra
parent	5ae40a63ab4c6838234db5a9da1e99d8bc27875d (diff)