52 files changed, 1261 insertions, 202 deletions
diff --git a/community-staging/ekg2/PKGBUILD b/community-staging/ekg2/PKGBUILD
new file mode 100644
index 000000000..403ec002d
--- /dev/null
+++ b/community-staging/ekg2/PKGBUILD
@@ -0,0 +1,40 @@
+# $Id: PKGBUILD 53828 2011-08-08 16:55:24Z jelle $
+# Maintainer: Mateusz Herych <heniekk@gmail.com>
+
+pkgname=ekg2
+pkgver=0.3.1
+pkgrel=1
+pkgdesc="ncurses based Jabber, Gadu-Gadu, Tlen and IRC client"
+arch=('i686' 'x86_64')
+url="http://ekg2.org/"
+license=('GPL')
+depends=('aspell' 'libjpeg' 'python2' 'libgadu' 'gnutls' 'gpm' 'libidn' 'giflib' 'gpgme')
+optdepends=( 'xosd: for xosd support'
+	         'sqlite3: sqlite support'
+			 'gtk2: gtk support')
+provides=('ekg2-unicode')
+source=(http://pl.ekg2.org/ekg2-$pkgver.tar.gz)
+md5sums=('652e492fcf72281a42c3e5960347516e')
+
+build() {
+  cd $srcdir/$pkgname-$pkgver
+  sed -i 's|ncursesw/ncurses.h|ncurses.h|g' configure plugins/ncurses/ecurses.h
+  ./configure --prefix=/usr \
+	--sysconfdir=/etc \
+  	--with-libgadu \
+  	--with-xosd \
+	--enable-unicode \
+	--enable-shared \
+	--without-gpg
+  make
+}
+
+package() {
+  cd $srcdir/$pkgname-$pkgver
+  make DESTDIR=$pkgdir install
+  rm -rf $pkgdir/usr/lib/perl5/core_perl/perllocal.pod
+  mv $pkgdir/usr/libexec/ioctld $pkgdir/usr/lib/ekg2/ioctld
+  rm -rf $pkgdir/usr/libexec
+  chmod -R 755 $pkgdir/usr/lib/perl5
+}
+md5sums=('68fc05b432c34622df6561eaabef5a40')
diff --git a/community-staging/gtk-gnutella/PKGBUILD b/community-staging/gtk-gnutella/PKGBUILD
new file mode 100644
index 000000000..1eb8c2b0f
--- /dev/null
+++ b/community-staging/gtk-gnutella/PKGBUILD
@@ -0,0 +1,26 @@
+# $Id: PKGBUILD 53764 2011-08-08 05:26:47Z ebelanger $
+# Contributor: Dan McGee <dan@archlinux.org>
+# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
+# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
+
+pkgname=gtk-gnutella
+pkgver=0.97
+pkgrel=2
+pkgdesc="A Gnutella client written in C"
+arch=('i686' 'x86_64')
+url="http://gtk-gnutella.sourceforge.net/"
+license=('GPL')
+depends=('gtk2')
+source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('d44e1af3441fb07a5e5712b0d522fae5')
+sha1sums=('1b50790adc494d7023a7cf9319d7cdef1c9ab51e')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./build.sh --prefix=/usr --gtk2 --disable-dbus
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make install INSTALL_PREFIX="${pkgdir}"
+}
diff --git a/community-staging/ifuse/PKGBUILD b/community-staging/ifuse/PKGBUILD
new file mode 100644
index 000000000..e85372405
--- /dev/null
+++ b/community-staging/ifuse/PKGBUILD
@@ -0,0 +1,28 @@
+# Maintainer: Thomas Dziedzic < gostrc at gmail >
+# Contributor: Gabriel Martinez < reitaka at gmail dot com >
+
+pkgname=ifuse
+pkgver=1.1.1
+pkgrel=4
+pkgdesc='A fuse filesystem to access the contents of an iPhone or iPod Touch'
+url='http://libimobiledevice.org/'
+arch=('i686' 'x86_64')
+license=('LGPL2.1')
+depends=('libimobiledevice' 'fuse')
+source=("http://www.libimobiledevice.org/downloads/${pkgname}-${pkgver}.tar.bz2")
+md5sums=('8d528a79de024b91f12f8ac67965c37c')
+
+build() {
+  cd ${pkgname}-${pkgver}
+
+  ./configure \
+    --prefix=/usr
+
+  make
+}
+
+package() {
+  cd ${pkgname}-${pkgver}
+
+  make DESTDIR=${pkgdir} install
+}
diff --git a/community-staging/jabberd14/PKGBUILD b/community-staging/jabberd14/PKGBUILD
new file mode 100644
index 000000000..fccef817a
--- /dev/null
+++ b/community-staging/jabberd14/PKGBUILD
@@ -0,0 +1,34 @@
+# $Id: PKGBUILD 53845 2011-08-08 21:03:13Z spupykin $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
+
+pkgname=jabberd14
+pkgver=1.6.1.1
+pkgrel=10
+pkgdesc="old (1.4) jabber server branch"
+arch=(i686 x86_64)
+url="http://jabberd.org/"
+license=("GPL")
+depends=(pth libidn expat popt gnutls)
+optdepends=(libmysqlclient)
+conflicts=(jabberd)
+backup=(etc/jabberd/jabber.xml)
+options=('!libtool')
+source=(http://download.jabberd.org/jabberd14/jabberd14-$pkgver.tar.gz
+	build-fix.patch
+	jabberd)
+md5sums=('597c7ee14518ba22b1cee883b4737d87'
+         'ad795626f26c01700a23515e0e75d654'
+         '5869169394d70977858320648075c7a6')
+
+build() {
+  cd $srcdir/jabberd14-$pkgver
+  export LDFLAGS="$LDFLAGS -lgcrypt"
+  [ $NOEXTRACT -eq 1 ] || ./configure --prefix=/usr --enable-ssl --enable-legacy --sysconfdir=/etc/jabberd --localstatedir=/var
+  echo "#undef HAVE_GNUTLS_EXTRA" >>config.h
+  [ $NOEXTRACT -eq 1 ] || patch -Rp1 <$srcdir/build-fix.patch
+  make -j1
+  make DESTDIR=$pkgdir install
+  install -D -m 0755 $srcdir/jabberd $pkgdir/etc/rc.d/jabberd
+  rm -rf $pkgdir/var/run
+}
diff --git a/community-staging/jabberd14/build-fix.patch b/community-staging/jabberd14/build-fix.patch
new file mode 100644
index 000000000..4f39b523e
--- /dev/null
+++ b/community-staging/jabberd14/build-fix.patch
@@ -0,0 +1,84 @@
+diff -wbBur /mnt/temp/builds/staging-i686/sergej/build/src/jabberd14-1.6.1.1/jabberd/lib/xmlnode.cc jabberd14-1.6.1.1/jabberd/lib/xmlnode.cc
+--- /mnt/temp/builds/staging-i686/sergej/build/src/jabberd14-1.6.1.1/jabberd/lib/xmlnode.cc	2011-08-09 00:37:29.000000000 +0400
++++ jabberd14-1.6.1.1/jabberd/lib/xmlnode.cc	2007-04-07 23:43:18.000000000 +0400
+@@ -910,8 +910,8 @@
+     }
+ 
+     /* separate this step from the next one, and check for a predicate in this step */
+-    start_predicate = strchr((char*)path, '[');
+-    next_step = strchr((char*)path, '/');
++    start_predicate = strchr(path, '[');
++    next_step = strchr(path, '/');
+     if (start_predicate == NULL && next_step == NULL) {
+ 	this_step = pstrdup(p, path);
+     } else if (start_predicate == NULL || start_predicate > next_step && next_step != NULL) {
+@@ -1833,8 +1833,7 @@
+     if (lang != NULL && strchr(lang, '-') != NULL) {
+ 	snprintf(general_lang, sizeof(general_lang), "%s", lang);
+ 	if (strchr(lang, '-') != NULL) {
+-	    char *tmp = strchr((char*)lang, '-');
+-	    tmp[0] = 0;
++	    strchr(lang, '-')[0] = 0;
+ 	} else {
+ 	    general_lang[0] = 0;
+ 	}
+diff -wbBur /mnt/temp/builds/staging-i686/sergej/build/src/jabberd14-1.6.1.1/jabberd/log.cc jabberd14-1.6.1.1/jabberd/log.cc
+--- /mnt/temp/builds/staging-i686/sergej/build/src/jabberd14-1.6.1.1/jabberd/log.cc	2011-08-09 00:37:29.000000000 +0400
++++ jabberd14-1.6.1.1/jabberd/log.cc	2007-07-20 17:56:59.000000000 +0400
+@@ -86,7 +86,7 @@
+     char *pos, c = '\0';
+     if(zone != NULL && debug__zones != NULL)
+     {
+-	pos = strchr((char*)zone,'.');
++	pos = strchr(zone,'.');
+         if(pos != NULL)
+         {
+             c = *pos;
+diff -wbBur /mnt/temp/builds/staging-i686/sergej/build/src/jabberd14-1.6.1.1/jabberd/mio_tls.cc jabberd14-1.6.1.1/jabberd/mio_tls.cc
+--- /mnt/temp/builds/staging-i686/sergej/build/src/jabberd14-1.6.1.1/jabberd/mio_tls.cc	2011-08-09 00:53:55.000000000 +0400
++++ jabberd14-1.6.1.1/jabberd/mio_tls.cc	2007-07-17 03:20:44.000000000 +0400
+@@ -43,7 +43,6 @@
+ #include <vector>
+ #include <list>
+ #include <iostream>
+-#include <gnutls/openpgp.h>
+ 
+ // Tell gcrypt that we are using libpth - had to move this to a plain C file
+ extern "C" void mio_tls_gcrypt_init(void);
+@@ -613,8 +612,7 @@
+ 	    }
+ 
+ 	    // load OpenPGP key/certificate
+-//	    ret = gnutls_certificate_set_openpgp_key_file(current_credentials, pubfile, privfile);
+-	    ret = gnutls_certificate_set_openpgp_key_file(current_credentials, pubfile, privfile, GNUTLS_OPENPGP_FMT_BASE64);
++	    ret = gnutls_certificate_set_openpgp_key_file(current_credentials, pubfile, privfile);
+ 	    if (ret < 0) {
+ 		log_error(NULL, "Error loading OpenPGP key pub=%s/priv=%s: %s", pubfile, privfile, gnutls_strerror(ret));
+ 		continue;
+@@ -633,8 +631,7 @@
+ 	    }
+ 
+ 	    // load the OpenPGP keyring
+-//	    ret = gnutls_certificate_set_openpgp_keyring_file(current_credentials, file);
+-	    ret = gnutls_certificate_set_openpgp_keyring_file(current_credentials, file, GNUTLS_OPENPGP_FMT_BASE64);
++	    ret = gnutls_certificate_set_openpgp_keyring_file(current_credentials, file);
+ 	    if (ret < 0) {
+ 		log_error(NULL, "Error loading OpenPGP keyring %s: %s", file, gnutls_strerror(ret));
+ 		continue;
+@@ -643,8 +640,6 @@
+ 	    continue;
+ 	}
+ 
+-
+-/*
+ 	// load GnuPG trustdb
+ 	if (j_strcmp(xmlnode_get_localname(cur), "trustdb") == 0) {
+ 	    char const *const file = xmlnode_get_data(cur);
+@@ -661,7 +656,6 @@
+ 		continue;
+ 	    }
+ 	}
+-*/
+ 
+ 	// setup protocols to use
+ 	if (j_strcmp(xmlnode_get_localname(cur), "protocols") == 0) {
diff --git a/community-staging/jabberd14/jabberd b/community-staging/jabberd14/jabberd
new file mode 100644
index 000000000..afbe6ef69
--- /dev/null
+++ b/community-staging/jabberd14/jabberd
@@ -0,0 +1,58 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+get_pid() {
+	pidof /usr/bin/jabberd
+}
+
+case "$1" in
+  start)
+    stat_busy "Starting Jabber daemon"
+
+    [ -d /var/run/jabberd ] || mkdir -p /var/run/jabberd
+    [ -f /var/run/jabberd/jabber.pid ] && rm -f /var/run/jabberd/jabber.pid
+    PID=`get_pid`
+    if [ -z "$PID" ]; then
+       /usr/bin/jabberd -c /etc/jabberd/jabber.xml -B >/dev/null 2>/dev/null
+      if [ $? -gt 0 ]; then
+        stat_fail
+        exit 1
+      else
+        sleep 1 # wait on children
+        echo `get_pid` > /var/run/jabberd/jabberd.pid
+        add_daemon jabberd
+  	sleep 1
+        stat_done
+      fi
+    else
+      stat_fail
+      exit 1
+    fi
+    ;;
+
+  stop)
+    stat_busy "Stopping Jabber daemon"
+    PID=`get_pid`
+    [ ! -z "$PID" ] && kill $PID &> /dev/null
+    sleep 2
+    if [ $? -gt 0 ]; then
+      stat_fail
+      exit 1
+    else
+      rm -f /var/run/jabberd/jabberd.pid &> /dev/null
+      rm_daemon jabberd
+      stat_done
+    fi
+    ;;
+
+  restart)
+    $0 stop
+    sleep 3
+    $0 start
+    ;;
+  *)
+    echo "usage: $0 {start|stop|restart}"  
+esac
+exit 0
diff --git a/community-staging/net6/PKGBUILD b/community-staging/net6/PKGBUILD
new file mode 100644
index 000000000..1d5a6e025
--- /dev/null
+++ b/community-staging/net6/PKGBUILD
@@ -0,0 +1,26 @@
+# $Id: PKGBUILD 53842 2011-08-08 20:25:54Z spupykin $
+# Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve> 
+# Contributor: William Rea <sillywilly@gmail.com>
+# Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+
+pkgname=net6
+pkgver=1.3.12
+pkgrel=2
+pkgdesc="A library that provides a TCP protocol abstraction for C++"
+arch=('i686' 'x86_64')
+url="http://gobby.0x539.de/"
+license=('LGPL')
+depends=('gnutls' 'libsigc++2.0')
+options=('!libtool')
+source=(http://releases.0x539.de/$pkgname/$pkgname-$pkgver.tar.gz
+	build-fix.patch)
+md5sums=('506776416d8aea2b9ea13a81f9145383'
+         '18ac67590d6bce0a0a4a6a21af8da429')
+
+build() {
+  cd ${srcdir}/$pkgname-$pkgver
+  patch -Rp1 <$srcdir/build-fix.patch
+  ./configure --prefix=/usr
+  make
+  make DESTDIR=${pkgdir} install
+}
diff --git a/community-staging/net6/build-fix.patch b/community-staging/net6/build-fix.patch
new file mode 100644
index 000000000..7e932bce6
--- /dev/null
+++ b/community-staging/net6/build-fix.patch
@@ -0,0 +1,24 @@
+diff -wbBur /mnt/temp/builds/staging-i686/sergej/build/src/net6-1.3.12/inc/encrypt.hpp net6-1.3.12/inc/encrypt.hpp
+--- /mnt/temp/builds/staging-i686/sergej/build/src/net6-1.3.12/inc/encrypt.hpp	2011-08-09 00:19:29.000000000 +0400
++++ net6-1.3.12/inc/encrypt.hpp	2009-11-15 16:02:46.000000000 +0300
+@@ -34,7 +34,7 @@
+ typedef gnutls_anon_server_credentials gnutls_anon_server_credentials_t;
+ typedef gnutls_transport_ptr gnutls_transport_ptr_t;
+ typedef gnutls_dh_params gnutls_dh_params_t;
+-//typedef gnutls_connection_end gnutls_connection_end_t;
++typedef gnutls_connection_end gnutls_connection_end_t;
+ 
+ class dh_params: private net6::non_copyable
+ {
+diff -wbBur /mnt/temp/builds/staging-i686/sergej/build/src/net6-1.3.12/src/encrypt.cpp net6-1.3.12/src/encrypt.cpp
+--- /mnt/temp/builds/staging-i686/sergej/build/src/net6-1.3.12/src/encrypt.cpp	2011-08-09 00:20:12.000000000 +0400
++++ net6-1.3.12/src/encrypt.cpp	2009-11-15 16:02:46.000000000 +0300
+@@ -25,7 +25,7 @@
+ {
+ 	const unsigned int DH_BITS = 1024;
+ 
+-	net6::gnutls_session_t create_session(gnutls_connection_end_t end)
++	net6::gnutls_session_t create_session(net6::gnutls_connection_end_t end)
+ 	{
+ 		net6::gnutls_session_t session;
+ 		gnutls_init(&session, end);
diff --git a/community-staging/nzbget/ChangeLog b/community-staging/nzbget/ChangeLog
new file mode 100644
index 000000000..74030cd3d
--- /dev/null
+++ b/community-staging/nzbget/ChangeLog
@@ -0,0 +1,18 @@
+2010-05-12 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+	* Fixed FS#19399 - missing postprocess-example.conf file
+
+2010-05-04 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+	* Update to major release 0.7.0
+
+2009-10-11 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+	* Dependency added (gnutls) in v0.6.0-2 
+
+2008-03-20 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+	* Update to major release 0.6.0
+
+2008-09-25 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+	* Update to major release 0.5.1
+
+2008-09-09 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+	* Package moved to [community]
+	* Update to major release 0.5.0
diff --git a/community-staging/nzbget/PKGBUILD b/community-staging/nzbget/PKGBUILD
new file mode 100644
index 000000000..278e38ac8
--- /dev/null
+++ b/community-staging/nzbget/PKGBUILD
@@ -0,0 +1,33 @@
+# $Id: PKGBUILD 53834 2011-08-08 19:30:16Z jelle $
+# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+
+pkgname=nzbget
+pkgver=0.7.0
+pkgrel=3
+pkgdesc="Downloads from Usenet using .nzb files"
+arch=('i686' 'x86_64')
+url="http://nzbget.sourceforge.net/"
+license=('GPL')
+depends=('gnutls' 'libpar2' 'libxml2' 'ncurses')
+makedepends=('autoconf' 'automake')
+source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz)
+md5sums=('27971846aba75f5e312d80dce7edbc5d')
+
+build() {
+  cd ${srcdir}/$pkgname-$pkgver
+
+#  autoreconf -fi || return 1
+#uudeview ("uulib") has been removed, and "it did not work well anyway"
+  ./configure --prefix=/usr --enable-parcheck || return 1
+  make 
+}
+package() {
+  cd ${srcdir}/$pkgname-$pkgver
+  make DESTDIR=${pkgdir} install
+
+#other files
+  install -d ${pkgdir}/usr/share/$pkgname || return 1
+  install -m644 -t ${pkgdir}/usr/share/$pkgname \
+    AUTHORS postprocess-example.sh postprocess-example.conf \
+    ChangeLog nzbget.conf.example README || return 1
+}
diff --git a/community-staging/smalltalk/PKGBUILD b/community-staging/smalltalk/PKGBUILD
new file mode 100644
index 000000000..1be6f7500
--- /dev/null
+++ b/community-staging/smalltalk/PKGBUILD
@@ -0,0 +1,42 @@
+# $Id: PKGBUILD 53831 2011-08-08 19:25:38Z jelle $
+# Maintainer: Kaiting Chen <kaitocracy@gmail.com>
+# Contributor: mrshpot <mrshpot at gmail dot com>
+# Contributor: Michael Fellinger <m.fellinger@gmail.com>
+
+pkgname=smalltalk
+pkgver=3.2.4
+pkgrel=2
+pkgdesc='A free implementation of Smalltalk-80 by the GNU project'
+url='http://smalltalk.gnu.org/'
+license=('GPL' 'LGPL')
+arch=('i686' 'x86_64')
+options=('!libtool')
+
+depends=('gmp' 'libffi' 'libsigsegv' 'readline')
+makedepends=('gdbm' 'gtk2' 'sqlite3' 'tk' 'zip')
+
+source=("ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz")
+md5sums=('a36a7c9beddca08dc492b500738efc82')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  ./configure --prefix=/usr \
+    --libexecdir=/usr/lib/smalltalk \
+    --with-imagedir=/var/lib/smalltalk \
+    --enable-gtk=yes \
+    --with-system-libffi \
+    --with-system-libsigsegv \
+    --with-readline \
+    --with-tcl --with-tk \
+    --with-x --without-emacs
+  make
+}
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="$pkgdir" install
+
+  # fix manpage symlink
+  rm -f $pkgdir/usr/share/man/man1/gst-reload.1
+  ln -s gst-load.1 $pkgdir/usr/share/man/man1/gst-reload.1
+}
diff --git a/community/cdfs/PKGBUILD b/community/cdfs/PKGBUILD
index 891e3d14f..dc31bc915 100644
--- a/community/cdfs/PKGBUILD
+++ b/community/cdfs/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 52427 2011-07-25 09:33:20Z spupykin $
+# $Id: PKGBUILD 53785 2011-08-08 08:18:16Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: J. Santiago Hirschfeld <jsantiagoh@yahoo.com.ar>
 
 pkgname=cdfs
 pkgver=2.6.27
