Tue Aug 2 04:35:55 UTC 2011

author: root <root@rshg054.dnsready.net> 2011-08-02 04:35:55 +0000
committer: root <root@rshg054.dnsready.net> 2011-08-02 04:35:55 +0000
commit: bf35116f9d203dcafce808a6c7b3dd5a0db8afbc (patch)
tree: f9551a1d3c67d2113cc5fc5c3f8816bcbaad0540 /extra
parent: 1173ff2dba7d0fd3c45f170a5e353a76b7a5da2f (diff)
204 files changed, 3665 insertions, 649 deletions
diff --git a/extra/akonadi/PKGBUILD b/extra/akonadi/PKGBUILD
index 3e181dafa..96798a34d 100644
--- a/extra/akonadi/PKGBUILD
+++ b/extra/akonadi/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 124793 2011-05-24 13:10:03Z andrea $
+# $Id: PKGBUILD 132788 2011-07-26 07:38:52Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=akonadi
-pkgver=1.5.3
+pkgver=1.6.0
 pkgrel=2
 pkgdesc="PIM layer, which provides an asynchronous API to access all kind of PIM data"
 arch=('i686' 'x86_64')
@@ -12,8 +12,8 @@ license=('LGPL')
 depends=('shared-mime-info' 'boost-libs' 'mysql' 'soprano')
 makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost')
 install="${pkgname}.install"
