Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts: extra/cinepaint/PKGBUILD extra/cmake/PKGBUILD extra/fltk/PKGBUILD extra/foomatic/PKGBUILD extra/kdegraphics/PKGBUILD extra/kdelibs/PKGBUILD extra/kdepim-runtime/PKGBUILD extra/kdepim/PKGBUILD extra/libxi/PKGBUILD extra/monica/PKGBUILD extra/rasqal/PKGBUILD extra/soprano/PKGBUILD multilib/wine/PKGBUILD testing/mesa/PKGBUILD
author: Nicolas Reynolds <fauno@kiwwwi.com.ar> 2011-07-09 20:52:21 -0300
committer: Nicolas Reynolds <fauno@kiwwwi.com.ar> 2011-07-09 20:52:21 -0300
commit: aabab2c530c33c1beb40ac3dacb95e19ab99eac3 (patch)
tree: 1417c10b601a05725676a727a25901a32e7fd94c /extra
parent: 3357db80ffa8a795fb5cdad0fc726470887706b0 (diff)
parent: d1e588afc2779754c0abd1122ecf4f8e3c863d7a (diff)
67 files changed, 709 insertions, 458 deletions
diff --git a/extra/bind/PKGBUILD b/extra/bind/PKGBUILD
index 3be95aabe..b6e6ea92e 100644
--- a/extra/bind/PKGBUILD
+++ b/extra/bind/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 125623 2011-05-27 08:34:32Z bisson $
+# $Id: PKGBUILD 130507 2011-07-07 02:35:18Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 # Contributor: Mario Vazquez <mario_vazq@hotmail.com>
@@ -6,8 +6,8 @@
 pkgname=bind
 
 # Use a period and not a hyphen before the patch level for proper versioning.
-pkgver=9.8.0.P2
-_pkgver=9.8.0-P2
+pkgver=9.8.0.P4
+_pkgver=9.8.0-P4
 pkgrel=1
 
 pkgdesc='Berkeley Internet Name Daemon (BIND) is the reference implementation of the Domain Name System (DNS) protocols'
@@ -30,8 +30,8 @@ source=("http://ftp.isc.org/isc/bind9/${_pkgver}/${pkgname}-${_pkgver}.tar.gz"
         'named.logrotate'
         'localhost.zone'
         '127.0.0.zone')
