diff --git a/.gitignore b/.gitignore
new file mode 100644
index 00000000000..f87428f3bc3
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+*.swo
+*.swp
+*~
+\#*#
diff --git a/common/shlibs b/common/shlibs
index f7d45e7150a..5fed1f6790e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -286,7 +286,8 @@ libxcb-keysyms.so.1		xcb-util		xcb-util-devel
 libxcb-property.so.1		xcb-util		xcb-util-devel
 libxcb-atom.so.1		xcb-util		xcb-util-devel
 libxcb-event.so.1		xcb-util		xcb-util-devel
-libtiff.so.3			tiff			tiff-devel
+libtiff.so.5			tiff			tiff-devel
+libtiffxx.so.5			tiff			tiff-devel
 libnotify.so.4			libnotify		libnotify-devel
 libexo-1.so.0			exo			exo-devel
 libvte.so.9			vte			vte-devel
@@ -410,7 +411,7 @@ libQt3Support.so.4		qt			qt-devel
 libQtSvg.so.4			qt			qt-devel
 libQtScript.so.4		qt			qt-devel
 libQtHelp.so.4			qt			qt-devel
-libphonon.so			qt			qt-devel
+libphonon.so.4			qt			qt-devel
 libQtCore.so.4			qt			qt-devel
 libQtSql.so.4			qt			qt-devel
 libQtWebKit.so.4		qt			qt-devel
diff --git a/srcpkgs/ImageMagick/libmagick.rshlibs b/srcpkgs/ImageMagick/libmagick.rshlibs
index 0fe996adf68..ed0bc092452 100644
--- a/srcpkgs/ImageMagick/libmagick.rshlibs
+++ b/srcpkgs/ImageMagick/libmagick.rshlibs
@@ -1,5 +1,4 @@
 liblcms2.so.2
-libtiff.so.3
 libfreetype.so.6
 libjpeg.so.8
 libfftw3.so.3
@@ -35,3 +34,4 @@ libstdc++.so.6
 libgcc_s.so.1
 libpangoft2-1.0.so.0
 libpango-1.0.so.0
+libtiff.so.5
diff --git a/srcpkgs/ImageMagick/libmagick.template b/srcpkgs/ImageMagick/libmagick.template
index b14d6880e65..ae02269e00d 100644
--- a/srcpkgs/ImageMagick/libmagick.template
+++ b/srcpkgs/ImageMagick/libmagick.template
@@ -1,5 +1,6 @@
 # Template file for 'libmagick'.
 #
+revision=1
 short_desc="ImageMagick low-level image manipulation libraries"
 long_desc="${long_desc}
 
diff --git a/srcpkgs/babl/template b/srcpkgs/babl/template
index 3b4e396158a..a71b47be7a4 100644
--- a/srcpkgs/babl/template
+++ b/srcpkgs/babl/template
@@ -1,16 +1,14 @@
 # Template build file for 'babl'.
 pkgname=babl
-version=0.1.4
-revision=3
-distfiles="ftp://ftp.gimp.org/pub/babl/0.1/babl-${version}.tar.bz2"
+version=0.1.6
+distfiles="ftp://ftp.gimp.org/pub/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
 build_style=gnu-configure
-# XXX reenable when it's fixed.
 configure_args="--disable-introspection"
 short_desc="Dynamic pixel format translation library"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://gegl.org/babl/"
 license="LGPL-3"
-checksum=5b36312528de84815f054345cd478743a9493981a44060013b682d0304ffe733
+checksum=319b9004a5366101fd522da02cc983a5d0f50a17af0fa5cbce3535e31bce19a4
 long_desc="
  babl is a dynamic, any to any, pixel format translation library.
 
diff --git a/srcpkgs/curl/libcurl.rshlibs b/srcpkgs/curl/libcurl.rshlibs
index 6225508aa55..130bd69fde9 100644
--- a/srcpkgs/curl/libcurl.rshlibs
+++ b/srcpkgs/curl/libcurl.rshlibs
@@ -11,3 +11,4 @@ libcrypto.so.1
 libdl.so.2
 libz.so.1
 libc.so.6
+liblber-2.4.so.2
diff --git a/srcpkgs/curl/libcurl.template b/srcpkgs/curl/libcurl.template
index 08f8a6e7639..c40f89b968d 100644
--- a/srcpkgs/curl/libcurl.template
+++ b/srcpkgs/curl/libcurl.template
@@ -1,5 +1,6 @@
 # Template file for 'libcurl'.
 #
+revision=1
 short_desc="The multiprotocol file transfer library"
 long_desc="
  libcurl is a free and easy-to-use client-side URL transfer library,
diff --git a/srcpkgs/djvulibre/djvulibre.rshlibs b/srcpkgs/djvulibre/djvulibre.rshlibs
index a368f08dfe7..18c6df65e89 100644
--- a/srcpkgs/djvulibre/djvulibre.rshlibs
+++ b/srcpkgs/djvulibre/djvulibre.rshlibs
@@ -2,6 +2,6 @@ libdjvulibre.so.21
 libstdc++.so.6
 libgcc_s.so.1
 libc.so.6
-libtiff.so.3
 libm.so.6
 libpthread.so.0
+libtiff.so.5
diff --git a/srcpkgs/djvulibre/template b/srcpkgs/djvulibre/template
index 29229d1f8bc..d516510c1f0 100644
--- a/srcpkgs/djvulibre/template
+++ b/srcpkgs/djvulibre/template
@@ -5,7 +5,7 @@ homepage="http://djvu.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/djvu/$pkgname-$version.tar.gz"
 build_style=gnu-configure
 configure_args="--disable-desktopfiles"
-revision=1
+revision=2
 short_desc="Utilities for the DjVu image format"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
diff --git a/srcpkgs/ethtool/template b/srcpkgs/ethtool/template
index 281d1bb327f..c86bb0e06ef 100644
--- a/srcpkgs/ethtool/template
+++ b/srcpkgs/ethtool/template
@@ -1,18 +1,17 @@
 # Template file for 'ethtool'
 pkgname=ethtool
-_distver=3.1
+_distver=3.2
 # Previous version was 6, we have to conserve it to make version comparision
 # work with previous versions.
 version=6:${_distver}
 wrksrc=${pkgname}-${_distver}
-#distfiles="http://www.kernel.org/pub/software/network/$pkgname/$pkgname-${_distver}.tar.bz2"
-distfiles="ftp://ftp.archlinux.org/other/$pkgname/$pkgname-${_distver}.tar.gz"
+distfiles="http://www.kernel.org/pub/software/network/$pkgname/$pkgname-${_distver}.tar.bz2"
 build_style=gnu-configure
 short_desc="Display or change ethernet card settings"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.kernel.org/pub/software/network/ethtool/"
 license="GPL-2"
-checksum=3ff78f9278a7a2fd0c508c6347b48beb5aa21eb3339070e6c8ba25fc0503f01c
+checksum=edeb2f1c44e396c3801ddb56ebb9bb0a8f8a0110acc68ccfd492d5a73ac6ef5b
 long_desc="
  ethtool is used for querying settings of an ethernet device and
  changing them."
diff --git a/srcpkgs/evince/evince.rshlibs b/srcpkgs/evince/evince.rshlibs
index 11912717cf3..f3e1a2f6225 100644
--- a/srcpkgs/evince/evince.rshlibs
+++ b/srcpkgs/evince/evince.rshlibs
@@ -27,11 +27,9 @@ libgcc_s.so.1
 libdjvulibre.so.21
 libpthread.so.0
 libnautilus-extension.so.1
-libSM.so.6
-libICE.so.6
 libevview3.so.3
 libX11.so.6
 libgnome-keyring.so.0
 libgxps.so.2
 libarchive.so.12
-libtiff.so.3
+libtiff.so.5
diff --git a/srcpkgs/evince/template b/srcpkgs/evince/template
index 9a177b86839..6e0c2897f08 100644
--- a/srcpkgs/evince/template
+++ b/srcpkgs/evince/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 configure_args="--enable-introspection --disable-schemas-compile
 --enable-comics --disable-scrollkeeper --enable-xps --disable-t1lib
 --disable-tests --disable-static"
-revision=4
+revision=5
 short_desc="GNOME Document viewer for multiple document formats"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://projects.gnome.org/evince/"
diff --git a/srcpkgs/gdk-pixbuf/gdk-pixbuf.rshlibs b/srcpkgs/gdk-pixbuf/gdk-pixbuf.rshlibs
index a88d490de0b..b2d4ad8e50f 100644
--- a/srcpkgs/gdk-pixbuf/gdk-pixbuf.rshlibs
+++ b/srcpkgs/gdk-pixbuf/gdk-pixbuf.rshlibs
@@ -8,5 +8,5 @@ libm.so.6
 libgobject-2.0.so.0
 libgthread-2.0.so.0
 librt.so.1
-libtiff.so.3
 libjpeg.so.8