-source=("http://download.akonadi-project.org/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('ad342acca61c2af27be4cce61b2d925a')
+source=("http://download.kde.org/stable/${pkgname}/src/${pkgname}-${pkgver}.tar.bz2")
+md5sums=('16bc40e022d06f287f18c71faaeb2e42')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/amarok/PKGBUILD b/extra/amarok/PKGBUILD
index ec25b42b8..a8183bd63 100644
--- a/extra/amarok/PKGBUILD
+++ b/extra/amarok/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 129446 2011-06-27 20:27:37Z andrea $
+# $Id: PKGBUILD 134019 2011-08-01 10:23:47Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: damir <damir@archlinux.org>
 
 pkgname=amarok
 replaces=('amarok-base' 'amarok-engine-xine' 'amarok-base-mysqlfree')
-pkgver=2.4.1
-pkgrel=3
+pkgver=2.4.3
+pkgrel=1
 pkgdesc="The powerful music player for KDE"
 arch=("i686" "x86_64")
 url="http://amarok.kde.org"
@@ -21,10 +21,10 @@ optdepends=("libgpod: support for Apple iPod audio devices"
             "libmygpo-qt: gpodder.net Internet Service")
 install="${pkgname}.install"
 source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('4c65c5cd4d7bd267bdbef8e912fd6cb6')
+md5sums=('24e8141bcbd065448911fa872c50197d')
 
 build() {
-  cd ${srcdir}
+  cd "${srcdir}"
   mkdir build
   cd build
   cmake ../${pkgname}-${pkgver} \
@@ -34,6 +34,6 @@ build() {
 }
 
 package(){
-  cd ${srcdir}/build
-  make DESTDIR=${pkgdir} install
+  cd "${srcdir}"/build
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/amarok/amarok.install b/extra/amarok/amarok.install
index e70c054ec..81ce5c4b0 100644
--- a/extra/amarok/amarok.install
+++ b/extra/amarok/amarok.install
@@ -1,5 +1,6 @@
 post_install() {
 	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+    update-desktop-database -q
 }
 
 post_upgrade() {
diff --git a/extra/archboot/PKGBUILD b/extra/archboot/PKGBUILD
index c5ffb4711..959b19cd6 100644
--- a/extra/archboot/PKGBUILD
+++ b/extra/archboot/PKGBUILD
@@ -1,20 +1,20 @@
-# $Id: PKGBUILD 132074 2011-07-19 20:24:15Z eric $
+# $Id: PKGBUILD 133615 2011-07-30 06:14:47Z tpowa $
 # Maintainer : Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=archboot
-pkgver=2011.06
+pkgver=2011.07
 pkgrel=2
-_sourcerel=1
 pkgdesc="Advanced, modular arch boot/install image creation utility"
-arch=('i686' 'x86_64')
-url="http://www.archlinux.org/"
+arch=(i686 x86_64)
 license=('GPL')
-depends=('mkinitcpio>=0.6.12-1' 'mksyslinux>=2010.08-1' 'mkpxelinux>=2010.08-1' 'mkisolinux>=2010.08-1' 'initscripts>=2011.05.2-1' 'subversion>=1.6.15-2' 'wget>=1.12-7' 'bash>=4.2.010-1' 'coreutils>=8.12-1' 'cryptsetup>=1.3.0-1' 'dialog>=1.1_20110302-1' 'e2fsprogs>=1.41.14-1' 'findutils>=4.4.2-3' 'gawk>=3.1.8-2' 'grep>=2.7-1' 'iputils>=20101006-1' 'jfsutils>=1.1.14-2' 'less>=443-1' 'lvm2>=2.02.85-1' 'mdadm>=3.2.1-3' 'module-init-tools>=3.12-2' 'nano>=2.2.6-1' 'ncurses>=5.9-1' 'net-tools>=1.60-14' 'gnu-netcat>=0.7.1-3' 'ntfsprogs>=2011.4.12-1' 'pcmciautils>=017-2' 'procps>=3.2.8-3' 'psmisc>=22.13-1' 'reiserfsprogs>=3.6.21-3' 'sed>=4.2.1-3' 'snarf>=7.0-4' 'syslog-ng>=3.2.4-1' 'sysvinit>=2.88-2' 'tar>=1.26-1' 'util-linux>=2.19.1-2' 'which>=2.20-4' 'kbd>=1.15.3-1' 'wireless_tools>=29-4' 'xfsprogs>=3.1.5-1' 'dnsutils>=9.8.0.P1-1' 'hdparm>=9.37-1' 'memtest86+>=4.20-1' 'inetutils>=1.8-2' 'openssh>=5.8p2-6' 'hwdetect>=2011.03-1' 'shadow>=4.1.4.3-1' 'bridge-utils>=1.4-4' 'ifenslave>=1.1.0-6' 'cpufrequtils>=008-1' 'links>=2.3pre1-1' 'dosfstools>=3.0.11-1' 'glibc>=2.13-5' 'linux-api-headers>=2.6.38.1-1' 'kernel26>=2.6.38.6-2' 'kernel26-lts>=2.6.32.40-1' 'xinetd>=2.3.14-6' 'kexec-tools>=2.0.2-3' 'ppp>=2.4.5-2' 'rp-pppoe>=3.10-6' 'lilo>=23.2-1' 'iptables>=1.4.10-1' 'capi4k-utils>=050718-7' 'isdn4k-utils>=3.2p1-6' 'ntfs-3g>=2011.4.12-1' 'pciutils>=3.1.7-4' 'usbutils>=002-3' 'vpnc>=0.5.3-3' 'openvpn>=2.2.0-1' 'b43-fwcutter>=014-1' 'wpa_supplicant>=0.7.3-3' 'rsync>=3.0.8-1' 'gzip>=1.4-2' 'libarchive>=2.8.4-2' 'device-mapper>=2.02.85-1' 'screen>=4.0.3-11' 'elfutils>=0.152-1' 'pam>=1.1.3-1' 'cracklib>=2.8.18-1' 'nfs-utils>=1.2.3-2' 'nfsidmap>=0.24-2' 'readline>=6.2.001-1' 'acl>=2.2.51-1' 'attr>=2.4.46-1' 'pcre>=8.12-1' 'cpio>=2.11-2' 'fuse>=2.8.5-1' 'libusb>=1.0.8-1' 'vim>=7.3.177-1' 'lzo2>=2.05-1' 'libsasl>=2.1.23-5' 'libldap>=2.4.24-1' 'gpm>=1.20.6-6' 'libevent>=2.0.11-1' 'gcc-libs>=4.6.0-5' 'sdparm>=1.06-1' 'licenses>=2.8-1' 'pptpclient>=1.7.2-3' 'zd1211-firmware>=1.4-4' 'ipw2100-fw>=1.3-5' 'ipw2200-fw>=3.1-3' 'smbclient>=3.5.8-3' 'bittorrent>=5.2.2-4' 'dhcpcd>=5.2.12-1' 'openssl>=1.0.0.d-1' 'git>=1.7.5.1-1' 'dmraid>=1.0.0.rc16.3-1' 'linux-atm>=2.5.1-2' 'netcfg>=2.5.4-1' 'parted>=2.3-1' 'tzdata>=2011g-1' 'ntp>=4.2.6.p3-3' 'libgcrypt>=1.4.6-3' 'iw>=0.9.22-1' 'crda>=1.1.1-3' 'libnl>=1.1-2' 'iproute2>=2.6.38-2' 'wireless-regdb>=2010.11.24-1' 'v86d>=0.1.10-1' 'dhclient>=4.2.1.1-1' 'syslinux>=4.04-1' 'mtools>=4.0.16-1' 'fsarchiver>=0.6.12-1' 'xz>=5.0.2-1' 'libtirpc>=0.2.1-3' 'librpcsecgss>=0.19-5' 'rpcbind>=0.2.0-3' 'testdisk>=6.12-1' 'wipe>=2.3.1-1' 'ddrescue>=1.14-1' 'udev>=168-1' 'ifplugd>=0.28-7' 'wpa_actiond>=1.1-2' 'nouveau-firmware>=20091212-4' 'rfkill>=0.4-2' 'libgssglue>=0.1-4' 'mkinitcpio-nfs-utils>=0.2-1' 'gptfdisk>=0.7.1-1' 'nilfs-utils>=2.0.23-1' 'btrfs-progs-unstable>=0.19.20101006-1' 'nouveau-drm-lts>=0.0.16_20100313-5' 'linux-firmware>=20110512-2' 'iana-etc>=2.30-1' 'libusb-compat>=0.1.3-1' 'eject>=2.1.5-5' 'keyutils>=1.4-1')
+url="http://www.archlinux.org/"
+depends=('mkinitcpio>=0.6.12-1' 'mksyslinux>=2010.08-1' 'mkpxelinux>=2010.08-1' 'mkisolinux>=2010.08-1' 'initscripts>=2011.05.2-1' 'subversion>=1.6.15-2' 'wget>=1.12-7' 'bash>=4.2.010-1' 'coreutils>=8.12-1' 'cryptsetup>=1.3.0-1' 'dialog>=1.1_20110302-1' 'e2fsprogs>=1.41.14-1' 'findutils>=4.4.2-3' 'gawk>=3.1.8-2' 'grep>=2.7-1' 'iputils>=20101006-1' 'jfsutils>=1.1.14-2' 'less>=443-1' 'lvm2>=2.02.85-1' 'mdadm>=3.2.1-3' 'module-init-tools>=3.12-2' 'nano>=2.2.6-1' 'ncurses>=5.9-1' 'net-tools>=1.60-14' 'gnu-netcat>=0.7.1-3' 'ntfsprogs>=2011.4.12-1' 'pcmciautils>=017-2' 'procps>=3.2.8-3' 'psmisc>=22.13-1' 'reiserfsprogs>=3.6.21-3' 'sed>=4.2.1-3' 'snarf>=7.0-4' 'syslog-ng>=3.2.4-1' 'sysvinit>=2.88-2' 'tar>=1.26-1' 'util-linux>=2.19.1-2' 'which>=2.20-4' 'kbd>=1.15.3-1' 'wireless_tools>=29-4' 'xfsprogs>=3.1.5-1' 'dnsutils>=9.8.0.P1-1' 'hdparm>=9.37-1' 'memtest86+>=4.20-1' 'inetutils>=1.8-2' 'openssh>=5.8p2-6' 'hwdetect>=2011.03-1' 'shadow>=4.1.4.3-1' 'bridge-utils>=1.4-4' 'ifenslave>=1.1.0-6' 'cpufrequtils>=008-1' 'links>=2.3pre1-1' 'dosfstools>=3.0.11-1' 'glibc>=2.13-5' 'linux-api-headers>=2.6.38.1-1' 'kernel26>=2.6.38.6-2' 'kernel26-lts>=2.6.32.40-1' 'xinetd>=2.3.14-6' 'kexec-tools>=2.0.2-3' 'ppp>=2.4.5-2' 'rp-pppoe>=3.10-6' 'lilo>=23.2-1' 'iptables>=1.4.10-1' 'capi4k-utils>=050718-7' 'isdn4k-utils>=3.2p1-6' 'ntfs-3g>=2011.4.12-1' 'pciutils>=3.1.7-4' 'usbutils>=002-3' 'vpnc>=0.5.3-3' 'openvpn>=2.2.0-1' 'b43-fwcutter>=014-1' 'wpa_supplicant>=0.7.3-3' 'rsync>=3.0.8-1' 'gzip>=1.4-2' 'libarchive>=2.8.4-2' 'device-mapper>=2.02.85-1' 'screen>=4.0.3-11' 'elfutils>=0.152-1' 'pam>=1.1.3-1' 'cracklib>=2.8.18-1' 'nfs-utils>=1.2.3-2' 'nfsidmap>=0.24-2' 'readline>=6.2.001-1' 'acl>=2.2.51-1' 'attr>=2.4.46-1' 'pcre>=8.12-1' 'cpio>=2.11-2' 'fuse>=2.8.5-1' 'libusb>=1.0.8-1' 'vim>=7.3.177-1' 'lzo2>=2.05-1' 'libsasl>=2.1.23-5' 'libldap>=2.4.24-1' 'gpm>=1.20.6-6' 'libevent>=2.0.11-1' 'gcc-libs>=4.6.0-5' 'sdparm>=1.06-1' 'licenses>=2.8-1' 'pptpclient>=1.7.2-3' 'zd1211-firmware>=1.4-4' 'ipw2100-fw>=1.3-5' 'ipw2200-fw>=3.1-3' 'smbclient>=3.5.8-3' 'bittorrent>=5.2.2-4' 'dhcpcd>=5.2.12-1' 'openssl>=1.0.0.d-1' 'git>=1.7.5.1-1' 'dmraid>=1.0.0.rc16.3-1' 'linux-atm>=2.5.1-2' 'netcfg>=2.5.4-1' 'parted>=2.3-1' 'tzdata>=2011g-1' 'ntp>=4.2.6.p3-3' 'libgcrypt>=1.4.6-3' 'iw>=0.9.22-1' 'crda>=1.1.1-3' 'libnl>=1.1-2' 'iproute2>=2.6.38-2' 'wireless-regdb>=2010.11.24-1' 'v86d>=0.1.10-1' 'dhclient>=4.2.1.1-1' 'syslinux>=4.04-1' 'mtools>=4.0.16-1' 'fsarchiver>=0.6.12-1' 'xz>=5.0.2-1' 'libtirpc>=0.2.1-3' 'librpcsecgss>=0.19-5' 'rpcbind>=0.2.0-3' 'testdisk>=6.12-1' 'wipe>=2.3.1-1' 'ddrescue>=1.14-1' 'udev>=168-1' 'ifplugd>=0.28-7' 'wpa_actiond>=1.1-2' 'nouveau-firmware>=20091212-4' 'rfkill>=0.4-2' 'libgssglue>=0.1-4' 'mkinitcpio-nfs-utils>=0.2-1' 'gptfdisk>=0.7.1-1' 'nilfs-utils>=2.0.23-1' 'btrfs-progs-unstable>=0.19.20101006-1' 'nouveau-drm-lts>=0.0.16_20100313-5' 'linux-firmware>=20110512-2' 'iana-etc>=2.30-1' 'libusb-compat>=0.1.3-1' 'eject>=2.1.5-5' 'keyutils>=1.4-1' 'libisoburn>=1.1.2' 'squashfs-tools>=4.2')
 optdepends=('grub2-bios: for grub2 support'
             'grub2-efi-i386: for grub2 support'
             'grub2-efi-x86_64: for grub2 support'
             'efibootmgr: for grub2 support'
 )
+source=(ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver-$pkgrel.tar.bz2 vmware-detect.c)
 backup=('etc/archboot/allinone.conf'
         'etc/archboot/allinone-lts.conf'
         'etc/archboot/default.conf'
@@ -31,22 +31,18 @@ backup=('etc/archboot/allinone.conf'
         'etc/archboot/presets/pxelinux-ftp'
 )
 install=archboot.install
-source=(ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver-$_sourcerel.tar.bz2 vmware-detect.c)
-md5sums=('eac77ae13bf2e6b5a92317b9885c69dd'
-         '7e2b03463747cb22ab388e79a09fa0cb')
 
 ### to bump the depends list use this:
 #for i in $(grep ^depends= PKGBUILD | sed  -e 's/depends=(//g' -e 's/)//g'); do sed -i -e "s/$(echo $i)/$(echo $i | sed -e "s/>=.*/>=$(pacman -Qi $(echo $i | sed -e "s/'//g" -e 's/>=.*//g') | grep ^Version | sed -e 's/.*: //g')'/g")/g" PKGBUILD; done
 
-build() 
+build()
 {
-  cd "$srcdir"
+  cd $srcdir/$pkgname-$pkgver-$pkgrel
+  mv * $pkgdir/
+  # vmware-detect
+  cd $startdir/src
   gcc -o vmware-detect vmware-detect.c
+  install -D -m 755 vmware-detect $startdir/pkg/usr/bin/vmware-detect
 }
-
-package() 
-{
-  cd "$srcdir/$pkgname-$pkgver-$_sourcerel"
-  mv * "$pkgdir/"
-  install -D -m 755 "$srcdir/vmware-detect" "$pkgdir/usr/bin/vmware-detect"
-}
+md5sums=('dadac046c8da0c45c7ed55e223b5a0b5'
+         '7e2b03463747cb22ab388e79a09fa0cb')
diff --git a/extra/ardour/PKGBUILD b/extra/ardour/PKGBUILD
index 89fa98ad1..5780fa159 100644
--- a/extra/ardour/PKGBUILD
+++ b/extra/ardour/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 130903 2011-07-08 19:43:04Z schiv $
+# $Id: PKGBUILD 131778 2011-07-14 23:39:36Z schiv $
 # Maintainer: tobias <tobias@archlinux.org>
 # Maintainer: Ray Rashif <schiv@archlinux.org>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
@@ -9,33 +9,43 @@
 
 pkgname=ardour
 pkgver=2.8.11
-pkgrel=4
+pkgrel=5
 pkgdesc="A multichannel hard disk recorder and digital audio workstation"
 arch=('i686' 'x86_64')
-url="http://ardour.org"
+url="http://ardour.org/"
 license=('GPL')
-depends=('liblrdf' 'liblo' 'aubio' 'libusb-compat'
-         'libgnomecanvasmm' 'soundtouch')
+depends=('liblrdf>=0.4.0-8' 'liblo' 'aubio' 'libusb-compat'
+         'libgnomecanvasmm' 'soundtouch' 'slv2>=0.6.6-6')
          # -rubberband -libgnomecanvas(+libgnomecanvasmm)
-         # +soundtouch -slv2
+         # +soundtouch (these +/- changes are for SYSLIBS)
+         # liblrdf versioned for https://bugs.archlinux.org/task/25005
+         # slv2 versioned for https://bugs.archlinux.org/task/25060
 makedepends=('scons' 'boost' 'pkg-config')
 changelog=${pkgname}.changelog
 source=(ftp://ftp.archlinux.org/other/ardour/${pkgname}-${pkgver}.tar.bz2
         ${pkgname}.desktop
-        gcc46.patch)
+        gcc46.patch
+        raptor2.patch)
 md5sums=('f451a8d0abc133a1700c3932e07a5612'
          '8aeaf433ebf781733db48e5a16b0c4da'
-         'd709add59911d099c813162448e4db99')
+         'd709add59911d099c813162448e4db99'
+         'a26a9bec0968fa0630c70f70c54f67de')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
   # gcc 4.6 compatibility
+  # http://tracker.ardour.org/view.php?id=3771
   patch -Np1 -i "$srcdir/gcc46.patch"
 
+  # raptor2 compatibility
+  # https://bugs.archlinux.org/task/25060
+  # http://tracker.ardour.org/view.php?id=4179
+  patch -Np0 -i "$srcdir/raptor2.patch"
+
   sed -i '/-O3/d' SConstruct
 
-  # use syslibs until internal sigc++ issue w/ latest gcc resolves
+  # use syslibs until internal sigc++ issue w/ latest gcc (?) resolves
   # TODO: report upstream
   scons ${MAKEFLAGS} ARCH="${CFLAGS}" \
                      PREFIX="/usr" \
@@ -43,7 +53,6 @@ build() {
                      FREEDESKTOP=0 \
                      FREESOUND=1 \
                      SYSLIBS=1 \
-                     LV2=0 \
                      DESTDIR="${pkgdir}"
 }
 
@@ -54,7 +63,6 @@ package() {
         FREEDESKTOP=0 \
         FREESOUND=1 \
         SYSLIBS=1 \
-        LV2=0 \
         DESTDIR="${pkgdir}" install
 
   # install some freedesktop.org compatibility
diff --git a/extra/ardour/ardour.changelog b/extra/ardour/ardour.changelog
index 69d289e8f..47c111f01 100644
--- a/extra/ardour/ardour.changelog
+++ b/extra/ardour/ardour.changelog
@@ -1,3 +1,14 @@
+15 Jul 2011 (GMT+8) Ray Rashif <schiv@archlinux.org>
+
+	* 2.8.11-5:
+	Resolve previous issues with slv2 & redland/rasqal/raptor
+		- just needed rebuild of slv2 against latest redland suite [1]
+		- also needed ardour buildsystem patch for raptor2 [1][2]
+		- bring back support for slv2
+
+	[1] https://bugs.archlinux.org/task/25060
+	[2] http://tracker.ardour.org/view.php?id=4179
+
 9 Jul 2011 (GMT+8) Ray Rashif <schiv@archlinux.org>
 
 	* 2.8.11-4:
diff --git a/extra/ardour/raptor2.patch b/extra/ardour/raptor2.patch
new file mode 100644
index 000000000..fe7cacff3
--- /dev/null
+++ b/extra/ardour/raptor2.patch
@@ -0,0 +1,57 @@
+Index: SConstruct
+===================================================================
+--- SConstruct	(revision 9877)
++++ SConstruct	(revision 9878)
+@@ -431,7 +431,6 @@
+ 	'gtk+-2.0'             : '2.8.1',
+ 	'libxml-2.0'           : '2.6.0',
+ 	'samplerate'           : '0.1.0',
+-	'raptor'               : '1.4.2',
+ 	'lrdf'                 : '0.4.0',
+ 	'jack'                 : '0.109.0',
+ 	'libgnomecanvas-2.0'   : '2.0',
+@@ -487,7 +486,10 @@
+ 
+ libraries['core'] = LibraryInfo (CCFLAGS = '-Ilibs')
+ 
+-conf = env.Configure (custom_tests = { 'CheckPKGExists' : CheckPKGExists } )
++conf = env.Configure (custom_tests = { 'CheckPKGExists' : CheckPKGExists,
++                                       'CheckPKGVersion' : CheckPKGVersion }
++                      )
++                      
+ 
+ if conf.CheckPKGExists ('fftw3f'):
+     libraries['fftw3f'] = LibraryInfo()
+@@ -501,6 +503,22 @@
+     libraries['aubio'] = LibraryInfo()
+     libraries['aubio'].ParseConfig('pkg-config --cflags --libs aubio')
+ 
++raptorOK = 0
++
++if conf.CheckPKGExists ('raptor2'):
++    libraries['raptor'] = LibraryInfo()
++    libraries['raptor'].ParseConfig('pkg-config --cflags --libs raptor2')
++    raptorOK = 1
++else:
++    if conf.CheckPKGExists ('raptor') and conf.CheckPKGVersion (pkg, '1.4.2'):
++        libraries['raptor'] = LibraryInfo()
++        libraries['raptor'].ParseConfig('pkg-config --cflags --libs raptor')
++        raptorOK = 1
++            
++if raptorOK == 0:
++    print "Ardour requires either raptor or raptor2 to be available at build time"
++    Exit (1)
++
+ env = conf.Finish ()
+ 
+ if env['FFT_ANALYSIS']:
+@@ -570,9 +588,6 @@
+ libraries['lrdf'] = LibraryInfo()
+ libraries['lrdf'].ParseConfig('pkg-config --cflags --libs lrdf')
+ 
+-libraries['raptor'] = LibraryInfo()
+-libraries['raptor'].ParseConfig('pkg-config --cflags --libs raptor')
+-
+ libraries['sndfile'] = LibraryInfo()
+ libraries['sndfile'].ParseConfig ('pkg-config --cflags --libs sndfile')
+ 
diff --git a/extra/avogadro/PKGBUILD b/extra/avogadro/PKGBUILD
index 6f1a6baf5..f85ad30cd 100644
--- a/extra/avogadro/PKGBUILD
+++ b/extra/avogadro/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 124796 2011-05-24 13:18:50Z andrea $
+# $Id: PKGBUILD 132785 2011-07-26 07:29:20Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Nick B <Shirakawasuna at gmail _dot_com>
 
 pkgname=avogadro
 pkgver=1.0.3
-pkgrel=2
+pkgrel=3
 pkgdesc="An advanced molecular editor based on Qt"
 arch=('i686' 'x86_64')
 url="http://avogadro.openmolecules.net/wiki/Main_Page"
diff --git a/extra/bluedevil/PKGBUILD b/extra/bluedevil/PKGBUILD
index 17720097d..fa7a1d2f6 100644
--- a/extra/bluedevil/PKGBUILD
+++ b/extra/bluedevil/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 119938 2011-04-17 01:35:14Z andrea $
+# $Id: PKGBUILD 132780 2011-07-26 07:20:57Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=bluedevil
-pkgver=1.1
+pkgver=1.1.1
 pkgrel=1
 pkgdesc='KDE bluetooth framework'
 arch=('i686' 'x86_64')
@@ -12,10 +12,10 @@ depends=('kdebase-workspace' 'libbluedevil' 'obex-data-server' 'obexd-client')
 makedepends=('cmake' 'automoc4')
 install="${pkgname}.install"
 source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('240151ff99b81f630de51fa9f8230198')
+md5sums=('b3764fb8ead502e2d410b0c0fc86ac6c')
 
 build(){
-  cd ${srcdir}
+  cd "${srcdir}"
   mkdir build
   cd build
   cmake ../${pkgname}-${pkgver} \
@@ -25,6 +25,6 @@ build(){
 }
 
 package() {
-  cd ${srcdir}/build
-  make DESTDIR=${pkgdir} install
+  cd "${srcdir}"/build
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/bluez/PKGBUILD b/extra/bluez/PKGBUILD
index 2e32cef93..ae17ecb75 100644
--- a/extra/bluez/PKGBUILD
+++ b/extra/bluez/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 130704 2011-07-07 21:27:00Z andrea $
+# $Id: PKGBUILD 134029 2011-08-01 10:30:12Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Geoffroy Carrier <geoffroy@archlinux.org>
 
 pkgname=bluez
-pkgver=4.95
+pkgver=4.96
 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=('f34338440a4b3697cb9b3a2584f3251d'
+md5sums=('255c3dda8b93210ab0dcf8d04ddaf69f'
          '8f60a5eb9d84b9c64c478d63e1c24b10'
          'ca4c39eb4bb201bd2eacad01492cd735')
 
diff --git a/extra/boost/PKGBUILD b/extra/boost/PKGBUILD
index c79772354..abeaf0569 100644
--- a/extra/boost/PKGBUILD
+++ b/extra/boost/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 126799 2011-06-07 11:40:27Z ibiru $
+# $Id: PKGBUILD 132748 2011-07-25 19:08:12Z ibiru $
 # Maintainer: kevin <kevin@archlinux.org>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Kritoke <kritoke@gamebox.net>
@@ -6,19 +6,15 @@
 
 pkgbase=boost
 pkgname=('boost-libs' 'boost')
-pkgver=1.46.1
+pkgver=1.47.0
 _boostver=${pkgver//./_}
-pkgrel=3
+pkgrel=1
 arch=('i686' 'x86_64')
 url="http://www.boost.org/"
 makedepends=('icu' 'python' 'python2' 'bzip2' 'zlib' 'openmpi')
-source=(http://downloads.sourceforge.net/sourceforge/${pkgbase}/${pkgbase}_${_boostver}.tar.gz
-        4994-compile-fix-for-Python32-v2.patch
-        boost-1.46.0-spirit.patch)
+source=(http://downloads.sourceforge.net/sourceforge/${pkgbase}/${pkgbase}_${_boostver}.tar.gz)
 license=('custom')
-md5sums=('341e5d993b19d099bf1a548495ea91ec'
-         'cb59e8adbf2a45ef9264a2f4ab92b849'
-         '9d6e2f13fef23bf27d7bdddc104e182a')
+md5sums=('ff180a5276bec773a7625cac7e2288e8')
 
 _stagedir="${srcdir}/stagedir"
 
@@ -30,7 +26,7 @@ build() {
   echo "using mpi ;" >> build/v2/user-config.jam
 
   # build bjam
-  cd "${srcdir}/${pkgbase}_${_boostver}/tools/build/v2/engine/src"
+  cd "${srcdir}/${pkgbase}_${_boostver}/tools/build/v2/engine"
   ./build.sh cc
 
   _bindir="bin.linuxx86"
@@ -55,10 +51,6 @@ build() {
 
   # build libs
   cd "${srcdir}/${pkgbase}_${_boostver}"
-  #python 3.2 support
-  #https://svn.boost.org/trac/boost/ticket/4994
-  patch -Np0 -i "${srcdir}/4994-compile-fix-for-Python32-v2.patch"
-  patch -Np0 -i "${srcdir}/boost-1.46.0-spirit.patch"
 
   # default "minimal" install: "release link=shared,static
   # runtime-link=shared threading=single,multi"
@@ -77,11 +69,6 @@ build() {
       --layout=system \
       ${MAKEFLAGS} \
       install
-
-  # pyste is unmaintained: http://www.boost.org/doc/libs/1_46_0/libs/python/doc/index.html
-  # build pyste
-  #cd "${srcdir}/${pkgbase}_${_boostver}/libs/python/pyste/install"
-  #python2 setup.py install --root=${_stagedir} --optimize=1
 }
 
 package_boost() {
diff --git a/extra/clamav/PKGBUILD b/extra/clamav/PKGBUILD
index 35dc54939..ab6daca4f 100644
--- a/extra/clamav/PKGBUILD
+++ b/extra/clamav/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 127029 2011-06-09 21:38:42Z bisson $
+# $Id: PKGBUILD 132770 2011-07-26 00:09:35Z bisson $
 # Contributor: Dale Blount <dale@archlinux.org>
 # Contributor: Gregor Ibic <gregor.ibic@intelicom.si>
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 
 pkgname=clamav
-pkgver=0.97.1
+pkgver=0.97.2
 pkgrel=1
 pkgdesc='Anti-virus toolkit for Unix'
 arch=('i686' 'x86_64')
@@ -13,12 +13,12 @@ options=('!libtool')
 license=('GPL')
 backup=('etc/clamav/clamd.conf' 'etc/clamav/freshclam.conf' 'etc/conf.d/clamav')
 url='http://www.clamav.net/'
-source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz"
+source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz"
         'rc.d'
         'conf.d'
         'logrotate'
         'config.patch')
-sha1sums=('1b3a4667dcc278bc7eab38acbc0f35269aa05387'
+sha1sums=('27d47c6ad22edc87c030f6d483fab1e13320cbf7'
           '7f15f0b13a1c11235bc99ef0add01efd8a442f07'
           'cb116cdab49a810381a515cbcfb6a6c148547f07'
           'be3310d2b41a68ce06e33c84ab68ffe59fdce104'
@@ -27,7 +27,7 @@ sha1sums=('1b3a4667dcc278bc7eab38acbc0f35269aa05387'
 install=install
 
 build() {
-	cd "$srcdir/$pkgname-$pkgver"
+	cd "${srcdir}/${pkgname}-${pkgver}"
 	patch -p1 < ../config.patch
 	./configure \
 		--prefix=/usr \
@@ -39,18 +39,18 @@ build() {
 }
 
 package() {
-	cd "$srcdir/$pkgname-$pkgver"
-	make DESTDIR="$pkgdir" install
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	make DESTDIR="${pkgdir}" install
 
 	# make sure conf files get installed, because make install
 	# doesn't do that if clamav is already installed upon building.
-	install -D -m644 etc/clamd.conf "$pkgdir/etc/clamav/clamd.conf"
-	install -D -m644 etc/freshclam.conf "$pkgdir/etc/clamav/freshclam.conf"
+	install -D -m644 etc/clamd.conf "${pkgdir}/etc/clamav/clamd.conf"
+	install -D -m644 etc/freshclam.conf "${pkgdir}/etc/clamav/freshclam.conf"
 
-	install -D -m644 ../logrotate "$pkgdir/etc/logrotate.d/clamav"
-	install -D -m644 ../conf.d "$pkgdir/etc/conf.d/clamav"
-	install -D -m755 ../rc.d "$pkgdir/etc/rc.d/clamav"
+	install -D -m644 ../logrotate "${pkgdir}/etc/logrotate.d/clamav"
+	install -D -m644 ../conf.d "${pkgdir}/etc/conf.d/clamav"
+	install -D -m755 ../rc.d "${pkgdir}/etc/rc.d/clamav"
 
 	# un-distribute databases to require freshclam
-	rm "$pkgdir"/var/lib/clamav/*.cvd
+	rm "${pkgdir}"/var/lib/clamav/*.cvd
 }
diff --git a/extra/cmus/PKGBUILD b/extra/cmus/PKGBUILD
index d9fd473a7..395192056 100644
--- a/extra/cmus/PKGBUILD
+++ b/extra/cmus/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 125618 2011-05-27 08:07:05Z eric $
+# $Id: PKGBUILD 132775 2011-07-26 00:10:12Z eric $
 # Maintainer: Aaron Griffin <aaron@archlinux.org>
 # Contributor: dorphell <dorphell@archlinux.org>
 
 pkgname=cmus
-pkgver=2.4.1
+pkgver=2.4.2
 pkgrel=1
 pkgdesc="A very feature-rich ncurses-based music player"
 arch=('i686' 'x86_64')
@@ -25,15 +25,12 @@ optdepends=('alsa-lib: for ALSA output plugin support'
             'flac: for flac input plugin support'
             'libmp4v2: for mp4 input plugin support')
 source=("http://downloads.sourceforge.net/$pkgname/$pkgname-v$pkgver.tar.bz2")
-md5sums=('7932bbada04bc9a273c332a323fc5704')
-sha1sums=('918c637becdcbca3652b836b38b164eb852fa896')
+md5sums=('f3ed7f14db20344ad7386aef48b98a4c')
+sha1sums=('12573e96e03435eca9b8a4aaeeb13a2da66f40a4')
 
 build() {
   cd "$srcdir/$pkgname-v$pkgver"
-  sed -i 's|ffmpeg/avcodec.h|libavcodec/avcodec.h|' configure ffmpeg.c
-  sed -i 's|ffmpeg/avformat.h|libavformat/avformat.h|' ffmpeg.c
-  sed -i 's|ffmpeg/avio.h|libavformat/avio.h|' ffmpeg.c
-  ./configure prefix=/usr CONFIG_ARTS=n
+  ./configure prefix=/usr
   make
 }
 
diff --git a/extra/cups/PKGBUILD b/extra/cups/PKGBUILD
index 753d439df..1f58e5f22 100644
--- a/extra/cups/PKGBUILD
+++ b/extra/cups/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 131768 2011-07-14 19:06:35Z andyrtr $
+# $Id: PKGBUILD 133458 2011-07-28 09:24:50Z jgc $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgbase="cups"
 pkgname=('libcups' 'cups')
 pkgver=1.4.7
-pkgrel=2
+pkgrel=3
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://www.cups.org/"
@@ -12,10 +12,12 @@ makedepends=('libtiff>=3.9.2-2' 'libpng>=1.4.0' 'acl' 'openslp' 'pam' 'xdg-utils
              'xinetd' 'gzip' 'autoconf' 'php' 'libusb-compat' 'dbus-core' 'avahi'  'hicolor-icon-theme')
 source=(ftp://ftp.easysw.com/pub/cups/${pkgver}/cups-${pkgver}-source.tar.bz2
 	cups-avahi.patch
+        cups-no-export-ssllibs.patch
         cups cups.logrotate cups.pam)
 #options=('!emptydirs')
 md5sums=('1590033ab4c739b859aeb672fe849089'
          '8ebd390197501ffd709f0ee546937fd5'
+         '9b8467a1e51d360096b70e2c3c081e6c'
          '9657daa21760bb0b5fa3d8b51d5e01a1'
          'f861b18f4446c43918c8643dcbbd7f6d'
          '96f82c38f3f540b53f3e5144900acf17')
@@ -26,6 +28,9 @@ build() {
   cd ${srcdir}/${pkgbase}-${pkgver}
   # Avahi support in the dnssd backend. patch from Fedora
   patch -Np1 -i ${srcdir}/cups-avahi.patch
+
+  # Do not export SSL libs in cups-config
+  patch -Np1 -i "${srcdir}/cups-no-export-ssllibs.patch"
   
   # Rebuild configure script for --enable-avahi.
   aclocal -I config-scripts
diff --git a/extra/cups/cups-no-export-ssllibs.patch b/extra/cups/cups-no-export-ssllibs.patch
new file mode 100644
index 000000000..9be3c819b
--- /dev/null
+++ b/extra/cups/cups-no-export-ssllibs.patch
@@ -0,0 +1,12 @@
+diff -up cups-1.5b1/config-scripts/cups-ssl.m4.no-export-ssllibs cups-1.5b1/config-scripts/cups-ssl.m4
+--- cups-1.5b1/config-scripts/cups-ssl.m4.no-export-ssllibs	2011-05-11 02:52:08.000000000 +0200
++++ cups-1.5b1/config-scripts/cups-ssl.m4	2011-05-23 17:47:27.000000000 +0200
+@@ -164,7 +164,7 @@ AC_SUBST(IPPALIASES)
+ AC_SUBST(SSLFLAGS)
+ AC_SUBST(SSLLIBS)
+ 
+-EXPORT_SSLLIBS="$SSLLIBS"
++EXPORT_SSLLIBS=""
+ AC_SUBST(EXPORT_SSLLIBS)
+ 
+ 
diff --git a/extra/cups/cups.install b/extra/cups/cups.install
index 0b7245aa7..47c3d9b82 100644
--- a/extra/cups/cups.install
+++ b/extra/cups/cups.install
@@ -14,7 +14,7 @@ post_upgrade() {
     fi
   if [ "`vercmp $2 1.4.7-2`" -lt 0 ]; then
     # important upgrade notice
-    echo "daemon srcript has been renamed to /etc/rc.d/cupsd"
+    echo "daemon script has been renamed to /etc/rc.d/cupsd"
     echo "change your entry in  /etc/rc.conf"
   fi
 }
diff --git a/extra/dconf/PKGBUILD b/extra/dconf/PKGBUILD
index d9054bb6d..36be36922 100644
--- a/extra/dconf/PKGBUILD
+++ b/extra/dconf/PKGBUILD
@@ -1,7 +1,7 @@
-# $Id: PKGBUILD 123352 2011-05-10 15:42:26Z ibiru $
+# $Id: PKGBUILD 132956 2011-07-26 15:21:51Z ibiru $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 pkgname=dconf
-pkgver=0.7.5
+pkgver=0.8.0
 pkgrel=1
 pkgdesc="A low-level configuration system."
 arch=(i686 x86_64)
@@ -11,8 +11,8 @@ depends=('glib2')
 makedepends=('vala' 'gobject-introspection' 'gtk3')
 optdepends=('gtk3: for dconf-editor')
 install=dconf.install
-source=(http://download.gnome.org/sources/${pkgname}/0.7/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('e2103e8207744903790e9fac6427fa394bb485a0c7f4e0d03b0fb43268c34f33')
+source=(http://download.gnome.org/sources/${pkgname}/0.8/${pkgname}-${pkgver}.tar.xz)
+sha256sums=('05111e973c365696759dd1b37e3f5acc877eff24dd2e4036d742aac5da5dda3b')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/digikam/PKGBUILD b/extra/digikam/PKGBUILD
index bfaf79277..7f60bd6e8 100644
--- a/extra/digikam/PKGBUILD
+++ b/extra/digikam/PKGBUILD
@@ -1,37 +1,84 @@
-# $Id: PKGBUILD 112844 2011-03-07 07:38:30Z tpowa $
-# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
+# $Id: PKGBUILD 134112 2011-08-01 17:31:36Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+# Contributor: Tobias Powalowski <tpowa@archlinux.org>
 
-pkgname=digikam
-pkgver=1.9.0
-pkgrel=1
-pkgdesc="Digital photo management application for kde"
+pkgbase=digikam
+pkgname=('digikam' 'kipi-plugins' 'libkface' 'libkgeomap' 'libmediawiki')
+pkgver=2.0.0
+pkgrel=2
+pkgdesc="Digital photo management application for KDE"
 arch=('i686' 'x86_64')
 license=('GPL')
-url="http://digikam.sourceforge.net"
-depends=('kdebase-runtime' 'kdegraphics-libs' 'kdepimlibs' 'kdeedu-marble' 'liblqr')
-makedepends=('pkgconfig' 'cmake' 'automoc4' 'doxygen')
-replaces=('digikamimageplugins')
-install=digikam.install
-optdepends=('kipi-plugins: for more extras and plugins')
-source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
+url="http://www.digikam.org/"
+makedepends=('kdepimlibs' 'libkexiv2' 'libkdcraw' 'libkipi' 'libksane' 'liblqr'
+             'kdeedu-marble' 'opencv' 'boost' 'libgpod' 'qjson' 'hugin'
+             'cmake' 'automoc4' 'doxygen')
+source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
+md5sums=('7b1ab69fc2fb36a45dc3ca38b01d42d8')
 
 build() {
-   cd ${srcdir}
-   mkdir build
-   cd build
-   # use internel lensfun packages
-   cmake ../${pkgname}-${pkgver} \
-     -DLENSFUN_LIBRARY="" \
-     -DLENSFUN_INCLUDE_DIR="" \
-     -DCMAKE_INSTALL_PREFIX=/usr \
-     -DENABLE_MARBLEWIDGET=yes \
-     -DWITH_MarbleWidget=yes \
-     -DCMAKE_SKIP_RPATH=ON
-   make all
+  cd "${srcdir}"
+  mkdir build
+  cd build
+  # Use internal lensfun (FS#21816)
+  cmake ../${pkgname}-${pkgver} \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_SKIP_RPATH=ON \
+    -DLENSFUN_LIBRARY="" \
+    -DLENSFUN_INCLUDE_DIR=""
+  make
 }
 
-package() {
-  cd ${srcdir}/build
+package_digikam() {
+  pkgdesc="Digital photo management application for KDE"
+  depends=('kdebase-runtime' 'kdepimlibs' 'libgphoto2' 'opencv' 'liblqr'
+           'libkipi' 'libkexiv2' 'libkdcraw' 'libkface' 'libkgeomap')
+  optdepends=('kipi-plugins: for more extras and plugins')
+  install=digikam.install
+
+  cd "${srcdir}"/build/core
+  make DESTDIR="${pkgdir}" install
+  cd "${srcdir}"/build/doc
+  make DESTDIR="${pkgdir}" install
+  cd "${srcdir}"/build/po
+  make DESTDIR="${pkgdir}" install
+}
+
+package_libkface() {
+  pkgdesc="A Qt/C++ wrapper around LibFace library to perform face recognition and detection over pictures"
+  depends=('kdelibs' 'opencv')
+
+  cd "${srcdir}"/build/extra/libkface
+  make DESTDIR="${pkgdir}" install
+}
+
+package_libkgeomap() {
+  pkgdesc="A wrapper around world map components for browsing and arranging photos on a map"
+  depends=('kdelibs' 'kdeedu-marble' 'libkexiv2')
+
+  cd "${srcdir}"/build/extra/libkgeomap
+  make DESTDIR="${pkgdir}" install
+}
+
+package_libmediawiki() {
+  pkgdesc="A KDE C++ interface for MediaWiki based web service as wikipedia.org"
+  depends=('kdelibs')
+
+  cd "${srcdir}"/build/extra/libmediawiki
+  make DESTDIR="${pkgdir}" install
+}
+
+package_kipi-plugins() {
+  pkgdesc="A collection of plugins extending the KDE graphics and image applications as digiKam"
+  depends=('kdebase-runtime' 'kdepimlibs' 'libkdcraw' 'libkipi' 'libksane'
+           'opencv' 'qjson')
+  optdepends=('libkgeomap'
+              'libmediawiki'
+              'libgpod'
+              'hugin')
+  install=kipi-plugins.install
+
+  cd "${srcdir}"/build/extra/kipi-plugins
   make DESTDIR="${pkgdir}" install
 }
-md5sums=('08934e97b63e8b1981f4087ec1a3372e')
diff --git a/extra/digikam/digikam.install b/extra/digikam/digikam.install
index e70c054ec..81ce5c4b0 100644
--- a/extra/digikam/digikam.install
+++ b/extra/digikam/digikam.install
@@ -1,5 +1,6 @@
 post_install() {
 	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+    update-desktop-database -q
 }
 
 post_upgrade() {
diff --git a/extra/digikam/kipi-plugins.install b/extra/digikam/kipi-plugins.install
new file mode 100644
index 000000000..81ce5c4b0
--- /dev/null
+++ b/extra/digikam/kipi-plugins.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/ekiga/PKGBUILD b/extra/ekiga/PKGBUILD
index 7d4d83910..6a3ab613e 100644
--- a/extra/ekiga/PKGBUILD
+++ b/extra/ekiga/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 124817 2011-05-24 15:39:18Z heftig $
+# $Id: PKGBUILD 132764 2011-07-25 20:58:05Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Tom K <tomk@runbox.com>
 
 pkgname=ekiga
-pkgver=3.3.0
-pkgrel=4
+pkgver=3.3.1
+pkgrel=1
 pkgdesc="VOIP/Videoconferencing app with full SIP and H.323 support (GnomeMeeting expanded and renamed)"
 url="http://www.ekiga.org"
 license=(GPL)
@@ -12,13 +12,11 @@ arch=(i686 x86_64)
 depends=('opal' 'boost-libs' 'libxv' 'libnotify' 'hicolor-icon-theme' 'avahi' 'gtk2' 'gconf')
 makedepends=('intltool' 'gnome-doc-utils' 'evolution-data-server' 'boost')
 optdepends=('evolution-data-server: Evolution integration')
-provides=('gnomemeeting')
-replaces=('gnomemeeting')
 options=(!emptydirs)
 groups=('gnome-extra')
 install=ekiga.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('3fb22704e44afebf4294632505fb7a13f3eccb152fcb5878e97aa556d9486d2c')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
+sha256sums=('4776834810f213a93cd6c307108c505970fe22e4803935134dd9f6b0bc834e06')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/freetype2/PKGBUILD b/extra/freetype2/PKGBUILD
index cfaffb725..4f19b7144 100644
--- a/extra/freetype2/PKGBUILD
+++ b/extra/freetype2/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 105523 2011-01-10 10:25:14Z jgc $
+# $Id: PKGBUILD 133922 2011-07-30 12:02:55Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=freetype2
-pkgver=2.4.4
-pkgrel=2
+pkgver=2.4.6
+pkgrel=1
 pkgdesc="TrueType font rendering library"
 arch=(i686 x86_64)
 license=('GPL')
@@ -12,9 +12,8 @@ depends=('zlib')
 options=('!libtool')
 source=(http://downloads.sourceforge.net/sourceforge/freetype/freetype-${pkgver}.tar.bz2
         freetype-2.3.0-enable-spr.patch
-        freetype-2.2.1-enable-valid.patch
-        allow-hlineto-vlineto-without-arguments.patch)
-md5sums=('b3e2b6e2f1c3e0dffa1fd2a0f848b671'
+        freetype-2.2.1-enable-valid.patch)
+md5sums=('5e6510613f612809d2d7862592b92ab7'
          '816dc8619a6904a7385769433c0a8653'
          '214119610444c9b02766ccee5e220680')
 
@@ -22,13 +21,12 @@ build() {
   cd "${srcdir}/freetype-${pkgver}"
   patch -Np1 -i "${srcdir}/freetype-2.3.0-enable-spr.patch"
   patch -Np1 -i "${srcdir}/freetype-2.2.1-enable-valid.patch"
-  patch -Np1 -i "${srcdir}/allow-hlineto-vlineto-without-arguments.patch"
 
   ./configure --prefix=/usr
   make
+}
+
+package() {
+  cd "${srcdir}/freetype-${pkgver}"
   make DESTDIR="${pkgdir}" install
 }
-md5sums=('b3e2b6e2f1c3e0dffa1fd2a0f848b671'
-         '816dc8619a6904a7385769433c0a8653'
-         '214119610444c9b02766ccee5e220680'
-         'bb094e147b25892f1d04cfb5ff877bce')
diff --git a/extra/gdb/PKGBUILD b/extra/gdb/PKGBUILD
index 385774b89..369098afa 100644
--- a/extra/gdb/PKGBUILD
+++ b/extra/gdb/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 90312 2010-09-10 14:58:18Z allan $
+# $Id: PKGBUILD 133976 2011-07-31 04:32:05Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
-# Maintainer: Jan de Groot <jgc@archlinux.org>
+# Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gdb
-pkgver=7.2
+pkgver=7.3
 pkgrel=2
 pkgdesc="The GNU Debugger"
 arch=('i686' 'x86_64')
@@ -15,18 +15,16 @@ backup=('etc/gdb/gdbinit')
 options=('!libtool')
 install=gdb.install
 source=(http://ftp.gnu.org/gnu/gdb/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('64260e6c56979ee750a01055f16091a5')
+md5sums=('485022b8df7ba2221f217e128f479fe7')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
   
   ./configure --prefix=/usr --disable-nls \
     --with-system-readline \
+    --with-python=/usr/bin/python2 \
     --with-system-gdbinit=/etc/gdb/gdbinit
   make
-  
-  # requires dejagnu
-  #make check
 }
 
 package() {
diff --git a/extra/gdb/gdb.install b/extra/gdb/gdb.install
index 44302170f..986ec547c 100644
--- a/extra/gdb/gdb.install
+++ b/extra/gdb/gdb.install
@@ -1,4 +1,4 @@
-infodir=/usr/share/info
+infodir=usr/share/info
 filelist=(annotate.info gdb.info gdb.info-1 gdb.info-2 gdb.info-3 gdb.info-4 gdbint.info gdbint.info-1 gdbint.info-2 stabs.info)
 
 post_install() {
diff --git a/extra/gnome-vfs/PKGBUILD b/extra/gnome-vfs/PKGBUILD
index 3474b4c22..6fbc241c5 100644
--- a/extra/gnome-vfs/PKGBUILD
+++ b/extra/gnome-vfs/PKGBUILD
@@ -1,26 +1,30 @@
-# $Id: PKGBUILD 122580 2011-05-04 18:07:34Z ibiru $
+# $Id: PKGBUILD 132804 2011-07-26 10:40:38Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gnome-vfs
 pkgver=2.24.4
-pkgrel=3
+pkgrel=4
 pkgdesc="The GNOME Virtual File System"
 arch=(i686 x86_64)
 license=('LGPL')
-depends=('fam' 'gconf' 'bzip2' 'avahi' 'smbclient' 'gnome-mime-data' 'krb5' 'gnutls')
+depends=('fam' 'gconf' 'bzip2' 'avahi' 'smbclient' 'gnome-mime-data' 'krb5' 'gnutls' 'libgcrypt')
 makedepends=('pkgconfig' 'intltool' 'gtk-doc' 'gnome-common')
 options=('!libtool' '!emptydirs')
 url="http://www.gnome.org"
 install=gnome-vfs.install
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.24/gnome-vfs-${pkgver}.tar.bz2
-        gnutls-config.patch)
+        gnutls-config.patch
+        gcrypt-config.patch)
 sha256sums=('62de64b5b804eb04104ff98fcd6a8b7276d510a49fbd9c0feb568f8996444faa'
-            '66c7cfb12995c0dd94a2caea95c7e3c55981993f05a79c585d60915ff131955d')
+            '66c7cfb12995c0dd94a2caea95c7e3c55981993f05a79c585d60915ff131955d'
+            'c059e218f310da683778919d36e7862f7e763384805f6453d328fbaf507a8114')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   #Fix build with new gnutls
   patch -Np1 -i "${srcdir}/gnutls-config.patch"
+  #fix build with new libgcrypt >= 1.5.0
+  patch -Np1 -i "${srcdir}/gcrypt-config.patch"
   libtoolize --force
   gtkdocize
   aclocal
diff --git a/extra/gnome-vfs/gcrypt-config.patch b/extra/gnome-vfs/gcrypt-config.patch
new file mode 100644
index 000000000..8ce91870a
--- /dev/null
+++ b/extra/gnome-vfs/gcrypt-config.patch
@@ -0,0 +1,31 @@
+# Allow gnome-vfs-2.24 to build with libgcrypt >= 1.5.0
+--- gnome-vfs-2.24.4/configure.in	2010-07-01 12:36:09.000000000 -0300
++++ gnome-vfs-2.24.4-libgcrypt//configure.in	2011-07-22 15:55:02.296325640 -0300
+@@ -689,6 +689,16 @@
+ AM_CONDITIONAL(HAVE_SSL, test x$have_ssl = xtrue)
+
+ dnl ****************************
++dnl LibGCrypt 1.5.0
++dnl ****************************
++
++AM_PATH_LIBGCRYPT(1.5.0)
++
++if test "x${LIBGCRYPT_LIBS}" = "x"; then
++	AC_MSG_ERROR([unable to find libgcrypt])
++fi
++
++dnl ****************************
+ dnl DNS-SD implementations
+ dnl ****************************
+ AM_CONDITIONAL(HAVE_AVAHI, false)
+@@ -1045,8 +1055,8 @@
+ dnl ==============================================================================
+
+ PKG_CHECK_MODULES(LIBGNOMEVFS, glib-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED gthread-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libxml-2.0 >= $XML_REQUIRED gnome-mime-data-2.0 $dbus_requirement)
+-LIBGNOMEVFS_CFLAGS="$LIBGNOMEVFS_CFLAGS $OPENSSL_CFLAGS $LIBGNUTLS_CFLAGS $HOWL_CFLAGS $AVAHI_CFLAGS"
+-LIBGNOMEVFS_LIBS="$LIBGNOMEVFS_LIBS $OPENSSL_LIBS $LIBGNUTLS_LIBS $HOWL_LIBS $AVAHI_LIBS $RESOLVER_LIBS"
++LIBGNOMEVFS_CFLAGS="$LIBGNOMEVFS_CFLAGS $OPENSSL_CFLAGS $LIBGNUTLS_CFLAGS $HOWL_CFLAGS $AVAHI_CFLAGS $LIBGCRYPT_CFLAGS"
++LIBGNOMEVFS_LIBS="$LIBGNOMEVFS_LIBS $OPENSSL_LIBS $LIBGNUTLS_LIBS $HOWL_LIBS $AVAHI_LIBS $RESOLVER_LIBS  $LIBGCRYPT_LIBS"
+ AC_SUBST(LIBGNOMEVFS_CFLAGS)
+ AC_SUBST(LIBGNOMEVFS_LIBS)
+
diff --git a/extra/gparted/PKGBUILD b/extra/gparted/PKGBUILD
index 16797c376..112ee183b 100644
--- a/extra/gparted/PKGBUILD
+++ b/extra/gparted/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 132466 2011-07-24 17:33:27Z giovanni $
+# $Id: PKGBUILD 133584 2011-07-29 19:07:04Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Andrew Simmons <andrew.simmons@gmail.com>
 
 pkgname=gparted
 pkgver=0.9.0
-pkgrel=2
+pkgrel=3
 pkgdesc="A Partition Magic clone, frontend to GNU Parted"
 arch=('i686' 'x86_64')
 url="http://gparted.sourceforge.net"
diff --git a/extra/gpgme/PKGBUILD b/extra/gpgme/PKGBUILD
index 7fe998fc2..3593bb5e7 100644
--- a/extra/gpgme/PKGBUILD
+++ b/extra/gpgme/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 78424 2010-04-23 17:42:52Z andrea $
+# $Id: PKGBUILD 131247 2011-07-12 07:42:52Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: Roman Kyrylych <roman@archlinux.org>
 # Contributor: Sarah Hay <sarah@archlinux.org>
 
 pkgname=gpgme
-pkgver=1.3.0
+pkgver=1.3.1
 pkgrel=1
 pkgdesc="A C wrapper library for GnuPG"
 arch=('i686' 'x86_64')
@@ -13,8 +13,7 @@ license=('GPL')
 depends=('libgpg-error' 'pth' 'gnupg' 'gnupg2')
 install=${pkgname}.install
 options=('!libtool' '!emptydirs')
-source=(ftp://ftp.gnupg.org/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-md5sums=('f148c73f6f540f91e02141df72844f62')
+source=(ftp://ftp.gnupg.org/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
@@ -28,3 +27,4 @@ package() {
   rm ${pkgdir}/usr/share/info/dir
   gzip ${pkgdir}/usr/share/info/*
 }
+md5sums=('90afa8436ce2b2683c001c824bd22601')
diff --git a/extra/hplip/PKGBUILD b/extra/hplip/PKGBUILD
index 22b0043ac..961e43b3f 100644
--- a/extra/hplip/PKGBUILD
+++ b/extra/hplip/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 127207 2011-06-11 09:02:04Z remy $
+# $Id: PKGBUILD 134122 2011-08-01 22:48:36Z giovanni $
 # Maintainer : Rémy Oudompheng <remy@archlinux.org>
 # Contributor: Morgan LEFIEUX <comete@archlinuxfr.org>
 
 pkgname=hplip
-pkgver=3.11.5
+pkgver=3.11.7
 pkgrel=1
 pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and some LaserJet"
 arch=('i686' 'x86_64')
@@ -24,8 +24,8 @@ optdepends=('cups: for printing support'
 replaces=('hpijs')
 options=('!libtool')
 install=hplip.install
-source=(http://downloads.sourceforge.net/${pkgname}/$pkgname-$pkgver.tar.gz)
-md5sums=('0a3d0f46ec89857b4c0feea6923864f1')
+source=("http://downloads.sourceforge.net/${pkgname}/$pkgname-$pkgver.tar.gz")
+md5sums=('5cb89a00b0c680d8bf9bf4b4f1f863b1')
 
 build() {
  cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/hugin/PKGBUILD b/extra/hugin/PKGBUILD
index 10ba90ba6..05ca2c60e 100644
--- a/extra/hugin/PKGBUILD
+++ b/extra/hugin/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 126376 2011-06-05 04:38:18Z eric $
+# $Id: PKGBUILD 132767 2011-07-25 23:16:55Z eric $
 # Maintainer: Tobias Kieslich <tobias@archlinux.org>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Dominik Ryba <domryba@post.pl>
 
 pkgname=hugin
 pkgver=2011.0.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A frontend to the panorama-tools"
 arch=('i686' 'x86_64')
 url="http://hugin.sourceforge.net/"
@@ -13,7 +13,7 @@ license=('LGPL')
 depends=('wxgtk' 'libpano13' 'boost-libs' 'enblend-enfuse' 'exiv2' 'openexr'
          'autopano-sift-c' 'lapack' 'desktop-file-utils' 'make' 'perl-exiftool')
 makedepends=('zip' 'cmake' 'boost')
-install=${pkgname}.install
+install=hugin.install
 source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
 md5sums=('ac8a129b4c3021233df6d9368c8164cf')
 sha1sums=('22e1ad3846291a9bbe58570683e213921a6f0116')
diff --git a/extra/jack/PKGBUILD b/extra/jack/PKGBUILD
index 170c43a4c..3e335f779 100644
--- a/extra/jack/PKGBUILD
+++ b/extra/jack/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 130010 2011-06-30 20:37:27Z schiv $
+# $Id: PKGBUILD 133558 2011-07-29 12:20:37Z schiv $
 # Maintainer: Ray Rashif <schiv@archlinux.org>
 # Contributor: tobias <tobias@archlinux.net>
 # Contributor: Robert Emil Berge <robert@rebi.no>
@@ -6,13 +6,14 @@
 pkgname=jack
 _longname=jack-audio-connection-kit
 pkgver=0.121.2
-pkgrel=1
+pkgrel=2
 pkgdesc="A low-latency audio server"
 arch=('i686' 'x86_64')
 license=('GPL' 'LGPL')
 depends=('libsamplerate' 'readline')
-makedepends=('doxygen' 'libffado')
-optdepends=('libffado: FireWire support')
+makedepends=('doxygen' 'libffado' 'celt-0.7')
+optdepends=('libffado: FireWire support'
+            'celt-0.7: NetJACK driver')
 url="http://jackaudio.org/"
 options=('!libtool')
 provides=("$_longname=$pkgver")
diff --git a/extra/jack/jack.changelog b/extra/jack/jack.changelog
index 47909c872..54b9df6e5 100644
--- a/extra/jack/jack.changelog
+++ b/extra/jack/jack.changelog
@@ -1,3 +1,9 @@
+29 Jul 2011 (GMT+8) Ray Rashif <schiv@archlinux.org>
+
+	* 0.121.2-2:
+	Added celt support with celt-0.7 from community
+	Will not bring celt to extra as it's very unstable
+
 8 Aug 2010 (GMT+8) Ray Rashif <schiv@archlinux.org>
 
 	* 0.118.0-4 :
diff --git a/extra/kdeaccessibility/PKGBUILD b/extra/kdeaccessibility/PKGBUILD
index 39a14d91d..49a66a384 100644
--- a/extra/kdeaccessibility/PKGBUILD
+++ b/extra/kdeaccessibility/PKGBUILD
@@ -1,25 +1,22 @@
-# $Id: PKGBUILD 130258 2011-07-04 19:27:34Z andrea $
+# $Id: PKGBUILD 132588 2011-07-25 00:13:13Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgbase=kdeaccessibility
-pkgname=('kdeaccessibility-colorschemes'
-         'kdeaccessibility-iconthemes'
-         'kdeaccessibility-jovie'
+pkgname=('kdeaccessibility-jovie'
          'kdeaccessibility-kaccessible'
          'kdeaccessibility-kmag'
          'kdeaccessibility-kmousetool'
          'kdeaccessibility-kmouth')
-pkgver=4.6.5
+pkgver=4.7.0
 pkgrel=1
 arch=('i686' 'x86_64')
 url='http://accessibility.kde.org'
 license=('GPL' 'FDL')
 groups=('kde' 'kdeaccessibility')
-makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdebase-runtime'
-        'speech-dispatcher')
+makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdelibs' 'speech-dispatcher')
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
-sha1sums=('6e40aab7c95671070cad0b5f59507ff887414ce0')
+sha1sums=('69ecaa186edd07cfc391d6c630b6a95da602d3b1')
 
 build() {
 	cd ${srcdir}
@@ -33,18 +30,6 @@ build() {
 	make
 }
 
-package_kdeaccessibility-colorschemes() {
-	pkgdesc='KDE Accessibility color schemes'
-	cd $srcdir/build/ColorSchemes
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeaccessibility-iconthemes() {
-	pkgdesc='KDE Accessibility icon themes'
-	cd $srcdir/build/IconThemes
-	make DESTDIR=$pkgdir install
-}
-
 package_kdeaccessibility-jovie() {
 	pkgdesc='A text to speech application'
 	depends=('kdebase-runtime' 'speech-dispatcher')
@@ -52,7 +37,7 @@ package_kdeaccessibility-jovie() {
 	install='kdeaccessibility.install'
 	cd $srcdir/build/jovie
 	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/jovie
+	cd $srcdir/build/jovie/doc
 	make DESTDIR=$pkgdir install
 }
 
@@ -71,7 +56,7 @@ package_kdeaccessibility-kmag() {
 	install='kdeaccessibility.install'
 	cd $srcdir/build/kmag
 	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kmag
+	cd $srcdir/build/kmag/doc
 	make DESTDIR=$pkgdir install
 }
 
@@ -82,7 +67,7 @@ package_kdeaccessibility-kmousetool() {
 	install='kdeaccessibility.install'
 	cd $srcdir/build/kmousetool
 	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kmousetool
+	cd $srcdir/build/kmousetool/doc
 	make DESTDIR=$pkgdir install
 }
 
@@ -93,6 +78,6 @@ package_kdeaccessibility-kmouth() {
 	install='kdeaccessibility.install'
 	cd $srcdir/build/kmouth
 	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kmouth
+	cd $srcdir/build/kmouth/doc
 	make DESTDIR=$pkgdir install
 }
diff --git a/extra/kdeadmin/PKGBUILD b/extra/kdeadmin/PKGBUILD
index 329404ead..30127f572 100644
--- a/extra/kdeadmin/PKGBUILD
+++ b/extra/kdeadmin/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 130259 2011-07-04 19:27:38Z andrea $
+# $Id: PKGBUILD 132589 2011-07-25 00:13:15Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
@@ -7,17 +7,17 @@ pkgname=('kdeadmin-kcron'
          'kdeadmin-ksystemlog'
          'kdeadmin-kuser'
          'kdeadmin-system-config-printer-kde')
-pkgver=4.6.5
+pkgver=4.7.0
 pkgrel=1
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdeadmin')
 makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdebindings-python'
-	         'system-config-printer-common' 'python2-pyqt')
+	         'system-config-printer-common')
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2"
         'syslog-path.patch')
-sha1sums=('010912294a12461a8a0bfdce69c5373b37342cb6'
+sha1sums=('792eaf403f1c95be0028145345ddd80a99cf3c15'
           '20095ce6e0f3e5b6800a7c6e52de6fddba62c031')
 
 build() {
@@ -31,9 +31,6 @@ build() {
 		-DCMAKE_BUILD_TYPE=Release \
 		-DCMAKE_SKIP_RPATH=ON \
 		-DCMAKE_INSTALL_PREFIX=/usr \
-		-DBUILD_kpackage=OFF \
-		-DBUILD_knetworkconf=OFF \
-		-DBUILD_lilo-config=OFF \
 		-DBUILD_strigi-analyzer=OFF
 	make
 }
diff --git a/extra/kdeartwork/PKGBUILD b/extra/kdeartwork/PKGBUILD
index c6aefa0d0..e12a5ba0a 100644
--- a/extra/kdeartwork/PKGBUILD
+++ b/extra/kdeartwork/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 130260 2011-07-04 19:27:42Z andrea $
+# $Id: PKGBUILD 132590 2011-07-25 00:13:19Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
@@ -13,16 +13,16 @@ pkgname=('kdeartwork-aurorae'
          'kdeartwork-styles'
          'kdeartwork-wallpapers'
          'kdeartwork-weatherwallpapers')
-pkgver=4.6.5
+pkgver=4.7.0
 pkgrel=1
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdeartwork')
 makedepends=('pkgconfig' 'cmake' 'automoc4' 'xscreensaver' 'eigen'
-	     'kdebase-workspace' 'kdegraphics-libs')
+	         'kdebase-workspace' 'libkexiv2')
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
-sha1sums=('9bcf223f7ee2ca0e12f9c8ab8235dcd35f589a8d')
+sha1sums=('b534a07ccd258135d72902a664198fd2bd22d508')
 
 build() {
 	cd $srcdir
@@ -43,6 +43,7 @@ package_kdeartwork-aurorae() {
 
 package_kdeartwork-colorschemes() {
 	pkgdesc='KDE color schemes'
+    replaces=('kdeaccessibility-colorschemes')
 	cd $srcdir/build/ColorSchemes
 	make DESTDIR=$pkgdir install
 }
@@ -61,13 +62,14 @@ package_kdeartwork-emoticons() {
 
 package_kdeartwork-iconthemes() {
 	pkgdesc='KDE icon themes'
+    replaces=('kdeaccessibility-iconthemes')
 	cd $srcdir/build/IconThemes
 	make DESTDIR=$pkgdir install
 }
 
 package_kdeartwork-kscreensaver() {
 	pkgdesc='KDE screensaver'
-	depends=('kdebase-workspace' 'kdegraphics-libs')
+	depends=('kdebase-workspace' 'libkexiv2')
 	cd $srcdir/build/kscreensaver
 	make DESTDIR=$pkgdir install
 }
diff --git a/extra/kdebase-konsole/PKGBUILD b/extra/kdebase-konsole/PKGBUILD
new file mode 100644
index 000000000..6b32d20cb
--- /dev/null
+++ b/extra/kdebase-konsole/PKGBUILD
@@ -0,0 +1,30 @@
+# $Id: PKGBUILD 132591 2011-07-25 00:13:21Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+
+pkgname=kdebase-konsole
+pkgver=4.7.0
+pkgrel=1
+arch=('i686' 'x86_64')
+url='http://kde.org/applications/system/konsole/'
+pkgdesc="Terminal"
+license=('GPL' 'LGPL' 'FDL')
+groups=('kde' 'kdebase')
+depends=('kdebase-runtime')
+makedepends=('cmake' 'automoc4')
+source=("http://download.kde.org/stable/${pkgver}/src/konsole-${pkgver}.tar.bz2")
+sha1sums=('e1e9fef5cb222e9d9eaba17e227ac66aed3e19d6')
+
+build() {
+  cd "${srcdir}"
+  mkdir build
+  cd build
+  cmake ../konsole-${pkgver} \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr
+  make
+}
+
+package() {
+  cd "${srcdir}"/build
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/extra/kdebase-runtime/PKGBUILD b/extra/kdebase-runtime/PKGBUILD
index ca063d8c1..172fbf6c1 100644
--- a/extra/kdebase-runtime/PKGBUILD
+++ b/extra/kdebase-runtime/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 130252 2011-07-04 19:27:07Z andrea $
+# $Id: PKGBUILD 132995 2011-07-26 16:04:04Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=kdebase-runtime
-pkgver=4.6.5
+pkgver=4.7.0
 pkgrel=1
 pkgdesc="KDE Base Runtime Environment"
 arch=('i686' 'x86_64')
@@ -16,14 +16,14 @@ optdepends=('htdig: to build the search index in khelpcenter'
             'rarian: needed by khelpcenter'
             'gdb: drkonq crash handler')
 install="${pkgname}.install"
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('e91d35af2a916259305cc7efc2f3a3fbc8b22def')
+source=("http://download.kde.org/stable/${pkgver}/src/kde-runtime-${pkgver}.tar.bz2")
+sha1sums=('79c9b8323368f1a2a9b03830bd9ae02b2b20482b')
 
 build() {
-	cd "${srcdir}"
+    cd "${srcdir}"
 	mkdir build
 	cd build
-	cmake ../${pkgname}-${pkgver} \
+	cmake ../kde-runtime-${pkgver} \
 		-DCMAKE_BUILD_TYPE=Release \
 		-DCMAKE_SKIP_RPATH=ON \
 		-DCMAKE_INSTALL_PREFIX=/usr
diff --git a/extra/kdebase-workspace/PKGBUILD b/extra/kdebase-workspace/PKGBUILD
index 85be8853d..7c122b37f 100644
--- a/extra/kdebase-workspace/PKGBUILD
+++ b/extra/kdebase-workspace/PKGBUILD
@@ -1,10 +1,11 @@
-# $Id: PKGBUILD 130255 2011-07-04 19:27:20Z andrea $
+# $Id: PKGBUILD 133463 2011-07-28 09:27:47Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=kdebase-workspace
-pkgver=4.6.5
-pkgrel=1
+_pkgname=kde-workspace
+pkgver=4.7.0
+pkgrel=2
 pkgdesc="KDE Base Workspace"
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
@@ -13,10 +14,11 @@ groups=('kde')
 # note on libxdamage:
 # 	not detected by namcap because libgl depends on it
 #	but nvidia providing libgl does not depend on libxdamage
-depends=('kdepim-runtime' 'lm_sensors' 'libraw1394' 'qimageblitz' 'libqalculate'
+depends=('kdepim-runtime' 'lm_sensors' 'libraw1394'  'libqalculate' 'qimageblitz'
          'polkit-kde' 'consolekit' 'xorg-xprop' 'libxdamage' 'libxklavier' 'libdmtx'
          'xorg-xsetroot' 'libxcomposite' 'libxinerama')
 makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' 'kdebindings-python')
+optdepends=('kde-wallpapers: officials KDE wallapers')
 replaces=('kdmtheme' 'kde-common' 'guidance-power-manager' 'policykit-kde' 'kdebase-kinfocenter')
 conflicts=('kde-common' 'guidance-power-manager' 'policykit-kde' 'kdebase-kinfocenter')
 install="${pkgname}.install"
@@ -25,10 +27,10 @@ backup=('usr/share/config/kdm/kdmrc'
         'etc/pam.d/kde-np'
         'etc/pam.d/kscreensaver')
 options=('emptydirs')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2"
+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')
-sha1sums=('190a524d57c4e52e69dcc1fc2e5a1c0681239a1c'
+sha1sums=('cbc61a20013c746f424681020c29480c6249fd10'
           '8c2bdefb23a03b753b78d16944d03fa3939d2d99'
           '5db3a245201bd4a50e65aa2ef583cf5490e4f646'
           'f7b38af38549242a240f1a90ab9964ca8a366129'
@@ -38,7 +40,7 @@ sha1sums=('190a524d57c4e52e69dcc1fc2e5a1c0681239a1c'
           'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3eeee')
 
 build() {
-	cd ${srcdir}/${pkgname}-${pkgver}
+	cd ${srcdir}/${_pkgname}-${pkgver}
 	patch -p0 -i ${srcdir}/kdm-zsh-profile.patch
 	patch -p0 -i ${srcdir}/fixpath.patch
 	patch -p0 -i ${srcdir}/terminate-server.patch
@@ -46,19 +48,24 @@ build() {
 	cd ${srcdir}
 	mkdir build
 	cd build
-	cmake ../${pkgname}-${pkgver} \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_SKIP_RPATH=ON \
-		-DCMAKE_INSTALL_PREFIX=/usr \
-		-DWITH_Xmms=OFF \
-		-DWITH_Googlegadgets=OFF \
-        -DWITH_NetworkManager=OFF
+	cmake ../${_pkgname}-${pkgver} \
+        -DCMAKE_BUILD_TYPE=Release \
+        -DCMAKE_SKIP_RPATH=ON \
+        -DCMAKE_INSTALL_PREFIX=/usr \
+        -DWITH_Xmms=OFF \
+        -DWITH_Googlegadgets=OFF \
+        -DWITH_libgps=OFF \
+        -DWITH_Prison=OFF \
+        -DWITH_NetworkManager=OFF \
+        -DKWIN_MOBILE_EFFECTS=OFF \
+        -DWITH_OpenGLES=OFF \
+        -DKWIN_BUILD_WITH_OPENGLES=OFF
 	make
 }
 
 package() {
-	cd $srcdir/build
-	make DESTDIR=$pkgdir install
+	cd ${srcdir}/build
+	make DESTDIR=${pkgdir} install
 
 	install -D -m755 ${srcdir}/kdm ${pkgdir}/etc/rc.d/kdm
 	install -D -m644 ${srcdir}/kde.pam ${pkgdir}/etc/pam.d/kde
diff --git a/extra/kdebase/PKGBUILD b/extra/kdebase/PKGBUILD
index 354b64302..0c3a6e4f6 100644
--- a/extra/kdebase/PKGBUILD
+++ b/extra/kdebase/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 130256 2011-07-04 19:27:25Z andrea $
+# $Id: PKGBUILD 132581 2011-07-25 00:12:45Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
@@ -8,26 +8,25 @@ pkgname=('kdebase-dolphin'
          'kdebase-kdialog'
          'kdebase-keditbookmarks'
          'kdebase-kfind'
+         'kdebase-konq-plugins'
          'kdebase-konqueror'
-         'kdebase-konsole'
-         'kdebase-kwrite'
          'kdebase-lib'
          'kdebase-plasma')
-pkgver=4.6.5
+pkgver=4.7.0
 pkgrel=1
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
 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=('1a902d22956daaf380ceefe68f8db75b8b760ae6')
+makedepends=('kdelibs' 'pkgconfig' 'cmake' 'automoc4' 'tidyhtml')
+source=("http://download.kde.org/stable/${pkgver}/src/kde-baseapps-${pkgver}.tar.bz2")
+sha1sums=('99f6b99039fbe41f470699232de703b4f4be802e')
 
 build() {
 	cd ${srcdir}
 	mkdir build
 	cd build
-	cmake ../${pkgbase}-${pkgver} \
+	cmake ../kde-baseapps-${pkgver} \
 		-DCMAKE_BUILD_TYPE=Release \
 		-DCMAKE_SKIP_RPATH=ON \
 		-DCMAKE_INSTALL_PREFIX=/usr
@@ -37,7 +36,9 @@ build() {
 package_kdebase-dolphin() {
 	pkgdesc='File Manager'
 	depends=('kdebase-runtime' 'kdebase-lib')
-	optdepends=('ruby: servicemenu installation')
+	optdepends=('kdegraphics-svgpart: thumbailers for SVG files'
+                'kdegraphics-thumbnailers: thumbnailers for graphics file'
+                'ruby: servicemenu installation')
 	url="http://kde.org/applications/system/dolphin/"
 	cd $srcdir/build/dolphin
 	make DESTDIR=$pkgdir install
@@ -79,6 +80,15 @@ package_kdebase-kfind() {
 	make DESTDIR=$pkgdir install
 }
 
+package_kdebase-konq-plugins() {
+	pkgdesc='Extra plugins for Konqueror'
+	depends=('kdebase-konqueror' 'tidyhtml')
+	replaces=('konq-plugins')
+	install='kdebase.install'
+	cd $srcdir/build/konq-plugins
+	make DESTDIR=$pkgdir install
+}
+
 package_kdebase-konqueror() {
 	pkgdesc='KDE File Manager & Web Browser'
 	depends=('kdebase-dolphin' 'kdebase-keditbookmarks')
@@ -93,26 +103,6 @@ package_kdebase-konqueror() {
     done
 }
 
-package_kdebase-konsole() {
-	pkgdesc='Terminal'
-	depends=('kdebase-runtime')
-	url="http://kde.org/applications/system/konsole/"
-	cd $srcdir/build/konsole
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/konsole/doc/manual
-	make DESTDIR=$pkgdir install
-}
-
-package_kdebase-kwrite() {
-	pkgdesc='Text Editor'
-	depends=('kdebase-runtime')
-	url="http://kde.org/applications/utilities/kwrite/"
-	cd $srcdir/build/kwrite
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kwrite
-	make DESTDIR=$pkgdir install
-}
-
 package_kdebase-lib() {
 	pkgdesc='KDE libraries for the basic desktop applications'
 	groups=()
diff --git a/extra/kdebindings-kimono/PKGBUILD b/extra/kdebindings-kimono/PKGBUILD
new file mode 100644
index 000000000..83fa80260
--- /dev/null
+++ b/extra/kdebindings-kimono/PKGBUILD
@@ -0,0 +1,32 @@
+# $Id: PKGBUILD 132592 2011-07-25 00:13:24Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+
+pkgname=kdebindings-kimono
+pkgver=4.7.0
+pkgrel=1
+pkgdesc=".NET/Mono bindings for the KDE libraries"
+url="http://kde.org/"
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL')
+groups=('kdebindings')
+depends=('kdebindings-qyoto' 'kdebindings-smokekde')
+makedepends=('cmake' 'automoc4' 'kdebindings-smokegen' 'boost' 'kdepimlibs')
+conflicts=('kdebindings-csharp')
+source=("http://download.kde.org/stable/${pkgver}/src/kimono-${pkgver}.tar.bz2")
+sha1sums=('3b9c6e12f5fdc57214db841b98bde90d8dbd40cf')
+
+build() {
+  cd "${srcdir}"
+  mkdir build
+  cd build
+  cmake ../kimono-${pkgver} \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DWITH_Soprano=OFF
+  make
+}
+
+package() {
+  cd "${srcdir}"/build
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/extra/kdebindings-korundum/PKGBUILD b/extra/kdebindings-korundum/PKGBUILD
new file mode 100644
index 000000000..6c48dfb58
--- /dev/null
+++ b/extra/kdebindings-korundum/PKGBUILD
@@ -0,0 +1,32 @@
+# $Id: PKGBUILD 132593 2011-07-25 00:13:27Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+
+pkgname=kdebindings-korundum
+pkgver=4.7.0
+pkgrel=1
+pkgdesc="KDE bindings for ruby"
+url="http://kde.org/"
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL')
+groups=('kdebindings')
+depends=('kdebindings-qtruby' 'kdebindings-smokekde')
+makedepends=('cmake' 'automoc4' 'kdebindings-smokegen' 'boost'
+             'kdepimlibs' 'kdegraphics-okular' 'kdesdk-kate')
+conflicts=('kdebindings-ruby')
+source=("http://download.kde.org/stable/${pkgver}/src/korundum-${pkgver}.tar.bz2")
+sha1sums=('6f96a412077d3b198ee64c88e26fe60227e723c9')
+
+build() {
+  cd "${srcdir}"
+  mkdir build
+  cd build
+  cmake ../korundum-${pkgver} \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr
+  make
+}
+
+package() {
+  cd "${srcdir}"/build
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/extra/kdebindings-kross/PKGBUILD b/extra/kdebindings-kross/PKGBUILD
new file mode 100644
index 000000000..6ce6f5538
--- /dev/null
+++ b/extra/kdebindings-kross/PKGBUILD
@@ -0,0 +1,51 @@
+# $Id: PKGBUILD 132594 2011-07-25 00:13:31Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+
+pkgbase=kdebindings-kross
+pkgname=('kdebindings-kross-python'
+#         'kdebindings-kross-ruby'
+         'kdebindings-kross-java')
+pkgver=4.7.0
+pkgrel=1
+url="http://kde.org/"
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL')
+groups=('kdebindings')
+makedepends=('kdelibs' 'cmake' 'automoc4' 'python2' 'openjdk6')
+source=("http://download.kde.org/stable/${pkgver}/src/kross-interpreters-${pkgver}.tar.bz2")
+sha1sums=('bd31f249a63696b34e33fe8ccd4adde07f386806')
+
+build() {
+  cd "${srcdir}"
+  mkdir build
+  cd build
+  cmake ../kross-interpreters-${pkgver} \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DBUILD_ruby=OFF
+  make
+}
+
+package_kdebindings-kross-python() {
+  pkgdesc="Python2 language interpreters to enable in-process scripting with Kross"
+  depends=('kdelibs' 'python2')
+
+  cd "${srcdir}"/build/python
+  make DESTDIR="${pkgdir}" install
+}
+
+package_kdebindings-kross-java() {
+  pkgdesc="Java language interpreters to enable in-process scripting with Kross"
+  depends=('kdelibs' 'openjdk6')
+
+  cd "${srcdir}"/build/java
+  make DESTDIR="${pkgdir}" install
+}
+
+package_kdebindings-kross-ruby() {
+  pkgdesc="Ruby language interpreters to enable in-process scripting with Kross"
+  depends=('kdelibs' 'ruby')
+
+  cd "${srcdir}"/build/ruby
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/extra/kdebindings-perlkde/PKGBUILD b/extra/kdebindings-perlkde/PKGBUILD
new file mode 100644
index 000000000..323a84382
--- /dev/null
+++ b/extra/kdebindings-perlkde/PKGBUILD
@@ -0,0 +1,31 @@
+# $Id: PKGBUILD 132595 2011-07-25 00:13:34Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+
+pkgname=kdebindings-perlkde
+pkgver=4.7.0
+pkgrel=1
+pkgdesc="Perl bindings for the KDE libraries"
+url="http://kde.org/"
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL')
+groups=('kdebindings')
+depends=('kdebindings-perlqt' 'kdebindings-smokekde')
+makedepends=('cmake' 'automoc4' 'kdebindings-smokegen' 'kdepimlibs'
+            'kdegraphics-okular' 'kdesdk-kate')
+source=("http://download.kde.org/stable/${pkgver}/src/perlkde-${pkgver}.tar.bz2")
+sha1sums=('cc4a9c1e966b3baae0f0b0b82224a9bef96bf7d7')
+
+build() {
+  cd "${srcdir}"
+  mkdir build
+  cd build
+  cmake ../perlkde-${pkgver} \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr
+  make
+}
+
+package() {
+  cd "${srcdir}"/build
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/extra/kdebindings-perlqt/PKGBUILD b/extra/kdebindings-perlqt/PKGBUILD
new file mode 100644
index 000000000..04f64deea
--- /dev/null
+++ b/extra/kdebindings-perlqt/PKGBUILD
@@ -0,0 +1,30 @@
+# $Id: PKGBUILD 132575 2011-07-25 00:12:27Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+
+pkgname=kdebindings-perlqt
+pkgver=4.7.0
+pkgrel=1
+pkgdesc="Perl bindings for the Qt libraries"
+url="http://kde.org/"
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL')
+groups=('kdebindings')
+depends=('kdebindings-smokeqt')
+makedepends=('cmake' 'automoc4' 'kdebindings-smokegen')
+source=("http://download.kde.org/stable/${pkgver}/src/perlqt-${pkgver}.tar.bz2")
+sha1sums=('a48f2f34374258793c7394914645cf2b8e597aaa')
+
+build() {
+  cd "${srcdir}"
+  mkdir build
+  cd build
+  cmake ../perlqt-${pkgver} \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr
+  make
+}
+
+package() {
+  cd "${srcdir}"/build
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/extra/kdebindings-python/PKGBUILD b/extra/kdebindings-python/PKGBUILD
new file mode 100644
index 000000000..3fa56c015
--- /dev/null
+++ b/extra/kdebindings-python/PKGBUILD
@@ -0,0 +1,34 @@
+# $Id: PKGBUILD 132576 2011-07-25 00:12:30Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+
+pkgname=kdebindings-python
+pkgver=4.7.0
+pkgrel=1
+pkgdesc="KDE bindings for python"
+url="http://kde.org/"
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL')
+groups=('kdebindings')
+depends=('kdepim-runtime' 'python2-pyqt' 'qscintilla' 'boost-libs')
+makedepends=('cmake' 'automoc4' 'boost')
+source=("http://download.kde.org/stable/${pkgver}/src/pykde4-${pkgver}.tar.bz2")
+sha1sums=('8f4cf7c9a99ee5b0fb2c7284518a129dced31c94')
+
+build() {
+  cd "${srcdir}"
+  mkdir build
+  cd build
+  cmake ../pykde4-${pkgver} \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DPYTHON_EXECUTABLE=/usr/bin/python2
+  make
+}
+
+package() {
+  cd "${srcdir}"/build
+  make DESTDIR="${pkgdir}" install
+
+  # Use the python2 executable
+  find "${pkgdir}" -name '*.py' | xargs sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|'
+}
diff --git a/extra/kdebindings-qtruby/PKGBUILD b/extra/kdebindings-qtruby/PKGBUILD
new file mode 100644
index 000000000..f80efdaec
--- /dev/null
+++ b/extra/kdebindings-qtruby/PKGBUILD
@@ -0,0 +1,31 @@
+# $Id: PKGBUILD 132578 2011-07-25 00:12:36Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+
+pkgname=kdebindings-qtruby
+pkgver=4.7.0
+pkgrel=1
+pkgdesc="Qt bindings for ruby"
+url="http://kde.org/"
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL')
+groups=('kdebindings')
+depends=('kdebindings-smokeqt' 'ruby')
+makedepends=('cmake' 'automoc4' 'kdebindings-smokegen')
+conflicts=('kdebindings-ruby')
+source=("http://download.kde.org/stable/${pkgver}/src/qtruby-${pkgver}.tar.bz2")
+sha1sums=('c42bf8eb7e237ce3b6ab061e30c8243d0e9ecae1')
+
+build() {
+  cd "${srcdir}"
+  mkdir build
+  cd build
+  cmake ../qtruby-${pkgver} \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr
+  make
+}
+
+package() {
+  cd "${srcdir}"/build
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/extra/kdebindings-qyoto/PKGBUILD b/extra/kdebindings-qyoto/PKGBUILD
new file mode 100644
index 000000000..6860cdb9f
--- /dev/null
+++ b/extra/kdebindings-qyoto/PKGBUILD
@@ -0,0 +1,31 @@
+# $Id: PKGBUILD 132577 2011-07-25 00:12:33Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+
+pkgname=kdebindings-qyoto
+pkgver=4.7.0
+pkgrel=1
+pkgdesc=".NET/Mono bindings for the Qt libraries"
+url="http://kde.org/"
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL')
+groups=('kdebindings')
+depends=('kdebindings-smokeqt' 'mono')
+makedepends=('cmake' 'automoc4' 'kdebindings-smokegen')
+conflicts=('kdebindings-csharp')
+source=("http://download.kde.org/stable/${pkgver}/src/qyoto-${pkgver}.tar.bz2")
+sha1sums=('2d55a08882679f2693008741f53deabc57898487')
+
+build() {
+  cd "${srcdir}"
+  mkdir build
+  cd build
+  cmake ../qyoto-${pkgver} \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr
+  make
+}
+
+package() {
+  cd "${srcdir}"/build
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/extra/kdebindings-smokegen/PKGBUILD b/extra/kdebindings-smokegen/PKGBUILD
new file mode 100644
index 000000000..2afa7fe17
--- /dev/null
+++ b/extra/kdebindings-smokegen/PKGBUILD
@@ -0,0 +1,30 @@
+# $Id: PKGBUILD 132570 2011-07-25 00:12:08Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+
+pkgname=kdebindings-smokegen
+pkgver=4.7.0
+pkgrel=1
+pkgdesc="A general purpose C++ parser with a plugin infrastructure"
+url="http://kde.org/"
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL')
+depends=('kdebase-runtime')
+makedepends=('cmake' 'automoc4')
+conflicts=('kdebindings-smoke')
+source=("http://download.kde.org/stable/${pkgver}/src/smokegen-${pkgver}.tar.bz2")
+sha1sums=('e6116d95aabe1fa00fb9126b582ad028765e56fc')
+
+build() {
+  cd "${srcdir}"
+  mkdir build
+  cd build
+  cmake ../smokegen-${pkgver} \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr
+  make
+}
+
+package() {
+  cd "${srcdir}"/build
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/extra/kdebindings-smokekde/PKGBUILD b/extra/kdebindings-smokekde/PKGBUILD
new file mode 100644
index 000000000..9e58d553f
--- /dev/null
+++ b/extra/kdebindings-smokekde/PKGBUILD
@@ -0,0 +1,32 @@
+# $Id: PKGBUILD 132574 2011-07-25 00:12:24Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+
+pkgname=kdebindings-smokekde
+pkgver=4.7.0
+pkgrel=1
+pkgdesc="Language independent library for KDE bindings"
+url="http://kde.org/"
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL')
+groups=('kdebindings')
+depends=('kdebindings-smokeqt')
+makedepends=('cmake' 'automoc4' 'kdebindings-smokegen' 'boost'
+             'kdepimlibs' 'kdegraphics-okular' 'kdesdk-kate')
+conflicts=('kdebindings-smoke')
+source=("http://download.kde.org/stable/${pkgver}/src/smokekde-${pkgver}.tar.bz2")
+sha1sums=('c1cd38131c841f1f386bc270225fc5950db1c7a0')
+
+build() {
+  cd "${srcdir}"
+  mkdir build
+  cd build
+  cmake ../smokekde-${pkgver} \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr
+  make
+}
+
+package() {
+  cd "${srcdir}"/build
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/extra/kdebindings-smokeqt/PKGBUILD b/extra/kdebindings-smokeqt/PKGBUILD
new file mode 100644
index 000000000..122ba1559
--- /dev/null
+++ b/extra/kdebindings-smokeqt/PKGBUILD
@@ -0,0 +1,31 @@
+# $Id: PKGBUILD 133252 2011-07-27 22:57:56Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+
+pkgname=kdebindings-smokeqt
+pkgver=4.6.95
+pkgrel=1
+pkgdesc="Language independent library for Qt bindings"
+url="http://kde.org/"
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL')
+groups=('kdebindings')
+depends=('kdebase-runtime' 'qimageblitz' 'qscintilla' 'qwt')
+makedepends=('cmake' 'automoc4' 'kdebindings-smokegen')
+conflicts=('kdebindings-smoke')
+source=("http://download.kde.org/unstable/${pkgver}/src/smokeqt-${pkgver}.tar.bz2")
+sha1sums=('304fcb7a38b3656db1d6614b8ff77e6e27274de6')
+
+build() {
+  cd "${srcdir}"
+  mkdir build
+  cd build
+  cmake ../smokeqt-${pkgver} \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr
+  make
+}
+
+package() {
+  cd "${srcdir}"/build
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/extra/kdeedu-blinken/PKGBUILD b/extra/kdeedu-blinken/PKGBUILD
new file mode 100644
index 000000000..8836294a8
--- /dev/null
+++ b/extra/kdeedu-blinken/PKGBUILD
@@ -0,0 +1,31 @@
+# $Id: PKGBUILD 132596 2011-07-25 00:13:36Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+
+pkgname=kdeedu-blinken
+pkgver=4.7.0
+pkgrel=1
+pkgdesc="Memory Enhancement Game"
+url="http://kde.org/applications/education/blinken/"
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL')
+groups=('kde' 'kdeedu')
+depends=('kdebase-runtime')
+makedepends=('cmake' 'automoc4')
+install=${pkgname}.install
+source=("http://download.kde.org/stable/${pkgver}/src/blinken-${pkgver}.tar.bz2")
+sha1sums=('8d6677b0c1b98bbb631730152e9edc1352af76c2')
+
+build() {
+  cd "${srcdir}"
+  mkdir build
+  cd build
+  cmake ../blinken-${pkgver} \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr
+  make
+}
+
+package() {
+  cd "${srcdir}"/build
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/extra/kdeedu-blinken/kdeedu-blinken.install b/extra/kdeedu-blinken/kdeedu-blinken.install
new file mode 100644
index 000000000..e70c054ec
--- /dev/null
+++ b/extra/kdeedu-blinken/kdeedu-blinken.install
@@ -0,0 +1,11 @@
+post_install() {
+	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+}
+
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+	post_install
+}
diff --git a/extra/kdeedu-cantor/PKGBUILD b/extra/kdeedu-cantor/PKGBUILD
new file mode 100644
index 000000000..b916917b9
--- /dev/null
+++ b/extra/kdeedu-cantor/PKGBUILD
@@ -0,0 +1,34 @@
+# $Id: PKGBUILD 132597 2011-07-25 00:13:40Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+
+pkgname=kdeedu-cantor
+pkgver=4.7.0
+pkgrel=1
+pkgdesc="KDE Frontend to Mathematical Software"
+url="http://kde.org/applications/education/cantor/"
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL')
+groups=('kde' 'kdeedu')
+depends=('kdebase-runtime' 'libspectre')
+makedepends=('cmake' 'automoc4' 'r')
+optdepends=('maxima: Maxima backend'
+            'octave: Octave backend'
+            'r: R backend')
+install=${pkgname}.install
+source=("http://download.kde.org/stable/${pkgver}/src/cantor-${pkgver}.tar.bz2")
+sha1sums=('2ab29119e2289d697cc0f623cbdd90933697c1de')
+
+build() {
+  cd "${srcdir}"
+  mkdir build
+  cd build
+  cmake ../cantor-${pkgver} \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr
+  make
+}
+
+package() {
+  cd "${srcdir}"/build
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/extra/kdeedu-cantor/kdeedu-cantor.install b/extra/kdeedu-cantor/kdeedu-cantor.install
new file mode 100644
index 000000000..81ce5c4b0
--- /dev/null
+++ b/extra/kdeedu-cantor/kdeedu-cantor.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/kdeedu-kalgebra/PKGBUILD b/extra/kdeedu-kalgebra/PKGBUILD
new file mode 100644
index 000000000..2743c3e3e
--- /dev/null
+++ b/extra/kdeedu-kalgebra/PKGBUILD
@@ -0,0 +1,31 @@
+# $Id: PKGBUILD 132598 2011-07-25 00:13:43Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+
+pkgname=kdeedu-kalgebra
+pkgver=4.7.0
+pkgrel=1
+pkgdesc="Graph Calculator"
+url="http://kde.org/applications/education/kalgebra/"
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL')
+groups=('kde' 'kdeedu')
+depends=('kdebase-runtime' 'libkdeedu')
+makedepends=('cmake' 'automoc4')
+install=${pkgname}.install
+source=("http://download.kde.org/stable/${pkgver}/src/kalgebra-${pkgver}.tar.bz2")
+sha1sums=('55def835948c6dff69ee87835c45630a1ae5cbc4')
+
+build() {
+  cd "${srcdir}"
+  mkdir build
+  cd build
+  cmake ../kalgebra-${pkgver} \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr
+  make
+}
+
+package() {
+  cd "${srcdir}"/build
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/extra/kdeedu-kalgebra/kdeedu-kalgebra.install b/extra/kdeedu-kalgebra/kdeedu-kalgebra.install
new file mode 100644
index 000000000..81ce5c4b0
--- /dev/null
+++ b/extra/kdeedu-kalgebra/kdeedu-kalgebra.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/kdeedu-kalzium/PKGBUILD b/extra/kdeedu-kalzium/PKGBUILD
new file mode 100644
index 000000000..6f3050406
--- /dev/null
+++ b/extra/kdeedu-kalzium/PKGBUILD
@@ -0,0 +1,31 @@
+# $Id: PKGBUILD 132599 2011-07-25 00:13:46Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+
+pkgname=kdeedu-kalzium
+pkgver=4.7.0
+pkgrel=1
+pkgdesc="Periodic Table of Elements"
+url="http://kde.org/applications/education/kalzium/"
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL')
+groups=('kde' 'kdeedu')
+depends=('kdelibs' 'avogadro' 'ocaml')
+makedepends=('cmake' 'automoc4')
+install=${pkgname}.install
+source=("http://download.kde.org/stable/${pkgver}/src/kalzium-${pkgver}.tar.bz2")
+sha1sums=('786890c54d8ea61841c2cfa4ca6b9c05492fae38')
+
+build() {
+  cd "${srcdir}"
+  mkdir build
+  cd build
+  cmake ../kalzium-${pkgver} \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr
+  make
+}
+
+package() {
+  cd "${srcdir}"/build
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/extra/kdeedu-kalzium/kdeedu-kalzium.install b/extra/kdeedu-kalzium/kdeedu-kalzium.install
new file mode 100644
index 000000000..e70c054ec
--- /dev/null
+++ b/extra/kdeedu-kalzium/kdeedu-kalzium.install
@@ -0,0 +1,11 @@
+post_install() {
+	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+}
+
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+	post_install
+}
diff --git a/extra/kdeedu-kanagram/PKGBUILD b/extra/kdeedu-kanagram/PKGBUILD
new file mode 100644
index 000000000..559d58097
--- /dev/null
+++ b/extra/kdeedu-kanagram/PKGBUILD
@@ -0,0 +1,31 @@
+# $Id: PKGBUILD 132600 2011-07-25 00:13:52Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+
+pkgname=kdeedu-kanagram
+pkgver=4.7.0
+pkgrel=1
+pkgdesc="Letter Order Game"
+url="http://kde.org/applications/education/kanagram/"
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL')
+groups=('kde' 'kdeedu')
+depends=('kdebase-runtime' 'libkdeedu')
+makedepends=('cmake' 'automoc4')
+install=${pkgname}.install
+source=("http://download.kde.org/stable/${pkgver}/src/kanagram-${pkgver}.tar.bz2")
+sha1sums=('7d3d423960958cae8df7113f722d92428037ff8e')
+
+build() {
+  cd "${srcdir}"
+  mkdir build
+  cd build
+  cmake ../kanagram-${pkgver} \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr
+  make
+}
+
+package() {
+  cd "${srcdir}"/build
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/extra/kdeedu-kanagram/kdeedu-kanagram.install b/extra/kdeedu-kanagram/kdeedu-kanagram.install
new file mode 100644
index 000000000..e70c054ec
--- /dev/null
+++ b/extra/kdeedu-kanagram/kdeedu-kanagram.install
@@ -0,0 +1,11 @@
+post_install() {
+	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+}
+
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+	post_install
+}
diff --git a/extra/kdeedu-kbruch/PKGBUILD b/extra/kdeedu-kbruch/PKGBUILD
new file mode 100644
index 000000000..cc2df7229
--- /dev/null
+++ b/extra/kdeedu-kbruch/PKGBUILD
@@ -0,0 +1,31 @@
+# $Id: PKGBUILD 132601 2011-07-25 00:13:57Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+
+pkgname=kdeedu-kbruch
+pkgver=4.7.0
+pkgrel=1
+pkgdesc="Exercise Fractions"
+url="http://kde.org/applications/education/kbruch/"
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL')
+groups=('kde' 'kdeedu')
+depends=('kdebase-runtime')
+makedepends=('cmake' 'automoc4')
+install=${pkgname}.install
+source=("http://download.kde.org/stable/${pkgver}/src/kbruch-${pkgver}.tar.bz2")
+sha1sums=('c3ca0d7a19787796faf8c7b96aeed46081613ac2')
+
+build() {
+  cd "${srcdir}"
+  mkdir build
+  cd build
+  cmake ../kbruch-${pkgver} \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr
+  make
+}
+
+package() {
+  cd "${srcdir}"/build
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/extra/kdeedu-kbruch/kdeedu-kbruch.install b/extra/kdeedu-kbruch/kdeedu-kbruch.install
new file mode 100644
index 000000000..e70c054ec
--- /dev/null
+++ b/extra/kdeedu-kbruch/kdeedu-kbruch.install
@@ -0,0 +1,11 @@
+post_install() {
+	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+}
+
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+	post_install
+}
diff --git a/extra/kdeedu-kgeography/PKGBUILD b/extra/kdeedu-kgeography/PKGBUILD
new file mode 100644
index 000000000..7cb32b49b
--- /dev/null
+++ b/extra/kdeedu-kgeography/PKGBUILD
@@ -0,0 +1,31 @@
+# $Id: PKGBUILD 132602 2011-07-25 00:14:02Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+
+pkgname=kdeedu-kgeography
+pkgver=4.7.0
+pkgrel=1
+pkgdesc="Geography Trainer"
+url="http://kde.org/applications/education/kgeography/"
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL')
+groups=('kde' 'kdeedu')
+depends=('kdebase-runtime')
+makedepends=('cmake' 'automoc4')
+install=${pkgname}.install
+source=("http://download.kde.org/stable/${pkgver}/src/kgeography-${pkgver}.tar.bz2")
+sha1sums=('5fa6bff0e67e11657d55435c3faffdfcaf318e1e')
+
+build() {
+  cd "${srcdir}"
+  mkdir build
+  cd build
+  cmake ../kgeography-${pkgver} \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr
+  make
+}
+
+package() {
+  cd "${srcdir}"/build
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/extra/kdeedu-kgeography/kdeedu-kgeography.install b/extra/kdeedu-kgeography/kdeedu-kgeography.install
new file mode 100644
index 000000000..e70c054ec
--- /dev/null
+++ b/extra/kdeedu-kgeography/kdeedu-kgeography.install
@@ -0,0 +1,11 @@
+post_install() {
+	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+}
+
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+	post_install
+}
diff --git a/extra/kdeedu-khangman/PKGBUILD b/extra/kdeedu-khangman/PKGBUILD
new file mode 100644
index 000000000..6ce8beb4b
--- /dev/null
+++ b/extra/kdeedu-khangman/PKGBUILD
@@ -0,0 +1,31 @@
+# $Id: PKGBUILD 132603 2011-07-25 00:14:06Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+
+pkgname=kdeedu-khangman
+pkgver=4.7.0
+pkgrel=1
+pkgdesc="Hangman Game"
+url="http://kde.org/applications/education/khangman/"
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL')
+groups=('kde' 'kdeedu')
+depends=('kdebase-runtime' 'libkdeedu')
+makedepends=('cmake' 'automoc4')
+install=${pkgname}.install
+source=("http://download.kde.org/stable/${pkgver}/src/khangman-${pkgver}.tar.bz2")
+sha1sums=('41ca66dd44de19e073993cc192bf6caf512b23d0')
+
+build() {
+  cd "${srcdir}"
+  mkdir build
+  cd build
+  cmake ../khangman-${pkgver} \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr
+  make
+}
+
+package() {
+  cd "${srcdir}"/build
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/extra/kdeedu-khangman/kdeedu-khangman.install b/extra/kdeedu-khangman/kdeedu-khangman.install
new file mode 100644
index 000000000..e70c054ec
--- /dev/null
+++ b/extra/kdeedu-khangman/kdeedu-khangman.install
@@ -0,0 +1,11 @@
+post_install() {
+	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+}
+
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+	post_install
+}
diff --git a/extra/kdeedu-kig/PKGBUILD b/extra/kdeedu-kig/PKGBUILD
new file mode 100644
index 000000000..be9ed46c1
--- /dev/null
+++ b/extra/kdeedu-kig/PKGBUILD
@@ -0,0 +1,34 @@
+# $Id: PKGBUILD 132604 2011-07-25 00:14:12Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+
+pkgname=kdeedu-kig
+pkgver=4.7.0
+pkgrel=1
+pkgdesc="Interactive Geometry"
+url="http://kde.org/applications/education/kig/"
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL')
+groups=('kde' 'kdeedu')
+depends=('kdebase-runtime')
+makedepends=('cmake' 'automoc4')
+install=${pkgname}.install
+source=("http://download.kde.org/stable/${pkgver}/src/kig-${pkgver}.tar.bz2")
+sha1sums=('a6f46c28c4da5de14e3e46c19c11bd2ccdb16abf')
+
+build() {
+  cd "${srcdir}"
+  mkdir build
+  cd build
+  cmake ../kig-${pkgver} \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr
+  make
+}
+
+package() {
+  cd "${srcdir}"/build
+  make DESTDIR="${pkgdir}" install
+
+  # Use the python2 executable
+  sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' "${pkgdir}"/usr/bin/pykig.py
+}
diff --git a/extra/kdeedu-kig/kdeedu-kig.install b/extra/kdeedu-kig/kdeedu-kig.install
new file mode 100644
index 000000000..81ce5c4b0
--- /dev/null
+++ b/extra/kdeedu-kig/kdeedu-kig.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/kdeedu-kiten/PKGBUILD b/extra/kdeedu-kiten/PKGBUILD
new file mode 100644
index 000000000..afbfb5676
--- /dev/null
+++ b/extra/kdeedu-kiten/PKGBUILD
@@ -0,0 +1,31 @@
+# $Id: PKGBUILD 132605 2011-07-25 00:14:17Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+
+pkgname=kdeedu-kiten
+pkgver=4.7.0
+pkgrel=1
+pkgdesc="Japanese Reference/Study Tool"
+url="http://kde.org/applications/education/kiten/"
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL')
+groups=('kde' 'kdeedu')
+depends=('kdebase-runtime')
+makedepends=('cmake' 'automoc4')
+install=${pkgname}.install
+source=("http://download.kde.org/stable/${pkgver}/src/kiten-${pkgver}.tar.bz2")
+sha1sums=('7caa8c13f6431d54eabc3a88f874f279134181c3')
+
+build() {
+  cd "${srcdir}"
+  mkdir build
+  cd build
+  cmake ../kiten-${pkgver} \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr
+  make
+}
+
+package() {
+  cd "${srcdir}"/build
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/extra/kdeedu-kiten/kdeedu-kiten.install b/extra/kdeedu-kiten/kdeedu-kiten.install
new file mode 100644
index 000000000..e70c054ec
--- /dev/null
+++ b/extra/kdeedu-kiten/kdeedu-kiten.install
@@ -0,0 +1,11 @@
+post_install() {
+	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+}
+
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+	post_install
+}
diff --git a/extra/kdeedu-klettres/PKGBUILD b/extra/kdeedu-klettres/PKGBUILD
new file mode 100644
index 000000000..5722dec40
--- /dev/null
+++ b/extra/kdeedu-klettres/PKGBUILD
@@ -0,0 +1,31 @@
+# $Id: PKGBUILD 132606 2011-07-25 00:14:23Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+
+pkgname=kdeedu-klettres
+pkgver=4.7.0
+pkgrel=1
+pkgdesc="Learn The Alphabet"
+url="http://kde.org/applications/education/klettres/"
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL')
+groups=('kde' 'kdeedu')
+depends=('kdebase-runtime')
+makedepends=('cmake' 'automoc4')
+install=${pkgname}.install
+source=("http://download.kde.org/stable/${pkgver}/src/klettres-${pkgver}.tar.bz2")
+sha1sums=('1701b1c83856686b5123036dcf3c17643bf1ccc6')
+
+build() {
+  cd "${srcdir}"
+  mkdir build
+  cd build
+  cmake ../klettres-${pkgver} \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr
+  make
+}
+
+package() {
+  cd "${srcdir}"/build
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/extra/kdeedu-klettres/kdeedu-klettres.install b/extra/kdeedu-klettres/kdeedu-klettres.install
new file mode 100644
index 000000000..e70c054ec
--- /dev/null
+++ b/extra/kdeedu-klettres/kdeedu-klettres.install
@@ -0,0 +1,11 @@
+post_install() {
+	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+}
+
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+	post_install
+}
diff --git a/extra/kdeedu-kmplot/PKGBUILD b/extra/kdeedu-kmplot/PKGBUILD
new file mode 100644
index 000000000..e56d89cbb
--- /dev/null
+++ b/extra/kdeedu-kmplot/PKGBUILD
@@ -0,0 +1,31 @@
+# $Id: PKGBUILD 132607 2011-07-25 00:14:26Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+
+pkgname=kdeedu-kmplot
+pkgver=4.7.0
+pkgrel=1
+pkgdesc="Mathematical Function Plotter"
+url="http://kde.org/applications/education/kmplot/"
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL')
+groups=('kde' 'kdeedu')
+depends=('kdebase-runtime')
+makedepends=('cmake' 'automoc4')
+install=${pkgname}.install
+source=("http://download.kde.org/stable/${pkgver}/src/kmplot-${pkgver}.tar.bz2")
+sha1sums=('5123c7855497e6374dbd7211890cf9e69a4ee886')
+
+build() {
+  cd "${srcdir}"
+  mkdir build
+  cd build
+  cmake ../kmplot-${pkgver} \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr
+  make
+}
+
+package() {
+  cd "${srcdir}"/build
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/extra/kdeedu-kmplot/kdeedu-kmplot.install b/extra/kdeedu-kmplot/kdeedu-kmplot.install
new file mode 100644
index 000000000..81ce5c4b0
--- /dev/null
+++ b/extra/kdeedu-kmplot/kdeedu-kmplot.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/kdeedu-kstars/PKGBUILD b/extra/kdeedu-kstars/PKGBUILD
new file mode 100644
index 000000000..e69b38abd
--- /dev/null
+++ b/extra/kdeedu-kstars/PKGBUILD
@@ -0,0 +1,32 @@
+# $Id: PKGBUILD 132608 2011-07-25 00:14:29Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+
+pkgname=kdeedu-kstars
+pkgver=4.7.0
+pkgrel=1
+pkgdesc="Desktop Planetarium"
+url="http://kde.org/applications/education/kstars/"
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL')
+groups=('kde' 'kdeedu')
+depends=('kdebase-runtime' 'eigen' 'cfitsio' 'libindi')
+makedepends=('cmake' 'automoc4')
+install=${pkgname}.install
+source=("http://download.kde.org/stable/${pkgver}/src/kstars-${pkgver}.tar.bz2")
+sha1sums=('7ef3b53889aceb97b9452bf0b581a3aeefd243dc')
+
+build() {
+  cd "${srcdir}"
+  mkdir build
+  cd build
+  cmake ../kstars-${pkgver} \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DWITH_Xplanet=OFF
+  make
+}
+
+package() {
+  cd "${srcdir}"/build
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/extra/kdeedu-kstars/kdeedu-kstars.install b/extra/kdeedu-kstars/kdeedu-kstars.install
new file mode 100644
index 000000000..e70c054ec
--- /dev/null
+++ b/extra/kdeedu-kstars/kdeedu-kstars.install
@@ -0,0 +1,11 @@
+post_install() {
+	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+}
+
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+	post_install
+}
diff --git a/extra/kdeedu-ktouch/PKGBUILD b/extra/kdeedu-ktouch/PKGBUILD
new file mode 100644
index 000000000..030fe2928
--- /dev/null
+++ b/extra/kdeedu-ktouch/PKGBUILD
@@ -0,0 +1,31 @@
+# $Id: PKGBUILD 132609 2011-07-25 00:14:32Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+
+pkgname=kdeedu-ktouch
+pkgver=4.7.0
+pkgrel=1
+pkgdesc="Touch Typing Tutor"
+url="http://kde.org/applications/education/ktouch/"
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL')
+groups=('kde' 'kdeedu')
+depends=('kdebase-runtime')
+makedepends=('cmake' 'automoc4')
+install=${pkgname}.install
+source=("http://download.kde.org/stable/${pkgver}/src/ktouch-${pkgver}.tar.bz2")
+sha1sums=('b310e264e3fe8c96e2ceee233f364ae5cbd38048')
+
+build() {
+  cd "${srcdir}"
+  mkdir build
+  cd build
+  cmake ../ktouch-${pkgver} \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr
+  make
+}
+
+package() {
+  cd "${srcdir}"/build
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/extra/kdeedu-ktouch/kdeedu-ktouch.install b/extra/kdeedu-ktouch/kdeedu-ktouch.install
new file mode 100644
index 000000000..e70c054ec
--- /dev/null
+++ b/extra/kdeedu-ktouch/kdeedu-ktouch.install
@@ -0,0 +1,11 @@
+post_install() {
+	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+}
+
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+	post_install
+}
diff --git a/extra/kdeedu-kturtle/PKGBUILD b/extra/kdeedu-kturtle/PKGBUILD
new file mode 100644
index 000000000..dbfc6916d
--- /dev/null
+++ b/extra/kdeedu-kturtle/PKGBUILD
@@ -0,0 +1,31 @@
+# $Id: PKGBUILD 132610 2011-07-25 00:14:35Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+
+pkgname=kdeedu-kturtle
+pkgver=4.7.0
+pkgrel=1
+pkgdesc="Educational Programming Environment"
+url="http://kde.org/applications/education/kturtle/"
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL')
+groups=('kde' 'kdeedu')
+depends=('kdebase-runtime')
+makedepends=('cmake' 'automoc4')
+install=${pkgname}.install
+source=("http://download.kde.org/stable/${pkgver}/src/kturtle-${pkgver}.tar.bz2")
+sha1sums=('d7bba4f06ac21b37bf32a84903ba6366a094ac1f')
+
+build() {
+  cd "${srcdir}"
+  mkdir build
+  cd build
+  cmake ../kturtle-${pkgver} \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr
+  make
+}
+
+package() {
+  cd "${srcdir}"/build
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/extra/kdeedu-kturtle/kdeedu-kturtle.install b/extra/kdeedu-kturtle/kdeedu-kturtle.install
new file mode 100644
index 000000000..e70c054ec
--- /dev/null
+++ b/extra/kdeedu-kturtle/kdeedu-kturtle.install
@@ -0,0 +1,11 @@
+post_install() {
+	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+}
+
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+	post_install
+}
diff --git a/extra/kdeedu-kwordquiz/PKGBUILD b/extra/kdeedu-kwordquiz/PKGBUILD
new file mode 100644
index 000000000..4eff81f21
--- /dev/null
+++ b/extra/kdeedu-kwordquiz/PKGBUILD
@@ -0,0 +1,31 @@
+# $Id: PKGBUILD 132611 2011-07-25 00:14:37Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+
+pkgname=kdeedu-kwordquiz
+pkgver=4.7.0
+pkgrel=1
+pkgdesc="Flash Card Trainer"
+url="http://kde.org/applications/education/kwordquiz/"
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL')
+groups=('kde' 'kdeedu')
+depends=('kdebase-runtime' 'libkdeedu')
+makedepends=('cmake' 'automoc4')
+install=${pkgname}.install
+source=("http://download.kde.org/stable/${pkgver}/src/kwordquiz-${pkgver}.tar.bz2")
+sha1sums=('57064fa6044c65c13da69a8954598357b6499622')
+
+build() {
+  cd "${srcdir}"
+  mkdir build
+  cd build
+  cmake ../kwordquiz-${pkgver} \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr
+  make
+}
+
+package() {
+  cd "${srcdir}"/build
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/extra/kdeedu-kwordquiz/kdeedu-kwordquiz.install b/extra/kdeedu-kwordquiz/kdeedu-kwordquiz.install
new file mode 100644
index 000000000..81ce5c4b0
--- /dev/null
+++ b/extra/kdeedu-kwordquiz/kdeedu-kwordquiz.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/kdeedu-marble/PKGBUILD b/extra/kdeedu-marble/PKGBUILD
new file mode 100644
index 000000000..519a8d9a0
--- /dev/null
+++ b/extra/kdeedu-marble/PKGBUILD
@@ -0,0 +1,36 @@
+# $Id: PKGBUILD 132583 2011-07-25 00:12:54Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+
+pkgname=kdeedu-marble
+pkgver=4.7.0
+pkgrel=1
+pkgdesc="Desktop Globe"
+url="http://kde.org/applications/education/marble/"
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL')
+groups=('kde' 'kdeedu')
+depends=('kdebase-runtime' 'gpsd')
+makedepends=('cmake' 'automoc4')
+install=${pkgname}.install
+source=("http://download.kde.org/stable/${pkgver}/src/marble-${pkgver}.tar.bz2"
+        'gpsd-2.96.patch')
+sha1sums=('bbe08a57a33e06fceea3a51aed1406bc71ee02a9'
+          'f44dfd3bb384e631d59b93d7dda3413795da8183')
+
+build() {
+  cd "${srcdir}"/marble-${pkgver}
+  patch -p1 -i "${srcdir}"/gpsd-2.96.patch
+
+  cd "${srcdir}"
+  mkdir build
+  cd build
+  cmake ../marble-${pkgver} \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr
+  make
+}
+
+package() {
+  cd "${srcdir}"/build
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/extra/kdeedu-marble/gpsd-2.96.patch b/extra/kdeedu-marble/gpsd-2.96.patch
new file mode 100644
index 000000000..e27702181
--- /dev/null
+++ b/extra/kdeedu-marble/gpsd-2.96.patch
@@ -0,0 +1,41 @@
+--- marble-4.6.80/src/plugins/positionprovider/gpsd/GpsdConnection.cpp
++++ marble-4.6.80/src/plugins/positionprovider/gpsd/GpsdConnection.cpp
+@@ -18,6 +18,9 @@ using namespace Marble;
+ 
+ GpsdConnection::GpsdConnection( QObject* parent )
+     : QObject( parent ),
++#if defined( GPSD_API_MAJOR_VERSION ) && ( GPSD_API_MAJOR_VERSION >= 5 )
++      m_gpsd("localhost", DEFAULT_GPSD_PORT),
++#endif
+       m_timer( 0 )
+ {
+     connect( &m_timer, SIGNAL( timeout() ), this, SLOT( update() ) );
+@@ -26,7 +29,11 @@ GpsdConnection::GpsdConnection( QObject*
+ void GpsdConnection::initialize()
+ {
+     m_timer.stop();
++#if defined( GPSD_API_MAJOR_VERSION ) && ( GPSD_API_MAJOR_VERSION >= 5 )
++    gps_data_t* data;
++#else
+     gps_data_t* data = m_gpsd.open();
++#endif
+     if ( data ) {
+         m_status = PositionProviderStatusAcquiring;
+         emit statusChanged( m_status );
+@@ -73,8 +80,16 @@ void GpsdConnection::initialize()
+ void GpsdConnection::update()
+ {
+ #if defined( GPSD_API_MAJOR_VERSION ) && ( GPSD_API_MAJOR_VERSION >= 3 ) && defined( PACKET_SET )
++#if defined( GPSD_API_MAJOR_VERSION ) && ( GPSD_API_MAJOR_VERSION >= 5 )
++    if ( m_gpsd.waiting(0) ) {
++#else
+     if ( m_gpsd.waiting() ) {
++#endif
++#if defined( GPSD_API_MAJOR_VERSION ) && ( GPSD_API_MAJOR_VERSION >= 5 )
++        gps_data_t* data = m_gpsd.read();
++#else
+         gps_data_t* data = m_gpsd.poll();
++#endif
+         if ( data && data->set & PACKET_SET ) {
+             emit gpsdInfo( *data );
+         }
diff --git a/extra/kdeedu-marble/kdeedu-marble.install b/extra/kdeedu-marble/kdeedu-marble.install
new file mode 100644
index 000000000..81ce5c4b0
--- /dev/null
+++ b/extra/kdeedu-marble/kdeedu-marble.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/kdeedu-parley/PKGBUILD b/extra/kdeedu-parley/PKGBUILD
new file mode 100644
index 000000000..0f3749239
--- /dev/null
+++ b/extra/kdeedu-parley/PKGBUILD
@@ -0,0 +1,31 @@
+# $Id: PKGBUILD 132612 2011-07-25 00:14:40Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+
+pkgname=kdeedu-parley
+pkgver=4.7.0
+pkgrel=1
+pkgdesc="Vocabulary Trainer"
+url="http://kde.org/applications/education/parley/"
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL')
+groups=('kde' 'kdeedu')
+depends=('kdebase-runtime' 'libkdeedu')
+makedepends=('cmake' 'automoc4')
+install=${pkgname}.install
+source=("http://download.kde.org/stable/${pkgver}/src/parley-${pkgver}.tar.bz2")
+sha1sums=('b0925b3658656933410eaee701ec5f30eebee88e')
+
+build() {
+  cd "${srcdir}"
+  mkdir build
+  cd build
+  cmake ../parley-${pkgver} \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr
+  make
+}
+
+package() {
+  cd "${srcdir}"/build
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/extra/kdeedu-parley/kdeedu-parley.install b/extra/kdeedu-parley/kdeedu-parley.install
new file mode 100644
index 000000000..81ce5c4b0
--- /dev/null
+++ b/extra/kdeedu-parley/kdeedu-parley.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/kdeedu-rocs/PKGBUILD b/extra/kdeedu-rocs/PKGBUILD
new file mode 100644
index 000000000..7537baa0b
--- /dev/null
+++ b/extra/kdeedu-rocs/PKGBUILD
@@ -0,0 +1,30 @@
+# $Id: PKGBUILD 132613 2011-07-25 00:14:43Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+
+pkgname=kdeedu-rocs
+pkgver=4.7.0
+pkgrel=1
+pkgdesc="Rocs Graph Theory"
+url="http://kde.org/applications/education/rocs/"
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL')
+groups=('kde' 'kdeedu')
+depends=('kdebase-runtime' 'boost-libs')
+makedepends=('cmake' 'automoc4' 'boost')
+source=("http://download.kde.org/stable/${pkgver}/src/rocs-${pkgver}.tar.bz2")
+sha1sums=('f7cb5e17d469e6f88851f1104145e3d02cff27c0')
+
+build() {
+  cd "${srcdir}"
+  mkdir build
+  cd build
+  cmake ../rocs-${pkgver} \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr
+  make
+}
+
+package() {
+  cd "${srcdir}"/build
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/extra/kdeedu-step/PKGBUILD b/extra/kdeedu-step/PKGBUILD
new file mode 100644
index 000000000..2f89c8c4f
--- /dev/null
+++ b/extra/kdeedu-step/PKGBUILD
@@ -0,0 +1,31 @@
+# $Id: PKGBUILD 132614 2011-07-25 00:14:47Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+
+pkgname=kdeedu-step
+pkgver=4.7.0
+pkgrel=1
+pkgdesc="Interactive Physical Simulator"
+url="http://kde.org/applications/education/step/"
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL')
+groups=('kde' 'kdeedu')
+depends=('kdebase-runtime' 'libqalculate' 'gsl' 'eigen')
+makedepends=('cmake' 'automoc4')
+install=${pkgname}.install
+source=("http://download.kde.org/stable/${pkgver}/src/step-${pkgver}.tar.bz2")
+sha1sums=('134fe3b80f0ea1931a81cd82981ef5d683442518')
+
+build() {
+  cd "${srcdir}"
+  mkdir build
+  cd build
+  cmake ../step-${pkgver} \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr
+  make
+}
+
+package() {
+  cd "${srcdir}"/build
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/extra/kdeedu-step/kdeedu-step.install b/extra/kdeedu-step/kdeedu-step.install
new file mode 100644
index 000000000..e70c054ec
--- /dev/null
+++ b/extra/kdeedu-step/kdeedu-step.install
@@ -0,0 +1,11 @@
+post_install() {
+	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+}
+
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+	post_install
+}
diff --git a/extra/kdegames/PKGBUILD b/extra/kdegames/PKGBUILD
index 21bc2765c..16f25e84a 100644
--- a/extra/kdegames/PKGBUILD
+++ b/extra/kdegames/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 130261 2011-07-04 19:27:48Z andrea $
+# $Id: PKGBUILD 132615 2011-07-25 00:14:50Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
@@ -43,7 +43,7 @@ pkgname=('kdegames-bomber'
          'kdegames-libkmahjongg'
          'kdegames-lskat'
          'kdegames-palapeli')
-pkgver=4.6.5
+pkgver=4.7.0
 pkgrel=1
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
@@ -52,7 +52,7 @@ groups=('kde' 'kdegames')
 makedepends=('pkgconfig' 'cmake' 'automoc4' 'ggz-client-libs' 'twisted'
              'kdebindings-python' 'openal')
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
-sha1sums=('28c4908439f493fa30436875a77de01a21e88f4c')
+sha1sums=('4921fc802f02d0f4b21b8c99cb2ac8c24867fe16')
 
 build() {
 	cd $srcdir
diff --git a/extra/kdegraphics-gwenview/PKGBUILD b/extra/kdegraphics-gwenview/PKGBUILD
new file mode 100644
index 000000000..fbda6ccfe
--- /dev/null
+++ b/extra/kdegraphics-gwenview/PKGBUILD
@@ -0,0 +1,32 @@
+# $Id: PKGBUILD 132616 2011-07-25 00:14:53Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+
+pkgname=kdegraphics-gwenview
+pkgver=4.7.0
+pkgrel=1
+pkgdesc="A fast and easy to use image viewer for KDE"
+url="http://kde.org/applications/graphics/gwenview/"
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL')
+groups=('kde' 'kdegraphics')
+depends=('kdebase-lib' 'libkipi')
+makedepends=('cmake' 'automoc4')
+optdepends=('kipi-plugins: extra plugins to share photos')
+install=$pkgname.install
+source=("http://download.kde.org/stable/${pkgver}/src/gwenview-${pkgver}.tar.bz2")
+sha1sums=('30058dc40ea6ae8e3298facb9582d6bf91753d8b')
+
+build() {
+  cd "${srcdir}"
+  mkdir build
+  cd build
+  cmake ../gwenview-${pkgver} \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr
+  make
+}
+
+package() {
+  cd "${srcdir}"/build
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/extra/kdegraphics-gwenview/kdegraphics-gwenview.install b/extra/kdegraphics-gwenview/kdegraphics-gwenview.install
new file mode 100644
index 000000000..81ce5c4b0
--- /dev/null
+++ b/extra/kdegraphics-gwenview/kdegraphics-gwenview.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/kdegraphics-kamera/PKGBUILD b/extra/kdegraphics-kamera/PKGBUILD
new file mode 100644
index 000000000..ab444ebb5
--- /dev/null
+++ b/extra/kdegraphics-kamera/PKGBUILD
@@ -0,0 +1,30 @@
+# $Id: PKGBUILD 132617 2011-07-25 00:14:56Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+
+pkgname=kdegraphics-kamera
+pkgver=4.7.0
+pkgrel=1
+pkgdesc="Configure Kamera"
+url="http://kde.org/applications/graphics/kamera/"
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL')
+groups=('kde' 'kdegraphics')
+depends=('kdebase-runtime' 'gphoto2')
+makedepends=('cmake' 'automoc4')
+source=("http://download.kde.org/stable/${pkgver}/src/kamera-${pkgver}.tar.bz2")
+sha1sums=('4b8b0bd1bddba96fbc0c856d985ccb7419aa0d75')
+
+build() {
+  cd "${srcdir}"
+  mkdir build
+  cd build
+  cmake ../kamera-${pkgver} \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr
+  make
+}
+
+package() {
+  cd "${srcdir}"/build
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/extra/kdegraphics-kcolorchooser/PKGBUILD b/extra/kdegraphics-kcolorchooser/PKGBUILD
new file mode 100644
index 000000000..6e6ca0ffd
--- /dev/null
+++ b/extra/kdegraphics-kcolorchooser/PKGBUILD
@@ -0,0 +1,31 @@
+# $Id: PKGBUILD 132618 2011-07-25 00:14:59Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+
+pkgname=kdegraphics-kcolorchooser
+pkgver=4.7.0
+pkgrel=1
+pkgdesc="Color Chooser"
+url="http://kde.org/applications/graphics/kcolorchooser/"
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL')
+groups=('kde' 'kdegraphics')
+depends=('kdebase-runtime')
+makedepends=('cmake' 'automoc4')
+install=${pkgname}.install
+source=("http://download.kde.org/stable/${pkgver}/src/kcolorchooser-${pkgver}.tar.bz2")
+sha1sums=('d4be9b00eecb8c7a9aad45ed5861ad0ea0bc764f')
+
+build() {
+  cd "${srcdir}"
+  mkdir build
+  cd build
+  cmake ../kcolorchooser-${pkgver} \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr
+  make
+}
+
+package() {
+  cd "${srcdir}"/build
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/extra/kdegraphics-kcolorchooser/kdegraphics-kcolorchooser.install b/extra/kdegraphics-kcolorchooser/kdegraphics-kcolorchooser.install
new file mode 100644
index 000000000..e70c054ec
--- /dev/null
+++ b/extra/kdegraphics-kcolorchooser/kdegraphics-kcolorchooser.install
@@ -0,0 +1,11 @@
+post_install() {
+	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+}
+
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+	post_install
+}
diff --git a/extra/kdegraphics-kgamma/PKGBUILD b/extra/kdegraphics-kgamma/PKGBUILD
new file mode 100644
index 000000000..ef84635f1
--- /dev/null
+++ b/extra/kdegraphics-kgamma/PKGBUILD
@@ -0,0 +1,33 @@
+# $Id: PKGBUILD 132619 2011-07-25 00:15:02Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+
+pkgname=kdegraphics-kgamma
+pkgver=4.7.0
+pkgrel=1
+pkgdesc="A monitor calibration tool"
+url="http://kde.org/applications/graphics/kgamma/"
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL')
+groups=('kde' 'kdegraphics')
+# note on libxxf86vm:
+#       not detected by namcap because libgl depends on it
+#       but nvidia providing libgl does not depend on libxxf86vm
+depends=('kdebase-runtime' 'libxxf86vm')
+makedepends=('cmake' 'automoc4')
+source=("http://download.kde.org/stable/${pkgver}/src/kgamma-${pkgver}.tar.bz2")
+sha1sums=('4534ea82e0d1f48414f1380e22d7aa8e7e50db98')
+
+build() {
+  cd "${srcdir}"
+  mkdir build
+  cd build
+  cmake ../kgamma-${pkgver} \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr
+  make
+}
+
+package() {
+  cd "${srcdir}"/build
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/extra/kdegraphics-kolourpaint/PKGBUILD b/extra/kdegraphics-kolourpaint/PKGBUILD
new file mode 100644
index 000000000..931272982
--- /dev/null
+++ b/extra/kdegraphics-kolourpaint/PKGBUILD
@@ -0,0 +1,31 @@
+# $Id: PKGBUILD 132620 2011-07-25 00:15:05Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+
+pkgname=kdegraphics-kolourpaint
+pkgver=4.7.0
+pkgrel=1
+pkgdesc="Paint Program"
+url="http://kde.org/applications/graphics/kolourpaint/"
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL')
+groups=('kde' 'kdegraphics')
+depends=('kdebase-runtime' 'qimageblitz')
+makedepends=('cmake' 'automoc4')
+install=${pkgname}.install
+source=("http://download.kde.org/stable/${pkgver}/src/kolourpaint-${pkgver}.tar.bz2")
+sha1sums=('e6095508eac71201b19a63d416ff771b7bc5b9ab')
+
+build() {
+  cd "${srcdir}"
+  mkdir build
+  cd build
+  cmake ../kolourpaint-${pkgver} \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr
+  make
+}
+
+package() {
+  cd "${srcdir}"/build
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/extra/kdegraphics-kolourpaint/kdegraphics-kolourpaint.install b/extra/kdegraphics-kolourpaint/kdegraphics-kolourpaint.install
new file mode 100644
index 000000000..81ce5c4b0
--- /dev/null
+++ b/extra/kdegraphics-kolourpaint/kdegraphics-kolourpaint.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/kdegraphics-kruler/PKGBUILD b/extra/kdegraphics-kruler/PKGBUILD
new file mode 100644
index 000000000..a60d544bd
--- /dev/null
+++ b/extra/kdegraphics-kruler/PKGBUILD
@@ -0,0 +1,31 @@
+# $Id: PKGBUILD 132621 2011-07-25 00:15:07Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+
+pkgname=kdegraphics-kruler
+pkgver=4.7.0
+pkgrel=1
+pkgdesc="Screen Ruler"
+url="http://kde.org/applications/graphics/kruler/"
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL')
+groups=('kde' 'kdegraphics')
+depends=('kdebase-runtime')
+makedepends=('cmake' 'automoc4')
+install=${pkgname}.install
+source=("http://download.kde.org/stable/${pkgver}/src/kruler-${pkgver}.tar.bz2")
+sha1sums=('d77be8bc37dc684253b0f18952ad463908d55561')
+
+build() {
+  cd "${srcdir}"
+  mkdir build
+  cd build
+  cmake ../kruler-${pkgver} \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr
+  make
+}
+
+package() {
+  cd "${srcdir}"/build
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/extra/kdegraphics-kruler/kdegraphics-kruler.install b/extra/kdegraphics-kruler/kdegraphics-kruler.install
new file mode 100644
index 000000000..81ce5c4b0
--- /dev/null
+++ b/extra/kdegraphics-kruler/kdegraphics-kruler.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/kdegraphics-ksaneplugin/PKGBUILD b/extra/kdegraphics-ksaneplugin/PKGBUILD
new file mode 100644
index 000000000..d663ed51a
--- /dev/null
+++ b/extra/kdegraphics-ksaneplugin/PKGBUILD
@@ -0,0 +1,31 @@
+# $Id: PKGBUILD 134039 2011-08-01 10:40:06Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+
+pkgname=kdegraphics-ksaneplugin
+pkgver=4.7.0
+pkgrel=2
+pkgdesc="A scan plugin that implements the scanning"
+url="http://kde.org/"
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL')
+depends=('libksane')
+makedepends=('cmake' 'automoc4')
+replaces=('kdegraphics-libs')
+conflicts=('kdegraphics-libs')
+source=("http://download.kde.org/stable/${pkgver}/src/ksaneplugin-${pkgver}.tar.bz2")
+sha1sums=('2d1b61bad04d24f699ea64b203a112df15d37946')
+
+build() {
+  cd "${srcdir}"
+  mkdir build
+  cd build
+  cmake ../ksaneplugin-${pkgver} \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr
+  make
+}
+
+package() {
+  cd "${srcdir}"/build
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/extra/kdegraphics-ksnapshot/PKGBUILD b/extra/kdegraphics-ksnapshot/PKGBUILD
new file mode 100644
index 000000000..9a57e639b
--- /dev/null
+++ b/extra/kdegraphics-ksnapshot/PKGBUILD
@@ -0,0 +1,32 @@
+# $Id: PKGBUILD 132623 2011-07-25 00:15:13Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+
+pkgname=kdegraphics-ksnapshot
+pkgver=4.7.0
+pkgrel=1
+pkgdesc="Screen Capture Program"
+url="http://kde.org/applications/graphics/ksnapshot/"
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL')
+groups=('kde' 'kdegraphics')
+depends=('kdelibs' 'libkipi')
+makedepends=('cmake' 'automoc4')
+optdepends=('kipi-plugins')
+install=${pkgname}.install
+source=("http://download.kde.org/stable/${pkgver}/src/ksnapshot-${pkgver}.tar.bz2")
+sha1sums=('771002ae1b047ffc850060f128f11514a3349f89')
+
+build() {
+  cd "${srcdir}"
+  mkdir build
+  cd build
+  cmake ../ksnapshot-${pkgver} \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr
+  make
+}
+
+package() {
+  cd "${srcdir}"/build
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/extra/kdegraphics-ksnapshot/kdegraphics-ksnapshot.install b/extra/kdegraphics-ksnapshot/kdegraphics-ksnapshot.install
new file mode 100644
index 000000000..81ce5c4b0
--- /dev/null
+++ b/extra/kdegraphics-ksnapshot/kdegraphics-ksnapshot.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/kdegraphics-mobipocket/PKGBUILD b/extra/kdegraphics-mobipocket/PKGBUILD
new file mode 100644
index 000000000..7cbd4151c
--- /dev/null
+++ b/extra/kdegraphics-mobipocket/PKGBUILD
@@ -0,0 +1,31 @@
+# $Id: PKGBUILD 134044 2011-08-01 10:41:01Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+
+pkgname=kdegraphics-mobipocket
+pkgver=4.7.0
+pkgrel=2
+pkgdesc="A collection of plugins to handle mobipocket files"
+url="http://kde.org/"
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL')
+depends=('kdelibs')
+makedepends=('cmake' 'automoc4')
+replaces=('kdegraphics-libs')
+conflicts=('kdegraphics-libs')
+source=("http://download.kde.org/stable/${pkgver}/src/mobipocket-${pkgver}.tar.bz2")
+sha1sums=('13e3c48a903411bc461f029564dd2e968dac719b')
+
+build() {
+  cd "${srcdir}"
+  mkdir build
+  cd build
+  cmake ../mobipocket-${pkgver} \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr
+  make
+}
+
+package() {
+  cd "${srcdir}"/build
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/extra/kdegraphics-okular/PKGBUILD b/extra/kdegraphics-okular/PKGBUILD
new file mode 100644
index 000000000..67f9edee1
--- /dev/null
+++ b/extra/kdegraphics-okular/PKGBUILD
@@ -0,0 +1,34 @@
+# $Id: PKGBUILD 132572 2011-07-25 00:12:14Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+
+pkgname=kdegraphics-okular
+pkgver=4.7.0
+pkgrel=1
+pkgdesc='Document Viewer'
+arch=('i686' 'x86_64')
+url="http://kde.org/applications/graphics/okular/"
+license=('GPL' 'LGPL' 'FDL')
+groups=('kde' 'kdegraphics')
+depends=('kdebase-runtime' 'qimageblitz' 'poppler-qt' 'chmlib' 'djvulibre'
+         'ebook-tools' 'libspectre')
+makedepends=('pkgconfig' 'cmake' 'automoc4')
+optdepends=('kdegraphics-mobipocket: mobipocket support')
+install=${pkgname}.install
+source=("http://download.kde.org/stable/${pkgver}/src/okular-${pkgver}.tar.bz2")
+sha1sums=('3fb935d79c2c24af9ea2874dbdb88f46d82154c2')
+
+build() {
+  cd "${srcdir}"
+  mkdir build
+  cd build
+  cmake ../okular-${pkgver} \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_SKIP_RPATH=ON \
+    -DCMAKE_INSTALL_PREFIX=/usr
+  make
+}
+
+package() {
+  cd "${srcdir}"/build
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/extra/kdegraphics-okular/kdegraphics-okular.install b/extra/kdegraphics-okular/kdegraphics-okular.install
new file mode 100644
index 000000000..81ce5c4b0
--- /dev/null
+++ b/extra/kdegraphics-okular/kdegraphics-okular.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/kdegraphics-strigi-analyzer/PKGBUILD b/extra/kdegraphics-strigi-analyzer/PKGBUILD
new file mode 100644
index 000000000..3f2508ade
--- /dev/null
+++ b/extra/kdegraphics-strigi-analyzer/PKGBUILD
@@ -0,0 +1,31 @@
+# $Id: PKGBUILD 134049 2011-08-01 10:42:13Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+
+pkgname=kdegraphics-strigi-analyzer
+pkgver=4.7.0
+pkgrel=2
+pkgdesc="Strigi analyzers for various graphics file formats"
+url="http://kde.org/"
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL')
+depends=('kdelibs')
+makedepends=('cmake' 'automoc4')
+replaces=('kdegraphics-libs')
+conflicts=('kdegraphics-libs')
+source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
+sha1sums=('2c2ff7e6b13ac1c073f112df9c794065d191e085')
+
+build() {
+  cd "${srcdir}"
+  mkdir build
+  cd build
+  cmake ../${pkgname}-${pkgver} \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr
+  make
+}
+
+package() {
+  cd "${srcdir}"/build
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/extra/kdegraphics-svgpart/PKGBUILD b/extra/kdegraphics-svgpart/PKGBUILD
new file mode 100644
index 000000000..d5923547d
--- /dev/null
+++ b/extra/kdegraphics-svgpart/PKGBUILD
@@ -0,0 +1,31 @@
+# $Id: PKGBUILD 134054 2011-08-01 10:43:27Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+
+pkgname=kdegraphics-svgpart
+pkgver=4.7.0
+pkgrel=2
+pkgdesc="A KPart for viewving SVGs"
+url="http://kde.org/"
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL')
+depends=('kdelibs')
+makedepends=('cmake' 'automoc4')
+replaces=('kdegraphics-libs')
+conflicts=('kdegraphics-libs')
+source=("http://download.kde.org/stable/${pkgver}/src/svgpart-${pkgver}.tar.bz2")
+sha1sums=('1b6f7eccf84c0cb6f92a37d8f65cd6720ed2e72b')
+
+build() {
+  cd "${srcdir}"
+  mkdir build
+  cd build
+  cmake ../svgpart-${pkgver} \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr
+  make
+}
+
+package() {
+  cd "${srcdir}"/build
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/extra/kdegraphics-thumbnailers/PKGBUILD b/extra/kdegraphics-thumbnailers/PKGBUILD
new file mode 100644
index 000000000..a4ea8f9d5
--- /dev/null
+++ b/extra/kdegraphics-thumbnailers/PKGBUILD
@@ -0,0 +1,31 @@
+# $Id: PKGBUILD 134059 2011-08-01 10:44:35Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+
+pkgname=kdegraphics-thumbnailers
+pkgver=4.7.0
+pkgrel=2
+pkgdesc="Thumbnailers for various graphics file formats"
+url="http://kde.org/"
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL')
+depends=('libkexiv2' 'libkdcraw')
+makedepends=('cmake' 'automoc4')
+replaces=('kdegraphics-libs')
+conflicts=('kdegraphics-libs')
+source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
+sha1sums=('6402d5a73d88ea4004aced3e68fc5e5c6454aaab')
+
+build() {
+  cd "${srcdir}"
+  mkdir build
+  cd build
+  cmake ../${pkgname}-${pkgver} \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr
+  make
+}
+
+package() {
+  cd "${srcdir}"/build
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/extra/kdelibs/PKGBUILD b/extra/kdelibs/PKGBUILD
index 8e4a0224a..3780ce2b4 100644
--- a/extra/kdelibs/PKGBUILD
+++ b/extra/kdelibs/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 131295 2011-07-12 17:46:50Z andrea $
+# $Id: PKGBUILD 132565 2011-07-25 00:11:50Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=kdelibs
-pkgver=4.6.5
-pkgrel=2
+pkgver=4.7.0
+pkgrel=1
 pkgdesc="KDE Core Libraries"
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
@@ -16,19 +16,13 @@ depends=('strigi' 'attica' 'libxss' 'xz' 'openssl' 'soprano' 'krb5'
         'docbook-xsl')
 makedepends=('pkgconfig' 'cmake' 'automoc4' 'intltool' 'avahi' 'libgl'
         'hspell')
-replaces=('arts' 'kdelibs-experimental')
+replaces=('kdelibs-experimental')
 install='kdelibs.install'
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2"
-        'kde-applications-menu.patch' 'archlinux-menu.patch'
-        'abs-syntax-highlight.patch'
-        'fix-lineedit-clear-button.patch'
-        'fix-lineedit-completion-tab.patch')
-sha1sums=('9bb948769a3a5d4d5b6c65e84a8cf570bd7bc120'
+        'kde-applications-menu.patch' 'archlinux-menu.patch')
+sha1sums=('2a7a59ac78a161c7c2393db89179449b495dd2db'
           '86ee8c8660f19de8141ac99cd6943964d97a1ed7'
-          '63a850ab4196b9d06934f2b4a13acd9f7739bc67'
-          'd994f262356af5b9e4e9619646e471bd98c91efb'
-          '3deae3fc6733624759ad8bf5a1560d9a2f792d73'
-          'a5f223b61499fa03043def0b3a45b1712cc72d70')
+          '63a850ab4196b9d06934f2b4a13acd9f7739bc67')
 
 build() {
        cd ${srcdir}/${pkgname}-${pkgver}
@@ -37,12 +31,6 @@ build() {
        patch -p1 -i $srcdir/kde-applications-menu.patch
        # add Archlinux menu entry
        patch -p1 -i $srcdir/archlinux-menu.patch
-       # add syntax highlightning for PKGBUILD and .install files
-       patch -p1 -i $srcdir/abs-syntax-highlight.patch
-
-       # Already fixed upstream
-       patch -p1 -i "${srcdir}"/fix-lineedit-clear-button.patch
-       patch -p1 -i "${srcdir}"/fix-lineedit-completion-tab.patch
 
        cd ${srcdir}
        mkdir build
@@ -55,8 +43,7 @@ build() {
                -DSYSCONF_INSTALL_DIR=/etc \
                -DHTML_INSTALL_DIR=/usr/share/doc/kde/html \
                -DKDE_DEFAULT_HOME='.kde4' \
-               -DWITH_FAM=OFF \
-               -DKAUTH_BACKEND=PolkitQt-1
+               -DWITH_FAM=OFF
        make
 }
 
diff --git a/extra/kdelibs/kdelibs.install b/extra/kdelibs/kdelibs.install
index ce5c32e1b..c77e68041 100644
--- a/extra/kdelibs/kdelibs.install
+++ b/extra/kdelibs/kdelibs.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/kdemultimedia/PKGBUILD b/extra/kdemultimedia/PKGBUILD
index 2d943f9b6..32a8745d3 100644
--- a/extra/kdemultimedia/PKGBUILD
+++ b/extra/kdemultimedia/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 131350 2011-07-12 19:23:57Z andrea $
+# $Id: PKGBUILD 132843 2011-07-26 13:58:32Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
@@ -10,25 +10,20 @@ pkgname=('kdemultimedia-dragonplayer'
          'kdemultimedia-kmix'
          'kdemultimedia-kscd'
          'kdemultimedia-mplayerthumbs')
-pkgver=4.6.5
-pkgrel=2
+pkgver=4.7.0
+pkgrel=1
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdemultimedia')
-makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdebase-runtime' 'tunepimp'
-        'ffmpeg' 'mplayer' 'pulseaudio' 'libmusicbrainz3')
+makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdelibs' 'tunepimp'
+            'ffmpeg' 'mplayer' 'pulseaudio' 'libmusicbrainz3')
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2"
-        'mplayerthumbs.config'
-        'fix-memleak-in-kmix.patch')
-sha1sums=('081bead5ee758d169f3119c138424929b001d04f'
-          'ba016fa2563c14ffcba852c62506b66bfc6ee683'
-          '80370de30898f1ba1a6db057d34324abdcc57384')
+        'mplayerthumbs.config')
+sha1sums=('3ad5f6e806a0e8ea9f7c88697d6f605a112a9d21'
+          'ba016fa2563c14ffcba852c62506b66bfc6ee683')
 
 build() {
-    cd "${srcdir}"/${pkgbase}-${pkgver}
-    patch -p1 -i "${srcdir}"/fix-memleak-in-kmix.patch
-
     cd ${srcdir}
 	mkdir build
 	cd build
diff --git a/extra/kdenetwork/PKGBUILD b/extra/kdenetwork/PKGBUILD
index 78a73889b..d4d475626 100644
--- a/extra/kdenetwork/PKGBUILD
+++ b/extra/kdenetwork/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 130263 2011-07-04 19:27:58Z andrea $
+# $Id: PKGBUILD 132629 2011-07-25 00:15:29Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
@@ -10,18 +10,18 @@ pkgname=('kdenetwork-filesharing'
          'kdenetwork-kppp'
          'kdenetwork-krdc'
          'kdenetwork-krfb')
-pkgver=4.6.5
+pkgver=4.7.0
 pkgrel=1
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
 license=('GPL' 'LGPL' 'FDL')
 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' 'mediastreamer')
+	'qca-ossl' 'kdebase-workspace' 'kdebase-lib' 'libvncserver' 'libmsn' 'ppp'
+    'v4l-utils' 'libidn' 'rdesktop' 'qimageblitz' 'libxdamage' 'libgadu'
+    'telepathy-qt4' 'libktorrent' 'libmms' 'mediastreamer')
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
-sha1sums=('cc398063da61f9f9ef0db4455dc0c989a4e68a25')
+sha1sums=('e9e9d9c648d7d0e38852bc3417faa605bd62c1d1')
 
 build() {
     cd "${srcdir}"
@@ -33,8 +33,7 @@ build() {
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DMOZPLUGIN_INSTALL_DIR=/usr/lib/mozilla/plugins/ \
         -DWITH_Xmms=OFF \
-		-DWITH_LibMeanwhile=OFF \
-        -DWITH_msiLBC=OFF
+		-DWITH_LibMeanwhile=OFF
 	make
 }
 
@@ -55,7 +54,7 @@ package_kdenetwork-kdnssd() {
 
 package_kdenetwork-kget() {
 	pkgdesc='Download Manager'
-	depends=('kdebase-workspace' 'kdebase-lib' 'libktorrent')
+	depends=('kdebase-workspace' 'kdebase-lib' 'libktorrent' 'libmms')
 	optdepends=('python2: YouTube plugin')
 	url="http://kde.org/applications/internet/kget/"
 	install='kdenetwork.install'
diff --git a/extra/kdepim-runtime/PKGBUILD b/extra/kdepim-runtime/PKGBUILD
index c53892f01..3c42a61a0 100644
--- a/extra/kdepim-runtime/PKGBUILD
+++ b/extra/kdepim-runtime/PKGBUILD
@@ -1,26 +1,21 @@
-# $Id: PKGBUILD 130494 2011-07-06 23:34:26Z andrea $
+# $Id: PKGBUILD 132642 2011-07-25 00:21:29Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=kdepim-runtime
-pkgver=4.6.1
+pkgver=4.7.0
 pkgrel=1
 pkgdesc='KDE PIM Runtime Environment'
 arch=('i686' 'x86_64')
-url='http://pim.kde.org'
+url='http://www.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"
-        'disable-l10n.patch')
-sha1sums=('e416ffd0142c720a779b4eb2e4a841ca751efdce'
-          'd4f8c39911cf288973a30d4b71087906ebb26359')
+source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
+sha1sums=('00286df86a64eecee64e6cf9199b69d87f62135e')
 
 build() {
-	cd "${srcdir}"/${pkgname}-${pkgver}
-    patch -p1 -i "${srcdir}"/disable-l10n.patch
-
     cd "${srcdir}"
 	mkdir build
 	cd build
diff --git a/extra/kdepim-runtime/kdepim-runtime.install b/extra/kdepim-runtime/kdepim-runtime.install
index c77e68041..ce5c32e1b 100644
--- a/extra/kdepim-runtime/kdepim-runtime.install
+++ b/extra/kdepim-runtime/kdepim-runtime.install
@@ -1,7 +1,6 @@
 post_install() {
 	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
 	update-mime-database usr/share/mime &> /dev/null
-    update-desktop-database -q
 }
 
 post_upgrade() {
@@ -10,4 +9,4 @@ post_upgrade() {
 
 post_remove() {
 	post_install
-}
+}
+\ No newline at end of file
diff --git a/extra/kdepim/PKGBUILD b/extra/kdepim/PKGBUILD
index 210df38c0..e485345f3 100644
--- a/extra/kdepim/PKGBUILD
+++ b/extra/kdepim/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 130497 2011-07-06 23:35:24Z andrea $
+# $Id: PKGBUILD 132630 2011-07-25 00:15:32Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
@@ -20,7 +20,7 @@ pkgname=('kdepim-akonadiconsole'
          'kdepim-ktimetracker'
          'kdepim-libkdepim'
          'kdepim-wizards')
-pkgver=4.6.1
+pkgver=4.7.0
 pkgrel=1
 arch=('i686' 'x86_64')
 url='http://pim.kde.org'
@@ -28,24 +28,19 @@ 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"
-        'disable-l10n.patch')
-sha1sums=('aa4dc75d33b3aa105e3f3b2f41e9d87b57cbf20a'
-          'f52c8d3918e3cd6d8e0180af243333ee2d87d382')
+source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
+sha1sums=('d8a131d886b923b397a50439028ea45880aa9404')
 
 build() {
-  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
+    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() {
@@ -133,7 +128,6 @@ package_kdepim-kleopatra() {
 	pkgdesc='Certificate Manager and Unified Crypto GUI'
 	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
@@ -144,7 +138,7 @@ package_kdepim-kmail() {
 	pkgdesc='Mail Client'
 	depends=('kdepim-libkdepim')
 	url="http://kde.org/applications/internet/kmail/"
-	install='kdepim-kmail.install'
+	install='kdepim.install'
 	conflicts=('kdepim-kmailcvt' 'kdepim-ksendemail' 'kdepim-libksieve'
 	           'kdepim-mimelib' 'kdepim-plugins')
 	replaces=('kdepim-kmailcvt' 'kdepim-ksendemail' 'kdepim-libksieve'
@@ -201,7 +195,7 @@ package_kdepim-korganizer() {
 	pkgdesc='Calendar and Scheduling Program'
 	depends=('kdepim-libkdepim')
 	url="http://kde.org/applications/office/korganizer"
-	install='kdepim-korganizer.install'
+	install='kdepim.install'
 	cd "${srcdir}"/build/korganizer
 	make DESTDIR="${pkgdir}" install
 	cd "${srcdir}"/build/doc/korganizer
diff --git a/extra/kdepimlibs/PKGBUILD b/extra/kdepimlibs/PKGBUILD
index 67d38d3b2..6871bde0c 100644
--- a/extra/kdepimlibs/PKGBUILD
+++ b/extra/kdepimlibs/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 130250 2011-07-04 19:26:55Z andrea $
+# $Id: PKGBUILD 133488 2011-07-28 15:16:21Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=kdepimlibs
-pkgver=4.6.5
-pkgrel=1
+pkgver=4.7.0
+pkgrel=2
 pkgdesc="KDE PIM Libraries"
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
 license=('GPL' 'LGPL')
-depends=('kdelibs' 'gpgme' 'akonadi' 'libical' )
+depends=('kdelibs' 'gpgme' 'akonadi' 'libical' 'prison')
 makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' 'cyrus-sasl' 'openldap')
 install='kdepimlibs.install'
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('6bf82a0934d5a16223f193e848bf3696a40e4820')
+sha1sums=('b5296ef96b94cab5aeb39dabde466e28670c20bd')
 
 build() {
 	cd ${srcdir}
diff --git a/extra/kdeplasma-addons/PKGBUILD b/extra/kdeplasma-addons/PKGBUILD
index a100ad0a1..4478597f4 100644
--- a/extra/kdeplasma-addons/PKGBUILD
+++ b/extra/kdeplasma-addons/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 131799 2011-07-15 11:47:07Z ronald $
+# $Id: PKGBUILD 132844 2011-07-26 13:58:57Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
@@ -72,25 +72,24 @@ pkgname=('kdeplasma-addons-applets-bball'
          'kdeplasma-addons-wallpapers-pattern'
          'kdeplasma-addons-wallpapers-virus'
          'kdeplasma-addons-wallpapers-weather')
-pkgver=4.6.5
-pkgrel=2
+pkgver=4.7.0
+pkgrel=1
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
 license=('GPL' 'LGPL')
 groups=('kde' 'kdeplasma-addons')
-makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdebase-workspace' 'kdegraphics-libs'
-	         'kdeedu-marble' 'eigen' 'scim' 'qwt' 'boost')
+makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdebase-workspace' 'kdeedu-marble'
+             'eigen' 'scim' 'qwt' 'boost' 'libkexiv2')
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2"
-	"kdeobservatory-qwt6.patch")
-sha1sums=('3bce5e41160ec318dbea9128c3e9104a4428deb8'
+        'kdeobservatory-qwt6.patch')
+sha1sums=('7a153131b84156ab33707c2ee21ffcf7021e099a'
           '140b2611fb23aed583c2691a77870e5c48152409')
 
 build() {
-    cd ${srcdir}
-
-    # qwt 6.0.0 patch
-    patch -Np0 -i ${srcdir}/kdeobservatory-qwt6.patch
-
+    cd "${srcdir}"/${pkgbase}-${pkgver}
+    patch -p1 -i "${srcdir}"/kdeobservatory-qwt6.patch
+    
+    cd "${srcdir}"
 	mkdir build
 	cd build
 	cmake ../${pkgbase}-${pkgver} \
@@ -199,7 +198,7 @@ package_kdeplasma-addons-applets-filewatcher() {
 
 package_kdeplasma-addons-applets-frame() {
 	pkgdesc='Display your favorite pictures'
-	depends=('kdebase-workspace' 'kdegraphics-libs')
+	depends=('kdebase-workspace' 'libkexiv2')
 	cd $srcdir/build/applets/frame
 	make DESTDIR=$pkgdir install
 }
diff --git a/extra/kdeplasma-applets-networkmanagement/PKGBUILD b/extra/kdeplasma-applets-networkmanagement/PKGBUILD
index 4953ba703..20b279e13 100644
--- a/extra/kdeplasma-applets-networkmanagement/PKGBUILD
+++ b/extra/kdeplasma-applets-networkmanagement/PKGBUILD
@@ -4,8 +4,8 @@
 
 pkgname=kdeplasma-applets-networkmanagement
 epoch=1
-pkgver=git20110713
-_commit=ac332a3e9f6e8ae7427e017b5826e51789437949
+pkgver=git20110726
+_commit=72f48aff1a672af24f66c26dd83b3ac6ee87df5f
 pkgrel=1
 pkgdesc="KDE control panel and widget network connections"
 arch=('i686' 'x86_64')
@@ -16,7 +16,7 @@ makedepends=('cmake' 'python2' 'automoc4' 'mobile-broadband-provider-info')
 optdepends=('mobile-broadband-provider-info: allow to add new mobile connection')
 install=${pkgname}.install
 source=("${pkgname}-${pkgver}.tar.gz"::"http://quickgit.kde.org/?p=networkmanagement.git&a=snapshot&h=${_commit}")
-md5sums=('e367743c72b072ae6d1b6988a3bc4406')
+md5sums=('1176f19901b6667c846a14fc0a04c07f')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdesdk-kate/PKGBUILD b/extra/kdesdk-kate/PKGBUILD
new file mode 100644
index 000000000..35a8a9b41
--- /dev/null
+++ b/extra/kdesdk-kate/PKGBUILD
@@ -0,0 +1,58 @@
+# $Id: PKGBUILD 132573 2011-07-25 00:12:17Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+
+pkgbase=kdesdk-kate
+pkgname=('kdebase-kwrite'
+         'kdesdk-kate')
+pkgver=4.7.0
+pkgrel=1
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL')
+makedepends=('kdelibs ''cmake' 'automoc4')
+source=("http://download.kde.org/stable/${pkgver}/src/kate-${pkgver}.tar.bz2"
+        'pkgbuild-syntax-highlight.patch')
+sha1sums=('8a9685f58c9a7cc2c317ffc4f2bd18b76639a2cd'
+          'ab0c5d2a796b0f283154799add161c99f48ffcd5')
+
+build() {
+  cd "${srcdir}"/kate-${pkgver}
+  patch -p1 -i "${srcdir}"/pkgbuild-syntax-highlight.patch
+
+  cd "${srcdir}"
+  mkdir build
+  cd build
+  cmake ../kate-${pkgver} \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DBUILD_KTEXTEDITOR=OFF
+  make
+}
+
+package_kdebase-kwrite() {
+  pkgdesc="Text Editor"
+  depends=('kdebase-runtime')
+  groups=('kde' 'kdebase')
+  install='kdebase-kwrite.install'
+
+  cd "${srcdir}"/build/kwrite
+  make DESTDIR="${pkgdir}" install
+
+  cd "${srcdir}"/build/part
+  make DESTDIR="${pkgdir}" install
+
+  cd "${srcdir}"/build/doc/kwrite
+  make DESTDIR="${pkgdir}" install
+}
+
+package_kdesdk-kate() {
+  pkgdesc="Advanced Text Editor"
+  depends=('kdebase-kwrite')
+  groups=('kde' 'kdesdk')
+  install='kdesdk-kate.install'
+
+  cd "${srcdir}"/build/kate
+  make DESTDIR="${pkgdir}" install
+
+  cd "${srcdir}"/build/doc/kate
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/extra/kdesdk-kate/kdebase-kwrite.install b/extra/kdesdk-kate/kdebase-kwrite.install
new file mode 100644
index 000000000..81ce5c4b0
--- /dev/null
+++ b/extra/kdesdk-kate/kdebase-kwrite.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/kdesdk-kate/kdesdk-kate.install b/extra/kdesdk-kate/kdesdk-kate.install
new file mode 100644
index 000000000..81ce5c4b0
--- /dev/null
+++ b/extra/kdesdk-kate/kdesdk-kate.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/kdesdk-kate/pkgbuild-syntax-highlight.patch b/extra/kdesdk-kate/pkgbuild-syntax-highlight.patch
new file mode 100644
index 000000000..3c43eca0f
--- /dev/null
+++ b/extra/kdesdk-kate/pkgbuild-syntax-highlight.patch
@@ -0,0 +1,11 @@
+--- kate-4.6.80/part/syntax/data/bash.xml~	2011-05-23 21:20:34.295137123 +0000
++++ kate-4.6.80/part/syntax/data/bash.xml	2011-05-23 21:20:54.581993368 +0000
+@@ -8,7 +8,7 @@
+         <!ENTITY noword   "(?![\w$+-])">                <!-- no word, $, + or - following -->
+         <!ENTITY pathpart "([\w_@.&#37;*?+-]|\\ )">     <!-- valid character in a file name -->
+ ]>
+-<language name="Bash" version="2.12" kateversion="2.4" section="Scripts" extensions="*.sh;*.bash;*.ebuild;*.eclass;.bashrc;.bash_profile;.bash_login;.profile" mimetype="application/x-shellscript" casesensitive="1" author="Wilbert Berendsen (wilbert@kde.nl)" license="LGPL">
++<language name="Bash" version="2.12" kateversion="2.4" section="Scripts" extensions="*.sh;*.bash;*.ebuild;*.eclass;.bashrc;.bash_profile;.bash_login;.profile;PKGBUILD" mimetype="application/x-shellscript" casesensitive="1" author="Wilbert Berendsen (wilbert@kde.nl)" license="LGPL">
+ 
+ <!-- (c) 2004 by Wilbert Berendsen (wilbert@kde.nl)
+     Changes by Matthew Woehlke (mw_triad@users.sourceforge.net)
diff --git a/extra/kdesdk/PKGBUILD b/extra/kdesdk/PKGBUILD
index 7c51f7b13..b67a61092 100644
--- a/extra/kdesdk/PKGBUILD
+++ b/extra/kdesdk/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 130265 2011-07-04 19:28:07Z andrea $
+# $Id: PKGBUILD 132632 2011-07-25 00:15:38Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
@@ -6,7 +6,6 @@ pkgbase=kdesdk
 pkgname=('kdesdk-cervisia'
          'kdesdk-dolphin-plugins'
          'kdesdk-kapptemplate'
-         'kdesdk-kate'
          'kdesdk-kcachegrind'
          'kdesdk-kdeaccounts-plugin'
          'kdesdk-kdepalettes'
@@ -15,25 +14,27 @@ pkgname=('kdesdk-cervisia'
          'kdesdk-kompare'
          'kdesdk-kpartloader'
          'kdesdk-kprofilemethod'
+#         'kdesdk-kspy'
          'kdesdk-kstartperf'
          'kdesdk-kuiviewer'
          'kdesdk-lokalize'
          'kdesdk-okteta'
          'kdesdk-poxml'
+#         'kdesdk-scheck'
          'kdesdk-scripts'
          'kdesdk-strigi-analyzer'
          'kdesdk-umbrello')
-pkgver=4.6.5
+pkgver=4.7.0
 pkgrel=1
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdesdk')
-makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' 'kdepim-runtime' 'subversion'
-        'antlr2' 'kdebase-konqueror')
+makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' 'subversion' 'antlr2'
+             'kdepimlibs' 'kdebase-lib')
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2"
         'fix-python2-path.patch')
-sha1sums=('8cffa0472fbe1096ebfea9bde49aaff76a145b34'
+sha1sums=('619e9e6255888c989997fa02a1b6b97220ae9f11'
           'd05ca0231869c484fd3861955d960a60aff7dcfb')
 
 build() {
@@ -87,17 +88,6 @@ package_kdesdk-kapptemplate() {
 	make DESTDIR=$pkgdir install
 }
 
-package_kdesdk-kate() {
-	pkgdesc='Advanced Text Editor'
-	depends=('kdebase-runtime' 'kdebase-lib')
-	url="http://kde.org/applications/utilities/kate/"
-	install='kdesdk-kate.install'
-	cd $srcdir/build/kate
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kate
-	make DESTDIR=$pkgdir install
-}
-
 package_kdesdk-kcachegrind() {
 	pkgdesc='Visualization of Performance Profiling Data'
 	depends=('kdebase-runtime' 'python2')
@@ -111,10 +101,10 @@ package_kdesdk-kcachegrind() {
 }
 
 package_kdesdk-kdeaccounts-plugin() {
-	pkgdesc='KDE Repository Accounts'
-	depends=('kdepim-runtime')
-	cd $srcdir/build/kdeaccounts-plugin
-	make DESTDIR=$pkgdir install
+        pkgdesc='KDE Repository Accounts'
+        depends=('kdepim-runtime')
+        cd $srcdir/build/kdeaccounts-plugin
+        make DESTDIR=$pkgdir install
 }
 
 package_kdesdk-kdepalettes() {
@@ -165,6 +155,13 @@ package_kdesdk-kprofilemethod() {
 	make DESTDIR=$pkgdir install
 }
 
+package_kdesdk-kspy() {
+	pkgdesc='An Object Inspector for Qt/KDE applications'
+	depends=('kdebase-runtime')
+	cd $srcdir/build/kspy
+	make DESTDIR=$pkgdir install
+}
+
 package_kdesdk-kstartperf() {
 	pkgdesc='Startup time measurement tool for KDE applications'
 	depends=('kdebase-runtime')
@@ -215,6 +212,13 @@ package_kdesdk-poxml() {
 	make DESTDIR=$pkgdir install
 }
 
+package_kdesdk-scheck() {
+	pkgdesc='An interface style to highlight accel and style guide conflicts'
+	depends=('kdebase-runtime')
+	cd $srcdir/build/scheck
+	make DESTDIR=$pkgdir install
+}
+
 package_kdesdk-scripts() {
 	pkgdesc='KDE SDK scripts'
 	depends=('python2')
diff --git a/extra/kdetoys/PKGBUILD b/extra/kdetoys/PKGBUILD
index fb1e8a81e..51e4e22cf 100644
--- a/extra/kdetoys/PKGBUILD
+++ b/extra/kdetoys/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 130266 2011-07-04 19:28:12Z andrea $
+# $Id: PKGBUILD 132633 2011-07-25 00:15:41Z 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.5
+pkgver=4.7.0
 pkgrel=1
 arch=('i686' 'x86_64')
 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=('0ce43a76f5b7005d60430692ae87421661281f1f')
+sha1sums=('2a4b3838293fedf9a814bf5ef8fbceba7460a8c5')
 
 build() {
 	cd $srcdir
diff --git a/extra/kdeutils/PKGBUILD b/extra/kdeutils/PKGBUILD
index 7c5382565..701ff0322 100644
--- a/extra/kdeutils/PKGBUILD
+++ b/extra/kdeutils/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 130960 2011-07-09 08:56:36Z andrea $
+# $Id: PKGBUILD 132634 2011-07-25 00:15:44Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
@@ -16,8 +16,8 @@ pkgname=('kdeutils-ark'
          'kdeutils-printer-applet'
          'kdeutils-superkaramba'
          'kdeutils-sweeper')
-pkgver=4.6.5
-pkgrel=2
+pkgver=4.7.0
+pkgrel=1
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
 license=('GPL' 'LGPL' 'FDL')
@@ -25,16 +25,11 @@ groups=('kde' 'kdeutils')
 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"
-        'fix-kcalc-keys.patch')
-sha1sums=('1c2ae023d9a6bcf72d3cebd0d7df2e6a175ffdcb'
-          'db87ec4d674a0979fc607f5b438e3e1c403b6eac')
+source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
+sha1sums=('829eb0935ffd26fa4bb33b6e66841e3599f92c94')
 
 build() {
-    cd "${srcdir}"/${pkgbase}-${pkgver}
-    patch -p3 -i "${srcdir}"/fix-kcalc-keys.patch
-
-    cd "${srcdir}"
+	cd ${srcdir}
 	mkdir build
 	cd build
 	cmake ../${pkgbase}-${pkgver} \
diff --git a/extra/kdewebdev/PKGBUILD b/extra/kdewebdev/PKGBUILD
index 495378d50..e29aec31f 100644
--- a/extra/kdewebdev/PKGBUILD
+++ b/extra/kdewebdev/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 130268 2011-07-04 19:28:19Z andrea $
+# $Id: PKGBUILD 132635 2011-07-25 00:15:47Z 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.5
+pkgver=4.7.0
 pkgrel=1
 arch=('i686' 'x86_64')
 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=('b7ec635c438f865337f5ef1e7bbaca23643ed871')
+sha1sums=('bc11c574260f596d20317827f468778df9352037')
 
 build() {
 	cd $srcdir
diff --git a/extra/koffice/PKGBUILD b/extra/koffice/PKGBUILD
index 1884dd92c..8f56a93ed 100644
--- a/extra/koffice/PKGBUILD
+++ b/extra/koffice/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 125678 2011-05-28 00:58:39Z andrea $
+# $Id: PKGBUILD 133446 2011-07-28 00:46:22Z andrea $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: BlackEagle < ike DOT devolder AT gmail DOT com >
@@ -37,13 +37,13 @@ pkgname=(
 #	'koffice-kdgantt' # still an empty package
 )
 pkgver=2.3.3
-pkgrel=4
+pkgrel=5
 arch=('i686' 'x86_64')
 url='http://koffice.kde.org'
 license=('GPL' 'LGPL' 'FDL')
 makedepends=('pkg-config' 'cmake' 'automoc4' 'boost' 'eigen' 'gsl' 'lcms'
              'glew' 'qimageblitz' 'kdepimlibs' 'pstoedit' 'poppler-qt' 'libwpd'
-             'libwpg' 'opengtl' 'kdegraphics-libs')
+             'libwpg' 'opengtl' 'libkdcraw')
 groups=('koffice')
 source=("http://download.kde.org/stable/${pkgbase}-${pkgver}/${pkgbase}-${pkgver}.tar.bz2"
         'kde4-koffice-libwpg02.patch' 'gcc46.patch')
@@ -71,9 +71,9 @@ build() {
 
 package_koffice-filters(){
 	pkgdesc="Filters for the KDE office suite"
-        optdepends=('libgsf: Microsoft Word document importer' 'libwpd: WordPerfect document importer'
-	'libwpg: Corel WordPerfect Graphics image importer' 'pstoedit: Karbon EPS import filter'
-	'kdegraphics-libs: support for raw images')
+    optdepends=('libgsf: Microsoft Word document importer' 'libwpd: WordPerfect document importer'
+        'libwpg: Corel WordPerfect Graphics image importer' 'pstoedit: Karbon EPS import filter'
+        'libkdcraw: support for raw images')
 	install=filters.install
         cd "${srcdir}/build/filters"
         make DESTDIR="${pkgdir}" install
diff --git a/extra/libass/PKGBUILD b/extra/libass/PKGBUILD
index 44277f446..5bd45f4e8 100644
--- a/extra/libass/PKGBUILD
+++ b/extra/libass/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 126098 2011-06-01 12:39:10Z giovanni $
+# $Id: PKGBUILD 134004 2011-07-31 16:07:36Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: G_Syme <demichan(at)mail(dot)upb(dot)de>
 
 pkgname=libass
-pkgver=0.9.12
+pkgver=0.9.13
 pkgrel=1
 pkgdesc="A portable library for SSA/ASS subtitles rendering"
 arch=('i686' 'x86_64')
 url="http://code.google.com/p/libass/"
-license=('GPL')
+license=('BSD')
 depends=('enca' 'fontconfig' 'libpng')
 makedepends=('pkgconfig')
 options=(!libtool)
 source=("http://libass.googlecode.com/files/${pkgname}-${pkgver}.tar.xz")
-md5sums=('fcef4b048ca2655a14073d692551cd1f')
+md5sums=('d99381922dcbeb7a766d2e7825cca193')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -26,4 +26,5 @@ package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
   make DESTDIR="${pkgdir}" install
+  install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
diff --git a/extra/libkdcraw/PKGBUILD b/extra/libkdcraw/PKGBUILD
new file mode 100644
index 000000000..d7fc94479
--- /dev/null
+++ b/extra/libkdcraw/PKGBUILD
@@ -0,0 +1,32 @@
+# $Id: PKGBUILD 134064 2011-08-01 10:46:13Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+
+pkgname=libkdcraw
+pkgver=4.7.0
+pkgrel=2
+pkgdesc="A C++ interface used to decode RAW picture"
+url="http://kde.org/"
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL')
+depends=('kdelibs' 'lcms')
+makedepends=('cmake' 'automoc4')
+replaces=('kdegraphics-libs')
+conflicts=('kdegraphics-libs')
+install=${pkgname}.install
+source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
+sha1sums=('7c8d7ed8eb18c3f2951d451a2cf46dde9a336216')
+
+build() {
+  cd "${srcdir}"
+  mkdir build
+  cd build
+  cmake ../${pkgname}-${pkgver} \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr
+  make
+}
+
+package() {
+  cd "${srcdir}"/build
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/extra/libkdcraw/libkdcraw.install b/extra/libkdcraw/libkdcraw.install
new file mode 100644
index 000000000..e70c054ec
--- /dev/null
+++ b/extra/libkdcraw/libkdcraw.install
@@ -0,0 +1,11 @@
+post_install() {
+	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+}
+
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+	post_install
+}
diff --git a/extra/libkdeedu/PKGBUILD b/extra/libkdeedu/PKGBUILD
new file mode 100644
index 000000000..e8ae228c0
--- /dev/null
+++ b/extra/libkdeedu/PKGBUILD
@@ -0,0 +1,31 @@
+# $Id: PKGBUILD 132582 2011-07-25 00:12:47Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+
+pkgname=libkdeedu
+pkgver=4.7.0
+pkgrel=1
+pkgdesc="Libraries used by KDE Education applications"
+url="http://kde.org/"
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL')
+depends=('kdelibs')
+makedepends=('cmake' 'automoc4')
+install=${pkgname}.install
+replaces=('kdeedu-libkdeedu' 'kdeedu-data')
+source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
+sha1sums=('fbe1f3a7416d58bd4b0653280181da192e330214')
+
+build() {
+  cd "${srcdir}"
+  mkdir build
+  cd build
+  cmake ../${pkgname}-${pkgver} \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr
+  make
+}
+
+package() {
+  cd "${srcdir}"/build
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/extra/libkdeedu/libkdeedu.install b/extra/libkdeedu/libkdeedu.install
new file mode 100644
index 000000000..e70c054ec
--- /dev/null
+++ b/extra/libkdeedu/libkdeedu.install
@@ -0,0 +1,11 @@
+post_install() {
+	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+}
+
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+	post_install
+}
diff --git a/extra/libkexiv2/PKGBUILD b/extra/libkexiv2/PKGBUILD
new file mode 100644
index 000000000..0307a60c7
--- /dev/null
+++ b/extra/libkexiv2/PKGBUILD
@@ -0,0 +1,31 @@
+# $Id: PKGBUILD 134069 2011-08-01 10:49:28Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+
+pkgname=libkexiv2
+pkgver=4.7.0
+pkgrel=2
+pkgdesc="A library to manipulate pictures metadata"
+url="http://kde.org/"
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL')
+depends=('kdelibs')
+makedepends=('cmake' 'automoc4')
+replaces=('kdegraphics-libs')
+conflicts=('kdegraphics-libs')
+source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
+sha1sums=('ee5f524d02c7b1fb29767177890f556fa155c5fc')
+
+build() {
+  cd "${srcdir}"
+  mkdir build
+  cd build
+  cmake ../${pkgname}-${pkgver} \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr
+  make
+}
+
+package() {
+  cd "${srcdir}"/build
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/extra/libkipi/PKGBUILD b/extra/libkipi/PKGBUILD
new file mode 100644
index 000000000..29bd12de6
--- /dev/null
+++ b/extra/libkipi/PKGBUILD
@@ -0,0 +1,32 @@
+# $Id: PKGBUILD 134074 2011-08-01 10:50:28Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+
+pkgname=libkipi
+pkgver=4.7.0
+pkgrel=2
+pkgdesc="An interface to use kipi-plugins from a KDE application"
+url="http://kde.org/"
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL')
+depends=('kdelibs')
+makedepends=('cmake' 'automoc4')
+replaces=('kdegraphics-libs')
+conflicts=('kdegraphics-libs')
+install=${pkgname}.install
+source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
+sha1sums=('252a55484ee282ada6dd88e8ec4991b2ccdc74f3')
+
+build() {
+  cd "${srcdir}"
+  mkdir build
+  cd build
+  cmake ../${pkgname}-${pkgver} \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr
+  make
+}
+
+package() {
+  cd "${srcdir}"/build
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/extra/libkipi/libkipi.install b/extra/libkipi/libkipi.install
new file mode 100644
index 000000000..e70c054ec
--- /dev/null
+++ b/extra/libkipi/libkipi.install
@@ -0,0 +1,11 @@
+post_install() {
+	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+}
+
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+	post_install
+}
diff --git a/extra/libksane/PKGBUILD b/extra/libksane/PKGBUILD
new file mode 100644
index 000000000..ea1d6f695
--- /dev/null
+++ b/extra/libksane/PKGBUILD
@@ -0,0 +1,32 @@
+# $Id: PKGBUILD 134075 2011-08-01 10:50:59Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+
+pkgname=libksane
+pkgver=4.7.0
+pkgrel=2
+pkgdesc="An image scanning library"
+url="http://kde.org/"
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL')
+depends=('kdelibs' 'sane')
+makedepends=('cmake' 'automoc4')
+replaces=('kdegraphics-libs')
+conflicts=('kdegraphics-libs')
+install=${pkgname}.install
+source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
+sha1sums=('73a3f2c4619ccd8da7c362fc3832c1d52795933f')
+
+build() {
+  cd "${srcdir}"
+  mkdir build
+  cd build
+  cmake ../${pkgname}-${pkgver} \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr
+  make
+}
+
+package() {
+  cd "${srcdir}"/build
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/extra/libksane/libksane.install b/extra/libksane/libksane.install
new file mode 100644
index 000000000..e70c054ec
--- /dev/null
+++ b/extra/libksane/libksane.install
@@ -0,0 +1,11 @@
+post_install() {
+	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+}
+
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+	post_install
+}
diff --git a/extra/liblrdf/PKGBUILD b/extra/liblrdf/PKGBUILD
index f4e0141da..17236fa71 100644
--- a/extra/liblrdf/PKGBUILD
+++ b/extra/liblrdf/PKGBUILD
@@ -1,25 +1,29 @@
-# $Id: PKGBUILD 110602 2011-02-20 15:55:20Z andyrtr $
+# $Id: PKGBUILD 130976 2011-07-09 09:47:10Z andyrtr $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 
 pkgname=liblrdf
 pkgver=0.4.0
-pkgrel=7
+pkgrel=8
 pkgdesc="A library for the manipulation of RDF file in LADSPA plugins"
 arch=('i686' 'x86_64')
-url="http://sourceforge.net/projects/lrdf"
-depends=('raptor1' 'ladspa')
+url="http://sourceforge.net/projects/lrdf" #"http://sourceforge.net/projects/lrdf"
+depends=('raptor' 'ladspa')
 makedepends=('pkgconfig')
 license=('GPL')
 options=('!libtool')
 source=(http://downloads.sourceforge.net/sourceforge/lrdf/${pkgname}-${pkgver}.tar.gz
-	md5.patch)
+	md5.patch
+	raptor2.diff)
 groups=('ladspa-plugins')
 md5sums=('327a5674f671c4b360c6353800226877'
-         'a6d231d052dc188cbc4c1039cf3a2003')
+         'a6d231d052dc188cbc4c1039cf3a2003'
+         '80e938469da06a178e03107ca5b41e55')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i "${srcdir}/md5.patch"
+  patch -Np1 -i ${srcdir}/md5.patch
+  patch -Np0 -i ${srcdir}/raptor2.diff
+  autoreconf -vfi
   ./configure --prefix=/usr
   make
 }
diff --git a/extra/liblrdf/raptor2.diff b/extra/liblrdf/raptor2.diff
new file mode 100644
index 000000000..77f1ad0e3
--- /dev/null
+++ b/extra/liblrdf/raptor2.diff
@@ -0,0 +1,193 @@
+--- src/Makefile.am
++++ src/Makefile.am
+@@ -4,5 +4,5 @@ lib_LTLIBRARIES = liblrdf.la
+ noinst_HEADERS = lrdf_md5.h md5_loc.h ladspa.h
+ 
+ liblrdf_la_SOURCES = lrdf.c lrdf_multi.c md5.c
+-liblrdf_la_LIBADD = -lraptor
++liblrdf_la_LIBADD = -lraptor2
+ liblrdf_la_LDFLAGS = -version-info @LRDF_LIBTOOL_VERSION@
+--- src/lrdf.c
++++ src/lrdf.c
+@@ -18,6 +18,7 @@
+ static unsigned int lrdf_uid = 0;	/* A unique(ish) id to append to genid's to
+ 					 * avoid clashses */
+ 
++static raptor_world *world = NULL;
+ static lrdf_statement *triples = NULL;
+ static lrdf_statement *free_triples;
+ static lrdf_string_hash *resources_hash[LRDF_HASH_SIZE];
+@@ -43,8 +44,7 @@ static void lrdf_remove_triple_hash(lrdf_triple_hash ** tbl,
+ 				    lrdf_hash hash, lrdf_statement * s);
+ static void lrdf_add_closure_hash(lrdf_closure_hash ** tbl,
+ 				  lrdf_hash subject, lrdf_hash object);
+-static void lrdf_store(void *user_data,
+-		       const raptor_statement * statement);
++static void lrdf_store(void *user_data, raptor_statement * statement);
+ void lrdf_free_statements(lrdf_statement * s);
+ void lrdf_copy_statement(lrdf_statement * from, lrdf_statement * to);
+ void lrdf_rebuild_taxonomic_closure(lrdf_closure_hash ** fwd_tbl,
+@@ -71,7 +71,7 @@ void lrdf_init()
+     unsigned int i;
+     struct timeval tv;
+ 
+-    raptor_init();
++    world = raptor_new_world();
+     lrdf_more_triples(256);
+ 
+     /* A UID to add to genids to make them safer */
+@@ -112,7 +112,8 @@ void lrdf_more_triples(int count)
+ 
+ void lrdf_cleanup()
+ {
+-    raptor_finish();
++    raptor_free_world(world);
++    world = NULL;
+ 
+     lrdf_free_string_hash(resources_hash);
+     lrdf_free_string_hash(literals_hash);
+@@ -232,26 +233,29 @@ void lrdf_remove_matches(lrdf_statement *pattern)
+     }
+ }
+ 
+-static void lrdf_store(void *user_data, const raptor_statement * statement)
++static const char *lrdf_term_as_string(char *tmp, int tmp_len,
++				       const raptor_term *term)
++{
++    switch (term->type) {
++    case RAPTOR_TERM_TYPE_URI:
++	return (const char *) raptor_uri_as_string(term->value.uri);
++    case RAPTOR_TERM_TYPE_LITERAL:
++	return (const char *) term->value.literal.string;
++    case RAPTOR_TERM_TYPE_BLANK:
++	snprintf(tmp, tmp_len, "_:%s.%x", term->value.blank.string, lrdf_uid);
++	return tmp;
++    default:
++	return "(?)";
++    }
++}
++
++static void lrdf_store(void *user_data, raptor_statement * statement)
+ {
+     lrdf_statement *s = lrdf_alloc_statement();
+     char tmps[128], tmpp[128], tmpo[128];
+-    char *subj = (char *) statement->subject,
+-	 *pred = (char *) statement->predicate,
+-	 *obj = (char *) statement->object;
+-
+-    if (statement->subject_type == RAPTOR_IDENTIFIER_TYPE_ANONYMOUS) {
+-	snprintf(tmps, 127, "_:%s.%x", subj, lrdf_uid);
+-	subj = tmps;
+-    }
+-    if (statement->predicate_type == RAPTOR_IDENTIFIER_TYPE_ANONYMOUS) {
+-	snprintf(tmpp, 127, "_:%s.%x", pred, lrdf_uid);
+-	pred = tmpp;
+-    }
+-    if (statement->object_type == RAPTOR_IDENTIFIER_TYPE_ANONYMOUS) {
+-	snprintf(tmpo, 127, "_:%s.%x", obj, lrdf_uid);
+-	obj = tmpo;
+-    }
++    const char *subj = lrdf_term_as_string(tmps, 128, statement->subject),
++	       *pred = lrdf_term_as_string(tmpp, 128, statement->predicate),
++	       *obj = lrdf_term_as_string(tmpo, 128, statement->object);
+ 
+     s->shash = lrdf_gen_hash(subj);
+     s->phash = lrdf_gen_hash(pred);
+@@ -261,7 +265,7 @@ static void lrdf_store(void *user_data, const raptor_statement * statement)
+ 
+     s->subject = lrdf_check_hash(resources_hash, s->shash, subj);
+     s->predicate = lrdf_check_hash(resources_hash, s->phash, pred);
+-    if (statement->object_type == RAPTOR_IDENTIFIER_TYPE_LITERAL) {
++    if (statement->object->type == RAPTOR_TERM_TYPE_LITERAL) {
+ 	s->object = lrdf_check_hash(literals_hash, s->ohash, obj);
+ 	s->object_type = lrdf_literal;
+     } else {
+@@ -537,28 +541,22 @@ void lrdf_rebuild_taxonomic_closure(lrdf_closure_hash ** fwd_tbl,
+     free(pathto);
+ }
+ 
+-static void lrdf_error_handler(void *data, raptor_locator * locator,
+-			       const char *message);
++static void lrdf_log_handler(void *data, raptor_log_message *message);
+ 
+-static void lrdf_error_handler(void *data, raptor_locator * locator,
+-			       const char *message)
++static void lrdf_log_handler(void *data, raptor_log_message *message)
+ {
+-    fprintf(stderr, "liblrdf: error - ");
+-    raptor_print_locator(stderr, locator);
+-    fprintf(stderr, " - %s\n", message);
+-
+-    raptor_parse_abort((raptor_parser*)data);
+-}
++    const char *severity = "error";
++    if (message->level == RAPTOR_LOG_LEVEL_WARN) {
++	severity = "warning";
++    }
+ 
+-static void lrdf_warning_handler(void *data, raptor_locator * locator,
+-				 const char *message);
++    fprintf(stderr, "liblrdf: %s - ", severity);
++    raptor_locator_print(message->locator, stderr);
++    fprintf(stderr, " - %s\n", message->text);
+ 
+-static void lrdf_warning_handler(void *data, raptor_locator * locator,
+-				 const char *message)
+-{
+-    fprintf(stderr, "liblrdf: warning - ");
+-    raptor_print_locator(stderr, locator);
+-    fprintf(stderr, " - %s\n", message);
++    if (message->level != RAPTOR_LOG_LEVEL_WARN) {
++	raptor_parser_parse_abort((raptor_parser*)data);
++    }
+ }
+ 
+ 
+@@ -593,15 +591,15 @@ int lrdf_read_file_intl(const char *uri)
+     lrdf_hash source;
+ 
+     //printf("lrdf: reading %s\n", uri);
+-    ruri = raptor_new_uri(uri);
+-    furi = raptor_new_uri(uri);
++    ruri = raptor_new_uri(world, (const unsigned char *) uri);
++    furi = raptor_new_uri(world, (const unsigned char *) uri);
+     source = lrdf_gen_hash(uri);
+     lrdf_check_hash(resources_hash, source, uri);
+ 
+     if (strstr(uri, ".rdf")) {
+-	parser = raptor_new_parser("rdfxml");
++	parser = raptor_new_parser(world, "rdfxml");
+     } else {
+-	parser = raptor_new_parser("ntriples");
++	parser = raptor_new_parser(world, "ntriples");
+     }
+     if (!parser) {
+ 	fprintf(stderr, "liblrdf: failed to create parser\n");
+@@ -609,12 +607,11 @@ int lrdf_read_file_intl(const char *uri)
+ 	return 1;
+     }
+ 
+-    raptor_set_error_handler(parser, parser, lrdf_error_handler);
+-    raptor_set_warning_handler(parser, NULL, lrdf_warning_handler);
+-    raptor_set_statement_handler(parser, &source, lrdf_store);
+-    raptor_set_default_generate_id_parameters(parser, NULL, ++lrdf_uid);
++    raptor_world_set_log_handler(world, parser, lrdf_log_handler);
++    raptor_parser_set_statement_handler(parser, &source, lrdf_store);
++    raptor_world_set_generate_bnodeid_parameters(world, NULL, ++lrdf_uid);
+ 
+-    if (raptor_parse_file(parser, furi, ruri)) {
++    if (raptor_parser_parse_file(parser, furi, ruri)) {
+ 	raptor_free_uri(furi);
+ 	raptor_free_uri(ruri);
+ 	raptor_free_parser(parser);
+--- configure.ac
++++ configure.ac
+@@ -18,7 +18,7 @@
+ AC_HEADER_STDC
+ AC_CHECK_HEADERS([errno.h limits.h stdlib.h string.h unistd.h])
+ 
+-PKG_CHECK_MODULES(RAPTOR, raptor >= 0.9.11)
++PKG_CHECK_MODULES(RAPTOR, raptor2 >= 0.9.11)
+ 
+ # Checks for typedefs, structures, and compiler characteristics.
+ AC_C_CONST
diff --git a/extra/liborigin2/PKGBUILD b/extra/liborigin2/PKGBUILD
index 9d29118a9..61dd30f38 100644
--- a/extra/liborigin2/PKGBUILD
+++ b/extra/liborigin2/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 124976 2011-05-25 14:38:34Z ibiru $
+# $Id: PKGBUILD 132812 2011-07-26 11:18:58Z ibiru $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: damir <damir@archlinux.org>
 
 pkgbase=liborigin2
 pkgname=('liborigin2' 'liborigin2-docs')
 pkgver=20100913
-pkgrel=4
+pkgrel=5
 arch=('i686' 'x86_64')
 url="http://soft.proindependent.com/liborigin2/"
 license=('GPL3')
diff --git a/extra/libpst/PKGBUILD b/extra/libpst/PKGBUILD
index 614c58ea4..9241e1ad8 100644
--- a/extra/libpst/PKGBUILD
+++ b/extra/libpst/PKGBUILD
@@ -1,17 +1,16 @@
-# $Id: PKGBUILD 124979 2011-05-25 14:53:00Z ibiru $
+# $Id: PKGBUILD 132809 2011-07-26 11:04:44Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=libpst
 pkgname=('libpst' 'libpst-docs')
-pkgver=0.6.49
-pkgrel=3
+pkgver=0.6.53
+pkgrel=1
 arch=('i686' 'x86_64')
 url="http://www.five-ten-sg.com/libpst/"
 license=('GPL')
 makedepends=('python2' 'boost')
 source=(http://www.five-ten-sg.com/libpst/packages/${pkgbase}-${pkgver}.tar.gz)
-md5sums=('a0a0f927e82ab14bb042bd8bbd97c312')
-sha1sums=('c10f4af9dc1d22b331420bc3931036a3d41115cb')
+sha1sums=('b8e5972429091fd0e915fd3eb695b68adbe1f7cc')
 
 build() {
   cd "${srcdir}/${pkgbase}-${pkgver}"
diff --git a/extra/libsigc++/PKGBUILD b/extra/libsigc++/PKGBUILD
index 4700619bd..444460e89 100644
--- a/extra/libsigc++/PKGBUILD
+++ b/extra/libsigc++/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 113455 2011-03-08 17:41:58Z ibiru $
+# $Id: PKGBUILD 132743 2011-07-25 18:52:55Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgbase=libsigc++
 pkgname=('libsigc++' 'libsigc++-docs')
-pkgver=2.2.9
+pkgver=2.2.10
 pkgrel=1
 arch=(i686 x86_64)
 license=('LGPL')
 url="http://libsigc.sourceforge.net/"
 source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgbase}/2.2/${pkgbase}-${pkgver}.tar.bz2)
 options=(!libtool !emptydirs)
-sha256sums=('2f4c083e01d9be377669206bd97090d2e95bc05f2e8d95447c9f9ce92bdfbb63')
+sha256sums=('d3d810c2ad469edfb2d4db29643bef189b7613019eadbd4a72823af3c73c959c')
 
 build() {
   cd "${srcdir}/${pkgbase}-${pkgver}"
diff --git a/extra/libsndfile/PKGBUILD b/extra/libsndfile/PKGBUILD
index 7fb0293e6..b2c8cd0bb 100644
--- a/extra/libsndfile/PKGBUILD
+++ b/extra/libsndfile/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 116432 2011-03-23 19:57:46Z eric $
+# $Id: PKGBUILD 133971 2011-07-31 04:15:25Z heftig $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=libsndfile
-pkgver=1.0.24
+pkgver=1.0.25
 pkgrel=1
 pkgdesc="A C library for reading and writing files containing sampled sound"
 arch=('i686' 'x86_64')
@@ -11,8 +11,8 @@ license=('LGPL')
 depends=('alsa-lib' 'flac' 'libvorbis')
 options=('!libtool')
 source=(http://www.mega-nerd.com/libsndfile/files/${pkgname}-${pkgver}.tar.gz)
-md5sums=('8f823c30c1d8d44830db6ab845d6679e')
-sha1sums=('ade2dad272b52f61bb58aca3a4004b28549ee0f8')
+md5sums=('e2b7bb637e01022c7d20f95f9c3990a2')
+sha1sums=('e95d9fca57f7ddace9f197071cbcfb92fa16748e')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/libsoup/PKGBUILD b/extra/libsoup/PKGBUILD
index 7c2aa02ae..6547c7d42 100644
--- a/extra/libsoup/PKGBUILD
+++ b/extra/libsoup/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 124678 2011-05-23 20:49:40Z ibiru $
+# $Id: PKGBUILD 133504 2011-07-28 18:24:45Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=libsoup
 pkgname=('libsoup' 'libsoup-gnome')
-pkgver=2.34.2
+pkgver=2.34.3
 pkgrel=1
 arch=('i686' 'x86_64')
 license=('LGPL')
 makedepends=('glib2' 'libxml2' 'sqlite3' 'libgnome-keyring' 'intltool' 'gobject-introspection' 'glib-networking')
 url="http://www.gnome.org"
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgbase}/${pkgver%.*}/${pkgbase}-${pkgver}.tar.bz2)
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgbase}/${pkgver%.*}/${pkgbase}-${pkgver}.tar.xz)
 options=('!libtool' '!emptydirs')
-sha256sums=('1d70edc48c309528635012269733739f9cd22548913125864318a65d1b6f1261')
+sha256sums=('c43f8865a9f7016c618b481bea3dd9ea65d9200685d4a94cddc54f8663704a1c')
 
 build() {
   cd "${srcdir}/${pkgbase}-${pkgver}"
diff --git a/extra/libtorrent-rasterbar/PKGBUILD b/extra/libtorrent-rasterbar/PKGBUILD
index 275c56431..3c92c4832 100644
--- a/extra/libtorrent-rasterbar/PKGBUILD
+++ b/extra/libtorrent-rasterbar/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 124787 2011-05-24 12:59:08Z ibiru $
+# $Id: PKGBUILD 132751 2011-07-25 19:30:07Z ibiru $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: Hugo Doria <hugo@archlinux.org>
 
 pkgname=libtorrent-rasterbar
 pkgver=0.15.6
-pkgrel=2
+pkgrel=3
 pkgdesc="A C++ library that aims to be a good alternative to all the other bittorrent implementations around"
 url="http://www.rasterbar.com/products/libtorrent/"
 arch=('i686' 'x86_64')
diff --git a/extra/libva/PKGBUILD b/extra/libva/PKGBUILD
index 3996e0059..182f6081c 100644
--- a/extra/libva/PKGBUILD
+++ b/extra/libva/PKGBUILD
@@ -1,7 +1,7 @@
-# $Id: PKGBUILD 125889 2011-05-31 13:21:31Z ibiru $
+# $Id: PKGBUILD 133625 2011-07-30 07:35:29Z ibiru $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 pkgname=libva
-pkgver=1.0.13
+pkgver=1.0.14
 pkgrel=1
 pkgdesc="Video Acceleration (VA) API for Linux"
 arch=('i686' 'x86_64')
@@ -11,14 +11,11 @@ depends=('libgl' 'libdrm>=2.4.23' 'libxfixes')
 makedepends=('mesa')
 optdepends=('vdpau-video: VDPAU backend for VA API')
 options=('!libtool')
-source=(http://cgit.freedesktop.org/libva/snapshot/${pkgname}-${pkgver}.tar.bz2
-        libva-dont-install-tests.patch)
-md5sums=('221207c386129e02fc05827147af7aa6'
-         'd13d1868f2db99bedec1057bbfbd9c61')
+source=(http://cgit.freedesktop.org/libva/snapshot/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('9a7eba239bffa3b40d7a49e3bb4fb6fb')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
-  patch -Np1 -i "${srcdir}/libva-dont-install-tests.patch"
   ./autogen.sh
   ./configure --prefix=/usr  \
     --enable-i965-driver \
diff --git a/extra/lyx/PKGBUILD b/extra/lyx/PKGBUILD
index 13f6451b7..cf09d5f97 100644
--- a/extra/lyx/PKGBUILD
+++ b/extra/lyx/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 130979 2011-07-09 11:00:04Z ronald $
+# $Id: PKGBUILD 133449 2011-07-28 03:31:32Z heftig $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Jason Chu <jason@archlinux.org>
 
 pkgname=lyx
 pkgver=2.0.0
-pkgrel=1
+pkgrel=3
 pkgdesc="An advanced open-source document processor."
 arch=('i686' 'x86_64')
 url="http://www.lyx.org"
diff --git a/extra/maxima/PKGBUILD b/extra/maxima/PKGBUILD
index d6254d5b6..67a5a1755 100644
--- a/extra/maxima/PKGBUILD
+++ b/extra/maxima/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 127537 2011-06-16 08:28:21Z juergen $
+# $Id: PKGBUILD 132840 2011-07-26 13:33:34Z juergen $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Damir Perisa <damir@archlinux.org>
 
 pkgname=maxima
 pkgver=5.24.0
-pkgrel=3
+pkgrel=4
 pkgdesc="Maxima - a sophisticated computer algebra system"
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://maxima.sourceforge.net"
-depends=('sbcl=1.0.49' 'texinfo' 'sh')
+depends=('sbcl=1.0.50' 'texinfo' 'sh')
 makedepends=('python2')
 optdepends=('gnuplot: plotting capabilities' 'rlwrap: readline support via /usr/bin/rmaxima' 'tk: graphical xmaxima interface')
 # needs rebuild when bash changes version
diff --git a/extra/memcached/PKGBUILD b/extra/memcached/PKGBUILD
index 8402e28f1..21822768c 100644
--- a/extra/memcached/PKGBUILD
+++ b/extra/memcached/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 109292 2011-02-07 17:22:01Z ibiru $
+# $Id: PKGBUILD 133031 2011-07-27 01:25:28Z dan $
 # Maintainer: Dan McGee <dan@archlinux.org>
 # Contributor: Michael Irwin <6d6469@gmail.com>
 
 pkgname=memcached
-pkgver=1.4.5
-pkgrel=3
+pkgver=1.4.6
+pkgrel=1
 pkgdesc="A distributed memory object caching system"
 arch=(i686 x86_64)
 url="http://memcached.org/"
@@ -14,26 +14,22 @@ optdepends=('perl: for memcached-tool usage')
 backup=('etc/conf.d/memcached')
 source=(http://memcached.googlecode.com/files/$pkgname-$pkgver.tar.gz
         memcached.conf
-        memcached.sh
-        fix-type-punning-issues.patch)
+		memcached.sh)
 changelog=ChangeLog
+sha256sums=('4dba55457e4e7f5a3e8255325671bf1e1efbe89ee224fcc6993fcd659956d3f7'
+            '0e57a0f528b387f1f04f628ec74856c615d82d44f4d6bc041c33b3814ce13d0a'
+            '72efa639c5a39c7c14f07cc51731ebbf82299870d9cf31cf3aaa981bc084b4eb')
 
 build() {
-  cd $srcdir/$pkgname-$pkgver
-  patch -Np1 < $srcdir/fix-type-punning-issues.patch
+  cd "$srcdir/$pkgname-$pkgver"
   ./configure --prefix=/usr
   make
 }
 
 package() {
-  cd $srcdir/$pkgname-$pkgver
-  make DESTDIR=$pkgdir install
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
   install -D -m 755 scripts/memcached-tool $pkgdir/usr/bin/memcached-tool
-  install -D -m 644 $srcdir/$pkgname.conf $pkgdir/etc/conf.d/$pkgname
-  install -D -m 755 $srcdir/$pkgname.sh $pkgdir/etc/rc.d/$pkgname
+  install -D -m 644 "$srcdir/memcached.conf" $pkgdir/etc/conf.d/memcached
+  install -D -m 755 "$srcdir/memcached.sh" $pkgdir/etc/rc.d/memcached
 }
-
-md5sums=('583441a25f937360624024f2881e5ea8'
-         'bf15619930dadf0c08669566e4aa809c'
-         '65f88b69cf3112b178725af121327765'
-         'c4f6da682cb4e7599fede4904021f4ae')
diff --git a/extra/mkvtoolnix/PKGBUILD b/extra/mkvtoolnix/PKGBUILD
index d79e21519..217a30f3f 100644
--- a/extra/mkvtoolnix/PKGBUILD
+++ b/extra/mkvtoolnix/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 131260 2011-07-12 12:02:03Z giovanni $
+# $Id: PKGBUILD 133025 2011-07-26 21:15:25Z eric $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 
 pkgname=mkvtoolnix
 pkgver=4.9.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Set of tools to create, edit and inspect Matroska files - CLI version"
 arch=('i686' 'x86_64')
 license=('GPL')
diff --git a/extra/mod_fcgid/PKGBUILD b/extra/mod_fcgid/PKGBUILD
index ad457a9a2..30eca4e61 100644
--- a/extra/mod_fcgid/PKGBUILD
+++ b/extra/mod_fcgid/PKGBUILD
@@ -1,7 +1,7 @@
-# $Id: PKGBUILD 72879 2010-03-21 12:12:44Z thomas $
+# $Id: PKGBUILD 133036 2011-07-27 01:53:07Z dan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 pkgname=mod_fcgid
-pkgver=2.3.5
+pkgver=2.3.6
 pkgrel=1
 pkgdesc="A FastCGI module for Apache HTTP Server."
 license=('APACHE')
@@ -9,7 +9,7 @@ arch=('i686' 'x86_64')
 url="http://httpd.apache.org/mod_fcgid/"
 depends=('apache')
 source=(http://apache.cs.utah.edu/httpd/mod_fcgid/mod_fcgid-$pkgver.tar.gz)
-sha256sums=('3280fd287659539d577fc3c77a975739c06bb9d0a9cef48275d4beb13c64ef39')
+sha256sums=('e831795498d91cf27a519ea1332c2a92a2a9920b0844d817b2ea7f079056d12b')
 
 build() {
   cd "$srcdir"/$pkgname-$pkgver
diff --git a/extra/mysql/PKGBUILD b/extra/mysql/PKGBUILD
index 54248034e..a3a8f726c 100644
--- a/extra/mysql/PKGBUILD
+++ b/extra/mysql/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 131641 2011-07-13 07:03:22Z andrea $
+# $Id: PKGBUILD 133474 2011-07-28 13:52:29Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 
 pkgbase=mysql
 pkgname=('libmysqlclient' 'mysql-clients' 'mysql')
-pkgver=5.5.14
-pkgrel=2
+pkgver=5.5.15
+pkgrel=1
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://www.mysql.com/"
@@ -15,7 +15,7 @@ options=('!libtool')
 source=("http://ftp.gwdg.de/pub/misc/mysql/Downloads/MySQL-5.5/${pkgbase}-${pkgver}.tar.gz"
         'mysqld'
         'my.cnf')
-md5sums=('19f43bb9c72b1b5f7ff86a7f921c9244'
+md5sums=('306b5549c7bd72e8e705a890db0da82b'
          '2234207625baa29b2ff7d7b4f088abce'
          '1c949c0dbea5206af0db14942d9927b6')
 
diff --git a/extra/opal/PKGBUILD b/extra/opal/PKGBUILD
index cbc4ae32b..7b4bcdd35 100644
--- a/extra/opal/PKGBUILD
+++ b/extra/opal/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 111695 2011-02-28 18:26:03Z heftig $
+# $Id: PKGBUILD 132761 2011-07-25 20:47:45Z ibiru $
 # Maintainer: Jan de Groot <jan@archlinux.org>
 # Contributor: Tom K <tomk@runbox.com>
 pkgname=opal
-pkgver=3.8.3
+pkgver=3.10.1
 pkgrel=1
 pkgdesc="Open Phone Abstraction Library"
 arch=(i686 x86_64)
@@ -10,12 +10,13 @@ url="http://www.ekiga.org"
 license=('GPL')
 depends=('ptlib' 'libtheora' 'x264' 'speex')
 makedepends=('ffmpeg')
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('d775626d786028357a8535fb2ff8f04bce9c1bff51db0e962f0939c2b988767f')
+options=(!makeflags)
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
+sha256sums=('093ff27589f5884af452e6e954ab4da1cc36ff4cc27138230b7d551f22d4f230')
 
 build() {
   cd "${srcdir}/opal-${pkgver}"
-  CFLAGS="$CFLAGS -D__STDC_CONSTANT_MACROS" \
+  CXXFLAGS="$CXXFLAGS -fpermissive" \
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
   make
 }
diff --git a/extra/oxygen-gtk/PKGBUILD b/extra/oxygen-gtk/PKGBUILD
index ca797ecd7..fa0903bdc 100644
--- a/extra/oxygen-gtk/PKGBUILD
+++ b/extra/oxygen-gtk/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 123677 2011-05-12 11:19:55Z andrea $
+# $Id: PKGBUILD 133245 2011-07-27 22:51:02Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: birdflesh <antkoul at gmail dot com>
 
 pkgname=oxygen-gtk
-pkgver=1.0.5
+pkgver=1.1.1
 pkgrel=1
 pkgdesc="Port of the default KDE widget theme (Oxygen) to GTK"
 arch=('i686' 'x86_64')
@@ -12,10 +12,10 @@ license=('LGPL')
 depends=('gtk2')
 makedepends=('cmake')
 source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('4a30da4b5442d896c054cfcae783248e')
+md5sums=('8e7454f2a1a97f7580995276d78aa35d')
 
 build() {
-  cd ${srcdir}
+  cd "${srcdir}"
   mkdir build
   cd build
   cmake ../${pkgname}-${pkgver} \
@@ -25,6 +25,6 @@ build() {
 }
 
 package() {
-  cd ${srcdir}/build
-  make DESTDIR=${pkgdir} install
+  cd "${srcdir}"/build
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/parted/PKGBUILD b/extra/parted/PKGBUILD
index a83bc0eca..8c8d7f3b1 100644
--- a/extra/parted/PKGBUILD
+++ b/extra/parted/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 132447 2011-07-24 17:00:59Z giovanni $
+# $Id: PKGBUILD 133576 2011-07-29 18:39:57Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Aaron Griffin <aaron@archlinux.org>
 
 pkgname=parted
 pkgver=3.0
-pkgrel=2
+pkgrel=3
 pkgdesc="A program for creating, destroying, resizing, checking and copying partitions"
 arch=('i686' 'x86_64')
 license=('GPL3')
@@ -13,12 +13,17 @@ depends=('device-mapper' 'e2fsprogs')
 makedepends=('pkgconfig')
 options=('!libtool')
 install=${pkgname}.install
-source=("http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz")
-md5sums=('c415e5c97f86b5ff65a2d925e5a3feb7')
+source=("http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz"
+        linux.c.patch)
+md5sums=('c415e5c97f86b5ff65a2d925e5a3feb7'
+         '08c942e212424e238271217f52c59706')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
+  # FS#25307
+  patch -Np1 -i ${srcdir}/linux.c.patch
+
   ./configure --prefix=/usr \
               --disable-debug \
               --disable-rpath
diff --git a/extra/parted/linux.c.patch b/extra/parted/linux.c.patch
new file mode 100644
index 000000000..c9feea142
--- /dev/null
+++ b/extra/parted/linux.c.patch
@@ -0,0 +1,25 @@
+--- a/libparted/arch/linux.c	2011-05-27 14:52:37.000000000 +0200
++++ b/libparted/arch/linux.c	2011-07-29 20:25:38.000000000 +0200
+@@ -601,17 +601,17 @@
+         static int kver = -1;
+ 
+         struct utsname uts;
+-        int major;
+-        int minor;
+-        int teeny;
++        int major = 0;
++        int minor = 0;
++        int teeny = 0;
+ 
+         if (kver != -1)
+                 return kver;
+ 
+         if (uname (&uts))
+                 return kver = 0;
+-        if (sscanf (uts.release, "%u.%u.%u", &major, &minor, &teeny) != 3)
+-                return kver = 0;
++        int n = sscanf (uts.release, "%u.%u.%u", &major, &minor, &teeny);
++        assert (n == 2 || n == 3);
+ 
+         return kver = KERNEL_VERSION (major, minor, teeny);
+ }
diff --git a/extra/phonon-vlc/PKGBUILD b/extra/phonon-vlc/PKGBUILD
index 717a857df..990855949 100644
--- a/extra/phonon-vlc/PKGBUILD
+++ b/extra/phonon-vlc/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 120790 2011-04-26 15:17:21Z andrea $
+# $Id: PKGBUILD 134014 2011-08-01 08:35:33Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=phonon-vlc
-pkgver=0.4.0
+pkgver=0.4.1
 pkgrel=1
 arch=('i686' 'x86_64')
 url="http://phonon.kde.org"
@@ -11,11 +11,11 @@ license=('LGPL')
 depends=('vlc')
 makedepends=('cmake' 'automoc4' 'phonon')
 provides=('phonon-backend')
-source=("http://download.kde.org/stable/phonon/phonon-backend-vlc/${pkgver}/src/phonon-backend-vlc-${pkgver}.tar.bz2")
-md5sums=('e6ef8c5b54a49610d4dad67754392420')
+source=("http://download.kde.org/stable/phonon/phonon-backend-vlc/${pkgver}/phonon-backend-vlc-${pkgver}.tar.bz2")
+md5sums=('bdf188c0d3ad3458e7e39ecad06a500b')
 
 build() {
-  cd ${srcdir}
+  cd "${srcdir}"
   mkdir build
   cd build
   cmake ../phonon-backend-vlc-${pkgver} \
@@ -25,6 +25,6 @@ build() {
 }
 
 package() {
-  cd ${srcdir}/build
-  make DESTDIR=${pkgdir} install
+  cd "${srcdir}"/build
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/phonon/PKGBUILD b/extra/phonon/PKGBUILD
index e93c1dcde..ad7852355 100644
--- a/extra/phonon/PKGBUILD
+++ b/extra/phonon/PKGBUILD
@@ -1,32 +1,32 @@
-# $Id: PKGBUILD 116776 2011-03-25 20:41:06Z andrea $
+# $Id: PKGBUILD 125369 2011-05-26 10:11:37Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=phonon
-pkgver=4.5.0
+pkgver=4.5.55
 pkgrel=1
 arch=('i686' 'x86_64')
 url="http://phonon.kde.org"
 license=('LGPL')
 pkgdesc="The multimedia framework for KDE4"
-depends=('qt' 'phonon-backend' 'libpulse')
+depends=('qt' 'phonon-backend' 'libpulse' 'libqzeitgeist')
 optdepends=('pulseaudio: PulseAudio support')
 makedepends=('cmake' 'automoc4' 'pulseaudio')
-source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('32f8d388c18fde2e23dea7bb103f9713')
+source=("${pkgname}-${pkgver}.tar.bz2"::"http://quickgit.kde.org/?p=phonon.git&a=snapshot&h=37ec84753af68c4f30041d080b37f1a49a89197c&fmt=tbz2")
+#source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
+md5sums=('ce1316c88df988320e75a2b4c3cb8804')
 
 build() {
-  cd ${srcdir}
+  cd "${srcdir}"
   mkdir build
   cd build
-  cmake ../${pkgname}-${pkgver} \
+  cmake ../${pkgname} \
     -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_SKIP_RPATH=ON \
-    -DWITH_QZeitgeist=OFF
+    -DCMAKE_SKIP_RPATH=ON
   make
 }
 
 package(){
-  cd ${srcdir}/build
-  make DESTDIR=${pkgdir} install
+  cd "${srcdir}"/build
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/polkit-gnome/PKGBUILD b/extra/polkit-gnome/PKGBUILD
index 6f901f6c9..2648f5294 100644
--- a/extra/polkit-gnome/PKGBUILD
+++ b/extra/polkit-gnome/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 117304 2011-03-30 19:38:26Z ibiru $
+# $Id: PKGBUILD 133630 2011-07-30 09:21:56Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: onestep_ua <onestep@ukr.net>
 
 pkgname=polkit-gnome
 pkgver=0.101
-pkgrel=2
+pkgrel=3
 pkgdesc="PolicyKit integration for the GNOME desktop"
 arch=('i686' 'x86_64')
 url="http://www.freedesktop.org/wiki/Software/PolicyKit"
@@ -15,7 +15,7 @@ options=(!libtool)
 source=(http://hal.freedesktop.org/releases/${pkgname}-${pkgver}.tar.bz2
         polkit-gnome-authentication-agent-1.desktop)
 md5sums=('da6aaff473ed80f8958fd6f67a59defe'
-         '5668cffbfd031452c86db8adceba79b5')
+         '147a0534adb37452edb4b27cdb2eabb2')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/polkit-gnome/polkit-gnome-authentication-agent-1.desktop b/extra/polkit-gnome/polkit-gnome-authentication-agent-1.desktop
index 2016294e9..fc2acc28d 100644
--- a/extra/polkit-gnome/polkit-gnome-authentication-agent-1.desktop
+++ b/extra/polkit-gnome/polkit-gnome-authentication-agent-1.desktop
@@ -85,4 +85,4 @@ Type=Application
 Categories=
 NoDisplay=true
 NotShowIn=KDE;
-AutostartCondition=GNOME3 if-session gnome-fallback
+AutostartCondition=GNOME3 unless-session gnome
diff --git a/extra/prison/PKGBUILD b/extra/prison/PKGBUILD
new file mode 100644
index 000000000..793db4535
--- /dev/null
+++ b/extra/prison/PKGBUILD
@@ -0,0 +1,29 @@
+# $Id: PKGBUILD 133482 2011-07-28 15:01:26Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+
+pkgname=prison
+pkgver=1.0
+pkgrel=1
+pkgdesc="A barcode API to produce QRCode barcodes and DataMatrix barcodes"
+arch=('i686' 'x86_64')
+url="http://www.kde.org"
+license=('GPL')
+depends=('qt' 'libdmtx' 'qrencode')
+makedepends=('cmake')
+source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.gz")
+md5sums=('8baac61506e37a31482a0df4a5d02cd2')
+
+build() {
+  cd "${srcdir}"
+  mkdir build
+  cd build
+  cmake ../${pkgname}-${pkgver} \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr
+  make
+}
+
+package() {
+  cd "${srcdir}"/build
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/extra/ptlib/PKGBUILD b/extra/ptlib/PKGBUILD
index efba27e62..51740fd32 100644
--- a/extra/ptlib/PKGBUILD
+++ b/extra/ptlib/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 111692 2011-02-28 18:24:37Z heftig $
+# $Id: PKGBUILD 132754 2011-07-25 19:54:44Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=ptlib
-pkgver=2.8.3
+pkgver=2.10.1
 pkgrel=1
 pkgdesc="Portable Windows Library"
 arch=(i686 x86_64)
@@ -11,8 +11,8 @@ license=('GPL')
 depends=('gcc-libs' 'openssl' 'alsa-lib' 'sdl' 'expat' 'libpulse' 'v4l-utils')
 replaces=('pwlib')
 conflicts=('pwlib')
-source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('076afde4e53e5fd0989adc344c3741aea8342b105c3e879e2f4f9a42ef36793e')
+source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
+sha256sums=('9d5ad6baede23ed893f70a4a21948aa656bf96013f04c5c1ad5154a5dbe13c5f')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/pycups/PKGBUILD b/extra/pycups/PKGBUILD
index 1f9637dc0..4936bab3d 100644
--- a/extra/pycups/PKGBUILD
+++ b/extra/pycups/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 127690 2011-06-17 17:53:00Z andrea $
+# $Id: PKGBUILD 134034 2011-08-01 10:36:25Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: nesl247 <nesl247@gmail.com>
 
 pkgname=pycups
-pkgver=1.9.57
+pkgver=1.9.58
 pkgrel=1
 pkgdesc="Python CUPS Bindings"
 url="http://cyberelk.net/tim/software/pycups/"
@@ -11,7 +11,7 @@ arch=('i686' 'x86_64')
 license=('GPL')
 depends=('libcups' 'python2')
 source=("http://cyberelk.net/tim/data/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('64e328e2c628e41862efe97f04e66da4')
+md5sums=('320d8ce1f10dea9a3dd9054befaf6239')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/pygobject/PKGBUILD b/extra/pygobject/PKGBUILD
index 7222d82f8..388e9fb69 100644
--- a/extra/pygobject/PKGBUILD
+++ b/extra/pygobject/PKGBUILD
@@ -1,18 +1,22 @@
-# $Id: PKGBUILD 120090 2011-04-19 21:33:57Z ibiru $
+# $Id: PKGBUILD 133523 2011-07-28 20:25:13Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=pygobject
 pkgname=(pygobject py3gobject pygobject-devel)
-pkgver=2.28.4
+pkgver=2.28.6
 pkgrel=1
 arch=('i686' 'x86_64')
 license=('LGPL')
 depends=('glib2' 'gobject-introspection')
 makedepends=(python python2 python-cairo python2-cairo)
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgbase}/${pkgver%.*}/${pkgbase}-${pkgver}.tar.bz2)
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgbase}/${pkgver%.*}/${pkgbase}-${pkgver}.tar.xz
+        python3-fix-build.patch
+        python3-fix-maketrans.patch)
 options=('!libtool')
 url="http://www.pygtk.org/"
-sha256sums=('70e3a05dd5f688e68b5dafa2412cd4fdbc0af83792a5752ef6353c4accf2022c')
+sha256sums=('fb8a1d4f665130a125011659bd347c7339c944232163dbb9a34fd0686577adb8'
+            'feafd4664f8455edf0bf8407ac45e219bb550df806ce0d601baae951e8c188ca'
+            '4bff9adcea13a824c45d14ec501c927df47d23c22507a2456d8b5ec885924c0a')
 
 build() {
   cd "${srcdir}"
@@ -28,6 +32,10 @@ build() {
 
   (
     cd "${pkgbase}-${pkgver}"
+    #patches available in 2.28 branch but unreleased.
+    patch -Np1 -i "${srcdir}/python3-fix-build.patch"
+    patch -Np1 -i "${srcdir}/python3-fix-maketrans.patch"
+
     ./configure --prefix=/usr
     make
   )
diff --git a/extra/pygobject/python3-fix-build.patch b/extra/pygobject/python3-fix-build.patch
new file mode 100644
index 000000000..4cb8cfe57
--- /dev/null
+++ b/extra/pygobject/python3-fix-build.patch
@@ -0,0 +1,34 @@
+From e2dc4ac346a16b6976b92e84819c7203629beb4a Mon Sep 17 00:00:00 2001
+From: Ignacio Casal Quinteiro <icq@gnome.org>
+Date: Thu, 21 Apr 2011 14:52:20 +0000
+Subject: [python3] fix build. PYcairo_IMPORT doesn't exists anymore
+
+---
+diff --git a/gi/pygi-foreign-cairo.c b/gi/pygi-foreign-cairo.c
+index 81b9865..edf52d7 100644
+--- a/gi/pygi-foreign-cairo.c
++++ b/gi/pygi-foreign-cairo.c
+@@ -30,7 +30,7 @@
+ #include <pycairo/py3cairo.h>
+ #endif
+ 
+-Pycairo_CAPI_t *Pycairo_CAPI;
++static Pycairo_CAPI_t *Pycairo_CAPI;
+ 
+ #include "pygi-foreign.h"
+ 
+@@ -117,7 +117,12 @@ cairo_surface_release (GIBaseInfo *base_info,
+ static PyMethodDef _gi_cairo_functions[] = {0,};
+ PYGLIB_MODULE_START(_gi_cairo, "_gi_cairo")
+ {
++#if PY_VERSION_HEX < 0x03000000
+     Pycairo_IMPORT;
++#else
++    Pycairo_CAPI = (Pycairo_CAPI_t*) PyCObject_Import("cairo", "CAPI");
++#endif
++
+     if (Pycairo_CAPI == NULL)
+         return PYGLIB_MODULE_ERROR_RETURN;
+ 
+--
+cgit v0.9
diff --git a/extra/pygobject/python3-fix-maketrans.patch b/extra/pygobject/python3-fix-maketrans.patch
new file mode 100644
index 000000000..f5bc0e77c
--- /dev/null
+++ b/extra/pygobject/python3-fix-maketrans.patch
@@ -0,0 +1,36 @@
+From 667bec76ccbc85cc1d54a0e68977dbda241c028c Mon Sep 17 00:00:00 2001
+From: Martin Pitt <martin.pitt@ubuntu.com>
+Date: Wed, 13 Jul 2011 06:42:22 +0000
+Subject: [python3] Fix maketrans import
+
+Python3 moved the maketrans() function from the string module to a str method.
+This unbreaks gi/module.py for Python 3 again.
+---
+diff --git a/gi/module.py b/gi/module.py
+index 70df76c..d56bdaf 100644
+--- a/gi/module.py
++++ b/gi/module.py
+@@ -24,7 +24,11 @@ from __future__ import absolute_import
+ 
+ import os
+ import gobject
+-import string
++try:
++    maketrans = ''.maketrans
++except AttributeError:
++    # fallback for Python 2
++    from string import maketrans
+ 
+ import gi
+ from .overrides import registry
+@@ -124,7 +128,7 @@ class IntrospectionModule(object):
+                 # Don't use upper() here to avoid locale specific
+                 # identifier conversion (e. g. in Turkish 'i'.upper() == 'i')
+                 # see https://bugzilla.gnome.org/show_bug.cgi?id=649165
+-                ascii_upper_trans = string.maketrans(
++                ascii_upper_trans = maketrans(
+                         'abcdefgjhijklmnopqrstuvwxyz', 
+                         'ABCDEFGJHIJKLMNOPQRSTUVWXYZ')
+                 for value_info in info.get_values():
+--
+cgit v0.9
diff --git a/extra/qrencode/PKGBUILD b/extra/qrencode/PKGBUILD
new file mode 100644
index 000000000..54915dcd0
--- /dev/null
+++ b/extra/qrencode/PKGBUILD
@@ -0,0 +1,31 @@
+# $Id: PKGBUILD 133485 2011-07-28 15:04:33Z andrea $
+# Maintainer: Florian Pritz< flo@xinu.at>
+# Contributor: Dany Martineau <dany.luc.martineau@gmail.com>
+
+pkgname=qrencode
+pkgver=3.1.1
+pkgrel=2
+pkgdesc="C library for encoding data in a QR Code symbol."
+arch=(i686 x86_64)
+depends=('libpng>=1.4.0')
+makedepends=(sdl)
+url="http://megaui.net/fukuchi/works/qrencode/index.en.html"
+license=('GPL')
+options=(!libtool)
+source=(http://megaui.net/fukuchi/works/${pkgname}/${pkgname}-${pkgver}.tar.bz2 libpng14.diff)
+md5sums=('e7feb2c2c65d0f2f4010a14da3ecdb89' '93e87b2751b0d422a08e96ccaae4d082')
+
+build() {
+  cd "${srcdir}/$pkgname-$pkgver"
+  patch -p1 < "$srcdir/libpng14.diff"
+  autoreconf
+  ./autogen.sh
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd "${srcdir}/$pkgname-$pkgver"
+
+  make prefix="$pkgdir/usr" install
+}
diff --git a/extra/qrencode/libpng14.diff b/extra/qrencode/libpng14.diff
new file mode 100644
index 000000000..eadf68dde
--- /dev/null
+++ b/extra/qrencode/libpng14.diff
@@ -0,0 +1,65 @@
+diff -U 3 -H -d -r -N -- qrencode-3.1.1/configure qrencode-3.1.1-ok/configure
+--- qrencode-3.1.1/configure	2010-02-02 19:43:16.000000000 -0500
++++ qrencode-3.1.1-ok/configure	2010-02-03 21:41:43.205709796 -0500
+@@ -11445,12 +11445,12 @@
+         pkg_cv_png_CFLAGS="$png_CFLAGS"
+     else
+         if test -n "$PKG_CONFIG" && \
+-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\"libpng12\"\""; } >&5
+-  ($PKG_CONFIG --exists --print-errors ""libpng12"") 2>&5
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\"libpng14\"\""; } >&5
++  ($PKG_CONFIG --exists --print-errors ""libpng14"") 2>&5
+   ac_status=$?
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+-  pkg_cv_png_CFLAGS=`$PKG_CONFIG --cflags ""libpng12"" 2>/dev/null`
++  pkg_cv_png_CFLAGS=`$PKG_CONFIG --cflags ""libpng14"" 2>/dev/null`
+ else
+   pkg_failed=yes
+ fi
+@@ -11463,12 +11463,12 @@
+         pkg_cv_png_LIBS="$png_LIBS"
+     else
+         if test -n "$PKG_CONFIG" && \
+-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\"libpng12\"\""; } >&5
+-  ($PKG_CONFIG --exists --print-errors ""libpng12"") 2>&5
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\"libpng14\"\""; } >&5
++  ($PKG_CONFIG --exists --print-errors ""libpng14"") 2>&5
+   ac_status=$?
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+-  pkg_cv_png_LIBS=`$PKG_CONFIG --libs ""libpng12"" 2>/dev/null`
++  pkg_cv_png_LIBS=`$PKG_CONFIG --libs ""libpng14"" 2>/dev/null`
+ else
+   pkg_failed=yes
+ fi
+@@ -11487,14 +11487,14 @@
+         _pkg_short_errors_supported=no
+ fi
+         if test $_pkg_short_errors_supported = yes; then
+-	        png_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors ""libpng12""`
++	        png_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors ""libpng14""`
+         else
+-	        png_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors ""libpng12""`
++	        png_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors ""libpng14""`
+         fi
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$png_PKG_ERRORS" >&5
+ 
+-	as_fn_error "Package requirements (\"libpng12\") were not met:
++	as_fn_error "Package requirements (\"libpng14\") were not met:
+ 
+ $png_PKG_ERRORS
+ 
+diff -U 3 -H -d -r -N -- qrencode-3.1.1/configure.ac qrencode-3.1.1-ok/configure.ac
+--- qrencode-3.1.1/configure.ac	2010-02-02 19:42:12.000000000 -0500
++++ qrencode-3.1.1-ok/configure.ac	2010-02-03 21:42:07.202419056 -0500
+@@ -36,7 +36,7 @@
+  [build_tools=$withval], [build_tools=yes])
+ AM_CONDITIONAL(BUILD_TOOLS, [test "x$build_tools" = "xyes" ])
+ if test x$build_tools = xyes ; then
+-	PKG_CHECK_MODULES(png, "libpng12")
++	PKG_CHECK_MODULES(png, "libpng14")
+ fi
+ 
+ dnl --with-tests
diff --git a/extra/rtmpdump/PKGBUILD b/extra/rtmpdump/PKGBUILD
index 6e7d26e4c..b1e933a21 100644
--- a/extra/rtmpdump/PKGBUILD
+++ b/extra/rtmpdump/PKGBUILD
@@ -1,20 +1,27 @@
-# $Id: $
+# $Id: PKGBUILD 134127 2011-08-02 03:47:07Z eric $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: xduugu
 # Contributor: Elis Hughes <elishughes@googlemail.com>
+
 pkgname=rtmpdump
-pkgver=2.3
-pkgrel=3
+pkgver=2.4
+pkgrel=1
 pkgdesc="A tool to download rtmp streams"
 arch=('i686' 'x86_64')
 url="http://rtmpdump.mplayerhq.hu/"
-license=('LGPL')
+license=('GPL2' 'LGPL2.1')
 depends=('openssl')
-source=(http://rtmpdump.mplayerhq.hu/download/${pkgname}-${pkgver}.tgz)
-sha256sums=('ef38b7a99d82ce6912063d21063aeaf28185341b3df486e24bffce5354224b2c')
+#source=(http://rtmpdump.mplayerhq.hu/download/${pkgname}-${pkgver}.tgz)
+source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.xz)
+sha256sums=('2c3b76d46d56180176ef099b8ad50a1608bef1dac35d8cb0b21ceac31b5c0656')
 
 build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"  
+  make
+}
+
+package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  sed -i 's/^install_so.0:.*/& install_base/' librtmp/Makefile
-  make prefix=/usr MANDIR="${pkgdir}/usr/share/man" DESTDIR="${pkgdir}" install
+  install -d -m755 "${pkgdir}/usr/lib"
+  make prefix=/usr mandir=/usr/share/man DESTDIR="${pkgdir}" install
 }
diff --git a/extra/samba/PKGBUILD b/extra/samba/PKGBUILD
index 09284b3d3..587d14cb5 100644
--- a/extra/samba/PKGBUILD
+++ b/extra/samba/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 130383 2011-07-06 08:32:50Z tpowa $
+# $Id: PKGBUILD 133513 2011-07-28 20:13:17Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 pkgbase=samba
 pkgname=('smbclient' 'samba')
-pkgver=3.5.9
+pkgver=3.5.10
 # We use the 'A' to fake out pacman's version comparators.  Samba chooses
 # to append 'a','b',etc to their subsequent releases, which pamcan
 # misconstrues as alpha, beta, etc.  Bad samba!
-_realver=3.5.9
-pkgrel=2
+_realver=3.5.10
+pkgrel=1
 arch=(i686 x86_64)
 url="http://www.samba.org"
 license=('GPL3')
@@ -129,7 +129,7 @@ depends=('db' 'popt' 'libcups' 'acl' 'libldap' "smbclient>=$pkgver" 'libcap' 'kr
   # copy ldap example
   install -D -m644 ${srcdir}/samba-${_realver}/examples/LDAP/samba.schema ${pkgdir}/usr/share/doc/samba/examples/LDAP/samba.schema
 }
-md5sums=('fc3fe1103cf9d71abe12a8c604f31c76'
+md5sums=('63f092b7a7a7e10121fbf79a492a5ce5'
          'a3da19515a234c703876cf850c44e996'
          '5697da77590ec092cc8a883bae06093c'
          'a4bbfa39fee95bba2e7ad6b535fae7e6'
diff --git a/extra/sbcl/PKGBUILD b/extra/sbcl/PKGBUILD
index 368197831..8f961492e 100644
--- a/extra/sbcl/PKGBUILD
+++ b/extra/sbcl/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 127534 2011-06-16 08:21:30Z juergen $
+# $Id: PKGBUILD 132801 2011-07-26 10:22:05Z juergen $
 # Contributor: John Proctor <jproctor@prium.net>
 # Contributor: Daniel White <daniel@whitehouse.id.au>
 # Maintainer: Juergen Hoetzel <juergen@archlinux.org>
 # Contributor: Leslie Polzer (skypher) 
 
 pkgname=sbcl
-pkgver=1.0.49
+pkgver=1.0.50
 pkgrel=1
 pkgdesc="Steel Bank Common Lisp"
 arch=('i686' 'x86_64')
@@ -14,7 +14,7 @@ depends=('glibc')
 provides=('common-lisp' 'cl-asdf')
 makedepends=('sbcl' 'texinfo')
 source=("http://downloads.sourceforge.net/project/sbcl/sbcl/$pkgver/$pkgname-$pkgver-source.tar.bz2" "arch-fixes.lisp")
-md5sums=('8d15c6af6388fcd9efbd13f301b7ba33'
+md5sums=('74ce9b24516885d066ec4287cde52e8c'
          '7ac0c1936547f4278198b8bf7725204d')
 url="http://www.sbcl.org/"
 install=sbcl.install
diff --git a/extra/skanlite/PKGBUILD b/extra/skanlite/PKGBUILD
index 6e64a82e4..0014d99c7 100644
--- a/extra/skanlite/PKGBUILD
+++ b/extra/skanlite/PKGBUILD
@@ -1,21 +1,21 @@
-# $Id: PKGBUILD 101716 2010-11-30 22:05:56Z andrea $
+# $Id: PKGBUILD 133044 2011-07-27 07:39:38Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=skanlite
 pkgver=0.7
-pkgrel=1
+pkgrel=2
 pkgdesc="Image Scanning Application for KDE"
 arch=('i686' 'x86_64')
 url='http://kde-apps.org/content/show.php?content=109803'
 license=('GPL')
-depends=('kdegraphics-libs')
-makedepends=('pkgconfig' 'cmake' 'automoc4' 'docbook-xsl')
+depends=('kdebase-runtime' 'libksane')
+makedepends=('pkgconfig' 'cmake' 'automoc4')
 source=("http://downloads.sourceforge.net/sanewidget/${pkgname}-${pkgver}.tar.bz2")
 md5sums=('cb256c392210c43d51e317c6a5ba9ad2')
 
 build() {
-  cd ${srcdir}
+  cd "${srcdir}"
   mkdir build
   cd build
   cmake ../${pkgname}-${pkgver} \
@@ -25,6 +25,6 @@ build() {
 }
 
 package() {
-  cd ${srcdir}/build
-  make DESTDIR=${pkgdir} install
+  cd "${srcdir}"/build
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/slv2/PKGBUILD b/extra/slv2/PKGBUILD
index c57af2dde..3005cd313 100644
--- a/extra/slv2/PKGBUILD
+++ b/extra/slv2/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 120979 2011-04-27 19:40:32Z andrea $
+# $Id: PKGBUILD 131701 2011-07-13 15:39:04Z schiv $
 # Maintainer: Ray Rashif <schiv@archlinux.org>
 # Contributor: Leslie P. Polzer <polzer@stardawn.org>
 
 pkgname=slv2
 pkgver=0.6.6
-pkgrel=4
+pkgrel=6
 pkgdesc="Library for LV2 hosts"
 arch=('i686' 'x86_64')
 url="http://drobilla.net/software/slv2"
 license=('GPL')
-depends=('redland>=1.0.12' 'lv2core' 'jack')
+depends=('redland>=1.0.13' 'lv2core' 'jack')
 makedepends=('python2')
 install=$pkgname.install
 changelog=$pkgname.changelog
diff --git a/extra/sonata/ChangeLog b/extra/sonata/ChangeLog
index b83211d02..8311a287c 100644
--- a/extra/sonata/ChangeLog
+++ b/extra/sonata/ChangeLog
@@ -1,3 +1,7 @@
+2011-07-26  Angel Velasquez <angvp@archlinux.org>
+  * sonata 1.6.2.1-7:
+  Applied patch to pull lyrics FS#25036
+
 2009-03-30  Alexander Fehr  <pizzapunk gmail com>
 
   * sonata-1.6-1:
diff --git a/extra/sonata/PKGBUILD b/extra/sonata/PKGBUILD
index 29c426a11..416352778 100644
--- a/extra/sonata/PKGBUILD
+++ b/extra/sonata/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 112050 2011-03-03 12:31:43Z angvp $
+# $Id: PKGBUILD 132792 2011-07-26 09:02:50Z angvp $
 # Maintainer: Angel Velasquez <angvp@archlinux.org> 
 # Contributor: William Rea <sillywilly@gmail.com>
 
 pkgname=sonata
 pkgver=1.6.2.1
-pkgrel=5
+pkgrel=7
 pkgdesc="Elegant GTK+ music client for MPD"
 arch=('i686' 'x86_64')
 url="http://sonata.berlios.de/"
@@ -12,12 +12,19 @@ license=('GPL3')
 depends=('pygtk' 'python-mpd')
 optdepends=('gnome-python-extras: Enhanced system tray support'
             'tagpy: Metadata editing support'
-            'zsi: Lyrics fetching support'
             'dbus-python: Various extra functionality (e.g. multimedia keys support)')
-source=(http://download.berlios.de/${pkgname}/${pkgname}-$pkgver.tar.gz)
-md5sums=('0b912325e7175abad3bf6c0edc071e05')
+source=(http://download.berlios.de/${pkgname}/${pkgname}-$pkgver.tar.gz
+        info.py.patch)
+changelog=ChangeLog
+md5sums=('0b912325e7175abad3bf6c0edc071e05'
+         '595fcf7615035829b264afecb5a1beeb')
 
 build() {
   cd "$srcdir/${pkgname}-$pkgver"
-  python2 setup.py install --prefix=/usr --root="$pkgdir"
+  patch -Np0 -i $srcdir/info.py.patch
+}
+
+package() {
+  cd "$srcdir/${pkgname}-$pkgver"
+  python2 setup.py install --prefix=/usr --optimize 1 --root="$pkgdir"
 }
diff --git a/extra/sonata/info.py.patch b/extra/sonata/info.py.patch
new file mode 100644
index 000000000..e95cc3a08
--- /dev/null
+++ b/extra/sonata/info.py.patch
@@ -0,0 +1,15 @@
+--- sonata/info.py	2011-07-05 22:32:08.452556016 -0500
++++ sonata/info.py	2011-07-05 22:45:50.849311466 -0500
+@@ -393,9 +393,9 @@
+ 				if content.startswith("#REDIRECT [["):
+ 					addr = "http://lyricwiki.org/index.php?title=%s&action=edit" % urllib.quote(content.split("[[")[1].split("]]")[0])
+ 					content = urllib.urlopen(addr).read()
+-				lyrics = content.split("&lt;lyrics&gt;")[1].split("&lt;/lyrics&gt;")[0]
+-				if lyrics.strip() != "&lt;!-- PUT LYRICS HERE (and delete this entire line) --&gt;":
+-					lyrics = misc.unescape_html(lyrics)
++				content = misc.unescape_html(content)
++				lyrics = content.split("<lyrics>")[1].split("</lyrics>")[0].strip()
++				if lyrics.strip() != "<!-- PUT LYRICS HERE (and delete this entire line) -->":
+ 					lyrics = misc.wiki_to_html(lyrics)
+ 					lyrics = lyrics.decode("utf-8")
+ # Save lyrics to file:
diff --git a/extra/soprano/PKGBUILD b/extra/soprano/PKGBUILD
index 698851fbd..fd610c59d 100644
--- a/extra/soprano/PKGBUILD
+++ b/extra/soprano/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 130173 2011-07-02 23:43:27Z andrea $
+# $Id: PKGBUILD 133416 2011-07-27 23:26:32Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=soprano
-pkgver=2.6.50git20110703
+pkgver=2.6.50git20110728
 pkgrel=1
 pkgdesc='A library which provides a highly usable object-oriented C++/Qt4 framework for RDF data'
 arch=('i686' 'x86_64')
@@ -12,8 +12,8 @@ license=('GPL' 'LGPL')
 depends=('qt' 'redland-storage-virtuoso' 'libiodbc' 'virtuoso')
 makedepends=('cmake' 'openjdk6' 'doxygen')
 #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')
+source=("${pkgname}-${pkgver}.tar.bz2"::"http://quickgit.kde.org/?p=soprano.git&a=snapshot&h=a2f8207cc83fb33253d548eaca8029c8f836addf&fmt=tbz2")
+md5sums=('1d7f99d7d5954fc88e4f7653aa89862e')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/source-highlight/PKGBUILD b/extra/source-highlight/PKGBUILD
index 144077a2b..c80a86f16 100644
--- a/extra/source-highlight/PKGBUILD
+++ b/extra/source-highlight/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 124988 2011-05-25 16:07:54Z ibiru $
+# $Id: PKGBUILD 133028 2011-07-26 22:29:32Z eric $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
 
 pkgname=source-highlight
 pkgver=3.1.4
-pkgrel=3
+pkgrel=4
 pkgdesc="Convert source code to syntax highlighted document"
 arch=('i686' 'x86_64')
 url="http://www.gnu.org/software/src-highlite/"
@@ -29,5 +29,4 @@ package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
   make prefix="${pkgdir}/usr" install
-  rm -rf ${pkgdir}/usr/share/info/dir
 }
diff --git a/extra/source-highlight/source-highlight.install b/extra/source-highlight/source-highlight.install
index fb764f5ed..4fd1b3005 100644
--- a/extra/source-highlight/source-highlight.install
+++ b/extra/source-highlight/source-highlight.install
@@ -1,4 +1,4 @@
-info_dir=/usr/share/info
+info_dir=usr/share/info
 info_files=(source-highlight.info source-highlight-lib.info)
 
 post_install() {
diff --git a/extra/system-config-printer/PKGBUILD b/extra/system-config-printer/PKGBUILD
index 5fa94711d..c36f18834 100644
--- a/extra/system-config-printer/PKGBUILD
+++ b/extra/system-config-printer/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 131906 2011-07-17 09:25:51Z andrea $
+# $Id: PKGBUILD 134084 2011-08-01 10:53:11Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgbase=system-config-printer
 pkgname=('system-config-printer-common'
 	'system-config-printer-gnome')
-pkgver=1.3.4
+pkgver=1.3.5
 pkgrel=1
 pkgdesc="A CUPS printer configuration tool and status applet"
 url="http://cyberelk.net/tim/software/system-config-printer/"
@@ -12,7 +12,7 @@ arch=('i686' 'x86_64')
 license=('GPL')
 makedepends=('intltool' 'python2' 'xmlto' 'docbook-xsl' 'desktop-file-utils' 'libcups' 'libxml2')
 source=("http://cyberelk.net/tim/data/${pkgbase}/1.3/${pkgbase}-${pkgver}.tar.xz")
-md5sums=('8e4b1b1fd078c09769708f09b77cb3ed')
+md5sums=('9d806643f17dc65a492a1d4e8a60f2ec')
 
 build() {
   cd "${srcdir}"/${pkgbase}-${pkgver}
diff --git a/extra/telepathy-gabble/PKGBUILD b/extra/telepathy-gabble/PKGBUILD
index bd6d48600..f2ccb3dd3 100644
--- a/extra/telepathy-gabble/PKGBUILD
+++ b/extra/telepathy-gabble/PKGBUILD
@@ -1,26 +1,26 @@
-# $Id: PKGBUILD 129881 2011-06-29 11:16:17Z ibiru $
+# $Id: PKGBUILD 133089 2011-07-27 19:11:28Z ibiru $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: Daniel Balieiro <daniel@balieiro.com>
 # Contributor: Rodrigo L. M. Flores <mail@rodrigoflores.org>
 pkgname=telepathy-gabble
-pkgver=0.12.3
+pkgver=0.12.4
 pkgrel=1
 pkgdesc="A Jabber/XMPP connection manager for Telepathy"
 arch=('i686' 'x86_64')
 url="http://telepathy.freedesktop.org"
 groups=('telepathy')
 license=('LGPL2.1')
-depends=('telepathy-glib' 'libsoup' 'libnice' 'util-linux' 'sqlite3')
+depends=('telepathy-glib' 'libsoup' 'libnice' 'sqlite3')
 makedepends=('libxslt' 'python2')
 options=('!libtool')
 source=(http://telepathy.freedesktop.org/releases/telepathy-gabble/${pkgname}-${pkgver}.tar.gz)
 install=telepathy-gabble.install
-md5sums=('07d927f1299dbb6bb7ca91ee9dce5d1c')
+md5sums=('428962565d568667d3ff1aa7eee3da51')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr \
-  	--libexecdir=/usr/lib/telepathy --with-tls=openssl
+  PYTHON=/usr/bin/python2 ./configure --prefix=/usr \
+  	--libexecdir=/usr/lib/telepathy
   make
 }
 
diff --git a/extra/telepathy-glib/PKGBUILD b/extra/telepathy-glib/PKGBUILD
index 27b968574..f747b1f60 100644
--- a/extra/telepathy-glib/PKGBUILD
+++ b/extra/telepathy-glib/PKGBUILD
@@ -1,9 +1,10 @@
-# $Id: PKGBUILD 132254 2011-07-22 09:07:47Z ibiru $
+# $Id: PKGBUILD 132830 2011-07-26 12:42:33Z andrea $
 # Maintainer:  Ionut Biru <ibiru@archlinux.org>
 # Contributor: Kessia 'even' Pinheiro <kessiapinheiro at gmail.com
 # Contributor: Bjorn Lindeijer <bjorn lindeijer nl>
+
 pkgname=telepathy-glib
-pkgver=0.14.9
+pkgver=0.15.4
 pkgrel=1
 pkgdesc="GLib bindings for the Telepathy D-Bus protocol"
 arch=('i686' 'x86_64')
@@ -14,7 +15,7 @@ options=('!libtool' '!emptydirs')
 depends=('dbus-glib')
 makedepends=('libxslt' 'vala' 'gobject-introspection')
 source=("http://telepathy.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz")
-md5sums=('212335854fa14b9d6319525ec7546d2f')
+md5sums=('87521a782de115f938787dc17fe158e1')
 
 build() {
     cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/telepathy-kde-accounts-kcm-plugins/PKGBUILD b/extra/telepathy-kde-accounts-kcm-plugins/PKGBUILD
new file mode 100644
index 000000000..52c88c6b8
--- /dev/null
+++ b/extra/telepathy-kde-accounts-kcm-plugins/PKGBUILD
@@ -0,0 +1,34 @@
+# $Id$
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+# Contributor: Laurent Carlier <lordheavym@gmail.com>
+
+pkgname=telepathy-kde-accounts-kcm-plugins
+pkgver=0.1.0
+pkgrel=1
+pkgdesc="Plugins for protocol-specific UI's in the Telepathy Accounts KCM"
+arch=('i686' 'x86_64')
+url="http://www.kde.org"
+license=('GPL')
+depends=('telepathy-kde-accounts-kcm')
+makedepends=('cmake' 'automoc4')
+optdepends=('telepathy-gabble: XMPP/Jabber/GTalk support'
+            'telepathy-butterfly: MSN/Windows Live support'
+            'telepathy-haze: all protocols supported by libpurple')
+groups=('telepathy-kde')
+source=("http://download.kde.org/unstable/telepathy-kde/${pkgver}/src/${pkgname}_${pkgver}.tar.bz2")
+sha1sums=('340202386d0e0e8e0f18fb3cb856a9055fc200a5')
+
+build() {
+  cd "${srcdir}"
+  mkdir build
+  cd build
+  cmake ../${pkgname}_${pkgver} \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_BUILD_TYPE=Release
+  make
+}
+
+package() {
+  cd "${srcdir}"/build
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/extra/telepathy-kde-accounts-kcm/PKGBUILD b/extra/telepathy-kde-accounts-kcm/PKGBUILD
new file mode 100644
index 000000000..f92cfc332
--- /dev/null
+++ b/extra/telepathy-kde-accounts-kcm/PKGBUILD
@@ -0,0 +1,31 @@
+# $Id$
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+# Contributor: Laurent Carlier <lordheavym@gmail.com>
+
+pkgname=telepathy-kde-accounts-kcm
+pkgver=0.1.0
+pkgrel=1
+pkgdesc="KCM Module for configuring Telepathy Instant Messaging Accounts"
+arch=('i686' 'x86_64')
+url="http://www.kde.org"
+license=('GPL')
+depends=('kdelibs' 'telepathy-qt4' 'telepathy-mission-control')
+makedepends=('cmake' 'automoc4')
+groups=('telepathy-kde')
+source=("http://download.kde.org/unstable/telepathy-kde/${pkgver}/src/${pkgname}_${pkgver}.tar.bz2")
+sha1sums=('23c1d3289ecaf4b4361d0ed324a7044cccfae801')
+
+build() {
+  cd "${srcdir}"
+  mkdir build
+  cd build
+  cmake ../${pkgname}_${pkgver} \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_BUILD_TYPE=Release
+  make
+}
+
+package() {
+  cd "${srcdir}"/build
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/extra/telepathy-kde-approver/PKGBUILD b/extra/telepathy-kde-approver/PKGBUILD
new file mode 100644
index 000000000..631f41f97
--- /dev/null
+++ b/extra/telepathy-kde-approver/PKGBUILD
@@ -0,0 +1,31 @@
+# $Id$
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+# Contributor: Laurent Carlier <lordheavym@gmail.com>
+
+pkgname=telepathy-kde-approver
+pkgver=0.1.0
+pkgrel=1
+pkgdesc="KDE Channel Approver for Telepathy"
+arch=('i686' 'x86_64')
+url="http://www.kde.org"
+license=('GPL')
+depends=('kdelibs' 'telepathy-qt4')
+makedepends=('cmake' 'automoc4')
+groups=('telepathy-kde')
+source=("http://download.kde.org/unstable/telepathy-kde/${pkgver}/src/${pkgname}_${pkgver}.tar.bz2")
+sha1sums=('ca4bb9d817354e50af18072736843b961a5dc916')
+
+build() {
+  cd "${srcdir}"
+  mkdir build
+  cd build
+  cmake ../${pkgname}_${pkgver} \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_BUILD_TYPE=Release
+  make
+}
+
+package() {
+  cd "${srcdir}"/build
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/extra/telepathy-kde-contact-list/PKGBUILD b/extra/telepathy-kde-contact-list/PKGBUILD
new file mode 100644
index 000000000..31df73c28
--- /dev/null
+++ b/extra/telepathy-kde-contact-list/PKGBUILD
@@ -0,0 +1,32 @@
+# $Id$
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+# Contributor: Laurent Carlier <lordheavym@gmail.com>
+
+pkgname=telepathy-kde-contact-list
+pkgver=0.1.0
+pkgrel=1
+pkgdesc="Telepathy contact list application "
+arch=('i686' 'x86_64')
+url="http://www.kde.org"
+license=('GPL')
+depends=('kdebase-runtime' 'telepathy-qt4')
+makedepends=('cmake' 'automoc4')
+groups=('telepathy-kde')
+install=${pkgname}.install
+source=("http://download.kde.org/unstable/telepathy-kde/${pkgver}/src/${pkgname}_${pkgver}.tar.bz2")
+sha1sums=('1875f88842568f800e08d7d1b391d05152834b3b')
+
+build() {
+  cd "${srcdir}"
+  mkdir build
+  cd build
+  cmake ../${pkgname}_${pkgver} \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_BUILD_TYPE=Release
+  make
+}
+
+package() {
+  cd "${srcdir}"/build
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/extra/telepathy-kde-contact-list/telepathy-kde-contact-list.install b/extra/telepathy-kde-contact-list/telepathy-kde-contact-list.install
new file mode 100644
index 000000000..c0797237a
--- /dev/null
+++ b/extra/telepathy-kde-contact-list/telepathy-kde-contact-list.install
@@ -0,0 +1,11 @@
+post_install() {
+    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+}
+
+post_upgrade() {
+    post_install
+}
+
+post_remove() {
+    post_install
+}
diff --git a/extra/telepathy-kde-filetransfer-handler/PKGBUILD b/extra/telepathy-kde-filetransfer-handler/PKGBUILD
new file mode 100644
index 000000000..e76a0f9ec
--- /dev/null
+++ b/extra/telepathy-kde-filetransfer-handler/PKGBUILD
@@ -0,0 +1,30 @@
+# $Id$
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+
+pkgname=telepathy-kde-filetransfer-handler
+pkgver=0.1.0
+pkgrel=1
+pkgdesc="Telepathy file transfer handler"
+arch=('i686' 'x86_64')
+url="http://www.kde.org"
+license=('GPL')
+depends=('kdebase-runtime' 'telepathy-qt4')
+makedepends=('cmake' 'automoc4')
+groups=('telepathy-kde')
+source=("http://download.kde.org/unstable/telepathy-kde/${pkgver}/src/${pkgname}_${pkgver}.tar.bz2")
+sha1sums=('050eb79ee5a24a102512cf4dbef18b4bf8eb5b50')
+
+build() {
+  cd "${srcdir}"
+  mkdir build
+  cd build
+  cmake ../${pkgname}_${pkgver} \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_BUILD_TYPE=Release
+  make
+}
+
+package() {
+  cd "${srcdir}"/build
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/extra/telepathy-kde-presence-dataengine/PKGBUILD b/extra/telepathy-kde-presence-dataengine/PKGBUILD
new file mode 100644
index 000000000..e022f4748
--- /dev/null
+++ b/extra/telepathy-kde-presence-dataengine/PKGBUILD
@@ -0,0 +1,31 @@
+# $Id$
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+# Contributor: Laurent Carlier <lordheavym@gmail.com>
+
+pkgname=telepathy-kde-presence-dataengine
+pkgver=0.1.0
+pkgrel=1
+pkgdesc="Plasma dataengine for managing Telepathy account presence"
+arch=('i686' 'x86_64')
+url="http://www.kde.org"
+license=('GPL')
+depends=('kdebase-plasma' 'telepathy-qt4')
+makedepends=('cmake' 'automoc4')
+groups=('telepathy-kde')
+source=("http://download.kde.org/unstable/telepathy-kde/${pkgver}/src/${pkgname}_${pkgver}.tar.bz2")
+sha1sums=('afaf16ce63eef9c9a4cdb06b1e88e62f887094bd')
+
+build() {
+  cd "${srcdir}"
+  mkdir build
+  cd build
+  cmake ../${pkgname}_${pkgver} \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_BUILD_TYPE=Release
+  make
+}
+
+package() {
+  cd "${srcdir}"/build
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/extra/telepathy-kde-send-file/PKGBUILD b/extra/telepathy-kde-send-file/PKGBUILD
new file mode 100644
index 000000000..777c2ace0
--- /dev/null
+++ b/extra/telepathy-kde-send-file/PKGBUILD
@@ -0,0 +1,31 @@
+# $Id$
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+
+pkgname=telepathy-kde-send-file
+pkgver=0.1.0
+pkgrel=1
+pkgdesc="A File manager plugin to launch a file transfer job with a specified contact"
+arch=('i686' 'x86_64')
+url="http://www.kde.org"
+license=('GPL')
+depends=('telepathy-kde-filetransfer-handler')
+makedepends=('cmake' 'automoc4')
+groups=('telepathy-kde')
+install=${pkgname}.install
+source=("http://download.kde.org/unstable/telepathy-kde/${pkgver}/src/${pkgname}_${pkgver}.tar.bz2")
+sha1sums=('ef49d3008294a6eacad846fbe1c042d59c5c8e69')
+
+build() {
+  cd "${srcdir}"
+  mkdir build
+  cd build
+  cmake ../${pkgname}_${pkgver} \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_BUILD_TYPE=Release
+  make
+}
+
+package() {
+  cd "${srcdir}"/build
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/extra/telepathy-kde-send-file/telepathy-kde-send-file.install b/extra/telepathy-kde-send-file/telepathy-kde-send-file.install
new file mode 100644
index 000000000..78681144b
--- /dev/null
+++ b/extra/telepathy-kde-send-file/telepathy-kde-send-file.install
@@ -0,0 +1,11 @@
+post_install() {
+    update-desktop-database -q
+}
+
+post_update() {
+    post_install
+}
+
+post_remove() {
+    post_install
+}
diff --git a/extra/telepathy-kde-text-ui/PKGBUILD b/extra/telepathy-kde-text-ui/PKGBUILD
new file mode 100644
index 000000000..9996d0e96
--- /dev/null
+++ b/extra/telepathy-kde-text-ui/PKGBUILD
@@ -0,0 +1,31 @@
+# $Id$
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+# Contributor: Laurent Carlier <lordheavym@gmail.com>
+
+pkgname=telepathy-kde-text-ui
+pkgver=0.1.0
+pkgrel=1
+pkgdesc="Telepathy text chat handler"
+arch=('i686' 'x86_64')
+url="http://www.kde.org"
+license=('GPL')
+depends=('kdebase-runtime' 'telepathy-qt4')
+makedepends=('cmake' 'automoc4')
+groups=('telepathy-kde')
+source=("http://download.kde.org/unstable/telepathy-kde/${pkgver}/src/${pkgname}_${pkgver}.tar.bz2")
+sha1sums=('3a9a174acd5b955618a74761a380e951c6dce48a')
+
+build() {
+  cd "${srcdir}"
+  mkdir build
+  cd build
+  cmake ../${pkgname}_${pkgver} \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_BUILD_TYPE=Release
+  make
+}
+
+package() {
+  cd "${srcdir}"/build
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/extra/telepathy-qt4/PKGBUILD b/extra/telepathy-qt4/PKGBUILD
index e3e65a267..6709092ea 100644
--- a/extra/telepathy-qt4/PKGBUILD
+++ b/extra/telepathy-qt4/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 126269 2011-06-03 14:35:07Z ibiru $
+# $Id: PKGBUILD 132835 2011-07-26 13:03:28Z andrea $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=telepathy-qt4
-pkgver=0.6.1
+pkgver=0.7.1
 pkgrel=1
 pkgdesc="A library for Qt-based Telepathy clients"
 arch=('i686' 'x86_64')
@@ -11,9 +11,9 @@ url="http://telepathy.freedesktop.org/wiki/"
 license=('LGPL')
 options=('!libtool')
 depends=('qt' 'telepathy-farsight')
-makedepends=('libxslt' 'python2' 'cmake')
+makedepends=('libxslt' 'python2' 'cmake' 'doxygen')
 source=("http://telepathy.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz")
-md5sums=('c429458a365f5114bbc9ea3fc971fc45')
+md5sums=('a609c6e9638e8cf24134b2165fec1c8a')
 
 build() {
     cd "${srcdir}"
diff --git a/extra/udisks/PKGBUILD b/extra/udisks/PKGBUILD
index 29fcaf5b7..2175233cf 100644
--- a/extra/udisks/PKGBUILD
+++ b/extra/udisks/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 132471 2011-07-24 17:40:16Z giovanni $
+# $Id: PKGBUILD 133589 2011-07-29 19:10:42Z giovanni $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=udisks
 pkgver=1.0.3
-pkgrel=5
+pkgrel=6
 pkgdesc="Disk Management Service"
 arch=('i686' 'x86_64')
 url="http://www.freedesktop.org/wiki/Software/udisks"
diff --git a/extra/uim/PKGBUILD b/extra/uim/PKGBUILD
index 67055a5d1..b7782644e 100644
--- a/extra/uim/PKGBUILD
+++ b/extra/uim/PKGBUILD
@@ -1,29 +1,35 @@
-# $Id: PKGBUILD 124164 2011-05-17 08:27:15Z bisson $
+# $Id: PKGBUILD 133084 2011-07-27 18:50:53Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: damir <damir@archlinux.org>
 
 pkgname=uim
-pkgver=1.7.0
+pkgver=1.7.1
 pkgrel=1
 pkgdesc='Multilingual input method library'
 arch=('i686' 'x86_64')
 url='http://code.google.com/p/uim/'
 license=('custom:BSD')
-depends=('gtk2' 'libxft' 'libedit' 'anthy' 'm17n-lib')
-makedepends=('intltool' 'gettext' 'gnome-panel')
-optdepends=('gnome-panel: gnome applet indicator')
+depends=('libxft' 'libedit' 'anthy' 'm17n-lib')
+makedepends=('intltool' 'gettext' 'qt' 'gtk2' 'gtk3' 'gnome-panel')
+optdepends=('qt: immodule and helper applications'
+            'gtk2: immodule and helper applications'
+            'gtk3: immodules and helper applications'
+            'gnome-panel: gnome applet indicator')
 options=('!libtool')
 source=("http://uim.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('b79ed80c2557e804e6d3d2771a213a29cd932a73')
+sha1sums=('9001955f9efbd3cf23c9ad62c027f44060553fa8')
 
 install=install
 
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
+
 	./configure \
 		--prefix=/usr \
 		--libexecdir=/usr/lib/uim \
-		--with-anthy-utf8
+		--with-anthy-utf8 \
+		--with-qt4 \
+
 	make
 }
 
diff --git a/extra/uim/install b/extra/uim/install
index a2d5e00e6..83a9cf391 100644
--- a/extra/uim/install
+++ b/extra/uim/install
@@ -1,7 +1,6 @@
 post_install() {
-	echo -n "updating gtk.immodules... "
-	usr/bin/gtk-query-immodules-2.0 > etc/gtk-2.0/gtk.immodules
-	echo "done."
+	[[ -x usr/bin/gtk-query-immodules-2.0 ]] && usr/bin/gtk-query-immodules-2.0 > etc/gtk-2.0/gtk.immodules
+	[[ -x usr/bin/gtk-query-immodules-3.0 ]] && usr/bin/gtk-query-immodules-3.0 > usr/lib/gtk-3.0/3.0.0/immodules.cache
 }
 
 post_upgrade() {
diff --git a/extra/vim/PKGBUILD b/extra/vim/PKGBUILD
index 603de624a..69e156492 100644
--- a/extra/vim/PKGBUILD
+++ b/extra/vim/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 125313 2011-05-25 20:09:55Z heftig $
+# $Id: PKGBUILD 133479 2011-07-28 14:12:10Z heftig $
 # Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com>
 # Maintainer: tobias [ tobias at archlinux org ]
 # Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
@@ -6,9 +6,9 @@
 pkgbase=vim
 pkgname=(vim gvim vim-runtime)
 _topver=7.3
-_patchlevel=206
+_patchlevel=266
 pkgver=${_topver}.${_patchlevel}
-__hgrev=e9538cfd0d9c
+__hgrev=124a81f12ca4
 pkgrel=1
 arch=('i686' 'x86_64')
 license=('custom:vim')
@@ -20,7 +20,7 @@ source=(pythoncomplete.vim::http://www.vim.org/scripts/download_script.php\?src_
 md5sums=('6e7adfbd5d26c1d161030ec203a7f243'
          'e57777374891063b9ca48a1fe392ac05'
          '10353a61aadc3f276692d0e17db1478e'
-         '4b83e5fe0e534c53daaba91dd1cd4cbb')
+         '63558c0b3509caea0d0f2b9274049c2a')
 
 __hgroot='http://vim.googlecode.com/hg/'
 __hgrepo='vim'
diff --git a/extra/vim/gvim.desktop b/extra/vim/gvim.desktop
index 56fd61b8f..4f0d294ed 100644
--- a/extra/vim/gvim.desktop
+++ b/extra/vim/gvim.desktop
@@ -1,42 +1,64 @@
 [Desktop Entry]
-Encoding=UTF-8
-Version=1.0
-Name=gVim
-Name[eo]=VIM-fasado
-Name[sv]=gVim
-Name[xx]=xx
-Comment=GTK2 enhanced vim text editor
-Comment[ar]=محرر نصوص
-Comment[bg]=Текст Редактор
-Comment[de]=Texteditor
-Comment[el]=Διορθωτής Κειμένου
-Comment[eo]=Tekstredaktilo
-Comment[et]=Tekstiredaktor
-Comment[eu]=Testu Editorea
-Comment[fi]=Tekstieditori
-Comment[he]=עורך טקסט
-Comment[is]=Textaritill
-Comment[ja]=テキストエディタ
-Comment[lt]=Teksto redaktorius
-Comment[mt]=Editur tat-test
-Comment[pt_BR]=Editor de Texto
-Comment[ro]=Editor de text
-Comment[ru]=редактор
-Comment[sk]=Textový editor
-Comment[sl]=Urejevalnik besedil
-Comment[ta]=¯¨Ã ¦¾¡ÌôÀ¡Ç÷
-Comment[tr]=Metin Düzenleyici
-Comment[uk]=Редактор текстів
-Comment[vi]=Trình soạn văn bản
-Comment[xx]=xx
-Comment[zh_CN]=文本编辑器
-Comment[zh_TW]=文字編輯器
-GenericName=Text Editor
-Type=Application
-TryExec=gvim
-Exec=gvim %u
+Name=Vi IMproved
+Name[bg]=Vi Ðåäàêòîð
+Name[ca]=Vi Millorat
+Name[da]=Vi forbedret
+Name[eo]=VIM
+Name[et]=Täiustatud Vi (vim)
+Name[fr]=Vi étendu (VIM)
+Name[he]=רפושמ Vi
+Name[hu]=Vi
+Name[is]=Vi IMproved ritillinn
+Name[it]=Vi iMproved
+Name[no]=Vi IMproved (forbedret VI)
+Name[pl]=Poprawiony VI (vim)
+Name[ro]=VIM
+Name[ru]=Улучшенный VI
+Name[sk]=Vi IMpreved
+Name[sl]=Izboljšani vi (vim)
+Name[sv]=Förbättrad Vi
+Name[zh_CN.GB2312]=改进的 Vi
+Comment=Powerful text editor with scripting functions and macro recorder
+Comment[bg]=Ðåäàêòîð ñ ìíîãî âúçìîæíîñòè
+Comment[ca]=Editor vi potent
+Comment[cs]=Mocný textový editor vi
+Comment[da]=En kraftig vi tekstbehandler
+Comment[de]=Ein leistungsfähiger vi-Editor
+Comment[el]=Πανίσχυρος διορθωτής vi
+Comment[eo]=VIM similas al redaktilo "vi", sed havas aldonajn ecojn
+Comment[es]=Una versión mejorada del editor vi
+Comment[et]=Võimas tekstiredaktor vi
+Comment[fi]=Tehokas vi-tekstieditori
+Comment[fr]=Éditeur vi puissant
+Comment[gl]=Potente editor vi
+Comment[he]=Vi המצועה בר ךרועה
+Comment[hr]=Napredni vi uređivač
+Comment[hu]=Vi szövegszerkesztő
+Comment[is]=Öflug útgáfa vi ritilsins
+Comment[it]=Un editor vi potenziato
+Comment[ja]=強力なViエディタ
+Comment[lt]=Galingas vi redaktorius
+Comment[mk]=Моќен VI уредувач
+Comment[nl]=Krachtige vi-editor
+Comment[no]=En kraftig vi-redigerer
+Comment[no_NY]=Kraftig vi-tekstredigeringsprogram
+Comment[pl]=Edytor vi
+Comment[pt]=Um poderoso editor de texto
+Comment[ro]=Un editor de texte VI, puternic
+Comment[ru]=Мощный текстовый редактор vi
+Comment[sk]=Silný textový procesor vi
+Comment[sl]=Zmogljivi urejevalnik vi
+Comment[sr]=Moćni vi editor
+Comment[sv]=En kraftfull texteditor
+Comment[ta]=ºì¾¢Å¡öó¾ vi ¦¾¡ÌôÀ¡Ç÷
+Comment[tr]=Güçlü vi düzenleyicisi
+Comment[uk]=Потужний редактор vi
+Comment[zh_CN.GB2312]=功能强大的 vi 编辑器
+MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++;
+Exec=gvim -f %F
 Icon=gvim
-Terminal=false
-X-MultipleArgs=false
-Categories=GTK;Application;Utility;TextEditor;
-MimeType=application/mathml+xml;application/xhtml+xml;application/x-perl;application/x-python;application/x-shellscript;audio/x-mpegurl;audio/x-scpls;image/svg+xml;message/news;message/rfc822;text/calendar;text/css;text/english;text/html;text/mrml;text/plain;text/rdf;text/rss;text/rtf;text/sgml;text/vnd.wap.wml;text/x-adasrc;text/x-bibtex;text/x-chdr;text/x-c++hdr;text/x-csrc;text/x-c++src;text/x-c;text/x-objc;text/x-csv;text/x-diff;text/x-java;text/x-katefilelist;text/x-latex;text/x-log;text/x-lyx;text/x-makefile;text/xmcd;text/xml;text/x-moc;text/x-mswinurl;text/x-objcsrc;text/x-pascal;text/x-perl;text/x-php;text/x-php-source;text/x-python;text/x-tcl;text/x-tex;text/x-vcalendar;text/x-vcard;text/x-xslfo;text/x-xslt;
+Type=Application
+Terminal=0
+X-XClassHintResName=VIM
+MapNotify=false
+Categories=Utility;TextEditor;
diff --git a/extra/vlc/PKGBUILD b/extra/vlc/PKGBUILD
index 7dc877239..27ef0826e 100644
--- a/extra/vlc/PKGBUILD
+++ b/extra/vlc/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 132018 2011-07-19 08:30:36Z giovanni $
+# $Id: PKGBUILD 133933 2011-07-30 16:56:22Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
 # Contributor: Martin Sandsmark <martin.sandsmark@kde.org>
 
 pkgname=vlc
 pkgver=1.1.11
-pkgrel=2
+pkgrel=3
 pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player"
 arch=('i686' 'x86_64')
 url="http://www.videolan.org/vlc/"
@@ -32,6 +32,10 @@ optdepends=('avahi: for service discovery using bonjour protocol'
             'libpulse: PulseAudio support')
 conflicts=('vlc-plugin')
 replaces=('vlc-plugin')
+backup=('usr/share/vlc/http/.hosts'
+        'usr/share/vlc/http/dialogs/.hosts'
+        'usr/share/vlc/lua/http/.hosts'
+        'usr/share/vlc/lua/http/dialogs/.hosts')
 options=('!libtool')
 install=vlc.install
 source=("http://download.videolan.org/pub/videolan/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2")
diff --git a/extra/wesnoth/PKGBUILD b/extra/wesnoth/PKGBUILD
index 67a9f56de..bdac470ae 100644
--- a/extra/wesnoth/PKGBUILD
+++ b/extra/wesnoth/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 125126 2011-05-25 17:01:35Z ibiru $
+# $Id: PKGBUILD 132797 2011-07-26 09:16:15Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: Jacobo Arvelo <unix4all@ya.com>
@@ -6,7 +6,7 @@
 
 pkgname=wesnoth
 pkgver=1.8.6
-pkgrel=1
+pkgrel=2
 pkgdesc="A turn-based strategy game on a fantasy world"
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -15,13 +15,16 @@ depends=('sdl_ttf' 'sdl_net' 'sdl_mixer' 'sdl_image' 'fribidi' 'boost-libs' 'pan
 makedepends=('boost')
 install=wesnoth.install
 source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2
-        wesnoth-libpng-1.4.0.patch)
+        wesnoth-libpng-1.4.0.patch
+        wesnoth-1.8.6-boost-foreach.patch)
 md5sums=('f1c3179869b01b61e253e74aeb241034'
-         'ca7412ffc4682ef55ddf82d56b0e2f08')
+         'ca7412ffc4682ef55ddf82d56b0e2f08'
+         'dc414ab7e1334941548e9db6db9c2460')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i ../wesnoth-libpng-1.4.0.patch
+  patch -Np1 -i "${srcdir}/wesnoth-libpng-1.4.0.patch"
+  patch -Np1 -i "${srcdir}/wesnoth-1.8.6-boost-foreach.patch"
   ./autogen.sh
   ./configure --prefix=/usr --localstatedir=/var --enable-tools --enable-editor --enable-server
   make DESTDIR="${pkgdir}" install-exec
diff --git a/extra/wesnoth/wesnoth-1.8.6-boost-foreach.patch b/extra/wesnoth/wesnoth-1.8.6-boost-foreach.patch
new file mode 100644
index 000000000..5aee3118c
--- /dev/null
+++ b/extra/wesnoth/wesnoth-1.8.6-boost-foreach.patch
@@ -0,0 +1,70 @@
+--- wesnoth-1.8.6/src/gui/widgets/tree_view_node.cpp~	2011-07-21 23:05:56.594879049 +0200
++++ wesnoth-1.8.6/src/gui/widgets/tree_view_node.cpp	2011-07-21 23:28:07.540358742 +0200
+@@ -238,6 +238,17 @@ void ttree_view_node::clear()
+ 
+ struct ttree_view_node_implementation
+ {
++	template<class W, class It>
++	static W* find_at_aux(It begin, It end,
++			      const tpoint& coordinate, const bool must_be_active) {
++		for (It it = begin; it != end; ++it) {
++			if(W* widget = it->find_at(coordinate, must_be_active)) {
++				return widget;
++			}
++		}
++		return NULL;
++	}
++
+ 	template<class W>
+ 	static W* find_at(
+ 			  typename tconst_duplicator<W, ttree_view_node>::type&
+@@ -255,13 +266,9 @@ struct ttree_view_node_implementation
+ 		}
+ 
+ 		typedef typename tconst_duplicator<W, ttree_view_node>::type thack;
+-		foreach(thack& node, tree_view_node.children_) {
+-			if(W* widget = node.find_at(coordinate, must_be_active)) {
+-				return widget;
+-			}
+-		}
+-
+-		return NULL;
++		return find_at_aux<W>(tree_view_node.children_.begin(),
++				      tree_view_node.children_.end(),
++				      coordinate, must_be_active);
+ 	}
+ };
+ 
+@@ -313,7 +320,9 @@ tpoint ttree_view_node::get_current_size
+ 		return size;
+ 	}
+ 
+-	foreach(const ttree_view_node& node, children_) {
++	for (boost::ptr_vector<ttree_view_node>::const_iterator it
++	       = children_.begin (); it != children_.end (); ++it) {
++		const ttree_view_node& node = *it;
+ 
+ 		if(node.grid_.get_visible() == twidget::INVISIBLE) {
+ 			continue;
+@@ -344,7 +353,9 @@ tpoint ttree_view_node::get_unfolded_siz
+ 		size.x += (get_indention_level() - 1) * tree_view().indention_step_size_;
+ 	}
+ 
+-	foreach(const ttree_view_node& node, children_) {
++	for (boost::ptr_vector<ttree_view_node>::const_iterator it
++	       = children_.begin (); it != children_.end (); ++it) {
++		const ttree_view_node& node = *it;
+ 
+ 		if(node.grid_.get_visible() == twidget::INVISIBLE) {
+ 			continue;
+@@ -378,7 +389,9 @@ tpoint ttree_view_node::calculate_best_s
+ 
+ 	DBG_GUI_L << LOG_HEADER << " own grid best size " << best_size << ".\n";
+ 
+-	foreach(const ttree_view_node& node, children_) {
++	for (boost::ptr_vector<ttree_view_node>::const_iterator it
++	       = children_.begin (); it != children_.end (); ++it) {
++		const ttree_view_node& node = *it;
+ 
+ 		if(node.grid_.get_visible() == twidget::INVISIBLE) {
+ 			continue;
diff --git a/extra/xmlto/PKGBUILD b/extra/xmlto/PKGBUILD
index 3df59ce7d..b83953432 100644
--- a/extra/xmlto/PKGBUILD
+++ b/extra/xmlto/PKGBUILD
@@ -1,26 +1,31 @@
-# $Id: PKGBUILD 67403 2010-02-06 18:09:00Z giovanni $
+# $Id: PKGBUILD 133999 2011-07-31 15:01:38Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 # Contributor: Sergej Pupykin <sergej@aur.archlinux.org>
 # Contributor: Robert Stoffers <rob1@ubuntu.com>
 
 pkgname=xmlto
-pkgver=0.0.23
+pkgver=0.0.24
 pkgrel=1
 pkgdesc="Convert xml to many other formats"
 arch=('i686' 'x86_64')
 url="http://cyberelk.net/tim/software/xmlto/"
 license=('GPL')
-depends=('libxslt>=1.1.24' 'perl-yaml-syck' 'perl-test-pod')
+depends=('libxslt' 'perl-yaml-syck' 'perl-test-pod')
 makedepends=('docbook-xsl')
-source=(https://fedorahosted.org/releases/x/m/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('3001d6bb2bbc2c8f6c2301f05120f074')
+source=("https://fedorahosted.org/releases/x/m/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
+md5sums=('9d45bbe43f7c66c6bf585ba6635df31a')
 
 build() {
   cd "$srcdir/${pkgname}-${pkgver}"
 
   ./configure --prefix=/usr \
-              --mandir=/usr/share/man || return 1
-  make || return 1
-  make DESTDIR="${pkgdir}" install || return 1
+              --mandir=/usr/share/man
+  make
+}
+
+package() {
+  cd "$srcdir/${pkgname}-${pkgver}"
+
+  make DESTDIR="${pkgdir}" install
 }
author	root <root@rshg054.dnsready.net>	2011-08-02 04:35:55 +0000
committer	root <root@rshg054.dnsready.net>	2011-08-02 04:35:55 +0000
commit	bf35116f9d203dcafce808a6c7b3dd5a0db8afbc (patch)
tree	f9551a1d3c67d2113cc5fc5c3f8816bcbaad0540 /extra
parent	1173ff2dba7d0fd3c45f170a5e353a76b7a5da2f (diff)