Sun Jun 26 23:06:14 UTC 2011

author: root <root@rshg047.dnsready.net> 2011-06-26 23:06:14 +0000
committer: root <root@rshg047.dnsready.net> 2011-06-26 23:06:14 +0000
commit: 715631caf52784c47c8ed3aeb6cbdba2715a08db (patch)
tree: d1923d66cba8dcf90112f81ca31009202cff25a3
parent: 8999fa1750304fb2367fb7743e49e013405e88be (diff)
152 files changed, 1905 insertions, 459 deletions
diff --git a/community/darcs/PKGBUILD b/community/darcs/PKGBUILD
new file mode 100644
index 000000000..d23e917a5
--- /dev/null
+++ b/community/darcs/PKGBUILD
@@ -0,0 +1,37 @@
+# $Id: PKGBUILD 116991 2011-03-27 10:10:32Z remy $
+# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
+# Contributor: Simo Leone <neotuli@gmail.com>
+
+pkgname=darcs
+pkgver=2.5.2
+pkgrel=1.1
+pkgdesc="Decentralized replacement for CVS with roots in quantum mechanics"
+arch=(i686 x86_64)
+url="http://darcs.net/"
+license=('GPL')
+depends=('curl' 'gmp' 'ncurses>=5.6-7')
+makedepends=('ghc' 'haskell-tar<0.4' 'haskell-text<0.12'
+    'haskell-hashed-storage<0.6' 'haskell-haskeline<0.7'
+    'haskell-html<1.1' 'haskell-parsec<3.2' 'haskell-regex-compat<0.94')
+source=("http://darcs.net/releases/$pkgname-$pkgver.tar.gz")
+md5sums=('491b6ca01dec245a16112ad2c7e07dc1')
+
+build() {
+    cd $srcdir/$pkgname-$pkgver
+    runhaskell Setup.lhs configure --ghc -O --prefix=/usr \
+         --disable-library-for-ghci --libsubdir=\$compiler/site-local/\$pkgid
+    runhaskell Setup.lhs build
+}
+
+check() {
+    cd ${srcdir}/$pkgname-$pkgver
+    runhaskell Setup.lhs test
+}
+
+package() {
+    cd $srcdir/$pkgname-$pkgver
+    runhaskell Setup.lhs copy --destdir=$pkgdir
+    rm -r $pkgdir/usr/lib/ 
+    chmod 755 $pkgdir/usr/share/man/man1/$pkgname.1   
+}
+
diff --git a/community/haddock/PKGBUILD b/community/haddock/PKGBUILD
new file mode 100644
index 000000000..c52029b85
--- /dev/null
+++ b/community/haddock/PKGBUILD
@@ -0,0 +1,40 @@
+# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
+# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
+# As generated by cabal2arch 0.7.6
+pkgname=haddock
+pkgver=2.9.2
+pkgrel=2
+pkgdesc="Documentation-generation tool for Haskell libraries"
+url="http://hackage.haskell.org/package/${pkgname}"
+license=('custom:BSD3')
+arch=('i686' 'x86_64')
+makedepends=(alex happy)
+depends=(ghc=7.0.3-2 sh 'haskell-mtl=2.0.1.0-3.1' 'haskell-xhtml=3000.2.0.1-7.1' 'haskell-ghc-paths=0.1.0.8-4.1') 
+options=('strip')
+source=(http://hackage.haskell.org/packages/archive/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz)
+install=${pkgname}.install
+
+build() {
+    cd ${srcdir}/${pkgname}-${pkgver}
+    runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \
+      --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid
+    runhaskell Setup build
+    runhaskell Setup haddock
+    runhaskell Setup register   --gen-script
+    runhaskell Setup unregister --gen-script
+    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+}
+
+package() {
+    cd ${srcdir}/${pkgname}-${pkgver}
+    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
+    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
+    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
+    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${pkgname}
+    runhaskell Setup copy --destdir=${pkgdir}
+    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
+    mv $pkgdir/usr/bin/haddock $pkgdir/usr/bin/haddock-cabal
+}
+
+md5sums=('04928e132827a1da20ace52babb43e47')
diff --git a/community/haddock/haddock.install b/community/haddock/haddock.install
new file mode 100644
index 000000000..278da355e
--- /dev/null
+++ b/community/haddock/haddock.install
@@ -0,0 +1,18 @@
+HS_DIR=usr/share/haskell/haddock
+post_install() {
+  ${HS_DIR}/register.sh &> /dev/null
+  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) &> /dev/null
+}
+pre_upgrade() {
+  ${HS_DIR}/unregister.sh &> /dev/null
+}
+post_upgrade() {
+  ${HS_DIR}/register.sh &> /dev/null
+  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) &> /dev/null
+}
+pre_remove() {
+  ${HS_DIR}/unregister.sh &> /dev/null
+}
+post_remove() {
+  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) &> /dev/null
+}
diff --git a/community/haskell-binary/PKGBUILD b/community/haskell-binary/PKGBUILD
new file mode 100644
index 000000000..f682bb59a
--- /dev/null
+++ b/community/haskell-binary/PKGBUILD
@@ -0,0 +1,39 @@
+# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
+# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
+# Package generated by cabal2arch 0.7.5
+_hkgname=binary
+pkgname=haskell-binary
+pkgver=0.5.0.2
+pkgrel=7.1
+pkgdesc="Binary serialisation for Haskell values using lazy ByteStrings"
+url="http://hackage.haskell.org/package/binary"
+license=('custom:BSD3')
+arch=('i686' 'x86_64')
+depends=(ghc=7.0.3-2 sh)
+options=('strip')
+source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
+install=${pkgname}.install
+md5sums=('6bf8f3d1441602c9ab09a75e3bd6e926')
+
+build() {
+    cd ${srcdir}/${_hkgname}-${pkgver}
+    runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
+      --prefix=/usr --docdir=/usr/share/doc/${pkgname} \
+      --libsubdir=\$compiler/site-local/\$pkgid
+    runhaskell Setup build
+    runhaskell Setup haddock
+    runhaskell Setup register   --gen-script
+    runhaskell Setup unregister --gen-script
+    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+}
+
+package() {
+    cd ${srcdir}/${_hkgname}-${pkgver}
+    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
+    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
+    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
+    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
+    runhaskell Setup copy --destdir=${pkgdir}
+    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
+}
diff --git a/community/haskell-binary/haskell-binary.install b/community/haskell-binary/haskell-binary.install
new file mode 100644
index 000000000..0084ebef8
--- /dev/null
+++ b/community/haskell-binary/haskell-binary.install
@@ -0,0 +1,18 @@
+HS_DIR=usr/share/haskell/haskell-binary
+post_install() {
+  ${HS_DIR}/register.sh
+  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+}
+pre_upgrade() {
+  ${HS_DIR}/unregister.sh
+}
+post_upgrade() {
+  ${HS_DIR}/register.sh
+  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+}
+pre_remove() {
+  ${HS_DIR}/unregister.sh
+}
+post_remove() {
+  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+}
diff --git a/community/haskell-dataenc/PKGBUILD b/community/haskell-dataenc/PKGBUILD
new file mode 100644
index 000000000..cd94ed17c
--- /dev/null
+++ b/community/haskell-dataenc/PKGBUILD
@@ -0,0 +1,39 @@
+# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
+# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
+# Package generated by cabal2arch 0.7.5
+_hkgname=dataenc
+pkgname=haskell-dataenc
+pkgver=0.13.0.4
+pkgrel=3.2
+pkgdesc="Data encoding library"
+url="http://hackage.haskell.org/package/dataenc"
+license=('custom:BSD3')
+arch=('i686' 'x86_64')
+depends=(ghc=7.0.3-2 sh)
+options=('strip')
+source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
+install=${pkgname}.install
+md5sums=('4764fa7f75ed3ee95a759d67d1347d46')
+
+build() {
+    cd ${srcdir}/${_hkgname}-${pkgver}
+    runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
+      --prefix=/usr --docdir=/usr/share/doc/${pkgname} \
+      --libsubdir=\$compiler/site-local/\$pkgid
+    runhaskell Setup build
+    runhaskell Setup haddock
+    runhaskell Setup register   --gen-script
+    runhaskell Setup unregister --gen-script
+    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+}
+
+package() {
+    cd ${srcdir}/${_hkgname}-${pkgver}
+    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
+    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
+    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
+    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
+    runhaskell Setup copy --destdir=${pkgdir}
+    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
+}
diff --git a/community/haskell-dataenc/haskell-dataenc.install b/community/haskell-dataenc/haskell-dataenc.install
new file mode 100644
index 000000000..9c1bbff01
--- /dev/null
+++ b/community/haskell-dataenc/haskell-dataenc.install
@@ -0,0 +1,18 @@
+HS_DIR=usr/share/haskell/haskell-dataenc
+post_install() {
+  ${HS_DIR}/register.sh
+  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+}
+pre_upgrade() {
+  ${HS_DIR}/unregister.sh
+}
+post_upgrade() {
+  ${HS_DIR}/register.sh
+  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+}
+pre_remove() {
+  ${HS_DIR}/unregister.sh
+}
+post_remove() {
+  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+}
diff --git a/community/haskell-ghc-paths/PKGBUILD b/community/haskell-ghc-paths/PKGBUILD
new file mode 100644
index 000000000..a7a4be130
--- /dev/null
+++ b/community/haskell-ghc-paths/PKGBUILD
@@ -0,0 +1,35 @@
+# Maintainer: Arch Haskell Team <arch-haskell@haskell.org>
+_hkgname=ghc-paths
+pkgname=haskell-ghc-paths
+pkgver=0.1.0.8
+pkgrel=4.1
+pkgdesc="Knowledge of GHC's installation directories"
+url="http://hackage.haskell.org/package/${_hkgname}"
+license=('custom:BSD3')
+arch=('i686' 'x86_64')
+makedepends=()
+depends=(ghc=7.0.3-2) # cannot have stricter dep here due to haddock
+options=('strip')
+source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
+install=${pkgname}.install
+md5sums=('d2b23dc563888e380588501d2ce1d82b')
+build() {
+    cd ${srcdir}/${_hkgname}-${pkgver}
+    runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
+       --prefix=/usr --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid
+    runhaskell Setup build
+    runhaskell Setup haddock
+    runhaskell Setup register   --gen-script
+    runhaskell Setup unregister --gen-script
+    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+}
+package() {
+    cd ${srcdir}/${_hkgname}-${pkgver}
+    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
+    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
+    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
+    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
+    runhaskell Setup copy --destdir=${pkgdir}
+    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
+}
diff --git a/community/haskell-ghc-paths/haskell-ghc-paths.install b/community/haskell-ghc-paths/haskell-ghc-paths.install
new file mode 100644
index 000000000..4fd2c6c56
--- /dev/null
+++ b/community/haskell-ghc-paths/haskell-ghc-paths.install
@@ -0,0 +1,18 @@
+HS_DIR=usr/share/haskell/haskell-ghc-paths
+post_install() {
+  ${HS_DIR}/register.sh
+  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+}
+pre_upgrade() {
+  ${HS_DIR}/unregister.sh
+}
+post_upgrade() {
+  ${HS_DIR}/register.sh
+  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+}
+pre_remove() {
+  ${HS_DIR}/unregister.sh
+}
+post_remove() {
+  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+}
diff --git a/community/haskell-haskeline/PKGBUILD b/community/haskell-haskeline/PKGBUILD
new file mode 100644
index 000000000..5a6124fd3
--- /dev/null
+++ b/community/haskell-haskeline/PKGBUILD
@@ -0,0 +1,39 @@
+# Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
+# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
+# Package generated by cabal2arch 0.7.6
+_hkgname=haskeline
+pkgname=haskell-haskeline
+pkgver=0.6.3.2
+pkgrel=2.2
+pkgdesc="A command-line interface for user input, written in Haskell."
+url="http://hackage.haskell.org/package/haskeline"
+license=('custom:BSD3')
+arch=('i686' 'x86_64')
+depends=('ghc=7.0.3-2' sh 'haskell-utf8-string=0.3.6-7.2' 'haskell-mtl=2.0.1.0-3.1' 'haskell-terminfo=0.3.1.3')
+options=('strip')
+source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
+install=${pkgname}.install
+md5sums=('d75863f63a1cfb499d0198e4f28ac2af')
+
+build() {
+    cd ${srcdir}/${_hkgname}-${pkgver}
+    runhaskell Setup configure \
+      -O -p --enable-split-objs --enable-shared -fterminfo --prefix=/usr \
+      --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid
+    runhaskell Setup build
+    runhaskell Setup haddock
+    runhaskell Setup register   --gen-script
+    runhaskell Setup unregister --gen-script
+    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+}
+
+package() {
+    cd ${srcdir}/${_hkgname}-${pkgver}
+    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
+    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
+    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
+    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
+    runhaskell Setup copy --destdir=${pkgdir}
+    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
+}
diff --git a/community/haskell-haskeline/haskell-haskeline.install b/community/haskell-haskeline/haskell-haskeline.install
new file mode 100644
index 000000000..27cb4a093
--- /dev/null
+++ b/community/haskell-haskeline/haskell-haskeline.install
@@ -0,0 +1,18 @@
+HS_DIR=usr/share/haskell/haskell-haskeline
+post_install() {
+  ${HS_DIR}/register.sh
+  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+}
+pre_upgrade() {
+  ${HS_DIR}/unregister.sh
+}
+post_upgrade() {
+  ${HS_DIR}/register.sh
+  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+}
+pre_remove() {
+  ${HS_DIR}/unregister.sh
+}
+post_remove() {
+  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+}
diff --git a/community/haskell-mmap/PKGBUILD b/community/haskell-mmap/PKGBUILD
new file mode 100644
index 000000000..b1002be46
--- /dev/null
+++ b/community/haskell-mmap/PKGBUILD
@@ -0,0 +1,38 @@
+# Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
+# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
+_hkgname=mmap
+pkgname=haskell-mmap
+pkgver=0.5.7
+pkgrel=3.2
+pkgdesc="Memory mapped files for POSIX and Windows"
+url="http://hackage.haskell.org/package/mmap"
+license=('custom:BSD3')
+arch=('i686' 'x86_64')
+depends=('ghc=7.0.3-2' sh)
+options=('strip')
+source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
+install=${pkgname}.install
+md5sums=('1f74b3f59617332b06e277f5212423c1')
+
+build() {
+    cd ${srcdir}/${_hkgname}-${pkgver}
+    runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
+      --prefix=/usr --docdir=/usr/share/doc/${pkgname} \
+      --libsubdir=\$compiler/site-local/\$pkgid
+    runhaskell Setup build
+    runhaskell Setup haddock
+    runhaskell Setup register   --gen-script
+    runhaskell Setup unregister --gen-script
+    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+}
+
+package() {
+    cd ${srcdir}/${_hkgname}-${pkgver}
+    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
+    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
+    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
+    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
+    runhaskell Setup copy --destdir=${pkgdir}
+    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
+}
diff --git a/community/haskell-mmap/haskell-mmap.install b/community/haskell-mmap/haskell-mmap.install
new file mode 100644
index 000000000..68fe74f4e
--- /dev/null
+++ b/community/haskell-mmap/haskell-mmap.install
@@ -0,0 +1,18 @@
+HS_DIR=usr/share/haskell/haskell-mmap
+post_install() {
+  ${HS_DIR}/register.sh
+  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+}
+pre_upgrade() {
+  ${HS_DIR}/unregister.sh
+}
+post_upgrade() {
+  ${HS_DIR}/register.sh
+  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+}
+pre_remove() {
+  ${HS_DIR}/unregister.sh
+}
+post_remove() {
+  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+}
diff --git a/community/haskell-tar/PKGBUILD b/community/haskell-tar/PKGBUILD
new file mode 100644
index 000000000..459f288bd
--- /dev/null
+++ b/community/haskell-tar/PKGBUILD
@@ -0,0 +1,37 @@
+# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
+_hkgname=tar
+pkgname=haskell-tar
+pkgver=0.3.1.0
+pkgrel=4.2
+pkgdesc="Reading, writing and manipulating \".tar\" archive files."
+url="http://hackage.haskell.org/package/tar"
+license=('custom:BSD3')
+arch=('i686' 'x86_64')
+depends=('ghc=7.0.3-2' sh)
+options=('strip')
+source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
+install=${pkgname}.install
+md5sums=('10b54856495f9ef0a42aa270085c7d5e')
+
+build() {
+    cd ${srcdir}/${_hkgname}-${pkgver}
+    runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
+      --prefix=/usr --docdir=/usr/share/doc/${pkgname} \
+      --libsubdir=\$compiler/site-local/\$pkgid
+    runhaskell Setup build
+    runhaskell Setup haddock
+    runhaskell Setup register   --gen-script
+    runhaskell Setup unregister --gen-script
+    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+}
+
+package() {
+    cd ${srcdir}/${_hkgname}-${pkgver}
+    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
+    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
+    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
+    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
+    runhaskell Setup copy --destdir=${pkgdir}
+    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
+}
diff --git a/community/haskell-tar/haskell-tar.install b/community/haskell-tar/haskell-tar.install
new file mode 100644
index 000000000..e8c2f6293
--- /dev/null
+++ b/community/haskell-tar/haskell-tar.install
@@ -0,0 +1,18 @@
+HS_DIR=usr/share/haskell/haskell-tar
+post_install() {
+  ${HS_DIR}/register.sh
+  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+}
+pre_upgrade() {
+  ${HS_DIR}/unregister.sh
+}
+post_upgrade() {
+  ${HS_DIR}/register.sh
+  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+}
+pre_remove() {
+  ${HS_DIR}/unregister.sh
+}
+post_remove() {
+  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+}
diff --git a/community/haskell-terminfo/PKGBUILD b/community/haskell-terminfo/PKGBUILD
new file mode 100644
index 000000000..51e968853
--- /dev/null
+++ b/community/haskell-terminfo/PKGBUILD
@@ -0,0 +1,38 @@
+# Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
+# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
+_hkgname=terminfo
+pkgname=haskell-terminfo
+pkgver=0.3.1.3
+pkgrel=4.2
+pkgdesc="Haskell bindings to the terminfo library."
+url="http://hackage.haskell.org/package/${_hkgname}"
+license=('custom:BSD3')
+arch=('i686' 'x86_64')
+depends=('ghc=7.0.3-2' sh)
+options=('strip')
+source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
+install=${pkgname}.install
+md5sums=('8c0e052340f628b76f5687fa23379628')
+
+build() {
+    cd ${srcdir}/${_hkgname}-${pkgver}
+    runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
+      --prefix=/usr --docdir=/usr/share/doc/${pkgname} \
+      --libsubdir=\$compiler/site-local/\$pkgid
+    runhaskell Setup build
+    runhaskell Setup haddock
+    runhaskell Setup register   --gen-script
+    runhaskell Setup unregister --gen-script
+    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+}
+
+package() {
+    cd ${srcdir}/${_hkgname}-${pkgver}
+    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
+    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
+    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
+    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
+    runhaskell Setup copy --destdir=${pkgdir}
+    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
+}
diff --git a/community/haskell-terminfo/haskell-terminfo.install b/community/haskell-terminfo/haskell-terminfo.install
new file mode 100644
index 000000000..40d39f42b
--- /dev/null
+++ b/community/haskell-terminfo/haskell-terminfo.install
@@ -0,0 +1,18 @@
+HS_DIR=usr/share/haskell/haskell-terminfo
+post_install() {
+  ${HS_DIR}/register.sh
+  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+}
+pre_upgrade() {
+  ${HS_DIR}/unregister.sh
+}
+post_upgrade() {
+  ${HS_DIR}/register.sh
+  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+}
+pre_remove() {
+  ${HS_DIR}/unregister.sh
+}
+post_remove() {
+  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+}
diff --git a/community/haskell-utf8-string/PKGBUILD b/community/haskell-utf8-string/PKGBUILD
new file mode 100644
index 000000000..e6d27dfad
--- /dev/null
+++ b/community/haskell-utf8-string/PKGBUILD
@@ -0,0 +1,39 @@
+# Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
+# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
+# Package generated by cabal2arch 0.7.6
+_hkgname=utf8-string
+pkgname=haskell-utf8-string
+pkgver=0.3.6
+pkgrel=7.2
+pkgdesc="Support for reading and writing UTF8 Strings"
+url="http://hackage.haskell.org/package/${_hkgname}"
+license=('custom:BSD3')
+arch=('i686' 'x86_64')
+depends=('ghc=7.0.3-2' sh)
+options=('strip')
+source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
+install=${pkgname}.install
+md5sums=('be8c5ef52a0824babdc89d60c1e9b600')
+
+build() {
+    cd ${srcdir}/${_hkgname}-${pkgver}
+    runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
+      --prefix=/usr --docdir=/usr/share/doc/${pkgname} \
+      --libsubdir=\$compiler/site-local/\$pkgid
+    runhaskell Setup build
+    runhaskell Setup haddock
+    runhaskell Setup register   --gen-script
+    runhaskell Setup unregister --gen-script
+    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+}
+
+package() {
+    cd ${srcdir}/${_hkgname}-${pkgver}
+    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
+    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
+    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
+    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
+    runhaskell Setup copy --destdir=${pkgdir}
+    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
+}
diff --git a/community/haskell-utf8-string/haskell-utf8-string.install b/community/haskell-utf8-string/haskell-utf8-string.install
new file mode 100644
index 000000000..0f64366b2
--- /dev/null
+++ b/community/haskell-utf8-string/haskell-utf8-string.install
@@ -0,0 +1,18 @@
+HS_DIR=usr/share/haskell/haskell-utf8-string
+post_install() {
+  ${HS_DIR}/register.sh
+  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+}
+pre_upgrade() {
+  ${HS_DIR}/unregister.sh
+}
+post_upgrade() {
+  ${HS_DIR}/register.sh
+  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+}
+pre_remove() {
+  ${HS_DIR}/unregister.sh
+}
+post_remove() {
+  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+}
diff --git a/community/haskell-x11-xft/PKGBUILD b/community/haskell-x11-xft/PKGBUILD
index 5d7da4448..c8a9ae0f9 100644
--- a/community/haskell-x11-xft/PKGBUILD
+++ b/community/haskell-x11-xft/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 41278 2011-03-04 23:15:52Z remy $
+# $Id: PKGBUILD 49962 2011-06-22 19:43:36Z vegai $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 _hkgname=X11-xft
 pkgname=haskell-x11-xft
 pkgver=0.3
-pkgrel=19.2
+pkgrel=19.4
 pkgdesc="Bindings to the Xft, X Free Type interface library, and some Xrender parts"
 url="http://hackage.haskell.org/package/${_hkgname}"
 license=('LGPL')
 arch=('i686' 'x86_64')