+libtiff.so.5
diff --git a/srcpkgs/gdk-pixbuf/template b/srcpkgs/gdk-pixbuf/template
index 5574246c6ae..31d0ea0977e 100644
--- a/srcpkgs/gdk-pixbuf/template
+++ b/srcpkgs/gdk-pixbuf/template
@@ -4,6 +4,7 @@ version=2.24.1
 distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
 build_style=gnu-configure
 configure_args="--without-libjasper --with-included-loaders=png"
+revision=1
 short_desc="An Image loading library for The GTK+ toolkit (v2)"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.gtk.org/"
diff --git a/srcpkgs/gegl/template b/srcpkgs/gegl/template
index bb1478f12ec..eb4c7e86bf2 100644
--- a/srcpkgs/gegl/template
+++ b/srcpkgs/gegl/template
@@ -1,14 +1,14 @@
 # Template build file for 'gegl'.
 pkgname=gegl
-version=0.1.6
-distfiles="ftp://ftp.gimp.org/pub/gegl/0.1/gegl-$version.tar.bz2"
+version=0.1.8
+distfiles="ftp://ftp.gimp.org/pub/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
 build_style=gnu-configure
 configure_args="--disable-docs --without-sdl --without-libopenraw
 --without-libavformat --without-graphviz --without-lua --without-libspiro
---without-umfpack --with-exiv2 --without-libv4l"
+--without-umfpack --with-exiv2 --without-libv4l --disable-introspection"
 short_desc="Graph based image processing framework"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=a166225625eebfb57fd417c88cf1fa6e29b1d308d50ac3bd9ef30bad9f3726d1
+checksum=106b9574b6d5fb282683794f7a7f090a1a3f4a388890e592b202827a4ca76f75
 long_desc="
  GEGL (Generic Graphics Library) is a graph based image processing
  framework.
@@ -28,6 +28,6 @@ Add_dependency build jpeg-devel
 Add_dependency build librsvg-devel
 Add_dependency build pango-devel
 Add_dependency build gtk+-devel
-Add_dependency build babl-devel
+Add_dependency build babl-devel ">=0.1.6"
 Add_dependency build jasper-devel
 Add_dependency build exiv2-devel
diff --git a/srcpkgs/gimp/gimp.rshlibs b/srcpkgs/gimp/gimp.rshlibs
index ccd47d0e55a..3c210920a14 100644
--- a/srcpkgs/gimp/gimp.rshlibs
+++ b/srcpkgs/gimp/gimp.rshlibs
@@ -35,9 +35,12 @@ libmng.so.1
 libpoppler-glib.so.8
 libz.so.1
 librsvg-2.so.2
-libtiff.so.3
 libwmf-0.2.so.7
 libwmflite-0.2.so.7
 libXpm.so.4
 libXext.so.6
 libXfixes.so.3
