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

Conflicts:
	community/clucene/PKGBUILD
	community/cuyo/PKGBUILD
	community/pinot/PKGBUILD
	extra/fontforge/PKGBUILD
	extra/gtkimageview/PKGBUILD
	extra/mkvtoolnix/PKGBUILD
	multilib-testing/lib32-glibc/PKGBUILD
	staging/qt/PKGBUILD
	testing/glibc/PKGBUILD

18 files changed, 232 insertions, 114 deletions

diff --git a/community/arm-elf-binutils/PKGBUILD b/community/arm-elf-binutils/PKGBUILD
new file mode 100644
index 000000000..ac242c134
--- /dev/null
+++ b/community/arm-elf-binutils/PKGBUILD
@@ -0,0 +1,54 @@
+# $Id: PKGBUILD 60835 2011-12-18 22:14:40Z spupykin $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+
+pkgname=arm-elf-binutils
+pkgver=2.22
+pkgrel=1
+_xprefix=/usr
+pkgdesc="A set of programs to assemble and manipulate binary and object files"
+arch=(i686 x86_64)
+license=(GPL)
+options=(!libtool)
+url="http://sources.redhat.com/binutils"
+depends=('glibc' 'zlib')
+source=(ftp://ftp.gnu.org/gnu/binutils/binutils-${pkgver}.tar.gz)
+md5sums=('8b3ad7090e3989810943aa19103fdb83')
+
+build() {
+  cd $srcdir/binutils-${pkgver}
+
+  [ $NOEXTRACT -eq 1 ] || ./configure --prefix=${_xprefix} \
+	--program-prefix=arm-elf- \
+	--enable-shared \
+	--disable-multilib \
+	--with-lib-path=${_xprefix}/lib/binutils/arm-elf \
+	--disable-nls \
+	--target=arm-elf \
+	--host=$CHOST \
+	--build=$CHOST \
+	--with-sysroot=/usr/$CHOST/arm-elf \
+#	--with-build-sysroot=/usr/i686-pc-linux-gnu/arm-elf/
+
+#  mkdir -p $pkgdir/${_xprefix}/lib/binutils
+#  sed -i 's|know (S_GET_VALUE (frag->tc_frag_data.last_map) < S_GET_VALUE (symbolP));|{know (S_GET_VALUE (frag->tc_frag_data.last_map) < S_GET_VALUE (symbolP));}|' gas/config/tc-arm.c
+
+  make configure-host
+  make tooldir=$pkgdir/${_xprefix}
+  make prefix=$pkgdir/${_xprefix} tooldir=$pkgdir/${_xprefix} install
+
+  mkdir -p $pkgdir/${_xprefix}/lib/binutils/arm-elf
+  cp -v include/libiberty.h $pkgdir/${_xprefix}/lib/binutils/arm-elf
+
+  rm -f $pkgdir/${_xprefix}/man/man1/{dlltool,nlmconv,windres}*
+
+  rm -f $pkgdir/usr/bin/ar
+  rm -f $pkgdir/usr/bin/as
+  rm -f $pkgdir/usr/bin/ld
+  rm -f $pkgdir/usr/bin/nm
+  rm -f $pkgdir/usr/bin/objdump
+  rm -f $pkgdir/usr/bin/ranlib
+  rm -f $pkgdir/usr/bin/strip
+  rm -f $pkgdir/usr/bin/objcopy
+  rm -f $pkgdir/usr/lib/libiberty.a
+  rm -rf $pkgdir/usr/share
+}
diff --git a/community/arm-elf-gcc-base/PKGBUILD b/community/arm-elf-gcc-base/PKGBUILD
new file mode 100644
index 000000000..a4490b7ea
--- /dev/null
+++ b/community/arm-elf-gcc-base/PKGBUILD
@@ -0,0 +1,60 @@
+# $Id: PKGBUILD 60837 2011-12-18 22:34:22Z spupykin $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+
+pkgname=arm-elf-gcc-base
+pkgver=4.6.2
+pkgrel=1
+pkgdesc="The GNU Compiler Collection"
+arch=(i686 x86_64)
+license=('GPL' 'LGPL')
+url="http://gcc.gnu.org"
+depends=('arm-elf-binutils' 'libmpc' 'libelf')
+options=(!libtool !emptydirs zipman docs !strip)
+source=(ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-core-${pkgver}.tar.bz2)
+md5sums=('780f614ab18c7a9066dec6387d7490b2')
+
+build() {
+  cd $srcdir/gcc-$pkgver
+
+  export CFLAGS="-O2 -pipe"
+  export CXXFLAGS="-O2 -pipe"
+
+  [ $NOEXTRACT -eq 1 ] || rm -rf build
+  mkdir build
+  cd build
+
+  [ $NOEXTRACT -eq 1 ] || ../configure --prefix=/usr \
+	--target=arm-elf \
+	--host=$CHOST \
+	--build=$CHOST \
+	--enable-shared --disable-nls --enable-languages=c --enable-multilib \
+	--with-local-prefix=/usr/lib/arm-elf \
+	--with-as=/usr/bin/arm-elf-as --with-ld=/usr/bin/arm-elf-ld \
+	--enable-softfloat \
+	--with-float=soft \
+	--with-newlib \
+	--with-sysroot=/usr/$CHOST/arm-elf
+
+  make all-gcc all-target-libgcc
+}
+
+package() {
+  cd $srcdir/gcc-$pkgver/build
+
+  export CFLAGS="-O2 -pipe"
+  export CXXFLAGS="-O2 -pipe"
+
+  make DESTDIR=$pkgdir install-gcc install-target-libgcc
+
+  rm -f $pkgdir/usr/share/man/man7/fsf-funding.7*
+  rm -f $pkgdir/usr/share/man/man7/gfdl.7*
+  rm -f $pkgdir/usr/share/man/man7/gpl.7*
+  rm -rf $pkgdir/usr/share/info
+
+  cp -r $pkgdir/usr/libexec/* $pkgdir/usr/lib/
+  rm -rf $pkgdir/usr/libexec
+
+  # strip it manually
+  strip $pkgdir/usr/bin/* 2>/dev/null || true
+  find $pkgdir/usr/lib -type f -exec arm-elf-strip {} \; 2>/dev/null || true
+}
diff --git a/community/cclive/PKGBUILD b/community/cclive/PKGBUILD
index 68ae47376..dd09fa284 100644
--- a/community/cclive/PKGBUILD
+++ b/community/cclive/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 59926 2011-12-02 20:58:05Z ibiru $
+# $Id: PKGBUILD 60841 2011-12-19 01:09:02Z lfleischer $
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: joyfulgirl@archlinux.us
 # Contributor: nathan owe ndowens04 at gmail dot com
 
 pkgname=cclive
-pkgver=0.7.7
-pkgrel=2
+pkgver=0.7.8
+pkgrel=1
 pkgdesc='Commandline downloader for popular video websites.'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://cclive.sourceforge.net/'
@@ -13,7 +13,7 @@ license=('GPL3')
 depends=('boost-libs' 'pcre' 'curl' 'libquvi')
 makedepends=('boost')
 source=("http://downloads.sourceforge.net/project/${pkgname}/0.7/${pkgname}-${pkgver}.tar.gz")
-md5sums=('8265be865a22fb477bcc050f0dc310dc')
+md5sums=('01ffbe54e48440721b3c283c993928f1')
 
 build() {
   cd "$pkgname-$pkgver"
diff --git a/community/clucene/PKGBUILD b/community/clucene/PKGBUILD
index ed52f0128..bc43ff644 100644
--- a/community/clucene/PKGBUILD
+++ b/community/clucene/PKGBUILD
@@ -1,31 +1,40 @@
-# $Id: PKGBUILD 49740 2011-06-20 20:01:57Z andrea $
-# Maintainer:
+# $Id: PKGBUILD 60839 2011-12-18 22:57:14Z arodseth $
+# Maintainer: Alexander Rødseth
 # Contributor: Alois Nespor <alois.nespor@gmail.com>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
-
 pkgname=clucene
 pkgver=2.3.3.4
-pkgrel=1
-pkgdesc="A C++ port of Lucene: the high-performance, full-featured text search engine"
+pkgrel=2
+pkgdesc="C++ port of the high-performance text search engine Lucene"
 arch=('i686' 'x86_64' 'mips64el')
-url="http://clucene.sourceforge.net"
+url="http://clucene.sourceforge.net/"
 license=('APACHE' 'LGPL')
 depends=('gcc-libs' 'zlib' 'boost-libs')
 makedepends=('cmake' 'boost')
 source=("http://downloads.sourceforge.net/$pkgname/$pkgname-core-$pkgver.tar.gz")
-md5sums=('48d647fbd8ef8889e5a7f422c1bfda94')
+sha256sums=('ddfdc433dd8ad31b5c5819cc4404a8d2127472a3b720d3e744e8c51d79732eab')
 
 build() {
-  cd "${srcdir}"
+  cd "$srcdir"
+
   mkdir build
   cd build
-  cmake ../$pkgname-core-$pkgver \
+  cmake "../$pkgname-core-$pkgver" \
     -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DENABLE_ASCII_MODE=OFF \
+    -DENABLE_PACKAGING=OFF \
+    -DDISABLE_MULTITHREADING=OFF
+    # The three lines above are from 
+    # http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/dev-cpp/clucene/clucene-2.3.3.4.ebuild
+    # Thanks, Gentoo
   make
 }
 
 package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
+  cd "$srcdir/build"
+
+  make DESTDIR="$pkgdir" install
 }
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/cuyo/PKGBUILD b/community/cuyo/PKGBUILD
index b1d1a20fa..868d99392 100644
--- a/community/cuyo/PKGBUILD
+++ b/community/cuyo/PKGBUILD
@@ -1,28 +1,33 @@
-# $Id: PKGBUILD 5434 2009-11-08 13:15:53Z jlichtblau $
+# $Id: PKGBUILD 60801 2011-12-18 13:21:49Z jlichtblau $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 
 pkgname=cuyo
-pkgver=2.1.1
-pkgrel=4
-pkgdesc="Tetris-style puzzle game for up to two players with a twist."
+pkgver=2.1.2
+pkgrel=1
+pkgdesc="Tetris-style puzzle game for up to two players with a twist"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.karimmi.de/cuyo/"
 license=('GPL')
-depends=('sdl' 'sdl_mixer' 'sdl_image' 'xdg-utils')
+depends=('desktop-file-utils' 'hicolor-icon-theme' 'sdl' 'sdl_mixer' 'sdl_image' 'xdg-utils')
 makedepends=('patch')
 install=$pkgname.install
-source=(http://download.savannah.gnu.org/releases/cuyo/$pkgname-2.~-1.1.tar.gz \
+changelog=$pkgname.changelog
+source=(http://download.savannah.gnu.org/releases/$pkgname/$pkgname-2.~-1.2.tar.gz \
         $pkgname.diff)
-
-md5sums=('1629b257311c6c55cf657f0fa92dbd92'
-         '923c88e894cfd9c77d75f21b448ee6cf')
+sha256sums=('3fb44af4e6f8d205d11d44b5a96ffa4a11eab5a4fa86897463c0c6ca0658adb0'
+            'dd81909594072f030571f2afc39cc69838eed26304d2d89949ac1c2c850dcafe')
 
 build() {
-  cd ${srcdir}/$pkgname-2.~-1.1
+  cd ${srcdir}/$pkgname-2.~-1.2
 
-  patch -Np1 -i ${srcdir}/$pkgname.diff || return 1
+  patch -Np0 -i ${srcdir}/$pkgname.diff
 
   ./configure --prefix=/usr
-  make || return 1
+  make
+}
+
+package() {
+  cd ${srcdir}/$pkgname-2.~-1.2
+
   make DESTDIR=${pkgdir} install
 }
diff --git a/community/cuyo/cuyo.changelog b/community/cuyo/cuyo.changelog
new file mode 100644
index 000000000..2212ac481
--- /dev/null
+++ b/community/cuyo/cuyo.changelog
@@ -0,0 +1,5 @@
+2011-12-18 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+	* cuyo 2.1.2-1
+
+2009-11-16 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+	* Update to minor release 2.1.1-4
diff --git a/community/cuyo/cuyo.diff b/community/cuyo/cuyo.diff
index 3011623d3..3da3b1c64 100644
--- a/community/cuyo/cuyo.diff
+++ b/community/cuyo/cuyo.diff
@@ -1,32 +1,11 @@
-diff -ruN cuyo-2.~-1.1-orig/icons/cuyo.desktop cuyo-2.~-1.1/icons/cuyo.desktop
---- cuyo-2.~-1.1-orig/icons/cuyo.desktop	2007-12-20 18:22:32.000000000 +0100
-+++ cuyo-2.~-1.1/icons/cuyo.desktop	2009-11-08 14:08:56.000000000 +0100
-@@ -1,11 +1,13 @@
- [Desktop Entry]
-+Type=Application
- Name=Cuyo
-+GenericName=Cuyo
- Icon=cuyo
--Type=Application
-+Exec=cuyo
-+StartupNotify=true
- Terminal=false
--MimeType=application/x-executable
-+MimeType=application/x-executable;
+--- icons/cuyo.desktop	2011-12-18 13:48:54.000000000 +0100
++++ icons/cuyo.desktop	2011-12-18 13:48:54.000000000 +0100
+@@ -7,4 +7,4 @@
  Categories=Game;BlocksGame;
 -Encoding=UTF-8
- Comment=A tetris like game with many levels
+ Comment=Play a tetris like game with many levels
 +Comment[cs]=Hra podobná tetrisu s mnoha úrovněmi
- Comment[de]=Ein Tetris-artiges Spiel mit vielen Leveln
--Exec=cuyo
-diff -ruN cuyo-2.~-1.1-orig/src/stringzeug.h cuyo-2.~-1.1/src/stringzeug.h
---- cuyo-2.~-1.1-orig/src/stringzeug.h	2006-07-03 19:26:23.000000000 +0200
-+++ cuyo-2.~-1.1/src/stringzeug.h	2009-11-08 14:08:56.000000000 +0100
-@@ -19,6 +19,7 @@
- #define STRINGZEUG_H
- 
- #include <config.h>
-+#include <cstdarg>
- #include <string>
- 
- 
+ Comment[de]=Ein Tetris-artiges Spiel mit vielen Leveln spielen
+@@ -12,2 +12 @@
+ GenericName=Tetris like game
+- 
diff --git a/community/cuyo/cuyo.install b/community/cuyo/cuyo.install
index b711352cb..4c0972beb 100644
--- a/community/cuyo/cuyo.install
+++ b/community/cuyo/cuyo.install
@@ -1,5 +1,6 @@
 post_install() {
   which xdg-icon-resource 1>/dev/null 2>/dev/null && xdg-icon-resource forceupdate || true
+  update-desktop-database -q
 }
 
 post_upgrade() {
diff --git a/community/html2text/PKGBUILD b/community/html2text/PKGBUILD
index 9c99e82d2..0a418b15b 100644
--- a/community/html2text/PKGBUILD
+++ b/community/html2text/PKGBUILD
@@ -1,23 +1,30 @@
-# $Id: PKGBUILD 5125 2009-11-06 16:14:08Z ibiru $
-# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
+# $Id: PKGBUILD 60804 2011-12-18 13:31:52Z jlichtblau $
+# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+# Contributor: Giovanni Scafora <giovanni@archlinux.org>
+# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgname=html2text
 pkgver=1.3.2a
-pkgrel=8
+pkgrel=9
 pkgdesc="A HTML to text converter"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.mbayer.de/html2text"
 license=('GPL2')
 depends=('gcc-libs')
-source=(http://ftp.ibiblio.org/pub/linux/apps/www/converters/$pkgname-$pkgver.tar.gz)
-md5sums=('6097fe07b948e142315749e6620c9cfc')
+source=(http://ftp.ibiblio.org/pub/linux/apps/www/converters/${pkgname}-${pkgver}.tar.gz)
+sha256sums=('000b39d5d910b867ff7e087177b470a1e26e2819920dcffd5991c33f6d480392')
 
 build() {
-  cd $srcdir/$pkgname-$pkgver
+  cd ${srcdir}/${pkgname}-${pkgver}
+
   ./configure
-  make || return 1
-  install -D -m 755 html2text $pkgdir/usr/bin/html2text
-  install -D -m 644 html2text.1.gz $pkgdir/usr/share/man/man1/html2text.1.gz
-  install -D -m 644 html2textrc.5.gz $pkgdir/usr/share/man/man5/html2textrc.5.gz
+  make
 }
 
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+
+  install -D -m755 $pkgname ${pkgdir}/usr/bin/$pkgname
+  install -D -m644 $pkgname.1.gz ${pkgdir}/usr/share/man/man1/$pkgname.1.gz
+  install -D -m644 html2textrc.5.gz ${pkgdir}/usr/share/man/man5/html2textrc.5.gz
+}
diff --git a/community/john/PKGBUILD b/community/john/PKGBUILD
index 806f00e61..b5d0288c4 100644
--- a/community/john/PKGBUILD
+++ b/community/john/PKGBUILD
@@ -5,9 +5,9 @@
 # Contributor: Michal Krenek <mikos@sg1.cz>
 
 pkgname=john
-pkgver=1.7.8
-pkgrel=7
-_jumbover=8
+pkgver=1.7.9
+pkgrel=1
+_jumbover=5
 pkgdesc="John The Ripper - A fast password cracker (jumbo-$_jumbover included)"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.openwall.com/$pkgname/"
@@ -18,8 +18,8 @@ source=(http://www.openwall.com/$pkgname/g/$pkgname-$pkgver.tar.bz2
 	http://www.openwall.com/john/g/john-$pkgver-jumbo-$_jumbover.diff.gz 
 	ftp://ftp.kfki.hu/pub/packages/security/ssh/ossh/libdes-4.04b.tar.gz
 	params.h.patch)
-md5sums=('e6d7f261829610d6949c706ebac0517c'
-         '96cb581fd8447f3f96614fd365896b07'
+md5sums=('45f54fc59386ecd67daaef9f19781d93'
+         '68cacb612f20c71eed6c24cbaf28148a'
          'c8d5c69f86c2eedb485583b0305284a1'
          'f69ed632eba8fb9e45847a4b4a323787')
 
diff --git a/community/ltris/PKGBUILD b/community/ltris/PKGBUILD
index 8d262586a..b21b1e5cc 100644
--- a/community/ltris/PKGBUILD
+++ b/community/ltris/PKGBUILD
@@ -1,19 +1,21 @@
-# $Id: PKGBUILD 54927 2011-08-28 13:23:10Z jlichtblau $
+# $Id: PKGBUILD 60814 2011-12-18 17:13:32Z jlichtblau $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Eric Belanger <eric@archlinux.org>
 # Contributor: SmackleFunky <smacklefunky@optusnet.com.au>
 
 pkgname=ltris
-pkgver=1.0.17
+pkgver=1.0.18
 pkgrel=1
 pkgdesc="A tetris clone where you have a bowl with blocks falling down"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://lgames.sourceforge.net/index.php?project=LTris"
 license=('GPL')
 depends=('sdl_mixer')
+backup=('var/games/ltris.hscr')
 install=$pkgname.install
+changelog=$pkgname.changelog
 source=(http://downloads.sourceforge.net/lgames/$pkgname-$pkgver.tar.gz)
-sha256sums=('b4d2888bc50bb2ad9dd59f97c15fbfaee96c54d86c834f1231cd6e8af66bf52c')
+sha256sums=('3cba90365d50e79601368499af77d54cb03c0cf2544324e5df246eb1eeaa0e30')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
@@ -29,7 +31,4 @@ package() {
 
   install -d ${pkgdir}/usr/share/pixmaps
   install -m644 icons/ltris{16,32,48}.xpm ${pkgdir}/usr/share/pixmaps
-
-  ./configure --prefix=/usr --localstatedir=/var/games
-  make
 }
diff --git a/community/ltris/ltris.changelog b/community/ltris/ltris.changelog
index 0454493b1..4cf7b905f 100644
--- a/community/ltris/ltris.changelog
+++ b/community/ltris/ltris.changelog
@@ -1,3 +1,8 @@
+2011-12-18  Jaroslav Lichtblau  <dragonlord@aur.archlinux.org>
+
+	* ltris 1.0.18-1
+	* Upstream update
+
 2011-08-28  Jaroslav Lichtblau  <dragonlord@aur.archlinux.org>
 
 	* ltris 1.0.17-1
diff --git a/community/ltris/ltris.install b/community/ltris/ltris.install
index ff4947f6e..e270274bd 100644
--- a/community/ltris/ltris.install
+++ b/community/ltris/ltris.install
@@ -1,17 +1,4 @@
 post_install() {
-  touch /var/games/ltris.hscr
-  chown root:games /var/games/ltris.hscr
-  chmod 664 /var/games/ltris.hscr
-}
-
-pre_upgrade() {
-  if [ -e /var/ltris.hscr ]; then
-    install -d /var/games
-    cp /var/ltris.hscr /var/games
-  fi
-}
-
-post_upgrade() {
   chown root:games /var/games/ltris.hscr
   chmod 664 /var/games/ltris.hscr
 }
diff --git a/community/pinot/PKGBUILD b/community/pinot/PKGBUILD
index 9c315cc50..def587def 100644
--- a/community/pinot/PKGBUILD
+++ b/community/pinot/PKGBUILD
@@ -1,18 +1,19 @@
-# $Id: PKGBUILD 40072 2011-02-19 22:02:17Z ebelanger $
+# $Id: PKGBUILD 60809 2011-12-18 16:48:56Z jlichtblau $
+# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Alexander Fehr <pizzapunk gmail com>
 # Contributor: William Rea <sillywilly@gmail.com>
-# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
+# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgname=pinot
-pkgver=0.97
+pkgver=0.98
 pkgrel=1
-pkgdesc='Personal search and metasearch tool.'
+pkgdesc='Personal search and metasearch tool'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://pinot.berlios.de/'
 license=('GPL')
 depends=('gtkmm' 'xapian-core' 'libtextcat' 'sqlite3' 'libxml++' 'curl'
          'gmime' 'dbus-glib' 'shared-mime-info' 'libexif' 'taglib' 
-         'hicolor-icon-theme' 'cairo')
+         'hicolor-icon-theme' 'cairo' 'exiv2')
 makedepends=('boost' 'desktop-file-utils')
 optdepends=('unzip: ZIP files extraction'
             'poppler: PDF to text conversion'
@@ -22,13 +23,14 @@ optdepends=('unzip: ZIP files extraction'
             'antiword: MS Word to text conversion'
             'catdoc: XLS and PPT to text conversion'
             'deskbar-applet: Pinot Deskbar-Applet module')
-install='pinot.install'
-source=("http://download.berlios.de/pinot/pinot-${pkgver}.tar.gz")
-md5sums=('9e16fe25f021c15f28c9382a008aca8d')
-sha1sums=('680d18e8777545cbde6a117629f89630a94a6bc8')
+options=('!emptydirs')
+install=$pkgname.install
+changelog=$pkgname.changelog
+source=(http://download.berlios.de/$pkgname/$pkgname-$pkgver.tar.gz)
+sha256sums=('8a89a73a48344074aa8f4534ce68fd18e3d84553645cef864c137ab21d8d341c')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${srcdir}/$pkgname-$pkgver
   sed -i 's|/usr/share/libtextcat/|/usr/share/libtextcat/LM/|' textcat_conf.txt
   sed -i -e "s|.*russian$|/usr/share/libtextcat/LM/russian-iso8859_5.lm   russian-iso8859_5\n\
 /usr/share/libtextcat/LM/russian-koi8_r.lm      russian-koi8_r\n\
@@ -39,8 +41,10 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
+  cd ${srcdir}/$pkgname-$pkgver
+
+  make DESTDIR=${pkgdir} install
+
   # Remove Deskbar-Applet handler
-  rm -rf "${pkgdir}/usr/lib/deskbar-applet/handlers"
+  rm -rf ${pkgdir}/usr/lib/deskbar-applet/handlers
 }
diff --git a/community/pinot/pinot.changelog b/community/pinot/pinot.changelog
new file mode 100644
index 000000000..7d899cdb0
--- /dev/null
+++ b/community/pinot/pinot.changelog
@@ -0,0 +1,2 @@
+2011-12-18 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+	* pinot 0.98-1
diff --git a/community/workrave/PKGBUILD b/community/workrave/PKGBUILD
index 9e428da02..3393fd535 100644
--- a/community/workrave/PKGBUILD
+++ b/community/workrave/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 51933 2011-07-18 09:09:27Z spupykin $
+# $Id: PKGBUILD 60818 2011-12-18 17:24:11Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: William Rea <sillywilly@gmail.com>
 
@@ -10,7 +10,7 @@ arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
 url="http://workrave.org"
 depends=('libxtst' 'gtkmm' 'gconf' 'gdome2' 'gstreamer0.10' 'libsm' 'libice')
-makedepends=('intltool' 'python-cheetah')
+makedepends=('intltool')
 source=(http://downloads.sourceforge.net/workrave/workrave-$pkgver.tar.gz)
 md5sums=('d5eaf399b38b063053cff1a8527cba8e')
 
diff --git a/community/xmonad-contrib/PKGBUILD b/community/xmonad-contrib/PKGBUILD
index a2d1a65e4..ee51d9f10 100644
--- a/community/xmonad-contrib/PKGBUILD
+++ b/community/xmonad-contrib/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 60423 2011-12-13 19:10:42Z spupykin $
+# $Id: PKGBUILD 60798 2011-12-18 11:12:08Z jelle $
 # 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=4
+pkgver=0.10
+pkgrel=1
 pkgdesc="Add-ons for xmonad"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://xmonad.org/"
 license=('BSD')
-depends=('ghc=7.0.3' 'xmonad=0.9.2' 'sh' 'haskell-x11=1.5.0.1'
+depends=('ghc=7.0.3' 'xmonad=0.10' 'sh' 'haskell-x11=1.5.0.1'
          'haskell-x11-xft=0.3.1' 'haskell-utf8-string=0.3.6')
 install='xmonad-contrib.install'
 source=(http://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz)
@@ -33,3 +33,4 @@ package() {
   runhaskell Setup.lhs copy --destdir=$pkgdir
   install -D LICENSE $pkgdir/usr/share/licenses/xmonad-contrib/LICENSE
 }
+md5sums=('9a4353a94ec0ea3a9c4700757ef5ae81')
diff --git a/community/xmonad/PKGBUILD b/community/xmonad/PKGBUILD
index e21e9aeaf..95051d2dc 100644
--- a/community/xmonad/PKGBUILD
+++ b/community/xmonad/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 60410 2011-12-13 13:22:16Z spupykin $
+# $Id: PKGBUILD 60796 2011-12-18 11:10:08Z jelle $
 # 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=3
+pkgver=0.10
+pkgrel=1
 pkgdesc="A lightweight X11 tiled window manager written in Haskell"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://xmonad.org/"
@@ -16,7 +16,7 @@ source=(http://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$p
 	xmonad.desktop
 	xmonad.session
 	xmonad.svg)
-md5sums=('5a4117f798664d772d2a834ea6c90f1c'
+md5sums=('f8381e1ec15137863558a454d4466467'
          'f8e3d84a9f154d1b5d7fcffbc0a058c9'
          '9d1bc84a7f32897d32f3fc71ef76228e'
          '72bfa5e62e4e44fe7fa59b6a7593d993')