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

Conflicts: community-testing/conntrack-tools/01-config-file-path.patch community-testing/conntrack-tools/PKGBUILD community-testing/gambas3/PKGBUILD community-testing/gigi/PKGBUILD community-testing/glob2/PKGBUILD community-testing/megaglest/PKGBUILD community-testing/openimageio/PKGBUILD community/gtk2hs-buildtools/PKGBUILD community/haddock/PKGBUILD community/haskell-dataenc/PKGBUILD community/haskell-ghc-paths/PKGBUILD community/haskell-haskeline/PKGBUILD community/haskell-hslogger/PKGBUILD community/haskell-tar/PKGBUILD community/haskell-terminfo/PKGBUILD community/haskell-utf8-string/PKGBUILD community/haskell-x11-xft/PKGBUILD community/libnetfilter_acct/PKGBUILD community/libnetfilter_conntrack/PKGBUILD community/libnetfilter_queue/PKGBUILD community/libnfnetlink/PKGBUILD community/sfk/PKGBUILD extra/cabal-install/PKGBUILD extra/claws-mail/PKGBUILD extra/haskell-http/PKGBUILD extra/haskell-mtl/PKGBUILD extra/haskell-network/PKGBUILD extra/haskell-parsec/PKGBUILD extra/haskell-text/PKGBUILD extra/haskell-transformers/PKGBUILD extra/haskell-zlib/PKGBUILD extra/nx/PKGBUILD extra/ocaml/PKGBUILD multilib/gcc-multilib/PKGBUILD multilib/lib32-dbus-core/PKGBUILD multilib/lib32-gnutls/PKGBUILD multilib/lib32-libtiff/PKGBUILD multilib/lib32-libxcb/PKGBUILD multilib/libtool-multilib/PKGBUILD social/squirm/PKGBUILD staging/kdebindings-python/PKGBUILD testing/curl/PKGBUILD testing/dnsutils/PKGBUILD testing/dnsutils/remove-bind.patch testing/mesa/PKGBUILD testing/openldap/PKGBUILD testing/pam/PKGBUILD testing/subversion/PKGBUILD testing/systemd/PKGBUILD testing/sysvinit/PKGBUILD
author: Nicolás Reynolds <fauno@kiwwwi.com.ar> 2012-10-13 11:26:30 -0300
committer: Nicolás Reynolds <fauno@kiwwwi.com.ar> 2012-10-13 11:26:30 -0300
commit: ea319c11ce5dcbe5994f166ea099b115bbffe960 (patch)
tree: 365b7a8276a93d738840c4481a1ff5e327920738
parent: 37936150d275890b518542e93a435ab5815d722b (diff)
parent: 21c295a86a10a3cd59802b2cf3ab7c24ebf0c608 (diff)
287 files changed, 10109 insertions, 830 deletions
diff --git a/artistic/blender-spacenav-libre/PKGBUILD b/artistic/blender-spacenav-libre/PKGBUILD
index 73968cd4b..bcd07aff4 100644
--- a/artistic/blender-spacenav-libre/PKGBUILD
+++ b/artistic/blender-spacenav-libre/PKGBUILD
@@ -3,8 +3,8 @@
 
 _pkgname=blender
 pkgname=blender-spacenav-libre
-pkgver=2.63a
-pkgrel=5
+pkgver=2.64
+pkgrel=1
 pkgdesc="A fully integrated 3D graphics creation suite, compiled with spacenav (without nonfree cuda-toolkit support)"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
@@ -21,17 +21,17 @@ install=${_pkgname}.install
 source=(http://download.${_pkgname}.org/source/${_pkgname}-${pkgver}.tar.gz
         ffmpeg-0.11.patch
         boost-1.50.patch)
-md5sums=('31a60b3ce5466d965cb7e2648995e092'
+md5sums=('caec080d2a3dcd57fe1ca20c51c00e53'
          '9e5649403e51654615d30b10bc460217'
          '0bab80da07d980c47b8ce3cb998edaef')
 
 build() {
   cd "${srcdir}/${_pkgname}-${pkgver}"
 
-  patch -Np1 < "${srcdir}"/ffmpeg-0.11.patch
-  patch -Np1 < "${srcdir}"/boost-1.50.patch
-  sed -i "/<libavcodec\/opt.h>/d" intern/ffmpeg/ffmpeg_compat.h
-  sed -i "/<libavcodec\/opt.h>/d" source/blender/blenkernel/intern/writeffmpeg.c
+  #patch -Np1 < "${srcdir}"/ffmpeg-0.11.patch
+  #patch -Np1 < "${srcdir}"/boost-1.50.patch
+  #sed -i "/<libavcodec\/opt.h>/d" intern/ffmpeg/ffmpeg_compat.h
+  #sed -i "/<libavcodec\/opt.h>/d" source/blender/blenkernel/intern/writeffmpeg.c
 
   mkdir build
   cd build
diff --git a/artistic/cinepaint-lts/LICENSE b/artistic/cinepaint-lts/LICENSE
new file mode 100644
index 000000000..746207229
--- /dev/null
+++ b/artistic/cinepaint-lts/LICENSE
@@ -0,0 +1,25 @@
+Copyright (c) 2005, Kai-Uwe Behrmann
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met: 
+    * Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer. 
+    * Redistributions in binary form must reproduce the above
+    copyright notice, this list of conditions and the following
+    disclaimer in the documentation and/or other materials provided
+    with the distribution.ntributors may be used to endorse or promote
+    products derived from this software without specific prior written
+    permission. 
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
diff --git a/artistic/cinepaint-lts/PKGBUILD b/artistic/cinepaint-lts/PKGBUILD
new file mode 100644
index 000000000..c680ac904
--- /dev/null
+++ b/artistic/cinepaint-lts/PKGBUILD
@@ -0,0 +1,62 @@
+# $Id$
+# Maintainer: tobias [tobias.archlinux.org]
+# Contributor: tobias [tobias.justdreams.de]
+# Maintainer (Parabola): Márcio Silva <coadde@adinet.com.uy>
+
+pkgname=cinepaint-lts
+pkgver=1.0
+pkgrel=1
+pkgdesc='Sophisticated graphics manipulation programm supporting > 8bit pictures'
+arch=(i686 x86_64 mips64el)
+license=(LGPL GPL MIT)
+url=http://www.${pkgname%-lts}.org
+depends=(gtk2 openexr lcms libxpm fltk ftgl libxxf86vm)
+makedepends=(python2 gutenprint)
+optdepends=(
+  'python2: for python plug-ins'
+  'gutenprint: for print plug-ins'
+  'ghostscript: for pdf plug-ins'
+)
+conflicts=(${pkgname%-lts})
+provides=(${pkgname%-lts})
+options=(!libtool)
+install=${pkgname%-lts}.install
+source=(
+  http://sourceforge.net/projects/${pkgname%-lts}/files/CinePaint/${pkgname%-lts}-$pkgver.tgz
+  LICENSE
+  ${pkgname%-lts}-libpng15.patch
+)
+md5sums=(
+  7dfdb005d246578392ac9bd500534804
+  169085743f667c250ea2e4022efecf5f
+  6d3f65b72e0f1569a9efe1bcab1b8124
+)
+
+build() {
+  cd $srcdir/${pkgname%-lts}
+
+  rm config.{sub,guess}
+  ln -s /usr/share/automake-1.12/config.sub   config.sub
+  ln -s /usr/share/automake-1.12/config.guess config.guess
+
+  patch -p1 -i ../${pkgname%-lts}-libpng15.patch
+  find plug-ins/pygimp -type f -exec sed -i 's#env python#env python2#' {} +
+  sed -i 's|$(LDFLAGS) -o|$(LDFLAGS) $(GTK_LIBS) -o|' lib/Makefile.in
+  sed -i -e '1 s/^/#include <unistd.h>\n/' plug-ins/icc_examin/icc_examin/icc_modell_beobachter.cpp
+
+  sh autogen.sh
+  LIBS+="-lstdc++ -lm -lX11" ./configure --prefix=/usr --libdir=/usr/lib --mandir=/usr/share/man \
+    --enable-gtk2 --enable-pygimp --with-python=/usr/bin/python2
+  sed -i 's/-Wl,,/-Wl,/' lib/fl_i18n/Makefile plug-ins/bracketing_to_hdr/Makefile \
+    plug-ins/collect/Makefile plug-ins/icc_examin/icc_examin/Makefile plug-ins/pdf/Makefile
+  make
+}
+
+package() {
+  cd $srcdir/${pkgname%-lts}
+  make DESTDIR=$pkgdir install
+  sed -i -e "s|-I$srcdir/${pkgname%-lts}||" -e "s|-I$srcdir/${pkgname%-lts}/lib||" -e "/lib${pkgname%-lts}.la/d" \
+    -e "s|${srcdir}/${pkgname%-lts}/lib/.libs/\$dlname||" $pkgdir/usr/bin/${pkgname%-lts}tool
+  sed -i "s/${pkgname%-lts}.png/${pkgname%-lts}/" $pkgdir/usr/share/applications/${pkgname%-lts}.desktop
+  install -D -m644 $srcdir/LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE
+}
diff --git a/artistic/cinepaint-lts/cinepaint-libpng15.patch b/artistic/cinepaint-lts/cinepaint-libpng15.patch
new file mode 100644
index 000000000..619d9af42
--- /dev/null
+++ b/artistic/cinepaint-lts/cinepaint-libpng15.patch
@@ -0,0 +1,446 @@
+diff -Nur a/plug-ins/png/png.c b/plug-ins/png/png.c
+--- a/plug-ins/png/png.c	2006-11-24 18:52:55.000000000 -0200
++++ b/plug-ins/png/png.c	2012-10-12 01:07:56.452245955 -0200
+@@ -390,6 +390,16 @@
+   gchar		*progress;	/* Title for progress display... */
+   guchar	alpha[256],	/* Index -> Alpha */
+   		*alpha_ptr;	/* Temporary pointer */
++  png_byte     color_type;
++  png_byte     bit_depth;
++  png_colorp palette;
++  int num_palette;
++  png_charpp iccp_name;
++  int compression_type;
++  png_bytepp iccp_profile;
++  png_uint_32 iccp_proflen;
++  png_uint_32 width, height;
++  png_byte channels;
+ 
+  /*
+   * PNG 0.89 and newer have a sane, forwards compatible constructor.
+@@ -405,7 +415,7 @@
+   info = (png_infop)calloc(sizeof(png_info), 1);
+ #endif /* PNG_LIBPNG_VER > 88 */
+ 
+-  if (setjmp (pp->jmpbuf))
++  if (setjmp (png_jmpbuf(pp)))
+   {
+     g_message ("%s\nPNG error. File corrupted?", filename);
+     return image;
+@@ -442,21 +452,26 @@
+   */
+ 
+   png_read_info(pp, info);
++  color_type = png_get_color_type(pp, info);
++  width=png_get_image_width(pp, info);
++  height=png_get_image_height(pp, info);
+ 
+  /*
+   * Latest attempt, this should be my best yet :)
+   */
+ 
++  bit_depth = png_get_bit_depth(pp, info);
++
+ #ifndef WORDS_BIGENDIAN
+-  if(info->bit_depth == 16)
++  if(bit_depth == 16)
+ 	  png_set_swap(pp);
+ #endif
+ 
+-  if (info->color_type == PNG_COLOR_TYPE_GRAY && info->bit_depth < 8) {
++  if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) {
+     png_set_expand(pp);
+   }
+ 
+-  if (info->color_type == PNG_COLOR_TYPE_PALETTE && info->bit_depth < 8) {
++  if (color_type == PNG_COLOR_TYPE_PALETTE && bit_depth < 8) {
+     png_set_packing(pp);
+   }
+ 
+@@ -464,8 +479,8 @@
+   * Expand G+tRNS to GA, RGB+tRNS to RGBA
+   */
+ 
+-  if (info->color_type != PNG_COLOR_TYPE_PALETTE &&
+-                       (info->valid & PNG_INFO_tRNS)) {
++  if (color_type != PNG_COLOR_TYPE_PALETTE &&
++      (png_get_valid(pp, info, PNG_INFO_tRNS))) {
+     png_set_expand(pp);
+   }
+ 
+@@ -482,7 +497,7 @@
+ 
+ #if PNG_LIBPNG_VER > 99
+   if (png_get_valid(pp, info, PNG_INFO_tRNS) &&
+-      info->color_type == PNG_COLOR_TYPE_PALETTE)
++      color_type == PNG_COLOR_TYPE_PALETTE)
+   {
+     png_get_tRNS(pp, info, &alpha_ptr, &num, NULL);
+     /* Copy the existing alpha values from the tRNS chunk */
+@@ -505,9 +520,9 @@
+ 
+   png_read_update_info(pp, info);
+   
+-  if(info->bit_depth==16)
++  if(bit_depth==16)
+   {
+-	  switch (info->color_type)
++	  switch (color_type)
+ 	  {
+ 		  case PNG_COLOR_TYPE_RGB :		/* RGB */
+ 			  bpp        = 6;
+@@ -545,7 +560,7 @@
+   }
+   else
+   {
+-	  switch (info->color_type)
++	  switch (color_type)
+ 	  {
+ 		  case PNG_COLOR_TYPE_RGB :		/* RGB */
+ 			  bpp        = 3;
+@@ -582,7 +597,7 @@
+ 	  };
+   }
+ 
+-  image = gimp_image_new(info->width, info->height, image_type);
++  image = gimp_image_new(width, height, image_type);
+   if (image == -1)
+   {
+     g_message("Can't allocate new image\n%s", filename);
+@@ -595,7 +610,7 @@
+   * Create the "background" layer to hold the image...
+   */
+ 
+-  layer = gimp_layer_new(image, _("Background"), info->width, info->height,
++  layer = gimp_layer_new(image, _("Background"), width, height,
+                          layer_type, 100, NORMAL_MODE);
+   gimp_image_add_layer(image, layer, 0);
+ 
+@@ -627,20 +642,21 @@
+ 
+   empty= 0; /* by default assume no full transparent palette entries */
+ 
+-  if (info->color_type & PNG_COLOR_MASK_PALETTE) {
++  if (color_type & PNG_COLOR_MASK_PALETTE) {
+ 
+ #if PNG_LIBPNG_VER > 99
++    png_get_PLTE(pp, info, &palette, &num_palette);
+     if (png_get_valid(pp, info, PNG_INFO_tRNS)) {
+       for (empty= 0; empty < 256 && alpha[empty] == 0; ++empty);
+         /* Calculates number of fully transparent "empty" entries */
+ 
+-      gimp_image_set_cmap(image, (guchar *) (info->palette + empty),
+-                          info->num_palette - empty);
++      gimp_image_set_cmap(image, (guchar *) (palette + empty),
++                          num_palette - empty);
+     } else {
+-      gimp_image_set_cmap(image, (guchar *)info->palette, info->num_palette);
++      gimp_image_set_cmap(image, (guchar *)palette, num_palette);
+     }
+ #else
+-    gimp_image_set_cmap(image, (guchar *)info->palette, info->num_palette);
++    gimp_image_set_cmap(image, (guchar *)palette, num_palette);
+ #endif /* PNG_LIBPNG_VER > 99 */
+ 
+   }
+@@ -659,18 +675,19 @@
+   */
+ 
+   tile_height = gimp_tile_height ();
+-  pixel       = g_new(guchar, tile_height * info->width * bpp);
++  pixel       = g_new(guchar, tile_height * width * bpp);
+   pixels      = g_new(guchar *, tile_height);
++  channels=png_get_channels(pp, info);
+ 
+-  if(info->bit_depth==16)
++  if(bit_depth==16)
+   {
+ 	  for (i = 0; i < tile_height; i ++)
+-		  pixels[i] = pixel + info->width * info->channels * i * 2;
++		  pixels[i] = pixel + width * channels * i * 2;
+   }
+   else
+   {
+ 	  for (i = 0; i < tile_height; i ++)
+-		  pixels[i] = pixel + info->width * info->channels * i;
++		  pixels[i] = pixel + width * channels * i;
+   }
+ 
+   for (pass = 0; pass < num_passes; pass ++)
+@@ -680,11 +697,11 @@
+ 	   */
+ 
+ 	  for (begin = 0, end = tile_height;
+-			  begin < info->height;
++			  begin < height;
+ 			  begin += tile_height, end += tile_height)
+ 	  {
+-		  if (end > info->height)
+-			  end = info->height;
++		  if (end > height)
++			  end = height;
+ 
+ 		  num = end - begin;
+ 
+@@ -697,20 +714,21 @@
+ 		  gimp_pixel_rgn_set_rect(&pixel_rgn, pixel, 0, begin,
+ 				  drawable->width, num);
+ 
+-		  gimp_progress_update(((double)pass + (double)end / (double)info->height) /
++		  gimp_progress_update(((double)pass + (double)end / (double)height) /
+ 				  (double)num_passes);
+ 	  };
+   };
+ 
+ #if defined(PNG_iCCP_SUPPORTED)
+   /* set icc profile */
+-  if (info->iccp_proflen > 0) {
+-    gimp_image_set_icc_profile_by_mem (image, info->iccp_proflen,
+-                                              info->iccp_profile,
+-                                              ICC_IMAGE_PROFILE);
++  png_get_iCCP(pp, info,  (png_charpp)iccp_name, &compression_type, iccp_profile, &iccp_proflen);
++  if (iccp_proflen > 0) {
++    gimp_image_set_icc_profile_by_mem (image, iccp_proflen,
++                                      (gchar *)iccp_profile,
++                                      ICC_IMAGE_PROFILE);
+     printf ("%s:%d %s() set embedded profile \"%s\"\n",
+              __FILE__,__LINE__,__func__,
+-                                              info->iccp_name);
++           (char *)iccp_name);
+   }
+ #endif
+ 
+@@ -808,6 +826,14 @@
+                 blue;           /* Used for palette background */
+   time_t	cutime;         /* Time since epoch */
+   struct tm	*gmt;		/* GMT broken down */
++  png_byte     color_type;
++  png_byte     bit_depth;
++  int filter_method=0;
++  png_colorp palette;
++  int num_palette;
++  png_charpp iccp_name;
++  png_uint_32 height;
++  int compression_type;
+ 
+  /*
+   * PNG 0.89 and newer have a sane, forwards compatible constructor.
+@@ -824,7 +850,7 @@
+   info = (png_infop)calloc(sizeof(png_info), 1);
+ #endif /* PNG_LIBPNG_VER > 88 */
+ 
+-  if (setjmp (pp->jmpbuf))
++  if (setjmp (png_jmpbuf(pp)))
+   {
+     g_message ("%s\nPNG error. Couldn't save image", filename);
+     return 0;
+@@ -858,87 +884,75 @@
+   type     = gimp_drawable_type (drawable_ID);
+ 
+  /*
+-  * Set the image dimensions, bit depth, interlacing and compression
+-  */
+-
+-  png_set_compression_level (pp, pngvals.compression_level);
+-
+-  info->width          = drawable->width;
+-  info->height         = drawable->height;
+-  info->interlace_type = pngvals.interlaced;
+-
+- /*
+   * Set color type and remember bytes per pixel count 
+   */
+ 
+   switch (type)
+   {
+     case RGB_IMAGE :
+-        info->color_type = PNG_COLOR_TYPE_RGB;
+-	info->bit_depth      = 8;
++        color_type = PNG_COLOR_TYPE_RGB;
++	bit_depth      = 8;
+         bpp              = 3;
+         break;
+     case RGBA_IMAGE :
+-        info->color_type = PNG_COLOR_TYPE_RGB_ALPHA;
+-	info->bit_depth      = 8;
++        color_type = PNG_COLOR_TYPE_RGB_ALPHA;
++	bit_depth      = 8;
+         bpp              = 4;
+         break;
+     case GRAY_IMAGE :
+-        info->color_type = PNG_COLOR_TYPE_GRAY;
+-	info->bit_depth      = 8;
++        color_type = PNG_COLOR_TYPE_GRAY;
++	bit_depth      = 8;
+         bpp              = 1;
+         break;
+     case GRAYA_IMAGE :
+-        info->color_type = PNG_COLOR_TYPE_GRAY_ALPHA;
+-	info->bit_depth      = 8;
++        color_type = PNG_COLOR_TYPE_GRAY_ALPHA;
++	bit_depth      = 8;
+         bpp              = 2;
+         break;
+     case INDEXED_IMAGE :
+ 	bpp		 = 1;
+-	info->bit_depth      = 8;
+-        info->color_type = PNG_COLOR_TYPE_PALETTE;
+-	info->valid      |= PNG_INFO_PLTE;
+-        info->palette= (png_colorp) gimp_image_get_cmap(image_ID, &num_colors);
+-        info->num_palette= num_colors;
++	bit_depth      = 8;
++        color_type = PNG_COLOR_TYPE_PALETTE;
++        png_get_valid(pp, info, PNG_INFO_PLTE);
++        png_set_PLTE(pp, info, (png_colorp) gimp_image_get_cmap(image_ID, &num_colors), num_colors);
+         break;
+     case INDEXEDA_IMAGE :
+ 	bpp		 = 2;
+-	info->bit_depth      = 8;
+-	info->color_type = PNG_COLOR_TYPE_PALETTE;
++	bit_depth      = 8;
++	color_type = PNG_COLOR_TYPE_PALETTE;
+ 	respin_cmap (pp, info, image_ID); /* fix up transparency */
+ 	break;
+     case U16_RGB_IMAGE :
+-        info->color_type = PNG_COLOR_TYPE_RGB;
+-	info->bit_depth      = 16;
++        color_type = PNG_COLOR_TYPE_RGB;
++	bit_depth      = 16;
+         bpp              = 6;
+         break;
+     case U16_RGBA_IMAGE :
+-        info->color_type = PNG_COLOR_TYPE_RGB_ALPHA;
+-	info->bit_depth      = 16;
++        color_type = PNG_COLOR_TYPE_RGB_ALPHA;
++	bit_depth      = 16;
+         bpp              = 8;
+         break;
+     case U16_GRAY_IMAGE :
+-        info->color_type = PNG_COLOR_TYPE_GRAY;
+-	info->bit_depth      = 16;
++        color_type = PNG_COLOR_TYPE_GRAY;
++	bit_depth      = 16;
+         bpp              = 2;
+         break;
+     case U16_GRAYA_IMAGE :
+-        info->color_type = PNG_COLOR_TYPE_GRAY_ALPHA;
+-	info->bit_depth      = 16;
++        color_type = PNG_COLOR_TYPE_GRAY_ALPHA;
++	bit_depth      = 16;
+         bpp              = 4;
+         break;
+     case U16_INDEXED_IMAGE :
+ 	bpp		 = 2;
+-	info->bit_depth      = 16;
+-        info->color_type = PNG_COLOR_TYPE_PALETTE;
+-	info->valid      |= PNG_INFO_PLTE;
+-        info->palette= (png_colorp) gimp_image_get_cmap(image_ID, &num_colors);
+-        info->num_palette= num_colors;
++	bit_depth      = 16;
++        color_type = PNG_COLOR_TYPE_PALETTE;
++        png_get_valid(pp, info, PNG_INFO_PLTE);
++        png_set_PLTE(pp, info, (png_colorp) gimp_image_get_cmap(image_ID, &num_colors), num_colors);
+         break;
+     case U16_INDEXEDA_IMAGE :
+ 	bpp		 = 4;
+-	info->bit_depth      = 16;
+-	info->color_type = PNG_COLOR_TYPE_PALETTE;
++	bit_depth      = 16;
++	color_type = PNG_COLOR_TYPE_PALETTE;
+ 	respin_cmap (pp, info, image_ID); /* fix up transparency */
+ 	break;
+     default:
+@@ -950,16 +964,22 @@
+   * Fix bit depths for (possibly) smaller colormap images
+   */
+   
+-  if (info->valid & PNG_INFO_PLTE) {
+-    if (info->num_palette <= 2)
+-      info->bit_depth= 1;
+-    else if (info->num_palette <= 4)
+-      info->bit_depth= 2;
+-    else if (info->num_palette <= 16)
+-      info->bit_depth= 4;
++  if (png_get_valid(pp, info, PNG_INFO_PLTE)) {
++    png_get_PLTE(pp, info, &palette, &num_palette);
++    if (num_palette <= 2)
++      bit_depth= 1;
++    else if (num_palette <= 4)
++      bit_depth= 2;
++    else if (num_palette <= 16)
++      bit_depth= 4;
+     /* otherwise the default is fine */
+   }
+ 
++ png_set_compression_level (pp, pngvals.compression_level);
++ png_set_IHDR(pp, info, drawable->width, drawable->height,
++             bit_depth, color_type, pngvals.interlaced, compression_type, filter_method);
++
++
+   // write icc profile
+ #if defined(PNG_iCCP_SUPPORTED)
+   if (gimp_image_has_icc_profile (image_ID, ICC_IMAGE_PROFILE)) {
+@@ -970,10 +990,10 @@
+                                                 ICC_IMAGE_PROFILE);
+     png_set_iCCP (pp, info,
+            gimp_image_get_icc_profile_description (image_ID, ICC_IMAGE_PROFILE),
+-                  0, buffer, size);
++                  0, (png_const_bytep)buffer, size);
+     printf ("%s:%d %s() embedd icc profile \"%s\"\n",
+              __FILE__,__LINE__,__func__,
+-                                              info->iccp_name);
++           (char *)iccp_name);
+   }
+ #endif
+ 
+@@ -1039,13 +1059,13 @@
+   * Convert unpacked pixels to packed if necessary
+   */
+ 
+-  if (info->color_type == PNG_COLOR_TYPE_PALETTE && info->bit_depth < 8)
++  if (color_type == PNG_COLOR_TYPE_PALETTE && bit_depth < 8)
+     png_set_packing(pp);
+ 
+   /* Set swapping for 16 bit per sample images */
+   
+ #ifndef WORDS_BIGENDIAN
+-  if (info->bit_depth == 16)
++  if (bit_depth == 16)
+ 	  png_set_swap(pp);
+ #endif
+   
+@@ -1063,6 +1083,7 @@
+ 
+   gimp_pixel_rgn_init(&pixel_rgn, drawable, 0, 0, drawable->width,
+                       drawable->height, FALSE, FALSE);
++  height=png_get_image_height(pp, info);
+ 
+   for (pass = 0; pass < num_passes; pass ++)
+   {
+@@ -1077,7 +1098,7 @@
+ 	num = end - begin;
+ 	
+ 	gimp_pixel_rgn_get_rect (&pixel_rgn, pixel, 0, begin, drawable->width, num);
+-        if (info->valid & PNG_INFO_tRNS) {
++        if (png_get_valid(pp, info, PNG_INFO_tRNS)) {
+           for (i = 0; i < num; ++i) {
+ 	    fixed= pixels[i];
+             for (k = 0; k < drawable->width; ++k) {
+@@ -1085,7 +1106,7 @@
+             }
+           }
+        /* Forgot this case before, what if there are too many colors? */
+-        } else if (info->valid & PNG_INFO_PLTE && bpp == 2) {
++        } else if (png_get_valid(pp, info, PNG_INFO_PLTE) && bpp == 2) {
+           for (i = 0; i < num; ++i) {
+ 	    fixed= pixels[i];
+             for (k = 0; k < drawable->width; ++k) {
+@@ -1097,7 +1118,6 @@
+ 	png_write_rows (pp, pixels, num);
+-	
+ 	gimp_progress_update (((double)pass + (double)end /
+-                    (double)info->height) / (double)num_passes);
++                    (double)height) / (double)num_passes);
+       };
+   };
+ 
diff --git a/artistic/cinepaint-lts/cinepaint.install b/artistic/cinepaint-lts/cinepaint.install
new file mode 100644
index 000000000..5e5cfef4d
--- /dev/null
+++ b/artistic/cinepaint-lts/cinepaint.install
@@ -0,0 +1,11 @@
+post_install() {
+  update-desktop-database -q
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+post_remove() {
+  update-desktop-database -q
+}
diff --git a/artistic/spnavcfg/PKGBUILD b/artistic/spnavcfg/PKGBUILD
index df9027bc5..cbea06d01 100644
--- a/artistic/spnavcfg/PKGBUILD
+++ b/artistic/spnavcfg/PKGBUILD
@@ -4,16 +4,17 @@
 pkgname=spnavcfg
 pkgver=0.2.1
 pkgrel=1
-pkgdesc="The spacenav project provides a free, compatible alternative, to the proprietary 3Dconnexion device driver and SDK, for their 3D input devices (called 'space navigator', 'space pilot', 'space traveller', etc)."
-arch=('i686' 'x86_64' 'mips64el')
-url="http://spacenav.sourceforge.net/"
-license=('GPL')
-depends=('gtk2')
+pkgdesc='A libre version of 3Dconnexion'\''s 3D input device drivers configuration'
+arch=(i686 x86_64 mips64el)
+url=http://spacenav.sourceforge.net/
+license=(GPL)
+depends=(gtk2)
 source=(http://downloads.sourceforge.net/spacenav/$pkgname-$pkgver.tar.gz)
-md5sums=('d20cf09515d1e39fd04877a00a2023b5')
+sha512sums=(8cda7e8c9c2aa0875c6cf19e96ec47b9492acdcb110e9845f278ede44bee733876a56e2aa2d1198f54d8fecb978fcfe0a61e8f7b7fe19c2754eceec957172e34)
 
 build() {
   cd $srcdir/$pkgname-$pkgver
+  sed -i -e 's/$(LDFLAGS)/$(LDFLAGS) -lX11/' Makefile.in
   ./configure --prefix=$pkgdir/usr
   make || return 1
   make DESTDIR=$pkgdir install || return 1
diff --git a/community-staging/luxrays/PKGBUILD b/community-staging/luxrays/PKGBUILD
new file mode 100644
index 000000000..89e7088fb
--- /dev/null
+++ b/community-staging/luxrays/PKGBUILD
@@ -0,0 +1,37 @@
+# $Id: PKGBUILD 77407 2012-10-09 16:46:51Z stativ $
+# Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com>
+pkgname=luxrays
+pkgver=1.1
+_pkgver=589aa5dac899
+pkgrel=1
+epoch=0
+pkgdesc="Accelerate the ray intersection process by using GPUs"
+arch=('i686' 'x86_64')
+url="http://www.luxrender.net/"
+license=('GPL')
+depends=('freeimage' 'freeglut' 'glew' 'libcl')
+makedepends=('cmake' 'boost' 'opencl-headers')
+source=(https://bitbucket.org/luxrender/luxrays/get/$_pkgver.tar.bz2)
+md5sums=('7513d71148fa14bc1779b816816580b9')
+
+build() {
+  cd "$srcdir/luxrender-$pkgname-$_pkgver"
+
+  export CXXFLAGS="$CXXFLAGS -lpthread"
+  cmake -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_SKIP_RPATH=ON \
+    -DLUXRAYS_DISABLE_OPENCL=OFF \
+    .
+  make
+}
+
+package() {
+  cd "$srcdir/luxrender-$pkgname-$_pkgver"
+
+  install -d -m755 "$pkgdir"/usr/{bin,include,lib}
+  install -m755 bin/* "$pkgdir"/usr/bin
+  install -m644 lib/* "$pkgdir"/usr/lib
+  cp -a include/luxrays "$pkgdir"/usr/include
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/community-staging/luxrender/PKGBUILD b/community-staging/luxrender/PKGBUILD
new file mode 100644
index 000000000..93a60466c
--- /dev/null
+++ b/community-staging/luxrender/PKGBUILD
@@ -0,0 +1,50 @@
+# $Id: PKGBUILD 77421 2012-10-09 18:45:01Z stativ $
+# Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com>
+# Initial contributor: flixie <69one@gmx.net>
+# Contributor: Imanol Celaya <ornitorrincos@archlinux-es.org>
+pkgname=luxrender
+pkgver=1.1
+_pkgver=4b4289cda943
+pkgrel=1
+pkgdesc="Rendering system for physically correct, unbiased image synthesis"
+arch=('i686' 'x86_64')
+url="http://www.luxrender.net/"
+license=('GPL')
+depends=('boost-libs' 'freeimage' 'openexr' 'libcl')
+optdepends=('luxblend25: Blender exporter' 'qt: Qt GUI' \
+            'python: Python interface (pylux)'
+            'nvidia-utils: OpenCL support for nVidia GPUs' \
+            'amdstream: OpenCL support for AMD GPUs' \
+            'intel-opencl-sdk: OpenCL support for Intel CPUs')
+makedepends=('cmake' 'boost' 'qt' "luxrays=$pkgver" 'python' 'opencl-headers')
+source=(https://bitbucket.org/luxrender/lux/get/$_pkgver.tar.bz2)
+md5sums=('accca65afdc4cc38db49a6e54f20e0f2')
+
+build() {
+  cd "$srcdir"/luxrender-lux-$_pkgver
+
+  # fix the installation
+  sed -i '/.*wxgui.*/ d' CMakeLists.txt
+
+  export CXXFLAGS="$CXXFLAGS -lpthread"
+  cmake -DCMAKE_INSTALL_PREFIX=/usr \
+    -DLUXRAYS_DISABLE_OPENCL=OFF \
+    -DPYTHON_CUSTOM=ON \
+    -DPYTHON_LIBRARIES=/usr/lib/libpython3.3m.so \
+    -DPYTHON_INCLUDE_PATH=/usr/include/python3.3m/ \
+    .
+  make
+}
+
+package() {
+  cd "$srcdir"/luxrender-lux-$_pkgver
+  make DESTDIR="$pkgdir" install
+
+  # fix library path on x86_64
+  [ "$CARCH" = "x86_64" ] && mv "$pkgdir"/usr/lib64 "$pkgdir"/usr/lib
+
+  #install pylux
+  install -D -m644 pylux.so "$pkgdir"/usr/lib/python3.3/pylux.so
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/community-staging/onboard/PKGBUILD b/community-staging/onboard/PKGBUILD
new file mode 100644
index 000000000..236f0046b
--- /dev/null
+++ b/community-staging/onboard/PKGBUILD
@@ -0,0 +1,27 @@
+# $Id: PKGBUILD 77541 2012-10-12 02:28:37Z bgyorgy $
+# Maintainer: Balló György <ballogyor+arch at gmail dot com>
+
+pkgname=onboard
+pkgver=0.98.1
+pkgrel=1
+pkgdesc="On-screen keyboard useful on tablet PCs or for mobility impaired users"
+arch=('i686' 'x86_64')
+url="https://launchpad.net/onboard"
+license=('GPL')
+depends=('python-dbus' 'python-gobject' 'gtk3' 'python-virtkey' 'librsvg' 'gsettings-desktop-schemas' 'desktop-file-utils' 'dconf' 'hicolor-icon-theme' 'xdg-utils')
+makedepends=('python-distutils-extra')
+optdepends=('at-spi2-atk: auto-show when editing text'
+            'mousetweaks: hover click with mouse')
+options=('!emptydirs')
+install=$pkgname.install
+source=(http://launchpad.net/$pkgname/${pkgver%.*}/$pkgver/+download/$pkgname-$pkgver.tar.gz)
+md5sums=('107e031b429329b71deb67c9b90195d6')
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  # Do not set getpreferredencoding, because it breaks getstatusoutput() in the setup script
+  sed -i '/getpreferredencoding =/ d' setup.py
+
+  python3 setup.py install --root=$pkgdir/ --optimize=1
+}
diff --git a/community-staging/onboard/onboard.install b/community-staging/onboard/onboard.install
new file mode 100644
index 000000000..aa4c3e059
--- /dev/null
+++ b/community-staging/onboard/onboard.install
@@ -0,0 +1,13 @@
+post_install() {
+  glib-compile-schemas usr/share/glib-2.0/schemas
+  update-desktop-database -q
+  xdg-icon-resource forceupdate
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+post_remove() {
+  post_install $1
+}
diff --git a/community-staging/python2-cjson/PKGBUILD b/community-staging/python2-cjson/PKGBUILD
new file mode 100644
index 000000000..2d95793a4
--- /dev/null
+++ b/community-staging/python2-cjson/PKGBUILD
@@ -0,0 +1,19 @@
+# $Id: PKGBUILD 66126 2012-02-23 01:35:30Z spupykin $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Contributor: Lincoln de Sousa <lincoln@archlinux-br.org>
+
+pkgname=python2-cjson
+pkgver=1.0.5
+pkgrel=5
+arch=('i686' 'x86_64')
+license=('LGPL')
+pkgdesc="Fast JSON encoder/decoder for Python"
+url="http://pypi.python.org/pypi/python-cjson/"
+depends=('python2')
+source=("http://pypi.python.org/packages/source/p/python-cjson/python-cjson-$pkgver.tar.gz")
+md5sums=('4d55b66ecdf0300313af9d030d9644a3')
+
+build() {
+  cd $srcdir/python-cjson-$pkgver
+  python2 setup.py install --root=$pkgdir
+}
diff --git a/community-staging/python2-galago/PKGBUILD b/community-staging/python2-galago/PKGBUILD
new file mode 100644
index 000000000..6076c3a9e
--- /dev/null
+++ b/community-staging/python2-galago/PKGBUILD
@@ -0,0 +1,22 @@
+# $Id: PKGBUILD 66128 2012-02-23 01:37:06Z spupykin $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Contributor: William Rea <sillywilly@gmail.com>
+
+pkgname=python2-galago
+pkgver=0.5.0
+pkgrel=6
+pkgdesc="A library of simple functions that are optimized for various CPUs"
+arch=('i686' 'x86_64')
+url="http://galago-project.org"
+options=('!libtool')
+license=('LGPL')
+depends=('libgalago' 'pygtk')
+source=(http://galago-project.org/files/releases/source/galago-python/galago-python-$pkgver.tar.bz2)
+md5sums=('27be31fcf2886aa21823caec15dc34aa')
+
+build() {
+  cd $srcdir/galago-python-$pkgver
+  ./configure --prefix=/usr
+  make
+  make DESTDIR=$pkgdir install
+}
diff --git a/community-staging/python2-gnutls/PKGBUILD b/community-staging/python2-gnutls/PKGBUILD
new file mode 100644
index 000000000..3a7c86a04
--- /dev/null
+++ b/community-staging/python2-gnutls/PKGBUILD
@@ -0,0 +1,23 @@
+# $Id: PKGBUILD 74655 2012-08-01 13:54:20Z spupykin $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Maintainer: Hugo Doria <hugo@archlinux.org>
+# Contributor: N3RD3X <n3rd3x@linuxmail.org>
+
+pkgname=python2-gnutls
+pkgver=1.2.4
+pkgrel=2
+pkgdesc="Python wrapper for the GNUTLS library"
+arch=('i686' 'x86_64')
+url="http://cheeseshop.python.org/pypi/python-gnutls"
+depends=('python2' 'gnutls')
+license=('LGPL')
+source=(http://pypi.python.org/packages/source/p/python-gnutls/python-gnutls-${pkgver}.tar.gz
+	gnutls3.patch)
+md5sums=('e3536c421291a791869d875a41dcb26a'
+         '24bc95d9f5e71e9f5e180706cbb09248')
+
+build() {
+  cd ${srcdir}/python-gnutls-${pkgver}
+  patch -Np0 <$srcdir/gnutls3.patch
+  python2 setup.py install --root=${pkgdir}
+}
diff --git a/community-staging/python2-gnutls/gnutls3.patch b/community-staging/python2-gnutls/gnutls3.patch
new file mode 100644
index 000000000..5110de2f2
--- /dev/null
+++ b/community-staging/python2-gnutls/gnutls3.patch
@@ -0,0 +1,271 @@
+diff -ru gnutls/library/functions.py gnutls.fixed/library/functions.py
+--- gnutls/library/functions.py	2011-08-19 04:48:14.000000000 +0100
++++ gnutls.fixed/library/functions.py	2012-08-01 11:56:43.450975419 +0100
+@@ -4,7 +4,7 @@
+ import sys
+ from ctypes import *
+ 
+-from gnutls.library import libgnutls, libgnutls_extra
++from gnutls.library import libgnutls
+ from gnutls.library.types import *
+ 
+ 
+@@ -121,14 +121,6 @@
+ gnutls_certificate_get_peers.argtypes = [gnutls_session_t, POINTER(c_uint)]
+ gnutls_certificate_get_peers.restype = POINTER(gnutls_datum_t)
+ 
+-gnutls_certificate_get_x509_cas = libgnutls.gnutls_certificate_get_x509_cas
+-gnutls_certificate_get_x509_cas.argtypes = [gnutls_certificate_credentials_t, POINTER(POINTER(gnutls_x509_crt_t)), POINTER(c_uint)]
+-gnutls_certificate_get_x509_cas.restype = None
+-
+-gnutls_certificate_get_x509_crls = libgnutls.gnutls_certificate_get_x509_crls
+-gnutls_certificate_get_x509_crls.argtypes = [gnutls_certificate_credentials_t, POINTER(POINTER(gnutls_x509_crl_t)), POINTER(c_uint)]
+-gnutls_certificate_get_x509_crls.restype = None
+-
+ gnutls_certificate_send_x509_rdn_sequence = libgnutls.gnutls_certificate_send_x509_rdn_sequence
+ gnutls_certificate_send_x509_rdn_sequence.argtypes = [gnutls_session_t, c_int]
+ gnutls_certificate_send_x509_rdn_sequence.restype = None
+@@ -221,10 +213,6 @@
+ gnutls_certificate_type_set_priority.argtypes = [gnutls_session_t, POINTER(c_int)]
+ gnutls_certificate_type_set_priority.restype = c_int
+ 
+-gnutls_certificate_verify_peers = libgnutls.gnutls_certificate_verify_peers
+-gnutls_certificate_verify_peers.argtypes = [gnutls_session_t]
+-gnutls_certificate_verify_peers.restype = c_int
+-
+ gnutls_certificate_verify_peers2 = libgnutls.gnutls_certificate_verify_peers2
+ gnutls_certificate_verify_peers2.argtypes = [gnutls_session_t, POINTER(c_uint)]
+ gnutls_certificate_verify_peers2.restype = c_int
+@@ -393,10 +381,6 @@
+ gnutls_error_to_alert.argtypes = [c_int, POINTER(c_int)]
+ gnutls_error_to_alert.restype = c_int
+ 
+-gnutls_extra_check_version = libgnutls_extra.gnutls_extra_check_version
+-gnutls_extra_check_version.argtypes = [c_char_p]
+-gnutls_extra_check_version.restype = c_char_p
+-
+ gnutls_fingerprint = libgnutls.gnutls_fingerprint
+ gnutls_fingerprint.argtypes = [gnutls_digest_algorithm_t, POINTER(gnutls_datum_t), c_void_p, POINTER(size_t)]
+ gnutls_fingerprint.restype = c_int
+@@ -409,10 +393,6 @@
+ gnutls_global_init.argtypes = []
+ gnutls_global_init.restype = c_int
+ 
+-gnutls_global_init_extra = libgnutls_extra.gnutls_global_init_extra
+-gnutls_global_init_extra.argtypes = []
+-gnutls_global_init_extra.restype = c_int
+-
+ gnutls_global_set_log_function = libgnutls.gnutls_global_set_log_function
+ gnutls_global_set_log_function.argtypes = [gnutls_log_func]
+ gnutls_global_set_log_function.restype = None
+@@ -461,86 +441,6 @@
+ gnutls_hex_encode.argtypes = [POINTER(gnutls_datum_t), c_char_p, POINTER(size_t)]
+ gnutls_hex_encode.restype = c_int
+ 
+-gnutls_ia_allocate_client_credentials = libgnutls_extra.gnutls_ia_allocate_client_credentials
+-gnutls_ia_allocate_client_credentials.argtypes = [POINTER(gnutls_ia_client_credentials_t)]
+-gnutls_ia_allocate_client_credentials.restype = c_int
+-
+-gnutls_ia_allocate_server_credentials = libgnutls_extra.gnutls_ia_allocate_server_credentials
+-gnutls_ia_allocate_server_credentials.argtypes = [POINTER(gnutls_ia_server_credentials_t)]
+-gnutls_ia_allocate_server_credentials.restype = c_int
+-
+-gnutls_ia_enable = libgnutls_extra.gnutls_ia_enable
+-gnutls_ia_enable.argtypes = [gnutls_session_t, c_int]
+-gnutls_ia_enable.restype = None
+-
+-gnutls_ia_endphase_send = libgnutls_extra.gnutls_ia_endphase_send
+-gnutls_ia_endphase_send.argtypes = [gnutls_session_t, c_int]
+-gnutls_ia_endphase_send.restype = c_int
+-
+-gnutls_ia_extract_inner_secret = libgnutls_extra.gnutls_ia_extract_inner_secret
+-gnutls_ia_extract_inner_secret.argtypes = [gnutls_session_t, c_char_p]
+-gnutls_ia_extract_inner_secret.restype = None
+-
+-gnutls_ia_free_client_credentials = libgnutls_extra.gnutls_ia_free_client_credentials
+-gnutls_ia_free_client_credentials.argtypes = [gnutls_ia_client_credentials_t]
+-gnutls_ia_free_client_credentials.restype = None
+-
+-gnutls_ia_free_server_credentials = libgnutls_extra.gnutls_ia_free_server_credentials
+-gnutls_ia_free_server_credentials.argtypes = [gnutls_ia_server_credentials_t]
+-gnutls_ia_free_server_credentials.restype = None
+-
+-gnutls_ia_generate_challenge = libgnutls_extra.gnutls_ia_generate_challenge
+-gnutls_ia_generate_challenge.argtypes = [gnutls_session_t, size_t, c_char_p]
+-gnutls_ia_generate_challenge.restype = c_int
+-
+-gnutls_ia_get_client_avp_ptr = libgnutls_extra.gnutls_ia_get_client_avp_ptr
+-gnutls_ia_get_client_avp_ptr.argtypes = [gnutls_ia_client_credentials_t]
+-gnutls_ia_get_client_avp_ptr.restype = c_void_p
+-
+-gnutls_ia_get_server_avp_ptr = libgnutls_extra.gnutls_ia_get_server_avp_ptr
+-gnutls_ia_get_server_avp_ptr.argtypes = [gnutls_ia_server_credentials_t]
+-gnutls_ia_get_server_avp_ptr.restype = c_void_p
+-
+-gnutls_ia_handshake = libgnutls_extra.gnutls_ia_handshake
+-gnutls_ia_handshake.argtypes = [gnutls_session_t]
+-gnutls_ia_handshake.restype = c_int
+-
+-gnutls_ia_handshake_p = libgnutls_extra.gnutls_ia_handshake_p
+-gnutls_ia_handshake_p.argtypes = [gnutls_session_t]
+-gnutls_ia_handshake_p.restype = c_int
+-
+-gnutls_ia_permute_inner_secret = libgnutls_extra.gnutls_ia_permute_inner_secret
+-gnutls_ia_permute_inner_secret.argtypes = [gnutls_session_t, size_t, c_char_p]
+-gnutls_ia_permute_inner_secret.restype = c_int
+-
+-gnutls_ia_recv = libgnutls_extra.gnutls_ia_recv
+-gnutls_ia_recv.argtypes = [gnutls_session_t, c_char_p, size_t]
+-gnutls_ia_recv.restype = ssize_t
+-
+-gnutls_ia_send = libgnutls_extra.gnutls_ia_send
+-gnutls_ia_send.argtypes = [gnutls_session_t, c_char_p, size_t]
+-gnutls_ia_send.restype = ssize_t
+-
+-gnutls_ia_set_client_avp_function = libgnutls_extra.gnutls_ia_set_client_avp_function
+-gnutls_ia_set_client_avp_function.argtypes = [gnutls_ia_client_credentials_t, gnutls_ia_avp_func]
+-gnutls_ia_set_client_avp_function.restype = None
+-
+-gnutls_ia_set_client_avp_ptr = libgnutls_extra.gnutls_ia_set_client_avp_ptr
+-gnutls_ia_set_client_avp_ptr.argtypes = [gnutls_ia_client_credentials_t, c_void_p]
+-gnutls_ia_set_client_avp_ptr.restype = None
+-
+-gnutls_ia_set_server_avp_function = libgnutls_extra.gnutls_ia_set_server_avp_function
+-gnutls_ia_set_server_avp_function.argtypes = [gnutls_ia_server_credentials_t, gnutls_ia_avp_func]
+-gnutls_ia_set_server_avp_function.restype = None
+-
+-gnutls_ia_set_server_avp_ptr = libgnutls_extra.gnutls_ia_set_server_avp_ptr
+-gnutls_ia_set_server_avp_ptr.argtypes = [gnutls_ia_server_credentials_t, c_void_p]
+-gnutls_ia_set_server_avp_ptr.restype = None
+-
+-gnutls_ia_verify_endphase = libgnutls_extra.gnutls_ia_verify_endphase
+-gnutls_ia_verify_endphase.argtypes = [gnutls_session_t, c_char_p]
+-gnutls_ia_verify_endphase.restype = c_int
+-
+ gnutls_init = libgnutls.gnutls_init
+ gnutls_init.argtypes = [POINTER(gnutls_session_t), gnutls_connection_end_t]
+ gnutls_init.restype = c_int
+@@ -733,10 +633,6 @@
+ gnutls_psk_free_server_credentials.argtypes = [gnutls_psk_server_credentials_t]
+ gnutls_psk_free_server_credentials.restype = None
+ 
+-gnutls_psk_netconf_derive_key = libgnutls.gnutls_psk_netconf_derive_key
+-gnutls_psk_netconf_derive_key.argtypes = [c_char_p, c_char_p, c_char_p, POINTER(gnutls_datum_t)]
+-gnutls_psk_netconf_derive_key.restype = c_int
+-
+ gnutls_psk_server_get_username = libgnutls.gnutls_psk_server_get_username
+ gnutls_psk_server_get_username.argtypes = [gnutls_session_t]
+ gnutls_psk_server_get_username.restype = c_char_p
+@@ -857,10 +753,6 @@
+ gnutls_session_enable_compatibility_mode.argtypes = [gnutls_session_t]
+ gnutls_session_enable_compatibility_mode.restype = None
+ 
+-gnutls_session_get_client_random = libgnutls.gnutls_session_get_client_random
+-gnutls_session_get_client_random.argtypes = [gnutls_session_t]
+-gnutls_session_get_client_random.restype = c_void_p
+-
+ gnutls_session_get_data = libgnutls.gnutls_session_get_data
+ gnutls_session_get_data.argtypes = [gnutls_session_t, c_void_p, POINTER(size_t)]
+ gnutls_session_get_data.restype = c_int
+@@ -873,18 +765,10 @@
+ gnutls_session_get_id.argtypes = [gnutls_session_t, c_void_p, POINTER(size_t)]
+ gnutls_session_get_id.restype = c_int
+ 
+-gnutls_session_get_master_secret = libgnutls.gnutls_session_get_master_secret
+-gnutls_session_get_master_secret.argtypes = [gnutls_session_t]
+-gnutls_session_get_master_secret.restype = c_void_p
+-
+ gnutls_session_get_ptr = libgnutls.gnutls_session_get_ptr
+ gnutls_session_get_ptr.argtypes = [gnutls_session_t]
+ gnutls_session_get_ptr.restype = c_void_p
+ 
+-gnutls_session_get_server_random = libgnutls.gnutls_session_get_server_random
+-gnutls_session_get_server_random.argtypes = [gnutls_session_t]
+-gnutls_session_get_server_random.restype = c_void_p
+-
+ gnutls_session_is_resumed = libgnutls.gnutls_session_is_resumed
+ gnutls_session_is_resumed.argtypes = [gnutls_session_t]
+ gnutls_session_is_resumed.restype = c_int
+@@ -905,10 +789,6 @@
+ gnutls_set_default_priority.argtypes = [gnutls_session_t]
+ gnutls_set_default_priority.restype = c_int
+ 
+-gnutls_sign_algorithm_get_name = libgnutls.gnutls_sign_algorithm_get_name
+-gnutls_sign_algorithm_get_name.argtypes = [gnutls_sign_algorithm_t]
+-gnutls_sign_algorithm_get_name.restype = c_char_p
+-
+ gnutls_sign_callback_get = libgnutls.gnutls_sign_callback_get
+ gnutls_sign_callback_get.argtypes = [gnutls_session_t, POINTER(c_void_p)]
+ gnutls_sign_callback_get.restype = gnutls_sign_func
+@@ -937,14 +817,6 @@
+ gnutls_transport_set_errno.argtypes = [gnutls_session_t, c_int]
+ gnutls_transport_set_errno.restype = None
+ 
+-gnutls_transport_set_global_errno = libgnutls.gnutls_transport_set_global_errno
+-gnutls_transport_set_global_errno.argtypes = [c_int]
+-gnutls_transport_set_global_errno.restype = None
+-
+-gnutls_transport_set_lowat = libgnutls.gnutls_transport_set_lowat
+-gnutls_transport_set_lowat.argtypes = [gnutls_session_t, c_int]
+-gnutls_transport_set_lowat.restype = None
+-
+ gnutls_transport_set_ptr = libgnutls.gnutls_transport_set_ptr
+ gnutls_transport_set_ptr.argtypes = [gnutls_session_t, gnutls_transport_ptr_t]
+ gnutls_transport_set_ptr.restype = None
+@@ -1501,10 +1373,6 @@
+ gnutls_x509_privkey_sign_hash.argtypes = [gnutls_x509_privkey_t, POINTER(gnutls_datum_t), POINTER(gnutls_datum_t)]
+ gnutls_x509_privkey_sign_hash.restype = c_int
+ 
+-gnutls_x509_privkey_verify_data = libgnutls.gnutls_x509_privkey_verify_data
+-gnutls_x509_privkey_verify_data.argtypes = [gnutls_x509_privkey_t, c_uint, POINTER(gnutls_datum_t), POINTER(gnutls_datum_t)]
+-gnutls_x509_privkey_verify_data.restype = c_int
+-
+ gnutls_x509_rdn_get = libgnutls.gnutls_x509_rdn_get
+ gnutls_x509_rdn_get.argtypes = [POINTER(gnutls_datum_t), c_char_p, POINTER(size_t)]
+ gnutls_x509_rdn_get.restype = c_int
+diff -ru gnutls/library/__init__.py gnutls.fixed/library/__init__.py
+--- gnutls/library/__init__.py	2011-11-11 17:23:49.000000000 +0000
++++ gnutls.fixed/library/__init__.py	2012-08-01 11:57:42.284290997 +0100
+@@ -53,6 +53,9 @@
+     else:
+         raise RuntimeError('cannot find lib%s on this system' % name)
+ 
++def do_nothing(*args, **kwargs):
++    pass
++
+ 
+ def initialize_gcrypt():
+     from ctypes import c_void_p
+@@ -104,7 +107,7 @@
+         libgcrypt = load_library(name='gcrypt', version=11)
+         gcry_control = libgcrypt.gcry_control
+     else:
+-        gcry_control = libgnutls.gcry_control
++        gcry_control = do_nothing
+ 
+     gcry_control(GCRYCTL_SET_THREAD_CBS, c_void_p(gcrypt_thread_callbacks_ptr))
+     if system == 'cygwin':
+@@ -117,12 +120,10 @@
+ 
+ 
+ 
+-libgnutls = load_library(name='gnutls', version=26)
+-libgnutls_extra = load_library(name='gnutls-extra', version=26)
++libgnutls = load_library(name='gnutls', version=28)
+ 
+ initialize_gcrypt()
+ libgnutls.gnutls_global_init()
+-libgnutls_extra.gnutls_global_init_extra()
+ 
+ 
+ from gnutls.library import constants
+@@ -136,9 +137,6 @@
+ if functions.gnutls_check_version(__need_version__) is None:
+     version = functions.gnutls_check_version(None)
+     raise RuntimeError("Found GNUTLS library version %s, but at least version %s is required" % (version, __need_version__))
+-if functions.gnutls_extra_check_version(__need_version__) is None:
+-    version = functions.gnutls_extra_check_version(None)
+-    raise RuntimeError("Found GNUTLS extra library version %s, but at least version %s is required" % (version, __need_version__))
+ 
+ 
+ del get_system_name, library_locations, load_library, initialize_gcrypt
diff --git a/community-staging/python2-lcms/PKGBUILD b/community-staging/python2-lcms/PKGBUILD
new file mode 100644
index 000000000..3b75364ab
--- /dev/null
+++ b/community-staging/python2-lcms/PKGBUILD
@@ -0,0 +1,37 @@
+# $Id: PKGBUILD 66130 2012-02-23 01:39:55Z spupykin $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Contributor: Connor Behan <connor.behan@gmail.com>
+
+pkgname=python2-lcms
+pkgver=1.19
+_mver=1.19
+pkgrel=4
+pkgdesc="LittleCMS Python bindings"
+arch=(i686 x86_64)
+license=('CUSTOM')
+depends=('libtiff' 'python2' 'lcms')
+url="http://www.littlecms.com"
+options=('!libtool')
+source=(http://downloads.sourceforge.net/project/lcms/lcms/${_mver}/lcms-$pkgver.tar.gz)
+md5sums=('8af94611baf20d9646c7c2c285859818')
+
+build() {
+  cd $srcdir/lcms-${_mver}
+  ./configure --prefix=/usr --with-python
+  make
+}
+
+package() {
+  cd $srcdir/lcms-${_mver}
+  make DESTDIR=$pkgdir install
+  install -D -m0644 COPYING $pkgdir/usr/share/licenses/$pkgname/COPYING
+  rm -rf $pkgdir/usr/bin \
+	 $pkgdir/usr/include \
+	 $pkgdir/usr/lib/pkgconfig \
+	 $pkgdir/usr/lib/liblcms.* \
+	 $pkgdir/usr/share/man/man1/icc2ps.1 \
+	 $pkgdir/usr/share/man/man1/icclink.1 \
+	 $pkgdir/usr/share/man/man1/jpegicc.1 \
+	 $pkgdir/usr/share/man/man1/tifficc.1 \
+	 $pkgdir/usr/share/man/man1/wtpt.1
+}
diff --git a/community-staging/python2-m2crypto/PKGBUILD b/community-staging/python2-m2crypto/PKGBUILD
new file mode 100644
index 000000000..a68c5a35d
--- /dev/null
+++ b/community-staging/python2-m2crypto/PKGBUILD
@@ -0,0 +1,27 @@
+# $Id: PKGBUILD 140196 2011-10-09 08:27:16Z angvp $
+# Maintainer: Angel Velasquez <angvp@archlinux.org> 
+# Contributor: Sergej Pupykin <sergej@aur.archlinux.org>
+# Contributor: William Rea <sillywilly@gmail.com>
+
+pkgname=python2-m2crypto
+pkgver=0.21.1
+pkgrel=2
+pkgdesc="A crypto and SSL toolkit for Python"
+arch=('i686' 'x86_64')
+url="http://wiki.osafoundation.org/bin/view/Projects/MeTooCrypto"
+license=('BSD')
+depends=('python2' 'openssl')
+makedepends=('swig')
+source=("http://pypi.python.org/packages/source/M/M2Crypto/M2Crypto-${pkgver}.tar.gz")
+md5sums=('f93d8462ff7646397a9f77a2fe602d17')
+
+build() {
+  cd "${srcdir}/M2Crypto-${pkgver}"
+  python2 setup.py build
+}
+
+package() {
+  cd "${srcdir}/M2Crypto-${pkgver}"
+  python2 setup.py install --root="${pkgdir}/" --optimize=1
+  install -D -m644 LICENCE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}
diff --git a/community-staging/python2-m2crypto/openssl1.patch b/community-staging/python2-m2crypto/openssl1.patch
new file mode 100644
index 000000000..59dba554d
--- /dev/null
+++ b/community-staging/python2-m2crypto/openssl1.patch
@@ -0,0 +1,531 @@
+Index: tests/test_ssl.py
+===================================================================
+--- tests/test_ssl.py	(revision 698)
++++ tests/test_ssl.py	(working copy)
+@@ -405,8 +405,11 @@
+         try:
+             ctx = SSL.Context('sslv23', weak_crypto=1)
+             s = SSL.Connection(ctx)
+-            s.connect(self.srv_addr)
+-            self.failUnlessEqual(s.get_version(), 'SSLv2')
++            if m2.OPENSSL_VERSION_NUMBER < 0x10000000: # SSLv2 ciphers disabled by default in newer OpenSSL
++                s.connect(self.srv_addr)
++                self.failUnlessEqual(s.get_version(), 'SSLv2')
++            else:
++                self.assertRaises(SSL.SSLError, s.connect, self.srv_addr)
+             s.close()
+         finally:
+             self.stop_server(pid)
+Index: tests/test_x509.py
+===================================================================
+--- tests/test_x509.py	(revision 698)
++++ tests/test_x509.py	(working copy)
+@@ -142,7 +142,7 @@
+         cn.set_data("Hello There!")
+         assert cn.get_data().as_text() == "Hello There!", cn.get_data().as_text()
+ 
+-        assert n.as_hash() == 1697185131
++        self.assertEquals(n.as_hash(), 1697185131)
+         
+         self.assertRaises(IndexError, lambda: n[100])
+         self.assert_(n[10])
+Index: tests/test_smime.py
+===================================================================
+--- tests/test_smime.py	(revision 698)
++++ tests/test_smime.py	(working copy)
+@@ -6,7 +6,7 @@
+ """
+ 
+ import unittest
+-from M2Crypto import SMIME, BIO, Rand, X509, EVP
++from M2Crypto import SMIME, BIO, Rand, X509, EVP, Err
+ 
+ class SMIMETestCase(unittest.TestCase):
+     cleartext = 'some text to manipulate'
+@@ -213,7 +213,7 @@
+ 
+         self.filenameSmime = 'tests/sig.p7s'
+         f = BIO.openfile(self.filenameSmime, 'wb')
+-        assert s.write(f, p7, BIO.MemoryBuffer('some text')) == 1
++        assert s.write(f, p7, BIO.MemoryBuffer('some text')) == 1, Err.get_error()
+         f.close()
+         
+     def test_write_pkcs7_der(self):
+Index: SWIG/_evp.i
+===================================================================
+--- SWIG/_evp.i	(revision 695)
++++ SWIG/_evp.i	(working copy)
+@@ -180,7 +180,7 @@
+ 
+     PKCS5_PBKDF2_HMAC_SHA1(passbuf, passlen, saltbuf, saltlen, iter,
+                            keylen, key);
+-    ret = PyString_FromStringAndSize(key, keylen);
++    ret = PyString_FromStringAndSize((char*)key, keylen);
+     OPENSSL_cleanse(key, keylen);
+     return ret;
+ }
+@@ -339,7 +339,7 @@
+     klen = EVP_BytesToKey(cipher, md, (unsigned char *)sbuf, 
+         (unsigned char *)dbuf, dlen, iter, 
+         key, NULL); /* Since we are not returning IV no need to derive it */
+-    ret = PyString_FromStringAndSize(key, klen);
++    ret = PyString_FromStringAndSize((char*)key, klen);
+     return ret;
+ }
+ 
+@@ -435,7 +435,7 @@
+         PyErr_SetString(_evp_err, ERR_reason_error_string(ERR_get_error()));
+         return NULL;
+     }
+-    ret = PyString_FromStringAndSize(sigbuf, siglen);
++    ret = PyString_FromStringAndSize((char*)sigbuf, siglen);
+     OPENSSL_cleanse(sigbuf, siglen);
+     OPENSSL_free(sigbuf);
+     return ret;
+@@ -513,7 +513,7 @@
+         PyErr_SetString(PyExc_ValueError, "EVP_PKEY as DER failed");
+         return NULL; 
+     }
+-    der = PyString_FromStringAndSize(pp, len);
++    der = PyString_FromStringAndSize((char*)pp, len);
+     OPENSSL_free(pp);
+     return der;
+ }
+Index: SWIG/_ssl.i
+===================================================================
+--- SWIG/_ssl.i	(revision 695)
++++ SWIG/_ssl.i	(working copy)
+@@ -17,13 +17,17 @@
+ %apply Pointer NONNULL { SSL_CTX * };
+ %apply Pointer NONNULL { SSL * };
+ %apply Pointer NONNULL { SSL_CIPHER * };
+-%apply Pointer NONNULL { STACK * };
++%apply Pointer NONNULL { STACK_OF(SSL_CIPHER) * };
++%apply Pointer NONNULL { STACK_OF(X509) * };
+ %apply Pointer NONNULL { BIO * };
+ %apply Pointer NONNULL { DH * };
+ %apply Pointer NONNULL { RSA * };
+ %apply Pointer NONNULL { EVP_PKEY *};
+ %apply Pointer NONNULL { PyObject *pyfunc };
+ 
++%rename(ssl_get_ciphers) SSL_get_ciphers;
++extern STACK_OF(SSL_CIPHER) *SSL_get_ciphers(const SSL *ssl);
++
+ %rename(ssl_get_version) SSL_get_version;
+ extern const char *SSL_get_version(CONST SSL *);
+ %rename(ssl_get_error) SSL_get_error;
+@@ -668,29 +672,25 @@
+     return SSL_CIPHER_get_bits(c, NULL);
+ }
+ 
+-STACK *ssl_get_ciphers(SSL *ssl) {
+-    return (STACK *)SSL_get_ciphers(ssl);
++int sk_ssl_cipher_num(STACK_OF(SSL_CIPHER) *stack) {
++    return sk_SSL_CIPHER_num(stack);
+ }
+ 
+-int sk_ssl_cipher_num(STACK *stack) {
+-    return sk_num(stack);
++SSL_CIPHER *sk_ssl_cipher_value(STACK_OF(SSL_CIPHER) *stack, int idx) {
++    return sk_SSL_CIPHER_value(stack, idx);
+ }
+ 
+-SSL_CIPHER *sk_ssl_cipher_value(STACK *stack, int idx) {
+-    return (SSL_CIPHER *)sk_value(stack, idx);
++STACK_OF(X509) *ssl_get_peer_cert_chain(SSL *ssl) {
++    return SSL_get_peer_cert_chain(ssl);
+ }
+ 
+-STACK *ssl_get_peer_cert_chain(SSL *ssl) {
+-    return (STACK *)SSL_get_peer_cert_chain(ssl);
++int sk_x509_num(STACK_OF(X509) *stack) {
++    return sk_X509_num(stack);
+ }
+ 
+-int sk_x509_num(STACK *stack) {
+-    return sk_num(stack);
++X509 *sk_x509_value(STACK_OF(X509) *stack, int idx) {
++    return sk_X509_value(stack, idx);
+ }
+-
+-X509 *sk_x509_value(STACK *stack, int idx) {
+-    return (X509 *)sk_value(stack, idx);
+-}
+ %}
+ 
+ %threadallow i2d_ssl_session;
+Index: SWIG/_x509.i
+===================================================================
+--- SWIG/_x509.i	(revision 695)
++++ SWIG/_x509.i	(working copy)
+@@ -148,8 +148,15 @@
+ extern int X509_NAME_print_ex(BIO *, X509_NAME *, int, unsigned long);
+ %rename(x509_name_print_ex_fp) X509_NAME_print_ex_fp;
+ extern int X509_NAME_print_ex_fp(FILE *, X509_NAME *, int, unsigned long);
++
++#if OPENSSL_VERSION_NUMBER >= 0x10000000L
++%rename(x509_name_hash) X509_NAME_hash_old;
++extern unsigned long X509_NAME_hash_old(X509_NAME *);
++#else
+ %rename(x509_name_hash) X509_NAME_hash;
+ extern unsigned long X509_NAME_hash(X509_NAME *);
++#endif
++
+ %rename(x509_name_get_index_by_nid) X509_NAME_get_index_by_NID;
+ extern int X509_NAME_get_index_by_NID(X509_NAME *, int, int);
+ 
+@@ -171,7 +178,7 @@
+     if (PyString_Check($input)) {
+         Py_ssize_t len;
+ 
+-        $1 = PyString_AsString($input); 
++        $1 = (unsigned char *)PyString_AsString($input); 
+         len = PyString_Size($input);
+         if (len > INT_MAX) {
+             PyErr_SetString(PyExc_ValueError, "object too large");
+@@ -184,7 +191,7 @@
+     }
+ }
+ %rename(x509_name_entry_set_data) X509_NAME_ENTRY_set_data;
+-extern int X509_NAME_ENTRY_set_data( X509_NAME_ENTRY *, int, CONST unsigned char *, int);
++extern int X509_NAME_ENTRY_set_data(X509_NAME_ENTRY *, int, CONST unsigned char *, int);
+ %typemap(in) (CONST unsigned char *, int);
+ 
+ %rename(x509_req_new) X509_REQ_new;
+@@ -230,7 +237,7 @@
+ %rename(x509_store_ctx_free) X509_STORE_CTX_free;
+ extern void X509_STORE_CTX_free(X509_STORE_CTX *);
+ %rename(x509_store_ctx_get1_chain) X509_STORE_CTX_get1_chain;
+-extern STACK *X509_STORE_CTX_get1_chain(X509_STORE_CTX *);
++extern STACK_OF(X509) *X509_STORE_CTX_get1_chain(X509_STORE_CTX *);
+ 
+ %rename(x509_extension_get_critical) X509_EXTENSION_get_critical;
+ extern int X509_EXTENSION_get_critical(X509_EXTENSION *);
+@@ -348,7 +355,7 @@
+         PyErr_SetString(_x509_err, ERR_reason_error_string(ERR_get_error()));
+     }
+     else {     
+-        ret = PyString_FromStringAndSize(buf, len);
++        ret = PyString_FromStringAndSize((char*)buf, len);
+         OPENSSL_free(buf);
+     }
+     return ret;
+@@ -435,12 +442,12 @@
+ }
+ 
+ int x509_name_set_by_nid(X509_NAME *name, int nid, PyObject *obj) {
+-    return X509_NAME_add_entry_by_NID(name, nid, MBSTRING_ASC, PyString_AsString(obj), -1, -1, 0);
++    return X509_NAME_add_entry_by_NID(name, nid, MBSTRING_ASC, (unsigned char *)PyString_AsString(obj), -1, -1, 0);
+ }
+ 
+ /* x509_name_add_entry_by_txt */
+ int x509_name_add_entry_by_txt(X509_NAME *name, char *field, int type, char *bytes, int len, int loc, int set) {
+-    return X509_NAME_add_entry_by_txt(name, field, type, bytes, len, loc, set);
++    return X509_NAME_add_entry_by_txt(name, field, type, (unsigned char *)bytes, len, loc, set);
+ }
+ 
+ PyObject *x509_name_get_der(X509_NAME *name)
+@@ -450,23 +457,23 @@
+ }
+ 
+ /* sk_X509_new_null() is a macro returning "STACK_OF(X509) *". */
+-STACK *sk_x509_new_null(void) {
+-    return (STACK *)sk_X509_new_null();
++STACK_OF(X509) *sk_x509_new_null(void) {
++    return sk_X509_new_null();
+ }
+ 
+ /* sk_X509_free() is a macro. */
+-void sk_x509_free(STACK *stack) {
+-    sk_X509_free((STACK_OF(X509) *)stack);
++void sk_x509_free(STACK_OF(X509) *stack) {
++    sk_X509_free(stack);
+ }
+ 
+ /* sk_X509_push() is a macro. */
+-int sk_x509_push(STACK *stack, X509 *x509) {
+-    return sk_X509_push((STACK_OF(X509) *)stack, x509);
++int sk_x509_push(STACK_OF(X509) *stack, X509 *x509) {
++    return sk_X509_push(stack, x509);
+ }
+ 
+ /* sk_X509_pop() is a macro. */
+-X509 *sk_x509_pop(STACK *stack) {
+-    return sk_X509_pop((STACK_OF(X509) *)stack);
++X509 *sk_x509_pop(STACK_OF(X509) *stack) {
++    return sk_X509_pop(stack);
+ }
+ 
+ int x509_store_load_locations(X509_STORE *store, const char *file) {
+@@ -493,21 +500,29 @@
+     return X509_REQ_set_version(x, version);
+ }
+ 
+-int x509_req_add_extensions(X509_REQ *req, STACK *exts) {
+-    return X509_REQ_add_extensions(req, (STACK_OF(X509_EXTENSION) *)exts);
++int x509_req_add_extensions(X509_REQ *req, STACK_OF(X509_EXTENSION) *exts) {
++    return X509_REQ_add_extensions(req, exts);
+ }
+ 
+-X509_NAME_ENTRY *x509_name_entry_create_by_txt( X509_NAME_ENTRY **ne, char *field, int type, char *bytes, int len) {
+-    return X509_NAME_ENTRY_create_by_txt( ne, field, type, bytes, len);
++X509_NAME_ENTRY *x509_name_entry_create_by_txt(X509_NAME_ENTRY **ne, char *field, int type, char *bytes, int len) {
++    return X509_NAME_ENTRY_create_by_txt( ne, field, type, (unsigned char *)bytes, len);
+ }
+ 
+-LHASH * 
+-x509v3_lhash(){ 
+-       return lh_new(NULL,NULL);
++#if OPENSSL_VERSION_NUMBER >= 0x10000000L
++LHASH_OF(CONF_VALUE) 
++#else
++LHASH
++#endif
++*x509v3_lhash() { 
++    return lh_new(NULL, NULL); /* Should probably be lh_CONF_VALUE_new but won't compile. */
+ }
+ 
+ X509V3_CTX *
+-x509v3_set_conf_lhash(LHASH * lhash){
++#if OPENSSL_VERSION_NUMBER >= 0x10000000L
++x509v3_set_conf_lhash(LHASH_OF(CONF_VALUE) * lhash) {
++#else
++x509v3_set_conf_lhash(LHASH                * lhash) {
++#endif
+       X509V3_CTX * ctx;
+       if (!(ctx=(X509V3_CTX *)PyMem_Malloc(sizeof(X509V3_CTX)))) {
+           PyErr_SetString(PyExc_MemoryError, "x509v3_set_conf_lhash");
+@@ -517,11 +532,20 @@
+       return ctx;
+ }
+ 
+-X509_EXTENSION *x509v3_ext_conf(LHASH *conf, X509V3_CTX *ctx, char *name, char *value) {
++X509_EXTENSION *
++#if OPENSSL_VERSION_NUMBER >= 0x10000000L
++x509v3_ext_conf(LHASH_OF(CONF_VALUE) *conf, X509V3_CTX *ctx, char *name, char *value) {
++#else
++x509v3_ext_conf(LHASH                *conf, X509V3_CTX *ctx, char *name, char *value) {
++#endif
+       X509_EXTENSION * ext = NULL;
+       ext = X509V3_EXT_conf(conf, ctx, name, value); 
+       PyMem_Free(ctx); 
++#if OPENSSL_VERSION_NUMBER >= 0x10000000L
++      lh_CONF_VALUE_free(conf);
++#else
+       lh_free(conf);
++#endif
+       return ext;
+ }
+ 
+@@ -543,33 +567,33 @@
+ }
+ 
+ /* sk_X509_EXTENSION_new_null is a macro. */
+-STACK *sk_x509_extension_new_null(void) {
+-    return (STACK *)sk_X509_EXTENSION_new_null();
++STACK_OF(X509_EXTENSION) *sk_x509_extension_new_null(void) {
++    return sk_X509_EXTENSION_new_null();
+ }
+ 
+ /* sk_X509_EXTENSION_free() is a macro. */
+-void sk_x509_extension_free(STACK *stack) {
+-    sk_X509_EXTENSION_free((STACK_OF(X509_EXTENSION) *)stack);
++void sk_x509_extension_free(STACK_OF(X509_EXTENSION) *stack) {
++    sk_X509_EXTENSION_free(stack);
+ }
+ 
+ /* sk_X509_EXTENSION_push() is a macro. */
+-int sk_x509_extension_push(STACK *stack, X509_EXTENSION *x509_ext) {
+-    return sk_X509_EXTENSION_push((STACK_OF(X509_EXTENSION) *)stack, x509_ext);
++int sk_x509_extension_push(STACK_OF(X509_EXTENSION) *stack, X509_EXTENSION *x509_ext) {
++    return sk_X509_EXTENSION_push(stack, x509_ext);
+ }
+ 
+ /* sk_X509_EXTENSION_pop() is a macro. */
+-X509_EXTENSION *sk_x509_extension_pop(STACK *stack) {
+-    return sk_X509_EXTENSION_pop((STACK_OF(X509_EXTENSION) *)stack);
++X509_EXTENSION *sk_x509_extension_pop(STACK_OF(X509_EXTENSION) *stack) {
++    return sk_X509_EXTENSION_pop(stack);
+ }
+ 
+ /* sk_X509_EXTENSION_num() is a macro. */
+-int sk_x509_extension_num(STACK *stack) {
+-    return sk_X509_EXTENSION_num((STACK_OF(X509_EXTENSION) *)stack);
++int sk_x509_extension_num(STACK_OF(X509_EXTENSION) *stack) {
++    return sk_X509_EXTENSION_num(stack);
+ }
+ 
+ /* sk_X509_EXTENSION_value() is a macro. */
+-X509_EXTENSION *sk_x509_extension_value(STACK *stack, int i) {
+-    return sk_X509_EXTENSION_value((STACK_OF(X509_EXTENSION) *)stack, i);
++X509_EXTENSION *sk_x509_extension_value(STACK_OF(X509_EXTENSION) *stack, int i) {
++    return sk_X509_EXTENSION_value(stack, i);
+ }
+ 
+ /* X509_STORE_CTX_get_app_data is a macro. */
+@@ -590,7 +614,7 @@
+ #define I2DTYPE int (*)()
+ #endif   
+ 
+-STACK *
++STACK_OF(X509) *
+ make_stack_from_der_sequence(PyObject * pyEncodedString){
+     STACK_OF(X509) *certs;
+     Py_ssize_t encoded_string_len;
+@@ -606,7 +630,7 @@
+         return NULL;
+     }
+ 
+-    certs = ASN1_seq_unpack((unsigned char *)encoded_string, encoded_string_len, (D2ITYPE)d2i_X509, (void(*)())X509_free ); 
++    certs = ASN1_seq_unpack_X509((unsigned char *)encoded_string, encoded_string_len, d2i_X509, X509_free ); 
+     if (!certs) {
+        PyErr_SetString(_x509_err, ERR_reason_error_string(ERR_get_error()));
+        return NULL;
+@@ -616,13 +640,13 @@
+ }
+ 
+ PyObject *
+-get_der_encoding_stack(STACK * stack){
++get_der_encoding_stack(STACK_OF(X509) *stack){
+     PyObject * encodedString;
+     
+     unsigned char * encoding;
+     int len; 
+     
+-    encoding = ASN1_seq_pack((STACK_OF(X509)*) stack, (I2DTYPE)i2d_X509, NULL, &len); 
++    encoding = ASN1_seq_pack_X509(stack, i2d_X509, NULL, &len); 
+     if (!encoding) {
+        PyErr_SetString(_x509_err, ERR_reason_error_string(ERR_get_error()));
+        return NULL;
+Index: SWIG/_aes.i
+===================================================================
+--- SWIG/_aes.i	(revision 695)
++++ SWIG/_aes.i	(working copy)
+@@ -76,7 +76,7 @@
+         AES_encrypt((const unsigned char *)in, out, key);
+     else
+         AES_decrypt((const unsigned char *)in, out, key);
+-    return PyString_FromStringAndSize(out, outlen);
++    return PyString_FromStringAndSize((char*)out, outlen);
+ }
+ 
+ int AES_type_check(AES_KEY *key) {
+Index: SWIG/_util.i
+===================================================================
+--- SWIG/_util.i	(revision 695)
++++ SWIG/_util.i	(working copy)
+@@ -48,7 +48,7 @@
+         PyErr_SetString(_util_err, ERR_reason_error_string(ERR_get_error()));
+         return NULL;
+     }
+-    obj = PyString_FromStringAndSize(ret, len);
++    obj = PyString_FromStringAndSize((char*)ret, len);
+     OPENSSL_free(ret);
+     return obj;
+ }
+Index: SWIG/_m2crypto.i
+===================================================================
+--- SWIG/_m2crypto.i	(revision 695)
++++ SWIG/_m2crypto.i	(working copy)
+@@ -38,6 +38,19 @@
+ #define CONST098
+ #endif
+ 
++/* Bring in STACK_OF macro definition */
++%include <openssl/safestack.h>
++
++/* Bring in LHASH_OF macro definition */
++/* XXX Can't include lhash.h where LHASH_OF is defined, because it includes
++   XXX stdio.h etc. which we fail to include. So we have to (re)define
++   XXX LHASH_OF here instead.
++%include <openssl/lhash.h>
++*/
++#if OPENSSL_VERSION_NUMBER >= 0x10000000L
++#define LHASH_OF(type) struct lhash_st_##type
++#endif
++
+ %include constraints.i
+ %include _threads.i
+ %include _lib.i
+Index: SWIG/_rand.i
+===================================================================
+--- SWIG/_rand.i	(revision 695)
++++ SWIG/_rand.i	(working copy)
+@@ -87,7 +87,7 @@
+         Py_INCREF(Py_None);
+         return Py_None;
+     } else {
+-        PyTuple_SET_ITEM(tuple, 0, PyString_FromStringAndSize(blob, n));
++        PyTuple_SET_ITEM(tuple, 0, PyString_FromStringAndSize((char*)blob, n));
+         PyMem_Free(blob);
+         PyTuple_SET_ITEM(tuple, 1, PyInt_FromLong((long)ret));
+         return tuple;
+Index: SWIG/_pkcs7.i
+===================================================================
+--- SWIG/_pkcs7.i	(revision 695)
++++ SWIG/_pkcs7.i	(working copy)
+@@ -12,7 +12,7 @@
+ %apply Pointer NONNULL { EVP_CIPHER * };
+ %apply Pointer NONNULL { EVP_PKEY * };
+ %apply Pointer NONNULL { PKCS7 * };
+-%apply Pointer NONNULL { STACK * };
++%apply Pointer NONNULL { STACK_OF(X509) * };
+ %apply Pointer NONNULL { X509 * };
+ 
+ %rename(pkcs7_new) PKCS7_new;
+@@ -54,8 +54,8 @@
+ 
+ %threadallow pkcs7_encrypt;
+ %inline %{
+-PKCS7 *pkcs7_encrypt(STACK *stack, BIO *bio, EVP_CIPHER *cipher, int flags) {
+-    return PKCS7_encrypt((STACK_OF(X509) *)stack, bio, cipher, flags);
++PKCS7 *pkcs7_encrypt(STACK_OF(X509) *stack, BIO *bio, EVP_CIPHER *cipher, int flags) {
++    return PKCS7_encrypt(stack, bio, cipher, flags);
+ }
+ 
+ PyObject *pkcs7_decrypt(PKCS7 *pkcs7, EVP_PKEY *pkey, X509 *cert, int flags) {
+@@ -96,14 +96,14 @@
+ 
+ %threadallow pkcs7_sign1;
+ %inline %{
+-PKCS7 *pkcs7_sign1(X509 *x509, EVP_PKEY *pkey, STACK *stack, BIO *bio, int flags) {
+-    return PKCS7_sign(x509, pkey, (STACK_OF(X509) *)stack, bio, flags);
++PKCS7 *pkcs7_sign1(X509 *x509, EVP_PKEY *pkey, STACK_OF(X509) *stack, BIO *bio, int flags) {
++    return PKCS7_sign(x509, pkey, stack, bio, flags);
+ }
+ %}
+ 
+ %threadallow pkcs7_verify1;
+ %inline %{
+-PyObject *pkcs7_verify1(PKCS7 *pkcs7, STACK *stack, X509_STORE *store, BIO *data, int flags) {
++PyObject *pkcs7_verify1(PKCS7 *pkcs7, STACK_OF(X509) *stack, X509_STORE *store, BIO *data, int flags) {
+     int outlen;
+     char *outbuf;
+     BIO *bio;
+@@ -113,7 +113,7 @@
+         PyErr_SetString(PyExc_MemoryError, "pkcs7_verify1");
+         return NULL;
+     }
+-    if (!PKCS7_verify(pkcs7, (STACK_OF(X509) *)stack, store, data, bio, flags)) {
++    if (!PKCS7_verify(pkcs7, stack, store, data, bio, flags)) {
+         PyErr_SetString(_pkcs7_err, ERR_reason_error_string(ERR_get_error()));
+         BIO_free(bio);
+         return NULL;
+@@ -131,7 +131,7 @@
+     return ret;
+ }
+ 
+-PyObject *pkcs7_verify0(PKCS7 *pkcs7, STACK *stack, X509_STORE *store, int flags) {
++PyObject *pkcs7_verify0(PKCS7 *pkcs7, STACK_OF(X509) *stack, X509_STORE *store, int flags) {
+     return pkcs7_verify1(pkcs7, stack, store, NULL, flags);
+ }
+ %}
+@@ -229,7 +229,7 @@
+ }
+ 
+ /* return STACK_OF(X509)* */     
+-STACK *pkcs7_get0_signers(PKCS7 *p7, STACK *certs, int flags) {     
++STACK_OF(X509) *pkcs7_get0_signers(PKCS7 *p7, STACK_OF(X509) *certs, int flags) {     
+     return PKCS7_get0_signers(p7, certs, flags);      
+ }
+ 
diff --git a/community-staging/python2-pybluez/PKGBUILD b/community-staging/python2-pybluez/PKGBUILD
new file mode 100644
index 000000000..6007614a6
--- /dev/null
+++ b/community-staging/python2-pybluez/PKGBUILD
@@ -0,0 +1,23 @@
+# $Id: PKGBUILD 66132 2012-02-23 01:40:38Z spupykin $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Contributor: cs-cam - me.at.camdaniel.com
+
+pkgname=python2-pybluez
+pkgver=0.18
+pkgrel=4
+pkgdesc="Python wrapper for the BlueZ Bluetooth stack"
+arch=('i686' 'x86_64')
+url="http://code.google.com/p/pybluez/"
+license=('GPL')
+provides=('pybluez')
+conflicts=('pybluez')
+replaces=('pybluez')
+depends=('python2' 'bluez')
+source=(http://pybluez.googlecode.com/files/PyBluez-$pkgver.tar.gz)
+md5sums=('be8c8ce615c3189fda1aaf3d568314b2')
+
+build() {
+  cd $srcdir/PyBluez-$pkgver
+  python2 setup.py install --root=$pkgdir
+  ln -s bluetooth/_bluetooth.so $pkgdir/usr/lib/python2.7/site-packages/_bluetooth.so
+}
diff --git a/community-staging/python2-pyxmpp/PKGBUILD b/community-staging/python2-pyxmpp/PKGBUILD
new file mode 100644
index 000000000..49096a86f
--- /dev/null
+++ b/community-staging/python2-pyxmpp/PKGBUILD
@@ -0,0 +1,20 @@
+# $Id: PKGBUILD 72078 2012-06-08 09:35:02Z spupykin $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Contributor: William Rea <sillywilly@gmail.com>
+
+pkgname=python2-pyxmpp
+pkgver=1.1.2
+pkgrel=2
+pkgdesc="A Python XMPP and Jabber implementation based on libxml2"
+arch=('i686' 'x86_64')
+url="http://pyxmpp.jajcus.net/"
+license=('LGPL')
+depends=('python2-dnspython' 'libxml2' 'python2-m2crypto')
+source=(http://pyxmpp.jajcus.net/downloads/pyxmpp-$pkgver.tar.gz)
+md5sums=('a38abf032aca0408b6055cd94296eb75')
+
+build() {
+  cd $srcdir/pyxmpp-$pkgver
+  python2 setup.py build
+  python2 setup.py install --root=$pkgdir
+}
diff --git a/community-staging/python2-simplejson/PKGBUILD b/community-staging/python2-simplejson/PKGBUILD
new file mode 100644
index 000000000..c6866a23d
--- /dev/null
+++ b/community-staging/python2-simplejson/PKGBUILD
@@ -0,0 +1,27 @@
+# $Id: PKGBUILD 74926 2012-08-09 22:02:03Z jlichtblau $
+# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+# Contributor: Allan McRae <allan@archlinux.org>
+# Contributor: David Moore <davidm@sjsoft.com>
+
+pkgname=python2-simplejson
+pkgver=2.6.1
+pkgrel=2
+pkgdesc="Simple, fast, extensible JSON encoder/decoder for Python"
+license=('MIT')
+arch=('i686' 'x86_64')
+url="http://undefined.org/python/#simplejson"
+depends=('python2')
+makedepends=('python2-distribute')
+changelog=$pkgname.changelog
+source=($pkgname-$pkgver.tar.gz::https://github.com/simplejson/simplejson/tarball/v${pkgver})
+sha256sums=('484b4cf0a545fc59a19ea8eed3a957919a89be116804b53712ec63466d7c3a31')
+
+build() {
+  cd ${srcdir}/simplejson-simplejson-*
+
+  python2 setup.py install --root=${pkgdir}
+
+# License
+  install -Dm644 ${srcdir}/simplejson-simplejson-*/LICENSE.txt \
+    ${pkgdir}/usr/share/licenses/$pkgname/LICENSE
+}
diff --git a/community-staging/python2-simplejson/python2-simplejson.changelog b/community-staging/python2-simplejson/python2-simplejson.changelog
new file mode 100644
index 000000000..c1e227d24
--- /dev/null
+++ b/community-staging/python2-simplejson/python2-simplejson.changelog
@@ -0,0 +1,20 @@
+2012-07-09 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+	* python-simplejson 2.6.1-1
+
+2012-05-24 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+	* python-simplejson 2.5.2-1
+
+2012-03-08 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+	* python-simplejson 2.3.3-1
+
+2011-10-26 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+	* python-simplejson 2.2.1-1
+
+2011-05-01 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+	* python-simplejson 2.1.3-1
+
+2010-05-15 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+	* Update to major release 2.1.1
+
+2010-03-27 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+	* Update to major release 2.1.0
diff --git a/community-staging/python2-vorbissimple/PKGBUILD b/community-staging/python2-vorbissimple/PKGBUILD
new file mode 100644
index 000000000..ba0a8be63
--- /dev/null
+++ b/community-staging/python2-vorbissimple/PKGBUILD
@@ -0,0 +1,21 @@
+# $Id: PKGBUILD 66136 2012-02-23 01:43:46Z spupykin $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Contributor: William Rea <sillywilly@gmail.com>
+
+pkgname=python2-vorbissimple
+pkgver=0.0.2
+pkgrel=6
+pkgdesc="Python bindings for vorbissimple"
+arch=('i686' 'x86_64')
+url="http://kamaelia.sourceforge.net"
+license=('MPL')
+depends=('python2' 'vorbissimple')
+makedepends=('pyrex')
+source=(http://downloads.sourceforge.net/kamaelia/vorbissimple-$pkgver.tar.gz)
+md5sums=('332077b25a4c9547947ab0922361ffda')
+
+build() {
+  cd $srcdir/vorbissimple-$pkgver/python
+  sed -i 's#__new__#__cinit__#' vorbissimple.pyx
+  python2 setup.py install --root=$pkgdir
+}
diff --git a/community-staging/virtkey/PKGBUILD b/community-staging/virtkey/PKGBUILD
new file mode 100644
index 000000000..7d350b553
--- /dev/null
+++ b/community-staging/virtkey/PKGBUILD
@@ -0,0 +1,46 @@
+# Maintainer: Balló György <ballogyor+arch at gmail dot com>
+# Contributor: codl <codl@aquageek.net>
+# Contributor: Megamixman <Megamixman@gmail.com>
+
+pkgbase=virtkey
+pkgname=('python2-virtkey' 'python-virtkey')
+pkgver=0.61.0
+pkgrel=2
+arch=('i686' 'x86_64')
+url="https://launchpad.net/virtkey"
+license=('LGPL')
+makedepends=('python2' 'python' 'libxtst' 'gtk2')
+source=(http://launchpad.net/$pkgbase/${pkgver%.*}/$pkgver/+download/$pkgbase-$pkgver.tar.gz)
+md5sums=('536d30acb2c8ddadc6b4a26fc01e8390')
+
+build() {
+  cd "$srcdir"
+
+  cp -a {,python2-}$pkgbase-$pkgver
+
+  # Build python 2 module
+  cd "$srcdir/python2-$pkgbase-$pkgver"
+  python2 setup.py build
+
+  # Build python 3 module
+  cd "$srcdir/$pkgbase-$pkgver"
+  python setup.py build
+}
+
+package_python2-virtkey() {
+  pkgdesc="Python 2 extension for emulating keypresses and getting layout information from the X server"
+  depends=('python2' 'libxtst' 'gtk2')
+
+  cd "$srcdir/python2-$pkgbase-$pkgver"
+
+  python2 setup.py install --root=$pkgdir/ --optimize=1
+}
+
+package_python-virtkey() {
+  pkgdesc="Python extension for emulating keypresses and getting layout information from the X server"
+  depends=('python' 'libxtst' 'gtk2')
+
+  cd "$srcdir/$pkgbase-$pkgver"
+
+  python3 setup.py install --root=$pkgdir/ --optimize=1
+}
diff --git a/community-testing/desmume/PKGBUILD b/community-testing/desmume/PKGBUILD
index 784e157d7..2a5d0a3bf 100644
--- a/community-testing/desmume/PKGBUILD
+++ b/community-testing/desmume/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 77328 2012-10-08 21:48:37Z schuay $
+# $Id: PKGBUILD 77556 2012-10-12 07:01:24Z schuay $
 # Maintainer: Jonathan Conder <jonno dot conder at gmail dot com>
 # Maintainer: Brad Fanella <bradfanella@archlinux.us>
 # Contributor: Arkham <arkham at archlinux dot us>
@@ -12,7 +12,7 @@
 
 pkgname=desmume
 pkgver=0.9.8
-pkgrel=2
+pkgrel=3
 pkgdesc="Nintendo DS emulator"
 arch=('i686' 'x86_64')
 url="http://desmume.org/"
@@ -36,4 +36,4 @@ package() {
   make DESTDIR="$pkgdir/" install
 }
 
-sha256sums=('f405b44e2d7ab3578d6be91a6546bbaa0afc60b2a8d193e4415fea5c5332d585')
+md5sums=('fb7c984c924087888b9eaaad8cb1875e')
diff --git a/community-testing/extremetuxracer/PKGBUILD b/community-testing/extremetuxracer/PKGBUILD
new file mode 100644
index 000000000..9292787b9
--- /dev/null
+++ b/community-testing/extremetuxracer/PKGBUILD
@@ -0,0 +1,46 @@
+# $Id: PKGBUILD 77580 2012-10-12 23:39:40Z ebelanger $
+# Maintainer: Ronald van Haren <ronald.archlinux.org>
+# Contributor: Eric Belanger <eric.archlinux.org>
+# Contributor: Fabio Scotoni <CCuleX.gmail.com>
+# Contributor: Alexander Rødseth <rodseth@gmail.com>
+pkgname=extremetuxracer
+pkgver=0.4
+pkgrel=4
+pkgdesc="Downhill racing game starring Tux"
+arch=('x86_64' 'i686')
+url="http://www.extremetuxracer.com"
+license=('GPL')
+depends=('gcc-libs' 'sdl_mixer' 'tcl>=8.5.0' 'libpng>=1.4.0' 'freetype2' 'glu')
+makedepends=('mesa' 'libxi' 'libxmu')
+conflicts=('ppracer' 'etracer')
+replaces=('ppracer' 'etracer')
+source=("http://downloads.sourceforge.net/extremetuxracer/extremetuxracer-$pkgver.tar.gz"
+       "$pkgname.png"
+       "$pkgname.desktop"
+       "libpng15.patch")
+sha256sums=('5e4057f90e6854e774f251f189b0e676cfd7e2f15779c75544c9ac5b8e30273d'
+            'ec1426171fc80b07b702e373bf9528244a3b224e887ab24b52f90740691e92fb'
+            '349448e8be522bbbe9fd896e875a4add7e02c35d0fafa46c5b10582562da3ca8'
+            '2b693eaf421d56887615fc02d40f742e9b8bf817ae36be1f1f9e33a52719eea8')
+
+build() {
+  cd "$srcdir/extremetuxracer-$pkgver"
+
+  patch -Np1 -i "${srcdir}/libpng15.patch"
+  sed -i -e 's/libpng12/libpng15/g' configure
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd "$srcdir/extremetuxracer-$pkgver"
+  make DESTDIR="$pkgdir" install
+
+ # Install icon and desktop file
+  install -Dm644 "$srcdir/$pkgname.desktop" \
+    "$pkgdir/usr/share/applications/$pkgname.desktop"
+  install -Dm644 "$srcdir/$pkgname.png" \
+    "$pkgdir/usr/share/pixmaps/$pkgname.png"
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/community-testing/extremetuxracer/extremetuxracer.desktop b/community-testing/extremetuxracer/extremetuxracer.desktop
new file mode 100644
index 000000000..6593607b8
--- /dev/null
+++ b/community-testing/extremetuxracer/extremetuxracer.desktop
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Type=Application
+Version=1.0
+Encoding=UTF-8
+Name=Extreme Tux Racer
+Comment=Open source racing game featuring Tux the Linux Penguin. 
+Icon=/usr/share/pixmaps/extremetuxracer.png
+Exec=etracer
+Terminal=false
+StartupNotify=true
+Categories=Application;Game;ArcadeGame
+
diff --git a/community-testing/extremetuxracer/extremetuxracer.png b/community-testing/extremetuxracer/extremetuxracer.png
new file mode 100644
index 000000000..6c4aec00b
--- /dev/null
+++ b/community-testing/extremetuxracer/extremetuxracer.png
diff --git a/community-testing/extremetuxracer/libpng15.patch b/community-testing/extremetuxracer/libpng15.patch
new file mode 100644
index 000000000..5c9999857
--- /dev/null
+++ b/community-testing/extremetuxracer/libpng15.patch
@@ -0,0 +1,57 @@
+diff -Nur extremetuxracer-0.4.orig/src/ppgltk/images/png_reader.cpp extremetuxracer-0.4/src/ppgltk/images/png_reader.cpp
+--- extremetuxracer-0.4.orig/src/ppgltk/images/png_reader.cpp	2007-09-01 19:38:12.000000000 +0300
++++ extremetuxracer-0.4/src/ppgltk/images/png_reader.cpp	2010-01-25 03:47:21.000000000 +0200
+@@ -53,7 +53,7 @@
+     if (!info_ptr)
+     {
+         png_destroy_read_struct(&png_ptr,
+-           (png_infopp)NULL, (png_infopp)NULL);
++           NULL, NULL);
+ 		fclose(fp);
+         return;
+     }
+@@ -62,7 +62,7 @@
+     if (!end_info)
+     {
+         png_destroy_read_struct(&png_ptr, &info_ptr,
+-          (png_infopp)NULL);
++          NULL);
+ 		fclose(fp);
+         return;
+     }
+@@ -77,7 +77,7 @@
+ 	
+ 	
+ 	png_get_IHDR(png_ptr, info_ptr, &width, &height,
+-       &bit_depth, &color_type, &interlace_type,int_p_NULL, int_p_NULL);
++       &bit_depth, &color_type, &interlace_type, NULL, NULL);
+ 	
+ 	if(bit_depth == 16)
+         png_set_strip_16(png_ptr);
+@@ -88,7 +88,7 @@
+ 		png_set_expand(png_ptr);
+ 		png_read_update_info(png_ptr, info_ptr);
+ 		png_get_IHDR(png_ptr, info_ptr, &width, &height,
+-			   &bit_depth, &color_type, &interlace_type,int_p_NULL, int_p_NULL);
++			   &bit_depth, &color_type, &interlace_type, NULL, NULL);
+ 	}
+ 	
+ 	if( color_type == PNG_COLOR_TYPE_GRAY ||
+@@ -96,7 +96,7 @@
+ 		png_set_gray_to_rgb(png_ptr);
+ 		png_read_update_info(png_ptr, info_ptr);
+ 		png_get_IHDR(png_ptr, info_ptr, &width, &height,
+-			   &bit_depth, &color_type, &interlace_type,int_p_NULL, int_p_NULL);
++			   &bit_depth, &color_type, &interlace_type, NULL, NULL);
+ 	}
+ 		
+ 	this->width=width;
+@@ -114,7 +114,7 @@
+ 	}
+ 	
+ 	png_read_end(png_ptr, info_ptr);
+-	png_destroy_read_struct(&png_ptr, &info_ptr, png_infopp_NULL);
++	png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
+ 	fclose(fp);
+ }
+ 
diff --git a/community-testing/freemat/ChangeLog b/community-testing/freemat/ChangeLog
new file mode 100644
index 000000000..dba4cf7ec
--- /dev/null
+++ b/community-testing/freemat/ChangeLog
@@ -0,0 +1,3 @@
+2007-06-27 tardo <tardo@nagi-fanboi.net>
+* Built for x86_64
+
diff --git a/community-testing/freemat/PKGBUILD b/community-testing/freemat/PKGBUILD
new file mode 100644
index 000000000..7e5702b32
--- /dev/null
+++ b/community-testing/freemat/PKGBUILD
@@ -0,0 +1,46 @@
+# $Id: PKGBUILD 77431 2012-10-10 12:16:20Z spupykin $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Contributor: William Rea <sillywilly@gmail.com>
+
+pkgname=freemat
+pkgver=4.1
+pkgrel=5
+pkgdesc="A free environment for rapid engineering, scientific prototyping and data processing"
+arch=('i686' 'x86_64')
+url="http://freemat.sourceforge.net"
+license=('GPL')
+depends=('qt' 'ffcall' 'fftw' 'mesa' 'portaudio' 'libffi' 'mesa' 'glu')
+makedepends=('arpack' 'lapack' 'umfpack' 'blas' 'libmatio' 'cmake' 'python2')
+install=freemat.install
+source=(http://downloads.sourceforge.net/project/freemat/FreeMat4/FreeMat-$pkgver-Source.tar.gz
+	build-fix.patch)
+md5sums=('929d31e2310feaff5d380fc2f7b4d1a2'
+         '2d11a28aa2a7df89c4618ed1c4be5973')
+
+build() {
+  cd $srcdir/FreeMat-$pkgver-Source
+
+  unset LDFLAGS
+  rm -f CMakeCache.txt
+  find . -type f -name '*.moc.cpp' -exec rm -f {} \;
+  find . -type f -name 'add.so' -exec rm -f {} \;
+  patch -p1 <$srcdir/build-fix.patch
+  echo >libs/libMatC/CJitFuncClang.hpp
+  echo >libs/libMatC/CJitFuncClang.cpp
+
+  cmake \
+	-DCMAKE_INSTALL_PREFIX=/usr \
+	-DUSE_LLVM=OFF \
+	-DFORCE_BUNDLED_UMFPACK=ON \
+	-DFFI_INCLUDE_DIR=/usr/lib/libffi-`pacman -Q libffi | cut -f2 -d\ |cut -f1 -d-`/include/ \
+	-DPYTHON_EXECUTABLE=/usr/bin/python2 \
+	.
+  make
+}
+package() {
+  cd $srcdir/FreeMat-$pkgver-Source
+
+  make DESTDIR=$pkgdir install -j1
+  sed -i "s|/FreeMat-.*/|/FreeMat-$pkgver/|g" $startdir/freemat.install
+  rm $pkgdir/usr/bin/blas.ini
+}
diff --git a/community-testing/freemat/build-fix.patch b/community-testing/freemat/build-fix.patch
new file mode 100644
index 000000000..c1ea63088
--- /dev/null
+++ b/community-testing/freemat/build-fix.patch
@@ -0,0 +1,11 @@
+diff -wbBur FreeMat-4.1-Source/libs/libGraphics/GLRenderEngine.cpp FreeMat-4.1-Source.my/libs/libGraphics/GLRenderEngine.cpp
+--- FreeMat-4.1-Source/libs/libGraphics/GLRenderEngine.cpp	2011-11-27 04:27:43.000000000 +0400
++++ FreeMat-4.1-Source.my/libs/libGraphics/GLRenderEngine.cpp	2012-01-20 19:07:48.000000000 +0400
+@@ -20,6 +20,7 @@
+ #include <qimage.h>
+ #include <qpainter.h>
+ #include <QtOpenGL>
++#include <GL/glu.h>
+ #include <math.h>
+ #include "IEEEFP.hpp"
+ 
diff --git a/community-testing/freemat/freemat.install b/community-testing/freemat/freemat.install
new file mode 100644
index 000000000..051cca866
--- /dev/null
+++ b/community-testing/freemat/freemat.install
@@ -0,0 +1,7 @@
+post_install() {
+  echo "-- Use FreeMat -i /usr/share/FreeMat-4.1/ to adjust docs location"
+}
+
+post_upgrade() {
+  echo "-- Use FreeMat -i /usr/share/FreeMat-4.1/ to adjust docs location"
+}
diff --git a/community-testing/libnetfilter_cthelper/PKGBUILD b/community-testing/libnetfilter_cthelper/PKGBUILD
new file mode 100644
index 000000000..3a051836e
--- /dev/null
+++ b/community-testing/libnetfilter_cthelper/PKGBUILD
@@ -0,0 +1,26 @@
+# $Id: PKGBUILD 77374 2012-10-09 09:35:39Z seblu $
+# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org>
+
+pkgname=libnetfilter_cthelper
+pkgver=1.0.0
+pkgrel=1
+pkgdesc='Library for the connection tracking helper infrastructure'
+arch=('i686' 'x86_64')
+url='http://www.netfilter.org/projects/libnetfilter_cthelper/'
+license=('GPL2')
+depends=('libmnl')
+options=('!libtool')
+source=("http://www.netfilter.org/projects/$pkgname/files/$pkgname-$pkgver.tar.bz2")
+md5sums=('b2efab1a3a198a5add448960ba011acd')
+
+build() {
+  cd $pkgname-$pkgver
+  ./configure --prefix=/usr
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/community-testing/prboom/PKGBUILD b/community-testing/prboom/PKGBUILD
new file mode 100644
index 000000000..7a6f8086d
--- /dev/null
+++ b/community-testing/prboom/PKGBUILD
@@ -0,0 +1,34 @@
+# $Id: PKGBUILD 77584 2012-10-13 02:06:46Z ebelanger $
+# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
+# Contributor: Thayer Williams <thayer@archlinux.org>
+# Contributor: dale <dale@archlinux.org>
+
+pkgname=prboom
+pkgver=2.5.0
+pkgrel=7
+pkgdesc='A game engine which provides a program to play Doom levels.'
+url='http://prboom.sourceforge.net/'
+license=('GPL2')
+arch=('i686' 'x86_64')
+depends=('libpng' 'sdl_mixer' 'sdl_net' 'glu')
+makedepends=('mesa')
+source=("http://downloads.sourceforge.net/prboom/${pkgname}-${pkgver}.tar.gz"
+        'libpng-1.4.patch')
+md5sums=('a8a15f61fa2626ab98051ab2703378c4'
+         'ba53474db8e747035ca2320a445e4ae0')
+
+build() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+
+	patch -p1 < ../libpng-1.4.patch
+
+	./configure --prefix=/usr --disable-i386-asm
+	sed -i "s|/games|/bin|g" "${srcdir}/${pkgname}-${pkgver}/src/Makefile"
+	make
+}
+
+package() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	make DESTDIR="${pkgdir}" install
+}
+
diff --git a/community-testing/prboom/libpng-1.4.patch b/community-testing/prboom/libpng-1.4.patch
new file mode 100644
index 000000000..a2215e37b
--- /dev/null
+++ b/community-testing/prboom/libpng-1.4.patch
@@ -0,0 +1,21 @@
+diff -Naur prboom-2.5.0-orig/src/SDL/i_sshot.c prboom-2.5.0/src/SDL/i_sshot.c
+--- prboom-2.5.0-orig/src/SDL/i_sshot.c	2010-01-24 23:26:03.000000000 -0500
++++ prboom-2.5.0/src/SDL/i_sshot.c	2010-01-24 23:28:42.000000000 -0500
+@@ -231,7 +231,7 @@
+   if (fp)
+   {
+     png_struct *png_ptr = png_create_write_struct(
+-        PNG_LIBPNG_VER_STRING, png_error_ptr_NULL, error_fn, warning_fn);
++        PNG_LIBPNG_VER_STRING, NULL, error_fn, warning_fn);
+ 
+     if (png_ptr)
+     {
+@@ -279,7 +279,7 @@
+             break;
+         }
+       }
+-      png_destroy_write_struct(&png_ptr,  png_infopp_NULL);
++      png_destroy_write_struct(&png_ptr,  NULL);
+     }
+     fclose(fp);
+   }
diff --git a/community-testing/qcad/PKGBUILD b/community-testing/qcad/PKGBUILD
new file mode 100644
index 000000000..7cecac054
--- /dev/null
+++ b/community-testing/qcad/PKGBUILD
@@ -0,0 +1,56 @@
+# $Id: PKGBUILD 77433 2012-10-10 12:17:59Z spupykin $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Contributor: Stefan Husmann <stefan-husmann@t-online.de>
+# Contributor: Giovanni Scafora <linuxmania@gmail.com>
+# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
+
+pkgname=qcad
+pkgver=2.0.5.0
+pkgrel=11
+pkgdesc="A 2D CAD package based upon Qt"
+arch=('i686' 'x86_64')
+url="http://www.ribbonsoft.com/qcad.html"
+license=('GPL2')
+depends=('qt3')
+makedepends=('glu')
+options=(libtool)
+source=(http://www.ribbonsoft.com/archives/$pkgname/$pkgname-$pkgver-1-community.src.tar.gz
+        qcad.xpm
+        QCad.desktop
+        qcad-intptr.patch
+        qcad.patch)
+       # http://ghost1227.com/files/misc/qm.tar.gz)
+md5sums=('96b6a56027782aec953c9c4e64c5998c'
+         'da32fec0d2fb85d96126bf28bb0ab9ff'
+         'b4d1eb6724b4b41f191f1ab6fd859c39'
+         '92f900fe1fd3a8f841232b587b49c7da'
+         '7e6779b1e3b10da1eb4daf36d93f8479')
+
+build() {
+  export PATH="/opt/qt/bin:$PATH"
+  export QTDIR=/opt/qt
+
+  cd ${srcdir}/${pkgname}-2.0.5.0-1-community.src
+
+  [ "$CARCH" = "x86_64" ] && {
+    patch -p1 < ../qcad-intptr.patch;
+    sed -i '1,1i#include <stdint.h>' qcadlib/src/engine/rs_layer.cpp qcadlib/src/engine/rs_entity.cpp;
+  }
+  patch -p1 < ../qcad.patch
+  sed -i "s:"-pedantic"::g" mkspecs/defs.pro
+
+  cd scripts
+  ./build_qcad.sh notrans
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-2.0.5.0-1-community.src/qcad
+
+  install -D -m755 qcad ${pkgdir}/usr/bin/qcad
+  install -d ${pkgdir}/usr/share/{qcad,pixmaps,applications}
+  install -m644 ../../qcad.xpm ${pkgdir}/usr/share/pixmaps/qcad.xpm
+  install -m644 ../../QCad.desktop \
+    ${pkgdir}/usr/share/applications/QCad.desktop
+  cp -r fonts patterns data library machines ${pkgdir}/usr/share/qcad
+  #cp -r ${srcdir}/qm ${pkgdir}/usr/share/qcad/
+}
diff --git a/community-testing/qcad/QCad.desktop b/community-testing/qcad/QCad.desktop
new file mode 100644
index 000000000..a55f5940f
--- /dev/null
+++ b/community-testing/qcad/QCad.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Encoding=UTF-8
+Exec=/usr/bin/qcad
+Icon=/usr/share/pixmaps/qcad.xpm
+Name=QCad
+StartupNotify=true
+Terminal=false
+Type=Application
+Categories=Application;Office;
diff --git a/community-testing/qcad/qcad-intptr.patch b/community-testing/qcad/qcad-intptr.patch
new file mode 100644
index 000000000..6d8b6acca
--- /dev/null
+++ b/community-testing/qcad/qcad-intptr.patch
@@ -0,0 +1,24 @@
+diff -Naur qcad-2.0.4.0-1.src.orig/qcadlib/src/engine/rs_entity.cpp qcad-2.0.4.0-1.src.patched/qcadlib/src/engine/rs_entity.cpp
+--- qcad-2.0.4.0-1.src.orig/qcadlib/src/engine/rs_entity.cpp	2004-09-14 15:13:02.000000000 -0500
++++ qcad-2.0.4.0-1.src.patched/qcadlib/src/engine/rs_entity.cpp	2006-06-23 14:21:40.000000000 -0500
+@@ -849,7 +849,7 @@
+         os << " layer: NULL ";
+     } else {
+         os << " layer: " << e.layer->getName().latin1() << " ";
+-        os << " layer address: " << (int)(e.layer) << " ";
++        os << " layer address: " << (intptr_t)(e.layer) << " ";
+     }
+ 
+     os << e.pen << "\n";
+diff -Naur qcad-2.0.4.0-1.src.orig/qcadlib/src/engine/rs_layer.cpp qcad-2.0.4.0-1.src.patched/qcadlib/src/engine/rs_layer.cpp
+--- qcad-2.0.4.0-1.src.orig/qcadlib/src/engine/rs_layer.cpp	2004-09-14 15:13:02.000000000 -0500
++++ qcad-2.0.4.0-1.src.patched/qcadlib/src/engine/rs_layer.cpp	2006-06-23 14:21:23.000000000 -0500
+@@ -57,7 +57,7 @@
+     os << " name: " << l.getName().latin1()
+     << " pen: " << l.getPen()
+ 	<< " frozen: " << (int)l.isFrozen()
+-	<< " address: " << (int)(&l)
++	<< " address: " << (intptr_t)(&l)
+     << std::endl;
+     return os;
+ }
diff --git a/community-testing/qcad/qcad.patch b/community-testing/qcad/qcad.patch
new file mode 100644
index 000000000..f051f29af
--- /dev/null
+++ b/community-testing/qcad/qcad.patch
@@ -0,0 +1,52 @@
+diff -aur qcad-2.0.5.0-1-community.src.orig/dxflib/src/dl_writer.h qcad-2.0.5.0-1-community.src.new/dxflib/src/dl_writer.h
+--- qcad-2.0.5.0-1-community.src.orig/dxflib/src/dl_writer.h	2008-12-11 22:28:20.000000000 +0100
++++ qcad-2.0.5.0-1-community.src.new/dxflib/src/dl_writer.h	2008-12-11 22:29:51.000000000 +0100
+@@ -37,6 +37,7 @@
+ #endif
+ 
+ #include <iostream>
++#include <cstring>
+ 
+ #include "dl_attributes.h"
+ #include "dl_codes.h"
+diff -aur qcad-2.0.5.0-1-community.src.orig/qcadactions/src/rs_actionzoompan.cpp qcad-2.0.5.0-1-community.src.new/qcadactions/src/rs_actionzoompan.cpp
+--- qcad-2.0.5.0-1-community.src.orig/qcadactions/src/rs_actionzoompan.cpp	2008-12-11 22:28:20.000000000 +0100
++++ qcad-2.0.5.0-1-community.src.new/qcadactions/src/rs_actionzoompan.cpp	2008-12-11 22:29:51.000000000 +0100
+@@ -23,7 +23,7 @@
+ ** not clear to you.
+ **
+ **********************************************************************/
+-
++#include <cstdlib>
+ #include "rs_actionzoompan.h"
+ #include "rs_snapper.h"
+ #include "rs_point.h"
+Nur in qcad-2.0.5.0-1-community.src.new/qcadlib/src/engine: rs_entity.cpp.orig.rej.
+Nur in qcad-2.0.5.0-1-community.src.new/qcadlib/src/engine: rs_entity.cpp.rej.
+Nur in qcad-2.0.5.0-1-community.src.new/qcadlib/src/engine: rs_layer.cpp.orig.rej.
+Nur in qcad-2.0.5.0-1-community.src.new/qcadlib/src/engine: rs_layer.cpp.rej.
+diff -aur qcad-2.0.5.0-1-community.src.orig/qcadlib/src/information/rs_information.cpp qcad-2.0.5.0-1-community.src.new/qcadlib/src/information/rs_information.cpp
+--- qcad-2.0.5.0-1-community.src.orig/qcadlib/src/information/rs_information.cpp	2008-12-11 22:28:20.000000000 +0100
++++ qcad-2.0.5.0-1-community.src.new/qcadlib/src/information/rs_information.cpp	2008-12-11 22:30:18.000000000 +0100
+@@ -25,7 +25,7 @@
+ **********************************************************************/
+ 
+ #include "rs_information.h"
+-
++#include <cstdlib>
+ #include "rs_constructionline.h"
+ 
+ 
+diff -aur qcad-2.0.5.0-1-community.src.orig/scripts/build_qcad.sh qcad-2.0.5.0-1-community.src.new/scripts/build_qcad.sh
+--- qcad-2.0.5.0-1-community.src.orig/scripts/build_qcad.sh	2008-12-11 22:28:20.000000000 +0100
++++ qcad-2.0.5.0-1-community.src.new/scripts/build_qcad.sh	2008-12-11 22:31:37.000000000 +0100
+@@ -16,9 +16,6 @@
+ echo "  distcc      use distcc for distributed compilation. DISTCC_HOSTS must be set."
+ echo
+ 
+-echo "QTDIR is: $QTDIR"
+-echo "QMAKESPEC is: $QMAKESPEC"
+-
+ # detect system:
+ if [ "x$OS" == "xWindows_NT" ]
+ then
diff --git a/community-testing/qcad/qcad.xpm b/community-testing/qcad/qcad.xpm
new file mode 100644
index 000000000..e747fa984
--- /dev/null
+++ b/community-testing/qcad/qcad.xpm
@@ -0,0 +1,132 @@
+/* XPM */
+static const char * qcad_xpm[] = {
+"32 32 97 2",
+"  	c None",
+". 	c #3F3F3F",
+"+ 	c #010180",
+"@ 	c #FFFFFF",
+"# 	c #E0E0EF",
+"$ 	c #41419F",
+"% 	c #4545A1",
+"& 	c #4949A3",
+"* 	c #4D4DA5",
+"= 	c #5151A7",
+"- 	c #5555A9",
+"; 	c #5959AB",
+"> 	c #4444A2",
+", 	c #3C3C9D",
+"' 	c #40409F",
+") 	c #4444A1",
+"! 	c #4848A3",
+"~ 	c #4C4CA5",
+"{ 	c #5050A7",
+"] 	c #5454A9",
+"^ 	c #5858AB",
+"/ 	c #5D5DAD",
+"( 	c #6161AF",
+"_ 	c #6565B1",
+": 	c #5C5CAD",
+"< 	c #6060AF",
+"[ 	c #6464B1",
+"} 	c #6868B3",
+"| 	c #6C6CB5",
+"1 	c #7070B7",
+"2 	c #7474B9",
+"3 	c #7878BB",
+"4 	c #3F3F9E",
+"5 	c #4343A0",
+"6 	c #4747A3",
+"7 	c #4B4BA5",
+"8 	c #000000",
+"9 	c #7C7CBD",
+"0 	c #8080BF",
+"a 	c #4747A2",
+"b 	c #4B4BA4",
+"c 	c #4F4FA6",
+"d 	c #7B7BBD",
+"e 	c #7F7FBF",
+"f 	c #8383C1",
+"g 	c #5353A8",
+"h 	c #8787C3",
+"i 	c #5757AA",
+"j 	c #8B8BC5",
+"k 	c #4E4EA6",
+"l 	c #5252A8",
+"m 	c #5656AA",
+"n 	c #5A5AAC",
+"o 	c #8787C2",
+"p 	c #8F8FC7",
+"q 	c #5E5EAE",
+"r 	c #8B8BC4",
+"s 	c #8F8FC6",
+"t 	c #9393C8",
+"u 	c #6262B0",
+"v 	c #8E8EC6",
+"w 	c #9292C8",
+"x 	c #9696CA",
+"y 	c #6666B2",
+"z 	c #9A9ACC",
+"A 	c #6A6AB4",
+"B 	c #9E9ECE",
+"C 	c #6565B2",
+"D 	c #6969B4",
+"E 	c #6D6DB6",
+"F 	c #7171B8",
+"G 	c #7575BA",
+"H 	c #9D9DCE",
+"I 	c #A1A1D0",
+"J 	c #7171B7",
+"K 	c #7575B9",
+"L 	c #7979BC",
+"M 	c #7D7DBE",
+"N 	c #8181C0",
+"O 	c #8585C2",
+"P 	c #8989C4",
+"Q 	c #8D8DC6",
+"R 	c #9191C8",
+"S 	c #9595CA",
+"T 	c #9999CC",
+"U 	c #A5A5D2",
+"V 	c #7979BB",
+"W 	c #7D7DBD",
+"X 	c #8181BF",
+"Y 	c #8585C1",
+"Z 	c #8989C3",
+"` 	c #A9A9D4",
+" .	c #8D8DC5",
+"..	c #9191C7",
+"+.	c #9595C9",
+"@.	c #9999CB",
+"#.	c #ADADD6",
+"                                                                ",
+"    . . . . . . . . . . . . . . . . . . . . . . . . . . . . .   ",
+"    .       .       .       .       .       .       .       .   ",
+"    .       .       .   + + + + + + +       .       .       .   ",
+"    .     @ .     @ + + # # # # # # # + + @ .     @ .     @ .   ",
+"    . . . . . . . + # # $ % & * = - ; > > + . . . . . . . . .   ",
+"    .       .   + # , ' ) ! ~ { ] ^ / ( _ > +       .       .   ",
+"    .       . + # , ' ) ! ~ { ] ^ : < [ } | > +     .       .   ",
+"    .     @ + # , ' ) ! ~ { ] ^ : < [ } | 1 2 > + @ .     @ .   ",
+"    . . . . + # ' ) ! . . . . . . . . . 1 2 3 > + . . . . . .   ",
+"    .     + # 4 5 6 7 . @ @ @ @ @ @ @ . 8 3 9 0 > + .       .   ",
+"    .     + # 5 a b c . @ @ @ @ @ @ @ . 8 d e f > + .       .   ",
+"    .     + # a b c g . @ @ @ @ @ @ @ . 8 e f h > + .     @ .   ",
+"    . . . + # b c g i . @ @ @ @ @ @ @ . 8 f h j > + . . . . .   ",
+"    .     + # k l m n . @ @ @ @ @ @ @ . 8 o j p > + .       .   ",
+"    .     + # l m n q . @ @ @ @ @ @ @ . 8 r s t > + .       .   ",
+"    .     + # m n q u . @ @ @ @ @ @ @ . 8 v w x > + .     @ .   ",
+"    . . . + # n q u y . @ @ @ @ @ @ @ . 8 w x z > + . . . . .   ",
+"    .     + # q u y A . @ @ @ @ @ @ @ . 8 x z B > + .       .   ",
+"    .       + > C D E . . . . . . . . . 8 z B > +   .       .   ",
+"    .     @ + > D E F G 8 8 8 8 8 8 8 8 8 H I > + @ .     @ .   ",
+"    . . . . . + > J K L M N O P Q R S T H I U + . . . . . . .   ",
+"    .       .   + > V W X Y Z Q R S T H I U ` > +   .       .   ",
+"    .       .     + > > Y Z  ...+.@.H > U ` #.#.> + .       .   ",
+"    .     @ .     @ + + > > > > > > > + > #.#.#.> + .     @ .   ",
+"    . . . . . . . . . . + + + + + + + . + > #.#.> + . . . . .   ",
+"    .       .       .       .       .     + > > +   .       .   ",
+"    .       .       .       .       .       + +     .       .   ",
+"    .     @ .     @ .     @ .     @ .     @ .     @ .     @ .   ",
+"    . . . . . . . . . . . . . . . . . . . . . . . . . . . . .   ",
+"                                                                ",
+"                                                                "};
diff --git a/community-testing/qlandkartegt/PKGBUILD b/community-testing/qlandkartegt/PKGBUILD
new file mode 100644
index 000000000..dc5485029
--- /dev/null
+++ b/community-testing/qlandkartegt/PKGBUILD
@@ -0,0 +1,42 @@
+# $Id: PKGBUILD 77586 2012-10-13 02:31:01Z ebelanger $
+# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+# Contributor: Matthias Maennich <arch@maennich.net>
+# Contributor: <boenki@gmx.de>
+
+pkgname=qlandkartegt
+pkgver=1.5.1
+pkgrel=2
+pkgdesc="Use your GPS with Linux"
+arch=('i686' 'x86_64')
+url="http://www.qlandkarte.org/"
+license=('GPL')
+depends=('gdal' 'gpsd' 'libdmtx' 'libexif' 'libmysqlclient' 'glu' 'postgresql-libs'
+         'qt' 'shared-mime-info' 'qtwebkit')
+makedepends=('cmake' 'garmindev' 'mesa')
+optdepends=('garmindev: to connect garmin devices')
+install=$pkgname.install
+changelog=$pkgname.changelog
+source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz
+        $pkgname-mimetypes.xml)
+sha256sums=('095cd2390684eead61b2868e1efc85500d6d61e95f3d54d0fd255cd95f55aadd'
+            'e8d33948831f8a66edd752c71c653085d6c4d9f1969e70dd8c40b9c7ca37fba0')
+
+build() {
+  cd "${srcdir}"
+  mkdir build
+  cd build
+
+  cmake ../${pkgname}-${pkgver} \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_BUILD_TYPE=Release
+  make
+}
+
+package(){
+  cd "${srcdir}/build"
+
+  make DESTDIR="${pkgdir}" install
+
+  install -D -m644 "${srcdir}/$pkgname-mimetypes.xml" \
+    "${pkgdir}/usr/share/mime/packages/$pkgname-mimetypes.xml"
+}
diff --git a/community-testing/qlandkartegt/qlandkartegt-mimetypes.xml b/community-testing/qlandkartegt/qlandkartegt-mimetypes.xml
new file mode 100644
index 000000000..46d3d402c
--- /dev/null
+++ b/community-testing/qlandkartegt/qlandkartegt-mimetypes.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<mime-info xmlns='http://www.freedesktop.org/standards/shared-mime-info'>
+  <mime-type type="application/vnd.qlandkartegt.qlb">
+    <comment>QLandkarteGT File</comment>
+    <glob pattern="*.qlb"/>
+  </mime-type>
+</mime-info>
diff --git a/community-testing/qlandkartegt/qlandkartegt.changelog b/community-testing/qlandkartegt/qlandkartegt.changelog
new file mode 100644
index 000000000..47c05ab04
--- /dev/null
+++ b/community-testing/qlandkartegt/qlandkartegt.changelog
@@ -0,0 +1,48 @@
+2012-09-06 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+	* qlandkartegt 1.5.1-1
+
+2012-07-07 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+	* qlandkartegt 1.5.0-1
+
+2012-05-24 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+	* qlandkartegt 1.4.2-1
+
+2012-05-20 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+	* qlandkartegt 1.4.1-1
+
+2012-03-08 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+	* qlandkartegt 1.4.0-1
+
+2012-02-21 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+	* qlandkartegt 1.3.2-1
+
+2011-12-08 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+	* qlandkartegt 1.3.1-1
+
+2011-10-09 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+	* qlandkartegt 1.2.4-1
+
+2011-09-09 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+	* qlandkartegt 1.2.3-1
+
+2011-07-19 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+	* qlandkartegt 1.2.2-1
+
+2011-07-07 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+	* qlandkartegt 1.2.1-1
+
+2011-06-22 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+	* qlandkartegt 1.2.0-1
+
+2011-05-22 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+	* qlandkartegt 1.1.2-1
+
+2011-03-21 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+	* qlandkartegt 1.1.1-1
+
+2011-02-23 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+	* qlandkartegt 1.1.0-1
+
+2011-02-05 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+	* qlandkartegt 1.0.1-2
+	* moved to [community] with 59 AUR votes
diff --git a/community-testing/qlandkartegt/qlandkartegt.install b/community-testing/qlandkartegt/qlandkartegt.install
new file mode 100644
index 000000000..e55805570
--- /dev/null
+++ b/community-testing/qlandkartegt/qlandkartegt.install
@@ -0,0 +1,7 @@
+post_install() {
+  update-mime-database usr/share/mime > /dev/null
+}
+
+post_remove() {
+  post_install $1
+}
diff --git a/community-testing/scorched3d/PKGBUILD b/community-testing/scorched3d/PKGBUILD
new file mode 100644
index 000000000..0ae9d7dcb
--- /dev/null
+++ b/community-testing/scorched3d/PKGBUILD
@@ -0,0 +1,62 @@
+# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
+# Contributor: Seppo Porspakka <sporspak@paju.oulu.fi>
+# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
+ 
+pkgname=scorched3d
+pkgver=43.3.d
+_pkgver=43.3d
+pkgrel=4
+pkgdesc="3D artillery combat game"
+arch=('i686' 'x86_64')
+url="http://www.scorched3d.co.uk/"
+license=('GPL')
+depends=('sdl_net' 'wxgtk' 'freealut>=1.0.0-3' 'libvorbis' 'glu' 'fftw' 'libjpeg>=8' 'xdg-utils')
+makedepends=('gendesk' 'mesa')
+install=scorched3d.install
+source=("http://downloads.sourceforge.net/${pkgname}/Scorched3D-${_pkgver}-src.tar.gz"
+        'scorched3d.png::http://cdn.portableapps.com/Scorched3DPortable_128.png'
+        'scorched3d-42.1-gcc43.patch'
+        'scorched3d-42.1-fixups.patch'
+        'scorched3d-libpng1.5.patch'
+        'libpng14.patch')
+md5sums=('9c3043282a9e7451468ff325bef3b04c'
+         '0f7e570f586c227873e909ebbc17c84d'
+         '053769f77a38c252eef1d967b18e93e6'
+         'dfde556559d95bca07c4a390c60790b4'
+         'ec6958191751b5a2c44aa15abfc75269'
+         'c8c03855fd3693122fd39427fa3638c1')
+
+build() {
+  cd "$srcdir/scorched"
+
+#  patch -Np1 -i ${srcdir}/scorched3d-42.1-gcc43.patch
+#  patch -Np1 -i ${srcdir}/scorched3d-42.1-fixups.patch
+   patch -Np1 -i ${srcdir}/scorched3d-libpng1.5.patch
+#  patch -Np0 -i ${srcdir}/libpng14.patch
+
+  WANT_WXGTK=gtk2
+  sh autogen.sh \
+    --prefix=/usr \
+    --datadir=/usr/share/scorched3d \
+    --disable-openaltest \
+    --with-wx-config=wx-config
+
+  sed -i '1 i #include <unistd.h>' src/client/client/SecureID.cpp
+  #sed -i 's/-lz/-lz -lalut/g' src/scorched/Makefile || return 1
+  #sed -i 's|/usr/local/lib/libwx_gtk-2.4.a||' src/scorched/Makefile || return 1
+
+  make
+}
+
+package() {
+  cd "$srcdir"
+  gendesk
+
+  cd scorched
+  make DESTDIR=${pkgdir} install
+  cd ..
+
+  install -D -m644 scorched3d.png "$pkgdir/usr/share/icons/hicolor/48x48/apps/$pkgname.png"
+  install -D -m644 scorched3d.png "$pkgdir/usr/share/pixmaps/$pkgname.png"
+  install -D -m644 scorched3d.desktop "$pkgdir/usr/share/applications/$pkgname.desktop"
+}
diff --git a/community-testing/scorched3d/libpng14.patch b/community-testing/scorched3d/libpng14.patch
new file mode 100644
index 000000000..7a5a9434c
--- /dev/null
+++ b/community-testing/scorched3d/libpng14.patch
@@ -0,0 +1,38 @@
+--- src/common/image/ImagePng.cpp	2009-02-23 04:14:20.000000000 +0100
++++ src/common/image/ImagePng.cpp_patched	2010-01-24 22:01:04.000000000 +0100
+@@ -189,7 +189,7 @@
+ 	info_ptr = png_create_info_struct(png_ptr);
+ 	if (info_ptr == NULL)
+ 	{
+-	  png_destroy_read_struct(&png_ptr, png_infopp_NULL, png_infopp_NULL);
++	  png_destroy_read_struct(&png_ptr, NULL, NULL);
+ 	  return false;
+ 	}
+ 
+@@ -200,7 +200,7 @@
+ 	if (setjmp(png_jmpbuf(png_ptr)))
+ 	{
+ 	  /* Free all of the memory associated with the png_ptr and info_ptr */
+-	  png_destroy_read_struct(&png_ptr, &info_ptr, png_infopp_NULL);
++	  png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
+ 	  /* If we get here, we had a problem reading the file */
+ 	  return false;
+ 	}
+@@ -258,7 +258,7 @@
+ 	}
+ 	else
+ 	{
+-		png_destroy_read_struct(&png_ptr, &info_ptr, png_infopp_NULL);
++		png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
+ 
+ 		Logger::log(S3D::formatStringBuffer(
+ 			"Invalid PNG format.\n"
+@@ -272,7 +272,7 @@
+ 	// END NEW CODE
+ 
+ 	/* clean up after the read, and free any memory allocated - REQUIRED */
+-	png_destroy_read_struct(&png_ptr, &info_ptr, png_infopp_NULL);
++	png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
+ 
+ 	/* that's it */
+ 	return true;
diff --git a/community-testing/scorched3d/scorched3d-42.1-fixups.patch b/community-testing/scorched3d/scorched3d-42.1-fixups.patch
new file mode 100644
index 000000000..36a027cb6
--- /dev/null
+++ b/community-testing/scorched3d/scorched3d-42.1-fixups.patch
@@ -0,0 +1,58 @@
+diff -ru scorched.orig/configure-al.m4 scorched/configure-al.m4
+--- scorched.orig/configure-al.m4	2008-03-03 16:17:18.000000000 -0500
++++ scorched/configure-al.m4	2009-02-15 20:43:35.000000000 -0500
+@@ -7,25 +7,9 @@
+ 	[  --disable-openaltest    Do not try to compile and run a test OpenAL program],
+ 		    , enable_openaltest=yes)
+ AC_MSG_CHECKING(for OpenAL support)
+-AC_PATH_PROG(OPENAL_CONFIG, openal-config, no)
+-if test x$OPENAL_CONFIG = xno; then
+-	echo "*** The openal-config script installed by OpenAL could not be found"
+-	echo "*** Make sure openal-config is in your path, or set the OPENAL_CONFIG"
+-	echo "*** environment variable to the full path to openal-config."
+-
+-	AC_MSG_ERROR([*** Can't find the openal library. Try: http://www.openal.org/])
+-else
+-
+-	if test x"$use_static_openal" = x"yes"; then
+-		AL_LIBS="/usr/local/lib/libopenal.a"
+-	else
+-		AL_LIBS="`$OPENAL_CONFIG --libs`"
+-	fi
+-	
+-	AL_CFLAGS="`$OPENAL_CONFIG --cflags`"
+-
+-	AC_MSG_RESULT(yes)
+-fi
++AL_LIBS="-lopenal"
++AL_CFLAGS="-I/usr/include/AL"
++AC_MSG_RESULT(yes)
+ 
+ AC_MSG_CHECKING(for Freealut support)
+ AC_PATH_PROG(FREEALUT_CONFIG, freealut-config, no)
+diff -ru scorched.orig/configure.ac scorched/configure.ac
+--- scorched.orig/configure.ac	2008-03-03 16:17:18.000000000 -0500
++++ scorched/configure.ac	2009-02-15 20:40:30.000000000 -0500
+@@ -13,22 +13,6 @@
+ AC_PROG_INSTALL
+ AC_PROG_RANLIB
+ 
+-LDFLAGS="-L/usr/X11R6/lib -L/usr/X11R6"
+-CPPFLAGS="-I/usr/X11R6/include -I/usr/X11R6"
+-
+-if test `uname` == Darwin; then
+-LDFLAGS="$LDFLAGS -lmx"
+-CPPFLAGS="$CPPFLAGS -DFFTW_USE_DOUBLE -D__DARWIN__ -D__MACOSX__"
+-else
+-LDFLAGS="$LDFLAGS -L/usr/local/lib"
+-CPPFLAGS="$CPPFLAGS -I/usr/local/include"
+-fi
+-
+-AC_CHECK_LIB(fridge, beer, echo "Hmm?!",[
+-	echo "Warning: No beer found in fridge!";
+-	echo "We highly suggest that you rectify this situation immediately."
+-])
+-
+ AC_ARG_ENABLE(serveronly, 
+ 	[  --enable-serveronly Enable server only compilation],
+ 		    , enable_serveronly=no,
diff --git a/community-testing/scorched3d/scorched3d-42.1-gcc43.patch b/community-testing/scorched3d/scorched3d-42.1-gcc43.patch
new file mode 100644
index 000000000..b235f07c5
--- /dev/null
+++ b/community-testing/scorched3d/scorched3d-42.1-gcc43.patch
@@ -0,0 +1,24 @@
+diff -ur scorched.old/src/common/common/main.h scorched/src/common/common/main.h
+--- scorched.old/src/common/common/main.h	2009-02-18 20:06:22.000000000 +0200
++++ scorched/src/common/common/main.h	2009-02-18 20:07:18.000000000 +0200
+@@ -40,7 +40,7 @@
+ void _no_storage()
+ {
+ 	printf("Failed to allocate memory!!");
+-	std::exit(1);
++	exit(1);
+ }
+ 
+ void run_main(int argc, char *argv[], OptionsParameters &params)
+diff -ur scorched.old/src/common/porting/windows.h scorched/src/common/porting/windows.h
+--- scorched.old/src/common/porting/windows.h	2009-02-18 20:06:22.000000000 +0200
++++ scorched/src/common/porting/windows.h	2009-02-18 20:06:46.000000000 +0200
+@@ -20,7 +20,7 @@
+ typedef unsigned short  WORD;
+ typedef unsigned char   BYTE;
+ 
+-typedef int 	HWND;
++// typedef int 	HWND;
+ typedef void * 	HINSTANCE;
+ typedef int 	WPARAM;
+ typedef int 	LPARAM;
diff --git a/community-testing/scorched3d/scorched3d-libpng1.5.patch b/community-testing/scorched3d/scorched3d-libpng1.5.patch
new file mode 100644
index 000000000..4e8f003b8
--- /dev/null
+++ b/community-testing/scorched3d/scorched3d-libpng1.5.patch
@@ -0,0 +1,74 @@
+--- ./src/common/image/ImagePngFactory.cpp.old	2011-09-12 12:34:30.114461019 +0200
++++ ./src/common/image/ImagePngFactory.cpp	2011-09-12 12:39:28.566425593 +0200
+@@ -104,7 +104,7 @@
+ 
+ static void user_png_error(png_structp png_ptr, png_const_charp msg) 
+ {
+-	longjmp(png_ptr->jmpbuf,1);
++	longjmp(png_jmpbuf(png_ptr),1);
+ }
+ 
+ static void user_png_warning(png_structp png_ptr, png_const_charp msg) 
+--- ./src/client/client/LoadPNG.cpp.old	2011-09-12 12:45:49.167380419 +0200
++++ ./src/client/client/LoadPNG.cpp	2011-09-12 14:11:14.961772024 +0200
+@@ -28,6 +28,8 @@
+ 	int row, i;
+ 	volatile int ckey = -1;
+ 	png_color_16 *transv;
++	png_colorp  png_palette;
++	int         num_palette;
+ 
+ 	if ( !src ) {
+ 		/* The error message has been set in SDL_RWFromFile */
+@@ -58,7 +60,7 @@
+ 	 * the normal method of doing things with libpng).  REQUIRED unless you
+ 	 * set up your own error handlers in png_create_read_struct() earlier.
+ 	 */
+-	if ( setjmp(png_ptr->jmpbuf) ) {
++	if ( setjmp(png_jmpbuf(png_ptr)) ) {
+ 		error = "Error reading the PNG file.";
+ 		goto done;
+ 	}
+@@ -127,9 +129,9 @@
+ 			Rmask = 0x000000FF;
+ 			Gmask = 0x0000FF00;
+ 			Bmask = 0x00FF0000;
+-			Amask = (info_ptr->channels == 4) ? 0xFF000000 : 0;
++			Amask = (png_get_channels(png_ptr, info_ptr) == 4) ? 0xFF000000 : 0;
+ 		} else {
+-		        int s = (info_ptr->channels == 4) ? 0 : 8;
++		        int s = (png_get_channels(png_ptr, info_ptr) == 4) ? 0 : 8;
+ 			Rmask = 0xFF000000 >> s;
+ 			Gmask = 0x00FF0000 >> s;
+ 			Bmask = 0x0000FF00 >> s;
+@@ -137,7 +139,7 @@
+ 		}
+ 	}
+ 	surface = SDL_AllocSurface(SDL_SWSURFACE, width, height,
+-			bit_depth*info_ptr->channels, Rmask,Gmask,Bmask,Amask);
++			bit_depth*png_get_channels(png_ptr, info_ptr), Rmask,Gmask,Bmask,Amask);
+ 	if ( surface == NULL ) {
+ 		error = "Out of memory";
+ 		goto done;
+@@ -185,12 +187,15 @@
+ 		    palette->colors[i].g = i;
+ 		    palette->colors[i].b = i;
+ 		}
+-	    } else if (info_ptr->num_palette > 0 ) {
+-		palette->ncolors = info_ptr->num_palette; 
+-		for( i=0; i<info_ptr->num_palette; ++i ) {
+-		    palette->colors[i].b = info_ptr->palette[i].blue;
+-		    palette->colors[i].g = info_ptr->palette[i].green;
+-		    palette->colors[i].r = info_ptr->palette[i].red;
++	    } else {
++	    	png_get_PLTE(png_ptr, info_ptr, &png_palette, &num_palette);
++	    	if (num_palette > 0 ) {
++			palette->ncolors = num_palette; 
++			for( i=0; i<num_palette; ++i ) {
++			    palette->colors[i].b = png_palette[i].blue;
++			    palette->colors[i].g = png_palette[i].green;
++			    palette->colors[i].r = png_palette[i].red;
++			}
+ 		}
+ 	    }
+ 	}
diff --git a/community-testing/scorched3d/scorched3d.install b/community-testing/scorched3d/scorched3d.install
new file mode 100644
index 000000000..c5571196e
--- /dev/null
+++ b/community-testing/scorched3d/scorched3d.install
@@ -0,0 +1,11 @@
+post_install() {
+  which xdg-icon-resource 1>/dev/null 2>/dev/null && xdg-icon-resource forceupdate || true
+}
+
+post_upgrade() {
+  which xdg-icon-resource 1>/dev/null 2>/dev/null && xdg-icon-resource forceupdate || true
+}
+
+post_remove() {
+  which xdg-icon-resource 1>/dev/null 2>/dev/null && xdg-icon-resource forceupdate || true
+}
diff --git a/community-testing/tdfsb/PKGBUILD b/community-testing/tdfsb/PKGBUILD
new file mode 100644
index 000000000..a219a2d99
--- /dev/null
+++ b/community-testing/tdfsb/PKGBUILD
@@ -0,0 +1,35 @@
+# $Id: PKGBUILD 77588 2012-10-13 02:40:19Z ebelanger $
+# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
+
+pkgname=tdfsb
+pkgver=0.0.10
+pkgrel=6
+pkgdesc="SDL based graphical file browser"
+arch=('i686' 'x86_64')
+url="http://www.determinate.net/webdata/seg/tdfsb.html"
+license=('GPL')
+depends=('smpeg' 'freeglut' 'sdl_image' 'libxmu' 'glu')
+source=("http://www.determinate.net/webdata/data/${pkgname}-${pkgver}.tar.gz"
+        'tdfsb.desktop'
+        'tdfsb.png')
+md5sums=('8162994a7e882dc7074a5f628d2ac076'
+         '4070a7de1153c00df875384a1817e43b'
+         'ecabb39597a3c17f9541300869873e50')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  sed -i -e "s:-O2:${CFLAGS} ${LDFLAGS}:g" compile.sh
+  ./compile.sh
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  install -D -m755 tdfsb "${pkgdir}/usr/bin/tdfsb"
+
+  # Install desktop file
+  install -D -m755 "${srcdir}/tdfsb.desktop" "${pkgdir}/usr/share/applications/tdfsb.desktop"
+  # Install icon
+  install -D -m644 "${srcdir}/tdfsb.png" "${pkgdir}/usr/share/pixmaps/tdfsb.png"
+}
diff --git a/community-testing/tdfsb/tdfsb.desktop b/community-testing/tdfsb/tdfsb.desktop
new file mode 100644
index 000000000..7167e022a
--- /dev/null
+++ b/community-testing/tdfsb/tdfsb.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=Tdfsb
+Comment=SDL based graphical file browser
+Icon=/usr/share/pixmaps/tdfsb.png
+Exec=tdfsb
+Terminal=false
+Type=Application
+Categories=System;Application;
+StartupNotify=true
diff --git a/community-testing/tdfsb/tdfsb.png b/community-testing/tdfsb/tdfsb.png
new file mode 100644
index 000000000..5ac3a5fe4
--- /dev/null
+++ b/community-testing/tdfsb/tdfsb.png
diff --git a/community-testing/warzone2100/PKGBUILD b/community-testing/warzone2100/PKGBUILD
new file mode 100644
index 000000000..0fbaa7e37
--- /dev/null
+++ b/community-testing/warzone2100/PKGBUILD
@@ -0,0 +1,30 @@
+# $Id: PKGBUILD 77388 2012-10-09 14:04:20Z lcarlier $
+# Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
+# Contributor: Angelo Theodorou <encelo@users.sourceforge.net>
+
+pkgname=warzone2100
+pkgver=2.3.9
+pkgrel=3
+pkgdesc="3D realtime strategy game on a future Earth"
+url="http://wz2100.net/"
+arch=('i686' 'x86_64')
+license=('GPL')
+depends=('sdl' 'openal' 'libpng' 'libvorbis' 'libtheora' 'physfs' 'quesoglc' 'popt' 'ttf-dejavu')
+makedepends=('gawk' 'bison' 'flex' 'zip' 'unzip' 'asciidoc')
+source=(#"http://downloads.sourceforge.net/project/warzone2100/releases/${pkgver}/${pkgname}-${pkgver}.tar.gz"
+        "http://downloads.sourceforge.net/project/warzone2100/archive/${pkgver}/${pkgname}-${pkgver}.tar.gz")
+md5sums=('7185090a089c9c0e0eca7535a8f25dca')
+
+build() {
+  cd ${pkgname}-${pkgver}
+
+  ./configure --prefix=/usr --with-distributor="Arch linux"
+
+  make
+}
+
+package() {
+  cd ${pkgname}-${pkgver}
+
+  make DESTDIR=${pkgdir} install
+}
diff --git a/community-testing/xmoto/PKGBUILD b/community-testing/xmoto/PKGBUILD
new file mode 100644
index 000000000..6cfbb2db3
--- /dev/null
+++ b/community-testing/xmoto/PKGBUILD
@@ -0,0 +1,48 @@
+# $Id: PKGBUILD 77535 2012-10-11 21:34:16Z lcarlier $
+# Maintainer: Ronald van Haren <ronald.archlinux.org>
+# Contributor: Travis Willard <travisw@wmpub.ca> 
+# Contributor: Denis (dtonator@gmail.com)
+
+pkgname=xmoto
+pkgver=0.5.10
+pkgrel=2
+pkgdesc="A challenging 2D motocross platform game, where physics play an important role."
+arch=('i686' 'x86_64')
+url="http://xmoto.tuxfamily.org"
+license=('GPL')
+depends=('libjpeg' 'libpng' 'lua' 'sdl_mixer' 'ode' 'curl' 
+	 'sqlite3' 'sdl_ttf' 'desktop-file-utils' 'sdl_net' 'glu'
+         'libxdg-basedir' 'libxml++')
+makedepends=('mesa')
+install=xmoto.install
+source=("http://download.tuxfamily.org/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}-src.tar.gz"
+        'xmoto-0.5.10-libpng15.patch'
+        'system.cpp.patch')
+sha1sums=('692d50a9c91791cd06ee84846632651b44544fcc'
+          '9d13fa09f1c558a0fc504f7e7b1ceac6b4b7b20d'
+          'e741f769d1fc5779a6688970ee97e2a61a50c7ae')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+
+  patch -Np1 -i "${srcdir}/xmoto-0.5.10-libpng15.patch"
+  patch -Np1 -i "${srcdir}/system.cpp.patch"
+
+  # build and install 
+  ./configure LDFLAGS="-L/usr/lib" --prefix=/usr --disable-sdltest
+
+  make
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make DESTDIR=${pkgdir} mangdir=/usr/share/man/man6 install
+
+  # install desktop file
+  install -Dm0644 ${srcdir}/${pkgname}-${pkgver}/extra/xmoto.desktop \
+        ${pkgdir}/usr/share/applications/xmoto.desktop
+
+  # install icon for desktop file
+  install -Dm0644 ${srcdir}/${pkgname}-${pkgver}/extra/xmoto.xpm \
+        ${pkgdir}/usr/share/pixmaps/xmoto.xpm
+}
diff --git a/community-testing/xmoto/system.cpp.patch b/community-testing/xmoto/system.cpp.patch
new file mode 100644
index 000000000..df42e3a7c
--- /dev/null
+++ b/community-testing/xmoto/system.cpp.patch
@@ -0,0 +1,10 @@
+--- a/src/helpers/System.cpp	2011-10-11 22:18:14.000000000 +0200
++++ b/src/helpers/System.cpp	2012-07-21 21:28:40.000000000 +0200
+@@ -24,6 +24,7 @@
+ #include "Log.h"
+ #include "VExcept.h"
+ #include <sstream>
++#include <unistd.h>
+ 
+ std::vector<std::string>* System::getDisplayModes(int windowed) {
+     std::vector<std::string>* modes = new std::vector<std::string>;
diff --git a/community-testing/xmoto/xmoto-0.5.10-libpng15.patch b/community-testing/xmoto/xmoto-0.5.10-libpng15.patch
new file mode 100644
index 000000000..aed175c7c
--- /dev/null
+++ b/community-testing/xmoto/xmoto-0.5.10-libpng15.patch
@@ -0,0 +1,10 @@
+--- a/src/image/tim_png.cpp	2011-12-29 22:13:37.000000000 +0100
++++ b/src/image/tim_png.cpp	2012-07-21 21:36:34.000000000 +0200
+@@ -24,6 +24,7 @@
+  */
+ #include <stdio.h>
+ #include <string.h>
++#include <zlib.h>
+ #include "tim.h"
+ #include <png.h>
+ #include <zlib.h>
diff --git a/community-testing/xmoto/xmoto.install b/community-testing/xmoto/xmoto.install
new file mode 100644
index 000000000..e111ef946
--- /dev/null
+++ b/community-testing/xmoto/xmoto.install
@@ -0,0 +1,11 @@
+post_install() {
+  update-desktop-database -q
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}
diff --git a/community/abe/PKGBUILD b/community/abe/PKGBUILD
new file mode 100644
index 000000000..9f646794f
--- /dev/null
+++ b/community/abe/PKGBUILD
@@ -0,0 +1,42 @@
+# Maintainer: jsteel <mail at jsteel dot org>
+# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
+
+pkgname=abe
+pkgver=1.1
+pkgrel=9
+pkgdesc="A scrolling, platform-jumping, key-collecting, ancient pyramid exploring game"
+arch=('i686' 'x86_64')
+url="http://abe.sourceforge.net"
+license=('GPL')
+depends=('sdl_mixer')
+source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz
+        $pkgname.patch
+        $pkgname.desktop)
+md5sums=('5537920e1746708e1a631d84d3500f5c'
+         '74802a45e21b59d3e3d34f35ade252a4'
+         '6ff678e781290bff780da154a32b9767')
+
+build() {
+  cd "$srcdir"/$pkgname-$pkgver
+
+  patch -Np1 -i "$srcdir"/$pkgname.patch
+
+  ./configure --prefix=/usr
+
+  make
+}
+
+package() {
+  cd "$srcdir"/$pkgname-$pkgver
+
+  make DESTDIR="$pkgdir" install
+
+  install -Dm644 "$srcdir"/$pkgname.desktop "$pkgdir"/usr/share/applications/$pkgname.desktop
+  install -dm755 "$pkgdir"/usr/share/$pkgname/images
+
+  cp -r images/ maps/ sounds/ "$pkgdir"/usr/share/$pkgname/
+
+  cd "$pkgdir"/usr/share/$pkgname/images
+  tar -xf "$srcdir"/$pkgname-$pkgver/images/images.tar abe.bmp
+  chown root:root abe.bmp
+}
diff --git a/community/abe/abe.desktop b/community/abe/abe.desktop
new file mode 100644
index 000000000..8c452e7af
--- /dev/null
+++ b/community/abe/abe.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Type=Application
+Name=Abe
+GenericName=Platform Game
+Comment=Retro Platform Game
+Icon=/usr/share/abe/images/abe.bmp
+Exec=abe
+Categories=Game;
diff --git a/community/abe/abe.patch b/community/abe/abe.patch
new file mode 100644
index 000000000..33b0b1af0
--- /dev/null
+++ b/community/abe/abe.patch
@@ -0,0 +1,24 @@
+diff -ur abe-1.1.orig/src/Directories.h abe-1.1/src/Directories.h
+--- abe-1.1.orig/src/Directories.h	2012-08-25 16:43:45.194974618 +0100
++++ abe-1.1/src/Directories.h	2012-08-25 16:48:07.489030577 +0100
+@@ -27,7 +27,7 @@
+ 
+ // BASE_DIR has not " arround it.
+ #ifndef BASE_DIR
+-#define BASE_DIR .
++#define BASE_DIR /usr/share/abe
+ #endif
+ 
+ #define IMAGES_DIR "images"
+diff -ur abe-1.1.orig/src/Menu.c abe-1.1/src/Menu.c
+--- abe-1.1.orig/src/Menu.c	2012-08-25 16:43:45.198307908 +0100
++++ abe-1.1/src/Menu.c	2012-08-25 16:45:00.319469631 +0100
+@@ -116,7 +116,7 @@
+   if(n == SOUND_ENABLED || n == MUSIC_ENABLED)
+     return sound_loaded;
+   else
+-    return 0;
++    return 1;
+ }
+ 
+ void
diff --git a/community/alex/PKGBUILD b/community/alex/PKGBUILD
index b7cc2cb52..380db3bd6 100644
--- a/community/alex/PKGBUILD
+++ b/community/alex/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 72380 2012-06-13 13:45:40Z tdziedzic $
+# $Id: PKGBUILD 77336 2012-10-09 04:16:39Z tdziedzic $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
 # Contributor: Philip Nilsson <pnilsson@nullref.se>
 
 pkgname=alex
 pkgver=3.0.2
-pkgrel=1
+pkgrel=2
 pkgdesc='a lexical analyser generator for Haskell'
 arch=('i686' 'x86_64')
-url='http://www.haskell.org/alex/'
+url='http://hackage.haskell.org/package/alex'
 license=('custom:BSD3')
 depends=('gmp')
-makedepends=('ghc=7.4.2-1' 'haskell-quickcheck=2.4.2-2')
+makedepends=('ghc=7.6.1-1' 'haskell-quickcheck=2.5-2')
 source=("http://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz")
 md5sums=('b8f0d831b65d05e5f54ff08bd3d9d10d')
 
diff --git a/community/avr-gcc/PKGBUILD b/community/avr-gcc/PKGBUILD
index 2b28e0904..36ed19ef1 100644
--- a/community/avr-gcc/PKGBUILD
+++ b/community/avr-gcc/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 75204 2012-08-16 01:56:23Z allan $
+# $Id: PKGBUILD 77419 2012-10-09 18:03:26Z schuay $
 # Maintainer: schuay <jakob.gruber@gmail.com>
 # Contributor: Brad Fanella <bradfanella@archlinux.us>
 # Contributor: Corrado Primier <bardo@aur.archlinux.org>
@@ -8,8 +8,8 @@
 
 pkgname=avr-gcc
 _pkgname=gcc
-pkgver=4.7.1
-pkgrel=2
+pkgver=4.7.2
+pkgrel=1
 pkgdesc="The GNU AVR Compiler Collection"
 arch=('i686' 'x86_64')
 license=('GPL' 'LGPL' 'custom')
@@ -69,4 +69,4 @@ package() {
     rm -rf ${pkgdir}/usr/share/info
 }
 
-md5sums=('933e6f15f51c031060af64a9e14149ff')
+md5sums=('cc308a0891e778cfda7a151ab8a6e762')
diff --git a/community/bullet/PKGBUILD b/community/bullet/PKGBUILD
index 5e24f32ea..f6ec83a31 100644
--- a/community/bullet/PKGBUILD
+++ b/community/bullet/PKGBUILD
@@ -1,10 +1,11 @@
-# $Id: PKGBUILD 68719 2012-04-01 00:16:22Z svenstaro $
+# $Id: PKGBUILD 77520 2012-10-11 13:39:07Z svenstaro $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org>
 
 pkgbase=bullet
 pkgname=('bullet' 'bullet-docs')
-pkgver=2.80
+_rev=2613
+pkgver=2.81
 pkgrel=1
 pkgdesc="A 3D Collision Detection and Rigid Body Dynamics Library for games and animation"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,13 +13,13 @@ url="http://www.bulletphysics.com/Bullet/"
 license=('custom:zlib')
 depends=('freeglut')
 makedepends=('cmake' 'doxygen' 'graphviz' 'ttf-dejavu')
-source=(http://bullet.googlecode.com/files/${pkgbase}-${pkgver}-rev2531.tgz
+source=(http://bullet.googlecode.com/files/${pkgbase}-${pkgver}-rev${_rev}.tgz
         ${pkgbase}.pc)
-md5sums=('d1eec0332110264a21d0fc0f2fb127c3'
+md5sums=('cec9c9a79c2804dbf6385dd7d061346c'
          'd1da06deba3b08b884d2212f6838905c')
 
 build() {
-  cd ${pkgbase}-${pkgver}-rev2531
+  cd ${pkgbase}-${pkgver}-rev${_rev}
 
   # get a clean build dir
   [[ -d build ]] && rm -rf build
@@ -46,15 +47,11 @@ build() {
 package_bullet() {
   optdepends=('bullet-docs: documentation')
 
-  cd ${pkgbase}-${pkgver}-rev2531/build
+  cd ${pkgbase}-${pkgver}-rev${_rev}/build
 
   # install it
   make DESTDIR=${pkgdir} install
 
-  # fix #29012
-  install -Dm644 ../Extras/HACD/hacdVector.inl ${pkgdir}/usr/include/bullet/HACD/hacdVector.inl
-  install -Dm644 ../Extras/HACD/hacdCircularList.inl ${pkgdir}/usr/include/bullet/HACD/hacdCircularList.inl
-
   # manually handle pkgconfig file
   mkdir -p "${pkgdir}"/usr/lib/pkgconfig
   sed "s|VERSION|${pkgver}|g" ${srcdir}/bullet.pc > ${pkgdir}/usr/lib/pkgconfig/bullet.pc
@@ -67,7 +64,7 @@ package_bullet-docs() {
   pkgdesc="Documentation for bullet"
   depends=()
 
-  cd ${pkgbase}-${pkgver}-rev2531
+  cd ${pkgbase}-${pkgver}-rev${_rev}
 
   # install docs
   install -Dm644 Bullet_User_Manual.pdf ${pkgdir}/usr/share/doc/bullet/Bullet_User_Manual.pdf
diff --git a/community/connman/PKGBUILD b/community/connman/PKGBUILD
index 3d02d9512..b6ca46685 100644
--- a/community/connman/PKGBUILD
+++ b/community/connman/PKGBUILD
@@ -1,9 +1,9 @@
-$Id: PKGBUILD 76664 2012-09-25 22:41:38Z dwallace $
+#$Id: PKGBUILD 77533 2012-10-11 21:23:35Z dwallace $
 # Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com>
 # Contributor: Lucas De Marchi <lucas.de.marchi@gmail.com>
 
 pkgname=connman
-pkgver=1.7
+pkgver=1.8
 pkgrel=1
 pkgdesc="Wireless LAN network manager"
 url="http://connman.net/"
@@ -18,10 +18,10 @@ options=('!libtool')
 source=('connmand-daemon'
         "http://www.kernel.org/pub/linux/network/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
         'allow_group_network.diff')
+
 md5sums=('88ece7cbf1d0d289545ce4f8553fdab8'
-         '9c6cf5a95989ae72d90b270ac7c6e38c'
+         '689468f92a1dcb2c0e30d7d00410ad87'
          'a8d22ee089fb0ed725130d16ad393047')
-
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
diff --git a/community/devil/PKGBUILD b/community/devil/PKGBUILD
index 5fc650a59..221ca1ab8 100644
--- a/community/devil/PKGBUILD
+++ b/community/devil/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 70147 2012-04-30 19:17:33Z lcarlier $
+# $Id: PKGBUILD 77572 2012-10-12 17:47:07Z svenstaro $
 # Maintainer: Laurent Carlier <lordheavym@gmail.org>
 # Contributor: damir <damir@archlinux.org>
 # Contributor: TheHoff <forums>
 
 pkgname=devil
 pkgver=1.7.8
-pkgrel=11
+pkgrel=12
 pkgdesc="Library for reading several different image formats"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://openil.sourceforge.net/"
diff --git a/community/enet/PKGBUILD b/community/enet/PKGBUILD
index b3603c9f1..ee6e2d97f 100644
--- a/community/enet/PKGBUILD
+++ b/community/enet/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 71720 2012-06-01 18:47:54Z ebelanger $
+# $Id: PKGBUILD 77516 2012-10-11 13:14:20Z svenstaro $
 # Maintainer: Mateusz Herych <heniekk@gmail.com>
 # Contributor: Bj?indeijer <bjorn@lindeijer.nl>
 
 pkgname=enet
-pkgver=1.3.4
+pkgver=1.3.5
 pkgrel=1
 pkgdesc='A relatively thin, simple and robust network communication layer on top of UDP.'
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ license=('custom')
 depends=('glibc')
 options=('!libtool')
 source=("http://enet.bespin.org/download/${pkgname}-${pkgver}.tar.gz")
-md5sums=('e5fb0ca3fd3a9fe7eadbcde4d6af1517')
+md5sums=('c75d0be31b6f23330839a68ee66e00f9')
 
 build() {
   cd "${pkgname}-${pkgver}"
diff --git a/community/glabels/PKGBUILD b/community/glabels/PKGBUILD
index 37d4a74fb..baad6680c 100644
--- a/community/glabels/PKGBUILD
+++ b/community/glabels/PKGBUILD
@@ -1,30 +1,27 @@
-# $Id: PKGBUILD 69806 2012-04-23 09:47:01Z ibiru $
+# $Id: PKGBUILD 77545 2012-10-12 03:02:27Z bgyorgy $
 # Maintainer: Balló György <ballogyor+arch at gmail dot com>
 # Contributor: yugrotavele <yugrotavele at archlinux dot us>
 # Contributor: Damir Perisa <damir@archlinux.org>
 
 pkgname=glabels
-pkgver=3.0.0
-pkgrel=3
+pkgver=3.0.1
+pkgrel=1
 pkgdesc="Creating labels and business cards the very easy way"
 arch=('i686' 'x86_64')
-url="http://glabels.sourceforge.net/"
+url="http://glabels.org/"
 license=('GPL' 'LGPL')
 depends=('librsvg' 'evolution-data-server>=3.4.0' 'qrencode' 'iec16022' 'dconf' 'desktop-file-utils' 'xdg-utils')
 makedepends=('barcode' 'intltool' 'gnome-doc-utils')
 options=('!libtool')
 install=$pkgname.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2
-        fix-gschema.patch)
-sha256sums=('a3a3db4dd25bfb1a03f4008f01c5d9045174e78e13ae77438b81bfe4bf14e64a'
-            'ef4f368b49fe66fb7e9c1c4edabb96e1f10fd3e8502d695aef6b89388c38cd94')
+source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
+sha256sums=('99810705b9fcb234f085ed4ac6dbea50cc5b232c6d8ca05ab2c0634673fb9bd2')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
-  patch -Np1 -i "$srcdir/fix-gschema.patch"
 
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-              --disable-static --disable-scrollkeeper --disable-schemas-compile
+              --disable-static --disable-schemas-compile
   make
 }
 
diff --git a/community/gtk2hs-buildtools/0001-fix-for-ghc-7.6.1-changes.patch b/community/gtk2hs-buildtools/0001-fix-for-ghc-7.6.1-changes.patch
new file mode 100644
index 000000000..1c6a7dd65
--- /dev/null
+++ b/community/gtk2hs-buildtools/0001-fix-for-ghc-7.6.1-changes.patch
@@ -0,0 +1,69 @@
+From 7d94bcd36eb1d5a2feae182fcb74f9d6ca439a80 Mon Sep 17 00:00:00 2001
+From: Thomas Dziedzic <gostrc@gmail.com>
+Date: Wed, 12 Sep 2012 03:29:46 -0700
+Subject: [PATCH] fix for ghc 7.6.1 changes
+
+---
+ c2hs/base/general/FileOps.hs  | 3 ++-
+ c2hs/base/state/StateTrans.hs | 3 ++-
+ c2hs/toplevel/C2HSConfig.hs   | 2 +-
+ 3 files changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/c2hs/base/general/FileOps.hs b/c2hs/base/general/FileOps.hs
+index 83ac70c..4914c4b 100644
+--- a/c2hs/base/general/FileOps.hs
++++ b/c2hs/base/general/FileOps.hs
+@@ -39,6 +39,7 @@ import Control.Monad	 (liftM)
+ import System.Random    (newStdGen, randomRs)
+ 
+ import FNameOps  (dirname, stripDirname, addPath)
++import System.IO.Error (catchIOError)
+ 
+ 
+ -- search for the given file in the given list of directories (EXPORTED)
+@@ -89,7 +90,7 @@ mktemp pre post =
+ 			     in do
+ 			       h <- openFile fname ReadWriteMode
+ 			       return (h, fname)
+-			     `catch` \_ -> createLoop (attempts - 1) rs'
++			     `catchIOError` \_ -> createLoop (attempts - 1) rs'
+     --
+     sixChars :: [Int] -> ([Int], String)
+     sixChars is = 
+diff --git a/c2hs/base/state/StateTrans.hs b/c2hs/base/state/StateTrans.hs
+index ada62f4..2ab0ad1 100644
+--- a/c2hs/base/state/StateTrans.hs
++++ b/c2hs/base/state/StateTrans.hs
+@@ -84,6 +84,7 @@ import System.IO  (fixIO)
+ import Data.IORef (IORef, newIORef, readIORef, writeIORef)
+ 
+ import Errors (interr)
++import System.IO.Error (catchIOError)
+ 
+ infixr 1 +>=, +>
+ 
+@@ -337,7 +338,7 @@ fatalsHandledBy m handler  =
+ 				  ioError err
+ 	      Right a          -> return state
+ 	    )
+-	    `catch` (\err -> let
++	    `catchIOError` (\err -> let
+ 			       STB handler' = handler err
+ 			     in
+ 			     handler' bs gs)
+diff --git a/c2hs/toplevel/C2HSConfig.hs b/c2hs/toplevel/C2HSConfig.hs
+index e8deddf..af32886 100644
+--- a/c2hs/toplevel/C2HSConfig.hs
++++ b/c2hs/toplevel/C2HSConfig.hs
+@@ -46,7 +46,7 @@ import Data.Array (Array, array)
+ 
+ import Foreign (Ptr, FunPtr)
+ import Foreign  (Storable(sizeOf, alignment), toBool)
+-import Foreign.C (CInt)
++import Foreign.C (CInt(..))
+ import System.Info (os)
+ 
+ -- program settings
+-- 
+1.7.12
+
diff --git a/community/gtk2hs-buildtools/PKGBUILD b/community/gtk2hs-buildtools/PKGBUILD
index 2d83c6a52..18ce2b97d 100644
--- a/community/gtk2hs-buildtools/PKGBUILD
+++ b/community/gtk2hs-buildtools/PKGBUILD
@@ -1,22 +1,27 @@
-# $Id: PKGBUILD 72381 2012-06-13 13:45:43Z tdziedzic $
+# $Id: PKGBUILD 77337 2012-10-09 04:16:44Z tdziedzic $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=gtk2hs-buildtools
 pkgver=0.12.3.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Tools to build the Gtk2Hs suite of User Interface libraries."
 url="http://hackage.haskell.org/package/gtk2hs-buildtools"
 license=('GPL2')
 arch=('i686' 'x86_64' 'mips64el')
-makedepends=('ghc' 'alex' 'happy' 'haskell-random')
+makedepends=('ghc=7.6.1-1' 'alex=3.0.2-2' 'happy=1.18.9-6' 'haskell-random=1.0.1.1-3')
 depends=('gmp')
 options=('strip')
 provides=('haskell-gtk2hs-buildtools')
-source=(http://hackage.haskell.org/packages/archive/gtk2hs-buildtools/$pkgver/gtk2hs-buildtools-$pkgver.tar.gz)
-md5sums=('612611d831635024c953d2817b124e29')
+source=(http://hackage.haskell.org/packages/archive/gtk2hs-buildtools/$pkgver/gtk2hs-buildtools-$pkgver.tar.gz
+        '0001-fix-for-ghc-7.6.1-changes.patch')
+md5sums=('612611d831635024c953d2817b124e29'
+         'b6551d8085c97bc2c6600ab397833101')
 
 build() {
     cd ${srcdir}/gtk2hs-buildtools-$pkgver
+
+    patch -Np1 -i ${srcdir}/0001-fix-for-ghc-7.6.1-changes.patch
+
     runhaskell Setup configure --prefix=/usr --docdir=/usr/share/doc/${pkgname}
     runhaskell Setup build
 }
diff --git a/community/haddock/0001-fix-incorrect-types-in-documentation-haddock.patch b/community/haddock/0001-fix-incorrect-types-in-documentation-haddock.patch
new file mode 100644
index 000000000..2e687db21
--- /dev/null
+++ b/community/haddock/0001-fix-incorrect-types-in-documentation-haddock.patch
@@ -0,0 +1,33 @@
+From c60f2ab90f6e39fdb515cc0305467e534f718a7d Mon Sep 17 00:00:00 2001
+From: Thomas Dziedzic <gostrc@gmail.com>
+Date: Tue, 11 Sep 2012 07:43:41 -0700
+Subject: [PATCH] fix incorrect types in documentation/haddock
+
+---
+ src/Documentation/Haddock.hs | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/Documentation/Haddock.hs b/src/Documentation/Haddock.hs
+index 60bb314..8fd9674 100644
+--- a/src/Documentation/Haddock.hs
++++ b/src/Documentation/Haddock.hs
+@@ -59,6 +59,7 @@ import Haddock.Types
+ import Haddock.Options
+ import Haddock.Utils
+ import Main
++import GHC (Ghc)
+ 
+ 
+ -- | Create 'Interface' structures from a given list of Haddock command-line
+@@ -68,7 +69,7 @@ import Main
+ createInterfaces
+   :: [Flag]         -- ^ A list of command-line flags
+   -> [String]       -- ^ File or module names
+-  -> IO [Interface] -- ^ Resulting list of interfaces
++  -> Ghc [Interface] -- ^ Resulting list of interfaces
+ createInterfaces flags modules = do
+   (_, ifaces, _) <- readPackagesAndProcessModules flags modules
+   return ifaces
+-- 
+1.7.12
+
diff --git a/community/haddock/PKGBUILD b/community/haddock/PKGBUILD
index 10cf419f9..c57706999 100644
--- a/community/haddock/PKGBUILD
+++ b/community/haddock/PKGBUILD
@@ -1,31 +1,30 @@
-# Maintainer: 
-# Contributor: Alexander Rødseth <rodseth@gmail.com>
+# Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Vesa Kaihlavirta <vesa@archlinux.org>
 # Contributor: Arch Haskell Team <arch-haskell@haskell.org>
 
 pkgname=haddock
-pkgver=2.10.0
-pkgrel=2
+pkgver=2.12.0
+pkgrel=1
 pkgdesc="Tool for generating documentation for Haskell libraries"
 url="http://hackage.haskell.org/package/haddock"
 license=('custom:BSD3')
 arch=('i686' 'x86_64' 'mips64el')
-makedepends=('alex' 'happy')
-depends=('ghc=7.4.2-1' 'haskell-xhtml=3000.2.1-1' 'haskell-ghc-paths=0.1.0.8-8')
+makedepends=('alex=3.0.2-2' 'happy=1.18.9-6')
+depends=('ghc=7.6.1-1' 'haskell-xhtml=3000.2.1-2' 'haskell-ghc-paths=0.1.0.8-9')
 install=$pkgname.install
-source=("http://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz")
-sha256sums=('d107dba15e8aee5abcb540b818b5dcb8ced98bae7d0714f50192dba26cadb410')
+source=("http://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz"
+        '0001-fix-incorrect-types-in-documentation-haddock.patch')
+sha256sums=('b6c53c3c2dcfc7604941f81acd8954c7deb101b1341003d2e9c6c26dd4ad6d02'
+            'a260b828ddf6e56440209d9631efcd6e1530b8996859528feee37638cc26e92a')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
-  
-  # These doesn't make haddock work for ghc 7.4.1
-  #sed -i 's:ghc >= 7.2 && < 7.4:ghc:' haddock.cabal
-  #sed -i 's:base >= 4.3 && < 4.5:base:' haddock.cabal
-  #sed -i 's:#elif __GLASGOW_HASKELL__ == 703:#elif __GLASGOW_HASKELL__ == 704:' src/Haddock/InterfaceFile.hs
 
-  runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \
-    --docdir=/usr/share/doc/"$pkgname" --libsubdir=\$compiler/site-local/\$pkgid
+  patch -Np1 -i ${srcdir}/0001-fix-incorrect-types-in-documentation-haddock.patch
+  
+  runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
+    --prefix=/usr --docdir=/usr/share/doc/"$pkgname" \
+    --libsubdir=\$compiler/site-local/\$pkgid
   runhaskell Setup build
   runhaskell Setup haddock
   runhaskell Setup register --gen-script
@@ -37,11 +36,15 @@ package() {
   cd "$srcdir/$pkgname-$pkgver"
   
   install -Dm744 register.sh "$pkgdir/usr/share/haskell/$pkgname/register.sh"
-  install -m744 unregister.sh "$pkgdir/usr/share/haskell/$pkgname/unregister.sh"
+  install -m744 unregister.sh \
+    "$pkgdir/usr/share/haskell/$pkgname/unregister.sh"
   install -dm755 "$pkgdir/usr/share/doc/ghc/html/libraries"
-  ln -s "/usr/share/doc/$pkgname/html" "$pkgdir/usr/share/doc/ghc/html/libraries/$pkgname"
+  ln -s "/usr/share/doc/$pkgname/html" \
+    "$pkgdir/usr/share/doc/ghc/html/libraries/$pkgname"
   runhaskell Setup copy --destdir="$pkgdir"
   install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
   rm -f "$pkgdir/usr/share/doc/$pkgname/LICENSE"
   mv "$pkgdir/usr/bin/haddock" "$pkgdir/usr/bin/haddock-cabal"
 }
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/happy/PKGBUILD b/community/happy/PKGBUILD
index fb8ecf1f5..99e4581d9 100644
--- a/community/happy/PKGBUILD
+++ b/community/happy/PKGBUILD
@@ -1,23 +1,27 @@
-# $Id: PKGBUILD 72383 2012-06-13 13:45:51Z tdziedzic $
+# $Id: PKGBUILD 77339 2012-10-09 04:16:54Z tdziedzic $
 # Maintainer: Thomas Dziedzic <gostrc@gmail.com>
 # Contributor: simo <simo@archlinux.org>
 # Contributor: Vesa Kaihlavirta <vegai@iki.fi>
  
 pkgname=happy
-pkgver=1.18.9
-pkgrel=5
+pkgver=1.18.10
+pkgrel=1
 pkgdesc="The Parser Generator for Haskell"
-url="http://www.haskell.org/happy/"
+url="http://hackage.haskell.org/package/happy"
 arch=('i686' 'x86_64')
 license=("custom:BSD3")
 depends=('gmp')
-makedepends=('ghc=7.4.2-1' 'haskell-mtl=2.1.1-1')
+makedepends=('ghc=7.6.1-1' 'haskell-mtl=2.1.2-1')
 source=(http://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz)
-md5sums=('aeb565fe572f979f15a24db0df2de37d')
+md5sums=('a1638e89434427e57f68ef311761dc30')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
+  # try was deprecated and removed into control.exception
+  # we really want tryIOError
+  #sed 's/try/&IOError/' -i Setup.lhs
+
   runhaskell Setup.lhs configure -O --prefix=/usr
   runhaskell Setup.lhs build
 }
diff --git a/community/haskell-bytestring-show/PKGBUILD b/community/haskell-bytestring-show/PKGBUILD
index 081f77510..3f0ee6008 100644
--- a/community/haskell-bytestring-show/PKGBUILD
+++ b/community/haskell-bytestring-show/PKGBUILD
@@ -1,22 +1,24 @@
-# $Id: PKGBUILD 75911 2012-09-05 10:26:10Z spupykin $
+# $Id: PKGBUILD 77340 2012-10-09 04:16:59Z tdziedzic $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=haskell-bytestring-show
-pkgver=0.3.5.2
+pkgver=0.3.5.3
 pkgrel=1
 pkgdesc="Efficient conversion of values into readable byte strings."
-#url="http://code.haskell.org/~dolio/"
-url="http://hackage.haskell.org/cgi-bin/hackage-scripts/package/bytestring-show"
+url="http://hackage.haskell.org/package/bytestring-show"
 license=("BSD3")
 arch=('i686' 'x86_64')
-depends=("ghc=7.4.2-1")
+depends=("ghc=7.6.1-1")
 install="${pkgname}.install"
 source=("http://hackage.haskell.org/packages/archive/bytestring-show/${pkgver}/bytestring-show-${pkgver}.tar.gz")
-md5sums=('bd7cc8c9da04814d5c81041f8f087a8c')
+md5sums=('cbcc94f57fc754685f428aba003ba058')
 
 build() {
   cd ${srcdir}/bytestring-show-${pkgver}
 
+  # update outdated dependency
+  sed 's/build-depends: integer-gmp >= 0.2 && < 0.5/build-depends: integer-gmp >= 0.2 \&\& < 0.6/' -i bytestring-show.cabal
+
   runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
 	--prefix=/usr --docdir=/usr/share/doc/${pkgname} \
 	--libsubdir=\$compiler/site-local/\$pkgid
diff --git a/community/haskell-cairo/PKGBUILD b/community/haskell-cairo/PKGBUILD
index a292c37c8..f5053689a 100644
--- a/community/haskell-cairo/PKGBUILD
+++ b/community/haskell-cairo/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 72385 2012-06-13 13:46:01Z tdziedzic $
+# $Id: PKGBUILD 77341 2012-10-09 04:17:04Z tdziedzic $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=haskell-cairo
 pkgver=0.12.3.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Binding to the cairo library for Gtk2Hs."
 url="http://hackage.haskell.org/package/cairo"
 license=('LGPL2.1')
 arch=('i686' 'x86_64')
-depends=('ghc=7.4.2-1' 'cairo' 'haskell-mtl=2.1.1-1')
+depends=('ghc=7.6.1-1' 'cairo' 'haskell-mtl=2.1.2-1')
 makedepends=("gtk2hs-buildtools")
 options=('strip')
 conflicts=('gtk2hs-cairo')
diff --git a/community/haskell-dataenc/0001-update-build-deps-for-ghc-7.6.1.patch b/community/haskell-dataenc/0001-update-build-deps-for-ghc-7.6.1.patch
new file mode 100644
index 000000000..9f544bb27
--- /dev/null
+++ b/community/haskell-dataenc/0001-update-build-deps-for-ghc-7.6.1.patch
@@ -0,0 +1,25 @@
+From 961892779b5f5a2f46d6baa44c31d06c39e56470 Mon Sep 17 00:00:00 2001
+From: Thomas Dziedzic <gostrc@gmail.com>
+Date: Tue, 11 Sep 2012 05:06:59 -0700
+Subject: [PATCH] update build deps for ghc 7.6.1
+
+---
+ dataenc.cabal | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/dataenc.cabal b/dataenc.cabal
+index 1ad42ca..3a4f5bb 100644
+--- a/dataenc.cabal
++++ b/dataenc.cabal
+@@ -21,7 +21,7 @@ flag BuildTests
+ 
+ library
+     hs-source-dirs: src
+-    build-depends: array >= 0.1.0 && < 0.5, base >= 3.0.0 && < 4.6, containers >= 0.1.0 && < 0.5
++    build-depends: array >= 0.1.0 && < 0.5, base >= 3.0.0 && < 4.7, containers >= 0.1.0 && < 0.6
+     exposed-modules:
+             Codec.Binary.Base16
+             Codec.Binary.Base32
+-- 
+1.7.12
+
diff --git a/community/haskell-dataenc/PKGBUILD b/community/haskell-dataenc/PKGBUILD
index aa3d36b36..34a0373b3 100644
--- a/community/haskell-dataenc/PKGBUILD
+++ b/community/haskell-dataenc/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 72386 2012-06-13 13:46:06Z tdziedzic $
+# $Id: PKGBUILD 77342 2012-10-09 04:17:11Z tdziedzic $
 # Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
 # Contributor: Arch Haskell Team <arch-haskell@haskell.org>
 # Package generated by cabal2arch 0.7.5
@@ -6,18 +6,24 @@
 _hkgname=dataenc
 pkgname=haskell-dataenc
 pkgver=0.14.0.3
-pkgrel=2
+pkgrel=3
 pkgdesc="Data encoding library"
 url="http://hackage.haskell.org/package/dataenc"
 license=('custom:BSD3')
 arch=('i686' 'x86_64' 'mips64el')
-depends=('ghc=7.4.2-1' sh)
-source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
+depends=('ghc=7.6.1-1' sh)
+source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz
+        '0001-update-build-deps-for-ghc-7.6.1.patch')
 install=${pkgname}.install
-md5sums=('643a8c022b9c840f801faf9a661fe637')
+md5sums=('643a8c022b9c840f801faf9a661fe637'
+         '662056adcb79efe8898298c271b49600')
 
 build() {
     cd ${srcdir}/${_hkgname}-${pkgver}
+
+    # update build deps for ghc 7.6.1
+    patch -Np1 -i ${srcdir}/0001-update-build-deps-for-ghc-7.6.1.patch
+
     runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
       --prefix=/usr --docdir=/usr/share/doc/${pkgname} \
       --libsubdir=\$compiler/site-local/\$pkgid
diff --git a/community/haskell-extensible-exceptions/PKGBUILD b/community/haskell-extensible-exceptions/PKGBUILD
new file mode 100644
index 000000000..2f2fbaa3c
--- /dev/null
+++ b/community/haskell-extensible-exceptions/PKGBUILD
@@ -0,0 +1,39 @@
+# $Id: PKGBUILD 77370 2012-10-09 08:29:13Z foutrelis $
+# Maintainer: Jelle van der Waa <jelle@vdwaa.nl>
+
+_hkgname=extensible-exceptions
+pkgname=haskell-${_hkgname}
+pkgver=0.1.1.4
+pkgrel=3
+pkgdesc="extensible exceptions for both new and old versions of GHC"
+url="http://hackage.haskell.org/package/extensible-exceptions"
+license=('custom:BSD3')
+arch=('i686' 'x86_64')
+depends=('ghc=7.6.1-1' sh)
+source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
+install=$pkgname.install
+md5sums=('fa1cadd15c1c7aa362618d41c6e17d8b')
+
+build() {
+    cd ${srcdir}/${_hkgname}-${pkgver}
+
+    runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
+      --prefix=/usr --docdir=/usr/share/doc/${pkgname} \
+      --libsubdir=\$compiler/site-local/\$pkgid
+    runhaskell Setup build
+    runhaskell Setup haddock
+    runhaskell Setup register   --gen-script
+    runhaskell Setup unregister --gen-script
+    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+}
+
+package() {
+    cd ${srcdir}/${_hkgname}-${pkgver}
+    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
+    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
+    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
+    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
+    runhaskell Setup copy --destdir=${pkgdir}
+    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
+}
diff --git a/community/haskell-extensible-exceptions/haskell-extensible-exceptions.install b/community/haskell-extensible-exceptions/haskell-extensible-exceptions.install
new file mode 100644
index 000000000..20c7dce30
--- /dev/null
+++ b/community/haskell-extensible-exceptions/haskell-extensible-exceptions.install
@@ -0,0 +1,19 @@
+HS_DIR=usr/share/haskell/haskell-extensible-exceptions
+post_install() {
+  ${HS_DIR}/register.sh
+  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+}
+pre_upgrade() {
+  ${HS_DIR}/unregister.sh
+}
+post_upgrade() {
+  ${HS_DIR}/register.sh
+  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+}
+pre_remove() {
+  ${HS_DIR}/unregister.sh
+}
+post_remove() {
+  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+}
+
diff --git a/community/haskell-ghc-paths/PKGBUILD b/community/haskell-ghc-paths/PKGBUILD
index b9a2f1e68..8afbfc68f 100644
--- a/community/haskell-ghc-paths/PKGBUILD
+++ b/community/haskell-ghc-paths/PKGBUILD
@@ -4,12 +4,13 @@
 
 pkgname=haskell-ghc-paths
 pkgver=0.1.0.8
-pkgrel=8
+pkgrel=9
 pkgdesc="Knowledge of GHC's installation directories"
 url="http://hackage.haskell.org/package/ghc-paths"
 license=('custom:BSD3')
 arch=('i686' 'x86_64' 'mips64el')
-depends=('ghc=7.4.2-1')
+arch=('x86_64' 'i686')
+depends=('ghc=7.6.1-1')
 source=("http://hackage.haskell.org/packages/archive/ghc-paths/$pkgver/ghc-paths-$pkgver.tar.gz")
 install=haskell-ghc-paths.install
 md5sums=('d2b23dc563888e380588501d2ce1d82b')
diff --git a/community/haskell-glib/0001-compatibility-with-ghc-7.6.1.patch b/community/haskell-glib/0001-compatibility-with-ghc-7.6.1.patch
new file mode 100644
index 000000000..845beb2bd
--- /dev/null
+++ b/community/haskell-glib/0001-compatibility-with-ghc-7.6.1.patch
@@ -0,0 +1,55 @@
+From 7e677b1c633d2b426fc956fcfa084a82ef6df861 Mon Sep 17 00:00:00 2001
+From: Thomas Dziedzic <gostrc@gmail.com>
+Date: Thu, 27 Sep 2012 04:48:10 -0700
+Subject: [PATCH] compatibility with ghc 7.6.1
+
+---
+ System/Glib/GObject.chs  | 4 +---
+ System/Glib/MainLoop.chs | 4 ++--
+ 2 files changed, 3 insertions(+), 5 deletions(-)
+
+diff --git a/System/Glib/GObject.chs b/System/Glib/GObject.chs
+index 5f0fe5c..9925d2c 100644
+--- a/System/Glib/GObject.chs
++++ b/System/Glib/GObject.chs
+@@ -127,8 +127,6 @@ makeNewGObject (constr, objectUnref) generator = do
+ 
+ {#pointer GDestroyNotify as DestroyNotify#}
+ 
+-foreign import ccall "wrapper" mkDestroyNotifyPtr :: IO () -> IO DestroyNotify
+-
+ -- | This function wraps any newly created objects that derives from
+ -- GInitiallyUnowned also known as objects with
+ -- \"floating-references\". The object will be refSink (for glib
+@@ -225,4 +223,4 @@ isA obj gType =
+ -- at this point we would normally implement the notify signal handler;
+ -- I've moved this definition into the Object class of the gtk package
+ -- since there's a quite a bit of machinery missing here (generated signal
+--- register functions and the problem of recursive modules)
+\ No newline at end of file
++-- register functions and the problem of recursive modules)
+diff --git a/System/Glib/MainLoop.chs b/System/Glib/MainLoop.chs
+index 72fecb6..feb4c77 100644
+--- a/System/Glib/MainLoop.chs
++++ b/System/Glib/MainLoop.chs
+@@ -71,7 +71,7 @@ import System.Glib.GObject	(DestroyNotify, destroyFunPtr)
+ 
+ {#pointer SourceFunc#}
+ 
+-foreign import ccall "wrapper" mkSourceFunc :: IO {#type gint#} -> IO SourceFunc
++foreign import ccall "wrapper" mkSourceFunc :: (Ptr () -> IO {#type gint#}) -> IO SourceFunc
+ 
+ type HandlerId = {#type guint#}
+ 
+@@ -79,7 +79,7 @@ type HandlerId = {#type guint#}
+ --
+ makeCallback :: IO {#type gint#} -> IO (SourceFunc, DestroyNotify)
+ makeCallback fun = do
+-  funPtr <- mkSourceFunc fun
++  funPtr <- mkSourceFunc (const fun)
+   return (funPtr, destroyFunPtr)
+ 
+ -- | Sets a function to be called at regular intervals, with the default
+-- 
+1.7.12.1
+
diff --git a/community/haskell-glib/PKGBUILD b/community/haskell-glib/PKGBUILD
index 367c45adb..2ea2ff587 100644
--- a/community/haskell-glib/PKGBUILD
+++ b/community/haskell-glib/PKGBUILD
@@ -1,25 +1,30 @@
-# $Id: PKGBUILD 72388 2012-06-13 13:46:17Z tdziedzic $
+# $Id: PKGBUILD 77344 2012-10-09 04:17:23Z tdziedzic $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=haskell-glib
 pkgver=0.12.3.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Binding to the GLIB library for Gtk2Hs."
 url="http://hackage.haskell.org/package/glib"
 license=('LGPL2.1')
 arch=('i686' 'x86_64')
-depends=('ghc=7.4.2-1' 'glib2')
+depends=('ghc=7.6.1-1' 'glib2')
 makedepends=("gtk2hs-buildtools")
 options=('strip')
 install=gtk2hs-glib.install
 provides=('gtk2hs-glib')
 replaces=('gtk2hs-glib')
 conflicts=('gtk2hs-glib')
-source=(http://hackage.haskell.org/packages/archive/glib/$pkgver/glib-$pkgver.tar.gz)
-md5sums=('f2899bd2a2850fe95479ddb63490eb04')
+source=(http://hackage.haskell.org/packages/archive/glib/$pkgver/glib-$pkgver.tar.gz
+        '0001-compatibility-with-ghc-7.6.1.patch')
+md5sums=('f2899bd2a2850fe95479ddb63490eb04'
+         'b00660b7102542942b0b9d84b59d1f3c')
 
 build() {
-    cd ${srcdir}/glib-$pkgver
+    cd glib-$pkgver
+
+    patch -Np1 -i ${srcdir}/0001-compatibility-with-ghc-7.6.1.patch
+
     runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
       --prefix=/usr --docdir=/usr/share/doc/haskell-glib \
       --libsubdir=\$compiler/site-local/\$pkgid
diff --git a/community/haskell-gtk/PKGBUILD b/community/haskell-gtk/PKGBUILD
index 064702b29..89e49dc07 100644
--- a/community/haskell-gtk/PKGBUILD
+++ b/community/haskell-gtk/PKGBUILD
@@ -1,40 +1,48 @@
-# $Id: PKGBUILD 73280 2012-07-05 11:48:30Z spupykin $
+# $Id: PKGBUILD 77345 2012-10-09 04:17:32Z tdziedzic $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=haskell-gtk
 pkgver=0.12.3.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Binding to the gtk library for Gtk2Hs."
 url="http://hackage.haskell.org/package/gtk"
 license=('LGPL2.1')
 arch=('i686' 'x86_64')
-depends=('ghc' 'gtk2' "haskell-pango=0.12.3-2" 'haskell-mtl=2.1.1-1')
+depends=('ghc' 'gtk2' "haskell-pango" 'haskell-mtl')
 makedepends=("gtk2hs-buildtools")
 provides=('gtk2hs-gtk')
 replaces=('gtk2hs-gtk')
 conflicts=('gtk2hs-gtk')
 options=('strip')
 install=gtk2hs-gtk.install
-source=(http://hackage.haskell.org/packages/archive/gtk/$pkgver/gtk-$pkgver.tar.gz)
-md5sums=('b10dfe92d2e4dfe3c0c92dd349489727')
+source=(http://hackage.haskell.org/packages/archive/gtk/$pkgver/gtk-$pkgver.tar.gz
+	ghc-7.6.1.patch)
+md5sums=('b10dfe92d2e4dfe3c0c92dd349489727'
+         '5fb93f37fe3f494b30ee682a36b8f1b6')
 
 build() {
-    cd ${srcdir}/gtk-${pkgver}
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
-      --prefix=/usr --docdir=/usr/share/doc/haskell-gtk \
-      --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+  cd ${srcdir}/gtk-${pkgver}
+  patch -p1 <$srcdir/ghc-7.6.1.patch
+  runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
+    --prefix=/usr --docdir=/usr/share/doc/haskell-gtk \
+    --libsubdir=\$compiler/site-local/\$pkgid
+  sed -i 's|import Foreign.C.Types.*(CULong, CUInt)|import Foreign.C.Types (CULong(..), CUInt(..))|' Graphics/UI/Gtk/Types.chs
+  runhaskell Setup build
+  runhaskell Setup haddock
+  runhaskell Setup register   --gen-script
+  runhaskell Setup unregister --gen-script
+  sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
 }
 
 package() {
-    cd ${srcdir}/gtk-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/gtk2hs-gtk/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/gtk2hs-gtk/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/haskell-gtk/html ${pkgdir}/usr/share/doc/ghc/html/libraries/gtk2hs-gtk
-    runhaskell Setup copy --destdir=${pkgdir}
+  _hmtlver=`pacman -Q haskell-mtl | cut -f2 -d\  | cut -f1 -d-`
+  _hpangover=`pacman -Q haskell-pango | cut -f2 -d\  | cut -f1 -d-`
+  depends=("ghc" "gtk2" "haskell-pango=${_hpangover}" "haskell-mtl=${_hmtlver}")
+
+  cd ${srcdir}/gtk-${pkgver}
+  install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/gtk2hs-gtk/register.sh
+  install -m744 unregister.sh ${pkgdir}/usr/share/haskell/gtk2hs-gtk/unregister.sh
+  install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
+  ln -s /usr/share/doc/haskell-gtk/html ${pkgdir}/usr/share/doc/ghc/html/libraries/gtk2hs-gtk
+  runhaskell Setup copy --destdir=${pkgdir}
 }
diff --git a/community/haskell-gtk/ghc-7.6.1.patch b/community/haskell-gtk/ghc-7.6.1.patch
new file mode 100644
index 000000000..5e259a38f
--- /dev/null
+++ b/community/haskell-gtk/ghc-7.6.1.patch
@@ -0,0 +1,574 @@
+diff -wbBur /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/Abstract/Object.chs gtk/Graphics/UI/Gtk/Abstract/Object.chs
+--- /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/Abstract/Object.chs	2012-06-18 01:39:34.000000000 +0400
++++ gtk/Graphics/UI/Gtk/Abstract/Object.chs	2012-10-02 16:30:54.000000000 +0400
+@@ -126,7 +126,8 @@
+ 
+ {#pointer GWeakNotify#}
+ 
+-foreign import ccall "wrapper" mkDestructor :: IO () -> IO GWeakNotify
++foreign import ccall "wrapper" mkDestructor
++  :: (Ptr () -> Ptr GObject -> IO ()) -> IO GWeakNotify
+ 
+ -- | Attach a callback that will be called after the
+ -- destroy hooks have been called
+@@ -134,7 +135,7 @@
+ objectWeakref :: ObjectClass o => o -> IO () -> IO GWeakNotify
+ objectWeakref obj uFun = do
+   funPtrContainer <- newIORef nullFunPtr
+-  uFunPtr <- mkDestructor $ do
++  uFunPtr <- mkDestructor $ \_ _ -> do
+     uFun
+     funPtr <- readIORef funPtrContainer
+     freeHaskellFunPtr funPtr
+diff -wbBur /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/Entry/Entry.chs gtk/Graphics/UI/Gtk/Entry/Entry.chs
+--- /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/Entry/Entry.chs	2012-06-18 01:39:34.000000000 +0400
++++ gtk/Graphics/UI/Gtk/Entry/Entry.chs	2012-10-02 16:27:26.000000000 +0400
+@@ -78,6 +78,10 @@
+   entrySetCompletion,
+   entryGetCompletion,
+ #endif
++#if GTK_CHECK_VERSION (2,18,0)
++  entryGetBuffer,
++  entrySetBuffer,
++#endif
+ #if GTK_CHECK_VERSION(2,20,0)
+   entryGetIconWindow,
+   entryGetTextWindow,
+@@ -104,6 +108,9 @@
+   entryAlignment,
+   entryCompletion,
+ #endif
++#if GTK_CHECK_VERSION (2,18,0)
++  entryBuffer,
++#endif
+ 
+ -- * Signals
+   entryActivate,
+@@ -157,6 +164,9 @@
+ import Graphics.UI.Gtk.Gdk.EventM	(EventM, EButton, EKey)
+ import Control.Monad.Reader             ( ask )
+ import Control.Monad.Trans              ( liftIO )
++#if GTK_CHECK_VERSION (2,18,0)
++import Graphics.UI.Gtk.Entry.EntryBuffer
++#endif
+ {#import Graphics.UI.Gtk.Types#}
+ {#import Graphics.UI.Gtk.Signals#}
+ 
+@@ -429,6 +439,23 @@
+     (toEntry self)
+ #endif
+ 
++#if GTK_CHECK_VERSION(2,18,0)
++-- | Get the 'EntryBuffer' object which holds the text for this widget.
++entryGetBuffer :: EntryClass self => self
++  -> IO EntryBuffer
++entryGetBuffer self =
++  makeNewGObject mkEntryBuffer $
++  {# call gtk_entry_get_buffer #}
++    (toEntry self)
++
++-- | Set the 'EntryBuffer' object which holds the text for this widget.
++entrySetBuffer :: (EntryClass self, EntryBufferClass buffer) => self
++  -> buffer -> IO ()
++entrySetBuffer self =
++  {# call gtk_entry_set_buffer #}
++    (toEntry self) . toEntryBuffer
++#endif
++
+ #if GTK_CHECK_VERSION(2,20,0)
+ -- | Returns the 'Window' which contains the entry's icon at @iconPos@. This function is useful when
+ -- drawing something to the entry in an 'eventExpose' callback because it enables the callback to
+@@ -623,6 +650,15 @@
+   entrySetCompletion
+ #endif
+ 
++#if GTK_CHECK_VERSION(2,18,0)
++entryBuffer :: (EntryClass self, EntryBufferClass buffer) =>
++  ReadWriteAttr self EntryBuffer buffer
++entryBuffer = newAttr
++  entryGetBuffer
++  entrySetBuffer
++#endif
++
++
+ --------------------
+ -- Signals
+ 
+diff -wbBur /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/Gdk/EventM.hsc gtk/Graphics/UI/Gtk/Gdk/EventM.hsc
+--- /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/Gdk/EventM.hsc	2012-06-18 01:39:34.000000000 +0400
++++ gtk/Graphics/UI/Gtk/Gdk/EventM.hsc	2012-10-02 16:27:27.000000000 +0400
+@@ -639,14 +639,16 @@
+ 
+ 
+ -- | Execute an event handler and assume it handled the event unless it
+---   threw a pattern match exception.
++--   threw a pattern match exception or calls mzero (e.g. via guard).
+ tryEvent :: EventM any () -> EventM any Bool
+ tryEvent act = do
+   ptr <- ask
+   liftIO $ (runReaderT (act >> return True) ptr)
+ #if __GLASGOW_HASKELL__ >= 610
+     `catches` [ Handler (\ (PatternMatchFail _) -> return False)
+-              , Handler (\ e -> if isUserError e && "Pattern" `isPrefixOf` ioeGetErrorString e
++              , Handler (\ e -> if isUserError e &&
++                                   ("Pattern" `isPrefixOf` ioeGetErrorString e ||
++                                    "mzero" == ioeGetErrorString e)
+                                 then return False
+                                 else throw e) ]
+ #else
+@@ -654,6 +656,8 @@
+                IOException e
+                  | "user error (Pattern" `isPrefixOf` show e ->
+                    return False
++                 | "user error (mzero" `isPrefixOf` show e ->
++                   return False
+                PatternMatchFail _ -> return False
+                _ -> throw e)
+ #endif
+diff -wbBur /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/Gdk/Pixbuf.chs gtk/Graphics/UI/Gtk/Gdk/Pixbuf.chs
+--- /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/Gdk/Pixbuf.chs	2012-06-18 01:39:34.000000000 +0400
++++ gtk/Graphics/UI/Gtk/Gdk/Pixbuf.chs	2012-10-02 16:27:28.000000000 +0400
+@@ -69,6 +69,7 @@
+ 
+ -- * Constructors
+   pixbufNew,
++  pixbufNewFromData,
+   pixbufNewFromFile,
+ #if GTK_CHECK_VERSION(2,4,0)
+   pixbufNewFromFileAtSize,
+@@ -402,6 +403,19 @@
+       (fromBool hasAlpha) (fromIntegral bitsPerSample) (fromIntegral width)
+       (fromIntegral height)
+ 
++pixbufNewFromData :: Ptr CUChar -> Colorspace -> Bool -> Int -> Int -> Int -> Int -> IO Pixbuf
++pixbufNewFromData imData cSpace hasAlpha bitsPerSample width height rowStride
++  = wrapNewGObject mkPixbuf $
++     {#call pixbuf_new_from_data #}
++       imData
++       (fromIntegral . fromEnum $ cSpace)
++       (fromBool hasAlpha)
++       (fromIntegral bitsPerSample)
++       (fromIntegral width)
++       (fromIntegral height)
++       (fromIntegral rowStride)
++       nullFunPtr nullPtr
++
+ -- | Create a new image from a String.
+ --
+ -- * Creates a new pixbuf from a string description.
+diff -wbBur /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/General/Clipboard.chs gtk/Graphics/UI/Gtk/General/Clipboard.chs
+--- /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/General/Clipboard.chs	2012-06-18 01:39:34.000000000 +0400
++++ gtk/Graphics/UI/Gtk/General/Clipboard.chs	2012-10-02 16:30:54.000000000 +0400
+@@ -260,7 +260,7 @@
+                               -- data succeeded.
+ clipboardSetWithData self targets getFunc clearFunc = do
+   gFunPtr <- mkClipboardGetFunc
+-    (\_ sPtr info -> runReaderT (getFunc info) sPtr >> return ())
++    (\_ sPtr info _ -> runReaderT (getFunc info) sPtr >> return ())
+   cFunPtr <- mkClipboardClearFunc
+     (\_ _ -> clearFunc)
+   res <- withTargetEntries targets $ \nTargets targets ->
+@@ -282,7 +282,7 @@
+ {#pointer ClipboardClearFunc#}
+ 
+ foreign import ccall "wrapper" mkClipboardGetFunc ::
+-  (Ptr Clipboard -> Ptr () -> {#type guint#} -> IO ()) -> IO ClipboardGetFunc
++  (Ptr Clipboard -> Ptr () -> {#type guint#} -> Ptr () -> IO ()) -> IO ClipboardGetFunc
+ 
+ foreign import ccall "wrapper" mkClipboardClearFunc ::
+   (Ptr Clipboard -> Ptr () -> IO ()) -> IO ClipboardClearFunc
+@@ -313,7 +313,7 @@
+                               -- ignored.
+ clipboardSetWithOwner self targets getFunc clearFunc owner = do
+   gFunPtr <- mkClipboardGetFunc
+-    (\_ sPtr info -> runReaderT (getFunc info) sPtr >> return ())
++    (\_ sPtr info _ -> runReaderT (getFunc info) sPtr >> return ())
+   cFunPtr <- mkClipboardClearFunc
+     (\_ _ -> clearFunc)
+   res <- withTargetEntries targets $ \nTargets targets ->
+@@ -404,7 +404,7 @@
+ clipboardRequestContents self (Atom target) callback = do
+   cbRef <- newIORef nullFunPtr
+   cbPtr <- mkClipboardReceivedFunc
+-    (\_ sPtr -> do
++    (\_ sPtr _ -> do
+       freeHaskellFunPtr =<< readIORef cbRef
+       runReaderT callback sPtr
+       return ())
+@@ -418,7 +418,7 @@
+ {#pointer ClipboardReceivedFunc#}
+ 
+ foreign import ccall "wrapper" mkClipboardReceivedFunc ::
+-  (Ptr Clipboard -> Ptr () -> IO ()) -> IO ClipboardReceivedFunc
++  (Ptr Clipboard -> Ptr () -> Ptr () -> IO ()) -> IO ClipboardReceivedFunc
+ 
+ -- %hash c:7bb1 d:4ef1
+ -- | Requests the contents of the clipboard as text. When the text is later
+@@ -439,7 +439,7 @@
+ clipboardRequestText self callback = do
+   cbRef <- newIORef nullFunPtr
+   cbPtr <- mkClipboardTextReceivedFunc
+-    (\_ sPtr -> do
++    (\_ sPtr _ -> do
+       freeHaskellFunPtr =<< readIORef cbRef
+       mStr <- if sPtr==nullPtr then return Nothing else
+         liftM Just $ peekUTFString sPtr
+@@ -453,7 +453,7 @@
+ {#pointer ClipboardTextReceivedFunc#}
+ 
+ foreign import ccall "wrapper" mkClipboardTextReceivedFunc ::
+-  (Ptr Clipboard -> CString -> IO ()) -> IO ClipboardTextReceivedFunc
++  (Ptr Clipboard -> CString -> Ptr () -> IO ()) -> IO ClipboardTextReceivedFunc
+ 
+ 
+ #if GTK_CHECK_VERSION(2,6,0)
+@@ -477,7 +477,7 @@
+ clipboardRequestImage self callback = do
+   cbRef <- newIORef nullFunPtr
+   cbPtr <- mkClipboardImageReceivedFunc
+-    (\_ sPtr -> do
++    (\_ sPtr _ -> do
+       freeHaskellFunPtr =<< readIORef cbRef
+       mPixbuf <- maybeNull (makeNewGObject mkPixbuf) (return sPtr)
+       callback mPixbuf)
+@@ -490,7 +490,7 @@
+ {#pointer ClipboardImageReceivedFunc#}
+ 
+ foreign import ccall "wrapper" mkClipboardImageReceivedFunc ::
+-  (Ptr Clipboard -> Ptr Pixbuf -> IO ()) -> IO ClipboardImageReceivedFunc
++  (Ptr Clipboard -> Ptr Pixbuf -> Ptr () -> IO ()) -> IO ClipboardImageReceivedFunc
+ 
+ #endif
+ 
+@@ -513,7 +513,7 @@
+ clipboardRequestTargets self callback = do
+   cbRef <- newIORef nullFunPtr
+   cbPtr <- mkClipboardTargetsReceivedFunc
+-    (\_ tPtr len -> do
++    (\_ tPtr len _ -> do
+       -- We must free Haskell pointer *in* the callback to avoid segfault.
+       freeHaskellFunPtr =<< readIORef cbRef
+       mTargets <- if tPtr==nullPtr then return Nothing else
+@@ -528,7 +528,7 @@
+ {#pointer ClipboardTargetsReceivedFunc#}
+ 
+ foreign import ccall "wrapper" mkClipboardTargetsReceivedFunc ::
+-  (Ptr Clipboard -> Ptr (Ptr ()) -> {#type gint#} -> IO ()) -> IO ClipboardTargetsReceivedFunc
++  (Ptr Clipboard -> Ptr (Ptr ()) -> {#type gint#} -> Ptr () -> IO ()) -> IO ClipboardTargetsReceivedFunc
+ 
+ #if GTK_CHECK_VERSION(2,10,0)
+ -- %hash c:5601 d:d6a6
+@@ -552,10 +552,10 @@
+ clipboardRequestRichText self buffer callback = do
+   cbRef <- newIORef nullFunPtr
+   cbPtr <- mkClipboardRichTextReceivedFunc
+-    (\_ tPtr sPtr len -> do
++    (\_ tPtr sPtr len _ -> do
+       freeHaskellFunPtr =<< readIORef cbRef
+       mRes <- if sPtr==nullPtr then return Nothing else liftM Just $ do
+-        str <- peekUTFStringLen (sPtr,fromIntegral len)
++        str <- peekUTFStringLen (castPtr sPtr,fromIntegral len)
+         return (Atom tPtr, str)
+       callback mRes)
+   writeIORef cbRef cbPtr
+@@ -568,7 +568,7 @@
+ {#pointer ClipboardRichTextReceivedFunc#}
+ 
+ foreign import ccall "wrapper" mkClipboardRichTextReceivedFunc ::
+-  (Ptr Clipboard -> Ptr () -> CString -> {#type gsize#} -> IO ()) ->
++  (Ptr Clipboard -> Ptr () -> Ptr CUChar -> {#type gsize#} -> Ptr () -> IO ()) ->
+   IO ClipboardRichTextReceivedFunc
+ #endif
+ #endif
+diff -wbBur /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/General/General.chs gtk/Graphics/UI/Gtk/General/General.chs
+--- /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/General/General.chs	2012-06-18 01:39:34.000000000 +0400
++++ gtk/Graphics/UI/Gtk/General/General.chs	2012-10-02 16:27:28.000000000 +0400
+@@ -202,7 +202,7 @@
+ --   their arguments from the main loop, that is, from the OS thread of Gtk,
+ --   thereby ensuring that any Gtk and OS function can be called.
+ --
+-{#fun unsafe gdk_threads_enter as threadsEnter {} -> `()' #}
++{#fun gdk_threads_enter as threadsEnter {} -> `()' #}
+ 
+ -- | Release the global Gtk lock.
+ --
+diff -wbBur /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/MenuComboToolbar/ComboBox.chs gtk/Graphics/UI/Gtk/MenuComboToolbar/ComboBox.chs
+--- /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/MenuComboToolbar/ComboBox.chs	2012-06-18 01:39:34.000000000 +0400
++++ gtk/Graphics/UI/Gtk/MenuComboToolbar/ComboBox.chs	2012-10-02 16:30:54.000000000 +0400
+@@ -493,17 +493,17 @@
+   {# call gtk_combo_box_set_row_separator_func #}
+     (toComboBox self) nullFunPtr nullPtr nullFunPtr
+ comboBoxSetRowSeparatorSource self (Just (model, extract)) = do
+-  funPtr <- mkRowSeparatorFunc $ \_ iterPtr -> do
++  funPtr <- mkRowSeparatorFunc $ \_ iterPtr _ -> do
+         iter <- peek iterPtr
+         value <- customStoreGetRow model iter
+-        return (extract value)
++        return (fromBool $ extract value)
+   {# call gtk_combo_box_set_row_separator_func #}
+     (toComboBox self) funPtr (castFunPtrToPtr funPtr) destroyFunPtr
+ 
+ {#pointer TreeViewRowSeparatorFunc#}
+ 
+ foreign import ccall "wrapper" mkRowSeparatorFunc ::
+-  (Ptr TreeModel -> Ptr TreeIter -> IO Bool) -> IO TreeViewRowSeparatorFunc
++  (Ptr TreeModel -> Ptr TreeIter -> Ptr () -> IO {#type gboolean #}) -> IO TreeViewRowSeparatorFunc
+ 
+ -- %hash c:5bf8
+ -- | Sets whether the popup menu should have a tearoff menu item.
+diff -wbBur /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/MenuComboToolbar/MenuItem.chs gtk/Graphics/UI/Gtk/MenuComboToolbar/MenuItem.chs
+--- /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/MenuComboToolbar/MenuItem.chs	2012-06-18 01:39:34.000000000 +0400
++++ gtk/Graphics/UI/Gtk/MenuComboToolbar/MenuItem.chs	2012-10-02 16:27:30.000000000 +0400
+@@ -76,6 +76,12 @@
+   menuItemNewWithMnemonic,
+ 
+ -- * Methods
++#if GTK_CHECK_VERSION(2,16,0)
++  menuItemSetLabel,
++  menuItemGetLabel,
++  menuItemSetUseUnderline,
++  menuItemGetUseUnderline,
++#endif
+   menuItemSetSubmenu,
+   menuItemGetSubmenu,
+   menuItemRemoveSubmenu,
+@@ -89,6 +95,10 @@
+ -- * Attributes
+   menuItemSubmenu,
+   menuItemRightJustified,
++#if GTK_CHECK_VERSION(2,16,0)
++  menuItemLabel,
++  menuItemUseUnderline,
++#endif
+ 
+ -- * Signals
+   menuItemActivateItem,
+@@ -163,7 +173,36 @@
+ 
+ --------------------
+ -- Methods
++#if GTK_CHECK_VERSION(2,16,0)
++-- | Sets text on the MenuItem label
++
++menuItemSetLabel :: (MenuItemClass self) => self -> String -> IO ()
++menuItemSetLabel self label =
++  withUTFString label $ {# call gtk_menu_item_set_label #} (toMenuItem self)
++
++-- | Gets text on the MenuItem label
++menuItemGetLabel :: (MenuItemClass self) => self -> IO String
++menuItemGetLabel self =
++  {# call gtk_menu_item_get_label #}
++    (toMenuItem self)
++  >>= \strPtr -> if strPtr == nullPtr
++                   then return ""
++                   else peekUTFString strPtr
++
++-- | If True, an underline in the text indicates the next character should be used for the mnemonic accelerator key.
++--
++menuItemSetUseUnderline :: (MenuItemClass self) => self -> Bool -> IO ()
++menuItemSetUseUnderline self =
++  {# call gtk_menu_item_set_use_underline #} (toMenuItem self) . fromBool
+ 
++-- | Checks if an underline in the text indicates the next character should be used for the mnemonic accelerator key.
++--
++menuItemGetUseUnderline :: (MenuItemClass self) => self -> IO Bool
++menuItemGetUseUnderline self =
++  liftM toBool $ {# call gtk_menu_item_get_use_underline #}
++    (toMenuItem self)
++
++#endif
+ -- | Sets the item's submenu, or changes it.
+ --
+ menuItemSetSubmenu :: (MenuItemClass self, MenuClass submenu) => self -> submenu -> IO ()
+@@ -278,6 +317,22 @@
+   menuItemGetRightJustified
+   menuItemSetRightJustified
+ 
++#if GTK_CHECK_VERSION(2,16,0)
++-- | \'label\' property. See 'menuItemSetLabel' and 'menuItemGetLabel'
++--
++menuItemLabel :: MenuItemClass self => Attr self String
++menuItemLabel = newAttr
++  menuItemGetLabel
++  menuItemSetLabel
++
++-- | \'useUnderline\' property. See 'menuItemSetUseUnderline' and 
++-- 'menuItemGetUseEUnderline'
++--
++menuItemUseUnderline :: MenuItemClass self => Attr self Bool
++menuItemUseUnderline = newAttr
++  menuItemGetUseUnderline
++  menuItemSetUseUnderline
++#endif
+ --------------------
+ -- Signals
+ 
+diff -wbBur /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/ModelView/CustomStore.chs gtk/Graphics/UI/Gtk/ModelView/CustomStore.chs
+--- /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/ModelView/CustomStore.chs	2012-06-18 01:39:34.000000000 +0400
++++ gtk/Graphics/UI/Gtk/ModelView/CustomStore.chs	2012-10-02 16:27:33.000000000 +0400
+@@ -239,7 +239,7 @@
+         customTreeDragSourceIface = fromMaybe dummyDragSource mDragSource,
+         customTreeDragDestIface = fromMaybe dummyDragDest mDragDest }
+   privPtr <- newStablePtr priv
+-  liftM con $ makeNewGObject (CustomStore, objectUnref) $
++  liftM con $ wrapNewGObject (CustomStore, objectUnref) $
+     gtk2hs_store_new implPtr privPtr
+ 
+ foreign import ccall unsafe "Gtk2HsStore.h gtk2hs_store_new"
+diff -wbBur /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/ModelView/TreeModel.chs gtk/Graphics/UI/Gtk/ModelView/TreeModel.chs
+--- /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/ModelView/TreeModel.chs	2012-06-18 01:39:34.000000000 +0400
++++ gtk/Graphics/UI/Gtk/ModelView/TreeModel.chs	2012-10-02 16:30:54.000000000 +0400
+@@ -427,7 +427,7 @@
+ {#pointer TreeModelForeachFunc#}
+ 
+ foreign import ccall "wrapper"  mkTreeModelForeachFunc ::
+-  (Ptr () -> Ptr () -> Ptr TreeIter -> Ptr () -> IO CInt) ->
++  (Ptr TreeModel -> Ptr NativeTreePath -> Ptr TreeIter -> Ptr () -> IO CInt) ->
+   IO TreeModelForeachFunc
+ 
+ #if GTK_CHECK_VERSION(2,2,0)
+diff -wbBur /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/ModelView/TreeModelFilter.chs gtk/Graphics/UI/Gtk/ModelView/TreeModelFilter.chs
+--- /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/ModelView/TreeModelFilter.chs	2012-06-18 01:39:34.000000000 +0400
++++ gtk/Graphics/UI/Gtk/ModelView/TreeModelFilter.chs	2012-10-02 16:30:54.000000000 +0400
+@@ -160,7 +160,7 @@
+ {#pointer TreeModelFilterVisibleFunc #}
+ 
+ foreign import ccall "wrapper" mkTreeModelFilterVisibleFunc ::
+-  (Ptr TreeModelFilter -> Ptr TreeIter -> Ptr () -> IO {#type gboolean#}) ->
++  (Ptr TreeModel -> Ptr TreeIter -> Ptr () -> IO {#type gboolean#}) ->
+   IO TreeModelFilterVisibleFunc
+ 
+ -- %hash c:a56d d:b42e
+diff -wbBur /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/ModelView/TreeSelection.chs gtk/Graphics/UI/Gtk/ModelView/TreeSelection.chs
+--- /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/ModelView/TreeSelection.chs	2012-06-18 01:39:34.000000000 +0400
++++ gtk/Graphics/UI/Gtk/ModelView/TreeSelection.chs	2012-10-02 16:30:54.000000000 +0400
+@@ -151,7 +151,7 @@
+ treeSelectionSetSelectFunction :: TreeSelectionClass self => self
+  -> TreeSelectionCB -> IO ()
+ treeSelectionSetSelectFunction ts fun = do
+-  fPtr <- mkTreeSelectionFunc (\_ _ tp _ -> do
++  fPtr <- mkTreeSelectionFunc (\_ _ tp _ _ -> do
+     path <- peekTreePath (castPtr tp)
+     liftM fromBool $ fun path
+     )
+@@ -168,7 +168,7 @@
+ {#pointer TreeSelectionFunc#}
+ 
+ foreign import ccall "wrapper"  mkTreeSelectionFunc ::
+-  (Ptr () -> Ptr () -> Ptr TreePath -> Ptr () -> IO CInt)->
++  (Ptr TreeSelection -> Ptr TreeModel -> Ptr NativeTreePath -> {#type gint#} -> Ptr () -> IO CInt)->
+   IO TreeSelectionFunc
+ 
+ -- | Retrieve the 'TreeView' widget that this 'TreeSelection' works on.
+@@ -199,7 +199,7 @@
+  -> TreeSelectionForeachCB
+  -> IO ()
+ treeSelectionSelectedForeach self fun = do
+-  fPtr <- mkTreeSelectionForeachFunc (\_ _ iterPtr -> do
++  fPtr <- mkTreeSelectionForeachFunc (\_ _ iterPtr _ -> do
+     -- make a deep copy of the iterator. This makes it possible to store this
+     -- iterator in Haskell land somewhere. The TreeModel parameter is not
+     -- passed to the function due to performance reasons. But since it is
+@@ -219,7 +219,7 @@
+ {#pointer TreeSelectionForeachFunc#}
+ 
+ foreign import ccall "wrapper"  mkTreeSelectionForeachFunc ::
+-  (Ptr () -> Ptr () -> Ptr TreeIter -> IO ()) -> IO TreeSelectionForeachFunc
++  (Ptr TreeModel -> Ptr NativeTreePath -> Ptr TreeIter -> Ptr () -> IO ()) -> IO TreeSelectionForeachFunc
+ 
+ #if GTK_CHECK_VERSION(2,2,0)
+ -- | Creates a list of paths of all selected rows.
+diff -wbBur /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/ModelView/TreeView.chs gtk/Graphics/UI/Gtk/ModelView/TreeView.chs
+--- /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/ModelView/TreeView.chs	2012-06-18 01:39:34.000000000 +0400
++++ gtk/Graphics/UI/Gtk/ModelView/TreeView.chs	2012-10-02 16:30:54.000000000 +0400
+@@ -582,7 +582,7 @@
+ {#pointer TreeViewColumnDropFunc#}
+ 
+ foreign import ccall "wrapper" mkTreeViewColumnDropFunc ::
+-  (Ptr () -> Ptr TreeViewColumn -> Ptr TreeViewColumn -> Ptr TreeViewColumn ->
++  (Ptr TreeView -> Ptr TreeViewColumn -> Ptr TreeViewColumn -> Ptr TreeViewColumn ->
+   Ptr () -> IO {#type gboolean#}) -> IO TreeViewColumnDropFunc
+ 
+ -- | Scroll to a coordinate.
+@@ -798,7 +798,7 @@
+ {#pointer TreeViewMappingFunc#}
+ 
+ foreign import ccall "wrapper" mkTreeViewMappingFunc ::
+-  (Ptr () -> Ptr NativeTreePath -> Ptr () -> IO ()) ->
++  (Ptr TreeView -> Ptr NativeTreePath -> Ptr () -> IO ()) ->
+   IO TreeViewMappingFunc
+ 
+ -- | Check if row is expanded.
+diff -wbBur /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/Multiline/TextBuffer.chs gtk/Graphics/UI/Gtk/Multiline/TextBuffer.chs
+--- /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/Multiline/TextBuffer.chs	2012-06-18 01:39:34.000000000 +0400
++++ gtk/Graphics/UI/Gtk/Multiline/TextBuffer.chs	2012-10-02 16:27:34.000000000 +0400
+@@ -1251,16 +1251,26 @@
+ 
+ -- | A 'Pixbuf' is inserted into the buffer.
+ --
++-- * See note in 'bufferInsertText'.
++--
+ insertPixbuf :: TextBufferClass self => Signal self (TextIter -> Pixbuf -> IO ())
+ insertPixbuf = Signal (connect_BOXED_OBJECT__NONE "insert-pixbuf" mkTextIterCopy)
+ 
+ -- | The 'insertChildAnchor' signal is emitted to insert a 'TextChildAnchor' in a 'TextBuffer'. 
+ -- Insertion actually occurs in the default handler.
+ --
++-- * See note in 'bufferInsertText'.
++--
+ insertChildAnchor :: TextBufferClass self => Signal self (TextIter -> TextChildAnchor -> IO ())
+ insertChildAnchor = Signal (connect_BOXED_OBJECT__NONE "insert-child-anchor" mkTextIterCopy)
+ 
+--- | Some text was inserted.
++-- | Some text is inserted. Insertion actually occurs in the default handler.
++--
++-- * The function connected to this handler may not modify the buffer since
++--   this would invalidate the iterator. If this function replaces the
++--   default handler, it needs to stop the emission of this signal in order
++--   to prevent the default handler from running. If additional text should
++--   be inserted, this can be done using the 'after' function to connect.
+ --
+ bufferInsertText :: TextBufferClass self => Signal self (TextIter -> String -> IO ())
+ bufferInsertText = Signal $ \after obj handler ->
+diff -wbBur /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/Multiline/TextIter.chs gtk/Graphics/UI/Gtk/Multiline/TextIter.chs
+--- /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/Multiline/TextIter.chs	2012-06-18 01:39:34.000000000 +0400
++++ gtk/Graphics/UI/Gtk/Multiline/TextIter.chs	2012-10-02 16:30:54.000000000 +0400
+@@ -797,7 +797,7 @@
+ {#pointer TextCharPredicate#}
+ 
+ foreign import ccall "wrapper" mkTextCharPredicate ::
+-  ({#type gunichar#} -> Ptr () -> {#type gboolean#}) -> IO TextCharPredicate
++  ({#type gunichar#} -> Ptr () -> IO {#type gboolean#}) -> IO TextCharPredicate
+ 
+ -- | Move 'TextIter' forward until a
+ -- predicate function returns True.
+@@ -810,7 +810,7 @@
+ textIterForwardFindChar :: TextIter -> (Char -> Bool) -> Maybe TextIter ->
+                            IO Bool
+ textIterForwardFindChar ti pred limit = do
+-  fPtr <- mkTextCharPredicate (\c _ -> fromBool $ pred (chr (fromIntegral c)))
++  fPtr <- mkTextCharPredicate (\c _ -> return $ fromBool $ pred (chr (fromIntegral c)))
+   res <- liftM toBool $ {#call text_iter_forward_find_char#} 
+     ti fPtr nullPtr (fromMaybe (TextIter nullForeignPtr) limit)
+   freeHaskellFunPtr fPtr
+@@ -827,7 +827,7 @@
+ textIterBackwardFindChar :: TextIter -> (Char -> Bool) -> Maybe TextIter ->
+                             IO Bool
+ textIterBackwardFindChar ti pred limit = do
+-  fPtr <- mkTextCharPredicate (\c _ -> fromBool $ pred (chr (fromIntegral c)))
++  fPtr <- mkTextCharPredicate (\c _ -> return $ fromBool $ pred (chr (fromIntegral c)))
+   res <- liftM toBool $ {#call text_iter_backward_find_char#} 
+     ti fPtr nullPtr (fromMaybe (TextIter nullForeignPtr) limit)
+   freeHaskellFunPtr fPtr
+diff -wbBur /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/Windows/Assistant.chs gtk/Graphics/UI/Gtk/Windows/Assistant.chs
+--- /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/Windows/Assistant.chs	2012-06-18 01:39:34.000000000 +0400
++++ gtk/Graphics/UI/Gtk/Windows/Assistant.chs	2012-10-02 16:30:54.000000000 +0400
+@@ -274,7 +274,7 @@
+ {#pointer AssistantPageFunc#}
+ 
+ foreign import ccall "wrapper" mkAssistantPageFunc ::
+-  ({#type glong#} -> Ptr () -> IO {#type glong#})
++  ({#type gint#} -> Ptr () -> IO {#type gint#})
+   -> IO AssistantPageFunc
+ 
+ -- | Sets the page type for @page@. The page type determines the page behavior
diff --git a/community/haskell-haskeline/PKGBUILD b/community/haskell-haskeline/PKGBUILD
index efa76ace8..403cb1a18 100644
--- a/community/haskell-haskeline/PKGBUILD
+++ b/community/haskell-haskeline/PKGBUILD
@@ -1,20 +1,20 @@
-# $Id: PKGBUILD 72390 2012-06-13 13:46:29Z tdziedzic $
+# $Id: PKGBUILD 77346 2012-10-09 04:17:37Z tdziedzic $
 # Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
 # Contributor: Arch Haskell Team <arch-haskell@haskell.org>
 # Package generated by cabal2arch 0.7.6
 
 _hkgname=haskeline
 pkgname=haskell-haskeline
-pkgver=0.6.4.7
+pkgver=0.7.0.3
 pkgrel=1
 pkgdesc="A command-line interface for user input, written in Haskell."
 url="http://hackage.haskell.org/package/haskeline"
 license=('custom:BSD3')
 arch=('i686' 'x86_64' 'mips64el')
-depends=('ghc=7.4.2-1' 'sh' 'haskell-utf8-string=0.3.7-2' 'haskell-mtl=2.1.1-1' 'haskell-terminfo=0.3.2.3-2')
+depends=('ghc=7.6.1-1' 'sh' 'haskell-utf8-string=0.3.7-3' 'haskell-mtl=2.1.2-1' 'haskell-terminfo=0.3.2.5-1')
 source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
 install=${pkgname}.install
-md5sums=('d8d0a90a9965f4f68935e76e4e777035')
+md5sums=('3a78043dc80b5510202e71e77c0a9923')
 
 build() {
     cd ${srcdir}/${_hkgname}-${pkgver}
diff --git a/community/haskell-hslogger/PKGBUILD b/community/haskell-hslogger/PKGBUILD
index bc06dc50b..b20f59876 100644
--- a/community/haskell-hslogger/PKGBUILD
+++ b/community/haskell-hslogger/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 75909 2012-09-05 10:20:43Z spupykin $
+# $Id: PKGBUILD 77347 2012-10-09 04:17:42Z tdziedzic $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Arch Haskell Team <arch-haskell@haskell.org>
 
 pkgname=haskell-hslogger
 pkgver=1.2.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Versatile logging framework"
 url="http://hackage.haskell.org/package/hslogger"
 license=('LGPL')
 arch=('i686' 'x86_64' 'mips64el')
-depends=('ghc=7.4.2-1' 'haskell-mtl=2.1.1-1' 'haskell-network=2.3.0.14-1')
+depends=('ghc=7.6.1-1' 'haskell-mtl=2.1.2-1' 'haskell-network=2.3.1.0-1')
 install=${pkgname}.install
 source=(http://hackage.haskell.org/packages/archive/hslogger/${pkgver}/hslogger-${pkgver}.tar.gz)
 md5sums=('e0737887b0df75a3781989c8f6689850')
diff --git a/community/haskell-html/PKGBUILD b/community/haskell-html/PKGBUILD
index f9aaa0f0f..8eb9fc6f4 100644
--- a/community/haskell-html/PKGBUILD
+++ b/community/haskell-html/PKGBUILD
@@ -5,12 +5,12 @@
 _hkgname=html
 pkgname=haskell-html
 pkgver=1.0.1.2
-pkgrel=11
+pkgrel=12
 pkgdesc="HTML combinator library"
 url="http://hackage.haskell.org/package/html"
 license=('custom:BSD3')
 arch=('i686' 'x86_64')
-depends=('ghc=7.4.2-1' sh)
+depends=('ghc=7.6.1-1' sh)
 source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
 install=${pkgname}.install
 md5sums=('2a7de5a2af9a2f80d39825d6a95ee445')
diff --git a/community/haskell-pango/PKGBUILD b/community/haskell-pango/PKGBUILD
index aa044c1ad..347c3a31d 100644
--- a/community/haskell-pango/PKGBUILD
+++ b/community/haskell-pango/PKGBUILD
@@ -1,43 +1,46 @@
-# $Id: PKGBUILD 72393 2012-06-13 13:46:44Z tdziedzic $
+# $Id: PKGBUILD 77349 2012-10-09 04:17:52Z tdziedzic $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=haskell-pango
 pkgver=0.12.3
-pkgrel=2
+pkgrel=3
 pkgdesc="Binding to the pango library for Gtk2Hs."
 url="http://hackage.haskell.org/package/pango"
 license=('LGPL2.1')
 arch=('i686' 'x86_64')
-depends=('ghc=7.4.2-1' 'pango' 'haskell-glib=0.12.3.1-1' 'haskell-cairo=0.12.3.1-1')
+depends=('ghc' 'pango' 'haskell-glib' 'haskell-cairo')
 makedepends=("gtk2hs-buildtools")
 provides=('gtk2hs-pango')
 replaces=('gtk2hs-pango')
 conflicts=('gtk2hs-pango')
 options=('strip')
-source=(http://hackage.haskell.org/packages/archive/pango/${pkgver}/pango-${pkgver}.tar.gz)
 install=gtk2hs-pango.install
+source=(http://hackage.haskell.org/packages/archive/pango/${pkgver}/pango-${pkgver}.tar.gz)
 md5sums=('1ef3132cb569703d5b1bc262c9d86fe3')
 
 build() {
-    cd ${srcdir}/pango-${pkgver}
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
-      --prefix=/usr --docdir=/usr/share/doc/haskell-pango \
-      --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+  cd ${srcdir}/pango-${pkgver}
+  runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
+    --prefix=/usr --docdir=/usr/share/doc/haskell-pango \
+    --libsubdir=\$compiler/site-local/\$pkgid
+  sed -i 's|import Foreign.C.Types.*(CULong, CUInt)|import Foreign.C.Types (CULong(..), CUInt(..))|' Graphics/Rendering/Pango/Types.chs
+  runhaskell Setup build
+  runhaskell Setup haddock
+  runhaskell Setup register --gen-script
+  runhaskell Setup unregister --gen-script
+  sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
 }
 
 package() {
-    #_ghcver=`pacman -Q ghc | cut -f2 -d\  | cut -f1 -d-`
-    #depends=("ghc=${_ghcver}" 'pango' 'haskell-glib' 'haskell-cairo')
+  _ghcver=`pacman -Q ghc | cut -f2 -d\  | cut -f1 -d-`
+  _hglibver=`pacman -Q haskell-glib | cut -f2 -d\  | cut -f1 -d-`
+  _hcairover=`pacman -Q haskell-cairo | cut -f2 -d\  | cut -f1 -d-`
+  depends=("ghc=${_ghcver}" "pango" "haskell-glib=${_hglibver}" "haskell-cairo=${_hcairover}")
 
-    cd ${srcdir}/pango-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/gtk2hs-pango/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/gtk2hs-pango/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/haskell-pango/html ${pkgdir}/usr/share/doc/ghc/html/libraries/pango
-    runhaskell Setup copy --destdir=${pkgdir}
+  cd ${srcdir}/pango-${pkgver}
+  install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/gtk2hs-pango/register.sh
+  install -m744 unregister.sh ${pkgdir}/usr/share/haskell/gtk2hs-pango/unregister.sh
+  install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
+  ln -s /usr/share/doc/haskell-pango/html ${pkgdir}/usr/share/doc/ghc/html/libraries/pango
+  runhaskell Setup copy --destdir=${pkgdir}
 }
diff --git a/community/haskell-quickcheck/0001-update-code-to-support-extensible-exceptions-no-long.patch b/community/haskell-quickcheck/0001-update-code-to-support-extensible-exceptions-no-long.patch
new file mode 100644
index 000000000..a25506e67
--- /dev/null
+++ b/community/haskell-quickcheck/0001-update-code-to-support-extensible-exceptions-no-long.patch
@@ -0,0 +1,50 @@
+From 554b8dc1439b4dbb5bc9a853fc27efe7b1e111de Mon Sep 17 00:00:00 2001
+From: Thomas Dziedzic <gostrc@gmail.com>
+Date: Tue, 11 Sep 2012 03:59:50 -0700
+Subject: [PATCH] update code to support extensible exceptions no longer being
+ a part of ghc >= 7.6.1
+
+---
+ QuickCheck.cabal             | 6 +++++-
+ Test/QuickCheck/Exception.hs | 6 ++++++
+ 2 files changed, 11 insertions(+), 1 deletion(-)
+
+diff --git a/QuickCheck.cabal b/QuickCheck.cabal
+index 1a9126e..5afd6fb 100644
+--- a/QuickCheck.cabal
++++ b/QuickCheck.cabal
+@@ -60,9 +60,13 @@ library
+       Build-depends: ghc
+ 
+   -- We want to use extensible-exceptions even if linking against base-3.
+-  if impl(ghc >= 6.9)
++  if impl(ghc >= 6.9) && impl(ghc < 7.6)
+     Build-depends: extensible-exceptions
+ 
++  -- GHC >= 7.6.1 no longer provides extensible exceptions
++  if impl(ghc >= 7.6)
++    cpp-options: -DNEW_EXCEPTIONS
++
+   -- Modules that are always built.
+   Exposed-Modules:
+     Test.QuickCheck,
+diff --git a/Test/QuickCheck/Exception.hs b/Test/QuickCheck/Exception.hs
+index f895351..d463195 100644
+--- a/Test/QuickCheck/Exception.hs
++++ b/Test/QuickCheck/Exception.hs
+@@ -18,6 +18,12 @@ module Test.QuickCheck.Exception where
+ 
+ #if defined(OLD_EXCEPTIONS)
+ import Control.Exception(evaluate, try, Exception(..), throw)
++#elif defined(NEW_EXCEPTIONS)
++import Control.Exception(evaluate, try, SomeException(SomeException), ErrorCall(..), throw
++#if defined(GHC_INTERRUPT)
++  , AsyncException(UserInterrupt)
++#endif
++  )
+ #else
+ import Control.Exception.Extensible(evaluate, try, SomeException(SomeException), ErrorCall(..), throw
+ #if defined(GHC_INTERRUPT)
+-- 
+1.7.12
+
diff --git a/community/haskell-quickcheck/PKGBUILD b/community/haskell-quickcheck/PKGBUILD
index 2ee16af54..e96121f81 100644
--- a/community/haskell-quickcheck/PKGBUILD
+++ b/community/haskell-quickcheck/PKGBUILD
@@ -4,19 +4,20 @@
 
 _hkgname=QuickCheck
 pkgname=haskell-quickcheck
-pkgver=2.5
+pkgver=2.5.1.1
 pkgrel=1
 pkgdesc="Automatic testing of Haskell programs"
 url="http://hackage.haskell.org/package/QuickCheck"
 license=('custom:BSD3')
 arch=('i686' 'x86_64')
-depends=('ghc=7.4.2-1' 'haskell-random=1.0.1.1-2' 'sh')
+depends=('ghc=7.6.1-1' 'haskell-random=1.0.1.1-3' 'sh')
 source=(http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz)
 install=${pkgname}.install
-md5sums=('ad647a3f208092e5d41469369c18185e')
+md5sums=('2631b41c8b6e297b52622d1698387f09')
 
 build() {
     cd ${srcdir}/${_hkgname}-${pkgver}
+
     runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \
       --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid
     runhaskell Setup build
diff --git a/community/haskell-regex-base/PKGBUILD b/community/haskell-regex-base/PKGBUILD
index d787c6007..d4e951cc6 100644
--- a/community/haskell-regex-base/PKGBUILD
+++ b/community/haskell-regex-base/PKGBUILD
@@ -4,12 +4,12 @@
 _hkgname=regex-base
 pkgname=haskell-regex-base
 pkgver=0.93.2
-pkgrel=6
+pkgrel=7
 pkgdesc="Interface API for regex-posix,pcre,parsec,tdfa,dfa"
 url="http://hackage.haskell.org/cgi-bin/hackage-scripts/package/regex-base"
 license=('custom:BSD3')
 arch=('i686' 'x86_64')
-depends=('ghc=7.4.2-1' sh 'haskell-mtl=2.1.1-1')
+depends=('ghc=7.6.1-1' sh 'haskell-mtl=2.1.2-1')
 source=(http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz)
 install=${pkgname}.install
 md5sums=('e7b93b0b17eff8d3068ecb2f5d5f6ea3')
diff --git a/community/haskell-regex-compat/PKGBUILD b/community/haskell-regex-compat/PKGBUILD
index f1e91b553..c546442ec 100644
--- a/community/haskell-regex-compat/PKGBUILD
+++ b/community/haskell-regex-compat/PKGBUILD
@@ -4,12 +4,12 @@
 _hkgname=regex-compat
 pkgname=haskell-regex-compat
 pkgver=0.95.1
-pkgrel=2
+pkgrel=3
 pkgdesc="Replaces and enhances Text.Regex"
 url="http://hackage.haskell.org/package/${_hkgname}"
 license=('custom:BSD3')
 arch=('i686' 'x86_64')
-depends=('ghc=7.4.2-1' 'sh' 'haskell-regex-base=0.93.2-6' 'haskell-regex-posix=0.95.2-1')
+depends=('ghc=7.6.1-1' 'sh' 'haskell-regex-base=0.93.2-7' 'haskell-regex-posix=0.95.2-2')
 source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
 install=${pkgname}.install
 md5sums=('d0573ab4e2f3de5faa61380b67333320')
diff --git a/community/haskell-regex-posix/PKGBUILD b/community/haskell-regex-posix/PKGBUILD
index f49daf3b2..3c570e4d1 100644
--- a/community/haskell-regex-posix/PKGBUILD
+++ b/community/haskell-regex-posix/PKGBUILD
@@ -4,12 +4,12 @@
 _hkgname=regex-posix
 pkgname=haskell-regex-posix
 pkgver=0.95.2
-pkgrel=1
+pkgrel=2
 pkgdesc="The posix regex backend for regex-base"
 url="http://hackage.haskell.org/package/${_hkgname}"
 license=('custom:BSD3')
 arch=('i686' 'x86_64')
-depends=('ghc=7.4.2-1' 'sh' 'haskell-regex-base=0.93.2-6')
+depends=('ghc=7.6.1-1' 'sh' 'haskell-regex-base=0.93.2-7')
 source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
 install=${pkgname}.install
 md5sums=('1df0f9494aab110c7231f36393285c7c')
diff --git a/community/haskell-stm/PKGBUILD b/community/haskell-stm/PKGBUILD
index 8eba45641..fec52e949 100644
--- a/community/haskell-stm/PKGBUILD
+++ b/community/haskell-stm/PKGBUILD
@@ -3,16 +3,16 @@
 # Package generated by cabal2arch 0.7.5
 _hkgname=stm
 pkgname=haskell-stm
-pkgver=2.3
+pkgver=2.4
 pkgrel=1
 pkgdesc="A modular composable concurrency abstraction."
 url="http://hackage.haskell.org/package/stm"
 license=('custom:BSD3')
 arch=('i686' 'x86_64')
-depends=('ghc=7.4.2-1' 'sh')
+depends=('ghc=7.6.1-1' 'sh')
 source=(http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz)
 install=${pkgname}.install
-md5sums=('fcaf091a492974045cc04b231a3b7c9c')
+md5sums=('fe8ab1a8231202f1748da53454cf55fc')
 
 build() {
     cd ${srcdir}/${_hkgname}-$pkgver
diff --git a/community/haskell-syb/PKGBUILD b/community/haskell-syb/PKGBUILD
index 301c463b5..a2595bf2c 100644
--- a/community/haskell-syb/PKGBUILD
+++ b/community/haskell-syb/PKGBUILD
@@ -2,17 +2,17 @@
 # Contributor: Arch Haskell Team <arch-haskell@haskell.org>
 _hkgname=syb
 pkgname=haskell-syb
-pkgver=0.3.6.1
+pkgver=0.3.7
 pkgrel=1
 pkgdesc="A library for client-side HTTP"
 url="http://hackage.haskell.org/package/${_hkgname}"
 license=('custom:BSD3')
 arch=('i686' 'x86_64')
-depends=('ghc=7.4.2-1' sh)
+depends=('ghc=7.6.1-1' sh)
 options=('strip')
 source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
 install=${pkgname}.install
-md5sums=('50e0a755fcc735cccd0d77a89714ae38')
+md5sums=('fa653976a4ee43918cc7546089f94b60')
 
 build() {
     cd ${srcdir}/${_hkgname}-${pkgver}
diff --git a/community/haskell-tar/0001-update-changed-time-code-for-ghc-7.6.1.patch b/community/haskell-tar/0001-update-changed-time-code-for-ghc-7.6.1.patch
new file mode 100644
index 000000000..b8c2264bc
--- /dev/null
+++ b/community/haskell-tar/0001-update-changed-time-code-for-ghc-7.6.1.patch
@@ -0,0 +1,50 @@
+From bd14edd6240c72baa22822338fc872e6827af680 Mon Sep 17 00:00:00 2001
+From: Thomas Dziedzic <gostrc@gmail.com>
+Date: Tue, 11 Sep 2012 06:24:09 -0700
+Subject: [PATCH] update changed time code for ghc 7.6.1
+
+---
+ Codec/Archive/Tar/Pack.hs | 9 +++++----
+ tar.cabal                 | 2 +-
+ 2 files changed, 6 insertions(+), 5 deletions(-)
+
+diff --git a/Codec/Archive/Tar/Pack.hs b/Codec/Archive/Tar/Pack.hs
+index 8e43091..0af6103 100644
+--- a/Codec/Archive/Tar/Pack.hs
++++ b/Codec/Archive/Tar/Pack.hs
+@@ -28,8 +28,8 @@ import qualified System.FilePath as FilePath.Native
+ import System.Directory
+          ( getDirectoryContents, doesDirectoryExist, getModificationTime
+          , Permissions(..), getPermissions )
+-import System.Time
+-         ( ClockTime(..) )
++import Data.Time.Clock.POSIX
++         ( utcTimeToPOSIXSeconds )
+ import System.IO
+          ( IOMode(ReadMode), openBinaryFile, hFileSize )
+ import System.IO.Unsafe (unsafeInterleaveIO)
+@@ -170,5 +170,6 @@ recurseDirectories base (dir:dirs) = unsafeInterleaveIO $ do
+ 
+ getModTime :: FilePath -> IO EpochTime
+ getModTime path = do
+-  (TOD s _) <- getModificationTime path
+-  return $! fromIntegral s
++  utcTime <- getModificationTime path
++  let s = truncate . utcTimeToPOSIXSeconds $ utcTime
++  return $! s
+diff --git a/tar.cabal b/tar.cabal
+index e748b07..d85b0da 100644
+--- a/tar.cabal
++++ b/tar.cabal
+@@ -25,7 +25,7 @@ source-repository head
+ 
+ library
+   build-depends: base >= 3 && < 5, filepath,
+-                 directory, old-time, bytestring
++                 directory, bytestring, time
+ 
+   exposed-modules:
+     Codec.Archive.Tar
+-- 
+1.7.12
+
diff --git a/community/haskell-tar/PKGBUILD b/community/haskell-tar/PKGBUILD
index f6890f827..b048da269 100644
--- a/community/haskell-tar/PKGBUILD
+++ b/community/haskell-tar/PKGBUILD
@@ -1,23 +1,27 @@
-# $Id: PKGBUILD 72400 2012-06-13 13:47:19Z tdziedzic $
+# $Id: PKGBUILD 77356 2012-10-09 04:18:31Z tdziedzic $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Arch Haskell Team <arch-haskell@haskell.org>
 
 pkgname=haskell-tar
 pkgver=0.4.0.0
-pkgrel=2
+pkgrel=3
 pkgdesc="Reading, writing and manipulating \".tar\" archive files."
 url="http://hackage.haskell.org/package/tar"
 license=('custom:BSD3')
 arch=('i686' 'x86_64' 'mips64el')
-depends=('ghc=7.4.2-1')
-options=('strip')
-source=("http://hackage.haskell.org/packages/archive/tar/$pkgver/tar-$pkgver.tar.gz")
+depends=('ghc=7.6.1-1')
+source=("http://hackage.haskell.org/packages/archive/tar/$pkgver/tar-$pkgver.tar.gz"
+        '0001-update-changed-time-code-for-ghc-7.6.1.patch')
 install=haskell-tar.install
-sha256sums=('a3d37be1b8666c16c6371d193a0795b8abe7b0216e81870a2666e1e85d931113')
+sha256sums=('a3d37be1b8666c16c6371d193a0795b8abe7b0216e81870a2666e1e85d931113'
+            '17b8afc519db5bed5d89807e6e659788f5d9c2f5c569150a9d1c6faac52e98e6')
 
 build() {
   cd "$srcdir/tar-$pkgver"
 
+  # time functions have changed in ghc 7.6.1
+  patch -Np1 -i ${srcdir}/0001-update-changed-time-code-for-ghc-7.6.1.patch
+
   runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
     --prefix=/usr --docdir="/usr/share/doc/$pkgname" \
     --libsubdir=\$compiler/site-local/\$pkgid
diff --git a/community/haskell-terminfo/PKGBUILD b/community/haskell-terminfo/PKGBUILD
index b1036e177..974779c1e 100644
--- a/community/haskell-terminfo/PKGBUILD
+++ b/community/haskell-terminfo/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 72401 2012-06-13 13:47:24Z tdziedzic $
+# $Id: PKGBUILD 77357 2012-10-09 04:18:36Z tdziedzic $
 # Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
 # Contributor: Arch Haskell Team <arch-haskell@haskell.org>
 
 _hkgname=terminfo
 pkgname=haskell-terminfo
-pkgver=0.3.2.3
-pkgrel=2
+pkgver=0.3.2.5
+pkgrel=1
 pkgdesc="Haskell bindings to the terminfo library."
 url="http://hackage.haskell.org/package/${_hkgname}"
 license=('custom:BSD3')
 arch=('i686' 'x86_64' 'mips64el')
-depends=('ghc=7.4.2-1' 'sh')
+depends=('ghc=7.6.1-1' 'sh')
 source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
 install=${pkgname}.install
-md5sums=('706f546c629ac100a402c9c2629c25fa')
+md5sums=('7ef09acfac9f6fc499ed3bb804ae2ab3')
 
 build() {
     cd ${srcdir}/${_hkgname}-${pkgver}
diff --git a/community/haskell-utf8-string/PKGBUILD b/community/haskell-utf8-string/PKGBUILD
index 5f5a528da..d167aa9d2 100644
--- a/community/haskell-utf8-string/PKGBUILD
+++ b/community/haskell-utf8-string/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 72402 2012-06-13 13:47:29Z tdziedzic $
+# $Id: PKGBUILD 77358 2012-10-09 04:18:41Z tdziedzic $
 # Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
 # Contributor: Arch Haskell Team <arch-haskell@haskell.org>
 # Package generated by cabal2arch 0.7.6
 _hkgname=utf8-string
 pkgname=haskell-utf8-string
 pkgver=0.3.7
-pkgrel=2
+pkgrel=3
 pkgdesc="Support for reading and writing UTF8 Strings"
 url="http://hackage.haskell.org/package/${_hkgname}"
 license=('custom:BSD3')
 arch=('i686' 'x86_64' 'mips64el')
-depends=('ghc=7.4.2-1' 'sh')
+depends=('ghc=7.6.1-1' 'sh')
 install=${pkgname}.install
 source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
 md5sums=('50e5c395713e716e0e4a56da73f87ccd')
diff --git a/community/haskell-x11-xft/PKGBUILD b/community/haskell-x11-xft/PKGBUILD
index 0a5d0b0f3..bb4e05077 100644
--- a/community/haskell-x11-xft/PKGBUILD
+++ b/community/haskell-x11-xft/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 72404 2012-06-13 13:47:39Z tdziedzic $
+# $Id: PKGBUILD 77360 2012-10-09 04:18:51Z tdziedzic $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 _hkgname=X11-xft
 pkgname=haskell-x11-xft
 pkgver=0.3.1
-pkgrel=4
+pkgrel=5
 pkgdesc="Bindings to the Xft, X Free Type interface library, and some Xrender parts"
 url="http://hackage.haskell.org/package/${_hkgname}"
 license=('LGPL')
 arch=('i686' 'x86_64' 'mips64el')
-depends=('ghc=7.4.2-1' 'haskell-x11=1.6.0' 'haskell-utf8-string=0.3.7' 'libxft')
+depends=('ghc=7.6.1-1' 'haskell-x11=1.6.0.2' 'haskell-utf8-string=0.3.7' 'libxft')
 options=('strip')
 install=haskell-x11-xft.install
 source=(http://hackage.haskell.org/packages/archive/X11-xft/$pkgver/X11-xft-$pkgver.tar.gz)
diff --git a/community/haskell-x11/PKGBUILD b/community/haskell-x11/PKGBUILD
index 4e2bf7feb..5d4c3a7bb 100644
--- a/community/haskell-x11/PKGBUILD
+++ b/community/haskell-x11/PKGBUILD
@@ -1,22 +1,22 @@
-# $Id: PKGBUILD 72403 2012-06-13 13:47:34Z tdziedzic $
+# $Id: PKGBUILD 77359 2012-10-09 04:18:46Z tdziedzic $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: shild <sxp@bk.ru>
 # Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
 
 _hkgname=X11
 pkgname=haskell-x11
-pkgver=1.6.0
+pkgver=1.6.0.2
 pkgrel=1
 pkgdesc="A Haskell binding to the X11 graphics library."
 arch=(i686 x86_64 'mips64el')
 url="http://hackage.haskell.org/cgi-bin/hackage-scripts/package/X11"
 license=('custom:BSD3')
 options=('strip')
-depends=("ghc=7.4.2-1" "haskell-syb=0.3.6.1" 'libx11' 'libxinerama' 'libxrandr')
+depends=("ghc=7.6.1-1" "haskell-syb=0.3.7" 'libx11' 'libxinerama' 'libxrandr')
 conflicts=(haskell-x11-extras)
 install=hsmod.install
 source=(http://hackage.haskell.org/packages/archive/X11/$pkgver/X11-$pkgver.tar.gz)
-md5sums=('8199520ce58e91762d31d54ed081b99c')
+md5sums=('0227ba7a8788c3cfd146e952a5fafc82')
 
 build() {
     cd ${srcdir}/${_hkgname}-${pkgver}
diff --git a/community/haskell-xhtml/PKGBUILD b/community/haskell-xhtml/PKGBUILD
index 68041976a..7ccfca159 100644
--- a/community/haskell-xhtml/PKGBUILD
+++ b/community/haskell-xhtml/PKGBUILD
@@ -1,38 +1,49 @@
 # Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
 # Contributor: Arch Haskell Team <arch-haskell@haskell.org>
-# Package generated by cabal2arch 0.7.6
+# Contributor: Alexander Rødseth <rodseth@gmail.com>
 
 _hkgname=xhtml
 pkgname=haskell-xhtml
 pkgver=3000.2.1
-pkgrel=1
-pkgdesc="Combinators for producing XHTML 1.0, including the Strict, Transitional and Frameset variants."
-url="http://hackage.haskell.org/package/xhtml"
+pkgrel=2
+pkgdesc='Combinators for producing XHTML 1.0'
+url='http://hackage.haskell.org/package/xhtml'
 license=('custom:BSD3')
-arch=('i686' 'x86_64')
-depends=('ghc=7.4.2-1' 'sh')
-source=(http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz)
-install=${pkgname}.install
-md5sums=('c63487bea16cbf0ecf252d6ed73106bf')
+arch=('x86_64' 'i686')
+depends=('ghc=7.6.1-1' 'sh')
+source=("http://hackage.haskell.org/packages/archive/$_hkgname/$pkgver/$_hkgname-$pkgver.tar.gz")
+install=$pkgname.install
+sha256sums=('33020782170c1c083bc59fc3bfcb72cec2db223e02d1181c07ae23b9fa7fdcd8')
 
 build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \
-      --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid
+    cd "$srcdir/$_hkgname-$pkgver"
+
+    runhaskell Setup configure -O -p \
+      --enable-split-objs \
+      --enable-shared \
+      --prefix=/usr \
+      --docdir="/usr/share/doc/$pkgname" \
+      --libsubdir=\$compiler/site-local/\$pkgid
     runhaskell Setup build
     runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
+    runhaskell Setup register --gen-script
     runhaskell Setup unregister --gen-script
     sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
 }
 
 package() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
+  cd "$srcdir/$_hkgname-$pkgver"
+  
+  install -Dm744 register.sh \
+    "$pkgdir/usr/share/haskell/$pkgname/register.sh"
+  install -m744 unregister.sh \
+    "$pkgdir/usr/share/haskell/$pkgname/unregister.sh"
+  install -dm755 "$pkgdir/usr/share/doc/ghc/html/libraries"
+  ln -s "/usr/share/doc/$pkgname/html" \
+    "$pkgdir/usr/share/doc/ghc/html/libraries/$_hkgname"
+  runhaskell Setup copy --destdir="$pkgdir"
+  install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+  rm -f "$pkgdir/usr/share/doc/$pkgname/LICENSE"
 }
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/hedgewars/PKGBUILD b/community/hedgewars/PKGBUILD
index c95de8618..d1542e75f 100644
--- a/community/hedgewars/PKGBUILD
+++ b/community/hedgewars/PKGBUILD
@@ -1,20 +1,20 @@
-# $Id: PKGBUILD 75756 2012-08-30 21:02:59Z spupykin $
+# $Id: PKGBUILD 77362 2012-10-09 04:19:03Z tdziedzic $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=hedgewars
 pkgver=0.9.17
-pkgrel=4
+pkgrel=5
 pkgdesc="Free Worms-like turn based strategy game"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://hedgewars.org"
 license=('GPL' 'custom')
 depends=('qt' 'sdl' 'sdl_mixer' 'sdl_image' 'sdl_net' 'sdl_ttf' 'lua')
 makedepends=('fpc' 'cmake'
-             # haskell specific
-             'ghc=7.4.2-1'
-	     'haskell-network=2.3.0.14-1' 'haskell-bytestring-show=0.3.5.1-3'
-	     'haskell-utf8-string=0.3.7-2' 'haskell-dataenc=0.14.0.3-2' 
-	     'haskell-hslogger=1.1.5-7')
+	     # haskell specific
+	     'ghc'
+	     'haskell-network' 'haskell-bytestring-show'
+	     'haskell-utf8-string' 'haskell-dataenc'
+	     'haskell-hslogger')
 source=(http://download.gna.org/hedgewars/hedgewars-src-$pkgver.tar.bz2
 	hedgewars.desktop
 	hedgewars.png)
@@ -26,6 +26,7 @@ build() {
   cd $pkgname-src-$pkgver
 
 #  sed -i 's|.*misc/liblua.*||' CMakeLists.txt
+  sed -i 's|instance NFData B.ByteString||' gameServer/Actions.hs
 
   cmake \
 	-DCMAKE_INSTALL_PREFIX=/usr \
diff --git a/community/hitori/PKGBUILD b/community/hitori/PKGBUILD
index a4a8ed903..d609f0fa5 100644
--- a/community/hitori/PKGBUILD
+++ b/community/hitori/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 69054 2012-04-08 19:56:12Z bgyorgy $
+# $Id: PKGBUILD 77547 2012-10-12 03:16:10Z bgyorgy $
 # Maintainer: Balló György <ballogyor+arch at gmail dot com>
 
 pkgname=hitori
-pkgver=0.3.2
+pkgver=0.4.0
 pkgrel=1
 pkgdesc="GTK+ application to generate and let you play games of Hitori"
 arch=('i686' 'x86_64' 'mips64el')
 url="https://live.gnome.org/Hitori"
 license=('GPL')
 depends=('gtk3' 'hicolor-icon-theme' 'xdg-utils')
-makedepends=('intltool' 'gnome-doc-utils')
+makedepends=('intltool' 'itstool')
 install=$pkgname.install
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('9e72bb0c84b0e0b66a96fcee6918cf15832f45458df4d8dd5f8091a20bba4350')
+sha256sums=('5d9e1c0f5d33c960167a126242bf57ff4865a6aaf6602da4a25aae56dc491030')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/lazarus/PKGBUILD b/community/lazarus/PKGBUILD
index e33f85066..8d1f24767 100644
--- a/community/lazarus/PKGBUILD
+++ b/community/lazarus/PKGBUILD
@@ -1,13 +1,13 @@
-# $Id: PKGBUILD 76459 2012-09-18 17:57:53Z spupykin $
+# $Id: PKGBUILD 77496 2012-10-11 11:35:28Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Jens Adam (byte/jra) <j_adam@web.de>
 # Contributor: BlackIkeEagle <ike DOT devolder AT gmail DOT com>
 
 pkgbase=lazarus
 pkgname=('lazarus' 'lazarus-gtk2' 'lazarus-qt')
-pkgver=1.0
+pkgver=1.0.2
 _pkgsubver=0
-pkgrel=2
+pkgrel=1
 url='http://www.lazarus.freepascal.org/'
 license=('GPL2' 'MPL' 'custom:LGPL')
 arch=('i686' 'x86_64' 'mips64el')
@@ -15,7 +15,7 @@ makedepends=('fpc' 'fpc-src' 'gtk2' 'qt4pas' 'rsync')
 options=('!emptydirs' '!makeflags')
 source=("http://downloads.sourceforge.net/project/lazarus/Lazarus%20Zip%20_%20GZip/Lazarus%20$pkgver/lazarus-$pkgver-${_pkgsubver}.tar.gz"
 	'lazcontrols2.diff')
-md5sums=('2412545d740059d006485f5d17ef0eca'
+md5sums=('738ee29686de71cd599b468eabf034e8'
          '288bca6ad5ade79deec34c3602daaaa9')
 
 build() {
diff --git a/community/libcryptui/PKGBUILD b/community/libcryptui/PKGBUILD
index 160bdd7fd..335780a1d 100644
--- a/community/libcryptui/PKGBUILD
+++ b/community/libcryptui/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 69509 2012-04-17 14:38:21Z bgyorgy $
+# $Id: PKGBUILD 77551 2012-10-12 03:46:14Z bgyorgy $
 # Maintainer: Balló György <ballogyor+arch at gmail dot com>
 
 pkgname=libcryptui
-pkgver=3.4.1
+pkgver=3.6.0
 pkgrel=1
 pkgdesc="Library for OpenPGP prompts"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ makedepends=('intltool' 'gobject-introspection')
 options=('!libtool')
 install=$pkgname.install
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('fad4addf5c5b6588f492a720edce59f925190e4cdf3672984f53b25327f10fd5')
+sha256sums=('0a4a747fff33acd03d1381d27454f8aa5eaca026b7475e24c4b8f8272bbe1c87')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/libnetfilter_acct/PKGBUILD b/community/libnetfilter_acct/PKGBUILD
index 4bdacafd9..c2b21f98c 100644
--- a/community/libnetfilter_acct/PKGBUILD
+++ b/community/libnetfilter_acct/PKGBUILD
@@ -1,12 +1,13 @@
 # $Id: PKGBUILD 71613 2012-05-31 08:51:38Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org>
 # Contributor: Kevin Edmonds <edmondskevin@hotmail.com>
 # Maintainer: Filip Wojciechowski, filip at loka dot pl
 
 pkgname=libnetfilter_acct
-pkgver=1.0.0
+pkgver=1.0.1
 pkgrel=1
-pkgdesc="userspace library providing interface to extended accounting infrastructure"
+pkgdesc='userspace library providing interface to extended accounting infrastructure'
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.netfilter.org/projects/libnetfilter_acct/index.html"
 license=('GPL')
@@ -14,11 +15,15 @@ depends=('libnfnetlink' 'libmnl')
 makedepends=('pkgconfig')
 options=('!libtool')
 source=(http://www.netfilter.org/projects/$pkgname/files/$pkgname-$pkgver.tar.bz2)
-md5sums=('246e97feb9cf98f7ddf70d71a3813336')
+md5sums=('4755429cbd46ad0ed32bb30f84da0dee')
 
 build() {
-  cd $srcdir/$pkgname-$pkgver
+  cd $pkgname-$pkgver
   ./configure --prefix=/usr
   make
-  make DESTDIR=$pkgdir install
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
 }
diff --git a/community/libnetfilter_conntrack/PKGBUILD b/community/libnetfilter_conntrack/PKGBUILD
index 0efd23631..84a8ced75 100644
--- a/community/libnetfilter_conntrack/PKGBUILD
+++ b/community/libnetfilter_conntrack/PKGBUILD
@@ -1,24 +1,30 @@
-# $Id: PKGBUILD 70936 2012-05-20 08:39:06Z spupykin $
+# $Id: PKGBUILD 77383 2012-10-09 10:14:26Z seblu $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org>
 # Contributor: Alessandro Sagratini <ale_sagra@hotmail.com>
 # Contributor: Kevin Edmonds <edmondskevin@hotmail.com>
 
 pkgname=libnetfilter_conntrack
-pkgver=1.0.1
+pkgver=1.0.2
 pkgrel=1
-pkgdesc="userspace library providing a programming interface (API) to the in-kernel connection tracking state table"
+pkgdesc='Library providing an API to the in-kernel connection tracking state table'
 arch=('i686' 'x86_64' 'mips64el')
-depends=(libnfnetlink)
-makedepends=(pkgconfig)
-url="http://www.netfilter.org/projects/libnetfilter_conntrack/index.html"
-license=("GPL")
+depends=('libnfnetlink' 'libmnl')
+url='http://www.netfilter.org/projects/libnetfilter_conntrack/'
+license=('GPL')
 options=('!libtool')
-source=(http://www.netfilter.org/projects/$pkgname/files/$pkgname-$pkgver.tar.bz2)
-md5sums=('2d17d9da1404728d61a29b4a8338ad0c')
+source=("http://www.netfilter.org/projects/$pkgname/files/$pkgname-$pkgver.tar.bz2")
+md5sums=('447114b5d61bb9a9617ead3217c3d3ff')
 
 build() {
-  cd $srcdir/$pkgname-$pkgver
+  cd $pkgname-$pkgver
   ./configure --prefix=/usr
   make
-  make DESTDIR=$pkgdir install
 }
+package() {
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+}
+
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/libnetfilter_queue/PKGBUILD b/community/libnetfilter_queue/PKGBUILD
index 9607bf44b..f9559cb90 100644
--- a/community/libnetfilter_queue/PKGBUILD
+++ b/community/libnetfilter_queue/PKGBUILD
@@ -1,24 +1,29 @@
-# $Id: PKGBUILD 71614 2012-05-31 08:52:14Z spupykin $
+# $Id: PKGBUILD 77377 2012-10-09 09:50:14Z seblu $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org>
 # Contributor: Kevin Edmonds <edmondskevin@hotmail.com>
 # Maintainer: Filip Wojciechowski, filip at loka dot pl
 
 pkgname=libnetfilter_queue
-pkgver=1.0.1
+pkgver=1.0.2
 pkgrel=1
-pkgdesc="userspace library providing an API to packets that have been queued by the kernel packet filter"
+pkgdesc='Userspace API to packets that have been queued by the kernel packet filter'
 arch=('i686' 'x86_64' 'mips64el')
-url="http://www.netfilter.org/projects/libnetfilter_queue/index.html"
+url='http://www.netfilter.org/projects/libnetfilter_queue/'
 license=('GPL')
-depends=(libnfnetlink)
-makedepends=(pkgconfig)
+depends=('libnfnetlink' 'libmnl')
 options=('!libtool')
-source=(http://www.netfilter.org/projects/$pkgname/files/$pkgname-$pkgver.tar.bz2)
-md5sums=('08b968cb2d36c24deb7f26a69f5d8602')
+source=("http://www.netfilter.org/projects/$pkgname/files/$pkgname-$pkgver.tar.bz2")
+md5sums=('df09befac35cb215865b39a36c96a3fa')
 
 build() {
-  cd $srcdir/$pkgname-$pkgver
+  cd $pkgname-$pkgver
   ./configure --prefix=/usr
-  make
-  make DESTDIR=$pkgdir install
 }
+
+package() {
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/libnfnetlink/PKGBUILD b/community/libnfnetlink/PKGBUILD
index 1d984263b..cd0661983 100644
--- a/community/libnfnetlink/PKGBUILD
+++ b/community/libnfnetlink/PKGBUILD
@@ -1,27 +1,30 @@
-# $Id: PKGBUILD 55539 2011-09-14 08:04:26Z andrea $
+# $Id: PKGBUILD 77381 2012-10-09 10:06:36Z seblu $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org>
 # Contributor: Kevin Edmonds <edmondskevin@hotmail.com>
 # Contributor: Filip Wojciechowski, filip at loka dot pl
 
 pkgname=libnfnetlink
-pkgver=1.0.0
-pkgrel=2
-pkgdesc="low-level library for netfilter related kernel/userspace communication"
+pkgver=1.0.1
+pkgrel=1
+pkgdesc='Low-level library for netfilter related kernel/userspace communication'
 arch=('i686' 'x86_64' 'mips64el')
-url="http://www.netfilter.org/projects/libnfnetlink/index.html"
+url='http://www.netfilter.org/projects/libnfnetlink/'
 license=('GPL')
 depends=('glibc')
 options=('!libtool')
 source=("http://www.netfilter.org/projects/$pkgname/files/$pkgname-$pkgver.tar.bz2")
-md5sums=('016fdec8389242615024c529acc1adb8')
+md5sums=('98927583d2016a9fb1936fed992e2c5e')
 
 build() {
-  cd "${srcdir}"/$pkgname-$pkgver
+  cd $pkgname-$pkgver
   ./configure --prefix=/usr
   make
 }
 
 package() {
-  cd "${srcdir}"/$pkgname-$pkgver
-  make DESTDIR="${pkgdir}" install
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
 }
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/lilypond/PKGBUILD b/community/lilypond/PKGBUILD
index 73f7cac04..37fb3c64b 100644
--- a/community/lilypond/PKGBUILD
+++ b/community/lilypond/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 75534 2012-08-26 20:38:31Z spupykin $
+# $Id: PKGBUILD 77506 2012-10-11 12:11:13Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Geoffroy Carrier <geoffroy@archlinux.org>
 # Contributor: William Rea <sillywilly@gmail.com>
@@ -6,7 +6,7 @@
 
 pkgname=lilypond
 pkgver=2.16.0
-pkgrel=1
+pkgrel=2
 pkgdesc="An automated music engraving system"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://lilypond.org"
@@ -39,5 +39,5 @@ build() {
 
 package() {
   cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
+  make DESTDIR="$pkgdir" vimdir="/usr/share/vim/vimfiles" install
 }
diff --git a/community/oath-toolkit/PKGBUILD b/community/oath-toolkit/PKGBUILD
index e531de80e..7fe814c91 100644
--- a/community/oath-toolkit/PKGBUILD
+++ b/community/oath-toolkit/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 75890 2012-09-04 18:45:38Z seblu $
+# $Id: PKGBUILD 77539 2012-10-11 23:18:29Z seblu $
 # Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org>
 # Contributor: Christian Hesse <mail@eworm.de>
 # Contributor: L42y <423300@gmail.com>
 
 pkgname=oath-toolkit
-pkgver=1.12.6
+pkgver=2.0.0
 pkgrel=1
 pkgdesc='OATH one-time password toolkit'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.nongnu.org/oath-toolkit/'
 license=('GPL3')
-depends=('pam')
+depends=('glibc' 'pam' 'libxml2')
 options=('!libtool')
 source=("http://download.savannah.nongnu.org/releases/$pkgname/$pkgname-$pkgver.tar.gz")
-md5sums=('7c8c4231aecfc5d74467b2a9e6bf054c')
+md5sums=('2da5d9211062dfd746539c783185fae1')
 
 build() {
   cd $pkgname-$pkgver
@@ -24,7 +24,6 @@ build() {
 package() {
   cd $pkgname-$pkgver
   make DESTDIR="$pkgdir" install
-
   # Install basic docs too
   install -D -m 644 pam_oath/README "$pkgdir/usr/share/doc/$pkgname/PAM_README"
   install -D -m 644 README "$pkgdir/usr/share/doc/$pkgname/README"
diff --git a/community/pam_mount/PKGBUILD b/community/pam_mount/PKGBUILD
index 9b226e9f2..d652fe0c3 100644
--- a/community/pam_mount/PKGBUILD
+++ b/community/pam_mount/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id$
+# $Id: PKGBUILD 77500 2012-10-11 11:40:42Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributors: Sirius Bakke <sirius\at/nonline.org>
 
 pkgname=pam_mount
 pkgver=2.13
-pkgrel=3
+pkgrel=4
 pkgdesc="A PAM module that can mount volumes for a user session"
 arch=('i686' 'x86_64')
 url="http://pam-mount.sourceforge.net/"
@@ -13,11 +13,18 @@ depends=('util-linux' 'libhx>=3.12.1' 'libxml2>=2.6' 'openssl>0.9.7' 'cryptsetup
 optdepends=('hxtools: If you have something like <logout wait="1000" hup="0" term="1" kill="1" /> in your config')
 backup=('etc/security/pam_mount.conf.xml')
 options=(!emptydirs !libtool)
-source=("http://downloads.sourceforge.net/project/pam-mount/$pkgname/$pkgver/$pkgname-$pkgver.tar.xz")
-md5sums=('9f75fc8e84ea9cde619cdd6a62c7de33')
+source=("http://downloads.sourceforge.net/project/pam-mount/$pkgname/$pkgver/$pkgname-$pkgver.tar.xz"
+	"$pkgname-git.patch")
+md5sums=('9f75fc8e84ea9cde619cdd6a62c7de33'
+         'f018cb901eb6a18447a3a1b0a50c14dd')
 
 build() {
   cd -- "$srcdir/$pkgname-$pkgver"
+  patch -p1 <$srcdir/$pkgname-git.patch
+  aclocal
+  automake --add-missing
+  libtoolize
+  autoreconf
   ./configure \
 	--prefix=/usr \
 	--with-ssbindir=/usr/sbin \
diff --git a/community/pam_mount/pam_mount-git.patch b/community/pam_mount/pam_mount-git.patch
new file mode 100644
index 000000000..5890d83f3
--- /dev/null
+++ b/community/pam_mount/pam_mount-git.patch
@@ -0,0 +1,1345 @@
+diff -wbBurN pam_mount-2.13/configure.ac pam-mount/configure.ac
+--- pam_mount-2.13/configure.ac	2011-12-15 16:12:10.000000000 +0400
++++ pam-mount/configure.ac	2012-10-11 15:28:24.848220631 +0400
+@@ -13,9 +13,10 @@
+ AC_CONFIG_HEADERS([config.h])
+ AC_CONFIG_MACRO_DIR([m4])
+ AC_PROG_INSTALL
+-AM_INIT_AUTOMAKE([-Wall no-dist foreign subdir-objects])
++AM_INIT_AUTOMAKE([-Wall foreign subdir-objects tar-pax no-dist-gzip dist-xz])
+ AC_PROG_CC
+ AM_PROG_CC_C_O
++m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
+ AC_DISABLE_STATIC
+ AM_PROG_LIBTOOL
+ AC_PROG_LN_S
+diff -wbBurN pam_mount-2.13/doc/changelog.txt pam-mount/doc/changelog.txt
+--- pam_mount-2.13/doc/changelog.txt	2011-12-15 16:12:10.000000000 +0400
++++ pam-mount/doc/changelog.txt	2012-10-11 15:28:24.851553965 +0400
+@@ -3,6 +3,15 @@
+ 
+ HEAD
+ ====
++Fixes:
++- fix "feature 1 already set to zero"
++- pmt-ehd: avoid miscalculating blockdev size obtained from BLKGETSIZE64
++- pam_mount: give more verbose output on "unknown digest/cipher"
++- pam_mount: fix crash when an unknown digest/cipher was specified
++- pam_mount: correctly mkdir mountpoint if requested
++- pam_mount: only remove mountpoint if actually created
++Changes:
++- Complain louder when EUID is not 0
+ 
+ 
+ v2.13 (2011-12-15)
+diff -wbBurN pam_mount-2.13/doc/Makefile.am pam-mount/doc/Makefile.am
+--- pam_mount-2.13/doc/Makefile.am	2011-12-15 16:12:10.000000000 +0400
++++ pam-mount/doc/Makefile.am	2012-10-11 15:28:24.848220631 +0400
+@@ -5,8 +5,9 @@
+ 		pmvarrun.8 pmt-ehd.8 \
+ 		umount.crypt.8 umount.crypt_LUKS.8 \
+ 		umount.crypto_LUKS.8
+-dist_noinst_DATA = pam_mount.txt
+-EXTRA_DIST = bugs.txt changelog.txt faq.txt install.txt options.txt todo.txt
++EXTRA_DIST = bugs.txt changelog.txt faq.txt install.txt options.txt todo.txt \
++	pam_mount.8.in pam_mount.conf.5.in
++DISTCLEANFILES = pam_mount.txt
+ CLEANFILES = ${man_MANS}
+ 
+ replcmd = perl -lpe 's/\@''PACKAGE\@/@PACKAGE@/g;s/\@''PACKAGE_VERSION\@/@PACKAGE_VERSION@/g;s/\@''PACKAGE_RELDATE\@/@PACKAGE_RELDATE@/g;'
+diff -wbBurN pam_mount-2.13/doc/mount.crypt.8 pam-mount/doc/mount.crypt.8
+--- pam_mount-2.13/doc/mount.crypt.8	2011-12-15 16:12:10.000000000 +0400
++++ pam-mount/doc/mount.crypt.8	2012-10-11 15:28:24.851553965 +0400
+@@ -37,10 +37,6 @@
+ Select the name for the crypto device (optional). This option is currently
+ only usable with dm-crypt systems.
+ .TP
+-\fBdm\-timeout=\fP\fIseconds\fP
+-Wait at most this many seconds for udev to create /dev/mapper/\fIname\fP after
+-calling cryptsetup(8). The default value is 0 seconds.
+-.TP
+ \fBfsck\fP
+ Run fsck on the container before mounting it.
+ .TP
+diff -wbBurN pam_mount-2.13/doc/options.txt pam-mount/doc/options.txt
+--- pam_mount-2.13/doc/options.txt	2011-12-15 16:12:10.000000000 +0400
++++ pam-mount/doc/options.txt	2012-10-11 15:28:24.851553965 +0400
+@@ -4,6 +4,11 @@
+ 
+ 	auth	optional	pam_mount.so	debug
+ 
++Options are to be separated by whitespace, hence specifying more than
++one is to look like:
++
++	auth	optional	pam_mount.so	debug disable_interactive
++
+ 
+ enable_pam_password (default)
+ disable_pam_password
+diff -wbBurN pam_mount-2.13/doc/pam_mount.conf.5.in pam-mount/doc/pam_mount.conf.5.in
+--- pam_mount-2.13/doc/pam_mount.conf.5.in	2011-12-15 16:12:10.000000000 +0400
++++ pam-mount/doc/pam_mount.conf.5.in	2012-10-11 15:28:24.851553965 +0400
+@@ -171,35 +171,33 @@
+ processes and optionally wait before sending signals.
+ .TP
+ \fB<luserconf name="\fP\fI.pam_mount.conf.xml\fP\fB" />\fP
+-Individual users may define additional volumes (usually in
+-~/.pam_mount.conf.xml) to mount if allowed by the master configuration file by
+-the presence of the \fB<luserconf>\fP element. With it, users may mount and
+-unmount any volumes they specify that they have ownership of (in case of
+-local mounts) - the mount process is called \fBas
+-superuser\fP. On some filesystem configurations this may be a security risk so
+-user-defined volumes are not allowed by the default pam_mount.conf.xml
+-distributed with pam_mount. Luserconfigs are parsed after any volumes from
+-the global configuration file are mounted, so mounting home directories with a
+-global config and then mounting further volumes from luserconfigs is possible.
++Individual users may define additional volumes in a file by the specified
++\fIname\fP relative to their home directory. The presence of \fB<luserconf>\fP
++in the master config file enables this feature. If turned on, users may mount
++and unmount any volumes they specify and that they have ownership of (in case
++of local mounts). The mount process is executed \fBas superuser\fP. This may
++have security implications, so this feature is disabled by default.
++Luserconfigs are parsed after any volumes from the global configuration file
++have been mounted, so that first mounting home directories with a global config
++and then mounting further volumes from luserconfigs is possible.
+ .TP
+ \fB<mntoptions allow="\fP\fIoptions,...\fP\fB" />\fP
+-The <mntoptions> elements determine which options may be specified in per\-user
+-configuration files (see <luserconf>). It does not apply to the master file.
+-Specifying <mntoptions> is forbidden and ignored in per\-user configs.
+-It defaults to \fIallow="nosuid,nodev"\fP, and the default is cleared when the
+-first <mntoptions allow="..."> tag is seen. All further <mntoptions> are
+-additive, though.
++The <mntoptions> elements determine which options may be specified in <volumes>
++in per-user configuration files (see <luserconf>). It does not apply to the
++master file. Specifying <mntoptions> is forbidden and ignored in per-user
++configs. The default allowed list consists of "\fInosuid,nodev\fP", and this
++default is cleared when the first allow="..." attribute is seen by the config
++parser. All further allow="..." are additive, though.
+ .TP
+ \fB<mntoptions deny="\fP\fIoptions,...\fP\fB" />\fP
+-Any options listed in deny may not appear in the option list of per\-user
+-mounts. (Does not apply to the master file.)
++Any options listed in deny may not appear in the option list of per-user
++mounts. The default deny list is empty.
+ .TP
+ \fB<mntoptions require="\fP\fIoptions,...\fP\fB" />\fP
+-All options listed in require must appear in the option list of per\-user
+-mounts. (Does not apply to the master file.)
+-It defaults to \fInosuid,nodev\fP, and the default is cleared when the
+-first <mntoptions require="..."> tag is seen. All further <mntoptions> are
+-additive, though.
++All options listed in require must appear in the option list of per-user
++mounts. The default require list consists of "\fInosuid,nodev\fP", and like
++allow="", is cleared when first encountered by the parser, and is otherwise
++additive.
+ .TP
+ \fB<path>\fP\fIdirectories...\fP\fB</path>\fP
+ The default for the PATH environmental variable is not consistent across
+diff -wbBurN pam_mount-2.13/Makefile.am pam-mount/Makefile.am
+--- pam_mount-2.13/Makefile.am	2011-12-15 16:12:10.000000000 +0400
++++ pam-mount/Makefile.am	2012-10-11 15:28:24.848220631 +0400
+@@ -24,14 +24,11 @@
+ 	tar --use=${packer} -C ${tmpdir} -cf ${PACKAGE_NAME}-${PACKAGE_VERSION}${packext} --owner=root --group=root ${PACKAGE_NAME}-${PACKAGE_VERSION}/;
+ 	rm -Rf ${tmpdir};
+ 
+-dist-hook:
+-	tar --use=${packer} -cf ${PACKAGE_NAME}-${PACKAGE_VERSION}${packext} --owner=root --group=root ${distdir}
+-
+ DISTCHECK_CONFIGURE_FLAGS = \
+ 	--with-ssbindir='$${abs_builddir}/ssbin' \
+ 	--with-slibdir='$${abs_builddir}/slib' \
+ 	--enable-la
+ 
+ DISTCLEANFILES = ${PACKAGE_NAME}-${PACKAGE_VERSION}${packext}
+-EXTRA_DIST = autogen.sh dist/pam_mount.spec LICENSE.GPL2 LICENSE.GPL3 \
++EXTRA_DIST = LICENSE.GPL2 LICENSE.GPL3 \
+ 	LICENSE.LGPL2 LICENSE.LGPL3
+diff -wbBurN pam_mount-2.13/src/cmt-internal.h pam-mount/src/cmt-internal.h
+--- pam_mount-2.13/src/cmt-internal.h	2011-12-15 16:12:10.000000000 +0400
++++ pam-mount/src/cmt-internal.h	2012-10-11 15:28:24.851553965 +0400
+@@ -3,6 +3,7 @@
+ 
+ #include <stdbool.h>
+ #include <libHX/string.h>
++#include "libcryptmount.h"
+ 
+ /**
+  * struct ehd_mount - EHD mount info
+@@ -12,6 +13,7 @@
+  * @loop_device:	loop device that was created, if any
+  * @crypto_name:	crypto device that was created (basename only)
+  * @crypto_device:	full path to the crypto device
++ * @mountpoint:		assigned mountpoint
+  */
+ struct ehd_mount_info {
+ 	char *container;
+@@ -19,25 +21,36 @@
+ 	char *loop_device;
+ 	hxmc_t *crypto_name;
+ 	hxmc_t *crypto_device;
++	hxmc_t *mountpoint;
+ };
+ 
+ /**
+  * struct ehd_mount_request - mapping and mount request for EHD
+  * @container:		path to disk image
++ * @fstype:		filesystem type
++ * @mount_opts:		mount options for fs
+  * @mountpoint:		where to mount the volume on
+  * @fs_cipher:		cipher used for filesystem, if any. (cryptsetup name)
+  * @fs_hash:		hash used for filesystem, if any. (cryptsetup name)
+  * @key_data:		key material/password
+  * @key_size:		size of key data, in bytes
+  * @trunc_keysize:	extra cryptsetup instruction for truncation (in bytes)
++ * @loop_hook:		hook function to run after loop device setup
++ * @crypto_hook:	hook function to run after crypto device setup
++ * @hook_priv:		user data
+++ * @last_stage:		stop after setup of given component
+  * @readonly:		whether to create a readonly vfsmount
++ * @allow_discards:	allow fs trim requests
+  */
+ struct ehd_mount_request {
+-	char *container, *crypto_name, *mountpoint;
++	char *container, *crypto_name, *fstype, *mount_opts, *mountpoint;
+ 	char *fs_cipher, *fs_hash;
+ 	void *key_data;
++	ehd_hook_fn_t loop_hook, crypto_hook;
++	void *hook_priv;
+ 	unsigned int key_size, trunc_keysize;
+-	bool readonly;
++	enum ehd_mtreq_stage last_stage;
++	bool readonly, allow_discards;
+ };
+ 
+ struct ehd_crypto_ops {
+diff -wbBurN pam_mount-2.13/src/crypto.c pam-mount/src/crypto.c
+--- pam_mount-2.13/src/crypto.c	2011-12-15 16:12:10.000000000 +0400
++++ pam-mount/src/crypto.c	2012-10-11 15:28:24.851553965 +0400
+@@ -100,6 +100,9 @@
+ 	case EHD_MTINFO_LOOPDEV:
+ 		*static_cast(const char **, ptr) = mt->loop_device;
+ 		break;
++	case EHD_MTINFO_LOWERDEV:
++		*static_cast(const char **, ptr) = mt->lower_device;
++		break;
+ 	default:
+ 		return 0;
+ 	}
+@@ -129,6 +132,7 @@
+ 	rq = calloc(1, sizeof(*rq));
+ 	if (rq == NULL)
+ 		return NULL;
++	rq->last_stage = EHD_MTREQ_STAGE_MOUNT;
+ 	return rq;
+ }
+ 
+@@ -147,7 +151,7 @@
+ {
+ 	va_list args;
+ 	const void *orig;
+-	void *nv;
++	void *nv = NULL;
+ 
+ 	va_start(args, opt);
+ 	switch (opt) {
+@@ -156,6 +160,8 @@
+ 	case EHD_MTREQ_MOUNTPOINT:
+ 	case EHD_MTREQ_FS_CIPHER:
+ 	case EHD_MTREQ_FS_HASH:
++	case EHD_MTREQ_FSTYPE:
++	case EHD_MTREQ_MOUNT_OPTS:
+ 		orig = va_arg(args, const char *);
+ 		nv = HX_strdup(orig);
+ 		if (nv == NULL && orig != NULL)
+@@ -178,6 +184,21 @@
+ 	case EHD_MTREQ_READONLY:
+ 		rq->readonly = va_arg(args, unsigned int);
+ 		break;
++	case EHD_MTREQ_LOOP_HOOK:
++		rq->loop_hook = va_arg(args, ehd_hook_fn_t);
++		break;
++	case EHD_MTREQ_HOOK_PRIV:
++		rq->hook_priv = va_arg(args, void *);
++		break;
++	case EHD_MTREQ_CRYPTO_HOOK:
++		rq->crypto_hook = va_arg(args, ehd_hook_fn_t);
++		break;
++	case EHD_MTREQ_LAST_STAGE:
++		rq->last_stage = va_arg(args, enum ehd_mtreq_stage);
++		break;
++	case EHD_MTREQ_ALLOW_DISCARDS:
++		rq->allow_discards = va_arg(args, unsigned int);
++		break;
+ 	}
+ 	switch (opt) {
+ 	case EHD_MTREQ_CONTAINER:
+@@ -200,6 +221,14 @@
+ 		free(rq->fs_hash);
+ 		rq->fs_hash = nv;
+ 		break;
++	case EHD_MTREQ_FSTYPE:
++		free(rq->fstype);
++		rq->fstype = nv;
++		break;
++	case EHD_MTREQ_MOUNT_OPTS:
++		free(rq->mount_opts);
++		rq->mount_opts = nv;
++		break;
+ 	default:
+ 		break;
+ 	}
+@@ -210,25 +239,52 @@
+ 	return -errno;
+ }
+ 
++static int ehd_wait_for_file(const char *path)
++{
++	static const struct timespec delay = {0, 100000000};
++	unsigned int retries = 50;
++	struct stat sb;
++	bool done = false;
++	int ret;
++
++	/* Nicer way to do these wait loops? libudev? */
++	while (retries-- > 0) {
++		ret = stat(path, &sb);
++		if (ret == 0)
++			break;
++		ret = -errno;
++		if (ret != -ENOENT)
++			return -errno;
++		if (!done) {
++			w4rn("Waiting for %s to appear\n", path);
++			done = true;
++		}
++		fprintf(stderr, ".");
++		nanosleep(&delay, NULL);
++	}
++	if (ret == -ENOENT)
++		w4rn("Device node %s was not created\n", path);
++	return (ret == 0) ? 1 : ret;
++}
++
+ /**
+  * ehd_load - set up crypto device for an EHD container
+  * @req:	parameters for setting up the mount
+  * @mt:		EHD mount state
+  */
+-EXPORT_SYMBOL int ehd_load(const struct ehd_mount_request *req,
++EXPORT_SYMBOL int ehd_load(struct ehd_mount_request *req,
+     struct ehd_mount_info **mtp)
+ {
+ 	struct stat sb;
+ 	int saved_errno, ret;
+ 	struct ehd_mount_info *mt;
+ 
+-	*mtp = mt = malloc(sizeof(*mt));
+ 	if (stat(req->container, &sb) < 0) {
+ 		l0g("Could not stat %s: %s\n", req->container, strerror(errno));
+ 		return -errno;
+ 	}
+ 
+-	*mtp = mt = malloc(sizeof(*mt));
++	*mtp = mt = calloc(1, sizeof(*mt));
+ 	if (mt == NULL)
+ 		goto out_err;
+ 	if ((mt->container = HX_strdup(req->container)) == NULL)
+@@ -252,7 +308,19 @@
+ 			w4rn("Using %s\n", mt->loop_device);
+ 			mt->lower_device = mt->loop_device;
+ 		}
++
++		ret = ehd_wait_for_file(mt->loop_device);
++		if (ret <= 0)
++			goto out_ser;
++	}
++
++	if (req->loop_hook != NULL) {
++		ret = req->loop_hook(req, mt, req->hook_priv);
++		if (ret <= 0)
++			goto out_ser;
+ 	}
++	if (req->last_stage == EHD_MTREQ_STAGE_LOOP)
++		return 1;
+ 
+ #ifdef HAVE_LIBCRYPTSETUP
+ 	ret = ehd_dmcrypt_ops.load(req, mt);
+@@ -264,6 +332,18 @@
+ 	if (ret <= 0)
+ 		goto out_ser;
+ 
++	ret = ehd_wait_for_file(mt->crypto_device);
++	if (ret <= 0)
++		goto out_ser;
++
++	if (req->crypto_hook != NULL) {
++		ret = req->crypto_hook(req, mt, req->hook_priv);
++		if (ret <= 0)
++			goto out_ser;
++	}
++	if (req->last_stage == EHD_MTREQ_STAGE_CRYPTO)
++		return 1;
++
+ 	return ret;
+ 
+  out_err:
+@@ -294,6 +374,7 @@
+ {
+ 	int ret, ret2;
+ 
++	if (mt->crypto_device != NULL) {
+ #ifdef HAVE_LIBCRYPTSETUP
+ 	ret = ehd_dmcrypt_ops.unload(mt);
+ #elif defined(HAVE_DEV_CGDVAR_H)
+@@ -301,6 +382,9 @@
+ #else
+ 	ret = -EOPNOTSUPP;
+ #endif
++	} else {
++		ret = 1;
++	}
+ 	/* Try to free loop device even if cryptsetup remove failed */
+ 	if (mt->loop_device != NULL) {
+ 		ret2 = ehd_loop_release(mt->loop_device);
+@@ -445,7 +529,7 @@
+ {
+ 	va_list args;
+ 	const void *orig;
+-	void *nv;
++	void *nv = NULL;
+ 
+ 	va_start(args, opt);
+ 	switch (opt) {
+diff -wbBurN pam_mount-2.13/src/crypto-dmc.c pam-mount/src/crypto-dmc.c
+--- pam_mount-2.13/src/crypto-dmc.c	2011-12-15 16:12:10.000000000 +0400
++++ pam-mount/src/crypto-dmc.c	2012-10-11 15:28:24.851553965 +0400
+@@ -97,6 +97,14 @@
+ 	}
+ 	if (req->readonly)
+ 		flags |= CRYPT_ACTIVATE_READONLY;
++	if (req->allow_discards) {
++#ifdef CRYPT_ACTIVATE_ALLOW_DISCARDS
++		flags |= CRYPT_ACTIVATE_ALLOW_DISCARDS;
++#else
++		fprintf(stderr, "CRYPT_ACTIVATE_ALLOW_DISCARDS requested, "
++		        "but not provided by your libcryptsetup.\n");
++#endif
++	}
+ 
+ 	ret = crypt_load(cd, CRYPT_LUKS1, NULL);
+ 	if (ret == 0) {
+diff -wbBurN pam_mount-2.13/src/ehd.c pam-mount/src/ehd.c
+--- pam_mount-2.13/src/ehd.c	2011-12-15 16:12:10.000000000 +0400
++++ pam-mount/src/ehd.c	2012-10-11 15:28:24.851553965 +0400
+@@ -41,8 +41,6 @@
+ /**
+  * @size:		container size in bytes
+  * @path:		store container at this path
+- * @loop_dev:		loop device in use (may be %NULL)
+- * @device:		pointer to either @path or @loop_dev as crypto demands
+  * @fstype:		initialize container with this filesystem
+  * @cipher:		cipher specification as understood by cryptsetup
+  * @keybits:		block size, as understood by cryptsetup and the cipher
+@@ -51,7 +49,7 @@
+  */
+ struct container_ctl {
+ 	unsigned long long size;
+-	char *path, *loop_dev, *device, *fstype, *cipher, *hash, *user;
++	char *path, *fstype, *cipher, *hash, *user;
+ 	unsigned int keybits, skip_random, uid;
+ 	bool blkdev;
+ };
+@@ -61,11 +59,12 @@
+  * @force_level:	number of "-f"s passed
+  * @interactive:	if stdin is a tty
+  * @cont:		container control substructure
+- * @fskey:		fskey control substructure
++ * @password:		master key password
+  */
+ struct ehd_ctl {
+ 	unsigned int force_level;
+ 	struct container_ctl cont;
++	const char *password;
+ 	bool interactive;
+ };
+ 
+@@ -239,16 +238,23 @@
+ 	return ret;
+ }
+ 
+-static bool ehd_mkfs(const struct ehd_ctl *pg, const hxmc_t *crypto_device)
++static bool ehd_mkfs(struct ehd_mount_request *rq,
++    struct ehd_mount_info *mtinfo, void *priv)
+ {
++	const struct ehd_ctl *pg = priv;
+ 	const struct container_ctl *cont = &pg->cont;
++	const char *crypto_device = NULL;
++	int ret;
++
++	ehd_mtinfo_get(mtinfo, EHD_MTINFO_CRYPTODEV, &crypto_device);
++	if (!cont->skip_random)
++		ehd_xfer2(crypto_device, cont->size);
+ 
+ 	hxmc_t *fsprog = HXmc_strinit("mkfs.");
+ 	HXmc_strcat(&fsprog, cont->fstype);
+ 	const char *const argv[] = {fsprog, crypto_device, NULL};
+-	int ret;
+ 
+-	fprintf(stderr, "-- Calling %s\n", fsprog);
++	fprintf(stderr, "-- Calling %s %s\n", fsprog, crypto_device);
+ 	if ((ret = HXproc_run_sync(argv, HXPROC_VERBOSE)) < 0 || ret != 0)
+ 		fprintf(stderr, "%s failed with run_sync status %d\n",
+ 		        fsprog, ret);
+@@ -273,24 +279,34 @@
+ 	HX_strlcpy(cipher_mode, p, cm_size);
+ }
+ 
+-static int ehd_init_volume_luks(struct ehd_ctl *pg, const char *password)
++static int ehd_init_volume_luks(struct ehd_mount_request *rq,
++    struct ehd_mount_info *mtinfo, void *priv)
+ {
+ 	/*
+ 	 * Pick what? WP specifies that XTS has a wider support range than
+ 	 * ESSIV. But XTS is also double complexity due to the double key,
+ 	 * without adding anything of value.
+ 	 */
++	struct ehd_ctl *pg = priv;
+ 	struct container_ctl *cont = &pg->cont;
+ 	char cipher[32], cipher_mode[32];
+ 	struct crypt_params_luks1 format_params = {.hash = cont->hash};
+ 	struct crypt_device *cd = NULL;
++	const char *lower_dev = NULL;
+ 	int ret;
+ 
++	BUILD_BUG_ON(!__builtin_types_compatible_p(
++		__typeof__(&ehd_init_volume_luks), ehd_hook_fn_t));
++
+ 	ehd_parse_name(cont->cipher, cipher, sizeof(cipher),
+ 	               cipher_mode, sizeof(cipher_mode));
+-	ret = crypt_init(&cd, cont->device);
++	ret = ehd_mtinfo_get(mtinfo, EHD_MTINFO_LOWERDEV, &lower_dev);
++	if (ret <= 0 || lower_dev == NULL)
++		goto out;
++	ret = crypt_init(&cd, lower_dev);
+ 	if (ret < 0) {
+-		fprintf(stderr, "crypt_init: %s\n", strerror(-ret));
++		fprintf(stderr, "crypt_init: %s: %s\n",
++		        lower_dev, strerror(-ret));
+ 		goto out;
+ 	}
+ 	ret = crypt_format(cd, CRYPT_LUKS1, cipher, cipher_mode, NULL, NULL,
+@@ -300,7 +316,7 @@
+ 		goto out2;
+ 	}
+ 	ret = crypt_keyslot_add_by_volume_key(cd, CRYPT_ANY_SLOT, NULL, 0,
+-	      password, strlen(password));
++	      pg->password, strlen(pg->password));
+ 	if (ret < 0) {
+ 		fprintf(stderr, "add_by_volume_key: %s\n", strerror(-ret));
+ 		goto out2;
+@@ -315,70 +331,53 @@
+ /**
+  * ehd_init_volume - set up loop device association if necessary
+  */
+-static bool ehd_init_volume(struct ehd_ctl *pg, const char *password)
++static bool ehd_init_volume(struct ehd_ctl *pg)
+ {
+ 	struct container_ctl *cont = &pg->cont;
+ 	struct ehd_mount_info *mount_info;
+ 	struct ehd_mount_request *mount_request;
+-	bool f_ret = false;
+ 	int ret;
+ 
+-	if (cont->blkdev) {
+-		cont->device = cont->path;
+-	} else {
+-		/*
+-		 * Need manual setup of loop device here, since ehd_load
+-		 * always does a crypt mount too, which we do not have yet.
+-		 */
+-		ret = ehd_loop_setup(cont->path, &cont->loop_dev, EHD_LOSETUP_RW);
+-		if (ret == 0) {
+-			fprintf(stderr, "loop_setup: error: no free loop "
+-			        "devices\n");
+-			return false;
+-		} else if (ret < 0) {
+-			fprintf(stderr, "loop_setup: error: %s\n",
+-			        strerror(-ret));
+-			return false;
+-		}
+-		cont->device = cont->loop_dev;
+-	}
+-
+-	ehd_init_volume_luks(pg, password);
+-	ret = ehd_loop_release(cont->device);
+-	if (ret <= 0)
+-		fprintf(stderr, "loop_release: warning: %s\n", strerror(-ret));
+-
+ 	mount_request = ehd_mtreq_new();
+ 	if (mount_request == NULL)
+ 		return -errno;
+ 	ret = ehd_mtreq_set(mount_request, EHD_MTREQ_CONTAINER, cont->path);
+ 	if (ret < 0)
+ 		goto out;
+-	ret = ehd_mtreq_set(mount_request, EHD_MTREQ_KEY_SIZE, strlen(password));
++	ret = ehd_mtreq_set(mount_request, EHD_MTREQ_KEY_SIZE,
++	                    strlen(pg->password));
+ 	if (ret < 0)
+ 		goto out;
+-	ret = ehd_mtreq_set(mount_request, EHD_MTREQ_KEY_DATA, password);
++	ret = ehd_mtreq_set(mount_request, EHD_MTREQ_KEY_DATA, pg->password);
+ 	if (ret < 0)
+ 		goto out;
+ 	ret = ehd_mtreq_set(mount_request, EHD_MTREQ_READONLY, EHD_LOSETUP_RW);
+ 	if (ret < 0)
+ 		goto out;
++	ret = ehd_mtreq_set(mount_request, EHD_MTREQ_LOOP_HOOK,
++	                    ehd_init_volume_luks);
++	if (ret < 0)
++		goto out;
++	ret = ehd_mtreq_set(mount_request, EHD_MTREQ_HOOK_PRIV, pg);
++	if (ret < 0)
++		goto out;
++	ret = ehd_mtreq_set(mount_request, EHD_MTREQ_CRYPTO_HOOK, ehd_mkfs);
++	if (ret < 0)
++		goto out;
++	/* We don't need to mount it */
++	ret = ehd_mtreq_set(mount_request, EHD_MTREQ_LAST_STAGE,
++	                    EHD_MTREQ_STAGE_CRYPTO);
++	if (ret < 0)
++		goto out;
+ 
+-	if (ehd_load(mount_request, &mount_info) > 0) {
+-		const char *crypto_device = NULL;
+-		ehd_mtinfo_get(mount_info, EHD_MTINFO_CRYPTODEV, &crypto_device);
+-		if (!cont->skip_random)
+-			ehd_xfer2(crypto_device, cont->size);
+-		f_ret = ehd_mkfs(pg, crypto_device);
++	ret = ehd_load(mount_request, &mount_info);
++	if (ret > 0) {
+ 		ret   = ehd_unload(mount_info);
+-		/* If mkfs failed, use its code. */
+ 		ehd_mtinfo_free(mount_info);
+-		if (f_ret)
+-			f_ret = ret > 0;
+ 	}
+  out:
+ 	ehd_mtreq_free(mount_request);
+-	return f_ret;
++	return ret > 0;
+ }
+ 
+ static void ehd_final_printout(const struct ehd_ctl *pg)
+@@ -463,16 +462,15 @@
+ 			HX_getl(&tmp, stdin);
+ 			HX_chomp(tmp);
+ 			s = strtoul(tmp, NULL, 0);
++			s <<= 20; /* megabytes -> bytes */
+ 		} while (*tmp == '\0' || s == 0);
+ 		cont->size = s;
+ 	}
+ 
+-	if (strcmp(cont->fstype, "xfs") == 0 && cont->size < 16)
++	if (strcmp(cont->fstype, "xfs") == 0 && cont->size < 16*1048576)
+ 		fprintf(stderr, "Warning: XFS volumes need to be "
+ 		        "at least 16 MB\n");
+ 
+-	cont->size <<= 20; /* megabytes -> bytes */
+-
+ 	if (cont->cipher == NULL) {
+ 		cont->cipher = HX_strdup(ehd_default_dmcipher);
+ 		if (cont->keybits == 0)
+@@ -544,6 +542,7 @@
+ 	    HXOPT_ERR_SUCCESS)
+ 		return false;
+ 
++	cont->size <<= 20; /* mb -> b */
+ 	pg->interactive = isatty(fileno(stdin));
+ 	return ehd_fill_options_container(pg);
+ }
+@@ -574,8 +573,8 @@
+ 		goto out;
+ 	}
+ 
+-	ret = ehd_init_volume(pg, password != NULL ? password : "") ?
+-	      EXIT_SUCCESS : EXIT_FAILURE;
++	pg->password = (password != NULL) ? password : "";
++	ret = ehd_init_volume(pg) ? EXIT_SUCCESS : EXIT_FAILURE;
+ 	if (ret == EXIT_SUCCESS)
+ 		ehd_final_printout(pg);
+ 
+diff -wbBurN pam_mount-2.13/src/ismnt.c pam-mount/src/ismnt.c
+--- pam_mount-2.13/src/ismnt.c	2011-12-15 16:12:10.000000000 +0400
++++ pam-mount/src/ismnt.c	1970-01-01 03:00:00.000000000 +0300
+@@ -1,45 +0,0 @@
+-/*
+- *	Internal diagnostic tool to debug pmt mtab.c
+- *	Copyright © Jan Engelhardt, 2009
+- *
+- *	This file is part of pam_mount; you can redistribute it and/or
+- *	modify it under the terms of the GNU Lesser General Public License
+- *	as published by the Free Software Foundation; either version 2.1
+- *	of the License, or (at your option) any later version.
+- */
+-#include <errno.h>
+-#include <stdio.h>
+-#include <stdlib.h>
+-#include <string.h>
+-#include <libHX/init.h>
+-#include "pam_mount.h"
+-
+-int main(int argc, const char **argv)
+-{
+-	int ret;
+-
+-	ret = HX_init();
+-	if (ret <= 0) {
+-		fprintf(stderr, "HX_init: %s\n", strerror(errno));
+-		abort();
+-	}
+-
+-	if (argc < 3) {
+-		fprintf(stderr, "Usage: %s dev mountpoint\n", *argv);
+-		return EXIT_FAILURE;
+-	}
+-
+-	ret = pmt_cmtab_mounted(argv[1], argv[2]);
+-	if (ret < 0) {
+-		fprintf(stderr, "%s\n", strerror(-ret));
+-		ret = 2;
+-	} else if (ret == 0) {
+-		printf("Not mounted\n");
+-		ret = EXIT_FAILURE;
+-	} else {
+-		printf("Mounted\n");
+-		ret = EXIT_SUCCESS;
+-	}
+-	HX_exit();
+-	return ret;
+-}
+diff -wbBurN pam_mount-2.13/src/libcryptmount.h pam-mount/src/libcryptmount.h
+--- pam_mount-2.13/src/libcryptmount.h	2011-12-15 16:12:10.000000000 +0400
++++ pam-mount/src/libcryptmount.h	2012-10-11 15:28:24.851553965 +0400
+@@ -69,6 +69,13 @@
+ 	EHD_MTREQ_TRUNC_KEYSIZE,
+ 	EHD_MTREQ_READONLY,
+ 	EHD_MTREQ_CRYPTONAME,
++	EHD_MTREQ_LOOP_HOOK,
++	EHD_MTREQ_HOOK_PRIV,
++	EHD_MTREQ_CRYPTO_HOOK,
++	EHD_MTREQ_LAST_STAGE,
++	EHD_MTREQ_FSTYPE,
++	EHD_MTREQ_MOUNT_OPTS,
++	EHD_MTREQ_ALLOW_DISCARDS,
+ };
+ 
+ enum ehd_mtinfo_opt {
+@@ -76,11 +83,22 @@
+ 	EHD_MTINFO_CRYPTONAME,
+ 	EHD_MTINFO_CRYPTODEV,
+ 	EHD_MTINFO_LOOPDEV,
++	EHD_MTINFO_LOWERDEV,
++};
++
++enum ehd_mtreq_stage {
++	EHD_MTREQ_STAGE_NONE,
++	EHD_MTREQ_STAGE_LOOP,
++	EHD_MTREQ_STAGE_CRYPTO,
++	EHD_MTREQ_STAGE_MOUNT,
+ };
+ 
+ struct ehd_mount_info;
+ struct ehd_mount_request;
+ 
++typedef int (*ehd_hook_fn_t)(struct ehd_mount_request *,
++	struct ehd_mount_info *, void *);
++
+ extern int cryptmount_init(void);
+ extern void cryptmount_exit(void);
+ 
+@@ -91,7 +109,7 @@
+ extern int ehd_mtinfo_get(struct ehd_mount_info *, enum ehd_mtinfo_opt, void *);
+ extern void ehd_mtinfo_free(struct ehd_mount_info *);
+ 
+-extern int ehd_load(const struct ehd_mount_request *, struct ehd_mount_info **);
++extern int ehd_load(struct ehd_mount_request *, struct ehd_mount_info **);
+ extern int ehd_unload(struct ehd_mount_info *);
+ extern int ehd_is_luks(const char *, bool);
+ 
+diff -wbBurN pam_mount-2.13/src/Makefile.am pam-mount/src/Makefile.am
+--- pam_mount-2.13/src/Makefile.am	2011-12-15 16:12:10.000000000 +0400
++++ pam-mount/src/Makefile.am	2012-10-11 15:28:24.851553965 +0400
+@@ -8,9 +8,11 @@
+ moduledir		= @PAM_MODDIR@
+ module_LTLIBRARIES	= pam_mount.la
+ sbin_PROGRAMS		= pmvarrun
++if HAVE_LIBCRYPTSETUP
+ sbin_PROGRAMS		+= pmt-ehd
++endif
+ ssbin_PROGRAMS		= mount.crypt
+-noinst_PROGRAMS		= autoloop ismnt
++noinst_PROGRAMS		= autoloop
+ noinst_SCRIPTS 		= umount.crypt
+ 
+ lib_LTLIBRARIES		= libcryptmount.la
+@@ -64,10 +66,6 @@
+ autoloop_SOURCES	= autoloop.c
+ autoloop_LDADD		= libcryptmount.la ${libHX_LIBS}
+ 
+-ismnt_SOURCES		= ismnt.c log.c
+-ismnt_CFLAGS		= ${AM_CFLAGS}
+-ismnt_LDADD		= libpmt_mtab.la
+-
+ #
+ # mount helpers
+ #
+@@ -75,7 +73,7 @@
+ mount_crypt_LDADD	= libcryptmount.la libpmt_mtab.la ${libHX_LIBS}
+ 
+ pmt_ehd_SOURCES		= ehd.c bdev.c misc.c spawn.c
+-pmt_ehd_LDADD		= libcryptmount.la ${libHX_LIBS}
++pmt_ehd_LDADD		= libcryptmount.la ${libHX_LIBS} ${libcryptsetup_LIBS}
+ 
+ #
+ # runtime helpers
+@@ -83,10 +81,10 @@
+ pmvarrun_SOURCES = pmvarrun.c
+ pmvarrun_LDADD   = libcryptmount.la ${libHX_LIBS}
+ 
+-EXTRA_DIST = misc.h mount.h pam_mount.h readconfig.h spawn.h
++EXTRA_DIST = cmt-internal.h libcryptmount.h pam_mount.h libcryptmount.map
+ 
+ umount.crypt${EXEEXT}: mount.crypt${EXEEXT}
+-	-${LN_S} $^ $@;
++	-${LN_S} -f $^ $@;
+ 
+ if !KEEP_LA
+ install-data-hook:
+diff -wbBurN pam_mount-2.13/src/misc.c pam-mount/src/misc.c
+--- pam_mount-2.13/src/misc.c	2011-12-15 16:12:10.000000000 +0400
++++ pam-mount/src/misc.c	2012-10-11 15:28:24.851553965 +0400
+@@ -28,18 +28,6 @@
+ struct HXbtree;
+ 
+ /**
+- * misc_dump_id - print user IDs
+- */
+-void misc_dump_id(const char *where)
+-{
+-	w4rn("%s: (ruid/rgid=%u/%u, e=%u/%u)\n", where,
+-	     static_cast(unsigned int, getuid()),
+-	     static_cast(unsigned int, getgid()),
+-	     static_cast(unsigned int, geteuid()),
+-	     static_cast(unsigned int, getegid()));
+-}
+-
+-/**
+  * pmt_fileop_exists -
+  * @file:	file to check
+  *
+@@ -47,7 +35,7 @@
+  * non-zero if that was successful. Returns 0 for error. %errno will be set
+  * in case of error.
+  */
+-int pmt_fileop_exists(const char *file)
++bool pmt_fileop_exists(const char *file)
+ {
+ 	struct stat sb;
+ 	assert(file != NULL);
+@@ -61,7 +49,7 @@
+  * Check if a path is a regular file and return positive non-zero if that was
+  * successful. Returns 0 for error. %errno will be set in case of error.
+  */
+-int pmt_fileop_isreg(const char *path)
++bool pmt_fileop_isreg(const char *path)
+ {
+ 	struct stat sb;
+ 
+@@ -75,11 +63,10 @@
+  * @user:	user to check for
+  * @file:	file to check
+  *
+- * Checks whether @user owns @file. Returns positive non-zero if this is the
+- * case, otherwise zero. If an error occurred, zero is returned and %errno
+- * is set. (For the success case, %errno is undefined.)
++ * Checks whether @user owns @file. If an error occurred, false is returned and
++ * %errno is set. (For the success case, %errno is undefined.)
+  */
+-int pmt_fileop_owns(const char *user, const char *file)
++bool pmt_fileop_owns(const char *user, const char *file)
+ {
+ 	struct stat filestat;
+ 	struct passwd *userinfo;
+@@ -90,12 +77,12 @@
+ 	if ((userinfo = getpwnam(user)) == NULL) {
+ 		l0g("user %s could not be translated to UID\n",
+ 		    user);
+-		return 0;
++		return false;
+ 	}
+ 
+ 	if (stat(file, &filestat) != 0) {
+ 		w4rn("file %s could not be stat'ed\n", file);
+-		return 0;
++		return false;
+ 	}
+ 
+ 	return filestat.st_uid == userinfo->pw_uid &&
+diff -wbBurN pam_mount-2.13/src/mount.c pam-mount/src/mount.c
+--- pam_mount-2.13/src/mount.c	2011-12-15 16:12:10.000000000 +0400
++++ pam-mount/src/mount.c	2012-10-11 15:28:24.851553965 +0400
+@@ -295,6 +295,7 @@
+ 	dtmp = HXmc_strinit(d);
+ 	if (dtmp == NULL || (!is_file && HXmc_strcat(&dtmp, "/") == NULL)) {
+ 		l0g("HXmc_strinit: %s\n", strerror(errno));
++		HXmc_free(dtmp);
+ 		return false;
+ 	}
+ 
+@@ -350,6 +351,7 @@
+ 		w4rn("chown %s -> %ld:%ld\n", dtmp,
+ 		     static_cast(long, pe->pw_uid),
+ 		     static_cast(long, pe->pw_gid));
++		*last = '/';
+ 	}
+ 	HXmc_free(dtmp);
+ 
+@@ -435,10 +437,11 @@
+ 		ret = proc.p_exited && proc.p_status == 0;
+ 
+  out:
+-	if (config->mkmntpoint && config->rmdir_mntpt && vpt->created_mntpt)
++	if (vpt->created_mntpt && config->rmdir_mntpt)
+ 		if (rmdir(vpt->mountpoint) < 0)
+ 			/* non-fatal, but warn */
+-			w4rn("could not remove %s\n", vpt->mountpoint);
++			w4rn("could not remove %s: %s\n", vpt->mountpoint,
++			     strerror(errno));
+ 	return ret;
+ }
+ 
+@@ -577,9 +580,14 @@
+ 	if (ret < 0)
+ 		goto out;
+ 	ret = ehd_keydec_run(dp, result);
+-	if (ret != EHD_KEYDEC_SUCCESS)
+-		l0g("ehd_keydec_run: %s\n",
+-		    ehd_keydec_strerror(ret));
++	if (ret == EHD_KEYDEC_NODIGEST)
++		l0g("ehd_keydec_run: %s: \"%s\"\n", ehd_keydec_strerror(ret),
++		    vol->fs_key_hash);
++	else if (ret == EHD_KEYDEC_NOCIPHER)
++		l0g("ehd_keydec_run: %s: \"%s\"\n", ehd_keydec_strerror(ret),
++		    vol->fs_key_cipher);
++	else if (ret != EHD_KEYDEC_SUCCESS)
++		l0g("ehd_keydec_run: %s\n", ehd_keydec_strerror(ret));
+  out:
+ 	ehd_kdreq_free(dp);
+ 	return ret;
+@@ -601,7 +609,7 @@
+ 	struct HXdeque *argv;
+ 	struct HXproc proc;
+ 	const char *mount_user;
+-	hxmc_t *ll_password;
++	hxmc_t *ll_password = NULL;
+ 	int ret;
+ 
+ 	assert(vinfo != NULL);
+@@ -642,8 +650,11 @@
+ 		 * any openssl decryption. Without %CMD_CRYPTMOUNT however,
+ 		 * we have to do this ourselves.
+ 		 */
++		w4rn("Not a crypto-type volume. Will decode OpenSSL key.\n");
+ 		ret = pmt_decrypt_keyfile(vpt, password, &ll_password);
+ 	} else {
++		w4rn("This is a crypto-type volume. "
++		     "Key decoding deferred to mount.crypt.\n");
+ 		ll_password = HXmc_strinit(password);
+ 	}
+ 	if (ll_password == NULL)
+@@ -698,7 +709,8 @@
+ 		return 0;
+ 	}
+ 
+-	if (!proc.p_exited || proc.p_status != 0) {
++	if ((!proc.p_exited || proc.p_status != 0) &&
++	    vpt->created_mntpt && config->rmdir_mntpt) {
+ 		/*
+ 		 * Remove mountpoint if mount failed, to flag unavailability
+ 		 * of service (e.g. when mntpt is the user's home directory).
+diff -wbBurN pam_mount-2.13/src/mtab.c pam-mount/src/mtab.c
+--- pam_mount-2.13/src/mtab.c	2011-12-15 16:12:10.000000000 +0400
++++ pam-mount/src/mtab.c	2012-10-11 15:28:24.851553965 +0400
+@@ -35,6 +35,7 @@
+ #include <libHX/defs.h>
+ #include <libHX/io.h>
+ #include <libHX/string.h>
++#include "cmt-internal.h"
+ #include "libcryptmount.h"
+ #include "pam_mount.h"
+ 
+@@ -191,28 +192,27 @@
+ 	return ret;
+ }
+ 
+-int pmt_cmtab_add(const char *mountpoint, const char *container,
+-    const char *loop_device, const char *crypto_device)
++int pmt_cmtab_add(struct ehd_mount_info *mt)
+ {
++	const char *loop_device, *crypto_device;
+ 	hxmc_t *line;
+ 	int ret;
+ 
+-	if (container == NULL)
++	if (mt->container == NULL)
+ 		return -EINVAL;
+-	if (loop_device == NULL)
+-		loop_device = "-";
+-	if (crypto_device == NULL)
+-		crypto_device = "-";
++	loop_device = (mt->loop_device == NULL) ? "-" : mt->loop_device;
++	crypto_device = (mt->crypto_device == NULL) ? "-" : mt->crypto_device;
+ 
+ 	/* Preallocate just the normal size */
+-	line = HXmc_meminit(NULL, strlen(mountpoint) + strlen(container) +
+-	       strlen(loop_device) + strlen(crypto_device) + 5);
++	line = HXmc_meminit(NULL, strlen(mt->mountpoint) +
++	       strlen(mt->container) + strlen(loop_device) +
++	       strlen(crypto_device) + 5);
+ 	if (line == NULL)
+ 		return -errno;
+ 
+-	mt_esccat(&line, mountpoint);
++	mt_esccat(&line, mt->mountpoint);
+ 	HXmc_strcat(&line, "\t");
+-	mt_esccat(&line, container);
++	mt_esccat(&line, mt->container);
+ 	HXmc_strcat(&line, "\t");
+ 	mt_esccat(&line, loop_device);
+ 	HXmc_strcat(&line, "\t");
+diff -wbBurN pam_mount-2.13/src/mtcrypt.c pam-mount/src/mtcrypt.c
+--- pam_mount-2.13/src/mtcrypt.c	2011-12-15 16:12:10.000000000 +0400
++++ pam-mount/src/mtcrypt.c	2012-10-11 15:28:24.851553965 +0400
+@@ -44,6 +44,7 @@
+  * @blkdev:		true if @container is a block device
+  * @fsck:		true if fsck should be performed
+  * @remount:		issue a remount
++ * @allow_discards:	allow fs trim requests
+  */
+ struct mount_options {
+ 	hxmc_t *object, *container, *mountpoint;
+@@ -53,11 +54,11 @@
+ 	hxmc_t *fsk_password, *extra_opts, *crypto_device;
+ 	char *loop_device;
+ 	unsigned int no_update, readonly, trunc_keysize;
+-	int dm_timeout;
+ 	bool is_cont;
+ 	bool blkdev;
+ 	bool fsck;
+ 	bool remount;
++	bool allow_discards;
+ };
+ 
+ /**
+@@ -120,9 +121,7 @@
+ 			else if (ret < EHD_SECURITY_UNSPEC)
+ 				fprintf(stderr, "Hash \"%s\" is considered "
+ 				        "insecure.\n", value);
+-		} else if (strcmp(key, "dm-timeout") == 0)
+-			mo->dm_timeout = strtoul(value, NULL, 0);
+-		else if (strcmp(key, "fstype") == 0)
++		} else if (strcmp(key, "fstype") == 0)
+ 			mo->fstype = value;
+ 		else if (strcmp(key, "keyfile") == 0)
+ 			mo->fsk_file = value;
+@@ -165,6 +164,8 @@
+ 			mo->readonly = EHD_LOSETUP_RO;
+ 		else if (strcmp(key, "rw") == 0)
+ 			mo->readonly = EHD_LOSETUP_RW;
++		else if (strcmp(key, "discard") == 0)
++			mo->allow_discards = true;
+ 	}
+ 
+ 	if (*passthru != '\0') {
+@@ -397,6 +398,26 @@
+ 	return ret;
+ }
+ 
++static int mtcr_fsck(struct ehd_mount_request *rq,
++    struct ehd_mount_info *mtinfo)
++{
++	const char *const fsck_args[4] =
++		{"fsck", "-p", mtinfo->crypto_device, NULL};
++	int ret;
++
++	arglist_llog(fsck_args);
++	ret = HXproc_run_sync(fsck_args, HXPROC_VERBOSE);
++	/*
++	 * Return codes higher than 1 indicate that manual intervention
++	 * is required, therefore abort the mount/login.
++	 * Lower than 0: internal error (e.g. fork).
++	 */
++	if (ret != 0 && ret != 1)
++		fprintf(stderr, "Automatic fsck failed, manual intervention "
++		        "required, run_status/exit status %d\n", ret);
++	return ret == 0;
++}
++
+ /**
+  * mtcr_mount
+  *
+@@ -405,8 +426,6 @@
+ static int mtcr_mount(struct mount_options *opt)
+ {
+ 	const char *mount_args[8];
+-	const char *fsck_args[4];
+-	struct stat sb;
+ 	hxmc_t *key = NULL;
+ 	int ret, argk;
+ 	struct ehd_mount_info *mount_info;
+@@ -433,6 +452,10 @@
+ 	ret = ehd_mtreq_set(mount_request, EHD_MTREQ_READONLY, opt->readonly);
+ 	if (ret < 0)
+ 		goto out_r;
++	ret = ehd_mtreq_set(mount_request, EHD_MTREQ_ALLOW_DISCARDS,
++	      opt->allow_discards);
++	if (ret < 0)
++		goto out_r;
+ 	/* Hack for CRYPT_PLAIN: default to 256 */
+ 	trunc_keysize = 256 / CHAR_BIT;
+ 	ret = ehd_mtreq_set(mount_request, EHD_MTREQ_TRUNC_KEYSIZE, trunc_keysize);
+@@ -482,6 +505,12 @@
+ 		if (ret < 0)
+ 			goto out_r;
+ 	}
++	if (opt->fsck) {
++		ret = ehd_mtreq_set(mount_request, EHD_MTREQ_CRYPTO_HOOK,
++		      mtcr_fsck);
++		if (ret < 0)
++			goto out_r;
++	}
+ 
+ 	w4rn("keysize=%u trunc_keysize=%u\n", key_size, trunc_keysize);
+ 	if ((ret = ehd_load(mount_request, &mount_info)) < 0) {
+@@ -490,44 +519,6 @@
+ 	} else if (ret == 0) {
+ 		goto out_z;
+ 	}
+-	if (mount_info->crypto_device == NULL) {
+-		if (mtcr_debug)
+-			fprintf(stderr, "No crypto device assigned\n");
+-		ehd_unload(mount_info);
+-		ehd_mtinfo_free(mount_info);
+-		goto out_z;
+-	}
+-
+-	opt->dm_timeout *= 3;
+-	while (stat(mount_info->crypto_device, &sb) < 0 && errno == ENOENT &&
+-	    opt->dm_timeout-- > 0)
+-		usleep(333333);
+-
+-	if (opt->fsck) {
+-		argk = 0;
+-		fsck_args[argk++] = "fsck";
+-		fsck_args[argk++] = "-p";
+-		fsck_args[argk++] = mount_info->crypto_device;
+-		fsck_args[argk] = NULL;
+-		assert(argk < ARRAY_SIZE(fsck_args));
+-
+-		arglist_llog(fsck_args);
+-		ret = HXproc_run_sync(fsck_args, HXPROC_VERBOSE);
+-
+-		/*
+-		 * Return codes higher than 1 indicate that manual intervention
+-		 * is required, therefore abort the mount/login.
+-		 * Lower than 0: internal error (e.g. fork).
+-		 */
+-		if (ret != 0 && ret != 1) {
+-			fprintf(stderr, "Automatic fsck failed, manual "
+-			        "intervention required, run_sync status %d\n",
+-			        ret);
+-			ehd_unload(mount_info);
+-			ehd_mtinfo_free(mount_info);
+-			goto out_z;
+-		}
+-	}
+ 
+ 	/* candidate for replacement by some libmount calls, I guess. */
+ 	argk = 0;
+@@ -550,19 +541,24 @@
+ 		fprintf(stderr, "mount failed with run_sync status %d\n", ret);
+ 		ehd_unload(mount_info);
+ 		ret = 0;
+-	} else if ((ret = pmt_cmtab_add(opt->mountpoint,
+-	    mount_info->container, mount_info->loop_device,
+-	    mount_info->crypto_device)) <= 0) {
++		goto out_i;
++	}
++	ret = HX_realpath(&mount_info->mountpoint, opt->mountpoint,
++	      HX_REALPATH_DEFAULT | HX_REALPATH_ABSOLUTE);
++	if (ret <= 0)
++		goto out_i;
++	if ((ret = pmt_cmtab_add(mount_info)) <= 0) {
+ 		fprintf(stderr, "pmt_cmtab_add: %s\n", strerror(errno));
+ 		/* ignore error on cmtab - let user have his crypto */
+ 	} else if (opt->no_update) {
+ 		/* awesome logic */;
+ 	} else {
+-		pmt_smtab_add(mount_info->container, opt->mountpoint,
++		pmt_smtab_add(mount_info->container, mount_info->mountpoint,
+ 			"crypt", (opt->extra_opts != NULL) ?
+ 			opt->extra_opts : "defaults");
+ 	}
+ 
++ out_i:
+ 	ehd_mtinfo_free(mount_info);
+ 	return ret;
+ 
+diff -wbBurN pam_mount-2.13/src/pam_mount.c pam-mount/src/pam_mount.c
+--- pam_mount-2.13/src/pam_mount.c	2011-12-15 16:12:10.000000000 +0400
++++ pam-mount/src/pam_mount.c	2012-10-11 15:28:24.851553965 +0400
+@@ -526,6 +526,20 @@
+ 	return ret;
+ }
+ 
++static void assert_root(void)
++{
++	/*
++	 * I know checking for 0 is rather unflexible, but it does - so far -
++	 * account for all the bugreports involving insufficient permissions.
++	 */
++	if (geteuid() == 0)
++		return;
++	l0g("*** PAM_MOUNT WAS INVOKED WITH INSUFFICIENT PRIVILEGES. (euid=%ld)\n",
++	    static_cast(long, geteuid()));
++	l0g("*** THIS IS A BUG OF THE CALLER. CONSULT YOUR DISTRO.\n");
++	l0g("*** Also see bugs.txt in the pam_mount source tarball/website documentation.\n");
++}
++
+ /**
+  * pam_sm_open_session -
+  * @pamh:	PAM handle
+@@ -589,7 +603,7 @@
+ 		/* There are some volumes, so grab a password. */
+ 		system_authtok = ses_grab_authtok(pamh);
+ 
+-	misc_dump_id("Session open");
++	assert_root();
+ 	envpath_init(Config.path);
+ 	ret = process_volumes(&Config, system_authtok);
+ 
+@@ -690,12 +704,12 @@
+ 		l0g("libHX init failed: %s\n", strerror(errno));
+ 	ret = PAM_SUCCESS;
+ 	w4rn("received order to close things\n");
++	assert_root();
+ 	if (Config.volume_list.items == 0) {
+ 		w4rn("No volumes to umount\n");
+ 		goto out;
+ 	}
+ 
+-	misc_dump_id("Session close");
+ 	/*
+ 	 * call pam_get_user() again because ssh calls PAM fns from seperate
+  	 * processes.
+diff -wbBurN pam_mount-2.13/src/pam_mount.h pam-mount/src/pam_mount.h
+--- pam_mount-2.13/src/pam_mount.h	2011-12-15 16:12:10.000000000 +0400
++++ pam-mount/src/pam_mount.h	2012-10-11 15:28:24.851553965 +0400
+@@ -156,10 +156,9 @@
+ extern void kvplist_genocide(struct HXclist_head *);
+ extern hxmc_t *kvplist_to_str(const struct HXclist_head *);
+ extern void misc_add_ntdom(struct HXformat_map *, const char *);
+-extern void misc_dump_id(const char *);
+-extern int pmt_fileop_exists(const char *);
+-extern int pmt_fileop_isreg(const char *);
+-extern int pmt_fileop_owns(const char *, const char *);
++extern bool pmt_fileop_exists(const char *);
++extern bool pmt_fileop_isreg(const char *);
++extern bool pmt_fileop_owns(const char *, const char *);
+ extern char *relookup_user(const char *);
+ extern long str_to_long(const char *);
+ extern char *xstrdup(const char *);
+@@ -187,13 +186,14 @@
+ 	PMT_BY_CRYPTODEV = 1 << 1,
+ };
+ 
++struct ehd_mount_info;
++
+ extern int pmt_smtab_add(const char *, const char *,
+ 	const char *, const char *);
+ extern int pmt_smtab_remove(const char *, enum smtab_field);
+ extern int pmt_smtab_mounted(const char *, const char *,
+ 	int (*)(const char *, const char *));
+-extern int pmt_cmtab_add(const char *, const char *,
+-	const char *, const char *);
++extern int pmt_cmtab_add(struct ehd_mount_info *);
+ extern int pmt_cmtab_get(const char *, enum cmtab_field,
+ 	char **, char **, char **, char **);
+ extern int pmt_cmtab_remove(const char *);
+diff -wbBurN pam_mount-2.13/src/rdconf1.c pam-mount/src/rdconf1.c
+--- pam_mount-2.13/src/rdconf1.c	2011-12-15 16:12:10.000000000 +0400
++++ pam-mount/src/rdconf1.c	2012-10-11 15:28:24.851553965 +0400
+@@ -340,6 +340,7 @@
+ 	char options_require[] = "nosuid,nodev";
+ 
+ 	memset(config, 0, sizeof(*config));
++	ehd_logctl(EHD_LOGFT_DEBUG, EHD_LOG_SET);
+ 	config->debug      = true;
+ 	config->mkmntpoint = true;
+ 
+@@ -1355,6 +1356,10 @@
+ }
+ 
+ //-----------------------------------------------------------------------------
++/*
++ * This list has no linear relation to vpt->command. Instead, what is done:
++ *   config->command[default_command[i].type] = <command>
++ */
+ static const struct pmt_command default_command[] = {
+ 	{CMD_SMBMOUNT,   "smbfs", {"smbmount", "%(COMBOPATH)", "%(MNTPT)", "-o", "username=%(USER),uid=%(USERUID),gid=%(USERGID)%(if %(OPTIONS),\",%(OPTIONS)\")", NULL}},
+ 	{CMD_SMBUMOUNT,  "smbfs", {"smbumount", "%(MNTPT)", NULL}},
+@@ -1368,6 +1373,8 @@
+ 	{CMD_NFSMOUNT,    "nfs4"},
+ 	{CMD_LCLMOUNT,    NULL,    {"mount", "-p0", "%(if %(OPTIONS),-o%(OPTIONS))", "-t%(FSTYPE)", "%(VOLUME)", "%(MNTPT)", NULL}},
+ 	{CMD_CRYPTMOUNT,  "crypt", {"mount", "-t", "crypt", "%(if %(CIPHER),-ocipher=%(CIPHER))", "%(if %(FSKEYCIPHER),-ofsk_cipher=%(FSKEYCIPHER))", "%(if %(FSKEYHASH),-ofsk_hash=%(FSKEYHASH))", "%(if %(FSKEYPATH),-okeyfile=%(FSKEYPATH))", "%(if %(OPTIONS),-o%(OPTIONS))", "%(VOLUME)", "%(MNTPT)", NULL}},
++	{CMD_CRYPTMOUNT,  "crypt_LUKS"},
++	{CMD_CRYPTMOUNT,  "crypto_LUKS"},
+ 	{CMD_CRYPTUMOUNT, "crypt", {"umount.crypt", "%(MNTPT)", NULL}},
+ 	{CMD_UMOUNT,     NULL,     {"umount", "%(MNTPT)", NULL}},
+ 	{CMD_FSCK,       NULL,     {"fsck", "-p", "%(FSCKTARGET)", NULL}},
+diff -wbBurN pam_mount-2.13/src/spawn.c pam-mount/src/spawn.c
+--- pam_mount-2.13/src/spawn.c	2011-12-15 16:12:10.000000000 +0400
++++ pam-mount/src/spawn.c	2012-10-11 15:28:24.851553965 +0400
+@@ -6,10 +6,12 @@
+  *	as published by the Free Software Foundation; either version 2.1
+  *	of the License, or (at your option) any later version.
+  */
++#include <errno.h>
+ #include <pthread.h>
+ #include <signal.h>
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <string.h>
+ #include <unistd.h>
+ #include <libHX/defs.h>
+ #include <libHX/deque.h>
+@@ -124,9 +126,8 @@
+ 	if (chdir("/") < 0)
+ 		;
+ 	if (user == NULL) {
+-		misc_dump_id("set_myuid<pre>");
+ 		if (setuid(0) < 0) {
+-			l0g("error setting uid to 0\n");
++			l0g("error setting uid to 0: %s\n", strerror(errno));
+ 			return;
+ 		}
+ 	} else {
+@@ -151,7 +152,6 @@
+ 		setenv("HOME", real_user->pw_dir, 1);
+ 		setenv("USER", real_user->pw_name, 1);
+ 	}
+-	misc_dump_id("set_myuid<post>");
+ }
+ 
+ const struct HXproc_ops pmt_dropprivs_ops = {
diff --git a/community/puzzles/PKGBUILD b/community/puzzles/PKGBUILD
index c5d8c2abd..8dc7976e6 100644
--- a/community/puzzles/PKGBUILD
+++ b/community/puzzles/PKGBUILD
@@ -3,7 +3,7 @@
 # Maintainer: schuay <jakob.gruber@gmail.com>
 
 pkgname=puzzles
-pkgver=9660
+pkgver=9682
 pkgrel=1
 pkgdesc="Simon Tatham's Portable Puzzle Collection"
 arch=('i686' 'x86_64' 'mips64el')
@@ -38,4 +38,4 @@ package() {
 	mv ${pkgdir}/usr/bin/blackbox ${pkgdir}/usr/bin/puzzles-blackbox
 }
 
-md5sums=('06f88f737158a1d7912b20010b75d1b1')
+md5sums=('2a592b4c43d24504be327367008807f7')
diff --git a/community/qtractor/PKGBUILD b/community/qtractor/PKGBUILD
index b73234799..7698fd62b 100644
--- a/community/qtractor/PKGBUILD
+++ b/community/qtractor/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 73166 2012-07-02 17:42:18Z schiv $
+# $Id: PKGBUILD 77470 2012-10-10 18:38:48Z schiv $
 # Maintainer: Ray Rashif <schiv@archlinux.org>
 # Contributor: Philipp Überbacher <hollunder at gmx dot at>
 
 pkgname=qtractor
-pkgver=0.5.5
+pkgver=0.5.6
 pkgrel=1
 pkgdesc="Audio/MIDI multitrack sequencer"
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,7 +14,7 @@ depends=('qt' 'jack' 'suil' 'lilv' 'libmad'
 makedepends=('ladspa' 'dssi')
 [ "$CARCH" = "i686" ] && optdepends=('dssi-vst: win32 VST support')
 source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz")
-md5sums=('ec3ad0f427a9e629fb0c42d10b4c2259')
+md5sums=('1483f37c6228cab8eaee3ac1c03ded6e')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/rawtherapee/PKGBUILD b/community/rawtherapee/PKGBUILD
index 3039561dc..86cd0c464 100644
--- a/community/rawtherapee/PKGBUILD
+++ b/community/rawtherapee/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 68906 2012-04-05 13:36:30Z stativ $
+# $Id: PKGBUILD 77564 2012-10-12 13:28:53Z stativ $
 # Maintainer: Lukas Jirkovsky <l.jirkovsky AT gmail.com>
 # Contributor: Bogdan Szczurek <thebodzio(at)gmail.com>
 # Contributor: Vaclav Kramar <vaclav.kramar@tiscali.cz>
@@ -7,6 +7,7 @@
 pkgname=rawtherapee
 pkgver=4.0.8
 pkgrel=1
+epoch=1
 pkgdesc="RAW photo editor"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.rawtherapee.com/"
@@ -14,7 +15,7 @@ license=('GPL3')
 depends=('gtkmm' 'libiptcdata' 'lcms2' 'desktop-file-utils' 'hicolor-icon-theme')
 makedepends=('mercurial' 'cmake')
 install=rawtherapee.install
-source=("http://rawtherapee.googlecode.com/files/rawtherapee-source-$pkgver.tar.xz")
+source=("http://rawtherapee.googlecode.com/files/rawtherapee-$pkgver.tar.xz")
 md5sums=('27b988200c5ff3f2863e1d83200657b2')
 
 build() {
diff --git a/community/rsyslog/PKGBUILD b/community/rsyslog/PKGBUILD
index 534176837..49830d433 100644
--- a/community/rsyslog/PKGBUILD
+++ b/community/rsyslog/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 75616 2012-08-27 14:38:49Z spupykin $
+# $Id: PKGBUILD 77498 2012-10-11 11:39:59Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=rsyslog
-pkgver=6.4.0
-pkgrel=1
+pkgver=6.4.2
+pkgrel=2
 pkgdesc="An enhanced multi-threaded syslogd with a focus on security and reliability"
 url="http://www.rsyslog.com/"
 arch=('i686' 'x86_64' 'mips64el')
@@ -22,10 +22,10 @@ source=("http://www.rsyslog.com/files/download/rsyslog/rsyslog-$pkgver.tar.gz"
 	'rsyslog'
 	'rsyslog.logrotate'
 	'rsyslog.conf.d')
-md5sums=('d81f74b09829a38ac91cf85a08c5ab19'
+md5sums=('7de0124ec7d67ce2bfda0009ab1263ee'
          'a18bbcbb6ebdaa13a6ec6d9f3d9eb2da'
          '8065db4bef3061a4f000ba58779f6829'
-         '1a0cd4530dd5d1439456d5ae230574d9')
+         '18565f38a4445136446a31a3c95ffc3e')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
diff --git a/community/rsyslog/rsyslog.conf.d b/community/rsyslog/rsyslog.conf.d
index e39f8c3b9..fc0770666 100644
--- a/community/rsyslog/rsyslog.conf.d
+++ b/community/rsyslog/rsyslog.conf.d
@@ -3,4 +3,4 @@
 # This should almost certainly include at least the current compatability
 # level, e.g. -c4
 #
-RSYSLOGD_ARGS="-c4"
+RSYSLOGD_ARGS="-c6"
diff --git a/community/scratch/PKGBUILD b/community/scratch/PKGBUILD
index 6d9d6baef..508442874 100644
--- a/community/scratch/PKGBUILD
+++ b/community/scratch/PKGBUILD
@@ -1,16 +1,17 @@
-# $Id: PKGBUILD 76325 2012-09-15 22:35:36Z jsteel $
+# $Id: PKGBUILD 77468 2012-10-10 18:12:07Z jsteel $
 # Maintainer: Jonathan Steel <mail at jsteel dot org>
 # Contributor: Muhammed Uluyol <muhammedu@gmail.com>
 
 pkgname=scratch
 pkgver=1.4.0.7
-pkgrel=1
+pkgrel=2
 pkgdesc="Create and share your own interactive stories, games, music and art"
 arch=('i686' 'x86_64')
 url="http://scratch.mit.edu"
 license=('GPL2')
 install=$pkgname.install
-depends=('squeak-vm' 'shared-mime-info' 'hicolor-icon-theme' 'desktop-file-utils' 'pango')
+depends=('squeak-vm' 'shared-mime-info' 'hicolor-icon-theme' 'desktop-file-utils' 'pango'
+	 'gtk-update-icon-cache')
 source=(http://download.scratch.mit.edu/$pkgname-$pkgver.src.tar.gz)
 md5sums=('f948e9e6de3ec9c7c7b4cc2a1975eb5a')
 
diff --git a/community/scratch/scratch.install b/community/scratch/scratch.install
index f9a769d4e..7fe49829c 100644
--- a/community/scratch/scratch.install
+++ b/community/scratch/scratch.install
@@ -1,9 +1,9 @@
 post_install() {
-    update-desktop-database 2>/dev/null
-    update-mime-database /usr/share/mime 2>/dev/null
-    gtk-update-icon-cache -qf /usr/share/icons/hicolor 2>/dev/null
+    update-desktop-database
+    update-mime-database /usr/share/mime
+    gtk-update-icon-cache -qf /usr/share/icons/hicolor
 }
 
 post_remove() {
-    post_install()
+    post_install
 }
diff --git a/community/scummvm/PKGBUILD b/community/scummvm/PKGBUILD
new file mode 100644
index 000000000..7ac13cb3a
--- /dev/null
+++ b/community/scummvm/PKGBUILD
@@ -0,0 +1,28 @@
+# $Id: PKGBUILD 160945 2012-06-07 12:04:14Z juergen $
+# Maintainer: juergen <juergen@archlinux.org>
+# Contributor: Manolis Tzanidakis, Petter Gundersen
+
+pkgname=scummvm
+pkgver=1.5.0
+pkgrel=1
+pkgdesc="A 'virtual machine' for several classic graphical point-and-click adventure games."
+arch=('i686' 'x86_64')
+license=('GPL')
+url="http://www.scummvm.org/"
+depends=('libmad' 'sdl' 'fluidsynth' 'flac' 'faad2' 'libvorbis' 'libmad')
+source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('d71d1df5c8262556fedbe885972fbf6e')
+
+build() {
+  cd "${srcdir}"/${pkgname}-${pkgver}
+  ./configure --disable-debug \
+    --enable-release \
+    --prefix=/usr
+  make
+}
+
+package() {
+  cd "${srcdir}"/${pkgname}-${pkgver}
+  make DESTDIR=${pkgdir} install
+  install -Dm644 dists/${pkgname}.desktop "${pkgdir}"/usr/share/applications/${pkgname}.desktop
+}
diff --git a/community/sfk/PKGBUILD b/community/sfk/PKGBUILD
index f59367fc8..cc1e707b5 100644
--- a/community/sfk/PKGBUILD
+++ b/community/sfk/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 67087 2012-03-03 17:34:42Z seblu $
+# $Id: PKGBUILD 77369 2012-10-09 06:40:23Z seblu $
 # Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org>
 # Contributor: Baumi <baumi@gmx.com>
 
 pkgname=sfk
-pkgver=1.6.5
+pkgver=1.6.6
 pkgrel=1
 pkgdesc='Swiss File Knife - A Command Line Tools Collection'
 arch=('i686' 'x86_64' 'mips64el')
@@ -11,7 +11,7 @@ url='http://stahlforce.com/dev/?tool=sfk'
 license=('custom: BSD')
 depends=('gcc-libs')
 source=("http://downloads.sourceforge.net/swissfileknife/${pkgname}${pkgver//./}.zip")
-md5sums=('8694d73033dde496c023258f08daa918')
+md5sums=('d32f487d783356eb15e23f5e26bf7ac7')
 
 build() {
   cd ${pkgname}${pkgver//./}
diff --git a/community/spring/PKGBUILD b/community/spring/PKGBUILD
index c076f9576..26806e3cd 100644
--- a/community/spring/PKGBUILD
+++ b/community/spring/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 75813 2012-08-31 23:33:23Z svenstaro $
+# $Id: PKGBUILD 77576 2012-10-12 19:50:28Z svenstaro $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Arkham <arkham at archlinux dot us>
 # Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org>
@@ -6,7 +6,7 @@
 pkgname=spring
 pkgver=0.91.0
 _pkgver=91.0
-pkgrel=1
+pkgrel=2
 pkgdesc='A free 3D real-time-strategy (RTS) game engine'
 arch=('i686' 'x86_64' 'mips64el')
 url="http://springrts.com/"
diff --git a/community/sysstat/PKGBUILD b/community/sysstat/PKGBUILD
index cbe4b5422..1552be656 100644
--- a/community/sysstat/PKGBUILD
+++ b/community/sysstat/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 77129 2012-10-05 11:05:03Z spupykin $
+# $Id: PKGBUILD 77464 2012-10-10 16:04:46Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Martin Devera <devik@cdi.cz>
 
 pkgname=sysstat
-pkgver=10.1.1
-pkgrel=2
+pkgver=10.1.2
+pkgrel=1
 pkgdesc="a collection of performance monitoring tools (iostat,isag,mpstat,pidstat,sadf,sar)"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://pagesperso-orange.fr/sebastien.godard/"
@@ -18,9 +18,9 @@ backup=('etc/conf.d/sysstat'
 source=(http://pagesperso-orange.fr/sebastien.godard/$pkgname-$pkgver.tar.gz
 	sysstat
 	sysstat.service)
-md5sums=('8250cdcbc4a959c8a05e4186fbd13d84'
+md5sums=('c40626b96cc2b4cf303cbcf1efc96eba'
          '3ce41ebf7330aba01e70b38658afed1f'
-         'f447a8081a07a73407b4b04afc027ebc')
+         '12ba479c606620193e8b7c6e982d5088')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
diff --git a/community/sysstat/sysstat.service b/community/sysstat/sysstat.service
index 267374d3e..2ff2365b3 100644
--- a/community/sysstat/sysstat.service
+++ b/community/sysstat/sysstat.service
@@ -1,12 +1,11 @@
 [Unit]
 Description= Resets System Activity Logs
-After=syslog.target 
+After=syslog.target
 
 [Service]
 Type=oneshot
-ExecStart=@LIBDIR@/sa/sa1 --boot
+ExecStart=/usr/lib/sa/sa1 --boot
 RemainAfterExit=yes
 
 [Install]
 WantedBy=multi-user.target
-
diff --git a/community/ulogd/PKGBUILD b/community/ulogd/PKGBUILD
index d32b424bb..e78329277 100644
--- a/community/ulogd/PKGBUILD
+++ b/community/ulogd/PKGBUILD
@@ -1,62 +1,57 @@
-# $Id: PKGBUILD 75920 2012-09-05 14:02:57Z spupykin $
+# $Id: PKGBUILD 77483 2012-10-10 23:43:02Z seblu $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Sebastien Luttringer <seblu+arch@seblu.net>
 # Contributor: Dale Blount <dale@archlinux.org>
 # Contributor: Sergej Pupykin <ps@lx-ltd.ru>
 
 pkgname=ulogd
-pkgver=2.0.0
-pkgrel=5
+pkgver=2.0.1
+pkgrel=3
 pkgdesc='Userspace Packet Logging for netfilter'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.netfilter.org/projects/ulogd/index.html'
 license=('GPL2')
-depends=('libmnl')
+depends=('libmnl' 'libnfnetlink')
 backup=('etc/ulogd.conf')
-makedepends=('libmysqlclient' 'postgresql-libs' 'sqlite' 'libpcap' 'libdbi'
-	     'libnetfilter_acct' 'libnetfilter_log' 'libnetfilter_conntrack'
-	     'linuxdoc-tools' 'groff' 'texlive-core')
-optdepends=('postgresql-libs'
-	    'sqlite'
-	    'libpcap'
-	    'libmysqlclient'
-	    'libdbi'
-	    'libnetfilter_acct'
-	    'libnetfilter_log'
-	    'libnetfilter_conntrack')
+makedepends=('libmysqlclient'
+             'libnetfilter_acct'
+             'libnetfilter_conntrack'
+             'libnetfilter_log'
+             'libpcap'
+             'libdbi'
+             'postgresql-libs'
+             'sqlite')
+optdepends=("${makedepends[@]}")
 options=('!libtool')
 source=("ftp://ftp.netfilter.org/pub/$pkgname/$pkgname-$pkgver.tar.bz2"
-	'rc'
-	'logrotate'
-	'ulogd.conf.min'
-	'ulogd.service')
-md5sums=('211e68781e3860959606fc94b97cf22e'
+	      "$pkgname.rc"
+	      "$pkgname.logrotate"
+	      "$pkgname.conf"
+	      "$pkgname.service")
+md5sums=('2f4b1a58955fcad4ebf22f0d00885fc9'
          'c42230c1cabf5dd9b80bf9a0fd87ca7e'
          'dd32eeee0949adff4188544419acd17e'
          'c21531312f95e790ed19aa267a17d35a'
-         '13a1227052322b4c17b258ed358f055e')
+         '42fc2c0568ff89ec00c2f0797280f296')
+
 
 build() {
   cd $pkgname-$pkgver
   ./configure --prefix=/usr --sysconfdir=/etc --with-mysql --with-pgsql --with-dbi
   make
-  (cd doc && make)
 }
 
 package() {
   cd $pkgname-$pkgver
   make DESTDIR="$pkgdir" install
-
-  install -dm0755 "$pkgdir/usr/share/doc/ulogd"
-  install -Dm0644 ulogd.conf $pkgdir/usr/share/doc/ulogd/ulogd.conf.sample
-  install -Dm0644 doc/ulogd.{dvi,html,ps,sgml,txt} "$pkgdir/usr/share/doc/ulogd"
-
-  install -dm0755 "$pkgdir/usr/share/ulogd"
-  install -m644 doc/*.{table,sql} "$pkgdir/usr/share/ulogd"
-
-  install -D -m644 "$srcdir/logrotate" "$pkgdir/etc/logrotate.d/ulogd"
-  install -D -m755 "$srcdir/rc" "$pkgdir/etc/rc.d/ulogd"
-
-  install -Dm0644 $srcdir/ulogd.conf.min $pkgdir/etc/ulogd.conf
-  install -Dm0644 $srcdir/ulogd.service $pkgdir/usr/lib/systemd/system/ulogd.service
+  install -dm755 "$pkgdir/usr/share/doc/ulogd"
+  install -Dm644 ulogd.conf "$pkgdir/usr/share/doc/ulogd/ulogd.conf"
+  install -m644 doc/*.{table,sql} "$pkgdir/usr/share/doc/ulogd"
+  cd "$srcdir"
+  install -Dm755 $pkgname.rc "$pkgdir/etc/rc.d/$pkgname"
+  install -Dm644 $pkgname.service "$pkgdir/usr/lib/systemd/system/$pkgname.service"
+  install -Dm644 $pkgname.logrotate "$pkgdir/etc/logrotate.d/$pkgname"
+  install -Dm644 $pkgname.conf "$pkgdir/etc/$pkgname.conf"
 }
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/ulogd/ulogd.conf b/community/ulogd/ulogd.conf
new file mode 100644
index 000000000..822575613
--- /dev/null
+++ b/community/ulogd/ulogd.conf
@@ -0,0 +1,20 @@
+[global]
+nlgroup=1
+logfile="/var/log/ulogd.log"
+loglevel=5
+rmem=131071
+bufsize=150000
+
+plugin="/usr/lib/ulogd/ulogd_inppkt_ULOG.so"
+plugin="/usr/lib/ulogd/ulogd_raw2packet_BASE.so"
+plugin="/usr/lib/ulogd/ulogd_filter_IP2STR.so"
+plugin="/usr/lib/ulogd/ulogd_filter_PRINTPKT.so"
+plugin="/usr/lib/ulogd/ulogd_output_LOGEMU.so"
+
+stack=ulog1:ULOG,base1:BASE,ip2str1:IP2STR,print1:PRINTPKT,emu1:LOGEMU
+
+[ulog1]
+nlgroup=1
+
+[emu1]
+file=/var/log/ulogd.syslogemu
diff --git a/community/ulogd/ulogd.logrotate b/community/ulogd/ulogd.logrotate
new file mode 100644
index 000000000..312c71acb
--- /dev/null
+++ b/community/ulogd/ulogd.logrotate
@@ -0,0 +1,10 @@
+/var/log/ulogd.log /var/log/ulogd.syslogemu {
+  missingok
+  notifempty
+  sharedscripts
+  create 0640 root root
+
+  postrotate
+    [ -e /var/run/ulogd.pid ] && /etc/rc.d/ulogd restart > /dev/null
+  endscript
+}
diff --git a/community/ulogd/ulogd.rc b/community/ulogd/ulogd.rc
new file mode 100644
index 000000000..83f0550cc
--- /dev/null
+++ b/community/ulogd/ulogd.rc
@@ -0,0 +1,54 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+get_pid() {
+	pidof /usr/sbin/ulogd
+}
+
+case "$1" in
+  start)
+    stat_busy "Starting ulogd daemon"
+
+    [ -f /var/run/ulog.pid ] && rm -f /var/run/ulog.pid
+    PID=`get_pid`
+    if [ -z "$PID" ]; then
+       /usr/sbin/ulogd -d &>/dev/null
+      if [ $? -gt 0 ]; then
+        stat_fail
+        exit 1
+      else
+        echo `get_pid` > /var/run/ulogd.pid
+        add_daemon ulogd
+        stat_done
+      fi
+    else
+      stat_fail
+      exit 1
+    fi
+    ;;
+
+  stop)
+    stat_busy "Stopping ulog daemon"
+    PID=`get_pid`
+    [ ! -z "$PID" ] && kill $PID &> /dev/null
+    if [ $? -gt 0 ]; then
+      stat_fail
+      exit 1
+    else
+      rm -f /var/run/ulogd.pid &> /dev/null
+      rm_daemon ulogd
+      stat_done
+    fi
+    ;;
+
+  restart)
+    $0 stop
+    sleep 3
+    $0 start
+    ;;
+  *)
+    echo "usage: $0 {start|stop|restart}"
+esac
+exit 0
diff --git a/community/ulogd/ulogd.service b/community/ulogd/ulogd.service
index 3984bbced..8858427fa 100644
--- a/community/ulogd/ulogd.service
+++ b/community/ulogd/ulogd.service
@@ -3,10 +3,7 @@ Description=Netfilter Ulogd daemon
 After=network.target
 
 [Service]
-Type=forking
-User=root
-ExecStart=/usr/sbin/ulogd -d
-PIDFile=/var/run/ulogd.pid
+ExecStart=/usr/sbin/ulogd
 
 [Install]
 WantedBy=multi-user.target
diff --git a/community/warsow/PKGBUILD b/community/warsow/PKGBUILD
index eea94f42f..7f7132f25 100644
--- a/community/warsow/PKGBUILD
+++ b/community/warsow/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 74467 2012-07-29 03:46:52Z svenstaro $
+# $Id: PKGBUILD 77523 2012-10-11 13:44:25Z svenstaro $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Slash <demodevil5[at]yahoo[dot]com>
 # Contributor: Babets
 # Contributor: Vain
 
 pkgname=warsow
-pkgver=1.0
+pkgver=1.01
 pkgrel=1
 pkgdesc="Free online multiplayer competitive FPS based on the Qfusion engine"
 url="http://www.warsow.net/"
@@ -15,13 +15,13 @@ depends=('curl' 'libjpeg' 'libvorbis' 'libxinerama' 'libxxf86dga' 'libxxf86vm' '
 makedepends=('mesa' 'openal' 'imagemagick' 'gendesk')
 optdepends=('openal: for openal audio support')
 source=('warsow.launcher' 'wsw-server.launcher' 'wswtv-server.launcher' \
-        "http://funpark.warsow-esport.net/~warsow/1.0/warsow_${pkgver}_sdk.tar.gz")
+        "http://wsw.null.so/warsow_${pkgver}_sdk.tar.gz")
 _genericname=('First person shooter')
 _comment=('Online Mulitiplayer Competitive FPS')
 md5sums=('ec00081d81ad9802a8ca42fc2eac5498'
          'f73e10c26197178df71b941b10bf83d7'
          'd7e4a69835bbcf801e58307e9d6b951e'
-         '35b9a8f530b51cda15c660b3a73f377e')
+         '9901ef17b4faf03d2b05e52ac3d189d5')
 
 build() {
   cd "$srcdir"
diff --git a/community/wt/PKGBUILD b/community/wt/PKGBUILD
index 55a3c436e..a7b4ab0a5 100644
--- a/community/wt/PKGBUILD
+++ b/community/wt/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 75796 2012-08-31 16:11:56Z spupykin $
+# $Id: PKGBUILD 77566 2012-10-12 14:44:41Z svenstaro $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Denis Martinez <deuns.martinez@gmail.com>
 
 pkgname=wt
-pkgver=3.2.2.1
-_pkgver=3.2.2-p1
-pkgrel=2
+pkgver=3.2.3rc1
+_pkgver=3.2.3-rc1
+pkgrel=1
 pkgdesc="a C++ library and application server for developing and deploying web applications"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.webtoolkit.eu/"
@@ -26,17 +26,17 @@ optdepends=('openssl: for SSL support in built-in webserver'
 	    'qt: for the Wt/Qt interopability example (wtwithqt)')
 backup=('etc/wt/wt_config.xml')
 source=(http://downloads.sourceforge.net/witty/$pkgname-${_pkgver}.tar.gz)
-md5sums=('d436430a4f1ae5fbcf038e645e4b5260')
+md5sums=('b58780f11d85b2da32a21f4c2be84cde')
 
 build() {
   cd ${srcdir}/${pkgname}-${_pkgver}
 
   mkdir -p build
   cd build
+      #-DCMAKE_EXE_LINKER_FLAGS="-lboost_random" \
   cmake \
       -DCONNECTOR_HTTP=ON \
       -DCMAKE_INSTALL_PREFIX=/usr \
-      -DCMAKE_EXE_LINKER_FLAGS="-lboost_random" \
       -DWEBUSER=http \
       -DWEBGROUP=http \
       -DUSE_SYSTEM_SQLITE3=ON \
diff --git a/community/xmobar/0001-Update-usage-of-catch-to-catchIOError-since-catch-ha.patch b/community/xmobar/0001-Update-usage-of-catch-to-catchIOError-since-catch-ha.patch
new file mode 100644
index 000000000..d4508c916
--- /dev/null
+++ b/community/xmobar/0001-Update-usage-of-catch-to-catchIOError-since-catch-ha.patch
@@ -0,0 +1,34 @@
+From b7345a790e8026a2075ce636ac377d8f049b4b7c Mon Sep 17 00:00:00 2001
+From: Thomas Dziedzic <gostrc@gmail.com>
+Date: Wed, 3 Oct 2012 06:51:21 -0700
+Subject: [PATCH] Update usage of catch to catchIOError since catch has been
+ removed from System.IO.Error in ghc 7.6.1
+
+---
+ src/Plugins/Monitors/Bright.hs | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/Plugins/Monitors/Bright.hs b/src/Plugins/Monitors/Bright.hs
+index 499e5bc..b5ec4c0 100644
+--- a/src/Plugins/Monitors/Bright.hs
++++ b/src/Plugins/Monitors/Bright.hs
+@@ -20,6 +20,7 @@ import Data.Char
+ import System.FilePath ((</>))
+ import System.Posix.Files (fileExist)
+ import System.Console.GetOpt
++import System.IO.Error (catchIOError)
+ 
+ data BrightOpts = BrightOpts
+ 	{ subDir :: String
+@@ -101,7 +102,7 @@ readBright files =
+ 		maxVal <- grab $ (fMax files)
+ 		return $ (currVal / maxVal) 
+ 	where
+-		grab f = catch (fmap (read . B.unpack) $ B.readFile f)(\_ -> return 0)
++		grab f = catchIOError (fmap (read . B.unpack) $ B.readFile f)(\_ -> return 0)
+ 
+ 
+ showHorizontalBar :: Float -> Monitor String
+-- 
+1.7.12.2
+
diff --git a/community/xmobar/PKGBUILD b/community/xmobar/PKGBUILD
index 50a973d61..2b61e3ba3 100644
--- a/community/xmobar/PKGBUILD
+++ b/community/xmobar/PKGBUILD
@@ -1,35 +1,37 @@
-# $Id: PKGBUILD 72497 2012-06-15 14:00:57Z jelle $
+# $Id: PKGBUILD 77363 2012-10-09 04:19:10Z tdziedzic $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Arch Haskell Team <arch-haskell@haskell.org>
-# Package generated by cabal2arch 0.4
 
 pkgname=xmobar
-pkgver=0.15
-pkgrel=2
+pkgver=0.16
+pkgrel=1
 pkgdesc="A Minimalistic Text Based Status Bar"
 url="http://hackage.haskell.org/package/xmobar"
 license=('custom:BSD3')
 arch=('i686' 'x86_64' 'mips64el')
 depends=('gmp' 'libxft' 'libxinerama' 'wireless_tools' 'libxrandr')
-makedepends=('ghc=7.4.2-1' 'haskell-x11=1.6.0' 'haskell-x11-xft=0.3.1' 'haskell-utf8-string'
+makedepends=('ghc=7.6.1-1' 'haskell-x11=1.6.0.2' 'haskell-x11-xft=0.3.1' 'haskell-utf8-string'
 	     'haskell-stm>=2.3' 'haskell-parsec>=3.1' 'haskell-mtl>=2')
 options=('strip')
-source=(http://hackage.haskell.org/packages/archive/xmobar/$pkgver/xmobar-$pkgver.tar.gz xmobar-0.15-haskell-mtl.patch)
+#source=(http://hackage.haskell.org/packages/archive/xmobar/$pkgver/xmobar-$pkgver.tar.gz  xmobar-0.15-builddep.patch)
+# Use Git snapshot for Ghc 7.6.1 rebuild
+source=(ftp://ftp.archlinux.org/other/community/xmobar/xmobar-$pkgver.tar.gz 
+0001-Update-usage-of-catch-to-catchIOError-since-catch-ha.patch)
 
 build() {
-    cd ${srcdir}/xmobar-$pkgver
-    # Fix haskell mtl dep
-    patch -Np1 -i $srcdir/xmobar-0.15-haskell-mtl.patch
+    cd ${srcdir}/xmobar
+    patch -Np1 -i $srcdir/0001-Update-usage-of-catch-to-catchIOError-since-catch-ha.patch
 
     runhaskell Setup configure --disable-optimization --prefix=/usr --flags="with_utf8 with_xft with_iwlib"
     runhaskell Setup build
 }
 
 package() {
-    cd ${srcdir}/xmobar-$pkgver
+    cd ${srcdir}/xmobar
     runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/$pkgname/LICENSE
+    install -D -m644 license ${pkgdir}/usr/share/licenses/$pkgname/LICENSE
 }
 
-md5sums=('0658679b39168f49d32fe178029ff9f1'
-         '0d9fb64557233c3a349feb53097c7b09')
+md5sums=('b470f8253f8d2b014f59e9d657cc7ddd'
+         'ffd6079c879f3b6ff7208a846d6ee241'
+         '149583c19ac3d0ad829f3138342bb9db')
diff --git a/community/xmonad-contrib/PKGBUILD b/community/xmonad-contrib/PKGBUILD
index 33de65a5a..2a849dfd9 100644
--- a/community/xmonad-contrib/PKGBUILD
+++ b/community/xmonad-contrib/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 72409 2012-06-13 13:48:15Z tdziedzic $
+# $Id: PKGBUILD 77365 2012-10-09 04:19:28Z tdziedzic $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
 # Contributor: orbisvicis <gmail.com>
 
 pkgname=xmonad-contrib
 pkgver=0.10
-pkgrel=4
+pkgrel=5
 pkgdesc="Add-ons for xmonad"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://xmonad.org/"
 license=('BSD')
-depends=('ghc=7.4.2-1' 'xmonad=0.10-4' 'sh' 'haskell-x11=1.6.0' 'haskell-x11-xft=0.3.1-4' 'haskell-utf8-string=0.3.7-2' 'haskell-random=1.0.1.1-2')
+depends=('ghc=7.6.1' 'xmonad=0.10-5' 'sh' 'haskell-x11=1.6.0.2' 'haskell-x11-xft=0.3.1' 'haskell-utf8-string=0.3.7' 'haskell-random=1.0.1.1-3')
 install='xmonad-contrib.install'
 source=(http://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz xmonad-contrib-0.10-x11-1.6.patch)
 md5sums=('9a4353a94ec0ea3a9c4700757ef5ae81'
diff --git a/community/xmonad/PKGBUILD b/community/xmonad/PKGBUILD
index 05065a05b..f53853afc 100644
--- a/community/xmonad/PKGBUILD
+++ b/community/xmonad/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 72408 2012-06-13 13:48:08Z tdziedzic $
+# $Id: PKGBUILD 77364 2012-10-09 04:19:21Z tdziedzic $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
 # Contributor: shild <shildv@gmail.com>
 
 pkgname=xmonad
 pkgver=0.10
-pkgrel=4
+pkgrel=5
 pkgdesc="Lightweight X11 tiled window manager written in Haskell"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://xmonad.org/"
 license=('BSD')
-depends=('ghc=7.4.2-1' 'gmp' 'haskell-x11=1.6.0' 'sh' 'haskell-mtl=2.1.1-1' 'haskell-utf8-string=0.3.7')
+depends=('ghc=7.6.1-1' 'gmp' 'haskell-x11=1.6.0.2' 'sh' 'haskell-mtl=2.1.2' 'haskell-utf8-string=0.3.7' 'haskell-extensible-exceptions')
 makedepends=('setconf' 'gendesk')
 optdepends=('xorg-xmessage: for displaying visual error messages')
 install='xmonad.install'
@@ -19,6 +19,7 @@ source=(http://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$p
 
 build() {
   cd "$srcdir"
+  ghc-pkg list
   gendesk
 
   cd $srcdir/$pkgname-$pkgver
@@ -39,7 +40,7 @@ package() {
   install -D -m744 register.sh $pkgdir/usr/share/haskell/$pkgname/register.sh
   install -m744 unregister.sh $pkgdir/usr/share/haskell/$pkgname/unregister.sh
   runhaskell Setup.lhs copy --destdir=$pkgdir
-  #  runhaskell util/GenerateManpage.hs
+  #runhaskell util/GenerateManpage.hs
 
   install -D -m644 man/xmonad.1 $pkgdir/usr/share/man/man1/xmonad.1
 
diff --git a/core/dnsutils/PKGBUILD b/core/dnsutils/PKGBUILD
index ae29490bd..223d8aa31 100644
--- a/core/dnsutils/PKGBUILD
+++ b/core/dnsutils/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 166636 2012-09-13 23:21:14Z bisson $
+# $Id: PKGBUILD 168406 2012-10-11 06:22:42Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: kevin <kevin@archlinux.org>
 # Contributor: mario <mario_vazq@hotmail.com>
 
 pkgname=dnsutils
-_pkgver=9.9.1-P3
+_pkgver=9.9.2
 pkgver=${_pkgver//-/.}
 pkgrel=1
 pkgdesc='DNS utilities: dig host nslookup'
@@ -15,8 +15,8 @@ options=('!makeflags')
 depends=('openssl' 'krb5' 'idnkit' 'dnssec-anchors')
 source=("http://ftp.isc.org/isc/bind9/${_pkgver}/bind-${_pkgver}.tar.gz"
         'remove-bind.patch')
-sha1sums=('1c890f69f627ffbc76460c766bafefde408ed799'
-          'b465ef6160b004838f04de9978fe1be8422af777')
+sha1sums=('eb9fa7b497d67ce61a120cb96c302381bc385324'
+          'bb13bd54134e4d787469be25461a3cc3f5cb57f4')
 
 replaces=('bind-tools' 'host')
 
diff --git a/core/dnsutils/remove-bind.patch b/core/dnsutils/remove-bind.patch
index 19d650964..8d4b49848 100644
--- a/core/dnsutils/remove-bind.patch
+++ b/core/dnsutils/remove-bind.patch
@@ -6,7 +6,7 @@ diff -aur old/bin/Makefile.in new/bin/Makefile.in
  top_srcdir =	@top_srcdir@
  
 -SUBDIRS =	named rndc dig dnssec tests tools nsupdate \
--		check confgen @PKCS11_TOOLS@
+-		check confgen @PYTHON_TOOLS@ @PKCS11_TOOLS@
 +SUBDIRS =	dig
  TARGETS =
  
diff --git a/core/iputils/PKGBUILD b/core/iputils/PKGBUILD
index 15fabce81..c3db8818b 100644
--- a/core/iputils/PKGBUILD
+++ b/core/iputils/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 163489 2012-07-13 11:24:04Z stephane $
+# $Id: PKGBUILD 168366 2012-10-09 12:53:03Z stephane $
 # Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: Aaron Griffin <aaron@archlinux.org>
 
 pkgname=iputils
 pkgver=20101006
-pkgrel=4
+pkgrel=7
 pkgdesc="IP Configuration Utilities (and Ping)"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
diff --git a/core/iputils/iputils.install b/core/iputils/iputils.install
index 2481fb396..8e5159e83 100644
--- a/core/iputils/iputils.install
+++ b/core/iputils/iputils.install
@@ -1,7 +1,6 @@
 post_install() {
-  setcap cap_net_raw=ep usr/bin/ping 
-  setcap cap_net_raw=ep usr/bin/ping6 
-  echo " >> Traceroute is now provided by core/traceroute"
+  setcap cap_net_raw=ep usr/bin/ping  2>/dev/null || chmod +s usr/bin/ping 
+  setcap cap_net_raw=ep usr/bin/ping6 2>/dev/null || chmod +s usr/bin/ping6
 }
 
 post_upgrade() {
diff --git a/extra/bind/PKGBUILD b/extra/bind/PKGBUILD
index e0df8bcc5..b1c13c445 100644
--- a/extra/bind/PKGBUILD
+++ b/extra/bind/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 166603 2012-09-12 22:39:35Z bisson $
+# $Id: PKGBUILD 168392 2012-10-09 22:16:55Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 # Contributor: Mario Vazquez <mario_vazq@hotmail.com>
 
 pkgname=bind
-_pkgver=9.9.1-P3
+_pkgver=9.9.2
 pkgver=${_pkgver//-/.}
 pkgrel=1
 pkgdesc='Berkeley Internet Name Daemon is the reference implementation of the DNS protocols'
@@ -23,9 +23,9 @@ source=("http://ftp.isc.org/isc/bind9/${_pkgver}/bind-${_pkgver}.tar.gz"
         'named.logrotate'
         'localhost.zone'
         '127.0.0.zone')
-sha1sums=('1c890f69f627ffbc76460c766bafefde408ed799'
+sha1sums=('eb9fa7b497d67ce61a120cb96c302381bc385324'
           'cbdecd1ea8e7b612b33b63d66bc57273795d1f54'
-          '18f477f510df31e6c6f547ee2d5fc46e973479bf'
+          '14264affa71bcfe7703d0fb7c3556c4c47efaa8b'
           '46232e9db243c6c05e170a1781d7a7f413be5d03'
           '5ca7a5f2a132548a090a045a2df3acea6b35d9eb'
           '7848edbfb9a848843f57c11c02b0289eefd42d00'
diff --git a/extra/bind/remove-tools.patch b/extra/bind/remove-tools.patch
index cbd1c53ad..29b4c9c5f 100644
--- a/extra/bind/remove-tools.patch
+++ b/extra/bind/remove-tools.patch
@@ -7,6 +7,6 @@ diff -aur old/bin/Makefile.in new/bin/Makefile.in
  
 -SUBDIRS =	named rndc dig dnssec tests tools nsupdate \
 +SUBDIRS =	named rndc dnssec tests tools nsupdate \
- 		check confgen @PKCS11_TOOLS@
+ 		check confgen @PYTHON_TOOLS@ @PKCS11_TOOLS@
  TARGETS =
  
diff --git a/extra/bluedevil/PKGBUILD b/extra/bluedevil/PKGBUILD
index aa163e17b..86214c98b 100644
--- a/extra/bluedevil/PKGBUILD
+++ b/extra/bluedevil/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 157804 2012-04-29 17:06:36Z andrea $
+# $Id: PKGBUILD 168408 2012-10-11 07:00:11Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=bluedevil
-pkgver=1.2.3
+pkgver=1.2.4
 pkgrel=1
 pkgdesc='KDE bluetooth framework'
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,10 +12,9 @@ depends=('kdebase-workspace' 'libbluedevil' 'obex-data-server' 'obexd-client')
 makedepends=('cmake' 'automoc4')
 install="${pkgname}.install"
 source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('e792576d34956d27cd0c3eb3c81a5923')
+md5sums=('e0be81bb13a3aa90d521ab96347ed305')
 
 build(){
-  cd "${srcdir}"
   mkdir build
   cd build
   cmake ../${pkgname}-${pkgver} \
@@ -25,6 +24,6 @@ build(){
 }
 
 package() {
-  cd "${srcdir}"/build
+  cd build
   make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/cabal-install/PKGBUILD b/extra/cabal-install/PKGBUILD
index b96d1830d..ff69776d6 100644
--- a/extra/cabal-install/PKGBUILD
+++ b/extra/cabal-install/PKGBUILD
@@ -3,34 +3,41 @@
 # Contributor: Arch Haskell Team <arch-haskell@haskell.org>
 
 pkgname=cabal-install
-pkgver=0.14.0
-pkgrel=2
+pkgver=1.16.0
+pkgrel=1
 pkgdesc="The command-line interface for Cabal and Hackage."
 url="http://hackage.haskell.org/package/cabal-install"
 license=('custom:BSD3')
 arch=('i686' 'x86_64' 'mips64el')
-makedepends=('haskell-http=4000.2.3-1' 'haskell-zlib=0.5.3.3-4' 'haskell-mtl=2.1.1-1' 'haskell-network=2.3.0.14-1' 'haskell-random=1.0.1.1-2')
+makedepends=('haskell-http=4000.2.4-1' 'haskell-zlib=0.5.3.3-5' 'haskell-mtl=2.1.2-1' 'haskell-network=2.3.1.0-1' 'haskell-random=1.0.1.1-3')
 depends=('ghc' 'gmp' 'zlib')
-source=(http://hackage.haskell.org/packages/archive/cabal-install/$pkgver/cabal-install-$pkgver.tar.gz)
-md5sums=('638514bd1a5792d75866481852148ae5')
+source=("http://hackage.haskell.org/packages/archive/cabal-install/${pkgver}/cabal-install-${pkgver}.tar.gz")
+md5sums=('da046116eee7664158411fa9e2cf6b14')
 
 build() {
-    cd cabal-install-${pkgver}
-    runhaskell Setup configure --enable-shared --enable-split-objs --enable-executable-stripping --prefix=/usr
-    runhaskell Setup build
+  cd cabal-install-${pkgver}
+
+  runhaskell Setup configure \
+    --enable-shared \
+    --enable-split-objs \
+    --enable-executable-stripping \
+    --prefix=/usr
+
+  runhaskell Setup build
 }
 
 package() {
-    cd cabal-install-${pkgver}
-    runhaskell Setup copy --destdir=$pkgdir
+  cd cabal-install-${pkgver}
+
+  runhaskell Setup copy --destdir=$pkgdir
 
-    # rm license installed to wrong location
-    rm -rf ${pkgdir}/usr/share/doc
+  # rm license installed to wrong location
+  rm -rf ${pkgdir}/usr/share/doc
 
-    install -D -m644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE
+  install -D -m644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE
     
-    # add bash completion
-    install -d ${pkgdir}/usr/share/bash-completion/completions
-    install -m644 bash-completion/cabal \
-        ${pkgdir}/usr/share/bash-completion/completions
+  # add bash completion
+  install -d ${pkgdir}/usr/share/bash-completion/completions
+  install -m644 bash-completion/cabal \
+    ${pkgdir}/usr/share/bash-completion/completions
 }
diff --git a/extra/claws-mail/PKGBUILD b/extra/claws-mail/PKGBUILD
index fff009679..cd127baa1 100644
--- a/extra/claws-mail/PKGBUILD
+++ b/extra/claws-mail/PKGBUILD
@@ -1,16 +1,17 @@
-# $Id: PKGBUILD 162656 2012-06-27 15:37:01Z andyrtr $
+# $Id: PKGBUILD 168432 2012-10-11 16:05:02Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgname=claws-mail
 pkgver=3.8.1
-pkgrel=1
+pkgrel=2
 pkgdesc="A GTK+ based e-mail client."
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL3')
 url="http://www.claws-mail.org"
 depends=('gtk2' 'gnutls' 'startup-notification' 'pilot-link' 'enchant'
-         'gpgme' 'libetpan' 'libsm' 'db' 'dbus-glib' 'hicolor-icon-theme' 'desktop-file-utils')
+         'gpgme' 'libetpan>=1.1' 'libsm' 'db' 'dbus-glib' 'hicolor-icon-theme' 'desktop-file-utils')
 makedepends=('compface' 'spamassassin' 'bogofilter')
+[ "$CARCH" != "mips64el" ] && depends+=('valgrind')
 optdepends=('python2:           needed for some tools'
             'perl:              needed for some tools'
             'spamassassin:      adds support for spamfiltering'
diff --git a/extra/ecasound/PKGBUILD b/extra/ecasound/PKGBUILD
index 97c51259d..d83129ee7 100644
--- a/extra/ecasound/PKGBUILD
+++ b/extra/ecasound/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 150935 2012-02-24 01:43:21Z tdziedzic $
+# $Id: PKGBUILD 168410 2012-10-11 09:44:14Z schiv $
 # Maintainer: Ray Rashif <schiv@archlinux.org>
 # Contributor: Eric Belanger <eric@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=ecasound
-pkgver=2.8.1
-pkgrel=3
+pkgver=2.9.0
+pkgrel=1
 pkgdesc="A software package designed for multitrack audio processing"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.eca.cx/ecasound/"
 license=('GPL' 'LGPL')
-depends=('gcc-libs' 'readline>=6.0.00' 'audiofile'
-         'jack' 'liblo' 'liboil')
-makedepends=('pkg-config' 'python2' 'ruby')
+depends=('audiofile' 'liblo'
+         'liboil' 'lilv')
+makedepends=('python2' 'ruby')
 optdepends=('python2: ecamonitor, ECI API'
             'ruby: ECI API'
             'mpg123: MP3 decoding'
@@ -24,7 +24,7 @@ optdepends=('python2: ecamonitor, ECI API'
             'libmikmod: tracker module')
 options=('!libtool')
 source=(http://ecasound.seul.org/download/$pkgname-$pkgver.tar.gz)
-md5sums=('d9ded0074a8eeb59dd507c248220d010')
+md5sums=('05e7d4664cdf4c7a138c098e9506a551')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/facile/PKGBUILD b/extra/facile/PKGBUILD
index 0261aaf7d..90349a108 100644
--- a/extra/facile/PKGBUILD
+++ b/extra/facile/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 166401 2012-09-07 16:46:16Z tpowa $
+# $Id: PKGBUILD 168478 2012-10-12 13:06:17Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=facile
 pkgver=1.1
-pkgrel=14
+pkgrel=15
 pkgdesc="A Functional Constraint Library"
 arch=(i686 x86_64 'mips64el')
 url="http://www.recherche.enac.fr/opti/facile/"
diff --git a/extra/ghc/PKGBUILD b/extra/ghc/PKGBUILD
index eae48b02f..19393772c 100644
--- a/extra/ghc/PKGBUILD
+++ b/extra/ghc/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 161653 2012-06-13 13:44:00Z tdziedzic $
+# $Id: PKGBUILD 168343 2012-10-09 04:08:52Z tdziedzic $
 # Maintainer: Thomas Dziedzic <gostrc@gmail.com>
 # Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
 # Special note for devs looking to upgrade this package:
@@ -7,7 +7,7 @@
 #   This implies that all libraries need to be rebuilt when ghc is rebuilt.
 
 pkgname=ghc
-pkgver=7.4.2
+pkgver=7.6.1
 pkgrel=1
 pkgdesc='The Glasgow Haskell Compiler'
 arch=('i686' 'x86_64' 'mips64el')
@@ -19,74 +19,64 @@ makedepends=('ghc' 'perl' 'libxslt' 'docbook-xsl')
 checkdepends=('python2')
 install='ghc.install'
 # keep this otherwise a lot of tests will show as unexpected failures... need to investigate why using -jn for n > 1 does this...
-options=('!makeflags')
+#options=('!makeflags')
 # missing rtl?
-provides=('haskell-array=0.4.0.0'
-          'haskell-base=4.5.1.0'
-          'haskell-binary=0.5.1.0'
+provides=('haskell-array=0.4.0.1'
+          'haskell-base=4.6.0.0'
+          'haskell-binary=0.5.1.1'
           'haskell-bin-package-db=0.0.0.0'
-          'haskell-bytestring=0.9.2.1'
-          'haskell-containers=0.4.2.1'
-          'haskell-deepseq=1.3.0.0'
-          'haskell-directory=1.1.0.2'
-          'haskell-extensible-exceptions=0.1.1.4'
-          'haskell-filepath=1.3.0.0'
-          'haskell-ghc-prim=0.2.0.0'
-          'haskell-haskell2010=1.1.0.1'
-          'haskell-haskell98=2.0.0.1'
-          'haskell-hoopl=3.8.7.3'
-          'haskell-hpc=0.5.1.1'
-          'haskell-integer-gmp=0.4.0.0'
-          'haskell-old-locale=1.0.0.4'
-          'haskell-old-time=1.1.0.0'
+          'haskell-bytestring=0.10.0.0'
+          'haskell-containers=0.5.0.0'
+          'haskell-deepseq=1.3.0.1'
+          'haskell-directory=1.2.0.0'
+          'haskell-filepath=1.3.0.1'
+          'haskell-ghc-prim=0.3.0.0'
+          'haskell-haskell2010=1.1.1.0'
+          'haskell-haskell98=2.0.0.2'
+          'haskell-hoopl=3.9.0.0'
+          'haskell-hpc=0.6.0.0'
+          'haskell-integer-gmp=0.5.0.0'
+          'haskell-old-locale=1.0.0.5'
+          'haskell-old-time=1.1.0.1'
           'haskell-pretty=1.1.1.0'
-          'haskell-process=1.1.0.1'
-          'haskell-template-haskell=2.7.0.0'
-          'haskell-time=1.4'
-          'haskell-unix=2.5.1.1'
-          'haskell-cabal=1.14.0'
-         )
-replaces=('haskell-array<0.4.0.0'
-          'haskell-base<4.5.1.0'
-          'haskell-binary<0.5.1.0'
+          'haskell-process=1.1.0.2'
+          'haskell-template-haskell=2.8.0.0'
+          'haskell-time=1.4.0.1'
+          'haskell-unix=2.6.0.0'
+          'haskell-cabal=1.16.0')
+replaces=('haskell-array<0.4.0.1'
+          'haskell-base<4.6.0.0'
+          'haskell-binary<0.5.1.1'
           'haskell-bin-package-db<0.0.0.0'
-          'haskell-bytestring<0.9.2.1'
-          'haskell-containers<0.4.2.1'
-          'haskell-deepseq<1.3.0.0'
-          'haskell-directory<1.1.0.2'
-          'haskell-extensible-exceptions<0.1.1.4'
-          'haskell-filepath<1.3.0.0'
-          'haskell-ghc-prim<0.2.0.0'
-          'haskell-haskell2010<1.1.0.1'
-          'haskell-haskell98<2.0.0.1'
-          'haskell-hoopl<3.8.7.3'
-          'haskell-hpc<0.5.1.1'
-          'haskell-integer-gmp<0.4.0.0'
-          'haskell-old-locale<1.0.0.4'
-          'haskell-old-time<1.1.0.0'
+          'haskell-bytestring<0.10.0.0'
+          'haskell-containers<0.5.0.0'
+          'haskell-deepseq<1.3.0.1'
+          'haskell-directory<1.2.0.0'
+          'haskell-filepath<1.3.0.1'
+          'haskell-ghc-prim<0.3.0.0'
+          'haskell-haskell2010<1.1.1.0'
+          'haskell-haskell98<2.0.0.2'
+          'haskell-hoopl<3.9.0.0'
+          'haskell-hpc<0.6.0.0'
+          'haskell-integer-gmp<0.5.0.0'
+          'haskell-old-locale<1.0.0.5'
+          'haskell-old-time<1.1.0.1'
           'haskell-pretty<1.1.1.0'
-          'haskell-process<1.1.0.1'
-          'haskell-template-haskell<2.7.0.0'
-          'haskell-time<1.4'
-          'haskell-unix<2.5.1.1'
-          'haskell-cabal<1.14.0'
-         )
+          'haskell-process<1.1.0.2'
+          'haskell-template-haskell<2.8.0.0'
+          'haskell-time<1.4.0.1'
+          'haskell-unix<2.6.0.0'
+          'haskell-cabal<1.16.0')
 source=("http://www.haskell.org/ghc/dist/${pkgver}/ghc-${pkgver}-src.tar.bz2"
         "http://www.haskell.org/ghc/dist/${pkgver}/ghc-${pkgver}-testsuite.tar.bz2"
-        'build.mk'
-        'silence-gen_contents_index.diff')
-md5sums=('267462db5c5a7c245fb26361b77007c4'
-         '528005749c761fe6c12a0079bd84fb90'
-         '88ad4108c26f56fc38466d82aaf9a295'
-         '2ac480d025b706fc47acc58c54b246bb')
+        'build.mk')
+md5sums=('e9d892d2970550ec5e70130b3621f6b6'
+         '0d93c458e3b445a7e524ef6ae459ce11'
+         'c367ef26300648ee9b8aca3dee5c9669')
 
 build() {
   cd ghc-${pkgver}
 
-  # Silence gen_contents_index for the common case.
-  # http://hackage.haskell.org/trac/ghc/ticket/5992
-  patch -Np1 -i ${srcdir}/silence-gen_contents_index.diff
-
   cp ${srcdir}/build.mk mk/build.mk
 
   ./configure \
@@ -96,16 +86,35 @@ build() {
 }
 
 check() {
+  # keep this otherwise a lot of tests will show as unexpected failures... need to investigate why using -jn for n > 1 does this...
+  unset MAKEFLAGS
+
   cd ghc-${pkgver}
 
   # python2 rename
   sed -e 's/PYTHON = python/&2/' -i testsuite/mk/boilerplate.mk
   sed -e 's_#!/usr/bin/env python_&2_' -i testsuite/timeout/calibrate testsuite/timeout/timeout.py
 
-  # note: there is one test failure on i686 only: http://hackage.haskell.org/trac/ghc/ticket/5856
-  #make THREADS=9 test
+  # upstream known failures on both i686 and x86_64:
+  #    ghci.debugger/scripts     break011 [bad stderr] (ghci)
+  #    perf/compiler             parsing001 [stat not good enough] (normal)
+  #    simplCore/should_compile  spec-inline [stderr mismatch] (optasm)
+  # upstream known failures on i686 only:
+  #    numrun012 test fails on i686 works on x86_64 - http://hackage.haskell.org/trac/ghc/ticket/5856
   make test
-  # might be some failures
+
+  # enabling threads to speed up
+  # causes more failures than make test, need to investigate
+  # upstream known failures on both i686 and x86_64:
+  #    perf/compiler             parsing001 [stat not good enough] (normal)
+  #    simplCore/should_compile  spec-inline [stderr mismatch] (optasm)
+  # upstream known failures on i686 only:
+  #    numrun012 test fails on i686 works on x86_64 - http://hackage.haskell.org/trac/ghc/ticket/5856
+  #make THREADS=9 test
+
+  # will most likely cause lots of failures
+  # enable this when upstream has 0 test failures from a simple 'make test'
+  # zero unexpected failures on all tier 1 platforms - http://hackage.haskell.org/trac/ghc/ticket/5757
   #make fulltest
 }
 
diff --git a/extra/ghc/build.mk b/extra/ghc/build.mk
index 73645a957..bb57594bf 100644
--- a/extra/ghc/build.mk
+++ b/extra/ghc/build.mk
@@ -10,6 +10,9 @@
 # Full build with max optimisation and everything enabled (very slow build)
 BuildFlavour = perf
 
+# As above but build GHC using the LLVM backend
+#BuildFlavour = perf-llvm
+
 # Fast build with optimised libraries, no profiling (RECOMMENDED):
 #BuildFlavour = quick
 
@@ -51,6 +54,23 @@ endif
 
 endif
 
+# ---------------- Perf build using LLVM -------------------------------------
+
+ifeq "$(BuildFlavour)" "perf-llvm"
+
+SRC_HC_OPTS     = -O -H64m -fllvm
+GhcStage1HcOpts = -O -fllvm
+GhcStage2HcOpts = -O2 -fllvm
+GhcHcOpts       = -Rghc-timing
+GhcLibHcOpts    = -O2
+GhcLibWays     += p
+
+ifeq "$(PlatformSupportsSharedLibs)" "YES"
+GhcLibWays += dyn
+endif
+
+endif
+
 # -------- A Fast build ------------------------------------------------------
 
 ifeq "$(BuildFlavour)" "quickest"
@@ -151,10 +171,14 @@ endif
 
 ifeq "$(BuildFlavour)" "unreg"
 
+# Note that the LLVM backend works in unregisterised mode as well as
+# registerised mode. This often makes it a good choice for porting
+# GHC.
+
 GhcUnregisterised    = YES
 GhcWithNativeCodeGen = NO
 
-SRC_HC_OPTS          = -O -H64m
+SRC_HC_OPTS          = -O -H64m # -fllvm
 GhcStage1HcOpts      = -O
 GhcStage2HcOpts      = -O2
 GhcHcOpts            = -Rghc-timing
@@ -173,3 +197,4 @@ endif
 # NoFib settings
 NoFibWays =
 STRIP_CMD = :
+
diff --git a/extra/gnome-games/PKGBUILD b/extra/gnome-games/PKGBUILD
index 8db44e775..3e665cf61 100644
--- a/extra/gnome-games/PKGBUILD
+++ b/extra/gnome-games/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 159079 2012-05-15 11:54:56Z heftig $
+# $Id: PKGBUILD 168505 2012-10-13 00:06:42Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
diff --git a/extra/gnu-efi-libs/PKGBUILD b/extra/gnu-efi-libs/PKGBUILD
index f71cd69b5..2799ac0d9 100644
--- a/extra/gnu-efi-libs/PKGBUILD
+++ b/extra/gnu-efi-libs/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 167140 2012-09-26 06:30:46Z tpowa $
+# $Id: PKGBUILD 168460 2012-10-12 06:35:15Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Maintainer : Keshav P R <(the.ridikulus.rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)>
 # Contributor: Alessio 'mOLOk' Bolognino <themolok@gmail.com>
 
 _pkgver="3.0"
 pkgname="gnu-efi-libs"
-pkgver="${_pkgver}q"
+pkgver="${_pkgver}r"
 pkgrel="1"
 pkgdesc="Library for building x86_64 and i386 UEFI Applications using GNU toolchain"
 url="http://sourceforge.net/projects/gnu-efi/"
@@ -19,8 +19,7 @@ conflicts=('gnu-efi')
 provides=('gnu-efi')
 replaces=('gnu-efi')
 options=('!strip' '!makeflags')
-source=("http://download.sourceforge.net/gnu-efi/gnu-efi_${pkgver}.orig.tar.gz")
-sha1sums=('99d29be5fd17dfca762cf0e265477862c21d63bb')
+source=("http://download.sourceforge.net/gnu-efi/gnu-efi_${pkgver}.orig.tar.gz"         gnu-efi-libs-x86_64-call-fix.patch)
 
 _build_gnu-efi-libs-x86_64() {	
 	cp -r "${srcdir}/gnu-efi-${_pkgver}" "${srcdir}/gnu-efi-${_pkgver}-x86_64"
@@ -36,12 +35,15 @@ _build_gnu-efi-libs-i386() {
 	ARCH="ia32" make -C apps all	
 }
 
-build() {	
+build() {
+        cd ${srcdir}/gnu-efi-${_pkgver}
+        # fix http://sourceforge.net/tracker/?func=detail&aid=3576537&group_id=163609&atid=828423
+        patch -Np1 -i ../gnu-efi-libs-x86_64-call-fix.patch	
 	## Fix Makefiles to enable compile for both UEFI arch
-	sed 's|INSTALLROOT=/usr/local|INSTALLROOT ?= /usr/lib|g' -i "${srcdir}/gnu-efi-${_pkgver}/Make.defaults"
-	sed 's|LIBDIR=lib|LIBDIR ?= lib|g' -i "${srcdir}/gnu-efi-${_pkgver}/Make.defaults"
-	sed 's|ARCH	   :=|ARCH	   ?=|g' -i "${srcdir}/gnu-efi-${_pkgver}/Make.defaults"
-	sed 's|-fno-strict-aliasing|-fno-strict-aliasing -fno-stack-protector|g' -i "${srcdir}/gnu-efi-${_pkgver}/Make.defaults"
+	sed 's|INSTALLROOT=/usr/local|INSTALLROOT ?= /usr/lib|g' -i Make.defaults
+	sed 's|LIBDIR=lib|LIBDIR ?= lib|g' -i Make.defaults
+	sed 's|ARCH	   :=|ARCH	   ?=|g' -i Make.defaults
+	sed 's|-fno-strict-aliasing|-fno-strict-aliasing -fno-stack-protector|g' -i Make.defaults
 	if [[ "${CARCH}" == "x86_64" ]]; then
 		_build_gnu-efi-libs-x86_64
 	fi
@@ -73,3 +75,5 @@ package() {
 		_package_gnu-efi-libs-i386
 	fi	
 }
+md5sums=('c5081850414bec34d3e254e8e970811b'
+         '4b5428c51af1981d3eb158d924d6bf85')
diff --git a/extra/gnu-efi-libs/gnu-efi-libs-x86_64-call-fix.patch b/extra/gnu-efi-libs/gnu-efi-libs-x86_64-call-fix.patch
new file mode 100644
index 000000000..8bda35c6b
--- /dev/null
+++ b/extra/gnu-efi-libs/gnu-efi-libs-x86_64-call-fix.patch
@@ -0,0 +1,327 @@
+diff -ur gnu-efi-3.0/lib/x86_64/efi_stub.S gnu-efi-3.0-mod/lib/x86_64/efi_stub.S
+--- gnu-efi-3.0/lib/x86_64/efi_stub.S	2012-04-30 17:35:44.000000000 +0200
++++ gnu-efi-3.0-mod/lib/x86_64/efi_stub.S	2012-10-12 00:39:09.300289985 +0200
+@@ -4,6 +4,7 @@
+  * Copyright (C) 2007 Intel Corp
+  *	Bibo Mao <bibo.mao@intel.com>
+  *	Huang Ying <ying.huang@intel.com>
++ * Copyright (C) 2012 Felipe Contreras <felipe.contreras@gmail.com>
+  */
+ 
+ /*
+@@ -14,152 +15,94 @@
+  *
+  * Basically here are the conversion rules:
+  * a) our function pointer is in %rdi
+- * b) ELF gives us 8-byte aligned %rsp, so we need to pad out to 16-byte
+- *    alignment.
+- * c) inside each call thunker, we can only adjust the stack by
+- *    multiples of 16 bytes. "offset" below refers to however much
+- *    we allocate inside a thunker.
+- * d) rsi through r8 (elf) aka rcx through r9 (ms) require stack space
++ * b) rsi through r8 (elf) aka rcx through r9 (ms) require stack space
+  *    on the MS side even though it's not getting used at all.
+- * e) arguments are as follows: (elf -> ms)
++ * c) 8(%rsp) is always aligned to 16 in ELF, so %rsp is shifted 8 bytes extra
++ * d) arguments are as follows: (elf -> ms)
+  *   1) rdi -> rcx (32 saved)
+  *   2) rsi -> rdx (32 saved)
+- *   3) rdx -> r8 ( 32 saved)
++ *   3) rdx -> r8 (32 saved)
+  *   4) rcx -> r9 (32 saved)
+- *   5) r8 -> 32(%rsp) (48 saved)
++ *   5) r8 -> 32(%rsp) (32 saved)
+  *   6) r9 -> 40(%rsp) (48 saved)
+- *   7) pad+offset+0(%rsp) -> 48(%rsp) (64 saved)
+- *   8) pad+offset+8(%rsp) -> 56(%rsp) (64 saved)
+- *   9) pad+offset+16(%rsp) -> 64(%rsp) (80 saved)
+- *  10) pad+offset+24(%rsp) -> 72(%rsp) (80 saved)
+- *  11) pad+offset+32(%rsp) -> 80(%rsp) (96 saved)
+- *  12) pad+offset+40(%rsp) -> 88(%rsp) (96 saved)
+- * f) because the first argument we recieve in a thunker is actually the
++ *   7) 8(%rsp) -> 48(%rsp) (48 saved)
++ *   8) 16(%rsp) -> 56(%rsp) (64 saved)
++ *   9) 24(%rsp) -> 64(%rsp) (64 saved)
++ *  10) 32(%rsp) -> 72(%rsp) (80 saved)
++ * e) because the first argument we recieve in a thunker is actually the
+  *    function to be called, arguments are offset as such:
+  *   0) rdi -> caller
+  *   1) rsi -> rcx (32 saved)
+  *   2) rdx -> rdx (32 saved)
+  *   3) rcx -> r8 (32 saved)
+  *   4) r8 -> r9 (32 saved)
+- *   5) r9 -> 32(%rsp) (48 saved)
+- *   6) pad+offset+0(%rsp) -> 40(%rsp) (48 saved)
+- *   7) pad+offset+8(%rsp) -> 48(%rsp) (64 saved)
+- *   8) pad+offset+16(%rsp) -> 56(%rsp) (64 saved)
+- *   9) pad+offset+24(%rsp) -> 64(%rsp) (80 saved)
+- *  10) pad+offset+32(%rsp) -> 72(%rsp) (80 saved)
+- *  11) pad+offset+40(%rsp) -> 80(%rsp) (96 saved)
+- *  12) pad+offset+48(%rsp) -> 88(%rsp) (96 saved)
+- * e) arguments need to be moved in opposite order to avoid clobbering
+- * f) pad_stack leaves the amount of padding it added in %r11 for functions
+- *    to use
+- * g) efi -> elf calls don't need to pad the stack, because the 16-byte
+- *    alignment is also always 8-byte aligned.
++ *   5) r9 -> 32(%rsp) (32 saved)
++ *   6) 8(%rsp) -> 40(%rsp) (48 saved)
++ *   7) 16(%rsp) -> 48(%rsp) (48 saved)
++ *   8) 24(%rsp) -> 56(%rsp) (64 saved)
++ *   9) 32(%rsp) -> 64(%rsp) (64 saved)
++ *  10) 40(%rsp) -> 72(%rsp) (80 saved)
++ * f) arguments need to be moved in opposite order to avoid clobbering
+  */
+ 
+ #define ENTRY(name)	\
+ 	.globl name;	\
+ 	name:
+ 
+-#define out(val)		\
+-	push %rax ;		\
+-	mov val, %rax ;		\
+-	out %al, $128 ;		\
+-	pop %rax
+-
+-#define pad_stack							\
+-	subq $8, %rsp ; /* must be a multiple of 16 - sizeof(%rip) */	\
+-	/* stash some handy integers */					\
+-	mov $0x8, %rax ;						\
+-	mov $0x10, %r10 ;						\
+-	/* see if we need padding */					\
+-	and %rsp, %rax ;						\
+-	/* store the pad amount in %r11 */				\
+-	cmovnz %rax, %r11 ;						\
+-	cmovz %r10, %r11 ;						\
+-	/* insert the padding */					\
+-	subq %r11, %rsp ;						\
+-	/* add the $8 we saved above in %r11 */				\
+-	addq $8, %r11 ;							\
+-	/* store the pad amount */					\
+-	mov %r11, (%rsp) ;						\
+-	/* compensate for %rip being stored on the stack by call */	\
+-	addq $8, %r11
+-
+-#define unpad_stack							\
+-	/* fetch the pad amount	we saved (%r11 has been clobbered) */	\
+-	mov (%rsp), %r11 ;						\
+-	/* remove the padding */					\
+-	addq %r11, %rsp
+-
+ ENTRY(efi_call0)
+-	pad_stack
+-	subq $32, %rsp
++	subq $40, %rsp
+ 	call *%rdi
+-	addq $32, %rsp
+-	unpad_stack
++	addq $40, %rsp
+ 	ret
+ 
+ ENTRY(efi_call1)
+-	pad_stack
+-	subq $32, %rsp
++	subq $40, %rsp
+ 	mov  %rsi, %rcx
+ 	call *%rdi
+-	addq $32, %rsp
+-	unpad_stack
++	addq $40, %rsp
+ 	ret
+ 
+ ENTRY(efi_call2)
+-	pad_stack
+-	subq $32, %rsp
++	subq $40, %rsp
+ 	/* mov %rdx, %rdx */
+ 	mov  %rsi, %rcx
+ 	call *%rdi
+-	addq $32, %rsp
+-	unpad_stack
++	addq $40, %rsp
+ 	ret
+ 
+ ENTRY(efi_call3)
+-	pad_stack
+-	subq $32, %rsp
++	subq $40, %rsp
+ 	mov  %rcx, %r8
+ 	/* mov %rdx, %rdx */
+ 	mov  %rsi, %rcx
+ 	call *%rdi
+-	addq $32, %rsp
+-	unpad_stack
++	addq $40, %rsp
+ 	ret
+ 
+ ENTRY(efi_call4)
+-	pad_stack
+-	subq $32, %rsp
++	subq $40, %rsp
+ 	mov %r8, %r9
+ 	mov %rcx, %r8
+ 	/* mov %rdx, %rdx */
+ 	mov %rsi, %rcx
+ 	call *%rdi
+-	addq $32, %rsp
+-	unpad_stack
++	addq $40, %rsp
+ 	ret
+ 
+ ENTRY(efi_call5)
+-	pad_stack
+-	subq $48, %rsp
++	subq $40, %rsp
+ 	mov %r9, 32(%rsp)
+ 	mov %r8, %r9
+ 	mov %rcx, %r8
+ 	/* mov %rdx, %rdx */
+ 	mov %rsi, %rcx
+ 	call *%rdi
+-	addq $48, %rsp
+-	unpad_stack
++	addq $40, %rsp
+ 	ret
+ 
+ ENTRY(efi_call6)
+-	pad_stack
+-	subq $48, %rsp
+-	addq $48, %r11
+-	addq %rsp, %r11
+-	mov (%r11), %rax
++	subq $56, %rsp
++	mov 56+8(%rsp), %rax
+ 	mov %rax, 40(%rsp)
+ 	mov %r9, 32(%rsp)
+ 	mov %r8, %r9
+@@ -167,20 +110,14 @@
+ 	/* mov %rdx, %rdx */
+ 	mov %rsi, %rcx
+ 	call *%rdi
+-	addq $48, %rsp
+-	unpad_stack
++	addq $56, %rsp
+ 	ret
+ 
+ ENTRY(efi_call7)
+-	pad_stack
+-	subq $64, %rsp
+-	addq $64, %r11
+-	addq $8, %r11
+-	addq %rsp, %r11
+-	mov (%r11), %rax
++	subq $56, %rsp
++	mov 56+16(%rsp), %rax
+ 	mov %rax, 48(%rsp)
+-	subq $8, %r11
+-	mov (%r11), %rax
++	mov 56+8(%rsp), %rax
+ 	mov %rax, 40(%rsp)
+ 	mov %r9, 32(%rsp)
+ 	mov %r8, %r9
+@@ -188,23 +125,16 @@
+ 	/* mov %rdx, %rdx */
+ 	mov %rsi, %rcx
+ 	call *%rdi
+-	addq $64, %rsp
+-	unpad_stack
++	addq $56, %rsp
+ 	ret
+ 
+ ENTRY(efi_call8)
+-	pad_stack
+-	subq $64, %rsp
+-	addq $64, %r11
+-	addq $16, %r11
+-	addq %rsp, %r11
+-	mov (%r11), %rax
++	subq $72, %rsp
++	mov 72+24(%rsp), %rax
+ 	mov %rax, 56(%rsp)
+-	subq $8, %r11
+-	mov (%r11), %rax
++	mov 72+16(%rsp), %rax
+ 	mov %rax, 48(%rsp)
+-	subq $8, %r11
+-	mov (%r11), %rax
++	mov 72+8(%rsp), %rax
+ 	mov %rax, 40(%rsp)
+ 	mov %r9, 32(%rsp)
+ 	mov %r8, %r9
+@@ -212,26 +142,18 @@
+ 	/* mov %rdx, %rdx */
+ 	mov %rsi, %rcx
+ 	call *%rdi
+-	addq $64, %rsp
+-	unpad_stack
++	addq $72, %rsp
+ 	ret
+ 
+ ENTRY(efi_call9)
+-	pad_stack
+-	subq $80, %rsp
+-	addq $80, %r11
+-	addq $24, %r11
+-	addq %rsp, %r11
+-	mov (%r11), %rax
++	subq $72, %rsp
++	mov 72+32(%rsp), %rax
+ 	mov %rax, 64(%rsp)
+-	subq $8, %r11
+-	mov (%r11), %rax
++	mov 72+24(%rsp), %rax
+ 	mov %rax, 56(%rsp)
+-	subq $8, %r11
+-	mov (%r11), %rax
++	mov 72+16(%rsp), %rax
+ 	mov %rax, 48(%rsp)
+-	subq $8, %r11
+-	mov (%r11), %rax
++	mov 72+8(%rsp), %rax
+ 	mov %rax, 40(%rsp)
+ 	mov %r9, 32(%rsp)
+ 	mov %r8, %r9
+@@ -239,29 +161,20 @@
+ 	/* mov %rdx, %rdx */
+ 	mov %rsi, %rcx
+ 	call *%rdi
+-	addq $80, %rsp
+-	unpad_stack
++	addq $72, %rsp
+ 	ret
+ 
+ ENTRY(efi_call10)
+-	pad_stack
+-	subq $80, %rsp
+-	addq $80, %r11
+-	addq $32, %r11
+-	addq %rsp, %r11
+-	mov (%r11), %rax
++	subq $88, %rsp
++	mov 88+40(%rsp), %rax
+ 	mov %rax, 72(%rsp)
+-	subq $8, %r11
+-	mov (%r11), %rax
++	mov 88+32(%rsp), %rax
+ 	mov %rax, 64(%rsp)
+-	subq $8, %r11
+-	mov (%r11), %rax
++	mov 88+24(%rsp), %rax
+ 	mov %rax, 56(%rsp)
+-	subq $8, %r11
+-	mov (%r11), %rax
++	mov 88+16(%rsp), %rax
+ 	mov %rax, 48(%rsp)
+-	subq $8, %r11
+-	mov (%r11), %rax
++	mov 88+8(%rsp), %rax
+ 	mov %rax, 40(%rsp)
+ 	mov %r9, 32(%rsp)
+ 	mov %r8, %r9
+@@ -269,6 +182,5 @@
+ 	/* mov %rdx, %rdx */
+ 	mov %rsi, %rcx
+ 	call *%rdi
+-	addq $80, %rsp
+-	unpad_stack
++	addq $88, %rsp
+ 	ret
diff --git a/extra/gparted/PKGBUILD b/extra/gparted/PKGBUILD
index c210e7909..c1721cde7 100644
--- a/extra/gparted/PKGBUILD
+++ b/extra/gparted/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 165018 2012-08-08 23:33:07Z giovanni $
+# $Id: PKGBUILD 168428 2012-10-11 16:00:51Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Andrew Simmons <andrew.simmons@gmail.com>
 # Contributor: György Balló <ballogy@freestart.hu>
 
 pkgname=gparted
-pkgver=0.13.1
+pkgver=0.14.0
 pkgrel=1
 pkgdesc="A Partition Magic clone, frontend to GNU Parted"
 arch=('i686' 'x86_64' 'mips64el')
@@ -24,7 +24,7 @@ optdepends=('dosfstools: for FAT16 and FAT32 partitions'
 install=gparted.install
 source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgname}-${pkgver}/${pkgname}-${pkgver}.tar.bz2"
         'org.archlinux.pkexec.gparted.policy')
-md5sums=('2c3f88fbdd0b43bfe4d843f6dc8063f2'
+md5sums=('fc3507479e930967a2049c533907384d'
          '27c264cfad8fa413d75954dda7a2dd50')
 
 build() {
diff --git a/extra/haskell-http/PKGBUILD b/extra/haskell-http/PKGBUILD
index 58db565ca..65c876927 100644
--- a/extra/haskell-http/PKGBUILD
+++ b/extra/haskell-http/PKGBUILD
@@ -5,16 +5,16 @@
 
 _hkgname=HTTP
 pkgname=haskell-http
-pkgver=4000.2.3
+pkgver=4000.2.4
 pkgrel=1
 pkgdesc="A library for client-side HTTP"
 url="http://hackage.haskell.org/package/${_hkgname}"
 license=('custom:BSD3')
 arch=('i686' 'x86_64' 'mips64el')
-depends=('ghc=7.4.2-1' 'sh' 'haskell-network=2.3.0.14-1' 'haskell-parsec=3.1.2-2' 'haskell-mtl=2.1.1-1')
+depends=('ghc=7.6.1-1' 'sh' 'haskell-network=2.3.1.0-1' 'haskell-parsec=3.1.3-1' 'haskell-mtl=2.1.2-1')
 source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
 install=${pkgname}.install
-md5sums=('872a1e49c3701c61c354f76716d4e3e7')
+md5sums=('5edcd9fd16a9cb72a140a29442d514b7')
 
 build() {
     cd ${srcdir}/${_hkgname}-${pkgver}
diff --git a/extra/haskell-mtl/PKGBUILD b/extra/haskell-mtl/PKGBUILD
index 48c05c8e7..a34001e4d 100644
--- a/extra/haskell-mtl/PKGBUILD
+++ b/extra/haskell-mtl/PKGBUILD
@@ -4,16 +4,16 @@
 
 _hkgname=mtl
 pkgname=haskell-mtl
-pkgver=2.1.1
+pkgver=2.1.2
 pkgrel=1
 pkgdesc="Monad transformer library"
 url="http://hackage.haskell.org/package/${_hkgname}"
 license=('custom:BSD3')
 arch=('i686' 'x86_64' 'mips64el')
-depends=('ghc=7.4.2-1' 'sh' 'haskell-transformers=0.3.0.0-1')
+depends=('ghc=7.6.1-1' 'sh' 'haskell-transformers=0.3.0.0-2')
 source=(http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz)
 install=${pkgname}.install
-md5sums=('0654be687f1492a2ff30cf6f3fb7eed0')
+md5sums=('943c110524d96126bfa0e61f7df1ebcd')
 
 build() {
     cd ${srcdir}/${_hkgname}-${pkgver}
diff --git a/extra/haskell-network/PKGBUILD b/extra/haskell-network/PKGBUILD
index fb74295df..03f297542 100644
--- a/extra/haskell-network/PKGBUILD
+++ b/extra/haskell-network/PKGBUILD
@@ -5,16 +5,16 @@
 
 _hkgname=network
 pkgname=haskell-network
-pkgver=2.3.0.14
+pkgver=2.3.1.0
 pkgrel=1
 pkgdesc="Networking-related facilities"
 url="http://hackage.haskell.org/package/network"
 license=('custom:BSD3')
 arch=('i686' 'x86_64' 'mips64el')
-depends=('ghc=7.4.2-1' 'sh' 'haskell-parsec=3.1.2-2')
+depends=('ghc=7.6.1-1' 'sh' 'haskell-parsec=3.1.3-1')
 source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
 install=${pkgname}.install
-md5sums=('1e45cc731647acff8b9c33bda085bf2a')
+md5sums=('d824db8fc068cab60fa178ab330a57a2')
 
 build() {
     cd ${srcdir}/${_hkgname}-${pkgver}
diff --git a/extra/haskell-parsec/PKGBUILD b/extra/haskell-parsec/PKGBUILD
index 7109f66e9..c331dcf71 100644
--- a/extra/haskell-parsec/PKGBUILD
+++ b/extra/haskell-parsec/PKGBUILD
@@ -5,16 +5,16 @@
 
 _hkgname=parsec
 pkgname=haskell-parsec
-pkgver=3.1.2
-pkgrel=2
+pkgver=3.1.3
+pkgrel=1
 pkgdesc="Monadic parser combinators"
 url="http://hackage.haskell.org/package/${_hkgname}"
 license=('custom:BSD3')
 arch=('i686' 'x86_64' 'mips64el')
-depends=('ghc=7.4.2-1' 'sh' 'haskell-mtl=2.1.1-1' 'haskell-text=0.11.2.1-1')
+depends=('ghc=7.6.1-1' 'sh' 'haskell-mtl=2.1.2-1' 'haskell-text=0.11.2.3-1')
 source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
 install=${pkgname}.install
-md5sums=('c2a75dfd247ae4839e2602b62dc87487')
+md5sums=('d72fc94b81153132c61125a1ec52a4a5')
 
 build() {
     cd ${srcdir}/${_hkgname}-${pkgver}
diff --git a/extra/haskell-random/PKGBUILD b/extra/haskell-random/PKGBUILD
index 56b110289..07cc5e2c2 100644
--- a/extra/haskell-random/PKGBUILD
+++ b/extra/haskell-random/PKGBUILD
@@ -3,12 +3,12 @@
 _hkgname=random
 pkgname=haskell-random
 pkgver=1.0.1.1
-pkgrel=2
+pkgrel=3
 pkgdesc="A basic random number generation library"
 url="http://hackage.haskell.org/package/${_hkgname}"
 license=('custom:BSD3')
 arch=('i686' 'x86_64')
-depends=('ghc=7.4.2-1' 'sh')
+depends=('ghc=7.6.1-1' 'sh')
 source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz")
 install=${pkgname}.install
 md5sums=('9a249cfa7ff6793cbf2be06e9fcd7538')
diff --git a/extra/haskell-text/PKGBUILD b/extra/haskell-text/PKGBUILD
index de6bc360a..30950b46b 100644
--- a/extra/haskell-text/PKGBUILD
+++ b/extra/haskell-text/PKGBUILD
@@ -4,16 +4,16 @@
 
 _hkgname=text
 pkgname=haskell-text
-pkgver=0.11.2.1
+pkgver=0.11.2.3
 pkgrel=1
 pkgdesc="An efficient packed Unicode text type."
 url="http://hackage.haskell.org/package/${_hkgname}"
 license=('custom:BSD3')
 arch=('i686' 'x86_64' 'mips64el')
-depends=('ghc=7.4.2-1' 'sh')
+depends=('ghc=7.6.1-1' 'sh')
 source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz")
 install=${pkgname}.install
-md5sums=('77245df79d10ed5f896a9d3f5b17ee74')
+md5sums=('7a469d49a7576fb3a18785cb64d4ee6c')
 
 build() {
     cd ${srcdir}/${_hkgname}-${pkgver}
diff --git a/extra/haskell-transformers/PKGBUILD b/extra/haskell-transformers/PKGBUILD
index 13ecd271a..f478e8ad9 100644
--- a/extra/haskell-transformers/PKGBUILD
+++ b/extra/haskell-transformers/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 161660 2012-06-13 13:44:42Z tdziedzic $
+# $Id: PKGBUILD 168350 2012-10-09 04:09:36Z tdziedzic $
 
 # Maintainer: Thomas Dziedzic <gostrc@gmail.com>
 # Contributor: Rémy Oudompheng <remy@archlinux.org>
@@ -6,12 +6,12 @@
 _hkgname=transformers
 pkgname=haskell-transformers
 pkgver=0.3.0.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Concrete functor and monad transformers"
 url="http://hackage.haskell.org/package/${_hkgname}"
 license=('custom:BSD3')
 arch=('i686' 'x86_64' 'mips64el')
-depends=('ghc=7.4.2-1' 'sh')
+depends=('ghc=7.6.1-1' 'sh')
 source=("http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz")
 install=${pkgname}.install
 md5sums=('852dc0b79cc2bcb39136287d3dd385e5')
diff --git a/extra/haskell-zlib/PKGBUILD b/extra/haskell-zlib/PKGBUILD
index 1cd980203..bc5a9d35a 100644
--- a/extra/haskell-zlib/PKGBUILD
+++ b/extra/haskell-zlib/PKGBUILD
@@ -6,18 +6,22 @@
 _hkgname=zlib
 pkgname=haskell-zlib
 pkgver=0.5.3.3
-pkgrel=4
+pkgrel=5
 pkgdesc="Compression and decompression in the gzip and zlib formats"
 url="http://hackage.haskell.org/package/zlib"
 license=('custom:BSD3')
 arch=('i686' 'x86_64' 'mips64el')
-depends=('ghc=7.4.2-1' 'zlib' 'sh')
+depends=('ghc=7.6.1-1' 'zlib' 'sh')
 source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz")
 install=${pkgname}.install
 md5sums=('1649e56d13ce2c6a6a9210227401dbbc')
 
 build() {
     cd ${srcdir}/${_hkgname}-${pkgver}
+
+    # ghc 7.6 includes bytestring 0.10
+    sed 's/bytestring == 0.9.*/bytestring == 0.10.*/' -i zlib.cabal
+
     runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
       --prefix=/usr --docdir=/usr/share/doc/${pkgname} \
       --libsubdir=\$compiler/site-local/\$pkgid
diff --git a/extra/kdebindings-python/PKGBUILD b/extra/kdebindings-python/PKGBUILD
index 9ca2d3ec0..1ed8f30c8 100644
--- a/extra/kdebindings-python/PKGBUILD
+++ b/extra/kdebindings-python/PKGBUILD
@@ -1,31 +1,36 @@
-# $Id: PKGBUILD 167774 2012-10-03 14:39:54Z andrea $
+# $Id: PKGBUILD 168439 2012-10-11 21:49:14Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgbase=kdebindings-python
 pkgname=('kdebindings-python'
          'kdebindings-python2')
 pkgver=4.9.2
-pkgrel=1
+pkgrel=2
 url='https://projects.kde.org/projects/kde/kdebindings/pykde4'
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 groups=('kdebindings')
 makedepends=('cmake' 'automoc4' 'boost' 'kdepim-runtime' 'python2-pyqt'
              'pyqt' 'qscintilla' 'python2-sip' 'python-sip')
-source=("http://download.kde.org/stable/${pkgver}/src/pykde4-${pkgver}.tar.xz")
-sha1sums=('44b3f02797c43a59f8c3a91131a2488a733cfa11')
+source=("http://download.kde.org/stable/${pkgver}/src/pykde4-${pkgver}.tar.xz"
+        'pyqt495.patch')
+sha1sums=('44b3f02797c43a59f8c3a91131a2488a733cfa11'
+          '0935c32e55806873f2d088613594559285da7e9c')
 
 build() {
   export PYTHONDONTWRITEBYTECODE="TRUE"
 
-  cd "${srcdir}"
+  cd pykde4-${pkgver}
+  patch -p1 -i "${srcdir}"/pyqt495.patch
+  cd ../ 
+
   mkdir build
   cd build
   cmake ../pykde4-${pkgver} \
     -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_INSTALL_PREFIX=/usr \
-    -DPYTHON_EXECUTABLE=/usr/bin/python \
-    -DPYTHON_LIBRARY=/usr/lib/libpython3.2mu.so.1.0
+    -DPYTHON_EXECUTABLE=/usr/bin/python3 \
+    -DPYTHON_LIBRARY=/usr/lib/libpython3.3m.so.1.0
   make
   cd ..
 
diff --git a/extra/kdebindings-python/pyqt495.patch b/extra/kdebindings-python/pyqt495.patch
new file mode 100644
index 000000000..b8a9df258
--- /dev/null
+++ b/extra/kdebindings-python/pyqt495.patch
@@ -0,0 +1,95 @@
+From: Luca Beltrame <lbeltrame@kde.org>
+Date: Mon, 01 Oct 2012 18:47:56 +0000
+Subject: Remove duplicated QVector<int> definition, since it's in PyQt now.
+X-Git-Url: http://quickgit.kde.org/?p=pykde4.git&amp;a=commitdiff&amp;h=017822bd0dfc83fe9a7a483ecc33f4aab839a3c6
+---
+Remove duplicated QVector<int> definition, since it's in PyQt now.
+Simon, if you have time, please review if everything is OK.
+
+CCMAIL: simon@simonzone.com
+---
+
+
+--- a/sip/kdecore/typedefs.sip
++++ b/sip/kdecore/typedefs.sip
+@@ -951,78 +951,4 @@
+ %End
+ };
+ 
+-%MappedType QVector<int>
+-{
+-%TypeHeaderCode
+-#include <qvector.h>
+-%End
+-
+-%ConvertFromTypeCode
+-    // Create the list.
+-    PyObject *l;
+-
+-    if ((l = PyList_New(sipCpp->size())) == NULL)
+-        return NULL;
+-
+-    // Set the list elements.
+-    for (int i = 0; i < sipCpp->size(); ++i)
+-    {
+-        int t = (sipCpp->at(i));
+-
+-#if PY_MAJOR_VERSION >= 3        
+-        PyObject *tobj = PyLong_FromLong(t);
+-#else
+-        PyObject *tobj = PyInt_FromLong(t);
+-#endif
+-
+-        PyList_SET_ITEM(l, i, tobj);
+-    }
+-
+-    return l;
+-%End
+-
+-%ConvertToTypeCode
+-    // Check the type if that is all that is required.
+-    if (sipIsErr == NULL)
+-    {
+-        if (!PyList_Check(sipPy))
+-            return 0;
+-
+-        for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i) {
+-            PyObject *tobj = PyList_GET_ITEM(sipPy, i);
+-#if PY_MAJOR_VERSION >= 3
+-            if (!PyNumber_Check(tobj))
+-#else
+-            if (!PyInt_Check(tobj))
+-#endif
+-                return 0;
+-        }
+-        return 1;
+-    }
+-
+-    QVector<int> *qv = new QVector<int>;
+- 
+-    for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i)
+-    {
+-        PyObject *tobj = PyList_GET_ITEM(sipPy, i);
+- #if PY_MAJOR_VERSION >= 3
+-        int t = PyLong_AsLong (tobj);
+-#else
+-        int t = PyInt_AS_LONG (tobj);
+-#endif
+-
+-        if (*sipIsErr)
+-        {
+-            delete qv;
+-            return 0;
+-        }
+-
+-        qv->append(t);
+-    }
+- 
+-    *sipCppPtr = qv;
+- 
+-    return sipGetState(sipTransferObj);
+-%End
+-};
+-
++
+
diff --git a/extra/kdegraphics-kamera/PKGBUILD b/extra/kdegraphics-kamera/PKGBUILD
index afadc8f22..1b5626b30 100644
--- a/extra/kdegraphics-kamera/PKGBUILD
+++ b/extra/kdegraphics-kamera/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 167824 2012-10-03 14:44:43Z andrea $
+# $Id: PKGBUILD 168467 2012-10-12 06:40:18Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegraphics-kamera
 pkgver=4.9.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Configure Kamera"
 url="http://kde.org/applications/graphics/kamera/"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdegraphics')
-depends=('kdebase-runtime' 'gphoto2')
+depends=('kdebase-runtime' 'libgphoto2')
 makedepends=('cmake' 'automoc4')
 source=("http://download.kde.org/stable/${pkgver}/src/kamera-${pkgver}.tar.xz")
 sha1sums=('5b5b68b8996fdb1cb6541704c03d36cf506e8827')
diff --git a/extra/kdevelop-php/PKGBUILD b/extra/kdevelop-php/PKGBUILD
index 24397a3af..305724577 100644
--- a/extra/kdevelop-php/PKGBUILD
+++ b/extra/kdevelop-php/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 156483 2012-04-19 10:23:39Z andrea $
+# $Id: PKGBUILD 168356 2012-10-09 06:48:14Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdevelop-php
-pkgver=1.3.1
-_pkgver=4.3.1
+pkgver=1.3.90
+_pkgver=4.3.90
 pkgrel=1
 pkgdesc="PHP language and documentation plugin for KDevelop/Quanta"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,9 +13,9 @@ depends=('kdevelop-pg-qt')
 makedepends=('cmake' 'automoc4')
 replaces=('kdevelop-php-docs')
 conflicts=('kdevelop-php-docs')
-source=(http://download.kde.org/stable/kdevelop/${_pkgver}/src/${pkgname}-{,docs-}${pkgver}.tar.bz2)
-sha1sums=('c5d31de0bf0ae4b242b6265851807e5b44606525'
-          '2b5c3dd2b26196a83bc95cfe8ee595e160f595f0')
+source=(http://download.kde.org/unstable/kdevelop/${_pkgver}/src/${pkgname}-{,docs-}${pkgver}.tar.bz2)
+sha1sums=('11f9b3d2d27ad93aa666edae60d08f64ea82bb8d'
+          'f11194f5672d78406b6c54d53b10c02384e5bf99')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdevelop/PKGBUILD b/extra/kdevelop/PKGBUILD
index ac6ba550d..75e6278c3 100644
--- a/extra/kdevelop/PKGBUILD
+++ b/extra/kdevelop/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 156481 2012-04-19 10:22:57Z andrea $
+# $Id: PKGBUILD 168354 2012-10-09 06:46:57Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 
 pkgname=kdevelop
-pkgver=4.3.1
+pkgver=4.3.90
 pkgrel=1
 pkgdesc="A C/C++ development environment for KDE"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,8 +12,8 @@ license=('GPL')
 depends=('kdebase-workspace' 'kdevplatform' 'kdesdk-okteta' 'kdebase-katepart')
 makedepends=('cmake' 'automoc4')
 install="${pkgname}.install"
-source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('99596bf333bf5a62547f3dc0800674db146eb401')
+source=("http://download.kde.org/unstable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
+sha1sums=('18ed2dccdeef8abe41c135cd3038038790b4e50a')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdevplatform/PKGBUILD b/extra/kdevplatform/PKGBUILD
index 6b81170cb..e124ac776 100644
--- a/extra/kdevplatform/PKGBUILD
+++ b/extra/kdevplatform/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 156479 2012-04-19 10:22:22Z andrea $
+# $Id: PKGBUILD 168355 2012-10-09 06:47:34Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 
 pkgname=kdevplatform
-pkgver=1.3.1
-_pkgver=4.3.1
+pkgver=1.3.90
+_pkgver=4.3.90
 pkgrel=1
 pkgdesc="A C/C++ development platform for KDE"
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,8 +14,8 @@ depends=('kdelibs' 'subversion' 'qjson')
 optdepends=("kdesdk-kompare: difference checking")
 makedepends=('cmake' 'automoc4' 'boost')
 install=${pkgname}.install
-source=("http://download.kde.org/stable/kdevelop/${_pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('bba0cefdac6de83c8d3354534a94e8500dccda37')
+source=("http://download.kde.org/unstable/kdevelop/${_pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
+sha1sums=('88300217681caa5c69f09b6428f2a6298cbd4733')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/libetpan/PKGBUILD b/extra/libetpan/PKGBUILD
index ae2f04677..436af32fa 100644
--- a/extra/libetpan/PKGBUILD
+++ b/extra/libetpan/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 146471 2012-01-11 15:22:10Z stephane $
+# $Id: PKGBUILD 168431 2012-10-11 16:04:57Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgname=libetpan
-pkgver=1.0
-pkgrel=4
+pkgver=1.1
+pkgrel=1
 pkgdesc="A portable middleware for email access"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.etpan.org/"
@@ -11,7 +11,7 @@ license=("custom:etpan")
 depends=('db>=5.3.15' 'libsasl>=2.1.23' 'curl>=7.23.1' 'expat>=2.0.1-1')
 options=('!libtool')
 source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-md5sums=('5addc766141a0b1d29ee1ca4ba1b6808')
+md5sums=('6fee60d08506e941642b8fa087e60b07')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
diff --git a/extra/libva-intel-driver/PKGBUILD b/extra/libva-intel-driver/PKGBUILD
new file mode 100644
index 000000000..b11c9a7de
--- /dev/null
+++ b/extra/libva-intel-driver/PKGBUILD
@@ -0,0 +1,32 @@
+# $Id: PKGBUILD 168383 2012-10-09 16:37:25Z ibiru $
+# Maintainer : Ionut Biru <ibiru@archlinux.org>
+
+pkgname=libva-intel-driver
+pkgver=1.0.18
+pkgrel=1
+pkgdesc="VA-API implementation for Intel G45 chipsets and Intel HD Graphics for Intel Core processor family."
+arch=('i686' 'x86_64')
+url="http://freedesktop.org/wiki/Software/vaapi"
+license=('MIT')
+depends=('libva')
+options=('!libtool')
+replaces=('libva-driver-intel')
+source=(http://www.freedesktop.org/software/vaapi/releases/$pkgname/$pkgname-$pkgver.tar.bz2
+        build-fix.patch)
+sha1sums=('2cbf6f8c9f59516cceb5c4245576d53d26612256'
+          '447987d81800b2a5c434e6b6b19b6f8ec9c675d1')
+
+build() {
+  cd $pkgname-$pkgver
+  patch -Np1 -i ../build-fix.patch
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+  install -m644 -D COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/extra/libva-intel-driver/build-fix.patch b/extra/libva-intel-driver/build-fix.patch
new file mode 100644
index 000000000..0127b06cf
--- /dev/null
+++ b/extra/libva-intel-driver/build-fix.patch
@@ -0,0 +1,68 @@
+From 73ccb0c88d53298befa6a896d2bb39a041169b36 Mon Sep 17 00:00:00 2001
+From: Gwenole Beauchesne <gwenole.beauchesne@intel.com>
+Date: Fri, 06 Apr 2012 15:24:36 +0000
+Subject: dri: cope with drm_state changes.
+
+Signed-off-by: Gwenole Beauchesne <gwenole.beauchesne@intel.com>
+---
+diff --git a/src/i965_drv_video.c b/src/i965_drv_video.c
+index 3bea253..20fed99 100644
+--- a/src/i965_drv_video.c
++++ b/src/i965_drv_video.c
+@@ -2380,7 +2380,7 @@ i965_PutSurface(VADriverContextP ctx,
+                 unsigned int flags) /* de-interlacing flags */
+ {
+     struct i965_driver_data *i965 = i965_driver_data(ctx); 
+-    struct dri_state *dri_state = (struct dri_state *)ctx->dri_state;
++    struct dri_state *dri_state = (struct dri_state *)ctx->drm_state;
+     struct i965_render_state *render_state = &i965->render_state;
+     struct dri_drawable *dri_drawable;
+     union dri_buffer *buffer;
+@@ -2393,7 +2393,7 @@ i965_PutSurface(VADriverContextP ctx,
+     int pp_flag = 0;
+ 
+     /* Currently don't support DRI1 */
+-    if (dri_state->driConnectedFlag != VA_DRI2)
++    if (dri_state->base.auth_type != VA_DRM_AUTH_DRI2)
+         return VA_STATUS_ERROR_UNKNOWN;
+ 
+     /* Some broken sources such as H.264 conformance case FM2_SVA_C
+diff --git a/src/intel_driver.c b/src/intel_driver.c
+index 4e6df81..b34d9a1 100644
+--- a/src/intel_driver.c
++++ b/src/intel_driver.c
+@@ -29,7 +29,7 @@
+ 
+ #include <assert.h>
+ 
+-#include <va/va_dricommon.h>
++#include <va/va_drmcommon.h>
+ 
+ #include "intel_batchbuffer.h"
+ #include "intel_memman.h"
+@@ -50,15 +50,17 @@ Bool
+ intel_driver_init(VADriverContextP ctx)
+ {
+     struct intel_driver_data *intel = intel_driver_data(ctx);
+-    struct dri_state *dri_state = (struct dri_state *)ctx->dri_state;
++    struct drm_state * const drm_state = (struct drm_state *)ctx->drm_state;
+     int has_exec2, has_bsd, has_blt;
+ 
+-    assert(dri_state);
+-    assert(dri_state->driConnectedFlag == VA_DRI2 || 
+-           dri_state->driConnectedFlag == VA_DRI1);
++    assert(drm_state);
++    assert(drm_state->auth_type == VA_DRM_AUTH_DRI1 ||
++           drm_state->auth_type == VA_DRM_AUTH_DRI2 ||
++           drm_state->auth_type == VA_DRM_AUTH_CUSTOM);
+ 
+-    intel->fd = dri_state->fd;
+-    intel->dri2Enabled = (dri_state->driConnectedFlag == VA_DRI2);
++    intel->fd = drm_state->fd;
++    intel->dri2Enabled = (drm_state->auth_type == VA_DRM_AUTH_DRI2 ||
++                          drm_state->auth_type == VA_DRM_AUTH_CUSTOM);
+ 
+     if (!intel->dri2Enabled) {
+         return False;
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/extra/libva-vdpau-driver/PKGBUILD b/extra/libva-vdpau-driver/PKGBUILD
new file mode 100644
index 000000000..4edf7b9c0
--- /dev/null
+++ b/extra/libva-vdpau-driver/PKGBUILD
@@ -0,0 +1,31 @@
+# $Id: PKGBUILD 168382 2012-10-09 16:32:34Z ibiru $
+# Maintainer: Ionut Biru <ibiru@archlinux.org>
+pkgname=libva-vdpau-driver
+pkgver=0.7.4
+pkgrel=1
+pkgdesc="VDPAU backend for VA API"
+arch=('i686' 'x86_64')
+url="http://freedesktop.org/wiki/Software/vaapi"
+license=('GPL')
+depends=('libva' 'libvdpau')
+makedepends=('mesa')
+replaces=('vdpau-video')
+options=('!libtool')
+source=(http://www.freedesktop.org/software/vaapi/releases/$pkgname/$pkgname-$pkgver.tar.bz2)
+sha1sums=('224318f4ea8bafca6a0fec770e388b7d1a1a66b3')
+
+build() {
+  cd $pkgname-$pkgver
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd $pkgname-$pkgver
+
+  make DESTDIR="$pkgdir" install
+}
+
+# vim:set ts=2 sw=2 et:
+
+
diff --git a/extra/libva/PKGBUILD b/extra/libva/PKGBUILD
index 9317458cc..2922dc84a 100644
--- a/extra/libva/PKGBUILD
+++ b/extra/libva/PKGBUILD
@@ -1,25 +1,23 @@
-# $Id: PKGBUILD 161866 2012-06-16 00:18:39Z ibiru $
+# $Id: PKGBUILD 168381 2012-10-09 16:30:41Z ibiru $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 
 pkgname=libva
 pkgver=1.1.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Video Acceleration (VA) API for Linux"
 arch=('i686' 'x86_64')
 url="http://freedesktop.org/wiki/Software/vaapi"
 license=('MIT')
 depends=('libegl' 'libgl' 'libdrm' 'libxfixes')
 makedepends=('mesa')
-optdepends=('vdpau-video: vdpau back-end for nvidia'
-            'libva-driver-intel: back-end for intel cards')
+optdepends=('libva-vdpau-driver: vdpau back-end for nvidia'
+            'libva-intel-driver: back-end for intel cards')
 options=('!libtool')
-install=libva.install
-source=(http://cgit.freedesktop.org/libva/snapshot/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('b22179bd44137e91d5c77a43a0cb8063')
+source=(http://www.freedesktop.org/software/vaapi/releases/$pkgname/$pkgname-$pkgver.tar.bz2)
+sha1sums=('af6e912ea86a6378992f5783390ab9cb8e5cadf9')
 
 build() {
   cd "$pkgname-$pkgver"
-  ./autogen.sh
   ./configure --prefix=/usr
   make
 }
diff --git a/extra/libxcb/PKGBUILD b/extra/libxcb/PKGBUILD
index 914dd0fe7..b835805bd 100644
--- a/extra/libxcb/PKGBUILD
+++ b/extra/libxcb/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 153294 2012-03-12 20:52:27Z andyrtr $
+# $Id: PKGBUILD 168376 2012-10-09 16:18:34Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Alexander Baldeck <alexander@archlinux.org>
 
 pkgname=libxcb
-pkgver=1.8.1
+pkgver=1.9
 pkgrel=1
 pkgdesc="X11 client-side library"
 arch=(i686 x86_64 'mips64el')
@@ -14,13 +14,16 @@ options=('!libtool')
 license=('custom')
 source=($url/dist/$pkgname-$pkgver.tar.bz2
         libxcb-1.1-no-pthread-stubs.patch)
-sha1sums=('98199b6054750a06cddd4e77baa4354af547ce6f'
+sha1sums=('ad2fb95eeec41ba3d39502a4f7460c3b64fdf061'
           'd2df03ddf3e949c10c2c185256b0eb7fa02837ab')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
   patch -Np1 -i "$srcdir/libxcb-1.1-no-pthread-stubs.patch"
-  PYTHON=/usr/bin/python2 ./autogen.sh --prefix=/usr --enable-xinput
+  PYTHON=/usr/bin/python2 
+  ./autogen.sh --prefix=/usr \
+    --enable-xinput \
+    --disable-static
   make
 }
 
diff --git a/extra/lm_sensors/PKGBUILD b/extra/lm_sensors/PKGBUILD
index fb96d290e..0a7e4f4a4 100644
--- a/extra/lm_sensors/PKGBUILD
+++ b/extra/lm_sensors/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 164818 2012-08-06 19:24:07Z eric $
+# $Id: PKGBUILD 168402 2012-10-10 23:19:44Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=lm_sensors
 pkgver=3.3.2
-pkgrel=4
+pkgrel=5
 pkgdesc="Collection of user space tools for general SMBus access and hardware monitoring"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.lm-sensors.org/"
@@ -28,7 +28,7 @@ sha1sums=('5d0f026ad763124e8c2ad733b6e1ad5e6473993d'
           '72a60251d1d55a67307dab4105d9f3f01a080af4'
           '7a4a4d1442aeeba0ba8aefb742a3ef187b593f4c'
           'eff43b4882d25dae7dd0b33eb2e33b0836a5cc51'
-          '9cc453eb0e9f9057227459cb07e74815383544bf'
+          'a7a20eb3c799d70287e6c7968a7ab42165925293'
           '34241388c4001bfb6e49b7e10da1217e29a258d6'
           '5662828085cdd981f0dc7cf8f79d3d6e2b72f50c')
 
diff --git a/extra/lm_sensors/healthd.service b/extra/lm_sensors/healthd.service
index b894fbb1f..59d3270b0 100644
--- a/extra/lm_sensors/healthd.service
+++ b/extra/lm_sensors/healthd.service
@@ -2,7 +2,7 @@
 Description=A daemon which can be used to alert you in the event of a hardware health monitoring alarm
 
 [Service]
-PIDFile=/var/run/healthd.pid
+Type=forking
 ExecStart=/usr/sbin/healthd
 
 [Install]
diff --git a/extra/mono/PKGBUILD b/extra/mono/PKGBUILD
index 9a83fc925..de3dcfc85 100644
--- a/extra/mono/PKGBUILD
+++ b/extra/mono/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 145729 2011-12-29 13:13:45Z daniel $
+# $Id: PKGBUILD 168399 2012-10-10 22:19:40Z tomegun $
 # Maintainer: Daniel Isenmann <daniel@archlinux.org>
 # Contributor: Brice Carpentier <brice@dlfp.org>
 
 pkgname=mono
 pkgver=2.10.8
-pkgrel=1
+pkgrel=2
 pkgdesc="Free implementation of the .NET platform including runtime and compiler"
 arch=(i686 x86_64)
 license=('GPL' 'LGPL2' 'MPL' 'custom:MITX11')
@@ -15,9 +15,7 @@ options=('!libtool' '!makeflags')
 provides=('monodoc')
 conflicts=('monodoc')
 source=(http://download.mono-project.com/sources/${pkgname}/${pkgname}-${pkgver}.tar.gz
-        mono.rc.d)
-md5sums=('411a2d9bcfc37a61eb9aedba88b40533'
-         '8315e46c6a6e9625502521fc0ad1a322')
+        mono.binfmt.d)
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
@@ -40,9 +38,8 @@ package() {
   make DESTDIR=${pkgdir} prefix=/usr INSTALL=../../install-sh install
   cd ${srcdir}/${pkgname}-${pkgver}
 
-  # install daemons and pathes
-  mkdir -p ${pkgdir}/etc/rc.d
-  install -m755 ${srcdir}/mono.rc.d ${pkgdir}/etc/rc.d/mono
+  # install binfmt conf file and pathes
+  install -D -m644 ${srcdir}/mono.binfmt.d ${pkgdir}/usr/lib/binfmt.d/mono.conf
 
   #install license
   mkdir -p ${pkgdir}/usr/share/licenses/${pkgname}
@@ -51,3 +48,5 @@ package() {
   #fix .pc file to be able to request mono on what it depends, fixes #go-oo build
   sed -i -e "s:#Requires:Requires:" ${pkgdir}/usr/lib/pkgconfig/mono.pc
 }
+md5sums=('411a2d9bcfc37a61eb9aedba88b40533'
+         'b9ef8a65fea497acf176cca16c1e2402')
diff --git a/extra/mono/mono.binfmt.d b/extra/mono/mono.binfmt.d
new file mode 100644
index 000000000..3075b0dc5
--- /dev/null
+++ b/extra/mono/mono.binfmt.d
@@ -0,0 +1 @@
+:CLR:M::MZ::/usr/bin/mono:
diff --git a/extra/mtdev/PKGBUILD b/extra/mtdev/PKGBUILD
index 5586c4412..0ade75444 100644
--- a/extra/mtdev/PKGBUILD
+++ b/extra/mtdev/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 153465 2012-03-14 17:58:06Z andyrtr $
+# $Id: PKGBUILD 168434 2012-10-11 16:11:43Z andyrtr $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Contributor: SpepS <dreamspepser at yahoo dot it>
 
 pkgname=mtdev
-pkgver=1.1.2
+pkgver=1.1.3
 pkgrel=1
 pkgdesc="A stand-alone library which transforms all variants of kernel MT events to the slotted type B protocol"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ license=('custom:MIT')
 depends=('glibc')
 options=('!libtool')
 source=("$url$pkgname-$pkgver.tar.bz2")
-md5sums=('d9c7700918fc392e29da7477ae20c5c2')
+md5sums=('8a236569ad3dd79eaeed45f1935359be')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
@@ -20,6 +20,11 @@ build() {
   make
 }
 
+check() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make -k check
+}
+
 package() {
   cd "$srcdir/$pkgname-$pkgver"
   make DESTDIR="$pkgdir/" install
diff --git a/extra/nx/PKGBUILD b/extra/nx/PKGBUILD
index fa5bc6408..ba0cc4c10 100644
--- a/extra/nx/PKGBUILD
+++ b/extra/nx/PKGBUILD
@@ -1,24 +1,53 @@
-# $Id: PKGBUILD 166924 2012-09-22 09:16:46Z andyrtr $
+# $Id: PKGBUILD 168379 2012-10-09 16:19:56Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgbase=nx
 pkgname=('libxcomp' 'nxproxy' 'nx-x11' 'nx-xcompext' 'nxagent' 'nx-headers')
 pkgver=3.5.0.15
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64' 'mips64el')
 url="http://wiki.x2go.org/"
 license=('GPL')
-options=('!makeflags')
+options=('!makeflags') # '!strip')
 makedepends=('libjpeg-turbo' 'libpng' 'bash' 'perl' # runtime dependencies from subpackages
              'xproto' 'freetype2' 'libxaw' 'libxrender' 'libxp' 'libxpm' 'libxdamage' 'libxrandr' 'libxcomposite' 'libxtst' 'xorg-sessreg' # makedepends
              )
 source=(http://code.x2go.org/releases/source/nx-libs/nx-libs-$pkgver-full.tar.gz
-        nx-x11.ld.so.conf.d)
+        nx-x11.ld.so.conf.d
+        nx-cflags.patch)
 md5sums=('d5b3dba1ecbd2989cd7ce20fee6683a0'
-         'f2ec60c7e2d81bef2f7292d2b33681a6')
+         'f2ec60c7e2d81bef2f7292d2b33681a6'
+         'd0c5b88aac0473e19699cf62d84b9d5f')
 
 build() {
   cd "${srcdir}/nx-libs-$pkgver"
+  
+  # debug flags
+#  export CFLAGS="-march=x86-64 -O1 -g -pipe"
+#  export CXXFLAGS="-march=x86-64 -O1 -g -pipe"
+
+
+  # Gentoo hacks to honor cflags
+  patch -Np0 -i ${srcdir}/nx-cflags.patch
+
+  # Run autoreconf in all neeed folders
+  for i in nxcomp nxcompext nxcompshad nxproxy; do
+     cd ${i}
+     autoreconf -vfi #${i}
+     cd ..
+  done
+  
+  # From xorg-x11-6.9.0-r3.ebuild
+  pushd "${srcdir}/nx-libs-$pkgver/nx-X11"
+
+  HOSTCONF="config/cf/host.def"
+  echo "#define OptimizedCDebugFlags ${CFLAGS} GccAliasingArgs" >> ${HOSTCONF}
+  echo "#define OptimizedCplusplusDebugFlags ${CXXFLAGS} GccAliasingArgs" >> ${HOSTCONF}
+  # Respect LDFLAGS
+  echo "#define ExtraLoadFlags ${LDFLAGS}" >> ${HOSTCONF}
+  echo "#define SharedLibraryLoadFlags -shared ${LDFLAGS}" >> ${HOSTCONF}
+  popd
+    
   make CONFIGURE="./configure --prefix=/usr --libdir=/usr/lib --libexecdir=/usr/lib --includedir=/usr/include"
   # fake install
   mkdir $srcdir/fakeinstall
diff --git a/extra/nx/nx-cflags.patch b/extra/nx/nx-cflags.patch
new file mode 100644
index 000000000..35562939c
--- /dev/null
+++ b/extra/nx/nx-cflags.patch
@@ -0,0 +1,54 @@
+--- nxcomp/configure.in.orig	2008-12-18 15:48:09.000000000 +0100
++++ nxcomp/configure.in	2008-12-18 15:54:14.000000000 +0100
+@@ -7,8 +7,7 @@
+ 
+ dnl Set our default compilation flags.
+ 
+-CXXFLAGS="-O3 -fno-rtti -fno-exceptions"
+-CFLAGS="-O3"
++CXXFLAGS="$CXXFLAGS -fno-rtti -fno-exceptions"
+ 
+ dnl Reset default linking directives.
+ 
+--- nxcompext/configure.in.orig	2008-12-18 15:55:29.000000000 +0100
++++ nxcompext/configure.in	2008-12-18 15:55:51.000000000 +0100
+@@ -5,11 +5,6 @@
+ AC_INIT(NXlib.h)
+ AC_PREREQ(2.13)
+ 
+-dnl Reset default compilation flags.
+-
+-CXXFLAGS="-O3"
+-CFLAGS="-O3"
+-
+ dnl Reset default linking directives.
+ 
+ LIBSTATIC=""
+--- nxcompshad/configure.in.orig	2008-12-18 15:56:13.000000000 +0100
++++ nxcompshad/configure.in	2008-12-18 15:56:22.000000000 +0100
+@@ -5,11 +5,6 @@
+ AC_INIT(Shadow.h)
+ AC_PREREQ(2.13)
+ 
+-dnl Reset default compilation flags.
+-
+-CXXFLAGS="-O3"
+-CPPFLAGS="-O3"
+-
+ dnl Reset default linking directives.
+ 
+ LIBSTATIC=""
+--- nxproxy/configure.in.orig	2008-12-18 15:57:48.000000000 +0100
++++ nxproxy/configure.in	2008-12-18 15:57:55.000000000 +0100
+@@ -5,11 +5,6 @@
+ AC_INIT(Main.c)
+ AC_PREREQ(2.13)
+ 
+-dnl Reset default compilation flags.
+-
+-CXXFLAGS="-O3"
+-CPPFLAGS="-O3"
+-
+ dnl Prefer headers and libraries from nx-X11 if present.
+ 
+ if test -d "../nx-X11/exports/include" ; then
diff --git a/extra/ocaml/PKGBUILD b/extra/ocaml/PKGBUILD
index c0f8d24c2..19ebef8d8 100644
--- a/extra/ocaml/PKGBUILD
+++ b/extra/ocaml/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 166569 2012-09-12 06:53:18Z tpowa $
+# $Id: PKGBUILD 168480 2012-10-12 13:08:15Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgbase='ocaml'
 pkgname=('ocaml')
 # Needs optimized build.
 [ "$CARCH" = "mips64el" ] || pkgname+=('ocaml-compiler-libs')
-pkgver=4.00.0
-pkgrel=2
+pkgver=4.00.1
+pkgrel=1
 pkgdesc="A functional language with OO extensions"
 arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL2' 'custom: QPL-1.0')
@@ -62,5 +62,5 @@ optdepends=()
   install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
   install -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/"
 }
-md5sums=('fa11560a45793bd9fa45c1295a6f4a91'
+md5sums=('91124a8eb12a57f1e56c02fe3db0f9e7'
          'e2c8bc316efe40532c5b9d7f9a1d8d62')
diff --git a/extra/openexr/PKGBUILD b/extra/openexr/PKGBUILD
index 0462943ed..b4d8a0f33 100644
--- a/extra/openexr/PKGBUILD
+++ b/extra/openexr/PKGBUILD
@@ -1,19 +1,17 @@
-# $Id: PKGBUILD 149571 2012-02-08 14:46:39Z tpowa $
+# $Id: PKGBUILD 168476 2012-10-12 12:47:54Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=openexr
-pkgver=1.7.0
-pkgrel=2
+pkgver=1.7.1
+pkgrel=1
 pkgdesc="An high dynamic-range image file format library"
 url="http://www.openexr.com/"
 arch=(i686 x86_64 'mips64el')
 license=('BSD')
 depends=('zlib' 'ilmbase')
 options=('!libtool')
-source=("http://download.savannah.nongnu.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz"
+source=("https://github.com/downloads/${pkgname}/${pkgname}/${pkgname}-${pkgver}.tar.gz"
         'gcc43.patch')
-md5sums=('27113284f7d26a58f853c346e0851d7a'
-         'd91fae759053a70bcedcf02eb33ca4a2')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -27,3 +25,6 @@ package() {
   make DESTDIR="${pkgdir}" install
   install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
+
+md5sums=('a9e0369dfd68941c50cdaa93e9d7a8d1'
+         'd91fae759053a70bcedcf02eb33ca4a2')
diff --git a/extra/subversion/PKGBUILD b/extra/subversion/PKGBUILD
index b38400de2..ed44cee47 100644
--- a/extra/subversion/PKGBUILD
+++ b/extra/subversion/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 165382 2012-08-17 10:46:53Z stephane $
+# $Id: PKGBUILD 168489 2012-10-12 17:51:02Z stephane $
 # Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
 # Contributor: Paul Mattal <paul@archlinux.org>
 # Contributor: Jason Chu <jason@archlinux.org>
 
 pkgname=subversion
-pkgver=1.7.6
+pkgver=1.7.7
 pkgrel=1
 pkgdesc="A Modern Concurrent Version Control System"
 arch=('i686' 'x86_64' 'mips64el')
@@ -29,8 +29,8 @@ source=(http://apache.mirror.rafal.ca/subversion/$pkgname-$pkgver.tar.bz2{,.asc}
         svnserve.service
         subversion-1.7.6-kwallet-gcc47.patch        
         subversion.rpath.fix.patch)
-sha1sums=('5b76a9f49e2c4bf064041a7d6b1bfcc3aa4ed068'
-          'd8d99c01c49b189047389816b720923f1d9dbf2a'
+sha1sums=('c9fc0c5992eda36ba9affd93a15929e25958a951'
+          '3df83e46277f0f08868236a6b6e6c0f0d7ef9278'
           '64ba3e6ebafc08ac62f59d788f7a825fdce69573'
           '73b36c046c09cec2093354911c89e3ba8056af6c'
           'ad117bf3b2a838a9a678a93fd8db1a066ad46c41'
diff --git a/extra/xsp/PKGBUILD b/extra/xsp/PKGBUILD
index 24ce7a846..88b3f9217 100644
--- a/extra/xsp/PKGBUILD
+++ b/extra/xsp/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 156037 2012-04-11 18:58:41Z daniel $
+# $Id: PKGBUILD 168400 2012-10-10 22:19:53Z tomegun $
 # Maintainer: Daniel Isenmann <daniel@archlinux.org>
 # Contributor: Tobias Kieslich <tobias@justdreams.de>
 
 pkgname=xsp
 pkgver=2.10.2
-pkgrel=3
+pkgrel=4
 pkgdesc="A simple webserver based on mono - provides ASP.NET support"
 arch=(i686 x86_64 'mips64el')
 license=('custom')
@@ -12,12 +12,8 @@ url="http://www.go-mono.com"
 depends=('mono>=2.10.2' 'sqlite')
 options=(!makeflags)
 install=${pkgname}.install
-source=(http://ftp.novell.com/pub/mono/sources/${pkgname}/${pkgname}-${pkgver}.tar.bz2 \
-        ${pkgname}.rc.d ${pkgname}.conf.d ${pkgname}.webapp)
-md5sums=('4fe62fc95ad5dc136d8a7f3299d523b6'
-         '9575bd7d6f64d51ba05bdd6370665858'
-         '35d921df0fefc30f47a438c95d420efc'
-         'c917c07f68b945691506c29750db482f')
+source=(http://download.mono-project.com/sources/xsp/xsp-2.10.2.tar.bz2
+        ${pkgname}.rc.d ${pkgname}.conf.d ${pkgname}.webapp ${pkgname}.service)
 
 build() {
  # get rid of that .wapi errors; thanks to brice
@@ -57,5 +53,12 @@ package(){
   install -D -m644 ${srcdir}/${pkgname}.webapp \
     ${pkgdir}/etc/${pkgname}/${pkgname}.webapp
   install -D -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING
-
+ # install systemd service file
+  install -D -m644 ${srcdir}/${pkgname}.service \
+    ${pkgdir}/usr/lib/systemd/system/xsp.service
 }
+md5sums=('4fe62fc95ad5dc136d8a7f3299d523b6'
+         '9575bd7d6f64d51ba05bdd6370665858'
+         '35d921df0fefc30f47a438c95d420efc'
+         'c917c07f68b945691506c29750db482f'
+         '9d83bd36d209f8d36a11dfbc4fa50819')
diff --git a/extra/xsp/xsp.service b/extra/xsp/xsp.service
new file mode 100644
index 000000000..36b802e21
--- /dev/null
+++ b/extra/xsp/xsp.service
@@ -0,0 +1,8 @@
+[Unit]
+Description=XSP Web Server
+
+[Service]
+ExecStart=/usr/bin/xsp --appconfigdir /etc/xsp --nonstop
+
+[Install]
+WantedBy=multi-user.target
diff --git a/extra/xterm/PKGBUILD b/extra/xterm/PKGBUILD
index 2a42af223..3f3f9ebb7 100644
--- a/extra/xterm/PKGBUILD
+++ b/extra/xterm/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 167270 2012-09-29 15:04:11Z andyrtr $
+# $Id: PKGBUILD 168424 2012-10-11 15:38:51Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Alexander Baldeck <alexander@archlinux.org>
 
 pkgname=xterm
-pkgver=282
+pkgver=283
 pkgrel=1
 pkgdesc="X Terminal Emulator"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ license=('custom')
 depends=('libxft' 'libxaw' 'ncurses' 'xorg-luit' 'xbitmaps')
 source=(ftp://invisible-island.net/${pkgname}/${pkgname}-${pkgver}.tgz
         LICENSE)
-md5sums=('eeac090c7e56ea573f7691d382a59968'
+md5sums=('678fb45f749216b11d57c4ffc935df65'
          '10ecc3f8ee91e3189863a172f68282d2')
 
 build() {
diff --git a/gnome-unstable/farstream/PKGBUILD b/gnome-unstable/farstream/PKGBUILD
index e152cece7..2c9bf363c 100644
--- a/gnome-unstable/farstream/PKGBUILD
+++ b/gnome-unstable/farstream/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 167403 2012-10-01 23:14:26Z jgc $
+# $Id: PKGBUILD 168361 2012-10-09 07:21:08Z ibiru $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=farstream
-pkgver=0.2.0
+pkgver=0.2.1
 pkgrel=1
 pkgdesc="Farstream (formerly Farsight) - Audio/Video Communications Framework"
 arch=(i686 x86_64)
@@ -15,7 +15,7 @@ conflicts=('farsight2')
 replaces=('farsight2')
 options=(!libtool)
 source=(http://freedesktop.org/software/$pkgname/releases/$pkgname/$pkgname-$pkgver.tar.gz)
-md5sums=('efedec4a885170d350b5cc43c933f1c0')
+md5sums=('479c42adf5cc606abcb47d58ed542414')
 
 build() {
   cd  "$pkgname-$pkgver"
diff --git a/gnome-unstable/pidgin/PKGBUILD b/gnome-unstable/pidgin/PKGBUILD
new file mode 100644
index 000000000..cc41d66a4
--- /dev/null
+++ b/gnome-unstable/pidgin/PKGBUILD
@@ -0,0 +1,100 @@
+# $Id: PKGBUILD 168421 2012-10-11 15:28:56Z foutrelis $
+# Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
+# Contributor: Ionut Biru <ibiru@archlinux.org>
+# Contributor: Andrea Scarpino <andrea@archlinux.org>
+# Contributor: Alexander Fehr <pizzapunk gmail com>
+# Contributor: Lucien Immink <l.immink@student.fnt.hvu.nl>
+
+pkgname=('pidgin' 'libpurple' 'finch')
+pkgver=2.10.6
+pkgrel=2
+arch=('i686' 'x86_64')
+url="http://pidgin.im/"
+license=('GPL')
+makedepends=('startup-notification' 'gtkspell' 'libxss' 'nss' 'libsasl' 'libsm'
+             'libidn' 'python2' 'hicolor-icon-theme' 'gstreamer0.10' 'avahi'
+             'tk' 'ca-certificates' 'intltool'
+             'networkmanager')
+options=('!libtool')
+source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2)
+sha256sums=('3e25a633b97cbfa8326999a30282e7a662a9b9bbf2853be84af0b8fb60392c96')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  # Use Python 2
+  sed -i 's/env python$/&2/' */plugins/*.py \
+    libpurple/purple-{remote,notifications-example,url-handler}
+
+  ./configure \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    --disable-schemas-install \
+    --disable-meanwhile \
+    --disable-gnutls \
+    --enable-cyrus-sasl \
+    --disable-doxygen \
+    --enable-nm \
+    --disable-vv \
+    --with-python=/usr/bin/python2 \
+    --with-system-ssl-certs=/etc/ssl/certs
+    make
+}
+
+package_pidgin(){
+  pkgdesc="Multi-protocol instant messaging client"
+  depends=('libpurple' 'startup-notification' 'gtkspell' 'libxss' 'libsm'
+           'hicolor-icon-theme')
+  optdepends=('aspell: for spelling correction')
+  install=pidgin.install
+
+  cd "$srcdir/pidgin-$pkgver"
+
+  # For linking
+  make -C libpurple DESTDIR="$pkgdir" install-libLTLIBRARIES
+
+  make -C pidgin DESTDIR="$pkgdir" install
+  make -C doc DESTDIR="$pkgdir" install
+
+  # Remove files that are packaged in libpurle
+  make -C libpurple DESTDIR="$pkgdir" uninstall-libLTLIBRARIES
+
+  install -Dm644 pidgin.desktop "$pkgdir"/usr/share/applications/pidgin.desktop
+
+  rm "$pkgdir/usr/share/man/man1/finch.1"
+}
+
+package_libpurple(){
+  pkgdesc="IM library extracted from Pidgin"
+  depends=('gstreamer0.10' 'libsasl' 'libidn' 'dbus-glib' 'nss')
+  optdepends=('avahi: Bonjour protocol support'
+              'ca-certificates: SSL CA certificates'
+              'python2-dbus: for purple-remote and purple-url-handler'
+              'tk: Tcl/Tk scripting support')
+
+  cd "$srcdir/pidgin-$pkgver"
+
+  for _dir in libpurple share/sounds share/ca-certs m4macros po; do
+    make -C "$_dir" DESTDIR="$pkgdir" install
+  done
+}
+
+package_finch(){
+  pkgdesc="A ncurses-based messaging client"
+  depends=("libpurple=$pkgver-$pkgrel" 'libx11' 'python2')
+
+  cd "$srcdir/pidgin-$pkgver"
+
+  # For linking
+  make -C libpurple DESTDIR="$pkgdir" install-libLTLIBRARIES
+
+  make -C finch DESTDIR="$pkgdir" install
+  make -C doc DESTDIR="$pkgdir" install
+
+  # Remove files that are packaged in libpurle
+  make -C libpurple DESTDIR="$pkgdir" uninstall-libLTLIBRARIES
+
+  rm "$pkgdir"/usr/share/man/man1/pidgin.1
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/gnome-unstable/pidgin/pidgin.install b/gnome-unstable/pidgin/pidgin.install
new file mode 100644
index 000000000..1a05f573e
--- /dev/null
+++ b/gnome-unstable/pidgin/pidgin.install
@@ -0,0 +1,11 @@
+post_install() {
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}
diff --git a/libre/blender-libre/PKGBUILD b/libre/blender-libre/PKGBUILD
index 6e3228359..f7005d739 100644
--- a/libre/blender-libre/PKGBUILD
+++ b/libre/blender-libre/PKGBUILD
@@ -3,8 +3,8 @@
 
 _pkgname=blender
 pkgname=blender-libre
-pkgver=2.63a
-pkgrel=5
+pkgver=2.64
+pkgrel=1
 pkgdesc="A fully integrated 3D graphics creation suite (without nonfree cuda-toolkit support)"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
@@ -21,17 +21,17 @@ install=${_pkgname}.install
 source=(http://download.${_pkgname}.org/source/${_pkgname}-${pkgver}.tar.gz
         ffmpeg-0.11.patch
         boost-1.50.patch)
-md5sums=('31a60b3ce5466d965cb7e2648995e092'
+md5sums=('caec080d2a3dcd57fe1ca20c51c00e53'
          '9e5649403e51654615d30b10bc460217'
          '0bab80da07d980c47b8ce3cb998edaef')
 
 build() {
   cd "${srcdir}/${_pkgname}-${pkgver}"
 
-  patch -Np1 < "${srcdir}"/ffmpeg-0.11.patch
-  patch -Np1 < "${srcdir}"/boost-1.50.patch
-  sed -i "/<libavcodec\/opt.h>/d" intern/ffmpeg/ffmpeg_compat.h
-  sed -i "/<libavcodec\/opt.h>/d" source/blender/blenkernel/intern/writeffmpeg.c
+  #patch -Np1 < "${srcdir}"/ffmpeg-0.11.patch
+  #patch -Np1 < "${srcdir}"/boost-1.50.patch
+  #sed -i "/<libavcodec\/opt.h>/d" intern/ffmpeg/ffmpeg_compat.h
+  #sed -i "/<libavcodec\/opt.h>/d" source/blender/blenkernel/intern/writeffmpeg.c
 
   mkdir build
   cd build
diff --git a/libre/cdfs-libre/PKGBUILD b/libre/cdfs-libre/PKGBUILD
index 9827d6813..5afccbcfb 100644
--- a/libre/cdfs-libre/PKGBUILD
+++ b/libre/cdfs-libre/PKGBUILD
@@ -6,7 +6,7 @@
 _pkgname=cdfs
 pkgname=cdfs-libre
 pkgver=2.6.27
-pkgrel=30
+pkgrel=31
 pkgdesc="File system module libre 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/libre/cdfs-libre/cdfs.install b/libre/cdfs-libre/cdfs.install
index 1c3cb4f8e..aa71a92ac 100644
--- a/libre/cdfs-libre/cdfs.install
+++ b/libre/cdfs-libre/cdfs.install
@@ -1,14 +1,14 @@
 post_install() {
-  EXTRAMODULES='extramodules-3.5-LIBRE'
+  EXTRAMODULES='extramodules-3.6-LIBRE'
   depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
 }
 
 post_upgrade() {
-  EXTRAMODULES='extramodules-3.5-LIBRE'
+  EXTRAMODULES='extramodules-3.6-LIBRE'
   depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
 }
 
 post_remove() {
-  EXTRAMODULES='extramodules-3.5-LIBRE'
+  EXTRAMODULES='extramodules-3.6-LIBRE'
   depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
 }
diff --git a/libre/iceweasel-i18n/PKGBUILD b/libre/iceweasel-i18n/PKGBUILD
index 16acf66e2..899c009f6 100644
--- a/libre/iceweasel-i18n/PKGBUILD
+++ b/libre/iceweasel-i18n/PKGBUILD
@@ -9,7 +9,7 @@
 # - Run 'make'. It will take care of everything else for you.
 
 _debname=iceweasel
-_debver=15.0.1
+_debver=16.0.1
 _debrel=1
 _debrepo=http://ftp.debian.org/debian/pool/main/
 debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
@@ -20,7 +20,7 @@ pkgbase=iceweasel-i18n
 pkgname=($(for lang in ${_langpacks[@]}
         do echo $pkgbase-$lang | tr A-Z a-z
         done))
-_pkgver=15.0.1
+_pkgver=16.0.1
 pkgver=${_debver}.${_debrel}
 pkgrel=1
 
@@ -40,7 +40,7 @@ build() {
   for f in *.deb
   do
       bsdtar xf $f
-      bsdtar xf data.tar.gz
+      bsdtar xf data.tar.xz
   done
 }
 
@@ -56,90 +56,90 @@ package_iceweasel-i18n-$(echo $lang | tr A-Z a-z)() {
 "
 done
 
-md5sums=('79831dfa9c7bc1d225c1e0731aa1812d'
-         '5064fdac19ceb7a0e7591e3d5227c71a'
-         '58e40739dfdef056300b69f3ff243bf7'
-         '9b1e8be0c7e9f11c1b6833622c41f7f7'
-         'f2cc2ab7fd4efb94a0abc2ed9f8dcd99'
-         '0c6b8d597963363d4deff2ba302933cb'
-         '4caf1810d3ec159aaee5aabe5fb41015'
-         '052e9fb61183919a9cef0ba3a21c1065'
-         '22a4011c70c2c7f2feb56ba9aa1b75b3'
-         'e450bdc0489c13da7007046efde141d7'
-         '1066e9b63a9615e5e705abd050886381'
-         'fb21b42b85f72d29ad104ee518f86816'
-         '261c4edc8eb830256e60221be390d573'
-         '489f7bf241f72945dd8003b7d579505a'
-         'e53715797a28a95dd5ebb094695f5d7d'
-         '965568dae2adacfaa89af19861bdd3c8'
-         '2c0f1dadd9dad562405bc10633e9ea55'
-         '6d35c2d76d364a858f60cbb8b0660a87'
-         'b735ed5cffb084c1c91146d27c4023f5'
-         '263a9856b1a3a00b629a22f2f69c6d4e'
-         '6b9235119e92fe3625e7ee12ad3cf7f1'
-         '2a8e8f053bd70a889a15bdac9e7b48de'
-         '337990a6b6b32cd8602617f0542577ad'
-         '48613cca6a97c02403cc9690e9fd8d2c'
-         '8be32d05a78f7276a4a6c4fcad6de138'
-         'a6ea3d88bfd8f4ef58e484639cd2a699'
-         'c1d0d16819bddceed43b25e4840c5e87'
-         '2dcd5644c1c95add25902727e9ac7d42'
-         '15176fb56b7c67949ca1d29ee02ce978'
-         '5fc634287dae98715ce017421212cc04'
-         '3076e60893d0e6cd32c679d021d00630'
-         '0157ff70e0e09a501525c56cd3b88ea4'
-         'd96211027a8225e2f72bd68abd664949'
-         'ffdfb3c66259660494af038d4079c097'
-         'b891b408f643120a985c9cac9e81742a'
-         '16353581281c2bec3c937e089fb6457e'
-         '3b74bab168b0e0b463082a7adfef27de'
-         '350212900b1b5dedfde431f3fabbf9c9'
-         '06939ccc30180980ea6e12eae31495c9'
-         '29c8cf5d130e5592b1814dcc51a2dae2'
-         '18bc79a25230dffe1c27ec017eb96fd1'
-         '55ffa67fd02875c87b2b59b3359d68b8'
-         '0ecb61d1344ade52509604e9586b2d4c'
-         '8eef6c0339ca718a14cdc74b9886908b'
-         '5b70ad36f87875e1743586e04b12a411'
-         '18ff63b7fb7b48c240c23d8b7b664ca9'
-         'fd70ac793964f2ce3714f302b30406f7'
-         'f06d30c67e79b8ba8fe8140dcc6a7135'
-         '1ce03a6583705dd86d2badc7892fe93d'
-         '6fd4037255e5cf8839dab79ecef04e27'
-         '2ac8f87c1506270fd245e94e0ac3518a'
-         '68ef53993504ce07ff1f6afde33cb81c'
-         '49c5830b53b99102543eef7314207309'
-         '8dc5f8b6b93e94b576ea8c10275487e5'
-         '8f17ba770e49782537f1735260c03541'
-         '96c8f2567b232854a725163160c65448'
-         '58e122361c24f596e2ab7a4db0bdee2e'
-         'a54c41dc316660ce259451a15601644c'
-         '6938ca2d179eb378affc3cb42cc2c246'
-         'ed3a70fc0f5ede98f3d11183c0d9617b'
-         'dd9f39a6c00a2ee8afd86385a6befe61'
-         'a2c421a7c15a1756f8b08806b84c448f'
-         '5bd32e2abf133b3ba7a38c870961a2b5'
-         '8d3715ee6389fc20989189ece7dac88b'
-         'cc3cd43d79e2e952118e589e9cdb1519'
-         'bbb1bd76a28f5f339786a15a82dc6511'
-         '6e305cf35820a7eb81f233ad4cf0c6b3'
-         'f268902fa45c71b989ae84bff17dfad7'
-         'fc19d4e5c1fe55aed5e7ff81f4c5840a'
-         '983e4aade5b9f3744db59cd3e36f4957'
-         '88323b7e6cf6f5e3a4ce1a23fc818f13'
-         'e6ab0d4d5e9d3e1b7f7b994998667931'
-         '572900c28726fc8aa25de53af7769218'
-         '21b497ea035a29df60fd3e8d07b56ddd'
-         '8a1667e492f18344ebcbbff72b9397e8'
-         '007462b1c8d812c56ab5d1856f15ca3e'
-         '8bd629c3984be0f9deeea91515d7367e'
-         '6853d129015e003996ccd94cf3873893'
-         'def9852b081ab0bfe9217341e1a180e0'
-         '3c41610d639a0d30fc38bcdfe69925f6'
-         '934acd8b6f51527c3d384d268b054311'
-         '390d48709061fe8fa586c6e5ccd36fee'
-         'f02a6c5c7ff53d61576d63258e65214c'
-         'cdba209a41e8d6336539dab4fb4dcfbf'
-         '98651af79417b210a85702e40c19d4fb'
-         '016841fdf23b1e3ee4d4dcb5626a8dad'
-         '59128bae2e6a3cf053e191bf632c47d6')
-\ No newline at end of file
+md5sums=('2f40a462c2850b50a604371e875fc47c'
+         'b49d42e9000a1163fd74d213624d8e86'
+         '385aa5d0bb43d43abb5ccddaae45bdf6'
+         'fce90fb3c7fddc26aa50978182f8b831'
+         '163277191a666f36a2885cf92a163961'
+         'e99bb607fd025990604e3229ce9aa8f6'
+         '35dcd2dd926b6e87dda1c11405b66472'
+         'debafd1aeb232448241953c66b89e63b'
+         'd23722619bb0d7f94894d2357060f629'
+         'cad3e2bf6d1d97fc8dd76426591e4511'
+         '72b529f4aa744b2368703c19080940f7'
+         'f0b1b1ee217230bd735c80b881657c92'
+         '9335e2678d66366a03ddfb4028b5c15e'
+         'a173f9f07df4cc614e23694b0e2f3ca1'
+         '5cd9492c24fe0476431ecb83dfa660ee'
+         '9f7c84b8269c756ac9feb96e59e4c903'
+         'a7dc03ef8409f2da04fc3a0a52016631'
+         '10e89e4953f1b9269e873345f03b867b'
+         'd893c8d240fc27a60b39f91f53a309cc'
+         '34b2d538d41fdcfd01d34a7cfb147135'
+         '1ce5f6b8a2e3e4921263d5af004f40bb'
+         'e59d36431f7f12eed4b7c89e2597fa6e'
+         '68684fce0eb66875f6d64f93b2e5fb4f'
+         'ecbf294dc3ac7bc558969479b3619501'
+         'a6226b0ab4b404d5e15194b7fd613604'
+         'a7234e85380e6cb647026a40275416e9'
+         '7b2877ea2915bdbabd2748ef4b180755'
+         '2adee8f256369fe890445eeffcd361c6'
+         'd9b1853f350d4124e5ebc2561beb8814'
+         'df6fa75a7165973d426c7d74e6c06cee'
+         '8ca0f965013836a32e4583da92149099'
+         'f007c9402015858a7a817be7f9038bbe'
+         'a7e87b3320cfea4d7b5d95b3f6769cd7'
+         '05659f1784f63c55dfe6735823b2e23a'
+         'a08a8a2504a8b5f2e419ed9f969a32be'
+         'ce7d8708af5982b26d645b7cd7e5b33b'
+         '77d7d6a32bffdcd46e8d4444f05b645d'
+         '5fcf6fd003938edeea07be704c92de74'
+         '8a83c45d55ee7b69cb895e33db3cfeb4'
+         '561255aeb09362d5ed5b3c4bfdf8f293'
+         '77f3d9c38dca64141d32babed3c4afb7'
+         'c30689f2cf263d4780bd106af2a68d0c'
+         'd25d040fd7d824f848b3b9a5fbddb446'
+         '30af6b1339fdda31b1acffa87a914363'
+         '582116acc9c6e38226bc8e256ab6bb9b'
+         '51811e3139cc4e514cf3d8c29e468e7c'
+         '987fab8eccf60ffbbb685e7af297030b'
+         '60f217af071d95743aad066daadc1a95'
+         '649e1a6e583aed2811427f3493b0aa74'
+         '33ba3c51cff806110324d0f27a63848f'
+         '8dbd143d46cc51b373f6b61f1a27d6f4'
+         '3fb0bec111ccc6dabe6c785810c40620'
+         'fc71d03873e7e1d4099702c1ab24c6da'
+         '775894f40a434b91f3489ff19f8237ee'
+         '71416fc9bf41b2c6719bc0b3c55e7b7b'
+         '30f988322526cfc25b15cb9179d69be4'
+         '195a1099a613215160c8be5f63169ce3'
+         'b59a10c70e33920d08750b76349ae764'
+         'd9f0b1dd204b34a78faca8b0de73fe2a'
+         'dd3eae36828975d87477fe465406e1e6'
+         'f8fbcee8171a6f7e0e81f8e0e3a381df'
+         'd5e5b6d7f4018b34fe01980548221332'
+         '7db06a1a09551d6ad943feb398affe57'
+         '7e7e0ccae292b3423d5d1a5dd848abe0'
+         '8397c0e05c04c6b054de4fe524a95c42'
+         '89becfa004fb398d2409800f5fb15179'
+         'd90fbc489d9993177a36ae788f9f23ed'
+         'b5aa84fbfa8e7ab12417b23f003fb17e'
+         'faf8056065dcf815e9a305b2739d0063'
+         '2e42ba1813720717da72041989c02880'
+         'a37d32a8cd3b8a5d4247527e6bc82380'
+         'd651717b27c2ffd4ce52d3c51b18dd85'
+         '2cc13f741a6910db6c3d00e7c53fb575'
+         '31755af06ea85ac187588076d20fa991'
+         'ff2ff3b748ef2dab4371897bfdc96dd4'
+         '2f38fda847f928bee7fba4772360699b'
+         '4e8c459c0c5d009c633e843a0420d113'
+         '4ce85d3534267db686f7d8181c499f17'
+         '465dd984f2f96407213c174ec832e51d'
+         'aade2355978099d9fc25d0aebb3add7f'
+         'c66934fca336e18aa90938b0bc5991d7'
+         'cc128b35d45e14047f769ee6f0c7af76'
+         '2357b049d7a7eb241b1a86f359aaa576'
+         '78f9371eb4c4c48a9ecd35f9e5c90461'
+         '9c06a7d81fb49995b56a3dfb4c77db9d'
+         '4af51a779abaa49a6bae6b90ccdb3fd8'
+         '3ee205c981dcc548f3e501aa06167df4')
diff --git a/libre/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch b/libre/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch
index 240c3d4e8..a5fe02165 100644
--- a/libre/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch
+++ b/libre/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch
@@ -139,7 +139,7 @@ index 21cf405..f3c1a6b 100644
  <!ENTITY noMigrationSources.label       "No programs that contain bookmarks, history or password data could be found.">
  
 diff --git a/browser/locales/en-US/chrome/browser/migration/migration.properties b/browser/locales/en-US/chrome/browser/migration/migration.properties
-index ab82d85..915f6b8 100644
+index 260bc29..52b32cc 100644
 --- a/browser/locales/en-US/chrome/browser/migration/migration.properties
 +++ b/browser/locales/en-US/chrome/browser/migration/migration.properties
 @@ -8,7 +8,6 @@ profileName_format=%S %S
@@ -150,7 +150,7 @@ index ab82d85..915f6b8 100644
  
  importedBookmarksFolder=From %S
  
-@@ -22,22 +21,22 @@ importedSafariReadingList=Reading List (From Safari)
+@@ -24,22 +23,22 @@ importedSafariReadingList=Reading List (From Safari)
  2_ie=Cookies
  2_safari=Cookies
  2_chrome=Cookies
@@ -177,25 +177,25 @@ index ab82d85..915f6b8 100644
  
  32_ie=Favorites
  32_safari=Bookmarks
-@@ -46,4 +45,4 @@ importedSafariReadingList=Reading List (From Safari)
+@@ -48,4 +47,4 @@ importedSafariReadingList=Reading List (From Safari)
  64_ie=Other Data
  64_safari=Other Data
  64_chrome=Other Data
 -64_firefox=Bookmarks Backups
 +64_self=Bookmarks Backups
 diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn
-index 697b217..b6e1709 100644
+index 339ffda..6999b26 100644
 --- a/toolkit/content/jar.mn
 +++ b/toolkit/content/jar.mn
 @@ -38,7 +38,7 @@ toolkit.jar:
  +  content/global/mozilla.xhtml               (mozilla.xhtml)
- *+ content/global/nsDragAndDrop.js            (nsDragAndDrop.js)
+    content/global/nsDragAndDrop.js            (nsDragAndDrop.js)
     content/global/resetProfile.css            (resetProfile.css)
 -*  content/global/resetProfile.js             (resetProfile.js)
 +   content/global/resetProfile.js             (resetProfile.js)
- *  content/global/resetProfile.xul            (resetProfile.xul)
- *  content/global/resetProfileProgress.xul    (resetProfileProgress.xul)
- *  content/global/treeUtils.js                (treeUtils.js)
+    content/global/resetProfile.xul            (resetProfile.xul)
+    content/global/resetProfileProgress.xul    (resetProfileProgress.xul)
+    content/global/treeUtils.js                (treeUtils.js)
 diff --git a/toolkit/content/resetProfile.js b/toolkit/content/resetProfile.js
 index dcb4065..09c1146 100644
 --- a/toolkit/content/resetProfile.js
@@ -267,10 +267,10 @@ index f35c227..7062886 100644
  
  %{C++
 diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp
-index e5d3042..6de3390 100644
+index 60348b5..c240c4f 100644
 --- a/toolkit/xre/nsAppRunner.cpp
 +++ b/toolkit/xre/nsAppRunner.cpp
-@@ -3650,7 +3650,7 @@ XREMain::XRE_mainRun()
+@@ -3651,7 +3651,7 @@ XREMain::XRE_mainRun()
          if (gDoProfileReset) {
            // Automatically migrate from the current application if we just
            // reset the profile.
diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD
index c2bb0cab6..ea048d500 100644
--- a/libre/iceweasel-libre/PKGBUILD
+++ b/libre/iceweasel-libre/PKGBUILD
@@ -14,7 +14,7 @@ _pgo=false
 
 # We're getting this from Debian Experimental
 _debname=iceweasel
-_debver=15.0.1
+_debver=16.0.1
 _debrel=1
 [ "$CARCH" == "mips64el" ] && { _debver=13.0.1; _debrel=2; }
 _debrepo=http://ftp.debian.org/debian/pool/main/
@@ -53,16 +53,16 @@ source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.bz2"
         vendor.js
         shared-libs.patch
         Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch)
-md5sums=('0936242388cd4c75930c1d2487e15216'
-         'ce37c76476b8edf40780d00cf79d0d62'
+md5sums=('33e50f7ddfa7274e5a3bd393c37fb3b3'
+         'ddfcf225ea0e3d7b4b377f4a63d5e8c4'
          'eab149c1994ab14392e55af3abb08e80'
          'ac29b01c189f20abae2f3eef1618ffc0'
          'a485a2b5dc544a8a2bd40c985d2e5813'
-         '6d8816d2577263556d76f1aa4527b55b'
-         'e529742c0a425648087bc3ce537fe4c5'
+         '8768dfc39e9f1057c2956bf4405ae58e'
+         'abf5ecb74caa857abb42bcfbb3442d9c'
          '0d053487907de4376d67d8f499c5502b'
          '52e52f840a49eb1d14be1c0065b03a93'
-         'c52fac65c1e06290a5108b75c31ace79')
+         '0a31239f1008038df5057982fe745dec')
 
 if [ "$_pkgname" != "$pkgname" ]; then
   provides+=("$_pkgname=$pkgver")
diff --git a/libre/iceweasel-libre/iceweasel-install-dir.patch b/libre/iceweasel-libre/iceweasel-install-dir.patch
index f80a3eca9..a44aef496 100644
--- a/libre/iceweasel-libre/iceweasel-install-dir.patch
+++ b/libre/iceweasel-libre/iceweasel-install-dir.patch
@@ -1,28 +1,31 @@
-diff -Nur iceweasel-9.0.1.orig/config/autoconf.mk.in iceweasel-9.0.1/config/autoconf.mk.in
---- iceweasel-9.0.1.orig/config/autoconf.mk.in	2011-12-31 17:07:52.000000000 -0500
-+++ iceweasel-9.0.1/config/autoconf.mk.in	2011-12-31 17:11:18.000000000 -0500
-@@ -68,8 +68,8 @@
- mandir		= @mandir@
- idldir		= $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_BASE_VERSION)
+diff -Nur iceweasel-16.0.1.orig/config/baseconfig.mk iceweasel-16.0.1/config/baseconfig.mk
+--- iceweasel-16.0.1.orig/config/baseconfig.mk	2012-10-10 19:42:45.000000000 -0200
++++ iceweasel-16.0.1/config/baseconfig.mk	2012-10-12 05:40:32.346949927 -0200
+@@ -1,10 +1,10 @@
+ INCLUDED_AUTOCONF_MK = 1
  
--installdir	= $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_BASE_VERSION)
--sdkdir		= $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_BASE_VERSION)
-+installdir	= $(libdir)/$(MOZ_APP_NAME)
-+sdkdir		= $(libdir)/$(MOZ_APP_NAME)-devel
+ MOZ_APP_BASE_VERSION = $(firstword $(subst ., ,$(MOZ_APP_VERSION))).$(word 2,$(subst ., ,$(MOZ_APP_VERSION)))
+-includedir := $(includedir)/$(MOZ_APP_NAME)-$(MOZ_APP_BASE_VERSION)
+-idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_BASE_VERSION)
+-installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_BASE_VERSION)
+-sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_BASE_VERSION)
++includedir := $(includedir)/$(MOZ_APP_NAME)
++idldir = $(datadir)/idl/$(MOZ_APP_NAME)
++installdir = $(libdir)/$(MOZ_APP_NAME)
++sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel
+ DIST = $(DEPTH)/dist
  
- DIST		= $(DEPTH)/dist
- LIBXUL_SDK      = @LIBXUL_SDK@
-diff -Nur iceweasel-9.0.1.orig/js/src/config/autoconf.mk.in iceweasel-9.0.1/js/src/config/autoconf.mk.in
---- iceweasel-9.0.1.orig/js/src/config/autoconf.mk.in	2011-12-20 18:28:21.000000000 -0500
-+++ iceweasel-9.0.1/js/src/config/autoconf.mk.in	2011-12-31 17:11:43.000000000 -0500
-@@ -60,8 +60,8 @@
- datadir		= @datadir@
- mandir		= @mandir@
+ # We do magic with OBJ_SUFFIX in config.mk, the following ensures we don't
+diff -Nur iceweasel-16.0.1.orig/js/src/config/baseconfig.mk iceweasel-16.0.1/js/src/config/baseconfig.mk
+--- iceweasel-16.0.1.orig/js/src/config/baseconfig.mk	2012-10-10 19:43:05.000000000 -0200
++++ iceweasel-16.0.1/js/src/config/baseconfig.mk	2012-10-12 05:08:23.064066227 -0200
+@@ -1,7 +1,7 @@
+ INCLUDED_AUTOCONF_MK = 1
  
--installdir	= $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
--sdkdir		= $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
-+installdir	= $(libdir)/$(MOZ_APP_NAME)
-+sdkdir		= $(libdir)/$(MOZ_APP_NAME)-devel
+-installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+-sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
++installdir = $(libdir)/$(MOZ_APP_NAME)
++sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel
  
- TOP_DIST	= @TOP_DIST@
  ifneq (,$(filter /%,$(TOP_DIST)))
+ DIST = $(TOP_DIST)
diff --git a/libre/iceweasel-libre/libre.patch b/libre/iceweasel-libre/libre.patch
index 9ffaf3a9a..7e7b7290f 100644
--- a/libre/iceweasel-libre/libre.patch
+++ b/libre/iceweasel-libre/libre.patch
@@ -1,7 +1,7 @@
-diff -urN iceweasel-13.0.orig/browser/app/profile/firefox.js iceweasel-13.0/browser/app/profile/firefox.js
---- mozilla-build.orig/browser/app/profile/firefox.js	2012-06-01 09:03:47.000000000 -0300
-+++ mozilla-build/browser/app/profile/firefox.js	2012-06-05 19:53:08.847012282 -0300
-@@ -64,11 +64,11 @@
+diff -urN iceweasel-16.0.orig/browser/app/profile/firefox.js iceweasel-16.0/browser/app/profile/firefox.js
+--- iceweasel-16.0.orig/browser/app/profile/firefox.js	2012-10-05 20:01:58.000000000 -0300
++++ iceweasel-16.0/browser/app/profile/firefox.js	2012-10-11 17:19:44.984225170 -0200
+@@ -37,11 +37,11 @@
  // Preferences for AMO integration
  pref("extensions.getAddons.cache.enabled", true);
  pref("extensions.getAddons.maxResults", 15);
@@ -18,16 +18,7 @@ diff -urN iceweasel-13.0.orig/browser/app/profile/firefox.js iceweasel-13.0/brow
  
  // Blocklist preferences
  pref("extensions.blocklist.enabled", true);
-@@ -92,7 +92,7 @@
- pref("extensions.autoDisableScopes", 15);
- 
- // Dictionary download preference
--pref("browser.dictionaries.download.url", "https://addons.mozilla.org/%LOCALE%/firefox/dictionaries/");
-+pref("browser.dictionaries.download.url", "about:blank");
- 
- // The minimum delay in seconds for the timer to fire.
- // default=2 minutes
-@@ -218,7 +218,7 @@
+@@ -194,7 +194,7 @@
  pref("extensions.update.interval", 86400);  // Check for updates to Extensions and 
                                              // Themes every day
  // Non-symmetric (not shared by extensions) extension-specific [update] preferences
@@ -36,25 +27,16 @@ diff -urN iceweasel-13.0.orig/browser/app/profile/firefox.js iceweasel-13.0/brow
  pref("extensions.dss.enabled", false);          // Dynamic Skin Switching                                               
  pref("extensions.dss.switchPending", false);    // Non-dynamic switch pending after next
                                                  // restart.
-@@ -252,7 +252,7 @@
- // 0 = blank, 1 = home (browser.startup.homepage), 2 = last visited page, 3 = resume previous browser session
- // The behavior of option 3 is detailed at: http://wiki.mozilla.org/Session_Restore
- pref("browser.startup.page",                1);
--pref("browser.startup.homepage",            "chrome://branding/locale/browserconfig.properties");
-+pref("browser.startup.homepage",            "about:home");
- 
- // This url, if changed, MUST continue to point to an https url. Pulling arbitrary content to inject into
- // this page over http opens us up to a man-in-the-middle attack that we'd rather not face. If you are a downstream
-@@ -345,7 +345,7 @@
- pref("browser.download.manager.resumeOnWakeDelay", 10000);
+@@ -327,7 +327,7 @@
+ pref("browser.download.panel.removeFinishedDownloads", false);
  
  // search engines URL
 -pref("browser.search.searchEnginesURL",      "https://addons.mozilla.org/%LOCALE%/firefox/search-engines/");
-+pref("browser.search.searchEnginesURL",      "http://www.gnu.org/software/gnuzilla/addons.html");
++pref("browser.search.searchEnginesURL",      "http://www.gnu.org/software/gnuzilla/addons.html#search%20engines");
  
  // pointer to the default engine name
  pref("browser.search.defaultenginename",      "chrome://browser-region/locale/region.properties");
-@@ -593,7 +593,7 @@
+@@ -584,7 +584,7 @@
  pref("accessibility.typeaheadfind.flashBar", 1);
  
  // plugin finder service url
diff --git a/libre/linux-libre-firmware/PKGBUILD b/libre/linux-libre-firmware/PKGBUILD
new file mode 100644
index 000000000..57488f6de
--- /dev/null
+++ b/libre/linux-libre-firmware/PKGBUILD
@@ -0,0 +1,49 @@
+# Maintainer: André Silva <emulatorman@lavabit.com>
+# Contributor: Márcio Silva <coadde@lavabit.com>
+
+pkgname=linux-libre-firmware
+pkgver=3.6
+pkgrel=2
+pkgdesc='Free firmware files for Linux-libre'
+arch=('any')
+url='http://linux-libre.fsfla.org/'
+license=('GPL2')
+provides=('linux-firmware=20120625'
+          'kernel26-firmware=2.6.34.99')
+conflicts=('linux-firmware'
+           'linux-firmware-git'
+           'kernel26-firmware'
+           'ar9170-fw'
+           'iwlwifi-1000-ucode'
+           'iwlwifi-3945-ucode'
+           'iwlwifi-4965-ucode'
+           'iwlwifi-5000-ucode'
+           'iwlwifi-5150-ucode'
+           'iwlwifi-6000-ucode'
+           'rt2870usb-fw'
+           'rt2x00-rt61-fw'
+           'rt2x00-rt71w-fw')
+replaces=('linux-firmware'
+          'kernel26-firmware'
+          'ar9170-fw'
+          'iwlwifi-1000-ucode'
+          'iwlwifi-3945-ucode'
+          'iwlwifi-4965-ucode'
+          'iwlwifi-5000-ucode'
+          'iwlwifi-5150-ucode'
+          'iwlwifi-6000-ucode'
+          'rt2870usb-fw'
+          'rt2x00-rt61-fw'
+          'rt2x00-rt71w-fw')
+source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/$pkgver-gnu/linux-libre-$pkgver-gnu.tar.xz")
+md5sums=('a2312edd0265b5b07bd4b50afae2b380')
+
+package() {
+  cd $srcdir/linux-$pkgver
+  
+  make INSTALL_FW_PATH=$pkgdir/usr/lib/firmware firmware_install
+
+  # move WHENCE file to linux-libre-firmware license folder
+  install -d -m755 $pkgdir/usr/share/licenses/$pkgname
+  mv firmware/WHENCE $pkgdir/usr/share/licenses/$pkgname
+}
diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD
index ec283afce..4feb1ac6f 100644
--- a/libre/linux-libre-lts/PKGBUILD
+++ b/libre/linux-libre-lts/PKGBUILD
@@ -154,7 +154,7 @@ build() {
 _package() {
   pkgdesc="The ${pkgbase} kernel and modules - stable longtime supported kernel package suitable for servers"
   [ "${pkgbase}" = "linux-libre" ] && groups=('base')
-  depends=('coreutils' 'kmod')
+  depends=('coreutils' 'linux-libre-firmware' 'kmod')
   optdepends=('crda: to set the correct wireless channels of your country')
   provides=("kernel26${_kernelname}=${pkgver}" "linux${_kernelname}=${pkgver}")
   conflicts=("kernel26${_kernelname}" "kernel26-libre${_kernelname}" "linux${_kernelname}")
diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD
index 9176015b9..b17744237 100644
--- a/libre/linux-libre/PKGBUILD
+++ b/libre/linux-libre/PKGBUILD
@@ -29,9 +29,6 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
         'Kbuild.platforms'
         'boot-logo.patch'
         'change-default-console-loglevel.patch'
-        'alsa-powersave-3.5.x.patch'
-        'watchdog-3.5.x.patch'
-        'i915-i2c-crash-3.5.x.patch'
         "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2")
 md5sums=('a2312edd0265b5b07bd4b50afae2b380'
          '62d272c8ec79bd2eb9cc56001aaf1042'
@@ -146,7 +143,7 @@ build() {
 _package() {
   pkgdesc="The ${pkgbase} kernel and modules"
   [ "${pkgbase}" = "linux-libre" ] && groups=('base')
-  depends=('coreutils' 'kmod')
+  depends=('coreutils' 'linux-libre-firmware' 'kmod')
   optdepends=('crda: to set the correct wireless channels of your country')
   provides=("kernel26${_kernelname}=${pkgver}" "linux${_kernelname}=${pkgver}")
   conflicts=("kernel26${_kernelname}" "kernel26-libre${_kernelname}" "linux${_kernelname}")
diff --git a/libre/lirc-libre/PKGBUILD b/libre/lirc-libre/PKGBUILD
index e8f6ff5a1..d4d91c412 100644
--- a/libre/lirc-libre/PKGBUILD
+++ b/libre/lirc-libre/PKGBUILD
@@ -6,14 +6,14 @@ _pkgbase=lirc
 pkgbase=lirc-libre
 pkgname=('lirc-libre' 'lirc-utils-libre')
 pkgver=0.9.0
-pkgrel=30
+pkgrel=31
 epoch=1
-_extramodules=extramodules-3.5-LIBRE
+_extramodules=extramodules-3.6-LIBRE
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.lirc.org/"
 license=('GPL')
 ### NOTICE don't forget to bump version in depends in package_lirc
-makedepends=('help2man' 'linux-libre-headers>=3.5' 'linux-libre-headers<3.6' 'alsa-lib' 'libx11' 'libftdi' 'libirman' 'python2')
+makedepends=('help2man' 'linux-libre-headers>=3.6' 'linux-libre-headers<3.7' 'alsa-lib' 'libx11' 'libftdi' 'libirman' 'python2')
 options=('!makeflags' '!strip')
 source=(http://prdownloads.sourceforge.net/${_pkgbase}/${_pkgbase}-${pkgver}.tar.bz2
         lirc_wpc8769l.patch
@@ -56,7 +56,7 @@ build() {
 
 package_lirc-libre() {
   pkgdesc="Linux-libre Infrared Remote Control kernel modules for stock kernel libre"
-  depends=('lirc-utils-libre' 'linux-libre>=3.4' 'linux-libre<3.5')
+  depends=('lirc-utils-libre' 'linux-libre>=3.6' 'linux-libre<3.7')
   replaces=('lirc' 'lirc+pctv')
   conflicts=('lirc')
   provides=("lirc=$pkgver")
diff --git a/libre/lirc-libre/lirc.install b/libre/lirc-libre/lirc.install
index b39282da6..976f5ab8a 100644
--- a/libre/lirc-libre/lirc.install
+++ b/libre/lirc-libre/lirc.install
@@ -1,4 +1,4 @@
-EXTRAMODULES=extramodules-3.5-LIBRE
+EXTRAMODULES=extramodules-3.6-LIBRE
 
 post_install() {
   # updating module dependencies
diff --git a/libre/parabola-keyring/PKGBUILD b/libre/parabola-keyring/PKGBUILD
index 7a95abd0b..9d77543ce 100644
--- a/libre/parabola-keyring/PKGBUILD
+++ b/libre/parabola-keyring/PKGBUILD
@@ -2,7 +2,7 @@
 # Maintainer: André Silva <emulatorman@lavabit.com>
 
 pkgname=parabola-keyring
-pkgver=20120816
+pkgver=20121012
 pkgrel=1
 pkgdesc='Parabola GNU/Linux-libre PGP keyring'
 arch=('any')
@@ -16,5 +16,5 @@ package() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
 	make PREFIX=/usr DESTDIR=${pkgdir} install
 }
-md5sums=('4163ebfce3ccc32e2398e18c19158fc1'
-         'b4b1b532657eb754ef2e9f7cf4d0a09a')
+md5sums=('386550a6b179ebd158bc7469362bf0b8'
+         '4794d17dd40d51069eca315c2243528b')
diff --git a/libre/tp_smapi-libre/PKGBUILD b/libre/tp_smapi-libre/PKGBUILD
index 19d1b8908..4c8910c2b 100644
--- a/libre/tp_smapi-libre/PKGBUILD
+++ b/libre/tp_smapi-libre/PKGBUILD
@@ -11,13 +11,13 @@
 _pkgname=tp_smapi
 pkgname=tp_smapi-libre
 pkgver=0.41
-pkgrel=11
+pkgrel=9
 pkgdesc="Modules for ThinkPad's SMAPI functionality"
 arch=('i686' 'x86_64')
 url='https://github.com/evgeni/tp_smapi'
 license=('GPL')
-depends=('linux-libre>=3.5' 'linux-libre<3.6')
-makedepends=('linux-libre-headers>=3.5' 'linux-libre-headers<3.6')
+depends=('linux-libre>=3.6' 'linux-libre<3.7')
+makedepends=('linux-libre-headers>=3.6' 'linux-libre-headers<3.7')
 replaces=("${_pkgname}")
 conflicts=("${_pkgname}")
 provides=("${_pkgname}=${pkgver}")
diff --git a/libre/tp_smapi-libre/tp_smapi.install b/libre/tp_smapi-libre/tp_smapi.install
index 5fe1bab90..3662e7f34 100644
--- a/libre/tp_smapi-libre/tp_smapi.install
+++ b/libre/tp_smapi-libre/tp_smapi.install
@@ -1,4 +1,4 @@
-extramodules=/usr/lib/modules/extramodules-3.5-ARCH
+extramodules=/usr/lib/modules/extramodules-3.6-ARCH
 
 post_install() {
   depmod -v $(< "$extramodules/version") &>/dev/null
diff --git a/libre/vhba-module-libre/PKGBUILD b/libre/vhba-module-libre/PKGBUILD
index 74209d64b..7405eb52f 100644
--- a/libre/vhba-module-libre/PKGBUILD
+++ b/libre/vhba-module-libre/PKGBUILD
@@ -2,17 +2,18 @@
 # Maintainer: Ray Rashif <schiv@archlinux.org>
 # Contributor: Mateusz Herych <heniekk@gmail.com>
 # Contributor: Charles Lindsay <charles@chaoslizard.org>
+# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 
 _pkgname=vhba-module
 pkgname=vhba-module-libre
 pkgver=20120422
-_extramodules=extramodules-3.5-LIBRE
-pkgrel=11
+_extramodules=extramodules-3.6-LIBRE
+pkgrel=12
 pkgdesc="Kernel libre module that emulates SCSI devices"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://cdemu.sourceforge.net/"
 license=('GPL')
-depends=('linux-libre>=3.5' 'linux-libre<3.6')
+depends=('linux-libre>=3.6' 'linux-libre<3.7')
 makedepends=('linux-libre-headers')
 options=(!makeflags)
 install=$_pkgname.install
diff --git a/libre/vhba-module-libre/vhba-module.install b/libre/vhba-module-libre/vhba-module.install
index b2a49a261..8bd740943 100644
--- a/libre/vhba-module-libre/vhba-module.install
+++ b/libre/vhba-module-libre/vhba-module.install
@@ -1,6 +1,6 @@
 _updatemod() {
   echo "  > Updating module dependencies..."
-  EXTRAMODULES='extramodules-3.5-LIBRE'
+  EXTRAMODULES='extramodules-3.6-LIBRE'
   depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
 }
 
diff --git a/libre/virtualbox-libre-modules/PKGBUILD b/libre/virtualbox-libre-modules/PKGBUILD
index 270e14af9..3bd4616eb 100644
--- a/libre/virtualbox-libre-modules/PKGBUILD
+++ b/libre/virtualbox-libre-modules/PKGBUILD
@@ -7,7 +7,7 @@
 pkgbase=virtualbox-libre-modules
 pkgname=('virtualbox-libre-host-modules' 'virtualbox-libre-guest-modules')
 pkgver=4.2.0
-pkgrel=5.3
+pkgrel=6
 arch=('i686' 'x86_64')
 url='http://virtualbox.org'
 license=('GPL')
@@ -32,15 +32,14 @@ build() {
 
 package_virtualbox-libre-host-modules(){
   pkgdesc='Host kernel libre modules for VirtualBox'
-  depends=('linux-libre>=3.5' 'linux-libre<3.6')
+  depends=('linux-libre>=3.6' 'linux-libre<3.7')
   provides=("virtualbox-host-modules=${pkgver}")
   replaces=('virtualbox-host-modules' 'virtualbox-modules' 'virtualbox-libre-modules')
   conflicts=('virtualbox-host-modules' 'virtualbox-modules' 'virtualbox-libre-modules')
   install=virtualbox-libre-host-modules.install
 
   _kernver=$(expac -Q '%v' linux-libre-headers)-LIBRE
-  #_extraver=extramodules-${_kernver%.*}-LIBRE
-  _extraver=extramodules-3.5-LIBRE
+  _extraver=extramodules-${_kernver%.*}-LIBRE
 
   install -dm755 "$pkgdir/usr/lib/modules/$_extraver"
   cd "dkms/vboxhost/$pkgver/$_kernver/$CARCH/module"
@@ -52,15 +51,14 @@ package_virtualbox-libre-host-modules(){
 package_virtualbox-libre-guest-modules(){
   pkgdesc='Guest kernel libre modules for VirtualBox'
   license=('GPL')
-  depends=('linux-libre>=3.5' 'linux-libre<3.6')
+  depends=('linux-libre>=3.6' 'linux-libre<3.7')
   provides=("virtualbox-guest-modules=${pkgver}")
   replaces=('virtualbox-guest-modules' 'virtualbox-archlinux-modules' 'virtualbox-parabola-modules')
   conflicts=('virtualbox-guest-modules' 'virtualbox-archlinux-modules' 'virtualbox-parabola-modules')
   install=virtualbox-libre-guest-modules.install
 
   _kernver=$(expac -Q '%v' linux-libre-headers)-LIBRE
-  #_extraver=extramodules-${_kernver%.*}-LIBRE
-  _extraver=extramodules-3.5-LIBRE
+  _extraver=extramodules-${_kernver%.*}-LIBRE
 
   install -dm755 "$pkgdir/usr/lib/modules/$_extraver"
   cd "dkms/vboxguest/$pkgver/$_kernver/$CARCH/module"
diff --git a/libre/virtualbox-libre-modules/virtualbox-libre-guest-modules.install b/libre/virtualbox-libre-modules/virtualbox-libre-guest-modules.install
index c3419c991..caf59aa13 100755
--- a/libre/virtualbox-libre-modules/virtualbox-libre-guest-modules.install
+++ b/libre/virtualbox-libre-modules/virtualbox-libre-guest-modules.install
@@ -2,16 +2,16 @@ post_install() {
 cat << EOF
 ===> You may want to load vboxguest, vboxsf and vboxvideo
 EOF
-    EXTRAMODULES='extramodules-3.5-LIBRE'
+    EXTRAMODULES='extramodules-3.6-LIBRE'
     depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
 }
 
 post_upgrade() {
-    EXTRAMODULES='extramodules-3.5-LIBRE'
+    EXTRAMODULES='extramodules-3.6-LIBRE'
     depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
 }
 
 post_remove() {
-    EXTRAMODULES='extramodules-3.5-LIBRE'
+    EXTRAMODULES='extramodules-3.6-LIBRE'
     depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
 }
diff --git a/multilib-testing/lib32-mesa/PKGBUILD b/multilib-testing/lib32-mesa/PKGBUILD
index fbc3017f4..35b76887b 100644
--- a/multilib-testing/lib32-mesa/PKGBUILD
+++ b/multilib-testing/lib32-mesa/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 77208 2012-10-06 21:02:40Z lcarlier $
+# $Id: PKGBUILD 77479 2012-10-10 21:26:42Z lcarlier $
 # Contributor: Jan de Groot <jgc@archlinux.org>
 # Contributor: Andreas Radke <andyrtr@archlinux.org>
 
 pkgbase=lib32-mesa
 pkgname=('lib32-libglapi' 'lib32-libgl' 'lib32-mesa' 'lib32-osmesa' 'lib32-libgles' 'lib32-ati-dri' 'lib32-intel-dri'
          'lib32-nouveau-dri') # lib32-libgbm needs udev
-_git=true
-_gitdate=20121005
-#_git=false
+#_git=true
+#_gitdate=20121005
+_git=false
 
 if [ "${_git}" = "true" ]; then
     pkgver=8.99.git_$_gitdate
   else
-    pkgver=8.0.4
+    pkgver=9.0
 fi
 
 pkgrel=1
@@ -23,7 +23,7 @@ makedepends=('glproto>=1.4.16' 'lib32-libdrm>=2.4.39' 'lib32-libxxf86vm>=1.1.2'
 url="http://mesa3d.sourceforge.net"
 license=('custom')
 options=('!libtool')
-source=(pthread_fix.diff)
+source=(git_fixes.diff)
 if [ "${_git}" = "true" ]; then
   # mesa git shot from 9.0 branch - see for state: http://cgit.freedesktop.org/mesa/mesa/log/?h=9.0
   #source=(${source[@]} 'ftp://ftp.archlinux.org/other/mesa/mesa-41d14eaf193c6b1eb87fe1998808a887f1c6c698.tar.gz')
@@ -31,8 +31,8 @@ if [ "${_git}" = "true" ]; then
 else
   source=(${source[@]} "ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2")
 fi
-md5sums=('03956ac54a44467678120f485b626633'
-         '107b77be1fbe64b4f0d87dfb441218b5')
+md5sums=('2ebce12196dbb7b69bdf7ef53b8afdee'
+         '60e557ce407be3732711da484ab3db6c')
 
 build() {
   export CC="gcc -m32"
@@ -48,7 +48,7 @@ build() {
   cd ${srcdir}/?esa-*
 
   # build fix from master http://cgit.freedesktop.org/mesa/mesa/commit/?id=dd4fde8f674f5e3efa19e929f97de4ecfd82391b
-  patch -Np1 -i ${srcdir}/pthread_fix.diff
+  patch -Np1 -i ${srcdir}/git_fixes.diff
 
   COMMONOPTS="--prefix=/usr \
     --sysconfdir=/etc \
diff --git a/multilib-testing/lib32-mesa/git_fixes.diff b/multilib-testing/lib32-mesa/git_fixes.diff
new file mode 100644
index 000000000..8132d1d10
--- /dev/null
+++ b/multilib-testing/lib32-mesa/git_fixes.diff
@@ -0,0 +1,93 @@
+From 161aababc659e23c4a8523366a31f63b3d14e280 Mon Sep 17 00:00:00 2001
+From: Ian Romanick <ian.d.romanick@intel.com>
+Date: Mon, 08 Oct 2012 22:07:10 +0000
+Subject: docs: Add 9.0 release md5sums
+
+Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
+---
+diff --git a/docs/relnotes-9.0.html b/docs/relnotes-9.0.html
+index d72c5bb..02b7324 100644
+--- a/docs/relnotes-9.0.html
++++ b/docs/relnotes-9.0.html
+@@ -26,7 +26,9 @@ because GL_ARB_compatibility is not supported.
+ 
+ <h2>MD5 checksums</h2>
+ <pre>
+-tbd
++be4cd34c6599a7cb9d254b05c48bdb1f  MesaLib-9.0.tar.gz
++60e557ce407be3732711da484ab3db6c  MesaLib-9.0.tar.bz2
++16b128544cd3f7e237927bb9f8aab7ce  MesaLib-9.0.zip
+ </pre>
+ 
+ 
+--
+cgit v0.9.0.2-2-gbebe
+From 32faf7ab0de8b88bb15a2cb262a73c411dce9d0d Mon Sep 17 00:00:00 2001
+From: Brian Paul <brianp@vmware.com>
+Date: Fri, 05 Oct 2012 22:47:40 +0000
+Subject: mesa: don't call TexImage driver hooks for zero-sized images
+
+This simply avoids some failed assertions but there's no reason to
+call the driver hooks for storing a tex image if its size is zero.
+
+Note: This is a candidate for the stable branches.
+(cherry picked from commit 91d84096497ff538f55591f7e6bb0b563726db8d)
+---
+diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c
+index 21646cc..8004876 100644
+--- a/src/mesa/main/teximage.c
++++ b/src/mesa/main/teximage.c
+@@ -3034,13 +3034,15 @@ teximage(struct gl_context *ctx, GLboolean compressed, GLuint dims,
+                                           border, internalFormat, texFormat);
+ 
+                /* Give the texture to the driver.  <pixels> may be null. */
+-               if (compressed) {
+-                  ctx->Driver.CompressedTexImage(ctx, dims, texImage,
+-                                                 imageSize, pixels);
+-               }
+-               else {
+-                  ctx->Driver.TexImage(ctx, dims, texImage, format,
+-                                       type, pixels, unpack);
++               if (width > 0 && height > 0 && depth > 0) {
++                  if (compressed) {
++                     ctx->Driver.CompressedTexImage(ctx, dims, texImage,
++                                                    imageSize, pixels);
++                  }
++                  else {
++                     ctx->Driver.TexImage(ctx, dims, texImage, format,
++                                          type, pixels, unpack);
++                  }
+                }
+ 
+                check_gen_mipmap(ctx, target, texObj, level);
+--
+cgit v0.9.0.2-2-gbebe
+From e75051d1967350ceff0209dde24ae42696b13b5c Mon Sep 17 00:00:00 2001
+From: Brian Paul <brianp@vmware.com>
+Date: Fri, 05 Oct 2012 22:59:27 +0000
+Subject: mesa: fix error check for zero-sized compressed subtexture
+
+For glCompressedTexSubImage, width or height = 0 is legal.
+Fixes a failure in piglit's s3tc-errors test.
+
+This is for the 9.0 and 8.0 branches.  Already fixed on master.
+---
+diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c
+index 8004876..38fa9fa 100644
+--- a/src/mesa/main/teximage.c
++++ b/src/mesa/main/teximage.c
+@@ -3598,10 +3598,10 @@ compressed_subtexture_error_check(struct gl_context *ctx, GLint dimensions,
+    if (!_mesa_is_compressed_format(ctx, format))
+       return GL_INVALID_ENUM;
+ 
+-   if (width < 1 || width > maxTextureSize)
++   if (width < 0 || width > maxTextureSize)
+       return GL_INVALID_VALUE;
+ 
+-   if ((height < 1 || height > maxTextureSize)
++   if ((height < 0 || height > maxTextureSize)
+        && dimensions > 1)
+       return GL_INVALID_VALUE;
+ 
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/multilib-testing/wine/PKGBUILD b/multilib-testing/wine/PKGBUILD
new file mode 100644
index 000000000..6bffe1ffb
--- /dev/null
+++ b/multilib-testing/wine/PKGBUILD
@@ -0,0 +1,154 @@
+# $Id: PKGBUILD 77392 2012-10-09 14:39:41Z bluewind $
+# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
+# Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com>
+# Contributor: Eduardo Romero <eduardo@archlinux.org>
+# Contributor: Giovanni Scafora <giovanni@archlinux.org>
+
+pkgname=wine
+pkgver=1.5.14
+pkgrel=2
+
+_pkgbasever=${pkgver/rc/-rc}
+
+source=(http://prdownloads.sourceforge.net/$pkgname/$pkgname-$_pkgbasever.tar.bz2{,.sign})
+md5sums=('f84c54bd7422328e96b6cf14ee6e163c'
+         'dd0c87e2dea529f0c898fe2ffa5390ce')
+
+pkgdesc="A compatibility layer for running Windows programs"
+url="http://www.winehq.com"
+arch=(i686 x86_64)
+license=(LGPL)
+install=wine.install
+
+depends=(
+  fontconfig      lib32-fontconfig
+  mesa            lib32-mesa 
+  libxcursor      lib32-libxcursor
+  libxrandr       lib32-libxrandr
+  libxdamage      lib32-libxdamage
+  libxi           lib32-libxi
+  gettext         lib32-gettext
+  glu             lib32-glu
+  desktop-file-utils
+)
+
+makedepends=(autoconf ncurses bison perl fontforge flex prelink
+  'gcc>=4.5.0-2'  'gcc-multilib>=4.5.0-2'
+  giflib          lib32-giflib
+  libpng          lib32-libpng
+  gnutls          lib32-gnutls
+  libxinerama     lib32-libxinerama
+  libxcomposite   lib32-libxcomposite
+  libxmu          lib32-libxmu
+  libxxf86vm      lib32-libxxf86vm
+  libxml2         lib32-libxml2
+  libldap         lib32-libldap
+  lcms            lib32-lcms
+  mpg123          lib32-mpg123
+  openal          lib32-openal
+  v4l-utils       lib32-v4l-utils
+  alsa-lib        lib32-alsa-lib
+  libxcomposite   lib32-libxcomposite
+  oss
+  samba
+)
+  
+optdepends=(
+  giflib          lib32-giflib
+  libpng          lib32-libpng
+  libldap         lib32-libldap
+  gnutls          lib32-gnutls
+  lcms            lib32-lcms
+  libxml2         lib32-libxml2
+  mpg123          lib32-mpg123
+  openal          lib32-openal
+  v4l-utils       lib32-v4l-utils
+  libpulse        lib32-libpulse
+  alsa-plugins    lib32-alsa-plugins
+  alsa-lib        lib32-alsa-lib
+  libjpeg-turbo   lib32-libjpeg-turbo
+  libxcomposite   lib32-libxcomposite
+  oss             cups
+  samba
+)
+
+if [[ $CARCH == i686 ]]; then
+  # Strip lib32 etc. on i686
+  depends=(${depends[@]/*32-*/})
+  makedepends=(${makedepends[@]/*32-*/})
+  makedepends=(${makedepends[@]/*-multilib*/})
+  optdepends=(${optdepends[@]/*32-*/})
+else
+  provides=("bin32-wine=$pkgver" "wine-wow64=$pkgver")
+  conflicts=('bin32-wine' 'wine-wow64')
+  replaces=('bin32-wine')
+fi
+
+build() {
+  cd "$srcdir"
+
+  # Allow ccache to work
+  mv $pkgname-$_pkgbasever $pkgname
+
+  # Get rid of old build dirs
+  rm -rf $pkgname-{32,64}-build
+  mkdir $pkgname-32-build
+
+  # These additional CFLAGS solve FS#27662
+  export CFLAGS="${CFLAGS/-D_FORTIFY_SOURCE=2/} -D_FORTIFY_SOURCE=0"
+  export CXXFLAGS="${CXXFLAGS/-D_FORTIFY_SOURCE=2/} -D_FORTIFY_SOURCE=0"
+
+  if [[ $CARCH == x86_64 ]]; then
+    msg2 "Building Wine-64..."
+
+    mkdir $pkgname-64-build
+    cd "$srcdir/$pkgname-64-build"
+    ../$pkgname/configure \
+      --prefix=/usr \
+      --sysconfdir=/etc \
+      --libdir=/usr/lib \
+      --with-x \
+      --enable-win64
+
+    make
+
+    _wine32opts=(
+      --libdir=/usr/lib32
+      --with-wine64="$srcdir/$pkgname-64-build"
+    )
+
+    export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
+  fi
+
+  msg2 "Building Wine-32..."
+  cd "$srcdir/$pkgname-32-build"
+  ../$pkgname/configure \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    --with-x \
+    "${_wine32opts[@]}"
+
+  # These additional CFLAGS solve FS#27560 and FS#23277
+  make CFLAGS+="-mstackrealign -mincoming-stack-boundary=2" CXXFLAGS+="-mstackrealign -mincoming-stack-boundary=2"
+}
+
+package() {
+  msg2 "Packaging Wine-32..."
+  cd "$srcdir/$pkgname-32-build"
+
+  if [[ $CARCH == i686 ]]; then
+    make prefix="$pkgdir/usr" install
+  else
+    make prefix="$pkgdir/usr" \
+      libdir="$pkgdir/usr/lib32" \
+      dlldir="$pkgdir/usr/lib32/wine" install
+
+    msg2 "Packaging Wine-64..."
+    cd "$srcdir/$pkgname-64-build"
+    make prefix="$pkgdir/usr" \
+      libdir="$pkgdir/usr/lib" \
+      dlldir="$pkgdir/usr/lib/wine" install
+  fi
+}
+
+# vim:set ts=8 sts=2 sw=2 et:
diff --git a/multilib-testing/wine/wine.install b/multilib-testing/wine/wine.install
new file mode 100644
index 000000000..0548b7ffd
--- /dev/null
+++ b/multilib-testing/wine/wine.install
@@ -0,0 +1,12 @@
+post_install() {
+	update-desktop-database -q
+	#echo "This wine package is wow64 enabled. This means it can run 32bit/64bit Windows apps on x86_64."
+	#echo "If you are on x86_64, the default WINEARCH will be win64."
+	#echo "This will cause a lot of Windows applications to malfunction even if they usually work in wine."
+	#echo "Please create your ~/.wine with 'WINEARCH=win32 winecfg' if you are unsure and on x86_64."
+	#echo "See the Arch wiki on wine for more information."
+}
+
+post_remove() {
+	update-desktop-database -q
+}
diff --git a/multilib/lib32-libtasn1/PKGBUILD b/multilib/lib32-libtasn1/PKGBUILD
new file mode 100644
index 000000000..0020a2816
--- /dev/null
+++ b/multilib/lib32-libtasn1/PKGBUILD
@@ -0,0 +1,32 @@
+# Maintainer: Florian Pritz <bluewind@xinu.at>
+# Contributor: josephgbr <rafael.f.f1 at gmail.com>
+
+_pkgbase=libtasn1
+pkgname=lib32-${_pkgbase}
+pkgver=2.14
+pkgrel=1
+pkgdesc="The ASN.1 library used in GNUTLS (32 bit)"
+arch=('x86_64')
+license=('GPL3' 'LGPL')
+url="http://www.gnu.org/software/libtasn1/"
+depends=('lib32-glibc' ${_pkgbase})
+makedepends=('gcc-multilib')
+options=('!libtool')
+source=("http://ftp.gnu.org/gnu/libtasn1/${_pkgbase}-${pkgver}.tar.gz")
+sha1sums=('22f9e0b15f870c8e03ac9cc1ead969d4d84eb931')
+
+build() {
+  export CC='gcc -m32'
+  export CXX='g++ -m32'
+  export PKG_CONFIG_PATH='/usr/lib32/pkgconfig'
+
+  cd ${_pkgbase}-${pkgver}
+  ./configure --prefix=/usr --libdir=/usr/lib32
+  make
+}
+
+package() {
+  cd ${_pkgbase}-${pkgver}
+  make DESTDIR="${pkgdir}" install
+  rm -rf "${pkgdir}/usr/"{bin,include,share}
+}
diff --git a/pcr/debootstrap/PKGBUILD b/pcr/debootstrap/PKGBUILD
new file mode 100644
index 000000000..9f03c48db
--- /dev/null
+++ b/pcr/debootstrap/PKGBUILD
@@ -0,0 +1,20 @@
+# $Id$
+# Maintainer: André Silva <emulatorman@lavabit.com>
+
+pkgname=debootstrap
+pkgver=1.0.26
+pkgrel=1
+pkgdesc="A tool used to create a gNewSense base system from scratch, without requiring the availability of dpkg or apt"
+arch=('any')
+license=('GPL')
+url="http://www.gnewsense.org"
+depends=('bash' 'wget')
+source=("http://archive.gnewsense.org/gnewsense-three/gnewsense/pool/overlays/parkes/kgoetz/${pkgname}/${pkgname}_${pkgver}+squeeze1+gnewsense1_all.deb") 
+install="debootstrap.install"
+md5sums=('2049317eac54c0fac6c3201a90fadc18')
+
+build(){
+  tar -xzf "${srcdir}/data.tar.gz" -C "${pkgdir}/"
+  # doesn't work with gpg 2.x, patch to point to gpgv1
+  sed 's/gpgv/gpgv1/g;' -i "${pkgdir}/usr/sbin/debootstrap" "${pkgdir}/usr/share/debootstrap/functions"
+}
diff --git a/pcr/debootstrap/debootstrap.install b/pcr/debootstrap/debootstrap.install
new file mode 100644
index 000000000..85a99f160
--- /dev/null
+++ b/pcr/debootstrap/debootstrap.install
@@ -0,0 +1,14 @@
+post_install() {
+  if [ "$(uname -m)" = "x86_64" ]; then
+    darch="amd64"
+  elif [ "$(uname -m)" = "i386" ]; then
+    darch="i386"
+  else
+    darch="mips64el"
+  fi
+  echo "$darch" > /usr/share/debootstrap/arch
+}
+
+pre_remove() {
+  rm -f /usr/share/debootstrap/arch
+}
diff --git a/social/lua-cyrussasl/PKGBUILD b/social/lua-cyrussasl/PKGBUILD
new file mode 100644
index 000000000..d37eacc1c
--- /dev/null
+++ b/social/lua-cyrussasl/PKGBUILD
@@ -0,0 +1,34 @@
+# Maintainer: Dwayne Bent <dbb.1@liqd.org>
+
+pkgname=lua-cyrussasl
+pkgver=1.0.0
+pkgrel=1
+pkgdesc="Lua bindings for Cyrus SASL library."
+arch=('i686' 'x86_64' 'mips64el')
+url="http://github.com/JorjBauer/lua-cyrussasl"
+license=('BSD')
+depends=('lua>=5.1' 'libsasl')
+source=(
+    "lua-cyrussasl-$pkgver.tar.gz::https://github.com/JorjBauer/lua-cyrussasl/tarball/v$pkgver"
+    "lua-cyrussasl.patch"
+)
+md5sums=('40c94c06441e1e47640d81b125742969'
+         '5b5c15e4cba63d05a5bfd1cc3ddcba0f')
+
+build() {
+    cd $srcdir/*-lua-cyrussasl-*
+
+    patch -p1 < "$srcdir/lua-cyrussasl.patch"
+	make
+}
+
+package() {
+    mkdir -p "$pkgdir/usr/lib/lua/5.1"
+    mkdir -p "$pkgdir/usr/share/licenses/lua-cyrussasl"
+	
+    cd $srcdir/*-lua-cyrussasl-*
+    
+    make DESTDIR=${pkgdir} install
+    install -m644 "LICENSE" "$pkgdir/usr/share/licenses/lua-cyrussasl/LICENSE"
+}
+
diff --git a/social/lua-cyrussasl/lua-cyrussasl.patch b/social/lua-cyrussasl/lua-cyrussasl.patch
new file mode 100644
index 000000000..5309e5af1
--- /dev/null
+++ b/social/lua-cyrussasl/lua-cyrussasl.patch
@@ -0,0 +1,37 @@
+diff --git a/Makefile b/Makefile
+index 9c696ab..37057da 100644
+--- a/Makefile
++++ b/Makefile
+@@ -4,12 +4,18 @@
+ #LUAPATH=/usr/share/lua/5.1
+ #CPATH=/usr/lib/lua/5.1
+ 
++# Linux (Arch Linux)
++CFLAGS=-g -O2 -fpic -I/usr/include
++LDFLAGS=-O -shared -fpic -lsasl2
++LUAPATH=/usr/share/lua/5.1
++CPATH=/usr/lib/lua/5.1
++
+ # MacOS
+-CFLAGS=-g -Wall -O2
+-LDFLAGS=-bundle -undefined dynamic_lookup -lsasl2
+-MACOSX_VERSION=10.5
+-LUAPATH=/usr/local/share/lua/5.1
+-CPATH=/usr/local/lib/lua/5.1
++#CFLAGS=-g -Wall -O2
++#LDFLAGS=-bundle -undefined dynamic_lookup -lsasl2
++#MACOSX_VERSION=10.5
++#LUAPATH=/usr/local/share/lua/5.1
++#CPATH=/usr/local/lib/lua/5.1
+ 
+ #########################################################
+ #
+@@ -26,7 +32,7 @@ OBJS=cyrussasl.o luaabstract.o context.o
+ all: $(TARGET)
+ 
+ install: $(TARGET)
+-	cp $(TARGET) $(CPATH)
++	cp $(TARGET) $(DESTDIR)$(CPATH)
+ 
+ clean:
+ 	rm -f *.o *.so *~
diff --git a/social/lua-ldap/PKGBUILD b/social/lua-ldap/PKGBUILD
new file mode 100644
index 000000000..a2ca1c830
--- /dev/null
+++ b/social/lua-ldap/PKGBUILD
@@ -0,0 +1,29 @@
+pkgname=lua-ldap
+_pkgname=lualdap
+pkgver=1.1.0
+pkgrel=1
+pkgdesc="Simple interface from Lua to an LDAP client"
+arch=('i686' 'x86_64' 'mips64el')
+url="http://www.keplerproject.org/lualdap"
+license=('BSD')
+depends=('lua' 'libldap')
+source=(http://files.luaforge.net/releases/$_pkgname/$_pkgname/LuaLDAP$pkgver/$_pkgname-$pkgver.tar.gz)
+
+build() {
+    cd $srcdir/$_pkgname-$pkgver
+
+    make CFLAGS="$CFLAGS" \
+         LUA_LIBDIR=/usr/lib/lua/5.1 \
+         LUA_VERSION_NUM=510 \
+         LUA_INC=/usr/include 
+
+}
+
+package() {
+    cd $srcdir/$_pkgname-$pkgver
+    make LUA_LIBDIR=${pkgdir}/usr/lib/lua/5.1 \
+         LUA_VERSION_NUM=510 \
+         install
+}
+
+md5sums=('5e104520c3f1333f38817a9fa1e76681')
diff --git a/social/opentracker/opentracker.install b/social/opentracker/opentracker.install
new file mode 100644
index 000000000..59f6f6ebe
--- /dev/null
+++ b/social/opentracker/opentracker.install
@@ -0,0 +1,17 @@
+post_install() {
+    cat <<EOM
+
+    Please be aware this package is built without accesslist support. Any
+    torrent announced to it will be tracked.
+
+    If you want this features you'll have to rebuild this package. There're
+    instructions on the PKGBUILD.
+
+    For more info check: http://erdgeist.org/arts/software/opentracker/
+
+EOM
+}
+
+post_upgrade() {
+    post_install
+}
diff --git a/social/squirm/PKGBUILD b/social/squirm/PKGBUILD
index 050c002d3..da3a6d372 100644
--- a/social/squirm/PKGBUILD
+++ b/social/squirm/PKGBUILD
@@ -9,13 +9,11 @@ source=("$url/$pkgname-$pkgver.tgz")
 md5sums=('54ac1d208620ec1e4419f97315d38848')
 license=('GPL2')
 arch=('i686' 'x86_64' 'mips64el')
-depends=('glibc')
-options=(!distcc)
 
 build() {
 	cd $srcdir/$pkgname-$pkgver
 
-	make PREFIX=/usr #CFLAGS="$CFLAGS"
+	make PREFIX=/usr
 }
 
 package() {
diff --git a/staging/python-lxml/PKGBUILD b/staging/python-lxml/PKGBUILD
new file mode 100644
index 000000000..33aa7dc70
--- /dev/null
+++ b/staging/python-lxml/PKGBUILD
@@ -0,0 +1,49 @@
+# $Id: PKGBUILD 168387 2012-10-09 21:43:30Z eric $
+# Maintainer:
+
+pkgname=('python-lxml' 'python2-lxml')
+pkgver=3.0
+pkgrel=1
+pkgdesc="Python binding for the libxml2 and libxslt libraries"
+arch=('i686' 'x86_64')
+license=('BSD' 'custom')
+url="http://lxml.de/"
+makedepends=('python2' 'python' 'libxslt')
+source=(http://pypi.python.org/packages/source/l/lxml/lxml-${pkgver}.tar.gz{,.asc})
+sha1sums=('8dbbd03a637bb563113cf07049a4d5a109369441'
+          'b38447fd3f9cfb30b4d56ffe3bec42739afb2947')
+
+check() {
+  cd "${srcdir}"/lxml-$pkgver
+  make PYTHON=python2 test
+  make PYTHON=python test
+}
+
+package_python2-lxml() {
+  depends=('python2' 'libxslt')
+  optdepends=('python2-beautifulsoup3: support for parsing not well formed HTML')
+
+  cd "${srcdir}"/lxml-$pkgver
+  python2 setup.py install --root="${pkgdir}" --optimize=1
+
+  install -Dm644 LICENSES.txt \
+    "${pkgdir}"/usr/share/licenses/$pkgname/LICENSE
+  install -Dm644 doc/licenses/BSD.txt \
+    "${pkgdir}"/usr/share/licenses/$pkgname/BSD.txt
+  install -Dm644 doc/licenses/elementtree.txt \
+    "${pkgdir}"/usr/share/licenses/$pkgname/elementtree.txt
+}
+
+package_python-lxml() {
+  depends=('python' 'libxslt')
+
+  cd "${srcdir}"/lxml-$pkgver
+  python setup.py install --root="${pkgdir}" --optimize=1
+
+  install -Dm644 LICENSES.txt \
+    "${pkgdir}"/usr/share/licenses/$pkgname/LICENSE
+  install -Dm644 doc/licenses/BSD.txt \
+    "${pkgdir}"/usr/share/licenses/$pkgname/BSD.txt
+  install -Dm644 doc/licenses/elementtree.txt \
+    "${pkgdir}"/usr/share/licenses/$pkgname/elementtree.txt
+}
diff --git a/staging/python-urwid/PKGBUILD b/staging/python-urwid/PKGBUILD
new file mode 100644
index 000000000..d1804969c
--- /dev/null
+++ b/staging/python-urwid/PKGBUILD
@@ -0,0 +1,42 @@
+# $Id: PKGBUILD,v 1.10 2009/03/13 21:14:09 sergej Exp $
+# Maintainer: Daniel Isenmann <daniel@archlinux.org>
+# Maintainer: Sergej Pupykin <sergej@aur.archlinux.org>
+# Maintainer: Douglas Soares de Andrade <dsandrade@gmail.com>
+
+pkgname=('python-urwid' 'python2-urwid')
+pkgver=1.0.2
+pkgrel=2
+pkgdesc="Urwid is a curses-based user interface library."
+license=('LGPL')
+arch=('i686' 'x86_64')
+makedepends=('python2-distribute' 'python-distribute')
+url="http://excess.org/urwid/"
+source=(http://excess.org/urwid/urwid-$pkgver.tar.gz)
+md5sums=('00542bbd15fae7ea60b02a7570edee2b')
+
+build() {
+  cp -r urwid-$pkgver python2-urwid-$pkgver
+
+  cd "$srcdir/urwid-$pkgver"
+  python setup.py build
+
+  cd "$srcdir/python2-urwid-$pkgver"
+  sed -i 's#bin/python#bin/python2#' urwid/*.py
+  
+  python2 setup.py build
+}
+
+package_python-urwid() {
+  depends=('python')
+
+  cd "$srcdir/urwid-$pkgver"
+  python setup.py install --prefix=/usr --root="$pkgdir" --optimize=1
+}
+
+package_python2-urwid() {
+  depends=('python2')
+ 
+  cd "$srcdir/python2-urwid-$pkgver"
+  python2 setup.py install --prefix=/usr --root="$pkgdir" --optimize=1
+}
+
diff --git a/testing/celestia/PKGBUILD b/testing/celestia/PKGBUILD
new file mode 100644
index 000000000..492b6565b
--- /dev/null
+++ b/testing/celestia/PKGBUILD
@@ -0,0 +1,53 @@
+# $Id: PKGBUILD 168482 2012-10-12 16:54:10Z andyrtr $
+# Maintainer: Ronald van Haren <ronald.archlinux.org>
+# Contributor : Damir Perisa <damir.perisa@bluewin.ch>
+
+pkgname=celestia
+pkgver=1.6.1
+pkgrel=3
+pkgdesc="Real-time space simulation"
+arch=('i686' 'x86_64')
+license=('GPL')
+url="http://www.shatters.net/celestia/"
+depends=('gtk2' 'libtheora' 'lua' 'gtkglext' 'glut' 'libxmu' 'glu' 'libjpeg')
+options=('!makeflags')
+source=("http://downloads.sourceforge.net/sourceforge/celestia/${pkgname}-${pkgver}.tar.gz"
+        'celestia-1.6.1-gcc46.patch' 
+        'celestia-1.6.1-libpng15.patch'
+        'celestia-1.6.1-linking.patch'
+        'gcc-4.7-fixes.diff')
+sha1sums=('1f0fdf4525a8b9d6c708e1f6383babed670d18e7'
+          '7c08ca391603806d788cb8f3342acedafc924eef'
+          '46ecc4e10b24191384bc848c206652498843adf0'
+          '534c8eee18d13a868c91f0b870ebecc05f3e7ae1'
+          '582f9eed93eca02a16350f02c29e2ea6f69aa869')
+
+build() {
+    cd ${srcdir}/${pkgname}-${pkgver}
+
+    # build patch
+    patch -Np0 -i "${srcdir}/celestia-1.6.1-gcc46.patch"
+    patch -Np0 -i "${srcdir}/celestia-1.6.1-libpng15.patch"
+    patch -Np1 -i "${srcdir}/celestia-1.6.1-linking.patch"
+    patch -Np1 -i "${srcdir}/gcc-4.7-fixes.diff"
+
+    # This version of Celestia has a bug in the font rendering and requires -fsigned-char 
+    export CFLAGS="$CFLAGS -fsigned-char"
+    export CXXFLAGS="$CXXFLAGS -fsigned-char"
+
+    autoreconf
+    ./configure --prefix=/usr \
+                --with-lua=/usr \
+		--datadir=/usr/share \
+                --with-gtk \
+                --disable-rpath \
+                --with-lua
+    make
+}
+
+package() {
+    cd ${srcdir}/${pkgname}-${pkgver}
+
+    make DESTDIR=${pkgdir} install
+}
+
diff --git a/testing/celestia/celestia-1.5.1-gcc44.patch b/testing/celestia/celestia-1.5.1-gcc44.patch
new file mode 100644
index 000000000..b1ee896f0
--- /dev/null
+++ b/testing/celestia/celestia-1.5.1-gcc44.patch
@@ -0,0 +1,20 @@
+--- src/celengine/overlay.h.orig	2009-07-08 02:27:08.000000000 -0400
++++ src/celengine/overlay.h	2009-07-08 02:27:28.000000000 -0400
+@@ -10,6 +10,7 @@
+ #ifndef _OVERLAY_H_
+ #define _OVERLAY_H_
+ 
++#include <cstdio>
+ #include <string>
+ #include <iostream>
+ #include <celtxf/texturefont.h>
+--- src/celengine/star.cpp.orig	2009-07-08 02:40:52.000000000 -0400
++++ src/celengine/star.cpp	2009-07-08 02:41:08.000000000 -0400
+@@ -8,6 +8,7 @@
+ // of the License, or (at your option) any later version.
+ 
+ #include <celmath/mathlib.h>
++#include <cstdio>
+ #include <cstring>
+ #include <cassert>
+ #include "celestia.h"
diff --git a/testing/celestia/celestia-1.6.1-gcc46.patch b/testing/celestia/celestia-1.6.1-gcc46.patch
new file mode 100644
index 000000000..ddf4036f2
--- /dev/null
+++ b/testing/celestia/celestia-1.6.1-gcc46.patch
@@ -0,0 +1,13 @@
+http://bugs.gentoo.org/show_bug.cgi?id=366073
+
+Patch written by Nils Larsson <ni1s@nerdshack.com>
+--- src/celengine/frametree.h
++++ src/celengine/frametree.h
+@@ -14,6 +14,7 @@
+ #define _CELENGINE_FRAMETREE_H_
+ 
+ #include <vector>
++#include <cstddef>
+ 
+ class Star;
+ class Body;
diff --git a/testing/celestia/celestia-1.6.1-gentoo.patch b/testing/celestia/celestia-1.6.1-gentoo.patch
new file mode 100644
index 000000000..57fffe159
--- /dev/null
+++ b/testing/celestia/celestia-1.6.1-gentoo.patch
@@ -0,0 +1,23 @@
+--- src/celestia/Makefile.am	2011-06-07 19:15:51.502000147 +0200
++++ src/celestia/Makefile.am.new	2011-06-07 19:15:47.208000302 +0200
+@@ -15,6 +15,7 @@
+ if ENABLE_GTK
+ SUBDIRS += gtk
+ celestiaGTKLIBS = $(GTK_LIBS) gtk/libgtkgui.a
++LIBS += $(GTK_LIBS)
+ endif
+ 
+ COMMONSOURCES = \
+
+Index: src/celengine/frametree.h
+===================================================================
+--- src/celengine/frametree.h	(revision 5163)
++++ src/celengine/frametree.h	(arbetskopia)
+@@ -14,6 +14,7 @@
+ #define _CELENGINE_FRAMETREE_H_
+ 
+ #include <vector>
++#include <cstddef>
+ 
+ class Star;
+ class Body;
diff --git a/testing/celestia/celestia-1.6.1-libpng15.patch b/testing/celestia/celestia-1.6.1-libpng15.patch
new file mode 100644
index 000000000..5dffbab24
--- /dev/null
+++ b/testing/celestia/celestia-1.6.1-libpng15.patch
@@ -0,0 +1,14 @@
+imagecapture.cpp:184:40: error: ‘Z_BEST_COMPRESSION’ was not declared in this scope
+
+--- src/celestia/imagecapture.cpp
++++ src/celestia/imagecapture.cpp
+@@ -31,6 +31,9 @@
+ #include "png.h"
+ #endif
+ 
++// Z_BEST_COMPRESSION
++#include <zlib.h>
++
+ // Define png_jmpbuf() in case we are using a pre-1.0.6 version of libpng
+ #ifndef png_jmpbuf
+ #define png_jmpbuf(png_ptr) png_ptr->jmpbuf
diff --git a/testing/celestia/celestia-1.6.1-linking.patch b/testing/celestia/celestia-1.6.1-linking.patch
new file mode 100644
index 000000000..d610d5243
--- /dev/null
+++ b/testing/celestia/celestia-1.6.1-linking.patch
@@ -0,0 +1,54 @@
+Fix linking issues:
+ * underlinking GLUT (bug #372123, #387609)
+ * as-needed (bug #281258)
+
+--- a/src/celestia/Makefile.am
++++ b/src/celestia/Makefile.am
+@@ -7,14 +7,15 @@
+ 
+ if ENABLE_KDE
+ SUBDIRS += kde
+-celestiaKDELIBS = $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KFILE) \
+-                  $(LIBSOCKET) -lDCOP kde/libkdegui.a
++celestiaKDELIBS = kde/libkdegui.a
+ celestia_LDFLAGS = $(all_libraries) $(KDE_RPATH)
++LIBS += $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KFILE) $(LIBSOCKET) -lDCOP
+ endif
+ 
+ if ENABLE_GTK
+ SUBDIRS += gtk
+-celestiaGTKLIBS = $(GTK_LIBS) gtk/libgtkgui.a
++celestiaGTKLIBS = gtk/libgtkgui.a
++LIBS += $(GTK_LIBS)
+ endif
+ 
+ COMMONSOURCES = \
+@@ -62,6 +63,7 @@
+ 
+ if ENABLE_GLUT
+ GLUTSOURCES = glutmain.cpp
++GLUTLIBS = -lGL
+ endif
+ 
+ if ENABLE_THEORA
+@@ -80,15 +82,16 @@
+ celestia_LDADD = \
+ 	$(celestiaKDELIBS) \
+ 	$(celestiaGTKLIBS) \
+-	$(DL_LIBS) \
+-	$(LUA_LIBS) \
+-	$(THEORA_LIBS) \
+ 	../celengine/libcelengine.a \
+ 	../celtxf/libceltxf.a \
+ 	../cel3ds/libcel3ds.a \
+ 	../celmath/libcelmath.a \
+ 	../celutil/libcelutil.a \
+-	$(SPICE_LIBS)
++	$(LUA_LIBS) \
++	$(THEORA_LIBS) \
++	$(GLUTLIBS) \
++	$(SPICE_LIBS) \
++	$(DL_LIBS)
+ 
+ noinst_HEADERS = $(wildcard *.h)
+ noinst_DATA = ../../celestia
diff --git a/testing/celestia/gcc-4.7-fixes.diff b/testing/celestia/gcc-4.7-fixes.diff
new file mode 100644
index 000000000..9ca09e03f
--- /dev/null
+++ b/testing/celestia/gcc-4.7-fixes.diff
@@ -0,0 +1,10 @@
+--- a/src/celmath/intersect.h
++++ b/src/celmath/intersect.h
+@@ -15,6 +15,7 @@
+ #include "ray.h"
+ #include "sphere.h"
+ #include "ellipsoid.h"
++#include "mathlib.h"
+ 
+ 
+ template<class T> bool testIntersection(const Ray3<T>& ray,
diff --git a/testing/gnome-games/PKGBUILD b/testing/gnome-games/PKGBUILD
new file mode 100644
index 000000000..f10dee80a
--- /dev/null
+++ b/testing/gnome-games/PKGBUILD
@@ -0,0 +1,37 @@
+# $Id: PKGBUILD 168505 2012-10-13 00:06:42Z heftig $
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
+# Contributor: Jan de Groot <jgc@archlinux.org>
+
+pkgname=gnome-games
+pkgver=3.4.2
+pkgrel=2
+pkgdesc="Some Games for GNOME"
+arch=('i686' 'x86_64')
+license=('GPL')
+depends=('desktop-file-utils' 'glu' 'libcanberra' 'clutter-gtk' 'hicolor-icon-theme' 'librsvg' 'python2-gobject' 'dconf')
+makedepends=('yelp-tools' 'intltool' 'gobject-introspection' 'vala')
+options=('!emptydirs' '!libtool')
+install=gnome-games.install
+url="http://www.gnome.org"
+groups=('gnome-extra')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
+sha256sums=('25676285fad33a39da7fc26b5b1dc751c7981ae778b8fe82e8b7c0a367e5117c')
+
+build() {
+  cd $pkgname-$pkgver
+  PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \
+      --localstatedir=/var --disable-static --disable-schemas-compile \
+      --with-scores-user=root --with-scores-group=games \
+      --enable-introspection=yes
+  make
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+
+  # Remove all scores, we generate them from postinstall
+  rm -rf "$pkgdir/var"
+
+  sed -i 's_#! /usr/bin/env python_#!/usr/bin/env python2_' "$pkgdir/usr/bin/gnome-sudoku"
+}
diff --git a/testing/gnome-games/gnome-games.install b/testing/gnome-games/gnome-games.install
new file mode 100644
index 000000000..aaa36a896
--- /dev/null
+++ b/testing/gnome-games/gnome-games.install
@@ -0,0 +1,122 @@
+_scores=(glines.Large.scores
+	glines.Medium.scores
+	glines.Small.scores
+	gnibbles.1.0.scores
+	gnibbles.1.1.scores
+	gnibbles.2.0.scores
+	gnibbles.2.1.scores
+	gnibbles.3.0.scores
+	gnibbles.3.1.scores
+	gnibbles.4.0.scores
+	gnibbles.4.1.scores
+	gnobots2.classic_robots-safe.scores
+	gnobots2.classic_robots-super-safe.scores
+	gnobots2.classic_robots.scores
+	gnobots2.nightmare-safe.scores
+	gnobots2.nightmare-super-safe.scores
+	gnobots2.nightmare.scores
+	gnobots2.robots2-safe.scores
+	gnobots2.robots2-super-safe.scores
+	gnobots2.robots2.scores
+	gnobots2.robots2_easy-safe.scores
+	gnobots2.robots2_easy-super-safe.scores
+	gnobots2.robots2_easy.scores
+	gnobots2.robots_with_safe_teleport-safe.scores
+	gnobots2.robots_with_safe_teleport-super-safe.scores
+	gnobots2.robots_with_safe_teleport.scores
+	gnomine.Custom.scores
+	gnomine.Large.scores
+	gnomine.Medium.scores
+	gnomine.Small.scores
+	gnotravex.2x2.scores
+	gnotravex.3x3.scores
+	gnotravex.4x4.scores
+	gnotravex.5x5.scores
+	gnotravex.6x6.scores
+	gnotski.1.scores
+	gnotski.10.scores
+	gnotski.11.scores
+	gnotski.12.scores
+	gnotski.13.scores
+	gnotski.14.scores
+	gnotski.15.scores
+	gnotski.16.scores
+	gnotski.17.scores
+	gnotski.18.scores
+	gnotski.19.scores
+	gnotski.2.scores
+	gnotski.20.scores
+	gnotski.21.scores
+	gnotski.22.scores
+	gnotski.23.scores
+	gnotski.24.scores
+	gnotski.25.scores
+	gnotski.26.scores
+	gnotski.27.scores
+	gnotski.28.scores
+	gnotski.29.scores
+	gnotski.3.scores
+	gnotski.30.scores
+	gnotski.31.scores
+	gnotski.32.scores
+	gnotski.33.scores
+	gnotski.34.scores
+	gnotski.35.scores
+	gnotski.36.scores
+	gnotski.37.scores
+	gnotski.4.scores
+	gnotski.5.scores
+	gnotski.6.scores
+	gnotski.7.scores
+	gnotski.8.scores
+	gnotski.9.scores
+	gtali.Colors.scores
+	gtali.Regular.scores
+	mahjongg.bridges.scores
+	mahjongg.cloud.scores
+	mahjongg.confounding.scores
+	mahjongg.difficult.scores
+	mahjongg.dragon.scores
+	mahjongg.easy.scores
+	mahjongg.pyramid.scores
+	mahjongg.tictactoe.scores
+	mahjongg.ziggurat.scores
+	swell-foop.Large.scores
+	swell-foop.Medium.scores
+	swell-foop.Small.scores
+	quadrapassel.scores)
+
+post_install() {
+  glib-compile-schemas usr/share/glib-2.0/schemas
+  update-desktop-database -q
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+
+  for score in "${_scores[@]}" ; do
+    if [ -e "var/games/$score" ]; then
+      continue
+    fi
+
+    touch "var/games/$score"
+    chown root:games "var/games/$score"
+    chmod 664 "var/games/$score"
+  done
+}
+
+pre_upgrade() {
+  (( $(vercmp $2 3.3.5) < 0 )) && gconfpkg --uninstall gnome-games
+  return 0
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  glib-compile-schemas usr/share/glib-2.0/schemas
+  update-desktop-database -q
+  gtk-update-icon-cache -q -f -t usr/share/icons/hicolor
+
+  for score in "${_scores[@]}" ; do
+    rm -f "var/games/$score"
+  done
+}
diff --git a/testing/gtkglext/PKGBUILD b/testing/gtkglext/PKGBUILD
new file mode 100644
index 000000000..c5b2f7937
--- /dev/null
+++ b/testing/gtkglext/PKGBUILD
@@ -0,0 +1,36 @@
+# $Id: PKGBUILD 168484 2012-10-12 16:59:46Z andyrtr $
+# Maintainer:
+# Contributor: Ben <ben@benmazer.net>
+
+pkgname=gtkglext
+pkgver=1.2.0
+pkgrel=8
+pkgdesc="opengl extensions for gtk2"
+arch=('i686' 'x86_64')
+url="http://gtkglext.sourceforge.net/"
+license=('LGPL')
+depends=('gtk2' 'glu' 'libxmu')
+makedepends=('mesa')
+options=('!libtool')
+source=("http://downloads.sourceforge.net/sourceforge/gtkglext/${pkgname}-${pkgver}.tar.bz2"
+	'gtk2.20.patch')
+md5sums=('ed7ba24ce06a8630c07f2d0ee5f04ab4'
+         'e5a87ec3f2d0e616c6f32f90c3f7237f')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  patch -Np1 -i "${srcdir}/gtk2.20.patch"
+  sed '/AC_PATH_XTRA/d' -i configure.in
+
+  autoreconf --force --install
+  ./configure --prefix=/usr \
+              --disable-static
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/testing/gtkglext/gtk2.20.patch b/testing/gtkglext/gtk2.20.patch
new file mode 100644
index 000000000..54b34c11e
--- /dev/null
+++ b/testing/gtkglext/gtk2.20.patch
@@ -0,0 +1,77 @@
+diff -Nur gtkglext-1.2.0.orig/gtk/gtkglwidget.c gtkglext-1.2.0/gtk/gtkglwidget.c
+--- gtkglext-1.2.0.orig/gtk/gtkglwidget.c	2004-02-20 11:38:36.000000000 +0200
++++ gtkglext-1.2.0/gtk/gtkglwidget.c	2010-04-20 19:29:42.941917275 +0300
+@@ -127,7 +127,7 @@
+    * Synchronize OpenGL and window resizing request streams.
+    */
+ 
+-  if (GTK_WIDGET_REALIZED (widget) && private->is_realized)
++  if (gtk_widget_get_realized (widget) && private->is_realized)
+     {
+       gldrawable = gdk_window_get_gl_drawable (widget->window);
+       gdk_gl_drawable_wait_gdk (gldrawable);
+@@ -154,7 +154,7 @@
+    * Remove OpenGL-capability from widget->window.
+    */
+ 
+-  if (GTK_WIDGET_REALIZED (widget))
++  if (gtk_widget_get_realized (widget))
+     gdk_window_unset_gl_capability (widget->window);
+ 
+   private->is_realized = FALSE;
+@@ -174,7 +174,7 @@
+    */
+ 
+   toplevel = gtk_widget_get_toplevel (widget);
+-  if (GTK_WIDGET_TOPLEVEL (toplevel) && !GTK_WIDGET_REALIZED (toplevel))
++  if (gtk_widget_is_toplevel (toplevel) && !gtk_widget_get_realized (toplevel))
+     {
+       GTK_GL_NOTE (MISC,
+         g_message (" - Install colormap to the top-level window."));
+@@ -194,7 +194,7 @@
+    * Set a background of "None" on window to avoid AIX X server crash.
+    */
+ 
+-  if (GTK_WIDGET_REALIZED (widget))
++  if (gtk_widget_get_realized (widget))
+     {
+       GTK_GL_NOTE (MISC,
+         g_message (" - window->bg_pixmap = %p",
+@@ -250,8 +250,8 @@
+   GTK_GL_NOTE_FUNC ();
+ 
+   g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE);
+-  g_return_val_if_fail (!GTK_WIDGET_NO_WINDOW (widget), FALSE);
+-  g_return_val_if_fail (!GTK_WIDGET_REALIZED (widget), FALSE);
++  g_return_val_if_fail (gtk_widget_get_has_window (widget), FALSE);
++  g_return_val_if_fail (!gtk_widget_get_realized (widget), FALSE);
+   g_return_val_if_fail (GDK_IS_GL_CONFIG (glconfig), FALSE);
+ 
+   /* 
+@@ -432,7 +432,7 @@
+   GTK_GL_NOTE_FUNC ();
+ 
+   g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);
+-  g_return_val_if_fail (GTK_WIDGET_REALIZED (widget), NULL);
++  g_return_val_if_fail (gtk_widget_get_realized (widget), NULL);
+ 
+   gldrawable = gdk_window_get_gl_drawable (widget->window);
+   if (gldrawable == NULL)
+@@ -474,7 +474,7 @@
+   GLWidgetPrivate *private;
+ 
+   g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);
+-  g_return_val_if_fail (GTK_WIDGET_REALIZED (widget), NULL);
++  g_return_val_if_fail (gtk_widget_get_realized (widget), NULL);
+ 
+   private = g_object_get_qdata (G_OBJECT (widget), quark_gl_private);
+   if (private == NULL)
+@@ -501,7 +501,7 @@
+ gtk_widget_get_gl_window (GtkWidget *widget)
+ {
+   g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);
+-  g_return_val_if_fail (GTK_WIDGET_REALIZED (widget), NULL);
++  g_return_val_if_fail (gtk_widget_get_realized (widget), NULL);
+ 
+   return gdk_window_get_gl_window (widget->window);
+ }
diff --git a/testing/gtkglextmm/PKGBUILD b/testing/gtkglextmm/PKGBUILD
new file mode 100644
index 000000000..e3a098e14
--- /dev/null
+++ b/testing/gtkglextmm/PKGBUILD
@@ -0,0 +1,40 @@
+# $Id: PKGBUILD 168486 2012-10-12 17:14:06Z andyrtr $
+# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
+# Contributor: Bastien Bouclet <bastien.bouclet@gmail.com>
+# Contributor: SpepS <dreamspepser at yahoo dot it>
+
+pkgname=gtkglextmm
+pkgver=1.2.0
+pkgrel=9
+pkgdesc="Cpp C++ bindings for gtkglext"
+arch=('i686' 'x86_64')
+url="http://gtkglext.sourceforge.net/"
+depends=('gtkmm' 'gtkglext')
+makedepends=('mesa')
+options=('!libtool')
+license=('GPL')
+source=("http://downloads.sourceforge.net/sourceforge/gtkglext/${pkgname}-${pkgver}.tar.bz2"
+        'gdkspanfunc.patch')
+md5sums=('27c05f4d45c5fd07b6fb0f044add3056'
+         'd7c8ea33c748a6857ee629c16b2d9bff')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  # FS#24706
+  patch -Np1 -i "${srcdir}/gdkspanfunc.patch"
+
+  # automake 1.8 fix
+  sed -i "s|\(AC_DEFUN(\)\(AC_.*_MULTIHEAD\)|\1[\2]|" m4macros/gtkglextmm.m4
+
+  ./configure --prefix=/usr \
+              --disable-gtkglext-test \
+              --disable-static
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/testing/gtkglextmm/gdkspanfunc.patch b/testing/gtkglextmm/gdkspanfunc.patch
new file mode 100644
index 000000000..ae5672a8c
--- /dev/null
+++ b/testing/gtkglextmm/gdkspanfunc.patch
@@ -0,0 +1,13 @@
+--- a/gtkglext/gtkmm/gl/widget.cc	2004-05-18 03:01:50.000000000 -0300
++++ b/gtkglext/gtkmm/gl/widget.cc	2011-06-12 17:57:13.075541070 -0300
+@@ -17,9 +17,8 @@
+  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA.
+  */
+ 
+-#include <gtk/gtkglwidget.h>
+-
+ #include "widget.h"
++#include <gtk/gtkglwidget.h>
+ 
+ namespace Gtk
+ {
diff --git a/testing/libvisual-plugins/02_64-bit_JESS_fix.patch b/testing/libvisual-plugins/02_64-bit_JESS_fix.patch
new file mode 100644
index 000000000..1d7f99e56
--- /dev/null
+++ b/testing/libvisual-plugins/02_64-bit_JESS_fix.patch
@@ -0,0 +1,58 @@
+diff -Nur libvisual-plugins-0.4.0/plugins/actor/JESS/renderer.c libvisual-plugins-0.4.0.new/plugins/actor/JESS/renderer.c
+--- libvisual-plugins-0.4.0/plugins/actor/JESS/renderer.c	2006-02-06 05:47:26.000000000 +1100
++++ libvisual-plugins-0.4.0.new/plugins/actor/JESS/renderer.c	2007-07-04 18:12:58.000000000 +1000
+@@ -282,7 +282,7 @@
+ 
+ void render_deformation(JessPrivate *priv, int defmode)
+ {
+-	uint32_t bmax;
++	intptr_t bmax;
+ 	uint32_t *tab1 = NULL, *tab2, *tab3, *tab4, i;
+ 	uint8_t *pix = priv->pixel, *buf = priv->buffer, *aux;
+ 
+@@ -294,7 +294,7 @@
+ 		tab2 = priv->table2;
+ 		tab3 = priv->table3;
+ 		tab4 = priv->table4;
+-		bmax = priv->resx * priv->resy + (uint32_t) priv->pixel;
++		bmax = priv->resx * priv->resy + (intptr_t) priv->pixel;
+ 
+ 		switch(defmode)
+ 		{
+@@ -352,7 +352,7 @@
+ 		}
+ 		for (i = 0; i < priv->resy * priv->resx; i++)
+ 		{
+-			aux  =  (uint8_t *) ((*(tab1) << 2 ) + (uint32_t) priv->buffer);
++			aux  =  (uint8_t *) ((*(tab1) << 2 ) + (intptr_t) priv->buffer);
+ 			*(pix++) = *(aux++) ;
+ 			*(pix++) = *(aux++);  
+ 			*(pix++) = *(aux);  
+@@ -373,7 +373,8 @@
+ 	/* j'ai mis pixel par defaut... */
+ 
+ 	uint8_t *pix = priv->pixel;
+-	uint32_t bmax,pitch_4;
++	intptr_t bmax;
++	uint32_t pitch_4;
+ 	
+ 	pix = priv->pixel;
+ 	if (priv->pixel == NULL)
+@@ -387,7 +388,7 @@
+ 	if (priv->video == 8)
+ 	{
+ 		if (visual_cpu_get_mmx ()) {
+-			bmax = priv->resx * (priv->resy-1) + (uint32_t) priv->pixel;
++			bmax = priv->resx * (priv->resy-1) + (intptr_t) priv->pixel;
+ #if defined(VISUAL_ARCH_X86) || defined(VISUAL_ARCH_X86_64)
+ 			__asm __volatile
+ 				("\n\t pxor %%mm6, %%mm6"
+@@ -423,7 +424,7 @@
+ 	else
+ 	{
+ 		pitch_4 = priv->pitch+4;
+-		bmax = priv->pitch*(priv->resy-1) + (uint32_t) priv->pixel;
++		bmax = priv->pitch*(priv->resy-1) + (intptr_t) priv->pixel;
+ 
+ 		if (visual_cpu_get_mmx ()) {
+ #if defined(VISUAL_ARCH_X86) || defined(VISUAL_ARCH_X86_64)
diff --git a/testing/libvisual-plugins/03_build_against_gl_fixes.patch b/testing/libvisual-plugins/03_build_against_gl_fixes.patch
new file mode 100644
index 000000000..b21558232
--- /dev/null
+++ b/testing/libvisual-plugins/03_build_against_gl_fixes.patch
@@ -0,0 +1,372 @@
+diff -Nur libvisual-plugins-0.4.0/plugins/actor/bumpscope/Makefile.am libvisual-plugins-0.4.0.new/plugins/actor/bumpscope/Makefile.am
+--- libvisual-plugins-0.4.0/plugins/actor/bumpscope/Makefile.am	2006-02-23 20:03:24.000000000 +1100
++++ libvisual-plugins-0.4.0.new/plugins/actor/bumpscope/Makefile.am	2007-07-04 18:19:43.000000000 +1000
+@@ -2,13 +2,12 @@
+ 
+ actor_plugin_LTLIBRARIES = actor_bumpscope.la
+ 
+-LIBS += $(LIBVISUAL_LIBS)
+-
+ AM_CFLAGS = $(LIBVISUAL_CFLAGS)
+ 
+ INCLUDES = $(all_includes) -I$(top_srcdir) 
+ 
+ actor_bumpscope_la_LDFLAGS = -module -avoid-version 
++actor_bumpscope_la_LIBADD = $(LIBVISUAL_LIBS)
+ 
+ actor_bumpscope_la_SOURCES = actor_bumpscope.c \
+ 			  actor_bumpscope.h \
+diff -Nur libvisual-plugins-0.4.0/plugins/actor/corona/Makefile.am libvisual-plugins-0.4.0.new/plugins/actor/corona/Makefile.am
+--- libvisual-plugins-0.4.0/plugins/actor/corona/Makefile.am	2006-02-23 20:03:24.000000000 +1100
++++ libvisual-plugins-0.4.0.new/plugins/actor/corona/Makefile.am	2007-07-04 18:19:43.000000000 +1000
+@@ -2,13 +2,12 @@
+ 
+ actor_plugin_LTLIBRARIES = actor_corona.la
+ 
+-LIBS += $(LIBVISUAL_LIBS)
+-
+ AM_CXXFLAGS = $(LIBVISUAL_CFLAGS)
+ 
+ INCLUDES = $(all_includes) -I$(top_srcdir)
+ 
+ actor_corona_la_LDFLAGS = -module -avoid-version
++actor_corona_la_LIBADD = $(LIBVISUAL_LIBS)
+ 
+ actor_corona_la_SOURCES = actor_corona.cpp \
+ 			  autopal.h \
+diff -Nur libvisual-plugins-0.4.0/plugins/actor/gdkpixbuf/Makefile.am libvisual-plugins-0.4.0.new/plugins/actor/gdkpixbuf/Makefile.am
+--- libvisual-plugins-0.4.0/plugins/actor/gdkpixbuf/Makefile.am	2006-02-24 00:34:48.000000000 +1100
++++ libvisual-plugins-0.4.0.new/plugins/actor/gdkpixbuf/Makefile.am	2007-07-04 18:19:43.000000000 +1000
+@@ -2,13 +2,12 @@
+ 
+ actor_plugin_LTLIBRARIES = actor_gdkpixbuf.la
+ 
+-LIBS += $(LIBVISUAL_LIBS) $(GTK_LIBS)
+-
+ AM_CFLAGS = $(LIBVISUAL_CFLAGS) $(GTK_CFLAGS)
+ 
+ INCLUDES = $(all_includes) -I$(top_srcdir) 
+ 
+ actor_gdkpixbuf_la_LDFLAGS = -module -avoid-version 
++actor_gdkpixbuf_la_LIBADD = $(LIBVISUAL_LIBS) $(GTK_LIBS)
+ 
+ actor_gdkpixbuf_la_SOURCES = actor_gdkpixbuf.c
+ 
+diff -Nur libvisual-plugins-0.4.0/plugins/actor/gstreamer/Makefile.am libvisual-plugins-0.4.0.new/plugins/actor/gstreamer/Makefile.am
+--- libvisual-plugins-0.4.0/plugins/actor/gstreamer/Makefile.am	2006-02-23 20:03:27.000000000 +1100
++++ libvisual-plugins-0.4.0.new/plugins/actor/gstreamer/Makefile.am	2007-07-04 18:19:43.000000000 +1000
+@@ -2,14 +2,13 @@
+ 
+ actor_plugin_LTLIBRARIES = actor_gstreamer.la
+ 
+-LIBS += $(LIBVISUAL_LIBS) $(GSTREAMER_LIBS)
+-
+ AM_CFLAGS = $(LIBVISUAL_CFLAGS) $(GSTREAMER_CFLAGS)
+ 
+ INCLUDES = $(all_includes) \
+ 	-I$(top_srcdir) 
+ 
+ actor_gstreamer_la_LDFLAGS = -module -avoid-version 
++actor_gstreamer_la_LIBADD = $(LIBVISUAL_LIBS) $(GSTREAMER_LIBS)
+ 
+ actor_gstreamer_la_SOURCES = actor_gstreamer.c
+ 
+diff -Nur libvisual-plugins-0.4.0/plugins/actor/infinite/Makefile.am libvisual-plugins-0.4.0.new/plugins/actor/infinite/Makefile.am
+--- libvisual-plugins-0.4.0/plugins/actor/infinite/Makefile.am	2006-02-23 20:03:27.000000000 +1100
++++ libvisual-plugins-0.4.0.new/plugins/actor/infinite/Makefile.am	2007-07-04 18:19:43.000000000 +1000
+@@ -2,13 +2,12 @@
+ 
+ actor_plugin_LTLIBRARIES = actor_infinite.la
+ 
+-LIBS += $(LIBVISUAL_LIBS)
+-
+ AM_CFLAGS = $(LIBVISUAL_CFLAGS)
+ 
+ INCLUDES = $(all_includes) -I$(top_srcdir) 
+ 
+ actor_infinite_la_LDFLAGS = -module -avoid-version 
++actor_infinite_la_LIBADD = $(LIBVISUAL_LIBS)
+ 
+ actor_infinite_la_SOURCES = compute.c compute.h \
+ 			    display.c display.h \
+diff -Nur libvisual-plugins-0.4.0/plugins/actor/jakdaw/Makefile.am libvisual-plugins-0.4.0.new/plugins/actor/jakdaw/Makefile.am
+--- libvisual-plugins-0.4.0/plugins/actor/jakdaw/Makefile.am	2006-02-23 20:03:28.000000000 +1100
++++ libvisual-plugins-0.4.0.new/plugins/actor/jakdaw/Makefile.am	2007-07-04 18:19:43.000000000 +1000
+@@ -2,13 +2,12 @@
+ 
+ actor_plugin_LTLIBRARIES = actor_jakdaw.la
+ 
+-LIBS += $(LIBVISUAL_LIBS)
+-
+ AM_CFLAGS = $(LIBVISUAL_CFLAGS)
+ 
+ INCLUDES = $(all_includes) -I$(top_srcdir) 
+ 
+ actor_jakdaw_la_LDFLAGS = -module -avoid-version 
++actor_jakdaw_la_LIBADD = $(LIBVISUAL_LIBS)
+ 
+ actor_jakdaw_la_SOURCES = actor_jakdaw.c \
+ 			  actor_jakdaw.h \
+diff -Nur libvisual-plugins-0.4.0/plugins/actor/JESS/Makefile.am libvisual-plugins-0.4.0.new/plugins/actor/JESS/Makefile.am
+--- libvisual-plugins-0.4.0/plugins/actor/JESS/Makefile.am	2006-02-23 20:03:24.000000000 +1100
++++ libvisual-plugins-0.4.0.new/plugins/actor/JESS/Makefile.am	2007-07-04 18:19:43.000000000 +1000
+@@ -2,13 +2,12 @@
+ 
+ actor_plugin_LTLIBRARIES = actor_JESS.la
+ 
+-LIBS += $(LIBVISUAL_LIBS)
+-
+ AM_CFLAGS = $(LIBVISUAL_CFLAGS)
+ 
+ INCLUDES = $(all_includes) -I$(top_srcdir) 
+ 
+ actor_JESS_la_LDFLAGS = -module -avoid-version
++actor_JESS_la_LIBADD = $(LIBVISUAL_LIBS)
+ 
+ actor_JESS_la_SOURCES = analyser.c analyser.h analyser_struct.h\
+ 			distorsion.c distorsion.h\
+diff -Nur libvisual-plugins-0.4.0/plugins/actor/lv_analyzer/Makefile.am libvisual-plugins-0.4.0.new/plugins/actor/lv_analyzer/Makefile.am
+--- libvisual-plugins-0.4.0/plugins/actor/lv_analyzer/Makefile.am	2006-02-23 20:03:28.000000000 +1100
++++ libvisual-plugins-0.4.0.new/plugins/actor/lv_analyzer/Makefile.am	2007-07-04 18:19:43.000000000 +1000
+@@ -2,14 +2,13 @@
+ 
+ actor_plugin_LTLIBRARIES = actor_lv_analyzer.la
+ 
+-LIBS += $(LIBVISUAL_LIBS)
+-
+ AM_CFLAGS = $(LIBVISUAL_CFLAGS)
+ 
+ INCLUDES = $(all_includes) \
+ 	-I$(top_srcdir) 
+ 
+ actor_lv_analyzer_la_LDFLAGS = -module -avoid-version 
++actor_lv_analyzer_la_LIBADD = $(LIBVISUAL_LIBS)
+ 
+ actor_lv_analyzer_la_SOURCES = actor_lv_analyzer.c
+ 
+diff -Nur libvisual-plugins-0.4.0/plugins/actor/lv_gltest/Makefile.am libvisual-plugins-0.4.0.new/plugins/actor/lv_gltest/Makefile.am
+--- libvisual-plugins-0.4.0/plugins/actor/lv_gltest/Makefile.am	2006-02-24 22:24:49.000000000 +1100
++++ libvisual-plugins-0.4.0.new/plugins/actor/lv_gltest/Makefile.am	2007-07-04 18:19:43.000000000 +1000
+@@ -4,5 +4,5 @@
+ 
+ actor_lv_gltest_la_CFLAGS = -I$(top_srcdir) $(LIBVISUAL_CFLAGS) $(X_CFLAGS)
+ actor_lv_gltest_la_LDFLAGS = -module -avoid-version 
+-actor_lv_gltest_la_LIBS = $(LIBVISUAL_LIBS) $(X_LIBS) -lGL -lGLU 
++actor_lv_gltest_la_LIBADD = $(LIBVISUAL_LIBS) $(X_LIBS) -lGL -lGLU 
+ actor_lv_gltest_la_SOURCES = actor_lv_gltest.c
+diff -Nur libvisual-plugins-0.4.0/plugins/actor/lv_scope/Makefile.am libvisual-plugins-0.4.0.new/plugins/actor/lv_scope/Makefile.am
+--- libvisual-plugins-0.4.0/plugins/actor/lv_scope/Makefile.am	2006-02-23 20:03:29.000000000 +1100
++++ libvisual-plugins-0.4.0.new/plugins/actor/lv_scope/Makefile.am	2007-07-04 18:19:43.000000000 +1000
+@@ -2,13 +2,12 @@
+ 
+ actor_plugin_LTLIBRARIES = actor_lv_scope.la
+ 
+-LIBS += $(LIBVISUAL_LIBS)
+-
+ AM_CFLAGS = $(LIBVISUAL_CFLAGS)
+ 
+ INCLUDES = $(all_includes) -I$(top_srcdir) 
+ 
+ actor_lv_scope_la_LDFLAGS = -module -avoid-version 
++actor_lv_scope_la_LIBADD = $(LIBVISUAL_LIBS)
+ 
+ actor_lv_scope_la_SOURCES = actor_lv_scope.c
+ 
+diff -Nur libvisual-plugins-0.4.0/plugins/actor/madspin/Makefile.am libvisual-plugins-0.4.0.new/plugins/actor/madspin/Makefile.am
+--- libvisual-plugins-0.4.0/plugins/actor/madspin/Makefile.am	2006-02-24 22:24:49.000000000 +1100
++++ libvisual-plugins-0.4.0.new/plugins/actor/madspin/Makefile.am	2007-07-04 18:19:43.000000000 +1000
+@@ -10,5 +10,5 @@
+ 
+ actor_madspin_la_CFLAGS = -I$(top_srcdir) $(LIBVISUAL_CFLAGS) -DSTAR_DIR=\""$(imagesdir)/"\"
+ actor_madspin_la_LDFLAGS = -module -avoid-version 
+-actor_madspin_la_LIBS = $(LIBVISUAL_LIBS) $(X_LIBS) -lGL 
++actor_madspin_la_LIBADD = $(LIBVISUAL_LIBS) $(X_LIBS) -lGL 
+ actor_madspin_la_SOURCES = madspin.c
+diff -Nur libvisual-plugins-0.4.0/plugins/actor/nastyfft/Makefile.am libvisual-plugins-0.4.0.new/plugins/actor/nastyfft/Makefile.am
+--- libvisual-plugins-0.4.0/plugins/actor/nastyfft/Makefile.am	2006-02-24 22:24:50.000000000 +1100
++++ libvisual-plugins-0.4.0.new/plugins/actor/nastyfft/Makefile.am	2007-07-04 18:19:43.000000000 +1000
+@@ -4,5 +4,5 @@
+ 
+ actor_nastyfft_la_CFLAGS = -I$(top_srcdir) $(LIBVISUAL_CFLAGS) $(X_CFLAGS)
+ actor_nastyfft_la_LDFLAGS = -module -avoid-version 
+-actor_nastyfft_la_LIBS = $(LIBVISUAL_LIBS) $(X_LIBS) -lGL -lGLU
++actor_nastyfft_la_LIBADD = $(LIBVISUAL_LIBS) $(X_LIBS) -lGL -lGLU
+ actor_nastyfft_la_SOURCES = actor_nastyfft.c
+diff -Nur libvisual-plugins-0.4.0/plugins/actor/oinksie/Makefile.am libvisual-plugins-0.4.0.new/plugins/actor/oinksie/Makefile.am
+--- libvisual-plugins-0.4.0/plugins/actor/oinksie/Makefile.am	2006-02-23 20:03:31.000000000 +1100
++++ libvisual-plugins-0.4.0.new/plugins/actor/oinksie/Makefile.am	2007-07-04 18:19:43.000000000 +1000
+@@ -2,13 +2,12 @@
+ 
+ actor_plugin_LTLIBRARIES = actor_oinksie.la
+ 
+-LIBS += $(LIBVISUAL_LIBS)
+-
+ AM_CFLAGS = $(LIBVISUAL_CFLAGS)
+ 
+ INCLUDES = $(all_includes) -I$(top_srcdir) 
+ 
+ actor_oinksie_la_LDFLAGS = -module -avoid-version 
++actor_oinksie_la_LIBADD = $(LIBVISUAL_LIBS)
+ 
+ actor_oinksie_la_SOURCES = actor_oinksie.c\
+ 			   oinksie.c oinksie.h\
+diff -Nur libvisual-plugins-0.4.0/plugins/actor/pseudotoad_flower/Makefile.am libvisual-plugins-0.4.0.new/plugins/actor/pseudotoad_flower/Makefile.am
+--- libvisual-plugins-0.4.0/plugins/actor/pseudotoad_flower/Makefile.am	2006-03-09 00:06:58.000000000 +1100
++++ libvisual-plugins-0.4.0.new/plugins/actor/pseudotoad_flower/Makefile.am	2007-07-04 18:19:43.000000000 +1000
+@@ -4,7 +4,7 @@
+ 
+ actor_flower_la_LDFLAGS = -module -avoid-version 
+ actor_flower_la_CFLAGS = -I$(top_srcdir) $(LIBVISUAL_CFLAGS) $(X_CFLAGS)
+-actor_flower_la_LIBS = $(LIBVISUAL_LIBS) $(X_LIBS) -lGL -lGLU 
++actor_flower_la_LIBADD = $(LIBVISUAL_LIBS) $(X_LIBS) -lGL -lGLU 
+ 
+ actor_flower_la_SOURCES = \
+ 	actor_flower.c \
+diff -Nur libvisual-plugins-0.4.0/plugins/input/alsa/Makefile.am libvisual-plugins-0.4.0.new/plugins/input/alsa/Makefile.am
+--- libvisual-plugins-0.4.0/plugins/input/alsa/Makefile.am	2006-02-23 20:03:35.000000000 +1100
++++ libvisual-plugins-0.4.0.new/plugins/input/alsa/Makefile.am	2007-07-04 18:19:43.000000000 +1000
+@@ -2,12 +2,11 @@
+ 
+ input_plugin_LTLIBRARIES = input_alsa.la
+ 
+-LIBS += $(ALSA_LIBS) $(LIBVISUAL_LIBS)
+-
+ AM_CFLAGS = $(ALSA_CFLAGS) $(LIBVISUAL_CFLAGS)
+ 
+ INCLUDES = $(all_includes) -I$(top_srcdir) -I$(top_builddir)
+ 
+ input_alsa_la_LDFLAGS = -module -avoid-version 
++input_alsa_la_LIBADD = $(ALSA_LIBS) $(LIBVISUAL_LIBS)
+ 
+ input_alsa_la_SOURCES = input_alsa.c
+diff -Nur libvisual-plugins-0.4.0/plugins/input/debug/Makefile.am libvisual-plugins-0.4.0.new/plugins/input/debug/Makefile.am
+--- libvisual-plugins-0.4.0/plugins/input/debug/Makefile.am	2006-02-23 20:03:36.000000000 +1100
++++ libvisual-plugins-0.4.0.new/plugins/input/debug/Makefile.am	2007-07-04 18:19:43.000000000 +1000
+@@ -2,11 +2,10 @@
+ 
+ input_plugin_LTLIBRARIES = input_debug.la
+ 
+-LIBS += $(LIBVISUAL_LIBS)
+-
+ AM_CFLAGS = $(LIBVISUAL_CFLAGS)
+ 
+ INCLUDES = $(all_includes) -I$(top_srcdir) -I$(top_builddir)
+ 
+ input_debug_la_LDFLAGS = -module -avoid-version 
++input_debug_la_LIBADD = $(LIBVISUAL_LIBS)
+ input_debug_la_SOURCES = input_debug.c
+diff -Nur libvisual-plugins-0.4.0/plugins/input/esd/Makefile.am libvisual-plugins-0.4.0.new/plugins/input/esd/Makefile.am
+--- libvisual-plugins-0.4.0/plugins/input/esd/Makefile.am	2006-02-23 20:03:37.000000000 +1100
++++ libvisual-plugins-0.4.0.new/plugins/input/esd/Makefile.am	2007-07-04 18:19:43.000000000 +1000
+@@ -2,11 +2,10 @@
+ 
+ input_plugin_LTLIBRARIES = input_esd.la
+ 
+-LIBS += $(LIBESD_LIBS) $(LIBVISUAL_LIBS)
+-
+ AM_CFLAGS = $(LIBESD_CFLAGS) $(LIBVISUAL_CFLAGS)
+ 
+ INCLUDES = $(all_includes) -I$(top_srcdir)
+ 
+ input_esd_la_LDFLAGS = -module -avoid-version 
++input_esd_la_LIBADD = $(LIBESD_LIBS) $(LIBVISUAL_LIBS)
+ input_esd_la_SOURCES = input_esd.c
+diff -Nur libvisual-plugins-0.4.0/plugins/input/jack/Makefile.am libvisual-plugins-0.4.0.new/plugins/input/jack/Makefile.am
+--- libvisual-plugins-0.4.0/plugins/input/jack/Makefile.am	2006-02-23 20:03:37.000000000 +1100
++++ libvisual-plugins-0.4.0.new/plugins/input/jack/Makefile.am	2007-07-04 18:19:43.000000000 +1000
+@@ -2,13 +2,12 @@
+ 
+ input_plugin_LTLIBRARIES = input_jack.la
+ 
+-LIBS += $(LIBJACK_LIBS) $(LIBVISUAL_LIBS)
+-
+ AM_CFLAGS = $(LIBJACK_CFLAGS) $(LIBVISUAL_CFLAGS)
+ 
+ INCLUDES = $(all_includes) -I$(top_srcdir) 
+ 
+ input_jack_la_LDFLAGS = -module -avoid-version 
++input_jack_la_LIBADD = $(LIBJACK_LIBS) $(LIBVISUAL_LIBS)
+ 
+ input_jack_la_SOURCES = input_jack.c
+ 
+diff -Nur libvisual-plugins-0.4.0/plugins/input/mplayer/Makefile.am libvisual-plugins-0.4.0.new/plugins/input/mplayer/Makefile.am
+--- libvisual-plugins-0.4.0/plugins/input/mplayer/Makefile.am	2006-02-23 20:03:38.000000000 +1100
++++ libvisual-plugins-0.4.0.new/plugins/input/mplayer/Makefile.am	2007-07-04 18:19:43.000000000 +1000
+@@ -2,12 +2,11 @@
+ 
+ input_plugin_LTLIBRARIES = input_mplayer.la
+ 
+-LIBS += $(LIBVISUAL_LIBS)
+-
+ AM_CFLAGS = $(LIBVISUAL_CFLAGS)
+ 
+ INCLUDES = $(all_includes) -I$(top_srcdir) 
+ 
+ input_mplayer_la_LDFLAGS = -module -avoid-version 
++input_mplayer_la_LIBADD = $(LIBVISUAL_LIBS)
+ input_mplayer_la_SOURCES = input_mplayer.c
+ 
+diff -Nur libvisual-plugins-0.4.0/plugins/morph/alphablend/Makefile.am libvisual-plugins-0.4.0.new/plugins/morph/alphablend/Makefile.am
+--- libvisual-plugins-0.4.0/plugins/morph/alphablend/Makefile.am	2006-02-23 20:03:38.000000000 +1100
++++ libvisual-plugins-0.4.0.new/plugins/morph/alphablend/Makefile.am	2007-07-04 18:19:43.000000000 +1000
+@@ -2,11 +2,10 @@
+ 
+ morph_plugin_LTLIBRARIES = morph_alphablend.la
+ 
+-LIBS += $(LIBVISUAL_LIBS)
+-
+ AM_CFLAGS = $(LIBVISUAL_CFLAGS)
+ 
+ INCLUDES = $(all_includes) -I$(top_srcdir) 
+ 
+ morph_alphablend_la_LDFLAGS = -module -avoid-version 
++morph_alphablend_la_LIBADD = $(LIBVISUAL_LIBS)
+ morph_alphablend_la_SOURCES = morph_alphablend.c
+diff -Nur libvisual-plugins-0.4.0/plugins/morph/flash/Makefile.am libvisual-plugins-0.4.0.new/plugins/morph/flash/Makefile.am
+--- libvisual-plugins-0.4.0/plugins/morph/flash/Makefile.am	2006-02-23 20:03:39.000000000 +1100
++++ libvisual-plugins-0.4.0.new/plugins/morph/flash/Makefile.am	2007-07-04 18:19:43.000000000 +1000
+@@ -2,11 +2,10 @@
+ 
+ morph_plugin_LTLIBRARIES = morph_flash.la
+ 
+-LIBS += $(LIBVISUAL_LIBS)
+-
+ AM_CFLAGS = $(LIBVISUAL_CFLAGS)
+ 
+ INCLUDES = $(all_includes) -I$(top_srcdir) 
+ 
+ morph_flash_la_LDFLAGS = -module -avoid-version 
++morph_flash_la_LIBADD = $(LIBVISUAL_LIBS)
+ morph_flash_la_SOURCES = morph_flash.c
+diff -Nur libvisual-plugins-0.4.0/plugins/morph/slide/Makefile.am libvisual-plugins-0.4.0.new/plugins/morph/slide/Makefile.am
+--- libvisual-plugins-0.4.0/plugins/morph/slide/Makefile.am	2006-02-23 20:03:39.000000000 +1100
++++ libvisual-plugins-0.4.0.new/plugins/morph/slide/Makefile.am	2007-07-04 18:19:43.000000000 +1000
+@@ -2,11 +2,10 @@
+ 
+ morph_plugin_LTLIBRARIES = morph_slide.la
+ 
+-LIBS += $(LIBVISUAL_LIBS)
+-
+ AM_CFLAGS = $(LIBVISUAL_CFLAGS)
+ 
+ INCLUDES = $(all_includes) -I$(top_srcdir) 
+ 
+ morph_slide_la_LDFLAGS = -module -avoid-version 
++morph_slide_la_LIBADD = $(LIBVISUAL_LIBS)
+ morph_slide_la_SOURCES = morph_slide.c
+diff -Nur libvisual-plugins-0.4.0/plugins/morph/tentacle/Makefile.am libvisual-plugins-0.4.0.new/plugins/morph/tentacle/Makefile.am
+--- libvisual-plugins-0.4.0/plugins/morph/tentacle/Makefile.am	2006-02-23 20:03:39.000000000 +1100
++++ libvisual-plugins-0.4.0.new/plugins/morph/tentacle/Makefile.am	2007-07-04 18:19:43.000000000 +1000
+@@ -2,11 +2,10 @@
+ 
+ morph_plugin_LTLIBRARIES = morph_tentacle.la
+ 
+-LIBS += $(LIBVISUAL_LIBS)
+-
+ AM_CFLAGS = $(LIBVISUAL_CFLAGS)
+ 
+ INCLUDES = $(all_includes) -I$(top_srcdir) 
+ 
+ morph_tentacle_la_LDFLAGS = -module -avoid-version 
++morph_tentacle_la_LIBADD = $(LIBVISUAL_LIBS)
+ morph_tentacle_la_SOURCES = morph_tentacle.c
diff --git a/testing/libvisual-plugins/04_lv_analyzer_build_fix.patch b/testing/libvisual-plugins/04_lv_analyzer_build_fix.patch
new file mode 100644
index 000000000..1fc5f7fc7
--- /dev/null
+++ b/testing/libvisual-plugins/04_lv_analyzer_build_fix.patch
@@ -0,0 +1,12 @@
+diff -Nur libvisual-plugins-0.4.0/configure.ac libvisual-plugins-0.4.0.new/configure.ac
+--- libvisual-plugins-0.4.0/configure.ac	2006-03-17 03:50:41.000000000 +1100
++++ libvisual-plugins-0.4.0.new/configure.ac	2007-07-04 18:22:38.000000000 +1000
+@@ -361,7 +361,7 @@
+   [ENABLE_ANALYZER=$enableval],
+   [ENABLE_ANALYZER=yes])
+ 
+-if test "$ENABLE_ANALYZER" = xyes; then
++if test "$ENABLE_ANALYZER" = "yes"; then
+   build_actor_plugins="$build_actor_plugins lv_analyzer"
+ fi
+ 
diff --git a/testing/libvisual-plugins/050_all_automagic.patch b/testing/libvisual-plugins/050_all_automagic.patch
new file mode 100644
index 000000000..9c25fac72
--- /dev/null
+++ b/testing/libvisual-plugins/050_all_automagic.patch
@@ -0,0 +1,50 @@
+--- configure.ac.old	2007-02-24 23:09:08.000000000 +0100
++++ configure.ac	2007-02-24 23:13:15.000000000 +0100
+@@ -89,7 +89,18 @@
+ 
+ dnl Libraries
+ 
++dnl List of plugins to build
++build_input_plugins=""
++build_actor_plugins=""
++build_morph_plugins=""
++
+ dnl EsounD
++AC_ARG_ENABLE([esd], AS_HELP_STRING([--disable-esd],
++	[Do not build esound input plugin @<:@default=enabled@:>@]),
++	[ENABLE_INPUT_ESD=$enableval],
++	[ENABLE_INPUT_ESD=yes])
++
++if test "$ENABLE_INPUT_ESD" = "yes"; then
+ PKG_CHECK_MODULES([LIBESD], [esound >= esound_required_version],
+   [HAVE_ESD="yes"], [HAVE_ESD="no"])
+ 
+@@ -98,8 +109,15 @@
+ else
+   AC_MSG_WARN([*** EsounD not found or too old. The EsounD input plugin won't be built])
+ fi
++fi
+ 
+ dnl JACK
++AC_ARG_ENABLE([jack], AS_HELP_STRING([--disable-jack],
++	[Do not build jack input plugin @<:@default=enabled@:>@]),
++        [ENABLE_INPUT_JACK=$enableval],
++	[ENABLE_INPUT_JACK=yes])
++
++if test "$ENABLE_INPUT_JACK" = "yes"; then
+ PKG_CHECK_MODULES([LIBJACK], [jack >= jack_required_version], [HAVE_JACK="yes"], [HAVE_JACK="no"])
+ if test "$HAVE_JACK" = "yes"; then
+   build_input_plugins="$build_input_plugins jack"
+@@ -107,11 +125,7 @@
+   AC_MSG_WARN([*** libjack is too old. You can download a newer version at
+              http://jackit.sf.net/. The jackit input plugin won't be built])
+ fi
+-
+-dnl List of plugins to build
+-build_input_plugins=""
+-build_actor_plugins=""
+-build_morph_plugins=""
++fi
+ 
+ dnl GdkPixbuf
+ AC_ARG_ENABLE([gdkpixbuf-plugin],
diff --git a/testing/libvisual-plugins/05_fix_po.patch b/testing/libvisual-plugins/05_fix_po.patch
new file mode 100644
index 000000000..a5413ef1b
--- /dev/null
+++ b/testing/libvisual-plugins/05_fix_po.patch
@@ -0,0 +1,127 @@
+diff -Nur libvisual-plugins-0.4.0/po/Makefile.in.in libvisual-plugins-0.4.0.new/po/Makefile.in.in
+--- libvisual-plugins-0.4.0/po/Makefile.in.in	2006-03-21 05:48:28.000000000 +1100
++++ libvisual-plugins-0.4.0.new/po/Makefile.in.in	2007-07-09 21:50:13.000000000 +1000
+@@ -28,7 +28,7 @@
+ 
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+-MKINSTALLDIRS = @MKINSTALLDIRS@
++MKINSTALLDIRS = mkinstalldirs
+ mkinstalldirs = $(SHELL) $(MKINSTALLDIRS)
+ 
+ GMSGFMT = @GMSGFMT@
+diff -Nur libvisual-plugins-0.4.0/po/mkinstalldirs libvisual-plugins-0.4.0.new/po/mkinstalldirs
+--- libvisual-plugins-0.4.0/po/mkinstalldirs	1970-01-01 10:00:00.000000000 +1000
++++ libvisual-plugins-0.4.0.new/po/mkinstalldirs	2006-03-21 05:48:42.000000000 +1100
+@@ -0,0 +1,111 @@
++#! /bin/sh
++# mkinstalldirs --- make directory hierarchy
++# Author: Noah Friedman <friedman@prep.ai.mit.edu>
++# Created: 1993-05-16
++# Public domain
++
++errstatus=0
++dirmode=""
++
++usage="\
++Usage: mkinstalldirs [-h] [--help] [-m mode] dir ..."
++
++# process command line arguments
++while test $# -gt 0 ; do
++  case $1 in
++    -h | --help | --h*)         # -h for help
++      echo "$usage" 1>&2
++      exit 0
++      ;;
++    -m)                         # -m PERM arg
++      shift
++      test $# -eq 0 && { echo "$usage" 1>&2; exit 1; }
++      dirmode=$1
++      shift
++      ;;
++    --)                         # stop option processing
++      shift
++      break
++      ;;
++    -*)                         # unknown option
++      echo "$usage" 1>&2
++      exit 1
++      ;;
++    *)                          # first non-opt arg
++      break
++      ;;
++  esac
++done
++
++for file
++do
++  if test -d "$file"; then
++    shift
++  else
++    break
++  fi
++done
++
++case $# in
++  0) exit 0 ;;
++esac
++
++case $dirmode in
++  '')
++    if mkdir -p -- . 2>/dev/null; then
++      echo "mkdir -p -- $*"
++      exec mkdir -p -- "$@"
++    fi
++    ;;
++  *)
++    if mkdir -m "$dirmode" -p -- . 2>/dev/null; then
++      echo "mkdir -m $dirmode -p -- $*"
++      exec mkdir -m "$dirmode" -p -- "$@"
++    fi
++    ;;
++esac
++
++for file
++do
++  set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
++  shift
++
++  pathcomp=
++  for d
++  do
++    pathcomp="$pathcomp$d"
++    case $pathcomp in
++      -*) pathcomp=./$pathcomp ;;
++    esac
++
++    if test ! -d "$pathcomp"; then
++      echo "mkdir $pathcomp"
++
++      mkdir "$pathcomp" || lasterr=$?
++
++      if test ! -d "$pathcomp"; then
++  	errstatus=$lasterr
++      else
++  	if test ! -z "$dirmode"; then
++	  echo "chmod $dirmode $pathcomp"
++    	  lasterr=""
++  	  chmod "$dirmode" "$pathcomp" || lasterr=$?
++
++  	  if test ! -z "$lasterr"; then
++  	    errstatus=$lasterr
++  	  fi
++  	fi
++      fi
++    fi
++
++    pathcomp="$pathcomp/"
++  done
++done
++
++exit $errstatus
++
++# Local Variables:
++# mode: shell-script
++# sh-indentation: 2
++# End:
++# mkinstalldirs ends here
diff --git a/testing/libvisual-plugins/60_no-const-vispluginfo-in-nastyfft.patch b/testing/libvisual-plugins/60_no-const-vispluginfo-in-nastyfft.patch
new file mode 100644
index 000000000..8e54e02cb
--- /dev/null
+++ b/testing/libvisual-plugins/60_no-const-vispluginfo-in-nastyfft.patch
@@ -0,0 +1,18 @@
+The static VisPluginInfo in nastyfft was declared as const, but libvisual write
+to its refcount when it visual_object_unref()s it (nasty!).  This is broken at
+various levels: libvisual shouldn't be writing to this static plugin which is
+allocated by a dlopen()ed plugin, and it should also honor the "const
+VisPluginInfo" API...  Anyway, nastyfft was the only occurrence and this fixes
+the crash for now; LP: #287448.
+
+--- libvisual-plugins-0.4.0.dfsg.1.orig/plugins/actor/nastyfft/actor_nastyfft.c
++++ libvisual-plugins-0.4.0.dfsg.1/plugins/actor/nastyfft/actor_nastyfft.c
+@@ -80,7 +80,7 @@
+ 		.vidoptions.depth = VISUAL_VIDEO_DEPTH_GL
+ 	}};
+ 
+-	static const VisPluginInfo info[] = {{
++	static VisPluginInfo info[] = {{
+ 		.type = VISUAL_PLUGIN_TYPE_ACTOR,
+ 
+ 		.plugname = N_("nastyfft"),
diff --git a/testing/libvisual-plugins/PKGBUILD b/testing/libvisual-plugins/PKGBUILD
new file mode 100644
index 000000000..df8684ed6
--- /dev/null
+++ b/testing/libvisual-plugins/PKGBUILD
@@ -0,0 +1,51 @@
+# $Id: PKGBUILD 168488 2012-10-12 17:38:33Z andyrtr $
+# Maintainer: damir <damir@archlinux.org>
+
+pkgname=libvisual-plugins
+pkgver=0.4.0
+pkgrel=7
+pkgdesc="plugins for libvisual"
+arch=("i686" "x86_64")
+license=('GPL')
+url="http://www.localhost.nl/~synap/libvisual/"
+depends=('libvisual' 'gtk2' 'glu' 'alsa-lib' 'jack')
+makedepends=('mesa')
+options=(!libtool)
+source=(http://downloads.sourceforge.net/sourceforge/libvisual/libvisual-plugins-${pkgver}.tar.gz
+        02_64-bit_JESS_fix.patch
+        03_build_against_gl_fixes.patch
+        04_lv_analyzer_build_fix.patch
+        05_fix_po.patch
+        050_all_automagic.patch
+        60_no-const-vispluginfo-in-nastyfft.patch)
+md5sums=('4330e9287f9d6fae02f482f428a1e77b'
+         'f9cfb607bfcbfef60830fae4e7dc6963'
+         '116701408747dbb87dc134434478ebe2'
+         '01678a8f1584c76a44e59d81003a1109'
+         '6189b7427c4e11c8b8d6c6266d6a1629'
+         'b50ae94c424a5f0af235deffa8451eb6'
+         '7012518727cb072a7e90a826a5577cc6')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np1 -i "${srcdir}/02_64-bit_JESS_fix.patch"
+  patch -Np1 -i "${srcdir}/03_build_against_gl_fixes.patch"
+  patch -Np1 -i "${srcdir}/04_lv_analyzer_build_fix.patch"
+  patch -Np0 -i "${srcdir}/050_all_automagic.patch"
+  patch -Np1 -i "${srcdir}/60_no-const-vispluginfo-in-nastyfft.patch"
+
+  autoreconf -fi
+  # Apply later as autoreconf overwrites po/Makefile.in.in
+  patch -Np1 -i "${srcdir}/05_fix_po.patch"
+
+  ./configure --prefix=/usr \
+      --disable-gstreamer-plugin \
+      --disable-gforce \
+      --disable-esd
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/testing/mesa/git_fixes.diff b/testing/mesa/git_fixes.diff
new file mode 100644
index 000000000..8132d1d10
--- /dev/null
+++ b/testing/mesa/git_fixes.diff
@@ -0,0 +1,93 @@
+From 161aababc659e23c4a8523366a31f63b3d14e280 Mon Sep 17 00:00:00 2001
+From: Ian Romanick <ian.d.romanick@intel.com>
+Date: Mon, 08 Oct 2012 22:07:10 +0000
+Subject: docs: Add 9.0 release md5sums
+
+Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
+---
+diff --git a/docs/relnotes-9.0.html b/docs/relnotes-9.0.html
+index d72c5bb..02b7324 100644
+--- a/docs/relnotes-9.0.html
++++ b/docs/relnotes-9.0.html
+@@ -26,7 +26,9 @@ because GL_ARB_compatibility is not supported.
+ 
+ <h2>MD5 checksums</h2>
+ <pre>
+-tbd
++be4cd34c6599a7cb9d254b05c48bdb1f  MesaLib-9.0.tar.gz
++60e557ce407be3732711da484ab3db6c  MesaLib-9.0.tar.bz2
++16b128544cd3f7e237927bb9f8aab7ce  MesaLib-9.0.zip
+ </pre>
+ 
+ 
+--
+cgit v0.9.0.2-2-gbebe
+From 32faf7ab0de8b88bb15a2cb262a73c411dce9d0d Mon Sep 17 00:00:00 2001
+From: Brian Paul <brianp@vmware.com>
+Date: Fri, 05 Oct 2012 22:47:40 +0000
+Subject: mesa: don't call TexImage driver hooks for zero-sized images
+
+This simply avoids some failed assertions but there's no reason to
+call the driver hooks for storing a tex image if its size is zero.
+
+Note: This is a candidate for the stable branches.
+(cherry picked from commit 91d84096497ff538f55591f7e6bb0b563726db8d)
+---
+diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c
+index 21646cc..8004876 100644
+--- a/src/mesa/main/teximage.c
++++ b/src/mesa/main/teximage.c
+@@ -3034,13 +3034,15 @@ teximage(struct gl_context *ctx, GLboolean compressed, GLuint dims,
+                                           border, internalFormat, texFormat);
+ 
+                /* Give the texture to the driver.  <pixels> may be null. */
+-               if (compressed) {
+-                  ctx->Driver.CompressedTexImage(ctx, dims, texImage,
+-                                                 imageSize, pixels);
+-               }
+-               else {
+-                  ctx->Driver.TexImage(ctx, dims, texImage, format,
+-                                       type, pixels, unpack);
++               if (width > 0 && height > 0 && depth > 0) {
++                  if (compressed) {
++                     ctx->Driver.CompressedTexImage(ctx, dims, texImage,
++                                                    imageSize, pixels);
++                  }
++                  else {
++                     ctx->Driver.TexImage(ctx, dims, texImage, format,
++                                          type, pixels, unpack);
++                  }
+                }
+ 
+                check_gen_mipmap(ctx, target, texObj, level);
+--
+cgit v0.9.0.2-2-gbebe
+From e75051d1967350ceff0209dde24ae42696b13b5c Mon Sep 17 00:00:00 2001
+From: Brian Paul <brianp@vmware.com>
+Date: Fri, 05 Oct 2012 22:59:27 +0000
+Subject: mesa: fix error check for zero-sized compressed subtexture
+
+For glCompressedTexSubImage, width or height = 0 is legal.
+Fixes a failure in piglit's s3tc-errors test.
+
+This is for the 9.0 and 8.0 branches.  Already fixed on master.
+---
+diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c
+index 8004876..38fa9fa 100644
+--- a/src/mesa/main/teximage.c
++++ b/src/mesa/main/teximage.c
+@@ -3598,10 +3598,10 @@ compressed_subtexture_error_check(struct gl_context *ctx, GLint dimensions,
+    if (!_mesa_is_compressed_format(ctx, format))
+       return GL_INVALID_ENUM;
+ 
+-   if (width < 1 || width > maxTextureSize)
++   if (width < 0 || width > maxTextureSize)
+       return GL_INVALID_VALUE;
+ 
+-   if ((height < 1 || height > maxTextureSize)
++   if ((height < 0 || height > maxTextureSize)
+        && dimensions > 1)
+       return GL_INVALID_VALUE;
+ 
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/testing/octave/PKGBUILD b/testing/octave/PKGBUILD
new file mode 100644
index 000000000..cc4149860
--- /dev/null
+++ b/testing/octave/PKGBUILD
@@ -0,0 +1,54 @@
+# $Id: PKGBUILD 168503 2012-10-12 21:20:37Z andyrtr $
+# Maintainer: Ronald van Haren <ronald.archlinux.org>
+# Contributor : shining <shiningxc.at.gmail.com>
+# Contributor : cyberdune <cyberdune@gmail.com>
+
+pkgname=octave
+pkgver=3.6.2
+pkgrel=2
+pkgdesc="A high-level language, primarily intended for numerical computations."
+arch=('i686' 'x86_64')
+url="http://www.octave.org"
+license=('GPL')
+depends=('fftw' 'pcre' 'curl' 'lapack' 'libx11' 'graphicsmagick' 'glpk' 'hdf5' 'gcc-libs' 'qhull' 'fltk' 'suitesparse')
+makedepends=('texinfo' 'graphicsmagick' 'gcc-fortran' 'suitesparse' 'texlive-core')
+optdepends=('texinfo: for help-support in octave'
+            'gnuplot: alternative plotting')
+source=("ftp://ftp.gnu.org/gnu/octave/octave-$pkgver.tar.bz2"
+        buildfix.diff
+        octave-gethelp.patch)
+options=('!emptydirs')
+install=octave.install
+sha1sums=('145fef0122268086727a60e1c33e29d56fd546d7'
+          'a7cdba1e05fbdd182facdd804aeec37729255551'
+          'd39d54763ac86114029f8bc5d60763d2adce27bb')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+
+  # patch by Gentoo http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/sci-mathematics/octave/files/octave-3.4.3-gets.patch?view=log
+  patch -Np0 -i ${srcdir}/buildfix.diff
+  # http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/sci-mathematics/octave/files/octave-3.4.3-help.patch?view=log
+  patch -Np0 -i ${srcdir}/octave-gethelp.patch
+
+  autoreconf -vfi
+
+  # http://www.nabble.com/Random-rounding-errors-td16010966.html
+  FFLAGS="-O -ffloat-store" \
+
+  ./configure --prefix=/usr --libexecdir=/usr/lib \
+  --enable-shared --disable-static \
+  --with-umfpack="-lumfpack -lsuitesparseconfig" # https://mailman.cae.wisc.edu/pipermail/help-octave/2012-September/053991.html
+
+  LANG=C make
+}
+
+package(){
+  cd ${srcdir}/${pkgname}-${pkgver}
+
+  make DESTDIR="${pkgdir}" install
+
+  # add octave library path to ld.so.conf.d
+  install -d ${pkgdir}/etc/ld.so.conf.d
+  echo "/usr/lib/${pkgname}/${pkgver}" > ${pkgdir}/etc/ld.so.conf.d/${pkgname}.conf
+}
diff --git a/testing/octave/buildfix.diff b/testing/octave/buildfix.diff
new file mode 100644
index 000000000..8288b7bec
--- /dev/null
+++ b/testing/octave/buildfix.diff
@@ -0,0 +1,85 @@
+--- libgnu/stdio.in.h.origs	2012-05-24 12:46:13.000000000 -0600
++++ libgnu/stdio.in.h	2012-05-24 16:29:54.813734894 -0600
+@@ -1,12 +1,10 @@
+-/* -*- buffer-read-only: t -*- vi: set ro: */
+-/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
+ /* A GNU-like <stdio.h>.
+ 
+    Copyright (C) 2004, 2007-2012 Free Software Foundation, Inc.
+ 
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+-   the Free Software Foundation; either version 3, or (at your option)
++   the Free Software Foundation; either version 2, or (at your option)
+    any later version.
+ 
+    This program is distributed in the hope that it will be useful,
+@@ -15,8 +13,7 @@
+    GNU General Public License for more details.
+ 
+    You should have received a copy of the GNU General Public License
+-   along with this program; if not, write to the Free Software Foundation,
+-   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
++   along with this program; if not, see <http://www.gnu.org/licenses/>.  */
+ 
+ #if __GNUC__ >= 3
+ @PRAGMA_SYSTEM_HEADER@
+@@ -55,7 +52,8 @@
+ #include <stddef.h>
+ 
+ /* Get off_t and ssize_t.  Needed on many systems, including glibc 2.8
+-   and eglibc 2.11.2.  */
++   and eglibc 2.11.2.
++   May also define off_t to a 64-bit type on native Windows.  */
+ #include <sys/types.h>
+ 
+ /* The __attribute__ feature is available in gcc versions 2.5 and later.
+@@ -701,22 +699,11 @@ _GL_WARN_ON_USE (getline, "getline is un
+ # endif
+ #endif
+ 
+-#if @GNULIB_GETS@
+-# if @REPLACE_STDIO_READ_FUNCS@ && @GNULIB_STDIO_H_NONBLOCKING@
+-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+-#   undef gets
+-#   define gets rpl_gets
+-#  endif
+-_GL_FUNCDECL_RPL (gets, char *, (char *s) _GL_ARG_NONNULL ((1)));
+-_GL_CXXALIAS_RPL (gets, char *, (char *s));
+-# else
+-_GL_CXXALIAS_SYS (gets, char *, (char *s));
+-#  undef gets
+-# endif
+-_GL_CXXALIASWARN (gets);
+ /* It is very rare that the developer ever has full control of stdin,
+-   so any use of gets warrants an unconditional warning.  Assume it is
+-   always declared, since it is required by C89.  */
++   so any use of gets warrants an unconditional warning; besides, C11
++   removed it.  */
++#undef gets
++#if HAVE_RAW_DECL_GETS
+ _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
+ #endif
+ 
+@@ -781,7 +768,7 @@ _GL_CXXALIASWARN (pclose);
+ #elif defined GNULIB_POSIXCHECK
+ # undef pclose
+ # if HAVE_RAW_DECL_PCLOSE
+-_GL_WARN_ON_USE (pclose, "popen is unportable - "
++_GL_WARN_ON_USE (pclose, "pclose is unportable - "
+                  "use gnulib module pclose for more portability");
+ # endif
+ #endif
+@@ -1056,9 +1043,9 @@ _GL_WARN_ON_USE (snprintf, "snprintf is
+ # endif
+ #endif
+ 
+-/* Some people would argue that sprintf should be handled like gets
+-   (for example, OpenBSD issues a link warning for both functions),
+-   since both can cause security holes due to buffer overruns.
++/* Some people would argue that all sprintf uses should be warned about
++   (for example, OpenBSD issues a link warning for it),
++   since it can cause security holes due to buffer overruns.
+    However, we believe that sprintf can be used safely, and is more
+    efficient than snprintf in those safe cases; and as proof of our
+    belief, we use sprintf in several gnulib modules.  So this header
diff --git a/testing/octave/curlfix.patch b/testing/octave/curlfix.patch
new file mode 100644
index 000000000..26f3d92f9
--- /dev/null
+++ b/testing/octave/curlfix.patch
@@ -0,0 +1,10 @@
+--- src/DLD-FUNCTIONS/urlwrite.cc.old	2011-07-02 16:39:22.466603778 +0200
++++ src/DLD-FUNCTIONS/urlwrite.cc	2011-07-02 16:39:54.543269859 +0200
+@@ -52,7 +52,6 @@
+ 
+ #include <curl/curl.h>
+ #include <curl/curlver.h>
+-#include <curl/types.h>
+ #include <curl/easy.h>
+ 
+ static int
diff --git a/testing/octave/imread.patch b/testing/octave/imread.patch
new file mode 100644
index 000000000..4a7b73ea0
--- /dev/null
+++ b/testing/octave/imread.patch
@@ -0,0 +1,29 @@
+--- src/DLD-FUNCTIONS/__magick_read__.cc.orig	2010-03-06 08:05:25.000000000 +0000
++++ src/DLD-FUNCTIONS/__magick_read__.cc	2009-08-25 09:26:01.000000000 +0100
+@@ -30,6 +30,7 @@
+ #include "defun-dld.h"
+ #include "error.h"
+ #include "ov-struct.h"
++#include "oct-env.h"
+ 
+ #ifdef HAVE_MAGICK
+ 
+@@ -359,6 +358,18 @@
+ 
+ #ifdef HAVE_MAGICK
+ 
++  static bool initialized = false;
++
++  if (! initialized)
++    {
++      std::string program_name = octave_env::get_program_invocation_name ();
++
++      Magick::InitializeMagick (program_name.c_str ());
++
++      initialized = true;
++    }
++
++
+   if (args.length () > 2 || args.length () < 1 || ! args(0).is_string ()
+       || nargout > 3)
+     {
diff --git a/testing/octave/octave-3.4.0-gcc46.patch b/testing/octave/octave-3.4.0-gcc46.patch
new file mode 100644
index 000000000..c174204ac
--- /dev/null
+++ b/testing/octave/octave-3.4.0-gcc46.patch
@@ -0,0 +1,24 @@
+diff -up octave-3.4.0/liboctave/oct-alloc.h.gcc46 octave-3.4.0/liboctave/oct-alloc.h
+--- octave-3.4.0/liboctave/oct-alloc.h.gcc46	2011-02-08 03:00:51.000000000 -0700
++++ octave-3.4.0/liboctave/oct-alloc.h	2011-02-08 09:41:23.984081687 -0700
+@@ -23,6 +23,8 @@ along with Octave; see the file COPYING.
+ #if !defined (octave_oct_alloc_h)
+ #define octave_oct_alloc_h 1
+ 
++#include <cstddef>
++
+ class
+ OCTAVE_API
+ octave_allocator
+diff -up octave-3.4.0/src/pr-output.cc.gcc46 octave-3.4.0/src/pr-output.cc
+--- octave-3.4.0/src/pr-output.cc.gcc46	2011-02-08 03:00:52.000000000 -0700
++++ octave-3.4.0/src/pr-output.cc	2011-02-08 09:55:16.149662744 -0700
+@@ -3024,7 +3024,7 @@ abs (T x)
+ }
+ 
+ #define INSTANTIATE_ABS(T) \
+-  template /* static */ inline T abs (T)
++  template /* static */ T abs (T)
+ 
+ INSTANTIATE_ABS(signed char);
+ INSTANTIATE_ABS(short);
diff --git a/testing/octave/octave-gethelp.patch b/testing/octave/octave-gethelp.patch
new file mode 100644
index 000000000..c0e693abc
--- /dev/null
+++ b/testing/octave/octave-gethelp.patch
@@ -0,0 +1,13 @@
+Help parallel compilation
+patch by Sebastien Fabbro 
+--- scripts/Makefile.am.orig	2011-06-09 22:27:22.688268651 +0100
++++ scripts/Makefile.am	2011-02-08 10:00:51.000000000 +0000
+@@ -316,7 +316,7 @@
+ 
+ gethelp_SOURCES = gethelp.cc
+ 
+-.DOCSTRINGS: $(FCN_FILES) $(GEN_FCN_FILES) mkdoc $(gethelp_SOURCES) Makefile
++.DOCSTRINGS: $(FCN_FILES) $(GEN_FCN_FILES) mkdoc $(gethelp_SOURCES) Makefile gethelp
+ 	@$(MAKE) $(AM_MAKEFLAGS) gethelp$(BUILD_EXEEXT)
+ 	if [ "x$(srcdir)" != "x." ] && [ -f $(srcdir)/DOCSTRINGS ] && [ ! -f DOCSTRINGS ]; then \
+ 		cp $(srcdir)/DOCSTRINGS DOCSTRINGS; \
diff --git a/testing/octave/octave.install b/testing/octave/octave.install
new file mode 100644
index 000000000..8ee77c430
--- /dev/null
+++ b/testing/octave/octave.install
@@ -0,0 +1,18 @@
+info_dir=/usr/share/info
+info_files=(octave.info octave.info-1 octave.info-2 octave.info-3 octave.info-4 octave.info-5)
+
+post_install() {
+  for f in ${info_files[@]}; do
+    install-info ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null
+  done
+}
+
+post_upgrade() {
+	post_install
+}
+
+pre_remove() {
+  for f in ${info_files[@]}; do
+    install-info --delete ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null
+  done
+}
diff --git a/testing/pam/pam_namespace-build-1.1.6.patch b/testing/pam/pam_namespace-build-1.1.6.patch
new file mode 100644
index 000000000..aeabc234c
--- /dev/null
+++ b/testing/pam/pam_namespace-build-1.1.6.patch
@@ -0,0 +1,11 @@
+--- modules/pam_namespace/Makefile~	2012-10-12 10:59:13.557550706 +0200
++++ modules/pam_namespace/Makefile	2012-10-12 10:59:13.564217270 +0200
+@@ -869,7 +869,7 @@
+ 
+ 
+ install-data-local:
+-	mkdir -p $(namespaceddir)
++	mkdir -p $(DESTDIR)$(namespaceddir)
+ README: pam_namespace.8.xml namespace.conf.5.xml
+ -include $(top_srcdir)/Make.xml.rules
+ 
diff --git a/testing/pam/pam_unix2-glibc216.patch b/testing/pam/pam_unix2-glibc216.patch
new file mode 100644
index 000000000..faa6a235f
--- /dev/null
+++ b/testing/pam/pam_unix2-glibc216.patch
@@ -0,0 +1,20 @@
+Index: pam_unix2-2.9.1/src/read-files.c
+===================================================================
+--- pam_unix2-2.9.1.orig/src/read-files.c
++++ pam_unix2-2.9.1/src/read-files.c
+@@ -30,8 +30,14 @@
+ #include <errno.h>
+ #include <fcntl.h>
+ #include <nss.h>
+-#include <bits/libc-lock.h>
++#include <pthread.h>
+ #define __libc_lock_t pthread_mutex_t
++#define __libc_lock_define_initialized(CLASS,NAME) \
++  CLASS __libc_lock_t NAME = PTHREAD_MUTEX_INITIALIZER;
++#define __libc_lock_lock(NAME) \
++  pthread_mutex_lock, (&(NAME))
++#define __libc_lock_unlock(NAME) \
++  pthread_mutex_unlock, (&(NAME))
+ 
+ #include "read-files.h"
+ 
diff --git a/testing/qtiplot/PKGBUILD b/testing/qtiplot/PKGBUILD
new file mode 100644
index 000000000..d4779fcb7
--- /dev/null
+++ b/testing/qtiplot/PKGBUILD
@@ -0,0 +1,94 @@
+# $Id: PKGBUILD 168491 2012-10-12 17:58:46Z andyrtr $
+# Maintainer: Ronald van Haren <ronald.archlinux.org>
+# Contributor: damir <damir.archlinux.org>
+# Contributor: Gergely Imreh <imrehg@gmail.com>
+
+pkgname=qtiplot
+pkgver=0.9.8.9
+pkgrel=2
+arch=('i686' 'x86_64')
+url="http://soft.proindependent.com/qtiplot.html"
+pkgdesc="Data analysis and scientific plotting - free clone of Origin"
+depends=('muparser' 'gsl' 'python2-pyqt' 'boost-libs' 'shared-mime-info' 'glu' 'liborigin2' 'qt-assistant-compat' 'tamu-anova')
+# build against qwtplot3d provided in the package ...
+# build against qwt provided in the package ...
+# as systemwide one doesn't provide all needed functions
+makedepends=('pkg-config' 'boost' 'mesa')
+license=('GPL2')
+install=${pkgname}.install
+source=(http://download.berlios.de/qtiplot/qtiplot-${pkgver}.tar.bz2
+        $pkgname.desktop
+        $pkgname.png
+        build.conf.archlinux
+        qwtplot3d_gcc.patch
+        qtiplot.xml
+	qtiplot-0.9.8.6-gold.patch
+	qtiplot-0.9.8.6-kde.patch
+	qtiplot-0.9.8.6-tamuanova.patch
+        qwtplot3d-qt-4.8.0.patch
+        qwtplot3d-libpng15.patch)
+sha1sums=('73b17dd9195c3d86750d5f1f5bdd4d5483c5fe30'
+          '4d5d7cf3965a0a1b1aa9cafc34e70ee207700bc8'
+          '4301cb2a36024a10108b689990d28c4fe5c7416e'
+          '326ee6bc623a637d058ab7ee9f65fede40a23a09'
+          '301bf6f70e8c1bb9ffd55eb49eedde7b29a12909'
+          '285f57d865956d93250ec548288c5bface096b6b'
+          'b534a609f317cf3117d6495909854cdacea20124'
+          'a1d4bec744c9b8fe29bf177851e66c97cdd9d975'
+          '830b518e3ef63625df84363a8047417124f243b0'
+          '3d4c471dda29a04d432f8e0a4c5b977068cdae72'
+          '4a45ee21f028f34da75d83c0d3e1d08c5f928892')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+   # gentoo fixes  
+   patch -Np1 -i "${srcdir}/qtiplot-0.9.8.6-gold.patch"
+   patch -Np1 -i "${srcdir}/qtiplot-0.9.8.6-kde.patch"
+#   patch -Np1 -i "${srcdir}/qtiplot-0.9.8.6-tamuanova.patch"
+
+   # build also static qwtplot3d lib
+   echo "unix:CONFIG += staticlib" >> 3rdparty/qwtplot3d/qwtplot3d.pro
+
+  # install build configuration file
+  install -Dm644 "${srcdir}/build.conf.archlinux" build.conf
+
+  # Make qwt
+  sed -i "s:elif:else:g" qtiplot/src/scripting/ScriptEdit.cpp
+  patch -Np1 -i "${srcdir}/qwtplot3d_gcc.patch"
+  cd ./3rdparty/qwt
+  qmake
+  make
+
+  # Make qwtplot3d
+  cd ../qwtplot3d
+  patch -Np3 -i "${srcdir}/qwtplot3d-qt-4.8.0.patch"
+  patch -Np0 -i "${srcdir}/qwtplot3d-libpng15.patch"
+  qmake
+  make
+
+  # Make qtiplot
+  cd "${srcdir}/${pkgname}-${pkgver}/${pkgname}"
+
+  # fix stuff
+  sed -i 's|/usr/local/|/usr/share/|' qtiplot.pro
+  sed -i 's|<QAssistantClient>|<QtAssistant/qassistantclient.h>|' src/core/ApplicationWindow.cpp
+  sed -i 's#d_python_config_folder + "#"/usr/share/qtiplot#' src/core/ApplicationWindow.cpp
+
+  qmake qtiplot.pro QMAKESPEC=linux-g++
+  make QTDIR=/usr/ QMAKESPEC=linux-g++
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}/${pkgname}"
+
+  INSTALL_ROOT="${pkgdir}" make install
+
+  # make it nice:
+  install -D -m644 "${srcdir}/${pkgname}.png" \
+  	"${pkgdir}/usr/share/pixmaps/${pkgname}.png"
+  install -D -m644 "${srcdir}/${pkgname}.desktop" \
+  	"${pkgdir}/usr/share/applications/${pkgname}.desktop"
+  install -D -m644 "${srcdir}/${pkgname}.xml" \
+        "${pkgdir}/usr/share/mime/packages/${pkgname}.xml"
+}
diff --git a/testing/qtiplot/build.conf.archlinux b/testing/qtiplot/build.conf.archlinux
new file mode 100644
index 000000000..7ccded7fa
--- /dev/null
+++ b/testing/qtiplot/build.conf.archlinux
@@ -0,0 +1,32 @@
+isEmpty( QTI_ROOT ) {
+  message( "each file including this config needs to set QTI_ROOT to the dir containing this file!" )
+}
+
+SYS_INCLUDEPATH = /usr/include
+SYS_LIBS = -L/usr/lib -lGLU
+
+MUPARSER_LIBS = -lmuparser 
+GSL_LIBS = -lgsl -lgslcblas
+BOOST_INCLUDEPATH = /usr/include/boost
+BOOST_LIBS = -lboost_date_time -lboost_thread
+QWT_INCLUDEPATH = $$QTI_ROOT/3rdparty/qwt/src
+QWT_LIBS = $$QTI_ROOT/3rdparty/qwt/lib/libqwt.a
+QWT3D_INCLUDEPATH = $$QTI_ROOT/3rdparty/qwtplot3d/include
+QWT3D_LIBS = $$QTI_ROOT/3rdparty/qwtplot3d/lib/libqwtplot3d.a
+LIB_ORIGIN_INCLUDEPATH = /usr/include/liborigin2
+LIB_ORIGIN_LIBS = -lorigin2
+QTEXENGINE_LIBS = $$QTI_ROOT/3rdparty/QTeXEngine
+TAMUANOVA_LIBS = -ltamuanova
+TAMUANOVA_INCLUDEPATH = /usr/include/tamu_anova
+LIBPNG_LIBS = -lpng
+
+PYTHON = python2
+LUPDATE = lupdate
+LRELEASE = lrelease
+
+SCRIPTING_LANGS += muParser
+SCRIPTING_LANGS += Python
+
+CONFIG          += CustomInstall
+DEFINES         += SCRIPTING_CONSOLE
+
diff --git a/testing/qtiplot/qtiplot-0.9.8.6-gold.patch b/testing/qtiplot/qtiplot-0.9.8.6-gold.patch
new file mode 100644
index 000000000..3b6757533
--- /dev/null
+++ b/testing/qtiplot/qtiplot-0.9.8.6-gold.patch
@@ -0,0 +1,15 @@
+ qtiplot/qtiplot.pro |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/qtiplot/qtiplot.pro b/qtiplot/qtiplot.pro
+index 99e0e36..b7cf373 100755
+--- a/qtiplot/qtiplot.pro
++++ b/qtiplot/qtiplot.pro
+@@ -20,6 +20,7 @@ LIBS         += $$MUPARSER_LIBS
+ LIBS         += $$QWT_LIBS
+ LIBS         += $$QWT3D_LIBS
+ LIBS         += $$GSL_LIBS
++LIBS         += -lz
+ 
+ #############################################################################
+ ###################### BASIC PROJECT PROPERTIES #############################
diff --git a/testing/qtiplot/qtiplot-0.9.8.6-kde.patch b/testing/qtiplot/qtiplot-0.9.8.6-kde.patch
new file mode 100644
index 000000000..919ec6cc2
--- /dev/null
+++ b/testing/qtiplot/qtiplot-0.9.8.6-kde.patch
@@ -0,0 +1,15 @@
+ qtiplot/src/plot2D/Graph.cpp |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/qtiplot/src/plot2D/Graph.cpp b/qtiplot/src/plot2D/Graph.cpp
+index 626172a..d4eab1b 100755
+--- a/qtiplot/src/plot2D/Graph.cpp
++++ b/qtiplot/src/plot2D/Graph.cpp
+@@ -73,6 +73,7 @@
+ #include <PatternBox.h>
+ #include <SymbolBox.h>
+ 
++#include <QPaintEngine>
+ #include <QApplication>
+ #include <QBitmap>
+ #include <QClipboard>
diff --git a/testing/qtiplot/qtiplot-0.9.8.6-tamuanova.patch b/testing/qtiplot/qtiplot-0.9.8.6-tamuanova.patch
new file mode 100644
index 000000000..1644266d1
--- /dev/null
+++ b/testing/qtiplot/qtiplot-0.9.8.6-tamuanova.patch
@@ -0,0 +1,26 @@
+diff --git a/qtiplot/qtiplot.pro b/qtiplot/qtiplot.pro
+index 95a5f0c..72e99ab 100755
+--- a/qtiplot/qtiplot.pro
++++ b/qtiplot/qtiplot.pro
+@@ -205,18 +205,14 @@ contains(SCRIPTING_LANGS, Python) {
+ !isEmpty(TAMUANOVA_LIBS) {
+ 	DEFINES += HAVE_TAMUANOVA
+ 	INCLUDEPATH += $$TAMUANOVA_INCLUDEPATH
+-	#LIBS        += $$TAMUANOVA_LIBS
+-
+-	HEADERS += $$TAMUANOVA_INCLUDEPATH/tamu_anova.h
+-	SOURCES += $$TAMUANOVA_INCLUDEPATH/anova_1.c
+-	SOURCES += $$TAMUANOVA_INCLUDEPATH/anova_2.c
++	LIBS        += $$TAMUANOVA_LIBS
+ }
+ 
+ ###############################################################
+ 
+ # At the very end: add global include- and lib path
+-#unix:INCLUDEPATH += $$SYS_INCLUDEPATH
+-#unix:LIBS += $$SYS_LIBS
++unix:INCLUDEPATH += $$SYS_INCLUDEPATH
++unix:LIBS += $$SYS_LIBS
+ 
+ ###############################################################
+ ############### Building QtiPlot as a browser plugin ##########
diff --git a/testing/qtiplot/qtiplot.desktop b/testing/qtiplot/qtiplot.desktop
new file mode 100644
index 000000000..ab64b3852
--- /dev/null
+++ b/testing/qtiplot/qtiplot.desktop
@@ -0,0 +1,13 @@
+[Desktop Entry]
+Encoding=UTF-8
+Type=Application
+Exec=qtiplot
+Comment=An application for plotting and analysis of data sets and functions
+Comment[de]=Ein Programm zum Plotten und analysieren von Daten und Funktionen
+Terminal=false
+Name=QtiPlot
+Protocols=file
+Icon=/usr/share/pixmaps/qtiplot.png
+# Categories=QT;KDE;Science;Utility;X-KDE-More
+# Categories=Qt;KDE;Math;Education
+Categories=Science;X-Plotting;
diff --git a/testing/qtiplot/qtiplot.install b/testing/qtiplot/qtiplot.install
new file mode 100644
index 000000000..66631520d
--- /dev/null
+++ b/testing/qtiplot/qtiplot.install
@@ -0,0 +1,12 @@
+post_install() {
+  update-mime-database usr/share/mime &> /dev/null
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove () {
+  post_install
+}
+
diff --git a/testing/qtiplot/qtiplot.png b/testing/qtiplot/qtiplot.png
new file mode 100644
index 000000000..5b4b87b21
--- /dev/null
+++ b/testing/qtiplot/qtiplot.png
diff --git a/testing/qtiplot/qtiplot.xml b/testing/qtiplot/qtiplot.xml
new file mode 100644
index 000000000..7ad4c4aa0
--- /dev/null
+++ b/testing/qtiplot/qtiplot.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
+  <mime-type type="application/x-qtiplot-project">
+    <sub-class-of type="text/plain"/>
+    <comment>QtiPlot project file</comment>
+    <glob pattern="*.qti" />
+  </mime-type>
+  <mime-type type="application/x-qtiplot-project-compressed">
+    <comment>Compressed QtiPlot project file</comment>
+    <glob pattern="*.qti.gz" />
+  </mime-type>
+  <mime-type type="application/x-qtiplot-project-backup">
+    <sub-class-of type="text/plain"/>
+    <comment>QtiPlot project file backup</comment>
+    <glob pattern="*.qti~" />
+  </mime-type>
+</mime-info>
diff --git a/testing/qtiplot/qwtplot3d-libpng15.patch b/testing/qtiplot/qwtplot3d-libpng15.patch
new file mode 100644
index 000000000..828f0c6d8
--- /dev/null
+++ b/testing/qtiplot/qwtplot3d-libpng15.patch
@@ -0,0 +1,10 @@
+--- 3rdparty/gl2ps/gl2ps.c.orig	2012-01-29 18:15:34.000000000 -0500
++++ 3rdparty/gl2ps/gl2ps.c	2012-01-29 18:16:08.000000000 -0500
+@@ -47,6 +47,7 @@
+ #endif
+ 
+ #if defined(GL2PS_HAVE_LIBPNG)
++#include <zlib.h>
+ #include <png.h>
+ #endif
+ 
diff --git a/testing/qtiplot/qwtplot3d-qt-4.8.0.patch b/testing/qtiplot/qwtplot3d-qt-4.8.0.patch
new file mode 100644
index 000000000..9d30f6b7b
--- /dev/null
+++ b/testing/qtiplot/qwtplot3d-qt-4.8.0.patch
@@ -0,0 +1,34 @@
+diff -Naur qtiplot-0.9.8.8.orig/3rdparty/qwtplot3d/include/qwt3d_io_gl2ps.h qtiplot-0.9.8.8/3rdparty/qwtplot3d/include/qwt3d_io_gl2ps.h
+--- qtiplot-0.9.8.8.orig/3rdparty/qwtplot3d/include/qwt3d_io_gl2ps.h	2012-01-29 17:42:01.000000000 -0500
++++ qtiplot-0.9.8.8/3rdparty/qwtplot3d/include/qwt3d_io_gl2ps.h	2012-01-29 17:58:30.000000000 -0500
+@@ -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 -Naur qtiplot-0.9.8.8.orig/3rdparty/qwtplot3d/include/qwt3d_openglhelper.h qtiplot-0.9.8.8/3rdparty/qwtplot3d/include/qwt3d_openglhelper.h
+--- qtiplot-0.9.8.8.orig/3rdparty/qwtplot3d/include/qwt3d_openglhelper.h	2012-01-29 17:42:01.000000000 -0500
++++ qtiplot-0.9.8.8/3rdparty/qwtplot3d/include/qwt3d_openglhelper.h	2012-01-29 17:57:21.000000000 -0500
+@@ -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/testing/qtiplot/qwtplot3d_gcc.patch b/testing/qtiplot/qwtplot3d_gcc.patch
new file mode 100644
index 000000000..06aeb50f5
--- /dev/null
+++ b/testing/qtiplot/qwtplot3d_gcc.patch
@@ -0,0 +1,9 @@
+--- a/3rdparty/qwtplot3d/src/qwt3d_function.cpp	2009-07-25 20:03:28.000000000 -0700
++++ b/3rdparty/qwtplot3d/src/qwt3d_function.cpp	2009-07-25 20:03:28.000000000 -0700
+@@ -1,5 +1,6 @@
+ #include "qwt3d_surfaceplot.h"
+ #include "qwt3d_function.h"
++#include <cstdio>
+ 
+ using namespace Qwt3D;
+ 
diff --git a/testing/qtiplot/sip.patch b/testing/qtiplot/sip.patch
new file mode 100644
index 000000000..146f4c277
--- /dev/null
+++ b/testing/qtiplot/sip.patch
@@ -0,0 +1,13 @@
+--- qtiplot/src/scripting/scripting.pri.bak	2009-09-09 07:18:51.000000000 +0800
++++ qtiplot/src/scripting/scripting.pri	2009-11-08 12:45:03.000000000 +0800
+@@ -80,7 +80,9 @@
+              $${SIP_DIR}/sipqtiPythonScript.cpp\
+              $${SIP_DIR}/sipqtiPythonScripting.cpp\
+              $${SIP_DIR}/sipqtiFolder.cpp\
+-             $${SIP_DIR}/sipqtiQList.cpp\
++             $${SIP_DIR}/sipqtiQList0101Folder.cpp \
++             $${SIP_DIR}/sipqtiQList0101Graph.cpp \
++             $${SIP_DIR}/sipqtiQList0101MdiSubWindow.cpp \
+              $${SIP_DIR}/sipqtiFit.cpp \
+              $${SIP_DIR}/sipqtiExponentialFit.cpp \
+              $${SIP_DIR}/sipqtiTwoExpFit.cpp \
diff --git a/testing/ruby/PKGBUILD b/testing/ruby/PKGBUILD
new file mode 100644
index 000000000..0732107ea
--- /dev/null
+++ b/testing/ruby/PKGBUILD
@@ -0,0 +1,69 @@
+# Maintainer: Thomas Dziedzic <gostrc@gmail.com>
+# Contributor: Allan McRae <allan@archlinux.org>
+# Contributor: John Proctor <jproctor@prium.net>
+# Contributor: Jeramy Rutley <jrutley@gmail.com>
+
+pkgname=('ruby' 'ruby-docs')
+pkgver=1.9.3_p286
+pkgrel=1
+arch=('i686' 'x86_64')
+url='http://www.ruby-lang.org/en/'
+license=('BSD' 'custom')
+makedepends=('openssl' 'tk' 'libffi' 'doxygen' 'graphviz' 'libyaml')
+options=('!emptydirs' '!makeflags')
+source=("ftp://ftp.ruby-lang.org/pub/ruby/${pkgver%.*}/ruby-${pkgver//_/-}.tar.bz2"
+        'gemrc')
+md5sums=('2278eff4cfed3cbc0653bc73085caa34'
+         '6fb8e7a09955e0f64be3158fb4a27e7a')
+
+build() {
+  cd ruby-${pkgver//_/-}
+
+  PKG_CONFIG=/usr/bin/pkg-config ./configure \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    --enable-shared \
+    --enable-pthread \
+    --disable-rpath
+
+  make
+}
+
+check() {
+  cd ruby-${pkgver//_/-}
+
+  make test
+}
+
+package_ruby() {
+  pkgdesc='An object-oriented language for quick and easy programming'
+  depends=('openssl' 'libffi' 'libyaml')
+  optdepends=('tk: for Ruby/TK'
+              'ruby-docs: Ruby documentation')
+  provides=('rubygems' 'rake')
+  conflicts=('rake')
+  backup=('etc/gemrc')
+  install='ruby.install'
+
+  cd ruby-${pkgver//_/-}
+
+  make DESTDIR="${pkgdir}" install-nodoc
+
+  install -D -m644 ${srcdir}/gemrc "${pkgdir}/etc/gemrc"
+
+  install -D -m644 COPYING "${pkgdir}/usr/share/licenses/ruby/LICENSE"
+  install -D -m644 BSDL "${pkgdir}/usr/share/licenses/ruby/BSDL"
+}
+
+package_ruby-docs() {
+  pkgdesc='Documentation files for ruby'
+
+  cd ruby-${pkgver//_/-}
+
+  make DESTDIR="${pkgdir}" install-doc install-capi
+
+  install -D -m644 COPYING "${pkgdir}/usr/share/licenses/ruby-docs/LICENSE"
+  install -D -m644 BSDL "${pkgdir}/usr/share/licenses/ruby-docs/BSDL"
+}
+md5sums=('e76848a86606a4fd5dcf14fc4b4e755e'
+         '6fb8e7a09955e0f64be3158fb4a27e7a')
diff --git a/testing/ruby/gemrc b/testing/ruby/gemrc
new file mode 100644
index 000000000..3d11de1ec
--- /dev/null
+++ b/testing/ruby/gemrc
@@ -0,0 +1,5 @@
+# Read about the gemrc format at http://docs.rubygems.org/read/chapter/11
+
+# --user-install is used to install to $HOME/.gem/ by default since we want to separate
+#                pacman installed gems and gem installed gems
+gem: --user-install
diff --git a/testing/ruby/ruby.install b/testing/ruby/ruby.install
new file mode 100644
index 000000000..ce78e96ec
--- /dev/null
+++ b/testing/ruby/ruby.install
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+print_gem_default_target() {
+  echo 'The default location of gem installs is $HOME/.gem/ruby'
+  echo 'Add the following line to your PATH if you plan to install using gem'
+  echo '$(ruby -rubygems -e "puts Gem.user_dir")/bin'
+  echo 'If you want to install to the system wide location, you must either:'
+  echo 'edit /etc/gemrc or run gem with the --no-user-install flag.'
+}
+
+# arg 1:  the new package version
+post_install() {
+  print_gem_default_target
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+post_upgrade() {
+  if [ "$(vercmp $2 1.9.3_p125-4)" -lt 0 ]; then
+    print_gem_default_target
+  fi
+}
diff --git a/testing/stellarium/PKGBUILD b/testing/stellarium/PKGBUILD
new file mode 100644
index 000000000..05a16e1e5
--- /dev/null
+++ b/testing/stellarium/PKGBUILD
@@ -0,0 +1,38 @@
+# $Id: PKGBUILD 168495 2012-10-12 19:14:51Z andyrtr $
+# Maintainer: Ronald van Haren <ronald.archlinux.org>
+# Contributor: Damir Perisa <damir.perisa@bluewin.ch>
+
+pkgname=stellarium
+pkgver=0.11.4
+pkgrel=2
+pkgdesc="A stellarium with great graphics and a nice database of sky-objects"
+arch=("i686" "x86_64")
+url="http://stellarium.free.fr/"
+license=('GPL2')
+depends=('libpng' 'glu' 'libgl' 'freetype2' 'qt' 'openssl')
+makedepends=('cmake' 'boost' 'mesa')
+source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz
+	stellarium.desktop
+        stellarium.png)
+sha1sums=('5b8bfd71b4c3eabbc1db64b71221eeebe6785dbf'
+          'c9cc79212542238227b5bd6af99f60fe056f4ab2'
+          'b890d3b6c4dcfcfcc696514202af11b2a50c0fea')
+	
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+
+  cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=RELEASE
+  make
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+ 
+  make DESTDIR=${pkgdir} install
+
+  # install desktop file & pixmap
+  install -Dm644 ${srcdir}/stellarium.desktop \
+	${pkgdir}/usr/share/applications/stellarium.desktop
+  install -Dm644 ${srcdir}/stellarium.png \
+	${pkgdir}/usr/share/pixmaps/stellarium.png
+}
diff --git a/testing/stellarium/libpng14.patch b/testing/stellarium/libpng14.patch
new file mode 100644
index 000000000..7ed1da689
--- /dev/null
+++ b/testing/stellarium/libpng14.patch
@@ -0,0 +1,21 @@
+diff -Naur stellarium-0.10.2-orig/src/core/StelTextureMgr.cpp stellarium-0.10.2/src/core/StelTextureMgr.cpp
+--- stellarium-0.10.2-orig/src/core/StelTextureMgr.cpp	2010-01-21 17:04:57.000000000 -0500
++++ stellarium-0.10.2/src/core/StelTextureMgr.cpp	2010-01-21 17:06:55.000000000 -0500
+@@ -513,7 +513,7 @@
+ 	fread (magic, 1, sizeof (magic), fp);
+ 
+ 	/* check for valid magic number */
+-	if (!png_check_sig (magic, sizeof (magic)))
++	if (png_sig_cmp (magic, 0, sizeof (magic)))
+ 	{
+ 		qWarning() << "error: \"" << filename << "\" is not a valid PNG image!";
+ 		fclose (fp);
+@@ -576,7 +576,7 @@
+ 	/* convert 1-2-4 bits grayscale images to 8 bits
+ 	   grayscale. */
+ 	if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8)
+-		png_set_gray_1_2_4_to_8 (png_ptr);
++		png_set_expand_gray_1_2_4_to_8 (png_ptr);
+ 
+ 	if (png_get_valid (png_ptr, info_ptr, PNG_INFO_tRNS))
+ 		png_set_tRNS_to_alpha (png_ptr);
diff --git a/testing/stellarium/stellarium.desktop b/testing/stellarium/stellarium.desktop
new file mode 100644
index 000000000..1b82b18bd
--- /dev/null
+++ b/testing/stellarium/stellarium.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=Stellarium nightsky renderer
+GenericName=Nightsky renderer
+Comment=A real-time nightsky renderer
+Categories=Education;Science;Astronomy;
+Icon=stellarium
+Exec=stellarium
+Terminal=false
+Type=Application
diff --git a/testing/stellarium/stellarium.png b/testing/stellarium/stellarium.png
new file mode 100644
index 000000000..08bce127c
--- /dev/null
+++ b/testing/stellarium/stellarium.png
diff --git a/~lukeshu/etckeeper/PKGBUILD b/~lukeshu/etckeeper/PKGBUILD
index e243f29f0..a359500b5 100644
--- a/~lukeshu/etckeeper/PKGBUILD
+++ b/~lukeshu/etckeeper/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=etckeeper
 pkgver=0.63
-pkgrel=2.1
+pkgrel=2.3
 pkgdesc="collection of tools to let /etc be stored in a git, hg, bzr or darcs repository."
 arch=('any')
 backup=('etc/etckeeper/etckeeper.conf')
@@ -15,7 +15,7 @@ provides=('etckeeper')
 depends=('inetutils' 'python2')
 makedepends=('bzr') # bzr must be there at compile time to have bzr support
 optdepends=('git' 'hg' 'bzr' 'darcs')
-source=("etckeeper-$pkgver.tar::git://git.kitenet.net/etckeeper#${pkgver}"
+source=("etckeeper-$pkgver::git://git.kitenet.net/etckeeper#tag=${pkgver}"
         etckeeper-archlinux.conf)
 
 build() {
@@ -33,5 +33,5 @@ package() {
   make CONFFILE="$srcdir/etckeeper-archlinux.conf" DESTDIR=$pkgdir install
 }
 
-md5sums=('0373375e93cb7122bb0ae4749e63c0d9'
+md5sums=('SKIP'
          '99d8d2838f49fa0f2f21c9e37948100d')
diff --git a/~lukeshu/md/PKGBUILD b/~lukeshu/md/PKGBUILD
new file mode 100644
index 000000000..7f74aaa2c
--- /dev/null
+++ b/~lukeshu/md/PKGBUILD
@@ -0,0 +1,42 @@
+# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
+
+pkgname=("md" "emacs-mdmua")
+pkgver=0.81
+pkgrel=4
+arch=('any')
+url="https://github.com/nicferrier/$_pkgname"
+license=('GPL3')
+
+makedepends=(python-distribute)
+
+#__gitbranch=1d69744 # This is the commit that is 0.81
+__gitbranch=455b6b4 # this is currently HEAD (has bugfixes)
+source=("nicferrier-md-${__gitbranch}.tar.gz::https://github.com/nicferrier/$pkgname/tarball/${__gitbranch}")
+
+build() {
+  cd "${srcdir}/nicferrier-md-${__gitbranch}"
+
+  # fix typo
+  sed -i 's/pyprofyfs/pyproxyfs/' setup.py
+}
+
+package_md() {
+  pkgdesc="A maildir client and library."
+  depends=('python' 'python-pyproxyfs')
+
+  cd "${srcdir}/nicferrier-md-${__gitbranch}"
+  python setup.py install --root="$pkgdir/" --optimize=1
+}
+
+package_emacs-mdmua() {
+  pkgdesc="An Emacs mail user agent (MUA) build around md."
+  pkgver='0.72'
+  depends=("md=0.81" 'emacs>=24')
+
+  cd "${srcdir}/nicferrier-md-${__gitbranch}"
+  cd useragents/emacs
+  install -d ${pkgdir}/usr/share/emacs/site-lisp
+  install -m 644 *.el ${pkgdir}/usr/share/emacs/site-lisp
+}
+
+md5sums=('452727348df2f51d7eddade709aceb1c')
diff --git a/~lukeshu/not-working/codeanalyst/PKGBUILD b/~lukeshu/not-working/codeanalyst/PKGBUILD
new file mode 100755
index 000000000..885e06f0e
--- /dev/null
+++ b/~lukeshu/not-working/codeanalyst/PKGBUILD
@@ -0,0 +1,91 @@
+# Maintainer (Parabola): Luke Shumaker <lukeshu@sbcglobal.net>
+# Maintainer (AUR): Felipe Bugno <capent@yahoo.com>
+
+# A note about the oprofile fork:
+# The docs claim that the fork is just for adding support for
+# processors that aren't upstream yet (at the time, they are now that
+# 0.9.7 is out). So, shouldn't we just link against 0.9.7? Well:
+#  * AMD also added a bunch of CodeAnalyst-specific code.
+#  * Several external variables/types have different names; the API is
+#    incompatible.
+#  * [extra]/oprofile-0.9.7-3 only includes about half of the headers.
+
+pkgbase=CodeAnalyst
+pkgname=(codeanalyst codeanalyst-cakm)
+pkgver=3.3.18.0361
+_pkgver="${pkgver//./_}"
+pkgrel=4.1
+pkgdesc="AMD performance profiler. Includes a fork of oprofile."
+url="http://developer.amd.com/tools/${pkgbase}/"
+arch=('i686' 'x86_64')
+license=('GPL')
+depends=('gcc' 'qt>=4.1' 'libdwarf')
+makedepends=('linux-headers' 'elfutils' 'findutils' 'file')
+options=('!strip')
+install=codeanalyst.install
+source=("http://download2-developer.amd.com/amd/${pkgbase}/${pkgbase}${_pkgver}Public.tar.gz"
+	'gcc47.patch'
+	'skipSetup.patch'
+        'kernel3.4.patch'
+        'codeanalyst.sudo'
+        'codeanalyst.desktop'
+	'codeanalyst.svg')
+
+build() {
+  build_codeanalyst
+  build_codeanalyst-cakm
+}
+
+build_codeanalyst() {
+  cd "${srcdir}/${pkgbase}-${_pkgver}-Public"
+  patch -Np1 -i "${srcdir}/gcc47.patch"
+  patch -Np1 -i "${srcdir}/skipSetup.patch"
+  rm -rf src/dwarf-* # easiest way to ensure using the system install
+
+  ./autogen.sh
+  ./configure --prefix=/usr \
+    --with-libdwarf-includes=/usr/include/libdwarf \
+    --with-libdwarf-libraries=/usr/lib
+  make
+}
+
+build_codeanalyst-cakm() {
+  cd "${srcdir}/${pkgbase}-${_pkgver}-Public"/src/cakm
+  cp -r kernel2.6.38 kernel3.4
+  cd kernel3.4
+  patch -Np1 -i "${srcdir}/kernel3.4.patch"
+  make
+}
+
+package_codeanalyst() {
+  provides=('oprofile=0.9.6cvs')
+  conflicts=('oprofile')
+
+  cd "${srcdir}/${pkgbase}-${_pkgver}-Public"
+  make DESTDIR="${pkgdir}" install
+  rm -f "${pkgdir}/usr/sbin/ca_user_manager" # either codeanalyst.install does this, or it is trivial
+
+  find "${pkgdir}"/usr/{bin,sbin} -type f -exec file '{}' +|sed -n 's/:\s*ELF .*//p'|xargs strip
+
+  cd "${srcdir}"
+  install -D -m644 codeanalyst.sudo "${pkgdir}/etc/sudoers.d/codeanalyst"
+  install -D -m644 codeanalyst.svg "${pkgdir}/usr/share/icons/hicolor/scalable/apps/codeanalyst.svg"
+  install -D -m644 codeanalyst.desktop "${pkgdir}/usr/share/applications/codeanalyst.desktop"
+}
+
+package_codeanalyst-cakm() {
+  pkgdesc="CodeAnalyst kernel module, oprofile-ca.ko, a replacement for oprofile.ko"
+  depends=(codeanalyst)
+  provides=()
+
+  cd "${srcdir}/${pkgbase}-${_pkgver}-Public"/src/cakm/kernel3.4
+  install -D -m644 oprofile.ko "${pkgdir}/lib/modules/`uname -r`/kernel/arch/x86/oprofile/oprofile-ca.ko"
+}
+
+md5sums=('f1e29bc7c7da259df228ce59281ee1d7'
+         '063d0fc9680641a92ce5e310ffe1c9c0'
+         'ce549e59c4a5916fd19e8d085e863627'
+         '3a5d820a43a0360d561bb0c4d67d9735'
+         '3cc8f64fe84c5a886d0172ee8d99f690'
+         '3a18d3f7fb01f199a8ed5ae2908c18e4'
+         '1822a4157b82904b82e72fc1e9bcbd42')
diff --git a/~lukeshu/not-working/codeanalyst/codeanalyst.desktop b/~lukeshu/not-working/codeanalyst/codeanalyst.desktop
new file mode 100755
index 000000000..56d54f884
--- /dev/null
+++ b/~lukeshu/not-working/codeanalyst/codeanalyst.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=AMD CodeAnalyst
+Comment=AMD profiler and performance analyzer
+Exec=/usr/bin/CodeAnalyst
+Icon=codeanalyst
+Terminal=false
+Encoding=UTF-8
+Type=Application
+Categories=Development;
diff --git a/~lukeshu/not-working/codeanalyst/codeanalyst.install b/~lukeshu/not-working/codeanalyst/codeanalyst.install
new file mode 100755
index 000000000..6ed1ac841
--- /dev/null
+++ b/~lukeshu/not-working/codeanalyst/codeanalyst.install
@@ -0,0 +1,29 @@
+post_install() {
+  getent group amdca &>/dev/null ||  groupadd amdca &>/dev/null
+  echo " ==> To use CodeAnalyst as non-root, you must be in the 'amdca' group"
+  echo "     ie: gpasswd -a USERNAME amdca"
+
+  chown root:amdca /usr/bin/calog_report
+  chown root:amdca /usr/bin/capackage.sh
+  chown root:amdca /usr/bin/careport.sh
+  chown root:amdca /usr/bin/cgreport
+  chown root:amdca /usr/bin/CodeAnalyst
+  chown root:amdca /usr/bin/opannotate
+  chown root:amdca /usr/bin/oparchive
+  chown root:amdca /usr/bin/opcontrol
+  chown root:amdca /usr/bin/opgprof
+  chown root:amdca /usr/bin/ophelp
+  chown root:amdca /usr/bin/opimport
+  chown root:amdca /usr/bin/opjitconv
+  chown root:amdca /usr/bin/opreport
+  chown root:amdca /usr/bin/oprofiled
+  chown root:amdca /usr/sbin/ca_oprofile_controller
+  #chown root:amdca /usr/sbin/ca_user_manager
+
+  update-desktop-database -q
+}
+
+post_remove() {
+  getent group amdca &>/dev/null && groupdel amdca &>/dev/null
+  update-desktop-database -q
+}
diff --git a/~lukeshu/not-working/codeanalyst/codeanalyst.sudo b/~lukeshu/not-working/codeanalyst/codeanalyst.sudo
new file mode 100755
index 000000000..1c3173bdb
--- /dev/null
+++ b/~lukeshu/not-working/codeanalyst/codeanalyst.sudo
@@ -0,0 +1 @@
+%amdca ALL= NOPASSWD: /usr/sbin/ca_oprofile_controller
diff --git a/~lukeshu/not-working/codeanalyst/codeanalyst.svg b/~lukeshu/not-working/codeanalyst/codeanalyst.svg
new file mode 100755
index 000000000..8febf725b
--- /dev/null
+++ b/~lukeshu/not-working/codeanalyst/codeanalyst.svg
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 12.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 51448)  -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="Layer_1"
+   width="286.95001"
+   height="286.95001"
+   viewBox="0 0 286.95063 286.95"
+   overflow="visible"
+   enable-background="new 0 0 1368.987 286.954"
+   xml:space="preserve"
+   inkscape:version="0.48.3.1 r9886"
+   sodipodi:docname="AMD_Logo.svg"
+   style="overflow:visible"><metadata
+   id="metadata17"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+   id="defs15" /><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1920"
+   inkscape:window-height="1028"
+   id="namedview13"
+   showgrid="false"
+   inkscape:zoom="2.11"
+   inkscape:cx="163.32315"
+   inkscape:cy="145.21584"
+   inkscape:window-x="-4"
+   inkscape:window-y="-3"
+   inkscape:window-maximized="1"
+   inkscape:current-layer="Layer_1" />
+<polyline
+   points="1165.47,92.779 1165.39,203.495 1281.63,203.513 1198.44,286.826 1081.79,286.954 1080.38,176.065 1165.47,92.779"
+   id="polyline3"
+   style="fill:#009a66"
+   transform="translate(-1082.0371,1.8496035e-4)" />
+<polyline
+   points="1165.39,84.082 1285.07,83.854 1284.83,202.972 1368.99,286.954 1368.75,0.12 1081.79,0 1165.39,84.082"
+   id="polyline5"
+   style="fill:#009a66"
+   transform="translate(-1082.0371,1.8496035e-4)" />
+
+
+
+</svg>
+\ No newline at end of file
diff --git a/~lukeshu/not-working/codeanalyst/gcc47.patch b/~lukeshu/not-working/codeanalyst/gcc47.patch
new file mode 100755
index 000000000..dfec4a0c4
--- /dev/null
+++ b/~lukeshu/not-working/codeanalyst/gcc47.patch
@@ -0,0 +1,72 @@
+diff -crB CodeAnalyst-3_3_18_0361-Public.orig/src/ca/cg/Makefile.am CodeAnalyst-3_3_18_0361-Public/src/ca/cg/Makefile.am
+*** CodeAnalyst-3_3_18_0361-Public.orig/src/ca/cg/Makefile.am	2012-04-13 02:41:43.000000000 -0300
+--- CodeAnalyst-3_3_18_0361-Public/src/ca/cg/Makefile.am	2012-04-22 17:55:01.227439003 -0300
+***************
+*** 25,31 ****
+  	cgcvt.cpp
+  
+  
+! cgreport_LDFLAGS = -Wl -fPIC @QT_LDFLAGS@
+  
+  AM_CPPFLAGS= $(INCLUDES) $(more_flags) \
+  			 $(FLAG64) -Wno-unused -Wno-parentheses \
+--- 25,31 ----
+  	cgcvt.cpp
+  
+  
+! cgreport_LDFLAGS = -fPIC @QT_LDFLAGS@
+  
+  AM_CPPFLAGS= $(INCLUDES) $(more_flags) \
+  			 $(FLAG64) -Wno-unused -Wno-parentheses \
+diff -crB CodeAnalyst-3_3_18_0361-Public.orig/src/ca/gui/MonitorDockView.cpp CodeAnalyst-3_3_18_0361-Public/src/ca/gui/MonitorDockView.cpp
+*** CodeAnalyst-3_3_18_0361-Public.orig/src/ca/gui/MonitorDockView.cpp	2012-04-13 02:41:43.000000000 -0300
+--- CodeAnalyst-3_3_18_0361-Public/src/ca/gui/MonitorDockView.cpp	2012-04-22 17:38:14.884058192 -0300
+***************
+*** 17,22 ****
+--- 17,23 ----
+  */
+  
+  #include <qtooltip.h>
++ #include <unistd.h>
+  
+  #include "MonitorDockView.h"
+  
+diff -crB CodeAnalyst-3_3_18_0361-Public.orig/src/ca/libs/libca/dwarfengine.cpp CodeAnalyst-3_3_18_0361-Public/src/ca/libs/libca/dwarfengine.cpp
+*** CodeAnalyst-3_3_18_0361-Public.orig/src/ca/libs/libca/dwarfengine.cpp	2012-04-13 02:41:43.000000000 -0300
+--- CodeAnalyst-3_3_18_0361-Public/src/ca/libs/libca/dwarfengine.cpp	2012-04-22 17:34:45.670714989 -0300
+***************
+*** 21,26 ****
+--- 21,27 ----
+  #include <sys/types.h>
+  #include <sys/stat.h>
+  #include <fcntl.h>
++ #include <unistd.h>
+  
+  #include "dwarfengine.h"
+  #define DWARF_DEBUG		0
+diff -crB CodeAnalyst-3_3_18_0361-Public.orig/src/ca/libs/libopdata/opdata_handler.cpp CodeAnalyst-3_3_18_0361-Public/src/ca/libs/libopdata/opdata_handler.cpp
+*** CodeAnalyst-3_3_18_0361-Public.orig/src/ca/libs/libopdata/opdata_handler.cpp	2012-04-13 02:41:43.000000000 -0300
+--- CodeAnalyst-3_3_18_0361-Public/src/ca/libs/libopdata/opdata_handler.cpp	2012-04-22 17:32:30.780708624 -0300
+***************
+*** 29,34 ****
+--- 29,35 ----
+  #include <sys/stat.h>
+  #include <fcntl.h>
+  #include <time.h>
++ #include <unistd.h>
+  
+  // CodeAnalyst headers
+  #include "CaProfileWriter.h"
+diff -crB CodeAnalyst-3_3_18_0361-Public.orig/src/ca_agent/libCAagent/slock.cpp CodeAnalyst-3_3_18_0361-Public/src/ca_agent/libCAagent/slock.cpp
+*** CodeAnalyst-3_3_18_0361-Public.orig/src/ca_agent/libCAagent/slock.cpp	2012-04-13 02:41:43.000000000 -0300
+--- CodeAnalyst-3_3_18_0361-Public/src/ca_agent/libCAagent/slock.cpp	2012-04-22 17:26:58.424026278 -0300
+***************
+*** 13,18 ****
+--- 13,19 ----
+  #include <sys/ipc.h>
+  #include <sys/sem.h>
+  #include <sys/stat.h>
++ #include <unistd.h>
+  
+  #include "slock.h"
+  #include "smm.h"
diff --git a/~lukeshu/not-working/codeanalyst/kernel3.4.patch b/~lukeshu/not-working/codeanalyst/kernel3.4.patch
new file mode 100644
index 000000000..589abc800
--- /dev/null
+++ b/~lukeshu/not-working/codeanalyst/kernel3.4.patch
@@ -0,0 +1,72 @@
+diff -ru kernel2.6.38/Makefile kernel3.4/Makefile
+--- kernel2.6.38/Makefile	2012-04-13 01:41:43.000000000 -0400
++++ kernel3.4/Makefile	2012-07-11 11:32:27.000000000 -0400
+@@ -1,6 +1,6 @@
+ TARGET = oprofile.ko
+ 
+-MDIR = $(if $(shell uname -m | grep x86_64),arch/x86/oprofile,arch/x86/oprofile)
++MDIR = arch/x86/oprofile
+ 
+ DRIVER_OBJS =   oprof.o cpu_buffer.o buffer_sync.o \
+ 		event_buffer.o oprofile_files.o \
+@@ -16,7 +16,8 @@
+ CURRENT = $(shell uname -r)
+ ARCH = $(if $(shell uname -m | grep x86_64),64,32)
+ KERN_ARCH = $(if $(shell uname -m | grep x86_64),x86_64,i386)
+-KDIR = /lib/modules/$(CURRENT)/build
++SYS_KDIR = /lib/modules/$(CURRENT)/build
++KDIR = $(PWD)/../build
+ PWD = $(shell pwd)
+ DEST = /lib/modules/$(CURRENT)/kernel/$(MDIR)
+ USE_INTERNAL_ERRATA = $(if $(shell ls ../internal/errata.h 2> /dev/null),1,0)
+@@ -39,6 +40,8 @@
+ all: default
+ 
+ default:
++	rm -rf $(KDIR)
++	cp -r $(SYS_KDIR)/ $(KDIR)
+ 	make -C $(KDIR) SUBDIRS=$(PWD) CFLAGS_MODULE+="-DMODULE -DUSE_INTERNAL_ERRATA=$(USE_INTERNAL_ERRATA)" modules ARCH=$(KERN_ARCH)
+ 
+ install:
+@@ -52,13 +55,12 @@
+ 
+ uninstall:
+ 	@echo  "... Restore original oprofile.ko."
+-	@mv -v $(DEST)/$(TARGET).orig $(DEST)/$(TARGET) 
++	@mv -v $(DEST)/$(TARGET).orig $(DEST)/$(TARGET)
+ 
+ clean:
+ 	rm -f *.o oprofile.ko .*.cmd .*.flags *.mod.c
+ 
+ prebuild: 
+ 	cp $(TARGET) ../prebuilds/$(CURRENT)_$(ARCH).ko
+-	
+ 
+--include $(KDIR)/Rules.make
++-include $(SYS_KDIR)/Rules.make
+Only in kernel3.4/: modules.order
+Only in kernel3.4/: Module.symvers
+diff -ru kernel2.6.38/nmi_int.c kernel3.4/nmi_int.c
+--- kernel2.6.38/nmi_int.c	2012-04-13 01:41:43.000000000 -0400
++++ kernel3.4/nmi_int.c	2012-07-11 11:32:27.000000000 -0400
+@@ -16,7 +16,6 @@
+ #include <linux/notifier.h>
+ #include <linux/smp.h>
+ #include "oprofile.h"
+-#include <linux/sysdev.h>
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(3,0,0) 
+ #include <linux/syscore_ops.h>
+ #endif
+diff -ru kernel2.6.38/oprofilefs.c kernel3.4/oprofilefs.c
+--- kernel2.6.38/oprofilefs.c	2012-04-13 01:41:43.000000000 -0400
++++ kernel3.4/oprofilefs.c	2012-07-11 11:32:27.000000000 -0400
+@@ -244,7 +244,7 @@
+ 		return -ENOMEM;
+ 	root_inode->i_op = &simple_dir_inode_operations;
+ 	root_inode->i_fop = &simple_dir_operations;
+-	root_dentry = d_alloc_root(root_inode);
++	root_dentry = d_make_root(root_inode);
+ 	if (!root_dentry) {
+ 		iput(root_inode);
+ 		return -ENOMEM;
+Only in kernel3.4/: .tmp_versions
diff --git a/~lukeshu/not-working/codeanalyst/skipSetup.patch b/~lukeshu/not-working/codeanalyst/skipSetup.patch
new file mode 100755
index 000000000..fdc9bf42f
--- /dev/null
+++ b/~lukeshu/not-working/codeanalyst/skipSetup.patch
@@ -0,0 +1,68 @@
+diff -crB CodeAnalyst-3_3_18_0361-Public.orig/src/ca/Makefile.am CodeAnalyst-3_3_18_0361-Public/src/ca/Makefile.am
+*** CodeAnalyst-3_3_18_0361-Public.orig/src/ca/Makefile.am	2012-04-13 02:41:43.000000000 -0300
+--- CodeAnalyst-3_3_18_0361-Public/src/ca/Makefile.am	2012-04-22 20:44:07.437917684 -0300
+***************
+*** 8,19 ****
+  # FIXME	[3.0] diffgui \
+  #    $(CA_RELEASE_TYPE)
+  
+! install-exec-hook:
+! 	@if test -e "scripts/Setup.sh"; then \
+! 		scripts/Setup.sh $(DESTDIR)$(prefix); \
+! 	fi
+  
+! uninstall-hook:
+! 	@if test -e "scripts/Uninstall.sh"; then \
+! 		scripts/Uninstall.sh $(DESTDIR)$(prefix);\
+! 	fi
+--- 8,19 ----
+  # FIXME	[3.0] diffgui \
+  #    $(CA_RELEASE_TYPE)
+  
+! #install-exec-hook:
+! #	@if test -e "scripts/Setup.sh"; then \
+! #		scripts/Setup.sh $(DESTDIR)$(prefix); \
+! #	fi
+  
+! #uninstall-hook:
+! #	@if test -e "scripts/Uninstall.sh"; then \
+! #		scripts/Uninstall.sh $(DESTDIR)$(prefix);\
+! #	fi
+diff -crB CodeAnalyst-3_3_18_0361-Public.orig/src/ca_agent/jvmpi/Makefile.am CodeAnalyst-3_3_18_0361-Public/src/ca_agent/jvmpi/Makefile.am
+*** CodeAnalyst-3_3_18_0361-Public.orig/src/ca_agent/jvmpi/Makefile.am	2012-04-13 02:41:43.000000000 -0300
+--- CodeAnalyst-3_3_18_0361-Public/src/ca_agent/jvmpi/Makefile.am	2012-04-22 20:47:21.604593511 -0300
+***************
+*** 15,20 ****
+  libCAJVMPIA_so_SOURCES = \
+      jpa.cpp 
+      
+! install-exec-hook:
+! 	@/sbin/ldconfig
+  
+--- 15,20 ----
+  libCAJVMPIA_so_SOURCES = \
+      jpa.cpp 
+      
+! #install-exec-hook:
+! #	@/sbin/ldconfig
+  
+diff -crB CodeAnalyst-3_3_18_0361-Public.orig/src/Makefile.am CodeAnalyst-3_3_18_0361-Public/src/Makefile.am
+*** CodeAnalyst-3_3_18_0361-Public.orig/src/Makefile.am	2012-04-13 02:41:43.000000000 -0300
+--- CodeAnalyst-3_3_18_0361-Public/src/Makefile.am	2012-04-22 20:44:57.674586720 -0300
+***************
+*** 8,21 ****
+  install-exec-hook:
+  	@if test -e "${LIBDWARF_DIR}libdwarf.so"; then \
+  		install -pD -m 755 ${LIBDWARF_DIR}libdwarf.so $(DESTDIR)$(prefix)/lib/libdwarf.so ; \
+- 		/sbin/ldconfig ;\
+  	fi
+  
+  uninstall-hook:
+  	@if test -e "${LIBDWARF_DIR}libdwarf.so"; then \
+  		if test -e "$(DESTDIR)$(prefix)/lib/libdwarf.so"; then \
+  			rm -f $(DESTDIR)$(prefix)/lib/libdwarf.so ; \
+- 			/sbin/ldconfig ; \
+  		fi ; \
+  	fi
+  
+--- 8,19 ----
diff --git a/~lukeshu/python-pyproxyfs/PKGBUILD b/~lukeshu/python-pyproxyfs/PKGBUILD
new file mode 100644
index 000000000..b24c5682a
--- /dev/null
+++ b/~lukeshu/python-pyproxyfs/PKGBUILD
@@ -0,0 +1,27 @@
+# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
+
+_pkgname=pyproxyfs
+pkgname=python-$_pkgname
+pkgver=0.8
+pkgrel=1
+pkgdesc="A proxy filesystem interface with a native filesystem implementation and a very simple test in-memory filesystem."
+arch=('any')
+url="https://github.com/nicferrier/$_pkgname"
+license=('GPL3')
+groups=()
+depends=('python')
+makedepends=()
+provides=()
+conflicts=()
+replaces=()
+backup=()
+options=(!emptydirs)
+install=
+source=("http://pypi.python.org/packages/source/P/PyProxyFS/PyProxyFS-0.8.tar.gz")
+
+package() {
+  cd "${srcdir}/PyProxyFS-$pkgver"
+  python setup.py install --root="$pkgdir/" --optimize=1
+}
+
+md5sums=('34f769e669877a9fdcfe5f8f93912b88')
diff --git a/~lukeshu/xcalib/PKGBUILD b/~lukeshu/xcalib/PKGBUILD
new file mode 100644
index 000000000..e2e053f11
--- /dev/null
+++ b/~lukeshu/xcalib/PKGBUILD
@@ -0,0 +1,30 @@
+# Contributor: Frank Ickstadt (frank dot ickstadt at gmail dot com)
+# adpoted from mOLOk since pkgver=0.7
+
+pkgname=xcalib
+pkgver=0.8
+pkgrel=4
+pkgdesc="A tiny monitor calibration loader for X.org"
+arch=(i686 x86_64)
+url="http://www.etg.e-technik.uni-erlangen.de/web/doe/xcalib/"
+license=('GPL')
+depends=(libxxf86vm)
+source=(http://downloads.sourceforge.net/xcalib/xcalib-source-$pkgver.tar.gz
+        makefile-ldflags.patch)
+md5sums=('1fbcae44ad8d754512fdd1e5f1b3a7e7'
+         '6c74457011515dd1cc7f2474af761142')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver/"
+  patch -p0 < ../makefile-ldflags.patch
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver/"
+  install -Dm755 xcalib $pkgdir/usr/bin/xcalib
+
+  for i in README *.icc *.icm; do
+      install -Dm644 $i $pkgdir/usr/share/xcalib/$i
+  done
+}
diff --git a/~lukeshu/xcalib/makefile-ldflags.patch b/~lukeshu/xcalib/makefile-ldflags.patch
new file mode 100644
index 000000000..275c4c3ea
--- /dev/null
+++ b/~lukeshu/xcalib/makefile-ldflags.patch
@@ -0,0 +1,22 @@
+--- Makefile	2007-08-26 23:30:34.000000000 +0200
++++ Makefile.new	2012-08-20 10:50:27.000000000 +0200
+@@ -50,16 +50,16 @@
+ # low overhead version (internal parser)
+ xcalib: xcalib.c
+ 	$(CC) $(CFLAGS) -c xcalib.c -I$(XINCLUDEDIR) -DXCALIB_VERSION=\"$(XCALIB_VERSION)\"
+-	$(CC) $(CFLAGS) -L$(XLIBDIR) -lm -o xcalib xcalib.o -lX11 -lXxf86vm -lXext
++	$(CC) $(LDFLAGS) -L$(XLIBDIR) -o xcalib xcalib.o -lX11 -lXxf86vm -lXext -lm
+ 
+ fglrx_xcalib: xcalib.c
+ 	$(CC) $(CFLAGS) -c xcalib.c -I$(XINCLUDEDIR) -DXCALIB_VERSION=\"$(XCALIB_VERSION)\" -I$(FGLRXINCLUDEDIR) -DFGLRX
+-	$(CC) $(CFLAGS) -L$(XLIBDIR) -L$(FGLRXLIBDIR) -lm -o xcalib xcalib.o -lX11 -lXxf86vm -lXext -lfglrx_gamma
++	$(CC) $(LDFLAGS) -L$(XLIBDIR) -L$(FGLRXLIBDIR) -o xcalib xcalib.o -lX11 -lXxf86vm -lXext -lfglrx_gamma -lm
+ 
+ win_xcalib: xcalib.c
+ 	$(CC) $(CFLAGS) -c xcalib.c -DXCALIB_VERSION=\"$(XCALIB_VERSION)\" -DWIN32GDI
+ 	windres.exe resource.rc resource.o
+-	$(CC) $(CFLAGS) -mwindows -lm resource.o -o xcalib xcalib.o
++	$(CC) $(LDFLAGS) -mwindows -lm resource.o -o xcalib xcalib.o
+ 
+ install:
+ 	cp ./xcalib $(DESTDIR)/usr/local/bin/
author	Nicolás Reynolds <fauno@kiwwwi.com.ar>	2012-10-13 11:26:30 -0300
committer	Nicolás Reynolds <fauno@kiwwwi.com.ar>	2012-10-13 11:26:30 -0300
commit	ea319c11ce5dcbe5994f166ea099b115bbffe960 (patch)
tree	365b7a8276a93d738840c4481a1ff5e327920738
parent	37936150d275890b518542e93a435ab5815d722b (diff)
parent	21c295a86a10a3cd59802b2cf3ab7c24ebf0c608 (diff)