Wed Apr 10 00:05:35 PDT 2013

15 files changed, 252 insertions, 133 deletions

diff --git a/extra/avahi/PKGBUILD b/extra/avahi/PKGBUILD
index a4ddb8e9e..50eed13a4 100644
--- a/extra/avahi/PKGBUILD
+++ b/extra/avahi/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 178950 2013-03-01 10:19:30Z andrea $
+# $Id: PKGBUILD 182390 2013-04-09 21:23:22Z eric $
 # Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 
@@ -45,10 +45,8 @@ 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
+	export MOC_QT3=/usr/bin/moc-qt3
+	export MOC_QT4=/usr/bin/moc-qt4
 
 	# pygtk requires python2; make it explicit in case other python are installed: FS#21865
 	PYTHON=python2 \
diff --git a/extra/kdelibs3/PKGBUILD b/extra/kdelibs3/PKGBUILD
index ff6cd1239..9f21d9a2d 100644
--- a/extra/kdelibs3/PKGBUILD
+++ b/extra/kdelibs3/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 178619 2013-02-25 20:45:02Z andyrtr $
+# $Id: PKGBUILD 182393 2013-04-09 21:34:09Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
@@ -38,7 +38,6 @@ sha1sums=('c930a25f4419134def55b8466c3a6f737227fb82'
 build() {
 	cd "$srcdir"/kdelibs-${pkgver}
 
-	. /etc/profile.d/qt3.sh
 	. "$srcdir"/kde3.profile
 
 	patch -p0 -i "$srcdir"/kde-3.5-1074156.patch
diff --git a/extra/kdepim/PKGBUILD b/extra/kdepim/PKGBUILD
index 30640ddf7..04f285b3e 100644
--- a/extra/kdepim/PKGBUILD
+++ b/extra/kdepim/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 181992 2013-04-05 08:57:03Z svenstaro $
+# $Id: PKGBUILD 182386 2013-04-09 20:40:43Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
@@ -21,7 +21,7 @@ pkgname=('kdepim-akonadiconsole'
          'kdepim-ktnef'
          'kdepim-libkdepim')
 pkgver=4.10.2
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url='http://pim.kde.org'
 license=('GPL' 'LGPL' 'FDL')
@@ -29,12 +29,15 @@ groups=('kde' 'kdepim')
 makedepends=('cmake' 'automoc4' 'boost' 'kdepim-runtime' 'libxss' 'pilot-link'
              'kde-agent' 'nepomuk-widgets')
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz"
-        "kleopatra-build-fix.patch::http://bugsfiles.kde.org/attachment.cgi?id=78592")
+        "kleopatra-build-fix.patch::http://bugsfiles.kde.org/attachment.cgi?id=78592"
+        'fix-completion.patch')
 sha1sums=('61b74cb3bf541040e09252d4dcfaea8a876a2859'
-          '61a7e31e7daee3358c442d3ac5f74171b45ae2c9')
+          '61a7e31e7daee3358c442d3ac5f74171b45ae2c9'
+          '92a44c7b1697de519b09265a3b68e7d73d4c024e')
 
 build() {
     patch -Np1 -d ${pkgbase}-${pkgver} < ${srcdir}/kleopatra-build-fix.patch
+    patch -Np1 -d ${pkgbase}-${pkgver} < ${srcdir}/fix-completion.patch
 
 	mkdir build
 	cd build
diff --git a/extra/kdepim/fix-completion.patch b/extra/kdepim/fix-completion.patch
new file mode 100644
index 000000000..c2edefe00
--- /dev/null
+++ b/extra/kdepim/fix-completion.patch
@@ -0,0 +1,182 @@
+commit 6a06c57f52a00018d607085efa7570deb91dc707
+Author: David Faure <faure@kde.org>
+Date:   Mon Apr 8 17:41:39 2013 +0200
+
+    Fix kmail autocompletion from akonadi.
+    
+    My commit 02f5f0214e made autocompletion from nepomuk work better, but broke
+    completion from akonadi. I kept the "keywords" based code, but now it's only
+    used for the special case of nickname-based search (because the nickname shouldn't
+    appear in the completion item). For everything else it really doesn't make sense
+    to have a search engine (akonadi/nepomuk) on top of a search engine
+    (the one inside KCompletion).
+    
+    This time I verified that:
+    * nepomuk search still works
+    * contacts from akonadi work again
+    * contact groups from akonadi work (after previous commit)
+    * nickname-search in akonadi still doesn't work, but it didn't before. More work
+    needed for that one. This is the only reason to keep KMailCompletion around btw,
+    everything else would work without it.
+    
+    BUG: 259949
+    FIXED-IN: 4.10.3
+
+diff --git a/libkdepim/addresseelineedit.cpp b/libkdepim/addresseelineedit.cpp
+index b7b11be..ec4caf9 100644
+--- a/libkdepim/addresseelineedit.cpp
++++ b/libkdepim/addresseelineedit.cpp
+@@ -30,6 +30,8 @@
+ #include "completionordereditor.h"
+ #endif
+ 
++#include "kmailcompletion.h"
++
+ #include <Akonadi/Contact/ContactSearchJob>
+ #include <Akonadi/Contact/ContactGroupSearchJob>
+ #include <Akonadi/CollectionFetchJob>
+@@ -77,6 +79,10 @@
+ 
+ using namespace KPIM;
+ 
++namespace KPIM {
++  typedef QMap< QString, QPair<int,int> > CompletionItemsMap;
++}
++
+ class AddresseeLineEditStatic
+ {
+   public:
+@@ -496,11 +502,9 @@ void AddresseeLineEdit::Private::addCompletionItem( const QString &string, int w
+     s_static->completionItemMap.insert( string, qMakePair( weight, completionItemSource ) );
+   }
+ 
+-  if ( keyWords == 0 ) {
+-    s_static->completion->addItem( string, weight );
+-  } else {
+-    s_static->completion->addItemWithKeys( string, weight, keyWords );
+-  }
++  s_static->completion->addItem(string, weight);
++  if (keyWords && !keyWords->isEmpty())
++    s_static->completion->addItemWithKeys(string, weight, keyWords); // see kmailcompletion.cpp
+ }
+ 
+ const QStringList KPIM::AddresseeLineEdit::Private::adjustedCompletionItems( bool fullSearch )
+@@ -1348,17 +1352,13 @@ void AddresseeLineEdit::addItem( const Akonadi::Item &item, int weight, int sour
+ void AddresseeLineEdit::addContactGroup( const KABC::ContactGroup &group, int weight, int source )
+ {
+   d->addCompletionItem( group.name(), weight, source );
+-  QStringList keyWords;
+-  keyWords.append( group.name() );
+-  d->addCompletionItem( group.name(), weight, source, &keyWords );
+ }
+ 
+ void AddresseeLineEdit::addContact( const KABC::Addressee &addr, int weight, int source )
+ {
+   const QStringList emails = addr.emails();
+   QStringList::ConstIterator it;
+-  const int prefEmailWeight = 1;     //increment weight by prefEmailWeight
+-  int isPrefEmail = prefEmailWeight; //first in list is preferredEmail
++  int isPrefEmail = 1; //first in list is preferredEmail
+   QStringList::ConstIterator end( emails.constEnd() );
+   for ( it = emails.constBegin(); it != end; ++it ) {
+     //TODO: highlight preferredEmail
+@@ -1368,40 +1368,6 @@ void AddresseeLineEdit::addContact( const KABC::Addressee &addr, int weight, int
+     const QString nickName  = addr.nickName();
+     QString fullEmail       = addr.fullEmail( email );
+ 
+-    // Prepare keywords (for CompletionShell, CompletionPopup)
+-    QStringList keyWords;
+-    const QString realName  = addr.realName();
+-
+-    if ( !givenName.isEmpty() && !familyName.isEmpty() ) {
+-      keyWords.append( givenName  + QLatin1Char( ' ' ) + familyName );
+-      keyWords.append( familyName + QLatin1Char( ' ' ) + givenName );
+-      keyWords.append( familyName + QLatin1String( ", " ) + givenName );
+-    } else if ( !givenName.isEmpty() ) {
+-      keyWords.append( givenName );
+-    } else if ( !familyName.isEmpty() ) {
+-      keyWords.append( familyName );
+-    }
+-
+-    if ( !nickName.isEmpty() ) {
+-      keyWords.append( nickName );
+-    }
+-
+-    if ( !realName.isEmpty() ) {
+-      keyWords.append( realName );
+-    }
+-
+-    keyWords.append( email );
+-
+-    /* KMailCompletion does not have knowledge about identities, it stores emails and
+-     * keywords for each email. KMailCompletion::allMatches does a lookup on the
+-     * keywords and returns an ordered list of emails. In order to get the preferred
+-     * email before others for each identity we use this little trick.
+-     * We remove the <blank> in adjustedCompletionItems.
+-     */
+-    if ( isPrefEmail == prefEmailWeight ) {
+-      fullEmail.replace( QLatin1String( " <" ), QLatin1String( "  <" ) );
+-    }
+-
+     // Prepare "givenName" + ' ' + "familyName"
+     QString fullName = givenName;
+     if (!familyName.isEmpty()) {
+@@ -1413,12 +1379,16 @@ void AddresseeLineEdit::addContact( const KABC::Addressee &addr, int weight, int
+     // Finally, we can add the completion items
+     if (!fullName.isEmpty()) {
+       const QString address = KPIMUtils::normalizedAddress(fullName, email, QString());
+-      d->addCompletionItem(address, weight + isPrefEmail, source, &keyWords);
++      if (fullEmail != address) {
++        // This happens when fullEmail contains a middle name, while our own fullName+email only has "first last".
++        // Let's offer both, the fullEmail with 3 parts, looks a tad formal.
++        d->addCompletionItem(address, weight + isPrefEmail, source);
++      }
+     }
+ 
+-    if ( !nickName.isEmpty() ) {
+-      const QString address = KPIMUtils::normalizedAddress(nickName, email, QString());
+-      d->addCompletionItem(address, weight + isPrefEmail, source, &keyWords);
++    QStringList keyWords;
++    if (!nickName.isEmpty()) {
++      keyWords.append(nickName);
+     }
+ 
+     d->addCompletionItem( fullEmail, weight + isPrefEmail, source, &keyWords );
+diff --git a/libkdepim/addresseelineedit.h b/libkdepim/addresseelineedit.h
+index 4e6784b..b2af4a9 100644
+--- a/libkdepim/addresseelineedit.h
++++ b/libkdepim/addresseelineedit.h
+@@ -27,7 +27,6 @@
+ #ifndef KDEPIM_ADDRESSEELINEEDIT_H
+ #define KDEPIM_ADDRESSEELINEEDIT_H
+ 
+-#include "kmailcompletion.h"
+ #include "kdepim_export.h"
+ 
+ #include "ldap/ldapclient.h"
+@@ -50,10 +49,6 @@ namespace KABC {
+   class ContactGroup;
+ }
+ 
+-namespace KPIM {
+-  typedef QMap< QString, QPair<int,int> > CompletionItemsMap;
+-}
+-
+ namespace Nepomuk2 {
+   namespace Query {
+     class Result;
+diff --git a/libkdepim/kmailcompletion.h b/libkdepim/kmailcompletion.h
+index e8574cc..93771d3 100644
+--- a/libkdepim/kmailcompletion.h
++++ b/libkdepim/kmailcompletion.h
+@@ -32,7 +32,9 @@ namespace KPIM {
+ 
+ /**
+  * KMailCompletion allows lookup of email addresses by keyword.
+- * Typically a keywods would be firstname, lastname, nickname or domain.
++ * This is used for lookup by nickname, since we don't want the nickname to appear in the final email.
++ * E.g. you have a nickname "idiot" for your boss, you want to type "idiot" but you want the completion
++ * to offer "Full Name <email@domain>", without the nickname being visible.
+  */
+ class KMailCompletion : public KCompletion
+ {
diff --git a/extra/libpng/PKGBUILD b/extra/libpng/PKGBUILD
index 7e6d62bde..40e363a68 100644
--- a/extra/libpng/PKGBUILD
+++ b/extra/libpng/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 178758 2013-02-26 18:11:18Z ioni $
+# $Id: PKGBUILD 182372 2013-04-09 18:14:06Z ioni $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: dorphell <dorphell@archlinux.org>
 # Contributor: Travis Willard <travis@archlinux.org>
 # Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
 
 pkgname=libpng
-pkgver=1.5.14
-_apngver=1.5.14
+pkgver=1.5.15
+_apngver=1.5.15
 pkgrel=1
 pkgdesc="A collection of routines used to create PNG format graphics files"
 arch=('i686' 'x86_64')
@@ -16,8 +16,8 @@ depends=('zlib' 'sh')
 options=('!libtool')
 source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.xz"
         "http://downloads.sourceforge.net/sourceforge/libpng-apng/libpng-$_apngver-apng.patch.gz")
-md5sums=('94284b01d62ca43c5eb3f6702db08ed8'
-         '89fbc11f19ec1f181587bdde1dd9402f')
+md5sums=('e3122e7b5b5c36c034a4624c65f8a9d8'
+         '3ae9ea7e4bd201f0b25e25cd6049b094')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/libva-intel-driver/PKGBUILD b/extra/libva-intel-driver/PKGBUILD
index daebd5ba6..e822af1bc 100644
--- a/extra/libva-intel-driver/PKGBUILD
+++ b/extra/libva-intel-driver/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 170694 2012-11-09 19:58:58Z ibiru $
+# $Id: PKGBUILD 182376 2013-04-09 18:36:11Z ioni $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 
 pkgname=libva-intel-driver
-pkgver=1.0.19
+pkgver=1.0.20
 pkgrel=1
 pkgdesc="VA-API implementation for Intel G45 chipsets and Intel HD Graphics for Intel Core processor family."
 arch=('i686' 'x86_64')
@@ -12,11 +12,11 @@ depends=('libva')
 options=('!libtool')
 replaces=('libva-driver-intel')
 source=(http://www.freedesktop.org/software/vaapi/releases/$pkgname/$pkgname-$pkgver.tar.bz2)
-sha1sums=('9b1c92ca2b59b3b150fd45cb01775e0c114a41a7')
+sha1sums=('0aeba2d78f02c4f2c13b519c468e04fa88b2ae3e')
 
 build() {
   cd $pkgname-$pkgver
-  ./autogen.sh --prefix=/usr
+  ./configure --prefix=/usr
   make
 }
 
diff --git a/extra/libva/PKGBUILD b/extra/libva/PKGBUILD
index 2922dc84a..7781d7219 100644
--- a/extra/libva/PKGBUILD
+++ b/extra/libva/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 168381 2012-10-09 16:30:41Z ibiru $
+# $Id: PKGBUILD 182375 2013-04-09 18:35:29Z ioni $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 
 pkgname=libva
-pkgver=1.1.0
-pkgrel=2
+pkgver=1.1.1
+pkgrel=1
 pkgdesc="Video Acceleration (VA) API for Linux"
 arch=('i686' 'x86_64')
 url="http://freedesktop.org/wiki/Software/vaapi"
@@ -14,7 +14,7 @@ optdepends=('libva-vdpau-driver: vdpau back-end for nvidia'
             'libva-intel-driver: back-end for intel cards')
 options=('!libtool')
 source=(http://www.freedesktop.org/software/vaapi/releases/$pkgname/$pkgname-$pkgver.tar.bz2)
-sha1sums=('af6e912ea86a6378992f5783390ab9cb8e5cadf9')
+sha1sums=('755e488677a196c9ac18b8c0d11aa2a56e050306')
 
 build() {
   cd "$pkgname-$pkgver"
diff --git a/extra/live-media/PKGBUILD b/extra/live-media/PKGBUILD
index 105be2a57..257230350 100644
--- a/extra/live-media/PKGBUILD
+++ b/extra/live-media/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 182095 2013-04-06 19:27:44Z giovanni $
+# $Id: PKGBUILD 182366 2013-04-09 15:06:58Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Gilles CHAUVIN <gcnweb@gmail.com>
 
 pkgname=live-media
-pkgver=2013.04.06
+pkgver=2013.04.08
 pkgrel=1
 pkgdesc="A set of C++ libraries for multimedia streaming"
 arch=('i686' 'x86_64')
@@ -11,7 +11,7 @@ license=('LGPL')
 url="http://live555.com/liveMedia"
 depends=('gcc-libs')
 source=("http://live555.com/liveMedia/public/live.${pkgver}.tar.gz")
-md5sums=('1cd8e5181a1ddd29537cb16ad3cb0138')
+md5sums=('25ff9f7bf9e47c699878e58c7789ee13')
 
 build() {
   cd ${srcdir}/live
diff --git a/extra/mtr/PKGBUILD b/extra/mtr/PKGBUILD
index 5e29706a8..48c359a20 100644
--- a/extra/mtr/PKGBUILD
+++ b/extra/mtr/PKGBUILD
@@ -1,30 +1,25 @@
-# $Id: PKGBUILD 178764 2013-02-26 18:56:25Z ioni $
+# $Id: PKGBUILD 182370 2013-04-09 18:07:19Z ioni $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
 
 pkgbase=mtr
 pkgname=(mtr mtr-gtk)
-pkgver=0.83
+pkgver=0.84
 pkgrel=1
 arch=('i686' 'x86_64')
 license=('GPL')
 makedepends=('ncurses' 'gtk2')
-source=(ftp://ftp.bitwizard.nl/mtr/$pkgbase-$pkgver.tar.gz
-        mtr-glib2.patch)
+source=(ftp://ftp.bitwizard.nl/mtr/$pkgbase-$pkgver.tar.gz)
 url="http://www.bitwizard.nl/mtr/"
-md5sums=('2e3a40f2da47748ad0053a5d678b9b4a'
-         '6bce08e1de7c6835bdda893847981bc8')
+md5sums=('df61096ae1b18b27f915feeb907ae48c')
 
 build() {
-    patch -Np0 -i mtr-glib2.patch
     cp -r  $pkgbase-$pkgver $pkgbase-cli
     cd mtr-cli
-    ./bootstrap.sh
     ./configure --prefix=/usr --without-gtk
     make
 
     cd "$srcdir/$pkgbase-$pkgver"
-    ./bootstrap.sh
     ./configure --prefix=/usr
     make
 }
diff --git a/extra/mtr/mtr-glib2.patch b/extra/mtr/mtr-glib2.patch
deleted file mode 100644
index 76a53fa6f..000000000
--- a/extra/mtr/mtr-glib2.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -up mtr-0.83/configure.in.glib2 mtr-0.83/configure.in
---- mtr-0.83/configure.in.glib2	2013-02-18 20:10:00.767417356 +0100
-+++ mtr-0.83/configure.in	2013-02-18 20:10:53.549513018 +0100
-@@ -59,6 +59,8 @@ else
- 	GTK_OBJ=""
- fi
- 
-+PKG_CHECK_MODULES([GLIB2], [glib-2.0])
-+
- AC_CHECK_FUNC(socket, , 
-   AC_CHECK_LIB(socket, socket, , AC_MSG_ERROR(No socket library found)))
- 
-diff -up mtr-0.83/Makefile.am.glib2 mtr-0.83/Makefile.am
---- mtr-0.83/Makefile.am.glib2	2013-02-18 20:13:54.635841512 +0100
-+++ mtr-0.83/Makefile.am	2013-02-18 20:16:17.877101679 +0100
-@@ -19,8 +19,9 @@ mtr_SOURCES = mtr.c \
-               mtr-gtk.h
- EXTRA_mtr_SOURCES = curses.c \
-                     gtk.c
-+AM_CFLAGS = $(GLIB2_CFLAGS)
- mtr_DEPENDENCIES = $(GTK_OBJ) $(CURSES_OBJ)
--mtr_LDFLAGS = $(GTK_OBJ) $(CURSES_OBJ)
-+mtr_LDFLAGS = $(GTK_OBJ) $(GLIB2_LIBS) $(CURSES_OBJ)
- 
- EXTRA_DIST = SECURITY mtr.8 Makefile Makefile.dist
- distclean-local:
diff --git a/extra/nspr/PKGBUILD b/extra/nspr/PKGBUILD
index 07dc4d298..f5174d07f 100644
--- a/extra/nspr/PKGBUILD
+++ b/extra/nspr/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 178768 2013-02-26 20:04:47Z ioni $
+# $Id: PKGBUILD 182378 2013-04-09 18:38:44Z ioni $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Alexander Baldeck <alexander@archlinux.org>
 pkgname=nspr
-pkgver=4.9.5
+pkgver=4.9.6
 pkgrel=1
 pkgdesc="Netscape Portable Runtime"
 arch=(i686 x86_64)
@@ -13,7 +13,7 @@ makedepends=('zip')
 options=(!emptydirs)
 source=(ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${pkgver}/src/${pkgname}-${pkgver}.tar.gz
         nspr.pc.in)
-md5sums=('b6ccfa8fcbbeb17ebeb19a3edff612bd'
+md5sums=('62b1e9d376d503d972f90c3c0031d879'
          'bce1611f3117b53fc904cab549c09967')
 
 build() {
diff --git a/extra/orc/PKGBUILD b/extra/orc/PKGBUILD
index dcdde8be1..24f5ab35f 100644
--- a/extra/orc/PKGBUILD
+++ b/extra/orc/PKGBUILD
@@ -1,7 +1,7 @@
-# $Id: PKGBUILD 149305 2012-02-06 18:30:33Z ibiru $
+# $Id: PKGBUILD 182380 2013-04-09 18:42:44Z ioni $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 pkgname=orc
-pkgver=0.4.16
+pkgver=0.4.17
 pkgrel=1
 pkgdesc="The Oild Runtime Compiler"
 arch=('i686' 'x86_64')
@@ -10,7 +10,7 @@ url="http://code.entropywave.com/projects/orc/"
 depends=('glibc')
 options=('!libtool')
 source=(http://code.entropywave.com/download/$pkgname/$pkgname-$pkgver.tar.gz)
-md5sums=('e482932e544c847761449b106ecbc483')
+md5sums=('af1bf3dab9e69f3c36f389285e2a12a1')
 
 build () {
     cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/qt3/PKGBUILD b/extra/qt3/PKGBUILD
index cf8e4d40a..e4b057141 100644
--- a/extra/qt3/PKGBUILD
+++ b/extra/qt3/PKGBUILD
@@ -1,25 +1,25 @@
-# $Id: PKGBUILD 180688 2013-03-25 19:15:40Z bpiotrowski $
+# $Id: PKGBUILD 182387 2013-04-09 21:20:53Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=qt3
 pkgver=3.3.8b
-pkgrel=3
+pkgrel=4
 epoch=1
-pkgdesc="The QT3 gui toolkit"
+pkgdesc="A cross-platform application and UI framework"
 arch=('i686' 'x86_64')
 url="http://www.trolltech.com/products/qt/index.html"
 license=('GPL')
 depends=('libpng' 'libxmu' 'libxcursor' 'libxinerama' 'glu' 'libxft'
          'libxrandr' 'libmng')
 makedepends=('mariadb' 'postgresql' 'unixodbc' 'sqlite' 'mesa')
-optdepends=('libmariadbclient' 'postgresql-libs' 'unixodbc')
-options=('!libtool')
-install=qt.install
+optdepends=('libmariadbclient: MariaDB driver'
+            'postgresql-libs: PostgreSQL driver'
+            'unixodbc: ODBC driver')
+options=('!libtool' '!docs')
 source=(ftp://ftp.qt-project.org/qt/source/qt-x11-free-${pkgver}.tar.gz
-        qt.profile qt3-png15.patch qt-copy-kde-patches.tar.bz2 qt-patches.tar.bz2
+        qt3-png15.patch qt-copy-kde-patches.tar.bz2 qt-patches.tar.bz2
         eastern_asian_languagues.diff qt-odbc.patch gcc-4.6.patch)
 sha1sums=('745def6250dc7f337dbb265e20bf38dcb41fd854'
-          'd2e257a9011208b2cb81b9cf47915b9a2f9dab83'
           '3d19510c46016a1a211d97bf8f82b01498b1b33c'
           '33418e5b117458af23c72cdbffc0c339bc34bdc4'
           '116afa0e737bdf27ea27f9b3653aeb56db9ec151'
@@ -31,11 +31,11 @@ sha1sums=('745def6250dc7f337dbb265e20bf38dcb41fd854'
 # other qt-patches come from fedora and gentoo
 
 build() {
-  unset QMAKESPEC
   export QTDIR="${srcdir}"/qt-x11-free-${pkgver}
   export PATH=${QTDIR}/bin:${PATH}
   export LD_LIBRARY_PATH=${QTDIR}/lib:${LD_LIBRARY_PATH}
   export QMAKESPEC=$QTDIR/mkspecs/linux-g++
+
   cd "${srcdir}"/qt-x11-free-${pkgver}
   # apply qt patches from kde.org
   for i in ../qt-copy-kde-patches/*; do
@@ -51,27 +51,25 @@ build() {
   patch -p1 -i "${srcdir}"/qt-odbc.patch 
   # fix build with gcc 4.6.0
   patch -p1 -i "${srcdir}"/gcc-4.6.patch
-
   patch -p0 -i "${srcdir}"/qt3-png15.patch 
-  # start compiling qt
-  sed -i 's|-cp -P -f|-cp -L -f|' qmake/Makefile.unix
-  rm -rf doc/html examples tutorial
-  sed -i "s|sub-tutorial sub-examples||" Makefile
-  sed -i "s|-O2|$CXXFLAGS|" mkspecs/linux-g++/qmake.conf
-  sed -i "s|-O2|$CXXFLAGS|" mkspecs/linux-g++-32/qmake.conf
-  sed -i "s|-O2|$CXXFLAGS|" mkspecs/linux-g++-64/qmake.conf
+ 
+  sed -i "s|-O2|$CXXFLAGS|" mkspecs/linux-g++{,-32,-64}/qmake.conf
   sed -i "s|-I. |$CXXFLAGS -I. |" qmake/Makefile.unix
   sed -i "s|read acceptance|acceptance=yes|" configure
 
- # remove unwanted mkspecs
-  rm -rf mkspecs/{*aix*,*bsd*,cygwin*,dgux*,darwin*,hpux*,hurd*,irix*,lynxos*,macx*,qnx*,reliant*,sco*,solaris*,tru64*,unixware*,win32*}
-
   if [ "$CARCH" = "x86_64" ]; then
       export ARCH="-64"	
     else unset ARCH
   fi
 
-  ./configure -prefix /opt/qt \
+  ./configure \
+    -prefix /usr \
+    -bindir /usr/lib/qt3/bin \
+    -headerdir /usr/include/qt3 \
+    -plugindir /usr/lib/qt3/plugins \
+    -datadir /usr/share/qt3 \
+    -translationdir /usr/share/qt3/translations \
+    -I/usr/include/mysql -I/usr/include/postgresql/server \
     -platform linux-g++$ARCH \
     -system-zlib \
     -qt-gif \
@@ -85,40 +83,26 @@ build() {
     -no-g++-exceptions \
     -plugin-sql-{mysql,psql,sqlite,odbc}
 
-  # fix /opt/qt/lib path
-  [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" "${srcdir}"/qt-x11-free-${pkgver}/src/Makefile
-  [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" "${srcdir}"/qt-x11-free-${pkgver}/tools/designer/designer/Makefile
-  [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" "${srcdir}"/qt-x11-free-${pkgver}/tools/designer/editor/Makefile
-  [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" "${srcdir}"/qt-x11-free-${pkgver}/tools/assistant/lib/Makefile
-  [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" "${srcdir}"/qt-x11-free-${pkgver}/tools/designer/uilib/Makefile
-
-  cd "${srcdir}"/qt-x11-free-${pkgver}
-  make -C qmake 
-  cd "${srcdir}"/qt-x11-free-${pkgver}/plugins/src/sqldrivers/mysql
-  "${srcdir}"/qt-x11-free-${pkgver}/bin/qmake -o Makefile "INCPATH+=/usr/include/mysql" "LIBS+=-L/usr/lib/mysql -lmysqlclient" mysql.pro
-  cd "${srcdir}"/qt-x11-free-${pkgver}/plugins/src/sqldrivers/psql
-  "${srcdir}"/qt-x11-free-${pkgver}/bin/qmake -o Makefile "INCPATH+=/usr/src/include /usr/include/postgresql/server" "LIBS+=-L/usr/lib -lpq" psql.pro
-
-  cd "${srcdir}"/qt-x11-free-${pkgver}
-  # fix the broken makefiles
-  #sed -i 's|[[:space:]]*strip.*doc/html.*$|#|g' src/Makefile
   make
 }
 
 package() {
   cd "${srcdir}"/qt-x11-free-${pkgver}
   make INSTALL_ROOT="${pkgdir}" install
-  rm -rf "${pkgdir}"/opt/qt/{phrasebooks,templates,translations}
-  sed -i "s|-L${srcdir}/qt-x11-free-${pkgver}/lib ||g" "${pkgdir}"/opt/qt/lib/*.prl
-  install -D -m755 qmake/qmake "${pkgdir}"/opt/qt/bin/qmake
-  install -D -m755 "${srcdir}"/qt.profile "${pkgdir}"/etc/profile.d/qt3.sh
-  ln -sf /opt/qt/bin/qtconfig "${pkgdir}"/opt/qt/bin/qt3config 
-  rm -f "${pkgdir}"/opt/qt/mkspecs/linux-g++$ARCH/linux-g++$ARCH
+  sed -i -e "s|-L${srcdir}/qt-x11-free-${pkgver}/lib ||g" -e "s|${srcdir}/||g" "${pkgdir}"/usr/lib/*.prl
+  rm -rf "${pkgdir}"/usr/share/qt3/{phrasebooks,templates,translations}
+  rm -rf "${pkgdir}"/usr/share/qt3/mkspecs/{aix*,*bsd*,cygwin*,dgux*,darwin*,hpux*,hurd*,irix*,linux-g++$ARCH/linux-g++$ARCH,lynxos*,macx*,qnx*,reliant*,sco*,solaris*,tru64*,unixware*,win32*} 
 
-  # install man pages
-  install -d -m755 "${pkgdir}"/opt/qt/man
-  cp -r "${srcdir}"/qt-x11-free-${pkgver}/doc/man/{man1,man3} "${pkgdir}"/opt/qt/man/
+# install man pages
+  install -d -m755 "${pkgdir}"/usr/share/man
+  cp -r "${srcdir}"/qt-x11-free-${pkgver}/doc/man/{man1,man3} "${pkgdir}"/usr/share/man/
+  for i in "${pkgdir}"/usr/share/man/man1/*; do
+    mv $i ${i%.*}-qt3.1
+  done
 
-  install -d -m755 "${pkgdir}"/etc/ld.so.conf.d/
-  echo '/opt/qt/lib' > "${pkgdir}"/etc/ld.so.conf.d/qt3.conf
+# Useful symlinks for cmake and configure scripts
+  install -d "${pkgdir}"/usr/bin
+  for b in "${pkgdir}"/usr/lib/qt3/bin/*; do
+    ln -s /usr/lib/qt3/bin/$(basename $b) "${pkgdir}"/usr/bin/$(basename $b)-qt3
+  done
 }
diff --git a/extra/qt3/qt.install b/extra/qt3/qt.install
deleted file mode 100644
index 6d042daae..000000000
--- a/extra/qt3/qt.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	post_remove
-}
-
-post_upgrade() {
-	post_remove
-}
-
-post_remove() {
-	# this can be removed in future versions
-	sed  -e '/\/opt\/qt\/lib/d' -i etc/ld.so.conf
-}
diff --git a/extra/qt3/qt.profile b/extra/qt3/qt.profile
deleted file mode 100644
index ed4d232ae..000000000
--- a/extra/qt3/qt.profile
+++ /dev/null
@@ -1,4 +0,0 @@
-export QTDIR=/opt/qt
-export QT_XFT=true
-export PATH=$PATH:$QTDIR/bin
-export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/opt/qt/lib/pkgconfig