-pkgrel=15
+pkgrel=16
 pkgdesc="File system module that 'exports' all tracks and boot images on a CD as normal files."
 arch=(i686 x86_64)
 url="http://www.elis.UGent.be/~ronsse/cdfs/"
diff --git a/community/fpc/Makefile-mk382.diff b/community/fpc/Makefile-mk382.diff
new file mode 100644
index 000000000..00909766d
--- /dev/null
+++ b/community/fpc/Makefile-mk382.diff
@@ -0,0 +1,174 @@
+--- Makefile.fpc.orig	2011-04-02 01:15:34.000000000 +0400
++++ Makefile.fpc	2011-08-05 22:29:44.000000000 +0400
+@@ -4,7 +4,7 @@
+ 
+ [package]
+ name=compiler
+-version=2.4.4
++version=2.5.1
+ 
+ [target]
+ programs=pp
+@@ -32,7 +32,7 @@
+ unexport FPC_VERSION FPC_COMPILERINFO
+ 
+ # Which platforms are ready for inclusion in the cycle
+-CYCLETARGETS=i386 powerpc sparc arm x86_64 powerpc64 m68k armeb # mipsel mips
++CYCLETARGETS=i386 powerpc sparc arm x86_64 powerpc64 m68k armeb mipsel mips avr
+ 
+ # All supported targets used for clean
+ ALLTARGETS=$(CYCLETARGETS)
+@@ -148,6 +148,12 @@
+ ifeq ($(CPC_TARGET),arm)
+ CPUSUF=arm
+ endif
++ifeq ($(CPC_TARGET),mips)
++CPUSUF=mips
++endif
++ifeq ($(CPC_TARGET),mipsel)
++CPUSUF=mipsel
++endif
+ 
+ # Do not define the default -d$(CPU_TARGET) because that
+ # will conflict with our -d$(CPC_TARGET)
+@@ -224,12 +230,39 @@
+ override LOCALOPT+=
+ endif
+ 
++# mipsel specific
++ifeq ($(PPC_TARGET),mipsel)
++override LOCALOPT+=-Fumips
++endif
++
++
++OPTWPOCOLLECT=-OWdevirtcalls,optvmts -FW$(BASEDIR)/pp1.wpo
++OPTWPOPERFORM=-Owdevirtcalls,optvmts -Fw$(BASEDIR)/pp1.wpo
++# symbol liveness WPO requires nm, smart linking and no stripping (the latter
++# is forced by the Makefile when necessary)
++ifneq ($(findstring $(OS_TARGET),darwin linux freebsd solaris),)
++ifdef LINKSMART
++ifdef CREATESMART
++OPTWPOCOLLECT+=-OWsymbolliveness -Xs-
++OPTWPOPERFORM+=-Owsymbolliveness
++endif
++endif
++endif
++
++
+ [rules]
+ #####################################################################
+ # Setup Targets
+ #####################################################################
+ 
+ ifeq ($(OS_TARGET),win32)
++USE_CMP_FOR_DIFF=1
++endif
++ifeq ($(OS_TARGET),win64)
++USE_CMP_FOR_DIFF=1
++endif
++
++ifdef USE_CMP_FOR_DIFF
+ ifdef CMP
+ override DIFF:=$(CMP) -i218
+ endif
+@@ -267,6 +300,8 @@
+ TEMPNAME1=ppc1$(EXEEXT)
+ TEMPNAME2=ppc2$(EXEEXT)
+ TEMPNAME3=ppc3$(EXEEXT)
++TEMPWPONAME1=ppcwpo1$(EXEEXT)
++TEMPWPONAME2=ppcwpo2$(EXEEXT)
+ MAKEDEP=ppdep$(EXEEXT)
+ MSG2INC=./msg2inc$(EXEEXT)
+ ifdef CROSSINSTALL
+@@ -327,15 +362,15 @@
+         -$(DEL) $(addsuffix /*$(PPUEXT),$(COMPILERSOURCEDIR))
+ 
+ tempclean:
+-        -$(DEL) $(PPCROSSNAME) $(TEMPNAME) $(TEMPNAME1) $(TEMPNAME2) $(TEMPNAME3) $(MSG2INC)
++        -$(DEL) $(PPCROSSNAME) $(TEMPNAME) $(TEMPNAME1) $(TEMPNAME2) $(TEMPNAME3) $(MSG2INC) pp1.wpo pp2.wpo
+ 
+ execlean :
+-        -$(DEL) ppc386$(EXEEXT) ppcaxp$(EXEEXT) ppc68k$(EXEEXT) ppcx64$(EXEEXT) ppcppc$(EXEEXT) ppcsparc$(EXEEXT) $(EXENAME)
++        -$(DEL) ppc386$(EXEEXT) ppc68k$(EXEEXT) ppcx64$(EXEEXT) ppcppc$(EXEEXT) ppcsparc$(EXEEXT) ppcppc64$(EXEEXT) ppcarm$(EXEEXT) ppcmips$(EXEEXT) ppcmipsel$(EXEEXT) $(EXENAME) $(TEMPWPONAME1) $(TEMPWPONAME2)
+ 
+ $(addsuffix _clean,$(ALLTARGETS)):
+         -$(DELTREE) $(addprefix $(subst _clean,,$@),/units)
+         -$(DEL) $(addprefix $(subst _clean,,$@)/,*$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIBEXT) *$(SHAREDLIBEXT) *$(PPLEXT))
+-        -$(DEL) $(addprefix $(subst _clean,,$@)/,ppc386$(EXEEXT) ppcaxp$(EXEEXT) ppc68k$(EXEEXT) ppcx64$(EXEEXT) ppcppc$(EXEEXT) ppcppc$(EXEEXT) $(EXENAME))
++        -$(DEL) $(addprefix $(subst _clean,,$@)/,ppc386$(EXEEXT) ppc68k$(EXEEXT) ppcx64$(EXEEXT) ppcppc$(EXEEXT) ppcsparc$(EXEEXT) ppcppc64$(EXEEXT) ppcarm$(EXEEXT) ppcmips$(EXEEXT) ppcmipsel$(EXEEXT) $(EXENAME))
+ 
+ cycleclean: cleanall $(addsuffix _clean,$(CPC_TARGET))
+         -$(DEL) $(EXENAME)
+@@ -444,6 +479,28 @@
+ # Normal cycle
+ #
+ 
++ifndef NOWPOCYCLE
++ifdef RELEASE
++DOWPOCYCLE=1
++# Two WPO cycles in case of RELEASE=1
++wpocycle:
++# don't use cycle_clean, it will delete the compiler utilities again
++        $(RM) $(EXENAME)
++        $(MAKE) 'FPC=$(BASEDIR)/$(TEMPNAME3)' 'OPT=$(LOCALOPT) $(OPTWPOCOLLECT)' compiler
++        $(RM) $(EXENAME)
++        $(MAKE) 'FPC=$(BASEDIR)/$(TEMPNAME3)' 'OPT=$(RTLOPT) $(OPTWPOPERFORM)' rtlclean rtl
++        $(MAKE) 'FPC=$(BASEDIR)/$(TEMPNAME3)' 'OPT=$(LOCALOPT) $(OPTWPOPERFORM) $(subst pp1.wpo,pp2.wpo,$(OPTWPOCOLLECT))' $(addsuffix _clean,$(ALLTARGETS)) compiler
++        $(MOVE) $(EXENAME) $(TEMPWPONAME1)
++        $(MAKE) 'FPC=$(BASEDIR)/$(TEMPWPONAME1)' 'OPT=$(RTLOPT) $(subst pp1.wpo,pp2.wpo,$(OPTWPOPERFORM))' rtlclean rtl
++        $(MAKE) 'FPC=$(BASEDIR)/$(TEMPWPONAME1)' 'OPT=$(LOCALOPT) $(subst pp1.wpo,pp2.wpo,$(OPTWPOPERFORM))' $(addsuffix _clean,$(ALLTARGETS)) compiler
++        $(COPY) $(EXENAME) $(TEMPWPONAME2)
++endif
++endif
++
++ifndef DOWPOCYCLE
++wpocycle:
++endif
++
+ # Used to avoid unnecessary steps
+ ifdef DIFF
+ ifdef OLDFPC
+@@ -490,6 +547,7 @@
+         $(MAKE) 'FPC=$(BASEDIR)/$(TEMPNAME3)' 'OLDFPC=$(BASEDIR)/$(TEMPNAME2)' next
+         $(DIFF) $(TEMPNAME3) $(EXENAME)
+         $(MAKE) $(addsuffix _all,$(TARGET_DIRS)) 'FPC=$(BASEDIR)/$(EXENAME)'
++        $(MAKE) wpocycle
+         $(MAKE) echotime
+ 
+ else
+@@ -508,8 +566,11 @@
+ # ppc<ARCH> (target native)
+ ifndef CROSSINSTALL
+         $(MAKE) 'FPC=$(BASEDIR)/$(PPCROSSNAME)' rtlclean rtl
++# building a native compiler for embedded targets is not possible
++ifneq ($(OS_TARGET),embedded)
+         $(MAKE) 'FPC=$(BASEDIR)/$(PPCROSSNAME)' cycleclean compiler
+ endif
++endif
+ 
+ endif
+ 
+@@ -523,10 +584,10 @@
+ # ppc3/ppcXXX = native (skipped for cross installation)
+ #
+ 
++cycle: override FPC=
+ cycle:
+ # ppc (source native)
+ # Clear detected compiler binary, because it can be existing crosscompiler binary, but we need native compiler here
+-override FPC=
+         $(MAKE) OS_TARGET=$(OS_SOURCE) CPU_TARGET=$(CPU_SOURCE) CROSSBINDIR= BINUTILSPREFIX= CROSSCYCLEBOOTSTRAP=1 rtlclean rtl
+         $(MAKE) OS_TARGET=$(OS_SOURCE) CPU_TARGET=$(CPU_SOURCE) EXENAME=$(TEMPNAME) CROSSBINDIR= BINUTILSPREFIX= CROSSCYCLEBOOTSTRAP=1 cycleclean compiler
+ # ppcross<ARCH> (source native)
+@@ -535,8 +596,11 @@
+ # ppc<ARCH> (target native)
+ ifndef CROSSINSTALL
+         $(MAKE) 'FPC=$(BASEDIR)/$(PPCROSSNAME)' 'OPT=$(OPT) $(CROSSOPT)' rtlclean rtl
++# building a native compiler for embedded targets is not possible
++ifneq ($(OS_TARGET),embedded)
+         $(MAKE) 'FPC=$(BASEDIR)/$(PPCROSSNAME)' 'OPT=$(OPT) $(CROSSOPT)' cycleclean compiler
+ endif
++endif
+ 
+ endif
+ 
diff --git a/community/fpc/PKGBUILD b/community/fpc/PKGBUILD
index 16dd11444..6402d9213 100644
--- a/community/fpc/PKGBUILD
+++ b/community/fpc/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 48312 2011-05-31 09:49:30Z spupykin $
+# $Id: PKGBUILD 53775 2011-08-08 08:05:51Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Valeriy Lyasotskiy <onestep@ukr.net>
 # Contributor: Jan Willemson <janwil@hot.ee>
@@ -8,7 +8,7 @@
 
 pkgname=fpc
 pkgver=2.4.4
-pkgrel=1
+pkgrel=3
 pkgdesc="The Free Pascal Compiler is a Turbo Pascal 7.0 and Delphi compatible 32bit Pascal Compiler. It comes with fully TP 7.0 compatible run-time library."
 arch=('i686' 'x86_64')
 url="http://www.freepascal.org/"
@@ -17,18 +17,31 @@ backup=("etc/fpc.cfg")
 depends=(ncurses)
 makedepends=(fpc)
 options=(zipman)
-source=(ftp://ftp.freepascal.org/pub/fpc/dist/$pkgver/source/fpcbuild-$pkgver.tar.gz)
-md5sums=('d069dfd3412bd0d26dcd1b81ac998305')
+source=(ftp://ftp.freepascal.org/pub/fpc/dist/$pkgver/source/fpcbuild-$pkgver.tar.gz
+	Makefile-mk382.diff)
+md5sums=('d069dfd3412bd0d26dcd1b81ac998305'
+         'a2242d261b055d08fa4d70e88ca1d1a7')
 
 build() {
   cd ${srcdir}/fpcbuild-$pkgver
+  pushd fpcsrc/compiler
+  patch -uN Makefile.fpc $srcdir/Makefile-mk382.diff
+  fpcmake -Tall
+  popd
   make NOGDB=1 build
+#  make NOGDB=1 build OS_TARGET=win32 CPU_TARGET=i386
 }
 
 package() {
   cd ${srcdir}/fpcbuild-$pkgver
+
+  export HOME=$srcdir
+
   make -j1 NOGDB=1 PREFIX=${pkgdir}/usr install
 
+#  make NOGDB=1 PREFIX=${pkgdir}/usr crossinstall OS_TARGET=win32 CPU_TARGET=i386
+#  ln -s /usr/lib/fpc/$pkgver/ppcross386 $pkgdir/usr/bin/ppcross386
+
   # install package license
   install -m 755 -d ${pkgdir}/usr/share/licenses/${pkgname}
   install -m 644 fpcsrc/rtl/COPYING.FPC ${pkgdir}/usr/share/licenses/${pkgname}/
diff --git a/community/gnome-system-tools/PKGBUILD b/community/gnome-system-tools/PKGBUILD
index aef106546..fc8daf9aa 100644
--- a/community/gnome-system-tools/PKGBUILD
+++ b/community/gnome-system-tools/PKGBUILD
@@ -1,27 +1,34 @@
-# $Id: PKGBUILD 44473 2011-04-07 19:13:54Z ibiru $
+# $Id: PKGBUILD 53804 2011-08-08 09:59:18Z ibiru $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: Hugo Doria <hugodoria@archlinux-br.org>
 
 pkgname=gnome-system-tools
 pkgver=3.0.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Gnome System Configuration Utilities"
 arch=('i686' 'x86_64')
 url="http://www.gnome.org/projects/gst/"
 license=('GPL')
 options=('!libtool')
 depends=('wireless_tools' 'liboobs' 'nautilus' 'polkit-gnome' 'dconf')
-makedepends=('gnome-doc-utils' 'intltool')
+makedepends=('gnome-doc-utils' 'intltool' 'gnome-common')
 install=gnome-system-tools.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/3.0/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('905df26c02f00a6c2c18706ba3db7eab764e3df6576289e103504aa39a47ae0b')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/3.0/${pkgname}-${pkgver}.tar.bz2
+        po.patch)
+sha256sums=('905df26c02f00a6c2c18706ba3db7eab764e3df6576289e103504aa39a47ae0b'
+            '827c3169ae5060403b3f833b0f9c1d5cefe1d80aa5ade22e2ff7908b1ce1b5ef')
 
 build() {
     cd "${srcdir}/${pkgname}-${pkgver}"
-
+    patch -Np1 -i "${srcdir}/po.patch"
+    gnome-autogen.sh
     ./configure --prefix=/usr  --sysconfdir=/etc \
-	--localstatedir=/var --disable-scrollkeeper --disable-static \
-	--disable-services --disable-schemas-compile
+        --localstatedir=/var --disable-scrollkeeper --disable-static \
+        --disable-services --disable-schemas-compile
     make
+}
+
+package() {
+    cd "${srcdir}/${pkgname}-${pkgver}"
     make DESTDIR="${pkgdir}" install
 }
diff --git a/community/gnome-system-tools/po.patch b/community/gnome-system-tools/po.patch
new file mode 100644
index 000000000..0f89f2605
--- /dev/null
+++ b/community/gnome-system-tools/po.patch
@@ -0,0 +1,14 @@
+diff -Nur gnome-system-tools-3.0.0.orig//configure.in gnome-system-tools-3.0.0/configure.in
+--- gnome-system-tools-3.0.0.orig//configure.in	2011-08-08 09:49:33.514034262 +0000
++++ gnome-system-tools-3.0.0/configure.in	2011-08-08 09:50:06.967688099 +0000
+@@ -161,8 +161,8 @@
+ AM_GNU_GETTEXT([external])
+ AM_GNU_GETTEXT_VERSION([0.17])
+ GETTEXT_PACKAGE=gnome-system-tools
+-AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [gettext package name])
+-AC_SUBST([GETTEXT_PACKAGE], GETTEXT_PACKAGE)
++AC_SUBST(GETTEXT_PACKAGE) # needed by gettext in po directory
++AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE",[fix])
+ 
+ dnl ========================================================
+ dnl END : Translations
diff --git a/community/java-oracle/PKGBUILD b/community/java-oracle/PKGBUILD
index 61cce1d2a..ac8e89a76 100644
--- a/community/java-oracle/PKGBUILD
+++ b/community/java-oracle/PKGBUILD
@@ -10,18 +10,16 @@
 pkgbase=java-oracle
 pkgname=('jre' 'jdk')
 pkgver=7
-pkgrel=2
+pkgrel=3
 arch=('i686' 'x86_64')
   [ "${CARCH}" = 'i686' ]   && _arch='i586'
   [ "${CARCH}" = 'x86_64' ] && _arch='x64'
 url='http://jdk7.java.net/'
 license=('custom')
 source=("http://download.oracle.com/otn-pub/java/jdk/7/jdk-7-linux-${_arch}.tar.gz"
-        'java-control-panel.desktop'
         'java-monitoring-and-management-console.desktop'
         'java-policy-settings.desktop'
         'java-visualvm.desktop'
-        'java-web-start.desktop'
         'jre.profile'
         'jre.profile.csh'
         'jdk.profile'
@@ -31,22 +29,20 @@ source=("http://download.oracle.com/otn-pub/java/jdk/7/jdk-7-linux-${_arch}.tar.
         'javaws-launcher')
 [ "${CARCH}" = 'i686' ] && md5sums=('f97244a104f03731e5ff69f0dd5a9927')
 [ "${CARCH}" = 'x86_64' ] && md5sums=('b3c1ef5faea7b180469c129a49762b64')
-md5sums+=('e4d814c0f310d77ed6990c731bccd0fb'
-          '4bc2b0be93f76ed07b471e3c89eb5a8a'
-          '8e3cec7ab641ec449cabd068be583f5c'
-          '9ba148ebabce8ed3351b813a9a66b6e5'
-          '619ec32235dcfe454234ef4316f8a7cc'
-          '7cd3dc10e7a37468cad4053a067dcd01'
-          'cc90df2df6fe80fab885a80036d420a1'
-          'b83ab5742651b4234b7d2e20785c6693'
-          '6f4cbf332816d2c4e9578ecd1d0dce7f'
-          'a279e195e249000646895d93e199860d'
-          '4bdff6982c66d24a879c424aaac3d04d'
-          '45c15a6b4767288f2f745598455ea2bf')
+md5sums+=('81cf9b716263ba85f0528d3357dccb75'
+         '6614b04176b9b7dfe26f22e9ce846801'
+         'ef27c6d4062f2f97c532a9e893b6adbe'
+         '7cd3dc10e7a37468cad4053a067dcd01'
+         'cc90df2df6fe80fab885a80036d420a1'
+         'b83ab5742651b4234b7d2e20785c6693'
+         '6f4cbf332816d2c4e9578ecd1d0dce7f'
+         'a279e195e249000646895d93e199860d'
+         '4bdff6982c66d24a879c424aaac3d04d'
+         '45c15a6b4767288f2f745598455ea2bf')
 
 package_jre() {
   pkgdesc="Oracle's Java Runtime Environment"
-  depends=('libxtst')
+  depends=('libxtst' 'desktop-file-utils' 'xdg-utils' 'shared-mime-info')
   provides=('java-runtime=7')
   conflicts=('java-runtime')
   install='jre.install'
@@ -55,6 +51,27 @@ package_jre() {
   mkdir -p ${pkgdir}/opt/java
   cp -r jdk1.7.0/jre ${pkgdir}/opt/java
 
+  # move icons to appropriate location
+  install -d ${pkgdir}/usr/share
+  mv ${pkgdir}/opt/java/jre/lib/desktop/icons ${pkgdir}/usr/share
+
+  # install .desktop entries
+  mv ${pkgdir}/opt/java/jre/lib/desktop/applications ${pkgdir}/usr/share
+  # desktop entries
+  install -d ${pkgdir}/usr/share/applications
+  install -m644 \
+    ${srcdir}/java-policy-settings.desktop \
+    ${pkgdir}/usr/share/applications
+
+  # move mime files
+  mv ${pkgdir}/opt/java/jre/lib/desktop/mime ${pkgdir}/usr/share
+
+  # get rid of already installed files
+  rm -r ${pkgdir}/opt/java/jre/plugin/desktop
+  rm -r ${pkgdir}/opt/java/jre/lib/desktop
+
+  # TODO: find out the purpose of ./jre/lib/images/icons
+
   # profiles
   install -D ${srcdir}/jre.profile \
     ${pkgdir}/etc/profile.d/jre.sh
@@ -73,19 +90,20 @@ package_jre() {
 
   # licenses
   install -d ${pkgdir}/usr/share/licenses/jre
-  install -m644 ${pkgdir}/opt/java/jre/COPYRIGHT \
-    ${pkgdir}/usr/share/licenses/jre
-  install -m644 ${pkgdir}/opt/java/jre/LICENSE \
-    ${pkgdir}/usr/share/licenses/jre
-  install -m644 ${pkgdir}/opt/java/jre/THIRDPARTYLICENSEREADME.txt \
+  install -m644 \
+    ${pkgdir}/opt/java/jre/{COPYRIGHT,LICENSE,THIRDPARTYLICENSEREADME.txt} \
     ${pkgdir}/usr/share/licenses/jre
 
-  # Fix system prefs folder FS#18872
-  install -d ${pkgdir}/etc/.java/.systemPrefs
-
   # Clicking a .jnlp file does not launch that file but launch javaws -viewer instead FS#22509
   install ${srcdir}/javaws-launcher \
     ${pkgdir}/opt/java/jre/bin
+  sed \
+    -e 's/Exec=javaws/&-launcher %f/' \
+    -e '/NoDisplay=true/d' \
+    -i ${pkgdir}/usr/share/applications/sun-javaws.desktop
+
+  # Fix system prefs folder FS#18872
+  install -d ${pkgdir}/etc/.java/.systemPrefs
 }
 
 package_jdk() {
@@ -101,14 +119,16 @@ package_jdk() {
 
   # main files
   install -d ${pkgdir}/opt
-  mv jdk1.7.0 ${pkgdir}/opt/java
+  cp -r jdk1.7.0 ${pkgdir}/opt/java
 
-  # cleanup jre folder
-  rm -rf ${pkgdir}/opt/java/jre
+  # remove jre folder provided by the jre package
+  rm -r ${pkgdir}/opt/java/jre
   # can not package src.zip due to international use restrictions for certain countries
   rm ${pkgdir}/opt/java/src.zip
   # remove windows specific batch files
   find ${pkgdir}/opt/java -name '*\.bat' -delete
+  # remove already installed icons, mime and .desktop files provided by jre
+  rm -r ${pkgdir}/opt/java/lib/desktop
 
   # profiles
   install -D ${srcdir}/jdk.profile \
@@ -118,24 +138,15 @@ package_jdk() {
 
   # licenses
   install -d ${pkgdir}/usr/share/licenses/jdk
-  install -m644 ${pkgdir}/opt/java/COPYRIGHT \
-    ${pkgdir}/usr/share/licenses/jdk
-  install -m644 ${pkgdir}/opt/java/LICENSE \
-    ${pkgdir}/usr/share/licenses/jdk
-  install -m644 ${pkgdir}/opt/java/THIRDPARTYLICENSEREADME.txt \
+  install -m644 \
+    ${pkgdir}/opt/java/{COPYRIGHT,LICENSE,THIRDPARTYLICENSEREADME.txt} \
     ${pkgdir}/usr/share/licenses/jdk
 
   # desktop entries
-  install -Dm644 ${srcdir}/java-control-panel.desktop \
-    ${pkgdir}/usr/share/applications/java-control-panel.desktop
-  install -Dm644 ${srcdir}/java-monitoring-and-management-console.desktop \
-    ${pkgdir}/usr/share/applications/java-monitoring-and-management-console.desktop
-  install -Dm644 ${srcdir}/java-policy-settings.desktop \
-    ${pkgdir}/usr/share/applications/java-policy-settings.desktop
-  install -Dm644 ${srcdir}/java-visualvm.desktop \
-    ${pkgdir}/usr/share/applications/java-visualvm.desktop
-  install -Dm644 ${srcdir}/java-web-start.desktop \
-    ${pkgdir}/usr/share/applications/java-web-start.desktop
+  install -d ${pkgdir}/usr/share/applications
+  install -m644 \
+    ${srcdir}/java-{monitoring-and-management-console,visualvm}.desktop \
+    ${pkgdir}/usr/share/applications
 
   # javadb (apache derby) daemon files FS#21186
   install -D ${srcdir}/derby-network-server \
diff --git a/community/java-oracle/java-monitoring-and-management-console.desktop b/community/java-oracle/java-monitoring-and-management-console.desktop
index c0e1e59f6..4de3bd293 100644
--- a/community/java-oracle/java-monitoring-and-management-console.desktop
+++ b/community/java-oracle/java-monitoring-and-management-console.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Exec=/opt/java/bin/jconsole
+Exec=jconsole
 Icon=java
 Name[cs]=Konzole monitorování a správy prostředí Java
 Name=Java Monitoring and Management Console
diff --git a/community/java-oracle/java-policy-settings.desktop b/community/java-oracle/java-policy-settings.desktop
index 1009301b1..0e032258d 100644
--- a/community/java-oracle/java-policy-settings.desktop
+++ b/community/java-oracle/java-policy-settings.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
-Exec=/opt/java/bin/policytool
-Icon=java
+Exec=policytool
+Icon=sun-java.png
 Name[cs]=Nastavení politiky Java aplikací
 Name=Java Policy Settings
 Path=
diff --git a/community/java-oracle/java-visualvm.desktop b/community/java-oracle/java-visualvm.desktop
index 8aa9527c8..f7ad3e324 100644
--- a/community/java-oracle/java-visualvm.desktop
+++ b/community/java-oracle/java-visualvm.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Exec=/opt/java/bin/jvisualvm
+Exec=jvisualvm
 GenericName[cs]=Nástroj pro monitorování a sledování výkonu Java aplikací
 GenericName=Java Monitoring and Performance Monitoring Tool
 Icon=java
diff --git a/community/java-oracle/jdk.install b/community/java-oracle/jdk.install
index abe08b6a0..0d96b6572 100644
--- a/community/java-oracle/jdk.install
+++ b/community/java-oracle/jdk.install
@@ -1,7 +1,16 @@
 post_install() {
+  update-desktop-database -q
   echo "The jdk package is licensed software."
   echo "You MUST read and agree to the license stored in"
-  echo "/opt/java/LICENSE before using it."
+  echo "/usr/share/licenses/jdk/LICENSE before using it."
 
   echo 'Please relogin to include jdk in your PATH'
 }
+
+post_upgrade() {
+  update-desktop-database -q
+}
+
+post_remove() {
+  update-desktop-database -q
+}
diff --git a/community/java-oracle/jre.install b/community/java-oracle/jre.install
index 111da3c2a..573f5f836 100644
--- a/community/java-oracle/jre.install
+++ b/community/java-oracle/jre.install
@@ -1,20 +1,35 @@
 post_install() {
-   echo "The jre package is licensed software."
-	echo "You MUST read and agree to the license stored in"
-	echo "/opt/java/jre/LICENSE before using it."
-	if [ -f /etc/mailcap ] ; then
-		sed -e '/application\/x-java-jnlp-file/d' -i /etc/mailcap
-	fi
-	echo 'application/x-java-jnlp-file;/opt/java/jre/bin/javaws %s' >>/etc/mailcap
+  update-desktop-database -q
+  xdg-icon-resource forceupdate
+  update-mime-database usr/share/mime &> /dev/null
+
+  echo "The jre package is licensed software."
+  echo "You MUST read and agree to the license stored in"
+  echo "/usr/share/licenses/jre/LICENSE before using it."
+
+  if [ -f /etc/mailcap ] ; then
+    sed -e '/application\/x-java-jnlp-file/d' -i /etc/mailcap
+  fi
+  echo 'application/x-java-jnlp-file;/opt/java/jre/bin/javaws %s' >>/etc/mailcap
 
   echo 'Please relogin to include jre in your PATH.'
 }
 
+post_upgrade() {
+  update-desktop-database -q
+  xdg-icon-resource forceupdate
+  update-mime-database usr/share/mime &> /dev/null
+}
+
 post_remove() {
-	mailcap=$(grep -v 'application/x-java-jnlp-file' /etc/mailcap)
-	if [ "$mailcap" != "" ] ; then
-		sed -e '/application\/x-java-jnlp-file/d' -i /etc/mailcap
-	else
-		rm /etc/mailcap
-	fi
+  update-desktop-database -q
+  xdg-icon-resource forceupdate
+  update-mime-database usr/share/mime &> /dev/null
+
+  mailcap=$(grep -v 'application/x-java-jnlp-file' /etc/mailcap)
+  if [ "$mailcap" != "" ] ; then
+    sed -e '/application\/x-java-jnlp-file/d' -i /etc/mailcap
+  else
+    rm /etc/mailcap
+  fi
 }
diff --git a/community/metapixel/PKGBUILD b/community/metapixel/PKGBUILD
new file mode 100644
index 000000000..056f40d52
--- /dev/null
+++ b/community/metapixel/PKGBUILD
@@ -0,0 +1,32 @@
+# $Id: PKGBUILD 53817 2011-08-08 13:44:50Z lfleischer $
+# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
+# Contributor: Daniel Isenmann <daniel.isenmann [at] gmx [dot] de>
+
+pkgname=metapixel
+pkgver=1.0.2
+pkgrel=2
+pkgdesc='A program for generating photomosaics.'
+arch=('i686' 'x86_64')
+url='http://www.complang.tuwien.ac.at/schani/metapixel/'
+license=('GPL')
+depends=('libungif' 'libjpeg' 'libpng' 'perl')
+source=("http://www.complang.tuwien.ac.at/schani/metapixel/files/${pkgname}-${pkgver}.tar.gz"
+        'metapixel-1.0.2-libpng-1.5.patch')
+md5sums=('af5d77d38826756af213a08e3ada9941'
+         '1832a79790b07402735bfeb9f71f36e9')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  sed -i 's/lgif/lungif/g' Makefile
+  sed -ie '58,58d' Makefile
+
+  patch -p1 -i ../metapixel-1.0.2-libpng-1.5.patch
+
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make PREFIX="${pkgdir}/usr" install
+}
diff --git a/community/metapixel/metapixel-1.0.2-libpng-1.5.patch b/community/metapixel/metapixel-1.0.2-libpng-1.5.patch
new file mode 100644
index 000000000..ed787452f
--- /dev/null
+++ b/community/metapixel/metapixel-1.0.2-libpng-1.5.patch
@@ -0,0 +1,174 @@
+--- metapixel-1.0.2.orig/rwimg/rwpng.c
++++ metapixel-1.0.2/rwimg/rwpng.c
+@@ -57,19 +57,39 @@
+     data->end_info = png_create_info_struct(data->png_ptr);
+     assert(data->end_info != 0);
+ 
++#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
++	if (setjmp(png_jmpbuf((data->png_ptr))))
++#else
+     if (setjmp(data->png_ptr->jmpbuf))
++#endif
+ 	assert(0);
+ 
+-    png_init_io(data->png_ptr, data->file);
+-
++#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
++	png_init_io(data->png_ptr, data->file);
++    png_read_info(data->png_ptr, data->info_ptr);
++#else
++	png_init_io(data->png_ptr, data->file);
+     png_read_info(data->png_ptr, data->info_ptr);
++#endif
+ 
++#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
++	*width = png_get_image_width(data->png_ptr, data->info_ptr);
++	*height = png_get_image_height(data->png_ptr, data->info_ptr);
++	{
++		png_byte value = png_get_bit_depth(data->png_ptr, data->info_ptr);
++    	assert(value == 8 || value == 16);
++		value = png_get_color_type(data->png_ptr, data->info_ptr);
++    	assert(value == PNG_COLOR_TYPE_RGB || value == PNG_COLOR_TYPE_RGB_ALPHA);
++    	value = png_get_interlace_type(data->png_ptr, data->info_ptr);
++    	assert(value == PNG_INTERLACE_NONE);
++	}
++#else
+     *width = data->info_ptr->width;
+     *height = data->info_ptr->height;
+-
+     assert(data->info_ptr->bit_depth == 8 || data->info_ptr->bit_depth == 16);
+     assert(data->info_ptr->color_type == PNG_COLOR_TYPE_RGB || data->info_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA);
+     assert(data->info_ptr->interlace_type == PNG_INTERLACE_NONE);
++#endif
+ 
+     data->have_read = 0;
+ 
+@@ -81,32 +101,51 @@
+ {
+     png_data_t *data = (png_data_t*)_data;
+     int i;
+-    int bps, spp;
++    int bps, spp, width;
+     unsigned char *row;
+ 
++#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
++
++	if (setjmp(png_jmpbuf((data->png_ptr))))
++#else
+     if (setjmp(data->png_ptr->jmpbuf))
++#endif
+ 	assert(0);
+ 
++#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
++	if(png_get_color_type(data->png_ptr, data->info_ptr) == PNG_COLOR_TYPE_RGB)
++#else
+     if (data->info_ptr->color_type == PNG_COLOR_TYPE_RGB)
++#endif
+ 	spp = 3;
+     else
+ 	spp = 4;
+ 
++#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
++	if(png_get_bit_depth(data->png_ptr, data->info_ptr) == 16)
++#else
+     if (data->info_ptr->bit_depth == 16)
++#endif
+ 	bps = 2;
+     else
+ 	bps = 1;
+ 
+-    row = (unsigned char*)malloc(data->info_ptr->width * spp * bps);
++#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
++	width = png_get_image_width(data->png_ptr, data->info_ptr);
++#else
++    width = data->info_ptr->width:
++#endif
++
++    row = (unsigned char*)malloc(width * spp * bps);
+ 
+     for (i = 0; i < num_lines; ++i)
+     {
+ 	int j, channel;
+ 
+ 	png_read_row(data->png_ptr, (png_bytep)row, 0);
+-	for (j = 0; j < data->info_ptr->width; ++j)
++	for (j = 0; j < width; ++j)
+ 	    for (channel = 0; channel < 3; ++channel)
+-		lines[i * data->info_ptr->width * 3 + j * 3 + channel] = row[j * spp * bps + channel * bps];
++		lines[i * width * 3 + j * 3 + channel] = row[j * spp * bps + channel * bps];
+     }
+ 
+     free(row);
+@@ -119,7 +158,11 @@
+ {
+     png_data_t *data = (png_data_t*)_data;
+ 
++#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
++	if (setjmp(png_jmpbuf((data->png_ptr))))
++#else
+     if (setjmp(data->png_ptr->jmpbuf))
++#endif
+ 	assert(0);
+ 
+     if (data->have_read)
+@@ -148,7 +191,11 @@
+     data->info_ptr = png_create_info_struct(data->png_ptr);
+     assert(data->info_ptr != 0);
+ 
++#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
++	if (setjmp(png_jmpbuf((data->png_ptr))))
++#else
+     if (setjmp(data->png_ptr->jmpbuf))
++#endif
+ 	assert(0);
+ 
+     if (pixel_stride == 4)
+@@ -156,6 +203,16 @@
+ 
+     png_init_io(data->png_ptr, data->file);
+ 
++#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
++	png_set_IHDR(data->png_ptr, data->info_ptr,
++		width, height, 8, PNG_COLOR_TYPE_RGB, PNG_INTERLACE_NONE,
++		PNG_COMPRESSION_TYPE_DEFAULT, PNG_FILTER_TYPE_DEFAULT);
++
++	/* Maybe does not need following. */
++	png_set_tRNS(data->png_ptr, data->info_ptr, NULL, 0, NULL);
++	png_set_PLTE(data->png_ptr, data->info_ptr, NULL, 0);
++	png_set_invalid(data->png_ptr, data->info_ptr, 0);
++#else
+     data->info_ptr->width = width;
+     data->info_ptr->height = height;
+     data->info_ptr->valid = 0;
+@@ -168,6 +225,7 @@
+     data->info_ptr->compression_type = PNG_COMPRESSION_TYPE_DEFAULT;
+     data->info_ptr->filter_type = PNG_FILTER_TYPE_DEFAULT;
+     data->info_ptr->interlace_type = PNG_INTERLACE_NONE;
++#endif
+ 
+     png_write_info(data->png_ptr, data->info_ptr);
+ 
+@@ -182,7 +240,11 @@
+     png_data_t *data = (png_data_t*)_data;
+     int i;
+ 
++#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
++	if (setjmp(png_jmpbuf((data->png_ptr))))
++#else
+     if (setjmp(data->png_ptr->jmpbuf))
++#endif
+ 	assert(0);
+ 
+     for (i = 0; i < num_lines; ++i)
+@@ -194,7 +256,11 @@
+ {
+     png_data_t *data = (png_data_t*)_data;
+ 
++#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
++	if (setjmp(png_jmpbuf((data->png_ptr))))
++#else
+     if (setjmp(data->png_ptr->jmpbuf))
++#endif
+ 	assert(0);
+ 
+     png_write_end(data->png_ptr, data->info_ptr);
diff --git a/community/open-vm-tools-modules/PKGBUILD b/community/open-vm-tools-modules/PKGBUILD
index 449f8d6cf..7240ccc97 100644
--- a/community/open-vm-tools-modules/PKGBUILD
+++ b/community/open-vm-tools-modules/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 52418 2011-07-24 20:40:05Z spupykin $
+# $Id: PKGBUILD 53790 2011-08-08 08:19:14Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Krzysztof Raczkowski <raczkow@gmail.com>
 
 pkgname=open-vm-tools-modules
 pkgver=2011.07.19
 _pkgsubver=450511
-pkgrel=1
+pkgrel=2
 pkgdesc="The Open Virtual Machine Tools (open-vm-tools) are the open source implementation of VMware Tools"
 arch=('i686' 'x86_64')
 url="http://open-vm-tools.sourceforge.net/"
diff --git a/community/quvi/PKGBUILD b/community/quvi/PKGBUILD
index e6a4f6c98..4194f970b 100644
--- a/community/quvi/PKGBUILD
+++ b/community/quvi/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 52105 2011-07-20 08:21:04Z lfleischer $
+# $Id: PKGBUILD 53820 2011-08-08 14:10:47Z lfleischer $
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: joyfulgirl@archlinux.us
 
 pkgname=quvi
-pkgver=0.2.18
+pkgver=0.2.19
 pkgrel=1
 pkgdesc='Command-line tool for parsing video download links.'
 arch=('i686' 'x86_64')
@@ -12,7 +12,7 @@ license=('LGPL')
 depends=('curl' 'pcre' 'lua')
 options=('!libtool')
 source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz")
-md5sums=('496bb7aad2f449c2a692aa48721b8a4a')
+md5sums=('c96627374377b049ac60e7642eb7f838')
 
 build() {
   cd "${pkgname}-${pkgver}"
diff --git a/community/ruby-atk/PKGBUILD b/community/ruby-atk/PKGBUILD
index d39683e6a..2787f8556 100644
--- a/community/ruby-atk/PKGBUILD
+++ b/community/ruby-atk/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 44814 2011-04-12 01:26:00Z bfanella $
+# $Id: PKGBUILD 53612 2011-08-07 01:11:19Z bfanella $
 # Maintainer: Brad Fanella <bradfanella@archlinux.us>
 # Contributor: Bjorn Lindeijer <bjorn@lindeijer.nl>
 # Contributor: kritoke <kritoke@nospam.gmail.com>
 
 pkgname=ruby-atk
-pkgver=0.90.8
+pkgver=1.0.0
 pkgrel=1
 pkgdesc="Ruby bindings for atk."
 arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ license=('LGPL')
 depends=('ruby-glib2')
 makedepends=('ruby-glib2' 'atk' 'ruby-pkgconfig')
 source=(http://downloads.sourceforge.net/ruby-gnome2/ruby-gtk2-$pkgver.tar.gz)
-md5sums=('74966bde5366bc9d09701e9f464d60c9')
+md5sums=('e9711eb5bd88debda90a920deb96d7d0')
 
 build() {
 	cd "$srcdir/ruby-gtk2-$pkgver"
diff --git a/community/ruby-gdkpixbuf2/PKGBUILD b/community/ruby-gdkpixbuf2/PKGBUILD
index 58cc56824..7298e2339 100644
--- a/community/ruby-gdkpixbuf2/PKGBUILD
+++ b/community/ruby-gdkpixbuf2/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 44824 2011-04-12 01:33:28Z bfanella $
+# $Id: PKGBUILD 53620 2011-08-07 02:18:34Z bfanella $
 # Maintainer: Brad Fanella <bradfanella@archlinux.us>
 # Contributor: Bjorn Lindeijer <bjorn@lindeijer.nl>
 # Contributor: kritoke <kritoke@nospam.gmail.com>
 
 pkgname=ruby-gdkpixbuf2
-pkgver=0.90.8
+pkgver=1.0.0
 pkgrel=1
 pkgdesc="Ruby bindings for gdkpixbuf2."
 arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ license=('LGPL')
 depends=('ruby-glib2' 'gtk2')
 makedepends=('ruby-glib2' 'ruby-pkgconfig')
 source=(http://downloads.sourceforge.net/ruby-gnome2/ruby-gtk2-$pkgver.tar.gz)
-md5sums=('74966bde5366bc9d09701e9f464d60c9')
+md5sums=('e9711eb5bd88debda90a920deb96d7d0')
 
 build() {
 	cd "$srcdir/ruby-gtk2-$pkgver"
diff --git a/community/ruby-gio2/PKGBUILD b/community/ruby-gio2/PKGBUILD
index e4eb57305..297f60085 100644
--- a/community/ruby-gio2/PKGBUILD
+++ b/community/ruby-gio2/PKGBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Brad Fanella <bradfanella@archlinux.us>
 
 pkgname=ruby-gio2
-pkgver=0.90.8
+pkgver=1.0.0
 pkgrel=1
 pkgdesc="Ruby bindings for gio2."
 arch=('i686' 'x86_64')
@@ -11,7 +11,7 @@ license=('LGPL')
 depends=('ruby-glib2')
 makedepends=('ruby-pkgconfig')
 source=(http://downloads.sourceforge.net/ruby-gnome2/ruby-gtk2-$pkgver.tar.gz)
-md5sums=('74966bde5366bc9d09701e9f464d60c9')
+md5sums=('e9711eb5bd88debda90a920deb96d7d0')
 
 build() {
 	cd "$srcdir/ruby-gtk2-$pkgver"
diff --git a/community/ruby-glib2/PKGBUILD b/community/ruby-glib2/PKGBUILD
index 8c885ead8..fb2a1fac3 100644
--- a/community/ruby-glib2/PKGBUILD
+++ b/community/ruby-glib2/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 44809 2011-04-12 00:27:03Z bfanella $
+# $Id: PKGBUILD 53576 2011-08-05 22:47:58Z bfanella $
 # Maintainer: Brad Fanella <bradfanella@archlinux.us>
 # Contributor: Bjorn Lindeijer <bjorn@lindeijer.nl>
 # Contributor: kritoke <kritoke@nospam.gmail.com>
 
 pkgname=ruby-glib2
-pkgver=0.90.8
+pkgver=1.0.0
 pkgrel=1
 pkgdesc="Ruby bindings for glib2."
 arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ license=('LGPL')
 depends=('ruby')
 makedepends=('ruby-pkgconfig')
 source=(http://downloads.sourceforge.net/ruby-gnome2/ruby-gtk2-$pkgver.tar.gz)
-md5sums=('74966bde5366bc9d09701e9f464d60c9')
+md5sums=('e9711eb5bd88debda90a920deb96d7d0')
 
 build() {
 	cd "$srcdir/ruby-gtk2-$pkgver"
diff --git a/community/ruby-gtk2/PKGBUILD b/community/ruby-gtk2/PKGBUILD
index b796f8416..cf6a05af1 100644
--- a/community/ruby-gtk2/PKGBUILD
+++ b/community/ruby-gtk2/PKGBUILD
@@ -1,28 +1,23 @@
-# $Id: PKGBUILD 44925 2011-04-13 00:53:43Z bfanella $
+# $Id: PKGBUILD 53871 2011-08-09 01:21:52Z bfanella $
 # Maintainer: Brad Fanella <bradfanella@archlinux.us>
 # Contributor: Bjorn Lindeijer <bjorn@lindeijer.nl>
 # Contributor: kritoke <kritoke@nospam.gmail.com>
 
 pkgname=ruby-gtk2
-pkgver=0.90.8
-pkgrel=2
+pkgver=1.0.0
+pkgrel=1
 pkgdesc="Ruby bindings for gtk2."
 arch=('i686' 'x86_64')
 url="http://ruby-gnome2.sourceforge.jp"
 license=('LGPL')
 depends=('ruby-glib2' 'ruby-pango' 'ruby-atk' 'ruby-gdkpixbuf2')
 makedepends=('ruby-pkgconfig' 'ruby-cairo')
-source=(http://downloads.sourceforge.net/ruby-gnome2/ruby-gtk2-$pkgver.tar.gz
-	'mkmf-gnome2.patch')
-md5sums=('74966bde5366bc9d09701e9f464d60c9'
-	'5674ec349bec878c36f70102ca7acb0b')
+source=(http://downloads.sourceforge.net/ruby-gnome2/ruby-gtk2-$pkgver.tar.gz)
+md5sums=('e9711eb5bd88debda90a920deb96d7d0')
 
 build() {
 	cd "$srcdir/ruby-gtk2-$pkgver"
 
-	# Apply mkmf-gnome2.patch
-	patch -Np1 glib2/lib/mkmf-gnome2.rb < ${srcdir}/mkmf-gnome2.patch
-
 	export LANG="en_US.UTF-8"
 	ruby extconf.rb gtk2 --topdir=$pkgdir
 	make
diff --git a/community/ruby-pango/PKGBUILD b/community/ruby-pango/PKGBUILD
index fd5e51805..1f20c7a3d 100644
--- a/community/ruby-pango/PKGBUILD
+++ b/community/ruby-pango/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 44819 2011-04-12 01:30:34Z bfanella $
+# $Id: PKGBUILD 53626 2011-08-07 02:29:56Z bfanella $
 # Maintainer: Brad Fanella <bradfanella@archlinux.us>
 # Contributor: Bjorn Lindeijer <bjorn@lindeijer.nl>
 # Contributor: kritoke <kritoke@nospam.gmail.com>
 
 pkgname=ruby-pango
-pkgver=0.90.8
+pkgver=1.0.0
 pkgrel=1
 pkgdesc="Ruby bindings for pango."
 arch=('i686' 'x86_64')
@@ -13,10 +13,10 @@ license=('LGPL')
 depends=('ruby-glib2' 'ruby-cairo')
 makedepends=('ruby-glib2' 'pango' 'ruby-pkgconfig' 'ruby-cairo')
 source=(http://downloads.sourceforge.net/ruby-gnome2/ruby-gtk2-$pkgver.tar.gz)
-md5sums=('74966bde5366bc9d09701e9f464d60c9')
+md5sums=('e9711eb5bd88debda90a920deb96d7d0')
+
 build() {
 	cd "$srcdir/ruby-gtk2-$pkgver"
-
 	ruby extconf.rb pango --topdir=$pkgdir
 	make
 }
diff --git a/community/systemd/PKGBUILD b/community/systemd/PKGBUILD
index 03f85a55d..aafaf1b5f 100644
--- a/community/systemd/PKGBUILD
+++ b/community/systemd/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 53341 2011-08-03 04:06:06Z dreisner $
+# $Id: PKGBUILD 53877 2011-08-09 02:05:40Z dreisner $
 # Maintainer: Dave Reisner <dreisner@archlinux.org>
 
 pkgname=systemd
 pkgver=33
-pkgrel=1
+pkgrel=2
 pkgdesc="Session and Startup manager"
 arch=('i686' 'x86_64')
 url="http://www.freedesktop.org/wiki/Software/systemd"
 license=('GPL2')
-depends=('dbus-core' 'libcap' 'util-linux>=2.19' 'udev>=172')
+depends=('dbus-core' 'kbd' 'libcap' 'util-linux>=2.19' 'udev>=172')
 makedepends=('docbook-xsl' 'libxslt' 'cryptsetup' 'gtk2' 'intltool' 'libnotify' 'gperf')
 optdepends=('cryptsetup: required for encrypted block devices'
             'dbus-python: systemd-analyze'
diff --git a/community/systemd/systemd.install b/community/systemd/systemd.install
index 34f902276..04b29688a 100644
--- a/community/systemd/systemd.install
+++ b/community/systemd/systemd.install
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 checkgroups() {
-  if usr/bin/getent group lock >/dev/null; then
+  if ! usr/bin/getent group lock >/dev/null; then
     usr/sbin/groupadd -g 54 lock
   fi
 }
@@ -13,7 +13,7 @@ sd_booted() {
 post_install() {
   checkgroups
 
-  if [ -f etc/machine-id ]; then
+  if [ ! -f etc/machine-id ]; then
     bin/systemd-machine-id-setup
   fi
 
@@ -24,7 +24,7 @@ post_install() {
 post_upgrade() {
   checkgroups
 
-  if [ -f etc/machine-id ]; then
+  if [ ! -f etc/machine-id ]; then
     bin/systemd-machine-id-setup
   fi
 
@@ -45,7 +45,9 @@ post_upgrade() {
 }
 
 post_remove() {
-  usr/bin/getent group lock >/dev/null && usr/sbin/groupdel lock
+  if usr/bin/getent group lock >/dev/null; then
+    usr/sbin/groupdel lock
+  fi
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/community/tea/PKGBUILD b/community/tea/PKGBUILD
index 3aacd232f..bc3845166 100644
--- a/community/tea/PKGBUILD
+++ b/community/tea/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 50314 2011-06-28 09:33:06Z spupykin $
+# $Id: PKGBUILD 53780 2011-08-08 08:12:58Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Roman Kyrylych <roman@archlinux.org>
@@ -6,7 +6,7 @@
 # Contributor: Zsolt Varadi <sysop_xxl@fibermail.hu>
 
 pkgname=tea
-pkgver=30.0.0
+pkgver=30.1.0
 pkgrel=1
 pkgdesc="A QT-based text editor for Linux and *BSD. With an ultimate small size TEA provides you hundreds of functions."
 arch=('i686' 'x86_64')
@@ -14,9 +14,9 @@ url="http://tea-editor.sourceforge.net/"
 license=('GPL')
 depends=('qt' 'aspell' 'hunspell')
 install=tea.install
-source=(http://downloads.sourceforge.net/tea-editor/${pkgname}-${pkgver}.tar.bz2
+source=(http://downloads.sourceforge.net/project/tea-editor/tea-editor/$pkgver/tea-$pkgver.tar.bz2
         tea.desktop)
-md5sums=('07508b4972403fc7c3a72169700e6157'
+md5sums=('1b6bdadf7cd323f059b0b7b4420e186b'
          '377ace3363124f4c086de0babb820761')
 
 build() {
diff --git a/community/vhba-module/PKGBUILD b/community/vhba-module/PKGBUILD
index 137897a28..5904f5ef7 100644
--- a/community/vhba-module/PKGBUILD
+++ b/community/vhba-module/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 51733 2011-07-13 18:23:43Z schiv $
+# $Id: PKGBUILD 53809 2011-08-08 10:37:58Z jelle $
 # Maintainer: Mateusz Herych <heniekk@gmail.com>
 # Contributor: Charles Lindsay <charles@chaoslizard.org>
 
 pkgname=vhba-module
 pkgver=20110416
-_kernver='2.6.39-ARCH'
-pkgrel=1
+_kernver='3.0-ARCH'
+pkgrel=2
 pkgdesc="Kernel module that emulates SCSI devices"
 arch=('i686' 'x86_64')
 url="http://cdemu.sourceforge.net/"
 license=('GPL2')
-depends=('kernel26>=2.6.39' 'kernel26<2.6.40')
-makedepends=('kernel26-headers>=2.6.39')
+depends=('linux>=3.0' 'linux<3.1')
+makedepends=('linux-headers>=3.0')
 install=vhba-module.install
 source=(http://downloads.sourceforge.net/cdemu/$pkgname-$pkgver.tar.gz)
 md5sums=('2f91dd4ee8648da92d625221d4275b60')
diff --git a/community/virtualbox/PKGBUILD b/community/virtualbox/PKGBUILD
index 9df5a53bf..bfb657eb9 100644
--- a/community/virtualbox/PKGBUILD
+++ b/community/virtualbox/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 53173 2011-07-31 12:12:47Z ibiru $
+# $Id: PKGBUILD 53837 2011-08-08 20:19:32Z ibiru $
 #Maintainer: Ionut Biru <ibiru@archlinux.org>
 pkgbase=virtualbox
 pkgname=('virtualbox' 'virtualbox-archlinux-additions' 'virtualbox-archlinux-modules' 'virtualbox-sdk')
 pkgver=4.1.0
-pkgrel=4
+pkgrel=5
 arch=('i686' 'x86_64')
 url='http://virtualbox.org'
 license=('GPL' 'custom')
@@ -26,7 +26,7 @@ build() {
     patch -Np1 -i "$srcdir/virtualbox-4-mkisofs-check.patch"
     patch -Np1 -i "$srcdir/vboxdrv-reference.patch"
     patch -Np1 -i "$srcdir/change_default_driver_dir.patch"
-    patch -Np0 -i "$srcdir/fix-kernel-panic.patch"
+    patch -Np2 -i "$srcdir/fix-kernel-panic.patch"
 
     cp "$srcdir/LocalConfig.kmk" .
 
@@ -203,6 +203,6 @@ md5sums=('02556a6b4877cfdfbaa3ce0a0c0dcf31'
          'ed1341881437455d9735875ddf455fbe'
          '4cf75d9c091199a47a7a1bc2f4e347d9'
          '78ffa67ff131680f1d2b6f06d4325c5b'
-         'b3de603560b2fb2c33e704e4e8ab3de8'
+         '790a1456345fe74b6b714d71f90a1c6d'
          '97e193f050574dd272a38e5ee5ebe62b'
-         '19b05b85a8a46af5a429b2ab618638cd')
+         '863107a852607b758b356cd53850679d')
diff --git a/community/virtualbox/fix-kernel-panic.patch b/community/virtualbox/fix-kernel-panic.patch
index 237715db2..1f1ea993d 100644
--- a/community/virtualbox/fix-kernel-panic.patch
+++ b/community/virtualbox/fix-kernel-panic.patch
@@ -1,22 +1,11 @@
-Index: src/VBox/Runtime/r0drv/linux/mpnotification-r0drv-linux.c
+Index: /trunk/src/VBox/Runtime/r0drv/linux/mpnotification-r0drv-linux.c
 ===================================================================
---- src/VBox/Runtime/r0drv/linux/mpnotification-r0drv-linux.c	(revision 73165)
-+++ src/VBox/Runtime/r0drv/linux/mpnotification-r0drv-linux.c	(revision 73166)
-@@ -32,6 +32,7 @@
- #include "internal/iprt.h"
- 
- #include <iprt/mp.h>
-+#include <iprt/asm-amd64-x86.h>
- #include <iprt/err.h>
- #include <iprt/cpuset.h>
- #include <iprt/thread.h>
-@@ -82,7 +83,8 @@
-     NOREF(pvUser1);
- 
-     AssertRelease(!RTThreadPreemptIsEnabled(NIL_RTTHREAD));
--    AssertRelease(idCpu == RTMpCpuId());   /* ASSUMES iCpu == RTCPUID */
-+    AssertReleaseMsg(idCpu == RTMpCpuId(),  /* ASSUMES iCpu == RTCPUID */
-+                     ("idCpu=%u RTMpCpuId=%d ApicId=%d\n", idCpu, RTMpCpuId(), ASMGetApicId() ));
- 
-     switch (ulNativeEvent)
-     {
-\ No newline at end of file
+--- /trunk/src/VBox/Runtime/r0drv/linux/mpnotification-r0drv-linux.c (revision 38199)
++++ /trunk/src/VBox/Runtime/r0drv/linux/mpnotification-r0drv-linux.c (revision 38232)
+@@ -78,5 +78,5 @@
+  * @remarks This can be invoked in interrupt context.
+  */
+-static void rtMpNotificationLinuxOnCurrentCpu(RTCPUID idCpu, void *pvUser1, void *pvUser2)
++static DECLCALLBACK(void) rtMpNotificationLinuxOnCurrentCpu(RTCPUID idCpu, void *pvUser1, void *pvUser2)
+ {
+     unsigned long ulNativeEvent = *(unsigned long *)pvUser2;
diff --git a/community/virtualbox/vboxdrv.sh b/community/virtualbox/vboxdrv.sh
index 845f6c769..aace25edf 100755
--- a/community/virtualbox/vboxdrv.sh
+++ b/community/virtualbox/vboxdrv.sh
@@ -21,7 +21,7 @@ fi
 case "$1" in
   setup)
     stat_busy "Unloading VirtualBox kernel modules"
-    for module in vbox{netflt,netadp,drv,pci}; do
+    for module in vbox{pci,netflt,netadp,drv}; do
       if grep -q "^${module}" /proc/modules; then
         MODLIST+=($module)
         modprobe -r $module
diff --git a/extra/ekiga/PKGBUILD b/extra/ekiga/PKGBUILD
index 6a3ab613e..d03b8be5f 100644
--- a/extra/ekiga/PKGBUILD
+++ b/extra/ekiga/PKGBUILD
@@ -1,25 +1,29 @@
-# $Id: PKGBUILD 132764 2011-07-25 20:58:05Z ibiru $
+# $Id: PKGBUILD 134880 2011-08-08 09:42:48Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Tom K <tomk@runbox.com>
 
 pkgname=ekiga
 pkgver=3.3.1
-pkgrel=1
+pkgrel=2
 pkgdesc="VOIP/Videoconferencing app with full SIP and H.323 support (GnomeMeeting expanded and renamed)"
 url="http://www.ekiga.org"
 license=(GPL)
 arch=(i686 x86_64)
 depends=('opal' 'boost-libs' 'libxv' 'libnotify' 'hicolor-icon-theme' 'avahi' 'gtk2' 'gconf')
-makedepends=('intltool' 'gnome-doc-utils' 'evolution-data-server' 'boost')
+makedepends=('intltool' 'gnome-doc-utils' 'evolution-data-server' 'boost' 'gnome-common')
 optdepends=('evolution-data-server: Evolution integration')
 options=(!emptydirs)
 groups=('gnome-extra')
 install=ekiga.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('4776834810f213a93cd6c307108c505970fe22e4803935134dd9f6b0bc834e06')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz
+        fix-generation-po.patch)
+sha256sums=('4776834810f213a93cd6c307108c505970fe22e4803935134dd9f6b0bc834e06'
+            'b87a3a044253f96631dd13453034e14ce4698a9106acf39e5816b8776d0de529')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np1 -i "${srcdir}/fix-generation-po.patch"
+  autoreconf -fi
   ./configure --prefix=/usr --sysconfdir=/etc \
       --localstatedir=/var --disable-schemas-install \
       --disable-scrollkeeper --enable-dbus
diff --git a/extra/ekiga/fix-generation-po.patch b/extra/ekiga/fix-generation-po.patch
new file mode 100644
index 000000000..ebec28433
--- /dev/null
+++ b/extra/ekiga/fix-generation-po.patch
@@ -0,0 +1,24 @@
+From ebd9de96878c224145c0b1d7bf21c7151c0563bf Mon Sep 17 00:00:00 2001
+From: Eugen Dedu <Eugen.Dedu@pu-pm.univ-fcomte.fr>
+Date: Tue, 19 Jul 2011 08:15:52 +0000
+Subject: Fix generation of po translation files
+
+Bug introduced by commit 2bfaf29.
+---
+diff --git a/configure.ac b/configure.ac
+index 63d8685..eefae22 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -770,7 +770,9 @@ AM_CONDITIONAL(DEBUG, test "x$has_debug" = "xyes")
+ dnl #########################################################################
+ dnl  Support for internationalization
+ dnl ########################################################################
+-AC_DEFINE(GETTEXT_PACKAGE, "[AC_PACKAGE_NAME]",[fix])
++GETTEXT_PACKAGE=AC_PACKAGE_NAME
++AC_SUBST(GETTEXT_PACKAGE)  # needed by gettext in po directory
++AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE",[fix])
+ AM_GLIB_GNU_GETTEXT
+ 
+ 
+--
+cgit v0.9
diff --git a/extra/hylafax/PKGBUILD b/extra/hylafax/PKGBUILD
index f0e678297..d0e7ab028 100644
--- a/extra/hylafax/PKGBUILD
+++ b/extra/hylafax/PKGBUILD
@@ -1,7 +1,7 @@
-# $Id: PKGBUILD 62528 2010-01-09 20:34:27Z tpowa $
+# $Id: PKGBUILD 134870 2011-08-08 08:29:49Z tpowa $
 # Maintainer: Paul Mattal <paul@archlinux.org>
 pkgname=hylafax
-pkgver=6.0.4
+pkgver=6.0.5
 pkgrel=1
 pkgdesc="Fax Server"
 arch=('i686' 'x86_64')
@@ -10,12 +10,14 @@ license=('custom')
 depends=('libtiff' 'pam' 'ghostscript')
 makedepends=('smtp-server')
 url="http://www.hylafax.org/"
-backup=(var/spool/hylafax/bin/{faxrcvd,notify} \
-	usr/lib/fax/{faxcover.ps,hfaxd.conf,pagesizes,typerules} \
+backup=(var/spool/hylafax/bin/{faxrcvd,notify}
+	usr/lib/fax/{faxcover.ps,hfaxd.conf,pagesizes,typerules}
 	var/spool/hylafax/etc/hosts.hfaxd) 
-source=(ftp://ftp.hylafax.org/source/${pkgname}-${pkgver}.tar.gz hylafax \
-        hylafax.cron.daily config.local)
-options=('!makeflags')
+source=(ftp://ftp.hylafax.org/source/${pkgname}-${pkgver}.tar.gz 
+        hylafax 
+        hylafax.cron.daily 
+        config.local
+        configure-6.0.5.patch)
 
 # build as root for successful build!
 build() {
@@ -26,16 +28,22 @@ build() {
     useradd -u 10 -g uucp -d '/' -s /bin/false uucp &>/dev/null
     useradd -u 69 -g daemon -d '/' -s /bin/false fax &>/dev/null
   fi
-  mkdir -p $pkgdir/usr/{bin,lib/fax,sbin,share/ghostscript/fonts} || return 1
-  mkdir -p $pkgdir/var/{spool/hylafax,lock} || return 1
-  cd $srcdir/${pkgname}-${pkgver} || return 1
+  mkdir -p $pkgdir/usr/{bin,lib/fax,sbin,share/ghostscript/fonts}
+  mkdir -p $pkgdir/var/{spool/hylafax,lock}
+  cd $srcdir/${pkgname}-${pkgver}
 
-  cp ../config.local . || return 1
-  ./configure --nointeractive --with-OPTIMIZER="${CFLAGS}" || return 1
-  make || return 1
-  make ROOT=$pkgdir install || return 1
-  install -D -m 755 $srcdir/hylafax $pkgdir/etc/rc.d/hylafax || return 1
-  install -D -m 744 $srcdir/hylafax.cron.daily $pkgdir/etc/cron.daily/hylafax || return 1
+  cp ../config.local .
+  # fix compiling
+  patch -Np0 -i ../configure-6.0.5.patch
+  ./configure --nointeractive --with-OPTIMIZER="${CFLAGS}"
+  make
+}
+
+package () {
+  cd $srcdir/${pkgname}-${pkgver}
+  make ROOT=$pkgdir install
+  install -D -m 755 $srcdir/hylafax $pkgdir/etc/rc.d/hylafax
+  install -D -m 744 $srcdir/hylafax.cron.daily $pkgdir/etc/cron.daily/hylafax
   # remove group if created
   if [ $uucp_created -eq 1 ]; then
     userdel uucp &>/dev/null
@@ -44,13 +52,14 @@ build() {
   fi
   # add missing awk file for notify-4.1 script
   install -D -m 755 $srcdir/${pkgname}-${pkgver}/util/notify.awk \
-  	$spkgdir/var/spool/hylafax/bin/notify.awk || return 1
+  	$spkgdir/var/spool/hylafax/bin/notify.awk
   # fix permission on /var/lock
   chmod 1777 $pkgdir/var/lock
 
   install -D -m644 COPYRIGHT $startdir/pkg/usr/share/licenses/$pkgname/COPYRIGHT
 }
-md5sums=('6ba4bc3a47c9d2634de1b14f4ab34c80'
+md5sums=('eb9ac942354ad708e20e4583cec6615f'
          '6602288a405324d8c8e3c5eac2bf19fd'
          '52beffe7dc296b4f9ce9fd0387f7804e'
-         '0d2ce24d918226a852539aebf57d3f4a')
+         '0d2ce24d918226a852539aebf57d3f4a'
+         '51d9f639bb76e5e39cdc8e2ac07e208d')
diff --git a/extra/hylafax/configure-6.0.5.patch b/extra/hylafax/configure-6.0.5.patch
new file mode 100644
index 000000000..e1f1126a5
--- /dev/null
+++ b/extra/hylafax/configure-6.0.5.patch
@@ -0,0 +1,11 @@
+--- configure.old	2011-08-08 10:19:37.619657223 +0200
++++ configure	2011-08-08 10:20:26.422189170 +0200
+@@ -2882,7 +2882,7 @@
+ 	echo '#define HAS_FCHMOD 1'
+ 	Note "... configure use of fchmod"
+ 	CheckFuncDecl fchmod 'extern int fchmod(int, mode_t);' \
+-	    unistd.h libc.h $OSFCNH sys/stat.h
++	    unistd.h $OSFCNH sys/stat.h libc.h
+     }
+     CheckFuncDecl mknod 'extern int mknod(const char*, mode_t, dev_t);' \
+ 	unistd.h sys/stat.h
diff --git a/extra/hylafax/hylafax.install b/extra/hylafax/hylafax.install
index d9d991e6b..bd97d42bd 100644
--- a/extra/hylafax/hylafax.install
+++ b/extra/hylafax/hylafax.install
@@ -42,8 +42,3 @@ pre_remove() {
   userdel fax &>/dev/null
   print_remove
 }
-
-op=$1
-shift
-
-$op $*
diff --git a/extra/vamp-plugin-sdk/PKGBUILD b/extra/vamp-plugin-sdk/PKGBUILD
index 06633b1de..72a3938d5 100644
--- a/extra/vamp-plugin-sdk/PKGBUILD
+++ b/extra/vamp-plugin-sdk/PKGBUILD
@@ -1,27 +1,24 @@
-# $Id: PKGBUILD 86992 2010-08-08 20:57:26Z schiv $
-# Maintainer: Ray Rashif <schivmeister@gmail.com>
+# $Id: PKGBUILD 134888 2011-08-08 13:42:21Z schiv $
+# Maintainer: Ray Rashif <schiv@archlinux.org>
 # Contributor: Orivej Desh <smpuj@bk.ru>
 
 pkgname=vamp-plugin-sdk
-pkgver=2.1
+pkgver=2.2
 pkgrel=1
-pkgdesc="The Vamp audio analysis plugin system"
+pkgdesc="The Vamp audio analysis plug-in system"
 arch=('i686' 'x86_64')
 url="http://www.vamp-plugins.org/"
 license=('BSD')
 depends=('gcc-libs' 'libsndfile')
-#options=('!libtool')
-source=(http://downloads.sourceforge.net/vamp/$pkgname-$pkgver.tar.gz
-        gcc44.patch)
-md5sums=('13252077a73987dae72a9174e529b6b9'
+options=('!libtool')
+source=("http://downloads.sourceforge.net/vamp/$pkgname-$pkgver.tar.gz"
+        'gcc44.patch')
+md5sums=('037cdb83f20a331ff1fa07d54550c773'
          'a07e3ef9c657a56cf2e8c4afc0ba1cec')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
-  # gcc 4.4 compatibility
-  patch -Np1 -i ../gcc44.patch
-
   ./configure --prefix=/usr
   make
 }
@@ -29,7 +26,7 @@ build() {
 package() {
   cd "$srcdir/$pkgname-$pkgver"
 
-  make DESTDIR="$pkgdir/" install
+  make DESTDIR="$pkgdir" install
 
   install -Dm644 COPYING \
     "$pkgdir/usr/share/licenses/$pkgname/COPYING"
diff --git a/extra/xorg-server/PKGBUILD b/extra/xorg-server/PKGBUILD
index 7045d4ed8..7550063d1 100644
--- a/extra/xorg-server/PKGBUILD
+++ b/extra/xorg-server/PKGBUILD
@@ -1,29 +1,27 @@
-# $Id: PKGBUILD 130953 2011-07-09 08:01:22Z andyrtr $
+# $Id: PKGBUILD 134875 2011-08-08 08:40:10Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=xorg-server
 pkgname=('xorg-server' 'xorg-server-xephyr' 'xorg-server-xdmx' 'xorg-server-xvfb' 'xorg-server-xnest' 'xorg-server-common' 'xorg-server-devel')
-pkgver=1.10.3
-pkgrel=2
+pkgver=1.10.3.901
+pkgrel=1
 arch=('i686' 'x86_64')
 license=('custom')
 url="http://xorg.freedesktop.org"
-makedepends=('pixman' 'libx11' 'mesa' 'libgl' 'xf86driproto' 'xcmiscproto' 'xtrans' 'bigreqsproto' 'randrproto' 'inputproto' 'fontsproto' 'videoproto' 'compositeproto' 'recordproto' 'scrnsaverproto' 'resourceproto' 'xineramaproto' 'libxkbfile' 'libxfont' 'renderproto' 'libpciaccess' 'libxv' 'xf86dgaproto' 'libxmu' 'libxrender' 'libxi' 'dmxproto' 'libxaw' 'libdmx' 'libxtst' 'libxres' 'xorg-xkbcomp' 'xorg-util-macros' 'xorg-font-util')
+makedepends=('pixman' 'libx11' 'mesa' 'libgl' 'xf86driproto' 'xcmiscproto' 'xtrans' 'bigreqsproto' 'randrproto' 'inputproto' 'fontsproto' 'videoproto' 'compositeproto' 'recordproto' 'scrnsaverproto' 'resourceproto' 'xineramaproto' 'libxkbfile' 'libxfont' 'renderproto' 'libpciaccess' 'libxv' 'xf86dgaproto' 'libxmu' 'libxrender' 'libxi' 'dmxproto' 'libxaw' 'libdmx' 'libxtst' 'libxres' 'xorg-xkbcomp' 'xorg-util-macros' 'xorg-font-util' 'glproto' 'dri2proto')
 options=('!libtool')
 source=(${url}/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2
-        #git-fixes.patch
+        randr-compare-all-the-bytes-in-rrpostpendingproperties.patch
         bg-none-revert.patch
         xserver-1.10-pointer-barriers.patch
-        xorg-redhat-die-ugly-pattern-die-die-die.patch
         autoconfig-nvidia.patch
         xvfb-run
         xvfb-run.1
         10-quirks.conf)
-sha1sums=('1699be5c0edeca553cfa3ee6caa228483465136b'
-         # '6dd2bcd9d8b17d1a50ed8c15eb1cba480558e695'
+sha1sums=('c7b0d4a29adf91baeae4783841303ccf8ba285e2'
+          '571f2925f2f3d1b5cdbb2e5a676205fcea256198'
           '629c6d8d52126eab81ee1b72a9e4209535f8cb81'
           '1b95e91384a57d966428c7db98ed06f4cc562f91'
-          '0efcdf61bde3c0cd813072b94e2b30ab922775b9'
           'f9328fd7bc931bb02c8909ecfcef35403de33782'
           'c94f742d3f9cabf958ae58e4015d9dd185aabedc'
           '6838fc00ef4618c924a77e0fb03c05346080908a'
@@ -31,8 +29,8 @@ sha1sums=('1699be5c0edeca553cfa3ee6caa228483465136b'
 
 build() {
   cd "${srcdir}/${pkgbase}-${pkgver}"
-  # Get rid of the ugly pattern
-  patch -Np3 -i "${srcdir}/xorg-redhat-die-ugly-pattern-die-die-die.patch"
+  # Upstream post-release commit
+  patch -Np1 -i "${srcdir}/randr-compare-all-the-bytes-in-rrpostpendingproperties.patch"
 
   # Add pointer barrier support, patch from Fedora
   patch -Np1 -i "${srcdir}/xserver-1.10-pointer-barriers.patch"
@@ -40,9 +38,6 @@ build() {
   # Patches from ~ajax/xserver xserver-next branch
   patch -Np1 -i "${srcdir}/bg-none-revert.patch"
 
-  # Upstream fixes from 1.10 branch
-  #patch -Np1 -i "${srcdir}/git-fixes.patch"
-
   # Use nouveau/nv/nvidia drivers for nvidia devices
   patch -Np1 -i "${srcdir}/autoconfig-nvidia.patch"
 
@@ -73,6 +68,7 @@ build() {
       --with-fontrootdir=/usr/share/fonts
   make
 
+  # Disable subdirs for make install rule to make splitting easier
   sed -e 's/^DMX_SUBDIRS =.*/DMX_SUBDIRS =/' \
       -e 's/^XVFB_SUBDIRS =.*/XVFB_SUBDIRS =/' \
       -e 's/^XNEST_SUBDIRS =.*/XNEST_SUBDIRS = /' \
diff --git a/extra/xorg-server/randr-compare-all-the-bytes-in-rrpostpendingproperties.patch b/extra/xorg-server/randr-compare-all-the-bytes-in-rrpostpendingproperties.patch
new file mode 100644
index 000000000..36d28ded0
--- /dev/null
+++ b/extra/xorg-server/randr-compare-all-the-bytes-in-rrpostpendingproperties.patch
@@ -0,0 +1,36 @@
+From fa425363e3927e86d57f42c4b6e4995d26d6bd0c Mon Sep 17 00:00:00 2001
+From: Aaron Plattner <aplattner@nvidia.com>
+Date: Fri, 29 Jul 2011 23:12:06 +0000
+Subject: randr: Compare all the bytes in RRPostPendingProperties
+
+RRPostPendingProperties tries to compare the pending and current
+property values to decide whether they're actually changing.  However,
+it does this using a memcmp that passes in pending_value->size as the
+number of bytes.  This is actually the number of elements, where each
+element is (pending_value->format / 8) bytes long.  This causes the
+pending value to not be propagated if the first pending_value->size
+bytes are the same and only the end of it is changing.
+
+Fix this by computing the total number of bytes to compare in the
+memcmp.
+
+Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
+Reviewed-by: Keith Packard <keithp@keithp.com>
+Signed-off-by: Keith Packard <keithp@keithp.com>
+(cherry picked from commit 08dfff92e8d0c2b1726634392c147f6634d1706d)
+---
+diff --git a/randr/rrproperty.c b/randr/rrproperty.c
+index ba04c16..61e7bb4 100644
+--- a/randr/rrproperty.c
++++ b/randr/rrproperty.c
+@@ -283,7 +283,7 @@ RRPostPendingProperties (RROutputPtr output)
+ 	    pending_value->format == current_value->format &&
+ 	    pending_value->size == current_value->size &&
+ 	    !memcmp (pending_value->data, current_value->data,
+-		     pending_value->size))
++		     pending_value->size * (pending_value->format / 8)))
+ 	    continue;
+ 
+ 	if (RRChangeOutputProperty (output, property->propertyName,
+--
+cgit v0.8.3-6-g21f6
diff --git a/staging/glib-networking/PKGBUILD b/staging/glib-networking/PKGBUILD
new file mode 100644
index 000000000..da6645cad
--- /dev/null
+++ b/staging/glib-networking/PKGBUILD
@@ -0,0 +1,30 @@
+# $Id: PKGBUILD 134861 2011-08-08 05:46:38Z eric $
+# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
+pkgname=glib-networking
+pkgver=2.28.7
+pkgrel=2
+pkgdesc="Network-related giomodules for glib"
+arch=('i686' 'x86_64')
+url="http://www.gtk.org/"
+license=('GPL2')
+depends=('glib2' 'libproxy' 'gnutls' 'ca-certificates' 'gsettings-desktop-schemas')
+makedepends=('intltool')
+options=('!libtool')
+install=glib-networking.install
+source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-${pkgver}.tar.bz2)
+sha256sums=('98bedfbd530c4b1b53c91025fe82290bafd289d249e4eb549c3b90d23a76021c')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+  ./configure \
+    --prefix=/usr  --sysconfdir=/etc \
+    --libexecdir=/usr/lib/glib-networking --disable-static
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="${pkgdir}" install
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/staging/glib-networking/glib-networking.install b/staging/glib-networking/glib-networking.install
new file mode 100644
index 000000000..595f1c75b
--- /dev/null
+++ b/staging/glib-networking/glib-networking.install
@@ -0,0 +1,11 @@
+post_install() {
+  usr/bin/gio-querymodules usr/lib/gio/modules
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}
diff --git a/staging/gtk-vnc/PKGBUILD b/staging/gtk-vnc/PKGBUILD
new file mode 100644
index 000000000..b8e4c8856
--- /dev/null
+++ b/staging/gtk-vnc/PKGBUILD
@@ -0,0 +1,40 @@
+# $Id: PKGBUILD 134864 2011-08-08 05:59:44Z eric $
+# Maintainer:
+# Contributor: Jan de Groot <jgc@archlinux.org>
+# Contributor: Allan McRae <mcrae_allan@hotmail.com>
+# Contributor: lp76 <l.peduto@gmail.com>
+
+pkgname=gtk-vnc
+pkgver=0.4.3
+pkgrel=2
+pkgdesc="A VNC viewer widget for GTK"
+arch=('i686' 'x86_64')
+url="http://live.gnome.org/gtk-vnc"
+license=('LGPL')
+depends=('gtk3')
+optdepends=('gtk2: GTK2 widget')
+makedepends=('intltool' 'pygtk' 'pygobject-devel' 'gtk-doc' 'gtk2')
+options=('!libtool')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
+sha256sums=('b9870d923d636d2e7547267d01c8cafdc06ad5b5b4987003ea3cd567bfbb6377')
+
+build() {
+  cd "$srcdir"
+  cp -a $pkgname-$pkgver gtk3-build
+
+  ( cd $pkgname-$pkgver
+    PYTHON=/usr/bin/python2 ./configure --prefix=/usr \
+      --with-python --disable-static --with-gtk=2.0
+    make )
+
+  ( cd gtk3-build
+    PYTHON=/usr/bin/python2 ./configure --prefix=/usr \
+      --with-python --with-examples --disable-static --with-gtk=3.0
+    make )
+}
+
+package() {
+  cd "${srcdir}"
+  make -C $pkgname-$pkgver -j1 DESTDIR="${pkgdir}" install
+  make -C gtk3-build -j1 DESTDIR="${pkgdir}" install
+}
diff --git a/staging/msmtp/PKGBUILD b/staging/msmtp/PKGBUILD
new file mode 100644
index 000000000..44d3e6209
--- /dev/null
+++ b/staging/msmtp/PKGBUILD
@@ -0,0 +1,38 @@
+# $Id: PKGBUILD 134900 2011-08-08 19:38:44Z eric $
+# Maintainer: tobias <tobias@archlinux.org>
+# Contributor: Ben Mazer <blm@groknil.org>
+
+pkgname=msmtp
+pkgver=1.4.24
+pkgrel=3
+pkgdesc="A mini smtp client"
+arch=('i686' 'x86_64')
+license=('GPL3')
+url="http://msmtp.sourceforge.net"
+depends=('gnutls' 'libidn')
+makedepends=('texlive-core')
+provides=('smtp-forwarder')
+install=msmtp.install
+source=(http://download.sourceforge.net/sourceforge/msmtp/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('3ed704fbd3e7419cab5c65bb7928d9ba')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./configure --prefix=/usr --sysconfdir=/etc --with-ssl=gnutls
+  make
+  make -C doc html pdf
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install 
+  make DESTDIR="${pkgdir}" -C doc install-html install-pdf
+
+# Installing example configs and scripts to /usr/share/doc/msmtp
+# as they are not installed by default (Debian and Gentoo do it this way)
+  install -d "${pkgdir}/usr/share/doc/msmtp"
+  cp -r scripts/{find_alias,msmtp-gnome-tool,msmtpqueue,msmtpq,set_sendmail} "${pkgdir}/usr/share/doc/msmtp/"
+  install -D -m644 doc/*.example "${pkgdir}/usr/share/doc/msmtp/"
+
+  install -D -m644 scripts/vim/msmtp.vim "${pkgdir}/usr/share/vim/vimfiles/syntax/msmtp.vim"
+}
diff --git a/staging/msmtp/msmtp.install b/staging/msmtp/msmtp.install
new file mode 100644
index 000000000..c4dd76476
--- /dev/null
+++ b/staging/msmtp/msmtp.install
@@ -0,0 +1,20 @@
+infodir=usr/share/info
+filelist=(msmtp.info)
+
+post_install() {
+  for file in ${filelist[@]}; do
+    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
+  done
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+  for file in ${filelist[@]}; do
+    install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
+  done
+}
+
+# vim:set ts=2 sw=2 et: