Wed Apr 10 00:05:35 PDT 2013

39 files changed, 620 insertions, 253 deletions

diff --git a/community/avifile/PKGBUILD b/community/avifile/PKGBUILD
index d9d575720..037d8f714 100644
--- a/community/avifile/PKGBUILD
+++ b/community/avifile/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 75654 2012-08-28 09:59:19Z spupykin $
+# $Id: PKGBUILD 87987 2013-04-09 21:29:15Z eric $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: tobias <tobias@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
@@ -30,9 +30,9 @@ build() {
  ./configure \
     --prefix=/usr \
     --mandir=$pkgdir/usr/share/man \
-    --with-qt-prefix=/opt/qt \
-    --with-qt-includes=/opt/qt/include \
-    --with-qt-libraries=/opt/qt/lib \
+    --with-qt-prefix=/usr \
+    --with-qt-includes=/usr/include/qt3 \
+    --with-qt-libraries=/usr/lib \
     --enable-oss
 
   make
diff --git a/community/botan/PKGBUILD b/community/botan/PKGBUILD
index 762a96f46..190945b06 100644
--- a/community/botan/PKGBUILD
+++ b/community/botan/PKGBUILD
@@ -1,32 +1,35 @@
-# $Id: PKGBUILD 83128 2013-01-27 16:10:24Z pierre $
-# Maintainer: Angel Velasquez <angvp@archlinux.org>
+# $Id: PKGBUILD 87983 2013-04-09 20:48:46Z arodseth $
+# Maintainer: Alexander Rødseth <rodseth@gmail.com>
+# Contributor: Angel Velasquez <angvp@archlinux.org>
 # Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
 # Contributor: d'Ronin <daronin@2600.com>
 
 pkgname=botan
-pkgver=1.10.3
+pkgver=1.10.5
 pkgrel=1
-pkgdesc="Crypto library written in C++"
+pkgdesc='Crypto library written in C++'
 license=('BSD')
-arch=('i686' 'x86_64')
-url="http://botan.randombit.net/"
+arch=('x86_64' 'i686')
+url='http://botan.randombit.net/'
 depends=('gcc-libs' 'sh')
 makedepends=('python2')
-source=(http://files.randombit.net/botan/Botan-${pkgver}.tbz{,.asc})
-sha1sums=('9f929101bf75c19432f49f57c80d2d26eec91dcb'
-          'd03b220849e3d3b3a49363a0debc266b615d9fca')
+source=("http://files.randombit.net/botan/Botan-${pkgver}.tbz")
+sha256sums=('2934c00533847dc93c485081d3ce6aae4a110151a69b587b895241159da77cf3')
 
 build() {
-  cd "${srcdir}/Botan-${pkgver}"
-  sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' configure.py
+  cd "$srcdir/Botan-$pkgver"
+
+  sed -i 's:env python:env python2:' configure.py
   ./configure.py --prefix=/usr
   make 
 }
 
 package() {
-  cd "${srcdir}/Botan-${pkgver}"
-  make DESTDIR="${pkgdir}/usr" install
-  install -D -m644 doc/license.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-  find "${pkgdir}/usr/share/doc" -type f -exec chmod 0644 {} \;
+  cd "$srcdir/Botan-$pkgver"
+
+  make DESTDIR="$pkgdir/usr" install
+  install -Dm644 doc/license.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+  find "$pkgdir/usr/share/doc" -type f -exec chmod 0644 {} \;
 }
 
+# vim:set ts=2 sw=2 et:
diff --git a/community/icewm-utils/PKGBUILD b/community/icewm-utils/PKGBUILD
index aed8df1b0..b49cbedef 100644
--- a/community/icewm-utils/PKGBUILD
+++ b/community/icewm-utils/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 58602 2011-11-16 15:27:25Z spupykin $
+# $Id: PKGBUILD 87991 2013-04-09 21:31:23Z eric $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Dominika Solarz <dominikasolarz@gmail.com>
 
@@ -50,11 +50,6 @@ md5sums=('cb2afc6efaa0f9d77b0119b29d528667'
          '5116da930c0063dd8c478dd8e473b08f')
 
 build() {
-  mkdir -p $pkgdir/usr/bin
-
-  . /etc/profile.d/qt3.sh
-  export PATH=/opt/qt/bin:$PATH
-
   cd $srcdir
   # fix default global path to IceWM
   for file in icewoed-$_woedver/qcentralwidget.cpp \
@@ -73,40 +68,43 @@ build() {
   (cd icets-$_tsver && patch -p0 <$srcdir/icets-fix-icewmtray-crash.diff)
 
   cd $srcdir/icemc-$_mcver
-  qmake
-  make
-  cp icemc $pkgdir/usr/bin/
+  qmake-qt3
+  make MOC=/usr/bin/moc-qt3 UIC=/usr/bin/uic-qt3 INCPATH+='-I/usr/include/qt3'
 
   cd $srcdir/icets-$_tsver
-  qmake
-  make
-  cp icets $pkgdir/usr/bin/
+  qmake-qt3
+  make MOC=/usr/bin/moc-qt3 UIC=/usr/bin/uic-qt3 INCPATH+='-I/usr/include/qt3'
 
   cd $srcdir/icebgset-$_bgsetver
-  qmake
-  make
-  cp icebgset $pkgdir/usr/bin/
+  qmake-qt3
+  make MOC=/usr/bin/moc-qt3 UIC=/usr/bin/uic-qt3 INCPATH+='-I/usr/include/qt3'
 
   cd $srcdir/iceked-$_kedver
-  qmake 
-  make
-  cp iceked $pkgdir/usr/bin/
+  qmake-qt3
+  make MOC=/usr/bin/moc-qt3 UIC=/usr/bin/uic-qt3 INCPATH+='-I/usr/include/qt3'
 
   cd $srcdir/icecc-$_ccver
-  qmake 
-  make
-  cp icecc $pkgdir/usr/bin/
+  qmake-qt3
+  make MOC=/usr/bin/moc-qt3 UIC=/usr/bin/uic-qt3 INCPATH+='-I/usr/include/qt3'
 
   cd $srcdir/icesndcfg-$_sndcfgver
-  qmake 
-  make
-  cp icesndcfg $pkgdir/usr/bin/
+  qmake-qt3
+  make MOC=/usr/bin/moc-qt3 UIC=/usr/bin/uic-qt3 INCPATH+='-I/usr/include/qt3'
 
   cd $srcdir/icewoed-$_woedver
-  qmake 
-  make
-  cp icewoed $pkgdir/usr/bin/
+  qmake-qt3
+  make MOC=/usr/bin/moc-qt3 UIC=/usr/bin/uic-qt3 INCPATH+='-I/usr/include/qt3'
+}
 
+package() {
+  mkdir -p $pkgdir/usr/bin
+  cp $srcdir/icemc-$_mcver/icemc $pkgdir/usr/bin/
+  cp $srcdir/icets-$_tsver/icets $pkgdir/usr/bin/
+  cp $srcdir/icebgset-$_bgsetver/icebgset $pkgdir/usr/bin/
+  cp $srcdir/iceked-$_kedver/iceked $pkgdir/usr/bin/
+  cp $srcdir/icecc-$_ccver/icecc $pkgdir/usr/bin/
+  cp $srcdir/icesndcfg-$_sndcfgver/icesndcfg $pkgdir/usr/bin/
+  cp $srcdir/icewoed-$_woedver/icewoed $pkgdir/usr/bin/
   cp $srcdir/icecursorscfg-$_cursorscfgver/icecurcfg.py $pkgdir/usr/bin/icecurcfg
   cp $srcdir/iceiconcvt-$_iconcvtver/iceiconcvt.py $pkgdir/usr/bin/iceiconcvt
   cp $srcdir/icemergeprefs-$_mergeprefsver/icemergeprefs.py $pkgdir/usr/bin/icemergeprefs
diff --git a/community/madman/PKGBUILD b/community/madman/PKGBUILD
index 22f3a5697..6cb991cff 100644
--- a/community/madman/PKGBUILD
+++ b/community/madman/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 56740 2011-10-11 17:41:27Z spupykin $
+# $Id: PKGBUILD 87994 2013-04-09 21:36:20Z eric $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Eric Belanger <belanger@astro.umontreal.ca>
 # Contributor: Hugo Ideler <hugoideler@dse.nl>
@@ -29,7 +29,6 @@ md5sums=('36e7a4619ebe83ed939c7ae09c16d535'
          '685a6fb13c861b82950dd6a77fd02120')
 
 build() {
-  . /etc/profile.d/qt3.sh
   cd $srcdir/$pkgname-$pkgver.orig
 
   patch -p1 -i $srcdir/madman_0.94beta1.20060611-2.diff
@@ -42,11 +41,17 @@ build() {
 	,build/release/designer/tsetlistview.h
   sed -i '26,1i#include <memory>' utility/base.h
   sed -i 's|python|python2|' designer/make_imagedata httpd/make_webdata doc/update_format_tag
-  cp $srcdir/fake-g++.sh ./g++
+  install -m755 $srcdir/fake-g++.sh ./g++
   export PATH=.:$PATH
 
-  scons
-  scons install_to=$pkgdir/usr prefix=/usr install
+  scons qt_directory=/usr/lib/qt3 add_c_include_dirs=/usr/include/qt3
+}
+
+package() {
+  cd $srcdir/$pkgname-$pkgver.orig
+
+  scons qt_directory=/usr/lib/qt3 add_c_include_dirs=/usr/include/qt3 \
+    install_to=$pkgdir/usr prefix=/usr install
 
   install -Dm644 $srcdir/madman_logo.png $pkgdir/usr/share/icons/madman_logo.png
   install -Dm644 $srcdir/madman_logo_mini.png $pkgdir/usr/share/icons/mini/madman_logo_mini.png
diff --git a/community/mandvd/PKGBUILD b/community/mandvd/PKGBUILD
index 4c5abc0cc..3519ac8dd 100644
--- a/community/mandvd/PKGBUILD
+++ b/community/mandvd/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 65689 2012-02-21 21:57:30Z jlichtblau $
+# $Id: PKGBUILD 87997 2013-04-09 21:40:35Z eric $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: JJDaNiMoTh <jjdanimoth.aur@gmail.com>
 # Contributor: Jesus Lazaro Plaza <jesuslazaro84@gmail.com>
@@ -12,16 +12,18 @@ url="http://www.kde-apps.org/content/show.php/ManDVD?content=83906"
 license=('GPL')
 depends=('dvd+rw-tools>=5.21.4' 'dvd-slideshow>=0.7.5' 'mjpegtools>=1.8.0' 'mplayer' 'qt3' 'xine-ui>=0.99.4')
 changelog=$pkgname.changelog
-source=(http://ftp.sh.cvut.cz/MIRRORS/vector/veclinux-7.0/source/abs/xap/$pkgname/$pkgname-$pkgver-1.fc12.tar.gz)
+source=(http://vectorlinux.osuosl.org/veclinux-7.0/source/abs/xap/$pkgname/$pkgname-$pkgver-1.fc12.tar.gz)
 sha256sums=('967fd66da31f0619001b3aaea494ab41579ab7ffdc6a1b0a51a4a4add012eb9c')
 
 build() {
   cd ${srcdir}/$pkgname-$pkgver
 
-  source /etc/profile.d/qt3.sh
-  ${QTDIR}/bin/qmake
+  qmake-qt3
   sed -i "s|O2|O1|" ./Makefile
-  make
+  sed -i 's|-I$(QTDIR)/include|-I/usr/include/qt3|' Makefile
+  sed -i '55 i\#include <unistd.h>' main.cpp
+  sed -i '28 i\#include <unistd.h>' mandvd.cpp
+  make QTDIR=/usr MOC=/usr/bin/moc-qt3 UIC=/usr/bin/uic-qt3
 }
 
 package() {
diff --git a/community/pdfedit/PKGBUILD b/community/pdfedit/PKGBUILD
index 4da652f91..b46eff23f 100644
--- a/community/pdfedit/PKGBUILD
+++ b/community/pdfedit/PKGBUILD
@@ -19,15 +19,11 @@ md5sums=('80502ee7f08cdfb867ffdaa92d160a23'
          'c0572c2dd54065322321718aa49ed6b8')
 
 build() {
-  . /etc/profile.d/qt3.sh
-  export PATH="$QTDIR/bin:$PATH"
-  export QMAKESPEC="$QTDIR/mkspecs/linux-g++"
-
   cd "${srcdir}/${pkgname}-${pkgver}"
 
   sed -i 's:/usr/share/fonts/type1/gsfonts:/usr/share/fonts/Type1:' src/xpdf/xpdf/GlobalParams.cc
-  ./configure --prefix=/usr --with-qmake=/opt/qt/bin/qmake
-  make
+  QTDIR=/usr ./configure --prefix=/usr
+  make CXXFLAGS+="-I/usr/include/qt3" MOC=/usr/bin/moc-qt3 UIC=/usr/bin/uic-qt3 QTDIR=/usr
 }
 
 package() {
diff --git a/community/qcad/PKGBUILD b/community/qcad/PKGBUILD
index 610f3b6a4..3f5c8d942 100644
--- a/community/qcad/PKGBUILD
+++ b/community/qcad/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 77657 2012-10-13 11:44:42Z allan $
+# $Id: PKGBUILD 88003 2013-04-09 21:45:04Z eric $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Stefan Husmann <stefan-husmann@t-online.de>
 # Contributor: Giovanni Scafora <linuxmania@gmail.com>
@@ -19,17 +19,14 @@ source=(http://www.ribbonsoft.com/archives/$pkgname/$pkgname-$pkgver-1-community
         QCad.desktop
         qcad-intptr.patch
         qcad.patch)
-       # http://ghost1227.com/files/misc/qm.tar.gz)
 md5sums=('96b6a56027782aec953c9c4e64c5998c'
          'da32fec0d2fb85d96126bf28bb0ab9ff'
          'b4d1eb6724b4b41f191f1ab6fd859c39'
          '92f900fe1fd3a8f841232b587b49c7da'
          '7e6779b1e3b10da1eb4daf36d93f8479')
+# http://ghost1227.com/files/misc/qm.tar.gz)
 
 build() {
-  export PATH="/opt/qt/bin:$PATH"
-  export QTDIR=/opt/qt
-
   cd ${srcdir}/${pkgname}-2.0.5.0-1-community.src
 
   [ "$CARCH" = "x86_64" ] && {
@@ -40,7 +37,11 @@ build() {
   sed -i "s:"-pedantic"::g" mkspecs/defs.pro
 
   cd scripts
-  ./build_qcad.sh notrans
+  sed -i "s|INCLUDEPATH += ../include|INCLUDEPATH += ../include /usr/include/qt3|" ../*/src/*.pro
+  sed -i "s|../../qcadlib/include|../../qcadlib/include /usr/include/qt3|" ../qcad/src/qcad.pro
+  sed -i "s/qmake/qmake-qt3/" build_qcad.sh
+  sed -i 's|eval $MAKE|sed -i "s/-lqt/-lqt-mt/" ../qcad/src/Makefile;eval $MAKE|'  build_qcad.sh
+  QTDIR=/usr/lib/qt3 ./build_qcad.sh notrans
 }
 
 package() {
diff --git a/community/qgo/PKGBUILD b/community/qgo/PKGBUILD
index 88a1c96f0..f650f97e7 100644
--- a/community/qgo/PKGBUILD
+++ b/community/qgo/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 64872 2012-02-18 19:23:28Z arodseth $
+# $Id: PKGBUILD 88006 2013-04-09 21:47:09Z eric $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Douglas Soares de Andrade <dsa@aur.archlinux.org>
 
@@ -20,10 +20,9 @@ sha256sums=('ddfb66ada7027b844838895061f266bda03b327e8dfec2ee2782e14748bac104'
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
-  . /etc/profile.d/qt3.sh
   patch -Np1 -i "$srcdir/gcc43.patch"
   patch -Np1 -i "$srcdir/gcc45.patch"
-  ./configure --prefix=/usr
+  ./configure --prefix=/usr --with-qt-includes=/usr/include/qt3
   make
 }
 
diff --git a/community/qscintilla-qt3/PKGBUILD b/community/qscintilla-qt3/PKGBUILD
index 97da30f58..257ea4fb9 100644
--- a/community/qscintilla-qt3/PKGBUILD
+++ b/community/qscintilla-qt3/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 55531 2011-09-14 07:43:04Z andrea $
+# $Id: PKGBUILD 88009 2013-04-09 21:48:46Z eric $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: red_over_blue,Ben <ben@benmazer.net>,Kritoke <kritoke@gamebox.net>
@@ -11,27 +11,22 @@ arch=('i686' 'x86_64')
 url="http://www.riverbankcomputing.co.uk/software/qscintilla/intro/"
 license=('GPL2')
 depends=('qt3')
-source=("http://www.riverbankcomputing.co.uk/static/Downloads/QScintilla1/QScintilla-1.71-gpl-$pkgver.tar.gz")
+source=("http://downloads.sourceforge.net/pyqt/QScintilla-1.71-gpl-$pkgver.tar.gz")
 md5sums=('dfa047b45d4f09ae8d4a8a431ba88a5a')
 
 build() {
-  . /etc/profile.d/qt3.sh
   cd "${srcdir}"/QScintilla-1.71-gpl-$pkgver
   cd qt
-  sed -i "s%DESTDIR.*%DESTDIR=$pkgdir/opt/qt/lib%g" qscintilla.pro
-  /opt/qt/bin/qmake qscintilla.pro
-  make
+  sed -i "s%DESTDIR.*%DESTDIR=$pkgdir/usr/lib%g" qscintilla.pro
+  qmake-qt3 qscintilla.pro
+  sed -i 's|$(QTDIR)/include|/usr/include/qt3|' Makefile
+  make MOC=/usr/bin/moc-qt3
 }
 
 package() {
   cd "${srcdir}"/QScintilla-1.71-gpl-$pkgver/qt
   # installind includes
   for i in qextscintilla*.h; do
-    install -m 644 -D $i "${pkgdir}"/opt/qt/include/$i
+    install -m 644 -D $i "${pkgdir}"/usr/include/qt3/$i
   done
-
-  #for i in qscintilla*.qm
-  #do
-  #install -m 644 -D $i "${pkgdir}"/opt/qt/translations/$i
-  #done
 }
diff --git a/community/qucs/PKGBUILD b/community/qucs/PKGBUILD
index 128762693..725db0efb 100644
--- a/community/qucs/PKGBUILD
+++ b/community/qucs/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 65495 2012-02-21 06:38:19Z spupykin $
+# $Id: PKGBUILD 88012 2013-04-09 21:50:26Z eric $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Víctor Martínez Romanos <vmromanos@gmail.com>
 
@@ -21,11 +21,14 @@ md5sums=('c916502171d422ab168fe5fc681b29d8'
 build() {
   cd $srcdir/$pkgname-$pkgver
 
-  . /etc/profile.d/qt3.sh
   export PATH=$QTDIR/bin:$PATH
 
   [ $NOEXTRACT -eq 1 ] || patch -p1 <$srcdir/qucs-gcc-4.5.1.patch
   [ $NOEXTRACT -eq 1 ] || ./configure --prefix=/usr
   make
+}
+
+package() {
+  cd $srcdir/$pkgname-$pkgver
   make DESTDIR=$pkgdir install
 }
diff --git a/community/ragel/PKGBUILD b/community/ragel/PKGBUILD
index fbff09e27..3d40c9ec9 100644
--- a/community/ragel/PKGBUILD
+++ b/community/ragel/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 60639 2011-12-16 00:03:11Z tredaelli $
+# $Id: PKGBUILD 87968 2013-04-09 16:09:00Z tredaelli $
 # Maintainer: Timothy Redaelli <timothy.redaelli@gmail.com>
 # Contributor: Michael P <ptchinster@archlinux.us>
 # Contributor: Roberto Alsina <ralsina@kde.org>
@@ -7,7 +7,7 @@
 # Contributor: Gustavo Alvarez <sl1pkn07@gmail.com>
 
 pkgname=ragel
-pkgver=6.7
+pkgver=6.8
 pkgrel=1
 pkgdesc="Compiles finite state machines from regular languages into executable C, C++, Objective-C, or D code."
 arch=('i686' 'x86_64')
@@ -15,7 +15,7 @@ url="http://www.complang.org/ragel/"
 license=('GPL')
 depends=('gcc-libs')
 source=("http://www.complang.org/$pkgname/$pkgname-$pkgver.tar.gz")
-md5sums=('f4423e0d8a6538dd4e61498fcfad3cec')
+md5sums=('1bb39745ac23da449019f9f2cb4b0d01')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
@@ -29,4 +29,3 @@ package() {
 
   make DESTDIR="$pkgdir/" install
 }
-
diff --git a/community/vyqchat/PKGBUILD b/community/vyqchat/PKGBUILD
index 9e8a0dc5a..135ff8e63 100644
--- a/community/vyqchat/PKGBUILD
+++ b/community/vyqchat/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 65377 2012-02-21 02:28:00Z spupykin $
+# $Id: PKGBUILD 88015 2013-04-09 21:51:55Z eric $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
@@ -12,10 +12,10 @@ license=('GPL')
 depends=('qt3' 'libao' 'libxi')
 source=(http://www.uic.unn.ru/~soed/programs/chat/$pkgname-$pkgver.tar.gz
 	build-fix.patch)
-md5sums=('67974bc5df1ed0d63785d04325444d4f' 'de3af70da3743c27929f04f72c837412')
+md5sums=('67974bc5df1ed0d63785d04325444d4f'
+         'de3af70da3743c27929f04f72c837412')
 
 build() {
-  . /etc/profile.d/qt3.sh
   cd $srcdir/$pkgname-${pkgver}
   patch -Np1 <../build-fix.patch
   # Use _LDADD to properly compile with --as-needed
@@ -23,7 +23,11 @@ build() {
   # Correct acinclude.m4 to avoid empty else block
   sed -i 's:# Leave bnv_qt_lib_dir defined:/bin/true:' acinclude.m4
   autoreconf -v
-  ./configure --prefix=/usr
+  ./configure --prefix=/usr --with-Qt-bin-dir=/usr/lib/qt3/bin --with-Qt-include-dir=/usr/include/qt3 --with-Qt-lib-dir=/usr/lib
   make
+}
+
+package() {
+  cd $srcdir/$pkgname-${pkgver}
   make DESTDIR=$pkgdir install
 }
diff --git a/community/xmms2/PKGBUILD b/community/xmms2/PKGBUILD
index 1d113ec48..ed4768a0a 100644
--- a/community/xmms2/PKGBUILD
+++ b/community/xmms2/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 86891 2013-03-23 23:10:55Z td123 $
+# $Id: PKGBUILD 87966 2013-04-09 15:45:48Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=xmms2
 pkgver=0.8DrO_o
-pkgrel=10
+pkgrel=11
 pkgdesc="complete rewrite of the popular music player"
 arch=('i686' 'x86_64')
 url="http://xmms2.org/"
@@ -55,7 +55,7 @@ source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz
 md5sums=('84d5c05a70bfd31ed392a4e3f701eaa3'
          'af13c937bf3c86b77ae6820107aab9b8'
          '31ab8c0980966dbe3e9f5e80b7b82612'
-         '19167aa54e4745853689abad72443b3e'
+         '47e68461589578e8a99857746c5b6f29'
          'e176971ef96807f72fa8fc17d260c20a')
 
 build() {
diff --git a/community/xmms2/xmms2d.service b/community/xmms2/xmms2d.service
index a38584df1..6adcf207f 100644
--- a/community/xmms2/xmms2d.service
+++ b/community/xmms2/xmms2d.service
@@ -5,8 +5,8 @@ After=network.target remote-fs.target nss-lookup.target
 [Service]
 Type=forking
 EnvironmentFile=/etc/conf.d/xmms2d.conf
-ExecStart=su -c '/usr/bin/xmms2-launcher $XMMS2_PARAMETERS &>/dev/null' - $XMMS2_USER
-ExecStop=su -c '/usr/bin/xmms2 quit &>/dev/null' - $XMMS2_USER
+ExecStart=/bin/su -c '/usr/bin/xmms2-launcher $XMMS2_PARAMETERS &>/dev/null' - $XMMS2_USER
+ExecStop=/bin/su -c '/usr/bin/xmms2 quit &>/dev/null' - $XMMS2_USER
 
 [Install]
 WantedBy=multi-user.target
diff --git a/community/zathura-pdf-mupdf/PKGBUILD b/community/zathura-pdf-mupdf/PKGBUILD
index f9b084b63..19bbf6f6e 100644
--- a/community/zathura-pdf-mupdf/PKGBUILD
+++ b/community/zathura-pdf-mupdf/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=zathura-pdf-mupdf
 pkgver=0.2.3
-pkgrel=1
+pkgrel=2
 pkgdesc="Adds pdf support to zathura by using the mupdf library"
 arch=('i686' 'x86_64')
 url="https://pwmt.org/projects/zathura/plugins/zathura-pdf-mupdf/"
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
diff --git a/libre/iceape-l10n/PKGBUILD b/libre/iceape-l10n/PKGBUILD
index d8fc4308a..c9f22703d 100644
--- a/libre/iceape-l10n/PKGBUILD
+++ b/libre/iceape-l10n/PKGBUILD
@@ -23,11 +23,11 @@ pkgname=($(for lang in ${_langpacks[@]}
         do echo $pkgbase-$lang | tr A-Z a-z
         done))
 pkgver=${_debver}.${_debrel}
-pkgrel=3
+pkgrel=4
 
 pkgdesc="Language packs for Debian Iceape."
-arch=('i686' 'x86_64' 'mips64el')
-url="http://packages.debian.org/source/sid/iceape"
+arch=('any')
+url="http://packages.debian.org/sid/iceape"
 license=('MPL' 'GPL')
 depends=("iceape-libre>=$pkgver")
 makedepends=('unzip' 'zip')
diff --git a/libre/iceape-libre/PKGBUILD b/libre/iceape-libre/PKGBUILD
index 1dff5d2dd..3c0d6942a 100644
--- a/libre/iceape-libre/PKGBUILD
+++ b/libre/iceape-libre/PKGBUILD
@@ -11,17 +11,17 @@ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
 _pkgname=${_debname}
 pkgname=${_debname}-libre
 pkgver=${_debver}.${_debrel}
-pkgrel=4
+pkgrel=5
 pkgdesc="A libre version of Debian Iceape, the internet suite based on SeaMonkey."
 arch=('i686' 'x86_64' 'mips64el')
 license=('MPL' 'GPL' 'LGPL')
 depends=('alsa-lib' 'dbus-glib' 'desktop-file-utils' 'gtk2' 'hunspell' 'libevent' 'libnotify' 'libvpx' 'libxt' 'mime-types' 'mozilla-common' 'mozilla-searchplugins' 'nss' 'sqlite' 'startup-notification')
 makedepends=('unzip-libre' 'zip' 'pkg-config' 'python2' 'python2-ply' 'librsvg' 'wireless_tools' 'yasm' 'mesa' 'autoconf2.13' 'quilt')
-replaces=('mozilla' 'seamonkey')
+replaces=('seamonkey')
 conflicts=('seamonkey')
 provides=('seamonkey')
 install=$_pkgname.install
-url="http://packages.debian.org/source/sid/${_pkgname}"
+url="http://packages.debian.org/sid/${_pkgname}"
 source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.bz2"
         "${_debrepo}/`debfile ${_debname}`_${_debver}-${_debrel}.debian.tar.gz"
         mozconfig
@@ -93,6 +93,9 @@ build() {
   rsvg-convert -w 128 -h 128 -o ${DEBIAN_BRANDING_DIR}/app-icons/iceape128.png ${DEBIAN_BRANDING_DIR}/iceape_icon_plain.svg
 
   cp "${srcdir}/mozconfig" .mozconfig
+  unset CPPFLAGS
+  CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=2"
+  CXXFLAGS="$CXXFLAGS -D_FORTIFY_SOURCE=2"
   make -j1 -f client.mk build MOZ_MAKE_FLAGS="${MAKEFLAGS}"
 }
 
diff --git a/libre/icedove-l10n/PKGBUILD b/libre/icedove-l10n/PKGBUILD
index fd24630fe..5b102846c 100644
--- a/libre/icedove-l10n/PKGBUILD
+++ b/libre/icedove-l10n/PKGBUILD
@@ -11,10 +11,10 @@ pkgname=($(for lang in ${_langpacks[@]}
         do echo $pkgbase-$lang | tr A-Z a-z
         done))
 
-pkgrel=1
+pkgrel=2
 pkgdesc="Language packs for Debian Icedove."
-arch=('i686' 'x86_64' 'mips64el')
-url="http://packages.debian.org/source/experimental/icedove"
+arch=('any')
+url="http://packages.debian.org/experimental/icedove"
 license=('MPL' 'GPL')
 depends=("icedove-libre>=$pkgver")
 makedepends=('unzip' 'zip')
diff --git a/libre/icedove-libre/PKGBUILD b/libre/icedove-libre/PKGBUILD
index c727fb2ce..f7962b8f5 100644
--- a/libre/icedove-libre/PKGBUILD
+++ b/libre/icedove-libre/PKGBUILD
@@ -11,11 +11,11 @@ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
 _pkgname=${_debname}
 pkgname=${_debname}-libre
 pkgver=${_debver}.${_debrel}
-pkgrel=1
+pkgrel=2
 pkgdesc="A libre version of Debian Icedove, the standalone mail/news reader based on Mozilla Thunderbird."
 arch=('i686' 'x86_64' 'mips64el')
 license=('MPL' 'GPL' 'LGPL')
-url="http://packages.debian.org/source/experimental/${_pkgname}"
+url="http://packages.debian.org/experimental/${_pkgname}"
 depends=('alsa-lib' 'dbus-glib' 'desktop-file-utils' 'gtk2' 'hicolor-icon-theme' 'hunspell' 'libevent' 'libnotify' 'libvpx' 'libxt' 'mime-types' 'mozilla-common' 'mozilla-searchplugins' 'nss' 'sqlite' 'startup-notification')
 makedepends=('unzip-libre' 'zip' 'pkg-config' 'python2' 'wireless_tools' 'yasm' 'mesa' 'autoconf2.13' 'quilt')
 optdepends=('libcanberra: for sound support')
@@ -75,6 +75,9 @@ build() {
   patch -Np1 -i "${srcdir}/Icedove-branding.patch" # debian patch fixed version
 
   cp "${srcdir}/mozconfig" .mozconfig
+  unset CPPFLAGS
+  CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=2"
+  CXXFLAGS="$CXXFLAGS -D_FORTIFY_SOURCE=2"
   make -j1 -f client.mk build MOZ_MAKE_FLAGS="${MAKEFLAGS}"
 }
 
diff --git a/libre/iceweasel-l10n/PKGBUILD b/libre/iceweasel-l10n/PKGBUILD
index af600985c..625995ecd 100644
--- a/libre/iceweasel-l10n/PKGBUILD
+++ b/libre/iceweasel-l10n/PKGBUILD
@@ -23,11 +23,11 @@ pkgname=($(for lang in ${_langpacks[@]}
         do echo $pkgbase-$lang | tr A-Z a-z
         done))
 pkgver=$_debver.$_debrel
-pkgrel=1
+pkgrel=2
 
 pkgdesc="Language packs for Debian Iceweasel."
 arch=('any')
-url="http://www.geticeweasel.org/"
+url="http://packages.debian.org/experimental/iceweasel"
 license=('MPL' 'GPL')
 depends=("iceweasel-libre>=$pkgver")
 makedepends=('unzip' 'zip')
@@ -66,9 +66,9 @@ for lang in ${_langpacks[@]}
 do
     eval "
 package_iceweasel-l10n-$(echo $lang | tr A-Z a-z)() {
-  replaces=(iceweasel-i18n-$(echo $lang | tr A-Z a-z) iceweasel-libre-l10n-$(echo $lang | tr A-Z a-z))
-  conflicts=(iceweasel-i18n-$(echo $lang | tr A-Z a-z) iceweasel-libre-l10n-$(echo $lang | tr A-Z a-z))
-  provides=(iceweasel-i18n-$(echo $lang | tr A-Z a-z) iceweasel-libre-l10n-$(echo $lang | tr A-Z a-z) firefox-i18n-$(echo $lang | tr A-Z a-z))
+  replaces=(firefox-i18n-$(echo $lang | tr A-Z a-z) iceweasel-i18n-$(echo $lang | tr A-Z a-z) iceweasel-libre-l10n-$(echo $lang | tr A-Z a-z))
+  conflicts=(firefox-i18n-$(echo $lang | tr A-Z a-z) iceweasel-i18n-$(echo $lang | tr A-Z a-z) iceweasel-libre-l10n-$(echo $lang | tr A-Z a-z))
+  provides=(firefox-i18n-$(echo $lang | tr A-Z a-z) iceweasel-i18n-$(echo $lang | tr A-Z a-z) iceweasel-libre-l10n-$(echo $lang | tr A-Z a-z))
   install -Dm644 \"\$srcdir$_path/langpack-$lang@iceweasel.mozilla.org.xpi\" \"\$pkgdir$_path/langpack-$lang@iceweasel.mozilla.org.xpi\"
 }
 "
diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD
index 6dc52a213..283d6e088 100644
--- a/libre/iceweasel-libre/PKGBUILD
+++ b/libre/iceweasel-libre/PKGBUILD
@@ -22,7 +22,7 @@ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
 _pkgname=iceweasel
 pkgname=iceweasel-libre
 pkgver=$_debver.$_debrel
-pkgrel=1
+pkgrel=2
 
 pkgdesc="A libre version of Debian Iceweasel, the standalone web browser based on Mozilla Firefox."
 arch=('i686' 'x86_64' 'mips64el')
@@ -36,8 +36,10 @@ if $_pgo; then
 fi
 
 optdepends=('networkmanager: Location detection via available WiFi networks')
-url="http://www.geticeweasel.org/"
+url="http://packages.debian.org/experimental/${_pkgname}"
 install=iceweasel.install
+replaces=('firefox')
+conflicts=('firefox')
 provides=('firefox')
 source=("$_debrepo/`debfile $_debname`_$_debver.orig.tar.bz2"
         "$_debrepo/`debfile $_debname`_$_debver-$_debrel.debian.tar.gz"
@@ -142,10 +144,16 @@ build() {
   fi
 
   if $_pgo; then
+    unset CPPFLAGS
+    export CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=2"
+    export CXXFLAGS="$CXXFLAGS -D_FORTIFY_SOURCE=2"
     LD_PRELOAD="" /usr/bin/Xvfb -nolisten tcp -extension GLX -screen 0 1280x1024x24 :99 &
     LD_PRELOAD="" DISPLAY=:99 make -j1 -f client.mk profiledbuild MOZ_MAKE_FLAGS="$MAKEFLAGS"
     kill $! || true
   else
+    unset CPPFLAGS
+    export CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=2"
+    export CXXFLAGS="$CXXFLAGS -D_FORTIFY_SOURCE=2"
     LD_PRELOAD="" make -j1 -f client.mk build MOZ_MAKE_FLAGS="$MAKEFLAGS"
   fi
 }
diff --git a/libre/kdepim-libre/PKGBUILD b/libre/kdepim-libre/PKGBUILD
index 75d81567f..07fa48b1a 100644
--- a/libre/kdepim-libre/PKGBUILD
+++ b/libre/kdepim-libre/PKGBUILD
@@ -23,7 +23,7 @@ pkgname=('kdepim-akonadiconsole-libre'
          'kdepim-ktnef-libre'
          'kdepim-libkdepim-libre')
 pkgver=4.10.2
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64' 'mips64el')
 url='http://pim.kde.org'
 license=('GPL' 'LGPL' 'FDL')
@@ -31,12 +31,15 @@ groups=('kde' 'kdepim-libre')
 makedepends=('cmake' 'automoc4' 'boost' 'kdepim-runtime' 'libxss'
              '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/libre/kdepim-libre/fix-completion.patch b/libre/kdepim-libre/fix-completion.patch
new file mode 100644
index 000000000..c2edefe00
--- /dev/null
+++ b/libre/kdepim-libre/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/pcr/xcftools/PKGBUILD b/pcr/xcftools/PKGBUILD
new file mode 100644
index 000000000..979453d24
--- /dev/null
+++ b/pcr/xcftools/PKGBUILD
@@ -0,0 +1,44 @@
+# Maintainer: Jonathan Frawley <jonathanfrawley@gmail.com>
+# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
+pkgname=xcftools
+pkgver=1.0.7
+pkgrel=1
+pkgdesc="Miscellaneous command line tools for use with the open ${pkgname::3} format used by The GIMP."
+url=http://henning.makholm.net/software
+arch=(
+  i686
+  x86_64
+  mips64el
+)
+license=(
+  GPL2
+  perl
+)
+depends=(
+  libpng
+  perl
+)
+optdepends=gimp
+makedepends=libpng
+source=(
+  http://henning.makholm.net/$pkgname/$pkgname-$pkgver.tar.gz
+  $pkgname.patch
+)
+md5sums=(
+  fd960b6470fb23520fc4b1ade6cf6e25
+  7439f6a8369a12913243ded6c93d31e1
+)
+
+build() {
+    cd $srcdir/$pkgname-$pkgver
+    patch -i ../$pkgname.patch
+    /bin/bash configure --prefix=/usr
+    setarch $CARCH make
+}
+
+package() {
+    cd $srcdir/$pkgname-$pkgver
+    setarch $CARCH make DESTDIR=$pkgdir install
+}
+
+# vim:set ts=2 sw=2 et: