50 files changed, 1184 insertions, 171 deletions
diff --git a/community/alsa-tools/PKGBUILD b/community/alsa-tools/PKGBUILD
index 1e097048e..c49246f5d 100644
--- a/community/alsa-tools/PKGBUILD
+++ b/community/alsa-tools/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 59642 2011-11-28 23:44:29Z seblu $
+# $Id: PKGBUILD 62752 2012-01-25 20:12:30Z seblu $
 #Maintainer: Sebastien Luttringer <seblu+arch@seblu.net>
 #Contributor: Jochen Immend�rfer <jochen dot immendoerfer at gmail dot com>
 
 pkgname=alsa-tools
-pkgver=1.0.24.1
+pkgver=1.0.25
 pkgrel=1
 pkgdesc='ALSA tools package'
 arch=('i686' 'x86_64')
@@ -12,7 +12,7 @@ license=('GPL2')
 depends=('fltk' 'alsa-lib' 'gtk2')
 options=('!libtool')
 source=("ftp://ftp.alsa-project.org/pub/tools/$pkgname-$pkgver.tar.bz2")
-md5sums=('08fe93a12006093e590d7ecc02b119dd')
+md5sums=('57bfec98a814d12e0f7ab379aaeccd87')
 
 build() {
   for f in $(find "$srcdir/$pkgname-$pkgver" -type f -name configure ); do
diff --git a/community/cegui/PKGBUILD b/community/cegui/PKGBUILD
index 9bd00f25a..8087bcef1 100644
--- a/community/cegui/PKGBUILD
+++ b/community/cegui/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 55877 2011-09-24 16:48:18Z stephane $
+# $Id: PKGBUILD 62687 2012-01-24 14:37:57Z svenstaro $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Juergen Hoetzel <juergen@archlinux.org> 
 # Contributor: William Rea <sillywilly@gmail.com>, 
 # Contributor: Bjorn Lindeijer <bjorn@lindeijer.nl>
 
 pkgname=cegui
-pkgver=0.7.5
-pkgrel=5
+pkgver=0.7.6
+pkgrel=1
 pkgdesc="A free library providing windowing and widgets for graphics APIs/engines"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://crayzedsgui.sourceforge.net"
@@ -15,7 +15,8 @@ license=("MIT")
 depends=('pcre' 'glew' 'expat' 'freetype2' 'libxml2' 'devil' 'freeglut' 'lua' 'silly')
 makedepends=('python2' 'doxygen')
 source=(http://downloads.sourceforge.net/crayzedsgui/CEGUI-$pkgver.tar.gz)
-md5sums=('38c79d1fdfaaa10f481c99a2ac479516')
+options=(!libtool)
+md5sums=('7ddb5145dc94fb7daf9aea1d30a6ffa3')
 
 build() {
   cd $srcdir/CEGUI-${pkgver}
diff --git a/community/deadbeef/PKGBUILD b/community/deadbeef/PKGBUILD
index c9272ed0e..83ceb2f38 100644
--- a/community/deadbeef/PKGBUILD
+++ b/community/deadbeef/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 58389 2011-11-12 17:16:28Z ibiru $
+# $Id: PKGBUILD 62726 2012-01-25 08:16:40Z lfleischer $
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: Alexey Yakovenko <waker@users.sourceforge.net>
 
 pkgname=deadbeef
 pkgver=0.5.1
-pkgrel=3
+pkgrel=4
 pkgdesc='An audio player for GNU/Linux based on GTK2.'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://deadbeef.sourceforge.net'
@@ -32,11 +32,18 @@ optdepends=('libsamplerate: for Resampler plugin'
             'libzip: for vfs_zip plugin')
 options=('!libtool')
 install='deadbeef.install'
-source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}-${pkgver}.tar.bz2" "ffmpeg.patch")
+source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
+        'deadbeef-0.5.1-ffmpeg-AV_VERSION_INT.patch'
+        'deadbeef-0.5.1-ffmpeg-version-check-fix.patch')
+md5sums=('be8359d1bd9cf7679cf2ca748996e726'
+         'd1c913c0ccefef33012732cf0ae49f7f'
+         '6d22855f61f4d2fea4b343dca76d5e85')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i $srcdir/ffmpeg.patch
+
+  patch -Np1 -i ../deadbeef-0.5.1-ffmpeg-AV_VERSION_INT.patch
+  patch -Np1 -i ../deadbeef-0.5.1-ffmpeg-version-check-fix.patch
 
   ./configure --prefix=/usr
   make
@@ -47,5 +54,3 @@ package () {
 
   make prefix="${pkgdir}/usr" install
 }
-md5sums=('be8359d1bd9cf7679cf2ca748996e726'
-         '6cc7623734af310095534c361c9f64e8')
diff --git a/community/deadbeef/deadbeef-0.5.1-ffmpeg-AV_VERSION_INT.patch b/community/deadbeef/deadbeef-0.5.1-ffmpeg-AV_VERSION_INT.patch
new file mode 100644
index 000000000..db1c79638
--- /dev/null
+++ b/community/deadbeef/deadbeef-0.5.1-ffmpeg-AV_VERSION_INT.patch
@@ -0,0 +1,118 @@
+From 2bb5828e58fa8c187377f8ba75f8eb73a53ed7ca Mon Sep 17 00:00:00 2001
+From: Igor Murzov <e-mail@date.by>
+Date: Mon, 4 Jul 2011 16:47:25 +0400
+Subject: [PATCH 1/2] ffmpeg: define fallback macro AV_VERSION_INT()
+
+For ffmpeg < 0.5.  Copied from libavutil 0.5.
+
+ffmpeg: don't use deprecated CODEC_TYPE_AUDIO with new lavc
+
+fixes build with lavc 53.
+
+ffmpeg: fix erroneous version comparisons
+
+Comparing versions this way: (x.y < x1.y1) is obviously equivalent to
+(x < x1 || (x == x1 && y < y1)), not to (x <= x1 && y < y1).
+
+ffmpeg: use av_register_protocol2() if available
+
+fixes usage with ffmpeg-0.8
+---
+ plugins/ffmpeg/ffmpeg.c |   37 ++++++++++++++++++++++++++++++-------
+ 1 files changed, 30 insertions(+), 7 deletions(-)
+
+diff --git a/plugins/ffmpeg/ffmpeg.c b/plugins/ffmpeg/ffmpeg.c
+index cd7edf4..0cb9955 100644
+--- a/plugins/ffmpeg/ffmpeg.c
++++ b/plugins/ffmpeg/ffmpeg.c
+@@ -44,6 +44,10 @@
+ #define av_register_protocol register_protocol
+ #endif
+ 
++#ifndef AV_VERSION_INT
++#define AV_VERSION_INT(a, b, c) (a<<16 | b<<8 | c)
++#endif
++
+ #endif
+ 
+ //#define trace(...) { fprintf(stderr, __VA_ARGS__); }
+@@ -140,7 +144,12 @@ ffmpeg_init (DB_fileinfo_t *_info, DB_playItem_t *it) {
+     for (i = 0; i < info->fctx->nb_streams; i++)
+     {
+         info->ctx = info->fctx->streams[i]->codec;
+-        if (info->ctx->codec_type == CODEC_TYPE_AUDIO)
++        if (info->ctx->codec_type ==
++#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 64, 0)
++            AVMEDIA_TYPE_AUDIO)
++#else
++            CODEC_TYPE_AUDIO)
++#endif
+         {
+             info->codec = avcodec_find_decoder (info->ctx->codec_id);
+             if (info->codec != NULL) {
+@@ -279,10 +288,10 @@ ffmpeg_read (DB_fileinfo_t *_info, char *bytes, int size) {
+             int out_size = AVCODEC_MAX_AUDIO_FRAME_SIZE;
+             int len;
+             //trace ("in: out_size=%d(%d), size=%d\n", out_size, AVCODEC_MAX_AUDIO_FRAME_SIZE, size);
+-#if (LIBAVCODEC_VERSION_MAJOR <= 52) && (LIBAVCODEC_VERSION_MINOR <= 25)
+-            len = avcodec_decode_audio2 (info->ctx, (int16_t *)info->buffer, &out_size, info->pkt.data, info->pkt.size);
+-#else
++#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52,25,0)
+             len = avcodec_decode_audio3 (info->ctx, (int16_t *)info->buffer, &out_size, &info->pkt);
++#else
++            len = avcodec_decode_audio2 (info->ctx, (int16_t *)info->buffer, &out_size, info->pkt.data, info->pkt.size);
+ #endif
+             trace ("out: out_size=%d, len=%d\n", out_size, len);
+             if (len <= 0) {
+@@ -418,7 +427,7 @@ static const char *map[] = {
+ 
+ static int
+ ffmpeg_read_metadata_internal (DB_playItem_t *it, AVFormatContext *fctx) {
+-#if LIBAVFORMAT_VERSION_MAJOR <= 52 && LIBAVFORMAT_VERSION_MINOR < 43
++#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(52,43,0)
+     if (!strlen (fctx->title)) {
+         // title is empty, this call will set track title to filename without extension
+         deadbeef->pl_add_meta (it, "title", NULL);
+@@ -490,7 +499,12 @@ ffmpeg_insert (ddb_playlist_t *plt, DB_playItem_t *after, const char *fname) {
+     for (i = 0; i < fctx->nb_streams; i++)
+     {
+         ctx = fctx->streams[i]->codec;
+-        if (ctx->codec_type == CODEC_TYPE_AUDIO)
++        if (ctx->codec_type ==
++#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 64, 0)
++            AVMEDIA_TYPE_AUDIO)
++#else
++            CODEC_TYPE_AUDIO)
++#endif
+         {
+             codec = avcodec_find_decoder(ctx->codec_id);
+             if (codec != NULL && !strcasecmp (codec->name, "alac")) { // only open alac streams
+@@ -704,7 +718,11 @@ ffmpeg_start (void) {
+     ffmpeg_init_exts ();
+     avcodec_init ();
+     av_register_all ();
++#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(52, 64, 0)
++    av_register_protocol2 (&vfswrapper, sizeof(vfswrapper));
++#else
+     av_register_protocol (&vfswrapper);
++#endif
+     return 0;
+ }
+ 
+@@ -745,7 +763,12 @@ ffmpeg_read_metadata (DB_playItem_t *it) {
+     for (i = 0; i < fctx->nb_streams; i++)
+     {
+         ctx = fctx->streams[i]->codec;
+-        if (ctx->codec_type == CODEC_TYPE_AUDIO)
++        if (ctx->codec_type ==
++#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 64, 0)
++            AVMEDIA_TYPE_AUDIO)
++#else
++            CODEC_TYPE_AUDIO)
++#endif
+         {
+             codec = avcodec_find_decoder(ctx->codec_id);
+             if (codec != NULL)
+-- 
+1.7.8.4
+
diff --git a/community/deadbeef/deadbeef-0.5.1-ffmpeg-version-check-fix.patch b/community/deadbeef/deadbeef-0.5.1-ffmpeg-version-check-fix.patch
new file mode 100644
index 000000000..af8c282c0
--- /dev/null
+++ b/community/deadbeef/deadbeef-0.5.1-ffmpeg-version-check-fix.patch
@@ -0,0 +1,25 @@
+From 9cbd09b81028679a507f751c206e8f6769fd450c Mon Sep 17 00:00:00 2001
+From: Igor Murzov <e-mail@date.by>
+Date: Thu, 7 Jul 2011 22:31:44 +0400
+Subject: [PATCH 2/2] ffmpeg: version check fix
+
+---
+ plugins/ffmpeg/ffmpeg.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/plugins/ffmpeg/ffmpeg.c b/plugins/ffmpeg/ffmpeg.c
+index 0cb9955..37c7e80 100644
+--- a/plugins/ffmpeg/ffmpeg.c
++++ b/plugins/ffmpeg/ffmpeg.c
+@@ -718,7 +718,7 @@ ffmpeg_start (void) {
+     ffmpeg_init_exts ();
+     avcodec_init ();
+     av_register_all ();
+-#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(52, 64, 0)
++#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(52, 69, 0)
+     av_register_protocol2 (&vfswrapper, sizeof(vfswrapper));
+ #else
+     av_register_protocol (&vfswrapper);
+-- 
+1.7.8.4
+
diff --git a/community/electricsheep/PKGBUILD b/community/electricsheep/PKGBUILD
index 41402f4b6..f2ac0230c 100644
--- a/community/electricsheep/PKGBUILD
+++ b/community/electricsheep/PKGBUILD
@@ -1,24 +1,26 @@
-# $Id: PKGBUILD 58393 2011-11-12 17:16:52Z ibiru $
+# $Id: PKGBUILD 62754 2012-01-25 20:28:55Z ebelanger $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=electricsheep
 pkgver=2.7b12
-pkgrel=4
+pkgrel=5
 pkgdesc="A screensaver that realize the collective dream of sleeping computers from all over the internet"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://community.electricsheep.org/"
 license=('GPL')
-depends=('curl' 'expat' 'flam3' 'ffmpeg' 'mplayer' 'libglade')
+depends=('curl' 'flam3' 'ffmpeg' 'mplayer' 'libglade')
 makedepends=('xscreensaver')
 optdepends=('xscreensaver: to use electricsheep with xscreensaver')
 source=(ftp://ftp.archlinux.org/other/community/${pkgname}/${pkgname}-${pkgver}.tar.bz2
-        electricsheep-ffmpeg.patch)
+        electricsheep-ffmpeg.patch electricsheep-pref-segfault.patch)
 sha1sums=('fd1c307912905ba456189efbb546ef0fe336fa32'
-          'd6816e27c2a2f6c74ae61c99ad2d7fb28b1d1825')
+          'd6816e27c2a2f6c74ae61c99ad2d7fb28b1d1825'
+          'bdf0f66fdbb5741671e8bb127bd76ef236d0e44a')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   patch -p1 -i "${srcdir}/electricsheep-ffmpeg.patch"
+  patch -p1 -i "${srcdir}/electricsheep-pref-segfault.patch"
   ./configure --prefix=/usr
   make
 }
diff --git a/community/electricsheep/PKGBUILD.svn b/community/electricsheep/PKGBUILD.svn
new file mode 100644
index 000000000..2fc8a26ff
--- /dev/null
+++ b/community/electricsheep/PKGBUILD.svn
@@ -0,0 +1,60 @@
+# $Id: PKGBUILD 57680 2011-11-01 05:03:57Z ebelanger $
+# Maintainer: Eric Bélanger <eric@archlinux.org>
+# Contributor: Alexander Rødseth <rodseth@gmail.com>
+pkgname=electricsheep
+pkgver=2.7b34
+pkgrel=1
+pkgdesc="Screensaver that realize the collective dream of computers all over the internet"
+arch=('x86_64' 'i686')
+url="http://community.electricsheep.org/"
+license=('GPL')
+depends=('curl' 'expat' 'flam3' 'ffmpeg' 'mplayer' 'libglade' 'tinyxml' 'boost' 'gtk2' 'lua')
+#subversion libgtk2.0 libgl1-mesa libavcodec libavformat libswscale liblua5 libcurl4-openssl libxml2 libjpeg8 libgtop2 libboost libboost-filesystem libboost-thread libtinyxml libglut3
+makedepends=('xscreensaver')
+optdepends=('xscreensaver: to use electricsheep with xscreensaver')
+_fixed_revision=107
+
+build() {
+  cd "$srcdir"
+
+  msg2 "Checking out svn revision $_fixed_revision (in lack of a Linux release for $pkgver)..."
+  if [[ -d "$pkgname/.svn" ]]; then
+    (cd "$pkgname" && svn up -r $_fixed_revision)
+  else
+    svn co \
+      http://electricsheep.googlecode.com/svn/trunk/ \
+      --config-dir ./ -r $_fixed_revision "$pkgname"
+  fi
+
+  msg2 "Setting up build directory..."
+  rm -rf "$srcdir/$pkgname-build"
+  cp -r "$srcdir/$pkgname" "$srcdir/$pkgname-build"
+  cd "$srcdir/$pkgname-build/client_generic"
+
+  #patch -p1 -i ../electricsheep-ffmpeg.patch
+  msg2 "Configuring..."
+  ./autogen.sh
+  ./configure --prefix=/usr
+
+  msg2 "Compiling..."
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-build/client_generic"
+
+  install -d "$pkgdir/usr/share/applications/screensavers"
+  install -d "$pkgdir/usr/lib/gnome-screensaver/gnome-screensaver"
+  make DESTDIR="$pkgdir" \
+    GNOME_SCREENSAVER_DATADIR="$pkgdir/usr/share/applications/screensavers" \
+    GNOME_SCREENSAVER_PRIVEXEDIR="$pkgdir/usr/lib/gnome-screensaver/gnome-screensaver" \
+    install
+  install -Dm644 electricsheep.desktop.kde \
+    "$pkgdir/usr/share/kde4/services/ScreenSavers/electricsheep.desktop"
+  install -Dm644 electricsheep.xml \
+    "$pkgdir/usr/share/xscreensaver/config/electricsheep.xml"
+  install -Dm755 electricsheep-saver \
+    "$pkgdir/usr/bin/electricsheep-saver"
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/electricsheep/electricsheep-pref-segfault.patch b/community/electricsheep/electricsheep-pref-segfault.patch
new file mode 100644
index 000000000..83bcd8a0f
--- /dev/null
+++ b/community/electricsheep/electricsheep-pref-segfault.patch
@@ -0,0 +1,270 @@
+diff -Naur electricsheep-2.7b12/electricsheep.c electricsheep-2.7~b12+svn20091224/electricsheep.c
+--- electricsheep-2.7b12/electricsheep.c	2009-07-09 04:10:05.000000000 -0400
++++ electricsheep-2.7~b12+svn20091224/electricsheep.c	2009-12-24 18:03:01.000000000 -0500
+@@ -564,6 +566,12 @@
+ 	    n++;
+ 	}
+     }
++    if (n < 1) {
++      if (debug) {
++	fprintf(logout, "median rank undefined\n");
++      }
++      return;
++    }
+     qsort(tms, n, sizeof(int), compare_ints);
+     if (0 && debug) {
+ 	for (i = 0; i < n; i++)
+@@ -1915,7 +1923,7 @@
+ 	if (-1 == (decoder_pid = fork())) {
+ 	    perror("decoder fork");
+ 	} else if (0 == decoder_pid) {
+-	    char *argv[20];
++	    char *argv[25];
+ 	    int c = 0;
+ 	    /* child */
+ 	    snprintf(fps, 24, "%g", prefs.frame_rate);
+@@ -1934,6 +1942,7 @@
+ 		cleanup_and_exit(1);
+ 	      }
+ 		argv[c++] = "mplayer";
++		argv[c++] = "-nolirc";
+ 		argv[c++] = "-cache";
+ 		argv[c++] = "8192";
+ 		argv[c++] = "-really-quiet";
+diff -Naur electricsheep-2.7b12/electricsheep.h electricsheep-2.7~b12+svn20091224/electricsheep.h
+--- electricsheep-2.7b12/electricsheep.h	2009-07-09 04:10:05.000000000 -0400
++++ electricsheep-2.7~b12+svn20091224/electricsheep.h	2009-12-24 18:03:01.000000000 -0500
+@@ -74,4 +74,4 @@
+ void init_list_cmd (char *buf);
+ void get_end_element(void *userData, const char *name);
+ void character_handler(void *userData, const XML_Char *s, int len);
+-char *encry(char *pw);
++char *encry(char *pw, char *nick);
+diff -Naur electricsheep-2.7b12/electricsheep-preferences.c electricsheep-2.7~b12+svn20091224/electricsheep-preferences.c
+--- electricsheep-2.7b12/electricsheep-preferences.c	2009-07-09 04:10:05.000000000 -0400
++++ electricsheep-2.7~b12+svn20091224/electricsheep-preferences.c	2009-12-24 18:03:01.000000000 -0500
+@@ -108,8 +108,9 @@
+       prefs.password = strdup("");
+     } else {
+       char *pw = (char*)gtk_entry_get_text(password_entry);
++      pw = strdup(pw);
+       if (strcmp(pw, pw_marker))
+-	prefs.password = encry(pw);
++	prefs.password = encry(pw, prefs.nick);
+     }
+     prefs.video_driver = (char*)gtk_entry_get_text(video_driver_entry);
+     prefs.frame_rate = gtk_spin_button_get_value(frame_rate_spin);
+@@ -207,72 +208,72 @@
+ void get_widgets(GladeXML *xml) {
+     title_label = (GtkLabel *) glade_xml_get_widget(xml, "titleLabel");
+     if (NULL == title_label) {
+-	fprintf(stderr, "titleLabel not found\n");
++	fprintf(logout, "titleLabel not found\n");
+ 	exit(1);
+     }
+     test_label = (GtkLabel *) glade_xml_get_widget(xml, "testLabel");
+     if (NULL == test_label) {
+-	fprintf(stderr, "testLabel not found\n");
++	fprintf(logout, "testLabel not found\n");
+ 	exit(1);
+     }
+     test_button = (GtkButton *) glade_xml_get_widget(xml, "testButton");
+     if (NULL == test_button) {
+-	fprintf(stderr, "testButton not found\n");
++	fprintf(logout, "testButton not found\n");
+ 	exit(1);
+     }
+     nick_entry = (GtkEntry *) glade_xml_get_widget(xml, "nickEntry");
+     if (NULL == nick_entry) {
+-	fprintf(stderr, "nickEntry not found\n");
++	fprintf(logout, "nickEntry not found\n");
+ 	exit(1);
+     }
+     url_entry = (GtkEntry *) glade_xml_get_widget(xml, "urlEntry");
+     if (NULL == url_entry) {
+-	fprintf(stderr, "urlEntry not found\n");
++	fprintf(logout, "urlEntry not found\n");
+ 	exit(1);
+     }
+     password_entry = (GtkEntry *) glade_xml_get_widget(xml, "passEntry");
+     if (NULL == password_entry) {
+-	fprintf(stderr, "passEntry not found\n");
++	fprintf(logout, "passEntry not found\n");
+ 	exit(1);
+     }
+     video_driver_entry = (GtkEntry *) glade_xml_get_widget(xml, "vdEntry");
+     if (NULL == video_driver_entry) {
+-	fprintf(stderr, "vdEntry not found\n");
++	fprintf(logout, "vdEntry not found\n");
+ 	exit(1);
+     }
+     frame_rate_spin = (GtkSpinButton *) glade_xml_get_widget(xml, "frameSpin");
+     if (NULL == frame_rate_spin) {
+-	fprintf(stderr, "frameSpin not found\n");
++	fprintf(logout, "frameSpin not found\n");
+ 	exit(1);
+     }
+     nrepeats_spin = (GtkSpinButton *) glade_xml_get_widget(xml, "repeatSpin");
+     if (NULL == nrepeats_spin) {
+-	fprintf(stderr, "repeatSpin not found\n");
++	fprintf(logout, "repeatSpin not found\n");
+ 	exit(1);
+     }
+     cache_spin = (GtkSpinButton *) glade_xml_get_widget(xml, "cacheSpin");
+     if (NULL == cache_spin) {
+-	fprintf(stderr, "cacheSpin not found\n");
++	fprintf(logout, "cacheSpin not found\n");
+ 	exit(1);
+     }
+     no_animation_check = (GtkCheckButton *) glade_xml_get_widget(xml, "noanimCheck");
+     if (NULL == no_animation_check) {
+-	fprintf(stderr, "noanimCheck not found\n");
++	fprintf(logout, "noanimCheck not found\n");
+ 	exit(1);
+     }
+     standalone_check = (GtkCheckButton *) glade_xml_get_widget(xml, "standaloneCheck");
+     if (NULL == standalone_check) {
+-	fprintf(stderr, "standaloneCheck not found\n");
++	fprintf(logout, "standaloneCheck not found\n");
+ 	exit(1);
+     }
+     hide_errors_check = (GtkCheckButton *) glade_xml_get_widget(xml, "hideCheck");
+     if (NULL == hide_errors_check) {
+-	fprintf(stderr, "hideCheck not found\n");
++	fprintf(logout, "hideCheck not found\n");
+ 	exit(1);
+     }
+     save_frames_check = (GtkCheckButton *) glade_xml_get_widget(xml, "saveCheck");
+     if (NULL == save_frames_check) {
+-	fprintf(stderr, "saveCheck not found\n");
++	fprintf(logout, "saveCheck not found\n");
+ 	exit(1);
+     }
+ }
+diff -Naur electricsheep-2.7b12/utils.c electricsheep-2.7~b12+svn20091224/utils.c
+--- electricsheep-2.7b12/utils.c	2009-07-09 04:10:05.000000000 -0400
++++ electricsheep-2.7~b12+svn20091224/utils.c	2009-12-24 18:03:01.000000000 -0500
+@@ -69,19 +70,23 @@
+     }
+ }
+ 
+-char *encry(char *pw) {
++
++char *encry(char *pw, char *nick) {
++  static char *salt = "sh33p";
+   unsigned char digest[16];
+   char md5_pw[33];
++  char *pw_salted = malloc(strlen(pw) + strlen(salt) + strlen(nick) + 1);
+   int i, j;
+-  md5_buffer(pw, strlen(pw), digest);
++  sprintf(pw_salted, "%s%s%s", pw, salt, nick);
++  md5_buffer(pw_salted, strlen(pw_salted), digest);
+   for (i = 0, j = 0; i < sizeof(digest); i++) {
+     char *hex_digits = "0123456789ABCDEF";
+-
+     md5_pw[j++] = hex_digits[digest[i] >> 4];
+     md5_pw[j++] = hex_digits[digest[i] & 0x0F];
+   }
+   md5_pw[j] = 0;
+   free(pw);
++  free(pw_salted);
+   return strdup(md5_pw);
+ }
+ 
+@@ -97,10 +102,11 @@
+ 		free(prefs->url);
+ 		prefs->url = strdup(atts[i+1]);
+ 	    } else if (!strcmp("password", atts[i])) {
+-		free(prefs->password);
+-		prefs->password = encry(strdup(atts[i+1]));
++	        free(prefs->password);
++		/* assume nick comes before pw in the xml XXX */
++		prefs->password = encry(strdup(atts[i+1]), prefs->nick);
+ 	    } else if (!strcmp("password_md5", atts[i])) {
+-		free(prefs->password);
++	        free(prefs->password);
+ 		prefs->password = strdup(atts[i+1]);
+ 	    } else if (!strcmp("video_driver", atts[i])) {
+ 		free(prefs->video_driver);
+@@ -133,7 +139,7 @@
+ 	    } else if (!strcmp("version", atts[i])) {
+ 	      // nothing to check
+ 	    } else {
+-		fprintf(stderr, "ignoring attribute %s\n", atts[i]);
++		fprintf(logout, "ignoring attribute %s\n", atts[i]);
+ 	    }
+ 	    i += 2;
+ 	}
+@@ -146,7 +152,7 @@
+ 	if (argc > 2)
+ 	    strcpy(rc_file, argv[2]);
+ 	else {
+-	    fprintf(stderr,
++	    fprintf(logout,
+ 		    "%s: --preferences option requires a file name argument.\n",
+ 		    argv[0]);
+ 	    exit(1);
+@@ -155,7 +161,7 @@
+     } 
+     hom = getenv("HOME");
+     if (!hom) {
+-	fprintf(stderr, "%s: HOME envar not defined\n", argv[0]);
++	fprintf(logout, "%s: HOME envar not defined\n", argv[0]);
+ 	exit(1);
+     }
+     snprintf(rc_file, PATH_MAX, "%s/.electricsheep/preferences.xml", hom);
+@@ -281,15 +287,15 @@
+ 
+ int mysystem(char *cmd, char *msg) {
+     int n;
+-    if (0) fprintf(stderr, "subprocess; (%s)\n", cmd);
++    if (0) fprintf(logout, "subprocess; (%s)\n", cmd);
+     if (0 != (n = interruptable_system(cmd))) {
+ 	if (SIGINT != n) {
+ 	    if (!prefs.hide_errors)
+-		fprintf(stderr, "subprocess error: %s, %d=%d<<8+%d\n",
++		fprintf(logout, "subprocess error: %s, %d=%d<<8+%d\n",
+ 			msg, n, n>>8, n&255);
+ 	    return 1;
+ 	}
+-	fprintf(stderr, "control-c during %s, exiting\n", msg);
++	fprintf(logout, "control-c during %s, exiting\n", msg);
+ 	cleanup_and_exit(1);
+     }
+     return 0;
+@@ -325,7 +331,7 @@
+ 	int bytes_read;
+ 	void *buff = XML_GetBuffer(parser, XML_BUFF_SIZE);
+ 	if (buff == NULL) {
+-	    fprintf(stderr, "unable to allocate buffer.\n");
++	    fprintf(logout, "unable to allocate buffer.\n");
+ 	    exit(1);
+ 	}
+ 
+@@ -334,7 +340,7 @@
+ 	    break;
+ 
+ 	if (! XML_ParseBuffer(parser, bytes_read, bytes_read == 0)) {
+-	    fprintf(stderr, "parse error.\n");
++	    fprintf(logout, "parse error.\n");
+ 	    exit(1);
+ 	}
+     }
+@@ -441,7 +447,7 @@
+ 
+ void init_curl_cmd(int registration) {
+ 
+-  if (debug) fprintf(stderr, "init_curl_cmd %d\n", registration);
++  if (debug) fprintf(logout, "init_curl_cmd %d\n", registration);
+ 
+     if (prefs.proxy_name) {
+ 	snprintf(curl_cmd, MAXBUF, "nice -n %d curl --location --proxy %s",
+@@ -472,7 +478,7 @@
+ 	}
+     }
+     server = dream_server;
+-    if (debug) fprintf(stderr, "curl_cmd = %s\nserver = %s\n", curl_cmd, server);
++    if (debug) fprintf(logout, "curl_cmd = %s\nserver = %s\n", curl_cmd, server);
+ }
+ 
+ void init_list_cmd (char *buf) {
diff --git a/community/fceux/PKGBUILD b/community/fceux/PKGBUILD
index fe25715f7..9c1632d33 100644
--- a/community/fceux/PKGBUILD
+++ b/community/fceux/PKGBUILD
@@ -1,35 +1,45 @@
-# $Id: PKGBUILD 49458 2011-06-16 19:25:29Z angvp $
-# Maintainer: Eric Belanger <eric@archlinux.org>
-# Contributor: Jo Christian Bergsk�s <jcberg@gmail.com>
-
+# $Id: PKGBUILD 57567 2011-10-30 20:09:10Z arodseth $
+# Maintainer: Alexander Rødseth <rodseth@gmail.com>
+# Contributor: Eric Belanger <eric@archlinux.org>
+# Contributor: Jo Christian Bergskås <jcberg@gmail.com>
 pkgname=fceux
 pkgver=2.1.5
-pkgrel=1
-arch=('i686' 'x86_64' 'mips64el')
-url="http://fceux.com/web/home.html"
-pkgdesc="A fast and ultra-compatible NES/Famicom emulator with SDL, OpenGL and SVGALIB support"
+pkgrel=3
+arch=('x86_64' 'i686' 'mips64el')
+url="http://fceux.com/"
+pkgdesc="Fast and ultra-compatible NES/Famicom emulator"
 license=('GPL')
-depends=('sdl' 'lua' 'gtk2')
-makedepends=('scons' 'mesa')
-optdepends=('xchm: for viewing the help manual')
+depends=('sdl' 'gtk2' 'gd' 'desktop-file-utils')
+makedepends=('scons' 'mesa' 'lua')
+optdepends=('xchm: for viewing the manual')
 provides=('fceu' 'gfceux')
 replaces=('fceu' 'gfceux')
-source=(http://downloads.sourceforge.net/fceultra/$pkgname-${pkgver}.src.tar.bz2 \
-        fceux.desktop fceux.png)
+install=fceux.install
+source=("http://downloads.sourceforge.net/fceultra/$pkgname-$pkgver.src.tar.bz2"
+        "fceux.desktop"
+        "fceux.png")
+md5sums=('e8b20e62bbbb061b1a59d51b47c827bd'
+         '3c6a259d88825ff1b9387d191a6c970e'
+         '3fe753731ac46b5fee528b1f73abd3e3')
 
 build() {
-  cd "${srcdir}/fceu$pkgver"
-  scons
+  cd "$srcdir/fceu${pkgver}"
 
-  sed -i "s|/usr/local|${pkgdir}/usr|" SConstruct
-  scons install
+  sed -i "s|/usr/local|$pkgdir/usr|" SConstruct
+  scons OPENGL=0 install
+}
 
-  install -D -m644 bin/$pkgname.chm "${pkgdir}/usr/share/doc/$pkgname/$pkgname.chm"
-  install -D -m644 "$srcdir"/fceux.desktop "${pkgdir}"/usr/share/applications/fceux.desktop
-  install -D -m644 "$srcdir"/fceux.png "$pkgdir"/usr/share/pixmaps/fceux.png
+package() {
+  cd "$srcdir/fceu${pkgver}"
+
+  install -Dm644 bin/$pkgname.chm \
+    "$pkgdir/usr/share/doc/$pkgname/$pkgname.chm"
+  install -Dm644 $srcdir/fceux.desktop \
+    "$pkgdir/usr/share/applications/fceux.desktop"
+  install -Dm644 $srcdir/fceux.png \
+    "$pkgdir/usr/share/pixmaps/fceux.png"
+  install -Dm644 COPYING \
+    "$pkgdir/usr/share/licenses/$pkgname/COPYING"
 }
 
 # vim:set ts=2 sw=2 et:
-md5sums=('e8b20e62bbbb061b1a59d51b47c827bd'
-         '30baf915c936926fa50f59d8276f6575'
-         '3fe753731ac46b5fee528b1f73abd3e3')
diff --git a/community/fceux/fceux.desktop b/community/fceux/fceux.desktop
new file mode 100644
index 000000000..c20271a77
--- /dev/null
+++ b/community/fceux/fceux.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=Fceux
+GenericName=NES/Famicom emulator
+Exec=fceux
+Icon=fceux
+Type=Application
+Categories=Game;Emulator;
+Encoding=UTF-8
+MimeType=application/x-nes;application/x-nes-rom
diff --git a/community/fceux/fceux.install b/community/fceux/fceux.install
new file mode 100644
index 000000000..ad97d7bab
--- /dev/null
+++ b/community/fceux/fceux.install
@@ -0,0 +1,13 @@
+post_upgrade() {
+  update-desktop-database -q
+}
+
+post_install() {
+  post_upgrade
+}
+
+post_remove() {
+  post_upgrade
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/fceux/fceux.png b/community/fceux/fceux.png
new file mode 100644
index 000000000..1cf27b1fd
--- /dev/null
+++ b/community/fceux/fceux.png
diff --git a/community/libee/PKGBUILD b/community/libee/PKGBUILD
new file mode 100644
index 000000000..dec3ed023
--- /dev/null
+++ b/community/libee/PKGBUILD
@@ -0,0 +1,28 @@
+# $Id: PKGBUILD 62738 2012-01-25 15:37:48Z spupykin $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Maintainer: Brian Knox <taotetek@gmail.com>
+
+pkgname=libee
+pkgver=0.3.1
+pkgrel=3
+pkgdesc="event expression library inspired by CEE"
+url="http://www.libee.org/"
+arch=('i686' 'x86_64')
+license=('LGPL2.1')
+depends=('libestr')
+makedepends=()
+optdepends=()
+options=(!libtool)
+source=("http://www.libee.org/files/download/libee-$pkgver.tar.gz")
+md5sums=('61403a9a62b984381cf48454664f915e')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  ./configure --prefix=/usr
+  make -j1
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make install DESTDIR=${pkgdir}
+}
diff --git a/community/libestr/PKGBUILD b/community/libestr/PKGBUILD
new file mode 100644
index 000000000..adb612d56
--- /dev/null
+++ b/community/libestr/PKGBUILD
@@ -0,0 +1,25 @@
+# $Id: PKGBUILD 62740 2012-01-25 15:38:28Z spupykin $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Maintainer: Brian Knox <taotetek@gmail.com>
+
+pkgname=libestr
+pkgver=0.1.2
+pkgrel=2
+pkgdesc="essentials for string handling (and a bit more)"
+url="http://libestr.adiscon.com/"
+arch=('i686' 'x86_64')
+license=('LGPL2.1')
+depends=()
+options=(!libtool)
+source=("http://libestr.adiscon.com/files/download/libestr-$pkgver.tar.gz")
+md5sums=('30ec4054155dc7d7e9b06418181c4f12')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  ./configure --prefix=/usr
+  make
+}
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make install DESTDIR=${pkgdir}
+}
diff --git a/community/libmicrohttpd/PKGBUILD b/community/libmicrohttpd/PKGBUILD
index 37f165f92..d7ca5a4be 100644
--- a/community/libmicrohttpd/PKGBUILD
+++ b/community/libmicrohttpd/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 59260 2011-11-22 06:42:34Z spupykin $
+# $Id: PKGBUILD 62677 2012-01-24 12:51:51Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Norberto Lopes <shelika@mail.telepac.pt>
 # Contributor: Kao Dome <kaodome@gmail.com>
@@ -6,7 +6,7 @@
 # Contributor: Mathias Rohnstock <linksoft@gmx.de>
 
 pkgname=libmicrohttpd
-pkgver=0.9.17
+pkgver=0.9.18
 pkgrel=1
 pkgdesc="a small C library that is supposed to make it easy to run an HTTP server as part of another application."
 arch=('i686' 'x86_64' 'mips64el')
@@ -16,7 +16,7 @@ options=('!libtool')
 depends=('gnutls' 'libgcrypt')
 install=libmicrohttpd.install
 source=(ftp://ftp.gnu.org/gnu/libmicrohttpd/$pkgname-$pkgver.tar.gz)
-md5sums=('d6802049c806e903ef1fa9c5b847e555')
+md5sums=('af0f282b92413f414cb6daf2d2f618c7')
 
 build() {
   cd ${pkgname}-${pkgver}
diff --git a/community/lightspark/PKGBUILD b/community/lightspark/PKGBUILD
index 2ffa1c59a..a49e2aa10 100644
--- a/community/lightspark/PKGBUILD
+++ b/community/lightspark/PKGBUILD
@@ -2,8 +2,8 @@
 # Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com>
 
 pkgname=lightspark
-pkgver=0.5.3
-pkgrel=2
+pkgver=0.5.4
+pkgrel=1
 pkgdesc='An alternative Flash Player for Linux.'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://lightspark.sourceforge.net'
@@ -15,12 +15,12 @@ optdepends=('gnash-gtk: fallback support')
 install="lightspark.install"
 source=("http://launchpad.net/lightspark/trunk/lightspark-${pkgver}/+download/lightspark-${pkgver}.tar.gz"
         'llvm29.diff')
-md5sums=('2d4519c61aabc34cbba97120f5c01d18'
+md5sums=('1101e1d1cb1b55b84b9214ef02217ec3'
          '5f717d1d9ead478184ca68f6ac068099')
 
 build() {
-  cd lightspark-${pkgver}
-  patch -Np0 -i ${srcdir}/llvm29.diff
+  #cd lightspark-${pkgver}
+  #patch -Np0 -i ${srcdir}/llvm29.diff
   cd ${srcdir}
 
   rm -rf build
diff --git a/community/mednafen/ChangeLog b/community/mednafen/ChangeLog
new file mode 100644
index 000000000..a3097076c
--- /dev/null
+++ b/community/mednafen/ChangeLog
@@ -0,0 +1,6 @@
+2011-05-17 Angel Velasquez <angvp@archlinux.org>
+    * Updated to 0.8.D.3
+	* Removed fix_build patch
+	* Cleaned PKGBUILD
+	* Adding ChangeLog
+
diff --git a/community/mednafen/PKGBUILD b/community/mednafen/PKGBUILD
new file mode 100755
index 000000000..88e469afc
--- /dev/null
+++ b/community/mednafen/PKGBUILD
@@ -0,0 +1,26 @@
+# Maintainer: Angel Velasquez <angvp@archlinux.org> 
+# Contributor: Daenyth <Daenyth+Arch [at] gmail [dot] com>
+# Contributor: kagan <juanynie@mi.madritel.es>
+pkgname=mednafen
+pkgver=0.8.D.3
+pkgrel=1
+pkgdesc="A command-line multi-system gaming emulator"
+url="http://mednafen.sourceforge.net/"
+license=(GPL)
+arch=('i686' 'x86_64')
+depends=('libcdio>=0.82' 'libsamplerate' 'libogg' 'libvorbis' 'sdl' 'sdl_net' 'libsndfile' 'zlib')
+makedepends=('pkgconfig' 'mesa')
+changelog=ChangeLog
+source=(http://downloads.sourceforge.net/mednafen/$pkgname-$pkgver.tar.bz2)
+md5sums=('57d22805071becd81858b0c088a275e5')
+
+build() {
+  cd $srcdir/$pkgname
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd $srcdir/$pkgname
+  make DESTDIR=$pkgdir install
+}
diff --git a/community/megaglest/PKGBUILD b/community/megaglest/PKGBUILD
index a1f316dc2..265ddeed9 100644
--- a/community/megaglest/PKGBUILD
+++ b/community/megaglest/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 62066 2012-01-15 14:56:57Z svenstaro $
+# $Id: PKGBUILD 62705 2012-01-24 21:51:26Z svenstaro $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Larry Hajali <larryhaja [at] gmail [dot] com>
  
 pkgname=megaglest
-pkgver=3.6.0.2
+pkgver=3.6.0.3
 pkgrel=1
 pkgdesc="Fork of Glest, a 3D real-time strategy game in a fantastic world."
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ depends=('curl' 'megaglest-data' 'xerces-c' 'sdl' 'libvorbis' 'openal' 'libgl' '
          'libircclient' 'miniupnpc' 'wxgtk')
 makedepends=('ftjam' 'cmake' 'mesa')
 source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-source-${pkgver}.tar.xz")
-md5sums=('9d840a04b41aef2cba503de7bf433b8d')
+md5sums=('e939cbbb85c35e66c67ec2aa6f6b7f0b')
 
 build() {
   cd "${srcdir}"/"${pkgname}"-"${pkgver}"/
diff --git a/community/miredo/PKGBUILD b/community/miredo/PKGBUILD
index 289ae5564..9c3ca8400 100644
--- a/community/miredo/PKGBUILD
+++ b/community/miredo/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 59154 2011-11-21 12:39:37Z spupykin $
+# $Id: PKGBUILD 62679 2012-01-24 12:52:57Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=miredo
-pkgver=1.2.3
+pkgver=1.2.4
 pkgrel=1
 pkgdesc="Teredo client and server."
 arch=('i686' 'x86_64' 'mips64el')
@@ -17,7 +17,7 @@ source=(http://www.remlab.net/files/${pkgname}/${pkgname}-${pkgver}.tar.bz2
 	miredo.install
 	miredo.rc.d
 	miredo-server.rc.d)
-md5sums=('6ba484ad5e331514a8a3452da2b144e7'
+md5sums=('1281e7e75bddbde244cd778d99fa22d4'
          '51ab6d091192605ee9206944869cb2ab'
          'd1b655d7a851cdb46c91c3418ed1962f'
          'c5a9be5c3175fecec387f1710bfd2788'
diff --git a/community/nestopia/ChangeLog b/community/nestopia/ChangeLog
new file mode 100644
index 000000000..5077d00b2
--- /dev/null
+++ b/community/nestopia/ChangeLog
@@ -0,0 +1,12 @@
+2008-12-16  Tiago Pierezan Camargo  <tcamargo@gmail.com>
+
+	* PKGBUILD: Minor corrections.
+
+2008-12-04  Tiago Pierezan Camargo  <tcamargo@gmail.com>
+
+	* PKGBUILD (source): Package adopted.
+	Variable/version cleanup.
+	Patch to remove bogus error messages on program exit.
+	New dependency: mesa.
+	Renamed executable to nestopia.
+
diff --git a/community/nestopia/PKGBUILD b/community/nestopia/PKGBUILD
new file mode 100644
index 000000000..0cff030f3
--- /dev/null
+++ b/community/nestopia/PKGBUILD
@@ -0,0 +1,46 @@
+# $Id: PKGBUILD 53185 2011-07-31 19:02:49Z spupykin $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Contributor: Tiago Pierezan Camargo <tcamargo@gmail.com>
+# Contributor: robb_force <robb_force@holybuffalo.net>
+
+pkgname=nestopia
+pkgver=1.40h
+pkgrel=4
+pkgdesc='An NES emulator featuring cycle exact emulation, a ridiculous number of mappers, and lots of custom sound chips.'
+url='http://rbelmont.mameworld.info/?page_id=200'
+license=('GPL')
+arch=('i686' 'x86_64')
+depends=('sdl>=1.2.12' 'alsa-lib' 'gtk2>=2.4' 'mesa')
+makedepends=('unzip')
+# rbelmont.mameworld.info blocks some user-agents
+DLAGENTS=('http::/usr/bin/wget -c -t 3 --waitretry=3 --user-agent=Mozilla/5.0 -O %o %u'
+	  'https::/usr/bin/wget -c -t 3 --waitretry=3 --no-check-certificate -O %o %u')
+source=("https://downloads.sourceforge.net/project/nestopia/Nestopia/v${pkgver//[a-z]/}/Nestopia${pkgver//[.a-z]/}src.zip"
+	"http://rbelmont.mameworld.info/nst${pkgver//[a.a-z]/}_lnx_release_${pkgver:${#pkgver}-1:1}.zip"
+	"nestopia"
+	"nestopia_bogus_error_on_save_settings.patch")
+md5sums=('526c99a06d2b257135e7047b0ed95ae0'
+         'f9a9a905bada67e11dac1364612d0b35'
+         'abc2f030dd291f58d65c9095ef024225'
+         '0160078c9afcbb1a6ac389c3989929f7')
+
+build() {
+  cd ${srcdir}
+  # remove a bogus error message on exit
+  patch -p0 < nestopia_bogus_error_on_save_settings.patch
+  make -j1
+
+  # Install the nestopia script that copies required files to ~/.nestopia
+  install -Dm755 ${srcdir}/${pkgname} ${pkgdir}/usr/bin/${pkgname}
+
+  # Older releases used a .sh file. Make a symlink to make everyone happy
+  cd ${pkgdir}/usr/bin
+  ln -s ${pkgname} ${pkgname}.sh
+
+  # Install the required files and executable in /usr/share
+  cd ${srcdir}
+  install -Dm755 nst ${pkgdir}/usr/bin/${pkgname}-bin
+  install -dm775 ${pkgdir}/usr/share/${pkgname}/
+  install -m644 nstcontrols ${pkgdir}/usr/share/${pkgname}/
+  install -m644 NstDatabase.xml ${pkgdir}/usr/share/${pkgname}/
+}
diff --git a/community/nestopia/nestopia b/community/nestopia/nestopia
new file mode 100644
index 000000000..52bd2b2b3
--- /dev/null
+++ b/community/nestopia/nestopia
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+if [ ! -e $HOME/.nestopia ]; then
+  echo "Running NEStopia for the first time..."
+  echo "Copying required files to ~/.nestopia..."
+  mkdir $HOME/.nestopia
+  cp /usr/share/nestopia/{nstcontrols,NstDatabase.xml} $HOME/.nestopia/
+fi
+
+nestopia-bin "$@"
diff --git a/community/nestopia/nestopia_bogus_error_on_save_settings.patch b/community/nestopia/nestopia_bogus_error_on_save_settings.patch
new file mode 100644
index 000000000..63f33bc72
--- /dev/null
+++ b/community/nestopia/nestopia_bogus_error_on_save_settings.patch
@@ -0,0 +1,11 @@
+--- source/linux/settings.cpp.old	2008-10-23 05:45:58.000000000 +0200
++++ source/linux/settings.cpp	2008-12-04 23:17:59.000000000 +0100
+@@ -16,7 +16,7 @@
+ using namespace LinuxNst;
+ 
+ #define READ_SETTING(x) fread(&x, sizeof(x), 1, f)
+-#define WRITE_SETTING(x) if (fwrite(&x, sizeof(x), 1, f) != sizeof(x)) std::cout << "Error writing setting!\n"
++#define WRITE_SETTING(x) if (fwrite(&x, sizeof(x), 1, f) != 1) std::cout << "Error writing setting!\n"
+ 
+ static int rates[4] = { 11025, 22050, 44100, 48000 };
+ 
diff --git a/community/parrot/PKGBUILD b/community/parrot/PKGBUILD
index e3bed3e31..5c5fcf876 100644
--- a/community/parrot/PKGBUILD
+++ b/community/parrot/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 58586 2011-11-16 05:16:04Z spupykin $
+# $Id: PKGBUILD 62750 2012-01-25 18:56:38Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributer: mpie <michael.kyne-phillips1@ntlworld.com>
 
 pkgname=parrot
-pkgver=3.10.0
-_rel=devel
-#_rel=stable
+pkgver=4.0.0
+#_rel=devel
+_rel=stable
 pkgrel=2
 pkgdesc="standalone virtual machine that can be used to execute bytecode compiled dynamic languages"
 arch=(i686 x86_64 'mips64el')
@@ -16,7 +16,7 @@ makedepends=('perl-json')
 optdepends=('freeglut')
 options=(!emptydirs !makeflags)
 source=(ftp://ftp.parrot.org/pub/parrot/releases/${_rel}/$pkgver/parrot-$pkgver.tar.gz)
-md5sums=('36a839beaef511f178b0607a03f1ff0f')
+md5sums=('fc613c41771baf79307c519072302299')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
diff --git a/community/portmidi/PKGBUILD b/community/portmidi/PKGBUILD
index 1ddd9bd97..033f881a6 100644
--- a/community/portmidi/PKGBUILD
+++ b/community/portmidi/PKGBUILD
@@ -1,19 +1,21 @@
-# $Id: PKGBUILD 31348 2010-10-30 15:46:33Z lfleischer $
+# $Id: PKGBUILD 62694 2012-01-24 20:35:44Z lfleischer $
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: SpepS <dreamspepser at yahoo dot it>
 # Contributor: Denis Martinez <deuns.martinez AT gmail DOT com>
 
 pkgname=portmidi
 pkgver=217
-pkgrel=2
+pkgrel=3
 pkgdesc="Platform independent library for real-time MIDI input/output."
 arch=('i686' 'x86_64' 'mips64el')
 url='http://portmedia.sourceforge.net/'
 license=('GPL')
 depends=('alsa-lib')
 makedepends=('cmake' 'java-environment')
-source=("http://downloads.sourceforge.net/project/portmedia/${pkgname}/${pkgver}/${pkgname}-src-${pkgver}.zip")
-md5sums=('03f46fd3947e2ef4c8c465baaf832241')
+source=("http://downloads.sourceforge.net/project/portmedia/${pkgname}/${pkgver}/${pkgname}-src-${pkgver}.zip"
+        'portmidi-217-build-fix.patch')
+md5sums=('03f46fd3947e2ef4c8c465baaf832241'
+         '59cb428b29a33bab3bb5811cda479a9b')
 
 build() {
   cd "${srcdir}/${pkgname}"
@@ -21,6 +23,9 @@ build() {
   sed -i "s#/usr/local#/usr#" */CMakeLists.txt pm_python/setup.py
   mkdir -p pm_java/Release
 
+  # build fix for "pm_java/CMakeLists.txt" (fixes FS#27118)
+  patch -p1 -i ../portmidi-217-build-fix.patch
+
   cmake . -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_ARCHIVE_OUTPUT_DIRECTORY=Release \
     -DCMAKE_LIBRARY_OUTPUT_DIRECTORY=Release \
diff --git a/community/portmidi/portmidi-217-build-fix.patch b/community/portmidi/portmidi-217-build-fix.patch
new file mode 100644
index 000000000..3e2dfef29
--- /dev/null
+++ b/community/portmidi/portmidi-217-build-fix.patch
@@ -0,0 +1,29 @@
+diff -rup portmidi.orig/pm_java/CMakeLists.txt portmidi/pm_java/CMakeLists.txt
+--- portmidi.orig/pm_java/CMakeLists.txt	2009-11-04 16:20:44.000000000 +0100
++++ portmidi/pm_java/CMakeLists.txt	2012-01-24 21:13:08.513182169 +0100
+@@ -15,13 +15,11 @@ if(UNIX)
+     add_custom_command(OUTPUT pmdefaults/PmDefaultsFrame.class
+         COMMAND javac -classpath . pmdefaults/PmDefaultsFrame.java
+ 	MAIN_DEPENDENCY pmdefaults/PmDefaultsFrame.java
+-	DEPENDS pmdefaults/PmDefaults.java
+-	WORKING_DIRECTORY pm_java)
++	DEPENDS pmdefaults/PmDefaults.java)
+     add_custom_command(OUTPUT pmdefaults/PmDefaults.class
+         COMMAND javac -classpath . pmdefaults/PmDefaults.java
+ 	MAIN_DEPENDENCY pmdefaults/PmDefaults.java
+-	DEPENDS pmdefaults/PmDefaultsFrame.java
+-	WORKING_DIRECTORY pm_java)
++	DEPENDS pmdefaults/PmDefaultsFrame.java)
+     add_custom_command(OUTPUT ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/pmdefaults.jar
+         COMMAND	cp pmdefaults/portmusic_logo.png .
+         COMMAND	jar cmf pmdefaults/manifest.txt pmdefaults.jar
+@@ -31,8 +29,7 @@ if(UNIX)
+ 	COMMAND mv pmdefaults.jar ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}
+ 	COMMAND rm portmusic_logo.png
+ 	MAIN_DEPENDENCY pmdefaults/PmDefaults.class
+-	DEPENDS ${PMDEFAULTS_ALL_CLASSES}
+-	WORKING_DIRECTORY pm_java)
++	DEPENDS ${PMDEFAULTS_ALL_CLASSES})
+     add_custom_target(pmdefaults_target ALL 
+         DEPENDS ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/pmdefaults.jar)
+     # message(STATUS "add_custom_target: pmdefaults.jar")
diff --git a/community/rsyslog/PKGBUILD b/community/rsyslog/PKGBUILD
index 6d3bb3f4c..6f0bfed5e 100644
--- a/community/rsyslog/PKGBUILD
+++ b/community/rsyslog/PKGBUILD
@@ -1,20 +1,20 @@
-# $Id: PKGBUILD 58329 2011-11-11 14:26:11Z spupykin $
+# $Id: PKGBUILD 62742 2012-01-25 15:39:27Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=rsyslog
-pkgver=5.8.6
+pkgver=6.2.0
 pkgrel=1
 pkgdesc="An enhanced multi-threaded syslogd with a focus on security and reliability"
 url="http://www.rsyslog.com/"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL3')
-depends=('zlib')
+depends=('zlib' 'libestr' 'libee')
 makedepends=('postgresql-libs>=8.4.1' 'libmysqlclient' 'net-snmp' 'gnutls')
 optdepends=('postgresql-libs: PostgreSQL Database Support'
 	    'libmysqlclient: MySQL Database Support'
 	    'net-snmp'
 	    'gnutls')
-backup=('etc/rsyslog.conf' \
+backup=('etc/rsyslog.conf'
 	'etc/logrotate.d/rsyslog'
 	'etc/conf.d/rsyslog')
 options=('strip' 'zipman' '!libtool')
@@ -22,13 +22,14 @@ source=("http://www.rsyslog.com/files/download/rsyslog/rsyslog-$pkgver.tar.gz"
 	'rsyslog'
 	'rsyslog.logrotate'
 	'rsyslog.conf.d')
-md5sums=('c46db0496066b82faf735bd4222208d7'
+md5sums=('03e237abaa5d47f92c6e655f92f22532'
          'a18bbcbb6ebdaa13a6ec6d9f3d9eb2da'
          '8065db4bef3061a4f000ba58779f6829'
          '1a0cd4530dd5d1439456d5ae230574d9')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
+  export LDFLAGS="-lestr"
   ./configure --prefix=/usr \
               --enable-mysql \
               --enable-pgsql \
diff --git a/community/setconf/PKGBUILD b/community/setconf/PKGBUILD
index e8dcf7cec..7c1f188be 100644
--- a/community/setconf/PKGBUILD
+++ b/community/setconf/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 61589 2012-01-03 23:37:49Z arodseth $
+# $Id: PKGBUILD 62734 2012-01-25 13:50:09Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 pkgname=setconf
 pkgver=0.3.2
-pkgrel=1
-pkgdesc="Utility to easily change settings in Makefiles and other configuration files"
+pkgrel=3
+pkgdesc="Utility to easily change settings in Makefiles and configuration files"
 arch=('x86_64' 'i686')
 url="http://setconf.roboticoverlords.org/"
 license=('GPL')
 depends=('pcre' 'gc')
-makedepends=('shedskin>=0.1.2')
+makedepends=('shedskin>=0.9.1')
 source=("http://setconf.roboticoverlords.org/$pkgname-$pkgver.tbz2")
 sha256sums=('8b18e11da7adf78f2e21c39cfa949b178fa1b2f85e691b85be123023b7303f03')
 
diff --git a/community/sigil/PKGBUILD b/community/sigil/PKGBUILD
index 7258bc6be..cfb9b390e 100644
--- a/community/sigil/PKGBUILD
+++ b/community/sigil/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 61097 2011-12-21 20:52:48Z andrea $
+# $Id: PKGBUILD 62685 2012-01-24 13:11:44Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Larry Hajali <larryhaja [at] gmail [dot] com>
 
 pkgname=sigil
-pkgver=0.4.2
-pkgrel=3
+pkgver=0.5.0
+pkgrel=1
 pkgdesc="A WYSIWYG ebook editor"
 arch=('i686' 'x86_64' 'mips64el') 
 url="http://code.google.com/p/sigil/"
@@ -14,7 +14,7 @@ makedepends=('cmake')
 install=sigil.install
 source=("http://sigil.googlecode.com/files/Sigil-${pkgver}-Code.zip"
         "${pkgname}.desktop")
-md5sums=('ce27976254236f8b11b787fd05be9acb'
+md5sums=('8deb8ae451d485698ab9330dccfe46e5'
          'fef6aa492af487ccccd6b133635cee5a')
 
 build() {
@@ -28,7 +28,7 @@ build() {
     -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_SKIP_RPATH=ON ..
 
-    make
+  make
 }
 
 package() {
diff --git a/community/tmux/PKGBUILD b/community/tmux/PKGBUILD
index c37dbd826..6f5bf908f 100644
--- a/community/tmux/PKGBUILD
+++ b/community/tmux/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 51497 2011-07-10 19:49:12Z spupykin $
+# $Id: PKGBUILD 62681 2012-01-24 12:53:39Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer:  TDY <tdy@gmx.com>
 # Contributor: Grigorios Bouzakis <grbzks[at]gmail[dot]com>
 
 pkgname=tmux
-pkgver=1.5
+pkgver=1.6
 pkgrel=1
 pkgdesc="A terminal multiplexer"
 url="http://tmux.sourceforge.net/"
@@ -13,7 +13,7 @@ license=('BSD')
 depends=('ncurses' 'libevent')
 source=(http://downloads.sourceforge.net/tmux/tmux-$pkgver.tar.gz
 	LICENSE)
-md5sums=('3d4b683572af34e83bc8b183a8285263'
+md5sums=('3e37db24aa596bf108a0442a81c845b3'
          '71601bc37fa44e4395580b321963018e')
 
 build() {
diff --git a/community/vidalia/PKGBUILD b/community/vidalia/PKGBUILD
new file mode 100644
index 000000000..9bb33a812
--- /dev/null
+++ b/community/vidalia/PKGBUILD
@@ -0,0 +1,32 @@
+# $Id: PKGBUILD 62747 2012-01-25 18:13:51Z tredaelli $
+# Maintainer: Timothy Redaelli <timothy.redaelli@gmail.com>
+# Contributor: Rorschach <r0rschach@lavabit.com>
+
+pkgname=vidalia
+pkgver=0.2.15
+pkgrel=1
+pkgdesc="Controller GUI for Tor"
+url="https://www.torproject.org/vidalia"
+arch=('i686' 'x86_64')
+license=('GPL')
+depends=('qt' 'tor')
+makedepends=('cmake')
+install=vidalia.install
+source=("https://www.torproject.org/vidalia/dist/$pkgname-$pkgver.tar.gz")
+md5sums=(845b627eb2534aa5da29efd6c8d30978)
+
+build() {
+  [[ -f /etc/profile.d/qt4.sh ]] && source /etc/profile.d/qt4.sh
+
+  cd "$srcdir"
+  mkdir build
+  cd build
+  cmake -D CMAKE_INSTALL_PREFIX=/usr ../$pkgname-$pkgver
+  make
+}
+
+package() {
+  cd "$srcdir/build"
+  make DESTDIR="$pkgdir/" install
+  install -Dm644 ../$pkgname-$pkgver/doc/vidalia.1 "$pkgdir"/usr/share/man/man1/vidalia.1 || return 1
+}
diff --git a/community/vidalia/vidalia.install b/community/vidalia/vidalia.install
new file mode 100644
index 000000000..58b897a0a
--- /dev/null
+++ b/community/vidalia/vidalia.install
@@ -0,0 +1,11 @@
+post_install() {
+    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+}
+
+post_upgrade() {
+    post_install
+}
+
+post_remove() {
+    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+}
diff --git a/core/curl/PKGBUILD b/core/curl/PKGBUILD
index eb142196f..f8653faad 100644
--- a/core/curl/PKGBUILD
+++ b/core/curl/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 143109 2011-11-23 02:58:17Z dreisner $
+# $Id: PKGBUILD 147269 2012-01-25 13:57:06Z dreisner $
 # Maintainer: Dave Reisner <dreisner@archlinux.org>
 # Contributor: Angel Velasquez <angvp@archlinux.org>
 # Contributor: Eric Belanger <eric@archlinux.org>
@@ -6,20 +6,19 @@
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgname=curl
-pkgver=7.23.1
-pkgrel=2
+pkgver=7.24.0
+pkgrel=1
 pkgdesc="An URL retrival utility and library"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://curl.haxx.se"
 license=('MIT')
 depends=('ca-certificates' 'libssh2' 'openssl' 'zlib')
-makedepends=('perl-libwww')
 options=('!libtool')
 source=("http://curl.haxx.se/download/$pkgname-$pkgver.tar.gz"{,.asc}
         fix-J-with-O-regression.patch
         curlbuild.h)
-md5sums=('8e23151f569fb54afef093ac0695077d'
-         '5d8eb7e2e38be0fb00a043f714f6d49f'
+md5sums=('b93420f80a2baaa61a0f45214eddc2ba'
+         '710242df6bc318d16eea611e7d1b1410'
          'aa4539ec4f4a2dad1663dc22dd3ab0a1'
          '751bd433ede935c8fae727377625a8ae')
 
@@ -33,11 +32,7 @@ case $ptrsize in
 esac
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  # upstream bugfix
-  # http://curl.haxx.se/mail/archive-2011-11/0030.html
-  patch -Np1 < "$srcdir/fix-J-with-O-regression.patch"
+  cd "$pkgname-$pkgver"
 
   ./configure \
       --prefix=/usr \
@@ -52,11 +47,12 @@ build() {
       --without-libidn \
       --with-random=/dev/urandom \
       --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt
+
   make
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd "$pkgname-$pkgver"
 
   make DESTDIR="$pkgdir" install
 
diff --git a/core/gcc/PKGBUILD b/core/gcc/PKGBUILD
index 748052b09..32a53b565 100644
--- a/core/gcc/PKGBUILD
+++ b/core/gcc/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 145915 2012-01-04 01:24:59Z allan $
+# $Id: PKGBUILD 147558 2012-01-25 22:42:47Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 
 # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc
@@ -10,8 +10,8 @@ else
     pkgname=('gcc' 'gcc-libs' 'gcc-fortran' 'gcc-objc')
 fi
 pkgver=4.6.2
-pkgrel=5
-_snapshot=4.6-20111223
+pkgrel=6
+_snapshot=4.6-20120120
 _libstdcppmanver=20111215		# Note: check source directory name when updating this
 pkgdesc="The GNU Compiler Collection"
 arch=('i686' 'x86_64' 'mips64el')
@@ -30,6 +30,11 @@ source=(#ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2
 	gcc_pure64.patch
         gcc_mips64el_lib.patch
 	gcc-hash-style-both.patch)
+md5sums=('f7ca5d9f7a07216577f81318b7cf56ef'
+         '450772ce32daed97d7383199f8797f33'
+         '4030ee1c08dd1e843c0225b772360e76'
+         '67e337993d821d72fccacbed52d48c34'
+         '4df25b623799b148a0703eaeec8fdf3f')
 
 if [ -n "${_snapshot}" ]; then
   _basedir="${srcdir}/gcc-${_snapshot}"
@@ -73,11 +78,12 @@ build() {
       --enable-shared --enable-threads=posix \
       --with-system-zlib --enable-__cxa_atexit \
       --disable-libunwind-exceptions --enable-clocale=gnu \
+      --disable-libstdcxx-pch --enable-libstdcxx-time \
       --enable-gnu-unique-object --enable-linker-build-id \
       --with-ppl --enable-cloog-backend=isl \
       --enable-lto --enable-gold --enable-ld=default \
       --enable-plugin --with-plugin-ld=ld.gold \
-      --disable-multilib --disable-libssp --disable-libstdcxx-pch \
+      --disable-multilib --disable-libssp \
       --enable-checking=release
   make
 }
@@ -158,6 +164,11 @@ package_gcc()
   install -m755 gcc/build/gengtype $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/
   install -m644 gcc/gtype.state $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/
 
+  # plugin headers are all over the place at the moment...
+  for i in common objc pragma pretty-print; do
+    ln -sf ../c-$i.h $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/plugin/include/c-family/c-$i.h
+  done
+
   # POSIX conformance launcher scripts for c89 and c99
   cat > $pkgdir/usr/bin/c89 <<"EOF"
 #!/bin/sh
@@ -266,8 +277,3 @@ package_gcc-go()
   install -Dm644 ${_basedir}/COPYING.RUNTIME \
     ${pkgdir}/usr/share/licenses/gcc-go/RUNTIME.LIBRARY.EXCEPTION
 }
-md5sums=('4755b9f6ac0abecbaa2097ed9738406a'
-         '450772ce32daed97d7383199f8797f33'
-         '4030ee1c08dd1e843c0225b772360e76'
-         '67e337993d821d72fccacbed52d48c34'
-         '4df25b623799b148a0703eaeec8fdf3f')
diff --git a/core/libarchive/PKGBUILD b/core/libarchive/PKGBUILD
index dfae5e946..a447951a5 100644
--- a/core/libarchive/PKGBUILD
+++ b/core/libarchive/PKGBUILD
@@ -1,16 +1,23 @@
-# $Id: PKGBUILD 146703 2012-01-16 19:48:41Z dreisner $
+# $Id: PKGBUILD 147657 2012-01-26 02:44:17Z dreisner $
 # Maintainer: Dan McGee <dan@archlinux.org>
+
 pkgname=libarchive
 pkgver=3.0.3
-pkgrel=2
+pkgrel=3
 pkgdesc="library that can create and read several streaming archive formats"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://libarchive.googlecode.com/"
 license=('BSD')
 depends=('zlib' 'bzip2' 'xz>=5.0.0' 'acl' 'openssl>=1.0.0' 'expat')
-source=("http://libarchive.googlecode.com/files/libarchive-${pkgver}.tar.gz")
-md5sums=('ca4090f0099432a9ac5a8b6618dc3892')
-sha256sums=('c5fc7620f74a54b1717e4aed38aee85dc27a988ad1db7640f28eb63a82ea62d7')
+source=("http://libarchive.googlecode.com/files/libarchive-${pkgver}.tar.gz"
+        'interpret-non-posix-zips.patch'
+        'test-with-zip-mtime.patch')
+md5sums=('ca4090f0099432a9ac5a8b6618dc3892'
+         'f02b88eb10877c7a7d527ed89c662e44'
+         '8366def6d7d70d424fa28a986c78c015')
+sha256sums=('c5fc7620f74a54b1717e4aed38aee85dc27a988ad1db7640f28eb63a82ea62d7'
+            '9d8240a360d61464dfc5a98342f520ad41b0f922261f2ace7ec1fefb8c289bdc'
+            'b7a8be5c1e3220960a9f67c9779b10d2663e25d72939546b4f01a49f1ee3a61f')
 
 # keep an upgrade path for older installations
 PKGEXT='.pkg.tar.gz'
@@ -18,6 +25,12 @@ PKGEXT='.pkg.tar.gz'
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
+  # http://code.google.com/p/libarchive/issues/detail?id=225
+  patch -Np0 <"$srcdir/interpret-non-posix-zips.patch"
+
+  # http://code.google.com/p/libarchive/issues/detail?id=231
+  patch -Np0 <"$srcdir/test-with-zip-mtime.patch"
+
   ./configure --prefix=/usr --without-xml2
   make
 }
@@ -25,8 +38,7 @@ build() {
 check() {
   cd "$srcdir/$pkgname-$pkgver"
 
-  # currently fails on i686 in a minor test involving atime updates (#60)
-  make check || :
+  make check
 }
 
 package() {
diff --git a/core/libarchive/interpret-non-posix-zips.patch b/core/libarchive/interpret-non-posix-zips.patch
new file mode 100644
index 000000000..63bc439d9
--- /dev/null
+++ b/core/libarchive/interpret-non-posix-zips.patch
@@ -0,0 +1,165 @@
+Index: libarchive/archive_read_support_format_zip.c
+===================================================================
+--- libarchive/archive_read_support_format_zip.c	(revision 4189)
++++ libarchive/archive_read_support_format_zip.c	(revision 4190)
+@@ -217,14 +217,13 @@
+ }
+ 
+ /*
+- * TODO: This is a performance sink because it forces
+- * the read core to drop buffered data from the start
+- * of file, which will then have to be re-read again
+- * if this bidder loses.
++ * TODO: This is a performance sink because it forces the read core to
++ * drop buffered data from the start of file, which will then have to
++ * be re-read again if this bidder loses.
+  *
+- * Consider passing in the winning bid value to subsequent
+- * bidders so that this bidder in particular can avoid
+- * seeking if it knows it's going to lose anyway.
++ * We workaround this a little by passing in the best bid so far so
++ * that later bidders can do nothing if they know they'll never
++ * outbid.  But we can certainly do better...
+  */
+ static int
+ archive_read_format_zip_seekable_bid(struct archive_read *a, int best_bid)
+@@ -311,19 +310,29 @@
+ 		external_attributes = archive_le32dec(p + 38);
+ 		zip_entry->local_header_offset = archive_le32dec(p + 42);
+ 
++		/* If we can't guess the mode, leave it zero here;
++		   when we read the local file header we might get
++		   more information. */
++		zip_entry->mode = 0;
+ 		if (zip_entry->system == 3) {
+ 			zip_entry->mode = external_attributes >> 16;
+-		} else {
+-			zip_entry->mode = AE_IFREG | 0777;
+ 		}
+ 
+-		/* Do we need to parse filename here? */
+-		/* Or can we wait until we read the local header? */
++		/* We don't read the filename until we get to the
++		   local file header.  Reading it here would speed up
++		   table-of-contents operations (removing the need to
++		   find and read local file header to get the
++		   filename) at the cost of requiring a lot of extra
++		   space. */
++		/* We don't read the extra block here.  We assume it
++		   will be duplicated at the local file header. */
+ 		__archive_read_consume(a,
+ 		    46 + filename_length + extra_length + comment_length);
+ 	}
+ 
+-	/* TODO: Sort zip entries. */
++	/* TODO: Sort zip entries by file offset so that we
++	   can optimize get_next_header() to use skip instead of
++	   seek. */
+ 
+ 	return ARCHIVE_OK;
+ }
+@@ -434,6 +443,11 @@
+ 			return (30);
+ 	}
+ 
++	/* TODO: It's worth looking ahead a little bit for a valid
++	 * PK signature.  In particular, that would make it possible
++	 * to read some UUEncoded SFX files or SFX files coming from
++	 * a network socket. */
++
+ 	return (0);
+ }
+ 
+Index: libarchive/test/test_compat_zip_6.zip.uu
+===================================================================
+--- libarchive/test/test_compat_zip_6.zip.uu	(revision 0)
++++ libarchive/test/test_compat_zip_6.zip.uu	(revision 4190)
+@@ -0,0 +1,10 @@
++begin 755 test_compat_zip_6.zip
++M4$L#!`H``````'@3-T`````````````````6````3F5W($9O;&1E<B].97<@
++M1F]L9&5R+U!+`P0*``````!\$S=`%4-8OPL````+````*P```$YE=R!&;VQD
++M97(O3F5W($9O;&1E<B].97<@5&5X="!$;V-U;65N="YT>'1S;VUE('1E>'0-
++M"E!+`0(4"PH``````'@3-T`````````````````6````````````$```````
++M``!.97<@1F]L9&5R+TYE=R!&;VQD97(O4$L!`A0+"@``````?!,W0!5#6+\+
++M````"P```"L``````````0`@````-````$YE=R!&;VQD97(O3F5W($9O;&1E
++M<B].97<@5&5X="!$;V-U;65N="YT>'102P4&``````(``@"=````B```````
++`
++end
+Index: libarchive/test/test_compat_zip.c
+===================================================================
+--- libarchive/test/test_compat_zip.c	(revision 4189)
++++ libarchive/test/test_compat_zip.c	(revision 4190)
+@@ -348,6 +348,53 @@
+ 	free(p);
+ }
+ 
++/*
++ * Issue 225: Errors extracting MSDOS Zip archives with directories.
++ */
++static void
++compat_zip_6_verify(struct archive *a)
++{
++	struct archive_entry *ae;
++
++	assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae));
++	assertEqualString("New Folder/New Folder/", archive_entry_pathname(ae));
++	assertEqualInt(AE_IFDIR, archive_entry_filetype(ae));
++	assertEqualInt(1327314468, archive_entry_mtime(ae));
++	assertEqualInt(0, archive_entry_size(ae));
++	assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae));
++	assertEqualString("New Folder/New Folder/New Text Document.txt", archive_entry_pathname(ae));
++	assertEqualInt(AE_IFREG, archive_entry_filetype(ae));
++	assertEqualInt(1327314476, archive_entry_mtime(ae));
++	assertEqualInt(11, archive_entry_size(ae));
++	assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae));
++}
++
++static void
++test_compat_zip_6(void)
++{
++	const char *refname = "test_compat_zip_6.zip";
++	struct archive *a;
++	void *p;
++	size_t s;
++
++	extract_reference_file(refname);
++	p = slurpfile(&s, refname);
++
++	assert((a = archive_read_new()) != NULL);
++	assertEqualIntA(a, ARCHIVE_OK, archive_read_support_filter_all(a));
++	assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a));
++	assertEqualIntA(a, ARCHIVE_OK, read_open_memory_seek(a, p, s, 7));
++	compat_zip_6_verify(a);
++	assertEqualIntA(a, ARCHIVE_OK, archive_read_free(a));
++
++	assert((a = archive_read_new()) != NULL);
++	assertEqualIntA(a, ARCHIVE_OK, archive_read_support_filter_all(a));
++	assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a));
++	assertEqualIntA(a, ARCHIVE_OK, read_open_memory(a, p, s, 7));
++	compat_zip_6_verify(a);
++	assertEqualIntA(a, ARCHIVE_OK, archive_read_free(a));
++}
++
+ DEFINE_TEST(test_compat_zip)
+ {
+ 	test_compat_zip_1();
+@@ -355,6 +402,7 @@
+ 	test_compat_zip_3();
+ 	test_compat_zip_4();
+ 	test_compat_zip_5();
++	test_compat_zip_6();
+ }
+ 
+ 
+Index: Makefile.am
+===================================================================
+--- Makefile.am	(revision 4189)
++++ Makefile.am	(revision 4190)
+@@ -462,6 +462,7 @@
+ 	libarchive/test/test_compat_zip_3.zip.uu			\
+ 	libarchive/test/test_compat_zip_4.zip.uu			\
+ 	libarchive/test/test_compat_zip_5.zip.uu			\
++	libarchive/test/test_compat_zip_6.zip.uu			\
+ 	libarchive/test/test_fuzz_1.iso.Z.uu				\
+ 	libarchive/test/test_fuzz.cab.uu				\
+ 	libarchive/test/test_fuzz.lzh.uu				\
diff --git a/core/libarchive/test-with-zip-mtime.patch b/core/libarchive/test-with-zip-mtime.patch
new file mode 100644
index 000000000..79e2f3c7e
--- /dev/null
+++ b/core/libarchive/test-with-zip-mtime.patch
@@ -0,0 +1,23 @@
+Index: libarchive/test/test_compat_zip.c
+===================================================================
+--- libarchive/test/test_compat_zip.c	(revision 4197)
++++ libarchive/test/test_compat_zip.c	(revision 4198)
+@@ -359,12 +359,16 @@
+ 	assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae));
+ 	assertEqualString("New Folder/New Folder/", archive_entry_pathname(ae));
+ 	assertEqualInt(AE_IFDIR, archive_entry_filetype(ae));
+-	assertEqualInt(1327314468, archive_entry_mtime(ae));
++	/* Zip timestamps are local time, so vary by time zone. */
++	/* TODO: A more complex assert would work here; we could
++	   verify that it's within +/- 24 hours of a particular value. */
++	/* assertEqualInt(1327314468, archive_entry_mtime(ae)); */
+ 	assertEqualInt(0, archive_entry_size(ae));
+ 	assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae));
+ 	assertEqualString("New Folder/New Folder/New Text Document.txt", archive_entry_pathname(ae));
+ 	assertEqualInt(AE_IFREG, archive_entry_filetype(ae));
+-	assertEqualInt(1327314476, archive_entry_mtime(ae));
++	/* Zip timestamps are local time, so vary by time zone. */
++	/* assertEqualInt(1327314476, archive_entry_mtime(ae)); */
+ 	assertEqualInt(11, archive_entry_size(ae));
+ 	assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae));
+ }
diff --git a/core/udev/PKGBUILD b/core/udev/PKGBUILD
index 5564ec3b9..ea10e0570 100644
--- a/core/udev/PKGBUILD
+++ b/core/udev/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 147123 2012-01-22 11:00:58Z tpowa $
+# $Id: PKGBUILD 147273 2012-01-25 16:27:42Z tomegun $
 # Maintainer: Tom Gundersen <teg@jklm.no>
 # Contributor: Aaron Griffin <aaron@archlinux.org>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
@@ -6,7 +6,7 @@
 
 pkgbase="udev"
 pkgname=('udev' 'udev-compat')
-pkgver=178
+pkgver=179
 pkgrel=1
 arch=(i686 x86_64 mips64el)
 url="http://git.kernel.org/?p=linux/hotplug/udev.git;a=summary"
@@ -15,7 +15,6 @@ groups=('base')
 options=(!makeflags !libtool)
 makedepends=('gobject-introspection' 'gperf' 'libxslt' 'usbutils' 'kmod')
 source=(ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/$pkgbase-$pkgver.tar.xz)
-md5sums=('173cc6061e3a82dd6e9a1a5cf767a858')
 
 build() {
   cd $srcdir/$pkgbase-$pkgver
@@ -100,4 +99,4 @@ package_udev-compat() {
   mknod cpu/microcode c 10 184
   
 }
-md5sums=('173cc6061e3a82dd6e9a1a5cf767a858')
+md5sums=('7d2880f66ea39146aae928f19ff3ca09')
diff --git a/core/wireless_tools/PKGBUILD b/core/wireless_tools/PKGBUILD
index 1b996d604..8019d8ae4 100644
--- a/core/wireless_tools/PKGBUILD
+++ b/core/wireless_tools/PKGBUILD
@@ -1,27 +1,29 @@
-# $Id: PKGBUILD 142302 2011-11-08 06:06:08Z tomegun $
-# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
-# Contributer: Jason Chu <jchu@xentac.net>
+# $Id: PKGBUILD 147661 2012-01-26 03:32:18Z bisson $
+# Maintainer: Gaetan Bisson <bisson@archlinux.org>
+# Contributor: Giovanni Scafora <giovanni@archlinux.org>
+# Contributor: Jason Chu <jchu@xentac.net>
 
 pkgname=wireless_tools
 pkgver=29
-pkgrel=5.1
-pkgdesc="Wireless Tools"
+pkgrel=6
+pkgdesc='Wireless Tools'
+url='http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html'
 arch=('i686' 'x86_64' 'mips64el')
-url="http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html"
 license=('GPL')
-depends=('glibc')
-source=("http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/wireless_tools.${pkgver}.tar.gz")
-md5sums=('e06c222e186f7cc013fd272d023710cb')
+source=("http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/${pkgname}.${pkgver}.tar.gz")
+sha1sums=('22040ac1497f4c5f8ddeca365591b01ae3475710')
 
 build() {
-	cd ${srcdir}/wireless_tools.${pkgver}
-	make
+	cd "${srcdir}/${pkgname}.${pkgver}"
+	make CFLAGS="${CFLAGS} -Wall -Wextra -I." LDFLAGS="${LDFLAGS}"
 }
 
 package() {
-	cd ${srcdir}/wireless_tools.${pkgver}
-	make INSTALL_DIR="${pkgdir}/usr/sbin" \
+	cd "${srcdir}/${pkgname}.${pkgver}"
+	make \
+		INSTALL_DIR="${pkgdir}/usr/sbin" \
 		INSTALL_LIB="${pkgdir}/usr/lib" \
 		INSTALL_INC="${pkgdir}/usr/include" \
-		INSTALL_MAN="${pkgdir}/usr/share/man" install
+		INSTALL_MAN="${pkgdir}/usr/share/man" \
+		install
 }
diff --git a/extra/akonadi/PKGBUILD b/extra/akonadi/PKGBUILD
index ad192cfb9..f2180a340 100644
--- a/extra/akonadi/PKGBUILD
+++ b/extra/akonadi/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 144041 2011-12-02 20:54:07Z ibiru $
+# $Id: PKGBUILD 147227 2012-01-24 20:32:45Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=akonadi
-pkgver=1.6.2
-pkgrel=2
+pkgver=1.7.0
+pkgrel=1
 pkgdesc="PIM layer, which provides an asynchronous API to access all kind of PIM data"
 arch=('i686' 'x86_64' 'mips64el')
 url='http://pim.kde.org/akonadi'
@@ -13,7 +13,7 @@ depends=('shared-mime-info' 'boost-libs' 'mysql' 'soprano')
 makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost')
 install="${pkgname}.install"
 source=("http://download.kde.org/stable/${pkgname}/src/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('07e2aa2e6953ac518f9306911747e264')
+md5sums=('804309dca70ede35b4a654ab764e9079')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/gdb/PKGBUILD b/extra/gdb/PKGBUILD
index 13c0207d5..795465954 100644
--- a/extra/gdb/PKGBUILD
+++ b/extra/gdb/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 137004 2011-09-05 05:59:05Z allan $
+# $Id: PKGBUILD 147258 2012-01-25 06:03:18Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gdb
-pkgver=7.3.1
+pkgver=7.4
 pkgrel=1
 pkgdesc="The GNU Debugger"
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,8 +14,9 @@ makedepends=('texinfo')
 backup=('etc/gdb/gdbinit')
 options=('!libtool')
 install=gdb.install
-source=(http://ftp.gnu.org/gnu/gdb/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('b89a5fac359c618dda97b88645ceab47')
+source=(http://ftp.gnu.org/gnu/gdb/${pkgname}-${pkgver}.tar.bz2{,.sig})
+md5sums=('95a9a8305fed4d30a30a6dc28ff9d060'
+         'd5ac067e8dca336cf4586e4e2269d3b2')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
diff --git a/extra/glsof/PKGBUILD b/extra/glsof/PKGBUILD
index 80fd90cbe..4d855ad76 100644
--- a/extra/glsof/PKGBUILD
+++ b/extra/glsof/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 146281 2012-01-08 05:34:24Z eric $
+# $Id: PKGBUILD 147275 2012-01-25 16:46:28Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=glsof
-pkgver=1.7.0
-_fmver=1.7.0
+pkgver=1.8.0
+_fmver=1.8.0
 _qver=1.0.0
 pkgrel=1
 pkgdesc="Two separate GUI utilities (Queries and Filemonitor) to the lsof command line utility"
@@ -15,14 +15,14 @@ source=(http://downloads.sourceforge.net/sourceforge/glsof/filemonitor-${_fmver}
 if [ "$CARCH" = "i686" ]; then
   source=(${source[@]} http://downloads.sourceforge.net/sourceforge/glsof/queries-${_qver}/queries_linux32.tar.gz \
           glsof-filemonitor glsof-queries)
-  sha1sums=('00db4305995a67cea6bc12bfe7ef3984d07434ae'
+  sha1sums=('a70c8d3877c13af8bd8e7e319a1709c1b90eedc6'
             'd5a17d66dd02cd78bad5ffdda0b936c7848e4890'
             '197b58f40880995d6442fd42a58fa1f4594fd19d'
             '2797c326904af16a254c3e39b8c529ea14ef37e5')
 elif [ "$CARCH" = "x86_64" ]; then
   source=(${source[@]} http://downloads.sourceforge.net/sourceforge/glsof/queries-${_qver}/queries_linux64.tar.gz \
           glsof-filemonitor glsof-queries)
-  sha1sums=('00db4305995a67cea6bc12bfe7ef3984d07434ae'
+  sha1sums=('a70c8d3877c13af8bd8e7e319a1709c1b90eedc6'
             'c5dd12e9b2860f1c427ed7cd482e898978051d2c'
             '197b58f40880995d6442fd42a58fa1f4594fd19d'
             '2797c326904af16a254c3e39b8c529ea14ef37e5')
diff --git a/extra/gtk-xfce-engine/PKGBUILD b/extra/gtk-xfce-engine/PKGBUILD
index 4100b803c..f6277c090 100644
--- a/extra/gtk-xfce-engine/PKGBUILD
+++ b/extra/gtk-xfce-engine/PKGBUILD
@@ -1,23 +1,22 @@
-# $Id: PKGBUILD 145294 2011-12-21 11:46:17Z foutrelis $
+# $Id: PKGBUILD 147260 2012-01-25 08:34:39Z foutrelis $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: tobias <tobias funnychar archlinux.org>
 
-pkgname=gtk-xfce-engine
+pkgbase=gtk-xfce-engine
+pkgname=('gtk2-xfce-engine' 'gtk3-xfce-engine')
 pkgver=2.99.0
-pkgrel=1
-pkgdesc="Xfce Gtk+-2.0 and Gtk+-3.0 engines"
+pkgrel=2
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.xfce.org/"
 license=('GPL2')
 groups=('xfce4')
-depends=('gtk2' 'gtk3')
-makedepends=('pkgconfig')
+makedepends=('gtk2' 'gtk3')
 options=('!libtool')
-source=(http://archive.xfce.org/src/xfce/$pkgname/2.99/$pkgname-$pkgver.tar.bz2)
+source=(http://archive.xfce.org/src/xfce/$pkgbase/2.99/$pkgbase-$pkgver.tar.bz2)
 sha256sums=('27bee5a68527d214cfda9b99d4ba68d39b6d341202bc728d0ddd170a73cde154')
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd "$srcdir/$pkgbase-$pkgver"
 
   ./configure \
     --prefix=/usr \
@@ -29,9 +28,30 @@ build() {
   make
 }
 
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
+package_gtk2-xfce-engine() {
+  pkgdesc="Xfce Gtk+-2.0 engine"
+  depends=('gtk2')
+  provides=("gtk-xfce-engine=$pkgver-$pkgrel")
+  conflicts=('gtk-xfce-engine')
+  replaces=('gtk-xfce-engine')
+
+  cd "$srcdir/$pkgbase-$pkgver"
   make DESTDIR="$pkgdir" install
+
+  # Remove gtk3 engine and themes
+  find "$pkgdir" -name gtk-3.0 -exec rm -r {} +
+}
+
+package_gtk3-xfce-engine() {
+  pkgdesc="Xfce Gtk+-3.0 engine"
+  depends=('gtk3')
+  conflicts=('gtk-xfce-engine<=2.99.0-1')
+
+  cd "$srcdir/$pkgbase-$pkgver"
+  make DESTDIR="$pkgdir" install
+
+  # Remove gtk2 engine and themes
+  find "$pkgdir" -name gtk-2.0 -exec rm -r {} +
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/extra/gtk2/PKGBUILD b/extra/gtk2/PKGBUILD
index 02209a249..62edc97f7 100644
--- a/extra/gtk2/PKGBUILD
+++ b/extra/gtk2/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 142844 2011-11-16 23:13:07Z ibiru $
+# $Id: PKGBUILD 147271 2012-01-25 15:45:40Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=gtk2
 pkgname=('gtk2' 'gtk-update-icon-cache')
-pkgver=2.24.8
-pkgrel=2
+pkgver=2.24.9
+pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gtk.org/"
 makedepends=('atk' 'pango' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxcomposite' 'libxdamage'
@@ -12,16 +12,13 @@ makedepends=('atk' 'pango' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxc
 options=('!libtool' '!docs')
 license=('LGPL')
 source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-$pkgver.tar.xz
-        xid-collision-debug.patch
-        revert-iconview.patch)
-sha256sums=('8a3b29f667933cf52eea2db7b066723edbc80443ca9c75b7cd7cbe8c8b90b93c'
-            'd758bb93e59df15a4ea7732cf984d1c3c19dff67c94b957575efea132b8fe558'
-            '517b3d0797b27324b8fa042ce4b653334ff3b55e48b921de3485505b9ca99fba')
+        xid-collision-debug.patch)
+sha256sums=('84204bf24cac739fd979943127e7b29cb46b1017684aa24dce630faa01bcb61d'
+            'd758bb93e59df15a4ea7732cf984d1c3c19dff67c94b957575efea132b8fe558')
 
 build() {
     cd "$srcdir/gtk+-$pkgver"
     patch -Np1 -i "$srcdir/xid-collision-debug.patch"
-    patch -Np1 -i "$srcdir/revert-iconview.patch"
 
     CXX=/bin/false ./configure --prefix=/usr \
         --sysconfdir=/etc \
diff --git a/extra/python-egenix-mx-base/PKGBUILD b/extra/python-egenix-mx-base/PKGBUILD
index 217a550a8..6f9ca8e29 100644
--- a/extra/python-egenix-mx-base/PKGBUILD
+++ b/extra/python-egenix-mx-base/PKGBUILD
@@ -1,21 +1,20 @@
-# $Id: PKGBUILD 140254 2011-10-11 00:44:55Z stephane $
+# $Id: PKGBUILD 147244 2012-01-25 02:07:03Z stephane $
 # Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
 # Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
 
 pkgname=python-egenix-mx-base
 _origname=egenix-mx-base
-pkgver=3.2.1
+pkgver=3.2.2
 pkgrel=1
 pkgdesc="A collection of Python tools"
 arch=('i686' 'x86_64' 'mips64el')
 license=('custom')
 url="http://www.egenix.com/products/python/mxBase/"
 depends=('python2')
-makedepends=('python2-distribute')
 replaces=('egenix-mx-base')
 provides=('egenix-mx-base')
 source=("http://downloads.egenix.com/python/${_origname}-${pkgver}.tar.gz")
-sha1sums=('a82f7f155ea92f26f40a6a3bf9160bfac7c52a00')
+sha1sums=('9faaf608a29b80d9a8daf16b8b3578e896b6395b')
 
 build() {
   cd "${srcdir}/${_origname}-${pkgver}"
diff --git a/extra/qwtplot3d/PKGBUILD b/extra/qwtplot3d/PKGBUILD
index 8b1c1c067..5d9fd6df2 100644
--- a/extra/qwtplot3d/PKGBUILD
+++ b/extra/qwtplot3d/PKGBUILD
@@ -1,21 +1,25 @@
-# $Id: PKGBUILD 131790 2011-07-15 09:16:14Z ronald $
-# Maintainer: damir <damir@archlinux.org>
+# $Id: PKGBUILD 147208 2012-01-24 18:38:05Z ronald $
+# Maintainer: Ronald van Haren <ronald@archlinux.org>
+# Contributor: damir <damir@archlinux.org>
 
 pkgname=qwtplot3d
 pkgver=0.2.7
-pkgrel=3
+pkgrel=4
 pkgdesc="Qt/OpenGL-based C++ programming library containing 3d-widgets"
 arch=("i686" "x86_64" 'mips64el')
 license=('custom:zlib')
 url="http://qwtplot3d.sourceforge.net/"
 depends=('qt' 'qwt' 'mesa')
 source=("http://downloads.sourceforge.net/sourceforge/qwtplot3d/qwtplot3d-$pkgver.tgz"
-        qwtplot3d-gcc44.patch)
-sha1sums=('4463fafb8420a91825e165da7a296aaabd70abea' '52fa169b651a98550f8a8391ddf52e0eaeb2c215')
+        qwtplot3d-gcc44.patch qwtplot3d-qt-4.8.0.patch)
+sha1sums=('4463fafb8420a91825e165da7a296aaabd70abea'
+          '52fa169b651a98550f8a8391ddf52e0eaeb2c215'
+          '8dcafdc9753b0f2eeea2f1e96efa6e8d3d956005')
 
 build() {
     cd ${srcdir}/${pkgname}
     patch -p1 < ../qwtplot3d-gcc44.patch
+    patch -p1 < ../qwtplot3d-qt-4.8.0.patch
 
     # build qwt:
     qmake qwtplot3d.pro
diff --git a/extra/qwtplot3d/qwtplot3d-qt-4.8.0.patch b/extra/qwtplot3d/qwtplot3d-qt-4.8.0.patch
new file mode 100644
index 000000000..ae10f48f0
--- /dev/null
+++ b/extra/qwtplot3d/qwtplot3d-qt-4.8.0.patch
@@ -0,0 +1,34 @@
+diff -urbN qwtplot3d/include/qwt3d_io_gl2ps.h qwtplot3d.patched/include/qwt3d_io_gl2ps.h
+--- qwtplot3d/include/qwt3d_io_gl2ps.h	2005-07-10 16:54:52.000000000 +0300
++++ qwtplot3d.patched/include/qwt3d_io_gl2ps.h	2012-01-21 22:15:20.000000000 +0200
+@@ -2,12 +2,7 @@
+ #define qwt3d_io_gl2ps_h__2004_05_07_01_16_begin_guarded_code
+ 
+ #include <time.h>
+-
+-#if QT_VERSION < 0x040000
+-#include <qgl.h>
+-#else
+-#include <QtOpenGL/qgl.h>
+-#endif
++#include <QtOpenGL>
+ 
+ #include "qwt3d_types.h"
+ #include "qwt3d_io.h"
+diff -urbN qwtplot3d/include/qwt3d_openglhelper.h qwtplot3d.patched/include/qwt3d_openglhelper.h
+--- qwtplot3d/include/qwt3d_openglhelper.h	2005-07-19 17:40:28.000000000 +0300
++++ qwtplot3d.patched/include/qwt3d_openglhelper.h	2012-01-21 22:29:56.000000000 +0200
+@@ -2,11 +2,8 @@
+ #define __openglhelper_2003_06_06_15_49__
+ 
+ #include "qglobal.h"
+-#if QT_VERSION < 0x040000
+-#include <qgl.h>
+-#else
+-#include <QtOpenGL/qgl.h>
+-#endif
++#include <QtOpenGL>
++#include <GL/glu.h>
+ 
+ namespace Qwt3D
+ {
diff --git a/extra/time/PKGBUILD b/extra/time/PKGBUILD
index d33fb5b2f..82706136f 100644
--- a/extra/time/PKGBUILD
+++ b/extra/time/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 131069 2011-07-10 01:00:33Z stephane $
+# $Id: PKGBUILD 147242 2012-01-25 01:42:55Z stephane $
 # Maintainer: Stéphane Gaudreault <stephane@archlinux.us>
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 # Contributor: damir <damir@archlinux.org>
 
 pkgname=time
 pkgver=1.7
-pkgrel=5
+pkgrel=6
 pkgdesc="Utility for monitoring a program's use of system resources"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnu.org/directory/time.html"
diff --git a/libre/your-freedom/PKGBUILD b/libre/your-freedom/PKGBUILD
index 68fe8b673..fe0e79220 100644
--- a/libre/your-freedom/PKGBUILD
+++ b/libre/your-freedom/PKGBUILD
@@ -9,6 +9,7 @@ license=('GPL3')
 groups=('base')
 install=${pkgname}.install
 source=(https://projects.parabolagnulinux.org/blacklist.git/plain/blacklist.txt)
+md5sums=('3f67515fda1c9b4e4d1a988d3c03bb9a')
 
 build() {
     cd ${srcdir}
@@ -23,4 +24,3 @@ package() {
         sort -u
         ))
 }
-md5sums=('980d8ab2f9886d648a700a7a909488d9')