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

Conflicts:
	community/pbzip2/PKGBUILD
	extra/audacious/PKGBUILD
	extra/stardict/PKGBUILD

26 files changed, 307 insertions, 80 deletions

diff --git a/community/chmsee/PKGBUILD b/community/chmsee/PKGBUILD
index aeb5968f6..d5809b91e 100644
--- a/community/chmsee/PKGBUILD
+++ b/community/chmsee/PKGBUILD
@@ -4,29 +4,43 @@
 # Contributor: Ermanno <erm67@yahoo.it>
 
 pkgname=chmsee
-pkgver=1.3.1.1
-pkgrel=1
+pkgver=1.99.03
+pkgrel=2
 arch=('i686' 'x86_64')
 pkgdesc="A chm (MS HTML help file format) viewer based on xulrunner."
 url="http://chmsee.googlecode.com/"
 license="GPL"
-depends=('xulrunner>=2.0' 'libglade' 'chmlib')
-makedepends=('intltool' 'cmake')
-source=(http://chmsee.googlecode.com/files/$pkgname-$pkgver.tar.gz)
-md5sums=('7c226e6f518284a040ad3b9433d5e218')
+depends=('xulrunner>=5.0' 'chmlib' 'desktop-file-utils')
+makedepends=()
+source=(chmsee-$pkgver.tar.gz::https://github.com/jungleji/chmsee/tarball/v$pkgver
+        chmsee)
+install=chmsee.install
+md5sums=('d72625e82222497237efeb228fb53816'
+         '4999362b0c89c24764cbd25173610a38')
 
 build() {
-  cd ${srcdir}/$pkgname-$pkgver
+  cd ${srcdir}/jungleji-chmsee-e06453b/src
 
-  mkdir build
-  cd build
+  cp Makefile.arch Makefile
+  sed -i -e 's/2.0/5.0/g' Makefile
 
-  cmake -DCMAKE_INSTALL_PREFIX=/usr ..
   make
 }
 
 package() {
-  cd ${srcdir}/$pkgname-$pkgver/build
+  cd ${srcdir}/jungleji-chmsee-e06453b
 
-  make DESTDIR="$pkgdir" install
+  install -d ${pkgdir}/usr/share/chmsee
+  cp -a * ${pkgdir}/usr/share/chmsee 
+  rm -r ${pkgdir}/usr/share/chmsee/src
+  install -Dm644 data/chmsee.desktop.in \
+    ${pkgdir}/usr/share/applications/chmsee.desktop
+  # Fix FS#25152
+  sed -i -e 's/_//g' ${pkgdir}/usr/share/applications/chmsee.desktop
+  #
+  install -d ${pkgdir}/usr/share/pixmaps
+  install -Dm644 data/chmsee-icon.png ${pkgdir}/usr/share/pixmaps
+  install -Dm755 ${srcdir}/chmsee ${pkgdir}/usr/bin/chmsee
+#  install -d ${pkgdir}/usr/share/icons
+#  cp -a data/icons/* ${pkgdir}/usr/share/icons/
 }
diff --git a/community/chmsee/chmsee b/community/chmsee/chmsee
new file mode 100644
index 000000000..0e7a79096
--- /dev/null
+++ b/community/chmsee/chmsee
@@ -0,0 +1,4 @@
+#!/bin/sh
+cd /usr/share/chmsee/
+xulrunner application.ini $@
+cd -
diff --git a/community/chmsee/chmsee.install b/community/chmsee/chmsee.install
new file mode 100644
index 000000000..308f27d33
--- /dev/null
+++ b/community/chmsee/chmsee.install
@@ -0,0 +1,11 @@
+post_install() {
+  update-desktop-database -q
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+post_remove() {
+  update-desktop-database -q 
+}
diff --git a/community/dictd/PKGBUILD b/community/dictd/PKGBUILD
index 52a509541..67cbef8ce 100644
--- a/community/dictd/PKGBUILD
+++ b/community/dictd/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 41057 2011-03-03 15:30:07Z spupykin $
+# $Id: PKGBUILD 51953 2011-07-18 13:18:14Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: SmackleFunky <smacklefunky@optusnet.com.au>
 # Contributor: Enrico Morelli <morelli@cerm.unifi.it>
 
 pkgname=dictd
 pkgver=1.12.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Online dictionary client and server"
 url="http://sourceforge.net/projects/dict/"
 license=("GPL")
@@ -16,26 +16,33 @@ backup=(etc/dict/dictd.conf
 	etc/dict/dict.conf
 	etc/dict/site.info
 	etc/conf.d/dictd
-	etc/xinetd.d/dictd)
+	etc/xinetd.d/dictd
+	etc/dict/colorit.conf)
 source=(http://downloads.sourceforge.net/project/dict/dictd/dictd-$pkgver/dictd-$pkgver.tar.gz
 	dictd
 	dict.conf
 	dictd.conf
 	dictd.confd
 	site.info
-	dictd.xinetd)
+	dictd.xinetd
+	colorit.conf)
 md5sums=('71aaf3a697ea2e9409643f11ea85b53a'
          '6542df4fc585773fc03f1a088730126b'
          'fb72f7d8c55f84b1b37bbc8d33a8e55a'
          '64cd6ffdb40fb3367224f91ac44926ac'
          '838887fee38ae4cebd652d399b1f2266'
          'b8cabf913876e544d919c7f20ff8db9e'
-         'b7dbc9529df13ff895dae2b4abd080d6')
+         'b7dbc9529df13ff895dae2b4abd080d6'
+         '978c9c079a0fc8d7d42a4cd4000190e7')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
   ./configure --enable-dictorg --prefix=/usr --sysconfdir=/etc/dict
   make