+libjasper.so.1
+libXcursor.so.1
+libgudev-1.0.so.0
+libtiff.so.5
diff --git a/srcpkgs/gimp/patches/gimp-poppler-0.18.patch b/srcpkgs/gimp/patches/gimp-poppler-0.18.patch
deleted file mode 100644
index e4fb13a4c09..00000000000
--- a/srcpkgs/gimp/patches/gimp-poppler-0.18.patch
+++ /dev/null
@@ -1,476 +0,0 @@
-From 69f69eed816b89be9a01a48a1f0643d1fd496118 Mon Sep 17 00:00:00 2001
-From: Nils Philippsen <nils@redhat.com>
-Date: Fri, 6 May 2011 11:58:44 +0200
-Subject: [PATCH] patch: poppler-0.17
-
-Squashed commit of the following:
-
-commit 529d940222dfc352d41fbf72de29134421aa4002
-Author: Nils Philippsen <nils@redhat.com>
-Date:   Fri May 6 11:50:30 2011 +0200
-
-    use code based on pixbufs instead of cairo surfaces
-
-    this is done to avoid adding to libgimp, thanks to Mukund Sivaraman for
-    hints how to do this
-
-commit f8671d8767d4cdab830dc06310e96c63a88ec0fd
-Author: Mukund Sivaraman <muks@banu.com>
-Date:   Thu Apr 21 13:57:13 2011 +0530
-
-    file-pdf-load: Update attribution, removing bogus copyright
-    (cherry picked from commit e999122e0b20b6ccd6bde3ce039bb64068fc0019)
-
-commit 89a78f2590d298dac2f42e6d9a3016fc5d672c70
-Author: Nils Philippsen <nils@redhat.com>
-Date:   Thu Apr 21 13:52:18 2011 +0200
-
-    file-pdf-load: Use better API + cleanups
-
-    * fixes issues with poppler 0.17 completely
-    * uses new libgimp API to pass surfaces instead of pixbufs
-    * uses GTK+ 3 API to convert surfaces to pixbufs where available
-    (backported from commit 7bdadd80ba479d6ff904e276d805e16f6b940ee2)
-
-commit 4e92302c4a14a961f112587a0ad86696c88da2f8
-Author: Nils Philippsen <nils@redhat.com>
-Date:   Thu Apr 21 13:38:08 2011 +0200
-
-    file-pdf-load: Don't use deprecated API (bug #646947)
-
-    (cherry picked from commit 9b3e1c91fd2eac69da6947ec9c7fbf10096ba237)
-
-    Conflicts:
-
-	plug-ins/common/file-pdf.c
----
- plug-ins/common/file-pdf.c |  323 ++++++++++++++++++++++++++++++++++++++------
- 1 files changed, 283 insertions(+), 40 deletions(-)
-
-diff --git a/plug-ins/common/file-pdf.c b/plug-ins/common/file-pdf.c
-index a43b459..43c2b7d 100644
---- plug-ins/common/file-pdf.c
-+++ plug-ins/common/file-pdf.c
-@@ -4,6 +4,9 @@
-  *
-  * Copyright (C) 2005 Nathan Summers
-  *
-+ * Some code in render_page_to_surface() borrowed from
-+ * poppler.git/glib/poppler-page.cc.
-+ *
-  * 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 2 of the License, or
-@@ -80,16 +83,20 @@ static gboolean          load_dialog       (PopplerDocument        *doc,
- static PopplerDocument * open_document     (const gchar            *filename,
-                                             GError                **error);
-
--static GdkPixbuf *       get_thumbnail     (PopplerDocument        *doc,
-+static cairo_surface_t * get_thumb_surface (PopplerDocument        *doc,
-+                                            gint                    page,
-+                                            gint                    preferred_size);
-+
-+static GdkPixbuf *       get_thumb_pixbuf  (PopplerDocument        *doc,
-                                             gint                    page,
-                                             gint                    preferred_size);
-
- static gint32            layer_from_pixbuf (gint32                  image,
--                                            const gchar            *layer_name,
--                                            gint                    position,
--                                            GdkPixbuf              *buf,
--                                            gdouble                 progress_start,
--                                            gdouble                 progress_scale);
-+					                        const gchar            *layer_name,
-+					                        gint                    position,
-+					                        GdkPixbuf              *pixbuf,
-+					                        gdouble                 progress_start,
-+					                        gdouble                 progress_scale);
-
- /**
-  ** the following was formerly part of
-@@ -433,11 +440,12 @@ run (const gchar      *name,
-         }
-       else
-         {
--          gdouble      width  = 0;
--          gdouble      height = 0;
--          gdouble      scale;
--          gint32       image  = -1;
--          GdkPixbuf   *pixbuf = NULL;
-+          gdouble    width     = 0;
-+          gdouble    height    = 0;
-+          gdouble    scale;
-+          gint32     image     = -1;
-+          gint       num_pages = 0;
-+          GdkPixbuf *pixbuf    = NULL;
-
-           /* Possibly retrieve last settings */
-           gimp_get_data (LOAD_PROC, &loadvals);
-@@ -455,7 +463,10 @@ run (const gchar      *name,
-                   g_object_unref (page);
-                 }
-
--              pixbuf = get_thumbnail (doc, 0, param[1].data.d_int32);
-+              num_pages = poppler_document_get_n_pages (doc);
-+
-+              pixbuf = get_thumb_pixbuf (doc, 0, param[1].data.d_int32);
-+
-               g_object_unref (doc);
-             }
-
-@@ -548,6 +559,187 @@ open_document (const gchar  *filename,
-   return doc;
- }
-
-+/* FIXME: Remove this someday when we depend fully on GTK+ >= 3 */
-+
-+#if (!GTK_CHECK_VERSION (3, 0, 0))
-+
-+static cairo_format_t
-+gdk_cairo_format_for_content (cairo_content_t content)
-+{
-+  switch (content)
-+    {
-+    case CAIRO_CONTENT_COLOR:
-+      return CAIRO_FORMAT_RGB24;
-+    case CAIRO_CONTENT_ALPHA:
-+      return CAIRO_FORMAT_A8;
-+    case CAIRO_CONTENT_COLOR_ALPHA:
-+    default:
-+      return CAIRO_FORMAT_ARGB32;
-+    }
-+}
-+
-+static cairo_surface_t *
-+gdk_cairo_surface_coerce_to_image (cairo_surface_t *surface,
-+                                   cairo_content_t  content,
-+                                   int              src_x,
-+                                   int              src_y,
-+                                   int              width,
-+                                   int              height)
-+{
-+  cairo_surface_t *copy;
-+  cairo_t *cr;
-+
-+  copy = cairo_image_surface_create (gdk_cairo_format_for_content (content),
-+                                     width,
-+                                     height);
-+
-+  cr = cairo_create (copy);
-+  cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE);
-+  cairo_set_source_surface (cr, surface, -src_x, -src_y);
-+  cairo_paint (cr);
-+  cairo_destroy (cr);
-+
-+  return copy;
-+}
-+
-+static void
-+convert_alpha (guchar *dest_data,
-+               int     dest_stride,
-+               guchar *src_data,
-+               int     src_stride,
-+               int     src_x,
-+               int     src_y,
-+               int     width,
-+               int     height)
-+{
-+  int x, y;
-+
-+  src_data += src_stride * src_y + src_x * 4;
-+
-+  for (y = 0; y < height; y++) {
-+    guint32 *src = (guint32 *) src_data;
-+
-+    for (x = 0; x < width; x++) {
-+      guint alpha = src[x] >> 24;
-+
-+      if (alpha == 0)
-+        {
-+          dest_data[x * 4 + 0] = 0;
-+          dest_data[x * 4 + 1] = 0;
-+          dest_data[x * 4 + 2] = 0;
-+        }
-+      else
-+        {
-+          dest_data[x * 4 + 0] = (((src[x] & 0xff0000) >> 16) * 255 + alpha / 2) / alpha;
-+          dest_data[x * 4 + 1] = (((src[x] & 0x00ff00) >>  8) * 255 + alpha / 2) / alpha;
-+          dest_data[x * 4 + 2] = (((src[x] & 0x0000ff) >>  0) * 255 + alpha / 2) / alpha;
-+        }
-+      dest_data[x * 4 + 3] = alpha;
-+    }
-+
-+    src_data += src_stride;
-+    dest_data += dest_stride;
-+  }
-+}
-+
-+static void
-+convert_no_alpha (guchar *dest_data,
-+                  int     dest_stride,
-+                  guchar *src_data,
-+                  int     src_stride,
-+                  int     src_x,
-+                  int     src_y,
-+                  int     width,
-+                  int     height)
-+{
-+  int x, y;
-+
-+  src_data += src_stride * src_y + src_x * 4;
-+
-+  for (y = 0; y < height; y++) {
-+    guint32 *src = (guint32 *) src_data;
-+
-+    for (x = 0; x < width; x++) {
-+      dest_data[x * 3 + 0] = src[x] >> 16;
-+      dest_data[x * 3 + 1] = src[x] >>  8;
-+      dest_data[x * 3 + 2] = src[x];
-+    }
-+
-+    src_data += src_stride;
-+    dest_data += dest_stride;
-+  }
-+}
-+
-+/**
-+ * gdk_pixbuf_get_from_surface:
-+ * @surface: surface to copy from
-+ * @src_x: Source X coordinate within @surface
-+ * @src_y: Source Y coordinate within @surface
-+ * @width: Width in pixels of region to get
-+ * @height: Height in pixels of region to get
-+ *
-+ * Transfers image data from a #cairo_surface_t and converts it to an RGB(A)
-+ * representation inside a #GdkPixbuf. This allows you to efficiently read
-+ * individual pixels from cairo surfaces. For #GdkWindows, use
-+ * gdk_pixbuf_get_from_window() instead.
-+ *
-+ * This function will create an RGB pixbuf with 8 bits per channel.
-+ * The pixbuf will contain an alpha channel if the @surface contains one.
-+ *
-+ * Return value: (transfer full): A newly-created pixbuf with a reference
-+ *     count of 1, or %NULL on error
-+ */
-+static GdkPixbuf *
-+gdk_pixbuf_get_from_surface  (cairo_surface_t *surface,
-+                              gint             src_x,
-+                              gint             src_y,
-+                              gint             width,
-+                              gint             height)
-+{
-+  cairo_content_t content;
-+  GdkPixbuf *dest;
-+
-+  /* General sanity checks */
-+  g_return_val_if_fail (surface != NULL, NULL);
-+  g_return_val_if_fail (width > 0 && height > 0, NULL);
-+
-+  content = cairo_surface_get_content (surface) | CAIRO_CONTENT_COLOR;
-+  dest = gdk_pixbuf_new (GDK_COLORSPACE_RGB,
-+                         !!(content & CAIRO_CONTENT_ALPHA),
-+                         8,
-+                         width, height);
-+
-+  surface = gdk_cairo_surface_coerce_to_image (surface, content,
-+                                               src_x, src_y,
-+                                               width, height);
-+  cairo_surface_flush (surface);
-+  if (cairo_surface_status (surface) || dest == NULL)
-+    {
-+      cairo_surface_destroy (surface);
-+      return NULL;
-+    }
-+
-+  if (gdk_pixbuf_get_has_alpha (dest))
-+    convert_alpha (gdk_pixbuf_get_pixels (dest),
-+                   gdk_pixbuf_get_rowstride (dest),
-+                   cairo_image_surface_get_data (surface),
-+                   cairo_image_surface_get_stride (surface),
-+                   0, 0,
-+                   width, height);
-+  else
-+    convert_no_alpha (gdk_pixbuf_get_pixels (dest),
-+                      gdk_pixbuf_get_rowstride (dest),
-+                      cairo_image_surface_get_data (surface),
-+                      cairo_image_surface_get_stride (surface),
-+                      0, 0,
-+                      width, height);
-+
-+  cairo_surface_destroy (surface);
-+  return dest;
-+}
-+
-+#endif
-+
- static gint32
- layer_from_pixbuf (gint32        image,
-                    const gchar  *layer_name,
-@@ -566,6 +758,54 @@ layer_from_pixbuf (gint32        image,
-   return layer;
- }
-
-+static cairo_surface_t *
-+render_page_to_surface (PopplerPage *page,
-+                        int          width,
-+                        int          height,
-+                        double       scale)
-+{
-+  cairo_surface_t *surface;
-+  cairo_t *cr;
-+
-+  surface = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, width, height);
-+  cr = cairo_create (surface);
-+
-+  cairo_save (cr);
-+  cairo_translate (cr, 0.0, 0.0);
-+
-+  if (scale != 1.0)
-+    cairo_scale (cr, scale, scale);
-+
-+  poppler_page_render (page, cr);
-+  cairo_restore (cr);
-+
-+  cairo_set_operator (cr, CAIRO_OPERATOR_DEST_OVER);
-+  cairo_set_source_rgb (cr, 1.0, 1.0, 1.0);
-+  cairo_paint (cr);
-+
-+  cairo_destroy (cr);
-+
-+  return surface;
-+}
-+
-+static GdkPixbuf *
-+render_page_to_pixbuf (PopplerPage *page,
-+                       int          width,
-+                       int          height,
-+                       double       scale)
-+{
-+  GdkPixbuf *pixbuf;
-+  cairo_surface_t *surface;
-+
-+  surface = render_page_to_surface (page, width, height, scale);
-+  pixbuf = gdk_pixbuf_get_from_surface (surface, 0, 0,
-+                                        cairo_image_surface_get_width (surface),
-+                                        cairo_image_surface_get_height (surface));
-+  cairo_surface_destroy (surface);
-+
-+  return pixbuf;
-+}
-+
- static gint32
- load_image (PopplerDocument        *doc,
-             const gchar            *filename,
-@@ -597,7 +837,7 @@ load_image (PopplerDocument        *doc,
-       gdouble      page_width;
-       gdouble      page_height;
-
--      GdkPixbuf   *buf;
-+      GdkPixbuf   *pixbuf;
-       gint         width;
-       gint         height;
-
-@@ -627,15 +867,13 @@ load_image (PopplerDocument        *doc,
-           gimp_image_set_resolution (image_ID, resolution, resolution);
-         }
-
--      buf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8, width, height);
--
--      poppler_page_render_to_pixbuf (page, 0, 0, width, height, scale, 0, buf);
-+      pixbuf = render_page_to_pixbuf (page, width, height, scale);
-
--      layer_from_pixbuf (image_ID, page_label, i, buf,
-+      layer_from_pixbuf (image_ID, page_label, i, pixbuf,
-                          doc_progress, 1.0 / pages->n_pages);
-
-       g_free (page_label);
--      g_object_unref (buf);
-+      g_object_unref(pixbuf);
-
-       doc_progress = (double) (i + 1) / pages->n_pages;
-       gimp_progress_update (doc_progress);
-@@ -676,30 +914,22 @@ load_image (PopplerDocument        *doc,
-   return image_ID;
- }
-
--static GdkPixbuf *
--get_thumbnail (PopplerDocument *doc,
--               gint             page_num,
--               gint             preferred_size)
-+static cairo_surface_t *
-+get_thumb_surface (PopplerDocument *doc,
-+                   gint             page_num,
-+                   gint             preferred_size)
- {
-   PopplerPage *page;
--  GdkPixbuf   *pixbuf;
-+  cairo_surface_t *surface;
-
-   page = poppler_document_get_page (doc, page_num);
-
-   if (! page)
-     return NULL;
-
--  /* XXX: Remove conditional when we depend on poppler 0.8.0, but also
--   * add configure check to make sure POPPLER_WITH_GDK is enabled!
--   */
--#ifdef POPPLER_WITH_GDK
--  pixbuf = poppler_page_get_thumbnail_pixbuf (page);
--#else
--  pixbuf = poppler_page_get_thumbnail (page);
--#endif
--
-+  surface = poppler_page_get_thumbnail (page);
-
--  if (! pixbuf)
-+  if (! surface)
-     {
-       gdouble width;
-       gdouble height;
-@@ -712,15 +942,28 @@ get_thumbnail (PopplerDocument *doc,
-       width  *= scale;
-       height *= scale;
-
--      pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8,
--                               width, height);
--
--      poppler_page_render_to_pixbuf (page,
--                                     0, 0, width, height, scale, 0, pixbuf);
-+      surface = render_page_to_surface (page, width, height, scale);
-     }
-
-   g_object_unref (page);
-
-+  return surface;
-+}
-+
-+static GdkPixbuf *
-+get_thumb_pixbuf (PopplerDocument *doc,
-+                  gint             page_num,
-+                  gint             preferred_size)
-+{
-+  cairo_surface_t *surface;
-+  GdkPixbuf *pixbuf;
-+
-+  surface = get_thumb_surface (doc, page_num, preferred_size);
-+  pixbuf = gdk_pixbuf_get_from_surface (surface, 0, 0,
-+                                        cairo_image_surface_get_width (surface),
-+                                        cairo_image_surface_get_height (surface));
-+  cairo_surface_destroy (surface);
-+
-   return pixbuf;
- }
-
-@@ -769,8 +1012,8 @@ thumbnail_thread (gpointer data)
-       idle_data->page_no  = i;
-
-       /* FIXME get preferred size from somewhere? */
--      idle_data->pixbuf = get_thumbnail (thread_data->document, i,
--                                         THUMBNAIL_SIZE);
-+      idle_data->pixbuf = get_thumb_pixbuf (thread_data->document, i,
-+                                            THUMBNAIL_SIZE);
-
-       g_idle_add (idle_set_thumbnail, idle_data);
-
---
-1.7.5
diff --git a/srcpkgs/gimp/patches/uri-backend-libcurl.patch b/srcpkgs/gimp/patches/uri-backend-libcurl.patch
deleted file mode 100644
index a53965c298d..00000000000
--- a/srcpkgs/gimp/patches/uri-backend-libcurl.patch
+++ /dev/null
@@ -1,76 +0,0 @@
---- plug-ins/file-uri/uri-backend-libcurl.c	2010-07-03 00:51:59.000000000 +0200
-+++ plug-ins/file-uri/uri-backend-libcurl.c	2011-06-23 19:15:30.000000000 +0200
-@@ -4,9 +4,9 @@
-  * libcurl backend for the URI plug-in
-  * Copyright (C) 2006 Mukund Sivaraman <muks@mukund.org>
-  *
-- * This program is free software; you can redistribute it and/or modify
-+ * 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 2 of the License, or
-+ * the Free Software Foundation; either version 3 of the License, or
-  * (at your option) any later version.
-  *
-  * This program is distributed in the hope that it will be useful,
-@@ -15,8 +15,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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-  */
- 
- #include "config.h"
-@@ -24,7 +23,6 @@
- #include <errno.h>
- 
- #include <curl/curl.h>
--#include <curl/types.h>
- #include <curl/easy.h>
- 
- #include <glib/gstdio.h>
-@@ -63,7 +61,7 @@
- 
-   vinfo = curl_version_info (CURLVERSION_NOW);
- 
--  protocols = g_string_new ("http:,ftp:");
-+  protocols = g_string_new ("http:,ftp:,gopher:");
- 
-   if (vinfo->features & CURL_VERSION_SSL)
-     {
-@@ -153,7 +151,7 @@
-   FILE      *out_file;
-   CURL      *curl_handle;
-   CURLcode   result;
--  gint       response_code;
-+  glong      response_code;
- 
-   gimp_progress_init (_("Connecting to server"));
- 
-@@ -195,12 +193,12 @@
- 
-   curl_easy_getinfo (curl_handle, CURLINFO_RESPONSE_CODE, &response_code);
- 
--  if (response_code != 200)
-+  if (response_code != 200 && response_code != 226 && response_code != 0)
-     {
-       fclose (out_file);
-       g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED,
-                    _("Opening '%s' for reading resulted in HTTP "
--                     "response code: %d"),
-+                     "response code: %ld"),
-                    uri, response_code);
-       curl_easy_cleanup (curl_handle);
-       return FALSE;
-@@ -224,3 +222,10 @@
- 
-   return FALSE;
- }
-+
-+gchar *
-+uri_backend_map_image (const gchar  *uri,
-+                       GimpRunMode   run_mode)
-+{
-+  return NULL;
-+}
diff --git a/srcpkgs/gimp/template b/srcpkgs/gimp/template
index 905544ad342..d3f505f37a7 100644
--- a/srcpkgs/gimp/template
+++ b/srcpkgs/gimp/template
@@ -1,15 +1,14 @@
 # Template build file for 'gimp'.
 pkgname=gimp
-version=2.6.11
-revision=4
-distfiles="http://pkgs.fedoraproject.org/repo/pkgs/gimp/gimp-$version.tar.bz2/bb2939fe13e54fc7255cef5d097bb5dd/gimp-$version.tar.bz2"
-#distfiles="http://ftp.gimp.org/pub/gimp/v2.6/gimp-$version.tar.bz2"
+version=2.7.4
+distfiles="ftp://ftp.gimp.org/pub/gimp/v${version%.*}/gimp-$version.tar.bz2"
 build_style=gnu-configure
 configure_args="--without-aa --without-gvfs --without-gnomevfs
 --enable-gimp-remote --without-hal"
+revision=1
 short_desc="The GNU image manipulation program"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=9b6d08d0803b3912ea596d1b77b9c21ee13778c23388a225c004b8c1587cb0a1
+checksum=6c0690d5c4e58423308169a2419b684d05e06bd346cded9e081be470a5f93710
 long_desc="
  Powerful image manipulation program similar to Adobe Photoshop[tm].
  It supports layers, arbitrary image sizes and working on several images
@@ -49,9 +48,11 @@ Add_dependency build poppler-glib-devel
 Add_dependency build libmng-devel
 Add_dependency build libXpm-devel
 Add_dependency build libcurl-devel
-Add_dependency build gegl-devel
-Add_dependency build babl-devel
+Add_dependency build gegl-devel ">=0.1.8"
+Add_dependency build babl-devel ">=0.1.6"
 Add_dependency build pygtk-devel
+Add_dependency build libgudev-devel
+Add_dependency build jasper-devel
 
 Add_dependency full iso-codes
 
diff --git a/srcpkgs/graphviz/graphviz.rshlibs b/srcpkgs/graphviz/graphviz.rshlibs
index 9b776cac6e1..ef76f17c447 100644
--- a/srcpkgs/graphviz/graphviz.rshlibs
+++ b/srcpkgs/graphviz/graphviz.rshlibs
@@ -33,3 +33,5 @@ libQtGui.so.4
 libQtCore.so.4
 libstdc++.so.6
 libgcc_s.so.1
+libgd.so.2
+libXpm.so.4
diff --git a/srcpkgs/graphviz/template b/srcpkgs/graphviz/template
index 7ca0f00637b..76ba9f3fffd 100644
--- a/srcpkgs/graphviz/template
+++ b/srcpkgs/graphviz/template
@@ -3,13 +3,13 @@ pkgname=graphviz
 version=2.28.0
 distfiles="http://www.graphviz.org/pub/graphviz/stable/SOURCES/$pkgname-$version.tar.gz"
 build_style=gnu-configure
-revision=2
+revision=3
 short_desc="Graph Visualization Software"
 configure_args="--disable-rpath --enable-ltdl --disable-ltdl-install
 --disable-swig --disable-sharp --disable-guile --disable-io --disable-java
 --disable-lua --disable-ocaml --disable-perl --disable-php --disable-python
 --disable-r --disable-ruby --disable-tcl --without-included-ltdl
---without-devil --without-glut --without-ghoscript"
+--without-devil --without-glut --without-ghoscript --with-libgd"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=d3aa7973c578cae4cc26d9d6498c57ed06680cab9a4e940d0357a3c6527afc76
 long_desc="
@@ -24,6 +24,7 @@ Add_dependency build libpng-devel
 Add_dependency build gd-devel
 Add_dependency build expat-devel
 Add_dependency build zlib-devel
+Add_dependency build gd-devel
 Add_dependency build gtk+-devel
 Add_dependency build glib-devel
 Add_dependency build pango-devel
@@ -40,6 +41,7 @@ Add_dependency build libSM-devel
 Add_dependency build libICE-devel
 Add_dependency build libXt-devel
 Add_dependency build libXmu-devel
+Add_dependency build libXpm-devel
 Add_dependency build libXext-devel
 Add_dependency build libltdl-devel
 Add_dependency build libXrender-devel
diff --git a/srcpkgs/imlib2/imlib2.rshlibs b/srcpkgs/imlib2/imlib2.rshlibs
index 5c827917f67..d39ebf6dbc4 100644
--- a/srcpkgs/imlib2/imlib2.rshlibs
+++ b/srcpkgs/imlib2/imlib2.rshlibs
@@ -8,6 +8,6 @@ libm.so.6
 libc.so.6
 libjpeg.so.8
 libpng14.so.14
-libtiff.so.3
 libgif.so.4
 libid3tag.so.0
+libtiff.so.5
diff --git a/srcpkgs/imlib2/template b/srcpkgs/imlib2/template
index 899c2b7a6a4..b2f6923a9eb 100644
--- a/srcpkgs/imlib2/template
+++ b/srcpkgs/imlib2/template
@@ -1,7 +1,7 @@
 # Template build file for 'imlib2'.
 pkgname=imlib2
 version=1.4.2
-revision=3
+revision=4
 distfiles="${SOURCEFORGE_SITE}/enlightenment/imlib2-$version.tar.gz"
 build_style=gnu-configure
 configure_args="--sysconfdir=/etc/imlib2 --enable-visibility-hiding"
diff --git a/srcpkgs/iso-codes/template b/srcpkgs/iso-codes/template
index 67496cdb830..3194d8da18b 100644
--- a/srcpkgs/iso-codes/template
+++ b/srcpkgs/iso-codes/template
@@ -1,6 +1,6 @@
 # Template build file for 'iso-codes'.
 pkgname=iso-codes
-version=3.29
+version=3.32
 homepage="http://pkg-isocodes.alioth.debian.org/"
 distfiles="${DEBIAN_SITE}/main/i/iso-codes/${pkgname}_${version}.orig.tar.bz2"
 build_style=gnu-configure
@@ -8,7 +8,7 @@ make_install_args="pkgconfigdir=/usr/lib/pkgconfig"
 short_desc="List of country, language and currency names"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="LGPL-2.1"
-checksum=8478b514cc57bcb75e7bc7c6259fac86bca42eaf4cdfc913cf846c6b72ef7edb
+checksum=de19d88fcbb0441d42cabdb88bddf273a2d5f332bc98875ce9f1cd9782eaba2b
 long_desc="
  iso-codes provides the list of the country, language and currency names in
  one place, rather than repeated in many third-party programs. This was
diff --git a/srcpkgs/lcms/lcms.rshlibs b/srcpkgs/lcms/lcms.rshlibs
index 87caeb1be7b..f88444be972 100644
--- a/srcpkgs/lcms/lcms.rshlibs
+++ b/srcpkgs/lcms/lcms.rshlibs
@@ -1,4 +1,4 @@
 libm.so.6
 libc.so.6
-libtiff.so.3
 libjpeg.so.8
+libtiff.so.5
diff --git a/srcpkgs/lcms/template b/srcpkgs/lcms/template
index 3043834262d..a5ba2ae3024 100644
--- a/srcpkgs/lcms/template
+++ b/srcpkgs/lcms/template
@@ -1,7 +1,7 @@
 # Template build file for 'lcms'.
 pkgname=lcms
 version=1.19
-revision=4
+revision=5
 wrksrc=${pkgname}-${version%[a-z]*}
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
 build_style=gnu-configure
diff --git a/srcpkgs/lcms2/lcms2.rshlibs b/srcpkgs/lcms2/lcms2.rshlibs
index 2a1b9451cb8..7b37d795287 100644
--- a/srcpkgs/lcms2/lcms2.rshlibs
+++ b/srcpkgs/lcms2/lcms2.rshlibs
@@ -1,4 +1,4 @@
 libc.so.6
 libjpeg.so.8
-libtiff.so.3
 libm.so.6
+libtiff.so.5
diff --git a/srcpkgs/lcms2/template b/srcpkgs/lcms2/template
index d0f7f5730c4..8b0fce127d3 100644
--- a/srcpkgs/lcms2/template
+++ b/srcpkgs/lcms2/template
@@ -3,7 +3,7 @@ pkgname=lcms2
 version=2.2
 distfiles="${SOURCEFORGE_SITE}/lcms/lcms2-$version.tar.gz"
 build_style=gnu-configure
-revision=1
+revision=2
 short_desc="Small-footprint color management engine, version 2"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.littlecms.com"
diff --git a/srcpkgs/libgxps/libgxps.rshlibs b/srcpkgs/libgxps/libgxps.rshlibs
index 13d3434011e..7fc2373dc8a 100644
--- a/srcpkgs/libgxps/libgxps.rshlibs
+++ b/srcpkgs/libgxps/libgxps.rshlibs
@@ -7,10 +7,10 @@ libglib-2.0.so.0
 libcairo.so.2
 libfreetype.so.6
 libjpeg.so.8
-libtiff.so.3
 libpthread.so.0
 libc.so.6
 liblcms2.so.2
 libpng14.so.14
 libm.so.6
 libarchive.so.12
+libtiff.so.5
diff --git a/srcpkgs/libgxps/template b/srcpkgs/libgxps/template
index e857287d1a3..5f2ea1b9318 100644
--- a/srcpkgs/libgxps/template
+++ b/srcpkgs/libgxps/template
@@ -5,7 +5,7 @@ homepage="http://live.gnome.org/libgxps"
 distfiles="${GNOME_SITE}/$pkgname/0.2/$pkgname-$version.tar.xz"
 build_style=gnu-configure
 configure_args="--disable-static"
-revision=1
+revision=2
 short_desc="GObject base library for XPS documents"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="LGPL-2.1"
diff --git a/srcpkgs/perl-Test-Simple/template b/srcpkgs/perl-Test-Simple/template
index 4e5e2ca2a0b..75466cfac51 100644
--- a/srcpkgs/perl-Test-Simple/template
+++ b/srcpkgs/perl-Test-Simple/template
@@ -1,13 +1,12 @@
 # Template build file for 'perl-Test-Simple'.
 pkgname=perl-Test-Simple
-version=0.94
-revision=1
+version=1.005000_002
 wrksrc="Test-Simple-$version"
 distfiles="http://cpan.uwinnipeg.ca/cpan/authors/id/M/MS/MSCHWERN/Test-Simple-$version.tar.gz"
 build_style=perl-module
 short_desc="Perl module with a simple framework for writing tests"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=6f93a4f758ac99bcaa2f917bf10493f6eb102b1ab769d57f5d5cafd6bf4aaee9
+checksum=b7ccaa175831f491ada10f021035e80dc50837c77d34e5662cb04f848594b6ff
 long_desc="
  This is an extremely simple, extremely basic module for writing
  tests suitable for CPAN modules and other pursuits. If you wish
diff --git a/srcpkgs/poppler/poppler-cpp.rshlibs b/srcpkgs/poppler/poppler-cpp.rshlibs
index 2b4bef3c31f..0fe8fd69e3a 100644
--- a/srcpkgs/poppler/poppler-cpp.rshlibs
+++ b/srcpkgs/poppler/poppler-cpp.rshlibs
@@ -1,6 +1,5 @@
 libpoppler.so.18
 liblcms.so.1
-libtiff.so.3
 libjpeg.so.8
 libpng14.so.14
 libcurl.so.4
@@ -11,3 +10,4 @@ libstdc++.so.6
 libm.so.6
 libc.so.6
 libgcc_s.so.1
+libtiff.so.5
diff --git a/srcpkgs/poppler/poppler-cpp.template b/srcpkgs/poppler/poppler-cpp.template
index c0c35b04357..e4695089e42 100644
--- a/srcpkgs/poppler/poppler-cpp.template
+++ b/srcpkgs/poppler/poppler-cpp.template
@@ -1,6 +1,6 @@
 # Template file for 'poppler-cpp'.
 #
-revision=1
+revision=2
 short_desc="${short_desc} (C++ bindings)"
 long_desc="${long_desc}
 
diff --git a/srcpkgs/poppler/poppler-glib.rshlibs b/srcpkgs/poppler/poppler-glib.rshlibs
index bccaa3145ad..701a1fea29a 100644
--- a/srcpkgs/poppler/poppler-glib.rshlibs
+++ b/srcpkgs/poppler/poppler-glib.rshlibs
@@ -1,6 +1,5 @@
 libpoppler.so.18
 liblcms.so.1
-libtiff.so.3
 libjpeg.so.8
 libpng14.so.14
 libcurl.so.4
@@ -16,3 +15,4 @@ libstdc++.so.6
 libm.so.6
 libc.so.6
 libgcc_s.so.1
+libtiff.so.5
diff --git a/srcpkgs/poppler/poppler-glib.template b/srcpkgs/poppler/poppler-glib.template
index 20eb25c2b1c..119e387a5f0 100644
--- a/srcpkgs/poppler/poppler-glib.template
+++ b/srcpkgs/poppler/poppler-glib.template
@@ -1,6 +1,6 @@
 # Template file for 'poppler-glib'.
 #
-revision=1
+revision=2
 short_desc="${short_desc} (GLib bindings)"
 long_desc="${long_desc}
 
diff --git a/srcpkgs/poppler/poppler-qt4.rshlibs b/srcpkgs/poppler/poppler-qt4.rshlibs
index 9c1b6a3dc89..bac4fefb3c6 100644
--- a/srcpkgs/poppler/poppler-qt4.rshlibs
+++ b/srcpkgs/poppler/poppler-qt4.rshlibs
@@ -1,6 +1,5 @@
 libpoppler.so.18
 liblcms.so.1
-libtiff.so.3
 libjpeg.so.8
 libpng14.so.14
 libcurl.so.4
@@ -14,3 +13,4 @@ libstdc++.so.6
 libm.so.6
 libc.so.6
 libgcc_s.so.1
+libtiff.so.5
diff --git a/srcpkgs/poppler/poppler-qt4.template b/srcpkgs/poppler/poppler-qt4.template
index b9244564a85..a941a890c7c 100644
--- a/srcpkgs/poppler/poppler-qt4.template
+++ b/srcpkgs/poppler/poppler-qt4.template
@@ -1,6 +1,6 @@
 # Template file for 'poppler-qt4'.
 #
-revision=1
+revision=2
 short_desc="${short_desc} (QT bindings)"
 long_desc="${long_desc}
 
diff --git a/srcpkgs/poppler/poppler.rshlibs b/srcpkgs/poppler/poppler.rshlibs
index 3b2eda01920..2d9198983a1 100644
--- a/srcpkgs/poppler/poppler.rshlibs
+++ b/srcpkgs/poppler/poppler.rshlibs
@@ -1,5 +1,4 @@
 liblcms.so.1
-libtiff.so.3
 libjpeg.so.8
 libpng14.so.14
 libcurl.so.4
@@ -10,3 +9,4 @@ libstdc++.so.6
 libm.so.6
 libc.so.6
 libgcc_s.so.1
+libtiff.so.5
diff --git a/srcpkgs/poppler/template b/srcpkgs/poppler/template
index 33aa46732d7..d4476dbaedb 100644
--- a/srcpkgs/poppler/template
+++ b/srcpkgs/poppler/template
@@ -5,8 +5,8 @@ homepage="http://poppler.freedesktop.org"
 distfiles="${homepage}/$pkgname-$version.tar.gz"
 build_style=gnu-configure
 configure_args="--enable-zlib --enable-libcurl --enable-libjpeg
---disable-libopenjpeg"
-revision=1
+--enable-libtiff --disable-libopenjpeg"
+revision=3
 short_desc="PDF rendering library"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
@@ -31,3 +31,4 @@ Add_dependency build gtk+-devel
 Add_dependency build lcms-devel
 Add_dependency build qt-devel
 Add_dependency build libcurl-devel
+Add_dependency build tiff-devel
diff --git a/srcpkgs/qt/patches/blacklist-diginotar-certs.diff b/srcpkgs/qt/patches/blacklist-diginotar-certs.diff
deleted file mode 100644
index 0bf384f00f7..00000000000
--- a/srcpkgs/qt/patches/blacklist-diginotar-certs.diff
+++ /dev/null
@@ -1,89 +0,0 @@
-diff --git a/src/network/ssl/qsslcertificate.cpp b/src/network/ssl/qsslcertificate.cpp
-index 328c5c2..1ae98f4 100644
---- src/network/ssl/qsslcertificate.cpp
-+++ src/network/ssl/qsslcertificate.cpp
-@@ -803,22 +803,47 @@ QList<QSslCertificate> QSslCertificatePrivate::certificatesFromDer(const QByteAr
- // These certificates are known to be fraudulent and were created during the comodo
- // compromise. See http://www.comodo.com/Comodo-Fraud-Incident-2011-03-23.html
- static const char *certificate_blacklist[] = {
--    "04:7e:cb:e9:fc:a5:5f:7b:d0:9e:ae:36:e1:0c:ae:1e",
--    "f5:c8:6a:f3:61:62:f1:3a:64:f5:4f:6d:c9:58:7c:06",
--    "d7:55:8f:da:f5:f1:10:5b:b2:13:28:2b:70:77:29:a3",
--    "39:2a:43:4f:0e:07:df:1f:8a:a3:05:de:34:e0:c2:29",
--    "3e:75:ce:d4:6b:69:30:21:21:88:30:ae:86:a8:2a:71",
--    "e9:02:8b:95:78:e4:15:dc:1a:71:0a:2b:88:15:44:47",
--    "92:39:d5:34:8f:40:d1:69:5a:74:54:70:e1:f2:3f:43",
--    "b0:b7:13:3e:d0:96:f9:b5:6f:ae:91:c8:74:bd:3a:c0",
--    "d8:f3:5f:4e:b7:87:2b:2d:ab:06:92:e3:15:38:2f:b0",
-+    "04:7e:cb:e9:fc:a5:5f:7b:d0:9e:ae:36:e1:0c:ae:1e", "mail.google.com", // Comodo
-+    "f5:c8:6a:f3:61:62:f1:3a:64:f5:4f:6d:c9:58:7c:06", "www.google.com", // Comodo
-+    "d7:55:8f:da:f5:f1:10:5b:b2:13:28:2b:70:77:29:a3", "login.yahoo.com", // Comodo
-+    "39:2a:43:4f:0e:07:df:1f:8a:a3:05:de:34:e0:c2:29", "login.yahoo.com", // Comodo
-+    "3e:75:ce:d4:6b:69:30:21:21:88:30:ae:86:a8:2a:71", "login.yahoo.com", // Comodo
-+    "e9:02:8b:95:78:e4:15:dc:1a:71:0a:2b:88:15:44:47", "login.skype.com", // Comodo
-+    "92:39:d5:34:8f:40:d1:69:5a:74:54:70:e1:f2:3f:43", "addons.mozilla.org", // Comodo
-+    "b0:b7:13:3e:d0:96:f9:b5:6f:ae:91:c8:74:bd:3a:c0", "login.live.com", // Comodo
-+    "d8:f3:5f:4e:b7:87:2b:2d:ab:06:92:e3:15:38:2f:b0", "global trustee", // Comodo
-+
-+    "05:e2:e6:a4:cd:09:ea:54:d6:65:b0:75:fe:22:a2:56", "*.google.com", // leaf certificate issued by DigiNotar
-+    "0c:76:da:9c:91:0c:4e:2c:9e:fe:15:d0:58:93:3c:4c", "DigiNotar Root CA", // DigiNotar root
-+    "f1:4a:13:f4:87:2b:56:dc:39:df:84:ca:7a:a1:06:49", "DigiNotar Services CA", // DigiNotar intermediate signed by DigiNotar Root
-+    "36:16:71:55:43:42:1b:9d:e6:cb:a3:64:41:df:24:38", "DigiNotar Services 1024 CA", // DigiNotar intermediate signed by DigiNotar Root
-+    "0a:82:bd:1e:14:4e:88:14:d7:5b:1a:55:27:be:bf:3e", "DigiNotar Root CA G2", // other DigiNotar Root CA
-+    "a4:b6:ce:e3:2e:d3:35:46:26:3c:b3:55:3a:a8:92:21", "CertiID Enterprise Certificate Authority", // DigiNotar intermediate signed by "DigiNotar Root CA G2"
-+    "5b:d5:60:9c:64:17:68:cf:21:0e:35:fd:fb:05:ad:41", "DigiNotar Qualified CA", // DigiNotar intermediate signed by DigiNotar Root
-+
-+    "1184640176",                                      "DigiNotar Services 1024 CA", // DigiNotar intermediate cross-signed by Entrust
-+    "120000525",                                       "DigiNotar Cyber CA", // DigiNotar intermediate cross-signed by CyberTrust
-+    "120000505",                                       "DigiNotar Cyber CA", // DigiNotar intermediate cross-signed by CyberTrust
-+    "120000515",                                       "DigiNotar Cyber CA", // DigiNotar intermediate cross-signed by CyberTrust
-+    "20015536",                                        "DigiNotar PKIoverheid CA Overheid en Bedrijven", // DigiNotar intermediate cross-signed by the Dutch government
-+    "20001983",                                        "DigiNotar PKIoverheid CA Organisatie - G2", // DigiNotar intermediate cross-signed by the Dutch government
-+    "d6:d0:29:77:f1:49:fd:1a:83:f2:b9:ea:94:8c:5c:b4", "DigiNotar Extended Validation CA", // DigiNotar intermediate signed by DigiNotar EV Root
-+    "1e:7d:7a:53:3d:45:30:41:96:40:0f:71:48:1f:45:04", "DigiNotar Public CA 2025", // DigiNotar intermediate
-+//    "(has not been seen in the wild so far)", "DigiNotar Public CA - G2", // DigiNotar intermediate
-+//    "(has not been seen in the wild so far)", "Koninklijke Notariele Beroepsorganisatie CA", // compromised during DigiNotar breach
-+//    "(has not been seen in the wild so far)", "Stichting TTP Infos CA," // compromised during DigiNotar breach
-+    "1184640175", "DigiNotar Root CA", // DigiNotar intermediate cross-signed by Entrust
-+    "1184644297", "DigiNotar Root CA", // DigiNotar intermediate cross-signed by Entrust
-     0
- };
-
- bool QSslCertificatePrivate::isBlacklisted(const QSslCertificate &certificate)
- {
-     for (int a = 0; certificate_blacklist[a] != 0; a++) {
--        if (certificate.serialNumber() == certificate_blacklist[a])
-+        QString blacklistedCommonName = QString::fromUtf8(certificate_blacklist[(a+1)]);
-+        if (certificate.serialNumber() == certificate_blacklist[a++] &&
-+            (certificate.subjectInfo(QSslCertificate::CommonName) == blacklistedCommonName ||
-+             certificate.issuerInfo(QSslCertificate::CommonName) == blacklistedCommonName))
-             return true;
-     }
-     return false;
-diff --git a/src/network/ssl/qsslsocket_openssl.cpp b/src/network/ssl/qsslsocket_openssl.cpp
-index 141d80a..b8e6c4c 100644
---- src/network/ssl/qsslsocket_openssl.cpp
-+++ src/network/ssl/qsslsocket_openssl.cpp
-@@ -1193,12 +1193,16 @@ bool QSslSocketBackendPrivate::startHandshake()
-     X509 *x509 = q_SSL_get_peer_certificate(ssl);
-     configuration.peerCertificate = QSslCertificatePrivate::QSslCertificate_from_X509(x509);
-     q_X509_free(x509);
--    if (QSslCertificatePrivate::isBlacklisted(configuration.peerCertificate)) {
--        q->setErrorString(QSslSocket::tr("The peer certificate is blacklisted"));
--        q->setSocketError(QAbstractSocket::SslHandshakeFailedError);
--        emit q->error(QAbstractSocket::SslHandshakeFailedError);
--        plainSocket->disconnectFromHost();
--        return false;
-+
-+    // check the whole chain for blacklisting (including root, as we check for subjectInfo and issuer)
-+    foreach (const QSslCertificate &cert, configuration.peerCertificateChain) {
-+        if (QSslCertificatePrivate::isBlacklisted(cert)) {
-+            q->setErrorString(QSslSocket::tr("The peer certificate is blacklisted"));
-+            q->setSocketError(QAbstractSocket::SslHandshakeFailedError);
-+            emit q->error(QAbstractSocket::SslHandshakeFailedError);
-+            plainSocket->disconnectFromHost();
-+            return false;
-+        }
-     }
-
-     // Start translating errors.
diff --git a/srcpkgs/qt/qt-demos.rshlibs b/srcpkgs/qt/qt-demos.rshlibs
index fc9372fab5d..86cc45e8df1 100644
--- a/srcpkgs/qt/qt-demos.rshlibs
+++ b/srcpkgs/qt/qt-demos.rshlibs
@@ -7,13 +7,11 @@ libgcc_s.so.1
 libc.so.6
 libGL.so.1
 libQtSql.so.4
-libGLU.so.1
 libQtWebKit.so.4
 libQtNetwork.so.4
 libQtDeclarative.so.4
 libQtXml.so.4
 libQtSvg.so.4
-libQt3Support.so.4
 libQtMultimedia.so.4
 libQtScript.so.4
 libQtScriptTools.so.4
@@ -21,3 +19,4 @@ libQtTest.so.4
 libQtHelp.so.4
 libQtDBus.so.4
 libQtXmlPatterns.so.4
+libphonon.so.4
diff --git a/srcpkgs/qt/qt-demos.template b/srcpkgs/qt/qt-demos.template
index df9de21d3e1..d74e682f11e 100644
--- a/srcpkgs/qt/qt-demos.template
+++ b/srcpkgs/qt/qt-demos.template
@@ -5,8 +5,6 @@ long_desc="${long_desc}
 
  This package contains Qt 4 examples and demos."
 
-revision=2
-
 gtk_iconcache_dirs="/usr/share/icons/hicolor"
 
 Add_dependency run hicolor-icon-theme
diff --git a/srcpkgs/qt/qt-designer.rshlibs b/srcpkgs/qt/qt-designer.rshlibs
index 4eae200e7e1..714239cee25 100644
--- a/srcpkgs/qt/qt-designer.rshlibs
+++ b/srcpkgs/qt/qt-designer.rshlibs
@@ -12,3 +12,4 @@ libm.so.6
 libQtScript.so.4
 libQtXml.so.4
 libQtNetwork.so.4
+libphonon.so.4
diff --git a/srcpkgs/qt/qt-designer.template b/srcpkgs/qt/qt-designer.template
index 97bf905ae0d..86002c67bad 100644
--- a/srcpkgs/qt/qt-designer.template
+++ b/srcpkgs/qt/qt-designer.template
@@ -6,8 +6,6 @@ long_desc="${long_desc}
  Qt Designer is a tool for designing and building graphical user
  interfaces (GUIs) from Qt components."
 
-revision=3
-
 gtk_iconcache_dirs="/usr/share/icons/hicolor"
 
 Add_dependency run hicolor-icon-theme
diff --git a/srcpkgs/qt/qt-devel-tools.template b/srcpkgs/qt/qt-devel-tools.template
index 98ac9322cee..b17ca80892c 100644
--- a/srcpkgs/qt/qt-devel-tools.template
+++ b/srcpkgs/qt/qt-devel-tools.template
@@ -1,6 +1,5 @@
 # Template file for 'qt-devel-tools'.
 #
-revision=1
 short_desc="Qt development tools"
 long_desc="${long_desc}
 
diff --git a/srcpkgs/qt/qt-devel.template b/srcpkgs/qt/qt-devel.template
index 4390230c03d..acb62fcb20a 100644
--- a/srcpkgs/qt/qt-devel.template
+++ b/srcpkgs/qt/qt-devel.template
@@ -1,6 +1,5 @@
 # Template file for 'qt-devel'.
 #
-revision=1
 short_desc="Qt development files"
 long_desc="${long_desc}
 
diff --git a/srcpkgs/qt/qt-plugin-mysql.template b/srcpkgs/qt/qt-plugin-mysql.template
index a13eda8c76d..a47e4931dfa 100644
--- a/srcpkgs/qt/qt-plugin-mysql.template
+++ b/srcpkgs/qt/qt-plugin-mysql.template
@@ -1,6 +1,5 @@
 # Template file for 'qt-plugin-mysql'.
 #
-revision=1
 short_desc="Qt MySQL plugin"
 long_desc="${long_desc}
 
diff --git a/srcpkgs/qt/qt-plugin-pgsql.template b/srcpkgs/qt/qt-plugin-pgsql.template
index fbf162029c7..351f79d9550 100644
--- a/srcpkgs/qt/qt-plugin-pgsql.template
+++ b/srcpkgs/qt/qt-plugin-pgsql.template
@@ -1,6 +1,5 @@
 # Template file for 'qt-plugin-pgsql'.
 #
-revision=1
 short_desc="Qt PostgreSQL plugin"
 long_desc="${long_desc}
 
diff --git a/srcpkgs/qt/qt-plugin-sqlite.template b/srcpkgs/qt/qt-plugin-sqlite.template
index 34be81689fb..50dcb088b01 100644
--- a/srcpkgs/qt/qt-plugin-sqlite.template
+++ b/srcpkgs/qt/qt-plugin-sqlite.template
@@ -1,6 +1,5 @@
 # Template file for 'qt-plugin-sqlite'.
 #
-revision=1
 short_desc="Qt SQLite plugin"
 long_desc="${long_desc}
 
diff --git a/srcpkgs/qt/qt-qmake.template b/srcpkgs/qt/qt-qmake.template
index 390ab246de4..9b15e4210f1 100644
--- a/srcpkgs/qt/qt-qmake.template
+++ b/srcpkgs/qt/qt-qmake.template
@@ -1,6 +1,5 @@
 # Template file for 'qt-qmake'.
 #
-revision=1
 short_desc="Qt qmake Makefile generator tool"
 long_desc="${long_desc}
 
diff --git a/srcpkgs/qt/qt-qtconfig.rshlibs b/srcpkgs/qt/qt-qtconfig.rshlibs
index 8c8abcfb557..9a746efc5a5 100644
--- a/srcpkgs/qt/qt-qtconfig.rshlibs
+++ b/srcpkgs/qt/qt-qtconfig.rshlibs
@@ -1,6 +1,9 @@
-libQt3Support.so.4
 libQtGui.so.4
 libQtCore.so.4
 libstdc++.so.6
 libgcc_s.so.1
 libc.so.6
+libgstreamer-0.10.so.0
+libgobject-2.0.so.0
+libphonon.so.4
+libglib-2.0.so.0
diff --git a/srcpkgs/qt/qt-qtconfig.template b/srcpkgs/qt/qt-qtconfig.template
index 4281adca729..3e5e92aaa3f 100644
--- a/srcpkgs/qt/qt-qtconfig.template
+++ b/srcpkgs/qt/qt-qtconfig.template
@@ -6,8 +6,6 @@ long_desc="${long_desc}
  The Qt Configuration program allows end users to configure the look
  and behavior of any Qt application."
 
-revision=3
-
 gtk_iconcache_dirs="/usr/share/icons/hicolor"
 
 Add_dependency run hicolor-icon-theme
diff --git a/srcpkgs/qt/qt.rshlibs b/srcpkgs/qt/qt.rshlibs
index bc01fff84c8..6e9785f8c94 100644
--- a/srcpkgs/qt/qt.rshlibs
+++ b/srcpkgs/qt/qt.rshlibs
@@ -25,5 +25,15 @@ libOpenVG.so.1
 libasound.so.2
 libsqlite3.so.0
 libmng.so.1
-libtiff.so.3
 libjpeg.so.8
+ld-linux-x86-64.so.2
+libgstapp-0.10.so.0
+libgstinterfaces-0.10.so.0
+libgstpbutils-0.10.so.0
+libgstvideo-0.10.so.0
+libgstbase-0.10.so.0
+libgstreamer-0.10.so.0
+libpulse-mainloop-glib.so.0
+libpulse.so.0
+libgstaudio-0.10.so.0
+libtiff.so.5
diff --git a/srcpkgs/qt/template b/srcpkgs/qt/template
index cec924c4809..a4478189161 100644
--- a/srcpkgs/qt/template
+++ b/srcpkgs/qt/template
@@ -1,15 +1,15 @@
 # Template file for 'qt'
 pkgname=qt
-version=4.7.4
-revision=5
+version=4.8.0
 _distname=qt-everywhere-opensource-src
 wrksrc=${_distname}-${version}
 homepage="http://qt.nokia.com/"
 distfiles="ftp://ftp.qt.nokia.com/qt/source/${_distname}-$version.tar.gz"
+revision=1
 short_desc="A cross-platform application and UI framework"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-3, LGPL-2.1"
-checksum=97195ebce8a46f9929fb971d9ae58326d011c4d54425389e6e936514f540221e
+checksum=9392b74e485e15f75a3e07a527547d4f6747eaf55ebce71ba0e863a9fd320b6e
 long_desc="
  Qt(TM) is a GUI software toolkit. Qt simplifies the task of writing and
  maintaining GUI (graphical user interface) applications."
@@ -34,6 +34,8 @@ Add_dependency build libXrandr-devel
 Add_dependency build zlib-devel
 Add_dependency build dbus-devel
 Add_dependency build glib-devel
+Add_dependency build gstreamer-devel
+Add_dependency build gst-plugins-base-devel
 Add_dependency build sqlite-devel
 Add_dependency build alsa-lib-devel
 Add_dependency build openssl-devel
@@ -63,11 +65,11 @@ do_configure() {
 		-examplesdir /usr/share/doc/qt/examples \
 		-demosdir /usr/share/doc/qt/demos -largefile \
 		-plugin-sql-sqlite -system-sqlite \
-		-xmlpatterns -no-phonon -no-phonon-backend -svg -webkit \
+		-xmlpatterns -svg -webkit \
 		-scripttools -system-zlib \
 		-system-libtiff -system-libpng -system-libmng -system-libjpeg \
 		-openssl-linked -optimized-qmake -no-rpath -reduce-relocations \
-		-no-separate-debug-info -gtkstyle -opengl -glib \
+		-no-separate-debug-info -gtkstyle -opengl -glib -gstreamer \
 		-no-sql-db2 -no-sql-ibase -gtkstyle \
 		-plugin-sql-mysql -plugin-sql-psql -no-sql-oci \
 		-no-sql-odbc -no-sql-sqlite2 \
@@ -84,6 +86,9 @@ do_install() {
 
 	make INSTALL_ROOT=${DESTDIR} install
 
+	# delete tests
+	rm -rf ${DESTDIR}/usr/tests
+
 	# install missing icons and desktop files
 	for icon in tools/linguist/linguist/images/icons/linguist-*-32.png ; do
 		size=$(echo $(basename ${icon}) | cut -d- -f2)
diff --git a/srcpkgs/tiff/depends b/srcpkgs/tiff/depends
index 32e97d91eb4..487aa86df2c 100644
--- a/srcpkgs/tiff/depends
+++ b/srcpkgs/tiff/depends
@@ -1,2 +1,2 @@
-abi_depends=">=3.8.2"
+abi_depends=">=4.0.0"
 api_depends="${abi_depends}"
diff --git a/srcpkgs/tiff/template b/srcpkgs/tiff/template
index d5f1a59e353..11e0f150624 100644
--- a/srcpkgs/tiff/template
+++ b/srcpkgs/tiff/template
@@ -1,13 +1,12 @@
 # Template build file for 'tiff'.
 pkgname=tiff
-version=3.9.3
+version=4.0.0
 distfiles="ftp://ftp.remotesensing.org/pub/libtiff/$pkgname-$version.tar.gz"
 build_style=gnu-configure
 configure_args="--enable-cxx --without-x"
-revision=1
 short_desc="Library and tools for reading and writing TIFF data files"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=60e08794966b7cbf46bbf13c347f1fe41c982f98714909f49d6f198add4fdee6
+checksum=9f4c0b2a8446a259db431c6401342bcb2c1be4a604e77a532d109c8448619288
 long_desc="
  This is software provides support for the Tag Image Format (TIFF).
  Included is a library, libtiff, for reading and writing TIFF, a
@@ -23,3 +22,4 @@ long_desc="
 subpackages="$pkgname-devel"
 Add_dependency build zlib-devel
 Add_dependency build jpeg-devel
+Add_dependency build liblzma-devel
diff --git a/srcpkgs/tiff/tiff.rshlibs b/srcpkgs/tiff/tiff.rshlibs
index d322904685e..959dc043cd5 100644
--- a/srcpkgs/tiff/tiff.rshlibs
+++ b/srcpkgs/tiff/tiff.rshlibs
@@ -4,3 +4,4 @@ libjpeg.so.8
 libz.so.1
 libstdc++.so.6
 libgcc_s.so.1
+liblzma.so.5
diff --git a/srcpkgs/tracker/template b/srcpkgs/tracker/template
index 7152c3d5f9b..e765f04aaf4 100644
--- a/srcpkgs/tracker/template
+++ b/srcpkgs/tracker/template
@@ -7,7 +7,7 @@ build_style=gnu-configure
 configure_args="--enable-libflac --enable-libvorbis --disable-unit-tests
 --enable-libtiff --disable-static"
 short_desc="Personal search tool and storage system"
-revision=1
+revision=2
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
 checksum=ccd61c8f79905f7e09af3a4a863772256601dcd3213b0f9a3f76add04e553b5c
diff --git a/srcpkgs/tracker/tracker.rshlibs b/srcpkgs/tracker/tracker.rshlibs
index de965eb2ce8..7e8ed5ccca2 100644
--- a/srcpkgs/tracker/tracker.rshlibs
+++ b/srcpkgs/tracker/tracker.rshlibs
@@ -19,7 +19,6 @@ libogg.so.0
 libFLAC.so.8
 libgif.so.4
 libjpeg.so.8
-libtiff.so.3
 libxml2.so.2
 libgsf-1.so.114
 libpoppler-glib.so.8
@@ -47,3 +46,4 @@ libupower-glib.so.1
 librest-0.7.so.0
 libpanel-applet-4.so.0
 libgee.so.2
+libtiff.so.5
diff --git a/srcpkgs/xbmc/template b/srcpkgs/xbmc/template
index 6d152a494c9..2f56b3c66fe 100644
--- a/srcpkgs/xbmc/template
+++ b/srcpkgs/xbmc/template
@@ -1,7 +1,7 @@
 # Template file for 'xbmc'
 pkgname=xbmc
 version=10.1
-revision=9
+revision=10
 patch_args="-Np1"
 distfiles="http://mirrors.xbmc.org/releases/source/xbmc-$version.tar.gz"
 short_desc="XBMC Media Center"
diff --git a/srcpkgs/xbmc/xbmc.rshlibs b/srcpkgs/xbmc/xbmc.rshlibs
index 6b15e2bc745..1bdebc49574 100644
--- a/srcpkgs/xbmc/xbmc.rshlibs
+++ b/srcpkgs/xbmc/xbmc.rshlibs
@@ -42,7 +42,7 @@ ld-linux-x86-64.so.2
 libexpat.so.1
 libpng14.so.14
 libjpeg.so.8
-libtiff.so.3
+libtiff.so.5
 libXmu.so.6
 libcdio.so.13
 libXrender.so.1