Tue Oct 1 03:05:59 PDT 2013

29 files changed, 489 insertions, 122 deletions

diff --git a/community/9base/PKGBUILD b/community/9base/PKGBUILD
index a38a266bd..92bcce809 100644
--- a/community/9base/PKGBUILD
+++ b/community/9base/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 68390 2012-03-23 21:00:56Z cbrannon $
+# $Id: PKGBUILD 97894 2013-09-30 20:21:53Z bpiotrowski $
 # Maintainer: Chris Brannon <cmbrannon79@gmail.com>
 # Contributor: Jeff Mickey <j@codemac.net>
 # Contributor: Aaron, phrakture, Griffin <aaron@archlinux.org>
@@ -6,7 +6,7 @@
 
 pkgname=9base
 pkgver=6
-pkgrel=4
+pkgrel=5
 pkgdesc="Port of various original Plan9 tools to unix"
 url="http://tools.suckless.org/9base"
 source=(http://dl.suckless.org/tools/$pkgname-$pkgver.tar.gz 9 plan9.sh)
@@ -16,9 +16,8 @@ provides=('plan9')
 arch=('i686' 'x86_64')
 license=('custom')
 
-build()
-{
-  cd "$srcdir/$pkgname-$pkgver"
+build() {
+  cd $pkgname-$pkgver
 
   case $CARCH in
 	i686) sed -i 's#^OBJTYPE\s.*$#OBJTYPE = 386#' config.mk ;;
@@ -36,7 +35,7 @@ build()
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd $pkgname-$pkgver
   make DESTDIR="$pkgdir" install
   install -m755 ../9 "$pkgdir/opt/plan9/bin/"
   install -D -m755 ../plan9.sh "$pkgdir/etc/profile.d/plan9.sh"
diff --git a/community/bchunk/PKGBUILD b/community/bchunk/PKGBUILD
index 2a8ac0198..23533b0d5 100644
--- a/community/bchunk/PKGBUILD
+++ b/community/bchunk/PKGBUILD
@@ -1,3 +1,4 @@
+# Maintainer: Xyne <ca dot archlinux at xyne, backwards>
 # Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org>
 # Contributor: eric <eric@archlinux.org>
 # Contributor: Markus Meissner <markus@meissna.de>
@@ -6,25 +7,23 @@ pkgname=bchunk
 pkgver=1.2.0
 pkgrel=3
 pkgdesc="A Tool to Convert *.raw *.bin files to an ISO file"
-url="http://hes.iki.fi/bchunk/"
+url="http://he.fi/bchunk/"
 arch=('i686' 'x86_64')
 license=('GPL')
 depends=('glibc')
-source=(http://hes.iki.fi/$pkgname/$pkgname-$pkgver.tar.gz)
+source=(http://he.fi/$pkgname/$pkgname-$pkgver.tar.gz)
 md5sums=('6a613da3f34f9a303f202d2e9731d231')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-
+  cd "$srcdir/$pkgname-$pkgver"
   make
 }
 
 package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-
-  mkdir -p ${pkgdir}/usr/bin ${pkgdir}/usr/share/man/man1
-
-  make PREFIX=${pkgdir}/usr MAN_DIR=${pkgdir}/usr/share/man install
-  chown root.root ${pkgdir}/usr/share/man/man1/bchunk.1
+  cd "$srcdir/$pkgname-$pkgver"
+  install -dm755 "$pkgdir"/usr/{bin,share/man/man1}
+  make PREFIX="$pkgdir/usr" MAN_DIR="$pkgdir/usr/share/man" install
+  chown root:root "$pkgdir/usr/share/man/man1/bchunk.1"
 }
+
 # vim: ts=2 sw=2 et ft=sh
diff --git a/community/cinnamon/PKGBUILD b/community/cinnamon/PKGBUILD
index 0571d4230..cd3603d04 100644
--- a/community/cinnamon/PKGBUILD
+++ b/community/cinnamon/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 95592 2013-08-14 21:28:25Z bgyorgy $
+# $Id: PKGBUILD 97850 2013-09-30 10:27:55Z allan $
 # Maintainer: Alexandre Filgueira <alexfilgueira@cinnarch.com>
 # Contributor: M0Rf30
 # Contributor: unifiedlinux
@@ -6,7 +6,7 @@
 
 pkgname=cinnamon
 pkgver=1.8.8
-pkgrel=4
+pkgrel=5
 pkgdesc="Linux desktop which provides advanced innovative features and a traditional user experience"
 arch=('i686' 'x86_64')
 url="http://cinnamon.linuxmint.com/"
@@ -14,7 +14,7 @@ license=('GPL2')
 depends=('accountsservice' 'caribou' 'clutter-gtk' 'gjs' 'gnome-bluetooth'
          'gnome-icon-theme' 'gnome-menus' 'gnome-settings-daemon' 'gnome-session'
          'gnome-themes-standard' 'gstreamer0.10' 'libgnome-keyring' 'librsvg'
-         'networkmanager' 'muffin' 'pygtk' 'python2-dbus' 'python2-imaging'
+         'networkmanager' 'muffin' 'pygtk' 'python2-dbus' 'python2-pillow'
          'python2-pyinotify' 'python2-lxml' 'webkitgtk3' 'gnome-settings-daemon-compat'
          'gnome-panel')
 makedepends=('gnome-common' 'intltool')
diff --git a/community/classpath/PKGBUILD b/community/classpath/PKGBUILD
index 729e13a9a..a222c9f35 100644
--- a/community/classpath/PKGBUILD
+++ b/community/classpath/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 59865 2011-12-01 13:10:18Z spupykin $
+# $Id: PKGBUILD 97832 2013-09-30 10:02:06Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: tardo <tardo@nagi-fanboi.net>
 # Contributor: Sean Gillespie <Sean.D.Gillespie@gmail.com>
 
 pkgname=classpath
 pkgver=0.98
-pkgrel=4
+pkgrel=5
 pkgdesc="A free replacement for Sun's proprietary core Java class libraries."
 arch=('i686' 'x86_64')
 url="http://www.gnu.org/software/classpath/"
 license=('GPL')
 depends=('gtk2>=2.8' 'libxtst' 'libsm')
-makedepends=('gtk2>=2.8' 'libxtst' 'gconf' 'openjdk6')
+makedepends=('gtk2>=2.8' 'libxtst' 'gconf' 'java-environment')
 optdepends=('file' 'gconf')
 source=(ftp://ftp.gnu.org/gnu/classpath/$pkgname-$pkgver.tar.gz)
 md5sums=('90c6571b8b0309e372faa0f9f6255ea9')
@@ -30,6 +30,10 @@ EOF
 
   ./configure --prefix=/usr --disable-Werror --disable-plugin
   make EXAMPLESDIR=
+}
+
+package() {
+  cd $srcdir/$pkgname-$pkgver
   make EXAMPLESDIR= DESTDIR=$pkgdir install
 
   rm -f $pkgdir/usr/bin/gappletviewer
diff --git a/community/cmus/PKGBUILD b/community/cmus/PKGBUILD
index eccd1eee4..5d54d3c79 100644
--- a/community/cmus/PKGBUILD
+++ b/community/cmus/PKGBUILD
@@ -1,18 +1,21 @@
-# $Id: PKGBUILD 94872 2013-08-01 06:54:46Z bpiotrowski $
-# Maintainer:  Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
+# $Id: PKGBUILD 97815 2013-09-30 02:36:29Z xyne $
+# Maintainer: Xyne <ca dot archlinux at xyne, backwards>
+# Contributor:  Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 # Contributor: Aaron Griffin <aaron@archlinux.org>
 # Contributor: dorphell <dorphell@archlinux.org>
 
 pkgname=cmus
 pkgver=2.5.0
-pkgrel=3
+pkgrel=4
 pkgdesc='Very feature-rich ncurses-based music player'
 arch=('i686' 'x86_64')
 url="http://cmus.sourceforge.net/"
 license=('GPL')
 depends=('ncurses')
-makedepends=('faad2' 'ffmpeg' 'flac' 'libao' 'libmad' 'libmodplug'
-             'libmp4v2' 'libmpcdec' 'libpulse' 'libvorbis' 'opusfile' 'wavpack')
+makedepends=(
+  'faad2' 'ffmpeg' 'flac' 'libao' 'libmad' 'libmodplug' 'libcdio-paranoia'
+  'libmp4v2' 'libmpcdec' 'libpulse' 'libvorbis' 'opusfile' 'wavpack'
+)
 optdepends=('alsa-lib: for ALSA output plugin support'
             'libao: for AO output plugin support'
             'libpulse: for PulseAudio output plugin support'
@@ -24,23 +27,32 @@ optdepends=('alsa-lib: for ALSA output plugin support'
             'libmp4v2: for mp4 input plugin support'
             'libmpcdec: for musepack input plugin support'
             'libvorbis: for vorbis input plugin support'
+            'libcdio-paranoia: for cdio support'
             'opusfile: for opus input plugin support'
             'wavpack: for wavpack input plugin support')
 source=(http://downloads.sourceforge.net/$pkgname/$pkgname-v$pkgver.tar.bz2
-        cmus-2.5.0-opus-support.patch)
+        cmus-2.5.0-opus-support.patch
+        cdio-git.patch)
 sha1sums=('244975a5ff642567acb047f6bd518e4a3271c25b'
-          '5e524f54d565dfa30760562c223bc0e2e8ed00a0')
+          '5e524f54d565dfa30760562c223bc0e2e8ed00a0'
+          '77738acc7d4e71f6d396a5cd464dbbce0168b6b7')
+
+prepare() {
+  cd "$srcdir/$pkgname-v$pkgver"
+  # Inherited from Bart or earlier.
+  patch -Np1 -i "$srcdir/cmus-2.5.0-opus-support.patch"
+  # Include changes from git for compatibility with new cdio.
+  patch -N -i "$srcdir/cdio-git.patch"
+}
 
 build() {
-  cd $srcdir/$pkgname-v$pkgver
-  patch -Np1 -i $srcdir/cmus-2.5.0-opus-support.patch
+  cd "$srcdir/$pkgname-v$pkgver"
   ./configure prefix=/usr
   make
 }
 
 package() {
-  cd $srcdir/$pkgname-v$pkgver
-  make DESTDIR=$pkgdir install
-
-  install -Dm 644 contrib/_cmus $pkgdir/usr/share/zsh/site-functions/_cmus
+  cd "$srcdir/$pkgname-v$pkgver"
+  make DESTDIR="$pkgdir" install
+  install -Dm644 contrib/_cmus "$pkgdir"/usr/share/zsh/site-functions/_cmus
 }
diff --git a/community/cmus/cdio-git.patch b/community/cmus/cdio-git.patch
new file mode 100644
index 000000000..8c549bee7
--- /dev/null
+++ b/community/cmus/cdio-git.patch
@@ -0,0 +1,137 @@
+*** cdio.c	2012-11-07 08:46:17.000000000 +0000
+--- cmus-git/src/cmus/cdio.c	2013-09-30 02:21:10.518785946 +0000
+***************
+*** 1,5 ****
+  /*
+!  * Copyright 2011 Various Authors
+   * Copyright 2011 Johannes Weißl
+   *
+   * Based on cdda.c from XMMS2.
+--- 1,5 ----
+  /*
+!  * Copyright 2011-2013 Various Authors
+   * Copyright 2011 Johannes Weißl
+   *
+   * Based on cdda.c from XMMS2.
+***************
+*** 27,35 ****
+  #include "comment.h"
+  #include "discid.h"
+  
+- #include <cdio/cdda.h>
+  #include <cdio/cdio.h>
+  #include <cdio/logging.h>
+  #include <stdio.h>
+  #include <stdlib.h>
+  #include <string.h>
+--- 27,40 ----
+  #include "comment.h"
+  #include "discid.h"
+  
+  #include <cdio/cdio.h>
+  #include <cdio/logging.h>
++ #if LIBCDIO_VERSION_NUM >= 90
++ #include <cdio/paranoia/cdda.h>
++ #else
++ #include <cdio/cdda.h>
++ #endif
++ 
+  #include <stdio.h>
+  #include <stdlib.h>
+  #include <string.h>
+***************
+*** 352,375 ****
+  	GROWING_KEYVALS(c);
+  	const char *artist = NULL, *albumartist = NULL, *album = NULL,
+  		*title = NULL, *genre = NULL, *comment = NULL;
+! 	const cdtext_t *cdtext_track, *cdtext_album;
+  #ifdef HAVE_CDDB
+  	cddb_conn_t *cddb_conn = NULL;
+  	cddb_disc_t *cddb_disc = NULL;
+  #endif
+  	char buf[64];
+  
+! 	cdtext_track = cdio_get_cdtext(priv->cdio, priv->track);
+! 	if (cdtext_track) {
+! 		char * const *field = cdtext_track->field;
+  		artist = field[CDTEXT_PERFORMER];
+  		title = field[CDTEXT_TITLE];
+  		genre = field[CDTEXT_GENRE];
+  		comment = field[CDTEXT_MESSAGE];
+  	}
+! 	cdtext_album = cdio_get_cdtext(priv->cdio, 0);
+! 	if (cdtext_album) {
+! 		char * const *field = cdtext_album->field;
+  		album = field[CDTEXT_TITLE];
+  		albumartist = field[CDTEXT_PERFORMER];
+  		if (!artist)
+--- 357,403 ----
+  	GROWING_KEYVALS(c);
+  	const char *artist = NULL, *albumartist = NULL, *album = NULL,
+  		*title = NULL, *genre = NULL, *comment = NULL;
+! 	int track_comments_found = 0;
+! 	const cdtext_t *cdt;
+  #ifdef HAVE_CDDB
+  	cddb_conn_t *cddb_conn = NULL;
+  	cddb_disc_t *cddb_disc = NULL;
+  #endif
+  	char buf[64];
+  
+! #if LIBCDIO_VERSION_NUM >= 90
+! 	cdt = cdio_get_cdtext(priv->cdio);
+! 	if (cdt) {
+! 		artist = cdtext_get(cdt, CDTEXT_FIELD_PERFORMER, priv->track);
+! 		title = cdtext_get(cdt, CDTEXT_FIELD_TITLE, priv->track);
+! 		genre = cdtext_get(cdt, CDTEXT_FIELD_GENRE, priv->track);
+! 		comment = cdtext_get(cdt, CDTEXT_FIELD_MESSAGE, priv->track);
+! 
+! 		if (title)
+! 			track_comments_found = 1;
+! 
+! 		album = cdtext_get(cdt, CDTEXT_FIELD_TITLE, 0);
+! 		albumartist = cdtext_get(cdt, CDTEXT_FIELD_PERFORMER, 0);
+! 		if (!artist)
+! 			artist = albumartist;
+! 		if (!genre)
+! 			genre = cdtext_get(cdt, CDTEXT_FIELD_GENRE, 0);
+! 		if (!comment)
+! 			comment = cdtext_get(cdt, CDTEXT_FIELD_MESSAGE, 0);
+! 	}
+! #else
+! 	cdt = cdio_get_cdtext(priv->cdio, priv->track);
+! 	if (cdt) {
+! 		track_comments_found = 1;
+! 		char * const *field = cdt->field;
+  		artist = field[CDTEXT_PERFORMER];
+  		title = field[CDTEXT_TITLE];
+  		genre = field[CDTEXT_GENRE];
+  		comment = field[CDTEXT_MESSAGE];
+  	}
+! 	cdt = cdio_get_cdtext(priv->cdio, 0);
+! 	if (cdt) {
+! 		char * const *field = cdt->field;
+  		album = field[CDTEXT_TITLE];
+  		albumartist = field[CDTEXT_PERFORMER];
+  		if (!artist)
+***************
+*** 379,387 ****
+  		if (!comment)
+  			comment = field[CDTEXT_MESSAGE];
+  	}
+  
+  #ifdef HAVE_CDDB
+! 	if (!cdtext_track && cddb_url && cddb_url[0]) {
+  		cddb_track_t *cddb_track;
+  		track_t i_tracks = cdio_get_num_tracks(priv->cdio);
+  		track_t i_first_track = cdio_get_first_track_num(priv->cdio);
+--- 407,416 ----
+  		if (!comment)
+  			comment = field[CDTEXT_MESSAGE];
+  	}
++ #endif
+  
+  #ifdef HAVE_CDDB
+! 	if (!track_comments_found && cddb_url && cddb_url[0]) {
+  		cddb_track_t *cddb_track;
+  		track_t i_tracks = cdio_get_num_tracks(priv->cdio);
+  		track_t i_first_track = cdio_get_first_track_num(priv->cdio);
diff --git a/community/fdupes/PKGBUILD b/community/fdupes/PKGBUILD
index 9dfae23a5..3b299b2a0 100644
--- a/community/fdupes/PKGBUILD
+++ b/community/fdupes/PKGBUILD
@@ -1,5 +1,6 @@
-# $Id: PKGBUILD 90262 2013-05-10 16:06:17Z jelle $
-# Maintainer: Daenyth <Daenyth+Arch at gmail dot com>
+# $Id: PKGBUILD 97812 2013-09-30 02:00:27Z xyne $
+# Maintainer: Xyne <ca dot archlinux at xyne, backwards>
+# Contributor: Daenyth <Daenyth+Arch at gmail dot com>
 # Contributor: Chris Winter <twidds at gmail dot com>
 
 pkgname=fdupes
@@ -11,19 +12,24 @@ url="http://code.google.com/p/fdupes/"
 license=('MIT')
 depends=(glibc)
 source=(http://fdupes.googlecode.com/files/$pkgname-$pkgver.tar.gz LICENSE)
-md5sums=('47d0410c90c9e51e450933ba35a32b62'
-         '47f17890218f832f870bf7a02eaeb017')
+sha256sums=('87dbc85b7b9cdb9626e713dd8078bd7487bceb58d47ceaff5404a9e6fd062881'
+            '6300e5a838d8a0f08b412742cb755c22708970aef420dbad5dc65ca7de677e39')
 
 build() {
-  cd $srcdir/$pkgname-$pkgver
-
+  cd "$srcdir/$pkgname-$pkgver"
   make  PREFIX=/usr
 }
-package(){
-  cd $srcdir/$pkgname-$pkgver
-
-  install -d ${pkgdir}/usr/{share/man/man1,bin}
 
-  make PREFIX=$pkgdir/usr DESTDIR=${pkgdir}/usr/bin INSTALLDIR=${pkgdir}/usr/bin MAN_DIR=${pkgdir}/usr/share/man/man1 install
-  install -D -m644 $srcdir/LICENSE ${pkgdir}/usr/share/licenses/$pkgname/LICENSE
+package(){
+  cd "$srcdir/$pkgname-$pkgver"
+  install -d "$pkgdir"/usr/{share/man/man1,bin}
+  make \
+    PREFIX="$pkgdir/usr" \
+    DESTDIR="$pkgdir/usr/bin" \
+    INSTALLDIR="$pkgdir"/usr/bin \
+    MAN_DIR="$pkgdir"/usr/share/man/man1 \
+    install
+  install -D -m644 "$srcdir/LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }
+
+# vim: set ts=2 sw=2 et:
diff --git a/community/gdc/PKGBUILD b/community/gdc/PKGBUILD
index c3201b9ac..5b0628024 100644
--- a/community/gdc/PKGBUILD
+++ b/community/gdc/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=('gdc' 'libgphobos-devel')
 pkgver=4.8.1
-pkgrel=4
+pkgrel=5
 arch=('i686' 'x86_64')
 url="https://github.com/D-Programming-GDC/GDC"
 license=('GPL')
@@ -69,7 +69,7 @@ build()
 
 package_gdc()
 {
-    depends=('libmpc' 'zlib')
+    depends=('gcc' 'binutils')
     optdepends=('libgphobos-devel: D standard library, GDC version')
     pkgdesc="Compiler for D programming language wich uses gcc backend"
  
diff --git a/community/gwibber/PKGBUILD b/community/gwibber/PKGBUILD
index 6bf243222..cda7de6b6 100644
--- a/community/gwibber/PKGBUILD
+++ b/community/gwibber/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 88679 2013-04-21 22:16:47Z heftig $
+# $Id: PKGBUILD 97853 2013-09-30 10:27:58Z allan $
 # Maintainer: Balló György <ballogyor+arch at gmail dot com>
 
 pkgname=gwibber
 pkgver=3.6.0
-pkgrel=4
+pkgrel=5
 pkgdesc="Microblogging client for GNOME, which supports Facebook, Identi.ca, Twitter, Flickr, Foursquare, Sina and Sohu"
 arch=('i686' 'x86_64')
 url="http://gwibber.com/"
 license=('GPL')
-depends=('libgee06' 'account-plugins' 'libnotify' 'libsoup' 'dee' 'json-glib' 'gtkspell3' 'python2-dbus' 'python2-gobject' 'python2-gobject2' 'python2-httplib2' 'python2-oauth' 'python2-imaging' 'python2-xdg' 'dconf')
+depends=('libgee06' 'account-plugins' 'libnotify' 'libsoup' 'dee' 'json-glib' 'gtkspell3' 'python2-dbus' 'python2-gobject' 'python2-gobject2' 'python2-httplib2' 'python2-oauth' 'python2-pillow' 'python2-xdg' 'dconf')
 makedepends=('intltool' 'vala')
 options=('!libtool')
 install=$pkgname.install
@@ -16,14 +16,16 @@ source=(http://launchpad.net/$pkgname/${pkgver%.*}/$pkgver/+download/$pkgname-$p
         lp_934530.patch
         lp_1051801.patch
         lp_1088775.patch
-        gtkspell3-port.patch)
+        gtkspell3-port.patch
+        gwibber-pillow.patch)
 md5sums=('5988e36e9f592c6eca6537ba6878307a'
          '8c43ae0ed96c52602befeff640a8672a'
          '0eb53f4f248a6c600b6c6dfaac12341f'
          '5698a3b1699c018719b193362486c9b5'
-         'e8c657543542d8141fdfe4b87a24d7fe')
+         'e8c657543542d8141fdfe4b87a24d7fe'
+         '8380d55786490965dfad37be09216dcb')
 
-build() {
+prepare() {
   cd "$srcdir/$pkgname-$pkgver"
   find . -type f | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@'
 
@@ -35,6 +37,9 @@ build() {
   # Port to the new gtkspell3
   patch -Np1 -i "$srcdir/gtkspell3-port.patch"
 
+  # Port to python-pillow
+  patch -Np1 -i "$srcdir/gwibber-pillow.patch"
+
   # Use the standalone accounts configuration panel
   sed -i 's/"gnome-control-center", "credentials", "application=gwibber"/"credentials-preferences"/' client/gwibber-client.vala
   sed -i 's/"gnome-control-center", "credentials"/"credentials-preferences"/' gwibber/microblog/dispatcher.py
@@ -42,6 +47,12 @@ build() {
   # Remove unneeded dependency on libdbusmenu
   sed -i '/Dbusmenu-0.4/ d' client/Makefile.{am,in}
 
+  # Fix libaccounts-glib dependency
+  sed -i 's/--pkg accounts/--pkg libaccounts-glib/' */Makefile.{am,in} */*/Makefile.{am,in}
+}
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
   autoreconf -fi
   intltoolize --force
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib/$pkgname \
@@ -51,6 +62,5 @@ build() {
 
 package() {
   cd "$srcdir/$pkgname-$pkgver"
-
   make DESTDIR="$pkgdir" install
 }
diff --git a/community/gwibber/gwibber-pillow.patch b/community/gwibber/gwibber-pillow.patch
new file mode 100644
index 000000000..211d22e73
--- /dev/null
+++ b/community/gwibber/gwibber-pillow.patch
@@ -0,0 +1,24 @@
+diff -Naur gwibber-3.6.0.orig/gwibber/microblog/util/imagehandler.py gwibber-3.6.0/gwibber/microblog/util/imagehandler.py
+--- gwibber-3.6.0.orig/gwibber/microblog/util/imagehandler.py	2012-08-21 06:14:09.000000000 +0200
++++ gwibber-3.6.0/gwibber/microblog/util/imagehandler.py	2013-09-15 15:03:07.056371930 +0200
+@@ -1,6 +1,7 @@
+ #!/usr/bin/env python
+ 
+-import os, hashlib, urllib2, Image
++import os, hashlib, urllib2
++from PIL import Image
+ 
+ DEFAULT_AVATAR = 'http://digg.com/img/udl.png'
+ 
+diff -Naur gwibber-3.6.0.orig/gwibber/microblog/util/resources.py gwibber-3.6.0/gwibber/microblog/util/resources.py
+--- gwibber-3.6.0.orig/gwibber/microblog/util/resources.py	2012-08-21 06:14:09.000000000 +0200
++++ gwibber-3.6.0/gwibber/microblog/util/resources.py	2013-09-15 15:02:36.825648020 +0200
+@@ -8,7 +8,7 @@
+ from hashlib import sha1
+ from os import makedirs, remove, environ
+ from os.path import join, isdir, realpath, exists
+-import Image
++from PIL import Image
+ from datetime import datetime
+ from gwibber.microblog import network
+ from gwibber.microblog.util.const import *
diff --git a/community/jansson/PKGBUILD b/community/jansson/PKGBUILD
index db43bce92..7dc08d820 100644
--- a/community/jansson/PKGBUILD
+++ b/community/jansson/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 76779 2012-09-29 19:28:30Z kkeen $
+# $Id: PKGBUILD 97810 2013-09-30 00:05:41Z kkeen $
 # Maintainer: Kyle Keen <keenerd@gmail.com>
 # Contributor: Dave Reisner <d@falconindy.com>
 
 pkgname=jansson
-pkgver=2.4
+pkgver=2.5
 pkgrel=1
 pkgdesc='C library for encoding, decoding and manipulating JSON data'
 arch=('i686' 'x86_64')
@@ -12,7 +12,7 @@ depends=('glibc')
 license=('MIT')
 options=('!libtool')
 source=("http://www.digip.org/$pkgname/releases/$pkgname-$pkgver.tar.bz2")
-md5sums=('3aaa1bb1195d705fac602b7504c9b945')
+md5sums=('ab239be8c08871c8463b27cf7610947c')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/lz4/PKGBUILD b/community/lz4/PKGBUILD
index c1ebdfefc..cb41d89e5 100644
--- a/community/lz4/PKGBUILD
+++ b/community/lz4/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 97016 2013-09-10 10:58:05Z seblu $
+# $Id: PKGBUILD 97896 2013-09-30 21:39:10Z seblu $
 # Maintainer: Sébastien Luttringer
 
 # Contacted by mail, author use svn commit as release version.
 # He only push tested release code into svn and support using revision as version
 
 pkgname=lz4
-pkgver=104
+pkgver=105
 pkgrel=1
 pkgdesc='Very fast lossless compression algorithm'
 arch=('i686' 'x86_64')
diff --git a/community/mlt/PKGBUILD b/community/mlt/PKGBUILD
index 5962f270b..e0c5b8f9e 100644
--- a/community/mlt/PKGBUILD
+++ b/community/mlt/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 96457 2013-08-29 15:10:58Z spupykin $
+# $Id: PKGBUILD 97836 2013-09-30 10:02:55Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Fabian Schoelzel <myfirstname.mylastname@googlemail.com>
 # Contributor: funkyou <spamopfer@nickname.berlin.de>
@@ -8,7 +8,7 @@
 pkgbase=mlt
 pkgname=('mlt' 'mlt-python-bindings')
 pkgver=0.9.0
-pkgrel=4
+pkgrel=5
 pkgdesc="An open source multimedia framework"
 arch=('i686' 'x86_64')
 url="http://www.mltframework.org"
@@ -25,7 +25,7 @@ build() {
   cd "$srcdir/mlt-$pkgver"
 
   msg "SSE2=$SSE2"
-  ./configure --prefix=/usr --disable-gtk2 \
+  ./configure --prefix=/usr \
 	--avformat-swscale \
 	--enable-gpl --enable-gpl3
   make
diff --git a/community/parrot/PKGBUILD b/community/parrot/PKGBUILD
index e36b3debe..7e07d2623 100644
--- a/community/parrot/PKGBUILD
+++ b/community/parrot/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 94711 2013-07-29 10:19:02Z spupykin $
+# $Id: PKGBUILD 97838 2013-09-30 10:03:17Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: mpie <michael.kyne-phillips1@ntlworld.com>
 
 pkgname=parrot
-pkgver=5.6.0
+pkgver=5.7.0
 #_rel=stable
 _rel=devel
 pkgrel=1
@@ -16,7 +16,7 @@ makedepends=('perl-json')
 optdepends=('freeglut')
 options=('!makeflags')
 source=(ftp://ftp.parrot.org/pub/parrot/releases/$_rel/$pkgver/$pkgname-$pkgver.tar.bz2)
-md5sums=('7bf098790c5772bb45480abe3e425f3c')
+md5sums=('3fcb1b21a3d71be8c4a4111fcac56278')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/pgadmin3/PKGBUILD b/community/pgadmin3/PKGBUILD
index 3621196b2..c73581bcd 100644
--- a/community/pgadmin3/PKGBUILD
+++ b/community/pgadmin3/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 97013 2013-09-10 10:15:36Z spupykin $
+# $Id: PKGBUILD 97840 2013-09-30 10:03:39Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Douglas Soares de Andrade <dsa@aur.archlinux.org>
 # Contributor: Benjamin Andresen <benny@klapmuetz.org>
@@ -6,13 +6,13 @@
 
 pkgname=pgadmin3
 pkgver=1.18.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Comprehensive design and management interface for PostgreSQL"
 arch=('i686' 'x86_64')
 url="http://www.pgadmin.org"
 license=('custom')
 depends=('wxgtk' 'postgresql-libs' 'libxslt')
-makedepends=('libpqxx' 'krb5' 'postgresql' 'gendesk' 'imagemagick')
+makedepends=('libpqxx' 'krb5' 'postgresql' 'imagemagick')
 _categories="Development;Application"
 source=(http://ftp.postgresql.org/pub/pgadmin3/release/v${pkgver}/src/pgadmin3-${pkgver}.tar.gz)
 md5sums=('ed1968a9abda0064be68bf57d7ccad43')
@@ -21,7 +21,6 @@ build() {
   cd "$srcdir"
   convert pgadmin3-${pkgver}/pgadmin/include/images/pgAdmin3.ico pgadmin3.png
   cp pgadmin3-3.png pgadmin3.png
-  gendesk $startdir/PKGBUILD
 
   cd "pgadmin3-${pkgver}"
   [ -f Makefile ] || ./configure --prefix=/usr
@@ -36,5 +35,5 @@ package() {
   install -Dm644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE
   install -Dm644 pgadmin/include/images/pgAdmin3.ico $pkgdir/usr/share/pgadmin3/pixmaps/pgAdmin3.ico
   install -Dm644 "$srcdir/pgadmin3.png" "$pkgdir/usr/share/pixmaps/pgadmin3.png"
-  install -Dm644 "$srcdir/pgadmin3.desktop" "$pkgdir/usr/share/applications/pgadmin3.desktop"
+  install -Dm644 "pkg/pgadmin3.desktop" "$pkgdir/usr/share/applications/pgadmin3.desktop"
 }
diff --git a/community/plan9port/PKGBUILD b/community/plan9port/PKGBUILD
index 3769cfbd8..00581da7b 100644
--- a/community/plan9port/PKGBUILD
+++ b/community/plan9port/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 97651 2013-09-26 18:54:27Z arodseth $
+# $Id: PKGBUILD 97830 2013-09-30 09:18:30Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: phrakture <aaronmgriffin--gmail--com>
 # Contributor: Fazlul Shahriar
 # Contributor: Chris Brannon <cmbrannon79@gmail.com>
 
 pkgname=plan9port
-pkgver=20130926
+pkgver=20130927
 pkgrel=1
 pkgdesc='Port of many programs from Plan 9 to Unix-like operating systems'
 arch=('x86_64' 'i686')
@@ -18,7 +18,7 @@ install='plan9.install'
 options=('!zipman')
 source=("http://swtch.com/$pkgname/$pkgname-$pkgver.tgz"
         'plan9.sh')
-sha256sums=('9ba90b04bc45bec3e197e6c12f68f270c15ba1a9f68a6051e1f2b99503b6b2a7'
+sha256sums=('580927688ae2df295bf7f78d0ba19588104c6b0403558ffa3cd9ed0b7b110542'
             '0247c4446497359d305aaec069b07180fbf79ce4fa5191464cd9ebb8c7f0228d')
 
 package() {
diff --git a/community/python-pillow/PKGBUILD b/community/python-pillow/PKGBUILD
new file mode 100644
index 000000000..3cf4c2a3c
--- /dev/null
+++ b/community/python-pillow/PKGBUILD
@@ -0,0 +1,68 @@
+# $Id: PKGBUILD 97882 2013-09-30 13:00:41Z bgyorgy $
+# Maintainer: Kyle Keen <keenerd@gmail.com>
+# Contributor: minder
+
+pkgbase=python-pillow
+pkgname=(python-pillow python2-pillow)
+_appname=Pillow
+pkgver=2.1.0
+pkgrel=5
+pkgdesc="Python Imaging Library (PIL) fork. Python3 version."
+arch=('i686' 'x86_64')
+url="http://python-imaging.github.io/"
+license=('BSD')
+makedepends=('python-setuptools' 'python2-setuptools' 'lcms' 'libwebp' 'tk' 'sane')
+# remove pull325.diff on 2.1.1 release, fixes FS#36945
+source=("http://pypi.python.org/packages/source/P/$_appname/$_appname-$pkgver.zip"
+  "pull325.diff")
+md5sums=('ec630d8ae15d4a3c4ae7b7efdeac8200'
+         'aa3fa12bd2d61041f6d01fedddab39fb')
+
+build() {
+  cd "$srcdir"
+  cp -r "$srcdir/$_appname-$pkgver" "$srcdir/${_appname}2-$pkgver"
+}  
+
+package_python-pillow() {
+  depends=('python' 'lcms' 'libwebp')
+  optdepends=('tk: for the ImageTK module'
+              'sane: for the Sane module'
+              'python-pyqt4: for the ImageQt module')
+  cd "$srcdir/$_appname-$pkgver"
+  python3 setup.py install --root="$pkgdir/" --optimize=0
+  pushd Sane
+    python3 setup.py install --root="$pkgdir/" --optimize=0
+  popd
+  install -Dm644 docs/LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+
+  # clean up bins
+  cd "$pkgdir/usr/bin"
+  for f in *.py; do
+    mv "$f" "${f%.py}"
+  done
+}
+
+package_python2-pillow() {
+  pkgdesc="Python Imaging Library (PIL) fork. Python2 version."
+  depends=('python2' 'lcms' 'libwebp')
+  optdepends=('tk: for the ImageTK module'
+              'sane: for the Sane module'
+              'python2-pyqt4: for the ImageQt module')
+  provides=('python-imaging' 'python2-imaging')
+  conflicts=('python-imaging' 'python2-imaging')
+  replaces=('python2-imaging')
+  cd "$srcdir/${_appname}2-$pkgver"
+  patch -Np1 -i ../pull325.diff
+  python2 setup.py install --root="$pkgdir/" --optimize=0
+  pushd Sane
+    python2 setup.py install --root="$pkgdir/" --optimize=0
+  popd
+  install -Dm644 docs/LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+
+  # clean up bins
+  cd "$pkgdir/usr/bin"
+  for f in *.py; do
+    mv "$f" "${f%.py}2"
+  done
+}
+
diff --git a/community/python-pillow/pull325.diff b/community/python-pillow/pull325.diff
new file mode 100644
index 000000000..48b36ab48
--- /dev/null
+++ b/community/python-pillow/pull325.diff
@@ -0,0 +1,38 @@
+diff --git a/PIL/Image.py b/PIL/Image.py
+index bb15aaa..2e120e5 100644
+--- a/PIL/Image.py
++++ b/PIL/Image.py
+@@ -706,7 +706,7 @@ def convert(self, mode=None, data=None, dither=None,
+         if self.mode == "L" and mode == "RGBA" and "transparency" in self.info:
+             from PIL import ImagePalette
+             self.mode = "P"
+-            bytePalette = bytes([i//3 for i in range(768)])
++            bytePalette = bytes(bytearray([i//3 for i in range(768)]))
+             self.palette = ImagePalette.raw("RGB", bytePalette)
+             self.palette.dirty = 1
+             self.load()
+diff --git a/_imaging.c b/_imaging.c
+index 9f48030..84f06e9 100644
+--- a/_imaging.c
++++ b/_imaging.c
+@@ -287,6 +287,7 @@ int PyImaging_GetBuffer(PyObject* buffer, Py_buffer *view)
+ static const char* wrong_raw_mode = "unrecognized raw mode";
+ static const char* outside_image = "image index out of range";
+ static const char* outside_palette = "palette index out of range";
++static const char* wrong_palette_size = "invalid palette size";
+ static const char* no_palette = "image has no palette";
+ static const char* readonly = "image is readonly";
+ /* static const char* no_content = "image has no content"; */
+@@ -1413,6 +1414,11 @@ int PyImaging_GetBuffer(PyObject* buffer, Py_buffer *view)
+     return NULL;
+     }
+ 
++    if ( palettesize * 8 / bits > 256) {
++    PyErr_SetString(PyExc_ValueError, wrong_palette_size);
++    return NULL;
++    }
++
+     ImagingPaletteDelete(self->image->palette);
+ 
+     strcpy(self->image->mode, "P");
+
diff --git a/community/qtcurve-qt4/PKGBUILD b/community/qtcurve-qt4/PKGBUILD
new file mode 100644
index 000000000..078bf49d9
--- /dev/null
+++ b/community/qtcurve-qt4/PKGBUILD
@@ -0,0 +1,35 @@
+# $Id: PKGBUILD 78820 2012-10-25 06:47:28Z foutrelis $
+# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
+# Contributor: Andrea Scarpino <andrea@archlinux.org>
+# Contributor: Pierre Schmitz <pierre@archlinux.de>
+
+pkgname=qtcurve-qt4
+pkgver=1.8.15
+pkgrel=1
+arch=('i686' 'x86_64')
+groups=('qtcurve')
+license=('GPL')
+pkgdesc='A configurable set of widget styles for KDE and Gtk'
+url='https://github.com/QtCurve/qtcurve-qt4'
+depends=('kdebase-workspace')
+makedepends=('cmake' 'automoc4')
+replaces=('qtcurve-kde4')
+source=("${pkgname}-${pkgver}.tar.gz::https://github.com/QtCurve/qtcurve-qt4/archive/${pkgver}.tar.gz")
+md5sums=('ee0b35fe428807b0dc2b0c57e5eb4f38')
+
+build() {
+	cd ${pkgname}-${pkgver}
+
+    sed -i "s/QApplication/QCoreApplication/g" tools/gen_image_header_qt4.cpp
+	mkdir build
+	cd build
+	cmake .. \
+		-DCMAKE_BUILD_TYPE=Release \
+		-DCMAKE_INSTALL_PREFIX=/usr
+	make
+}
+
+package() {
+	cd ${pkgname}-${pkgver}/build
+	make DESTDIR="${pkgdir}" install
+}
diff --git a/community/sk1/PKGBUILD b/community/sk1/PKGBUILD
index ce9d43be2..cdba8f23c 100644
--- a/community/sk1/PKGBUILD
+++ b/community/sk1/PKGBUILD
@@ -1,29 +1,30 @@
-# $Id: PKGBUILD 81608 2012-12-25 00:34:13Z foutrelis $
+# $Id: PKGBUILD 97887 2013-09-30 13:21:30Z bgyorgy $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: ConnorBehan <connor.behan@gmail.com>
 
 pkgname=sk1
 pkgver=0.9.1
-pkgrel=9
+pkgrel=11
 pkgdesc="Fork of skencil with improved CMYK support"
 arch=(i686 x86_64)
 url="http://sk1project.org/modules.php?name=Products&product=sk1"
-depends=('tcl' 'tk' 'python2-lcms' 'pil>=1.0' 'pyxml' 'zenity' 'sk1libs')
+depends=('tcl' 'tk' 'python2-lcms' 'python2-pillow' 'pyxml' 'zenity' 'sk1libs')
 license=('GPL' 'LGPL')
 source=(http://sk1project.org/downloads/sk1/${pkgver}pre_rev905/sK1-${pkgver}pre_rev905.tar.gz
 	sk1.desktop
+        fix_pillow_import.patch
 	build-fix.patch)
-md5sums=('43b82fd85049b078dcf98e9dd81fdc6a'
-         'bbf6f10b8155838eede93b5abed724f5'
-         'b22c3c7b6a979c0a4e59ecaa2bd2182b')
 
-build() {
+package() {
   local _tclver=`pacman -Q tcl`
   local _tclnum=${tclver:4:3}
   local _tcldir='tcl'${tclnum}
 
   cd $srcdir/sK1-${pkgver}pre
 
+  # pillow import fix
+  patch -Np1 -i $srcdir/fix_pillow_import.patch
+
   # python2 fix
   sed -i 's_#! /usr/bin/python_#! /usr/bin/python2_' src/__init__.py
 
@@ -44,3 +45,7 @@ build() {
 
   sed -i 's#^python#python2#' $pkgdir/usr/bin/sk1
 }
+md5sums=('43b82fd85049b078dcf98e9dd81fdc6a'
+         'bbf6f10b8155838eede93b5abed724f5'
+         '4a44dd89707b19fe58f4c124ed321236'
+         'b22c3c7b6a979c0a4e59ecaa2bd2182b')
diff --git a/community/sk1/fix_pillow_import.patch b/community/sk1/fix_pillow_import.patch
new file mode 100644
index 000000000..7306dd3b6
--- /dev/null
+++ b/community/sk1/fix_pillow_import.patch
@@ -0,0 +1,35 @@
+diff -aur sK1-0.9.1pre/src/app/UI/pluginpanels/properties/gradient_fill.py sK1-0.9.1pre.new/src/app/UI/pluginpanels/properties/gradient_fill.py
+--- sK1-0.9.1pre/src/app/UI/pluginpanels/properties/gradient_fill.py	2009-07-16 23:26:15.000000000 +0000
++++ sK1-0.9.1pre.new/src/app/UI/pluginpanels/properties/gradient_fill.py	2013-09-22 09:52:26.543457833 +0000
+@@ -24,7 +24,7 @@
+ 
+ import tooltips
+ 
+-import Image, ImageTk, ImageDraw
++from PIL import Image, ImageTk, ImageDraw
+ 
+ DEFAULT_WIDTH=0.283286
+ DEFAULT_CORNER=const.JoinMiter
+diff -aur sK1-0.9.1pre/src/app/UI/pluginpanels/properties/outlineprop.py sK1-0.9.1pre.new/src/app/UI/pluginpanels/properties/outlineprop.py
+--- sK1-0.9.1pre/src/app/UI/pluginpanels/properties/outlineprop.py	2009-05-15 22:11:39.000000000 +0000
++++ sK1-0.9.1pre.new/src/app/UI/pluginpanels/properties/outlineprop.py	2013-09-22 09:52:13.216885815 +0000
+@@ -24,7 +24,7 @@
+ 
+ import tooltips
+ 
+-import Image, ImageTk, ImageDraw
++from PIL import Image, ImageTk, ImageDraw
+ 
+ DEFAULT_WIDTH=0.283286
+ DEFAULT_CORNER=const.JoinMiter
+diff -aur sK1-0.9.1pre/src/app/UI/widgets/colorbutton.py sK1-0.9.1pre.new/src/app/UI/widgets/colorbutton.py
+--- sK1-0.9.1pre/src/app/UI/widgets/colorbutton.py	2009-04-30 02:58:41.000000000 +0000
++++ sK1-0.9.1pre.new/src/app/UI/widgets/colorbutton.py	2013-09-22 09:52:38.150044124 +0000
+@@ -8,7 +8,7 @@
+ # The color sample size is 31x20 px
+ 
+ from Ttk import TButton
+-import Image, ImageTk
++from PIL import Image, ImageTk
+ 
+ class TColorButton(TButton):
diff --git a/community/uniconvertor/PKGBUILD b/community/uniconvertor/PKGBUILD
index 5a2c6f383..c8efbd281 100644
--- a/community/uniconvertor/PKGBUILD
+++ b/community/uniconvertor/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 78268 2012-10-17 10:27:59Z allan $
+# $Id: PKGBUILD 97864 2013-09-30 10:28:08Z allan $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Roberto Alsina <ralsina@kde.org>
 
 pkgname=uniconvertor
 pkgver=1.1.5
-pkgrel=6
+pkgrel=7
 pkgdesc="A universal vector graphics translator using sK1 engine."
 arch=('i686' 'x86_64')
 url="http://sk1project.org/modules.php?name=Products&product=uniconvertor"
 license=('GPL')
-depends=('python2' 'python2-imaging' 'python2-reportlab' 'sk1libs')
+depends=('python2' 'python2-pillow' 'python2-reportlab' 'sk1libs')
 makedepends=('gcc')
 source=(http://uniconvertor.googlecode.com/files/uniconvertor-$pkgver.tar.gz)
 md5sums=('d1272315a58304ece2ff588834e23f72')
diff --git a/community/xboard/PKGBUILD b/community/xboard/PKGBUILD
index f9687dc57..c84973936 100644
--- a/community/xboard/PKGBUILD
+++ b/community/xboard/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 97605 2013-09-25 13:39:22Z spupykin $
+# $Id: PKGBUILD 97844 2013-09-30 10:04:25Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Jason Chu <jason@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=xboard
 pkgver=4.7.2
-pkgrel=2
+pkgrel=3
 pkgdesc="Graphical user interfaces for chess"
 arch=('i686' 'x86_64')
 url="http://www.gnu.org/software/xboard/"
@@ -13,16 +13,12 @@ license=('GPL3')
 depends=('gnuchess' 'texinfo' 'xdg-utils'
 	 'xorg-fonts-75dpi' 'xorg-fonts-100dpi'
 	 'gtk2' 'cairo' 'librsvg')
-makedepends=('gendesk')
 optdepends=('perl')
 install=${pkgname}.install
 source=("http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz")
 md5sums=('83ec086cbf5c4bc362a188654a9332fc')
 
 build() {
-  cd "${srcdir}"
-  gendesk $startdir/PKGBUILD
-
   cd "${pkgname}-${pkgver}"
   sed -i 's/fairymax/gnuchess/g' {xaw,gtk}/xboard.h xboard.conf.in
   ./configure \
@@ -36,11 +32,7 @@ build() {
 
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-
   make DESTDIR="${pkgdir}" install
-
-  install -Dm644 ${srcdir}/${pkgname}.png \
-    ${pkgdir}/usr/share/pixmaps/${pkgname}.png
   install -Dm755 ${srcdir}/${pkgname}-${pkgver}/cmail \
     ${pkgdir}/usr/bin/cmail
 }
diff --git a/community/xmms2/PKGBUILD b/community/xmms2/PKGBUILD
index e7fa795bb..8d9963c87 100644
--- a/community/xmms2/PKGBUILD
+++ b/community/xmms2/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 94916 2013-08-01 06:55:59Z bpiotrowski $
+# $Id: PKGBUILD 97846 2013-09-30 10:05:03Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=xmms2
 pkgver=0.8DrO_o
-pkgrel=19
+pkgrel=20
 pkgdesc="complete rewrite of the popular music player"
 arch=('i686' 'x86_64')
 url="http://xmms2.org/"
@@ -13,7 +13,7 @@ depends=('sqlite' 'libmad')
 makedepends=('alsa-lib' 'boost' 'curl' 'faad2' 'ffmpeg' 'fftw' 'flac' 'glib'
 	'jack' 'libao' 'libmms' 'libmpcdec' 'libofa' 'libsamplerate' 'libshout'
 	'libdiscid' 'libcdio-paranoia'
-	'libvorbis' 'libxml2' 'mpg123' 'oss' 'perl' 'pulseaudio' 'pyrex'
+	'libvorbis' 'libxml2' 'mpg123' 'perl' 'pulseaudio' 'pyrex'
 	'ruby' 'smbclient' 'speex' 'wavpack' 'libmodplug' 'python' 'python2' 'libgme' 'avahi')
 optdepends=('alsa-lib: ALSA audio output'
 	    'avahi: announce xmms2d via bonjour/mDNS/zeroconf'
@@ -37,7 +37,6 @@ optdepends=('alsa-lib: ALSA audio output'
 	    'libvorbis: Ogg Vorbis support'
 	    'libxml2: XSPF and podcast support'
 	    'mpg123: alternative MP3 plugin'
-	    'oss: OSS audio output'
 	    'perl: Perl language bindings'
 	    'pulseaudio: PulseAudio audio output'
 	    'pyrex: Python language bindings'
diff --git a/community/xosd/PKGBUILD b/community/xosd/PKGBUILD
index 675b532d9..d6f4400d1 100644
--- a/community/xosd/PKGBUILD
+++ b/community/xosd/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 61859 2012-01-09 10:23:17Z spupykin $
+# $Id: PKGBUILD 97848 2013-09-30 10:05:25Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Damir Perisa <damir.perisa@bluewin.ch>
 
 pkgname=xosd
 pkgver=2.2.14
-pkgrel=5
+pkgrel=6
 pkgdesc="Displays text on your screen. On-Screen-Display-libs for some tools"
 arch=('i686' 'x86_64')
 license=('GPL2')
 url="http://www.ignavus.net/software.html"
 depends=('libxt' 'libxinerama' 'sh')
-makedepends=('xmms' 'bmp' 'gdk-pixbuf')
-optdepends=('gdk-pixbuf: for using the bmp or xmms plugin')
+makedepends=('xmms' 'gdk-pixbuf')
+optdepends=('gdk-pixbuf: for using the xmms plugin')
 options=('!libtool')
 source=("http://downloads.sourceforge.net/libxosd/${pkgname}-${pkgver}.tar.gz"
 	"http://ftp.de.debian.org/debian/pool/main/x/xosd/xosd_$pkgver-2.debian.tar.gz")
diff --git a/extra/asymptote/PKGBUILD b/extra/asymptote/PKGBUILD
index eca3192f2..6b289393c 100644
--- a/extra/asymptote/PKGBUILD
+++ b/extra/asymptote/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 191983 2013-08-03 19:18:46Z remy $
+# $Id: PKGBUILD 195314 2013-09-30 10:28:34Z allan $
 # Maintainer: Rémy Oudompheng <remy@archlinux.org>
 # Contributor: Firmicus <francois.archlinux.org>
 # Contributor: bender02 at gmx dot com
 
 pkgname=asymptote
 pkgver=2.24
-pkgrel=1
+pkgrel=2
 pkgdesc="A vector graphics language (like metapost)"
 arch=('i686' 'x86_64')
 url="http://asymptote.sourceforge.net/"
@@ -16,7 +16,7 @@ makedepends=('ghostscript' 'imagemagick'
              'texlive-plainextra' # For texinfo
             )
 optdepends=('python2:           for the xasy GUI'
-            'python-imaging:    for the xasy GUI'
+            'python2-pillow:    for the xasy GUI'
             'tix:               for the xasy GUI')
 source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.src.tgz)
 install=texlive.install
diff --git a/extra/python-geoip/PKGBUILD b/extra/python-geoip/PKGBUILD
index 01ab96af0..dc15efab0 100644
--- a/extra/python-geoip/PKGBUILD
+++ b/extra/python-geoip/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 186477 2013-05-27 11:23:42Z foutrelis $
+# $Id: PKGBUILD 195467 2013-09-30 13:27:17Z jgc $
 # Maintainer:
 # Contributor: Angel Velasquez <angvp@archlinux.org>
 # Contributor: Jan de Groot <jgc@archlinux.org>
@@ -6,7 +6,7 @@
 pkgname=('python2-geoip')
 pkgbase=python-geoip
 pkgver=1.2.8
-pkgrel=1
+pkgrel=2
 pkgdesc="Python bindings for the GeoIP IP-to-country resolver library"
 arch=('i686' 'x86_64')
 url="http://dev.maxmind.com/geoip/legacy/downloadable#Python-10"
@@ -16,12 +16,12 @@ source=(http://www.maxmind.com/download/geoip/api/python/GeoIP-Python-$pkgver.ta
 sha256sums=('8b946307355b60cb0f2b0be8ac90c1231286e0e79917509763267fce01a50e73')
 
 build() {
-  cd "$srcdir/GeoIP-Python-$pkgver"
+  cd "GeoIP-Python-$pkgver"
   python2 setup.py build
 }
 
 package_python2-geoip() {
-  cd "$srcdir/GeoIP-Python-$pkgver"
+  cd "GeoIP-Python-$pkgver"
   python2 setup.py install --root="$pkgdir" -O1
 }
 
diff --git a/extra/rsync/PKGBUILD b/extra/rsync/PKGBUILD
index 9cc142f00..4744ab5b8 100644
--- a/extra/rsync/PKGBUILD
+++ b/extra/rsync/PKGBUILD
@@ -1,18 +1,20 @@
-# $Id: PKGBUILD 185234 2013-05-12 10:36:09Z pierre $
+# $Id: PKGBUILD 195476 2013-09-30 19:07:27Z pierre $
 
 pkgname=rsync
-pkgver=3.0.9
-pkgrel=6
+pkgver=3.1.0
+pkgrel=1
 pkgdesc="A file transfer program to keep remote files in sync"
 arch=('i686' 'x86_64')
 url="http://samba.anu.edu.au/rsync/"
 license=('GPL3')
-depends=('perl')
+depends=('perl' 'popt')
 backup=('etc/rsyncd.conf' 'etc/xinetd.d/rsync')
 source=("http://rsync.samba.org/ftp/rsync/$pkgname-$pkgver.tar.gz"
+        "http://rsync.samba.org/ftp/rsync/$pkgname-$pkgver.tar.gz.asc"
         'rsyncd.conf' 'rsync.xinetd' 'rsyncd.service'
         'rsyncd.socket' 'rsyncd@.service')
-md5sums=('5ee72266fe2c1822333c407e1761b92b'
+md5sums=('3be148772a33224771a8d4d2a028b132'
+         'SKIP'
          'bce64d122a8e0f86872a4a21a03bc7f3'
          'ea3e9277dc908bc51f9eddc0f6b935c1'
          '084140868d38cf3e937a2db716d47c0f'
@@ -21,7 +23,10 @@ md5sums=('5ee72266fe2c1822333c407e1761b92b'
 
 build() {
 	cd "$srcdir/$pkgname-$pkgver"
-	./configure --prefix=/usr --with-included-popt
+	./configure --prefix=/usr \
+		--with-included-popt=no \
+		--with-included-zlib=no \
+		--disable-debug
 	make
 }
 
diff --git a/libre/libretools/PKGBUILD b/libre/libretools/PKGBUILD
index 953cd18b1..9228e28a5 100644
--- a/libre/libretools/PKGBUILD
+++ b/libre/libretools/PKGBUILD
@@ -9,15 +9,15 @@ pkgdesc="Programs for Parabola development"
 url="https://projects.parabolagnulinux.org/packages/libretools.git/"
 license=('GPL3' 'GPL2')
 
-pkgver=20130914
-_libretools_commit=ab8dc8d4204d198f01e1fc7f59498a2794df829f
-_devtools_commit=6fbdc4eb481302541cf8fa282fb3453e4c5d0d16
+pkgver=20130930
+_libretools_commit=1e16e59a861c8359dffe0af5b8dd4d2922f4018e
+_devtools_commit=f566ebf8345cf39f1d50eaa6a679b3ca7088f4eb
 
 _packages_url=https://projects.parabolagnulinux.org/packages
 source=($_packages_url/libretools.git/snapshot/libretools-$_libretools_commit.tar.bz2
 	$_packages_url/devtools-par.git/snapshot/devtools-par-$_devtools_commit.tar.bz2)
 
-pkgrel=1
+pkgrel=2
 arch=('any')
 makedepends=(emacs ronn) # emacs --batch is used during the build to process text
 checkdepends=(sh-roundup)
@@ -83,5 +83,5 @@ package_libretools-mips64el() {
   make install-libretools-mips64el DESTDIR="$pkgdir"
 }
 
-md5sums=('91b1d56254bd61f1266ee2cb20e671a3'
-         'f44ca55997ab9598b7f1a8aeb2379b52')
+md5sums=('134ad4f9d4d8bad135e28c62b9856cda'
+         'a3cc8d8fc2daa370799249a4ea5caafc')