-sha1sums=('b3492ad11cfbf2939d9b0fb62c52c204de58679b'
-          'ee52947062c1582858187716b776afa3613608fb'
+sha1sums=('969864200c1516a8bea54266de60f316d79182b4'
+          'cbdecd1ea8e7b612b33b63d66bc57273795d1f54'
           'b433ba99f23e3db305f8ce293fe4ce6d1b8d4cfb'
           '17444f9d759a4bde7688bdaa304dac57a138e4c1'
           '46232e9db243c6c05e170a1781d7a7f413be5d03'
diff --git a/extra/blender/PKGBUILD b/extra/blender/PKGBUILD
index fca057768..4959644e2 100644
--- a/extra/blender/PKGBUILD
+++ b/extra/blender/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 128410 2011-06-23 22:00:17Z eric $
+# $Id: PKGBUILD 130835 2011-07-08 08:34:11Z eric $
 # Contributor: John Sowiak <john@archlinux.org>
 # Maintainer: tobias <tobias@archlinux.org>
 
@@ -8,13 +8,13 @@
 # look for release numbers only we make a messy PKGBUILD that can checkout svn
 # release if necessary.
 
-#_svn=true
-_svn=false
+_svn=true
+#_svn=false
 
 pkgname=blender
-pkgver=2.58
+pkgver=2.58a
 pkgrel=1
-epoch=1
+epoch=2
 pkgdesc="A fully integrated 3D graphics creation suite"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
@@ -25,16 +25,16 @@ depends=('libpng' 'libtiff' 'openexr' 'python' 'desktop-file-utils' \
 makedepends=('cmake') # 'subversion'
 install=blender.install
 if [ $_svn = false ]; then
-  source=(http://download.blender.org/source/$pkgname-$pkgver.tgz blender-ffmpeg.diff)
-  md5sums=('04a0d43ff27aa0abf14ca559f6a6bf67' 'ed36bab11bfc87864fe0cadf0de5d98f')
+  source=(http://download.blender.org/source/$pkgname-$pkgver.tgz)
+  md5sums=('04a0d43ff27aa0abf14ca559f6a6bf67')
 else
   source=(ftp://ftp.archlinux.org/other/${pkgname}/$pkgname-$pkgver.tar.xz)
-  md5sums=('59e344d4ec48750a86e4ef079c3acbfc')
+  md5sums=('7579d1139d0d6025df8afcfca64a65c4')
 fi
 
 # source PKGBUILD && mksource
 mksource() {
-  _svnver=36339
+  _svnver=38016
   _svntrunk="https://svn.blender.org/svnroot/bf-blender/trunk/blender"
   _svnmod="$pkgname-$pkgver"
   mkdir ${pkgname}-$pkgver
@@ -47,7 +47,6 @@ mksource() {
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
-  patch -p0 -i ../blender-ffmpeg.diff
   mkdir build
   cd build
 
diff --git a/extra/bluez/PKGBUILD b/extra/bluez/PKGBUILD
index 4e49a3024..0df0e4187 100644
--- a/extra/bluez/PKGBUILD
+++ b/extra/bluez/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 127566 2011-06-16 15:50:23Z andrea $
+# $Id: PKGBUILD 130704 2011-07-07 21:27:00Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Geoffroy Carrier <geoffroy@archlinux.org>
 
 pkgname=bluez
-pkgver=4.94
+pkgver=4.95
 pkgrel=1
 pkgdesc="Libraries and tools for the Bluetooth protocol stack"
 url="http://www.bluez.org/"
@@ -27,7 +27,7 @@ backup=(etc/bluetooth/{main,rfcomm,audio,network,input,serial}.conf
 source=("http://www.kernel.org/pub/linux/bluetooth/${pkgname}-${pkgver}.tar.bz2"
         'bluetooth.conf.d'
         'rc.bluetooth')
-md5sums=('1b599892f4c71c0ab6cf0ed4d3cb226a'
+md5sums=('f34338440a4b3697cb9b3a2584f3251d'
          '8f60a5eb9d84b9c64c478d63e1c24b10'
          'ca4c39eb4bb201bd2eacad01492cd735')
 
diff --git a/extra/cinepaint/LICENSE b/extra/cinepaint/LICENSE
new file mode 100644
index 000000000..746207229
--- /dev/null
+++ b/extra/cinepaint/LICENSE
@@ -0,0 +1,25 @@
+Copyright (c) 2005, Kai-Uwe Behrmann
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met: 
+    * Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer. 
+    * Redistributions in binary form must reproduce the above
+    copyright notice, this list of conditions and the following
+    disclaimer in the documentation and/or other materials provided
+    with the distribution.ntributors may be used to endorse or promote
+    products derived from this software without specific prior written
+    permission. 
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
diff --git a/extra/cinepaint/PKGBUILD b/extra/cinepaint/PKGBUILD
index fed92aed9..93b61ee16 100644
--- a/extra/cinepaint/PKGBUILD
+++ b/extra/cinepaint/PKGBUILD
@@ -1,39 +1,48 @@
-# $Id: PKGBUILD 89858 2010-09-04 14:16:02Z remy $
+# $Id: PKGBUILD 130311 2011-07-04 22:01:41Z eric $
 # Maintainer: tobias [tobias.archlinux.org]
 # Contributor: tobias [tobias.justdreams.de]
 
 pkgname=cinepaint
 _srcver=0.22-1
 pkgver=${_srcver/-/.}
-pkgrel=7
-pkgdesc="sophisticated graphics manipulation programm supporting >8bit pictures"
-arch=(i686 x86_64 'mips64el')
-license=('LGPL' 'GPL' 'MIT-OSI')
-url=(http://cinepaint.org.sourceforge.net/)
-depends=('gtk2>=2.18.6' 'openexr>=1.6.1' 'lcms>=1.18' 'libxmu>=1.0.4' 'libxpm>=3.5.7' 'fltk>=1.1.9' 'desktop-file-utils' 'ftgl>=2.1.3rc5' 'libjpeg>=8')
-makedepends=('python2' 'gutenprint>=5.2.3')
-optdepends=('python2' 'gutenprint')
+pkgrel=8
+pkgdesc="Sophisticated graphics manipulation programm supporting >8bit pictures"
+arch=('i686' 'x86_64')
+license=('LGPL' 'GPL' 'MIT')
+url="http://www.cinepaint.org"
+depends=('gtk2>=2.18.6' 'openexr>=1.6.1' 'lcms>=1.18' 'libxpm>=3.5.7' 'fltk' 
+         'desktop-file-utils' 'ftgl>=2.1.3rc5')
+makedepends=('python2' 'gutenprint')
+optdepends=('python2: for python plug-ins' 'gutenprint: for print plug-ins')
 options=('!libtool')
 install=cinepaint.install
 source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${_srcver}.tar.gz
+        LICENSE
         cinepaint-0.22.1-gcc43.patch
         cinepaint-0.22.1-multiple_parameters_named.patch
         cinepaint-0.22.1-ambiguousawake.patch
 	cinepaint-0.22-gcc44.patch)
-md5sums=('f360587240db6b6d2f0bfd94c420c492' 'f05e17a16d0018e5301aff0e1fa597b0'\
-         '0876510a5ce3d581ebdde7e18199c09f' '4586aa153a0d3cac36120afc1f95a880'\
+md5sums=('f360587240db6b6d2f0bfd94c420c492'
+         '169085743f667c250ea2e4022efecf5f'
+         'f05e17a16d0018e5301aff0e1fa597b0'
+         '0876510a5ce3d581ebdde7e18199c09f'
+         '4586aa153a0d3cac36120afc1f95a880'
          '368e820c27f525e3569d43388f1c119a')
 
 build() {
   cd "${srcdir}/${pkgname}-${_srcver}"
  # FIXES
-  patch -Np1 -i "${srcdir}/cinepaint-0.22.1-gcc43.patch" || return 1
-  patch -Np1 -i "${srcdir}/cinepaint-0.22-gcc44.patch" || return 1
-  patch -Np1 -i "${srcdir}/cinepaint-0.22.1-multiple_parameters_named.patch" || return 1
-  patch -Np0 -i "${srcdir}/cinepaint-0.22.1-ambiguousawake.patch" || return 1
+  patch -Np1 -i "${srcdir}/cinepaint-0.22.1-gcc43.patch"
+  patch -Np1 -i "${srcdir}/cinepaint-0.22-gcc44.patch"
+  patch -Np1 -i "${srcdir}/cinepaint-0.22.1-multiple_parameters_named.patch"
+  patch -Np0 -i "${srcdir}/cinepaint-0.22.1-ambiguousawake.patch"
   find plug-ins/pygimp -type f -exec sed -i 's#env python#env python2#' {} +
-  find plug-ins/print -type f -exec \
-    sed -i "s:gutenprintui/gutenprintui:gutenprintui2/gutenprintui:" {} \;
+  find plug-ins/print -type f -exec  sed -i "s:gutenprintui/gutenprintui:gutenprintui2/gutenprintui:" {} \;
+  sed -i 's|Fl/Fl_File_Chooser.H|FL/Fl_File_Chooser.H|' lib/fl_i18n/fl_i18n.cxx
+  sed -i 's|Fl/Fl_Widget.H|FL/Fl_Widget.H|' plug-ins/icc_examin/icc_examin/icc_helfer.h
+  sed -i 's|Fl/Fl.H|FL/Fl.H|' plug-ins/icc_examin/icc_examin/icc_helfer_fltk.cpp
+  sed -i 's|Fl/Fl_File_Chooser.H|FL/Fl_File_Chooser.H|' plug-ins/icc_examin/icc_examin/fl_i18n/fl_i18n.cxx
+
   # Fix insecure rpath
   sed '/-rpath/d' -i plug-ins/icc_examin/icc_examin/configure
 
@@ -45,11 +54,11 @@ build() {
   sed -i 's/^\(X_LIBS.*\)$/\1 -lpthread/' plug-ins/openexr/Makefile
   make
 }
+
 package() {
   cd "${srcdir}/${pkgname}-${_srcver}"
-  make DESTDIR="${pkgdir}" install || return 1
-  install -m755 -d "${pkgdir}/usr/share/applications"
-  install -m755 -d "${pkgdir}/usr/share/pixmaps"
-  install -m644 cinepaint.desktop "${pkgdir}/usr/share/applications/" || return 1
-  install -m644 cinepaint.png "${pkgdir}/usr/share/pixmaps/" || return 1
+  make DESTDIR="${pkgdir}" install
+  sed -i -e "s|-I$srcdir/cinepaint-0.22-1||" -e "s|-I$srcdir/cinepaint-0.22-1/lib||" -e "/libcinepaint.la/d" \
+    -e "s|$srcdir/cinepaint-0.22-1/lib/.libs/\$dlname||" "${pkgdir}/usr/bin/cinepainttool"
+  install -D -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
diff --git a/extra/cmake/PKGBUILD b/extra/cmake/PKGBUILD
index 0312bf46a..93c48895d 100644
--- a/extra/cmake/PKGBUILD
+++ b/extra/cmake/PKGBUILD
@@ -1,25 +1,25 @@
-# $Id: PKGBUILD 110150 2011-02-16 19:31:21Z andrea $
+# $Id: PKGBUILD 130915 2011-07-09 03:24:24Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 # Contributor: damir <damir@archlinux.org>
 # Contributor: Konstantinos Pachnis <kpachnis@mes-direct.com>
 
 pkgname=cmake
-pkgver=2.8.4
-pkgrel=2
+pkgver=2.8.5
+pkgrel=1
 pkgdesc="A cross-platform open-source make system"
 arch=('i686' 'x86_64' 'mips64el')
 license=('custom')
 url="http://www.cmake.org"
-depends=('expat' 'curl' 'gcc-libs' 'shared-mime-info')
+depends=('curl' 'libarchive' 'shared-mime-info')
 makedepends=('qt')
 optdepends=('qt: cmake-gui')
 install="${pkgname}.install"
 source=("http://www.cmake.org/files/v2.8/${pkgname}-${pkgver}.tar.gz")
-md5sums=('209b7d1d04b2e00986538d74ba764fcf')
+md5sums=('3c5d32cec0f4c2dc45f4c2e84f4a20c5')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd "${srcdir}"/${pkgname}-${pkgver}
 
   ./bootstrap --prefix=/usr \
     --mandir=/share/man \
@@ -31,8 +31,8 @@ build() {
 }
 
 package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
+  cd "${srcdir}"/${pkgname}-${pkgver}
+  make DESTDIR="${pkgdir}" install
 
   vimpath="$pkgdir/usr/share/vim/vimfiles"
   install -Dm644 Docs/cmake-indent.vim ${vimpath}/indent/cmake-indent.vim
diff --git a/extra/cmake/cmake.install b/extra/cmake/cmake.install
index 7c8a8bd2b..64e7020ea 100644
--- a/extra/cmake/cmake.install
+++ b/extra/cmake/cmake.install
@@ -1,5 +1,6 @@
 post_install() {
 	update-mime-database usr/share/mime &> /dev/null
+    [ -x usr/bin/update-desktop-database ] && update-desktop-database -q
 }
 
 post_upgrade() {
diff --git a/extra/fltk/PKGBUILD b/extra/fltk/PKGBUILD
index 407761d30..ed71922ad 100644
--- a/extra/fltk/PKGBUILD
+++ b/extra/fltk/PKGBUILD
@@ -1,26 +1,46 @@
-# $Id: PKGBUILD 71291 2010-03-06 01:40:12Z pierre $
+# $Id: PKGBUILD 130308 2011-07-04 21:56:54Z eric $
 
-pkgname=fltk
-pkgver=1.1.10
+pkgbase=fltk
+pkgname=('fltk' 'fltk-docs')
+pkgver=1.3.0
 pkgrel=1
-pkgdesc="Graphical user interface toolkit for X"
 arch=('i686' 'x86_64' 'mips64el')
-license=('LGPL')
+license=('custom:LGPL')
 url="http://www.fltk.org/"
-depends=('libjpeg' 'libpng' 'gcc-libs' 'libxft' 'libxext')
-makedepends=('mesa')
-source=("http://ftp.easysw.com/pub/$pkgname/$pkgver/$pkgname-$pkgver-source.tar.bz2")
-md5sums=('a1765594bc427ff892e36089fe1fa672')
+depends=('sh' 'libjpeg' 'libpng' 'libxft' 'libxinerama' 'alsa-lib' 'hicolor-icon-theme' 'desktop-file-utils' 'xdg-utils')
+makedepends=('mesa' 'doxygen')
+source=(http://ftp.easysw.com/pub/$pkgbase/$pkgver/$pkgbase-$pkgver-source.tar.gz)
+md5sums=('44d5d7ba06afdd36ea17da6b4b703ca3')
 
 build() {
-  cd $srcdir/$pkgname-$pkgver
-  export LDFLAGS="${LDFLAGS//-Wl,--as-needed}"
-  export LDFLAGS="${LDFLAGS//,--as-needed}"
+  cd "$srcdir/$pkgbase-$pkgver"
   ./configure --prefix=/usr --enable-threads --enable-xft --enable-shared
-  make || return 1
+  make
+  cd documentation
+  make html
 }
 
-package() {
-  cd $srcdir/$pkgname-$pkgver
-  make DESTDIR=$pkgdir install
+package_fltk() {
+  pkgdesc="Graphical user interface toolkit for X"
+  options=('!docs')
+  install=fltk.install
+
+  cd "$srcdir/$pkgbase-$pkgver"
+  make DESTDIR="$pkgdir" install install-desktop
+  chmod 644 "$pkgdir"/usr/lib/*.a
+  install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}
+
+package_fltk-docs() {
+  pkgdesc="Graphical user interface toolkit for X (documentation)"
+  depends=('')
+
+  cd "$srcdir/$pkgbase-$pkgver/documentation"
+  install -d "$pkgdir"/usr/share/doc/fltk/
+  for _file in html/* ; do
+    install -m644 $_file "$pkgdir"/usr/share/doc/fltk/
+  done
+  cd ../test
+  make DESTDIR="$pkgdir" install
+  install -D -m644 ../COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
diff --git a/extra/fltk/fltk.install b/extra/fltk/fltk.install
new file mode 100644
index 000000000..f89ec8213
--- /dev/null
+++ b/extra/fltk/fltk.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/foomatic/PKGBUILD b/extra/foomatic/PKGBUILD
index a3fbd7b69..5354a6c25 100644
--- a/extra/foomatic/PKGBUILD
+++ b/extra/foomatic/PKGBUILD
@@ -1,27 +1,24 @@
-# $Id: PKGBUILD 103148 2010-12-15 21:11:48Z andyrtr $
+# $Id: PKGBUILD 130674 2011-07-07 16:52:03Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
  
 pkgbase="foomatic"
 pkgname=('foomatic-db' 'foomatic-filters' 'foomatic-db-engine' 'foomatic-db-nonfree')
 arch=('i686' 'x86_64' 'mips64el') # needs to be changed  in the subpackages when makepkg will support it
-_snapdate=20101215
-_relver=4.0.6
+_snapdate=20110707
+_relver=4.0.7
 pkgver=${_relver}_${_snapdate}
 pkgrel=1
-makedepends=('cups>=1.4.2' 'perl' 'libxml2' 'enscript' 'perl' 'net-snmp' 'bash')
+epoch=1
+makedepends=('cups>=1.4.7' 'perl' 'libxml2' 'enscript' 'perl' 'net-snmp' 'bash')
 source=(http://www.linuxprinting.org/download/foomatic/$pkgbase-{filters,db-engine}-${_relver}.tar.gz
         http://www.linuxprinting.org/download/foomatic/$pkgbase-db-4.0-${_snapdate}.tar.gz
         http://www.linuxprinting.org/download/foomatic/$pkgbase-db-nonfree-${_snapdate}.tar.gz)
 url="http://www.linuxprinting.org/foomatic.html"
-options=('force' '!emptydirs')
-md5sums=('fd99dac3a36807a47ffa4f9eb15c1b07'
-         '0893a4a9705ffd7305bc50cbb951daf9'
-         'f801fab0b210cc61f217bede1963cd0e'
-         'f51e447404b32949057307a1bc4d1b5e')
-md5sums=('9bca3d3d83192a3741a34bd9b1859b1e'
-         'b34f17b56304b48e3e90c1c6c8f2c287'
-         'f99807cb4d5da437ddf02c843f92eaca'
-         '21040845f5fcb2bbdfa814bae934fd8d')
+options=('!emptydirs')
+md5sums=('20abd25c1c98b2dae68709062a132a7d'
+         'fcfa8eb9ce5494b81b58ae983fc2aeb5'
+         '88d467d9099188b170185564bd33d7b7'
+         'e12969b36dc0b59be6a973ee522d707e')
 
 build() {
  /bin/true
@@ -39,8 +36,8 @@ package_foomatic-db() {
 
    cd ${srcdir}/${pkgname}-${_snapdate}
    ./configure --prefix=/usr
-   make DESTDIR=${pkgdir} install || return 1
-   install -v -Dm644 ${srcdir}/${pkgname}-${_snapdate}/COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING || return 1
+   make DESTDIR=${pkgdir} install
+   install -v -Dm644 ${srcdir}/${pkgname}-${_snapdate}/COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING
 }
 
 package_foomatic-filters() {
@@ -56,8 +53,8 @@ package_foomatic-filters() {
 #   cd ${srcdir}/${pkgname}-${pkgver}
    cd ${srcdir}/foomatic-filters-${_relver}
    ./configure --prefix=/usr --sysconfdir=/etc
-   make || return 1
-   make DESTDIR=${pkgdir} install || return 1
+   make
+   make DESTDIR=${pkgdir} install
 }
 
 package_foomatic-db-engine() {
@@ -70,12 +67,12 @@ package_foomatic-db-engine() {
 #   cd ${srcdir}/${pkgname}-${pkgver}
    cd ${srcdir}/foomatic-db-engine-${_relver}
     ./configure --prefix=/usr
-   make || return 1
+   make
    eval `perl -V:archname`
    make DESTDIR=${pkgdir} \
         INSTALLARCHLIB=/usr/lib/perl5/vendor_perl/ \
         INSTALLSITELIB=/usr/lib/perl5/vendor_perl/ \
-        INSTALLSITEARCH=/usr/lib/perl5/vendor_perl/ install || return 1
+        INSTALLSITEARCH=/usr/lib/perl5/vendor_perl/ install
    /usr/bin/find ${pkgdir} -name '.packlist' -delete
    # fix permissions
    chmod 755 ${pkgdir}/usr/lib{,/perl5,/perl5/vendor_perl}
@@ -91,7 +88,7 @@ package_foomatic-db-nonfree() {
 #   cd ${srcdir}/${pkgname}-${_snapdate}
    cd ${srcdir}/foomatic-db-nonfree-${_snapdate}
    ./configure --prefix=/usr
-   make DESTDIR=${pkgdir} install || return 1
-#   install -Dm644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING || return 1
-   install -Dm644 COPYING ${pkgdir}/usr/share/licenses/foomatic-db-nonfree/COPYING || return 1
+   make DESTDIR=${pkgdir} install
+#   install -Dm644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING
+   install -Dm644 COPYING ${pkgdir}/usr/share/licenses/foomatic-db-nonfree/COPYING
 }
diff --git a/extra/gnome-disk-utility/PKGBUILD b/extra/gnome-disk-utility/PKGBUILD
index 0a5f8e9a6..487b4fa07 100644
--- a/extra/gnome-disk-utility/PKGBUILD
+++ b/extra/gnome-disk-utility/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 117728 2011-04-04 17:27:54Z ibiru $
+# $Id: PKGBUILD 130871 2011-07-08 15:15:27Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gnome-disk-utility
 pkgver=3.0.0
-pkgrel=1
+pkgrel=2
 pkgdesc="GNOME libraries and applications for dealing with storage devices"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
@@ -13,13 +13,16 @@ makedepends=('gtk-doc' 'intltool')
 options=('!libtool' '!emptydirs')
 install=gnome-disk-utility.install
 source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2
-        fix-freeze.patch)
+        fix-freeze.patch
+        add-support-for-DeviceAutomountHint.patch)
 sha256sums=('94d31142a5f488d034cd2954df4ab1c26bd053fb0d46d230fba91b4f8b3663fb'
-            '818b70360978968457d2c50738347c6726ed8d0c007eb57074881a7e33652526')
+            '818b70360978968457d2c50738347c6726ed8d0c007eb57074881a7e33652526'
+            '1e2f8d2d8ea121d21ff2b2a1e208c0fd4af603a4ed0d024ad326a991ebc7a613')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   patch -Np1 -i "${srcdir}/fix-freeze.patch"
+  patch -Np1 -i "${srcdir}/add-support-for-DeviceAutomountHint.patch"
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
       --libexecdir=/usr/lib/gnome-disk-utility \
       --disable-scrollkeeper --disable-nautilus --disable-gtk-doc
diff --git a/extra/gnome-disk-utility/add-support-for-DeviceAutomountHint.patch b/extra/gnome-disk-utility/add-support-for-DeviceAutomountHint.patch
new file mode 100644
index 000000000..5a36cc540
--- /dev/null
+++ b/extra/gnome-disk-utility/add-support-for-DeviceAutomountHint.patch
@@ -0,0 +1,65 @@
+From 7dde5bc75a1d96be9510ce1e98d28f9d33520919 Mon Sep 17 00:00:00 2001
+From: David Zeuthen <davidz@redhat.com>
+Date: Fri, 08 Jul 2011 15:03:52 +0000
+Subject: Add support for DeviceAutomountHint
+
+Based on the patch in https://bugzilla.gnome.org/show_bug.cgi?id=653184
+
+Signed-off-by: David Zeuthen <davidz@redhat.com>
+---
+diff --git a/src/gdu/gdu-device.c b/src/gdu/gdu-device.c
+index 6a5afad..4be39cf 100644
+--- a/src/gdu/gdu-device.c
++++ b/src/gdu/gdu-device.c
+@@ -82,6 +82,7 @@ typedef struct
+   gboolean device_presentation_nopolicy;
+   char *device_presentation_name;
+   char *device_presentation_icon_name;
++  char *device_automount_hint;
+   guint64 device_size;
+   guint64 device_block_size;
+ 
+@@ -279,6 +280,8 @@ collect_props (const char *key,
+     props->device_presentation_name = g_strdup (g_value_get_string (value));
+   else if (strcmp (key, "DevicePresentationIconName") == 0)
+     props->device_presentation_icon_name = g_strdup (g_value_get_string (value));
++  else if (strcmp (key, "DeviceAutomountHint") == 0)
++    props->device_automount_hint = g_strdup (g_value_get_string (value));
+   else if (strcmp (key, "DeviceSize") == 0)
+     props->device_size = g_value_get_uint64 (value);
+   else if (strcmp (key, "DeviceBlockSize") == 0)
+@@ -549,6 +552,7 @@ device_properties_free (DeviceProperties *props)
+   g_strfreev (props->device_mount_paths);
+   g_free (props->device_presentation_name);
+   g_free (props->device_presentation_icon_name);
++  g_free (props->device_automount_hint);
+   g_free (props->job_id);
+   g_free (props->id_usage);
+   g_free (props->id_type);
+@@ -1294,6 +1298,12 @@ gdu_device_drive_get_media_compatibility (GduDevice *device)
+ }
+ 
+ const char *
++gdu_device_get_automount_hint (GduDevice *device)
++{
++        return device->priv->props->device_automount_hint;
++}
++
++const char *
+ gdu_device_drive_get_media (GduDevice *device)
+ {
+         return device->priv->props->drive_media;
+diff --git a/src/gdu/gdu-device.h b/src/gdu/gdu-device.h
+index 4c1302b..8cfd7a9 100644
+--- a/src/gdu/gdu-device.h
++++ b/src/gdu/gdu-device.h
+@@ -143,6 +143,7 @@ const char *gdu_device_drive_get_wwn (GduDevice *device);
+ const char *gdu_device_drive_get_connection_interface (GduDevice *device);
+ guint64 gdu_device_drive_get_connection_speed (GduDevice *device);
+ char **gdu_device_drive_get_media_compatibility (GduDevice *device);
++const gchar *gdu_device_get_automount_hint(GduDevice *device);
+ const char *gdu_device_drive_get_media (GduDevice *device);
+ gboolean gdu_device_drive_get_is_media_ejectable (GduDevice *device);
+ gboolean gdu_device_drive_get_requires_eject (GduDevice *device);
+--
+cgit v0.9
diff --git a/extra/gnucash/PKGBUILD b/extra/gnucash/PKGBUILD
index c182576f6..dadde70b6 100644
--- a/extra/gnucash/PKGBUILD
+++ b/extra/gnucash/PKGBUILD
@@ -1,17 +1,16 @@
-# $Id: PKGBUILD 127860 2011-06-18 22:47:58Z foutrelis $
+# $Id: PKGBUILD 130812 2011-07-08 04:52:51Z eric $
 # Maintainer: Aaron Griffin <aaron@archlinux.org>
 # Contributor: Mark Schneider <queueRAM@gmail.com>
 
 pkgname=gnucash
-pkgver=2.4.6
-pkgrel=2
+pkgver=2.4.7
+pkgrel=1
 pkgdesc="A personal and small-business financial-accounting application"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnucash.org"
 license=("GPL")
-depends=('gtkhtml' 'slib' 'goffice' 'guile' 'libofx'
-         'libgnomeui' 'hicolor-icon-theme' 'libdbi-drivers' 'aqbanking'
-         'desktop-file-utils')
+depends=('gtkhtml' 'slib' 'goffice' 'libgnomeui' 'hicolor-icon-theme' 
+         'libdbi-drivers' 'aqbanking' 'desktop-file-utils')
 makedepends=('intltool')
 optdepends=('evince: for print preview'
             'perl-finance-quote: for stock information lookups'
@@ -19,8 +18,8 @@ optdepends=('evince: for print preview'
 options=('!libtool' '!makeflags')
 install=gnucash.install
 source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('b7d5fbb1bddf3618c97ebeeb76408ebe')
-sha1sums=('b6d4a6bc327ef5a260d070215a14a3180b474ad8')
+md5sums=('0f85c8bfd165b2605a7853f579808823')
+sha1sums=('e99dd56949de27c19d9c3413d30c87a0f74e8ff9')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/gtkmm/PKGBUILD b/extra/gtkmm/PKGBUILD
index babd7c197..00f5ccec6 100644
--- a/extra/gtkmm/PKGBUILD
+++ b/extra/gtkmm/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 109786 2011-02-12 18:59:28Z ibiru $
+# $Id: PKGBUILD 130876 2011-07-08 15:25:31Z ibiru $
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=gtkmm
 pkgname=('gtkmm' 'gtkmm-docs')
-pkgver=2.24.0
+pkgver=2.24.2
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 makedepends=('gtk2' 'pangomm' 'atkmm' 'glibmm-docs')
 license=('LGPL')
 options=('!libtool' '!emptydirs')
 url="http://gtkmm.sourceforge.net/"
-source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgbase}/2.24/${pkgbase}-${pkgver}.tar.bz2)
-sha256sums=('8cbae7254746bc7df7cce882d9b9a916c4e00dba7bdacd1c50b5d096a484cf56')
+source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgbase}/2.24/${pkgbase}-${pkgver}.tar.xz)
+sha256sums=('c90c7a29c20dd6d795925bd66ad1ff40be07cea0e4c03f4d6105a8c07448953d')
 
 build() {
   cd "${srcdir}/${pkgbase}-${pkgver}"
diff --git a/extra/kdeaccessibility/PKGBUILD b/extra/kdeaccessibility/PKGBUILD
index 68f39e752..0fd7b21bc 100644
--- a/extra/kdeaccessibility/PKGBUILD
+++ b/extra/kdeaccessibility/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 121097 2011-04-29 00:27:46Z andrea $
+# $Id: PKGBUILD 130258 2011-07-04 19:27:34Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
@@ -10,7 +10,7 @@ pkgname=('kdeaccessibility-colorschemes'
          'kdeaccessibility-kmag'
          'kdeaccessibility-kmousetool'
          'kdeaccessibility-kmouth')
-pkgver=4.6.3
+pkgver=4.6.5
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url='http://accessibility.kde.org'
@@ -19,7 +19,7 @@ groups=('kde' 'kdeaccessibility')
 makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdebase-runtime'
         'speech-dispatcher')
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
-sha1sums=('8d4053defbf839fd428820d6d1659b6e46ab468a')
+sha1sums=('6e40aab7c95671070cad0b5f59507ff887414ce0')
 
 build() {
 	cd ${srcdir}
diff --git a/extra/kdeadmin/PKGBUILD b/extra/kdeadmin/PKGBUILD
index 9b424bbde..68dbd407d 100644
--- a/extra/kdeadmin/PKGBUILD
+++ b/extra/kdeadmin/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 122186 2011-05-02 17:58:19Z andrea $
+# $Id: PKGBUILD 130259 2011-07-04 19:27:38Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
@@ -7,7 +7,7 @@ pkgname=('kdeadmin-kcron'
          'kdeadmin-ksystemlog'
          'kdeadmin-kuser'
          'kdeadmin-system-config-printer-kde')
-pkgver=4.6.3
+pkgver=4.6.5
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.kde.org'
@@ -17,7 +17,7 @@ makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdebindings-python'
 	         'system-config-printer-common' 'python2-pyqt')
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2"
         'syslog-path.patch')
-sha1sums=('141e8e794ebd5341940d2d22986b7376a2abefbf'
+sha1sums=('010912294a12461a8a0bfdce69c5373b37342cb6'
           '20095ce6e0f3e5b6800a7c6e52de6fddba62c031')
 
 build() {
diff --git a/extra/kdeartwork/PKGBUILD b/extra/kdeartwork/PKGBUILD
index 5716a1f04..e1847e906 100644
--- a/extra/kdeartwork/PKGBUILD
+++ b/extra/kdeartwork/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 121099 2011-04-29 00:27:52Z andrea $
+# $Id: PKGBUILD 130260 2011-07-04 19:27:42Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
@@ -13,7 +13,7 @@ pkgname=('kdeartwork-aurorae'
          'kdeartwork-styles'
          'kdeartwork-wallpapers'
          'kdeartwork-weatherwallpapers')
-pkgver=4.6.3
+pkgver=4.6.5
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.kde.org'
@@ -22,7 +22,7 @@ groups=('kde' 'kdeartwork')
 makedepends=('pkgconfig' 'cmake' 'automoc4' 'xscreensaver' 'eigen'
 	     'kdebase-workspace' 'kdegraphics-libs')
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
-sha1sums=('084834ac3c654ea24257d9ed407c2384bf5aa110')
+sha1sums=('9bcf223f7ee2ca0e12f9c8ab8235dcd35f589a8d')
 
 build() {
 	cd $srcdir
diff --git a/extra/kdebase-runtime/PKGBUILD b/extra/kdebase-runtime/PKGBUILD
index 949de45e5..742c11888 100644
--- a/extra/kdebase-runtime/PKGBUILD
+++ b/extra/kdebase-runtime/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 121092 2011-04-29 00:27:28Z andrea $
+# $Id: PKGBUILD 130252 2011-07-04 19:27:07Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=kdebase-runtime
-pkgver=4.6.3
+pkgver=4.6.5
 pkgrel=1
 pkgdesc="KDE Base Runtime Environment"
 arch=('i686' 'x86_64' 'mips64el')
@@ -17,7 +17,7 @@ optdepends=('htdig: to build the search index in khelpcenter'
             'gdb: drkonq crash handler')
 install="${pkgname}.install"
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('75cf1993b42cbada44b8c3ca2d5b99e6ac48594c')
+sha1sums=('e91d35af2a916259305cc7efc2f3a3fbc8b22def')
 
 build() {
 	cd "${srcdir}"
diff --git a/extra/kdebase-workspace/PKGBUILD b/extra/kdebase-workspace/PKGBUILD
index 210e6cead..b969a4b1a 100644
--- a/extra/kdebase-workspace/PKGBUILD
+++ b/extra/kdebase-workspace/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 124831 2011-05-24 17:22:55Z andrea $
+# $Id: PKGBUILD 130255 2011-07-04 19:27:20Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=kdebase-workspace
-pkgver=4.6.3
-pkgrel=2
+pkgver=4.6.5
+pkgrel=1
 pkgdesc="KDE Base Workspace"
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.kde.org'
@@ -27,17 +27,15 @@ backup=('usr/share/config/kdm/kdmrc'
 options=('emptydirs')
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2"
         'kdm-zsh-profile.patch' 'kdm' 'kde.pam' 'kde-np.pam' 'kscreensaver.pam'
-        'fixpath.patch' 'terminate-server.patch'
-        'fix-app-launch-in-plasmoid.patch')
-sha1sums=('50103b7752defbab08965b665fa95361bb5b3ff6'
+        'fixpath.patch' 'terminate-server.patch')
+sha1sums=('190a524d57c4e52e69dcc1fc2e5a1c0681239a1c'
           '8c2bdefb23a03b753b78d16944d03fa3939d2d99'
           '5db3a245201bd4a50e65aa2ef583cf5490e4f646'
           'f7b38af38549242a240f1a90ab9964ca8a366129'
           '603cc79c4d2b4eae62bb5f244aeecb3a778b5516'
           '106635aa1aae51d6f0668b1853f6c49a4fe9d3d8'
           'd7b5883f7e65c6839b1f65f94d58026673dd0226'
-          'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3eeee'
-          'ca55cd0a25fd8cfb95fa3b1cdd373d496fd7312d')
+          'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3eeee')
 
 build() {
 	cd ${srcdir}/${pkgname}-${pkgver}
@@ -45,9 +43,6 @@ build() {
 	patch -p0 -i ${srcdir}/fixpath.patch
 	patch -p0 -i ${srcdir}/terminate-server.patch
 
-    # Already fixed upstream
-    patch -p1 -i ${srcdir}/fix-app-launch-in-plasmoid.patch
-
 	cd ${srcdir}
 	mkdir build
 	cd build
diff --git a/extra/kdebase/PKGBUILD b/extra/kdebase/PKGBUILD
index d337fc353..1faff3b6b 100644
--- a/extra/kdebase/PKGBUILD
+++ b/extra/kdebase/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 121096 2011-04-29 00:27:43Z andrea $
+# $Id: PKGBUILD 130256 2011-07-04 19:27:25Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
@@ -13,7 +13,7 @@ pkgname=('kdebase-dolphin'
          'kdebase-kwrite'
          'kdebase-lib'
          'kdebase-plasma')
-pkgver=4.6.3
+pkgver=4.6.5
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.kde.org'
@@ -21,7 +21,7 @@ license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdebase')
 makedepends=('kdebase-workspace' 'pkgconfig' 'cmake' 'automoc4')
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
-sha1sums=('69cfba74099cdce27f7f72725288f025979b41f3')
+sha1sums=('1a902d22956daaf380ceefe68f8db75b8b760ae6')
 
 build() {
 	cd ${srcdir}
diff --git a/extra/kdebindings/PKGBUILD b/extra/kdebindings/PKGBUILD
index e98536d41..48a76a359 100644
--- a/extra/kdebindings/PKGBUILD
+++ b/extra/kdebindings/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=('kdebindings-csharp'
          'kdebindings-python'
          'kdebindings-ruby'
          'kdebindings-smoke')
-pkgver=4.6.3
+pkgver=4.6.5
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.kde.org'
@@ -15,7 +15,7 @@ license=('GPL' 'LGPL')
 makedepends=('pkgconfig' 'cmake' 'automoc4' 'python2-pyqt' 'kdepim-runtime' 'mono'
 	         'kdegraphics-okular' 'qwt' 'boost' 'qscintilla' 'ruby')
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
-sha1sums=('4ecc6ac378c241472aa75680abfafd8d57672653')
+sha1sums=('e63a0b0eec92320df2c2c539b916c5ee9425a689')
 
 build() {
 	export MONO_SHARED_DIR="${srcdir}/build/.mono"
@@ -31,7 +31,8 @@ build() {
 		-DBUILD_falcon=OFF \
 		-DBUILD_java=OFF \
 		-DBUILD_php=OFF \
-		-DWITH_PolkitQt=OFF
+		-DWITH_PolkitQt=OFF \
+        -DWITH_Soprano=OFF
 	make
 }
 
diff --git a/extra/kdeedu/PKGBUILD b/extra/kdeedu/PKGBUILD
index a5a24fb20..449a41c1c 100644
--- a/extra/kdeedu/PKGBUILD
+++ b/extra/kdeedu/PKGBUILD
@@ -1,11 +1,10 @@
-# $Id: PKGBUILD 124802 2011-05-24 13:56:35Z andrea $
+# $Id: PKGBUILD 130257 2011-07-04 19:27:28Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgbase=kdeedu
 pkgname=('kdeedu-blinken'
          'kdeedu-cantor'
-         'kdeedu-data'
          'kdeedu-kalgebra'
          'kdeedu-kalzium'
          'kdeedu-kanagram'
@@ -25,8 +24,8 @@ pkgname=('kdeedu-blinken'
          'kdeedu-parley'
          'kdeedu-rocs'
          'kdeedu-step')
-pkgver=4.6.3
-pkgrel=2
+pkgver=4.6.5
+pkgrel=1
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
 license=('GPL' 'LGPL' 'FDL')
@@ -35,13 +34,16 @@ makedepends=('pkgconfig' 'cmake' 'automoc4' 'ocaml' 'facile' 'cfitsio' 'gpsd'
 	'kdebase-runtime' 'libqalculate' 'gsl' 'boost' 'libindi' 'r' 'libspectre'
 	'python2' 'avogadro')
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2"
-        'gpsd-2.96.patch')
-sha1sums=('4b27e6e1670760982dae13dc8c51c814c6853396'
-          'fd6b6b81945d951bb6ad0bb735df33c11bb2008e')
+        'gpsd-2.96.patch'
+        'remove-libkdeedu-libscience.patch')
+sha1sums=('64247eb68b2710a66baaf824d798e46b34ca4d4f'
+          'fd6b6b81945d951bb6ad0bb735df33c11bb2008e'
+          'cd4e18f2b30d42f6e2bcc518ad72fd49839fd8dc')
 
 build() {
     cd ${srcdir}/${pkgbase}-${pkgver}
     patch -Np1 -i ${srcdir}/gpsd-2.96.patch
+    patch -p1 -i ${srcdir}/remove-libkdeedu-libscience.patch
 
     cd ${srcdir}
 	mkdir build
@@ -59,7 +61,7 @@ package_kdeedu-blinken() {
 	install='kdeedu.install'
 	cd $srcdir/build/blinken
 	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/blinken
+	cd $srcdir/build/blinken/doc
 	make DESTDIR=$pkgdir install
 }
 
@@ -72,14 +74,7 @@ package_kdeedu-cantor() {
 	install='kdeedu.install'
 	cd $srcdir/build/cantor
 	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/cantor
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeedu-data() {
-	pkgdesc='Data for KDE Educational Software'
-	groups=()
-	cd $srcdir/build/data
+	cd $srcdir/build/cantor/doc
 	make DESTDIR=$pkgdir install
 }
 
@@ -89,7 +84,7 @@ package_kdeedu-kalgebra() {
 	install='kdeedu.install'
 	cd $srcdir/build/kalgebra
 	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kalgebra
+	cd $srcdir/build/kalgebra/doc
 	make DESTDIR=$pkgdir install
 }
 
@@ -99,17 +94,17 @@ package_kdeedu-kalzium() {
 	install='kdeedu.install'
 	cd $srcdir/build/kalzium
 	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kalzium
+	cd $srcdir/build/kalzium/doc
 	make DESTDIR=$pkgdir install
 }
 
 package_kdeedu-kanagram() {
 	pkgdesc='KDE Letter Order Game'
-	depends=('kdebase-runtime' 'kdeedu-libkdeedu' 'kdeedu-data')
+	depends=('kdebase-runtime' 'kdeedu-libkdeedu')
 	install='kdeedu.install'
 	cd $srcdir/build/kanagram
 	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kanagram
+	cd $srcdir/build/kanagram/doc
 	make DESTDIR=$pkgdir install
 }
 
@@ -119,7 +114,7 @@ package_kdeedu-kbruch() {
 	install='kdeedu.install'
 	cd $srcdir/build/kbruch
 	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kbruch
+	cd $srcdir/build/kbruch/doc
 	make DESTDIR=$pkgdir install
 }
 
@@ -129,17 +124,17 @@ package_kdeedu-kgeography() {
 	install='kdeedu.install'
 	cd $srcdir/build/kgeography
 	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kgeography
+	cd $srcdir/build/kgeography/doc
 	make DESTDIR=$pkgdir install
 }
 
 package_kdeedu-khangman() {
 	pkgdesc='KDE Hangman Game'
-	depends=('kdebase-runtime' 'kdeedu-libkdeedu' 'kdeedu-data')
+	depends=('kdebase-runtime' 'kdeedu-libkdeedu')
 	install='kdeedu.install'
 	cd $srcdir/build/khangman
 	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/khangman
+	cd $srcdir/build/khangman/doc
 	make DESTDIR=$pkgdir install
 }
 
@@ -149,7 +144,7 @@ package_kdeedu-kig() {
 	install='kdeedu.install'
 	cd $srcdir/build/kig
 	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kig
+	cd $srcdir/build/kig/doc
 	make DESTDIR=$pkgdir install
 
 	# Use the python2 executable
@@ -162,7 +157,7 @@ package_kdeedu-kiten() {
 	install='kdeedu.install'
 	cd $srcdir/build/kiten
 	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kiten
+	cd $srcdir/build/kiten/doc
 	make DESTDIR=$pkgdir install
 }
 
@@ -172,7 +167,7 @@ package_kdeedu-klettres() {
 	install='kdeedu.install'
 	cd $srcdir/build/klettres
 	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/klettres
+	cd $srcdir/build/klettres/doc
 	make DESTDIR=$pkgdir install
 }
 
@@ -182,7 +177,7 @@ package_kdeedu-kmplot() {
 	install='kdeedu.install'
 	cd $srcdir/build/kmplot
 	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kmplot
+	cd $srcdir/build/kmplot/doc
 	make DESTDIR=$pkgdir install
 }
 
@@ -192,7 +187,7 @@ package_kdeedu-kstars() {
 	install='kdeedu.install'
 	cd $srcdir/build/kstars
 	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kstars
+	cd $srcdir/build/kstars/doc
 	make DESTDIR=$pkgdir install
 }
 
@@ -202,7 +197,7 @@ package_kdeedu-ktouch() {
 	install='kdeedu.install'
 	cd $srcdir/build/ktouch
 	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/ktouch
+	cd $srcdir/build/ktouch/doc
 	make DESTDIR=$pkgdir install
 }
 
@@ -212,17 +207,17 @@ package_kdeedu-kturtle() {
 	install='kdeedu.install'
 	cd $srcdir/build/kturtle
 	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kturtle
+	cd $srcdir/build/kturtle/doc
 	make DESTDIR=$pkgdir install
 }
 
 package_kdeedu-kwordquiz() {
 	pkgdesc='A flashcard and vocabulary learning program'
-	depends=('kdebase-runtime' 'kdeedu-libkdeedu' 'kdeedu-data')
+	depends=('kdebase-runtime' 'kdeedu-libkdeedu')
 	install='kdeedu.install'
 	cd $srcdir/build/kwordquiz
 	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kwordquiz
+	cd $srcdir/build/kwordquiz/doc
 	make DESTDIR=$pkgdir install
 }
 
@@ -231,10 +226,10 @@ package_kdeedu-libkdeedu() {
 	groups=()
 	depends=('kdelibs')
 	install='kdeedu.install'
+    replaces=('kdeedu-data')
+    conflicts=('kdeedu-data')
 	cd $srcdir/build/libkdeedu
 	make DESTDIR=$pkgdir install
-	install -D -m644 $srcdir/${pkgbase}-${pkgver}/cmake/modules/FindKDEEdu.cmake \
-		$pkgdir/usr/share/apps/cmake/modules/FindKDEEdu.cmake
 }
 
 package_kdeedu-marble() {
@@ -243,19 +238,17 @@ package_kdeedu-marble() {
 	install='kdeedu.install'
 	cd $srcdir/build/marble
 	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/marble
+	cd $srcdir/build/marble/doc
 	make DESTDIR=$pkgdir install
-	install -D -m644 $srcdir/${pkgbase}-${pkgver}/cmake/modules/FindMarbleWidget.cmake \
-		$pkgdir/usr/share/apps/cmake/modules/FindMarbleWidget.cmake
 }
 
 package_kdeedu-parley() {
 	pkgdesc='Vocabulary Trainer'
-	depends=('kdebase-runtime' 'kdeedu-libkdeedu' 'kdeedu-data' 'kdebindings-python')
+	depends=('kdebase-runtime' 'kdeedu-libkdeedu' 'kdebindings-python')
 	install='kdeedu.install'
 	cd $srcdir/build/parley
 	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/parley
+	cd $srcdir/build/parley/doc
 	make DESTDIR=$pkgdir install
 }
 
@@ -265,7 +258,7 @@ package_kdeedu-rocs() {
 	install='kdeedu.install'
 	cd $srcdir/build/rocs
 	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/rocs
+	cd $srcdir/build/rocs/doc
 	make DESTDIR=$pkgdir install
 }
 
@@ -275,6 +268,6 @@ package_kdeedu-step() {
 	install='kdeedu.install'
 	cd $srcdir/build/step
 	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/step
+	cd $srcdir/build/step/doc
 	make DESTDIR=$pkgdir install
 }
diff --git a/extra/kdeedu/remove-libkdeedu-libscience.patch b/extra/kdeedu/remove-libkdeedu-libscience.patch
new file mode 100644
index 000000000..a8643d49f
--- /dev/null
+++ b/extra/kdeedu/remove-libkdeedu-libscience.patch
@@ -0,0 +1,10 @@
+--- kdeedu-4.6.4/libkdeedu/CMakeLists.txt~	2011-06-10 16:59:34.922935038 +0000
++++ kdeedu-4.6.4/libkdeedu/CMakeLists.txt	2011-06-10 16:59:56.279802081 +0000
+@@ -8,7 +8,6 @@
+ 
+ add_subdirectory(keduvocdocument)
+ add_subdirectory(kdeeduui)
+-add_subdirectory(libscience)
+ add_subdirectory(data)
+ #add_subdirectory(widgets)
+ add_subdirectory(qtmmlwidget)
diff --git a/extra/kdegames/PKGBUILD b/extra/kdegames/PKGBUILD
index 4f120b7c0..21bc2765c 100644
--- a/extra/kdegames/PKGBUILD
+++ b/extra/kdegames/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 123676 2011-05-12 11:12:57Z andrea $
+# $Id: PKGBUILD 130261 2011-07-04 19:27:48Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
@@ -43,16 +43,16 @@ pkgname=('kdegames-bomber'
          'kdegames-libkmahjongg'
          'kdegames-lskat'
          'kdegames-palapeli')
-pkgver=4.6.3
-pkgrel=2
+pkgver=4.6.5
+pkgrel=1
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdegames')
-makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdebase-runtime' 'ggz-client-libs'
-             'twisted' 'kdebindings-python')
+makedepends=('pkgconfig' 'cmake' 'automoc4' 'ggz-client-libs' 'twisted'
+             'kdebindings-python' 'openal')
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
-sha1sums=('472cb9541f389a8869a496f715d48587db568dda')
+sha1sums=('28c4908439f493fa30436875a77de01a21e88f4c')
 
 build() {
 	cd $srcdir
@@ -61,8 +61,7 @@ build() {
 	cmake ../${pkgbase}-${pkgver} \
 		-DCMAKE_BUILD_TYPE=Release \
 		-DCMAKE_SKIP_RPATH=ON \
-		-DCMAKE_INSTALL_PREFIX=/usr \
-        -DWITH_OpenAL=OFF
+		-DCMAKE_INSTALL_PREFIX=/usr
 	make
 }
 
@@ -90,7 +89,7 @@ package_kdegames-bovo() {
 
 package_kdegames-granatier() {
 	pkgdesc='Granatier'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
+	depends=('kdebase-runtime' 'kdegames-libkdegames' 'openal')
 	url="http://kde.org/applications/games/granatier/"
 	install='kdegames.install'
 	cd $srcdir/build/granatier
@@ -215,7 +214,7 @@ package_kdegames-kfourinline() {
 
 package_kdegames-kgoldrunner() {
 	pkgdesc='A game of action and puzzle-solving'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
+	depends=('kdebase-runtime' 'kdegames-libkdegames' 'openal')
 	url="http://kde.org/applications/games/kgoldrunner/"
 	install='kdegames.install'
 	cd $srcdir/build/kgoldrunner
diff --git a/extra/kdegraphics/PKGBUILD b/extra/kdegraphics/PKGBUILD
index 9cbff59d8..a6ea11d92 100644
--- a/extra/kdegraphics/PKGBUILD
+++ b/extra/kdegraphics/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 121093 2011-04-29 00:27:32Z andrea $
+# $Id: PKGBUILD 130500 2011-07-06 23:50:56Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
@@ -12,8 +12,8 @@ pkgname=('kdegraphics-gwenview'
          'kdegraphics-ksnapshot'
          'kdegraphics-libs'
          'kdegraphics-okular')
-pkgver=4.6.3
-pkgrel=1
+pkgver=4.6.5
+pkgrel=2
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.kde.org'
 license=('GPL' 'LGPL' 'FDL')
@@ -25,7 +25,7 @@ makedepends=('pkgconfig' 'cmake' 'automoc4' 'qimageblitz' 'sane' 'lcms'
         'libxxf86vm' 'poppler-qt' 'libspectre' 'djvulibre'
         'ebook-tools' 'kdebase-runtime')
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
-sha1sums=('c16dc9c55e7459418fa9887aa532ea0a269e7179')
+sha1sums=('1e64698993d0754dfae1296d8d16ba9370f9a08c')
 
 build() {
 	cd ${srcdir}
diff --git a/extra/kdelibs/PKGBUILD b/extra/kdelibs/PKGBUILD
index 1344a9af6..6e42bd435 100644
--- a/extra/kdelibs/PKGBUILD
+++ b/extra/kdelibs/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 124805 2011-05-24 14:15:20Z andrea $
+# $Id: PKGBUILD 130249 2011-07-04 19:26:50Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=kdelibs
-pkgver=4.6.3
-pkgrel=3
+pkgver=4.6.5
+pkgrel=1
 pkgdesc="KDE Core Libraries"
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.kde.org'
@@ -20,11 +20,11 @@ replaces=('arts' 'kdelibs-experimental')
 install='kdelibs.install'
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2"
         'kde-applications-menu.patch'
-        'abs-syntax-highlight.patch' 'fix-double-POST-action.patch')
-sha1sums=('c7fb089c9d52a6b1d9188b9e788753373a3288e4'
+        'abs-syntax-highlight.patch')
+sha1sums=('9bb948769a3a5d4d5b6c65e84a8cf570bd7bc120'
           '86ee8c8660f19de8141ac99cd6943964d97a1ed7'
-          'd994f262356af5b9e4e9619646e471bd98c91efb'
-          'c8ef05943e71a28c4604217d31fc6ca83e48476c')
+          '63a850ab4196b9d06934f2b4a13acd9f7739bc67'
+          'd994f262356af5b9e4e9619646e471bd98c91efb')
 
 build() {
        cd ${srcdir}/${pkgname}-${pkgver}
@@ -34,9 +34,6 @@ build() {
        # add syntax highlightning for PKGBUILD and .install files
        patch -p1 -i $srcdir/abs-syntax-highlight.patch
 
-       # Already fixed upstream
-       patch -p1 -i $srcdir/fix-double-POST-action.patch
-
        cd ${srcdir}
        mkdir build
        cd build
diff --git a/extra/kdemultimedia/PKGBUILD b/extra/kdemultimedia/PKGBUILD
index 35dbe4d09..45e56ecbd 100644
--- a/extra/kdemultimedia/PKGBUILD
+++ b/extra/kdemultimedia/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 121101 2011-04-29 00:27:58Z andrea $
+# $Id: PKGBUILD 130262 2011-07-04 19:27:51Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
@@ -10,7 +10,7 @@ pkgname=('kdemultimedia-dragonplayer'
          'kdemultimedia-kmix'
          'kdemultimedia-kscd'
          'kdemultimedia-mplayerthumbs')
-pkgver=4.6.3
+pkgver=4.6.5
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.kde.org'
@@ -20,7 +20,7 @@ makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdebase-runtime' 'tunepimp'
         'ffmpeg' 'mplayer' 'pulseaudio' 'libmusicbrainz3')
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2"
         'mplayerthumbs.config')
-sha1sums=('d5bde19156b65e9b56e0e6de800efc0efe117632'
+sha1sums=('081bead5ee758d169f3119c138424929b001d04f'
           'ba016fa2563c14ffcba852c62506b66bfc6ee683')
 
 build() {
diff --git a/extra/kdenetwork/PKGBUILD b/extra/kdenetwork/PKGBUILD
index 8163dfcac..3d6a6fcf4 100644
--- a/extra/kdenetwork/PKGBUILD
+++ b/extra/kdenetwork/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 121102 2011-04-29 00:28:01Z andrea $
+# $Id: PKGBUILD 130263 2011-07-04 19:27:58Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
@@ -10,7 +10,7 @@ pkgname=('kdenetwork-filesharing'
          'kdenetwork-kppp'
          'kdenetwork-krdc'
          'kdenetwork-krfb')
-pkgver=4.6.3
+pkgver=4.6.5
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.kde.org'
@@ -19,12 +19,12 @@ groups=('kde' 'kdenetwork')
 makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' 'speex' 'ortp' 'libotr'
 	'qca-ossl' 'kdebase-workspace' 'kdebase-lib' 'libvncserver' 'libmsn'
 	'ppp' 'v4l-utils' 'libidn' 'rdesktop' 'qimageblitz' 'libxdamage' 'libgadu'
-	'telepathy-qt4' 'libktorrent')
+	'telepathy-qt4' 'libktorrent' 'mediastreamer')
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
-sha1sums=('6f140dca442be815eda4fb79d51efd9e4588a1f1')
+sha1sums=('cc398063da61f9f9ef0db4455dc0c989a4e68a25')
 
 build() {
-    cd ${srcdir}
+    cd "${srcdir}"
 	mkdir build
 	cd build
 	cmake ../${pkgbase}-${pkgver} \
@@ -33,7 +33,8 @@ build() {
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DMOZPLUGIN_INSTALL_DIR=/usr/lib/mozilla/plugins/ \
         -DWITH_Xmms=OFF \
-		-DWITH_LibMeanwhile=OFF
+		-DWITH_LibMeanwhile=OFF \
+        -DWITH_msiLBC=OFF
 	make
 }
 
@@ -70,7 +71,7 @@ package_kdenetwork-kget() {
 package_kdenetwork-kopete() {
 	pkgdesc='Instant Messenger'
 	depends=('kdebase-runtime' 'kdepimlibs' 'qca-ossl' 'libotr' 'libmsn'
-	         'libidn' 'qimageblitz' 'v4l-utils' 'libgadu')
+	         'libidn' 'qimageblitz' 'v4l-utils' 'libgadu' 'mediastreamer')
 	url="http://kde.org/applications/internet/kopete/"
 	install='kdenetwork.install'
 	cd $srcdir/build/kopete
diff --git a/extra/kdepim-runtime/PKGBUILD b/extra/kdepim-runtime/PKGBUILD
index 421e86016..c88d69ffe 100644
--- a/extra/kdepim-runtime/PKGBUILD
+++ b/extra/kdepim-runtime/PKGBUILD
@@ -1,22 +1,27 @@
-# $Id: PKGBUILD 120273 2011-04-22 00:22:43Z andrea $
+# $Id: PKGBUILD 130494 2011-07-06 23:34:26Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=kdepim-runtime
-pkgver=4.4.11.1
+pkgver=4.6.1
 pkgrel=1
 pkgdesc='KDE PIM Runtime Environment'
 arch=('i686' 'x86_64' 'mips64el')
-url='http://www.kde.org'
+url='http://pim.kde.org'
 license=('GPL' 'LGPL' 'FDL')
 depends=('kdepimlibs' 'kdebase-runtime')
 makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost')
 install=${pkgname}.install
-source=("http://download.kde.org/stable/kdepim-${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('e3105eb99ab0de47c617f8491774b2e3ee4cdd4a')
+source=("http://download.kde.org/stable/kdepim-${pkgver}/src/${pkgname}-${pkgver}.tar.bz2"
+        'disable-l10n.patch')
+sha1sums=('e416ffd0142c720a779b4eb2e4a841ca751efdce'
+          'd4f8c39911cf288973a30d4b71087906ebb26359')
 
 build() {
-	cd $srcdir
+	cd "${srcdir}"/${pkgname}-${pkgver}
+    patch -p1 -i "${srcdir}"/disable-l10n.patch
+
+    cd "${srcdir}"
 	mkdir build
 	cd build
 	cmake ../${pkgname}-${pkgver} \
@@ -27,6 +32,6 @@ build() {
 }
 
 package() {
-	cd $srcdir/build
-	make DESTDIR=$pkgdir install
+	cd "${srcdir}"/build
+	make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/kdepim-runtime/disable-l10n.patch b/extra/kdepim-runtime/disable-l10n.patch
new file mode 100644
index 000000000..b49cd54a8
--- /dev/null
+++ b/extra/kdepim-runtime/disable-l10n.patch
@@ -0,0 +1,10 @@
+--- kdepim-runtime-4.6.0/CMakeLists.txt~	2011-06-10 16:49:12.130427269 +0000
++++ kdepim-runtime-4.6.0/CMakeLists.txt	2011-06-10 16:56:52.871414776 +0000
+@@ -194,7 +194,3 @@
+ update_xdg_mimetypes(${XDG_MIME_INSTALL_DIR})
+ 
+ macro_display_feature_log()
+-
+-find_package(Msgfmt REQUIRED)
+-find_package(Gettext REQUIRED)
+-add_subdirectory(po)
diff --git a/extra/kdepim-runtime/kdepim-runtime.install b/extra/kdepim-runtime/kdepim-runtime.install
index ce5c32e1b..c77e68041 100644
--- a/extra/kdepim-runtime/kdepim-runtime.install
+++ b/extra/kdepim-runtime/kdepim-runtime.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() {
@@ -9,4 +10,4 @@ post_upgrade() {
 
 post_remove() {
 	post_install
-}
-\ No newline at end of file
+}
diff --git a/extra/kdepim/PKGBUILD b/extra/kdepim/PKGBUILD
index a68675772..797351c17 100644
--- a/extra/kdepim/PKGBUILD
+++ b/extra/kdepim/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 120278 2011-04-22 00:23:46Z andrea $
+# $Id: PKGBUILD 130497 2011-07-06 23:35:24Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
@@ -20,219 +20,239 @@ pkgname=('kdepim-akonadiconsole'
          'kdepim-ktimetracker'
          'kdepim-libkdepim'
          'kdepim-wizards')
-pkgver=4.4.11.1
+pkgver=4.6.1
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
-url='http://www.kde.org'
+url='http://pim.kde.org'
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdepim')
 makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' 'kdepim-runtime' 'libxss'
              'pilot-link' 'kde-agent')
-source=("http://download.kde.org/stable/${pkgbase}-${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
-sha1sums=('49dd6cc8406b0ef4bb681bfc0de6ad9368b4b5b2')
+source=("http://download.kde.org/stable/${pkgbase}-${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2"
+        'disable-l10n.patch')
+sha1sums=('aa4dc75d33b3aa105e3f3b2f41e9d87b57cbf20a'
+          'f52c8d3918e3cd6d8e0180af243333ee2d87d382')
 
 build() {
-    cd ${srcdir}
-	mkdir build
-	cd build
-	cmake ../${pkgbase}-${pkgver} \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_SKIP_RPATH=ON \
-		-DCMAKE_INSTALL_PREFIX=/usr
-	make
+  cd "${srcdir}"/${pkgbase}-${pkgver}
+  patch -p1 -i "${srcdir}"/disable-l10n.patch
+
+  cd "${srcdir}"
+  mkdir build
+  cd build
+  cmake ../${pkgbase}-${pkgver} \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_SKIP_RPATH=ON \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DKDEPIM_BUILD_MOBILE=OFF
+  make
 }
 
 package_kdepim-akonadiconsole() {
 	pkgdesc='Akonadi Management and Debugging Console'
-	depends=('kdepim-libkdepim' 'kdebase-runtime')
+	depends=('kdepim-libkdepim')
+	url='http://pim.kde.org'
 	install='kdepim.install'
-	cd $srcdir/build/akonadiconsole
-	make DESTDIR=$pkgdir install
+	cd "${srcdir}"/build/akonadiconsole
+	make DESTDIR="${pkgdir}" install
 }
 
 package_kdepim-akregator() {
 	pkgdesc='A Feed Reader for KDE'
-	depends=('kdepim-libkdepim' 'kdebase-runtime')
+	depends=('kdepim-libkdepim')
 	url="http://kde.org/applications/internet/akregator/"
 	install='kdepim.install'
-	cd $srcdir/build/akregator
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/akregator
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/kontact/plugins/akregator
-	make DESTDIR=$pkgdir install
+	cd "${srcdir}"/build/akregator
+	make DESTDIR="${pkgdir}" install
+	cd "${srcdir}"/build/doc/akregator
+	make DESTDIR="${pkgdir}" install
+	cd "${srcdir}"/build/kontact/plugins/akregator
+	make DESTDIR="${pkgdir}" install
 }
 
 package_kdepim-blogilo() {
 	pkgdesc='A KDE Blogging Client'
-	depends=('kdebase-runtime' 'kdepimlibs' 'kdepim-runtime')
+	depends=('kdepim-runtime')
 	url="http://kde.org/applications/internet/blogilo/"
 	replaces=('blogilo')
 	conflicts=('blogilo')
 	install='kdepim.install'
-	cd $srcdir/build/blogilo
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/blogilo
-	make DESTDIR=$pkgdir install
+	cd "${srcdir}"/build/blogilo
+	make DESTDIR="${pkgdir}" install
+	cd "${srcdir}"/build/doc/blogilo
+	make DESTDIR="${pkgdir}" install
 }
 
 package_kdepim-console() {
 	pkgdesc='Command line tool for accessing calendar files'
-	depends=('kdebase-runtime' 'kdepimlibs' 'kdepim-runtime')
-	cd $srcdir/build/console
-	make DESTDIR=$pkgdir install
+	depends=('kdepim-runtime')
+	url='http://pim.kde.org'
+	install='kdepim.install'
+	cd "${srcdir}"/build/console
+	make DESTDIR="${pkgdir}" install
 }
 
 package_kdepim-kaddressbook() {
 	pkgdesc='Contact Manager'
-	depends=('kdepim-libkdepim' 'kdebase-runtime')
+	depends=('kdepim-libkdepim')
 	url="http://kde.org/applications/office/kaddressbook/"
 	install='kdepim.install'
-	cd $srcdir/build/kaddressbook
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/kontact/plugins/kaddressbook
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/plugins/kaddressbook
-	make DESTDIR=$pkgdir install
+	cd "${srcdir}"/build/kaddressbook
+	make DESTDIR="${pkgdir}" install
+	cd "${srcdir}"/build/kontact/plugins/kaddressbook
+	make DESTDIR="${pkgdir}" install
+	cd "${srcdir}"/build/plugins/kaddressbook
+	make DESTDIR="${pkgdir}" install
 }
 
 package_kdepim-kalarm() {
 	pkgdesc='Personal Alarm Scheduler'
-	depends=('kdepim-libkdepim' 'kdebase-runtime')
+	depends=('kdepim-libkdepim')
+	url="http://kde.org/applications/utilities/kalarm/"
 	install='kdepim.install'
-	cd $srcdir/build/kalarm
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kalarm
-	make DESTDIR=$pkgdir install
+	cd "${srcdir}"/build/kalarm
+	make DESTDIR="${pkgdir}" install
+	cd "${srcdir}"/build/doc/kalarm
+	make DESTDIR="${pkgdir}" install
 }
 
 package_kdepim-kjots() {
 	pkgdesc='Note Taker'
-	depends=('kdebase-runtime' 'kdepimlibs' 'kdepim-runtime')
+	depends=('kdepim-libkdepim')
+	url="http://kde.org/applications/utilities/kjots/"
 	install='kdepim.install'
-	cd $srcdir/build/kjots
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kjots
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/kontact/plugins/kjots
-	make DESTDIR=$pkgdir install
+	cd "${srcdir}"/build/kjots
+	make DESTDIR="${pkgdir}" install
+	cd "${srcdir}"/build/doc/kjots
+	make DESTDIR="${pkgdir}" install
+	cd "${srcdir}"/build/kontact/plugins/kjots
+	make DESTDIR="${pkgdir}" install
 }
 
 package_kdepim-kleopatra() {
 	pkgdesc='Certificate Manager and Unified Crypto GUI'
-	depends=('kdepim-libkdepim' 'kdebase-runtime')
-	cd $srcdir/build/kleopatra
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kleopatra
-	make DESTDIR=$pkgdir install
+	depends=('kdepim-libkdepim')
+	url="http://kde.org/applications/utilities/kleopatra/"
+    install='kdepim-kleopatra.install'
+	cd "${srcdir}"/build/kleopatra
+	make DESTDIR="${pkgdir}" install
+	cd "${srcdir}"/build/doc/kleopatra
+	make DESTDIR="${pkgdir}" install
 }
 
 package_kdepim-kmail() {
 	pkgdesc='Mail Client'
-	depends=('kdepim-libkdepim' 'kdebase-runtime')
+	depends=('kdepim-libkdepim')
 	url="http://kde.org/applications/internet/kmail/"
-	install='kdepim.install'
+	install='kdepim-kmail.install'
 	conflicts=('kdepim-kmailcvt' 'kdepim-ksendemail' 'kdepim-libksieve'
 	           'kdepim-mimelib' 'kdepim-plugins')
 	replaces=('kdepim-kmailcvt' 'kdepim-ksendemail' 'kdepim-libksieve'
 	          'kdepim-mimelib' 'kdepim-plugins')
-    optdepends=('cyrus-sasl-plugins: CRAM-MD5 authentication')
-	for i in kmail doc/kmail mimelib libksieve plugins/kmail ksendemail \
-		kmailcvt ontologies kontact/plugins/kmail; do
-		cd $srcdir/build/${i}
-		make DESTDIR=$pkgdir install
+	optdepends=('cyrus-sasl-plugins: CRAM-MD5 authentication')
+	for i in kmail doc/kmail kmailcvt ksendemail libksieve mailcommon \
+		nepomuk_email_feeder ontologies templateparser kontact/plugins/kmail; do
+		cd "${srcdir}"/build/${i}
+		make DESTDIR="${pkgdir}" install
 	done
 }
 
 package_kdepim-knode() {
 	pkgdesc='News Reader'
-	depends=('kdebase-runtime' 'kdepim-libkdepim')
+	depends=('kdepim-libkdepim')
 	url="http://kde.org/applications/internet/knode/"
 	install='kdepim.install'
-	cd $srcdir/build/knode
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/knode
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/kontact/plugins/knode
-	make DESTDIR=$pkgdir install
+	cd "${srcdir}"/build/knode
+	make DESTDIR="${pkgdir}" install
+	cd "${srcdir}"/build/doc/knode
+	make DESTDIR="${pkgdir}" install
+	cd "${srcdir}"/build/kontact/plugins/knode
+	make DESTDIR="${pkgdir}" install
 }
 
 package_kdepim-knotes() {
 	pkgdesc='Popup Notes'
-	depends=('kdepim-libkdepim' 'kdebase-runtime')
+	depends=('kdepim-libkdepim')
+	url="http://kde.org/applications/utilities/knotes/"
 	install='kdepim.install'
-	cd $srcdir/build/knotes
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/knotes
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/kontact/plugins/knotes
-	make DESTDIR=$pkgdir install
+	cd "${srcdir}"/build/knotes
+	make DESTDIR="${pkgdir}" install
+	cd "${srcdir}"/build/doc/knotes
+	make DESTDIR="${pkgdir}" install
+	cd "${srcdir}"/build/kontact/plugins/knotes
+	make DESTDIR="${pkgdir}" install
 }
 
 package_kdepim-kontact() {
 	pkgdesc='Personal Information Manager'
-	depends=('kdebase-runtime' 'kdepim-korganizer')
+	depends=('kdepim-libkdepim')
 	url="http://kde.org/applications/office/kontact/"
 	install='kdepim.install'
 	conflcits=('kdepim-kontactinterfaces')
 	replaces=('kdepim-kontactinterfaces')
-	for i in kontact/src kontact/pics doc/kontact\
-		kontact/plugins/summary; do
-		cd $srcdir/build/${i}
-		make DESTDIR=$pkgdir install
+	for i in kontact/src doc/kontact \
+		kontact/plugins/summary kontact/plugins/specialdates; do
+		cd "${srcdir}"/build/${i}
+		make DESTDIR="${pkgdir}" install
 	done
 }
 
 package_kdepim-korganizer() {
 	pkgdesc='Calendar and Scheduling Program'
-	depends=('kdepim-libkdepim' 'kdebase-runtime')
+	depends=('kdepim-libkdepim')
 	url="http://kde.org/applications/office/korganizer"
-	install='kdepim.install'
-	cd $srcdir/build/korganizer
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/korganizer
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/kontact/plugins/korganizer
-	make DESTDIR=$pkgdir install
+	install='kdepim-korganizer.install'
+	cd "${srcdir}"/build/korganizer
+	make DESTDIR="${pkgdir}" install
+	cd "${srcdir}"/build/doc/korganizer
+	make DESTDIR="${pkgdir}" install
+	cd "${srcdir}"/build/kontact/plugins/korganizer
+	make DESTDIR="${pkgdir}" install
 }
 
 package_kdepim-kresources() {
 	pkgdesc='KDE PIM resources'
-	depends=('kdebase-runtime' 'kdepim-libkdepim')
-	cd $srcdir/build/kresources
-	make DESTDIR=$pkgdir install
+	depends=('kdepim-libkdepim')
+	url='http://pim.kde.org'
+	cd "${srcdir}"/build/kresources
+	make DESTDIR="${pkgdir}" install
 }
 
 package_kdepim-ktimetracker() {
 	pkgdesc='Personal Time Tracker'
-	depends=('kdebase-runtime' 'kdepim-kresources')
+	depends=('kdepim-kresources')
+	url="http://kde.org/applications/utilities/ktimetracker/"
 	install='kdepim.install'
-	cd $srcdir/build/ktimetracker
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/ktimetracker
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/kontact/plugins/ktimetracker
-	make DESTDIR=$pkgdir install
+	cd "${srcdir}"/build/ktimetracker
+	make DESTDIR="${pkgdir}" install
+	cd "${srcdir}"/build/doc/ktimetracker
+	make DESTDIR="${pkgdir}" install
+	cd "${srcdir}"/build/kontact/plugins/ktimetracker
+	make DESTDIR="${pkgdir}" install
 }
 
 package_kdepim-libkdepim() {
 	pkgdesc='Library for KDE PIM'
 	groups=()
-	depends=('kdepimlibs' 'kde-agent' 'kdepim-runtime')
+	depends=('kde-agent' 'kdepim-runtime')
+	url='http://pim.kde.org'
 	conflicts=('kdepim-icons' 'kdepim-libkleo' 'kdepim-libkpgp'
 	            'kdepim-strigi-analyzer' 'kdepim-akonadi')
 	replaces=('kdepim-icons' 'kdepim-libkleo' 'kdepim-libkpgp'
 	          'kdepim-strigi-analyzer' 'kdepim-akonadi')
-	for i in libkdepim icons libkleo libkpgp strigi-analyzer \
-		messagecore messagelist messageviewer akonadi plugins/ktexteditor; do
-		cd $srcdir/build/${i}
-		make DESTDIR=$pkgdir install
+	for i in akonadi_next calendarsupport calendarviews incidenceeditor-ng \
+		kdgantt2 libkdepim libkdepimdbusinterfaces libkleo libkpgp \
+		messagecomposer messagecore messagelist messageviewer icons \
+		strigi-analyzer plugins/messageviewer plugins/ktexteditor; do
+		cd "${srcdir}"/build/${i}
+		make DESTDIR="${pkgdir}" install
 	done
 }
 
 package_kdepim-wizards() {
 	pkgdesc='KDE Groupware Wizard'
-	depends=('kdebase-runtime' 'kdepim-libkdepim' 'kdepim-kresources')
-	cd $srcdir/build/wizards
-	make DESTDIR=$pkgdir install
+	depends=('kdepim-kresources')
+	url='http://pim.kde.org'
+	cd "${srcdir}"/build/wizards
+	make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/kdepim/disable-l10n.patch b/extra/kdepim/disable-l10n.patch
new file mode 100644
index 000000000..0c24ab408
--- /dev/null
+++ b/extra/kdepim/disable-l10n.patch
@@ -0,0 +1,10 @@
+--- kdepim-4.6.1/CMakeLists.txt~	2011-07-06 19:17:16.801814825 +0000
++++ kdepim-4.6.1/CMakeLists.txt	2011-07-06 19:17:34.141961840 +0000
+@@ -425,7 +425,3 @@
+ endif(NOT QGPGME_FOUND)
+ # All done, let's display what we found...
+ macro_display_feature_log()
+-find_package(Msgfmt REQUIRED)
+-find_package(Gettext REQUIRED)
+-add_subdirectory(po)
+-add_subdirectory(doc-translations)
diff --git a/extra/kdepim/kdepim-kleopatra.install b/extra/kdepim/kdepim-kleopatra.install
new file mode 100644
index 000000000..81ce5c4b0
--- /dev/null
+++ b/extra/kdepim/kdepim-kleopatra.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/kdepim/kdepim-kmail.install b/extra/kdepim/kdepim-kmail.install
new file mode 100644
index 000000000..81ce5c4b0
--- /dev/null
+++ b/extra/kdepim/kdepim-kmail.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/kdepim/kdepim-korganizer.install b/extra/kdepim/kdepim-korganizer.install
new file mode 100644
index 000000000..81ce5c4b0
--- /dev/null
+++ b/extra/kdepim/kdepim-korganizer.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/kdepimlibs/PKGBUILD b/extra/kdepimlibs/PKGBUILD
index e285528bc..964f26bf9 100644
--- a/extra/kdepimlibs/PKGBUILD
+++ b/extra/kdepimlibs/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 121090 2011-04-29 00:27:22Z andrea $
+# $Id: PKGBUILD 130250 2011-07-04 19:26:55Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=kdepimlibs
-pkgver=4.6.3
+pkgver=4.6.5
 pkgrel=1
 pkgdesc="KDE PIM Libraries"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ depends=('kdelibs' 'gpgme' 'akonadi' 'libical' )
 makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' 'cyrus-sasl' 'openldap')
 install='kdepimlibs.install'
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('370b4e98ab9e1f8ba18d36630d5c8bbff8da4883')
+sha1sums=('6bf82a0934d5a16223f193e848bf3696a40e4820')
 
 build() {
 	cd ${srcdir}
diff --git a/extra/kdeplasma-addons/PKGBUILD b/extra/kdeplasma-addons/PKGBUILD
index f28feb08a..934b2b469 100644
--- a/extra/kdeplasma-addons/PKGBUILD
+++ b/extra/kdeplasma-addons/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 122728 2011-05-06 08:49:57Z andrea $
+# $Id: PKGBUILD 130264 2011-07-04 19:28:03Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
@@ -72,7 +72,7 @@ pkgname=('kdeplasma-addons-applets-bball'
          'kdeplasma-addons-wallpapers-pattern'
          'kdeplasma-addons-wallpapers-virus'
          'kdeplasma-addons-wallpapers-weather')
-pkgver=4.6.3
+pkgver=4.6.5
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.kde.org'
@@ -81,7 +81,7 @@ groups=('kde' 'kdeplasma-addons')
 makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdebase-workspace' 'kdegraphics-libs'
 	         'kdeedu-marble' 'eigen' 'scim' 'qwt' 'boost')
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
-sha1sums=('7a43dcfebc0316e681b04d0958d89272620a11b7')
+sha1sums=('3bce5e41160ec318dbea9128c3e9104a4428deb8')
 
 build() {
     cd ${srcdir}
diff --git a/extra/kdesdk/PKGBUILD b/extra/kdesdk/PKGBUILD
index afb12e671..7c51f7b13 100644
--- a/extra/kdesdk/PKGBUILD
+++ b/extra/kdesdk/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 126168 2011-06-02 00:51:07Z andrea $
+# $Id: PKGBUILD 130265 2011-07-04 19:28:07Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
@@ -23,8 +23,8 @@ pkgname=('kdesdk-cervisia'
          'kdesdk-scripts'
          'kdesdk-strigi-analyzer'
          'kdesdk-umbrello')
-pkgver=4.6.3
-pkgrel=2
+pkgver=4.6.5
+pkgrel=1
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
 license=('GPL' 'LGPL' 'FDL')
@@ -33,7 +33,7 @@ makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' 'kdepim-runtime' 'subversion
         'antlr2' 'kdebase-konqueror')
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2"
         'fix-python2-path.patch')
-sha1sums=('6faecbd828fda6cf0aced642287d982d3541d746'
+sha1sums=('8cffa0472fbe1096ebfea9bde49aaff76a145b34'
           'd05ca0231869c484fd3861955d960a60aff7dcfb')
 
 build() {
diff --git a/extra/kdetoys/PKGBUILD b/extra/kdetoys/PKGBUILD
index 490da8856..b9afc3add 100644
--- a/extra/kdetoys/PKGBUILD
+++ b/extra/kdetoys/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 121104 2011-04-29 00:28:07Z andrea $
+# $Id: PKGBUILD 130266 2011-07-04 19:28:12Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
@@ -6,7 +6,7 @@ pkgbase=kdetoys
 pkgname=('kdetoys-amor'
          'kdetoys-kteatime'
          'kdetoys-ktux')
-pkgver=4.6.3
+pkgver=4.6.5
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.kde.org'
@@ -14,7 +14,7 @@ license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdetoys')
 makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdebase-workspace')
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
-sha1sums=('07eaf12ccabc9209bd5de6a3f0e4ff6c70fca8b0')
+sha1sums=('0ce43a76f5b7005d60430692ae87421661281f1f')
 
 build() {
 	cd $srcdir
diff --git a/extra/kdeutils/PKGBUILD b/extra/kdeutils/PKGBUILD
index 7fc6bb18b..e53730aa6 100644
--- a/extra/kdeutils/PKGBUILD
+++ b/extra/kdeutils/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 121105 2011-04-29 00:28:11Z andrea $
+# $Id: PKGBUILD 130267 2011-07-04 19:28:16Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
@@ -16,7 +16,7 @@ pkgname=('kdeutils-ark'
          'kdeutils-printer-applet'
          'kdeutils-superkaramba'
          'kdeutils-sweeper')
-pkgver=4.6.3
+pkgver=4.6.5
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.kde.org'
@@ -26,7 +26,7 @@ makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdebase-lib' 'kdebase-workspace'
 	'kdebindings-python' 'system-config-printer-common' 'libarchive' 'qimageblitz'
 	'qjson')
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
-sha1sums=('1aa735c03689ef49b949278ee31d0d8e8536b7d6')
+sha1sums=('1c2ae023d9a6bcf72d3cebd0d7df2e6a175ffdcb')
 
 build() {
 	cd ${srcdir}
diff --git a/extra/kdewebdev/PKGBUILD b/extra/kdewebdev/PKGBUILD
index 3da6dd566..ee5efbdbd 100644
--- a/extra/kdewebdev/PKGBUILD
+++ b/extra/kdewebdev/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 121106 2011-04-29 00:28:14Z andrea $
+# $Id: PKGBUILD 130268 2011-07-04 19:28:19Z andrea $
 # Maintainer: Pierre Schmitz <pierre@archlinux.de>
 
 pkgbase=kdewebdev
@@ -6,7 +6,7 @@ pkgname=('kdewebdev-kfilereplace'
          'kdewebdev-kimagemapeditor'
          'kdewebdev-klinkstatus'
          'kdewebdev-kommander')
-pkgver=4.6.3
+pkgver=4.6.5
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.kde.org'
@@ -15,7 +15,7 @@ groups=('kde' 'kdewebdev')
 makedepends=('pkgconfig' 'cmake' 'automoc4' 'ruby' 'tidyhtml' 'kdepim-runtime'
 	'boost')
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
-sha1sums=('39e72fbaf76ee1c685321c8c3a767c38e63bc2a9')
+sha1sums=('b7ec635c438f865337f5ef1e7bbaca23643ed871')
 
 build() {
 	cd $srcdir
diff --git a/extra/libpng/PKGBUILD b/extra/libpng/PKGBUILD
index 394ffe2cd..45de74b8c 100644
--- a/extra/libpng/PKGBUILD
+++ b/extra/libpng/PKGBUILD
@@ -1,23 +1,23 @@
-# $Id: PKGBUILD 103693 2010-12-22 14:49:59Z jgc $
+# $Id: PKGBUILD 130820 2011-07-08 07:28:34Z andyrtr $
 # 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.4.5
-_apngver=1.4.5
+pkgver=1.4.8
+_apngver=1.4.7
 pkgrel=1
 pkgdesc="A collection of routines used to create PNG format graphics files"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.libpng.org/pub/png/libpng.html"
 license=('custom')
-depends=('zlib')
+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=('37d420c7d8294aac438c150bb4335901'
-         '459affb0ac7e0f1ae4d99b88234cb3db')
+md5sums=('2ce595d571f2b06a9403ed5bcfa4ecbd'
+         '4842a4cba3487a64084ca0a7417ff1c7')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -28,6 +28,10 @@ build() {
 
   ./configure --prefix=/usr
   make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}" install
 
   cd contrib/pngminus
diff --git a/extra/libreoffice/PKGBUILD b/extra/libreoffice/PKGBUILD
index 74b940110..9dc386211 100644
--- a/extra/libreoffice/PKGBUILD
+++ b/extra/libreoffice/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 130106 2011-07-02 19:39:19Z andyrtr $
+# $Id: PKGBUILD 130669 2011-07-07 16:34:03Z andyrtr $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 
 pkgbase="libreoffice"
@@ -77,7 +77,6 @@ source=(${_mirror}/${pkgbase}-{artwork,base,bootstrap,calc,components,extensions
 	http://download.go-oo.org/src/7a0dcb3fe1e8c7229ab4fb868b7325e6-mdds_0.5.2.tar.bz2
 	http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll
 	http://download.go-oo.org/extern/b4cae0700aa1c2aef7eb7f345365e6f1-translate-toolkit-1.8.1.tar.bz2
-	http://download.go-oo.org/src/451ccf439a36a568653b024534669971-ConvertTextToNumber-1.3.2.oxt
 	http://download.go-oo.org/src/90401bca927835b6fbae4a707ed187c8-nlpsolver-0.9.tar.bz2
 	http://download.go-oo.org/src/f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2
 	http://ooo.itc.hu/oxygenoffice/download/libreoffice/7e7efc5d4a03126bb9ae3ae9aa2c4e87-Barcode_1.3.1.0.oxt
@@ -177,7 +176,6 @@ md5sums=('10b3212002688e7ce49a276c68352b50'
          '7a0dcb3fe1e8c7229ab4fb868b7325e6'
          '185d60944ea767075d27247c3162b3bc'
          'b4cae0700aa1c2aef7eb7f345365e6f1'
-         '451ccf439a36a568653b024534669971'
          '90401bca927835b6fbae4a707ed187c8'
          'f02578f5218f217a9f20e9c30e119c6a'
          '7e7efc5d4a03126bb9ae3ae9aa2c4e87'
diff --git a/extra/libxcursor/PKGBUILD b/extra/libxcursor/PKGBUILD
index 6199211a2..aca6b0796 100644
--- a/extra/libxcursor/PKGBUILD
+++ b/extra/libxcursor/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 97807 2010-11-01 22:23:46Z jgc $
+# $Id: PKGBUILD 130855 2011-07-08 13:02:13Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Alexander Baldeck <alexander@archlinux.org>
 pkgname=libxcursor
-pkgver=1.1.11
+pkgver=1.1.12
 pkgrel=1
 pkgdesc="X cursor management library"
 arch=(i686 x86_64 'mips64el')
@@ -12,12 +12,16 @@ depends=('libxfixes' 'libxrender')
 makedepends=('xorg-util-macros')
 options=('!libtool')
 source=(${url}/releases/individual/lib/libXcursor-${pkgver}.tar.bz2)
-sha1sums=('35491bd17cbcdda712e1a064c67ccbc523e2702c')
+sha1sums=('f68d7baed5ecf4b1ae88004dd05ef4680d63ee2c')
 
 build() {
   cd "${srcdir}/libXcursor-${pkgver}"
   ./configure --prefix=/usr --sysconfdir=/etc --disable-static
   make
+}
+
+package() {
+  cd "${srcdir}/libXcursor-${pkgver}"
   make DESTDIR="${pkgdir}" install
 
   install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
diff --git a/extra/libxi/PKGBUILD b/extra/libxi/PKGBUILD
index b6657834e..d7dbfd42f 100644
--- a/extra/libxi/PKGBUILD
+++ b/extra/libxi/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 115723 2011-03-20 15:52:24Z andyrtr $
+# $Id: PKGBUILD 130682 2011-07-07 17:24:45Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libxi
@@ -11,7 +11,7 @@ depends=('libxext' 'inputproto')
 makedepends=('pkgconfig' 'xorg-util-macros')
 options=(!libtool)
 license=('custom')
-source=(${url}/releases/individual/lib/libXi-${pkgver}.tar.bz2
+source=(${url}/releases/individual/lib/libXi-${pkgver}.tar.bz2)
         XExtInt-align-classes-n32.diff)
 sha1sums=('c66cfdee74e8d169a7992b5f257395e653ca761b'
           '30931831efa9a7f8a888f41bb9284fa32f2e2392')
diff --git a/extra/libxrandr/PKGBUILD b/extra/libxrandr/PKGBUILD
index e10b084ba..8efc601e4 100644
--- a/extra/libxrandr/PKGBUILD
+++ b/extra/libxrandr/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 97787 2010-11-01 22:11:26Z jgc $
+# $Id: PKGBUILD 130687 2011-07-07 17:27:06Z andyrtr $
 # Maintainer: Alexander Baldeck <alexander@archlinux.org>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 pkgname=libxrandr
-pkgver=1.3.1
+pkgver=1.3.2
 pkgrel=1
 pkgdesc="X11 RandR extension library"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ depends=('libxext' 'libxrender' 'randrproto')
 makedepends=('xorg-util-macros')
 options=('!libtool')
 source=(${url}/releases/individual/lib/libXrandr-${pkgver}.tar.bz2)
-sha1sums=('8e89622b0656cb2eb22c1f3c646c797dc648ead5')
+sha1sums=('0c844a4c5237f96794f0c18a5af16dc5ab7a36ec')
 
 build() {
   cd "${srcdir}/libXrandr-${pkgver}"
diff --git a/extra/monica/PKGBUILD b/extra/monica/PKGBUILD
index ac1dd942d..0615205f3 100644
--- a/extra/monica/PKGBUILD
+++ b/extra/monica/PKGBUILD
@@ -1,30 +1,33 @@
-# $Id: PKGBUILD 2959 2008-06-17 01:02:56Z eric $
+# $Id: PKGBUILD 130314 2011-07-04 22:06:55Z eric $
 # Maintainer: tobias <tobias@archlinux.org>
 # Contributor: Tobias Kieslich <tobias@justdreams.de>
 
 pkgname=monica
 pkgver=3.7
-pkgrel=1
+pkgrel=2
 pkgdesc="A monitor calibration tool"
-arch=(i686 x86_64 'mips64el')
-license=('custom')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.pcbypaul.com/software/monica.html"
-depends=('fltk')
-makedepends=('librsvg' 'python')
-source=(http://www.pcbypaul.com/software/dl/${pkgname}-${pkgver}.tar.bz2 \
-        ${pkgname}.desktop ${pkgname}.svg)
-md5sums=('490aabc35b830e4a3dc32a2f893ba805' 'a337bfda1fca7228420db0ce92256816'\
+license=('BSD')
+depends=('fltk' 'xorg-xgamma')
+makedepends=('librsvg')
+#http://www.pcbypaul.com/software/dl/${pkgname}-${pkgver}.tar.bz2
+source=(ftp://ftp.archlinux.org/other/monica/${pkgname}-${pkgver}.tar.bz2 \
+        monica.desktop monica.svg)
+md5sums=('490aabc35b830e4a3dc32a2f893ba805'
+         'a337bfda1fca7228420db0ce92256816'
          '4569f5df7d7b3eaf20108adf48e8dfe4')
 
 build() {
-  cd ${startdir}/src/${pkgname}-${pkgver}
-  make || return 1
-  install -Dm755 ${pkgname} ${startdir}/pkg/usr/bin/${pkgname}
-  install -Dm644 ../${pkgname}.desktop \
-    ${startdir}/pkg/usr/share/applications/${pkgname}.desktop
-  install -Dm644 ../${pkgname}.svg \
-    ${startdir}/pkg/usr/share/pixmaps/${pkgname}.svg
-  rsvg -w 64 -h 57 -f png ${startdir}/pkg/usr/share/pixmaps/${pkgname}.svg \
-    ${startdir}/pkg/usr/share/pixmaps/${pkgname}.png
-  install -Dm644 licence ${startdir}/pkg/usr/share/licenses/monica/license.txt
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  install -Dm755 monica "${pkgdir}/usr/bin/monica"
+  install -Dm644 "${srcdir}/monica.desktop" "${pkgdir}/usr/share/applications/monica.desktop"
+  install -Dm644 "${srcdir}/monica.svg" "${pkgdir}/usr/share/pixmaps/monica.svg"
+  rsvg-convert -w 64 -h 57 -f png -o "${pkgdir}/usr/share/pixmaps/monica.png" "${srcdir}/monica.svg"
+  install -Dm644 licence "${pkgdir}/usr/share/licenses/monica/license.txt"
 }
diff --git a/extra/networkmanager-openvpn/PKGBUILD b/extra/networkmanager-openvpn/PKGBUILD
index 7463def53..f65860d6b 100644
--- a/extra/networkmanager-openvpn/PKGBUILD
+++ b/extra/networkmanager-openvpn/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 122487 2011-05-04 09:23:49Z ibiru $
+# $Id: PKGBUILD 130881 2011-07-08 15:29:40Z ibiru $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=networkmanager-openvpn
-pkgver=0.8.999
+pkgver=0.8.9997
 pkgrel=1
 pkgdesc="NetworkManager VPN plugin for OpenVPN"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,8 +13,8 @@ makedepends=('intltool')
 optdepends=('network-manager-applet: GNOME frontends to NetWorkmanager')
 install=networkmanager-openvpn.install
 options=('!libtool')
-source=(http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-openvpn/0.8/NetworkManager-openvpn-${pkgver}.tar.bz2)
-sha256sums=('be1837025226b9f85621b32d0ebe5f971a4fb7e9094c39f89ce1af7403ee8da1')
+source=(http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-openvpn/0.8/NetworkManager-openvpn-${pkgver}.tar.xz)
+sha256sums=('47aa4d73a3e2074cf7fe4c293213df00a2fd0f76e663b05e7178731a5faa2c02')
 
 build() {
   cd "${srcdir}/NetworkManager-openvpn-${pkgver}"
diff --git a/extra/obexd/PKGBUILD b/extra/obexd/PKGBUILD
index f537f0771..3b07cbc6b 100644
--- a/extra/obexd/PKGBUILD
+++ b/extra/obexd/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 106996 2011-01-20 12:27:07Z andrea $
+# $Id: PKGBUILD 130696 2011-07-07 21:06:55Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Geoffroy Carrier <geoffroy@archlinux.org>
 
 pkgbase=obexd
 pkgname=('obexd-client' 'obexd-server')
-pkgver=0.40
+pkgver=0.41
 pkgrel=1
 url="http://www.bluez.org/"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
 makedepends=('openobex' 'libical')
 source=("http://www.kernel.org/pub/linux/bluetooth/${pkgbase}-${pkgver}.tar.bz2")
-md5sums=('f303592b7664b246965c1d6e9361c919')
+md5sums=('d8ec74f18014e0f7164bcc37dee6723b')
 
 build() {
   cd "${srcdir}/${pkgbase}-${pkgver}"
diff --git a/extra/postfix/PKGBUILD b/extra/postfix/PKGBUILD
index cfa680456..c94fdc984 100644
--- a/extra/postfix/PKGBUILD
+++ b/extra/postfix/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 127765 2011-06-18 08:12:47Z bisson $
+# $Id: PKGBUILD 130701 2011-07-07 21:12:32Z bisson $
 # Contributor: Jeff Brodnax <tullyarcher@bellsouth.net>
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Maintainer: Paul Mattal <paul@archlinux.org>
 
 pkgname=postfix
-pkgver=2.8.3
-pkgrel=4
+pkgver=2.8.4
+pkgrel=1
 pkgdesc='Secure, fast, easy to administer drop in replacement for Sendmail (MTA)'
 url='http://www.postfix.org/'
 arch=('i686' 'x86_64' 'mips64el')
@@ -15,7 +15,7 @@ backup=('etc/postfix/'{access,aliases,canonical,generic,header_checks,main.cf,ma
 source=("ftp://ftp.porcupine.org/mirrors/postfix-release/official/${pkgname}-${pkgver}.tar.gz" \
         'aliases.patch' \
         'rc.d')
-sha1sums=('2604066f158f5327449960afd6334b996dc01799'
+sha1sums=('48d077ad2614098f39411cb965a74d8ce2f3e5be'
           '5fc3de6c7df1e5851a0a379e825148868808318b'
           '40c6be2eb55e6437a402f43775cdb3d22ea87a66')
 
@@ -27,7 +27,7 @@ install=install
 
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
-	
+
 	make makefiles DEBUG='' CCARGS=' \
 		-DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I/usr/include/sasl \
 		-DHAS_LDAP \
diff --git a/extra/rasqal/PKGBUILD b/extra/rasqal/PKGBUILD
index 5ada50032..ca84c03b5 100644
--- a/extra/rasqal/PKGBUILD
+++ b/extra/rasqal/PKGBUILD
@@ -1,21 +1,19 @@
-# $Id: PKGBUILD 120960 2011-04-27 19:27:24Z andrea $
+# $Id: PKGBUILD 130165 2011-07-02 23:00:40Z andrea $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Contributor: Lawrence Lee <valheru@facticius.net>
 
 pkgname=rasqal
 epoch=1
-pkgver=0.9.21
+pkgver=0.9.26
 pkgrel=1
 pkgdesc="A free C library that handles Resource Description Framework (RDF) query syntaxes, query construction and query execution returning result bindings"
 url="http://librdf.org/rasqal"
 license=('GPL' 'LGPL')
 arch=('i686' 'x86_64' 'mips64el')
-depends=('raptor1' 'mpfr')
+depends=('raptor>=2.0.3' 'mpfr')
 options=('!libtool')
-replaces=('rasqal-compat')
-conflicts=('rasqal-compat')
 source=(http://download.librdf.org/source/${pkgname}-${pkgver}.tar.gz)
-md5sums=('55b67ec92a059ef8979d46486b00a032')
+md5sums=('1e9fe5423498f10f636319633855e691')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
diff --git a/extra/soprano/PKGBUILD b/extra/soprano/PKGBUILD
index 671d19b8b..5052681ff 100644
--- a/extra/soprano/PKGBUILD
+++ b/extra/soprano/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 127976 2011-06-20 14:47:11Z andrea $
+# $Id: PKGBUILD 130173 2011-07-02 23:43:27Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=soprano
-pkgver=2.6.0
-pkgrel=6
+pkgver=2.6.50git20110703
+pkgrel=1
 pkgdesc='A library which provides a highly usable object-oriented C++/Qt4 framework for RDF data'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://soprano.sourceforge.net/'
@@ -12,8 +12,9 @@ license=('GPL' 'LGPL')
 depends=('qt' 'redland-storage-virtuoso' 'libiodbc' 'virtuoso')
 makedepends=('cmake' 'openjdk6' 'doxygen')
 [ "$CARCH" = "mips64el" ] && makedepends=('cmake' 'doxygen')
-source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('03ae49e87c6ec99e57d0433c2650846f')
+#source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
+source=("${pkgname}-${pkgver}.tar.bz2"::"http://quickgit.kde.org/?p=soprano.git&a=snapshot&h=3a7a527fd07c0d58146eb9e6770ecbcfb6717bc6&fmt=tbz2")
+md5sums=('21ef1f075062ea13d3e55d89d8f92fd2')
 
 build() {
   cd "${srcdir}"
@@ -23,7 +24,7 @@ build() {
   [ "$CARCH" = "mips64el" ] || \
   . /etc/profile.d/openjdk6.sh
   # we need the rpath
-  cmake ../${pkgname}-${pkgver} \
+  cmake ../${pkgname} \
     -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_SKIP_RPATH=OFF \
     -DCMAKE_INSTALL_PREFIX=/usr \
diff --git a/extra/telepathy-salut/PKGBUILD b/extra/telepathy-salut/PKGBUILD
index ab1bbfafd..94ba3d455 100644
--- a/extra/telepathy-salut/PKGBUILD
+++ b/extra/telepathy-salut/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 129928 2011-06-30 10:52:28Z ibiru $
+# $Id: PKGBUILD 130825 2011-07-08 08:13:11Z ibiru $
 # Maintainer:  Ionut Biru <ibiru@archlinux.org>
 # Contributor: Daniel Balieiro <daniel@balieiro.com>
 pkgname=telepathy-salut
-pkgver=0.5.0
+pkgver=0.5.1
 pkgrel=1
 pkgdesc="A link-local XMPP connection manager for Telepathy"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ depends=('telepathy-glib' 'avahi' 'libsoup')
 makedepends=('libxslt' 'python2' 'xmldiff')
 install=telepathy-salut.install
 source=(http://telepathy.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-md5sums=('0642bd33d5d5e8e50087ace1faa769cd')
+md5sums=('8c9a0588d9b74c467a8b2dcb442efae1')
 
 build() {
     cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/upower/PKGBUILD b/extra/upower/PKGBUILD
index 30a9704c2..c7887ed96 100644
--- a/extra/upower/PKGBUILD
+++ b/extra/upower/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 124973 2011-05-25 14:17:57Z ibiru $
+# $Id: PKGBUILD 130830 2011-07-08 08:18:13Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=upower
-pkgver=0.9.11
+pkgver=0.9.12
 pkgrel=1
 pkgdesc="Abstraction for enumerating power devices, listening to device events and querying history and statistics"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,8 +12,8 @@ depends=('udev' 'libusb' 'polkit' 'pm-utils' 'dbus-glib')
 makedepends=('pkg-config' 'intltool' 'docbook-xsl' 'gobject-introspection')
 replaces=('devicekit-power')
 options=('!libtool')
-source=($url/releases/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('567358cc1b4887485d29e309897dd091c2c2ae95e48dfbb3279ffdc44a4b2956')
+source=($url/releases/${pkgname}-${pkgver}.tar.xz)
+sha256sums=('06e7bb323c93a8e377a3cc5000b8deafdd22c92f3d2f3ef7f1a1f74d8e134bb0')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/usbmuxd/PKGBUILD b/extra/usbmuxd/PKGBUILD
index 396f108a3..96b2e3cbb 100644
--- a/extra/usbmuxd/PKGBUILD
+++ b/extra/usbmuxd/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 101289 2010-11-28 18:01:54Z ibiru $
+# $Id: PKGBUILD 130891 2011-07-08 15:48:48Z ibiru $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: Gabriel Martinez < reitaka at gmail dot com >
 
 pkgname=usbmuxd
-pkgver=1.0.6
-pkgrel=2
+pkgver=1.0.7
+pkgrel=1
 pkgdesc="USB Multiplex Daemon"
 url="http://marcansoft.com/blog/iphonelinux/usbmuxd/"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,17 +12,18 @@ license=('GPL2' 'GPL3' 'LGPL2.1')
 depends=('libusb>=1.0.8')
 makedepends=('cmake')
 install=usbmuxd.install
-source=(http://marcansoft.com/uploads/${pkgname}/${pkgname}-${pkgver}.tar.bz2
-	usbmuxd-udevuser.patch)
-md5sums=('c8909cfd9253d8d1a5e26f2ff7e5908b'
-         '299349dcacd60af9dceecec1ceebce06')
+source=(http://marcansoft.com/uploads/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('6f431541f3177fa06aa6df9ceecb2da0')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i "${srcdir}/usbmuxd-udevuser.patch"
   mkdir build
   cd build
   cmake ../ -DCMAKE_INSTALL_PREFIX:PATH=/usr -DLIB_SUFFIX=""
   make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}/build"
   make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/vinagre/PKGBUILD b/extra/vinagre/PKGBUILD
index 1801cb940..82128c578 100644
--- a/extra/vinagre/PKGBUILD
+++ b/extra/vinagre/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 120639 2011-04-25 18:49:25Z ibiru $
+# $Id: PKGBUILD 130886 2011-07-08 15:35:02Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Maintainer: Allan McRae <mcrae_allan@hotmail.com>
 # Contributor: lp76 <l.peduto@gmail.com>
 
 pkgname=vinagre
-pkgver=3.0.1
+pkgver=3.0.2
 pkgrel=1
 pkgdesc="A VNC Client for the GNOME Desktop"
 arch=('i686' 'x86_64' 'mips64el')
@@ -16,12 +16,11 @@ optdepends=('rdesktop: RDP plugin')
 makedepends=('gtk-doc' 'intltool' 'rdesktop')
 groups=('gnome-extra')
 options=('!emptydirs' '!libtool')
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('a4c2ec5935c0cea0da1958e7f27a925a03867854cdcaf904ce8c7e405ebe2e5b')
+source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
+sha256sums=('cddc604ca6b2e45aaa5af55306eb29fc4910b29e1273c4915b7f60fd78da264e')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  # Disable Spice until someone cares (file a bug!)
   ./configure --prefix=/usr --sysconfdir=/etc --disable-scrollkeeper \
       --libexecdir=/usr/lib/vinagre --enable-rdp --disable-spice
   make
diff --git a/extra/xf86-input-aiptek/PKGBUILD b/extra/xf86-input-aiptek/PKGBUILD
index 582cb5f41..61a054eb2 100644
--- a/extra/xf86-input-aiptek/PKGBUILD
+++ b/extra/xf86-input-aiptek/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 123262 2011-05-09 13:47:41Z jgc $
+# $Id: PKGBUILD 130860 2011-07-08 13:07:09Z andyrtr $
 #Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-input-aiptek
-pkgver=1.4.0
+pkgver=1.4.1
 pkgrel=1
 pkgdesc="X.Org Aiptek USB Digital Tablet input driver"
 arch=(i686 x86_64 'mips64el')
@@ -14,7 +14,7 @@ conflicts=('xorg-server<1.10.0')
 options=('!libtool')
 groups=('xorg-drivers' 'xorg')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('19b7d42f35aff866de96d95941dce2b4682ad923')
+sha1sums=('55ea7d12d3e24fd72eacc966a59262864dce7769')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/xf86-input-mouse/PKGBUILD b/extra/xf86-input-mouse/PKGBUILD
index 4c78ca293..61ce843bd 100644
--- a/extra/xf86-input-mouse/PKGBUILD
+++ b/extra/xf86-input-mouse/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 115449 2011-03-18 08:03:09Z andyrtr $
+# $Id: PKGBUILD 130850 2011-07-08 12:58:03Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-input-mouse
-pkgver=1.7.0
-pkgrel=2
+pkgver=1.7.1
+pkgrel=1
 pkgdesc="X.org mouse input driver"
 arch=(i686 x86_64 'mips64el')
 license=('custom')
@@ -14,12 +14,16 @@ conflicts=('xorg-server<1.10.0')
 options=('!libtool')
 groups=('xorg-drivers' 'xorg')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('8b99054e5e4feafd7e08c87b936e64386b74ae8f')
+sha1sums=('11a6402e82d65bda5fb559c5e9bc72f3fd7af2ed')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   ./configure --prefix=/usr
   make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}" install
   install -d -m755 "${pkgdir}/usr/share/licenses/${pkgname}"
   install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
diff --git a/extra/xf86-input-synaptics/PKGBUILD b/extra/xf86-input-synaptics/PKGBUILD
index d32626177..cd8dce772 100644
--- a/extra/xf86-input-synaptics/PKGBUILD
+++ b/extra/xf86-input-synaptics/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 126576 2011-06-06 10:40:59Z jgc $
+# $Id: PKGBUILD 130717 2011-07-07 22:08:11Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Tobias Powalowski  <tpowa@archlinux.org>
 # Contributor: Thomas Bächler <thomas@archlinux.org>
 # Contributor: Alexander Baldeck <alexander@archlinux.org>
 
 pkgname=xf86-input-synaptics
-pkgver=1.4.0.901
+pkgver=1.4.1
 pkgrel=1
 pkgdesc="Synaptics driver for notebook touchpads"
 arch=(i686 x86_64 'mips64el')
@@ -22,13 +22,16 @@ options=(!libtool)
 backup=('etc/X11/xorg.conf.d/10-synaptics.conf')
 source=(http://xorg.freedesktop.org/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
         10-synaptics.conf)
-sha1sums=('2203f64a9d656088387c81c5914422c63827848f'
+sha1sums=('e41201476f4bc8658291808d2d6ef2e0535179ae'
           '68e1f4ef5e1038231d210eb422fa4d18c5922f0f')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   ./configure --prefix=/usr
   make
+}
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}" install
   install -m755 -d "${pkgdir}/etc/X11/xorg.conf.d"
   install -m644 "${srcdir}/10-synaptics.conf" "${pkgdir}/etc/X11/xorg.conf.d/"
diff --git a/extra/xorg-mkfontscale/PKGBUILD b/extra/xorg-mkfontscale/PKGBUILD
index b7eee43a6..883dc49b7 100644
--- a/extra/xorg-mkfontscale/PKGBUILD
+++ b/extra/xorg-mkfontscale/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 113678 2011-03-10 14:41:30Z jgc $
+# $Id: PKGBUILD 130725 2011-07-07 22:14:26Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xorg-mkfontscale
-pkgver=1.0.8
+pkgver=1.0.9
 pkgrel=1
 pkgdesc="Create an index of scalable font files for X"
 arch=(i686 x86_64)
@@ -12,12 +12,16 @@ depends=('freetype2' 'libfontenc')
 makedepends=('xorg-util-macros' 'xproto')
 groups=('xorg-apps' 'xorg')
 source=(http://xorg.freedesktop.org/archive/individual/app/mkfontscale-${pkgver}.tar.bz2)
-sha1sums=('accfb12751bf3b7ae7b28c1b0b863d5be871398f')
+sha1sums=(''5a8ac438d6d6694dcf1314b74c4d9f029da4f486)
 
 build() {
   cd "${srcdir}/mkfontscale-${pkgver}"
   ./configure --prefix=/usr
   make
+}
+
+package() {
+  cd "${srcdir}/mkfontscale-${pkgver}"
   make DESTDIR="${pkgdir}" install
   install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
   install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
diff --git a/extra/xorg-smproxy/PKGBUILD b/extra/xorg-smproxy/PKGBUILD
index 50964a380..d8c25e0a4 100644
--- a/extra/xorg-smproxy/PKGBUILD
+++ b/extra/xorg-smproxy/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 113698 2011-03-10 14:47:17Z jgc $
+# $Id: PKGBUILD 130730 2011-07-07 22:18:10Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xorg-smproxy
-pkgver=1.0.4
-pkgrel=2
+pkgver=1.0.5
+pkgrel=1
 pkgdesc="Allows X applications that do not support X11R6 session management to participate in an X11R6 session"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
@@ -12,12 +12,16 @@ depends=('libsm' 'libxt' 'libxmu')
 makedepends=('xorg-util-macros')
 groups=('xorg-apps' 'xorg')
 source=(http://xorg.freedesktop.org/archive/individual/app/smproxy-${pkgver}.tar.bz2)
-sha1sums=('ea9639b6d0669f157ac62b807cdba64f509b25ed')
+sha1sums=('59e19def9a351896cb3101cb580ae424e9e48a3e')
 
 build() {
   cd "${srcdir}/smproxy-${pkgver}"
   ./configure --prefix=/usr
   make
+}
+
+package() {
+  cd "${srcdir}/smproxy-${pkgver}"
   make DESTDIR="${pkgdir}" install
   install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
   install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
diff --git a/extra/xorg-xkbcomp/PKGBUILD b/extra/xorg-xkbcomp/PKGBUILD
index 50c2b77f6..dc2ec9c89 100644
--- a/extra/xorg-xkbcomp/PKGBUILD
+++ b/extra/xorg-xkbcomp/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 113771 2011-03-10 15:39:50Z jgc $
+# $Id: PKGBUILD 130738 2011-07-07 22:22:56Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xorg-xkbcomp
-pkgver=1.2.1
-pkgrel=2
+pkgver=1.2.3
+pkgrel=1
 pkgdesc="X Keyboard description compiler"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
@@ -12,12 +12,16 @@ depends=('libxkbfile')
 makedepends=('xorg-util-macros')
 groups=('xorg-apps' 'xorg')
 source=(${url}/releases/individual/app/xkbcomp-${pkgver}.tar.bz2)
-sha1sums=('02d7e7b67a6ef3035f92f9e541252bf85e3f0385')
+sha1sums=('c20d1b5b8e25634cc9a79c5e4c3397a5ffbee1e0')
 
 build() {
   cd "${srcdir}/xkbcomp-${pkgver}"
   ./configure --prefix=/usr
   make
+}
+
+package() {
+  cd "${srcdir}/xkbcomp-${pkgver}"
   make DESTDIR="${pkgdir}" install
   install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
   install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
diff --git a/extra/xorg-xman/PKGBUILD b/extra/xorg-xman/PKGBUILD
index b35686959..77bb96546 100644
--- a/extra/xorg-xman/PKGBUILD
+++ b/extra/xorg-xman/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: $
+# $Id: PKGBUILD 113771 2011-03-10 15:39:50Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xorg-xman
-pkgver=1.1.1
+pkgver=1.1.2
 pkgrel=1
 pkgdesc="Unix manual page viewer"
 arch=(i686 x86_64)
@@ -11,12 +11,16 @@ license=('custom')
 depends=('libxaw' 'libxt')
 makedepends=('xorg-util-macros' 'xproto' 'libxmu')
 source=(http://xorg.freedesktop.org/archive/individual/app/xman-${pkgver}.tar.bz2)
-sha1sums=('c8e1170e837da4bc280ee907030b3f9245608ef2')
+sha1sums=('ba10cf0b2d0c2b40ded93e892c69e7bd4586ad1e')
 
 build() {
   cd "${srcdir}/xman-${pkgver}"
   ./configure --prefix=/usr
   make
+}
+
+package() {
+  cd "${srcdir}/xman-${pkgver}"
   make DESTDIR="${pkgdir}" install
   install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
   install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
diff --git a/extra/xorg-xprop/PKGBUILD b/extra/xorg-xprop/PKGBUILD
index 9fd9e0cb5..32e121164 100644
--- a/extra/xorg-xprop/PKGBUILD
+++ b/extra/xorg-xprop/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 113811 2011-03-10 15:49:11Z jgc $
+# $Id: PKGBUILD 130748 2011-07-07 22:27:50Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xorg-xprop
-pkgver=1.2.0
-pkgrel=2
+pkgver=1.2.1
+pkgrel=1
 pkgdesc="Property displayer for X"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
@@ -12,12 +12,16 @@ depends=('libx11')
 makedepends=('xorg-util-macros')
 groups=('xorg-apps' 'xorg')
 source=(http://xorg.freedesktop.org/archive/individual/app/xprop-${pkgver}.tar.bz2)
-sha1sums=('278f83c5077eed1d96c180bdc0a6f22ba5279a66')
+sha1sums=('d531be0f5f2b7758216ea4d7890f88c42c5fa3fd')
 
 build() {
   cd "${srcdir}/xprop-${pkgver}"
   ./configure --prefix=/usr
   make
+}
+
+package() {
+  cd "${srcdir}/xprop-${pkgver}"
   make DESTDIR="${pkgdir}" install
   install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
   install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
diff --git a/extra/xorg-xrandr/PKGBUILD b/extra/xorg-xrandr/PKGBUILD
index 483f2748c..a208b1ee3 100644
--- a/extra/xorg-xrandr/PKGBUILD
+++ b/extra/xorg-xrandr/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 113816 2011-03-10 15:50:41Z jgc $
+# $Id: PKGBUILD 130753 2011-07-07 22:30:11Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xorg-xrandr
-pkgver=1.3.4
-pkgrel=2
+pkgver=1.3.5
+pkgrel=1
 pkgdesc="Primitive command line interface to RandR extension"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
@@ -12,12 +12,16 @@ depends=('libxrandr' 'libx11')
 makedepends=('xorg-util-macros')
 groups=('xorg-apps' 'xorg')
 source=(http://xorg.freedesktop.org/archive/individual/app/xrandr-${pkgver}.tar.bz2)
-sha1sums=('637949501b8a45d32d9cab809e8822ee45b69414')
+sha1sums=('ef45925d5b0e72c73d21798d65a41d476fdb0d3f')
 
 build() {
   cd "${srcdir}/xrandr-${pkgver}"
   ./configure --prefix=/usr
   make
+}
+
+package() {
+  cd "${srcdir}/xrandr-${pkgver}"
   make DESTDIR="${pkgdir}" install
   install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
   install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
diff --git a/extra/xorg-xwininfo/PKGBUILD b/extra/xorg-xwininfo/PKGBUILD
index 785353a88..1e16302d1 100644
--- a/extra/xorg-xwininfo/PKGBUILD
+++ b/extra/xorg-xwininfo/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 113851 2011-03-10 16:03:22Z jgc $
+# $Id: PKGBUILD 130758 2011-07-07 22:32:22Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xorg-xwininfo
-pkgver=1.1.1
-pkgrel=2
+pkgver=1.1.2
+pkgrel=1
 pkgdesc="Command-line utility to print information about windows on an X server"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
@@ -12,12 +12,16 @@ depends=('libxcb')
 makedepends=('xorg-util-macros' 'libx11')
 groups=('xorg-apps' 'xorg')
 source=(http://xorg.freedesktop.org/archive/individual/app/xwininfo-${pkgver}.tar.bz2)
-sha1sums=('945e5d51632876e304e001003c8068f34ffe299e')
+sha1sums=('c90b3c289f95474aa8eb6cf1bf4caf3b9dbf82d3')
 
 build() {
   cd "${srcdir}/xwininfo-${pkgver}"
   ./configure --prefix=/usr
   make
+}
+
+package() {
+  cd "${srcdir}/xwininfo-${pkgver}"
   make DESTDIR="${pkgdir}" install
   install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
   install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
author	Nicolas Reynolds <fauno@kiwwwi.com.ar>	2011-07-09 20:52:21 -0300
committer	Nicolas Reynolds <fauno@kiwwwi.com.ar>	2011-07-09 20:52:21 -0300
commit	aabab2c530c33c1beb40ac3dacb95e19ab99eac3 (patch)
tree	1417c10b601a05725676a727a25901a32e7fd94c /extra
parent	3357db80ffa8a795fb5cdad0fc726470887706b0 (diff)
parent	d1e588afc2779754c0abd1122ecf4f8e3c863d7a (diff)