-depends=('ghc=7.0.2' 'haskell-x11=1.5.0.0' 'haskell-utf8-string=0.3.6' 'libxft')
+depends=('ghc=7.0.3-2' 'haskell-x11=1.5.0.0-7.3' 'haskell-utf8-string=0.3.6-7.2' 'libxft')
 options=('strip')
 source=(http://hackage.haskell.org/packages/archive/X11-xft/$pkgver/X11-xft-$pkgver.tar.gz)
 install=haskell-x11-xft.install
diff --git a/community/haskell-x11/PKGBUILD b/community/haskell-x11/PKGBUILD
index 9c1f0bf8b..417b6daab 100644
--- a/community/haskell-x11/PKGBUILD
+++ b/community/haskell-x11/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 41253 2011-03-04 22:32:41Z remy $
+# $Id: PKGBUILD 49953 2011-06-22 19:21:47Z vegai $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: shild <sxp@bk.ru>
 # Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
@@ -6,13 +6,13 @@
 _hkgname=X11
 pkgname=haskell-x11
 pkgver=1.5.0.0
-pkgrel=7.2
+pkgrel=7.3
 pkgdesc="A Haskell binding to the X11 graphics library."
 arch=(i686 x86_64)
 url="http://hackage.haskell.org/cgi-bin/hackage-scripts/package/X11"
 license=('custom:BSD3')
 options=('strip')
-depends=("ghc=7.0.2" "haskell-syb=0.3" 'libx11' 'libxinerama')
+depends=("ghc=7.0.3-2" "haskell-syb=0.3-2.1" 'libx11' 'libxinerama')
 conflicts=(haskell-x11-extras)
 install=hsmod.install
 source=(http://hackage.haskell.org/packages/archive/X11/$pkgver/X11-$pkgver.tar.gz)
diff --git a/community/libtorrent/PKGBUILD b/community/libtorrent/PKGBUILD
index a3c670b43..a15316f09 100644
--- a/community/libtorrent/PKGBUILD
+++ b/community/libtorrent/PKGBUILD
@@ -3,24 +3,29 @@
 # Contributor: sh__
 
 pkgname=libtorrent
-pkgver=0.12.6
-pkgrel=2
-pkgdesc="BitTorrent library written in C++"
-arch=('i686' 'x86_64')
-url="http://libtorrent.rakshasa.no"
+pkgver=0.12.9
+pkgrel=1
+pkgdesc='BitTorrent library written in C++'
+url='http://libtorrent.rakshasa.no/'
 license=('GPL')
+arch=('i686' 'x86_64')
 depends=('libsigc++2.0' 'openssl')
 options=('!libtool')
-source=(http://libtorrent.rakshasa.no/downloads/$pkgname-$pkgver.tar.gz)
-md5sums=('037499ed708aaf72988cee60e5a8d96b')
+source=("http://libtorrent.rakshasa.no/downloads/${pkgname}-${pkgver}.tar.gz")
+sha1sums=('176a836c6e685e4dad71ac08c0e09caaa5b7757c')
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
+	cd "${srcdir}/${pkgname}-${pkgver}"
 
-  CXXFLAGS="$CXXFLAGS -fno-strict-aliasing" \
-    ./configure --prefix=/usr --disable-debug || return 1
-  make || return 1
-  make DESTDIR="$pkgdir" install
+	export CXXFLAGS="${CXXFLAGS} -fno-strict-aliasing"
+	./configure \
+		--prefix=/usr \
+		--disable-debug \
+
+	make
 }
 
-# vim:set ts=2 sw=2 et:
+package() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	make DESTDIR="${pkgdir}" install
+}
diff --git a/community/picard/PKGBUILD b/community/picard/PKGBUILD
index d63ac162d..96ec12311 100644
--- a/community/picard/PKGBUILD
+++ b/community/picard/PKGBUILD
@@ -1,22 +1,27 @@
-# $Id: PKGBUILD 42161 2011-03-14 16:27:36Z mherych $
-# Maintainer Mateusz Herych <heniekk@gmail.com>
-# Contributor sysrq
+# $Id: PKGBUILD 50174 2011-06-25 20:20:09Z bisson $
+# Maintainer: Mateusz Herych <heniekk@gmail.com>
+# Contributor: sysrq
 
 pkgname=picard
-pkgver=0.13
+pkgver=0.14
 pkgrel=1
-pkgdesc="Next generation MusicBrainz tagging application (QT4 interface)"
-arch=('i686' 'x86_64')
-url="http://musicbrainz.org/doc/PicardQt"
+pkgdesc='Official MusicBrainz tagger'
+url='http://musicbrainz.org/doc/MusicBrainz_Picard'
 license=('GPL')
+arch=('i686' 'x86_64')
 depends=('python2-qt' 'mutagen' 'libofa' 'ffmpeg')
 optdepends=('libdiscid: CD-Lookup feature')
-install=picard.install
-source=(http://ftp.musicbrainz.org/pub/musicbrainz/$pkgname/$pkgname-$pkgver.tar.gz)
-md5sums=('bc8dc9109de218b544204669119d10c5')
+source=("http://ftp.musicbrainz.org/pub/musicbrainz/${pkgname}/${pkgname}-${pkgver}.tar.gz")
+md5sums=('bbc6aee61e779153b77e381e8cd2ba08')
+
+install=install
 
 build() {
-  cd $srcdir/picard-$pkgver
-  python2 setup.py config
-  python2 setup.py install --root=$pkgdir
+	cd "${srcdir}/picard-${pkgver}"
+	python2 setup.py config
+}
+
+package() {
+	cd "${srcdir}/picard-${pkgver}"
+	python2 setup.py install --root="${pkgdir}"
 }
diff --git a/community/picard/install b/community/picard/install
new file mode 100644
index 000000000..b46fab005
--- /dev/null
+++ b/community/picard/install
@@ -0,0 +1,12 @@
+post_install() {
+	xdg-icon-resource forceupdate --theme hicolor &>/dev/null
+	update-desktop-database -q &>/dev/null
+}
+
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+	post_install
+}
diff --git a/community/qtcreator/PKGBUILD b/community/qtcreator/PKGBUILD
index 866bff343..4fd8b9f42 100644
--- a/community/qtcreator/PKGBUILD
+++ b/community/qtcreator/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 50079 2011-06-24 08:49:19Z svenstaro $
+# $Id: PKGBUILD 50126 2011-06-25 11:05:26Z svenstaro $
 # Maintainer: Imanol Celaya <ornitorrincos@archlinux-es.org>
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Lukas Jirkovsky <l.jirkovsky@gmail.com>
@@ -11,7 +11,7 @@ pkgbase=qtcreator
 #pkgname=('qtcreator' 'qtcreator-todo-plugin' 'qtcreator-artisticstyle-plugin')
 pkgname=('qtcreator' 'qtcreator-todo-plugin')
 pkgver=2.2.1
-pkgrel=2
+pkgrel=3
 pkgdesc='Lightweight, cross-platform integrated development environment'
 arch=('i686' 'x86_64')
 url='http://qt.nokia.com/products/developer-tools'
@@ -88,7 +88,7 @@ package_qtcreator() {
 
 package_qtcreator-todo-plugin() {
   license=('BSD')
-  depends=('qtcreator=2.2.0')
+  depends=("qtcreator=$pkgver")
   pkgdesc='TODO plugin for QtCreator'
   url='http://gitorious.org/qt-creator-tod
   install -Dm644 ${srcdir}/qtcreator.desktop \
@@ -105,7 +105,7 @@ package_qtcreator-todo-plugin() {
 
 #package_qtcreator-artisticstyle-plugin() {
 #  license=('GPL3' 'LGPL')
-#  depends=('qtcreator=2.2.0')
+#  depends=("qtcreator=$pkgver")
 #  pkgdesc='ArtisticStyle plugin for QtCreator'
 #  url='http://astyleplugin.berlios.de/index.php'
 #  
diff --git a/community/rtorrent/PKGBUILD b/community/rtorrent/PKGBUILD
index e106bd12c..0f387097d 100644
--- a/community/rtorrent/PKGBUILD
+++ b/community/rtorrent/PKGBUILD
@@ -3,30 +3,33 @@
 # Contributor: sh__
 
 pkgname=rtorrent
-pkgver=0.8.6
-pkgrel=3
-pkgdesc="Ncurses BitTorrent client based on libTorrent"
-arch=('i686' 'x86_64')
-url="http://libtorrent.rakshasa.no"
+pkgver=0.8.9
+pkgrel=2
+pkgdesc='Ncurses BitTorrent client based on libTorrent'
+url='http://libtorrent.rakshasa.no/'
 license=('GPL')
-depends=('libtorrent=0.12.6' 'curl>=7.14.3' 'xmlrpc-c>=1858')
-source=("http://libtorrent.rakshasa.no/downloads/$pkgname-$pkgver.tar.gz" \
-    ncurses58.patch)
-options=(!strip)
+arch=('i686' 'x86_64')
+depends=('libtorrent=0.12.9' 'curl' 'xmlrpc-c')
+source=("http://libtorrent.rakshasa.no/downloads/${pkgname}-${pkgver}.tar.gz")
+sha1sums=('0ac51c185e98b5a386e5f1a07bca9a9963e2d6ce')
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  patch -Np0 -i $srcdir/ncurses58.patch
+	cd "${srcdir}/${pkgname}-${pkgver}"
 
-  CXXFLAGS="$CXXFLAGS -g -fno-strict-aliasing" \
-    ./configure --prefix=/usr --enable-debug --with-xmlrpc-c 
-  make 
-  make DESTDIR="$pkgdir" install
+	export CXXFLAGS="${CXXFLAGS} -fno-strict-aliasing"
+	./configure \
+		--prefix=/usr \
+		--enable-debug \
+		--with-xmlrpc-c \
+
+	make
 }
 
+package() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	make DESTDIR="${pkgdir}" install
 
-# vim:set ts=2 sw=2 et:
-md5sums=('b804c45c01c40312926bcea6b55bb084'
-         'b8fcd9b6d3385a85ff31de6f32e60e7d')
-md5sums=('b804c45c01c40312926bcea6b55bb084'
-         '1a525adddc0424c23ed9a4aa31c0164a')
+	install -D doc/faq.xml "${pkgdir}"/usr/share/doc/rtorrent/faq.xml
+	install -D doc/rtorrent.1 "${pkgdir}"/usr/share/man/man1/rtorrent.1
+	install -D doc/rtorrent.rc "${pkgdir}"/usr/share/doc/rtorrent/rtorrent.rc
+}
diff --git a/community/xmonad-contrib/PKGBUILD b/community/xmonad-contrib/PKGBUILD
index 1e43ff570..84455217a 100644
--- a/community/xmonad-contrib/PKGBUILD
+++ b/community/xmonad-contrib/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 41293 2011-03-04 23:37:55Z remy $
+# $Id: PKGBUILD 49972 2011-06-22 19:52:11Z vegai $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
 # Contributor: orbisvicis <gmail.com>
 
 pkgname=xmonad-contrib
 pkgver=0.9.2
-pkgrel=1.2
+pkgrel=2.1
 pkgdesc="Add-ons for xmonad"
 arch=('i686' 'x86_64')
 url="http://xmonad.org/"
 license=('BSD')
-depends=('ghc=7.0.2' 'xmonad=0.9.2' 'sh' 'haskell-x11=1.5.0.0'
+depends=('ghc=7.0.3-2' 'xmonad=0.9.2-2.1' 'sh' 'haskell-x11=1.5.0.0'
          'haskell-x11-xft=0.3' 'haskell-utf8-string=0.3.6')
 install='xmonad-contrib.install'
 source=(http://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz)
@@ -18,7 +18,7 @@ md5sums=('616cbc632bbde5cd4cdb643ee47e74d2')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
-  runhaskell Setup.lhs configure --ghc --enable-split-objs --prefix=/usr -fuse_xft \
+  runhaskell Setup.lhs configure --ghc --enable-shared --enable-split-objs --prefix=/usr -fuse_xft \
              --libsubdir=\$compiler/site-local/\$pkgid
   runhaskell Setup build
   runhaskell Setup register --gen-script
diff --git a/community/xmonad/PKGBUILD b/community/xmonad/PKGBUILD
index 63bad6732..d669fc325 100644
--- a/community/xmonad/PKGBUILD
+++ b/community/xmonad/PKGBUILD
@@ -1,26 +1,23 @@
-# $Id: PKGBUILD 41283 2011-03-04 23:20:31Z remy $
+# $Id: PKGBUILD 49967 2011-06-22 19:45:42Z vegai $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
 # Contributor: shild <shildv@gmail.com>
 
 pkgname=xmonad
 pkgver=0.9.2
-pkgrel=1.2
+pkgrel=2.1
 pkgdesc="A lightweight X11 tiled window manager written in Haskell"
 arch=('i686' 'x86_64')
 url="http://xmonad.org/"
 license=('BSD')
-depends=('ghc=7.0.2' 'gmp' 'haskell-x11=1.5.0.0' 'sh' 'haskell-mtl=2.0.1.0' 'haskell-utf8-string=0.3.6')
+depends=('ghc=7.0.3' 'gmp' 'haskell-x11=1.5.0.0' 'sh' 'haskell-mtl=2.0.1.0' 'haskell-utf8-string=0.3.6')
 install='xmonad.install'
 source=(http://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz
-        xmonad.desktop xmonad.svg)
-md5sums=('5a4117f798664d772d2a834ea6c90f1c'
-         'f61961459f190b6d948f1f2782afa7a7'
-         '72bfa5e62e4e44fe7fa59b6a7593d993')
+        xmonad.desktop xmonad.session xmonad.svg)
 
 build() {
   cd $srcdir/$pkgname-$pkgver
-  runhaskell Setup.lhs configure --ghc --enable-split-objs --prefix=/usr \
+  runhaskell Setup.lhs configure --ghc --enable-shared --enable-split-objs --prefix=/usr \
              --libsubdir=\$compiler/site-local/\$pkgid
   runhaskell Setup build
   runhaskell Setup register --gen-script
@@ -39,8 +36,11 @@ package() {
 
   install -D -m644 LICENSE $pkgdir/usr/share/licenses/xmonad/LICENSE
 
-  install -D -m644 $srcdir/xmonad.desktop $pkgdir/usr/share/applications/xmonad.desktop
-  mkdir -p $pkgdir/etc/X11/sessions
-  ln -s /usr/share/applications/xmonad.desktop $pkgdir/etc/X11/sessions/xmonad.desktop
+  install -D -m644 $srcdir/xmonad.desktop $pkgdir/usr/share/xsessions/xmonad.desktop
+  install -D -m644 $srcdir/xmonad.session $pkgdir/usr/share/gnome-session/sessions/xmonad.session
   install -D -m644 $srcdir/xmonad.svg $pkgdir/usr/share/pixmaps/xmonad.svg
 }
+md5sums=('5a4117f798664d772d2a834ea6c90f1c'
+         'f8e3d84a9f154d1b5d7fcffbc0a058c9'
+         '9d1bc84a7f32897d32f3fc71ef76228e'
+         '72bfa5e62e4e44fe7fa59b6a7593d993')
diff --git a/community/xmonad/xmonad.desktop b/community/xmonad/xmonad.desktop
index a99be19f9..0af0f2d9b 100644
--- a/community/xmonad/xmonad.desktop
+++ b/community/xmonad/xmonad.desktop
@@ -1,12 +1,7 @@
 [Desktop Entry]
-Encoding=UTF-8
-Name=xmonad
+Name=Xmonad GNOME
+Comment=Tiling window manager
+TryExec=/usr/bin/gnome-session
+Exec=gnome-session --session=xmonad
+Type=XSession
 Icon=/usr/share/pixmaps/xmonad.svg
-Comment=This session starts xmonad
-Exec=/usr/bin/xmonad
-Type=Application
-NoDisplay=true
-X-GNOME-WMName=Xmonad
-X-GNOME-Autostart-Phase=WindowManager
-X-GNOME-Provides=windowmanager
-X-GNOME-Autostart-Notify=false
diff --git a/community/xmonad/xmonad.session b/community/xmonad/xmonad.session
new file mode 100644
index 000000000..c0bd16781
--- /dev/null
+++ b/community/xmonad/xmonad.session
@@ -0,0 +1,6 @@
+[GNOME Session]
+Name=Xmonad session
+RequiredComponents=gnome-panel;gnome-settings-daemon;
+RequiredProviders=windowmanager;notifications;
+DefaultProvider-windowmanager=xmonad
+DefaultProvider-notifications=notification-daemon
diff --git a/core/psmisc/PKGBUILD b/core/psmisc/PKGBUILD
index 98e542a3a..1783c528a 100644
--- a/core/psmisc/PKGBUILD
+++ b/core/psmisc/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 90063 2010-09-07 03:39:08Z eric $
-# Maintainer: Eric Belanger <eric@archlinux.org>
+# $Id: PKGBUILD 128514 2011-06-24 07:34:22Z eric $
+# Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=psmisc
-pkgver=22.13
+pkgver=22.14
 pkgrel=1
 pkgdesc="Miscellaneous procfs tools"
 arch=('i686' 'x86_64')
@@ -10,10 +10,9 @@ url="http://psmisc.sourceforge.net/index.html"
 license=('GPL')
 groups=('base')
 depends=('glibc' 'ncurses')
-changelog=ChangeLog
 source=(http://downloads.sourceforge.net/psmisc/${pkgname}-${pkgver}.tar.gz)
-md5sums=('e2c339e6b65b730042084023784a729e')
-sha1sums=('5d53c8bb5a279176be3515c07d833cdf116dd516')
+md5sums=('ba3f4e971895c92bba7770d81c981503')
+sha1sums=('dc6fc0ec131c11796d01512bbd80089719b04a66')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/eclipse/PKGBUILD b/extra/eclipse/PKGBUILD
index 5dac6abe4..12cf9da92 100644
--- a/extra/eclipse/PKGBUILD
+++ b/extra/eclipse/PKGBUILD
@@ -1,13 +1,13 @@
-# $Id: PKGBUILD 112888 2011-03-07 14:35:42Z paul $
+# $Id: PKGBUILD 128950 2011-06-25 15:38:08Z paul $
 # Maintainer: Paul Mattal <paul@archlinux.org>
 # Contributor: Andrew Wright <andreww@photism.org>
 # Contributor: Andreas W. Hauser <andy-aur@splashground.de>
 
 pkgname=eclipse
-pkgver=3.6.2
-_internal_pkgver=3.6.2
+pkgver=3.7
+_internal_pkgver=3.7
 pkgrel=1
-_date=201102101200
+_date=201106131736
 pkgdesc="An IDE for Java and other languages"
 arch=('i686' 'x86_64')
 url="http://eclipse.org"
@@ -24,7 +24,7 @@ md5sums=('7777a21debf1e05591731ac5c93b6bb6'
 	'ba8a37e30a7ebd69774cec87c69e8c44'
 	'017b2a68edc48a752a7e27c7aceef797')
 [ "$CARCH" = "x86_64" ] && source[0]="ftp://ftp.osuosl.org/pub/eclipse/eclipse/downloads/drops/R-${pkgver}-${_date}/${pkgname}-SDK-${pkgver}-linux-gtk-${CARCH}.tar.gz"
-[ "$CARCH" = "x86_64" ] && md5sums[0]='b82be4ed2dabf9dc53188b9dc3891f32'
+[ "$CARCH" = "x86_64" ] && md5sums[0]='980360c038960dfa1ef7485faa317ec6'
 
 package() {
   cd "${srcdir}/eclipse"
@@ -51,8 +51,4 @@ package() {
   # install icon
   install -Dm644 ${srcdir}/eclipse.svg \
     ${pkgdir}/usr/share/icons/hicolor/scalable/apps/eclipse.svg
-
-  # fix python 2.7 path
-  sed -i 's|#!/usr/bin/python|#!/usr/bin/python2|' \
-    ${pkgdir}/usr/share/eclipse/plugins/org.apache.ant_1.7.1.v20100518-1145/bin/runant.py
 }
diff --git a/extra/haskell-cgi/PKGBUILD b/extra/haskell-cgi/PKGBUILD
index 608249fff..4b64ba578 100644
--- a/extra/haskell-cgi/PKGBUILD
+++ b/extra/haskell-cgi/PKGBUILD
@@ -4,12 +4,12 @@
 _hkgname=cgi
 pkgname=haskell-cgi
 pkgver=3001.1.7.4
-pkgrel=2.1
+pkgrel=3.1
 pkgdesc="A library for writing CGI programs"
 url="http://hackage.haskell.org/package/${_hkgname}"
 license=('custom:BSD3')
 arch=('i686' 'x86_64')
-depends=('ghc=7.0.2' 'haskell-mtl=2.0.1.0' 'haskell-network=2.3.0.2' 'haskell-parsec=3.1.1' 'haskell-xhtml=3000.2.0.1')
+depends=('ghc=7.0.3-2' 'haskell-mtl=2.0.1.0-3.1' 'haskell-network=2.3.0.2-2.1' 'haskell-parsec=3.1.1-2.1' 'haskell-xhtml=3000.2.0.1-7.1')
 options=('strip')
 source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
 install=${pkgname}.install
diff --git a/extra/haskell-deepseq/PKGBUILD b/extra/haskell-deepseq/PKGBUILD
index f9a01956b..934303f2b 100644
--- a/extra/haskell-deepseq/PKGBUILD
+++ b/extra/haskell-deepseq/PKGBUILD
@@ -4,12 +4,12 @@
 _hkgname=deepseq
 pkgname=haskell-deepseq
 pkgver=1.1.0.2
-pkgrel=1.1
+pkgrel=2.1
 pkgdesc="Fully evaluate data structures"
 url="http://hackage.haskell.org/package/${_hkgname}"
 license=('custom:BSD3')
 arch=('i686' 'x86_64')
-depends=(ghc=7.0.2 sh)
+depends=(ghc=7.0.3-2 sh)
 options=('strip')
 source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
 install=${pkgname}.install
diff --git a/extra/haskell-fgl/PKGBUILD b/extra/haskell-fgl/PKGBUILD
index 840016e0e..45f466e91 100644
--- a/extra/haskell-fgl/PKGBUILD
+++ b/extra/haskell-fgl/PKGBUILD
@@ -2,20 +2,20 @@
 _hkgname=fgl
 pkgname=haskell-fgl
 pkgver=5.4.2.3
-pkgrel=3.2
+pkgrel=4.1
 pkgdesc="Martin Erwig's Functional Graph Library"
 url="http://hackage.haskell.org/package/${_hkgname}"
 license=('custom:BSD3')
 arch=('i686' 'x86_64')
 makedepends=()
-depends=('ghc=7.0.2' 'haskell-mtl=2.0.1.0')
+depends=('ghc=7.0.3-2' 'haskell-mtl=2.0.1.0-3.1')
 options=('strip')
 source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
 install=${pkgname}.install
 md5sums=('29ccab8bebed16a8d7346c3ed52c5d9c')
 build() {
     cd ${srcdir}/${_hkgname}-${pkgver}
-    runhaskell Setup configure -O --enable-split-objs --enable-shared \
+    runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
        --prefix=/usr --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid
     runhaskell Setup build
     runhaskell Setup haddock
diff --git a/extra/haskell-glut/PKGBUILD b/extra/haskell-glut/PKGBUILD
index 3682828e0..98a30495c 100644
--- a/extra/haskell-glut/PKGBUILD
+++ b/extra/haskell-glut/PKGBUILD
@@ -2,13 +2,13 @@
 _hkgname=GLUT
 pkgname=haskell-glut
 pkgver=2.1.2.1
-pkgrel=5.2
+pkgrel=7.1
 pkgdesc="A binding for the OpenGL Utility Toolkit"
 url="http://hackage.haskell.org/package/${_hkgname}"
 license=('custom:BSD3')
 arch=('i686' 'x86_64')
 makedepends=()
-depends=('ghc=7.0.2' 'haskell-opengl=2.2.3.0' 'freeglut')
+depends=('ghc=7.0.3-2' 'haskell-opengl=2.2.3.0-7.1' 'freeglut')
 options=('strip')
 source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
 install=${pkgname}.install
@@ -16,7 +16,7 @@ md5sums=('b97f476a04098701e330e86c1f89ed52')
 
 build() {
     cd ${srcdir}/${_hkgname}-${pkgver}
-    runhaskell Setup configure -O --enable-split-objs --enable-shared \
+    runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
        --prefix=/usr --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid
     runhaskell Setup build
     runhaskell Setup haddock
diff --git a/extra/haskell-haskell-src/PKGBUILD b/extra/haskell-haskell-src/PKGBUILD
index 6dbed0bed..eeb4844a7 100644
--- a/extra/haskell-haskell-src/PKGBUILD
+++ b/extra/haskell-haskell-src/PKGBUILD
@@ -3,12 +3,12 @@
 _hkgname=haskell-src
 pkgname=haskell-haskell-src
 pkgver=1.0.1.4
-pkgrel=1.1
+pkgrel=2.1
 pkgdesc="Facilities for manipulating Haskell source code: an abstract syntax, lexer, parser and pretty-printer."
 url="http://hackage.haskell.org/package/${_hkgname}"
 license=('custom:BSD3')
 arch=('i686' 'x86_64')
-depends=('ghc=7.0.2' 'haskell-syb=0.3' sh)
+depends=('ghc=7.0.3-2' 'haskell-syb=0.3-2.1' sh)
 makedepends=(happy)
 options=('strip')
 source=(http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz)
diff --git a/extra/haskell-html/PKGBUILD b/extra/haskell-html/PKGBUILD
index 255e98645..1d207117e 100644
--- a/extra/haskell-html/PKGBUILD
+++ b/extra/haskell-html/PKGBUILD
@@ -4,12 +4,12 @@
 _hkgname=html
 pkgname=haskell-html
 pkgver=1.0.1.2
-pkgrel=8.1
+pkgrel=9.1
 pkgdesc="HTML combinator library"
 url="http://hackage.haskell.org/package/html"
 license=('custom:BSD3')
 arch=('i686' 'x86_64')
-depends=(ghc=7.0.2 sh)
+depends=(ghc=7.0.3-2 sh)
 options=('strip')
 source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
 install=${pkgname}.install
diff --git a/extra/haskell-http/PKGBUILD b/extra/haskell-http/PKGBUILD
index 974119394..d1106c478 100644
--- a/extra/haskell-http/PKGBUILD
+++ b/extra/haskell-http/PKGBUILD
@@ -4,12 +4,12 @@
 _hkgname=HTTP
 pkgname=haskell-http
 pkgver=4000.1.1
-pkgrel=2.1
+pkgrel=3.1
 pkgdesc="A library for client-side HTTP"
 url="http://hackage.haskell.org/package/${_hkgname}"
 license=('custom:BSD3')
 arch=('i686' 'x86_64')
-depends=('ghc=7.0.2' sh 'haskell-network=2.3.0.2' 'haskell-parsec=3.1.1' 'haskell-mtl=2.0.1.0')
+depends=('ghc=7.0.3-2' sh 'haskell-network=2.3.0.2-2.1' 'haskell-parsec=3.1.1-2.1' 'haskell-mtl=2.0.1.0-3.1')
 options=('strip')
 source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
 install=${pkgname}.install
diff --git a/extra/haskell-hunit/PKGBUILD b/extra/haskell-hunit/PKGBUILD
index a64b87af8..401887e4e 100644
--- a/extra/haskell-hunit/PKGBUILD
+++ b/extra/haskell-hunit/PKGBUILD
@@ -3,12 +3,12 @@
 _hkgname=HUnit
 pkgname=haskell-hunit
 pkgver=1.2.2.3
-pkgrel=1.1
+pkgrel=2.1
 pkgdesc="A unit testing framework for Haskell"
 url="http://hackage.haskell.org/package/${_hkgname}"
 license=('custom:BSD3')
 arch=('i686' 'x86_64')
-depends=(ghc=7.0.2 sh)
+depends=(ghc=7.0.3-2 sh)
 options=('strip')
 source=(http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz)
 install=${pkgname}.install
diff --git a/extra/haskell-mtl/PKGBUILD b/extra/haskell-mtl/PKGBUILD
index 48ba57a3a..e0ee184de 100644
--- a/extra/haskell-mtl/PKGBUILD
+++ b/extra/haskell-mtl/PKGBUILD
@@ -3,12 +3,12 @@
 _hkgname=mtl
 pkgname=haskell-mtl
 pkgver=2.0.1.0
-pkgrel=1.1
+pkgrel=3.1
 pkgdesc="Monad transformer library"
 url="http://hackage.haskell.org/package/${_hkgname}"
 license=('custom:BSD3')
 arch=('i686' 'x86_64')
-depends=(ghc=7.0.2 sh 'haskell-transformers=0.2.2.0')
+depends=(ghc=7.0.3-2 sh 'haskell-transformers=0.2.2.0-3.1')
 options=('strip')
 source=(http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz)
 install=${pkgname}.install
diff --git a/extra/haskell-network/PKGBUILD b/extra/haskell-network/PKGBUILD
index 0aad81e65..372cdf623 100644
--- a/extra/haskell-network/PKGBUILD
+++ b/extra/haskell-network/PKGBUILD
@@ -4,12 +4,12 @@
 _hkgname=network
 pkgname=haskell-network
 pkgver=2.3.0.2
-pkgrel=1.1
+pkgrel=2.1
 pkgdesc="Networking-related facilities"
 url="http://hackage.haskell.org/package/network"
 license=('custom:BSD3')
 arch=('i686' 'x86_64')
-depends=(ghc=7.0.2 sh 'haskell-parsec=3.1.1')
+depends=(ghc=7.0.3-2 sh 'haskell-parsec=3.1.1-2.1')
 options=('strip')
 source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
 install=${pkgname}.install
diff --git a/extra/haskell-opengl/PKGBUILD b/extra/haskell-opengl/PKGBUILD
index e07975cf9..8d70bbc91 100644
--- a/extra/haskell-opengl/PKGBUILD
+++ b/extra/haskell-opengl/PKGBUILD
@@ -2,20 +2,20 @@
 _hkgname=OpenGL
 pkgname=haskell-opengl
 pkgver=2.2.3.0
-pkgrel=5.2
+pkgrel=7.1
 pkgdesc="A binding for the OpenGL graphics system"
 url="http://hackage.haskell.org/package/${_hkgname}"
 license=('custom:BSD3')
 arch=('i686' 'x86_64')
-makedepends=()
-depends=('ghc=7.0.2' 'mesa')
+depends=('ghc=7.0.3-2' 'mesa')
 options=('strip')
 source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
 install=${pkgname}.install
 md5sums=('f4e3ccb471034a6a74921d4dab9dd32d')
+
 build() {
     cd ${srcdir}/${_hkgname}-${pkgver}
-    runhaskell Setup configure -O --enable-split-objs --enable-shared \
+    runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
        --prefix=/usr --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid
     runhaskell Setup build
     runhaskell Setup haddock
diff --git a/extra/haskell-parallel/PKGBUILD b/extra/haskell-parallel/PKGBUILD
index 93f43095e..0e46c2c93 100644
--- a/extra/haskell-parallel/PKGBUILD
+++ b/extra/haskell-parallel/PKGBUILD
@@ -4,12 +4,12 @@
 _hkgname=parallel
 pkgname=haskell-parallel
 pkgver=3.1.0.1
-pkgrel=2.1
+pkgrel=3.1
 pkgdesc="Parallel programming library"
 url="http://hackage.haskell.org/package/${_hkgname}"
 license=('custom:BSD3')
 arch=('i686' 'x86_64')
-depends=(ghc=7.0.2 sh 'haskell-deepseq=1.1.0.2')
+depends=(ghc=7.0.3-2 sh 'haskell-deepseq=1.1.0.2-2.1')
 options=('strip')
 source=(http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz)
 install=${pkgname}.install
diff --git a/extra/haskell-parsec/PKGBUILD b/extra/haskell-parsec/PKGBUILD
index e6928946c..0810df75b 100644
--- a/extra/haskell-parsec/PKGBUILD
+++ b/extra/haskell-parsec/PKGBUILD
@@ -4,12 +4,12 @@
 _hkgname=parsec
 pkgname=haskell-parsec
 pkgver=3.1.1
-pkgrel=1.1
+pkgrel=2.1
 pkgdesc="Monadic parser combinators"
 url="http://hackage.haskell.org/package/${_hkgname}"
 license=('custom:BSD3')
 arch=('i686' 'x86_64')
-depends=(ghc=7.0.2 sh 'haskell-mtl=2.0.1.0')
+depends=(ghc=7.0.3-2 sh 'haskell-mtl=2.0.1.0-3.1')
 options=('strip')
 source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
 install=${pkgname}.install
diff --git a/extra/haskell-platform/PKGBUILD b/extra/haskell-platform/PKGBUILD
index 57a3a2c9b..2534d95c2 100644
--- a/extra/haskell-platform/PKGBUILD
+++ b/extra/haskell-platform/PKGBUILD
@@ -1,38 +1,38 @@
 # Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
 pkgname=haskell-platform
 pkgver=2011.2.0.0
-pkgrel=2.1
+pkgrel=4
 pkgdesc="The Haskell Platform"
 url="http://hackage.haskell.org/platform/"
 license=('custom:BSD3')
 arch=('i686' 'x86_64')
-depends=('ghc=7.0.2' 
-         'haskell-glut=2.1.2.1' 
-         'haskell-http=4000.1.1'
-         'haskell-hunit=1.2.2.3'
-         'haskell-opengl=2.2.3.0'
-         'haskell-quickcheck=2.4.0.1'
-         'haskell-cgi=3001.1.7.4'
-         'haskell-deepseq=1.1.0.2'
-         'haskell-fgl=5.4.2.3'
-         'haskell-haskell-src=1.0.1.4'
-         'haskell-html=1.0.1.2'
-         'haskell-mtl=2.0.1.0'
-         'haskell-network=2.3.0.2'
-         'haskell-parallel=3.1.0.1'
-         'haskell-parsec=3.1.1'
-         'haskell-regex-base=0.93.2'
-         'haskell-regex-compat=0.93.1'
-         'haskell-regex-posix=0.94.4'
-         'haskell-stm=2.2.0.1'
-         'haskell-syb=0.3'
-         'haskell-text=0.11.0.5'
-         'haskell-transformers=0.2.2.0'
-         'haskell-xhtml=3000.2.0.1'
-         'haskell-zlib=0.5.3.1'
+depends=('ghc=7.0.3-2' 
+         'haskell-glut=2.1.2.1-7.1' 
+         'haskell-http=4000.1.1-3.1'
+         'haskell-hunit=1.2.2.3-2.1'
+         'haskell-opengl=2.2.3.0-7.1'
+         'haskell-quickcheck=2.4.0.1-3.1'
+         'haskell-cgi=3001.1.7.4-3.1'
+         'haskell-deepseq=1.1.0.2-2.1'
+         'haskell-fgl=5.4.2.3-4.1'
+         'haskell-haskell-src=1.0.1.4-2.1'
+         'haskell-html=1.0.1.2-9.1'
+         'haskell-mtl=2.0.1.0-3.1'
+         'haskell-network=2.3.0.2-2.1'
+         'haskell-parallel=3.1.0.1-3.1'
+         'haskell-parsec=3.1.1-2.1'
+         'haskell-regex-base=0.93.2-4.1'
+         'haskell-regex-posix=0.94.4-2.1'
+         'haskell-regex-compat=0.93.1-4.1'	
+         'haskell-stm=2.2.0.1-2.1'
+         'haskell-syb=0.3-2.1'
+         'haskell-text=0.11.0.5-2.1'
+         'haskell-transformers=0.2.2.0-3.1'
+         'haskell-xhtml=3000.2.0.1-7.1'
+         'haskell-zlib=0.5.3.1-2.1'
          'cabal-install=0.10.2'
          'alex=2.3.5'
-         'happy=1.18.6')
+         'happy=1.18.6' )
 
 build() {
   return 0 
diff --git a/extra/haskell-quickcheck/PKGBUILD b/extra/haskell-quickcheck/PKGBUILD
index bf911846b..ab05c75f7 100644
--- a/extra/haskell-quickcheck/PKGBUILD
+++ b/extra/haskell-quickcheck/PKGBUILD
@@ -4,12 +4,12 @@
 _hkgname=QuickCheck
 pkgname=haskell-quickcheck
 pkgver=2.4.0.1
-pkgrel=2.1
+pkgrel=3.1
 pkgdesc="Automatic testing of Haskell programs"
 url="http://hackage.haskell.org/package/QuickCheck"
 license=('custom:BSD3')
 arch=('i686' 'x86_64')
-depends=(ghc=7.0.2 haskell-mtl=2.0.1.0 sh)
+depends=(ghc=7.0.3-2 haskell-mtl=2.0.1.0-3.1 sh)
 options=('strip')
 source=(http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz)
 install=${pkgname}.install
diff --git a/extra/haskell-regex-base/PKGBUILD b/extra/haskell-regex-base/PKGBUILD
index e73d781d5..57721d39b 100644
--- a/extra/haskell-regex-base/PKGBUILD
+++ b/extra/haskell-regex-base/PKGBUILD
@@ -3,12 +3,12 @@
 _hkgname=regex-base
 pkgname=haskell-regex-base
 pkgver=0.93.2
-pkgrel=3.1
+pkgrel=4.1
 pkgdesc="Interface API for regex-posix,pcre,parsec,tdfa,dfa"
 url="http://hackage.haskell.org/cgi-bin/hackage-scripts/package/regex-base"
 license=('custom:BSD3')
 arch=('i686' 'x86_64')
-depends=(ghc=7.0.2 sh 'haskell-mtl=2.0.1.0')
+depends=(ghc=7.0.3-2 sh 'haskell-mtl=2.0.1.0-3.1')
 options=('strip')
 source=(http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz)
 install=${pkgname}.install
diff --git a/extra/haskell-regex-compat/PKGBUILD b/extra/haskell-regex-compat/PKGBUILD
index cb643a135..507a96618 100644
--- a/extra/haskell-regex-compat/PKGBUILD
+++ b/extra/haskell-regex-compat/PKGBUILD
@@ -3,12 +3,12 @@
 _hkgname=regex-compat
 pkgname=haskell-regex-compat
 pkgver=0.93.1
-pkgrel=3.1
+pkgrel=4.1
 pkgdesc="Replaces and enhances Text.Regex"
 url="http://hackage.haskell.org/package/${_hkgname}"
 license=('custom:BSD3')
 arch=('i686' 'x86_64')
-depends=(ghc=7.0.2 sh 'haskell-regex-base' 'haskell-regex-posix=0.94.4')
+depends=(ghc=7.0.3-2 sh 'haskell-regex-base=0.93.2-4.1' 'haskell-regex-posix=0.94.4-2.1')
 options=('strip')
 source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
 install=${pkgname}.install
diff --git a/extra/haskell-regex-posix/PKGBUILD b/extra/haskell-regex-posix/PKGBUILD
index 84d157d4a..3b00616eb 100644
--- a/extra/haskell-regex-posix/PKGBUILD
+++ b/extra/haskell-regex-posix/PKGBUILD
@@ -3,12 +3,12 @@
 _hkgname=regex-posix
 pkgname=haskell-regex-posix
 pkgver=0.94.4
-pkgrel=1.1
+pkgrel=2.1
 pkgdesc="The posix regex backend for regex-base"
 url="http://hackage.haskell.org/package/${_hkgname}"
 license=('custom:BSD3')
 arch=('i686' 'x86_64')
-depends=(ghc=7.0.2 sh 'haskell-regex-base=0.93.2')
+depends=(ghc=7.0.3-2 sh 'haskell-regex-base=0.93.2-4.1')
 options=('strip')
 source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
 install=${pkgname}.install
diff --git a/extra/haskell-stm/PKGBUILD b/extra/haskell-stm/PKGBUILD
index 0506c9dbf..9a9c9a962 100644
--- a/extra/haskell-stm/PKGBUILD
+++ b/extra/haskell-stm/PKGBUILD
@@ -4,12 +4,12 @@
 _hkgname=stm
 pkgname=haskell-stm
 pkgver=2.2.0.1
-pkgrel=1.1
+pkgrel=2.1
 pkgdesc="A modular composable concurrency abstraction."
 url="http://hackage.haskell.org/package/stm"
 license=('custom:BSD3')
 arch=('i686' 'x86_64')
-depends=(ghc=7.0.2 sh)
+depends=(ghc=7.0.3-2 sh)
 options=('strip')
 source=(http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz)
 install=${pkgname}.install
diff --git a/extra/haskell-syb/PKGBUILD b/extra/haskell-syb/PKGBUILD
index c2325d7cc..64faf05ed 100644
--- a/extra/haskell-syb/PKGBUILD
+++ b/extra/haskell-syb/PKGBUILD
@@ -3,12 +3,12 @@
 _hkgname=syb
 pkgname=haskell-syb
 pkgver=0.3
-pkgrel=1.2
+pkgrel=2.1
 pkgdesc="A library for client-side HTTP"
 url="http://hackage.haskell.org/package/${_hkgname}"
 license=('custom:BSD3')
 arch=('i686' 'x86_64')
-depends=('ghc=7.0.2' sh)
+depends=('ghc=7.0.3-2' sh)
 options=('strip')
 source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
 install=${pkgname}.install
diff --git a/extra/haskell-text/PKGBUILD b/extra/haskell-text/PKGBUILD
index 20b0d25e5..7dbc1ce17 100644
--- a/extra/haskell-text/PKGBUILD
+++ b/extra/haskell-text/PKGBUILD
@@ -3,12 +3,12 @@
 _hkgname=text
 pkgname=haskell-text
 pkgver=0.11.0.5
-pkgrel=1.1
+pkgrel=2.1
 pkgdesc="An efficient packed Unicode text type."
 url="http://hackage.haskell.org/package/${_hkgname}"
 license=('custom:BSD3')
 arch=('i686' 'x86_64')
-depends=('ghc=7.0.2' sh 'haskell-deepseq=1.1.0.2')
+depends=('ghc=7.0.3-2' sh 'haskell-deepseq=1.1.0.2-2.1')
 options=('strip')
 source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
 install=${pkgname}.install
diff --git a/extra/haskell-transformers/PKGBUILD b/extra/haskell-transformers/PKGBUILD
index 3e5d66a47..446b2ffca 100644
--- a/extra/haskell-transformers/PKGBUILD
+++ b/extra/haskell-transformers/PKGBUILD
@@ -1,15 +1,15 @@
 # Maintainer: Rémy Oudompheng <remy@archlinux.org>
-# $Id: PKGBUILD 114165 2011-03-11 05:13:33Z vesa $
+# $Id: PKGBUILD 128119 2011-06-22 11:19:38Z vesa $
 
 _hkgname=transformers
 pkgname=haskell-transformers
 pkgver=0.2.2.0
-pkgrel=1.2
+pkgrel=3.1
 pkgdesc="Concrete functor and monad transformers"
 url="http://hackage.haskell.org/package/${_hkgname}"
 license=('custom:BSD3')
 arch=('i686' 'x86_64')
-depends=(ghc=7.0.2 sh)
+depends=(ghc=7.0.3-2 sh)
 options=('strip')
 source=(http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz)
 install=${pkgname}.install
diff --git a/extra/haskell-xhtml/PKGBUILD b/extra/haskell-xhtml/PKGBUILD
index cbe80cfbe..4a34206ad 100644
--- a/extra/haskell-xhtml/PKGBUILD
+++ b/extra/haskell-xhtml/PKGBUILD
@@ -4,12 +4,12 @@
 _hkgname=xhtml
 pkgname=haskell-xhtml
 pkgver=3000.2.0.1
-pkgrel=6.1
+pkgrel=7.1
 pkgdesc="Combinators for producing XHTML 1.0, including the Strict, Transitional and Frameset variants."
 url="http://hackage.haskell.org/package/xhtml"
 license=('custom:BSD3')
 arch=('i686' 'x86_64')
-depends=(ghc=7.0.2 sh)
+depends=(ghc=7.0.3-2 sh)
 options=('strip')
 source=(http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz)
 install=${pkgname}.install
diff --git a/extra/haskell-zlib/PKGBUILD b/extra/haskell-zlib/PKGBUILD
index eabdd83c2..22a9eb932 100644
--- a/extra/haskell-zlib/PKGBUILD
+++ b/extra/haskell-zlib/PKGBUILD
@@ -4,12 +4,12 @@
 _hkgname=zlib
 pkgname=haskell-zlib
 pkgver=0.5.3.1
-pkgrel=1.1
+pkgrel=2.1
 pkgdesc="Compression and decompression in the gzip and zlib formats"
 url="http://hackage.haskell.org/package/zlib"
 license=('custom:BSD3')
 arch=('i686' 'x86_64')
-depends=(ghc=7.0.2 'zlib' sh)
+depends=(ghc=7.0.3-2 'zlib' sh)
 options=('strip')
 source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
 install=${pkgname}.install
diff --git a/extra/kdevelop-php/PKGBUILD b/extra/kdevelop-php/PKGBUILD
index aaca1eb81..bdf4aab89 100644
--- a/extra/kdevelop-php/PKGBUILD
+++ b/extra/kdevelop-php/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 118377 2011-04-06 12:39:21Z andrea $
+# $Id: PKGBUILD 128655 2011-06-25 11:01:42Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdevelop-php
-pkgver=1.2.2
-_pkgver=4.2.2
+pkgver=1.2.3
+_pkgver=4.2.3
 pkgrel=1
 pkgdesc="PHP language and documentation plugin for KDevelop/Quanta"
 arch=('i686' 'x86_64')
@@ -16,11 +16,11 @@ conflicts=('kdevelop-php-docs')
 options=('!makeflags')
 source=("http://download.kde.org/stable/kdevelop/${_pkgver}/src/${pkgname}-${pkgver}.tar.bz2"
         "http://download.kde.org/stable/kdevelop/${_pkgver}/src/${pkgname}-docs-${pkgver}.tar.bz2")
-sha1sums=('0c9e4bdda868c8e2432a24727cc3e512a4a66997'
-          'bb668e8c5dcc92dfb6b879b1a2beb27de384da2a')
+sha1sums=('b0dc43cf01d2005f2ad66872ce6b49b093a7ceb4'
+          'e399465638457fe015e920227e3aca5a53716804')
 
 build() {
-  cd ${srcdir}
+  cd "${srcdir}"
   mkdir build
   cd build
   cmake ../${pkgname}-${pkgver} \
@@ -28,7 +28,7 @@ build() {
     -DCMAKE_BUILD_TYPE=Release
   make
 
-  cd ${srcdir}
+  cd "${srcdir}"
   mkdir build-docs
   cd build-docs
   # kdevelop-php-docs
@@ -39,9 +39,9 @@ build() {
 }
 
 package() {
-  cd ${srcdir}/build
-  make DESTDIR=${pkgdir} install
+  cd "${srcdir}/build"
+  make DESTDIR="${pkgdir}" install
 
-  cd ${srcdir}/build-docs
-  make DESTDIR=${pkgdir} install
+  cd "${srcdir}"/build-docs
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/kdevelop/PKGBUILD b/extra/kdevelop/PKGBUILD
index 88c87c3d0..4a56b46c2 100644
--- a/extra/kdevelop/PKGBUILD
+++ b/extra/kdevelop/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 118376 2011-04-06 12:39:07Z andrea $
+# $Id: PKGBUILD 128650 2011-06-25 11:00:37Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 
 pkgname=kdevelop
-pkgver=4.2.2
+pkgver=4.2.3
 pkgrel=1
 pkgdesc="A C/C++ development environment for KDE"
 arch=('i686' 'x86_64')
@@ -13,10 +13,10 @@ depends=('kdebase-workspace' 'kdevplatform' 'kdesdk-okteta')
 makedepends=('cmake' 'automoc4' 'perl')
 install="${pkgname}.install"
 source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('943f86edd0f353bfa4c614972af222a1c7075755')
+sha1sums=('e87ae29b343df3fea9bda7d8d85ec696e57b68e4')
 
 build() {
-  cd ${srcdir}
+  cd "${srcdir}"
   mkdir build
   cd build 
   cmake ../${pkgname}-${pkgver} \
@@ -26,6 +26,6 @@ build() {
 }
 
 package() {
-  cd ${srcdir}/build
-  make DESTDIR=${pkgdir} install
+  cd "${srcdir}"/build
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/kdevplatform/PKGBUILD b/extra/kdevplatform/PKGBUILD
index 2226dc645..b77ab5dd6 100644
--- a/extra/kdevplatform/PKGBUILD
+++ b/extra/kdevplatform/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 118366 2011-04-06 12:37:13Z andrea $
+# $Id: PKGBUILD 128645 2011-06-25 10:59:34Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 
 pkgname=kdevplatform
-pkgver=1.2.2
-_pkgver=4.2.2
+pkgver=1.2.3
+_pkgver=4.2.3
 pkgrel=1
 pkgdesc="A C/C++ development platform for KDE"
 arch=('i686' 'x86_64')
@@ -15,10 +15,10 @@ optdepends=("kdesdk-kompare: difference checking")
 makedepends=('cmake' 'automoc4' 'boost')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/kdevelop/${_pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('7b3c0d3e3e66fe1c959b3343e7283e4212014e92')
+sha1sums=('c8badd157c2477b1b299403d01d40f68a1ba14cd')
 
 build() {
-  cd ${srcdir}
+  cd "${srcdir}"
   mkdir build
   cd build 
   cmake ../${pkgname}-${pkgver} \
@@ -28,6 +28,6 @@ build() {
 }
 
 package() {
-  cd ${srcdir}/build
-  make DESTDIR=${pkgdir} install
+  cd "${srcdir}"/build
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/libjpeg-turbo/PKGBUILD b/extra/libjpeg-turbo/PKGBUILD
index 3623e1dd5..96e9e69b5 100644
--- a/extra/libjpeg-turbo/PKGBUILD
+++ b/extra/libjpeg-turbo/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 124693 2011-05-24 03:40:20Z eric $
+# $Id: PKGBUILD 129225 2011-06-26 02:06:08Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Contributor: Simone Sclavi 'Ito' <darkhado@gmail.com>
 
 pkgname=libjpeg-turbo
 pkgver=1.1.1
-pkgrel=1
+pkgrel=3
 pkgdesc="libjpeg derivative with accelerated baseline JPEG compression and decompression"
 arch=('i686' 'x86_64')
 url="http://libjpeg-turbo.virtualgl.org/"
@@ -29,5 +29,14 @@ package() {
   cd "$srcdir/$pkgname-$pkgver"
 
   make DESTDIR="$pkgdir/" install
+  
+  # provide jpegint.h as it is required by various software
+  install -m644 jpegint.h $pkgdir/usr/include/
+  
+  # do not distributre libturbojpeg as it is unversioned
+  rm $pkgdir/usr/lib/libturbojpeg.{so,a}
+  rm $pkgdir/usr/include/turbojpeg.h
+  rm $pkgdir/usr/bin/jpgtest
+  
   install -Dm644 LICENSE.txt "$pkgdir/usr/share/licenses/libjpeg-turbo/LICENSE"
 }
diff --git a/extra/mpd/ChangeLog b/extra/mpd/ChangeLog
new file mode 100644
index 000000000..56ccb2263
--- /dev/null
+++ b/extra/mpd/ChangeLog
@@ -0,0 +1,5 @@
+2011-06-25 Angel Velasquez <angvp@archlinux.org>
+    * Added a patch for bug with ffmpeg FS#24839 
+
+
+# vim: set ft=changelog ts=4 sw=4 et:
diff --git a/extra/mpd/PKGBUILD b/extra/mpd/PKGBUILD
index acdf209ef..046904a22 100644
--- a/extra/mpd/PKGBUILD
+++ b/extra/mpd/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 127604 2011-06-16 17:50:00Z angvp $
+# $Id: PKGBUILD 128638 2011-06-25 09:54:26Z angvp $
 # Maintainer: Angel Velasquez <angvp@archlinux.org>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Damir Perisa <damir.perisa@bluewin.ch>
@@ -6,7 +6,7 @@
 
 pkgname=mpd
 pkgver=0.16.3
-pkgrel=1
+pkgrel=2
 pkgdesc="Music daemon that plays MP3, FLAC, and Ogg Vorbis files"
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -16,10 +16,13 @@ depends=('libao' 'ffmpeg' 'libmodplug' 'audiofile' 'libshout' 'libmad' 'curl' 'f
          'libpulse')
 makedepends=('pkgconfig' 'doxygen')
 install=${pkgname}.install
+changelog=ChangeLog
 source=("http://downloads.sourceforge.net/musicpd/${pkgname}-${pkgver}.tar.bz2"
-        'mpd')
+        'mpd' 
+        'mpd-0.16.3_ffmpeg_sigsegv.patch')
 md5sums=('6e708c02b0e8c288aec855eecf441a5a'
-         'e5669c2bff4031928531e52475addeb1')
+         'e5669c2bff4031928531e52475addeb1'
+         '9a730957e213c62339e9335971e4b85e')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
@@ -32,6 +35,7 @@ build() {
     --disable-libwrap \
     --disable-cue \
     --disable-sidplay 
+  patch -Np1 -i $srcdir/mpd-0.16.3_ffmpeg_sigsegv.patch
   make
 }
 
diff --git a/extra/mpd/mpd-0.16.3_ffmpeg_sigsegv.patch b/extra/mpd/mpd-0.16.3_ffmpeg_sigsegv.patch
new file mode 100644
index 000000000..a945a0a6a
--- /dev/null
+++ b/extra/mpd/mpd-0.16.3_ffmpeg_sigsegv.patch
@@ -0,0 +1,21 @@
+diff -ur mpd-0.16.3.orig/src/decoder/ffmpeg_decoder_plugin.c mpd-0.16.3/src/decoder/ffmpeg_decoder_plugin.c
+--- mpd-0.16.3.orig/src/decoder/ffmpeg_decoder_plugin.c	2011-06-04 17:36:33.000000000 +0300
++++ mpd-0.16.3/src/decoder/ffmpeg_decoder_plugin.c	2011-06-24 18:18:51.840218251 +0300
+@@ -321,7 +321,7 @@
+ 	}
+ 
+ 	//ffmpeg works with ours "fileops" helper
+-	AVFormatContext *format_context;
++	AVFormatContext *format_context = NULL;
+ 	if (av_open_input_stream(&format_context, stream->io, input->uri,
+ 				 input_format, NULL) != 0) {
+ 		g_warning("Open failed\n");
+@@ -470,7 +470,7 @@
+ 	if (stream == NULL)
+ 		return NULL;
+ 
+-	AVFormatContext *f;
++	AVFormatContext *f = NULL;
+ 	if (av_open_input_stream(&f, stream->io, is->uri,
+ 				 input_format, NULL) != 0) {
+ 		mpd_ffmpeg_stream_close(stream);
diff --git a/extra/tcl/PKGBUILD b/extra/tcl/PKGBUILD
index acce9e847..49a3581d8 100644
--- a/extra/tcl/PKGBUILD
+++ b/extra/tcl/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 90377 2010-09-11 03:54:51Z allan $
+# $Id: PKGBUILD 128924 2011-06-25 14:08:35Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Committer: Judd Vinet <jvinet@zeroflux.org>
 
 pkgname=tcl
-pkgver=8.5.9
+pkgver=8.5.10
 pkgrel=1
 pkgdesc="The Tcl scripting language"
 arch=('i686' 'x86_64')
@@ -11,7 +11,7 @@ url="http://tcl.sourceforge.net/"
 license=('custom')
 depends=('glibc')
 source=(http://downloads.sourceforge.net/sourceforge/tcl/tcl${pkgver}-src.tar.gz)
-md5sums=('8512d8db3233041dd68a81476906012a')
+md5sums=('a08eaf8467c0631937067c1948dd326b')
 
 build() {
   cd ${srcdir}/tcl${pkgver}/unix
diff --git a/extra/tk/PKGBUILD b/extra/tk/PKGBUILD
index 4b1807027..cb89106d8 100644
--- a/extra/tk/PKGBUILD
+++ b/extra/tk/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 90372 2010-09-11 03:52:30Z allan $
+# $Id: PKGBUILD 128929 2011-06-25 14:10:32Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Contributor: Judd Vinet <jvinet@zeroflux.org>
 
 pkgname=tk
-pkgver=8.5.9
+pkgver=8.5.10
 pkgrel=1
 pkgdesc="A windowing toolkit for use with tcl"
 arch=('i686' 'x86_64')
@@ -11,7 +11,7 @@ url="http://tcl.sourceforge.net/"
 license=('custom')
 depends=("tcl=${pkgver}" 'libxss' 'libxft')
 source=(http://downloads.sourceforge.net/sourceforge/tcl/tk${pkgver}-src.tar.gz)
-md5sums=('7cdeb9feb61593f58a0ae61f2497580e')
+md5sums=('adfdaca46cc95fec8557df8ecdb0715c')
 
 build() {
   cd ${srcdir}/tk${pkgver}/unix
diff --git a/extra/xf86-input-wacom/PKGBUILD b/extra/xf86-input-wacom/PKGBUILD
index 2ee290485..7c96f58c0 100644
--- a/extra/xf86-input-wacom/PKGBUILD
+++ b/extra/xf86-input-wacom/PKGBUILD
@@ -1,9 +1,10 @@
-# $Id: PKGBUILD 115476 2011-03-18 08:17:07Z andyrtr $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
+# $Id: PKGBUILD 128917 2011-06-25 14:03:51Z heftig $
+# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
+# Contributor: Jan de Groot <jgc@archlinux.org>
 # Contributor: M Rawash <mrawash@gmail.com>
 
 pkgname=xf86-input-wacom
-pkgver=0.10.9
+pkgver=0.11.1
 pkgrel=1
 pkgdesc="X.Org Wacom tablet driver"
 arch=('i686' 'x86_64')
@@ -16,13 +17,17 @@ conflicts=('xorg-server<1.10.0')
 options=(!libtool)
 source=(http://downloads.sourceforge.net/project/linuxwacom/${pkgname}/${pkgname}-${pkgver}.tar.bz2
         70-wacom.rules)
-md5sums=('8af337d2919995f39ff19d8a890ea222'
+md5sums=('0aec4a338cc583ed497b6af68d6d80ab'
          '4d3665bb2ef8a8190734640dffa4c6f7')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   ./configure --prefix=/usr --with-xorg-conf-dir=/etc/X11/xorg.conf.d
   make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}" install
 
   install -m755 -d "${pkgdir}/lib/udev/rules.d"
diff --git a/kde-unstable/kdeaccessibility/PKGBUILD b/kde-unstable/kdeaccessibility/PKGBUILD
index 9fe34bcd9..df662afc7 100644
--- a/kde-unstable/kdeaccessibility/PKGBUILD
+++ b/kde-unstable/kdeaccessibility/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 125373 2011-05-26 10:37:17Z andrea $
+# $Id: PKGBUILD 128546 2011-06-24 12:53:08Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
@@ -8,7 +8,7 @@ pkgname=('kdeaccessibility-jovie'
          'kdeaccessibility-kmag'
          'kdeaccessibility-kmousetool'
          'kdeaccessibility-kmouth')
-pkgver=4.6.80
+pkgver=4.6.90
 pkgrel=1
 arch=('i686' 'x86_64')
 url='http://accessibility.kde.org'
@@ -16,7 +16,7 @@ license=('GPL' 'FDL')
 groups=('kde' 'kdeaccessibility')
 makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdelibs' 'speech-dispatcher')
 source=("http://download.kde.org/unstable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
-sha1sums=('a8d4ca99dadc9439b6a1ee91645527f954665cb1')
+sha1sums=('8e6b90d52a7b7b4e8544186f5384683d11c7e224')
 
 build() {
 	cd ${srcdir}
diff --git a/kde-unstable/kdeadmin/PKGBUILD b/kde-unstable/kdeadmin/PKGBUILD
index ceac7ec49..16066692f 100644
--- a/kde-unstable/kdeadmin/PKGBUILD
+++ b/kde-unstable/kdeadmin/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 124778 2011-05-24 11:55:25Z andrea $
+# $Id: PKGBUILD 128547 2011-06-24 12:53:11Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
@@ -7,7 +7,7 @@ pkgname=('kdeadmin-kcron'
          'kdeadmin-ksystemlog'
          'kdeadmin-kuser'
          'kdeadmin-system-config-printer-kde')
-pkgver=4.6.80
+pkgver=4.6.90
 pkgrel=1
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
@@ -17,7 +17,7 @@ makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdebindings-python'
 	         'system-config-printer-common')
 source=("http://download.kde.org/unstable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2"
         'syslog-path.patch')
-sha1sums=('ceb0ccd2d24b64770f6ac7649d312937a09a17e2'
+sha1sums=('48f434cb4cde895d06f03e40b7d77e5f9d3f184f'
           '20095ce6e0f3e5b6800a7c6e52de6fddba62c031')
 
 build() {
diff --git a/kde-unstable/kdeartwork/PKGBUILD b/kde-unstable/kdeartwork/PKGBUILD
index 0118d8b45..0994158d3 100644
--- a/kde-unstable/kdeartwork/PKGBUILD
+++ b/kde-unstable/kdeartwork/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 124845 2011-05-24 18:14:29Z andrea $
+# $Id: PKGBUILD 128548 2011-06-24 12:53:15Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
@@ -13,7 +13,7 @@ pkgname=('kdeartwork-aurorae'
          'kdeartwork-styles'
          'kdeartwork-wallpapers'
          'kdeartwork-weatherwallpapers')
-pkgver=4.6.80
+pkgver=4.6.90
 pkgrel=1
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
@@ -22,7 +22,7 @@ groups=('kde' 'kdeartwork')
 makedepends=('pkgconfig' 'cmake' 'automoc4' 'xscreensaver' 'eigen'
 	         'kdebase-workspace' 'libkexiv2')
 source=("http://download.kde.org/unstable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
-sha1sums=('70c5274f2c933b87c10a1ae53eb6971ae3887e87')
+sha1sums=('7eca9710ec09232ef4face13f8135da96f41b888')
 
 build() {
 	cd $srcdir
diff --git a/kde-unstable/kdebase-konsole/PKGBUILD b/kde-unstable/kdebase-konsole/PKGBUILD
index 105e3dc39..cad2e935d 100644
--- a/kde-unstable/kdebase-konsole/PKGBUILD
+++ b/kde-unstable/kdebase-konsole/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 124800 2011-05-24 13:26:15Z andrea $
+# $Id: PKGBUILD 128549 2011-06-24 12:53:18Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdebase-konsole
-pkgver=4.6.80
+pkgver=4.6.90
 pkgrel=1
 arch=('i686' 'x86_64')
 url='http://kde.org/applications/system/konsole/'
@@ -12,7 +12,7 @@ groups=('kde' 'kdebase')
 depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 source=("http://download.kde.org/unstable/${pkgver}/src/konsole-${pkgver}.tar.bz2")
-sha1sums=('7e7b5a0b37ae4d22e51a61f70afccbba86a93921')
+sha1sums=('314362990e41499c76f7f67bc4c4da0c43cf7780')
 
 build() {
   cd "${srcdir}"
diff --git a/kde-unstable/kdebase-runtime/PKGBUILD b/kde-unstable/kdebase-runtime/PKGBUILD
index 70105c4ec..d499198d9 100644
--- a/kde-unstable/kdebase-runtime/PKGBUILD
+++ b/kde-unstable/kdebase-runtime/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 125373 2011-05-26 10:37:17Z andrea $
+# $Id: PKGBUILD 128525 2011-06-24 12:41:45Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=kdebase-runtime
 _pkgname=kde-runtime
-pkgver=4.6.80
+pkgver=4.6.90
 pkgrel=1
 pkgdesc="KDE Base Runtime Environment"
 arch=('i686' 'x86_64')
@@ -18,10 +18,10 @@ optdepends=('htdig: to build the search index in khelpcenter'
             'gdb: drkonq crash handler')
 install="${pkgname}.install"
 source=("http://download.kde.org/unstable/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2")
-sha1sums=('5d06c11f43beb21ebf6c47d2a7addcbe710e019e')
+sha1sums=('9bc01f0e829b355f110246f28daed6496d96f335')
 
 build() {
-	cd "${srcdir}"
+    cd "${srcdir}"
 	mkdir build
 	cd build
 	cmake ../${_pkgname}-${pkgver} \
diff --git a/kde-unstable/kdebase-workspace/PKGBUILD b/kde-unstable/kdebase-workspace/PKGBUILD
index fae8c192f..941670d9a 100644
--- a/kde-unstable/kdebase-workspace/PKGBUILD
+++ b/kde-unstable/kdebase-workspace/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 125374 2011-05-26 12:53:42Z andrea $
+# $Id: PKGBUILD 128537 2011-06-24 12:42:31Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=kdebase-workspace
 _pkgname=kde-workspace
-pkgver=4.6.80
-pkgrel=2
+pkgver=4.6.90
+pkgrel=1
 pkgdesc="KDE Base Workspace"
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
@@ -29,7 +29,7 @@ options=('emptydirs')
 source=("http://download.kde.org/unstable/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2"
         'kdm-zsh-profile.patch' 'kdm' 'kde.pam' 'kde-np.pam' 'kscreensaver.pam'
         'fixpath.patch' 'terminate-server.patch')
-sha1sums=('99bf68ee90c4cfa3568527a55c7c68d4247d9b13'
+sha1sums=('762a95772b8ba65d5581173739c77fb29505101c'
           '8c2bdefb23a03b753b78d16944d03fa3939d2d99'
           '5db3a245201bd4a50e65aa2ef583cf5490e4f646'
           'f7b38af38549242a240f1a90ab9964ca8a366129'
diff --git a/kde-unstable/kdebase/PKGBUILD b/kde-unstable/kdebase/PKGBUILD
index da7098290..56fc4e475 100644
--- a/kde-unstable/kdebase/PKGBUILD
+++ b/kde-unstable/kdebase/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 124659 2011-05-23 19:43:17Z andrea $
+# $Id: PKGBUILD 128538 2011-06-24 12:42:34Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
@@ -12,7 +12,7 @@ pkgname=('kdebase-dolphin'
          'kdebase-konqueror'
          'kdebase-lib'
          'kdebase-plasma')
-pkgver=4.6.80
+pkgver=4.6.90
 pkgrel=1
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
@@ -20,7 +20,7 @@ license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdebase')
 makedepends=('kdelibs' 'pkgconfig' 'cmake' 'automoc4' 'tidyhtml')
 source=("http://download.kde.org/unstable/${pkgver}/src/kde-baseapps-${pkgver}.tar.bz2")
-sha1sums=('f89b848791628d675e26dd7e703bd79834d1c951')
+sha1sums=('83d1f13ea32381bf70ad4aed5477fe585f806abc')
 
 build() {
 	cd ${srcdir}
@@ -80,7 +80,7 @@ package_kdebase-kfind() {
 
 package_kdebase-konq-plugins() {
 	pkgdesc='Extra plugins for Konqueror'
-	depends=('kdebase-konqueror')
+	depends=('kdebase-konqueror' 'tidyhtml')
 	replaces=('konq-plugins')
 	install='kdebase.install'
 	cd $srcdir/build/konq-plugins
diff --git a/kde-unstable/kdebindings-kimono/PKGBUILD b/kde-unstable/kdebindings-kimono/PKGBUILD
index 0fa73a2b1..9e609c797 100644
--- a/kde-unstable/kdebindings-kimono/PKGBUILD
+++ b/kde-unstable/kdebindings-kimono/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 124934 2011-05-25 09:35:20Z andrea $
+# $Id: PKGBUILD 128666 2011-06-25 12:00:22Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdebindings-kimono
-pkgver=4.6.80
+pkgver=4.6.90
 pkgrel=1
 pkgdesc=".NET/Mono bindings for the KDE libraries"
 url="http://kde.org/"
 arch=('i686' 'x86_64')
 license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdebindings')
+groups=('kdebindings')
 depends=('kdebindings-qyoto' 'kdebindings-smokekde')
 makedepends=('cmake' 'automoc4' 'kdebindings-smokegen' 'boost' 'kdepimlibs')
 conflicts=('kdebindings-csharp')
 source=("http://download.kde.org/unstable/${pkgver}/src/kimono-${pkgver}.tar.bz2")
-sha1sums=('911dfbee3141ca0f72c13e15bafc549ccd9ab33a')
+sha1sums=('4e18150625d26c1fb6ddc8fa68cc0f97588275c7')
 
 build() {
   cd "${srcdir}"
@@ -21,7 +21,8 @@ build() {
   cd build
   cmake ../kimono-${pkgver} \
     -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DWITH_Soprano=OFF
   make
 }
 
diff --git a/kde-unstable/kdebindings-korundum/PKGBUILD b/kde-unstable/kdebindings-korundum/PKGBUILD
index 9c40054a2..bdd9614ed 100644
--- a/kde-unstable/kdebindings-korundum/PKGBUILD
+++ b/kde-unstable/kdebindings-korundum/PKGBUILD
@@ -1,20 +1,20 @@
-# $Id: PKGBUILD 124940 2011-05-25 09:48:53Z andrea $
+# $Id: PKGBUILD 128666 2011-06-25 12:00:22Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdebindings-korundum
-pkgver=4.6.80
+pkgver=4.6.90
 pkgrel=1
 pkgdesc="KDE bindings for ruby"
 url="http://kde.org/"
 arch=('i686' 'x86_64')
 license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdebindings')
+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/unstable/${pkgver}/src/korundum-${pkgver}.tar.bz2")
-sha1sums=('30209e7e3d3dc54c7eb787d7e7bcc90735c5bc1a')
+sha1sums=('458c40543fdd5c340b8738632ae3c867941a4a8c')
 
 build() {
   cd "${srcdir}"
diff --git a/kde-unstable/kdebindings-kross/PKGBUILD b/kde-unstable/kdebindings-kross/PKGBUILD
new file mode 100644
index 000000000..8e23d9d30
--- /dev/null
+++ b/kde-unstable/kdebindings-kross/PKGBUILD
@@ -0,0 +1,51 @@
+# $Id: PKGBUILD 128666 2011-06-25 12:00:22Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+
+pkgbase=kdebindings-kross
+pkgname=('kdebindings-kross-python'
+#         'kdebindings-kross-ruby'
+         'kdebindings-kross-java')
+pkgver=4.6.90
+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/unstable/${pkgver}/src/kross-interpreters-${pkgver}.tar.bz2")
+sha1sums=('db15d0957951a56bdb8c3727dc68cbc207b0e4b4')
+
+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/kde-unstable/kdebindings-perlkde/PKGBUILD b/kde-unstable/kdebindings-perlkde/PKGBUILD
index 4dfb0d07e..e553f1944 100644
--- a/kde-unstable/kdebindings-perlkde/PKGBUILD
+++ b/kde-unstable/kdebindings-perlkde/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 124941 2011-05-25 09:55:03Z andrea $
+# $Id: PKGBUILD 128666 2011-06-25 12:00:22Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdebindings-perlkde
-pkgver=4.6.80
+pkgver=4.6.90
 pkgrel=1
 pkgdesc="Perl bindings for the KDE libraries"
 url="http://kde.org/"
 arch=('i686' 'x86_64')
 license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdebindings')
+groups=('kdebindings')
 depends=('kdebindings-perlqt' 'kdebindings-smokekde')
 makedepends=('cmake' 'automoc4' 'kdebindings-smokegen' 'kdepimlibs'
             'kdegraphics-okular' 'kdesdk-kate')
 source=("http://download.kde.org/unstable/${pkgver}/src/perlkde-${pkgver}.tar.bz2")
-sha1sums=('0d689b8ffcfaeb1f4e216f00f0ddacb5f59b9047')
+sha1sums=('71514987b314cbf1101daccac1b26fe7f76d2184')
 
 build() {
   cd "${srcdir}"
diff --git a/kde-unstable/kdebindings-perlqt/PKGBUILD b/kde-unstable/kdebindings-perlqt/PKGBUILD
index a8268f3c5..215b442bf 100644
--- a/kde-unstable/kdebindings-perlqt/PKGBUILD
+++ b/kde-unstable/kdebindings-perlqt/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 124667 2011-05-23 20:36:47Z andrea $
+# $Id: PKGBUILD 128666 2011-06-25 12:00:22Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdebindings-perlqt
-pkgver=4.6.80
+pkgver=4.6.90
 pkgrel=1
 pkgdesc="Perl bindings for the Qt libraries"
 url="http://kde.org/"
 arch=('i686' 'x86_64')
 license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdebindings')
+groups=('kdebindings')
 depends=('kdebindings-smokeqt')
 makedepends=('cmake' 'automoc4' 'kdebindings-smokegen')
 source=("http://download.kde.org/unstable/${pkgver}/src/perlqt-${pkgver}.tar.bz2")
-sha1sums=('aa6f72ff5eed3f178a1d7274e61c2c7ed81fd74e')
+sha1sums=('d55ffeacf16b940e61234294b310933eb133fe0d')
 
 build() {
   cd "${srcdir}"
diff --git a/kde-unstable/kdebindings-python/PKGBUILD b/kde-unstable/kdebindings-python/PKGBUILD
index 817ca914a..0193b124d 100644
--- a/kde-unstable/kdebindings-python/PKGBUILD
+++ b/kde-unstable/kdebindings-python/PKGBUILD
@@ -1,20 +1,20 @@
-# $Id: PKGBUILD 124775 2011-05-24 11:26:16Z andrea $
+# $Id: PKGBUILD 128666 2011-06-25 12:00:22Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdebindings-python
-pkgver=4.6.80
+pkgver=4.6.90
 pkgrel=1
 pkgdesc="KDE bindings for python"
 url="http://kde.org/"
 arch=('i686' 'x86_64')
 license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdebindings')
+groups=('kdebindings')
 depends=('kdepim-runtime' 'python2-pyqt' 'qscintilla' 'boost-libs')
 makedepends=('cmake' 'automoc4' 'boost')
 source=("http://download.kde.org/unstable/${pkgver}/src/pykde4-${pkgver}.tar.bz2"
         'fix-build.patch')
-sha1sums=('f45e40298046ecea382f9b85c34b3e21d856a9da'
-          '3d2329981ea571d38f0354c6d1300a2743a775db')
+sha1sums=('c90432ec2643b109427a02afbb8d3f7acc19f5e2'
+          '4eb8917ad922819bbea038d79a9786cf5d0e2767')
 
 build() {
   cd "${srcdir}"/pykde4-${pkgver}
@@ -37,5 +37,3 @@ package() {
   # Use the python2 executable
   find "${pkgdir}" -name '*.py' | xargs sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|'
 }
-sha1sums=('f45e40298046ecea382f9b85c34b3e21d856a9da'
-          '4eb8917ad922819bbea038d79a9786cf5d0e2767')
diff --git a/kde-unstable/kdebindings-qtruby/PKGBUILD b/kde-unstable/kdebindings-qtruby/PKGBUILD
index 82fd53c1b..70d8ef224 100644
--- a/kde-unstable/kdebindings-qtruby/PKGBUILD
+++ b/kde-unstable/kdebindings-qtruby/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 124815 2011-05-24 15:22:45Z andrea $
+# $Id: PKGBUILD 128666 2011-06-25 12:00:22Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdebindings-qtruby
-pkgver=4.6.80
+pkgver=4.6.90
 pkgrel=1
 pkgdesc="Qt bindings for ruby"
 url="http://kde.org/"
 arch=('i686' 'x86_64')
 license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdebindings')
+groups=('kdebindings')
 depends=('kdebindings-smokeqt' 'ruby')
 makedepends=('cmake' 'automoc4' 'kdebindings-smokegen')
 conflicts=('kdebindings-ruby')
 source=("http://download.kde.org/unstable/${pkgver}/src/qtruby-${pkgver}.tar.bz2")
-sha1sums=('9b153784efb3187ca4f38a14355b8a5ce283316c')
+sha1sums=('a056ae7485ffc3a2f14ddf7cfd62e14265002234')
 
 build() {
   cd "${srcdir}"
diff --git a/kde-unstable/kdebindings-qyoto/PKGBUILD b/kde-unstable/kdebindings-qyoto/PKGBUILD
index d130b397d..3bd134647 100644
--- a/kde-unstable/kdebindings-qyoto/PKGBUILD
+++ b/kde-unstable/kdebindings-qyoto/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 124815 2011-05-24 15:22:45Z andrea $
+# $Id: PKGBUILD 128666 2011-06-25 12:00:22Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdebindings-qyoto
-pkgver=4.6.80
+pkgver=4.6.90
 pkgrel=1
 pkgdesc=".NET/Mono bindings for the Qt libraries"
 url="http://kde.org/"
 arch=('i686' 'x86_64')
 license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdebindings')
+groups=('kdebindings')
 depends=('kdebindings-smokeqt' 'mono')
 makedepends=('cmake' 'automoc4' 'kdebindings-smokegen')
 conflicts=('kdebindings-csharp')
 source=("http://download.kde.org/unstable/${pkgver}/src/qyoto-${pkgver}.tar.bz2")
-sha1sums=('7f63ae1c1e30edf226ca8418d5fa78edaf42cb36')
+sha1sums=('05902dd17e0aafa91a71b0f8fb3fdcc0e1ab8770')
 
 build() {
   cd "${srcdir}"
diff --git a/kde-unstable/kdebindings-smokegen/PKGBUILD b/kde-unstable/kdebindings-smokegen/PKGBUILD
index ba2edc4f6..76db20481 100644
--- a/kde-unstable/kdebindings-smokegen/PKGBUILD
+++ b/kde-unstable/kdebindings-smokegen/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 124815 2011-05-24 15:22:45Z andrea $
+# $Id: PKGBUILD 128527 2011-06-24 12:41:51Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdebindings-smokegen
-pkgver=4.6.80
+pkgver=4.6.90
 pkgrel=1
 pkgdesc="A general purpose C++ parser with a plugin infrastructure"
 url="http://kde.org/"
@@ -12,7 +12,7 @@ depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 conflicts=('kdebindings-smoke')
 source=("http://download.kde.org/unstable/${pkgver}/src/smokegen-${pkgver}.tar.bz2")
-sha1sums=('ce860f4308df4cc91b1e49d0f1f5bca3805c4cf1')
+sha1sums=('e3f24c57d79216df8c52eaafb2e4ee7af11e1d5c')
 
 build() {
   cd "${srcdir}"
diff --git a/kde-unstable/kdebindings-smokekde/PKGBUILD b/kde-unstable/kdebindings-smokekde/PKGBUILD
index 6f9724353..e28d5abcc 100644
--- a/kde-unstable/kdebindings-smokekde/PKGBUILD
+++ b/kde-unstable/kdebindings-smokekde/PKGBUILD
@@ -1,20 +1,20 @@
-# $Id: PKGBUILD 124928 2011-05-25 09:28:04Z andrea $
+# $Id: PKGBUILD 128666 2011-06-25 12:00:22Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdebindings-smokekde
-pkgver=4.6.80
+pkgver=4.6.90
 pkgrel=1
 pkgdesc="Language independent library for KDE bindings"
 url="http://kde.org/"
 arch=('i686' 'x86_64')
 license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdebindings')
+groups=('kdebindings')
 depends=('kdebindings-smokeqt')
 makedepends=('cmake' 'automoc4' 'kdebindings-smokegen' 'boost'
              'kdepimlibs' 'kdegraphics-okular' 'kdesdk-kate')
 conflicts=('kdebindings-smoke')
 source=("http://download.kde.org/unstable/${pkgver}/src/smokekde-${pkgver}.tar.bz2")
-sha1sums=('9fd8cbac3f0affce6fa078b07ca418a5e0c79521')
+sha1sums=('dc140ff5d6fc87ac2116739df62b49f059510de8')
 
 build() {
   cd "${srcdir}"
diff --git a/kde-unstable/kdebindings-smokeqt/PKGBUILD b/kde-unstable/kdebindings-smokeqt/PKGBUILD
index c7bdbcbd1..84533ada3 100644
--- a/kde-unstable/kdebindings-smokeqt/PKGBUILD
+++ b/kde-unstable/kdebindings-smokeqt/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 124815 2011-05-24 15:22:45Z andrea $
+# $Id: PKGBUILD 128666 2011-06-25 12:00:22Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdebindings-smokeqt
-pkgver=4.6.80
+pkgver=4.6.90
 pkgrel=1
 pkgdesc="Language independent library for Qt bindings"
 url="http://kde.org/"
 arch=('i686' 'x86_64')
 license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdebindings')
+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=('872b77e7e445b7492a647e63e267677604d76a96')
+sha1sums=('0fc6b293f96806b695c8dd19275d79db16df24b1')
 
 build() {
   cd "${srcdir}"
diff --git a/kde-unstable/kdeedu-blinken/PKGBUILD b/kde-unstable/kdeedu-blinken/PKGBUILD
index 7ebd3c811..a8c1c4013 100644
--- a/kde-unstable/kdeedu-blinken/PKGBUILD
+++ b/kde-unstable/kdeedu-blinken/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 124761 2011-05-24 08:01:51Z andrea $
+# $Id: PKGBUILD 128553 2011-06-24 12:53:30Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-blinken
-pkgver=4.6.80
+pkgver=4.6.90
 pkgrel=1
 pkgdesc="Memory Enhancement Game"
 url="http://kde.org/applications/education/blinken/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/unstable/${pkgver}/src/blinken-${pkgver}.tar.bz2")
-sha1sums=('847ee81d2a4f5f1acb4bf8c0835c2e8187a631ea')
+sha1sums=('3fbf5f9668588197601b6cf8678d04e2f73dd929')
 
 build() {
   cd "${srcdir}"
diff --git a/kde-unstable/kdeedu-cantor/PKGBUILD b/kde-unstable/kdeedu-cantor/PKGBUILD
index a82cacfaa..27f802bce 100644
--- a/kde-unstable/kdeedu-cantor/PKGBUILD
+++ b/kde-unstable/kdeedu-cantor/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 124761 2011-05-24 08:01:51Z andrea $
+# $Id: PKGBUILD 128554 2011-06-24 12:53:33Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-cantor
-pkgver=4.6.80
+pkgver=4.6.90
 pkgrel=1
 pkgdesc="KDE Frontend to Mathematical Software"
 url="http://kde.org/applications/education/cantor/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'r' 'libspectre')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/unstable/${pkgver}/src/cantor-${pkgver}.tar.bz2")
-sha1sums=('0c6ebd5e523bf5fdf01bbf654ce60a55fc72cbe2')
+sha1sums=('aafbed9dd3781eb56042cace8dd2a7ccda8d594e')
 
 build() {
   cd "${srcdir}"
diff --git a/kde-unstable/kdeedu-kalgebra/PKGBUILD b/kde-unstable/kdeedu-kalgebra/PKGBUILD
index 40b24830e..919813935 100644
--- a/kde-unstable/kdeedu-kalgebra/PKGBUILD
+++ b/kde-unstable/kdeedu-kalgebra/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 124761 2011-05-24 08:01:51Z andrea $
+# $Id: PKGBUILD 128555 2011-06-24 12:53:47Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-kalgebra
-pkgver=4.6.80
+pkgver=4.6.90
 pkgrel=1
 pkgdesc="Graph Calculator"
 url="http://kde.org/applications/education/kalgebra/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdeedu')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/unstable/${pkgver}/src/kalgebra-${pkgver}.tar.bz2")
-sha1sums=('d448a675782157d8c553db497e048231d6eb5f53')
+sha1sums=('5ee5d9e2a45cdb8a9660b9d786db68138ceb8661')
 
 build() {
   cd "${srcdir}"
diff --git a/kde-unstable/kdeedu-kalzium/PKGBUILD b/kde-unstable/kdeedu-kalzium/PKGBUILD
index 8bc1d0c3c..156623957 100644
--- a/kde-unstable/kdeedu-kalzium/PKGBUILD
+++ b/kde-unstable/kdeedu-kalzium/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 124761 2011-05-24 08:01:51Z andrea $
+# $Id: PKGBUILD 128556 2011-06-24 12:53:50Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-kalzium
-pkgver=4.6.80
+pkgver=4.6.90
 pkgrel=1
 pkgdesc="Periodic Table of Elements"
 url="http://kde.org/applications/education/kalzium/"
@@ -13,7 +13,7 @@ depends=('kdelibs' 'avogadro' 'ocaml')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/unstable/${pkgver}/src/kalzium-${pkgver}.tar.bz2")
-sha1sums=('1ace4d42711904d9556efbe1ff89dc4c803887fe')
+sha1sums=('4c5cf75e8596d0aec2fdc19d6d28b2c1e468afaa')
 
 build() {
   cd "${srcdir}"
diff --git a/kde-unstable/kdeedu-kanagram/PKGBUILD b/kde-unstable/kdeedu-kanagram/PKGBUILD
index 45a33746c..ebcad6581 100644
--- a/kde-unstable/kdeedu-kanagram/PKGBUILD
+++ b/kde-unstable/kdeedu-kanagram/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 124761 2011-05-24 08:01:51Z andrea $
+# $Id: PKGBUILD 128557 2011-06-24 12:53:54Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-kanagram
-pkgver=4.6.80
+pkgver=4.6.90
 pkgrel=1
 pkgdesc="Letter Order Game"
 url="http://kde.org/applications/education/kanagram/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdeedu')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/unstable/${pkgver}/src/kanagram-${pkgver}.tar.bz2")
-sha1sums=('b7075ffa2c366acecfce13b5bef9938c6317aefb')
+sha1sums=('f34f5656d977b11dc42631059215f46ce2f35acf')
 
 build() {
   cd "${srcdir}"
diff --git a/kde-unstable/kdeedu-kbruch/PKGBUILD b/kde-unstable/kdeedu-kbruch/PKGBUILD
index 9710c1df2..b2dd48dac 100644
--- a/kde-unstable/kdeedu-kbruch/PKGBUILD
+++ b/kde-unstable/kdeedu-kbruch/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 124761 2011-05-24 08:01:51Z andrea $
+# $Id: PKGBUILD 128558 2011-06-24 12:53:57Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-kbruch
-pkgver=4.6.80
+pkgver=4.6.90
 pkgrel=1
 pkgdesc="Exercise Fractions"
 url="http://kde.org/applications/education/kbruch/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/unstable/${pkgver}/src/kbruch-${pkgver}.tar.bz2")
-sha1sums=('205b7f2171e67b55fc1bbcd0844702daf9dcb4a6')
+sha1sums=('6c2e1be87b8f79341bc5cfef5b75203b5692e2e9')
 
 build() {
   cd "${srcdir}"
diff --git a/kde-unstable/kdeedu-kgeography/PKGBUILD b/kde-unstable/kdeedu-kgeography/PKGBUILD
index 720c4027a..26f0c910d 100644
--- a/kde-unstable/kdeedu-kgeography/PKGBUILD
+++ b/kde-unstable/kdeedu-kgeography/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 124761 2011-05-24 08:01:51Z andrea $
+# $Id: PKGBUILD 128559 2011-06-24 12:54:00Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-kgeography
-pkgver=4.6.80
+pkgver=4.6.90
 pkgrel=1
 pkgdesc="Geography Trainer"
 url="http://kde.org/applications/education/kgeography/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/unstable/${pkgver}/src/kgeography-${pkgver}.tar.bz2")
-sha1sums=('2d161ef150618780e6f2bcf3a8e19993a5c95fa6')
+sha1sums=('a143e4b4f59b339d4b3d8f9aa4700c4f86852980')
 
 build() {
   cd "${srcdir}"
diff --git a/kde-unstable/kdeedu-khangman/PKGBUILD b/kde-unstable/kdeedu-khangman/PKGBUILD
index 56df0fbce..48353ed42 100644
--- a/kde-unstable/kdeedu-khangman/PKGBUILD
+++ b/kde-unstable/kdeedu-khangman/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 124761 2011-05-24 08:01:51Z andrea $
+# $Id: PKGBUILD 128560 2011-06-24 12:54:03Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-khangman
-pkgver=4.6.80
+pkgver=4.6.90
 pkgrel=1
 pkgdesc="Hangman Game"
 url="http://kde.org/applications/education/khangman/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdeedu')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/unstable/${pkgver}/src/khangman-${pkgver}.tar.bz2")
-sha1sums=('a3e140a71c27400d49f75b862965123c1df6e992')
+sha1sums=('25de6658d00980e8e785c9181fb55039aaeab2f8')
 
 build() {
   cd "${srcdir}"
diff --git a/kde-unstable/kdeedu-kig/PKGBUILD b/kde-unstable/kdeedu-kig/PKGBUILD
index ca6f92279..52abb4c20 100644
--- a/kde-unstable/kdeedu-kig/PKGBUILD
+++ b/kde-unstable/kdeedu-kig/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 125335 2011-05-25 23:12:03Z andrea $
+# $Id: PKGBUILD 128561 2011-06-24 12:54:06Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-kig
-pkgver=4.6.80
-pkgrel=2
+pkgver=4.6.90
+pkgrel=1
 pkgdesc="Interactive Geometry"
 url="http://kde.org/applications/education/kig/"
 arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/unstable/${pkgver}/src/kig-${pkgver}.tar.bz2")
-sha1sums=('d0b2ca69262b1e720be8ab2b6cfb9dd6b5a81371')
+sha1sums=('e48e7e21678eb2e06f8730237658d649f436fd08')
 
 build() {
   cd "${srcdir}"
diff --git a/kde-unstable/kdeedu-kiten/PKGBUILD b/kde-unstable/kdeedu-kiten/PKGBUILD
index 6ba5c4b19..0aebfabe8 100644
--- a/kde-unstable/kdeedu-kiten/PKGBUILD
+++ b/kde-unstable/kdeedu-kiten/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 124761 2011-05-24 08:01:51Z andrea $
+# $Id: PKGBUILD 128562 2011-06-24 12:54:09Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-kiten
-pkgver=4.6.80
+pkgver=4.6.90
 pkgrel=1
 pkgdesc="Japanese Reference/Study Tool"
 url="http://kde.org/applications/education/kiten/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/unstable/${pkgver}/src/kiten-${pkgver}.tar.bz2")
-sha1sums=('a5120c87015e044b4313e889b80afd608341e414')
+sha1sums=('6faec1ab525a3b7b71a48a6c5f73950d1f139bc0')
 
 build() {
   cd "${srcdir}"
diff --git a/kde-unstable/kdeedu-klettres/PKGBUILD b/kde-unstable/kdeedu-klettres/PKGBUILD
index 70f5e54b4..92a41331e 100644
--- a/kde-unstable/kdeedu-klettres/PKGBUILD
+++ b/kde-unstable/kdeedu-klettres/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 124761 2011-05-24 08:01:51Z andrea $
+# $Id: PKGBUILD 128563 2011-06-24 12:54:12Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-klettres
-pkgver=4.6.80
+pkgver=4.6.90
 pkgrel=1
 pkgdesc="Learn The Alphabet"
 url="http://kde.org/applications/education/klettres/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/unstable/${pkgver}/src/klettres-${pkgver}.tar.bz2")
-sha1sums=('395a1c700eaf1fee83216facbe5442162d383e64')
+sha1sums=('8e55891618e02b7bd8d647e014e4d090fc46537a')
 
 build() {
   cd "${srcdir}"
diff --git a/kde-unstable/kdeedu-kmplot/PKGBUILD b/kde-unstable/kdeedu-kmplot/PKGBUILD
index 8db40962f..4680a3c5f 100644
--- a/kde-unstable/kdeedu-kmplot/PKGBUILD
+++ b/kde-unstable/kdeedu-kmplot/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 124761 2011-05-24 08:01:51Z andrea $
+# $Id: PKGBUILD 128564 2011-06-24 12:54:15Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-kmplot
-pkgver=4.6.80
+pkgver=4.6.90
 pkgrel=1
 pkgdesc="Mathematical Function Plotter"
 url="http://kde.org/applications/education/kmplot/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/unstable/${pkgver}/src/kmplot-${pkgver}.tar.bz2")
-sha1sums=('be3593a33b05a59d82020d988804e82737abbc09')
+sha1sums=('f0a947cf818c4f5a3aff2dc8a9c442d0eb324515')
 
 build() {
   cd "${srcdir}"
diff --git a/kde-unstable/kdeedu-kstars/PKGBUILD b/kde-unstable/kdeedu-kstars/PKGBUILD
index 77306c68d..bfaf8ae14 100644
--- a/kde-unstable/kdeedu-kstars/PKGBUILD
+++ b/kde-unstable/kdeedu-kstars/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 124761 2011-05-24 08:01:51Z andrea $
+# $Id: PKGBUILD 128565 2011-06-24 12:54:31Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-kstars
-pkgver=4.6.80
+pkgver=4.6.90
 pkgrel=1
 pkgdesc="Desktop Planetarium"
 url="http://kde.org/applications/education/kstars/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'eigen' 'cfitsio' 'libindi')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/unstable/${pkgver}/src/kstars-${pkgver}.tar.bz2")
-sha1sums=('c74818da033d70200b873a954a2f05af3e03c610')
+sha1sums=('4d82d0bed20c66c820b2dde664f6fb6978c618a1')
 
 build() {
   cd "${srcdir}"
diff --git a/kde-unstable/kdeedu-ktouch/PKGBUILD b/kde-unstable/kdeedu-ktouch/PKGBUILD
index 0b8e706e9..e544a7f79 100644
--- a/kde-unstable/kdeedu-ktouch/PKGBUILD
+++ b/kde-unstable/kdeedu-ktouch/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 124761 2011-05-24 08:01:51Z andrea $
+# $Id: PKGBUILD 128566 2011-06-24 12:54:35Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-ktouch
-pkgver=4.6.80
+pkgver=4.6.90
 pkgrel=1
 pkgdesc="Touch Typing Tutor"
 url="http://kde.org/applications/education/ktouch/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/unstable/${pkgver}/src/ktouch-${pkgver}.tar.bz2")
-sha1sums=('7e80926b1fe45d7af861891a140e843b27cbf171')
+sha1sums=('2a7a22e194b023e2cd36b2aecf7d7eedc28518be')
 
 build() {
   cd "${srcdir}"
diff --git a/kde-unstable/kdeedu-kturtle/PKGBUILD b/kde-unstable/kdeedu-kturtle/PKGBUILD
index dc60d6200..108259e32 100644
--- a/kde-unstable/kdeedu-kturtle/PKGBUILD
+++ b/kde-unstable/kdeedu-kturtle/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 124761 2011-05-24 08:01:51Z andrea $
+# $Id: PKGBUILD 128567 2011-06-24 12:54:38Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-kturtle
-pkgver=4.6.80
+pkgver=4.6.90
 pkgrel=1
 pkgdesc="Educational Programming Environment"
 url="http://kde.org/applications/education/kturtle/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/unstable/${pkgver}/src/kturtle-${pkgver}.tar.bz2")
-sha1sums=('5aa67c458212315616a9c67e06a3e8a8a79ee302')
+sha1sums=('936799165299e62241ef4fe4914446470d089501')
 
 build() {
   cd "${srcdir}"
diff --git a/kde-unstable/kdeedu-kwordquiz/PKGBUILD b/kde-unstable/kdeedu-kwordquiz/PKGBUILD
index 76696bc6d..3763ef433 100644
--- a/kde-unstable/kdeedu-kwordquiz/PKGBUILD
+++ b/kde-unstable/kdeedu-kwordquiz/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 124761 2011-05-24 08:01:51Z andrea $
+# $Id: PKGBUILD 128568 2011-06-24 12:54:41Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-kwordquiz
-pkgver=4.6.80
+pkgver=4.6.90
 pkgrel=1
 pkgdesc="Flash Card Trainer"
 url="http://kde.org/applications/education/kwordquiz/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdeedu')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/unstable/${pkgver}/src/kwordquiz-${pkgver}.tar.bz2")
-sha1sums=('44277946ffad538cd50690af9475e0520698bafb')
+sha1sums=('cf585ca654ab26e05b8107973253119363c0a152')
 
 build() {
   cd "${srcdir}"
diff --git a/kde-unstable/kdeedu-marble/PKGBUILD b/kde-unstable/kdeedu-marble/PKGBUILD
index 39fe50f17..30651f815 100644
--- a/kde-unstable/kdeedu-marble/PKGBUILD
+++ b/kde-unstable/kdeedu-marble/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 124761 2011-05-24 08:01:51Z andrea $
+# $Id: PKGBUILD 128540 2011-06-24 12:42:41Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-marble
-pkgver=4.6.80
+pkgver=4.6.90
 pkgrel=1
 pkgdesc="Desktop Globe"
 url="http://kde.org/applications/education/marble/"
@@ -14,7 +14,7 @@ makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/unstable/${pkgver}/src/marble-${pkgver}.tar.bz2"
         'gpsd-2.96.patch')
-sha1sums=('4d7663909efe3b42006debd78f1217bb3dfffd88'
+sha1sums=('cff7862fef00e7848c8c9bb55f1ee1ba847c1ac3'
           'f44dfd3bb384e631d59b93d7dda3413795da8183')
 
 build() {
diff --git a/kde-unstable/kdeedu-parley/PKGBUILD b/kde-unstable/kdeedu-parley/PKGBUILD
index 7b27fa558..eb1b6c5af 100644
--- a/kde-unstable/kdeedu-parley/PKGBUILD
+++ b/kde-unstable/kdeedu-parley/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 124761 2011-05-24 08:01:51Z andrea $
+# $Id: PKGBUILD 128569 2011-06-24 12:54:44Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-parley
-pkgver=4.6.80
+pkgver=4.6.90
 pkgrel=1
 pkgdesc="Vocabulary Trainer"
 url="http://kde.org/applications/education/parley/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdeedu')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/unstable/${pkgver}/src/parley-${pkgver}.tar.bz2")
-sha1sums=('991f7aeee7849913a167d65b792791724bc5c1aa')
+sha1sums=('483078998a0677974e39580f827a4bffe5c16cd4')
 
 build() {
   cd "${srcdir}"
diff --git a/kde-unstable/kdeedu-rocs/PKGBUILD b/kde-unstable/kdeedu-rocs/PKGBUILD
index 1ab660c03..8f40e9971 100644
--- a/kde-unstable/kdeedu-rocs/PKGBUILD
+++ b/kde-unstable/kdeedu-rocs/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 124761 2011-05-24 08:01:51Z andrea $
+# $Id: PKGBUILD 128570 2011-06-24 12:54:47Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-rocs
-pkgver=4.6.80
+pkgver=4.6.90
 pkgrel=1
 pkgdesc="Rocs Graph Theory"
 url="http://kde.org/applications/education/rocs/"
@@ -12,7 +12,7 @@ groups=('kde' 'kdeedu')
 depends=('kdebase-runtime' 'boost-libs')
 makedepends=('cmake' 'automoc4' 'boost')
 source=("http://download.kde.org/unstable/${pkgver}/src/rocs-${pkgver}.tar.bz2")
-sha1sums=('90ea18d54bc7dc6a87db72e34fb9131849300392')
+sha1sums=('6de23231f0d43ecac33a456b8b46a6ff6158a1fb')
 
 build() {
   cd "${srcdir}"
diff --git a/kde-unstable/kdeedu-step/PKGBUILD b/kde-unstable/kdeedu-step/PKGBUILD
index 6b63198df..10710b68a 100644
--- a/kde-unstable/kdeedu-step/PKGBUILD
+++ b/kde-unstable/kdeedu-step/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 124761 2011-05-24 08:01:51Z andrea $
+# $Id: PKGBUILD 128571 2011-06-24 12:54:50Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-step
-pkgver=4.6.80
+pkgver=4.6.90
 pkgrel=1
 pkgdesc="Interactive Physical Simulator"
 url="http://kde.org/applications/education/step/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libqalculate' 'gsl' 'eigen')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/unstable/${pkgver}/src/step-${pkgver}.tar.bz2")
-sha1sums=('a71d1ed2f92c9b881640b273adafa71240ca6e8a')
+sha1sums=('2f005305cd53d396b88cf35bca8bd3d7e7cadb7c')
 
 build() {
   cd "${srcdir}"
diff --git a/kde-unstable/kdegames/PKGBUILD b/kde-unstable/kdegames/PKGBUILD
index bc3b1576a..1ae9c4c2f 100644
--- a/kde-unstable/kdegames/PKGBUILD
+++ b/kde-unstable/kdegames/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 124786 2011-05-24 12:57:40Z andrea $
+# $Id: PKGBUILD 128572 2011-06-24 12:54:54Z 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.80
+pkgver=4.6.90
 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/unstable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
-sha1sums=('c9e21203e8f47e1748c309a4ff14c87953c43839')
+sha1sums=('b20c005287ec09b70096146507f49b0a34c48a90')
 
 build() {
 	cd $srcdir
@@ -214,7 +214,7 @@ package_kdegames-kfourinline() {
 
 package_kdegames-kgoldrunner() {
 	pkgdesc='A game of action and puzzle-solving'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
+	depends=('kdebase-runtime' 'kdegames-libkdegames' 'openal')
 	url="http://kde.org/applications/games/kgoldrunner/"
 	install='kdegames.install'
 	cd $srcdir/build/kgoldrunner
diff --git a/kde-unstable/kdegraphics-gwenview/PKGBUILD b/kde-unstable/kdegraphics-gwenview/PKGBUILD
index c8528477b..6a944a619 100644
--- a/kde-unstable/kdegraphics-gwenview/PKGBUILD
+++ b/kde-unstable/kdegraphics-gwenview/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 124674 2011-05-23 20:43:19Z andrea $
+# $Id: PKGBUILD 128573 2011-06-24 12:54:57Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegraphics-gwenview
-pkgver=4.6.80
+pkgver=4.6.90
 pkgrel=1
 pkgdesc="A fast and easy to use image viewer for KDE"
 url="http://kde.org/applications/graphics/gwenview/"
@@ -13,7 +13,7 @@ depends=('kdebase-lib' 'libkipi')
 makedepends=('cmake' 'automoc4')
 optdepends=('kipi-plugins')
 source=("http://download.kde.org/unstable/${pkgver}/src/gwenview-${pkgver}.tar.bz2")
-sha1sums=('41b93bdcab6ba169be4ed3fcfb481c6ae1161bd6')
+sha1sums=('c6d38823ed1a041dd43b3e20674106bf62404a11')
 
 build() {
   cd "${srcdir}"
diff --git a/kde-unstable/kdegraphics-kamera/PKGBUILD b/kde-unstable/kdegraphics-kamera/PKGBUILD
index 17b0a9b3f..901c18fe8 100644
--- a/kde-unstable/kdegraphics-kamera/PKGBUILD
+++ b/kde-unstable/kdegraphics-kamera/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 124674 2011-05-23 20:43:19Z andrea $
+# $Id: PKGBUILD 128575 2011-06-24 12:55:05Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegraphics-kamera
-pkgver=4.6.80
+pkgver=4.6.90
 pkgrel=1
 pkgdesc="Configure Kamera"
 url="http://kde.org/applications/graphics/kamera/"
@@ -12,7 +12,7 @@ groups=('kde' 'kdegraphics')
 depends=('kdebase-runtime' 'gphoto2')
 makedepends=('cmake' 'automoc4')
 source=("http://download.kde.org/unstable/${pkgver}/src/kamera-${pkgver}.tar.bz2")
-sha1sums=('cba0e4ca19fe62a9cbfe7b2559e5364c16944901')
+sha1sums=('34bbd9a2cbda925a55369e3bf2b839ffc49b36b6')
 
 build() {
   cd "${srcdir}"
diff --git a/kde-unstable/kdegraphics-kcolorchooser/PKGBUILD b/kde-unstable/kdegraphics-kcolorchooser/PKGBUILD
index ebad9e424..8e4999149 100644
--- a/kde-unstable/kdegraphics-kcolorchooser/PKGBUILD
+++ b/kde-unstable/kdegraphics-kcolorchooser/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 124674 2011-05-23 20:43:19Z andrea $
+# $Id: PKGBUILD 128576 2011-06-24 12:55:19Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegraphics-kcolorchooser
-pkgver=4.6.80
+pkgver=4.6.90
 pkgrel=1
 pkgdesc="Color Chooser"
 url="http://kde.org/applications/graphics/kcolorchooser/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/unstable/${pkgver}/src/kcolorchooser-${pkgver}.tar.bz2")
-sha1sums=('99aad5ebb4b1d5d99426e8a33c2f15717cc4087e')
+sha1sums=('598742387491f91038fa4a0914fc79df4fdbea51')
 
 build() {
   cd "${srcdir}"
diff --git a/kde-unstable/kdegraphics-kgamma/PKGBUILD b/kde-unstable/kdegraphics-kgamma/PKGBUILD
index 18926be42..00c09d255 100644
--- a/kde-unstable/kdegraphics-kgamma/PKGBUILD
+++ b/kde-unstable/kdegraphics-kgamma/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 124788 2011-05-24 12:59:42Z andrea $
+# $Id: PKGBUILD 128577 2011-06-24 12:55:22Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegraphics-kgamma
-pkgver=4.6.80
+pkgver=4.6.90
 pkgrel=1
 pkgdesc="A monitor calibration tool"
 url="http://kde.org/applications/graphics/kgamma/"
@@ -15,7 +15,7 @@ groups=('kde' 'kdegraphics')
 depends=('kdebase-runtime' 'libxxf86vm')
 makedepends=('cmake' 'automoc4')
 source=("http://download.kde.org/unstable/${pkgver}/src/kgamma-${pkgver}.tar.bz2")
-sha1sums=('aac4e43df0095e0511bb27cc27a23b10847eb075')
+sha1sums=('4a57feb62a75cae0a0efeef86873ec6a745d6bb6')
 
 build() {
   cd "${srcdir}"
diff --git a/kde-unstable/kdegraphics-kolourpaint/PKGBUILD b/kde-unstable/kdegraphics-kolourpaint/PKGBUILD
index c68c46c2d..d0c8f0a31 100644
--- a/kde-unstable/kdegraphics-kolourpaint/PKGBUILD
+++ b/kde-unstable/kdegraphics-kolourpaint/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 124674 2011-05-23 20:43:19Z andrea $
+# $Id: PKGBUILD 128578 2011-06-24 12:55:25Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegraphics-kolourpaint
-pkgver=4.6.80
+pkgver=4.6.90
 pkgrel=1
 pkgdesc="Paint Program"
 url="http://kde.org/applications/graphics/kolourpaint/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'qimageblitz')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/unstable/${pkgver}/src/kolourpaint-${pkgver}.tar.bz2")
-sha1sums=('c79fc3a31d61623a02e7c89ede19cbe7e49a8518')
+sha1sums=('437f3a4396c7fb959c8fd32fb6fd28fca734f680')
 
 build() {
   cd "${srcdir}"
diff --git a/kde-unstable/kdegraphics-kruler/PKGBUILD b/kde-unstable/kdegraphics-kruler/PKGBUILD
index 663888d54..bc43e9edf 100644
--- a/kde-unstable/kdegraphics-kruler/PKGBUILD
+++ b/kde-unstable/kdegraphics-kruler/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 124674 2011-05-23 20:43:19Z andrea $
+# $Id: PKGBUILD 128579 2011-06-24 12:55:28Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegraphics-kruler
-pkgver=4.6.80
+pkgver=4.6.90
 pkgrel=1
 pkgdesc="Screen Ruler"
 url="http://kde.org/applications/graphics/kruler/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/unstable/${pkgver}/src/kruler-${pkgver}.tar.bz2")
-sha1sums=('b43fee1954baa7b84866a1cd5f15cbcff54d5e3d')
+sha1sums=('448f6f98646b69be47f64a554bb006d7cc643a93')
 
 build() {
   cd "${srcdir}"
diff --git a/kde-unstable/kdegraphics-ksaneplugin/PKGBUILD b/kde-unstable/kdegraphics-ksaneplugin/PKGBUILD
index 4dde21e03..76a4731bc 100644
--- a/kde-unstable/kdegraphics-ksaneplugin/PKGBUILD
+++ b/kde-unstable/kdegraphics-ksaneplugin/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 124799 2011-05-24 13:21:06Z andrea $
+# $Id: PKGBUILD 128580 2011-06-24 12:55:31Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegraphics-ksaneplugin
-pkgver=4.6.80
+pkgver=4.6.90
 pkgrel=1
 pkgdesc="A scan plugin that implements the scanning"
 url="http://kde.org/"
@@ -12,7 +12,7 @@ depends=('libksane')
 makedepends=('cmake' 'automoc4')
 conflicts=('kdegraphics-libs')
 source=("http://download.kde.org/unstable/${pkgver}/src/ksaneplugin-${pkgver}.tar.bz2")
-sha1sums=('3caa70899ed3797c9739409d311779f39fa9eda7')
+sha1sums=('e0e77853ebbfe9895301a7e335c65c2db4d7c01d')
 
 build() {
   cd "${srcdir}"
diff --git a/kde-unstable/kdegraphics-ksnapshot/PKGBUILD b/kde-unstable/kdegraphics-ksnapshot/PKGBUILD
index de10d1e5e..72db35c06 100644
--- a/kde-unstable/kdegraphics-ksnapshot/PKGBUILD
+++ b/kde-unstable/kdegraphics-ksnapshot/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 124674 2011-05-23 20:43:19Z andrea $
+# $Id: PKGBUILD 128581 2011-06-24 12:55:34Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegraphics-ksnapshot
-pkgver=4.6.80
+pkgver=4.6.90
 pkgrel=1
 pkgdesc="Screen Capture Program"
 url="http://kde.org/applications/graphics/ksnapshot/"
@@ -14,7 +14,7 @@ makedepends=('cmake' 'automoc4')
 optdepends=('kipi-plugins')
 install=${pkgname}.install
 source=("http://download.kde.org/unstable/${pkgver}/src/ksnapshot-${pkgver}.tar.bz2")
-sha1sums=('684be8b03920e4a92625337ff18a5b368482dd08')
+sha1sums=('f2b92a791e986c1b4e92611646fc327aa096e25d')
 
 build() {
   cd "${srcdir}"
diff --git a/kde-unstable/kdegraphics-okular/PKGBUILD b/kde-unstable/kdegraphics-okular/PKGBUILD
new file mode 100644
index 000000000..6763efad0
--- /dev/null
+++ b/kde-unstable/kdegraphics-okular/PKGBUILD
@@ -0,0 +1,33 @@
+# $Id: PKGBUILD 128529 2011-06-24 12:42:01Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+
+pkgname=kdegraphics-okular
+pkgver=4.6.90
+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')
+install=${pkgname}.install
+source=("http://download.kde.org/unstable/${pkgver}/src/okular-${pkgver}.tar.bz2")
+sha1sums=('9de2423f525a82c28158ffd3add82196afce710f')
+
+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/kde-unstable/kdegraphics-okular/kdegraphics-okular.install b/kde-unstable/kdegraphics-okular/kdegraphics-okular.install
new file mode 100644
index 000000000..81ce5c4b0
--- /dev/null
+++ b/kde-unstable/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/kde-unstable/kdegraphics-strigi-analyzer/PKGBUILD b/kde-unstable/kdegraphics-strigi-analyzer/PKGBUILD
index 4c027b673..032281af9 100644
--- a/kde-unstable/kdegraphics-strigi-analyzer/PKGBUILD
+++ b/kde-unstable/kdegraphics-strigi-analyzer/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 124799 2011-05-24 13:21:06Z andrea $
+# $Id: PKGBUILD 128582 2011-06-24 12:55:37Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegraphics-strigi-analyzer
-pkgver=4.6.80
+pkgver=4.6.90
 pkgrel=1
 pkgdesc="Strigi analyzers for various graphics file formats"
 url="http://kde.org/"
@@ -12,7 +12,7 @@ depends=('kdelibs')
 makedepends=('cmake' 'automoc4')
 conflicts=('kdegraphics-libs')
 source=("http://download.kde.org/unstable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('bc4c901bc4bc7080c91ed739d2480294d2fc5033')
+sha1sums=('6f5da6ecb917304ed8356bf286753c378d393239')
 
 build() {
   cd "${srcdir}"
diff --git a/kde-unstable/kdegraphics-svgpart/PKGBUILD b/kde-unstable/kdegraphics-svgpart/PKGBUILD
index ce748bb92..3403293de 100644
--- a/kde-unstable/kdegraphics-svgpart/PKGBUILD
+++ b/kde-unstable/kdegraphics-svgpart/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 124799 2011-05-24 13:21:06Z andrea $
+# $Id: PKGBUILD 128583 2011-06-24 12:55:40Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegraphics-svgpart
-pkgver=4.6.80
+pkgver=4.6.90
 pkgrel=1
 pkgdesc="A KPart for viewving SVGs"
 url="http://kde.org/"
@@ -12,7 +12,7 @@ depends=('kdelibs')
 makedepends=('cmake' 'automoc4')
 conflicts=('kdegraphics-libs')
 source=("http://download.kde.org/unstable/${pkgver}/src/svgpart-${pkgver}.tar.bz2")
-sha1sums=('300fc6a062ea34e6131097ae9a59e8279f3c1193')
+sha1sums=('85e86bd65d67dce99415f03e189236f7e20ad052')
 
 build() {
   cd "${srcdir}"
diff --git a/kde-unstable/kdegraphics-thumbnailers/PKGBUILD b/kde-unstable/kdegraphics-thumbnailers/PKGBUILD
index 7a3e5b1a1..edc803749 100644
--- a/kde-unstable/kdegraphics-thumbnailers/PKGBUILD
+++ b/kde-unstable/kdegraphics-thumbnailers/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 124799 2011-05-24 13:21:06Z andrea $
+# $Id: PKGBUILD 128584 2011-06-24 12:55:43Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegraphics-thumbnailers
-pkgver=4.6.80
+pkgver=4.6.90
 pkgrel=1
 pkgdesc="Thumbnailers for various graphics file formats"
 url="http://kde.org/"
@@ -12,7 +12,7 @@ depends=('libkexiv2' 'libkdcraw')
 makedepends=('cmake' 'automoc4')
 conflicts=('kdegraphics-libs')
 source=("http://download.kde.org/unstable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('d350cb85ad8520be00f6ee1f05a393d777e0f021')
+sha1sums=('31fc2f01f0a4946ca2b542ea112d6e683dc0e183')
 
 build() {
   cd "${srcdir}"
diff --git a/kde-unstable/kdelibs/PKGBUILD b/kde-unstable/kdelibs/PKGBUILD
index 8bfff6584..452c32835 100644
--- a/kde-unstable/kdelibs/PKGBUILD
+++ b/kde-unstable/kdelibs/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 124924 2011-05-25 08:50:46Z andrea $
+# $Id: PKGBUILD 128522 2011-06-24 12:41:31Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=kdelibs
-pkgver=4.6.80
+pkgver=4.6.90
 pkgrel=1
 pkgdesc="KDE Core Libraries"
 arch=('i686' 'x86_64')
@@ -19,12 +19,10 @@ makedepends=('pkgconfig' 'cmake' 'automoc4' 'intltool' 'avahi' 'libgl'
 replaces=('kdelibs-experimental')
 install='kdelibs.install'
 source=("http://download.kde.org/unstable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2"
-        'kde-applications-menu.patch' 'archlinux-menu.patch'
-        'kcalendarsystem-fixed.patch')
-sha1sums=('313e051b08762ec68d7d7aaceb5471ede2bf66ac'
+        'kde-applications-menu.patch' 'archlinux-menu.patch')
+sha1sums=('e04a0ecdb83a2cb086e13c9a2541b264dce00993'
           '86ee8c8660f19de8141ac99cd6943964d97a1ed7'
-          '63a850ab4196b9d06934f2b4a13acd9f7739bc67'
-          '13cbb58347dc7103684bb002b8f636fc0fa9e738')
+          '63a850ab4196b9d06934f2b4a13acd9f7739bc67')
 
 build() {
        cd ${srcdir}/${pkgname}-${pkgver}
@@ -34,9 +32,6 @@ build() {
        # add Archlinux menu entry
        patch -p1 -i $srcdir/archlinux-menu.patch
 
-       # Already fixed upstream
-       patch -p1 -i "${srcdir}"/kcalendarsystem-fixed.patch
-
        cd ${srcdir}
        mkdir build
        cd build
diff --git a/kde-unstable/kdemultimedia/PKGBUILD b/kde-unstable/kdemultimedia/PKGBUILD
index 44d684966..a2dec2b03 100644
--- a/kde-unstable/kdemultimedia/PKGBUILD
+++ b/kde-unstable/kdemultimedia/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 125373 2011-05-26 10:37:17Z andrea $
+# $Id: PKGBUILD 128585 2011-06-24 12:55:46Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
@@ -10,7 +10,7 @@ pkgname=('kdemultimedia-dragonplayer'
          'kdemultimedia-kmix'
          'kdemultimedia-kscd'
          'kdemultimedia-mplayerthumbs')
-pkgver=4.6.80
+pkgver=4.6.90
 pkgrel=1
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
@@ -20,7 +20,7 @@ makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdelibs' 'tunepimp'
             'ffmpeg' 'mplayer' 'pulseaudio' 'libmusicbrainz3')
 source=("http://download.kde.org/unstable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2"
         'mplayerthumbs.config')
-sha1sums=('60fa25d125aa77b66fd1c1e9e043df48abf35bd4'
+sha1sums=('ebc01da3a67e04fa1c281ff3aab04079caa61325'
           'ba016fa2563c14ffcba852c62506b66bfc6ee683')
 
 build() {
diff --git a/kde-unstable/kdenetwork/PKGBUILD b/kde-unstable/kdenetwork/PKGBUILD
index 763acd722..bd83a8b75 100644
--- a/kde-unstable/kdenetwork/PKGBUILD
+++ b/kde-unstable/kdenetwork/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 124770 2011-05-24 10:05:32Z andrea $
+# $Id: PKGBUILD 128586 2011-06-24 12:56:07Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
@@ -10,7 +10,7 @@ pkgname=('kdenetwork-filesharing'
          'kdenetwork-kppp'
          'kdenetwork-krdc'
          'kdenetwork-krfb')
-pkgver=4.6.80
+pkgver=4.6.90
 pkgrel=1
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
@@ -21,7 +21,7 @@ makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' 'speex' 'ortp' 'libotr'
     'v4l-utils' 'libidn' 'rdesktop' 'qimageblitz' 'libxdamage' 'libgadu'
     'telepathy-qt4' 'libktorrent' 'libmms')
 source=("http://download.kde.org/unstable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
-sha1sums=('8afe1547ea6f9f7acbdaf73b3ade4e3c752e645e')
+sha1sums=('0aa2f1ae9d13f9bd9dd4f57b6707f2edbfce1f40')
 
 build() {
     cd ${srcdir}
diff --git a/kde-unstable/kdepim-runtime/PKGBUILD b/kde-unstable/kdepim-runtime/PKGBUILD
index 72aecd954..d192169e9 100644
--- a/kde-unstable/kdepim-runtime/PKGBUILD
+++ b/kde-unstable/kdepim-runtime/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=kdepim-runtime
-pkgver=4.6.80
+pkgver=4.6.90
 pkgrel=1
 pkgdesc='KDE PIM Runtime Environment'
 arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ depends=('kdepimlibs' 'kdebase-runtime')
 makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost')
 install=${pkgname}.install
 source=("http://download.kde.org/unstable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('18cb10ea5a7373c4eea859b0d0518b6a9c0e6a4e')
+sha1sums=('ac13fffd49e9b29de7da65d6713aa8b9fa9106b4')
 
 build() {
     cd "${srcdir}"
diff --git a/kde-unstable/kdepim/PKGBUILD b/kde-unstable/kdepim/PKGBUILD
index 1b0491433..cd3e3939a 100644
--- a/kde-unstable/kdepim/PKGBUILD
+++ b/kde-unstable/kdepim/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 124768 2011-05-24 09:38:48Z andrea $
+# $Id: PKGBUILD 128587 2011-06-24 12:56:13Z 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.80
+pkgver=4.6.90
 pkgrel=1
 arch=('i686' 'x86_64')
 url='http://pim.kde.org'
@@ -28,15 +28,10 @@ license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdepim')
 makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' 'kdepim-runtime' 'libxss'
              'pilot-link' 'kde-agent')
-source=("http://download.kde.org/unstable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2"
-        'fix-console-build.patch')
-sha1sums=('dc32fee3332df3bdb4395f3a229d88de34ae4de1'
-          'e4b82bcee6c46aad39196a5bb2732fed72ff4541')
+source=("http://download.kde.org/unstable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
+sha1sums=('40d8b4718281554096dc1cee3928e5ed38f1c52d')
 
 build() {
-	cd "${srcdir}"/${pkgbase}-${pkgver}
-    patch -p1 -i "${srcdir}"/fix-console-build.patch
-
     cd "${srcdir}"
 	mkdir build
 	cd build
diff --git a/kde-unstable/kdepimlibs/PKGBUILD b/kde-unstable/kdepimlibs/PKGBUILD
index 2fff6052c..bab597e53 100644
--- a/kde-unstable/kdepimlibs/PKGBUILD
+++ b/kde-unstable/kdepimlibs/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 124655 2011-05-23 19:42:19Z andrea $
+# $Id: PKGBUILD 128644 2011-06-25 10:17:07Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=kdepimlibs
-pkgver=4.6.80
+pkgver=4.6.90
 pkgrel=1
 pkgdesc="KDE PIM Libraries"
 arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ depends=('kdelibs' 'gpgme' 'akonadi' 'libical' )
 makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' 'cyrus-sasl' 'openldap')
 install='kdepimlibs.install'
 source=("http://download.kde.org/unstable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('e07ba03177775ee6db6669123b944dd7c3b362f1')
+sha1sums=('8dfdc170ed506d3c7d3dc0d46195cee8804bc431')
 
 build() {
 	cd ${srcdir}
@@ -22,7 +22,8 @@ build() {
 	cmake ../${pkgname}-${pkgver} \
 		-DCMAKE_BUILD_TYPE=Release \
 		-DCMAKE_SKIP_RPATH=ON \
-		-DCMAKE_INSTALL_PREFIX=/usr
+		-DCMAKE_INSTALL_PREFIX=/usr \
+        -DWITH_Prison=OFF
 	make
 }
 
diff --git a/kde-unstable/kdeplasma-addons/PKGBUILD b/kde-unstable/kdeplasma-addons/PKGBUILD
index 567e16086..86719c634 100644
--- a/kde-unstable/kdeplasma-addons/PKGBUILD
+++ b/kde-unstable/kdeplasma-addons/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 124813 2011-05-24 15:14:21Z andrea $
+# $Id: PKGBUILD 128588 2011-06-24 12:56:20Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
@@ -72,7 +72,7 @@ pkgname=('kdeplasma-addons-applets-bball'
          'kdeplasma-addons-wallpapers-pattern'
          'kdeplasma-addons-wallpapers-virus'
          'kdeplasma-addons-wallpapers-weather')
-pkgver=4.6.80
+pkgver=4.6.90
 pkgrel=1
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
@@ -81,7 +81,7 @@ groups=('kde' 'kdeplasma-addons')
 makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdebase-workspace' 'kdeedu-marble'
              'eigen' 'scim' 'qwt' 'boost' 'libkexiv2')
 source=("http://download.kde.org/unstable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
-sha1sums=('09b97248aa576991f9f5e9ddaa3392618e2337e7')
+sha1sums=('d0db05c9881c3151a128b0feb0f4505f271a520c')
 
 build() {
     cd ${srcdir}
diff --git a/kde-unstable/kdesdk-kate/PKGBUILD b/kde-unstable/kdesdk-kate/PKGBUILD
index c64df1df3..5a4917efa 100644
--- a/kde-unstable/kdesdk-kate/PKGBUILD
+++ b/kde-unstable/kdesdk-kate/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 124689 2011-05-23 21:22:48Z andrea $
+# $Id: PKGBUILD 128530 2011-06-24 12:42:04Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgbase=kdesdk-kate
 pkgname=('kdebase-kwrite'
          'kdesdk-kate')
-pkgver=4.6.80
+pkgver=4.6.90
 pkgrel=1
 arch=('i686' 'x86_64')
 license=('GPL' 'LGPL' 'FDL')
 makedepends=('kdelibs ''cmake' 'automoc4')
 source=("http://download.kde.org/unstable/${pkgver}/src/kate-${pkgver}.tar.bz2"
         'pkgbuild-syntax-highlight.patch')
-sha1sums=('9c95690b9f967a0ed52afcf6c4d7ace3ef9284ff'
+sha1sums=('a1afeeae3de94e964b48bc84ef5c920862571dcb'
           'ab0c5d2a796b0f283154799add161c99f48ffcd5')
 
 build() {
diff --git a/kde-unstable/kdesdk/PKGBUILD b/kde-unstable/kdesdk/PKGBUILD
index f71e64204..975e5f4a1 100644
--- a/kde-unstable/kdesdk/PKGBUILD
+++ b/kde-unstable/kdesdk/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 126511 2011-06-05 22:11:29Z andrea $
+# $Id: PKGBUILD 128589 2011-06-24 12:56:27Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
@@ -24,8 +24,8 @@ pkgname=('kdesdk-cervisia'
          'kdesdk-scripts'
          'kdesdk-strigi-analyzer'
          'kdesdk-umbrello')
-pkgver=4.6.80
-pkgrel=2
+pkgver=4.6.90
+pkgrel=1
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
 license=('GPL' 'LGPL' 'FDL')
@@ -34,7 +34,7 @@ makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' 'subversion' 'antlr2'
              'kdepimlibs' 'kdebase-lib')
 source=("http://download.kde.org/unstable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2"
         'fix-python2-path.patch')
-sha1sums=('2193e14b8373b833221dbf08ecdb0075e86abe44'
+sha1sums=('cfdcb81459e105dc843fcfd56a1093b557754b79'
           'd05ca0231869c484fd3861955d960a60aff7dcfb')
 
 build() {
diff --git a/kde-unstable/kdetoys/PKGBUILD b/kde-unstable/kdetoys/PKGBUILD
index 1eba40691..7ddc8710b 100644
--- a/kde-unstable/kdetoys/PKGBUILD
+++ b/kde-unstable/kdetoys/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 124780 2011-05-24 12:05:42Z andrea $
+# $Id: PKGBUILD 128590 2011-06-24 12:56:36Z 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.80
+pkgver=4.6.90
 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/unstable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
-sha1sums=('b268bb38f84199d33d3be1fe3e0389c0abb35e69')
+sha1sums=('faa490fc8d58976e37961780145f0c85971c030b')
 
 build() {
 	cd $srcdir
diff --git a/kde-unstable/kdeutils/PKGBUILD b/kde-unstable/kdeutils/PKGBUILD
index 89915c6f6..449b47a96 100644
--- a/kde-unstable/kdeutils/PKGBUILD
+++ b/kde-unstable/kdeutils/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 124777 2011-05-24 11:52:41Z andrea $
+# $Id: PKGBUILD 128591 2011-06-24 12:56:50Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
@@ -16,7 +16,7 @@ pkgname=('kdeutils-ark'
          'kdeutils-printer-applet'
          'kdeutils-superkaramba'
          'kdeutils-sweeper')
-pkgver=4.6.80
+pkgver=4.6.90
 pkgrel=1
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
@@ -26,7 +26,7 @@ makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdebase-lib' 'kdebase-workspace'
 	'kdebindings-python' 'system-config-printer-common' 'libarchive' 'qimageblitz'
 	'qjson')
 source=("http://download.kde.org/unstable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
-sha1sums=('90b5e5bd95ec2de2d36db20c6155d23dbeab2d60')
+sha1sums=('d2782e6b24ea433017c31412d1b2610d87549c7d')
 
 build() {
 	cd ${srcdir}
diff --git a/kde-unstable/kdewebdev/PKGBUILD b/kde-unstable/kdewebdev/PKGBUILD
index d70b92ee0..3473a71b4 100644
--- a/kde-unstable/kdewebdev/PKGBUILD
+++ b/kde-unstable/kdewebdev/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 124779 2011-05-24 12:04:03Z andrea $
+# $Id: PKGBUILD 128592 2011-06-24 12:56:53Z 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.80
+pkgver=4.6.90
 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/unstable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
-sha1sums=('d5e35391eb64265f66d81c5bdd8d95abf11d474a')
+sha1sums=('959a3f020f8b79a539162df74cf9898628c900ff')
 
 build() {
 	cd $srcdir
diff --git a/kde-unstable/libkdcraw/PKGBUILD b/kde-unstable/libkdcraw/PKGBUILD
index 95daa4280..6fdf59762 100644
--- a/kde-unstable/libkdcraw/PKGBUILD
+++ b/kde-unstable/libkdcraw/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 124799 2011-05-24 13:21:06Z andrea $
+# $Id: PKGBUILD 128541 2011-06-24 12:43:00Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=libkdcraw
-pkgver=4.6.80
+pkgver=4.6.90
 pkgrel=1
 pkgdesc="A C++ interface used to decode RAW picture"
 url="http://kde.org/"
@@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4')
 conflicts=('kdegraphics-libs')
 install=${pkgname}.install
 source=("http://download.kde.org/unstable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('19fe60a51ede7bf5b4047f8fff22cd8361ebd90c')
+sha1sums=('4ea47528716db93c0b3a0fa5abcd9dde0148eb78')
 
 build() {
   cd "${srcdir}"
diff --git a/kde-unstable/libkdeedu/PKGBUILD b/kde-unstable/libkdeedu/PKGBUILD
index fa4986b87..8cc822b1f 100644
--- a/kde-unstable/libkdeedu/PKGBUILD
+++ b/kde-unstable/libkdeedu/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 124792 2011-05-24 13:04:47Z andrea $
+# $Id: PKGBUILD 128539 2011-06-24 12:42:38Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=libkdeedu
-pkgver=4.6.80
+pkgver=4.6.90
 pkgrel=1
 pkgdesc="Libraries used by KDE Education applications"
 url="http://kde.org/"
@@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 replaces=('kdeedu-libkdeedu' 'kdeedu-data')
 source=("http://download.kde.org/unstable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('2349b0a1676b61c7915a272030d6388e8bd6c3b1')
+sha1sums=('1c4f1fbe5301c0b82e53cd6b009f7fc04209965c')
 
 build() {
   cd "${srcdir}"
diff --git a/kde-unstable/libkexiv2/PKGBUILD b/kde-unstable/libkexiv2/PKGBUILD
index c80f8cd71..82811eff9 100644
--- a/kde-unstable/libkexiv2/PKGBUILD
+++ b/kde-unstable/libkexiv2/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 124799 2011-05-24 13:21:06Z andrea $
+# $Id: PKGBUILD 128542 2011-06-24 12:50:40Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=libkexiv2
-pkgver=4.6.80
+pkgver=4.6.90
 pkgrel=1
 pkgdesc="A library to manipulate pictures metadata"
 url="http://kde.org/"
@@ -12,7 +12,7 @@ depends=('kdelibs')
 makedepends=('cmake' 'automoc4')
 conflicts=('kdegraphics-libs')
 source=("http://download.kde.org/unstable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('cff979e2bcc604ec422feff0bc1fee3483955e5d')
+sha1sums=('da3d8a14200171371be48e31290cb3a22015829b')
 
 build() {
   cd "${srcdir}"
diff --git a/kde-unstable/libkipi/PKGBUILD b/kde-unstable/libkipi/PKGBUILD
index b11e5a1cf..72f3d2297 100644
--- a/kde-unstable/libkipi/PKGBUILD
+++ b/kde-unstable/libkipi/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 124799 2011-05-24 13:21:06Z andrea $
+# $Id: PKGBUILD 128543 2011-06-24 12:51:01Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=libkipi
-pkgver=4.6.80
+pkgver=4.6.90
 pkgrel=1
 pkgdesc="An interface to use kipi-plugins from a KDE application"
 url="http://kde.org/"
@@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4')
 conflicts=('kdegraphics-libs')
 install=${pkgname}.install
 source=("http://download.kde.org/unstable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('f87620e1eaa795129447473c3b89dbc5a27da161')
+sha1sums=('c85d4c4572f8d9c91fd7e40ed3f7a6e0bee72320')
 
 build() {
   cd "${srcdir}"
diff --git a/kde-unstable/libksane/PKGBUILD b/kde-unstable/libksane/PKGBUILD
index b1f117368..2a857d528 100644
--- a/kde-unstable/libksane/PKGBUILD
+++ b/kde-unstable/libksane/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 124799 2011-05-24 13:21:06Z andrea $
+# $Id: PKGBUILD 128544 2011-06-24 12:51:18Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=libksane
-pkgver=4.6.80
+pkgver=4.6.90
 pkgrel=1
 pkgdesc="An image scanning library"
 url="http://kde.org/"
@@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4')
 conflicts=('kdegraphics-libs')
 install=${pkgname}.install
 source=("http://download.kde.org/unstable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('19cf8532f5ea046343fcaa51b9a9c0df7aae2978')
+sha1sums=('26b27920f02a6e6999c7bfd08fe6632a39fe2d53')
 
 build() {
   cd "${srcdir}"
diff --git a/libre/thunderbird-libre/rePKGBUILD b/libre/thunderbird-libre/rePKGBUILD
index 215f893a1..e71f6ad78 100644
--- a/libre/thunderbird-libre/rePKGBUILD
+++ b/libre/thunderbird-libre/rePKGBUILD
@@ -25,6 +25,7 @@ build() {
 }
 
 package() {
+  find ${srcdir} -type l -maxdepth 1 -delete
   cd ${srcdir}
   cp -a ./* ${pkgdir}
 }
diff --git a/multilib-testing/lib32-glibc/PKGBUILD b/multilib-testing/lib32-glibc/PKGBUILD
index 59e7e0d74..276d465cd 100644
--- a/multilib-testing/lib32-glibc/PKGBUILD
+++ b/multilib-testing/lib32-glibc/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 49882 2011-06-21 19:12:48Z heftig $
+# $Id: PKGBUILD 50168 2011-06-25 17:22:07Z heftig $
 # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 # Contributor: Allan McRae <allan@archlinux.org>
@@ -9,7 +9,7 @@
 _pkgbasename=glibc
 pkgname=lib32-$_pkgbasename
 pkgver=2.14
-pkgrel=3
+pkgrel=4
 _glibcdate=20110617
 pkgdesc="GNU C Library for multilib"
 arch=('x86_64')
@@ -26,7 +26,8 @@ source=(http://mirrors.kernel.org/archlinux/other/glibc/${_pkgbasename}-${pkgver
         glibc-2.12.2-ignore-origin-of-privileged-program.patch
         glibc-2.13-futex.patch
         glibc-2.14-libdl-crash.patch
-        glibc-2.14-fix-resolver-crash-typo.patch
+        #glibc-2.14-fix-resolver-crash-typo.patch
+        glibc-2.14-revert-4462fad3.patch
         glibc-2.14-reexport-rpc-interface.patch
         glibc-2.14-reinstall-nis-rpc-headers.patch
         lib32-glibc.conf)
@@ -38,7 +39,7 @@ md5sums=('e441d745609d93c907b72548ba646dad'
          'b042647ea7d6f22ad319e12e796bd13e'
          '7d0154b7e17ea218c9fa953599d24cc4'
          'cea62cc6b903d222c5f26e05a3c0e0e6'
-         '73bfaafe25b93f357cf6a3b5eeb70e1b'
+         '46e56492cccb1c9172ed3a235cf43c6c'
          'c5de2a946215d647c8af5432ec4b0da0'
          '55febbb72139ac7b65757df085024b83'
          '6e052f1cb693d5d3203f50f9d4e8c33b')
@@ -71,8 +72,11 @@ build() {
   # http://sourceware.org/ml/libc-alpha/2011-06/msg00006.html
   patch -Np1 -i ${srcdir}/glibc-2.14-libdl-crash.patch
 
-  # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=57912a71 (FS#24615)
-  patch -Np1 -i ${srcdir}/glibc-2.14-fix-resolver-crash-typo.patch
+  # This fixes the main segfault but not the assert fail (FS#24615)
+  # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=57912a71 
+  #patch -Np1 -i ${srcdir}/glibc-2.14-fix-resolver-crash-typo.patch
+  # resort to reverting the bad commit completely for the moment
+  patch -Np1 -i ${srcdir}/glibc-2.14-revert-4462fad3.patch
 
   # re-export RPC interface until libtirpc is ready as a replacement
   # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=acee4873 (only fedora branch...)
diff --git a/social/tinc/PKGBUILD b/social/tinc/PKGBUILD
index 1dd9ad328..a34d3785b 100644
--- a/social/tinc/PKGBUILD
+++ b/social/tinc/PKGBUILD
@@ -1,12 +1,15 @@
 pkgname=tinc
 pkgver=1.0.15
-pkgrel=1
+pkgrel=2
 pkgdesc="VPN (Virtual Private Network) daemon"
 arch=(i686 x86_64)
 url="http://www.tinc-vpn.org/"
 license=('GPL')
 depends=('lzo2' 'zlib' 'openssl')
-source=(http://www.tinc-vpn.org/packages/tinc-$pkgver.tar.gz)
+source=(http://www.tinc-vpn.org/packages/tinc-$pkgver.tar.gz
+        tincd.conf
+        tincd.rcd)
+md5sums=('44bb7d1618955a0a56e9e159f1c46362')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
@@ -20,7 +23,13 @@ package() {
 
   make DESTDIR="$pkgdir" install
 
-  install -d $pkgdir/etc/tinc
+  install -d $pkgdir/etc/{tinc,rc.d,conf.d}
+
+  install -Dm755 $srcdir/tincd.rcd $pkgdir/etc/rc.d/tincd
+  install -Dm755 $srcdir/tincd.conf $pkgdir/etc/conf.d/tincd
+
   tar xzvf doc/sample-config.tar.gz -C $pkgdir/etc/tinc/
 }
-md5sums=('44bb7d1618955a0a56e9e159f1c46362')
+md5sums=('44bb7d1618955a0a56e9e159f1c46362'
+         '9b40646cd898709e90ae3c32baecb075'
+         '75516d05803ee6c6b22516e10129ad99')
diff --git a/social/tinc/tincd.conf b/social/tinc/tincd.conf
new file mode 100644
index 000000000..84547936c
--- /dev/null
+++ b/social/tinc/tincd.conf
@@ -0,0 +1 @@
+NETNAME=yournetname
diff --git a/social/tinc/tincd.rcd b/social/tinc/tincd.rcd
new file mode 100644
index 000000000..f0a456e17
--- /dev/null
+++ b/social/tinc/tincd.rcd
@@ -0,0 +1,43 @@
+#!/bin/bash
+
+daemon_name=tincd
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+. /etc/conf.d/$daemon_name.conf
+
+PID=`pidof -o %PPID /usr/sbin/tincd`
+
+case "$1" in
+    start)
+        stat_busy "Starting ${daemon_name}"
+        [ -z "$PID" ] && \
+            /usr/sbin/tincd -n ${NETNAME} \
+                            --pidfile=/var/run/tinc.${NETNAME} &> /dev/null
+
+        if [ $? -gt 0 ]; then
+            stat_fail
+        else
+            add_daemon ${daemon_name}
+            stat_done
+        fi
+        ;;
+    stop)
+        stat_busy "Stopping ${daemon_name}"
+        [ ! -z "$PID" ] && kill $PID &> /dev/null
+        if [ $? -gt 0 ]; then
+            stat_fail
+        else
+            rm_daemon ${daemon_name}
+            stat_done
+        fi
+        ;;
+    restart)
+        $0 stop
+        sleep 3
+        $0 start
+        ;;
+    *)
+        echo "usage: $0 {start|stop|restart}"
+esac
+exit 0
diff --git a/testing/fakeroot/PKGBUILD b/testing/fakeroot/PKGBUILD
new file mode 100644
index 000000000..2d869d714
--- /dev/null
+++ b/testing/fakeroot/PKGBUILD
@@ -0,0 +1,35 @@
+# $Id: PKGBUILD 128934 2011-06-25 14:19:16Z allan $
+# Maintainer: Allan McRae <allan@archlinux.org>
+# Contributor: Jochem Kossen <j.kossen@home.nl>
+
+pkgname=fakeroot
+pkgver=1.16
+pkgrel=1
+pkgdesc="Gives a fake root environment, useful for building packages as a non-privileged user"
+arch=('i686' 'x86_64')
+license=('GPL')
+url="http://packages.debian.org/fakeroot"
+groups=('base-devel')
+install=fakeroot.install
+depends=('glibc' 'filesystem' 'sed' 'util-linux' 'sh')
+options=('!libtool')
+source=(http://ftp.debian.org/debian/pool/main/f/${pkgname}/${pkgname}_${pkgver}.orig.tar.bz2)
+md5sums=('e8470aa7e965bfc74467de0e594e60b6')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./configure --prefix=/usr --libdir=/usr/lib/libfakeroot \
+              --disable-static --with-ipc=sysv
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR=${pkgdir} install
+
+  install -dm755 ${pkgdir}/etc/ld.so.conf.d/
+  echo '/usr/lib/libfakeroot' > ${pkgdir}/etc/ld.so.conf.d/fakeroot.conf
+
+  # install README for sysv/tcp usage
+  install -Dm644 $srcdir/$pkgname-$pkgver/README $pkgdir/usr/share/doc/$pkgname/README
+}
diff --git a/testing/fakeroot/fakeroot.install b/testing/fakeroot/fakeroot.install
new file mode 100644
index 000000000..986c91b06
--- /dev/null
+++ b/testing/fakeroot/fakeroot.install
@@ -0,0 +1,14 @@
+post_install() {
+  sbin/ldconfig -r .
+}
+
+post_upgrade() {
+  if [ "$(vercmp $2 1.14.4-2)" -lt 0 ]; then
+    sed -i -e '/\/usr\/lib\/libfakeroot/d' etc/ld.so.conf
+  fi
+  sbin/ldconfig -r .
+}
+
+pre_remove() {
+  sbin/ldconfig -r .
+}
diff --git a/testing/glibc/PKGBUILD b/testing/glibc/PKGBUILD
index 33810d391..f3a040236 100644
--- a/testing/glibc/PKGBUILD
+++ b/testing/glibc/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 127755 2011-06-18 06:06:01Z allan $
+# $Id: PKGBUILD 128661 2011-06-25 11:56:19Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 
 # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc
@@ -6,7 +6,7 @@
 
 pkgname=glibc
 pkgver=2.14
-pkgrel=3
+pkgrel=4
 _glibcdate=20110617
 pkgdesc="GNU C Library"
 arch=('i686' 'x86_64')
@@ -27,7 +27,8 @@ source=(ftp://ftp.archlinux.org/other/glibc/${pkgname}-${pkgver}_${_glibcdate}.t
         glibc-2.12.2-ignore-origin-of-privileged-program.patch
         glibc-2.13-futex.patch
         glibc-2.14-libdl-crash.patch
-        glibc-2.14-fix-resolver-crash-typo.patch
+        #glibc-2.14-fix-resolver-crash-typo.patch
+        glibc-2.14-revert-4462fad3.patch
         glibc-2.14-reexport-rpc-interface.patch
         glibc-2.14-reinstall-nis-rpc-headers.patch
         nscd
@@ -41,7 +42,7 @@ md5sums=('e441d745609d93c907b72548ba646dad'
          'b042647ea7d6f22ad319e12e796bd13e'
          '7d0154b7e17ea218c9fa953599d24cc4'
          'cea62cc6b903d222c5f26e05a3c0e0e6'
-         '73bfaafe25b93f357cf6a3b5eeb70e1b'
+         '46e56492cccb1c9172ed3a235cf43c6c'
          'c5de2a946215d647c8af5432ec4b0da0'
          '55febbb72139ac7b65757df085024b83'
          'b587ee3a70c9b3713099295609afde49'
@@ -85,8 +86,11 @@ build() {
   # http://sourceware.org/ml/libc-alpha/2011-06/msg00006.html
   patch -Np1 -i ${srcdir}/glibc-2.14-libdl-crash.patch
 
-  # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=57912a71 (FS#24615)
-  patch -Np1 -i ${srcdir}/glibc-2.14-fix-resolver-crash-typo.patch
+  # This fixes the main segfault but not the assert fail (FS#24615)
+  # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=57912a71 
+  #patch -Np1 -i ${srcdir}/glibc-2.14-fix-resolver-crash-typo.patch
+  # resort to reverting the bad commit completely for the moment
+  patch -Np1 -i ${srcdir}/glibc-2.14-revert-4462fad3.patch
 
   # re-export RPC interface until libtirpc is ready as a replacement
   # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=acee4873 (only fedora branch...)
diff --git a/testing/grep/PKGBUILD b/testing/grep/PKGBUILD
new file mode 100644
index 000000000..958f5b0e5
--- /dev/null
+++ b/testing/grep/PKGBUILD
@@ -0,0 +1,33 @@
+# $Id: PKGBUILD 128670 2011-06-25 12:20:55Z allan $
+# Maintainer: Allan McRae <allan@archlinux.org>
+# Contributor: judd <jvinet@zeroflux.org>
+
+pkgname=grep
+pkgver=2.9
+pkgrel=1
+pkgdesc="A string search utility"
+arch=('i686' 'x86_64')
+license=('GPL3')
+url="http://www.gnu.org/software/grep/grep.html"
+groups=('base')
+depends=('glibc' 'pcre' 'sh')
+makedepends=('texinfo')
+install=${pkgname}.install
+source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz)
+md5sums=('25e41b2aa201104354740961ef36005a')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  ./configure --prefix=/usr --bindir=/bin --without-included-regex
+  make
+}
+
+check() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make check
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make DESTDIR=${pkgdir} install
+}
diff --git a/testing/grep/grep.install b/testing/grep/grep.install
new file mode 100644
index 000000000..7cd31301f
--- /dev/null
+++ b/testing/grep/grep.install
@@ -0,0 +1,21 @@
+infodir=usr/share/info
+filelist=(grep.info)
+
+post_install() {
+  [ -x usr/bin/install-info ] || return 0
+  for file in ${filelist[@]}; do
+    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
+  done
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+  [ -x usr/bin/install-info ] || return 0
+  for file in ${filelist[@]}; do
+    install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
+  done
+}
+
diff --git a/testing/less/PKGBUILD b/testing/less/PKGBUILD
new file mode 100644
index 000000000..36b928066
--- /dev/null
+++ b/testing/less/PKGBUILD
@@ -0,0 +1,30 @@
+# $Id: PKGBUILD 128667 2011-06-25 12:14:07Z allan $
+# Maintainer: Allan McRae <allan@archlinux.org>
+# Contributor: judd <jvinet@zeroflux.org>
+
+pkgname=less
+pkgver=444
+pkgrel=1
+pkgdesc="A terminal based program for viewing text files"
+license=('GPL3')
+arch=('i686' 'x86_64')
+url="http://www.greenwoodsoftware.com/less"
+groups=('base')
+depends=('ncurses' 'pcre')
+source=(http://www.greenwoodsoftware.com/$pkgname/$pkgname-$pkgver.tar.gz)
+md5sums=('56f9f76ffe13f70155f47f6b3c87d421')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  ./configure --prefix=/usr --sysconfdir=/etc --with-regex=pcre
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  make prefix="${pkgdir}"/usr install
+  install -dm755 "${pkgdir}"/bin
+  mv "${pkgdir}"/usr/bin/${pkgname} "${pkgdir}"/bin
+}
diff --git a/testing/module-init-tools/PKGBUILD b/testing/module-init-tools/PKGBUILD
new file mode 100644
index 000000000..e65f419df
--- /dev/null
+++ b/testing/module-init-tools/PKGBUILD
@@ -0,0 +1,39 @@
+# $Id: PKGBUILD 128937 2011-06-25 14:35:00Z dreisner $
+# Maintainer: Aaron Griffin <aaron@archlinux.org>
+# Contributor: judd <jvinet@zeroflux.org>
+
+pkgname=module-init-tools
+pkgver=3.16
+pkgrel=1
+pkgdesc="utilities needed by Linux systems for managing loadable kernel modules"
+arch=('i686' 'x86_64')
+url="http://kerneltools.org"
+license=('GPL')
+depends=('glibc')
+makedepends=('docbook2x')
+backup=('etc/modprobe.d/modprobe.conf')
+source=(http://www.kernel.org/pub/linux/utils/kernel/module-init-tools/module-init-tools-$pkgver.tar.bz2
+        modprobe.conf
+        docfix.patch)
+md5sums=('bc44832c6e41707b8447e2847d2019f5'
+         '316f1bda4c21af02b30252eb014a0a55'
+         '4320d19902ded43bed55c804b065cdc7')
+
+build() {
+  cd $srcdir/$pkgname-$pkgver
+
+  # fix headers in SGML manpage sources and an XML typo
+  patch -Np0 < "$srcdir/docfix.patch"
+
+  ./configure --prefix=/usr --exec-prefix=/ --enable-zlib
+  make
+}
+
+package() {
+  cd $srcdir/$pkgname-$pkgver
+
+  make DESTDIR=$pkgdir install
+
+  # Install our custom (read: empty) modprobe.conf
+  install -Dm644 $srcdir/modprobe.conf $pkgdir/etc/modprobe.d/modprobe.conf
+}
diff --git a/testing/module-init-tools/docfix.patch b/testing/module-init-tools/docfix.patch
new file mode 100644
index 000000000..0151ca3f1
--- /dev/null
+++ b/testing/module-init-tools/docfix.patch
@@ -0,0 +1,90 @@
+--- doc/depmod.conf.sgml.orig	2011-06-25 10:07:15.897805024 -0400
++++ doc/depmod.conf.sgml	2011-06-25 10:07:48.810805020 -0400
+@@ -1,4 +1,5 @@
+-<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
++<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1.2//EN"
++  "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
+   <!ENTITY debian  "<productname>Debian GNU/Linux</productname>">
+   <!ENTITY docbook "<productname>DocBook</productname>">
+   <!ENTITY sgml    "<abbrev>SGML</abbrev>">
+--- doc/depmod.sgml.orig	2011-06-25 10:07:15.898805024 -0400
++++ doc/depmod.sgml	2011-06-25 10:07:56.636805021 -0400
+@@ -1,4 +1,5 @@
+-<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
++<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1.2//EN"
++  "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
+   <!ENTITY debian  "<productname>Debian GNU/Linux</productname>">
+   <!ENTITY docbook "<productname>DocBook</productname>">
+   <!ENTITY sgml    "<abbrev>SGML</abbrev>">
+@@ -52,7 +52,7 @@
+       <arg><option>-n</option></arg>
+       <arg><option>-v</option></arg>
+       <arg><option>-P <replaceable>prefix</replaceable></option></arg>
+-      <arg><option>-w</option><arg>
++      <arg><option>-w</option></arg>
+       <arg><option><replaceable>version</replaceable></option></arg>
+       <arg rep='repeat'><option><replaceable>filename</replaceable></option></arg>
+     </cmdsynopsis>
+--- doc/insmod.sgml.orig	2011-06-25 10:07:15.899805024 -0400
++++ doc/insmod.sgml	2011-06-25 10:07:59.228805019 -0400
+@@ -1,4 +1,5 @@
+-<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
++<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1.2//EN"
++  "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
+   <!ENTITY debian  "<productname>Debian GNU/Linux</productname>">
+   <!ENTITY docbook "<productname>DocBook</productname>">
+   <!ENTITY sgml    "<abbrev>SGML</abbrev>">
+--- doc/lsmod.sgml.orig	2011-06-25 10:07:15.899805024 -0400
++++ doc/lsmod.sgml	2011-06-25 10:08:04.804805020 -0400
+@@ -1,4 +1,5 @@
+-<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
++<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1.2//EN"
++  "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
+   <!ENTITY debian  "<productname>Debian GNU/Linux</productname>">
+   <!ENTITY docbook "<productname>DocBook</productname>">
+   <!ENTITY sgml    "<abbrev>SGML</abbrev>">
+--- doc/modinfo.sgml.orig	2011-06-25 10:07:15.900805024 -0400
++++ doc/modinfo.sgml	2011-06-25 10:08:07.630805019 -0400
+@@ -1,4 +1,5 @@
+-<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
++<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1.2//EN"
++  "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
+   <!ENTITY debian  "<productname>Debian GNU/Linux</productname>">
+   <!ENTITY docbook "<productname>DocBook</productname>">
+   <!ENTITY sgml    "<abbrev>SGML</abbrev>">
+--- doc/modprobe.conf.sgml.orig	2011-06-25 10:07:15.901805024 -0400
++++ doc/modprobe.conf.sgml	2011-06-25 10:08:10.173805018 -0400
+@@ -1,4 +1,5 @@
+-<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
++<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1.2//EN"
++  "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
+   <!ENTITY debian  "<productname>Debian GNU/Linux</productname>">
+   <!ENTITY docbook "<productname>DocBook</productname>">
+   <!ENTITY sgml    "<abbrev>SGML</abbrev>">
+--- doc/modprobe.sgml.orig	2011-06-25 10:07:15.902805024 -0400
++++ doc/modprobe.sgml	2011-06-25 10:08:13.623805019 -0400
+@@ -1,4 +1,5 @@
+-<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
++<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1.2//EN"
++  "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
+   <!ENTITY debian  "<productname>Debian GNU/Linux</productname>">
+   <!ENTITY docbook "<productname>DocBook</productname>">
+   <!ENTITY sgml    "<abbrev>SGML</abbrev>">
+--- doc/modules.dep.sgml.orig	2011-06-25 10:07:15.903805024 -0400
++++ doc/modules.dep.sgml	2011-06-25 10:08:19.323805019 -0400
+@@ -1,4 +1,5 @@
+-<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
++<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1.2//EN"
++  "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
+   <!ENTITY debian  "<productname>Debian GNU/Linux</productname>">
+   <!ENTITY docbook "<productname>DocBook</productname>">
+   <!ENTITY sgml    "<abbrev>SGML</abbrev>">
+--- doc/rmmod.sgml.orig	2011-06-25 10:07:15.904805024 -0400
++++ doc/rmmod.sgml	2011-06-25 10:08:27.691805017 -0400
+@@ -1,4 +1,5 @@
+-<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
++<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1.2//EN"
++  "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
+   <!ENTITY debian  "<productname>Debian GNU/Linux</productname>">
+   <!ENTITY docbook "<productname>DocBook</productname>">
+   <!ENTITY sgml    "<abbrev>SGML</abbrev>">
diff --git a/testing/module-init-tools/modprobe.conf b/testing/module-init-tools/modprobe.conf
new file mode 100644
index 000000000..83865a3af
--- /dev/null
+++ b/testing/module-init-tools/modprobe.conf
@@ -0,0 +1,3 @@
+#
+# /etc/modprobe.d/modprobe.conf (for v2.6 kernels)
+#
diff --git a/testing/mpfr/PKGBUILD b/testing/mpfr/PKGBUILD
new file mode 100644
index 000000000..3f593116a
--- /dev/null
+++ b/testing/mpfr/PKGBUILD
@@ -0,0 +1,38 @@
+# $Id: PKGBUILD 128942 2011-06-25 14:51:58Z allan $
+# Maintainer: Allan McRae <allan@archlinux.org>
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+# Contributor: damir <damir@archlinux.org>
+
+pkgname=mpfr
+_pkgver=3.0.1
+_patchlevel=p4
+pkgver=${_pkgver}.${_patchlevel}
+pkgrel=1
+pkgdesc="Multiple-precision floating-point library"
+arch=('i686' 'x86_64')
+url="http://www.mpfr.org/"
+license=('LGPL')
+depends=('gmp>=5.0')
+options=('!libtool')
+install=mpfr.install
+source=(http://www.mpfr.org/mpfr-current/mpfr-${_pkgver}.tar.xz
+        mpfr-${_pkgver}.${_patchlevel}.patch)
+md5sums=('645882d9d179113a70af84d27086ed9f'
+         '52c2ac5ffbbbf0c68f08e89f016ba7aa')
+
+build() {
+  cd "${srcdir}/${pkgname}-${_pkgver}"
+  patch -Np1 -i $srcdir/mpfr-${_pkgver}.${_patchlevel}.patch
+  ./configure --prefix=/usr --enable-thread-safe --enable-shared
+  make
+}
+
+check() {
+  cd "${srcdir}/${pkgname}-${_pkgver}"
+  make check
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${_pkgver}"
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/testing/mpfr/mpfr-3.0.1.p4.patch b/testing/mpfr/mpfr-3.0.1.p4.patch
new file mode 100644
index 000000000..9604635a2
--- /dev/null
+++ b/testing/mpfr/mpfr-3.0.1.p4.patch
@@ -0,0 +1,367 @@
+diff -Naurd mpfr-3.0.1-a/PATCHES mpfr-3.0.1-b/PATCHES
+--- mpfr-3.0.1-a/PATCHES	2011-04-12 10:50:02.000000000 +0000
++++ mpfr-3.0.1-b/PATCHES	2011-04-12 10:50:02.000000000 +0000
+@@ -0,0 +1 @@
++asin_exprange
+diff -Naurd mpfr-3.0.1-a/VERSION mpfr-3.0.1-b/VERSION
+--- mpfr-3.0.1-a/VERSION	2011-04-04 10:19:18.000000000 +0000
++++ mpfr-3.0.1-b/VERSION	2011-04-12 10:50:02.000000000 +0000
+@@ -1 +1 @@
+-3.0.1
++3.0.1-p1
+diff -Naurd mpfr-3.0.1-a/asin.c mpfr-3.0.1-b/asin.c
+--- mpfr-3.0.1-a/asin.c	2011-04-04 10:19:18.000000000 +0000
++++ mpfr-3.0.1-b/asin.c	2011-04-12 10:50:02.000000000 +0000
+@@ -63,11 +63,14 @@
+ 
+   compared = mpfr_cmp_ui (xp, 1);
+ 
++  MPFR_SAVE_EXPO_MARK (expo);
++
+   if (MPFR_UNLIKELY (compared >= 0))
+     {
+       mpfr_clear (xp);
+       if (compared > 0)                  /* asin(x) = NaN for |x| > 1 */
+         {
++          MPFR_SAVE_EXPO_FREE (expo);
+           MPFR_SET_NAN (asin);
+           MPFR_RET_NAN;
+         }
+@@ -80,13 +83,11 @@
+               inexact = -mpfr_const_pi (asin, MPFR_INVERT_RND(rnd_mode));
+               MPFR_CHANGE_SIGN (asin);
+             }
+-          mpfr_div_2ui (asin, asin, 1, rnd_mode); /* May underflow */
+-          return inexact;
++          mpfr_div_2ui (asin, asin, 1, rnd_mode);
+         }
+     }
+-
+-  MPFR_SAVE_EXPO_MARK (expo);
+-
++  else
++    {
+   /* Compute exponent of 1 - ABS(x) */
+   mpfr_ui_sub (xp, 1, xp, MPFR_RNDD);
+   MPFR_ASSERTD (MPFR_GET_EXP (xp) <= 0);
+@@ -115,6 +116,7 @@
+   inexact = mpfr_set (asin, xp, rnd_mode);
+ 
+   mpfr_clear (xp);
++    }
+ 
+   MPFR_SAVE_EXPO_FREE (expo);
+   return mpfr_check_range (asin, inexact, rnd_mode);
+diff -Naurd mpfr-3.0.1-a/mpfr.h mpfr-3.0.1-b/mpfr.h
+--- mpfr-3.0.1-a/mpfr.h	2011-04-04 10:19:18.000000000 +0000
++++ mpfr-3.0.1-b/mpfr.h	2011-04-12 10:50:02.000000000 +0000
+@@ -27,7 +27,7 @@
+ #define MPFR_VERSION_MAJOR 3
+ #define MPFR_VERSION_MINOR 0
+ #define MPFR_VERSION_PATCHLEVEL 1
+-#define MPFR_VERSION_STRING "3.0.1"
++#define MPFR_VERSION_STRING "3.0.1-p1"
+ 
+ /* Macros dealing with MPFR VERSION */
+ #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
+diff -Naurd mpfr-3.0.1-a/tests/tasin.c mpfr-3.0.1-b/tests/tasin.c
+--- mpfr-3.0.1-a/tests/tasin.c	2011-04-04 10:19:17.000000000 +0000
++++ mpfr-3.0.1-b/tests/tasin.c	2011-04-12 10:50:02.000000000 +0000
+@@ -219,6 +219,49 @@
+   mpfr_clear (y);
+ }
+ 
++static void
++reduced_expo_range (void)
++{
++  mpfr_exp_t emin, emax;
++  mpfr_t x, y, ex_y;
++  int inex, ex_inex;
++  unsigned int flags, ex_flags;
++
++  emin = mpfr_get_emin ();
++  emax = mpfr_get_emax ();
++
++  mpfr_inits2 (4, x, y, ex_y, (mpfr_ptr) 0);
++  mpfr_set_str (x, "-0.1e1", 2, MPFR_RNDN);
++
++  mpfr_set_emin (1);
++  mpfr_set_emax (1);
++  mpfr_clear_flags ();
++  inex = mpfr_asin (y, x, MPFR_RNDA);
++  flags = __gmpfr_flags;
++  mpfr_set_emin (emin);
++  mpfr_set_emax (emax);
++
++  mpfr_set_str (ex_y, "-0.1101e1", 2, MPFR_RNDN);
++  ex_inex = -1;
++  ex_flags = MPFR_FLAGS_INEXACT;
++
++  if (SIGN (inex) != ex_inex || flags != ex_flags ||
++      ! mpfr_equal_p (y, ex_y))
++    {
++      printf ("Error in reduced_expo_range\non x = ");
++      mpfr_dump (x);
++      printf ("Expected y = ");
++      mpfr_out_str (stdout, 2, 0, ex_y, MPFR_RNDN);
++      printf ("\n         inex = %d, flags = %u\n", ex_inex, ex_flags);
++      printf ("Got      y = ");
++      mpfr_out_str (stdout, 2, 0, y, MPFR_RNDN);
++      printf ("\n         inex = %d, flags = %u\n", SIGN (inex), flags);
++      exit (1);
++    }
++
++  mpfr_clears (x, y, ex_y, (mpfr_ptr) 0);
++}
++
+ int
+ main (void)
+ {
+@@ -226,6 +269,7 @@
+ 
+   special ();
+   special_overflow ();
++  reduced_expo_range ();
+ 
+   test_generic (2, 100, 15);
+ 
+diff -Naurd mpfr-3.0.1-a/version.c mpfr-3.0.1-b/version.c
+--- mpfr-3.0.1-a/version.c	2011-04-04 10:19:18.000000000 +0000
++++ mpfr-3.0.1-b/version.c	2011-04-12 10:50:02.000000000 +0000
+@@ -25,5 +25,5 @@
+ const char *
+ mpfr_get_version (void)
+ {
+-  return "3.0.1";
++  return "3.0.1-p1";
+ }
+diff -Naurd mpfr-3.0.1-a/PATCHES mpfr-3.0.1-b/PATCHES
+--- mpfr-3.0.1-a/PATCHES	2011-05-04 11:18:33.000000000 +0000
++++ mpfr-3.0.1-b/PATCHES	2011-05-04 11:18:33.000000000 +0000
+@@ -0,0 +1 @@
++rec_sqrt-carry
+diff -Naurd mpfr-3.0.1-a/VERSION mpfr-3.0.1-b/VERSION
+--- mpfr-3.0.1-a/VERSION	2011-04-12 10:50:02.000000000 +0000
++++ mpfr-3.0.1-b/VERSION	2011-05-04 11:18:33.000000000 +0000
+@@ -1 +1 @@
+-3.0.1-p1
++3.0.1-p2
+diff -Naurd mpfr-3.0.1-a/mpfr.h mpfr-3.0.1-b/mpfr.h
+--- mpfr-3.0.1-a/mpfr.h	2011-04-12 10:50:02.000000000 +0000
++++ mpfr-3.0.1-b/mpfr.h	2011-05-04 11:18:33.000000000 +0000
+@@ -27,7 +27,7 @@
+ #define MPFR_VERSION_MAJOR 3
+ #define MPFR_VERSION_MINOR 0
+ #define MPFR_VERSION_PATCHLEVEL 1
+-#define MPFR_VERSION_STRING "3.0.1-p1"
++#define MPFR_VERSION_STRING "3.0.1-p2"
+ 
+ /* Macros dealing with MPFR VERSION */
+ #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
+diff -Naurd mpfr-3.0.1-a/rec_sqrt.c mpfr-3.0.1-b/rec_sqrt.c
+--- mpfr-3.0.1-a/rec_sqrt.c	2011-04-04 10:19:18.000000000 +0000
++++ mpfr-3.0.1-b/rec_sqrt.c	2011-05-04 11:18:33.000000000 +0000
+@@ -375,20 +375,37 @@
+       MPFR_ASSERTD(un == ln + 1 || un == ln + 2);
+       /* the high un-ln limbs of u will overlap the low part of {x+ln,xn},
+          we need to add or subtract the overlapping part {u + ln, un - ln} */
++      /* Warning! th may be 0, in which case the mpn_add_1 and mpn_sub_1
++         below (with size = th) mustn't be used. In such a case, the limb
++         (carry) will be 0, so that this is semantically a no-op, but if
++         mpn_add_1 and mpn_sub_1 are used, GMP (currently) still does a
++         non-atomic read/write in a place that is not always allocated,
++         with the possible consequences: a crash if the corresponding
++         address is not mapped, or (rather unlikely) memory corruption
++         if another process/thread writes at the same place; things may
++         be worse with future GMP versions. Hence the tests carry != 0. */
+       if (neg == 0)
+         {
+           if (ln > 0)
+             MPN_COPY (x, u, ln);
+           cy = mpn_add (x + ln, x + ln, xn, u + ln, un - ln);
+           /* add cu at x+un */
+-          cy += mpn_add_1 (x + un, x + un, th, cu);
++          if (cu != 0)
++            {
++              MPFR_ASSERTD (th != 0);
++              cy += mpn_add_1 (x + un, x + un, th, cu);
++            }
+         }
+       else /* negative case */
+         {
+           /* subtract {u+ln, un-ln} from {x+ln,un} */
+           cy = mpn_sub (x + ln, x + ln, xn, u + ln, un - ln);
+           /* carry cy is at x+un, like cu */
+-          cy = mpn_sub_1 (x + un, x + un, th, cy + cu); /* n - un = th */
++          if (cy + cu != 0)
++            {
++              MPFR_ASSERTD (th != 0);
++              cy = mpn_sub_1 (x + un, x + un, th, cy + cu); /* n - un = th */
++            }
+           /* cy cannot be zero, since the most significant bit of Xh is 1,
+              and the correction is bounded by 2^{-h+3} */
+           MPFR_ASSERTD(cy == 0);
+diff -Naurd mpfr-3.0.1-a/version.c mpfr-3.0.1-b/version.c
+--- mpfr-3.0.1-a/version.c	2011-04-12 10:50:02.000000000 +0000
++++ mpfr-3.0.1-b/version.c	2011-05-04 11:18:33.000000000 +0000
+@@ -25,5 +25,5 @@
+ const char *
+ mpfr_get_version (void)
+ {
+-  return "3.0.1-p1";
++  return "3.0.1-p2";
+ }
+diff -Naurd mpfr-3.0.1-a/PATCHES mpfr-3.0.1-b/PATCHES
+--- mpfr-3.0.1-a/PATCHES	2011-05-05 00:00:35.000000000 +0000
++++ mpfr-3.0.1-b/PATCHES	2011-05-05 00:00:35.000000000 +0000
+@@ -0,0 +1 @@
++atan-expo-range
+diff -Naurd mpfr-3.0.1-a/VERSION mpfr-3.0.1-b/VERSION
+--- mpfr-3.0.1-a/VERSION	2011-05-04 11:18:33.000000000 +0000
++++ mpfr-3.0.1-b/VERSION	2011-05-05 00:00:35.000000000 +0000
+@@ -1 +1 @@
+-3.0.1-p2
++3.0.1-p3
+diff -Naurd mpfr-3.0.1-a/atan.c mpfr-3.0.1-b/atan.c
+--- mpfr-3.0.1-a/atan.c	2011-04-04 10:19:18.000000000 +0000
++++ mpfr-3.0.1-b/atan.c	2011-05-05 00:00:35.000000000 +0000
+@@ -431,5 +431,5 @@
+   MPFR_GROUP_CLEAR (group);
+ 
+   MPFR_SAVE_EXPO_FREE (expo);
+-  return mpfr_check_range (arctgt, inexact, rnd_mode);
++  return mpfr_check_range (atan, inexact, rnd_mode);
+ }
+diff -Naurd mpfr-3.0.1-a/mpfr.h mpfr-3.0.1-b/mpfr.h
+--- mpfr-3.0.1-a/mpfr.h	2011-05-04 11:18:33.000000000 +0000
++++ mpfr-3.0.1-b/mpfr.h	2011-05-05 00:00:35.000000000 +0000
+@@ -27,7 +27,7 @@
+ #define MPFR_VERSION_MAJOR 3
+ #define MPFR_VERSION_MINOR 0
+ #define MPFR_VERSION_PATCHLEVEL 1
+-#define MPFR_VERSION_STRING "3.0.1-p2"
++#define MPFR_VERSION_STRING "3.0.1-p3"
+ 
+ /* Macros dealing with MPFR VERSION */
+ #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
+diff -Naurd mpfr-3.0.1-a/tests/tatan.c mpfr-3.0.1-b/tests/tatan.c
+--- mpfr-3.0.1-a/tests/tatan.c	2011-04-04 10:19:17.000000000 +0000
++++ mpfr-3.0.1-b/tests/tatan.c	2011-05-05 00:00:35.000000000 +0000
+@@ -535,6 +535,52 @@
+   mpfr_clears (a, x, y, (mpfr_ptr) 0);
+ }
+ 
++/* http://websympa.loria.fr/wwsympa/arc/mpfr/2011-05/msg00008.html
++ * Incorrect flags (in debug mode on a 32-bit machine, assertion failure).
++ */
++static void
++reduced_expo_range (void)
++{
++  mpfr_exp_t emin, emax;
++  mpfr_t x, y, ex_y;
++  int inex, ex_inex;
++  unsigned int flags, ex_flags;
++
++  emin = mpfr_get_emin ();
++  emax = mpfr_get_emax ();
++
++  mpfr_inits2 (12, x, y, ex_y, (mpfr_ptr) 0);
++  mpfr_set_str (x, "0.1e-5", 2, MPFR_RNDN);
++
++  mpfr_set_emin (-5);
++  mpfr_set_emax (-5);
++  mpfr_clear_flags ();
++  inex = mpfr_atan (y, x, MPFR_RNDN);
++  flags = __gmpfr_flags;
++  mpfr_set_emin (emin);
++  mpfr_set_emax (emax);
++
++  mpfr_set_str (ex_y, "0.1e-5", 2, MPFR_RNDN);
++  ex_inex = 1;
++  ex_flags = MPFR_FLAGS_INEXACT;
++
++  if (SIGN (inex) != ex_inex || flags != ex_flags ||
++      ! mpfr_equal_p (y, ex_y))
++    {
++      printf ("Error in reduced_expo_range\non x = ");
++      mpfr_dump (x);
++      printf ("Expected y = ");
++      mpfr_out_str (stdout, 2, 0, ex_y, MPFR_RNDN);
++      printf ("\n         inex = %d, flags = %u\n", ex_inex, ex_flags);
++      printf ("Got      y = ");
++      mpfr_out_str (stdout, 2, 0, y, MPFR_RNDN);
++      printf ("\n         inex = %d, flags = %u\n", SIGN (inex), flags);
++      exit (1);
++    }
++
++  mpfr_clears (x, y, ex_y, (mpfr_ptr) 0);
++}
++
+ int
+ main (int argc, char *argv[])
+ {
+@@ -546,6 +592,7 @@
+   smallvals_atan2 ();
+   atan2_bug_20071003 ();
+   atan2_different_prec ();
++  reduced_expo_range ();
+ 
+   test_generic_atan  (2, 200, 17);
+   test_generic_atan2 (2, 200, 17);
+diff -Naurd mpfr-3.0.1-a/version.c mpfr-3.0.1-b/version.c
+--- mpfr-3.0.1-a/version.c	2011-05-04 11:18:33.000000000 +0000
++++ mpfr-3.0.1-b/version.c	2011-05-05 00:00:35.000000000 +0000
+@@ -25,5 +25,5 @@
+ const char *
+ mpfr_get_version (void)
+ {
+-  return "3.0.1-p2";
++  return "3.0.1-p3";
+ }
+diff -Naurd mpfr-3.0.1-a/PATCHES mpfr-3.0.1-b/PATCHES
+--- mpfr-3.0.1-a/PATCHES	2011-05-09 14:48:24.000000000 +0000
++++ mpfr-3.0.1-b/PATCHES	2011-05-09 14:48:24.000000000 +0000
+@@ -0,0 +1 @@
++texp-zero
+diff -Naurd mpfr-3.0.1-a/VERSION mpfr-3.0.1-b/VERSION
+--- mpfr-3.0.1-a/VERSION	2011-05-05 00:00:35.000000000 +0000
++++ mpfr-3.0.1-b/VERSION	2011-05-09 14:48:24.000000000 +0000
+@@ -1 +1 @@
+-3.0.1-p3
++3.0.1-p4
+diff -Naurd mpfr-3.0.1-a/mpfr.h mpfr-3.0.1-b/mpfr.h
+--- mpfr-3.0.1-a/mpfr.h	2011-05-05 00:00:35.000000000 +0000
++++ mpfr-3.0.1-b/mpfr.h	2011-05-09 14:48:24.000000000 +0000
+@@ -27,7 +27,7 @@
+ #define MPFR_VERSION_MAJOR 3
+ #define MPFR_VERSION_MINOR 0
+ #define MPFR_VERSION_PATCHLEVEL 1
+-#define MPFR_VERSION_STRING "3.0.1-p3"
++#define MPFR_VERSION_STRING "3.0.1-p4"
+ 
+ /* Macros dealing with MPFR VERSION */
+ #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
+diff -Naurd mpfr-3.0.1-a/tests/texp.c mpfr-3.0.1-b/tests/texp.c
+--- mpfr-3.0.1-a/tests/texp.c	2011-04-04 10:19:17.000000000 +0000
++++ mpfr-3.0.1-b/tests/texp.c	2011-05-09 14:48:24.000000000 +0000
+@@ -170,7 +170,9 @@
+       mpfr_set_prec (x, prec);
+       mpfr_set_prec (y, prec);
+       mpfr_set_prec (z, prec);
+-      mpfr_urandomb (x, RANDS);
++      do
++        mpfr_urandomb (x, RANDS);
++      while (MPFR_IS_ZERO (x));  /* 0 is handled by mpfr_exp only */
+       rnd = RND_RAND ();
+       mpfr_exp_2 (y, x, rnd);
+       mpfr_exp_3 (z, x, rnd);
+diff -Naurd mpfr-3.0.1-a/version.c mpfr-3.0.1-b/version.c
+--- mpfr-3.0.1-a/version.c	2011-05-05 00:00:35.000000000 +0000
++++ mpfr-3.0.1-b/version.c	2011-05-09 14:48:24.000000000 +0000
+@@ -25,5 +25,5 @@
+ const char *
+ mpfr_get_version (void)
+ {
+-  return "3.0.1-p3";
++  return "3.0.1-p4";
+ }
diff --git a/testing/mpfr/mpfr.install b/testing/mpfr/mpfr.install
new file mode 100644
index 000000000..d6dd0475b
--- /dev/null
+++ b/testing/mpfr/mpfr.install
@@ -0,0 +1,20 @@
+info_dir=usr/share/info
+info_files=(mpfr.info)
+
+post_install() {
+  [ -x usr/bin/install-info ] || return 0
+  for f in ${info_files[@]}; do
+    install-info ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null
+  done
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+  [ -x usr/bin/install-info ] || return 0
+  for f in ${info_files[@]}; do
+    install-info --delete ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null
+  done
+}
author	root <root@rshg047.dnsready.net>	2011-06-26 23:06:14 +0000
committer	root <root@rshg047.dnsready.net>	2011-06-26 23:06:14 +0000
commit	715631caf52784c47c8ed3aeb6cbdba2715a08db (patch)
tree	d1923d66cba8dcf90112f81ca31009202cff25a3
parent	8999fa1750304fb2367fb7743e49e013405e88be (diff)