+}
+
+package() {
+  cd $srcdir/$pkgname-$pkgver
   make DESTDIR=$pkgdir install
   install -D -m 0755 $srcdir/dictd $pkgdir/etc/rc.d/dictd
   install -D -m 0644 $srcdir/dictd.xinetd $pkgdir/etc/xinetd.d/dictd
@@ -43,4 +50,5 @@ build() {
   install -D -m 0644 $srcdir/dict.conf $pkgdir/etc/dict/dict.conf
   install -D -m 0644 $srcdir/site.info $pkgdir/etc/dict/site.info
   install -D -m 0644 $srcdir/dictd.confd $pkgdir/etc/conf.d/dictd
+  install -D -m 0644 $srcdir/colorit.conf $pkgdir/etc/dict/colorit.conf
 }
diff --git a/community/dictd/colorit.conf b/community/dictd/colorit.conf
new file mode 100644
index 000000000..8355dae15
--- /dev/null
+++ b/community/dictd/colorit.conf
@@ -0,0 +1,32 @@
+dnl /etc/dictd/colorit.conf   vim:ft=m4
+dnl
+dnl Sample configuration file for colorit(1) program
+dnl
+divert(-1)
+dnl
+dnl Define some useful color variables
+dnl
+define(`black',   `0')
+define(`red',     `1')
+define(`green',   `2')
+define(`brown',   `3')
+define(`blue',    `4')
+define(`magenta', `5')
+define(`cyan',    `6')
+define(`white',   `7')
+dnl
+dnl Mark macro arguments: regexp foreground-color [background-color]
+dnl
+define(`mark', ``mark "$1"''  `ifelse(`$#', `3', ``"\033[3$2;4$3m"'', ``"\033[3$2m"'')' `"\033[m"')
+dnl
+divert
+mark(`^From.*$',red,cyan)
+mark(`^  [^ ]+',green)
+mark(`^ *Note:',red)
+mark(`{[^{]+}',green)
+mark(`^ *\[[^\[]+\]', cyan)
+mark(`^[    ]*(adj|n|v|adv)? *[0-9]+[\.:]',cyan)
+mark(`^ *\([a-z]+\)',cyan)
+mark(`(Syn|Ant|syn|ant):', blue, white)
+mark(` (t|i|a|adj|adv|n|v)\. ',cyan)
+mark(` (t|i|a|adj|adv|n|v)\.$',cyan)
diff --git a/community/expac/PKGBUILD b/community/expac/PKGBUILD
index c442b2204..325f89f12 100644
--- a/community/expac/PKGBUILD
+++ b/community/expac/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 44424 2011-04-07 13:07:03Z dreisner $
+# $Id: PKGBUILD 51880 2011-07-17 19:50:14Z dreisner $
 # Maintainer: Dave Reisner <d@falconindy.com>
 
 pkgname=expac
-pkgver=0.04
+pkgver=0.05
 pkgrel=1
 pkgdesc="pacman database extraction utility"
 arch=('i686' 'x86_64' 'mips64el')
@@ -11,7 +11,7 @@ license=('GPL')
 depends=('pacman')
 makedepends=('perl')
 source=("https://github.com/downloads/falconindy/$pkgname/$pkgname-$pkgver.tar.gz")
-md5sums=('a5a766f27d8147bf53cbc6cfd7d9e5c9')
+md5sums=('366d741b21d1029c63a5e977d3fc08db')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/freevo/PKGBUILD b/community/freevo/PKGBUILD
index 6ca2dc88e..00530e5e4 100644
--- a/community/freevo/PKGBUILD
+++ b/community/freevo/PKGBUILD
@@ -1,26 +1,26 @@
-# $Id: PKGBUILD 27382 2010-09-22 14:12:22Z rvanharen $
+# $Id: PKGBUILD 51736 2011-07-13 19:46:02Z rvanharen $
 # Maintainer: Ronald van Haren  <ronald.archlinux.org>
 
 pkgname=freevo
 pkgver=1.9.0
-pkgrel=5
+pkgrel=6
 pkgdesc="Freevo is an open-source home theatre PC platform based on Linux and a number of open-source audio/video tools."
 url="http://freevo.sourceforge.net/"
 license=('GPL2')
 arch=('i686' 'x86_64' 'mips64el')
 depends=('lame' 'flac' 'faad2' 'cdparanoia' 'vorbis-tools' \
 	 'fbset' 'smpeg' 'pil' 'python-pysqlite-legacy' \
-	 'pyxml' 'lsdvd'  'twisted' 'python-numpy' 'python-pygame'\
-	 'kaa-metadata' 'kaa-imlib2' 'beautiful-soup' 'python-html5lib')
+	 'pyxml' 'lsdvd'  'twisted' 'python2-numpy' 'python-pygame'\
+	 'kaa-metadata' 'kaa-imlib2' 'python-beautifulsoup' 'python-html5lib')
 optdepends=('mplayer: most features' 'xine-lib: can be used instead of mplayer' 'tvtime: watching tv' 'xmltv: parsing online tv guides')
 install=freevo.install
 options=('docs')
 source=(http://downloads.sourceforge.net/freevo/$pkgname-$pkgver.tar.gz \
 	freevo.desktop
 	imdb-html5lib.patch)
-md5sums=('aeb05e52f996258386af2951688bf6e3'
-         '9c5fcea7149bf52978730229831d1a40'
-	 'b11f82049f112f9964a29d37a461fee5')
+sha1sums=('0533a2d4ff8a7b09b3b233fdf303ff56bda22d16'
+          '5f6e76dc58496f072aca29257c24be5ffa9c6c7d'
+          '57e1099527603500c594fbffa2cb7233b636eed1')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
diff --git a/community/frei0r-plugins/PKGBUILD b/community/frei0r-plugins/PKGBUILD
index da05cb921..0abb74191 100644
--- a/community/frei0r-plugins/PKGBUILD
+++ b/community/frei0r-plugins/PKGBUILD
@@ -1,15 +1,16 @@
-# $Id: PKGBUILD 42041 2011-03-12 11:30:34Z spupykin $
+# $Id: PKGBUILD 51938 2011-07-18 09:49:20Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=frei0r-plugins
 pkgver=1.3
-pkgrel=1
+pkgrel=2
 pkgdesc="frei0r is a minimalistic plugin API for video sources and filters."
 arch=(i686 x86_64 'mips64el')
 url="http://www.piksel.org/frei0r"
 license=('GPL')
 depends=('gcc-libs' 'gavl>=1.0.0' 'opencv')
 makedepends=('graphviz')
+options=('!emptydirs')
 source=(http://ftp.dyne.org/frei0r/releases/frei0r-plugins-$pkgver.tar.gz)
 md5sums=('a2eb63feeeb0c5cf439ccca276cbf70c')
 
@@ -17,11 +18,13 @@ build() {
   cd "$srcdir/frei0r-$pkgver"
   ./configure --prefix=/usr --docdir=/usr/share/doc
   make
+}
+
+package() {
+  cd "$srcdir/frei0r-$pkgver"
   make DESTDIR="$pkgdir" install \
 	htmldocsdir=$pkgdir/usr/share/doc/frei0r-plugins-$pkgver \
 	docsdir=$pkgdir/usr/share/doc/frei0r-plugins-$pkgver
-
   mkdir -p $pkgdir/usr/share/doc/frei0r-plugins-$pkgver/
   mv $pkgdir/$pkgdir/usr/share/doc/frei0r-plugins-$pkgver/* $pkgdir/usr/share/doc/frei0r-plugins-$pkgver/
-  rm -rf $pkgdir/home
 }
diff --git a/community/gnome-do/PKGBUILD b/community/gnome-do/PKGBUILD
index f619fca17..45fa60629 100644
--- a/community/gnome-do/PKGBUILD
+++ b/community/gnome-do/PKGBUILD
@@ -1,28 +1,28 @@
-# $Id: PKGBUILD 16886 2010-05-12 16:41:03Z ibiru $
+# $Id: PKGBUILD 51990 2011-07-18 20:45:07Z spupykin $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Contributor: Doehni <dohny@gmx.de>
 
 pkgname=gnome-do
-pkgver=0.8.3.1
-_pkgver=0.8.3
-pkgrel=2
+pkgver=0.8.5
+pkgrel=1
 pkgdesc="A launcher application for gnome (like Launchy or Katapult)"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://do.davebsd.com/"
 license=('GPL3')
-depends=('ndesk-dbus-glib' 'gnome-desktop-sharp' 'mono-addins' 'gtk2'
-         'gnome-keyring-sharp' 'notify-sharp-svn' 'xdg-utils' 'desktop-file-utils')
+depends=('ndesk-dbus-glib' 'gnome-desktop-sharp' 'mono-addins' 'gtk2' 'gnome-vfs-sharp'
+	 'gnome-keyring-sharp' 'notify-sharp-svn' 'xdg-utils' 'desktop-file-utils'
+	 'gconf-sharp' 'libgnome-sharp')
 makedepends=('intltool' 'ca-certificates')
 options=('!libtool')
 install=$pkgname.install
-source=(http://code.edge.launchpad.net/do/0.8/${_pkgver}/+download/${pkgname}-${pkgver}.tar.gz)
+source=("http://edge.launchpad.net/do/trunk/$pkgver/+download/gnome-do-$pkgver.tar.gz")
+md5sums=('71e0e653021f895f151a6f46a97f75ba')
 
 build() {
   export MONO_SHARED_DIR="${srcdir}/.wabi"
   mkdir -p "${MONO_SHARED_DIR}"
   cd "${srcdir}/${pkgname}-$pkgver"
   ./configure --prefix=/usr --sysconfdir=/etc
-  make || return 1
-  make DESTDIR="$pkgdir" install || return 1
+  make
+  make DESTDIR="$pkgdir" install
 }
-md5sums=('6b4e2b55241892d165b504b1fb98645e')
diff --git a/community/gnome-do/gnome-do.install b/community/gnome-do/gnome-do.install
index b82a99ad7..b69cc3275 100644
--- a/community/gnome-do/gnome-do.install
+++ b/community/gnome-do/gnome-do.install
@@ -1,7 +1,7 @@
 post_install() {
   update-desktop-database -q
   gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-  
+
   echo "==> To use docky, make sure your compoisiting manager is"
   echo "==> running before launching gnome-do."
 }
diff --git a/community/jansson/PKGBUILD b/community/jansson/PKGBUILD
index f93779824..0d4060211 100644
--- a/community/jansson/PKGBUILD
+++ b/community/jansson/PKGBUILD
@@ -2,15 +2,15 @@
 # Contributor: Dave Reisner <d@falconindy.com>
 
 pkgname=jansson
-pkgver=2.0.1
-pkgrel=2
+pkgver=2.1
+pkgrel=1
 pkgdesc='C library for encoding, decoding and manipulating JSON data'
 arch=('i686' 'x86_64')
 url='http://www.digip.org/jansson/'
 license=('MIT')
 options=('!libtool')
 source=("$url/releases/$pkgname-$pkgver.tar.bz2")
-md5sums=('1fcf45810adcb36eb77eea636091a61e')
+md5sums=('a7830e5b104fe6d95643516a625436f9')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/kdenlive/PKGBUILD b/community/kdenlive/PKGBUILD
index 465cbbb95..8b7a0cbb7 100644
--- a/community/kdenlive/PKGBUILD
+++ b/community/kdenlive/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 49851 2011-06-21 11:51:31Z spupykin $
+# $Id: PKGBUILD 51890 2011-07-17 20:51:02Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Zuf <kontakt.zuf@gmail.com>
 # Contributor: Darwin Bautista <djclue917@gmail.com>
 
 pkgname=kdenlive
 pkgver=0.8
-pkgrel=2
+pkgrel=3
 pkgdesc="A non-linear video editor for Linux"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.kdenlive.org/"
diff --git a/community/libharu/PKGBUILD b/community/libharu/PKGBUILD
new file mode 100644
index 000000000..160373489
--- /dev/null
+++ b/community/libharu/PKGBUILD
@@ -0,0 +1,31 @@
+# $Id: PKGBUILD 51967 2011-07-18 20:03:48Z spupykin $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Maintainer : SpepS <dreamspepser at yahoo dot it>
+# Contributor: Auguste <auguste@gmail.com>
+# Contributor: Jose Negron <josenj.arch@mailnull.com>
+
+pkgname=libharu
+pkgver=2.2.1
+pkgrel=1
+pkgdesc="C/C++ library for generating PDF documents"
+url="http://libharu.org/wiki/Main_Page"
+arch=('i686' 'x86_64')
+license=('custom:ZLIB')
+depends=('libpng' 'gcc-libs')
+options=(!libtool)
+source=("http://libharu.org/files/$pkgname-$pkgver.tar.gz")
+md5sums=('63da8e087744f1d6cf16f9501b1cb766')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir/" install
+  # license
+  install -d "$pkgdir/usr/share/licenses/$pkgname"
+  sed -n '102,120p' README > "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}
diff --git a/community/mlt/PKGBUILD b/community/mlt/PKGBUILD
index f710731ae..eab793997 100644
--- a/community/mlt/PKGBUILD
+++ b/community/mlt/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 50803 2011-07-01 12:47:31Z spupykin $
+# $Id: PKGBUILD 51875 2011-07-17 19:10:00Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Fabian Schoelzel <myfirstname.mylastname@googlemail.com>
 # Contributor: funkyou <spamopfer@nickname.berlin.de>
@@ -7,7 +7,7 @@
 
 pkgbase=mlt
 pkgname=('mlt' 'mlt-python-bindings')
-pkgver=0.7.2
+pkgver=0.7.4
 pkgrel=1.1
 pkgdesc="An open source multimedia framework"
 arch=('i686' 'x86_64' 'mips64el')
@@ -16,7 +16,7 @@ license=('GPL')
 makedepends=('sdl_image' 'libsamplerate' 'libdv' 'qt' 'sox' 'libxml2' 'gtk2' 'ffmpeg'
 	     'frei0r-plugins' 'swig' 'python2' "jack" "ladspa")
 source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz)
-md5sums=('3adeace6642a5ee0db0715b6bd7b7a52')
+md5sums=('d5d1ff686f51131a02b0f6fca0f073da')
 
 build() {
   # mlt
diff --git a/community/mypaint/PKGBUILD b/community/mypaint/PKGBUILD
index fa2ace03d..9b38e0a35 100644
--- a/community/mypaint/PKGBUILD
+++ b/community/mypaint/PKGBUILD
@@ -1,30 +1,32 @@
-# $Id: PKGBUILD 47074 2011-05-16 14:01:24Z spupykin $
+# $Id: PKGBUILD 51725 2011-07-13 14:26:16Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Jon Nordby <jononor@gmail.com>
 
 pkgname=mypaint
 pkgver=0.9.1
-pkgrel=2
+pkgrel=3
 pkgdesc="A fast and easy painting application for digital painters, with brush dynamics"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://mypaint.intilinux.com/"
 license=('GPL' 'LGPL')
-depends=('pygtk' 'python-numpy' 'protobuf-python' 'python2')
+depends=('pygtk' 'python2-numpy' 'protobuf-python' 'python2')
 makedepends=('scons>=0.97' 'swig>=1.3.39')
 install=mypaint.install
 source=(http://download.gna.org/$pkgname/$pkgname-$pkgver.tar.bz2)
 md5sums=('6249a16359a438d6dc658f5765b35515')
 
 build() {
-  cd $pkgname-$pkgver
-
+  cd $srcdir/$pkgname-$pkgver
   # python2 fix
   sed -i 's_python generate.py_python2 generate.py_' brushlib/SConscript
   for file in $(find . -name '*.py' -print); do
     sed -i 's_^#!.*/usr/bin/python_#!/usr/bin/python2_' $file
     sed -i 's_^#!.*/usr/bin/env.*python_#!/usr/bin/env python2_' $file
   done
-
   scons
+}
+
+package() {
+  cd $srcdir/$pkgname-$pkgver
   scons prefix="$pkgdir"/usr install
 }
diff --git a/community/mysql++/PKGBUILD b/community/mysql++/PKGBUILD
new file mode 100644
index 000000000..2b7a4ac14
--- /dev/null
+++ b/community/mysql++/PKGBUILD
@@ -0,0 +1,41 @@
+# $Id: PKGBUILD 51970 2011-07-18 20:04:38Z spupykin $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Contributor: Markus Härer <markus.haerer@gmx.net>
+
+pkgname=mysql++
+pkgver=3.1.0
+pkgrel=2
+pkgdesc="A C++ wraper for MySQLs C API"
+arch=("i686" "x86_64")
+url="http://tangentsoft.net/mysql++/"
+license=("LGPL" "custom")
+depends=("libmysqlclient")
+options=('docs')
+source=("http://tangentsoft.net/mysql++/releases/$pkgname-$pkgver.tar.gz"
+	"mysql++-fix-cstring.patch"
+	"mysql++-fix-size_t.patch")
+md5sums=('d92769cc579b87a60e58a77099cc4f0e'
+         '72f85a1bdba9d5285f0baf1d973033f8'
+         '6dcfbf06072b81cf27530ca9a0df8a8e')
+
+build() {
+  unset LDFLAGS
+  cd "$srcdir/$pkgname-$pkgver/"
+  patch -p1 <$srcdir/mysql++-fix-cstring.patch
+  patch -p1 <$srcdir/mysql++-fix-size_t.patch
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver/"
+  make DESTDIR="$pkgdir" install
+
+  #install docs
+  mkdir -p $pkgdir/usr/share/doc/mysql++
+  cp -r doc/html $pkgdir/usr/share/doc/mysql++
+  cp -r doc/pdf $pkgdir/usr/share/doc/mysql++
+
+  #install doc licence
+  install -Dm0644 doc/userman/LICENSE.txt $pkgdir/usr/share/licenses/mysql++/LICENSE
+}
diff --git a/community/mysql++/mysql++-fix-cstring.patch b/community/mysql++/mysql++-fix-cstring.patch
new file mode 100644
index 000000000..2a9faeb07
--- /dev/null
+++ b/community/mysql++/mysql++-fix-cstring.patch
@@ -0,0 +1,11 @@
+diff -Naur mysql++-3.1.0.old/ssx/genv2.cpp mysql++-3.1.0/ssx/genv2.cpp
+--- mysql++-3.1.0.old/ssx/genv2.cpp	2010-06-12 11:12:11.574891331 +0200
++++ mysql++-3.1.0/ssx/genv2.cpp	2010-06-12 11:14:00.564881723 +0200
+@@ -35,6 +35,7 @@
+ #include <iostream>
+ #include <fstream>
+ #include <typeinfo>
++#include <cstring>
+ 
+ using namespace std;
+ 
diff --git a/community/mysql++/mysql++-fix-size_t.patch b/community/mysql++/mysql++-fix-size_t.patch
new file mode 100644
index 000000000..908141d5d
--- /dev/null
+++ b/community/mysql++/mysql++-fix-size_t.patch
@@ -0,0 +1,21 @@
+diff -Naur mysql++-3.1.0.old//lib/refcounted.h mysql++-3.1.0/lib/refcounted.h
+--- mysql++-3.1.0.old//lib/refcounted.h	2010-06-03 19:59:23.000000000 +0200
++++ mysql++-3.1.0/lib/refcounted.h	2011-04-23 12:35:39.943366970 +0200
+@@ -101,7 +101,7 @@
+ 	{
+ 		std::auto_ptr<T> exception_guard(counted_);
+ 		if (counted_) {
+-			refs_ = new size_t(1);
++			refs_ = new std::size_t(1);
+ 		}
+ 		exception_guard.release();	// previous new didn't throw
+ 	}
+@@ -255,7 +255,7 @@
+ 	/// We can't keep this as a plain integer because this object
+ 	/// allows itself to be copied.  All copies need to share this
+ 	/// reference count, not just the pointer to the counted object.
+-	size_t* refs_;
++	std::size_t* refs_;
+ };
+ 
+ 
diff --git a/community/pbzip2/PKGBUILD b/community/pbzip2/PKGBUILD
index d9b8ef890..6c2253b68 100644
--- a/community/pbzip2/PKGBUILD
+++ b/community/pbzip2/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 45756 2011-04-28 15:32:42Z foutrelis $
+# $Id: PKGBUILD 51901 2011-07-17 21:41:16Z foutrelis $
 # Contributor: Vasco Costa <vasco dot costa at geekslot dot com>
 # Maintainer: Evangelos Foutras <foutrelis@gmail.com>
 
 pkgname=pbzip2
-pkgver=1.1.4
+pkgver=1.1.5
 pkgrel=1
 pkgdesc="Parallel implementation of the bzip2 block-sorting file compressor"
 arch=(i686 x86_64 'mips64el')
@@ -11,7 +11,7 @@ url="http://compression.ca/pbzip2/"
 license=('BSD')
 depends=('bzip2' 'gcc-libs')
 source=(http://compression.ca/$pkgname/$pkgname-$pkgver.tar.gz)
-md5sums=('797e3ae5c6293a55e3e97fefb11cf494')
+md5sums=('62f529d3ef17d775b9e1745f7a458018')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/picard/PKGBUILD b/community/picard/PKGBUILD
index e08a21f03..9f47399bd 100644
--- a/community/picard/PKGBUILD
+++ b/community/picard/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 50174 2011-06-25 20:20:09Z bisson $
+# $Id: PKGBUILD 51943 2011-07-18 12:42:54Z bisson $
 # Maintainer: Mateusz Herych <heniekk@gmail.com>
 # Contributor: sysrq
 
 pkgname=picard
-pkgver=0.14
+pkgver=0.15
 pkgrel=1
 pkgdesc='Official MusicBrainz tagger'
 url='http://musicbrainz.org/doc/MusicBrainz_Picard'
@@ -12,7 +12,7 @@ arch=('i686' 'x86_64' 'mips64el')
 depends=('python2-qt' 'mutagen' 'libofa' 'ffmpeg')
 optdepends=('libdiscid: CD-Lookup feature')
 source=("http://ftp.musicbrainz.org/pub/musicbrainz/${pkgname}/${pkgname}-${pkgver}.tar.gz")
-md5sums=('bbc6aee61e779153b77e381e8cd2ba08')
+md5sums=('0e8d8afa6f9e493d494a3e9c746834e0')
 
 install=install
 
diff --git a/community/python-scipy/PKGBUILD b/community/python-scipy/PKGBUILD
index f726054ca..44959e811 100755
--- a/community/python-scipy/PKGBUILD
+++ b/community/python-scipy/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 45545 2011-04-24 06:08:32Z schiv $
+# $Id: PKGBUILD 51728 2011-07-13 14:46:12Z tdziedzic $
 # Maintainer: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve>
 # Maintainer: Ray Rashif <schiv@archlinux.org>
 # Contributor: Douglas Soares de Andrade <dsa@aur.archlinux.org>
@@ -10,20 +10,18 @@ _app=scipy
 pkgname=('python-scipy' 'python2-scipy')
 pkgver=0.9.0
 _theapp=$_app-$pkgver
-pkgrel=1
+pkgrel=2
 pkgdesc="SciPy is open-source software for mathematics, science, and engineering."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.scipy.org/"
 license=('BSD')
-depends=('python3-numpy')
+depends=('python-numpy')
 makedepends=('gcc-fortran' 'python2-numpy')
 changelog=$pkgbase.changelog
 source=("http://downloads.sourceforge.net/$_app/$_theapp.tar.gz")
 md5sums=('ebfef6e8e82d15c875a4ee6a46d4e1cd')
 
 build() {
-  cd "$srcdir"
-
   unset LDFLAGS
   unset FFLAGS
 
diff --git a/community/python-scipy/python-scipy.changelog b/community/python-scipy/python-scipy.changelog
index 77c6d43a5..76a3e7f35 100644
--- a/community/python-scipy/python-scipy.changelog
+++ b/community/python-scipy/python-scipy.changelog
@@ -1,3 +1,8 @@
+2011-07-13 Thomas Dziedzic < gostrc at gmail >
+	* 0.9.0-2:
+	rebuild for python3-numpy to python-numpy rename
+	also, minor PKGBUILD cleanup
+
 2011-04-24 Ray Rashif <schiv@archlinux.org>
 
 	* 0.9.0-1:
diff --git a/community/sakura/PKGBUILD b/community/sakura/PKGBUILD
index f1deb5e7e..e9bb21b92 100644
--- a/community/sakura/PKGBUILD
+++ b/community/sakura/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 40517 2011-02-25 08:55:44Z rvanharen $
+# $Id: PKGBUILD 51984 2011-07-18 20:42:27Z rvanharen $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Dmitry N. Shilov <stormblast@land.ru>
 
 pkgname=sakura
-pkgver=2.4.0
+pkgver=2.4.1
 pkgrel=1
 pkgdesc="A terminal emulator based on GTK and VTE"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ depends=('vte' 'libxft' 'desktop-file-utils')
 makedepends=('cmake')
 source=(http://pleyades.net/david/projects/$pkgname/$pkgname-$pkgver.tar.bz2)
 install=sakura.install
-sha1sums=('417508be2551ff82e6bad8868832ef634479a432')
+sha1sums=('43858ba79574b4e9413aefd19131dc21c9c1f575')
 
 build() {
   cd $srcdir/${pkgname}-${pkgver}
diff --git a/community/uzbl/PKGBUILD b/community/uzbl/PKGBUILD
index 42cfc5ea3..c3e4c667d 100644
--- a/community/uzbl/PKGBUILD
+++ b/community/uzbl/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 49179 2011-06-12 21:24:14Z jelle $
+# $Id: PKGBUILD 51925 2011-07-18 08:18:29Z lcarlier $
 # Maintainer : Laurent Carlier <lordheavym@gmail.com>
 # Contributor: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Dieter Plaetinck <dieter@plaetinck.be>
 
 pkgbase=uzbl
 pkgname=('uzbl-core' 'uzbl-browser' 'uzbl-tabbed')
-pkgver=2011.04.12
-pkgrel=3
+pkgver=2011.07.17
+pkgrel=1
 arch=('i686' 'x86_64')
 url="http://www.uzbl.org"
 license=('GPL3')
 makedepends=('git' 'pkgconfig' 'libwebkit>=1.3.13')
-source=(uzbl-$pkgver.tar.gz::http://github.com/Dieterbe/uzbl/tarball/$pkgver)
-md5sums=('27e82c838b8136dafb0683fa52ffc701')
+source=(uzbl-$pkgver.tar.gz::https://github.com/Dieterbe/uzbl/tarball/$pkgver)
+md5sums=('c4f441d25c1edf7dddc5b8ce40994e64')
 
 build() {
     cd "$srcdir"/Dieterbe-uzbl-*
@@ -50,6 +50,7 @@ package_uzbl-browser() {
    cd "$srcdir"/Dieterbe-uzbl-*
 
    make DESTDIR="$pkgdir" PREFIX=/usr  install-uzbl-browser
+   rm -r $pkgdir/usr/bin/uzbl-core $pkgdir/usr/share/uzbl/docs
 }
 
 package_uzbl-tabbed() {
diff --git a/community/workrave/PKGBUILD b/community/workrave/PKGBUILD
index 7cbc54dd4..9e428da02 100644
--- a/community/workrave/PKGBUILD
+++ b/community/workrave/PKGBUILD
@@ -1,17 +1,16 @@
-# $Id: PKGBUILD 44736 2011-04-11 12:32:49Z spupykin $
+# $Id: PKGBUILD 51933 2011-07-18 09:09:27Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: William Rea <sillywilly@gmail.com>
 
 pkgname=workrave
 pkgver=1.9.4
-pkgrel=1
+pkgrel=2
 pkgdesc="a tool to help RSI"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
 url="http://workrave.org"
-depends=('libgnomeuimm' 'gnet' 'gnome-panel' 'dbus' 'libxmu' 'gdome2' 'python-cheetah' 'libsigc++'
-	 'libxtst' 'python-cheetah')
-makedepends=('intltool')
+depends=('libxtst' 'gtkmm' 'gconf' 'gdome2' 'gstreamer0.10' 'libsm' 'libice')
+makedepends=('intltool' 'python-cheetah')
 source=(http://downloads.sourceforge.net/workrave/workrave-$pkgver.tar.gz)
 md5sums=('d5eaf399b38b063053cff1a8527cba8e')
 
@@ -21,5 +20,9 @@ build() {
   ./configure --prefix=/usr --enable-dbus --sysconfdir=/etc --libexecdir=/usr/lib/workrave \
 	--disable-pulse
   make
+}
+
+package() {
+  cd $srcdir/workrave-$pkgver
   make DESTDIR=$pkgdir install
 }
diff --git a/community/wt/PKGBUILD b/community/wt/PKGBUILD
new file mode 100644
index 000000000..a97a41844
--- /dev/null
+++ b/community/wt/PKGBUILD
@@ -0,0 +1,42 @@
+# $Id: PKGBUILD 51980 2011-07-18 20:26:38Z spupykin $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Contributor: Denis Martinez <deuns.martinez@gmail.com>
+
+pkgname=wt
+pkgver=3.1.10
+pkgrel=2
+pkgdesc="a C++ library and application server for developing and deploying web applications"
+arch=('i686' 'x86_64')
+url="http://www.webtoolkit.eu/"
+license=('GPL')
+depends=('boost-libs>=1.36')
+makedepends=('boost>=1.36' 'cmake>=2.8'
+	     'postgresql-libs' 'zlib' 'fcgi' 'sqlite3' 'libharu' 'graphicsmagick' 'pango' 'mysql++' 'qt')
+optdepends=('openssl: for SSL support in built-in webserver'
+            'zlib: for compression in HTTP protocol'
+            'fcgi: for FastCGI support'
+            'postgresql-libs: for PostgreSQL Dbo support'
+            'sqlite3: for Sqlite3 Dbo support'
+            'libharu: for PDF generation (WPdfImage)'
+            'graphicsmagick: for raster image support (WRasterImage)'
+            'pango: for advanced font rendering (WRasterImage)'
+            'mysql++: for the hangman example'
+            'qt: for the Wt/Qt interopability example (wtwithqt)')
+backup=('etc/wt/wt_config.xml')
+source=(http://downloads.sourceforge.net/witty/$pkgname-${pkgver}.tar.gz)
+md5sums=('535945f48f479e74b893adf5b1a857b7')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  mkdir build
+  cd build
+  cmake -DCONNECTOR_HTTP=ON -DCMAKE_INSTALL_PREFIX=/usr \
+    -DWEBUSER=http -DWEBGROUP=http -DRUNDIR=/var/run/wt -DDEPLOYROOT=/var/www/wt \
+    -DDESTDIR=${pkgdir} -DWT_CMAKE_FINDER_INSTALL_DIR="share/cmake-2.8/Modules" ..
+  make
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}/build
+  make DESTDIR=${pkgdir} install
+}